@phnx-labs/agents-cli 1.22.39 → 1.22.40

package/dist/commands/subagents.js

@@ -14,7 +14,7 @@ import { homeDir } from '../lib/platform/index.js';
 import { capableAgents } from '../lib/capabilities.js';
 import { cloneRepo } from '../lib/git.js';
 import { discoverSubagentsFromRepo, installSubagentCentrally, listInstalledSubagents, getInstalledSubagent, listSubagentsForAgent, iterSubagentsCapableVersions, removeSubagentFromVersion, } from '../lib/subagents.js';
-import { listInstalledVersions, syncResourcesToVersion, getGlobalDefault, getVersionHomePath, promptAgentVersionSelection, } from '../lib/versions.js';
+import { listInstalledVersions, syncResourcesToVersion, getGlobalDefault, getVersionHomePath, promptAgentVersionSelection, } from '../lib/installations/versions.js';
 import { getSubagentsDir, recordVersionResources } from '../lib/state.js';
 import { requireDestructiveArg, promptRemovalTargets, parseCommaSeparatedList, resolveAgentTargetsAutoInstalling, } from './utils.js';
 import { showResourceList, buildTargetsSection, } from './resource-view.js';

package/dist/commands/sync.js

@@ -34,7 +34,7 @@ import { Option } from 'commander';
 import chalk from 'chalk';
 import { resolveSyncPassphraseFromEnv } from '../lib/secrets/sync-passphrase.js';
 import { agentLabel, resolveAgentName, MANAGED_AGENT_IDS, isAgentHardDeprecated, hardDeprecationError } from '../lib/agents.js';
-import { isVersionInstalled, syncResourcesToVersion, parseAgentSpec, resolveVersion, resolveVersionAlias, listInstalledVersions, getAvailableResources, getActuallySyncedResources, getProjectOnlyResources, getNewResources, hasNewResources, promptResourceSelection, promptNewResourceSelection, buildSelection, mergeRepoScopedSelections, listRepoNames, getVersionHomePath, } from '../lib/versions.js';
+import { isVersionInstalled, syncResourcesToVersion, parseAgentSpec, resolveVersion, resolveVersionAlias, listInstalledVersions, getAvailableResources, getActuallySyncedResources, getProjectOnlyResources, getNewResources, hasNewResources, promptResourceSelection, promptNewResourceSelection, buildSelection, mergeRepoScopedSelections, listRepoNames, getVersionHomePath, } from '../lib/installations/versions.js';
 import { capableAgents } from '../lib/capabilities.js';
 import { parseHookManifest, registerHooksToSettings } from '../lib/hooks.js';
 import { compileRulesForProject } from '../lib/rules/compile.js';
@@ -134,7 +134,7 @@ export function addSelectorOptions(cmd) {
 export function registerSyncCommand(program) {
     const cmd = addHostOption(program.command('sync [agentSpec] [repo]'))
         .summary('Make this machine current, or sync resources into one agent')
-        .description('With an [agentSpec], syncs resources (commands, skills, hooks, rules, MCPs, plugins, etc.) into that installed agent version — previews changes and lets you pick. e.g. "claude", "claude@2.1.142", a selector: @latest / @oldest / @pinned (= @default), or @all for every installed version.\n\nAppend a [repo] (or pass --repo) to scope the sync to a single DotAgent repo — system / user / project / <alias>. e.g. "agents sync claude@all system" reconciles only the system repo\'s resources into every installed Claude.\n\nGive a DotAgent repo name ALONE — "agents sync system" / "agents sync user" / "agents sync <alias>" — to git-sync that one repo: git pull --rebase against origin when the tree is clean; when it is dirty, fast-forward anyway if no incoming path is uncommitted, else refuse and name what collided. The user repo and extra aliases also push local commits up; the system repo is a pull-only mirror.\n\nWith NO agent, runs the umbrella verb: fetch the config repos then reconcile them into every installed agent. Secrets are opt-in — add --secrets to pull secret bundles. Session transcripts are queryable live via "agents sessions --host <machine>", or moved with "agents sessions export/import". Also: --cloud (fetch only), --local (reconcile only).')
+        .description('With an [agentSpec], syncs resources (commands, skills, hooks, rules, MCPs, plugins, etc.) into that installed agent version — previews changes and lets you pick. e.g. "claude", "claude@2.1.142", a selector: @latest / @oldest / @pinned (= @default), or @all for every installed version.\n\nAppend a [repo] (or pass --repo) to scope the sync to a single DotAgent repo — system / user / project / <alias>. e.g. "agents sync claude@all system" reconciles only the system repo\'s resources into every installed Claude.\n\nGive a DotAgent repo name ALONE — "agents sync system" / "agents sync user" / "agents sync <alias>" — to git-sync that one repo: git pull --rebase against origin when the tree is clean; when it is dirty, fast-forward anyway if no incoming path is uncommitted, else refuse and name what collided. The user repo and extra aliases also push local commits up; the system repo is a pull-only mirror.\n\nWith NO agent, runs the umbrella verb: fetch the config repos then reconcile them into every installed agent. Secrets are opt-in — add --secrets to pull secret bundles. Session transcripts are queryable live via "agents sessions --device <machine>", or moved with "agents sessions export/import". Also: --cloud (fetch only), --local (reconcile only).')
         .option('--agent <agent>', 'Agent identifier (legacy form; prefer the positional spec)')
         .option('--agent-version <version>', 'Version to sync into (legacy form; prefer "agent@version" or --version)')
         .option('--repo <name>', 'Scope the sync to a single DotAgent repo: system / user / project / <alias> (also accepted as a positional)')
@@ -146,7 +146,7 @@ export function registerSyncCommand(program) {
         .option('--quiet', 'Suppress all output (exit code indicates success)', false)
         .option('--dry-run', 'Show what would be synced without making any changes', false)
         .option('--allow-exec-surfaces', 'Allow syncing plugin exec surfaces (scripts, binaries) — off by default for safety', false)
-        .option('--json', 'Emit machine-readable JSON (also accepted so fleet fan-out via --host all can parse each peer)', false)
+        .option('--json', 'Emit machine-readable JSON (also accepted so fleet fan-out via --device all can parse each peer)', false)
         // Umbrella verb (no agent given): make this machine current.
         .option('--repos', 'Umbrella: git-pull ~/.agents + enabled ~/.agents-* extras', false)
         .option('--secrets', 'Umbrella: pull encrypted secret bundles from the remote', false)
@@ -317,7 +317,7 @@ async function runInteractiveReconcile(opts, outLog, errLog) {
 /**
  * The umbrella verb: bare `agents sync` (no agent) makes this machine current.
  * Resolves the flags + a secrets passphrase (env-only for now; tokenized auth
- * arrives with `agents login`) and runs the fetch+reconcile stages, then prints
+ * arrives with `agents secrets vault unlock`) and runs the fetch+reconcile stages, then prints
  * a one-line summary. Stage failures are non-fatal and surfaced as warnings.
  */
 async function runUmbrella(opts, quiet, outLog, errLog, json = false) {
@@ -357,13 +357,15 @@ async function runUmbrella(opts, quiet, outLog, errLog, json = false) {
         });
         if (json) {
             emitJson({
-                ok: true,
+                // A refused resource is not a clean sync (RUSH-2700).
+                ok: result.declined.length === 0,
                 mode: 'umbrella',
                 plan: result.plan,
                 repos: result.repos,
                 secrets: result.secrets,
                 devices: result.devices,
                 reconciled: result.reconciled,
+                declined: result.declined,
             });
             return;
         }
@@ -498,7 +500,7 @@ async function runSync(agentSpec, repoArg, opts) {
     if (!agentId) {
         // No agent specified → the umbrella verb: make this machine current
         // (fetch repos + secrets + sessions, then reconcile all installed agents).
-        // This is the path fleet fan-out (`--host all`) hits with injected --json.
+        // This is the path fleet fan-out (`--device all`) hits with injected --json.
         await runUmbrella(opts, quiet, outLog, errLog, json);
         return;
     }
@@ -575,7 +577,8 @@ async function runSync(agentSpec, repoArg, opts) {
         }
         if (json) {
             emitJson({
-                ok: true,
+                // Any version that refused a write makes the whole run not-ok (RUSH-2700).
+                ok: versions.every(({ result }) => result.declined.length === 0),
                 mode: 'agent-all',
                 agent: agentId,
                 repo: repoScope,
@@ -591,6 +594,7 @@ async function runSync(agentSpec, repoArg, opts) {
                     plugins: result.plugins,
                     workflows: result.workflows,
                     pruned: result.pruned,
+                    declined: result.declined,
                 })),
             });
         }
@@ -810,7 +814,10 @@ async function runSync(agentSpec, repoArg, opts) {
 /** Stable `--json` payload for a single agent@version resource sync. */
 function agentSyncJson(agent, version, result, repo) {
     return {
-        ok: true,
+        // A refused resource is not a clean sync. `ok` was hardcoded true, so the
+        // machine surface (`--host all` fan-out) reported success for exactly the
+        // silent no-op this changed (RUSH-2677).
+        ok: result.declined.length === 0,
         mode: 'agent',
         agent,
         version,
@@ -826,6 +833,7 @@ function agentSyncJson(agent, version, result, repo) {
         workflows: result.workflows,
         projectSkipped: result.projectSkipped,
         pruned: result.pruned,
+        declined: result.declined,
     };
 }
 function anyResources(r) {
@@ -864,7 +872,7 @@ function printSyncDetail(result, agent, version, cwd) {
     const prunedLines = Object.entries(result.pruned)
         .filter(([, names]) => names.length > 0)
         .map(([kind, names]) => ({ kind, items: names }));
-    if (lines.length === 0 && prunedLines.length === 0) {
+    if (lines.length === 0 && prunedLines.length === 0 && result.declined.length === 0) {
         console.log(chalk.gray(`Already in sync — ${agentLabel(agent)}@${version}`));
         if (kept)
             console.log(chalk.gray(kept));
@@ -891,6 +899,13 @@ function printSyncDetail(result, agent, version, cwd) {
         for (const { kind, items } of prunedLines)
             printKindLine(kind, items, kindWidth, chalk.yellow);
     }
+    // A resource agents-cli refused to write is reported, never swallowed — an
+    // empty synced list on its own reads as "nothing to do" (RUSH-2677).
+    if (result.declined.length > 0) {
+        console.log(chalk.yellow(`Not written to ${agentLabel(agent)}@${version}:`));
+        for (const reason of result.declined)
+            console.log(`  ${chalk.yellow(reason)}`);
+    }
     if (kept)
         console.log(chalk.gray(kept));
 }

package/dist/commands/teams.d.ts

@@ -115,8 +115,8 @@ spawners?: Map<string, TeamSpawner>): {
 };
 /**
  * `teams add --remote-cwd` is a no-op trap. `--remote-cwd` comes from the shared
- * `--host` option family (option.ts) and is meaningful for commands that *route*
- * to a host, but `teams add` special-cases `--host`/`--device` as PLACEMENT, so
+ * `--device` option family (option.ts) and is meaningful for commands that *route*
+ * to a host, but `teams add` special-cases `--device`/`--device` as PLACEMENT, so
  * the flag is never read — a teammate's directory is the team's repo plus its
  * `--worktree`, not a path passed here. Silently ignoring it misleads you into
  * thinking it set the teammate's repo path (the exact wrong model that turns one

package/dist/commands/teams.js

@@ -6,7 +6,7 @@ import * as path from 'path';
 import { AgentManager, AgentStatus, checkCliSignedIn, collectTeamsDoctorData, getAgentsDir, VALID_TASK_TYPES, } from '../lib/teams/agents.js';
 import { mailboxDir, enqueue } from '../lib/mailbox.js';
 import { resolveProvider } from '../lib/cloud/registry.js';
-import { emit } from '../lib/events.js';
+import { emit } from '../lib/feed/events.js';
 import { maybeShowStarNudge } from '../lib/star-nudge.js';
 import { shareRuntimeEnv } from '../lib/share/config.js';
 import { runSupervisor } from '../lib/teams/supervisor.js';
@@ -26,13 +26,13 @@ import { resolveRemoteOsSync } from '../lib/hosts/remote-os.js';
 import { remoteWorktreeDirty, removeRemoteWorktree, ensureRemoteRepo, remoteCommitsBehindDefault } from '../lib/teams/remoteWorktree.js';
 import { getRemoteUrl } from '../lib/git.js';
 import { machineId } from '../lib/session/sync/config.js';
-import { isVersionInstalled, resolveVersionAlias, resolveVersionAliasLoose } from '../lib/versions.js';
+import { isVersionInstalled, resolveVersionAlias, resolveVersionAliasLoose } from '../lib/installations/versions.js';
 import { AGENTS, warnAgentDeprecated } from '../lib/agents.js';
 import { discoverSessions, parseTimeFilter, resolveSessionById } from '../lib/session/discover.js';
 import { renderSessionLog } from './sessions.js';
 import { buildPreview as buildSessionPreview } from './sessions-picker.js';
 import { parseExecEnv } from '../lib/exec.js';
-import { checkRunAccountReadiness } from '../lib/rotate.js';
+import { checkRunAccountReadiness } from '../lib/accounting/rotate.js';
 import { teamPicker, printTeamTable } from './teams-picker.js';
 import { teamSpawners } from '../lib/session/db.js';
 import { itemPicker } from '../lib/picker.js';
@@ -1155,8 +1155,8 @@ async function pickTeamOr(mgr, command) {
 }
 /**
  * `teams add --remote-cwd` is a no-op trap. `--remote-cwd` comes from the shared
- * `--host` option family (option.ts) and is meaningful for commands that *route*
- * to a host, but `teams add` special-cases `--host`/`--device` as PLACEMENT, so
+ * `--device` option family (option.ts) and is meaningful for commands that *route*
+ * to a host, but `teams add` special-cases `--device`/`--device` as PLACEMENT, so
  * the flag is never read — a teammate's directory is the team's repo plus its
  * `--worktree`, not a path passed here. Silently ignoring it misleads you into
  * thinking it set the teammate's repo path (the exact wrong model that turns one
@@ -1347,7 +1347,6 @@ export function registerTeamsCommands(program) {
         .option('--enable-worktrees', 'Each teammate works in its own git worktree (requires --worktree on add)')
         .option('--use-worktree <path>', 'All teammates share this existing worktree path (mutually exclusive with --enable-worktrees)')
         .option('--devices <list>', 'Pool of machines this team may run teammates on (comma-separated). Enables distributed auto-scheduling.')
-        .option('--hosts <list>', 'Alias for --devices.')
         .option('--repo <urlOrPath>', 'How each remote (--device) teammate gets the code — ONE git URL/path for the whole team (existing checkout reused, else cloned). A team is single-repo; for work across repos, make one team per repo. Defaults to this checkout origin.')
         .option('--project <slug>', "Work this team on a defined project: its primary directory is each local teammate's base cwd, its other directories become --add-dir grants")
         .option('--json', 'Output machine-readable JSON')
@@ -1460,7 +1459,7 @@ export function registerTeamsCommands(program) {
         .option('--confirm', 'Proceed even when the base checkout/repo is behind origin/main (a stale repo otherwise blocks the add)')
         .option('--json', 'Output machine-readable JSON')
         .action(async (team, teammate, task, opts) => {
-        // `--remote-cwd` rides the shared --host option family but is never read by
+        // `--remote-cwd` rides the shared --device option family but is never read by
         // `teams add` (placement, not routing). Fail loud with guidance rather than
         // silently ignoring it — see remoteCwdOnAddError. `!== undefined` so even an
         // explicit empty value (`--remote-cwd ""`) is rejected, not silently dropped.
@@ -1495,17 +1494,9 @@ export function registerTeamsCommands(program) {
         // device gets the code) before we resolve a per-teammate --device pin.
         await ensureTeam(team);
         const teamMeta = await getTeam(team);
-        // `--device`/`--host` are aliases (addHostOption registers both). For `teams
-        // add` the passthrough special-cases them as PLACEMENT, not routing, so the
-        // local action reads them here. Reject a conflicting pair.
-        let explicitDevice = (() => {
-            const h = opts.host;
-            const d = opts.device;
-            if (h && d && h !== d) {
-                dieFriction('teams', 'conflicting-host-device', 'Conflicting --host/--device values — pass just one.');
-            }
-            return h ?? d ?? null;
-        })();
+        // For `teams add` the passthrough special-cases --device as PLACEMENT,
+        // not routing, so the local action reads it here.
+        let explicitDevice = opts.device ?? null;
         // `auto` is the same live fleet sentinel `agents run --device auto` resolves
         // (RUSH-2185) — pick the concrete device name up front so the local-machine
         // check right below (and every dieFriction message further down) sees the

package/dist/commands/tmux.js

@@ -24,7 +24,7 @@ import chalk from 'chalk';
 import { truncate } from '../lib/format.js';
 import * as path from 'path';
 import { setHelpSections } from '../lib/help.js';
-import { assertTmuxAvailable, attachTmux, capturePane, createSession, getDefaultSocketPath, getTmuxVersion, hasSession, isTmuxInstalled, isTmuxVersionSupported, killAll, killSession, listSessions, MIN_TMUX_VERSION, readSessionMeta, sendKeys, splitPane, TmuxCommandError, TmuxSessionError, TmuxUnavailableError, } from '../lib/tmux/index.js';
+import { assertTmuxAvailable, attachTmux, capturePane, createSession, ensureSessionHookRepaired, getDefaultSocketPath, getTmuxVersion, hasSession, isTmuxInstalled, isTmuxVersionSupported, killAll, killSession, listSessions, MIN_TMUX_VERSION, readSessionMeta, sendKeys, splitPane, TmuxCommandError, TmuxSessionError, TmuxUnavailableError, } from '../lib/tmux/index.js';
 /** Register the `agents tmux` command tree. */
 export function registerTmuxCommands(program) {
     const tmux = program
@@ -158,6 +158,10 @@ export function registerTmuxCommands(program) {
                 console.error(chalk.red('attach requires a TTY. Run this from an interactive shell.'));
                 process.exit(1);
             }
+            // Repair a legacy/stale pane-died hook before handing the session to an
+            // attach client — the 5-min daemon reconcile that used to cover this was
+            // deleted; attach-time repair is what closes the gap now (RUSH-2435).
+            await ensureSessionHookRepaired(name, socket);
             const code = await attachTmux({ socket, args: ['attach-session', '-t', `=${name}`] });
             process.exit(code);
         });

package/dist/commands/trash.js

@@ -3,7 +3,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { resolveAgentName, agentLabel } from '../lib/agents.js';
 import { getTrashVersionsDir } from '../lib/state.js';
-import { getVersionDir } from '../lib/versions.js';
+import { getVersionDir } from '../lib/installations/versions.js';
 function listTrashEntries(filterAgent) {
     const root = getTrashVersionsDir();
     if (!fs.existsSync(root))

package/dist/commands/usage.d.ts

@@ -12,7 +12,7 @@
  */
 import type { Command } from 'commander';
 import type { AgentId } from '../lib/types.js';
-import { getUsageInfoForIdentity } from '../lib/usage.js';
+import { getUsageInfoForIdentity } from '../lib/accounting/usage.js';
 /** One agent's usage snapshot — the unit the text and --json renderers share. */
 export interface AgentUsageRecord {
     agent: AgentId;

package/dist/commands/usage.js

@@ -1,8 +1,8 @@
 import { addHostOption } from '../lib/hosts/option.js';
 import chalk from 'chalk';
 import { ALL_AGENT_IDS, AGENTS, getAccountInfo, agentLabel, resolveAgentName, formatAgentError, } from '../lib/agents.js';
-import { listInstalledVersions, getGlobalDefault, getVersionHomePath } from '../lib/versions.js';
-import { agentReportsUsage, formatUsageSection, getUsageInfoForIdentity } from '../lib/usage.js';
+import { listInstalledVersions, getGlobalDefault, getVersionHomePath } from '../lib/installations/versions.js';
+import { agentReportsUsage, formatUsageSection, getUsageInfoForIdentity } from '../lib/accounting/usage.js';
 export function registerUsageCommand(program) {
     addHostOption(program.command('usage [agent]'))
         .description('Show rate-limit / quota usage per agent')

package/dist/commands/utils.d.ts

@@ -6,7 +6,7 @@
  */
 import type { Command } from 'commander';
 import type { AgentId } from '../lib/types.js';
-import { type InstalledAgentTargetResult, type VersionSelectionResult } from '../lib/versions.js';
+import { type InstalledAgentTargetResult, type VersionSelectionResult } from '../lib/installations/versions.js';
 /**
  * Resolve a read/list command's `@version` filter through the agent-spec engine,
  * exiting cleanly on a bad spec. Drop-in for the old
@@ -15,14 +15,8 @@ import { type InstalledAgentTargetResult, type VersionSelectionResult } from '..
  *   @latest/@oldest/@x.y.z → concrete.
  */
 export declare function resolveListFilterOrExit(agent: AgentId, qualifier: string | undefined | null): string | undefined;
-/**
- * Check if an error is from user cancelling a prompt (Ctrl+C)
- */
-export declare function isPromptCancelled(err: unknown): boolean;
-/**
- * True when stdin/stdout are attached to a real terminal.
- */
-export declare function isInteractiveTerminal(): boolean;
+import { isPromptCancelled, isInteractiveTerminal, parseCommaSeparatedList } from '../lib/format.js';
+export { isPromptCancelled, isInteractiveTerminal, parseCommaSeparatedList };
 /** The resolved I/O surface for one command invocation — the human/agent split. */
 export interface Surface {
     /** Machine-readable output was requested (`--json`). */
@@ -73,10 +67,6 @@ export declare function requireDestructiveArg(opts: {
  * Print long content directly in non-interactive shells, use a pager only for real terminals.
  */
 export declare function printWithPager(output: string, lineCount: number): void;
-/**
- * Parse a comma-separated CLI list, trimming whitespace and dropping empties.
- */
-export declare function parseCommaSeparatedList(value: string | undefined): string[];
 /**
  * A target for resource removal: agent + version.
  */
@@ -127,4 +117,4 @@ export declare function resolveInstalledAgentTargetsAutoInstalling(value: string
     yes?: boolean;
     allVersions?: boolean;
 }): Promise<InstalledAgentTargetResult | null>;
-export { VersionNotInstalledError } from '../lib/versions.js';
+export { VersionNotInstalledError } from '../lib/installations/versions.js';

package/dist/commands/utils.js

@@ -10,7 +10,7 @@ import chalk from 'chalk';
 import ora from 'ora';
 import { confirm } from '@inquirer/prompts';
 import { agentLabel, resolveAgentName } from '../lib/agents.js';
-import { installVersion, listInstalledVersions, resolveAgentVersionTargets, resolveInstalledAgentTargets, } from '../lib/versions.js';
+import { installVersion, listInstalledVersions, resolveAgentVersionTargets, resolveInstalledAgentTargets, } from '../lib/installations/versions.js';
 import { resolveListFilter, AgentSpecError } from '../lib/agent-spec/index.js';
 /**
  * Resolve a read/list command's `@version` filter through the agent-spec engine,
@@ -31,20 +31,10 @@ export function resolveListFilterOrExit(agent, qualifier) {
         throw e;
     }
 }
-/**
- * Check if an error is from user cancelling a prompt (Ctrl+C)
- */
-export function isPromptCancelled(err) {
-    return err instanceof Error && (err.name === 'ExitPromptError' ||
-        err.message.includes('force closed') ||
-        err.message.includes('User force closed'));
-}
-/**
- * True when stdin/stdout are attached to a real terminal.
- */
-export function isInteractiveTerminal() {
-    return Boolean(process.stdin.isTTY && process.stdout.isTTY);
-}
+// Defined in lib/format.ts so `lib/` callers don't have to import upward into
+// the command layer; re-exported here for the ~50 command-layer consumers.
+import { isPromptCancelled, isInteractiveTerminal, parseCommaSeparatedList } from '../lib/format.js';
+export { isPromptCancelled, isInteractiveTerminal, parseCommaSeparatedList };
 /**
  * Compute a command's I/O surface once, in one place, instead of each command
  * re-deriving the human-vs-agent split (and raw-sniffing `process.std*.isTTY`
@@ -126,17 +116,6 @@ export function printWithPager(output, lineCount) {
         process.stdout.write(output.endsWith('\n') ? output : `${output}\n`);
     }
 }
-/**
- * Parse a comma-separated CLI list, trimming whitespace and dropping empties.
- */
-export function parseCommaSeparatedList(value) {
-    if (!value)
-        return [];
-    return value
-        .split(',')
-        .map((item) => item.trim())
-        .filter(Boolean);
-}
 /**
  * Prompt user to select which agent/version targets to remove a resource from.
  * If only one target, returns it without prompting. If multiple, shows checkbox.
@@ -317,4 +296,4 @@ export async function resolveInstalledAgentTargetsAutoInstalling(value, availabl
 }
 // Re-export so callers can `catch (err) { if (err instanceof VersionNotInstalledError) … }`
 // without reaching into ../lib/versions directly.
-export { VersionNotInstalledError } from '../lib/versions.js';
+export { VersionNotInstalledError } from '../lib/installations/versions.js';

package/dist/commands/versions.js

@@ -5,11 +5,11 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { select, confirm, checkbox } from '@inquirer/prompts';
 import { AGENTS, MANAGED_AGENT_IDS, accountOrgBadge, getAccountEmail, getAccountInfo, agentLabel, warnAgentDeprecated, isAgentHardDeprecated, hardDeprecationError, isSelfUpdatingAgent, } from '../lib/agents.js';
-import { formatUsageSummary, getUsageInfoForIdentity, getUsageInfoByIdentity, getUsageLookupKey, isUsageHeadlessScopeError, } from '../lib/usage.js';
+import { formatUsageSummary, getUsageInfoForIdentity, getUsageInfoByIdentity, getUsageLookupKey, isUsageHeadlessScopeError, } from '../lib/accounting/usage.js';
 import { viewAction } from './view.js';
 import { resolveConfiguredModel, formatAgentIdentity } from '../lib/models.js';
 import { readManifest, writeManifest, createDefaultManifest } from '../lib/manifest.js';
-import { installVersion, removeVersion, listInstalledVersions, isVersionInstalled, isLatestInstalled, isOldestInstalled, getGlobalDefault, setGlobalDefault, markVersionIsolated, setIsolatedDefault, isVersionIsolated, getVersionHomePath, getVersionDir, syncResourcesToVersion, parseAgentSpec, promptResourceSelection, promptNewResourceSelection, getAvailableResources, getActuallySyncedResources, getNewResources, getProjectOnlyResources, hasNewResources, printTrashFooter, } from '../lib/versions.js';
+import { installVersion, removeVersion, listInstalledVersions, isVersionInstalled, isLatestInstalled, isOldestInstalled, getGlobalDefault, setGlobalDefault, markVersionIsolated, setIsolatedDefault, isVersionIsolated, getVersionHomePath, getVersionDir, syncResourcesToVersion, parseAgentSpec, promptResourceSelection, promptNewResourceSelection, getAvailableResources, getActuallySyncedResources, getNewResources, getProjectOnlyResources, hasNewResources, printTrashFooter, } from '../lib/installations/versions.js';
 import { carryForwardSettings } from '../lib/settings-manifest.js';
 import { createShim, createVersionedAlias, supportsIsolatedInstall, isIsolationProtected, CONFIG_ENV_ISOLATED_AGENTS, removeShim, shimExists, getShimsDir, getShimPath, getPathShadowingExecutable, isShimsInPath, getPathSetupInstructions, addShimsToPath, switchConfigSymlink, switchHomeFileSymlinks, } from '../lib/shims.js';
 import { isInteractiveTerminal, isPromptCancelled, requireInteractiveSelection } from './utils.js';

package/dist/commands/view.d.ts

@@ -10,11 +10,19 @@ import type { Command } from 'commander';
 import { accountDisplayLabel } from '../lib/agents.js';
 import type { AccountInfo } from '../lib/agents.js';
 import type { AgentId } from '../lib/types.js';
-import { type ConfiguredModelSource } from '../lib/models.js';
+import type { ResourceSection, ViewJsonAgent } from '../lib/view-types.js';
+export type { ResourceItemJson, ResourceSection, SyncState, VersionResourcesJson, ViewJsonAgent, ViewJsonVersion } from '../lib/view-types.js';
 import { type ProfileSummary } from '../lib/profiles.js';
 import { type ByokUsageResult } from '../lib/byok-usage.js';
 /** Shared account identity formatter, re-exported for the view-specific tests. */
 export declare const accountColumnLabel: typeof accountDisplayLabel;
+/**
+ * The account column with the durable native-account name folded in: when the
+ * signed-in identity of `agentId` has been named via `agents accounts name`,
+ * render `work · email` instead of the bare email. Falls back to the plain
+ * display label when the identity is unnamed.
+ */
+export declare function namedAccountColumnLabel(agentId: AgentId, info: AccountInfo | undefined): string;
 export interface AccountOrderedVersion {
     version: string;
     email: string | null;
@@ -32,7 +40,6 @@ export declare function compareAccountOrderedVersions(a: AccountOrderedVersion,
  * gutter, but interior empties stay padded so later columns stay aligned.
  */
 export declare function joinViewColumns(cols: string[]): string;
-type SyncState = 'synced' | 'new' | 'modified' | 'deleted';
 /** Per-section filter flags. When any are true, only those sections render. */
 export interface ViewSectionFilter {
     commands?: boolean;
@@ -59,80 +66,6 @@ export declare function descriptionForPrefix(desc: string | undefined, prefix: s
  * host is missing is flagged rather than silently listed as runnable.
  */
 export declare function renderHarnessBlocks(harnesses: ProfileSummary[], installedHosts: Set<AgentId>, showPaths: boolean, byokMap?: Map<string, ByokUsageResult>): void;
-/** Machine-readable entry for a single installed version. */
-export interface ViewJsonVersion {
-    version: string;
-    isDefault: boolean;
-    /**
-     * Installed with `--isolated`. The human view has shown this since the isolated
-     * tag landed, but JSON carried no signal at all, so tooling could not tell a
-     * sandboxed copy from one that owns the user's launcher and real config.
-     */
-    isolated: boolean;
-    /**
-     * The isolated copy a bare `agents run <agent>` resolves to. Separate from
-     * `isDefault`, which is the GLOBAL default an isolated version can never be —
-     * reporting only `isDefault: false` hid the fact that this one is selected.
-     */
-    isIsolatedDefault: boolean;
-    signedIn: boolean;
-    email: string | null;
-    accountId?: string | null;
-    organizationType?: string | null;
-    organizationName?: string | null;
-    plan: string | null;
-    usageStatus: 'available' | 'rate_limited' | 'out_of_credits' | null;
-    overageCredits?: {
-        amount: number;
-        currency: string;
-    } | null;
-    windows: Array<{
-        key: 'session' | 'week' | 'sonnet_week' | 'month';
-        label?: string;
-        usedPercent: number;
-        resetsAt: string | null;
-    }>;
-    lastActive: string | null;
-    path: string;
-    configuredModel?: {
-        model: string;
-        source: ConfiguredModelSource;
-    } | null;
-    /** Present only when --resources / --detailed (or --json with a section
-     *  flag) is passed: this version's resource inventory with git sync-state. */
-    resources?: VersionResourcesJson;
-}
-/** Machine-readable entry for one agent's installed versions. */
-export interface ViewJsonAgent {
-    agent: AgentId;
-    versions: ViewJsonVersion[];
-    /** Custom harnesses that run on this agent as their host CLI. */
-    harnesses: ProfileSummary[];
-}
-/** Resource sections that --resources can include in --json output. */
-export type ResourceSection = 'commands' | 'skills' | 'mcp' | 'memory' | 'hooks' | 'workflows' | 'plugins';
-/** One resource entry in `--json --resources` output. */
-export interface ResourceItemJson {
-    name: string;
-    scope?: 'user' | 'project';
-    /** Git sync-state vs ~/.agents. Omitted for project-scoped resources or when
-     *  ~/.agents isn't a git repo. When queried via --host it reflects the
-     *  remote's ~/.agents — i.e. per-host resource drift. */
-    syncState?: SyncState;
-    description?: string;
-    /** Skills only, when > 0. */
-    ruleCount?: number;
-}
-/** Per-version resource inventory; one key per requested section. */
-export interface VersionResourcesJson {
-    commands?: ResourceItemJson[];
-    skills?: ResourceItemJson[];
-    mcp?: ResourceItemJson[];
-    memory?: ResourceItemJson[];
-    hooks?: ResourceItemJson[];
-    workflows?: ResourceItemJson[];
-    plugins?: ResourceItemJson[];
-}
 /** Build the set of resource sections to include in `--json` from the
  *  `--resources` / `--detailed` flags, plus (in --json mode) the per-section
  *  boolean filters (`--skills` etc.) that plain `--json` historically ignored. */
@@ -183,4 +116,3 @@ export declare function viewAction(agentArg?: string, options?: {
 } & ViewSectionFilter): Promise<void>;
 /** Register the `agents view` command. */
 export declare function registerViewCommand(program: Command): void;
-export {};

package/dist/commands/view.js

@@ -8,21 +8,22 @@ import { AGENTS, ALL_AGENT_IDS, accountDisplayLabel, getAllCliStates, getUnmanag
 import { ambientClaudeToken, loginHint } from '../lib/signin-badge.js';
 import { machineId } from '../lib/machine-id.js';
 import { authCacheKey, formatCheckedAge, readAuthHealthCache } from '../lib/auth-health.js';
-import { agentReportsUsage, deriveUsageStatusFromSnapshot, formatUsageSection, formatUsageSummary, formatUsageStatusBadge, getUsageInfoForIdentity, getUsageInfoByIdentity, getUsageLookupKey, isUsageHeadlessScopeError, } from '../lib/usage.js';
+import { agentReportsUsage, deriveUsageStatusFromSnapshot, formatUsageSection, formatUsageSummary, formatUsageStatusBadge, getUsageInfoForIdentity, getUsageInfoByIdentity, getUsageLookupKey, isUsageHeadlessScopeError, } from '../lib/accounting/usage.js';
 import { readManifest } from '../lib/manifest.js';
-import { listInstalledVersions, listInstalledVersionDirs, getGlobalDefault, getVersionHomePath, getVersionDir, removeVersion, printTrashFooter, reconcileStaleLatestForAgent, isGlobalBinaryAgent, getLiveVersion, isVersionIsolated, getIsolatedDefault, } from '../lib/versions.js';
+import { listInstalledVersions, listInstalledVersionDirs, getGlobalDefault, getVersionHomePath, getVersionDir, removeVersion, printTrashFooter, reconcileStaleLatestForAgent, isGlobalBinaryAgent, getLiveVersion, isVersionIsolated, getIsolatedDefault, } from '../lib/installations/versions.js';
 import { ensureVersionedAliasCurrent, removeShim, } from '../lib/shims.js';
 import { getAgentResources } from '../lib/resources.js';
 import { renderMergedResources } from '../lib/merged-resources.js';
 import { resolveVersionFilter, AgentSpecError } from '../lib/agent-spec/index.js';
 import { listCliStatus } from '../lib/cli-resources.js';
 import { isCapable } from '../lib/capabilities.js';
-import { discoverPlugins, pluginSupportsAgent } from '../lib/plugins.js';
-import { getAgentsDir, getUserAgentsDir, getEffectivePromptcutsPath, readMergedPromptcuts } from '../lib/state.js';
+import { discoverPlugins, pluginSupportsAgent } from '../lib/plugins/plugins.js';
+import { getAgentsDir, getUserAgentsDir, getEffectivePromptcutsPath, readMergedPromptcuts, readMeta } from '../lib/state.js';
+import { listNativeAccounts } from '../lib/account-registry.js';
 import { isGitRepo, getGitSyncStatus } from '../lib/git.js';
 import { getCentralRulesFileName } from '../lib/rules/rules.js';
 import { composeRulesFromState } from '../lib/rules/compose.js';
-import { getConfiguredRunStrategy } from '../lib/rotate.js';
+import { getConfiguredRunStrategy } from '../lib/accounting/rotate.js';
 import { resolveRunDefaults } from '../lib/run-defaults.js';
 import { resolveConfiguredModel } from '../lib/models.js';
 import { listProfiles, profileExists, profileSummary, readProfile } from '../lib/profiles.js';
@@ -33,6 +34,20 @@ import { formatPath, isInteractiveTerminal, isPromptCancelled } from './utils.js
 import { terminalWidth, truncateToWidth, stringWidth, padToWidth } from '../lib/session/width.js';
 /** Shared account identity formatter, re-exported for the view-specific tests. */
 export const accountColumnLabel = accountDisplayLabel;
+/**
+ * The account column with the durable native-account name folded in: when the
+ * signed-in identity of `agentId` has been named via `agents accounts name`,
+ * render `work · email` instead of the bare email. Falls back to the plain
+ * display label when the identity is unnamed.
+ */
+export function namedAccountColumnLabel(agentId, info) {
+    const display = accountColumnLabel(info);
+    const identityKey = info?.accountKey ?? info?.email?.toLowerCase();
+    if (!identityKey)
+        return display;
+    const saved = listNativeAccounts(readMeta()).find(item => item.agent === agentId && item.identityKey === identityKey);
+    return saved ? `${saved.name} · ${display || saved.identityLabel || identityKey}` : display;
+}
 /**
  * Human `agents view` row order: selected default first, then email-bearing
  * accounts alphabetically, then installs whose account has no email. Version
@@ -499,7 +514,7 @@ async function showInstalledVersions(filterAgentId, viewOpts) {
                 maxVerLabel = Math.max(maxVerLabel, versionRowLabel(agentId, v, globalDefault).length);
                 const rawInfo = infoMap.get(`${agentId}:${v}`);
                 const info = rawInfo ? mergeCanonical(rawInfo) : undefined;
-                const accountLabel = accountColumnLabel(info);
+                const accountLabel = namedAccountColumnLabel(agentId, info);
                 if (accountLabel)
                     maxEmail = Math.max(maxEmail, accountLabel.length);
                 if (info?.plan)
@@ -628,7 +643,7 @@ async function showInstalledVersions(filterAgentId, viewOpts) {
                     // Always emit account / usage / status / lastActive columns once any
                     // signed-in row exists in the table (widths are global). Empty cells
                     // are space-padded so later columns do not drift left.
-                    const display = accountColumnLabel(vInfo);
+                    const display = namedAccountColumnLabel(agentId, vInfo);
                     parts.push(display ? chalk.cyan(padToWidth(display, maxEmail)) : ' '.repeat(maxEmail));
                     if (maxUsageWidth > 0) {
                         parts.push(padToWidth(usageStr, maxUsageWidth));
@@ -1690,7 +1705,7 @@ Examples:
 
   # One call: full inventory + what's synced on a host (installed agents,
   # versions, accounts, usage, and per-version resource sync-state)
-  agents view claude --host yosemite-s0 --json --resources all
+  agents view claude --device yosemite-s0 --json --resources all
   agents view claude --json --resources skills,plugins   # just those sections
 
   # Prune older versions that duplicate an account already used by a newer version

package/dist/commands/watchdog.js

@@ -37,7 +37,7 @@ function stateDir() {
  * Dynamic import keeps daemon.ts's heavy deps off the watchdog command's load path.
  */
 async function reloadDaemonForRoutine(startIfStopped) {
-    const { isDaemonRunning, ensureDaemonStarted, signalDaemonReload } = await import('../lib/daemon.js');
+    const { isDaemonRunning, ensureDaemonStarted, signalDaemonReload } = await import('../lib/daemon/daemon.js');
     if (isDaemonRunning()) {
         signalDaemonReload();
         return;