@phnx-labs/agents-cli 1.22.39 → 1.22.41

package/dist/commands/inspect.js

@@ -17,7 +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 { truncate, termLink, formatBytes } from '../lib/format.js';
 import * as yaml from 'yaml';
 import { AGENTS, getCliState, resolveAgentName } from '../lib/agents.js';
 import { supports } from '../lib/capabilities.js';
@@ -25,13 +25,13 @@ import { resolveConfiguredModel } from '../lib/models.js';
 import { getAgentModesCatalog } from '../lib/agent-modes.js';
 import { resolveSingleAgentTarget, AgentSpecError } from '../lib/agent-spec/index.js';
 import { readMeta, getUserAgentsDir, getSystemAgentsDir, getProjectAgentsDir, getEnabledExtraRepos, } from '../lib/state.js';
-import { getVersionHomePath, isVersionIsolated, getIsolatedDefault, } from '../lib/versions.js';
+import { getVersionHomePath, isVersionIsolated, getIsolatedDefault, } from '../lib/installations/versions.js';
 import { getShimsDir, getVersionedAliasPath } from '../lib/shims.js';
 import { getAgentResources, isDirectoryDoc, listResources, } from '../lib/resources.js';
 import { listHookEntriesFromDir } from '../lib/hooks.js';
 import { getResourceInventory } from '../lib/resource-inventory.js';
 import { listMcpServerConfigs, discoverMcpConfigsFromRepo } from '../lib/mcp.js';
-import { discoverPlugins, discoverPluginsInDir, pluginResourceGroups, inspectPluginCapabilities, pluginCapabilityLabels } from '../lib/plugins.js';
+import { discoverPlugins, discoverPluginsInDir, pluginResourceGroups, inspectPluginCapabilities, pluginCapabilityLabels } from '../lib/plugins/plugins.js';
 import { showResourceList } from './resource-view.js';
 import { PLUGIN_GROUP_COLORS } from './plugins.js';
 import { isInteractiveTerminal } from './utils.js';
@@ -39,7 +39,7 @@ import { countSessionsInScope } from '../lib/session/discover.js';
 import { isSessionTrackedAgent } from '../lib/session/types.js';
 import { damerauLevenshtein } from '../lib/fuzzy.js';
 import { terminalWidth, truncateToWidth, stringWidth, stripAnsi } from '../lib/session/width.js';
-import { readJobFileResult, getJobRunsDir, readRunMeta, isOneShotRoutine, isPastOneShotRoutine, listJobs, } from '../lib/routines.js';
+import { readJobFileResult, getJobRunsDir, readRunMeta, isOneShotRoutine, isPastOneShotRoutine, listJobs, } from '../lib/scheduling/routines.js';
 import { routineDeviceIndex, currentRoutineDevice, routineEnabledOnThisDevice, } from '../lib/routine-activation.js';
 import { humanizeCron } from '../lib/routines-format.js';
 /** Resource kinds the inspect command can drill into. */
@@ -764,18 +764,6 @@ function itemsSize(items) {
     }
     return { bytes, files };
 }
-/** Human byte size: "84 KB", "3.1 MB". */
-export function formatBytes(n) {
-    if (n < 1024)
-        return `${n} B`;
-    const units = ['KB', 'MB', 'GB', 'TB'];
-    let v = n / 1024, i = 0;
-    while (v >= 1024 && i < units.length - 1) {
-        v /= 1024;
-        i++;
-    }
-    return `${v >= 10 ? Math.round(v) : v.toFixed(1)} ${units[i]}`;
-}
 /** Parse the repo's own agents.yaml into the version pins + run strategies it declares. */
 export function repoManifestSummary(root) {
     let parsed;

package/dist/commands/logs.d.ts

@@ -2,7 +2,7 @@
  * `agents logs` — unified, discoverable run-log viewer + audit trail.
  *
  * Resolves a run across two substrates and shows (or `-f` follows) its log:
- *  - host-dispatch tasks (`agents run --host`) → combined-stdout log, offset-tailed
+ *  - host-dispatch tasks (`agents run --device`) → combined-stdout log, offset-tailed
  *  - sessions (the local index) → transcript, tailed via the sessions tailer
  *
  * Subcommands:
@@ -14,7 +14,7 @@
  * transcript / raw stdout is opt-in behind `--full` (alias `-m/--markdown`).
  *
  * `[id]`/`--session` load directly (host task tried first, then session). With no
- * id, `--host`/`--agent`/`--version` filter a merged candidate list; one match is
+ * id, `--device`/`--agent`/`--version` filter a merged candidate list; one match is
  * shown, several open the fuzzy picker (or, non-TTY, print the list).
  *
  * Additive: `agents devices ps`/`stop` and `agents sessions tail` are unchanged and

package/dist/commands/logs.js

@@ -2,7 +2,7 @@
  * `agents logs` — unified, discoverable run-log viewer + audit trail.
  *
  * Resolves a run across two substrates and shows (or `-f` follows) its log:
- *  - host-dispatch tasks (`agents run --host`) → combined-stdout log, offset-tailed
+ *  - host-dispatch tasks (`agents run --device`) → combined-stdout log, offset-tailed
  *  - sessions (the local index) → transcript, tailed via the sessions tailer
  *
  * Subcommands:
@@ -14,7 +14,7 @@
  * transcript / raw stdout is opt-in behind `--full` (alias `-m/--markdown`).
  *
  * `[id]`/`--session` load directly (host task tried first, then session). With no
- * id, `--host`/`--agent`/`--version` filter a merged candidate list; one match is
+ * id, `--device`/`--agent`/`--version` filter a merged candidate list; one match is
  * shown, several open the fuzzy picker (or, non-TTY, print the list).
  *
  * Additive: `agents devices ps`/`stop` and `agents sessions tail` are unchanged and
@@ -27,7 +27,7 @@ import { streamSessionTail, isTailable } from './sessions-tail.js';
 import { showHostTaskLog, hostTaskLogJson } from '../lib/hosts/logs.js';
 import { listTasks } from '../lib/hosts/tasks.js';
 import { itemPicker } from '../lib/picker.js';
-import { stats, getLogsPath, rotate, } from '../lib/events.js';
+import { stats, getLogsPath, rotate, } from '../lib/feed/events.js';
 import { addEventsReadOptions, runEventsCommand } from './events.js';
 /** Compact one-line label used by both the picker and the non-TTY list. */
 function candidateLabel(c) {
@@ -119,22 +119,22 @@ async function runLogs(id, opts) {
     const { agent, version } = parseAgentFilter(opts.agent);
     const wantVersion = opts.version ?? version;
     // Host tasks carry no session-index metadata; sessions carry no host tag.
-    // So --host scopes to dispatched tasks, and --version to sessions.
+    // So --device scopes to dispatched tasks, and --version to sessions.
     const candidates = [];
     let tasks = listTasks();
-    if (opts.host)
-        tasks = tasks.filter((t) => t.host === opts.host);
+    if (opts.device)
+        tasks = tasks.filter((t) => t.host === opts.device);
     if (agent)
         tasks = tasks.filter((t) => t.agent === agent);
     for (const t of tasks)
         candidates.push({ kind: 'task', task: t });
-    if (!opts.host) {
+    if (!opts.device) {
         const sessions = await discoverSessions({ agent, version: wantVersion, limit: 50 });
         for (const s of sessions)
             candidates.push({ kind: 'session', session: s });
     }
     if (candidates.length === 0) {
-        console.error(chalk.yellow('No matching runs. Dispatch one: agents run <agent> "<task>" [--host <name>]'));
+        console.error(chalk.yellow('No matching runs. Dispatch one: agents run <agent> "<task>" [--device <name>]'));
         process.exit(1);
     }
     if (candidates.length === 1) {
@@ -252,7 +252,7 @@ export function registerLogsCommand(program) {
     const logsCmd = program
         .command('logs [id]')
         .description('Show a run log, audit trail, or stats. Subcommands: audit, stats, rotate.')
-        .option('--host <name>', 'Scope to runs dispatched to a host')
+        .option('--device <name>', 'Scope to runs dispatched to a device')
         .option('-a, --agent <agent>', 'Filter by agent (e.g. claude, codex@0.116.0)')
         .option('--version <version>', 'Filter by agent version')
         .option('--session <id>', 'Select a session/run by id (same as the positional id)')

package/dist/commands/mcp.js

@@ -3,13 +3,13 @@ import { truncate } from '../lib/format.js';
 import ora from 'ora';
 import { checkbox } from '@inquirer/prompts';
 import { capableAgents, isCapable } from '../lib/capabilities.js';
-import { emit } from '../lib/events.js';
+import { emit } from '../lib/feed/events.js';
 import { AGENTS, getAllCliStates, resolveAgentName, formatAgentError, registerMcpToTargets, unregisterMcpFromTargets, listInstalledMcpsWithScope, parseMcpConfig, getMcpConfigPathForHome, agentLabel, } from '../lib/agents.js';
 import { readManifest, writeManifest, createDefaultManifest } from '../lib/manifest.js';
 import { listMcpServerConfigs, discoverMcpConfigsFromRepo, installMcpConfigCentrally, isProjectMcpTrusted, trustProjectMcp, untrustProjectMcp, getMcpTrustStorePath, } from '../lib/mcp.js';
 import { cloneRepo } from '../lib/git.js';
 import { getMcpDir, getProjectAgentsDir } from '../lib/state.js';
-import { getEffectiveHome, getGlobalDefault, listInstalledVersions, getVersionHomePath, resolveInstalledAgentTargets, resolveConfiguredAgentTargets, syncResourcesToVersion, } from '../lib/versions.js';
+import { getEffectiveHome, getGlobalDefault, listInstalledVersions, getVersionHomePath, resolveInstalledAgentTargets, resolveConfiguredAgentTargets, syncResourcesToVersion, } from '../lib/installations/versions.js';
 import { getUserAgentsDir } from '../lib/state.js';
 import { isPromptCancelled, isInteractiveTerminal, requireInteractiveSelection, promptRemovalTargets, parseCommaSeparatedList, ensureAgentVersionsInstalled, resolveAgentTargetsAutoInstalling, resolveInstalledAgentTargetsAutoInstalling, VersionNotInstalledError, resolveListFilterOrExit, } from './utils.js';
 import { showResourceList, buildTargetsSection, } from './resource-view.js';

package/dist/commands/memory.js

@@ -9,7 +9,7 @@ import * as fs from 'fs';
 import { listMemoryFacts, addMemoryFact, removeMemoryFact, readMemoryFact, ensureUserMemoryDir, getUserMemoryDir, syncMemoryToVersionHome, } from '../lib/memory.js';
 import { capableAgents } from '../lib/capabilities.js';
 import { resolveAgentName, formatAgentError, agentLabel, ALL_AGENT_IDS } from '../lib/agents.js';
-import { listInstalledVersions, getVersionHomePath, } from '../lib/versions.js';
+import { listInstalledVersions, getVersionHomePath, } from '../lib/installations/versions.js';
 import { supports } from '../lib/capabilities.js';
 import { setHelpSections } from '../lib/help.js';
 /** Register the `agents memory` command tree. */

package/dist/commands/message.d.ts

@@ -7,7 +7,7 @@
  *   - parked headless (no rail) → `agents run --resume <id> -- <answer>`
  *   - cloud task → provider.message()
  *
- * Cross-host is handled one layer up: `--host <h>` routes the whole command over
+ * Cross-host is handled one layer up: `--device <h>` routes the whole command over
  * ssh via `REMOTE_PASSTHROUGH` (see src/lib/hosts/passthrough.ts), so the box is
  * written on the host that actually owns the agent. A caller who doesn't already
  * know the host (a detached `agents run --device <h> --no-follow` dispatch) is

package/dist/commands/message.js

@@ -6,14 +6,14 @@ import { getActiveSessions, isSessionIdLiveOnProcessTable } from '../lib/session
 import { getTaskById, updateTaskStatus } from '../lib/cloud/store.js';
 import { resolveProvider } from '../lib/cloud/registry.js';
 import { mailboxDir, enqueue } from '../lib/mailbox.js';
-import { getAgentsInvocation } from '../lib/daemon.js';
+import { getAgentsInvocation } from '../lib/daemon/daemon.js';
 import { resolveTaskRef } from '../lib/hosts/tasks.js';
 import { reconcileRunningTasks } from '../lib/hosts/reconcile.js';
 import { resolveMessageTarget, mailboxIdForActiveSession, decideHostTaskRoute, } from '../lib/mailbox-target.js';
-import { blockIdForSession, listBlocks, readBlock, recordAnswer, recordMessageReceipt, } from '../lib/feed.js';
+import { blockIdForSession, listBlocks, readBlock, recordAnswer, recordMessageReceipt, } from '../lib/feed/feed.js';
 import { verifyOperatorIdentity } from '../lib/operator.js';
 import { resolveAnswerRoute, resumeArgv, } from '../lib/answer-router.js';
-import { injectIntoTerminal } from '../lib/terminal/inject.js';
+import { injectIntoTerminal } from '../lib/terminal/index.js';
 import { setHelpSections } from '../lib/help.js';
 /** Find the still-open block addressed to `mailboxId`, if any. */
 function findOpenBlockForMailbox(mailboxId) {
@@ -122,13 +122,13 @@ async function deliverViaResume(route, mailboxId) {
  * while `agents devices ps` shows the same dispatch running with a live remote
  * pid — the only recovery was kill-and-redispatch, losing all context.
  *
- * Re-spawns `agents message <remoteRef> <text> --host <host>` through
- * `getAgentsInvocation`, so it re-enters via the SAME `--host` REMOTE_PASSTHROUGH
- * choke point (`lib/hosts/passthrough.ts`) any explicit `--host` caller uses,
+ * Re-spawns `agents message <remoteRef> <text> --device <host>` through
+ * `getAgentsInvocation`, so it re-enters via the SAME `--device` REMOTE_PASSTHROUGH
+ * choke point (`lib/hosts/passthrough.ts`) any explicit `--device` caller uses,
  * and resolves against the remote box's own active sessions.
  */
 async function deliverViaHostReroute(route, text, opts) {
-    const argv = ['message', route.remoteRef, text, '--host', route.host];
+    const argv = ['message', route.remoteRef, text, '--device', route.host];
     if (opts.from)
         argv.push('--from', opts.from);
     if (opts.as)

package/dist/commands/mine.d.ts

@@ -1,13 +1,12 @@
 /**
- * `agents mine` — white-label the CLI under your own name.
+ * `agents mine` helpers — white-label the CLI under your own name.
  *
- * `agents mine init <name>` mints a personally-named binary (e.g. `jack`) that
+ * `agents setup mine init <name>` mints a personally-named binary (e.g. `jack`) that
  * IS agents-cli: a pure pass-through shim on PATH that runs every `agents` verb
  * under the brand's name, with the brand's disabled commands and curated
- * resource profile applied. `list` / `toggle` / `remove` manage brands.
- *
- * The discoverable entry point is the `agents setup mine` wizard
- * (see setup-mine.ts), which delegates to `initBrand` here.
+ * resource profile applied. Manage verbs live under `agents setup mine`
+ * (`list` / `toggle` / `remove`); the bare `agents setup mine` wizard is the
+ * discoverable entry point (see setup-mine.ts).
  *
  * Storage: brand config in `meta.brands` (agents.yaml); the curated resource set
  * reuses the resource-profile engine — each brand owns a preset named
@@ -15,7 +14,7 @@
  */
 import type { Command } from 'commander';
 /**
- * Create (or re-mint) a brand. Shared by `mine init` and the `setup mine`
+ * Create (or re-mint) a brand. Shared by `setup mine init` and the `setup mine`
  * wizard. Writes the shim, the brand config, and an empty resource preset.
  */
 export declare function initBrand(name: string, opts?: {
@@ -24,4 +23,8 @@ export declare function initBrand(name: string, opts?: {
 }): {
     pathWarning: boolean;
 };
-export declare function registerMineCommand(program: Command): void;
+/**
+ * Register brand manage verbs (`init`/`list`/`toggle`/`remove`) under a parent
+ * Command — used by `agents setup mine`.
+ */
+export declare function registerMineManageCommands(cmd: Command): void;

package/dist/commands/mine.js

@@ -2,10 +2,10 @@ import chalk from 'chalk';
 import { validateBrandName, listBrands, getBrandConfig, upsertBrand, removeBrand, brandPresetName, } from '../lib/brand.js';
 import { createBrandShim, removeBrandShim, isShimsInPath } from '../lib/shims.js';
 import { updateMeta } from '../lib/state.js';
-import { COMMAND_LOADERS } from '../lib/startup/command-registry.js';
+import { KNOWN_TOP_LEVEL_COMMANDS } from '../lib/startup/command-registry.js';
 /** Built-in top-level command names, for validating `--disable <cmd>`. */
 function knownCommandNames() {
-    const names = new Set(Object.keys(COMMAND_LOADERS));
+    const names = new Set(KNOWN_TOP_LEVEL_COMMANDS);
     // Inline aliases registered outside COMMAND_LOADERS (see src/index.ts).
     for (const n of ['perms', 'exec', 'jobs', 'cron', 'upgrade'])
         names.add(n);
@@ -63,7 +63,7 @@ function editPreset(name, fn) {
     });
 }
 /**
- * Create (or re-mint) a brand. Shared by `mine init` and the `setup mine`
+ * Create (or re-mint) a brand. Shared by `setup mine init` and the `setup mine`
  * wizard. Writes the shim, the brand config, and an empty resource preset.
  */
 export function initBrand(name, opts = {}) {
@@ -73,7 +73,7 @@ export function initBrand(name, opts = {}) {
         process.exit(1);
     }
     if (getBrandConfig(name) && !opts.force) {
-        console.error(chalk.red(`Brand "${name}" already exists. Use --force to re-mint, or 'agents mine toggle ${name}'.`));
+        console.error(chalk.red(`Brand "${name}" already exists. Use --force to re-mint, or 'agents setup mine toggle ${name}'.`));
         process.exit(1);
     }
     ensurePresetExists(name);
@@ -101,10 +101,11 @@ function printMinted(name, pathWarning) {
         console.log(chalk.yellow(`  note: the shims dir isn't on your PATH yet — run 'agents setup' or open a new shell.`));
     }
 }
-export function registerMineCommand(program) {
-    const cmd = program
-        .command('mine')
-        .description('White-label the CLI: your own personally-named binary (e.g. `jack`)');
+/**
+ * Register brand manage verbs (`init`/`list`/`toggle`/`remove`) under a parent
+ * Command — used by `agents setup mine`.
+ */
+export function registerMineManageCommands(cmd) {
     cmd
         .command('init <name>')
         .description('Mint your own branded CLI that runs every agents verb under <name>')
@@ -125,7 +126,7 @@ export function registerMineCommand(program) {
         const brands = listBrands();
         const entries = Object.entries(brands);
         if (entries.length === 0) {
-            console.log(chalk.gray("No brands yet. Try: agents setup mine   (or: agents mine init jack)"));
+            console.log(chalk.gray("No brands yet. Try: agents setup mine   (or: agents setup mine init jack)"));
             return;
         }
         const width = entries.reduce((m, [n]) => Math.max(m, n.length), 0);
@@ -147,7 +148,7 @@ export function registerMineCommand(program) {
         .action((name, options) => {
         const cfg = getBrandConfig(name);
         if (!cfg) {
-            console.error(chalk.red(`No brand named "${name}". Create it with 'agents mine init ${name}'.`));
+            console.error(chalk.red(`No brand named "${name}". Create it with 'agents setup mine init ${name}'.`));
             process.exit(1);
         }
         // Built-in command toggles → brand.disabledCommands.

package/dist/commands/models.js

@@ -9,7 +9,7 @@ import chalk from 'chalk';
 import * as fs from 'fs';
 import { homeDir } from '../lib/platform/index.js';
 import { resolveAgentName, formatAgentError, agentLabel, } from '../lib/agents.js';
-import { listInstalledVersions, getGlobalDefault, resolveVersion, resolveVersionAlias } from '../lib/versions.js';
+import { listInstalledVersions, getGlobalDefault, resolveVersion, resolveVersionAlias } from '../lib/installations/versions.js';
 import { getModelCatalog, locateModelSource } from '../lib/models.js';
 import { resolveTierMap, MODEL_TIERS } from '../lib/model-tiers.js';
 import { setTierOverride, clearTierOverride, listTierOverrides } from '../lib/model-tier-overrides.js';

package/dist/commands/modes.js

@@ -11,7 +11,7 @@ import chalk from 'chalk';
 import { AGENTS, ALL_AGENT_IDS, agentLabel, formatAgentError, resolveAgentName, } from '../lib/agents.js';
 import { formatModeFlags, getAgentModesCatalog, } from '../lib/agent-modes.js';
 import { setHelpSections } from '../lib/help.js';
-import { getGlobalDefault, listInstalledVersions, resolveVersion, resolveVersionAlias } from '../lib/versions.js';
+import { getGlobalDefault, listInstalledVersions, resolveVersion, resolveVersionAlias } from '../lib/installations/versions.js';
 /** Agents that show in the no-arg overview (skip hard-deprecated). */
 const MODE_AGENTS = ALL_AGENT_IDS.filter((id) => !AGENTS[id].deprecated?.hard);
 /** Register `agents modes [agent[@version]]`. */

package/dist/commands/monitors.js

@@ -11,14 +11,14 @@ import chalk from 'chalk';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as yaml from 'yaml';
-import { isDaemonRunning, signalDaemonReload, startDaemon, } from '../lib/daemon.js';
+import { isDaemonRunning, signalDaemonReload, startDaemon, } from '../lib/daemon/daemon.js';
 import { findDuplicateMonitor, monitorFingerprint } from '../lib/monitors/fingerprint.js';
 import { gatherFleetMonitors, NO_MONITOR_FANOUT_ENV } from '../lib/monitors/remote.js';
 import { listMonitors, readMonitor, writeMonitor, deleteMonitor, setMonitorEnabled, getMonitorPath, validateMonitor, monitorRunsOnThisDevice, parseInterval, } from '../lib/monitors/config.js';
 import { formatRelativeTime } from '../lib/session/relative-time.js';
 import { evaluateMonitorOnce, POLL_SOURCE_TYPES } from '../lib/monitors/engine.js';
-import { listFires, readState, readLiveness } from '../lib/monitors/state.js';
-import { listRuns, getLatestRun, getRunDir } from '../lib/routines.js';
+import { listFires, readState, readLiveness, resolveFireOutcome } from '../lib/monitors/state.js';
+import { listRuns, getLatestRun, getRunDir } from '../lib/scheduling/routines.js';
 import { getMonitorsDir } from '../lib/state.js';
 import { IS_WINDOWS } from '../lib/platform/index.js';
 import { safeJoin } from '../lib/paths.js';
@@ -452,6 +452,7 @@ export function registerMonitorsCommands(program) {
         .option('--device <name>', 'OWNER (not body placement) — the single machine that evaluates + fires (exactly-once). See docs/concepts.md#placement.')
         .option('--devices <list>', 'Allowlist (comma-separated): each device fires independently')
         .option('--run-on <host>', 'BODY placement — execute the ACTION on this machine over SSH (same idea as run --where device:<host>)')
+        .option('--cwd <path>', "Working directory for --run, home-relative or ~/… (default: the execution target's home)")
         .option('--rate-limit <spec>', 'Auto-pause if it fires more than N/<interval> (e.g. 5/1m)')
         .option('--disabled', 'Create the monitor paused (enable later with resume)')
         .option('--force', 'Overwrite a same-named monitor, or add one that duplicates an existing watcher')
@@ -536,6 +537,7 @@ export function registerMonitorsCommands(program) {
             ...(device ? { device } : {}),
             ...(devices ? { devices } : {}),
             ...(options.runOn ? { runOn: options.runOn } : {}),
+            ...(options.cwd ? { cwd: options.cwd } : {}),
             ...(rateLimit ? { rateLimit } : {}),
         };
         const errors = validateMonitor(config);
@@ -669,7 +671,9 @@ export function registerMonitorsCommands(program) {
         if (recentFires.length > 0) {
             console.log(chalk.bold('\nRecent fires'));
             for (const f of recentFires) {
-                console.log(`  ${chalk.gray(f.firedAt)}  ${f.action ?? '?'}  ${f.ok === false ? chalk.red('failed') : chalk.green('ok')}`);
+                // Reconciled against the run's real status — see `runs`, above (RUSH-2690).
+                const { ok } = resolveFireOutcome(name, f);
+                console.log(`  ${chalk.gray(f.firedAt)}  ${f.action ?? '?'}  ${ok ? chalk.green('ok') : chalk.red('failed')}`);
             }
         }
     });
@@ -843,9 +847,22 @@ export function registerMonitorsCommands(program) {
         }
         console.log(chalk.bold(`Fire history: ${name}\n`));
         for (const f of fires.slice(-20)) {
-            const outcome = f.ok === false ? chalk.red('failed') : chalk.green('ok');
+            // Reconcile against the run's REAL, current status (RUSH-2690) rather
+            // than trusting the frozen `ok` written at fire time — `dispatchAction`
+            // only sees a synchronous 'running' snapshot before the run has
+            // actually settled, so a run that later fails/times out/never produces
+            // output would otherwise read `ok` here forever while `agents monitors
+            // logs` (which reads the run record fresh) already shows the truth.
+            const { ok, runStatus } = resolveFireOutcome(name, f);
+            const outcome = ok ? chalk.green('ok') : chalk.red('failed');
+            // Surface the divergence explicitly when the frozen write disagreed
+            // with the reconciled read — the exact "fire says ok, run says
+            // otherwise" symptom RUSH-2690 reported.
+            const corrected = f.ok !== false && !ok && runStatus
+                ? chalk.yellow(` (run ${runStatus})`)
+                : '';
             const runRef = f.runId ? chalk.gray(`  run ${f.runId}`) : '';
-            console.log(`  ${f.firedAt}  ${(f.action ?? '?').padEnd(12)} ${outcome}${runRef}`);
+            console.log(`  ${f.firedAt}  ${(f.action ?? '?').padEnd(12)} ${outcome}${corrected}${runRef}`);
             console.log(chalk.gray(`    ${f.summary.slice(0, 100)}`));
         }
     });

package/dist/commands/output.d.ts

@@ -1,11 +1,11 @@
 /**
  * Output command — productivity: token *burn* vs shipped *output*.
  *
- * `agents cost` answers "what did we burn?" (dollars + duration). This joins that
- * burn to what actually shipped — real generated (output) tokens plus PRs and
- * commits across every git identity — so you can see burn-vs-output and ratios
- * like $/PR and output-tokens/$. Pure SQLite + local git/gh, no server, no
- * telemetry — the same offline spirit as `cost`.
+ * Nested as `agents insights output`. `agents insights cost` answers "what did
+ * we burn?" (dollars + duration). This joins that burn to what actually shipped —
+ * real generated (output) tokens plus PRs and commits across every git identity —
+ * so you can see burn-vs-output and ratios like $/PR and output-tokens/$. Pure
+ * SQLite + local git/gh, no server, no telemetry — the same offline spirit as cost.
  *
  * Why not just show `token_count`? Because that number sums cache-read/-write
  * context re-counted every turn and is dominated by cheap re-reads (often ~100x
@@ -16,4 +16,5 @@
  * over SSH and merges — one fleet-wide burn-vs-output view.
  */
 import type { Command } from 'commander';
-export declare function registerOutputCommand(program: Command): void;
+/** Register `agents insights output` under the insights parent. */
+export declare function registerOutputCommand(insightsCmd: Command): void;

package/dist/commands/output.js

@@ -14,8 +14,9 @@ import { loadDevices, isControlDevice } from '../lib/devices/registry.js';
 import { machineId } from '../lib/session/sync/config.js';
 import { stripClixml } from '../lib/hosts/remote-cmd.js';
 const execFileAsync = promisify(execFile);
-export function registerOutputCommand(program) {
-    addHostOption(program.command('output'))
+/** Register `agents insights output` under the insights parent. */
+export function registerOutputCommand(insightsCmd) {
+    addHostOption(insightsCmd.command('output'))
         .description('Productivity rollup — token burn vs shipped output (PRs, commits) across agents')
         .option('--json', 'Output the rollup as JSON')
         .option('--since <time>', 'Only sessions/commits newer than this: 1h, 24h, 7d, 4w, 1mo, 1y, or ISO date (default 7d)')
@@ -28,12 +29,12 @@ export function registerOutputCommand(program) {
         .option('--pricing <scenario>', 'Cost scenario: actual (default, cache-discounted) or no-cache (cache read/write billed at the full input rate)')
         .addHelpText('after', `
 Examples:
-  agents output                       Last 7 days: burn, output tokens, PRs, commits, ratios
-  agents output --since 24h           Last 24 hours
-  agents output --since 1mo           Last month  (units: 1h 24h 7d 4w 1mo 1y, or ISO date)
-  agents output --pricing no-cache    Model the burn as if prompt caching were off
-  agents output --all-hosts           Fleet-wide, folding in every online machine
-  agents output --by day --json       Machine-readable daily burn/output rollup
+  agents insights output                       Last 7 days: burn, output tokens, PRs, commits, ratios
+  agents insights output --since 24h           Last 24 hours
+  agents insights output --since 1mo           Last month  (units: 1h 24h 7d 4w 1mo 1y, or ISO date)
+  agents insights output --pricing no-cache    Model the burn as if prompt caching were off
+  agents insights output --all-hosts           Fleet-wide, folding in every online machine
+  agents insights output --by day --json       Machine-readable daily burn/output rollup
 
 Burn (cost) is computed offline from a versioned per-model price table (${PRICING_VERSION}).
 Output tokens are the real generated tokens — NOT the cache-inflated total token count.
@@ -136,9 +137,9 @@ async function computeLocalPayload(options, includePrs) {
         uncostedAgents: groupBy === 'agent' ? breakdown.filter(r => r.costUsd === 0).map(r => r.key) : [],
     };
 }
-/** Fetch one remote device's payload by re-invoking `agents output --json --host <name>`. */
+/** Fetch one remote device's payload by re-invoking `agents insights output --json --device <name>`. */
 async function fetchRemotePayload(device, options) {
-    const args = ['output', '--json', '--no-prs', '--host', device, '--since', options.since ?? '7d'];
+    const args = ['insights', 'output', '--json', '--no-prs', '--device', device, '--since', options.since ?? '7d'];
     if (options.by)
         args.push('--by', options.by);
     if (options.reposDir)

package/dist/commands/packages.js

@@ -14,12 +14,12 @@ import { DEFAULT_REGISTRIES } from '../lib/types.js';
 import { getRegistries, setRegistry, removeRegistry, search as searchRegistries, resolvePackage, validatedNpmSpec, validatedPyPISpec, verifySkillIntegrity, } from '../lib/registry.js';
 import { cloneRepo } from '../lib/git.js';
 import { discoverCommands, resolveCommandSource, installCommand, installCommandCentrally, } from '../lib/commands.js';
-import { discoverSkillsFromRepo, installSkill, installSkillCentrally, } from '../lib/skills.js';
+import { discoverSkillsFromRepo, installSkill, installSkillCentrally, } from '../lib/plugins/skills.js';
 import { discoverHooksFromRepo, installHooks, installHooksCentrally, } from '../lib/hooks.js';
 import { discoverWorkflowsFromRepo, installWorkflowCentrally, } from '../lib/workflows.js';
 import { discoverSubagentsFromRepo, installSubagentCentrally, } from '../lib/subagents.js';
 import { discoverPermissionsFromRepo, installPermissionSet, } from '../lib/permissions.js';
-import { listInstalledVersions, resolveConfiguredAgentTargets, syncResourcesToVersion, } from '../lib/versions.js';
+import { listInstalledVersions, resolveConfiguredAgentTargets, syncResourcesToVersion, } from '../lib/installations/versions.js';
 import { formatPath, isInteractiveTerminal, isPromptCancelled, parseCommaSeparatedList, requireDestructiveArg, requireInteractiveSelection, resolveInstalledAgentTargetsAutoInstalling, } from './utils.js';
 import { itemPicker } from '../lib/picker.js';
 import { registerMcpCommandToTargets, discoverMcpConfigsFromRepo, installMcpConfigCentrally, } from '../lib/mcp.js';
@@ -369,8 +369,8 @@ delegate to the same underlying installers.
                 spinner.stop();
                 const spec = resolved.pluginSpec ?? resolved.source;
                 console.log(chalk.gray(`Installing plugin from: ${spec}`));
-                const { installPlugin, getPlugin, inspectPluginCapabilities, pluginCapabilityLabels, parseInstallSpec, checkPluginDependencies, hasPluginExecSurfaces, pluginSupportsAgent, syncPluginToVersion, pluginResourceGroups, } = await import('../lib/plugins.js');
-                const { listInstalledVersions, getGlobalDefault, getVersionHomePath, syncResourcesToVersion } = await import('../lib/versions.js');
+                const { installPlugin, getPlugin, inspectPluginCapabilities, pluginCapabilityLabels, parseInstallSpec, checkPluginDependencies, hasPluginExecSurfaces, pluginSupportsAgent, syncPluginToVersion, pluginResourceGroups, } = await import('../lib/plugins/plugins.js');
+                const { listInstalledVersions, getGlobalDefault, getVersionHomePath, syncResourcesToVersion } = await import('../lib/installations/versions.js');
                 const { agentLabel } = await import('../lib/agents.js');
                 let name;
                 let root;

package/dist/commands/perf.js

@@ -14,7 +14,7 @@
 import chalk from 'chalk';
 import { aggregateSamples, perfDbPath, } from '../lib/perf/db.js';
 import { formatMs, formatCacheColumn, DEFAULT_SLOW_HOOK_WARN_MS, loadHookFireEvents, aggregateHookProfile, } from '../lib/hooks/profile.js';
-import { query } from '../lib/events.js';
+import { query } from '../lib/feed/events.js';
 import { detectRepeatedGuardBlocks } from '../lib/friction-heuristics.js';
 function parseDays(raw) {
     const n = parseInt(raw ?? '7', 10);