@phnx-labs/agents-cli 1.22.40 → 1.22.42

package/dist/commands/computer-sessions-picker.js

@@ -13,39 +13,14 @@
  * computer run has no on-disk artifact of its own to open (see
  * `lib/computer/sessions-list.ts`'s module docblock), so `enter` prints the
  * run's full action list rather than opening a file, and the picker keeps
- * browsing afterward instead of exiting.
+ * browsing afterward instead of exiting. Interactive routing and the browse
+ * loop live in `sessions-picker-factory.ts` (shared with the browser twin).
  */
 import chalk from 'chalk';
-import { itemPicker } from '../lib/picker.js';
-import { isInteractiveTerminal, isPromptCancelled } from './utils.js';
 import { buildPreview } from './sessions-picker.js';
+import { createSessionsPickerCommand } from './sessions-picker-factory.js';
 import { runComputerSessions, printComputerSessionRows, buildComputerSessionRows, matchesComputerSessionRow, formatRowActions, } from '../lib/computer/sessions-list.js';
 import { formatRelativeTime } from '../lib/session/relative-time.js';
-/** True when the interactive picker should open instead of the printed table:
- *  a real TTY, no `--json`, and `--no-interactive` not set. */
-export function shouldOpenInteractiveComputerSessions(opts, isTTY) {
-    return opts.interactive !== false && !opts.json && isTTY;
-}
-/**
- * Shared entry point for `agents computer sessions` and `agents sessions
- * --computer`. Mirrors `runBrowserSessionsCommand`'s interactive-routing
- * split so both call sites stay in lockstep.
- */
-export async function runComputerSessionsCommand(opts) {
-    if (!shouldOpenInteractiveComputerSessions(opts, isInteractiveTerminal())) {
-        if (opts.rows)
-            printComputerSessionRows(opts.rows, { limit: opts.limit, json: opts.json });
-        else
-            runComputerSessions({ machine: opts.machine, limit: opts.limit, json: opts.json });
-        return;
-    }
-    const rows = opts.rows ?? buildComputerSessionRows({ machine: opts.machine });
-    if (rows.length === 0) {
-        console.log(`No computer actions recorded${opts.machine ? ` for machine "${opts.machine}"` : ''}.`);
-        return;
-    }
-    await browseComputerSessions(rows);
-}
 function rowLinkSummary(row) {
     if (row.linkStatus === 'linked' && row.linkedSession) {
         const s = row.linkedSession;
@@ -111,31 +86,33 @@ function printRunDetail(row) {
         console.log('(no driving actions recorded)');
     console.log('');
 }
-/** Run-level picker with an action-list preview. Loops until the user quits
- *  (esc) so a session's whole run history can be browsed repeatedly in one
- *  sitting — mirroring `browseAndOpen`'s loop, minus the artifact drill-down
- *  a computer run has none of. */
-async function browseComputerSessions(rows) {
-    for (;;) {
-        let picked;
-        try {
-            picked = await itemPicker({
-                message: 'Computer sessions:',
-                items: rows,
-                filter: (query) => (query.trim() ? rows.filter((r) => matchesComputerSessionRow(r, query)) : rows),
-                labelFor: (row) => formatRowLabel(row),
-                buildPreview: (row) => buildRowPreview(row),
-                emptyMessage: 'No computer sessions match.',
-                enterHint: 'view actions',
-            });
-        }
-        catch (err) {
-            if (isPromptCancelled(err))
-                return;
-            throw err;
-        }
-        if (!picked)
-            return;
-        printRunDetail(picked.item);
-    }
+const computerSessionsPicker = createSessionsPickerCommand({
+    runFlat: (opts) => {
+        if (opts.rows)
+            printComputerSessionRows(opts.rows, { limit: opts.limit, json: opts.json });
+        else
+            runComputerSessions({ machine: opts.machine, limit: opts.limit, json: opts.json });
+    },
+    buildRows: (opts) => opts.rows ?? buildComputerSessionRows({ machine: opts.machine }),
+    emptyMessage: (opts) => `No computer actions recorded${opts.machine ? ` for machine "${opts.machine}"` : ''}.`,
+    message: 'Computer sessions:',
+    matches: matchesComputerSessionRow,
+    labelFor: formatRowLabel,
+    buildPreview: buildRowPreview,
+    emptyFilterMessage: 'No computer sessions match.',
+    enterHint: 'view actions',
+    onOpen: printRunDetail,
+});
+/** True when the interactive picker should open instead of the printed table:
+ *  a real TTY, no `--json`, and `--no-interactive` not set. */
+export function shouldOpenInteractiveComputerSessions(opts, isTTY) {
+    return computerSessionsPicker.shouldOpen(opts, isTTY);
+}
+/**
+ * Shared entry point for `agents computer sessions` and `agents sessions
+ * --computer`. Mirrors `runBrowserSessionsCommand`'s interactive-routing
+ * split so both call sites stay in lockstep.
+ */
+export async function runComputerSessionsCommand(opts) {
+    await computerSessionsPicker.run(opts);
 }

package/dist/commands/computer.d.ts

@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import { resolveHelperExec, resolveSocketPath } from '../lib/computer-rpc.js';
+import { resolveHelperExec, resolveSocketPath } from '../lib/computer/computer-rpc.js';
 /**
  * Pure platform gate. The computer subsystem is macOS-only for LOCAL driving
  * (Accessibility / launchctl). It is NOT blocked off macOS when a remote daemon

package/dist/commands/computer.js

@@ -3,8 +3,8 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 import { registerCommandGroups } from '../lib/help.js';
-import { openComputerClient, resolveHelperApp, resolveHelperExec, resolveSocketPath, resolveLogPath, resolvePolicyPath, resolvePeersPath, resolveTcpEndpoint, loadComputerAllowList, loadDefaultPeers, writeComputerPolicy, writeComputerPeers, } from '../lib/computer-rpc.js';
-import { setupRemoteHelper, startRemoteTunnel, stopRemoteHelper, hydrateRemoteEnvFromState, readRemoteState, resolveRemoteDevice, REMOTE_TASK_NAME, WIN_HELPER_EXE, } from '../lib/ssh-tunnel.js';
+import { openComputerClient, resolveHelperApp, resolveHelperExec, resolveSocketPath, resolveLogPath, resolvePolicyPath, resolvePeersPath, resolveTcpEndpoint, loadComputerAllowList, loadDefaultPeers, writeComputerPolicy, writeComputerPeers, } from '../lib/computer/computer-rpc.js';
+import { setupRemoteHelper, startRemoteTunnel, stopRemoteHelper, hydrateRemoteEnvFromState, readRemoteState, resolveRemoteDevice, REMOTE_TASK_NAME, WIN_HELPER_EXE, } from '../lib/computer/ssh-tunnel.js';
 import { sshExec } from '../lib/ssh-exec.js';
 import { encodePowershell } from '../lib/hosts/remote-cmd.js';
 import { registerActionCommands, withClient, unwrap, pickTarget, emitComputerAction } from './computer-actions.js';

package/dist/commands/doctor.d.ts

@@ -25,7 +25,7 @@ import type { Command } from 'commander';
 import { type FleetInventory } from '../lib/devices/fleet-divergence.js';
 import { type DoctorFinding } from '../lib/devices/doctor-findings.js';
 import { type VersionResourceReport } from '../lib/doctor-diff.js';
-import { type DuplicateVersionHook } from '../lib/hooks.js';
+import { type DuplicateVersionHook } from '../lib/hooks/install.js';
 import { type SyncStatusRow, type OrphanRow } from '../lib/drift.js';
 import { type FetchStatusMarker } from '../lib/auto-pull.js';
 export declare function wrapLine(prefix: string, text: string, width?: number): string[];

package/dist/commands/doctor.js

@@ -1,4 +1,4 @@
-import { IsolationBoundaryError } from '../lib/shims.js';
+import { IsolationBoundaryError } from '../lib/installations/shims.js';
 import { explainIsolationBoundary } from '../lib/isolation-boundary-report.js';
 import { addHostOption } from '../lib/hosts/option.js';
 import { buildRemoteAgentsInvocation } from '../lib/hosts/remote-cmd.js';
@@ -23,7 +23,7 @@ import { getVersionHomePath, listInstalledVersions, } from '../lib/installations
 import { resolveAgentTargets, AgentSpecError } from '../lib/agent-spec/index.js';
 import { loadManifest, isStale } from '../lib/staleness/index.js';
 import { diffVersionResources, DOCTOR_ALL_KINDS, } from '../lib/doctor-diff.js';
-import { checkVersionHookWiring, inspectDuplicateVersionHooks, registerHooksToSettings, repairManagedHookRuntimeArtifacts } from '../lib/hooks.js';
+import { checkVersionHookWiring, inspectDuplicateVersionHooks, registerHooksToSettings, repairManagedHookRuntimeArtifacts } from '../lib/hooks/install.js';
 import { isVersionIsolated } from '../lib/installations/versions.js';
 import { computeDrift, checkSyncStatus, countOrphans, computeSourceBehind } from '../lib/drift.js';
 import { readAuthHealthCache, summarizeHostAuth } from '../lib/auth-health.js';
@@ -1523,7 +1523,7 @@ export function registerDoctorCommand(program) {
                 console.error(chalk.red('--adopt and --release are mutually exclusive; pass only one.'));
                 process.exit(1);
             }
-            const { adoptShadowingLauncher, releaseAdoptedLauncher } = await import('../lib/shims.js');
+            const { adoptShadowingLauncher, releaseAdoptedLauncher } = await import('../lib/installations/shims.js');
             const raw = (opts.adopt || opts.release);
             const agent = resolveAgentName(raw);
             if (!agent) {

package/dist/commands/feed.js

@@ -312,7 +312,7 @@ export async function loadSessionMetasForFeedEnrichment(load) {
 export function registerFeedCommand(program) {
     const feed = program
         .command('feed')
-        .description('Operator inbox + agent status posts (aliases: inbox = needs-you; timeline = --filter updates)')
+        .description('Operator inbox + agent status posts (alias: inbox = needs-you). Agent progress = --filter updates')
         .option('--json', 'Output as JSON (each block stamped with its outcome + ask class)')
         .option('--filter <view>', 'What to show: needs (default) · updates · all', 'needs')
         .option('--flat', 'List one block per agent instead of grouping by outcome')
@@ -449,7 +449,7 @@ export function registerFeedCommand(program) {
                 setupWarnings.push(activityInstall.error);
             if (!hookInstall.error || !activityInstall.error) {
                 const [{ iterHooksCapableVersions, parseHookManifest, registerHooksToSettings }, { getVersionHomePath }] = await Promise.all([
-                    import('../lib/hooks.js'),
+                    import('../lib/hooks/install.js'),
                     import('../lib/installations/versions.js'),
                 ]);
                 const manifest = parseHookManifest({ warn: false });
@@ -647,8 +647,8 @@ export function registerFeedCommand(program) {
     registerFeedObserveAliases(program);
 }
 /**
- * `inbox` / `timeline` → feed. Loaded with the feed module so lazy COMMAND_LOADERS
- * for those names also get the real `feed` command registered for re-parse.
+ * `inbox` → feed. Loaded with the feed module so the lazy COMMAND_LOADERS entry
+ * for `inbox` also gets the real `feed` command registered for re-parse.
  */
 function registerFeedObserveAliases(program) {
     const reparse = async (alias) => {
@@ -671,14 +671,6 @@ function registerFeedObserveAliases(program) {
         .action(async () => {
         await reparse('inbox');
     });
-    program
-        .command('timeline')
-        .description('Agent progress stream (alias of `agents feed --filter updates`). What agents posted recently.')
-        .allowUnknownOption()
-        .allowExcessArguments()
-        .action(async () => {
-        await reparse('timeline');
-    });
 }
 /**
  * Mirror a written post to the configured sinks (`feed.broadcast` in

package/dist/commands/hooks.js

@@ -7,7 +7,7 @@ import { checkbox } from '@inquirer/prompts';
 import { AGENTS, resolveAgentName, formatAgentError, agentLabel, } from '../lib/agents.js';
 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 { discoverHooksFromRepo, installHooksCentrally, listCentralHooks, listInstalledHooksWithScope, getHookInfo, parseHookManifest, iterHooksCapableVersions, removeHookFromVersion, } from '../lib/hooks/install.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';

package/dist/commands/import.js

@@ -21,7 +21,7 @@
  * management — same behavior as the first-run `agents setup` import flow.
  */
 import { withIsolationBoundary } from '../lib/isolation-boundary-report.js';
-import { assertIsolationBoundary, createVersionedAlias } from '../lib/shims.js';
+import { assertIsolationBoundary, createVersionedAlias } from '../lib/installations/shims.js';
 import { markVersionIsolated } from '../lib/installations/versions.js';
 import chalk from 'chalk';
 import ora from 'ora';

package/dist/commands/insights.js

@@ -49,7 +49,24 @@ import { terminalWidth, truncateToWidth, stringWidth, padToWidth } from '../lib/
 import { registerMixCommands } from '../lib/analytics/mix-commands.js';
 import { registerCostCommand } from './cost.js';
 import { registerOutputCommand } from './output.js';
+import { getTier } from '../lib/entitlement.js';
 const execFileAsync = promisify(execFile);
+/**
+ * Plan-tier gate for the behavioural report (RUSH-2424). Free keeps top-line
+ * counts and the harness mix (and `insights mix` / `agents perf`, which never
+ * enter this file's gating since they're separate command trees); the
+ * friction/correction-signal sections, grouping `--by account`, and
+ * `--narrative` are paid. `insights mix`/`cost`/`output` are unaffected — this
+ * gate applies only to the default behavioural report.
+ */
+const PAID_PLAN_NOTICE = 'Friction and account-split analysis are on the paid plan.';
+function resolveInsightsGate(tier, dim) {
+    return {
+        tier,
+        groupGated: !tier.isPaid && dim === 'account',
+        frictionGated: !tier.isPaid,
+    };
+}
 function collectAgent(value, previous) {
     return [...previous, value];
 }
@@ -208,7 +225,7 @@ function renderHours(hours, out) {
     out.push(`  ${chalk.cyan(spark)}`);
     out.push(`  ${chalk.gray('0h'.padEnd(6))}${chalk.gray('6h'.padEnd(6))}${chalk.gray('12h'.padEnd(6))}${chalk.gray('18h'.padEnd(5))}${chalk.gray('23h')}`);
 }
-function renderReport(groups, dim, meta, actions, harnesses) {
+function renderReport(groups, dim, meta, actions, harnesses, gate) {
     const out = [];
     const scope = meta.since ? `last ${meta.since}` : 'all time';
     out.push(chalk.bold('Insights') + chalk.gray(`  ${scope} · ${meta.analyzed} of ${meta.scanned} sessions`));
@@ -218,28 +235,44 @@ function renderReport(groups, dim, meta, actions, harnesses) {
         console.log(out.join('\n'));
         return;
     }
+    let noticePrinted = false;
+    const printPlanNotice = () => {
+        if (noticePrinted)
+            return;
+        noticePrinted = true;
+        out.push('');
+        out.push(chalk.gray(`  ${PAID_PLAN_NOTICE}`));
+    };
     // Per-group table — the headline, and the thing no sibling command produces.
     // Includes silent-stall counts so harness/account laziness is visible without --json.
-    out.push('');
-    out.push(chalk.bold(`By ${dim}`));
-    const labelW = Math.min(Math.max(...groups.map((g) => stringWidth(g.label)), 5), Math.max(16, terminalWidth() - 58));
-    const sessW = Math.max(...groups.map((g) => String(g.sessions).length), 3);
-    const stallOf = (g) => Object.entries(g.facets.frictionSignals)
-        .filter(([k]) => k.startsWith('silent stall:'))
-        .reduce((n, [, c]) => n + c, 0);
-    const resumeOf = (g) => g.facets.correctionSignals['resume after silent stall'] ?? 0;
-    const stallW = Math.max(...groups.map((g) => String(stallOf(g)).length), 5);
-    out.push(chalk.gray(`  ${padToWidth('', labelW)}  ${''.padStart(sessW)}       ` +
-        `${''.padStart(9)}  ${''.padStart(8)}  ${'stalls'.padStart(stallW)}  resume`));
-    for (const g of groups) {
-        const cost = g.costUsd > 0 ? formatUsd(g.costUsd) : '—';
-        const dur = g.durationMs > 0 ? formatDuration(g.durationMs) : '—';
-        const stalls = stallOf(g);
-        const resumes = resumeOf(g);
-        out.push(`  ${padToWidth(truncateToWidth(g.label, labelW), labelW)}  ` +
-            `${chalk.gray(String(g.sessions).padStart(sessW))} ${chalk.gray('sess')}  ` +
-            `${chalk.green(padToWidth(cost, 9))}  ${chalk.gray(padToWidth(dur, 8))}  ` +
-            `${chalk.cyan(String(stalls).padStart(stallW))}  ${chalk.cyan(String(resumes))}`);
+    // Gated on the free plan when grouped `--by account` (the default) — see resolveInsightsGate.
+    if (gate.groupGated) {
+        printPlanNotice();
+    }
+    else {
+        out.push('');
+        out.push(chalk.bold(`By ${dim}`));
+        const labelW = Math.min(Math.max(...groups.map((g) => stringWidth(g.label)), 5), Math.max(16, terminalWidth() - 58));
+        const sessW = Math.max(...groups.map((g) => String(g.sessions).length), 3);
+        // Friction-derived — never shown on the free plan, even when grouping by
+        // something other than account (gate.groupGated only covers `--by account`).
+        const stallOf = (g) => Object.entries(g.facets.frictionSignals)
+            .filter(([k]) => k.startsWith('silent stall:'))
+            .reduce((n, [, c]) => n + c, 0);
+        const resumeOf = (g) => g.facets.correctionSignals['resume after silent stall'] ?? 0;
+        const stallW = gate.frictionGated ? 6 : Math.max(...groups.map((g) => String(stallOf(g)).length), 5);
+        out.push(chalk.gray(`  ${padToWidth('', labelW)}  ${''.padStart(sessW)}       ` +
+            `${''.padStart(9)}  ${''.padStart(8)}  ${gate.frictionGated ? ''.padStart(stallW) : 'stalls'.padStart(stallW)}  ${gate.frictionGated ? '' : 'resume'}`));
+        for (const g of groups) {
+            const cost = g.costUsd > 0 ? formatUsd(g.costUsd) : '—';
+            const dur = g.durationMs > 0 ? formatDuration(g.durationMs) : '—';
+            const stalls = gate.frictionGated ? '—' : String(stallOf(g));
+            const resumes = gate.frictionGated ? '' : String(resumeOf(g));
+            out.push(`  ${padToWidth(truncateToWidth(g.label, labelW), labelW)}  ` +
+                `${chalk.gray(String(g.sessions).padStart(sessW))} ${chalk.gray('sess')}  ` +
+                `${chalk.green(padToWidth(cost, 9))}  ${chalk.gray(padToWidth(dur, 8))}  ` +
+                `${chalk.cyan(stalls.padStart(stallW))}  ${chalk.cyan(resumes)}`);
+        }
     }
     // Everything below is the whole scope folded together; per-group detail is in --json.
     const all = newFacetAccumulator();
@@ -248,52 +281,64 @@ function renderReport(groups, dim, meta, actions, harnesses) {
     renderCounts('Top tools', topEntries(all.toolCounts, 8), out);
     renderCounts('Languages', topEntries(all.languages, 6), out);
     renderCounts('Models', topEntries(all.models, 6), out);
-    renderCounts('Silent stalls by model', topEntries(all.silentStallsByModel ?? {}, 8), out);
-    // Friction — the section that earns the command.
-    const gaps = all.responseGaps;
-    const silentStalls = Object.entries(all.frictionSignals)
-        .filter(([k]) => k.startsWith('silent stall:'))
-        .reduce((n, [, c]) => n + c, 0);
-    const resumeNudges = all.correctionSignals['resume after silent stall'] ?? 0;
-    out.push('');
-    out.push(chalk.bold('Friction'));
-    out.push(`  ${padToWidth('interruptions', 18)}  ${chalk.cyan(String(all.interruptions))}` +
-        chalk.gray('   turns you cut short'));
-    out.push(`  ${padToWidth('tool errors', 18)}  ${chalk.cyan(String(all.errorCount))}`);
-    if (gaps.length > 0) {
-        // Same timestamps as silent stalls; this line is the distribution. Silent
-        // stalls (below) are the agent-attributed long gaps after the model stopped.
-        out.push(`  ${padToWidth('gap until next msg', 18)}  ` +
-            chalk.cyan(`p50 ${Math.round(percentile(gaps, 50))}s`) + chalk.gray(` · p90 ${Math.round(percentile(gaps, 90))}s`) +
-            chalk.gray('   after assistant last spoke'));
-    }
-    if (silentStalls > 0) {
-        out.push(`  ${padToWidth('silent stalls', 18)}  ${chalk.cyan(String(silentStalls))}` +
-            chalk.gray('   agent idle ≥5m until you resumed (also in By ' + dim + ' table)'));
+    // Friction — the section that earns the command. Paid plan only (RUSH-2424);
+    // top-line counts and harness mix above/below stay free.
+    if (gate.frictionGated) {
+        printPlanNotice();
     }
-    if (resumeNudges > 0) {
-        out.push(`  ${padToWidth('resume nudges', 18)}  ${chalk.cyan(String(resumeNudges))}` +
-            chalk.gray('   "continue"/"keep going" after a silent stall'));
-    }
-    const errs = topEntries(all.errorCategories, 6);
-    if (errs.length > 0) {
-        for (const e of errs)
-            out.push(`    ${chalk.gray('·')} ${padToWidth(e.name, 16)} ${chalk.gray(String(e.count))}`);
+    else {
+        renderCounts('Silent stalls by model', topEntries(all.silentStallsByModel ?? {}, 8), out);
+        const gaps = all.responseGaps;
+        const silentStalls = Object.entries(all.frictionSignals)
+            .filter(([k]) => k.startsWith('silent stall:'))
+            .reduce((n, [, c]) => n + c, 0);
+        const resumeNudges = all.correctionSignals['resume after silent stall'] ?? 0;
+        out.push('');
+        out.push(chalk.bold('Friction'));
+        out.push(`  ${padToWidth('interruptions', 18)}  ${chalk.cyan(String(all.interruptions))}` +
+            chalk.gray('   turns you cut short'));
+        out.push(`  ${padToWidth('tool errors', 18)}  ${chalk.cyan(String(all.errorCount))}`);
+        if (gaps.length > 0) {
+            // Same timestamps as silent stalls; this line is the distribution. Silent
+            // stalls (below) are the agent-attributed long gaps after the model stopped.
+            out.push(`  ${padToWidth('gap until next msg', 18)}  ` +
+                chalk.cyan(`p50 ${Math.round(percentile(gaps, 50))}s`) + chalk.gray(` · p90 ${Math.round(percentile(gaps, 90))}s`) +
+                chalk.gray('   after assistant last spoke'));
+        }
+        if (silentStalls > 0) {
+            out.push(`  ${padToWidth('silent stalls', 18)}  ${chalk.cyan(String(silentStalls))}` +
+                chalk.gray('   agent idle ≥5m until you resumed (also in By ' + dim + ' table)'));
+        }
+        if (resumeNudges > 0) {
+            out.push(`  ${padToWidth('resume nudges', 18)}  ${chalk.cyan(String(resumeNudges))}` +
+                chalk.gray('   "continue"/"keep going" after a silent stall'));
+        }
+        const errs = topEntries(all.errorCategories, 6);
+        if (errs.length > 0) {
+            for (const e of errs)
+                out.push(`    ${chalk.gray('·')} ${padToWidth(e.name, 16)} ${chalk.gray(String(e.count))}`);
+        }
+        renderCounts('Friction / thrash', topEntries(all.frictionSignals, 10), out);
+        renderCounts('Dissatisfaction / corrections', topEntries(all.correctionSignals, 10), out);
     }
-    renderCounts('Friction / thrash', topEntries(all.frictionSignals, 10), out);
-    renderCounts('Dissatisfaction / corrections', topEntries(all.correctionSignals, 10), out);
     renderCounts('Automatable repeats', topEntries(all.automationSignals, 10), out);
     renderCounts('Harness split', harnesses, out);
-    out.push('');
-    out.push(chalk.bold('Actions'));
-    if (actions.length === 0) {
-        out.push(chalk.gray('  No repeated action pattern met the evidence threshold in this window.'));
-    }
-    else {
-        out.push(chalk.gray('  pri     category    evidence  sample sessions  action'));
-        for (const action of actions.slice(0, 12)) {
-            out.push(`  ${padToWidth(action.priority, 7)} ${padToWidth(action.category, 11)} ` +
-                `${String(action.evidenceCount).padStart(8)}  ${padToWidth(action.sampleSessionIds.join(', '), 25)} ${action.action}`);
+    // Actions are built from frictionSignals/correctionSignals/automationSignals
+    // together (buildInsightActions) — evidence counts, sample session ids, and
+    // the action text itself describe the same paid friction/correction
+    // categories gated above, so the whole section is paid too (RUSH-2424).
+    if (!gate.frictionGated) {
+        out.push('');
+        out.push(chalk.bold('Actions'));
+        if (actions.length === 0) {
+            out.push(chalk.gray('  No repeated action pattern met the evidence threshold in this window.'));
+        }
+        else {
+            out.push(chalk.gray('  pri     category    evidence  sample sessions  action'));
+            for (const action of actions.slice(0, 12)) {
+                out.push(`  ${padToWidth(action.priority, 7)} ${padToWidth(action.category, 11)} ` +
+                    `${String(action.evidenceCount).padStart(8)}  ${padToWidth(action.sampleSessionIds.join(', '), 25)} ${action.action}`);
+            }
         }
     }
     // Output
@@ -349,7 +394,9 @@ function renderReport(groups, dim, meta, actions, harnesses) {
             out.push('');
         out.push(chalk.yellow(`  ${meta.unreadable} transcripts could not be read; their behaviour is missing from these totals.`));
     }
-    if (all.gapsOverCeiling > 0) {
+    // Friction-derived (gapsOverCeiling is a PAID_FACET_KEYS entry) and names
+    // "silent stall" outright — must not render on the free plan.
+    if (!gate.frictionGated && all.gapsOverCeiling > 0) {
         out.push(chalk.gray(`  ${all.gapsOverCeiling} gaps over an hour excluded from p50/p90 (still counted as silent stall: 1h+ when the assistant last spoke).`));
     }
     out.push('');
@@ -404,8 +451,23 @@ async function renderNarrative(payload) {
         process.exitCode = 1;
     }
 }
+/** Facet keys that belong to the paid friction/correction sections — stripped from `--json` on free (RUSH-2424). */
+const PAID_FACET_KEYS = new Set([
+    'frictionSignals', 'correctionSignals', 'silentStallsByModel',
+    'interruptions', 'errorCount', 'errorCategories', 'responseGaps', 'gapsOverCeiling',
+]);
+function freeFacetSubset(facets) {
+    const out = {};
+    for (const [key, value] of Object.entries(facets)) {
+        if (!PAID_FACET_KEYS.has(key))
+            out[key] = value;
+    }
+    return out;
+}
 async function insightsAction(options) {
     const dim = resolveGroup(options.by);
+    const tier = await getTier();
+    const gate = resolveInsightsGate(tier, dim);
     const minMessages = Number.parseInt(options.minMessages ?? '2', 10);
     if (!Number.isFinite(minMessages) || minMessages < 0) {
         console.error(chalk.red('error: --min-messages must be a non-negative integer'));
@@ -471,27 +533,37 @@ async function insightsAction(options) {
             unreadable,
             minMessages,
             by: dim,
+            plan: { tierName: tier.tierName, isPaid: tier.isPaid },
+            ...(gate.groupGated || gate.frictionGated ? { notice: PAID_PLAN_NOTICE } : {}),
             overlap,
-            actions,
+            // Built from frictionSignals/correctionSignals/automationSignals together
+            // (buildInsightActions) — same paid friction/correction data as above.
+            actions: gate.frictionGated ? null : actions,
             harnesses,
-            groups: groups.map((g) => ({
+            groups: gate.groupGated ? null : groups.map((g) => ({
                 key: g.key,
                 label: g.label,
                 sessions: g.sessions,
                 costUsd: g.costUsd,
                 durationMs: g.durationMs,
                 outputTokens: g.outputTokens,
-                ...g.facets,
-                responseGapP50: Math.round(percentile(g.facets.responseGaps, 50)),
-                responseGapP90: Math.round(percentile(g.facets.responseGaps, 90)),
-                responseGapBuckets: bucketGaps(g.facets.responseGaps),
-                // The raw sample is large and uninteresting once bucketed.
-                responseGaps: undefined,
+                ...(gate.frictionGated ? freeFacetSubset(g.facets) : {
+                    ...g.facets,
+                    responseGapP50: Math.round(percentile(g.facets.responseGaps, 50)),
+                    responseGapP90: Math.round(percentile(g.facets.responseGaps, 90)),
+                    responseGapBuckets: bucketGaps(g.facets.responseGaps),
+                    // The raw sample is large and uninteresting once bucketed.
+                    responseGaps: undefined,
+                }),
             })),
         };
         console.log(JSON.stringify(payload, null, 2));
-        if (options.narrative)
-            await renderNarrative(payload);
+        if (options.narrative) {
+            if (!tier.isPaid)
+                console.error(chalk.gray(`  ${PAID_PLAN_NOTICE}`));
+            else
+                await renderNarrative(payload);
+        }
         return;
     }
     renderReport(groups, dim, {
@@ -502,18 +574,24 @@ async function insightsAction(options) {
         unreadable,
         minMessages,
         overlap,
-    }, actions, harnesses);
+    }, actions, harnesses, gate);
     if (options.narrative) {
-        await renderNarrative(groups.map((g) => ({
-            account: g.label, sessions: g.sessions, costUsd: g.costUsd,
-            topTools: topEntries(g.facets.toolCounts, 8),
-            languages: topEntries(g.facets.languages, 6),
-            errorCategories: topEntries(g.facets.errorCategories, 6),
-            interruptions: g.facets.interruptions,
-            linesTouchedAfter: g.facets.linesTouchedAfter, linesTouchedBefore: g.facets.linesTouchedBefore,
-            gitCommits: g.facets.gitCommits,
-            replyP50s: Math.round(percentile(g.facets.responseGaps, 50)),
-        })));
+        if (!tier.isPaid) {
+            console.log('');
+            console.log(chalk.gray(`  ${PAID_PLAN_NOTICE}`));
+        }
+        else {
+            await renderNarrative(groups.map((g) => ({
+                account: g.label, sessions: g.sessions, costUsd: g.costUsd,
+                topTools: topEntries(g.facets.toolCounts, 8),
+                languages: topEntries(g.facets.languages, 6),
+                errorCategories: topEntries(g.facets.errorCategories, 6),
+                interruptions: g.facets.interruptions,
+                linesTouchedAfter: g.facets.linesTouchedAfter, linesTouchedBefore: g.facets.linesTouchedBefore,
+                gitCommits: g.facets.gitCommits,
+                replyP50s: Math.round(percentile(g.facets.responseGaps, 50)),
+            })));
+        }
     }
 }
 function configureInsightsCommand(cmd) {

package/dist/commands/inspect.js

@@ -26,9 +26,9 @@ 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/installations/versions.js';
-import { getShimsDir, getVersionedAliasPath } from '../lib/shims.js';
+import { getShimsDir, getVersionedAliasPath } from '../lib/installations/shims.js';
 import { getAgentResources, isDirectoryDoc, listResources, } from '../lib/resources.js';
-import { listHookEntriesFromDir } from '../lib/hooks.js';
+import { listHookEntriesFromDir } from '../lib/hooks/install.js';
 import { getResourceInventory } from '../lib/resource-inventory.js';
 import { listMcpServerConfigs, discoverMcpConfigsFromRepo } from '../lib/mcp.js';
 import { discoverPlugins, discoverPluginsInDir, pluginResourceGroups, inspectPluginCapabilities, pluginCapabilityLabels } from '../lib/plugins/plugins.js';

package/dist/commands/mine.js

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 import { validateBrandName, listBrands, getBrandConfig, upsertBrand, removeBrand, brandPresetName, } from '../lib/brand.js';
-import { createBrandShim, removeBrandShim, isShimsInPath } from '../lib/shims.js';
+import { createBrandShim, removeBrandShim, isShimsInPath } from '../lib/installations/shims.js';
 import { updateMeta } from '../lib/state.js';
 import { KNOWN_TOP_LEVEL_COMMANDS } from '../lib/startup/command-registry.js';
 /** Built-in top-level command names, for validating `--disable <cmd>`. */

package/dist/commands/org.d.ts

@@ -0,0 +1,6 @@
+import type { Command } from 'commander';
+/** `--role` defaults to member when omitted; anything present must be a real role — never silently coerced. */
+export declare function resolveInviteRole(raw: string | undefined): 'admin' | 'member';
+/** Validate a role argument before any network call — same rule the backend enforces server-side. */
+export declare function parseRole(raw: string): 'admin' | 'member';
+export declare function registerOrgCommand(program: Command): void;