dsh-remote 0.6.9 → 0.7.1

package/lib/client.js

@@ -455,6 +455,280 @@ window.__ModuleLoader__.load({
       )
     }
 
+    // ── better-sidebar integration (optional) ────────────────────────────────
+    // The sidebar of dsh-better-sidebar lists LOCAL files (its fs tree reads
+    // the host filesystem). When dsh-remote is the active remote workspace the
+    // user wants to browse the REMOTE host's files live — not the local SFTP
+    // mirror snapshot (which rw_sync caps by depth/file-count/size).
+    //
+    // Through the public `ctx.betterSidebar` service (v0.4.0+; gracefully
+    // skipped when dsh-better-sidebar is not installed) we register TWO tabs:
+    //   • `dsh-remote:explorer` — a live remote file tree (dirs expand over
+    //     /dsh-remote/ls; every click lists the REMOTE host, not the mirror),
+    //   • `dsh-remote:file` — a read-only remote file view (hidden from the
+    //     + menu; opened by the explorer) that reads the file live over
+    //     /dsh-remote/read and renders its text (or a binary notice).
+    //
+    // Both are READ-ONLY on purpose: the sidebar editor's save path writes to
+    // the LOCAL fs, so an editable remote file would silently save into the
+    // mirror. Editing stays in the rw_* tools / the mirror workflow. We do NOT
+    // register a file viewer (better-sidebar's matching is extension/priority
+    // based and cannot tell a remote path from a local one — a catch-all
+    // viewer would hijack every local file open).
+
+    // A stable id namespace so the persisted sidebar tabs survive reloads.
+    const SIDEBAR_EXPLORER_ID = 'dsh-remote:explorer'
+    const SIDEBAR_FILE_ID = 'dsh-remote:file'
+
+    /** Remote workspace state the sidebar reads (host /dsh-remote/status). */
+    function fetchRemoteStatus() {
+      return api('GET', '/dsh-remote/status').catch(() => null)
+    }
+
+    /** Read a remote file (live) → {binary, content?, head?, size?, truncated?}. */
+    function readRemoteFile(path, maxBytes) {
+      return api('POST', '/dsh-remote/read', { path, maxBytes }).catch((e) => {
+        throw new Error('远程读取失败: ' + ((e && e.message) || e))
+      })
+    }
+
+    /** List a remote dir (live) → items [{name, type}] (server-driven types). */
+    function listRemoteDir(path) {
+      return api('GET', '/dsh-remote/ls?path=' + encodeURIComponent(path || '')).catch((e) => {
+        throw new Error('远程目录读取失败: ' + ((e && e.message) || e))
+      })
+    }
+
+    /** Join a remote dir + entry name, honoring the dir's separator style. */
+    function joinRemote(base, name) {
+      if (!base) return name
+      return base.replace(/[\\/]+$/, '') + (base.includes('\\') ? '\\' : '/') + name
+    }
+
+    // ── Remote explorer tab ────────────────────────────────────────────────
+    function RemoteExplorerTab(props) {
+      const [status, setStatus] = React.useState(null)
+      const [levels, setLevels] = React.useState([])   // [{path, items}]
+      const [err, setErr] = React.useState('')
+      const [loading, setLoading] = React.useState(false)
+      const [picker, setPicker] = React.useState(false)
+
+      const refreshStatus = () => {
+        fetchRemoteStatus().then((s) => {
+          setStatus(s)
+          if (s && s.workspace) {
+            setLevels((prev) => {
+              // First open with a workspace: seed the root level AND load it,
+              // so the tree shows the remote listing immediately instead of
+              // an empty "（空目录）" until the user hits ↻.
+              if (!prev.length) {
+                loadDir(s.workspace, 0)
+                return [{ path: s.workspace, items: null }]
+              }
+              return prev
+            })
+          }
+        })
+      }
+      React.useEffect(() => { refreshStatus() }, [])
+      // When the tab becomes visible, re-verify the workspace still exists
+      // (the remote connection may have been switched in settings).
+      React.useEffect(() => { if (props.visible) refreshStatus() }, [props.visible])
+
+      const loadDir = (p, idx) => {
+        if (loading) return
+        setLoading(true); setErr('')
+        listRemoteDir(p).then((res) => {
+          const items = Array.isArray(res && res.items) ? res.items : []
+          setLevels((prev) => {
+            const base = prev.length ? prev.slice() : [{ path: p, items: null }]
+            const list = items.map((it) => ({ name: it.name, type: it.type === 'dir' ? 'dir' : 'file' }))
+            if (idx < 0 || idx >= base.length) return base.concat([{ path: p, items: list }])
+            base[idx] = { path: p, items: list }
+            return base.slice(0, idx + 1)
+          })
+        }).catch((e) => setErr(String((e && e.message) || e)))
+          .finally(() => setLoading(false))
+      }
+
+      // Open a directory: append it as the new deepest level.
+      const enterDir = (name) => {
+        const last = levels.length ? levels[levels.length - 1] : null
+        if (!last || !last.items) return
+        const base = last.path
+        const sep = base.includes('\\') ? '\\' : '/'
+        const next = base === '/' ? '/' + name : base + sep + name
+        loadDir(next, levels.length)
+      }
+      // Jump to a breadcrumb ancestor.
+      const jumpTo = (p) => {
+        const idx = levels.findIndex((lv) => lv.path === p)
+        if (idx < 0) return
+        setLevels(levels.slice(0, idx + 1))
+      }
+      // Open a file: open the dedicated REMOTE file tab (reads the file live
+      // over /dsh-remote/read) — NOT the builtin editor, whose fs.read would
+      // hit the local filesystem and fail on a remote path.
+      const openFile = (p) => {
+        const name = String(p).split(/[\\/]/).pop() || p
+        props.ctx.betterSidebar.openTab({ type: SIDEBAR_FILE_ID, title: name, path: p }, props.scope)
+      }
+
+      const allItems = levels.length ? (levels[levels.length - 1].items || []) : []
+      const curPath = levels.length ? levels[levels.length - 1].path : ''
+      const segs = String(curPath || '').split(/[\\/]+/).filter(Boolean)
+      const crumbs = [React.createElement('span', { key: 'r', style: { cursor: 'pointer', color: '#4caf7d', fontWeight: 700 }, onClick: () => { const idx = levels.findIndex((lv) => lv.path === '/' || lv.path === '\\'); if (idx >= 0) jumpTo(levels[idx].path); else setLevels([]) } }, '⌂')]
+      let acc = ''
+      segs.forEach((s, i) => {
+        acc = acc ? acc + '/' + s : s
+        const isLast = i === segs.length - 1
+        crumbs.push(React.createElement('span', { key: 's' + i, style: { color: isLast ? '#e4e4e7' : '#9a9aa0', cursor: isLast ? 'default' : 'pointer', fontWeight: isLast ? 600 : 400, whiteSpace: 'nowrap' }, onClick: isLast ? undefined : () => jumpTo(acc) }, (i ? '/' : '') + s))
+      })
+
+      const row = (it, i) => React.createElement('div', {
+        key: it.name + '|' + i,
+        title: (it.type === 'dir' ? '进入目录 ' : '打开文件 ') + it.name,
+        onClick: () => (it.type === 'dir' ? enterDir(it.name) : openFile(joinRemote(curPath, it.name))),
+        style: { display: 'flex', alignItems: 'center', gap: 6, padding: '5px 8px', borderRadius: 5, cursor: 'pointer', fontSize: 13, color: it.type === 'dir' ? '#4caf7d' : '#e4e4e7', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', borderBottom: '1px solid rgba(128,128,128,0.12)' },
+      }, React.createElement('span', { style: { flexShrink: 0 } }, it.type === 'dir' ? '📁' : '📄'), React.createElement('span', { style: { overflow: 'hidden', textOverflow: 'ellipsis' } }, it.name))
+
+      const rootHint = status && status.workspace
+        ? React.createElement('div', { style: { fontSize: 11, opacity: 0.7, padding: '4px 8px', wordBreak: 'break-all' } }, '远程工作区: ' + status.workspace + (status.host ? '  (' + status.username + '@' + status.host + ')' : ''))
+        : React.createElement('div', { style: { fontSize: 11, opacity: 0.7, padding: '4px 8px' } }, '未设置远程工作区')
+
+      return React.createElement('div', { style: { display: 'flex', flexDirection: 'column', height: '100%', minHeight: 0 } },
+        React.createElement('div', { style: { display: 'flex', gap: 6, alignItems: 'center', padding: '6px 8px', borderBottom: '1px solid rgba(128,128,128,0.25)' } },
+          React.createElement('button', { style: { ...buttonS, padding: '3px 8px', fontSize: 12 }, onClick: () => { const w = status && status.workspace; if (w) { setLevels([{ path: w, items: null }]); loadDir(w, 0) } else setPicker(true) } }, '↻'),
+          React.createElement('div', { style: { flex: 1, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', fontSize: 12, fontFamily: 'monospace' } }, crumbs),
+          React.createElement('button', { style: { ...buttonS, padding: '3px 8px', fontSize: 12 }, onClick: () => setPicker(true) }, '…'),
+        ),
+        rootHint,
+        picker ? React.createElement('div', { style: { padding: 8 } }, React.createElement(DirPicker, {
+          open: true, busy: false, onPicked: (localMirror) => {
+            setPicker(false)
+            // The picker commits a mirror + workspace; refresh the tree.
+            refreshStatus()
+            fetchRemoteStatus().then((s) => { if (s && s.workspace) { setLevels([{ path: s.workspace, items: null }]); loadDir(s.workspace, 0) } })
+          }, onCancel: () => setPicker(false),
+        })) : null,
+        React.createElement('div', { style: { flex: 1, overflowY: 'auto', minHeight: 0 } },
+          loading ? React.createElement('div', { style: { opacity: 0.7, padding: 12, fontSize: 13 } }, '加载中…')
+            : (allItems.length ? allItems.slice(0, 500).map(row)
+                : (curPath ? React.createElement('div', { style: { opacity: 0.6, padding: 12, fontSize: 13 } }, '（空目录）')
+                    : React.createElement('div', { style: { opacity: 0.6, padding: 12, fontSize: 13 } }, '选择或设置一个远程工作区'))),
+        ),
+        err ? React.createElement('div', { style: { color: '#e06c75', fontSize: 12, padding: '4px 8px' } }, err) : null,
+      )
+    }
+
+    // ── Remote file tab (opened by the explorer; reads the file live) ──────
+    // A dedicated tab type instead of a file viewer: better-sidebar's viewer
+    // matching is extension/priority-based and cannot tell a REMOTE path from
+    // a LOCAL one (a catch-all viewer would hijack every local file open and
+    // then fail its local fs.read). Our own tab carries the remote path and
+    // reads it straight over /dsh-remote/read — read-only by design (the
+    // sidebar editor's save writes to the LOCAL fs, so an editable remote
+    // file would silently save into the mirror).
+    function RemoteFileTab(props) {
+      const { tab, scope } = props
+      const path = tab.path || ''
+      const [data, setData] = React.useState(null)
+      const [err, setErr] = React.useState('')
+      const [loading, setLoading] = React.useState(true)
+
+      React.useEffect(() => {
+        if (!path) { setLoading(false); return }
+        let cancelled = false
+        setLoading(true); setErr(''); setData(null)
+        readRemoteFile(path, 256 * 1024)
+          .then((d) => { if (!cancelled) { setData(d); setLoading(false) } })
+          .catch((e) => { if (!cancelled) { setErr(String((e && e.message) || e)); setLoading(false) } })
+        return () => { cancelled = true }
+      }, [path])
+
+      const baseName = path.split(/[\\/]/).pop() || path
+      return React.createElement('div', { style: { display: 'flex', flexDirection: 'column', height: '100%', minHeight: 0 } },
+        React.createElement('div', { style: { display: 'flex', alignItems: 'center', gap: 8, padding: '6px 10px', borderBottom: '1px solid rgba(128,128,128,0.25)', fontSize: 12 } },
+          React.createElement('span', { style: { fontWeight: 600, whiteSpace: 'nowrap' } }, '📄 ' + baseName),
+          React.createElement('code', { style: { flex: 1, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', opacity: 0.75 } }, path),
+          React.createElement('span', { style: { opacity: 0.7, fontSize: 11, flexShrink: 0 } }, '只读'),
+        ),
+        React.createElement('div', { style: { flex: 1, overflow: 'auto', minHeight: 0 } },
+          loading ? React.createElement('div', { style: { opacity: 0.7, padding: 12, fontSize: 13 } }, '加载中…')
+            : err ? React.createElement('div', { style: { color: '#e06c75', padding: 12, fontSize: 13 } }, err)
+              : (data && data.binary
+                  ? React.createElement('div', { style: { padding: 12, fontSize: 13, color: '#e6c07b' } },
+                      '二进制文件 (' + (data.size != null ? data.size + ' bytes' : '未知大小') + ') — 远程查看器为只读，请用 rw_download / 本地镜像查看。')
+                  : React.createElement('div', { style: { fontSize: 13, lineHeight: 1.55, fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Consolas, monospace', padding: '10px 12px', whiteSpace: 'pre-wrap', wordBreak: 'break-word' } },
+                      (data && data.content != null) ? data.content : '（空文件）',
+                      (data && data.truncated)
+                        ? React.createElement('div', { style: { color: '#e6c07b', fontSize: 12, marginTop: 8 } }, '… 内容已截断（只读远程查看，完整文件请用 rw_read_file / 下载）')
+                        : null,
+                    )),
+        ),
+      )
+    }
+
+    // ── better-sidebar registration (guarded: plugin may be absent) ────────
+    function registerSidebarIntegration(ctx) {
+      const bs = (ctx && ctx.get && ctx.get('betterSidebar')) || null
+      if (!bs || typeof bs.registerTab !== 'function') return
+      const disposers = []
+      try {
+        disposers.push(bs.registerTab({
+          id: SIDEBAR_EXPLORER_ID,
+          title: () => '远程文件',
+          icon: (size) => React.createElement('span', { style: { fontSize: (size || 14), lineHeight: 1 } }, '🌐'),
+          order: 55,
+          single: true,
+          component: (props) => React.createElement(RemoteExplorerTab, props),
+        }))
+        disposers.push(bs.registerTab({
+          id: SIDEBAR_FILE_ID,
+          title: () => '远程文件',
+          hidden: true, // not in the + menu; opened from the explorer tree
+          dedupeKey: (tab) => tab.path,
+          component: (props) => React.createElement(RemoteFileTab, props),
+        }))
+      } catch (e) {
+        console.warn('[dsh-remote] better-sidebar integration skipped:', e)
+        disposers.forEach((d) => { try { d() } catch {} })
+        return
+      }
+      // When a remote workspace is already configured, auto-open the remote
+      // explorer tab so the sidebar shows REMOTE files (not the local mirror
+      // tree the built-in Files tab lists). openTab with a path seed expands
+      // the panel and lands the tab in the active pane (the right panel);
+      // on the single:true explorer descriptor a repeat open focuses it.
+      //
+      // Timing: at plugin apply there is usually no active session yet, so
+      // openTab would be a no-op (store.reduce without a session). Subscribe
+      // to the sidebar snapshot and open the FIRST time a session appears;
+      // the subscription is also the cleanup channel for the auto-open fiber.
+      let autoOpened = false
+      let disposeAuto = null
+      const tryAutoOpen = () => {
+        if (autoOpened || typeof bs.subscribeState !== 'function') return
+        const snap = bs.getSnapshot && bs.getSnapshot()
+        if (!snap || !snap.sessionId) return
+        fetchRemoteStatus().then((s) => {
+          if (!s || !s.workspace || autoOpened) return
+          autoOpened = true
+          try {
+            bs.openTab({ type: SIDEBAR_EXPLORER_ID, title: '远程文件', path: s.workspace })
+          } catch (e2) {
+            console.warn('[dsh-remote] better-sidebar auto-open skipped:', e2)
+          }
+        })
+      }
+      tryAutoOpen()
+      if (typeof bs.subscribeState === 'function') {
+        disposeAuto = bs.subscribeState(tryAutoOpen)
+        disposers.push(disposeAuto)
+      }
+      return () => disposers.forEach((d) => { try { d() } catch {} })
+    }
+
     function apply(ctx) {
       const slots = ctx.get('slots')
       if (slots === undefined) return
@@ -471,6 +745,23 @@ window.__ModuleLoader__.load({
           },
         ),
       )
+      // better-sidebar integration: register the remote explorer + file tabs
+      // when dsh-better-sidebar is installed. Guarded — the plugin is optional
+      // and everything above works without it.
+      //
+      // Timing: bundle order may apply dsh-remote BEFORE dsh-better-sidebar,
+      // so `ctx.get('betterSidebar')` at apply time can be undefined. Use
+      // ctx.inject (cordis: "run once the requested services are available",
+      // re-run when a required service changes) so the integration registers
+      // the moment better-sidebar provides its service; when the plugin is
+      // never installed the fiber simply never runs — the optional integration
+      // stays inert. ctx.effect inside keeps the disposer fiber-bound.
+      ctx.inject(['betterSidebar'], (inner) => {
+        const bsDispose = registerSidebarIntegration(inner)
+        if (bsDispose) {
+          inner.effect(() => bsDispose, 'dsh-remote.betterSidebar')
+        }
+      })
     }
 
     exports.name = name

package/lib/index.js

@@ -1492,6 +1492,57 @@ export async function apply(ctx, config) {
         }
       },
     },
+    {
+      // Read a remote file over SFTP (live, not the local mirror) for the
+      // sidebar's remote file viewer. Text files come back as UTF-8 content
+      // (CRLF→LF), binary files are reported as binary with size+head bytes
+      // (base64) so the client can sniff the format without loading the
+      // whole file. `maxBytes` caps how much text is returned.
+      kind: 'exact',
+      path: '/dsh-remote/read',
+      handler: async (req, res) => {
+        if (req.method !== 'GET' && req.method !== 'POST') return sendJson(res, 405, { ok: false, error: 'method not allowed' })
+        try {
+          const q = new URL(req.url, 'http://localhost').searchParams
+          let p = q.get('path') ? decodeURIComponent(q.get('path')) : ''
+          if (req.method === 'POST') {
+            const body = JSON.parse((await readBody(req)) || '{}')
+            if (!p) p = String(body.path || '')
+          }
+          if (!p) return sendJson(res, 400, { ok: false, error: 'path is required' })
+          const target = normalizeRemotePath(p)
+          const maxBytes = Math.min(Math.max(Number(q.get('maxBytes')) || 256 * 1024, 1024), 2 * 1024 * 1024)
+          let sftp
+          try {
+            sftp = await pool.sftp()
+          } catch (err) {
+            return sendJson(res, 500, { ok: false, error: 'sftp unavailable: ' + ((err && err.message) || err) })
+          }
+          let buf
+          try {
+            buf = await sftp.readFile(target)
+          } catch (err) {
+            return sendJson(res, 500, { ok: false, error: 'read failed: ' + ((err && err.message) || err) })
+          }
+          // Binary sniff: NUL byte in the first 8KB (or the whole file when
+          // smaller) marks the file binary — matches the sidebar's convention.
+          const headN = Math.min(buf.length, 8192)
+          let binary = false
+          for (let i = 0; i < headN; i++) {
+            if (buf[i] === 0) { binary = true; break }
+          }
+          if (binary) {
+            return sendJson(res, 200, { ok: true, binary: true, size: buf.length, head: buf.slice(0, Math.min(buf.length, 4096)).toString('base64') })
+          }
+          let content = buf.toString('utf8').replace(/\r\n/g, '\n')
+          const truncated = content.length > maxBytes
+          if (truncated) content = content.slice(0, maxBytes) + `\n…[truncated: ${buf.length - maxBytes} more bytes]`
+          return sendJson(res, 200, { ok: true, binary: false, content, truncated })
+        } catch (err) {
+          return sendJson(res, 500, { ok: false, error: String((err && err.message) || err) })
+        }
+      },
+    },
     {
       kind: 'exact',
       path: '/dsh-remote/workspace',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote",
-  "version": "0.6.9",
+  "version": "0.7.1",
   "description": "Remote-work assistant for DeepSeek Harness: connect SSH (password or key), pick a remote workspace, operate on it with rw_pick_workspace / rw_list_dir / rw_read_file / rw_exec / rw_sync tools, and mirror it to a real local directory (SFTP) so the DSH native workspace can adopt it.",
   "license": "MIT",
   "author": "flymysql <flyphp@outlook.com>",