mocode-ai 0.4.3 → 0.4.5

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

@@ -79,11 +79,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 — not a generic "ask" tool.',
+        ' DEFAULT: pass 2–6 concrete options via `options`; the user picks one and the pick comes back.',
+        ' FREE-TEXT (omit `options`): only when the answer truly cannot be reduced to a few choices',
+        ' (e.g. "paste the error message", "enter the exact URL") — this blocks with a text input.',
+        ' DO NOT call when the task is clear and you can pick a sensible default — decide and proceed.',
+    ].join(' '),
     parameters: {
         type: 'object',
         properties: {
@@ -94,7 +95,7 @@ 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',
+                description: '2–6 concrete choices the user can pick with one click. Required in most cases; omit only when free-form text is genuinely needed.',
             },
             context: {
                 type: 'string',

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',

package/dist/ui/batch.js

@@ -0,0 +1,218 @@
+/**
+ * 工具调用批量折叠渲染(仿 Claude Code):
+ *   agent 一轮返回 N 个 tool_calls 时,不逐个打印 `● name ↳ result`,
+ *   改输出一行摘要 `● Ran N tools · read 3, grep 1, glob 1`;
+ *   鼠标点击该摘要行 → 展开完整明细(● 头 + ↳ preview / diff 块),再点折回。
+ *
+ * 设计要点:
+ *  - 实时执行 + renderHistory 回放共用本渲染器;
+ *  - 仅 buffer 写一行,详情行展开时才插入(mid-buffer insert via layout.contentInsertAfter);
+ *  - 默认折叠;展开/折叠不影响历史回放的 history 结构(history 仍存完整 tool_calls+tool 消息)。
+ *
+ * 状态全模块级(单实例)——一次 REPL 内所有 batch 共享,清内容区 / 退 alt 屏时统一重置。
+ */
+import { ui } from './theme.js';
+const batches = new Map();
+/** 绝对行索引 → 所属 batch id(仅记录 summary 行;用于鼠标点击反查)。
+ *  buffer 行数变化时本表可能漂移——但只在 insertAfter/deleteFrom 后由本模块同步更新,
+ *  并保持 buffer 当前状态对应。 */
+const absLineToBatchId = new Map();
+/** 已展开的 batch id;默认空(全折叠);layout.mouse release 点击摘要行时切。
+ *  含 mutation 的 batch 不在此 set——它们走 forceExpanded 永远展开,与 toggle 隔离。 */
+const expandedBatches = new Set();
+/** mutation 工具名集合(写盘操作);与 src/agent/core.ts 的 isMutationTool 同步,本模块独立持有
+ *  避免 ui → agent 反向依赖。 */
+const MUTATION_TOOLS = new Set(['write_file', 'edit_file']);
+function isMutationTool(name) {
+    return MUTATION_TOOLS.has(name);
+}
+/** 通知 buffer 整体清空(clearContent / exitAltScreen / 新一轮 turn)——本模块状态同步归零。 */
+export function reset() {
+    batches.clear();
+    absLineToBatchId.clear();
+    expandedBatches.clear();
+}
+/** 新建一个 batch(在 agent 拿到第一条 onToolHeader 时调)。返回 id。 */
+export function beginBatch() {
+    const id = `b${++_idCounter}`;
+    batches.set(id, { id, summaryAbsIdx: -1, entries: [], forceExpanded: false });
+    return id;
+}
+/** 记一条工具调用(在 onToolHeader 时调,与 setEntryResult 配对;entries 顺序 = agent 调用顺序)。 */
+export function recordCall(id, name, callSummary) {
+    const b = batches.get(id);
+    if (!b)
+        return;
+    b.entries.push({ name, callSummary, resultSummary: '', diffBlock: null });
+}
+/** 记一条工具结果(diff 块或单行 preview);agent 在 onToolResult 时调,匹配最后一条未填的 entry。 */
+export function recordResult(id, name, resultSummary, diffBlock) {
+    const b = batches.get(id);
+    if (!b || b.entries.length === 0)
+        return;
+    // 反向找最后一条同名的 entry 填结果;同名工具一批多次调用时正向遍历更安全——用 lastIndexOf 同名回退
+    for (let i = b.entries.length - 1; i >= 0; i--) {
+        if (b.entries[i].name === name && !b.entries[i].resultSummary) {
+            b.entries[i].resultSummary = resultSummary;
+            b.entries[i].diffBlock = diffBlock;
+            return;
+        }
+    }
+    // 兜底:无匹配则填最后一条
+    const last = b.entries[b.entries.length - 1];
+    if (!last.resultSummary) {
+        last.resultSummary = resultSummary;
+        last.diffBlock = diffBlock;
+    }
+}
+// ── 摘要行文本生成 ──
+/** 把 entry 列表压缩成一行摘要(Claude Code 风格)。 */
+function buildSummaryLine(entries) {
+    if (entries.length === 0) {
+        return `  ${ui.brightMagenta}●${ui.reset} ${ui.dim}No tools${ui.reset}`;
+    }
+    if (entries.length === 1) {
+        const e = entries[0];
+        return `  ${ui.brightMagenta}●${ui.reset} ${ui.cyan}${e.name}${ui.reset}  ${ui.dim}${e.callSummary}${ui.reset}`;
+    }
+    // N>1:同类合并 "read_file 3, glob 1, grep 1"
+    const counts = new Map();
+    for (const e of entries)
+        counts.set(e.name, (counts.get(e.name) ?? 0) + 1);
+    const parts = [];
+    for (const [n, c] of counts)
+        parts.push(`${n} ${c}`);
+    return `  ${ui.brightMagenta}●${ui.reset} ${ui.dim}Ran ${entries.length} tools · ${parts.join(', ')}${ui.reset}`;
+}
+// ── 展开/折叠 ──
+/** 把 batch 的详情行展开成自洽行数组(供 layout.contentInsertAfter 走 mid-buffer 插入)。
+ *  每行末尾必须以 \x1B[0m 收尾(SGR 自洽模型),行内允许含 SGR(行末 reset 不影响行内样式),
+ *  但**绝不**带 \n——rows[] 是行数组,不是流输出。 */
+function buildExpandedLines(entries) {
+    const lines = [];
+    for (const e of entries) {
+        lines.push(`    ${ui.brightMagenta}●${ui.reset} ${ui.cyan}${e.name}${ui.reset}  ${ui.dim}${e.callSummary}${ui.reset}\x1B[0m`);
+        if (e.diffBlock) {
+            // diff 块多行文本(由 renderFileChange 渲染);按 \n 拆成物理行,
+            // 每行单独入 rows[]。行末 reset 由本函数统一追加(若原行已带 reset,终端合并即可)。
+            const block = e.diffBlock.endsWith('\n') ? e.diffBlock : e.diffBlock + '\n';
+            for (const line of block.split('\n')) {
+                if (line === '' && lines.length > 0 && lines[lines.length - 1] === '')
+                    continue; // 折叠连续空行
+                if (line === '' && lines.length > 0)
+                    continue; // 跳过首尾空行(diff 头/尾换行)
+                lines.push(line.endsWith('\x1B[0m') ? line : line + '\x1B[0m');
+            }
+        }
+        else if (e.resultSummary) {
+            lines.push(`    ${ui.gray}↳ ${e.resultSummary}${ui.reset}\x1B[0m`);
+        }
+    }
+    return lines;
+}
+/** 在 batch 收尾时(onToolBatchEnd):写摘要行 + 登记 summaryAbsIdx;若已展开(回放场景)立即插详情。 */
+export function endBatch(id, layout) {
+    const b = batches.get(id);
+    if (!b || b.summaryAbsIdx >= 0)
+        return; // 幂等
+    // 含 mutation(write_file/edit_file)时强制展开——写盘操作必须让用户看到 diff
+    b.forceExpanded = b.entries.some((e) => isMutationTool(e.name));
+    const summary = buildSummaryLine(b.entries);
+    // 写摘要行(以 \n 收尾;contentWrite 会 breakRow 让其成为完整物理行)
+    layout.contentWrite(summary + '\n');
+    // 摘要行绝对索引 = totalRows - 2(hasCurrent 那行是新空行)
+    b.summaryAbsIdx = Math.max(0, layout.totalRows() - 2);
+    absLineToBatchId.set(b.summaryAbsIdx, b.id);
+    // forceExpanded 时立刻展开(让 diff 在收尾后立即可见,无需点击)
+    if (b.forceExpanded) {
+        expand(b, layout);
+    }
+}
+/** 绝对行索引 → 命中 batch id(用于鼠标 release 反查);非摘要行返 null。 */
+export function findBatchByAbsLine(absLine) {
+    return absLineToBatchId.get(absLine) ?? null;
+}
+/** 当前 batch 是否已展开。 */
+export function isExpanded(id) {
+    return expandedBatches.has(id);
+}
+/**
+ * 切换 batch 展开/折叠;无变化时 no-op。
+ * 折叠:从 buffer 删详情行(mid-buffer delete);
+ * 展开:把详情行插入摘要行下方(mid-buffer insert)。
+ * 同步更新 absLineToBatchId 中所有受影响的索引:
+ *   - 删除/插入点之后的 batch 摘要行索引相应平移。
+ * 含 mutation(write_file/edit_file)的 batch 强制展开——不允许折叠(写盘操作必须始终可见)。
+ */
+export function toggleBatch(id, layout) {
+    const b = batches.get(id);
+    if (!b)
+        return;
+    if (b.forceExpanded) {
+        // 写盘操作的 batch 强制展开,toggle 拒绝折叠(用户能看到完整 diff 即用)
+        if (!expandedBatches.has(id))
+            expand(b, layout);
+        return;
+    }
+    if (expandedBatches.has(id)) {
+        collapse(b, layout);
+    }
+    else {
+        expand(b, layout);
+    }
+}
+function expand(b, layout) {
+    const lines = buildExpandedLines(b.entries);
+    layout.contentInsertAfter(b.summaryAbsIdx, lines);
+    expandedBatches.add(b.id);
+}
+function collapse(b, layout) {
+    const lines = buildExpandedLines(b.entries);
+    layout.contentDeleteFrom(b.summaryAbsIdx + 1, lines.length);
+    expandedBatches.delete(b.id);
+}
+/**
+ * 当 buffer 中段插/删 N 行后,所有受影响 batch 的 summaryAbsIdx 需平移。
+ * 由 layout.contentInsertAfter / contentDeleteFrom 在每次变动后调一次,
+ * 参数 afterIdx 是被插入/删除点的绝对索引(插入点之前索引不变;之后索引 += delta)。
+ */
+export function shiftBatchesAfter(absIdx, delta) {
+    if (delta === 0)
+        return;
+    // 重建 absLineToBatchId:删除所有 <= absIdx 的项,把 > absIdx 的项按 delta 平移
+    const next = new Map();
+    for (const [idx, id] of absLineToBatchId) {
+        if (idx <= absIdx) {
+            next.set(idx, id);
+        }
+        else {
+            const newIdx = idx + delta;
+            if (newIdx >= 0)
+                next.set(newIdx, id);
+        }
+    }
+    absLineToBatchId.clear();
+    for (const [k, v] of next)
+        absLineToBatchId.set(k, v);
+    // 同步每个 batch 的 summaryAbsIdx
+    for (const b of batches.values()) {
+        if (b.summaryAbsIdx > absIdx)
+            b.summaryAbsIdx = Math.max(0, b.summaryAbsIdx + delta);
+    }
+}
+// ── history 回放支持 ──
+/** 把已构造好的 BatchEntry[] 直接落成摘要行(用于 renderHistory 回放;不记录 id 也不需可切换)。
+ *  含 mutation(write_file/edit_file)时整批展开——与实时 endBatch 行为一致。 */
+export function writeSummaryOnly(entries, layout) {
+    layout.contentWrite(buildSummaryLine(entries) + '\n');
+    const hasMutation = entries.some((e) => isMutationTool(e.name));
+    if (hasMutation) {
+        // 回放时同步展开:重新调 expand 路径需要 BatchRecord,此处直接拼 line 插入
+        const summaryIdx = Math.max(0, layout.totalRows() - 2);
+        const lines = buildExpandedLines(entries);
+        layout.contentInsertAfter(summaryIdx, lines);
+        // 不入 batches/absLineToBatchId/expandedBatches——回放行不支持点击 toggle(设计取舍:
+        // 简化模型;若需要支持回放也可展开/折叠,可在 alt-screen 启动时建一张临时映射)
+    }
+}
+let _idCounter = 0;

package/dist/ui/content.js

@@ -136,3 +136,54 @@ export function lineAt(abs) {
     const all = snapshot();
     return abs >= 0 && abs < all.length ? all[abs] : null;
 }
+/**
+ * 在绝对行索引 after(0-based,已 commit)之后插入 N 条自洽行。
+ * 用于「折叠摘要行下展开明细」——把详情行在已写入摘要行后面塞入缓冲,
+ * 不重写尾部已有内容;且不影响更早的 buffer 行(hasCurrent 先 commit 再 splice)。
+ *
+ * 行须自洽(每行带行末 \x1B[0m),不经 feedChar/feedSgr,直接入 rows。
+ * after < 0 视为在所有已 commit 行之前插入;after ≥ 已 commit 行数则追加到末尾。
+ * 不动 segMark——此函数用于非 md 路径(BatchRenderer 展开/折叠);
+ * md 段切回 layout.contentWriteMd 时 setLines 仍按 segMark 截断。
+ *
+ * 后置条件:插入后 hasCurrent=false(新空行不由本函数建立);调用方须自行决定续写位
+ * (BatchRenderer 在插入后调 layout.contentWrite 续写,新 \n 自然在详情块后建新行)。
+ */
+export function insertAfter(after, lines) {
+    if (lines.length === 0)
+        return;
+    if (hasCurrent) {
+        rows.push(rowStartSgr + curRaw + '\x1B[0m');
+        curRaw = '';
+        rowStartSgr = curSgr;
+        hasCurrent = false;
+    }
+    const committed = rows.length;
+    // after 是绝对行索引;若超过 committed(例如快照时 hasCurrent=true),钳到末尾
+    const target = after < 0 ? 0 : Math.min(after + 1, committed);
+    rows.splice(target, 0, ...lines);
+    if (rows.length > MAX_ROWS + 512)
+        rows.splice(0, rows.length - MAX_ROWS);
+}
+/**
+ * 从绝对行索引 startIdx(0-based,已 commit)起删 n 行。
+ * 用于「已展开明细折回摘要」——把详情行从中段裁掉,保留摘要行和后续内容。
+ * startIdx 越界或 n <= 0 直接 no-op。hasCurrent 时先 commit(同 insertAfter)。
+ *
+ * 后置条件:删除后 hasCurrent=false。后续 layout.contentWrite 自然续写。
+ */
+export function deleteFrom(startIdx, n) {
+    if (n <= 0)
+        return;
+    if (hasCurrent) {
+        rows.push(rowStartSgr + curRaw + '\x1B[0m');
+        curRaw = '';
+        rowStartSgr = curSgr;
+        hasCurrent = false;
+    }
+    const committed = rows.length;
+    if (startIdx >= committed)
+        return;
+    const end = Math.min(startIdx + n, committed);
+    rows.splice(startIdx, end - startIdx);
+}

package/dist/ui/intervention.js

@@ -102,7 +102,6 @@ export async function promptIntervention(req) {
                 cursorLine: 0,
                 cursorCol: displayWidth(hint),
                 menu: { lines: menuLinesChoice() },
-                caret: false, // 纯导航(非文本输入):不画输入框块状光标,聚焦由选项 ▸ 标记
             });
         }
         else {