@pellux/goodvibes-agent 0.1.117 → 1.0.1

package/src/agent/runtime-profile.ts

@@ -103,6 +103,10 @@ const PROFILE_CREATED_FILE = 'profile.json';
 const PROFILE_SELECTION_FILE = 'profile-selection.json';
 const PROFILE_ID_PATTERN = /^[a-z0-9](?:[a-z0-9._-]{0,62}[a-z0-9])?$/;
 
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+}
+
 export function normalizeAgentRuntimeProfileId(value: string): string {
   return value
     .trim()
@@ -149,12 +153,11 @@ export function readAgentRuntimeProfileSelection(baseHomeDirectory: string): Age
   if (!existsSync(path)) return null;
   try {
     const raw: unknown = JSON.parse(readFileSync(path, 'utf-8'));
-    if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return null;
-    const record = raw as Record<string, unknown>;
-    const profileId = record.profileId;
+    if (!isRecord(raw)) return null;
+    const profileId = raw.profileId;
     if (typeof profileId !== 'string') return null;
     const resolution = resolveAgentRuntimeProfileHome(baseHomeDirectory, profileId);
-    const selectedAt = typeof record.selectedAt === 'string' ? record.selectedAt : null;
+    const selectedAt = typeof raw.selectedAt === 'string' ? raw.selectedAt : null;
     return {
       ...resolution,
       selectedAt,
@@ -192,13 +195,11 @@ function readProfileStarterTemplate(homeDirectory: string): Pick<AgentRuntimePro
   if (!existsSync(path)) return {};
   try {
     const raw: unknown = JSON.parse(readFileSync(path, 'utf-8'));
-    if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return {};
-    const record = raw as Record<string, unknown>;
-    const starter = record.starterTemplate;
-    if (!starter || typeof starter !== 'object' || Array.isArray(starter)) return {};
-    const starterRecord = starter as Record<string, unknown>;
-    const id = starterRecord.id;
-    const name = starterRecord.name;
+    if (!isRecord(raw)) return {};
+    const starter = raw.starterTemplate;
+    if (!isRecord(starter)) return {};
+    const id = starter.id;
+    const name = starter.name;
     if (!isAgentRuntimeProfileTemplateId(id) || typeof name !== 'string') return {};
     return {
       starterTemplateId: id,
@@ -271,7 +272,7 @@ function selectDiscoveredRecord<T extends { readonly name: string; readonly path
   if (!selector?.trim()) return records[0]!;
   const lookup = selector.trim().toLowerCase();
   const match = records.find((record) => normalizedLookupValues(record.name, record.path).includes(lookup));
-  if (!match) throw new Error(`Unknown discovered Agent ${label}: ${selector}.`);
+  if (!match) throw new Error(`Unknown discovered Agent ${label} ${selector}.`);
   return match;
 }
 
@@ -323,8 +324,8 @@ function readTemplateTextBlock(value: unknown, field: string): string {
 }
 
 function readTemplateObject(value: unknown, field: string): Record<string, unknown> {
-  if (!value || typeof value !== 'object' || Array.isArray(value)) throw new Error(`Starter template ${field} must be an object.`);
-  return value as Record<string, unknown>;
+  if (!isRecord(value)) throw new Error(`Starter template ${field} must be an object.`);
+  return value;
 }
 
 function parseTemplateSkill(value: unknown): AgentRuntimeProfileStarterTemplate['skills'][number] {
@@ -405,7 +406,7 @@ function resolveAgentRuntimeProfileTemplate(templateId: AgentRuntimeProfileTempl
   const local = baseHomeDirectory ? listLocalTemplates(baseHomeDirectory).find((template) => template.id === id) : undefined;
   if (local) return local;
   const suffix = baseHomeDirectory ? ' Use profiles templates to list starters.' : '';
-  throw new Error(`Unknown Agent starter profile template: ${templateId}.${suffix}`);
+  throw new Error(`Unknown Agent starter profile template ${templateId}.${suffix}`);
 }
 
 export function listAgentRuntimeProfileTemplates(baseHomeDirectory?: string): readonly AgentRuntimeProfileTemplateSummary[] {
@@ -468,7 +469,7 @@ export async function createAgentRuntimeProfileTemplateFromDiscovered(
   const selectedRoutines = selectDiscoveredRecords(routines, options.routines, 'routine');
   const target = join(getAgentRuntimeProfileTemplatesRoot(shellPaths.homeDirectory), `${id}.json`);
   if (existsSync(target) && options.replace !== true) {
-    throw new Error(`Agent starter template already exists: ${id}. Rerun with --replace to overwrite it.`);
+    throw new Error(`Agent starter template already exists ${id}. Rerun with --replace to overwrite it.`);
   }
   const persona = discoveredPersonaToTemplate(selectedPersona);
   const template: AgentRuntimeProfileStarterTemplate = {
@@ -621,7 +622,7 @@ export function createAgentRuntimeProfile(baseHomeDirectory: string, profileName
 export function setAgentRuntimeProfileSelection(baseHomeDirectory: string, profileName: string): AgentRuntimeProfileSelection {
   const resolution = resolveAgentRuntimeProfileHome(baseHomeDirectory, profileName);
   if (!existsSync(resolution.homeDirectory)) {
-    throw new Error(`Agent profile not found: ${resolution.id}`);
+    throw new Error(`Agent profile not found ${resolution.id}`);
   }
   const path = getAgentRuntimeProfileSelectionPath(baseHomeDirectory);
   mkdirSync(dirname(path), { recursive: true });

package/src/agent/skill-registry.ts

@@ -3,6 +3,7 @@ import { delimiter, dirname, join } from 'node:path';
 import type { ShellPathService } from '@/runtime/index.ts';
 import { GOODVIBES_AGENT_SURFACE_ROOT } from '../config/surface.ts';
 import { assertNoSecretLikeText } from './persona-registry.ts';
+import { formatAgentRecordReviewState } from './record-labels.ts';
 
 export type AgentSkillSource = 'user' | 'agent' | 'imported' | 'system';
 export type AgentSkillReviewState = 'fresh' | 'reviewed' | 'stale';
@@ -153,10 +154,10 @@ function normalizeList(values: readonly string[] | undefined): string[] {
 
 function validateRequirementName(requirement: AgentSkillRequirement): void {
   if (requirement.kind === 'env' && !/^[A-Za-z_][A-Za-z0-9_]*$/.test(requirement.name)) {
-    throw new Error(`Invalid skill env requirement: ${requirement.name}`);
+    throw new Error(`Invalid skill env requirement ${requirement.name}`);
   }
   if (requirement.kind === 'command' && !/^[A-Za-z0-9._+-]+$/.test(requirement.name)) {
-    throw new Error(`Invalid skill command requirement: ${requirement.name}`);
+    throw new Error(`Invalid skill command requirement ${requirement.name}`);
   }
 }
 
@@ -375,9 +376,9 @@ export class AgentSkillRegistry {
     const procedure = input.procedure.trim();
     this.validateRequired(name, description, procedure);
     const requirements = normalizeRequirements(input.requirements);
-    assertNoSecretLikeText([name, description, procedure, ...(input.tags ?? []), ...(input.triggers ?? []), ...requirements.flatMap((requirement) => [requirement.name, requirement.description ?? ''])]);
+    assertNoSecretLikeText([name, description, procedure, ...(input.tags ?? []), ...(input.triggers ?? []), ...requirements.flatMap((requirement) => [requirement.name, requirement.description ?? ''])], 'Skills');
     const duplicate = store.skills.find((skill) => skill.name.toLowerCase() === name.toLowerCase());
-    if (duplicate) throw new Error(`Skill already exists: ${duplicate.id}`);
+    if (duplicate) throw new Error(`Skill already exists ${duplicate.id}`);
     const timestamp = nowIso();
     const skill: AgentSkillRecord = {
       id: this.nextId(name, store.skills),
@@ -404,9 +405,9 @@ export class AgentSkillRegistry {
     const description = input.description.trim();
     const skillIds = this.normalizeExistingSkillIds(store, input.skillIds);
     this.validateBundleRequired(name, description, skillIds);
-    assertNoSecretLikeText([name, description, ...skillIds]);
+    assertNoSecretLikeText([name, description, ...skillIds], 'Skill bundles');
     const duplicate = store.bundles.find((bundle) => bundle.name.toLowerCase() === name.toLowerCase());
-    if (duplicate) throw new Error(`Skill bundle already exists: ${duplicate.id}`);
+    if (duplicate) throw new Error(`Skill bundle already exists ${duplicate.id}`);
     const timestamp = nowIso();
     const bundle: AgentSkillBundleRecord = {
       id: this.nextBundleId(name, store.bundles),
@@ -427,15 +428,15 @@ export class AgentSkillRegistry {
   public update(idOrName: string, input: AgentSkillUpdateInput): AgentSkillRecord {
     const store = this.readStore();
     const existing = this.findInStore(store, idOrName);
-    if (!existing) throw new Error(`Unknown skill: ${idOrName}`);
+    if (!existing) throw new Error(`Unknown skill ${idOrName}`);
     const name = input.name === undefined ? existing.name : normalizeName(input.name);
     const description = input.description === undefined ? existing.description : input.description.trim();
     const procedure = input.procedure === undefined ? existing.procedure : input.procedure.trim();
     this.validateRequired(name, description, procedure);
     const requirements = input.requirements === undefined ? existing.requirements : normalizeRequirements(input.requirements);
-    assertNoSecretLikeText([name, description, procedure, ...(input.tags ?? []), ...(input.triggers ?? []), ...requirements.flatMap((requirement) => [requirement.name, requirement.description ?? ''])]);
+    assertNoSecretLikeText([name, description, procedure, ...(input.tags ?? []), ...(input.triggers ?? []), ...requirements.flatMap((requirement) => [requirement.name, requirement.description ?? ''])], 'Skills');
     const duplicate = store.skills.find((skill) => skill.id !== existing.id && skill.name.toLowerCase() === name.toLowerCase());
-    if (duplicate) throw new Error(`Skill already exists: ${duplicate.id}`);
+    if (duplicate) throw new Error(`Skill already exists ${duplicate.id}`);
     const updated: AgentSkillRecord = {
       ...existing,
       name,
@@ -460,14 +461,14 @@ export class AgentSkillRegistry {
   public updateBundle(idOrName: string, input: AgentSkillBundleUpdateInput): AgentSkillBundleRecord {
     const store = this.readStore();
     const existing = this.findBundleInStore(store, idOrName);
-    if (!existing) throw new Error(`Unknown skill bundle: ${idOrName}`);
+    if (!existing) throw new Error(`Unknown skill bundle ${idOrName}`);
     const name = input.name === undefined ? existing.name : normalizeName(input.name);
     const description = input.description === undefined ? existing.description : input.description.trim();
     const skillIds = input.skillIds === undefined ? existing.skillIds : this.normalizeExistingSkillIds(store, input.skillIds);
     this.validateBundleRequired(name, description, skillIds);
-    assertNoSecretLikeText([name, description, ...skillIds]);
+    assertNoSecretLikeText([name, description, ...skillIds], 'Skill bundles');
     const duplicate = store.bundles.find((bundle) => bundle.id !== existing.id && bundle.name.toLowerCase() === name.toLowerCase());
-    if (duplicate) throw new Error(`Skill bundle already exists: ${duplicate.id}`);
+    if (duplicate) throw new Error(`Skill bundle already exists ${duplicate.id}`);
     const updated: AgentSkillBundleRecord = {
       ...existing,
       name,
@@ -489,7 +490,7 @@ export class AgentSkillRegistry {
   public setEnabled(idOrName: string, enabled: boolean): AgentSkillRecord {
     const store = this.readStore();
     const existing = this.findInStore(store, idOrName);
-    if (!existing) throw new Error(`Unknown skill: ${idOrName}`);
+    if (!existing) throw new Error(`Unknown skill ${idOrName}`);
     const updated: AgentSkillRecord = { ...existing, enabled, updatedAt: nowIso() };
     this.writeStore({
       ...store,
@@ -501,7 +502,7 @@ export class AgentSkillRegistry {
   public setBundleEnabled(idOrName: string, enabled: boolean): AgentSkillBundleRecord {
     const store = this.readStore();
     const existing = this.findBundleInStore(store, idOrName);
-    if (!existing) throw new Error(`Unknown skill bundle: ${idOrName}`);
+    if (!existing) throw new Error(`Unknown skill bundle ${idOrName}`);
     const updated: AgentSkillBundleRecord = { ...existing, enabled, updatedAt: nowIso() };
     this.writeStore({
       ...store,
@@ -513,7 +514,7 @@ export class AgentSkillRegistry {
   public markReviewed(idOrName: string): AgentSkillRecord {
     const store = this.readStore();
     const existing = this.findInStore(store, idOrName);
-    if (!existing) throw new Error(`Unknown skill: ${idOrName}`);
+    if (!existing) throw new Error(`Unknown skill ${idOrName}`);
     const updated: AgentSkillRecord = {
       ...existing,
       reviewState: 'reviewed',
@@ -531,7 +532,7 @@ export class AgentSkillRegistry {
   public markBundleReviewed(idOrName: string): AgentSkillBundleRecord {
     const store = this.readStore();
     const existing = this.findBundleInStore(store, idOrName);
-    if (!existing) throw new Error(`Unknown skill bundle: ${idOrName}`);
+    if (!existing) throw new Error(`Unknown skill bundle ${idOrName}`);
     const updated: AgentSkillBundleRecord = {
       ...existing,
       reviewState: 'reviewed',
@@ -549,7 +550,7 @@ export class AgentSkillRegistry {
   public markStale(idOrName: string, reason: string): AgentSkillRecord {
     const store = this.readStore();
     const existing = this.findInStore(store, idOrName);
-    if (!existing) throw new Error(`Unknown skill: ${idOrName}`);
+    if (!existing) throw new Error(`Unknown skill ${idOrName}`);
     const updated: AgentSkillRecord = {
       ...existing,
       reviewState: 'stale',
@@ -566,7 +567,7 @@ export class AgentSkillRegistry {
   public markBundleStale(idOrName: string, reason: string): AgentSkillBundleRecord {
     const store = this.readStore();
     const existing = this.findBundleInStore(store, idOrName);
-    if (!existing) throw new Error(`Unknown skill bundle: ${idOrName}`);
+    if (!existing) throw new Error(`Unknown skill bundle ${idOrName}`);
     const updated: AgentSkillBundleRecord = {
       ...existing,
       reviewState: 'stale',
@@ -583,7 +584,7 @@ export class AgentSkillRegistry {
   public deleteSkill(idOrName: string): AgentSkillRecord {
     const store = this.readStore();
     const existing = this.findInStore(store, idOrName);
-    if (!existing) throw new Error(`Unknown skill: ${idOrName}`);
+    if (!existing) throw new Error(`Unknown skill ${idOrName}`);
     this.writeStore({
       ...store,
       skills: store.skills.filter((skill) => skill.id !== existing.id),
@@ -597,7 +598,7 @@ export class AgentSkillRegistry {
   public deleteBundle(idOrName: string): AgentSkillBundleRecord {
     const store = this.readStore();
     const existing = this.findBundleInStore(store, idOrName);
-    if (!existing) throw new Error(`Unknown skill bundle: ${idOrName}`);
+    if (!existing) throw new Error(`Unknown skill bundle ${idOrName}`);
     this.writeStore({
       ...store,
       bundles: store.bundles.filter((bundle) => bundle.id !== existing.id),
@@ -655,7 +656,7 @@ export class AgentSkillRegistry {
     const normalized = normalizeList(skillIds).map(slugify);
     const known = new Set(store.skills.map((skill) => skill.id));
     for (const skillId of normalized) {
-      if (!known.has(skillId)) throw new Error(`Unknown skill for bundle: ${skillId}`);
+      if (!known.has(skillId)) throw new Error(`Unknown skill for bundle ${skillId}`);
     }
     return normalized;
   }
@@ -665,7 +666,7 @@ export class AgentSkillRegistry {
     try {
       return parseStore(readFileSync(this.storePath, 'utf-8'));
     } catch (error) {
-      throw new Error(`Could not read Agent skill store: ${error instanceof Error ? error.message : String(error)}`);
+      throw new Error(`Could not read Agent skill store ${error instanceof Error ? error.message : String(error)}`);
     }
   }
 
@@ -768,7 +769,7 @@ export function buildEnabledSkillsPrompt(shellPaths: ShellPathService): string |
       return [
         `### Skill Bundle: ${bundle.name}`,
         `Description: ${bundle.description}`,
-        `Review state: ${bundle.reviewState}`,
+        `Review: ${formatAgentRecordReviewState(bundle.reviewState)}`,
         `Readiness: ${readiness.ready ? 'ready' : `missing ${missing.join(', ')}`}`,
         `Included skills: ${bundle.skillIds.join(', ')}`,
         '',
@@ -777,7 +778,7 @@ export function buildEnabledSkillsPrompt(shellPaths: ShellPathService): string |
     ...active.slice(0, 8).flatMap((skill) => [
       `### ${skill.name}`,
       `Description: ${skill.description}`,
-      `Review state: ${skill.reviewState}`,
+      `Review: ${formatAgentRecordReviewState(skill.reviewState)}`,
       `Triggers: ${skill.triggers.join(', ') || '(manual)'}`,
       `Readiness: ${evaluateAgentSkillReadiness(skill).ready ? 'ready' : `missing ${evaluateAgentSkillReadiness(skill).missing.map(formatAgentSkillRequirement).join(', ')}`}`,
       skill.procedure,

package/src/cli/agent-knowledge-args.ts

@@ -14,7 +14,7 @@ export function commandValues(args: readonly string[]): string[] {
 export function delegationTaskValues(args: readonly string[]): string[] {
   const values: string[] = [];
   for (const token of args) {
-    if (token === '--wrfc') continue;
+    if (token === '--review' || token === '--wrfc') continue;
     if (!token.startsWith('--')) values.push(token);
   }
   return values;
@@ -79,6 +79,10 @@ export function hasFlag(args: readonly string[], flag: string): boolean {
   return args.includes(flag);
 }
 
+export function hasAnyFlag(args: readonly string[], flags: readonly string[]): boolean {
+  return flags.some((flag) => args.includes(flag));
+}
+
 export function stripCommandFlag(args: readonly string[], flag: string): { readonly rest: readonly string[]; readonly present: boolean } {
   const rest: string[] = [];
   let present = false;

package/src/cli/agent-knowledge-command.ts

@@ -3,6 +3,7 @@ import type { CliCommandRuntime } from './management.ts';
 import {
   commandValues,
   delegationTaskValues,
+  hasAnyFlag,
   hasFlag,
   parseConnectorInput,
   readFirstStringList,
@@ -14,6 +15,7 @@ import {
 } from './agent-knowledge-args.ts';
 import {
   formatAsk,
+  formatAgentKnowledgeFailureKind,
   formatBatchIngest,
   formatConnector,
   formatConnectorDoctor,
@@ -30,7 +32,7 @@ import {
 import { AGENT_KNOWLEDGE_METHODS, DELEGATION_METHOD } from './agent-knowledge-methods.ts';
 import {
   createAgentSdk,
-  fetchDaemonStatus,
+  fetchConnectedHostStatus,
   findDisallowedKnowledgeScopeFlag,
   formatScopeFlagRejection,
   getAgentKnowledgeJson,
@@ -38,7 +40,7 @@ import {
   postAgentKnowledgeJson,
   readPackageMetadata,
   readString,
-  resolveDaemonConnection,
+  resolveConnectedHostConnection,
   runKnowledgeCall,
 } from './agent-knowledge-runtime.ts';
 import { formatJsonOrText, yesNo } from './management.ts';
@@ -47,23 +49,23 @@ interface DelegationResult {
   readonly sessionId: string;
   readonly message: unknown;
   readonly task: string;
-  readonly wrfcRequested: boolean;
+  readonly reviewRequested: boolean;
 }
 
-function buildDelegationBody(task: string, wrfcRequested: boolean): string {
+function buildDelegationBody(task: string, reviewRequested: boolean): string {
   return [
     'GoodVibes Agent explicit build delegation.',
     '',
-    'Original user ask:',
+    'Original user ask',
     task,
     '',
-    'Agent policy:',
+    'Agent policy',
     '- GoodVibes Agent is not the coding TUI.',
     '- Preserve the full original ask.',
-    '- GoodVibes TUI owns file edits, git/worktree flows, execution isolation UX, and any WRFC owner chain.',
-    wrfcRequested
-      ? '- WRFC was explicitly requested by the Agent user for this build/fix/review delegation.'
-      : '- WRFC was not explicitly requested; do not turn this into WRFC solely because it came from Agent.',
+    '- GoodVibes TUI owns file edits, git/worktree flows, execution isolation UX, and any delegated review owner chain.',
+    reviewRequested
+      ? '- Delegated review was explicitly requested by the Agent user for this build/fix/review handoff.'
+      : '- Delegated review was not explicitly requested; do not add review solely because this came from Agent.',
   ].join('\n');
 }
 
@@ -479,12 +481,12 @@ export async function handleAgentKnowledgeShortcutCommand(
 }
 
 export async function handleCompatCommand(runtime: CliCommandRuntime): Promise<CliCommandOutput> {
-  const connection = resolveDaemonConnection(runtime);
+  const connection = resolveConnectedHostConnection(runtime);
   const metadata = readPackageMetadata();
-  const daemon = await fetchDaemonStatus(connection);
-  const daemonRecord = isRecord(daemon.body) ? daemon.body : {};
-  const daemonVersion = readString(daemonRecord, 'version') ?? 'unknown';
-  const versionCompatible = daemon.ok && daemonVersion === metadata.sdkVersion;
+  const connectedHost = await fetchConnectedHostStatus(connection);
+  const connectedHostRecord = isRecord(connectedHost.body) ? connectedHost.body : {};
+  const connectedHostVersion = readString(connectedHostRecord, 'version') ?? 'unknown';
+  const versionCompatible = connectedHost.ok && connectedHostVersion === metadata.sdkVersion;
   const knowledgeRoute = await runKnowledgeCall(runtime, AGENT_KNOWLEDGE_METHODS.status, async (routeConnection) => (
     await createAgentSdk(routeConnection).knowledge.status()
   ));
@@ -495,9 +497,9 @@ export async function handleCompatCommand(runtime: CliCommandRuntime): Promise<C
     sdkPin: metadata.sdkVersion,
     connectedHost: {
       baseUrl: connection.baseUrl,
-      status: daemon.status,
-      version: daemonVersion,
-      reachable: daemon.ok,
+      status: connectedHost.status,
+      version: connectedHostVersion,
+      reachable: connectedHost.ok,
       compatible: versionCompatible,
     },
     auth: {
@@ -512,13 +514,13 @@ export async function handleCompatCommand(runtime: CliCommandRuntime): Promise<C
   };
   const text = [
     'GoodVibes Agent compatibility',
-    `  package: ${metadata.version}`,
-    `  SDK pin: ${metadata.sdkVersion}`,
-    `  runtime: ${daemonVersion} at ${connection.baseUrl} (${daemon.ok ? 'reachable' : 'unreachable'})`,
-    `  version compatible: ${yesNo(versionCompatible)}`,
-    `  operator token: ${connection.token ? 'present' : 'missing'} (${connection.tokenPath})`,
-    `  Agent knowledge route: ${knowledgeRouteReady ? 'ready' : `not ready (${knowledgeRoute.ok ? 'unknown' : knowledgeRoute.kind})`}`,
-    ...(versionCompatible ? [] : ['  next: update the connected GoodVibes host so /status matches the Agent SDK pin.']),
+    `  package ${metadata.version}`,
+    `  SDK pin ${metadata.sdkVersion}`,
+    `  connected host ${connectedHostVersion} at ${connection.baseUrl} (${connectedHost.ok ? 'reachable' : 'unreachable'})`,
+    `  version compatible ${yesNo(versionCompatible)}`,
+    `  operator token ${connection.token ? 'present' : 'missing'} (${connection.tokenPath})`,
+    `  Agent Knowledge route ${knowledgeRouteReady ? 'ready' : `not ready (${knowledgeRoute.ok ? 'unknown' : formatAgentKnowledgeFailureKind(knowledgeRoute.kind)})`}`,
+    ...(versionCompatible ? [] : ['  next update the connected GoodVibes host so /status matches the Agent SDK pin.']),
   ].join('\n');
   return {
     output: runtime.cli.flags.outputFormat === 'json' ? JSON.stringify(value, null, 2) : text,
@@ -527,11 +529,11 @@ export async function handleCompatCommand(runtime: CliCommandRuntime): Promise<C
 }
 
 export async function handleDelegateCommand(runtime: CliCommandRuntime): Promise<CliCommandOutput> {
-  const wrfcRequested = hasFlag(runtime.cli.commandArgs, '--wrfc');
+  const reviewRequested = hasAnyFlag(runtime.cli.commandArgs, ['--review', '--wrfc']);
   const task = delegationTaskValues(runtime.cli.commandArgs).join(' ').trim();
   if (!task) {
     return {
-      output: 'Usage: goodvibes-agent delegate [--wrfc] <build/fix/review task>',
+      output: 'Usage: goodvibes-agent delegate [--review] <build/fix/review task>',
       exitCode: 2,
     };
   }
@@ -548,10 +550,14 @@ export async function handleDelegateCommand(runtime: CliCommandRuntime): Promise
     if (!sessionId) throw new Error('sessions.create returned no session id.');
     const message = await sdk.operator.invoke('sessions.messages.create', {
       sessionId,
-      body: buildDelegationBody(task, wrfcRequested),
+      body: buildDelegationBody(task, reviewRequested),
       surfaceKind: 'goodvibes-agent',
       surfaceId: 'goodvibes-agent-cli',
       kind: 'task',
+      metadata: {
+        reviewRequested,
+        wrfcRequested: reviewRequested,
+      },
       routing: {
         executionIntent: {
           riskClass: 'elevated',
@@ -561,15 +567,15 @@ export async function handleDelegateCommand(runtime: CliCommandRuntime): Promise
         },
       },
     });
-    return { sessionId, message, task, wrfcRequested };
+    return { sessionId, message, task, reviewRequested };
   });
   if (!result.ok) return { output: formatFailure(result, runtime.cli.flags.outputFormat === 'json'), exitCode: 1 };
   const text = [
     'Delegation submitted to GoodVibes TUI/shared-session routes.',
-    `  session: ${result.data.sessionId}`,
-    `  mode: ${result.data.wrfcRequested ? 'WRFC requested' : 'direct build delegation'}`,
-    `  task: ${result.data.task}`,
-    '  next: check GoodVibes TUI shared-session/task status for the result.',
+    `  session ${result.data.sessionId}`,
+    `  mode ${result.data.reviewRequested ? 'delegated review requested' : 'direct build delegation'}`,
+    `  task ${result.data.task}`,
+    '  next check GoodVibes TUI shared-session/task status for the result.',
   ].join('\n');
   return {
     output: formatJsonOrText(runtime.cli)(result, text),