aws-runtime-bridge 1.9.124 → 1.9.126

package/package/aws-client-agent-mcp/dist/agent-client.test.js

@@ -1,6 +1,6 @@
 import assert from "node:assert/strict";
 import { describe, it, beforeEach, afterEach, mock } from "node:test";
-import { AgentClient } from "./agent-client.js";
+import { AgentClient, PollLongPollTimeoutError } from "./agent-client.js";
 import { setMcpNodeLogSink } from "./logger.js";
 // Helper function to create a complete ProfileInfo
 function createProfileInfo(overrides = {}) {
@@ -55,6 +55,78 @@ describe("AgentClient", () => {
             assert.equal(client.getAgentConfig().agentId, "preset-agent-with-token");
         });
     });
+    describe("initialize with unreachable bridge", () => {
+        function setupFastClaimEnv() {
+            process.env.AWS_AGENT_ID = "preset-agent-retry";
+            process.env.AWS_RUNTIME_BRIDGE_BASE_URL = "http://127.0.0.1:18081";
+            process.env.AWS_MCP_LAUNCH_BINDING_CLAIM_ATTEMPTS = "1";
+            process.env.AWS_MCP_LAUNCH_BINDING_CLAIM_RETRY_DELAY_MS = "0";
+        }
+        it("keeps bridge base url and pends claim when bridge is unreachable at startup", async () => {
+            setupFastClaimEnv();
+            mock.method(globalThis, "fetch", async () => {
+                throw new Error("fetch failed");
+            });
+            const client = new AgentClient();
+            await client.initialize();
+            // 关键回归点：不能清空 runtimeBridgeBaseUrl，否则后续永远拿不到 token，
+            // 日志目录会停留在 unknown-role-* 且所有工具调用 401。
+            assert.equal(client.getServerConfig().runtimeBridgeBaseUrl, "http://127.0.0.1:18081");
+        });
+        it("applies reclaimed launch binding once bridge recovers", async () => {
+            setupFastClaimEnv();
+            let bridgeUp = false;
+            mock.method(globalThis, "fetch", async (url) => {
+                const urlText = url.toString();
+                if (!urlText.includes("/runtime/binding/claim-agent")) {
+                    throw new Error(`unexpected fetch target: ${urlText}`);
+                }
+                if (!bridgeUp) {
+                    throw new Error("fetch failed");
+                }
+                return new Response(JSON.stringify({
+                    agentId: "preset-agent-retry",
+                    workspacePath: "/workspace/demo",
+                    runtimeAccessToken: "reclaimed-token-1234567890",
+                }), { status: 200, headers: { "Content-Type": "application/json" } });
+            });
+            const client = new AgentClient();
+            await client.initialize();
+            assert.equal(client.getServerConfig().runtimeAccessToken, undefined);
+            bridgeUp = true;
+            // register() 每次尝试前会走同一条补认领路径；这里直接调用私有方法聚焦断言。
+            await Reflect.get(client, "retryPendingLaunchBindingClaim").call(client);
+            assert.equal(client.getServerConfig().runtimeAccessToken, "reclaimed-token-1234567890");
+        });
+        it("still registers via preset agent id while bridge stays unreachable", async () => {
+            setupFastClaimEnv();
+            mock.method(globalThis, "fetch", async () => {
+                throw new Error("fetch failed");
+            });
+            const client = new AgentClient();
+            await client.initialize();
+            let getProfileCalls = 0;
+            Reflect.set(client, "httpClient", {
+                callTool: async (tool) => {
+                    if (tool !== "get_profile") {
+                        throw new Error(`unexpected tool: ${tool}`);
+                    }
+                    getProfileCalls += 1;
+                    return createProfileInfo({ id: "preset-agent-retry" });
+                },
+            });
+            Reflect.set(client, "wsClient", {
+                connect: async () => { },
+                disconnect: () => { },
+                isConnected: () => true,
+                on: () => { },
+            });
+            const result = await client.register();
+            assert.equal(result.agentId, "preset-agent-retry");
+            assert.ok(getProfileCalls >= 1);
+            assert.equal(client.getServerConfig().runtimeBridgeBaseUrl, "http://127.0.0.1:18081");
+        });
+    });
     describe("register", () => {
         it("should register as new agent when no preset agentId", async () => {
             process.env.AWS_ROLE_NAME = "test-role";
@@ -188,6 +260,63 @@ describe("AgentClient", () => {
             assert.equal(disconnectCalled, true);
         });
     });
+    describe("callAgentScopedTool", () => {
+        it("should always use the registered agent id over a caller-supplied id", async () => {
+            const client = new AgentClient();
+            Reflect.set(client, "agentId", "registered-agent");
+            let capturedArgs;
+            Reflect.set(client, "httpClient", {
+                callTool: async (_toolName, args) => {
+                    capturedArgs = args;
+                    return { success: true };
+                },
+            });
+            await client.callAgentScopedTool("meeting_speak", {
+                agentId: "spoofed-agent",
+                meetingId: "meeting-1",
+                content: "hello",
+            });
+            assert.equal(capturedArgs?.agentId, "registered-agent");
+            assert.equal(capturedArgs?.meetingId, "meeting-1");
+            assert.equal(capturedArgs?.content, "hello");
+        });
+    });
+    describe("hire identity injection", () => {
+        it("hireColleague should always use the registered agent id over a caller-supplied id", async () => {
+            const client = new AgentClient();
+            Reflect.set(client, "agentId", "registered-agent");
+            let capturedArgs;
+            Reflect.set(client, "httpClient", {
+                callTool: async (_toolName, args) => {
+                    capturedArgs = args;
+                    return { success: true };
+                },
+            });
+            await client.hireColleague({
+                agentId: "spoofed-agent",
+                workspacePath: "/tmp/ws",
+            });
+            assert.equal(capturedArgs?.agentId, "registered-agent");
+            assert.equal(capturedArgs?.workspacePath, "/tmp/ws");
+        });
+        it("hireColleaguesBatch should always use the registered agent id over a caller-supplied id", async () => {
+            const client = new AgentClient();
+            Reflect.set(client, "agentId", "registered-agent");
+            let capturedArgs;
+            Reflect.set(client, "httpClient", {
+                callTool: async (_toolName, args) => {
+                    capturedArgs = args;
+                    return { success: true };
+                },
+            });
+            await client.hireColleaguesBatch({
+                agentId: "spoofed-agent",
+                items: [{ workspacePath: "/tmp/ws" }],
+            });
+            assert.equal(capturedArgs?.agentId, "registered-agent");
+            assert.deepEqual(capturedArgs?.items, [{ workspacePath: "/tmp/ws" }]);
+        });
+    });
     describe("sendGroupMessage", () => {
         it("should send group message with correct parameters", async () => {
             const client = new AgentClient();
@@ -362,6 +491,127 @@ describe("AgentClient", () => {
             assert.deepEqual(result, { directMessages: [], groupMessages: [] });
             assert.deepEqual(calledTools, ["poll_message", "discover_group_rooms"]);
         });
+        it("should pass preemptiveJoinWaitMs and pollMessageTimeoutMs through to poll_message", async () => {
+            const client = new AgentClient();
+            Reflect.set(client, "agentId", "agent-1");
+            Reflect.set(client, "projectId", "demo");
+            const capturedCalls = [];
+            Reflect.set(client, "httpClient", {
+                callTool: async () => ({}),
+                callToolOnce: async (toolName, args, timeoutMs) => {
+                    capturedCalls.push({ toolName, args, timeoutMs });
+                    if (toolName === "poll_message") {
+                        return { messages: [] };
+                    }
+                    if (toolName === "discover_group_rooms") {
+                        return { groups: [] };
+                    }
+                    return {};
+                },
+            });
+            await client.fetchUnreadMessages({
+                includePipelineTasks: true,
+                preemptiveJoinWaitMs: 0,
+                pollMessageTimeoutMs: 65_000,
+                skipGroupMessages: true,
+            });
+            const pollCall = capturedCalls.find((call) => call.toolName === "poll_message");
+            assert.ok(pollCall, "poll_message 应被调用");
+            // 显式 0 必须下发（语义为"立即加入但不阻塞等待"）：省略会让服务端回退默认阻塞预算，
+            // 后台周期性 hydrate 在服务端堆积长阻塞 Callable
+            assert.equal(pollCall.args.preemptiveJoinWaitMs, 0);
+            // 会议邀请强制 hydrate 的单请求超时需覆盖服务端等待预算，否则合法长请求被误判超时
+            assert.equal(pollCall.timeoutMs, 65_000);
+            // 会议快速 hydrate 跳过群聊发现，避免群阶段耗时拖慢抢占返回
+            assert.equal(capturedCalls.some((call) => call.toolName === "discover_group_rooms"), false);
+        });
+        it("should propagate client poll_message timeout as PollLongPollTimeoutError when requested", async () => {
+            const client = new AgentClient();
+            Reflect.set(client, "agentId", "agent-1");
+            Reflect.set(client, "projectId", "demo");
+            const mockCallPollTimeout = async (toolName) => {
+                if (toolName === "poll_message") {
+                    throw new Error("MCP tool poll_message timed out after 65000ms");
+                }
+                if (toolName === "discover_group_rooms") {
+                    return { groups: [] };
+                }
+                return {};
+            };
+            Reflect.set(client, "httpClient", {
+                callTool: mockCallPollTimeout,
+                callToolOnce: mockCallPollTimeout,
+            });
+            // 超时必须与"服务端快速返回空"区分开：超时说明服务端大概率仍在执行同一请求
+            // （Callable 占线至预算结束），立即重试只会在服务端叠加长阻塞线程
+            await assert.rejects(() => client.fetchUnreadMessages({
+                includePipelineTasks: true,
+                propagatePollTimeout: true,
+            }), (error) => {
+                assert.ok(error instanceof PollLongPollTimeoutError);
+                assert.match(error.message, /timed out after 65000ms/);
+                return true;
+            });
+        });
+        it("should propagate server poll_message 503 as PollLongPollTimeoutError when requested", async () => {
+            const client = new AgentClient();
+            Reflect.set(client, "agentId", "agent-1");
+            Reflect.set(client, "projectId", "demo");
+            const mockCallPoll503 = async (toolName) => {
+                if (toolName === "poll_message") {
+                    throw new Error('MCP tool poll_message call failed: 503 Service Unavailable - {"error":"Async request timed out"}');
+                }
+                if (toolName === "discover_group_rooms") {
+                    return { groups: [] };
+                }
+                return {};
+            };
+            Reflect.set(client, "httpClient", {
+                callTool: mockCallPoll503,
+                callToolOnce: mockCallPoll503,
+            });
+            await assert.rejects(() => client.fetchUnreadMessages({
+                includePipelineTasks: true,
+                propagatePollTimeout: true,
+            }), PollLongPollTimeoutError);
+        });
+        it("should keep fetched DMs when discover_group_rooms fails in group phase", async () => {
+            const client = new AgentClient();
+            Reflect.set(client, "agentId", "agent-1");
+            Reflect.set(client, "projectId", "demo");
+            const meetingNotice = {
+                msgId: 42,
+                channel: "meeting",
+                meetingId: "m-9",
+                senderId: "MEETING-SYSTEM",
+                senderName: "会议系统",
+                content: "系统已自动为你加入会议「评审会」。",
+                isSystem: true,
+                timestamp: new Date().toISOString(),
+            };
+            Reflect.set(client, "httpClient", {
+                callTool: async (toolName) => {
+                    if (toolName === "discover_group_rooms") {
+                        throw new Error("MCP tool discover_group_rooms call failed: 500 Internal Server Error");
+                    }
+                    return {};
+                },
+                callToolOnce: async (toolName) => {
+                    if (toolName === "poll_message") {
+                        return { messages: [meetingNotice] };
+                    }
+                    if (toolName === "discover_group_rooms") {
+                        throw new Error("MCP tool discover_group_rooms call failed: 500 Internal Server Error");
+                    }
+                    return {};
+                },
+            });
+            // 群阶段失败必须降级为无群消息，绝不能抛出导致已取到的私信（含会议自动加入提示）被整体丢弃
+            const result = await client.fetchUnreadMessages({ includePipelineTasks: true });
+            assert.equal(result.directMessages.length, 1);
+            assert.deepEqual(result.directMessages[0], meetingNotice);
+            assert.deepEqual(result.groupMessages, []);
+        });
         it("should not recover non-poll_message 503 errors", async () => {
             const client = new AgentClient();
             Reflect.set(client, "agentId", "agent-1");

package/package/aws-client-agent-mcp/dist/config.d.ts

@@ -1,5 +1,7 @@
 
 import type { AgentConfig, RuntimeLaunchBinding, ServerConfig } from "./types.js";
+
+export declare function resolveAcodeDataHome(): string;
 export declare class ConfigManager {
     private agentConfig;
     private serverConfig;

package/package/aws-client-agent-mcp/dist/config.js

@@ -1,2 +1,2 @@
-import{logger as o}from"./logger.js";const T="ws://localhost:8080/ws/agent",u=3e3,_=9e3,A=200,C=3e4,m=1e3,R=-1,d=12*60*60*1e3,I=12e4,v=`http://127.0.0.1:${process.env.AWS_RUNTIME_BRIDGE_PORT||"18081"}`;function i(n){return n.replace(/^((?:https?|wss?):\/\/(?:\[[^\]]+\]|[^/:?#]+):\d+):\d+(?=\/|$)/i,"$1")}function c(n){const t=n.toLowerCase();return t==="localhost"||t==="::1"||t==="[::1]"?"127.0.0.1":t}function h(n){const t=String(n||"").trim();if(!t)return;const r=i(t);try{const e=new URL(r);return e.protocol==="ws:"?e.protocol="http:":e.protocol==="wss:"?e.protocol="https:":e.protocol=e.protocol.toLowerCase(),e.hostname=c(e.hostname),e.origin}catch{return r.replace(/\/+$/,"")}}function S(n){const t=String(n||"").trim();if(!t)return;const r=i(t);try{const e=new URL(r);return e.protocol==="http:"?e.protocol="ws:":e.protocol==="https:"?e.protocol="wss:":e.protocol!=="ws:"&&e.protocol!=="wss:"&&(e.protocol="ws:"),e.hostname=c(e.hostname),e.pathname=e.pathname.includes("/ws/agent")?e.pathname:`${e.pathname.replace(/\/$/,"")}/ws/agent`,e.search="",e.hash="",e.toString()}catch{const e=h(r);return e?`${e}/ws/agent`.replace(/^http:/,"ws:").replace(/^https:/,"wss:"):void 0}}function E(n){const t=String(n||"").trim();if(!t)return;const r=i(t);try{const e=new URL(r);return e.protocol==="ws:"?e.protocol="http:":e.protocol==="wss:"?e.protocol="https:":e.protocol!=="http:"&&e.protocol!=="https:"&&(e.protocol="http:"),e.hostname=c(e.hostname),e.pathname=e.pathname.includes("/mcp/call")?e.pathname:`${e.pathname.replace(/\/$/,"")}/mcp/call`,e.search="",e.hash="",e.toString()}catch{const e=h(r);return e?`${e}/mcp/call`:void 0}}class U{agentConfig=null;serverConfig=null;loadConfig(){const t=process.env.AWS_WORKSPACE_PATH||process.cwd();this.agentConfig={roleName:process.env.AWS_ROLE_NAME||"",agentId:process.env.AWS_AGENT_ID||void 0,projectId:process.env.AWS_PROJECT_NAME||"default",workspacePath:t,prompt:process.env.AWS_PROMPT||"",describe:""},o.info("[Config] MCP \u5BA2\u6237\u7AEF\u914D\u7F6E\u5DF2\u52A0\u8F7D"),o.info(`[Config] \u5DE5\u4F5C\u76EE\u5F55: ${this.agentConfig.workspacePath}`),o.info(`[Config] \u9879\u76EE\u540D: ${this.agentConfig.projectId}`),this.agentConfig.agentId&&o.info(`[Config] \u9884\u8BBE AgentID: ${this.agentConfig.agentId}`),this.serverConfig={serverUrl:process.env.AWS_SERVER_URL||T,heartbeatInterval:parseInt(process.env.AWS_HEARTBEAT_INTERVAL||String(u),10),heartbeatTimeout:parseInt(process.env.AWS_HEARTBEAT_TIMEOUT||String(_),10),reconnectInterval:A,reconnectMaxInterval:this.parsePositiveIntegerEnv("AWS_RECONNECT_MAX_INTERVAL",C),reconnectJitterMs:this.parsePositiveIntegerEnv("AWS_RECONNECT_JITTER_MS",m),maxReconnectAttempts:R,userId:process.env.AWS_USER_ID||void 0,runtimeBridgeBaseUrl:process.env.AWS_RUNTIME_BRIDGE_BASE_URL||v,mcpHttpUrl:process.env.AWS_MCP_HTTP_URL||void 0,runtimeTokenRefreshIntervalMs:this.parseRuntimeTokenRefreshInterval(),mcpHttpRequestTimeoutMs:this.parsePositiveIntegerEnv("AWS_MCP_HTTP_REQUEST_TIMEOUT_MS",I)},o.info(`[Config] \u670D\u52A1\u5668\u5730\u5740: ${this.serverConfig.serverUrl}`)}applyRuntimeLaunchBinding(t){if(!this.agentConfig||!this.serverConfig)throw new Error("Configuration is not loaded. Call loadConfig() first.");const r=String(t.agentId||"").trim();r&&(this.agentConfig.agentId=r);const e=String(t.workspacePath||"").trim();e&&(this.agentConfig.workspacePath=e);const s=String(t.runtimeAccessToken||"").trim();s&&(this.serverConfig.runtimeAccessToken=s);const a=String(t.runtimeAccessTokenExpiresAt||"").trim();a&&(this.serverConfig.runtimeAccessTokenExpiresAt=a);const p=String(t.userId||"").trim();p&&(this.serverConfig.userId=p);const l=S(t.serverUrl||t.schedulerBaseUrl);l&&(this.serverConfig.serverUrl=l);const f=E(t.mcpHttpUrl);if(f)this.serverConfig.mcpHttpUrl=f;else if(t.schedulerBaseUrl){const g=E(t.schedulerBaseUrl);g&&(this.serverConfig.mcpHttpUrl=g)}o.info(`[Config] \u5DF2\u5E94\u7528 runtime-bridge \u542F\u52A8\u7ED1\u5B9A: agentId=${this.agentConfig.agentId||"(\u7A7A)"}`)}parseRuntimeTokenRefreshInterval(){return this.parsePositiveIntegerEnv("AWS_RUNTIME_TOKEN_REFRESH_INTERVAL_MS",d)}parsePositiveIntegerEnv(t,r){const e=process.env[t];if(!e||!e.trim())return r;const s=Number.parseInt(e,10);return!Number.isFinite(s)||s<=0?(o.warn(`[Config] ${t} \u65E0\u6548\uFF0C\u4F7F\u7528\u9ED8\u8BA4\u503C ${r}ms`),r):s}updateRuntimeAccessToken(t){if(!this.serverConfig)return!1;const r=t.trim();return!r||r===this.serverConfig.runtimeAccessToken?!1:(this.serverConfig.runtimeAccessToken=r,o.info("[Config] runtimeAccessToken \u5DF2\u66F4\u65B0\uFF08401 \u6062\u590D\uFF09"),!0)}getAgentConfig(){if(!this.agentConfig)throw new Error("Configuration is not loaded. Call loadConfig() first.");return this.agentConfig}getServerConfig(){if(!this.serverConfig)throw new Error("Configuration is not loaded. Call loadConfig() first.");return this.serverConfig}}const M=new U;export{U as ConfigManager,M as configManager};
+import d from"node:fs";import _ from"node:os";import g from"node:path";import{logger as s}from"./logger.js";const A="ws://localhost:8080/ws/agent",C=3e3,R=9e3,v=200,I=3e4,S=1e3,U=-1,w=12*60*60*1e3,M=12e4,h=18081;function N(){const n=String(process.env.AWS_RUNTIME_BRIDGE_BASE_URL||"").trim();if(n)return n;const t=String(process.env.AWS_RUNTIME_BRIDGE_PORT||"").trim();if(t){const e=Number.parseInt(t,10);if(Number.isFinite(e)&&e>=1&&e<=65535)return`http://127.0.0.1:${e}`}const r=L();return r!==null?`http://127.0.0.1:${r}`:`http://127.0.0.1:${h}`}function P(n,t){for(const r of n.split(/\r?\n/)){const e=r.trim();if(!e||e.startsWith("#"))continue;const o=e.search(/[=:]/);if(o<=0||e.slice(0,o).trim()!==t)continue;return e.slice(o+1).trim()||void 0}}function m(){return String(process.env.AWS_TEST_HOME||"").trim()||String(process.env.AWS_RUNTIME_HOME_DIR||"").trim()||_.homedir()}function $(){return String(process.env.ACODE_HOME||"").trim()||g.join(m(),".acode")}function L(){const n=g.join(m(),".aws-bridge","bridge-runtime.properties");let t;try{t=d.readFileSync(n,"utf8")}catch{return null}const r=P(t,"port");if(r===void 0)return null;const e=Number.parseInt(r,10);return Number.isFinite(e)&&e>=1&&e<=65535?e:(s.warn("[Config] %s \u4E2D port \u65E0\u6548\uFF1A%s\uFF0C\u56DE\u9000\u9ED8\u8BA4\u7AEF\u53E3 %d",n,r,h),null)}function a(n){return n.replace(/^((?:https?|wss?):\/\/(?:\[[^\]]+\]|[^/:?#]+):\d+):\d+(?=\/|$)/i,"$1")}function p(n){const t=n.toLowerCase();return t==="localhost"||t==="::1"||t==="[::1]"?"127.0.0.1":t}function E(n){const t=String(n||"").trim();if(!t)return;const r=a(t);try{const e=new URL(r);return e.protocol==="ws:"?e.protocol="http:":e.protocol==="wss:"?e.protocol="https:":e.protocol=e.protocol.toLowerCase(),e.hostname=p(e.hostname),e.origin}catch{return r.replace(/\/+$/,"")}}function H(n){const t=String(n||"").trim();if(!t)return;const r=a(t);try{const e=new URL(r);return e.protocol==="http:"?e.protocol="ws:":e.protocol==="https:"?e.protocol="wss:":e.protocol!=="ws:"&&e.protocol!=="wss:"&&(e.protocol="ws:"),e.hostname=p(e.hostname),e.pathname=e.pathname.includes("/ws/agent")?e.pathname:`${e.pathname.replace(/\/$/,"")}/ws/agent`,e.search="",e.hash="",e.toString()}catch{const e=E(r);return e?`${e}/ws/agent`.replace(/^http:/,"ws:").replace(/^https:/,"wss:"):void 0}}function T(n){const t=String(n||"").trim();if(!t)return;const r=a(t);try{const e=new URL(r);return e.protocol==="ws:"?e.protocol="http:":e.protocol==="wss:"?e.protocol="https:":e.protocol!=="http:"&&e.protocol!=="https:"&&(e.protocol="http:"),e.hostname=p(e.hostname),e.pathname=e.pathname.includes("/mcp/call")?e.pathname:`${e.pathname.replace(/\/$/,"")}/mcp/call`,e.search="",e.hash="",e.toString()}catch{const e=E(r);return e?`${e}/mcp/call`:void 0}}class k{agentConfig=null;serverConfig=null;loadConfig(){const t=process.env.AWS_WORKSPACE_PATH||process.cwd();this.agentConfig={roleName:process.env.AWS_ROLE_NAME||"",agentId:process.env.AWS_AGENT_ID||void 0,projectId:process.env.AWS_PROJECT_NAME||"default",workspacePath:t,prompt:process.env.AWS_PROMPT||"",describe:""},s.info("[Config] MCP \u5BA2\u6237\u7AEF\u914D\u7F6E\u5DF2\u52A0\u8F7D"),s.info(`[Config] \u5DE5\u4F5C\u76EE\u5F55: ${this.agentConfig.workspacePath}`),s.info(`[Config] \u9879\u76EE\u540D: ${this.agentConfig.projectId}`),this.agentConfig.agentId&&s.info(`[Config] \u9884\u8BBE AgentID: ${this.agentConfig.agentId}`),this.serverConfig={serverUrl:process.env.AWS_SERVER_URL||A,heartbeatInterval:parseInt(process.env.AWS_HEARTBEAT_INTERVAL||String(C),10),heartbeatTimeout:parseInt(process.env.AWS_HEARTBEAT_TIMEOUT||String(R),10),reconnectInterval:v,reconnectMaxInterval:this.parsePositiveIntegerEnv("AWS_RECONNECT_MAX_INTERVAL",I),reconnectJitterMs:this.parsePositiveIntegerEnv("AWS_RECONNECT_JITTER_MS",S),maxReconnectAttempts:U,userId:process.env.AWS_USER_ID||void 0,runtimeBridgeBaseUrl:N(),mcpHttpUrl:process.env.AWS_MCP_HTTP_URL||void 0,runtimeTokenRefreshIntervalMs:this.parseRuntimeTokenRefreshInterval(),mcpHttpRequestTimeoutMs:this.parsePositiveIntegerEnv("AWS_MCP_HTTP_REQUEST_TIMEOUT_MS",M)},s.info(`[Config] \u670D\u52A1\u5668\u5730\u5740: ${this.serverConfig.serverUrl}`),s.info(`[Config] Runtime Bridge \u5730\u5740: ${this.serverConfig.runtimeBridgeBaseUrl}`)}applyRuntimeLaunchBinding(t){if(!this.agentConfig||!this.serverConfig)throw new Error("Configuration is not loaded. Call loadConfig() first.");const r=String(t.agentId||"").trim();r&&(this.agentConfig.agentId=r);const e=String(t.workspacePath||"").trim();e&&(this.agentConfig.workspacePath=e);const o=String(t.runtimeAccessToken||"").trim();o&&(this.serverConfig.runtimeAccessToken=o);const i=String(t.runtimeAccessTokenExpiresAt||"").trim();i&&(this.serverConfig.runtimeAccessTokenExpiresAt=i);const c=String(t.userId||"").trim();c&&(this.serverConfig.userId=c);const l=H(t.serverUrl||t.schedulerBaseUrl);l&&(this.serverConfig.serverUrl=l);const f=T(t.mcpHttpUrl);if(f)this.serverConfig.mcpHttpUrl=f;else if(t.schedulerBaseUrl){const u=T(t.schedulerBaseUrl);u&&(this.serverConfig.mcpHttpUrl=u)}s.info(`[Config] \u5DF2\u5E94\u7528 runtime-bridge \u542F\u52A8\u7ED1\u5B9A: agentId=${this.agentConfig.agentId||"(\u7A7A)"}`)}parseRuntimeTokenRefreshInterval(){return this.parsePositiveIntegerEnv("AWS_RUNTIME_TOKEN_REFRESH_INTERVAL_MS",w)}parsePositiveIntegerEnv(t,r){const e=process.env[t];if(!e||!e.trim())return r;const o=Number.parseInt(e,10);return!Number.isFinite(o)||o<=0?(s.warn(`[Config] ${t} \u65E0\u6548\uFF0C\u4F7F\u7528\u9ED8\u8BA4\u503C ${r}ms`),r):o}updateRuntimeAccessToken(t){if(!this.serverConfig)return!1;const r=t.trim();return!r||r===this.serverConfig.runtimeAccessToken?!1:(this.serverConfig.runtimeAccessToken=r,s.info("[Config] runtimeAccessToken \u5DF2\u66F4\u65B0\uFF08401 \u6062\u590D\uFF09"),!0)}getAgentConfig(){if(!this.agentConfig)throw new Error("Configuration is not loaded. Call loadConfig() first.");return this.agentConfig}getServerConfig(){if(!this.serverConfig)throw new Error("Configuration is not loaded. Call loadConfig() first.");return this.serverConfig}}const F=new k;export{k as ConfigManager,F as configManager,$ as resolveAcodeDataHome};
 

package/package/aws-client-agent-mcp/dist/config.test.js

@@ -1,6 +1,9 @@
 import assert from 'node:assert/strict';
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
 import { describe, it, beforeEach, afterEach } from 'node:test';
-import { ConfigManager } from './config.js';
+import { ConfigManager, resolveAcodeDataHome } from './config.js';
 describe('ConfigManager', () => {
     const originalEnv = { ...process.env };
     let configManager;
@@ -97,6 +100,73 @@ describe('ConfigManager', () => {
             assert.equal(serverConfig.mcpHttpRequestTimeoutMs, 30000);
         });
     });
+    describe('runtimeBridgeBaseUrl discovery', () => {
+        let tempHome;
+        const createdRoots = [];
+        function useTempHome() {
+            tempHome = mkdtempSync(path.join(os.tmpdir(), 'aws-mcp-home-'));
+            createdRoots.push(tempHome);
+            // 主目录解析优先读 AWS_TEST_HOME（JS 层读取，不受外层 afterEach
+            // 整体替换 process.env 后与真实 OS 环境断开的影响）
+            process.env.AWS_TEST_HOME = tempHome;
+            delete process.env.AWS_RUNTIME_HOME_DIR;
+            delete process.env.AWS_RUNTIME_BRIDGE_BASE_URL;
+        }
+        function writeBridgeRuntimeProperties(content) {
+            const dir = path.join(tempHome, '.aws-bridge');
+            mkdirSync(dir, { recursive: true });
+            writeFileSync(path.join(dir, 'bridge-runtime.properties'), content, 'utf8');
+        }
+        afterEach(() => {
+            for (const root of createdRoots.splice(0)) {
+                rmSync(root, { recursive: true, force: true });
+            }
+        });
+        it('falls back to default bridge port when env and properties file are absent', () => {
+            useTempHome();
+            configManager.loadConfig();
+            assert.equal(configManager.getServerConfig().runtimeBridgeBaseUrl, 'http://127.0.0.1:18081');
+        });
+        it('discovers bridge port from bridge-runtime.properties', () => {
+            useTempHome();
+            writeBridgeRuntimeProperties('port=28081\npid=4321\nstartedAt=2026-08-26T00:00:00.000Z\n');
+            configManager.loadConfig();
+            assert.equal(configManager.getServerConfig().runtimeBridgeBaseUrl, 'http://127.0.0.1:28081');
+        });
+        it('accepts colon-separated properties entries', () => {
+            useTempHome();
+            writeBridgeRuntimeProperties('port: 28100\n');
+            configManager.loadConfig();
+            assert.equal(configManager.getServerConfig().runtimeBridgeBaseUrl, 'http://127.0.0.1:28100');
+        });
+        it('falls back to default when port entry is invalid', () => {
+            useTempHome();
+            writeBridgeRuntimeProperties('port=not-a-number\n');
+            configManager.loadConfig();
+            assert.equal(configManager.getServerConfig().runtimeBridgeBaseUrl, 'http://127.0.0.1:18081');
+        });
+        it('prefers explicit AWS_RUNTIME_BRIDGE_BASE_URL over the properties file', () => {
+            useTempHome();
+            writeBridgeRuntimeProperties('port=28081\n');
+            process.env.AWS_RUNTIME_BRIDGE_BASE_URL = 'http://127.0.0.1:29099';
+            configManager.loadConfig();
+            assert.equal(configManager.getServerConfig().runtimeBridgeBaseUrl, 'http://127.0.0.1:29099');
+        });
+        it('prefers inherited AWS_RUNTIME_BRIDGE_PORT over the properties file', () => {
+            useTempHome();
+            // 文件来自最后一次落盘的实例（如生产 18081），继承端口代表本次拉起自己的实例（如 dev 28081）
+            writeBridgeRuntimeProperties('port=18081\n');
+            process.env.AWS_RUNTIME_BRIDGE_PORT = '28081';
+            configManager.loadConfig();
+            assert.equal(configManager.getServerConfig().runtimeBridgeBaseUrl, 'http://127.0.0.1:28081');
+        });
+        it('ignores invalid inherited AWS_RUNTIME_BRIDGE_PORT and falls back to default', () => {
+            useTempHome();
+            process.env.AWS_RUNTIME_BRIDGE_PORT = 'not-a-port';
+            configManager.loadConfig();
+            assert.equal(configManager.getServerConfig().runtimeBridgeBaseUrl, 'http://127.0.0.1:18081');
+        });
+    });
     describe('getAgentConfig', () => {
         it('throws error when config not loaded', () => {
             assert.throws(() => configManager.getAgentConfig(), /Configuration is not loaded/);
@@ -142,6 +212,16 @@ describe('ConfigManager', () => {
             assert.equal(serverConfig.serverUrl, 'ws://127.0.0.1:8080/ws/agent');
             assert.equal(serverConfig.mcpHttpUrl, 'http://127.0.0.1:8080/mcp/call');
         });
+        it('keeps handed-down loopback dev proxy port without rewriting', () => {
+            configManager.loadConfig();
+            configManager.applyRuntimeLaunchBinding({
+                agentId: 'agent-a',
+                schedulerBaseUrl: 'http://localhost:3000',
+            });
+            const serverConfig = configManager.getServerConfig();
+            assert.equal(serverConfig.serverUrl, 'ws://127.0.0.1:3000/ws/agent');
+            assert.equal(serverConfig.mcpHttpUrl, 'http://127.0.0.1:3000/mcp/call');
+        });
         it('preserves MCP HTTP subpaths from runtime bridge bindings', () => {
             configManager.loadConfig();
             configManager.applyRuntimeLaunchBinding({
@@ -165,3 +245,15 @@ describe('ConfigManager', () => {
         });
     });
 });
+describe('resolveAcodeDataHome', () => {
+    it('prefers explicit ACODE_HOME over the resolved home dir', () => {
+        process.env.ACODE_HOME = '/tmp/isolated-acode';
+        assert.equal(resolveAcodeDataHome(), '/tmp/isolated-acode');
+    });
+    it('falls back to {home}/.acode based on AWS_TEST_HOME', () => {
+        delete process.env.ACODE_HOME;
+        delete process.env.AWS_RUNTIME_HOME_DIR;
+        process.env.AWS_TEST_HOME = path.join(os.tmpdir(), 'fake-home-x');
+        assert.equal(resolveAcodeDataHome(), path.join(process.env.AWS_TEST_HOME, '.acode'));
+    });
+});

package/package/aws-client-agent-mcp/dist/http-client.d.ts

@@ -16,6 +16,8 @@ export declare class HttpClient {
     fetchRuntimeFeatures(): Promise<Record<string, boolean>>;
     
     callToolOnce<T = unknown>(toolName: string, args: Record<string, unknown>, timeoutMs?: number): Promise<T>;
+    private readTextWithTimeout;
+    private parseJsonWithTimeout;
     
     private singleFetchWithTimeout;
     

package/package/aws-client-agent-mcp/dist/http-client.js

@@ -1,2 +1,2 @@
-import{logger as a}from"./logger.js";const d=12e4,w=5e3,g=3e4,m=1e3;function h(c){const t=c.trim();return t?t.length<=m?t:`${t.slice(0,m)}...(truncated)`:""}function T(c){return c.replace(/^((?:https?|wss?):\/\/(?:\[[^\]]+\]|[^/:?#]+):\d+):\d+(?=\/|$)/i,"$1")}function y(c){const t=c.toLowerCase();return t==="localhost"||t==="::1"||t==="[::1]"?"127.0.0.1":t}function p(c,t={}){const r=String(c||"").trim();if(!r)return;const n=T(r);try{const e=new URL(n);e.protocol==="ws:"?e.protocol="http:":e.protocol==="wss:"?e.protocol="https:":e.protocol=e.protocol.toLowerCase(),e.hostname=y(e.hostname);const s=t.fromAgentWebSocketUrl?e.pathname.replace(/\/ws\/agent\/?$/,""):e.pathname;return e.pathname=s.includes("/mcp/call")?s:`${s.replace(/\/$/,"")}/mcp/call`,e.search="",e.hash="",e.toString()}catch{const e=(t.fromAgentWebSocketUrl?n.replace(/\/ws\/agent\/?$/i,""):n).replace(/\/+$/,"");return e.endsWith("/mcp/call")?e:`${e}/mcp/call`}}const C=6e5;class k{serverConfig;mcpHttpUrl;tokenRefreshPromise=null;constructor(t){this.serverConfig=t,this.mcpHttpUrl=this.resolveMcpHttpUrl()}async callTool(t,r){await this.ensureRuntimeAccessToken();const n=Date.now()+this.resolveRetryMaxAccumulatedMs();let e=0;for(;;){e++;let s;try{s=await this.executeToolRequest(t,r)}catch(o){if(Date.now()<n&&this.isTransientError(o)){await this.delayForRetry(n,t,e);continue}throw a.warn("[HttpClient] MCP tool %s \u8BF7\u6C42\u4E0D\u53EF\u6062\u590D\u5F02\u5E38 (attempt=%s): %s",t,e,o instanceof Error?o.message:String(o)),o}if(s.status===401){if(a.warn(`[HttpClient] MCP Tool ${t} \u8FD4\u56DE 401\uFF0C\u5C1D\u8BD5\u5411 bridge \u5237\u65B0 token`),await this.tryRefreshToken(r)){let u;try{u=await this.executeToolRequest(t,r)}catch(l){if(Date.now()<n&&this.isTransientError(l)){await this.delayForRetry(n,t,e);continue}throw a.warn("[HttpClient] MCP tool %s 401\u91CD\u8BD5\u5F02\u5E38 (attempt=%s): %s",t,e,l instanceof Error?l.message:String(l)),l}if(!u.ok){if(Date.now()<n&&this.isRetryableHttpStatus(u.status)){await this.delayForRetry(n,t,e);continue}const l=typeof u.text=="function"?h(await u.text().catch(()=>"")):"";throw new Error(`MCP tool ${t} call failed: ${u.status} ${u.statusText}${l?` - ${l}`:""}`)}const f=await u.json();if(typeof f.error=="string"&&f.error.trim().length>0)throw new Error(`MCP tool ${t} failed: ${f.error}`);return f}a.warn("[HttpClient] token \u5237\u65B0\u5931\u8D25\u6216\u65E0\u65B0 token\uFF0C\u8FD4\u56DE\u539F\u59CB 401 \u9519\u8BEF")}if(!s.ok){if(Date.now()<n&&this.isRetryableHttpStatus(s.status)){await this.delayForRetry(n,t,e);continue}const o=typeof s.text=="function"?h(await s.text().catch(()=>"")):"";throw new Error(`MCP tool ${t} call failed: ${s.status} ${s.statusText}${o?` - ${o}`:""}`)}const i=await s.json();if(typeof i.error=="string"&&i.error.trim().length>0)throw new Error(`MCP tool ${t} failed: ${i.error}`);return i}}async fetchRuntimeFeatures(){await this.ensureRuntimeAccessToken();const t=this.mcpHttpUrl.replace(/\/mcp\/call(\/)?$/,"/mcp/features$1");let r;try{r=await fetch(t,{method:"POST",headers:this.buildRequestHeaders(),body:JSON.stringify({})})}catch(e){throw a.warn("[HttpClient] \u67E5\u8BE2\u80FD\u529B\u5F00\u5173\u8BF7\u6C42\u5931\u8D25: %s",e instanceof Error?e.message:String(e)),new Error(`fetch runtime features failed: ${e instanceof Error?e.message:String(e)}`)}if(!r.ok)throw a.warn("[HttpClient] \u67E5\u8BE2\u80FD\u529B\u5F00\u5173\u5931\u8D25: status=%s, statusText=%s",r.status,r.statusText),new Error(`fetch runtime features failed: ${r.status} ${r.statusText}`);const n=await r.json();return!n||typeof n.features!="object"||n.features===null?{}:n.features}async callToolOnce(t,r,n=C){await this.ensureRuntimeAccessToken();const e=o=>fetch(this.mcpHttpUrl,{method:"POST",headers:this.buildRequestHeaders(),body:JSON.stringify({tool:t,arguments:r}),signal:o});let s=await this.singleFetchWithTimeout(e,n,t);if(s.status===401&&(a.warn(`[HttpClient] MCP Tool ${t} \u8FD4\u56DE 401\uFF0C\u5C1D\u8BD5\u5411 bridge \u5237\u65B0 token`),await this.tryRefreshToken(r)&&(s=await this.singleFetchWithTimeout(e,n,t))),!s.ok){const o=typeof s.text=="function"?h(await s.text().catch(()=>"")):"";throw new Error(`MCP tool ${t} call failed: ${s.status} ${s.statusText}${o?` - ${o}`:""}`)}const i=await s.json();if(typeof i.error=="string"&&i.error.trim().length>0)throw new Error(`MCP tool ${t} failed: ${i.error}`);return i}async singleFetchWithTimeout(t,r,n){const e=new AbortController;let s;r>0&&(s=setTimeout(()=>e.abort(),r));try{return await t(e.signal)}catch(i){throw e.signal.aborted?new Error(`MCP tool ${n} timed out after ${r}ms`):i}finally{s!==void 0&&clearTimeout(s)}}async executeToolRequest(t,r){return await this.fetchWithTimeout(this.mcpHttpUrl,{method:"POST",headers:this.buildRequestHeaders(),body:JSON.stringify({tool:t,arguments:r})},`MCP tool ${t}`)}async fetchWithTimeout(t,r,n){const e=this.resolveRequestTimeoutMs(),s=new AbortController,i=setTimeout(()=>s.abort(),e);try{return await fetch(t,{...r,signal:s.signal})}catch(o){throw s.signal.aborted?new Error(`${n} timed out after ${e}ms`):o}finally{clearTimeout(i)}}resolveRequestTimeoutMs(){const t=this.serverConfig.mcpHttpRequestTimeoutMs;return typeof t=="number"&&Number.isFinite(t)&&t>0?t:d}resolveRetryIntervalMs(){const t=this.serverConfig.mcpRetryIntervalMs;return typeof t=="number"&&Number.isFinite(t)&&t>=0?t:w}resolveRetryMaxAccumulatedMs(){const t=this.serverConfig.mcpRetryMaxAccumulatedMs;return typeof t=="number"&&Number.isFinite(t)&&t>=0?t:g}isTransientError(t){if(!(t instanceof Error))return!1;const r=t.message;return!!(/timed out after \d+ms/.test(r)||/fetch failed/i.test(r)||/network/i.test(r)||/ECONNREFUSED/i.test(r)||/ECONNRESET/i.test(r))}isRetryableHttpStatus(t){return t>=500||t===429}async delayForRetry(t,r,n){const e=t-Date.now(),s=Math.min(this.resolveRetryIntervalMs(),Math.max(0,e));a.warn(`[HttpClient] MCP tool ${r} \u8BF7\u6C42\u5931\u8D25\uFF0C${s}ms \u540E\u91CD\u8BD5 (\u7B2C${n}\u6B21)`),s>0&&await new Promise(i=>setTimeout(i,s))}buildRequestHeaders(){const t={"Content-Type":"application/json"};return this.serverConfig.runtimeAccessToken&&(t["X-Runtime-Token"]=this.serverConfig.runtimeAccessToken,t.Authorization=`Bearer ${this.serverConfig.runtimeAccessToken}`),t}async ensureRuntimeAccessToken(){if(!(this.serverConfig.runtimeAccessToken||!this.serverConfig.runtimeBridgeBaseUrl))throw new Error("runtimeAccessToken is required; MCP nodes must claim a session token from launch binding")}async tryRefreshToken(t){if(this.tokenRefreshPromise)return this.tokenRefreshPromise;this.tokenRefreshPromise=this.doRefreshToken(t);try{return await this.tokenRefreshPromise}finally{this.tokenRefreshPromise=null}}async doRefreshToken(t){const r=this.serverConfig.runtimeBridgeBaseUrl;if(!r)return a.warn("[HttpClient] \u65E0 runtimeBridgeBaseUrl\uFF0C\u65E0\u6CD5\u5237\u65B0 token"),!1;const n=String(t?.agentId||"").trim();if(!n)return a.warn("[HttpClient] \u65E0 agentId\uFF0C\u65E0\u6CD5\u5237\u65B0 token"),!1;try{const e=await fetch(`${r}/runtime/binding/refresh-token`,{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({agentId:n,currentToken:this.serverConfig.runtimeAccessToken||""})});if(!e.ok)return a.warn(`[HttpClient] bridge refresh-token \u8FD4\u56DE ${e.status}\uFF0C\u65E0\u6CD5\u5237\u65B0`),!1;const i=(await e.json()).runtimeAccessToken;return i?i===this.serverConfig.runtimeAccessToken?!1:(this.serverConfig.runtimeAccessToken=i,a.info("[HttpClient] runtimeAccessToken \u5DF2\u901A\u8FC7 bridge refresh \u66F4\u65B0"),!0):(a.warn("[HttpClient] bridge \u672A\u8FD4\u56DE\u65B0 token"),!1)}catch(e){return a.warn("[HttpClient] \u5237\u65B0 token \u5931\u8D25: %s",e instanceof Error?e.message:String(e)),e instanceof Error&&e.stack&&a.warn("[HttpClient] \u5237\u65B0 token \u5F02\u5E38\u5806\u6808:",e.stack),!1}}async refreshRuntimeAccessToken(t){return this.tryRefreshToken({agentId:t})}resolveMcpHttpUrl(){const t=this.serverConfig.mcpHttpUrl;if(t&&t.trim().length>0){const n=p(t);if(n)return n}const r=p(this.serverConfig.serverUrl,{fromAgentWebSocketUrl:!0});return r||this.serverConfig.serverUrl}getMcpHttpUrl(){return this.mcpHttpUrl}}export{k as HttpClient};
+import{logger as o}from"./logger.js";import{meetingDebugLog as h}from"./meeting-debug-log.js";const w=12e4,g=5e3,T=3e4,d=1e3;function p(l){const e=l.trim();return e?e.length<=d?e:`${e.slice(0,d)}...(truncated)`:""}function y(l){return l.replace(/^((?:https?|wss?):\/\/(?:\[[^\]]+\]|[^/:?#]+):\d+):\d+(?=\/|$)/i,"$1")}function C(l){const e=l.toLowerCase();return e==="localhost"||e==="::1"||e==="[::1]"?"127.0.0.1":e}function m(l,e={}){const r=String(l||"").trim();if(!r)return;const s=y(r);try{const t=new URL(s);t.protocol==="ws:"?t.protocol="http:":t.protocol==="wss:"?t.protocol="https:":t.protocol=t.protocol.toLowerCase(),t.hostname=C(t.hostname);const n=e.fromAgentWebSocketUrl?t.pathname.replace(/\/ws\/agent\/?$/,""):t.pathname;return t.pathname=n.includes("/mcp/call")?n:`${n.replace(/\/$/,"")}/mcp/call`,t.search="",t.hash="",t.toString()}catch{const t=(e.fromAgentWebSocketUrl?s.replace(/\/ws\/agent\/?$/i,""):s).replace(/\/+$/,"");return t.endsWith("/mcp/call")?t:`${t}/mcp/call`}}const R=6e5;class E{serverConfig;mcpHttpUrl;tokenRefreshPromise=null;constructor(e){this.serverConfig=e,this.mcpHttpUrl=this.resolveMcpHttpUrl()}async callTool(e,r){await this.ensureRuntimeAccessToken();const s=Date.now()+this.resolveRetryMaxAccumulatedMs();let t=0;for(;;){t++;let n;try{n=await this.executeToolRequest(e,r)}catch(a){if(Date.now()<s&&this.isTransientError(a)){await this.delayForRetry(s,e,t);continue}throw o.warn("[HttpClient] MCP tool %s \u8BF7\u6C42\u4E0D\u53EF\u6062\u590D\u5F02\u5E38 (attempt=%s): %s",e,t,a instanceof Error?a.message:String(a)),a}if(n.status===401){if(o.warn(`[HttpClient] MCP Tool ${e} \u8FD4\u56DE 401\uFF0C\u5C1D\u8BD5\u5411 bridge \u5237\u65B0 token`),await this.tryRefreshToken(r)){let c;try{c=await this.executeToolRequest(e,r)}catch(f){if(Date.now()<s&&this.isTransientError(f)){await this.delayForRetry(s,e,t);continue}throw o.warn("[HttpClient] MCP tool %s 401\u91CD\u8BD5\u5F02\u5E38 (attempt=%s): %s",e,t,f instanceof Error?f.message:String(f)),f}if(!c.ok){if(Date.now()<s&&this.isRetryableHttpStatus(c.status)){await this.delayForRetry(s,e,t);continue}const f=typeof c.text=="function"?p(await c.text().catch(()=>"")):"";throw new Error(`MCP tool ${e} call failed: ${c.status} ${c.statusText}${f?` - ${f}`:""}`)}const u=await c.json();if(typeof u.error=="string"&&u.error.trim().length>0)throw new Error(`MCP tool ${e} failed: ${u.error}`);return u}o.warn("[HttpClient] token \u5237\u65B0\u5931\u8D25\u6216\u65E0\u65B0 token\uFF0C\u8FD4\u56DE\u539F\u59CB 401 \u9519\u8BEF")}if(!n.ok){if(Date.now()<s&&this.isRetryableHttpStatus(n.status)){await this.delayForRetry(s,e,t);continue}const a=typeof n.text=="function"?p(await n.text().catch(()=>"")):"";throw new Error(`MCP tool ${e} call failed: ${n.status} ${n.statusText}${a?` - ${a}`:""}`)}const i=await n.json();if(typeof i.error=="string"&&i.error.trim().length>0)throw new Error(`MCP tool ${e} failed: ${i.error}`);return i}}async fetchRuntimeFeatures(){await this.ensureRuntimeAccessToken();const e=this.mcpHttpUrl.replace(/\/mcp\/call(\/)?$/,"/mcp/features$1");let r;try{r=await fetch(e,{method:"POST",headers:this.buildRequestHeaders(),body:JSON.stringify({})})}catch(t){throw o.warn("[HttpClient] \u67E5\u8BE2\u80FD\u529B\u5F00\u5173\u8BF7\u6C42\u5931\u8D25: %s",t instanceof Error?t.message:String(t)),new Error(`fetch runtime features failed: ${t instanceof Error?t.message:String(t)}`)}if(!r.ok)throw o.warn("[HttpClient] \u67E5\u8BE2\u80FD\u529B\u5F00\u5173\u5931\u8D25: status=%s, statusText=%s",r.status,r.statusText),new Error(`fetch runtime features failed: ${r.status} ${r.statusText}`);const s=await r.json();return!s||typeof s.features!="object"||s.features===null?{}:s.features}async callToolOnce(e,r,s=R){await this.ensureRuntimeAccessToken(),o.info("[HttpClient] callToolOnce \u5F00\u59CB: tool=%s, timeoutMs=%d, url=%s, agentId=%s",e,s,this.mcpHttpUrl,String(r?.agentId??"")),e==="poll_message"&&h("http.callToolOnce.start",`tool=${e} timeoutMs=${s} preemptiveJoinWaitMs=${String(r?.preemptiveJoinWaitMs??"-")}`);const t=c=>fetch(this.mcpHttpUrl,{method:"POST",headers:this.buildRequestHeaders(),body:JSON.stringify({tool:e,arguments:r}),signal:c}),n=Date.now();let i=await this.singleFetchWithTimeout(t,s,e);if(o.info("[HttpClient] callToolOnce \u6536\u5230\u54CD\u5E94: tool=%s, status=%d, \u8017\u65F6=%dms",e,i.status,Date.now()-n),e==="poll_message"&&h("http.callToolOnce.response",`status=${i.status} elapsedMs=${Date.now()-n}`),i.status===401&&(o.warn(`[HttpClient] MCP Tool ${e} \u8FD4\u56DE 401\uFF0C\u5C1D\u8BD5\u5411 bridge \u5237\u65B0 token`),await this.tryRefreshToken(r)&&(i=await this.singleFetchWithTimeout(t,s,e),o.info("[HttpClient] callToolOnce token \u5237\u65B0\u540E\u91CD\u8BD5\u6536\u5230\u54CD\u5E94: tool=%s, status=%d, \u7D2F\u8BA1\u8017\u65F6=%dms",e,i.status,Date.now()-n))),!i.ok){const c=typeof i.text=="function"?p(await this.readTextWithTimeout(i,s,e).catch(()=>"")):"";throw o.info("[HttpClient] callToolOnce \u975E 2xx \u54CD\u5E94: tool=%s, status=%d, body=%s",e,i.status,c||"(\u7A7A)"),new Error(`MCP tool ${e} call failed: ${i.status} ${i.statusText}${c?` - ${c}`:""}`)}const a=await this.parseJsonWithTimeout(i,s,e);if(o.info("[HttpClient] callToolOnce \u5B8C\u6210: tool=%s, \u603B\u8017\u65F6=%dms, error=%s",e,Date.now()-n,typeof a.error=="string"?a.error:"(\u65E0)"),e==="poll_message"){const c=Array.isArray(a.messages)?a.messages:[];h("http.callToolOnce.parsed",`totalElapsedMs=${Date.now()-n} serverMessages=${c.length} `+JSON.stringify(c.map(u=>({msgId:u.msgId,channel:u.channel,sender:u.senderId}))))}if(typeof a.error=="string"&&a.error.trim().length>0)throw new Error(`MCP tool ${e} failed: ${a.error}`);return a}async readTextWithTimeout(e,r,s){if(r<=0)return await e.text();let t;try{return await Promise.race([e.text(),new Promise((n,i)=>{t=setTimeout(()=>i(new Error(`MCP tool ${s} timed out after ${r}ms`)),r)})])}finally{t!==void 0&&clearTimeout(t)}}async parseJsonWithTimeout(e,r,s){if(r<=0)return await e.json();let t;try{return await Promise.race([e.json(),new Promise((n,i)=>{t=setTimeout(()=>i(new Error(`MCP tool ${s} timed out after ${r}ms`)),r)})])}finally{t!==void 0&&clearTimeout(t)}}async singleFetchWithTimeout(e,r,s){const t=new AbortController;let n;r>0&&(n=setTimeout(()=>t.abort(),r));try{return await e(t.signal)}catch(i){throw t.signal.aborted?(s==="poll_message"&&h("http.callToolOnce.timeout",`timeoutMs=${r} \u670D\u52A1\u7AEF\u53EF\u80FD\u4ECD\u5728\u6267\u884C\u540C\u4E00\u8BF7\u6C42\uFF08Callable \u5360\u7EBF\u81F3\u9884\u7B97\u7ED3\u675F\uFF09`),new Error(`MCP tool ${s} timed out after ${r}ms`)):i}finally{n!==void 0&&clearTimeout(n)}}async executeToolRequest(e,r){return await this.fetchWithTimeout(this.mcpHttpUrl,{method:"POST",headers:this.buildRequestHeaders(),body:JSON.stringify({tool:e,arguments:r})},`MCP tool ${e}`)}async fetchWithTimeout(e,r,s){const t=this.resolveRequestTimeoutMs(),n=new AbortController,i=setTimeout(()=>n.abort(),t);try{return await fetch(e,{...r,signal:n.signal})}catch(a){throw n.signal.aborted?new Error(`${s} timed out after ${t}ms`):a}finally{clearTimeout(i)}}resolveRequestTimeoutMs(){const e=this.serverConfig.mcpHttpRequestTimeoutMs;return typeof e=="number"&&Number.isFinite(e)&&e>0?e:w}resolveRetryIntervalMs(){const e=this.serverConfig.mcpRetryIntervalMs;return typeof e=="number"&&Number.isFinite(e)&&e>=0?e:g}resolveRetryMaxAccumulatedMs(){const e=this.serverConfig.mcpRetryMaxAccumulatedMs;return typeof e=="number"&&Number.isFinite(e)&&e>=0?e:T}isTransientError(e){if(!(e instanceof Error))return!1;const r=e.message;return!!(/timed out after \d+ms/.test(r)||/fetch failed/i.test(r)||/network/i.test(r)||/ECONNREFUSED/i.test(r)||/ECONNRESET/i.test(r))}isRetryableHttpStatus(e){return e>=500||e===429}async delayForRetry(e,r,s){const t=e-Date.now(),n=Math.min(this.resolveRetryIntervalMs(),Math.max(0,t));o.warn(`[HttpClient] MCP tool ${r} \u8BF7\u6C42\u5931\u8D25\uFF0C${n}ms \u540E\u91CD\u8BD5 (\u7B2C${s}\u6B21)`),n>0&&await new Promise(i=>setTimeout(i,n))}buildRequestHeaders(){const e={"Content-Type":"application/json"};return this.serverConfig.runtimeAccessToken&&(e["X-Runtime-Token"]=this.serverConfig.runtimeAccessToken,e.Authorization=`Bearer ${this.serverConfig.runtimeAccessToken}`),e}async ensureRuntimeAccessToken(){if(this.serverConfig.runtimeAccessToken||!this.serverConfig.runtimeBridgeBaseUrl){o.info("[HttpClient] ensureRuntimeAccessToken: tokenLen=%d, bridgeBaseUrl=%s",(this.serverConfig.runtimeAccessToken||"").length,this.serverConfig.runtimeBridgeBaseUrl||"(\u7A7A)");return}throw new Error("runtimeAccessToken is required; MCP nodes must claim a session token from launch binding")}async tryRefreshToken(e){if(this.tokenRefreshPromise)return this.tokenRefreshPromise;this.tokenRefreshPromise=this.doRefreshToken(e);try{return await this.tokenRefreshPromise}finally{this.tokenRefreshPromise=null}}async doRefreshToken(e){const r=this.serverConfig.runtimeBridgeBaseUrl;if(!r)return o.warn("[HttpClient] \u65E0 runtimeBridgeBaseUrl\uFF0C\u65E0\u6CD5\u5237\u65B0 token"),!1;const s=String(e?.agentId||"").trim();if(!s)return o.warn("[HttpClient] \u65E0 agentId\uFF0C\u65E0\u6CD5\u5237\u65B0 token"),!1;try{const t=await fetch(`${r}/runtime/binding/refresh-token`,{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({agentId:s,currentToken:this.serverConfig.runtimeAccessToken||""})});if(!t.ok)return o.warn(`[HttpClient] bridge refresh-token \u8FD4\u56DE ${t.status}\uFF0C\u65E0\u6CD5\u5237\u65B0`),!1;const i=(await t.json()).runtimeAccessToken;return i?i===this.serverConfig.runtimeAccessToken?!1:(this.serverConfig.runtimeAccessToken=i,o.info("[HttpClient] runtimeAccessToken \u5DF2\u901A\u8FC7 bridge refresh \u66F4\u65B0"),!0):(o.warn("[HttpClient] bridge \u672A\u8FD4\u56DE\u65B0 token"),!1)}catch(t){return o.warn("[HttpClient] \u5237\u65B0 token \u5931\u8D25: %s",t instanceof Error?t.message:String(t)),t instanceof Error&&t.stack&&o.warn("[HttpClient] \u5237\u65B0 token \u5F02\u5E38\u5806\u6808:",t.stack),!1}}async refreshRuntimeAccessToken(e){return this.tryRefreshToken({agentId:e})}resolveMcpHttpUrl(){const e=this.serverConfig.mcpHttpUrl;if(e&&e.trim().length>0){const s=m(e);if(s)return s}const r=m(this.serverConfig.serverUrl,{fromAgentWebSocketUrl:!0});return r||this.serverConfig.serverUrl}getMcpHttpUrl(){return this.mcpHttpUrl}}export{E as HttpClient};
 

package/package/aws-client-agent-mcp/dist/launch-config-tools.test.js

@@ -6,7 +6,7 @@ import { afterEach, describe, it } from "node:test";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js";
 import { McpServer } from "./mcp-server.js";
-import { MCP_TOOLS, LAUNCH_CONFIG_TOOL_NAMES } from "./mcp-tools.js";
+import { MCP_TOOLS, LAUNCH_CONFIG_TOOL_NAMES, HIRE_TOOL_NAMES } from "./mcp-tools.js";
 import { MessageBuffer } from "./message-buffer.js";
 import { MemoryStore } from "./memory-store.js";
 const LAUNCH_ITEM_FEATURE_KEY = "agentSys.launchItem";
@@ -57,7 +57,11 @@ describe("launch_config_* 能力开关门控（aws-mcp 侧）", () => {
         for (const launchTool of LAUNCH_TOOL_NAMES) {
             assert.equal(names.includes(launchTool), false, `${launchTool} 不应暴露`);
         }
-        assert.equal(names.length, MCP_TOOLS.length - LAUNCH_TOOL_NAMES.length);
+        // 能力开关 stub 返回空对象：启动项管理与招聘工具（默认关闭）均不暴露
+        for (const hireTool of HIRE_TOOL_NAMES) {
+            assert.equal(names.includes(hireTool), false, `${hireTool} 不应暴露`);
+        }
+        assert.equal(names.length, MCP_TOOLS.length - LAUNCH_TOOL_NAMES.length - HIRE_TOOL_NAMES.size);
     });
     it("开启「启动项管理」后暴露全部 9 个启动项工具", async () => {
         const { client, dir } = await buildServer(async () => ({

package/package/aws-client-agent-mcp/dist/mcp-server.d.ts

@@ -32,6 +32,10 @@ export declare class McpServer {
     
     private static readonly LAUNCH_TOOLS_ENV_KEY;
     
+    private static readonly HIRE_FEATURE_KEY;
+    
+    private static readonly HIRE_TOOLS_ENV_KEY;
+    
     private leaseRenewalTimer;
     private activeLeaseUris;
     private static readonly LEASE_DURATION_MINUTES;
@@ -39,6 +43,18 @@ export declare class McpServer {
     
     private profileSynced;
     
+    private urgentMeetingHydrateRequested;
+    private static readonly MEETING_HYDRATE_RETRY_COUNT;
+    private static readonly MEETING_HYDRATE_RETRY_DELAY_MS;
+    
+    private static readonly MEETING_HYDRATE_TIMEOUT_REARM_DELAY_MS;
+    
+    private meetingHydrateTimeoutRearmDelayMs;
+    
+    private static readonly MEETING_HYDRATE_POLL_TIMEOUT_MS;
+    
+    private static readonly MEETING_PREEMPTIVE_JOIN_WAIT_MS;
+    
     private pendingPollMessage;
     
     private syncRoleMemoryStore;
@@ -68,6 +84,8 @@ export declare class McpServer {
     
     private isLaunchConfigToolsEnabled;
     
+    private isHireToolsEnabled;
+    
     private fetchRuntimeFeaturesWithStatus;
     private static readonly MEMORY_TYPES;
     private static readonly MEMORY_TOOL_NAMES;
@@ -198,6 +216,9 @@ export declare class McpServer {
     
     private handleIncomingMessage;
     
+    private handleSystemNotify;
+    private parseNotificationPayload;
+    
     private shouldBufferIncomingMessage;
     
     private isGroupMessage;