@phnx-labs/agents-cli 1.19.2 → 1.20.3

package/dist/commands/versions.js

@@ -7,7 +7,7 @@ import { AGENTS, ALL_AGENT_IDS, getAccountEmail, getAccountInfo, agentLabel, } f
 import { formatUsageSummary, getUsageInfoForIdentity, getUsageInfoByIdentity, getUsageLookupKey, } from '../lib/usage.js';
 import { viewAction } from './view.js';
 import { readManifest, writeManifest, createDefaultManifest } from '../lib/manifest.js';
-import { installVersion, removeVersion, listInstalledVersions, isVersionInstalled, isLatestInstalled, getGlobalDefault, setGlobalDefault, getVersionHomePath, getVersionDir, syncResourcesToVersion, parseAgentSpec, promptResourceSelection, promptNewResourceSelection, getAvailableResources, getActuallySyncedResources, getNewResources, hasNewResources, } from '../lib/versions.js';
+import { installVersion, removeVersion, listInstalledVersions, isVersionInstalled, isLatestInstalled, getGlobalDefault, setGlobalDefault, getVersionHomePath, getVersionDir, syncResourcesToVersion, parseAgentSpec, promptResourceSelection, promptNewResourceSelection, getAvailableResources, getActuallySyncedResources, getNewResources, getProjectOnlyResources, hasNewResources, printTrashFooter, } from '../lib/versions.js';
 import { createShim, createVersionedAlias, removeShim, shimExists, getShimsDir, getShimPath, getPathShadowingExecutable, isShimsInPath, getPathSetupInstructions, addShimsToPath, switchConfigSymlink, switchHomeFileSymlinks, } from '../lib/shims.js';
 import { isInteractiveTerminal, isPromptCancelled, requireInteractiveSelection } from './utils.js';
 import { tryAutoPull } from '../lib/git.js';
@@ -93,7 +93,130 @@ function warnIfShimShadowed(agent) {
     console.log(chalk.gray(`  Managed shim: ${getShimPath(agent)}`));
     console.log(chalk.gray(`  ${getPathSetupInstructions().split('\n').join('\n  ')}`));
 }
-/** Register `agents add`, `agents remove`, `agents use`, and `agents list` (deprecated). */
+async function versionPruneAction(specs, options, commandName) {
+    const isProject = options.project;
+    const moved = [];
+    for (const spec of specs) {
+        const parsed = parseAgentSpec(spec);
+        if (!parsed) {
+            console.log(chalk.red(`Invalid agent: ${spec}`));
+            console.log(chalk.gray(`Format: <agent>[@version]. Available: ${ALL_AGENT_IDS.join(', ')}`));
+            continue;
+        }
+        const { agent, version } = parsed;
+        const agentConfig = AGENTS[agent];
+        if (version === 'latest' || !spec.includes('@')) {
+            const versions = listInstalledVersions(agent);
+            if (versions.length === 0) {
+                console.log(chalk.gray(`No versions of ${agentLabel(agentConfig.id)} installed`));
+                continue;
+            }
+            if (!isInteractiveTerminal()) {
+                requireInteractiveSelection(`Selecting ${agentLabel(agentConfig.id)} versions to ${commandName}`, [
+                    `agents ${commandName} ${agent}@${versions[0]}`,
+                ]);
+            }
+            const globalDefault = getGlobalDefault(agent);
+            const sortedVersions = [...versions].sort((a, b) => {
+                if (a === globalDefault)
+                    return -1;
+                if (b === globalDefault)
+                    return 1;
+                return 0;
+            });
+            try {
+                const toRemove = await checkbox({
+                    message: `Select ${agentLabel(agentConfig.id)} versions to ${commandName}:`,
+                    choices: sortedVersions.map((v) => ({
+                        name: v === globalDefault ? `${v} ${chalk.green('(default)')}` : v,
+                        value: v,
+                        checked: false,
+                    })),
+                });
+                if (toRemove.length === 0) {
+                    console.log(chalk.gray('No versions selected'));
+                    continue;
+                }
+                for (const v of toRemove) {
+                    const versionDir = getVersionDir(agent, v);
+                    removeVersion(agent, v);
+                    fixSessionFilePaths(agent, v, versionDir);
+                    console.log(chalk.green(`Moved ${agentLabel(agentConfig.id)}@${v} to trash`));
+                    moved.push({ agent, version: v });
+                }
+                if (globalDefault && toRemove.includes(globalDefault)) {
+                    setGlobalDefault(agent, undefined);
+                    console.log(chalk.yellow(`Default version removed. Run: agents use ${agent}@<version> to set a new default`));
+                }
+                const remaining = listInstalledVersions(agent);
+                if (remaining.length === 0) {
+                    removeShim(agent);
+                }
+            }
+            catch (err) {
+                if (isPromptCancelled(err)) {
+                    console.log(chalk.gray('Cancelled'));
+                    continue;
+                }
+                throw err;
+            }
+        }
+        else if (!isVersionInstalled(agent, version)) {
+            console.log(chalk.gray(`${agentLabel(agentConfig.id)}@${version} not installed`));
+        }
+        else {
+            const versionDir = getVersionDir(agent, version);
+            removeVersion(agent, version);
+            fixSessionFilePaths(agent, version, versionDir);
+            console.log(chalk.green(`Moved ${agentLabel(agentConfig.id)}@${version} to trash`));
+            moved.push({ agent, version });
+            const remaining = listInstalledVersions(agent);
+            if (remaining.length === 0) {
+                removeShim(agent);
+            }
+        }
+        if (isProject) {
+            const projectManifestPath = path.join(process.cwd(), '.agents', 'agents.yaml');
+            if (fs.existsSync(projectManifestPath)) {
+                const manifest = readManifest(process.cwd());
+                if (manifest?.agents?.[agent]) {
+                    delete manifest.agents[agent];
+                    writeManifest(process.cwd(), manifest);
+                    console.log(chalk.gray(`  Removed from .agents/agents.yaml`));
+                }
+            }
+        }
+    }
+    printTrashFooter(moved);
+}
+function configureVersionPruneCommand(cmd, commandName) {
+    const isAlias = commandName === 'remove';
+    cmd
+        .description(isAlias
+        ? 'Alias for agents prune. Uninstalls agent CLI versions.'
+        : 'Uninstall agent CLI versions. Moves version data to trash for recovery.')
+        .option('-p, --project', 'Also clear the pinned version from .agents/agents.yaml in the current project');
+    setHelpSections(cmd, {
+        examples: `
+      # Prune a specific version
+      agents ${commandName} claude@2.0.50
+
+      # Pick interactively if you omit the version
+      agents ${commandName} claude
+
+      # Prune and also clear the project pin
+      agents ${commandName} claude@2.0.50 --project
+    `,
+        notes: `
+      - Pruned version directories move to trash with their home/ data intact.
+      - Session file paths are rewritten so session history remains readable.
+      - Removing the default version unsets the default; run 'agents use' to pick a new one.
+      - Reinstall any time with 'agents add'.
+    `,
+    });
+    cmd.action((specs, options) => versionPruneAction(specs, options, commandName));
+}
+/** Register `agents add`, `agents prune`, `agents remove`, `agents use`, and `agents list` (deprecated). */
 export function registerVersionsCommands(program) {
     const addCmd = program
         .command('add <specs...>')
@@ -132,7 +255,7 @@ export function registerVersionsCommands(program) {
             }
             const { agent, version } = parsed;
             const agentConfig = AGENTS[agent];
-            if (!agentConfig.npmPackage) {
+            if (!agentConfig.npmPackage && !agentConfig.installScript) {
                 console.log(chalk.yellow(`${agentLabel(agentConfig.id)} has no npm package. Install manually.`));
                 continue;
             }
@@ -170,7 +293,7 @@ export function registerVersionsCommands(program) {
                     // Smart resource detection: compare available vs ACTUALLY synced (source of truth: files)
                     const available = getAvailableResources();
                     const actuallySynced = getActuallySyncedResources(agent, installedVersion);
-                    const newResources = getNewResources(available, actuallySynced);
+                    const newResources = getNewResources(available, actuallySynced, getProjectOnlyResources());
                     const hasAnySynced = actuallySynced.commands.length > 0 ||
                         actuallySynced.skills.length > 0 ||
                         actuallySynced.hooks.length > 0 ||
@@ -195,9 +318,9 @@ export function registerVersionsCommands(program) {
                                 selection = userSelection;
                             }
                         }
-                        else if (hasNewResources(newResources, agent)) {
+                        else if (hasNewResources(newResources, agent, installedVersion)) {
                             // Some synced, but NEW resources available - prompt for new only
-                            const userSelection = await promptNewResourceSelection(agent, newResources);
+                            const userSelection = await promptNewResourceSelection(agent, newResources, installedVersion);
                             if (userSelection) {
                                 selection = userSelection;
                             }
@@ -311,127 +434,8 @@ export function registerVersionsCommands(program) {
             }
         }
     });
-    const removeCmd = program
-        .command('remove <specs...>')
-        .description('Uninstall agent CLI versions. Frees disk space and removes the version\'s auth token.')
-        .option('-p, --project', 'Also clear the pinned version from .agents/agents.yaml in the current project');
-    setHelpSections(removeCmd, {
-        examples: `
-      # Remove a specific version
-      agents remove claude@2.0.50
-
-      # Pick interactively if you omit the version
-      agents remove claude
-
-      # Remove and also clear the project pin
-      agents remove claude@2.0.50 --project
-    `,
-        notes: `
-      - Removing the default version unsets the default; run 'agents use' to pick a new one.
-      - Reinstall any time with 'agents add'.
-    `,
-    });
-    removeCmd.action(async (specs, options) => {
-        const isProject = options.project;
-        for (const spec of specs) {
-            const parsed = parseAgentSpec(spec);
-            if (!parsed) {
-                console.log(chalk.red(`Invalid agent: ${spec}`));
-                console.log(chalk.gray(`Format: <agent>[@version]. Available: ${ALL_AGENT_IDS.join(', ')}`));
-                continue;
-            }
-            const { agent, version } = parsed;
-            const agentConfig = AGENTS[agent];
-            if (version === 'latest' || !spec.includes('@')) {
-                // Show picker for which versions to remove
-                const versions = listInstalledVersions(agent);
-                if (versions.length === 0) {
-                    console.log(chalk.gray(`No versions of ${agentLabel(agentConfig.id)} installed`));
-                    continue;
-                }
-                if (!isInteractiveTerminal()) {
-                    requireInteractiveSelection(`Selecting ${agentLabel(agentConfig.id)} versions to remove`, [
-                        `agents remove ${agent}@${versions[0]}`,
-                    ]);
-                }
-                const globalDefault = getGlobalDefault(agent);
-                // Sort versions with default first
-                const sortedVersions = [...versions].sort((a, b) => {
-                    if (a === globalDefault)
-                        return -1;
-                    if (b === globalDefault)
-                        return 1;
-                    return 0;
-                });
-                try {
-                    const toRemove = await checkbox({
-                        message: `Select ${agentLabel(agentConfig.id)} versions to remove:`,
-                        choices: sortedVersions.map((v) => ({
-                            name: v === globalDefault ? `${v} ${chalk.green('(default)')}` : v,
-                            value: v,
-                            checked: false, // All unchecked by default
-                        })),
-                    });
-                    if (toRemove.length === 0) {
-                        console.log(chalk.gray('No versions selected'));
-                        continue;
-                    }
-                    for (const v of toRemove) {
-                        const versionDir = getVersionDir(agent, v);
-                        removeVersion(agent, v);
-                        fixSessionFilePaths(agent, v, versionDir);
-                        console.log(chalk.green(`Removed ${agentLabel(agentConfig.id)}@${v}`));
-                    }
-                    // Check if default was removed
-                    if (globalDefault && toRemove.includes(globalDefault)) {
-                        setGlobalDefault(agent, undefined);
-                        console.log(chalk.yellow(`Default version removed. Run: agents use ${agent}@<version> to set a new default`));
-                    }
-                    // Remove shim if no versions left
-                    const remaining = listInstalledVersions(agent);
-                    if (remaining.length === 0) {
-                        removeShim(agent);
-                    }
-                }
-                catch (err) {
-                    if (isPromptCancelled(err)) {
-                        console.log(chalk.gray('Cancelled'));
-                        continue;
-                    }
-                    throw err;
-                }
-            }
-            else {
-                // Remove specific version
-                if (!isVersionInstalled(agent, version)) {
-                    console.log(chalk.gray(`${agentLabel(agentConfig.id)}@${version} not installed`));
-                }
-                else {
-                    const versionDir = getVersionDir(agent, version);
-                    removeVersion(agent, version);
-                    fixSessionFilePaths(agent, version, versionDir);
-                    console.log(chalk.green(`Removed ${agentLabel(agentConfig.id)}@${version}`));
-                    // Remove shim if no versions left
-                    const remaining = listInstalledVersions(agent);
-                    if (remaining.length === 0) {
-                        removeShim(agent);
-                    }
-                }
-            }
-            // Update project manifest if -p flag
-            if (isProject) {
-                const projectManifestPath = path.join(process.cwd(), '.agents', 'agents.yaml');
-                if (fs.existsSync(projectManifestPath)) {
-                    const manifest = readManifest(process.cwd());
-                    if (manifest?.agents?.[agent]) {
-                        delete manifest.agents[agent];
-                        writeManifest(process.cwd(), manifest);
-                        console.log(chalk.gray(`  Removed from .agents/agents.yaml`));
-                    }
-                }
-            }
-        }
-    });
+    configureVersionPruneCommand(program.command('prune <specs...>'), 'prune');
+    configureVersionPruneCommand(program.command('remove <specs...>', { hidden: true }), 'remove');
     const useCmd = program
         .command('use <agent> [version]')
         .description('Switch the active version for an agent. This is the only command that sets the default.')
@@ -573,7 +577,7 @@ export function registerVersionsCommands(program) {
                 // Smart resource detection: compare available vs ACTUALLY synced (source of truth: files, not tracking)
                 const available = getAvailableResources();
                 const actuallySynced = getActuallySyncedResources(agentId, finalVersion);
-                const newResources = getNewResources(available, actuallySynced);
+                const newResources = getNewResources(available, actuallySynced, getProjectOnlyResources());
                 // Check if anything is actually synced (source of truth: actual files)
                 const hasAnySynced = actuallySynced.commands.length > 0 ||
                     actuallySynced.skills.length > 0 ||
@@ -638,9 +642,9 @@ export function registerVersionsCommands(program) {
                             }
                         }
                     }
-                    else if (hasNewResources(newResources, agentId)) {
+                    else if (hasNewResources(newResources, agentId, finalVersion)) {
                         // Has synced before, but NEW items available
-                        const userSelection = await promptNewResourceSelection(agentId, newResources);
+                        const userSelection = await promptNewResourceSelection(agentId, newResources, finalVersion);
                         if (userSelection && Object.keys(userSelection).length > 0) {
                             const syncResult = syncResourcesToVersion(agentId, finalVersion, userSelection);
                             const syncedTypes = [];

package/dist/commands/view.d.ts

@@ -8,6 +8,7 @@
  */
 import type { Command } from 'commander';
 import type { AgentId } from '../lib/types.js';
+import { type ProfileSummary } from '../lib/profiles.js';
 /** Machine-readable entry for a single installed version. */
 export interface ViewJsonVersion {
     version: string;
@@ -16,6 +17,10 @@ export interface ViewJsonVersion {
     email: 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';
         usedPercent: number;
@@ -28,6 +33,7 @@ export interface ViewJsonVersion {
 export interface ViewJsonAgent {
     agent: AgentId;
     versions: ViewJsonVersion[];
+    profiles: ProfileSummary[];
 }
 /**
  * Prune older installed versions that share an email with a newer installed