@zswarm/core 0.8.0 → 0.8.1

package/dist/host/gate.js

@@ -1,4 +1,4 @@
-import { appendFileSync, existsSync, mkdirSync, readFileSync, realpathSync } from "node:fs";
+import { appendFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { ZellijError } from "../errors.js";
 import { dispatchZswarm } from "../ops/dispatch.js";
@@ -61,15 +61,6 @@ async function readStdin(limit) {
     }
     return Buffer.concat(chunks).toString("utf8");
 }
-function cliPath() {
-    const script = process.argv[1] ?? "";
-    try {
-        return realpathSync(script);
-    }
-    catch {
-        return script;
-    }
-}
 const s = (v) => (typeof v === "string" ? v : undefined);
 export function gateAllow(id, flags, env = process.env) {
     id = validateGateId(id);
@@ -83,7 +74,7 @@ export function gateAllow(id, flags, env = process.env) {
     const key = s(flags["--key"]) ?? (keyFile ? readFileSync(keyFile, "utf8") : undefined);
     if (!key)
         throw new ZellijError("usage", "gate allow needs --key 'ssh-ed25519 AAAA…' or --key-file PATH (the sender's public key)");
-    const command = gateForcedCommand({ id, node: process.execPath, cli: cliPath(), env });
+    const command = gateForcedCommand({ id, bin: s(flags["--bin"]), env });
     const line = gateKeyLine({ id, key, command, from: s(flags["--from"]) });
     const keysPath = s(flags["--authorized-keys"]) ?? defaultAuthorizedKeysPath(env);
     mkdirSync(dirname(keysPath), { recursive: true, mode: 0o700 });
@@ -119,10 +110,11 @@ export function gateList(flags, env = process.env) {
     };
 }
 export const GATE_USAGE = [
-    "zswarm gate allow ID (--key 'ssh-ed25519 AAAA…' | --key-file PUB) --session S --pane P [--from ADDRS] [--authorized-keys PATH]",
+    "zswarm gate allow ID (--key 'ssh-ed25519 AAAA…' | --key-file PUB) --session S --pane P [--from ADDRS] [--bin PATH] [--authorized-keys PATH]",
     "      on the receiving machine: let the key send to pane P in session S as ID. Writes a forced-command line",
     "      (send only: no shell, no pty, no forwarding) to authorized_keys and the target to gate.json (ZSWARM_GATE_CONFIG,",
-    "      default ~/.zswarm/gate.json); --from limits the source addresses (sshd from= patterns)",
+    "      default ~/.zswarm/gate.json); --from limits the source addresses (sshd from= patterns); the command runs",
+    "      `zswarm` from this shell's PATH (kept across upgrades), or --bin PATH",
     "zswarm gate revoke ID [--session S --pane P]   drop ID from one target or all; the key line goes when nothing is left",
     "zswarm gate list   targets, allowed ids and gate keys",
     "zswarm gate ID     the forced command itself: reads one request on stdin and sends locally (sshd runs this)",

package/dist/ops/gate.d.ts

@@ -67,12 +67,14 @@ export declare function authorizeGateRequest(config: GateConfig, id: string, raw
 /**
  * The forced command for one id. sshd gives it a bare environment, so the PATH
  * (and on macOS the per-user TMPDIR that Zellij keeps its sockets under) of the
- * process running `gate allow` is written into the command.
+ * process running `gate allow` is written into the command. The launcher is
+ * `zswarm` looked up on that PATH, not the resolved script: package managers
+ * install each version under its own directory, so a resolved path breaks on
+ * the next upgrade. `bin` pins an explicit launcher instead.
  */
 export declare function gateForcedCommand(input: {
     id: string;
-    node: string;
-    cli: string;
+    bin?: string;
     platform?: NodeJS.Platform;
     env?: NodeJS.ProcessEnv;
 }): string;

package/dist/ops/gate.js

@@ -223,19 +223,20 @@ function posixQuote(arg) {
 /**
  * The forced command for one id. sshd gives it a bare environment, so the PATH
  * (and on macOS the per-user TMPDIR that Zellij keeps its sockets under) of the
- * process running `gate allow` is written into the command.
+ * process running `gate allow` is written into the command. The launcher is
+ * `zswarm` looked up on that PATH, not the resolved script: package managers
+ * install each version under its own directory, so a resolved path breaks on
+ * the next upgrade. `bin` pins an explicit launcher instead.
  */
 export function gateForcedCommand(input) {
     const platform = input.platform ?? process.platform;
     const env = input.env ?? process.env;
+    const bin = input.bin?.trim() || "zswarm";
     if (platform === "win32") {
         // Unquoted paths run the same in cmd and PowerShell (OpenSSH's DefaultShell
         // may be either); a path with spaces needs quoting, which only cmd accepts.
-        const q = (s) => {
-            const p = s.replace(/\\/g, "/");
-            return /\s/.test(p) ? `"${p}"` : p;
-        };
-        return `${q(input.node)} ${q(input.cli)} gate ${input.id}`;
+        const p = bin.replace(/\\/g, "/");
+        return `${/\s/.test(p) ? `"${p}"` : p} gate ${input.id}`;
     }
     const vars = [];
     if (env.PATH)
@@ -246,7 +247,7 @@ export function gateForcedCommand(input) {
         vars.push(`ZSWARM_STATE_DIR=${posixQuote(env.ZSWARM_STATE_DIR)}`);
     if (env.ZSWARM_GATE_CONFIG)
         vars.push(`ZSWARM_GATE_CONFIG=${posixQuote(env.ZSWARM_GATE_CONFIG)}`);
-    return ["env", ...vars, posixQuote(input.node), posixQuote(input.cli), "gate", input.id].join(" ");
+    return ["env", ...vars, posixQuote(bin), "gate", input.id].join(" ");
 }
 const KEY_TYPES = /^(ssh-ed25519|ssh-rsa|ecdsa-sha2-nistp(256|384|521)|sk-ssh-ed25519@openssh\.com|sk-ecdsa-sha2-nistp256@openssh\.com)$/;
 /** `type base64 [comment]` → `type base64`; anything else is refused. */

package/dist/zellij/client.js

@@ -323,8 +323,15 @@ export function createZellijClient(options = {}) {
                 creation: server.creationName,
                 at: now(),
             };
-            aliases.recordSessionAlias(candidate, entry);
-            if (server.creationName && server.creationName !== candidate) {
+            // Remember only names that no live session carries. A live name that
+            // resolved elsewhere was reused, or came from a process whose env is
+            // stale (a daemon started from another session's pane); recording it
+            // would send every explicit --session NAME to the wrong session
+            // (bacloud, 2026-10-06: cratchet -> astro-dogster).
+            const liveName = (name) => live.some((session) => session.name === name);
+            if (!liveName(candidate))
+                aliases.recordSessionAlias(candidate, entry);
+            if (server.creationName && server.creationName !== candidate && !liveName(server.creationName)) {
                 aliases.recordSessionAlias(server.creationName, entry);
             }
         }
@@ -345,9 +352,21 @@ export function createZellijClient(options = {}) {
         if (!isSelf) {
             if (aliases) {
                 const entry = aliases.readSessionAliases()[candidate];
-                if (entry?.serverPid != null) {
+                if (entry?.serverPid != null && entry.current !== candidate) {
                     const table = await processTable();
                     if (liveServers(table).some((server) => server.pid === entry.serverPid)) {
+                        // A live session with exactly the requested name wins over a
+                        // remembered rename; the listing is only paid when an alias would
+                        // redirect. If the listing fails, the alias still applies.
+                        try {
+                            const liveNow = await listSessions(callTimeoutMs);
+                            if (liveNow.some((session) => !session.exited && session.name === candidate)) {
+                                return fromEnv;
+                            }
+                        }
+                        catch {
+                            // fall through to the alias
+                        }
                         return { session: entry.current, source: "alias", requested: candidate };
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zswarm/core",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "type": "module",
   "description": "zSwarm Zellij client and shared ops dispatch",
   "exports": {