@phnx-labs/agents-cli 1.20.92 → 1.21.0

package/dist/lib/sqlite.js

@@ -14,11 +14,38 @@
 import { createRequire } from 'module';
 const isBun = typeof globalThis.Bun !== 'undefined';
 const require = createRequire(import.meta.url);
+// node:sqlite emits a process-level ExperimentalWarning the first time it loads.
+// The packaged CLI launches Node with --no-warnings=ExperimentalWarning, but a
+// direct `node dist/...` run (and vitest's subprocesses) does not, so the warning
+// would leak onto stderr and break any command whose --json output is asserted to
+// be clean. Suppress only that single warning for the duration of the load; every
+// other warning passes through untouched.
+function loadNodeSqlite() {
+    const original = process.emitWarning;
+    const filtered = ((warning, ...rest) => {
+        const name = warning instanceof Error
+            ? warning.name
+            : typeof rest[0] === 'string'
+                ? rest[0]
+                : rest[0]?.type;
+        const message = warning instanceof Error ? warning.message : warning;
+        if (name === 'ExperimentalWarning' && /SQLite/i.test(String(message ?? '')))
+            return;
+        original.call(process, warning, ...rest);
+    });
+    process.emitWarning = filtered;
+    try {
+        return require('node:sqlite');
+    }
+    finally {
+        process.emitWarning = original;
+    }
+}
 // Keep Node on createRequire() so Vitest doesn't try to prebundle the built-in
 // sqlite module as a userland package during test collection.
 const sqliteMod = isBun
     ? await import('bun:sqlite')
-    : require('node:sqlite');
+    : loadNodeSqlite();
 // bun:sqlite exports `Database`; node:sqlite exports `DatabaseSync`.
 const NativeDatabase = sqliteMod.Database
     ?? sqliteMod.DatabaseSync;

package/dist/lib/startup/command-registry.d.ts

@@ -67,7 +67,6 @@ export declare const loadBeta: ModuleLoader;
 export declare const loadSync: ModuleLoader;
 export declare const loadLock: ModuleLoader;
 export declare const loadRefreshRules: ModuleLoader;
-export declare const loadDrive: ModuleLoader;
 export declare const loadFactory: ModuleLoader;
 export declare const loadUsage: ModuleLoader;
 export declare const loadCost: ModuleLoader;
@@ -96,7 +95,6 @@ export declare const loadTeams: ModuleLoader;
 export declare const loadCloud: ModuleLoader;
 export declare const loadMessage: ModuleLoader;
 export declare const loadSend: ModuleLoader;
-export declare const loadHq: ModuleLoader;
 export declare const loadFeed: ModuleLoader;
 export declare const loadActivity: ModuleLoader;
 export declare const loadMailboxes: ModuleLoader;

package/dist/lib/startup/command-registry.js

@@ -45,7 +45,6 @@ export const loadBeta = async () => (await import('../../commands/beta.js')).reg
 export const loadSync = async () => (await import('../../commands/sync.js')).registerSyncCommand;
 export const loadLock = async () => (await import('../../commands/lock.js')).registerLockCommand;
 export const loadRefreshRules = async () => (await import('../../commands/refresh-rules.js')).registerRefreshRulesCommand;
-export const loadDrive = async () => (await import('../../commands/drive.js')).registerDriveCommands;
 export const loadFactory = async () => (await import('../../commands/factory.js')).registerFactoryCommands;
 export const loadUsage = async () => (await import('../../commands/usage.js')).registerUsageCommand;
 export const loadCost = async () => (await import('../../commands/cost.js')).registerCostCommand;
@@ -74,7 +73,6 @@ export const loadTeams = async () => (await import('../../commands/teams.js')).r
 export const loadCloud = async () => (await import('../../commands/cloud.js')).registerCloudCommands;
 export const loadMessage = async () => (await import('../../commands/message.js')).registerMessageCommand;
 export const loadSend = async () => (await import('../../commands/send.js')).registerSendCommand;
-export const loadHq = async () => (await import('../../commands/hq.js')).registerHqCommand;
 export const loadFeed = async () => (await import('../../commands/feed.js')).registerFeedCommand;
 export const loadActivity = async () => (await import('../../commands/activity.js')).registerActivityCommand;
 export const loadMailboxes = async () => (await import('../../commands/mailboxes.js')).registerMailboxesCommand;
@@ -90,7 +88,7 @@ export const loadFunnel = async () => (await import('../../commands/funnel.js'))
  * inherit the root's custom help formatter rather than getting the per-command
  * recursive pass. Keeping that ordering preserves their `--help` output exactly.
  */
-export const LAZY_COMMAND_NAMES = new Set(['sessions', 'teams', 'cloud', 'message', 'hq', 'serve']);
+export const LAZY_COMMAND_NAMES = new Set(['sessions', 'teams', 'cloud', 'message', 'serve']);
 /**
  * User-typed top-level command name -> ordered list of module loaders to run.
  *
@@ -161,7 +159,6 @@ export const COMMAND_LOADERS = {
     sync: [loadSync],
     lock: [loadLock],
     'refresh-rules': [loadRefreshRules],
-    drive: [loadDrive],
     factory: [loadFactory],
     usage: [loadUsage],
     cost: [loadCost],
@@ -199,7 +196,6 @@ export const COMMAND_LOADERS = {
     message: [loadMessage],
     send: [loadSend],
     notify: [loadSend],
-    hq: [loadHq],
     feed: [loadFeed],
     activity: [loadActivity],
     mailboxes: [loadMailboxes],

package/dist/lib/state.d.ts

@@ -23,6 +23,13 @@
  * and leaves a back-compat symlink at the old path.
  */
 import type { Meta } from './types.js';
+/**
+ * Header prepended to every agents.yaml the CLI writes (central and per-device
+ * docs). Carries the yaml-language-server schema hint so editors validate the
+ * file against `schema/agents-yaml.schema.json`. Exported so
+ * `lib/device-config.ts` writes a sibling device's doc with the same header.
+ */
+export declare const META_HEADER = "# agents-cli metadata\n# Auto-generated - do not edit manually\n# https://github.com/phnx-labs/agents-cli\n# yaml-language-server: $schema=https://raw.githubusercontent.com/phnx-labs/agents-cli/main/apps/cli/schema/agents-yaml.schema.json\n\n";
 /** Root of the system data directory (~/.agents/.system/). */
 export declare function getAgentsDir(): string;
 /** Root of the system data directory (~/.agents/.system/). */
@@ -98,6 +105,18 @@ export declare function getUserSubagentsDir(): string;
 export declare function getSystemWorkflowsDir(): string;
 export declare function getUserWorkflowsDir(): string;
 export declare function getUserSecretsDir(): string;
+/**
+ * Path to the secrets usage read-model database (~/.agents/secrets/secrets.db).
+ * Read at CALL time so a test can redirect it to a temp file via
+ * AGENTS_SECRETS_DB without racing the module-load capture of USER_SECRETS_DIR —
+ * mirrors the AGENTS_EVENTS_PATH / AGENTS_DEVICES_DIR escape hatches. Holds only
+ * value-free usage telemetry (which bundle was created/imported/exported/viewed/
+ * accessed/unlocked, when, by whom), never a secret value. It is a derived index
+ * fed FROM the emitSecretAudit chokepoint alongside the append-only
+ * ~/.agents/events.jsonl audit log — the same way sessions.db indexes session
+ * metadata off the real session flow — not a second write path.
+ */
+export declare function getSecretsDbPath(): string;
 export declare function getUserPromptcutsPath(): string;
 /** Canonical home anchor (HOME env override or os.homedir()). */
 export declare function getHomeDir(): string;
@@ -182,8 +201,6 @@ export declare function getSystemPluginsDir(): string;
 export declare function getExtraPluginsDir(alias: string): string;
 /** Path to a project-scoped plugins directory (<project>/.agents/plugins/), or null when none. */
 export declare function getProjectPluginsDir(cwd?: string): string | null;
-/** Path to synced remote session data (~/.agents/.cache/drive/). */
-export declare function getDriveDir(): string;
 /** Path to soft-deleted resources (~/.agents/.history/trash/). */
 export declare function getTrashDir(): string;
 /** Path to local session indexer storage (~/.agents/.history/sessions/). */

package/dist/lib/state.js

@@ -26,7 +26,9 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
 import * as yaml from 'yaml';
+import { execFileSync } from 'child_process';
 import { ensureLockTarget, atomicWriteFileSync, withFileLock } from './fs-atomic.js';
+import { DEFAULT_SYSTEM_REPO, systemRepoSlug } from './types.js';
 import { machineId } from './machine-id.js';
 const HOME = process.env.HOME ?? os.homedir();
 /**
@@ -116,7 +118,6 @@ const PACKAGES_DIR = path.join(CACHE_DIR, 'packages');
 // They live at the user-root so they're git-tracked as source of truth.
 const PLUGINS_DIR = path.join(USER_AGENTS_DIR, 'plugins');
 const CLOUD_DIR = path.join(CACHE_DIR, 'cloud');
-const DRIVE_DIR = path.join(CACHE_DIR, 'drive');
 const TERMINALS_DIR = path.join(CACHE_DIR, 'terminals');
 const LOGS_DIR = path.join(CACHE_DIR, 'logs');
 /** Disposable performance samples (~/.agents/.cache/perf/) — safe to wipe. */
@@ -144,9 +145,16 @@ const USER_SUBAGENTS_DIR = path.join(USER_AGENTS_DIR, 'subagents');
 const USER_WORKFLOWS_DIR = path.join(USER_AGENTS_DIR, 'workflows');
 const USER_SECRETS_DIR = path.join(USER_AGENTS_DIR, 'secrets');
 const USER_PROMPTCUTS_FILE = path.join(USER_AGENTS_DIR, 'hooks', 'promptcuts.yaml');
-const META_HEADER = `# agents-cli metadata
+/**
+ * Header prepended to every agents.yaml the CLI writes (central and per-device
+ * docs). Carries the yaml-language-server schema hint so editors validate the
+ * file against `schema/agents-yaml.schema.json`. Exported so
+ * `lib/device-config.ts` writes a sibling device's doc with the same header.
+ */
+export const META_HEADER = `# agents-cli metadata
 # Auto-generated - do not edit manually
 # https://github.com/phnx-labs/agents-cli
+# yaml-language-server: $schema=https://raw.githubusercontent.com/phnx-labs/agents-cli/main/apps/cli/schema/agents-yaml.schema.json
 
 `;
 // ─── Root getters ─────────────────────────────────────────────────────────────
@@ -190,13 +198,69 @@ export function getOptionalUserAgentsDir() {
     }
     return USER_AGENTS_DIR;
 }
+/**
+ * Origin `owner/repo` slug (lowercased, `.git` stripped) of a git checkout, or
+ * null when `dir` isn't a git repo / has no origin. Extracts the slug from any
+ * remote URL form: `git@host:owner/repo.git`, `https://host/owner/repo.git`,
+ * `ssh://git@host/owner/repo`. Sync (mirrors readGitConfigUser in git.ts) so it
+ * can be used from the synchronous getProjectAgentsDir walk.
+ */
+function gitOriginSlug(dir) {
+    let url;
+    try {
+        url = execFileSync('git', ['-C', dir, 'config', '--get', 'remote.origin.url'], {
+            stdio: ['ignore', 'pipe', 'ignore'],
+        }).toString().trim();
+    }
+    catch {
+        return null;
+    }
+    if (!url)
+        return null;
+    const m = url.replace(/\.git$/i, '').match(/[:/]([^/:]+\/[^/]+)$/);
+    return m ? m[1].toLowerCase() : null;
+}
+/** Slugs of the user + system DotAgents repos — a checkout of any of these is not a project layer. */
+function canonicalDotAgentsRepoSlugs() {
+    const slugs = new Set([systemRepoSlug(DEFAULT_SYSTEM_REPO).toLowerCase()]);
+    for (const dir of [USER_AGENTS_DIR, SYSTEM_AGENTS_DIR]) {
+        const slug = gitOriginSlug(dir);
+        if (slug)
+            slugs.add(slug);
+    }
+    return slugs;
+}
+/**
+ * True when `agentsPath` is itself a git checkout of the user's or system's
+ * DotAgents repo — i.e. a *clone* of the very repo whose rules already load as
+ * the user/system layer (e.g. `git clone …/.agents.git ~/src/github.com/<you>/.agents`).
+ * Such a clone must NOT also be treated as a *project* layer: because project
+ * outranks user, a stale clone would silently shadow the live user rules by
+ * filename and plant a compiled AGENTS.md in an ancestor dir (RUSH-2037).
+ *
+ * A legitimate project layer is a plain subdirectory of a project and is never
+ * itself a git-repo root, so the cheap `.git` gate skips the (git-spawning)
+ * origin comparison for the common case — only a `.agents/` that is its own
+ * checkout pays it, and even then it's kept unless its origin matches the
+ * user/system DotAgents repo (an unrelated repo checked out at `.agents/`,
+ * or a project's own versioned `.agents/`, stays a valid project layer).
+ */
+function isUserOrSystemRepoCheckout(agentsPath) {
+    if (!fs.existsSync(path.join(agentsPath, '.git')))
+        return false;
+    const origin = gitOriginSlug(agentsPath);
+    if (!origin)
+        return false;
+    return canonicalDotAgentsRepoSlugs().has(origin);
+}
 /** Walk up from startPath to find a project-scoped .agents/ directory (skipping both roots). */
 export function getProjectAgentsDir(startPath = process.cwd()) {
     let dir = path.resolve(startPath);
     while (true) {
         const agentsPath = path.join(dir, '.agents');
         if (fs.existsSync(agentsPath) && fs.statSync(agentsPath).isDirectory()) {
-            if (!isSamePath(agentsPath, SYSTEM_AGENTS_DIR) && !isSamePath(agentsPath, USER_AGENTS_DIR)) {
+            if (!isSamePath(agentsPath, SYSTEM_AGENTS_DIR) && !isSamePath(agentsPath, USER_AGENTS_DIR)
+                && !isUserOrSystemRepoCheckout(agentsPath)) {
                 return agentsPath;
             }
         }
@@ -299,6 +363,20 @@ export function getUserSubagentsDir() { return USER_SUBAGENTS_DIR; }
 export function getSystemWorkflowsDir() { return SYSTEM_WORKFLOWS_DIR; }
 export function getUserWorkflowsDir() { return USER_WORKFLOWS_DIR; }
 export function getUserSecretsDir() { return USER_SECRETS_DIR; }
+/**
+ * Path to the secrets usage read-model database (~/.agents/secrets/secrets.db).
+ * Read at CALL time so a test can redirect it to a temp file via
+ * AGENTS_SECRETS_DB without racing the module-load capture of USER_SECRETS_DIR —
+ * mirrors the AGENTS_EVENTS_PATH / AGENTS_DEVICES_DIR escape hatches. Holds only
+ * value-free usage telemetry (which bundle was created/imported/exported/viewed/
+ * accessed/unlocked, when, by whom), never a secret value. It is a derived index
+ * fed FROM the emitSecretAudit chokepoint alongside the append-only
+ * ~/.agents/events.jsonl audit log — the same way sessions.db indexes session
+ * metadata off the real session flow — not a second write path.
+ */
+export function getSecretsDbPath() {
+    return process.env.AGENTS_SECRETS_DB ?? path.join(USER_SECRETS_DIR, 'secrets.db');
+}
 export function getUserPromptcutsPath() { return USER_PROMPTCUTS_FILE; }
 // ─── User operational path getters ────────────────────────────────────────────
 //
@@ -404,8 +482,6 @@ export function getProjectPluginsDir(cwd = process.cwd()) {
         return null;
     return path.join(projectAgentsDir, 'plugins');
 }
-/** Path to synced remote session data (~/.agents/.cache/drive/). */
-export function getDriveDir() { return DRIVE_DIR; }
 /** Path to soft-deleted resources (~/.agents/.history/trash/). */
 export function getTrashDir() { return TRASH_DIR; }
 /** Path to local session indexer storage (~/.agents/.history/sessions/). */
@@ -659,8 +735,9 @@ function writeIfChanged(filePath, content) {
 /**
  * Partition the in-memory Meta across three files by sync-domain:
  *   - central  `~/.agents/agents.yaml`             — portable, everything else
+ *              (including the user-scope `config:` block)
  *   - device   `~/.agents/devices/<machine>/agents.yaml` — `agents:` pins +
- *              `defaultBrowserProfile:` (both per-device)
+ *              `defaultBrowserProfile:` + device-scope `config:` (all per-device)
  *   - history  `~/.agents/.history/version-resources.json` — `versions:` (machine-local)
  * All callers funnel through writeMeta → here, so nothing else changes. Empty
  * `agents:` / `versions:` are not written (no empty committed files).
@@ -722,7 +799,7 @@ function serializeCentral(central) {
     return isEmpty ? META_HEADER : doc.toString({ collectionStyle: 'block' });
 }
 function writeMetaUnlocked(meta) {
-    const { agents, isolatedAgents, versions, defaultBrowserProfile, ...central } = meta;
+    const { agents, isolatedAgents, versions, defaultBrowserProfile, deviceConfig, ...central } = meta;
     // Write the machine-local files FIRST, then strip central — so a crash mid-write
     // never removes pins/versions from central before they're persisted elsewhere.
     const devicePath = getDeviceMetaPath();
@@ -733,9 +810,13 @@ function writeMetaUnlocked(meta) {
     // it does not have.
     const hasIsolatedAgents = !!isolatedAgents && Object.keys(isolatedAgents).length > 0;
     const hasDefaultBrowser = !!defaultBrowserProfile;
-    if (hasAgents || hasIsolatedAgents || hasDefaultBrowser) {
-        // Device-local doc carries `agents:` pins and `defaultBrowserProfile:` — both
-        // are per-machine and must never land in central agents.yaml (which syncs).
+    // Device-scope config (`maxAgents`, `schedulerEnabled`, …) is per-machine, so it
+    // rides the device doc under `config:` — never the central doc that syncs.
+    const hasDeviceConfig = !!deviceConfig && Object.keys(deviceConfig).length > 0;
+    if (hasAgents || hasIsolatedAgents || hasDefaultBrowser || hasDeviceConfig) {
+        // Device-local doc carries `agents:` pins, `defaultBrowserProfile:`, and the
+        // device-scope `config:` — all per-machine and must never land in central
+        // agents.yaml (which syncs).
         const deviceDoc = {};
         if (hasAgents)
             deviceDoc.agents = agents;
@@ -743,6 +824,8 @@ function writeMetaUnlocked(meta) {
             deviceDoc.isolatedAgents = isolatedAgents;
         if (hasDefaultBrowser)
             deviceDoc.defaultBrowserProfile = defaultBrowserProfile;
+        if (hasDeviceConfig)
+            deviceDoc.config = deviceConfig;
         fs.mkdirSync(path.dirname(devicePath), { recursive: true });
         writeIfChanged(devicePath, META_HEADER + yaml.stringify(deviceDoc));
     }
@@ -768,6 +851,10 @@ function writeMetaUnlocked(meta) {
  *     still has pins)
  *   - `defaultBrowserProfile:` from the device file (device is the sole source;
  *     the field is stripped from central on write, so nothing to merge against)
+ *   - `config:` from the device file into `deviceConfig` (device is the sole
+ *     source for device-scope config, same routing as `defaultBrowserProfile`;
+ *     the in-memory field is named `deviceConfig` so it can never collide with
+ *     the user-scope `config:` central carries)
  *   - `versions:` from the history JSON (wholesale replace; falls back to
  *     whatever central carried when the history file doesn't exist yet)
  */
@@ -782,6 +869,8 @@ function overlayMachineLocal(meta) {
                 meta.isolatedAgents = { ...meta.isolatedAgents, ...dm.isolatedAgents };
             if (dm?.defaultBrowserProfile)
                 meta.defaultBrowserProfile = dm.defaultBrowserProfile;
+            if (dm?.config)
+                meta.deviceConfig = dm.config;
         }
         catch { /* ignore malformed device file */ }
     }

package/dist/lib/sync-umbrella.d.ts

@@ -2,25 +2,23 @@
  * Umbrella `agents sync` orchestration — "make this machine current".
  *
  * Bare `agents sync` fetches the config repos then reconciles them into every
- * installed agent's version home. Secrets and sessions are opt-in stages
- * (`--secrets` / `--sessions`) — see `planUmbrellaStages` for why they're off by
- * default. Each stage is an existing exported library function; this module only
- * sequences them and decides — from the flags — which stages run. The planner is
- * pure so the flag matrix is unit-tested without any I/O.
+ * installed agent's version home. Secrets are an opt-in stage (`--secrets`) —
+ * see `planUmbrellaStages` for why it's off by default. Each stage is an
+ * existing exported library function; this module only sequences them and
+ * decides — from the flags — which stages run. The planner is pure so the
+ * flag matrix is unit-tested without any I/O.
  *
  * Stage backends:
  *   repos    -> git pull of ~/.agents + enabled ~/.agents-* extras (pullRepo)
  *   secrets  -> listRemoteBundles + pullBundle (needs a passphrase; skipped
  *               cleanly when none is available — tokenized non-interactive auth
  *               arrives with `agents login`, #366/#367)
- *   sessions -> syncSessions(), gated by the session-sync beta opt-in + isSyncConfigured(), like the daemon
  *   reconcile-> refresh({ skipPrompts }) — re-materialize resources into homes
  */
-/** The five umbrella flags off `agents sync`. */
+/** The umbrella flags off `agents sync`. */
 export interface UmbrellaFlags {
     repos?: boolean;
     secrets?: boolean;
-    sessions?: boolean;
     cloud?: boolean;
     local?: boolean;
 }
@@ -28,7 +26,6 @@ export interface UmbrellaFlags {
 export interface UmbrellaPlan {
     fetchRepos: boolean;
     fetchSecrets: boolean;
-    fetchSessions: boolean;
     reconcile: boolean;
 }
 /**
@@ -36,14 +33,12 @@ export interface UmbrellaPlan {
  *   bare (no flags)        fetch repos, then reconcile
  *   --local                reconcile only, no fetch
  *   --cloud                fetch repos (or the selected subset), skip reconcile
- *   --repos/--secrets/...  fetch only the selected types, then reconcile
+ *   --repos/--secrets      fetch only the selected types, then reconcile
  * `--local` wins over everything; `--cloud` suppresses reconcile.
  *
- * Secrets and sessions are NOT part of the bare default — they are opt-in via
- * `--secrets` / `--sessions`. Pulling every secret bundle onto the machine on a
- * bare `agents sync` is more blast radius than the verb should carry by
- * default, and session transcripts are queryable on demand (`agents sessions
- * --host <machine>`) so they don't need eager mirroring.
+ * Secrets are NOT part of the bare default — they are opt-in via `--secrets`.
+ * Pulling every secret bundle onto the machine on a bare `agents sync` is more
+ * blast radius than the verb should carry by default.
  */
 export declare function planUmbrellaStages(f: UmbrellaFlags): UmbrellaPlan;
 export interface UmbrellaResult {
@@ -58,13 +53,6 @@ export interface UmbrellaResult {
         reason?: string;
         errors: string[];
     };
-    sessions?: {
-        ran: boolean;
-        pushed: number;
-        pulled: number;
-        merged: number;
-        error?: string;
-    };
     devices?: {
         synced: number;
         pending: number;
@@ -82,7 +70,7 @@ export interface RunUmbrellaArgs {
     passphrase?: string;
 }
 /**
- * Execute the planned stages in order: repos -> secrets -> sessions -> reconcile.
+ * Execute the planned stages in order: repos -> secrets -> reconcile.
  * A failure in one fetch stage is recorded and does not abort the others or the
  * reconcile — `agents sync` should make as much current as it can in one pass.
  */

package/dist/lib/sync-umbrella.js

@@ -2,18 +2,17 @@
  * Umbrella `agents sync` orchestration — "make this machine current".
  *
  * Bare `agents sync` fetches the config repos then reconciles them into every
- * installed agent's version home. Secrets and sessions are opt-in stages
- * (`--secrets` / `--sessions`) — see `planUmbrellaStages` for why they're off by
- * default. Each stage is an existing exported library function; this module only
- * sequences them and decides — from the flags — which stages run. The planner is
- * pure so the flag matrix is unit-tested without any I/O.
+ * installed agent's version home. Secrets are an opt-in stage (`--secrets`) —
+ * see `planUmbrellaStages` for why it's off by default. Each stage is an
+ * existing exported library function; this module only sequences them and
+ * decides — from the flags — which stages run. The planner is pure so the
+ * flag matrix is unit-tested without any I/O.
  *
  * Stage backends:
  *   repos    -> git pull of ~/.agents + enabled ~/.agents-* extras (pullRepo)
  *   secrets  -> listRemoteBundles + pullBundle (needs a passphrase; skipped
  *               cleanly when none is available — tokenized non-interactive auth
  *               arrives with `agents login`, #366/#367)
- *   sessions -> syncSessions(), gated by the session-sync beta opt-in + isSyncConfigured(), like the daemon
  *   reconcile-> refresh({ skipPrompts }) — re-materialize resources into homes
  */
 import { pullRepo } from './git.js';
@@ -24,34 +23,31 @@ import { listRemoteBundles, pullBundle } from './secrets/sync.js';
  *   bare (no flags)        fetch repos, then reconcile
  *   --local                reconcile only, no fetch
  *   --cloud                fetch repos (or the selected subset), skip reconcile
- *   --repos/--secrets/...  fetch only the selected types, then reconcile
+ *   --repos/--secrets      fetch only the selected types, then reconcile
  * `--local` wins over everything; `--cloud` suppresses reconcile.
  *
- * Secrets and sessions are NOT part of the bare default — they are opt-in via
- * `--secrets` / `--sessions`. Pulling every secret bundle onto the machine on a
- * bare `agents sync` is more blast radius than the verb should carry by
- * default, and session transcripts are queryable on demand (`agents sessions
- * --host <machine>`) so they don't need eager mirroring.
+ * Secrets are NOT part of the bare default — they are opt-in via `--secrets`.
+ * Pulling every secret bundle onto the machine on a bare `agents sync` is more
+ * blast radius than the verb should carry by default.
  */
 export function planUmbrellaStages(f) {
     if (f.local) {
-        return { fetchRepos: false, fetchSecrets: false, fetchSessions: false, reconcile: true };
+        return { fetchRepos: false, fetchSecrets: false, reconcile: true };
     }
-    const anySelector = !!(f.repos || f.secrets || f.sessions);
+    const anySelector = !!(f.repos || f.secrets);
     if (anySelector) {
         return {
             fetchRepos: !!f.repos,
             fetchSecrets: !!f.secrets,
-            fetchSessions: !!f.sessions,
             reconcile: !f.cloud,
         };
     }
     // No per-type selector: bare = repos + reconcile; --cloud = repos, no
-    // reconcile. Secrets/sessions stay off unless explicitly selected above.
-    return { fetchRepos: true, fetchSecrets: false, fetchSessions: false, reconcile: !f.cloud };
+    // reconcile. Secrets stay off unless explicitly selected above.
+    return { fetchRepos: true, fetchSecrets: false, reconcile: !f.cloud };
 }
 /**
- * Execute the planned stages in order: repos -> secrets -> sessions -> reconcile.
+ * Execute the planned stages in order: repos -> secrets -> reconcile.
  * A failure in one fetch stage is recorded and does not abort the others or the
  * reconcile — `agents sync` should make as much current as it can in one pass.
  */
@@ -110,33 +106,6 @@ export async function runUmbrellaSync(args) {
             result.secrets = { pulled, skipped: false, errors };
         }
     }
-    if (plan.fetchSessions) {
-        // Gate exactly like the daemon: without the `session-sync` beta opt-in (or
-        // with a missing r2.backups bundle) this is a clean no-op, not an error that
-        // fails the whole sync.
-        const { isBetaEnabled } = await import('./beta.js');
-        const { isSyncConfigured } = await import('./session/sync/config.js');
-        if (isBetaEnabled('session-sync') && isSyncConfigured()) {
-            const { syncSessions } = await import('./session/sync/sync.js');
-            // Record a failure here instead of letting it throw: like the fetchSecrets
-            // block above, a failure in one fetch stage must not abort the others or
-            // the reconcile below (see this function's doc comment). Without this,
-            // syncSessions() throwing — e.g. via the C1 containment reject on a
-            // malicious peer manifest — would skip `plan.reconcile` entirely.
-            try {
-                const r = await syncSessions();
-                result.sessions = { ran: true, pushed: r.pushed, pulled: r.pulled, merged: r.merged };
-                log(`sessions: pushed ${r.pushed}, pulled ${r.pulled}, merged ${r.merged}`);
-            }
-            catch (err) {
-                result.sessions = { ran: false, pushed: 0, pulled: 0, merged: 0, error: err.message };
-                log(`sessions: failed — ${err.message}`);
-            }
-        }
-        else {
-            result.sessions = { ran: false, pushed: 0, pulled: 0, merged: 0 };
-        }
-    }
     if (plan.reconcile) {
         const { refresh } = await import('./refresh.js');
         await refresh({ skipPrompts: yes });

package/dist/lib/teams/agents.d.ts

@@ -218,13 +218,30 @@ export declare class AgentProcess {
      * Uses a per-wave batched snapshot (remotePollSnapshot) when the supervisor's
      * one-ssh-per-host pre-pass populated it; otherwise falls back to its own
      * round-trips so a bare `teams status`/`teams logs` is still correct.
+     *
+     * Only polls a teammate that is plausibly still RUNNING (RUSH-2118). Once a
+     * remote teammate reaches a terminal status, the poll that resolved it already
+     * mirrored the final log bytes and read the `.exit` sentinel in this SAME
+     * function (delta pulled before the exit check below) — the underlying process
+     * is gone and can never write more, so there is nothing left to fetch. Without
+     * this guard every finished remote teammate still cost one ssh round-trip on
+     * EVERY `--active`/`listAll` poll forever, which is what made `agents sessions
+     * --active --local` take ~4.3s on a box with 30 completed teammates.
      */
     private syncRemoteMirror;
     /** Reset the local stdout cursor for a newly truncated resume log. */
     resetLogReadPosition(): number;
     /** Restore the cursor when a resume transaction puts the prior log back. */
     restoreLogReadPosition(position: number): void;
-    readNewEvents(): Promise<void>;
+    /**
+     * @param opts.skipRemote A `--local` caller (RUSH-2118): never dial a
+     *   remote-host teammate, not even a still-RUNNING one — report its
+     *   last-persisted meta.json state as-is. A local-only query is by definition
+     *   this-machine-only, so it must not issue an ssh round-trip at all.
+     */
+    readNewEvents(opts?: {
+        skipRemote?: boolean;
+    }): Promise<void>;
     /**
      * Truncate the local mirror to its trailing REMOTE_MIRROR_MAX_BYTES and reset
      * lastReadPos to the new (smaller) size so the parser doesn't re-read the kept
@@ -244,7 +261,14 @@ export declare class AgentProcess {
     saveMeta(): Promise<void>;
     static loadFromDisk(agentId: string, baseDir?: string | null): Promise<AgentProcess | null>;
     isProcessAlive(): boolean;
-    updateStatusFromProcess(): Promise<void>;
+    /**
+     * @param opts.skipRemote A `--local` caller (RUSH-2118): a distributed
+     *   teammate is never dialed — its in-memory state (already loaded from
+     *   meta.json) stands as-is, no ssh, no re-save.
+     */
+    updateStatusFromProcess(opts?: {
+        skipRemote?: boolean;
+    }): Promise<void>;
     /**
      * Recover the teammate's exit status after its process is gone.
      *
@@ -298,8 +322,16 @@ export declare class AgentManager {
     private defaultMode;
     private initPromise;
     private cloudDispatcher;
+    /**
+     * A `--local` caller (RUSH-2118): every poll this manager issues skips the
+     * ssh round-trip for a distributed (remote-host) teammate, reporting its
+     * last-persisted meta.json state instead. Set once at construction so the
+     * INITIAL load in doInitialize()/loadExistingAgents() — which polls every
+     * teammate before listRunning()/listAll() ever run — honors it too.
+     */
+    private localOnly;
     private constructorAgentsDir;
-    constructor(maxAgents?: number, agentsDir?: string | null, defaultMode?: Mode | null, filterByCwd?: string | null, cleanupAgeDays?: number);
+    constructor(maxAgents?: number, agentsDir?: string | null, defaultMode?: Mode | null, filterByCwd?: string | null, cleanupAgeDays?: number, localOnly?: boolean);
     private initialize;
     private doInitialize;
     getDefaultMode(): Mode;