aws-runtime-bridge 1.6.1 → 1.6.5

package/dist/routes/instance.d.ts

@@ -47,5 +47,6 @@ export declare function buildToolStatusDetectionTargets(enabledTools: string[]):
  * 汇总卸载后仍可执行的工具，用于避免把部分卸载误报为成功。
  */
 export declare function buildUninstallFailureMessage(requestedTools: string[], toolStatus: Record<string, ToolInstallStatus>): string;
+export declare function summarizeToolStatus(toolStatus: Record<string, ToolInstallStatus>): Record<string, Pick<ToolInstallStatus, "installed" | "version" | "executable" | "error">>;
 export {};
 //# sourceMappingURL=instance.d.ts.map

package/dist/routes/instance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../../src/routes/instance.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAYrD,wBAAgB,qBAAqB,CACnC,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,GAC/D,IAAI,CAEN;AAED,eAAO,MAAM,cAAc,4CAAW,CAAC;AAyBvC,wBAAgB,4BAA4B,CAAC,gBAAgB,EAAE,MAAM,GAAG;IACtE,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE;QACJ,EAAE,EAAE,OAAO,CAAC;QACZ,aAAa,CAAC,EAAE,SAAS,CAAC;QAC1B,oBAAoB,EAAE,OAAO,CAAC;QAC9B,qBAAqB,EAAE,OAAO,CAAC;QAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CAqCA;AAED,MAAM,WAAW,4BAA4B;IAC3C,EAAE,EAAE,KAAK,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,gBAAgB,CAAC;IAC/B,aAAa,EAAE,SAAS,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,iCAAiC;IACzC,EAAE,EAAE,KAAK,CAAC;IACV,KAAK,EAAE,8BAA8B,CAAC;IACtC,YAAY,EAAE,gBAAgB,CAAC;IAC/B,aAAa,EAAE,SAAS,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;GAGG;AACH,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,KAAK,EACZ,0BAA0B,EAAE,MAAM,GACjC,4BAA4B,CAiB9B;AAED;;;GAGG;AACH,wBAAgB,sCAAsC,CACpD,UAAU,EAAE,MAAM,EAAE,GACnB,iCAAiC,CAUnC;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAQhF;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,cAAc,EAAE,MAAM,EAAE,EACxB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAC5C,MAAM,CAaR"}
+{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../../src/routes/instance.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAYrD,wBAAgB,qBAAqB,CACnC,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,GAC/D,IAAI,CAEN;AAED,eAAO,MAAM,cAAc,4CAAW,CAAC;AAyBvC,wBAAgB,4BAA4B,CAAC,gBAAgB,EAAE,MAAM,GAAG;IACtE,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE;QACJ,EAAE,EAAE,OAAO,CAAC;QACZ,aAAa,CAAC,EAAE,SAAS,CAAC;QAC1B,oBAAoB,EAAE,OAAO,CAAC;QAC9B,qBAAqB,EAAE,OAAO,CAAC;QAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CAqCA;AAED,MAAM,WAAW,4BAA4B;IAC3C,EAAE,EAAE,KAAK,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,gBAAgB,CAAC;IAC/B,aAAa,EAAE,SAAS,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,iCAAiC;IACzC,EAAE,EAAE,KAAK,CAAC;IACV,KAAK,EAAE,8BAA8B,CAAC;IACtC,YAAY,EAAE,gBAAgB,CAAC;IAC/B,aAAa,EAAE,SAAS,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;GAGG;AACH,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,KAAK,EACZ,0BAA0B,EAAE,MAAM,GACjC,4BAA4B,CAiB9B;AAED;;;GAGG;AACH,wBAAgB,sCAAsC,CACpD,UAAU,EAAE,MAAM,EAAE,GACnB,iCAAiC,CAUnC;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAQhF;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,cAAc,EAAE,MAAM,EAAE,EACxB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAC5C,MAAM,CAaR;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAC5C,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,WAAW,GAAG,SAAS,GAAG,YAAY,GAAG,OAAO,CAAC,CAAC,CAY3F"}

package/dist/routes/instance.js

@@ -132,6 +132,17 @@ export function buildUninstallFailureMessage(requestedTools, toolStatus) {
     })
         .join("; ");
 }
+export function summarizeToolStatus(toolStatus) {
+    return Object.fromEntries(Object.entries(toolStatus || {}).map(([tool, status]) => [
+        tool,
+        {
+            installed: Boolean(status?.installed),
+            version: status?.version || null,
+            executable: status?.executable || null,
+            error: status?.error || null,
+        },
+    ]));
+}
 instanceRouter.get("/healthz", (_req, res) => {
     res.json({
         ok: true,
@@ -180,6 +191,13 @@ instanceRouter.post("/init-instance", validateToken, async (req, res) => {
         return;
     }
     try {
+        log.info("[init-instance] Request received", {
+            agentId: String(agentId),
+            workspacePath: String(workspacePath),
+            skillEnabled,
+            mcpEnabled,
+            ccSwitchEnabledTools,
+        });
         const result = await initInstance(agentId, workspacePath, {
             skillEnabled,
             mcpEnabled,
@@ -188,10 +206,22 @@ instanceRouter.post("/init-instance", validateToken, async (req, res) => {
             skillPackages,
             mcpServers,
         });
+        log.info("[init-instance] Initialization completed", {
+            agentId: String(agentId),
+            ok: result.ok,
+            logCount: result.logs?.length || 0,
+            enabledTools: result.enabledTools,
+        });
         res.json(result);
     }
     catch (error) {
         const err = error;
+        log.error("[init-instance] Initialization failed", {
+            agentId: String(agentId),
+            workspacePath: String(workspacePath),
+            error: err?.message || String(error),
+            stack: err?.stack || null,
+        });
         res.status(400).json({
             error: err?.message || "initialize instance failed",
         });
@@ -204,11 +234,23 @@ instanceRouter.post("/cc-switch/state", validateToken, async (req, res) => {
         return;
     }
     try {
+        log.info("[cc-switch/state] Request received", { agentId: String(agentId) });
         const sdk = await loadCcSwitchSdk(agentId);
         const imported = await discoverCcSwitchConfiguredItems(sdk);
         const synced = await syncLegacyStateFromSdk(agentId, sdk);
         const state = synced.state;
-        const toolStatus = await detectToolStatuses(buildToolStatusDetectionTargets(state.enabledTools || []));
+        const detectionTargets = buildToolStatusDetectionTargets(state.enabledTools || []);
+        log.info("[cc-switch/state] Detecting SDK statuses", {
+            agentId: String(agentId),
+            detectionTargets,
+        });
+        const toolStatus = await detectToolStatuses(detectionTargets);
+        log.info("[cc-switch/state] SDK status detection completed", {
+            agentId: String(agentId),
+            toolStatus: summarizeToolStatus(toolStatus),
+            importedMcpCount: imported.mcpServers,
+            importedSkillCount: imported.skills,
+        });
         res.json({
             ok: true,
             agentId: String(agentId),
@@ -221,6 +263,11 @@ instanceRouter.post("/cc-switch/state", validateToken, async (req, res) => {
     }
     catch (error) {
         const err = error;
+        log.error("[cc-switch/state] Failed to load state", {
+            agentId: String(agentId),
+            error: err?.message || String(error),
+            stack: err?.stack || null,
+        });
         res.status(400).json({ error: err?.message || "load state failed" });
     }
 });
@@ -237,9 +284,23 @@ instanceRouter.post("/cc-switch/install-tools", validateToken, async (req, res)
             .toLowerCase())
             .filter(Boolean)
         : [];
+    log.info("[cc-switch/install-tools] Request received", {
+        agentId: String(agentId),
+        requestedTools,
+    });
     const supportedInstallableTools = new Set(SUPPORTED_INSTALLABLE_TOOLS);
     const installableTools = requestedTools.filter((tool) => supportedInstallableTools.has(tool));
+    log.info("[cc-switch/install-tools] Request normalized", {
+        agentId: String(agentId),
+        requestedTools,
+        installableTools,
+        supportedInstallableTools: SUPPORTED_INSTALLABLE_TOOLS,
+    });
     if (installableTools.length === 0) {
+        log.warn("[cc-switch/install-tools] No supported installable tools requested", {
+            agentId: String(agentId),
+            requestedTools,
+        });
         res
             .status(400)
             .json({
@@ -250,8 +311,22 @@ instanceRouter.post("/cc-switch/install-tools", validateToken, async (req, res)
     try {
         const state = await loadInstanceState(agentId);
         const enabledTools = Array.from(new Set([...(state.enabledTools || []), ...installableTools]));
+        log.info("[cc-switch/install-tools] Starting installer", {
+            agentId: String(agentId),
+            installableTools,
+            previousEnabledTools: state.enabledTools || [],
+            nextEnabledTools: enabledTools,
+        });
         const toolStatus = await ensureToolsInstalled(installableTools);
+        log.info("[cc-switch/install-tools] Installer completed", {
+            agentId: String(agentId),
+            toolStatus: summarizeToolStatus(toolStatus),
+        });
         const refreshedToolStatus = await detectToolStatuses(enabledTools);
+        log.info("[cc-switch/install-tools] Refreshed enabled SDK statuses", {
+            agentId: String(agentId),
+            refreshedToolStatus: summarizeToolStatus(refreshedToolStatus),
+        });
         const nextToolStatus = {
             ...refreshedToolStatus,
             ...toolStatus,
@@ -261,6 +336,20 @@ instanceRouter.post("/cc-switch/install-tools", validateToken, async (req, res)
             enabledTools,
             toolStatus: nextToolStatus,
         });
+        const failedTools = Object.entries(nextToolStatus)
+            .filter(([, status]) => !status.installed)
+            .map(([tool, status]) => ({ tool, error: status.error || null }));
+        if (failedTools.length > 0) {
+            log.warn("[cc-switch/install-tools] Some SDKs remain unavailable", {
+                agentId: String(agentId),
+                failedTools,
+            });
+        }
+        log.info("[cc-switch/install-tools] State saved", {
+            agentId: String(agentId),
+            enabledTools: savedState.enabledTools,
+            toolStatus: summarizeToolStatus(nextToolStatus),
+        });
         res.json({
             ok: true,
             agentId: String(agentId),
@@ -270,6 +359,13 @@ instanceRouter.post("/cc-switch/install-tools", validateToken, async (req, res)
     }
     catch (error) {
         const err = error;
+        log.error("[cc-switch/install-tools] Install route failed", {
+            agentId: String(agentId),
+            requestedTools,
+            installableTools,
+            error: err?.message || String(error),
+            stack: err?.stack || null,
+        });
         res.status(400).json({ error: err?.message || "install tools failed" });
     }
 });

package/dist/routes/instance.test.js

@@ -104,6 +104,40 @@ describe('instance route validation', () => {
             },
         })).toContain('opencode: uninstall completed but command is still available');
     });
+    it('summarizes tool status for route diagnostics', async () => {
+        const { summarizeToolStatus } = await import('./instance.js');
+        expect(summarizeToolStatus({
+            opencode: {
+                tool: 'opencode',
+                installed: false,
+                executable: null,
+                version: null,
+                installing: false,
+                error: 'SDK package @opencode-ai/sdk is not installed in aws-runtime-bridge',
+            },
+            claude: {
+                tool: 'claude',
+                installed: true,
+                executable: '@anthropic-ai/claude-agent-sdk',
+                version: '0.2.87',
+                installing: false,
+                error: null,
+            },
+        })).toEqual({
+            opencode: {
+                installed: false,
+                executable: null,
+                version: null,
+                error: 'SDK package @opencode-ai/sdk is not installed in aws-runtime-bridge',
+            },
+            claude: {
+                installed: true,
+                executable: '@anthropic-ai/claude-agent-sdk',
+                version: '0.2.87',
+                error: null,
+            },
+        });
+    });
     it('does not report uninstall failure when requested tools are no longer installed', async () => {
         const { buildUninstallFailureMessage } = await import('./instance.js');
         expect(buildUninstallFailureMessage(['claude'], {

package/dist/routes/pty.d.ts

@@ -1,3 +1,4 @@
+import fs from "node:fs";
 import type { IncomingMessage } from "node:http";
 import type { Socket } from "node:net";
 import type { Router } from "express";
@@ -38,7 +39,7 @@ export declare function resolvePtyIdleTtlMs(env?: NodeJS.ProcessEnv): number;
  * 选择默认 shell。
  * 主流程：Windows 优先 pwsh/powershell/cmd；Unix 优先 SHELL/bash/sh，返回可执行文件名与参数。
  */
-export declare function resolveDefaultShell(platform?: NodeJS.Platform, env?: NodeJS.ProcessEnv): {
+export declare function resolveDefaultShell(platform?: NodeJS.Platform, env?: NodeJS.ProcessEnv, existsSync?: (path: fs.PathLike) => boolean): {
     shell: string;
     args: string[];
 };

package/dist/routes/pty.d.ts.map

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

package/dist/routes/pty.js

@@ -1,11 +1,11 @@
-import fs from "node:fs";
 import crypto from "node:crypto";
+import fs from "node:fs";
 import path from "node:path";
 import { Router as createRouter } from "express";
 import * as pty from "node-pty";
 import { v4 as uuidv4 } from "uuid";
 import WebSocket, { WebSocketServer } from "ws";
-import { validateToken, isRuntimeTokenValid } from "../middleware/auth.js";
+import { isRuntimeTokenValid, validateToken } from "../middleware/auth.js";
 import { createLogger } from "../utils/logger.js";
 const log = createLogger("pty");
 const DEFAULT_COLS = 80;
@@ -15,6 +15,15 @@ const DEFAULT_IDLE_TTL_MS = 30 * 60 * 1000;
 const DEFAULT_EXITED_TTL_MS = 5 * 60 * 1000;
 const DEFAULT_CONNECT_TOKEN_TTL_MS = 60 * 1000;
 const DEFAULT_MAX_PTY_SESSIONS = 8;
+const NON_INTERACTIVE_UNIX_SHELLS = new Set([
+    "false",
+    "halt",
+    "nologin",
+    "reboot",
+    "shutdown",
+    "sync",
+    "true",
+]);
 export const ptySessions = new Map();
 const ptyConnectTokens = new Map();
 /**
@@ -36,13 +45,29 @@ export function resolvePtyIdleTtlMs(env = process.env) {
  * 选择默认 shell。
  * 主流程：Windows 优先 pwsh/powershell/cmd；Unix 优先 SHELL/bash/sh，返回可执行文件名与参数。
  */
-export function resolveDefaultShell(platform = process.platform, env = process.env) {
+export function resolveDefaultShell(platform = process.platform, env = process.env, existsSync = fs.existsSync) {
     if (platform === "win32") {
         const comSpec = String(env.ComSpec || env.COMSPEC || "").trim();
         return { shell: comSpec || "powershell.exe", args: [] };
     }
     const configuredShell = String(env.SHELL || "").trim();
-    return { shell: configuredShell || "/bin/bash", args: [] };
+    const shell = [configuredShell, "/bin/bash", "/bin/sh"].find((candidate) => isUsableUnixShellCandidate(candidate, existsSync));
+    return { shell: shell || "/bin/sh", args: [] };
+}
+/**
+ * 判断 Unix shell 候选是否适合交互式 PTY。
+ * 具体逻辑：跳过 nologin/false 等会立即退出的系统 shell；绝对路径还必须真实存在。
+ */
+function isUsableUnixShellCandidate(candidate, existsSync) {
+    const shell = candidate.trim();
+    if (!shell) {
+        return false;
+    }
+    const basename = path.basename(shell).toLowerCase();
+    if (NON_INTERACTIVE_UNIX_SHELLS.has(basename)) {
+        return false;
+    }
+    return !path.isAbsolute(shell) || existsSync(shell);
 }
 /**
  * 校验并解析 shell 选择。

package/dist/routes/pty.test.js

@@ -20,6 +20,15 @@ afterEach(async () => {
     ptyKill.mockClear();
 });
 describe('ordinary PTY persistence policy', () => {
+    it('falls back from non-interactive Linux login shells', async () => {
+        const { resolveDefaultShell } = await import('./pty.js');
+        expect(resolveDefaultShell('linux', { SHELL: '/usr/sbin/nologin' }, (candidate) => candidate === '/bin/bash')).toEqual({ shell: '/bin/bash', args: [] });
+        expect(resolveDefaultShell('linux', { SHELL: '/bin/false' }, (candidate) => candidate === '/bin/sh')).toEqual({ shell: '/bin/sh', args: [] });
+    });
+    it('falls back when Linux SHELL points to a missing absolute path', async () => {
+        const { resolveDefaultShell } = await import('./pty.js');
+        expect(resolveDefaultShell('linux', { SHELL: '/missing/shell' }, (candidate) => candidate === '/bin/bash')).toEqual({ shell: '/bin/bash', args: [] });
+    });
     it('keeps persistent dashboard PTY sessions alive across browser disconnects', () => {
         const source = readFileSync(resolve(currentDir, './pty.ts'), 'utf-8');
         expect(source).toContain('persistent: boolean');

package/dist/services/tool-installer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-installer.d.ts","sourceRoot":"","sources":["../../src/services/tool-installer.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AA8GrD,eAAO,MAAM,2BAA2B,mBAEvC,CAAC;AAEF,eAAO,MAAM,6BAA6B,mBAIzC,CAAC;AAEF;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAK/D;AAoDD,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAM5D;AAqJD;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,iBAAiB,CAAC,CAyB5B;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAkB5C;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CA+C5C;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAiD5C"}
+{"version":3,"file":"tool-installer.d.ts","sourceRoot":"","sources":["../../src/services/tool-installer.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAiHrD,eAAO,MAAM,2BAA2B,mBAEvC,CAAC;AAEF,eAAO,MAAM,6BAA6B,mBAIzC,CAAC;AAEF;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAK/D;AAoDD,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAM5D;AAkOD;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,iBAAiB,CAAC,CAsC5B;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAkB5C;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAqF5C;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAiD5C"}

package/dist/services/tool-installer.js

@@ -1,78 +1,71 @@
 import { execFile } from "node:child_process";
-import { access } from "node:fs/promises";
+import { access, readFile } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
+import { fileURLToPath } from "node:url";
 import { promisify } from "node:util";
+import { createLogger } from "../utils/logger.js";
 const execFileAsync = promisify(execFile);
+const log = createLogger("tool-installer");
+const bridgePackageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..", "..");
 const isWindows = process.platform === "win32";
+function quoteCommandArg(value) {
+    if (isWindows) {
+        return `"${value.replaceAll('"', '\\"')}"`;
+    }
+    return `'${value.replaceAll("'", "'\\''")}'`;
+}
+function npmInstallIntoBridgeCommand(packages) {
+    return `npm install --prefix ${quoteCommandArg(bridgePackageRoot)} ${packages.join(" ")}`;
+}
+function npmUninstallFromBridgeCommand(packages) {
+    return `npm uninstall --prefix ${quoteCommandArg(bridgePackageRoot)} ${packages.join(" ")}`;
+}
 const TOOL_DEFINITIONS = {
     claude: {
         key: "claude",
-        packageName: "@anthropic-ai/claude-code",
-        aliases: isWindows ? ["claude.cmd", "claude.exe", "claude"] : ["claude"],
-        versionArgs: ["--version"],
-        installCommands: isWindows
-            ? ["npm install -g @anthropic-ai/claude-code@latest"]
-            : [
-                "curl -fsSL https://claude.ai/install.sh | bash",
-                "npm install -g @anthropic-ai/claude-code@latest",
-            ],
-        uninstallCommands: isWindows
-            ? [
-                "npm uninstall -g @anthropic-ai/claude-code",
-                "volta uninstall @anthropic-ai/claude-code",
-            ]
-            : [
-                "npm uninstall -g @anthropic-ai/claude-code",
-                "volta uninstall @anthropic-ai/claude-code",
-                "rm -f ~/.local/bin/claude",
-            ],
+        packageName: "@anthropic-ai/claude-agent-sdk",
+        sdkPackageName: "@anthropic-ai/claude-agent-sdk",
+        aliases: [],
+        versionArgs: [],
+        installCommands: [
+            npmInstallIntoBridgeCommand(["@anthropic-ai/claude-agent-sdk@latest"]),
+        ],
+        uninstallCommands: [
+            npmUninstallFromBridgeCommand(["@anthropic-ai/claude-agent-sdk"]),
+        ],
     },
     claudecode: {
         key: "claudecode",
-        packageName: "@anthropic-ai/claude-code",
-        aliases: isWindows ? ["claude.cmd", "claude.exe", "claude"] : ["claude"],
-        versionArgs: ["--version"],
-        installCommands: isWindows
-            ? ["npm install -g @anthropic-ai/claude-code@latest"]
-            : [
-                "curl -fsSL https://claude.ai/install.sh | bash",
-                "npm install -g @anthropic-ai/claude-code@latest",
-            ],
-        uninstallCommands: isWindows
-            ? [
-                "npm uninstall -g @anthropic-ai/claude-code",
-                "volta uninstall @anthropic-ai/claude-code",
-            ]
-            : [
-                "npm uninstall -g @anthropic-ai/claude-code",
-                "volta uninstall @anthropic-ai/claude-code",
-                "rm -f ~/.local/bin/claude",
-            ],
+        packageName: "@anthropic-ai/claude-agent-sdk",
+        sdkPackageName: "@anthropic-ai/claude-agent-sdk",
+        aliases: [],
+        versionArgs: [],
+        installCommands: [
+            npmInstallIntoBridgeCommand(["@anthropic-ai/claude-agent-sdk@latest"]),
+        ],
+        uninstallCommands: [
+            npmUninstallFromBridgeCommand(["@anthropic-ai/claude-agent-sdk"]),
+        ],
     },
     opencode: {
         key: "opencode",
-        packageName: "opencode-ai",
+        packageName: "@opencode-ai/sdk",
+        sdkPackageName: "@opencode-ai/sdk",
         aliases: isWindows
             ? ["opencode.cmd", "opencode.exe", "opencode"]
             : ["opencode"],
         versionArgs: ["--version"],
-        installCommands: isWindows
-            ? ["npm install -g opencode-ai@latest"]
-            : [
-                "curl -fsSL https://opencode.ai/install | bash",
-                "npm install -g opencode-ai@latest",
-            ],
+        installCommands: [
+            npmInstallIntoBridgeCommand(["@opencode-ai/sdk@latest", "opencode-ai@latest"]),
+        ],
         uninstallCommands: isWindows
             ? [
-                "opencode uninstall --force",
-                "npm uninstall -g opencode-ai",
-                "volta uninstall opencode-ai",
+                npmUninstallFromBridgeCommand(["@opencode-ai/sdk", "opencode-ai"]),
             ]
             : [
+                npmUninstallFromBridgeCommand(["@opencode-ai/sdk", "opencode-ai"]),
                 "opencode uninstall --force",
-                "npm uninstall -g opencode-ai",
-                "volta uninstall opencode-ai",
                 "rm -f ~/.opencode/bin/opencode",
             ],
         extraSearchPaths: () => {
@@ -88,14 +81,12 @@ const TOOL_DEFINITIONS = {
     },
     codex: {
         key: "codex",
-        packageName: "@openai/codex",
-        aliases: isWindows ? ["codex.cmd", "codex.exe", "codex"] : ["codex"],
-        versionArgs: ["--version"],
-        installCommands: ["npm install -g @openai/codex@latest"],
-        uninstallCommands: [
-            "npm uninstall -g @openai/codex",
-            "volta uninstall @openai/codex",
-        ],
+        packageName: "@openai/codex-sdk",
+        sdkPackageName: "@openai/codex-sdk",
+        aliases: [],
+        versionArgs: [],
+        installCommands: [npmInstallIntoBridgeCommand(["@openai/codex-sdk@latest"])],
+        uninstallCommands: [npmUninstallFromBridgeCommand(["@openai/codex-sdk"])],
     },
 };
 export const SUPPORTED_INSTALLABLE_TOOLS = Object.freeze(Object.keys(TOOL_DEFINITIONS));
@@ -271,14 +262,74 @@ async function resolveExecutableCandidate(definition) {
     }
     return { executable: null, version: null, error: "command not installed" };
 }
+async function readPackageVersion(packageJsonPath) {
+    try {
+        const rawPackageJson = await readFile(packageJsonPath, "utf8");
+        const parsedPackageJson = JSON.parse(rawPackageJson);
+        return typeof parsedPackageJson.version === "string"
+            ? parsedPackageJson.version
+            : null;
+    }
+    catch {
+        return null;
+    }
+}
+async function readInstalledPackageVersion(packageName) {
+    const packageJsonPath = path.join(bridgePackageRoot, "node_modules", ...packageName.split("/"), "package.json");
+    return readPackageVersion(packageJsonPath);
+}
+/**
+ * 检测 SDK provider 包是否能被当前 bridge 进程解析。
+ * 主流程：使用与运行时代码相同的模块解析上下文，避免把全局 CLI 安装误报为 SDK 可用。
+ */
+async function resolveSdkPackageCandidate(definition) {
+    const sdkPackageName = definition.sdkPackageName;
+    if (!sdkPackageName) {
+        return resolveExecutableCandidate(definition);
+    }
+    try {
+        await import(sdkPackageName);
+        return {
+            executable: sdkPackageName,
+            version: await readInstalledPackageVersion(sdkPackageName),
+            error: null,
+        };
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error || "");
+        return {
+            executable: null,
+            version: null,
+            error: message.includes(sdkPackageName)
+                ? `SDK package ${sdkPackageName} is not installed in aws-runtime-bridge`
+                : message || `SDK package ${sdkPackageName} is not installed in aws-runtime-bridge`,
+        };
+    }
+}
+function describeCommandFailure(error) {
+    if (!error || typeof error !== "object") {
+        return { message: String(error || "command failed") };
+    }
+    const failure = error;
+    return {
+        message: typeof failure.message === "string" ? failure.message : String(error),
+        code: failure.code ?? null,
+        signal: failure.signal ?? null,
+        stdout: typeof failure.stdout === "string" ? failure.stdout : "",
+        stderr: typeof failure.stderr === "string" ? failure.stderr : "",
+    };
+}
 async function runToolCommand(command) {
     if (isWindows) {
-        await execFileAsync("cmd.exe", ["/d", "/s", "/c", command], {
+        const result = await execFileAsync("cmd.exe", ["/d", "/s", "/c", command], {
             timeout: 10 * 60 * 1000,
         });
-        return;
+        return { stdout: result.stdout || "", stderr: result.stderr || "" };
     }
-    await execFileAsync("/bin/sh", ["-lc", command], { timeout: 10 * 60 * 1000 });
+    const result = await execFileAsync("/bin/sh", ["-lc", command], {
+        timeout: 10 * 60 * 1000,
+    });
+    return { stdout: result.stdout || "", stderr: result.stderr || "" };
 }
 /**
  * 检查单个工具的 CLI 可执行状态，供实例状态展示与初始化前判断使用。
@@ -289,6 +340,7 @@ export async function detectToolInstallStatus(tool) {
         .toLowerCase();
     const definition = TOOL_DEFINITIONS[normalizedTool];
     if (!definition) {
+        log.warn("Unsupported tool status requested", { tool: normalizedTool });
         return {
             tool: normalizedTool,
             installed: false,
@@ -298,6 +350,17 @@ export async function detectToolInstallStatus(tool) {
             error: "unsupported tool",
         };
     }
+    const sdkResult = await resolveSdkPackageCandidate(definition);
+    if (definition.sdkPackageName) {
+        return {
+            tool: normalizedTool,
+            installed: Boolean(sdkResult.executable),
+            executable: sdkResult.executable,
+            version: sdkResult.version,
+            installing: false,
+            error: sdkResult.error,
+        };
+    }
     const result = await resolveExecutableCandidate(definition);
     return {
         tool: normalizedTool,
@@ -326,25 +389,51 @@ export async function detectToolStatuses(tools) {
  * 根据勾选工具自动安装缺失 CLI，安装后重新检测状态并返回。
  */
 export async function ensureToolsInstalled(tools) {
+    log.info("Install request received", {
+        requestedTools: tools,
+        bridgePackageRoot,
+        platform: process.platform,
+        node: process.version,
+    });
     const initialStatuses = await detectToolStatuses(tools);
+    log.info("Initial install status detected", { statuses: initialStatuses });
     const nextStatuses = {
         ...initialStatuses,
     };
     for (const tool of Object.keys(initialStatuses)) {
         const current = initialStatuses[tool];
         if (current.installed) {
+            log.info("Skipping install because tool SDK is already available", {
+                tool,
+                version: current.version,
+                executable: current.executable,
+            });
             continue;
         }
         const definition = TOOL_DEFINITIONS[tool];
         if (!definition) {
+            log.warn("Skipping install because tool is unsupported", { tool, current });
             continue;
         }
         let lastError = current.error;
         for (const command of definition.installCommands) {
             try {
-                await runToolCommand(command);
+                log.info("Running install command", {
+                    tool,
+                    command,
+                    sdkPackageName: definition.sdkPackageName || null,
+                    packageName: definition.packageName,
+                });
+                const commandResult = await runToolCommand(command);
+                log.info("Install command completed", {
+                    tool,
+                    command,
+                    stdout: commandResult.stdout,
+                    stderr: commandResult.stderr,
+                });
                 const detected = await detectToolInstallStatus(tool);
                 nextStatuses[tool] = detected;
+                log.info("Post-install status detected", { tool, status: detected });
                 if (detected.installed) {
                     lastError = null;
                     break;
@@ -352,6 +441,11 @@ export async function ensureToolsInstalled(tools) {
                 lastError = detected.error;
             }
             catch (error) {
+                log.error("Install command failed", {
+                    tool,
+                    command,
+                    failure: describeCommandFailure(error),
+                });
                 lastError =
                     error instanceof Error
                         ? error.message
@@ -366,8 +460,14 @@ export async function ensureToolsInstalled(tools) {
                 installing: false,
                 error: lastError || "install failed",
             };
+            log.warn("Tool SDK remains unavailable after install attempts", {
+                tool,
+                status: nextStatuses[tool],
+                attemptedCommands: definition.installCommands,
+            });
         }
     }
+    log.info("Install request completed", { statuses: nextStatuses });
     return nextStatuses;
 }
 /**

package/dist/services/tool-installer.test.js

@@ -76,30 +76,44 @@ describe('tool installer service', () => {
         expect(typeof status.installed).toBe('boolean');
         expect(status.error).not.toBe('unsupported tool');
     });
+    it('detects OpenCode by SDK package instead of CLI availability', async () => {
+        const status = await detectToolInstallStatus('opencode');
+        expect(status.tool).toBe('opencode');
+        expect(status.executable === null || status.executable === '@opencode-ai/sdk').toBe(true);
+        if (!status.installed) {
+            expect(status.error).toContain('@opencode-ai/sdk');
+        }
+    });
+    it('detects Codex by SDK package instead of CLI availability', async () => {
+        const status = await detectToolInstallStatus('codex');
+        expect(status.tool).toBe('codex');
+        expect(status.executable === null || status.executable === '@openai/codex-sdk').toBe(true);
+        if (!status.installed) {
+            expect(status.error).toContain('@openai/codex-sdk');
+        }
+    });
     it('supports all panel tools as uninstallable tools', () => {
         expect(SUPPORTED_UNINSTALLABLE_TOOLS).toEqual(expect.arrayContaining(['claude', 'opencode', 'codex']));
     });
     it('covers npm and native installer uninstall paths for OpenCode', () => {
         const commands = getToolUninstallCommands('opencode');
-        expect(commands).toContain('npm uninstall -g opencode-ai');
-        expect(commands).toContain('volta uninstall opencode-ai');
+        expect(commands.some(command => command.includes('npm uninstall --prefix'))).toBe(true);
+        expect(commands.some(command => command.includes('@opencode-ai/sdk'))).toBe(true);
+        expect(commands.some(command => command.includes('opencode-ai'))).toBe(true);
         if (process.platform !== 'win32') {
             expect(commands).toContain('opencode uninstall --force');
             expect(commands).toContain('rm -f ~/.opencode/bin/opencode');
         }
     });
-    it('covers npm and native installer uninstall paths for Claude Code on Unix', () => {
+    it('covers bridge-local SDK uninstall path for Claude Code', () => {
         const commands = getToolUninstallCommands('claude');
-        expect(commands).toContain('npm uninstall -g @anthropic-ai/claude-code');
-        expect(commands).toContain('volta uninstall @anthropic-ai/claude-code');
-        if (process.platform !== 'win32') {
-            expect(commands).toContain('rm -f ~/.local/bin/claude');
-        }
+        expect(commands.some(command => command.includes('npm uninstall --prefix'))).toBe(true);
+        expect(commands.some(command => command.includes('@anthropic-ai/claude-agent-sdk'))).toBe(true);
     });
-    it('covers Volta package uninstall for Codex', () => {
+    it('covers bridge-local SDK uninstall path for Codex', () => {
         const commands = getToolUninstallCommands('codex');
-        expect(commands).toContain('npm uninstall -g @openai/codex');
-        expect(commands).toContain('volta uninstall @openai/codex');
+        expect(commands.some(command => command.includes('npm uninstall --prefix'))).toBe(true);
+        expect(commands.some(command => command.includes('@openai/codex-sdk'))).toBe(true);
     });
     it('recognizes Volta shim paths for package-manager-aware detection', () => {
         expect(isVoltaShimPath('C:\\Users\\tester\\AppData\\Local\\Volta\\bin\\codex.cmd')).toBe(true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-runtime-bridge",
-  "version": "1.6.1",
+  "version": "1.6.5",
   "description": "AgentsWorkStudio runtime bridge service for machine-level agent runtime integration",
   "type": "module",
   "main": "dist/index.js",