aws-runtime-bridge 1.9.0 → 1.9.2

package/dist/routes/terminal.test.js

@@ -3,7 +3,7 @@ import os from "node:os";
 import path from "node:path";
 import { describe, expect, it } from "vitest";
 import { SDK_PROVIDER_DEFINITIONS } from "../adapter/SdkProviderSpi.js";
-import { buildAcodeCommandOutputPath, buildClaudeCodeLaunchConfig, buildRuntimeEnv, buildSdkOutputMetadata, buildToolResultTimelineActionInfo, countTerminalOutputLines, createTerminalOutputDecoder, decodeTerminalOutputChunk, evaluatePersistedSessionReuse, formatCommandInactivityTimeoutNotice, formatCommandOutputSpilloverNotice, formatTerminalPrompt, formatSdkOutputEvent, normalizeTerminalCommandInput, parseTerminalDirectoryChangeTarget, resolveSdkInputMessage, resolveTerminalOutputEncoding, resolveSdkProviderId, resolveSdkSessionDisplayStatus, resolveRuntimeStatusFromProviderEvent, resolveStatusChangeUsage, } from "./terminal.js";
+import { buildAcodeCommandOutputPath, buildClaudeCodeLaunchConfig, buildRuntimeEnv, buildSdkOutputMetadata, buildToolResultTimelineActionInfo, countTerminalOutputLines, createTerminalOutputDecoder, decodeTerminalOutputChunk, evaluatePersistedSessionReuse, formatCommandInactivityTimeoutNotice, formatCommandOutputSpilloverNotice, formatTerminalPrompt, formatSdkOutputEvent, normalizeTerminalCommandInput, parseTerminalDirectoryChangeTarget, resolveSdkInputMessage, resolveTerminalOutputEncoding, resolveSdkProviderId, resolveSdkSessionDisplayStatus, resolveRuntimeStatusFromProviderEvent, resolveStatusChangeRuntimeState, resolveStatusChangeUsage, shouldProbeSdkProcessPid, } from "./terminal.js";
 describe("terminal route validation", () => {
     it("requires agentId and workspacePath for start", () => {
         const validateStartRequest = (body) => {
@@ -90,6 +90,10 @@ describe("terminal route validation", () => {
     });
 });
 describe("SDK startup idle command ordering", () => {
+    it("skips PID probing for in-process ACode sessions", () => {
+        expect(shouldProbeSdkProcessPid("acode")).toBe(false);
+        expect(shouldProbeSdkProcessPid("claude-code")).toBe(true);
+    });
     it("sets idle commands immediately after adapter startup and before PID probing or persistence", async () => {
         const calls = [];
         const adapter = {
@@ -217,10 +221,19 @@ describe("SDK provider event runtime status mapping", () => {
         expect(resolveRuntimeStatusFromProviderEvent(event("thinking"))?.status).toBe("thinking");
         expect(resolveRuntimeStatusFromProviderEvent(event("text_delta"))?.status).toBe("thinking");
     });
+    it("keeps command output chunks from changing the runtime status", () => {
+        expect(resolveRuntimeStatusFromProviderEvent(event("command_output", { text: "stdout chunk", stream: "stdout" }))).toBeUndefined();
+    });
     it("maps AI request events to thinking status with request details", () => {
         const state = resolveRuntimeStatusFromProviderEvent(event("ai_request", {
             model: "test-model",
             endpoint: "https://example.invalid/v1/chat/completions",
+            requestMethod: "POST",
+            requestUrl: "https://example.invalid/v1/chat/completions",
+            requestHeaders: {
+                "Content-Type": "application/json",
+                Authorization: "Bearer ***",
+            },
             stream: true,
             messageCount: 3,
             toolCount: 2,
@@ -234,9 +247,25 @@ describe("SDK provider event runtime status mapping", () => {
         });
         expect(state?.actionInfo?.actionDetail).toContain("模型: test-model");
         expect(state?.actionInfo?.actionDetail).toContain("接口: https://example.invalid/v1/chat/completions");
+        expect(state?.actionInfo?.actionDetail).toContain("方法: POST");
+        expect(state?.actionInfo?.actionDetail).toContain("请求头:\nContent-Type: application/json\nAuthorization: Bearer ***");
         expect(state?.actionInfo?.actionDetail).toContain("最后请求: inspect status");
         expect(state?.actionInfo?.actionDetail).toContain('请求体:\n{"model":"test-model"}');
     });
+    it("does not let idle polling text chunks override waiting_input", () => {
+        expect(resolveRuntimeStatusFromProviderEvent(event("thinking"), "waiting_input")).toBeUndefined();
+        expect(resolveRuntimeStatusFromProviderEvent(event("text_delta"), "waiting_input")).toBeUndefined();
+    });
+    it("still reports AI request details when a request starts from waiting_input", () => {
+        expect(resolveRuntimeStatusFromProviderEvent(event("ai_request", {
+            model: "test-model",
+            requestBody: '{"model":"test-model"}',
+        }), "waiting_input")?.actionInfo).toMatchObject({
+            actionType: "ai_request",
+            actionLabel: "AI请求",
+            actionDetail: expect.stringContaining('请求体:\n{"model":"test-model"}'),
+        });
+    });
     it("maps tool start events to tool_using with action info", () => {
         const state = resolveRuntimeStatusFromProviderEvent(event("tool_use_start", {
             toolName: "mcp__aws__my_task",
@@ -315,8 +344,8 @@ describe("terminal command helpers", () => {
         expect(outputPath).toBe(path.join("D:", "code", "repo", ".agentswork", "acode", "cmd-dist", "2026-02-03", "04", "05", "20260203-040506-007-cmd.out"));
     });
     it("formats ACode long-output and inactivity notices for terminal users", () => {
-        expect(formatCommandOutputSpilloverNotice("/repo/out.txt", 100)).toContain("命令输出超过 100 行");
-        expect(formatCommandOutputSpilloverNotice("/repo/out.txt", 100)).toContain("/repo/out.txt");
+        expect(formatCommandOutputSpilloverNotice("/repo/out.txt", 300)).toContain("命令输出超过 300 行");
+        expect(formatCommandOutputSpilloverNotice("/repo/out.txt", 300)).toContain("/repo/out.txt");
         expect(formatCommandInactivityTimeoutNotice(60_000)).toContain("超过 60 秒没有新的输出");
     });
 });
@@ -343,6 +372,20 @@ describe("resolveSdkProviderId", () => {
     });
 });
 describe("SDK status usage forwarding", () => {
+    it("normalizes idle tool status changes to waiting_input", () => {
+        expect(resolveStatusChangeRuntimeState("tool_using", {
+            actionType: "idle",
+            actionLabel: "监听消息",
+            actionDetail: "aws-mcp/poll_message",
+        })).toEqual({
+            status: "waiting_input",
+            actionInfo: {
+                actionType: "idle",
+                actionLabel: "监听消息",
+                actionDetail: "aws-mcp/poll_message",
+            },
+        });
+    });
     it("keeps accumulated usage from status-change action info", () => {
         expect(resolveStatusChangeUsage({
             usage: { inputTokens: 12000, outputTokens: 345 },
@@ -435,6 +478,20 @@ describe("SDK output forwarding", () => {
         };
         expect(formatSdkOutputEvent(thinkingEvent)).toBe("internal prompt or reasoning");
     });
+    it("formats command output provider events as realtime output chunks", () => {
+        const commandOutputEvent = {
+            type: "command_output",
+            sessionId: "session-1",
+            timestamp: new Date(0).toISOString(),
+            data: {
+                text: "stdout chunk",
+                stream: "stdout",
+                sequence: 7,
+                cwd: "/repo",
+            },
+        };
+        expect(formatSdkOutputEvent(commandOutputEvent)).toBe("stdout chunk");
+    });
     it("formats SDK errors as terminal output and ignores non-output events", () => {
         const errorEvent = {
             type: "error",
@@ -468,7 +525,11 @@ describe("SDK output forwarding", () => {
             type: "ai_request",
             sessionId: "session-1",
             timestamp: new Date(0).toISOString(),
-            data: { model: "test-model", endpoint: "openai-compatible", toolCount: 2 },
+            data: {
+                model: "test-model",
+                endpoint: "openai-compatible",
+                toolCount: 2,
+            },
         };
         const errorEvent = {
             type: "error",
@@ -489,6 +550,28 @@ describe("SDK output forwarding", () => {
             logMessage: "provider failed",
         });
     });
+    it("builds ordered ACode log metadata for command output callbacks", () => {
+        const commandOutputEvent = {
+            type: "command_output",
+            sessionId: "session-1",
+            timestamp: new Date(0).toISOString(),
+            data: {
+                text: "stdout chunk",
+                stream: "stdout",
+                sequence: 7,
+                cwd: "/repo",
+            },
+        };
+        expect(buildSdkOutputMetadata(commandOutputEvent)).toEqual({
+            sourceEventType: "command_output",
+            logCategory: "acode",
+            logLevel: "info",
+            logMessage: "命令输出(stdout #7): stdout chunk",
+            stream: "stdout",
+            sequence: 7,
+            cwd: "/repo",
+        });
+    });
     it("does not mark streaming text chunks as standalone ACode log rows", () => {
         const metadata = buildSdkOutputMetadata({
             type: "text_delta",

package/dist/services/auto-register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auto-register.d.ts","sourceRoot":"","sources":["../../src/services/auto-register.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAmDH;;GAEG;AACH,UAAU,kBAAkB;IAC1B,eAAe;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,oBAAoB;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oCAAoC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mCAAmC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,0BAA0B;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,yCAAyC;IACzC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4BAA4B;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mCAAmC;IACnC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAwBD,wBAAgB,2BAA2B,IAAI,MAAM,EAAE,CAEtD;AAiED;;GAEG;AACH,wBAAgB,6BAA6B,IAAI,MAAM,CAGtD;AAyJD;;;;;;GAMG;AACH,wBAAgB,UAAU,IAAI,kBAAkB,CA2C/C;AAED,wBAAgB,WAAW,IAAI,kBAAkB,EAAE,CA0ClD;AA2PD;;;;;;;;;;GAUG;AACH,wBAAsB,YAAY,CAChC,YAAY,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GACzC,OAAO,CAAC,OAAO,CAAC,CAalB;AAyHD;;GAEG;AACH,wBAAsB,gCAAgC,IAAI,OAAO,CAAC;IAChE,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CAoED;AAED,wBAAsB,yCAAyC,CAC7D,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC;IACT,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CA0ED;AAED,wBAAsB,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC,CAgCnD;AAED;;GAEG;AACH,wBAAgB,oBAAoB;gBAh6BtB,OAAO;iBACN,MAAM;mBACJ,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;kBACvB,IAAI;YACV,MAAM;EA85Bf;AAED;;GAEG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAEtC;AAED;;GAEG;AACH,wBAAgB,aAAa,IAAI,MAAM,GAAG,SAAS,CAElD;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC;IACpD,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CA0ED"}
+{"version":3,"file":"auto-register.d.ts","sourceRoot":"","sources":["../../src/services/auto-register.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAmDH;;GAEG;AACH,UAAU,kBAAkB;IAC1B,eAAe;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,oBAAoB;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oCAAoC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mCAAmC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,0BAA0B;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,yCAAyC;IACzC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4BAA4B;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mCAAmC;IACnC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAuBD,wBAAgB,2BAA2B,IAAI,MAAM,EAAE,CAEtD;AAiED;;GAEG;AACH,wBAAgB,6BAA6B,IAAI,MAAM,CAGtD;AAyJD;;;;;;GAMG;AACH,wBAAgB,UAAU,IAAI,kBAAkB,CA2C/C;AAED,wBAAgB,WAAW,IAAI,kBAAkB,EAAE,CA0ClD;AA2PD;;;;;;;;;;GAUG;AACH,wBAAsB,YAAY,CAChC,YAAY,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GACzC,OAAO,CAAC,OAAO,CAAC,CAalB;AAyHD;;GAEG;AACH,wBAAsB,gCAAgC,IAAI,OAAO,CAAC;IAChE,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CAoED;AAED,wBAAsB,yCAAyC,CAC7D,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC;IACT,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CA0ED;AAED,wBAAsB,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC,CAgCnD;AAED;;GAEG;AACH,wBAAgB,oBAAoB;gBAh6BtB,OAAO;iBACN,MAAM;mBACJ,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;kBACvB,IAAI;YACV,MAAM;EA85Bf;AAED;;GAEG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAEtC;AAED;;GAEG;AACH,wBAAgB,aAAa,IAAI,MAAM,GAAG,SAAS,CAElD;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC;IACpD,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CA0ED"}

package/dist/services/auto-register.js

@@ -14,13 +14,12 @@ import fs from "node:fs";
 import { logger } from "../utils/logger.js";
 import { schedulerBaseUrl } from "../config.js";
 import { clearRuntimeBinding, clearScopedRuntimeAccessToken, getRuntimeAccessToken, getRuntimeBindingPublicState, loadRuntimeBinding, normalizeSchedulerBaseUrl, saveRuntimeBinding, saveScopedRuntimeAccessToken, } from "./runtime-binding.js";
-// 默认配置
 const DEFAULT_CONFIG = {
     enabled: false,
     serverUrl: schedulerBaseUrl,
     preferSameLanIp: true,
-    maxRetries: 5,
-    retryInterval: 5000,
+    maxRetries: 3,
+    retryInterval: 2000,
 };
 let registrationState = {
     registered: false,
@@ -533,8 +532,8 @@ async function autoRegisterSingle(config) {
         return false;
     }
     // tenantId 现在是可选的，如果没有提供，后端会根据 userKey 自动推导
-    const maxRetries = config.maxRetries || 5;
-    const retryInterval = config.retryInterval || 5000;
+    const maxRetries = config.maxRetries ?? 3;
+    const retryInterval = config.retryInterval ?? 2000;
     // 重试循环
     for (let attempt = 1; attempt <= maxRetries; attempt++) {
         try {

package/dist/services/mcp-launch-binding-queue.d.ts

@@ -31,6 +31,11 @@ export interface McpLaunchBindingClaimRequest {
 export declare function enqueueMcpLaunchBinding(input: McpLaunchBindingInput): McpLaunchBinding | null;
 export declare function claimMcpLaunchBinding(request: McpLaunchBindingClaimRequest): ClaimedMcpLaunchBinding | null;
 export declare function getMcpLaunchQueueSize(workspacePath: unknown): number;
+/**
+ * 主流程：按启动绑定 ID 移除尚未被 MCP node 认领的绑定。
+ * 具体逻辑：启动流程失败时调用；若绑定已被认领或 ID 不存在则返回 false，保持幂等。
+ */
+export declare function removeMcpLaunchBinding(bindingId: string): boolean;
 export declare function clearMcpLaunchBindingQueues(): void;
 /**
  * 获取指定 agent 的最新 MCP session token。

package/dist/services/mcp-launch-binding-queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-launch-binding-queue.d.ts","sourceRoot":"","sources":["../../src/services/mcp-launch-binding-queue.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,uBAAwB,SAAQ,gBAAgB;IAC/D,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,4BAA4B;IAC3C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AA2DD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,qBAAqB,GAAG,gBAAgB,GAAG,IAAI,CAyC7F;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,4BAA4B,GAAG,uBAAuB,GAAG,IAAI,CAkD3G;AAED,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,OAAO,GAAG,MAAM,CAOpE;AAED,wBAAgB,2BAA2B,IAAI,IAAI,CAElD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,kBAAkB,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAM1F"}
+{"version":3,"file":"mcp-launch-binding-queue.d.ts","sourceRoot":"","sources":["../../src/services/mcp-launch-binding-queue.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,uBAAwB,SAAQ,gBAAgB;IAC/D,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,4BAA4B;IAC3C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AA2DD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,qBAAqB,GAAG,gBAAgB,GAAG,IAAI,CAyC7F;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,4BAA4B,GAAG,uBAAuB,GAAG,IAAI,CAkD3G;AAED,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,OAAO,GAAG,MAAM,CAOpE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAcjE;AAED,wBAAgB,2BAA2B,IAAI,IAAI,CAElD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,kBAAkB,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAM1F"}

package/dist/services/mcp-launch-binding-queue.js

@@ -142,6 +142,23 @@ export function getMcpLaunchQueueSize(workspacePath) {
     }
     return launchBindings.filter((binding) => normalizeWorkspacePath(binding.workspacePath) === workspaceKey).length;
 }
+/**
+ * 主流程：按启动绑定 ID 移除尚未被 MCP node 认领的绑定。
+ * 具体逻辑：启动流程失败时调用；若绑定已被认领或 ID 不存在则返回 false，保持幂等。
+ */
+export function removeMcpLaunchBinding(bindingId) {
+    pruneExpiredBindings();
+    const normalizedId = String(bindingId || "").trim();
+    if (!normalizedId) {
+        return false;
+    }
+    const index = launchBindings.findIndex((binding) => binding.id === normalizedId);
+    if (index < 0) {
+        return false;
+    }
+    launchBindings.splice(index, 1);
+    return true;
+}
 export function clearMcpLaunchBindingQueues() {
     launchBindings.splice(0, launchBindings.length);
 }

package/dist/services/mcp-launch-binding-queue.test.js

@@ -1,5 +1,5 @@
 import { afterEach, describe, expect, it } from 'vitest';
-import { claimMcpLaunchBinding, clearMcpLaunchBindingQueues, enqueueMcpLaunchBinding, getMcpLaunchQueueSize, } from './mcp-launch-binding-queue.js';
+import { claimMcpLaunchBinding, clearMcpLaunchBindingQueues, enqueueMcpLaunchBinding, getMcpLaunchQueueSize, removeMcpLaunchBinding, } from './mcp-launch-binding-queue.js';
 describe('mcp launch binding queue', () => {
     afterEach(() => {
         clearMcpLaunchBindingQueues();
@@ -157,6 +157,21 @@ describe('mcp launch binding queue', () => {
         expect(claimMcpLaunchBinding({ workspacePath: 'C:/repo/b', serverUrl: 'ws://server:7380/ws/agent' })?.agentId).toBe('agent-b');
         expect(claimMcpLaunchBinding({ workspacePath: 'C:/repo/a', serverUrl: 'ws://server:7380/ws/agent' })?.agentId).toBe('agent-a');
     });
+    it('removes a stale launch binding by id after a failed start', () => {
+        const binding = enqueueMcpLaunchBinding({
+            agentId: 'agent-a',
+            workspacePath: 'C:/repo/demo',
+            serverUrl: 'ws://server:7380/ws/agent',
+        });
+        expect(binding).not.toBeNull();
+        expect(removeMcpLaunchBinding(binding?.id || '')).toBe(true);
+        expect(claimMcpLaunchBinding({
+            agentId: 'agent-a',
+            workspacePath: 'C:/repo/demo',
+            serverUrl: 'ws://server:7380/ws/agent',
+        })).toBeNull();
+        expect(getMcpLaunchQueueSize('C:/repo/demo')).toBe(0);
+    });
     it('returns null for missing or invalid workspaces', () => {
         expect(enqueueMcpLaunchBinding({ agentId: '', workspacePath: 'C:/repo/demo' })).toBeNull();
         expect(enqueueMcpLaunchBinding({ agentId: 'agent-a', workspacePath: '' })).toBeNull();

package/dist/services/session-output.d.ts

@@ -21,6 +21,11 @@ export interface RuntimeOutputMetadata {
     logLevel?: "info" | "warn" | "error";
     logMessage?: string;
     logCategory?: string;
+    stream?: string;
+    sequence?: number;
+    cwd?: string;
+    commandFilePath?: string;
+    commandLineCount?: number;
 }
 /** 活跃会话存储 */
 export declare const sessions: Map<string, Session>;

package/dist/services/session-output.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-output.d.ts","sourceRoot":"","sources":["../../src/services/session-output.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAG3C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAI3C,UAAU,uBAAuB;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,0BAA0B;IACzC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,qBAAqB;IACpC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AA8BD,aAAa;AACb,eAAO,MAAM,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAa,CAAC;AAExD;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,uBAAuB,EACpC,KAAK,CAAC,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,EACrD,WAAW,CAAC,EAAE,0BAA0B,GACvC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC,CA4C7C;AAED;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,qBAAqB,EAChC,WAAW,CAAC,EAAE,0BAA0B,GACvC,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,0BAA0B,GACvC,OAAO,CAAC,IAAI,CAAC,CAef;AAED,MAAM,WAAW,yBAAyB;IACxC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,IAAI,CAAC,CAef;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAgBzE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAa3D;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqCzE"}
+{"version":3,"file":"session-output.d.ts","sourceRoot":"","sources":["../../src/services/session-output.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAG3C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAI3C,UAAU,uBAAuB;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,0BAA0B;IACzC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,qBAAqB;IACpC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AA8BD,aAAa;AACb,eAAO,MAAM,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAa,CAAC;AAExD;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,uBAAuB,EACpC,KAAK,CAAC,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,EACrD,WAAW,CAAC,EAAE,0BAA0B,GACvC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC,CA4C7C;AAED;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,qBAAqB,EAChC,WAAW,CAAC,EAAE,0BAA0B,GACvC,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,0BAA0B,GACvC,OAAO,CAAC,IAAI,CAAC,CAef;AAED,MAAM,WAAW,yBAAyB;IACxC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,IAAI,CAAC,CAef;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAgBzE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAa3D;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqCzE"}

package/package/acode/dist/built-in-file-tools.d.ts

@@ -1,3 +1,4 @@
+import { type CommandOutputSink } from "./builtins/shellCommandRunner.js";
 export type JsonValue = string | number | boolean | null | JsonValue[] | {
     [key: string]: JsonValue;
 };
@@ -10,7 +11,10 @@ export interface ACodeBuiltInTool {
     exposedName: string;
     description: string;
     inputSchema: JsonObject;
-    execute(args: JsonObject): Promise<unknown>;
+    execute(args: JsonObject, context?: ACodeBuiltInToolExecutionContext): Promise<unknown>;
+}
+export interface ACodeBuiltInToolExecutionContext {
+    readonly onOutput?: CommandOutputSink;
 }
 export declare function createBuiltInFileTools(workingDirectory: string): ACodeBuiltInTool[];
 //# sourceMappingURL=built-in-file-tools.d.ts.map

package/package/acode/dist/built-in-file-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"built-in-file-tools.d.ts","sourceRoot":"","sources":["../src/built-in-file-tools.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,SAAS,GACjB,MAAM,GACN,MAAM,GACN,OAAO,GACP,IAAI,GACJ,SAAS,EAAE,GACX;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AACjC,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAEtD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,UAAU,CAAC;IACxB,OAAO,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC7C;AAyvBD,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,MAAM,GACvB,gBAAgB,EAAE,CAOpB"}
+{"version":3,"file":"built-in-file-tools.d.ts","sourceRoot":"","sources":["../src/built-in-file-tools.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,kCAAkC,CAAC;AAE1C,MAAM,MAAM,SAAS,GACjB,MAAM,GACN,MAAM,GACN,OAAO,GACP,IAAI,GACJ,SAAS,EAAE,GACX;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AACjC,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC;AAEtD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,UAAU,CAAC;IACxB,OAAO,CACL,IAAI,EAAE,UAAU,EAChB,OAAO,CAAC,EAAE,gCAAgC,GACzC,OAAO,CAAC,OAAO,CAAC,CAAC;CACrB;AAED,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC;CACvC;AAsfD,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,MAAM,GACvB,gBAAgB,EAAE,CAOpB"}

package/package/acode/dist/built-in-file-tools.js

@@ -1,7 +1,7 @@
-import { spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import { promises as fs } from "node:fs";
 import path from "node:path";
+import { runShellCommand, } from "./builtins/shellCommandRunner.js";
 function toDisplayPath(targetPath) {
     return targetPath.replace(/\\/g, "/");
 }
@@ -178,208 +178,10 @@ async function readFileInsideWorkspace(workingDirectory, filePath) {
         content: await fs.readFile(realTargetPath, "utf-8"),
     };
 }
-const DEFAULT_COMMAND_TIMEOUT_MS = 30_000;
 const MAX_COMMAND_TIMEOUT_MS = 10 * 60_000;
+const DEFAULT_COMMAND_TIMEOUT_MS = MAX_COMMAND_TIMEOUT_MS;
 const DEFAULT_COMMAND_INACTIVITY_TIMEOUT_MS = 60_000;
 const MAX_COMMAND_INACTIVITY_TIMEOUT_MS = 10 * 60_000;
-const MAX_COMMAND_OUTPUT_BYTES = 128 * 1024;
-const COMMAND_OUTPUT_SPILLOVER_LINE_LIMIT = 100;
-function padDatePart(value) {
-    return String(value).padStart(2, "0");
-}
-function countOutputLines(output) {
-    if (!output) {
-        return 0;
-    }
-    const normalized = output.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-    const withoutTrailingLineBreak = normalized.endsWith("\n")
-        ? normalized.slice(0, -1)
-        : normalized;
-    return withoutTrailingLineBreak
-        ? withoutTrailingLineBreak.split("\n").length
-        : 1;
-}
-function buildCommandOutputSpilloverPath(workspaceRoot, now = new Date()) {
-    const year = now.getFullYear();
-    const month = padDatePart(now.getMonth() + 1);
-    const day = padDatePart(now.getDate());
-    const hour = padDatePart(now.getHours());
-    const minute = padDatePart(now.getMinutes());
-    const timestamp = `${year}${month}${day}-${hour}${minute}${padDatePart(now.getSeconds())}-${String(now.getMilliseconds()).padStart(3, "0")}-${process.pid}-${randomUUID().slice(0, 8)}`;
-    return path.join(workspaceRoot, ".agentswork", "acode", "cmd-dist", `${year}-${month}-${day}`, hour, minute, `${timestamp}-cmd.out`);
-}
-async function writeCommandOutputSpilloverFile(workspaceRoot, content) {
-    const targetPath = buildCommandOutputSpilloverPath(workspaceRoot);
-    await fs.mkdir(path.dirname(targetPath), { recursive: true });
-    await fs.writeFile(targetPath, content, "utf-8");
-    return targetPath;
-}
-function buildCommandOutputSpilloverContent(input) {
-    return [
-        `Command: ${input.commandText}`,
-        `CWD: ${input.cwd}`,
-        `Started: ${input.startedAt.toISOString()}`,
-        `Ended: ${input.endedAt.toISOString()}`,
-        `Exit code: ${input.exitCode ?? "null"}`,
-        `Signal: ${input.signal ?? "null"}`,
-        `Timed out: ${input.timedOut}`,
-        `Timed out by inactivity: ${input.inactivityTimedOut}`,
-        "",
-        "--- stdout ---",
-        input.stdout,
-        "",
-        "--- stderr ---",
-        input.stderr,
-    ].join("\n");
-}
-function formatCommandOutputSpilloverStdout(outputFilePath, outputLineCount) {
-    return [
-        `[ACode] 命令输出超过 ${COMMAND_OUTPUT_SPILLOVER_LINE_LIMIT} 行（共 ${outputLineCount} 行），完整输出已写入: ${toDisplayPath(outputFilePath)}`,
-        "[ACode] Agent 可自行读取该文件，或在该文件中搜索需要的内容。",
-        "",
-    ].join("\n");
-}
-function truncateOutput(value) {
-    const bytes = Buffer.byteLength(value, "utf-8");
-    if (bytes <= MAX_COMMAND_OUTPUT_BYTES) {
-        return { text: value, truncated: false };
-    }
-    const buffer = Buffer.from(value, "utf-8");
-    return {
-        text: buffer.subarray(0, MAX_COMMAND_OUTPUT_BYTES).toString("utf-8") +
-            `\n...[truncated after ${MAX_COMMAND_OUTPUT_BYTES} bytes]`,
-        truncated: true,
-    };
-}
-function shellExecutable() {
-    if (process.platform === "win32") {
-        return {
-            command: process.env.ComSpec || "cmd.exe",
-            argsPrefix: ["/d", "/s", "/c"],
-        };
-    }
-    return { command: process.env.SHELL || "/bin/sh", argsPrefix: ["-lc"] };
-}
-function runShellCommand(commandText, workspaceRoot, cwd, timeoutMs, inactivityTimeoutMs) {
-    return new Promise((resolve, reject) => {
-        const shell = shellExecutable();
-        const startedAt = new Date();
-        const child = spawn(shell.command, [...shell.argsPrefix, commandText], {
-            cwd,
-            env: process.env,
-            windowsHide: true,
-        });
-        let stdout = "";
-        let stderr = "";
-        let timedOut = false;
-        let inactivityTimedOut = false;
-        let killEscalationTimer;
-        let inactivityTimer;
-        const escalateKill = () => {
-            killEscalationTimer = setTimeout(() => {
-                if (!child.killed) {
-                    child.kill("SIGKILL");
-                }
-            }, 1000);
-            killEscalationTimer.unref?.();
-        };
-        const timer = setTimeout(() => {
-            timedOut = true;
-            child.kill("SIGTERM");
-            escalateKill();
-        }, timeoutMs);
-        timer.unref?.();
-        const resetInactivityTimer = () => {
-            if (inactivityTimer) {
-                clearTimeout(inactivityTimer);
-            }
-            inactivityTimer = setTimeout(() => {
-                inactivityTimedOut = true;
-                timedOut = true;
-                child.kill("SIGTERM");
-                escalateKill();
-            }, inactivityTimeoutMs);
-            inactivityTimer.unref?.();
-        };
-        resetInactivityTimer();
-        child.stdout?.setEncoding("utf-8");
-        child.stderr?.setEncoding("utf-8");
-        child.stdout?.on("data", (chunk) => {
-            stdout += chunk;
-            resetInactivityTimer();
-        });
-        child.stderr?.on("data", (chunk) => {
-            stderr += chunk;
-            resetInactivityTimer();
-        });
-        child.on("error", (error) => {
-            clearTimeout(timer);
-            if (inactivityTimer) {
-                clearTimeout(inactivityTimer);
-            }
-            if (killEscalationTimer) {
-                clearTimeout(killEscalationTimer);
-            }
-            reject(error);
-        });
-        child.on("close", async (exitCode, signal) => {
-            clearTimeout(timer);
-            if (inactivityTimer) {
-                clearTimeout(inactivityTimer);
-            }
-            if (killEscalationTimer) {
-                clearTimeout(killEscalationTimer);
-            }
-            const endedAt = new Date();
-            const outputLineCount = countOutputLines(`${stdout}${stderr}`);
-            try {
-                if (outputLineCount > COMMAND_OUTPUT_SPILLOVER_LINE_LIMIT) {
-                    const outputFilePath = await writeCommandOutputSpilloverFile(workspaceRoot, buildCommandOutputSpilloverContent({
-                        commandText,
-                        cwd,
-                        startedAt,
-                        endedAt,
-                        exitCode,
-                        signal,
-                        timedOut,
-                        inactivityTimedOut,
-                        stdout,
-                        stderr,
-                    }));
-                    resolve({
-                        exitCode,
-                        signal,
-                        stdout: formatCommandOutputSpilloverStdout(outputFilePath, outputLineCount),
-                        stderr: "",
-                        durationMs: endedAt.getTime() - startedAt.getTime(),
-                        timedOut,
-                        inactivityTimedOut,
-                        outputSpilled: true,
-                        outputFilePath: toDisplayPath(outputFilePath),
-                        outputLineCount,
-                    });
-                    return;
-                }
-                const truncatedStdout = truncateOutput(stdout);
-                const truncatedStderr = truncateOutput(stderr);
-                resolve({
-                    exitCode,
-                    signal,
-                    stdout: truncatedStdout.text,
-                    stderr: truncatedStderr.text,
-                    durationMs: endedAt.getTime() - startedAt.getTime(),
-                    timedOut,
-                    inactivityTimedOut,
-                    outputSpilled: false,
-                    outputLineCount,
-                });
-            }
-            catch (error) {
-                reject(error);
-            }
-        });
-    });
-}
 function writeFileTool(workingDirectory) {
     return {
         kind: "builtin",
@@ -512,7 +314,7 @@ function bashTool(workingDirectory) {
                 },
                 timeout_ms: {
                     type: "number",
-                    description: "Optional timeout in milliseconds. Defaults to 30000 and is capped at 600000.",
+                    description: "Optional timeout in milliseconds. Defaults to 600000 and is capped at 600000.",
                 },
                 inactivity_timeout_ms: {
                     type: "number",
@@ -526,7 +328,7 @@ function bashTool(workingDirectory) {
             required: ["command"],
             additionalProperties: false,
         },
-        async execute(args) {
+        async execute(args, context) {
             const command = readStringArg(args, ["command"], "command").trim();
             if (!command) {
                 throw new Error("command must not be empty");
@@ -537,7 +339,14 @@ function bashTool(workingDirectory) {
             const inactivityTimeoutMs = Math.min(requestedInactivityTimeoutMs, MAX_COMMAND_INACTIVITY_TIMEOUT_MS);
             const cwdArg = readOptionalStringArg(args, ["cwd"]);
             const resolved = await resolveWorkspaceDirectory(workingDirectory, cwdArg);
-            const result = await runShellCommand(command, resolved.workspaceRoot, resolved.cwd, timeoutMs, inactivityTimeoutMs);
+            const result = await runShellCommand({
+                commandText: command,
+                workspaceRoot: resolved.workspaceRoot,
+                cwd: resolved.cwd,
+                timeoutMs,
+                inactivityTimeoutMs,
+                onOutput: context?.onOutput,
+            });
             return {
                 ok: result.exitCode === 0 && !result.timedOut,
                 tool: "Bash",
@@ -553,6 +362,8 @@ function bashTool(workingDirectory) {
                 outputSpilled: result.outputSpilled,
                 outputFilePath: result.outputFilePath,
                 outputLineCount: result.outputLineCount,
+                commandFilePath: result.commandFilePath,
+                commandLineCount: result.commandLineCount,
                 stdout: result.stdout,
                 stderr: result.stderr,
             };

package/package/acode/dist/builtins/commandArtifacts.d.ts

@@ -0,0 +1,25 @@
+export declare const COMMAND_OUTPUT_SPILLOVER_LINE_LIMIT = 300;
+export declare const LONG_COMMAND_LINE_LIMIT = 300;
+export declare const MAX_COMMAND_OUTPUT_BYTES: number;
+export declare function toDisplayPath(targetPath: string): string;
+export declare function countOutputLines(output: string): number;
+export declare function writeCommandArtifactFile(workspaceRoot: string, suffix: string, extension: string, content: string, now?: Date): Promise<string>;
+export declare function buildCommandOutputSpilloverContent(input: {
+    readonly commandText: string;
+    readonly commandFilePath?: string;
+    readonly commandLineCount: number;
+    readonly cwd: string;
+    readonly startedAt: Date;
+    readonly endedAt: Date;
+    readonly exitCode: number | null;
+    readonly signal: NodeJS.Signals | null;
+    readonly timedOut: boolean;
+    readonly inactivityTimedOut: boolean;
+    readonly stdout: string;
+    readonly stderr: string;
+}): string;
+export declare function formatCommandOutputSpilloverStdout(outputFilePath: string, outputLineCount: number): string;
+export declare function truncateOutput(value: string): {
+    readonly text: string;
+};
+//# sourceMappingURL=commandArtifacts.d.ts.map

package/package/acode/dist/builtins/commandArtifacts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"commandArtifacts.d.ts","sourceRoot":"","sources":["../../src/builtins/commandArtifacts.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mCAAmC,MAAM,CAAC;AACvD,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAC3C,eAAO,MAAM,wBAAwB,QAAa,CAAC;AAEnD,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAExD;AAMD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAWvD;AA4BD,wBAAsB,wBAAwB,CAC5C,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,GAAG,OAAa,GACf,OAAO,CAAC,MAAM,CAAC,CAUjB;AAED,wBAAgB,kCAAkC,CAAC,KAAK,EAAE;IACxD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;IACvC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,GAAG,MAAM,CAmBT;AAED,wBAAgB,kCAAkC,CAChD,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,MAAM,GACtB,MAAM,CAMR;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAWvE"}