minimal-agent 0.8.2 → 0.10.0

package/src/tools/webfetch/webfetch.js

@@ -313,5 +313,6 @@ export const webfetchTool = {
     isReadOnly: true,
     isConcurrencySafe: true,
     maxResultSizeChars: DEFAULT_MAX_RESULT_SIZE_CHARS,
+    interruptBehavior: () => 'cancel',
     call,
 };

package/src/tools/websearch/websearch.js

@@ -3,6 +3,8 @@
  *  src/tools/websearch.ts —— WebSearch 工具（联网搜索）
  * ------------------------------------------------------------
  *  底层调用 Tavily Search API（https://tavily.com/）。
+ *  发请求带退避重试（见下「4b. 退避重试」）：并发突发 + dev/免费 key 被前端切 socket
+ *  的瞬态不再直接当失败喂回 LLM。次数由 TAVILY_MAX_RETRIES 控（默认 3）。
  *
  *  为什么选 Tavily：
  *    - LLM 友好：返回结构化 JSON，自带 content 摘要；不用我们再去抓 HTML
@@ -11,7 +13,7 @@
  *
  *  Key 配置：
  *    在项目根 .env 里加：
- *      TAVILY_API_KEY=tvly-xxxxxxxxxxxxxxxx
+ *      TAVILY_API_KEY=
  *    没设的话，工具会返回友好错误（不影响 agent 启动）。
  *
  *  输入：
@@ -29,6 +31,7 @@
  * ============================================================
  */
 import { z } from 'zod';
+import { configService } from '../../config/configService.js';
 import { DEFAULT_MAX_RESULT_SIZE_CHARS } from '../types.js';
 import { toToolParameters } from '../../utils/zodToJson.js';
 // ---------------- 1. Zod 输入 schema ----------------
@@ -62,17 +65,126 @@ const description = `- Searches the public web via the Tavily Search API and ret
 - Returns the top N results, each with a title, URL, and content snippet. With \`search_depth: "advanced"\` Tavily also returns a synthesized answer at the top.
 - Prefer specific natural-language queries over keyword soup (e.g. "how does Bun handle .env files in version 1.1").
 - Requires the TAVILY_API_KEY environment variable to be set; if missing the tool returns a friendly error.`;
+// ---------------- 4b. 退避重试 ----------------
+//
+// 为什么需要（与单发 fetch 零重试的旧行为对比）：WebSearch 是 isConcurrencySafe 工具，
+// 主循环把同一轮的多个 WebSearch 调用 **并行**发火（loop.ts，Promise.all）。研究类
+// prompt 又常让模型「围绕 3–6 个子问题分别检索」——于是一瞬间 3~6 条连接同时打向
+// 同一个 Tavily key。dev / 免费 ティア 的并发/速率上限被触发时，CDN 前端常**直接切断
+// socket** 而非返回干净的 429（错误落进 fetch 的 catch：「socket connection closed
+// unexpectedly」）。旧代码单发 fetch、零重试，这类瞬态会被直接当失败喂回 LLM ——
+// 表现为「突然连续搜索失败，但单发检索仍通」。
+//
+// 对策与 llm/client.ts 的自适应退避同思想（本地、有界、带抖动）：
+//   可重试：fetch 抛错（socket 切断/超时）+ HTTP 429 + 5xx（尊重 Retry-After）。
+//   不重试：用户中断（signal）、其它 4xx（401 key 错 / 400 参数错，重试无意义）、
+//           JSON 解析失败（body 已到、重发大概率同样坏）。
+//   次数：默认 3 次重试（共 4 次尝试），可用 TAVILY_MAX_RETRIES 覆盖。
+//   抖动：±15% 把并发重试**散开**，避免落 socket 的几条同时再殺到、又一起被切。
+const TAVILY_ENDPOINT = 'https://api.tavily.com/search';
+function tavilyMaxRetries() {
+    const n = Number(process.env.TAVILY_MAX_RETRIES);
+    return Number.isFinite(n) && n >= 0 ? Math.floor(n) : 3;
+}
+/** 退避时长（ms）：优先 Retry-After；否则指数 500·2^n 封顶 8s，再叠 ±15% 抖动。 */
+function backoffDelayMs(attempt, retryAfterMs) {
+    if (retryAfterMs && retryAfterMs > 0)
+        return Math.min(retryAfterMs, 15000);
+    const capped = Math.min(500 * 2 ** attempt, 8000);
+    return Math.round(capped * (0.85 + Math.random() * 0.3));
+}
+/** Retry-After 头解析（秒数 或 HTTP-date）→ ms；无法解析返回 undefined。 */
+function parseRetryAfter(h) {
+    if (!h)
+        return undefined;
+    const secs = Number(h);
+    if (Number.isFinite(secs))
+        return Math.max(0, secs * 1000);
+    const at = Date.parse(h);
+    return Number.isNaN(at) ? undefined : Math.max(0, at - Date.now());
+}
+/** 可中断退避：signal abort 时立即 resolve（让外层据 signal 收口，不在这里抛）。 */
+function sleep(ms, signal) {
+    return new Promise((resolve) => {
+        if (signal?.aborted)
+            return resolve();
+        const onAbort = () => {
+            clearTimeout(timer);
+            resolve();
+        };
+        const timer = setTimeout(() => {
+            signal?.removeEventListener('abort', onAbort);
+            resolve();
+        }, ms);
+        signal?.addEventListener('abort', onAbort, { once: true });
+    });
+}
+/** 发 Tavily 请求并按上述策略重试。成功返回已解析的 data，失败返回 friendly error。 */
+async function fetchTavilyWithRetry(body, signal) {
+    const maxRetries = tavilyMaxRetries();
+    let lastErr = '';
+    for (let attempt = 0; attempt <= maxRetries; attempt++) {
+        if (signal?.aborted)
+            return { ok: false, error: '搜索已被中断' };
+        let res;
+        try {
+            res = await fetch(TAVILY_ENDPOINT, {
+                method: 'POST',
+                headers: { 'content-type': 'application/json' },
+                body: JSON.stringify(body),
+                signal,
+            });
+        }
+        catch (e) {
+            if (signal?.aborted)
+                return { ok: false, error: '搜索已被中断' };
+            lastErr = `调用 Tavily 失败（网络）：${e.message}`;
+            if (attempt < maxRetries) {
+                await sleep(backoffDelayMs(attempt), signal);
+                continue;
+            }
+            break;
+        }
+        // 429 / 5xx：服务端瞬态（限流 / 过载 / 切 socket 后偶发的 5xx）→ 可重试
+        if (res.status === 429 || res.status >= 500) {
+            const text = await res.text().catch(() => '');
+            lastErr = `Tavily HTTP ${res.status}：${text.slice(0, 300)}`;
+            if (attempt < maxRetries) {
+                const wait = backoffDelayMs(attempt, parseRetryAfter(res.headers.get('retry-after')));
+                await sleep(wait, signal);
+                continue;
+            }
+            break;
+        }
+        // 其它 4xx（401 key 无效 / 400 参数错…）：重试无意义，立即返回
+        if (!res.ok) {
+            const text = await res.text().catch(() => '');
+            return { ok: false, error: `Tavily HTTP ${res.status}：${text.slice(0, 500)}` };
+        }
+        // 解析 JSON（坏响应不重试——body 已到、重发大概率同样坏）
+        try {
+            const data = (await res.json());
+            return { ok: true, data };
+        }
+        catch (e) {
+            return { ok: false, error: `Tavily 响应不是合法 JSON：${e.message}` };
+        }
+    }
+    return {
+        ok: false,
+        error: `${lastErr}（已重试 ${maxRetries} 次仍失败——并发突发下 dev/免费 key 易被前端切 socket；` +
+            `可减少同轮并发检索数、调大 TAVILY_MAX_RETRIES，或升级 Tavily key）`,
+    };
+}
 // ---------------- 5. call() ----------------
-async function call(input, signal) {
+async function call(input, signal, getApiKey = async () => (await configService.tool('webSearch'))?.apiKey) {
     // 5a. 取 key
-    const apiKey = process.env.TAVILY_API_KEY;
+    const apiKey = await getApiKey();
     if (!apiKey) {
         return {
             ok: false,
-            error: 'WebSearch 不可用：环境变量 TAVILY_API_KEY 未设置。\n' +
-                '请在项目根 .env 里加：\n' +
-                '  TAVILY_API_KEY=tvly-你的key\n' +
-                '免费 key 申请：https://tavily.com/',
+            error: 'WebSearch 不可用：尚未配置 Tavily API Key。\n' +
+                '请在 KakadeAI 设置 → 工具 → 联网搜索中配置，或在 env 模式提供 TAVILY_API_KEY。',
         };
     }
     // 5b. 自动追加当前日期到 query（强制时间限制，防止搜索到过时信息）
@@ -89,40 +201,12 @@ async function call(input, signal) {
         // 让 advanced 模式自动给 answer；basic 不会有
         include_answer: input.search_depth === 'advanced',
     };
-    // 5c. 发请求
-    let res;
-    try {
-        res = await fetch('https://api.tavily.com/search', {
-            method: 'POST',
-            headers: { 'content-type': 'application/json' },
-            body: JSON.stringify(body),
-            signal,
-        });
-    }
-    catch (e) {
-        return {
-            ok: false,
-            error: `调用 Tavily 失败（网络）：${e.message}`,
-        };
-    }
-    if (!res.ok) {
-        const text = await res.text().catch(() => '');
-        return {
-            ok: false,
-            error: `Tavily HTTP ${res.status}：${text.slice(0, 500)}`,
-        };
-    }
-    // 5d. 解析
-    let data;
-    try {
-        data = (await res.json());
-    }
-    catch (e) {
-        return {
-            ok: false,
-            error: `Tavily 响应不是合法 JSON：${e.message}`,
-        };
-    }
+    // 5c. 发请求（带退避重试，吸收 dev/免费 key 在并发突发下的 socket 切断 + 429/5xx）
+    const fetched = await fetchTavilyWithRetry(body, signal);
+    if (!fetched.ok)
+        return { ok: false, error: fetched.error };
+    const data = fetched.data;
+    // 5d. 取结果
     const results = data.results ?? [];
     if (results.length === 0) {
         return {
@@ -149,13 +233,12 @@ async function call(input, signal) {
     return { ok: true, content };
 }
 // ---------------- 6. 导出 ----------------
-export const webSearchTool = {
-    name: 'WebSearch',
-    description,
-    inputSchema,
-    parameters,
-    isReadOnly: true,
-    isConcurrencySafe: true,
-    maxResultSizeChars: DEFAULT_MAX_RESULT_SIZE_CHARS,
-    call,
-};
+export function createWebSearchTool(getApiKey = async () => (await configService.tool('webSearch'))?.apiKey) {
+    return {
+        name: 'WebSearch', description, inputSchema, parameters, isReadOnly: true,
+        isConcurrencySafe: true, maxResultSizeChars: DEFAULT_MAX_RESULT_SIZE_CHARS,
+        interruptBehavior: () => 'cancel',
+        call: (input, signal) => call(input, signal, getApiKey),
+    };
+}
+export const webSearchTool = createWebSearchTool();

package/src/tools/write/write.js

@@ -129,5 +129,6 @@ export const writeTool = {
     isReadOnly: false,
     isConcurrencySafe: false,
     maxResultSizeChars: DEFAULT_MAX_RESULT_SIZE_CHARS,
+    interruptBehavior: () => 'block',
     call,
 };

package/src/ui/App.js

@@ -10,15 +10,26 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useDeferredValue } from 'react';
 import { Box, Text } from 'ink';
 import { getWorkingDir } from '../bootstrap/workingDir.js';
+import { ConfigMenu } from '../cli/configMenu.js';
+import { configService } from '../config/configService.js';
 import { listArchives, restoreArchive } from '../context/archive.js';
 import { saveContext } from '../context/persistContext.js';
 import { sessionFileFor } from '../context/sessionPath.js';
-import { listSessions } from '../context/sessionRegistry.js';
+import { workspaceIndexService } from '../context/workspaceIndex.js';
+import { createSession, listSessionSummaries, updateSessionMetadata, } from '../context/sessionRegistry.js';
+import { activatePlugins } from '../plugins/pluginLifecycle.js';
+import { runAgentTurn } from '../session/runAgentTurn.js';
+import { runAdvisor } from '../tools/advisor/advisor.js';
 import { AskQuestion } from './AskQuestion.js';
 import { InputBox } from './InputBox.js';
 import { LiveArea } from './LiveArea.js';
+import { QueuedMessagesBanner } from './QueuedMessagesBanner.js';
 import { MessageList } from './MessageList.js';
+import { ModelPicker } from './ModelPicker.js';
+import { SessionPicker } from './SessionPicker.js';
+import { WorkspacePicker } from './WorkspacePicker.js';
 import { StatusLine } from './StatusLine.js';
+import { theme } from './theme.js';
 import { useChat } from './hooks/useChat.js';
 import { useTerminalSize } from './hooks/useTerminalSize.js';
 /**
@@ -33,6 +44,13 @@ import { useTerminalSize } from './hooks/useTerminalSize.js';
  * 走 Ink 渲染管线，否则会破坏 log-update 计数。
  */
 const CLEAR_SCREEN = '\x1b[2J\x1b[H';
+function formatProviderName(apiFormat) {
+    if (apiFormat === 'anthropic')
+        return 'Anthropic';
+    if (apiFormat === 'openai')
+        return 'OpenAI兼容';
+    return apiFormat;
+}
 export function App({ provider, initialHistory }) {
     // v2 multi-session：持久化路径完全由 useChat 内部管控（按 activeSessionId 选文件）。
     // App 不再传 onPersist —— 之前 App 端调 saveContext(messages) 会污染 default session。
@@ -44,6 +62,27 @@ export function App({ provider, initialHistory }) {
     // 终端尺寸感知：rows → MessageList 决定窄终端是否折叠 reasoning + LiveArea 收敛预览高；
     //                cols → LiveArea 逐行截断防换行
     const { rows: terminalRows, cols: terminalCols } = useTerminalSize();
+    React.useEffect(() => {
+        const controller = new AbortController();
+        let cleanup;
+        void activatePlugins({
+            provider,
+            signal: controller.signal,
+            runAgentTurn,
+        }).then((fn) => {
+            if (controller.signal.aborted) {
+                fn();
+                return;
+            }
+            cleanup = fn;
+        }).catch((err) => {
+            console.warn(`[minimal-agent] plugin activation failed: ${err instanceof Error ? err.message : String(err)}`);
+        });
+        return () => {
+            controller.abort();
+            cleanup?.();
+        };
+    }, [provider]);
     /**
      * 用 useDeferredValue 把 history 推后到低优先级渲染队列。
      *
@@ -73,6 +112,88 @@ export function App({ provider, initialHistory }) {
     React.useEffect(() => {
         historyRef.current = chat.history;
     }, [chat.history]);
+    // /session /sessions /resume（裸命令）打开的选择器数据；非 null 时顶替 InputBox。
+    // 纯本地 UI 态，不需要塞进 useChat——不像 pendingAsk 那样由 askBridge 从外部注入，
+    // 这里完全由 handleSubmit 自己的分支触发/清空。
+    const [sessionPicker, setSessionPicker] = React.useState(null);
+    const [workspacePicker, setWorkspacePicker] = React.useState(null);
+    // /config —— 硬编码菜单覆盖层，纯本地 UI 态（与 sessionPicker 同构）。
+    const [configMenuOpen, setConfigMenuOpen] = React.useState(false);
+    // /model —— 基座模型选择器；/advisor select —— 顾问模型选择器
+    const [baseModelPicker, setBaseModelPicker] = React.useState(null);
+    const [advisorModelPicker, setAdvisorModelPicker] = React.useState(null);
+    // 强制刷新计数，用于切换模型后触发 StatusLine 重渲染
+    const [, forceRerender] = React.useState(0);
+    const handleSessionSelect = React.useCallback(async (id) => {
+        setSessionPicker(null);
+        await chat.switchSession(id);
+        chat.ephemeralLine(`[/session] 已切换到 session "${id}"`);
+    }, [chat.switchSession, chat.ephemeralLine]);
+    const handleSessionCreate = React.useCallback(async (title) => {
+        setSessionPicker(null);
+        const summary = await createSession(getWorkingDir(), title ? { title } : {});
+        await chat.switchSession(summary.id);
+        chat.ephemeralLine(`[/session] 已新建并切换到 session "${summary.id}"（${summary.title}）`);
+    }, [chat.switchSession, chat.ephemeralLine]);
+    const openWorkspacePicker = React.useCallback(async () => {
+        if (chat.isLoading)
+            return;
+        setSessionPicker(null);
+        setConfigMenuOpen(false);
+        setWorkspacePicker(await workspaceIndexService.list());
+    }, [chat.isLoading]);
+    const handleWorkspaceSelect = React.useCallback(async (cwd, sessionId) => {
+        const switched = await chat.switchWorkspace(cwd, sessionId);
+        setWorkspacePicker(null);
+        if (switched) {
+            chat.ephemeralLine(`[/workspaces] 已切换到 ${cwd} · ${sessionId}`);
+        }
+    }, [chat.switchWorkspace, chat.ephemeralLine]);
+    const handleBaseModelSelect = React.useCallback(async (modelId) => {
+        setBaseModelPicker(null);
+        if (!modelId)
+            return;
+        const snap = await configService.getSnapshot();
+        const model = snap.config?.models.find((m) => m.id === modelId);
+        if (!model) {
+            chat.ephemeralLine(`[/model] 未找到模型 "${modelId}"`);
+            return;
+        }
+        const newProvider = await configService.providerForModel(modelId);
+        if (newProvider) {
+            await updateSessionMetadata(getWorkingDir(), chat.activeSessionId, { modelId });
+            chat.setProvider(newProvider);
+            forceRerender((v) => v + 1);
+            chat.ephemeralLine(`[/model] 当前 Session 已切换为 ${model.displayName || model.model}（${formatProviderName(model.apiFormat)}），下一轮对话生效。`);
+        }
+    }, [chat.activeSessionId, chat.setProvider, chat.ephemeralLine]);
+    React.useEffect(() => {
+        let cancelled = false;
+        void listSessionSummaries(getWorkingDir()).then(async (sessions) => {
+            const modelId = sessions.find((session) => session.id === chat.activeSessionId)?.modelId;
+            const provider = await configService.providerForModel(modelId ?? null)
+                ?? await configService.providerForModel(null);
+            if (!cancelled && provider)
+                chat.setProvider(provider);
+        }).catch(() => { });
+        return () => { cancelled = true; };
+    }, [chat.activeSessionId, chat.setProvider]);
+    const handleAdvisorModelSelect = React.useCallback(async (modelId) => {
+        setAdvisorModelPicker(null);
+        if (modelId === null) {
+            await configService.savePatch({ advisor: { modelId: null, enabled: false } });
+            chat.ephemeralLine('[/advisor] 已关闭顾问模型。');
+            return;
+        }
+        const snap = await configService.getSnapshot();
+        const model = snap.config?.models.find((m) => m.id === modelId);
+        if (!model) {
+            chat.ephemeralLine(`[/advisor] 未找到模型 "${modelId}"`);
+            return;
+        }
+        await configService.savePatch({ advisor: { modelId, enabled: true } });
+        chat.ephemeralLine(`[/advisor] 已设置顾问模型为 ${model.displayName || model.model}（${formatProviderName(model.apiFormat)}）。`);
+    }, [chat.ephemeralLine]);
     /**
      * v2 slash 命令拦截层。
      *
@@ -85,31 +206,36 @@ export function App({ provider, initialHistory }) {
      * previousLineCount 计数，下一帧 eraseLines 用过期 N 去清会留下脏行。
      *
      * 支持：
-     *   /session <name>   — 切到指定 session（同 cwd）
-     *   /sessions         — 列当前 cwd 下所有 session
+     *   /session /sessions /resume（裸命令）  — 列出当前 cwd 下所有 session，弹选择器
+     *   /session <id> /resume <id>            — 直接切换到指定 session
+     *   /session new [title]                  — 新建 session 并切过去
      *   /list-archive     — 列归档
      *   /restore <id>     — 恢复归档为当前 session 历史（覆盖+重读）
      *   /show <id-suffix> — 打印 tool_call_id 末尾匹配的完整 tool result
      */
     const handleSubmit = React.useCallback(async (text) => {
-        // /session <name>
-        if (text.startsWith('/session ')) {
-            const id = text.slice('/session '.length).trim();
-            if (id.length === 0) {
-                chat.ephemeralLine('[/session] 用法：/session <name>');
-                return;
-            }
-            await chat.switchSession(id);
-            chat.ephemeralLine(`[/session] 已切换到 session "${id}"`);
+        const trimmed = text.trim();
+        const isBareSessionCmd = trimmed === '/session' || trimmed === '/sessions' || trimmed === '/resume';
+        const sessionArgMatch = /^\/(?:session|resume)\s+(.+)$/.exec(trimmed);
+        if (trimmed === '/workspaces') {
+            await openWorkspacePicker();
             return;
         }
-        // /sessions
-        if (text.trim() === '/sessions') {
-            const ids = await listSessions(getWorkingDir());
-            const lines = ids
-                .map((id) => (id === chat.activeSessionId ? `* ${id}` : `  ${id}`))
-                .join('\n');
-            chat.ephemeralLine(`[/sessions] 当前 cwd 下的 session（* = 激活）：\n${lines}`);
+        if (isBareSessionCmd) {
+            const sessions = await listSessionSummaries(getWorkingDir());
+            setSessionPicker(sessions);
+            return;
+        }
+        if (sessionArgMatch) {
+            const arg = sessionArgMatch[1].trim();
+            // "new" 必须是独立词（后面跟空格或到此为止），避免 "/session newton" 被误
+            // 拆成 "new" + 标题 "ton"——真实 session id 恰好以 "new" 开头时会撞上。
+            if (arg === 'new' || arg.startsWith('new ')) {
+                const title = arg.slice('new'.length).trim();
+                await handleSessionCreate(title);
+                return;
+            }
+            await handleSessionSelect(arg);
             return;
         }
         // /list-archive
@@ -173,6 +299,99 @@ export function App({ provider, initialHistory }) {
             void chat.submit(`/workflow plan "${goal}"`);
             return;
         }
+        // /model —— 列出已配置的基座模型并切换选择器；/model <id> 直接切换
+        const modelArgMatch = /^\/model(?:\s+(.+))?$/.exec(trimmed);
+        if (modelArgMatch) {
+            const arg = modelArgMatch[1]?.trim();
+            const models = await configService.models();
+            const enabledModels = models.filter((m) => m.enabled && m.apiKey);
+            if (enabledModels.length === 0) {
+                chat.ephemeralLine('[/model] 尚未配置任何模型，请先通过 Desktop 设置或 /config 添加模型。');
+                return;
+            }
+            if (arg) {
+                // 直接切换到指定模型（支持精确匹配 id 或模糊匹配 displayName/model）
+                const target = enabledModels.find((m) => m.id === arg || m.model === arg || m.displayName === arg);
+                if (!target) {
+                    chat.ephemeralLine(`[/model] 未找到模型 "${arg}"，可用模型：\n${enabledModels.map((m) => `  ${m.id}  ·  ${m.displayName || m.model}`).join('\n')}`);
+                    return;
+                }
+                await handleBaseModelSelect(target.id);
+                return;
+            }
+            // 无参数：打开交互选择器
+            const currentSession = (await listSessionSummaries(getWorkingDir())).find((session) => session.id === chat.activeSessionId);
+            const snap = await configService.getSnapshot();
+            setBaseModelPicker({ models: enabledModels, currentId: currentSession?.modelId ?? snap.config?.baseModelId ?? null });
+            return;
+        }
+        // /advisor status|on|off|ask|select —— 与 Desktop 共用统一配置。
+        const advisorArgMatch = /^\/advisor(?:\s+(status|on|off|ask|select)(?:\s+([\s\S]*))?)?$/.exec(trimmed);
+        if (advisorArgMatch) {
+            const sub = advisorArgMatch[1] ?? 'status';
+            const note = advisorArgMatch[2]?.trim();
+            const advisor = await configService.advisor();
+            if (sub === 'status') {
+                if (!advisor) {
+                    chat.ephemeralLine('[/advisor] 未配置顾问模型，请在 Desktop 设置 → 模型中配置。');
+                }
+                else {
+                    chat.ephemeralLine(`[/advisor] ${advisor.provider.name}/${advisor.provider.model} · ${advisor.enabled ? '开启' : '关闭'} · ${advisor.mode === 'auto' ? '智能自动' : '仅手动'}。`);
+                }
+                return;
+            }
+            if (sub === 'on') {
+                if (!advisor) {
+                    chat.ephemeralLine('[/advisor] 未配置顾问模型，无法开启。');
+                }
+                else {
+                    await configService.savePatch({ advisor: { enabled: true } });
+                    chat.ephemeralLine(`[/advisor] 顾问模型已开启（${advisor.provider.name}/${advisor.provider.model}）。`);
+                }
+                return;
+            }
+            if (sub === 'off') {
+                if (advisor)
+                    await configService.savePatch({ advisor: { enabled: false } });
+                chat.ephemeralLine('[/advisor] 顾问模型已关闭。');
+                return;
+            }
+            if (sub === 'select') {
+                const models = await configService.models();
+                const enabledModels = models.filter((m) => m.enabled && m.apiKey);
+                if (enabledModels.length === 0) {
+                    chat.ephemeralLine('[/advisor] 尚未配置任何模型，请先添加模型。');
+                    return;
+                }
+                if (note) {
+                    // /advisor select <id> 直接指定模型
+                    const target = enabledModels.find((m) => m.id === note || m.model === note || m.displayName === note);
+                    if (!target) {
+                        chat.ephemeralLine(`[/advisor] 未找到模型 "${note}"，可用模型：\n${enabledModels.map((m) => `  ${m.id}  ·  ${m.displayName || m.model}`).join('\n')}`);
+                        return;
+                    }
+                    await configService.savePatch({ advisor: { modelId: target.id, enabled: true } });
+                    chat.ephemeralLine(`[/advisor] 已设置顾问模型为 ${target.displayName || target.model}（${formatProviderName(target.apiFormat)}）。`);
+                }
+                else {
+                    // 无参数：打开交互选择器（含"关闭"选项）
+                    const snap = await configService.getSnapshot();
+                    setAdvisorModelPicker({ models: enabledModels, currentId: snap.config?.advisor?.modelId ?? null });
+                }
+                return;
+            }
+            // sub === 'ask'（或无参数但有 note 文本）：立即请求顾问意见
+            const result = await runAdvisor({ ...(note ? { note } : {}) }, undefined, { history: historyRef.current, advisorCalls: { used: 0, max: 1 }, advisorInvocation: 'manual' });
+            chat.ephemeralLine(result.ok ? `[/advisor] 专家意见：\n${result.content}` : `[/advisor] ${result.error}`);
+            return;
+        }
+        // /config —— 硬编码配置菜单（取代旧版 LLM 驱动的 skills/config/SKILL.md）。
+        // 精确匹配，不接受多余文字（与 /advisor 等硬拦截命令同规则）。仅交互式 TUI
+        // 支持；-p 非交互模式没有 Ink 树可渲染菜单，此命令在那里就是普通聊天文本。
+        if (trimmed === '/config') {
+            setConfigMenuOpen(true);
+            return;
+        }
         // 非命令 → 走正常 LLM 流程
         void chat.submit(text);
     }, 
@@ -185,12 +404,20 @@ export function App({ provider, initialHistory }) {
         chat.switchSession,
         chat.activeSessionId,
         chat.submit,
+        chat.setProvider,
+        handleSessionSelect,
+        handleSessionCreate,
+        openWorkspacePicker,
+        handleBaseModelSelect,
+        handleAdvisorModelSelect,
     ]);
     // banner 改作为 Static items[0] 走 MessageList。原因：Ink 5 的 Static 约定
     // 它必须是兄弟节点中第一个，否则 above-sibling 会跟 Static commit 一起被重打
     // 到 stdout（实测看到 banner 反复打印 N 次）。
-    const bannerText = `minimal-agent  · ${provider.name}/${provider.model} · /new 清空 · /compact 压缩 · /exit 退出 · Ctrl+C 中断`;
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(MessageList, { history: deferredHistory, compactGeneration: chat.compactGeneration, bannerText: bannerText, terminalRows: terminalRows }), _jsxs(Box, { flexDirection: "column", width: Math.max(1, terminalCols - 1), children: [_jsx(LiveArea, { progressStage: chat.progressStage, reasoningPreview: chat.reasoningPreview, streamingText: chat.streamingText, runningTools: chat.runningTools, pluginProgress: chat.pluginProgress, terminalCols: terminalCols, terminalRows: terminalRows }), chat.error && (_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: "red", children: ["\u26A0 ", chat.error] }) })), chat.interrupted && (_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { color: "yellow", children: "\u26A1 \u64CD\u4F5C\u88AB\u7528\u6237\u4E2D\u65AD\uFF0C\u7B49\u5F85\u65B0\u7684\u4EFB\u52A1\u8F93\u5165..." }), _jsx(Text, { dimColor: true, children: "  \u8C03\u6574\u4E0A\u4E00\u6B21\u8BA1\u5212\uFF1A\u76F4\u63A5\u8BF4\u8C03\u6574\u5185\u5BB9 / \u91CD\u65B0\u8DD1 /plan \u76EE\u6807 / \u65B0\u4EFB\u52A1\u76F4\u63A5\u8BF4" })] })), chat.pendingAsk ? (_jsx(AskQuestion, { questions: chat.pendingAsk, onAnswer: chat.answerAsk, onCancel: chat.abort })) : (
+    // 使用 getCurrentProvider() 获取最新 provider（/model 切换后实时显示）
+    const currentProvider = chat.getCurrentProvider();
+    const bannerText = `minimal-agent  · ${currentProvider.name}/${currentProvider.model} · /model 切模型 · /advisor 专家 · /new 清空 · /compact 压缩 · /exit 退出 · Ctrl+C 中断`;
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(MessageList, { history: deferredHistory, compactGeneration: chat.compactGeneration, bannerText: bannerText, terminalRows: terminalRows }), _jsxs(Box, { flexDirection: "column", width: Math.max(1, terminalCols - 1), children: [_jsx(LiveArea, { progressStage: chat.progressStage, reasoningPreview: chat.reasoningPreview, streamingText: chat.streamingText, runningTools: chat.runningTools, pluginProgress: chat.pluginProgress, transientError: chat.transientError, terminalCols: terminalCols, terminalRows: terminalRows }), _jsx(QueuedMessagesBanner, { items: chat.queuedItems }), chat.error && (_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: theme.error, children: ["\u26A0 ", chat.error] }) })), chat.interrupted && (_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { color: theme.warning, children: "\u26A1 \u64CD\u4F5C\u88AB\u7528\u6237\u4E2D\u65AD\uFF0C\u7B49\u5F85\u65B0\u7684\u4EFB\u52A1\u8F93\u5165..." }), _jsx(Text, { dimColor: true, children: "  \u8C03\u6574\u4E0A\u4E00\u6B21\u8BA1\u5212\uFF1A\u76F4\u63A5\u8BF4\u8C03\u6574\u5185\u5BB9 / \u91CD\u65B0\u8DD1 /plan \u76EE\u6807 / \u65B0\u4EFB\u52A1\u76F4\u63A5\u8BF4" })] })), configMenuOpen ? (_jsx(ConfigMenu, { mode: "reconfigure", onDone: () => setConfigMenuOpen(false) })) : baseModelPicker ? (_jsx(ModelPicker, { models: baseModelPicker.models, currentModelId: baseModelPicker.currentId, title: "\u9009\u62E9\u57FA\u5EA7\u6A21\u578B", onSelect: handleBaseModelSelect, onCancel: () => setBaseModelPicker(null) })) : advisorModelPicker ? (_jsx(ModelPicker, { models: advisorModelPicker.models, currentModelId: advisorModelPicker.currentId, title: "\u9009\u62E9\u987E\u95EE\u6A21\u578B", nullOptionLabel: "\u25CB \u4E0D\u4F7F\u7528\u987E\u95EE\u6A21\u578B", onSelect: handleAdvisorModelSelect, onCancel: () => setAdvisorModelPicker(null) })) : workspacePicker ? (_jsx(WorkspacePicker, { workspaces: workspacePicker, currentPath: getWorkingDir(), currentSessionId: chat.activeSessionId, onSelect: handleWorkspaceSelect, onCancel: () => setWorkspacePicker(null) })) : sessionPicker ? (_jsx(SessionPicker, { sessions: sessionPicker, activeSessionId: chat.activeSessionId, onSelect: handleSessionSelect, onCreate: handleSessionCreate, onCancel: () => setSessionPicker(null) })) : chat.pendingAsk ? (_jsx(AskQuestion, { questions: chat.pendingAsk, source: chat.pendingAskSource, queuedCount: chat.pendingAskQueueCount, onAnswer: chat.answerAsk, onCancel: chat.cancelAsk })) : (
                     /* handleSubmit 包装做 slash 命令拦截，非命令透传 chat.submit */
-                    _jsx(InputBox, { onSubmit: handleSubmit, disabled: chat.isLoading, onAbort: chat.abort, onClear: handleClear, onCompact: chat.compactNow })), _jsx(StatusLine, { provider: provider, history: chat.history, pluginProgress: chat.pluginProgress })] })] }));
+                    _jsx(InputBox, { onSubmit: handleSubmit, disabled: chat.isLoading, onAbort: chat.abort, onClear: handleClear, onCompact: chat.compactNow, onWorkspaces: openWorkspacePicker })), _jsx(StatusLine, { provider: currentProvider, history: chat.history, pluginProgress: chat.pluginProgress, contextUsage: chat.contextUsage })] })] }));
 }