@phnx-labs/agents-cli 1.22.38 → 1.22.40

package/dist/commands/factory.js

@@ -5,7 +5,7 @@ import * as path from 'path';
 import { homedir } from 'os';
 import { betaEnableHint, isBetaEnabled } from '../lib/beta.js';
 import { insertTask } from '../lib/cloud/store.js';
-import { emit } from '../lib/events.js';
+import { emit } from '../lib/feed/events.js';
 import { buildFactorySnapshot } from '../lib/factory/snapshot.js';
 function requireFactoryUrl() {
     const url = process.env.FACTORY_FLOOR_URL;

package/dist/commands/feed.d.ts

@@ -2,7 +2,7 @@
  * `agents feed` -- operator inbox + agent status posts.
  *
  * Default (`agents feed`): list open blocks (decisions agents are waiting on).
- * Aggregates block records from the local feed store and, with --host, from
+ * Aggregates block records from the local feed store and, with --device, from
  * reachable remote hosts via SSH passthrough. Each block carries enough
  * identity for `agents message` to route a reply back to the right agent.
  *
@@ -16,7 +16,7 @@
  * Humans watch via the feed activity lane.
  */
 import type { Command } from 'commander';
-import { type OpenBlock } from '../lib/feed.js';
+import { type OpenBlock } from '../lib/feed/feed.js';
 import { type OutcomeGroup, type SessionOutcomeHint } from '../lib/feed-outcome.js';
 import { filterBlocksForFeed } from '../lib/ask-classifier.js';
 import { type FeedSessionSignal } from '../lib/feed-ranking.js';

package/dist/commands/feed.js

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
-import { ensureFeedPublishHook, listAskStats, listBlocks, recordNotified, buildDeclaredBlock, publishBlock, } from '../lib/feed.js';
-import { ensureActivityLogHook, readRecentActivity, formatActivityLine, formatProgressUpdate, mergeActivityEvents, parseActivityPayload, } from '../lib/activity.js';
+import { ensureFeedPublishHook, listAskStats, listBlocks, recordNotified, buildDeclaredBlock, publishBlock, } from '../lib/feed/feed.js';
+import { ensureActivityLogHook, readRecentActivity, formatActivityLine, formatProgressUpdate, mergeActivityEvents, parseActivityPayload, } from '../lib/feed/activity.js';
 import { projectKeyFromCwd } from '../lib/project-key.js';
 import { postFeedStatus } from '../lib/feed-post.js';
 import { parseFeedPostLevel, planFeedBroadcast, runFeedBroadcast, effectiveBroadcastConfig, withDesktopNotify, blockBroadcastContext, blockDeliveryFailure, } from '../lib/feed-broadcast.js';
@@ -318,8 +318,7 @@ export function registerFeedCommand(program) {
         .option('--flat', 'List one block per agent instead of grouping by outcome')
         .option('--all', 'Include stalls/FYIs that policy would suppress (default: hide them)')
         .option('--local', 'Only this machine -- skip the cross-machine SSH fan-out')
-        .option('-H, --host <target...>', 'Scope to remote machine(s) over SSH; repeatable')
-        .option('--device <target...>', 'Alias for --host; repeatable')
+        .option('-D, --device <target...>', 'Scope to remote machine(s) over SSH; repeatable')
         .option('--project <name>', 'Scope the feed to one project/repo (matches cwd basename, case-insensitive)')
         .option('--dispatch', 'Run stall suppression + default-on-no-answer policy and urgent notifications')
         .option('--pause <id>', 'Pause a runaway/needy local process (SIGSTOP) or cancel a cloud task')
@@ -434,11 +433,9 @@ export function registerFeedCommand(program) {
         }
     });
     feed.action(async (opts) => {
-        if (opts.device?.length)
-            opts.host = [...(opts.host ?? []), ...opts.device];
         const self = machineId();
         const filter = resolveFeedFilter(opts.filter);
-        const includeLocal = shouldIncludeLocalFeed(opts.host, self);
+        const includeLocal = shouldIncludeLocalFeed(opts.device, self);
         const setupWarnings = [];
         if (includeLocal) {
             // Feed and activity hooks are independent -- install both, and register
@@ -453,7 +450,7 @@ export function registerFeedCommand(program) {
             if (!hookInstall.error || !activityInstall.error) {
                 const [{ iterHooksCapableVersions, parseHookManifest, registerHooksToSettings }, { getVersionHomePath }] = await Promise.all([
                     import('../lib/hooks.js'),
-                    import('../lib/versions.js'),
+                    import('../lib/installations/versions.js'),
                 ]);
                 const manifest = parseHookManifest({ warn: false });
                 for (const { agent, version } of iterHooksCapableVersions({ agent: 'claude' })) {
@@ -470,7 +467,7 @@ export function registerFeedCommand(program) {
             if (filter === 'all') {
                 console.log();
                 renderUpdatesView(await gatherStatusPosts({
-                    limit: UPDATES_VIEW_LIMIT, hosts: opts.host, local: opts.local, includeLocal, self, project: opts.project,
+                    limit: UPDATES_VIEW_LIMIT, hosts: opts.device, local: opts.local, includeLocal, self, project: opts.project,
                 }), opts.project);
                 return;
             }
@@ -487,7 +484,7 @@ export function registerFeedCommand(program) {
             }
             const updates = await gatherStatusPosts({
                 limit: opts.json ? UPDATES_JSON_LIMIT : UPDATES_VIEW_LIMIT,
-                hosts: opts.host,
+                hosts: opts.device,
                 local: opts.local,
                 includeLocal,
                 self,
@@ -557,8 +554,8 @@ export function registerFeedCommand(program) {
         let blocks = visibleLocalBlocks;
         const forceLocal = opts.local === true || process.env[FEED_NO_FANOUT_ENV] === '1';
         if (!forceLocal) {
-            const remoteHosts = remoteFeedHostsToDial(opts.host, self);
-            if (!opts.host?.length || (remoteHosts && remoteHosts.length > 0)) {
+            const remoteHosts = remoteFeedHostsToDial(opts.device, self);
+            if (!opts.device?.length || (remoteHosts && remoteHosts.length > 0)) {
                 const remote = await gatherRemoteAgentsJson({
                     // Bare --json stays a block array so older peers and scripts keep working.
                     args: ['feed', '--json'],

package/dist/commands/fleet-capture.js

@@ -10,39 +10,32 @@
  * command just gathers inputs and persists via `updateMeta`.
  */
 import * as fs from 'fs';
-import * as path from 'path';
 import chalk from 'chalk';
 import * as yaml from 'yaml';
 import { loadDevices, isControlDevice } from '../lib/devices/registry.js';
-import { readMeta, updateMeta, getDeviceMetaPath } from '../lib/state.js';
+import { readMeta, updateMeta, getDevicePinsPath } from '../lib/state.js';
+import { machineId } from '../lib/machine-id.js';
 import { listBundles } from '../lib/secrets/bundles.js';
-import { listJobs } from '../lib/routines.js';
+import { listJobs } from '../lib/scheduling/routines.js';
 import { captureFleet } from '../lib/fleet/capture.js';
-/** The committed per-device pin dir: `~/.agents/devices/`. Derived from the
- * device-meta path so it honors any AGENTS_HOME override the same way. */
-function devicesPinDir() {
-    return path.dirname(path.dirname(getDeviceMetaPath()));
-}
-/** Read `devices/<name>/agents.yaml` pin files into `name -> [id@latest]`. Only
- * used with `--from-pins`; keeps capture zero-SSH by reading committed state. */
+/** Read THIS machine's pins file into `name -> [id@latest]`. Only used with
+ * `--from-pins`; keeps capture zero-SSH by reading local state. Pins are
+ * machine-local runtime state (`.history/devices/pins-<host>.json`, untracked)
+ * — peer pins never sync, so only this machine contributes; peers inherit the
+ * captured fleet defaults. */
 function agentsFromPins(names) {
-    const dir = devicesPinDir();
-    const out = {};
-    for (const name of names) {
-        const p = path.join(dir, name, 'agents.yaml');
-        if (!fs.existsSync(p))
-            continue;
-        try {
-            const doc = yaml.parse(fs.readFileSync(p, 'utf-8'));
-            const ids = doc?.agents ? Object.keys(doc.agents) : [];
-            if (ids.length > 0)
-                out[name] = ids.map((id) => `${id}@latest`);
-        }
-        catch {
-            /* skip an unparsable pin file — capture is best-effort per device */
-        }
+    const self = machineId();
+    if (!names.includes(self))
+        return {};
+    let pins;
+    try {
+        pins = JSON.parse(fs.readFileSync(getDevicePinsPath(), 'utf-8'));
+    }
+    catch {
+        return {}; // no pins file (or unparsable) — capture is best-effort
     }
-    return out;
+    const ids = pins?.agents ? Object.keys(pins.agents) : [];
+    return ids.length > 0 ? { [self]: ids.map((id) => `${id}@latest`) } : {};
 }
 async function runCapture(opts) {
     const meta = readMeta();
@@ -56,6 +49,11 @@ async function runCapture(opts) {
         names = names.filter((n) => n === opts.device);
         if (names.length === 0)
             throw new Error(`Device '${opts.device}' is not a registered device.`);
+        // --from-pins reads the LOCAL pins file only (peer pins are machine-local
+        // runtime state and never sync), so targeting a peer would record nothing.
+        if (opts.fromPins && opts.device !== machineId()) {
+            throw new Error(`--from-pins can only read THIS machine's pins ('${machineId()}') — peer pins are machine-local and never sync. Run it on '${opts.device}' itself, or drop --device.`);
+        }
     }
     // Defaults seeded from the source machine's own installed agents.
     const sourceAgents = Object.keys(meta.agents ?? {}).sort();
@@ -93,7 +91,7 @@ export function registerFleetCaptureCommand(devicesCmd) {
         .command('capture')
         .description('Snapshot the live environment (roster names, agents, browser, secret-bundle names, routines) into agents.yaml fleet:.')
         .option('--dry-run', 'print the fleet: block that would be written, and exit')
-        .option('--from-pins', 'record per-device agents from committed devices/<name>/agents.yaml')
+        .option('--from-pins', "record THIS machine's pinned agents (peer pins are machine-local and never sync)")
         .option('--device <name>', 'capture a single device')
         .action(async (opts) => {
         try {

package/dist/commands/focus.d.ts

@@ -18,11 +18,10 @@ import { type ActiveSession } from '../lib/session/active.js';
 import { type SessionMeta } from '../lib/session/types.js';
 import { type LiveStatusFilter } from './sessions.js';
 import { openSurfaces, type Backend } from '../lib/terminal/index.js';
-/** Options for `sessions focus` — device/host scope + the `--active` live-state filters. */
+/** Options for `sessions focus` — device scope + the `--active` live-state filters. */
 export interface FocusOptions {
     local?: boolean;
     attachOnly?: boolean;
-    host?: string[];
     device?: string[];
     active?: boolean;
     agent?: string;
@@ -60,7 +59,7 @@ export interface FocusOptions {
  * when they appear after `focus`. Fold only values explicitly provided there
  * into the child options; child defaults (limit/sort) otherwise stay intact. */
 export declare function inheritFocusOptions(child: FocusOptions, parent?: Command): FocusOptions;
-/** `--device` is an alias of `--host`; both are repeatable. Merge into one host list. */
+/** Collect device targets from `--device`; repeatable. Returns a host list. */
 export declare function mergeFocusHosts(opts: FocusOptions): string[];
 /** Picker header that reflects the active filter + device, e.g. "Focus orphaned sessions on yosemite-s0:". */
 export declare function focusHeader(statuses: LiveStatusFilter[], hosts: string[]): string;

package/dist/commands/focus.js

@@ -17,12 +17,13 @@ import chalk from 'chalk';
 import { confirm } from '@inquirer/prompts';
 import { gatherLiveTargets, pickLiveTarget, pickLiveTargets, jumpTo, probeAttachRail, refuseFallback } from './go.js';
 import { sessionProcessIsLocal, sessionProcessHost, shortIdFromName } from '../lib/session/active.js';
-import { attachTmux, getDefaultSocketPath, hasSession, runTmux } from '../lib/tmux/index.js';
+import { attachTmux, ensureSessionHookRepaired, getDefaultSocketPath, hasSession, runTmux } from '../lib/tmux/index.js';
 import { isAgentTmuxAlias } from '../lib/session/types.js';
 import { buildSessionRecoveryCommand, filterSessionsByQuery, formatLiveStatusHeadline, formatPickerLabel, isRunningLiveSession, pickerColumnsFor, resumeSessionInPlace, resolveSessionMetadataValue, resolveSessionAgentName, requestedLiveStatuses, } from './sessions.js';
 import { resolveBackend, CONFIRM_THRESHOLD } from './sessions-resume.js';
 import { runOnPeer } from '../lib/session/remote-list.js';
-import { discoverSessions } from '../lib/session/discover.js';
+import { discoverSessions, resolveIndexedSessionById } from '../lib/session/discover.js';
+import { machineId } from '../lib/session/sync/config.js';
 import { collectSessionCandidates, normalizeDeviceSeed } from './sessions-browser.js';
 import { buildPreview } from './sessions-picker.js';
 import { multiItemPicker } from '../lib/picker.js';
@@ -32,7 +33,7 @@ import { openSurfaces, currentContext, availableBackends, detectCurrentBackend,
 import { isInteractiveTerminal, isPromptCancelled } from './utils.js';
 import { setHelpSections } from '../lib/help.js';
 const INHERITED_FOCUS_OPTIONS = [
-    'local', 'host', 'device', 'active', 'agent',
+    'local', 'device', 'active', 'agent',
     'claude', 'codex', 'kimi', 'antigravity', 'grok', 'opencode',
     'all', 'teams', 'inTeam', 'routine', 'project', 'skill', 'plugin',
     'since', 'until', 'limit', 'bookmarks', 'unmanaged', 'sort',
@@ -54,9 +55,9 @@ export function inheritFocusOptions(child, parent) {
     }
     return merged;
 }
-/** `--device` is an alias of `--host`; both are repeatable. Merge into one host list. */
+/** Collect device targets from `--device`; repeatable. Returns a host list. */
 export function mergeFocusHosts(opts) {
-    return [...(opts.host ?? []), ...(opts.device ?? [])];
+    return [...(opts.device ?? [])];
 }
 /** Picker header that reflects the active filter + device, e.g. "Focus orphaned sessions on yosemite-s0:". */
 export function focusHeader(statuses, hosts) {
@@ -81,8 +82,7 @@ export function registerFocusCommand(program) {
         .argument('[selector]', 'Session id/prefix, agent@version, or topic/path search')
         .option('--local', 'Only this machine (skip the cross-host sweep)')
         .option('--attach-only', 'Attach only — never open a new tab / resume a copy (the old `go` behavior)')
-        .option('-H, --host <target...>', 'Scope the picker to live sessions on these devices (host alias or user@host; repeatable)')
-        .option('--device <target...>', 'Alias for --host (device alias from `agents devices`; repeatable)')
+        .option('-D, --device <target...>', 'Scope the picker to live sessions on these devices (device alias from `agents devices`, user@host; repeatable)')
         .option('--active', 'Only sessions present in the live roster')
         .option('-a, --agent <agent>', 'Filter by harness and recorded version (for example claude@latest)')
         .option('--claude', 'Shorthand for --agent claude')
@@ -143,7 +143,7 @@ export function registerFocusCommand(program) {
       - With no selector/filter, the picker shows the live fleet. An id focuses directly; agent@version and text selectors always show the preview picker.
       - A living tmux pane is JOINED (a second client, no fork). Dead/missing panes recover on the origin device: exact healthy origin uses native resume; otherwise a healthy version of the same harness receives /continue <id>.
       - An id/identity selector resolves across the whole reachable fleet on its own — you do NOT need --device to focus a session that lives on another box (same as resume/preview). --device only narrows the browsable picker and the agent/version resolution.
-      - --host/--device and the sessions-browser filters compose. latest/oldest resolve against each selected device's installed versions.
+      - --device and the sessions-browser filters compose. latest/oldest resolve against each selected device's installed versions.
       Lifecycle siblings (not synonyms):
         focus              attach if alive, otherwise recover (default "take me there")
         focus --attach-only  attach only; never fork (replaces go)
@@ -187,6 +187,27 @@ export async function focusAction(id, opts) {
             process.exitCode = 1;
             return;
         }
+        // RUSH-2477: an id selector for a LOCAL indexed session resolves against the
+        // WAL index alone — a plain read, no write-heavy discovery scan (none of
+        // `tryClaimScan`/`releaseScan`'s `BEGIN IMMEDIATE` writer lock) and no
+        // boot-time fleet SSH fan-out. This is the crash-restart storm path: dozens
+        // of `sessions resume <id>` at once must not each take the writer lock or
+        // dial the not-yet-up tailnet. A genuine miss, an ambiguous prefix, or a
+        // peer-owned row falls through to the fleet resolver below unchanged — the
+        // narrow win is the exact case the storm hits, with no behaviour change for
+        // a session that lives on another box.
+        if (idLookup && hosts.length === 0 && looksLikeIdSelector(textSelector)) {
+            const self = machineId();
+            const localMatch = dedupeSessionsByLogicalId(await resolveIndexedSessionById(textSelector), self);
+            if (localMatch.length === 1 && !sessionProcessHost(localMatch[0], self)) {
+                // Local live index only (ps/tmux, no fleet sweep) so a still-live pane is
+                // still joined instead of resumed as a copy; a crashed session has no live
+                // row and recovers in place.
+                const { activeById } = await gatherLiveTargets(true, { statuses: [] });
+                await focusResolvedSession(localMatch[0], activeById, self, fallback, opts.attachOnly === true);
+                return;
+            }
+        }
         const { sessions, liveById, self, unreachable } = await collectSessionCandidates({
             running: opts.active === true || statuses.length > 0,
             statuses,
@@ -437,12 +458,16 @@ async function attachLiveTmuxAlias(selector) {
         return true;
     }
     console.log(chalk.gray(`Attaching ${selector} — Ctrl-b d to detach.`));
+    // Repair a legacy/stale pane-died hook before handing the session to an
+    // attach client — the 5-min daemon reconcile that used to cover this was
+    // deleted; attach-time repair is what closes the gap now (RUSH-2435).
+    await ensureSessionHookRepaired(selector, socket);
     const code = await attachTmux({ socket, args: ['attach-session', '-t', `=${selector}`] });
     process.exitCode = code;
     return true;
 }
 function hasFocusFilters(opts, statuses) {
-    return statuses.length > 0 || !!(opts.active || opts.local || opts.host?.length || opts.device?.length || focusOptionAgent(opts) ||
+    return statuses.length > 0 || !!(opts.active || opts.local || opts.device?.length || focusOptionAgent(opts) ||
         opts.all || opts.teams || opts.inTeam || opts.routine || opts.project || opts.skill || opts.plugin ||
         opts.since || opts.until || opts.bookmarks || opts.unmanaged || (opts.sort && opts.sort !== 'recent'));
 }

package/dist/commands/go.js

@@ -28,7 +28,7 @@ import { isPromptCancelled } from './utils.js';
 import { focusAction } from './focus.js';
 import { machineId } from '../lib/session/sync/config.js';
 import { attachTmux, runTmux } from '../lib/tmux/binary.js';
-import { paneExitStatus } from '../lib/tmux/session.js';
+import { ensureSessionHookRepaired, paneExitStatus } from '../lib/tmux/session.js';
 import { getDefaultSocketPath } from '../lib/tmux/paths.js';
 import { sshExec, sshStream, assertValidSshTarget, shellQuote } from '../lib/ssh-exec.js';
 import { enumerateGhosttyTabs, assignGhosttyTabs } from '../lib/session/ghostty-tabs.js';
@@ -165,10 +165,15 @@ export async function buildLivePool(activeById, self) {
 }
 function synthMeta(s, self) {
     const remote = !sessionProcessIsLocal(s, self);
-    // For a local session, locate the real transcript on disk so the picker's
-    // buildPreview parses it directly (rich Prompt/Changes/Tools/Last response) —
-    // independent of the sessions DB. Remote transcripts live on the peer, so leave
-    // filePath empty and the preview shows a clean "not indexed here" note.
+    // For a local session, locate the real transcript so the picker's buildPreview
+    // parses it directly (rich Prompt/Changes/Tools/Last response) rather than
+    // rendering from the indexed digest. For Claude that resolves off disk; every
+    // other harness resolves the id THROUGH the session index (RUSH-2691), so a
+    // local non-Claude session the index has not reached yet yields '' here and
+    // gets the same clean "not indexed here" note as a remote one — which is the
+    // honest answer, since the pre-RUSH-2691 alternative was a co-located
+    // stranger's transcript. Remote transcripts live on the peer, so leave
+    // filePath empty there too.
     const filePath = remote ? '' : (findSessionFileForKind(s.kind, s.cwd, s.sessionId) ?? '');
     return {
         id: s.sessionId,
@@ -297,6 +302,11 @@ export async function jumpTo(s, self, fallback = refuseFallback) {
             return;
         }
         console.log(chalk.gray(`Attaching ${shortId(s)} (tmux ${tgt}) — Ctrl-b d to detach.`));
+        // Repair a legacy/stale pane-died hook before the attach client takes over
+        // — the 5-min daemon reconcile that used to cover this was deleted;
+        // attach-time repair is what closes the gap now (RUSH-2435).
+        if (session)
+            await ensureSessionHookRepaired(session, socket);
         process.exit(await attachTmux({ socket, args: ['attach-session', '-t', tgt] }));
     }
     // Path A: local Ghostty — focus its tab (Cmd+N via System Events).

package/dist/commands/harness.d.ts

@@ -6,9 +6,9 @@
  * (`agents run spark`) and syncs across devices via `agents repo push user`.
  *
  * Mechanism: harnesses ARE profiles (same ~/.agents/profiles/*.yml, same run
- * resolution). This command group is the harness-flavored surface over that
- * layer + a discovery `list` spanning custom harnesses, addable presets, and the
- * native harness registry. The `agents profiles` tree stays unchanged.
+ * resolution). This command group is the surface over that layer + a discovery
+ * `list` spanning custom harnesses, addable presets, and the native harness
+ * registry. The former top-level `agents profiles` tree was removed — use harness.
  */
 import type { Command } from 'commander';
 import { type AddProfileOptions } from './profiles.js';

package/dist/commands/harness.js

@@ -6,9 +6,9 @@
  * (`agents run spark`) and syncs across devices via `agents repo push user`.
  *
  * Mechanism: harnesses ARE profiles (same ~/.agents/profiles/*.yml, same run
- * resolution). This command group is the harness-flavored surface over that
- * layer + a discovery `list` spanning custom harnesses, addable presets, and the
- * native harness registry. The `agents profiles` tree stays unchanged.
+ * resolution). This command group is the surface over that layer + a discovery
+ * `list` spanning custom harnesses, addable presets, and the native harness
+ * registry. The former top-level `agents profiles` tree was removed — use harness.
  */
 import chalk from 'chalk';
 import { addProfile, ensureProviderToken, applyFromSecrets } from './profiles.js';
@@ -17,6 +17,8 @@ import { listProfiles, readProfile, writeProfile, deleteProfile, profileExists,
 import { listPresets, getPreset } from '../lib/profiles-presets.js';
 import { AGENTS, ALL_AGENT_IDS, resolveAgentName } from '../lib/agents.js';
 import { findAccount } from '../lib/account-registry.js';
+import { keychainItemName, setKeychainToken, deleteKeychainToken } from '../lib/secrets/profiles.js';
+import { readStdinSync } from '../lib/format.js';
 import { runWizardSteps, createSteps, editSteps, defaultWizardIO, } from './harness-wizard.js';
 /** Short capability summary for a native harness — its supported run modes. */
 function nativeModes(id) {
@@ -347,7 +349,7 @@ Examples:
   # Private OpenAI/Anthropic-compatible endpoint using an existing account
   agents harness add corp --host claude --model gpt-x --base-url https://gw.corp/v1 --account corp
 
-  # Custom harnesses are just profiles — this also works via 'agents profiles'
+  # Custom harnesses are named host+model pins — manage them with agents harness
 `);
     cmd
         .command('add [name]')
@@ -565,7 +567,7 @@ Examples:
     cmd
         .command('remove <name>')
         .alias('rm')
-        .description('Delete a custom harness (keychain token is kept).')
+        .description('Delete a custom harness (keychain token is kept — use `harness logout <provider>` to remove).')
         .action((name) => {
         const existed = deleteProfile(name);
         if (!existed) {
@@ -574,4 +576,50 @@ Examples:
         }
         console.log(chalk.green(`Harness '${name}' removed.`));
     });
+    cmd
+        .command('login <provider>')
+        .description('Store or rotate the API key for a provider (e.g., openrouter). Shared across harnesses using that provider.')
+        .option('--key-stdin', 'Read API key from stdin')
+        .action(async (provider, opts) => {
+        try {
+            const item = keychainItemName(provider);
+            let token;
+            if (opts.keyStdin) {
+                token = readStdinSync();
+                if (!token)
+                    throw new Error('No key received on stdin.');
+            }
+            else {
+                if (!isInteractiveTerminal()) {
+                    throw new Error('A secret is required but the shell is not interactive. Pipe the key via stdin (--key-stdin).');
+                }
+                const { password } = await import('@inquirer/prompts');
+                token = await password({ message: `Enter API key for ${provider}`, mask: true });
+            }
+            setKeychainToken(item, token);
+            console.log(chalk.green(`Stored in keychain: ${item}`));
+        }
+        catch (err) {
+            console.error(chalk.red(err.message));
+            process.exit(1);
+        }
+    });
+    cmd
+        .command('logout <provider>')
+        .description('Remove a stored provider key from keychain')
+        .action((provider) => {
+        try {
+            const item = keychainItemName(provider);
+            const existed = deleteKeychainToken(item);
+            if (!existed) {
+                console.error(chalk.yellow(`No keychain item '${item}' to remove.`));
+                process.exit(1);
+            }
+            console.log(chalk.green(`Removed keychain item: ${item}`));
+        }
+        catch (err) {
+            console.error(chalk.red(err.message));
+            process.exit(1);
+        }
+    });
 }

package/dist/commands/hooks.js

@@ -8,7 +8,7 @@ import { AGENTS, resolveAgentName, formatAgentError, agentLabel, } from '../lib/
 import { supports, capableAgents } from '../lib/capabilities.js';
 import { cloneRepo } from '../lib/git.js';
 import { discoverHooksFromRepo, installHooksCentrally, listCentralHooks, listInstalledHooksWithScope, getHookInfo, parseHookManifest, iterHooksCapableVersions, removeHookFromVersion, } from '../lib/hooks.js';
-import { listInstalledVersions, getGlobalDefault, syncResourcesToVersion, promptAgentVersionSelection, getVersionHomePath, resolveInstalledAgentTargets, } from '../lib/versions.js';
+import { listInstalledVersions, getGlobalDefault, syncResourcesToVersion, promptAgentVersionSelection, getVersionHomePath, resolveInstalledAgentTargets, } from '../lib/installations/versions.js';
 import { recordVersionResources } from '../lib/state.js';
 import { isPromptCancelled, isInteractiveTerminal, parseCommaSeparatedList, printWithPager, requireInteractiveSelection, promptRemovalTargets, resolveAgentTargetsAutoInstalling, resolveListFilterOrExit, } from './utils.js';
 /** Register the `agents hooks` command tree (list, add, remove, sync, prune, view). */

package/dist/commands/import.js

@@ -22,7 +22,7 @@
  */
 import { withIsolationBoundary } from '../lib/isolation-boundary-report.js';
 import { assertIsolationBoundary, createVersionedAlias } from '../lib/shims.js';
-import { markVersionIsolated } from '../lib/versions.js';
+import { markVersionIsolated } from '../lib/installations/versions.js';
 import chalk from 'chalk';
 import ora from 'ora';
 import * as fs from 'fs';
@@ -31,7 +31,7 @@ import * as path from 'path';
 import { confirm } from '@inquirer/prompts';
 import { MANAGED_AGENT_IDS } from '../lib/agents.js';
 import { AGENTS, getCliPath, getCliVersion, agentLabel, resolveAgentName, isAgentHardDeprecated, hardDeprecationError } from '../lib/agents.js';
-import { getVersionDir } from '../lib/versions.js';
+import { getVersionDir } from '../lib/installations/versions.js';
 import { finalizeImport, importAgentBinary, importAgentConfig, importInstallScriptBinary, seedIsolatedConfigFromLocal, isValidImportVersion, resolvePackageDirFromBinary, } from '../lib/import.js';
 import { isPromptCancelled, isInteractiveTerminal } from './utils.js';
 async function runImport(agentArg, opts) {

package/dist/commands/insights.d.ts

@@ -12,11 +12,11 @@
  *
  * Sibling observe verbs (stay separate — different questions):
  *
- *   agents cost       what you spent ($ and duration)
- *   agents output     what shipped (burn vs PRs and commits)
- *   agents usage      live quota headroom
- *   agents perf       latency (hooks, CLI commands, agent.run) — not popularity
- *   agents sessions stats  which skills/slash-commands were explicitly invoked
+ *   agents insights cost    what you spent ($ and duration)
+ *   agents insights output  what shipped (burn vs PRs and commits)
+ *   agents usage            live quota headroom
+ *   agents perf             latency (hooks, CLI commands, agent.run) — not popularity
+ *   agents sessions stats   which skills/slash-commands were explicitly invoked
  *
  * Why mix lives here (not a second top-level `trends`): two abstract "analytics"
  * nouns taught agents and humans to guess. One verb, two engines — cheap SQL mix

package/dist/commands/insights.js

@@ -12,11 +12,11 @@
  *
  * Sibling observe verbs (stay separate — different questions):
  *
- *   agents cost       what you spent ($ and duration)
- *   agents output     what shipped (burn vs PRs and commits)
- *   agents usage      live quota headroom
- *   agents perf       latency (hooks, CLI commands, agent.run) — not popularity
- *   agents sessions stats  which skills/slash-commands were explicitly invoked
+ *   agents insights cost    what you spent ($ and duration)
+ *   agents insights output  what shipped (burn vs PRs and commits)
+ *   agents usage            live quota headroom
+ *   agents perf             latency (hooks, CLI commands, agent.run) — not popularity
+ *   agents sessions stats   which skills/slash-commands were explicitly invoked
  *
  * Why mix lives here (not a second top-level `trends`): two abstract "analytics"
  * nouns taught agents and humans to guess. One verb, two engines — cheap SQL mix
@@ -47,6 +47,8 @@ import { formatUsd } from '../lib/pricing/index.js';
 import { formatDuration } from '../lib/session/render.js';
 import { terminalWidth, truncateToWidth, stringWidth, padToWidth } from '../lib/session/width.js';
 import { registerMixCommands } from '../lib/analytics/mix-commands.js';
+import { registerCostCommand } from './cost.js';
+import { registerOutputCommand } from './output.js';
 const execFileAsync = promisify(execFile);
 function collectAgent(value, previous) {
     return [...previous, value];
@@ -317,7 +319,7 @@ function renderReport(groups, dim, meta, actions, harnesses) {
     // shell command TEXT, and not every harness exposes it — the codex parser populates
     // `command` for `exec_command` but not plain `exec`, its dominant tool — so gate on
     // whether we had anything to search rather than on seeing a shell-shaped tool call.
-    // When we did, the count is real, and still disagrees with `agents output`, which
+    // When we did, the count is real, and still disagrees with `agents insights output`, which
     // counts deduped SHAs from git log.
     if (all.shellCommandsSeen > 0) {
         out.push(`  ${chalk.gray(`${all.gitCommits} commits · ${all.gitPushes} pushes (seen in shell commands)`)}`);
@@ -414,7 +416,7 @@ async function insightsAction(options) {
     // --since win so `--all --since 7d` is not silently contradictory.
     const since = options.since ?? (options.all ? 'all' : '30d');
     const sinceMs = since === 'all' ? undefined : parseTimeFilter(since);
-    // Refresh the index first, exactly as `agents cost` does, so a report never silently
+    // Refresh the index first, exactly as `agents insights cost` does, so a report never silently
     // describes a stale picture of disk.
     await discoverSessions({ all: true, since: since === 'all' ? undefined : since, limit: 1 });
     if (options.refresh)
@@ -569,7 +571,8 @@ function configureInsightsCommand(cmd) {
       Two paths under one verb:
         bare \`agents insights\`     — transcript behaviour (tools, friction, rhythm, by account)
         \`agents insights mix\`      — cheap counters from sessions.db + usage.db
-      Latency is \`agents perf\` (not mix). Quota is \`agents usage\`. Skill/slash popularity
+      Latency is \`agents perf\` (not mix). Quota is \`agents usage\`. Spend is
+      \`agents insights cost\`; shipped output is \`agents insights output\`. Skill/slash popularity
       is \`agents sessions stats\`. \`agents trends\` is a deprecated alias of the mix tree.
 
       The behavioural report parses in-scope transcripts once and caches facets; later runs
@@ -583,7 +586,10 @@ function configureInsightsCommand(cmd) {
     });
 }
 export function registerInsightsCommand(program) {
-    configureInsightsCommand(program.command('insights'));
+    const cmd = program.command('insights');
+    configureInsightsCommand(cmd);
+    registerCostCommand(cmd);
+    registerOutputCommand(cmd);
 }
 export function registerSessionsInsightsCommand(sessions) {
     configureInsightsCommand(sessions.command('insights'));

package/dist/commands/inspect.d.ts

@@ -14,8 +14,8 @@
 import { Command } from 'commander';
 import type { ManifestHook } from '../lib/types.js';
 import { type McpYamlConfig } from '../lib/mcp.js';
-import { type PluginResourceGroup } from '../lib/plugins.js';
-import { type JobConfig, type RunMeta } from '../lib/routines.js';
+import { type PluginResourceGroup } from '../lib/plugins/plugins.js';
+import { type JobConfig, type RunMeta } from '../lib/scheduling/routines.js';
 /** Resource kinds the inspect command can drill into. */
 declare const DRILLABLE_KINDS: readonly ["commands", "skills", "hooks", "mcp", "rules", "plugins", "workflows", "subagents", "routines"];
 type DrillableKind = typeof DRILLABLE_KINDS[number];
@@ -134,7 +134,6 @@ export declare function pathSize(p: string): {
     files: number;
 };
 /** Human byte size: "84 KB", "3.1 MB". */
-export declare function formatBytes(n: number): string;
 export interface ManifestSummary {
     /** `run.<agent>.strategy` pairs from agents.yaml. */
     strategies: Array<{