aws-runtime-bridge 1.0.3 → 1.1.0

package/dist/services/auto-register.js

@@ -17,12 +17,70 @@ import { getRuntimeAccessToken, getRuntimeBindingPublicState, saveRuntimeBinding
 // 默认配置
 const DEFAULT_CONFIG = {
     enabled: false,
+    serverUrl: schedulerBaseUrl,
+    preferSameLanIp: true,
     maxRetries: 5,
     retryInterval: 5000,
 };
 let registrationState = {
     registered: false,
+    registrations: {},
 };
+let cachedConfiguredConnectionKeys = [];
+export function getConfiguredConnectionKeys() {
+    return [...cachedConfiguredConnectionKeys];
+}
+function normalizeOptionalString(value) {
+    if (value == null) {
+        return undefined;
+    }
+    const normalized = String(value).trim();
+    return normalized || undefined;
+}
+function normalizeOptionalBoolean(value) {
+    if (typeof value === "boolean") {
+        return value;
+    }
+    if (typeof value === "string") {
+        const normalized = value.trim().toLowerCase();
+        if (["true", "1", "yes", "y"].includes(normalized)) {
+            return true;
+        }
+        if (["false", "0", "no", "n"].includes(normalized)) {
+            return false;
+        }
+    }
+    return undefined;
+}
+function normalizeOptionalNumber(value) {
+    if (value == null || value === "") {
+        return undefined;
+    }
+    const parsed = Number(value);
+    return Number.isFinite(parsed) ? parsed : undefined;
+}
+function normalizeTargetConfig(source) {
+    const serverUrl = normalizeOptionalString(source.serverUrl) ||
+        normalizeOptionalString(source.schedulerBaseUrl);
+    const connectionKey = normalizeOptionalString(source.connectionKey) ||
+        normalizeOptionalString(source.password);
+    return {
+        enabled: normalizeOptionalBoolean(source.enabled),
+        serverUrl,
+        tenantId: normalizeOptionalString(source.tenantId),
+        userKey: normalizeOptionalString(source.userKey),
+        connectionKey,
+        instanceName: normalizeOptionalString(source.instanceName),
+        projectName: normalizeOptionalString(source.projectName),
+        roleName: normalizeOptionalString(source.roleName),
+        workspacePath: normalizeOptionalString(source.workspacePath),
+        registerIp: normalizeOptionalString(source.registerIp),
+        virtualIp: normalizeOptionalString(source.virtualIp),
+        preferSameLanIp: normalizeOptionalBoolean(source.preferSameLanIp),
+        maxRetries: normalizeOptionalNumber(source.maxRetries),
+        retryInterval: normalizeOptionalNumber(source.retryInterval),
+    };
+}
 /**
  * 配置文件路径
  */
@@ -65,6 +123,18 @@ function ensureConfigFile() {
  *
  * 配置文件格式：
  * {
+ *   "connectionKey": "bridge-password", // 可选，server/面板连接该 bridge 的密钥
+ *   "autoRegisterTargets": [
+ *     {
+ *       "serverUrl": "http://scheduler-host:7380", // 必填，要主动注册的 server 地址
+ *       "userKey": "aws_live_xxx",                 // 必填，用户 API Key
+ *       "instanceName": "my-bridge",               // 必填/可选，默认主机名
+ *       "registerIp": "192.168.1.25",              // 可选，优先作为注册 IP
+ *       "connectionKey": "bridge-password"          // 可选，不填则使用顶层 connectionKey
+ *     }
+ *   ],
+ *
+ *   // 兼容旧版单目标配置：
  *   "userKey": "aws_live_xxx",     // 必填，用户 API Key
  *   "tenantId": "xxx",             // 可选，租户 ID（不填则自动推导）
  *   "instanceName": "my-bridge",   // 可选，默认使用主机名
@@ -89,18 +159,7 @@ function loadConfigFromFile() {
         const content = fs.readFileSync(configPath, "utf-8");
         const config = JSON.parse(content);
         logger.info(`[AutoRegister] 从配置文件加载配置: ${configPath}`);
-        return {
-            tenantId: config.tenantId,
-            userKey: config.userKey,
-            instanceName: config.instanceName,
-            projectName: config.projectName,
-            roleName: config.roleName,
-            workspacePath: config.workspacePath,
-            registerIp: config.registerIp,
-            virtualIp: config.virtualIp,
-            maxRetries: config.maxRetries,
-            retryInterval: config.retryInterval,
-        };
+        return normalizeTargetConfig(config);
     }
     catch (error) {
         const err = error;
@@ -108,6 +167,39 @@ function loadConfigFromFile() {
         return null;
     }
 }
+function loadTargetsFromFile() {
+    ensureConfigFile();
+    const configPath = getConfigFilePath();
+    try {
+        if (!fs.existsSync(configPath)) {
+            return [];
+        }
+        const content = fs.readFileSync(configPath, "utf-8");
+        const config = JSON.parse(content);
+        const topLevel = normalizeTargetConfig(config);
+        const rawTargets = Array.isArray(config.autoRegisterTargets)
+            ? config.autoRegisterTargets
+            : [];
+        if (rawTargets.length === 0) {
+            return topLevel.userKey ? [topLevel] : [];
+        }
+        return rawTargets
+            .filter((item) => Boolean(item && typeof item === "object" && !Array.isArray(item)))
+            .map((item) => {
+            const target = normalizeTargetConfig(item);
+            return {
+                ...topLevel,
+                ...target,
+                connectionKey: target.connectionKey || topLevel.connectionKey,
+            };
+        });
+    }
+    catch (error) {
+        const err = error;
+        logger.warn(`[AutoRegister] 读取自动注册目标失败: ${configPath}, error: ${err.message}`);
+        return [];
+    }
+}
 /**
  * 从环境变量加载配置
  */
@@ -116,12 +208,18 @@ function loadConfigFromEnv() {
     if (process.env.AWS_AUTO_REGISTER === "true") {
         envConfig.enabled = true;
     }
+    if (process.env.AWS_RUNTIME_SCHEDULER_BASE_URL) {
+        envConfig.serverUrl = process.env.AWS_RUNTIME_SCHEDULER_BASE_URL;
+    }
     if (process.env.AWS_TENANT_ID) {
         envConfig.tenantId = process.env.AWS_TENANT_ID;
     }
     if (process.env.AWS_USER_KEY) {
         envConfig.userKey = process.env.AWS_USER_KEY;
     }
+    if (process.env.AWS_BRIDGE_CONNECTION_KEY) {
+        envConfig.connectionKey = process.env.AWS_BRIDGE_CONNECTION_KEY;
+    }
     if (process.env.AWS_INSTANCE_NAME) {
         envConfig.instanceName = process.env.AWS_INSTANCE_NAME;
     }
@@ -140,6 +238,10 @@ function loadConfigFromEnv() {
     if (process.env.AWS_VIRTUAL_IP) {
         envConfig.virtualIp = process.env.AWS_VIRTUAL_IP;
     }
+    if (process.env.AWS_PREFER_SAME_LAN_IP) {
+        envConfig.preferSameLanIp =
+            normalizeOptionalBoolean(process.env.AWS_PREFER_SAME_LAN_IP) ?? true;
+    }
     if (process.env.AWS_REGISTER_MAX_RETRIES) {
         envConfig.maxRetries = parseInt(process.env.AWS_REGISTER_MAX_RETRIES, 10);
     }
@@ -180,18 +282,60 @@ export function loadConfig() {
     }
     return {
         enabled,
+        serverUrl: merged.serverUrl || schedulerBaseUrl,
         tenantId: merged.tenantId || "", // 保持为空字符串，后续会通过userKey自动推导
         userKey: merged.userKey || "",
+        connectionKey: merged.connectionKey,
         instanceName,
         projectName: merged.projectName,
         roleName: merged.roleName,
         workspacePath: merged.workspacePath,
         registerIp: merged.registerIp,
         virtualIp: merged.virtualIp,
+        preferSameLanIp: merged.preferSameLanIp !== false,
         maxRetries: merged.maxRetries,
         retryInterval: merged.retryInterval,
     };
 }
+export function loadConfigs() {
+    const fileTargets = loadTargetsFromFile();
+    const envConfig = loadConfigFromEnv();
+    const targets = fileTargets.length > 0 ? fileTargets : [loadConfigFromFile() || {}];
+    const configs = targets.map((target) => {
+        const merged = {
+            ...DEFAULT_CONFIG,
+            ...target,
+            ...envConfig,
+        };
+        let enabled = false;
+        if (process.env.AWS_AUTO_REGISTER !== undefined) {
+            enabled = process.env.AWS_AUTO_REGISTER === "true";
+        }
+        else {
+            enabled = fileTargets.length > 0 || Boolean(merged.userKey);
+        }
+        return {
+            enabled,
+            serverUrl: merged.serverUrl || schedulerBaseUrl,
+            tenantId: merged.tenantId || "",
+            userKey: merged.userKey || "",
+            connectionKey: merged.connectionKey,
+            instanceName: merged.instanceName || os.hostname(),
+            projectName: merged.projectName,
+            roleName: merged.roleName,
+            workspacePath: merged.workspacePath,
+            registerIp: merged.registerIp,
+            virtualIp: merged.virtualIp,
+            preferSameLanIp: merged.preferSameLanIp !== false,
+            maxRetries: merged.maxRetries,
+            retryInterval: merged.retryInterval,
+        };
+    });
+    cachedConfiguredConnectionKeys = configs
+        .map((config) => config.connectionKey)
+        .filter((key) => Boolean(key && key.trim()));
+    return configs;
+}
 /**
  * 获取本机所有非内部 IPv4 地址
  */
@@ -259,8 +403,7 @@ function extractIpFromUrl(url) {
  * 策略：
  * 1. 解析调度中心 URL 获取其 IP
  * 2. 遍历本机网卡，找到与调度中心同子网的 IP
- * 3. 如果找不到同子网 IP，返回第一个非内部 IP
- * 4. 如果没有任何非内部 IP，返回 127.0.0.1
+ * 3. 如果找不到同子网 IP，返回 127.0.0.1
  */
 function getPreferredIpAddress(schedulerUrl) {
     const allIps = getAllLocalIpAddresses();
@@ -278,43 +421,49 @@ function getPreferredIpAddress(schedulerUrl) {
                 return ipInfo.address;
             }
         }
-        logger.warn(`[AutoRegister] 未找到与调度中心 (${schedulerIp}) 同子网的 IP，使用第一个可用 IP`);
+        logger.warn(`[AutoRegister] 未找到与调度中心 (${schedulerIp}) 同子网的本机 IP，使用 127.0.0.1`);
     }
     else {
-        logger.info("[AutoRegister] 无法解析调度中心 IP，使用第一个可用 IP");
+        logger.warn("[AutoRegister] 无法解析调度中心 IP，使用 127.0.0.1");
     }
-    // 回退：返回第一个非内部 IP
-    return allIps[0].address;
+    return "127.0.0.1";
 }
 /**
  * 获取本机 IP 地址（兼容旧接口）
  */
-function getLocalIpAddress() {
-    return getPreferredIpAddress(schedulerBaseUrl);
+function getLocalIpAddress(targetServerUrl = schedulerBaseUrl) {
+    return getPreferredIpAddress(targetServerUrl);
+}
+function resolveRuntimeBridgeBaseUrl(config) {
+    const port = process.env.AWS_RUNTIME_BRIDGE_PORT || 18081;
+    const localIp = config.preferSameLanIp === false
+        ? "127.0.0.1"
+        : getLocalIpAddress(config.serverUrl || schedulerBaseUrl);
+    return `http://${config.registerIp || config.virtualIp || localIp}:${port}`;
 }
 /**
  * 执行注册请求
  */
 async function doRegister(config) {
     const instanceName = config.instanceName || os.hostname();
-    const localIp = getLocalIpAddress();
-    const port = process.env.AWS_RUNTIME_BRIDGE_PORT || 18081;
+    const targetServerUrl = config.serverUrl || schedulerBaseUrl;
     const request = {
         tenantId: config.tenantId,
         userKey: config.userKey,
         instanceName,
         hostname: os.hostname(),
         virtualIp: config.registerIp || config.virtualIp,
-        runtimeBridgeBaseUrl: `http://${config.registerIp || config.virtualIp || localIp}:${port}`,
+        runtimeBridgeBaseUrl: resolveRuntimeBridgeBaseUrl(config),
+        connectionKey: config.connectionKey,
         workspacePath: config.workspacePath,
         projectName: config.projectName,
         roleName: config.roleName,
     };
     logger.info(`[AutoRegister] 正在注册实例: ${instanceName}`);
-    logger.info(`[AutoRegister] 调度中心: ${schedulerBaseUrl}`);
+    logger.info(`[AutoRegister] 调度中心: ${targetServerUrl}`);
     logger.info(`[AutoRegister] 用户 Key: ${config.userKey ? "****" + config.userKey.slice(-4) : "(未设置)"}`);
     logger.info(`[AutoRegister] 租户 ID: ${config.tenantId || "(自动推导)"}`);
-    const response = await axios.post(`${schedulerBaseUrl}/api/instances/register`, request, {
+    const response = await axios.post(`${targetServerUrl}/api/instances/register`, request, {
         headers: {
             "Content-Type": "application/json",
             "X-Runtime-Token": runtimeToken,
@@ -348,11 +497,16 @@ async function doUnregister(instanceId) {
  * 4. 默认值
  */
 export async function autoRegister(customConfig) {
-    // 加载并合并配置
-    const config = {
-        ...loadConfig(),
-        ...customConfig,
-    };
+    const configs = customConfig
+        ? [{ ...loadConfig(), ...customConfig }]
+        : loadConfigs();
+    if (configs.length > 1) {
+        const results = await Promise.all(configs.map((config) => autoRegisterSingle(config)));
+        return results.every(Boolean);
+    }
+    return autoRegisterSingle(configs[0] || loadConfig());
+}
+async function autoRegisterSingle(config) {
     // 检查是否启用
     if (!config.enabled) {
         logger.info("[AutoRegister] 自动注册未启用");
@@ -375,6 +529,10 @@ export async function autoRegister(customConfig) {
             if (response.success) {
                 registrationState.registered = true;
                 registrationState.instanceId = response.instanceId;
+                if (response.instanceId) {
+                    registrationState.registrations[config.serverUrl || schedulerBaseUrl] =
+                        response.instanceId;
+                }
                 registrationState.error = undefined;
                 logger.info(`[AutoRegister] ✓ 注册成功！`);
                 logger.info(`[AutoRegister]   实例 ID: ${response.instanceId}`);
@@ -386,7 +544,7 @@ export async function autoRegister(customConfig) {
                             accessToken: response.runtimeAccessToken,
                             instanceId: response.instanceId,
                             userId: response.userId,
-                            schedulerBaseUrl: response.serverUrl || schedulerBaseUrl,
+                            schedulerBaseUrl: response.serverUrl || config.serverUrl || schedulerBaseUrl,
                         });
                         logger.info("[AutoRegister] 已保存调度中心下发的 runtime access token");
                     }
@@ -428,7 +586,7 @@ export async function autoRegister(customConfig) {
     logger.error(`[AutoRegister]   - 用户 Key (userKey): ${config.userKey ? "****" + config.userKey.slice(-4) : "(未设置)"}`);
     logger.error(`[AutoRegister]   - 租户 ID (tenantId): ${config.tenantId || "(可选，将自动推导)"}`);
     logger.error(`[AutoRegister]   - 实例名 (instanceName): ${config.instanceName || "(使用主机名)"}`);
-    logger.error(`[AutoRegister]   - 调度中心地址: ${schedulerBaseUrl}`);
+    logger.error(`[AutoRegister]   - 调度中心地址: ${config.serverUrl || schedulerBaseUrl}`);
     logger.error(`[AutoRegister]   - 最后错误: ${registrationState.error || "未知"}`);
     logger.error(`[AutoRegister] ========================================`);
     logger.error(`[AutoRegister] 配置来源：~/.aws-bridge/config.json 或环境变量`);

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

@@ -1,3 +1,4 @@
+import { mkdtempSync } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { afterEach, describe, expect, it, vi } from 'vitest';
@@ -61,6 +62,8 @@ describe('aws-client-agent-mcp service', () => {
         process.env.AWS_CLIENT_AGENT_MCP_COMMAND = 'aws-client-agent-mcp';
         process.env.AWS_RUNTIME_CALLBACK_TOKEN = 'secret-runtime-token';
         process.env.CUSTOM_SECRET = 'should-not-leak';
+        process.env.AWS_RUNTIME_HOME_DIR = mkdtempSync(path.join(os.tmpdir(), 'aws-mcp-config-'));
+        process.env.AWS_RUNTIME_SCHEDULER_BASE_URL = '';
         process.env.AWS_SERVER_URL = '';
         process.env.AWS_MCP_HTTP_URL = '';
         const mod = await import('./aws-client-agent-mcp.js');

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

@@ -0,0 +1,36 @@
+export interface McpLaunchBindingInput {
+    agentId: string;
+    workspacePath: string;
+    serverUrl?: string;
+    mcpHttpUrl?: string;
+    runtimeAccessToken?: string;
+    userId?: string;
+    schedulerBaseUrl?: string;
+}
+export interface McpLaunchBinding {
+    id: string;
+    agentId: string;
+    workspacePath: string;
+    serverUrl: string;
+    mcpHttpUrl: string;
+    runtimeAccessToken?: string;
+    userId?: string;
+    schedulerBaseUrl?: string;
+    enqueuedAt: string;
+}
+export interface ClaimedMcpLaunchBinding extends McpLaunchBinding {
+    runtimeAccessToken?: string;
+    userId?: string;
+    schedulerBaseUrl?: string;
+}
+export interface McpLaunchBindingClaimRequest {
+    agentId: unknown;
+    bindingId?: unknown;
+    workspacePath: unknown;
+    serverUrl?: unknown;
+}
+export declare function enqueueMcpLaunchBinding(input: McpLaunchBindingInput): McpLaunchBinding | null;
+export declare function claimMcpLaunchBinding(request: McpLaunchBindingClaimRequest): ClaimedMcpLaunchBinding | null;
+export declare function getMcpLaunchQueueSize(workspacePath: unknown): number;
+export declare function clearMcpLaunchBindingQueues(): void;
+//# sourceMappingURL=mcp-launch-binding-queue.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,92 @@
+import path from "node:path";
+import { getRuntimeAccessToken, loadRuntimeBinding } from "./runtime-binding.js";
+const launchBindings = [];
+function normalizeWorkspacePath(workspacePath) {
+    const raw = String(workspacePath || "").trim();
+    if (!raw) {
+        return "";
+    }
+    return path.resolve(raw).toLowerCase();
+}
+function normalizeOptionalUrl(value) {
+    return String(value || "").trim();
+}
+function normalizeServerUrl(serverUrl) {
+    const raw = String(serverUrl || "").trim();
+    if (!raw) {
+        return "";
+    }
+    try {
+        const url = new URL(raw);
+        url.protocol = url.protocol.toLowerCase();
+        url.hostname = url.hostname.toLowerCase();
+        url.pathname = url.pathname.replace(/\/+$/, "");
+        return url.toString().replace(/\/+$/, "");
+    }
+    catch {
+        return raw.replace(/\/+$/, "").toLowerCase();
+    }
+}
+function createBindingId(agentId) {
+    return `${agentId}-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
+}
+export function enqueueMcpLaunchBinding(input) {
+    const agentId = String(input.agentId || "").trim();
+    const workspaceKey = normalizeWorkspacePath(input.workspacePath);
+    if (!agentId || !workspaceKey) {
+        return null;
+    }
+    const binding = {
+        id: createBindingId(agentId),
+        agentId,
+        workspacePath: path.resolve(String(input.workspacePath)),
+        serverUrl: normalizeOptionalUrl(input.serverUrl || input.schedulerBaseUrl),
+        mcpHttpUrl: normalizeOptionalUrl(input.mcpHttpUrl),
+        runtimeAccessToken: normalizeOptionalUrl(input.runtimeAccessToken),
+        userId: normalizeOptionalUrl(input.userId),
+        schedulerBaseUrl: normalizeOptionalUrl(input.schedulerBaseUrl),
+        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();
+    const workspaceKey = normalizeWorkspacePath(request.workspacePath);
+    const serverKey = normalizeServerUrl(request.serverUrl);
+    if (!agentId || !bindingId || !workspaceKey || !serverKey) {
+        return null;
+    }
+    const bindingIndex = launchBindings.findIndex((binding) => binding.agentId === agentId &&
+        binding.id === bindingId &&
+        normalizeWorkspacePath(binding.workspacePath) === workspaceKey &&
+        normalizeServerUrl(binding.serverUrl || binding.schedulerBaseUrl) === serverKey);
+    if (bindingIndex < 0) {
+        return null;
+    }
+    const [binding] = launchBindings.splice(bindingIndex, 1);
+    if (!binding) {
+        return null;
+    }
+    const runtimeState = loadRuntimeBinding();
+    const userId = binding.userId || runtimeState.userId;
+    const schedulerBaseUrl = binding.schedulerBaseUrl || runtimeState.schedulerBaseUrl;
+    const runtimeAccessToken = binding.runtimeAccessToken || getRuntimeAccessToken(userId, schedulerBaseUrl);
+    return {
+        ...binding,
+        runtimeAccessToken,
+        userId,
+        schedulerBaseUrl,
+    };
+}
+export function getMcpLaunchQueueSize(workspacePath) {
+    const workspaceKey = normalizeWorkspacePath(workspacePath);
+    if (!workspaceKey) {
+        return 0;
+    }
+    return launchBindings.filter((binding) => normalizeWorkspacePath(binding.workspacePath) === workspaceKey).length;
+}
+export function clearMcpLaunchBindingQueues() {
+    launchBindings.splice(0, launchBindings.length);
+}

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=mcp-launch-binding-queue.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-launch-binding-queue.test.d.ts","sourceRoot":"","sources":["../../src/services/mcp-launch-binding-queue.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,107 @@
+import { afterEach, describe, expect, it } from 'vitest';
+import { claimMcpLaunchBinding, clearMcpLaunchBindingQueues, enqueueMcpLaunchBinding, getMcpLaunchQueueSize, } from './mcp-launch-binding-queue.js';
+describe('mcp launch binding queue', () => {
+    afterEach(() => {
+        clearMcpLaunchBindingQueues();
+    });
+    it('claims same-workspace bindings only for the requested agent identity', () => {
+        const firstBinding = enqueueMcpLaunchBinding({
+            agentId: 'agent-a',
+            workspacePath: 'C:/repo/demo',
+            serverUrl: 'ws://server-a:7380/ws/agent',
+            runtimeAccessToken: 'token-a',
+            userId: 'user-a',
+            schedulerBaseUrl: 'http://server-a:7380',
+        });
+        const secondBinding = enqueueMcpLaunchBinding({
+            agentId: 'agent-b',
+            workspacePath: 'C:/repo/demo',
+            serverUrl: 'ws://server-a:7380/ws/agent',
+            runtimeAccessToken: 'token-b',
+            userId: 'user-b',
+            schedulerBaseUrl: 'http://server-a:7380',
+        });
+        expect(getMcpLaunchQueueSize('C:/repo/demo')).toBe(2);
+        const second = claimMcpLaunchBinding({
+            agentId: 'agent-b',
+            bindingId: secondBinding?.id,
+            workspacePath: 'C:/repo/demo',
+            serverUrl: 'ws://server-a:7380/ws/agent',
+        });
+        const first = claimMcpLaunchBinding({
+            agentId: 'agent-a',
+            bindingId: firstBinding?.id,
+            workspacePath: 'C:/repo/demo',
+            serverUrl: 'ws://server-a:7380/ws/agent',
+        });
+        expect(first?.agentId).toBe('agent-a');
+        expect(first?.runtimeAccessToken).toBe('token-a');
+        expect(second?.agentId).toBe('agent-b');
+        expect(second?.runtimeAccessToken).toBe('token-b');
+        expect(getMcpLaunchQueueSize('C:/repo/demo')).toBe(0);
+    });
+    it('does not consume a binding when the requested agent id does not match', () => {
+        const binding = enqueueMcpLaunchBinding({
+            agentId: 'agent-a',
+            workspacePath: 'C:/repo/demo',
+            serverUrl: 'ws://server:7380/ws/agent',
+        });
+        expect(claimMcpLaunchBinding({
+            agentId: 'agent-b',
+            bindingId: binding?.id,
+            workspacePath: 'C:/repo/demo',
+            serverUrl: 'ws://server:7380/ws/agent',
+        })).toBeNull();
+        expect(getMcpLaunchQueueSize('C:/repo/demo')).toBe(1);
+        expect(claimMcpLaunchBinding({
+            agentId: 'agent-a',
+            bindingId: binding?.id,
+            workspacePath: 'C:/repo/demo',
+            serverUrl: 'ws://server:7380/ws/agent',
+        })?.agentId).toBe('agent-a');
+    });
+    it('does not consume a binding when the binding id is missing or wrong', () => {
+        const binding = enqueueMcpLaunchBinding({
+            agentId: 'agent-a',
+            workspacePath: 'C:/repo/demo',
+            serverUrl: 'ws://server:7380/ws/agent',
+        });
+        expect(claimMcpLaunchBinding({
+            agentId: 'agent-a',
+            workspacePath: 'C:/repo/demo',
+            serverUrl: 'ws://server:7380/ws/agent',
+        })).toBeNull();
+        expect(claimMcpLaunchBinding({
+            agentId: 'agent-a',
+            bindingId: 'wrong-binding',
+            workspacePath: 'C:/repo/demo',
+            serverUrl: 'ws://server:7380/ws/agent',
+        })).toBeNull();
+        expect(getMcpLaunchQueueSize('C:/repo/demo')).toBe(1);
+        expect(claimMcpLaunchBinding({
+            agentId: 'agent-a',
+            bindingId: binding?.id,
+            workspacePath: 'C:/repo/demo',
+            serverUrl: 'ws://server:7380/ws/agent',
+        })?.agentId).toBe('agent-a');
+    });
+    it('matches by server URL as well as workspace path', () => {
+        const firstBinding = enqueueMcpLaunchBinding({ agentId: 'agent-a', workspacePath: 'C:/repo/demo', serverUrl: 'ws://server-a:7380/ws/agent' });
+        const secondBinding = enqueueMcpLaunchBinding({ agentId: 'agent-b', workspacePath: 'C:/repo/demo', serverUrl: 'ws://server-b:7380/ws/agent' });
+        expect(claimMcpLaunchBinding({ agentId: 'agent-b', bindingId: secondBinding?.id, workspacePath: 'C:/repo/demo', serverUrl: 'ws://server-b:7380/ws/agent' })?.agentId).toBe('agent-b');
+        expect(claimMcpLaunchBinding({ agentId: 'agent-a', bindingId: firstBinding?.id, workspacePath: 'C:/repo/demo', serverUrl: 'ws://server-a:7380/ws/agent' })?.agentId).toBe('agent-a');
+    });
+    it('does not mix different workspace paths', () => {
+        const firstBinding = enqueueMcpLaunchBinding({ agentId: 'agent-a', workspacePath: 'C:/repo/a', serverUrl: 'ws://server:7380/ws/agent' });
+        const secondBinding = enqueueMcpLaunchBinding({ agentId: 'agent-b', workspacePath: 'C:/repo/b', serverUrl: 'ws://server:7380/ws/agent' });
+        expect(claimMcpLaunchBinding({ agentId: 'agent-b', bindingId: secondBinding?.id, workspacePath: 'C:/repo/b', serverUrl: 'ws://server:7380/ws/agent' })?.agentId).toBe('agent-b');
+        expect(claimMcpLaunchBinding({ agentId: 'agent-a', bindingId: firstBinding?.id, workspacePath: 'C:/repo/a', serverUrl: 'ws://server:7380/ws/agent' })?.agentId).toBe('agent-a');
+    });
+    it('returns null for missing or invalid workspaces', () => {
+        expect(enqueueMcpLaunchBinding({ agentId: '', workspacePath: 'C:/repo/demo' })).toBeNull();
+        expect(enqueueMcpLaunchBinding({ agentId: 'agent-a', workspacePath: '' })).toBeNull();
+        expect(claimMcpLaunchBinding({ agentId: 'agent-a', workspacePath: 'C:/repo/missing', serverUrl: 'ws://server:7380/ws/agent' })).toBeNull();
+        expect(claimMcpLaunchBinding({ agentId: '', workspacePath: 'C:/repo/demo', serverUrl: 'ws://server:7380/ws/agent' })).toBeNull();
+        expect(claimMcpLaunchBinding({ agentId: 'agent-a', bindingId: 'binding-a', workspacePath: 'C:/repo/demo' })).toBeNull();
+    });
+});

package/dist/services/orphan-monitor.js

@@ -180,7 +180,7 @@ export class OrphanMonitor {
         // 使用进程树终止
         const result = terminateProcessTree(pid);
         // 等待进程完全终止（最多 5 秒）
-        const exited = waitForProcessExit(pid, 5000);
+        const exited = await waitForProcessExit(pid, 5000);
         if (result.terminated > 0 && exited) {
             const event = {
                 type: 'orphan_cleaned',

package/dist/services/process-detector.d.ts

@@ -81,7 +81,7 @@ export declare function terminateProcessTree(pid: number): {
  * @param timeoutMs 超时时间（毫秒）
  * @returns 是否成功终止
  */
-export declare function waitForProcessExit(pid: number, timeoutMs?: number): boolean;
+export declare function waitForProcessExit(pid: number, timeoutMs?: number): Promise<boolean>;
 /**
  * 检测并收集所有孤儿进程信息
  * 用于 runtime-bridge 启动时恢复控制

package/dist/services/process-detector.d.ts.map

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