aws-runtime-bridge 1.8.8 → 1.9.1

package/dist/adapter/AcodeSdkAdapter.d.ts

@@ -17,6 +17,7 @@ type ACodeRuntimeInstance = {
     start(): Promise<void>;
     submit(message: string): Promise<void>;
     abort(): Promise<void>;
+    resetContext?(): Promise<void>;
     stop(): Promise<void>;
 };
 type ACodeRuntimeConstructor = new (config: {
@@ -44,6 +45,7 @@ export declare class AcodeSdkAdapter extends EventEmitter implements BaseProvide
     sendMessage(sessionId: string, message: string): Promise<void>;
     sendConfirmation(_sessionId: string, _accept: boolean): Promise<void>;
     abortCurrentTurn(sessionId: string): Promise<void>;
+    resetContext(sessionId: string): Promise<void>;
     terminateSession(sessionId: string): Promise<void>;
     getConversation(sessionId: string): ConversationMessage[];
     hasSession(sessionId: string): boolean;

package/dist/adapter/AcodeSdkAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcodeSdkAdapter.d.ts","sourceRoot":"","sources":["../../src/adapter/AcodeSdkAdapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AcodeSdkAdapter.d.ts","sourceRoot":"","sources":["../../src/adapter/AcodeSdkAdapter.ts"],"names":[],"mappings":"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"}

package/dist/adapter/AcodeSdkAdapter.js

@@ -10,6 +10,7 @@ import { pathToFileURL } from "node:url";
 import { v4 as uuidv4 } from "uuid";
 import { getAcodeConfigFile, getAcodeSkillsDir, getRuntimeHomeDir, } from "../config.js";
 import { getReleasedAcodeEntryPath } from "../services/acode-package.js";
+import { isMessagePollingIdleCommand, isPollMessageToolDescriptor, } from "./acode-tool-names.js";
 import { IdlePollLoop } from "./idle-poll-loop.js";
 import { getCanonicalMcpDetail, getToolActionInfo } from "./types.js";
 const ACODE_AUTO_POLL_PROMPT = [
@@ -24,15 +25,6 @@ const ACODE_AUTO_POLL_DELAY_MS = 250;
 // avoid busy-looping when the same failure recurs on every retry.
 const ACODE_AUTO_POLL_FAILURE_DELAY_MS = 2000;
 const ACODE_MESSAGE_POLLING_IDLE_PROMPT = "系统提醒：当前工作已完成或运行时已进入空闲状态。请立即调用 poll_message 工具阻塞等待新消息和流程线任务提醒；收到流程任务提醒后调用 my_task 查看已由后台静默抢占的任务详情并直接处理；完成任务后调用 submit_task_result 提交结果，然后继续 poll_message。";
-function isMessagePollingIdleCommand(command) {
-    const normalized = command.trim();
-    if (!normalized)
-        return false;
-    const lower = normalized.toLowerCase();
-    return (lower.includes("poll_message") ||
-        lower.includes("get_message") ||
-        normalized.includes("取消息"));
-}
 function getAcodePackageEntryPath() {
     return path.resolve(getReleasedAcodeEntryPath());
 }
@@ -66,6 +58,24 @@ function toFiniteTokenCount(...values) {
 function toEstimatedContextTokens(data) {
     return toFiniteTokenCount(data.estimatedContextTokens, data.contextTokens, data.context_tokens, data.contextUsedTokens, data.context_used_tokens);
 }
+function toCommandOutputStream(value) {
+    if (value === "stderr" || value === "mixed") {
+        return value;
+    }
+    return "stdout";
+}
+function toStringRecord(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+        return undefined;
+    }
+    const headers = {};
+    for (const [key, headerValue] of Object.entries(value)) {
+        if (typeof headerValue === "string") {
+            headers[key] = headerValue;
+        }
+    }
+    return Object.keys(headers).length > 0 ? headers : undefined;
+}
 /**
  * Check whether an ACode turn_complete event represents a failed turn.
  * Main flow: only explicit failed=true prevents error status from being reset to waiting_input.
@@ -194,6 +204,31 @@ export class AcodeSdkAdapter extends EventEmitter {
     async abortCurrentTurn(sessionId) {
         await this.requireSession(sessionId).runtime.abort();
     }
+    async resetContext(sessionId) {
+        const entry = this.requireSession(sessionId);
+        this.cancelScheduledAutoPoll(entry);
+        entry.failedTurnRecoveryScheduled = false;
+        entry.autoPollActive = false;
+        entry.autoPollObservedPollingTool = false;
+        entry.autoPollObservedAssistantText = false;
+        entry.stopAutoPollAfterCurrentTurn = false;
+        entry.idlePollLoop?.stop();
+        if (!entry.runtime.resetContext) {
+            throw new Error("ACode runtime does not support context reset");
+        }
+        await entry.runtime.resetContext();
+        entry.adapterSession.messages = [];
+        entry.adapterSession.totalUsage = { inputTokens: 0, outputTokens: 0 };
+        entry.adapterSession.status = "waiting_input";
+        this.emit("status-change", sessionId, "waiting_input", {
+            usage: entry.adapterSession.totalUsage,
+        });
+        if (entry.config.initialPrompt?.trim()) {
+            this.startInitialPromptTurn(sessionId, entry.config.initialPrompt);
+            return;
+        }
+        this.armIdleLoopOrAutoPoll(sessionId);
+    }
     async terminateSession(sessionId) {
         const entry = this.sessions.get(sessionId);
         if (!entry) {
@@ -336,6 +371,23 @@ export class AcodeSdkAdapter extends EventEmitter {
             this.emitProviderEvent(event, "thinking", { text });
             return;
         }
+        if (event.type === "command_output") {
+            this.emitProviderEvent(event, "command_output", {
+                text: typeof event.data.text === "string" ? event.data.text : "",
+                stream: toCommandOutputStream(event.data.stream),
+                sequence: typeof event.data.sequence === "number"
+                    ? event.data.sequence
+                    : undefined,
+                cwd: typeof event.data.cwd === "string" ? event.data.cwd : undefined,
+                commandLineCount: typeof event.data.commandLineCount === "number"
+                    ? event.data.commandLineCount
+                    : undefined,
+                commandFilePath: typeof event.data.commandFilePath === "string"
+                    ? event.data.commandFilePath
+                    : undefined,
+            });
+            return;
+        }
         if (event.type === "ai_request") {
             const estimatedTokens = toEstimatedContextTokens(event.data);
             if (estimatedTokens > 0) {
@@ -350,6 +402,13 @@ export class AcodeSdkAdapter extends EventEmitter {
                 endpoint: typeof event.data.endpoint === "string"
                     ? event.data.endpoint
                     : undefined,
+                requestMethod: typeof event.data.requestMethod === "string"
+                    ? event.data.requestMethod
+                    : undefined,
+                requestUrl: typeof event.data.requestUrl === "string"
+                    ? event.data.requestUrl
+                    : undefined,
+                requestHeaders: toStringRecord(event.data.requestHeaders),
                 stream: typeof event.data.stream === "boolean"
                     ? event.data.stream
                     : undefined,
@@ -459,8 +518,7 @@ export class AcodeSdkAdapter extends EventEmitter {
             // the session status.
             if (!event.data.action && Array.isArray(event.data.tools)) {
                 const tools = event.data.tools;
-                const hasPollMessage = tools.some((tool) => typeof tool?.name === "string" &&
-                    tool.name.includes("poll_message"));
+                const hasPollMessage = tools.some((tool) => isPollMessageToolDescriptor(tool));
                 if (!hasPollMessage) {
                     const message = "ACode runtime is not exposing a poll_message tool. The LLM cannot call poll_message. " +
                         "Please configure an MCP server that provides poll_message (e.g. aws-mcp) in the dashboard panel for this runtime.";
@@ -549,7 +607,7 @@ export class AcodeSdkAdapter extends EventEmitter {
             return;
         }
         if (entry.idleCommands?.idleInputCommand) {
-            entry.idlePollLoop?.start();
+            this.getIdlePollLoop(entry).start();
             return;
         }
         this.scheduleAutoPoll(sessionId);
@@ -562,12 +620,14 @@ export class AcodeSdkAdapter extends EventEmitter {
             getStatus: () => this.sessions.get(sessionId)?.adapterSession.status,
             getCommand: () => this.sessions.get(sessionId)?.idleCommands?.idleInputCommand,
             isPollingCommand: (command) => isMessagePollingIdleCommand(command),
-            dispatchPollingPrompt: () => this.submitAutoPollPrompt(sessionId, ACODE_MESSAGE_POLLING_IDLE_PROMPT),
+            dispatchPollingPrompt: () => this.submitAutoPollPrompt(sessionId, ACODE_MESSAGE_POLLING_IDLE_PROMPT, {
+                keepWaitingStatus: true,
+            }),
             dispatchRegularIdleCommand: (command) => this.submitAutoPollPrompt(sessionId, command),
         });
         return entry.idlePollLoop;
     }
-    submitAutoPollPrompt(sessionId, prompt) {
+    submitAutoPollPrompt(sessionId, prompt, options) {
         const entry = this.sessions.get(sessionId);
         if (!entry || this.isTerminalStatus(entry.adapterSession.status))
             return;
@@ -575,8 +635,10 @@ export class AcodeSdkAdapter extends EventEmitter {
         entry.autoPollObservedPollingTool = false;
         entry.autoPollObservedAssistantText = false;
         entry.stopAutoPollAfterCurrentTurn = false;
-        entry.adapterSession.status = "thinking";
-        this.emit("status-change", sessionId, "thinking");
+        if (!options?.keepWaitingStatus) {
+            entry.adapterSession.status = "thinking";
+            this.emit("status-change", sessionId, "thinking");
+        }
         void entry.runtime
             .submit(prompt)
             .catch((error) => {
@@ -642,7 +704,9 @@ export class AcodeSdkAdapter extends EventEmitter {
                 return;
             }
             currentEntry.autoPollTimer = undefined;
-            this.submitAutoPollPrompt(sessionId, ACODE_AUTO_POLL_PROMPT);
+            this.submitAutoPollPrompt(sessionId, ACODE_AUTO_POLL_PROMPT, {
+                keepWaitingStatus: true,
+            });
         }, delayMs);
     }
     cancelScheduledAutoPoll(entry) {
@@ -707,7 +771,9 @@ export class AcodeSdkAdapter extends EventEmitter {
                 this.getIdlePollLoop(currentEntry).start();
             }
             else {
-                this.submitAutoPollPrompt(sessionId, ACODE_AUTO_POLL_PROMPT);
+                this.submitAutoPollPrompt(sessionId, ACODE_AUTO_POLL_PROMPT, {
+                    keepWaitingStatus: true,
+                });
             }
         }, ACODE_AUTO_POLL_FAILURE_DELAY_MS);
     }

package/dist/adapter/AcodeSdkAdapter.test.js

@@ -211,6 +211,12 @@ class AiRequestRuntime extends EventEmitter {
             data: {
                 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,
@@ -257,6 +263,30 @@ class AssistantDeltaRuntime extends EventEmitter {
     async abort() { }
     async stop() { }
 }
+class CommandOutputRuntime extends EventEmitter {
+    constructor(config) {
+        super();
+        this.config = config;
+    }
+    async start() { }
+    async submit(_message) {
+        this.emit("event", {
+            type: "command_output",
+            sessionId: this.config.sessionId,
+            timestamp: new Date(0).toISOString(),
+            data: {
+                text: "live command output",
+                stream: "stdout",
+                sequence: 2,
+                cwd: "/repo",
+                commandLineCount: 1,
+                commandFilePath: "/repo/.agentswork/acode/cmd-dist/run.cmd",
+            },
+        });
+    }
+    async abort() { }
+    async stop() { }
+}
 class ResponseBodyTurnCompleteRuntime extends EventEmitter {
     constructor(config) {
         super();
@@ -297,6 +327,36 @@ class ProviderUsageTurnCompleteRuntime extends EventEmitter {
     async abort() { }
     async stop() { }
 }
+class ResettableRuntime extends EventEmitter {
+    constructor(config) {
+        super();
+        this.config = config;
+    }
+    async start() { }
+    async submit(_message) {
+        this.emit("event", {
+            type: "assistant_delta",
+            sessionId: this.config.sessionId,
+            timestamp: new Date(0).toISOString(),
+            data: { text: "done" },
+        });
+        this.emit("event", {
+            type: "turn_complete",
+            sessionId: this.config.sessionId,
+            timestamp: new Date(0).toISOString(),
+            data: { usage: { inputTokens: 7, outputTokens: 3 } },
+        });
+    }
+    async resetContext() {
+        ResettableRuntime.resetCalls += 1;
+    }
+    async abort() { }
+    async stop() {
+        ResettableRuntime.stopCalls += 1;
+    }
+}
+ResettableRuntime.resetCalls = 0;
+ResettableRuntime.stopCalls = 0;
 class ThinkingThenAssistantDeltaRuntime extends EventEmitter {
     constructor(config) {
         super();
@@ -643,6 +703,58 @@ class DifferentlyNamedMcpRuntime extends EventEmitter {
     async abort() { }
     async stop() { }
 }
+class FakePollMessageToolRuntime extends EventEmitter {
+    constructor(config) {
+        super();
+        this.config = config;
+    }
+    async start() {
+        this.emit("event", {
+            type: "mcp_status",
+            sessionId: this.config.sessionId,
+            timestamp: new Date(0).toISOString(),
+            data: {
+                tools: [
+                    {
+                        name: "other-mcp__not_poll_message",
+                        source: "other-mcp.not_poll_message",
+                    },
+                ],
+            },
+        });
+    }
+    async submit(_message) { }
+    async abort() { }
+    async stop() { }
+}
+class DeferredInitialThenRegularIdleRuntime extends EventEmitter {
+    constructor(config) {
+        super();
+        this.config = config;
+    }
+    async start() { }
+    async submit(message) {
+        DeferredInitialThenRegularIdleRuntime.submitMessages.push(message);
+        if (DeferredInitialThenRegularIdleRuntime.submitMessages.length !== 1) {
+            return;
+        }
+        await new Promise((resolve) => {
+            DeferredInitialThenRegularIdleRuntime.completeInitialTurn = () => {
+                this.emit("event", {
+                    type: "turn_complete",
+                    sessionId: this.config.sessionId,
+                    timestamp: new Date(0).toISOString(),
+                    data: { usage: { inputTokens: 1, outputTokens: 1 } },
+                });
+                DeferredInitialThenRegularIdleRuntime.completeInitialTurn = undefined;
+                resolve();
+            };
+        });
+    }
+    async abort() { }
+    async stop() { }
+}
+DeferredInitialThenRegularIdleRuntime.submitMessages = [];
 describe("AcodeSdkAdapter turn completion state", () => {
     it("keeps error status for failed turn_complete events", () => {
         expect(isFailedAcodeTurnComplete({ failed: true })).toBe(true);
@@ -730,6 +842,46 @@ describe("AcodeSdkAdapter turn completion state", () => {
             usage: { inputTokens: 31, outputTokens: 58 },
         });
     });
+    it("resets ACode context in place without terminating the SDK session", async () => {
+        vi.useFakeTimers();
+        ResettableRuntime.resetCalls = 0;
+        ResettableRuntime.stopCalls = 0;
+        const adapter = new AcodeSdkAdapter();
+        adapter.setRuntimeConstructorForTest(ResettableRuntime);
+        const statuses = [];
+        adapter.on("status-change", (_sessionId, status, actionInfo) => {
+            statuses.push({ status, usage: actionInfo?.usage });
+        });
+        try {
+            await adapter.startSession("session-reset-context", {
+                command: "acode",
+                workingDirectory: process.cwd(),
+                autoAccept: true,
+                extraMcpServers: {},
+                envOverrides: {},
+            });
+            await adapter.sendMessage("session-reset-context", "finish work");
+            expect(adapter.getConversation("session-reset-context")).toHaveLength(2);
+            expect(statuses.at(-1)).toEqual({
+                status: "waiting_input",
+                usage: { inputTokens: 7, outputTokens: 3 },
+            });
+            await adapter.resetContext("session-reset-context");
+            expect(ResettableRuntime.resetCalls).toBe(1);
+            expect(ResettableRuntime.stopCalls).toBe(0);
+            expect(adapter.hasSession("session-reset-context")).toBe(true);
+            expect(adapter.getSessionStatus("session-reset-context")).toBe("waiting_input");
+            expect(adapter.getConversation("session-reset-context")).toEqual([]);
+            expect(statuses.at(-1)).toEqual({
+                status: "waiting_input",
+                usage: { inputTokens: 0, outputTokens: 0 },
+            });
+        }
+        finally {
+            vi.useRealTimers();
+            adapter.cleanup();
+        }
+    });
     it("maps ACode MCP status events to tool_using instead of thinking", async () => {
         const adapter = new AcodeSdkAdapter();
         adapter.setRuntimeConstructorForTest(McpStatusRuntime);
@@ -992,6 +1144,12 @@ describe("AcodeSdkAdapter turn completion state", () => {
             data: {
                 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,
@@ -1042,6 +1200,32 @@ describe("AcodeSdkAdapter turn completion state", () => {
             data: { text: "answer chunk" },
         });
     });
+    it("forwards ACode command output as ordered realtime provider events", async () => {
+        const adapter = new AcodeSdkAdapter();
+        adapter.setRuntimeConstructorForTest(CommandOutputRuntime);
+        const events = [];
+        adapter.on("event", (event) => events.push(event));
+        await adapter.startSession("session-command-output", {
+            command: "acode",
+            workingDirectory: process.cwd(),
+            autoAccept: true,
+            extraMcpServers: {},
+            envOverrides: {},
+        });
+        await adapter.sendMessage("session-command-output", "run command");
+        expect(events).toHaveLength(1);
+        expect(events[0]).toMatchObject({
+            type: "command_output",
+            data: {
+                text: "live command output",
+                stream: "stdout",
+                sequence: 2,
+                cwd: "/repo",
+                commandLineCount: 1,
+                commandFilePath: "/repo/.agentswork/acode/cmd-dist/run.cmd",
+            },
+        });
+    });
     it("preserves realtime thinking then answer delta order", async () => {
         const adapter = new AcodeSdkAdapter();
         adapter.setRuntimeConstructorForTest(ThinkingThenAssistantDeltaRuntime);
@@ -1146,6 +1330,43 @@ describe("AcodeSdkAdapter turn completion state", () => {
         expect(statuses).toEqual(["starting", "waiting_input", "thinking"]);
         expect(adapter.getSessionStatus("session-initial-prompt")).toBe("thinking");
     });
+    it("runs regular idle commands configured while ACode is still busy", async () => {
+        vi.useFakeTimers();
+        DeferredInitialThenRegularIdleRuntime.submitMessages = [];
+        DeferredInitialThenRegularIdleRuntime.completeInitialTurn = undefined;
+        const adapter = new AcodeSdkAdapter();
+        adapter.setRuntimeConstructorForTest(DeferredInitialThenRegularIdleRuntime);
+        try {
+            await adapter.startSession("session-regular-idle-busy-config", {
+                command: "acode",
+                workingDirectory: process.cwd(),
+                autoAccept: true,
+                initialPrompt: "bootstrap current task",
+                extraMcpServers: {},
+                envOverrides: {},
+            });
+            expect(DeferredInitialThenRegularIdleRuntime.submitMessages).toEqual([
+                "bootstrap current task",
+            ]);
+            expect(adapter.getSessionStatus("session-regular-idle-busy-config")).toBe("thinking");
+            adapter.setIdleCommands("session-regular-idle-busy-config", {
+                idleInputCommand: "continue after idle",
+                nonInputCommand: "",
+            });
+            const completeInitialTurn = DeferredInitialThenRegularIdleRuntime.completeInitialTurn;
+            expect(completeInitialTurn).toBeDefined();
+            completeInitialTurn?.();
+            await vi.advanceTimersByTimeAsync(1500);
+            expect(DeferredInitialThenRegularIdleRuntime.submitMessages).toEqual([
+                "bootstrap current task",
+                "continue after idle",
+            ]);
+        }
+        finally {
+            vi.useRealTimers();
+            adapter.cleanup();
+        }
+    });
     it("continues the message loop by auto-submitting poll_message after a completed turn", async () => {
         vi.useFakeTimers();
         AutoPollRuntime.submitMessages = [];
@@ -1171,8 +1392,6 @@ describe("AcodeSdkAdapter turn completion state", () => {
                 "waiting_input",
                 "thinking",
                 "waiting_input",
-                "thinking",
-                "waiting_input",
             ]);
             expect(adapter.getSessionStatus("session-auto-poll")).toBe("waiting_input");
         }
@@ -1181,6 +1400,31 @@ describe("AcodeSdkAdapter turn completion state", () => {
             adapter.cleanup();
         }
     });
+    it("keeps waiting_input while dispatching an auto-poll prompt", async () => {
+        vi.useFakeTimers();
+        DeferredInitialPromptRuntime.submitCalls = 0;
+        const adapter = new AcodeSdkAdapter();
+        adapter.setRuntimeConstructorForTest(DeferredInitialPromptRuntime);
+        const statuses = [];
+        adapter.on("status-change", (_sessionId, status) => statuses.push(status));
+        try {
+            await adapter.startSession("session-auto-poll-pending", {
+                command: "acode",
+                workingDirectory: process.cwd(),
+                autoAccept: true,
+                extraMcpServers: {},
+                envOverrides: {},
+            });
+            await vi.advanceTimersByTimeAsync(250);
+            expect(DeferredInitialPromptRuntime.submitCalls).toBe(1);
+            expect(adapter.getSessionStatus("session-auto-poll-pending")).toBe("waiting_input");
+            expect(statuses).toEqual(["starting", "waiting_input"]);
+        }
+        finally {
+            vi.useRealTimers();
+            adapter.cleanup();
+        }
+    });
     it("stops re-arming auto-poll when the model answers without calling poll_message", async () => {
         vi.useFakeTimers();
         NonPollingAutoPollRuntime.submitMessages = [];
@@ -1324,17 +1568,12 @@ describe("AcodeSdkAdapter turn completion state", () => {
             });
             await vi.advanceTimersByTimeAsync(250);
             // Status sequence: starting -> waiting_input (startSession) ->
-            // thinking (auto-poll fires) -> waiting_input (turn_complete success
-            // re-arms the loop). Empty turns are allowed to retry because only a
-            // plain-text assistant answer indicates the model ignored poll_message.
+            // waiting_input (poll turn completes and re-arms the loop). The
+            // auto-poll prompt stays in waiting_input so a slow or missing
+            // poll_message tool event cannot leave the dashboard on thinking.
             expect(AutoPollRuntime.submitMessages).toHaveLength(1);
             expect(AutoPollRuntime.submitMessages[0]).toContain("poll_message");
-            expect(statuses).toEqual([
-                "starting",
-                "waiting_input",
-                "thinking",
-                "waiting_input",
-            ]);
+            expect(statuses).toEqual(["starting", "waiting_input", "waiting_input"]);
             expect(adapter.getSessionStatus("session-r1-no-initial")).toBe("waiting_input");
         }
         finally {
@@ -1368,7 +1607,6 @@ describe("AcodeSdkAdapter turn completion state", () => {
             expect(statuses).toEqual([
                 "starting",
                 "waiting_input",
-                "thinking",
                 "error",
                 "waiting_input",
             ]);
@@ -1408,7 +1646,6 @@ describe("AcodeSdkAdapter turn completion state", () => {
             expect(statuses).toEqual([
                 "starting",
                 "waiting_input",
-                "thinking",
                 "error",
                 "waiting_input",
             ]);
@@ -1557,6 +1794,31 @@ describe("AcodeSdkAdapter turn completion state", () => {
             adapter.cleanup();
         }
     });
+    it("does not treat tools that only contain poll_message as a real listener", async () => {
+        const adapter = new AcodeSdkAdapter();
+        adapter.setRuntimeConstructorForTest(FakePollMessageToolRuntime);
+        const events = [];
+        const consoleWarn = vi
+            .spyOn(console, "warn")
+            .mockImplementation(() => undefined);
+        adapter.on("event", (event) => events.push(event));
+        try {
+            await adapter.startSession("session-r3-fake-poll-message", {
+                command: "acode",
+                workingDirectory: process.cwd(),
+                autoAccept: true,
+                extraMcpServers: {},
+                envOverrides: {},
+            });
+            expect(events.find((event) => event.type === "error")).toBeUndefined();
+            expect(consoleWarn).toHaveBeenCalled();
+            expect(String(consoleWarn.mock.calls[0]?.[0] ?? "")).toContain("poll_message");
+        }
+        finally {
+            consoleWarn.mockRestore();
+            adapter.cleanup();
+        }
+    });
     it("does not log a warning when the MCP server is named differently but still exposes poll_message (R3 user-scenario)", async () => {
         // Reproduces the production scenario from the bug report: the user
         // configures the AWS MCP under a non-default name (e.g. 'aws-mcp-server'

package/dist/adapter/acode-tool-names.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Main flow: normalize common MCP separators, then use the final segment as
+ * the semantic tool name exposed to the agent.
+ */
+export declare function getSemanticToolName(toolName: string): string;
+/**
+ * Main flow: detect free-form idle guidance that asks the agent to enter the
+ * message-polling loop.
+ */
+export declare function isMessagePollingIdleCommand(command: string): boolean;
+/**
+ * Main flow: validate startup MCP tool descriptors against the exact
+ * poll_message semantic tool name instead of substring matching.
+ */
+export declare function isPollMessageToolDescriptor(tool: Readonly<Record<string, unknown>>): boolean;
+//# sourceMappingURL=acode-tool-names.d.ts.map

package/dist/adapter/acode-tool-names.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"acode-tool-names.d.ts","sourceRoot":"","sources":["../../src/adapter/acode-tool-names.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAI5D;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CASpE;AASD;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACtC,OAAO,CAKT"}

package/dist/adapter/acode-tool-names.js

@@ -0,0 +1,37 @@
+const CHINESE_GET_MESSAGE_HINT = "\u53d6\u6d88\u606f";
+/**
+ * Main flow: normalize common MCP separators, then use the final segment as
+ * the semantic tool name exposed to the agent.
+ */
+export function getSemanticToolName(toolName) {
+    const normalized = toolName.trim().toLowerCase();
+    const segments = normalized.split(/__|[./]/).filter(Boolean);
+    return segments.at(-1) ?? normalized;
+}
+/**
+ * Main flow: detect free-form idle guidance that asks the agent to enter the
+ * message-polling loop.
+ */
+export function isMessagePollingIdleCommand(command) {
+    const normalized = command.trim();
+    if (!normalized)
+        return false;
+    const lower = normalized.toLowerCase();
+    return (lower.includes("poll_message") ||
+        lower.includes("get_message") ||
+        normalized.includes(CHINESE_GET_MESSAGE_HINT));
+}
+function hasExactToolSegment(value, toolName) {
+    if (typeof value !== "string") {
+        return false;
+    }
+    return getSemanticToolName(value) === toolName;
+}
+/**
+ * Main flow: validate startup MCP tool descriptors against the exact
+ * poll_message semantic tool name instead of substring matching.
+ */
+export function isPollMessageToolDescriptor(tool) {
+    return (hasExactToolSegment(tool.name, "poll_message") ||
+        hasExactToolSegment(tool.source, "poll_message"));
+}

package/dist/adapter/acode-tool-names.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=acode-tool-names.test.d.ts.map

package/dist/adapter/acode-tool-names.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"acode-tool-names.test.d.ts","sourceRoot":"","sources":["../../src/adapter/acode-tool-names.test.ts"],"names":[],"mappings":""}