aws-runtime-bridge 1.6.2 → 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/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;AA0GrD,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;AAgND;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,iBAAiB,CAAC,CAqC5B;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

@@ -4,7 +4,9 @@ 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) {
@@ -304,14 +306,30 @@ async function resolveSdkPackageCandidate(definition) {
         };
     }
 }
+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 可执行状态，供实例状态展示与初始化前判断使用。
@@ -322,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,
@@ -370,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;
@@ -396,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
@@ -410,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/package.json

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