aws-runtime-bridge 1.8.1 → 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.
@@ -83,6 +89,30 @@ function isAcodeSemanticToolAction(actionType) {
         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);
@@ -113,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);
             }
@@ -305,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"
@@ -431,7 +471,9 @@ 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 toolInput = event.data.arguments && typeof event.data.arguments === "object" && !Array.isArray(event.data.arguments)
+            const toolInput = event.data.arguments &&
+                typeof event.data.arguments === "object" &&
+                !Array.isArray(event.data.arguments)
                 ? event.data.arguments
                 : undefined;
             const actionInfo = getToolActionInfo(toolName, toolInput);
@@ -439,7 +481,8 @@ export class AcodeSdkAdapter extends EventEmitter {
                 entry.autoPollObservedPollingTool = true;
             }
             const actionDetail = isAcodeSemanticToolAction(actionInfo.actionType)
-                ? actionInfo.actionDetail || toAcodeMcpActionDetail(undefined, server, tool)
+                ? actionInfo.actionDetail ||
+                    toAcodeMcpActionDetail(undefined, server, tool)
                 : toAcodeMcpActionDetail(actionInfo.actionDetail, server, tool);
             const toolUseId = typeof event.data.toolUseId === "string"
                 ? event.data.toolUseId
@@ -459,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";
@@ -469,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),
         });

package/dist/adapter/AcodeSdkAdapter.test.js

@@ -121,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();
@@ -156,6 +215,7 @@ class AiRequestRuntime extends EventEmitter {
                 messageCount: 3,
                 toolCount: 2,
                 lastUserMessagePreview: "inspect status",
+                estimatedContextTokens: 6800,
                 requestBody: '{"model":"test-model"}',
             },
         });
@@ -620,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(),
@@ -822,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);
@@ -852,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(),
@@ -874,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();

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/routes/runtime-binding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-binding.d.ts","sourceRoot":"","sources":["../../src/routes/runtime-binding.ts"],"names":[],"mappings":"AAmBA,eAAO,MAAM,oBAAoB,4CAAW,CAAC;AAE7C,MAAM,WAAW,wBAAwB;IACvC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,0BAA0B,CAAC,EAAE,OAAO,CAAC;CACtC;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,wBAAwB,GAC9B,yBAAyB,CAM3B;AAqMD,wBAAgB,6BAA6B,IAAI,IAAI,CAapD"}
+{"version":3,"file":"runtime-binding.d.ts","sourceRoot":"","sources":["../../src/routes/runtime-binding.ts"],"names":[],"mappings":"AAmBA,eAAO,MAAM,oBAAoB,4CAAW,CAAC;AAE7C,MAAM,WAAW,wBAAwB;IACvC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,0BAA0B,CAAC,EAAE,OAAO,CAAC;CACtC;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,wBAAwB,GAC9B,yBAAyB,CAM3B;AAgPD,wBAAgB,6BAA6B,IAAI,IAAI,CAapD"}

package/dist/routes/runtime-binding.js

@@ -1,6 +1,6 @@
 import { Router } from "express";
 import { validateToken } from "../middleware/auth.js";
-import { claimMcpLaunchBinding, getMcpLaunchQueueSize } from "../services/mcp-launch-binding-queue.js";
+import { claimMcpLaunchBinding, getLatestAgentToken, getMcpLaunchQueueSize } from "../services/mcp-launch-binding-queue.js";
 import { clearRuntimeBinding, getRuntimeAccessToken, getRuntimeBindingPublicState, getRuntimePairingCode, hasRuntimeBinding, saveRuntimeBinding, validateRuntimeBindingToken, validateRuntimePairingCode, } from "../services/runtime-binding.js";
 import { createLogger } from "../utils/logger.js";
 const log = createLogger("runtime-binding-route");
@@ -133,6 +133,41 @@ runtimeBindingRouter.post("/binding/claim-agent", (req, res) => {
         remainingQueueSize: getMcpLaunchQueueSize(workspacePath),
     });
 });
+/**
+ * MCP node 在 401 后向 bridge 查询最新 session token 的端点。
+ * 仅接受本地回环请求，仅返回缓存中最新的 token。
+ */
+runtimeBindingRouter.post("/binding/refresh-token", (req, res) => {
+    if (!isLoopbackRequest(req)) {
+        res.status(403).json({ ok: false, error: "loopback request required" });
+        return;
+    }
+    const { agentId, currentToken } = req.body || {};
+    const normalizedAgentId = String(agentId || "").trim();
+    if (!normalizedAgentId) {
+        res.status(400).json({ ok: false, error: "agentId is required" });
+        return;
+    }
+    const latest = getLatestAgentToken(normalizedAgentId);
+    if (!latest) {
+        res.status(404).json({ ok: false, error: "no cached token for agent" });
+        return;
+    }
+    // 如果最新 token 与当前 token 相同，说明服务端已撤销，bridge 侧没有更新的
+    const normalizedCurrent = String(currentToken || "").trim();
+    if (normalizedCurrent && latest.runtimeAccessToken === normalizedCurrent) {
+        res.status(409).json({
+            ok: false,
+            error: "token_unchanged",
+            message: "Bridge cached token is the same as current; token may be revoked server-side",
+        });
+        return;
+    }
+    res.json({
+        ok: true,
+        runtimeAccessToken: latest.runtimeAccessToken,
+    });
+});
 runtimeBindingRouter.post("/binding/issue", validateToken, (req, res) => {
     const { accessToken, instanceId, userId, schedulerBaseUrl } = req.body || {};
     const nextToken = String(accessToken || "").trim();

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

@@ -32,4 +32,11 @@ export declare function enqueueMcpLaunchBinding(input: McpLaunchBindingInput): M
 export declare function claimMcpLaunchBinding(request: McpLaunchBindingClaimRequest): ClaimedMcpLaunchBinding | null;
 export declare function getMcpLaunchQueueSize(workspacePath: unknown): number;
 export declare function clearMcpLaunchBindingQueues(): void;
+/**
+ * 获取指定 agent 的最新 MCP session token。
+ * 供 MCP node 在 401 后向 bridge 查询最新 token 使用。
+ */
+export declare function getLatestAgentToken(agentId: string): {
+    runtimeAccessToken: string;
+} | null;
 //# sourceMappingURL=mcp-launch-binding-queue.d.ts.map

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":"AAMA,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,CA+B7F;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"}
+{"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"}

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

@@ -2,6 +2,12 @@ import path from "node:path";
 import { schedulerBaseUrl as defaultSchedulerBaseUrl } from "../config.js";
 import { getRuntimeAccessToken, loadRuntimeBinding, normalizeSchedulerBaseUrl } from "./runtime-binding.js";
 const LAUNCH_BINDING_TTL_MS = 5 * 60 * 1000;
+/**
+ * 每个 agent 最新的 MCP session token 缓存。
+ * key = agentId，value = { runtimeAccessToken, updatedAt }
+ * 当 /runtime/start 入队新 binding 时更新，供 MCP node 401 后刷新使用。
+ */
+const latestAgentTokens = new Map();
 const launchBindings = [];
 function normalizeWorkspacePath(workspacePath) {
     const raw = String(workspacePath || "").trim();
@@ -76,6 +82,14 @@ export function enqueueMcpLaunchBinding(input) {
         enqueuedAt: new Date().toISOString(),
     };
     launchBindings.push(binding);
+    // 缓存最新 token，供 MCP node 401 后刷新
+    const tokenValue = binding.runtimeAccessToken;
+    if (tokenValue) {
+        latestAgentTokens.set(agentId, {
+            runtimeAccessToken: tokenValue,
+            updatedAt: Date.now(),
+        });
+    }
     return binding;
 }
 export function claimMcpLaunchBinding(request) {
@@ -131,3 +145,14 @@ export function getMcpLaunchQueueSize(workspacePath) {
 export function clearMcpLaunchBindingQueues() {
     launchBindings.splice(0, launchBindings.length);
 }
+/**
+ * 获取指定 agent 的最新 MCP session token。
+ * 供 MCP node 在 401 后向 bridge 查询最新 token 使用。
+ */
+export function getLatestAgentToken(agentId) {
+    const cached = latestAgentTokens.get(agentId);
+    if (!cached || !cached.runtimeAccessToken) {
+        return null;
+    }
+    return { runtimeAccessToken: cached.runtimeAccessToken };
+}

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

@@ -33,6 +33,7 @@ export declare class ACodeRuntime extends EventEmitter {
     private requestChatCompletion;
     private readChatCompletionStream;
     private handleToolCalls;
+    private callMcpToolWithTimeout;
     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;AA44BpB,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;IAwF5B;;;;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;YA6DZ,qBAAqB;YAiHrB,wBAAwB;YA6ExB,eAAe;YAwJf,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;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"}