aws-runtime-bridge 1.6.1 → 1.6.2

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;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"}

package/dist/services/tool-installer.js

@@ -1,78 +1,69 @@
 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";
 const execFileAsync = promisify(execFile);
+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 +79,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,6 +260,50 @@ 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`,
+        };
+    }
+}
 async function runToolCommand(command) {
     if (isWindows) {
         await execFileAsync("cmd.exe", ["/d", "/s", "/c", command], {
@@ -298,6 +331,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,

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.2",
   "description": "AgentsWorkStudio runtime bridge service for machine-level agent runtime integration",
   "type": "module",
   "main": "dist/index.js",