@phnx-labs/agents-cli 1.20.49 → 1.20.51

package/dist/commands/exec.js

@@ -11,6 +11,7 @@ import { setHelpSections } from '../lib/help.js';
 import { parseLoopInterval } from '../lib/loop.js';
 import { AGENTS } from '../lib/agents.js';
 import { recordDispatchedRun } from '../lib/audit/log.js';
+import { warnUnpushedWork, shouldWarnUnpushed } from '../lib/warn-unpushed.js';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
@@ -211,7 +212,7 @@ export function registerRunCommand(program) {
         .option('--secrets-keys <keys>', 'Inject only this comma-separated subset of keys from --secrets bundles (e.g. KEY1,KEY2). Missing keys are an error. Applies to all --secrets bundles on this run.')
         .option('--allow-expired', 'Inject secrets even if their expiry date has passed (overrides the pre-run expiry abort).')
         .option('--cwd <dir>', 'Working directory for the agent (defaults to current directory)')
-        .option('--add-dir <dir>', 'Grant access to an additional directory outside the project (Claude only, repeatable)', (val, prev) => [...prev, val], [])
+        .option('--add-dir <dir>', 'Grant access to an additional directory outside the project (Claude and Codex, repeatable)', (val, prev) => [...prev, val], [])
         .option('--json', 'Stream events as JSON lines (for parsing by other tools)')
         .option('--quiet', 'Suppress preamble (rotation banner, "Running:" line). Useful when piping JSON events to a parser.', false)
         .option('--headless', 'Force headless mode. Auto-enabled when a prompt is provided; pass explicitly to stay headless with no prompt (reads the prompt from stdin).', false)
@@ -245,6 +246,12 @@ export function registerRunCommand(program) {
     // `--on` and `--computer` are hidden aliases of `--host` — same behavior.
     runCmd.addOption(new Option('--on <name>', 'Alias of --host.').hideHelp());
     runCmd.addOption(new Option('--computer <name>', 'Alias of --host.').hideHelp());
+    // Required for the documented `agents run <agent> [prompt] -- <native flags>`
+    // passthrough: commander >=13 rejects excess operands by default, so any
+    // post-`--` token died with "too many arguments" before the action ran. The
+    // action re-derives the `--` boundary from rawArgs and still errors on excess
+    // operands that are NOT behind `--`.
+    runCmd.allowExcessArguments(true);
     setHelpSections(runCmd, {
         examples: `
       # Headless, read-only: investigate or summarize without writing files
@@ -293,10 +300,25 @@ export function registerRunCommand(program) {
     `,
     });
     runCmd.action(async (agentSpec, prompt, options, command) => {
-        // Capture everything after -- as passthrough args forwarded verbatim to the underlying CLI.
-        // Use command.args (all positional strings) and strip the declared positional args from the front.
-        const declaredArgCount = prompt !== undefined ? 2 : 1;
-        const passthroughArgs = command.args.slice(declaredArgCount);
+        // Capture everything after -- as passthrough args forwarded verbatim to the
+        // underlying CLI. Commander strips the literal `--` and folds what follows
+        // into the positional operands (so `agents run codex -- --yolo` would parse
+        // `--yolo` as the PROMPT) — recover the boundary from rawArgs instead of
+        // operand counts. Excess operands not behind `--` are still an error (an
+        // unquoted prompt must not silently become agent flags).
+        const rawArgs = process.argv;
+        const separatorIdx = rawArgs.indexOf('--');
+        const passthroughArgs = separatorIdx === -1 ? [] : rawArgs.slice(separatorIdx + 1);
+        const operandsBeforeSeparator = command.args.length - passthroughArgs.length;
+        if (operandsBeforeSeparator > 2) {
+            console.error(chalk.red(`Too many arguments for 'run'. Quote the prompt ("fix the bug"), and put agent-native flags after -- (agents run codex -- --yolo).`));
+            process.exit(1);
+        }
+        if (prompt !== undefined && operandsBeforeSeparator < 2) {
+            // The token commander assigned to [prompt] came from behind `--` — it is
+            // a native flag, not a prompt. Run interactively.
+            prompt = undefined;
+        }
         // --lease: invent a disposable cloud box for this run (via crabbox), run
         // the agent there, then tear it down. Unlike --host, nothing is registered.
         if (options.lease) {
@@ -342,7 +364,7 @@ export function registerRunCommand(program) {
                     secretsBundle: process.env.AGENTS_LEASE_SECRETS_BUNDLE,
                     keep: options.keepBox,
                 });
-                console.error(chalk.gray(toreDown ? `Box ${box.slug} destroyed.` : `Box ${box.slug} kept${box.ip ? ` (${box.ip})` : ''}. Stop it: crabbox stop --id ${box.slug}`));
+                console.error(chalk.gray(toreDown ? `Box ${box.slug} destroyed.` : `Box ${box.slug} kept${box.ip ? ` (${box.ip})` : ''}. Stop it: crabbox stop ${box.slug}`));
                 process.exit(exitCode === null ? 1 : exitCode);
             }
             catch (err) {
@@ -568,6 +590,9 @@ export function registerRunCommand(program) {
                 cwd: resumeExec.cwd ?? process.cwd(),
                 exitCode: resumeExit,
             });
+            // A resumed loop is always headless; surface any commits it left unpushed.
+            if (shouldWarnUnpushed(resumeExec.mode ?? 'auto', false))
+                await warnUnpushedWork(resumeExec.cwd ?? process.cwd());
             process.exit(resumeExit);
         }
         const [{ buildExecCommand, parseExecEnv, execAgent, runWithFallback, normalizeMode, resolveMode, headlessPlanStallCommand, nativeResume, resolveInteractive }, { ALL_AGENT_IDS }, { profileExists, resolveProfileForRun }, { readAndResolveBundleEnv, describeBundle, assertRemoteBundleFlagsUnsupported }, { splitBundleRef, resolveSshTarget, remoteResolveEnv }, { getConfiguredRunStrategy, normalizeRunStrategy, resolveRunVersion, rotationFailoverChain, shouldArmRotationFailover, RUN_STRATEGIES }, { getGlobalDefault, getVersionHomePath, resolveVersion, resolveVersionAlias, ensureAgentRunnable }, { buildDiscoveredPlugin, loadPluginManifest, syncPluginToVersion }, { parseWorkflowFrontmatter, resolveWorkflowRef, resolveAllowedSubagents, pruneStaleWorkflowSubagents }, { resolveRunDefaults }, { getMcpServersByName, buildWorkflowMcpConfig }, { supports },] = await Promise.all([
@@ -1279,6 +1304,9 @@ export function registerRunCommand(program) {
                 // Governance chokepoint (#347): the --acp path exits here, bypassing
                 // the normal finalize below — record its one audit entry.
                 recordDispatchedRun({ agent, version: defaultVersion ?? 'unknown', mode, cwd, exitCode });
+                // ACP headless run always has a prompt; surface any unpushed commits.
+                if (shouldWarnUnpushed(mode, false))
+                    await warnUnpushedWork(cwd);
                 process.exit(exitCode);
             }
             catch (err) {
@@ -1435,6 +1463,9 @@ export function registerRunCommand(program) {
                 // the normal finalize below — record its one audit entry.
                 const loopExit = loopExitCode(result.stoppedBy);
                 recordDispatchedRun({ agent, version: defaultVersion ?? 'unknown', mode, cwd, exitCode: loopExit });
+                // A loop is always headless; surface any commits it left unpushed.
+                if (shouldWarnUnpushed(mode, false))
+                    await warnUnpushedWork(cwd);
                 process.exit(loopExit);
             }
             catch (err) {
@@ -1462,6 +1493,13 @@ export function registerRunCommand(program) {
             }
             cleanupWorkflowMcpConfig();
             cleanupWorkflowSubagents();
+            // Surface committed-but-unpushed work a headless writable run left
+            // behind, so it isn't silently stranded in a worktree. Advisory only,
+            // never throws; skipped for interactive runs (the human sees the shell)
+            // and read-only plan mode (can't commit).
+            if (shouldWarnUnpushed(mode, resolveInteractive(execOptions))) {
+                await warnUnpushedWork(cwd);
+            }
             // Governance chokepoint (#347): every dispatched run finalizes here.
             // ONE tamper-evident audit record per run — non-fatal by contract.
             recordDispatchedRun({ agent: ranAgent, version: ranVersion ?? 'unknown', mode, cwd, exitCode });
@@ -1470,6 +1508,11 @@ export function registerRunCommand(program) {
         catch (err) {
             cleanupWorkflowMcpConfig();
             cleanupWorkflowSubagents();
+            // An agent that committed then crashed is the case where stranded work
+            // matters most — warn before exiting the error path too.
+            if (shouldWarnUnpushed(mode, resolveInteractive(execOptions))) {
+                await warnUnpushedWork(cwd);
+            }
             console.error(chalk.red(`Failed to execute ${agent}: ${err.message}`));
             process.exit(1);
         }

package/dist/commands/factory.js

@@ -1,13 +1,10 @@
 import chalk from 'chalk';
+import { die } from '../lib/format.js';
 import * as fs from 'fs';
 import * as path from 'path';
 import { homedir } from 'os';
 import { betaEnableHint, isBetaEnabled } from '../lib/beta.js';
 import { insertTask } from '../lib/cloud/store.js';
-function die(msg, code = 1) {
-    console.error(chalk.red(msg));
-    process.exit(code);
-}
 function requireFactoryUrl() {
     const url = process.env.FACTORY_FLOOR_URL;
     if (!url) {

package/dist/commands/inspect.js

@@ -17,6 +17,7 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 import chalk from 'chalk';
+import { truncate, termLink } from '../lib/format.js';
 import * as yaml from 'yaml';
 import { AGENTS, getCliState, resolveAgentName } from '../lib/agents.js';
 import { supports } from '../lib/capabilities.js';
@@ -1216,12 +1217,6 @@ function readFirstProseLine(p) {
     return '';
 }
 // ─── OSC-8 + path helpers ────────────────────────────────────────────────────
-function termLink(text, filePath) {
-    if (!filePath || !process.stdout.isTTY)
-        return text;
-    const url = `file://${filePath}`;
-    return `\x1b]8;;${url}\x1b\\${text}\x1b]8;;\x1b\\`;
-}
 function linkTarget(p) {
     if (!p)
         return '';
@@ -1271,8 +1266,3 @@ function safeCountSessions(agent) {
         return 0;
     }
 }
-function truncate(s, n) {
-    if (s.length <= n)
-        return s;
-    return s.slice(0, n - 1) + '…';
-}

package/dist/commands/mcp.js

@@ -1,4 +1,5 @@
 import chalk from 'chalk';
+import { truncate } from '../lib/format.js';
 import ora from 'ora';
 import { checkbox } from '@inquirer/prompts';
 import { capableAgents, isCapable } from '../lib/capabilities.js';
@@ -764,7 +765,7 @@ function buildMcpRows(opts) {
         const displayCommand = declaredCommand || firstCommand;
         rows.push({
             name,
-            description: displayCommand ? truncateString(displayCommand, 60) : '',
+            description: displayCommand ? truncate(displayCommand, 60) : '',
             extra: source,
             targets,
             buildDetail: () => formatMcpDetail(name, source, centralConfig, manifestConfig, displayCommand, targets),
@@ -811,8 +812,3 @@ function formatMcpDetail(name, source, centralConfig, manifestConfig, command, t
     lines.push(buildTargetsSection(targets));
     return lines.join('\n');
 }
-function truncateString(s, max) {
-    if (s.length <= max)
-        return s;
-    return s.slice(0, max - 1) + '…';
-}

package/dist/commands/message.js

@@ -1,13 +1,10 @@
 import chalk from 'chalk';
+import { die } from '../lib/format.js';
 import { getActiveSessions } from '../lib/session/active.js';
 import { getTaskById, updateTaskStatus } from '../lib/cloud/store.js';
 import { resolveProvider } from '../lib/cloud/registry.js';
 import { mailboxDir, enqueue } from '../lib/mailbox.js';
 import { resolveMessageTarget } from '../lib/mailbox-target.js';
-function die(msg, code = 1) {
-    console.error(chalk.red(msg));
-    process.exit(code);
-}
 export function registerMessageCommand(program) {
     program
         .command('message <target> <text>')

package/dist/commands/profiles.js

@@ -7,7 +7,7 @@
  * through a standard agent CLI with no local proxy.
  */
 import chalk from 'chalk';
-import * as fs from 'fs';
+import { readStdinSync } from '../lib/format.js';
 import { spawn } from 'child_process';
 import { listProfiles, readProfile, writeProfile, deleteProfile, profileExists, profileFromPreset, validateProfileName, getPresetForProfile, } from '../lib/profiles.js';
 import { getPreset, listPresets, expandPreset } from '../lib/profiles-presets.js';
@@ -41,23 +41,6 @@ async function promptForSecret(message) {
     return await password({ message, mask: true });
 }
 /** Read all available data from stdin synchronously, trimmed. */
-function readStdinSync() {
-    const chunks = [];
-    const buf = Buffer.alloc(65536);
-    while (true) {
-        let bytesRead;
-        try {
-            bytesRead = fs.readSync(0, buf, 0, buf.length, null);
-        }
-        catch {
-            break;
-        }
-        if (bytesRead === 0)
-            break;
-        chunks.push(Buffer.from(buf.subarray(0, bytesRead)));
-    }
-    return Buffer.concat(chunks).toString('utf-8').trim();
-}
 /** Ensure a provider API key exists in keychain, prompting or reading stdin if missing. */
 async function ensureProviderToken(provider, signupUrl, fromStdin) {
     const item = keychainItemName(provider);

package/dist/commands/repo.js

@@ -1,4 +1,5 @@
 import chalk from 'chalk';
+import { visibleWidth, padVisible } from '../lib/format.js';
 import ora from 'ora';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -26,7 +27,7 @@ function resolveRepoPath(target) {
     return path.join(HOME, `.agents-${trimmed}`);
 }
 import { applyExtraAliasToVersions, ensureAgentsDir, getExtraRepoDir, getSystemAgentsDir, getUserAgentsDir, readMeta, resolveExtraRepoDir, updateMeta, } from '../lib/state.js';
-import { parseSource, pullRepo, commitAndPush, isGitRepo, isSystemRepoOrigin } from '../lib/git.js';
+import { parseSource, pullRepo, commitAndPush, isGitRepo, isSystemRepoOrigin, adoptRepo } from '../lib/git.js';
 import { DEFAULT_SYSTEM_REPO } from '../lib/types.js';
 import { ALL_AGENT_IDS, isAgentName, resolveAgentName } from '../lib/agents.js';
 import { refresh } from '../lib/refresh.js';
@@ -218,14 +219,6 @@ async function diffResourceEntries(git, range) {
     }
     return out;
 }
-/** Visible character width of a string with embedded ANSI color codes. */
-function visibleWidth(s) {
-    return s.replace(/\[[0-9;]*m/g, '').length;
-}
-/** Pad string with trailing spaces to a target visible column width. */
-function padVisible(s, width) {
-    return s + ' '.repeat(Math.max(0, width - visibleWidth(s)));
-}
 /**
  * Read one repo's status into structured data: branch, resource-level sync (what
  * a pull/push would move), resource-level local edits, and remote URL + commit.
@@ -752,9 +745,9 @@ export function registerRepoCommands(program) {
         await toggle(alias, false);
     });
     repoCmd
-        .command('pull [alias]')
-        .description('Pull updates. Aliases: "system" (~/.agents/.system/), "user" (~/.agents/), or any registered extra. No arg pulls all.')
-        .action(async (alias) => {
+        .command('pull [alias] [url]')
+        .description('Pull updates. Aliases: "system" (~/.agents/.system/), "user" (~/.agents/), or any registered extra. No arg pulls all. Pass a git URL to git-back a not-yet-cloned user repo: "agents repo pull user <url>".')
+        .action(async (alias, url) => {
         const targets = collectRepoTargets(alias);
         if (!targets) {
             process.exitCode = 1;
@@ -766,8 +759,34 @@ export function registerRepoCommands(program) {
         }
         for (const t of targets) {
             if (!fs.existsSync(t.dir) || !isGitRepo(t.dir)) {
-                console.log(chalk.yellow(`  ${t.alias}: not a git repo, skipping`));
-                continue;
+                // A plain (never-cloned) user repo — setup makes ~/.agents a bare dir and
+                // never git-clones it (state.ts ensureAgentsDir), so a fresh/Windows box
+                // silently falls out of config sync. If a URL was passed, git-back it in
+                // place (keeping local files, backing up any that differ); else guide the
+                // user. Only the USER repo gets this — system is cloned by setup, extras
+                // by `repo add`.
+                if (t.alias === 'user' && url) {
+                    const spinner = ora(`Git-backing ${t.dir} from ${url}...`).start();
+                    const res = await adoptRepo(url, t.dir);
+                    if (!res.success) {
+                        spinner.fail(`user: could not git-back — ${res.error}`);
+                        process.exitCode = 1;
+                        continue;
+                    }
+                    spinner.succeed(`user: git-backed -> ${res.commit}`);
+                    if (res.backedUp.length > 0) {
+                        console.log(chalk.yellow(`  backed up ${res.backedUp.length} locally-modified file(s) to ${res.backupDir}`));
+                        console.log(chalk.gray(`  (${res.backedUp.slice(0, 5).join(', ')}${res.backedUp.length > 5 ? ', …' : ''})`));
+                    }
+                    // Now a git repo — fall through to the normal pull below.
+                }
+                else {
+                    console.log(chalk.yellow(`  ${t.alias}: not a git repo, skipping`));
+                    if (t.alias === 'user') {
+                        console.log(chalk.gray('  git-back it from your config remote: agents repo pull user <git-url>'));
+                    }
+                    continue;
+                }
             }
             if (t.alias === 'system') {
                 // Skip system repo unless explicitly requested

package/dist/commands/resource-view.d.ts

@@ -58,3 +58,4 @@ export declare function resourceLayout(cols: number, o: {
 }): ResourceLayout;
 /** Build the sync targets section showing version pills grouped by agent. */
 export declare function buildTargetsSection(targets: SyncTarget[]): string;
+/** Pad a string to a fixed width, accounting for ANSI escape codes in length calculation. */

package/dist/commands/resource-view.js

@@ -7,6 +7,7 @@
  * filtering, and paging.
  */
 import chalk from 'chalk';
+import { truncate, padVisible } from '../lib/format.js';
 import { agentLabel } from '../lib/agents.js';
 import { itemPicker } from '../lib/picker.js';
 import { isInteractiveTerminal, isPromptCancelled, printWithPager } from './utils.js';
@@ -65,15 +66,15 @@ function filterRows(rows, query) {
 }
 /** Row label rendered inside the picker list. */
 function formatPickerRow(row, opts) {
-    const name = chalk.cyan(padRight(row.name, 22));
+    const name = chalk.cyan(padVisible(row.name, 22));
     const extra = opts.extraLabel
-        ? chalk.gray(padRight(row.extra ?? '-', 10))
+        ? chalk.gray(padVisible(row.extra ?? '-', 10))
         : '';
     const extra2 = opts.extra2Label
-        ? chalk.gray(padRight(row.extra2 ?? '-', 16))
+        ? chalk.gray(padVisible(row.extra2 ?? '-', 16))
         : '';
     const descRaw = row.description ? truncate(row.description, 40) : '';
-    const desc = padRight(chalk.gray(descRaw), 42);
+    const desc = padVisible(chalk.gray(descRaw), 42);
     const sync = formatSyncSummary(row.targets, opts);
     return `${name} ${extra}${extra2}${desc} ${sync}`;
 }
@@ -252,16 +253,3 @@ function formatVersionPill(t) {
     }
 }
 /** Pad a string to a fixed width, accounting for ANSI escape codes in length calculation. */
-function padRight(s, width) {
-    // Strip ANSI for length calc
-    const raw = s.replace(/\x1b\[[0-9;]*m/g, '');
-    if (raw.length >= width)
-        return s;
-    return s + ' '.repeat(width - raw.length);
-}
-/** Truncate a string to a maximum length, appending an ellipsis if needed. */
-function truncate(s, max) {
-    if (s.length <= max)
-        return s;
-    return s.slice(0, max - 1) + '…';
-}

package/dist/commands/secrets.d.ts

@@ -9,6 +9,7 @@ import { type Command } from 'commander';
 import { SSH_TARGET_RE, assertValidSshTarget } from '../lib/ssh-exec.js';
 import { quoteWin32ExecArg } from '../lib/platform/index.js';
 import { type SecretsBundle, type SecretsPolicy } from '../lib/secrets/bundles.js';
+/** Read all available data from stdin synchronously, trimmed. */
 /**
  * Read the raw `.env` text for `import --from <path|->`. A `-` reads the .env
  * from stdin (the SSH push path: `export --host` pipes the resolved dotenv over

package/dist/commands/secrets.js

@@ -7,6 +7,7 @@
  */
 import { Option } from 'commander';
 import chalk from 'chalk';
+import { padVisible, readStdinSync } from '../lib/format.js';
 import { terminalWidth, truncateToWidth, stringWidth } from '../lib/session/width.js';
 import * as fs from 'fs';
 import { SSH_TARGET_RE, assertValidSshTarget, sshExec } from '../lib/ssh-exec.js';
@@ -125,23 +126,6 @@ async function resolveVault(vaultOpt) {
     });
 }
 /** Read all available data from stdin synchronously, trimmed. */
-function readStdinSync() {
-    const chunks = [];
-    const buf = Buffer.alloc(65536);
-    while (true) {
-        let bytesRead;
-        try {
-            bytesRead = fs.readSync(0, buf, 0, buf.length, null);
-        }
-        catch {
-            break;
-        }
-        if (bytesRead === 0)
-            break;
-        chunks.push(Buffer.from(buf.subarray(0, bytesRead)));
-    }
-    return Buffer.concat(chunks).toString('utf-8').trim();
-}
 /**
  * Read the raw `.env` text for `import --from <path|->`. A `-` reads the .env
  * from stdin (the SSH push path: `export --host` pipes the resolved dotenv over
@@ -257,17 +241,6 @@ async function browseRemote(targets, args, tty) {
         process.exit(1);
 }
 /** Strip ANSI escape sequences so padding can be computed on visible width. */
-function visibleWidth(s) {
-    // eslint-disable-next-line no-control-regex
-    return s.replace(/\x1b\[[0-9;]*m/g, '').length;
-}
-/** padEnd that respects ANSI color codes (chalk-wrapped strings have invisible bytes). */
-function padVisible(s, n) {
-    const w = visibleWidth(s);
-    if (w >= n)
-        return s;
-    return s + ' '.repeat(n - w);
-}
 /** Render an ISO-8601 timestamp as a compact relative age: "now", "5m", "1h", "3d", "2w", "4mo", "1y". */
 function relativeAge(iso) {
     const t = Date.parse(iso);

package/dist/commands/sessions-picker.js

@@ -7,6 +7,7 @@
  */
 import fs from 'node:fs';
 import chalk from 'chalk';
+import { truncate, humanDuration } from '../lib/format.js';
 import { parseSession, sanitizeForTerminal } from '../lib/session/parse.js';
 import { cleanSessionPrompt, extractSessionTopic } from '../lib/session/prompt.js';
 import { linkPath, relativeToCwd } from '../lib/session/render.js';
@@ -154,21 +155,6 @@ function extractTiming(events) {
     const dur = Number.isNaN(lastMs) ? undefined : humanDuration(Math.max(0, lastMs - firstMs));
     return { startedAgo: ago, duration: dur };
 }
-function humanDuration(ms) {
-    const s = Math.floor(ms / 1000);
-    if (s < 60)
-        return `${s}s`;
-    const m = Math.floor(s / 60);
-    if (m < 60)
-        return `${m}m`;
-    const h = Math.floor(m / 60);
-    const mm = m % 60;
-    if (h < 24)
-        return mm ? `${h}h ${mm}m` : `${h}h`;
-    const d = Math.floor(h / 24);
-    const hh = h % 24;
-    return hh ? `${d}d ${hh}h` : `${d}d`;
-}
 function countMessages(events) {
     return events.filter(e => e.type === 'message').length;
 }
@@ -364,9 +350,6 @@ function renderTodos(todos, termWidth) {
     }
     return out;
 }
-function truncate(s, max) {
-    return s.length > max ? s.slice(0, max - 1) + '…' : s;
-}
 /** Show an interactive session picker and return the selected session with its action (resume or view). */
 export async function sessionPicker(config) {
     const picked = await itemPicker({

package/dist/commands/sessions.js

@@ -12,6 +12,7 @@ import * as os from 'os';
 import * as path from 'path';
 import { spawn } from 'child_process';
 import chalk from 'chalk';
+import { truncate, padRight } from '../lib/format.js';
 import ora from 'ora';
 import { SESSION_AGENTS } from '../lib/session/types.js';
 import { discoverArtifacts, readArtifact, resolveArtifact } from '../lib/session/artifacts.js';
@@ -1349,8 +1350,11 @@ async function renderSession(session, mode, filters, options = {}) {
         process.stdout.write(renderMarkdown(renderConversationMarkdown(events, { redact: options.noRedact !== true })));
         return;
     }
-    // json — no header, raw events only (pipeable)
-    process.stdout.write(renderJson(events));
+    // json — normalized events plus the durable session signals from the state
+    // engine (plan text, PR, worktree, ticket). Pre-1.20.51 emitted a bare event
+    // array; consumers that JSON.parse this now read `output.events` for the
+    // array. See issue #743 (plan surfaced) and CHANGELOG for the shape change.
+    process.stdout.write(renderJson(events, session));
 }
 function renderTopicCell(label, topic, query, visibleWidth, paddedWidth) {
     const lbl = (label ?? '').trim();
@@ -2289,9 +2293,3 @@ function formatAbsoluteTime(isoTimestamp) {
     const mm = String(d.getMinutes()).padStart(2, '0');
     return `${months[d.getMonth()]} ${d.getDate()} ${hh}:${mm}`;
 }
-function padRight(s, width) {
-    return s.length >= width ? s : s + ' '.repeat(width - s.length);
-}
-function truncate(s, max) {
-    return s.length > max ? s.slice(0, max - 1) + '.' : s;
-}

package/dist/commands/teams-picker.js

@@ -7,6 +7,7 @@
  * activity for each team.
  */
 import chalk from 'chalk';
+import { relTime, truncate, humanDuration } from '../lib/format.js';
 import { itemPicker } from '../lib/picker.js';
 const AGENT_LABEL = {
     claude: 'Claude',
@@ -26,23 +27,6 @@ function statusColor(status) {
         default: return chalk.white;
     }
 }
-function relTime(iso) {
-    const secs = Math.floor((Date.now() - new Date(iso).getTime()) / 1000);
-    if (secs < 10)
-        return 'just now';
-    if (secs < 60)
-        return `${secs}s ago`;
-    if (secs < 3600)
-        return `${Math.floor(secs / 60)}m ago`;
-    if (secs < 86400)
-        return `${Math.floor(secs / 3600)}h ago`;
-    return `${Math.floor(secs / 86400)}d ago`;
-}
-function truncate(s, n) {
-    if (s.length <= n)
-        return s;
-    return s.slice(0, n - 1) + '…';
-}
 function firstLine(s) {
     // Collapse to the first non-empty line so multi-line messages (markdown,
     // code blocks) render cleanly inside a one-line preview slot.
@@ -120,21 +104,6 @@ function formatComposition(agents) {
         .map(([type, n]) => (n === 1 ? type : `${type}×${n}`));
     return parts.join(' ');
 }
-function humanDuration(ms) {
-    const s = Math.floor(ms / 1000);
-    if (s < 60)
-        return `${s}s`;
-    const m = Math.floor(s / 60);
-    if (m < 60)
-        return `${m}m`;
-    const h = Math.floor(m / 60);
-    const mm = m % 60;
-    if (h < 24)
-        return mm ? `${h}h${mm}m` : `${h}h`;
-    const d = Math.floor(h / 24);
-    const hh = h % 24;
-    return hh ? `${d}d${hh}h` : `${d}d`;
-}
 function runtimeSpan(t) {
     const startMs = new Date(t.created_at).getTime();
     const endMs = new Date(t.modified_at).getTime();