From 6f4dcec12af185121f070802e3b7b10e8b07699c Mon Sep 17 00:00:00 2001 From: wsp Date: Fri, 4 Sep 2026 20:41:48 +0800 Subject: [PATCH] fix(core): remove stale model resolver input The model resolver no longer depends on the original user input after the short-first-turn fast-model strategy was removed. Remove the obsolete parameter and its call-site plumbing, and keep the external route-root helper test-only so normal builds do not report dead code. --- .../assembly/core/src/agentic/coordination/coordinator.rs | 2 -- .../core/src/agentic/execution/execution_engine.rs | 8 -------- src/crates/assembly/core/src/external_tools.rs | 1 + 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/crates/assembly/core/src/agentic/coordination/coordinator.rs b/src/crates/assembly/core/src/agentic/coordination/coordinator.rs index 4cc9b5e111..c11c3edb36 100644 --- a/src/crates/assembly/core/src/agentic/coordination/coordinator.rs +++ b/src/crates/assembly/core/src/agentic/coordination/coordinator.rs @@ -3989,7 +3989,6 @@ Update the persona files and delete BOOTSTRAP.md as soon as bootstrap is complet &session, ASSISTANT_BOOTSTRAP_AGENT_TYPE, Some(&workspace_binding), - kickoff_query, 0, None, None, @@ -6286,7 +6285,6 @@ Update the persona files and delete BOOTSTRAP.md as soon as bootstrap is complet &session, &effective_agent_type, session_workspace.as_ref(), - &original_user_input, turn_index, None, None, diff --git a/src/crates/assembly/core/src/agentic/execution/execution_engine.rs b/src/crates/assembly/core/src/agentic/execution/execution_engine.rs index 261c141f24..8b85197453 100644 --- a/src/crates/assembly/core/src/agentic/execution/execution_engine.rs +++ b/src/crates/assembly/core/src/agentic/execution/execution_engine.rs @@ -1806,7 +1806,6 @@ impl ExecutionEngine { session: &Session, agent_type: &str, workspace: Option<&WorkspaceBinding>, - original_user_input: &str, turn_index: usize, frozen_model_id: Option<&str>, frozen_model_binding_fingerprint: Option<&str>, @@ -2548,17 +2547,11 @@ impl ExecutionEngine { OpenBitFunError::NotFound(format!("Agent not found: {}", context.agent_type)) })?; - let original_user_input = context - .context - .get("original_user_input") - .cloned() - .unwrap_or_default(); let (model_id, _) = self .resolve_model_id_for_turn( session, &context.agent_type, context.workspace.as_ref(), - &original_user_input, context.turn_index, context .context @@ -3484,7 +3477,6 @@ impl ExecutionEngine { &session, &agent_type, context.workspace.as_ref(), - &original_user_input, context.turn_index, context .context diff --git a/src/crates/assembly/core/src/external_tools.rs b/src/crates/assembly/core/src/external_tools.rs index 2f09010b8f..477bbec313 100644 --- a/src/crates/assembly/core/src/external_tools.rs +++ b/src/crates/assembly/core/src/external_tools.rs @@ -1246,6 +1246,7 @@ pub(crate) fn resolve_external_tool_for_context( router().resolve_registered_tool_for_context(tool, context) } +#[cfg(test)] pub(crate) fn external_tool_route_root( workspace_root: Option<&Path>, is_remote: bool,