mocode-ai 0.7.3 → 1.0.2

package/dist/tools/builtins/write-file.js

@@ -1,36 +1,71 @@
-import { writeFile, mkdir } from 'node:fs/promises';
-import { resolve, dirname } from 'node:path';
-import { verifyWrittenFile } from '../../verification/postconditions.js';
-// ---------- write_file ----------
+import { commitChangeSet, createChangeSet, normalizeContentHash, summarizeChangeSet, } from '../../changeset/index.js';
+function conflict(path, details) {
+    return {
+        status: 'error',
+        code: 'CHANGE_CONFLICT',
+        retryable: false,
+        changedFiles: [],
+        staleFiles: [path],
+        output: `CHANGE_CONFLICT: ${path} was not changed. ${details} Do not retry these arguments. Call read_file on this exact path, then use the returned hash; use expected_hash=null only if read_file reports that the path is missing.`,
+    };
+}
 export const writeFileTool = {
     name: 'write_file',
-    description: 'Create or overwrite a file; parent dirs created.',
+    description: 'Create or replace one file transactionally. expected_hash may be omitted (or null) only for create-only writes to a path that must not exist; overwriting requires the hash from a fresh read_file artifact header.',
     risk: 'confirm',
     parameters: {
         type: 'object',
         properties: {
             path: { type: 'string', description: 'File path' },
             content: { type: 'string', description: 'Full file content' },
+            expected_hash: {
+                type: ['string', 'null'],
+                description: 'Optional sha256 hash from read_file. Omit or pass null only when the path must not exist.',
+            },
         },
         required: ['path', 'content'],
     },
-    async execute(args) {
-        const path = String(args.path);
+    async execute(args, ctx) {
+        const file = String(args.path);
         const content = String(args.content);
-        const full = resolve(path);
-        await mkdir(dirname(full), { recursive: true });
-        await writeFile(full, content, 'utf8');
-        const postcondition = await verifyWrittenFile(full, content);
-        if (postcondition.status === 'failed') {
+        let expectedHash = null;
+        // Missing and explicit null are both safe create-only requests. They never
+        // overwrite: ChangeSet compares expectedHash=null against the current path.
+        if (args.expected_hash != null) {
+            expectedHash = normalizeContentHash(String(args.expected_hash));
+            if (!expectedHash)
+                return conflict(file, 'expected_hash 必须是 null 或 sha256:<64 hex>。');
+        }
+        const operation = expectedHash === null ? 'create' : 'update';
+        const result = await commitChangeSet(createChangeSet([{
+                path: file,
+                operation,
+                expectedHash,
+                replacement: content,
+            }]), ctx?.signal);
+        if (result.status === 'conflict') {
+            const item = result.conflicts[0];
+            return conflict(file, `expected=${item?.expectedHash ?? 'missing'}, actual=${item?.actualHash ?? 'missing'}。请重新读取后再写入。`);
+        }
+        if (result.status === 'failed') {
             return {
                 status: 'error',
-                code: 'POSTCONDITION_FAILED',
+                code: 'EXECUTION_ERROR',
                 retryable: false,
-                output: postcondition.diagnostics
-                    .map((item) => `[${item.code ?? 'V0_FAILED'}] ${item.file ?? path}: ${item.message}`)
-                    .join('\n'),
+                changedFiles: [],
+                output: `错误:ChangeSet 提交失败并已执行恢复: ${result.error}`,
             };
         }
-        return `已写入 ${path} (${content.length} 字符, sha256=${postcondition.actualHash})`;
+        const summary = summarizeChangeSet(result.changeSet);
+        return {
+            status: 'success',
+            code: 'OK',
+            retryable: false,
+            changedFiles: result.changedFiles,
+            changeSet: summary,
+            output: result.changedFiles.length === 0
+                ? `文件 ${file} 内容未变化 (ChangeSet ${summary.id})。`
+                : `已事务化写入 ${file} (${content.length} 字符, ChangeSet ${summary.id}, sha256=${summary.changes[0]?.afterHash})。`,
+        };
     },
 };

package/dist/tools/constants.js

@@ -26,7 +26,7 @@ export const IGNORE = ['**/node_modules/**', '**/.git/**'];
 // ── plan 模式(只读规划,不执行)──────────────────────────────────────────────
 /**
  * plan 模式下从工具 schema 里剔除的工具(模型根本看不到 → 调不到):
- * 写盘 / 命令 / 记忆写入类 + task(派生子 agent,plan 模式只读不可有副作用)。单一事实源,
+ * 写盘 / 命令 / 记忆写入类 + sub-agent（派生子 agent，plan 模式只读不可有副作用）。单一事实源,
  * 被 llm(planChatTools)与 agent(防御 backstop)共用。
  * 只读工具(read_file/glob/grep/codegraph/web_search/web_fetch/use_skill/ask_human/memory_search/memory_list)保留。
  */
@@ -37,7 +37,7 @@ export const PLAN_DISABLED_TOOLS = new Set([
     'memory_save',
     'memory_update',
     'memory_forget',
-    'task',
+    'sub-agent',
 ]);
 /**
  * 按当前 isMemoryEnabled() 现算 plan 模式应屏蔽的工具。
@@ -56,5 +56,5 @@ export function getPlanDisabledTools() {
 }
 /** auto/plan 共用的运行时功能开关防线；关闭时即使模型幻觉调用也不得执行。 */
 export function getRuntimeDisabledTools() {
-    return isSubAgentEnabled() ? new Set() : new Set(['task']);
+    return isSubAgentEnabled() ? new Set() : new Set(['sub-agent']);
 }

package/dist/tools/registry.js

@@ -145,7 +145,9 @@ async function executeToolAttempt(tool, args, signal, opts, notifyLockAcquired)
                 opts?.onLockAcquired?.(args);
             const mutationBefore = getCurrentTurnMutationState();
             mutationVersionBefore = mutationBefore.version;
-            const pathCapture = isFileMutationTool(tool.name) && typeof args.path === 'string' && args.path
+            // Transactional tools own their full write-set capture inside ChangeSet commit.
+            const pathCapture = !capabilities.delegatesResourceLocks &&
+                isFileMutationTool(tool.name) && typeof args.path === 'string' && args.path
                 ? beginPathMutation(args.path)
                 : null;
             capturedPath = pathCapture?.path;
@@ -169,7 +171,8 @@ async function executeToolAttempt(tool, args, signal, opts, notifyLockAcquired)
                     : mutationAfter.changedFiles.map((item) => item.path)
                 : [];
             if (signal?.aborted) {
-                return terminalOutcome('aborted', 'ABORTED', String(isStructuredOutcome(raw) ? raw.output : raw), startedAt, changedFiles);
+                const aborted = terminalOutcome('aborted', 'ABORTED', String(isStructuredOutcome(raw) ? raw.output : raw), startedAt, changedFiles);
+                return isStructuredOutcome(raw) ? { ...aborted, usage: raw.usage } : aborted;
             }
             return normalizeOutcome(raw, Date.now() - startedAt, changedFiles);
         });

package/dist/ui/batch.js

@@ -12,6 +12,7 @@
  * 状态全模块级(单实例)——一次 REPL 内所有 batch 共享,清内容区 / 退 alt 屏时统一重置。
  */
 import { ui } from './theme.js';
+import { t } from '../i18n/index.js';
 const batches = new Map();
 /** 绝对行索引 → 所属 batch id(仅记录 summary 行;用于鼠标点击反查)。
  *  buffer 行数变化时本表可能漂移——但只在 insertAfter/deleteFrom 后由本模块同步更新,
@@ -36,7 +37,7 @@ export function reset() {
 /** 新建一个 batch(在 agent 拿到第一条 onToolHeader 时调)。返回 id。 */
 export function beginBatch() {
     const id = `b${++_idCounter}`;
-    batches.set(id, { id, summaryAbsIdx: -1, entries: [], expandedEntries: new Set() });
+    batches.set(id, { id, summaryAbsIdx: -1, entries: [], expandedEntries: new Set(), startedAt: Date.now() });
     return id;
 }
 /** 记一条工具调用(在 onToolHeader 时调,与 setEntryResult 配对;entries 顺序 = agent 调用顺序)。 */
@@ -44,11 +45,13 @@ export function recordCall(id, name, callSummary) {
     const b = batches.get(id);
     if (!b)
         return;
+    // 已完成的累计探索后又追加工具：恢复进行中，待新结果返回再完成。
+    b.finishedAt = undefined;
     b.entries.push({ name, callSummary, resultSummary: '', diffBlock: null });
 }
 /** 记一条工具结果(diff 块或单行 preview);agent 在 onToolResult 时调,匹配最后一条未填的 entry。
  *  fullOutput:工具原始完整输出(纯文本),展开时显示;mutation 工具的 diff 块已自含无需传。 */
-export function recordResult(id, name, resultSummary, diffBlock, fullOutput) {
+export function recordResult(id, name, resultSummary, diffBlock, fullOutput, failed = false) {
     const b = batches.get(id);
     if (!b || b.entries.length === 0)
         return;
@@ -58,6 +61,9 @@ export function recordResult(id, name, resultSummary, diffBlock, fullOutput) {
             b.entries[i].resultSummary = resultSummary;
             b.entries[i].diffBlock = diffBlock;
             b.entries[i].fullOutput = fullOutput;
+            b.entries[i].failed = failed;
+            if (b.entries.every((e) => e.resultSummary || e.diffBlock || e.failed))
+                b.finishedAt = Date.now();
             return;
         }
     }
@@ -67,19 +73,17 @@ export function recordResult(id, name, resultSummary, diffBlock, fullOutput) {
         last.resultSummary = resultSummary;
         last.diffBlock = diffBlock;
         last.fullOutput = fullOutput;
+        last.failed = failed;
+        if (b.entries.every((e) => e.resultSummary || e.diffBlock || e.failed))
+            b.finishedAt = Date.now();
     }
 }
 // ── 摘要行文本生成 ──
 /** 把 entry 列表压缩成一行摘要。 */
-function buildSummaryLine(entries) {
+function buildSummaryLine(record, live = false) {
+    const entries = record.entries;
     if (entries.length === 0) {
-        return `  ${ui.bold}${ui.accent}●${ui.reset} ${ui.dim}No tools${ui.reset}`;
-    }
-    if (entries.length === 1) {
-        const e = entries[0];
-        // 实时摘要必须稳定保持单行；完整参数放在第一层工具概要中，避免长 JSON 自动折行后
-        // 原地刷新只能覆盖最后一条物理行、残留旧摘要前半段。
-        return `  ${ui.bold}${ui.accent}●${ui.reset} ${ui.dim}Ran 1 tool · ${e.name} 1${ui.reset}`;
+        return `  ${ui.dim}│${ui.reset} ${ui.bold}${ui.accent}◇${ui.reset} ${ui.dim}No tools${ui.reset}`;
     }
     // N>1:同类合并 "read_file 3, glob 1, grep 1"
     const counts = new Map();
@@ -88,7 +92,23 @@ function buildSummaryLine(entries) {
     const parts = [];
     for (const [n, c] of counts)
         parts.push(`${n} ${c}`);
-    return `  ${ui.bold}${ui.accent}●${ui.reset} ${ui.dim}Ran ${entries.length} tools · ${parts.join(', ')}${ui.reset}`;
+    const completed = entries.filter((e) => e.resultSummary || e.diffBlock || e.failed).length;
+    const failed = entries.some((e) => e.failed);
+    // 工具本身完成就立即显示完成态，不等待整轮正文流完/onDone。
+    const finished = completed >= entries.length;
+    const symbol = failed ? '×' : finished ? '◆' : '◇';
+    const color = failed ? ui.red : finished ? ui.green : ui.accent;
+    const label = failed
+        ? t('agent.toolsFailed')
+        : finished
+            ? t('agent.toolsComplete')
+            : t('agent.toolsRunning');
+    const progress = live && !finished ? `  ${completed}/${entries.length}` : `  ${entries.length}`;
+    const elapsedMs = record.finishedAt ? record.finishedAt - record.startedAt : 0;
+    const elapsed = record.finishedAt
+        ? `  ${elapsedMs < 100 ? '<0.1s' : `${(elapsedMs / 1000).toFixed(1)}s`}`
+        : '';
+    return `  ${ui.bold}${color}${symbol}${ui.reset} ${label}${progress}${elapsed}  ${ui.dim}${parts.join('  ')}${ui.reset}`;
 }
 // ── 展开/折叠 ──
 /** 把 batch 的详情行展开成自洽行数组(供 layout.contentInsertAfter 走 mid-buffer 插入)。
@@ -105,7 +125,8 @@ function buildEntryDetailLines(e, indent = '      ') {
                 continue; // 折叠连续空行
             if (line === '' && lines.length > 0)
                 continue; // 跳过首尾空行(diff 头/尾换行)
-            lines.push(line.endsWith('\x1B[0m') ? line : line + '\x1B[0m');
+            const prefixed = `${ui.dim}${indent}${ui.reset}${line}`;
+            lines.push(prefixed.endsWith('\x1B[0m') ? prefixed : prefixed + '\x1B[0m');
         }
     }
     else if (e.fullOutput) {
@@ -126,24 +147,30 @@ function buildEntryDetailLines(e, indent = '      ') {
     return lines;
 }
 /** 第一层只展示有哪些调用及其简短结果，不展开完整输出。 */
-function buildExpandedLines(entries, indent = '    ') {
-    return entries.map((e) => {
+function buildExpandedLines(entries) {
+    return entries.map((e, index) => {
         const result = e.resultSummary ? `  ${ui.gray}↳ ${e.resultSummary}${ui.reset}` : '';
-        return `${indent}${ui.bold}${ui.accent}●${ui.reset} ${ui.accent}${e.name}${ui.reset}  ${ui.dim}${e.callSummary}${ui.reset}${result}\x1B[0m`;
+        const branch = index === entries.length - 1 ? '└─' : '├─';
+        const failure = e.failed ? `${ui.red}×${ui.reset} ` : '';
+        return `    ${ui.dim}${branch}${ui.reset} ${failure}${ui.accent}${e.name}${ui.reset}  ${ui.dim}${e.callSummary}${ui.reset}${result}\x1B[0m`;
     });
 }
+function entryDetailIndent(entries, index) {
+    return index < entries.length - 1 ? '    │  ' : '       ';
+}
 /** 在 batch 收尾时(onToolBatchEnd):写摘要行 + 登记 summaryAbsIdx;若已展开(回放场景)立即插详情。 */
 export function endBatch(id, layout) {
     const b = batches.get(id);
     if (!b)
         return;
+    b.finishedAt ??= Date.now();
     if (b.summaryAbsIdx >= 0) {
-        layout.contentReplaceLine?.(b.summaryAbsIdx, buildSummaryLine(b.entries));
+        layout.contentReplaceLine?.(b.summaryAbsIdx, buildSummaryLine(b));
         // 执行阶段只展示实时摘要；到 endBatch 才开放点击，避免未完成 batch 的第一层列表失步。
         absLineToBatchId.set(b.summaryAbsIdx, b.id);
         return;
     }
-    const summary = buildSummaryLine(b.entries);
+    const summary = buildSummaryLine(b);
     // 写摘要行(以 \n 收尾;contentWrite 会 breakRow 让其成为完整物理行)
     layout.contentWrite(summary + '\n');
     // 摘要行绝对索引 = totalRows - 2(hasCurrent 那行是新空行)
@@ -157,7 +184,7 @@ export function showLiveBatch(id, layout) {
     const b = batches.get(id);
     if (!b)
         return;
-    const summary = buildSummaryLine(b.entries);
+    const summary = buildSummaryLine(b, true);
     if (b.summaryAbsIdx < 0) {
         layout.contentWrite(summary + '\n');
         b.summaryAbsIdx = Math.max(0, layout.totalRows() - 2);
@@ -211,7 +238,7 @@ export function expandSingleEntryFully(id, layout) {
         return;
     const lines = [
         ...buildExpandedLines(b.entries),
-        ...buildEntryDetailLines(b.entries[0]),
+        ...buildEntryDetailLines(b.entries[0], entryDetailIndent(b.entries, 0)),
     ];
     layout.contentInsertAfter(b.summaryAbsIdx, lines);
     expandedBatches.add(id);
@@ -220,8 +247,9 @@ export function expandSingleEntryFully(id, layout) {
 }
 function collapse(b, layout) {
     let lineCount = b.entries.length;
-    for (const i of b.expandedEntries)
-        lineCount += buildEntryDetailLines(b.entries[i]).length;
+    for (const i of b.expandedEntries) {
+        lineCount += buildEntryDetailLines(b.entries[i], entryDetailIndent(b.entries, i)).length;
+    }
     layout.contentDeleteFrom(b.summaryAbsIdx + 1, lineCount);
     expandedBatches.delete(b.id);
     b.expandedEntries.clear();
@@ -246,7 +274,7 @@ export function toggleEntry(batchId, entryIndex, layout) {
     }
     if (headerIdx < 0)
         return;
-    const details = buildEntryDetailLines(b.entries[entryIndex]);
+    const details = buildEntryDetailLines(b.entries[entryIndex], entryDetailIndent(b.entries, entryIndex));
     if (details.length === 0)
         return;
     if (b.expandedEntries.has(entryIndex)) {
@@ -303,8 +331,8 @@ export function shiftBatchesAfter(absIdx, delta) {
     }
 }
 // ── history 回放支持 ──
-/** 把已构造好的 BatchEntry[] 直接落成摘要行(用于 renderHistory 回放;不记录 id 也不需可切换)。
- *  含 mutation(write_file/edit_file)时整批展开——与实时 endBatch 行为一致。 */
+/** 把已构造好的 BatchEntry[] 落成可切换摘要行(用于 renderHistory 回放)。
+ *  含 mutation(write_file/edit_file)时整批展开；普通批次保留与实时 flushToolBatch 相同的空行边界。 */
 export function writeSummaryOnly(entries, layout) {
     const id = beginBatch();
     const b = batches.get(id);
@@ -315,5 +343,9 @@ export function writeSummaryOnly(entries, layout) {
     if (entries.length === 1 && isMutationToolName(entries[0].name)) {
         expandSingleEntryFully(id, layout);
     }
+    else {
+        // endBatch 已用一个换行结束摘要；再提交当前空行，避免下一段 assistant 正文紧贴工具结果。
+        layout.contentWrite('\n');
+    }
 }
 let _idCounter = 0;

package/dist/ui/layout.js

@@ -3,7 +3,7 @@ import { charWidth, displayWidth, truncateDisplay, truncateDisplayHead, truncate
 import { ui, applyTerminalBackground, resetTerminalBackground } from './theme.js';
 import * as content from './content.js';
 import * as mouse from './mouse.js';
-import { shiftBatchesAfter } from './batch.js';
+import { reset as resetBatches, shiftBatchesAfter } from './batch.js';
 import { copyToClipboard, readClipboard } from './clipboard.js';
 import { renderMarkdown } from './markdown.js';
 import { t } from '../i18n/index.js';
@@ -604,6 +604,10 @@ export function normalizeMutationBoundary() {
     if (scrollOffset === 0)
         repaintViewport();
 }
+/** 命令/Agent 输出→下一条输入气泡前，统一保留恰好一条视觉空行。 */
+export function normalizeInputBoundary() {
+    normalizeMutationBoundary();
+}
 /** 原地刷新一条内容行（行数不变），用于运行中的工具 batch 更新计数。 */
 export function contentReplaceLine(absIdx, line) {
     if (!active)
@@ -616,8 +620,9 @@ export function contentReplaceLine(absIdx, line) {
 }
 /** 清空内容区时通知 batch 渲染器重置(摘要行映射与展开态)。 */
 export function notifyContentReset() {
-    // 动态 import 避免循环;模块级 reset() 只清映射,不动 batch 内部数据(id 与 entries 仍可重用)
-    void import('./batch.js').then((m) => m.reset());
+    // 必须同步清理：clearContent() 后调用方会立即 renderHistory() 重建 batch。
+    // 若异步 reset，旧清理会在回放完成后反过来抹掉新摘要的点击映射。
+    resetBatches();
 }
 // ── viewport 滚动回看(Phase 2)──
 /** 是否处于滚动回看态(offset>0,内容区显历史)。prompt 据此在非滚动键时回尾。 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mocode-ai",
-  "version": "0.7.3",
+  "version": "1.0.2",
   "description": "终端编码 agent:LLM + tool-call 循环 + 流式输出(含思考)+ 16 个工具,接任意 OpenAI 兼容后端。",
   "type": "module",
   "bin": {