@phnx-labs/agents-cli 1.20.33 → 1.20.34

package/dist/commands/teams.js

@@ -2,7 +2,7 @@ import chalk from 'chalk';
 import * as fs from 'fs/promises';
 import { addHostOption } from '../lib/hosts/option.js';
 import * as path from 'path';
-import { AgentManager, checkAllClis, getAgentsDir, VALID_TASK_TYPES, } from '../lib/teams/agents.js';
+import { AgentManager, checkAllClis, checkCliSignedIn, getAgentsDir, resolveSignInAdvisory, VALID_TASK_TYPES, } from '../lib/teams/agents.js';
 import { resolveProvider } from '../lib/cloud/registry.js';
 import { runSupervisor } from '../lib/teams/supervisor.js';
 import { handleSpawn, handleStatus, handleStop, handleTasks, toTaskStatusSummary, } from '../lib/teams/api.js';
@@ -10,6 +10,7 @@ import { createTeam, ensureTeam, getTeam, loadTeams, removeTeam, teamExists, } f
 import { setHelpSections } from '../lib/help.js';
 import { createWorktree, isGitRepo, hasUncommittedChanges, removeWorktree, } from '../lib/teams/worktree.js';
 import { isVersionInstalled, resolveVersionAlias, resolveVersionAliasLoose } from '../lib/versions.js';
+import { AGENTS, warnAgentDeprecated } from '../lib/agents.js';
 import { discoverSessions, parseTimeFilter, resolveSessionById } from '../lib/session/discover.js';
 import { buildPreview as buildSessionPreview } from './sessions-picker.js';
 import { parseExecEnv } from '../lib/exec.js';
@@ -133,7 +134,7 @@ function parseTeammate(spec) {
         }
     }
     die(`Unknown teammate '${spec}'. Available agents: ${VALID_AGENTS.join(', ')}.\n` +
-        `  Use 'claude', 'claude@2.1.112', or the name of a profile from 'agents view'.`);
+        `  Use 'claude', 'kimi@latest', 'kimi@0.19.2' (a version from 'agents view'), or a profile name.`);
 }
 function shortId(id) {
     return id.slice(0, 8);
@@ -183,6 +184,31 @@ export function wireCloudDispatcher(mgr) {
         return { cloudSessionId: cloudTask.id };
     });
 }
+/**
+ * Advisory: warn once per agent type of any still-pending (staged `--after`)
+ * teammate whose CLI may not be signed in. Warn-only — never blocks `start`.
+ * Local teammates only; cloud teammates authenticate through their provider.
+ */
+async function warnUnsignedTeammates(mgr, team) {
+    let pending;
+    try {
+        pending = (await mgr.listByTask(team)).filter((a) => a.status === 'pending' && !a.cloudProvider);
+    }
+    catch {
+        return; // team not loadable yet — nothing to warn about
+    }
+    const seen = new Set();
+    for (const a of pending) {
+        const agent = a.agentType;
+        if (seen.has(agent) || !AGENT_NAMES[agent])
+            continue;
+        seen.add(agent);
+        if (!(await checkCliSignedIn(agent))) {
+            console.error(chalk.yellow(`⚠ ${AGENT_NAMES[agent]} may not be signed in (detection is unreliable). Launching anyway.`) +
+                chalk.gray(`\n  If it fails to start, run \`${AGENTS[agent].cliCommand}\` to log in, or pass --force to silence this.`));
+        }
+    }
+}
 /** Single-wave start used by `teams start` without --watch. */
 async function runOneWave(mgr, team, json) {
     const launched = await mgr.startReady(team);
@@ -839,6 +865,7 @@ export function registerTeamsCommands(program) {
         .option('--cloud <provider>', `Dispatch to cloud backend instead of local CLI: ${VALID_CLOUD_PROVIDERS.join('|')}`)
         .option('--repo <owner/repo>', 'GitHub repository (required for --cloud rush)')
         .option('--branch <name>', 'Target git branch for cloud dispatch')
+        .option('--force', "Skip the advisory 'may not be signed in' warning (detection is unreliable)")
         .option('--json', 'Output machine-readable JSON')
         .action(async (team, teammate, task, opts) => {
         if (!VALID_MODES.includes(opts.mode)) {
@@ -865,10 +892,18 @@ export function registerTeamsCommands(program) {
             }
         }
         const { agent, version, profileName } = parseTeammate(teammate);
+        warnAgentDeprecated(agent);
         if (version && !isVersionInstalled(agent, version)) {
             die(`${AGENT_NAMES[agent]} ${version} isn't installed.\n` +
                 `  Install it:  agents add ${agent}@${version}\n` +
-                `  Or see what's installed:  agents view ${agent}`);
+                `  Or see what's installed (incl. @latest):  agents view ${agent}`);
+        }
+        // Advisory sign-in check: warn but NEVER block. Detection is unreliable
+        // for opaque-cred agents, so a false negative must not stop a team. Cloud
+        // dispatch authenticates through the provider, not the local CLI — skip it.
+        if (!opts.force && !cloudProviderId && !(await checkCliSignedIn(agent))) {
+            console.error(chalk.yellow(`⚠ ${AGENT_NAMES[agent]} may not be signed in (detection is unreliable). Adding anyway.`) +
+                chalk.gray(`\n  If it fails to start, run \`${AGENTS[agent].cliCommand}\` to log in, or pass --force to silence this.`));
         }
         if (opts.name !== undefined) {
             if (!opts.name || !/^[A-Za-z0-9_-]+$/.test(opts.name)) {
@@ -1139,6 +1174,7 @@ export function registerTeamsCommands(program) {
         .option('--watch', 'Keep running: poll every --interval seconds, fire new waves, exit when the DAG drains.')
         .option('--interval <seconds>', 'Seconds between waves in --watch mode (default 8)', '8')
         .option('--max-waves <n>', 'Safety cap on waves in --watch mode (default 1000)', '1000')
+        .option('--force', "Skip the advisory 'may not be signed in' warning for staged teammates (detection is unreliable)")
         .action(async (team, opts) => {
         const mgr = mkManager();
         wireCloudDispatcher(mgr);
@@ -1148,6 +1184,8 @@ export function registerTeamsCommands(program) {
                 return;
             team = picked;
         }
+        if (!opts.force && !isJsonMode(opts))
+            await warnUnsignedTeammates(mgr, team);
         if (!opts.watch) {
             await runOneWave(mgr, team, Boolean(opts.json));
             return;
@@ -1446,19 +1484,45 @@ export function registerTeamsCommands(program) {
     teams
         .command('doctor')
         .alias('dr')
-        .description('Check which agents are installed and available to join a team. Verifies CLI paths.')
+        .description('Check which agents are installed and available to join a team. Verifies CLI paths and shows an advisory sign-in hint.')
         .option('--json', 'Output machine-readable JSON')
         .action(async (opts) => {
         const info = checkAllClis();
+        // Advisory enrichment only. Sign-in detection is UNRELIABLE, so it never
+        // changes the authoritative installed/ready column — it annotates. And an
+        // agent that is actually running in a team is treated as signed in
+        // regardless of the probe, so doctor never reports a working agent as
+        // logged out ("don't show wrong stuff").
+        const running = new Set();
+        try {
+            for (const a of await mkManager().listRunning())
+                running.add(a.agentType);
+        }
+        catch { /* no teams yet — leave running empty */ }
+        const auth = {};
+        await Promise.all(Object.entries(info).map(async ([name, entry]) => {
+            const isRunning = running.has(name);
+            const probe = entry.installed && !isRunning ? await checkCliSignedIn(name) : false;
+            auth[name] = resolveSignInAdvisory(entry.installed, isRunning, probe);
+        }));
         if (isJsonMode(opts)) {
-            console.log(JSON.stringify(info, null, 2));
+            const merged = {};
+            for (const [name, entry] of Object.entries(info))
+                merged[name] = { ...entry, ...auth[name] };
+            console.log(JSON.stringify(merged, null, 2));
             return;
         }
         console.log(chalk.bold('Who can join a team:'));
         for (const [name, entry] of Object.entries(info)) {
             const pretty = AGENT_NAMES[name] || name;
             if (entry.installed) {
-                console.log(`  ${chalk.green('ready')}  ${pretty.padEnd(10)} ${chalk.gray(entry.path || '')}`);
+                const { signedIn, running: isRunning } = auth[name];
+                const hint = isRunning
+                    ? chalk.gray('in use')
+                    : signedIn
+                        ? chalk.gray('signed in')
+                        : chalk.gray('sign-in unverified');
+                console.log(`  ${chalk.green('ready')}  ${pretty.padEnd(10)} ${chalk.gray(entry.path || '')}  ${hint}`);
             }
             else {
                 console.log(`  ${chalk.red('no   ')}  ${pretty.padEnd(10)} ${chalk.gray(entry.error || 'not installed')}`);

package/dist/commands/versions.js

@@ -4,7 +4,7 @@ import ora from 'ora';
 import * as fs from 'fs';
 import * as path from 'path';
 import { select, confirm, checkbox } from '@inquirer/prompts';
-import { AGENTS, ALL_AGENT_IDS, getAccountEmail, getAccountInfo, agentLabel, } from '../lib/agents.js';
+import { AGENTS, ALL_AGENT_IDS, getAccountEmail, getAccountInfo, agentLabel, warnAgentDeprecated, } from '../lib/agents.js';
 import { formatUsageSummary, getUsageInfoForIdentity, getUsageInfoByIdentity, getUsageLookupKey, } from '../lib/usage.js';
 import { viewAction } from './view.js';
 import { readManifest, writeManifest, createDefaultManifest } from '../lib/manifest.js';
@@ -273,6 +273,7 @@ export function registerVersionsCommands(program) {
             }
             const { agent, version } = parsed;
             const agentConfig = AGENTS[agent];
+            warnAgentDeprecated(agent);
             if (!agentConfig.npmPackage && !agentConfig.installScript) {
                 console.log(chalk.yellow(`${agentLabel(agentConfig.id)} has no npm package. Install manually.`));
                 continue;

package/dist/commands/view.d.ts

@@ -9,6 +9,7 @@
 import type { Command } from 'commander';
 import type { AgentId } from '../lib/types.js';
 import { type ProfileSummary } from '../lib/profiles.js';
+type SyncState = 'synced' | 'new' | 'modified' | 'deleted';
 /** Per-section filter flags. When any are true, only those sections render. */
 export interface ViewSectionFilter {
     commands?: boolean;
@@ -27,6 +28,7 @@ export interface ViewJsonVersion {
     isDefault: boolean;
     signedIn: boolean;
     email: string | null;
+    accountId?: string | null;
     plan: string | null;
     usageStatus: 'available' | 'rate_limited' | 'out_of_credits' | null;
     overageCredits?: {
@@ -40,6 +42,9 @@ export interface ViewJsonVersion {
     }>;
     lastActive: string | null;
     path: string;
+    /** 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 {
@@ -47,6 +52,37 @@ export interface ViewJsonAgent {
     versions: ViewJsonVersion[];
     profiles: 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. */
+export declare function parseResourceSections(options: {
+    resources?: string | boolean;
+    detailed?: boolean;
+} & ViewSectionFilter, jsonMode: boolean): Set<ResourceSection>;
 /**
  * Prune older installed versions that share an email with a newer installed
  * version. Keeps the highest semver per email, skips the global default (with
@@ -66,6 +102,9 @@ export declare function viewAction(agentArg?: string, options?: {
     prune?: boolean;
     yes?: boolean;
     dryRun?: boolean;
+    resources?: string | boolean;
+    detailed?: boolean;
 } & ViewSectionFilter): Promise<void>;
 /** Register the `agents view` command. */
 export declare function registerViewCommand(program: Command): void;
+export {};

package/dist/commands/view.js

@@ -24,8 +24,24 @@ import { loadManifest, isStale } from '../lib/staleness/index.js';
 import { confirm } from '@inquirer/prompts';
 import { formatPath, isInteractiveTerminal, isPromptCancelled } from './utils.js';
 // Shown in the email column for agents that are signed in but expose no email
-// address locally (Antigravity, Kimi store an opaque OAuth/JWT credential).
+// address locally (Antigravity stores an opaque OAuth grant with no identity).
 const SIGNED_IN_LABEL = 'signed in';
+/**
+ * Text for the account (email) column. Prefers the real email; otherwise, for a
+ * signed-in agent whose credential carries no email but does carry an opaque
+ * account id (Kimi's user_id), show `id:<user_id>` so distinct accounts read
+ * distinctly instead of a generic "signed in". Falls back to "signed in" when we
+ * have neither (Antigravity), and empty when signed out.
+ */
+function accountColumnLabel(info) {
+    if (!info)
+        return '';
+    if (info.email)
+        return info.email;
+    if (info.signedIn)
+        return info.accountId ? `id:${info.accountId}` : SIGNED_IN_LABEL;
+    return '';
+}
 /**
  * Group profile summaries by their host harness, optionally filtered to a
  * single agent. Profile YAMLs that fail validation are silently skipped by
@@ -310,7 +326,10 @@ async function showInstalledVersions(filterAgentId) {
             return info;
         return {
             ...info,
-            plan: canon.plan,
+            // Prefer a plan the live usage fetch surfaced (Kimi reports membership
+            // tier in /usages; its local auth file has none) and fall back to the
+            // account-derived plan (Claude's billingType).
+            plan: usageByKey.get(key)?.snapshot?.plan ?? canon.plan,
             // Throttle state comes from the live usage windows, not the pay-as-you-go
             // overage flag that AccountInfo.usageStatus used to carry. A maxed window
             // means rate-limited; no snapshot means no badge. See
@@ -353,10 +372,9 @@ async function showInstalledVersions(filterAgentId) {
                 maxVerLabel = Math.max(maxVerLabel, label.length);
                 const rawInfo = infoMap.get(`${agentId}:${v}`);
                 const info = rawInfo ? mergeCanonical(rawInfo) : undefined;
-                if (info?.email)
-                    maxEmail = Math.max(maxEmail, info.email.length);
-                else if (info?.signedIn)
-                    maxEmail = Math.max(maxEmail, SIGNED_IN_LABEL.length);
+                const accountLabel = accountColumnLabel(info);
+                if (accountLabel)
+                    maxEmail = Math.max(maxEmail, accountLabel.length);
                 if (info?.plan)
                     maxPlanWidth = Math.max(maxPlanWidth, info.plan.length);
             }
@@ -432,9 +450,10 @@ async function showInstalledVersions(filterAgentId) {
                 }
                 else {
                     if (hasEmail || hasUsage || hasActive || signedIn) {
-                        // Signed-in agents without a local email (Antigravity, Kimi) show a
-                        // "signed in" placeholder so they read as logged in, not blank.
-                        const display = vInfo?.email || (signedIn ? SIGNED_IN_LABEL : '');
+                        // Signed-in agents without a local email show their account id
+                        // (Kimi's user_id) or a "signed in" placeholder (Antigravity) so they
+                        // read as logged in, not blank.
+                        const display = accountColumnLabel(vInfo);
                         const emailCol = display.padEnd(maxEmail);
                         parts.push(display ? chalk.cyan(emailCol) : ' '.repeat(maxEmail));
                     }
@@ -515,7 +534,7 @@ async function showInstalledVersions(filterAgentId) {
             const gUsageStr = formatUsageSummary(gInfo?.plan || null, gUsage?.snapshot || null);
             const gActiveStr = gInfo ? formatLastActive(gInfo.lastActive) : '';
             if (gInfo?.email || gUsageStr || gActiveStr || gInfo?.signedIn) {
-                const gDisplay = gInfo?.email || (gInfo?.signedIn ? SIGNED_IN_LABEL : '');
+                const gDisplay = accountColumnLabel(gInfo);
                 parts.push(gDisplay ? chalk.cyan(gDisplay) : '');
             }
             if (gUsageStr || gActiveStr)
@@ -686,53 +705,9 @@ async function showAgentResources(agentId, requestedVersion, filter) {
         }
     }
     const home = getVersionHomePath(agentId, version);
-    // Get git sync status if ~/.agents/ is a git repo
-    const userAgentsDir = getUserAgentsDir();
-    const hasGitRepo = isGitRepo(userAgentsDir);
-    const commandsSync = hasGitRepo ? await getGitSyncStatus(userAgentsDir, 'commands') : null;
-    const skillsSync = hasGitRepo ? await getGitSyncStatus(userAgentsDir, 'skills') : null;
-    const hooksSync = hasGitRepo ? await getGitSyncStatus(userAgentsDir, 'hooks') : null;
-    const memorySync = hasGitRepo ? await getGitSyncStatus(userAgentsDir, 'rules') : null;
-    // Helper to determine sync state for a resource
-    const getSyncState = (resourceName, resourceType, syncStatus) => {
-        if (!syncStatus)
-            return undefined;
-        let relativePath;
-        if (resourceType === 'commands') {
-            relativePath = `commands/${resourceName}.md`;
-        }
-        else if (resourceType === 'skills') {
-            relativePath = `skills/${resourceName}`;
-        }
-        else if (resourceType === 'hooks') {
-            relativePath = `hooks/${resourceName}`;
-        }
-        else {
-            // Rules files: map agent-specific name (CLAUDE.md) back to canonical (AGENTS.md)
-            const centralName = getCentralRulesFileName(agentId);
-            relativePath = `rules/${centralName}`;
-        }
-        const matchesPath = (f) => f === relativePath || f.startsWith(relativePath + '/');
-        const isNew = syncStatus.new.some(matchesPath);
-        const isStaged = syncStatus.staged.some(matchesPath);
-        const isModified = syncStatus.modified.some(matchesPath);
-        const isDeleted = syncStatus.deleted.some(matchesPath);
-        const isSynced = syncStatus.synced.some(matchesPath);
-        if (isNew || isStaged) {
-            return 'new';
-        }
-        if (isModified) {
-            return 'modified';
-        }
-        if (isDeleted) {
-            return 'deleted';
-        }
-        if (isSynced) {
-            return 'synced';
-        }
-        // Not in any array = local-only (untracked with no files)
-        return 'new';
-    };
+    // Git sync status if ~/.agents/ is a git repo (shared loader — see
+    // loadResourceSyncData / resolveResourceSyncState, reused by --json --resources).
+    const { hasGitRepo, commands: commandsSync, skills: skillsSync, hooks: hooksSync, memory: memorySync } = await loadResourceSyncData();
     const resources = getAgentResources(agentId, {
         cwd,
         scope: 'all',
@@ -745,23 +720,23 @@ async function showAgentResources(agentId, requestedVersion, filter) {
         version,
         commands: resources.commands.map(r => ({
             ...r,
-            syncState: r.scope === 'project' ? undefined : getSyncState(r.name, 'commands', commandsSync),
+            syncState: r.scope === 'project' ? undefined : resolveResourceSyncState(agentId, r.name, 'commands', commandsSync),
         })),
         skills: resources.skills.map(r => ({
             ...r,
             // ruleCount of 0 is noise — every skill has 0 unless it ships subrules, which is rare.
             ruleCount: r.ruleCount && r.ruleCount > 0 ? r.ruleCount : undefined,
-            syncState: r.scope === 'project' ? undefined : getSyncState(r.name, 'skills', skillsSync),
+            syncState: r.scope === 'project' ? undefined : resolveResourceSyncState(agentId, r.name, 'skills', skillsSync),
         })),
         skillErrors: resources.skillErrors,
         mcp: resources.mcp.map(r => ({ name: r.name, scope: r.scope, syncState: r.scope === 'project' ? undefined : 'synced' })),
         memory: resources.memory.map(r => ({
             ...r,
-            syncState: r.scope === 'project' ? undefined : getSyncState(r.name, 'memory', memorySync),
+            syncState: r.scope === 'project' ? undefined : resolveResourceSyncState(agentId, r.name, 'memory', memorySync),
         })),
         hooks: resources.hooks.map(r => ({
             ...r,
-            syncState: r.scope === 'project' ? undefined : getSyncState(r.name, 'hooks', hooksSync),
+            syncState: r.scope === 'project' ? undefined : resolveResourceSyncState(agentId, r.name, 'hooks', hooksSync),
         })),
         workflows: resources.workflows.map(r => ({ name: r.name, path: r.path, scope: r.scope })),
     };
@@ -827,13 +802,10 @@ async function showAgentResources(agentId, requestedVersion, filter) {
             cliVersion: version,
             info: accountInfo,
         });
-        const emailStr = accountInfo.email
-            ? chalk.cyan(`  ${accountInfo.email}`)
-            : accountInfo.signedIn
-                ? chalk.cyan(`  ${SIGNED_IN_LABEL}`)
-                : '';
+        const accountLabel = accountColumnLabel(accountInfo);
+        const emailStr = accountLabel ? chalk.cyan(`  ${accountLabel}`) : '';
         const status = chalk.green(version);
-        const usageStr = formatUsageSummary(accountInfo.plan, null);
+        const usageStr = formatUsageSummary(usageInfo.snapshot?.plan ?? accountInfo.plan, null);
         const usagePart = usageStr ? `  ${usageStr}` : '';
         console.log(`  ${colorAgent(agentId)(AGENTS[agentId].name.padEnd(14))} ${status}${emailStr}${usagePart}`);
         const usageLines = formatUsageSection(usageInfo);
@@ -973,14 +945,144 @@ async function showAgentResources(agentId, requestedVersion, filter) {
         console.log(chalk.gray('Legend:'), chalk.green('Tracked'), chalk.blue('Local-only'), chalk.yellow('Modified'), chalk.red('Deleted'));
     }
 }
+const ALL_RESOURCE_SECTIONS = ['commands', 'skills', 'mcp', 'memory', 'hooks', 'workflows', 'plugins'];
+/** Load git sync-state for the tracked resource kinds. Shared by the human
+ *  detail view (showAgentResources) and the `--json --resources` path. */
+async function loadResourceSyncData() {
+    const userAgentsDir = getUserAgentsDir();
+    const hasGitRepo = isGitRepo(userAgentsDir);
+    return {
+        hasGitRepo,
+        commands: hasGitRepo ? await getGitSyncStatus(userAgentsDir, 'commands') : null,
+        skills: hasGitRepo ? await getGitSyncStatus(userAgentsDir, 'skills') : null,
+        hooks: hasGitRepo ? await getGitSyncStatus(userAgentsDir, 'hooks') : null,
+        memory: hasGitRepo ? await getGitSyncStatus(userAgentsDir, 'rules') : null,
+    };
+}
+/** Resolve one resource's git sync-state. Extracted from showAgentResources so
+ *  the human view and the JSON path derive drift identically. */
+function resolveResourceSyncState(agentId, resourceName, resourceType, syncStatus) {
+    if (!syncStatus)
+        return undefined;
+    let relativePath;
+    if (resourceType === 'commands') {
+        relativePath = `commands/${resourceName}.md`;
+    }
+    else if (resourceType === 'skills') {
+        relativePath = `skills/${resourceName}`;
+    }
+    else if (resourceType === 'hooks') {
+        relativePath = `hooks/${resourceName}`;
+    }
+    else {
+        // Rules files: map agent-specific name (CLAUDE.md) back to canonical (AGENTS.md)
+        const centralName = getCentralRulesFileName(agentId);
+        relativePath = `rules/${centralName}`;
+    }
+    const matchesPath = (f) => f === relativePath || f.startsWith(relativePath + '/');
+    if (syncStatus.new.some(matchesPath) || syncStatus.staged.some(matchesPath))
+        return 'new';
+    if (syncStatus.modified.some(matchesPath))
+        return 'modified';
+    if (syncStatus.deleted.some(matchesPath))
+        return 'deleted';
+    if (syncStatus.synced.some(matchesPath))
+        return 'synced';
+    // Not in any array = local-only (untracked with no files)
+    return 'new';
+}
+/** Collect one version's resources for `--json`, limited to `sections`. Scans
+ *  the version's `home`, so per-version differences are reported accurately. */
+function collectVersionResources(agentId, home, cwd, cliInstalled, sections, sync) {
+    const res = getAgentResources(agentId, { cwd, scope: 'all', cliInstalled, home });
+    const out = {};
+    const withSync = (r, type, syncStatus) => {
+        const item = { name: r.name, scope: r.scope };
+        if (r.scope !== 'project') {
+            const s = resolveResourceSyncState(agentId, r.name, type, syncStatus);
+            if (s)
+                item.syncState = s;
+        }
+        if (r.description)
+            item.description = r.description;
+        return item;
+    };
+    if (sections.has('commands'))
+        out.commands = res.commands.map((r) => withSync(r, 'commands', sync.commands));
+    if (sections.has('skills')) {
+        out.skills = res.skills.map((r) => {
+            const item = withSync(r, 'skills', sync.skills);
+            // ruleCount of 0 is noise — every skill has 0 unless it ships subrules.
+            if (r.ruleCount && r.ruleCount > 0)
+                item.ruleCount = r.ruleCount;
+            return item;
+        });
+    }
+    if (sections.has('mcp')) {
+        out.mcp = res.mcp.map((r) => {
+            const item = { name: r.name, scope: r.scope };
+            if (r.scope !== 'project')
+                item.syncState = 'synced';
+            return item;
+        });
+    }
+    if (sections.has('memory'))
+        out.memory = res.memory.map((r) => withSync(r, 'memory', sync.memory));
+    if (sections.has('hooks'))
+        out.hooks = res.hooks.map((r) => withSync(r, 'hooks', sync.hooks));
+    if (sections.has('workflows'))
+        out.workflows = res.workflows.map((r) => ({ name: r.name, scope: r.scope }));
+    if (sections.has('plugins')) {
+        out.plugins = discoverPlugins()
+            .filter((p) => pluginSupportsAgent(p, agentId))
+            .map((p) => ({ name: p.name }));
+    }
+    return out;
+}
+/** 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. */
+export function parseResourceSections(options, jsonMode) {
+    const set = new Set();
+    const addAll = () => ALL_RESOURCE_SECTIONS.forEach((s) => set.add(s));
+    if (options.detailed)
+        addAll();
+    const rv = options.resources;
+    if (rv !== undefined) {
+        if (rv === true || String(rv).trim() === '' || String(rv).toLowerCase() === 'all') {
+            addAll();
+        }
+        else {
+            for (const raw of String(rv).split(',').map((s) => s.trim().toLowerCase()).filter(Boolean)) {
+                const section = raw === 'rules' ? 'memory' : raw; // --rules is the memory file
+                if (ALL_RESOURCE_SECTIONS.includes(section))
+                    set.add(section);
+            }
+        }
+    }
+    if (jsonMode) {
+        const flagToSection = [
+            ['commands', 'commands'], ['skills', 'skills'], ['mcp', 'mcp'],
+            ['workflows', 'workflows'], ['plugins', 'plugins'], ['hooks', 'hooks'], ['rules', 'memory'],
+        ];
+        for (const [flag, section] of flagToSection)
+            if (options[flag])
+                set.add(section);
+    }
+    return set;
+}
 /**
  * Collect structured info for one or more agents without rendering to the
  * terminal. Used by `--json` output and any programmatic consumer (e.g. the
  * agents-cli extension's "resume current session in best available version"
  * command).
  */
-async function collectAgentsJson(filterAgentId) {
+async function collectAgentsJson(filterAgentId, resourceSections) {
     const agentsToShow = filterAgentId ? [filterAgentId] : ALL_AGENT_IDS;
+    const wantResources = !!resourceSections && resourceSections.size > 0;
+    // Only pay for the git-status + resource scans when resources were requested.
+    const resourceSync = wantResources ? await loadResourceSyncData() : null;
+    const cliStates = wantResources ? await getAllCliStates() : null;
     const infoFetches = [];
     for (const agentId of agentsToShow) {
         for (const ver of listInstalledVersions(agentId)) {
@@ -1004,7 +1106,10 @@ async function collectAgentsJson(filterAgentId) {
             return info;
         return {
             ...info,
-            plan: canon.plan,
+            // Prefer a plan the live usage fetch surfaced (Kimi reports membership
+            // tier in /usages; its local auth file has none) and fall back to the
+            // account-derived plan (Claude's billingType).
+            plan: usageByKey.get(key)?.snapshot?.plan ?? canon.plan,
             // Throttle state comes from the live usage windows, not the pay-as-you-go
             // overage flag that AccountInfo.usageStatus used to carry. A maxed window
             // means rate-limited; no snapshot means no badge. See
@@ -1014,7 +1119,7 @@ async function collectAgentsJson(filterAgentId) {
         };
     };
     const byAgent = new Map();
-    for (const { agentId, version, info: rawInfo } of infoResults) {
+    for (const { agentId, version, home, info: rawInfo } of infoResults) {
         const info = mergeCanonical(rawInfo);
         const globalDefault = getGlobalDefault(agentId);
         const usageKey = getUsageLookupKey(info);
@@ -1025,6 +1130,7 @@ async function collectAgentsJson(filterAgentId) {
             isDefault: version === globalDefault,
             signedIn: info.signedIn,
             email: info.email,
+            accountId: info.accountId,
             plan: info.plan,
             usageStatus: info.usageStatus,
             overageCredits: info.overageCredits,
@@ -1038,6 +1144,9 @@ async function collectAgentsJson(filterAgentId) {
             lastActive: info.lastActive ? info.lastActive.toISOString() : null,
             path: getVersionDir(agentId, version),
         };
+        if (wantResources && resourceSync) {
+            entry.resources = collectVersionResources(agentId, home, process.cwd(), cliStates?.[agentId]?.installed ?? false, resourceSections, resourceSync);
+        }
         const existing = byAgent.get(agentId);
         if (existing)
             existing.push(entry);
@@ -1248,7 +1357,10 @@ export async function pruneDuplicates(filterAgentId, yes, dryRun) {
  * Exported for use by deprecated aliases.
  */
 export async function viewAction(agentArg, options) {
-    const json = options?.json === true;
+    // --resources / --detailed imply --json (they only shape structured output).
+    const explicitResources = options?.detailed === true || options?.resources !== undefined;
+    const json = options?.json === true || explicitResources;
+    const resourceSections = parseResourceSections(options ?? {}, json);
     const prune = options?.prune === true;
     const yes = options?.yes === true;
     const dryRun = options?.dryRun === true;
@@ -1280,7 +1392,7 @@ export async function viewAction(agentArg, options) {
             return;
         }
         if (json) {
-            const data = await collectAgentsJson();
+            const data = await collectAgentsJson(undefined, resourceSections);
             console.log(JSON.stringify(data, null, 2));
             return;
         }
@@ -1329,9 +1441,9 @@ export async function viewAction(agentArg, options) {
         return;
     }
     if (json) {
-        // --json ignores the @version suffix (detailed resource view is not yet
-        // exposed as structured data). Emit the version list for the agent.
-        const data = await collectAgentsJson(agentId);
+        // --json ignores the @version suffix, but --resources/--detailed (or a
+        // section flag) now attach each version's resource inventory + sync-state.
+        const data = await collectAgentsJson(agentId, resourceSections);
         console.log(JSON.stringify(data[0] ?? { agent: agentId, versions: [], profiles: [] }, null, 2));
         return;
     }
@@ -1354,6 +1466,8 @@ export function registerViewCommand(program) {
     addHostOption(program.command('view [agent]'))
         .description('Show what agent CLIs are installed and which versions you have. Inspect resources when you pass agent@version.')
         .option('--json', 'Emit machine-readable JSON (version list, usage, signed-in status).')
+        .option('--resources [sections]', 'In --json mode, include each version\'s resources: "all" (default) or a comma list (skills,plugins,mcp,commands,workflows,memory,hooks). Implies --json.')
+        .option('--detailed', 'Include all resources in --json output (alias for --resources all). Implies --json.')
         .option('--prune', 'Remove older installed versions that share an account with a newer installed version. Skips the global default.')
         .option('--dry-run', 'With --prune, show duplicate versions without deleting')
         .option('-y, --yes', 'Skip the prune confirmation prompt.')
@@ -1381,6 +1495,11 @@ Examples:
   # Machine-readable output (used by tools that pick a version programmatically)
   agents view claude --json
 
+  # 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 --json --resources skills,plugins   # just those sections
+
   # Prune older versions that duplicate an account already used by a newer version
   agents view --prune --dry-run
   agents view claude --prune