aws-runtime-bridge 1.8.0 → 1.8.2

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

@@ -11,7 +11,7 @@ import { v4 as uuidv4 } from "uuid";
 import { getAcodeConfigFile, getAcodeSkillsDir, getRuntimeHomeDir, } from "../config.js";
 import { getReleasedAcodeEntryPath } from "../services/acode-package.js";
 import { IdlePollLoop } from "./idle-poll-loop.js";
-import { getCanonicalMcpDetail, getToolActionInfo, } from "./types.js";
+import { getCanonicalMcpDetail, getToolActionInfo } from "./types.js";
 const ACODE_AUTO_POLL_PROMPT = [
     "Continue the AgentsWork message loop now.",
     "You MUST call the exact MCP tool named aws-mcp__poll_message as your next action and wait for the next assigned message or task.",
@@ -46,6 +46,9 @@ function toUsage(value) {
     const usage = value;
     const inputTokens = toFiniteTokenCount(usage.inputTokens, usage.input_tokens, usage.promptTokens, usage.prompt_tokens);
     const outputTokens = toFiniteTokenCount(usage.outputTokens, usage.output_tokens, usage.completionTokens, usage.completion_tokens);
+    if (inputTokens === 0 && outputTokens === 0) {
+        return undefined;
+    }
     return {
         inputTokens,
         outputTokens,
@@ -60,6 +63,9 @@ function toFiniteTokenCount(...values) {
     }
     return 0;
 }
+function toEstimatedContextTokens(data) {
+    return toFiniteTokenCount(data.estimatedContextTokens, data.contextTokens, data.context_tokens, data.contextUsedTokens, data.context_used_tokens);
+}
 /**
  * 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.
@@ -77,6 +83,36 @@ function toAcodeMcpActionDetail(actionDetail, server, tool) {
     }
     return getCanonicalMcpDetail(actionDetail.replace("/", "__"));
 }
+function isAcodeSemanticToolAction(actionType) {
+    return (actionType === "read_file" ||
+        actionType === "edit_file" ||
+        actionType === "write_file" ||
+        actionType === "bash");
+}
+function hasPollingMessages(result) {
+    const parsed = parseToolResultObject(result);
+    if (!parsed) {
+        return typeof result === "string" && result.trim().length > 0;
+    }
+    return [parsed.directMessages, parsed.groupMessages, parsed.messages].some((value) => Array.isArray(value) && value.length > 0);
+}
+function parseToolResultObject(result) {
+    if (result && typeof result === "object" && !Array.isArray(result)) {
+        return result;
+    }
+    if (typeof result !== "string" || !result.trim()) {
+        return undefined;
+    }
+    try {
+        const parsed = JSON.parse(result);
+        return parsed && typeof parsed === "object" && !Array.isArray(parsed)
+            ? parsed
+            : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 export class AcodeSdkAdapter extends EventEmitter {
     constructor() {
         super(...arguments);
@@ -107,7 +143,9 @@ export class AcodeSdkAdapter extends EventEmitter {
         try {
             await entry.runtime.start();
             session.status = "waiting_input";
-            this.emit("status-change", sessionId, "waiting_input");
+            this.emit("status-change", sessionId, "waiting_input", {
+                usage: entry.adapterSession.totalUsage,
+            });
             if (config.initialPrompt?.trim()) {
                 this.startInitialPromptTurn(sessionId, config.initialPrompt);
             }
@@ -280,6 +318,9 @@ export class AcodeSdkAdapter extends EventEmitter {
         }
         if (event.type === "assistant_delta") {
             const text = typeof event.data.text === "string" ? event.data.text : "";
+            if (entry.autoPollActive) {
+                entry.autoPollObservedAssistantText = true;
+            }
             entry.adapterSession.messages.push({
                 id: uuidv4(),
                 sessionId: event.sessionId,
@@ -296,6 +337,14 @@ export class AcodeSdkAdapter extends EventEmitter {
             return;
         }
         if (event.type === "ai_request") {
+            const estimatedTokens = toEstimatedContextTokens(event.data);
+            if (estimatedTokens > 0) {
+                entry.adapterSession.totalUsage.inputTokens = estimatedTokens;
+                entry.adapterSession.totalUsage.outputTokens = 0;
+                this.emit("status-change", event.sessionId, entry.adapterSession.status, {
+                    usage: entry.adapterSession.totalUsage,
+                });
+            }
             this.emitProviderEvent(event, "ai_request", {
                 model: typeof event.data.model === "string" ? event.data.model : undefined,
                 endpoint: typeof event.data.endpoint === "string"
@@ -354,6 +403,13 @@ export class AcodeSdkAdapter extends EventEmitter {
             this.emit("status-change", event.sessionId, "waiting_input", {
                 usage: entry.adapterSession.totalUsage,
             });
+            if (entry.autoPollActive &&
+                entry.autoPollObservedAssistantText &&
+                !entry.autoPollObservedPollingTool) {
+                entry.stopAutoPollAfterCurrentTurn = true;
+                console.warn(`[${this.displayName}] Auto-poll turn produced assistant text without calling poll_message; stopping auto-poll rearm for session ${event.sessionId}`);
+                return;
+            }
             this.armIdleLoopOrAutoPoll(event.sessionId);
             return;
         }
@@ -415,8 +471,19 @@ export class AcodeSdkAdapter extends EventEmitter {
             const server = typeof event.data.server === "string" ? event.data.server : "mcp";
             const tool = typeof event.data.tool === "string" ? event.data.tool : "";
             const toolName = server && tool ? `${server}__${tool}` : tool || server;
-            const actionInfo = getToolActionInfo(toolName);
-            const actionDetail = toAcodeMcpActionDetail(actionInfo.actionDetail, server, tool);
+            const toolInput = event.data.arguments &&
+                typeof event.data.arguments === "object" &&
+                !Array.isArray(event.data.arguments)
+                ? event.data.arguments
+                : undefined;
+            const actionInfo = getToolActionInfo(toolName, toolInput);
+            if (entry.autoPollActive && actionInfo.actionType === "idle") {
+                entry.autoPollObservedPollingTool = true;
+            }
+            const actionDetail = isAcodeSemanticToolAction(actionInfo.actionType)
+                ? actionInfo.actionDetail ||
+                    toAcodeMcpActionDetail(undefined, server, tool)
+                : toAcodeMcpActionDetail(actionInfo.actionDetail, server, tool);
             const toolUseId = typeof event.data.toolUseId === "string"
                 ? event.data.toolUseId
                 : undefined;
@@ -425,6 +492,7 @@ export class AcodeSdkAdapter extends EventEmitter {
                 actionType: actionInfo.actionType,
                 actionLabel: actionInfo.actionLabel,
                 actionDetail,
+                ...(toolInput ? { toolInput } : {}),
                 ...(toolUseId ? { toolUseId, actionId: toolUseId } : {}),
             };
             if (event.data.action === "tool_result") {
@@ -434,8 +502,12 @@ export class AcodeSdkAdapter extends EventEmitter {
                         ? event.data.result
                         : JSON.stringify(event.data.result ?? ""),
                 });
-                entry.adapterSession.status = "thinking";
-                this.emit("status-change", event.sessionId, "thinking");
+                const status = actionInfo.actionType === "idle" &&
+                    !hasPollingMessages(event.data.result)
+                    ? "waiting_input"
+                    : "thinking";
+                entry.adapterSession.status = status;
+                this.emit("status-change", event.sessionId, status);
                 return;
             }
             const status = actionInfo.actionType === "idle" ? "waiting_input" : "tool_using";
@@ -444,6 +516,17 @@ export class AcodeSdkAdapter extends EventEmitter {
             this.emit("status-change", event.sessionId, status, eventData);
             return;
         }
+        if (event.type === "session_started") {
+            const estimatedTokens = toEstimatedContextTokens(event.data);
+            if (estimatedTokens > 0) {
+                entry.adapterSession.totalUsage.inputTokens = estimatedTokens;
+                entry.adapterSession.totalUsage.outputTokens = 0;
+                this.emit("status-change", event.sessionId, entry.adapterSession.status, {
+                    usage: entry.adapterSession.totalUsage,
+                });
+            }
+            return;
+        }
         this.emitProviderEvent(event, "thinking", {
             text: JSON.stringify(event.data),
         });
@@ -489,6 +572,9 @@ export class AcodeSdkAdapter extends EventEmitter {
         if (!entry || this.isTerminalStatus(entry.adapterSession.status))
             return;
         entry.autoPollActive = true;
+        entry.autoPollObservedPollingTool = false;
+        entry.autoPollObservedAssistantText = false;
+        entry.stopAutoPollAfterCurrentTurn = false;
         entry.adapterSession.status = "thinking";
         this.emit("status-change", sessionId, "thinking");
         void entry.runtime
@@ -511,6 +597,12 @@ export class AcodeSdkAdapter extends EventEmitter {
                 latestEntry.failedTurnRecoveryScheduled = false;
                 return;
             }
+            if (latestEntry.stopAutoPollAfterCurrentTurn) {
+                latestEntry.stopAutoPollAfterCurrentTurn = false;
+                latestEntry.autoPollObservedPollingTool = false;
+                latestEntry.autoPollObservedAssistantText = false;
+                return;
+            }
             if (latestEntry.adapterSession.status === "error") {
                 this.recoverTurnFailure(sessionId, latestEntry);
                 return;

package/dist/adapter/AcodeSdkAdapter.test.js

@@ -46,6 +46,30 @@ class McpStatusRuntime extends EventEmitter {
     async abort() { }
     async stop() { }
 }
+class BuiltinReadStatusRuntime extends EventEmitter {
+    constructor(config) {
+        super();
+        this.config = config;
+    }
+    async start() { }
+    async submit(_message) {
+        this.emit("event", {
+            type: "mcp_status",
+            sessionId: this.config.sessionId,
+            timestamp: new Date(0).toISOString(),
+            data: {
+                action: "call_tool",
+                server: "builtin",
+                tool: "read_file",
+                exposedName: "builtin/read_file",
+                toolUseId: "tool-read-1",
+                arguments: { path: "src/views/App.vue" },
+            },
+        });
+    }
+    async abort() { }
+    async stop() { }
+}
 class McpResultRuntime extends EventEmitter {
     constructor(config) {
         super();
@@ -97,6 +121,65 @@ class PollMessageStatusRuntime extends EventEmitter {
     async abort() { }
     async stop() { }
 }
+class EmptyPollResultRuntime extends EventEmitter {
+    constructor(config) {
+        super();
+        this.config = config;
+    }
+    async start() { }
+    async submit(_message) {
+        this.emit("event", {
+            type: "mcp_status",
+            sessionId: this.config.sessionId,
+            timestamp: new Date(0).toISOString(),
+            data: { action: "call_tool", server: "aws-mcp", tool: "poll_message" },
+        });
+        this.emit("event", {
+            type: "mcp_status",
+            sessionId: this.config.sessionId,
+            timestamp: new Date(0).toISOString(),
+            data: {
+                action: "tool_result",
+                server: "aws-mcp",
+                tool: "poll_message",
+                result: JSON.stringify({ directMessages: [], groupMessages: [] }),
+            },
+        });
+    }
+    async abort() { }
+    async stop() { }
+}
+class PollResultWithMessageRuntime extends EventEmitter {
+    constructor(config) {
+        super();
+        this.config = config;
+    }
+    async start() { }
+    async submit(_message) {
+        this.emit("event", {
+            type: "mcp_status",
+            sessionId: this.config.sessionId,
+            timestamp: new Date(0).toISOString(),
+            data: { action: "call_tool", server: "aws-mcp", tool: "poll_message" },
+        });
+        this.emit("event", {
+            type: "mcp_status",
+            sessionId: this.config.sessionId,
+            timestamp: new Date(0).toISOString(),
+            data: {
+                action: "tool_result",
+                server: "aws-mcp",
+                tool: "poll_message",
+                result: JSON.stringify({
+                    directMessages: [{ senderName: "User", content: "ping" }],
+                    groupMessages: [],
+                }),
+            },
+        });
+    }
+    async abort() { }
+    async stop() { }
+}
 class CommandStatusRuntime extends EventEmitter {
     constructor(config) {
         super();
@@ -132,6 +215,7 @@ class AiRequestRuntime extends EventEmitter {
                 messageCount: 3,
                 toolCount: 2,
                 lastUserMessagePreview: "inspect status",
+                estimatedContextTokens: 6800,
                 requestBody: '{"model":"test-model"}',
             },
         });
@@ -294,6 +378,56 @@ class AutoPollRuntime extends EventEmitter {
     async stop() { }
 }
 AutoPollRuntime.submitMessages = [];
+class NonPollingAutoPollRuntime extends EventEmitter {
+    constructor(config) {
+        super();
+        this.config = config;
+    }
+    async start() { }
+    async submit(message) {
+        NonPollingAutoPollRuntime.submitMessages.push(message);
+        this.emit("event", {
+            type: "assistant_delta",
+            sessionId: this.config.sessionId,
+            timestamp: new Date(0).toISOString(),
+            data: { text: "I cannot call poll_message." },
+        });
+        this.emit("event", {
+            type: "turn_complete",
+            sessionId: this.config.sessionId,
+            timestamp: new Date(0).toISOString(),
+            data: { usage: { inputTokens: 1, outputTokens: 1 } },
+        });
+    }
+    async abort() { }
+    async stop() { }
+}
+NonPollingAutoPollRuntime.submitMessages = [];
+class PollingAutoPollRuntime extends EventEmitter {
+    constructor(config) {
+        super();
+        this.config = config;
+    }
+    async start() { }
+    async submit(message) {
+        PollingAutoPollRuntime.submitMessages.push(message);
+        this.emit("event", {
+            type: "mcp_status",
+            sessionId: this.config.sessionId,
+            timestamp: new Date(0).toISOString(),
+            data: { action: "call_tool", server: "aws-mcp", tool: "poll_message" },
+        });
+        this.emit("event", {
+            type: "turn_complete",
+            sessionId: this.config.sessionId,
+            timestamp: new Date(0).toISOString(),
+            data: { usage: { inputTokens: 1, outputTokens: 1 } },
+        });
+    }
+    async abort() { }
+    async stop() { }
+}
+PollingAutoPollRuntime.submitMessages = [];
 class TerminalAfterTurnRuntime extends EventEmitter {
     constructor(config) {
         super();
@@ -546,7 +680,11 @@ describe("AcodeSdkAdapter turn completion state", () => {
         const adapter = new AcodeSdkAdapter();
         adapter.setRuntimeConstructorForTest(ResponseBodyTurnCompleteRuntime);
         const events = [];
+        const statuses = [];
         adapter.on("event", (event) => events.push(event));
+        adapter.on("status-change", (_sessionId, status, actionInfo) => {
+            statuses.push({ status, usage: actionInfo?.usage });
+        });
         await adapter.startSession("session-response-body", {
             command: "acode",
             workingDirectory: process.cwd(),
@@ -633,6 +771,42 @@ describe("AcodeSdkAdapter turn completion state", () => {
         });
         expect(adapter.getSessionStatus("session-mcp")).toBe("waiting_input");
     });
+    it("preserves built-in file tool arguments in ACode provider events and statuses", async () => {
+        const adapter = new AcodeSdkAdapter();
+        adapter.setRuntimeConstructorForTest(BuiltinReadStatusRuntime);
+        const events = [];
+        const statuses = [];
+        adapter.on("event", (event) => events.push(event));
+        adapter.on("status-change", (_sessionId, status, actionInfo) => {
+            statuses.push({
+                status,
+                actionType: actionInfo?.actionType,
+                actionDetail: actionInfo?.actionDetail,
+            });
+        });
+        await adapter.startSession("session-builtin-read", {
+            command: "acode",
+            workingDirectory: process.cwd(),
+            autoAccept: true,
+            extraMcpServers: {},
+            envOverrides: {},
+        });
+        await adapter.sendMessage("session-builtin-read", "read file");
+        expect(events.map((event) => event.type)).toEqual(["tool_use_start"]);
+        expect(events[0]?.data).toMatchObject({
+            actionType: "read_file",
+            actionLabel: "读取文件",
+            actionDetail: "src/views/App.vue",
+            actionId: "tool-read-1",
+            toolUseId: "tool-read-1",
+            toolInput: { path: "src/views/App.vue" },
+        });
+        expect(statuses.at(-2)).toEqual({
+            status: "tool_using",
+            actionType: "read_file",
+            actionDetail: "src/views/App.vue",
+        });
+    });
     it("clears active MCP tool status when ACode reports a tool result", async () => {
         const adapter = new AcodeSdkAdapter();
         adapter.setRuntimeConstructorForTest(McpResultRuntime);
@@ -712,6 +886,63 @@ describe("AcodeSdkAdapter turn completion state", () => {
         });
         expect(adapter.getSessionStatus("session-poll-message")).toBe("waiting_input");
     });
+    it("keeps empty poll_message results in waiting_input instead of showing stuck thinking", async () => {
+        const adapter = new AcodeSdkAdapter();
+        adapter.setRuntimeConstructorForTest(EmptyPollResultRuntime);
+        const events = [];
+        const statuses = [];
+        adapter.on("event", (event) => events.push(event));
+        adapter.on("status-change", (_sessionId, status) => statuses.push(status));
+        await adapter.startSession("session-empty-poll-result", {
+            command: "acode",
+            workingDirectory: process.cwd(),
+            autoAccept: true,
+            extraMcpServers: {},
+            envOverrides: {},
+        });
+        await adapter.sendMessage("session-empty-poll-result", "listen");
+        expect(events.map((event) => event.type)).toEqual([
+            "tool_use_start",
+            "tool_use_end",
+        ]);
+        expect(statuses).toEqual([
+            "starting",
+            "waiting_input",
+            "thinking",
+            "waiting_input",
+            "waiting_input",
+        ]);
+        expect(adapter.getSessionStatus("session-empty-poll-result")).toBe("waiting_input");
+    });
+    it("shows thinking after poll_message returns actual messages to process", async () => {
+        const adapter = new AcodeSdkAdapter();
+        adapter.setRuntimeConstructorForTest(PollResultWithMessageRuntime);
+        const events = [];
+        const statuses = [];
+        adapter.on("event", (event) => events.push(event));
+        adapter.on("status-change", (_sessionId, status) => statuses.push(status));
+        await adapter.startSession("session-poll-result-with-message", {
+            command: "acode",
+            workingDirectory: process.cwd(),
+            autoAccept: true,
+            extraMcpServers: {},
+            envOverrides: {},
+        });
+        await adapter.sendMessage("session-poll-result-with-message", "listen");
+        expect(events.map((event) => event.type)).toEqual([
+            "tool_use_start",
+            "tool_use_end",
+        ]);
+        expect(statuses).toEqual([
+            "starting",
+            "waiting_input",
+            "thinking",
+            "waiting_input",
+            "thinking",
+            "waiting_input",
+        ]);
+        expect(adapter.getSessionStatus("session-poll-result-with-message")).toBe("waiting_input");
+    });
     it("forwards ACode command status as thinking without changing session status", async () => {
         const adapter = new AcodeSdkAdapter();
         adapter.setRuntimeConstructorForTest(CommandStatusRuntime);
@@ -742,7 +973,11 @@ describe("AcodeSdkAdapter turn completion state", () => {
         const adapter = new AcodeSdkAdapter();
         adapter.setRuntimeConstructorForTest(AiRequestRuntime);
         const events = [];
+        const statuses = [];
         adapter.on("event", (event) => events.push(event));
+        adapter.on("status-change", (_sessionId, status, actionInfo) => {
+            statuses.push({ status, usage: actionInfo?.usage });
+        });
         await adapter.startSession("session-ai-request", {
             command: "acode",
             workingDirectory: process.cwd(),
@@ -764,6 +999,10 @@ describe("AcodeSdkAdapter turn completion state", () => {
                 requestBody: '{"model":"test-model"}',
             },
         });
+        expect(statuses).toContainEqual({
+            status: "thinking",
+            usage: { inputTokens: 6800, outputTokens: 0 },
+        });
     });
     it("forwards ACode thinking deltas as realtime thinking provider events", async () => {
         const adapter = new AcodeSdkAdapter();
@@ -942,6 +1181,78 @@ describe("AcodeSdkAdapter turn completion state", () => {
             adapter.cleanup();
         }
     });
+    it("stops re-arming auto-poll when the model answers without calling poll_message", async () => {
+        vi.useFakeTimers();
+        NonPollingAutoPollRuntime.submitMessages = [];
+        const adapter = new AcodeSdkAdapter();
+        adapter.setRuntimeConstructorForTest(NonPollingAutoPollRuntime);
+        try {
+            await adapter.startSession("session-non-polling-auto-poll", {
+                command: "acode",
+                workingDirectory: process.cwd(),
+                autoAccept: true,
+                extraMcpServers: {},
+                envOverrides: {},
+            });
+            await vi.advanceTimersByTimeAsync(250);
+            expect(NonPollingAutoPollRuntime.submitMessages).toHaveLength(1);
+            expect(NonPollingAutoPollRuntime.submitMessages[0]).toContain("poll_message");
+            await vi.advanceTimersByTimeAsync(5_000);
+            expect(NonPollingAutoPollRuntime.submitMessages).toHaveLength(1);
+            expect(adapter.getSessionStatus("session-non-polling-auto-poll")).toBe("waiting_input");
+        }
+        finally {
+            vi.useRealTimers();
+            adapter.cleanup();
+        }
+    });
+    it("keeps re-arming auto-poll when the model actually calls poll_message", async () => {
+        vi.useFakeTimers();
+        PollingAutoPollRuntime.submitMessages = [];
+        const adapter = new AcodeSdkAdapter();
+        adapter.setRuntimeConstructorForTest(PollingAutoPollRuntime);
+        try {
+            await adapter.startSession("session-polling-auto-poll", {
+                command: "acode",
+                workingDirectory: process.cwd(),
+                autoAccept: true,
+                extraMcpServers: {},
+                envOverrides: {},
+            });
+            await vi.advanceTimersByTimeAsync(250);
+            expect(PollingAutoPollRuntime.submitMessages).toHaveLength(1);
+            await vi.advanceTimersByTimeAsync(250);
+            expect(PollingAutoPollRuntime.submitMessages).toHaveLength(2);
+        }
+        finally {
+            vi.useRealTimers();
+            adapter.cleanup();
+        }
+    });
+    it("keeps re-arming auto-poll when a poll turn completes without assistant text", async () => {
+        vi.useFakeTimers();
+        AutoPollRuntime.submitMessages = [];
+        const adapter = new AcodeSdkAdapter();
+        adapter.setRuntimeConstructorForTest(AutoPollRuntime);
+        try {
+            await adapter.startSession("session-empty-auto-poll-turn", {
+                command: "acode",
+                workingDirectory: process.cwd(),
+                autoAccept: true,
+                extraMcpServers: {},
+                envOverrides: {},
+            });
+            await vi.advanceTimersByTimeAsync(250);
+            expect(AutoPollRuntime.submitMessages).toHaveLength(1);
+            await vi.advanceTimersByTimeAsync(250);
+            expect(AutoPollRuntime.submitMessages).toHaveLength(2);
+            expect(AutoPollRuntime.submitMessages[1]).toContain("poll_message");
+        }
+        finally {
+            vi.useRealTimers();
+            adapter.cleanup();
+        }
+    });
     it("cancels a pending auto-poll when a user message arrives", async () => {
         vi.useFakeTimers();
         AutoPollRuntime.submitMessages = [];
@@ -1014,8 +1325,8 @@ 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). The 2nd auto-poll is scheduled but not yet fired
-            // because the advance only covers the first 250ms.
+            // re-arms the loop). Empty turns are allowed to retry because only a
+            // plain-text assistant answer indicates the model ignored poll_message.
             expect(AutoPollRuntime.submitMessages).toHaveLength(1);
             expect(AutoPollRuntime.submitMessages[0]).toContain("poll_message");
             expect(statuses).toEqual([

package/dist/adapter/OpencodeSdkAdapter.js

@@ -517,7 +517,7 @@ export class OpencodeSdkAdapter extends EventEmitter {
                     data: { usage: session.adapterSession.totalUsage },
                 });
                 session.adapterSession.status = 'waiting_input';
-                this.emit('status-change', sessionId, 'waiting_input');
+                this.emit('status-change', sessionId, 'waiting_input', { usage: session.adapterSession.totalUsage });
                 this.startIdleDetection(sessionId);
                 break;
             }

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/adapter/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/adapter/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI3C,MAAM,MAAM,aAAa,GACrB,UAAU,GACV,UAAU,GACV,YAAY,GACZ,eAAe,GACf,WAAW,GACX,YAAY,GACZ,OAAO,CAAC;AAIZ,MAAM,MAAM,iBAAiB,GACzB,YAAY,GACZ,YAAY,GACZ,UAAU,GACV,gBAAgB,GAChB,cAAc,GACd,oBAAoB,GACpB,mBAAmB,GACnB,gBAAgB,GAChB,eAAe,GACf,kBAAkB,GAClB,OAAO,CAAC;AAIZ;;;GAGG;AACH,MAAM,MAAM,cAAc,GACtB,OAAO,GACP,KAAK,GACL,MAAM,GACN,WAAW,GACX,YAAY,GACZ,WAAW,GACX,MAAM,GACN,QAAQ,GACR,KAAK,GACL,YAAY,GACZ,KAAK,GACL,UAAU,GACV,OAAO,CAAC;AAEZ;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,aAAa;IACb,UAAU,EAAE,cAAc,CAAC;IAC3B,iBAAiB;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,iCAAiC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY;IACZ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAUD;;;GAGG;AACH,wBAAgB,kCAAkC,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQvE;AAED;;;GAGG;AACH,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAWvE;AAED;;GAEG;AACH,wBAAgB,yCAAyC,CACvD,KAAK,EAAE,OAAO,GACb,OAAO,CAgBT;AAyCD,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAsBjE;AAQD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,QAAQ,CAAC,EAAE,YAAY,GACtB,cAAc,CA8ahB;AAED,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,uBAAuB;IACtC,UAAU,CAAC,EAAE,cAAc,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,iBAAiB,CAAC;CAC3B;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,iBAAiB,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE;QACJ,0CAA0C;QAC1C,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,4BAA4B;QAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,yCAAyC;QACzC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,8BAA8B;QAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,+BAA+B;QAC/B,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,8BAA8B;QAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,kCAAkC;QAClC,sBAAsB,CAAC,EAAE,MAAM,CAAC;QAChC,kDAAkD;QAClD,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,0CAA0C;QAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,kEAAkE;QAClE,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACpC,2BAA2B;QAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,6BAA6B;QAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,8BAA8B;QAC9B,KAAK,CAAC,EAAE,iBAAiB,CAAC;QAC1B,uDAAuD;QACvD,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,+BAA+B;QAC/B,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,4BAA4B;QAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,iCAAiC;QACjC,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,4BAA4B;QAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,4BAA4B;QAC5B,SAAS,CAAC,EAAE,KAAK,CAAC;YAChB,QAAQ,EAAE,MAAM,CAAC;YACjB,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,OAAO,CAAC,EAAE,KAAK,CAAC;gBAAE,KAAK,EAAE,MAAM,CAAC;gBAAC,WAAW,CAAC,EAAE,MAAM,CAAA;aAAE,CAAC,CAAC;YACzD,QAAQ,CAAC,EAAE,OAAO,CAAC;SACpB,CAAC,CAAC;QACH,6BAA6B;QAC7B,UAAU,CAAC,EAAE,cAAc,CAAC;QAC5B,+BAA+B;QAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,6BAA6B;QAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,+CAA+C;QAC/C,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,2BAA2B;QAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;CACH;AAID,MAAM,WAAW,oBAAoB;IACnC,qBAAqB;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW;IACX,gBAAgB,EAAE,MAAM,CAAC;IACzB,2BAA2B;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,0BAA0B;IAC1B,uBAAuB,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC/C,mBAAmB;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa;IACb,YAAY,CAAC,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACzE,aAAa;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mBAAmB;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oBAAoB;IACpB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB;IACpB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa;IACb,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,iBAAiB;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,iBAAiB;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0BAA0B;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,6BAA6B;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe;IACf,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;CAClC;AAID,MAAM,WAAW,cAAc;IAC7B,cAAc;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,6BAA6B;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW;IACX,MAAM,EAAE,aAAa,CAAC;IACtB,aAAa;IACb,QAAQ,EAAE,mBAAmB,EAAE,CAAC;IAChC,WAAW;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB;IAClB,UAAU,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC;IAE1D,6BAA6B;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAID,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,UAAU,GAAG,aAAa,CAAC;IACxD,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,mCAAmC;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uBAAuB;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,wBAAwB;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,wBAAwB;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAID,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAID,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,KAAK,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,KAAK,CAAC;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,WAAW,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;QACzD,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAAC,CAAC;CACJ;AAID;;;;;;;;;;;;;GAaG;AACH,8BAAsB,mBAAoB,SAAQ,YAAY;IAC5D,iDAAiD;IACjD,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAErC,wCAAwC;IACxC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAEtC;;;;OAIG;IACH,QAAQ,CAAC,YAAY,CACnB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,IAAI,CAAC;IAEhB;;;;OAIG;IACH,QAAQ,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAEvE;;;;OAIG;IACH,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAE5E;;;;OAIG;IACH,QAAQ,CAAC,kBAAkB,CAAC,CAC1B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,OAAO,CAAC,IAAI,CAAC;IAEhB;;;;;OAKG;IACH,QAAQ,CAAC,eAAe,CAAC,CACvB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAE,GAC9D,IAAI;IAEP;;;;OAIG;IACH,QAAQ,CAAC,iBAAiB,CAAC,CACzB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;IAEhB;;;;OAIG;IACH,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAE3D;;;OAGG;IACH,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAE3D;;;;;OAKG;IACH,QAAQ,CAAC,aAAa,CAAC,CACrB,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,EACzB,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,IAAI,CAAC;IAEhB;;;OAGG;IACH,QAAQ,CAAC,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,mBAAmB,EAAE;IAElE;;;OAGG;IACH,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAE/C;;OAEG;IACH,QAAQ,CAAC,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAEpE;;OAEG;IACH,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAEvE;;OAEG;IACH,QAAQ,CAAC,aAAa,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAE9D;;OAEG;IACH,QAAQ,CAAC,OAAO,IAAI,IAAI;CACzB"}

package/dist/adapter/types.js

@@ -132,9 +132,13 @@ export function getToolActionInfo(toolName, toolInput, metadata) {
     const normalizedName = name.replace(/[_-]/g, "");
     const semanticToolName = name.startsWith("mcp__")
         ? name.split("__").slice(2).join("__")
-        : name.includes("-mcp__")
-            ? name.slice(name.indexOf("-mcp__") + 6)
-            : name;
+        : name.startsWith("builtin__")
+            ? name.split("__").slice(1).join("__")
+            : name.includes("-mcp__")
+                ? name.slice(name.indexOf("-mcp__") + 6)
+                : name.includes("/")
+                    ? name.split("/").filter(Boolean).at(-1) || name
+                    : name;
     const normalizedSemanticToolName = semanticToolName.replace(/[_-]/g, "");
     const normalizeSkillList = (value) => {
         if (!Array.isArray(value)) {