aws-runtime-bridge 1.0.2 → 1.1.0

package/dist/routes/terminal.js

@@ -10,8 +10,9 @@ import { v4 as uuidv4 } from 'uuid';
 import { adapterRegistry, registerSdkProviders, resolveSdkProviderIdByCommand, } from '../adapter/index.js';
 import { validateToken } from '../middleware/auth.js';
 import { getAgentProcessManager } from '../services/agent-process-manager.js';
-import { findClaudeCodeProcesses } from '../services/process-detector.js';
+import { findClaudeCodeProcesses, terminateProcessTree, waitForProcessExit } from '../services/process-detector.js';
 import { flushSessionOutput, scheduleOutputFlush, sendQuestionRequest, sendStatus, sessions } from '../services/session-output.js';
+import { enqueueMcpLaunchBinding } from '../services/mcp-launch-binding-queue.js';
 import { loadPersistedSessions, removePersistedSession, removePersistedSessionByAgentId, savePersistedSessions, upsertPersistedSession, } from '../services/terminal-persistence.js';
 export const terminalRouter = Router();
 // 导出 SDK 会话存储，供其他模块使用（如 sessions.ts）
@@ -69,9 +70,17 @@ terminalRouter.post('/start', validateToken, async (req, res) => {
         res.status(400).json({ error: 'agentId and workspacePath are required' });
         return;
     }
+    const queuedBinding = enqueueMcpLaunchBinding({
+        agentId: String(agentId),
+        workspacePath: String(workspacePath),
+        serverUrl: req.body?.serverUrl || req.body?.schedulerBaseUrl,
+        runtimeAccessToken: req.body?.runtimeAccessToken,
+        userId: req.body?.userId,
+        schedulerBaseUrl: req.body?.schedulerBaseUrl,
+    });
     // SDK 模式
     if (mode === 'sdk') {
-        await startSdkSession(req, res);
+        await startSdkSession(req, res, queuedBinding?.id);
         return;
     }
     // PTY 模式（原有逻辑）
@@ -101,6 +110,8 @@ 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',
         },
     });
     sessions.set(sessionId, {
@@ -165,13 +176,14 @@ terminalRouter.post('/start', validateToken, async (req, res) => {
         workspacePath,
         command: actualCommand,
         mode: 'pty',
+        mcpLaunchBindingId: queuedBinding?.id,
     });
 });
 /**
  * 启动 SDK 会话
  * 支持 MCP 配置和空闲命令
  */
-async function startSdkSession(req, res) {
+async function startSdkSession(req, res, mcpLaunchBindingId) {
     const { agentId, workspacePath, command, autoAccept = true, initialPrompt, 
     // MCP 配置 - 加载 aws-client-agent-mcp
     mcpConfigPath, extraMcpServers, 
@@ -198,6 +210,12 @@ async function startSdkSession(req, res) {
             // MCP 配置：不再默认注入 aws-mcp；由用户在面板中安装/配置
             mcpConfigPath,
             extraMcpServers: extraMcpServers || {},
+            envOverrides: {
+                AWS_AGENT_ID: String(agentId),
+                AWS_WORKSPACE_PATH: String(workspacePath),
+                AWS_MCP_LAUNCH_BINDING_ID: mcpLaunchBindingId || '',
+                AWS_MCP_CLAIM_LAUNCH_BINDING: 'true',
+            },
         };
         // 存储会话信息
         sdkSessions.set(sessionId, {
@@ -533,16 +551,8 @@ terminalRouter.post('/stop', validateToken, async (req, res) => {
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);
-            // 即使终止失败，也清理会话记录
-            sdkSessions.delete(sessionId);
-            // 同时按 sessionId 和 agentId 删除，确保持久化会话被清除
-            await removePersistedSession(sessionId);
-            await removePersistedSessionByAgentId(agentId);
-            // ★ 也从进程管理器清理
-            const processManager = getAgentProcessManager();
-            await processManager.removeProcess(agentId);
             console.error(`[Runtime] Failed to terminate SDK session ${sessionId}:`, errorMessage);
-            res.json({ ok: true, status: 'stopped', mode: 'sdk', warning: errorMessage });
+            res.status(500).json({ ok: false, status: 'stop_failed', mode: 'sdk', error: errorMessage });
             return;
         }
     }
@@ -568,11 +578,35 @@ terminalRouter.post('/stop', validateToken, async (req, res) => {
     }
     // 4. 终止 PTY 进程
     const agentId = session.agentId;
+    const pid = session.ptyProcess.pid;
+    let exited = false;
+    let terminated = 0;
+    let failed = 0;
     try {
         session.ptyProcess.kill();
+        exited = await waitForProcessExit(pid, 3000);
     }
-    catch {
-        // ignore stop race errors
+    catch (error) {
+        console.warn(`[Runtime] Failed to kill PTY process gracefully: sessionId=${sessionId}, pid=${pid}`, error);
+    }
+    if (!exited) {
+        const result = terminateProcessTree(pid);
+        terminated = result.terminated;
+        failed = result.failed;
+        exited = await waitForProcessExit(pid, 5000);
+    }
+    if (!exited) {
+        await sendStatus(agentId, sessionId, 'stop_failed');
+        res.status(500).json({
+            ok: false,
+            status: 'stop_failed',
+            mode: 'pty',
+            pid,
+            terminated,
+            failed,
+            error: `process ${pid} is still running after termination attempts`,
+        });
+        return;
     }
     if (session.flushTimer) {
         clearTimeout(session.flushTimer);

package/dist/routes/terminal.test.js

@@ -56,12 +56,16 @@ describe('terminal configuration', () => {
         expect(getShellConfig('linux').shell).toBe('bash');
     });
     it('builds correct terminal environment', () => {
-        const buildTerminalEnv = (agentId, baseEnv) => ({
+        const buildTerminalEnv = (agentId, bindingId, baseEnv) => ({
             ...baseEnv,
             AWS_AGENT_ID: agentId,
+            AWS_MCP_LAUNCH_BINDING_ID: bindingId,
+            AWS_MCP_CLAIM_LAUNCH_BINDING: 'true',
         });
-        const env = buildTerminalEnv('agent-123', { PATH: '/usr/bin' });
+        const env = buildTerminalEnv('agent-123', 'binding-456', { 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_CLAIM_LAUNCH_BINDING).toBe('true');
     });
 });
 describe('resolveSdkProviderId', () => {

package/dist/services/agent-process-manager.js

@@ -260,7 +260,7 @@ export class AgentProcessManager {
         log.debug(`[stopProcess] Level 1: Sending SIGTERM to pid=${pid}`);
         const sigtermResult = this.sendSigterm(pid);
         if (sigtermResult) {
-            const exited = waitForProcessExit(pid, 3000);
+            const exited = await waitForProcessExit(pid, 3000);
             if (exited) {
                 await this.registry.markTerminated(agentId);
                 log.info(`[stopProcess] Process stopped at Level 1: agentId=${agentId}, pid=${pid}`);
@@ -279,7 +279,7 @@ export class AgentProcessManager {
         log.debug(`[stopProcess] Level 2: Force killing pid=${pid}`);
         const forceKillResult = this.sendForceKill(pid);
         if (forceKillResult) {
-            const exited = waitForProcessExit(pid, 3000);
+            const exited = await waitForProcessExit(pid, 3000);
             if (exited) {
                 await this.registry.markTerminated(agentId);
                 log.info(`[stopProcess] Process stopped at Level 2: agentId=${agentId}, pid=${pid}`);
@@ -298,7 +298,7 @@ export class AgentProcessManager {
         log.debug(`[stopProcess] Level 3: Terminating process tree for pid=${pid}`);
         const treeResult = terminateProcessTree(pid);
         // Wait for process tree to terminate
-        const treeExited = waitForProcessExit(pid, 5000);
+        const treeExited = await waitForProcessExit(pid, 5000);
         if (treeExited) {
             await this.registry.markTerminated(agentId);
             log.info(`[stopProcess] Process stopped at Level 3: agentId=${agentId}, pid=${pid}, terminated=${treeResult.terminated}, failed=${treeResult.failed}`);
@@ -398,7 +398,7 @@ export class AgentProcessManager {
         // Direct process tree termination
         const result = terminateProcessTree(pid);
         // Wait briefly for termination
-        const exited = waitForProcessExit(pid, 2000);
+        const exited = await waitForProcessExit(pid, 2000);
         if (exited) {
             await this.registry.markTerminated(agentId);
             log.info(`[forceKill] Process terminated: agentId=${agentId}, pid=${pid}`);

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

@@ -13,10 +13,14 @@
 interface AutoRegisterConfig {
     /** 是否启用自动注册 */
     enabled: boolean;
+    /** 要主动注册到的调度中心地址 */
+    serverUrl?: string;
     /** 租户 ID（可选，如果提供 userKey 则可自动推导） */
     tenantId?: string;
     /** 用户 API Key（必填，用于验证身份和自动推导租户） */
     userKey: string;
+    /** 连接 Bridge 机器实例需要的密钥 */
+    connectionKey?: string;
     /** 实例名称（默认使用主机名） */
     instanceName?: string;
     /** 项目名称 */
@@ -25,13 +29,18 @@ interface AutoRegisterConfig {
     roleName?: string;
     /** 工作空间路径 */
     workspacePath?: string;
-    /** 虚拟 IP（EasyTier） */
+    /** 注册 IP（优先用于生成 runtimeBridgeBaseUrl） */
+    registerIp?: string;
+    /** 虚拟 IP（EasyTier，兼容旧配置） */
     virtualIp?: string;
+    /** 是否优先选择与 serverUrl 同局域网的本机 IP */
+    preferSameLanIp?: boolean;
     /** 注册重试次数 */
     maxRetries?: number;
     /** 注册重试间隔（毫秒） */
     retryInterval?: number;
 }
+export declare function getConfiguredConnectionKeys(): string[];
 /**
  * 加载自动注册配置
  *
@@ -40,6 +49,7 @@ interface AutoRegisterConfig {
  * 如果没有配置文件且没有环境变量，则不启用自动注册
  */
 export declare function loadConfig(): AutoRegisterConfig;
+export declare function loadConfigs(): AutoRegisterConfig[];
 /**
  * 自动注册主函数
  *
@@ -68,6 +78,7 @@ export declare function unregister(): Promise<boolean>;
 export declare function getRegistrationState(): {
     registered: boolean;
     instanceId?: string;
+    registrations: Record<string, string>;
     lastAttempt?: Date;
     error?: string;
 };

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;AA4CH;;GAEG;AACH,UAAU,kBAAkB;IAC1B,eAAe;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,oCAAoC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mCAAmC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,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,sBAAsB;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAiKD;;;;;;GAMG;AACH,wBAAgB,UAAU,IAAI,kBAAkB,CAuC/C;AAuLD;;;;;;;;;;GAUG;AACH,wBAAsB,YAAY,CAChC,YAAY,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GACzC,OAAO,CAAC,OAAO,CAAC,CAmHlB;AAED;;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,CAoED;AAED,wBAAsB,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC,CAuBnD;AAED;;GAEG;AACH,wBAAgB,oBAAoB;gBAxmBtB,OAAO;iBACN,MAAM;kBACL,IAAI;YACV,MAAM;EAumBf;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,CA0ED"}
+{"version":3,"file":"auto-register.d.ts","sourceRoot":"","sources":["../../src/services/auto-register.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AA8CH;;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;AAsQD;;;;;;GAMG;AACH,wBAAgB,UAAU,IAAI,kBAAkB,CA2C/C;AAED,wBAAgB,WAAW,IAAI,kBAAkB,EAAE,CA0ClD;AA8LD;;;;;;;;;;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,CAoED;AAED,wBAAsB,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC,CAuBnD;AAED;;GAEG;AACH,wBAAgB,oBAAoB;gBA7yBtB,OAAO;iBACN,MAAM;mBACJ,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;kBACvB,IAAI;YACV,MAAM;EA2yBf;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,CA0ED"}

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,13 +123,26 @@ 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",   // 可选，默认使用主机名
  *   "projectName": "default",     // 可选
  *   "roleName": "Bridge",          // 可选
  *   "workspacePath": "/path/to/workspace",  // 可选
- *   "virtualIp": "10.144.144.1", // 可选
+ *   "registerIp": "192.168.1.25", // 可选，优先作为注册 IP
+ *   "virtualIp": "10.144.144.1", // 可选，兼容 EasyTier 虚拟 IP
  *   "maxRetries": 5,              // 可选
  *   "retryInterval": 5000          // 可选
  * }
@@ -88,17 +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,
-            virtualIp: config.virtualIp,
-            maxRetries: config.maxRetries,
-            retryInterval: config.retryInterval,
-        };
+        return normalizeTargetConfig(config);
     }
     catch (error) {
         const err = error;
@@ -106,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 [];
+    }
+}
 /**
  * 从环境变量加载配置
  */
@@ -114,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;
     }
@@ -132,9 +232,16 @@ function loadConfigFromEnv() {
     if (process.env.AWS_WORKSPACE_PATH) {
         envConfig.workspacePath = process.env.AWS_WORKSPACE_PATH;
     }
+    if (process.env.AWS_REGISTER_IP) {
+        envConfig.registerIp = process.env.AWS_REGISTER_IP;
+    }
     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);
     }
@@ -175,17 +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 地址
  */
@@ -253,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();
@@ -272,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.virtualIp,
-        runtimeBridgeBaseUrl: `http://${config.virtualIp || localIp}:${port}`,
+        virtualIp: config.registerIp || config.virtualIp,
+        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,
@@ -342,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] 自动注册未启用");
@@ -369,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}`);
@@ -379,7 +543,8 @@ export async function autoRegister(customConfig) {
                         saveRuntimeBinding({
                             accessToken: response.runtimeAccessToken,
                             instanceId: response.instanceId,
-                            schedulerBaseUrl: response.serverUrl || schedulerBaseUrl,
+                            userId: response.userId,
+                            schedulerBaseUrl: response.serverUrl || config.serverUrl || schedulerBaseUrl,
                         });
                         logger.info("[AutoRegister] 已保存调度中心下发的 runtime access token");
                     }
@@ -421,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 或环境变量`);
@@ -441,7 +606,7 @@ export async function requestRuntimeAccessTokenRefresh() {
     const state = getRuntimeBindingPublicState();
     const localIp = getLocalIpAddress();
     const runtimeBridgePort = process.env.AWS_RUNTIME_BRIDGE_PORT || 18081;
-    const runtimeBridgeBaseUrl = `http://${config.virtualIp || localIp}:${runtimeBridgePort}`;
+    const runtimeBridgeBaseUrl = `http://${config.registerIp || config.virtualIp || localIp}:${runtimeBridgePort}`;
     try {
         const response = await axios.post(`${schedulerBaseUrl}/api/instances/runtime-tokens/refresh`, {
             tenantId: config.tenantId,
@@ -465,13 +630,12 @@ export async function requestRuntimeAccessTokenRefresh() {
         }
         const previousToken = getRuntimeAccessToken();
         const updated = previousToken !== response.data.runtimeAccessToken;
-        if (updated) {
-            saveRuntimeBinding({
-                accessToken: response.data.runtimeAccessToken,
-                instanceId: state.instanceId,
-                schedulerBaseUrl,
-            });
-        }
+        saveRuntimeBinding({
+            accessToken: response.data.runtimeAccessToken,
+            instanceId: state.instanceId,
+            userId: response.data.userId || config.userKey,
+            schedulerBaseUrl,
+        });
         return {
             success: true,
             runtimeAccessToken: response.data.runtimeAccessToken,
@@ -552,7 +716,7 @@ export async function bridgeRestartCleanup() {
     if (config.enabled) {
         const localIp = getLocalIpAddress();
         const port = process.env.AWS_RUNTIME_BRIDGE_PORT || 18081;
-        requestBody.runtimeBridgeBaseUrl = `http://${config.virtualIp || localIp}:${port}`;
+        requestBody.runtimeBridgeBaseUrl = `http://${config.registerIp || config.virtualIp || localIp}:${port}`;
     }
     if (!requestBody.instanceId && !requestBody.runtimeBridgeBaseUrl) {
         logger.info("[AutoRegister] Bridge 重启清理：没有 instanceId 或 runtimeBridgeBaseUrl，跳过清理");

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');