mocode-ai 1.7.9 → 1.7.11

package/dist/tools/builtins/run-command.js

@@ -46,7 +46,7 @@ class BoundedCommandOutput {
     }
 }
 /** Execute a command with the same sandbox, output cap and cancellation semantics as run_command. */
-export async function runCommandRaw(command, timeout = DEFAULT_COMMAND_TIMEOUT_MS, signal, cwd, shell) {
+export async function runCommandRaw(command, timeout = DEFAULT_COMMAND_TIMEOUT_MS, signal, cwd, shell, onOutput) {
     const startedAt = Date.now();
     // 内部调用方(skill 注入等)也走同一钳制:防止任何路径把前台命令挂成无限期持锁。
     const effectiveTimeout = clampCommandTimeout(timeout);
@@ -124,7 +124,16 @@ export async function runCommandRaw(command, timeout = DEFAULT_COMMAND_TIMEOUT_M
         const onAbort = () => {
             terminate('aborted');
         };
-        const onChunk = (chunk) => output.append(chunk.toString('utf8'));
+        const onChunk = (chunk) => {
+            const text = chunk.toString('utf8');
+            output.append(text);
+            try {
+                onOutput?.(text);
+            }
+            catch {
+                // Output observers must not affect the command process lifecycle.
+            }
+        };
         // 先起 timer 再挂事件:finish/onAbort 是闭包,里面要 clearTimeout(timer)。
         // 把 timer 的初始化提到所有引用它的注册点之前,避免依赖"事件回调必然异步"这一前提。
         const timer = setTimeout(() => {
@@ -221,7 +230,7 @@ export const runCommandTool = {
             }
             shell = parsed;
         }
-        const result = await runCommandRaw(command, timeout, ctx?.signal, undefined, shell);
+        const result = await runCommandRaw(command, timeout, ctx?.signal, undefined, shell, ctx?.onOutput);
         const outcome = commandOutcome(result);
         // 钳制要显式告知:模型传了 30min 却按 10min 判超时,不说清它会以为是环境抽风而盲目重试。
         if (args.timeout !== undefined && Number(args.timeout) !== timeout && result.status === 'timed_out') {

package/dist/tools/constants.js

@@ -29,6 +29,10 @@ export const MAX_OLD_TOOL_STUB = 600;
 export const MAX_TRACE_BYTES = 512 * 1024;
 /** 保留的历史 trace 轮转份数(trace.1 .. trace.N),更老的硬删。 */
 export const MAX_TRACE_ROTATIONS = 3;
+/** compacted/ 压缩归档目录总量上限(字节):旧区原文逐段累积,超了从最老 seg 淘汰。
+ *  段大小与窗口正相关(200k 窗口单段约几百 KB),10MiB 约覆盖十几~几十次压缩。
+ *  可用 MOCODE_MAX_COMPACTED_BYTES 覆盖(测试/小盘用)。 */
+export const MAX_COMPACTED_ARCHIVE_BYTES = 10 * 1024 * 1024;
 /** rollback snapshots 压缩前滚动窗口:无论是否 compact,仅保留最近 N 个 user turn 的快照。 */
 export const MAX_SNAPSHOT_TURNS = 50;
 // ── 上下文压缩摘要(见 session/compact.ts defaultSummarize)────────────────

package/dist/tools/ripgrep-client.js

@@ -69,6 +69,9 @@ export function runRipgrep(params, signal) {
     // --no-require-git:rg 默认只在 git 仓库内才读 .gitignore;加上后非 git 项目的 .gitignore
     // 同样生效(实测不加时 ignored/ 会被扫到)。
     const args = ['--json', '--hidden', '--no-require-git', '--path-separator', '/'];
+    // glob 显式指向 gitignore 内的 .mocode(回捞压缩归档等)时放开 VCS ignore。
+    if (params.noIgnoreVcs)
+        args.push('--no-ignore-vcs');
     if (params.context > 0)
         args.push('-C', String(params.context));
     if (params.glob && params.glob !== '**/*')
@@ -169,7 +172,14 @@ export function runRipgrep(params, signal) {
                 handleLine(buffer.trim());
             // exit 2 + stderr = 正则/参数错误;无命中事件时按 regex_error 上报。
             if (code === 2 && byPath.size === 0 && stderr.trim()) {
-                finish({ status: 'regex_error', message: stderr.trim() });
+                const message = stderr.trim();
+                // 过滤器把所有文件排除(典型:glob 指向 .gitignore 内的 .mocode 却没放开 ignore)
+                // 不是正则错误——按无匹配处理,避免误导模型去改 pattern。
+                if (/No files were searched/i.test(message)) {
+                    finish({ status: 'no-match', scanned, truncated });
+                    return;
+                }
+                finish({ status: 'regex_error', message });
                 return;
             }
             if (byPath.size === 0) {

package/dist/tools/tool-runtime.js

@@ -290,6 +290,7 @@ export class ToolRuntime {
                     raw = await tool.execute(args, {
                         signal,
                         callId: opts?.callId,
+                        onOutput: opts?.onOutput,
                         allowedToolNames: opts?.allowedToolNames,
                         delegation: opts?.delegation,
                         readDedup: opts?.readDedup,

package/dist/ui/batch.js

@@ -38,6 +38,8 @@ const callToBatch = new Map();
 const groupChildIndexByCall = new Map();
 /** 展开时完整输出的最大行数;超出截断,避免巨型输出撑爆 viewport。 */
 const MAX_EXPAND_LINES = 200;
+const MAX_LIVE_OUTPUT_CHARS = 256 * 1024;
+const LIVE_OUTPUT_REFRESH_MS = 80;
 /** 自洽行允许的最大显示宽(= 终端 cols)。buffer 行超 cols 会被终端 auto-wrap,
  *  物理行与缓冲行失配 → repaintViewport 的 CUP 寻址全错(屏幕错乱)。 */
 let maxCols = 200;
@@ -66,6 +68,12 @@ export function isMutationToolName(name) {
 }
 /** 通知 buffer 整体清空(clearContent / exitAltScreen / 新一轮 turn)——本模块状态同步归零。 */
 export function reset() {
+    for (const record of batches.values()) {
+        for (const entry of record.entries) {
+            if (entry.liveRefreshTimer)
+                clearTimeout(entry.liveRefreshTimer);
+        }
+    }
     batches.clear();
     absLineToBatchId.clear();
     absLineToEntry.clear();
@@ -154,7 +162,61 @@ export function isBatchComplete(id) {
 /** 记一条工具结果(diff 块或单行 preview);agent 在 onToolResult 时调,匹配最后一条未填的 entry。
  *  fullOutput:工具原始完整输出(纯文本),展开时显示;mutation 工具的 diff 块已自含无需传。
  *  callId:组容器批用,直接把结果填到对应 entry(避免多个 sub-agent 同名时反向匹配错位)。 */
-export function recordResult(id, name, resultSummary, diffBlock, fullOutput, failed = false, callId) {
+function refreshEntryDetails(b, entryIndex, layout) {
+    if (!expandedBatches.has(b.id) || !b.expandedEntries.has(entryIndex))
+        return;
+    const headerIdx = [...absLineToEntry].find(([, target]) => target.batchId === b.id && target.entryIndex === entryIndex)?.[0];
+    if (headerIdx == null)
+        return;
+    const entry = b.entries[entryIndex];
+    const oldCount = entry.renderedDetailCount ?? 0;
+    const lines = buildEntryDetailLines(entry, entryDetailIndent(b.indent ?? ''));
+    const replacement = lines.slice(0, MAX_EXPAND_LINES);
+    if (oldCount > 0)
+        layout.contentDeleteFrom(headerIdx + 1, oldCount);
+    if (replacement.length > 0)
+        layout.contentInsertAfter(headerIdx, replacement, false);
+    entry.renderedDetailCount = replacement.length;
+    entry.renderedDigest = entryLineDigest(entry);
+    layout.contentReplaceLine(headerIdx, buildEntryLine(b, entryIndex, b.indent ?? ''));
+}
+export function recordOutput(callId, chunk, layout) {
+    const batchId = callToBatch.get(callId);
+    const b = batchId ? batches.get(batchId) : undefined;
+    const entryIndex = groupChildIndexByCall.get(callId);
+    if (!b || entryIndex == null || b.entries[entryIndex]?.name !== 'run_command')
+        return;
+    const entry = b.entries[entryIndex];
+    entry.liveOutput = `${entry.liveOutput ?? ''}${chunk}`;
+    if (entry.liveOutput.length > MAX_LIVE_OUTPUT_CHARS) {
+        entry.liveOutput = entry.liveOutput.slice(-MAX_LIVE_OUTPUT_CHARS);
+    }
+    if (!expandedBatches.has(b.id))
+        return;
+    if (!b.expandedEntries.has(entryIndex)) {
+        const headerIdx = [...absLineToEntry].find(([, target]) => target.batchId === b.id && target.entryIndex === entryIndex)?.[0];
+        if (headerIdx != null) {
+            entry.renderedDigest = entryLineDigest(entry);
+            layout.contentReplaceLine(headerIdx, buildEntryLine(b, entryIndex, b.indent ?? ''));
+        }
+        return;
+    }
+    if (entry.liveRefreshTimer)
+        return;
+    const refresh = () => {
+        entry.liveRefreshTimer = undefined;
+        entry.liveRefreshAt = Date.now();
+        refreshEntryDetails(b, entryIndex, layout);
+    };
+    const wait = Math.max(0, LIVE_OUTPUT_REFRESH_MS - (Date.now() - (entry.liveRefreshAt ?? 0)));
+    if (wait === 0)
+        refresh();
+    else {
+        entry.liveRefreshTimer = setTimeout(refresh, wait);
+        entry.liveRefreshTimer.unref();
+    }
+}
+export function recordResult(id, name, resultSummary, diffBlock, fullOutput, failed = false, callId, layout) {
     const b = batches.get(id);
     if (!b || b.entries.length === 0)
         return;
@@ -168,8 +230,14 @@ export function recordResult(id, name, resultSummary, diffBlock, fullOutput, fai
             e.fullOutput = fullOutput;
             e.failed = failed;
             e.done = true;
+            if (e.liveRefreshTimer)
+                clearTimeout(e.liveRefreshTimer);
+            e.liveRefreshTimer = undefined;
+            e.liveOutput = undefined;
             if (b.entries.every(isEntryDone))
                 b.finishedAt = Date.now();
+            if (layout)
+                refreshEntryDetails(b, idx, layout);
             return;
         }
     }
@@ -181,8 +249,14 @@ export function recordResult(id, name, resultSummary, diffBlock, fullOutput, fai
             b.entries[i].fullOutput = fullOutput;
             b.entries[i].failed = failed;
             b.entries[i].done = true;
+            if (b.entries[i].liveRefreshTimer)
+                clearTimeout(b.entries[i].liveRefreshTimer);
+            b.entries[i].liveRefreshTimer = undefined;
+            b.entries[i].liveOutput = undefined;
             if (b.entries.every(isEntryDone))
                 b.finishedAt = Date.now();
+            if (layout)
+                refreshEntryDetails(b, i, layout);
             return;
         }
     }
@@ -194,8 +268,14 @@ export function recordResult(id, name, resultSummary, diffBlock, fullOutput, fai
         last.fullOutput = fullOutput;
         last.failed = failed;
         last.done = true;
+        if (last.liveRefreshTimer)
+            clearTimeout(last.liveRefreshTimer);
+        last.liveRefreshTimer = undefined;
+        last.liveOutput = undefined;
         if (b.entries.every(isEntryDone))
             b.finishedAt = Date.now();
+        if (layout)
+            refreshEntryDetails(b, b.entries.length - 1, layout);
     }
 }
 // ── 摘要行文本生成 ──
@@ -465,11 +545,10 @@ function buildEntryDetailLines(e, indent = DETAIL_INDENT) {
             lines.push(sanitizeRow(prefixed));
         }
     }
-    else if (e.fullOutput) {
-        // 完整工具输出(纯文本):按行展开,每行缩进 + dim 样式;长输出截断到 MAX_EXPAND_LINES 行。
-        // 每行经 sanitizeRow 钳宽:fullOutput 可能含 grep 扫二进制(db/压缩文件)得到的
-        // 超长行 + 控制字符,不钳会让终端 auto-wrap 打乱屏位。
-        const rawLines = e.fullOutput.split('\n');
+    else if (e.liveOutput || e.fullOutput) {
+        // 实时输出优先展示;结束后由 recordResult 替换成最终有界工具结果。
+        // 每行 sanitizeRow 会清除控制字符并钳宽,避免 ANSI/终端控制序列污染 TUI。
+        const rawLines = (e.liveOutput || e.fullOutput || '').split(/\r\n|\n|\r/);
         const truncated = rawLines.length > MAX_EXPAND_LINES;
         const displayLines = truncated ? rawLines.slice(0, MAX_EXPAND_LINES) : rawLines;
         for (const line of displayLines) {
@@ -493,7 +572,7 @@ function buildEntryDetailLines(e, indent = DETAIL_INDENT) {
  * 只取有无不取内容:完整输出可能上万字符,拼进指纹是浪费,且其内容不影响 entry 行渲染。
  */
 function entryLineDigest(e) {
-    return `${e.resultSummary}\u0001${e.diffBlock ? '1' : '0'}\u0001${e.fullOutput ? '1' : '0'}\u0001${e.failed ? '1' : '0'}`;
+    return `${e.resultSummary}\u0001${e.diffBlock ? '1' : '0'}\u0001${e.fullOutput || e.liveOutput ? '1' : '0'}\u0001${e.failed ? '1' : '0'}`;
 }
 /**
  * 第二层展开三角:折叠 ▸ / 展开 ▾。替代原先的 ├─ / └─。
@@ -537,7 +616,7 @@ const DETAIL_RESULT_MARK = '· ';
 /** entry 是否有可展开的详情行。须与 buildEntryDetailLines 的分支一致,
  *  否则会画出点了没反应的三角(toggleEntry 对空 details 直接 return)。 */
 function hasEntryDetail(e) {
-    return Boolean(e.diffBlock || e.fullOutput || e.resultSummary);
+    return Boolean(e.diffBlock || e.fullOutput || e.liveOutput || e.resultSummary);
 }
 /** entry 行的展开三角(含尾随空格与配色)。折叠 dim、展开 accent,一眼区分当前态。 */
 function entryCaret(e, expanded) {
@@ -938,9 +1017,11 @@ export function toggleEntry(batchId, entryIndex, layout) {
     layout.contentReplaceLine(headerIdx, buildEntryLine(b, entryIndex, b.indent ?? ''));
     if (wasExpanded) {
         layout.contentDeleteFrom(headerIdx + 1, details.length);
+        b.entries[entryIndex].renderedDetailCount = 0;
     }
     else {
         layout.contentInsertAfter(headerIdx, details);
+        b.entries[entryIndex].renderedDetailCount = Math.min(details.length, MAX_EXPAND_LINES);
     }
 }
 /**

package/package.json

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