@hecer/yoke 1.11.0 → 1.13.0

package/dist/agents/telemetry.js

@@ -12,6 +12,13 @@ function parseJson(value) {
 function isRecord(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
+function textContent(value) {
+    if (typeof value === 'string')
+        return value;
+    if (!Array.isArray(value))
+        return '';
+    return value.filter(isRecord).filter(part => part.type === 'text' && typeof part.text === 'string').map(part => part.text).join('');
+}
 function directMachineResult(value) {
     return isRecord(value) && value.schemaVersion === 1 ? value : undefined;
 }
@@ -22,6 +29,8 @@ export function parseProviderResult(agent, output) {
         if (direct !== undefined)
             return direct;
     }
+    if (agent === 'qwen')
+        return parseQwenResult(output);
     const fragments = [];
     for (const line of output.split(/\r?\n/u)) {
         const parsed = parseJson(line);
@@ -45,9 +54,19 @@ export function parseProviderResult(agent, output) {
                 if (event.type === 'message' && event.role === 'assistant' && typeof event.content === 'string')
                     fragments.push(event.content);
                 break;
-            case 'qwen':
-                if (event.type === 'message' && event.role === 'assistant' && typeof event.content === 'string')
-                    fragments.push(event.content);
+            case 'opencode':
+            case 'kilo': {
+                const part = isRecord(event.part) ? event.part : undefined;
+                if (event.type === 'text' && typeof part?.text === 'string')
+                    fragments.push(part.text);
+                break;
+            }
+            case 'pi':
+                if (event.type === 'message_end' && isRecord(event.message) && event.message.role === 'assistant') {
+                    const text = textContent(event.message.content);
+                    if (text)
+                        fragments.push(text);
+                }
                 break;
         }
     }
@@ -67,6 +86,34 @@ export function parseProviderResult(agent, output) {
     }
     return null;
 }
+/** Qwen uses assistant content blocks and result envelopes, not Gemini messages. */
+function parseQwenResult(output) {
+    let candidate = null;
+    for (const line of output.split(/\r?\n/u)) {
+        const parsed = parseJson(line);
+        if (!parsed.ok || !isRecord(parsed.value))
+            continue;
+        const event = parsed.value;
+        if (event.parent_tool_use_id != null)
+            continue;
+        if (event.type === 'result') {
+            if (event.is_error === true) {
+                candidate = null;
+                continue;
+            }
+            const structured = directMachineResult(event.structured_result);
+            const result = typeof event.result === 'string' ? parseJson(event.result) : { ok: false };
+            candidate = structured ?? (result.ok ? directMachineResult(result.value) : undefined) ?? null;
+        }
+        else if (event.type === 'assistant' && isRecord(event.message) && Array.isArray(event.message.content)) {
+            const text = event.message.content.filter(isRecord).filter(part => part.type === 'text' && typeof part.text === 'string').map(part => part.text).join('');
+            const result = parseJson(text);
+            if (result.ok)
+                candidate = directMachineResult(result.value) ?? candidate;
+        }
+    }
+    return candidate;
+}
 export function parseProviderTelemetry(agent, lines) {
     let inputTokens;
     let cachedInputTokens;
@@ -76,6 +123,10 @@ export function parseProviderTelemetry(agent, lines) {
     let totalCostUsd;
     let model;
     let reportedModels = [];
+    const harnessTotals = agent === 'opencode' || agent === 'kilo'
+        ? { input: 0, output: 0, cached: 0, cacheWrite: 0, reasoning: 0, cost: 0, hasInput: false, hasOutput: false, hasCached: false, hasCacheWrite: false, hasReasoning: false, hasCost: false }
+        : undefined;
+    let piUsage;
     for (const line of lines) {
         let parsed;
         try {
@@ -87,8 +138,47 @@ export function parseProviderTelemetry(agent, lines) {
         if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
             continue;
         const event = parsed;
+        if (agent === 'qwen' && event.parent_tool_use_id != null)
+            continue;
         const message = event.message && typeof event.message === 'object' ? event.message : undefined;
         const stats = event.stats && typeof event.stats === 'object' ? event.stats : undefined;
+        const part = event.part && typeof event.part === 'object' ? event.part : undefined;
+        const partTokens = part?.tokens && typeof part.tokens === 'object' ? part.tokens : undefined;
+        if (harnessTotals && (event.type === 'step_finish' || part?.type === 'step-finish') && partTokens) {
+            const cache = partTokens.cache && typeof partTokens.cache === 'object' ? partTokens.cache : undefined;
+            const stepInput = finite(partTokens.input);
+            const stepOutput = finite(partTokens.output);
+            const stepCached = finite(partTokens.cached ?? partTokens.cacheRead ?? cache?.read);
+            const stepCacheWrite = finite(partTokens.cacheWrite ?? cache?.write);
+            const stepReasoning = finite(partTokens.reasoning);
+            const stepCost = finite(part?.cost ?? event.cost);
+            if (stepInput !== undefined) {
+                harnessTotals.input += stepInput;
+                harnessTotals.hasInput = true;
+            }
+            if (stepOutput !== undefined) {
+                harnessTotals.output += stepOutput;
+                harnessTotals.hasOutput = true;
+            }
+            if (stepCached !== undefined) {
+                harnessTotals.cached += stepCached;
+                harnessTotals.hasCached = true;
+            }
+            if (stepCacheWrite !== undefined) {
+                harnessTotals.cacheWrite += stepCacheWrite;
+                harnessTotals.hasCacheWrite = true;
+            }
+            if (stepReasoning !== undefined) {
+                harnessTotals.reasoning += stepReasoning;
+                harnessTotals.hasReasoning = true;
+            }
+            if (stepCost !== undefined) {
+                harnessTotals.cost += stepCost;
+                harnessTotals.hasCost = true;
+            }
+        }
+        if (agent === 'pi' && event.type === 'message_update' && event.usage && typeof event.usage === 'object')
+            piUsage = event.usage;
         const usage = (event.usage && typeof event.usage === 'object'
             ? event.usage
             : message?.usage && typeof message.usage === 'object'
@@ -105,41 +195,12 @@ export function parseProviderTelemetry(agent, lines) {
         // Older JSON stats only provide model-local token objects. Sum a field
         // only when every model measured it; a missing measurement is not zero.
         let source = usage ?? nestedModelTokens ?? modelUsage;
-        if (agent === 'gemini' && modelEntries.length > 0) {
+        if ((agent === 'gemini' || agent === 'qwen') && modelEntries.length > 0) {
             reportedModels = modelEntries.map(([name]) => name);
             model = firstModel?.[0];
             const fields = {
-                input_tokens: ['input_tokens', 'inputTokens', 'promptTokenCount', 'input'],
-                output_tokens: ['output_tokens', 'outputTokens', 'candidatesTokenCount', 'output'],
-                cached_input_tokens: ['cached_input_tokens', 'cachedInputTokens', 'cachedContentTokenCount', 'cached'],
-                reasoning_output_tokens: ['reasoning_output_tokens', 'reasoningOutputTokens', 'thoughtsTokenCount', 'thoughts'],
-            };
-            const totals = {};
-            for (const [field, aliases] of Object.entries(fields)) {
-                const aggregate = aliases.map(key => finite(usage?.[key])).find(value => value !== undefined);
-                if (aggregate !== undefined) {
-                    totals[field] = aggregate;
-                    continue;
-                }
-                const values = modelEntries.map(([, value]) => {
-                    const entry = isRecord(value) ? value : {};
-                    const tokens = isRecord(entry.tokens) ? entry.tokens : entry;
-                    return aliases.map(key => finite(tokens[key])).find(value => value !== undefined);
-                });
-                if (values.every(value => value !== undefined))
-                    totals[field] = values.reduce((sum, value) => sum + value, 0);
-            }
-            source = { ...totals, ...usage };
-            const aggregateCached = finite(usage?.cached_input_tokens ?? usage?.cached);
-            if (aggregateCached !== undefined)
-                source.cached_input_tokens = aggregateCached;
-        }
-        if (agent === 'qwen' && modelEntries.length > 0) {
-            reportedModels = modelEntries.map(([name]) => name);
-            model = firstModel?.[0];
-            const fields = {
-                input_tokens: ['input_tokens', 'inputTokens', 'promptTokenCount', 'input'],
-                output_tokens: ['output_tokens', 'outputTokens', 'candidatesTokenCount', 'output'],
+                input_tokens: ['input_tokens', 'inputTokens', 'promptTokenCount', 'input', 'prompt'],
+                output_tokens: ['output_tokens', 'outputTokens', 'candidatesTokenCount', 'output', 'candidates'],
                 cached_input_tokens: ['cached_input_tokens', 'cachedInputTokens', 'cachedContentTokenCount', 'cached'],
                 reasoning_output_tokens: ['reasoning_output_tokens', 'reasoningOutputTokens', 'thoughtsTokenCount', 'thoughts'],
             };
@@ -164,7 +225,7 @@ export function parseProviderTelemetry(agent, lines) {
                 source.cached_input_tokens = aggregateCached;
         }
         const inValue = finite(source?.input_tokens ?? source?.inputTokens ?? source?.prompt_tokens ?? source?.promptTokenCount ?? source?.input);
-        const cachedValue = finite(source?.cached_input_tokens ?? source?.cache_read_input_tokens ?? source?.cachedInputTokens ?? source?.cachedContentTokenCount ?? source?.cached);
+        const cachedValue = finite(source?.cached_input_tokens ?? source?.cache_read_input_tokens ?? source?.cachedInputTokens ?? source?.cacheRead ?? source?.cachedContentTokenCount ?? source?.cached);
         const cacheWriteValue = finite(source?.cache_write_input_tokens ?? source?.cache_creation_input_tokens ?? source?.cacheWriteInputTokens ?? source?.cacheWrite);
         const outValue = finite(source?.output_tokens ?? source?.outputTokens ?? source?.completion_tokens ?? source?.candidatesTokenCount ?? source?.output);
         const reasoningValue = finite(source?.reasoning_output_tokens ?? source?.reasoningOutputTokens ?? source?.thoughtsTokenCount ?? source?.thoughts);
@@ -178,13 +239,48 @@ export function parseProviderTelemetry(agent, lines) {
             outputTokens = outValue;
         if (reasoningValue !== undefined)
             reasoningOutputTokens = reasoningValue;
-        const costValue = finite(event.total_cost_usd ?? event.totalCostUsd ?? stats?.total_cost_usd);
+        const usageCost = isRecord(usage?.cost) ? finite(usage.cost.total) : undefined;
+        const costValue = finite(event.total_cost_usd ?? event.totalCostUsd ?? stats?.total_cost_usd ?? usageCost);
         if (costValue !== undefined)
             totalCostUsd = costValue;
         const eventModel = event.model ?? message?.model ?? firstModel?.[0];
         if (typeof eventModel === 'string' && eventModel && reportedModels.length <= 1)
             model = eventModel;
     }
+    if (piUsage) {
+        const piInput = finite(piUsage.input);
+        const piOutput = finite(piUsage.output);
+        const piCached = finite(piUsage.cacheRead);
+        const piCacheWrite = finite(piUsage.cacheWrite);
+        const piReasoning = finite(piUsage.reasoning);
+        const piCost = isRecord(piUsage.cost) ? finite(piUsage.cost.total) : undefined;
+        if (piInput !== undefined)
+            inputTokens = piInput;
+        if (piOutput !== undefined)
+            outputTokens = piOutput;
+        if (piCached !== undefined)
+            cachedInputTokens = piCached;
+        if (piCacheWrite !== undefined)
+            cacheWriteInputTokens = piCacheWrite;
+        if (piReasoning !== undefined)
+            reasoningOutputTokens = piReasoning;
+        if (piCost !== undefined)
+            totalCostUsd = piCost;
+    }
+    if (harnessTotals) {
+        if (harnessTotals.hasInput)
+            inputTokens = harnessTotals.input;
+        if (harnessTotals.hasOutput)
+            outputTokens = harnessTotals.output;
+        if (harnessTotals.hasCached)
+            cachedInputTokens = harnessTotals.cached;
+        if (harnessTotals.hasCacheWrite)
+            cacheWriteInputTokens = harnessTotals.cacheWrite;
+        if (harnessTotals.hasReasoning)
+            reasoningOutputTokens = harnessTotals.reasoning;
+        if (harnessTotals.hasCost)
+            totalCostUsd = harnessTotals.cost;
+    }
     if (inputTokens === undefined || outputTokens === undefined) {
         const partialUsage = {
             ...(inputTokens !== undefined ? { inputTokens } : {}),

package/dist/canon/manifest.js

@@ -1,7 +1,8 @@
 import { z } from 'zod';
 import { parse } from 'yaml';
 import { readFileSync } from 'node:fs';
-export const AgentSchema = z.enum(['claude', 'codex', 'gemini', 'qwen']);
+import { AgentSchema } from '../agents/contracts.js';
+export { AgentSchema };
 export const InvocationSchema = z.enum(['auto', 'manual']);
 export const SkillEntrySchema = z.object({
     id: z.string().min(1),

package/dist/change/inbox.js

@@ -104,7 +104,7 @@ export function buildChangePrompt(request, proposalPath, stories, brief = '') {
         'Every proposed story must have passes: false and 2-5 structured acceptance criteria.',
         'Every criterion must have a stable id, behavioral text, and one or more executable verify commands.',
         'Each criterion id must appear in every verify command; each entry must be one approved test command without shell control operators.',
-        'Use only claude, codex, or gemini if an optional agent affinity is useful.',
+        'Use only a configured Yoke harness if an optional agent affinity is useful (claude, codex, gemini, qwen, opencode, kilo, or pi).',
         '',
         `Write ONLY a YAML array of the NEW stories to this exact file: ${proposalPath}`,
         'Do not edit .yoke/prd.yaml or any source file. Do not commit.',

package/dist/cli.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { MODEL_PROVIDERS } from './setup/model-presets.js';
 import { pathToFileURL } from 'node:url';
 import { realpathSync } from 'node:fs';
 import { checkProject, checkExitCode, protectAcceptance } from './check/command.js';
@@ -18,6 +19,7 @@ import { runLoopCleanup } from './loop/cleanup.js';
 import { runFlowSmoke } from './smoke/command.js';
 import { maybeNotifyUpdate, currentYokeVersion } from './update/check.js';
 import { runUpgrade } from './update/upgrade.js';
+import { AGENT_LIST, isSupportedAgent, SUPPORTED_AGENTS } from './agents/catalog.js';
 import { printAudit, runAudit } from './audit/command.js';
 import { runSetup } from './setup/command.js';
 import { pendingChanges, queueChange } from './change/inbox.js';
@@ -104,7 +106,7 @@ export function main(argv) {
     switch (cmd) {
         case 'setup': {
             const targetDir = rest.find(a => !a.startsWith('-')) ?? '.';
-            const valid = ['claude', 'codex', 'gemini', 'qwen'];
+            const valid = [...SUPPORTED_AGENTS];
             const hostArg = rest.find(a => a.startsWith('--host='))?.slice('--host='.length);
             if (hostArg && !valid.includes(hostArg)) {
                 console.error(`Invalid --host value: ${hostArg}`);
@@ -114,7 +116,7 @@ export function main(argv) {
             const agentTokens = agentArg === 'all' ? valid : agentArg?.split(',').map(a => a.trim());
             const invalidAgents = agentTokens?.filter(a => !valid.includes(a)) ?? [];
             if (agentArg && (invalidAgents.length > 0 || agentTokens?.length === 0)) {
-                console.error(`Invalid --agent value: ${agentArg} (expected claude,codex,gemini|all)`);
+                console.error(`Invalid --agent value: ${agentArg} (expected ${AGENT_LIST}|all)`);
                 return 1;
             }
             const agents = agentTokens ? [...new Set(agentTokens)] : undefined;
@@ -140,7 +142,14 @@ export function main(argv) {
                 console.error('Invalid routing strategy');
                 return 1;
             }
+            const modelProviderArg = rest.find(a => a.startsWith('--model-provider='))?.slice('--model-provider='.length);
+            const modelProviders = modelProviderArg?.split(',').map(value => value.trim());
+            if (modelProviders?.some(value => !MODEL_PROVIDERS.includes(value))) {
+                console.error('Invalid --model-provider (expected deepseek,kimi)');
+                return 1;
+            }
             return runSetup(targetDir, {
+                modelProviders: modelProviders,
                 host: hostArg, agents, runner: runnerArg,
                 codeGraph: graphArg,
                 loop, routing, decisionPolicy: policyArg,
@@ -226,7 +235,7 @@ export function main(argv) {
                 }
                 if (sub === 'run' || sub === 'resume') {
                     const provider = value('runner') ?? 'codex';
-                    if (!['codex', 'claude', 'gemini', 'qwen'].includes(provider))
+                    if (!SUPPORTED_AGENTS.includes(provider))
                         throw new Error('Unknown runner');
                     return runProjectGoal(targetDir, { provider: provider, selection: { model: value('model') } }).then(goal => {
                         console.log(JSON.stringify(goal));
@@ -269,7 +278,7 @@ export function main(argv) {
             const targetDir = rest.find(a => !a.startsWith('-')) ?? '.';
             const loop = rest.includes('--loop');
             const agentArg = rest.find(a => a.startsWith('--agent='))?.slice('--agent='.length);
-            const all = ['claude', 'codex', 'gemini', 'qwen'];
+            const all = [...SUPPORTED_AGENTS];
             const agents = !agentArg || agentArg === 'all'
                 ? (agentArg === 'all' ? all : undefined)
                 : agentArg.split(',').filter((a) => all.includes(a));
@@ -468,18 +477,17 @@ export function main(argv) {
                     return 1;
                 }
                 const runnerArg = rest.find(a => a.startsWith('--runner='))?.slice('--runner='.length);
-                const valid = ['claude', 'codex', 'gemini', 'qwen'];
-                const agent = runnerArg && valid.includes(runnerArg) ? runnerArg : undefined;
+                const agent = runnerArg && isSupportedAgent(runnerArg) ? runnerArg : undefined;
                 if (runnerArg && !agent) {
-                    console.error(`Invalid --runner value: ${runnerArg} (expected claude|codex|gemini|qwen)`);
+                    console.error(`Invalid --runner value: ${runnerArg} (expected ${AGENT_LIST})`);
                     return 1;
                 }
                 const isolate = rest.includes('--isolate') ? true : rest.includes('--no-isolate') ? false : undefined;
                 const reviewerArg = rest.find(a => a.startsWith('--reviewer='))?.slice('--reviewer='.length);
                 let reviewer;
                 if (reviewerArg) {
-                    if (!valid.includes(reviewerArg)) {
-                        console.error(`Invalid --reviewer value: ${reviewerArg} (expected claude|codex|gemini)`);
+                    if (!isSupportedAgent(reviewerArg)) {
+                        console.error(`Invalid --reviewer value: ${reviewerArg} (expected ${AGENT_LIST})`);
                         return 1;
                     }
                     reviewer = reviewerArg;
@@ -522,19 +530,19 @@ export function main(argv) {
                 }
                 return runLoopCommand(targetDir, { maxIterations: rawMax, agent, isolate, resumeWorktree: rest.includes('--resume-worktree'), parallel, parallelAuto: parallelArg === '--parallel=auto', reviewer, review, allowSelfReview, timeoutMinutes, json, routing, onAmbiguity: oaArg, decisionPolicy: dpArg, permissions, ...qualityFlags.options });
             }
-            console.log('usage: yoke loop <on|off|status|decision|answer|resume [--discard] [--quality|--no-quality] [--quality-rounds=N] [--quality-minutes=N] [--quality-policy=<blocking|advisory>] [--quality-unbounded] [--candidates=N]|cleanup [--remove-worktrees] [--discard-stale-recovery]|run [--max=N] [--parallel=<auto|N>] [--runner=<claude|codex|gemini>] [--reviewer=<claude|codex|gemini>] [--review] [--allow-self-review] [--routing|--no-routing] [--isolate|--no-isolate] [--unsafe] [--timeout=<minutes>] [--decision-policy=<auto|critical>] [--quality|--no-quality] [--quality-rounds=N] [--quality-minutes=N] [--quality-policy=<blocking|advisory>] [--quality-unbounded] [--candidates=N] [--json]> [targetDir]');
+            console.log(`usage: yoke loop <on|off|status|decision|answer|resume [--discard] [--quality|--no-quality] [--quality-rounds=N] [--quality-minutes=N] [--quality-policy=<blocking|advisory>] [--quality-unbounded] [--candidates=N]|cleanup [--remove-worktrees] [--discard-stale-recovery]|run [--max=N] [--parallel=<auto|N>] [--runner=<${AGENT_LIST}>] [--reviewer=<${AGENT_LIST}>] [--review] [--allow-self-review] [--routing|--no-routing] [--isolate|--no-isolate] [--unsafe] [--timeout=<minutes>] [--decision-policy=<auto|critical>] [--quality|--no-quality] [--quality-rounds=N] [--quality-minutes=N] [--quality-policy=<blocking|advisory>] [--quality-unbounded] [--candidates=N] [--json]> [targetDir]`);
             return 1;
         }
         case 'new': {
             const dir = rest.find(a => !a.startsWith('-'));
             if (!dir) {
-                console.error('usage: yoke new <dir> [--idea="..."] [--agent=claude,codex,gemini|all] [--runner=<claude|codex|gemini>] [--loop]');
+                console.error(`usage: yoke new <dir> [--idea="..."] [--agent=${AGENT_LIST}|all] [--runner=<${AGENT_LIST}>] [--loop]`);
                 return 1;
             }
             const idea = rest.find(a => a.startsWith('--idea='))?.slice('--idea='.length);
             const loop = rest.includes('--loop');
             const agentArg = rest.find(a => a.startsWith('--agent='))?.slice('--agent='.length);
-            const all = ['claude', 'codex', 'gemini', 'qwen'];
+            const all = [...SUPPORTED_AGENTS];
             const agents = !agentArg || agentArg === 'all'
                 ? (agentArg === 'all' ? all : undefined)
                 : agentArg.split(',').filter((a) => all.includes(a));
@@ -542,8 +550,8 @@ export function main(argv) {
                 console.warn('Unknown agent(s) in --agent; falling back to detection');
             }
             const runnerArg = rest.find(a => a.startsWith('--runner='))?.slice('--runner='.length);
-            if (runnerArg && !all.includes(runnerArg)) {
-                console.error(`Invalid --runner value: ${runnerArg} (expected claude|codex|gemini)`);
+            if (runnerArg && !isSupportedAgent(runnerArg)) {
+                console.error(`Invalid --runner value: ${runnerArg} (expected ${AGENT_LIST})`);
                 return 1;
             }
             return runNew(dir, { idea, agents, runner: runnerArg, loop });
@@ -553,7 +561,7 @@ export function main(argv) {
             const targetDir = rest.slice(1).find(a => !a.startsWith('-')) ?? '.';
             if (sub === 'assess') {
                 const runner = rest.find(a => a.startsWith('--runner='))?.slice('--runner='.length);
-                if (runner && !['codex', 'claude', 'gemini', 'qwen'].includes(runner)) {
+                if (runner && !SUPPORTED_AGENTS.includes(runner)) {
                     console.error('Invalid planning runner');
                     return 1;
                 }
@@ -562,13 +570,12 @@ export function main(argv) {
             if (sub === 'draft') {
                 const idea = rest.find(a => a.startsWith('--idea='))?.slice('--idea='.length);
                 if (!idea) {
-                    console.error('usage: yoke prd draft [dir] --idea="..." [--runner=<claude|codex|gemini>] [--force] [--timeout=<minutes>]');
+                    console.error(`usage: yoke prd draft [dir] --idea="..." [--runner=<${AGENT_LIST}>] [--force] [--timeout=<minutes>]`);
                     return 1;
                 }
-                const valid = ['claude', 'codex', 'gemini', 'qwen'];
                 const runnerArg = rest.find(a => a.startsWith('--runner='))?.slice('--runner='.length);
-                if (runnerArg && !valid.includes(runnerArg)) {
-                    console.error(`Invalid --runner value: ${runnerArg} (expected claude|codex|gemini|qwen)`);
+                if (runnerArg && !isSupportedAgent(runnerArg)) {
+                    console.error(`Invalid --runner value: ${runnerArg} (expected ${AGENT_LIST})`);
                     return 1;
                 }
                 const force = rest.includes('--force');
@@ -586,7 +593,7 @@ export function main(argv) {
             }
             if (sub === 'check')
                 return runPrdCheck(targetDir);
-            console.log('usage: yoke prd <draft|check|assess> [dir] [--idea="..."] [--runner=<claude|codex|gemini>] [--story=<id>] [--reassess] [--force] [--timeout=<minutes>]');
+            console.log(`usage: yoke prd <draft|check|assess> [dir] [--idea="..."] [--runner=<${AGENT_LIST}>] [--story=<id>] [--reassess] [--force] [--timeout=<minutes>]`);
             return 1;
         }
         case 'context': {
@@ -601,10 +608,9 @@ export function main(argv) {
         }
         case 'review': {
             const targetDir = rest.find(a => !a.startsWith('-')) ?? '.';
-            const valid = ['claude', 'codex', 'gemini'];
             const reviewerArg = rest.find(a => a.startsWith('--reviewer='))?.slice('--reviewer='.length);
-            if (reviewerArg && !valid.includes(reviewerArg)) {
-                console.error(`Invalid --reviewer value: ${reviewerArg} (expected claude|codex|gemini)`);
+            if (reviewerArg && !isSupportedAgent(reviewerArg)) {
+                console.error(`Invalid --reviewer value: ${reviewerArg} (expected ${AGENT_LIST})`);
                 return 1;
             }
             const base = rest.find(a => a.startsWith('--base='))?.slice('--base='.length);
@@ -651,7 +657,7 @@ export function main(argv) {
             return runUpgrade();
         default:
             console.log('Project workflows: yoke check [dir] [--json|--protect] | goal set|run|resume|pause|status|handoff|budget [dir] | projects add|list|remove | dashboard [dir] [--port=N]');
-            console.log('usage: yoke <setup [dir] | new <dir> [--idea="..."] | validate [canonDir] | retrofit [targetDir] [--agent=claude,codex,gemini|all] [--code-graph=graphify|serena] [--loop] | change <add|status> [dir] | prd <draft|check|assess> [dir] | loop <on|off|status|decision|answer|resume|run|cleanup> | context <init|status> | review [dir] [--reviewer=<claude|codex|gemini>] [--base=<ref>] [--focus="..."] | design-scan [dir] [--max=N] [--report] | flow-smoke [dir] [--url=<baseUrl>] [--label=<name>] | upgrade>');
+            console.log(`usage: yoke <setup [dir] | new <dir> [--idea="..."] | validate [canonDir] | retrofit [targetDir] [--agent=${AGENT_LIST}|all] [--code-graph=graphify|serena] [--loop] | change <add|status> [dir] | prd <draft|check|assess> [dir] | loop <on|off|status|decision|answer|resume|run|cleanup> | context <init|status> | review [dir] [--reviewer=<${AGENT_LIST}>] [--base=<ref>] [--focus="..."] | design-scan [dir] [--max=N] [--report] | flow-smoke [dir] [--url=<baseUrl>] [--label=<name>] | upgrade>`);
             return cmd ? 1 : 0;
     }
 }