aws-runtime-bridge 1.4.0 → 1.6.1

package/dist/routes/file-browser.js

@@ -3,15 +3,79 @@
  *
  * 提供文件系统浏览功能
  */
-import { Router } from 'express';
+import os from 'node:os';
+import { createReadStream, promises as fs } from 'node:fs';
 import path from 'node:path';
-import { promises as fs } from 'node:fs';
-import { validateToken } from '../middleware/auth.js';
+import { Router } from 'express';
+import multer from 'multer';
 import { allowHostFileBrowser } from '../config.js';
+import { validateToken } from '../middleware/auth.js';
 import { createLogger } from '../utils/logger.js';
-import { createWorkspaceEntry, deleteWorkspaceEntry, listWorkspaceDirectory, readWorkspaceFile, renameWorkspaceEntry, writeWorkspaceFile, } from '../services/workspace-files.js';
+import { createWorkspaceEntry, deleteWorkspaceEntry, extractWorkspaceArchive, listWorkspaceDirectory, moveWorkspaceEntry, previewWorkspaceDocument, readWorkspaceFile, renameWorkspaceEntry, resolveWorkspaceDownloadTarget, streamWorkspaceDirectoryZip, uploadWorkspaceFiles, writeWorkspaceFile, } from '../services/workspace-files.js';
+import { unwatchWorkspaceFile, watchWorkspaceFile } from '../services/workspace-watch.js';
 const log = createLogger('file-browser');
 export const fileBrowserRouter = Router();
+export const WORKSPACE_UPLOAD_FILE_LIMIT = 2000;
+const upload = multer({
+    dest: path.join(os.tmpdir(), 'agentswork-runtime-bridge-uploads'),
+    limits: {
+        files: WORKSPACE_UPLOAD_FILE_LIMIT,
+        fileSize: 512 * 1024 * 1024
+    }
+});
+function toBoolean(value) {
+    return value === true || value === 'true' || value === '1';
+}
+function contentDispositionFileName(fileName) {
+    const fallbackName = fileName
+        .replace(/[\\"\r\n]/g, '_')
+        .replace(/[^\x20-\x7E]/g, '_');
+    return `attachment; filename="${fallbackName}"; filename*=UTF-8''${encodeURIComponent(fileName)}`;
+}
+async function cleanupUploadedFiles(files = []) {
+    await Promise.all(files.map((file) => fs.rm(file.path, { force: true }).catch(() => undefined)));
+}
+export function createWorkspaceUploadLimitResponse(error) {
+    return {
+        status: 400,
+        body: {
+            error: error.code === 'LIMIT_FILE_COUNT'
+                ? `一次最多上传 ${WORKSPACE_UPLOAD_FILE_LIMIT} 个文件，请拆分文件夹后重试。`
+                : error.message,
+            code: error.code
+        }
+    };
+}
+export function parseWorkspaceUploadRelativePaths(body) {
+    const relativePathsJson = body.relativePathsJson;
+    if (typeof relativePathsJson === 'string' && relativePathsJson.trim()) {
+        const parsed = JSON.parse(relativePathsJson);
+        if (!Array.isArray(parsed)) {
+            throw new Error('relativePathsJson must be an array');
+        }
+        return parsed.map((relativePath) => String(relativePath || ''));
+    }
+    const relativePaths = body.relativePaths;
+    return Array.isArray(relativePaths)
+        ? relativePaths.map((relativePath) => String(relativePath || ''))
+        : typeof relativePaths === 'string'
+            ? [relativePaths]
+            : [];
+}
+function workspaceUploadMiddleware(req, res, next) {
+    upload.array('files')(req, res, (error) => {
+        if (!error) {
+            next();
+            return;
+        }
+        if (error instanceof multer.MulterError) {
+            const response = createWorkspaceUploadLimitResponse(error);
+            res.status(response.status).json(response.body);
+            return;
+        }
+        next(error);
+    });
+}
 async function listHostDirectories(requestPath = '') {
     const platform = process.platform;
     const isWindows = platform === 'win32';
@@ -155,6 +219,61 @@ fileBrowserRouter.post('/workspace/read', validateToken, async (req, res) => {
         res.status(400).json({ error: err.message });
     }
 });
+/**
+ * 预览工作区文档内容。
+ * POST /api/file-browser/workspace/preview
+ */
+fileBrowserRouter.post('/workspace/preview', validateToken, async (req, res) => {
+    try {
+        const { workspacePath, filePath } = req.body || {};
+        const result = await previewWorkspaceDocument({
+            workspacePath: String(workspacePath || ''),
+            filePath: String(filePath || '')
+        });
+        res.json(result);
+    }
+    catch (error) {
+        const err = error;
+        log.error('failed to preview workspace document:', err);
+        res.status(400).json({ error: err.message });
+    }
+});
+/**
+ * 监听工作区文件变化，用于文档预览自动刷新。
+ * POST /api/file-browser/workspace/watch
+ */
+fileBrowserRouter.post('/workspace/watch', validateToken, async (req, res) => {
+    try {
+        const { workspacePath, filePath } = req.body || {};
+        res.json(await watchWorkspaceFile({
+            workspacePath: String(workspacePath || ''),
+            filePath: String(filePath || '')
+        }));
+    }
+    catch (error) {
+        const err = error;
+        log.error('failed to watch workspace file:', err);
+        res.status(400).json({ error: err.message });
+    }
+});
+/**
+ * 取消监听工作区文件变化。
+ * POST /api/file-browser/workspace/unwatch
+ */
+fileBrowserRouter.post('/workspace/unwatch', validateToken, async (req, res) => {
+    try {
+        const { workspacePath, filePath } = req.body || {};
+        res.json(await unwatchWorkspaceFile({
+            workspacePath: String(workspacePath || ''),
+            filePath: String(filePath || '')
+        }));
+    }
+    catch (error) {
+        const err = error;
+        log.error('failed to unwatch workspace file:', err);
+        res.status(400).json({ error: err.message });
+    }
+});
 /**
  * 保存工作区文件内容
  * POST /api/file-browser/workspace/write
@@ -216,6 +335,26 @@ fileBrowserRouter.post('/workspace/rename', validateToken, async (req, res) => {
         res.status(400).json({ error: err.message });
     }
 });
+/**
+ * 移动工作区中的文件或目录到另一个工作区目录
+ * POST /api/file-browser/workspace/move
+ */
+fileBrowserRouter.post('/workspace/move', validateToken, async (req, res) => {
+    try {
+        const { workspacePath, targetPath, destinationPath } = req.body || {};
+        const result = await moveWorkspaceEntry({
+            workspacePath: String(workspacePath || ''),
+            targetPath: String(targetPath || ''),
+            destinationPath: String(destinationPath || '')
+        });
+        res.json(result);
+    }
+    catch (error) {
+        const err = error;
+        log.error('failed to move workspace entry:', err);
+        res.status(400).json({ error: err.message });
+    }
+});
 /**
  * 删除工作区中的文件或目录
  * POST /api/file-browser/workspace/delete
@@ -235,3 +374,86 @@ fileBrowserRouter.post('/workspace/delete', validateToken, async (req, res) => {
         res.status(400).json({ error: err.message });
     }
 });
+/**
+ * 上传文件到工作区指定目录，可选自动解压常见压缩包。
+ * POST /api/file-browser/workspace/upload
+ */
+fileBrowserRouter.post('/workspace/upload', validateToken, workspaceUploadMiddleware, async (req, res) => {
+    const files = (req.files || []);
+    try {
+        const { workspacePath, path: requestPath = '', extractArchives } = req.body || {};
+        const relativePaths = parseWorkspaceUploadRelativePaths(req.body || {});
+        const result = await uploadWorkspaceFiles({
+            workspacePath: String(workspacePath || ''),
+            targetPath: String(requestPath || ''),
+            extractArchives: toBoolean(extractArchives),
+            files: files.map((file, index) => ({
+                originalname: file.originalname,
+                relativePath: relativePaths[index],
+                path: file.path,
+                size: file.size
+            }))
+        });
+        res.json(result);
+    }
+    catch (error) {
+        const err = error;
+        log.error('failed to upload workspace files:', err);
+        res.status(400).json({ error: err.message });
+    }
+    finally {
+        await cleanupUploadedFiles(files);
+    }
+});
+/**
+ * 下载工作区文件或目录；目录会实时打包为 zip。
+ * POST /api/file-browser/workspace/download
+ */
+fileBrowserRouter.post('/workspace/download', validateToken, async (req, res) => {
+    try {
+        const { workspacePath, targetPath } = req.body || {};
+        const target = await resolveWorkspaceDownloadTarget({
+            workspacePath: String(workspacePath || ''),
+            targetPath: String(targetPath || '')
+        });
+        res.setHeader('Content-Type', target.contentType);
+        res.setHeader('Content-Disposition', contentDispositionFileName(target.fileName));
+        res.setHeader('X-Workspace-Path', encodeURIComponent(target.workspacePath));
+        res.setHeader('X-Workspace-Target-Path', encodeURIComponent(target.targetPath));
+        if (target.isDirectory) {
+            await streamWorkspaceDirectoryZip(target.resolvedTargetPath, res);
+            return;
+        }
+        createReadStream(target.resolvedTargetPath).pipe(res);
+    }
+    catch (error) {
+        const err = error;
+        log.error('failed to download workspace entry:', err);
+        if (!res.headersSent) {
+            res.status(400).json({ error: err.message });
+        }
+        else {
+            res.destroy(err);
+        }
+    }
+});
+/**
+ * 解压工作区内的压缩包到指定目录。
+ * POST /api/file-browser/workspace/extract
+ */
+fileBrowserRouter.post('/workspace/extract', validateToken, async (req, res) => {
+    try {
+        const { workspacePath, archivePath, outputPath = '' } = req.body || {};
+        const result = await extractWorkspaceArchive({
+            workspacePath: String(workspacePath || ''),
+            archivePath: String(archivePath || ''),
+            outputPath: String(outputPath || '')
+        });
+        res.json(result);
+    }
+    catch (error) {
+        const err = error;
+        log.error('failed to extract workspace archive:', err);
+        res.status(400).json({ error: err.message });
+    }
+});

package/dist/routes/file-browser.test.js

@@ -2,6 +2,8 @@
  * File Browser 路由单元测试
  */
 import { describe, it, expect } from 'vitest';
+import multer from 'multer';
+import { createWorkspaceUploadLimitResponse, parseWorkspaceUploadRelativePaths, WORKSPACE_UPLOAD_FILE_LIMIT } from './file-browser.js';
 describe('file-browser route validation', () => {
     it('returns root drives on Windows when path is empty', () => {
         const getRootForWindows = () => {
@@ -61,6 +63,15 @@ describe('file-browser route validation', () => {
         expect(validateDeleteRequest({}).valid).toBe(false);
         expect(validateDeleteRequest({ workspacePath: '/p', targetPath: '/p/file' }).valid).toBe(true);
     });
+    it('validates move request', () => {
+        const validateMoveRequest = (body) => {
+            if (!body.workspacePath || !body.targetPath || !body.destinationPath)
+                return { valid: false, error: 'workspacePath, targetPath, and destinationPath are required' };
+            return { valid: true };
+        };
+        expect(validateMoveRequest({}).valid).toBe(false);
+        expect(validateMoveRequest({ workspacePath: '/p', targetPath: '/p/file', destinationPath: '/p/dest' }).valid).toBe(true);
+    });
 });
 describe('file-browser response building', () => {
     it('builds correct list response', () => {
@@ -85,4 +96,24 @@ describe('file-browser response building', () => {
         expect(directories).toEqual(['src']);
         expect(files).toEqual(['package.json']);
     });
+    it('returns JSON guidance when folder upload exceeds file count limit', () => {
+        const response = createWorkspaceUploadLimitResponse(new multer.MulterError('LIMIT_FILE_COUNT'));
+        expect(response.status).toBe(400);
+        expect(response.body).toEqual({
+            error: `一次最多上传 ${WORKSPACE_UPLOAD_FILE_LIMIT} 个文件，请拆分文件夹后重试。`,
+            code: 'LIMIT_FILE_COUNT'
+        });
+    });
+    it('parses relative paths from a JSON manifest to preserve folder hierarchy', () => {
+        const relativePaths = parseWorkspaceUploadRelativePaths({
+            relativePathsJson: JSON.stringify(['a/b/c.txt', 'a/d/e.txt'])
+        });
+        expect(relativePaths).toEqual(['a/b/c.txt', 'a/d/e.txt']);
+    });
+    it('keeps backward compatibility with repeated relativePaths fields', () => {
+        const relativePaths = parseWorkspaceUploadRelativePaths({
+            relativePaths: ['a/b/c.txt', 'a/d/e.txt']
+        });
+        expect(relativePaths).toEqual(['a/b/c.txt', 'a/d/e.txt']);
+    });
 });

package/dist/routes/instance.d.ts

@@ -1,3 +1,4 @@
+import type { ToolInstallStatus } from "../types.js";
 export declare function setGracefulShutdownFn(fn: (signal: string, preserveSessions: boolean) => Promise<void>): void;
 export declare const instanceRouter: import("express-serve-static-core").Router;
 export declare function buildConnectionCheckResponse(connectionKeyMd5: string): {
@@ -37,5 +38,14 @@ export declare function buildSchedulerPingFailureResponse(error: Error, configur
  * Main flow: never silently pick the first target; require an explicit scheduler URL or future scheduler identity routing.
  */
 export declare function buildAmbiguousSchedulerBaseUrlResponse(targetUrls: string[]): AmbiguousSchedulerBaseUrlResponse;
+/**
+ * 构建工具状态检测目标列表。
+ * 主流程：合并实例启用工具与配置面板固定展示工具，避免历史状态缺少 Codex 时前端误判为待检测。
+ */
+export declare function buildToolStatusDetectionTargets(enabledTools: string[]): string[];
+/**
+ * 汇总卸载后仍可执行的工具，用于避免把部分卸载误报为成功。
+ */
+export declare function buildUninstallFailureMessage(requestedTools: string[], toolStatus: Record<string, ToolInstallStatus>): string;
 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":"AA6BA,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"}
+{"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"}

package/dist/routes/instance.js

@@ -8,10 +8,11 @@ import { loadInstanceState, saveInstanceState, } from "../services/instance-stat
 import { initInstance } from "../services/instance-init-service.js";
 import { discoverCcSwitchConfiguredItems, loadCcSwitchSdk } from "../services/cc-switch-sdk.js";
 import { syncLegacyStateFromSdk } from "../services/instance-init-service.js";
-import { detectToolStatuses, ensureToolsInstalled, SUPPORTED_INSTALLABLE_TOOLS, } from "../services/tool-installer.js";
+import { detectToolStatuses, ensureToolsInstalled, SUPPORTED_INSTALLABLE_TOOLS, SUPPORTED_UNINSTALLABLE_TOOLS, uninstallTools, } from "../services/tool-installer.js";
 import { getConfiguredConnectionKeys } from "../services/auto-register.js";
 import { createLogger } from "../utils/logger.js";
 const log = createLogger("instance");
+const PANEL_TOOL_STATUS_KEYS = ["claude", "opencode", "codex"];
 // ★★★ 导出 gracefulShutdown 的触发函数
 // 用于 aws-mcp-server 通知 bridge 保留会话状态关闭
 let gracefulShutdownFn = null;
@@ -106,6 +107,31 @@ export function buildAmbiguousSchedulerBaseUrlResponse(targetUrls) {
         hint: "Multiple autoRegisterTargets.serverUrl values were found, so bridge cannot safely infer which scheduler /runtime/ping should call back. Set AWS_RUNTIME_SCHEDULER_BASE_URL explicitly, or use future schedulerId/token-bound multi-scheduler routing.",
     };
 }
+/**
+ * 构建工具状态检测目标列表。
+ * 主流程：合并实例启用工具与配置面板固定展示工具，避免历史状态缺少 Codex 时前端误判为待检测。
+ */
+export function buildToolStatusDetectionTargets(enabledTools) {
+    return Array.from(new Set([...enabledTools, ...PANEL_TOOL_STATUS_KEYS]
+        .map((tool) => String(tool || "").trim().toLowerCase())
+        .filter(Boolean)));
+}
+/**
+ * 汇总卸载后仍可执行的工具，用于避免把部分卸载误报为成功。
+ */
+export function buildUninstallFailureMessage(requestedTools, toolStatus) {
+    const failedTools = requestedTools.filter((tool) => toolStatus[tool]?.installed);
+    if (failedTools.length === 0) {
+        return "";
+    }
+    return failedTools
+        .map((tool) => {
+        const status = toolStatus[tool];
+        const detail = status?.error || status?.executable || "command is still available";
+        return `${tool}: ${detail}`;
+    })
+        .join("; ");
+}
 instanceRouter.get("/healthz", (_req, res) => {
     res.json({
         ok: true,
@@ -182,7 +208,7 @@ instanceRouter.post("/cc-switch/state", validateToken, async (req, res) => {
         const imported = await discoverCcSwitchConfiguredItems(sdk);
         const synced = await syncLegacyStateFromSdk(agentId, sdk);
         const state = synced.state;
-        const toolStatus = await detectToolStatuses(state.enabledTools || []);
+        const toolStatus = await detectToolStatuses(buildToolStatusDetectionTargets(state.enabledTools || []));
         res.json({
             ok: true,
             agentId: String(agentId),
@@ -247,6 +273,71 @@ instanceRouter.post("/cc-switch/install-tools", validateToken, async (req, res)
         res.status(400).json({ error: err?.message || "install tools failed" });
     }
 });
+instanceRouter.post("/cc-switch/uninstall-tools", validateToken, async (req, res) => {
+    const { agentId, tools } = req.body || {};
+    if (!agentId) {
+        res.status(400).json({ error: "agentId is required" });
+        return;
+    }
+    const requestedTools = Array.isArray(tools)
+        ? tools
+            .map((tool) => String(tool || "")
+            .trim()
+            .toLowerCase())
+            .filter(Boolean)
+        : [];
+    const supportedUninstallableTools = new Set(SUPPORTED_UNINSTALLABLE_TOOLS);
+    const uninstallableTools = requestedTools.filter((tool) => supportedUninstallableTools.has(tool));
+    if (uninstallableTools.length === 0) {
+        res.status(400).json({
+            error: `tools must include ${SUPPORTED_UNINSTALLABLE_TOOLS.join(", ")}`,
+        });
+        return;
+    }
+    try {
+        const state = await loadInstanceState(agentId);
+        const uninstallableToolSet = new Set(uninstallableTools);
+        const enabledTools = (state.enabledTools || []).filter((tool) => !uninstallableToolSet.has(String(tool || "").trim().toLowerCase()));
+        const uninstalledToolStatus = await uninstallTools(uninstallableTools);
+        const refreshedToolStatus = await detectToolStatuses([
+            ...enabledTools,
+            ...uninstallableTools,
+        ]);
+        const nextToolStatus = {
+            ...refreshedToolStatus,
+            ...uninstalledToolStatus,
+        };
+        const uninstallFailureMessage = buildUninstallFailureMessage(uninstallableTools, nextToolStatus);
+        const nextEnabledTools = uninstallFailureMessage
+            ? state.enabledTools || []
+            : enabledTools;
+        const savedState = await saveInstanceState(agentId, {
+            ...state,
+            enabledTools: nextEnabledTools,
+            toolStatus: nextToolStatus,
+        });
+        if (uninstallFailureMessage) {
+            res.status(400).json({
+                ok: false,
+                agentId: String(agentId),
+                error: `uninstall incomplete: ${uninstallFailureMessage}`,
+                toolStatus: nextToolStatus,
+                state: savedState,
+            });
+            return;
+        }
+        res.json({
+            ok: true,
+            agentId: String(agentId),
+            toolStatus: nextToolStatus,
+            state: savedState,
+        });
+    }
+    catch (error) {
+        const err = error;
+        res.status(400).json({ error: err?.message || "uninstall tools failed" });
+    }
+});
 /**
  * ★★★ 新增：aws-mcp-server 通知 bridge 准备重启
  * POST /runtime/prepare-restart

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