aws-runtime-bridge 1.6.5 → 1.6.8

package/dist/adapter/OpencodeSdkAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OpencodeSdkAdapter.d.ts","sourceRoot":"","sources":["../../src/adapter/OpencodeSdkAdapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAc3C,OAAO,KAAK,EACV,oBAAoB,EAEpB,mBAAmB,EACnB,mBAAmB,EAEnB,aAAa,EACd,MAAM,YAAY,CAAC;AA4GpB,qBAAa,kBAAmB,SAAQ,YAAa,YAAW,mBAAmB;IACjF,QAAQ,CAAC,UAAU,cAAc;IACjC,QAAQ,CAAC,WAAW,cAAc;IAElC,OAAO,CAAC,QAAQ,CAA2C;IAC3D,OAAO,CAAC,SAAS,CAAC,CAAoB;IAEhC,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IA+I5E,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwC9D,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBnE,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7F,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAUnG,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAclD,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BxD,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,mBAAmB,EAAE;IAIzD,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAItC,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI3D,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAI9D,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAOpD,OAAO,IAAI,IAAI;IAaf;;;OAGG;YACW,OAAO;YA6BP,aAAa;IAmB3B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAO3B;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAahC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,YAAY;YAYN,UAAU;IAuBxB,OAAO,CAAC,mBAAmB;IA6H3B,OAAO,CAAC,gBAAgB;IA6GxB,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,2BAA2B;CAOpC"}
+{"version":3,"file":"OpencodeSdkAdapter.d.ts","sourceRoot":"","sources":["../../src/adapter/OpencodeSdkAdapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAgB3C,OAAO,KAAK,EAEV,oBAAoB,EACpB,mBAAmB,EACnB,mBAAmB,EAEnB,aAAa,EACd,MAAM,YAAY,CAAC;AA2GpB,qBAAa,kBAAmB,SAAQ,YAAa,YAAW,mBAAmB;IACjF,QAAQ,CAAC,UAAU,cAAc;IACjC,QAAQ,CAAC,WAAW,cAAc;IAElC,OAAO,CAAC,QAAQ,CAA2C;IAC3D,OAAO,CAAC,SAAS,CAAC,CAAoB;IAEhC,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IA+I5E,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwC9D,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBnE,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7F,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAUnG,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAclD,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BxD,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,mBAAmB,EAAE;IAIzD,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAItC,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI3D,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAI9D,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAOpD,OAAO,IAAI,IAAI;IAaf;;;OAGG;YACW,OAAO;YA2BP,aAAa;IAmB3B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAO3B;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAahC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,YAAY;YAYN,UAAU;IAuBxB,OAAO,CAAC,mBAAmB;IA6H3B,OAAO,CAAC,gBAAgB;IA6GxB,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,2BAA2B;CAOpC"}

package/dist/adapter/OpencodeSdkAdapter.js

@@ -17,6 +17,7 @@ import * as net from 'node:net';
 import * as os from 'node:os';
 import * as path from 'node:path';
 import { v4 as uuidv4 } from 'uuid';
+import { BRIDGE_PACKAGE_ROOT, importBridgeSdkPackage } from '../utils/sdk-package-loader.js';
 import { getToolActionInfo } from './types.js';
 // ============ 可执行文件查找 ============
 /**
@@ -359,7 +360,7 @@ export class OpencodeSdkAdapter extends EventEmitter {
     async loadSdk() {
         if (!this.sdkModule) {
             try {
-                this.sdkModule = await import('@opencode-ai/sdk');
+                this.sdkModule = await importBridgeSdkPackage('@opencode-ai/sdk');
             }
             catch (error) {
                 if (isMissingPackageError(error, '@opencode-ai/sdk')) {
@@ -367,13 +368,11 @@ export class OpencodeSdkAdapter extends EventEmitter {
                         'OpenCode SDK provider is not installed.',
                         '',
                         'aws-runtime-bridge keeps Codex/OpenCode provider SDKs optional to reduce default install size.',
-                        'To use SDK mode with command "opencode", install:',
+                        'To use SDK mode with command "opencode", install the SDK into the aws-runtime-bridge package root:',
                         '',
-                        '  npm install -g @opencode-ai/sdk',
+                        `  npm install --prefix "${BRIDGE_PACKAGE_ROOT}" @opencode-ai/sdk@latest opencode-ai@latest`,
                         '',
-                        'If aws-runtime-bridge is installed locally, install the SDK in the same project:',
-                        '',
-                        '  npm install @opencode-ai/sdk',
+                        'If aws-runtime-bridge is installed locally, run the same command with that local package path.',
                         '',
                         `Original error: ${error instanceof Error ? error.message : String(error)}`,
                     ].join('\n'));

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

@@ -1,10 +1,28 @@
 import type { ToolInstallStatus } from "../types.js";
+type ToolCommand = {
+    kind: "execFile";
+    command: string;
+    args: string[];
+    display: string;
+} | {
+    kind: "shell";
+    display: string;
+};
 export declare const SUPPORTED_INSTALLABLE_TOOLS: readonly string[];
 export declare const SUPPORTED_UNINSTALLABLE_TOOLS: readonly string[];
 /**
  * 返回工具对应的全局卸载命令副本，用于诊断与测试卸载覆盖范围。
  */
 export declare function getToolUninstallCommands(tool: string): string[];
+/**
+ * 返回工具对应的安装/卸载执行参数副本，用于验证 Windows 下不会把路径引号传给 npm。
+ */
+export declare function getToolCommandSpecs(tool: string, phase: "install" | "uninstall"): Array<{
+    command: string;
+    args: string[];
+    display: string;
+    kind: ToolCommand["kind"];
+}>;
 export declare function isVoltaShimPath(commandPath: string): boolean;
 /**
  * 检查单个工具的 CLI 可执行状态，供实例状态展示与初始化前判断使用。
@@ -22,4 +40,5 @@ export declare function ensureToolsInstalled(tools: string[]): Promise<Record<st
  * 按工具定义执行全局卸载命令，随后重新检测并返回最新安装状态。
  */
 export declare function uninstallTools(tools: string[]): Promise<Record<string, ToolInstallStatus>>;
+export {};
 //# sourceMappingURL=tool-installer.d.ts.map

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":"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"}
+{"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;AAwBrD,KAAK,WAAW,GACZ;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAiHN,eAAO,MAAM,2BAA2B,mBAEvC,CAAC;AAEF,eAAO,MAAM,6BAA6B,mBAIzC,CAAC;AAEF;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAO/D;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,SAAS,GAAG,WAAW,GAC7B,KAAK,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC,CAaxF;AAoDD,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAM5D;AAgPD;;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,CAsF5C;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

@@ -2,12 +2,12 @@ import { execFile } from "node:child_process";
 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";
+import { BRIDGE_PACKAGE_ROOT, importBridgeSdkPackage } from "../utils/sdk-package-loader.js";
 const execFileAsync = promisify(execFile);
 const log = createLogger("tool-installer");
-const bridgePackageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..", "..");
+const bridgePackageRoot = BRIDGE_PACKAGE_ROOT;
 const isWindows = process.platform === "win32";
 function quoteCommandArg(value) {
     if (isWindows) {
@@ -21,6 +21,27 @@ function npmInstallIntoBridgeCommand(packages) {
 function npmUninstallFromBridgeCommand(packages) {
     return `npm uninstall --prefix ${quoteCommandArg(bridgePackageRoot)} ${packages.join(" ")}`;
 }
+function npmExecutableName() {
+    return isWindows ? "npm.cmd" : "npm";
+}
+/**
+ * 构建 bridge 本地 npm 包安装/卸载命令。
+ * 主流程：展示层保留可读命令；执行层使用参数数组，避免 Windows shell 引号被 npm 当作路径内容。
+ */
+function npmBridgeCommand(action, packages) {
+    const display = action === "install"
+        ? npmInstallIntoBridgeCommand(packages)
+        : npmUninstallFromBridgeCommand(packages);
+    return {
+        kind: "execFile",
+        command: npmExecutableName(),
+        args: [action, "--prefix", bridgePackageRoot, ...packages],
+        display,
+    };
+}
+function shellToolCommand(command) {
+    return { kind: "shell", display: command };
+}
 const TOOL_DEFINITIONS = {
     claude: {
         key: "claude",
@@ -29,10 +50,10 @@ const TOOL_DEFINITIONS = {
         aliases: [],
         versionArgs: [],
         installCommands: [
-            npmInstallIntoBridgeCommand(["@anthropic-ai/claude-agent-sdk@latest"]),
+            npmBridgeCommand("install", ["@anthropic-ai/claude-agent-sdk@latest"]),
         ],
         uninstallCommands: [
-            npmUninstallFromBridgeCommand(["@anthropic-ai/claude-agent-sdk"]),
+            npmBridgeCommand("uninstall", ["@anthropic-ai/claude-agent-sdk"]),
         ],
     },
     claudecode: {
@@ -42,10 +63,10 @@ const TOOL_DEFINITIONS = {
         aliases: [],
         versionArgs: [],
         installCommands: [
-            npmInstallIntoBridgeCommand(["@anthropic-ai/claude-agent-sdk@latest"]),
+            npmBridgeCommand("install", ["@anthropic-ai/claude-agent-sdk@latest"]),
         ],
         uninstallCommands: [
-            npmUninstallFromBridgeCommand(["@anthropic-ai/claude-agent-sdk"]),
+            npmBridgeCommand("uninstall", ["@anthropic-ai/claude-agent-sdk"]),
         ],
     },
     opencode: {
@@ -57,16 +78,16 @@ const TOOL_DEFINITIONS = {
             : ["opencode"],
         versionArgs: ["--version"],
         installCommands: [
-            npmInstallIntoBridgeCommand(["@opencode-ai/sdk@latest", "opencode-ai@latest"]),
+            npmBridgeCommand("install", ["@opencode-ai/sdk@latest", "opencode-ai@latest"]),
         ],
         uninstallCommands: isWindows
             ? [
-                npmUninstallFromBridgeCommand(["@opencode-ai/sdk", "opencode-ai"]),
+                npmBridgeCommand("uninstall", ["@opencode-ai/sdk", "opencode-ai"]),
             ]
             : [
-                npmUninstallFromBridgeCommand(["@opencode-ai/sdk", "opencode-ai"]),
-                "opencode uninstall --force",
-                "rm -f ~/.opencode/bin/opencode",
+                npmBridgeCommand("uninstall", ["@opencode-ai/sdk", "opencode-ai"]),
+                shellToolCommand("opencode uninstall --force"),
+                shellToolCommand("rm -f ~/.opencode/bin/opencode"),
             ],
         extraSearchPaths: () => {
             const home = os.homedir();
@@ -85,8 +106,8 @@ const TOOL_DEFINITIONS = {
         sdkPackageName: "@openai/codex-sdk",
         aliases: [],
         versionArgs: [],
-        installCommands: [npmInstallIntoBridgeCommand(["@openai/codex-sdk@latest"])],
-        uninstallCommands: [npmUninstallFromBridgeCommand(["@openai/codex-sdk"])],
+        installCommands: [npmBridgeCommand("install", ["@openai/codex-sdk@latest"])],
+        uninstallCommands: [npmBridgeCommand("uninstall", ["@openai/codex-sdk"])],
     },
 };
 export const SUPPORTED_INSTALLABLE_TOOLS = Object.freeze(Object.keys(TOOL_DEFINITIONS));
@@ -98,7 +119,24 @@ export function getToolUninstallCommands(tool) {
     const normalizedTool = String(tool || "")
         .trim()
         .toLowerCase();
-    return [...(TOOL_DEFINITIONS[normalizedTool]?.uninstallCommands || [])];
+    return (TOOL_DEFINITIONS[normalizedTool]?.uninstallCommands || []).map((command) => command.display);
+}
+/**
+ * 返回工具对应的安装/卸载执行参数副本，用于验证 Windows 下不会把路径引号传给 npm。
+ */
+export function getToolCommandSpecs(tool, phase) {
+    const normalizedTool = String(tool || "")
+        .trim()
+        .toLowerCase();
+    const commands = phase === "install"
+        ? TOOL_DEFINITIONS[normalizedTool]?.installCommands
+        : TOOL_DEFINITIONS[normalizedTool]?.uninstallCommands;
+    return (commands || []).map((command) => ({
+        command: command.kind === "execFile" ? command.command : command.display,
+        args: command.kind === "execFile" ? [...command.args] : [],
+        display: command.display,
+        kind: command.kind,
+    }));
 }
 function parseVersion(output) {
     const normalized = String(output || "").trim();
@@ -288,7 +326,7 @@ async function resolveSdkPackageCandidate(definition) {
         return resolveExecutableCandidate(definition);
     }
     try {
-        await import(sdkPackageName);
+        await importBridgeSdkPackage(sdkPackageName);
         return {
             executable: sdkPackageName,
             version: await readInstalledPackageVersion(sdkPackageName),
@@ -320,13 +358,26 @@ function describeCommandFailure(error) {
     };
 }
 async function runToolCommand(command) {
+    if (command.kind === "execFile") {
+        const needsWindowsCmdShim = isWindows && /\.(?:cmd|bat)$/i.test(command.command);
+        const result = needsWindowsCmdShim
+            ? await execFileAsync("cmd.exe", ["/d", "/s", "/c", command.command, ...command.args], {
+                timeout: 10 * 60 * 1000,
+                windowsVerbatimArguments: false,
+            })
+            : await execFileAsync(command.command, command.args, {
+                timeout: 10 * 60 * 1000,
+                windowsVerbatimArguments: false,
+            });
+        return { stdout: result.stdout || "", stderr: result.stderr || "" };
+    }
     if (isWindows) {
-        const result = await execFileAsync("cmd.exe", ["/d", "/s", "/c", command], {
+        const result = await execFileAsync("cmd.exe", ["/d", "/s", "/c", command.display], {
             timeout: 10 * 60 * 1000,
         });
         return { stdout: result.stdout || "", stderr: result.stderr || "" };
     }
-    const result = await execFileAsync("/bin/sh", ["-lc", command], {
+    const result = await execFileAsync("/bin/sh", ["-lc", command.display], {
         timeout: 10 * 60 * 1000,
     });
     return { stdout: result.stdout || "", stderr: result.stderr || "" };
@@ -420,14 +471,14 @@ export async function ensureToolsInstalled(tools) {
             try {
                 log.info("Running install command", {
                     tool,
-                    command,
+                    command: command.display,
                     sdkPackageName: definition.sdkPackageName || null,
                     packageName: definition.packageName,
                 });
                 const commandResult = await runToolCommand(command);
                 log.info("Install command completed", {
                     tool,
-                    command,
+                    command: command.display,
                     stdout: commandResult.stdout,
                     stderr: commandResult.stderr,
                 });
@@ -443,7 +494,7 @@ export async function ensureToolsInstalled(tools) {
             catch (error) {
                 log.error("Install command failed", {
                     tool,
-                    command,
+                    command: command.display,
                     failure: describeCommandFailure(error),
                 });
                 lastError =
@@ -464,6 +515,7 @@ export async function ensureToolsInstalled(tools) {
                 tool,
                 status: nextStatuses[tool],
                 attemptedCommands: definition.installCommands,
+                attemptedCommandDisplays: definition.installCommands.map((command) => command.display),
             });
         }
     }

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

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { detectToolInstallStatus, SUPPORTED_INSTALLABLE_TOOLS, SUPPORTED_UNINSTALLABLE_TOOLS, detectToolStatuses, getToolUninstallCommands, isVoltaShimPath } from './tool-installer.js';
+import { SUPPORTED_INSTALLABLE_TOOLS, SUPPORTED_UNINSTALLABLE_TOOLS, detectToolInstallStatus, detectToolStatuses, getToolCommandSpecs, getToolUninstallCommands, isVoltaShimPath } from './tool-installer.js';
 describe('tool installer service', () => {
     it('returns structured status for supported tools', async () => {
         const statuses = await detectToolStatuses(['claude', 'opencode', 'codex']);
@@ -115,6 +115,25 @@ describe('tool installer service', () => {
         expect(commands.some(command => command.includes('npm uninstall --prefix'))).toBe(true);
         expect(commands.some(command => command.includes('@openai/codex-sdk'))).toBe(true);
     });
+    it('executes npm-backed install and uninstall commands with prefix as an unquoted argument', () => {
+        const expectedPackagesByTool = {
+            claude: '@anthropic-ai/claude-agent-sdk',
+            claudecode: '@anthropic-ai/claude-agent-sdk',
+            opencode: '@opencode-ai/sdk',
+            codex: '@openai/codex-sdk'
+        };
+        for (const [tool, packageName] of Object.entries(expectedPackagesByTool)) {
+            for (const phase of ['install', 'uninstall']) {
+                const [command] = getToolCommandSpecs(tool, phase);
+                expect(command.kind).toBe('execFile');
+                expect(command.command).toMatch(/^npm(?:\.cmd)?$/);
+                expect(command.args.slice(0, 3)).toEqual([phase, '--prefix', expect.any(String)]);
+                expect(command.args[2]).not.toMatch(/^"|"$/);
+                expect(command.args.some(arg => arg.startsWith(packageName))).toBe(true);
+                expect(command.display).toContain(`npm ${phase} --prefix`);
+            }
+        }
+    });
     it('recognizes Volta shim paths for package-manager-aware detection', () => {
         expect(isVoltaShimPath('C:\\Users\\tester\\AppData\\Local\\Volta\\bin\\codex.cmd')).toBe(true);
         expect(isVoltaShimPath('/home/tester/.volta/bin/codex')).toBe(true);

package/dist/utils/sdk-package-loader.d.ts

@@ -0,0 +1,12 @@
+export declare const BRIDGE_PACKAGE_ROOT: string;
+/**
+ * 主干流程：从 bridge 自身安装根下的 node_modules 读取包元数据，
+ * 按 package.json 的 exports/module/main 定位真实 ESM 入口，避免猜测根目录 index.js。
+ */
+export declare function resolveBridgePackageEntryPath(packageName: string, packageRoot?: string): Promise<string>;
+/**
+ * 具体实现逻辑：优先从 bridge-local 安装目录显式导入真实入口；
+ * 若没有本地 package.json，则退回 Node 的包名解析以兼容开发环境。
+ */
+export declare function importBridgeSdkPackage<TModule>(packageName: string): Promise<TModule>;
+//# sourceMappingURL=sdk-package-loader.d.ts.map

package/dist/utils/sdk-package-loader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sdk-package-loader.d.ts","sourceRoot":"","sources":["../../src/utils/sdk-package-loader.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mBAAmB,QAI/B,CAAC;AA4DF;;;GAGG;AACH,wBAAsB,6BAA6B,CACjD,WAAW,EAAE,MAAM,EACnB,WAAW,SAAsB,GAChC,OAAO,CAAC,MAAM,CAAC,CAUjB;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAAC,OAAO,EAClD,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC,CAUlB"}

package/dist/utils/sdk-package-loader.js

@@ -0,0 +1,78 @@
+import { access, readFile } from 'node:fs/promises';
+import path from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+export const BRIDGE_PACKAGE_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', '..');
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function getPackageDirectory(packageName, packageRoot) {
+    return path.join(packageRoot, 'node_modules', ...packageName.split('/'));
+}
+function resolveConditionalExport(value) {
+    if (typeof value === 'string') {
+        return value;
+    }
+    if (!isRecord(value)) {
+        return null;
+    }
+    for (const condition of ['import', 'module', 'default', 'node']) {
+        const resolved = resolveConditionalExport(value[condition]);
+        if (resolved) {
+            return resolved;
+        }
+    }
+    return null;
+}
+function resolvePackageRootExport(exportsField) {
+    if (typeof exportsField === 'string') {
+        return exportsField;
+    }
+    if (!isRecord(exportsField)) {
+        return null;
+    }
+    const rootExport = resolveConditionalExport(exportsField['.']);
+    return rootExport ?? resolveConditionalExport(exportsField);
+}
+function resolveEntryFromPackageJson(packageJson) {
+    const exportedEntry = resolvePackageRootExport(packageJson.exports);
+    if (exportedEntry) {
+        return exportedEntry;
+    }
+    if (typeof packageJson.module === 'string') {
+        return packageJson.module;
+    }
+    if (typeof packageJson.main === 'string') {
+        return packageJson.main;
+    }
+    return 'index.js';
+}
+/**
+ * 主干流程：从 bridge 自身安装根下的 node_modules 读取包元数据，
+ * 按 package.json 的 exports/module/main 定位真实 ESM 入口，避免猜测根目录 index.js。
+ */
+export async function resolveBridgePackageEntryPath(packageName, packageRoot = BRIDGE_PACKAGE_ROOT) {
+    const packageDirectory = getPackageDirectory(packageName, packageRoot);
+    const packageJsonPath = path.join(packageDirectory, 'package.json');
+    const rawPackageJson = await readFile(packageJsonPath, 'utf8');
+    const packageJson = JSON.parse(rawPackageJson);
+    const entry = resolveEntryFromPackageJson(packageJson);
+    const entryPath = path.resolve(packageDirectory, entry);
+    await access(entryPath);
+    return entryPath;
+}
+/**
+ * 具体实现逻辑：优先从 bridge-local 安装目录显式导入真实入口；
+ * 若没有本地 package.json，则退回 Node 的包名解析以兼容开发环境。
+ */
+export async function importBridgeSdkPackage(packageName) {
+    try {
+        const entryPath = await resolveBridgePackageEntryPath(packageName);
+        return (await import(pathToFileURL(entryPath).href));
+    }
+    catch (error) {
+        if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
+            return (await import(packageName));
+        }
+        throw error;
+    }
+}

package/dist/utils/sdk-package-loader.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=sdk-package-loader.test.d.ts.map

package/dist/utils/sdk-package-loader.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sdk-package-loader.test.d.ts","sourceRoot":"","sources":["../../src/utils/sdk-package-loader.test.ts"],"names":[],"mappings":""}

package/dist/utils/sdk-package-loader.test.js

@@ -0,0 +1,66 @@
+import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { afterEach, describe, expect, it } from 'vitest';
+import { resolveBridgePackageEntryPath } from './sdk-package-loader.js';
+const tempRoots = [];
+afterEach(async () => {
+    await Promise.all(tempRoots.splice(0).map((root) => rm(root, { recursive: true, force: true })));
+});
+async function createTempPackageRoot() {
+    const root = await mkdtemp(path.join(os.tmpdir(), 'aws-sdk-package-loader-'));
+    tempRoots.push(root);
+    return root;
+}
+describe('sdk package loader', () => {
+    it('resolves package exports instead of assuming a root index.js file', async () => {
+        const packageRoot = await createTempPackageRoot();
+        const packageDirectory = path.join(packageRoot, 'node_modules', '@opencode-ai', 'sdk');
+        await mkdir(path.join(packageDirectory, 'dist'), { recursive: true });
+        await writeFile(path.join(packageDirectory, 'package.json'), JSON.stringify({
+            name: '@opencode-ai/sdk',
+            type: 'module',
+            exports: {
+                '.': {
+                    import: './dist/index.js',
+                    types: './dist/index.d.ts',
+                },
+            },
+        }));
+        await writeFile(path.join(packageDirectory, 'dist', 'index.js'), 'export const ok = true;');
+        await expect(resolveBridgePackageEntryPath('@opencode-ai/sdk', packageRoot)).resolves.toBe(path.join(packageDirectory, 'dist', 'index.js'));
+    });
+    it('resolves default conditional exports', async () => {
+        const packageRoot = await createTempPackageRoot();
+        const packageDirectory = path.join(packageRoot, 'node_modules', 'default-only-sdk');
+        await mkdir(path.join(packageDirectory, 'dist'), { recursive: true });
+        await writeFile(path.join(packageDirectory, 'package.json'), JSON.stringify({ exports: { '.': { default: './dist/default.js' } } }));
+        await writeFile(path.join(packageDirectory, 'dist', 'default.js'), 'export const ok = true;');
+        await expect(resolveBridgePackageEntryPath('default-only-sdk', packageRoot)).resolves.toBe(path.join(packageDirectory, 'dist', 'default.js'));
+    });
+    it('falls back to module when exports is absent', async () => {
+        const packageRoot = await createTempPackageRoot();
+        const packageDirectory = path.join(packageRoot, 'node_modules', 'module-sdk');
+        await mkdir(path.join(packageDirectory, 'esm'), { recursive: true });
+        await writeFile(path.join(packageDirectory, 'package.json'), JSON.stringify({ module: './esm/index.js' }));
+        await writeFile(path.join(packageDirectory, 'esm', 'index.js'), 'export const ok = true;');
+        await expect(resolveBridgePackageEntryPath('module-sdk', packageRoot)).resolves.toBe(path.join(packageDirectory, 'esm', 'index.js'));
+    });
+    it('falls back to main when exports and module are absent', async () => {
+        const packageRoot = await createTempPackageRoot();
+        const packageDirectory = path.join(packageRoot, 'node_modules', 'main-sdk');
+        await mkdir(path.join(packageDirectory, 'lib'), { recursive: true });
+        await writeFile(path.join(packageDirectory, 'package.json'), JSON.stringify({ main: './lib/main.js' }));
+        await writeFile(path.join(packageDirectory, 'lib', 'main.js'), 'export const ok = true;');
+        await expect(resolveBridgePackageEntryPath('main-sdk', packageRoot)).resolves.toBe(path.join(packageDirectory, 'lib', 'main.js'));
+    });
+    it('rejects when the resolved package entry is missing', async () => {
+        const packageRoot = await createTempPackageRoot();
+        const packageDirectory = path.join(packageRoot, 'node_modules', 'broken-sdk');
+        await mkdir(packageDirectory, { recursive: true });
+        await writeFile(path.join(packageDirectory, 'package.json'), JSON.stringify({ exports: './dist/missing.js' }));
+        await expect(resolveBridgePackageEntryPath('broken-sdk', packageRoot)).rejects.toMatchObject({
+            code: 'ENOENT',
+        });
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-runtime-bridge",
-  "version": "1.6.5",
+  "version": "1.6.8",
   "description": "AgentsWorkStudio runtime bridge service for machine-level agent runtime integration",
   "type": "module",
   "main": "dist/index.js",
@@ -49,6 +49,7 @@
     "@anthropic-ai/claude-agent-sdk": "^0.2.87",
     "@cc-switch/sdk": "file:package/cc-switch-sdk",
     "@modelcontextprotocol/sdk": "^1.27.1",
+    "@openai/codex-sdk": "^0.130.0",
     "archiver": "^8.0.0",
     "axios": "^1.7.9",
     "cors": "^2.8.5",
@@ -64,7 +65,6 @@
     "zod": "^4.1.12"
   },
   "peerDependencies": {
-    "@openai/codex-sdk": "^0.125.0",
     "@opencode-ai/sdk": "^1.3.13"
   },
   "peerDependenciesMeta": {
@@ -77,7 +77,6 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.0.0",
-    "@openai/codex-sdk": "^0.125.0",
     "@opencode-ai/sdk": "^1.3.13",
     "@types/archiver": "^7.0.0",
     "@types/cors": "^2.8.19",