dsh-ssh-workbench 1.7.0 → 1.7.9

package/lib/routes.js

@@ -10,9 +10,11 @@
  * Every browser-facing request is fenced by `ctx.connection.requestRejection`
  * when the Connection service exists.
  */
+import path from 'node:path'
 import { Readable } from 'node:stream'
 
 import { createLocalFileApi, LOCAL_FILE_REF } from './core/local-file-api.js'
+import { createLocalFs } from './core/localfs.js'
 import { effectiveDialect } from './core/dialect.js'
 import { SshError } from './core/errors.js'
 import { summarizeExecution } from './core/execution-stats.js'
@@ -165,7 +167,7 @@ function lastExecutedServer(entries, session) {
   return entry?.server ?? null
 }
 
-export function createRoutes({ loadServers, saveServers, runtime, secrets, knownHosts, targets, liveExecutions, refreshFacts, prefs, terminals, localfs, publicConfig, activity }) {
+export function createRoutes({ loadServers, saveServers, runtime, secrets, knownHosts, targets, liveExecutions, refreshFacts, prefs, terminals, localfs, getSessionCwd, publicConfig, activity }) {
   const prefsApi = prefs ?? {
     load: () => ({ sidebar: true }),
     save: () => ({ sidebar: true }),
@@ -173,6 +175,36 @@ export function createRoutes({ loadServers, saveServers, runtime, secrets, known
   // Reuse the files panel for the local workspace by giving it the same
   // method surface as the SSH runtime under the synthetic `__local__` ref.
   const localFiles = localfs ? createLocalFileApi(localfs) : null
+  /**
+   * Session-scoped local file APIs. The hierarchy page browses a session's
+   * cwd, which may sit outside the local-pane root (e.g. `C:\A\B\lumina` on
+   * Windows). The scoped API keeps the same boundary checks, just rooted at the
+   * live session workspace instead of `localRoot`.
+   */
+  const scopedLocalFiles = new Map()
+  /** Local transfer session id → the API instance that opened it. */
+  const localTransferOwners = new Map()
+
+  function localApiForSession(sessionId) {
+    if (!localfs || !getSessionCwd || typeof sessionId !== 'string' || !sessionId) return localFiles
+    let cwd
+    try {
+      cwd = getSessionCwd(sessionId)
+    } catch {
+      return localFiles
+    }
+    if (typeof cwd !== 'string' || !cwd || !path.isAbsolute(cwd)) return localFiles
+    let api = scopedLocalFiles.get(cwd)
+    if (!api) {
+      api = createLocalFileApi(createLocalFs({ getRoot: () => cwd }))
+      scopedLocalFiles.set(cwd, api)
+    }
+    return api
+  }
+
+  function localTransferApi(sessionId) {
+    return localTransferOwners.get(sessionId) ?? (localFiles && sessionId.startsWith('loc') ? localFiles : null)
+  }
   // Small UI-facing caches: a repeated directory view or connection test should
   // not pay another round trip. Write operations invalidate the affected server.
   const TEST_TTL_MS = 30000
@@ -262,9 +294,10 @@ export function createRoutes({ loadServers, saveServers, runtime, secrets, known
    * workstream); fall back to `localfs.rootReal()` and finally the lexical
    * `localfs.root()` so this route keeps working while the two land.
    */
-  async function localHomeDirectory() {
+  async function localHomeDirectory(sessionId) {
     const sources = []
-    if (typeof localFiles?.sftpHome === 'function') sources.push(() => localFiles.sftpHome())
+    const api = localApiForSession(sessionId)
+    if (typeof api?.sftpHome === 'function') sources.push(() => api.sftpHome())
     if (typeof localfs?.rootReal === 'function') sources.push(() => localfs.rootReal())
     if (typeof localfs?.root === 'function') sources.push(() => localfs.root())
     if (sources.length === 0) throw new Error('local files are unavailable on this host')
@@ -291,11 +324,11 @@ export function createRoutes({ loadServers, saveServers, runtime, secrets, known
   }
 
   /** GET/POST /sftp/home → `{ ok:true, result:{ home } }` (U5). */
-  async function serveSftpHome(res, ref) {
+  async function serveSftpHome(res, ref, sessionId) {
     if (!ref) return send(res, 400, { ok: false, error: 'ref is required' })
     try {
       if (ref === LOCAL_FILE_REF) {
-        const home = await localHomeDirectory()
+        const home = await localHomeDirectory(sessionId)
         return send(res, 200, { ok: true, result: { home } })
       }
       const server = findTarget(loadServers(), ref)
@@ -366,15 +399,19 @@ export function createRoutes({ loadServers, saveServers, runtime, secrets, known
       if (req.method === 'GET' && rel === '/localfs/root') {
         if (!localfs) return send(res, 503, { ok: false, error: 'local files are unavailable on this host' })
         // S3: list()/entry paths are canonicalized through realpath, so the
-        // navigation root handed to the client must use the same form.
-        const root = typeof localfs.rootReal === 'function'
-          ? await localfs.rootReal()
-          : await Promise.resolve(localfs.root())
+        // navigation root handed to the client must use the same form. A
+        // `session` query scopes this to the session workspace (hierarchy page).
+        const api = localApiForSession(searchParams.get('session'))
+        const root = typeof api?.sftpHome === 'function'
+          ? await api.sftpHome()
+          : typeof localfs.rootReal === 'function'
+            ? await localfs.rootReal()
+            : await Promise.resolve(localfs.root())
         return send(res, 200, { ok: true, result: { root } })
       }
       if (req.method === 'GET' && rel === '/sftp/home') {
         const ref = resolveRef(searchParams.get('ref') ?? searchParams.get('server') ?? searchParams.get('name'))
-        return await serveSftpHome(res, ref)
+        return await serveSftpHome(res, ref, searchParams.get('session'))
       }
       if (req.method !== 'POST') return send(res, 404, { ok: false, error: 'not found' })
       const body = await readBody(req)
@@ -383,14 +420,28 @@ export function createRoutes({ loadServers, saveServers, runtime, secrets, known
         const ref = resolveRef(
           body.ref ?? body.server ?? body.name ?? searchParams.get('ref') ?? searchParams.get('server') ?? searchParams.get('name'),
         )
-        return await serveSftpHome(res, ref)
+        return await serveSftpHome(res, ref, body.session)
       }
 
       if (rel === '/prefs') {
-        if (typeof body.sidebar !== 'boolean') {
-          return send(res, 400, { ok: false, error: 'prefs.sidebar must be a boolean' })
+        const patch = {}
+        if (typeof body.sidebar === 'boolean') patch.sidebar = body.sidebar
+        // `null` clears the override and falls back to the plugin config.
+        if (typeof body.remoteFileWrite === 'boolean' || body.remoteFileWrite === null) {
+          patch.remoteFileWrite = body.remoteFileWrite
+        }
+        if (typeof body.systemFileHierarchy === 'boolean' || body.systemFileHierarchy === null) {
+          patch.systemFileHierarchy = body.systemFileHierarchy
         }
-        return send(res, 200, { ok: true, prefs: prefsApi.save({ sidebar: body.sidebar }) })
+        if (Object.keys(patch).length === 0) {
+          return send(res, 400, { ok: false, error: 'prefs patch must contain sidebar, remoteFileWrite and/or systemFileHierarchy' })
+        }
+        const saved = prefsApi.save(patch)
+        return send(res, 200, {
+          ok: true,
+          prefs: saved,
+          config: typeof publicConfig === 'function' ? publicConfig() : undefined,
+        })
       }
 
       if (rel === '/terminal/open') {
@@ -437,7 +488,7 @@ export function createRoutes({ loadServers, saveServers, runtime, secrets, known
       // Chunked transfer sessions: the client holds a session id, so these
       // routes do not take a server ref. They must run before ref resolution.
       const sessionId = typeof body.session === 'string' ? body.session : ''
-      const localTransfer = localFiles && sessionId.startsWith('loc') ? localFiles : null
+      const localTransfer = localTransferApi(sessionId)
       if (rel === '/sftp/write-chunk') {
         if (!sessionId) return send(res, 400, { ok: false, error: 'session is required' })
         // B10: offset used to be silently coerced to 0 by the runtime, which
@@ -463,6 +514,7 @@ export function createRoutes({ loadServers, saveServers, runtime, secrets, known
           return send(res, 200, { ok: true, result })
         }
         const result = await fileOp('finish upload', undefined, () => api.sftpCloseTransfer(sessionId, { verify: true }))
+        localTransferOwners.delete(sessionId)
         // F1/B5/B8: the local adapter used to return no `server`, so the dir
         // cache was cleared for `undefined` and the activity log said
         // "unknown". Prefer the reported id, fall back to the synthetic local
@@ -494,6 +546,7 @@ export function createRoutes({ loadServers, saveServers, runtime, secrets, known
         if (!sessionId) return send(res, 400, { ok: false, error: 'session is required' })
         const api = localTransfer ?? runtime
         const result = await fileOp('close download', undefined, () => api.sftpCloseTransfer(sessionId))
+        localTransferOwners.delete(sessionId)
         return send(res, 200, { ok: true, result })
       }
 
@@ -501,9 +554,11 @@ export function createRoutes({ loadServers, saveServers, runtime, secrets, known
       const servers = loadServers()
       let target
       let fileApi = runtime
+      let localApi = null
       if (ref === LOCAL_FILE_REF && localFiles) {
-        target = localFiles.server
-        fileApi = localFiles
+        localApi = localApiForSession(body.session)
+        target = localApi.server
+        fileApi = localApi
       } else {
         target = ref ? findTarget(servers, ref) : undefined
       }
@@ -605,11 +660,15 @@ export function createRoutes({ loadServers, saveServers, runtime, secrets, known
 
       if (rel === '/sftp/open-write') {
         if (typeof body.path !== 'string') return send(res, 400, { ok: false, error: 'path is required' })
-        return send(res, 200, { ok: true, result: await fileOp('open for writing', body.path, () => fileApi.sftpOpenWrite(target, body.path, body.truncate !== false)) })
+        const result = await fileOp('open for writing', body.path, () => fileApi.sftpOpenWrite(target, body.path, body.truncate !== false))
+        if (localApi && typeof result?.session === 'string') localTransferOwners.set(result.session, localApi)
+        return send(res, 200, { ok: true, result })
       }
       if (rel === '/sftp/open-read') {
         if (typeof body.path !== 'string') return send(res, 400, { ok: false, error: 'path is required' })
-        return send(res, 200, { ok: true, result: await fileOp('open for reading', body.path, () => fileApi.sftpOpenRead(target, body.path)) })
+        const result = await fileOp('open for reading', body.path, () => fileApi.sftpOpenRead(target, body.path))
+        if (localApi && typeof result?.session === 'string') localTransferOwners.set(result.session, localApi)
+        return send(res, 200, { ok: true, result })
       }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ssh-workbench",
-  "version": "1.7.0",
+  "version": "1.7.9",
   "description": "远程工作台：SSH 终端、本地与远程文件、@服务器 对话执行；显式目标的远程 shell 与 read/glob/grep，Windows 宿主和目标都能用。DeepSeek Harness SSH workbench plugin.",
   "type": "module",
   "main": "lib/index.js",
@@ -38,7 +38,10 @@
       "platform": "web",
       "inject": [
         "@deepseek-ai/dsh-client-ui-renderer",
-        "@deepseek-ai/dsh-client-locale"
+        "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-ui-context-menu",
+        "@deepseek-ai/dsh-api-remotes",
+        "@deepseek-ai/dsh-api-session-controller"
       ]
     }
   },
@@ -48,6 +51,9 @@
     "@deepseek-ai/schemastery": "^3.18.5",
     "@deepseek-ai/dsh-client-ui-renderer": ">=0.2.1-rc.1 <0.3.0",
     "@deepseek-ai/dsh-client-locale": ">=0.2.1-rc.1 <0.3.0",
+    "@deepseek-ai/dsh-client-ui-context-menu": ">=0.2.1-rc.1 <0.3.0",
+    "@deepseek-ai/dsh-api-remotes": ">=0.2.1-rc.1 <0.3.0",
+    "@deepseek-ai/dsh-api-session-controller": ">=0.2.1-rc.1 <0.3.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
   },
@@ -57,6 +63,15 @@
     },
     "@deepseek-ai/dsh-client-locale": {
       "optional": true
+    },
+    "@deepseek-ai/dsh-client-ui-context-menu": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-api-remotes": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-api-session-controller": {
+      "optional": true
     }
   },
   "scripts": {