aws-runtime-bridge 1.5.0 → 1.6.2

package/dist/services/terminal-persistence.js

@@ -80,6 +80,26 @@ export async function upsertPersistedSession(session) {
         return runningSessions;
     });
 }
+/**
+ * 更新指定 Agent 的持久化自动命令配置。
+ *
+ * 主流程：加载 running 会话 -> 命中 agentId 时只替换自动命令字段，保留原 command/workspace/pid。
+ */
+export async function updatePersistedSessionAutoCommands(agentId, commands) {
+    let updated = false;
+    await updatePersistedSessions((sessions) => sessions.map((session) => {
+        if (session.agentId !== agentId) {
+            return session;
+        }
+        updated = true;
+        return {
+            ...session,
+            idleInputAutoCommand: commands.idleInputAutoCommand,
+            nonInputAutoCommand: commands.nonInputAutoCommand,
+        };
+    }));
+    return updated;
+}
 /**
  * 移除持久化会话（从完整文件中删除，包括 stopped 状态的）
  *

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

@@ -1,5 +1,11 @@
 import type { ToolInstallStatus } from "../types.js";
 export declare const SUPPORTED_INSTALLABLE_TOOLS: readonly string[];
+export declare const SUPPORTED_UNINSTALLABLE_TOOLS: readonly string[];
+/**
+ * 返回工具对应的全局卸载命令副本，用于诊断与测试卸载覆盖范围。
+ */
+export declare function getToolUninstallCommands(tool: string): string[];
+export declare function isVoltaShimPath(commandPath: string): boolean;
 /**
  * 检查单个工具的 CLI 可执行状态，供实例状态展示与初始化前判断使用。
  */
@@ -12,4 +18,8 @@ export declare function detectToolStatuses(tools: string[]): Promise<Record<stri
  * 根据勾选工具自动安装缺失 CLI，安装后重新检测状态并返回。
  */
 export declare function ensureToolsInstalled(tools: string[]): Promise<Record<string, ToolInstallStatus>>;
+/**
+ * 按工具定义执行全局卸载命令，随后重新检测并返回最新安装状态。
+ */
+export declare function uninstallTools(tools: string[]): Promise<Record<string, ToolInstallStatus>>;
 //# 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":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAoErD,eAAO,MAAM,2BAA2B,mBAEvC,CAAC;AAmLF;;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"}
+{"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,44 +1,70 @@
+import { execFile } from "node:child_process";
+import { access, readFile } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
-import { access } from "node:fs/promises";
-import { execFile } from "node:child_process";
+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",
-        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",
-            ],
+        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",
-        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",
-            ],
+        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/sdk",
+        sdkPackageName: "@opencode-ai/sdk",
         aliases: isWindows
             ? ["opencode.cmd", "opencode.exe", "opencode"]
             : ["opencode"],
         versionArgs: ["--version"],
-        installCommands: isWindows
-            ? ["npm install -g opencode-ai@latest"]
+        installCommands: [
+            npmInstallIntoBridgeCommand(["@opencode-ai/sdk@latest", "opencode-ai@latest"]),
+        ],
+        uninstallCommands: isWindows
+            ? [
+                npmUninstallFromBridgeCommand(["@opencode-ai/sdk", "opencode-ai"]),
+            ]
             : [
-                "curl -fsSL https://opencode.ai/install | bash",
-                "npm install -g opencode-ai@latest",
+                npmUninstallFromBridgeCommand(["@opencode-ai/sdk", "opencode-ai"]),
+                "opencode uninstall --force",
+                "rm -f ~/.opencode/bin/opencode",
             ],
         extraSearchPaths: () => {
             const home = os.homedir();
@@ -53,12 +79,25 @@ const TOOL_DEFINITIONS = {
     },
     codex: {
         key: "codex",
-        aliases: isWindows ? ["codex.cmd", "codex.exe", "codex"] : ["codex"],
-        versionArgs: ["--version"],
-        installCommands: ["npm install -g @openai/codex@latest"],
+        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));
+export const SUPPORTED_UNINSTALLABLE_TOOLS = Object.freeze(Object.keys(TOOL_DEFINITIONS).filter((tool) => TOOL_DEFINITIONS[tool].uninstallCommands.length > 0));
+/**
+ * 返回工具对应的全局卸载命令副本，用于诊断与测试卸载覆盖范围。
+ */
+export function getToolUninstallCommands(tool) {
+    const normalizedTool = String(tool || "")
+        .trim()
+        .toLowerCase();
+    return [...(TOOL_DEFINITIONS[normalizedTool]?.uninstallCommands || [])];
+}
 function parseVersion(output) {
     const normalized = String(output || "").trim();
     if (!normalized) {
@@ -103,6 +142,26 @@ function describeExecError(error) {
     }
     return message || "command execution failed";
 }
+export function isVoltaShimPath(commandPath) {
+    const normalizedPath = path
+        .normalize(commandPath)
+        .replaceAll("\\", "/")
+        .toLowerCase();
+    return /(?:^|\/)\.?volta\/bin\//.test(normalizedPath);
+}
+async function isVoltaPackageInstalled(packageName) {
+    try {
+        const { stdout, stderr } = await execFileAsync("volta", ["list", "--format", "plain"], {
+            timeout: 20_000,
+        });
+        const output = `${stdout || ""}\n${stderr || ""}`;
+        const escapedPackageName = packageName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+        return new RegExp(`^package\\s+${escapedPackageName}(?:@|\\s)`, "im").test(output);
+    }
+    catch {
+        return false;
+    }
+}
 /**
  * 在 Windows 上执行命令（处理 .cmd/.bat 文件）
  * 在 Unix 系统上直接执行
@@ -151,7 +210,7 @@ async function resolveExecutableCandidate(definition) {
         }
         catch (error) {
             executionFailureMessage = describeExecError(error);
-            if (executionFailureMessage !== "command not found in PATH") {
+            if (!isWindows && executionFailureMessage !== "command not found in PATH") {
                 return {
                     executable: alias,
                     version: null,
@@ -164,6 +223,11 @@ async function resolveExecutableCandidate(definition) {
             try {
                 await access(absolutePath);
                 foundCommandPath = absolutePath;
+                if (isVoltaShimPath(absolutePath) &&
+                    !(await isVoltaPackageInstalled(definition.packageName))) {
+                    foundCommandPath = null;
+                    continue;
+                }
                 const { stdout, stderr } = await executeVersionCommand(absolutePath, definition.versionArgs);
                 const version = parseVersion(`${stdout || ""}\n${stderr || ""}`);
                 if (!version) {
@@ -196,7 +260,51 @@ async function resolveExecutableCandidate(definition) {
     }
     return { executable: null, version: null, error: "command not installed" };
 }
-async function runInstallCommand(command) {
+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], {
             timeout: 10 * 60 * 1000,
@@ -223,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,
@@ -267,7 +386,7 @@ export async function ensureToolsInstalled(tools) {
         let lastError = current.error;
         for (const command of definition.installCommands) {
             try {
-                await runInstallCommand(command);
+                await runToolCommand(command);
                 const detected = await detectToolInstallStatus(tool);
                 nextStatuses[tool] = detected;
                 if (detected.installed) {
@@ -295,3 +414,49 @@ export async function ensureToolsInstalled(tools) {
     }
     return nextStatuses;
 }
+/**
+ * 按工具定义执行全局卸载命令，随后重新检测并返回最新安装状态。
+ */
+export async function uninstallTools(tools) {
+    const normalizedTools = [
+        ...new Set((Array.isArray(tools) ? tools : [])
+            .map((item) => String(item || "")
+            .trim()
+            .toLowerCase())
+            .filter(Boolean)),
+    ];
+    const nextStatuses = {};
+    for (const tool of normalizedTools) {
+        const definition = TOOL_DEFINITIONS[tool];
+        if (!definition) {
+            nextStatuses[tool] = await detectToolInstallStatus(tool);
+            continue;
+        }
+        let lastError = null;
+        for (const command of definition.uninstallCommands) {
+            try {
+                await runToolCommand(command);
+                lastError = null;
+                const detectedAfterCommand = await detectToolInstallStatus(tool);
+                if (!detectedAfterCommand.installed) {
+                    nextStatuses[tool] = detectedAfterCommand;
+                    break;
+                }
+            }
+            catch (error) {
+                lastError =
+                    error instanceof Error
+                        ? error.message
+                        : String(error || "uninstall failed");
+            }
+        }
+        const detected = await detectToolInstallStatus(tool);
+        nextStatuses[tool] = {
+            ...detected,
+            error: detected.installed
+                ? lastError || detected.error || "uninstall completed but command is still available"
+                : detected.error,
+        };
+    }
+    return nextStatuses;
+}

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

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { detectToolStatuses, detectToolInstallStatus, SUPPORTED_INSTALLABLE_TOOLS } from './tool-installer.js';
+import { detectToolInstallStatus, SUPPORTED_INSTALLABLE_TOOLS, SUPPORTED_UNINSTALLABLE_TOOLS, detectToolStatuses, 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']);
@@ -76,6 +76,51 @@ 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.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 bridge-local SDK uninstall path for Claude Code', () => {
+        const commands = getToolUninstallCommands('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 bridge-local SDK uninstall path for Codex', () => {
+        const commands = getToolUninstallCommands('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);
+        expect(isVoltaShimPath('/home/tester/.volta/bin/codex')).toBe(true);
+        expect(isVoltaShimPath('/Users/tester/.volta/bin/claude')).toBe(true);
+        expect(isVoltaShimPath('/usr/local/bin/codex')).toBe(false);
+    });
     it('detectToolStatuses returns status for all requested tools', async () => {
         const tools = ['claude', 'opencode', 'unknown-tool'];
         const statuses = await detectToolStatuses(tools);

package/dist/services/workspace-files.d.ts

@@ -67,6 +67,10 @@ interface RenameWorkspaceEntryParams extends WorkspacePathParams {
     targetPath: string;
     newName: string;
 }
+interface MoveWorkspaceEntryParams extends WorkspacePathParams {
+    targetPath: string;
+    destinationPath: string;
+}
 interface DeleteWorkspaceEntryParams extends WorkspacePathParams {
     targetPath: string;
 }
@@ -119,6 +123,16 @@ export declare function renameWorkspaceEntry(params: RenameWorkspaceEntryParams)
     sourcePath: string;
     targetPath: string;
 }>;
+/**
+ * 将工作区内文件或目录移动到另一个工作区目录，保持原文件名不变。
+ */
+export declare function moveWorkspaceEntry(params: MoveWorkspaceEntryParams): Promise<{
+    ok: true;
+    workspacePath: string;
+    sourcePath: string;
+    targetPath: string;
+    destinationPath: string;
+}>;
 /**
  * 删除工作区内的文件或目录，并阻止误删工作区根目录。
  */

package/dist/services/workspace-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-files.d.ts","sourceRoot":"","sources":["../../src/services/workspace-files.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAqDH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,4BAA4B;IAC3C,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,iBAAiB,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,uBAAuB;IACtC,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,8BAA8B;IAC7C,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,uBAAuB;IACtC,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,mBAAmB;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,6BAA6B;IAC5C,EAAE,EAAE,IAAI,CAAC;IACT,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,UAAU,mBAAmB;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,mBAAmB;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,wBAAyB,SAAQ,mBAAmB;IAC5D,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,0BAA2B,SAAQ,mBAAmB;IAC9D,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,UAAU,0BAA2B,SAAQ,mBAAmB;IAC9D,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,0BAA2B,SAAQ,mBAAmB;IAC9D,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,0BAA2B,SAAQ,mBAAmB;IAC9D,KAAK,EAAE,mBAAmB,EAAE,CAAC;IAC7B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,UAAU,4BAA6B,SAAQ,mBAAmB;IAChE,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,6BAA8B,SAAQ,mBAAmB;IACjE,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAkWD;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CA0B/G;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAgBrG;AAED;;GAEG;AACH,wBAAsB,wBAAwB,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAkCnH;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAYzI;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,CAAC,CAkCxF;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,CAkCtF;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,CAelE;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,6BAA6B,CAAA;KAAE,CAAC,CAAA;CAAE,CAAC,CA4CnL;AAED;;GAEG;AACH,wBAAsB,8BAA8B,CAAC,MAAM,EAAE,4BAA4B,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAa3H;AAED;;GAEG;AACH,wBAAsB,2BAA2B,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAarH;AA4GD;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,6BAA6B,GAAG,OAAO,CAAC,6BAA6B,CAAC,CA8C3H"}
+{"version":3,"file":"workspace-files.d.ts","sourceRoot":"","sources":["../../src/services/workspace-files.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAqDH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,4BAA4B;IAC3C,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,iBAAiB,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,uBAAuB;IACtC,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,8BAA8B;IAC7C,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,aAAa,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,uBAAuB;IACtC,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,mBAAmB;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,6BAA6B;IAC5C,EAAE,EAAE,IAAI,CAAC;IACT,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,UAAU,mBAAmB;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,mBAAmB;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,wBAAyB,SAAQ,mBAAmB;IAC5D,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,0BAA2B,SAAQ,mBAAmB;IAC9D,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,UAAU,0BAA2B,SAAQ,mBAAmB;IAC9D,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,wBAAyB,SAAQ,mBAAmB;IAC5D,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,UAAU,0BAA2B,SAAQ,mBAAmB;IAC9D,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,0BAA2B,SAAQ,mBAAmB;IAC9D,KAAK,EAAE,mBAAmB,EAAE,CAAC;IAC7B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,UAAU,4BAA6B,SAAQ,mBAAmB;IAChE,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,6BAA8B,SAAQ,mBAAmB;IACjE,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAkWD;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,4BAA4B,CAAC,CA0B/G;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAgBrG;AAED;;GAEG;AACH,wBAAsB,wBAAwB,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAkCnH;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAYzI;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,CAAC,CAkCxF;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,CAkCtF;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,wBAAwB,GAC/B,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC,CAiD/G;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,CAelE;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,0BAA0B,GACjC,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,6BAA6B,CAAA;KAAE,CAAC,CAAA;CAAE,CAAC,CA4CnL;AAED;;GAEG;AACH,wBAAsB,8BAA8B,CAAC,MAAM,EAAE,4BAA4B,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAa3H;AAED;;GAEG;AACH,wBAAsB,2BAA2B,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAarH;AA+GD;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,MAAM,EAAE,6BAA6B,GAAG,OAAO,CAAC,6BAA6B,CAAC,CA8C3H"}

package/dist/services/workspace-files.js

@@ -487,6 +487,55 @@ export async function renameWorkspaceEntry(params) {
         targetPath: toDisplayPath(renamedPath)
     };
 }
+/**
+ * 将工作区内文件或目录移动到另一个工作区目录，保持原文件名不变。
+ */
+export async function moveWorkspaceEntry(params) {
+    const { workspaceRoot, resolvedTargetPath } = await resolveEntryTarget(params);
+    const destination = await resolveDirectoryTarget({
+        workspacePath: params.workspacePath,
+        targetPath: params.destinationPath,
+    });
+    const destinationStat = await fs.stat(destination.resolvedTargetPath);
+    if (!destinationStat.isDirectory()) {
+        throw new Error(`Destination is not a directory: ${destination.resolvedTargetPath}`);
+    }
+    const targetStat = await fs.stat(resolvedTargetPath);
+    if (targetStat.isDirectory()) {
+        const relativeDestination = path.relative(resolvedTargetPath, destination.resolvedTargetPath);
+        if (relativeDestination === '' || (!relativeDestination.startsWith('..') && !path.isAbsolute(relativeDestination))) {
+            throw new Error('Cannot move a directory into itself or its descendant');
+        }
+    }
+    const movedPath = ensureInsideWorkspace(workspaceRoot, path.join(destination.resolvedTargetPath, path.basename(resolvedTargetPath)));
+    if (movedPath === resolvedTargetPath) {
+        return {
+            ok: true,
+            workspacePath: toDisplayPath(workspaceRoot),
+            sourcePath: toDisplayPath(resolvedTargetPath),
+            targetPath: toDisplayPath(movedPath),
+            destinationPath: toDisplayPath(destination.resolvedTargetPath),
+        };
+    }
+    try {
+        await fs.access(movedPath);
+        throw new Error(`Path already exists: ${movedPath}`);
+    }
+    catch (error) {
+        const errorCode = typeof error === 'object' && error !== null ? Reflect.get(error, 'code') : undefined;
+        if (errorCode !== 'ENOENT') {
+            throw error;
+        }
+    }
+    await fs.rename(resolvedTargetPath, movedPath);
+    return {
+        ok: true,
+        workspacePath: toDisplayPath(workspaceRoot),
+        sourcePath: toDisplayPath(resolvedTargetPath),
+        targetPath: toDisplayPath(movedPath),
+        destinationPath: toDisplayPath(destination.resolvedTargetPath),
+    };
+}
 /**
  * 删除工作区内的文件或目录，并阻止误删工作区根目录。
  */
@@ -639,6 +688,9 @@ async function extractTarArchive(archivePath, outputRoot, gzip, meter) {
             if (entryType === 'symboliclink' || entryType === 'link') {
                 throw new Error(`Archive links are not supported: ${entryPath}`);
             }
+            if (entryType !== 'file' && entryType !== 'oldfile' && entryType !== 'contiguousfile' && entryType !== 'directory') {
+                throw new Error(`Unsupported archive entry type: ${entryPath}`);
+            }
             if (typeof entry.size === 'number') {
                 trackArchiveBytes(meter, entry.size);
             }

package/dist/services/workspace-files.test.js

@@ -3,7 +3,7 @@ import os from 'node:os';
 import path from 'node:path';
 import * as tar from 'tar';
 import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-import { createWorkspaceEntry, deleteWorkspaceEntry, extractWorkspaceArchive, listWorkspaceDirectory, previewWorkspaceDocument, readWorkspaceFile, renameWorkspaceEntry, resolveWorkspaceDownloadTarget, streamWorkspaceDirectoryZip, uploadWorkspaceFiles, writeWorkspaceFile, } from './workspace-files.js';
+import { createWorkspaceEntry, deleteWorkspaceEntry, extractWorkspaceArchive, listWorkspaceDirectory, moveWorkspaceEntry, previewWorkspaceDocument, readWorkspaceFile, renameWorkspaceEntry, resolveWorkspaceDownloadTarget, streamWorkspaceDirectoryZip, uploadWorkspaceFiles, writeWorkspaceFile, } from './workspace-files.js';
 const { ZipArchive } = await import('archiver');
 function crc32(input) {
     let crc = 0xffffffff;
@@ -70,6 +70,27 @@ async function writeStoredZipWithNameBytes(filePath, nameBytes, content) {
         endRecord
     ]));
 }
+async function writeTarHeaderOnlyEntry(filePath, entryName, typeFlag) {
+    const header = Buffer.alloc(512, 0);
+    header.write(entryName, 0, Math.min(Buffer.byteLength(entryName), 100), 'utf-8');
+    header.write('0000644\0', 100, 'ascii');
+    header.write('0000000\0', 108, 'ascii');
+    header.write('0000000\0', 116, 'ascii');
+    header.write('00000000000\0', 124, 'ascii');
+    header.write('00000000000\0', 136, 'ascii');
+    header.fill(0x20, 148, 156);
+    header.write(typeFlag, 156, 'ascii');
+    header.write('ustar\0', 257, 'ascii');
+    header.write('00', 263, 'ascii');
+    let checksum = 0;
+    for (const byte of header) {
+        checksum += byte;
+    }
+    header.write(checksum.toString(8).padStart(6, '0'), 148, 'ascii');
+    header[154] = 0;
+    header[155] = 0x20;
+    await fs.writeFile(filePath, Buffer.concat([header, Buffer.alloc(1024, 0)]));
+}
 describe('workspace file service', () => {
     const tempRoot = path.join(os.tmpdir(), `aws-workspace-files-${Date.now()}`);
     const workspacePath = path.join(tempRoot, 'workspace');
@@ -201,6 +222,60 @@ describe('workspace file service', () => {
             targetPath: workspacePath
         })).rejects.toThrow(/Workspace root cannot be modified/);
     });
+    it('moves files and rejects moving directories into themselves', async () => {
+        const moveSourceDir = path.join(workspacePath, 'move-source');
+        const moveDestinationDir = path.join(workspacePath, 'move-destination');
+        const fileToMove = path.join(moveSourceDir, 'move-me.txt');
+        await fs.mkdir(moveSourceDir, { recursive: true });
+        await fs.mkdir(moveDestinationDir, { recursive: true });
+        await fs.writeFile(fileToMove, 'move me', 'utf-8');
+        const result = await moveWorkspaceEntry({
+            workspacePath,
+            targetPath: fileToMove,
+            destinationPath: moveDestinationDir,
+        });
+        const movedPath = path.join(moveDestinationDir, 'move-me.txt');
+        expect(result.sourcePath).toBe(fileToMove.replace(/\\/g, '/'));
+        expect(result.targetPath).toBe((await fs.realpath(movedPath)).replace(/\\/g, '/'));
+        await expect(fs.access(fileToMove)).rejects.toThrow();
+        await expect(fs.readFile(movedPath, 'utf-8')).resolves.toBe('move me');
+        const childDestination = path.join(moveSourceDir, 'child');
+        await fs.mkdir(childDestination, { recursive: true });
+        await expect(moveWorkspaceEntry({
+            workspacePath,
+            targetPath: moveSourceDir,
+            destinationPath: childDestination,
+        })).rejects.toThrow(/itself or its descendant/);
+    });
+    it('rejects unsafe workspace move targets', async () => {
+        const moveSafetyDir = path.join(workspacePath, 'move-safety');
+        const moveSafetyFile = path.join(moveSafetyDir, 'safe.txt');
+        const moveSafetyDestination = path.join(workspacePath, 'move-safety-dest');
+        await fs.mkdir(moveSafetyDir, { recursive: true });
+        await fs.mkdir(moveSafetyDestination, { recursive: true });
+        await fs.writeFile(moveSafetyFile, 'safe', 'utf-8');
+        await fs.writeFile(path.join(moveSafetyDestination, 'safe.txt'), 'exists', 'utf-8');
+        await expect(moveWorkspaceEntry({
+            workspacePath,
+            targetPath: workspacePath,
+            destinationPath: moveSafetyDestination,
+        })).rejects.toThrow(/Workspace root cannot be modified/);
+        await expect(moveWorkspaceEntry({
+            workspacePath,
+            targetPath: path.join(tempRoot, 'outside.txt'),
+            destinationPath: moveSafetyDestination,
+        })).rejects.toThrow(/outside workspace/);
+        await expect(moveWorkspaceEntry({
+            workspacePath,
+            targetPath: moveSafetyFile,
+            destinationPath: tempRoot,
+        })).rejects.toThrow(/outside workspace/);
+        await expect(moveWorkspaceEntry({
+            workspacePath,
+            targetPath: moveSafetyFile,
+            destinationPath: moveSafetyDestination,
+        })).rejects.toThrow(/Path already exists/);
+    });
     it('uploads files to a selected workspace directory', async () => {
         const uploadSource = path.join(tempRoot, 'upload-source.txt');
         const uploadTargetDir = path.join(workspacePath, 'uploads');
@@ -490,4 +565,13 @@ describe('workspace file service', () => {
             outputPath: workspacePath
         })).rejects.toThrow(/links are not supported/);
     });
+    it('rejects tar archives with unsupported special entries', async () => {
+        const archivePath = path.join(workspacePath, 'special-entry.tar');
+        await writeTarHeaderOnlyEntry(archivePath, 'special-device', '3');
+        await expect(extractWorkspaceArchive({
+            workspacePath,
+            archivePath,
+            outputPath: workspacePath
+        })).rejects.toThrow(/Unsupported archive entry type/);
+    });
 });