Include call IDs in MCP requests and clarify metadata config (#37477)

## What changed

- Add the tool call ID to `_meta.callId` for every MCP tool request.
- Rename `features.tool_registry.include_tool_metadata` to
  `features.tool_registry.turn_metadata_includes_tool_info` to clarify that the
  setting controls authoritative tool information in per-turn metadata.
- Update config parsing, schema generation, and session config locking for the
  renamed setting.

## Testing

- Cover `callId` metadata for custom, plugin, and Codex Apps MCP calls.
- Update strict-config, config-loading, feature-config, and config-lock tests for
  the renamed setting.

GitOrigin-RevId: ac0e58c489b03bd9b55a356f545de86c8ecaf865
This commit is contained in:
tongzhou wang authored and copyberry committed 2026-08-07 17:44:05 +00:00
1 parent 5729546839
commit 248d8c0e22
10 files changed
+37 -23

No files matched your search

+4 -4
View File
@@ -574,7 +574,7 @@ disable_in_process_fallback = true
async fn load_config_resolves_tool_registry_config() -> std::io::Result<()> {
let codex_home = tempdir()?;
for (config_toml, error_on_tool_collisions, include_tool_metadata) in [
for (config_toml, error_on_tool_collisions, turn_metadata_includes_tool_info) in [
("", false, false),
(
"[features.tool_registry]\nerror_on_tool_collisions = true\n",
@@ -582,7 +582,7 @@ async fn load_config_resolves_tool_registry_config() -> std::io::Result<()> {
false,
),
(
"[features.tool_registry]\ninclude_tool_metadata = true\n",
"[features.tool_registry]\nturn_metadata_includes_tool_info = true\n",
false,
true,
),
@@ -601,8 +601,8 @@ async fn load_config_resolves_tool_registry_config() -> std::io::Result<()> {
error_on_tool_collisions
);
assert_eq!(
config.tool_registry.include_tool_metadata,
include_tool_metadata
config.tool_registry.turn_metadata_includes_tool_info,
turn_metadata_includes_tool_info
);
assert!(!config.features.enabled(Feature::CodeMode));
}
+4 -4
View File
@@ -1119,8 +1119,8 @@ pub struct Config {
pub struct ToolRegistryConfig {
/// Fail the turn when multiple tools share the same effective name.
pub error_on_tool_collisions: bool,
/// Include authoritative tool information in request metadata.
pub include_tool_metadata: bool,
/// Include authoritative tool information in per-turn request metadata.
pub turn_metadata_includes_tool_info: bool,
}
const DEFAULT_CODE_MODE_EXEC_YIELD_TIME_MS: u64 = 30_000;
@@ -3731,11 +3731,11 @@ impl Config {
.and_then(|features| features.tool_registry.as_ref())
.and_then(|config| config.error_on_tool_collisions)
.unwrap_or_default(),
include_tool_metadata: cfg
turn_metadata_includes_tool_info: cfg
.features
.as_ref()
.and_then(|features| features.tool_registry.as_ref())
.and_then(|config| config.include_tool_metadata)
.and_then(|config| config.turn_metadata_includes_tool_info)
.unwrap_or_default(),
};
let code_mode = resolve_code_mode_config(&cfg);