@nowcrew/daemon 0.5.21 → 0.5.22

package/dist/console-formatter.js

@@ -0,0 +1,60 @@
+/**
+ * 单次 runtime execution 的 console 格式化器。
+ * 用 tool_use id 关联 Read 结果,避免将整文件作为普通 tool_result 倾泻到终端。
+ */
+import { buildFilePreview } from "./console-payload.js";
+import { toConsoleLines, TOOL_RESULT_CAP } from "./console.js";
+import { parseUnifiedDiff } from "./unified-diff.js";
+const extract = (content) => {
+    if (typeof content === "string")
+        return content;
+    if (!Array.isArray(content))
+        return "";
+    return content.map((item) => item && typeof item === "object" && typeof item.text === "string"
+        ? item.text : "").filter(Boolean).join("\n");
+};
+const clip = (text) => text.length > TOOL_RESULT_CAP
+    ? `${text.slice(0, TOOL_RESULT_CAP)}… (+${text.length - TOOL_RESULT_CAP})`
+    : text;
+export function createConsoleFormatter() {
+    const pending = new Map();
+    return {
+        format(event) {
+            const rec = event && typeof event === "object" ? event : {};
+            const message = rec.message && typeof rec.message === "object" ? rec.message : undefined;
+            if (rec.type === "assistant" && Array.isArray(message?.content)) {
+                for (const block of message.content) {
+                    if (block.type === "tool_use" && block.id && block.name) {
+                        pending.set(block.id, { name: block.name, ...(block.input ? { input: block.input } : {}) });
+                    }
+                }
+            }
+            if (rec.type === "user" && Array.isArray(message?.content)) {
+                const out = [];
+                for (const block of message.content) {
+                    if (block.type !== "tool_result")
+                        continue;
+                    const text = extract(block.content);
+                    if (!text)
+                        continue;
+                    const tool = block.tool_use_id ? pending.get(block.tool_use_id) : undefined;
+                    if (block.tool_use_id)
+                        pending.delete(block.tool_use_id);
+                    if (!block.is_error && tool?.name === "Read" && typeof tool.input?.file_path === "string") {
+                        const start = typeof tool.input.offset === "number" && Number.isSafeInteger(tool.input.offset)
+                            ? Math.max(1, tool.input.offset) : 1;
+                        const preview = buildFilePreview("read", tool.input.file_path, text, start);
+                        out.push({ stream: "tool_result", text: `Read ${preview.totalLines} line(s) from ${preview.path}`, payload: preview });
+                        continue;
+                    }
+                    const patch = block.is_error ? null : parseUnifiedDiff(text);
+                    out.push(patch
+                        ? { stream: "tool_result", text: `Changed ${patch.files.length} file(s): +${patch.additions} -${patch.deletions}`, payload: patch }
+                        : { stream: "tool_result", text: clip(text) });
+                }
+                return out;
+            }
+            return toConsoleLines(event);
+        },
+    };
+}

package/dist/console-payload.js

@@ -0,0 +1,73 @@
+/**
+ * AgentConsole 的结构化展示协议与有界构造器。
+ * 所有代码/文件预览在 daemon 边界裁剪,避免 server/web 接收整文件。
+ */
+export const CONSOLE_PREVIEW_ROWS = 12;
+export const CONSOLE_PREVIEW_HEAD_ROWS = 8;
+export const CONSOLE_DIFF_ROWS = 40;
+export const CONSOLE_ROW_CHARS = 240;
+const clipRow = (text) => text.length > CONSOLE_ROW_CHARS
+    ? `${text.slice(0, CONSOLE_ROW_CHARS)}…`
+    : text;
+/** 头 8 + 尾 4,中间显式 omitted;小文件全部显示。 */
+export function buildFilePreview(operation, path, content, startLine = 1) {
+    const lines = content ? content.split("\n") : [];
+    const visible = lines.length <= CONSOLE_PREVIEW_ROWS
+        ? lines.map((text, index) => ({ type: "line", line: startLine + index, text: clipRow(text) }))
+        : [
+            ...lines.slice(0, CONSOLE_PREVIEW_HEAD_ROWS).map((text, index) => ({
+                type: "line", line: startLine + index, text: clipRow(text),
+            })),
+            { type: "omitted", count: lines.length - CONSOLE_PREVIEW_ROWS },
+            ...lines.slice(-4).map((text, index) => ({
+                type: "line", line: startLine + lines.length - 4 + index, text: clipRow(text),
+            })),
+        ];
+    return {
+        kind: "file_preview",
+        operation,
+        path,
+        totalLines: lines.length,
+        totalBytes: Buffer.byteLength(content, "utf8"),
+        rows: visible,
+    };
+}
+/** old/new 片段转紧凑带双行号 diff;变更中段超过预算时裁剪。 */
+export function buildSnippetDiff(path, oldText, newText) {
+    const oldLines = oldText ? oldText.split("\n") : [];
+    const newLines = newText ? newText.split("\n") : [];
+    let prefix = 0;
+    while (prefix < oldLines.length && prefix < newLines.length && oldLines[prefix] === newLines[prefix])
+        prefix++;
+    let oldEnd = oldLines.length;
+    let newEnd = newLines.length;
+    while (oldEnd > prefix && newEnd > prefix && oldLines[oldEnd - 1] === newLines[newEnd - 1]) {
+        oldEnd--;
+        newEnd--;
+    }
+    const rows = [];
+    const contextStart = Math.max(0, prefix - 2);
+    for (let index = contextStart; index < prefix; index++) {
+        rows.push({ type: "context", oldLine: index + 1, newLine: index + 1, text: clipRow(oldLines[index]) });
+    }
+    for (let index = prefix; index < oldEnd; index++) {
+        rows.push({ type: "delete", oldLine: index + 1, newLine: null, text: clipRow(oldLines[index]) });
+    }
+    for (let index = prefix; index < newEnd; index++) {
+        rows.push({ type: "add", oldLine: null, newLine: index + 1, text: clipRow(newLines[index]) });
+    }
+    for (let offset = 0; offset < Math.min(2, oldLines.length - oldEnd); offset++) {
+        rows.push({ type: "context", oldLine: oldEnd + offset + 1, newLine: newEnd + offset + 1, text: clipRow(oldLines[oldEnd + offset]) });
+    }
+    const additions = Math.max(0, newEnd - prefix);
+    const deletions = Math.max(0, oldEnd - prefix);
+    if (rows.length <= CONSOLE_DIFF_ROWS)
+        return { kind: "diff_rows", files: [{ path, rows }], additions, deletions };
+    const head = rows.slice(0, 28);
+    const tail = rows.slice(-11);
+    return {
+        kind: "diff_rows",
+        files: [{ path, rows: [...head, { type: "omitted", oldCount: rows.length - 39, newCount: rows.length - 39 }, ...tail] }],
+        additions, deletions, truncated: true,
+    };
+}

package/dist/console.js

@@ -13,6 +13,8 @@
  * kimi(OpenAI 消息风格行)。
  */
 import { detectDaemonLang, translateDaemon } from "./i18n.js";
+import { buildFilePreview, buildSnippetDiff } from "./console-payload.js";
+import { parseUnifiedDiff } from "./unified-diff.js";
 /** 单条工具返回正文上限(超出截断并标注),避免单条把终端/DB 撑爆。 */
 export const TOOL_RESULT_CAP = 4000;
 /** 工具输入摘要上限(标题行那一段)。 */
@@ -95,10 +97,10 @@ function toolPayload(name, input) {
         return { kind: "command", command: clip(input.command, PAYLOAD_TEXT_CAP) };
     }
     if (name === "Edit" && typeof input.file_path === "string") {
-        return diffPayload(input.file_path, input.old_string, input.new_string);
+        return buildSnippetDiff(input.file_path, typeof input.old_string === "string" ? input.old_string : "", typeof input.new_string === "string" ? input.new_string : "");
     }
     if (name === "Write" && typeof input.file_path === "string" && typeof input.content === "string") {
-        return diffPayload(input.file_path, "", input.content);
+        return buildFilePreview("write", input.file_path, input.content);
     }
     if (name === "TodoWrite") {
         const todos = normalizeTodos(input.todos);
@@ -125,7 +127,7 @@ function toolUseChunks(name, input) {
             chunks.push({
                 stream: "tool",
                 text: `⏺ Edit(${clip(file, TOOL_INPUT_CAP)})`,
-                payload: diffPayload(file, rec.old_string, rec.new_string),
+                payload: buildSnippetDiff(file, typeof rec.old_string === "string" ? rec.old_string : "", typeof rec.new_string === "string" ? rec.new_string : ""),
             });
         }
         if (chunks.length)
@@ -170,8 +172,12 @@ function codexItemChunks(item, td) {
                 },
             }];
         const output = item.aggregated_output?.trim();
-        if (output)
-            out.push({ stream: "tool_result", text: clip(output, TOOL_RESULT_CAP) });
+        if (output) {
+            const patch = parseUnifiedDiff(output);
+            out.push(patch
+                ? { stream: "tool_result", text: `Changed ${patch.files.length} file(s): +${patch.additions} -${patch.deletions}`, payload: patch }
+                : { stream: "tool_result", text: clip(output, TOOL_RESULT_CAP) });
+        }
         return out;
     }
     if (item.type === "file_change" && Array.isArray(item.changes)) {

package/dist/execution-event-limit.js

@@ -38,6 +38,11 @@ export function boundExecutionFrame(input, maxBytes) {
     }
     else if (input.type === "execution:console" || input.type === "execution:output") {
         frame = withBoundedString(frame, "text", maxBytes, false);
+        // 富 payload 是可选增强;事件超限时先丢 payload,保留必需 text 帧。
+        if (executionFrameBytes(frame) > maxBytes && "payload" in frame) {
+            const { payload: _payload, ...withoutPayload } = frame;
+            frame = withoutPayload;
+        }
     }
     else if (input.type === "execution:rejected") {
         frame = withBoundedString(frame, "message", maxBytes, true);

package/dist/execution-protocol.js

@@ -191,6 +191,7 @@ export const ExecutionConsoleSchema = z.object({
     executionId: ExecutionIdSchema,
     stream: ConsoleStreamSchema,
     text: z.string(),
+    payload: z.record(z.string(), z.unknown()).optional(),
     seq: SequenceSchema,
     at: TimestampSchema,
 }).strict();

package/dist/execution-runner.js

@@ -422,6 +422,7 @@ export async function runExecution(config, input, dependencies) {
                         executionId: spec.executionId,
                         stream: chunk.stream,
                         text: chunk.text,
+                        ...(chunk.payload ? { payload: chunk.payload } : {}),
                         seq: consoleSequence++,
                         at: now().toISOString(),
                     });

package/dist/local-executor.js

@@ -9,7 +9,7 @@ import { applyProviderEnv, providerFingerprint } from "./provider-env.js";
 import { augmentedPath } from "./runtime-path.js";
 import { extractFinalText, extractRunMeta, normalizeEvent, parseLine, } from "./normalize.js";
 import { readSession, writeSession, pickResumeId, isNearBudget } from "./session.js";
-import { toConsoleLines } from "./console.js";
+import { createConsoleFormatter } from "./console-formatter.js";
 import { capMemoryForInject, capWorkLogForInject } from "./prompt.js";
 import { decodeExternalOutputEvent, extractExternalAnswer, ExternalAnswerDecoder, stripExternalAnswerMarkers, } from "./external-output.js";
 import { cleanupMaterializedAttachments as cleanupAttachments, executionAttachmentDirectory, materializeAttachments, } from "./attachments.js";
@@ -300,6 +300,8 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
         let finalText = null;
         let sentViaCrew = false;
         const externalOutput = new ExternalAnswerDecoder();
+        // 每轮独立:tool_use/result 关联状态不能跨 execution 泄漏。
+        const consoleFormatter = createConsoleFormatter();
         const readline = createInterface({ input: child.stdout });
         readline.on("line", (line) => {
             const event = parseLine(line);
@@ -327,7 +329,7 @@ async function executeLocalUnlocked(input, callbacks, dependencies) {
             for (const text of decodeExternalOutputEvent(runtime.name, event, externalOutput)) {
                 callbacks.onExternalOutput?.(text);
             }
-            for (const chunk of toConsoleLines(event))
+            for (const chunk of consoleFormatter.format(event))
                 callbacks.onConsole?.(chunk);
         });
         let stderrTail = "";

package/dist/unified-diff.js

@@ -0,0 +1,84 @@
+/** 严格、有限的 unified diff 解析器。只有完整文件头 + hunk 才识别,避免误染普通 +/- 日志。 */
+import { CONSOLE_DIFF_ROWS, CONSOLE_ROW_CHARS, } from "./console-payload.js";
+const HUNK = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;
+const clip = (text) => text.length > CONSOLE_ROW_CHARS ? `${text.slice(0, CONSOLE_ROW_CHARS)}…` : text;
+const pathFromHeader = (line) => line.slice(4).split("\t", 1)[0].replace(/^[ab]\//, "");
+export function parseUnifiedDiff(input) {
+    const lines = input.split("\n");
+    const files = [];
+    let additions = 0;
+    let deletions = 0;
+    let cursor = 0;
+    let totalRows = 0;
+    let truncated = false;
+    while (cursor < lines.length) {
+        while (cursor < lines.length && !isFileHeaderPair(lines, cursor))
+            cursor++;
+        if (cursor >= lines.length)
+            break;
+        const oldPath = pathFromHeader(lines[cursor]);
+        const newPath = pathFromHeader(lines[cursor + 1]);
+        const path = newPath === "/dev/null" ? oldPath : newPath;
+        cursor += 2;
+        const rows = [];
+        let sawHunk = false;
+        while (cursor < lines.length && !isFileHeaderPair(lines, cursor)) {
+            const match = lines[cursor].match(HUNK);
+            if (!match) {
+                cursor++;
+                continue;
+            }
+            sawHunk = true;
+            let oldLine = Number(match[1]);
+            let oldRemaining = Number(match[2] ?? 1);
+            let newLine = Number(match[3]);
+            let newRemaining = Number(match[4] ?? 1);
+            cursor++;
+            while (cursor < lines.length && (oldRemaining > 0 || newRemaining > 0)) {
+                const line = lines[cursor];
+                cursor++;
+                if (line === "\")
+                    continue;
+                let row;
+                if (line.startsWith("+")) {
+                    row = { type: "add", oldLine: null, newLine, text: clip(line.slice(1)) };
+                    newLine++;
+                    newRemaining--;
+                    additions++;
+                }
+                else if (line.startsWith("-")) {
+                    row = { type: "delete", oldLine, newLine: null, text: clip(line.slice(1)) };
+                    oldLine++;
+                    oldRemaining--;
+                    deletions++;
+                }
+                else if (line.startsWith(" ")) {
+                    row = { type: "context", oldLine, newLine, text: clip(line.slice(1)) };
+                    oldLine++;
+                    newLine++;
+                    oldRemaining--;
+                    newRemaining--;
+                }
+                else
+                    break;
+                if (totalRows < CONSOLE_DIFF_ROWS) {
+                    rows.push(row);
+                    totalRows++;
+                }
+                else
+                    truncated = true;
+            }
+        }
+        if (sawHunk) {
+            if (truncated && !rows.some((row) => row.type === "omitted"))
+                rows.push({ type: "omitted", oldCount: 1, newCount: 1 });
+            files.push({ path, rows });
+        }
+    }
+    if (!files.length)
+        return null;
+    return { kind: "diff_rows", files, additions, deletions, ...(truncated ? { truncated: true } : {}) };
+}
+function isFileHeaderPair(lines, index) {
+    return lines[index]?.startsWith("--- ") === true && lines[index + 1]?.startsWith("+++ ") === true;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nowcrew/daemon",
-  "version": "0.5.21",
+  "version": "0.5.22",
   "type": "module",
   "description": "crew daemon — 运行在用户机器:拉起/管理 agent 进程,注入 crew CLI,归一化 runtime 事件",
   "license": "Apache-2.0",
@@ -21,7 +21,7 @@
     "cross-spawn": "^7.0.6",
     "ws": "^8",
     "zod": "^3.23.0",
-    "@nowcrew/cli": "^0.4.12"
+    "@nowcrew/cli": "^0.4.6"
   },
   "optionalDependencies": {
     "koffi": "^2.9.0"