dsh-remote 0.8.3 → 0.8.5

package/lib/ignore.js

@@ -1,123 +1,123 @@
-// dsh-remote — gitignore-style ignore matcher for mirror sync / remote search.
-import { readFileSync } from 'node:fs'
-//
-// Deliberately a SUBSET of gitignore semantics (documented, no surprises):
-//   - blank lines and `#` comments are skipped
-//   - `!` negation is NOT supported (later rules never un-ignore)
-//   - a trailing `/` matches directories only (and everything under them)
-//   - a pattern containing `/` (or starting with `/`) is anchored to the
-//     workspace root; otherwise it matches the basename at ANY depth
-//   - `*` matches any run of chars except `/`; `**` matches any run incl. `/`;
-//     `?` matches one char except `/`
-//   - character classes (`[abc]`) are not supported (treated literally)
-
-/** Convert one glob segment to a regex source (no `/` crossing). A leading
- * double-star-slash (`**` + `/`) matches zero or more directories (gitignore). */
-function globToRe(glob) {
-  let out = ''
-  let i = 0
-  const s = String(glob)
-  if (s.startsWith('**/')) { out = '(?:.*/)?'; i = 3 }
-  while (i < s.length) {
-    const c = s[i]
-    if (c === '*') {
-      if (s[i + 1] === '*') { out += '.*'; i += 2; continue }
-      out += '[^/]*'; i++; continue
-    }
-    if (c === '?') { out += '[^/]'; i++; continue }
-    if ('\\^$+{}[]()|.'.includes(c)) out += '\\' + c
-    else out += c
-    i++
-  }
-  return out
-}
-
-/**
- * Compile a list of ignore patterns into a matcher.
- * @param {string[]|string} patterns lines or an array of lines
- * @returns {(relPath: string, isDir?: boolean) => boolean} true = ignored.
- *   `relPath` is POSIX-style ('/' separated, no leading '/').
- */
-export function compileIgnore(patterns) {
-  const rules = []
-  const lines = Array.isArray(patterns) ? patterns : String(patterns || '').split('\n')
-  for (let raw of lines) {
-    let line = String(raw || '').trim()
-    if (!line || line.startsWith('#')) continue
-    let dirOnly = false
-    if (line.endsWith('/')) { dirOnly = true; line = line.slice(0, -1) }
-    let anchored = line.startsWith('/')
-    if (anchored) line = line.slice(1)
-    if (!line) continue
-    const hasSlash = line.includes('/')
-    const isAnchored = anchored || hasSlash
-    const segRe = globToRe(line)
-    let re
-    if (isAnchored) {
-      // Root-anchored: match the full path from the root.
-      re = dirOnly
-        ? new RegExp('^' + segRe + '(/.*)?$')
-        : new RegExp('^' + segRe + '$')
-    } else {
-      // Basename at any depth; a dir pattern also covers everything under it.
-      re = dirOnly
-        ? new RegExp('(^|/)' + segRe + '(/|$)')
-        : new RegExp('(^|/)' + segRe + '$')
-    }
-    rules.push({ re, dirOnly })
-  }
-  return function isIgnored(relPath, isDir) {
-    const rel = String(relPath || '').replace(/^\/+/, '').replace(/\\/g, '/')
-    if (!rel) return false
-    for (const r of rules) {
-      if (r.re.test(rel)) return true
-    }
-    return false
-  }
-}
-
-/** Built-in defaults: never pull/push these into/from a mirror. */
-export const DEFAULT_IGNORE = [
-  '.git/',
-  '.svn/',
-  '.hg/',
-  'node_modules/',
-  'target/',
-  'dist/',
-  'build/',
-  '.venv/',
-  'venv/',
-  '__pycache__/',
-  '.idea/',
-  '.vscode/',
-  '*.o',
-  '*.a',
-  '*.so',
-  '*.dylib',
-  '*.exe',
-  '*.dll',
-  '*.class',
-  '*.jar',
-  '*.log',
-  '*.tmp',
-  '.DS_Store',
-  'Thumbs.db',
-  '.dsh-remote-meta.json',
-  '.dsh-remote-sync-state.json',
-]
-
-/**
- * Load the user ignore file (gitignore syntax) and merge with defaults.
- * Returns `{ patterns, fromFile }`.
- */
-export function loadIgnore(ignoreFile) {
-  let fromFile = []
-  if (ignoreFile) {
-    try {
-      const text = readFileSync(ignoreFile, 'utf8')
-      fromFile = text.split('\n').map((l) => l.trim()).filter((l) => l && !l.startsWith('#'))
-    } catch { /* missing file → defaults only */ }
-  }
-  const patterns = DEFAULT_IGNORE.concat(fromFile)
-  return { patterns, fromFile, matcher: compileIgnore(patterns) }
-}
+// dsh-remote — gitignore-style ignore matcher for mirror sync / remote search.
+import { readFileSync } from 'node:fs'
+//
+// Deliberately a SUBSET of gitignore semantics (documented, no surprises):
+//   - blank lines and `#` comments are skipped
+//   - `!` negation is NOT supported (later rules never un-ignore)
+//   - a trailing `/` matches directories only (and everything under them)
+//   - a pattern containing `/` (or starting with `/`) is anchored to the
+//     workspace root; otherwise it matches the basename at ANY depth
+//   - `*` matches any run of chars except `/`; `**` matches any run incl. `/`;
+//     `?` matches one char except `/`
+//   - character classes (`[abc]`) are not supported (treated literally)
+
+/** Convert one glob segment to a regex source (no `/` crossing). A leading
+ * double-star-slash (`**` + `/`) matches zero or more directories (gitignore). */
+function globToRe(glob) {
+  let out = ''
+  let i = 0
+  const s = String(glob)
+  if (s.startsWith('**/')) { out = '(?:.*/)?'; i = 3 }
+  while (i < s.length) {
+    const c = s[i]
+    if (c === '*') {
+      if (s[i + 1] === '*') { out += '.*'; i += 2; continue }
+      out += '[^/]*'; i++; continue
+    }
+    if (c === '?') { out += '[^/]'; i++; continue }
+    if ('\\^$+{}[]()|.'.includes(c)) out += '\\' + c
+    else out += c
+    i++
+  }
+  return out
+}
+
+/**
+ * Compile a list of ignore patterns into a matcher.
+ * @param {string[]|string} patterns lines or an array of lines
+ * @returns {(relPath: string, isDir?: boolean) => boolean} true = ignored.
+ *   `relPath` is POSIX-style ('/' separated, no leading '/').
+ */
+export function compileIgnore(patterns) {
+  const rules = []
+  const lines = Array.isArray(patterns) ? patterns : String(patterns || '').split('\n')
+  for (let raw of lines) {
+    let line = String(raw || '').trim()
+    if (!line || line.startsWith('#')) continue
+    let dirOnly = false
+    if (line.endsWith('/')) { dirOnly = true; line = line.slice(0, -1) }
+    let anchored = line.startsWith('/')
+    if (anchored) line = line.slice(1)
+    if (!line) continue
+    const hasSlash = line.includes('/')
+    const isAnchored = anchored || hasSlash
+    const segRe = globToRe(line)
+    let re
+    if (isAnchored) {
+      // Root-anchored: match the full path from the root.
+      re = dirOnly
+        ? new RegExp('^' + segRe + '(/.*)?$')
+        : new RegExp('^' + segRe + '$')
+    } else {
+      // Basename at any depth; a dir pattern also covers everything under it.
+      re = dirOnly
+        ? new RegExp('(^|/)' + segRe + '(/|$)')
+        : new RegExp('(^|/)' + segRe + '$')
+    }
+    rules.push({ re, dirOnly })
+  }
+  return function isIgnored(relPath, isDir) {
+    const rel = String(relPath || '').replace(/^\/+/, '').replace(/\\/g, '/')
+    if (!rel) return false
+    for (const r of rules) {
+      if (r.re.test(rel)) return true
+    }
+    return false
+  }
+}
+
+/** Built-in defaults: never pull/push these into/from a mirror. */
+export const DEFAULT_IGNORE = [
+  '.git/',
+  '.svn/',
+  '.hg/',
+  'node_modules/',
+  'target/',
+  'dist/',
+  'build/',
+  '.venv/',
+  'venv/',
+  '__pycache__/',
+  '.idea/',
+  '.vscode/',
+  '*.o',
+  '*.a',
+  '*.so',
+  '*.dylib',
+  '*.exe',
+  '*.dll',
+  '*.class',
+  '*.jar',
+  '*.log',
+  '*.tmp',
+  '.DS_Store',
+  'Thumbs.db',
+  '.dsh-remote-meta.json',
+  '.dsh-remote-sync-state.json',
+]
+
+/**
+ * Load the user ignore file (gitignore syntax) and merge with defaults.
+ * Returns `{ patterns, fromFile }`.
+ */
+export function loadIgnore(ignoreFile) {
+  let fromFile = []
+  if (ignoreFile) {
+    try {
+      const text = readFileSync(ignoreFile, 'utf8')
+      fromFile = text.split('\n').map((l) => l.trim()).filter((l) => l && !l.startsWith('#'))
+    } catch { /* missing file → defaults only */ }
+  }
+  const patterns = DEFAULT_IGNORE.concat(fromFile)
+  return { patterns, fromFile, matcher: compileIgnore(patterns) }
+}

package/lib/index.js

@@ -22,6 +22,7 @@ import z from '@deepseek-ai/schemastery'
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import ssh2 from 'ssh2'
 import { execFile } from 'node:child_process'
+import zlib from 'node:zlib'
 import { readFileSync, mkdirSync, writeFileSync, existsSync, readdirSync, statSync, renameSync, copyFileSync, utimesSync, appendFileSync, unlinkSync, watch } from 'node:fs'
 import { homedir } from 'node:os'
 import path from 'node:path'
@@ -123,6 +124,33 @@ function remoteWorkspacesRoot() {
   return path.join(dshBase(), 'remote-workspaces')
 }
 
+/** Safe path segment for a session id (mirrors DSH's encodeSegment: alnum + _- .).
+ *  Session dirs keep the id mostly verbatim; sanitize anything exotic. */
+function encodeSegmentSafe(id) {
+  const s = String(id || '').replace(/[^A-Za-z0-9._-]/g, '_')
+  return s || 'session'
+}
+
+/** Read the cwd from a session log header. Handles plain JSONL, .gz, and
+ *  multi-frame zstd (decompress only the first frame, which holds the header).
+ *  Returns the header cwd string, or '' when unreadable/absent. */
+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 ''
+  }
+}
+
 /** Local mirrors of one remote host. */
 function mirrorRootFor(host, user, port) {
   const tag = [host, user, port].filter(Boolean).join('-').replace(/[^a-zA-Z0-9._-]/g, '_')
@@ -1479,7 +1507,7 @@ export async function apply(ctx, config) {
         command: { type: 'string', required: true, description: 'Shell command (run on the remote host)' },
         cwd: { type: 'string', description: 'Working directory for the command (default: the current remote workspace)' },
         pty: { type: 'boolean', description: 'Allocate a pseudo-terminal (interactive commands, default false)' },
-        env: { type: 'object', description: 'Extra environment variables (string values)' },
+        env: { type: 'object', additionalProperties: true, description: 'Extra environment variables (string values)' },
       },
       output: textOut,
       async execute(args) {
@@ -1800,6 +1828,93 @@ export async function apply(ctx, config) {
         sendJson(res, 405, { error: 'method not allowed' })
       },
     },
+    {
+      // Map a LOCAL path (typically a session cwd that sits inside a remote
+      // mirror dir) to the remote path it mirrors, by reading each mirror
+      // dir's .dsh-remote-meta.json. Falls back to the machine workspace so
+      // the sidebar still shows something sensible for non-mirror cwds.
+      // Accepts either ?local=<abs path> or ?sessionId=<id> (resolved via
+      // the host sessions service header.cwd).
+      kind: 'exact',
+      path: '/dsh-remote/resolve-mirror',
+      handler: async (req, res) => {
+        if (req.method !== 'GET') return sendJson(res, 405, { error: 'method not allowed' })
+        try {
+          const q = new URL(req.url, 'http://localhost').searchParams
+          let local = q.get('local') ? decodeURIComponent(q.get('local')) : ''
+          const sessionId = q.get('sessionId') ? decodeURIComponent(q.get('sessionId')) : ''
+          let resolvedVia = 'query'
+          if (!local && sessionId) {
+            // 1) Live in-memory session header (active sessions only).
+            try {
+              const sessions = ctx && typeof ctx.get === 'function' ? ctx.get('sessions') : null
+              const session = sessions && typeof sessions.get === 'function' ? sessions.get(sessionId) : null
+              const header = session && session.header ? session.header : null
+              if (header && header.cwd) {
+                local = String(header.cwd)
+                resolvedVia = 'session'
+              }
+            } catch { /* sessions service unavailable */ }
+            // 2) Durable session log header (works for historical sessions too):
+            //    walk $DSH_HOME/sessions/<projectKey>/<sessionId>/session.jsonl.zstd
+            //    and read the header line (first zstd frame) for cwd.
+            if (!local) {
+              try {
+                const sessionsRoot = path.join(dshBase(), 'sessions')
+                if (existsSync(sessionsRoot)) {
+                  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) {
+                      local = cwd
+                      resolvedVia = 'session-log'
+                      break
+                    }
+                  }
+                }
+              } catch { /* session log scan failed */ }
+            }
+          }
+          const remote = status().workspace || ''
+          const root = remoteWorkspacesRoot()
+          const norm = (p) => path.resolve(String(p || '')).replace(/[\\/]+$/, '') || ''
+          let matched = ''
+          let matchedRemote = ''
+          if (local && existsSync(root)) {
+            const base = norm(local)
+            for (const hostDir of readdirSync(root)) {
+              const hostPath = path.join(root, hostDir)
+              if (!statSync(hostPath, { throwIfNoEntry: false })?.isDirectory?.()) continue
+              for (const mirrorDir of readdirSync(hostPath)) {
+                const metaPath = path.join(hostPath, mirrorDir, '.dsh-remote-meta.json')
+                if (!existsSync(metaPath)) continue
+                try {
+                  const meta = JSON.parse(readFileSync(metaPath, 'utf8'))
+                  const mirrorAbs = norm(path.join(hostPath, mirrorDir))
+                  // Exact mirror dir match, or the local path is inside the mirror dir.
+                  if (mirrorAbs === base || base.startsWith(mirrorAbs + path.sep) || base.startsWith(mirrorAbs + '/')) {
+                    if (mirrorAbs.length > matched.length) {
+                      matched = mirrorAbs
+                      matchedRemote = String(meta.remotePath || '')
+                    }
+                  }
+                } catch { /* skip unparsable meta */ }
+              }
+            }
+          }
+          const remotePath = matchedRemote || remote
+          return sendJson(res, 200, { local, remotePath, mirrorDir: matched || null, fallback: !matchedRemote, resolvedVia })
+        } catch (err) {
+          return sendJson(res, 500, { error: String((err && err.message) || err) })
+        }
+      },
+    },
     {
       kind: 'exact',
       path: '/dsh-remote/connect',