新增: F-01阶段6 AiChat模型下拉+override穿透

src-tauri/src/commands/ai/agentic.rs

@@ -119,6 +119,7 @@ pub(crate) async fn run_agentic_loop(
     max_iterations: usize,
     max_retries: usize,
     start_iteration: usize,
+    model_override: Option<String>,
 ) {
     // B-260615-09: generating 状态由 RAII guard 收敛复位(正常 exit 显式 reset;panic/异常 Drop 兜底)
     let mut guard = GeneratingGuard::new(session_arc.clone());
@@ -174,6 +175,17 @@ pub(crate) async fn run_agentic_loop(
     };
     let resolved_model = select_model_id(&agentic_req, &provider_config.model_configs)
         .unwrap_or_else(|| provider_config.default_model.clone());
+    // F-01 阶段6: 用户指定模型 override 穿透(仅主对话生效,标题/扫描/灵感仍走路由)。
+    // 兜底原则:override 非空且在该 provider model_configs 池中 → 用 override;否则用 resolved_model。
+    // 绝不让 override 导致无模型(空/不在池 → 落回路由结果,行为不变)。
+    let resolved_model = match model_override.as_deref() {
+        Some(id) if !id.is_empty()
+            && provider_config.model_configs.iter().any(|m| m.model_id == id) =>
+        {
+            id.to_string()
+        }
+        _ => resolved_model,
+    };
     let tool_defs = tools_arc.tool_definitions();
     // 停止信号副本：stream_llm 与每轮迭代共享读取，避免重复加锁
     // notify 同取一份 Arc 引用（B-260615-14）：stream_llm select! 监听 notified() 即时唤醒
@@ -684,6 +696,11 @@ pub(crate) async fn try_continue_agent_loop(app: &AppHandle, state: &AppState, s
     let max_iterations = state.agent_max_iterations.load(Ordering::SeqCst);
     // F-260616-07: 流式失败重试次数快照
     let max_retries = state.agent_max_retries.load(Ordering::SeqCst);
+    // F-01 阶段6: 续跑沿用同一主对话的 model_override(审批续跑/达 max 续跑保持一致)。
+    let model_override = {
+        let session = state.ai_session.lock().await;
+        session.model_override.clone()
+    };
 
     // 恢复循环前通知前端新建 assistant 消息：审批(通过/拒绝)后新一轮文本
     // 不应追加到发起工具调用的旧消息，用 AiAgentRound 隔开
@@ -693,6 +710,6 @@ pub(crate) async fn try_continue_agent_loop(app: &AppHandle, state: &AppState, s
     });
 
     tauri::async_runtime::spawn(async move {
-        run_agentic_loop(session_arc, tools_arc, db, app_handle, provider_config, system_prompt, conv_id, knowledge_config, llm_concurrency, max_iterations, max_retries, start_iteration).await;
+        run_agentic_loop(session_arc, tools_arc, db, app_handle, provider_config, system_prompt, conv_id, knowledge_config, llm_concurrency, max_iterations, max_retries, start_iteration, model_override).await;
     });
 }