@phnx-labs/agents-cli 1.20.34 → 1.20.35

package/dist/lib/session/remote-active.js

@@ -0,0 +1,141 @@
+/**
+ * Cross-machine fan-out for `agents sessions --active`.
+ *
+ * A single `getActiveSessions()` only sees the local machine. To show the whole
+ * fleet in one view, we run `agents sessions --active --json --local` on each
+ * peer over SSH and merge the parsed results, tagging every row with the machine
+ * it came from so the renderer can bucket by computer.
+ *
+ * Peers are the registered, online devices from `ag devices` (or an explicit
+ * `--host` list). `--local` on the remote invocation is critical: it stops the
+ * peer from fanning out to *its* devices, so the sweep never recurses.
+ *
+ * A dead or slow host is skipped with a stderr note, never fatal — one asleep
+ * laptop must not blank the whole view. SSH runs are async + parallel (a fresh
+ * `spawn`, not the sync `sshExec`) so N peers cost one round-trip, not N.
+ */
+import { spawn } from 'child_process';
+import chalk from 'chalk';
+import { SSH_OPTS, controlOpts, assertValidSshTarget, shellQuote } from '../ssh-exec.js';
+import { sshTargetFor } from '../devices/connect.js';
+import { loadDevices } from '../devices/registry.js';
+import { machineId, normalizeHost } from './sync/config.js';
+/** Per-host SSH budget. Slightly above SSH_OPTS' ConnectTimeout=10 so a
+ * reachable-but-slow remote still answers before we give up. */
+const REMOTE_TIMEOUT_MS = 12_000;
+/**
+ * Recursion guard, passed as an env var (not a CLI flag) so an OLDER remote
+ * `agents` that predates this feature ignores it harmlessly instead of erroring
+ * on an unknown option. A remote new enough to fan out reads it and stays local.
+ */
+export const NO_FANOUT_ENV = 'AGENTS_SESSIONS_LOCAL';
+/** The command run on each peer: answer for itself, as JSON, without recursing. */
+function remoteActiveCommand() {
+    const inner = `${NO_FANOUT_ENV}=1 agents sessions --active --json`;
+    return `bash -lc ${shellQuote(inner)}`;
+}
+/**
+ * Parse a peer's `--active --json` stdout into active sessions, tagging each
+ * with `machine`. Defensive against version skew / partial output: non-JSON or
+ * a non-array yields `[]`, and non-object entries are dropped rather than
+ * throwing. Exported for unit testing without a live tailnet.
+ */
+export function parseRemoteActive(stdout, machine) {
+    let parsed;
+    try {
+        parsed = JSON.parse(stdout);
+    }
+    catch {
+        return [];
+    }
+    if (!Array.isArray(parsed))
+        return [];
+    const out = [];
+    for (const x of parsed) {
+        if (x && typeof x === 'object' && !Array.isArray(x)) {
+            out.push({ ...x, machine });
+        }
+    }
+    return out;
+}
+/** Run one remote `agents sessions --active --json --local` and capture stdout.
+ * Resolves `{ code: null }` on spawn error or timeout (host treated as dead). */
+function sshCapture(target, remoteCmd, timeoutMs) {
+    assertValidSshTarget(target);
+    return new Promise((resolve) => {
+        const args = [...SSH_OPTS, ...controlOpts(), target, remoteCmd];
+        const child = spawn('ssh', args, { stdio: ['ignore', 'pipe', 'ignore'] });
+        let stdout = '';
+        let settled = false;
+        const done = (code) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timer);
+            resolve({ code, stdout });
+        };
+        const timer = setTimeout(() => { child.kill('SIGKILL'); done(null); }, timeoutMs);
+        child.stdout.on('data', (d) => { stdout += d.toString(); });
+        child.on('error', () => done(null));
+        child.on('close', (code) => done(code));
+    });
+}
+async function fetchByTarget(target, machine, display) {
+    const { code, stdout } = await sshCapture(target, remoteActiveCommand(), REMOTE_TIMEOUT_MS);
+    if (code !== 0) {
+        process.stderr.write(chalk.gray(`  ${display}: unreachable or no agents CLI — skipped\n`));
+        return [];
+    }
+    return parseRemoteActive(stdout, machine);
+}
+/**
+ * Gather active sessions from other machines. With an explicit `hosts` list
+ * (from `--host`), fan out to exactly those. Otherwise sweep the registered,
+ * online devices from `ag devices`, excluding this machine and any without an
+ * address. Results from all peers run in parallel and are flattened.
+ */
+export async function gatherRemoteActive(hosts) {
+    const self = machineId();
+    const targets = [];
+    if (hosts && hosts.length > 0) {
+        for (const h of hosts) {
+            try {
+                assertValidSshTarget(h);
+            }
+            catch {
+                process.stderr.write(chalk.gray(`  ${h}: not a valid ssh target — skipped\n`));
+                continue;
+            }
+            const bareHost = h.split('@').pop() || h;
+            targets.push({ target: h, machine: normalizeHost(bareHost), name: h });
+        }
+    }
+    else {
+        let reg;
+        try {
+            reg = await loadDevices();
+        }
+        catch {
+            return { sessions: [], deviceCount: 0 };
+        }
+        for (const d of Object.values(reg)) {
+            if (d.tailscale?.online !== true)
+                continue;
+            if (normalizeHost(d.name) === self)
+                continue;
+            // Only machines that can actually run the CLI. iOS/tablet nodes register as
+            // `unknown` platform and can never answer, so skip them rather than burn a
+            // full ConnectTimeout on each.
+            if (d.platform !== 'windows' && d.platform !== 'linux' && d.platform !== 'macos')
+                continue;
+            try {
+                targets.push({ target: sshTargetFor(d), machine: normalizeHost(d.name), name: d.name });
+            }
+            catch {
+                // No address on the profile — nothing to dial; skip silently.
+            }
+        }
+    }
+    const results = await Promise.all(targets.map((t) => fetchByTarget(t.target, t.machine, t.name)));
+    return { sessions: results.flat(), deviceCount: targets.length };
+}

package/dist/lib/session/remote.js

@@ -27,6 +27,7 @@ import { join } from 'path';
 import { createHash } from 'crypto';
 import chalk from 'chalk';
 import { getCacheDir } from '../state.js';
+import { SSH_OPTS, controlOpts } from '../ssh-exec.js';
 import { formatRelativeTime } from './relative-time.js';
 import { terminalWidth } from './width.js';
 /**
@@ -96,11 +97,6 @@ export function buildRemoteCommand(forwardedArgs, columns) {
     const withCols = columns && columns > 0 ? `COLUMNS=${columns} ${inner}` : inner;
     return `bash -lc ${shellQuote(withCols)}`;
 }
-const SSH_OPTS = [
-    '-o', 'BatchMode=yes',
-    '-o', 'StrictHostKeyChecking=accept-new',
-    '-o', 'ConnectTimeout=10',
-];
 /**
  * Classify an ssh `spawnSync` result. ssh(1) reserves exit 255 for its own
  * connection-layer failures (host down, timeout, refused, auth, changed host
@@ -186,7 +182,7 @@ export function runRemoteSessions(hosts, argv = process.argv) {
     for (const host of hosts) {
         if (multi)
             process.stdout.write(chalk.cyan(`\n── ${host} ──\n`));
-        const res = spawnSync('ssh', [...SSH_OPTS, host, remoteCmd], {
+        const res = spawnSync('ssh', [...SSH_OPTS, ...controlOpts(), host, remoteCmd], {
             encoding: 'utf8',
             maxBuffer: 64 * 1024 * 1024,
         });

package/dist/lib/session/render.js

@@ -541,7 +541,7 @@ export function renderSummary(events, cwd) {
                 if (p)
                     filesReadAbs.add(p);
             }
-            else if (['Write', 'Edit', 'write_file', 'edit_file', 'create_file', 'replace', 'patch'].includes(tool)) {
+            else if (['Write', 'Edit', 'Create', 'write_file', 'edit_file', 'create_file', 'replace', 'patch'].includes(tool)) {
                 if (p) {
                     if (p.includes('.claude/plans/') && p.endsWith('.md')) {
                         planFilePath = p;

package/dist/lib/session/sync/config.d.ts

@@ -33,6 +33,14 @@ export declare function loadR2Config(): R2Config;
  * does not re-storm every cycle. `now` is injectable for tests.
  */
 export declare function isSyncConfigured(now?: number): boolean;
+/**
+ * Normalize a raw hostname into a stable device id: first label only,
+ * lowercased, non-alphanumerics collapsed to hyphens. `zion.tail…ts.net` and
+ * `ZION` both become `zion`. The single source for this transform — machineId()
+ * and cross-machine session grouping must agree or the local machine won't
+ * match its own registry key.
+ */
+export declare function normalizeHost(raw: string): string;
 /**
  * This machine's stable, human-readable id, used as its R2 prefix and mirror
  * directory name. Tailnet hostnames (zion, yosemite-s0, mac-mini) are already

package/dist/lib/session/sync/config.js

@@ -93,6 +93,16 @@ export function isSyncConfigured(now = Date.now()) {
         return false;
     }
 }
+/**
+ * Normalize a raw hostname into a stable device id: first label only,
+ * lowercased, non-alphanumerics collapsed to hyphens. `zion.tail…ts.net` and
+ * `ZION` both become `zion`. The single source for this transform — machineId()
+ * and cross-machine session grouping must agree or the local machine won't
+ * match its own registry key.
+ */
+export function normalizeHost(raw) {
+    return raw.split('.')[0].trim().toLowerCase().replace(/[^a-z0-9_-]/g, '-') || 'unknown';
+}
 /**
  * This machine's stable, human-readable id, used as its R2 prefix and mirror
  * directory name. Tailnet hostnames (zion, yosemite-s0, mac-mini) are already
@@ -100,6 +110,5 @@ export function isSyncConfigured(now = Date.now()) {
  * via AGENTS_SYNC_MACHINE_ID for tests and unusual setups.
  */
 export function machineId() {
-    const raw = process.env.AGENTS_SYNC_MACHINE_ID || os.hostname();
-    return raw.split('.')[0].trim().toLowerCase().replace(/[^a-z0-9_-]/g, '-') || 'unknown';
+    return normalizeHost(process.env.AGENTS_SYNC_MACHINE_ID || os.hostname());
 }

package/dist/lib/session/types.d.ts

@@ -7,7 +7,7 @@
  * speaks these types.
  */
 /** Agents that store session data on disk and can be discovered by `agents sessions`. */
-export type SessionAgentId = 'claude' | 'codex' | 'gemini' | 'opencode' | 'openclaw' | 'rush' | 'hermes' | 'grok' | 'kimi' | 'droid';
+export type SessionAgentId = 'claude' | 'codex' | 'gemini' | 'antigravity' | 'opencode' | 'openclaw' | 'rush' | 'hermes' | 'grok' | 'kimi' | 'droid';
 /** All agents with session discovery support, in display order. */
 export declare const SESSION_AGENTS: SessionAgentId[];
 /** A single normalized event within a session (message, tool call, thinking, etc.). */

package/dist/lib/session/types.js

@@ -7,4 +7,4 @@
  * speaks these types.
  */
 /** All agents with session discovery support, in display order. */
-export const SESSION_AGENTS = ['claude', 'codex', 'gemini', 'opencode', 'openclaw', 'rush', 'hermes', 'grok', 'kimi', 'droid'];
+export const SESSION_AGENTS = ['claude', 'codex', 'gemini', 'antigravity', 'opencode', 'openclaw', 'rush', 'hermes', 'grok', 'kimi', 'droid'];

package/dist/lib/shims.d.ts

@@ -77,7 +77,7 @@ export interface ConflictInfo {
  *         top-level entry add/remove — deep edits to plugin contents won't
  *         trigger auto-resync, run `agents sync` for that.
  */
-export declare const SHIM_SCHEMA_VERSION = 19;
+export declare const SHIM_SCHEMA_VERSION = 21;
 /**
  * Generate the full bash shim script for the given agent. The returned string
  * is written to ~/.agents/shims/{cliCommand} and made executable.
@@ -126,8 +126,16 @@ export declare function removeShim(agent: AgentId): boolean;
  *        hardcoded node_modules/.bin, which never exists for these three and
  *        made every versioned alias (the path `agents teams` pins to) fail
  *        with "<agent>@<version> not installed". Also emit GROK_HOME.
- */
-export declare const VERSIONED_ALIAS_SCHEMA_VERSION = 8;
+ *   v9 — kimi was wrong in v8: it npm-installs @moonshot-ai/kimi-code into
+ *        node_modules/.bin/kimi (grok/droid ship native binaries elsewhere,
+ *        kimi does not). The ~/.kimi-code/bin path never existed for an npm
+ *        install and the `command -v kimi` fallback resolved to this alias's
+ *        sibling dispatcher shim, re-exec-looping forever. Resolve kimi via the
+ *        generic node_modules/.bin branch.
+ *  v10 — guard grok's `command -v grok` fallback against resolving to our own
+ *        shims dir (same infinite re-exec loop), mirroring droid.
+ */
+export declare const VERSIONED_ALIAS_SCHEMA_VERSION = 10;
 /**
  * Generate a versioned alias script that directly execs a specific version.
  * e.g., claude@2.0.65 -> directly runs that version's binary

package/dist/lib/shims.js

@@ -202,7 +202,13 @@ async function promptConflictStrategy(conflictInfos) {
  *         top-level entry add/remove — deep edits to plugin contents won't
  *         trigger auto-resync, run `agents sync` for that.
  */
-export const SHIM_SCHEMA_VERSION = 19;
+// v20 — stop treating kimi like grok/droid: it npm-installs into
+//        node_modules/.bin/kimi, so resolve it via the generic branch. The old
+//        ~/.kimi-code/bin special-case never existed for npm installs and
+//        re-exec-looped through `command -v kimi` (the dispatcher itself).
+// v21 — guard grok's `command -v grok` fallback against resolving to our own
+//        shims dir (same infinite re-exec loop), mirroring droid.
+export const SHIM_SCHEMA_VERSION = 21;
 /** Internal marker string used to embed the schema version in shim scripts. */
 const SHIM_VERSION_MARKER = 'agents-shim-version:';
 function shellQuote(value) {
@@ -401,19 +407,25 @@ if [ "$AGENT" = "grok" ]; then
     fi
   fi
   if [ -z "$BINARY" ] || [ ! -x "$BINARY" ]; then
-    # Last resort: whatever is on PATH (user may have installed grok globally)
+    # Last resort: whatever is on PATH (user may have installed grok globally).
+    # Refuse anything under our own shims dir: the shims dir sits ahead of
+    # ~/.local/bin on PATH, so "command -v grok" resolves to THIS dispatcher.
+    # exec-ing it would re-enter and spin in an infinite re-exec loop (the same
+    # bug the droid branch below guards against). Fall through to the clean
+    # "not installed" error instead.
     BINARY=$(command -v grok 2>/dev/null || echo "")
+    case "$BINARY" in
+      "$AGENTS_USER_DIR/.cache/shims/"*) BINARY="" ;;
+    esac
   fi
-# Kimi special case: binary lives in ~/.kimi-code/bin/, not node_modules.
-# We still use the agents-cli version dir purely for KIMI_CODE_HOME isolation.
-elif [ "$AGENT" = "kimi" ]; then
-  KIMI_BINARY="$HOME/.kimi-code/bin/kimi"
-  if [ -x "$KIMI_BINARY" ]; then
-    BINARY="$KIMI_BINARY"
-  else
-    # Last resort: whatever is on PATH
-    BINARY=$(command -v kimi 2>/dev/null || echo "")
-  fi
+# Kimi is a normal npm agent: "agents add kimi" npm-installs
+# @moonshot-ai/kimi-code into the version dir and the binary lands at
+# node_modules/.bin/kimi (a curl-installed kimi is symlinked to the same spot
+# by installVersion). So kimi resolves via the generic node_modules branch
+# below -- never a bespoke ~/.kimi-code/bin path that does not exist for npm
+# installs and fell back to "command -v kimi", which resolves to THIS
+# dispatcher (shims dir is ahead on PATH) and re-execs forever. Only
+# KIMI_CODE_HOME (config isolation) stays special-cased, separately below.
 # Droid (Factory AI) special case: the official installer drops a standalone
 # native binary at ~/.local/bin/droid — there is no npm package and nothing
 # lands in node_modules/.bin. Resolve the fixed install path directly. The
@@ -620,8 +632,16 @@ export function removeShim(agent) {
  *        hardcoded node_modules/.bin, which never exists for these three and
  *        made every versioned alias (the path `agents teams` pins to) fail
  *        with "<agent>@<version> not installed". Also emit GROK_HOME.
+ *   v9 — kimi was wrong in v8: it npm-installs @moonshot-ai/kimi-code into
+ *        node_modules/.bin/kimi (grok/droid ship native binaries elsewhere,
+ *        kimi does not). The ~/.kimi-code/bin path never existed for an npm
+ *        install and the `command -v kimi` fallback resolved to this alias's
+ *        sibling dispatcher shim, re-exec-looping forever. Resolve kimi via the
+ *        generic node_modules/.bin branch.
+ *  v10 — guard grok's `command -v grok` fallback against resolving to our own
+ *        shims dir (same infinite re-exec loop), mirroring droid.
  */
-export const VERSIONED_ALIAS_SCHEMA_VERSION = 8;
+export const VERSIONED_ALIAS_SCHEMA_VERSION = 10;
 /** Internal marker string used to embed the schema version in versioned alias scripts. */
 const VERSIONED_ALIAS_VERSION_MARKER = 'agents-versioned-alias-version:';
 // The version string is interpolated into a generated bash script and into
@@ -680,12 +700,16 @@ export KIMI_CODE_HOME="$HOME/.agents/.history/versions/${agent}/${version}/home/
                         : '';
     const launchArgs = agent === 'codex' ? ' -c check_for_update_on_startup=false' : '';
     // Resolve the binary the same way the main shim does (see generateShimScript).
-    // Grok, Kimi, and Droid do NOT ship into node_modules/.bin — Grok downloads a
-    // native binary to ~/.grok/downloads, Kimi to ~/.kimi-code/bin, and Droid
-    // (Factory AI) installs a standalone binary to ~/.local/bin. Hardcoding the
-    // node_modules path made every versioned alias for these three fail with
-    // "<agent>@<version> not installed", which is exactly the path `agents teams`
-    // takes once it pins a teammate's version.
+    // Grok and Droid do NOT ship into node_modules/.bin — Grok downloads a native
+    // binary to ~/.grok/downloads and Droid (Factory AI) installs a standalone
+    // binary to ~/.local/bin. Hardcoding the node_modules path made every
+    // versioned alias for those two fail with "<agent>@<version> not installed",
+    // which is exactly the path `agents teams` takes once it pins a teammate's
+    // version. Kimi is NOT one of them: `agents add kimi` npm-installs
+    // @moonshot-ai/kimi-code so its binary is at node_modules/.bin/kimi (the
+    // generic branch below). The old ~/.kimi-code/bin path never exists for an
+    // npm install and fell back to `command -v kimi`, which resolves to this
+    // alias's sibling dispatcher shim and re-execs forever.
     // This template is unix-only — on Windows the .cmd companion delegates to
     // "agents __shim" which resolves via getBinaryPath() instead.
     const versionDir = `$HOME/.agents/.history/versions/${agent}/${version}`;
@@ -697,17 +721,17 @@ if [ -d "$GROK_DOWNLOADS" ]; then
   BINARY=$(ls "$GROK_DOWNLOADS"/grok-* 2>/dev/null | grep -i "${version}" | head -1)
   [ -n "$BINARY" ] || BINARY=$(ls "$GROK_DOWNLOADS"/grok-* 2>/dev/null | head -1)
 fi
-[ -n "$BINARY" ] && [ -x "$BINARY" ] || BINARY=$(command -v grok 2>/dev/null || echo "")`
-        : agent === 'kimi'
-            ? `# Kimi ships its binary in ~/.kimi-code/bin, not node_modules.
-KIMI_BINARY="$HOME/.kimi-code/bin/kimi"
-if [ -x "$KIMI_BINARY" ]; then
-  BINARY="$KIMI_BINARY"
-else
-  BINARY=$(command -v kimi 2>/dev/null || echo "")
+# Refuse a PATH match under our own shims dir — it resolves to this alias's
+# sibling dispatcher shim (shims dir is ahead of ~/.local/bin on PATH) and
+# re-execs forever. Fall through to the clean "not installed" error instead.
+if [ -z "$BINARY" ] || [ ! -x "$BINARY" ]; then
+  BINARY=$(command -v grok 2>/dev/null || echo "")
+  case "$BINARY" in
+    "$HOME/.agents/.cache/shims/"*) BINARY="" ;;
+  esac
 fi`
-            : agent === 'droid'
-                ? `# Droid (Factory AI) installs a standalone native binary at ~/.local/bin/droid;
+        : agent === 'droid'
+            ? `# Droid (Factory AI) installs a standalone native binary at ~/.local/bin/droid;
 # there is no npm package and nothing lands in node_modules/.bin. The PATH
 # fallback refuses anything under our shims dir to avoid an infinite re-exec.
 DROID_BINARY="$HOME/.local/bin/droid"
@@ -719,7 +743,7 @@ else
     "$HOME/.agents/.cache/shims/"*) BINARY="" ;;
   esac
 fi`
-                : `BINARY="${versionDir}/node_modules/.bin/${agentConfig.cliCommand}"`;
+            : `BINARY="${versionDir}/node_modules/.bin/${agentConfig.cliCommand}"`;
     return `#!/bin/bash
 # Auto-generated by agents-cli - do not edit
 # ${VERSIONED_ALIAS_VERSION_MARKER} ${VERSIONED_ALIAS_SCHEMA_VERSION}

package/dist/lib/ssh-exec.d.ts

@@ -17,7 +17,16 @@ export declare const SSH_TARGET_RE: RegExp;
 export declare function assertValidSshTarget(host: string): void;
 /** POSIX single-quote a string for safe interpolation into a remote shell command. */
 export declare function shellQuote(s: string): string;
-/** Hardened ssh options applied to every connection. */
+/**
+ * Hardened ssh options applied to every connection — the single baseline every
+ * `ssh` in the codebase composes from (directly here, or as `[...SSH_OPTS, …]`
+ * in the few callers that need extra flags like `-L`/`-N`/`ProxyCommand`).
+ *
+ * `ServerAliveInterval`/`ServerAliveCountMax` add in-connection keepalive: a
+ * silently-dropped link (laptop sleeps, Wi-Fi flips) is detected and the ssh
+ * process exits within ~45s instead of hanging forever — so a followed run or a
+ * long-lived `-N` tunnel can't leave a zombie ssh + socket pinned on the laptop.
+ */
 export declare const SSH_OPTS: readonly string[];
 export declare function controlOpts(): string[];
 export interface SshExecOptions {
@@ -27,7 +36,7 @@ export interface SshExecOptions {
     timeoutMs?: number;
     /** Extra ssh flags inserted before the target (e.g. `-tt`). */
     extraSshArgs?: string[];
-    /** Reuse a persistent control socket across calls (see `controlOpts`). */
+    /** Reuse a persistent control socket across calls (default true; see `controlOpts`). */
     multiplex?: boolean;
 }
 export interface SshExecResult {
@@ -44,6 +53,20 @@ export interface SshExecResult {
  * it); callers that build it from user input must `shellQuote` the pieces.
  */
 export declare function sshExec(target: string, remoteCmd: string, opts?: SshExecOptions): SshExecResult;
+export interface SshExecRawResult {
+    code: number | null;
+    stdout: Buffer;
+    stderr: Buffer;
+    timedOut: boolean;
+}
+/**
+ * Like {@link sshExec} but returns raw stdout/stderr Buffers — no UTF-8 decode.
+ *
+ * Use when byte-exactness matters, e.g. offset-tracked log tailing: a multibyte
+ * character split across a read boundary must stay raw bytes, not collapse to a
+ * U+FFFD replacement char (which would desync a byte offset from the wire).
+ */
+export declare function sshExecRaw(target: string, remoteCmd: string, opts?: SshExecOptions): SshExecRawResult;
 /** True if `target` is reachable over ssh (a passwordless `true` succeeds quickly). */
 export declare function sshReachable(target: string, timeoutMs?: number): boolean;
 export interface SshStreamOptions {
@@ -54,7 +77,7 @@ export interface SshStreamOptions {
      * leave it off and forward a non-interactive invocation instead.
      */
     tty?: boolean;
-    /** Reuse a persistent control socket across calls (see `controlOpts`). */
+    /** Reuse a persistent control socket across calls (default true; see `controlOpts`). */
     multiplex?: boolean;
 }
 /**

package/dist/lib/ssh-exec.js

@@ -29,11 +29,22 @@ export function shellQuote(s) {
         return s;
     return "'" + s.replace(/'/g, "'\\''") + "'";
 }
-/** Hardened ssh options applied to every connection. */
+/**
+ * Hardened ssh options applied to every connection — the single baseline every
+ * `ssh` in the codebase composes from (directly here, or as `[...SSH_OPTS, …]`
+ * in the few callers that need extra flags like `-L`/`-N`/`ProxyCommand`).
+ *
+ * `ServerAliveInterval`/`ServerAliveCountMax` add in-connection keepalive: a
+ * silently-dropped link (laptop sleeps, Wi-Fi flips) is detected and the ssh
+ * process exits within ~45s instead of hanging forever — so a followed run or a
+ * long-lived `-N` tunnel can't leave a zombie ssh + socket pinned on the laptop.
+ */
 export const SSH_OPTS = [
     '-o', 'StrictHostKeyChecking=accept-new',
     '-o', 'BatchMode=yes',
     '-o', 'ConnectTimeout=10',
+    '-o', 'ServerAliveInterval=15',
+    '-o', 'ServerAliveCountMax=3',
 ];
 /**
  * OpenSSH connection-multiplexing options. The first connection to a host opens
@@ -44,6 +55,12 @@ export const SSH_OPTS = [
  * client exits. `%C` (a short fixed-length hash of local-host/remote/port/user)
  * keeps the socket path well under macOS's 104-char `sun_path` limit.
  *
+ * This is **on by default** for every `sshExec`/`sshStream` call: the poll loops
+ * (`followHostTask`), readiness probes, and per-host fan-outs are exactly the
+ * high-frequency callers that benefit most from socket reuse, and they should
+ * never have to remember to opt in. A caller passes `multiplex: false` only for
+ * a genuine one-shot where a lingering 60s master is pure overhead.
+ *
  * The socket directory is created lazily; if ssh can't open the control socket
  * it falls back to a normal connection (multiplexing is an optimisation, never a
  * requirement), so this can never make a reachable host unreachable.
@@ -79,7 +96,7 @@ export function controlOpts() {
  */
 export function sshExec(target, remoteCmd, opts = {}) {
     assertValidSshTarget(target);
-    const mux = opts.multiplex ? controlOpts() : [];
+    const mux = opts.multiplex === false ? [] : controlOpts();
     const args = [...SSH_OPTS, ...mux, ...(opts.extraSshArgs ?? []), target, remoteCmd];
     const res = spawnSync('ssh', args, {
         input: opts.input,
@@ -95,6 +112,31 @@ export function sshExec(target, remoteCmd, opts = {}) {
         timedOut,
     };
 }
+/**
+ * Like {@link sshExec} but returns raw stdout/stderr Buffers — no UTF-8 decode.
+ *
+ * Use when byte-exactness matters, e.g. offset-tracked log tailing: a multibyte
+ * character split across a read boundary must stay raw bytes, not collapse to a
+ * U+FFFD replacement char (which would desync a byte offset from the wire).
+ */
+export function sshExecRaw(target, remoteCmd, opts = {}) {
+    assertValidSshTarget(target);
+    const mux = opts.multiplex === false ? [] : controlOpts();
+    const args = [...SSH_OPTS, ...mux, ...(opts.extraSshArgs ?? []), target, remoteCmd];
+    const res = spawnSync('ssh', args, {
+        input: opts.input,
+        // No `encoding` → spawnSync returns Buffers.
+        timeout: opts.timeoutMs,
+        stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    const timedOut = !!(res.error && res.error.code === 'ETIMEDOUT');
+    return {
+        code: typeof res.status === 'number' ? res.status : null,
+        stdout: res.stdout ?? Buffer.alloc(0),
+        stderr: res.stderr ?? Buffer.alloc(0),
+        timedOut,
+    };
+}
 /** True if `target` is reachable over ssh (a passwordless `true` succeeds quickly). */
 export function sshReachable(target, timeoutMs = 10000) {
     return sshExec(target, 'true', { timeoutMs, multiplex: true }).code === 0;
@@ -108,7 +150,7 @@ export function sshReachable(target, timeoutMs = 10000) {
  */
 export function sshStream(target, remoteCmd, opts = {}) {
     assertValidSshTarget(target);
-    const mux = opts.multiplex ? controlOpts() : [];
+    const mux = opts.multiplex === false ? [] : controlOpts();
     const tty = opts.tty ? ['-tt'] : [];
     const args = [...SSH_OPTS, ...mux, ...tty, target, remoteCmd];
     const res = spawnSync('ssh', args, { stdio: 'inherit' });

package/dist/lib/ssh-tunnel.d.ts

@@ -28,7 +28,11 @@ export interface StartTunnelOptions {
      */
     detached?: boolean;
 }
-/** Build the ssh argv (after the `ssh` program name) for an `-L` tunnel. Pure. */
+/** Build the ssh argv (after the `ssh` program name) for an `-L` tunnel. Pure.
+ *
+ * Composes the shared hardened baseline (`SSH_OPTS`) rather than re-listing it,
+ * so the tunnel inherits the same options — crucially the keepalive, which lets
+ * a dropped `-N` tunnel exit instead of lingering as a zombie on the laptop. */
 export declare function buildTunnelArgs(user: string, host: string, localPort: number, remotePort: number): string[];
 /**
  * Spawn `ssh -L localPort:127.0.0.1:remotePort -N user@host`.
@@ -74,12 +78,13 @@ export declare function resolveRemoteDevice(name: string): Promise<{
     host: string;
 }>;
 /**
- * PowerShell that streams base64 from stdin, decodes it incrementally to
- * %LOCALAPPDATA%\agents\computer-helper-win.exe, and stops any running instance
- * first so the file isn't locked. The CryptoStream/FromBase64Transform decode
- * is streaming — the ~156MB exe never lands in memory whole on the remote.
+ * PowerShell that resolves the destination under %LOCALAPPDATA%\agents and
+ * stops any running instance first so the file is not locked. The caller copies
+ * the exe with scp and then verifies the byte count separately.
  */
 export declare function buildPushScript(): string;
+/** PowerShell that verifies scp wrote the expected number of bytes. */
+export declare function buildVerifyPushScript(remotePath: string, expectedBytes: number): string;
 /**
  * PowerShell that registers the daemon as a LOGON scheduled task. Interactive
  * logon type + Highest run level so the daemon runs in the real desktop session
@@ -90,6 +95,20 @@ export declare function buildPushScript(): string;
 export declare function buildRegisterTaskScript(port: number, taskName: string): string;
 /** PowerShell that unregisters the task and stops any running daemon process. */
 export declare function buildUnregisterTaskScript(taskName: string): string;
+/** Convert a Windows path returned by PowerShell into the scp/SFTP path form. */
+export declare function scpRemotePath(remotePath: string): string;
+/**
+ * Build the scp argv used for the helper exe transfer. Exported so tests can
+ * assert the real binary copy path keeps BatchMode and does not route bytes
+ * through a PowerShell decoder.
+ */
+export declare function buildScpArgs(target: string, remotePath: string, filePath: string): string[];
+/**
+ * `setup --host`: push the exe, then register + start the LOGON task. Remote
+ * PowerShell hops go through `sshExec` (BatchMode key auth — the same hardening
+ * the browser driver and `agents ssh` use), and the large exe rides a binary
+ * scp transfer. Throws with the remote stderr on any failure.
+ */
 export declare function setupRemoteHelper(name: string): Promise<{
     target: string;
     taskName: string;