@pellux/goodvibes-agent 0.1.117 → 1.0.0

package/src/input/commands/agent-runtime-profile-runtime.ts

@@ -17,6 +17,7 @@ import {
   type AgentRuntimeProfileInfo,
   type AgentRuntimeProfileTemplateSummary,
 } from '../../agent/runtime-profile.ts';
+import { formatAgentRecordSource } from '../../agent/record-labels.ts';
 import type { CommandContext, CommandRegistry } from '../command-registry.ts';
 import { requireYesFlag, stripYesFlag } from './confirmation.ts';
 import { requireShellPaths } from './runtime-services.ts';
@@ -35,19 +36,19 @@ function parseCsvFlag(args: readonly string[], name: string): readonly string[]
 }
 
 function profileLine(profile: AgentRuntimeProfileInfo): string {
-  const created = profile.createdAt ? ` created=${profile.createdAt}` : '';
-  const starter = profile.starterTemplateId ? ` starter=${profile.starterTemplateId}` : '';
-  return `  ${profile.id}  home=${profile.homeDirectory}${created}${starter}`;
+  const created = profile.createdAt ? `  created ${profile.createdAt}` : '';
+  const starter = profile.starterTemplateId ? `  starter=${profile.starterTemplateId}` : '';
+  return `  ${profile.id}  home ${profile.homeDirectory}${created}${starter}`;
 }
 
 function templateLine(template: AgentRuntimeProfileTemplateSummary): string {
-  const source = template.source === 'local' ? `local ${template.path ?? ''}`.trim() : 'builtin';
+  const origin = template.source === 'local' ? `local ${template.path ?? ''}`.trim() : formatAgentRecordSource(template.source).toLowerCase();
   return [
-    `  ${template.id}  [${source}]`,
-    `    ${template.name}: ${template.description}`,
-    `    persona: ${template.personaName}`,
-    `    skills: ${template.skillNames.join(', ')}`,
-    `    routines: ${template.routineNames.join(', ')}`,
+    `  ${template.id}  [${origin}]`,
+    `    ${template.name} - ${template.description}`,
+    `    persona ${template.personaName}`,
+    `    skills ${template.skillNames.join(', ')}`,
+    `    routines ${template.routineNames.join(', ')}`,
   ].join('\n');
 }
 
@@ -72,9 +73,9 @@ function renderProfileDetail(homeDirectory: string, name: string): string {
   const starter = info.starterTemplateId ? [`  starter: ${info.starterTemplateId} (${info.starterTemplateName ?? info.starterTemplateId})`] : [];
   return [
     `Agent profile: ${profile.id}`,
-    `  home: ${profile.homeDirectory}`,
+    `  home ${profile.homeDirectory}`,
     ...starter,
-    `  use: goodvibes-agent --agent-profile ${profile.id}`,
+    `  use goodvibes-agent --agent-profile ${profile.id}`,
   ].join('\n');
 }
 
@@ -98,8 +99,8 @@ function renderGuide(homeDirectory: string): string {
   const localCount = templates.filter((template) => template.source === 'local').length;
   return [
     'Agent Starter Authoring Guide',
-    `  built-in starters: ${templates.length - localCount}`,
-    `  local starters: ${localCount}`,
+    `  built-in starters ${templates.length - localCount}`,
+    `  local starters ${localCount}`,
     '',
     '1. Pick a base starter:',
     '   /agent-profile templates',
@@ -111,20 +112,20 @@ function renderGuide(homeDirectory: string): string {
     '5. Create an Agent profile from the imported starter:',
     '   /agent-profile create <name> --template <imported-id> --yes',
     '',
-    'This writes only Agent-local starter/profile state. It does not mutate connected GoodVibes host, default wiki, or non-Agent knowledge segments.',
+    'This writes only Agent-local starter/profile state. It does not mutate connected GoodVibes host, default knowledge, or non-Agent knowledge segments.',
   ].join('\n');
 }
 
 function renderTemplatePreview(homeDirectory: string, templateId: string): string {
   const file = getAgentRuntimeProfileTemplateFile(templateId, homeDirectory);
   return [
-    `Agent Starter Template: ${file.template.id}`,
-    `  name: ${file.template.name}`,
-    `  source: ${file.template.source}`,
-    `  description: ${file.template.description}`,
-    `  persona: ${file.template.persona.name}`,
-    `  skills: ${file.template.skills.map((skill) => skill.name).join(', ')}`,
-    `  routines: ${file.template.routines.map((routine) => routine.name).join(', ')}`,
+    `Agent Starter Template ${file.template.id}`,
+    `  name ${file.template.name}`,
+    `  origin ${formatAgentRecordSource(file.template.source)}`,
+    `  description ${file.template.description}`,
+    `  persona ${file.template.persona.name}`,
+    `  skills ${file.template.skills.map((skill) => skill.name).join(', ')}`,
+    `  routines ${file.template.routines.map((routine) => routine.name).join(', ')}`,
     '',
     'Export/edit/import to customize this starter:',
     `  /agent-profile template export ${file.template.id} ./agent-starter.json --yes`,
@@ -184,9 +185,9 @@ export function registerAgentRuntimeProfileRuntimeCommands(registry: CommandRegi
             const selected = setAgentRuntimeProfileSelection(homeDirectory, target);
             ctx.print([
               `Default Agent profile selected: ${selected.id}`,
-              `  home: ${selected.homeDirectory}`,
+              `  home ${selected.homeDirectory}`,
               '  next launch: goodvibes-agent',
-              '  explicit override: goodvibes-agent --agent-profile <name>',
+              '  explicit override goodvibes-agent --agent-profile <name>',
             ].join('\n'));
             return;
           }
@@ -194,7 +195,7 @@ export function registerAgentRuntimeProfileRuntimeCommands(registry: CommandRegi
           ctx.print(selected
             ? [
               `Default Agent profile: ${selected.id}${selected.exists ? '' : ' (missing)'}`,
-              `  home: ${selected.homeDirectory}`,
+              `  home ${selected.homeDirectory}`,
               '  next launch: goodvibes-agent',
             ].join('\n')
             : 'No default Agent profile selected. Next launch uses the base Agent home.');
@@ -214,9 +215,9 @@ export function registerAgentRuntimeProfileRuntimeCommands(registry: CommandRegi
           const selected = setAgentRuntimeProfileSelection(homeDirectory, name);
           ctx.print([
             `Default Agent profile selected: ${selected.id}`,
-            `  home: ${selected.homeDirectory}`,
+            `  home ${selected.homeDirectory}`,
             '  next launch: goodvibes-agent',
-            '  explicit override: goodvibes-agent --agent-profile <name>',
+            '  explicit override goodvibes-agent --agent-profile <name>',
           ].join('\n'));
           return;
         }
@@ -251,7 +252,7 @@ export function registerAgentRuntimeProfileRuntimeCommands(registry: CommandRegi
             const targetPath = shellPaths.resolveWorkspacePath(pathArg);
             mkdirSync(dirname(targetPath), { recursive: true });
             const template = exportAgentRuntimeProfileTemplate(homeDirectory, templateId, targetPath);
-            ctx.print(`Agent starter template exported: ${template.id}\n  path: ${template.path ?? targetPath}\n  edit it, then import it with /agent-profile template import <path> --yes`);
+            ctx.print(`Agent starter template exported: ${template.id}\n  path ${template.path ?? targetPath}\n  edit it, then import it with /agent-profile template import <path> --yes`);
             return;
           }
           if (mode === 'import') {
@@ -266,7 +267,7 @@ export function registerAgentRuntimeProfileRuntimeCommands(registry: CommandRegi
             }
             const sourcePath = shellPaths.resolveWorkspacePath(pathArg);
             const template = importAgentRuntimeProfileTemplate(homeDirectory, sourcePath);
-            ctx.print(`Agent starter template imported: ${template.id}\n  source: ${template.source}\n  use: /agent-profile create <name> --template ${template.id} --yes`);
+            ctx.print(`Agent starter template imported: ${template.id}\n  origin ${formatAgentRecordSource(template.source).toLowerCase()}\n  use /agent-profile create <name> --template ${template.id} --yes`);
             return;
           }
           if (mode === 'from-discovered' || mode === 'import-discovered') {
@@ -290,10 +291,10 @@ export function registerAgentRuntimeProfileRuntimeCommands(registry: CommandRegi
             });
             ctx.print([
               `Agent starter template created from discovered behavior: ${template.id}`,
-              `  persona: ${template.personaName}`,
-              `  skills: ${template.skillNames.join(', ')}`,
-              `  routines: ${template.routineNames.join(', ')}`,
-              `  use: /agent-profile create <name> --template ${template.id} --yes`,
+              `  persona ${template.personaName}`,
+              `  skills ${template.skillNames.join(', ')}`,
+              `  routines ${template.routineNames.join(', ')}`,
+              `  use /agent-profile create <name> --template ${template.id} --yes`,
             ].join('\n'));
             return;
           }
@@ -315,9 +316,9 @@ export function registerAgentRuntimeProfileRuntimeCommands(registry: CommandRegi
           const profile = createAgentRuntimeProfile(homeDirectory, name, { templateId });
           ctx.print([
             `Agent profile created: ${profile.id}`,
-            `  home: ${profile.homeDirectory}`,
+            `  home ${profile.homeDirectory}`,
             profile.starterTemplateId ? `  starter: ${profile.starterTemplateId}` : '',
-            `  launch: goodvibes-agent --agent-profile ${profile.id}`,
+            `  launch goodvibes-agent --agent-profile ${profile.id}`,
           ].filter(Boolean).join('\n'));
           return;
         }
@@ -344,12 +345,12 @@ export function registerAgentRuntimeProfileRuntimeCommands(registry: CommandRegi
           });
           ctx.print([
             `Agent profile created from discovered behavior: ${created.profile.id}`,
-            `  home: ${created.profile.homeDirectory}`,
+            `  home ${created.profile.homeDirectory}`,
             `  starter: ${created.template.id}`,
-            `  persona: ${created.template.personaName}`,
-            `  skills: ${created.template.skillNames.join(', ')}`,
-            `  routines: ${created.template.routineNames.join(', ')}`,
-            `  launch: goodvibes-agent --agent-profile ${created.profile.id}`,
+            `  persona ${created.template.personaName}`,
+            `  skills ${created.template.skillNames.join(', ')}`,
+            `  routines ${created.template.routineNames.join(', ')}`,
+            `  launch goodvibes-agent --agent-profile ${created.profile.id}`,
           ].join('\n'));
           return;
         }
@@ -364,13 +365,16 @@ export function registerAgentRuntimeProfileRuntimeCommands(registry: CommandRegi
             requireYesFlag(ctx, `delete Agent profile ${name}`, '/agent-profile delete <name> --yes');
             return;
           }
-          ctx.print(deleteAgentRuntimeProfile(homeDirectory, name) ? `Agent profile deleted: ${name}` : `Agent profile not found: ${name}`);
+          ctx.print(deleteAgentRuntimeProfile(homeDirectory, name) ? `Agent profile deleted: ${name}` : `Agent profile not found ${name}`);
           return;
         }
 
         ctx.print('Usage: /agent-profile [list|show <name>|default [<name>|clear] --yes|use <name> --yes|templates|guide|template show <id>|template export <id> <path> --yes|template import <path> --yes|create <name> [--template <id>] --yes|create-from-discovered <name> --yes|delete <name> --yes]');
       } catch (error) {
-        ctx.print(`Error: ${error instanceof Error ? error.message : String(error)}`);
+        ctx.print([
+          'Error',
+          `  message ${error instanceof Error ? error.message : String(error)}`,
+        ].join('\n'));
       }
     },
   });

package/src/input/commands/agent-skills-runtime.ts

@@ -8,6 +8,7 @@ import {
   type AgentSkillRecord,
 } from '../../agent/skill-registry.ts';
 import { discoverSkills, type SkillRecord } from '../../agent/skill-discovery.ts';
+import { formatAgentRecordOrigin, formatAgentRecordReviewState } from '../../agent/record-labels.ts';
 import type { CommandContext, CommandRegistry } from '../command-registry.ts';
 import { requireShellPaths } from './runtime-services.ts';
 
@@ -58,23 +59,34 @@ function requiredFlag(flags: ReadonlyMap<string, string>, key: string): string {
   return value;
 }
 
+function formatSkillReceipt(title: string, record: { readonly id: string; readonly name: string }, extra: readonly string[] = []): string {
+  return [
+    `${title} ${record.id}`,
+    `  id ${record.id}`,
+    `  name ${record.name}`,
+    ...extra,
+  ].join('\n');
+}
+
 function summarizeSkill(skill: AgentSkillRecord): string {
   const enabled = skill.enabled ? 'enabled' : 'disabled';
-  const tags = skill.tags.length > 0 ? ` tags=${skill.tags.join(',')}` : '';
+  const tags = skill.tags.length > 0 ? ` tags ${skill.tags.join(', ')}` : '';
   const readiness = evaluateAgentSkillReadiness(skill);
+  const review = formatAgentRecordReviewState(skill.reviewState);
   const ready = readiness.ready ? 'ready' : `needs ${readiness.missing.map(formatAgentSkillRequirement).join(',')}`;
-  return `  ${skill.id}  ${enabled}  ${skill.reviewState}  ${ready}  ${skill.name} - ${skill.description}${tags}`;
+  return `  ${skill.id}  ${enabled}  ${review}  ${ready}  ${skill.name} - ${skill.description}${tags}`;
 }
 
 function summarizeBundle(bundle: AgentSkillBundleRecord, skills: readonly AgentSkillRecord[]): string {
   const enabled = bundle.enabled ? 'enabled' : 'disabled';
   const readiness = evaluateAgentSkillBundleReadiness(bundle, skills);
+  const review = formatAgentRecordReviewState(bundle.reviewState);
   const missing = [
     ...readiness.missingRequirements.map(formatAgentSkillRequirement),
-    ...readiness.missingSkillIds.map((skillId) => `skill:${skillId}`),
+    ...readiness.missingSkillIds.map((skillId) => `skill ${skillId}`),
   ];
   const ready = readiness.ready ? 'ready' : `needs ${missing.join(',')}`;
-  return `  ${bundle.id}  ${enabled}  ${bundle.reviewState}  ${ready}  ${bundle.name} - ${bundle.description}  skills=${bundle.skillIds.join(',')}`;
+  return `  ${bundle.id}  ${enabled}  ${review}  ${ready}  ${bundle.name} - ${bundle.description}  skills ${bundle.skillIds.join(', ')}`;
 }
 
 function renderList(title: string, registry: AgentSkillRegistry, skills: readonly AgentSkillRecord[], emptyMessage?: string): string {
@@ -82,21 +94,21 @@ function renderList(title: string, registry: AgentSkillRegistry, skills: readonl
   if (skills.length === 0) {
     return emptyMessage
       ? `${title}\n  ${emptyMessage}`
-      : `${title}\n  No local Agent skills yet. Create one with /agent-skills create --name <name> --description <summary> --procedure <steps>.`;
+      : `${title}\n  No Agent-local skills yet. Create one with /skills create --name <name> --description <summary> --procedure <steps>.`;
   }
   return [
     `${title} (${skills.length})`,
-    `  store: ${snapshot.path}`,
-    `  enabled: ${snapshot.enabledSkills.length}`,
+    `  store ${snapshot.path}`,
+    `  enabled ${snapshot.enabledSkills.length}`,
     ...skills.map(summarizeSkill),
   ].join('\n');
 }
 
 function summarizeDiscoveredSkill(skill: SkillRecord): string {
   const description = skill.description ? ` - ${skill.description}` : '';
-  const dependencies = skill.dependencies.length > 0 ? ` deps=${skill.dependencies.join(',')}` : '';
-  const includes = skill.includes.length > 0 ? ` includes=${skill.includes.join(',')}` : '';
-  return `  ${skill.name}  ${skill.origin}${description}${dependencies}${includes}\n    path: ${skill.path}`;
+  const dependencies = skill.dependencies.length > 0 ? ` deps ${skill.dependencies.join(', ')}` : '';
+  const includes = skill.includes.length > 0 ? ` includes ${skill.includes.join(', ')}` : '';
+  return `  ${skill.name}  ${skill.origin}${description}${dependencies}${includes}\n    path ${skill.path}`;
 }
 
 function renderDiscoveredSkills(skills: readonly SkillRecord[]): string {
@@ -111,7 +123,7 @@ function renderDiscoveredSkills(skills: readonly SkillRecord[]): string {
     `Discovered Agent skill files (${skills.length})`,
     ...skills.map(summarizeDiscoveredSkill),
     '',
-    'Import one with: /agent-skills import-discovered <name> --yes',
+    'Import one with: /skills import-discovered <name> --yes',
   ].join('\n');
 }
 
@@ -150,23 +162,23 @@ async function importDiscoveredSkill(args: readonly string[], ctx: CommandContex
   const parsed = parseSkillArgs(args);
   const name = parsed.rest.join(' ').trim();
   if (!name) {
-    ctx.print('Usage: /agent-skills import-discovered <name> [--enabled] --yes');
+    ctx.print('Usage: /skills import-discovered <name> [--enabled] --yes');
     return;
   }
   const discovered = findDiscoveredSkill(await discoverSkills(requireShellPaths(ctx)), name);
   if (!discovered) {
-    ctx.print(`Unknown discovered Agent skill: ${name}\nRun /agent-skills discover to inspect available skill files.`);
+    ctx.print(`Unknown discovered Agent skill ${name}\nRun /skills discover to inspect available skill files.`);
     return;
   }
   if (!parsed.yes) {
     ctx.print([
       'Agent skill import preview',
-      `  name: ${discovered.name}`,
-      `  origin: ${discovered.origin}`,
-      `  path: ${discovered.path}`,
-      `  description: ${discovered.description || '(none)'}`,
-      `  procedure characters: ${discovered.body.length}`,
-      '  next: rerun with --yes to import into the Agent-local skill registry',
+      `  name ${discovered.name}`,
+      `  origin ${discovered.origin}`,
+      `  path ${discovered.path}`,
+      `  description ${discovered.description || '(none)'}`,
+      `  procedure characters ${discovered.body.length}`,
+      '  next rerun with --yes to import into the Agent-local skill registry',
     ].join('\n'));
     return;
   }
@@ -182,9 +194,9 @@ async function importDiscoveredSkill(args: readonly string[], ctx: CommandContex
     }),
     enabled: parsed.flags.get('enabled') === 'true',
     source: 'imported',
-    provenance: `discovered:${discovered.origin}:${discovered.path}`,
+    provenance: `Imported file (${discovered.origin}): ${discovered.path}`,
   });
-  ctx.print(`Imported Agent skill ${skill.id}: ${skill.name}`);
+  ctx.print(formatSkillReceipt('Imported Agent skill', skill, [`  enabled ${skill.enabled ? 'yes' : 'no'}`]));
 }
 
 function renderBundleList(title: string, registry: AgentSkillRegistry, bundles: readonly AgentSkillBundleRecord[], emptyMessage?: string): string {
@@ -192,11 +204,11 @@ function renderBundleList(title: string, registry: AgentSkillRegistry, bundles:
   if (bundles.length === 0) {
     return emptyMessage
       ? `${title}\n  ${emptyMessage}`
-      : `${title}\n  No local Agent skill bundles yet. Create one with /agent-skills bundle create --name <name> --description <summary> --skills <id,id>.`;
+      : `${title}\n  No Agent-local skill bundles yet. Create one with /skills bundle create --name <name> --description <summary> --skills <id,id>.`;
   }
   return [
     `${title} (${bundles.length})`,
-    `  store: ${snapshot.path}`,
+    `  store ${snapshot.path}`,
     `  enabled bundles: ${snapshot.enabledBundles.length}`,
     `  active skills: ${snapshot.activeSkills.length}`,
     ...bundles.map((bundle) => summarizeBundle(bundle, snapshot.skills)),
@@ -207,14 +219,13 @@ function renderSkill(skill: AgentSkillRecord): string {
   const readiness = evaluateAgentSkillReadiness(skill);
   return [
     `Skill ${skill.name}`,
-    `  id: ${skill.id}`,
+    `  id ${skill.id}`,
     `  enabled: ${skill.enabled ? 'yes' : 'no'}`,
     `  readiness: ${readiness.ready ? 'ready' : 'needs setup'}`,
     `  requirements: ${skill.requirements.map(formatAgentSkillRequirement).join(', ') || '(none)'}`,
     readiness.missing.length > 0 ? `  missing: ${readiness.missing.map(formatAgentSkillRequirement).join(', ')}` : '',
-    `  review: ${skill.reviewState}`,
-    `  source: ${skill.source}`,
-    `  provenance: ${skill.provenance}`,
+    `  review: ${formatAgentRecordReviewState(skill.reviewState)}`,
+    `  origin: ${formatAgentRecordOrigin(skill.source, skill.provenance)}`,
     `  tags: ${skill.tags.join(', ') || '(none)'}`,
     `  triggers: ${skill.triggers.join(', ') || '(manual)'}`,
     `  created: ${skill.createdAt}`,
@@ -234,17 +245,16 @@ function renderBundle(bundle: AgentSkillBundleRecord, registry: AgentSkillRegist
   const readiness = evaluateAgentSkillBundleReadiness(bundle, registry.snapshot().skills);
   const missing = [
     ...readiness.missingRequirements.map(formatAgentSkillRequirement),
-    ...readiness.missingSkillIds.map((skillId) => `skill:${skillId}`),
+    ...readiness.missingSkillIds.map((skillId) => `skill ${skillId}`),
   ];
   return [
     `Skill Bundle ${bundle.name}`,
-    `  id: ${bundle.id}`,
+    `  id ${bundle.id}`,
     `  enabled: ${bundle.enabled ? 'yes' : 'no'}`,
     `  readiness: ${readiness.ready ? 'ready' : 'needs setup'}`,
     missing.length > 0 ? `  missing: ${missing.join(', ')}` : '',
-    `  review: ${bundle.reviewState}`,
-    `  source: ${bundle.source}`,
-    `  provenance: ${bundle.provenance}`,
+    `  review: ${formatAgentRecordReviewState(bundle.reviewState)}`,
+    `  origin: ${formatAgentRecordOrigin(bundle.source, bundle.provenance)}`,
     `  skills: ${bundle.skillIds.join(', ')}`,
     `  created: ${bundle.createdAt}`,
     `  updated: ${bundle.updatedAt}`,
@@ -257,7 +267,10 @@ function renderBundle(bundle: AgentSkillBundleRecord, registry: AgentSkillRegist
 }
 
 function printError(ctx: CommandContext, error: unknown): void {
-  ctx.print(`Error: ${error instanceof Error ? error.message : String(error)}`);
+  ctx.print([
+    'Error',
+    `  message ${error instanceof Error ? error.message : String(error)}`,
+  ].join('\n'));
 }
 
 function runBundleCommand(args: readonly string[], ctx: CommandContext, skillRegistry: AgentSkillRegistry): void {
@@ -274,7 +287,7 @@ function runBundleCommand(args: readonly string[], ctx: CommandContext, skillReg
   if (sub === 'attention' || sub === 'needs-setup') {
     const snapshot = skillRegistry.snapshot();
     const bundles = snapshot.bundles.filter((bundle) => !evaluateAgentSkillBundleReadiness(bundle, snapshot.skills).ready);
-    ctx.print(renderBundleList('Agent Skill Bundles needing setup', skillRegistry, bundles, 'No local Agent skill bundles need setup.'));
+    ctx.print(renderBundleList('Agent Skill Bundles needing setup', skillRegistry, bundles, 'No Agent-local skill bundles need setup.'));
     return;
   }
   if (sub === 'search') {
@@ -285,11 +298,11 @@ function runBundleCommand(args: readonly string[], ctx: CommandContext, skillReg
   if (sub === 'show') {
     const id = args[1];
     if (!id) {
-      ctx.print('Usage: /agent-skills bundle show <id>');
+      ctx.print('Usage: /skills bundle show <id>');
       return;
     }
     const bundle = skillRegistry.getBundle(id);
-    ctx.print(bundle ? renderBundle(bundle, skillRegistry) : `Unknown Agent skill bundle: ${id}`);
+    ctx.print(bundle ? renderBundle(bundle, skillRegistry) : `Unknown Agent skill bundle ${id}`);
     return;
   }
   if (sub === 'create') {
@@ -300,15 +313,15 @@ function runBundleCommand(args: readonly string[], ctx: CommandContext, skillReg
       skillIds: splitList(requiredFlag(parsed.flags, 'skills')),
       enabled: parsed.flags.get('enabled') === 'true',
       source: 'user',
-      provenance: 'slash-command',
+      provenance: 'Command',
     });
-    ctx.print(`Created Agent skill bundle ${bundle.id}: ${bundle.name}`);
+    ctx.print(formatSkillReceipt('Created Agent skill bundle', bundle));
     return;
   }
   if (sub === 'update') {
     const id = args[1];
     if (!id) {
-      ctx.print('Usage: /agent-skills bundle update <id> [--name ...] [--description ...] [--skills id,id]');
+      ctx.print('Usage: /skills bundle update <id> [--name ...] [--description ...] [--skills id,id]');
       return;
     }
     const parsed = parseSkillArgs(args.slice(2));
@@ -316,46 +329,46 @@ function runBundleCommand(args: readonly string[], ctx: CommandContext, skillReg
       name: parsed.flags.get('name'),
       description: parsed.flags.get('description'),
       skillIds: parsed.flags.has('skills') ? splitList(parsed.flags.get('skills')) : undefined,
-      provenance: 'slash-command',
+      provenance: 'Command',
     });
-    ctx.print(`Updated Agent skill bundle ${updated.id}: ${updated.name}`);
+    ctx.print(formatSkillReceipt('Updated Agent skill bundle', updated));
     return;
   }
   if (sub === 'enable' || sub === 'disable') {
     const id = args[1];
     if (!id) {
-      ctx.print(`Usage: /agent-skills bundle ${sub} <id>`);
+      ctx.print(`Usage: /skills bundle ${sub} <id>`);
       return;
     }
     const bundle = skillRegistry.setBundleEnabled(id, sub === 'enable');
-    ctx.print(`${sub === 'enable' ? 'Enabled' : 'Disabled'} Agent skill bundle ${bundle.id}: ${bundle.name}`);
+    ctx.print(formatSkillReceipt(`${sub === 'enable' ? 'Enabled' : 'Disabled'} Agent skill bundle`, bundle));
     return;
   }
   if (sub === 'review') {
     const id = args[1];
     if (!id) {
-      ctx.print('Usage: /agent-skills bundle review <id>');
+      ctx.print('Usage: /skills bundle review <id>');
       return;
     }
     const bundle = skillRegistry.markBundleReviewed(id);
-    ctx.print(`Reviewed Agent skill bundle ${bundle.id}.`);
+    ctx.print(formatSkillReceipt('Reviewed Agent skill bundle', bundle));
     return;
   }
   if (sub === 'stale') {
     const id = args[1];
     if (!id) {
-      ctx.print('Usage: /agent-skills bundle stale <id> <reason...>');
+      ctx.print('Usage: /skills bundle stale <id> <reason...>');
       return;
     }
     const bundle = skillRegistry.markBundleStale(id, args.slice(2).join(' '));
-    ctx.print(`Marked Agent skill bundle ${bundle.id} stale.`);
+    ctx.print(formatSkillReceipt('Marked Agent skill bundle stale', bundle));
     return;
   }
   if (sub === 'delete' || sub === 'remove') {
     const parsed = parseSkillArgs(args.slice(1));
     const id = parsed.rest[0];
     if (!id) {
-      ctx.print('Usage: /agent-skills bundle delete <id> --yes');
+      ctx.print('Usage: /skills bundle delete <id> --yes');
       return;
     }
     if (!parsed.yes) {
@@ -363,10 +376,10 @@ function runBundleCommand(args: readonly string[], ctx: CommandContext, skillReg
       return;
     }
     const removed = skillRegistry.deleteBundle(id);
-    ctx.print(`Deleted Agent skill bundle ${removed.id}: ${removed.name}`);
+    ctx.print(formatSkillReceipt('Deleted Agent skill bundle', removed));
     return;
   }
-  ctx.print('Usage: /agent-skills bundle [list|enabled|attention|search|show|create|update|enable|disable|review|stale|delete]');
+  ctx.print('Usage: /skills bundle [list|enabled|attention|search|show|create|update|enable|disable|review|stale|delete]');
 }
 
 export async function runAgentSkillsRuntimeCommand(args: readonly string[], ctx: CommandContext): Promise<void> {
@@ -400,7 +413,7 @@ export async function runAgentSkillsRuntimeCommand(args: readonly string[], ctx:
     }
     if (sub === 'attention' || sub === 'needs-setup') {
       const skills = skillRegistry.list().filter((skill) => !evaluateAgentSkillReadiness(skill).ready);
-      ctx.print(renderList('Agent Skills needing setup', skillRegistry, skills, 'No local Agent skills need setup.'));
+      ctx.print(renderList('Agent Skills needing setup', skillRegistry, skills, 'No Agent-local skills need setup.'));
       return;
     }
     if (sub === 'search') {
@@ -411,11 +424,11 @@ export async function runAgentSkillsRuntimeCommand(args: readonly string[], ctx:
     if (sub === 'show') {
       const id = args[1];
       if (!id) {
-        ctx.print('Usage: /agent-skills show <id>');
+        ctx.print('Usage: /skills show <id>');
         return;
       }
       const skill = skillRegistry.get(id);
-      ctx.print(skill ? renderSkill(skill) : `Unknown Agent skill: ${id}`);
+      ctx.print(skill ? renderSkill(skill) : `Unknown Agent skill ${id}`);
       return;
     }
     if (sub === 'create') {
@@ -433,15 +446,15 @@ export async function runAgentSkillsRuntimeCommand(args: readonly string[], ctx:
         }),
         enabled: parsed.flags.get('enabled') === 'true',
         source: 'user',
-        provenance: 'slash-command',
+        provenance: 'Command',
       });
-      ctx.print(`Created Agent skill ${skill.id}: ${skill.name}`);
+      ctx.print(formatSkillReceipt('Created Agent skill', skill));
       return;
     }
     if (sub === 'update') {
       const id = args[1];
       if (!id) {
-        ctx.print('Usage: /agent-skills update <id> [--name ...] [--description ...] [--procedure ...]');
+        ctx.print('Usage: /skills update <id> [--name ...] [--description ...] [--procedure ...]');
         return;
       }
       const parsed = parseSkillArgs(args.slice(2));
@@ -457,46 +470,46 @@ export async function runAgentSkillsRuntimeCommand(args: readonly string[], ctx:
             commands: splitList(parsed.flags.get('requires-command') ?? parsed.flags.get('requires-commands')),
           })
           : undefined,
-        provenance: 'slash-command',
+        provenance: 'Command',
       });
-      ctx.print(`Updated Agent skill ${updated.id}: ${updated.name}`);
+      ctx.print(formatSkillReceipt('Updated Agent skill', updated));
       return;
     }
     if (sub === 'enable' || sub === 'disable') {
       const id = args[1];
       if (!id) {
-        ctx.print(`Usage: /agent-skills ${sub} <id>`);
+        ctx.print(`Usage: /skills ${sub} <id>`);
         return;
       }
       const skill = skillRegistry.setEnabled(id, sub === 'enable');
-      ctx.print(`${sub === 'enable' ? 'Enabled' : 'Disabled'} Agent skill ${skill.id}: ${skill.name}`);
+      ctx.print(formatSkillReceipt(`${sub === 'enable' ? 'Enabled' : 'Disabled'} Agent skill`, skill));
       return;
     }
     if (sub === 'review') {
       const id = args[1];
       if (!id) {
-        ctx.print('Usage: /agent-skills review <id>');
+        ctx.print('Usage: /skills review <id>');
         return;
       }
       const skill = skillRegistry.markReviewed(id);
-      ctx.print(`Reviewed Agent skill ${skill.id}.`);
+      ctx.print(formatSkillReceipt('Reviewed Agent skill', skill));
       return;
     }
     if (sub === 'stale') {
       const id = args[1];
       if (!id) {
-        ctx.print('Usage: /agent-skills stale <id> <reason...>');
+        ctx.print('Usage: /skills stale <id> <reason...>');
         return;
       }
       const skill = skillRegistry.markStale(id, args.slice(2).join(' '));
-      ctx.print(`Marked Agent skill ${skill.id} stale.`);
+      ctx.print(formatSkillReceipt('Marked Agent skill stale', skill));
       return;
     }
     if (sub === 'delete' || sub === 'remove') {
       const parsed = parseSkillArgs(args.slice(1));
       const id = parsed.rest[0];
       if (!id) {
-        ctx.print('Usage: /agent-skills delete <id> --yes');
+        ctx.print('Usage: /skills delete <id> --yes');
         return;
       }
       if (!parsed.yes) {
@@ -504,10 +517,10 @@ export async function runAgentSkillsRuntimeCommand(args: readonly string[], ctx:
         return;
       }
       const removed = skillRegistry.deleteSkill(id);
-      ctx.print(`Deleted Agent skill ${removed.id}: ${removed.name}`);
+      ctx.print(formatSkillReceipt('Deleted Agent skill', removed));
       return;
     }
-    ctx.print('Usage: /agent-skills [list|enabled|attention|discover|import-discovered|search|show|create|update|enable|disable|review|stale|delete|bundle]');
+    ctx.print('Usage: /skills [list|enabled|attention|discover|import-discovered|search|show|create|update|enable|disable|review|stale|delete|bundle]');
   } catch (error) {
     printError(ctx, error);
   }
@@ -515,9 +528,9 @@ export async function runAgentSkillsRuntimeCommand(args: readonly string[], ctx:
 
 export function registerAgentSkillsRuntimeCommands(registry: CommandRegistry): void {
   registry.register({
-    name: 'agent-skills',
-    aliases: ['askills', 'local-skills', 'skills', 'skill'],
-    description: 'Manage local GoodVibes Agent skills',
+    name: 'skills',
+    aliases: ['skill', 'agent-skills', 'askills', 'local-skills'],
+    description: 'Manage Agent-local skills',
     usage: '[list|enabled|attention|discover|import-discovered <name> --yes|search <query>|show <id>|create --name <name> --description <summary> --procedure <steps> [--requires-env A,B] [--requires-command gh,jq]|update <id> [--name ...] [--description ...] [--procedure ...]|enable <id>|disable <id>|review <id>|stale <id> <reason...>|delete <id> --yes|bundle ...]',
     handler: runAgentSkillsRuntimeCommand,
   });