minimal-agent 0.18.13 → 0.18.14

package/src/tools/ssh/sshClient.ts

@@ -1,189 +0,0 @@
-/**
- * ============================================================
- *  src/tools/ssh/sshClient.ts —— ssh2 的薄封装（Promise 化 exec / sftp）
- * ------------------------------------------------------------
- *  只做协议层：连接、执行命令、传文件。主机解析（别名→凭据）、危险命令拦截、
- *  后台模式语义全部在调用方（ssh.ts / sshUpload.ts / sshDownload.ts）处理，
- *  这里不掺业务判断，方便测试用假实现替换（见 createSshTool 系列的 DI 参数）。
- * ============================================================
- */
-
-import { readFile } from 'node:fs/promises';
-import { posix } from 'node:path';
-import { Client, type ConnectConfig, type SFTPWrapper } from 'ssh2';
-
-import type { SshHostConfig } from '../../context/sshHosts.js';
-import { DEFAULT_MAX_RESULT_SIZE_CHARS } from '../types.js';
-
-/** 三个 SSH 工具（exec/upload/download）共用的默认超时——唯一真值。 */
-export const DEFAULT_SSH_TIMEOUT_MS = 30_000;
-
-/**
- * exec() 累积 stdout/stderr 时的内存安全上限（字符，每路各自）——远程命令狂输出
- * （如误连到日志尾/`cat` 大文件）时防止字符串无限增长撑爆内存。跟 Bash 工具的
- * `MAX_STREAM_BUFFER_CHARS` 同一思路：取展示层截断阈值（`ssh.ts` 里做）的 2 倍，
- * 正常输出不受影响。这里只做内存兜底，不做背压/归档——那是业务逻辑，本文件按头注
- * 原则不掺（真要背压得像 Bash 那样接 `ToolOutputStore`，成本对协议薄封装层不划算）。
- */
-const MAX_EXEC_BUFFER_CHARS = DEFAULT_MAX_RESULT_SIZE_CHARS * 2;
-
-function appendCapped(current: string, chunk: string, capChars: number): string {
-  if (current.length >= capChars) return current;
-  const combined = current + chunk;
-  return combined.length > capChars ? combined.slice(0, capChars) : combined;
-}
-
-/** 专门区分「执行超时」与其它失败（认证/网络错误）——background 模式要能识别前者。 */
-export class SshExecTimeoutError extends Error {
-  /** 超时发生前已经收到的部分输出（exec 用）——调用方可选择性地把它带给模型，而不是整段丢弃。 */
-  readonly partialStdout?: string;
-  readonly partialStderr?: string;
-
-  constructor(timeoutMs: number, partial?: { stdout: string; stderr: string }) {
-    super(`执行超时（${timeoutMs}ms）`);
-    this.name = 'SshExecTimeoutError';
-    this.partialStdout = partial?.stdout;
-    this.partialStderr = partial?.stderr;
-  }
-}
-
-export interface SshExecResult {
-  stdout: string;
-  stderr: string;
-  code: number | null;
-  signal: string | null;
-}
-
-export interface SshConnection {
-  exec(command: string, timeoutMs: number): Promise<SshExecResult>;
-  /** 上传本地文件到远程路径，返回写入的字节数。超时会中断连接并抛 SshExecTimeoutError（与 exec 同语义）。 */
-  put(localPath: string, remotePath: string, timeoutMs: number): Promise<number>;
-  /** 从远程路径下载到本地文件，返回写入的字节数。超时会中断连接并抛 SshExecTimeoutError（与 exec 同语义）。 */
-  get(remotePath: string, localPath: string, timeoutMs: number): Promise<number>;
-  end(): void;
-}
-
-/** 主循环/工具注入的连接工厂类型——测试用假实现替换，避免真的打网络。 */
-export type SshConnectImpl = (host: SshHostConfig, connectTimeoutMs: number) => Promise<SshConnection>;
-
-async function buildConnectConfig(host: SshHostConfig, connectTimeoutMs: number): Promise<ConnectConfig> {
-  const base: ConnectConfig = {
-    host: host.host,
-    port: host.port,
-    username: host.username,
-    readyTimeout: connectTimeoutMs,
-  };
-  if (host.authMethod === 'password') return { ...base, password: host.password };
-  const privateKey = await readFile(host.privateKeyPath!);
-  return { ...base, privateKey, ...(host.passphrase ? { passphrase: host.passphrase } : {}) };
-}
-
-/**
- * 逐级 mkdir 出 remotePath 的父目录（SFTP 没有 `mkdir -p`，ssh2 的 `sftp.mkdir` 一次只建一层）。
- * 每一级都直接 mkdir、忽略错误（多数情况下是"已存在"）——不去解析具体 SFTP 错误码区分
- * "已存在" vs "无权限"：无权限时 mkdir 静默失败，紧随其后的 fastPut 会用清楚得多的错误
- * 报出真实原因，没必要在这里重复判断一遍。
- */
-function sftpMkdirParents(sftp: SFTPWrapper, remotePath: string): Promise<void> {
-  const dir = posix.dirname(remotePath);
-  if (dir === '.' || dir === '/' || dir === '') return Promise.resolve();
-  const absolute = dir.startsWith('/');
-  const segments = dir.split('/').filter(Boolean);
-  let current = '';
-  let chain: Promise<void> = Promise.resolve();
-  for (const seg of segments) {
-    current += `/${seg}`;
-    const path = absolute ? current : current.slice(1);
-    chain = chain.then(() => new Promise<void>((resolve) => sftp.mkdir(path, () => resolve())));
-  }
-  return chain;
-}
-
-/** 导出仅供单测直接驱动（绕开真实 ssh2.Client 网络连接，喂假 exec/sftp 回调验证超时与 mkdir-parents 行为）。 */
-export function wrapConnection(conn: Client): SshConnection {
-  return {
-    exec(command, timeoutMs) {
-      return new Promise((resolvePromise, rejectPromise) => {
-        let stdout = '';
-        let stderr = '';
-        const timer = setTimeout(() => {
-          conn.end();
-          rejectPromise(new SshExecTimeoutError(timeoutMs, { stdout, stderr }));
-        }, timeoutMs);
-        conn.exec(command, (execError, stream) => {
-          if (execError) {
-            clearTimeout(timer);
-            rejectPromise(execError);
-            return;
-          }
-          stream
-            .on('close', (code: number | null, signal: string | null) => {
-              clearTimeout(timer);
-              resolvePromise({ stdout, stderr, code, signal: signal ?? null });
-            })
-            .on('data', (data: Buffer) => { stdout = appendCapped(stdout, data.toString('utf8'), MAX_EXEC_BUFFER_CHARS); })
-            .stderr.on('data', (data: Buffer) => { stderr = appendCapped(stderr, data.toString('utf8'), MAX_EXEC_BUFFER_CHARS); });
-        });
-      });
-    },
-    put(localPath, remotePath, timeoutMs) {
-      return new Promise((resolvePromise, rejectPromise) => {
-        const timer = setTimeout(() => {
-          conn.end();
-          rejectPromise(new SshExecTimeoutError(timeoutMs));
-        }, timeoutMs);
-        conn.sftp((sftpError, sftp) => {
-          if (sftpError) { clearTimeout(timer); rejectPromise(sftpError); return; }
-          sftpMkdirParents(sftp, remotePath)
-            .then(() => {
-              sftp.fastPut(localPath, remotePath, (putError) => {
-                if (putError) { clearTimeout(timer); rejectPromise(putError); return; }
-                sftp.stat(remotePath, (statError, stats) => {
-                  clearTimeout(timer);
-                  resolvePromise(statError ? 0 : stats.size);
-                });
-              });
-            })
-            // sftp.mkdir 的回调本身吞错误恒 resolve（见 sftpMkdirParents 头注），这里防的是
-            // 更早一层：sftp 连接在 mkdir 期间掉线导致同步抛出——没有这个 catch，链路会挂成
-            // 未处理 rejection，外层 Promise 只能干等到 timer 触发，模型看到的是「执行超时」
-            // 而不是真实的连接错误。
-            .catch((mkdirError: unknown) => { clearTimeout(timer); rejectPromise(mkdirError); });
-        });
-      });
-    },
-    get(remotePath, localPath, timeoutMs) {
-      return new Promise((resolvePromise, rejectPromise) => {
-        const timer = setTimeout(() => {
-          conn.end();
-          rejectPromise(new SshExecTimeoutError(timeoutMs));
-        }, timeoutMs);
-        conn.sftp((sftpError, sftp) => {
-          if (sftpError) { clearTimeout(timer); rejectPromise(sftpError); return; }
-          sftp.fastGet(remotePath, localPath, (getError) => {
-            if (getError) { clearTimeout(timer); rejectPromise(getError); return; }
-            sftp.stat(remotePath, (statError, stats) => {
-              clearTimeout(timer);
-              resolvePromise(statError ? 0 : stats.size);
-            });
-          });
-        });
-      });
-    },
-    end() {
-      conn.end();
-    },
-  };
-}
-
-/** 生产环境的真实连接实现——测试通过 DI 参数注入假实现，不经过这里。 */
-export const defaultSshConnect: SshConnectImpl = async (host, connectTimeoutMs) => {
-  const config = await buildConnectConfig(host, connectTimeoutMs);
-  return new Promise((resolvePromise, rejectPromise) => {
-    const conn = new Client();
-    conn
-      .on('ready', () => resolvePromise(wrapConnection(conn)))
-      .on('error', (error) => rejectPromise(error))
-      .connect(config);
-  });
-};

package/src/tools/ssh/sshDownload.js

@@ -1,77 +0,0 @@
-/**
- * ============================================================
- *  src/tools/ssh/sshDownload.ts —— SSHDownload：远程主机 → 本地文件（SFTP）
- * ------------------------------------------------------------
- *  拆成独立工具名的理由同 sshUpload.ts 头注。落盘用临时文件 + rename 做到
- *  原子性——SFTP 流式写入中途失败时不留半个文件覆盖已有内容。
- * ============================================================
- */
-import { randomUUID } from 'node:crypto';
-import { mkdir, rename, rm } from 'node:fs/promises';
-import { dirname } from 'node:path';
-import { z } from 'zod';
-import { resolveSshHost } from '../../context/sshHosts.js';
-import { CONFIG_LIMITS } from '../../config/numericLimits.js';
-import { resolveToolPath } from '../shared/fileUtils.js';
-import { toToolParameters } from '../../utils/zodToJson.js';
-import { resolveSshToolAvailability } from './sshAvailability.js';
-import { DEFAULT_SSH_TIMEOUT_MS, defaultSshConnect, SshExecTimeoutError } from './sshClient.js';
-const inputSchema = z.object({
-    host: z.string().optional().describe('已配置的 SSH 主机别名；不填则使用该工作区的默认主机'),
-    remotePath: z.string().min(1).describe('远程源路径（远程文件系统语义，不做本地锚定）'),
-    localPath: z.string().min(1).describe('本地落盘路径（相对路径基于 working dir 解析；会覆盖已存在的同名文件）'),
-    timeoutMs: z.number().int().min(CONFIG_LIMITS.sshTimeoutMs.min).max(CONFIG_LIMITS.sshTimeoutMs.max).optional()
-        .describe('本次传输超时（毫秒），默认 30000'),
-});
-async function callWith(input, signal, context, resolveHost, connectImpl) {
-    const workspaceId = context?.workspaceId;
-    if (!workspaceId) {
-        return { ok: false, error: '当前运行环境没有工作区身份，无法解析 SSH 主机配置（SSH 主机按工作区隔离存储）。', recovery: 'none' };
-    }
-    const local = resolveToolPath(input.localPath);
-    if (!local.ok)
-        return local;
-    const resolved = await resolveHost(workspaceId, input.host);
-    if (!resolved.ok)
-        return { ok: false, error: resolved.error, recovery: 'change-input' };
-    const host = resolved.host;
-    const timeoutMs = input.timeoutMs ?? host.timeoutMs ?? DEFAULT_SSH_TIMEOUT_MS;
-    let connection;
-    try {
-        connection = await connectImpl(host, timeoutMs);
-    }
-    catch (error) {
-        return { ok: false, error: `连接主机 "${host.alias}" 失败：${error instanceof Error ? error.message : String(error)}`, recovery: 'retry' };
-    }
-    const tmpPath = `${local.resolvedPath}.${randomUUID()}.minimal-agent-ssh.tmp`;
-    try {
-        await mkdir(dirname(local.resolvedPath), { recursive: true });
-        const bytes = await connection.get(input.remotePath, tmpPath, timeoutMs);
-        await rename(tmpPath, local.resolvedPath);
-        return { ok: true, content: `已下载 ${host.alias}:${input.remotePath} → ${input.localPath}（${bytes} 字节）`, sensitivity: 'local' };
-    }
-    catch (error) {
-        await rm(tmpPath, { force: true }).catch(() => { });
-        if (signal?.aborted)
-            return { ok: false, error: 'SSH 下载已取消', recovery: 'none' };
-        if (error instanceof SshExecTimeoutError)
-            return { ok: false, error: error.message, recovery: 'retry' };
-        return { ok: false, error: `从 "${host.alias}" 下载失败：${error instanceof Error ? error.message : String(error)}`, recovery: 'retry' };
-    }
-    finally {
-        connection.end();
-    }
-}
-export function createSshDownloadTool(resolveHost = resolveSshHost, connectImpl = defaultSshConnect) {
-    return {
-        name: 'SSHDownload',
-        description: '通过 SFTP 把远程 SSH 主机上的文件下载到本地。主机由用户在 /config → 远程主机(SSH) 中配置，按当前工作区隔离；不确定有哪些主机时先调用 SSHHosts。',
-        inputSchema,
-        parameters: toToolParameters(inputSchema),
-        isReadOnly: false,
-        resolveAvailability: resolveSshToolAvailability,
-        call: (input, signal) => callWith(input, signal, undefined, resolveHost, connectImpl),
-        callWithContext: (input, signal, context) => callWith(input, signal, context, resolveHost, connectImpl),
-    };
-}
-export const sshDownloadTool = createSshDownloadTool();

package/src/tools/ssh/sshDownload.ts

@@ -1,92 +0,0 @@
-/**
- * ============================================================
- *  src/tools/ssh/sshDownload.ts —— SSHDownload：远程主机 → 本地文件（SFTP）
- * ------------------------------------------------------------
- *  拆成独立工具名的理由同 sshUpload.ts 头注。落盘用临时文件 + rename 做到
- *  原子性——SFTP 流式写入中途失败时不留半个文件覆盖已有内容。
- * ============================================================
- */
-
-import { randomUUID } from 'node:crypto';
-import { mkdir, rename, rm } from 'node:fs/promises';
-import { dirname } from 'node:path';
-
-import { z } from 'zod';
-
-import { resolveSshHost } from '../../context/sshHosts.js';
-import type { Tool, ToolCallContext, ToolResult } from '../../types.js';
-import { CONFIG_LIMITS } from '../../config/numericLimits.js';
-import { resolveToolPath } from '../shared/fileUtils.js';
-import { toToolParameters } from '../../utils/zodToJson.js';
-import { resolveSshToolAvailability } from './sshAvailability.js';
-import { DEFAULT_SSH_TIMEOUT_MS, defaultSshConnect, SshExecTimeoutError, type SshConnectImpl } from './sshClient.js';
-
-const inputSchema = z.object({
-  host: z.string().optional().describe('已配置的 SSH 主机别名；不填则使用该工作区的默认主机'),
-  remotePath: z.string().min(1).describe('远程源路径（远程文件系统语义，不做本地锚定）'),
-  localPath: z.string().min(1).describe('本地落盘路径（相对路径基于 working dir 解析；会覆盖已存在的同名文件）'),
-  timeoutMs: z.number().int().min(CONFIG_LIMITS.sshTimeoutMs.min).max(CONFIG_LIMITS.sshTimeoutMs.max).optional()
-    .describe('本次传输超时（毫秒），默认 30000'),
-});
-
-type SshDownloadInput = z.infer<typeof inputSchema>;
-
-async function callWith(
-  input: SshDownloadInput,
-  signal: AbortSignal | undefined,
-  context: ToolCallContext | undefined,
-  resolveHost: typeof resolveSshHost,
-  connectImpl: SshConnectImpl,
-): Promise<ToolResult> {
-  const workspaceId = context?.workspaceId;
-  if (!workspaceId) {
-    return { ok: false, error: '当前运行环境没有工作区身份，无法解析 SSH 主机配置（SSH 主机按工作区隔离存储）。', recovery: 'none' };
-  }
-  const local = resolveToolPath(input.localPath);
-  if (!local.ok) return local;
-
-  const resolved = await resolveHost(workspaceId, input.host);
-  if (!resolved.ok) return { ok: false, error: resolved.error, recovery: 'change-input' };
-  const host = resolved.host;
-  const timeoutMs = input.timeoutMs ?? host.timeoutMs ?? DEFAULT_SSH_TIMEOUT_MS;
-
-  let connection;
-  try {
-    connection = await connectImpl(host, timeoutMs);
-  } catch (error) {
-    return { ok: false, error: `连接主机 "${host.alias}" 失败：${error instanceof Error ? error.message : String(error)}`, recovery: 'retry' };
-  }
-
-  const tmpPath = `${local.resolvedPath}.${randomUUID()}.minimal-agent-ssh.tmp`;
-  try {
-    await mkdir(dirname(local.resolvedPath), { recursive: true });
-    const bytes = await connection.get(input.remotePath, tmpPath, timeoutMs);
-    await rename(tmpPath, local.resolvedPath);
-    return { ok: true, content: `已下载 ${host.alias}:${input.remotePath} → ${input.localPath}（${bytes} 字节）`, sensitivity: 'local' };
-  } catch (error) {
-    await rm(tmpPath, { force: true }).catch(() => {});
-    if (signal?.aborted) return { ok: false, error: 'SSH 下载已取消', recovery: 'none' };
-    if (error instanceof SshExecTimeoutError) return { ok: false, error: error.message, recovery: 'retry' };
-    return { ok: false, error: `从 "${host.alias}" 下载失败：${error instanceof Error ? error.message : String(error)}`, recovery: 'retry' };
-  } finally {
-    connection.end();
-  }
-}
-
-export function createSshDownloadTool(
-  resolveHost: typeof resolveSshHost = resolveSshHost,
-  connectImpl: SshConnectImpl = defaultSshConnect,
-): Tool<SshDownloadInput> {
-  return {
-    name: 'SSHDownload',
-    description: '通过 SFTP 把远程 SSH 主机上的文件下载到本地。主机由用户在 /config → 远程主机(SSH) 中配置，按当前工作区隔离；不确定有哪些主机时先调用 SSHHosts。',
-    inputSchema,
-    parameters: toToolParameters(inputSchema),
-    isReadOnly: false,
-    resolveAvailability: resolveSshToolAvailability,
-    call: (input, signal) => callWith(input, signal, undefined, resolveHost, connectImpl),
-    callWithContext: (input, signal, context) => callWith(input, signal, context, resolveHost, connectImpl),
-  };
-}
-
-export const sshDownloadTool = createSshDownloadTool();

package/src/tools/ssh/sshHostsTool.js

@@ -1,36 +0,0 @@
-/**
- * ============================================================
- *  src/tools/ssh/sshHostsTool.ts —— SSHHosts：列出当前工作区已配置的 SSH 主机
- * ------------------------------------------------------------
- *  存在的理由：Tool.description 只能是字符串或无参函数（同步、拿不到
- *  workspaceId），没法把"当前工作区配置了哪些主机"实时渲染进静态描述——
- *  主机列表按工作区隔离且可随时增删，唯一正确的做法是让模型按需查询一次，
- *  而不是塞一份可能已经过期、还可能读到别的工作区数据的静态文案。
- *  只读、不带密码，随时可调用。
- * ============================================================
- */
-import { z } from 'zod';
-import { describeSshHosts } from '../../context/sshHosts.js';
-import { toToolParameters } from '../../utils/zodToJson.js';
-import { resolveSshToolAvailability } from './sshAvailability.js';
-const inputSchema = z.object({});
-async function callWith(_input, context, describe) {
-    const workspaceId = context?.workspaceId;
-    if (!workspaceId) {
-        return { ok: false, error: '当前运行环境没有工作区身份，无法解析 SSH 主机配置（SSH 主机按工作区隔离存储）。', recovery: 'none' };
-    }
-    return { ok: true, content: await describe(workspaceId), sensitivity: 'local' };
-}
-export function createSshHostsTool(describe = describeSshHosts) {
-    return {
-        name: 'SSHHosts',
-        description: '列出当前工作区在 /config → 远程主机(SSH) 中配置的 SSH 主机别名（不含密码），用于在调用 SSH/SSHUpload/SSHDownload 前确认可用主机。',
-        inputSchema,
-        parameters: toToolParameters(inputSchema),
-        isReadOnly: true,
-        resolveAvailability: resolveSshToolAvailability,
-        call: (input) => callWith(input, undefined, describe),
-        callWithContext: (input, _signal, context) => callWith(input, context, describe),
-    };
-}
-export const sshHostsTool = createSshHostsTool();

package/src/tools/ssh/sshHostsTool.ts

@@ -1,48 +0,0 @@
-/**
- * ============================================================
- *  src/tools/ssh/sshHostsTool.ts —— SSHHosts：列出当前工作区已配置的 SSH 主机
- * ------------------------------------------------------------
- *  存在的理由：Tool.description 只能是字符串或无参函数（同步、拿不到
- *  workspaceId），没法把"当前工作区配置了哪些主机"实时渲染进静态描述——
- *  主机列表按工作区隔离且可随时增删，唯一正确的做法是让模型按需查询一次，
- *  而不是塞一份可能已经过期、还可能读到别的工作区数据的静态文案。
- *  只读、不带密码，随时可调用。
- * ============================================================
- */
-
-import { z } from 'zod';
-
-import { describeSshHosts } from '../../context/sshHosts.js';
-import type { Tool, ToolCallContext, ToolResult } from '../../types.js';
-import { toToolParameters } from '../../utils/zodToJson.js';
-import { resolveSshToolAvailability } from './sshAvailability.js';
-
-const inputSchema = z.object({});
-type SshHostsInput = z.infer<typeof inputSchema>;
-
-async function callWith(
-  _input: SshHostsInput,
-  context: ToolCallContext | undefined,
-  describe: typeof describeSshHosts,
-): Promise<ToolResult> {
-  const workspaceId = context?.workspaceId;
-  if (!workspaceId) {
-    return { ok: false, error: '当前运行环境没有工作区身份，无法解析 SSH 主机配置（SSH 主机按工作区隔离存储）。', recovery: 'none' };
-  }
-  return { ok: true, content: await describe(workspaceId), sensitivity: 'local' };
-}
-
-export function createSshHostsTool(describe: typeof describeSshHosts = describeSshHosts): Tool<SshHostsInput> {
-  return {
-    name: 'SSHHosts',
-    description: '列出当前工作区在 /config → 远程主机(SSH) 中配置的 SSH 主机别名（不含密码），用于在调用 SSH/SSHUpload/SSHDownload 前确认可用主机。',
-    inputSchema,
-    parameters: toToolParameters(inputSchema),
-    isReadOnly: true,
-    resolveAvailability: resolveSshToolAvailability,
-    call: (input) => callWith(input, undefined, describe),
-    callWithContext: (input, _signal, context) => callWith(input, context, describe),
-  };
-}
-
-export const sshHostsTool = createSshHostsTool();

package/src/tools/ssh/sshUpload.js

@@ -1,72 +0,0 @@
-/**
- * ============================================================
- *  src/tools/ssh/sshUpload.ts —— SSHUpload：本地文件 → 远程主机（SFTP）
- * ------------------------------------------------------------
- *  与 SSH（exec）/SSHDownload 拆成独立工具名而不是一个 action 字段：
- *  本地/远程路径的语义在上传和下载之间是反的，合并成一个 schema 会引入
- *  「当前 action 下 localPath 到底是读还是写」的歧义；拆开还让宿主 toolGate
- *  能按操作粒度分别放行（例如允许下载但拦截上传）。
- * ============================================================
- */
-import { z } from 'zod';
-import { resolveSshHost } from '../../context/sshHosts.js';
-import { CONFIG_LIMITS } from '../../config/numericLimits.js';
-import { resolveToolPath } from '../shared/fileUtils.js';
-import { toToolParameters } from '../../utils/zodToJson.js';
-import { resolveSshToolAvailability } from './sshAvailability.js';
-import { DEFAULT_SSH_TIMEOUT_MS, defaultSshConnect, SshExecTimeoutError } from './sshClient.js';
-const inputSchema = z.object({
-    host: z.string().optional().describe('已配置的 SSH 主机别名；不填则使用该工作区的默认主机'),
-    localPath: z.string().min(1).describe('本地文件路径（相对路径基于 working dir 解析）'),
-    remotePath: z.string().min(1).describe('远程目标路径（远程文件系统语义，不做本地锚定）'),
-    timeoutMs: z.number().int().min(CONFIG_LIMITS.sshTimeoutMs.min).max(CONFIG_LIMITS.sshTimeoutMs.max).optional()
-        .describe('本次传输超时（毫秒），默认 30000'),
-});
-async function callWith(input, signal, context, resolveHost, connectImpl) {
-    const workspaceId = context?.workspaceId;
-    if (!workspaceId) {
-        return { ok: false, error: '当前运行环境没有工作区身份，无法解析 SSH 主机配置（SSH 主机按工作区隔离存储）。', recovery: 'none' };
-    }
-    const local = resolveToolPath(input.localPath);
-    if (!local.ok)
-        return local;
-    const resolved = await resolveHost(workspaceId, input.host);
-    if (!resolved.ok)
-        return { ok: false, error: resolved.error, recovery: 'change-input' };
-    const host = resolved.host;
-    const timeoutMs = input.timeoutMs ?? host.timeoutMs ?? DEFAULT_SSH_TIMEOUT_MS;
-    let connection;
-    try {
-        connection = await connectImpl(host, timeoutMs);
-    }
-    catch (error) {
-        return { ok: false, error: `连接主机 "${host.alias}" 失败：${error instanceof Error ? error.message : String(error)}`, recovery: 'retry' };
-    }
-    try {
-        const bytes = await connection.put(local.resolvedPath, input.remotePath, timeoutMs);
-        return { ok: true, content: `已上传 ${input.localPath} → ${host.alias}:${input.remotePath}（${bytes} 字节）`, sensitivity: 'local' };
-    }
-    catch (error) {
-        if (signal?.aborted)
-            return { ok: false, error: 'SSH 上传已取消', recovery: 'none' };
-        if (error instanceof SshExecTimeoutError)
-            return { ok: false, error: error.message, recovery: 'retry' };
-        return { ok: false, error: `上传到 "${host.alias}" 失败：${error instanceof Error ? error.message : String(error)}`, recovery: 'retry' };
-    }
-    finally {
-        connection.end();
-    }
-}
-export function createSshUploadTool(resolveHost = resolveSshHost, connectImpl = defaultSshConnect) {
-    return {
-        name: 'SSHUpload',
-        description: '通过 SFTP 把本地文件上传到已配置的远程 SSH 主机。主机由用户在 /config → 远程主机(SSH) 中配置，按当前工作区隔离；不确定有哪些主机时先调用 SSHHosts。',
-        inputSchema,
-        parameters: toToolParameters(inputSchema),
-        isReadOnly: false,
-        resolveAvailability: resolveSshToolAvailability,
-        call: (input, signal) => callWith(input, signal, undefined, resolveHost, connectImpl),
-        callWithContext: (input, signal, context) => callWith(input, signal, context, resolveHost, connectImpl),
-    };
-}
-export const sshUploadTool = createSshUploadTool();

package/src/tools/ssh/sshUpload.ts

@@ -1,85 +0,0 @@
-/**
- * ============================================================
- *  src/tools/ssh/sshUpload.ts —— SSHUpload：本地文件 → 远程主机（SFTP）
- * ------------------------------------------------------------
- *  与 SSH（exec）/SSHDownload 拆成独立工具名而不是一个 action 字段：
- *  本地/远程路径的语义在上传和下载之间是反的，合并成一个 schema 会引入
- *  「当前 action 下 localPath 到底是读还是写」的歧义；拆开还让宿主 toolGate
- *  能按操作粒度分别放行（例如允许下载但拦截上传）。
- * ============================================================
- */
-
-import { z } from 'zod';
-
-import { resolveSshHost } from '../../context/sshHosts.js';
-import type { Tool, ToolCallContext, ToolResult } from '../../types.js';
-import { CONFIG_LIMITS } from '../../config/numericLimits.js';
-import { resolveToolPath } from '../shared/fileUtils.js';
-import { toToolParameters } from '../../utils/zodToJson.js';
-import { resolveSshToolAvailability } from './sshAvailability.js';
-import { DEFAULT_SSH_TIMEOUT_MS, defaultSshConnect, SshExecTimeoutError, type SshConnectImpl } from './sshClient.js';
-
-const inputSchema = z.object({
-  host: z.string().optional().describe('已配置的 SSH 主机别名；不填则使用该工作区的默认主机'),
-  localPath: z.string().min(1).describe('本地文件路径（相对路径基于 working dir 解析）'),
-  remotePath: z.string().min(1).describe('远程目标路径（远程文件系统语义，不做本地锚定）'),
-  timeoutMs: z.number().int().min(CONFIG_LIMITS.sshTimeoutMs.min).max(CONFIG_LIMITS.sshTimeoutMs.max).optional()
-    .describe('本次传输超时（毫秒），默认 30000'),
-});
-
-type SshUploadInput = z.infer<typeof inputSchema>;
-
-async function callWith(
-  input: SshUploadInput,
-  signal: AbortSignal | undefined,
-  context: ToolCallContext | undefined,
-  resolveHost: typeof resolveSshHost,
-  connectImpl: SshConnectImpl,
-): Promise<ToolResult> {
-  const workspaceId = context?.workspaceId;
-  if (!workspaceId) {
-    return { ok: false, error: '当前运行环境没有工作区身份，无法解析 SSH 主机配置（SSH 主机按工作区隔离存储）。', recovery: 'none' };
-  }
-  const local = resolveToolPath(input.localPath);
-  if (!local.ok) return local;
-
-  const resolved = await resolveHost(workspaceId, input.host);
-  if (!resolved.ok) return { ok: false, error: resolved.error, recovery: 'change-input' };
-  const host = resolved.host;
-  const timeoutMs = input.timeoutMs ?? host.timeoutMs ?? DEFAULT_SSH_TIMEOUT_MS;
-
-  let connection;
-  try {
-    connection = await connectImpl(host, timeoutMs);
-  } catch (error) {
-    return { ok: false, error: `连接主机 "${host.alias}" 失败：${error instanceof Error ? error.message : String(error)}`, recovery: 'retry' };
-  }
-  try {
-    const bytes = await connection.put(local.resolvedPath, input.remotePath, timeoutMs);
-    return { ok: true, content: `已上传 ${input.localPath} → ${host.alias}:${input.remotePath}（${bytes} 字节）`, sensitivity: 'local' };
-  } catch (error) {
-    if (signal?.aborted) return { ok: false, error: 'SSH 上传已取消', recovery: 'none' };
-    if (error instanceof SshExecTimeoutError) return { ok: false, error: error.message, recovery: 'retry' };
-    return { ok: false, error: `上传到 "${host.alias}" 失败：${error instanceof Error ? error.message : String(error)}`, recovery: 'retry' };
-  } finally {
-    connection.end();
-  }
-}
-
-export function createSshUploadTool(
-  resolveHost: typeof resolveSshHost = resolveSshHost,
-  connectImpl: SshConnectImpl = defaultSshConnect,
-): Tool<SshUploadInput> {
-  return {
-    name: 'SSHUpload',
-    description: '通过 SFTP 把本地文件上传到已配置的远程 SSH 主机。主机由用户在 /config → 远程主机(SSH) 中配置，按当前工作区隔离；不确定有哪些主机时先调用 SSHHosts。',
-    inputSchema,
-    parameters: toToolParameters(inputSchema),
-    isReadOnly: false,
-    resolveAvailability: resolveSshToolAvailability,
-    call: (input, signal) => callWith(input, signal, undefined, resolveHost, connectImpl),
-    callWithContext: (input, signal, context) => callWith(input, signal, context, resolveHost, connectImpl),
-  };
-}
-
-export const sshUploadTool = createSshUploadTool();