dsh-remote 0.8.8 → 0.8.9

package/README.md

@@ -36,7 +36,9 @@ Real capture (host scrubbed to a placeholder):
 - **`~/.ssh/config` import** — the Settings page lists your `Host` aliases; one click fills the form (path reference only, the plugin never reads key material).
 - **Two-tab workspace picker** (fills the native "Add workspace" flow):
   - **本机 / Local** — opens the **native OS folder chooser** over the host (macOS `osascript` / Linux `zenity`→`kdialog` / **Windows `FolderBrowserDialog`**), or lets you type a local path → adopted directly as a normal DSH local workspace.
-  - **远程 / Remote** — the picker is a **centered modal**. Pick a **machine** → the path field is **pre-filled with `/`** and live **autocompletes** directories; selecting a directory immediately lists its next level. A **浏览…** floating browser (shows **size + mtime**, dirs first, follows symlinks) fills the field without committing. **最近 workspaces** quick-pick, **`~` 主目录** shortcut and **新建目录** are one click away. On confirm it creates a **real local mirror** under `$DSH_HOME/remote-workspaces/<host>-<user>-<port>/<base>` that passes `fs.realpath` → the harness adopts it as a real workspace while dsh-remote keeps it synced over SFTP.
+  - **远程 / Remote** — the picker is a **centered modal**. Pick a **machine** → on Windows hosts the root shows a **"This PC" drive view** (`C:\`, `D:\`, `E:\`… instead of the Git Bash MSYS root) and the path field live **autocompletes** directories (accepts `C:\Users\…` or `/c/Users/…` — Windows paths are rewritten to the Git Bash form underneath); selecting a directory immediately lists its next level. A **浏览…** floating browser (Windows-aware breadcrumb `此电脑 / C:\ / Users / dev`, drive rows, size + mtime, dirs first, follows symlinks) fills the field without committing; the **回上一级** button works at any depth (even when the browser was opened at the path bar's value). **最近 workspaces** quick-pick, **`~` 主目录** shortcut and **新建目录** are one click away. On confirm it creates a **real local mirror** under `$DSH_HOME/remote-workspaces/<host>-<user>-<port>/<base>` that passes `fs.realpath` → the harness adopts it as a real workspace while dsh-remote keeps it synced over SFTP.
+- **Git Bash default terminal (Windows remotes)** — the remote platform is auto-detected (`cmd /c ver`, plus an `uname -s` MINGW/MSYS probe as fallback); on Windows the plugin locates Git Bash (`config.shell` can pin a path or `native` disables wrapping) and pipes every command to `bash -s` over the exec channel, so quoting/backslash escaping is never an issue regardless of the SSH default shell. `rw_exec` runs with a Git Bash cwd (`/c/Users/…` form). `/dsh-remote/status`, `rw_info` and the 测试连接 button report the detected platform + shell.
+- **Windows path auto-conversion** — typing `C:\Users\dev\project` (or `C:/…`, `/c/…`, `/C:/…`) is normalized underneath to the Git Bash form `/c/Users/dev/project` for shell commands, while workspaces are stored and shown Windows-style (`C:\Users\dev\project`). All model tools accept and report both forms; SFTP access uses the Win32-OpenSSH `/D:/…` form (see `toSftpPath`).
 - **Bidirectional SFTP sync, conflict-aware** — `rw_sync` (remote → mirror) and `rw_push` (mirror → remote) are **three-way** (remote vs local vs last-synced snapshot): files changed on both sides are **reported as conflicts and never silently overwritten** (`force=true` overrides). Both support **dry-run**, **background tasks**, and honor **gitignore-style ignore rules** (`.dsh-remote-ignore` under `remote-workspaces`, defaults cover `.git/node_modules/target/dist/build/…`).
 - **Model tools** — 20 tools, all Windows/POSIX portable via SFTP: `rw_info`, `rw_connect` (with `save`), `rw_pick_workspace`, `rw_list_dir` (size+mtime), `rw_stat`, `rw_read_file` (encoding-aware: utf-8/gbk), `rw_write_file`, **`rw_edit`** (literal replace + mtime optimistic lock), `rw_append`, `rw_mkdir`, `rw_remove` (recursive, bounded), `rw_move`, `rw_exec` (pty/env), **`rw_search`** (SFTP tree walk — works on Windows too, honors ignore rules, context lines), `rw_download`/`rw_upload` (streaming fastGet/fastPut + size caps), **`rw_forward`** (SSH tunnels), `rw_sync`, `rw_push`, `rw_disconnect`.
 - **Port forwarding panel** — create/start/stop/remove **local** (`127.0.0.1:port → remote`) and **reverse** (`remote → local`) tunnels in the Settings page or via `rw_forward`; definitions persist, auto-restart on reconnect when enabled, all tunnels stop on disconnect.
@@ -190,6 +192,7 @@ and should be done only when you intend to release.
 | `privateKeyPath` | string | `''` | private key path (used only when explicitly provided) |
 | `passphrase` | string | `''` | passphrase for an encrypted private key |
 | `workspace` | string | `''` | default remote workspace path |
+| `shell` | string | `''` | remote command terminal strategy: `''`=auto-detect (Git Bash on Windows remotes), `'git-bash'`=prefer Git Bash, `'native'`=never wrap, anything else=explicit bash.exe path (e.g. `C:\Program Files\Git\bin\bash.exe`) |
 | `commandTimeoutMs` | int | 20000 | per remote command timeout |
 | `connectTimeoutMs` | int | 15000 | SSH connect timeout |
 | `maxFileBytes` | int | 52428800 | skip mirroring/reading files larger than this (0 = no cap) |

package/README.zh.md

@@ -35,7 +35,9 @@ DSH 的 Web 界面刻意只监听 `127.0.0.1`（CLI 为安全拒绝 `--host 0.0.
 - **多机 SSH** —— 可存任意多台主机（host/port/user + **私钥**或**密码**）。密码只存在本地，界面不回显；在设置里一键切当前机。
 - **双 tab 工作区选择器**（填充原生「Add workspace」流程）：
   - **本机** —— 走 **host 端原生系统文件夹对话框**选本地目录（或直接输入本地路径）→ 直接成为普通 DSH 本地工作区（与本地工作区共存）。优先用 DSH 的 `directoryPicker` 服务，服务缺失时**回退到插件自持的原生选择器**（macOS `osascript` / Linux `zenity`→`kdialog`）——桌面启动路径上框架服务不注册也能用。
-  - **远程** —— 选择器是**居中弹窗**（窄侧边栏也不会被挤压）。先**选机器** → 路径框**自动预填 `/`** 并**实时补全**目录；**选中一个目录立即列出它下一级**（OS/VSCode 式级联）。另有 **「浏览…」浮层**（不透明、定高、内部滚动、跟随软链），选中**回填输入框不提交**，你复核/修改后再确定。确定会创建**真实本地镜像**（`$DSH_HOME/remote-workspaces/<host>-<user>-<port>/<basename>`；仅当同主机上**别的远端路径**已占用同名 basename 时才追加短路径 hash）→ harness 把它当真实工作区收养，同时 dsh-remote 通过 SFTP 保持同步。所选工作区会**持久化到该机器**，重启不丢。
+  - **远程** —— 选择器是**居中弹窗**（窄侧边栏也不会被挤压）。先**选机器** → Windows 主机根级显示 **「此电脑」多盘视图**（`C:\`、`D:\`、`E:\`…，而不是 Git Bash 的 MSYS 根），路径框**实时补全**目录（支持 `C:\Users\…` 或 `/c/Users/…` 任意写法，Windows 路径在底层自动改写为 Git Bash 形式）；**选中一个目录立即列出它下一级**（OS/VSCode 式级联）。另有 **「浏览…」文件选择式浮层**（Windows 面包屑 `此电脑 / C:\ / Users / dev` 可点击跳级、驱动器行、大小/时间、跟随软链），选中**回填输入框不提交**，你复核/修改后再确定；「回上一级」任意深度可用（包括浮层直接打开在路径栏当前路径时）。**最近工作区**快捷入口、**`~` 主目录**、**新建目录**一键可达。确定会创建**真实本地镜像**（`$DSH_HOME/remote-workspaces/<host>-<user>-<port>/<basename>`；仅当同主机上**别的远端路径**已占用同名 basename 时才追加短路径 hash）→ harness 把它当真实工作区收养，同时 dsh-remote 通过 SFTP 保持同步。所选工作区会**持久化到该机器**，重启不丢。
+- **Git Bash 默认终端（Windows 主机）** —— 自动探测远程平台（`cmd /c ver`，附 `uname -s` 的 MINGW/MSYS 探测兜底）；Windows 机器自动定位 Git Bash（`config.shell` 可显式指定或 `native` 关闭），所有命令经 `bash -s` 从 SSH 通道 stdin 管道执行，不依赖 cmd/PowerShell，也不受引号/反斜杠转义困扰；`rw_exec` 默认在 Git Bash 形式的 cwd（`/c/Users/…`）下执行。`/dsh-remote/status`、`rw_info`、设置页「测试连接」都会报告检测到的平台与 shell。
+- **Windows 路径自动改写** —— 用户输入 `C:\Users\dev\project`（或 `C:/…`、`/c/…`、`/C:/…`）时底层自动规范为 Git Bash 形式 `/c/Users/dev/project` 执行；工作区存储与展示为 Windows 形式 `C:\Users\dev\project`。模型工具全部接受并展示两种写法；SFTP 访问使用 Win32-OpenSSH 的 `/D:/…` 形式（见 `toSftpPath`）。
 - **双向 SFTP 同步（增量）** —— `rw_sync`（远程→镜像）、`rw_push`（镜像→远程），本地镜像改动可回传机器。两者都会**跳过 size+mtime 未变化的文件**，并有**单文件大小上限**防误拉大二进制；目录遍历带**有界并发**。
 - **模型工具** —— `rw_info`、`rw_connect`、`rw_pick_workspace`、`rw_list_dir`、`rw_read_file`、`rw_write_file`、`rw_exec`（默认在工作区目录执行，可传 `cwd=`）、`rw_search`（可移植递归 grep）、`rw_download`、`rw_upload`、`rw_sync`、`rw_push`、`rw_disconnect`。
 - **直接写远程文件** —— `rw_write_file` 直接创建/覆盖远程文件（自动建父目录），单个文件改动不必绕本地镜像来回同步；`rw_download` / `rw_upload` 可单文件双向取真字节。
@@ -170,6 +172,7 @@ scripts/dev-run.sh --status    # 是否在运行
 | `password` | string | `''` | 默认 SSH 密码（非空覆盖 key） |
 | `privateKeyPath` | string | `''` | 私钥路径（仅在显式提供时使用） |
 | `workspace` | string | `''` | 默认远程工作区路径 |
+| `shell` | string | `''` | 远程命令终端策略：`''`=自动检测（Windows 找 Git Bash）、`'git-bash'`=优先 Git Bash、`'native'`=不包装、其他=显式 bash.exe 路径（如 `C:\Program Files\Git\bin\bash.exe`） |
 | `commandTimeoutMs` | int | 20000 | 单条远程命令超时 |
 | `connectTimeoutMs` | int | 15000 | SSH 连接超时 |
 | `maxFileBytes` | int | 52428800 | 镜像同步时跳过超过该大小的文件（0=不设上限） |

package/lib/client.js

@@ -86,6 +86,29 @@ window.__ModuleLoader__.load({
       return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`
     }
 
+    // Write text to the clipboard. Prefers the async Clipboard API (works on
+    // http://127.0.0.1 secure contexts) and falls back to the legacy
+    // execCommand('copy') path, mirroring primitives' writeClipboard semantics.
+    function copyToClipboard(text) {
+      if (navigator.clipboard && window.isSecureContext) {
+        return navigator.clipboard.writeText(text).then(() => true).catch(() => false)
+      }
+      try {
+        const ta = document.createElement('textarea')
+        ta.value = String(text)
+        ta.style.position = 'fixed'
+        ta.style.opacity = '0'
+        document.body.appendChild(ta)
+        ta.focus()
+        ta.select()
+        const ok = document.execCommand('copy')
+        ta.remove()
+        return Promise.resolve(ok)
+      } catch (e) {
+        return Promise.resolve(false)
+      }
+    }
+
     let WORKSPACES = null // ctx.get('workspaces'), set in apply()
     let SESSIONS = null // ctx.get('sessions'), set in apply()
 
@@ -118,7 +141,10 @@ window.__ModuleLoader__.load({
           proxy: form.proxyHost ? { host: form.proxyHost, port: Number(form.proxyPort) || 22, username: form.proxyUser || '', password: form.proxyPassword || '', privateKeyPath: form.proxyKey || '' } : undefined,
         })
           .then((r) => {
-            if (r && r.ok) { setTst('ok'); setMsg(r.latencyMs != null ? `连接成功（${r.user}@${r.host}，${r.latencyMs}ms）` : '连接成功'); refresh() }
+            if (r && r.ok) {
+              const shellTag = r.platform === 'windows' ? (r.gitBash ? '（Windows · Git Bash）' : '（Windows · 未找到 Git Bash）') : (r.platform === 'posix' ? '（POSIX）' : '')
+              setTst('ok'); setMsg(r.latencyMs != null ? `连接成功（${r.user}@${r.host}，${r.latencyMs}ms）${shellTag}` : '连接成功'); refresh()
+            }
             else { setTst('failing'); setErr((r && r.error) || '连接失败') }
           })
           .catch((e) => { setTst('failing'); setErr(String((e && e.message) || e)) })
@@ -409,25 +435,40 @@ window.__ModuleLoader__.load({
       return out
     }
 
-    // Clickable breadcrumb of the current remote path.
-    function breadcrumb(active, cur, jumpTo) {
-      const norm = String(cur || '').replace(/\/+$/, '')
-      const segs = norm === '' || norm === '/' ? [] : norm.split('/')
+    // Clickable breadcrumb of the current remote path. Windows remotes show a
+    // "This PC" root and `\` separators (此电脑 / C:\ / Users / dev); POSIX `/`.
+    function breadcrumb(active, cur, win, jumpTo) {
+      const raw = String(cur || '')
+      const isWinPath = win && (raw === '' || /^[a-zA-Z]:/.test(raw))
+      const rootLabel = isWinPath ? '此电脑' : '/'
       const crumbs = []
-      crumbs.push(React.createElement('span', { key: 'root', style: { cursor: active ? 'pointer' : 'default', color: active ? T.ok : T.muted }, onClick: active ? () => jumpTo('/') : undefined }, '/'))
-      let acc = ''
-      for (const s of segs) {
-        if (!s) continue
-        acc += '/' + s
-        crumbs.push(React.createElement('span', { key: s + '|' + acc, style: { color: T.muted } }, '/'))
-        crumbs.push(React.createElement('span', {
-          key: acc,
-          style: { cursor: active ? 'pointer' : 'default', color: active ? T.label : T.muted, fontWeight: acc === norm ? 700 : 400, whiteSpace: 'nowrap' },
-          onClick: active ? () => jumpTo(acc) : undefined,
-        }, s))
+      const rootStyle = { cursor: active ? 'pointer' : 'default', color: active ? T.ok : T.muted, whiteSpace: 'nowrap' }
+      crumbs.push(React.createElement('span', { key: 'root', style: rootStyle, onClick: active ? () => jumpTo('') : undefined }, rootLabel))
+      if (isWinPath && raw !== '') {
+        const driveM = raw.match(/^([a-zA-Z]):(.*)$/)
+        const drive = driveM[1].toUpperCase() + ':\\'
+        crumbs.push(React.createElement('span', { key: 'sep0', style: { color: T.muted } }, '\\'))
+        crumbs.push(React.createElement('span', { key: 'drive', style: { cursor: active ? 'pointer' : 'default', color: active ? T.label : T.muted, fontWeight: raw === drive ? 700 : 400, whiteSpace: 'nowrap' }, onClick: active ? () => jumpTo(drive) : undefined }, drive))
+        let acc = drive
+        for (const s of (driveM[2] || '').split('\\')) {
+          if (!s) continue
+          acc += s + '\\'
+          const target = acc.slice(0, -1)
+          crumbs.push(React.createElement('span', { key: 's|' + target, style: { color: T.muted } }, '\\'))
+          crumbs.push(React.createElement('span', { key: target, style: { cursor: active ? 'pointer' : 'default', color: active ? T.label : T.muted, fontWeight: target === raw ? 700 : 400, whiteSpace: 'nowrap' }, onClick: active ? () => jumpTo(target) : undefined }, s))
+        }
+      } else if (!isWinPath && raw !== '' && raw !== '/') {
+        const segs = raw.replace(/\/+$/, '').split('/')
+        let acc = ''
+        for (const s of segs) {
+          if (!s) continue
+          acc += '/' + s
+          crumbs.push(React.createElement('span', { key: s + '|' + acc, style: { color: T.muted } }, '/'))
+          crumbs.push(React.createElement('span', { key: acc, style: { cursor: active ? 'pointer' : 'default', color: active ? T.label : T.muted, fontWeight: acc === raw ? 700 : 400, whiteSpace: 'nowrap' }, onClick: active ? () => jumpTo(acc) : undefined }, s))
+        }
       }
-      if (!crumbs.length) crumbs.push(React.createElement('span', { key: 'empty', style: { color: T.muted } }, '/'))
-      return React.createElement('span', { key: 'crumb' }, crumbs)
+      if (crumbs.length === 1) crumbs.push(React.createElement('span', { key: 'empty', style: { color: T.muted } }, isWinPath ? ' 选择驱动器' : ''))
+      return React.createElement('span', { key: 'crumb', style: { overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', display: 'inline-block', maxWidth: '100%' } }, crumbs)
     }
 
     function DirPicker(props) {
@@ -444,6 +485,7 @@ window.__ModuleLoader__.load({
       const [suggest, setSuggest] = React.useState([])
       const [suggestOpen, setSuggestOpen] = React.useState(false)
       const [recent, setRecent] = React.useState([])
+      const [win, setWin] = React.useState(false) // remote platform: windows = Git-Bash host
       // 本机浏览浮层（browse 后端）：{ path, home, crumbs, entries, truncated }。
       const [localPop, setLocalPop] = React.useState(null)
       const [newDirName, setNewDirName] = React.useState('')
@@ -472,15 +514,29 @@ window.__ModuleLoader__.load({
         return dirs.concat(files)
       }
 
+      // Client-side full-path fallback: when the server did not attach a `path`
+      // (older host half), join base + name with the base's own separator.
+      const joinDisplay = (base, name) => {
+        const b = String(base || '')
+        const n = String(name || '')
+        if (!b || b === '/') return '/' + n
+        const sep = /^[a-zA-Z]:/.test(b) || b.includes('\\') ? '\\' : '/'
+        return b.replace(/[\\/]+$/, '') + sep + n
+      }
+
       const loadLevels = (id, p, toIndex) => {
         if (!id) return
         setLoading(true); setErr('')
         api('POST', '/dsh-remote/current', { id }).catch(() => {})
         .then(() => api('GET', '/dsh-remote/ls?path=' + encodeURIComponent(p || '')))
         .then((res) => {
+          setWin(res && res.platform === 'windows')
           const real = res && res.path ? res.path : (p || '')
+          // Server returns [{ type, name, size, mtime, path }] where `path` is
+          // the FULL display-form path (C:\Users\dev on Windows) — the client
+          // never joins paths itself, so drives and Windows paths just work.
           const list = Array.isArray(res && res.items)
-            ? res.items.map((it) => ({ name: it.name, dir: it.type === 'dir', size: it.size, mtime: it.mtime }))
+            ? res.items.map((it) => ({ name: it.name, dir: it.type === 'dir', size: it.size, mtime: it.mtime, path: it.path || joinDisplay(real, it.name), drive: !!it.drive }))
             : parseLs(res && res.text)
           const node = { path: real, dirs: sortItems(list.filter((it) => it.dir)), all: sortItems(list) }
           setLevels((prev) => {
@@ -496,6 +552,9 @@ window.__ModuleLoader__.load({
       }
 
       React.useEffect(() => { if (open) {
+        // Bug fix: the picker must NOT reopen with the previous selection's
+        // path — reset the path bar (and the browse state) on every open.
+        setPath(''); setLevels(null); setWin(false)
         setLocalPop(null); setNewDirName('')
         api('GET', '/dsh-remote/machines').then((r) => {
           setMachines(r.machines || [])
@@ -548,19 +607,47 @@ window.__ModuleLoader__.load({
 
       const switchTab = (t) => {
         setTab(t); setErr('')
+        // each tab keeps its own path — never leak the other tab's selection
+        setPath('')
         if (t === 'remote') {
+          // Windows remotes show a "This PC" drive view at the root; POSIX shows
+          // the filesystem root. Either way loadLevels('') lists that root.
           if (machineId) loadLevels(machineId, '', 0)
-          if (!path.trim()) { setPath('/'); loadSuggestions('/') }
         }
       }
 
-      const enterDir = (name) => {
-        if (busy || loading) return
+      // Parent path of a display-form remote path (client-side, both separators).
+      const parentOf = (p) => {
+        const t = String(p || '')
+        if (!t || t === '/') return null
+        const win = /^[a-zA-Z]:/.test(t)
+        if (win && /^[a-zA-Z]:\\?$/.test(t)) return null // drive root: no parent
+        const sep = win ? '\\' : '/'
+        const idx = t.lastIndexOf(sep)
+        if (idx <= 0) return null
+        const par = t.slice(0, idx)
+        if (win && /^[a-zA-Z]:$/.test(par)) return par + '\\'
+        return par || '/'
+      }
+
+      // enterDir(it): drive into the given entry — `it.path` is the FULL
+      // display-form path from the server (drives C:\, Windows and POSIX alike).
+      const enterDir = (it) => {
+        if (busy || loading || !it || !it.dir) return
+        loadLevels(machineId, it.path, (levels ? levels.length : 0))
+      }
+
+      // Navigate one level up in the browse popup. When the current level was
+      // opened directly at a deep path (levels.length === 1 — e.g. the popup
+      // was opened at the path bar's value) the parent is loaded as the new top
+      // level instead of being disabled.
+      const goUp = () => {
+        if (loading) return
         const last = levels && levels.length ? levels[levels.length - 1] : null
-        const base = last && last.path ? last.path : ''
-        const sep = base.includes('\\') ? '\\' : '/'
-        const next = base === '/' ? '/' + name : (base ? base + sep + name : name)
-        loadLevels(machineId, next, (levels ? levels.length : 0))
+        if (!last) return
+        if (levels.length > 1) { setLevels((p) => p.slice(0, p.length - 1)); return }
+        const par = parentOf(last.path)
+        if (par) loadLevels(machineId, par, 1)
       }
 
       const loadSuggestions = (raw, mid) => {
@@ -568,20 +655,23 @@ window.__ModuleLoader__.load({
         if (!id || !raw) { setSuggest([]); setSuggestOpen(false); return }
         const t = String(raw || '').trim()
         if (!t) { setSuggest([]); setSuggestOpen(false); return }
-        const isWin = t.includes('\\')
-        const sep = isWin ? '\\' : '/'
-        const slash = t.lastIndexOf(sep)
-        const parent = slash <= 0 ? (isWin ? t.match(/^[a-zA-Z]:\\?/) ? t : '' : '/') : t.slice(0, slash)
-        const lastSeg = slash < 0 ? t : t.slice(slash + 1)
+        // Separator-aware split: `\` when the input looks like a Windows path.
+        const backslash = t.includes('\\') || /^[a-zA-Z]:/.test(t)
+        const sep = backslash ? '\\' : '/'
+        const idx = t.lastIndexOf(sep)
+        let parent, lastSeg
+        if (idx < 0) { parent = backslash ? t + '\\' : '/'; lastSeg = backslash ? '' : t }
+        else if (idx === t.length - 1) { parent = t.slice(0, idx) || '/'; lastSeg = '' }
+        else { parent = t.slice(0, idx) || '/'; lastSeg = t.slice(idx + 1) }
         api('POST', '/dsh-remote/current', { id }).catch(() => {})
         .then(() => api('GET', '/dsh-remote/ls?path=' + encodeURIComponent(parent || '/')))
         .then((res) => {
           const list = Array.isArray(res && res.items)
-            ? res.items.map((it) => ({ name: it.name, dir: it.type === 'dir' }))
-            : parseLs(res && res.text)
-          const base = parent === '/' ? '/' : parent
-          const matches = list.filter((it) => it.name.toLowerCase().startsWith(String(lastSeg).toLowerCase()))
-            .slice(0, 40).map((it) => (base === '/' || !base ? sep + it.name : base + sep + it.name))
+            ? res.items.map((it) => ({ name: it.name, dir: it.type === 'dir', path: it.path || joinDisplay(parent, it.name) }))
+            : []
+          const matches = list
+            .filter((it) => it.dir && (!lastSeg || it.name.toLowerCase().startsWith(String(lastSeg).toLowerCase())))
+            .slice(0, 40).map((it) => it.path)
           setSuggest(matches)
           setSuggestOpen(!!matches.length)
         }).catch(() => { setSuggest([]); setSuggestOpen(false) })
@@ -596,23 +686,20 @@ window.__ModuleLoader__.load({
       const continueSuggest = (dir) => {
         if (!machineId || !dir) { setSuggest([]); setSuggestOpen(false); return }
         setSuggestOpen(false)
-        const sep = String(dir).includes('\\') ? '\\' : '/'
         api('POST', '/dsh-remote/current', { id: machineId }).catch(() => {})
         .then(() => api('GET', '/dsh-remote/ls?path=' + encodeURIComponent(String(dir).replace(/[\\/]+$/, '') || '/')))
         .then((res) => {
           const list = Array.isArray(res && res.items)
-            ? res.items.map((it) => ({ name: it.name, dir: it.type === 'dir' }))
-            : parseLs(res && res.text)
-          const base = String(dir).replace(/[\\/]+$/, '') === '' ? '/' : String(dir).replace(/[\\/]+$/, '')
-          // Show every entry (dirs + files), matching loadSuggestions — the
-          // previous dir-only filter made the next-level list look truncated.
-          const kids = list.slice(0, 40).map((it) => (base === '/' ? sep + it.name : base + sep + it.name))
+            ? res.items.map((it) => ({ name: it.name, dir: it.type === 'dir', path: it.path || joinDisplay(dir, it.name) }))
+            : []
+          const kids = list.slice(0, 40).map((it) => it.path)
           setSuggest(kids)
           setSuggestOpen(!!kids.length)
         }).catch(() => { setSuggest([]); setSuggestOpen(false) })
       }
 
       const selectSuggestion = (s) => {
+        if (!s) { setSuggestOpen(false); return }
         // Auto-append the trailing separator so the path reads as a directory
         // and the user can keep typing the next segment right away.
         const sep = String(s).includes('\\') ? '\\' : '/'
@@ -732,27 +819,27 @@ window.__ModuleLoader__.load({
         const entries = last.all || []
         return React.createElement('div', { style: { border: '1px solid ' + T.borderStrong, borderRadius: 10, background: v('--dsw-alias-bg-overlay', '#1e1e1e'), boxShadow: '0 8px 32px rgba(0,0,0,0.4)', display: 'flex', flexDirection: 'column', maxHeight: 'min(300px, 46vh)', overflow: 'hidden' } },
           React.createElement('div', { style: { display: 'flex', gap: 6, alignItems: 'center', padding: '6px 10px', borderBottom: '1px solid ' + T.border } },
-            React.createElement('button', { style: { ...buttonS, padding: '2px 8px' }, onClick: () => setLevels((p) => p && p.length > 1 ? p.slice(0, p.length - 1) : p), disabled: levels.length <= 1 || loading }, '回上一级 ▴'),
-            React.createElement('div', { style: { fontSize: 11, opacity: 0.75, fontFamily: 'monospace', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', flex: 1 } }, breadcrumb(machineId, last.path, (p) => setLevels((prev) => { const cut = (prev || []).findIndex((lv) => lv.path === p); return cut >= 0 ? prev.slice(0, cut + 1) : prev }))),
+            React.createElement('button', { style: { ...buttonS, padding: '2px 8px' }, onClick: goUp, disabled: loading || (levels.length <= 1 && !parentOf(last.path)) }, '回上一级 ▴'),
+            React.createElement('div', { style: { fontSize: 11, opacity: 0.75, fontFamily: 'monospace', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', flex: 1 } }, breadcrumb(!!machineId, last.path, win, (p) => setLevels((prev) => { const cut = (prev || []).findIndex((lv) => lv.path === p); return cut >= 0 ? prev.slice(0, cut + 1) : prev }))),
             React.createElement('button', { style: { ...buttonS, padding: '2px 8px' }, onClick: mkdirHere }, '新建目录'),
             React.createElement('button', { style: { ...buttonS, padding: '2px 8px' }, onClick: () => setPopOpen(false) }, '关闭 ✕'),
           ),
           React.createElement('div', { style: { overflowY: 'auto', overflowX: 'hidden' } },
             loading ? React.createElement('div', { style: { opacity: 0.7, padding: 12 } }, '加载中…')
               : (entries.length ? entries.slice(0, 400).map((it, i) => React.createElement('div', {
-                  key: i, title: (it.dir ? '进入 ' : '文件: ') + it.name,
-                  onClick: it.dir ? () => enterDir(it.name) : undefined,
+                  key: i, title: it.drive ? '进入驱动器 ' + it.name : (it.dir ? '进入 ' + it.name : '文件: ' + it.name),
+                  onClick: it.dir ? () => enterDir(it) : undefined,
                   style: { padding: '6px 10px', cursor: it.dir ? 'pointer' : 'default', color: T.label, whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', display: 'flex', gap: 8, alignItems: 'center', fontSize: 13, borderBottom: '1px solid ' + T.border },
                 },
-                  React.createElement('span', { style: { flexShrink: 0, display: 'inline-flex', color: T.label } }, it.dir
+                  React.createElement('span', { style: { flexShrink: 0, display: 'inline-flex', color: T.label, fontSize: 13 } }, it.drive ? '💽' : (it.dir
                     ? React.createElement('svg', { width: 14, height: 14, viewBox: '0 0 16 16', fill: 'currentColor' }, React.createElement('path', { d: 'M1.5 3.5A1.5 1.5 0 0 1 3 2h3.2a1.5 1.5 0 0 1 1.06.44L8.5 3.7h4.5A1.5 1.5 0 0 1 14.5 5.2V12A1.5 1.5 0 0 1 13 13.5H3A1.5 1.5 0 0 1 1.5 12V3.5Zm2.5 1a.5.5 0 0 0 0 1h1.2a.5.5 0 0 0 0-1H4Z' }))
-                    : React.createElement('svg', { width: 14, height: 14, viewBox: '0 0 16 16', fill: 'currentColor', opacity: 0.85 }, React.createElement('path', { d: 'M3.5 1.5a1 1 0 0 0-1 1v11a1 1 0 0 0 1 1h9a1 1 0 0 0 1-1V5.2a1 1 0 0 0-.29-.7L10.5 1.79a1 1 0 0 0-.7-.29H3.5Zm1.5 3h2.25a.75.75 0 0 1 0 1.5H5a.75.75 0 0 1 0-1.5ZM5 9.5h6a.75.75 0 0 1 0 1.5H5a.75.75 0 0 1 0-1.5Zm0 2.25h4a.75.75 0 0 1 0 1.5H5a.75.75 0 0 1 0-1.5Z' }))),
+                    : React.createElement('svg', { width: 14, height: 14, viewBox: '0 0 16 16', fill: 'currentColor', opacity: 0.85 }, React.createElement('path', { d: 'M3.5 1.5a1 1 0 0 0-1 1v11a1 1 0 0 0 1 1h9a1 1 0 0 0 1-1V5.2a1 1 0 0 0-.29-.7L10.5 1.79a1 1 0 0 0-.7-.29H3.5Zm1.5 3h2.25a.75.75 0 0 1 0 1.5H5a.75.75 0 0 1 0-1.5ZM5 9.5h6a.75.75 0 0 1 0 1.5H5a.75.75 0 0 1 0-1.5Zm0 2.25h4a.75.75 0 0 1 0 1.5H5a.75.75 0 0 1 0-1.5Z' })))),
                   React.createElement('span', { style: { overflow: 'hidden', textOverflow: 'ellipsis', flex: 1 } }, it.name),
                   React.createElement('span', { style: { fontSize: 11, opacity: 0.55, flexShrink: 0, fontFamily: 'monospace' } }, it.dir ? '' : (humanSize(it.size) + (it.mtime ? '  ' + fmtTime(it.mtime) : ''))),
                 )) : React.createElement('div', { style: { opacity: 0.6, padding: 12 } }, '（空目录）')),
           ),
           React.createElement('div', { style: { display: 'flex', gap: 8, justifyContent: 'flex-end', alignItems: 'center', padding: '6px 10px', borderTop: '1px solid ' + T.border } },
-            React.createElement('span', { style: { fontSize: 11, opacity: 0.75, fontFamily: 'monospace', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', flex: 1 } }, '所选: ' + last.path),
+            React.createElement('span', { style: { fontSize: 11, opacity: 0.75, fontFamily: 'monospace', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', flex: 1 } }, '所选: ' + (last.path || (win ? '（驱动器根）' : '/'))),
             React.createElement('button', { style: { ...buttonS, fontWeight: 600 }, onClick: () => { acceptBrowserPick(last.path); setPopOpen(false) } }, '选用此路径'),
           ),
         )
@@ -791,7 +878,7 @@ window.__ModuleLoader__.load({
                   mOpen
                     ? React.createElement('div', { style: { position: 'absolute', top: '100%', left: 0, zIndex: 1000, marginTop: 2, minWidth: 300, maxHeight: 260, overflow: 'auto', background: v('--dsw-alias-bg-overlay', '#1f1f23'), border: '1px solid ' + T.border, borderRadius: T.radius, padding: 4 } },
                         machines.length
-                          ? machines.map((m) => React.createElement('div', { key: m.id, onClick: () => { setMachineId(m.id); setRecent(m.recentWorkspaces || []); setLevels(null); setMOpen(false); if (m.id) { loadLevels(m.id, '', 0); if (!path.trim()) { setPath('/'); loadSuggestions('/', m.id) } } }, style: { padding: '6px 8px', borderRadius: 4, cursor: 'pointer', color: m.id === machineId ? T.ok : 'inherit' } }, m.name + '  (' + m.username + '@' + m.host + ':' + m.port + ')'))
+                          ? machines.map((m) => React.createElement('div', { key: m.id, onClick: () => { setMachineId(m.id); setRecent(m.recentWorkspaces || []); setLevels(null); setPath(''); setMOpen(false); if (m.id) loadLevels(m.id, '', 0) }, style: { padding: '6px 8px', borderRadius: 4, cursor: 'pointer', color: m.id === machineId ? T.ok : 'inherit' } }, m.name + '  (' + m.username + '@' + m.host + ':' + m.port + ')'))
                           : React.createElement('div', { style: { padding: 6, opacity: 0.6 } }, '还没有机器，请先在设置里添加'),
                       )
                     : null,
@@ -803,8 +890,8 @@ window.__ModuleLoader__.load({
                 recent.map((w, i) => React.createElement('button', { key: w + i, onClick: () => { setPath(w); setErr(''); continueSuggest(w) }, style: { ...buttonS, padding: '2px 8px', fontSize: 11, fontFamily: 'monospace' } }, w))) : null,
               React.createElement('div', { ref: suggestRef, style: { position: 'relative' } },
                 React.createElement('div', { style: { display: 'flex', gap: 6, flexWrap: 'wrap' } },
-                  React.createElement('input', { value: path, onChange: (e) => onPathChange(e.target.value), onFocus: () => loadSuggestions(path), placeholder: (machineId ? '输入远程路径（自动补全）' : '先选远程机器'), disabled: !machineId, style: { ...inputS, flex: 1, minWidth: 120 } }),
-                  React.createElement('button', { style: { ...buttonS, whiteSpace: 'nowrap' }, onClick: () => { if (machineId) setPopOpen(true) }, disabled: !machineId }, '浏览…'),
+                  React.createElement('input', { value: path, onChange: (e) => onPathChange(e.target.value), onFocus: () => loadSuggestions(path), placeholder: (machineId ? (win ? '输入远程路径，如 C:\\Users\\…（自动补全）' : '输入远程路径（自动补全）') : '先选远程机器'), disabled: !machineId, style: { ...inputS, flex: 1, minWidth: 120 } }),
+                  React.createElement('button', { style: { ...buttonS, whiteSpace: 'nowrap' }, onClick: () => { if (!machineId) return; const p = path.trim(); loadLevels(machineId, p || '', 0); setPopOpen(true) }, disabled: !machineId }, '浏览…'),
                   React.createElement('button', { style: { ...buttonS, whiteSpace: 'nowrap' }, onClick: pickHome, disabled: !machineId }, '~ 主目录'),
                 ),
                 (suggestOpen && suggest.length)
@@ -916,6 +1003,8 @@ window.__ModuleLoader__.load({
       const [menu, setMenu] = React.useState(null) // { x, y, path, isDir, name }
       const [rootOpen, setRootOpen] = React.useState(true) // first level expanded by default
       const [hoverPath, setHoverPath] = React.useState('') // row hover highlight
+      /** Row whose path was just copied — shows a brief「已复制」label. */
+      const [copiedPath, setCopiedPath] = React.useState('')
       const expanded = Array.isArray(props.expanded) ? props.expanded : []
 
       const storeLevel = (path, level) => {
@@ -923,8 +1012,13 @@ window.__ModuleLoader__.load({
         setData(dataRef.current)
       }
 
-      const loadDir = React.useCallback((dir) => {
+      const loadDir = React.useCallback((dir, opts) => {
         const cur = dataRef.current
+        const existing = cur[dir]
+        // If we already have data (entries loaded) and this is a background
+        // refresh, keep what we have — don't flash a loading state over a
+        // populated tree.
+        if (existing && !existing.loading && opts && opts.keep) return
         if (cur[dir] !== undefined && !cur[dir].loading) return
         storeLevel(dir, { loading: true })
         listRemoteDir(dir)
@@ -937,7 +1031,17 @@ window.__ModuleLoader__.load({
             })
             storeLevel(dir, { entries: sorted })
           })
-          .catch((e) => storeLevel(dir, { error: String((e && e.message) || e) }))
+          .catch((e) => {
+            // Keep any previously-loaded entries under this dir (so a transient
+            // SFTP failure doesn't collapse the whole subtree); surface a
+            // message only when there was nothing to show before.
+            const prev = dataRef.current[dir]
+            if (prev && prev.entries) {
+              storeLevel(dir, { ...prev, softError: String((e && e.message) || e) })
+            } else {
+              storeLevel(dir, { error: String((e && e.message) || e) })
+            }
+          })
       }, [])
 
       // Resolve this session's remote root, then load it and every expanded dir.
@@ -946,13 +1050,32 @@ window.__ModuleLoader__.load({
       // own workspace dir.
       const scopeCwd = props.scope && props.scope.cwd
       const sessionId = props.scope && props.scope.sessionId
-      const refreshStatus = React.useCallback(() => {
-        const applyRoot = (r) => {
+      const rootRef = React.useRef('')
+      const refreshStatus = React.useCallback((opts) => {
+        const applyRoot = (r, connected) => {
+          const prevRoot = rootRef.current
+          rootRef.current = r
           setRoot(r)
-          setData({})
-          dataRef.current = {}
+          // Full reset ONLY when the session's remote root actually changed
+          // (different workspace / different conversation). When we just come
+          // back to this tab with the same workspace, keep the loaded tree so
+          // expanded dirs and their contents stay put.
+          const sameRoot = prevRoot && r && prevRoot === r
+          if (!sameRoot) {
+            setData({})
+            dataRef.current = {}
+          }
           if (r) {
-            storeLevel(r, { loading: true })
+            // Not connected (e.g. freshly restarted, machine no longer active):
+            // show a clear disconnected state instead of firing ls requests
+            // that all fail with AggregateError / 500 in a loop.
+            if (!connected) {
+              storeLevel(r, { error: '未连接远程主机（重启后需在设置中将机器「设为当前」，或刷新右侧列）' })
+              return
+            }
+            if (!sameRoot) {
+              storeLevel(r, { loading: true })
+            }
             listRemoteDir(r)
               .then((res) => {
                 const items = Array.isArray(res && res.items) ? res.items : []
@@ -961,10 +1084,19 @@ window.__ModuleLoader__.load({
                   if (a.type !== 'dir' && b.type === 'dir') return 1
                   return String(a.name).localeCompare(String(b.name))
                 })
-                storeLevel(r, { entries: sorted })
-                for (const dir of expanded) loadDir(dir)
+                storeLevel(r, { entries: sorted, missing: !!(res && res.missing) })
+                for (const dir of expanded) loadDir(dir, { keep: true })
+              })
+              .catch((e) => {
+                // Transient connection failure: keep the previously visible
+                // root level so the tree doesn't collapse to an error.
+                const prev = dataRef.current[r]
+                if (prev && prev.entries) {
+                  storeLevel(r, { ...prev, softError: String((e && e.message) || e) })
+                } else {
+                  storeLevel(r, { error: String((e && e.message) || e) })
+                }
               })
-              .catch((e) => storeLevel(r, { error: String((e && e.message) || e) }))
           }
         }
         const resolveRoot = () => {
@@ -982,20 +1114,44 @@ window.__ModuleLoader__.load({
             // Issue #13: NEVER fall back to the machine-level workspace here —
             // a session whose cwd is not a mirror is a LOCAL session and shows
             // the "no remote workspace" empty state instead.
-            applyRoot(r || '')
+            applyRoot(r || '', !!(s && s.connected))
           })
         })
       }, [scopeCwd, sessionId])
 
       React.useEffect(() => { refreshStatus() }, [refreshStatus])
-      React.useEffect(() => { if (props.visible) refreshStatus() }, [props.visible])
-      // Load dirs as they get expanded.
-      React.useEffect(() => { if (root) for (const dir of expanded) loadDir(dir) }, [root, expanded, loadDir])
+      React.useEffect(() => { if (props.visible) refreshStatus({ visible: true }) }, [props.visible])
+      // Load dirs as they get expanded (keep already-loaded content).
+      React.useEffect(() => { if (root) for (const dir of expanded) loadDir(dir, { keep: true }) }, [root, expanded, loadDir])
+      // ── Context-menu portal: append to document.body so the sidebar's
+      //    overflow/transform cannot clip it. Pure DOM, no React portal needed.
       React.useEffect(() => {
         if (!menu) return
-        const close = () => setMenu(null)
-        document.addEventListener('mousedown', close)
-        return () => document.removeEventListener('mousedown', close)
+        const host = document.createElement('div')
+        host.style.cssText = 'position:fixed;z-index:999999;pointer-events:auto'
+        const box = document.createElement('div')
+        box.style.cssText = 'position:fixed;left:' + menu.x + 'px;top:' + menu.y + 'px;z-index:999999;background:#1f1f23;border:1px solid rgba(128,128,128,0.5);border-radius:8px;padding:4px;box-shadow:0 8px 24px rgba(0,0,0,0.4);min-width:170;font-family:system-ui,sans-serif'
+        const mkItem = (label, danger, fn) => {
+          const d = document.createElement('div')
+          d.textContent = label
+          d.style.cssText = 'padding:6px 10px;cursor:pointer;font-size:12px;color:' + (danger ? '#e06c75' : '#e4e4e7') + ';border-radius:4px;white-space:nowrap;transition:background 0.1s'
+          d.onmouseenter = () => { d.style.background = 'rgba(128,128,128,0.14)' }
+          d.onmouseleave = () => { d.style.background = 'transparent' }
+          d.addEventListener('click', (e) => { e.stopPropagation(); setMenu(null); fn() })
+          return d
+        }
+        box.appendChild(mkItem(menu.isDir ? '📂 展开/收起' : '📄 打开文件', false, () => { if (menu.isDir) { if (props.onToggleDir) props.onToggleDir(menu.path) } else openFile(menu.path) }))
+        box.appendChild(mkItem('⬇ 下载到本地镜像', false, () => doFs('download', { path: menu.path })))
+        box.appendChild(mkItem('📋 复制相对地址', false, () => copyPath(relPath(menu.path), menu.path)))
+        box.appendChild(mkItem('📋 复制绝对地址', false, () => copyPath(menu.path, menu.path)))
+        box.appendChild(mkItem('✏ 重命名', false, () => { const nm = window.prompt('重命名为（新名字）', menu.name); if (nm && nm.trim() && nm.trim() !== menu.name) doFs('rename', { path: menu.path, dest: joinRemote(String(menu.path).replace(/[\\/][^\\/]*$/, ''), nm.trim()) }, true) }))
+        box.appendChild(mkItem('🗑 删除' + (menu.isDir ? '（含子目录）' : ''), true, () => { if (window.confirm('确认删除 ' + menu.path + '？')) doFs('remove', { path: menu.path }, true) }))
+        host.appendChild(box)
+        document.body.appendChild(host)
+        const close = (e) => { if (!box.contains(e.target)) { setMenu(null) } }
+        // Delay adding listener so the same mousedown that opened the menu doesn't close it
+        const tid = setTimeout(() => document.addEventListener('mousedown', close), 0)
+        return () => { clearTimeout(tid); document.removeEventListener('mousedown', close); host.remove() }
       }, [menu])
 
       const openFile = (p) => {
@@ -1028,6 +1184,32 @@ window.__ModuleLoader__.load({
         style: { padding: '6px 10px', cursor: 'pointer', fontSize: 12, color: danger ? '#e06c75' : '#e4e4e7', borderRadius: 4, whiteSpace: 'nowrap' },
       }, label)
 
+      // The path shown by「复制相对地址」: relative to this session's remote
+      // workspace root (mirror of the built-in local tree's cwd-relative copy).
+      const relPath = (p) => {
+        if (!root) return p
+        const r = String(root).replace(/[\\/]+$/, '')
+        const s = String(p)
+        if (s === r) return '.'
+        if (s.startsWith(r + '/')) return s.slice(r.length + 1)
+        if (s.startsWith(r + '\\')) return s.slice(r.length + 1)
+        return s
+      }
+      // Copy `text`, then briefly flag the row whose path was copied.
+      const copyPath = (text, path) => {
+        copyToClipboard(text).then((ok) => {
+          if (!ok) return
+          setCopiedPath(path)
+          window.setTimeout(() => {
+            setCopiedPath((cur) => (cur === path ? '' : cur))
+          }, 1200)
+        })
+      }
+      /** Trailing「已复制」feedback for a row (after a successful copy). */
+      const copiedMark = (path) => (copiedPath === path
+        ? React.createElement('span', { style: { fontSize: 11, opacity: 0.75, flexShrink: 0, color: T.ok } }, '已复制')
+        : null)
+
       // One tree row (dir toggles via the framework's onToggleDir; file opens).
       // Text uses the normal foreground (theme-following) — no accent green.
       const row = (entry, depth) => {
@@ -1055,6 +1237,7 @@ window.__ModuleLoader__.load({
             },
               React.createElement('span', { style: { flexShrink: 0, color: T.label, display: 'inline-flex' } }, IconFolder(isOpen)),
               React.createElement('span', { style: { overflow: 'hidden', textOverflow: 'ellipsis', flex: 1, fontWeight: 500 } }, entry.name),
+              copiedMark(entry.path),
             ),
             isOpen ? renderLevel(entry.path, depth + 1) : null,
           )
@@ -1071,7 +1254,11 @@ window.__ModuleLoader__.load({
         },
           React.createElement('span', { style: { flexShrink: 0, display: 'inline-flex' } }, IconFile()),
           React.createElement('span', { style: { overflow: 'hidden', textOverflow: 'ellipsis', flex: 1 } }, entry.name),
-          entry.size != null ? React.createElement('span', { style: { fontSize: 11, opacity: 0.55, flexShrink: 0, fontFamily: 'monospace' } }, humanSize(entry.size)) : null,
+          copiedMark(entry.path),
+          (entry.size != null || entry.mtime)
+            ? React.createElement('span', { style: { fontSize: 11, opacity: 0.55, flexShrink: 0, fontFamily: 'monospace' } },
+                humanSize(entry.size) + (entry.mtime ? '  ' + fmtTime(entry.mtime) : ''))
+            : null,
         )
       }
 
@@ -1080,12 +1267,21 @@ window.__ModuleLoader__.load({
         if (level === undefined || (level.loading && !level.entries)) {
           return React.createElement('div', { key: dir + ':loading', style: { display: 'flex', alignItems: 'center', gap: 6, padding: '5px 8px', paddingLeft: depth * 22 + 6, fontSize: 13, opacity: 0.6 } }, '加载中…')
         }
+        if (level.missing) {
+          return React.createElement('div', { key: dir + ':missing', style: { display: 'flex', alignItems: 'center', gap: 6, padding: '5px 8px', paddingLeft: depth * 22 + 6, fontSize: 13, opacity: 0.6 } }, '目录不存在或已被删除')
+        }
         if (level.error !== undefined) {
           return React.createElement('div', { key: dir + ':err', style: { display: 'flex', alignItems: 'center', gap: 6, padding: '5px 8px', paddingLeft: depth * 22 + 6, fontSize: 13, color: '#e06c75' } }, level.error)
         }
         const items = level.entries || []
-        if (!items.length) return null
-        return React.createElement('div', { key: dir + ':list' }, items.map((it) => row({ ...it, path: joinRemote(dir, it.name) }, depth)))
+        const soft = level.softError
+          ? React.createElement('div', { key: dir + ':softerr', style: { display: 'flex', alignItems: 'center', gap: 6, padding: '5px 8px', paddingLeft: depth * 22 + 6, fontSize: 11, opacity: 0.6, color: '#e6c07b' } }, '⚠ ' + level.softError + '（显示缓存，可点 ↻ 刷新）')
+          : null
+        if (!items.length) return soft || null
+        return React.createElement('div', { key: dir + ':list' },
+          items.map((it) => row({ ...it, path: joinRemote(dir, it.name) }, depth)),
+          soft,
+        )
       }
 
       const rootName = root ? String(root).split(/[\\/]/).filter(Boolean).pop() || root : ''
@@ -1124,18 +1320,8 @@ window.__ModuleLoader__.load({
                 rootLevel && rootOpen ? renderLevel(root, 1) : null,
               ),
         ),
-        // context menu
-        menu ? React.createElement('div', { style: { position: 'fixed', left: menu.x, top: menu.y, zIndex: 9998, background: v('--dsw-alias-bg-overlay', '#1f1f23'), border: '1px solid ' + T.borderStrong, borderRadius: 8, padding: 4, boxShadow: '0 8px 24px rgba(0,0,0,0.4)', minWidth: 170 }, onClick: (e) => e.stopPropagation() },
-          ctxItem(menu.isDir ? '📂 展开/收起' : '📄 打开文件', false, () => { if (menu.isDir) { if (props.onToggleDir) props.onToggleDir(menu.path) } else openFile(menu.path) }),
-          ctxItem('⬇ 下载到本地镜像', false, () => doFs('download', { path: menu.path })),
-          ctxItem('✏ 重命名', false, () => {
-            const nm = window.prompt('重命名为（新名字）', menu.name)
-            if (nm && nm.trim() && nm.trim() !== menu.name) doFs('rename', { path: menu.path, dest: joinRemote(String(menu.path).replace(/[\\/][^\\/]*$/, ''), nm.trim()) }, true)
-          }),
-          ctxItem('🗑 删除' + (menu.isDir ? '（含子目录）' : ''), true, () => {
-            if (window.confirm('确认删除 ' + menu.path + '？')) doFs('remove', { path: menu.path }, true)
-          }),
-        ) : null,
+        // context menu — now rendered via DOM portal in useEffect above
+        null,
         err ? React.createElement('div', { style: { color: '#e06c75', fontSize: 12, padding: '4px 8px' } }, (busy ? '处理中… ' : '') + err) : null,
       )
     }

package/lib/index.js

@@ -30,7 +30,7 @@ import iconv from 'iconv-lite'
 
 import {
   shq, normalizeRemotePath, joinRemotePath, remoteDirname, mkdirRemoteDirs,
-  toSftpPath, remotePathBase, truncate, shortHash, relPathUnder,
+  toSftpPath, toShellPath, toDisplayPath, remotePathBase, truncate, shortHash, relPathUnder,
 } from './paths.js'
 import { blobAlgorithm, keyFingerprint } from './hostkey.js'
 import { compileIgnore, DEFAULT_IGNORE } from './ignore.js'
@@ -68,6 +68,12 @@ export const Config = z.object({
   passphrase: z.string().default(''),
   /** Initial remote workspace path (absolute dir the agent should treat as root). */
   workspace: z.string().default(''),
+  /** Remote command terminal strategy. '' = auto-detect (Windows remotes look
+   * for Git Bash and pipe every command through `bash -s`); 'git-bash' = prefer
+   * Git Bash on Windows; 'native' = never wrap; any other value = explicit
+   * bash.exe path (e.g. 'C:\\Program Files\\Git\\bin\\bash.exe'). Git Bash makes
+   * a Windows remote behave like a POSIX host (/c/Users/... paths). */
+  shell: z.string().default(''),
   /** Per-command timeout. */
   commandTimeoutMs: z.number().step(1).min(1000).default(20000),
   /** SSH connection establishment timeout. */
@@ -306,6 +312,14 @@ class SshPool {
     // Generational token: bumped on every target change / close so a stale
     // in-flight connect can never hand this pool a connection to an old host.
     this.epoch = 0
+    /** Auto-detected remote platform: unknown | windows | posix (per target). */
+    this.platform = 'unknown'
+    /** Resolved Git Bash bash.exe path on Windows remotes ('' when none). */
+    this.gitBashPath = ''
+    /** Resolved terminal strategy: native | git-bash. */
+    this.shellMode = 'native'
+    /** In-flight platform detection promise (cached). */
+    this._detecting = null
     /** Optional async resolver for a machine-stored (keychain) password. */
     this.passwordResolver = null
     /** Optional hook called with the live client after a successful connect. */
@@ -333,6 +347,11 @@ class SshPool {
     if (keyboardInteractive !== undefined) this.config.keyboardInteractive = !!keyboardInteractive
     if (proxy !== undefined) this.config.proxy = proxy
     if (hostKeyMode !== undefined) this.config.hostKeyMode = String(hostKeyMode)
+    // the new target may be a different OS — re-detect on the next command
+    this.platform = 'unknown'
+    this.gitBashPath = ''
+    this.shellMode = 'native'
+    this._detecting = null
     this.close()
     return this
   }
@@ -470,25 +489,133 @@ class SshPool {
     })
   }
 
+  /** Detect the remote platform + locate Git Bash once; cached per target. */
+  detect() {
+    if (this.platform !== 'unknown') return Promise.resolve()
+    if (this._detecting) return this._detecting
+    this._detecting = this._detect().finally(() => {
+      this._detecting = null
+    })
+    return this._detecting
+  }
+
+  async _detect() {
+    let res
+    try {
+      // `cmd /c ver` works under cmd.exe, PowerShell AND Git Bash (all print
+      // "Microsoft Windows …"); on POSIX hosts `cmd` simply doesn't exist.
+      res = await this._execRaw('cmd /c ver', { timeoutMs: Math.min(this.config.commandTimeoutMs, 8000) })
+    } catch (err) {
+      this.platform = 'unknown'
+      this.shellMode = 'native'
+      return
+    }
+    const out = String(res.stdout || '') + '\n' + String(res.stderr || '')
+    if (res.code === 0 && /microsoft windows/i.test(out)) {
+      this.platform = 'windows'
+      await this._resolveGitBash()
+      return
+    }
+    // inconclusive — probe for a Git-Bash/MSYS remote (uname prints MINGW64_NT…)
+    try {
+      const u = await this._execRaw('uname -s', { timeoutMs: Math.min(this.config.commandTimeoutMs, 8000) })
+      if (/mingw|msys|cygwin/i.test(String(u.stdout || ''))) {
+        this.platform = 'windows'
+        await this._resolveGitBash()
+        return
+      }
+    } catch {}
+    this.platform = 'posix'
+    this.shellMode = 'native'
+    this.gitBashPath = ''
+  }
+
+  /** On a Windows remote, locate Git Bash (config path → PATH → common installs). */
+  async _resolveGitBash() {
+    const cfg = String(this.config.shell || '').trim()
+    if (cfg && cfg !== 'git-bash' && cfg !== 'native') {
+      if (await this._cmdExists(cfg)) {
+        this.gitBashPath = cfg
+        this.shellMode = 'git-bash'
+        return
+      }
+    }
+    if (cfg === 'native') {
+      this.shellMode = 'native'
+      this.gitBashPath = ''
+      return
+    }
+    try {
+      const r = await this._execRaw('cmd /c where bash', { timeoutMs: 8000 })
+      const first = String(r.stdout || '').trim().split(/\r?\n/)[0].trim()
+      if (first) {
+        this.gitBashPath = first
+        this.shellMode = 'git-bash'
+        return
+      }
+    } catch {}
+    const candidates = [
+      'C:\\Program Files\\Git\\bin\\bash.exe',
+      'C:\\Program Files (x86)\\Git\\bin\\bash.exe',
+      ...(process.env.LOCALAPPDATA ? [process.env.LOCALAPPDATA + '\\Programs\\Git\\bin\\bash.exe'] : []),
+      '%LOCALAPPDATA%\\Programs\\Git\\bin\\bash.exe',
+    ]
+    for (const c of candidates) {
+      if (await this._cmdExists(c)) {
+        this.gitBashPath = c
+        this.shellMode = 'git-bash'
+        return
+      }
+    }
+    this.shellMode = 'git-bash' // wanted but not found — commands fall back to raw
+    this.gitBashPath = ''
+  }
+
+  async _cmdExists(p) {
+    try {
+      const r = await this._execRaw(`cmd /c if exist "${p}" (echo Y) else (echo N)`, { timeoutMs: 8000 })
+      return /Y/.test(String(r.stdout || ''))
+    } catch {
+      return false
+    }
+  }
+
   /** Run one remote command; resolves { code, signal, stdout, stderr }.
-   * Accepts `exec(cmd, timeoutMs)` (legacy) or `exec(cmd, {timeoutMs, pty, env})`. */
+   * On Windows remotes with Git Bash the script is piped to `bash -s` over the
+   * exec-channel stdin — no shell quoting round-trip, so any content (quotes,
+   * backslashes, newlines) survives verbatim. */
   exec(command, timeoutMsOrOpts) {
     const opts = timeoutMsOrOpts && typeof timeoutMsOrOpts === 'object' ? timeoutMsOrOpts : { timeoutMs: timeoutMsOrOpts }
-    const timeoutMs = opts.timeoutMs || this.config.commandTimeoutMs
+    return this.detect().then(() => {
+      if (this.platform === 'windows' && this.gitBashPath) {
+        const script = String(command)
+        return this._execRaw(`"${this.gitBashPath}" -s`, { ...opts, timeoutMs: opts.timeoutMs || this.config.commandTimeoutMs }, (stream) => {
+          try { stream.end(script) } catch {}
+        })
+      }
+      return this._execRaw(command, opts)
+    })
+  }
+
+  /** Raw exec (no detection / no wrapper). Optional stdinWriter(stream) feeds
+   * the remote process stdin (used by the Git Bash `-s` mode). */
+  _execRaw(command, opts, stdinWriter) {
+    const timeoutMs = (opts && opts.timeoutMs) || this.config.commandTimeoutMs
     return this.connect().then(
       (client) =>
         new Promise((resolve, reject) => {
           let retried = false
           const runOn = (c) => {
             const execOpts = {}
-            if (opts.pty) execOpts.pty = true
-            if (opts.env && typeof opts.env === 'object') execOpts.env = opts.env
+            if (opts && opts.pty) execOpts.pty = true
+            if (opts && opts.env && typeof opts.env === 'object') execOpts.env = opts.env
             c.exec(command, execOpts, (err, stream) => {
               if (err) {
-                // Channel-open failure usually means the pooled connection died
-                // server-side (idle timeout / network reset) while keepalive
-                // hadn't noticed. Drop it and retry ONCE on a fresh connection.
-                if (!retried && /channel open failure|open failed/i.test(String((err && err.message) || err))) {
+                // Channel-open failure — or a session termination — usually
+                // means the pooled connection died server-side (idle timeout /
+                // network reset) while keepalive hadn't noticed. Drop it and
+                // retry ONCE on a fresh connection.
+                if (!retried && /channel open failure|open failed|unexpected .* session termination|session termination|disconnect/i.test(String((err && err.message) || err))) {
                   retried = true
                   this.invalidate()
                   return this.connect().then(
@@ -549,6 +676,9 @@ class SshPool {
                 clearTimeout(timer)
                 reject(new Error('ssh stream error: ' + ((e && e.message) || e)))
               })
+              if (stdinWriter) {
+                try { stdinWriter(stream) } catch {}
+              }
             })
           }
           runOn(client)
@@ -566,9 +696,11 @@ class SshPool {
             c.sftp((err, sftp) => {
               if (err) {
                 // Same dead-connection recovery as exec(): a channel open
-                // failure means the pooled connection is stale — drop it and
+                // failure — or a session termination (remote closed the
+                // SFTP subchannel, e.g. transient network blip / sshd idle
+                // drop) — means the pooled connection is stale: drop it and
                 // retry ONCE on a fresh connection.
-                if (!retried && /channel open failure|open failed/i.test(String((err && err.message) || err))) {
+                if (!retried && /channel open failure|open failed|unexpected sftp session termination|session termination|disconnect/i.test(String((err && err.message) || err))) {
                   retried = true
                   this.invalidate()
                   return this.connect().then(
@@ -783,6 +915,27 @@ export async function apply(ctx, config) {
     if (cur && cur.host && !store.currentId && !registryExplicitNone) applyMachine(config, cur)
   }
 
+  // ── auto-restore the last active machine (best-effort) ───────────────────
+  // When the harness (re)starts, bring back the machine that was "current"
+  // last time: apply its config to the pool and probe a real SSH connection so
+  // the sidebar shows connected instead of a disconnected 500-spamming state.
+  // Failures are swallowed — an unreachable host must never break plugin boot
+  // (the sidebar will show「未连接」and the user can reconnect or set current).
+  if (store.currentId) {
+    const i = machineIndex(store.currentId)
+    if (i >= 0 && machines[i] && machines[i].host) {
+      setImmediate(async () => {
+        try {
+          await applyActiveMachine()
+          await pool.exec('echo dsh-remote-restore', { timeoutMs: Math.min(config.commandTimeoutMs || 20000, 15000) })
+        } catch {
+          // Offline / bad credentials: leave pool unconnected; UI falls back
+          // to the "未连接" state and the user can reconnect manually.
+        }
+      })
+    }
+  }
+
   /** Persist the active workspace on the machine the pool is actually bound to
    * (fixes the old bug where a tool-connected machine saved its workspace onto
    * the registry's current machine instead). */
@@ -920,7 +1073,14 @@ export async function apply(ctx, config) {
     try {
       list = await sftp.readdir(target)
     } catch (err) {
-      throw new Error('browse failed: ' + ((err && err.message) || err))
+      // Missing directory / deleted folder: not an internal error. Report it
+      // distinctly so the UI can show「目录不存在」without treating it as a
+      // hard failure (500) that collapses the whole tree.
+      const msg = String((err && err.message) || err)
+      if (/no such file|not found|does not exist|ENOENT/i.test(msg)) {
+        return { path: target, items: [], missing: true }
+      }
+      throw new Error('browse failed: ' + msg)
     }
     const items = []
     const symIdx = []
@@ -958,6 +1118,29 @@ export async function apply(ctx, config) {
     return { path: target, items }
   }
 
+  /** Windows drive letters as display-form dir entries (the "This PC" root view).
+   * `cmd /c fsutil fsinfo drives` works under cmd/PowerShell/Git Bash and prints
+   * e.g. "Drives: C:\\ D:\\ E:\\"; falls back to listing Git-Bash mount points
+   * (/c /d …). Returns [] on POSIX hosts or when enumeration fails. */
+  const listRemoteDrives = async () => {
+    let letters = []
+    try {
+      const res = await pool.exec('cmd /c fsutil fsinfo drives', { timeoutMs: Math.min(config.commandTimeoutMs, 8000) })
+      letters = [...String(res.stdout || '').matchAll(/([a-zA-Z]):\\?/g)].map((mm) => mm[1].toUpperCase())
+    } catch {}
+    if (!letters.length) {
+      try {
+        const res = await pool.exec('ls -d /[a-z] 2>/dev/null', { timeoutMs: Math.min(config.commandTimeoutMs, 8000) })
+        letters = String(res.stdout || '')
+          .split(/\s+/)
+          .map((s) => s.replace(/^\/+|\/+$/g, ''))
+          .filter((s) => /^[a-zA-Z]$/.test(s))
+          .map((s) => s.toUpperCase())
+      } catch {}
+    }
+    return [...new Set(letters)].sort().map((l) => ({ name: l + ':\\', path: l + ':\\', type: 'dir', drive: true, size: 0, mtime: 0 }))
+  }
+
   const isRemoteDir = async (p) => {
     const target = normalizeRemotePath(p)
     try {
@@ -1055,7 +1238,7 @@ export async function apply(ctx, config) {
     port: config.port,
     username: config.username,
     connected: !!pool.client,
-    workspace: wsPath(),
+    workspace: toDisplayPath(wsPath(), pool.platform),
     localMirror: wsPath() ? mirrorDirFor(wsPath(), config.host, config.username, config.port) : '',
     currentId: store.currentId || null,
     activeSource: ephemeral ? 'ephemeral' : (store.currentId ? 'machine' : (config.host ? 'config' : 'none')),
@@ -1070,6 +1253,9 @@ export async function apply(ctx, config) {
     forwards: forwards.list(),
     auditEnabled: !!config.auditLog,
     backend: platformBackend(),
+    platform: pool.platform,
+    shell: pool.shellMode,
+    gitBash: pool.gitBashPath || '',
   })
 
   // ── tools ─────────────────────────────────────────────────────────────────
@@ -1098,6 +1284,7 @@ export async function apply(ctx, config) {
           `Local mirror: ${s.localMirror || '(none)'}`,
           `Session remote context: ${s.sessionRemotePath ? s.sessionRemotePath : '(this session is LOCAL — no remote workspace bound)'}`,
           `Connected: ${s.connected ? 'yes' : 'no'}`,
+          `Remote shell: ${s.platform === 'windows' ? (s.gitBash ? 'Git Bash (' + s.gitBash + ')' : 'Windows (Git Bash not found — set config.shell to a bash.exe path)') : (s.platform === 'posix' ? 'native POSIX' : 'detecting…')}`,
           `Active forwards: ${s.forwards.filter((f) => f.active).length} / ${s.forwards.length}`,
           `Host key: ${s.hostKeyKnown ? 'trusted' : 'not yet trusted'} (mode=${s.hostKeyMode})`,
           '',
@@ -1184,21 +1371,22 @@ export async function apply(ctx, config) {
     defineTool({
       name: 'rw_pick_workspace',
       description:
-        'Set the remote workspace directory this session should treat as its working root on the connected remote. Verifies it exists (a directory). Use rw_list_dir to browse first if unsure.',
+        'Set the remote workspace directory this session should treat as its working root on the connected remote. Verifies it exists (a directory). Use rw_list_dir to browse first if unsure. Accepts POSIX (/home/dev/project) or Windows (C:\\Users\\dev\\project) paths.',
       parameters: {
-        path: { type: 'string', required: true, description: 'Absolute remote directory path, e.g. /home/dev/code/project' },
+        path: { type: 'string', required: true, description: 'Absolute remote directory path, e.g. /home/dev/code/project or C:\\Users\\dev\\project' },
       },
       output: textOut,
       async execute(args) {
         const p = normalizeRemotePath(String(args.path || ''))
         if (!p || p === '/') throw new Error('rw_pick_workspace: path must be an absolute directory')
         const ok = await isRemoteDir(p)
-        if (!ok) return { text: `not a directory (or missing) on ${p}` }
+        const shown = toDisplayPath(p, pool.platform)
+        if (!ok) return { text: `not a directory (or missing) on ${shown}` }
         persistWorkspace(p)
         const local = ensureMirror(p, config.host, config.username, config.port)
         startAutoPush(local)
         return {
-          text: `Remote workspace set to ${p} on ${config.username}@${config.host} (saved for this machine).\nLocal mirror (native workspace path): ${local}\n\nRun rw_sync to download its files into the local mirror.`,
+          text: `Remote workspace set to ${shown} on ${config.username}@${config.host} (saved for this machine).\nLocal mirror (native workspace path): ${local}\n\nRun rw_sync to download its files into the local mirror.`,
         }
       },
     }),
@@ -1306,7 +1494,7 @@ export async function apply(ctx, config) {
     defineTool({
       name: 'rw_list_dir',
       description:
-        'List a remote directory (or a single file) via SSH. Path is absolute; if omitted, lists the current remote workspace. Shows type, size, mtime.',
+        'List a remote directory (or a single file) via SSH. Path is absolute; accepts Windows paths like C:\\Users\\dev\\project on Git Bash remotes. If omitted, lists the current remote workspace. Shows type, size, mtime.',
       parameters: {
         path: { type: 'string', description: 'Absolute remote path (default: current remote workspace)' },
       },
@@ -1588,7 +1776,15 @@ export async function apply(ctx, config) {
         if (!cmd) throw new Error('rw_exec: command is required')
         const ws = wsPath()
         const cwd = args.cwd ? normalizeRemotePath(String(args.cwd)) : (ws || '')
-        const full = cwd && !cwd.includes('\\') ? `cd ${shq(cwd)} && ${cmd}` : cmd
+        let full = cmd
+        if (cwd) {
+          if (pool.platform === 'windows' && pool.gitBashPath) {
+            // Git Bash terminal: cd in the /c/Users/… mount form
+            full = `cd ${shq(toShellPath(cwd))} && ${cmd}`
+          } else if (!cwd.includes('\\')) {
+            full = `cd ${shq(cwd)} && ${cmd}`
+          }
+        }
         try {
           const res = await pool.exec(full, { timeoutMs: config.commandTimeoutMs, pty: !!args.pty, env: args.env })
           audit('exec', cmd, res.code)
@@ -1785,7 +1981,7 @@ export async function apply(ctx, config) {
       if (fwd.length) extra = `\nActive port forwards: ${fwd.join(', ')}`
       return (
         '## Remote workspace\n' +
-        `Current remote workspace: ${config.username || 'user'}@${config.host}:${remotePath}\n` +
+        `Current remote workspace: ${config.username || 'user'}@${config.host}:${toDisplayPath(remotePath, pool.platform)}\n` +
         'Use the rw_* tools (rw_list_dir / rw_read_file / rw_write_file / rw_edit / rw_exec / rw_search / rw_sync / rw_push) to inspect and act on files on the remote host. Treat this directory as the working root for this task.' +
         extra
       )
@@ -2069,10 +2265,29 @@ export async function apply(ctx, config) {
       path: '/dsh-remote/ls',
       handler: async (req, res) => {
         try {
+          await pool.detect()
           const q = new URL(req.url, 'http://localhost').searchParams
-          const p = q.get('path') ? decodeURIComponent(q.get('path')) : wsPath()
-          const out = await listDirStructured(p || '/')
-          return sendJson(res, 200, { path: out.path, items: out.items })
+          const raw = q.get('path') ? decodeURIComponent(q.get('path')) : wsPath()
+          const canon = normalizeRemotePath(raw)
+          const win = pool.platform === 'windows'
+          // Windows root → "This PC" drive view (C:\ D:\ E:\), not the Git-Bash
+          // MSYS root. When the platform probe was inconclusive we still try — a
+          // real Windows box answers fsutil, a POSIX box yields no letters and
+          // falls through to the normal root listing.
+          if (canon === '/' || raw === '' || raw === '/') {
+            if (win || pool.platform !== 'posix') {
+              const drives = await listRemoteDrives()
+              if (drives.length) return sendJson(res, 200, { path: '', platform: 'windows', items: drives })
+            }
+            if (win) return sendJson(res, 200, { path: '', platform: 'windows', items: [] })
+          }
+          const out = await listDirStructured(canon)
+          const items = out.items.map((it) => ({
+            ...it,
+            // full display-form path so the client never joins paths itself
+            path: toDisplayPath(joinRemotePath(canon, it.name), pool.platform),
+          }))
+          return sendJson(res, 200, { path: toDisplayPath(out.path, pool.platform), platform: win ? 'windows' : 'posix', items })
         } catch (err) {
           return sendJson(res, 500, { error: String((err && err.message) || err) })
         }
@@ -2520,7 +2735,7 @@ export async function apply(ctx, config) {
             machines[mi].latencyMs = latencyMs
             saveMachines(machines, store.currentId)
           }
-          return sendJson(res, 200, { ok: true, host: probe.config.host, user: probe.config.username, latencyMs, lastConnectedAt: new Date().toISOString() })
+          return sendJson(res, 200, { ok: true, host: probe.config.host, user: probe.config.username, latencyMs, lastConnectedAt: new Date().toISOString(), platform: probe.platform, shell: probe.shellMode, gitBash: probe.gitBashPath || '' })
         } catch (err) {
           return sendJson(res, 200, { ok: false, error: friendlyMessage(err, { host: body && body.host, port: body && body.port }) })
         }

package/lib/paths.js

@@ -127,6 +127,54 @@ export function toSftpPath(p) {
   return norm
 }
 
+/**
+ * Convert a remote path to the form used in SHELL commands on the remote.
+ *
+ * On Windows remotes running Git Bash, native `D:\Code` (or `D:/Code`,
+ * `/D:/Code`, `/d/Code`) becomes the Git-Bash mount form `/d/Code`; a path
+ * already in Git-Bash form passes through unchanged. UNC (`\\server\share`)
+ * maps to `//server/share`. POSIX paths are normalized as-is. The conversion
+ * is syntactic, so it is safe on POSIX remotes too (only unambiguous Windows
+ * forms are rewritten).
+ */
+export function toShellPath(p) {
+  let t = String(p || '').replace(/\\/g, '/')
+  const unc = t.match(/^\/\/([^/]+)(?:\/(.*))?$/)
+  if (unc) return '//' + unc[1] + (unc[2] ? '/' + unc[2] : '')
+  const drive = t.match(/^([a-zA-Z]):(\/|$)/) || t.match(/^\/([a-zA-Z]):(\/|$)/)
+  if (drive) {
+    t = '/' + drive[1].toLowerCase() + (drive[2] ? '/' : '') + t.slice(drive[0].length)
+  }
+  const parts = []
+  for (const seg of t.split('/')) {
+    if (seg === '' || seg === '.') continue
+    if (seg === '..') { parts.pop(); continue }
+    parts.push(seg)
+  }
+  return '/' + parts.join('/')
+}
+
+/**
+ * Display form of a path for a Windows remote: a Git-Bash mount `/d/Code` (or
+ * `/D:/Code`, `D:/Code`) renders as `D:\Code`; anything else (POSIX paths,
+ * native Windows paths) is returned normalized. POSIX remotes always pass
+ * through unchanged.
+ */
+export function toDisplayPath(p, platform) {
+  if (platform !== 'windows') return normalizeRemotePath(p)
+  const t = String(p || '').replace(/\\/g, '/')
+  // /X:/rest (Win32-OpenSSH SFTP form)
+  const gs = t.match(/^\/([a-zA-Z]):\/(.*)$/)
+  if (gs) return gs[1].toUpperCase() + ':\\' + gs[2].replace(/\//g, '\\')
+  // /x/rest (Git-Bash mount form) and bare /x
+  const git = t.match(/^\/([a-zA-Z])(?:\/(.*))?$/)
+  if (git) return git[1].toUpperCase() + ':\\' + (git[2] || '').replace(/\//g, '\\')
+  // native X:/rest
+  const drive = t.match(/^([a-zA-Z]):(?:\/(.*))?$/)
+  if (drive) return drive[1].toUpperCase() + ':\\' + (drive[2] || '').replace(/\//g, '\\')
+  return t
+}
+
 /** Basename of a remote absolute path (POSIX or Windows). */
 export function remotePathBase(p) {
   const norm = normalizeRemotePath(p).replace(/[\\/]+$/, '')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote",
-  "version": "0.8.8",
+  "version": "0.8.9",
   "description": "Remote-work assistant for DeepSeek Harness: connect SSH (password/key/agent/keyboard-interactive/proxy jump), pick a remote workspace, operate on it with 21 rw_* tools (incl. rw_edit/rw_stat/rw_mkdir/rw_remove/rw_move/rw_forward), conflict-aware mirror sync, port forwarding, side-bar remote file editing, audit log, keychain passwords.",
   "license": "MIT",
   "author": "flymysql <flyphp@outlook.com>",