dsh-remote 0.8.45 → 0.8.46

package/lib/client.js

@@ -3415,26 +3415,40 @@ window.__ModuleLoader__.load({
       const mirror = mirrorForCwd(cwd, MIRRORS.list)
       if (!mirror) return null
       const remoteRoot = String(mirror.remotePath || '').replace(/[\\/]+$/, '')
-      const raw = String(parsed.path || '')
-      const isWin = raw.includes('\\') || remoteRoot.includes('\\')
-      const sep = isWin ? '\\' : '/'
-      const norm = (s) => String(s).replace(/[\\/]+/g, sep).replace(new RegExp('\\' + sep + '+$'), '')
-      const rel = norm(raw)
+      // The REMOTE host's separator is INDEPENDENT of this machine's, and taking
+      // it from the address was wrong: a Windows client mirroring a Linux host
+      // is the ordinary case here, and reading the separator off the local path
+      // then glued a POSIX root to a Windows join ("/home/u/app" + "\" + "x.c").
+      // Decide from the remote root alone.
+      const remoteIsWin = /^[A-Za-z]:/.test(remoteRoot) || (remoteRoot.includes('\\') && !remoteRoot.includes('/'))
+      const remoteSep = remoteIsWin ? '\\' : '/'
+      const toRemote = (s) => String(s).replace(/[\\/]+/g, remoteSep)
+      // Comparison is separator-INSENSITIVE: `@` completion may insert either
+      // style, and the two sides describe the same directory. The local side
+      // folds case when it looks like a Windows path (Windows paths do).
+      const canon = (s) => String(s).replace(/[\\/]+/g, '/').replace(/\/+$/, '')
+      const localDir = String(mirror.dir || '')
+      const localIsWin = /^[A-Za-z]:/.test(localDir) || localDir.includes('\\')
+      const fold = (s) => (localIsWin ? s.toLowerCase() : s)
+      const rel = canon(parsed.path || '')
+      const mirrorDir = canon(localDir)
       // The mirror's own directory prefix may be baked into the address when the
-      // link was written against the local path; strip it so the result is
-      // remote-relative rather than duplicated under the remote root.
-      const mirrorDir = norm(mirror.dir || '')
-      const relBody = rel && mirrorDir && (rel === mirrorDir || rel.startsWith(mirrorDir + sep))
-        ? rel.slice(mirrorDir.length).replace(new RegExp('^\\' + sep + '+'), '')
+      // link was written against the LOCAL path (that is what `@` completion
+      // inserts); strip it so the result is remote-relative rather than
+      // duplicated under the remote root.
+      const stripped = rel && mirrorDir && (fold(rel) === fold(mirrorDir) || fold(rel).startsWith(fold(mirrorDir) + '/'))
+        ? rel.slice(mirrorDir.length).replace(/^\/+/, '')
         : rel
-      if (!remoteRoot) return relBody || sep
+      const relBody = canon(stripped)
+      if (!remoteRoot) return relBody ? toRemote(relBody) : remoteSep
       if (!relBody) return remoteRoot
-      // An absolute remote path that is already inside the remote root is used
-      // as-is; anything else absolute is left alone (the reader meant it).
-      if (/^[\\/]/.test(relBody) || /^[A-Za-z]:[\\/]/.test(relBody)) {
-        return relBody
-      }
-      return remoteRoot + sep + relBody
+      // A drive-letter absolute path on a POSIX remote is a LOCAL path that fell
+      // outside the mirror: nothing on the remote can name it, so refuse rather
+      // than invent "/home/u/app/D:/x.c".
+      if (!remoteIsWin && /^[A-Za-z]:/.test(relBody)) return null
+      // Genuinely absolute: the reader meant that path on the remote.
+      if (/^[A-Za-z]:/.test(relBody) || /^\//.test(relBody)) return toRemote(relBody)
+      return remoteRoot + remoteSep + toRemote(relBody)
     }
     function NativeExplorer(props) {
       const info = props.useTabInfo()

package/lib/pool.js

@@ -31,7 +31,7 @@ export function createPool(config, opts) {
  *
  * ssh2 reports a dead connection by THROWING synchronously —
  * `if (!this._sock || !isWritable(this._sock)) throw new Error('Not connected')`
- * (ssh2/lib/client.js:1398-1400) — and never calls the callback, so a
+ * (ssh2 >= 1.16, `Client.forwardOut`) — and never calls the callback, so a
  * callback-only error path cannot guard this call (issue #54). Two further
  * consequences justify a shared helper rather than an inline try/catch:
  *
@@ -40,8 +40,11 @@ export function createPool(config, opts) {
  *   • called from a `net.Server` connection handler the throw escapes to the
  *     process top level and kills the host.
  *
- * The system-OpenSSH backend (lib/openssh.js) throws the same way when its
- * connection is already closed, so this covers both transports.
+ * This guards the CALLER's side of the contract rather than assuming one
+ * backend's behaviour: the system-OpenSSH backend (lib/openssh.js `forwardOut`)
+ * already converts its own spawn failure into a callback error, so for it the
+ * try/catch below is dead code — but a backend is free to throw, and the one
+ * that does must not be able to take the process down.
  *
  * @param {object} client - an ssh2 Client or OpenSshConnection.
  * @param {object} spec - `srcHost`/`srcPort`/`dstHost`/`dstPort`.

package/lib/web-attach.js

@@ -228,8 +228,12 @@ export class WebAttach {
    */
   constructor(opts = {}) {
     this.net = opts.net || net
-    this.localPortStart = opts.localPortStart || 3088
-    this.localPortMax = opts.localPortMax || 50
+    // `??`, not `||`: port 0 is a MEANINGFUL value here (let the OS pick), and
+    // `0 || 3088` silently turned "let the OS choose" into a bind on a fixed
+    // port. An explicit 0 now survives, which is also what lets a test ask for a
+    // port without risking a collision with something really listening.
+    this.localPortStart = opts.localPortStart ?? 3088
+    this.localPortMax = opts.localPortMax ?? 50
     /** Whether the pool's lifecycle hooks are ours to install. */
     this.trackPool = opts.trackPool !== false
     /** @type {import('node:net').Server|null} */ this.server = null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote",
-  "version": "0.8.45",
+  "version": "0.8.46",
   "description": "Remote-work assistant for DeepSeek Harness: connect SSH (password/key/agent/keyboard-interactive/proxy jump), pick a remote workspace, operate on it with 22 rw_* tools (incl. rw_edit/rw_stat/rw_mkdir/rw_remove/rw_move/rw_forward), conflict-aware mirror sync, one-click remote dsh deploy + web UI attach, port forwarding, optional side-bar remote file editing, audit log, keychain passwords.",
   "license": "MIT",
   "author": "flymysql <flyphp@outlook.com>",
@@ -84,6 +84,6 @@
     "semver": "^7.8.5"
   },
   "scripts": {
-    "test": "node --import ./test/setup-telemetry-off.mjs --test"
+    "test": "node --import ./test/setup-telemetry-off.mjs --test --test-timeout=20000 --test-force-exit"
   }
 }