@phnx-labs/agents-cli 1.20.34 → 1.20.36

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

@@ -0,0 +1,153 @@
+/**
+ * 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 { remoteShellFor, buildWindowsAgentsCommand } from '../hosts/remote-cmd.js';
+import { resolveRemoteOsSync } from '../hosts/remote-os.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.
+ * A Windows peer gets a PowerShell invocation (ssh lands in cmd.exe/PowerShell
+ * there, where `bash -lc` is not a command); every other OS keeps `bash -lc`. */
+function remoteActiveCommand(os) {
+    if (remoteShellFor(os) === 'powershell') {
+        return buildWindowsAgentsCommand({
+            args: ['sessions', '--active', '--json'],
+            env: { [NO_FANOUT_ENV]: '1' },
+        });
+    }
+    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, os) {
+    const { code, stdout } = await sshCapture(target, remoteActiveCommand(os), 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;
+            // Resolve the OS by the name the user passed (a bare alias like `win-mini`
+            // matches a device-registry entry; a raw `user@host` falls back to POSIX).
+            targets.push({ target: h, machine: normalizeHost(bareHost), name: h, os: resolveRemoteOsSync(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, os: d.platform });
+            }
+            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, t.os)));
+    return { sessions: results.flat(), deviceCount: targets.length };
+}

package/dist/lib/session/remote-list.d.ts

@@ -0,0 +1,51 @@
+import type { SessionMeta } from './types.js';
+/**
+ * The command run on each peer: answer for itself, as JSON, without recursing.
+ * `forwardedArgs` carry the caller's own query/filters (already including the
+ * leading `sessions` and a `--json`) so each peer returns a comparable slice.
+ * A Windows peer gets a PowerShell invocation (ssh lands in cmd.exe/PowerShell
+ * there, where `bash -lc` is not a command); every other OS keeps `bash -lc`.
+ */
+export declare function remoteListCommand(forwardedArgs: string[], os?: string): string;
+/**
+ * Parse a peer's `sessions --json` stdout into `SessionMeta[]`, 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. The `machine` we dialed always wins over any value the peer set on
+ * its own rows, so grouping keys off the computer we asked. Exported for unit
+ * testing without a live tailnet.
+ */
+export declare function parseRemoteList(stdout: string, machine: string): SessionMeta[];
+export interface RemoteListResult {
+    sessions: SessionMeta[];
+    /** How many peer machines we attempted to reach (drives the empty-fleet tip). */
+    deviceCount: number;
+}
+/**
+ * Gather listing 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. `forwardedArgs` are the caller's own sessions args (query + filters,
+ * already `--json`) so every peer returns the same slice this machine asked for.
+ */
+export declare function gatherRemoteList(forwardedArgs: string[], hosts?: string[]): Promise<RemoteListResult>;
+/** Resolve a peer's SSH target (and OS) from the device registry by its
+ * normalized machine id — the same id the fan-out tags rows with. Returns
+ * undefined when no registered device with an address matches. */
+export declare function resolvePeerTarget(machine: string): Promise<{
+    target: string;
+    os?: string;
+} | undefined>;
+/**
+ * Run `agents <args>` ON a peer over SSH, attached to this terminal (inherited
+ * stdio). `args` is the full arg vector after the binary — callers pass e.g.
+ * `['sessions', id, '--markdown']` or `['sessions', 'resume', id]`. Used when a
+ * picked session lives on another machine: its transcript and agent binary are
+ * there, so both reading (no TTY) and resuming (TTY) must execute on the peer —
+ * not via a local `--host` hop, which would discover locally and dead-end for a
+ * session that exists only on the peer. Resolves 'no-target' when the machine
+ * isn't a dialable registered device; the caller surfaces a clear message.
+ */
+export declare function runOnPeer(args: string[], machine: string, opts?: {
+    tty?: boolean;
+}): Promise<'ok' | 'no-target'>;

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

@@ -0,0 +1,213 @@
+/**
+ * Cross-machine fan-out for the default `agents sessions` listing.
+ *
+ * `discoverSessions()` only scans the local disk. To browse the whole fleet in
+ * one list — without syncing anything — we run `agents sessions <same query>
+ * --json` on each peer over SSH and merge the parsed `SessionMeta[]`, tagging
+ * every row with the machine it came from so the picker/table can label and
+ * group by computer.
+ *
+ * This is the browse-listing sibling of `remote-active.ts` (which fans out
+ * `--active`): same transport, same device set, same recursion guard. The peer
+ * runs with `AGENTS_SESSIONS_LOCAL=1` so it answers only for itself and the
+ * sweep never recurses. A dead or slow host is skipped with a stderr note,
+ * never fatal — one asleep laptop must not blank the list.
+ */
+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 { remoteShellFor, buildWindowsAgentsCommand } from '../hosts/remote-cmd.js';
+import { resolveRemoteOsSync } from '../hosts/remote-os.js';
+import { machineId, normalizeHost } from './sync/config.js';
+import { NO_FANOUT_ENV } from './remote-active.js';
+import { terminalWidth } from './width.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;
+/**
+ * The command run on each peer: answer for itself, as JSON, without recursing.
+ * `forwardedArgs` carry the caller's own query/filters (already including the
+ * leading `sessions` and a `--json`) so each peer returns a comparable slice.
+ * A Windows peer gets a PowerShell invocation (ssh lands in cmd.exe/PowerShell
+ * there, where `bash -lc` is not a command); every other OS keeps `bash -lc`.
+ */
+export function remoteListCommand(forwardedArgs, os) {
+    if (remoteShellFor(os) === 'powershell') {
+        return buildWindowsAgentsCommand({
+            args: forwardedArgs,
+            env: { [NO_FANOUT_ENV]: '1' },
+        });
+    }
+    const inner = [`${NO_FANOUT_ENV}=1`, 'agents', ...forwardedArgs].map((t, i) => i === 0 ? t : shellQuote(t)).join(' ');
+    return `bash -lc ${shellQuote(inner)}`;
+}
+/**
+ * Parse a peer's `sessions --json` stdout into `SessionMeta[]`, 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. The `machine` we dialed always wins over any value the peer set on
+ * its own rows, so grouping keys off the computer we asked. Exported for unit
+ * testing without a live tailnet.
+ */
+export function parseRemoteList(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)) {
+            // `_remote` marks these as living on the peer's disk (not a local mirror),
+            // so the picker routes read/resume back over SSH instead of the local FS.
+            out.push({ ...x, machine, _remote: true });
+        }
+    }
+    return out;
+}
+/** Run one remote `agents sessions … --json` 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, forwardedArgs, os) {
+    const { code, stdout } = await sshCapture(target, remoteListCommand(forwardedArgs, os), REMOTE_TIMEOUT_MS);
+    if (code !== 0) {
+        process.stderr.write(chalk.gray(`  ${display}: unreachable or no agents CLI — skipped\n`));
+        return [];
+    }
+    return parseRemoteList(stdout, machine);
+}
+/**
+ * Gather listing 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. `forwardedArgs` are the caller's own sessions args (query + filters,
+ * already `--json`) so every peer returns the same slice this machine asked for.
+ */
+export async function gatherRemoteList(forwardedArgs, 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, os: resolveRemoteOsSync(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, os: d.platform });
+            }
+            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, forwardedArgs, t.os)));
+    return { sessions: results.flat(), deviceCount: targets.length };
+}
+/** Resolve a peer's SSH target (and OS) from the device registry by its
+ * normalized machine id — the same id the fan-out tags rows with. Returns
+ * undefined when no registered device with an address matches. */
+export async function resolvePeerTarget(machine) {
+    let reg;
+    try {
+        reg = await loadDevices();
+    }
+    catch {
+        return undefined;
+    }
+    for (const d of Object.values(reg)) {
+        if (normalizeHost(d.name) !== machine)
+            continue;
+        try {
+            return { target: sshTargetFor(d), os: d.platform };
+        }
+        catch {
+            return undefined; // matched the machine, but it has no address to dial
+        }
+    }
+    return undefined;
+}
+/**
+ * Run `agents <args>` ON a peer over SSH, attached to this terminal (inherited
+ * stdio). `args` is the full arg vector after the binary — callers pass e.g.
+ * `['sessions', id, '--markdown']` or `['sessions', 'resume', id]`. Used when a
+ * picked session lives on another machine: its transcript and agent binary are
+ * there, so both reading (no TTY) and resuming (TTY) must execute on the peer —
+ * not via a local `--host` hop, which would discover locally and dead-end for a
+ * session that exists only on the peer. Resolves 'no-target' when the machine
+ * isn't a dialable registered device; the caller surfaces a clear message.
+ */
+export async function runOnPeer(args, machine, opts = {}) {
+    const peer = await resolvePeerTarget(machine);
+    if (!peer)
+        return 'no-target';
+    assertValidSshTarget(peer.target); // registry-sourced, but validate like the fan-out does
+    const cols = terminalWidth();
+    const remoteCmd = remoteShellFor(peer.os) === 'powershell'
+        ? buildWindowsAgentsCommand({ args, env: cols > 0 ? { COLUMNS: String(cols) } : undefined })
+        : `bash -lc ${shellQuote((cols > 0 ? [`COLUMNS=${cols}`] : []).concat(['agents', ...args].map(shellQuote)).join(' '))}`;
+    const sshArgs = [...SSH_OPTS, ...controlOpts()];
+    if (opts.tty)
+        sshArgs.push('-tt'); // force a PTY so the resumed agent is interactive
+    sshArgs.push(peer.target, remoteCmd);
+    return new Promise((resolve) => {
+        const child = spawn('ssh', sshArgs, { stdio: 'inherit' });
+        // ssh prints its own connection errors to the inherited stderr; a spawn
+        // failure (e.g. ssh not on PATH) has no such output, so name it. Either way
+        // we resolve once it settles so the picker flow completes.
+        child.on('error', (err) => {
+            process.stderr.write(chalk.red(`Failed to reach ${machine}: ${err?.message ?? 'ssh failed to launch'}\n`));
+            resolve('ok');
+        });
+        child.on('close', () => resolve('ok'));
+    });
+}

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

@@ -22,8 +22,14 @@ export declare function buildForwardedArgs(argv: string[], hosts?: Set<string>):
  * Build the single remote command string for `ssh <host> <cmd>`. Forwarded args
  * are quoted for the inner login shell, then the whole `agents …` invocation is
  * quoted again so it survives `bash -lc <...>`.
+ *
+ * `os` selects the remote shell: a Windows host gets a PowerShell invocation
+ * (ssh lands in cmd.exe/PowerShell there, where `bash -lc` does not exist);
+ * anything else — including unknown/absent — keeps the POSIX form unchanged.
+ * The forwarded terminal width rides across as an env var either way so the
+ * remote renders its table to the local screen.
  */
-export declare function buildRemoteCommand(forwardedArgs: string[], columns?: number): string;
+export declare function buildRemoteCommand(forwardedArgs: string[], columns?: number, os?: string): string;
 /** The four outcomes of one `ssh <host> agents sessions …` invocation. */
 export type SshOutcome = 'ok' | 'unreachable' | 'query-failed' | 'spawn-error';
 /**

package/dist/lib/session/remote.js

@@ -27,6 +27,9 @@ 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 { remoteShellFor, buildWindowsAgentsCommand } from '../hosts/remote-cmd.js';
+import { resolveRemoteOsSync } from '../hosts/remote-os.js';
 import { formatRelativeTime } from './relative-time.js';
 import { terminalWidth } from './width.js';
 /**
@@ -87,8 +90,18 @@ export function buildForwardedArgs(argv, hosts = new Set()) {
  * Build the single remote command string for `ssh <host> <cmd>`. Forwarded args
  * are quoted for the inner login shell, then the whole `agents …` invocation is
  * quoted again so it survives `bash -lc <...>`.
+ *
+ * `os` selects the remote shell: a Windows host gets a PowerShell invocation
+ * (ssh lands in cmd.exe/PowerShell there, where `bash -lc` does not exist);
+ * anything else — including unknown/absent — keeps the POSIX form unchanged.
+ * The forwarded terminal width rides across as an env var either way so the
+ * remote renders its table to the local screen.
  */
-export function buildRemoteCommand(forwardedArgs, columns) {
+export function buildRemoteCommand(forwardedArgs, columns, os) {
+    if (remoteShellFor(os) === 'powershell') {
+        const env = columns && columns > 0 ? { COLUMNS: String(columns) } : undefined;
+        return buildWindowsAgentsCommand({ args: forwardedArgs, env });
+    }
     const inner = ['agents', ...forwardedArgs].map(shellQuote).join(' ');
     // Forward the caller's terminal width so the remote renders the table to the
     // local screen (over SSH the remote's own COLUMNS is unset/wrong). `VAR=val
@@ -96,11 +109,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
@@ -180,13 +188,15 @@ export function runRemoteSessions(hosts, argv = process.argv) {
     for (const host of hosts)
         assertValidSshTarget(host); // fail fast on any bad target
     const forwarded = buildForwardedArgs(argv, new Set(hosts));
-    const remoteCmd = buildRemoteCommand(forwarded, terminalWidth());
+    const cols = terminalWidth();
     const multi = hosts.length > 1;
     let failures = 0;
     for (const host of hosts) {
         if (multi)
             process.stdout.write(chalk.cyan(`\n── ${host} ──\n`));
-        const res = spawnSync('ssh', [...SSH_OPTS, host, remoteCmd], {
+        // Per-host: a Windows peer needs a PowerShell command, POSIX peers `bash -lc`.
+        const remoteCmd = buildRemoteCommand(forwarded, cols, resolveRemoteOsSync(host));
+        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,10 +33,4 @@ export declare function loadR2Config(): R2Config;
  * does not re-storm every cycle. `now` is injectable for tests.
  */
 export declare function isSyncConfigured(now?: number): boolean;
-/**
- * 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
- * unique and readable; we lowercase and strip any domain suffix. Overridable
- * via AGENTS_SYNC_MACHINE_ID for tests and unusual setups.
- */
-export declare function machineId(): string;
+export { machineId, normalizeHost } from '../../machine-id.js';

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

@@ -3,7 +3,6 @@
  * machine's stable identity. Credentials come from the `r2.backups` secrets
  * bundle (OS keychain on macOS, libsecret on Linux) — never from env or disk.
  */
-import * as os from 'os';
 import { readAndResolveBundleEnv } from '../../secrets/bundles.js';
 /** Secrets bundle holding the R2 credentials. */
 export const SYNC_BUNDLE = 'r2.backups';
@@ -93,13 +92,7 @@ export function isSyncConfigured(now = Date.now()) {
         return false;
     }
 }
-/**
- * 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
- * unique and readable; we lowercase and strip any domain suffix. Overridable
- * 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';
-}
+// machineId() and normalizeHost() now live in the dependency-free leaf
+// ../../machine-id.ts so low-level modules (state.ts) can use them without an
+// import cycle. Re-exported here for existing importers.
+export { machineId, normalizeHost } from '../../machine-id.js';

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.). */
@@ -78,6 +78,23 @@ export interface SessionMeta {
      * `entrypoint` field ('sdk-cli' for team spawns, 'cli' for real sessions).
      */
     isTeamOrigin?: boolean;
+    /**
+     * The machine (normalized hostname) this session's transcript originated on:
+     * the local machine for live-home sessions, or the origin machine parsed from
+     * the cross-machine mirror path (backups/<agent>/<machine>/…, see
+     * sync/agents.ts). Populated by discoverSessions for the listing/picker;
+     * undefined for sessions obtained outside that path.
+     */
+    machine?: string;
+    /**
+     * True only for rows pulled from another machine over the live cross-machine
+     * fan-out (`remote-list.ts`) — their transcript is on that peer's disk, so
+     * reading/resuming has to hop back over SSH. Distinct from `machine`, which is
+     * also set on locally-readable synced mirrors: a mirror is machine-tagged but
+     * its `filePath` is a local path, so it must NOT be treated as remote. Set by
+     * `parseRemoteList`; transient (never persisted, stripped from --json).
+     */
+    _remote?: boolean;
     /** Terms that matched the current search query */
     _matchedTerms?: string[];
     /** BM25 relevance score from the most recent content-index search */

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'];