@phnx-labs/agents-cli 1.20.29 → 1.20.30

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

@@ -63,6 +63,15 @@ export interface SessionMeta {
     label?: string;
     /** Set when this session was spawned by `agents teams`. */
     teamOrigin?: TeamOrigin;
+    /** Durable state signals extracted at scan time by the session-state engine. */
+    /** PR URL, if the session opened one (`gh pr create`). */
+    prUrl?: string;
+    /** PR number parsed from prUrl, for compact display. */
+    prNumber?: number;
+    /** Worktree slug when cwd is under `.agents/worktrees/<slug>/`. */
+    worktreeSlug?: string;
+    /** Tracker ticket ref (e.g. RUSH-1234) from the prompt or branch. */
+    ticketId?: string;
     /**
      * True when the session was spawned programmatically (SDK entrypoint) rather
      * than by a human at the Claude CLI. Captured at scan time from the JSONL

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

@@ -0,0 +1,29 @@
+/**
+ * Terminal display-width helpers.
+ *
+ * `String.length` is the wrong ruler for a terminal: it over-counts ANSI colour
+ * escapes (chalk output) and under-counts wide glyphs (CJK, emoji) which occupy
+ * two cells. The result is the drifting, wrapping session-table line users see
+ * under tmux and over `--host` SSH. Every renderer that sizes a session-table
+ * cell measures and truncates through this module so alignment is computed once,
+ * correctly, from the same source of truth.
+ */
+/** Strip SGR colour escapes so width is measured on visible characters only. */
+export declare function stripAnsi(s: string): string;
+/** Visible display width of a string, ANSI-aware and wide-char-aware. */
+export declare function stringWidth(s: string): number;
+/**
+ * Truncate to a target display width, appending '…' when shortened. Operates on
+ * the visible (ANSI-stripped) string; callers colour the result afterwards so
+ * the ellipsis is never inserted mid-escape.
+ */
+export declare function truncateToWidth(s: string, max: number): string;
+/** Right-pad with spaces to a target display width. Never truncates. */
+export declare function padToWidth(s: string, width: number): string;
+/**
+ * Effective terminal width. Reads `$COLUMNS` first so it survives tmux and
+ * `--host` SSH (where `process.stdout.columns` is unset or wrong), falls back to
+ * the TTY's reported width, then to `fallback`. Clamped to a sane band so a
+ * bogus value can't produce a 0-wide or absurdly long table.
+ */
+export declare function terminalWidth(fallback?: number): number;

package/dist/lib/session/width.js

@@ -0,0 +1,91 @@
+/**
+ * Terminal display-width helpers.
+ *
+ * `String.length` is the wrong ruler for a terminal: it over-counts ANSI colour
+ * escapes (chalk output) and under-counts wide glyphs (CJK, emoji) which occupy
+ * two cells. The result is the drifting, wrapping session-table line users see
+ * under tmux and over `--host` SSH. Every renderer that sizes a session-table
+ * cell measures and truncates through this module so alignment is computed once,
+ * correctly, from the same source of truth.
+ */
+/** SGR colour sequences emitted by chalk (e.g. `\x1b[32m`). */
+const SGR_REGEX = /\x1b\[[0-9;]*m/g;
+/** Strip SGR colour escapes so width is measured on visible characters only. */
+export function stripAnsi(s) {
+    return s.replace(SGR_REGEX, '');
+}
+/**
+ * Display cells for one code point: 0 for zero-width combining/ZWJ/variation
+ * selectors, 2 for East-Asian-wide and emoji ranges, 1 otherwise. Compact and
+ * dependency-free — covers the glyphs that actually show up in prompts/titles.
+ */
+function charWidth(cp) {
+    if (cp === 0)
+        return 0;
+    // Zero-width: combining marks, zero-width joiner, variation selectors.
+    if ((cp >= 0x0300 && cp <= 0x036f) ||
+        cp === 0x200b || cp === 0x200d ||
+        (cp >= 0xfe00 && cp <= 0xfe0f))
+        return 0;
+    // Wide (2 cells): CJK, Hangul, fullwidth forms, emoji & pictographs.
+    if ((cp >= 0x1100 && cp <= 0x115f) || // Hangul Jamo
+        (cp >= 0x2e80 && cp <= 0xa4cf) || // CJK radicals … Yi
+        (cp >= 0xac00 && cp <= 0xd7a3) || // Hangul syllables
+        (cp >= 0xf900 && cp <= 0xfaff) || // CJK compatibility ideographs
+        (cp >= 0xfe30 && cp <= 0xfe4f) || // CJK compatibility forms
+        (cp >= 0xff00 && cp <= 0xff60) || // Fullwidth forms
+        (cp >= 0xffe0 && cp <= 0xffe6) || // Fullwidth signs
+        (cp >= 0x1f300 && cp <= 0x1faff) || // emoji & symbols
+        (cp >= 0x20000 && cp <= 0x3fffd) // CJK Ext-B and beyond
+    )
+        return 2;
+    return 1;
+}
+/** Visible display width of a string, ANSI-aware and wide-char-aware. */
+export function stringWidth(s) {
+    const plain = stripAnsi(s);
+    let w = 0;
+    for (const ch of plain)
+        w += charWidth(ch.codePointAt(0));
+    return w;
+}
+/**
+ * Truncate to a target display width, appending '…' when shortened. Operates on
+ * the visible (ANSI-stripped) string; callers colour the result afterwards so
+ * the ellipsis is never inserted mid-escape.
+ */
+export function truncateToWidth(s, max) {
+    if (max <= 0)
+        return '';
+    const plain = stripAnsi(s);
+    if (stringWidth(plain) <= max)
+        return plain;
+    let w = 0;
+    let out = '';
+    for (const ch of plain) {
+        const cw = charWidth(ch.codePointAt(0));
+        if (w + cw > max - 1)
+            break; // reserve one cell for the ellipsis
+        out += ch;
+        w += cw;
+    }
+    return out + '…';
+}
+/** Right-pad with spaces to a target display width. Never truncates. */
+export function padToWidth(s, width) {
+    const pad = width - stringWidth(s);
+    return pad > 0 ? s + ' '.repeat(pad) : s;
+}
+/**
+ * Effective terminal width. Reads `$COLUMNS` first so it survives tmux and
+ * `--host` SSH (where `process.stdout.columns` is unset or wrong), falls back to
+ * the TTY's reported width, then to `fallback`. Clamped to a sane band so a
+ * bogus value can't produce a 0-wide or absurdly long table.
+ */
+export function terminalWidth(fallback = 100) {
+    const env = Number.parseInt(process.env.COLUMNS ?? '', 10);
+    const raw = Number.isFinite(env) && env > 0
+        ? env
+        : (process.stdout.columns || fallback);
+    return Math.max(60, Math.min(200, raw));
+}

package/dist/lib/shims.d.ts

@@ -108,8 +108,14 @@ export declare function removeShim(agent: AgentId): boolean;
  *   v5 — hard-disable Codex startup update checks in versioned aliases.
  *   v6 — versions moved from ~/.agents-system/versions to ~/.agents/versions
  *        (two-repo split: system = shipped defaults, user = operational state).
+ *   v7 — runtime state split into ~/.agents/.history and ~/.agents/.cache.
+ *   v8 — resolve grok/kimi/droid binaries from their real install locations
+ *        (~/.grok/downloads, ~/.kimi-code/bin, ~/.local/bin) instead of the
+ *        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 = 7;
+export declare const VERSIONED_ALIAS_SCHEMA_VERSION = 8;
 /**
  * Generate a versioned alias script that directly execs a specific version.
  * e.g., claude@2.0.65 -> directly runs that version's binary
@@ -159,6 +165,16 @@ export declare function versionedAliasExists(agent: AgentId, version: string): b
  *
  * Returns: { success: boolean, backupPath?: string, error?: string }
  */
+/**
+ * Seed a version's config home with the account credential so switching versions
+ * doesn't log the CLI out. Droid/antigravity/kimi (registry `authFiles`) store
+ * login as files inside the per-version config dir; sign-in is account-global,
+ * so we copy the FRESHEST existing copy (by mtime, across all installed version
+ * homes) into `toConfigDir` when its copy is missing or older. mtime is
+ * preserved so the "freshest" comparison stays stable and switches don't
+ * ping-pong. Best-effort: a failed copy just means the user re-logs in.
+ */
+export declare function carryForwardAuthFiles(agent: AgentId, toConfigDir: string): void;
 export declare function switchConfigSymlink(agent: AgentId, version: string): Promise<{
     success: boolean;
     backupPath?: string;

package/dist/lib/shims.js

@@ -16,7 +16,7 @@ import { confirm, select } from '@inquirer/prompts';
 import { IS_WINDOWS, prependToWindowsUserPath } from './platform/index.js';
 import { getShimsDir, getVersionsDir, getBackupsDir, ensureAgentsDir } from './state.js';
 export { getShimsDir };
-import { AGENTS } from './agents.js';
+import { AGENTS, agentConfigDirName } from './agents.js';
 /**
  * Files and directories to always skip during conflict detection and migration.
  * These are never user config that should be migrated.
@@ -596,8 +596,14 @@ export function removeShim(agent) {
  *   v5 — hard-disable Codex startup update checks in versioned aliases.
  *   v6 — versions moved from ~/.agents-system/versions to ~/.agents/versions
  *        (two-repo split: system = shipped defaults, user = operational state).
+ *   v7 — runtime state split into ~/.agents/.history and ~/.agents/.cache.
+ *   v8 — resolve grok/kimi/droid binaries from their real install locations
+ *        (~/.grok/downloads, ~/.kimi-code/bin, ~/.local/bin) instead of the
+ *        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 const VERSIONED_ALIAS_SCHEMA_VERSION = 7;
+export const VERSIONED_ALIAS_SCHEMA_VERSION = 8;
 /** 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
@@ -640,22 +646,70 @@ export CODEX_HOME="$HOME/.agents/.history/versions/${agent}/${version}/home/${co
 # version MCP and session state are isolated.
 export COPILOT_HOME="$HOME/.agents/.history/versions/${agent}/${version}/home/${configDirName}"
 `
-                : agent === 'kimi'
+                : agent === 'grok'
                     ? `
+# Grok Build uses GROK_HOME to isolate its entire configuration tree (skills,
+# hooks, plugins, agents, memory, sessions, config.toml, MCP). Point direct
+# aliases at the versioned home for isolation parity with the main shim.
+export GROK_HOME="$HOME/.agents/.history/versions/${agent}/${version}/home/${configDirName}"
+`
+                    : agent === 'kimi'
+                        ? `
 # Kimi Code CLI honors KIMI_CODE_HOME to relocate ~/.kimi-code (config.toml,
 # mcp.json, sessions, skills, hooks). Point direct aliases at the versioned home.
 export KIMI_CODE_HOME="$HOME/.agents/.history/versions/${agent}/${version}/home/${configDirName}"
 `
-                    : '';
+                        : '';
     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.
+    // 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}`;
+    const binaryResolution = agent === 'grok'
+        ? `# Grok ships its native binary in ~/.grok/downloads, not node_modules.
+GROK_DOWNLOADS="$HOME/.grok/downloads"
+BINARY=""
+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 "")
+fi`
+            : 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"
+if [ -x "$DROID_BINARY" ]; then
+  BINARY="$DROID_BINARY"
+else
+  BINARY=$(command -v droid 2>/dev/null || echo "")
+  case "$BINARY" in
+    "$HOME/.agents/.cache/shims/"*) BINARY="" ;;
+  esac
+fi`
+                : `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}
 # Direct alias for ${agentConfig.name}@${version}
 
-BINARY="$HOME/.agents/.history/versions/${agent}/${version}/node_modules/.bin/${agentConfig.cliCommand}"
+${binaryResolution}
 
-if [ ! -x "$BINARY" ]; then
+if [ -z "$BINARY" ] || [ ! -x "$BINARY" ]; then
   echo "agents: ${agent}@${version} not installed" >&2
   exit 1
 fi
@@ -831,6 +885,70 @@ function detectMigrationConflicts(agent, version) {
  *
  * Returns: { success: boolean, backupPath?: string, error?: string }
  */
+/**
+ * Seed a version's config home with the account credential so switching versions
+ * doesn't log the CLI out. Droid/antigravity/kimi (registry `authFiles`) store
+ * login as files inside the per-version config dir; sign-in is account-global,
+ * so we copy the FRESHEST existing copy (by mtime, across all installed version
+ * homes) into `toConfigDir` when its copy is missing or older. mtime is
+ * preserved so the "freshest" comparison stays stable and switches don't
+ * ping-pong. Best-effort: a failed copy just means the user re-logs in.
+ */
+export function carryForwardAuthFiles(agent, toConfigDir) {
+    const authFiles = AGENTS[agent].authFiles;
+    if (!authFiles || authFiles.length === 0)
+        return;
+    const configDirName = agentConfigDirName(agent);
+    const versionsBase = path.join(getVersionsDir(), agent);
+    let sourceDirs = [];
+    try {
+        sourceDirs = fs
+            .readdirSync(versionsBase)
+            .map(v => path.join(versionsBase, v, 'home', configDirName));
+    }
+    catch {
+        return; // no installed versions to source from
+    }
+    for (const rel of authFiles) {
+        const dest = path.join(toConfigDir, rel);
+        const destResolved = path.resolve(dest);
+        // Newest existing source copy across all version homes (excluding dest).
+        let newest = null;
+        for (const dir of sourceDirs) {
+            const src = path.join(dir, rel);
+            if (path.resolve(src) === destResolved)
+                continue;
+            let st;
+            try {
+                st = fs.statSync(src);
+            }
+            catch {
+                continue;
+            }
+            if (!st.isFile())
+                continue;
+            if (!newest || st.mtimeMs > newest.mtimeMs)
+                newest = { path: src, mtimeMs: st.mtimeMs };
+        }
+        if (!newest)
+            continue;
+        // Skip when the target already has an at-least-as-fresh copy.
+        try {
+            const dstat = fs.statSync(dest);
+            if (dstat.mtimeMs >= newest.mtimeMs)
+                continue;
+        }
+        catch { /* dest missing — copy below */ }
+        try {
+            fs.mkdirSync(path.dirname(dest), { recursive: true });
+            const srcStat = fs.statSync(newest.path);
+            fs.copyFileSync(newest.path, dest);
+            fs.chmodSync(dest, (srcStat.mode & 0o777) || 0o600);
+            fs.utimesSync(dest, srcStat.atime, srcStat.mtime);
+        }
+        catch { /* best-effort; a failed carry just means a re-login */ }
+    }
+}
 export async function switchConfigSymlink(agent, version) {
     const configPath = getAgentConfigPath(agent);
     const versionConfigPath = getVersionConfigPath(agent, version);
@@ -838,6 +956,12 @@ export async function switchConfigSymlink(agent, version) {
     if (!fs.existsSync(versionConfigPath)) {
         fs.mkdirSync(versionConfigPath, { recursive: true });
     }
+    // Carry the account credential into the version we're switching to. Droid /
+    // antigravity / kimi store login as files INSIDE the per-version config home;
+    // switching versions repoints the symlink to a home that was never logged in,
+    // silently logging the CLI out. Sign-in is account-global, so seed the target
+    // home with the freshest existing credential before we flip the symlink.
+    carryForwardAuthFiles(agent, versionConfigPath);
     try {
         const stat = fs.lstatSync(configPath);
         if (stat.isSymbolicLink()) {

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

@@ -0,0 +1,127 @@
+/**
+ * Shared SSH port-forward tunnel + remote computer-helper provisioning.
+ *
+ * Two layers live here:
+ *
+ *  1. `startSSHTunnel` — the generic `ssh -L localPort:127.0.0.1:remotePort -N`
+ *     spawn, extracted verbatim from the browser CDP driver so both the browser
+ *     and `agents computer --host` reach a remote loopback service through one
+ *     hardened tunnel. Behavior for the browser caller is unchanged (default,
+ *     foreground, stderr-captured).
+ *
+ *  2. Remote computer-helper orchestration — resolve a registered device to an
+ *     ssh target, push the cross-published Windows daemon exe, register it as a
+ *     LOGON scheduled task (interactive session so real-desktop UIA/screenshot
+ *     works and it survives the ssh disconnect), and open a tunnel the TS RPC
+ *     client drives via TCP. Everything rides the existing `ssh-exec` /
+ *     `devices/connect` primitives — no parallel SSH implementation.
+ */
+import { type ChildProcess } from 'child_process';
+import { type DeviceProfile } from './devices/registry.js';
+export interface StartTunnelOptions {
+    /**
+     * Detach the tunnel so it OUTLIVES this CLI process. Used by
+     * `agents computer start --host` — the tunnel must persist across separate
+     * verb invocations (`apps`, `click`, …) until `stop --host` tears it down.
+     * The browser driver leaves this false: it holds the tunnel for the lifetime
+     * of one CDP session and kills it on cleanup.
+     */
+    detached?: boolean;
+}
+/** Build the ssh argv (after the `ssh` program name) for an `-L` tunnel. Pure. */
+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`.
+ *
+ * Foreground (default): stderr is captured so a tunnel that dies inside 500ms
+ * rejects with the ssh error — the browser driver's original contract. Detached
+ * mode ignores stdio and `unref`s the child so the parent can exit while the
+ * tunnel lives; liveness is then confirmed by the caller probing the service.
+ */
+export declare function startSSHTunnel(user: string, host: string, localPort: number, remotePort: number, opts?: StartTunnelOptions): Promise<ChildProcess>;
+/** Loopback TCP port the Windows daemon binds on the remote (Program.cs default). */
+export declare const REMOTE_HELPER_PORT = 8765;
+/** Task Scheduler task name for the daemon. Stable so setup/stop pair up. */
+export declare const REMOTE_TASK_NAME = "AgentsComputerHelper";
+/** Basename of the cross-published exe under packages/computer-helper-win/dist. */
+export declare const WIN_HELPER_EXE = "computer-helper-win.exe";
+/**
+ * Locate the cross-published Windows daemon exe. Only the local build output is
+ * a candidate — `scripts/build-win.sh` writes it to packages/.../dist/.
+ */
+export declare function resolveWinHelperExe(): string | null;
+/** Persisted per-device tunnel state so verbs can reconnect after `start --host`. */
+export interface RemoteTunnelState {
+    device: string;
+    target: string;
+    localPort: number;
+    remotePort: number;
+    tunnelPid: number;
+    token: string | null;
+    taskName: string;
+    startedAt: number;
+}
+/** State file path for a device. Device names are ssh-alias safe (validated). */
+export declare function remoteStatePath(device: string): string;
+export declare function readRemoteState(device: string): RemoteTunnelState | null;
+export declare function writeRemoteState(state: RemoteTunnelState): void;
+export declare function clearRemoteState(device: string): void;
+/** Resolve a registered device to its ssh pieces, or throw a clear error. */
+export declare function resolveRemoteDevice(name: string): Promise<{
+    device: DeviceProfile;
+    target: string;
+    user: string;
+    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.
+ */
+export declare function buildPushScript(): 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
+ * (UIAutomation and ScreenCapture need a live session, not Session 0) and
+ * survives ssh disconnect — the same rationale as the browser WMI launch. The
+ * task is started immediately so the caller need not log out/in.
+ */
+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;
+/**
+ * `setup --host`: push the exe, then register + start the LOGON task. Both hops
+ * go through `sshExec` (BatchMode key auth — the same hardening the browser
+ * driver and `agents ssh` use). Throws with the remote stderr on any failure.
+ */
+export declare function setupRemoteHelper(name: string): Promise<{
+    target: string;
+    taskName: string;
+}>;
+/** Reserve a free local TCP port by binding :0 and reading the assigned port. */
+export declare function pickFreePort(): Promise<number>;
+/**
+ * `start --host`: open a detached ssh -L tunnel to the remote daemon, verify it
+ * answers over TCP, and persist the tunnel state so verbs can reconnect. Returns
+ * the state (and leaves the tunnel running in the background).
+ */
+export declare function startRemoteTunnel(name: string): Promise<RemoteTunnelState>;
+/**
+ * `stop --host`: kill the local tunnel, unregister the remote task (best-effort
+ * — the box may be offline), and clear the persisted state.
+ */
+export declare function stopRemoteHelper(name: string): Promise<{
+    tunnelKilled: boolean;
+    taskRemoved: boolean;
+}>;
+/**
+ * Point this process's RPC client at a device's live tunnel by setting
+ * COMPUTER_HELPER_TCP / COMPUTER_HELPER_TOKEN from persisted state. Called for
+ * remote verbs (`apps --host`, `click --host`, …) so the shared
+ * openComputerClient() transparently selects the TcpClient transport — no
+ * per-verb wiring. Exits with guidance when there is no active tunnel.
+ */
+export declare function hydrateRemoteEnvFromState(name: string): void;
+/** Generate a shared-secret token (reserved for token-file provisioning). */
+export declare function generateToken(): string;