@phnx-labs/agents-cli 1.20.93 → 1.21.0

package/dist/lib/session/remote-list.js

@@ -17,32 +17,12 @@ import { spawn } from 'child_process';
 import chalk from 'chalk';
 import { SSH_OPTS, controlOpts, assertValidSshTarget, shellQuote } from '../ssh-exec.js';
 import { sshTargetFor } from '../devices/connect.js';
-import { resolveExplicitTargets } from '../devices/resolve-target.js';
-import { loadDevices, isControlDevice, isDialableDevice } from '../devices/registry.js';
+import { loadDevices } from '../devices/registry.js';
 import { remoteShellFor, buildWindowsAgentsCommand } from '../hosts/remote-cmd.js';
-import { machineId, normalizeHost } from './sync/config.js';
+import { gatherRemoteAgentsJson } from '../remote-agents-json.js';
+import { normalizeHost } from './sync/config.js';
 import { NO_FANOUT_ENV } from './remote-active.js';
 import { terminalWidth } from './width.js';
-/** Per-host SSH budget. Slightly above SSH_OPTS' ConnectTimeout=10 so a
- * reachable-but-slow remote still answers before we give up. */
-const REMOTE_TIMEOUT_MS = 12_000;
-/**
- * The command run on each peer: answer for itself, as JSON, without recursing.
- * `forwardedArgs` carry the caller's own query/filters (already including the
- * leading `sessions` and a `--json`) so each peer returns a comparable slice.
- * A Windows peer gets a PowerShell invocation (ssh lands in cmd.exe/PowerShell
- * there, where `bash -lc` is not a command); every other OS keeps `bash -lc`.
- */
-export function remoteListCommand(forwardedArgs, os) {
-    if (remoteShellFor(os) === 'powershell') {
-        return buildWindowsAgentsCommand({
-            args: forwardedArgs,
-            env: { [NO_FANOUT_ENV]: '1' },
-        });
-    }
-    const inner = [`${NO_FANOUT_ENV}=1`, 'agents', ...forwardedArgs].map((t, i) => i === 0 ? t : shellQuote(t)).join(' ');
-    return `bash -lc ${shellQuote(inner)}`;
-}
 /**
  * Parse a peer's `sessions --json` stdout into `SessionMeta[]`, tagging each
  * with `machine`. Defensive against version skew / partial output: non-JSON or
@@ -83,61 +63,22 @@ export function parseRemoteListPayload(stdout, machine, safeResolver = false) {
         parsed = JSON.parse(stdout);
     }
     catch {
-        return { sessions: [], valid: false };
+        return { items: [], valid: false };
     }
     if (!Array.isArray(parsed))
-        return { sessions: [], valid: false };
+        return { items: [], valid: false };
     const out = [];
     for (const x of parsed) {
         if (!x || typeof x !== 'object' || Array.isArray(x))
-            return { sessions: [], valid: false };
+            return { items: [], valid: false };
         if (safeResolver && !isSafeResolverRow(x)) {
-            return { sessions: [], valid: false };
+            return { items: [], valid: false };
         }
         // `_remote` marks these as living on the peer's disk (not a local mirror),
         // so the picker routes read/resume back over SSH instead of the local FS.
         out.push({ ...x, machine, _remote: true });
     }
-    return { sessions: out, valid: true };
-}
-/** Convert one completed peer process into the exact aggregation result. This
- * is the production parent/peer seam and is exercised with real child output. */
-export function remoteListCaptureResult(code, stdout, machine, display, safeResolver = false) {
-    if (code !== 0)
-        return { sessions: [], unreachable: display };
-    const parsed = parseRemoteListPayload(stdout, machine, safeResolver);
-    return parsed.valid ? { sessions: parsed.sessions } : { sessions: [], unreachable: display };
-}
-/** Run one remote `agents sessions … --json` and capture stdout. Resolves
- * `{ code: null }` on spawn error or timeout (host treated as dead). */
-function sshCapture(target, remoteCmd, timeoutMs) {
-    assertValidSshTarget(target);
-    return new Promise((resolve) => {
-        const args = [...SSH_OPTS, ...controlOpts(), target, remoteCmd];
-        const child = spawn('ssh', args, { stdio: ['ignore', 'pipe', 'ignore'] });
-        let stdout = '';
-        let settled = false;
-        const done = (code) => {
-            if (settled)
-                return;
-            settled = true;
-            clearTimeout(timer);
-            resolve({ code, stdout });
-        };
-        const timer = setTimeout(() => { child.kill('SIGKILL'); done(null); }, timeoutMs);
-        child.stdout.on('data', (d) => { stdout += d.toString(); });
-        child.on('error', () => done(null));
-        child.on('close', (code) => done(code));
-    });
-}
-async function fetchByTarget(target, machine, display, forwardedArgs, os) {
-    const { code, stdout } = await sshCapture(target, remoteListCommand(forwardedArgs, os), REMOTE_TIMEOUT_MS);
-    const safeResolver = forwardedArgs.includes('--resolve-safe-v1');
-    const result = remoteListCaptureResult(code, stdout, machine, display, safeResolver);
-    if (result.unreachable) {
-        process.stderr.write(chalk.gray(`  ${display}: unreachable or no agents CLI — skipped\n`));
-    }
-    return result;
+    return { items: out, valid: true };
 }
 /**
  * Gather listing sessions from other machines. With an explicit `hosts` list
@@ -147,51 +88,21 @@ async function fetchByTarget(target, machine, display, forwardedArgs, os) {
  * already `--json`) so every peer returns the same slice this machine asked for.
  */
 export async function gatherRemoteList(forwardedArgs, hosts) {
-    const self = machineId();
-    const targets = [];
-    if (hosts && hosts.length > 0) {
-        // Resolve each token through the device registry so an explicit --host/--device
-        // dials the exact same address (and machine id) as the auto-discovery sweep.
-        targets.push(...await resolveExplicitTargets(hosts));
-    }
-    else {
-        let reg;
-        try {
-            reg = await loadDevices();
-        }
-        catch {
-            return { sessions: [], deviceCount: 0, unreachable: ['device registry'] };
-        }
-        for (const d of Object.values(reg)) {
-            // Live SSH-probe verdict first, cached tailscale snapshot only as a
-            // fallback — see isDialableDevice. A manually-registered device has no
-            // tailscale peer entry, so gating on `online` alone hid its sessions.
-            if (!isDialableDevice(d))
-                continue;
-            if (normalizeHost(d.name) === self)
-                continue;
-            // Control-only devices (a phone/tablet running the cockpit) drive the fleet
-            // but never run agents — never dial them, whatever their platform reads as.
-            if (isControlDevice(d))
-                continue;
-            // Only machines that can actually run the CLI. iOS/tablet nodes register as
-            // `unknown` platform and can never answer, so skip them rather than burn a
-            // full ConnectTimeout on each.
-            if (d.platform !== 'windows' && d.platform !== 'linux' && d.platform !== 'macos')
-                continue;
-            try {
-                targets.push({ target: sshTargetFor(d), machine: normalizeHost(d.name), name: d.name, os: d.platform });
-            }
-            catch {
-                // No address on the profile — nothing to dial; skip silently.
-            }
-        }
-    }
-    const results = await Promise.all(targets.map((t) => fetchByTarget(t.target, t.machine, t.name, forwardedArgs, t.os)));
+    const safeResolver = forwardedArgs.includes('--resolve-safe-v1');
+    const result = await gatherRemoteAgentsJson({
+        args: forwardedArgs,
+        noFanoutEnv: NO_FANOUT_ENV,
+        hosts,
+        parse: (stdout, machine) => parseRemoteListPayload(stdout, machine, safeResolver),
+    });
     return {
-        sessions: results.flatMap((r) => r.sessions),
-        deviceCount: targets.length,
-        unreachable: results.map((r) => r.unreachable).filter((n) => !!n),
+        sessions: result.items,
+        deviceCount: result.deviceCount,
+        unreachable: [
+            ...(result.discoveryFailed ? ['device registry'] : []),
+            ...result.skipped,
+            ...result.parseFailed,
+        ],
     };
 }
 /** Resolve a peer's SSH target (and OS) from the device registry by its

package/dist/lib/session/sync/config.d.ts

@@ -1,7 +1,15 @@
 /**
- * Configuration for cross-machine session sync: R2 credentials and this
- * machine's stable identity. Credentials come from the `r2.backups` secrets
- * bundle (OS keychain on macOS, libsecret on Linux) — never from env or disk.
+ * R2 credential resolution + this machine's stable identity. The only field
+ * `agents sessions export --encrypt` / `import` actually consume is the
+ * shared `R2_SYNC_ENC_KEY` transcript key (`resolveSyncEncKey`); the other R2
+ * fields (account/bucket/access keys) are validated here as a presence gate —
+ * no `r2.backups` bundle configured means no shared key, so export/import
+ * fall back to an ephemeral one. There is no R2 network client in this
+ * codebase today (it moved with the rest of the R2/CRDT background sync this
+ * bundle used to back — see git history for `./r2.ts`); a future R2-backed
+ * feature (an export destination, a fleet cache) would add one where it's
+ * actually wired. Credentials come from the `r2.backups` secrets bundle (OS
+ * keychain on macOS, libsecret on Linux) — never from env or disk.
  */
 /** Secrets bundle holding the R2 credentials. */
 export declare const SYNC_BUNDLE = "r2.backups";
@@ -16,8 +24,8 @@ export interface R2Config {
      * Shared 32-byte key (hex or base64) for client-side transcript encryption,
      * held in the bundle as `R2_SYNC_ENC_KEY`. Optional and deliberately separate
      * from the R2 credentials so rotating the access token never orphans already
-     * encrypted objects. When absent, transcripts upload unencrypted (with a loud
-     * per-cycle warning) — see transcript-crypto.ts + pushOwn.
+     * encrypted bundles. `agents sessions export --encrypt` prefers this key when
+     * present, else mints and prints an ephemeral one — see transcript-crypto.ts.
      */
     syncEncKey?: string;
 }

package/dist/lib/session/sync/config.js

@@ -1,7 +1,15 @@
 /**
- * Configuration for cross-machine session sync: R2 credentials and this
- * machine's stable identity. Credentials come from the `r2.backups` secrets
- * bundle (OS keychain on macOS, libsecret on Linux) — never from env or disk.
+ * R2 credential resolution + this machine's stable identity. The only field
+ * `agents sessions export --encrypt` / `import` actually consume is the
+ * shared `R2_SYNC_ENC_KEY` transcript key (`resolveSyncEncKey`); the other R2
+ * fields (account/bucket/access keys) are validated here as a presence gate —
+ * no `r2.backups` bundle configured means no shared key, so export/import
+ * fall back to an ephemeral one. There is no R2 network client in this
+ * codebase today (it moved with the rest of the R2/CRDT background sync this
+ * bundle used to back — see git history for `./r2.ts`); a future R2-backed
+ * feature (an export destination, a fleet cache) would add one where it's
+ * actually wired. Credentials come from the `r2.backups` secrets bundle (OS
+ * keychain on macOS, libsecret on Linux) — never from env or disk.
  */
 import { readAndResolveBundleEnv, isHeadlessSecretsContext } from '../../secrets/bundles.js';
 /** Secrets bundle holding the R2 credentials. */
@@ -12,13 +20,13 @@ export const SYNC_BUNDLE = 'r2.backups';
  * without real credentials (no silent fallback).
  */
 function resolveR2Config() {
-    // The daemon monitor loop is headless by construction (no TTY, ever), so
-    // isHeadlessSecretsContext() is true here and this resolves broker-only — a
-    // broker miss can never pop an unattended Touch ID sheet on the user's screen
-    // (the same broker-only-when-headless rationale the secrets readers use). Using
-    // the shared predicate rather than a literal keeps it consistent with the other callers
-    // and lets any interactive caller of loadR2Config still prompt.
-    const { env } = readAndResolveBundleEnv(SYNC_BUNDLE, { caller: 'sessions-sync', agentOnly: isHeadlessSecretsContext() });
+    // A headless caller (no TTY — e.g. a routine or SSH-dispatched command) must
+    // resolve broker-only: isHeadlessSecretsContext() true means a broker miss
+    // can never pop an unattended Touch ID sheet on the user's screen (the same
+    // broker-only-when-headless rationale the secrets readers use). Using the
+    // shared predicate rather than a literal keeps it consistent with the other
+    // callers and lets any interactive caller of loadR2Config still prompt.
+    const { env } = readAndResolveBundleEnv(SYNC_BUNDLE, { caller: 'session-transport', agentOnly: isHeadlessSecretsContext() });
     const accountId = env.R2_ACCOUNT_ID?.trim();
     const bucket = env.R2_BUCKET_NAME?.trim();
     const accessKeyId = env.R2_ACCESS_KEY_ID?.trim();
@@ -31,7 +39,7 @@ function resolveR2Config() {
         !secretAccessKey && 'R2_SECRET_ACCESS_KEY',
     ].filter(Boolean);
     if (missing.length > 0) {
-        throw new Error(`Sessions sync: bundle '${SYNC_BUNDLE}' is missing ${missing.join(', ')}. ` +
+        throw new Error(`Session R2 transport: bundle '${SYNC_BUNDLE}' is missing ${missing.join(', ')}. ` +
             `Add them with: agents secrets add ${SYNC_BUNDLE} <KEY>`);
     }
     return {
@@ -40,8 +48,8 @@ function resolveR2Config() {
         accessKeyId: accessKeyId,
         secretAccessKey: secretAccessKey,
         // Default to the account's R2 endpoint; an explicit R2_ENDPOINT override
-        // points sync at any S3-compatible store (MinIO, another provider) — which
-        // is also how the feature is verified end-to-end without live R2.
+        // points at any S3-compatible store (MinIO, another provider) — which is
+        // also how the feature is verified end-to-end without live R2.
         endpoint: env.R2_ENDPOINT?.trim() || `https://${accountId}.r2.cloudflarestorage.com`,
         syncEncKey,
     };

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/). */
@@ -194,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;
             }
         }
@@ -418,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/). */
@@ -673,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).
@@ -736,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();
@@ -747,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;
@@ -757,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));
     }
@@ -782,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)
  */
@@ -796,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.
  */