@phnx-labs/agents-cli 1.22.53 → 1.22.55

package/dist/commands/output.js

@@ -42,8 +42,14 @@ The burn is split into input / cache-read / cache-write where the harness record
 (Claude/Codex/Gemini/Droid). --pricing no-cache reprices cached tokens at the input rate,
 so you can see what caching is saving. --json always carries both actual and no-cache costs.
 `)
-        .action(async (options) => {
-        await outputAction(options);
+        // Read opts via optsWithGlobals(): `--json`/`--since`/`--by` collide by name
+        // with the `insights` parent's own options, so commander binds them to the
+        // parent at parse time and the leaf's plain opts() never sees them. Merging
+        // ancestor opts is what the sibling `insights mix` recipes already do
+        // (mix-commands.ts) — without it every flag on this command is silently
+        // dropped (e.g. `agents insights output --json` printed the human table).
+        .action(async (_options, command) => {
+        await outputAction(command.optsWithGlobals());
     });
 }
 function resolveGroup(by) {

package/dist/commands/repo.js

@@ -1052,6 +1052,14 @@ export function registerRepoCommands(program) {
             ].filter(Boolean);
             if (parts.length > 0)
                 console.log(chalk.gray(`Device policy: ${parts.join(' · ')}`));
+            const { syncReservedAuthBundle } = await import('../lib/secrets/reserved-sync.js');
+            const auth = syncReservedAuthBundle();
+            if (auth.pushed.length > 0) {
+                console.log(chalk.gray(`Auth bundle: pushed to ${auth.pushed.join(', ')}`));
+            }
+            for (const err of auth.errors) {
+                console.error(chalk.yellow(`Auth bundle: ${err.device}: ${err.message}`));
+            }
         }
     });
     repoCmd
@@ -1091,6 +1099,16 @@ export function registerRepoCommands(program) {
             const result = await commitAndPush(t.dir, options.message);
             if (result.success) {
                 spinner.succeed(`${formatRepoTarget(t.alias, t.dir, result.branch)}: ${result.detail ?? 'pushed'}`);
+                if (t.alias === 'user') {
+                    const { syncReservedAuthBundle } = await import('../lib/secrets/reserved-sync.js');
+                    const auth = syncReservedAuthBundle();
+                    if (auth.pushed.length > 0) {
+                        console.log(chalk.gray(`Auth bundle: pushed to ${auth.pushed.join(', ')}`));
+                    }
+                    for (const err of auth.errors) {
+                        console.error(chalk.yellow(`Auth bundle: ${err.device}: ${err.message}`));
+                    }
+                }
             }
             else {
                 spinner.fail(`${formatRepoTarget(t.alias, t.dir)}: ${result.error}`);

package/dist/commands/routines.js

@@ -16,7 +16,7 @@ import { parseAgentVersionSpec, isAgentHardDeprecated, hardDeprecationError, ROU
 import { isCustomHarnessName } from '../lib/profiles.js';
 import { RUN_STRATEGIES, normalizeRunStrategy } from '../lib/accounting/rotate.js';
 import { formatRepoLink, REPO_DISPLAY_MAX } from '../lib/routines-format.js';
-import { listJobs as listAllJobs, deleteJob, readJob, validateJob, writeJob, setJobEnabled, listRuns, routineStats, getLatestRun, getRunDir, getJobPath, isCanonicalRoutineSource, parseAtTime, hasCompletedOneShotRun, isOneShotLikeSchedule, isOneShotRoutine, jobRunsOnThisDevice, checkJobDeviceEligibility, normalizeTriggerEvent, parseHostStrategy, resolveHostStrategy, HOST_STRATEGIES, computeProjectGroupKind, projectGroupKey, projectGroupTitle, projectGroupOrder, normalizeProjects, buildRoutineListJson, fireConditionLabel, nextRunForDisplay, nextRunLabel, localLatestRun, listJobsForDisplay, } from '../lib/scheduling/routines.js';
+import { listJobs as listAllJobs, deleteJob, readJob, validateJob, writeJob, setJobEnabled, listRuns, routineStats, getLatestRun, getRunDir, getJobPath, isCanonicalRoutineSource, parseAtTime, hasCompletedOneShotRun, isOneShotLikeSchedule, isOneShotRoutine, jobRunsOnThisDevice, checkJobDeviceEligibility, normalizeTriggerEvent, parseHostStrategy, resolveHostStrategy, HOST_STRATEGIES, computeProjectGroupKind, projectGroupKey, projectGroupTitle, projectGroupOrder, normalizeProjects, buildRoutineListJson, buildRoutineStatusRows, fireConditionLabel, nextRunForDisplay, nextRunLabel, localLatestRun, listJobsForDisplay, } from '../lib/scheduling/routines.js';
 export { buildRoutineListJson } from '../lib/scheduling/routines.js';
 import { listProjectDefs, isSafeProjectName } from '../lib/projects.js';
 import { evaluateActivationReadinessLive } from '../lib/routine-readiness.js';
@@ -831,6 +831,9 @@ export function registerRoutinesCommands(program) {
 
       # Check whether the scheduler is running
       agents routines status
+
+      # Machine-readable scheduler + per-routine status: owner device, last fire, last error, in-flight run
+      agents routines status --json
     `,
         notes: `
       A routine is a YAML file that schedules an agent invocation. It specifies:
@@ -2148,12 +2151,38 @@ export function registerRoutinesCommands(program) {
     routinesCmd
         .command('status')
         .description('Show scheduler status, enabled routines, and when each one fires next.')
-        .action(() => {
+        .option('--json', 'Emit machine-readable scheduler + per-routine status (owner device, last fire, last error, in-flight run)')
+        .action((options) => {
         try {
             monitorRunningJobs();
         }
         catch { /* best-effort orphan reap */ }
         const status = getDaemonStatus();
+        // The daemon-owned status surface (PHNX-3215): scheduler truth plus, per
+        // routine, its single owner device, last fire outcome + error, and any
+        // in-flight spawn — the fields `list --json` (definition-shaped) does not
+        // carry. Emitted from THIS device, so per-device fields read as this box's.
+        if (options.json) {
+            const rows = buildRoutineStatusRows();
+            writeJson({
+                device: machineId(),
+                scheduler: {
+                    state: status.state,
+                    pid: status.pid,
+                    binaryPath: status.binaryPath,
+                    heartbeat: status.heartbeat
+                        ? {
+                            lastTick: status.heartbeat.lastTick,
+                            ageSec: Math.round((Date.now() - Date.parse(status.heartbeat.lastTick)) / 1000),
+                        }
+                        : null,
+                    enabled: rows.filter((r) => r.enabled).length,
+                    total: rows.length,
+                },
+                routines: rows,
+            });
+            return;
+        }
         console.log(chalk.bold('Scheduler\n'));
         const stateLabel = status.state === 'running'
             ? chalk.green('running')

package/dist/commands/secrets.js

@@ -18,7 +18,7 @@ import { ensureDaemonStarted, isDaemonRunning } from '../lib/daemon/daemon.js';
 import { parseHostsOption, remoteResolveEnv, remoteSecretsRaw, remoteSecretsStream, resolveHostSshTarget, } from '../lib/secrets/remote.js';
 import { resolveBundleForPush, pushResolvedBundleToHost, bundleEnvToDotenv } from '../lib/secrets/push.js';
 export { bundleEnvToDotenv };
-import { bundleBackend, bundleExists, bundleItemStore, bundlePolicy, deleteBundle, describeBundle, keychainItemsForBundle, keychainRef, listBundles, healKeychainBundleMetadataAclOnce, isHeadlessSecretsContext, isAgentInvocationContext, migrateLegacyBundles, parseDotenv, readAndResolveBundleEnv, readBundle, readBundleIfDecryptable, reAclBundleItems, renameBundle, rotateBundleSecret, sanitizeProcessEnv, validateBundleName, validateEnvKey, validateExpiresFutureDated, validateSecretType, writeBundle, writeBundleWithItems, SECRET_TYPES, } from '../lib/secrets/bundles.js';
+import { bundleBackend, bundleExists, bundleItemStore, bundlePolicy, deleteBundle, describeBundle, keychainItemsForBundle, keychainRef, listBundles, healKeychainBundleMetadataAclOnce, isHeadlessSecretsContext, isAgentInvocationContext, migrateLegacyBundles, parseDotenv, readAndResolveBundleEnv, readBundle, readBundleIfDecryptable, reAclBundleItems, renameBundle, rotateBundleSecret, sanitizeProcessEnv, validateBundleName, validateEnvKey, validateExpiresFutureDated, validateSecretType, writeBundle, writeBundleWithItems, assertFileBundleDecryptable, isReservedBundleName, ReservedBundleWrongBackendError, SECRET_TYPES, } from '../lib/secrets/bundles.js';
 import { parseListFilters, bundleMatchesFilter, bundleExpiry, filterIsActive, describeFilter, parseSortField, sortBundles, SORT_FIELDS, REF_KINDS, DEFAULT_EXPIRING_DAYS, } from '../lib/secrets/list-filter.js';
 import { encryptForFallback, decryptForFallback } from '../lib/secrets/filestore.js';
 import { getKeychainToken, hasKeychainToken, secretsKeychainItem, setKeychainToken, maybeAutoRekey, } from '../lib/secrets/index.js';
@@ -846,7 +846,12 @@ export function renderExpiringCol(b, now = Date.now()) {
  * exists to describe. `--force` already means "overwrite what is there".
  */
 export function resolveImportBundle(name, backendOpt, synced = false, force = false) {
-    const requestedBackend = synced ? 'vault' : resolveBackendOpt(backendOpt);
+    if (isReservedBundleName(name) && (synced || (backendOpt && backendOpt !== 'file'))) {
+        throw new ReservedBundleWrongBackendError(name, synced ? 'vault' : resolveBackendOpt(backendOpt));
+    }
+    const requestedBackend = isReservedBundleName(name)
+        ? 'file'
+        : (synced ? 'vault' : resolveBackendOpt(backendOpt));
     if (bundleExists(name)) {
         // readBundleIfDecryptable nulls ONLY on BundleUndecryptableError; a locked
         // keychain or logged-out vault still throws, so a recoverable state can
@@ -892,6 +897,9 @@ function applyEnvToBundle(bundle, env, opts) {
     else {
         writeBundle(bundle);
     }
+    if (added > 0) {
+        assertFileBundleDecryptable(bundle.name, Object.keys(env).filter((k) => k in bundle.vars));
+    }
     return { added, skipped };
 }
 /** Register the `agents secrets` command tree. */
@@ -1581,7 +1589,16 @@ export function registerSecretsCommands(program) {
             // inherits the configured default (`hold`) instead of being pinned.
             const policyOpt = opts.policy ?? opts.tier;
             const policy = policyOpt ? parsePolicyOpt(policyOpt) : undefined;
-            const backend = opts.synced ? 'vault' : resolveBackendOpt(opts.backend);
+            let backend = opts.synced ? 'vault' : resolveBackendOpt(opts.backend);
+            if (isReservedBundleName(resolvedName)) {
+                // Reserved `auth` is file-backed by construction. Omitting --backend
+                // still forces file even when agents.yaml defaults to keychain; an
+                // explicit non-file backend fails loud (SEC-GAP-3).
+                if (opts.synced || (opts.backend && opts.backend !== 'file')) {
+                    throw new ReservedBundleWrongBackendError(resolvedName, backend);
+                }
+                backend = 'file';
+            }
             if (bundleExists(resolvedName) && !opts.force) {
                 console.error(chalk.red(`Bundle '${resolvedName}' already exists. Use --force to overwrite.`));
                 process.exit(1);
@@ -2134,7 +2151,7 @@ Examples:
         .option('--to-1password', 'Push every key in the bundle as a PASSWORD item in a 1Password vault')
         .option('--vault <name>', '1Password vault name (used with --to-1password)')
         .option('--device <target...>', 'Push the bundle over SSH to this device (host alias or user@host); repeatable for multiple machines')
-        .option('--remote-backend <backend>', 'Backend for the bundle on the remote device (with --device): keychain (default) or file. file is headless-readable via the remote\'s machine-local key; it forwards AGENTS_SECRETS_PASSPHRASE over stdin only if set (opt-in).', 'keychain')
+        .option('--remote-backend <backend>', 'Backend for the bundle on the remote device (with --device): keychain (default) or file. file is headless-readable via the remote\'s machine-local key and never forwards AGENTS_SECRETS_PASSPHRASE.', 'keychain')
         .option('--force', 'Overwrite existing keys/items on the target (used with --to-1password and --device)')
         .option('--to-file <path>', `Write the bundle as an AES-256-GCM encrypted offline file (needs ${SYNC_PASSPHRASE_ENV}; symmetric counterpart of import --from-file)`)
         .action(async (bundleName, opts) => {
@@ -2170,15 +2187,18 @@ Examples:
                     console.error(chalk.red("--remote-backend vault is not supported; use 'keychain' or 'file'."));
                     process.exit(1);
                 }
-                const remoteBackend = parsedBackend;
-                // For a file-backed remote bundle a passphrase is OPTIONAL. The file
-                // store is passphrase-free by default: with AGENTS_SECRETS_PASSPHRASE
-                // unset the remote `import --backend file` auto-provisions the remote's
-                // own machine-local key (0600 under ~/.agents/.secrets-key/), so reads
-                // are HEADLESS. We forward the LOCAL AGENTS_SECRETS_PASSPHRASE only when
-                // the operator opts in by setting it. Forcing a shared passphrase would
-                // defeat headless reads, so we no longer require one.
-                const remotePassphrase = remoteBackend === 'file' ? (process.env.AGENTS_SECRETS_PASSPHRASE ?? '') : '';
+                let remoteBackend = parsedBackend;
+                if (isReservedBundleName(resolvedBundleName)) {
+                    if (opts.remoteBackend && opts.remoteBackend !== 'file') {
+                        throw new ReservedBundleWrongBackendError(resolvedBundleName, parsedBackend);
+                    }
+                    remoteBackend = 'file';
+                }
+                // File-backend export NEVER forwards AGENTS_SECRETS_PASSPHRASE
+                // (PHNX-2371). Forwarding it keys the remote ciphertext to a secret
+                // the destination daemon does not hold, so later headless reads fail
+                // while import still prints "Imported N key(s)". The remote
+                // auto-provisions its own machine-local key instead.
                 // Resolve ONCE for N hosts — reading a bundle can prompt, and doing it
                 // per host would prompt per host.
                 //
@@ -2197,7 +2217,6 @@ Examples:
                     const out = pushResolvedBundleToHost(resolvedForPush, resolvedBundleName, host, {
                         remoteBackend,
                         force: opts.force,
-                        passphrase: remotePassphrase,
                         operation: 'ssh export',
                     });
                     if (!out.ok) {

package/dist/commands/sessions.d.ts

@@ -676,7 +676,7 @@ export declare function formatPickerLabel(s: SessionMeta, query: string, cols?:
  * so it stays fixed across the picker's re-renders within a single run.
  */
 export declare function formatPickerTip(sessions: SessionMeta[]): string;
-export declare function pickSessionInteractive(sessions: SessionMeta[], message?: string, initialSearch?: string, hiddenCount?: number, enterHint?: string): Promise<PickedSession | null>;
+export declare function pickSessionInteractive(sessions: SessionMeta[], message?: string, initialSearch?: string, hiddenCount?: number, enterHint?: string, scope?: SessionSearchScope): Promise<PickedSession | null>;
 /**
  * Row-id prefix for a live session whose agent has not reported a session id yet
  * (a booting harness, a queued teammate). The browser lists these so nothing live
@@ -736,6 +736,16 @@ interface AgentFilter {
  * alias and single-typo rules. Kept pure so focus and the browser cannot drift. */
 export declare function resolveSessionAgentName(name: string): SessionAgentId | null;
 export declare function parseAgentFilter(agentName?: string): AgentFilter;
+/**
+ * Explicit `--agent` / `--project` / `--routine` flags. Distinct from the
+ * listing pool (cwd-scoped, default-capped) that PHNX-2767 hydrates past:
+ * these flags MUST still exclude FTS hits after that union.
+ */
+export type SessionSearchScope = {
+    agent?: string;
+    project?: string;
+    routine?: boolean | string;
+};
 /**
  * How a `sessions <query>` argument was resolved against the pool.
  *
@@ -759,29 +769,27 @@ export interface SessionQueryResolution {
  */
 export declare function resolveSessionQuery(pool: SessionMeta[], query: string, options?: {
     indexFallback?: boolean;
+    scope?: SessionSearchScope;
 }): SessionQueryResolution;
 /** Honest result of a fleet sweep that found nothing: it says what the sweep
  * actually did — how many peers answered, which were unreachable — instead of
  * dead-ending on "search with --device <host>" after the search already ran. */
 export declare function fleetNotFoundMessage(query: string, deviceCount: number, unreachable: string[]): string[];
 /** Filter and rank sessions by a multi-term search query across metadata and content. */
-export declare function filterSessionsByQuery(sessions: SessionMeta[], query: string | undefined): SessionMeta[];
+export declare function filterSessionsByQuery(sessions: SessionMeta[], query: string | undefined, scope?: SessionSearchScope): SessionMeta[];
 /**
  * Narrow a session list by --project and --agent before search resolution.
  * Without this, a query like "scoped search" could match sessions in BOTH
  * the project you specified AND elsewhere, producing an ambiguity error
  * even though the user already pointed at the correct scope.
+ *
+ * PHNX-2767 hydrates FTS hits missing from the listing pool *after* this
+ * runs, so callers that search must also pass the same scope into
+ * `filterSessionsByQuery` / `scopedContentIndex` or the union
+ * reintroduces the rows this function just dropped.
  */
-export declare function applyScopeFilters(sessions: SessionMeta[], scope: {
-    agent?: string;
-    project?: string;
-    routine?: boolean | string;
-}): SessionMeta[];
-export declare function artifactLookupScope(agent?: string, project?: string, routine?: boolean | string): {
-    agent?: string;
-    project?: string;
-    routine?: boolean | string;
-};
+export declare function applyScopeFilters(sessions: SessionMeta[], scope: SessionSearchScope): SessionMeta[];
+export declare function artifactLookupScope(agent?: string, project?: string, routine?: boolean | string): SessionSearchScope;
 /**
  * Whether a missed local id lookup should widen to a cross-machine sweep.
  *

package/dist/commands/sessions.js

@@ -1978,7 +1978,7 @@ export async function renderSessionPreview(query, scope) {
     if (outcome.kind !== 'resolved'
         && (!scope.hosts?.length || shouldIncludeLocal(scope.hosts, machineId()))) {
         const discovered = applyScopeFilters(await discoverSessions({ all: true, cwd: process.cwd(), limit: 5000, waitForScan: true }), scope);
-        const localMatches = resolveSessionQuery(discovered, query, { indexFallback: false }).matches
+        const localMatches = resolveSessionQuery(discovered, query, { indexFallback: false, scope }).matches
             .map(session => ({ ...session, machine: session.machine || machineId() }));
         const exact = localMatches.find(session => selectorAllowsEarlyExit(query)
             && session.id.toLowerCase() === query.trim().toLowerCase());
@@ -2674,7 +2674,11 @@ limitSource) {
         if (toolEvidenceMode) {
             const self = toolSelf;
             const selectedSessions = searchQuery
-                ? filterSessionsByQuery(sessions, searchQuery)
+                ? filterSessionsByQuery(sessions, searchQuery, {
+                    agent: options.agent,
+                    project: options.project,
+                    routine: options.routine,
+                })
                 : sessions;
             const localSessions = selectedSessions;
             const mayFanOut = options.local !== true && process.env[NO_FANOUT_ENV] !== '1';
@@ -2771,7 +2775,9 @@ limitSource) {
             // that merely MENTIONS the id, defeating exact remote resolution. A genuine
             // search phrase keeps the ranked metadata+content path.
             const filtered = searchQuery
-                ? resolveSessionQuery(sessions, searchQuery).matches
+                ? resolveSessionQuery(sessions, searchQuery, {
+                    scope: { agent: options.agent, project: options.project, routine: options.routine },
+                }).matches
                 : sessions;
             // JSON is the canonical picker contract: enrich the durable rows once
             // from the shared live cache so every consumer gets lifecycle/recovery
@@ -2880,7 +2886,7 @@ limitSource) {
             const message = pathFilter
                 ? `Search sessions (${path.basename(pathFilter)}):`
                 : formatSearchMessage(options);
-            const picked = await pickSessionInteractive(sessions, message, searchQuery, hiddenCount);
+            const picked = await pickSessionInteractive(sessions, message, searchQuery, hiddenCount, undefined, { agent: options.agent, project: options.project, routine: options.routine });
             if (picked) {
                 await handlePickedSession(picked);
                 return;
@@ -2888,7 +2894,13 @@ limitSource) {
             return;
         }
         // Non-interactive fallback (piped output) or --flat/--tree.
-        const filtered = searchQuery ? filterSessionsByQuery(sessions, searchQuery) : sessions;
+        const filtered = searchQuery
+            ? filterSessionsByQuery(sessions, searchQuery, {
+                agent: options.agent,
+                project: options.project,
+                routine: options.routine,
+            })
+            : sessions;
         const liveIndex = await maybeLiveIndex(options);
         printSessionTable(filtered, hiddenCount, options.tree === true, liveIndex);
         // Every listing path must say what it dropped — a hidden default that stays
@@ -3764,7 +3776,7 @@ const PICKER_TIPS = [
 export function formatPickerTip(sessions) {
     return chalk.gray(PICKER_TIPS[sessions.length % PICKER_TIPS.length]);
 }
-export async function pickSessionInteractive(sessions, message = 'Search sessions:', initialSearch, hiddenCount = 0, enterHint) {
+export async function pickSessionInteractive(sessions, message = 'Search sessions:', initialSearch, hiddenCount = 0, enterHint, scope) {
     // The hidden-session footer is console.log'd above the Inquirer prompt, so it
     // scrolls the viewport the picker can't measure; tell the picker to reserve for
     // it (see pickerPageSize) so the preview and the footer stay on screen together.
@@ -3784,7 +3796,7 @@ export async function pickSessionInteractive(sessions, message = 'Search session
                 // Typing: search the full pool.
                 if (!query.trim())
                     return sessions;
-                return filterSessionsByQuery(sessions, query);
+                return filterSessionsByQuery(sessions, query, scope);
             },
             labelFor: (s, query) => formatPickerLabel(s, query, cols),
             pageSize: PICKER_RECENT_COUNT,
@@ -4179,7 +4191,7 @@ export function resolveSessionQuery(pool, query, options = {}) {
         const matches = options.indexFallback === false ? [] : findSessionsById(normalized);
         return { matches, byId: true, completeId };
     }
-    return { matches: filterSessionsByQuery(pool, normalized), byId: false, completeId };
+    return { matches: filterSessionsByQuery(pool, normalized, options.scope), byId: false, completeId };
 }
 /** Explain an ambiguous resolution. Only a short id can be lengthened: a complete
  * id is already maximal, and a search phrase was never an id to begin with. */
@@ -4218,7 +4230,7 @@ export function fleetNotFoundMessage(query, deviceCount, unreachable) {
     return lines;
 }
 /** Filter and rank sessions by a multi-term search query across metadata and content. */
-export function filterSessionsByQuery(sessions, query) {
+export function filterSessionsByQuery(sessions, query, scope) {
     const trimmed = query?.trim().toLowerCase() || '';
     if (!trimmed)
         return sessions;
@@ -4228,7 +4240,9 @@ export function filterSessionsByQuery(sessions, query) {
         return sessions.filter((session) => session.agent === agent && session.version === version);
     }
     const terms = trimmed.split(/\s+/).filter(Boolean);
-    const contentIndex = searchContentIndex(sessions, trimmed);
+    // Hydrate FTS hits missing from the pool (PHNX-2767), then drop hits that
+    // fail --project/--agent/--routine so those flags are not undone by the union.
+    const contentIndex = scopedContentIndex(sessions, trimmed, scope);
     // If the query exactly matches a session label, short-circuit the structural
     // scorer (which would otherwise surface every session whose topic happens to
     // contain the same words) and return only the label hits.
@@ -4237,7 +4251,15 @@ export function filterSessionsByQuery(sessions, query) {
     if (exactLabelHits.length > 0) {
         return exactLabelHits.sort((a, b) => (b._bm25Score ?? 0) - (a._bm25Score ?? 0));
     }
-    return sessions
+    // The listing pool is a page of the index. FTS hits the whole index. Union
+    // so a grep-visible transcript is returned even when it missed the page
+    // (PHNX-2767).
+    const poolById = new Map(sessions.map(s => [s.id, s]));
+    for (const [id, hit] of contentIndex) {
+        if (!poolById.has(id))
+            poolById.set(id, hit);
+    }
+    return [...poolById.values()]
         .map(session => ({ session, score: scoreSessionQuery(session, terms) }))
         .filter(entry => {
         // Include if scored by topic/project/etc, or matched by content search
@@ -4314,6 +4336,11 @@ function scoreSessionQuery(session, terms) {
  * Without this, a query like "scoped search" could match sessions in BOTH
  * the project you specified AND elsewhere, producing an ambiguity error
  * even though the user already pointed at the correct scope.
+ *
+ * PHNX-2767 hydrates FTS hits missing from the listing pool *after* this
+ * runs, so callers that search must also pass the same scope into
+ * `filterSessionsByQuery` / `scopedContentIndex` or the union
+ * reintroduces the rows this function just dropped.
  */
 export function applyScopeFilters(sessions, scope) {
     let filtered = sessions;
@@ -4350,6 +4377,23 @@ export function applyScopeFilters(sessions, scope) {
     }
     return filtered;
 }
+/**
+ * PHNX-2767 hydrates FTS hits missing from the listing pool. That union is
+ * unscoped on purpose (cwd/limit are a page of the index, not a filter).
+ * `--project` / `--agent` / `--routine` ARE filters: drop hydrated hits that
+ * fail them so content search cannot undo a scope the user already set.
+ */
+function scopedContentIndex(sessions, query, scope) {
+    const hits = searchContentIndex(sessions, query);
+    if (!scope || (!scope.agent && !scope.project && !scope.routine))
+        return hits;
+    const kept = new Map();
+    for (const [id, session] of hits) {
+        if (applyScopeFilters([session], scope).length > 0)
+            kept.set(id, session);
+    }
+    return kept;
+}
 export function artifactLookupScope(agent, project, routine) {
     return { agent, project, routine };
 }
@@ -4365,7 +4409,7 @@ async function renderArtifactsGlobal(query, listAll, name, scope) {
         });
         tracker.stop();
         const allSessions = applyScopeFilters(discovered, scope);
-        const { matches: queryMatches, byId, completeId } = resolveSessionQuery(allSessions, query);
+        const { matches: queryMatches, byId, completeId } = resolveSessionQuery(allSessions, query, { scope });
         if (queryMatches.length === 0) {
             spinner.stop();
             if (byId)
@@ -4462,7 +4506,7 @@ async function renderOneSession(query, mode, scope) {
         tracker.stop();
         const allSessions = applyScopeFilters(discovered, scope);
         let session;
-        const resolution = resolveSessionQuery(allSessions, query);
+        const resolution = resolveSessionQuery(allSessions, query, { scope });
         let queryMatches = resolution.matches;
         let byId = resolution.byId;
         const completeId = resolution.completeId;
@@ -4474,7 +4518,7 @@ async function renderOneSession(query, mode, scope) {
         // echoes the id in a resume prompt. Gate on looksLikeSessionId, not just
         // completeId, so a short id resolves to "no match" rather than fuzzy content.
         if (queryMatches.length === 0 && !looksLikeSessionId(query)) {
-            const contentResults = searchContentIndex(allSessions, query);
+            const contentResults = scopedContentIndex(allSessions, query, scope);
             if (contentResults.size > 0) {
                 const matchedSessions = Array.from(contentResults.values())
                     .sort((a, b) => (b._bm25Score ?? 0) - (a._bm25Score ?? 0));
@@ -4669,16 +4713,16 @@ export function fleetCandidatesByQuery(rows, query, trustResolvedRows = false) {
     });
 }
 /** Resolve through the canonical metadata+content union used by keyword search. */
-function resolveIndexedMetadataRows(indexed, selector) {
+function resolveIndexedMetadataRows(indexed, selector, scope) {
     const alias = resolveSessionAlias(selector);
     if (alias.kind === 'resolved') {
-        return resolveSessionQuery(indexed, alias.sessionId, { indexFallback: false }).matches;
+        return resolveSessionQuery(indexed, alias.sessionId, { indexFallback: false, scope }).matches;
     }
     if (alias.kind === 'ambiguous') {
         const ids = new Set(alias.sessionIds.map(id => id.toLowerCase()));
         return indexed.filter(session => ids.has(session.id.toLowerCase()));
     }
-    return resolveSessionQuery(indexed, selector, { indexFallback: false }).matches;
+    return resolveSessionQuery(indexed, selector, { indexFallback: false, scope }).matches;
 }
 /**
  * ID-shaped selectors go straight to SQLite's primary-key/short-id lookup.
@@ -4789,7 +4833,7 @@ export async function computeLocalMetadataMatches(selector, scope, deps = {}) {
     const includeLocal = !scope.hosts?.length || shouldIncludeLocal(scope.hosts, localMachine);
     if (!includeLocal)
         return [];
-    const indexed = resolveIndexedMetadataRows(indexedRowsForSelector(selector, scope), selector);
+    const indexed = resolveIndexedMetadataRows(indexedRowsForSelector(selector, scope), selector, scope);
     if (indexed.length > 0 || !looksLikeSessionId(selector)) {
         return indexed.map(session => ({ ...session, machine: session.machine || localMachine }));
     }
@@ -4806,7 +4850,7 @@ export async function computeLocalMetadataMatches(selector, scope, deps = {}) {
  */
 export async function liveMetadataMatches(selector, scope, self, deps = {}) {
     const load = deps.loadActive ?? loadLocalActiveSessions;
-    const match = (metas) => resolveIndexedMetadataRows(applyScopeFilters(metas, scope), selector);
+    const match = (metas) => resolveIndexedMetadataRows(applyScopeFilters(metas, scope), selector, scope);
     try {
         const cached = liveSessionMetas((await load()).sessions, self, Date.now());
         const hit = match(cached);
@@ -5023,7 +5067,7 @@ export function registerSessionsCommands(program) {
         .option('--preview', 'With a session id/query: print a compact preview and exit (no pager)');
     setHelpSections(sessionsCmd, {
         examples: `
-      # Search prior sessions in this project by topic, file path, or command
+      # Search indexed transcripts by topic, file path, or command
       agents sessions "add auth middleware"
 
       # Read a session as markdown (user + assistant + thinking + tools)

package/dist/commands/setup-accounts.d.ts

@@ -0,0 +1,8 @@
+/**
+ * `agents setup accounts` — mint a Claude setup-token so unattended usage/probe
+ * is not stuck on "usage pending". Delegates to the same mint engine as
+ * `agents accounts mint` / `agents auth mint`.
+ */
+import type { Command } from 'commander';
+export declare function runAccountsSetupWizard(): Promise<void>;
+export declare function registerSetupAccountsCommand(setupCmd: Command): void;

package/dist/commands/setup-accounts.js

@@ -0,0 +1,47 @@
+import chalk from 'chalk';
+import { confirm } from '@inquirer/prompts';
+import { isInteractiveTerminal, isPromptCancelled } from './utils.js';
+import { hasMintedSetupToken, mintAndSeed } from '../lib/auth-mint.js';
+export async function runAccountsSetupWizard() {
+    const status = hasMintedSetupToken();
+    if (status.ready) {
+        console.log(chalk.green(`Setup-token already minted (${status.detail}).`));
+        console.log(chalk.gray('Re-mint with: agents accounts mint claude'));
+        return;
+    }
+    if (!isInteractiveTerminal()) {
+        console.log(chalk.yellow('No Claude setup-token on this machine.'));
+        console.log(chalk.gray('Mint one with: agents accounts mint claude'));
+        console.log(chalk.gray('Already have a token: agents accounts mint claude --token-stdin'));
+        process.exitCode = 1;
+        return;
+    }
+    const proceed = await confirm({
+        message: 'Mint a Claude setup-token now? (opens a browser; seeds a named account + the reserved auth bundle)',
+        default: true,
+    });
+    if (!proceed) {
+        console.log(chalk.gray('Skipped. Run `agents accounts mint claude` when ready.'));
+        return;
+    }
+    const result = await mintAndSeed({ harness: 'claude' });
+    console.log(chalk.green(`Minted account '${result.account}' for ${result.email}.`));
+}
+export function registerSetupAccountsCommand(setupCmd) {
+    setupCmd
+        .command('accounts')
+        .description('Mint a Claude setup-token into a named account (unattended usage/probe).')
+        .action(async () => {
+        try {
+            await runAccountsSetupWizard();
+        }
+        catch (err) {
+            if (isPromptCancelled(err)) {
+                console.log(chalk.yellow('\nCancelled'));
+                return;
+            }
+            console.error(chalk.red(err instanceof Error ? err.message : String(err)));
+            process.exitCode = 1;
+        }
+    });
+}

package/dist/commands/setup.d.ts

@@ -31,7 +31,7 @@ export declare function ensureInitialized(program: Command): Promise<void>;
  * wizard. Never throws — a cancel or an optional wizard's error just skips the
  * rest and lets core setup complete.
  */
-export type SetupPhase = 'browser' | 'computer' | 'share' | 'secrets' | 'fleet' | 'watchdog' | 'preferences';
+export type SetupPhase = 'browser' | 'computer' | 'share' | 'secrets' | 'accounts' | 'fleet' | 'watchdog' | 'preferences';
 export type SetupStatusState = 'ready' | 'missing' | 'n/a';
 export interface SetupStatusRow {
     phase: 'core' | SetupPhase;

package/dist/commands/setup.js

@@ -24,7 +24,9 @@ import { runShareWizard } from './artifacts-setup.js';
 import { registerSetupMineCommand } from './setup-mine.js';
 import { registerSetupSecretsCommand } from './setup-secrets.js';
 import { registerSetupFleetCommand } from './setup-fleet.js';
+import { registerSetupAccountsCommand, runAccountsSetupWizard } from './setup-accounts.js';
 import { registerSetupWatchdogCommand, runWatchdogSetupWizard } from './setup-watchdog.js';
+import { hasMintedSetupToken } from '../lib/auth-mint.js';
 import { registerAliasCommand } from './alias.js';
 import { registerBetaCommands } from './beta.js';
 import { runPreferencesStep } from './setup-preferences.js';
@@ -276,6 +278,7 @@ export async function getSetupStatus() {
     const devices = await loadDevices();
     const coreReady = isGitRepo(getAgentsDir());
     const secretsReady = fs.existsSync(setupSecretsPrefsPath());
+    const minted = hasMintedSetupToken();
     const shareConfig = readShareConfig();
     const watchdogEnabled = getConfigValue('watchdog.enabled').value === true;
     const interactiveHost = getConfigValue('interactive.host').value;
@@ -285,6 +288,7 @@ export async function getSetupStatus() {
         { phase: 'browser', state: browserReady ? 'ready' : 'missing', detail: browserReady ? `profile ${browserProfile.name}` : browserProfile ? `profile ${browserProfile.name} cannot launch here` : installedBrowsers.length ? 'no default profile' : 'no supported browser found' },
         { phase: 'computer', state: computerState, detail: computerState === 'ready' ? 'helper trusted' : computerState === 'n/a' ? 'macOS local setup only' : 'helper not running or not trusted' },
         { phase: 'secrets', state: secretsReady ? 'ready' : 'missing', detail: secretsReady ? 'defaults chosen' : 'defaults not chosen' },
+        { phase: 'accounts', state: minted.ready ? 'ready' : 'missing', detail: minted.detail },
         { phase: 'fleet', state: Object.keys(devices).length ? 'ready' : 'missing', detail: Object.keys(devices).length ? `${Object.keys(devices).length} device${Object.keys(devices).length === 1 ? '' : 's'} registered` : 'no devices registered' },
         { phase: 'share', state: shareConfig ? 'ready' : 'missing', detail: shareConfig?.baseUrl ?? 'endpoint not configured' },
         { phase: 'watchdog', state: watchdogEnabled ? 'ready' : 'missing', detail: watchdogEnabled ? 'enabled on this device' : 'disabled on this device' },
@@ -308,6 +312,8 @@ async function runSetupPhase(phase) {
         await runShareWizard();
     else if (phase === 'secrets')
         await import('./setup-secrets.js').then((m) => m.runSecretsSetupWizard());
+    else if (phase === 'accounts')
+        await runAccountsSetupWizard();
     else if (phase === 'fleet')
         await import('./setup-fleet.js').then((m) => m.runFleetSetupWizard());
     else if (phase === 'watchdog')
@@ -364,19 +370,20 @@ export function registerSetupCommand(program) {
         .description('Set up agents-cli, or re-open the capability onboarding hub.')
         .option('-f, --force', 'Re-run setup even if ~/.agents/.system/ already exists (use with caution)')
         .option('--no-system-repo', 'Skip cloning the system repo (you must populate ~/.agents/.system/ yourself)');
-    // Capability subcommands: `agents setup browser|computer|mine|secrets|fleet|alias|beta`.
+    // Capability subcommands: `agents setup browser|computer|mine|secrets|accounts|fleet|alias|beta`.
     // Share/artifact publishing is set up by `agents artifacts setup` (RUSH-2580);
     // the hub below still offers it as a phase via runShareWizard.
     registerSetupBrowserCommand(setupCmd);
     registerSetupComputerCommand(setupCmd);
     registerSetupMineCommand(setupCmd);
     registerSetupSecretsCommand(setupCmd);
+    registerSetupAccountsCommand(setupCmd);
     registerSetupFleetCommand(setupCmd);
     registerSetupWatchdogCommand(setupCmd);
     registerAliasCommand(setupCmd);
     registerBetaCommands(setupCmd);
     setupCmd.command('status')
-        .description('Show setup readiness for core, browser, computer, secrets, fleet, share, watchdog, and preferences.')
+        .description('Show setup readiness for core, browser, computer, secrets, accounts, fleet, share, watchdog, and preferences.')
         .option('--json', 'print machine-readable JSON')
         .action(async (options) => {
         const rows = await getSetupStatus();
@@ -399,6 +406,7 @@ export function registerSetupCommand(program) {
       agents setup browser
       agents setup computer
       agents setup secrets
+      agents setup accounts
       agents setup fleet
       agents setup watchdog
       agents setup alias add teams
@@ -416,6 +424,7 @@ export function registerSetupCommand(program) {
         agents setup computer    # install the signed macOS helper + grant permissions
         agents artifacts setup   # provision or join a Cloudflare share endpoint
         agents setup secrets     # choose secrets backend/policy defaults + import
+        agents setup accounts    # mint a Claude setup-token for unattended usage/probe
         agents setup fleet       # discover Tailscale devices + configure SSH access
         agents setup watchdog    # choose which devices run the daemon watchdog pass
         agents setup alias add teams  # PATH shorthand: teams runs agents teams