dsh-remote 0.8.16 → 0.8.17

package/README.md

@@ -8,6 +8,8 @@
 [![license](https://img.shields.io/github/license/flymysql/dsh-remote)](LICENSE)
 [![dsh-plugin](https://img.shields.io/badge/topic-dsh--plugin-7a3ef3)](https://github.com/topics/dsh-plugin)
 
+![dsh-remote workspace picker](docs/cover.png)
+
 **Remote-work assistant for [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) (DSH).**
 
 Manage several SSH machines, then pick a **remote workspace** (or a **local** one) and let the agent operate right there without leaving the harness — listing files, reading code, running builds & commands over the remote host, and keeping that remote directory mirrored into a real local workspace object.
@@ -18,7 +20,7 @@ The harness Web UI intentionally binds `127.0.0.1` (the CLI rejects `--host 0.0.
 
 Settings → **远程工作区** — a multi-machine SSH registry (add / edit / delete / set-current, password stored locally):
 
-<img src="https://cdn.jsdelivr.net/gh/flymysql/dsh-remote@main/docs/ui-settings-panel.png" alt="dsh-remote settings — multi-machine registry (light theme, host scrubbed)" width="720"/>
+<img src="docs/ui-settings-panel.png" alt="dsh-remote settings — multi-machine registry (light theme, host scrubbed)" width="720"/>
 
 The native **"Add workspace" / "Select workspace"** flow — a centered modal, two tabs, opens on **本机 (local)**; switch to **远程 (remote)**:
 
@@ -26,7 +28,7 @@ The native **"Add workspace" / "Select workspace"** flow — a centered modal, t
 
 Real capture (host scrubbed to a placeholder):
 
-<img src="https://cdn.jsdelivr.net/gh/flymysql/dsh-remote@main/docs/ui-picker-panel.png" alt="dsh-remote workspace picker — real dialog; 本机 (local) tab; 远程 machine select + prefilled root path + autocomplete" width="720"/>
+<img src="docs/ui-picker-panel.png" alt="dsh-remote workspace picker — real dialog; 本机 (local) tab; 远程 machine select + prefilled root path + autocomplete" width="720"/>
 
 ---
 

package/README.zh.md

@@ -28,6 +28,8 @@ Desktop 安装器还可能要求明确配置 `ssh2` / `cpu-features` 可选构
 [![license](https://img.shields.io/github/license/flymysql/dsh-remote)](LICENSE)
 [![dsh-plugin](https://img.shields.io/badge/topic-dsh--plugin-7a)](https://github.com/topics/dsh-plugin)
 
+![dsh-remote 工作区选择](docs/cover.png)
+
 **为 [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness)（DSH）打造的远程工作助手。**
 
 维护多台 SSH 机器，然后在「选择工作区」时选一个**远程工作区**（或**本地工作区**），Agent 就能在不离开 harness 的情况下直接操作——列文件、读代码、在远程主机上跑构建/命令，并把远程目录镜像成一个真实的本地工作区对象。
@@ -38,7 +40,7 @@ DSH 的 Web 界面刻意只监听 `127.0.0.1`（CLI 为安全拒绝 `--host 0.0.
 
 设置 → **远程工作区** —— 多机 SSH 列表（增/删/改/设为当前，密码本地保存、不回显）：
 
-<img src="https://cdn.jsdelivr.net/gh/flymysql/dsh-remote@main/docs/ui-settings-panel.png" alt="dsh-remote 设置页 — 多机列表（浅色主题，主机已打码）" width="720"/>
+<img src="docs/ui-settings-panel.png" alt="dsh-remote 设置页 — 多机列表（浅色主题，主机已打码）" width="720"/>
 
 原生 **「Add workspace / 选择工作区」** 流程 —— **居中弹窗**、两个 tab，**默认落在「本机」**；切到 **「远程」**：
 
@@ -46,7 +48,7 @@ DSH 的 Web 界面刻意只监听 `127.0.0.1`（CLI 为安全拒绝 `--host 0.0.
 
 真实截图（机器已打码为占位）：
 
-<img src="https://cdn.jsdelivr.net/gh/flymysql/dsh-remote@main/docs/ui-picker-panel.png" alt="dsh-remote 工作区选择 — 真实弹窗；默认本机 tab；远程：机器下拉 + 预填根路径 + 自动补全" width="720"/>
+<img src="docs/ui-picker-panel.png" alt="dsh-remote 工作区选择 — 真实弹窗；默认本机 tab；远程：机器下拉 + 预填根路径 + 自动补全" width="720"/>
 
 ---
 

package/lib/client.js

@@ -1491,11 +1491,177 @@ window.__ModuleLoader__.load({
       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' }),
     )
 
-    // Tree-style remote file explorer. Uses the same `expanded` / `onToggleDir`
-    // contract as the built-in local file tree (better-sidebar framework
-    // manages + persists the expanded set), so interaction and look match the
-    // local files tab. Data is listed live from the remote host over
-    // /dsh-remote/ls, rooted at this session's remote workspace dir.
+    // Issue #32: the remote tree's expansion list travels on the TAB (`meta`),
+    // never on better-sidebar's session-shared `expanded` array. Best-effort:
+    // an older sidebar without tab meta simply forgets the expansion on reload.
+    const TAB_EXPANDED_META = 'remoteExpanded'
+    /** The tab's persisted expansion list, or null when the tab records none
+     *  (so a caller can tell "never expanded" from "expanded then collapsed
+     *  everything"). */
+    function readTabExpanded(tab) {
+      try {
+        const meta = tab && tab.meta
+        if (!meta || typeof meta !== 'object' || !(TAB_EXPANDED_META in meta)) return null
+        const list = meta[TAB_EXPANDED_META]
+        return Array.isArray(list) ? list.filter((p) => typeof p === 'string') : []
+      } catch { return null }
+    }
+    /** Fallback store when the sidebar predates tab meta (no persistence then,
+     *  but the tree still opens and closes within the page's lifetime). */
+    const tabExpandedFallback = new Map()
+    function tabExpandedOf(tab) {
+      const fromMeta = readTabExpanded(tab)
+      if (fromMeta !== null) return fromMeta
+      const id = tab && tab.id
+      return (id && tabExpandedFallback.get(id)) || []
+    }
+    function toggleTabExpanded(ctx, tab, path) {
+      const cur = tabExpandedOf(tab)
+      const next = cur.includes(path) ? cur.filter((p) => p !== path) : [...cur, path]
+      const id = tab && tab.id
+      if (id) tabExpandedFallback.set(id, next)
+      try {
+        if (!ctx || !tab || !id || typeof ctx.get !== 'function') return next
+        const bs = ctx.get('betterSidebar')
+        if (!bs || typeof bs.updateTab !== 'function') return next
+        const meta = tab.meta && typeof tab.meta === 'object' ? tab.meta : {}
+        bs.updateTab(id, { meta: { ...meta, [TAB_EXPANDED_META]: next } })
+      } catch { /* expansion memory is best-effort */ }
+      return next
+    }
+
+    // Issue #32 healing, kept pure so it is directly testable: an older
+    // dsh-remote pushed REMOTE paths into better-sidebar's session-shared
+    // `expanded` set through onToggleDir. That set is PERSISTED (localStorage
+    // `dsh-sidebar:v1:<sessionId>`) and the built-in local Files tree loads
+    // every entry through a LOCAL fs.realpath, so those remote paths kept
+    // failing with ENOENT until the set was cleaned.
+    //
+    // Return exactly the entries this tree owns: the current remote root and
+    // anything under it. That range is remote-only by construction (the root
+    // comes from resolve-mirror), so a legitimate local directory cannot
+    // match. A LOCAL MIRROR path is never evicted — on a host whose own home is
+    // an ancestor of the remote root (a macOS host driving a macOS remote) the
+    // mirror under $DSH_HOME/remote-workspaces would otherwise fall inside it.
+    //
+    // On a WINDOWS host the sweep is broader and complete: a POSIX-absolute
+    // entry (`/home/...`) can never be a valid local path there (Windows paths
+    // are drive- or UNC-rooted), which is exactly why the bug only bit Windows.
+    // That also cleans pollution left by an earlier remote root, which no
+    // per-root rule could find.
+    function isPosixAbsolutePath(p) {
+      return typeof p === 'string' && p.startsWith('/') && !p.startsWith('//')
+    }
+    function windowsHost() {
+      try {
+        const nav = typeof navigator !== 'undefined' ? navigator : null
+        if (!nav) return false
+        if (nav.userAgentData && typeof nav.userAgentData.platform === 'string') {
+          return /win/i.test(nav.userAgentData.platform)
+        }
+        if (typeof nav.platform === 'string' && nav.platform) return /win/i.test(nav.platform)
+        return typeof nav.userAgent === 'string' && /windows/i.test(nav.userAgent)
+      } catch { return false }
+    }
+    function strayRemoteSharedPaths(root, shared, hostIsWindows = windowsHost()) {
+      if (!Array.isArray(shared) || !shared.length) return []
+      let prefix = ''
+      if (typeof root === 'string' && root !== '' && root !== '/') prefix = root.replace(/[\\/]+$/, '')
+      const isMirror = (p) => p.includes('/remote-workspaces/') || p.includes('\\remote-workspaces\\')
+      return shared.filter((p) => {
+        if (typeof p !== 'string' || p === '' || isMirror(p)) return false
+        if (prefix !== '' && (p === prefix || p === root ||
+          p.startsWith(prefix + '/') || p.startsWith(prefix + '\\'))) return true
+        return hostIsWindows && isPosixAbsolutePath(p)
+      })
+    }
+
+    // Issue #32: the remote tree must NOT use better-sidebar's `expanded` /
+    // `onToggleDir` props. That pair is the SESSION-shared expansion set, which
+    // the built-in local Files tree also reads and loads as local directories
+    // through /sidebar/api fs.tree. Feeding it remote paths (/home/...) made the
+    // core tree run a LOCAL fs.realpath on them; on win32 a POSIX path counts as
+    // absolute (drive-rooted), so it resolved to `D:\home\...` and failed with
+    // ENOENT. Own the expansion here and persist it on the tab instead.
+    //
+    // Because that shared set is PERSISTED, an already-affected user stays
+    // broken across reloads, so the stray entries are also migrated eagerly (see
+    // migratePollutedSidebarState) and healed again from the tab (below).
+    const SIDEBAR_STATE_PREFIX = 'dsh-sidebar:v1:'
+    /**
+     * Strip remote paths a pre-fix dsh-remote left in PERSISTED sidebar state,
+     * before the built-in Files tree loads them. Only entries that cannot be a
+     * valid local path on this host are removed (see strayRemoteSharedPaths).
+     * Best-effort: any storage failure just leaves the tab-level healing to do
+     * the job on the next load.
+     *
+     * @param storage - a Storage-like object (window.localStorage).
+     * @param hostIsWindows - overrides host detection (tests).
+     * @returns how many stray entries were removed.
+     */
+    function migratePollutedSidebarState(storage, hostIsWindows = windowsHost()) {
+      if (!storage || typeof storage.length !== 'number') return 0
+      let cleaned = 0
+      try {
+        const keys = []
+        for (let i = 0; i < storage.length; i++) {
+          const key = storage.key(i)
+          if (key && key.startsWith(SIDEBAR_STATE_PREFIX)) keys.push(key)
+        }
+        for (const key of keys) {
+          const raw = storage.getItem(key)
+          if (typeof raw !== 'string' || raw === '') continue
+          let parsed
+          try { parsed = JSON.parse(raw) } catch { continue }
+          if (parsed === null || typeof parsed !== 'object' || !Array.isArray(parsed.expanded)) continue
+          const stray = strayRemoteSharedPaths('', parsed.expanded, hostIsWindows)
+          if (!stray.length) continue
+          const drop = new Set(stray)
+          parsed.expanded = parsed.expanded.filter((p) => !drop.has(p))
+          storage.setItem(key, JSON.stringify(parsed))
+          cleaned += stray.length
+        }
+      } catch { /* storage unavailable: the tab-level healing still runs */ }
+      return cleaned
+    }
+
+    // `evictStray` heals state an older dsh-remote already polluted: the tree
+    // calls it once it knows its remote root, and it drops exactly those paths
+    // from the shared set. It is a plain function (not an effect) so the rule is
+    // directly testable.
+    function RemoteExplorerTabOwned(props) {
+      const [expanded, setExpanded] = React.useState(tabExpandedOf(props.tab))
+      const sharedExpanded = Array.isArray(props.expanded) ? props.expanded : []
+      const evictShared = typeof props.onToggleDir === 'function' ? props.onToggleDir : null
+      // Heal without needing the remote root: on a Windows host a POSIX-absolute
+      // entry can never be a valid local path, so the sweep is complete there.
+      // (The root-scoped sweep for the session's own remote tree runs inside the
+      // tab, which is where the resolved root becomes known.)
+      const sharedKey = sharedExpanded.join('\u0000')
+      React.useEffect(() => {
+        if (!evictShared) return
+        const stray = strayRemoteSharedPaths('', sharedKey ? sharedKey.split('\u0000') : [])
+        for (const p of stray) evictShared(p)
+      }, [sharedKey, evictShared])
+      // Explicitly drop the framework's session-shared pair from the child.
+      const owned = { ...props }
+      delete owned.expanded
+      delete owned.onToggleDir
+      return React.createElement(RemoteExplorerTab, {
+        ...owned,
+        evictStray: (root) => {
+          if (!evictShared || !sharedExpanded.length) return []
+          const stray = strayRemoteSharedPaths(root, sharedExpanded)
+          for (const p of stray) evictShared(p)
+          return stray
+        },
+        expanded,
+        onToggleDir: (path) => setExpanded(toggleTabExpanded(props.ctx, props.tab, path)),
+      })
+    }
+
+    // Tree-style remote file explorer. Data is listed live from the remote host
+    // over /dsh-remote/ls, rooted at this session's remote workspace dir.
     function RemoteExplorerTab(props) {
       const [status, setStatus] = React.useState(null)
       const [root, setRoot] = React.useState('') // remote root path for this session
@@ -1627,6 +1793,13 @@ window.__ModuleLoader__.load({
       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])
+      // Issue #32 healing: once the remote root is known, drop the paths an
+      // older dsh-remote left in better-sidebar's PERSISTED session-shared
+      // expansion set (the built-in local tree was loading them through a local
+      // fs.realpath and failing). See strayRemoteSharedPaths().
+      React.useEffect(() => {
+        if (root && typeof props.evictStray === 'function') props.evictStray(root)
+      }, [root, props.evictStray])
       // ── Context-menu portal: append to document.body so the sidebar's
       //    overflow/transform cannot clip it. Pure DOM, no React portal needed.
       React.useEffect(() => {
@@ -1917,6 +2090,13 @@ window.__ModuleLoader__.load({
     function registerSidebarIntegration(ctx) {
       const bs = (ctx && ctx.get && ctx.get('betterSidebar')) || null
       if (!bs || typeof bs.registerTab !== 'function') return
+      // Issue #32 migration: drop the remote paths an older dsh-remote left in
+      // PERSISTED sidebar state, BEFORE the built-in Files tree loads them
+      // through its local fs guard. Runs once per activation; a failure is
+      // harmless because the tab-level healing repeats it.
+      try {
+        migratePollutedSidebarState(typeof window !== 'undefined' ? window.localStorage : null)
+      } catch { /* best-effort migration */ }
       const disposers = []
       try {
         disposers.push(bs.registerTab({
@@ -1925,7 +2105,8 @@ window.__ModuleLoader__.load({
           icon: (size) => React.createElement('span', { style: { fontSize: (size || 14), lineHeight: 1 } }, '🌐'),
           order: 55,
           single: true,
-          component: (props) => React.createElement(RemoteExplorerTab, props),
+          // Issue #32: own the expansion state (see RemoteExplorerTabOwned).
+          component: RemoteExplorerTabOwned,
         }))
         disposers.push(bs.registerTab({
           id: SIDEBAR_FILE_ID,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote",
-  "version": "0.8.16",
+  "version": "0.8.17",
   "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>",