mocode-ai 0.4.4 → 0.4.6

package/dist/repl/index.js

@@ -3,6 +3,7 @@ import { emitKeypressEvents } from 'node:readline';
 import { stdin, stdout } from 'node:process';
 import { config, updateModelConfig, isModelConfigured, updateMemoryConfig, isMemoryEnabled, buildBasePrompt, getPlanModeSuffix, } from '../config/index.js';
 import { updateConfigKey, writeConfigKeys, CONFIG_PATH } from '../config/file.js';
+import { deletePreset, getPreset, isValidPresetName, listPresets, migrateCurrentToPreset, savePreset, } from '../config/presets.js';
 import { runAgent } from '../agent/index.js';
 import { getAgentMode, setAgentMode, onModeChange } from '../agent/mode.js';
 import { togglePet, killPetProcess, listSkins, setSkin, sendState } from '../pet/bridge.js';
@@ -11,11 +12,13 @@ import { ui, setTheme, getTheme, listThemes, themeExists } from '../ui/theme.js'
 import { bannerString, displayWidth, padEndDisplay, summarizeToolCall, summarizeToolResult } from '../ui/render.js';
 import * as layout from '../ui/layout.js';
 import * as mouse from '../ui/mouse.js';
+import * as batch from '../ui/batch.js';
 import { promptWithSlashMenu, promptTurnPicker, promptSessionPicker, promptThemePicker, promptRevertChoice, } from '../ui/prompt.js';
 import { promptIntervention } from '../ui/intervention.js';
 import { tools } from '../tools/registry.js';
 import { estimateMessagesTokens, reconfigureClient, } from '../llm/index.js';
 import { loadImageAttachment, renderChip, MAX_INLINE_BYTES_DEFAULT, } from '../attachments/image.js';
+import { modelSupportsVision } from '../llm/capabilities.js';
 import { manualCompact, contextState, newSessionId, saveSession, loadSession, listSessions, } from '../session/index.js';
 import { listTurns, planRollback, applyRollback, persistSnapshots, loadSnapshots, rebuildFromHistory, resetState, } from '../rollback/index.js';
 import { listSkills, effectiveSystemPrompt, } from '../skills/index.js';
@@ -42,7 +45,10 @@ const SLASH_COMMANDS = [
     { name: '/reflect', desc: '手动触发后台记忆反思 pass(需先开启记忆)' },
     { name: '/init', desc: '扫描项目生成 MOCODE.md 项目记忆(需先开启记忆)' },
     { name: '/theme', desc: '切换颜色主题(↑↓·Enter)' },
-    { name: '/model', desc: '配置大模型(baseURL/key/model/窗口)' },
+    { name: '/model', desc: '配置新模型(向导);/model switch·list·delete 管理已配置预设' },
+    { name: '/model switch', desc: '↑↓·Enter 在已配置预设间切换' },
+    { name: '/model list', desc: '列出已经配置的模型' },
+    { name: '/model delete <name>', desc: '删除已配置的模型' },
     { name: '/plan', desc: '切到 plan 模式(只读探查+产出计划)' },
     { name: '/auto', desc: '切回 auto 模式(全工具执行)' },
     { name: '/pet', desc: '开关桌宠(独立悬浮窗,展示 agent 状态动画)' },
@@ -63,6 +69,9 @@ const MODEL_PRESETS = [
     { label: 'GLM(智谱)', baseURL: 'https://open.bigmodel.cn/api/v3', model: 'glm-4.6', window: 128000 },
     { label: 'DeepSeek', baseURL: 'https://api.deepseek.com', model: 'deepseek-chat', window: 64000 },
     { label: 'Qwen(阿里)', baseURL: 'https://dashscope.aliyuncs.com/compatible-mode/v1', model: 'qwen-plus', window: 128000 },
+    // MiniMax OpenAI 兼容端点(https://platform.minimax.io/docs/api-reference/text-openai-api)。
+    // MiniMax-M3 为唯一支持图片/视频输入的模型;M2 系列纯文本(见 llm/capabilities.ts KNOWN_TEXT_ONLY_PREFIXES)。
+    { label: 'MiniMax', baseURL: 'https://api.minimax.io/v1', model: 'MiniMax-M3', window: 1000000 },
     { label: '本地 Ollama', baseURL: 'http://localhost:11434/v1', model: 'qwen2.5:7b', window: 32768 },
     { label: '本地 vLLM', baseURL: 'http://localhost:8000/v1', model: 'default', window: 32768 },
     { label: '自定义 base_url', baseURL: '', model: '', window: 128000 },
@@ -418,19 +427,33 @@ function textOf(c) {
 }
 /**
  * 把会话历史渲染成静态文本进内容区(回滚 / 续接 / --resume 后复显上下文,仿 Claude Code):
- * user→❯ 回显、assistant→正文(+ tool_calls 作 ● 行)、tool→↳ 结果预览;system 跳过。
+ * user→❯ 回显、assistant→正文(+ tool_calls 折叠成 ● 摘要行)、tool→↳ 结果预览;system 跳过。
  * 思考段不持久(history 只存正文),故无思考折叠。渲染后续写位在末尾,紧接 enterInputMode 画输入框。
  * 内容长于屏时 viewport 显尾(最近轮次),PgUp 可看更早——与流式态一致。
  * user 多模态:用 textOf 取 text parts;若侧 channel messageAttachments 有原文件名则追加 chip 行
  * (避免 base64 解码不可逆,旧 session 没侧 channel 时只显文本,文件名 fallback 到 image/* mime)。
+ *
+ * 折叠策略:遇到 assistant + tool_calls 不立即打 ● 行,而是累积到 batchEntries;
+ * 跟随的连续 tool 消息按 tool_call_id 反查填 resultSummary;遇下一个非 tool 消息(或末尾)时,
+ * 用 batch.writeSummaryOnly 出单行摘要(与实时 runAgent 同一渲染器,UI 一致)。
+ * 回放默认全折叠;用户可鼠标点击摘要行展开(由 BatchRenderer 接管,见 ui/batch.ts)。
  */
 export function renderHistory(history) {
     const idToName = new Map();
+    // 当前累积的 batch(assistant.tool_calls + 后续 tool 消息);一旦遇到非 tool 消息即收尾出摘要
+    let pendingBatch = [];
+    const flushBatch = () => {
+        if (pendingBatch.length === 0)
+            return;
+        batch.writeSummaryOnly(pendingBatch, layout);
+        pendingBatch = [];
+    };
     for (let idx = 0; idx < history.length; idx++) {
         const m = history[idx];
         if (m.role === 'system')
             continue;
         if (m.role === 'user') {
+            flushBatch(); // 上一轮 batch(若有)收尾
             const lines = textOf(m.content).split('\n');
             layout.contentWrite(formatUserMessage(lines));
             const atts = messageAttachments.get(idx);
@@ -455,31 +478,53 @@ export function renderHistory(history) {
         if (m.role === 'assistant') {
             const text = textOf(m.content);
             if (text) {
+                flushBatch(); // 文本前若有累积 batch 先收尾(罕见:连续两个 assistant tool_calls 文本间)
                 layout.contentWriteMdOnce(text);
                 if (!text.endsWith('\n'))
                     layout.contentWrite('\n');
             }
             const tcs = m.tool_calls;
-            if (Array.isArray(tcs)) {
+            if (Array.isArray(tcs) && tcs.length > 0) {
+                // 累积到 pendingBatch,顺序 = tool_calls 序
                 for (const tc of tcs) {
                     const name = tc?.function?.name ?? '';
                     const args = tc?.function?.arguments ?? '';
                     if (tc?.id && name)
                         idToName.set(tc.id, name);
-                    layout.contentWrite(`  ${ui.brightMagenta}●${ui.reset} ${ui.cyan}${name}${ui.reset}  ${ui.dim}${summarizeToolCall(name, args)}${ui.reset}\n`);
+                    pendingBatch.push({
+                        name,
+                        callSummary: summarizeToolCall(name, args),
+                        resultSummary: '',
+                        diffBlock: null,
+                    });
                 }
+                continue; // 跳过后续 tool 消息处理循环(由下一分支填 result)
             }
+            // 无 tool_calls:若有 pending batch(文本+无 tool_calls 的 assistant),不常见,先收尾
+            flushBatch();
             continue;
         }
         if (m.role === 'tool') {
             const id = m.tool_call_id ?? '';
             const name = idToName.get(id) ?? '';
-            const preview = summarizeToolResult(name, textOf(m.content));
-            if (preview)
-                layout.contentWrite(`  ${ui.gray}↳ ${preview}${ui.reset}\n`);
+            const output = textOf(m.content);
+            const preview = summarizeToolResult(name, output);
+            // 匹配 pendingBatch 中尚未填 result 的同名 entry;同名前缀 tool 较罕见(并行工具同 id 不同名)
+            let target;
+            for (let i = pendingBatch.length - 1; i >= 0; i--) {
+                const e = pendingBatch[i];
+                if (e.name === name && !e.resultSummary) {
+                    target = e;
+                    break;
+                }
+            }
+            if (target)
+                target.resultSummary = preview;
+            // 不直接写屏——等 flushBatch 时出单行摘要
             continue;
         }
     }
+    flushBatch(); // 末尾兜底
 }
 /**
  * 交互式 REPL:全屏 TUI(alt screen + 固定底栏)。INPUT 态底栏=状态行+输入框(raw mode 等按键);
@@ -554,6 +599,26 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
         // 未配置 baseURL/apiKey:醒目提示引导 /model(不退出,REPL 仍可用;发消息会失败但不崩)。
         layout.contentWrite(`${ui.yellow}  ⚠ 未配置大模型。输入 ${ui.cyan}/model${ui.yellow} 配置 baseURL / apiKey / model(即时生效),或退出后运行 ${ui.cyan}mocode config${ui.yellow} 走向导。${ui.reset}\n`);
     }
+    else {
+        // 老用户兜底:若 ~/.mocode/models/ 空,自动把 ~/.mocode/config 的当前 LLM 四键迁成 'default' 预设。
+        // 这样 /model list / switch 立即可见,无需手动 /model 重存一遍。幂等:重启只生效一次。
+        if (listPresets().length === 0) {
+            try {
+                const migrated = migrateCurrentToPreset({
+                    baseURL: config.baseURL,
+                    apiKey: config.apiKey,
+                    model: config.model,
+                    contextWindow: config.contextWindowTokens,
+                });
+                if (migrated) {
+                    layout.contentWrite(`${ui.dim}  ↳ 检测到老配置,已自动迁为预设 “${migrated}”(${ui.cyan}/model list${ui.dim} 查看 · /model switch 切换)${ui.reset}\n`);
+                }
+            }
+            catch {
+                // 迁移失败不阻塞启动;用户后续 /model 时仍能手动配。
+            }
+        }
+    }
     layout.contentWrite(`${ui.dim}  /plan · /auto · Shift+Tab 切换模式(plan:只读探查 + 产出计划,审批后切 auto 执行)${ui.reset}\n`);
     /**
      * 切换 agent 模式(Shift+Tab 触发,经 prompt.ts 的 onCycleMode 回调)。
@@ -674,9 +739,13 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
             ? input
             : [
                 { type: 'text', text: input },
+                // detail 故意不设(留 undefined,JSON.stringify 时被丢弃):OpenAI 认 'auto'/'low'/'high',
+                // 但 MiniMax 只认 'low'/'default'/'high'——'auto' 不是合法枚举值,某些后端会 400。
+                // 不传 detail 让各 provider 用自己的默认值(OpenAI 默认视为 auto,MiniMax 默认 default),
+                // 是唯一在两边都不出错的写法。
                 ...imgs.map((a) => ({
                     type: 'image_url',
-                    image_url: { url: a.dataUrl, detail: 'auto' },
+                    image_url: { url: a.dataUrl },
                 })),
             ];
         const msgIndex = history.length; // runAgent push 后 = 这个 index
@@ -939,6 +1008,11 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
                 pendingAttachments.push(r.att);
             }
             layout.contentWrite(`  ${ui.dim}${renderChip(r.att)} — will attach to next message${ui.reset}\n`);
+            // 提前警告(不阻断附加):当前模型已知不支持视觉(如 MiniMax M2.x / gpt-3.5 等)时,
+            // 附加时就提示,而不是等发送后才在 catch 块里翻译 API 报错——减少一轮无意义请求。
+            if (!modelSupportsVision(config.model)) {
+                layout.contentWrite(`  ${ui.yellow}⚠ 当前模型 ${config.model} 已知不支持视觉输入,发送图片可能会失败。可用 /model 切换。${ui.reset}\n`);
+            }
             continue;
         }
         if (line === '/context') {
@@ -969,6 +1043,11 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
             continue;
         }
         if (line === '/reflect') {
+            // 记忆子系统总开关关闭时反思无意义(kickoffReflection 内部也会短路),直接提示,不误导用户"已触发"。
+            if (!isMemoryEnabled()) {
+                layout.contentWrite(`${ui.dim}(记忆子系统已关闭,/reflect 无效。用 /memory_switch 打开后再试)${ui.reset}\n`);
+                continue;
+            }
             // 手动触发后台反思 pass(不等;完成后下次 INPUT 态显摘要)。
             kickoffReflection(snapshotTranscript(history, 20));
             layout.contentWrite(`${ui.dim}(反思已触发,后台进行;完成后下次输入态显示摘要。日志见 .mocode/memory.log)${ui.reset}\n`);
@@ -1160,8 +1239,114 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
             // 即时生效(updateModelConfig 改内存 + env,reconfigureClient 重建 OpenAI 实例)+ 持久化(writeConfigKeys 写 ~/.mocode/config)。
             // 仿 /theme:promptIntervention 弹菜单/输入 → 改 config → refreshStatusBase 刷底栏 → clearContent+banner 重显横幅 → dim 警告(shell env 覆盖)。
             const arg = line.startsWith('/model ') ? line.slice('/model '.length).trim() : '';
-            // /model list:显示当前四项配置(apiKey 脱敏)。
-            if (arg === 'list' || arg === 'show') {
+            // ── /model 子命令(use/save/list/delete/rename)优先派发,免得被无参向导路径吞掉。
+            // 共用:apply 一个预设到 config + 持久化 + 重建 client + 重显横幅。无参 /model 选菜单和 /model use 都走这里。
+            const applyPresetAndPersist = (target) => {
+                updateModelConfig({
+                    model: target.model,
+                    baseURL: target.baseURL,
+                    apiKey: target.apiKey,
+                    contextWindowTokens: target.contextWindow,
+                });
+                writeConfigKeys({
+                    LLM_BASE_URL: target.baseURL,
+                    LLM_API_KEY: target.apiKey,
+                    LLM_MODEL: target.model,
+                    CONTEXT_WINDOW_TOKENS: String(target.contextWindow),
+                });
+                reconfigureClient();
+                refreshStatusBase(history);
+                layout.clearContent();
+                if (history.some((m) => m.role === 'user')) {
+                    renderHistory(history);
+                }
+                else {
+                    layout.contentWrite(bannerString(banner()));
+                }
+                layout.contentWrite(`${ui.dim}(已切换到预设 “${target.name}” → ${target.model} @ ${target.baseURL})${ui.reset}\n`);
+                if (config.llmKeysFromShell.length > 0) {
+                    layout.contentWrite(`${ui.dim}(shell 环境变量已设 ${config.llmKeysFromShell.join(' / ')},文件写入下次启动被其覆盖)${ui.reset}\n`);
+                }
+            };
+            // 决定自动存的预设名:用 desired(model 字段),若与已有预设四元组完全相同则不重复存(返 null);
+            // 否则若 desired 已存在则追加 -2/-3/...。desired 含非法字符(如 glm-4.6 的 '.')时先 sanitize(. → -),
+            // sanitize 后仍空才退化到 'preset'。
+            const uniquePresetName = (desired, baseURL, apiKey, model, contextWindow) => {
+                const existing = listPresets();
+                const sameEntry = existing.find((p) => p.baseURL === baseURL && p.apiKey === apiKey && p.model === model && p.contextWindow === contextWindow);
+                if (sameEntry)
+                    return null; // 完全相同,不重复存
+                // sanitize:把非 [a-zA-Z0-9_-] 字符(如 glm-4.6 的 '.')替换为 -,压缩两端 -,裁 1-32。
+                const sanitized = desired
+                    .replace(/[^a-zA-Z0-9_-]+/g, '-')
+                    .replace(/^-+|-+$/g, '')
+                    .slice(0, 32) || 'preset';
+                const base = isValidPresetName(sanitized) ? sanitized : 'preset';
+                if (!existing.some((p) => p.name === base))
+                    return base;
+                for (let i = 2; i < 1000; i++) {
+                    const candidate = `${base}-${i}`;
+                    if (candidate.length > 32)
+                        return `${base.slice(0, 32 - String(i).length - 1)}-${i}`;
+                    if (!existing.some((p) => p.name === candidate))
+                        return candidate;
+                }
+                return `${base}-${Date.now()}`;
+            };
+            // /model switch:弹 ↑↓·Enter 菜单挑预设切换。无预设时给一行引导。
+            if (arg === 'switch') {
+                const presets = listPresets();
+                if (presets.length === 0) {
+                    layout.contentWrite(`${ui.dim}(还没有预设;先跑 /model 添加一个)${ui.reset}\n`);
+                    continue;
+                }
+                const isCurrent = (p) => p.baseURL === config.baseURL &&
+                    p.apiKey === config.apiKey &&
+                    p.model === config.model &&
+                    p.contextWindow === config.contextWindowTokens;
+                const cols = layout.getGeo().cols;
+                const labelFor = (p) => {
+                    const tag = isCurrent(p) ? ' ★current' : '';
+                    const right = `${p.model} @ ${p.baseURL}`;
+                    const left = `${p.name}${tag}`;
+                    const sep = left.length + 1 + right.length;
+                    if (sep <= cols - 2)
+                        return `${left} ${ui.dim}${right}${ui.reset}`;
+                    return left;
+                };
+                const choice = await promptIntervention({
+                    type: 'choice',
+                    title: '切换模型预设',
+                    detail: `当前: ${config.model} @ ${config.baseURL}(★ = 已匹配)`,
+                    options: presets.map(labelFor),
+                    allowCustom: false, // 纯切换,不需要「其他」干扰
+                });
+                if (choice.action === 'selected' && choice.value) {
+                    // value 含 ANSI 序列(labelFor 用了 ui.dim);按 preset.name 前缀匹配。
+                    const idx = presets.findIndex((p) => choice.value.startsWith(p.name));
+                    const target = idx >= 0 ? presets[idx] : presets[0];
+                    applyPresetAndPersist(target);
+                }
+                continue;
+            }
+            // /model list:列已配置的预设(★ 标当前);无预设给一行引导。
+            // /model presets 是同义别名(老用户习惯)。
+            if (arg === 'list' || arg === 'presets') {
+                const ps = listPresets();
+                if (ps.length === 0) {
+                    layout.contentWrite(`${ui.dim}(还没有预设;先跑 /model 添加一个)${ui.reset}\n`);
+                    continue;
+                }
+                layout.contentWrite(`${ui.dim}已配置 ${ps.length} 个预设:${ui.reset}\n`);
+                for (const p of ps) {
+                    const star = p.baseURL === config.baseURL && p.apiKey === config.apiKey && p.model === config.model ? ' ★' : '';
+                    layout.contentWrite(`  ${ui.cyan}${p.name}${ui.reset}${star}  ${ui.dim}${p.model} @ ${p.baseURL}${ui.reset}\n`);
+                }
+                layout.contentWrite(`${ui.dim}(★ = 与当前一致;切换用 /model switch)${ui.reset}\n`);
+                continue;
+            }
+            // /model show:显示当前四项配置(apiKey 脱敏)。
+            if (arg === 'show') {
                 layout.contentWrite(`${ui.dim}当前模型配置:${ui.reset}\n`);
                 layout.contentWrite(`  ${ui.cyan}baseURL${ui.reset}  ${config.baseURL}\n`);
                 layout.contentWrite(`  ${ui.cyan}apiKey ${ui.reset}  ${maskKey(config.apiKey)}\n`);
@@ -1170,6 +1355,61 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
                 layout.contentWrite(`${ui.dim}(配置文件: ${CONFIG_PATH})${ui.reset}\n`);
                 continue;
             }
+            // /model use <name>:一键把预设应用到 config + 持久化 + 重建 client。
+            if (arg.startsWith('use ')) {
+                const name = arg.slice(4).trim();
+                if (!name) {
+                    layout.contentWrite(`${ui.yellow}用法: /model use <name>${ui.reset}\n`);
+                    continue;
+                }
+                if (!isValidPresetName(name)) {
+                    layout.contentWrite(`${ui.yellow}非法名字: ${name}(仅允许 [a-zA-Z0-9_-]{1,32})${ui.reset}\n`);
+                    continue;
+                }
+                let preset;
+                try {
+                    preset = getPreset(name);
+                }
+                catch (e) {
+                    if (e.code === 'ENOENT') {
+                        layout.contentWrite(`${ui.yellow}没有预设 “${name}”;先 /model save ${name}${ui.reset}\n`);
+                    }
+                    else {
+                        layout.contentWrite(`${ui.red}/model use 失败: ${e.message}${ui.reset}\n`);
+                    }
+                    continue;
+                }
+                applyPresetAndPersist(preset);
+                continue;
+            }
+            // /model delete <name>:删一个预设。无参 / 重名 / 非法名字分别给不同提示。
+            if (arg.startsWith('delete ')) {
+                const name = arg.slice(7).trim();
+                if (!name) {
+                    layout.contentWrite(`${ui.yellow}用法: /model delete <name>${ui.reset}\n`);
+                    continue;
+                }
+                if (!isValidPresetName(name)) {
+                    layout.contentWrite(`${ui.yellow}非法名字: ${name}(仅允许 [a-zA-Z0-9_-]{1,32})${ui.reset}\n`);
+                    continue;
+                }
+                if (deletePreset(name)) {
+                    layout.contentWrite(`${ui.dim}已删除预设 “${name}”${ui.reset}\n`);
+                }
+                else {
+                    layout.contentWrite(`${ui.yellow}没有预设 “${name}”${ui.reset}\n`);
+                }
+                continue;
+            }
+            // /model 后跟了未知子命令 → 给一行简短用法提示,免得静默吞用户输入。
+            // arg === '' → 直接进向导(下方 4 步链);这里只兜底非法子命令。
+            if (arg !== '') {
+                layout.contentWrite(`${ui.yellow}未知子命令: ${arg}${ui.reset}\n` +
+                    `${ui.dim}用法: /model(配置新模型向导) · /model switch · /model list · /model delete <name>${ui.reset}\n`);
+                continue;
+            }
+            // /model 无参 → 直接进入「配置新模型」4 步向导(不弹动作菜单)。
+            //   切换 / 查看 / 删除已配置预设改用显式子命令:/model switch · /model list · /model delete <name>。
             // 1) 选 provider 预设(预填 baseURL,后续仍可逐项改)。
             let preset;
             try {
@@ -1203,6 +1443,7 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
                         title: `应用 ${preset.label}?`,
                         detail: `model   ${preset.model}\nbaseURL ${preset.baseURL}\napiKey  ${maskKey(config.apiKey)}(直接应用=保留当前)\n窗口    ${preset.window}`,
                         options: ['直接应用', '逐项修改'],
+                        allowCustom: false,
                     });
                     if (res.action === 'cancelled') {
                         continue;
@@ -1312,6 +1553,20 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
                 CONTEXT_WINDOW_TOKENS: String(window),
             });
             reconfigureClient();
+            // 3.5) 自动存为命名预设:用 model 字段,重名追加 -2/-3,完全相同的四元组不重复存。
+            //     让 /model 跑一次就多一份可切换的预设,/model switch 切回去。
+            let savedName = null;
+            try {
+                const finalName = uniquePresetName(model, baseURL, apiKey, model, window);
+                if (finalName) {
+                    savePreset({ name: finalName, baseURL, apiKey, model, contextWindow: window });
+                    savedName = finalName;
+                }
+                // finalName === null 表示与某个已存在预设完全一致,不再重复保存。
+            }
+            catch (e) {
+                layout.contentWrite(`${ui.red}保存预设失败: ${e.message}${ui.reset}\n`);
+            }
             // 4) 刷新 UI:底栏模型名 + 重显横幅(banner() 闭包实时读 config,自动反映新值)。
             refreshStatusBase(history);
             layout.clearContent();
@@ -1322,6 +1577,9 @@ export async function startRepl(initialHistory, sessionId, updateNotice = null,
                 layout.contentWrite(bannerString(banner()));
             }
             layout.contentWrite(`${ui.dim}(已切换模型 → ${model} @ ${baseURL})${ui.reset}\n`);
+            if (savedName) {
+                layout.contentWrite(`${ui.dim}(已保存为预设 “${savedName}”,下次 /model use ${savedName} 一键切回)${ui.reset}\n`);
+            }
             // 5) dim 警告:shell export 的 LLM 键下次启动会覆盖文件值。
             if (config.llmKeysFromShell.length > 0) {
                 layout.contentWrite(`${ui.dim}(shell 环境变量已设 ${config.llmKeysFromShell.join(' / ')},文件写入下次启动被其覆盖;取消该 shell 设置后生效)${ui.reset}\n`);

package/dist/tools/builtins/ask-human.js

@@ -1,72 +1,85 @@
 import { promptIntervention } from '../../ui/intervention.js';
 import { sendState } from '../../pet/bridge.js';
-/** 将单个选项元素安全地转为可读字符串。
- *  LLM 有时会传对象(如 {name/label/title:"xxx", desc/description:"yyy"})而不是纯字符串,
- *  直接 String(obj) 会变成 "[object Object]"——这里智能提取可读字段。 */
-function optionToString(o) {
+/** 把单个选项元素安全地转成 {label, detail}。LLM 有时传对象而不是字符串,这里提取可读字段。 */
+function optionToChoice(o) {
     if (o === null || o === undefined)
-        return '';
+        return { label: '' };
     if (typeof o === 'string')
-        return o;
+        return { label: o };
     if (typeof o === 'number' || typeof o === 'boolean')
-        return String(o);
+        return { label: String(o) };
     if (typeof o === 'object') {
         const obj = o;
-        // 优先取常见的标签字段
+        const pickString = (source, keys) => {
+            for (const k of keys) {
+                const v = source[k];
+                if (typeof v === 'string' && v.trim())
+                    return v.trim();
+            }
+            return undefined;
+        };
         const labelKeys = ['label', 'name', 'title', 'text', 'option', 'choice', 'value', 'key'];
-        for (const k of labelKeys) {
-            const v = obj[k];
-            if (typeof v === 'string' && v.trim())
-                return v;
+        let label = pickString(obj, labelKeys);
+        const nestedOptions = obj.options;
+        if (!label && nestedOptions && typeof nestedOptions === 'object' && !Array.isArray(nestedOptions)) {
+            label = pickString(nestedOptions, labelKeys);
         }
-        // 其次尝试 "label + description" 组合
-        const label = obj.label ?? obj.name ?? obj.title;
-        const desc = obj.description ?? obj.desc ?? obj.detail;
-        if (typeof label === 'string' && typeof desc === 'string') {
-            return `${label}: ${desc}`;
+        const desc = pickString(obj, ['description', 'desc', 'detail', 'details', 'reason']);
+        if (label && desc && label !== desc)
+            return { label, detail: desc };
+        if (label)
+            return { label };
+        if (desc)
+            return { label: desc };
+        const nestedKeys = ['options', 'option', 'choice', 'value'];
+        for (const k of nestedKeys) {
+            const nested = obj[k];
+            if (nested && typeof nested === 'object' && !Array.isArray(nested)) {
+                const c = optionToChoice(nested);
+                if (c.label && !c.label.startsWith('{'))
+                    return c;
+            }
         }
-        // 兜底:JSON 序列化(去掉大括号让它看起来不像代码)
         try {
+            // 兜底:仍 stringify 原值,以便上游能看到真实内容做调试/日志;但若得到字面"{}"或"[]"
+            // (说明 obj 本身就是个空对象),返回空 label 让 coerceOptions 的 length>0 filter 自然过滤掉,
+            // 避免终端上显示「1. {}」这种对用户无意义的内容。
             const s = JSON.stringify(obj);
-            // 如果是简单对象尝试美化
-            return s;
+            if (s === '{}' || s === '[]')
+                return { label: '' };
+            return { label: s };
         }
         catch {
-            return String(o);
+            return { label: String(o) };
         }
     }
-    return String(o);
+    return { label: String(o) };
 }
 /** 公开以便 check-ask-human-options.ts 单元测试。 */
 export function coerceOptions(raw) {
-    // 路径 1:本身就是数组,map 成字符串。
     if (Array.isArray(raw)) {
-        // 子路径 1a:LLM 把真数组包成字符串塞在单元素里(本次 bug 现场)
         if (raw.length === 1 && typeof raw[0] === 'string') {
             const t = raw[0].trim();
             if (t.startsWith('[') && t.endsWith(']')) {
                 try {
                     const parsed = JSON.parse(t);
                     if (Array.isArray(parsed))
-                        return parsed.map(optionToString);
+                        return parsed.map(optionToChoice).filter((o) => o.label.length > 0);
                 }
                 catch {
                     // 不是合法 JSON 数组,降级原值
                 }
             }
         }
-        return raw.map(optionToString);
+        return raw.map(optionToChoice).filter((o) => o.label.length > 0);
     }
-    // 路径 2:LLM 直接把整个数组 stringify 成单字符串塞 options 字段(JSON.parse 出来是字符串)
-    // 例如 GLM 系经常这么做,arg h['options']='["A","B"]' → args.options='["A","B"]'
-    // 这里解开成真数组再转。
     if (typeof raw === 'string') {
         const t = raw.trim();
         if (t.startsWith('[') && t.endsWith(']')) {
             try {
                 const parsed = JSON.parse(t);
                 if (Array.isArray(parsed))
-                    return parsed.map(optionToString);
+                    return parsed.map(optionToChoice).filter((o) => o.label.length > 0);
             }
             catch {
                 // 不是合法 JSON,保留为单元素数组(对应 input 模式)
@@ -79,11 +92,12 @@ export function coerceOptions(raw) {
 export const askHumanTool = {
     name: 'ask_human',
     description: [
-        'Ask the user for input at a decision point (blocks until they respond).',
-        ' Use when: multiple approaches need a user decision, intent is unclear, or extra info is needed.',
-        ' Don\'t call when the task is clear and you can decide — it interrupts the user.',
-        ' Options (2-6) let the user pick; omit/empty for free-text input. Their answer is returned as the result.',
-    ].join(''),
+        'Present the user with a menu of choices to pick from.',
+        ' DEFAULT: pass 2-4 concrete options via `options`; each is a string, or { label, description } when the choice has a non-obvious tradeoff.',
+        ' STRICT: object form requires a non-empty `label` — never emit {} or omit label (renders as a literal "{}" menu item). Only `label` and `description` are recognized — no extra fields.',
+        ' FREE-TEXT (omit `options`): only when the answer truly cannot be reduced to a few choices (e.g. "paste the error message").',
+        ' DO NOT call when the task is clear and you can pick a sensible default.',
+    ].join(' '),
     parameters: {
         type: 'object',
         properties: {
@@ -93,25 +107,39 @@ export const askHumanTool = {
             },
             options: {
                 type: 'array',
-                items: { type: 'string' },
-                description: 'Options for the user to choose from (2~6). May be omitted — when omitted or empty, it becomes free-text input instead',
+                items: {
+                    anyOf: [
+                        { type: 'string' },
+                        {
+                            type: 'object',
+                            properties: {
+                                label: {
+                                    type: 'string',
+                                    minLength: 1,
+                                    description: 'Short option title (1-5 words), shown as the choice itself.',
+                                },
+                                description: {
+                                    type: 'string',
+                                    description: 'What picking this option means or implies; explain the tradeoff when the label alone leaves the user unsure.',
+                                },
+                            },
+                            required: ['label'],
+                        },
+                    ],
+                },
+                description: '2-4 concrete choices. Each is a plain string, or { label, description } when the tradeoff is non-obvious. Required in most cases; omit only for free-form input.',
             },
             context: {
                 type: 'string',
-                description: 'Background explanation for the question (optional; helps the user understand why their decision is needed; shown under the title, may be multiline)',
+                description: 'Background explanation shown under the title; may be multiline.',
             },
         },
         required: ['question'],
     },
     async execute(args) {
         const question = String(args.question ?? '');
-        // 容错:部分 LLM(尤其 GLM 系)把数组/对象 stringify 后塞进来,这里识别「长得很像 JSON
-        // 数组的单字符串元素」并解开,避免菜单只剩一行 [object Object]、逼用户手动输入。
-        // 任何一步失败 / 解出非数组:降级 input,与原代码语义一致。
         const options = coerceOptions(args.options);
         const context = args.context ? String(args.context) : undefined;
-        // 桌宠:面板弹出期间广播 waiting_human(红灯闪烁,提示需要人工介入);拿到响应后 sendState 会被
-        // 下一个 hook 事件(如 onToolDone→tool_call)覆盖,这里不用手动切回——与其它工具状态转移逻辑一致。
         sendState('waiting_human');
         const result = await promptIntervention({
             type: options.length > 0 ? 'choice' : 'input',

package/dist/tools/builtins/codegraph.js

@@ -53,7 +53,7 @@ export const codegraphTool = {
     description: 'FIRST CHOICE for understanding/locating code, tracing call chains, or assessing the impact of changes — use this before read_file/grep when a .codegraph/ index exists.' +
         ' Returns symbol source + call paths in one shot — more accurate and economical than piecing together read_file/grep.' +
         ' When to use: starting any code exploration; locating a symbol; understanding how a feature works; seeing what calls a function or what a change affects.' +
-        ' When NOT to use: no .codegraph/ index (build it first with `codegraph init`); reading a file you just edited; editing a single known small file — in those cases go straight to read_file/edit_file.' +
+        ' When NOT to use: no .codegraph/ index (build it first with `codegraph init`); reading a file you just edited; editing a single known small file — in those cases go straight to read_file/edit_file; or the symbol/area was already retrieved earlier in this session — reuse that result instead of calling again.' +
         ' Fallback: if codegraph misses or the result is incomplete, then use read_file/grep/glob to fill the gaps.',
     parameters: {
         type: 'object',