dsh-remote 0.8.15 → 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"/>
 
 ---
 
@@ -58,6 +60,41 @@ Real capture (host scrubbed to a placeholder):
 
 ## Install
 
+### Official Desktop compatibility (experimental, unreleased)
+
+This branch adds a compatibility path for the **official**
+[DeepSeek Harness Desktop](https://github.com/deepseek-ai/deepseek-harness),
+tested against the `0.1.5-rc.2` Host transport. It does not replace the Harness
+core or require a listening Web server:
+
+- The SSH settings and directory picker use `/api/dsh-remote/*` over the
+  Desktop's `dsh-app:` carrier. Exact Fetch routes are registered on
+  `ctx.connection.fetch`; the carrier retains ownership of authentication.
+- A native **Remote Files** entry uses `sidebarRightTabs` and the keyed
+  `sidebar.right.pane.tab` seat. It reuses the existing explorer/editor and
+  gives remote files their own session-scoped resource addresses, rather than
+  sending remote paths to the local Files viewer.
+- When the core Web-server row is explicitly disabled (the official Desktop
+  composition), the bundled `dsh-better-sidebar` row stays disabled. Web hosts
+  retain the existing `/dsh-remote/*` routes and sidebar composition, including
+  the standalone-sidebar deduplication guard.
+
+Validation so far covers Host startup, Desktop IPC JSON requests, read-only
+SSH connection/list/read, and opening the settings/import UI. Native file-tab
+navigation, editing/sync, concurrent sessions on different machines, and the
+full legacy Web UI still need end-to-end acceptance before release. In
+particular, existing sidebar file endpoints use the active-machine pool;
+session-scoped tab addresses alone do **not** make those endpoints
+session-bound. This is not a claim of production-ready multi-machine Desktop
+support.
+
+Desktop's package installer may also require an explicit policy for the
+optional `ssh2` / `cpu-features` build scripts. The isolated transport test
+disabled those optional scripts; this change does not loosen an application's
+build allowlist or automatically approve dependency scripts.
+
+### Published Web bundle
+
 ```bash
 dsh plugin add dsh-remote            # add the bundle
 ```
@@ -79,6 +116,24 @@ after** `dsh-remote` in `dsh.profile.bundles` (order-independent guard since
 > `import { settingsNamespace } from "@deepseek-ai/dsh-settings"` broke once
 > dsh-settings 0.1.2-alpha.2 made that symbol private; issue #29).
 
+> **Harness requirement of the embedded sidebar (0.8.15+): `dsh ≥ 0.1.2-rc.1`.**
+> `dsh-better-sidebar` 0.18.x imports `SessionLogOffset` from
+> `@deepseek-ai/dsh-session`, which only exists from 0.1.2-rc.1 on. On an older
+> harness (0.1.0-rc.x) that import fails and the loader aborts the whole plugin
+> tree, so dsh does not start at all. Verified: 0.8.14 + sidebar 0.14.0 boots on
+> 0.1.0-rc.8, while 0.8.15 + sidebar 0.18.1 does not; both boot on 0.1.2-rc.1.
+> On an older harness either stay on **0.8.14**, or keep the host half by
+> disabling the embedded sidebar row in your profile's `cordis.patch.yml`
+> (verified working on 0.1.0-rc.8 — the `rw_*` tools keep working, the sidebar
+> UI is what you give up):
+>
+> ```yaml
+> - id: dsh-remote-sidebar
+>   disabled: true
+> ```
+>
+> (and do not list a standalone `dsh-better-sidebar` bundle either).
+
 > **Requires the profile's pnpm linker to be `hoisted`** (the DSH profile
 > default, `nodeLinker: hoisted` in `pnpm-workspace.yaml`). The loader resolves
 > plugin packages from the profile root, so the sidebar must be reachable in
@@ -234,4 +289,4 @@ MIT
 
 ## Changelog
 
-See [CHANGELOG.md](./CHANGELOG.md).
+See [CHANGELOG.md](./CHANGELOG.md).

package/README.zh.md

@@ -4,10 +4,32 @@
 
 # dsh-remote
 
+## 官方 Desktop 兼容适配（实验性，尚未发布）
+
+本分支增加对 [DeepSeek 官方 Desktop](https://github.com/deepseek-ai/deepseek-harness)
+的适配，以 `0.1.5-rc.2` Host 通信协议验证，不修改 Harness 核心：
+
+- 通过 `ctx.connection.fetch` 注册 `/api/dsh-remote/*`，由 Desktop 的
+  `dsh-app:` 通道承载请求，鉴权仍由宿主负责，不启动 Web Server。
+- 通过 `sidebarRightTabs` 和 `sidebar.right.pane.tab` 提供原生“远程文件”入口，
+  复用原来的文件树与编辑器，不把远端路径传给本地文件预览器。
+- 官方 Desktop 显式禁用 Web Server 时，不挂载内置 `dsh-better-sidebar`；
+  Web 版仍保留原路由、侧栏及独立安装时的去重逻辑。
+
+已验证 Host 启动、IPC 请求、真实 SSH 的只读连接/目录列表/文本读取，以及设置页和
+测试 SSH 配置的导入。文件标签的完整 UI 操作、编辑/同步、多机器并行会话，以及旧 Web
+版完整 UI 回归仍需在发布前验收。尤其是现有侧栏文件接口仍使用“当前机器”的连接池，
+不能把会话级标签地址误认为后端已实现会话级机器绑定；本分支尚不代表生产级多机器支持。
+
+Desktop 安装器还可能要求明确配置 `ssh2` / `cpu-features` 可选构建脚本策略。
+隔离验证中禁用了这些可选脚本；本改动不放宽应用的构建白名单，也不自动批准脚本。
+
 [![npm version](https://img.shields.io/npm/v/dsh-remote)](https://www.npmjs.com/package/dsh-remote)
 [![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 的情况下直接操作——列文件、读代码、在远程主机上跑构建/命令，并把远程目录镜像成一个真实的本地工作区对象。
@@ -18,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，**默认落在「本机」**；切到 **「远程」**：
 
@@ -26,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"/>
 
 ---
 
@@ -65,6 +87,21 @@ dsh plugin add dsh-remote            # 添加 bundle
 > 该导出自 dsh-settings 0.1.2-alpha.2 起被移除，静态导入失败会让整个插件树加载失败
 > （issue #29）。
 
+> **⚠ 内嵌侧边栏对 harness 的要求（0.8.15+）：`dsh ≥ 0.1.2-rc.1`**。
+> `dsh-better-sidebar` 0.18.x 会 `import { SessionLogOffset } from "@deepseek-ai/dsh-session"`，
+> 该导出从 0.1.2-rc.1 才有。在更老的 harness（0.1.0-rc.x）上这个静态导入会失败，
+> loader 因此判定整个插件树加载失败 —— **dsh 直接起不来**。实测：`0.8.14 + 侧边栏 0.14.0`
+> 在 0.1.0-rc.8 上可以正常启动，`0.8.15 + 侧边栏 0.18.1` 不行；两者在 0.1.2-rc.1 上都正常。
+> 老 harness 上要么**留在 0.8.14**，要么在 profile 的 `cordis.patch.yml` 里关掉内嵌侧边栏行
+> 以保住 host 半（已在 0.1.0-rc.8 实测可启动，`rw_*` 工具照常可用，放弃的只是侧边栏 UI）：
+>
+> ```yaml
+> - id: dsh-remote-sidebar
+>   disabled: true
+> ```
+>
+> （同时不要再单独列出 `dsh-better-sidebar` bundle。）
+
 > **要求 profile 的 pnpm linker 为 `hoisted`**（DSH profile 默认，
 > `pnpm-workspace.yaml` 里 `nodeLinker: hoisted`）。loader 从 profile 根解析
 > 插件包，侧边栏必须能在顶层 `node_modules` 被解析到。如果你的
@@ -193,4 +230,4 @@ MIT
 
 ## 变更记录
 
-见 [CHANGELOG.md](./CHANGELOG.md)。
+见 [CHANGELOG.md](./CHANGELOG.md)。

package/cordis.patch.yml

@@ -4,7 +4,9 @@
 #
 # Since v0.7.2 dsh-remote ships dsh-better-sidebar as a hard dependency and
 # mounts it here, so `dsh plugin add dsh-remote` brings up the sidebar with
-# zero extra steps. The sidebar row uses a DEDICATED id (`dsh-remote-sidebar`)
+# zero extra steps on Web. Official Desktop explicitly disables the Web server
+# row and uses the native right-sidebar seats instead. The sidebar
+# row uses a DEDICATED id (`dsh-remote-sidebar`)
 # and a guard so it backs off when another row mounts `dsh-better-sidebar`
 # (e.g. the user installed the sidebar bundle on its own, or an aggregate
 # bundle owns it) — two enabled mounts would both register /sidebar/api and
@@ -37,6 +39,10 @@
       name: 'dsh-better-sidebar'
       disabled: !!js >-
         (function () {
+          // Inspect the core row's explicit disabled flag, not service presence:
+          // a Web server that simply has not started yet must still be awaited.
+          // Do not evaluate another sidebar's disabled guard (issue #12).
+          if ([...ctx.loader.entries()].some((e) => e.options.name === '@deepseek-ai/dsh-host-webserver' && e.options.disabled === true)) return true
           try {
             const inc = ctx.loader && ctx.loader.resolve && ctx.loader.resolve('include')
             const patches = inc && inc.subtree && inc.subtree.config && inc.subtree.config.patches

package/lib/client.js

@@ -517,10 +517,18 @@ window.__ModuleLoader__.load({
       return msg
     }
 
+    // The official Electron shell serves the shared API over its private
+    // dsh-app carrier. Legacy browser hosts keep their existing route prefix.
+    // Choose before sending: never retry a mutating request on another route.
+    function apiPath(path) {
+      return window.location && window.location.protocol === 'dsh-app:'
+        ? '/api' + path : path
+    }
+
     async function api(method, path, body) {
       const opts = { method, headers: {} }
       if (body) { opts.headers['Content-Type'] = 'application/json'; opts.body = JSON.stringify(body) }
-      const res = await fetch(path, opts)
+      const res = await fetch(apiPath(path), opts)
       const data = await res.json().catch(() => ({}))
       if (!res.ok) throw new Error(trHostError((data && (data.error || data.message))) || 'HTTP ' + res.status)
       return data
@@ -530,7 +538,7 @@ window.__ModuleLoader__.load({
     async function apiRaw(method, path, body) {
       const opts = { method, headers: {} }
       if (body) { opts.headers['Content-Type'] = 'application/json'; opts.body = JSON.stringify(body) }
-      const res = await fetch(path, opts)
+      const res = await fetch(apiPath(path), opts)
       const data = await res.json().catch(() => ({}))
       if (data && typeof data.error === 'string') data.error = trHostError(data.error)
       if (data && typeof data.message === 'string') data.message = trHostError(data.message)
@@ -1483,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
@@ -1619,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(() => {
@@ -1652,7 +1833,8 @@ window.__ModuleLoader__.load({
 
       const openFile = (p) => {
         const name = String(p).split(/[\\/]/).pop() || p
-        props.ctx.betterSidebar.openTab({ type: SIDEBAR_FILE_ID, title: name, path: p }, props.scope)
+        if (props.onOpenFile) props.onOpenFile(p)
+        else props.ctx.betterSidebar.openTab({ type: SIDEBAR_FILE_ID, title: name, path: p }, props.scope)
       }
 
       const doFs = (op, payload, refreshParent) => {
@@ -1908,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({
@@ -1916,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,
@@ -1960,6 +2150,56 @@ window.__ModuleLoader__.load({
       return () => disposers.forEach((d) => { try { d() } catch {} })
     }
 
+    // Official Desktop's right-sidebar extension contract. Reuse the SSH
+    // explorer/editor rather than replacing core Files or pretending remote
+    // paths are local filesystem resources. Each address is session-scoped.
+    const NATIVE_EXPLORER = 'dsh-remote/explorer'
+    const NATIVE_FILE = 'dsh-remote/file'
+    function remoteFileAddress(sessionId, path) {
+      return 'dsh-resource://dsh-remote/' + encodeURIComponent(sessionId) + '/' + encodeURIComponent(path)
+    }
+    function remoteFilePath(address) {
+      const url = new URL(address)
+      if (url.protocol !== 'dsh-resource:' || url.hostname !== 'dsh-remote') throw new Error('Invalid remote resource')
+      return decodeURIComponent(url.pathname.split('/').slice(2).join('/'))
+    }
+    function NativeExplorer(props) {
+      const info = props.useTabInfo()
+      const [expanded, setExpanded] = React.useState([])
+      return React.createElement(RemoteExplorerTab, {
+        scope: { sessionId: props.sessionId }, visible: info.tab.visible,
+        expanded,
+        onToggleDir: (path) => setExpanded((old) => old.includes(path) ? old.filter((p) => p !== path) : [...old, path]),
+        onOpenFile: (path) => info.tab.actions.openResource(remoteFileAddress(props.sessionId, path)),
+      })
+    }
+    function NativeFile(props) {
+      const info = props.useTabInfo()
+      const path = remoteFilePath(info.tab.navigation.address)
+      return React.createElement(RemoteFileTab, { key: path, tab: { path }, scope: { sessionId: props.sessionId } })
+    }
+    function registerNativeSidebar(inner) {
+      const tabs = inner.get('sidebarRightTabs')
+      const slots = inner.get('slots')
+      inner.effect(() => tabs.register({
+        id: NATIVE_EXPLORER, kind: NATIVE_EXPLORER,
+        title: () => tr('explorer.tabTitle'),
+        guide: [{ order: 55, title: () => tr('explorer.tabTitle') }],
+      }), 'dsh-remote.native-explorer-type')
+      inner.effect(() => tabs.register({
+        id: NATIVE_FILE, kind: NATIVE_FILE,
+        patterns: ['dsh-resource://dsh-remote/**'],
+        title: (address) => remoteFilePath(address).split(/[\\/]/).pop() || tr('explorer.tabTitle'),
+      }), 'dsh-remote.native-file-type')
+      inner.effect(() => slots.inject('sidebar.right.pane.tab', () => {
+        const disposers = [
+          slots.register({ name: 'sidebar.right.pane.tab', key: NATIVE_EXPLORER }, NativeExplorer),
+          slots.register({ name: 'sidebar.right.pane.tab', key: NATIVE_FILE }, NativeFile),
+        ]
+        return () => disposers.forEach((dispose) => dispose())
+      }), 'dsh-remote.native-bodies')
+    }
+
     function apply(ctx) {
       const slots = ctx.get('slots')
       wireLocale(ctx)
@@ -1983,6 +2223,7 @@ window.__ModuleLoader__.load({
       ctx.inject(['betterSidebar'], (inner) => {
         inner.effect(() => registerSidebarIntegration(inner), 'dsh-remote.betterSidebar')
       })
+      ctx.inject(['sidebarRightTabs'], registerNativeSidebar)
     }
 
     exports.name = name

package/lib/http-transport.js

@@ -0,0 +1,104 @@
+// The routes in index.js are bounded JSON handlers, not arbitrary HTTP proxy
+// handlers. Keep their implementation shared with legacy Web hosts while using
+// Connection's authenticated, carrier-neutral channel on portless Desktop.
+import { Readable } from 'node:stream'
+
+const MAX_BODY_BYTES = 1024 * 1024
+
+export function connectionRoute(route) {
+  // Only the prefix is a real invariant here. `kind`/`exact` belongs to
+  // dsh-host-webserver's registry (WebRouteKind); Connection's
+  // ConnectionFetchRoute has no `kind` field and assertFetchRoute never reads
+  // one, so requiring it would let a future route that omits it silently lose
+  // itself and every route registered after it.
+  if (!route.path.startsWith('/dsh-remote/')) {
+    throw new Error('dsh-remote: expected a plugin route under /dsh-remote/')
+  }
+  return {
+    path: '/api' + route.path,
+    methods: ['GET', 'POST'],
+    requestBody: 'buffered',
+    async fetch(request) {
+      const chunks = []
+      let size = 0
+      // Desktop's IPC carrier need not impose the Web carrier's JSON cap.
+      // Enforce our own cap before dispatch: oversized input must never become
+      // an empty object that could accidentally trigger a default operation.
+      const reader = request.body?.getReader()
+      try {
+        if (reader) {
+          while (true) {
+            request.signal.throwIfAborted()
+            const { done, value } = await reader.read()
+            if (done) break
+            size += value.byteLength
+            if (size > MAX_BODY_BYTES) {
+              await reader.cancel()
+              return Response.json({ ok: false, error: 'request body too large' }, { status: 413 })
+            }
+            chunks.push(Buffer.from(value))
+          }
+        }
+      } finally {
+        reader?.releaseLock()
+      }
+      request.signal.throwIfAborted()
+      const url = new URL(request.url)
+      // The legacy JSON reader joins chunks as strings. Supply one bounded
+      // buffer so UTF-8 characters split by the IPC stream remain intact.
+      const req = Readable.from(size ? [Buffer.concat(chunks, size)] : [])
+      req.method = request.method
+      req.url = route.path + url.search
+      const headers = new Headers()
+      let response
+      const res = {
+        statusCode: 200,
+        setHeader(key, value) { headers.set(key, value) },
+        end(body) { response = new Response(body, { status: this.statusCode, headers }) },
+      }
+      try {
+        await route.handler(req, res)
+        if (!response) throw new Error('JSON handler did not finish its response')
+        return response
+      } finally {
+        req.destroy()
+      }
+    },
+  }
+}
+
+export function registerHttpTransports(ctx, routes) {
+  // Reactive injection matters: either service can arrive after the plugin.
+  // Neither optional transport is a hard prerequisite for the SSH tools.
+  ctx.inject(['webServer'], (inner) => {
+    const disposers = routes.map((route) => inner.get('webServer').register(route))
+    inner.effect(() => () => disposers.forEach((dispose) => dispose()), 'dsh-remote.web-routes')
+  })
+  ctx.inject(['connection'], (inner) => {
+    const connection = inner.get('connection')
+    // Older Web compositions may have Connection without exact Fetch routes.
+    // dsh < 0.1.2-rc.1 is such a composition: the Desktop transport is simply
+    // absent there, and the legacy /dsh-remote/* routes above still serve.
+    if (typeof connection.fetch?.register !== 'function') return
+    // Register one route at a time. A single failing route must not abort the
+    // rest of the list (which would silently drop every later route) nor leak
+    // the routes already registered, because this callback is a ctx.inject
+    // child fiber: its throw is caught and logged by the loader, so the parent
+    // plugin stays ACTIVE and the failure is easy to miss.
+    const disposers = []
+    const failed = []
+    for (const route of routes) {
+      try {
+        disposers.push(connection.fetch.register(connectionRoute(route)))
+      } catch (err) {
+        failed.push(route.path + ': ' + String((err && err.message) || err))
+      }
+    }
+    inner.effect(() => () => Promise.all(disposers.map((dispose) => dispose())), 'dsh-remote.fetch-routes')
+    if (failed.length) {
+      // Surface a partial registration instead of swallowing it; the Web
+      // transport is unaffected, so this is a warning rather than a failure.
+      console.warn('[dsh-remote] some Connection Fetch routes did not register:', failed.join('; '))
+    }
+  })
+}

package/lib/index.js

@@ -44,15 +44,15 @@ import { TaskManager } from './tasks.js'
 import { ForwardManager } from './forwards.js'
 import { selfDir, readVersion, gtVersion, fetchLatestVersion, applyUpdate, persistUpdateMode, readUpdateMode } from './update.js'
 import { loadMachines as _loadMachines, saveMachines as _saveMachines, sanitizeMachine as _sanitizeMachine, applyMachine as _applyMachine, machineId as _machineId } from './registry.js'
+import { registerHttpTransports } from './http-transport.js'
 
 const { Client } = ssh2
 
 export const name = 'dsh-remote'
 
-// tools + systemPrompt + webServer are required. webServer is INJECTED (not just
-// lazily read) so this plugin activates only after the web server is up — otherwise
-// apply() runs ahead of webServer and the /dsh-remote/* JSON routes never register.
-export const inject = ['tools', 'systemPrompt', 'webServer']
+// Web and Desktop share the SSH tools; each optional UI transport is attached
+// reactively below, so service startup order does not drop the JSON routes.
+export const inject = ['tools', 'systemPrompt']
 
 export const Config = z.object({
   /** Remote SSH host (empty → the plugin starts disconnected). */
@@ -2300,9 +2300,6 @@ export async function apply(ctx, config) {
   }
 
   // ── JSON endpoints for settings UI ─────────────────────────────────────────
-  const webServer = ctx.get('webServer')
-  if (webServer === undefined) return
-
   const sendJson = (res, status, body) => {
     res.statusCode = status
     res.setHeader('Content-Type', 'application/json; charset=utf-8')
@@ -3264,8 +3261,7 @@ export async function apply(ctx, config) {
     },
   ]
 
-  const disposers = routes.map((r) => webServer.register(r))
-  ctx.effect(() => () => disposers.forEach((d) => d && d()), 'dsh-remote.routes')
+  registerHttpTransports(ctx, routes)
 
   // ── auto-update: check on load + on an interval; apply silently ───────────
   // Failures are swallowed (never break the plugin). The persisted override

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote",
-  "version": "0.8.15",
+  "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>",
@@ -52,8 +52,17 @@
     "@deepseek-ai/dsh-system-prompt": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-ui-renderer": "^0.1.2-rc.1",
     "@deepseek-ai/dsh-client-locale": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-connection": "^0.1.2-rc.1",
     "@deepseek-ai/cordis": "^4.0.1"
   },
+  "peerDependenciesMeta": {
+    "@deepseek-ai/dsh-host-webserver": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-client-connection": {
+      "optional": true
+    }
+  },
   "dependencies": {
     "ssh2": "^1.16.0",
     "@deepseek-ai/schemastery": "^3.18.1",