Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Use the step-scoped router for tool execution (#36357)

jif66ebeb703710
diff --git a/codex-rs/core/src/session/tests.rs b/codex-rs/core/src/session/tests.rs
index 8ee16e14f4..6f1b228eb6 100644
--- a/codex-rs/core/src/session/tests.rs
+++ b/codex-rs/core/src/session/tests.rs
@@ -225,6 +225,16 @@ impl StepContext {
loaded_agents_md: None,
})
}
+
+ pub(crate) fn with_tool_router_for_test(
+ mut self: Arc<Self>,
+ tool_router: Arc<ToolRouter>,
+ ) -> Arc<Self> {
+ Arc::get_mut(&mut self)
+ .expect("test step context must not be shared before its tool router is set")
+ .tool_router = tool_router;
+ self
+ }
}
mod guardian_tests;
@@ -845,8 +855,9 @@ fn test_tool_runtime(session: Arc<Session>, turn_context: Arc<TurnContext>) -> T
hosted_specs,
&Default::default(),
));
+ let step_context = step_context.with_tool_router_for_test(router);
let tracker = Arc::new(tokio::sync::Mutex::new(TurnDiffTracker::new()));
- ToolCallRuntime::new(router, session, step_context, tracker)
+ ToolCallRuntime::new(session, step_context, tracker)
}
fn make_connector(id: &str, name: &str) -> AppInfo {
diff --git a/codex-rs/core/src/session/turn.rs b/codex-rs/core/src/session/turn.rs
index ec93b4db6b..32c853782b 100644
--- a/codex-rs/core/src/session/turn.rs
+++ b/codex-rs/core/src/session/turn.rs
@@ -1321,7 +1321,6 @@ async fn run_sampling_request(
let base_instructions = sess.get_base_instructions().await;
let tool_runtime = ToolCallRuntime::new(
- Arc::clone(&router),
Arc::clone(&sess),
Arc::clone(&step_context),
Arc::clone(&turn_diff_tracker),
@@ -1329,7 +1328,6 @@ async fn run_sampling_request(
let _code_mode_worker = sess.services.code_mode_service.start_turn_worker(
&sess,
Arc::clone(&step_context),
- Arc::clone(&router),
Arc::clone(&turn_diff_tracker),
);
let max_retries = turn_context.provider.info().stream_max_retries();
diff --git a/codex-rs/core/src/stream_events_utils_tests.rs b/codex-rs/core/src/stream_events_utils_tests.rs
index 94e370009c..be31809f85 100644
--- a/codex-rs/core/src/stream_events_utils_tests.rs
+++ b/codex-rs/core/src/stream_events_utils_tests.rs
@@ -285,8 +285,9 @@ async fn handle_output_item_done_returns_contributed_last_agent_message() {
hosted_specs,
&Default::default(),
));
+ let step_context = step_context.with_tool_router_for_test(router);
let tracker = Arc::new(tokio::sync::Mutex::new(TurnDiffTracker::new()));
- let tool_runtime = ToolCallRuntime::new(router, Arc::clone(&session), step_context, tracker);
+ let tool_runtime = ToolCallRuntime::new(Arc::clone(&session), step_context, tracker);
let item = assistant_output_text("original assistant text");
let mut ctx = HandleOutputCtx {
sess: session,
diff --git a/codex-rs/core/src/tools/code_mode/delegate.rs b/codex-rs/core/src/tools/code_mode/delegate.rs
index acb4546840..70defb2421 100644
--- a/codex-rs/core/src/tools/code_mode/delegate.rs
+++ b/codex-rs/core/src/tools/code_mode/delegate.rs
@@ -18,7 +18,6 @@ use super::ExecContext;
use super::PUBLIC_TOOL_NAME;
use super::call_nested_tool;
use crate::session::step_context::StepContext;
-use crate::tools::ToolRouter;
use crate::tools::context::SharedTurnDiffTracker;
use crate::tools::parallel::ToolCallRuntime;
@@ -49,12 +48,10 @@ impl CodeModeDispatchBroker {
pub(super) fn start_turn_worker(
&self,
exec: ExecContext,
- router: Arc<ToolRouter>,
step_context: Arc<StepContext>,
tracker: SharedTurnDiffTracker,
) -> CodeModeDispatchWorker {
- let tool_runtime =
- ToolCallRuntime::new(router, Arc::clone(&exec.session), step_context, tracker);
+ let tool_runtime = ToolCallRuntime::new(Arc::clone(&exec.session), step_context, tracker);
let host = Arc::new(CoreTurnHost { exec, tool_runtime });
let dispatch_rx = self.dispatch_rx.clone();
let dispatch_gates = Arc::clone(&self.dispatch_gates);
diff --git a/codex-rs/core/src/tools/code_mode/mod.rs b/codex-rs/core/src/tools/code_mode/mod.rs
index e02415b193..144334c8ba 100644
--- a/codex-rs/core/src/tools/code_mode/mod.rs
+++ b/codex-rs/core/src/tools/code_mode/mod.rs
@@ -30,7 +30,6 @@ use crate::original_image_detail::sanitize_original_image_detail as sanitize_ima
use crate::session::session::Session;
use crate::session::step_context::StepContext;
use crate::session::turn_context::TurnContext;
-use crate::tools::ToolRouter;
use crate::tools::context::FunctionToolOutput;
use crate::tools::context::SharedTurnDiffTracker;
use crate::tools::context::ToolPayload;
@@ -178,7 +177,6 @@ impl CodeModeService {
&self,
session: &Arc<Session>,
step_context: Arc<StepContext>,
- router: Arc<ToolRouter>,
tracker: SharedTurnDiffTracker,
) -> Option<CodeModeDispatchWorker> {
let turn = &step_context.turn;
@@ -193,7 +191,7 @@ impl CodeModeService {
};
Some(
self.dispatch_broker
- .start_turn_worker(exec, router, step_context, tracker),
+ .start_turn_worker(exec, step_context, tracker),
)
}
diff --git a/codex-rs/core/src/tools/parallel.rs b/codex-rs/core/src/tools/parallel.rs
index 5cc896341f..b19f7e324d 100644
--- a/codex-rs/core/src/tools/parallel.rs
+++ b/codex-rs/core/src/tools/parallel.rs
@@ -25,7 +25,6 @@ use crate::tools::registry::AnyToolResult;
use crate::tools::registry::ToolArgumentDiffConsumer;
use crate::tools::router::ToolCall;
use crate::tools::router::ToolCallSource;
-use crate::tools::router::ToolRouter;
use codex_protocol::error::CodexErr;
use codex_protocol::models::ResponseInputItem;
@@ -40,7 +39,6 @@ struct ToolCallTimingGuard {
#[derive(Clone)]
pub(crate) struct ToolCallRuntime {
- router: Arc<ToolRouter>,
session: Arc<Session>,
// Tool calls may run later, so retain the step whose tool list advertised them.
step_context: Arc<StepContext>,
@@ -50,13 +48,11 @@ pub(crate) struct ToolCallRuntime {
impl ToolCallRuntime {
pub(crate) fn new(
- router: Arc<ToolRouter>,
session: Arc<Session>,
step_context: Arc<StepContext>,
tracker: SharedTurnDiffTracker,
) -> Self {
Self {
- router,
session,
step_context,
tracker,
@@ -68,7 +64,9 @@ impl ToolCallRuntime {
&self,
tool_name: &codex_tools::ToolName,
) -> Option<Box<dyn ToolArgumentDiffConsumer>> {
- self.router.create_diff_consumer(tool_name)
+ self.step_context
+ .tool_router
+ .create_diff_consumer(tool_name)
}
#[instrument(level = "trace", skip_all)]
@@ -111,16 +109,17 @@ impl ToolCallRuntime {
super::effective_tool_mode(&self.step_context.turn),
);
}
- let supports_parallel = self.router.tool_supports_parallel(&call);
- let tool_runtime = self.router.tool_runtime(&call);
- let router = Arc::clone(&self.router);
+ let router = &self.step_context.tool_router;
+ let supports_parallel = router.tool_supports_parallel(&call);
+ let tool_runtime = router.tool_runtime(&call);
+ let wait_for_runtime_cancellation = router.tool_waits_for_runtime_cancellation(&call);
+ let router = Arc::clone(router);
let session = Arc::clone(&self.session);
let step_context = Arc::clone(&self.step_context);
let turn = Arc::clone(&step_context.turn);
let tracker = Arc::clone(&self.tracker);
let lock = Arc::clone(&self.parallel_execution);
let invocation_cancellation_token = cancellation_token.clone();
- let wait_for_runtime_cancellation = self.router.tool_waits_for_runtime_cancellation(&call);
let started = Instant::now();
let tool_call_timing_guard =
ToolCallTimingGuard::capture(started, &session.thread_id, &turn.sub_id, &call, &source);
@@ -377,6 +376,7 @@ mod tests {
use crate::tools::registry::CoreToolRuntime;
use crate::tools::registry::ToolExecutor;
use crate::tools::registry::ToolRegistry;
+ use crate::tools::router::ToolRouter;
use crate::turn_diff_tracker::TurnDiffTracker;
use codex_extension_api::ToolCallOutcome;
use codex_protocol::models::FunctionCallOutputBody;
@@ -445,8 +445,9 @@ mod tests {
ToolRegistry::from_tools([handler]),
Vec::new(),
));
+ let step_context = step_context.with_tool_router_for_test(router);
let tracker = Arc::new(tokio::sync::Mutex::new(TurnDiffTracker::new()));
- let runtime = ToolCallRuntime::new(router, session, step_context, tracker);
+ let runtime = ToolCallRuntime::new(session, step_context, tracker);
let execution_gate = Arc::clone(&runtime.parallel_execution);
let execution_gate_guard = execution_gate
.try_write_owned()
@@ -710,8 +711,9 @@ mod tests {
ToolRegistry::from_tools([handler]),
Vec::new(),
));
+ let step_context = step_context.with_tool_router_for_test(router);
let tracker = Arc::new(tokio::sync::Mutex::new(TurnDiffTracker::new()));
- let runtime = ToolCallRuntime::new(router, session, step_context, tracker);
+ let runtime = ToolCallRuntime::new(session, step_context, tracker);
let cancellation_token = CancellationToken::new();
let call = ToolCall {
tool_name,
@@ -784,8 +786,9 @@ mod tests {
ToolRegistry::from_tools([handler]),
Vec::new(),
));
+ let step_context = step_context.with_tool_router_for_test(router);
let tracker = Arc::new(tokio::sync::Mutex::new(TurnDiffTracker::new()));
- let runtime = ToolCallRuntime::new(router, session, step_context, tracker);
+ let runtime = ToolCallRuntime::new(session, step_context, tracker);
let cancellation_token = CancellationToken::new();
let call = ToolCall {
tool_name,