aws-runtime-bridge 1.2.0 → 1.3.0

package/dist/routes/terminal.js

@@ -80,7 +80,7 @@ terminalRouter.post('/start', validateToken, async (req, res) => {
     });
     // SDK 模式
     if (mode === 'sdk') {
-        await startSdkSession(req, res, queuedBinding?.id);
+        await startSdkSession(req, res);
         return;
     }
     // PTY 模式（原有逻辑）
@@ -110,7 +110,6 @@ terminalRouter.post('/start', validateToken, async (req, res) => {
         env: {
             ...process.env,
             AWS_AGENT_ID: String(agentId),
-            AWS_MCP_LAUNCH_BINDING_ID: queuedBinding?.id || '',
             AWS_MCP_CLAIM_LAUNCH_BINDING: 'true',
         },
     });
@@ -176,14 +175,13 @@ terminalRouter.post('/start', validateToken, async (req, res) => {
         workspacePath,
         command: actualCommand,
         mode: 'pty',
-        mcpLaunchBindingId: queuedBinding?.id,
     });
 });
 /**
  * 启动 SDK 会话
  * 支持 MCP 配置和空闲命令
  */
-async function startSdkSession(req, res, mcpLaunchBindingId) {
+async function startSdkSession(req, res) {
     const { agentId, workspacePath, command, autoAccept = true, initialPrompt, 
     // MCP 配置 - 加载 aws-client-agent-mcp
     mcpConfigPath, extraMcpServers, 
@@ -213,7 +211,6 @@ async function startSdkSession(req, res, mcpLaunchBindingId) {
             envOverrides: {
                 AWS_AGENT_ID: String(agentId),
                 AWS_WORKSPACE_PATH: String(workspacePath),
-                AWS_MCP_LAUNCH_BINDING_ID: mcpLaunchBindingId || '',
                 AWS_MCP_CLAIM_LAUNCH_BINDING: 'true',
             },
         };

package/dist/routes/terminal.test.js

@@ -56,15 +56,14 @@ describe('terminal configuration', () => {
         expect(getShellConfig('linux').shell).toBe('bash');
     });
     it('builds correct terminal environment', () => {
-        const buildTerminalEnv = (agentId, bindingId, baseEnv) => ({
+        const buildTerminalEnv = (agentId, baseEnv) => ({
             ...baseEnv,
             AWS_AGENT_ID: agentId,
-            AWS_MCP_LAUNCH_BINDING_ID: bindingId,
             AWS_MCP_CLAIM_LAUNCH_BINDING: 'true',
         });
-        const env = buildTerminalEnv('agent-123', 'binding-456', { PATH: '/usr/bin' });
+        const env = buildTerminalEnv('agent-123', { PATH: '/usr/bin' });
         expect(env.AWS_AGENT_ID).toBe('agent-123');
-        expect(env.AWS_MCP_LAUNCH_BINDING_ID).toBe('binding-456');
+        expect(env.AWS_MCP_LAUNCH_BINDING_ID).toBeUndefined();
         expect(env.AWS_MCP_CLAIM_LAUNCH_BINDING).toBe('true');
     });
 });

package/dist/services/auto-register.d.ts

@@ -75,6 +75,12 @@ export declare function requestRuntimeAccessTokenRefresh(): Promise<{
     updated?: boolean;
     error?: string;
 }>;
+export declare function requestRuntimeAccessTokenRefreshForServer(serverBaseUrl: string): Promise<{
+    success: boolean;
+    runtimeAccessToken?: string;
+    updated?: boolean;
+    error?: string;
+}>;
 export declare function unregister(): Promise<boolean>;
 /**
  * 获取注册状态

package/dist/services/auto-register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auto-register.d.ts","sourceRoot":"","sources":["../../src/services/auto-register.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AA+CH;;GAEG;AACH,UAAU,kBAAkB;IAC1B,eAAe;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,oBAAoB;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oCAAoC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mCAAmC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,0BAA0B;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,yCAAyC;IACzC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4BAA4B;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mCAAmC;IACnC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAwBD,wBAAgB,2BAA2B,IAAI,MAAM,EAAE,CAEtD;AA6DD;;GAEG;AACH,wBAAgB,6BAA6B,IAAI,MAAM,CAGtD;AAyJD;;;;;;GAMG;AACH,wBAAgB,UAAU,IAAI,kBAAkB,CA2C/C;AAED,wBAAgB,WAAW,IAAI,kBAAkB,EAAE,CA0ClD;AA4OD;;;;;;;;;;GAUG;AACH,wBAAsB,YAAY,CAChC,YAAY,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GACzC,OAAO,CAAC,OAAO,CAAC,CAalB;AAyHD;;GAEG;AACH,wBAAsB,gCAAgC,IAAI,OAAO,CAAC;IAChE,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CAqED;AAED,wBAAsB,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC,CAuBnD;AAED;;GAEG;AACH,wBAAgB,oBAAoB;gBAlzBtB,OAAO;iBACN,MAAM;mBACJ,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;kBACvB,IAAI;YACV,MAAM;EAgzBf;AAED;;GAEG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAEtC;AAED;;GAEG;AACH,wBAAgB,aAAa,IAAI,MAAM,GAAG,SAAS,CAElD;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC;IACpD,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CA2ED"}
+{"version":3,"file":"auto-register.d.ts","sourceRoot":"","sources":["../../src/services/auto-register.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAiDH;;GAEG;AACH,UAAU,kBAAkB;IAC1B,eAAe;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,oBAAoB;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oCAAoC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mCAAmC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,0BAA0B;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,yCAAyC;IACzC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4BAA4B;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mCAAmC;IACnC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAwBD,wBAAgB,2BAA2B,IAAI,MAAM,EAAE,CAEtD;AAiED;;GAEG;AACH,wBAAgB,6BAA6B,IAAI,MAAM,CAGtD;AAyJD;;;;;;GAMG;AACH,wBAAgB,UAAU,IAAI,kBAAkB,CA2C/C;AAED,wBAAgB,WAAW,IAAI,kBAAkB,EAAE,CA0ClD;AA4OD;;;;;;;;;;GAUG;AACH,wBAAsB,YAAY,CAChC,YAAY,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GACzC,OAAO,CAAC,OAAO,CAAC,CAalB;AAyHD;;GAEG;AACH,wBAAsB,gCAAgC,IAAI,OAAO,CAAC;IAChE,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CAqED;AAED,wBAAsB,yCAAyC,CAC7D,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC;IACT,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CA2ED;AAED,wBAAsB,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC,CAuBnD;AAED;;GAEG;AACH,wBAAgB,oBAAoB;gBA14BtB,OAAO;iBACN,MAAM;mBACJ,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;kBACvB,IAAI;YACV,MAAM;EAw4Bf;AAED;;GAEG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAEtC;AAED;;GAEG;AACH,wBAAgB,aAAa,IAAI,MAAM,GAAG,SAAS,CAElD;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC;IACpD,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC,CA2ED"}

package/dist/services/auto-register.js

@@ -13,7 +13,7 @@ import path from "node:path";
 import fs from "node:fs";
 import { logger } from "../utils/logger.js";
 import { schedulerBaseUrl, runtimeToken } from "../config.js";
-import { getRuntimeAccessToken, getRuntimeBindingPublicState, loadRuntimeBinding, saveRuntimeBinding, } from "./runtime-binding.js";
+import { getRuntimeAccessToken, getRuntimeBindingPublicState, loadRuntimeBinding, normalizeSchedulerBaseUrl, saveRuntimeBinding, saveScopedRuntimeAccessToken, } from "./runtime-binding.js";
 // 默认配置
 const DEFAULT_CONFIG = {
     enabled: false,
@@ -37,6 +37,9 @@ function normalizeOptionalString(value) {
     const normalized = String(value).trim();
     return normalized || undefined;
 }
+function normalizeSchedulerHttpBaseUrl(value) {
+    return normalizeSchedulerBaseUrl(value);
+}
 function normalizeOptionalBoolean(value) {
     if (typeof value === "boolean") {
         return value;
@@ -649,6 +652,65 @@ export async function requestRuntimeAccessTokenRefresh() {
         return { success: false, error: message };
     }
 }
+export async function requestRuntimeAccessTokenRefreshForServer(serverBaseUrl) {
+    const targetServerUrl = normalizeSchedulerHttpBaseUrl(serverBaseUrl);
+    if (!targetServerUrl) {
+        return { success: false, error: "serverUrl is required for runtime token refresh" };
+    }
+    const config = loadConfigs().find((item) => normalizeSchedulerHttpBaseUrl(item.serverUrl) === targetServerUrl) || loadPrimaryLifecycleConfig();
+    if (!config.userKey) {
+        return {
+            success: false,
+            error: "userKey is required for runtime token refresh",
+        };
+    }
+    const state = getRuntimeBindingPublicState();
+    const localIp = getLocalIpAddress(targetServerUrl);
+    const runtimeBridgePort = process.env.AWS_RUNTIME_BRIDGE_PORT || 18081;
+    const runtimeBridgeBaseUrl = `http://${config.registerIp || config.virtualIp || localIp}:${runtimeBridgePort}`;
+    try {
+        const response = await axios.post(`${targetServerUrl}/api/instances/runtime-tokens/refresh`, {
+            tenantId: config.tenantId,
+            userKey: config.userKey,
+            instanceId: state.instanceId,
+            instanceName: config.instanceName,
+            runtimeBridgeBaseUrl,
+        }, {
+            headers: {
+                "Content-Type": "application/json",
+                "X-Runtime-Token": runtimeToken,
+            },
+            timeout: 10000,
+        });
+        if (!response.data.success || !response.data.runtimeAccessToken) {
+            return {
+                success: false,
+                error: response.data.message ||
+                    "scheduler did not return runtimeAccessToken",
+            };
+        }
+        const userId = response.data.userId || config.userKey;
+        const previousToken = getRuntimeAccessToken(userId, targetServerUrl);
+        const updated = previousToken !== response.data.runtimeAccessToken;
+        saveScopedRuntimeAccessToken({
+            userId,
+            serverBaseUrl: targetServerUrl,
+            accessToken: response.data.runtimeAccessToken,
+        });
+        return {
+            success: true,
+            runtimeAccessToken: response.data.runtimeAccessToken,
+            updated,
+        };
+    }
+    catch (error) {
+        const err = error;
+        const message = err.response?.data
+            ? JSON.stringify(err.response.data)
+            : err.message;
+        return { success: false, error: message };
+    }
+}
 export async function unregister() {
     if (!registrationState.registered || !registrationState.instanceId) {
         logger.info("[AutoRegister] 实例未注册，无需注销");

package/dist/services/aws-client-agent-mcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aws-client-agent-mcp.d.ts","sourceRoot":"","sources":["../../src/services/aws-client-agent-mcp.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAuB7C,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,sCAAsC;IACrD,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IACvC,OAAO,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,sCAAsC;IACrD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAaD,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,QAAQ,CAAC;CAC3C;AAqBD,wBAAgB,sBAAsB,IAAI,MAAM,CAE/C;AA0FD,wBAAgB,+BAA+B,CAC7C,OAAO,GAAE,sCAA2C,GACnD,MAAM,GAAG,IAAI,CAgDf;AA2ED,wBAAgB,+BAA+B,CAC7C,OAAO,GAAE,sCAA2C,GACnD,kBAAkB,CAEpB;AAED,wBAAgB,gCAAgC,CAC9C,OAAO,GAAE,sCAA2C,GACnD,kBAAkB,CAsBpB;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,uBAAuB,GAC7B,kBAAkB,CAwBpB;AAED,wBAAgB,+BAA+B,IAAI,IAAI,CAgBtD"}
+{"version":3,"file":"aws-client-agent-mcp.d.ts","sourceRoot":"","sources":["../../src/services/aws-client-agent-mcp.ts"],"names":[],"mappings":"AAyBA,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAsB7C,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,sCAAsC;IACrD,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IACvC,OAAO,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,sCAAsC;IACrD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAaD,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,QAAQ,CAAC;CAC3C;AAuBD,wBAAgB,sBAAsB,IAAI,MAAM,CAE/C;AAgLD,wBAAgB,+BAA+B,CAC7C,OAAO,GAAE,sCAA2C,GACnD,MAAM,GAAG,IAAI,CAoDf;AA2ED,wBAAgB,+BAA+B,CAC7C,OAAO,GAAE,sCAA2C,GACnD,kBAAkB,CAEpB;AAED,wBAAgB,gCAAgC,CAC9C,OAAO,GAAE,sCAA2C,GACnD,kBAAkB,CAsBpB;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,uBAAuB,GAC7B,kBAAkB,CA0BpB;AAED,wBAAgB,+BAA+B,IAAI,IAAI,CAgBtD"}

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

@@ -1,13 +1,12 @@
 import { createHash } from "node:crypto";
-import { cpSync, existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync, } from "node:fs";
+import { cpSync, existsSync, lstatSync, mkdirSync, readdirSync, readFileSync, realpathSync, rmSync, statSync, symlinkSync, writeFileSync, } from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { getRuntimeHomeDir, port, schedulerBaseUrl } from "../config.js";
 import { logger } from "../utils/logger.js";
-import { getRuntimeAccessToken, loadRuntimeBinding, } from "./runtime-binding.js";
+import { getRuntimeAccessToken, loadRuntimeBinding, normalizeSchedulerBaseUrl, } from "./runtime-binding.js";
 export const AWS_MCP_SERVER_NAME = "aws-mcp";
 const AWS_MCP_ALLOWED_ENV_KEYS = [
-    "AWS_INTERNAL_API_KEY",
     "AWS_PROJECT_NAME",
     "AWS_PROMPT",
     "AWS_ROLE_NAME",
@@ -32,7 +31,10 @@ function getPackageRoot() {
     return path.resolve(path.dirname(currentFile), "..", "..");
 }
 function getBundledEntryPath(packageRoot = getPackageRoot()) {
-    return path.join(packageRoot, "package", "aws-client-agent-mcp", "dist", "index.js");
+    return path.join(getBundledMcpRoot(packageRoot), "dist", "index.js");
+}
+function getBundledMcpRoot(packageRoot) {
+    return path.join(packageRoot, "package", "aws-client-agent-mcp");
 }
 function getReleasedMcpRoot() {
     return path.join(getRuntimeHomeDir(), ".aws-bridge", "mcp");
@@ -56,7 +58,66 @@ function getBridgeVersion(packageRoot) {
     return readPackageVersion(path.join(packageRoot, "package.json"));
 }
 function getBundledMcpVersion(packageRoot) {
-    return readPackageVersion(path.join(packageRoot, "package", "aws-client-agent-mcp", "package.json"));
+    return readPackageVersion(path.join(getBundledMcpRoot(packageRoot), "package.json"));
+}
+function copyIfExists(sourcePath, targetPath) {
+    if (!existsSync(sourcePath)) {
+        return;
+    }
+    copyFileOrDirectory(sourcePath, targetPath);
+}
+function copyFileOrDirectory(sourcePath, targetPath) {
+    const stat = statSync(sourcePath);
+    if (stat.isDirectory()) {
+        cpSync(sourcePath, targetPath, {
+            errorOnExist: false,
+            force: true,
+            recursive: true,
+        });
+        return;
+    }
+    cpSync(sourcePath, targetPath, { errorOnExist: false, force: true });
+}
+function syncReleasedPackageMetadata(packageRoot, releasedRoot) {
+    const bundledMcpRoot = getBundledMcpRoot(packageRoot);
+    copyIfExists(path.join(bundledMcpRoot, "package.json"), path.join(releasedRoot, "package.json"));
+    copyIfExists(path.join(bundledMcpRoot, "README.md"), path.join(releasedRoot, "README.md"));
+    copyIfExists(path.join(bundledMcpRoot, "package-lock.json"), path.join(releasedRoot, "package-lock.json"));
+}
+function shouldReplaceNodeModulesLink(targetPath) {
+    if (!existsSync(targetPath)) {
+        return true;
+    }
+    const stat = lstatSync(targetPath);
+    return stat.isSymbolicLink() || stat.isDirectory();
+}
+function isExpectedNodeModulesLink(targetPath, sourcePath) {
+    if (!existsSync(targetPath)) {
+        return false;
+    }
+    try {
+        return realpathSync(targetPath) === realpathSync(sourcePath);
+    }
+    catch {
+        return false;
+    }
+}
+function ensureReleasedNodeModules(packageRoot, releasedRoot) {
+    const sourceNodeModules = path.join(packageRoot, "node_modules");
+    const releasedNodeModules = path.join(releasedRoot, "node_modules");
+    if (!existsSync(sourceNodeModules)) {
+        logger.warn(`[runtime-bridge] ${AWS_MCP_SERVER_NAME} MCP 未找到依赖目录，release 产物可能无法解析运行时依赖: ${sourceNodeModules}`);
+        return;
+    }
+    if (isExpectedNodeModulesLink(releasedNodeModules, sourceNodeModules)) {
+        return;
+    }
+    if (!shouldReplaceNodeModulesLink(releasedNodeModules)) {
+        logger.warn(`[runtime-bridge] ${AWS_MCP_SERVER_NAME} MCP 依赖路径已存在但不是目录或链接，已保留: ${releasedNodeModules}`);
+        return;
+    }
+    rmSync(releasedNodeModules, { recursive: true, force: true });
+    symlinkSync(sourceNodeModules, releasedNodeModules, process.platform === "win32" ? "junction" : "dir");
 }
 function listDistFiles(dirPath, rootPath = dirPath) {
     return readdirSync(dirPath, { withFileTypes: true }).flatMap((entry) => {
@@ -128,6 +189,8 @@ export function releaseBundledAwsClientAgentMcp(options = {}) {
     if (shouldRefreshReleasedMcp(releasedEntry, currentManifest, nextManifest)) {
         rmSync(releasedDist, { recursive: true, force: true });
         mkdirSync(releasedRoot, { recursive: true });
+        syncReleasedPackageMetadata(packageRoot, releasedRoot);
+        ensureReleasedNodeModules(packageRoot, releasedRoot);
         cpSync(bundledDist, releasedDist, {
             errorOnExist: false,
             force: true,
@@ -140,6 +203,8 @@ export function releaseBundledAwsClientAgentMcp(options = {}) {
         logger.info(`[runtime-bridge] ${AWS_MCP_SERVER_NAME} MCP 已更新到: ${releasedDist}`);
     }
     else {
+        syncReleasedPackageMetadata(packageRoot, releasedRoot);
+        ensureReleasedNodeModules(packageRoot, releasedRoot);
         logger.info(`[runtime-bridge] ${AWS_MCP_SERVER_NAME} MCP 已是最新: ${releasedDist}`);
     }
     return releasedEntry;
@@ -170,7 +235,7 @@ function parseAwsClientAgentMcpArgs(raw) {
     return [];
 }
 function toWebSocketUrl(baseUrl) {
-    const url = new URL("/ws/agent", baseUrl);
+    const url = new URL("/ws/agent", normalizeSchedulerBaseUrl(baseUrl) || baseUrl);
     if (url.protocol === "https:") {
         url.protocol = "wss:";
     }
@@ -180,7 +245,7 @@ function toWebSocketUrl(baseUrl) {
     return url.toString();
 }
 function toMcpHttpUrl(baseUrl) {
-    return new URL("/mcp/call", baseUrl).toString();
+    return new URL("/mcp/call", normalizeSchedulerBaseUrl(baseUrl) || baseUrl).toString();
 }
 function resolveSchedulerBaseUrlForMcp() {
     const envSchedulerBaseUrl = String(process.env.AWS_RUNTIME_SCHEDULER_BASE_URL || "").trim();
@@ -231,6 +296,7 @@ export function buildAwsMcpServerConfig(input) {
             AWS_SERVER_URL: env.AWS_SERVER_URL || toWebSocketUrl(effectiveSchedulerBaseUrl),
             AWS_MCP_HTTP_URL: env.AWS_MCP_HTTP_URL || toMcpHttpUrl(effectiveSchedulerBaseUrl),
             AWS_RUNTIME_BRIDGE_BASE_URL: env.AWS_RUNTIME_BRIDGE_BASE_URL || `http://127.0.0.1:${port}`,
+            AWS_MCP_CLAIM_LAUNCH_BINDING: env.AWS_MCP_CLAIM_LAUNCH_BINDING || "true",
             ...(issuedRuntimeAccessToken
                 ? { AWS_RUNTIME_ACCESS_TOKEN: issuedRuntimeAccessToken }
                 : {}),

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

@@ -1,4 +1,5 @@
-import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync, } from 'node:fs';
+import { spawnSync } from 'node:child_process';
+import { existsSync, lstatSync, mkdirSync, mkdtempSync, readFileSync, readlinkSync, realpathSync, rmSync, writeFileSync, } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { afterEach, describe, expect, it, vi } from 'vitest';
@@ -13,7 +14,31 @@ function createBundledMcpPackage(version = '1.0.0') {
     const bundledDist = path.join(packageRoot, 'package', 'aws-client-agent-mcp', 'dist');
     mkdirSync(bundledDist, { recursive: true });
     writeFileSync(path.join(packageRoot, 'package.json'), JSON.stringify({ name: 'aws-runtime-bridge', version: '9.9.9' }), 'utf-8');
-    writeFileSync(path.join(packageRoot, 'package', 'aws-client-agent-mcp', 'package.json'), JSON.stringify({ name: 'aws-client-agent-mcp', version }), 'utf-8');
+    writeFileSync(path.join(packageRoot, 'package', 'aws-client-agent-mcp', 'package.json'), JSON.stringify({
+        name: 'aws-client-agent-mcp',
+        version,
+        type: 'module',
+        main: 'dist/index.js',
+        dependencies: {
+            '@modelcontextprotocol/sdk': '^1.27.1',
+            ws: '^8.14.2',
+            yaml: '^2.3.4',
+        },
+    }), 'utf-8');
+    writeFileSync(path.join(packageRoot, 'package', 'aws-client-agent-mcp', 'README.md'), '# aws-client-agent-mcp\n', 'utf-8');
+    mkdirSync(path.join(packageRoot, 'node_modules', '@modelcontextprotocol', 'sdk'), {
+        recursive: true,
+    });
+    writeFileSync(path.join(packageRoot, 'node_modules', '@modelcontextprotocol', 'sdk', 'package.json'), JSON.stringify({
+        name: '@modelcontextprotocol/sdk',
+        version: '1.27.1',
+        type: 'module',
+        main: 'index.js',
+        exports: './index.js',
+    }), 'utf-8');
+    writeFileSync(path.join(packageRoot, 'node_modules', '@modelcontextprotocol', 'sdk', 'index.js'), 'export const sdkMarker = "resolved-sdk";\n', 'utf-8');
+    mkdirSync(path.join(packageRoot, 'node_modules', 'ws'), { recursive: true });
+    mkdirSync(path.join(packageRoot, 'node_modules', 'yaml'), { recursive: true });
     writeFileSync(path.join(bundledDist, 'index.js'), 'console.log("mcp v1");\n', 'utf-8');
     return packageRoot;
 }
@@ -56,8 +81,21 @@ describe('aws-client-agent-mcp service', () => {
             });
             const releasedIndex = path.join(releasedRoot, 'dist', 'index.js');
             const manifestPath = path.join(releasedRoot, '.release.json');
+            const releasedPackageJson = path.join(releasedRoot, 'package.json');
+            const releasedNodeModules = path.join(releasedRoot, 'node_modules');
             expect(firstRelease).toBe(releasedIndex);
             expect(existsSync(releasedIndex)).toBe(true);
+            expect(JSON.parse(readFileSync(releasedPackageJson, 'utf-8'))).toMatchObject({
+                name: 'aws-client-agent-mcp',
+                version: '1.0.0',
+                dependencies: {
+                    '@modelcontextprotocol/sdk': '^1.27.1',
+                },
+            });
+            expect(readFileSync(path.join(releasedRoot, 'README.md'), 'utf-8')).toBe('# aws-client-agent-mcp\n');
+            expect(lstatSync(releasedNodeModules).isSymbolicLink()).toBe(true);
+            expect(realpathSync(releasedNodeModules)).toBe(realpathSync(path.join(packageRoot, 'node_modules')));
+            expect(path.resolve(readlinkSync(releasedNodeModules))).toBe(path.join(packageRoot, 'node_modules'));
             const firstManifest = JSON.parse(readFileSync(manifestPath, 'utf-8'));
             expect(firstManifest).toMatchObject({
                 bridgeVersion: '9.9.9',
@@ -66,12 +104,15 @@ describe('aws-client-agent-mcp service', () => {
             });
             expect(firstManifest.distHash).toMatch(/^sha256:/);
             writeFileSync(releasedIndex, 'console.log("local marker");\n', 'utf-8');
+            rmSync(releasedNodeModules, { recursive: true, force: true });
+            mkdirSync(releasedNodeModules, { recursive: true });
             mod.releaseBundledAwsClientAgentMcp({
                 packageRoot,
                 releasedRoot,
                 now: () => '2026-05-05T00:00:00.000Z',
             });
             expect(readFileSync(releasedIndex, 'utf-8')).toBe('console.log("local marker");\n');
+            expect(realpathSync(releasedNodeModules)).toBe(realpathSync(path.join(packageRoot, 'node_modules')));
             expect(JSON.parse(readFileSync(manifestPath, 'utf-8')).releasedAt).toBe('2026-05-04T00:00:00.000Z');
         }
         finally {
@@ -102,6 +143,32 @@ describe('aws-client-agent-mcp service', () => {
             rmSync(releasedRoot, { recursive: true, force: true });
         }
     });
+    it('releases a runnable package root that resolves bundled mcp runtime dependencies', async () => {
+        process.env.AWS_CLIENT_AGENT_MCP_COMMAND = '';
+        const packageRoot = createBundledMcpPackage('1.0.0');
+        const releasedRoot = mkdtempSync(path.join(os.tmpdir(), 'aws-mcp-release-'));
+        try {
+            const bundledIndex = path.join(packageRoot, 'package', 'aws-client-agent-mcp', 'dist', 'index.js');
+            writeFileSync(bundledIndex, 'import { sdkMarker } from "@modelcontextprotocol/sdk";\nconsole.log(sdkMarker);\n', 'utf-8');
+            const mod = await import('./aws-client-agent-mcp.js');
+            const releasedEntry = mod.releaseBundledAwsClientAgentMcp({ packageRoot, releasedRoot });
+            expect(releasedEntry).toBe(path.join(releasedRoot, 'dist', 'index.js'));
+            if (!releasedEntry) {
+                throw new Error('Expected bundled MCP release entry to exist');
+            }
+            const result = spawnSync(process.execPath, [releasedEntry], {
+                cwd: releasedRoot,
+                encoding: 'utf-8',
+            });
+            expect(result.stderr).toBe('');
+            expect(result.status).toBe(0);
+            expect(result.stdout.trim()).toBe('resolved-sdk');
+        }
+        finally {
+            rmSync(packageRoot, { recursive: true, force: true });
+            rmSync(releasedRoot, { recursive: true, force: true });
+        }
+    });
     it('releases bundled mcp into home directory when runtime dist is missing', async () => {
         process.env.AWS_CLIENT_AGENT_MCP_COMMAND = '';
         const mod = await import('./aws-client-agent-mcp.js');
@@ -149,6 +216,20 @@ describe('aws-client-agent-mcp service', () => {
         expect(config.env.AWS_RUNTIME_CALLBACK_TOKEN).toBeUndefined();
         expect(config.env.CUSTOM_SECRET).toBeUndefined();
     });
+    it('repairs duplicated scheduler ports when building MCP URLs', async () => {
+        process.env.AWS_CLIENT_AGENT_MCP_COMMAND = 'aws-client-agent-mcp';
+        process.env.AWS_RUNTIME_HOME_DIR = mkdtempSync(path.join(os.tmpdir(), 'aws-mcp-config-'));
+        process.env.AWS_RUNTIME_SCHEDULER_BASE_URL = 'http://127.0.0.1:8080:8080';
+        process.env.AWS_SERVER_URL = '';
+        process.env.AWS_MCP_HTTP_URL = '';
+        const mod = await import('./aws-client-agent-mcp.js');
+        const config = mod.buildAwsMcpServerConfig({
+            agentId: 'agent-1',
+            workspacePath: '/workspace/demo',
+        });
+        expect(config.env.AWS_SERVER_URL).toBe('ws://127.0.0.1:8080/ws/agent');
+        expect(config.env.AWS_MCP_HTTP_URL).toBe('http://127.0.0.1:8080/mcp/call');
+    });
     it('ignores malformed AWS_CLIENT_AGENT_MCP_ARGS JSON', async () => {
         process.env.AWS_CLIENT_AGENT_MCP_COMMAND = 'custom-aws-client-agent-mcp';
         process.env.AWS_CLIENT_AGENT_MCP_ARGS = '{bad json';

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

@@ -24,8 +24,6 @@ export interface ClaimedMcpLaunchBinding extends McpLaunchBinding {
     schedulerBaseUrl?: string;
 }
 export interface McpLaunchBindingClaimRequest {
-    agentId: unknown;
-    bindingId?: unknown;
     workspacePath: unknown;
     serverUrl?: unknown;
 }

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":"AAGA,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,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAqCD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,qBAAqB,GAAG,gBAAgB,GAAG,IAAI,CAoB7F;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,4BAA4B,GAAG,uBAAuB,GAAG,IAAI,CAoC3G;AAED,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,OAAO,GAAG,MAAM,CAMpE;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":"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,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAmDD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,qBAAqB,GAAG,gBAAgB,GAAG,IAAI,CA+B7F;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,4BAA4B,GAAG,uBAAuB,GAAG,IAAI,CA0C3G;AAED,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,OAAO,GAAG,MAAM,CAOpE;AAED,wBAAgB,2BAA2B,IAAI,IAAI,CAElD"}

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

@@ -1,5 +1,7 @@
 import path from "node:path";
-import { getRuntimeAccessToken, loadRuntimeBinding } from "./runtime-binding.js";
+import { schedulerBaseUrl as defaultSchedulerBaseUrl } from "../config.js";
+import { getRuntimeAccessToken, loadRuntimeBinding, normalizeSchedulerBaseUrl } from "./runtime-binding.js";
+const LAUNCH_BINDING_TTL_MS = 5 * 60 * 1000;
 const launchBindings = [];
 function normalizeWorkspacePath(workspacePath) {
     const raw = String(workspacePath || "").trim();
@@ -11,57 +13,82 @@ function normalizeWorkspacePath(workspacePath) {
 function normalizeOptionalUrl(value) {
     return String(value || "").trim();
 }
-function normalizeServerUrl(serverUrl) {
-    const raw = String(serverUrl || "").trim();
+function normalizeSchedulerOrigin(serverUrl) {
+    const raw = normalizeSchedulerBaseUrl(serverUrl) || String(serverUrl || "").trim();
     if (!raw) {
         return "";
     }
     try {
         const url = new URL(raw);
-        url.protocol = url.protocol.toLowerCase();
+        if (url.protocol === "ws:") {
+            url.protocol = "http:";
+        }
+        else if (url.protocol === "wss:") {
+            url.protocol = "https:";
+        }
+        else {
+            url.protocol = url.protocol.toLowerCase();
+        }
         url.hostname = url.hostname.toLowerCase();
-        url.pathname = url.pathname.replace(/\/+$/, "");
-        return url.toString().replace(/\/+$/, "");
+        return url.origin;
     }
     catch {
         return raw.replace(/\/+$/, "").toLowerCase();
     }
 }
+function pruneExpiredBindings(now = Date.now()) {
+    for (let index = launchBindings.length - 1; index >= 0; index -= 1) {
+        const enqueuedAt = Date.parse(launchBindings[index]?.enqueuedAt || "");
+        if (!Number.isFinite(enqueuedAt) || now - enqueuedAt > LAUNCH_BINDING_TTL_MS) {
+            launchBindings.splice(index, 1);
+        }
+    }
+}
 function createBindingId(agentId) {
     return `${agentId}-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
 }
 export function enqueueMcpLaunchBinding(input) {
+    pruneExpiredBindings();
     const agentId = String(input.agentId || "").trim();
     const workspaceKey = normalizeWorkspacePath(input.workspacePath);
     if (!agentId || !workspaceKey) {
         return null;
     }
+    const runtimeState = loadRuntimeBinding();
+    const schedulerUrl = normalizeSchedulerBaseUrl(input.serverUrl || input.schedulerBaseUrl || runtimeState.schedulerBaseUrl || defaultSchedulerBaseUrl) || normalizeOptionalUrl(input.serverUrl || input.schedulerBaseUrl || runtimeState.schedulerBaseUrl || defaultSchedulerBaseUrl);
+    const schedulerBindingBaseUrl = normalizeSchedulerBaseUrl(input.schedulerBaseUrl || runtimeState.schedulerBaseUrl || defaultSchedulerBaseUrl) || normalizeOptionalUrl(input.schedulerBaseUrl || runtimeState.schedulerBaseUrl || defaultSchedulerBaseUrl);
     const binding = {
         id: createBindingId(agentId),
         agentId,
         workspacePath: path.resolve(String(input.workspacePath)),
-        serverUrl: normalizeOptionalUrl(input.serverUrl || input.schedulerBaseUrl),
+        serverUrl: schedulerUrl,
         mcpHttpUrl: normalizeOptionalUrl(input.mcpHttpUrl),
         runtimeAccessToken: normalizeOptionalUrl(input.runtimeAccessToken),
         userId: normalizeOptionalUrl(input.userId),
-        schedulerBaseUrl: normalizeOptionalUrl(input.schedulerBaseUrl),
+        schedulerBaseUrl: schedulerBindingBaseUrl,
         enqueuedAt: new Date().toISOString(),
     };
     launchBindings.push(binding);
     return binding;
 }
 export function claimMcpLaunchBinding(request) {
-    const agentId = String(request.agentId || "").trim();
-    const bindingId = String(request.bindingId || "").trim();
+    pruneExpiredBindings();
     const workspaceKey = normalizeWorkspacePath(request.workspacePath);
-    const serverKey = normalizeServerUrl(request.serverUrl);
-    if (!agentId || !bindingId || !workspaceKey || !serverKey) {
+    const serverKey = normalizeSchedulerOrigin(request.serverUrl);
+    if (!workspaceKey) {
         return null;
     }
-    const bindingIndex = launchBindings.findIndex((binding) => binding.agentId === agentId &&
-        binding.id === bindingId &&
-        normalizeWorkspacePath(binding.workspacePath) === workspaceKey &&
-        normalizeServerUrl(binding.serverUrl || binding.schedulerBaseUrl) === serverKey);
+    let bindingIndex = launchBindings.findIndex((binding) => normalizeWorkspacePath(binding.workspacePath) === workspaceKey &&
+        serverKey &&
+        normalizeSchedulerOrigin(binding.serverUrl || binding.schedulerBaseUrl) === serverKey);
+    if (bindingIndex < 0) {
+        const workspaceMatches = launchBindings
+            .map((binding, index) => ({ binding, index }))
+            .filter(({ binding }) => normalizeWorkspacePath(binding.workspacePath) === workspaceKey);
+        if (workspaceMatches.length === 1) {
+            bindingIndex = workspaceMatches[0]?.index ?? -1;
+        }
+    }
     if (bindingIndex < 0) {
         return null;
     }
@@ -81,6 +108,7 @@ export function claimMcpLaunchBinding(request) {
     };
 }
 export function getMcpLaunchQueueSize(workspacePath) {
+    pruneExpiredBindings();
     const workspaceKey = normalizeWorkspacePath(workspacePath);
     if (!workspaceKey) {
         return 0;