@pellux/goodvibes-agent 0.1.117 → 1.0.0

package/src/input/commands/qrcode-runtime.ts

@@ -2,14 +2,14 @@ import type { CommandRegistry } from '../command-registry.ts';
 import { networkInterfaces } from 'node:os';
 import {
   buildCompanionConnectionInfo,
+  type CompanionConnectionInfo,
   encodeConnectionPayload,
-  formatConnectionBlock,
   generateQrMatrix,
   renderQrToString,
 } from '@pellux/goodvibes-sdk/platform/pairing';
 import { GOODVIBES_AGENT_PAIRING_SURFACE } from '../../config/surface.ts';
 import { resolveRuntimeEndpointBinding } from '../../cli/endpoints.ts';
-import { connectedHostTokenRequiredMessage, readConnectedHostOperatorToken } from '../../runtime/connected-host-auth.ts';
+import { connectedHostOperatorTokenFingerprint, connectedHostTokenRequiredMessage, readConnectedHostOperatorToken } from '../../runtime/connected-host-auth.ts';
 import { requirePlatform, requireShellPaths } from './runtime-services.ts';
 
 function getLocalNetworkIp(): string {
@@ -31,13 +31,42 @@ function urlHostForBindHost(host: string): string {
   return host || '127.0.0.1';
 }
 
+function formatTokenLine(token: string, showToken: boolean): string {
+  if (showToken) return `Token:          ${token}`;
+  return `Token:          present sha256:${connectedHostOperatorTokenFingerprint(token)} (hidden in text; QR contains pairing payload)`;
+}
+
+function formatAgentPairingBlock(info: CompanionConnectionInfo, qr: string, showToken: boolean): string {
+  return [
+    `GoodVibes Agent companion pairing v${info.version}`,
+    '━━━━━━━━━━━━━━━━━━━━━━━━',
+    `Connected host: ${info.url}`,
+    `Surface:        ${info.surface}`,
+    `User:           ${info.username}`,
+    formatTokenLine(info.token, showToken),
+    '',
+    'Scan to connect:',
+    '',
+    qr,
+    '',
+    showToken
+      ? 'Manual token display was explicitly confirmed for this command.'
+      : 'For manual setup, rerun /pair --show-token --yes to print the token once.',
+    'Agent is waiting for the companion app to connect to the owning GoodVibes host.',
+  ].join('\n');
+}
+
+function shouldShowToken(args: readonly string[]): boolean {
+  return args.includes('--show-token') || args.includes('--manual-token');
+}
+
 export function registerQrcodeRuntimeCommands(registry: CommandRegistry): void {
   registry.register({
     name: 'qrcode',
     aliases: ['qr', 'pair'],
     description: 'Print companion pairing details and a QR code',
     usage: '',
-    handler(_args, ctx) {
+    handler(args, ctx) {
       const shellPaths = requireShellPaths(ctx);
       const configManager = requirePlatform(ctx).configManager;
       const tokenRecord = readConnectedHostOperatorToken(shellPaths.homeDirectory);
@@ -46,16 +75,26 @@ export function registerQrcodeRuntimeCommands(registry: CommandRegistry): void {
         return;
       }
       const binding = resolveRuntimeEndpointBinding(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,
       });
       const payload = encodeConnectionPayload(info);
       const qr = renderQrToString(generateQrMatrix(payload));
-      ctx.print([formatConnectionBlock(info, payload), '', qr].join('\n'));
+      const showToken = shouldShowToken(args);
+      if (showToken && !args.includes('--yes')) {
+        ctx.print([
+          'Manual companion token display requires confirmation.',
+          '  rerun: /pair --show-token --yes',
+          `  token fingerprint: sha256:${connectedHostOperatorTokenFingerprint(tokenRecord.token)}`,
+          '  QR pairing remains available without printing the raw token.',
+        ].join('\n'));
+        return;
+      }
+      ctx.print(formatAgentPairingBlock(info, qr, showToken));
     },
   });
 }

package/src/input/commands/recall-bundle.ts

@@ -31,7 +31,7 @@ export function handleRecallExport(args: string[], context: CommandContext): voi
   if (scopeIdx !== -1 && commandArgs[scopeIdx + 1]) {
     const scope = commandArgs[scopeIdx + 1];
     if (!isValidScope(scope)) {
-      context.print(`[memory] Unknown scope "${scope}". Valid: ${VALID_SCOPES.join(', ')}`);
+      context.print(`[memory] Unknown scope "${scope}". Valid values ${VALID_SCOPES.join(', ')}.`);
       return;
     }
     filter.scope = scope;
@@ -41,7 +41,7 @@ export function handleRecallExport(args: string[], context: CommandContext): voi
   if (clsIdx !== -1 && commandArgs[clsIdx + 1]) {
     const cls = commandArgs[clsIdx + 1];
     if (!isValidClass(cls)) {
-      context.print(`[memory] Unknown class "${cls}". Valid: ${VALID_CLASSES.join(', ')}`);
+      context.print(`[memory] Unknown class "${cls}". Valid values ${VALID_CLASSES.join(', ')}.`);
       return;
     }
     filter.cls = cls;
@@ -77,23 +77,23 @@ export async function handleRecallImport(args: string[], context: CommandContext
   try {
     bundle = JSON.parse(readFileSync(targetPath, 'utf-8')) as MemoryBundle;
   } catch (error) {
-    context.print(`[memory] Failed to read memory bundle: ${summarizeError(error)}`);
+    context.print(`[memory] Failed to read memory bundle ${summarizeError(error)}`);
     return;
   }
 
   const result = await memory.importBundle(bundle);
   context.print(`[memory] Imported bundle from ${targetPath}`);
-  context.print(`  Records: imported=${result.importedRecords} skipped=${result.skippedRecords}`);
-  context.print(`  Links:   imported=${result.importedLinks}`);
+  context.print(`  records imported=${result.importedRecords} skipped=${result.skippedRecords}`);
+  context.print(`  links imported=${result.importedLinks}`);
 }
 
 function inspectBundle(bundle: MemoryBundle): string {
   return [
     'Memory Handoff Review',
-    `  scope: ${bundle.scope}`,
-    `  records: ${bundle.recordCount}`,
-    `  links: ${bundle.linkCount}`,
-    `  exportedAt: ${new Date(bundle.exportedAt).toISOString()}`,
+    `  scope ${bundle.scope}`,
+    `  records ${bundle.recordCount}`,
+    `  links ${bundle.linkCount}`,
+    `  exportedAt ${new Date(bundle.exportedAt).toISOString()}`,
   ].join('\n');
 }
 
@@ -116,7 +116,7 @@ export function handleRecallHandoffExport(args: string[], context: CommandContex
   const scopeIdx = commandArgs.indexOf('--scope');
   const scopeRaw = scopeIdx !== -1 ? commandArgs[scopeIdx + 1] : 'team';
   if (!scopeRaw || !isValidScope(scopeRaw)) {
-    context.print(`[memory] Unknown scope "${scopeRaw ?? ''}". Valid: ${VALID_SCOPES.join(', ')}`);
+    context.print(`[memory] Unknown scope "${scopeRaw ?? ''}". Valid values ${VALID_SCOPES.join(', ')}.`);
     return;
   }
   const bundle = memory.exportBundle({ scope: scopeRaw });
@@ -137,7 +137,7 @@ export function handleRecallHandoffInspect(args: string[], context: CommandConte
     const bundle = JSON.parse(readFileSync(targetPath, 'utf-8')) as MemoryBundle;
     context.print(inspectBundle(bundle));
   } catch (error) {
-    context.print(`[memory] Failed to inspect handoff bundle: ${summarizeError(error)}`);
+    context.print(`[memory] Failed to inspect handoff bundle ${summarizeError(error)}`);
   }
 }
 

package/src/input/commands/recall-capture.ts

@@ -1,5 +1,6 @@
 import type { CommandContext } from '../command-registry.ts';
 import type { ProvenanceLink } from '@pellux/goodvibes-sdk/platform/state';
+import { formatAgentRecordReferences } from '../../agent/record-labels.ts';
 import {
   buildIncidentMemoryAddOptions,
   buildMcpSecurityMemoryAddOptions,
@@ -17,7 +18,7 @@ export async function handleRecallAdd(args: string[], context: CommandContext):
 
   const cls = args[0];
   if (!cls || !isValidClass(cls)) {
-    context.print(`[memory] Invalid class "${cls ?? ''}". Valid: ${VALID_CLASSES.join(', ')}`);
+    context.print(`[memory] Invalid class "${cls ?? ''}". Valid values ${VALID_CLASSES.join(', ')}.`);
     return;
   }
 
@@ -36,7 +37,7 @@ export async function handleRecallAdd(args: string[], context: CommandContext):
   const scope = scopeRaw && isValidScope(scopeRaw) ? scopeRaw : 'project';
 
   if (scopeRaw && !isValidScope(scopeRaw)) {
-    context.print(`[memory] Invalid scope "${scopeRaw}". Valid: ${VALID_SCOPES.join(', ')}`);
+    context.print(`[memory] Invalid scope "${scopeRaw}". Valid values ${VALID_SCOPES.join(', ')}.`);
     return;
   }
 
@@ -60,12 +61,13 @@ export async function handleRecallAdd(args: string[], context: CommandContext):
   }
 
   const record = await memory.add({ scope, cls, summary, detail, tags, provenance });
-  context.print(`[memory] Added ${cls}: ${record.id}`);
-  context.print(`  Scope:   ${record.scope}`);
-  context.print(`  Summary: ${record.summary}`);
-  if (record.tags.length) context.print(`  Tags: ${record.tags.join(', ')}`);
+  context.print(`[memory] Added ${cls}`);
+  context.print(`  id ${record.id}`);
+  context.print(`  scope ${record.scope}`);
+  context.print(`  summary ${record.summary}`);
+  if (record.tags.length) context.print(`  tags ${record.tags.join(', ')}`);
   if (record.provenance.length) {
-    context.print(`  Provenance: ${record.provenance.map((entry) => `${entry.kind}:${entry.ref}`).join(', ')}`);
+    context.print(`  origin ${formatAgentRecordReferences(record.provenance)}`);
   }
 }
 
@@ -87,12 +89,12 @@ export async function handleRecallCapture(args: string[], context: CommandContex
       ? context.extensions.forensicsRegistry.latest()
       : context.extensions.forensicsRegistry.getById(requestedId);
     if (!report) {
-      context.print(`[memory] Incident not found: ${requestedId ?? 'latest'}`);
+      context.print(`[memory] Incident not found ${requestedId ?? 'latest'}`);
       return;
     }
     const bundle = context.extensions.forensicsRegistry.buildBundle(report.id);
     if (!bundle) {
-      context.print(`[memory] Failed to build incident bundle: ${report.id}`);
+      context.print(`[memory] Failed to build incident bundle ${report.id}`);
       return;
     }
     const record = await memory.add(buildIncidentMemoryAddOptions(bundle));
@@ -119,7 +121,7 @@ export async function handleRecallCapture(args: string[], context: CommandContex
     }
     const server = context.extensions.mcpRegistry.listServerSecurity().find((entry) => entry.name === serverName);
     if (!server) {
-      context.print(`[memory] MCP server not found: ${serverName}`);
+      context.print(`[memory] MCP server not found ${serverName}`);
       return;
     }
     const record = await memory.add(buildMcpSecurityMemoryAddOptions(server));
@@ -139,7 +141,7 @@ export async function handleRecallCapture(args: string[], context: CommandContex
     }
     const plugin = pluginManager.list().find((entry) => entry.name === pluginName);
     if (!plugin) {
-      context.print(`[memory] Plugin not found: ${pluginName}`);
+      context.print(`[memory] Plugin not found ${pluginName}`);
       return;
     }
     const quarantineReason = pluginManager.getQuarantineRecord(plugin.name)?.reason;

package/src/input/commands/recall-query.ts

@@ -1,6 +1,7 @@
 import type { CommandContext } from '../command-registry.ts';
 import type { MemoryApi } from '@pellux/goodvibes-sdk/platform/knowledge';
 import type { MemorySearchFilter } from '@pellux/goodvibes-sdk/platform/state';
+import { formatAgentRecordReference, formatAgentRecordReferences } from '../../agent/record-labels.ts';
 import { VALID_CLASSES, VALID_SCOPES, isValidClass, isValidScope } from './recall-shared.ts';
 import { requireYesFlag, stripYesFlag } from './confirmation.ts';
 
@@ -8,7 +9,7 @@ export function getMemoryApi(context: CommandContext): MemoryApi | null {
   const memoryApi = context.clients?.agentKnowledgeApi?.memory;
   if (!memoryApi) {
     context.print('[memory] Agent Memory API is not available in this runtime.');
-    context.print('[memory] Refusing to use default Knowledge/Wiki or non-Agent knowledge fallback.');
+    context.print('[memory] Refusing to use default knowledge or non-Agent knowledge fallback.');
     return null;
   }
   return memoryApi;
@@ -29,7 +30,7 @@ export function handleRecallSearch(args: string[], context: CommandContext): voi
     const cls = args[clsIdx + 1];
     if (isValidClass(cls)) filter.cls = cls;
     else {
-      context.print(`[memory] Unknown class "${cls}". Valid: ${VALID_CLASSES.join(', ')}`);
+      context.print(`[memory] Unknown class "${cls}". Valid values ${VALID_CLASSES.join(', ')}.`);
       return;
     }
   }
@@ -39,7 +40,7 @@ export function handleRecallSearch(args: string[], context: CommandContext): voi
     const scope = args[scopeIdx + 1];
     if (isValidScope(scope)) filter.scope = scope;
     else {
-      context.print(`[memory] Unknown scope "${scope}". Valid: ${VALID_SCOPES.join(', ')}`);
+      context.print(`[memory] Unknown scope "${scope}". Valid values ${VALID_SCOPES.join(', ')}.`);
       return;
     }
   }
@@ -63,7 +64,7 @@ export function handleRecallSearch(args: string[], context: CommandContext): voi
     return;
   }
 
-  context.print(`[memory] ${results.length} ${semantic ? 'semantic ' : ''}record(s):`);
+  context.print(`[memory] ${results.length} ${semantic ? 'semantic ' : ''}record(s)`);
   for (const record of results) {
     const semanticEntry = semanticResults.find((entry) => entry.record.id === record.id);
     const ts = new Date(record.createdAt).toISOString().slice(0, 16).replace('T', ' ');
@@ -72,7 +73,7 @@ export function handleRecallSearch(args: string[], context: CommandContext): voi
     context.print(`  ${record.id}  [${record.cls}]${tagStr}  ${ts}${scoreStr}`);
     context.print(`    ${record.summary}`);
     if (record.provenance.length) {
-      context.print(`    via: ${record.provenance.map((entry) => `${entry.kind}:${entry.ref}`).join(', ')}`);
+      context.print(`    origin ${formatAgentRecordReferences(record.provenance)}`);
     }
   }
 }
@@ -124,29 +125,28 @@ export function handleRecallGet(args: string[], context: CommandContext): void {
   }
   const record = memory.get(id);
   if (!record) {
-    context.print(`[memory] Record not found: ${id}`);
+    context.print(`[memory] Record not found ${id}`);
     return;
   }
   const ts = new Date(record.createdAt).toISOString().slice(0, 19).replace('T', ' ');
   context.print(`[memory] ${record.id}`);
-  context.print(`  Scope:   ${record.scope}`);
-  context.print(`  Class:   ${record.cls}`);
-  context.print(`  Summary: ${record.summary}`);
-  if (record.detail) context.print(`  Detail:  ${record.detail}`);
-  if (record.tags.length) context.print(`  Tags:    ${record.tags.join(', ')}`);
-  context.print(`  Created: ${ts}`);
+  context.print(`  scope ${record.scope}`);
+  context.print(`  class ${record.cls}`);
+  context.print(`  summary ${record.summary}`);
+  if (record.detail) context.print(`  detail ${record.detail}`);
+  if (record.tags.length) context.print(`  tags ${record.tags.join(', ')}`);
+  context.print(`  created ${ts}`);
 
   if (record.provenance.length) {
-    context.print('  Provenance:');
+    context.print('  origin');
     for (const provenance of record.provenance) {
-      const label = provenance.label ? ` (${provenance.label})` : '';
-      context.print(`    ${provenance.kind}: ${provenance.ref}${label}`);
+      context.print(`    ${formatAgentRecordReference(provenance)}`);
     }
   }
 
   const links = memory.linksFor(id);
   if (links.length) {
-    context.print('  Links:');
+    context.print('  links');
     for (const link of links) {
       const dir = link.fromId === id ? '->' : '<-';
       const other = link.fromId === id ? link.toId : link.fromId;
@@ -175,7 +175,12 @@ export async function handleRecallLink(args: string[], context: CommandContext):
     context.print('[memory] Link failed — check that both IDs exist.');
     return;
   }
-  context.print(`[memory] Linked: ${fromId} -> ${toId} [${relation}]`);
+  context.print([
+    '[memory] Linked',
+    `  from ${fromId}`,
+    `  to ${toId}`,
+    `  relation ${relation}`,
+  ].join('\n'));
 }
 
 export function handleRecallRemove(args: string[], context: CommandContext): void {
@@ -195,10 +200,13 @@ export function handleRecallRemove(args: string[], context: CommandContext): voi
   }
   const removed = memory.delete(id);
   if (!removed) {
-    context.print(`[memory] Record not found: ${id}`);
+    context.print(`[memory] Record not found ${id}`);
     return;
   }
-  context.print(`[memory] Deleted: ${id}`);
+  context.print([
+    '[memory] Deleted',
+    `  id ${id}`,
+  ].join('\n'));
 }
 
 export function handleRecallList(args: string[], context: CommandContext): void {
@@ -213,7 +221,7 @@ export function handleRecallList(args: string[], context: CommandContext): void
   if (scopeIdx !== -1 && args[scopeIdx + 1]) {
     const scope = args[scopeIdx + 1];
     if (!isValidScope(scope)) {
-      context.print(`[memory] Unknown scope "${scope}". Valid: ${VALID_SCOPES.join(', ')}`);
+      context.print(`[memory] Unknown scope "${scope}". Valid values ${VALID_SCOPES.join(', ')}.`);
       return;
     }
     filter.scope = scope;
@@ -232,7 +240,7 @@ export function handleRecallList(args: string[], context: CommandContext): void
   }
 
   for (const [clsName, group] of Object.entries(grouped)) {
-    context.print(`\n[memory] ${clsName.toUpperCase()} (${group.length}):`);
+    context.print(`\n[memory] ${clsName.toUpperCase()} (${group.length})`);
     for (const record of group) {
       const tagStr = record.tags.length ? ` [${record.tags.join(', ')}]` : '';
       context.print(`  ${record.id} [${record.scope}]${tagStr}  ${record.summary}`);

package/src/input/commands/recall-review.ts

@@ -1,4 +1,5 @@
 import type { CommandContext } from '../command-registry.ts';
+import { formatAgentRecordReviewState } from '../../agent/record-labels.ts';
 import { VALID_REVIEW_STATES, VALID_SCOPES, isValidReviewState, isValidScope } from './recall-shared.ts';
 import { getMemoryApi } from './recall-query.ts';
 import { requireYesFlag, stripYesFlag } from './confirmation.ts';
@@ -17,7 +18,7 @@ export function handleRecallQueue(args: string[], context: CommandContext): void
   context.print(`[memory] Review queue (${queue.length}):`);
   for (const record of queue) {
     const reason = record.staleReason ? ` — ${record.staleReason}` : '';
-    context.print(`  ${record.id} [${record.scope}/${record.cls}] ${record.reviewState} ${record.confidence}%  ${record.summary}${reason}`);
+    context.print(`  ${record.id} [${record.scope}/${record.cls}] ${formatAgentRecordReviewState(record.reviewState)} ${record.confidence}%  ${record.summary}${reason}`);
   }
 }
 

package/src/input/commands/routines-runtime.ts

@@ -1,10 +1,11 @@
 import { discoverRoutines, type DiscoveredRoutineRecord } from '../../agent/routine-discovery.ts';
 import { AgentRoutineRegistry, evaluateAgentRoutineReadiness, type AgentRoutineRecord } from '../../agent/routine-registry.ts';
+import { formatAgentRecordOrigin, formatAgentRecordReviewState } from '../../agent/record-labels.ts';
 import { buildAgentSkillRequirements, formatAgentSkillRequirement } from '../../agent/skill-registry.ts';
 import {
   buildRoutineSchedulePreview,
-  promoteRoutineToDaemonSchedule,
-  resolveAgentDaemonConnection,
+  promoteRoutineToConnectedSchedule,
+  resolveAgentConnectedHostConnection,
 } from '../../agent/routine-schedule-promotion.ts';
 import { parseRoutineSchedulePromotionArgs } from '../../agent/routine-schedule-args.ts';
 import {
@@ -73,12 +74,23 @@ function requiredFlag(flags: ReadonlyMap<string, string>, key: string): string {
   return value;
 }
 
+function formatRoutineReceipt(title: string, routine: Pick<AgentRoutineRecord, 'id' | 'name'>, extra: readonly string[] = []): string {
+  const enabled = extra.some((line) => line.trim() === 'enabled yes');
+  return [
+    `${title} ${routine.id}: ${routine.name}${enabled ? ' (enabled)' : ''}`,
+    `  id ${routine.id}`,
+    `  name ${routine.name}`,
+    ...extra,
+  ].join('\n');
+}
+
 function summarizeRoutine(routine: AgentRoutineRecord): string {
   const enabled = routine.enabled ? 'enabled' : 'disabled';
-  const tags = routine.tags.length > 0 ? ` tags=${routine.tags.join(',')}` : '';
+  const tags = routine.tags.length > 0 ? ` tags ${routine.tags.join(', ')}` : '';
   const readiness = evaluateAgentRoutineReadiness(routine);
+  const review = formatAgentRecordReviewState(routine.reviewState);
   const ready = readiness.ready ? 'ready' : `needs ${readiness.missing.map(formatAgentSkillRequirement).join(',')}`;
-  return `  ${routine.id}  ${enabled}  ${routine.reviewState}  ${ready}  starts=${routine.startCount}  ${routine.name} - ${routine.description}${tags}`;
+  return `  ${routine.id}  ${enabled}  ${review}  ${ready}  starts ${routine.startCount}  ${routine.name} - ${routine.description}${tags}`;
 }
 
 function renderList(title: string, registry: AgentRoutineRegistry, routines: readonly AgentRoutineRecord[], emptyMessage?: string): string {
@@ -86,12 +98,12 @@ function renderList(title: string, registry: AgentRoutineRegistry, routines: rea
   if (routines.length === 0) {
     return emptyMessage
       ? `${title}\n  ${emptyMessage}`
-      : `${title}\n  No local Agent routines yet. Create one with /routines create --name <name> --description <summary> --steps <steps>.`;
+      : `${title}\n  No local Agent routines yet.\n  No Agent-local routines yet. Create one with /routines create --name <name> --description <summary> --steps <steps>.`;
   }
   return [
     `${title} (${routines.length})`,
-    `  store: ${snapshot.path}`,
-    `  enabled: ${snapshot.enabledRoutines.length}`,
+    `  store ${snapshot.path}`,
+    `  enabled ${snapshot.enabledRoutines.length}`,
     ...routines.map(summarizeRoutine),
   ].join('\n');
 }
@@ -100,20 +112,19 @@ function renderRoutine(routine: AgentRoutineRecord): string {
   const readiness = evaluateAgentRoutineReadiness(routine);
   return [
     `Routine ${routine.name}`,
-    `  id: ${routine.id}`,
-    `  enabled: ${routine.enabled ? 'yes' : 'no'}`,
+    `  id ${routine.id}`,
+    `  enabled ${routine.enabled ? 'yes' : 'no'}`,
     `  readiness: ${readiness.ready ? 'ready' : 'needs setup'}`,
-    `  requirements: ${routine.requirements.map(formatAgentSkillRequirement).join(', ') || '(none)'}`,
+    `  requirements ${routine.requirements.map(formatAgentSkillRequirement).join(', ') || '(none)'}`,
     readiness.missing.length > 0 ? `  missing: ${readiness.missing.map(formatAgentSkillRequirement).join(', ')}` : '',
-    `  review: ${routine.reviewState}`,
-    `  source: ${routine.source}`,
-    `  provenance: ${routine.provenance}`,
+    `  review ${formatAgentRecordReviewState(routine.reviewState)}`,
+    `  origin ${formatAgentRecordOrigin(routine.source, routine.provenance)}`,
     `  tags: ${routine.tags.join(', ') || '(none)'}`,
     `  triggers: ${routine.triggers.join(', ') || '(manual)'}`,
-    `  started: ${routine.startCount}${routine.lastStartedAt ? `; last ${routine.lastStartedAt}` : ''}`,
-    `  created: ${routine.createdAt}`,
-    `  updated: ${routine.updatedAt}`,
-    routine.staleReason ? `  stale reason: ${routine.staleReason}` : '',
+    `  started ${routine.startCount}${routine.lastStartedAt ? `; last ${routine.lastStartedAt}` : ''}`,
+    `  created ${routine.createdAt}`,
+    `  updated ${routine.updatedAt}`,
+    routine.staleReason ? `  stale reason ${routine.staleReason}` : '',
     '',
     routine.description,
     '',
@@ -123,7 +134,7 @@ function renderRoutine(routine: AgentRoutineRecord): string {
 
 function summarizeDiscoveredRoutine(routine: DiscoveredRoutineRecord): string {
   const description = routine.description ? ` - ${routine.description}` : '';
-  return `  ${routine.name}  ${routine.origin}${description}\n    path: ${routine.path}`;
+  return `  ${routine.name}  ${routine.origin}${description}\n    path ${routine.path}`;
 }
 
 function renderDiscoveredRoutines(routines: readonly DiscoveredRoutineRecord[]): string {
@@ -169,7 +180,10 @@ function frontmatterAnyList(routine: DiscoveredRoutineRecord, keys: readonly str
 }
 
 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'));
 }
 
 async function importDiscoveredRoutine(args: readonly string[], ctx: CommandContext, routineRegistry: AgentRoutineRegistry): Promise<void> {
@@ -181,18 +195,18 @@ async function importDiscoveredRoutine(args: readonly string[], ctx: CommandCont
   }
   const discovered = findDiscoveredRoutine(await discoverRoutines(requireShellPaths(ctx)), name);
   if (!discovered) {
-    ctx.print(`Unknown discovered Agent routine: ${name}\nRun /routines discover to inspect available routine files.`);
+    ctx.print(`Unknown discovered Agent routine ${name}\nRun /routines discover to inspect available routine files.`);
     return;
   }
   if (!parsed.yes) {
     ctx.print([
       'Agent routine import preview',
-      `  name: ${discovered.name}`,
-      `  origin: ${discovered.origin}`,
-      `  path: ${discovered.path}`,
-      `  description: ${discovered.description || '(none)'}`,
-      `  steps characters: ${discovered.steps.length}`,
-      '  next: rerun with --yes to import into the Agent-local routine registry',
+      `  name ${discovered.name}`,
+      `  origin ${discovered.origin}`,
+      `  path ${discovered.path}`,
+      `  description ${discovered.description || '(none)'}`,
+      `  steps characters ${discovered.steps.length}`,
+      '  next rerun with --yes to import into the Agent-local routine registry',
     ].join('\n'));
     return;
   }
@@ -210,7 +224,7 @@ async function importDiscoveredRoutine(args: readonly string[], ctx: CommandCont
     source: 'imported',
     provenance: `discovered:${discovered.origin}:${discovered.path}`,
   });
-  ctx.print(`Imported Agent routine ${routine.id}: ${routine.name}${routine.enabled ? ' (enabled)' : ''}`);
+  ctx.print(formatRoutineReceipt('Imported Agent routine', routine, [`  enabled ${routine.enabled ? 'yes' : 'no'}`]));
 }
 
 async function promoteRoutine(args: readonly string[], routineRegistry: AgentRoutineRegistry, ctx: CommandContext): Promise<void> {
@@ -233,8 +247,8 @@ async function promoteRoutine(args: readonly string[], routineRegistry: AgentRou
     return;
   }
   const shellPaths = requireShellPaths(ctx);
-  const connection = resolveAgentDaemonConnection(ctx.platform.configManager, shellPaths.homeDirectory);
-  const result = await promoteRoutineToDaemonSchedule(connection, preview);
+  const connection = resolveAgentConnectedHostConnection(ctx.platform.configManager, shellPaths.homeDirectory);
+  const result = await promoteRoutineToConnectedSchedule(connection, preview);
   const receipt = receiptStoreFromContext(ctx).append(connection, preview, result);
   ctx.print(result.ok ? `${formatRoutineScheduleSuccess(result)}\n  receipt: ${receipt.id}` : `${formatRoutineScheduleFailure(result)}\n  receipt: ${receipt.id}`);
 }
@@ -254,7 +268,7 @@ export async function runRoutinesRuntimeCommand(args: readonly string[], ctx: Co
     }
     if (sub === 'attention' || sub === 'needs-setup') {
       const routines = routineRegistry.list().filter((routine) => !evaluateAgentRoutineReadiness(routine).ready);
-      ctx.print(renderList('Agent Routines needing setup', routineRegistry, routines, 'No local Agent routines need setup.'));
+      ctx.print(renderList('Agent Routines needing setup', routineRegistry, routines, 'No Agent-local routines need setup.'));
       return;
     }
     if (sub === 'discover' || sub === 'discovered') {
@@ -286,7 +300,7 @@ export async function runRoutinesRuntimeCommand(args: readonly string[], ctx: Co
     }
     if (sub === 'reconcile' || sub === 'sync' || sub === 'status') {
       const shellPaths = requireShellPaths(ctx);
-      const connection = resolveAgentDaemonConnection(ctx.platform.configManager, shellPaths.homeDirectory);
+      const connection = resolveAgentConnectedHostConnection(ctx.platform.configManager, shellPaths.homeDirectory);
       const result = await reconcileRoutineScheduleReceipts(connection, receiptStoreFromContext(ctx).snapshot());
       ctx.print(formatRoutineScheduleCorrelation(result));
       return;
@@ -298,7 +312,7 @@ export async function runRoutinesRuntimeCommand(args: readonly string[], ctx: Co
         return;
       }
       const receipt = receiptStoreFromContext(ctx).get(id);
-      ctx.print(receipt ? formatRoutineScheduleReceipt(receipt) : `Unknown routine schedule receipt: ${id}`);
+      ctx.print(receipt ? formatRoutineScheduleReceipt(receipt) : `Unknown routine schedule receipt ${id}`);
       return;
     }
     if (sub === 'create') {
@@ -316,9 +330,9 @@ export async function runRoutinesRuntimeCommand(args: readonly string[], ctx: Co
         }),
         enabled: parsed.flags.get('enabled') === 'true',
         source: 'user',
-        provenance: 'slash-command',
+        provenance: 'Command',
       });
-      ctx.print(`Created Agent routine ${routine.id}: ${routine.name}`);
+      ctx.print(formatRoutineReceipt('Created Agent routine', routine));
       return;
     }
     if (sub === 'update') {
@@ -340,9 +354,9 @@ export async function runRoutinesRuntimeCommand(args: readonly string[], ctx: Co
             commands: splitList(parsed.flags.get('requires-command') ?? parsed.flags.get('requires-commands')),
           })
           : undefined,
-        provenance: 'slash-command',
+        provenance: 'Command',
       });
-      ctx.print(`Updated Agent routine ${updated.id}: ${updated.name}`);
+      ctx.print(formatRoutineReceipt('Updated Agent routine', updated));
       return;
     }
     if (sub === 'enable' || sub === 'disable') {
@@ -352,7 +366,7 @@ export async function runRoutinesRuntimeCommand(args: readonly string[], ctx: Co
         return;
       }
       const routine = routineRegistry.setEnabled(id, sub === 'enable');
-      ctx.print(`${sub === 'enable' ? 'Enabled' : 'Disabled'} Agent routine ${routine.id}: ${routine.name}`);
+      ctx.print(formatRoutineReceipt(`${sub === 'enable' ? 'Enabled' : 'Disabled'} Agent routine`, routine));
       return;
     }
     if (sub === 'start' || sub === 'run') {
@@ -364,9 +378,11 @@ export async function runRoutinesRuntimeCommand(args: readonly string[], ctx: Co
       const routine = routineRegistry.markStarted(id);
       const readiness = evaluateAgentRoutineReadiness(routine);
       ctx.print([
-        `Started Agent routine ${routine.id}: ${routine.name}`,
+        `Started Agent routine ${routine.id}`,
+        `  id ${routine.id}`,
+        `  name ${routine.name}`,
         `  readiness: ${readiness.ready ? 'ready' : `needs setup (${readiness.missing.map(formatAgentSkillRequirement).join(', ')})`}`,
-        '  policy: same main conversation; no hidden job, runtime mutation, or external side effect was started',
+        '  policy same main conversation; no hidden job, runtime mutation, or external side effect was started',
         '',
         routine.steps,
       ].join('\n'));
@@ -379,7 +395,7 @@ export async function runRoutinesRuntimeCommand(args: readonly string[], ctx: Co
         return;
       }
       const routine = routineRegistry.markReviewed(id);
-      ctx.print(`Reviewed Agent routine ${routine.id}.`);
+      ctx.print(formatRoutineReceipt('Reviewed Agent routine', routine));
       return;
     }
     if (sub === 'stale') {
@@ -389,7 +405,7 @@ export async function runRoutinesRuntimeCommand(args: readonly string[], ctx: Co
         return;
       }
       const routine = routineRegistry.markStale(id, args.slice(2).join(' '));
-      ctx.print(`Marked Agent routine ${routine.id} stale.`);
+      ctx.print(formatRoutineReceipt('Marked Agent routine stale', routine));
       return;
     }
     if (sub === 'promote' || sub === 'schedule' || sub === 'promote-schedule') {
@@ -408,7 +424,7 @@ export async function runRoutinesRuntimeCommand(args: readonly string[], ctx: Co
         return;
       }
       const removed = routineRegistry.deleteRoutine(id);
-      ctx.print(`Deleted Agent routine ${removed.id}: ${removed.name}`);
+      ctx.print(formatRoutineReceipt('Deleted Agent routine', removed));
       return;
     }
     ctx.print('Usage: /routines [list|enabled|attention|discover|import-discovered|search|show|receipts|reconcile|receipt|create|update|enable|disable|start|review|stale|promote|delete]');
@@ -421,7 +437,7 @@ export function registerRoutinesRuntimeCommands(registry: CommandRegistry): void
   registry.register({
     name: 'routines',
     aliases: ['routine'],
-    description: 'Manage local GoodVibes Agent routines',
+    description: 'Manage Agent-local routines',
     usage: '[list|enabled|attention|discover|import-discovered <name> --yes|search <query>|show <id>|receipts|reconcile|receipt <id>|create --name <name> --description <summary> --steps <steps> [--requires-env A,B] [--requires-command gh,jq]|update <id> [--name ...] [--description ...] [--steps ...]|enable <id>|disable <id>|start <id>|review <id>|stale <id> <reason...>|promote <id> --cron <expr> [--delivery-channel slack] --yes|delete <id> --yes]',
     handler: runRoutinesRuntimeCommand,
   });