aws-runtime-bridge 1.9.0 → 1.9.1

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

@@ -0,0 +1,14 @@
+import { type CommandOutputEvent, type CommandOutputSink } from "./commandOutputEvents.js";
+import { type ShellCommandResult } from "./shellCommandResult.js";
+export type { CommandOutputEvent, CommandOutputSink };
+export interface RunShellCommandOptions {
+    readonly commandText: string;
+    readonly workspaceRoot: string;
+    readonly cwd: string;
+    readonly timeoutMs: number;
+    readonly inactivityTimeoutMs: number;
+    readonly onOutput?: CommandOutputSink;
+}
+export type { ShellCommandResult };
+export declare function runShellCommand(options: RunShellCommandOptions): Promise<ShellCommandResult>;
+//# sourceMappingURL=shellCommandRunner.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"shellCommandRunner.d.ts","sourceRoot":"","sources":["../../src/builtins/shellCommandRunner.ts"],"names":[],"mappings":"AAEA,OAAO,EACN,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EAEtB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAEN,KAAK,kBAAkB,EACvB,MAAM,yBAAyB,CAAC;AAMjC,YAAY,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,CAAC;AAEtD,MAAM,WAAW,sBAAsB;IACtC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC;CACtC;AAED,YAAY,EAAE,kBAAkB,EAAE,CAAC;AAInC,wBAAsB,eAAe,CACpC,OAAO,EAAE,sBAAsB,GAC7B,OAAO,CAAC,kBAAkB,CAAC,CAqH7B"}

package/package/acode/dist/builtins/shellCommandRunner.js

@@ -0,0 +1,114 @@
+import { spawn } from "node:child_process";
+import { createOutputEventCollector, } from "./commandOutputEvents.js";
+import { prepareShellCommand, shellExecutable, } from "./shellCommandPreparation.js";
+import { resolveClosedShellCommand, } from "./shellCommandResult.js";
+import { createShellOutputDecoder, decodeShellOutputChunk, } from "./shellOutputDecoder.js";
+const KILL_ESCALATION_DELAY_MS = 1000;
+export async function runShellCommand(options) {
+    const shell = shellExecutable();
+    const prepared = await prepareShellCommand(options.commandText, options.workspaceRoot, shell);
+    return new Promise((resolve, reject) => {
+        const startedAt = new Date();
+        const child = spawn(shell.command, [...shell.argsPrefix, prepared.commandText], {
+            cwd: options.cwd,
+            env: process.env,
+            windowsVerbatimArguments: process.platform === "win32",
+            windowsHide: true,
+        });
+        const outputEvents = createOutputEventCollector({
+            cwd: options.cwd,
+            commandLineCount: prepared.commandLineCount,
+            commandFilePath: prepared.commandFilePath,
+            onOutput: options.onOutput,
+        });
+        let stdout = "";
+        let stderr = "";
+        let timedOut = false;
+        let inactivityTimedOut = false;
+        let killEscalationTimer;
+        let inactivityTimer;
+        const stdoutDecoder = createShellOutputDecoder();
+        const stderrDecoder = createShellOutputDecoder();
+        const clearTimers = () => {
+            if (inactivityTimer)
+                clearTimeout(inactivityTimer);
+            if (killEscalationTimer)
+                clearTimeout(killEscalationTimer);
+            inactivityTimer = undefined;
+            killEscalationTimer = undefined;
+        };
+        const escalateKill = () => {
+            if (killEscalationTimer)
+                return;
+            killEscalationTimer = setTimeout(() => {
+                if (!child.killed) {
+                    child.kill("SIGKILL");
+                }
+            }, KILL_ESCALATION_DELAY_MS);
+            killEscalationTimer.unref?.();
+        };
+        const timer = setTimeout(() => {
+            timedOut = true;
+            child.kill("SIGTERM");
+            escalateKill();
+        }, options.timeoutMs);
+        timer.unref?.();
+        const resetInactivityTimer = () => {
+            if (inactivityTimer)
+                clearTimeout(inactivityTimer);
+            inactivityTimer = setTimeout(() => {
+                inactivityTimedOut = true;
+                timedOut = true;
+                child.kill("SIGTERM");
+                escalateKill();
+            }, options.inactivityTimeoutMs);
+            inactivityTimer.unref?.();
+        };
+        resetInactivityTimer();
+        const appendStdout = (text) => {
+            if (!text)
+                return;
+            stdout += text;
+            outputEvents.push("stdout", text);
+            resetInactivityTimer();
+        };
+        const appendStderr = (text) => {
+            if (!text)
+                return;
+            stderr += text;
+            outputEvents.push("stderr", text);
+            resetInactivityTimer();
+        };
+        child.stdout?.on("data", (chunk) => {
+            appendStdout(decodeShellOutputChunk(stdoutDecoder, chunk));
+        });
+        child.stderr?.on("data", (chunk) => {
+            appendStderr(decodeShellOutputChunk(stderrDecoder, chunk));
+        });
+        child.on("error", (error) => {
+            clearTimeout(timer);
+            clearTimers();
+            outputEvents.close();
+            reject(error);
+        });
+        child.on("close", (exitCode, signal) => {
+            clearTimeout(timer);
+            clearTimers();
+            appendStdout(decodeShellOutputChunk(stdoutDecoder, undefined, true));
+            appendStderr(decodeShellOutputChunk(stderrDecoder, undefined, true));
+            outputEvents.close();
+            void resolveClosedShellCommand({
+                exitCode,
+                signal,
+                stdout,
+                stderr,
+                startedAt,
+                timedOut,
+                inactivityTimedOut,
+                prepared,
+                workspaceRoot: options.workspaceRoot,
+                cwd: options.cwd,
+            }).then(resolve, reject);
+        });
+    });
+}

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

@@ -0,0 +1,5 @@
+import { TextDecoder } from "node:util";
+export declare function resolveShellOutputEncoding(platform?: NodeJS.Platform, env?: NodeJS.ProcessEnv): string;
+export declare function createShellOutputDecoder(encoding?: string): TextDecoder;
+export declare function decodeShellOutputChunk(decoder: TextDecoder, chunk?: Buffer, end?: boolean): string;
+//# sourceMappingURL=shellOutputDecoder.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"shellOutputDecoder.d.ts","sourceRoot":"","sources":["../../src/builtins/shellOutputDecoder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAKxC,wBAAgB,0BAA0B,CACzC,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,GAAG,GAAE,MAAM,CAAC,UAAwB,GAClC,MAAM,CAUR;AAED,wBAAgB,wBAAwB,CACvC,QAAQ,SAA+B,GACrC,WAAW,CAMb;AAED,wBAAgB,sBAAsB,CACrC,OAAO,EAAE,WAAW,EACpB,KAAK,CAAC,EAAE,MAAM,EACd,GAAG,UAAQ,GACT,MAAM,CAQR"}

package/package/acode/dist/builtins/shellOutputDecoder.js

@@ -0,0 +1,30 @@
+import { TextDecoder } from "node:util";
+const DEFAULT_WINDOWS_SHELL_OUTPUT_ENCODING = "gb18030";
+const DEFAULT_SHELL_OUTPUT_ENCODING = "utf-8";
+export function resolveShellOutputEncoding(platform = process.platform, env = process.env) {
+    const configuredEncoding = env.ACODE_COMMAND_OUTPUT_ENCODING?.trim() ||
+        env.AWS_TERMINAL_OUTPUT_ENCODING?.trim();
+    if (configuredEncoding) {
+        return configuredEncoding;
+    }
+    return platform === "win32"
+        ? DEFAULT_WINDOWS_SHELL_OUTPUT_ENCODING
+        : DEFAULT_SHELL_OUTPUT_ENCODING;
+}
+export function createShellOutputDecoder(encoding = resolveShellOutputEncoding()) {
+    try {
+        return new TextDecoder(encoding, { fatal: false });
+    }
+    catch {
+        return new TextDecoder(DEFAULT_SHELL_OUTPUT_ENCODING, { fatal: false });
+    }
+}
+export function decodeShellOutputChunk(decoder, chunk, end = false) {
+    if (end) {
+        return decoder.decode();
+    }
+    if (!chunk || chunk.length === 0) {
+        return "";
+    }
+    return decoder.decode(chunk, { stream: true });
+}

package/package/acode/dist/mcpToolNames.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Main flow: normalize common MCP separators, then use the final segment as
+ * the semantic tool name that controls timeout policy.
+ */
+export declare function getSemanticToolName(toolName: string): string;
+/**
+ * Main flow: classify only exact polling tool names so similarly named tools
+ * keep the regular MCP timeout.
+ */
+export declare function isMcpPollingToolName(toolName: string): boolean;
+//# sourceMappingURL=mcpToolNames.d.ts.map

package/package/acode/dist/mcpToolNames.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcpToolNames.d.ts","sourceRoot":"","sources":["../src/mcpToolNames.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAI5D;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAE9D"}

package/package/acode/dist/mcpToolNames.js

@@ -0,0 +1,17 @@
+const POLLING_TOOL_NAMES = new Set(["poll_message", "get_message"]);
+/**
+ * Main flow: normalize common MCP separators, then use the final segment as
+ * the semantic tool name that controls timeout policy.
+ */
+export function getSemanticToolName(toolName) {
+    const normalized = toolName.trim().toLowerCase();
+    const segments = normalized.split(/__|[./]/).filter(Boolean);
+    return segments.at(-1) ?? normalized;
+}
+/**
+ * Main flow: classify only exact polling tool names so similarly named tools
+ * keep the regular MCP timeout.
+ */
+export function isMcpPollingToolName(toolName) {
+    return POLLING_TOOL_NAMES.has(getSemanticToolName(toolName));
+}

package/package/acode/dist/runtime.d.ts

@@ -3,12 +3,15 @@ import type { ACodeRuntimeConfig } from "./types.js";
 export declare class ACodeRuntime extends EventEmitter {
     private readonly config;
     private readonly hookBus;
+    private initialConversation;
     private state;
     private abortController;
     private submitQueue;
     private activeTurn;
     private abortRequested;
     private sessionCompleteEmitted;
+    private contextVersion;
+    private readonly stopWaiters;
     constructor(config: ACodeRuntimeConfig);
     private emitAcodeEvent;
     /**
@@ -23,6 +26,12 @@ export declare class ACodeRuntime extends EventEmitter {
      * MCP tool call 则执行工具并继续同一轮，最后输出 assistant 文本与 usage。
      */
     submit(message: string): Promise<void>;
+    /**
+     * Reset only the conversation context while keeping the live ACode session,
+     * MCP connections, exposed tools, commands, and hooks available.
+     */
+    resetContext(): Promise<void>;
+    private isTurnSuperseded;
     private executeSubmit;
     /** 中止当前轮次；由执行轮次统一发出一个终态事件，避免 aborted/failed 双终态。 */
     abort(): Promise<void>;
@@ -34,6 +43,16 @@ export declare class ACodeRuntime extends EventEmitter {
     private readChatCompletionStream;
     private handleToolCalls;
     private callMcpToolWithTimeout;
+    /**
+     * Build a one-shot waiter that rejects long-running MCP calls when the runtime stops.
+     * Main flow: register a stop callback -> race it with the SDK call -> remove it after either side settles.
+     */
+    private createRuntimeStopWaiter;
+    /**
+     * Notify and clear every pending runtime-stop waiter.
+     * Main flow: snapshot callbacks -> clear the set -> reject each pending MCP race exactly once.
+     */
+    private notifyRuntimeStop;
     private appendSyntheticMultimodalUserMessage;
     private appendToolFailureResult;
     private connectMcpServers;

package/package/acode/dist/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAiB3C,OAAO,KAAK,EAOV,kBAAkB,EAEnB,MAAM,YAAY,CAAC;AAuoCpB,qBAAa,YAAa,SAAQ,YAAY;IAmChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAlCnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IAEvC,OAAO,CAAC,KAAK,CAoBX;IAEF,OAAO,CAAC,eAAe,CAAgC;IAEvD,OAAO,CAAC,WAAW,CAAoC;IAEvD,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO,CAAC,cAAc,CAAS;IAE/B,OAAO,CAAC,sBAAsB,CAAS;gBAEV,MAAM,EAAE,kBAAkB;IAevD,OAAO,CAAC,cAAc;IAatB;;;;OAIG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAyF5B;;;;OAIG;IACG,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAM9B,aAAa;IA2E3B,oDAAoD;IAC9C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAM5B,uCAAuC;IACjC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B3B,OAAO,CAAC,kBAAkB;YAaZ,YAAY;YAoEZ,qBAAqB;YA4JrB,wBAAwB;YA6ExB,eAAe;YAoJf,sBAAsB;YAqCtB,oCAAoC;IAkBlD,OAAO,CAAC,uBAAuB;YAuBjB,iBAAiB;IA2C/B,OAAO,CAAC,kBAAkB;YA2BZ,oBAAoB;CAiBnC"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAkB3C,OAAO,KAAK,EAOV,kBAAkB,EAEnB,MAAM,YAAY,CAAC;AAksCpB,qBAAa,YAAa,SAAQ,YAAY;IAsChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IArCnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IACvC,OAAO,CAAC,mBAAmB,CAAqB;IAEhD,OAAO,CAAC,KAAK,CAoBX;IAEF,OAAO,CAAC,eAAe,CAAgC;IAEvD,OAAO,CAAC,WAAW,CAAoC;IAEvD,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO,CAAC,cAAc,CAAS;IAE/B,OAAO,CAAC,sBAAsB,CAAS;IACvC,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyB;gBAExB,MAAM,EAAE,kBAAkB;IAevD,OAAO,CAAC,cAAc;IAatB;;;;OAIG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA2F5B;;;;OAIG;IACG,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS5C;;;OAGG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAWnC,OAAO,CAAC,gBAAgB;YAIV,aAAa;IA6F3B,oDAAoD;IAC9C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAM5B,uCAAuC;IACjC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA+B3B,OAAO,CAAC,kBAAkB;YAaZ,YAAY;YAoFZ,qBAAqB;YAuKrB,wBAAwB;YA8ExB,eAAe;YAuMf,sBAAsB;IA6CpC;;;OAGG;IACH,OAAO,CAAC,uBAAuB;IAiC/B;;;OAGG;IACH,OAAO,CAAC,iBAAiB;YAQX,oCAAoC;IAsBlD,OAAO,CAAC,uBAAuB;YAuBjB,iBAAiB;IA2C/B,OAAO,CAAC,kBAAkB;YA2BZ,oBAAoB;CAiBnC"}