@phnx-labs/agents-cli 1.20.33 → 1.20.35

package/dist/commands/view.js

@@ -23,9 +23,26 @@ import { listProfiles, profileSummary } from '../lib/profiles.js';
 import { loadManifest, isStale } from '../lib/staleness/index.js';
 import { confirm } from '@inquirer/prompts';
 import { formatPath, isInteractiveTerminal, isPromptCancelled } from './utils.js';
+import { terminalWidth, truncateToWidth, stringWidth } from '../lib/session/width.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
@@ -51,6 +68,8 @@ function profileKindAndModel(model, planWidth) {
     return `${kind}  ${model}`;
 }
 function termLink(text, filePath) {
+    if (!process.stdout.isTTY)
+        return text;
     const url = `file://${filePath}`;
     return `\x1b]8;;${url}\x1b\\${text}\x1b]8;;\x1b\\`;
 }
@@ -135,13 +154,18 @@ function shouldRenderSection(key, filter) {
     return filter[key] === true;
 }
 /** Trim a description to a column-friendly snippet. Strips newlines, collapses whitespace. */
-function summarizeDescription(desc, maxLen = 80) {
+export function summarizeDescription(desc, maxLen = 80) {
     if (!desc)
         return '';
     const cleaned = desc.replace(/\s+/g, ' ').trim();
-    if (cleaned.length <= maxLen)
-        return cleaned;
-    return cleaned.slice(0, maxLen - 1).trimEnd() + '…';
+    return truncateToWidth(cleaned, maxLen);
+}
+export function descriptionForPrefix(desc, prefix) {
+    if (!desc)
+        return '';
+    const visiblePrefix = prefix.replace(/\x1b]8;;[^\x1b]*(?:\x1b\\|\x07)/g, '');
+    const budget = Math.max(1, terminalWidth() - stringWidth(visiblePrefix));
+    return summarizeDescription(desc, budget);
 }
 function getProfileSummaries(filterAgentId) {
     return listProfiles()
@@ -207,8 +231,10 @@ function renderHostClisSection(cwd) {
             const status = installed ? chalk.green('installed') : chalk.red('missing  ');
             const linkedName = termLink(manifest.name.padEnd(nameWidth), linkTarget(manifest.path));
             const tag = hostCliSourceTag(manifest.source);
-            const desc = manifest.description ? chalk.gray(`  ${summarizeDescription(manifest.description, 60)}`) : '';
-            console.log(`  ${status}  ${chalk.cyan(linkedName)} ${tag}${desc}`);
+            const prefix = `  ${status}  ${chalk.cyan(linkedName)} ${tag}`;
+            const descSnippet = descriptionForPrefix(manifest.description, `${prefix}  `);
+            const desc = descSnippet ? chalk.gray(`  ${descSnippet}`) : '';
+            console.log(prefix + desc);
         }
         if (anyMissing) {
             console.log(chalk.gray('  Install missing with `agents cli install`'));
@@ -310,7 +336,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 +382,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 +460,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 +544,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 +715,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 +730,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 })),
     };
@@ -796,9 +781,10 @@ async function showAgentResources(agentId, requestedVersion, filter) {
                     : chalk.gray('[system]');
             display += ` ${sourceTag}`;
             const syncStr = r.syncState ? chalk.gray(` [${r.syncState}]`) : '';
-            const descSnippet = summarizeDescription(r.description);
+            const prefix = `    ${display}${syncStr}`;
+            const descSnippet = descriptionForPrefix(r.description, `${prefix}  `);
             const descStr = descSnippet ? chalk.gray(`  ${descSnippet}`) : '';
-            console.log(`    ${display}${syncStr}${descStr}`);
+            console.log(prefix + descStr);
         }
     }
     // Render promptcuts (cross-agent, not per-version). Shortcuts are layered
@@ -827,13 +813,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 +956,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 +1117,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 +1130,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 +1141,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 +1155,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 +1368,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 +1403,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 +1452,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 +1477,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 +1506,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

package/dist/commands/wallet.d.ts

@@ -11,4 +11,10 @@
  *   agents-cli.secrets.wallet.<id>                JSON {pan, cvc, cardholder}
  */
 import type { Command } from 'commander';
+import { type CardMetadata } from '../lib/wallet/index.js';
+/** Width of the id column (incl. its 2-space gap): full UUID >=104, short id >=80, none below. */
+export declare function walletIdWidth(cols: number): number;
+/** Nickname column width. Shrinks so the whole row fits even at the 60-col floor. */
+export declare function walletNickWidth(cols: number): number;
+export declare function renderRow(c: CardMetadata, cols?: number): string;
 export declare function registerWalletCommands(program: Command): void;

package/dist/commands/wallet.js

@@ -11,6 +11,7 @@
  *   agents-cli.secrets.wallet.<id>                JSON {pan, cvc, cardholder}
  */
 import chalk from 'chalk';
+import { terminalWidth, truncateToWidth } from '../lib/session/width.js';
 import { addCard, detectBrand, isValidLuhn, listCards, removeCard, renameCard, showCard, } from '../lib/wallet/index.js';
 import { isInteractiveTerminal, isPromptCancelled } from './utils.js';
 import { setHelpSections } from '../lib/help.js';
@@ -29,12 +30,25 @@ function brandLabel(b) {
 function formatExp(month, year) {
     return `${month}/${year.slice(-2)}`;
 }
-function renderRow(c) {
-    const nick = c.nickname.padEnd(24);
+/** Width of the id column (incl. its 2-space gap): full UUID >=104, short id >=80, none below. */
+export function walletIdWidth(cols) {
+    return cols >= 104 ? 2 + 36 : cols >= 80 ? 2 + 8 : 0;
+}
+/** Nickname column width. Shrinks so the whole row fits even at the 60-col floor. */
+export function walletNickWidth(cols) {
+    const rest = 2 + 1 + 18 + 1 + 10 + 1 + 9 + walletIdWidth(cols); // everything but the nickname
+    return Math.max(8, Math.min(24, cols - rest));
+}
+export function renderRow(c, cols = terminalWidth()) {
+    const nickW = walletNickWidth(cols);
+    const nick = truncateToWidth(c.nickname, nickW).padEnd(nickW);
     const brand = brandLabel(c.brand).padEnd(18);
     const last4 = `•••• ${c.last4}`.padEnd(10);
     const exp = formatExp(c.exp_month, c.exp_year);
-    return `  ${chalk.cyan(nick)} ${brand} ${last4} ${chalk.gray('exp ' + exp)}  ${chalk.gray(c.id)}`;
+    // Full 36-char UUID pushed rows to ~106 chars; size the id to the terminal.
+    const id = cols >= 104 ? c.id : cols >= 80 ? c.id.slice(0, 8) : '';
+    const idCol = id ? `  ${chalk.gray(id)}` : '';
+    return `  ${chalk.cyan(nick)} ${brand} ${last4} ${chalk.gray('exp ' + exp)}${idCol}`;
 }
 async function promptString(message, validate) {
     const { input } = await import('@inquirer/prompts');
@@ -131,9 +145,12 @@ export function registerWalletCommands(program) {
                 console.log(chalk.gray('No cards in wallet. Try: agents wallet add'));
                 return;
             }
-            console.log(chalk.bold(`  ${'NICKNAME'.padEnd(24)} ${'BRAND'.padEnd(18)} ${'LAST4'.padEnd(10)} EXP        ID`));
+            const walletCols = terminalWidth();
+            const nickW = walletNickWidth(walletCols);
+            const idHeader = walletIdWidth(walletCols) ? '        ID' : '';
+            console.log(chalk.bold(`  ${'NICKNAME'.padEnd(nickW)} ${'BRAND'.padEnd(18)} ${'LAST4'.padEnd(10)} EXP${idHeader}`));
             for (const c of cards)
-                console.log(renderRow(c));
+                console.log(renderRow(c, walletCols));
         }
         catch (err) {
             console.error(chalk.red(err.message));