mocode-ai 1.4.0 → 1.4.2

package/README.md

@@ -84,7 +84,7 @@ MoCode isn't a chat box with a coat of paint — it's an agent that actually get
 - **Interruptible and reversible** — Ctrl+C interrupts the current turn at any time (kills child processes recursively, rolls history back to before the turn started, leaves no half-finished tool calls). `/rollback` restores file changes from per-turn snapshots, with a per-file keep/undo choice — no git dependency required.
 - **Input safety net** — Long prompts no longer fear a stray Enter: `Ctrl+G` opens an in-TUI composer popup (notepad-style editing — Enter inserts a newline, with soft wrap, selection, copy/cut/paste and undo; Ctrl+S fills the text back into the input box without sending). `Ctrl+R`/`Ctrl+P` fuzzy-search your input history (Enter only fills it back), and the post-send recall window widens to 2 seconds with any-key recall for long inputs.
 - **Sandbox protection** — File reads/writes go through a sandbox that blocks out-of-bounds paths (`../../`, absolute paths outside the root, symlink escapes, etc.), so the agent never touches files outside your working directory.
-- **Computer Use (high-risk, routed only for explicit GUI intent)** — When the request genuinely requires real mouse/keyboard interaction, the router can expose the `computer-control` group and feed each resulting screenshot back to the model. `/cu off` (or `MOCODE_COMPUTER_USE_ENABLED=false`) is a hard veto; `/cu on` merely allows routing and does not keep the tool permanently visible. The blast radius exceeds file tools because OS input bypasses the file sandbox. **Use a VM / sandbox / dedicated test machine**, not a daily driver. Every action still passes the permission gate, and plan mode always blocks it. Windows first; macOS/Linux pending. See `docs/computer-use-design.md`.
+- **Computer Use (high-risk, routed only for explicit GUI intent)** — When the request genuinely requires real mouse/keyboard interaction, the router can expose the `computer-control` group and feed each resulting screenshot back to the model. `/cu off` (or `MOCODE_COMPUTER_USE_ENABLED=false`) is a hard veto; `/cu on` merely allows routing and does not keep the tool permanently visible. The blast radius exceeds file tools because OS input bypasses the file sandbox. **Use a VM / sandbox / dedicated test machine**, not a daily driver. Every action still passes the permission gate, and plan mode always blocks it. Windows first; macOS/Linux pending.
 
 ## Features
 

package/README.zh-CN.md

@@ -83,7 +83,7 @@ mocode 不是一个套壳聊天框,而是一个能真正动手干活的 agent:
 - **可中断、可回滚** — Ctrl+C 随时打断当前轮次(树杀子进程,历史还原到本轮开始前,不留残半的工具调用);`/rollback` 按轮次快照恢复文件改动,逐个文件「保留/撤销」,不依赖 git。
 - **输入安全网** — 长 prompt 不再怕误按 Enter:`Ctrl+G` 弹出 TUI 内「输入面板」(记事本式编辑,Enter=换行、软换行、选区、复制/剪切/粘贴、撤销,Ctrl+S 填回输入框不自动发送);`Ctrl+R`/`Ctrl+P` 模糊搜索历史输入(Enter 只回填不发送);长文本误发后撤回窗口自动放宽到 2 秒且任意键可撤回。
 - **沙箱防护** — 文件读写经沙箱拦截,挡掉越界路径(`../../`、绝对外圈、软链出圈等),不碰工作目录之外的文件。
-- **Computer Use(高危，仅明确 GUI 意图时路由)** — 请求确实需要真实鼠标/键盘交互时，router 才可暴露 `computer-control`，并把每次动作后的截图回灌模型。`/cu off`（或 `MOCODE_COMPUTER_USE_ENABLED=false`）是硬否决；`/cu on` 仅允许按需路由，不会让工具常驻。它会绕过文件沙箱，**强烈建议只在 VM / 沙箱 / 专用测试机里使用**。每个动作仍走权限门，plan 模式永远屏蔽。Windows 首发，macOS/Linux 待接入。设计见 `docs/computer-use-design.md`。
+- **Computer Use(高危，仅明确 GUI 意图时路由)** — 请求确实需要真实鼠标/键盘交互时，router 才可暴露 `computer-control`，并把每次动作后的截图回灌模型。`/cu off`（或 `MOCODE_COMPUTER_USE_ENABLED=false`）是硬否决；`/cu on` 仅允许按需路由，不会让工具常驻。它会绕过文件沙箱，**强烈建议只在 VM / 沙箱 / 专用测试机里使用**。每个动作仍走权限门，plan 模式永远屏蔽。Windows 首发，macOS/Linux 待接入。
 
 ## 特性
 

package/bin/mocode-agent-host.js

@@ -1,3 +1,3 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 // Mocode Work 的本地 Agent Host。stdout 仅输出 NDJSON 协议事件；诊断写 stderr。
 await import('../dist/host/stdio.js');

package/dist/permissions/index.js

@@ -28,7 +28,7 @@ function canonicalProjectRoot(root) {
     return process.platform === 'win32' ? resolved.toLowerCase() : resolved;
 }
 /**
- * computer 工具的 type/key 文本内容审查(docs/computer-use-design.md §1.3):
+ * computer 工具的 type/key 文本内容审查:
  * 命中 URL / 密码形态 / 支付关键词时,无论是否已授权都强制 once 级确认——
  * 这类文本是「把内容敲进任意应用」的载体,不能因 session/项目授权而放行后续所有输入。
  * 纯函数,独立可单测。
@@ -54,7 +54,7 @@ export function permissionFingerprint(tool, args) {
     }
     else if (tool.name === 'computer') {
         // computer:坐标/文本每次不同,进指纹会让每次点击都弹窗(功能上等同不可用)。
-        // 按动作粒度授权:允许一次 left_click = 本会话允许任意坐标的左键(docs/computer-use-design.md §3.6)。
+        // 按动作粒度授权:允许一次 left_click = 本会话允许任意坐标的左键。
         subject = { computer: typeof args.action === 'string' ? args.action : 'unknown' };
     }
     else {
@@ -157,7 +157,7 @@ export async function checkPermission(tool, args, signal, options = {}) {
         return 'allow';
     // computer 的 type/key 命中敏感内容(URL/密码/支付)时强制 once 级确认:
     // 不看任何授权缓存,也不提供 session/项目/永久授权选项——这类文本是「敲进任意应用」的载体,
-    // 一旦放行不该沿用到下一次输入(docs/computer-use-design.md §1.3/§3.6)。
+    // 一旦放行不该沿用到下一次输入。
     const forceOnce = tool.name === 'computer' &&
         (args.action === 'type' || args.action === 'key') &&
         typeof args.text === 'string' &&

package/dist/runtime/input-injector.js

@@ -4,7 +4,7 @@
  * 架构:InputInjector 接口与实现解耦——
  * - 阶段一(MVP,本文件):PowerShell 常驻子进程,stdin 收 NDJSON 动作、stdout 回 NDJSON 结果,
  *   P/Invoke user32.dll(SendInput / SetCursorPos / GetCursorPos / mouse_event)。零新依赖。
- * - 阶段二(终态,docs/computer-use-design.md P4,本轮不做):rust/ enigo 二进制,同协议替换。
+ * - 阶段二(终态,本轮不做):rust/ enigo 二进制,同协议替换。
  *
  * 非 Windows 平台 MVP 显式抛错(诚实降级),不静默假装支持。
  * 键名映射接受 Anthropic 风格键名(Return / Alt_L / ctrl+s),在 TS 侧映射成 VK 码,

package/dist/sandbox/jail.js

@@ -2,7 +2,7 @@
 // 核心:resolve(root, input) → realpath(解软链)→ 前缀校验。
 // 新文件(目标不存在)走「最近存在祖先 realpath 再拼回剩余分量」,同样挡住「祖先是出圈软链」。
 import { realpathSync, existsSync } from 'node:fs';
-import { resolve, relative, isAbsolute, dirname, basename, join } from 'node:path';
+import { resolve, relative, isAbsolute, dirname, basename, join, posix, win32 } from 'node:path';
 import { getSandboxRoot } from './root.js';
 const isWin = process.platform === 'win32';
 /** 当前沙箱根(绝对),未初始化回退 process.cwd()。 */
@@ -59,14 +59,14 @@ export function jailResolve(input) {
     return abs;
 }
 /**
- * glob pattern 校验:拒绝对路径(平台相关的 isAbsolute)与含 `..` 段的 pattern。
+ * glob pattern 校验:同时拒绝 POSIX/Windows 绝对路径与含 `..` 段的 pattern。
  * 返 null = 通过;返 string = 拒绝原因。形如 *.ts 的正常 pattern 放行。
  */
 export function jailGlobPattern(pattern) {
     const p = String(pattern ?? '').trim();
     if (!p)
         return '空 pattern';
-    if (isAbsolute(p))
+    if (posix.isAbsolute(p) || win32.isAbsolute(p))
         return `不得为绝对路径: ${pattern}`;
     const segs = p.split(/[\\/]/);
     if (segs.includes('..'))

package/dist/session/trace-metrics.js

@@ -4,20 +4,29 @@ function countAskHumanCalls(events) {
 }
 export function reduceTraceMetrics(events) {
     const ends = events.filter((event) => event.type === 'tool_call_end');
-    let recovered = false;
-    let hadFailure = false;
+    const failedTools = new Set();
+    const earliestFailureStep = new Map();
+    const recoveredTools = new Set();
     let successes = 0;
     let tokens = 0;
     let hasTokens = false;
     for (const event of ends) {
+        const tool = typeof event.data.tool === 'string' ? event.data.tool : '';
         const status = String(event.data.status ?? 'error');
         if (status === 'success') {
             successes++;
-            if (hadFailure)
-                recovered = true;
+            const failedStep = earliestFailureStep.get(tool);
+            if (tool && failedStep !== undefined && event.step !== undefined && event.step > failedStep) {
+                recoveredTools.add(tool);
+            }
         }
-        else {
-            hadFailure = true;
+        else if (tool) {
+            failedTools.add(tool);
+            if (event.step !== undefined) {
+                const previousStep = earliestFailureStep.get(tool);
+                if (previousStep === undefined || event.step < previousStep)
+                    earliestFailureStep.set(tool, event.step);
+            }
         }
     }
     for (const event of events) {
@@ -34,7 +43,9 @@ export function reduceTraceMetrics(events) {
     return {
         toolCalls: events.filter((event) => event.type === 'tool_call_start').length,
         toolFailures: ends.length - successes,
-        toolRecovery: recovered,
+        toolRecovery: recoveredTools.size > 0,
+        toolRecoveryAttempts: failedTools.size,
+        toolRecoveries: recoveredTools.size,
         firstSuccessRate: ends.length ? successes / ends.length : 1,
         modelRetries,
         retries: modelRetries,

package/dist/tools/builtins/computer.js

@@ -1,5 +1,5 @@
 /**
- * computer 工具:桌面 GUI 操控闭环(设计 docs/computer-use-design.md)。
+ * computer 工具:桌面 GUI 操控闭环。
  *
  * 结构:校验(纯函数,可单测) → 动作前截屏(拿物理分辨率做 norm1000 换算) →
  * InputInjector 注入动作 → 动作后重截屏 → 缩放 → modelAttachments 回灌。

package/dist/ui/batch.js

@@ -55,13 +55,11 @@ function visibleControl(s) {
         .map((part, i) => (i % 2 === 1 ? part : part.replace(/[\x00-\x1f\x7f]/g, '·')))
         .join('');
 }
-/** 自洽行统一收尾:行宽钳到 maxCols + 行末补 reset。
- *  超宽行若直接入 rows[],repaintViewport 逐行 cup+clearLine 直出时终端会
- *  auto-wrap 成多条物理行,把后续所有行的屏位打乱(用户报告:展开含超长行的
- *  工具输出后整屏错乱)。truncateAnsi 保留行内 SGR 且断尾补 reset,再统一 \x1B[0m 收尾。 */
-function sanitizeRow(s) {
+/** 自洽行统一收尾:行宽钳到 cols + 行末补 reset。
+ *  纯函数导出供行宽/控制字符不变量测试；生产渲染默认传模块当前 maxCols。 */
+export function sanitizeRow(s, cols = maxCols) {
     const cleaned = visibleControl(s);
-    return truncateAnsi(cleaned, maxCols) + '\x1B[0m';
+    return truncateAnsi(cleaned, cols) + '\x1B[0m';
 }
 export function isMutationToolName(name) {
     return name === 'write_file' || name === 'edit_file';
@@ -313,23 +311,20 @@ function entryCaret(e, expanded) {
         return CARET_NONE;
     return expanded ? `${ui.accent}${CARET_EXPANDED}${ui.reset} ` : `${ui.dim}${CARET_COLLAPSED}${ui.reset} `;
 }
-/**
- * 单条第一层明细行。三角由 entry 自身的详情展开态决定(▸ 可展开 / ▾ 已展开 / 空白占位),
- * 不再依赖 isLast —— 兄弟条目间没有嵌套语义,画分支符(├─/└─)纯属误导且引入宽度歧义。
- */
-function buildEntryLine(b, index, extraIndent = '') {
+function buildEntryLine(b, index, extraIndent = '', cols = maxCols) {
     const e = b.entries[index];
     const result = e.resultSummary ? `  ${ui.gray}↳ ${e.resultSummary}${ui.reset}` : '';
     const caret = entryCaret(e, b.expandedEntries.has(index));
     const failure = e.failed ? `${ui.red}×${ui.reset} ` : '';
-    return sanitizeRow(`${extraIndent}    ${caret}${failure}${ui.accent}${e.name}${ui.reset}  ${ui.dim}${e.callSummary}${ui.reset}${result}`);
+    return sanitizeRow(`${extraIndent}    ${caret}${failure}${ui.accent}${e.name}${ui.reset}  ${ui.dim}${e.callSummary}${ui.reset}${result}`, cols);
 }
 /** 第一层只展示有哪些调用及其简短结果，不展开完整输出。extraIndent 供子批嵌套加深缩进。
  *  fromIndex:运行态追加渲染时只产出 entries[fromIndex, ...) 的行(已渲染的不能重复输出)。 */
-function buildExpandedLines(b, extraIndent = '', fromIndex = 0) {
+export function buildExpandedLines(b, extraIndent = '', fromIndex = 0, cols = maxCols) {
     const out = [];
-    for (let i = fromIndex; i < b.entries.length; i++)
-        out.push(buildEntryLine(b, i, extraIndent));
+    const start = Math.max(0, Math.min(b.entries.length, Math.floor(fromIndex)));
+    for (let i = start; i < b.entries.length; i++)
+        out.push(buildEntryLine(b, i, extraIndent, cols));
     return out;
 }
 /** 详情行缩进(现在与 index 无关,统一常量;保留签名以免调用点全改)。 */

package/dist/ui/prompt-internal/editor-operations.js

@@ -0,0 +1,56 @@
+function clampCursor(text, cursor) {
+    if (!Number.isFinite(cursor))
+        return text.length;
+    return Math.max(0, Math.min(text.length, Math.floor(cursor)));
+}
+/** 在光标处插入文本，返回更新后的文本与光标。 */
+export function insertTextAt(text, cursor, inserted) {
+    const at = clampCursor(text, cursor);
+    return {
+        text: text.slice(0, at) + inserted + text.slice(at),
+        cursor: at + inserted.length,
+    };
+}
+/** 删除光标前一个 UTF-16 单元；与 readline 提供的字符偏移语义保持一致。 */
+export function deleteBackwardAt(text, cursor) {
+    const at = clampCursor(text, cursor);
+    if (at === 0)
+        return { text, cursor: at };
+    return {
+        text: text.slice(0, at - 1) + text.slice(at),
+        cursor: at - 1,
+    };
+}
+/** 删除光标后的一个 UTF-16 单元。 */
+export function deleteForwardAt(text, cursor) {
+    const at = clampCursor(text, cursor);
+    if (at === text.length)
+        return { text, cursor: at };
+    return {
+        text: text.slice(0, at) + text.slice(at + 1),
+        cursor: at,
+    };
+}
+/** 删除当前逻辑行从行首到光标的内容。 */
+export function deleteToLineStartAt(text, cursor) {
+    const at = clampCursor(text, cursor);
+    const lineStart = text.lastIndexOf('\n', at - 1) + 1;
+    if (lineStart === at)
+        return { text, cursor: at };
+    return {
+        text: text.slice(0, lineStart) + text.slice(at),
+        cursor: lineStart,
+    };
+}
+/** 删除当前逻辑行从光标到行尾的内容；存在换行时一并删除换行并连接下一行。 */
+export function deleteToLineEndAt(text, cursor) {
+    const at = clampCursor(text, cursor);
+    const newline = text.indexOf('\n', at);
+    if (newline < 0) {
+        return at === text.length ? { text, cursor: at } : { text: text.slice(0, at), cursor: at };
+    }
+    return {
+        text: text.slice(0, at) + text.slice(newline + 1),
+        cursor: at,
+    };
+}

package/dist/ui/prompt-internal/editor.js

@@ -8,6 +8,7 @@ import { t } from '../../i18n/index.js';
 import { promptComposer } from '../composer.js';
 import { promptHistorySearch } from '../history-picker.js';
 import { CONFIRM_SEND_MS, LONG_INPUT_CHARS, confirmSendMode, ensurePasteDetector, pasteState } from './paste.js';
+import { deleteBackwardAt, deleteForwardAt, deleteToLineEndAt, deleteToLineStartAt, insertTextAt, } from './editor-operations.js';
 /** 非 TTY / 未进 alt screen 时退化为普通 readline 行输入(无菜单、单行)。 */
 function questionFallback(prompt) {
     return new Promise((res, rej) => {
@@ -218,9 +219,9 @@ export async function promptWithSlashMenu(opts) {
     }
     /** 在光标处插入文本(含换行则落进当前可编辑段,原样保留)。供短粘贴与可打印字符共用。 */
     function insertText(text) {
-        const s = segs[curSeg].text;
-        segs[curSeg].text = s.slice(0, curOff) + text + s.slice(curOff);
-        curOff += text.length;
+        const edit = insertTextAt(segs[curSeg].text, curOff, text);
+        segs[curSeg].text = edit.text;
+        curOff = edit.cursor;
     }
     /** 落一段粘贴文本:长粘贴 → 在此处插入一个只读 chip(把当前可编辑段从光标切开成「前段 + chip + 后段」),
      *  短粘贴 → 作为可编辑文本插入。连续长粘贴会产生相邻 chip,各自独立;两次粘贴之间敲的字是可编辑段,
@@ -477,27 +478,21 @@ export async function promptWithSlashMenu(opts) {
     }
     /** Ctrl+U:删到行首(当前可编辑段内的当前行;已在行首则 no-op,不跨入相邻粘贴块)。 */
     function deleteToLineStart() {
-        const s = segs[curSeg].text;
-        const ls = s.lastIndexOf('\n', curOff - 1) + 1;
-        if (ls === curOff)
+        const edit = deleteToLineStartAt(segs[curSeg].text, curOff);
+        if (edit.text === segs[curSeg].text && edit.cursor === curOff)
             return;
-        segs[curSeg].text = s.slice(0, ls) + s.slice(curOff);
-        curOff = ls;
+        segs[curSeg].text = edit.text;
+        curOff = edit.cursor;
         computeFiltered();
         redraw();
     }
     /** Ctrl+K:删到行尾(当前可编辑段内的当前行;已在行尾则 no-op,不跨入相邻粘贴块)。 */
     function deleteToLineEnd() {
-        const s = segs[curSeg].text;
-        const ne = s.indexOf('\n', curOff);
-        if (ne < 0) {
-            if (curOff === s.length)
-                return;
-            segs[curSeg].text = s.slice(0, curOff);
-        }
-        else {
-            segs[curSeg].text = s.slice(0, curOff) + s.slice(ne + 1);
-        }
+        const edit = deleteToLineEndAt(segs[curSeg].text, curOff);
+        if (edit.text === segs[curSeg].text && edit.cursor === curOff)
+            return;
+        segs[curSeg].text = edit.text;
+        curOff = edit.cursor;
         computeFiltered();
         redraw();
     }
@@ -683,10 +678,10 @@ export async function promptWithSlashMenu(opts) {
         }
         switch (key.name) {
             case 'backspace': {
-                const s = segs[curSeg].text;
-                if (curOff > 0) {
-                    segs[curSeg].text = s.slice(0, curOff - 1) + s.slice(curOff);
-                    curOff--;
+                const edit = deleteBackwardAt(segs[curSeg].text, curOff);
+                if (edit.cursor !== curOff) {
+                    segs[curSeg].text = edit.text;
+                    curOff = edit.cursor;
                     computeFiltered();
                     redraw();
                 }
@@ -712,9 +707,9 @@ export async function promptWithSlashMenu(opts) {
                 return;
             }
             case 'delete': {
-                const s = segs[curSeg].text;
-                if (curOff < s.length) {
-                    segs[curSeg].text = s.slice(0, curOff) + s.slice(curOff + 1);
+                const edit = deleteForwardAt(segs[curSeg].text, curOff);
+                if (edit.text !== segs[curSeg].text) {
+                    segs[curSeg].text = edit.text;
                     computeFiltered();
                     redraw();
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mocode-ai",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "终端编码 agent:LLM + tool-call 循环 + 流式输出(含思考)+ 16 个工具,接任意 OpenAI 兼容后端。",
   "type": "module",
   "bin": {
@@ -28,7 +28,7 @@
     "lint:fix": "eslint . --fix",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
-    "eval:smoke": "tsx evals/smoke.ts && tsx evals/coding/smoke.ts && tsx evals/work-discipline.ts",
+    "eval:smoke": "tsx evals/smoke.ts && tsx evals/coding/smoke.ts && tsx evals/quality-metrics.ts && tsx evals/work-discipline.ts",
     "eval:coding": "tsx evals/coding/runner.ts",
     "eval:coding:list": "tsx evals/coding/runner.ts --list",
     "prepare": "npm run build"