@zhangfengshun/dsh-remote-ssh 1.3.1 → 1.5.0

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 本文件的版本号与 `package.json` 的 `version` 保持一致。每个版本对应一个 Cordis Package 快照（`pkg-N`）。
 
+## [1.5.0] — 导入 OpenSSH 配置 + 双向同步
+### 新增
+- **从 `~/.ssh/config` 导入连接**：设置小节「从 ~/.ssh/config 导入…」按钮读取本机 OpenSSH 用户配置（递归解析 `Include`），多选主机后批量导入为连接配置（`HostName` / `User` / `Port` / `IdentityFile` / `ProxyJump` 一并带入）。借鉴 Yan-Zero `dsh-remote-ssh`，免去逐条手动录入。
+- **跳板机（ProxyJump）**：连接配置新增可选 `ProxyJump` 字段，`sshArgv` 追加 `-o ProxyJump=...`，OpenSSH 原生支持；导入的带跳板机主机开箱即用。
+- **tar-over-ssh 双向同步**：新增 `syncDown`（远端 → 本地镜像）/ `syncUp`（本地镜像 → 远端）HTTP API 与 `remote_ssh_sync` / `remote_ssh_push` 模型工具，用流式管道把一条 ssh 的 stdout 喂给本地 `tar` 的 stdin（反之亦然），不经过 4MB 缓冲上限。借鉴 flymysql `dsh-remote` 的 `rw_sync` / `rw_push`，但复用现有 `ssh.exe` + `tar`，不引入 `ssh2` 依赖。
+- 「远程文件」页签在选中工作区时显示「⬇ 同步 / ⬆ 推送」按钮，同步后镜像目录装下真实远程文件，内置 `read`/`grep`/`glob` 工具可直接读取镜像。
+- `remote_ssh_sync` / `remote_ssh_push` 工具会话感知：在远程工作区会话中无需 `workspaceId`，自动识别当前工作区。
+
+## [1.4.0] — 远程文件单开一栏预览
+### 新增
+- 点击「远程文件」文件树中的文件，改为在 better-sidebar 中**单开一栏（独立页签）预览/编辑**，与内置「文件」页签一致，不再在文件树下方内嵌预览。新增隐藏页签类型 `remssh:editor`，同一远程文件按 (profileId, path) 去重复用。
+
 ## [1.3.1] — 修复远程文件树滚动
 ### 修复
 - 「远程文件」页签改为 flex 布局：文件树在文件很多时占据剩余高度并内部滚动（`flex:1; overflow-y:auto`），不再因父容器 `overflow:hidden` 而无法往下拉。

package/README.md

@@ -8,11 +8,13 @@
 
 | 能力 | 说明 |
 | --- | --- |
-| 🔌 远程连接 | SSH 连接超算 / 服务器，密钥认证（推荐）或密码认证（需本机 `sshpass`），内置「测试连接」 |
-| 🗂️ 远程文件 | 在 better-sidebar「远程文件」页签浏览 / 打开 / 编辑 / 保存远程文件 |
+| 🔌 远程连接 | SSH 连接超算 / 服务器，密钥认证（推荐）或密码认证（需本机 `sshpass`），内置「测试连接」；支持 `ProxyJump` 跳板机 |
+| 📥 配置导入 | 一键从 `~/.ssh/config`（递归 `Include`）发现主机并批量导入连接配置 |
+| 🗂️ 远程文件 | 在 better-sidebar「远程文件」页签浏览 / 打开 / 编辑 / 保存远程文件；选中工作区后可双向同步 |
 | 💻 远程终端 | 在 better-sidebar「远程终端」页签打开 `ssh -tt` 集成终端，支持多终端并发 |
+| 🔄 双向同步 | `remote_ssh_sync`（远端 → 本地镜像）/ `remote_ssh_push`（本地镜像 → 远端），tar 流式管道，同步后内置文件工具可见 |
 | 🌐 远程工作区 | 选择远程目录创建**原生工作区**（本地镜像目录 + 原生注册），一键打开进入远程环境 |
-| 🤖 模型工具 | 5 个 `remote_ssh_*` 工具，模型可读写远程文件、执行远程命令；在远程工作区会话中免填连接参数 |
+| 🤖 模型工具 | 7 个 `remote_ssh_*` 工具，模型可读写远程文件、执行远程命令、双向同步；在远程工作区会话中免填连接参数 |
 | 🌍 国际化 | 界面文案 + 工具描述中英双语，通过 `ctx.locale` 跟随 DSH 语言设置自动切换 |
 | 🧠 会话记忆 | 切换会话后，「远程文件」「远程终端」页签记住已选连接、浏览目录、打开的文件与终端 |
 
@@ -27,7 +29,7 @@ dsh plugin --profile <name> add /absolute/path/to/dsh-remote-ssh
 ### 发布后安装
 
 ```bash
-dsh plugin --profile <name> add @zhangfengshun/dsh-remote-ssh@1.2.0
+dsh plugin --profile <name> add @zhangfengshun/dsh-remote-ssh@1.5.0
 ```
 
 > ⚠️ 安装后需**重启 DSH** 才生效；后续仅修改 Client 半边时刷新浏览器即可。
@@ -86,6 +88,8 @@ dsh plugin --profile <name> add @zhangfengshun/dsh-remote-ssh@1.2.0
 | `remote_ssh_ls` | 列举远程目录 |
 | `remote_ssh_cat` | 读取远程文本文件（base64 传输，二进制安全） |
 | `remote_ssh_write` | 写入远程文件（覆盖写入） |
+| `remote_ssh_sync` | 远端文件同步到本地镜像目录（tar 流式管道） |
+| `remote_ssh_push` | 本地镜像目录推送回远端（tar 流式管道） |
 
 **会话感知**：当会话是从远程工作区创建时，模型调用这些工具可**不填** `profileId` / `host` / `user` 等连接参数，自动复用该工作区的连接，相对路径基于该工作区远程目录解析。
 
@@ -112,7 +116,7 @@ dsh-remote-ssh/
 │  · 远程文件 / 远程终端        │ ◀────── │  · SSH：listDir/readFile/…       │
 │ ctx.slots: settings.section   │  JSON   │  · settings：profiles/workspaces  │
 │  · DSH 设置页「远程连接」      │         │  · terminals：ssh -tt 管道        │
-└───────────────────────────────┘         │ ctx.tools：5 个 remote_ssh_*     │
+└───────────────────────────────┘         │ ctx.tools：7 个 remote_ssh_*     │
                                           └───────────────┬──────────────────┘
                                                           │ SSH
                                                      远程超算 / 服务器
@@ -132,15 +136,16 @@ dsh-remote-ssh/
 1. **终端非本地 PTY**：走 `ssh -tt` 管道通道（跨平台可用）；`vim` / `htop` 等全屏程序体验受限，后续可接入 `terminals.registerBackend` + `node-pty` 真 PTY。
 2. **文件操作依赖 GNU 工具**（`find -printf`、`base64 -w0`）：目标为 Linux 超算时通用。
 3. **密码认证需本机 `sshpass`**（Windows 默认没有）；密钥认证无此依赖。
-4. **无大文件上传 / 下载**：当前读 / 写为文本流，可后续加 `scp` / `sftp`。
-5. **镜像目录对内置文件工具不可见**：远程工作区的本地镜像目录是注册占位，模型对远程文件应使用 `remote_ssh_*` 工具（镜像目录内已放置说明文件）。
+4. **同步为全量 tar**：`remote_ssh_sync` / `remote_ssh_push` 用 `tar` 流式全量同步，单次同步大目录耗时与传输量较高，后续可换 `rsync -e ssh` 增量。
+5. **原生工具编辑的是本地镜像副本**，不会自动回传 —— 须点「推送」或调用 `remote_ssh_push` 同步回远端（与 `dsh-remote` 的 `rw_sync` / `rw_push` 模型一致）。
 
 ## 路线图
 
+- [x] 从 `~/.ssh/config` 自动导入连接
+- [x] ProxyJump / 跳板机、SSH config 复用
+- [x] `tar`-over-ssh 双向同步（`scp` / `sftp` 增量同步为后续优化）
+- [ ] `rsync -e ssh` 增量同步
 - [ ] 真 PTY 终端（`terminals.registerBackend` + `node-pty`）
-- [ ] `scp` / `sftp` 上传下载
-- [ ] 从 `~/.ssh/config` 自动导入连接
-- [ ] ProxyJump / 跳板机、SSH config 复用
 - [ ] 密码凭据走 `credentials` 服务（避免明文进 argv）
 
 ## 许可证

package/lib/client.js

@@ -73,6 +73,7 @@ window.__ModuleLoader__.load({
       "settings.keyPathPlaceholder": "~/.ssh/id_rsa",
       "settings.passwordField": "密码 password",
       "settings.remoteRoot": "远程根目录 remoteRoot",
+      "settings.proxyJump": "跳板机 ProxyJump",
       "settings.test": "测试连接",
       "settings.saved": "已保存",
       "settings.connOk": "连接成功",
@@ -96,6 +97,7 @@ window.__ModuleLoader__.load({
       "files.errRead": "读取失败",
       "files.errSave": "保存失败",
       "files.errSaveDefaultDir": "保存默认目录失败",
+      "files.binary": "二进制文件，无法预览",
       "term.title": "终端 {id}",
       "term.exited": " (已退出)",
       "term.connecting": "正在连接…",
@@ -114,7 +116,17 @@ window.__ModuleLoader__.load({
       "flow.remoteDir": "远程目录",
       "flow.chooseRemote": "选择远程目录…",
       "flow.backLocal": "← 选择本地目录",
-      "flow.errCreate": "创建远程工作区失败"
+      "flow.errCreate": "创建远程工作区失败",
+      "settings.importSshConfig": "从 ~/.ssh/config 导入…",
+      "settings.importTitle": "导入 ~/.ssh/config 主机",
+      "settings.noneFound": "未在 ~/.ssh/config 中发现可用主机",
+      "settings.imported": "已导入 {n} 个连接",
+      "sync.down": "⬇ 同步",
+      "sync.up": "⬆ 推送",
+      "sync.syncing": "同步中…",
+      "sync.pushing": "推送中…",
+      "sync.done": "同步完成",
+      "sync.fail": "同步失败"
     };
     var en = {
       "tabs.files": "Remote Files",
@@ -137,6 +149,7 @@ window.__ModuleLoader__.load({
       "settings.keyPathPlaceholder": "~/.ssh/id_rsa",
       "settings.passwordField": "Password",
       "settings.remoteRoot": "Remote root (remoteRoot)",
+      "settings.proxyJump": "ProxyJump (jump host)",
       "settings.test": "Test Connection",
       "settings.saved": "Saved",
       "settings.connOk": "Connected",
@@ -160,6 +173,7 @@ window.__ModuleLoader__.load({
       "files.errRead": "Failed to read",
       "files.errSave": "Failed to save",
       "files.errSaveDefaultDir": "Failed to save default directory",
+      "files.binary": "Binary file — preview not available",
       "term.title": "Terminal {id}",
       "term.exited": " (exited)",
       "term.connecting": "Connecting…",
@@ -178,7 +192,17 @@ window.__ModuleLoader__.load({
       "flow.remoteDir": "Remote directory",
       "flow.chooseRemote": "Choose remote directory…",
       "flow.backLocal": "← Choose local directory",
-      "flow.errCreate": "Failed to create remote workspace"
+      "flow.errCreate": "Failed to create remote workspace",
+      "settings.importSshConfig": "Import from ~/.ssh/config…",
+      "settings.importTitle": "Import ~/.ssh/config hosts",
+      "settings.noneFound": "No usable hosts found in ~/.ssh/config",
+      "settings.imported": "Imported {n} connection(s)",
+      "sync.down": "⬇ Sync",
+      "sync.up": "⬆ Push",
+      "sync.syncing": "Syncing…",
+      "sync.pushing": "Pushing…",
+      "sync.done": "Sync complete",
+      "sync.fail": "Sync failed"
     };
     var i18n = {
       t: function (key) { return key; },
@@ -255,6 +279,7 @@ window.__ModuleLoader__.load({
     function FilesTab(props) {
       var t = useT();
       var sessionId = props.sessionId;
+      var betterSidebar = props.betterSidebar;
       var [workspaces, setWorkspaces] = React.useState([]);
       var profiles = useProfiles();
       var [wsId, setWsId] = useSessionMemory(sessionId, "wsId", sel.workspaceId);
@@ -263,8 +288,8 @@ window.__ModuleLoader__.load({
       var [entries, setEntries] = useSessionMemory(sessionId, "entries", []);
       var [err, setErr] = React.useState(null);
       var [loading, setLoading] = React.useState(false);
-      var [openFile, setOpenFile] = useSessionMemory(sessionId, "openFile", null);
       var [defaultDir, setDefaultDir] = useSessionMemory(sessionId, "defaultDir", "");
+      var [syncSt, setSyncSt] = React.useState(null); // { busy, msg, ok }
 
       React.useEffect(function () {
         api("listWorkspaces").then(function (r) { if (r && r.ok) setWorkspaces(r.workspaces || []); });
@@ -310,17 +335,34 @@ window.__ModuleLoader__.load({
         });
       }
 
+      function doSync(direction) {
+        if (!wsId) return;
+        var ws = workspaces.find(function (w) { return w.id === wsId; });
+        if (!ws) return;
+        setSyncSt({ busy: true, msg: direction === "down" ? t("sync.syncing") : t("sync.pushing"), ok: null });
+        var method = direction === "down" ? "syncDown" : "syncUp";
+        api(method, { workspaceId: wsId }).then(function (r) {
+          if (r && r.ok) setSyncSt({ busy: false, msg: direction === "down" ? t("sync.done") : t("sync.done"), ok: true });
+          else setSyncSt({ busy: false, msg: (r && r.error) || t("sync.fail"), ok: false });
+        });
+      }
+
       function openEntry(e) {
         var base = path ? (path.replace(/\/+$/, "") + "/" + e.name) : e.name;
         if (e.type === "directory") {
           setPath(base);
           load(profileId, base);
         } else {
-          setOpenFile({ path: base, content: "", loading: true });
-          api("readFile", { profileId: profileId, path: base }).then(function (r) {
-            if (r && r.ok) setOpenFile({ path: base, content: r.content, binary: r.binary, dirty: false, loading: false });
-            else setOpenFile({ path: base, content: "", error: (r && r.error) || t("files.errRead"), loading: false });
-          });
+          // 用独立页签预览远程文件（与内置「文件」页签一致），而非在文件树下方预览。
+          if (betterSidebar && betterSidebar.openTab) {
+            betterSidebar.openTab({
+              type: "remssh:editor",
+              id: "remssh:editor:" + profileId + ":" + base,
+              title: e.name,
+              path: base,
+              meta: { profileId: profileId, remotePath: base }
+            }, { sessionId: sessionId });
+          }
         }
       }
 
@@ -333,14 +375,6 @@ window.__ModuleLoader__.load({
         load(profileId, up);
       }
 
-      function saveFile() {
-        if (!openFile) return;
-        api("writeFile", { profileId: profileId, path: openFile.path, content: openFile.content }).then(function (r) {
-          if (r && r.ok) setOpenFile(Object.assign({}, openFile, { dirty: false }));
-          else setErr((r && r.error) || t("files.errSave"));
-        });
-      }
-
       return h("div", { style: { display: "flex", flexDirection: "column", flex: 1, minHeight: 0, overflow: "hidden" } },
         h("div", { style: { flex: "none" } },
           h("div", { className: "rssh-row" },
@@ -369,6 +403,11 @@ window.__ModuleLoader__.load({
             h("button", { className: "rssh-btn", onClick: function () { load(profileId, path); } }, t("common.open")),
             h("button", { className: "rssh-btn", onClick: goUp }, t("common.up"))
           ),
+          wsId ? h("div", { className: "rssh-pathbar" },
+            h("button", { className: "rssh-btn", onClick: function () { doSync("down"); }, disabled: syncSt && syncSt.busy }, t("sync.down")),
+            h("button", { className: "rssh-btn", onClick: function () { doSync("up"); }, disabled: syncSt && syncSt.busy }, t("sync.up")),
+            syncSt ? h("span", { className: syncSt.ok === false ? "rssh-err" : (syncSt.ok ? "rssh-ok" : "rssh-muted"), style: { flex: 1, fontSize: 11 } }, syncSt.msg) : null
+          ) : null,
           loading ? h("div", { className: "rssh-muted" }, t("common.loading")) : null,
           err ? h("div", { className: "rssh-err", style: { whiteSpace: "pre-wrap" } }, err) : null
         ),
@@ -379,18 +418,56 @@ window.__ModuleLoader__.load({
               e.type === "file" ? h("span", { className: "rssh-tree-size" }, String(e.size)) : null
             );
           })
+        )
+      );
+    }
+
+    // ======================================================================
+    // 远程文件编辑器页签：点击文件树中的文件后单开一栏预览/编辑（与内置「文件」页签一致）
+    // ======================================================================
+    function RemoteEditor(props) {
+      var t = useT();
+      var tab = props.tab || {};
+      var ctx = props.ctx;
+      var meta = tab.meta || {};
+      var profileId = meta.profileId || "";
+      var remotePath = tab.path || meta.remotePath || "";
+      var [data, setData] = React.useState({ loading: true, content: "", binary: false, dirty: false, error: null });
+
+      React.useEffect(function () {
+        var alive = true;
+        setData({ loading: true, content: "", binary: false, dirty: false, error: null });
+        api("readFile", { profileId: profileId, path: remotePath }).then(function (r) {
+          if (!alive) return;
+          if (r && r.ok) setData({ loading: false, content: r.content || "", binary: !!r.binary, dirty: false, error: null });
+          else setData({ loading: false, content: "", binary: false, dirty: false, error: (r && r.error) || t("files.errRead") });
+        });
+        return function () { alive = false; };
+      }, [profileId, remotePath]);
+
+      function save() {
+        api("writeFile", { profileId: profileId, path: remotePath, content: data.content }).then(function (r) {
+          if (r && r.ok) setData(Object.assign({}, data, { dirty: false, error: null }));
+          else setData(Object.assign({}, data, { error: (r && r.error) || t("files.errSave") }));
+        });
+      }
+
+      function close() {
+        if (ctx && ctx.betterSidebar && tab.id) ctx.betterSidebar.closeTab(tab.id);
+      }
+
+      if (data.loading) return h("div", { className: "rssh-muted", style: { padding: 8 } }, t("files.reading"));
+      if (data.error) return h("div", { className: "rssh-err", style: { padding: 8, whiteSpace: "pre-wrap" } }, data.error);
+      if (data.binary) return h("div", { className: "rssh-muted", style: { padding: 8 } }, t("files.binary"));
+
+      return h("div", { style: { display: "flex", flexDirection: "column", flex: 1, minHeight: 0, padding: 8, overflow: "hidden" } },
+        h("div", { className: "rssh-pathbar", style: { flex: "none" } },
+          h("span", { className: "rssh-title", style: { flex: 1, wordBreak: "break-all" } }, remotePath),
+          h("button", { className: "rssh-btn", onClick: save }, t("common.save")),
+          h("button", { className: "rssh-btn", onClick: close }, t("common.close"))
         ),
-        openFile ? h("div", { style: { flex: "none" } },
-          h("div", { className: "rssh-pathbar", style: { marginTop: 8 } },
-            h("span", { className: "rssh-title", style: { flex: 1, wordBreak: "break-all" } }, openFile.path),
-            h("button", { className: "rssh-btn", onClick: saveFile }, t("common.save")),
-            h("button", { className: "rssh-btn", onClick: function () { setOpenFile(null); } }, t("common.close"))
-          ),
-          openFile.loading ? h("div", { className: "rssh-muted" }, t("files.reading")) :
-          openFile.error ? h("div", { className: "rssh-err" }, openFile.error) :
-          h("textarea", { className: "rssh-content", style: { width: "100%", boxSizing: "border-box", minHeight: 200, background: "var(--dsw-alias-markdown-code-block)", color: "var(--dsw-alias-label-primary)", border: "1px solid var(--dsw-alias-border-l2)" },
-            value: openFile.content, onChange: function (e) { setOpenFile(Object.assign({}, openFile, { content: e.target.value, dirty: true })); } })
-        ) : null
+        h("textarea", { className: "rssh-content", style: { flex: 1, minHeight: 0, maxHeight: "none", width: "100%", boxSizing: "border-box", background: "var(--dsw-alias-markdown-code-block)", color: "var(--dsw-alias-label-primary)", border: "1px solid var(--dsw-alias-border-l2)" },
+          value: data.content, onChange: function (e) { setData(Object.assign({}, data, { content: e.target.value, dirty: true })); } })
       );
     }
 
@@ -629,9 +706,10 @@ window.__ModuleLoader__.load({
     function SettingsSection(props) {
       var t = useT();
       var [profiles, setProfiles] = React.useState([]);
-      var [form, setForm] = React.useState({ name: "", host: "", port: "22", user: "", authMethod: "key", keyPath: "", password: "", remoteRoot: "~" });
+      var [form, setForm] = React.useState({ name: "", host: "", port: "22", user: "", authMethod: "key", keyPath: "", password: "", remoteRoot: "~", proxyJump: "" });
       var [result, setResult] = React.useState(null);
       var [busy, setBusy] = React.useState(false);
+      var [importDlg, setImportDlg] = React.useState(null);
       var set = function (k, v) { setForm(function (f) { var n = {}; for (var key in f) n[key] = f[key]; n[k] = v; return n; }); };
 
       function reload() { api("listProfiles").then(function (r) { if (r && r.ok) setProfiles(r.profiles || []); }); }
@@ -643,7 +721,7 @@ window.__ModuleLoader__.load({
           setBusy(false);
           if (r && r.ok) {
             setProfiles(r.profiles || []);
-            setForm({ name: "", host: "", port: "22", user: "", authMethod: "key", keyPath: "", password: "", remoteRoot: "~" });
+            setForm({ name: "", host: "", port: "22", user: "", authMethod: "key", keyPath: "", password: "", remoteRoot: "~", proxyJump: "" });
             setResult({ ok: true, msg: t("settings.saved") });
           } else setResult({ ok: false, msg: (r && r.error) || t("settings.errSave") });
         });
@@ -660,6 +738,47 @@ window.__ModuleLoader__.load({
         api("deleteProfile", { id: p.id }).then(function (r) { if (r && r.ok) { setProfiles(r.profiles || []); } });
       }
 
+      function openImport() {
+        setImportDlg({ loading: true, hosts: [], selected: {} });
+        api("listSshConfigHosts").then(function (r) {
+          if (r && r.ok) {
+            var hosts = r.hosts || [];
+            var sel = {};
+            hosts.forEach(function (h) { sel[h.name + "|" + h.hostName] = true; });
+            setImportDlg({ loading: false, hosts: hosts, selected: sel });
+          } else {
+            setImportDlg({ loading: false, hosts: [], selected: {}, error: (r && r.error) || t("settings.noneFound") });
+          }
+        });
+      }
+      function toggleImport(key) {
+        setImportDlg(function (d) {
+          var sel = {}; for (var k in d.selected) sel[k] = d.selected[k];
+          sel[key] = !sel[key];
+          return Object.assign({}, d, { selected: sel });
+        });
+      }
+      function doImport() {
+        if (!importDlg) return;
+        var picked = importDlg.hosts.filter(function (h) { return importDlg.selected[h.name + "|" + h.hostName]; });
+        setBusy(true);
+        var i = 0;
+        function next() {
+          if (i >= picked.length) {
+            setBusy(false); setImportDlg(null);
+            setResult({ ok: true, msg: t("settings.imported").replace("{n}", String(picked.length)) });
+            reload();
+            return;
+          }
+          var h = picked[i++];
+          api("saveProfile", {
+            name: h.name, host: h.hostName, port: h.port || 22, user: h.user || "",
+            authMethod: "key", keyPath: h.identityFile || "", password: "", remoteRoot: "~", proxyJump: h.proxyJump || ""
+          }).then(next);
+        }
+        next();
+      }
+
       return h("div", null,
         h("p", { className: "rssh-muted" }, t("settings.desc")),
         profiles.map(function (p) {
@@ -689,9 +808,33 @@ window.__ModuleLoader__.load({
           form.authMethod === "key" ? Field({ label: t("settings.keyPath"), value: form.keyPath, onChange: function (v) { set("keyPath", v); }, placeholder: t("settings.keyPathPlaceholder") }) : null,
           form.authMethod === "password" ? Field({ label: t("settings.passwordField"), type: "password", value: form.password, onChange: function (v) { set("password", v); } }) : null,
           Field({ label: t("settings.remoteRoot"), value: form.remoteRoot, onChange: function (v) { set("remoteRoot", v); }, placeholder: "~/project" }),
-          h("button", { className: "rssh-btn", onClick: save, disabled: busy }, busy ? t("common.processing") : t("common.save"))
+          Field({ label: t("settings.proxyJump"), value: form.proxyJump, onChange: function (v) { set("proxyJump", v); }, placeholder: "bastion.example.com" }),
+          h("div", { className: "rssh-actions" },
+            h("button", { className: "rssh-btn", onClick: save, disabled: busy }, busy ? t("common.processing") : t("common.save")),
+            h("button", { className: "rssh-btn", onClick: openImport, disabled: busy }, t("settings.importSshConfig"))
+          )
         ),
-        result ? h("div", { className: result.ok ? "rssh-ok" : "rssh-err", style: { whiteSpace: "pre-wrap", marginTop: 6 } }, result.msg) : null
+        result ? h("div", { className: result.ok ? "rssh-ok" : "rssh-err", style: { whiteSpace: "pre-wrap", marginTop: 6 } }, result.msg) : null,
+        importDlg ? h(Modal, { open: true, onClose: function () { if (!busy) setImportDlg(null); }, title: t("settings.importTitle"), closeLabel: t("common.close") },
+          importDlg.loading ? h("div", { className: "rssh-muted" }, t("common.loading")) :
+          importDlg.error ? h("div", { className: "rssh-err" }, importDlg.error) :
+          (importDlg.hosts.length === 0 ? h("div", { className: "rssh-muted" }, t("settings.noneFound")) :
+            h("div", null,
+              importDlg.hosts.map(function (hh) {
+                var key = hh.name + "|" + hh.hostName;
+                return h("label", { key: key, className: "rssh-tree-item", style: { cursor: "pointer" } },
+                  h("input", { type: "checkbox", checked: !!importDlg.selected[key], onChange: function () { toggleImport(key); } }),
+                  h("span", { className: "rssh-tree-dir" }, hh.name),
+                  h("span", { className: "rssh-sub" }, (hh.user || "?") + "@" + hh.hostName + ":" + (hh.port || 22) + (hh.proxyJump ? "  → " + hh.proxyJump : ""))
+                );
+              }),
+              h("div", { className: "rssh-actions", style: { marginTop: 8 } },
+                h("button", { className: "rssh-btn", onClick: doImport, disabled: busy }, busy ? t("common.processing") : t("common.save")),
+                h("button", { className: "rssh-btn", onClick: function () { setImportDlg(null); }, disabled: busy }, t("common.close"))
+              )
+            )
+          )
+        ) : null
       );
     }
 
@@ -728,7 +871,20 @@ window.__ModuleLoader__.load({
             icon: function () { return h("span", null, "🗂️"); },
             component: function (props) {
               var sid = props && props.scope ? props.scope.sessionId : null;
-              return h(FilesTab, { key: "files:" + (sid || "global"), sessionId: sid });
+              return h(FilesTab, { key: "files:" + (sid || "global"), sessionId: sid, betterSidebar: props && props.ctx ? props.ctx.betterSidebar : null });
+            }
+          });
+        });
+        // 远程文件编辑器页签（隐藏页签，仅由文件树点击打开，每个远程文件单开一栏）。
+        ctx.effect(function () {
+          return betterSidebar.registerTab({
+            id: "remssh:editor",
+            title: function () { return i18n.t("tabs.files"); },
+            hidden: true,
+            dedupeKey: function (tab) { return (tab && tab.meta && tab.meta.profileId || "") + "\u0000" + (tab && tab.path || ""); },
+            icon: function () { return h("span", null, "📄"); },
+            component: function (props) {
+              return h(RemoteEditor, { tab: props && props.tab, ctx: props && props.ctx, scope: props && props.scope });
             }
           });
         });

package/lib/index.js

@@ -11,7 +11,7 @@
 import z from "schemastery";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import { settingsNamespace } from "@deepseek-ai/dsh-settings";
-import { mkdir, rm, writeFile } from "node:fs/promises";
+import { mkdir, rm, writeFile, readFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
 
@@ -36,7 +36,8 @@ const ProfileSchema = z.object({
   authMethod: z.string().default("key"),
   keyPath: z.string().default(""),
   password: z.string().default("").role("secret"),
-  remoteRoot: z.string().default("~")
+  remoteRoot: z.string().default("~"),
+  proxyJump: z.string().default("")
 });
 /** 远程工作区 schema（连接配置 + 远程根目录 + 本地镜像目录）。 */
 const WorkspaceSchema = z.object({
@@ -68,6 +69,92 @@ function shellQuotePath(s) {
   return shellQuote(str);
 }
 
+/**
+ * 解析 OpenSSH 用户配置（~/.ssh/config），递归处理 Include，发现其中的具体主机。
+ * 借鉴 Yan-Zero dsh-remote-ssh：自动读取 OpenSSH 配置发现主机，免去手动录入。
+ * 返回 [{ name, hostName, user, port, identityFile, proxyJump }]。
+ */
+function expandSshPath(raw) {
+  const s = String(raw || "").trim();
+  if (s === "~") return join(homedir());
+  if (s.startsWith("~/")) return join(homedir(), s.slice(2));
+  return s;
+}
+
+async function parseSshConfigFile(filePath, seen) {
+  const real = filePath;
+  if (seen.has(real)) return [];
+  seen.add(real);
+  let text;
+  try {
+    text = await readFile(filePath, "utf8");
+  } catch (e) {
+    return [];
+  }
+  const hosts = [];
+  let cur = null;
+  const lines = text.split(/\r?\n/);
+  for (let i = 0; i < lines.length; i++) {
+    const raw = lines[i];
+    const hash = raw.indexOf("#");
+    const line = (hash >= 0 ? raw.slice(0, hash) : raw).trim();
+    if (!line) continue;
+    const sp = line.search(/\s+/);
+    if (sp < 0) continue;
+    const key = line.slice(0, sp).toLowerCase();
+    const val = line.slice(sp).trim();
+    if (key === "host") {
+      // 多个名字空格分隔；含通配符 * / ? 的跳过
+      const names = val.split(/\s+/);
+      cur = null;
+      for (const n of names) {
+        if (n && !/[*?]/.test(n)) {
+          cur = { name: n, hostName: "", user: "", port: 22, identityFile: "", proxyJump: "" };
+          hosts.push(cur);
+          break;
+        }
+      }
+    } else if (cur) {
+      if (key === "hostname") cur.hostName = val;
+      else if (key === "user") cur.user = val;
+      else if (key === "port") { const pn = parseInt(val, 10); if (!isNaN(pn)) cur.port = pn; }
+      else if (key === "identityfile") cur.identityFile = expandSshPath(val);
+      else if (key === "proxyjump") cur.proxyJump = val;
+      else if (key === "include") {
+        // 递归 Include（相对 ~/.ssh/ 或绝对）
+        for (const inc of val.split(/\s+/)) {
+          if (!inc) continue;
+          const incPath = expandSshPath(inc);
+          const sub = await parseSshConfigFile(incPath, seen);
+          for (const h of sub) hosts.push(h);
+        }
+      }
+    }
+  }
+  return hosts;
+}
+
+async function listSshConfigHosts() {
+  const cfg = join(homedir(), ".ssh", "config");
+  const seen = new Set();
+  let hosts = [];
+  try {
+    hosts = await parseSshConfigFile(cfg, seen);
+  } catch (e) {
+    return { ok: false, error: "读取 ~/.ssh/config 失败: " + String(e && e.message ? e.message : e) };
+  }
+  // 过滤掉没有 hostName 的占位条目；保留 user 默认
+  const out = hosts.filter((h) => h.hostName).map((h) => ({
+    name: h.name,
+    hostName: h.hostName,
+    user: h.user || "",
+    port: h.port || 22,
+    identityFile: h.identityFile || "",
+    proxyJump: h.proxyJump || ""
+  }));
+  return { ok: true, hosts: out };
+}
+
 function sshArgv(p, remoteCmd, tty) {
   const opts = ["ssh"];
   if (tty) opts.push("-tt");
@@ -76,6 +163,7 @@ function sshArgv(p, remoteCmd, tty) {
   opts.push("-o", "ConnectTimeout=15");
   opts.push("-o", "ServerAliveInterval=30");
   opts.push("-o", "ServerAliveCountMax=3");
+  if (p.proxyJump) opts.push("-o", "ProxyJump=" + String(p.proxyJump));
   if (p.authMethod === "key" && p.keyPath) opts.push("-i", p.keyPath);
   const target = String(p.user || "") + "@" + String(p.host || "");
   const head = (p.authMethod === "password" && p.password) ? ["sshpass", "-p", String(p.password)] : [];
@@ -171,6 +259,96 @@ async function remoteWriteFile(subprocess, p, path, content) {
   return await runRemote(subprocess, p, "cat > " + shellQuotePath(path), c, MAX_BYTES);
 }
 
+/**
+ * tar-over-ssh 双向同步（借鉴 flymysql dsh-remote 的 SFTP 镜像同步，但复用现有 ssh.exe + tar，
+ * 不引入 ssh2 依赖）。用流式管道把一条 ssh 的 stdout 喂给本地 tar 的 stdin（反之亦然），
+ * 不经过 4MB Buffer 上限。
+ */
+function spawnOne(subprocess, argv, stdio, cwd) {
+  return subprocess.spawn({ argv: argv, cwd: cwd || process.cwd(), stdio: stdio, graceMs: 60000 });
+}
+
+function readCollected(handle, name) {
+  if (!handle || !handle.collected || !handle.collected[name]) return "";
+  const r = handle.collected[name].readFrom(0);
+  return r ? r.text : "";
+}
+
+/** 远端 → 本地镜像：先清空 mirror，再 tar 展开到 mirror。 */
+async function remoteSyncDown(subprocess, p, remotePath, mirrorPath) {
+  if (!remotePath) return { ok: false, error: "remotePath 为必填项" };
+  if (!mirrorPath) return { ok: false, error: "mirrorPath 为必填项" };
+  try { await rm(mirrorPath, { recursive: true, force: true }); } catch (e) {}
+  try { await mkdir(mirrorPath, { recursive: true }); } catch (e) {
+    return { ok: false, error: "创建镜像目录失败: " + String(e && e.message ? e.message : e) };
+  }
+  const COLLECT = { maxBytes: 1024 * 1024, spill: { maxBytes: 1024 * 1024 } };
+  let sshH, tarH;
+  try {
+    sshH = spawnOne(subprocess, sshArgv(p, "tar cf - -C " + shellQuotePath(remotePath) + " ."), {
+      stdin: "ignore", stdout: "pipe", stderr: COLLECT
+    });
+    tarH = spawnOne(subprocess, ["tar", "xf", "-", "-C", mirrorPath], {
+      stdin: "pipe", stdout: "ignore", stderr: COLLECT
+    });
+  } catch (e) {
+    return { ok: false, error: "spawn 失败: " + String(e && e.message ? e.message : e) };
+  }
+  let pipeErr = "";
+  try {
+    if (sshH.stdout && tarH.stdin) sshH.stdout.pipe(tarH.stdin);
+    else pipeErr = "stdout/stdin 管道不可用（subprocess 未暴露原始流）";
+  } catch (e) { pipeErr = String(e && e.message ? e.message : e); }
+  let sshOut, tarOut;
+  try { sshOut = await sshH.done; } catch (e) { sshOut = { exitCode: -1 }; }
+  try { tarOut = await tarH.done; } catch (e) { tarOut = { exitCode: -1 }; }
+  const sshErr = readCollected(sshH, "stderr");
+  const tarErr = readCollected(tarH, "stderr");
+  // ssh 正常退出且 tar 正常退出才算成功
+  if (sshOut.exitCode === 0 && tarOut.exitCode === 0) return { ok: true, mirrorPath: mirrorPath };
+  const parts = [];
+  if (pipeErr) parts.push("管道: " + pipeErr);
+  if (sshOut.exitCode !== 0) parts.push("ssh 退出码 " + sshOut.exitCode + (sshErr ? ": " + sshErr.slice(0, 500) : ""));
+  if (tarOut.exitCode !== 0) parts.push("tar 退出码 " + tarOut.exitCode + (tarErr ? ": " + tarErr.slice(0, 500) : ""));
+  if (!parts.length) parts.push("远端可能缺少 tar，或本机无 tar.exe");
+  return { ok: false, error: "同步失败: " + parts.join("；") };
+}
+
+/** 本地镜像 → 远端：本地 tar 打包喂给远端 tar 展开。 */
+async function remoteSyncUp(subprocess, p, remotePath, mirrorPath) {
+  if (!remotePath) return { ok: false, error: "remotePath 为必填项" };
+  if (!mirrorPath) return { ok: false, error: "mirrorPath 为必填项" };
+  const COLLECT = { maxBytes: 1024 * 1024, spill: { maxBytes: 1024 * 1024 } };
+  let tarH, sshH;
+  try {
+    tarH = spawnOne(subprocess, ["tar", "cf", "-", "-C", mirrorPath, "."], {
+      stdin: "ignore", stdout: "pipe", stderr: COLLECT
+    });
+    sshH = spawnOne(subprocess, sshArgv(p, "tar xf - -C " + shellQuotePath(remotePath)), {
+      stdin: "pipe", stdout: "ignore", stderr: COLLECT
+    });
+  } catch (e) {
+    return { ok: false, error: "spawn 失败: " + String(e && e.message ? e.message : e) };
+  }
+  let pipeErr = "";
+  try {
+    if (tarH.stdout && sshH.stdin) tarH.stdout.pipe(sshH.stdin);
+    else pipeErr = "stdout/stdin 管道不可用（subprocess 未暴露原始流）";
+  } catch (e) { pipeErr = String(e && e.message ? e.message : e); }
+  let tarOut, sshOut;
+  try { tarOut = await tarH.done; } catch (e) { tarOut = { exitCode: -1 }; }
+  try { sshOut = await sshH.done; } catch (e) { sshOut = { exitCode: -1 }; }
+  const tarErr = readCollected(tarH, "stderr");
+  const sshErr = readCollected(sshH, "stderr");
+  if (tarOut.exitCode === 0 && sshOut.exitCode === 0) return { ok: true, remotePath: remotePath };
+  const parts = [];
+  if (pipeErr) parts.push("管道: " + pipeErr);
+  if (tarOut.exitCode !== 0) parts.push("tar 退出码 " + tarOut.exitCode + (tarErr ? ": " + tarErr.slice(0, 500) : ""));
+  if (sshOut.exitCode !== 0) parts.push("ssh 退出码 " + sshOut.exitCode + (sshErr ? ": " + sshErr.slice(0, 500) : ""));
+  if (!parts.length) parts.push("远端可能缺少 tar，或本机无 tar.exe");
+  return { ok: false, error: "推送失败: " + parts.join("；") };
+}
+
 function normExec(r) {
   return {
     ok: !!r.ok,
@@ -346,6 +524,16 @@ function apply(ctx, config) {
     return { profile: null, remotePath: undefined };
   }
 
+  /** 解析同步工具的目标工作区：显式 workspaceId 优先，其次当前会话的远程工作区。 */
+  function resolveWorkspace(args, exec) {
+    const a = args || {};
+    const workspaces = settingsFace.read().workspaces;
+    if (a.workspaceId) {
+      return workspaces.find((w) => w.id === a.workspaceId) || null;
+    }
+    return remoteContextFor(exec);
+  }
+
   /** 相对路径拼到远程工作目录下，绝对路径（/、~、盘符）原样返回。 */
   function resolveRemotePath(path, base) {
     if (!base) return path || "";
@@ -357,6 +545,8 @@ function apply(ctx, config) {
 
   const api = {
     listProfiles: async () => ({ ok: true, profiles: settingsFace.read().profiles }),
+    /** 读取本机 ~/.ssh/config 发现的主机（借鉴 Yan-Zero dsh-remote-ssh）。 */
+    listSshConfigHosts: async () => listSshConfigHosts(),
     saveProfile: async (args) => {
       const p = args || {};
       if (!p.host || !p.user) return { ok: false, error: "host 和 user 为必填项" };
@@ -372,7 +562,8 @@ function apply(ctx, config) {
         authMethod: p.authMethod || "key",
         keyPath: p.keyPath || "",
         password: p.password || "",
-        remoteRoot: p.remoteRoot || "~"
+        remoteRoot: p.remoteRoot || "~",
+        proxyJump: p.proxyJump || ""
       };
       if (existing) {
         const i = profiles.indexOf(existing);
@@ -485,6 +676,24 @@ function apply(ctx, config) {
       if (!p) return { ok: false, error: "需要 profileId 或 host+user" };
       return await remoteWriteFile(subprocess, p, args && args.path, args && args.content);
     },
+    /** 远端 → 本地镜像（按工作区）。 */
+    syncDown: async (args) => {
+      const a = args || {};
+      const ws = settingsFace.read().workspaces.find((w) => w.id === (a.workspaceId || a.id));
+      if (!ws) return { ok: false, error: "未找到远程工作区" };
+      const p = getProfile(ws.profileId);
+      if (!p) return { ok: false, error: "未找到连接配置" };
+      return await remoteSyncDown(subprocess, p, ws.remotePath, ws.mirrorPath);
+    },
+    /** 本地镜像 → 远端（按工作区）。 */
+    syncUp: async (args) => {
+      const a = args || {};
+      const ws = settingsFace.read().workspaces.find((w) => w.id === (a.workspaceId || a.id));
+      if (!ws) return { ok: false, error: "未找到远程工作区" };
+      const p = getProfile(ws.profileId);
+      if (!p) return { ok: false, error: "未找到连接配置" };
+      return await remoteSyncUp(subprocess, p, ws.remotePath, ws.mirrorPath);
+    },
     spawnTerminal: async (args) => {
       const p = resolveProfile(args);
       if (!p) return { ok: false, error: "需要 profileId 或 host+user" };
@@ -681,6 +890,48 @@ function apply(ctx, config) {
     }
   });
 
+  // 同步：把远程工作区的文件同步到本地镜像目录（syncDown），或把本地镜像改动推回远端（syncUp）。
+  // 借鉴 flymysql dsh-remote 的 rw_sync / rw_push，但用 tar-over-ssh 流式管道，不引入 ssh2。
+  const syncDesc = "按远程工作区双向同步：sync 把远端文件同步到本地镜像目录，push 把本地镜像改动推回远端。" +
+    "用 workspaceId 指定工作区，或留空在当前远程工作区会话中自动识别。" +
+    "Sync/push a remote workspace to its local mirror (or back). Pass workspaceId, or omit it inside a remote-workspace session.";
+  const syncParams = {
+    workspaceId: { type: "string", description: "远程工作区 id（留空则在当前远程工作区会话中自动识别）。" }
+  };
+  const syncOutput = {
+    schema: { type: "object", additionalProperties: false, properties: {
+      ok: { type: "boolean", required: true },
+      error: { type: "string", required: true }
+    } },
+    render: textRender(function (a, v) { return v.ok ? "同步完成" : (v.error || "同步失败"); })
+  };
+  register({
+    name: "remote_ssh_sync",
+    description: syncDesc,
+    parameters: syncParams,
+    output: syncOutput,
+    execute: async function (args, exec) {
+      const ws = resolveWorkspace(args, exec);
+      if (!ws) return { ok: false, error: "未找到远程工作区（workspaceId 必填，或当前会话非远程工作区）" };
+      const p = getProfile(ws.profileId);
+      if (!p) return { ok: false, error: "未找到连接配置" };
+      return await remoteSyncDown(subprocess, p, ws.remotePath, ws.mirrorPath);
+    }
+  });
+  register({
+    name: "remote_ssh_push",
+    description: syncDesc,
+    parameters: syncParams,
+    output: syncOutput,
+    execute: async function (args, exec) {
+      const ws = resolveWorkspace(args, exec);
+      if (!ws) return { ok: false, error: "未找到远程工作区（workspaceId 必填，或当前会话非远程工作区）" };
+      const p = getProfile(ws.profileId);
+      if (!p) return { ok: false, error: "未找到连接配置" };
+      return await remoteSyncUp(subprocess, p, ws.remotePath, ws.mirrorPath);
+    }
+  });
+
   // ---- 清理 ----
   ctx.effect(() => () => {
     terminals.forEach(function (s) { try { s.handle.terminate(); } catch (e) {} });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhangfengshun/dsh-remote-ssh",
-  "version": "1.3.1",
+  "version": "1.5.0",
   "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",