dsh-remote 0.8.15 → 0.8.16

package/README.md

@@ -58,6 +58,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 +114,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 +287,4 @@ MIT
 
 ## Changelog
 
-See [CHANGELOG.md](./CHANGELOG.md).
+See [CHANGELOG.md](./CHANGELOG.md).

package/README.zh.md

@@ -4,6 +4,26 @@
 
 # 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)
@@ -65,6 +85,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 +228,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)
@@ -1652,7 +1660,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) => {
@@ -1960,6 +1969,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 +2042,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.16",
   "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",