@pellux/goodvibes-agent 0.1.117 → 1.0.0

package/src/cli/memory-command.ts

@@ -17,6 +17,7 @@ import {
   type ProvenanceLinkKind,
 } from '@pellux/goodvibes-sdk/platform/state';
 import { assertNoSecretLikeMemoryText } from '../agent/memory-safety.ts';
+import { formatAgentRecordReference, formatAgentRecordReviewState } from '../agent/record-labels.ts';
 import { GOODVIBES_AGENT_SURFACE_ROOT } from '../config/surface.ts';
 import type { CliCommandOutput } from './types.ts';
 import type { CliCommandRuntime } from './management.ts';
@@ -172,12 +173,12 @@ function isProvenanceKind(value: string): value is ProvenanceLinkKind {
 }
 
 function requireClass(value: string | undefined): MemoryClass {
-  if (!value || !isMemoryClass(value)) throw new Error(`Invalid memory class "${value ?? ''}". Valid: ${VALID_CLASSES.join(', ')}`);
+  if (!value || !isMemoryClass(value)) throw new Error(`Invalid memory class "${value ?? ''}". Valid values ${VALID_CLASSES.join(', ')}`);
   return value;
 }
 
 function requireScope(value: string | undefined): MemoryScope {
-  if (!value || !isMemoryScope(value)) throw new Error(`Invalid memory scope "${value ?? ''}". Valid: ${VALID_SCOPES.join(', ')}`);
+  if (!value || !isMemoryScope(value)) throw new Error(`Invalid memory scope "${value ?? ''}". Valid values ${VALID_SCOPES.join(', ')}`);
   return value;
 }
 
@@ -217,23 +218,23 @@ async function withMemory<T>(runtime: CliCommandRuntime, fn: (context: MemoryCon
 }
 
 function renderRecordLine(record: MemoryRecord, semanticEntry?: MemorySemanticSearchResult): string {
-  const tags = record.tags.length > 0 ? ` tags=${record.tags.join(',')}` : '';
-  const score = semanticEntry ? ` sim=${Math.round(semanticEntry.similarity * 100)}%` : '';
-  return `  ${record.id}  ${record.scope}/${record.cls}  ${record.reviewState}  ${record.confidence}%${score}${tags}  ${record.summary}`;
+  const tags = record.tags.length > 0 ? `  tags ${record.tags.join(', ')}` : '';
+  const score = semanticEntry ? `  similarity ${Math.round(semanticEntry.similarity * 100)}%` : '';
+  return `  ${record.id}  ${record.scope}/${record.cls}  ${formatAgentRecordReviewState(record.reviewState)}  ${record.confidence}%${score}${tags}  ${record.summary}`;
 }
 
 function renderRecordList(title: string, path: string, records: readonly MemoryRecord[], semanticResults: readonly MemorySemanticSearchResult[] = []): string {
   if (records.length === 0) {
     return [
       title,
-      `  store: ${path}`,
+      `  store ${path}`,
       '  No Agent memory records found.',
       '  Add one with: goodvibes-agent memory add fact "Useful durable fact" --scope project',
     ].join('\n');
   }
   return [
     `${title} (${records.length})`,
-    `  store: ${path}`,
+    `  store ${path}`,
     ...records.map((record) => renderRecordLine(record, semanticResults.find((entry) => entry.record.id === record.id))),
   ].join('\n');
 }
@@ -243,7 +244,7 @@ function renderRecord(record: MemoryRecord, links: readonly MemoryLink[]): strin
     `Memory ${record.id}`,
     `  scope: ${record.scope}`,
     `  class: ${record.cls}`,
-    `  review: ${record.reviewState}`,
+    `  review: ${formatAgentRecordReviewState(record.reviewState)}`,
     `  confidence: ${record.confidence}`,
     `  tags: ${record.tags.join(', ') || '(none)'}`,
     `  created: ${timestamp(record.createdAt)}`,
@@ -253,9 +254,9 @@ function renderRecord(record: MemoryRecord, links: readonly MemoryLink[]): strin
     '',
     record.summary,
     record.detail ? `\n${record.detail}` : '',
-    record.provenance.length > 0 ? '\nProvenance:' : '',
-    ...record.provenance.map((entry) => `  ${entry.kind}:${entry.ref}${entry.label ? ` (${entry.label})` : ''}`),
-    links.length > 0 ? '\nLinks:' : '',
+    record.provenance.length > 0 ? '\nProvenance' : '',
+    ...record.provenance.map((entry) => `  ${formatAgentRecordReference(entry)}`),
+    links.length > 0 ? '\nLinks' : '',
     ...links.map((link) => `  ${link.fromId} -> ${link.toId} [${link.relation}]`),
   ].filter((line): line is string => Boolean(line)).join('\n');
 }
@@ -283,7 +284,7 @@ function provenanceFromOptions(options: ParsedOptions): readonly ProvenanceLink[
   addProvenance(provenance, 'turn', optionValue(options, 'turn'));
   addProvenance(provenance, 'task', optionValue(options, 'task'));
   addProvenance(provenance, 'file', optionValue(options, 'file'));
-  if (provenance.length === 0) provenance.push({ kind: 'event', ref: 'cli' });
+  if (provenance.length === 0) provenance.push({ kind: 'event', ref: 'Command' });
   return provenance;
 }
 
@@ -306,7 +307,7 @@ function usage(): string {
     '  handoff-inspect <path>',
     '  vector [status|doctor|rebuild]',
     '',
-    'Agent memory is local to GoodVibes Agent and never falls back to default Knowledge/Wiki or non-Agent knowledge segments.',
+    'Agent memory is local to GoodVibes Agent and never falls back to default knowledge or non-Agent knowledge segments.',
   ].join('\n');
 }
 
@@ -391,11 +392,11 @@ function writeBundle(path: string, bundle: MemoryBundle): void {
 function renderBundleInspection(path: string, bundle: MemoryBundle): string {
   return [
     'Agent memory handoff bundle',
-    `  path: ${path}`,
-    `  scope: ${bundle.scope}`,
-    `  records: ${bundle.recordCount}`,
-    `  links: ${bundle.linkCount}`,
-    ...bundle.records.slice(0, 20).map((record) => `  ${record.id} ${record.scope}/${record.cls} ${record.reviewState} ${record.summary}`),
+    `  path ${path}`,
+    `  scope ${bundle.scope}`,
+    `  records ${bundle.recordCount}`,
+    `  links ${bundle.linkCount}`,
+    ...bundle.records.slice(0, 20).map((record) => `  ${record.id} ${record.scope}/${record.cls} ${formatAgentRecordReviewState(record.reviewState)} ${record.summary}`),
     bundle.records.length > 20 ? `  ... ${bundle.records.length - 20} more` : '',
   ].filter((line): line is string => Boolean(line)).join('\n');
 }
@@ -441,7 +442,7 @@ async function handleAdd(runtime: CliCommandRuntime, context: MemoryContext, arg
   assertNoSecretLikeMemoryText([summary, detail ?? '', ...(tags ?? [])]);
   const reviewState = optionValue(options, 'review-state');
   if (reviewState !== undefined && !isReviewState(reviewState)) {
-    return failure(runtime, 'invalid_memory_command', `Invalid review state "${reviewState}". Valid: ${VALID_REVIEW_STATES.join(', ')}`, 2);
+    return failure(runtime, 'invalid_memory_command', `Invalid review state "${reviewState}". Valid values ${VALID_REVIEW_STATES.join(', ')}`, 2);
   }
   const record = await context.registry.add({
     scope: optionalScope(optionValue(options, 'scope')) ?? 'project',
@@ -456,14 +457,17 @@ async function handleAdd(runtime: CliCommandRuntime, context: MemoryContext, arg
       reviewedBy: optionValue(options, 'by'),
     },
   });
-  return success(runtime, 'agent.memory.add', record, `Agent memory added: ${record.id}`);
+  return success(runtime, 'agent.memory.add', record, [
+    'Agent memory added',
+    `  id ${record.id}`,
+  ].join('\n'));
 }
 
 async function handleShow(runtime: CliCommandRuntime, context: MemoryContext, args: readonly string[]): Promise<CliCommandOutput> {
   const id = args[0];
   if (!id) return failure(runtime, 'invalid_memory_command', 'Usage: goodvibes-agent memory show <id>', 2);
   const record = context.registry.get(id);
-  if (!record) return failure(runtime, 'memory_not_found', `Memory record not found: ${id}`, 1);
+  if (!record) return failure(runtime, 'memory_not_found', `Memory record not found ${id}`, 1);
   return success(runtime, 'agent.memory.show', { record, links: context.registry.linksFor(id) }, renderRecord(record, context.registry.linksFor(id)));
 }
 
@@ -485,8 +489,13 @@ async function handleReview(runtime: CliCommandRuntime, context: MemoryContext,
     reviewedBy: optionValue(options, 'by') ?? 'operator',
     staleReason: optionValue(options, 'reason'),
   });
-  if (!record) return failure(runtime, 'memory_not_found', `Memory record not found: ${id}`, 1);
-  return success(runtime, 'agent.memory.review', record, `Agent memory reviewed: ${record.id} ${record.reviewState} ${record.confidence}%`);
+  if (!record) return failure(runtime, 'memory_not_found', `Memory record not found ${id}`, 1);
+  return success(runtime, 'agent.memory.review', record, [
+    'Agent memory reviewed',
+    `  id ${record.id}`,
+    `  review ${formatAgentRecordReviewState(record.reviewState)}`,
+    `  confidence ${record.confidence}%`,
+  ].join('\n'));
 }
 
 async function handleReviewShortcut(runtime: CliCommandRuntime, context: MemoryContext, state: Extract<MemoryReviewState, 'stale' | 'contradicted'>, args: readonly string[]): Promise<CliCommandOutput> {
@@ -499,8 +508,11 @@ async function handleReviewShortcut(runtime: CliCommandRuntime, context: MemoryC
     reviewedBy: 'operator',
     staleReason: reasonParts.join(' '),
   });
-  if (!record) return failure(runtime, 'memory_not_found', `Memory record not found: ${id}`, 1);
-  return success(runtime, `agent.memory.${state}`, record, `Agent memory marked ${state}: ${record.id}`);
+  if (!record) return failure(runtime, 'memory_not_found', `Memory record not found ${id}`, 1);
+  return success(runtime, `agent.memory.${state}`, record, [
+    `Agent memory marked ${state}`,
+    `  id ${record.id}`,
+  ].join('\n'));
 }
 
 async function handlePromote(runtime: CliCommandRuntime, context: MemoryContext, args: readonly string[]): Promise<CliCommandOutput> {
@@ -509,8 +521,12 @@ async function handlePromote(runtime: CliCommandRuntime, context: MemoryContext,
   if (!id || !scopeRaw) return failure(runtime, 'invalid_memory_command', 'Usage: goodvibes-agent memory promote <id> <session|project|team> --yes', 2);
   if (!hasFlag(options, 'yes')) return failure(runtime, 'confirmation_required', `Refusing to promote memory record ${id} without --yes.`, 2);
   const record = context.registry.update(id, { scope: requireScope(scopeRaw) });
-  if (!record) return failure(runtime, 'memory_not_found', `Memory record not found: ${id}`, 1);
-  return success(runtime, 'agent.memory.promote', record, `Agent memory promoted: ${record.id} -> ${record.scope}`);
+  if (!record) return failure(runtime, 'memory_not_found', `Memory record not found ${id}`, 1);
+  return success(runtime, 'agent.memory.promote', record, [
+    'Agent memory promoted',
+    `  id ${record.id}`,
+    `  scope ${record.scope}`,
+  ].join('\n'));
 }
 
 async function handleLink(runtime: CliCommandRuntime, context: MemoryContext, args: readonly string[]): Promise<CliCommandOutput> {
@@ -520,7 +536,12 @@ async function handleLink(runtime: CliCommandRuntime, context: MemoryContext, ar
   if (!hasFlag(options, 'yes')) return failure(runtime, 'confirmation_required', `Refusing to link memory records ${fromId} and ${toId} without --yes.`, 2);
   const link = await context.registry.link(fromId, toId, relation);
   if (!link) return failure(runtime, 'memory_link_failed', 'Memory link failed; check that both records exist.', 1);
-  return success(runtime, 'agent.memory.link', link, `Agent memory linked: ${fromId} -> ${toId} [${relation}]`);
+  return success(runtime, 'agent.memory.link', link, [
+    'Agent memory linked',
+    `  from ${fromId}`,
+    `  to ${toId}`,
+    `  relation ${relation}`,
+  ].join('\n'));
 }
 
 async function handleDelete(runtime: CliCommandRuntime, context: MemoryContext, args: readonly string[]): Promise<CliCommandOutput> {
@@ -528,8 +549,11 @@ async function handleDelete(runtime: CliCommandRuntime, context: MemoryContext,
   const id = options.positionals[0];
   if (!id) return failure(runtime, 'invalid_memory_command', 'Usage: goodvibes-agent memory delete <id> --yes', 2);
   if (!hasFlag(options, 'yes')) return failure(runtime, 'confirmation_required', `Refusing to delete memory record ${id} without --yes.`, 2);
-  if (!context.registry.delete(id)) return failure(runtime, 'memory_not_found', `Memory record not found: ${id}`, 1);
-  return success(runtime, 'agent.memory.delete', { id }, `Agent memory deleted: ${id}`);
+  if (!context.registry.delete(id)) return failure(runtime, 'memory_not_found', `Memory record not found ${id}`, 1);
+  return success(runtime, 'agent.memory.delete', { id }, [
+    `Agent memory deleted: ${id}`,
+    `  id ${id}`,
+  ].join('\n'));
 }
 
 async function handleExport(runtime: CliCommandRuntime, context: MemoryContext, args: readonly string[]): Promise<CliCommandOutput> {
@@ -541,7 +565,12 @@ async function handleExport(runtime: CliCommandRuntime, context: MemoryContext,
   const path = resolvePath(runtime, pathArg);
   const bundle = context.registry.exportBundle(filter);
   writeBundle(path, bundle);
-  return success(runtime, 'agent.memory.export', { path, bundle }, `Agent memory exported: ${bundle.recordCount} record(s), ${bundle.linkCount} link(s) -> ${path}`);
+  return success(runtime, 'agent.memory.export', { path, bundle }, [
+    'Agent memory exported',
+    `  records ${bundle.recordCount}`,
+    `  links ${bundle.linkCount}`,
+    `  path ${path}`,
+  ].join('\n'));
 }
 
 async function handleImport(runtime: CliCommandRuntime, context: MemoryContext, args: readonly string[]): Promise<CliCommandOutput> {
@@ -552,7 +581,12 @@ async function handleImport(runtime: CliCommandRuntime, context: MemoryContext,
   const path = resolvePath(runtime, pathArg);
   const bundle = readBundle(path);
   const result = await context.registry.importBundle(bundle);
-  return success(runtime, 'agent.memory.import', { path, result }, `Agent memory imported: ${result.importedRecords} record(s), ${result.importedLinks} link(s); skipped ${result.skippedRecords}`);
+  return success(runtime, 'agent.memory.import', { path, result }, [
+    `Agent memory imported: ${result.importedRecords} record${result.importedRecords === 1 ? '' : 's'}`,
+    `  records: ${result.importedRecords}`,
+    `  links: ${result.importedLinks}`,
+    `  skipped: ${result.skippedRecords}`,
+  ].join('\n'));
 }
 
 async function handleInspect(runtime: CliCommandRuntime, args: readonly string[]): Promise<CliCommandOutput> {

package/src/cli/parser.ts

@@ -58,28 +58,40 @@ const COMMAND_ALIASES: Readonly<Record<string, GoodVibesCliCommand>> = {
   version: 'version',
 };
 
-const BLOCKED_PRODUCT_COMMANDS = new Set([
-  'app',
-  'bridge',
-  'control-plane',
-  'controlplane',
-  'cp',
-  'daemon',
-  'http-listener',
-  'launch',
-  'listener',
-  'remote',
-  'serve',
-  'server',
-  'service',
-  'services',
-  'start',
-  'surface',
-  'surfaces',
-  'tui',
-  'web',
-  'webhook',
-]);
+const BLOCKED_PRODUCT_COMMAND_HINTS: Readonly<Partial<Record<string, (binary: string) => string>>> = {
+  app: (binary) => `Unsupported command: app. Launch the Agent TUI with "${binary}" and no command.`,
+  bridge: () => 'Unsupported command: bridge. GoodVibes Agent connects to an externally managed GoodVibes host and does not expose bridge processes.',
+  'control-plane': () => 'Unsupported command: control-plane. GoodVibes Agent can inspect connected-host posture, but it does not manage host endpoints.',
+  controlplane: () => 'Unsupported command: controlplane. GoodVibes Agent can inspect connected-host posture, but it does not manage host endpoints.',
+  cp: () => 'Unsupported command: cp. GoodVibes Agent can inspect connected-host posture, but it does not manage host endpoints.',
+  daemon: () => 'Unsupported command: daemon. GoodVibes Agent connects to an externally managed GoodVibes host and does not start or manage host processes.',
+  'http-listener': () => 'Unsupported command: http-listener. GoodVibes Agent does not start listeners or expose inbound host endpoints.',
+  launch: (binary) => `Unsupported command: launch. Launch the Agent TUI with "${binary}" and no command.`,
+  listener: () => 'Unsupported command: listener. GoodVibes Agent does not start listeners or expose inbound host endpoints.',
+  remote: () => 'Unsupported command: remote. GoodVibes Agent uses explicit connected-host routes and does not manage remote host transport.',
+  serve: () => 'Unsupported command: serve. GoodVibes Agent connects to an externally managed GoodVibes host and does not start server processes.',
+  server: () => 'Unsupported command: server. GoodVibes Agent connects to an externally managed GoodVibes host and does not start server processes.',
+  service: () => 'Unsupported command: service. GoodVibes Agent keeps host lifecycle ownership outside this product.',
+  services: () => 'Unsupported command: services. GoodVibes Agent keeps host lifecycle ownership outside this product.',
+  start: (binary) => `Unsupported command: start. Launch the Agent TUI with "${binary}" and no command; Agent does not start connected-host processes.`,
+  surface: () => 'Unsupported command: surface. GoodVibes Agent does not manage connected-host surfaces.',
+  surfaces: () => 'Unsupported command: surfaces. GoodVibes Agent does not manage connected-host surfaces.',
+  tui: (binary) => `Unsupported command: tui. Launch the Agent TUI with "${binary}" and no command.`,
+  web: () => 'Unsupported command: web. GoodVibes Agent does not start web servers or expose browser routes.',
+  webhook: () => 'Unsupported command: webhook. GoodVibes Agent can send explicit channel messages, but it does not create webhook listeners.',
+};
+
+export function listGoodVibesCliCommandTokens(): readonly string[] {
+  return Object.keys(COMMAND_ALIASES).sort();
+}
+
+export function listGoodVibesCliCommands(): readonly GoodVibesCliCommand[] {
+  return [...new Set<GoodVibesCliCommand>(['tui', ...Object.values(COMMAND_ALIASES)])].sort();
+}
+
+export function listBlockedGoodVibesCliCommandTokens(): readonly string[] {
+  return Object.keys(BLOCKED_PRODUCT_COMMAND_HINTS).sort();
+}
 
 function createDefaultFlags(): GoodVibesCliFlags {
   return {
@@ -221,7 +233,7 @@ export function parseGoodVibesCli(
     if (!token.startsWith('-') || token === '-') {
       if (!sawCommand) {
         const commandToken = token.toLowerCase();
-        if (BLOCKED_PRODUCT_COMMANDS.has(commandToken)) {
+        if (BLOCKED_PRODUCT_COMMAND_HINTS[commandToken]) {
           command = 'unknown';
           rawCommand = token;
           sawCommand = true;
@@ -394,7 +406,8 @@ export function parseGoodVibesCli(
   }
 
   if (rawCommand !== undefined && command === 'unknown') {
-    errors.push(`Unknown command: ${rawCommand}`);
+    const blockedHint = BLOCKED_PRODUCT_COMMAND_HINTS[rawCommand.toLowerCase()];
+    errors.push(blockedHint ? blockedHint(binary) : `Unknown command ${rawCommand}`);
   }
 
   return {

package/src/cli/profiles-command.ts

@@ -16,6 +16,7 @@ import {
   type AgentRuntimeProfileCommandResult,
   type AgentRuntimeProfileInfo,
 } from '../agent/runtime-profile.ts';
+import { formatAgentRecordSource } from '../agent/record-labels.ts';
 import type { CliCommandOutput, GoodVibesCliParseResult } from './types.ts';
 
 interface ProfilesCommandRuntime {
@@ -56,7 +57,7 @@ function parseTemplate(args: readonly string[]): AgentRuntimeProfileTemplateId |
   if (!raw || raw === 'blank') return undefined;
   const normalized = raw.trim().toLowerCase().replace(/_/g, '-');
   if (isAgentRuntimeProfileTemplateId(normalized)) return normalized;
-  throw new Error(`Unknown Agent starter profile template: ${raw}. Use profiles templates to list starters.`);
+  throw new Error(`Unknown Agent starter profile template ${raw}. Use profiles templates to list starters.`);
 }
 
 function parseCsvFlag(args: readonly string[], names: readonly string[]): readonly string[] | undefined {
@@ -66,16 +67,21 @@ function parseCsvFlag(args: readonly string[], names: readonly string[]): readon
 }
 
 function profileLine(profile: AgentRuntimeProfileInfo): string {
-  const created = profile.createdAt ? ` created=${profile.createdAt}` : '';
+  const created = profile.createdAt ? ` created ${profile.createdAt}` : '';
   const starter = profile.starterTemplateId ? ` starter=${profile.starterTemplateId}` : '';
-  return `  ${profile.id}  home=${profile.homeDirectory}${created}${starter}`;
+  return `  ${profile.id}  home ${profile.homeDirectory}${created}${starter}`;
 }
 
 function renderProfilesResult(result: AgentRuntimeProfileCommandResult): string {
   if (!result.ok) return result.error ?? 'Agent profile command failed.';
   if (result.kind === 'agent.profiles.list') {
     const profiles = result.data?.profiles ?? [];
-    if (profiles.length === 0) return 'No Agent profiles. Use: goodvibes-agent profiles create <name> --template <id> --yes';
+    if (profiles.length === 0) {
+      return [
+        'No Agent profiles',
+        '  next goodvibes-agent profiles create <name> --template <id> --yes',
+      ].join('\n');
+    }
     return [
       `Agent profiles (${profiles.length})`,
       ...profiles.map(profileLine),
@@ -86,63 +92,71 @@ function renderProfilesResult(result: AgentRuntimeProfileCommandResult): string
     return [
       `Agent starter profile templates (${templates.length})`,
       ...templates.map((template) => [
-        `  ${template.id}  ${template.name} [${template.source}]`,
+        `  ${template.id}  ${template.name} [${formatAgentRecordSource(template.source).toLowerCase()}]`,
         `    ${template.description}`,
-        `    persona: ${template.personaName}`,
-        `    skills: ${template.skillNames.join(', ')}`,
-        `    routines: ${template.routineNames.join(', ')}`,
+        `    persona ${template.personaName}`,
+        `    skills ${template.skillNames.join(', ')}`,
+        `    routines ${template.routineNames.join(', ')}`,
       ].join('\n')),
-      'Use: goodvibes-agent profiles create <name> --template <id> --yes',
-      'Export/edit/import: goodvibes-agent profiles templates export <id> <path> --yes',
+      'Use goodvibes-agent profiles create <name> --template <id> --yes',
+      'Export/edit/import with goodvibes-agent profiles templates export <id> <path> --yes',
     ].join('\n');
   }
   if (result.kind === 'agent.profiles.template.export' && result.data?.template && result.data.path) {
     return [
       `Agent starter template exported: ${result.data.template.id}`,
-      `  path: ${result.data.path}`,
-      '  edit the JSON, then import it with: goodvibes-agent profiles templates import <path> --yes',
+      `  path ${result.data.path}`,
+      '  edit the JSON, then import it with goodvibes-agent profiles templates import <path> --yes',
     ].join('\n');
   }
   if (result.kind === 'agent.profiles.template.import' && result.data?.template) {
     return [
       `Agent starter template imported: ${result.data.template.id}`,
-      `  name: ${result.data.template.name}`,
-      `  source: ${result.data.template.source}`,
-      `  use: goodvibes-agent profiles create <name> --template ${result.data.template.id} --yes`,
+      `  name ${result.data.template.name}`,
+      `  origin ${formatAgentRecordSource(result.data.template.source)}`,
+      `  use goodvibes-agent profiles create <name> --template ${result.data.template.id} --yes`,
     ].join('\n');
   }
   if (result.kind === 'agent.profiles.template.from_discovered' && result.data?.template) {
     return [
       `Agent starter template created from discovered behavior: ${result.data.template.id}`,
-      `  name: ${result.data.template.name}`,
-      `  persona: ${result.data.template.personaName}`,
-      `  skills: ${result.data.template.skillNames.join(', ')}`,
-      `  routines: ${result.data.template.routineNames.join(', ')}`,
-      `  use: goodvibes-agent profiles create <name> --template ${result.data.template.id} --yes`,
+      `  name ${result.data.template.name}`,
+      `  persona ${result.data.template.personaName}`,
+      `  skills ${result.data.template.skillNames.join(', ')}`,
+      `  routines ${result.data.template.routineNames.join(', ')}`,
+      `  use goodvibes-agent profiles create <name> --template ${result.data.template.id} --yes`,
     ].join('\n');
   }
   if (result.kind === 'agent.profiles.default') {
     const selected = result.data?.selectedProfile;
-    if (!selected) return 'No default Agent profile selected. Use: goodvibes-agent profiles use <name> --yes';
+    if (!selected) {
+      return [
+        'No default Agent profile selected',
+        '  next goodvibes-agent profiles use <name> --yes',
+      ].join('\n');
+    }
     return [
       `Default Agent profile: ${selected.id}${selected.exists ? '' : ' (missing)'}`,
-      `  home: ${selected.homeDirectory}`,
-      selected.selectedAt ? `  selectedAt: ${selected.selectedAt}` : '',
+      `  home ${selected.homeDirectory}`,
+      selected.selectedAt ? `  selected ${selected.selectedAt}` : '',
       `  next launch: ${result.data?.nextCommand ?? 'goodvibes-agent'}`,
-      selected.exists ? '' : '  fix: create the profile again or clear it with goodvibes-agent profiles default clear --yes',
+      selected.exists ? '' : '  fix create the profile again or clear it with goodvibes-agent profiles default clear --yes',
     ].filter(Boolean).join('\n');
   }
   if (result.kind === 'agent.profiles.default.clear') {
-    return 'Default Agent profile cleared. Next launch uses the base Agent home unless --agent-profile is provided.';
+    return [
+      'Default Agent profile cleared',
+      '  next launch uses the base Agent home unless --agent-profile is provided',
+    ].join('\n');
   }
   if (result.kind === 'agent.profiles.create_from_discovered' && result.data?.profile && result.data.template) {
     return [
       `Agent profile created from discovered behavior: ${result.data.profile.id}`,
-      `  home: ${result.data.profile.homeDirectory}`,
+      `  home ${result.data.profile.homeDirectory}`,
       `  starter: ${result.data.template.id}`,
-      `  persona: ${result.data.template.personaName}`,
-      `  skills: ${result.data.template.skillNames.join(', ')}`,
-      `  routines: ${result.data.template.routineNames.join(', ')}`,
+      `  persona ${result.data.template.personaName}`,
+      `  skills ${result.data.template.skillNames.join(', ')}`,
+      `  routines ${result.data.template.routineNames.join(', ')}`,
       `  launch: ${result.data.nextCommand ?? `goodvibes-agent --agent-profile ${result.data.profile.id}`}`,
     ].join('\n');
   }
@@ -151,16 +165,19 @@ function renderProfilesResult(result: AgentRuntimeProfileCommandResult): string
     const template = result.data?.appliedTemplate;
     return [
       `Agent profile created: ${profile.id}`,
-      `  home: ${profile.homeDirectory}`,
+      `  home ${profile.homeDirectory}`,
       ...(template ? [
         `  starter: ${template.id} (${template.name})`,
         `  seeded: ${template.personaIds.length} persona, ${template.skillIds.length} skills, ${template.routineIds.length} routine`,
       ] : []),
-      `  use: ${result.data?.nextCommand ?? `goodvibes-agent --agent-profile ${profile.id}`}`,
+      `  use ${result.data?.nextCommand ?? `goodvibes-agent --agent-profile ${profile.id}`}`,
     ].join('\n');
   }
   if (result.kind === 'agent.profiles.delete' && profile) {
-    return `Agent profile deleted: ${profile.id}`;
+    return [
+      `Agent profile deleted: ${profile.id}`,
+      `  id ${profile.id}`,
+    ].join('\n');
   }
   return 'Agent profile command completed.';
 }
@@ -435,7 +452,7 @@ export async function handleProfilesCommand(runtime: ProfilesCommandRuntime): Pr
         data: { profile: info },
       };
       const starter = info.starterTemplateId ? [`  starter: ${info.starterTemplateId} (${info.starterTemplateName ?? info.starterTemplateId})`] : [];
-      const text = [`Agent profile: ${profile.id}`, `  home: ${profile.homeDirectory}`, ...starter, `  use: goodvibes-agent --agent-profile ${profile.id}`].join('\n');
+      const text = [`Agent profile: ${profile.id}`, `  home ${profile.homeDirectory}`, ...starter, `  use goodvibes-agent --agent-profile ${profile.id}`].join('\n');
       return {
         output: runtime.cli.flags.outputFormat === 'json' ? JSON.stringify(result, null, 2) : text,
         exitCode: 0,
@@ -571,8 +588,8 @@ export async function handleProfilesCommand(runtime: ProfilesCommandRuntime): Pr
         : {
           ok: false,
           kind: 'agent.profiles.error',
-          error: `Agent profile not found: ${resolution.id}`,
-      };
+          error: `Agent profile not found ${resolution.id}`,
+        };
       return {
         output: renderProfilesOutput(result, runtime.cli.flags.outputFormat),
         exitCode: deleted ? 0 : 1,

package/src/cli/provider-auth-routes.ts

@@ -1,4 +1,5 @@
 import type { ProviderAuthRouteDescriptor } from '@pellux/goodvibes-sdk/platform/providers';
+import { formatProviderAuthRouteId, formatProviderAuthRouteLabel } from '../provider-auth-route-display.ts';
 
 function routeUsable(route: ProviderAuthRouteDescriptor): boolean {
   return route.usable ?? route.configured;
@@ -18,5 +19,5 @@ export function formatProviderAuthRoute(route: ProviderAuthRouteDescriptor): str
     route.freshness,
   ].filter((part): part is string => Boolean(part));
   const detail = route.detail?.trim();
-  return `${route.label} [${route.route}; ${status.join(', ')}]${detail ? ` - ${detail}` : ''}`;
+  return `${formatProviderAuthRouteLabel(route.route, route.label)} [${formatProviderAuthRouteId(route.route)}; ${status.join(', ')}]${detail ? ` - ${detail}` : ''}`;
 }