Include code-mode tool names in Responses Lite metadata (#35271)

## What changed

- Add `code_mode_tool_names` to Responses Lite turn metadata, mapping each normalized code-mode identifier to its structured `ToolName`.
- Reserve the metadata key against client overrides and omit it from metadata exposed to external MCP servers.
- Keep non-Lite requests and the legacy top-level client metadata unchanged.

## Testing

- Cover HTTP and WebSocket Responses Lite requests, including switching from a non-Lite model.
- Verify reserved-key handling and external MCP metadata filtering.

GitOrigin-RevId: b678afba13d57a91e26f5895aa37238fbb4cb276
This commit is contained in:
rka-oai
2026-07-25 01:05:33 +00:00
committed by copyberry
parent 63fe5a6b71
commit 25b6fc9bbc
6 changed files with 124 additions and 0 deletions
+21
View File
@@ -9,6 +9,7 @@ use std::sync::atomic::Ordering;
use serde_json::Value;
use tokio::task::JoinHandle;
use crate::responses_metadata::CODE_MODE_TOOL_NAMES_KEY;
use crate::responses_metadata::CodexResponsesMetadata;
use crate::responses_metadata::CodexResponsesRequestKind;
use crate::responses_metadata::TurnMetadataWorkspace;
@@ -21,6 +22,7 @@ use codex_git_utils::get_git_repo_root;
use codex_git_utils::get_has_changes;
use codex_git_utils::get_head_commit_hash;
use codex_protocol::ThreadId;
use codex_protocol::ToolName;
use codex_protocol::config_types::WindowsSandboxLevel;
use codex_protocol::models::PermissionProfile;
use codex_protocol::openai_models::ReasoningEffort as ReasoningEffortConfig;
@@ -96,6 +98,7 @@ pub(crate) struct TurnMetadataState {
turn_id: String,
sandbox: Option<String>,
enriched_workspaces: Arc<RwLock<Option<BTreeMap<String, TurnMetadataWorkspace>>>>,
code_mode_tool_names: Arc<RwLock<Option<BTreeMap<String, ToolName>>>>,
turn_started_at_unix_ms: Arc<RwLock<Option<i64>>>,
responsesapi_client_metadata: Arc<RwLock<BTreeMap<String, String>>>,
user_input_requested_during_turn: Arc<AtomicBool>,
@@ -139,6 +142,7 @@ impl TurnMetadataState {
turn_id,
sandbox,
enriched_workspaces: Arc::new(RwLock::new(None)),
code_mode_tool_names: Arc::new(RwLock::new(None)),
turn_started_at_unix_ms: Arc::new(RwLock::new(None)),
responsesapi_client_metadata: Arc::new(RwLock::new(BTreeMap::new())),
user_input_requested_during_turn: Arc::new(AtomicBool::new(false)),
@@ -155,6 +159,7 @@ impl TurnMetadataState {
else {
return None;
};
metadata.remove(CODE_MODE_TOOL_NAMES_KEY); // Precaution: avoid exposing tool data to external MCPs.
metadata.insert(
MODEL_KEY.to_string(),
Value::String(context.model.to_string()),
@@ -203,6 +208,17 @@ impl TurnMetadataState {
.store(true, Ordering::Relaxed);
}
pub(crate) fn set_code_mode_tool_names(
&self,
code_mode_tool_names: BTreeMap<String, ToolName>,
) {
*self
.code_mode_tool_names
.write()
.unwrap_or_else(std::sync::PoisonError::into_inner) =
(!code_mode_tool_names.is_empty()).then_some(code_mode_tool_names);
}
pub(crate) fn set_responsesapi_client_metadata(
&self,
responsesapi_client_metadata: HashMap<String, String>,
@@ -232,6 +248,11 @@ impl TurnMetadataState {
thread_source: self.thread_source.clone(),
sandbox: self.sandbox.clone(),
workspaces: self.current_workspaces(),
code_mode_tool_names: self
.code_mode_tool_names
.read()
.unwrap_or_else(std::sync::PoisonError::into_inner)
.clone(),
turn_started_at_unix_ms: self.current_turn_started_at_unix_ms(),
extra: self
.responsesapi_client_metadata