Use captured step settings for request metadata and tool hooks (#45248)

## Why

Model and reasoning effort updates during a turn can leave request metadata and tool hooks reporting the turn's initial settings. Metadata should describe the step that issued the request or tool call.

## What changed

- Share captured execution metadata across Responses, MCP, and extension tool calls, including model, reasoning effort, and automatic review and Node REPL flags.
- Build Responses tool inventory metadata from the issuing step's finalized tool router. Attach the finalized inventory separately for remote compaction.
- Use captured step settings for pre- and post-tool hooks, and captured review settings for permission-request hooks.

## Testing

Add and extend regression tests for model and effort changes during a turn, MCP metadata, pre-tool hook model attribution, captured review flags, and tool inventory matching the issuing request.

GitOrigin-RevId: 9dee46a8b4839de8b434cdad4ed441cc0bb6ff9b
This commit is contained in:
Abhinav
2026-09-13 15:47:59 +00:00
committed by copyberry
parent 36f0dbe796
commit 16537b20a5
20 changed files with 545 additions and 255 deletions
+1 -1
View File
@@ -495,7 +495,7 @@ impl Session {
// 2. If StrictAutoReview || Guardian enabled, then Guardian. Else, user.
let resolution = match run_permission_request_hooks(
self,
ctx.review_context.turn(),
&ctx.review_context,
&permission_request_run_id,
action.permission_request_payload(),
)
@@ -26,7 +26,7 @@ use crate::tools::handlers::apply_granted_turn_permissions;
use crate::tools::lifecycle::extension_tool_call_source;
use crate::tools::registry::CoreToolRuntime;
use crate::tools::registry::ToolExecutor;
use crate::turn_metadata::McpTurnMetadataContext;
use crate::turn_metadata::ExecutionMetadata;
pub(crate) struct ExtensionToolAdapter(
Arc<dyn for<'call> codex_tools::ToolExecutor<ExtensionToolCall<'call>>>,
@@ -170,11 +170,9 @@ async fn to_extension_call(invocation: &ToolInvocation) -> ExtensionToolCall<'_>
let codex_turn_metadata = invocation
.turn
.turn_metadata_state
.current_meta_value_for_mcp_request(McpTurnMetadataContext {
model: settings.model_info.slug.as_str(),
reasoning_effort: settings.effective_reasoning_effort(),
node_repl_disabled: settings.model_info.node_repl_disabled,
})
.current_meta_value_for_mcp_request(ExecutionMetadata::from_settings(
&invocation.step_context.settings,
))
.and_then(|metadata| to_ascii_json_string(&metadata).ok());
let mut environments = Vec::new();
for environment in invocation.step_context.environments.turn_environments() {
+2 -2
View File
@@ -567,7 +567,7 @@ impl ToolRegistry {
if let Some(pre_tool_use_payload) = tool.pre_tool_use_payload(&invocation) {
match run_pre_tool_use_hooks(
&invocation.session,
&invocation.turn,
invocation.step_context.as_ref(),
invocation.call_id.clone(),
&pre_tool_use_payload.tool_name,
&pre_tool_use_payload.tool_input,
@@ -683,7 +683,7 @@ impl ToolRegistry {
Some(
run_post_tool_use_hooks(
&invocation.session,
&invocation.turn,
invocation.step_context.as_ref(),
post_tool_use_payload.tool_use_id,
post_tool_use_payload.tool_name.name().to_string(),
post_tool_use_payload.tool_name.matcher_aliases().to_vec(),
@@ -45,7 +45,6 @@ use serde_json::json;
use crate::WaitForEnvironmentToolConfig;
use crate::config::CurrentTimeReminderConfig;
use crate::environment_selection::TurnEnvironmentState;
use crate::responses_metadata::CodexResponsesRequestKind;
use crate::responses_metadata::TurnToolFunctionInfo;
use crate::responses_metadata::TurnToolNamespacesInfo;
use crate::responses_metadata::TurnToolSource;
@@ -1596,13 +1595,6 @@ async fn candidate_model_plan_leaves_selected_model_and_inventory_unchanged() {
turn.model_info(),
ToolPlanInputs::default(),
));
let selected_inventory = selected
.tool_namespaces_info
.clone()
.expect("selected plan inventory");
turn.turn_metadata_state
.set_tool_namespaces_info(selected_inventory.clone());
let mut candidate_model = selected_model.as_ref().clone();
candidate_model.tool_mode = Some(ToolMode::CodeModeOnly);
candidate_model.shell_type = ConfigShellToolType::UnifiedExec;
@@ -1633,12 +1625,6 @@ async fn candidate_model_plan_leaves_selected_model_and_inventory_unchanged() {
source: TurnToolSource::Harness,
}
);
let metadata = turn.turn_metadata_state.to_responses_metadata(
"installation".to_string(),
"window".to_string(),
CodexResponsesRequestKind::Turn,
);
assert_eq!(metadata.tool_namespaces_info, Some(selected_inventory));
assert_eq!(turn.model_info(), &selected_model);
assert_eq!(
ToolPlanProbe::from_router(plan_with_model(