dsh-remote 0.8.72 → 0.8.74

package/cordis.patch.yml

@@ -1,9 +1,9 @@
-# dsh-remote bundle patch: inserts only this plugin into a profile's layer stack.
-#
-# dsh-better-sidebar is deliberately not mounted here and is not a dependency.
-# Users who want that optional Web UI can install its bundle separately;
-# lib/client.js discovers the betterSidebar service dynamically and adds the
-# remote explorer/editor tabs when it is present.
-- insert:
-    - id: dsh-remote
-      name: 'dsh-remote'
+# dsh-remote bundle patch: inserts only this plugin into a profile's layer stack.
+#
+# dsh-better-sidebar is deliberately not mounted here and is not a dependency.
+# Users who want that optional Web UI can install its bundle separately;
+# lib/client.js discovers the betterSidebar service dynamically and adds the
+# remote explorer/editor tabs when it is present.
+- insert:
+    - id: dsh-remote
+      name: 'dsh-remote'

package/lib/binding.js

@@ -1,172 +1,172 @@
-// Session → remote-binding resolution.
-//
-// A session's remote target is derived from its own workspace mirror, never
-// from the plugin's mutable active-machine state. That is what keeps concurrent
-// sessions on different hosts independent: with a single shared connection and
-// a single shared workspace value, one session switching machines redirected
-// every other session's commands to the wrong host (issue #25).
-//
-// The mirror directory is the durable record of that binding: `ensureMirror()`
-// writes `.dsh-remote-meta.json` with the remote origin (`host`/`port`/
-// `username`/`remotePath`) when the workspace is picked, so a session's cwd
-// alone identifies both the machine to connect to and the workspace root.
-
-import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs'
-import path from 'node:path'
-import zlib from 'node:zlib'
-
-/** Strip trailing separators so a mirror root and a path inside it compare cleanly. */
-const norm = (p) => path.resolve(String(p || '')).replace(/[\\/]+$/, '') || ''
-
-/** Whether `base` is `dir` itself or nested under it (separator-aware, so
- *  `/a/mirror-2` is NOT treated as living inside `/a/mirror`). */
-const isUnder = (base, dir) => base === dir || base.startsWith(dir + path.sep) || base.startsWith(dir + '/')
-
-/**
- * Resolve which remote workspace a LOCAL path belongs to by scanning the mirror
- * registry for the mirror that contains it.
- *
- * Mirrors live exactly one level under the registry root as
- * `<host>-<user>-<port>/<basename>`, and `mirrorDirFor()` appends a short hash
- * when two remote paths share a basename, so containment is unambiguous. The
- * longest containing path still wins, which keeps the result stable if a
- * future layout ever nests them.
- *
- * A mirror whose meta is missing, unparsable, or has no `host` is skipped
- * rather than guessed at: reporting no binding makes the caller refuse loudly,
- * while guessing would send commands to an unintended host.
- *
- * @param {string} local - absolute local path, typically a session's cwd.
- * @param {string} root - the mirror registry root (`$DSH_HOME/remote-workspaces`).
- * @returns {{mirrorDir: string|null, remotePath: string, machine: {host: string, port: number, username: string, alias: string}|null}}
- *   `machine` is the mirror-recorded origin (`alias` is the ~/.ssh/config alias
- *   it was created through, '' when the machine uses literal values), or null
- *   when `local` is not inside a usable mirror (in which case `remotePath` is
- *   empty too).
- */
-export function resolveMirror(local, root) {
-  let mirrorDir = null
-  let remotePath = ''
-  let machine = null
-  if (!local || !root || !existsSync(root)) return { mirrorDir, remotePath, machine }
-  const base = norm(local)
-  let hostDirs
-  try {
-    hostDirs = readdirSync(root)
-  } catch {
-    return { mirrorDir, remotePath, machine }
-  }
-  for (const hostDir of hostDirs) {
-    const hostPath = path.join(root, hostDir)
-    if (!statSync(hostPath, { throwIfNoEntry: false })?.isDirectory?.()) continue
-    let entries
-    try {
-      entries = readdirSync(hostPath)
-    } catch {
-      continue
-    }
-    for (const entry of entries) {
-      const metaPath = path.join(hostPath, entry, '.dsh-remote-meta.json')
-      if (!existsSync(metaPath)) continue
-      const mirrorAbs = norm(path.join(hostPath, entry))
-      if (!isUnder(base, mirrorAbs)) continue
-      // Deepest match wins; an equal-length path cannot occur twice.
-      if (mirrorDir && mirrorAbs.length <= mirrorDir.length) continue
-      try {
-        const meta = JSON.parse(readFileSync(metaPath, 'utf8'))
-        if (!meta || !meta.host) continue
-        mirrorDir = mirrorAbs
-        remotePath = String(meta.remotePath || '')
-        machine = {
-          host: String(meta.host),
-          port: Number(meta.port) || 22,
-          username: String(meta.username || ''),
-          // The ~/.ssh/config alias this mirror was created through, when the
-          // machine was saved as one (issue #38): it keeps the mirror bound to
-          // its machine even if that alias's HostName/port later change.
-          alias: String(meta.alias || ''),
-        }
-      } catch { /* unparsable meta → not a usable binding */ }
-    }
-  }
-  return { mirrorDir, remotePath, machine }
-}
-
-/**
- * Stable pool key for a remote identity. Two sessions on the same machine
- * produce the same key and therefore share one SSH connection; sessions on
- * different machines never collide.
- * @param {{host: string, port?: number|string, username?: string}} m - the remote identity.
- * @returns {string} the canonical `user@host:port` key.
- */
-export function poolKey(m) {
-  return `${(m && m.username) || ''}@${(m && m.host) || ''}:${Number(m && m.port) || 22}`
-}
-
-/** Safe path segment for a session id (mirrors DSH's encodeSegment). */
-export function encodeSegmentSafe(id) {
-  const s = String(id || '').replace(/[^A-Za-z0-9._-]/g, '_')
-  return s || 'session'
-}
-
-/** Read the cwd from a session log header (JSONL / .gz / zstd first frame). */
-export function readSessionHeaderCwd(file) {
-  try {
-    let buf = readFileSync(file)
-    if (/\.zstd$/.test(file)) buf = zlib.zstdDecompressSync(buf)
-    else if (/\.gz$/.test(file)) buf = zlib.gunzipSync(buf)
-    const nl = buf.indexOf(10)
-    if (nl < 0) return ''
-    const head = JSON.parse(buf.subarray(0, nl).toString('utf8'))
-    return typeof head.cwd === 'string' ? head.cwd : ''
-  } catch {
-    return ''
-  }
-}
-
-/**
- * Resolve a session's workspace cwd from the live sessions service, then from
- * durable session logs under `$DSH_HOME/sessions`.
- */
-export function lookupSessionCwd(sessionId, { sessions, dshHome } = {}) {
-  if (!sessionId) return ''
-  try {
-    if (sessions && typeof sessions.get === 'function') {
-      const s = sessions.get(sessionId)
-      const cwd = s && s.header && s.header.cwd
-      if (cwd) return String(cwd)
-    }
-  } catch { /* sessions service unavailable */ }
-  if (!dshHome) return ''
-  try {
-    const sessionsRoot = path.join(dshHome, 'sessions')
-    if (!existsSync(sessionsRoot)) return ''
-    const targetDir = encodeSegmentSafe(sessionId)
-    for (const projDir of readdirSync(sessionsRoot)) {
-      const projPath = path.join(sessionsRoot, projDir)
-      if (!statSync(projPath, { throwIfNoEntry: false })?.isDirectory?.()) continue
-      const sessDir = path.join(projPath, targetDir)
-      if (!statSync(sessDir, { throwIfNoEntry: false })?.isDirectory?.()) continue
-      const logFile = ['session.jsonl.zstd', 'session.jsonl', 'session.jsonl.gz']
-        .map((n) => path.join(sessDir, n)).find((p) => existsSync(p))
-      if (!logFile) continue
-      const cwd = readSessionHeaderCwd(logFile)
-      if (cwd) return cwd
-    }
-  } catch { /* session log scan failed */ }
-  return ''
-}
-
-/** Pull sessionId / local from a JSON HTTP request (query string + body). */
-export function requestSessionHint(req, body = {}) {
-  let sessionId = ''
-  let local = ''
-  try {
-    const q = new URL(req.url || '', 'http://localhost').searchParams
-    sessionId = q.get('sessionId') ? decodeURIComponent(q.get('sessionId')) : ''
-    local = q.get('local') ? decodeURIComponent(q.get('local')) : ''
-  } catch { /* malformed url */ }
-  if (!sessionId && body && body.sessionId) sessionId = String(body.sessionId)
-  if (!local && body && body.local) local = String(body.local)
-  return { sessionId: String(sessionId || '').trim(), local: String(local || '').trim() }
-}
+// Session → remote-binding resolution.
+//
+// A session's remote target is derived from its own workspace mirror, never
+// from the plugin's mutable active-machine state. That is what keeps concurrent
+// sessions on different hosts independent: with a single shared connection and
+// a single shared workspace value, one session switching machines redirected
+// every other session's commands to the wrong host (issue #25).
+//
+// The mirror directory is the durable record of that binding: `ensureMirror()`
+// writes `.dsh-remote-meta.json` with the remote origin (`host`/`port`/
+// `username`/`remotePath`) when the workspace is picked, so a session's cwd
+// alone identifies both the machine to connect to and the workspace root.
+
+import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs'
+import path from 'node:path'
+import zlib from 'node:zlib'
+
+/** Strip trailing separators so a mirror root and a path inside it compare cleanly. */
+const norm = (p) => path.resolve(String(p || '')).replace(/[\\/]+$/, '') || ''
+
+/** Whether `base` is `dir` itself or nested under it (separator-aware, so
+ *  `/a/mirror-2` is NOT treated as living inside `/a/mirror`). */
+const isUnder = (base, dir) => base === dir || base.startsWith(dir + path.sep) || base.startsWith(dir + '/')
+
+/**
+ * Resolve which remote workspace a LOCAL path belongs to by scanning the mirror
+ * registry for the mirror that contains it.
+ *
+ * Mirrors live exactly one level under the registry root as
+ * `<host>-<user>-<port>/<basename>`, and `mirrorDirFor()` appends a short hash
+ * when two remote paths share a basename, so containment is unambiguous. The
+ * longest containing path still wins, which keeps the result stable if a
+ * future layout ever nests them.
+ *
+ * A mirror whose meta is missing, unparsable, or has no `host` is skipped
+ * rather than guessed at: reporting no binding makes the caller refuse loudly,
+ * while guessing would send commands to an unintended host.
+ *
+ * @param {string} local - absolute local path, typically a session's cwd.
+ * @param {string} root - the mirror registry root (`$DSH_HOME/remote-workspaces`).
+ * @returns {{mirrorDir: string|null, remotePath: string, machine: {host: string, port: number, username: string, alias: string}|null}}
+ *   `machine` is the mirror-recorded origin (`alias` is the ~/.ssh/config alias
+ *   it was created through, '' when the machine uses literal values), or null
+ *   when `local` is not inside a usable mirror (in which case `remotePath` is
+ *   empty too).
+ */
+export function resolveMirror(local, root) {
+  let mirrorDir = null
+  let remotePath = ''
+  let machine = null
+  if (!local || !root || !existsSync(root)) return { mirrorDir, remotePath, machine }
+  const base = norm(local)
+  let hostDirs
+  try {
+    hostDirs = readdirSync(root)
+  } catch {
+    return { mirrorDir, remotePath, machine }
+  }
+  for (const hostDir of hostDirs) {
+    const hostPath = path.join(root, hostDir)
+    if (!statSync(hostPath, { throwIfNoEntry: false })?.isDirectory?.()) continue
+    let entries
+    try {
+      entries = readdirSync(hostPath)
+    } catch {
+      continue
+    }
+    for (const entry of entries) {
+      const metaPath = path.join(hostPath, entry, '.dsh-remote-meta.json')
+      if (!existsSync(metaPath)) continue
+      const mirrorAbs = norm(path.join(hostPath, entry))
+      if (!isUnder(base, mirrorAbs)) continue
+      // Deepest match wins; an equal-length path cannot occur twice.
+      if (mirrorDir && mirrorAbs.length <= mirrorDir.length) continue
+      try {
+        const meta = JSON.parse(readFileSync(metaPath, 'utf8'))
+        if (!meta || !meta.host) continue
+        mirrorDir = mirrorAbs
+        remotePath = String(meta.remotePath || '')
+        machine = {
+          host: String(meta.host),
+          port: Number(meta.port) || 22,
+          username: String(meta.username || ''),
+          // The ~/.ssh/config alias this mirror was created through, when the
+          // machine was saved as one (issue #38): it keeps the mirror bound to
+          // its machine even if that alias's HostName/port later change.
+          alias: String(meta.alias || ''),
+        }
+      } catch { /* unparsable meta → not a usable binding */ }
+    }
+  }
+  return { mirrorDir, remotePath, machine }
+}
+
+/**
+ * Stable pool key for a remote identity. Two sessions on the same machine
+ * produce the same key and therefore share one SSH connection; sessions on
+ * different machines never collide.
+ * @param {{host: string, port?: number|string, username?: string}} m - the remote identity.
+ * @returns {string} the canonical `user@host:port` key.
+ */
+export function poolKey(m) {
+  return `${(m && m.username) || ''}@${(m && m.host) || ''}:${Number(m && m.port) || 22}`
+}
+
+/** Safe path segment for a session id (mirrors DSH's encodeSegment). */
+export function encodeSegmentSafe(id) {
+  const s = String(id || '').replace(/[^A-Za-z0-9._-]/g, '_')
+  return s || 'session'
+}
+
+/** Read the cwd from a session log header (JSONL / .gz / zstd first frame). */
+export function readSessionHeaderCwd(file) {
+  try {
+    let buf = readFileSync(file)
+    if (/\.zstd$/.test(file)) buf = zlib.zstdDecompressSync(buf)
+    else if (/\.gz$/.test(file)) buf = zlib.gunzipSync(buf)
+    const nl = buf.indexOf(10)
+    if (nl < 0) return ''
+    const head = JSON.parse(buf.subarray(0, nl).toString('utf8'))
+    return typeof head.cwd === 'string' ? head.cwd : ''
+  } catch {
+    return ''
+  }
+}
+
+/**
+ * Resolve a session's workspace cwd from the live sessions service, then from
+ * durable session logs under `$DSH_HOME/sessions`.
+ */
+export function lookupSessionCwd(sessionId, { sessions, dshHome } = {}) {
+  if (!sessionId) return ''
+  try {
+    if (sessions && typeof sessions.get === 'function') {
+      const s = sessions.get(sessionId)
+      const cwd = s && s.header && s.header.cwd
+      if (cwd) return String(cwd)
+    }
+  } catch { /* sessions service unavailable */ }
+  if (!dshHome) return ''
+  try {
+    const sessionsRoot = path.join(dshHome, 'sessions')
+    if (!existsSync(sessionsRoot)) return ''
+    const targetDir = encodeSegmentSafe(sessionId)
+    for (const projDir of readdirSync(sessionsRoot)) {
+      const projPath = path.join(sessionsRoot, projDir)
+      if (!statSync(projPath, { throwIfNoEntry: false })?.isDirectory?.()) continue
+      const sessDir = path.join(projPath, targetDir)
+      if (!statSync(sessDir, { throwIfNoEntry: false })?.isDirectory?.()) continue
+      const logFile = ['session.jsonl.zstd', 'session.jsonl', 'session.jsonl.gz']
+        .map((n) => path.join(sessDir, n)).find((p) => existsSync(p))
+      if (!logFile) continue
+      const cwd = readSessionHeaderCwd(logFile)
+      if (cwd) return cwd
+    }
+  } catch { /* session log scan failed */ }
+  return ''
+}
+
+/** Pull sessionId / local from a JSON HTTP request (query string + body). */
+export function requestSessionHint(req, body = {}) {
+  let sessionId = ''
+  let local = ''
+  try {
+    const q = new URL(req.url || '', 'http://localhost').searchParams
+    sessionId = q.get('sessionId') ? decodeURIComponent(q.get('sessionId')) : ''
+    local = q.get('local') ? decodeURIComponent(q.get('local')) : ''
+  } catch { /* malformed url */ }
+  if (!sessionId && body && body.sessionId) sessionId = String(body.sessionId)
+  if (!local && body && body.local) local = String(body.local)
+  return { sessionId: String(sessionId || '').trim(), local: String(local || '').trim() }
+}