@phnx-labs/agents-cli 1.22.38 → 1.22.40

package/dist/lib/devices/fleet-inventory.js

@@ -8,10 +8,11 @@
  * FleetInventory} that both the local baseline and every remote box serialize
  * into their doctor payload; the comparator then diffs those payloads.
  */
-import { getAvailableResources, getVersionHomePath, isVersionIsolated, listInstalledVersions } from '../versions.js';
+import { getAvailableResources, getVersionHomePath, isVersionIsolated, listInstalledVersions } from '../installations/versions.js';
 import { supports } from '../capabilities.js';
 import { checkVersionHookWiring } from '../hooks.js';
-import { getUserAgentsDir, getSystemAgentsDir } from '../state.js';
+import { getUserAgentsDir, getSystemAgentsDir, readMeta } from '../state.js';
+import { listNativeAccounts } from '../account-registry.js';
 import { readRepoState } from '../git.js';
 import { ALL_AGENT_IDS, accountDisplayLabel, credentialPresence, getAccountInfo, supportsAccountInspection, } from '../agents.js';
 import { FLEET_RESOURCE_KINDS, } from './fleet-divergence.js';
@@ -43,7 +44,11 @@ export async function collectLocalFleetSignIn() {
             try {
                 const info = await getAccountInfo(agent, home);
                 signedIn = info.signedIn;
-                account = accountDisplayLabel(info) || null;
+                // Prefix the durable account name when this identity has been named.
+                const display = accountDisplayLabel(info);
+                const identityKey = info.accountKey ?? info.email?.toLowerCase();
+                const saved = identityKey ? listNativeAccounts(readMeta()).find(item => item.agent === agent && item.identityKey === identityKey) : undefined;
+                account = (saved ? `${saved.name} · ${display || saved.identityLabel || identityKey}` : display) || null;
             }
             catch {
                 /* advisory only — treat as logged out, provability decided below */

package/dist/lib/devices/harness-inventory.d.ts

@@ -1,6 +1,6 @@
 import { type AccountInfo } from '../agents.js';
 import type { AgentId } from '../types.js';
-import { type UsageSnapshot } from '../usage.js';
+import { type UsageSnapshot } from '../accounting/usage.js';
 /** An account's usage headroom rolled into one glanceable summary. */
 export interface QuotaSummary {
     /**

package/dist/lib/devices/harness-inventory.js

@@ -15,8 +15,10 @@
  */
 import chalk from 'chalk';
 import { ALL_AGENT_IDS, accountDisplayLabel, getAccountInfo, } from '../agents.js';
-import { deriveUsageStatusFromSnapshot, getUsageInfoByIdentity, getUsageLookupKey, } from '../usage.js';
-import { getVersionHomePath, listInstalledVersions } from '../versions.js';
+import { deriveUsageStatusFromSnapshot, getUsageInfoByIdentity, getUsageLookupKey, } from '../accounting/usage.js';
+import { getVersionHomePath, listInstalledVersions } from '../installations/versions.js';
+import { readMeta } from '../state.js';
+import { listNativeAccounts } from '../account-registry.js';
 /**
  * Roll one usage snapshot into a {@link QuotaSummary}. Mirrors the blocking-window
  * selection of {@link deriveUsageStatusFromSnapshot} (the model-specific
@@ -99,6 +101,7 @@ export async function collectLocalHarnessInventory(opts) {
     const usageByKey = usageInputs.length
         ? (await getUsageInfoByIdentity(usageInputs, opts?.refresh ? { forceRefresh: true } : undefined)).usageByKey
         : new Map();
+    const savedNative = listNativeAccounts(readMeta());
     return pending.map(({ agent, version, info }) => {
         const key = getUsageLookupKey(info);
         const usage = key ? usageByKey.get(key) : undefined;
@@ -106,7 +109,10 @@ export async function collectLocalHarnessInventory(opts) {
         const quota = summarizeQuota(snapshot, usage?.error ?? null, info?.usageStatus ?? null);
         const signedIn = !!info?.signedIn;
         const { ready, reason } = computeReady(signedIn, quota);
-        const account = info ? accountDisplayLabel(info) || null : null;
+        const display = info ? accountDisplayLabel(info) || null : null;
+        const identityKey = info?.accountKey ?? info?.email?.toLowerCase();
+        const saved = identityKey ? savedNative.find(item => item.agent === agent && item.identityKey === identityKey) : undefined;
+        const account = saved ? `${saved.name} · ${display || saved.identityLabel || identityKey}` : display;
         return { agent, version, account, signedIn, quota, ready, reason };
     });
 }
@@ -121,6 +127,9 @@ export function groupByAccount(rows) {
     const order = [];
     const groups = new Map();
     for (const row of rows) {
+        // Signed-out rows share one bucket under a sentinel key. Use the NUL-prefixed
+        // literal (a TS `\0` escape, NOT a raw NUL byte in the source) so the key can
+        // never collide with a real account label named literally "signed-out".
         const key = row.account ?? '\0signed-out';
         if (!groups.has(key)) {
             groups.set(key, []);

package/dist/lib/devices/known-hosts.js

@@ -12,7 +12,7 @@
  *
  * The learn-then-pin flow: the first `agents ssh`/fleet connection to a host is
  * still `accept-new`, but it writes the learned key into THIS store, which pins
- * it for every subsequent connect. Credential copies (`run --host --copy-creds`)
+ * it for every subsequent connect. Credential copies (`run --device --copy-creds`)
  * refuse to run against a host that isn't pinned here — see
  * `commands/exec.ts` — so tokens never ride an unverified first connect.
  */

package/dist/lib/devices/pool.d.ts

@@ -0,0 +1,61 @@
+/**
+ * The automatic-placement pool — which devices `--device auto` may pick from.
+ *
+ * One rule, in one place, so every automatic-placement path agrees: `agents run
+ * --device auto`, `agents teams add --device auto`, the generic host resolver,
+ * and the AGI EXT launch commands (which emit `--device auto` rather than
+ * scoring devices themselves) all draw from {@link filterAutoPool}.
+ *
+ * The pool is an ALLOWLIST the moment the operator marks a worker. Roles are
+ * stored in that device's tracked per-device doc
+ * (`devices/<name>/agents.yaml` `config.role`, see `lib/device-config.ts`)
+ * and sync with `agents repo push/pull`.
+ *
+ * | Fleet state | `--device auto` picks from |
+ * |---|---|
+ * | no device marked | every online device (unchanged behavior) |
+ * | some marked `worker` | ONLY those workers |
+ * | marked `personal` | never, under either state |
+ *
+ * `auto.pool all` turns the allowlist off; `personal` stays excluded, because a
+ * machine the user sits at is marked precisely so agents stay off it.
+ *
+ * Paired cockpits (an iPhone/iPad, `role: control` in the device registry, set
+ * by `agents devices pair-ios`) are excluded by the CALLER that reads the
+ * registry — `listOnlineDeviceNames` in `lib/smart-launch.ts` — not here. That
+ * role is machine-local by nature and already has a home; duplicating it in the
+ * shared config would be a second store for one concept.
+ */
+import { type AutoPoolMode, type ConfiguredDeviceRole } from '../device-config.js';
+export interface AutoPoolOptions {
+    /** Pool mode; defaults to the configured `auto.pool`. */
+    mode?: AutoPoolMode;
+    /** Configured roles by device name; defaults to the fleet-shared block. */
+    roles?: Record<string, ConfiguredDeviceRole>;
+    /**
+     * Device names to resolve roles for when `roles` is not given directly —
+     * so a fleet-wide role default reaches a device with no per-device doc of
+     * its own. Ignored once `roles` is supplied. See
+     * {@link listConfiguredDeviceRoles}.
+     */
+    roster?: string[];
+}
+/**
+ * Narrow a candidate host list to the devices automatic placement may pick.
+ *
+ * Returns the input order, minus the excluded devices. An empty result is a
+ * real answer — "you marked workers and none of them is a candidate right now"
+ * — and callers surface it as their own no-healthy-device error rather than
+ * quietly widening back to the full fleet.
+ */
+export declare function filterAutoPool(pool: string[], opts?: AutoPoolOptions): string[];
+/** True when this host is one automatic placement may pick. */
+export declare function isAutoPoolMember(host: string, opts?: AutoPoolOptions): boolean;
+/** Device names explicitly marked `worker`, in registry order. */
+export declare function listWorkerDevices(opts?: Pick<AutoPoolOptions, 'roles'>): string[];
+/**
+ * One line naming why the pool is what it is, for the `--device auto` banner and
+ * the no-healthy-device error. Empty string when no role narrows anything, so
+ * callers can append it unconditionally.
+ */
+export declare function describeAutoPool(opts?: AutoPoolOptions): string;

package/dist/lib/devices/pool.js

@@ -0,0 +1,83 @@
+/**
+ * The automatic-placement pool — which devices `--device auto` may pick from.
+ *
+ * One rule, in one place, so every automatic-placement path agrees: `agents run
+ * --device auto`, `agents teams add --device auto`, the generic host resolver,
+ * and the AGI EXT launch commands (which emit `--device auto` rather than
+ * scoring devices themselves) all draw from {@link filterAutoPool}.
+ *
+ * The pool is an ALLOWLIST the moment the operator marks a worker. Roles are
+ * stored in that device's tracked per-device doc
+ * (`devices/<name>/agents.yaml` `config.role`, see `lib/device-config.ts`)
+ * and sync with `agents repo push/pull`.
+ *
+ * | Fleet state | `--device auto` picks from |
+ * |---|---|
+ * | no device marked | every online device (unchanged behavior) |
+ * | some marked `worker` | ONLY those workers |
+ * | marked `personal` | never, under either state |
+ *
+ * `auto.pool all` turns the allowlist off; `personal` stays excluded, because a
+ * machine the user sits at is marked precisely so agents stay off it.
+ *
+ * Paired cockpits (an iPhone/iPad, `role: control` in the device registry, set
+ * by `agents devices pair-ios`) are excluded by the CALLER that reads the
+ * registry — `listOnlineDeviceNames` in `lib/smart-launch.ts` — not here. That
+ * role is machine-local by nature and already has a home; duplicating it in the
+ * shared config would be a second store for one concept.
+ */
+import { autoPoolMode, listConfiguredDeviceRoles } from '../device-config.js';
+import { normalizeHost } from '../machine-id.js';
+/** Roles that automatic placement never picks, whatever the pool mode. */
+const NEVER_AUTO = new Set(['personal']);
+/**
+ * Narrow a candidate host list to the devices automatic placement may pick.
+ *
+ * Returns the input order, minus the excluded devices. An empty result is a
+ * real answer — "you marked workers and none of them is a candidate right now"
+ * — and callers surface it as their own no-healthy-device error rather than
+ * quietly widening back to the full fleet.
+ */
+export function filterAutoPool(pool, opts = {}) {
+    const roles = opts.roles ?? listConfiguredDeviceRoles(opts.roster ?? pool);
+    const byHost = new Map(Object.entries(roles).map(([name, role]) => [normalizeHost(name), role]));
+    const roleOf = (host) => byHost.get(normalizeHost(host));
+    const eligible = pool.filter((host) => {
+        const role = roleOf(host);
+        return role === undefined || !NEVER_AUTO.has(role);
+    });
+    const mode = opts.mode ?? autoPoolMode();
+    if (mode === 'all')
+        return eligible;
+    const anyWorkerMarked = [...byHost.values()].some((role) => role === 'worker');
+    if (!anyWorkerMarked)
+        return eligible;
+    return eligible.filter((host) => roleOf(host) === 'worker');
+}
+/** True when this host is one automatic placement may pick. */
+export function isAutoPoolMember(host, opts = {}) {
+    return filterAutoPool([host], opts).length > 0;
+}
+/** Device names explicitly marked `worker`, in registry order. */
+export function listWorkerDevices(opts = {}) {
+    const roles = opts.roles ?? listConfiguredDeviceRoles();
+    return Object.entries(roles)
+        .filter(([, role]) => role === 'worker')
+        .map(([name]) => name);
+}
+/**
+ * One line naming why the pool is what it is, for the `--device auto` banner and
+ * the no-healthy-device error. Empty string when no role narrows anything, so
+ * callers can append it unconditionally.
+ */
+export function describeAutoPool(opts = {}) {
+    const roles = opts.roles ?? listConfiguredDeviceRoles(opts.roster);
+    const mode = opts.mode ?? autoPoolMode();
+    const workers = listWorkerDevices({ roles });
+    if (mode === 'all') {
+        return workers.length > 0 ? 'auto.pool=all (worker marks ignored)' : '';
+    }
+    if (workers.length === 0)
+        return '';
+    return `workers: ${workers.join(', ')}`;
+}

package/dist/lib/devices/registry.d.ts

@@ -112,7 +112,7 @@ export declare function shellForPlatform(platform: DevicePlatform): DeviceShell;
 export declare function loadDevices(): Promise<DeviceRegistry>;
 /**
  * Synchronous {@link loadDevices} for callers already on a sync path (e.g. the
- * `agents sessions --host` fan-out builds its ssh command strings synchronously
+ * `agents sessions --device` fan-out builds its ssh command strings synchronously
  * and only needs the target's platform to pick POSIX vs PowerShell). Same
  * missing-file/corruption contract as {@link loadDevices}.
  */

package/dist/lib/devices/registry.js

@@ -164,7 +164,7 @@ export async function loadDevices() {
 }
 /**
  * Synchronous {@link loadDevices} for callers already on a sync path (e.g. the
- * `agents sessions --host` fan-out builds its ssh command strings synchronously
+ * `agents sessions --device` fan-out builds its ssh command strings synchronously
  * and only needs the target's platform to pick POSIX vs PowerShell). Same
  * missing-file/corruption contract as {@link loadDevices}.
  */

package/dist/lib/devices/resolve-profile.d.ts

@@ -1,7 +1,7 @@
 /**
  * The effective device profile: the registry's discovery record overlaid with
- * the operator's central config (`fleet.devices.<name>.config` in
- * `~/.agents/agents.yaml`).
+ * the operator's config (the per-device doc `devices/<name>/agents.yaml`
+ * `config:` block over central `fleet.defaults.config`).
  *
  * The registry (`~/.agents/.history/devices/registry.json`) stays the
  * discovery cache — address, Tailscale snapshot, reachability, createdAt. The

package/dist/lib/devices/resolve-profile.js

@@ -1,7 +1,7 @@
 /**
  * The effective device profile: the registry's discovery record overlaid with
- * the operator's central config (`fleet.devices.<name>.config` in
- * `~/.agents/agents.yaml`).
+ * the operator's config (the per-device doc `devices/<name>/agents.yaml`
+ * `config:` block over central `fleet.defaults.config`).
  *
  * The registry (`~/.agents/.history/devices/registry.json`) stays the
  * discovery cache — address, Tailscale snapshot, reachability, createdAt. The

package/dist/lib/devices/resolve-target.d.ts

@@ -27,7 +27,7 @@ export interface ResolvedExplicitTargetSet {
  */
 export declare function resolveDeviceTarget(token: string, opts?: Pick<MatchHostOptions, 'resolveAuto'>): Promise<DeviceProfile | undefined>;
 /**
- * Resolve an explicit `--host`/`--device` list to dialable targets. A token that
+ * Resolve an explicit `--device`/`--device` list to dialable targets. A token that
  * fails the injection guard or names nothing reachable is skipped with a stderr
  * note (never fatal — one bad token must not blank the fan-out). Shared by every
  * cross-machine fan-out so they can never diverge onto two routes.

package/dist/lib/devices/resolve-target.js

@@ -1,14 +1,14 @@
 /**
  * Fan-out + `agents ssh` adapters over the single host/device resolver.
  *
- * Every `--host` / `--device` token becomes a concrete target through one core,
+ * Every `--device` / `--device` token becomes a concrete target through one core,
  * {@link matchHost} in ../hosts/registry.ts — the merged directory that reads the
  * devices registry, the agents.yaml overlay, AND ssh_config (RUSH-1967). This
  * module is only the two thin adapters the fan-out and interactive-ssh paths
  * need on top of that core:
  *   - {@link resolveExplicitTargets} — a token list → dialable `{target, machine,
- *     name, os}` rows, so `sessions --host` / session bundles / remote agents-json
- *     dial the exact same address (and machine id) `run --host` does.
+ *     name, os}` rows, so `sessions --device` / session bundles / remote agents-json
+ *     dial the exact same address (and machine id) `run --device` does.
  *   - {@link resolveDeviceTarget} — a token → the full {@link DeviceProfile}
  *     `agents ssh` needs (auth, shell, tailscale metadata), with the same
  *     grammar; a bare unregistered alias returns undefined ("Unknown device").
@@ -98,7 +98,7 @@ export async function resolveDeviceTarget(token, opts = {}) {
     return undefined;
 }
 /**
- * Resolve an explicit `--host`/`--device` list to dialable targets. A token that
+ * Resolve an explicit `--device`/`--device` list to dialable targets. A token that
  * fails the injection guard or names nothing reachable is skipped with a stderr
  * note (never fatal — one bad token must not blank the fan-out). Shared by every
  * cross-machine fan-out so they can never diverge onto two routes.

package/dist/lib/devices/self-host.d.ts

@@ -1,6 +1,6 @@
 /**
  * True when `name` refers to the local machine. Case-insensitive and
- * trailing-dot-tolerant. Use this everywhere a `--host`/fleet target is compared
+ * trailing-dot-tolerant. Use this everywhere a `--device`/fleet target is compared
  * against "self" so a tailscale-name reference short-circuits to a local run
  * instead of self-SSHing.
  */

package/dist/lib/devices/self-host.js

@@ -2,11 +2,11 @@
  * "Is this hostname the local machine?" — matched against every identity the box
  * answers to, not just its short id.
  *
- * The self-checks that gate `--host` dispatch and the fleet-health fan-out used to
+ * The self-checks that gate `--device` dispatch and the fleet-health fan-out used to
  * compare only against {@link machineId} (the lowercased short hostname, e.g.
  * `zion`). A caller that referenced the box by its **tailscale MagicDNS name**
  * (`zion.tail1a85a1.ts.net`) — which is exactly what `fleetDialTarget` and the
- * Factory floor's `--host` probes use — slipped past the check and SSH'd to the
+ * Factory floor's `--device` probes use — slipped past the check and SSH'd to the
  * LOCAL box over its own tailscale name. On a loaded machine that self-SSH'd
  * `doctor --json` orphaned on timeout and piled up until the host was crushed
  * (RUSH-2114). Matching the full identity set closes that gap at the source.
@@ -45,7 +45,7 @@ function selfAliases() {
 }
 /**
  * True when `name` refers to the local machine. Case-insensitive and
- * trailing-dot-tolerant. Use this everywhere a `--host`/fleet target is compared
+ * trailing-dot-tolerant. Use this everywhere a `--device`/fleet target is compared
  * against "self" so a tailscale-name reference short-circuits to a local run
  * instead of self-SSHing.
  */

package/dist/lib/devices/ssh-config.d.ts

@@ -3,7 +3,7 @@
  *
  * Writing a managed include (e.g. `~/.ssh/config.d/agents`) makes every tool
  * that speaks ssh — plain `ssh`/`scp`/`rsync`/`git`, and `agents sessions
- * --host` — resolve the registry's logical device names transparently, without
+ * --device` — resolve the registry's logical device names transparently, without
  * each of them learning about the registry. `agents ssh` stays the value-add
  * layer (preflight, password-from-bundle auth, platform-aware exec) on top.
  *

package/dist/lib/devices/stats-cache.js

@@ -15,7 +15,7 @@
  * - **`--refresh` / `--live`:** skip the cache and live-probe every device,
  *   rewriting the cache.
  *
- * The daemon warms this cache (~every 3 min, see `lib/daemon.ts
+ * The daemon warms this cache (~every 3 min, see `lib/daemon/daemon.ts
  * runFleetCacheWarm`), so in steady state a default read has zero
  * remote ssh round-trips and returns immediately with data that is at most a
  * few minutes old — surfaced to the user as an "as of …" freshness note.

package/dist/lib/devices/sync.d.ts

@@ -6,7 +6,7 @@ import type { PendingDevice } from './pending.js';
  * node's OS and address but NOT the account you ssh in as, so we materialize the
  * local operator's username — tailnet devices are overwhelmingly one person's
  * boxes, and this is exactly the account ssh would already fall back to. Pinning
- * it in the registry makes `--host <device>` dial that account no matter which
+ * it in the registry makes `--device <device>` dial that account no matter which
  * machine launches the fan-out (a peer whose local user differs otherwise dials
  * the wrong account). Returns undefined when the username isn't a safe ssh
  * identifier, so a weird value never lands in the registry. */
@@ -40,6 +40,8 @@ export interface DeviceSyncResult {
     ok: boolean;
     /** Number of tailscale nodes upserted into the registry. */
     synced: number;
+    /** Names upserted, for explicit onboarding surfaces to persist approval. */
+    syncedNames: string[];
     /** Nodes discovered but neither registered-before nor ignored (name+platform). */
     pending: PendingDevice[];
     /** Populated when ok is false: why discovery was skipped. */

package/dist/lib/devices/sync.js

@@ -22,7 +22,7 @@ import { nodeToDeviceInput, parseTailscaleStatus, tailscaleStatusJson, } from '.
  * node's OS and address but NOT the account you ssh in as, so we materialize the
  * local operator's username — tailnet devices are overwhelmingly one person's
  * boxes, and this is exactly the account ssh would already fall back to. Pinning
- * it in the registry makes `--host <device>` dial that account no matter which
+ * it in the registry makes `--device <device>` dial that account no matter which
  * machine launches the fan-out (a peer whose local user differs otherwise dials
  * the wrong account). Returns undefined when the username isn't a safe ssh
  * identifier, so a weird value never lands in the registry. */
@@ -138,11 +138,11 @@ export async function runDeviceSync(opts = {}) {
             const input = withDefaultUser(nodeToDeviceInput(node), registeredBefore[node.name]?.user, localUser);
             await upsertDevice(node.name, input);
         }
-        return { ok: true, synced: toUpsert.length, pending };
+        return { ok: true, synced: toUpsert.length, syncedNames: toUpsert.map((node) => node.name), pending };
     }
     catch (err) {
         if (opts.soft) {
-            return { ok: false, synced: 0, pending: [], reason: err?.message ?? String(err) };
+            return { ok: false, synced: 0, syncedNames: [], pending: [], reason: err?.message ?? String(err) };
         }
         throw err;
     }

package/dist/lib/doctor-diff.js

@@ -24,15 +24,15 @@ import * as path from 'path';
 import { AGENTS, agentConfigDirName } from './agents.js';
 import { getProjectAgentsDir, getUserAgentsDir, getSystemAgentsDir, getEnabledExtraRepos, getResolvedRulesDir, getUserRulesDir, getEffectivePromptcutsPath, getActiveRulesPreset, } from './state.js';
 import { composeRulesFromState } from './rules/compose.js';
-import { getAvailableResources, getActuallySyncedResources, getVersionHomePath, compareVersions, } from './versions.js';
-import { discoverPlugins, marketplaceSpecForName } from './plugins.js';
-import { pluginInstallDir, repairableManifestFields } from './plugin-marketplace.js';
+import { getAvailableResources, getActuallySyncedResources, getVersionHomePath, compareVersions, } from './installations/versions.js';
+import { discoverPlugins, marketplaceSpecForName } from './plugins/plugins.js';
+import { pluginInstallDir, repairableManifestFields } from './plugins/plugin-marketplace.js';
 import { markdownToToml } from './convert.js';
 import { listCommandsInVersionHome, getVersionCommandsDir, listPluginCommandNames } from './commands.js';
 import { shouldInstallCommandAsSkill, commandSkillMatches, commandSkillName } from './command-skills.js';
 import { gooseCommandMatches, gooseCommandsDir } from './goose-commands.js';
 import { supports } from './capabilities.js';
-import { listSkillsInVersionHome, getVersionSkillsDir } from './skills.js';
+import { listSkillsInVersionHome, getVersionSkillsDir } from './plugins/skills.js';
 import { listHookEntriesFromDir } from './hooks.js';
 import { getResourceInventory } from './resource-inventory.js';
 const RULES_DOC_FILENAME = 'README.md';

package/dist/lib/drift-sync.js

@@ -20,8 +20,8 @@ import { select, confirm } from '@inquirer/prompts';
 import { AGENTS } from './agents.js';
 import { pullRepo } from './git.js';
 import { heal } from './heal.js';
-import { promptAgentVersionSelection } from './versions.js';
-import { isInteractiveTerminal, isPromptCancelled } from '../commands/utils.js';
+import { promptAgentVersionSelection } from './installations/versions.js';
+import { isInteractiveTerminal, isPromptCancelled } from './format.js';
 import { computeSyncStatus, } from './sync-status.js';
 const agentName = (id) => AGENTS[id]?.name ?? id;
 /** "claude@2.1.170  2 drifted · 1 missing" for one version. */

package/dist/lib/drift.js

@@ -1,9 +1,9 @@
 import { ALL_AGENT_IDS } from './agents.js';
-import { getGlobalDefault, listInstalledVersions } from './versions.js';
+import { getGlobalDefault, listInstalledVersions } from './installations/versions.js';
 import { loadManifest, isStale } from './staleness/index.js';
 import { diffVersionResources } from './doctor-diff.js';
 import { diffVersionCommands, iterCommandsCapableVersions } from './commands.js';
-import { diffVersionSkills, iterSkillsCapableVersions } from './skills.js';
+import { diffVersionSkills, iterSkillsCapableVersions } from './plugins/skills.js';
 import { iterHooksCapableVersions, listUnmanagedHooksInVersionHome, checkVersionHookWiring } from './hooks.js';
 import { commitsBehindUpstream } from './git.js';
 import { getUserAgentsDir, getSystemAgentsDir, getEnabledExtraRepos } from './state.js';

package/dist/lib/event-families.d.ts

@@ -3,7 +3,7 @@
  * event reader. One vocabulary maps onto existing filters (includeActivity,
  * eventTypes, level) so the engine stays single-path.
  */
-import type { EventType } from './events.js';
+import type { EventType } from './feed/events.js';
 import type { UnifiedQuery } from './event-stream.js';
 export declare const EVENT_FAMILIES: readonly ["ops", "activity", "commands", "runs", "security"];
 export type EventFamily = (typeof EVENT_FAMILIES)[number];

package/dist/lib/event-stream.d.ts

@@ -11,7 +11,7 @@
  * per-session shards (high frequency, one writer each). This module is the
  * single READ surface that merges them; nothing here writes.
  */
-import { type EventRecord, type EventType, type EventLevel } from './events.js';
+import { type EventRecord, type EventType, type EventLevel } from './feed/events.js';
 import { type EventFamily } from './event-families.js';
 export interface UnifiedQuery {
     startDate?: Date;

package/dist/lib/event-stream.js

@@ -11,8 +11,8 @@
  * per-session shards (high frequency, one writer each). This module is the
  * single READ surface that merges them; nothing here writes.
  */
-import { query, levelFor } from './events.js';
-import { readActivityAsEventRecords } from './activity.js';
+import { query, levelFor } from './feed/events.js';
+import { readActivityAsEventRecords } from './feed/activity.js';
 import { applyFamilies } from './event-families.js';
 /** Apply the same filters query() applies, to an activity-derived record. */
 function matches(r, q) {

package/dist/lib/events-ingest.js

@@ -17,8 +17,8 @@
  * Pure except for the two writers it calls, so the routing and validation rules
  * below are unit-testable against a temp events path + activity root.
  */
-import { emit, isEventType, } from './events.js';
-import { appendActivityEvent, tierForEvent, } from './activity.js';
+import { emit, isEventType, } from './feed/events.js';
+import { appendActivityEvent, tierForEvent, } from './feed/activity.js';
 /** Envelope keys an incoming line may set directly; everything else is payload. */
 const ENVELOPE_KEYS = [
     'event', 'ts', 'sessionId', 'mailboxId', 'terminalId', 'launchId', 'tmuxPane',

package/dist/lib/exec.d.ts

@@ -161,7 +161,7 @@ export interface ExecOptions {
     captureStdoutTail?: boolean;
     /**
      * Print the run's resolved session id to stdout as a one-line sentinel once the
-     * child exits (see hosts/session-marker.ts). Set by the `--host` dispatch so the
+     * child exits (see hosts/session-marker.ts). Set by the `--device` dispatch so the
      * LAUNCHER can relate the remote-created session back to itself — Claude's id is
      * forced up front, but every other agent coins its own id on the remote box, and
      * this marker is how that id rides the followed log home. Headless-only and inert
@@ -219,10 +219,10 @@ export declare function parseExecEnv(entries: string[]): Record<string, string>
  * alongside the agent's real session id (terminals/sessions/<pid>.json), so it
  * is what maps a launch to its exact session even when the hook runs under a
  * different pid (tmux pane leaf / cmd.exe wrapper) — and, across an SSH hop, what
- * lets a `--host` launcher resolve the remote-coined id for agents that never
+ * lets a `--device` launcher resolve the remote-coined id for agents that never
  * accept a forced `--session-id`.
  *
- * ADOPT a caller-supplied `AGENT_LAUNCH_ID` (a `--host` launcher forwards one via
+ * ADOPT a caller-supplied `AGENT_LAUNCH_ID` (a `--device` launcher forwards one via
  * `--env` so it controls the key end-to-end); MINT a fresh one otherwise (every
  * local run, which passes none). A malformed inbound value is ignored in favour
  * of a fresh mint — the key must be a real correlation id, never an empty string.
@@ -365,7 +365,7 @@ export declare function shouldRecapDeadPane(status: number | undefined, interact
  * Why this is not `status ?? 0`: an interactive run whose tmux server died mid-
  * work landed on exactly those unknown branches and returned 0, so `agents run`
  * printed a failure banner while handing its caller a success code. The same
- * "1 if unknown" rule already governs the `--host` follow path
+ * "1 if unknown" rule already governs the `--device` follow path
  * (`docs/specifications.md` §Agent execution, exit-code table).
  *
  * @param pane       What `paneExitStatus` read back for the agent pane.
@@ -398,6 +398,8 @@ export interface TmuxWrapContext {
     raw: boolean;
     /** The AGENTS_NO_TMUX=1 escape hatch. */
     noTmuxEnv: boolean;
+    /** This device's `tmux.enabled` config — false turns the wrap off for every launch on this box. */
+    configEnabled: boolean;
     /** Whether a tmux binary is on PATH. */
     tmuxAvailable: boolean;
 }
@@ -410,12 +412,13 @@ export interface TmuxWrapContext {
  * focus` re-attach a live session without forking it. Pure so the gate is unit-
  * tested independently of the (side-effecting) spawn.
  *
- * All five guards must pass:
+ * All seven guards must pass:
  *   - interactive     — a headless `-p` run has no TTY to attach; keep bare spawn.
  *   - not Windows     — no tmux path on win32.
  *   - not already in tmux — nesting tmux-in-tmux is pointless and confusing.
  *   - not --raw       — explicit opt-out.
  *   - not AGENTS_NO_TMUX=1 — env opt-out (CI, scripts, the shim passthrough path).
+ *   - tmux.enabled    — this device's durable opt-out, for a box whose tmux is broken.
  *   - tmux installed  — otherwise there is nothing to wrap with.
  */
 export declare function shouldWrapInTmux(ctx: TmuxWrapContext): boolean;