@pellux/goodvibes-agent 0.1.117 → 1.0.0

package/src/cli/management-commands.ts

@@ -3,6 +3,7 @@ import { dirname } from 'node:path';
 import { SecretsManager } from '../config/secrets.ts';
 import { BUILTIN_SECRET_PROVIDER_SOURCES, describeSecretRef, isSecretRefInput, resolveSecretRef } from '@pellux/goodvibes-sdk/platform/config';
 import { getSubscriptionProviderConfig, listAvailableSubscriptionProviders } from '@pellux/goodvibes-sdk/platform/config';
+import type { OAuthProviderConfig } from '@pellux/goodvibes-sdk/platform/config';
 import { beginOpenAICodexLogin, exchangeOpenAICodexCode } from '@pellux/goodvibes-sdk/platform/config';
 import { inspectProviderAuth } from '@/runtime/index.ts';
 import { buildCompanionConnectionInfo, encodeConnectionPayload, formatConnectionBlock } from '@pellux/goodvibes-sdk/platform/pairing';
@@ -12,6 +13,13 @@ import type { CliCommandRuntime } from './management.ts';
 import { extractAuthorizationCode, formatJsonOrText, hasCommandFlag, openBrowser, urlHostForBindHost, withRuntimeServices, yesNo } from './management.ts';
 import { GOODVIBES_AGENT_PAIRING_SURFACE } from '../config/surface.ts';
 import { connectedHostTokenRequiredMessage, readConnectedHostOperatorToken } from '../runtime/connected-host-auth.ts';
+import { formatAgentRecordSource } from '../agent/record-labels.ts';
+
+function resolveManualSubscriptionConfig(config: OAuthProviderConfig): OAuthProviderConfig {
+  return config.manualRedirectUri
+    ? { ...config, redirectUri: config.manualRedirectUri }
+    : config;
+}
 
 export async function renderSubscriptions(runtime: CliCommandRuntime): Promise<string> {
   return await withRuntimeServices(runtime, async (services) => {
@@ -23,7 +31,7 @@ export async function renderSubscriptions(runtime: CliCommandRuntime): Promise<s
     if (sub === 'providers') {
       return formatJsonOrText(runtime.cli)(available, [
         'GoodVibes subscription providers',
-        ...available.map((provider) => `  ${provider.provider} source=${provider.source} redirect=${provider.oauth.redirectUri}`),
+        ...available.map((provider) => `  ${provider.provider}  origin ${provider.source}  redirect ${provider.oauth.redirectUri}`),
       ].join('\n'));
     }
     if (sub === 'inspect' || sub === 'show') {
@@ -41,21 +49,21 @@ export async function renderSubscriptions(runtime: CliCommandRuntime): Promise<s
       const stored = services.subscriptionManager.get(provider);
       return formatJsonOrText(runtime.cli)({ provider, resolved, inspection, stored }, [
         `GoodVibes subscription ${provider}`,
-        `  configured: ${yesNo(inspection.configured)}`,
-        `  freshness: ${inspection.freshness}`,
-        `  callbackMode: ${inspection.callbackMode}`,
+        `  configured ${yesNo(inspection.configured)}`,
+        `  freshness ${inspection.freshness}`,
+        '  finish mode explicit manual',
         ...(resolved ? [
-          `  source: ${resolved.source}`,
-          `  redirectUri: ${resolved.oauth.redirectUri}`,
+          `  origin ${formatAgentRecordSource(resolved.source)}`,
+          `  redirect URI ${resolved.oauth.redirectUri}`,
         ] : []),
         ...(stored ? [
-          `  tokenType: ${stored.tokenType}`,
-          `  expiresAt: ${stored.expiresAt ? new Date(stored.expiresAt).toISOString() : 'n/a'}`,
-          `  refreshToken: ${stored.refreshToken ? 'present' : 'absent'}`,
-          `  overrideAmbient: ${yesNo(stored.overrideAmbientApiKeys)}`,
-        ] : ['  stored: no']),
-        ...inspection.issues.map((issue) => `  issue: ${issue}`),
-        ...inspection.nextActions.map((action) => `  next: ${action}`),
+          `  token type ${stored.tokenType}`,
+          `  expires ${stored.expiresAt ? new Date(stored.expiresAt).toISOString() : 'n/a'}`,
+          `  refresh token ${stored.refreshToken ? 'present' : 'absent'}`,
+          `  override ambient ${yesNo(stored.overrideAmbientApiKeys)}`,
+        ] : ['  stored no']),
+        ...inspection.issues.map((issue) => `  issue ${issue}`),
+        ...inspection.nextActions.map((action) => `  next ${action}`),
       ].join('\n'));
     }
     if (sub === 'login' || sub === 'start') {
@@ -63,7 +71,7 @@ export async function renderSubscriptions(runtime: CliCommandRuntime): Promise<s
       const mode = sub === 'start' ? 'start' : rest[1]?.toLowerCase();
       if (!provider || mode !== 'start') return `Usage: ${binary} subscription login <provider> start [--open]`;
       const resolved = getSubscriptionProviderConfig(provider, services.serviceRegistry.get(provider));
-      if (!resolved) return `No subscription provider found: ${provider}`;
+      if (!resolved) return `No subscription provider found ${provider}`;
       if (provider === 'openai' && resolved.source === 'builtin') {
         const started = await beginOpenAICodexLogin();
         services.subscriptionManager.savePending({
@@ -75,26 +83,29 @@ export async function renderSubscriptions(runtime: CliCommandRuntime): Promise<s
         });
         const openResult = runtime.cli.flags.open || hasCommandFlag(rest, '--open') ? openBrowser(started.authorizationUrl) : null;
         return [
-          `Subscription OAuth started: ${provider}`,
-          `  source: ${resolved.source}`,
-          `  state: ${started.state}`,
-          `  redirectUri: ${started.redirectUri}`,
-          ...(openResult ? [`  open: ${openResult}`] : []),
-          `  next: ${binary} subscription login ${provider} finish <code-or-url>`,
-          '  authorizationUrl:',
+          `Subscription OAuth started ${provider}`,
+          `  origin ${formatAgentRecordSource(resolved.source)}`,
+          `  state ${started.state}`,
+          `  redirect URI ${started.redirectUri}`,
+          ...(openResult ? [`  open ${openResult}`] : []),
+          '  completion paste the callback code or redirect URL into the finish command',
+          `  next ${binary} subscription login ${provider} finish <code-or-url>`,
+          '  authorization URL',
           `  ${started.authorizationUrl}`,
         ].join('\n');
       }
-      const started = await services.subscriptionManager.beginOAuthLogin(provider, resolved.oauth);
+      const activeConfig = resolveManualSubscriptionConfig(resolved.oauth);
+      const started = await services.subscriptionManager.beginOAuthLogin(provider, activeConfig);
       const openResult = runtime.cli.flags.open || hasCommandFlag(rest, '--open') ? openBrowser(started.authorizationUrl) : null;
       return [
-        `Subscription OAuth started: ${provider}`,
-        `  source: ${resolved.source}`,
-        `  state: ${started.pending.state}`,
-        `  redirectUri: ${started.pending.redirectUri}`,
-        ...(openResult ? [`  open: ${openResult}`] : []),
-        `  next: ${binary} subscription login ${provider} finish <code-or-url>`,
-        '  authorizationUrl:',
+        `Subscription OAuth started ${provider}`,
+        `  origin ${formatAgentRecordSource(resolved.source)}`,
+        `  state ${started.pending.state}`,
+        `  redirect URI ${started.pending.redirectUri}`,
+        ...(openResult ? [`  open ${openResult}`] : []),
+        '  completion paste the callback code or redirect URL into the finish command',
+        `  next ${binary} subscription login ${provider} finish <code-or-url>`,
+        '  authorization URL',
         `  ${started.authorizationUrl}`,
       ].join('\n');
     }
@@ -103,7 +114,7 @@ export async function renderSubscriptions(runtime: CliCommandRuntime): Promise<s
       const codeInput = sub === 'finish' ? rest[1] : rest[2];
       if (!provider || !codeInput) return `Usage: ${binary} subscription login <provider> finish <code-or-url>`;
       const resolved = getSubscriptionProviderConfig(provider, services.serviceRegistry.get(provider));
-      if (!resolved) return `No subscription provider found: ${provider}`;
+      if (!resolved) return `No subscription provider found ${provider}`;
       const code = extractAuthorizationCode(codeInput);
       if (provider === 'openai' && resolved.source === 'builtin') {
         const pendingLogin = services.subscriptionManager.getPending(provider);
@@ -122,24 +133,36 @@ export async function renderSubscriptions(runtime: CliCommandRuntime): Promise<s
           createdAt: services.subscriptionManager.get(provider)?.createdAt ?? now,
           updatedAt: now,
         });
-        return `Subscription stored: ${provider} token=${record.tokenType} expires=${record.expiresAt ? new Date(record.expiresAt).toISOString() : 'n/a'}`;
+        return [
+          `Subscription stored ${provider}`,
+          `  token type ${record.tokenType}`,
+          `  expires ${record.expiresAt ? new Date(record.expiresAt).toISOString() : 'n/a'}`,
+        ].join('\n');
       }
-      const record = await services.subscriptionManager.completeOAuthLogin(provider, resolved.oauth, code);
-      return `Subscription stored: ${provider} token=${record.tokenType} expires=${record.expiresAt ? new Date(record.expiresAt).toISOString() : 'n/a'}`;
+      const activeConfig = resolveManualSubscriptionConfig(resolved.oauth);
+      const record = await services.subscriptionManager.completeOAuthLogin(provider, activeConfig, code);
+      return [
+        `Subscription stored ${provider}`,
+        `  token type ${record.tokenType}`,
+        `  expires ${record.expiresAt ? new Date(record.expiresAt).toISOString() : 'n/a'}`,
+      ].join('\n');
     }
     if (sub === 'refresh') {
       const provider = rest[0];
       if (!provider) return `Usage: ${binary} subscription refresh <provider>`;
       const resolved = getSubscriptionProviderConfig(provider, services.serviceRegistry.get(provider));
-      if (!resolved) return `No subscription provider found: ${provider}`;
+      if (!resolved) return `No subscription provider found ${provider}`;
       const record = await services.subscriptionManager.refreshOAuthToken(provider, resolved.oauth);
-      return `Subscription refreshed: ${provider} expires=${record.expiresAt ? new Date(record.expiresAt).toISOString() : 'n/a'}`;
+      return [
+        `Subscription refreshed ${provider}`,
+        `  expires ${record.expiresAt ? new Date(record.expiresAt).toISOString() : 'n/a'}`,
+      ].join('\n');
     }
     if (sub === 'logout' || sub === 'remove') {
       const provider = rest[0];
       if (!provider) return `Usage: ${binary} subscription logout <provider>`;
       const removed = services.subscriptionManager.logout(provider);
-      return removed ? `Subscription removed: ${provider}` : `No stored subscription session existed for ${provider}.`;
+      return removed ? `Subscription removed ${provider}` : `No stored subscription session existed for ${provider}.`;
     }
     if (sub !== 'list' && sub !== 'status' && sub !== 'review') {
       return `Usage: ${binary} subscription [list|providers|inspect <provider>|login <provider> start|finish <code-or-url>|refresh <provider>|logout <provider>]`;
@@ -155,10 +178,10 @@ export async function renderSubscriptions(runtime: CliCommandRuntime): Promise<s
     };
     return formatJsonOrText(runtime.cli)(value, [
       'GoodVibes subscriptions',
-      subscriptions.length === 0 ? '  active: none' : '  active:',
-      ...subscriptions.map((sub) => `    ${sub.provider} token=${sub.tokenType} expires=${sub.expiresAt ? new Date(sub.expiresAt).toISOString() : 'n/a'} overrideAmbient=${yesNo(sub.overrideAmbientApiKeys)}`),
-      pending.length === 0 ? '  pending: none' : '  pending:',
-      ...pending.map((sub) => `    ${sub.provider} created=${new Date(sub.createdAt).toISOString()}`),
+      subscriptions.length === 0 ? '  active none' : '  active',
+      ...subscriptions.map((sub) => `    ${sub.provider} token ${sub.tokenType} expires ${sub.expiresAt ? new Date(sub.expiresAt).toISOString() : 'n/a'} override ambient ${yesNo(sub.overrideAmbientApiKeys)}`),
+      pending.length === 0 ? '  pending none' : '  pending',
+      ...pending.map((sub) => `    ${sub.provider} created ${new Date(sub.createdAt).toISOString()}`),
     ].join('\n'));
   });
 }
@@ -186,7 +209,11 @@ export async function handleSecrets(runtime: CliCommandRuntime): Promise<string>
     }
     const resolved = await resolveSecretRef(ref, { resolveLocalSecret: (key) => secrets.get(key) });
     const value = { ref: describeSecretRef(ref), resolved: Boolean(resolved.value) };
-    return formatJsonOrText(runtime.cli)(value, `[secrets] ${value.ref}: ${value.resolved ? 'resolved <redacted>' : 'missing'}`);
+    return formatJsonOrText(runtime.cli)(value, [
+      'GoodVibes secret test',
+      `  ref ${value.ref}`,
+      `  result ${value.resolved ? 'resolved <redacted>' : 'missing'}`,
+    ].join('\n'));
   }
   if (sub === 'set' || sub === 'link') {
     const flags = new Set(rest.filter((arg) => arg.startsWith('--')));
@@ -201,7 +228,10 @@ export async function handleSecrets(runtime: CliCommandRuntime): Promise<string>
       scope: flags.has('--user') ? 'user' : 'project',
       medium: flags.has('--plaintext') ? 'plaintext' : 'secure',
     });
-    return `[secrets] ${sub === 'link' ? 'Linked' : 'Stored'}: ${key}`;
+    return [
+      `Secret ${sub === 'link' ? 'linked' : 'stored'}`,
+      `  key ${key}`,
+    ].join('\n');
   }
   if (sub === 'delete') {
     const key = rest.find((arg) => !arg.startsWith('--'));
@@ -211,18 +241,21 @@ export async function handleSecrets(runtime: CliCommandRuntime): Promise<string>
       scope: flags.has('--user') ? 'user' : flags.has('--project') ? 'project' : undefined,
       medium: flags.has('--secure') ? 'secure' : flags.has('--plaintext') ? 'plaintext' : undefined,
     });
-    return `[secrets] Deleted: ${key}`;
+    return [
+      'Secret deleted',
+      `  key ${key}`,
+    ].join('\n');
   }
   const [records, review] = await Promise.all([secrets.listDetailed(), secrets.inspect()]);
   const stored = records.filter((record) => record.source !== 'env');
   const value = { policy: review.policy, records: stored, warnings: review.warnings };
   return formatJsonOrText(runtime.cli)(value, [
     'GoodVibes secrets',
-    `  policy: ${review.policy}`,
-    `  secure available: ${yesNo(review.secureAvailable)}`,
-    `  stored keys: ${stored.length}`,
+    `  policy ${review.policy}`,
+    `  secure available ${yesNo(review.secureAvailable)}`,
+    `  stored keys ${stored.length}`,
     ...stored.map((record) => `    ${record.key} (${record.source}${record.refSource ? `, ref:${record.refSource}` : ''}${record.overriddenByEnv ? ', env override' : ''})`),
-    ...review.warnings.map((warning) => `  warning: ${warning}`),
+    ...review.warnings.map((warning) => `  warning ${warning}`),
   ].join('\n'));
 }
 
@@ -235,21 +268,21 @@ export async function handleSessions(runtime: CliCommandRuntime): Promise<string
       const value = sessions;
       return formatJsonOrText(runtime.cli)(value, [
         `GoodVibes sessions (${sessions.length})`,
-        ...sessions.slice(0, 50).map((session) => `  ${session.name}  messages=${session.messageCount}  ${new Date(session.timestamp).toISOString()}  ${session.title || '(untitled)'}`),
+        ...sessions.slice(0, 50).map((session) => `  ${session.name}  messages ${session.messageCount}  ${new Date(session.timestamp).toISOString()}  ${session.title || '(untitled)'}`),
       ].join('\n'));
     }
     if (sub === 'show' || sub === 'info') {
       const target = rest.join(' ').trim();
       if (!target) return `Usage: ${binary} sessions show <id|name>`;
       const found = sessions.find((session) => session.name === target || session.name.startsWith(target) || session.title.toLowerCase() === target.toLowerCase());
-      if (!found) return `Session not found: ${target}`;
+      if (!found) return `Session not found ${target}`;
       return formatJsonOrText(runtime.cli)(found, [
         `Session ${found.name}`,
-        `  title: ${found.title || '(untitled)'}`,
-        `  messages: ${found.messageCount}`,
-        `  provider/model: ${found.provider}/${found.model}`,
-        `  updated: ${new Date(found.timestamp).toISOString()}`,
-        `  file: ${found.filePath}`,
+        `  title ${found.title || '(untitled)'}`,
+        `  messages ${found.messageCount}`,
+        `  provider/model ${found.provider}/${found.model}`,
+        `  updated ${new Date(found.timestamp).toISOString()}`,
+        `  file ${found.filePath}`,
       ].join('\n'));
     }
     if (sub === 'export') {
@@ -257,14 +290,17 @@ export async function handleSessions(runtime: CliCommandRuntime): Promise<string
       const outputPath = rest[1];
       if (!target) return `Usage: ${binary} sessions export <id|name> [path]`;
       const found = sessions.find((session) => session.name === target || session.name.startsWith(target) || session.title.toLowerCase() === target.toLowerCase());
-      if (!found) return `Session not found: ${target}`;
+      if (!found) return `Session not found ${target}`;
       const data = services.sessionManager.load(found.name);
       const text = JSON.stringify({ name: found.name, ...data }, null, 2) + '\n';
       if (outputPath) {
         const targetPath = services.shellPaths.resolveWorkspacePath(outputPath);
         mkdirSync(dirname(targetPath), { recursive: true });
         writeFileSync(targetPath, text, 'utf-8');
-        return `Session exported: ${targetPath}`;
+        return [
+          'Session exported',
+          `  path ${targetPath}`,
+        ].join('\n');
       }
       return text.trimEnd();
     }
@@ -281,9 +317,9 @@ export async function handleTasks(runtime: CliCommandRuntime): Promise<string> {
   if (sub === 'submit') {
     return [
       'GoodVibes Agent blocks CLI task submission from the host-owned task workflow.',
-      '  policy: do normal assistant work in the main Agent conversation or use `goodvibes-agent run <prompt>` for an explicit one-shot run.',
-      '  build/fix/review: use `goodvibes-agent delegate <task>` for explicit GoodVibes TUI handoff.',
-      '  result: no local task was started.',
+      '  policy do normal assistant work in the main Agent conversation or use `goodvibes-agent run <prompt>` for an explicit one-shot run.',
+      '  build/fix/review use `goodvibes-agent delegate <task>` for explicit GoodVibes TUI handoff.',
+      '  result no local task was started.',
     ].join('\n');
   }
   return await withRuntimeServices(runtime, (services) => {
@@ -296,7 +332,7 @@ export async function handleTasks(runtime: CliCommandRuntime): Promise<string> {
     if (sub === 'show') {
       if (!rest[0]) return `Usage: ${runtime.cli.binary} tasks show <taskId>`;
       const task = tasks.find((candidate) => candidate.id === rest[0]);
-      return task ? JSON.stringify(task, null, 2) : `Unknown task: ${rest[0] ?? ''}`;
+      return task ? JSON.stringify(task, null, 2) : `Unknown task ${rest[0] ?? ''}`;
     }
     return `Usage: ${runtime.cli.binary} tasks list|show <taskId>`;
   });
@@ -306,9 +342,9 @@ export async function renderPairing(runtime: CliCommandRuntime): Promise<string>
   const tokenRecord = readConnectedHostOperatorToken(runtime.homeDirectory);
   if (!tokenRecord.token) return connectedHostTokenRequiredMessage(tokenRecord.path);
   const binding = resolveRuntimeEndpointBinding(runtime.configManager, 'controlPlane');
-  const daemonUrl = `http://${urlHostForBindHost(binding.host)}:${binding.port}`;
+  const connectedHostUrl = `http://${urlHostForBindHost(binding.host)}:${binding.port}`;
   const info = buildCompanionConnectionInfo({
-    daemonUrl,
+    daemonUrl: connectedHostUrl,
     token: tokenRecord.token,
     username: 'admin',
     surface: GOODVIBES_AGENT_PAIRING_SURFACE,

package/src/cli/management.ts

@@ -13,6 +13,9 @@ import type { RuntimeServices } from '../runtime/services.ts';
 import { SecretsManager } from '../config/secrets.ts';
 import { RuntimeEventBus, type TurnEvent } from '@/runtime/index.ts';
 import { createShellPathService } from '@/runtime/index.ts';
+import { buildPersistedSessionContext } from '@/runtime/index.ts';
+import type { SessionSnapshot } from '@/runtime/index.ts';
+import { conversationMessagesAsSessionRecords } from '../core/conversation-message-snapshot.ts';
 import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 import { listProviderRuntimeSnapshots } from '@pellux/goodvibes-sdk/platform/providers';
 import { BUILTIN_SECRET_PROVIDER_SOURCES, describeSecretRef, isSecretRefInput, resolveSecretRef } from '@pellux/goodvibes-sdk/platform/config';
@@ -56,8 +59,8 @@ export function formatJsonOrText(cli: GoodVibesCliParseResult): Formatter {
 }
 
 function exitCodeForText(output: string): number {
-  if (output.startsWith('Usage:') || output.startsWith('Invalid ') || output.startsWith('Unsupported:')) return 2;
-  if (output.startsWith('Session not found:') || output.startsWith('Unknown task:') || output.startsWith('Task submit failed ')) return 1;
+  if (output.startsWith('Usage:') || output.startsWith('Invalid ') || output.startsWith('Unsupported')) return 2;
+  if (output.startsWith('Session not found') || output.startsWith('Unknown task') || output.startsWith('Task submit failed ')) return 1;
   if (output.startsWith('No stored ') || output.startsWith('No pending ') || output.startsWith('No model ') || output.startsWith('No provider ') || output.startsWith('No auth ')) return 1;
   if (output.startsWith('Unknown ')) return 1;
   if (output === 'Bundle has no config object to import.') return 1;
@@ -98,7 +101,7 @@ export function getNestedValue(source: unknown, key: string): unknown {
   let cursor = source;
   for (const part of key.split('.')) {
     if (cursor == null || typeof cursor !== 'object') return undefined;
-    cursor = (cursor as Record<string, unknown>)[part];
+    cursor = Reflect.get(cursor, part);
   }
   return cursor;
 }
@@ -278,7 +281,13 @@ export async function runNonInteractiveAgent(runtime: CliCommandRuntime): Promis
       }) + '\n');
     }
   } finally {
-    const snapshot = ctx.conversation.toJSON() as Parameters<typeof ctx.shutdown>[0];
+    const messages = ctx.conversation.getMessageSnapshot();
+    const snapshot: SessionSnapshot = {
+      messages: conversationMessagesAsSessionRecords(messages),
+      timestamp: Date.now(),
+      title: ctx.conversation.title,
+      ...buildPersistedSessionContext(messages, ctx.conversation.getTitleSource()),
+    };
     await ctx.shutdown(snapshot);
   }
   return exitCode;
@@ -326,18 +335,25 @@ async function renderProviders(runtime: CliCommandRuntime): Promise<string> {
         } else {
           runtime.configManager.setDynamic('provider.model', formatProviderModel(provider, getModelIdFromProviderModel(runtime.configManager.get('provider.model'))));
         }
-        return requestedModel
-          ? `Provider selected: ${provider} (${requestedModel})\n  warning: model catalog entry was not available locally; saved explicit selection.`
-          : `Provider selected: ${provider}\n  warning: model catalog entry was not available locally; model selection was left unchanged.`;
+        return [
+          'Provider selected',
+          `  provider ${provider}`,
+          ...(requestedModel ? [`  model ${requestedModel}`] : []),
+          `  warning model catalog entry was not available locally; ${requestedModel ? 'saved explicit selection' : 'model selection was left unchanged'}.`,
+        ].join('\n');
       }
       runtime.configManager.setDynamic('provider.model', selected.registryKey);
-      return `Provider selected: ${selected.provider} (${selected.registryKey})`;
+      return [
+        'Provider selected',
+        `  provider ${selected.provider}`,
+        `  model ${selected.registryKey}`,
+      ].join('\n');
     }
     if (sub === 'inspect' || sub === 'show') {
       const provider = rest[0];
       if (!provider) return `Usage: ${binary} providers inspect <provider>`;
       const snapshot = snapshots.find((candidate) => candidate.providerId === provider);
-      if (!snapshot) return `No provider found: ${provider}`;
+      if (!snapshot) return `No provider found ${provider}`;
       const setup = classifyProviderSetup({
         providerId: snapshot.providerId,
         authMode: snapshot.runtime.auth?.mode,
@@ -383,7 +399,7 @@ async function renderProviders(runtime: CliCommandRuntime): Promise<string> {
     return formatJsonOrText(runtime.cli)(value, [
       'GoodVibes providers',
       ...value.map((provider) =>
-        `  ${provider.current ? '*' : ' '} ${provider.provider.padEnd(18)} setup=${provider.setupClass} configured=${yesNo(provider.configured)} via=${provider.configuredVia ?? 'n/a'} models=${provider.models} routes=${provider.authRouteSummary} ${provider.detail ?? ''}`.trimEnd(),
+        `  ${provider.current ? '*' : ' '} ${provider.provider.padEnd(18)} setup ${provider.setupClass} configured ${yesNo(provider.configured)} via ${provider.configuredVia ?? 'n/a'} models ${provider.models} routes ${provider.authRouteSummary} ${provider.detail ?? ''}`.trimEnd(),
       ),
     ].join('\n'));
   });
@@ -436,18 +452,28 @@ async function renderModels(runtime: CliCommandRuntime): Promise<string> {
         const provider = inferProviderFromRegistryKey(modelKey);
         runtime.configManager.setDynamic('provider.model', formatProviderModel(provider, modelKey));
         await services.favoritesStore.recordUsage(modelKey);
-        return `Model selected: ${modelKey}\n  warning: model catalog entry was not available locally; saved explicit selection.`;
+        return [
+          'Model selected',
+          `  model ${modelKey}`,
+          '  warning model catalog entry was not available locally; saved explicit selection.',
+        ].join('\n');
       }
       runtime.configManager.setDynamic('provider.model', model.registryKey);
       await services.favoritesStore.recordUsage(model.registryKey);
-      return `Model selected: ${model.registryKey}`;
+      return [
+        'Model selected',
+        `  model ${model.registryKey}`,
+      ].join('\n');
     }
     if (subOrFilter === 'pin' || subOrFilter === 'unpin') {
       const modelKey = rest[0];
       if (!modelKey) return `Usage: ${binary} models ${subOrFilter} <registryKey>`;
       if (subOrFilter === 'pin') await services.favoritesStore.pinModel(modelKey);
       else await services.favoritesStore.unpinModel(modelKey);
-      return `Model ${subOrFilter === 'pin' ? 'pinned' : 'unpinned'}: ${modelKey}`;
+      return [
+        `Model ${subOrFilter === 'pin' ? 'pinned' : 'unpinned'}`,
+        `  model ${modelKey}`,
+      ].join('\n');
     }
     if (subOrFilter === 'pinned') {
       const pinned = await services.favoritesStore.getPinned();
@@ -479,7 +505,7 @@ async function renderModels(runtime: CliCommandRuntime): Promise<string> {
     }));
     return formatJsonOrText(runtime.cli)(value, [
       `GoodVibes models${filter ? ` (${filter})` : ''}`,
-      ...value.map((model) => `  ${model.current ? '*' : ' '} ${model.registryKey.padEnd(42)} setup=${model.setupClass} ctx=${model.contextWindow.toLocaleString()} ${model.displayName}`),
+      ...value.map((model) => `  ${model.current ? '*' : ' '} ${model.registryKey.padEnd(42)} setup ${model.setupClass} context ${model.contextWindow.toLocaleString()} ${model.displayName}`),
     ].join('\n'));
   });
 }
@@ -521,23 +547,23 @@ async function renderAuth(runtime: CliCommandRuntime): Promise<string> {
   if (sub === 'users' || sub === 'sessions') {
     return formatJsonOrText(runtime.cli)(value, [
       `GoodVibes Agent auth ${sub}`,
-      '  owner: connected GoodVibes host',
-      `  operator token: ${paths.operatorTokenPresent ? 'present' : 'missing'}`,
-      `  operator token path: ${paths.operatorTokenPath}`,
-      `  ${sub}: managed outside Agent`,
+      '  owner connected GoodVibes host',
+      `  operator token ${paths.operatorTokenPresent ? 'present' : 'missing'}`,
+      `  operator token path ${paths.operatorTokenPath}`,
+      `  ${sub} managed outside Agent`,
       '  Agent does not enumerate or mutate connected-host users/sessions from the local CLI.',
     ].join('\n'));
   }
   return formatJsonOrText(runtime.cli)(value, [
     'GoodVibes Agent auth',
-    '  owner: connected GoodVibes host',
-    `  permission mode: ${String(value.permissionMode)}`,
-    `  operator token: ${paths.operatorTokenPresent ? 'present' : 'missing'} (${paths.operatorTokenPath})`,
-    `  compatibility user store: ${paths.userStorePresent ? 'present' : 'missing'} (${paths.userStorePath})`,
-    `  compatibility bootstrap credential: ${paths.bootstrapCredentialPresent ? 'present' : 'missing'} (${paths.bootstrapCredentialPath})`,
-    '  connected-host user/session administration: outside Agent',
-    '  next: goodvibes-agent providers',
-    '  next: goodvibes-agent subscription providers',
+    '  owner connected GoodVibes host',
+    `  permission mode ${String(value.permissionMode)}`,
+    `  operator token ${paths.operatorTokenPresent ? 'present' : 'missing'} (${paths.operatorTokenPath})`,
+    `  compatibility user store ${paths.userStorePresent ? 'present' : 'missing'} (${paths.userStorePath})`,
+    `  compatibility bootstrap credential ${paths.bootstrapCredentialPresent ? 'present' : 'missing'} (${paths.bootstrapCredentialPath})`,
+    '  connected-host user/session administration outside Agent',
+    '  next goodvibes-agent providers',
+    '  next goodvibes-agent subscription providers',
   ].join('\n'));
 }