dsh-remote 0.8.17 → 0.8.20

package/lib/routes-fs.js

@@ -0,0 +1,221 @@
+// Sidebar file routes: /ls /read /write /fs.
+//
+// Machine-scoped callers (workspace picker, settings) omit sessionId and use
+// the active-machine pool. Session-scoped callers (explorer / file tab) MUST
+// pass sessionId (or local=mirror cwd); those requests resolve through the
+// same mirror binding as rw_* tools and never fall back to the active machine.
+import { mkdirSync } from 'node:fs'
+import path from 'node:path'
+import {
+  normalizeRemotePath, joinRemotePath, remoteDirname, mkdirRemoteDirs, toDisplayPath,
+} from './paths.js'
+import { requestSessionHint } from './binding.js'
+import { listDirStructured, listRemoteDrives, removeRemoteTree, previewRemoteFile } from './remote-fs.js'
+
+export function createFsRoutes({
+  sendJson,
+  readBody,
+  resolveRequestBinding,
+  decodeBuf,
+  encodeText,
+  audit,
+  config,
+  mirrorDirFor,
+}) {
+  const bindOrReply = async (req, res, body = {}) => {
+    try {
+      return await resolveRequestBinding(req, body)
+    } catch (err) {
+      sendJson(res, (err && err.httpStatus) || 500, { ok: false, error: String((err && err.message) || err) })
+      return null
+    }
+  }
+
+  return [
+    {
+      kind: 'exact',
+      path: '/dsh-remote/ls',
+      handler: async (req, res) => {
+        try {
+          const hint = requestSessionHint(req)
+          const b = await bindOrReply(req, res, hint)
+          if (!b) return
+          await b.pool.detect()
+          const q = new URL(req.url, 'http://localhost').searchParams
+          const raw = q.get('path') ? decodeURIComponent(q.get('path')) : (b.ws || '')
+          const canon = normalizeRemotePath(raw)
+          const win = b.pool.platform === 'windows'
+          if (canon === '/' || raw === '' || raw === '/') {
+            if (win || b.pool.platform !== 'posix') {
+              const drives = await listRemoteDrives(b.pool)
+              if (drives.length) return sendJson(res, 200, { path: '', platform: 'windows', items: drives, bound: b.bound })
+            }
+            if (win) return sendJson(res, 200, { path: '', platform: 'windows', items: [], bound: b.bound })
+          }
+          const sftp = await b.pool.sftp()
+          const out = await listDirStructured(sftp, canon)
+          const items = out.items.map((it) => ({
+            ...it,
+            path: toDisplayPath(joinRemotePath(canon, it.name), b.pool.platform),
+          }))
+          return sendJson(res, 200, {
+            path: toDisplayPath(out.path, b.pool.platform),
+            platform: win ? 'windows' : 'posix',
+            items,
+            missing: !!out.missing,
+            bound: b.bound,
+          })
+        } catch (err) {
+          return sendJson(res, 500, { error: String((err && err.message) || err) })
+        }
+      },
+    },
+    {
+      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')) : ''
+          let encoding = ''
+          let maxBytes = 256 * 1024
+          let body = {}
+          if (req.method === 'POST') {
+            body = JSON.parse((await readBody(req)) || '{}')
+            if (!p) p = String(body.path || '')
+            if (body.encoding) encoding = String(body.encoding)
+            if (body.maxBytes) maxBytes = Number(body.maxBytes)
+          }
+          if (q.get('maxBytes')) maxBytes = Number(q.get('maxBytes'))
+          if (!p) return sendJson(res, 400, { ok: false, error: 'path is required' })
+          const b = await bindOrReply(req, res, body)
+          if (!b) return
+          const target = normalizeRemotePath(p)
+          let sftp
+          try {
+            sftp = await b.pool.sftp()
+          } catch (err) {
+            return sendJson(res, 500, { ok: false, error: 'sftp unavailable: ' + ((err && err.message) || err) })
+          }
+          try {
+            const preview = await previewRemoteFile(sftp, target, {
+              maxBytes,
+              encoding: encoding || config.encoding,
+              decodeBuf,
+            })
+            return sendJson(res, 200, preview)
+          } catch (err) {
+            return sendJson(res, 500, { ok: false, error: 'read failed: ' + ((err && err.message) || err) })
+          }
+        } catch (err) {
+          return sendJson(res, 500, { ok: false, error: String((err && err.message) || err) })
+        }
+      },
+    },
+    {
+      kind: 'exact',
+      path: '/dsh-remote/write',
+      handler: async (req, res) => {
+        if (req.method !== 'POST') return sendJson(res, 405, { ok: false, error: 'method not allowed' })
+        try {
+          const body = JSON.parse((await readBody(req)) || '{}')
+          const p = normalizeRemotePath(String(body.path || ''))
+          if (!p || p === '/') return sendJson(res, 400, { ok: false, error: 'path is required' })
+          const b = await bindOrReply(req, res, body)
+          if (!b) return
+          const sftp = await b.pool.sftp()
+          let st = null
+          try { st = await sftp.stat(p) } catch { /* new file */ }
+          if (body.expectedMtime != null && st && st.mtime !== Number(body.expectedMtime)) {
+            return sendJson(res, 409, { ok: false, error: `远端文件已变化（mtime ${st.mtime} ≠ ${body.expectedMtime}），已放弃保存——请重新读取后再编辑` })
+          }
+          const buf = encodeText(String(body.content ?? ''), body.encoding || config.encoding)
+          if (!st) await mkdirRemoteDirs(sftp, remoteDirname(p))
+          await sftp.writeFile(p, buf)
+          audit('write', `write ${p}`, 0, b)
+          const st2 = await sftp.stat(p).catch(() => null)
+          return sendJson(res, 200, { ok: true, bytes: buf.byteLength, mtime: st2 ? st2.mtime : Math.floor(Date.now() / 1000) })
+        } catch (err) {
+          return sendJson(res, 500, { ok: false, error: String((err && err.message) || err) })
+        }
+      },
+    },
+    {
+      kind: 'exact',
+      path: '/dsh-remote/fs',
+      handler: async (req, res) => {
+        if (req.method !== 'POST') return sendJson(res, 405, { ok: false, error: 'method not allowed' })
+        try {
+          const body = JSON.parse((await readBody(req)) || '{}')
+          const op = String(body.op || '')
+          const b = await bindOrReply(req, res, body)
+          if (!b) return
+          const sftp = await b.pool.sftp()
+          if (op === 'mkdir') {
+            const p = normalizeRemotePath(String(body.path || ''))
+            if (!p || p === '/') return sendJson(res, 400, { ok: false, error: 'path required' })
+            await mkdirRemoteDirs(sftp, p)
+            audit('mkdir', `mkdir ${p}`, 0, b)
+            return sendJson(res, 200, { ok: true })
+          }
+          if (op === 'rename') {
+            const p = normalizeRemotePath(String(body.path || ''))
+            const d = normalizeRemotePath(String(body.dest || ''))
+            if (!p || !d) return sendJson(res, 400, { ok: false, error: 'path and dest required' })
+            await sftp.rename(p, d)
+            audit('move', `move ${p} → ${d}`, 0, b)
+            return sendJson(res, 200, { ok: true })
+          }
+          if (op === 'remove') {
+            const p = normalizeRemotePath(String(body.path || ''))
+            if (!p || p === '/') return sendJson(res, 400, { ok: false, error: 'path required' })
+            const st = await sftp.stat(p).catch(() => null)
+            if (!st) return sendJson(res, 404, { ok: false, error: 'not found' })
+            if (st.isDirectory && st.isDirectory()) {
+              await removeRemoteTree(sftp, p)
+            } else {
+              await sftp.unlink(p)
+            }
+            audit('remove', `remove ${p}`, 0, b)
+            return sendJson(res, 200, { ok: true })
+          }
+          if (op === 'write' || op === 'append') {
+            const p = normalizeRemotePath(String(body.path || ''))
+            if (!p || p === '/') return sendJson(res, 400, { ok: false, error: 'path required' })
+            let content = ''
+            if (op === 'append') {
+              try { content = decodeBuf(await sftp.readFile(p), body.encoding || config.encoding) } catch { /* new */ }
+            }
+            const buf = encodeText(content + String(body.content ?? ''), body.encoding || config.encoding)
+            if (op === 'write' && !(await sftp.stat(p).catch(() => null))) await mkdirRemoteDirs(sftp, remoteDirname(p))
+            await sftp.writeFile(p, buf)
+            audit(op, `${op} ${p}`, 0, b)
+            return sendJson(res, 200, { ok: true, bytes: buf.byteLength })
+          }
+          if (op === 'download') {
+            const p = normalizeRemotePath(String(body.path || ''))
+            const ws = b.ws
+            if (!p || p === '/') return sendJson(res, 400, { ok: false, error: 'path required' })
+            if (!ws) return sendJson(res, 400, { ok: false, error: 'no remote workspace set' })
+            const st = await sftp.stat(p).catch(() => null)
+            if (!st) return sendJson(res, 404, { ok: false, error: 'not found' })
+            if (config.maxFileBytes > 0 && st.size > config.maxFileBytes) {
+              return sendJson(res, 400, { ok: false, error: `file is ${st.size} bytes (over ${config.maxFileBytes} cap)` })
+            }
+            const base = b.mirrorDir || mirrorDirFor(ws, b.host, b.username, b.port)
+            const rel = p.startsWith(ws) ? p.slice(ws.length).replace(/^\/+/, '') : p.slice(1)
+            const local = path.join(base, rel)
+            mkdirSync(path.dirname(local), { recursive: true })
+            await sftp.fastGet(p, local)
+            audit('download', `download ${p}`, 0, b)
+            return sendJson(res, 200, { ok: true, bytes: st.size, local })
+          }
+          return sendJson(res, 400, { ok: false, error: 'unknown op' })
+        } catch (err) {
+          return sendJson(res, 500, { ok: false, error: String((err && err.message) || err) })
+        }
+      },
+    },
+  ]
+}

package/lib/search.js

@@ -2,7 +2,7 @@
 // Replaces `find … -exec grep` (which needs a POSIX shell and dies on
 // Windows remotes). Walks the remote tree over SFTP readdir/stat/readFile with
 // the same bounded-parallelism + ignore rules as the mirror sync.
-import { joinRemotePath } from './paths.js'
+import { joinRemotePath, shq } from './paths.js'
 
 function mapLimit(items, limit, fn) {
   const limitN = Math.max(1, Math.min(Math.floor(limit) || 1, items.length))
@@ -123,5 +123,63 @@ export async function searchTree(sftp, rootDir, opts = {}) {
   }
 
   await walk(rootDir, maxDepth)
+  if (scanned >= maxFiles) truncated = true
   return { matches, scanned, truncated }
 }
+
+function parseGrepLines(stdout, maxMatches) {
+  const matches = []
+  let truncated = false
+  for (const line of String(stdout || '').split('\n')) {
+    if (!line) continue
+    const m = line.match(/^(.*?):(\d+):(.*)$/)
+    if (!m) continue
+    if (matches.length >= maxMatches) { truncated = true; break }
+    matches.push({ path: m[1], line: Number(m[2]), text: m[3] })
+  }
+  return { matches, truncated }
+}
+
+/**
+ * POSIX fast path: `rg` then `grep -R`. Returns null when the remote has
+ * neither, so the caller can fall back to an SFTP walk (Windows / no grep).
+ */
+export async function searchViaShell(pool, rootDir, opts = {}) {
+  const {
+    pattern,
+    ignoreCase = true,
+    glob,
+    contextLines = 0,
+    maxMatches = 500,
+  } = opts
+  const ic = ignoreCase ? ' -i' : ''
+  const globFlag = glob ? ` --glob ${shq(glob)}` : ''
+  const ctx = contextLines > 0 ? ` -C ${Number(contextLines)}` : ''
+  const rg = `rg -n --no-heading -I${ic}${globFlag}${ctx} --max-count ${maxMatches} -- ${shq(pattern)} ${shq(rootDir)}`
+  const grepGlob = glob ? ` --include=${shq(glob)}` : ''
+  const grep = `grep -R -n -I -E${ic}${grepGlob}${ctx} -- ${shq(pattern)} ${shq(rootDir)}`
+  const script = `if command -v rg >/dev/null 2>&1; then ${rg}; elif command -v grep >/dev/null 2>&1; then ${grep}; else exit 127; fi`
+  const res = await pool.exec(script, { timeoutMs: opts.timeoutMs })
+  // 0 = hits, 1 = no hits; other codes mean the tools are missing / failed.
+  if (res.signal === 'TIMEOUT') throw new Error('search timed out')
+  if (res.code !== 0 && res.code !== 1) throw new Error(res.stderr || `search exit ${res.code}`)
+  const parsed = parseGrepLines(res.stdout, maxMatches)
+  return {
+    matches: parsed.matches,
+    scanned: parsed.matches.length,
+    truncated: parsed.truncated || /truncated|max-count/i.test(String(res.stderr || '')),
+    via: /rg/.test(String(res.stderr || '')) ? 'rg' : 'grep',
+  }
+}
+
+/** Prefer a POSIX grep/rg, fall back to the portable SFTP walk. */
+export async function searchRemote(pool, rootDir, opts = {}) {
+  if (pool && pool.platform !== 'windows') {
+    try {
+      const fast = await searchViaShell(pool, rootDir, opts)
+      if (fast && Array.isArray(fast.matches)) return fast
+    } catch { /* missing rg/grep or Windows-like remote → SFTP walk */ }
+  }
+  const sftp = await pool.sftp()
+  return searchTree(sftp, rootDir, opts)
+}

package/lib/sync.js

@@ -43,15 +43,15 @@ const remoteKey = (st) => (st ? keyOf(st.size, st.mtime) : null)
 /** Recursively pull remote → local mirror (three-way, ignore-aware). */
 export async function syncTree(sftp, remoteDir, localDir, opts = {}) {
   const {
-    maxDepth = 5,
-    maxFiles = 500,
+    maxDepth = 8,
+    maxFiles = 2000,
     maxFileBytes = 0,
     isIgnored = () => false,
     dryRun = false,
     force = false,
     state = {},
   } = opts
-  const stats = { files: 0, dirs: 0, skippedUnchanged: 0, skippedLarge: 0, conflicts: [], staleRemote: 0, touched: [] }
+  const stats = { files: 0, dirs: 0, skippedUnchanged: 0, skippedLarge: 0, conflicts: [], staleRemote: 0, touched: [], truncated: false }
   const nextState = { ...state }
 
   const walk = async (rDir, lDir, depth) => {
@@ -62,7 +62,10 @@ export async function syncTree(sftp, remoteDir, localDir, opts = {}) {
       if (name === '.' || name === '..') continue
       const isDir = !!(e.attrs && e.attrs.isDirectory && e.attrs.isDirectory())
       if (!isDir) continue
-      if (depth <= 0 || stats.files >= maxFiles) continue
+      if (depth <= 0 || stats.files >= maxFiles) {
+        stats.truncated = true
+        continue
+      }
       const rp = joinRemotePath(rDir, name)
       const lp = path.join(lDir, name)
       const rel = relPathUnder(remoteDir, rp) || name
@@ -72,14 +75,14 @@ export async function syncTree(sftp, remoteDir, localDir, opts = {}) {
       stats.dirs++
       if (stats.files >= maxFiles) break
     }
-    if (stats.files >= maxFiles) return
+    if (stats.files >= maxFiles) { stats.truncated = true; return }
 
     const files = entries.filter(
       (e) => !(e.attrs && e.attrs.isDirectory && e.attrs.isDirectory()) &&
         String(e.filename) !== '.' && String(e.filename) !== '..',
     )
     await mapLimit(files, 4, async (e) => {
-      if (stats.files >= maxFiles) return
+      if (stats.files >= maxFiles) { stats.truncated = true; return }
       const name = String(e.filename)
       const rp = joinRemotePath(rDir, name)
       const lp = path.join(lDir, name)
@@ -122,6 +125,7 @@ export async function syncTree(sftp, remoteDir, localDir, opts = {}) {
   }
 
   await walk(remoteDir, localDir, maxDepth)
+  if (stats.files >= maxFiles) stats.truncated = true
   // Informational: remote entries in the snapshot that no longer exist remotely.
   for (const rel of Object.keys(state)) {
     if (state[rel] && !nextState[rel]) stats.staleRemote++
@@ -132,14 +136,14 @@ export async function syncTree(sftp, remoteDir, localDir, opts = {}) {
 /** Recursively push local mirror → remote (three-way, ignore-aware). */
 export async function pushTree(sftp, localDir, remoteDir, opts = {}) {
   const {
-    maxFiles = 500,
+    maxFiles = 2000,
     maxFileBytes = 0,
     isIgnored = () => false,
     dryRun = false,
     force = false,
     state = {},
   } = opts
-  const stats = { files: 0, dirs: 0, skippedUnchanged: 0, skippedLarge: 0, conflicts: [], staleLocal: 0, pushed: [] }
+  const stats = { files: 0, dirs: 0, skippedUnchanged: 0, skippedLarge: 0, conflicts: [], staleLocal: 0, pushed: [], truncated: false }
   const nextState = { ...state }
 
   const walk = async (lDir, rDir) => {
@@ -157,11 +161,11 @@ export async function pushTree(sftp, localDir, remoteDir, opts = {}) {
       await walk(path.join(lDir, e.name), rp)
       if (stats.files >= maxFiles) break
     }
-    if (stats.files >= maxFiles) return
+    if (stats.files >= maxFiles) { stats.truncated = true; return }
 
     const files = entries.filter((e) => !e.isDirectory())
     await mapLimit(files, 4, async (e) => {
-      if (stats.files >= maxFiles) return
+      if (stats.files >= maxFiles) { stats.truncated = true; return }
       const lp = path.join(lDir, e.name)
       const rp = joinRemotePath(rDir, e.name)
       const rel = relPathUnder(remoteDir, rp) || e.name
@@ -208,6 +212,7 @@ export async function pushTree(sftp, localDir, remoteDir, opts = {}) {
   }
 
   await walk(localDir, remoteDir)
+  if (stats.files >= maxFiles) stats.truncated = true
   for (const rel of Object.keys(state)) {
     if (state[rel] && !nextState[rel]) stats.staleLocal++
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-remote",
-  "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.",
+  "version": "0.8.20",
+  "description": "Remote-work assistant for DeepSeek Harness: connect SSH (password/key/agent/keyboard-interactive/proxy jump), pick a remote workspace, operate on it with 20 rw_* tools (incl. rw_edit/rw_stat/rw_mkdir/rw_remove/rw_move/rw_forward), conflict-aware mirror sync, port forwarding, optional side-bar remote file editing, audit log, keychain passwords.",
   "license": "MIT",
   "author": "flymysql <flyphp@outlook.com>",
   "homepage": "https://github.com/flymysql/dsh-remote",
@@ -66,7 +66,6 @@
   "dependencies": {
     "ssh2": "^1.16.0",
     "@deepseek-ai/schemastery": "^3.18.1",
-    "dsh-better-sidebar": "^0.18.1",
     "iconv-lite": "^0.6.3"
   },
   "devDependencies": {