@zhangfengshun/dsh-remote-ssh 2.1.6 → 2.1.7

package/CHANGELOG.md

@@ -2,6 +2,49 @@
 
 本文件的版本号与 `package.json` 的 `version` 保持一致。每个版本对应一个 Cordis Package 快照（`pkg-N`）。
 
+## [2.1.7] — 兼容 DSH Desktop ≥ 2.0.4：polyfill __DSH_MODULES__ + 可靠性/安全修复
+### 修复
+- **__DSH_MODULES__ polyfill**：better-sidebar 0.15+ 的懒加载 chunk（编辑器等）依赖 `globalThis.__DSH_MODULES__`，而 DSH Desktop ≥ 2.0.4 的 shell 不再挂载该全局，导致侧边栏面板打不开（"chunk ... client module system unavailable"）。Client 半边启动时用内核 `modules` 服务补挂该全局（better-sidebar 已注入则保持原值），并带定期兜底重试。
+- **持久会话 stderr 排空**：SSH 会话的 stderr 管道此前无人消费，写满后远端 ssh 进程阻塞、会话假死；现在持续排空并保留最近 64KB，会话意外关闭时报错会附带最近 stderr 尾部，便于排查断连原因。
+- **修复 `remote_ssh_grep` 命令注入**：`--include` 参数此前未做 shell 转义，可通过构造参数在远端执行任意命令；现已与其它参数一样经 `shellQuote` 引用。
+- **删除连接配置时级联清理**：删除 profile 时同步删除其远程工作区的原生注册与本地镜像目录（复用统一的 `cleanupWorkspace`），不再留下指向已删配置的孤儿工作区。
+- **密钥路径支持 `~` 展开**：`keyPath` 按 `~`、`~/` 前缀展开为绝对路径，与设置界面占位符（`~/.ssh/id_rsa`）行为一致。
+- **会话池 key 纳入认证信息**：修改连接配置的 keyPath/authMethod 后立即重建 SSH 会话，不再复用旧连接。
+- 清理每次文件请求的 `console.log` 调试输出（改走 `ctx.logger.debug`）；`localToRemote` 对镜像目录之外的路径不再静默拼出错误远程路径。
+- 文档：补全 2.1.0 以来缺失的 CHANGELOG 条目；README 安装命令版本号同步为 2.1.7。
+
+## [2.1.6] — P0 打磨：远程下载 / 流式上传完善 / 远程 Git / 重连
+### 修复 / 改进
+- **远程文件下载与媒体预览**：拦截 better-sidebar 的 `/sidebar/file`（同路径 exact 路由优先），远程工作区中的文件直接从远端 base64 拉回（上限 64MB），本地照旧。
+- **流式上传**：`/remote-ssh/upload` 把请求体直接管道到远端 `cat > target`（二进制安全、恒定内存），请求中断时终止远端进程。
+- **远程 Git 面板**：拦截 `/sidebar/api/git.*`（status/diff/log/branch/commit-diff/show/stage/unstage/commit/checkout/discard/revert/cherry-pick），远程工作区中在远端目录执行同语义 git 命令。
+- **SSH 失败修复建议**：端口转发占用 / 公钥认证失败 / 连接拒绝 / 超时 / 域名解析失败翻译为带修复建议的中文提示。
+
+## [2.1.5] — 同步 better-sidebar 0.15+ 上传到远程工作区
+### 修复
+- better-sidebar 0.15+ 的上传 UI 直连 `/sidebar/upload`，远程工作区镜像目录会导致文件只落在本地镜像。Client 半边包装 `fetch`：目标目录位于远程工作区镜像内时把上传重定向到 `/remote-ssh/upload`，经 SSH 直接写远端。
+
+## [2.1.4] — 修复远程工作区标题卡在镜像目录名
+### 修复
+- `workspaceRegistry.create` 只对新建记录应用 title，旧工作区（早期版本未传 title）标题卡在镜像目录名（如 `wmt3tev5cdfge`）。创建时显式 `setTitle`，并新增启动自愈 `healWorkspaceTitles`（仅在标题等于镜像目录 basename 时修复，不覆盖用户自定义标题）。
+
+## [2.1.3] — 远程工作区标题默认取远程路径最后一段
+### 改进
+- 创建远程工作区时的默认标题改为远程路径最后一段目录名（如 `~/run/zfs/codex/DSH_Test → DSH_Test`），取不到有效段时回退为 `连接名:远程路径`；原生工作区标题带 🌐 前缀。
+
+## [2.1.2] — 修复 ssh config RemoteForward 端口占用导致连接失败
+### 修复
+- 插件内部连接（文件读写 / 工具 / 同步）追加 `ClearAllForwardings=yes`；shell wrapper 追加 `ExitOnForwardFailure=no`。`~/.ssh/config` 里的 `RemoteForward` 端口被上次会话占用且 `ExitOnForwardFailure yes` 时不再导致连接直接失败。
+- 把 SSH 常见失败（端口转发占用 / 公钥认证失败 / 连接拒绝 / 超时 / 域名解析失败）翻译成带修复建议的中文提示。
+
+## [2.1.1] — 新增英文 README
+### 文档
+- 新增 README_EN.md，中英文版本互链。
+
+## [2.1.0] — README 拆分语言版本
+### 文档
+- 移除 README 内联双语，拆分为 README.md（中文）与 README_EN.md（英文）。
+
 ## [2.0.1] — 修复远程检测：从 payload.path 也查找 .remote-ssh.json
 ### 修复
 - **sessionCwd 为空时无法检测远程工作区**：客户端请求有时只带 `payload.path` 不带 `cwd`，而 `ctx.sessions.get(sessionId)` 可能返回 undefined（session 未创建或 ID 不匹配）。现改为：先尝试 `sessionCwd`，再尝试 `payload.path`，两者都会检查 `.remote-ssh.json`。

package/README.md

@@ -17,7 +17,7 @@
 ## 安装
 
 ```bash
-dsh plugin --profile <name> add @zhangfengshun/dsh-remote-ssh@2.1.0
+dsh plugin --profile <name> add @zhangfengshun/dsh-remote-ssh@2.1.7
 ```
 
 > 安装后需**重启 DSH**。`@zhangfengshun/dsh-remote-ssh` 必须在 bundles 列表中排在 `dsh-better-sidebar` **之后**。

package/README_EN.md

@@ -0,0 +1,67 @@
+# @zhangfengshun/dsh-remote-ssh
+
+English | [中文](./README.md)
+
+A **DSH** plugin like **VSCode Remote-SSH**: connect to remote HPC / servers via SSH, and directly operate remote files and terminals within DSH's built-in **Files** and **Terminal** sidebar tabs.
+
+## Features
+
+| Feature | Description |
+| --- | --- |
+| 🔌 SSH Connection | Key / password auth, ProxyJump bastion, one-click import from `~/.ssh/config` |
+| 📂 Remote Files | Built-in **Files** tab reads/writes remote files directly via SSH — no sync needed |
+| 💻 Remote Terminal | Built-in **Terminal** tab auto-detects remote workspaces, opens SSH interactive shell |
+| 🌐 Remote Workspace | Select a remote directory to create a native workspace, one-click enter |
+| 🤖 Model Tools | 12 `remote_ssh_*` tools, session-aware with auto-filled connection params |
+
+## Installation
+
+```bash
+dsh plugin --profile <name> add @zhangfengshun/dsh-remote-ssh@2.1.7
+```
+
+> **Restart DSH** after installation. `@zhangfengshun/dsh-remote-ssh` must come **after** `dsh-better-sidebar` in the bundles list.
+
+## Usage
+
+1. **Settings → 🖥️ Remote SSH** → Add a connection (host/port/user/key) → Click "Test Connection"
+2. **Add Workspace** → Choose "Select Remote Directory…" → Pick a connection → Browse and select
+3. Open the built-in **Files** tab → Remote files shown directly, edits save back to remote
+4. Open the built-in **Terminal** tab → Auto SSH to remote host (key auth only)
+
+## Model Tools
+
+| Tool | Purpose |
+| --- | --- |
+| `remote_ssh_profiles` | List saved connections + current session's remote workspace context |
+| `remote_ssh_exec` | Execute remote command |
+| `remote_ssh_ls` | List remote directory |
+| `remote_ssh_cat` | Read remote file |
+| `remote_ssh_write` | Write remote file |
+| `remote_ssh_grep` | Search remote file contents |
+| `remote_ssh_glob` | Find remote files by glob |
+| `remote_ssh_mkdir` | Create remote directory |
+| `remote_ssh_delete` | Delete remote file/directory |
+| `remote_ssh_move` | Move/rename |
+| `remote_ssh_sync` | Sync remote to local mirror |
+| `remote_ssh_push` | Push local mirror back to remote |
+
+In a remote-workspace session, `profileId` and other connection params can be omitted.
+
+## How It Works
+
+The plugin registers 4 exact routes (`/sidebar/api/fs.tree`, `fs.read`, `fs.write`, `fs.search`) that intercept better-sidebar's prefix route. When the session cwd contains `.remote-ssh.json`, requests go through SSH; otherwise local fs. The client sees local mirror paths — the Host transparently translates them to remote paths.
+
+A shell wrapper (`~/.dsh/remote-ssh/dsh-remote-shell[.cmd]`) detects the workspace's `.remote-ssh.json` and auto-launches `ssh -tt`, making the built-in **Terminal** tab transparently connect to remote.
+
+## ❤️ Happy Qixi
+
+This project is a Qixi Festival gift for **zhangyi**.
+
+May it connect us as closely as it connects to distant supercomputers. Happy Qixi ❤️
+
+—— August 18, 2026
+
+## License
+
+[MIT](./LICENSE)

package/lib/client.js

@@ -1063,6 +1063,39 @@ window.__ModuleLoader__.load({
       var slots = ctx.slots;
       var locale = ctx.locale;
 
+      // 兼容 DSH Desktop ≥2.0.4：shell 不再把客户端模块系统挂到
+      // globalThis.__DSH_MODULES__，而 dsh-better-sidebar 0.15+ 的懒加载
+      // chunk（editor 等）会回退到该全局——缺失时侧边栏面板打不开、报
+      // "chunk ... client module system unavailable"。这里用内核提供的
+      // modules 服务补挂该全局；better-sidebar 已注入则保持原值。
+      try {
+        if (typeof globalThis !== "undefined") {
+          var fallbackModules = null;
+          try { if (ctx.modules && typeof ctx.modules.import === "function") fallbackModules = ctx.modules; } catch (e) {}
+          if (!fallbackModules && ctx.get && typeof ctx.get === "function") {
+            try { fallbackModules = ctx.get("modules"); } catch (e) { fallbackModules = null; }
+          }
+          // 定期兜底：better-sidebar 若把本插件应用时间之后的模块系统清掉，也补回。
+          if (globalThis.__DSH_MODULES__ === undefined && fallbackModules === null) {
+            var waitModules = 0;
+            var waitTimer = setInterval(function () {
+              waitModules += 1;
+              try {
+                var ms = (ctx.get && typeof ctx.get === "function") ? ctx.get("modules") : null;
+                if (ms && typeof ms.import === "function") {
+                  globalThis.__DSH_MODULES__ = ms;
+                  clearInterval(waitTimer);
+                }
+              } catch (e) {}
+              if (globalThis.__DSH_MODULES__ !== undefined || waitModules > 40) clearInterval(waitTimer);
+            }, 250);
+          }
+          if (!globalThis.__DSH_MODULES__ && fallbackModules && typeof fallbackModules.import === "function") {
+            globalThis.__DSH_MODULES__ = fallbackModules;
+          }
+        }
+      } catch (e) {}
+
       // 注册中英文词典并绑定当前语言；locale 切换时 i18n.subscribe 触发组件重渲染。
       if (locale) {
         ctx.effect(function () { return locale.register(NS, { zh: zh, en: en }); }, "dsh-remote-ssh: dictionaries");

package/lib/index.js

@@ -176,6 +176,8 @@ class CommandSession {
     this.sentinel = "DSHEOF" + Math.random().toString(36).slice(2, 14) + Math.random().toString(36).slice(2, 10) + "DSHEOF";
     this.lastUsed = Date.now();
     this.connectPromise = null;
+    /** 最近一段 stderr（防背压消费 + 会话关闭诊断）。 */
+    this.errBuf = "";
   }
 
   async connect() {
@@ -189,6 +191,7 @@ class CommandSession {
     if (this.handle) { try { this.handle.terminate(); } catch (e) {} this.handle = null; }
     this.alive = false;
     this.buf = "";
+    this.errBuf = "";
     this.current = null;
     this.queue = [];
     const argv = sshArgv(this.profile, "bash", false);
@@ -203,10 +206,16 @@ class CommandSession {
       this.buf += chunk.toString("utf8");
       this._check();
     });
+    // stderr 必须消费：不挂监听会让管道缓冲填满、远端 ssh 写 stderr 阻塞（会话假死）。
+    // 保留最近 64KB 用于会话关闭时的诊断。
+    h.stderr.on("data", (chunk) => {
+      this.errBuf = (this.errBuf + chunk.toString("utf8")).slice(-65536);
+    });
     const onEnd = () => {
       this.alive = false;
-      if (this.current) { this.current.reject(new Error("ssh 会话已关闭")); this.current = null; }
-      while (this.queue.length) this.queue.shift().reject(new Error("ssh 会话已关闭"));
+      const errMsg = "ssh 会话已关闭" + (this.errBuf.trim() ? ": " + this.errBuf.trim().slice(-300) : "");
+      if (this.current) { this.current.reject(new Error(errMsg)); this.current = null; }
+      while (this.queue.length) this.queue.shift().reject(new Error(errMsg));
     };
     h.stdout.on("end", onEnd);
     h.stdout.on("error", onEnd);
@@ -283,7 +292,7 @@ function sshArgv(p, remoteCmd, tty) {
   // 清除 ssh config 里的 RemoteForward/LocalForward，避免端口被占时连接直接失败。
   opts.push("-o", "ClearAllForwardings=yes");
   if (p.proxyJump) opts.push("-o", "ProxyJump=" + String(p.proxyJump));
-  if (p.authMethod === "key" && p.keyPath) opts.push("-i", p.keyPath);
+  if (p.authMethod === "key" && p.keyPath) opts.push("-i", expandSshPath(p.keyPath));
   const target = String(p.user || "") + "@" + String(p.host || "");
   const head = (p.authMethod === "password" && p.password) ? ["sshpass", "-p", String(p.password)] : [];
   const argv = head.concat(opts, [target]);
@@ -388,7 +397,7 @@ async function remoteGrep(runner, p, pattern, path, opts) {
   const target = path || p.remoteRoot || "~";
   const parts = ["grep", "-rnIE"];
   if (opts.ignoreCase) parts.push("-i");
-  if (opts.include) parts.push("--include=" + String(opts.include));
+  if (opts.include) parts.push("--include=" + shellQuote(String(opts.include)));
   parts.push("--", shellQuote(pattern), shellQuotePath(target));
   const cmd = parts.join(" ");
   const r = await runner(p, cmd, undefined, MAX_BYTES);
@@ -653,7 +662,8 @@ function apply(ctx, config) {
   const sessions = new Map(); // profileKey -> CommandSession
   const SESSION_IDLE_MS = 10 * 60 * 1000;
   function profileKey(p) {
-    return String(p.id) + "|" + String(p.host) + ":" + String(p.port || 22) + "|" + String(p.user || "");
+    // 认证信息变化时应重建会话：修改 keyPath/authMethod 后旧连接不能继续复用。
+    return String(p.id) + "|" + String(p.host) + ":" + String(p.port || 22) + "|" + String(p.user || "") + "|" + String(p.authMethod || "key") + "|" + String(p.keyPath || "");
   }
   function getSession(p) {
     const key = profileKey(p);
@@ -782,6 +792,18 @@ function apply(ctx, config) {
     return base.replace(/\/+$/, "") + "/" + String(path);
   }
 
+  /** 清理远程工作区的原生注册与本地镜像目录（删除工作区或级联删除 profile 时调用）。 */
+  async function cleanupWorkspace(ws) {
+    if (!ws || !ws.mirrorPath) return;
+    if (workspaceRegistry) {
+      try {
+        const entity = await workspaceRegistry.resolveByPath(ws.mirrorPath);
+        if (entity) await workspaceRegistry.delete(entity.id);
+      } catch (e) {}
+    }
+    try { await rm(ws.mirrorPath, { recursive: true, force: true }); } catch (e) {}
+  }
+
   const api = {
     listProfiles: async () => ({ ok: true, profiles: settingsFace.read().profiles }),
     /** 读取本机 ~/.ssh/config 发现的主机（借鉴 Yan-Zero dsh-remote-ssh）。 */
@@ -816,9 +838,12 @@ function apply(ctx, config) {
     deleteProfile: async (args) => {
       const id = args && args.id;
       const profiles = settingsFace.read().profiles.filter((p) => p.id !== id);
+      const orphaned = settingsFace.read().workspaces.filter((w) => w.profileId === id);
       const workspaces = settingsFace.read().workspaces.filter((w) => w.profileId !== id);
       await settingsFace.updateProfiles(profiles);
       await settingsFace.updateWorkspaces(workspaces);
+      // 级联清理：相关远程工作区的原生注册与本地镜像目录一并删除，不留孤儿。
+      for (const ws of orphaned) await cleanupWorkspace(ws);
       return { ok: true, profiles: profiles, workspaces: workspaces };
     },
     testConnection: async (args) => {
@@ -891,15 +916,7 @@ function apply(ctx, config) {
       const ws = all.find((w) => w.id === id);
       const workspaces = all.filter((w) => w.id !== id);
       await settingsFace.updateWorkspaces(workspaces);
-      if (ws && ws.mirrorPath) {
-        if (workspaceRegistry) {
-          try {
-            const entity = await workspaceRegistry.resolveByPath(ws.mirrorPath);
-            if (entity) await workspaceRegistry.delete(entity.id);
-          } catch (e) {}
-        }
-        try { await rm(ws.mirrorPath, { recursive: true, force: true }); } catch (e) {}
-      }
+      await cleanupWorkspace(ws);
       return { ok: true, workspaces: workspaces };
     },
     updateWorkspace: async (args) => {
@@ -1480,7 +1497,9 @@ function apply(ctx, config) {
     if (rel.toLowerCase().startsWith(mc.toLowerCase())) {
       rel = rel.slice(mc.length);
     } else {
-      // 可能是相对于 cwd 的路径
+      // 不在镜像目录下：剥掉可能的前导斜杠与盘符，按相对路径处理（此前会静默拼出错误路径）。
+      rel = rel.replace(/^[A-Za-z]:/, "").replace(/^\/+/, "");
+      try { ctx.logger?.debug("[dsh-remote-ssh] localToRemote: path outside mirror, treated as relative: " + localPath); } catch (e) {}
     }
     if (rel.startsWith("/")) rel = rel.slice(1);
     if (!rel) return remoteBase;
@@ -1634,7 +1653,7 @@ function apply(ctx, config) {
         remoteInfo = readRemoteInfoSync(payload.path);
         remoteBase = payload.path;
       }
-      console.log("[dsh-remote-ssh] intercept " + method + ": sessionId=" + sessionId + " cwd=" + sessionCwd + " path=" + (payload && payload.path) + " remote=" + (remoteInfo ? "YES" : "NO"));
+      try { ctx.logger?.debug("[dsh-remote-ssh] intercept " + method + ": sessionId=" + sessionId + " cwd=" + sessionCwd + " path=" + (payload && payload.path) + " remote=" + (remoteInfo ? "YES" : "NO")); } catch (e) {}
       let result;
       if (remoteInfo && remoteInfo.keyPath && remoteInfo.host && remoteInfo.user) {
         // ---- 远程工作区：走 SSH ----

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhangfengshun/dsh-remote-ssh",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "description": "DSH web plugin: VSCode Remote-SSH-like remote development (SSH to supercomputers/servers, remote workspace, file explorer, integrated terminal), integrated with dsh-better-sidebar and DSH settings.",
   "keywords": [
     "dsh",
@@ -40,6 +40,7 @@
     },
     "client": {
       "inject": [
+        "@deepseek-ai/dsh-client-modules",
         "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-ui-slots",
@@ -66,6 +67,7 @@
     "lib/client.js",
     "cordis.patch.yml",
     "README.md",
+    "README_EN.md",
     "LICENSE",
     "CHANGELOG.md"
   ],