aws-runtime-bridge 1.5.0 → 1.6.1

package/dist/routes/instance.test.js

@@ -55,6 +55,14 @@ describe('instance route validation', () => {
         expect(validateStateRequest({}).valid).toBe(false);
         expect(validateStateRequest({ agentId: 'agent-1' }).valid).toBe(true);
     });
+    it('always detects panel tool statuses even when legacy enabled tools omit codex', async () => {
+        const { buildToolStatusDetectionTargets } = await import('./instance.js');
+        expect(buildToolStatusDetectionTargets(['claude', 'opencode'])).toEqual([
+            'claude',
+            'opencode',
+            'codex',
+        ]);
+    });
     it('accepts codex for cc-switch tool installation validation', async () => {
         const { SUPPORTED_INSTALLABLE_TOOLS } = await import('../services/tool-installer.js');
         const normalizeInstallableTools = (tools) => {
@@ -67,6 +75,48 @@ describe('instance route validation', () => {
         expect(normalizeInstallableTools(['Codex'])).toEqual(['codex']);
         expect(SUPPORTED_INSTALLABLE_TOOLS).toContain('codex');
     });
+    it('accepts panel tools for cc-switch tool uninstallation validation', async () => {
+        const { SUPPORTED_UNINSTALLABLE_TOOLS } = await import('../services/tool-installer.js');
+        const normalizeUninstallableTools = (tools) => {
+            const supported = new Set(SUPPORTED_UNINSTALLABLE_TOOLS);
+            const requestedTools = Array.isArray(tools)
+                ? tools.map((tool) => String(tool || '').trim().toLowerCase()).filter(Boolean)
+                : [];
+            return requestedTools.filter((tool) => supported.has(tool));
+        };
+        expect(normalizeUninstallableTools(['Claude', 'OpenCode', 'Codex'])).toEqual([
+            'claude',
+            'opencode',
+            'codex',
+        ]);
+        expect(normalizeUninstallableTools(['unknown-tool'])).toEqual([]);
+    });
+    it('reports uninstall failure when a requested tool remains installed', async () => {
+        const { buildUninstallFailureMessage } = await import('./instance.js');
+        expect(buildUninstallFailureMessage(['opencode'], {
+            opencode: {
+                tool: 'opencode',
+                installed: true,
+                executable: '/home/user/.opencode/bin/opencode',
+                version: '1.14.39',
+                installing: false,
+                error: 'uninstall completed but command is still available',
+            },
+        })).toContain('opencode: uninstall completed but command is still available');
+    });
+    it('does not report uninstall failure when requested tools are no longer installed', async () => {
+        const { buildUninstallFailureMessage } = await import('./instance.js');
+        expect(buildUninstallFailureMessage(['claude'], {
+            claude: {
+                tool: 'claude',
+                installed: false,
+                executable: null,
+                version: null,
+                installing: false,
+                error: 'command not installed',
+            },
+        })).toBe('');
+    });
     it('allows connection check when no connection key is configured', async () => {
         const { getConfiguredConnectionKeys } = await import('../services/auto-register.js');
         vi.mocked(getConfiguredConnectionKeys).mockReturnValue([]);

package/dist/routes/pty.d.ts

@@ -0,0 +1,106 @@
+import type { IncomingMessage } from "node:http";
+import type { Socket } from "node:net";
+import type { Router } from "express";
+import * as pty from "node-pty";
+import WebSocket from "ws";
+export type PtySessionStatus = "running" | "exited";
+export interface PtySessionSummary {
+    id: string;
+    title: string;
+    workspacePath: string;
+    shell: string;
+    cols: number;
+    rows: number;
+    status: PtySessionStatus;
+    createdAt: string;
+    lastActiveAt: string;
+    exitCode?: number;
+    signal?: number;
+    attachedClients: number;
+    ownerUserId?: string;
+    tenantId?: string;
+    projectName?: string;
+}
+interface PtySessionEntry extends PtySessionSummary {
+    ptyProcess: pty.IPty;
+    sockets: Set<WebSocket>;
+    outputBuffer: string;
+    idleTimer: NodeJS.Timeout | null;
+    persistent: boolean;
+}
+export declare const ptySessions: Map<string, PtySessionEntry>;
+/**
+ * 解析 PTY 空闲清理时间。
+ * 主流程：读取环境变量 -> 非法值回退默认值 -> 用于 WebSocket 全断开后的延迟清理。
+ */
+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): {
+    shell: string;
+    args: string[];
+};
+/**
+ * 校验并解析 shell 选择。
+ * 主流程：auto 使用默认 shell；显式 shell 必须命中 allowlist，避免前端任意执行二进制。
+ */
+export declare function resolveRequestedShell(requestedShell: unknown, platform?: NodeJS.Platform, env?: NodeJS.ProcessEnv): {
+    shell: string;
+    args: string[];
+};
+/**
+ * 判断候选路径是否位于允许根目录中。
+ * 具体逻辑：使用 path.relative 处理 Windows/Unix 分隔符，拒绝向上穿越和跨盘路径。
+ */
+export declare function isPathInsideRoot(candidatePath: string, rootPath: string): boolean;
+/**
+ * 解析并校验 PTY 工作目录。
+ * 主流程：要求绝对目录存在；如果配置 AWS_PTY_ALLOWED_ROOTS，则必须位于允许根目录内。
+ */
+export declare function resolvePtyWorkspacePath(workspacePath: unknown, env?: NodeJS.ProcessEnv): string;
+/**
+ * 创建 PTY session。
+ * 主流程：校验 cwd/shell -> spawn 真实 PTY -> 注册 output/exit 事件 -> 返回元数据给控制面。
+ */
+export declare function createPtySession(input: {
+    workspacePath: unknown;
+    title?: unknown;
+    shell?: unknown;
+    cols?: unknown;
+    rows?: unknown;
+    persistent?: unknown;
+    preCommand?: unknown;
+    ownerUserId?: unknown;
+    tenantId?: unknown;
+    projectName?: unknown;
+}): PtySessionSummary;
+export declare function resolvePtyExitedTtlMs(env?: NodeJS.ProcessEnv): number;
+export declare function resolveMaxPtySessions(env?: NodeJS.ProcessEnv): number;
+export declare function listPtySessions(): PtySessionSummary[];
+export declare function getPtySessionSummary(id: string): PtySessionSummary | undefined;
+/**
+ * 生成短期 PTY 连接令牌。
+ * 主流程：确认 session 存在 -> 生成随机 token -> 记录 session 绑定和过期时间。
+ */
+export declare function createPtyConnectToken(sessionId: string): {
+    token: string;
+    expiresAt: string;
+} | undefined;
+/**
+ * 关闭 PTY session。
+ * 主流程：关闭连接 -> kill PTY -> 清理定时器和内存索引。
+ */
+export declare function closePtySession(id: string, reason?: string): boolean;
+export declare function closeAllPtySessions(reason?: string): void;
+export declare const ptyRouter: Router;
+/**
+ * 将 PTY WebSocket upgrade 挂到 HTTP server。
+ * 主流程：匹配 /pty/sessions/:id/stream -> token 校验 -> session 校验 -> 交给 noServer WSS。
+ */
+export declare function attachPtyWebSocketServer(server: {
+    on: (event: "upgrade", listener: (request: IncomingMessage, socket: Socket, head: Buffer) => void) => unknown;
+}): void;
+export {};
+//# sourceMappingURL=pty.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"pty.d.ts","sourceRoot":"","sources":["../../src/routes/pty.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAEhC,OAAO,SAA8B,MAAM,IAAI,CAAC;AAehD,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,QAAQ,CAAC;AAEpD,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,gBAAgB,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,UAAU,eAAgB,SAAQ,iBAAiB;IACjD,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC;IACrB,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;IACjC,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,eAAO,MAAM,WAAW,8BAAqC,CAAC;AAG9D;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAUhF;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,CAQnC;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,cAAc,EAAE,OAAO,EACvB,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,CAuBnC;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAGjF;AAUD;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,aAAa,EAAE,OAAO,EACtB,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,CAoBR;AA2ED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE;IACtC,aAAa,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,GAAG,iBAAiB,CAuEpB;AAgCD,wBAAgB,qBAAqB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAUlF;AAED,wBAAgB,qBAAqB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAUlF;AAgCD,wBAAgB,eAAe,IAAI,iBAAiB,EAAE,CAErD;AAED,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAG9E;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAQzG;AA0BD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,SAAW,GAAG,OAAO,CAkBtE;AAED,wBAAgB,mBAAmB,CAAC,MAAM,SAAa,GAAG,IAAI,CAI7D;AAED,eAAO,MAAM,SAAS,EAAE,MAAuB,CAAC;AA2HhD;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE;IAAE,EAAE,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,KAAK,OAAO,CAAA;CAAE,GAAG,IAAI,CA8BxK"}