Configure a subagent_models_manager

codex-rs/core/config.schema.json

@@ -578,6 +578,14 @@
         "service_tier": {
           "$ref": "#/definitions/ServiceTier"
         },
+        "subagent_model_catalog_json": {
+          "allOf": [
+            {
+              "$ref": "#/definitions/AbsolutePathBuf"
+            }
+          ],
+          "description": "Optional path to a JSON subagent model catalog (applied on startup only)."
+        },
         "tools": {
           "$ref": "#/definitions/ToolsToml"
         },
@@ -2421,6 +2429,14 @@
       ],
       "description": "Directory where Codex stores the SQLite state DB. Defaults to `$CODEX_SQLITE_HOME` when set. Otherwise uses `$CODEX_HOME`."
     },
+    "subagent_model_catalog_json": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/AbsolutePathBuf"
+        }
+      ],
+      "description": "Optional path to a JSON subagent model catalog (applied on startup only). Per-thread `config` overrides are accepted but do not reapply this (no-ops)."
+    },
     "suppress_unstable_features_warning": {
       "description": "Suppress warnings about unstable (under development) features.",
       "type": "boolean"
@@ -2479,4 +2495,4 @@
   },
   "title": "ConfigToml",
   "type": "object"
-}
+}

codex-rs/core/src/codex.rs

@@ -359,6 +359,7 @@ pub(crate) struct CodexSpawnArgs {
     pub(crate) config: Config,
     pub(crate) auth_manager: Arc<AuthManager>,
     pub(crate) models_manager: Arc<ModelsManager>,
+    pub(crate) subagent_models_manager: Arc<ModelsManager>,
     pub(crate) skills_manager: Arc<SkillsManager>,
     pub(crate) plugins_manager: Arc<PluginsManager>,
     pub(crate) mcp_manager: Arc<McpManager>,
@@ -411,6 +412,7 @@ impl Codex {
             mut config,
             auth_manager,
             models_manager,
+            subagent_models_manager,
             skills_manager,
             plugins_manager,
             mcp_manager,
@@ -589,6 +591,7 @@ impl Codex {
             config.clone(),
             auth_manager.clone(),
             models_manager.clone(),
+            subagent_models_manager.clone(),
             exec_policy,
             tx_event.clone(),
             agent_status_tx.clone(),
@@ -831,7 +834,12 @@ impl TurnContext {
             .apps_enabled_cached(self.auth_manager.as_deref())
     }
 
-    pub(crate) async fn with_model(&self, model: String, models_manager: &ModelsManager) -> Self {
+    pub(crate) async fn with_model(
+        &self,
+        model: String,
+        models_manager: &ModelsManager,
+        subagent_models_manager: &ModelsManager,
+    ) -> Self {
         let mut config = (*self.config).clone();
         config.model = Some(model.clone());
         let model_info = models_manager.get_model_info(model.as_str(), &config).await;
@@ -866,7 +874,7 @@ impl TurnContext {
         let features = self.features.clone();
         let tools_config = ToolsConfig::new(&ToolsConfigParams {
             model_info: &model_info,
-            available_models: &models_manager
+            available_subagent_models: &subagent_models_manager
                 .list_models(RefreshStrategy::OnlineIfUncached)
                 .await,
             features: &features,
@@ -1282,7 +1290,7 @@ impl Session {
         main_execve_wrapper_exe: Option<&PathBuf>,
         per_turn_config: Config,
         model_info: ModelInfo,
-        models_manager: &ModelsManager,
+        subagent_models_manager: &ModelsManager,
         network: Option<NetworkProxy>,
         environment: Arc<Environment>,
         sub_id: String,
@@ -1305,7 +1313,9 @@ impl Session {
 
         let tools_config = ToolsConfig::new(&ToolsConfigParams {
             model_info: &model_info,
-            available_models: &models_manager.try_list_models().unwrap_or_default(),
+            available_subagent_models: &subagent_models_manager
+                .try_list_models()
+                .unwrap_or_default(),
             features: &per_turn_config.features,
             web_search_mode: Some(per_turn_config.web_search_mode.value()),
             session_source: session_source.clone(),
@@ -1380,6 +1390,7 @@ impl Session {
         config: Arc<Config>,
         auth_manager: Arc<AuthManager>,
         models_manager: Arc<ModelsManager>,
+        subagent_models_manager: Arc<ModelsManager>,
         exec_policy: ExecPolicyManager,
         tx_event: Sender<Event>,
         agent_status: watch::Sender<AgentStatus>,
@@ -1790,6 +1801,7 @@ impl Session {
             auth_manager: Arc::clone(&auth_manager),
             session_telemetry,
             models_manager: Arc::clone(&models_manager),
+            subagent_models_manager: Arc::clone(&subagent_models_manager),
             tool_approvals: Mutex::new(ApprovalStore::default()),
             execve_session_approvals: RwLock::new(HashMap::new()),
             skills_manager,
@@ -2388,7 +2400,7 @@ impl Session {
             self.services.main_execve_wrapper_exe.as_ref(),
             per_turn_config,
             model_info,
-            &self.services.models_manager,
+            &self.services.subagent_models_manager,
             self.services
                 .network_proxy
                 .as_ref()
@@ -5130,9 +5142,9 @@ async fn spawn_review_thread(
     let review_web_search_mode = WebSearchMode::Disabled;
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &review_model_info,
-        available_models: &sess
+        available_subagent_models: &sess
             .services
-            .models_manager
+            .subagent_models_manager
             .list_models(RefreshStrategy::OnlineIfUncached)
             .await,
         features: &review_features,
@@ -5873,7 +5885,11 @@ async fn maybe_run_previous_model_inline_compact(
     };
     let previous_model_turn_context = Arc::new(
         turn_context
-            .with_model(previous_turn_settings.model, &sess.services.models_manager)
+            .with_model(
+                previous_turn_settings.model,
+                &sess.services.models_manager,
+                &sess.services.subagent_models_manager,
+            )
             .await,
     );
 

codex-rs/core/src/codex_delegate.rs

@@ -77,6 +77,7 @@ pub(crate) async fn run_codex_thread_interactive(
         config,
         auth_manager,
         models_manager,
+        subagent_models_manager: Arc::clone(&parent_session.services.subagent_models_manager),
         skills_manager: Arc::clone(&parent_session.services.skills_manager),
         plugins_manager: Arc::clone(&parent_session.services.plugins_manager),
         mcp_manager: Arc::clone(&parent_session.services.mcp_manager),

codex-rs/core/src/codex_tests.rs

@@ -1866,7 +1866,11 @@ async fn turn_context_with_model_updates_model_fields() {
     let (session, mut turn_context) = make_session_and_context().await;
     turn_context.reasoning_effort = Some(ReasoningEffortConfig::Minimal);
     let updated = turn_context
-        .with_model("gpt-5.1".to_string(), &session.services.models_manager)
+        .with_model(
+            "gpt-5.1".to_string(),
+            &session.services.models_manager,
+            &session.services.subagent_models_manager,
+        )
         .await;
     let expected_model_info = session
         .services
@@ -2363,6 +2367,7 @@ async fn session_new_fails_when_zsh_fork_enabled_without_zsh_path() {
         session_configuration,
         Arc::clone(&config),
         auth_manager,
+        Arc::clone(&models_manager),
         models_manager,
         ExecPolicyManager::default(),
         tx_event,
@@ -2496,6 +2501,7 @@ pub(crate) async fn make_session_and_context() -> (Session, TurnContext) {
         auth_manager: auth_manager.clone(),
         session_telemetry: session_telemetry.clone(),
         models_manager: Arc::clone(&models_manager),
+        subagent_models_manager: Arc::clone(&models_manager),
         tool_approvals: Mutex::new(ApprovalStore::default()),
         execve_session_approvals: RwLock::new(HashMap::new()),
         skills_manager,
@@ -3290,6 +3296,7 @@ pub(crate) async fn make_session_and_context_with_dynamic_tools_and_rx(
         auth_manager: Arc::clone(&auth_manager),
         session_telemetry: session_telemetry.clone(),
         models_manager: Arc::clone(&models_manager),
+        subagent_models_manager: Arc::clone(&models_manager),
         tool_approvals: Mutex::new(ApprovalStore::default()),
         execve_session_approvals: RwLock::new(HashMap::new()),
         skills_manager,
@@ -3469,6 +3476,7 @@ async fn build_settings_update_items_emits_environment_item_for_network_changes(
         .with_model(
             previous_context.model_info.slug.clone(),
             &session.services.models_manager,
+            &session.services.subagent_models_manager,
         )
         .await;
 
@@ -3526,6 +3534,7 @@ async fn build_settings_update_items_emits_environment_item_for_time_changes() {
         .with_model(
             previous_context.model_info.slug.clone(),
             &session.services.models_manager,
+            &session.services.subagent_models_manager,
         )
         .await;
     current_context.current_date = Some("2026-02-27".to_string());
@@ -3560,6 +3569,7 @@ async fn build_settings_update_items_emits_realtime_start_when_session_becomes_l
         .with_model(
             previous_context.model_info.slug.clone(),
             &session.services.models_manager,
+            &session.services.subagent_models_manager,
         )
         .await;
     current_context.realtime_active = true;
@@ -3588,6 +3598,7 @@ async fn build_settings_update_items_emits_realtime_end_when_session_stops_being
         .with_model(
             previous_context.model_info.slug.clone(),
             &session.services.models_manager,
+            &session.services.subagent_models_manager,
         )
         .await;
     current_context.realtime_active = false;
@@ -3621,6 +3632,7 @@ async fn build_settings_update_items_uses_previous_turn_settings_for_realtime_en
         .with_model(
             previous_context.model_info.slug.clone(),
             &session.services.models_manager,
+            &session.services.subagent_models_manager,
         )
         .await;
     current_context.realtime_active = false;
@@ -3889,7 +3901,11 @@ async fn record_context_updates_and_set_reference_context_item_persists_baseline
         "gpt-5.1"
     };
     let turn_context = previous_context
-        .with_model(next_model.to_string(), &session.services.models_manager)
+        .with_model(
+            next_model.to_string(),
+            &session.services.models_manager,
+            &session.services.subagent_models_manager,
+        )
         .await;
     let previous_context_item = previous_context.to_turn_context_item();
     {
@@ -3991,7 +4007,11 @@ async fn record_context_updates_and_set_reference_context_item_persists_full_rei
         "gpt-5.1"
     };
     let turn_context = previous_context
-        .with_model(next_model.to_string(), &session.services.models_manager)
+        .with_model(
+            next_model.to_string(),
+            &session.services.models_manager,
+            &session.services.subagent_models_manager,
+        )
         .await;
     let config = session.get_config().await;
     let recorder = RolloutRecorder::new(

codex-rs/core/src/codex_tests_guardian.rs

@@ -426,6 +426,7 @@ async fn guardian_subagent_does_not_inherit_parent_exec_policy_rules() {
         None,
         CollaborationModesConfig::default(),
     ));
+    let subagent_models_manager = Arc::clone(&models_manager);
     let plugins_manager = Arc::new(PluginsManager::new(config.codex_home.clone()));
     let skills_manager = Arc::new(SkillsManager::new(
         config.codex_home.clone(),
@@ -439,6 +440,7 @@ async fn guardian_subagent_does_not_inherit_parent_exec_policy_rules() {
         config,
         auth_manager,
         models_manager,
+        subagent_models_manager,
         skills_manager,
         plugins_manager,
         mcp_manager,

codex-rs/core/src/config/config_tests.rs

@@ -4245,6 +4245,7 @@ fn test_precedence_fixture_with_o3_profile() -> std::io::Result<()> {
             model_reasoning_summary: Some(ReasoningSummary::Detailed),
             model_supports_reasoning_summaries: None,
             model_catalog: None,
+            subagent_model_catalog: None,
             model_verbosity: None,
             personality: Some(Personality::Pragmatic),
             chatgpt_base_url: "https://chatgpt.com/backend-api/".to_string(),
@@ -4384,6 +4385,7 @@ fn test_precedence_fixture_with_gpt3_profile() -> std::io::Result<()> {
         model_reasoning_summary: None,
         model_supports_reasoning_summaries: None,
         model_catalog: None,
+        subagent_model_catalog: None,
         model_verbosity: None,
         personality: Some(Personality::Pragmatic),
         chatgpt_base_url: "https://chatgpt.com/backend-api/".to_string(),
@@ -4521,6 +4523,7 @@ fn test_precedence_fixture_with_zdr_profile() -> std::io::Result<()> {
         model_reasoning_summary: None,
         model_supports_reasoning_summaries: None,
         model_catalog: None,
+        subagent_model_catalog: None,
         model_verbosity: None,
         personality: Some(Personality::Pragmatic),
         chatgpt_base_url: "https://chatgpt.com/backend-api/".to_string(),
@@ -4644,6 +4647,7 @@ fn test_precedence_fixture_with_gpt5_profile() -> std::io::Result<()> {
         model_reasoning_summary: Some(ReasoningSummary::Detailed),
         model_supports_reasoning_summaries: None,
         model_catalog: None,
+        subagent_model_catalog: None,
         model_verbosity: Some(Verbosity::High),
         personality: Some(Personality::Pragmatic),
         chatgpt_base_url: "https://chatgpt.com/backend-api/".to_string(),

codex-rs/core/src/config/mod.rs

@@ -481,6 +481,10 @@ pub struct Config {
     /// When set, this replaces the bundled catalog for the current process.
     pub model_catalog: Option<ModelsResponse>,
 
+    /// Optional full subagent model catalog loaded from `subagent_model_catalog_json`.
+    /// When set, this replaces the catalog used for spawn_agent model description generation.
+    pub subagent_model_catalog: Option<ModelsResponse>,
+
     /// Optional verbosity control for GPT-5 models (Responses API `text.verbosity`).
     pub model_verbosity: Option<Verbosity>,
 
@@ -1372,6 +1376,10 @@ pub struct ConfigToml {
     /// Per-thread `config` overrides are accepted but do not reapply this (no-ops).
     pub model_catalog_json: Option<AbsolutePathBuf>,
 
+    /// Optional path to a JSON subagent model catalog (applied on startup only).
+    /// Per-thread `config` overrides are accepted but do not reapply this (no-ops).
+    pub subagent_model_catalog_json: Option<AbsolutePathBuf>,
+
     /// Optionally specify a personality for the model
     pub personality: Option<Personality>,
 
@@ -2530,6 +2538,12 @@ impl Config {
                 .clone()
                 .or(cfg.model_catalog_json.clone()),
         )?;
+        let subagent_model_catalog = load_model_catalog(
+            config_profile
+                .subagent_model_catalog_json
+                .clone()
+                .or(cfg.subagent_model_catalog_json.clone()),
+        )?;
 
         let log_dir = cfg
             .log_dir
@@ -2702,6 +2716,7 @@ impl Config {
                 .or(cfg.model_reasoning_summary),
             model_supports_reasoning_summaries: cfg.model_supports_reasoning_summaries,
             model_catalog,
+            subagent_model_catalog,
             model_verbosity: config_profile.model_verbosity.or(cfg.model_verbosity),
             chatgpt_base_url: config_profile
                 .chatgpt_base_url

codex-rs/core/src/config/profile.rs

@@ -34,6 +34,8 @@ pub struct ConfigProfile {
     pub model_verbosity: Option<Verbosity>,
     /// Optional path to a JSON model catalog (applied on startup only).
     pub model_catalog_json: Option<AbsolutePathBuf>,
+    /// Optional path to a JSON subagent model catalog (applied on startup only).
+    pub subagent_model_catalog_json: Option<AbsolutePathBuf>,
     pub personality: Option<Personality>,
     pub chatgpt_base_url: Option<String>,
     /// Optional path to a file containing model instructions.

codex-rs/core/src/state/service.rs

@@ -47,6 +47,7 @@ pub(crate) struct SessionServices {
     pub(crate) exec_policy: ExecPolicyManager,
     pub(crate) auth_manager: Arc<AuthManager>,
     pub(crate) models_manager: Arc<ModelsManager>,
+    pub(crate) subagent_models_manager: Arc<ModelsManager>,
     pub(crate) session_telemetry: SessionTelemetry,
     pub(crate) tool_approvals: Mutex<ApprovalStore>,
     #[cfg_attr(not(unix), allow(dead_code))]

codex-rs/core/src/thread_manager.rs

@@ -152,6 +152,7 @@ pub(crate) struct ThreadManagerState {
     thread_created_tx: broadcast::Sender<ThreadId>,
     auth_manager: Arc<AuthManager>,
     models_manager: Arc<ModelsManager>,
+    subagent_models_manager: Arc<ModelsManager>,
     skills_manager: Arc<SkillsManager>,
     plugins_manager: Arc<PluginsManager>,
     mcp_manager: Arc<McpManager>,
@@ -183,17 +184,30 @@ impl ThreadManager {
             config.bundled_skills_enabled(),
         ));
         let file_watcher = build_file_watcher(codex_home.clone(), Arc::clone(&skills_manager));
+        let models_manager = Arc::new(ModelsManager::new_with_provider(
+            codex_home.clone(),
+            auth_manager.clone(),
+            config.model_catalog.clone(),
+            collaboration_modes_config,
+            openai_models_provider.clone(),
+        ));
+
+        let subagent_models_manager = match config.subagent_model_catalog.clone() {
+            Some(subagent_model_catalog) => Arc::new(ModelsManager::new_with_provider(
+                codex_home,
+                auth_manager.clone(),
+                Some(subagent_model_catalog),
+                collaboration_modes_config,
+                openai_models_provider,
+            )),
+            None => Arc::clone(&models_manager),
+        };
         Self {
             state: Arc::new(ThreadManagerState {
                 threads: Arc::new(RwLock::new(HashMap::new())),
                 thread_created_tx,
-                models_manager: Arc::new(ModelsManager::new_with_provider(
-                    codex_home,
-                    auth_manager.clone(),
-                    config.model_catalog.clone(),
-                    collaboration_modes_config,
-                    openai_models_provider,
-                )),
+                models_manager,
+                subagent_models_manager,
                 skills_manager,
                 plugins_manager,
                 mcp_manager,
@@ -244,15 +258,18 @@ impl ThreadManager {
             /*bundled_skills_enabled*/ true,
         ));
         let file_watcher = build_file_watcher(codex_home.clone(), Arc::clone(&skills_manager));
+        let models_manager = Arc::new(ModelsManager::with_provider_for_tests(
+            codex_home,
+            auth_manager.clone(),
+            provider,
+        ));
+        let subagent_models_manager = Arc::clone(&models_manager);
         Self {
             state: Arc::new(ThreadManagerState {
                 threads: Arc::new(RwLock::new(HashMap::new())),
                 thread_created_tx,
-                models_manager: Arc::new(ModelsManager::with_provider_for_tests(
-                    codex_home,
-                    auth_manager.clone(),
-                    provider,
-                )),
+                models_manager,
+                subagent_models_manager,
                 skills_manager,
                 plugins_manager,
                 mcp_manager,
@@ -290,6 +307,10 @@ impl ThreadManager {
         self.state.models_manager.clone()
     }
 
+    pub fn get_subagent_models_manager(&self) -> Arc<ModelsManager> {
+        self.state.subagent_models_manager.clone()
+    }
+
     pub async fn list_models(
         &self,
         refresh_strategy: crate::models_manager::manager::RefreshStrategy,
@@ -300,6 +321,16 @@ impl ThreadManager {
             .await
     }
 
+    pub async fn list_subagent_models(
+        &self,
+        refresh_strategy: crate::models_manager::manager::RefreshStrategy,
+    ) -> Vec<ModelPreset> {
+        self.state
+            .subagent_models_manager
+            .list_models(refresh_strategy)
+            .await
+    }
+
     pub fn list_collaboration_modes(&self) -> Vec<CollaborationModeMask> {
         self.state.models_manager.list_collaboration_modes()
     }
@@ -743,6 +774,7 @@ impl ThreadManagerState {
             config,
             auth_manager,
             models_manager: Arc::clone(&self.models_manager),
+            subagent_models_manager: Arc::clone(&self.subagent_models_manager),
             skills_manager: Arc::clone(&self.skills_manager),
             plugins_manager: Arc::clone(&self.plugins_manager),
             mcp_manager: Arc::clone(&self.mcp_manager),

codex-rs/core/src/tools/handlers/multi_agents.rs

@@ -333,13 +333,13 @@ async fn apply_requested_spawn_agent_model_overrides(
     if let Some(requested_model) = requested_model {
         let available_models = session
             .services
-            .models_manager
+            .subagent_models_manager
             .list_models(RefreshStrategy::Offline)
             .await;
         let selected_model_name = find_spawn_agent_model_name(&available_models, requested_model)?;
         let selected_model_info = session
             .services
-            .models_manager
+            .subagent_models_manager
             .get_model_info(&selected_model_name, config)
             .await;
 

codex-rs/core/src/tools/spec.rs

@@ -255,7 +255,7 @@ impl UnifiedExecShellMode {
 
 #[derive(Debug, Clone)]
 pub(crate) struct ToolsConfig {
-    pub available_models: Vec<ModelPreset>,
+    pub available_subagent_models: Vec<ModelPreset>,
     pub shell_type: ConfigShellToolType,
     shell_command_backend: ShellCommandBackendConfig,
     pub unified_exec_shell_mode: UnifiedExecShellMode,
@@ -286,7 +286,7 @@ pub(crate) struct ToolsConfig {
 
 pub(crate) struct ToolsConfigParams<'a> {
     pub(crate) model_info: &'a ModelInfo,
-    pub(crate) available_models: &'a Vec<ModelPreset>,
+    pub(crate) available_subagent_models: &'a Vec<ModelPreset>,
     pub(crate) features: &'a Features,
     pub(crate) web_search_mode: Option<WebSearchMode>,
     pub(crate) session_source: SessionSource,
@@ -311,7 +311,7 @@ impl ToolsConfig {
     pub fn new(params: &ToolsConfigParams) -> Self {
         let ToolsConfigParams {
             model_info,
-            available_models: available_models_ref,
+            available_subagent_models: available_subagent_models_ref,
             features,
             web_search_mode,
             session_source,
@@ -387,7 +387,7 @@ impl ToolsConfig {
             );
 
         Self {
-            available_models: available_models_ref.to_vec(),
+            available_subagent_models: available_subagent_models_ref.to_vec(),
             shell_type,
             shell_command_backend,
             unified_exec_shell_mode: UnifiedExecShellMode::Direct,
@@ -1037,7 +1037,8 @@ fn create_collab_input_items_schema() -> JsonSchema {
 }
 
 fn create_spawn_agent_tool(config: &ToolsConfig) -> ToolSpec {
-    let available_models_description = spawn_agent_models_description(&config.available_models);
+    let available_subagent_models_description =
+        spawn_agent_models_description(&config.available_subagent_models);
     let properties = BTreeMap::from([
         (
             "message".to_string(),
@@ -1095,7 +1096,7 @@ fn create_spawn_agent_tool(config: &ToolsConfig) -> ToolSpec {
         Agent-role guidance below only helps choose which agent to use after spawning is already authorized; it never authorizes spawning by itself.
         Spawn a sub-agent for a well-scoped task. Returns the agent id (and user-facing nickname when available) to use to communicate with this agent. This spawn_agent tool provides you access to smaller but more efficient sub-agents. A mini model can solve many tasks faster than the main model. You should follow the rules and guidelines below to use this tool.
 
-{available_models_description}
+{available_subagent_models_description}
 ### When to delegate vs. do the subtask yourself
 - First, quickly analyze the overall user task and form a succinct high-level plan. Identify which tasks are immediate blockers on the critical path, and which tasks are sidecar tasks that are needed but can run in parallel without blocking the next local step. As part of that plan, explicitly decide what immediate task you should do locally right now. Do this planning step before delegating to agents so you do not hand off the immediate blocking task to a submodel and then waste time waiting on it.
 - Use the smaller subagent when a subtask is easy enough for it to handle and can run in parallel with your local work. Prefer delegating concrete, bounded sidecar tasks that materially advance the main task without blocking your immediate next local step.

codex-rs/core/src/tools/spec_tests.rs

@@ -398,7 +398,7 @@ fn model_provided_unified_exec_is_blocked_for_windows_sandboxed_policies() {
     let available_models = Vec::new();
     let config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -422,7 +422,7 @@ fn test_full_toolset_specs_for_gpt5_codex_unified_exec_web_search() {
     let available_models = Vec::new();
     let config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Live),
         session_source: SessionSource::Cli,
@@ -501,7 +501,7 @@ fn test_build_specs_collab_tools_enabled() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -526,7 +526,7 @@ fn test_build_specs_enable_fanout_enables_agent_jobs_and_collab_tools() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -556,7 +556,7 @@ fn view_image_tool_omits_detail_without_original_detail_feature() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -585,7 +585,7 @@ fn view_image_tool_includes_detail_with_original_detail_feature() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -622,7 +622,7 @@ fn test_build_specs_artifact_tool_enabled() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -644,7 +644,7 @@ fn test_build_specs_agent_job_worker_tools_enabled() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::SubAgent(SubAgentSource::Other(
@@ -677,7 +677,7 @@ fn request_user_input_description_reflects_default_mode_feature_flag() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -695,7 +695,7 @@ fn request_user_input_description_reflects_default_mode_feature_flag() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -720,7 +720,7 @@ fn request_permissions_requires_feature_flag() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -735,7 +735,7 @@ fn request_permissions_requires_feature_flag() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -759,7 +759,7 @@ fn request_permissions_tool_is_independent_from_additional_permissions() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -780,7 +780,7 @@ fn get_memory_requires_feature_flag() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -803,7 +803,7 @@ fn js_repl_requires_feature_flag() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -832,7 +832,7 @@ fn js_repl_enabled_adds_tools() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -858,7 +858,7 @@ fn image_generation_tools_require_feature_and_supported_model() {
     let available_models = Vec::new();
     let default_tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &supported_model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &default_features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -875,7 +875,7 @@ fn image_generation_tools_require_feature_and_supported_model() {
 
     let supported_tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &supported_model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &image_generation_features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -895,7 +895,7 @@ fn image_generation_tools_require_feature_and_supported_model() {
 
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &unsupported_model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &image_generation_features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -937,7 +937,7 @@ fn assert_model_tools(
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features,
         web_search_mode,
         session_source: SessionSource::Cli,
@@ -986,7 +986,7 @@ fn web_search_mode_cached_sets_external_web_access_false() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -1017,7 +1017,7 @@ fn web_search_mode_live_sets_external_web_access_true() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Live),
         session_source: SessionSource::Cli,
@@ -1061,7 +1061,7 @@ fn web_search_config_is_forwarded_to_tool_spec() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Live),
         session_source: SessionSource::Cli,
@@ -1099,7 +1099,7 @@ fn web_search_tool_type_text_and_image_sets_search_content_types() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Live),
         session_source: SessionSource::Cli,
@@ -1134,7 +1134,7 @@ fn mcp_resource_tools_are_hidden_without_mcp_servers() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -1160,7 +1160,7 @@ fn mcp_resource_tools_are_included_when_mcp_servers_are_present() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -1400,7 +1400,7 @@ fn test_build_specs_default_shell_present() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Live),
         session_source: SessionSource::Cli,
@@ -1428,7 +1428,7 @@ fn shell_zsh_fork_prefers_shell_command_over_unified_exec() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Live),
         session_source: SessionSource::Cli,
@@ -1490,7 +1490,7 @@ fn test_parallel_support_flags() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -1520,7 +1520,7 @@ fn test_test_model_info_includes_sync_tool() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -1556,7 +1556,7 @@ fn test_build_specs_mcp_tools_converted() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Live),
         session_source: SessionSource::Cli,
@@ -1649,7 +1649,7 @@ fn test_build_specs_mcp_tools_sorted_by_name() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -1697,7 +1697,7 @@ fn search_tool_description_lists_each_codex_apps_connector_once() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -1839,7 +1839,7 @@ fn search_tool_requires_model_capability_only() {
             supports_search_tool: false,
             ..model_info.clone()
         },
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -1851,7 +1851,7 @@ fn search_tool_requires_model_capability_only() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -1870,7 +1870,7 @@ fn tool_suggest_is_not_registered_without_feature_flag() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -1905,7 +1905,7 @@ fn search_tool_description_handles_no_enabled_apps() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -1931,7 +1931,7 @@ fn search_tool_description_falls_back_to_connector_name_without_description() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -1979,7 +1979,7 @@ fn search_tool_registers_namespaced_app_tool_aliases() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -2045,7 +2045,7 @@ fn tool_suggest_description_lists_discoverable_tools() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -2126,7 +2126,7 @@ fn test_mcp_tool_property_missing_type_defaults_to_string() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -2186,7 +2186,7 @@ fn test_mcp_tool_integer_normalized_to_number() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -2243,7 +2243,7 @@ fn test_mcp_tool_array_without_items_gets_default_string_items() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -2302,7 +2302,7 @@ fn test_mcp_tool_anyof_defaults_to_string() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -2499,7 +2499,7 @@ fn test_get_openai_tools_mcp_tools_with_additional_properties_schema() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -2610,7 +2610,7 @@ fn code_mode_augments_builtin_tool_descriptions_with_typed_sample() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -2641,7 +2641,7 @@ fn code_mode_augments_mcp_tool_descriptions_with_namespaced_sample() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -2707,7 +2707,7 @@ fn code_mode_only_exec_description_includes_full_nested_tool_details() {
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,
@@ -2739,7 +2739,7 @@ fn code_mode_exec_description_omits_nested_tool_details_when_not_code_mode_only(
     let available_models = Vec::new();
     let tools_config = ToolsConfig::new(&ToolsConfigParams {
         model_info: &model_info,
-        available_models: &available_models,
+        available_subagent_models: &available_models,
         features: &features,
         web_search_mode: Some(WebSearchMode::Cached),
         session_source: SessionSource::Cli,