@hecer/yoke 1.12.0 → 1.13.0

package/dist/agents/providers.js

@@ -24,6 +24,20 @@ const argsFor = (agent, permissions) => {
         const approval = permissions === 'read-only' ? 'plan' : 'auto-edit';
         return ['--approval-mode', approval, '--sandbox', '--output-format', 'stream-json', ...(permissions === 'safe' ? ['--allowed-tools', 'run_shell_command'] : [])];
     }
+    if (agent === 'opencode' || agent === 'kilo') {
+        const args = ['run', '--format', 'json', '--auto'];
+        if (permissions === 'read-only')
+            args.push('--agent', 'plan');
+        if (permissions === 'unsafe')
+            args.push('--dangerously-skip-permissions');
+        return args;
+    }
+    if (agent === 'pi') {
+        const args = ['--mode', 'json', '--no-session'];
+        if (permissions !== 'unsafe')
+            args.push('--tools', permissions === 'read-only' ? 'read,grep,find,ls' : 'read,bash,edit,write');
+        return args;
+    }
     if (permissions === 'unsafe')
         return ['--yolo', '--output-format', 'stream-json'];
     const approval = permissions === 'read-only' ? 'plan' : 'auto_edit';
@@ -43,6 +57,10 @@ export function buildProviderInvocation(agent, prompt, cwd, permissions = 'safe'
         throw new Error('Qwen does not support the reasoningEffort selection');
     if (agent === 'qwen' && parsedSelection.nativeMultiAgent === true)
         throw new Error('Qwen does not support enabling the nativeMultiAgent selection');
+    if (parsedSelection.provider && !['opencode', 'kilo', 'pi'].includes(agent))
+        throw new Error(`${agent} does not support an explicit provider selection`);
+    if (parsedSelection.variant && !['opencode', 'kilo', 'pi'].includes(agent))
+        throw new Error(`${agent} does not support a model variant selection`);
     const args = argsFor(agent, permissions);
     if (output.schemaFile !== undefined || output.jsonSchema !== undefined) {
         if (agent === 'codex' && output.schemaFile && output.jsonSchema === undefined) {
@@ -56,9 +74,11 @@ export function buildProviderInvocation(agent, prompt, cwd, permissions = 'safe'
                 throw new Error('Inline structured output is unsupported by the Windows provider shell shim');
             args.push('--json-schema', schema);
         }
-        else
+        else if (!['opencode', 'kilo', 'pi'].includes(agent))
             throw new Error(`${agent} structured output schema requires ${agent === 'codex' ? 'schemaFile' : agent === 'claude' ? 'jsonSchema' : 'a supported native schema option (unavailable)'}`);
     }
+    if (parsedSelection.provider && agent === 'pi')
+        args.push('--provider', parsedSelection.provider);
     if (parsedSelection.model) {
         const qualified = agent === 'qwen' && parsedSelection.model.includes('::')
             ? parsedSelection.model.match(/^(openai|anthropic|gemini|vertex-ai|qwen-oauth)::(.+)$/u) : undefined;
@@ -68,14 +88,32 @@ export function buildProviderInvocation(agent, prompt, cwd, permissions = 'safe'
             const model = ModelSelectionSchema.shape.model.parse(qualified[2]);
             args.push('--auth-type', qualified[1], '--model', model);
         }
-        else
-            args.push('--model', parsedSelection.model);
+        else {
+            const qualified = parsedSelection.provider && (agent === 'opencode' || agent === 'kilo')
+                ? `${parsedSelection.provider}/${parsedSelection.model}`
+                : parsedSelection.model;
+            args.push('--model', qualified);
+        }
     }
     if (parsedSelection.reasoningEffort) {
         if (agent === 'claude')
             args.push('--effort', parsedSelection.reasoningEffort);
         else if (agent === 'codex')
             args.push('--config', `model_reasoning_effort=${parsedSelection.reasoningEffort}`);
+        else if (agent === 'opencode' || agent === 'kilo')
+            args.push('--variant', parsedSelection.reasoningEffort);
+        else if (agent === 'pi')
+            args.push('--thinking', parsedSelection.reasoningEffort);
+    }
+    if (parsedSelection.variant) {
+        if (agent === 'opencode' || agent === 'kilo')
+            args.push('--variant', parsedSelection.variant);
+        else if (agent === 'pi') {
+            if (parsedSelection.reasoningEffort && parsedSelection.reasoningEffort !== parsedSelection.variant)
+                throw new Error('Pi reasoningEffort and variant selections must match');
+            if (!parsedSelection.reasoningEffort)
+                args.push('--thinking', parsedSelection.variant);
+        }
     }
     if (agent === 'codex' && parsedSelection.nativeMultiAgent === false)
         args.push('--disable', 'multi_agent');
@@ -89,6 +127,10 @@ export function buildProviderInvocation(agent, prompt, cwd, permissions = 'safe'
             args.push('--ignore-user-config');
         else if (agent === 'claude')
             args.push('--bare');
+        else if (agent === 'opencode' || agent === 'kilo')
+            args.push('--pure');
+        else if (agent === 'pi')
+            throw new Error('Pi does not support the bare startup selection');
     }
     if (agent === 'gemini' && parsedSelection.nativeMultiAgent === false) {
         return { command: process.execPath, args: [fileURLToPath(new URL('../../hooks/bounded-gemini.mjs', import.meta.url)), ...args], input: prompt, cwd };

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;
 }
@@ -47,6 +54,20 @@ export function parseProviderResult(agent, output) {
                 if (event.type === 'message' && event.role === 'assistant' && typeof event.content === 'string')
                     fragments.push(event.content);
                 break;
+            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;
         }
     }
     const joined = parseJson(fragments.join(''));
@@ -102,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 {
@@ -117,6 +142,43 @@ export function parseProviderTelemetry(agent, lines) {
             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'
@@ -163,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);
@@ -177,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

@@ -19,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';
@@ -105,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}`);
@@ -115,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,qwen|all)`);
+                console.error(`Invalid --agent value: ${agentArg} (expected ${AGENT_LIST}|all)`);
                 return 1;
             }
             const agents = agentTokens ? [...new Set(agentTokens)] : undefined;
@@ -234,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));
@@ -277,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));
@@ -476,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|qwen)`);
+                    if (!isSupportedAgent(reviewerArg)) {
+                        console.error(`Invalid --reviewer value: ${reviewerArg} (expected ${AGENT_LIST})`);
                         return 1;
                     }
                     reviewer = reviewerArg;
@@ -530,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|qwen>] [--reviewer=<claude|codex|gemini|qwen>] [--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,qwen|all] [--runner=<claude|codex|gemini|qwen>] [--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));
@@ -550,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|qwen)`);
+            if (runnerArg && !isSupportedAgent(runnerArg)) {
+                console.error(`Invalid --runner value: ${runnerArg} (expected ${AGENT_LIST})`);
                 return 1;
             }
             return runNew(dir, { idea, agents, runner: runnerArg, loop });
@@ -561,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;
                 }
@@ -570,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|qwen>] [--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');
@@ -594,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|qwen>] [--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': {
@@ -609,10 +608,9 @@ export function main(argv) {
         }
         case 'review': {
             const targetDir = rest.find(a => !a.startsWith('-')) ?? '.';
-            const valid = ['claude', 'codex', 'gemini', 'qwen'];
             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|qwen)`);
+            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);
@@ -659,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,qwen|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|qwen>] [--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;
     }
 }

package/dist/dashboard/panels.js

@@ -45,12 +45,12 @@ function renderNow(p){
   if(goal.pendingAttempt)summary.append(row('Goal attempt',goal.pendingAttempt.provider+' · requested model '+(goal.pendingAttempt.model||'provider default')+' · started '+goal.pendingAttempt.startedAt,state.stale?'unconfirmed':'running'));
   if(status.execution&&status.state==='running')summary.append(el('p',state.stale?'Execution was reported but is now unconfirmed.':status.execution.provider+' · requested model '+(status.execution.requestedModel||'provider default')+' · elapsed '+duration(Date.now()-Date.parse(status.execution.startedAt))));
   if(status.story&&!workers.length)summary.append(row(status.storyTitle||status.story,status.phase||'Phase unknown',reportedState));
-  for(const worker of workers)summary.append(row(worker.storyTitle||worker.story,[worker.selectedProvider||worker.provider,'requested model '+(worker.selectedModel||worker.model||'provider default'),worker.phase||worker.lifecycle||'working',worker.startedAt?(state.stale?'last started '+worker.startedAt:'elapsed '+duration(Date.now()-Date.parse(worker.startedAt))):null,worker.quality?'repair '+worker.quality.usedRepairs:null].filter(Boolean).join(' · '),state.stale?'unconfirmed':worker.lifecycle||'running'));
+  for(const worker of workers)summary.append(row(worker.storyTitle||worker.story,[worker.provider+(worker.selectedProvider&&worker.selectedProvider!==worker.provider?' ('+worker.selectedProvider+')':''),'requested model '+(worker.selectedModel||worker.model||'provider default'),worker.selectedVariant?'variant '+worker.selectedVariant:null,worker.phase||worker.lifecycle||'working',worker.startedAt?(state.stale?'last started '+worker.startedAt:'elapsed '+duration(Date.now()-Date.parse(worker.startedAt))):null,worker.quality?'repair '+worker.quality.usedRepairs:null].filter(Boolean).join(' · '),state.stale?'unconfirmed':worker.lifecycle||'running'));
   if(status.parallel?.integrator){const worker=status.parallel.integrator;summary.append(row('Integration: '+(worker.storyTitle||worker.story),worker.phase||'checking',state.stale?'unconfirmed':'integrating'))}
   if(!workers.length&&!status.story&&!goal.pendingAttempt)summary.append(el('p','No task currently reported.','empty'));
   summary.append(el('p','Status refreshes every 5 seconds. Requested models are not proof of the model actually used; reported model identities appear under Usage & time.','muted'));content.append(summary);
   const tasks=panel('Tasks');for(const task of p.stories||[])tasks.append(row(task.title,task.id+(task.needs?.length?' · after '+task.needs.join(', '):'')+' · '+taskTiming(task,p.estimate),task.passes?'passed':workers.some(worker=>worker.story===task.id)?state.stale?'unconfirmed':'running':'open'));content.append(tasks);
-  const routing=panel('Model selection');for(const [id,decision] of Object.entries(status.routingDecisions||{})){routing.append(row(id,decision.provider+' / '+(decision.model||'provider default')+(decision.reasoningEffort?' · '+decision.reasoningEffort:''),decision.profile));routing.append(el('p',decision.reason));routing.append(el('p','Next escalation: '+decision.next,'muted'))}if(!Object.keys(status.routingDecisions||{}).length)routing.append(el('p','No recorded model selection for this run.','empty'));content.append(routing);
+  const routing=panel('Model selection');for(const [id,decision] of Object.entries(status.routingDecisions||{})){routing.append(row(id,decision.provider+(decision.providerModel?' ('+decision.providerModel+')':'')+' / '+(decision.model||'provider default')+(decision.reasoningEffort?' · '+decision.reasoningEffort:'')+(decision.variant?' · variant '+decision.variant:''),decision.profile));routing.append(el('p',decision.reason));routing.append(el('p','Next escalation: '+decision.next,'muted'))}if(!Object.keys(status.routingDecisions||{}).length)routing.append(el('p','No recorded model selection for this run.','empty'));content.append(routing);
   const activity=panel('Recent activity');for(const event of (p.events||[]).slice(-16).reverse())activity.append(row(event.storyId||event.type,event.timestamp+(event.phase?' · '+event.phase:'')+(Number.isFinite(event.durationMs)?' · '+duration(event.durationMs):''),event.outcome||event.type));content.append(activity);
 }
 function renderUsageHistory(current,previous){

package/dist/goals/command.js

@@ -10,10 +10,11 @@ import { acquireLock, releaseLock, isPidAlive } from '../loop/lock.js';
 import { reapProviderProcesses, isProviderTreeAlive } from '../loop/cleanup.js';
 import { killProcessTreeForCleanup } from '../loop/watchdog.js';
 import { buildProviderInvocation, startProviderProcess } from '../agents/providers.js';
+import { AgentSchema } from '../agents/contracts.js';
 import { appendEvent } from '../observability/events.js';
 import { statePath } from '../workspace/state.js';
-const Attempt = z.object({ provider: z.enum(['codex', 'claude', 'gemini', 'qwen']), model: z.string().optional(), startedAt: z.string(), durationMs: z.number().nonnegative(), success: z.boolean(), summary: z.string(), checkId: z.string(), inputTokens: z.number().nonnegative().optional(), outputTokens: z.number().nonnegative().optional() });
-const Goal = z.object({ version: z.literal(1), id: z.string().uuid(), objective: z.string().trim().min(1).max(16000), status: z.enum(['active', 'running', 'paused', 'blocked', 'complete']), createdAt: z.string(), updatedAt: z.string(), maxAttempts: z.number().int().min(1).max(20), maxMinutes: z.number().positive().max(1440), tokenBudget: z.number().int().positive().optional(), attempts: z.array(Attempt), reason: z.string().optional(), lastCheck: z.string().optional(), pendingAttempt: z.object({ provider: z.enum(['codex', 'claude', 'gemini', 'qwen']), model: z.string().optional(), startedAt: z.string().datetime() }).optional() }).strict();
+const Attempt = z.object({ provider: AgentSchema, model: z.string().optional(), startedAt: z.string(), durationMs: z.number().nonnegative(), success: z.boolean(), summary: z.string(), checkId: z.string(), inputTokens: z.number().nonnegative().optional(), outputTokens: z.number().nonnegative().optional() });
+const Goal = z.object({ version: z.literal(1), id: z.string().uuid(), objective: z.string().trim().min(1).max(16000), status: z.enum(['active', 'running', 'paused', 'blocked', 'complete']), createdAt: z.string(), updatedAt: z.string(), maxAttempts: z.number().int().min(1).max(20), maxMinutes: z.number().positive().max(1440), tokenBudget: z.number().int().positive().optional(), attempts: z.array(Attempt), reason: z.string().optional(), lastCheck: z.string().optional(), pendingAttempt: z.object({ provider: AgentSchema, model: z.string().optional(), startedAt: z.string().datetime() }).optional() }).strict();
 const goalPath = (root) => statePath(root, 'goal.json');
 function save(root, goal) {
     const parsed = Goal.parse({ ...goal, updatedAt: new Date().toISOString() });

package/dist/loop/claims.js

@@ -4,6 +4,7 @@ import { z } from 'zod';
 import { isPidAlive } from './lock.js';
 import { publishClaimFile, replaceClaimFile, withClaimOperations } from './claim-lease.js';
 import { storyPathSegment } from './prd.js';
+import { AgentSchema } from '../agents/contracts.js';
 export const CLAIM_SCHEMA_VERSION = 2;
 const LegacyClaimSchema = z.object({
     storyId: z.string().min(1),
@@ -18,7 +19,7 @@ const RichClaimSchema = LegacyClaimSchema.extend({
     heartbeatAt: z.string().min(1),
     baseCommit: z.string().min(1).optional(),
     worktree: z.string().min(1).optional(),
-    provider: z.enum(['claude', 'codex', 'gemini', 'qwen']).optional(),
+    provider: AgentSchema.optional(),
     model: z.string().min(1).optional(),
     role: z.enum(['implementation', 'quality', 'repair', 'review']).optional(),
     cancellation: z.object({

package/dist/loop/decision.js

@@ -10,6 +10,7 @@ import { resolveCommitIdentity } from './identity.js';
 import { commitPaths, realGitOps } from './git.js';
 import { acquireLock, releaseLock } from './lock.js';
 import { loadPrd, selectNextStory } from './prd.js';
+import { AgentSchema } from '../agents/contracts.js';
 const singleLine = (max) => z.string().trim().min(1).max(max).refine(value => !/[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]/u.test(value), 'must be a single line without control or bidi-formatting characters');
 const MAX_STATE_BYTES = 256 * 1024;
 const DecisionOptionSchema = z.object({
@@ -60,9 +61,9 @@ export const DecisionResumeSchema = z.object({
     answered: z.boolean().optional(),
     /** Absent preserves the default unlimited run across a critical-decision resume. */
     maxIterations: z.number().int().positive().optional(),
-    agent: z.enum(['claude', 'codex', 'gemini', 'qwen']).optional(),
+    agent: AgentSchema.optional(),
     isolate: z.boolean().optional(),
-    reviewer: z.enum(['claude', 'codex', 'gemini', 'qwen']).optional(),
+    reviewer: AgentSchema.optional(),
     review: z.boolean().optional(),
     allowSelfReview: z.boolean().optional(),
     timeoutMinutes: z.number().nonnegative().optional(),

package/dist/loop/parallel-command.js

@@ -255,7 +255,7 @@ function asyncRunner(input, provider, signal, workerId) {
     if (input.routing) {
         const routed = makeAsyncAdaptiveRunner({
             parent: input.routing.strategy === 'capability' ? input.runnerAgent : provider.provider,
-            parentSelection: input.routing.strategy === 'capability' ? input.selection : { ...input.selection, model: provider.model, reasoningEffort: provider.reasoningEffort, nativeMultiAgent: false },
+            parentSelection: input.routing.strategy === 'capability' ? input.selection : { ...input.selection, provider: provider.providerModel, model: provider.model, reasoningEffort: provider.reasoningEffort, variant: provider.variant, nativeMultiAgent: false },
             projectRoot: input.targetDir,
             workers: input.routing.workers,
             rules: input.routing.rules,
@@ -276,7 +276,7 @@ function asyncRunner(input, provider, signal, workerId) {
             makeWorker: (agent, selection) => async (context) => {
                 if (signal?.aborted)
                     return { success: false, summary: 'Routing cancelled before worker start' };
-                input.reporter.parallelWorker?.({ story: context.story.id, storyTitle: context.story.title, provider: agent, selectedProvider: agent, selectedModel: selection.model, phase: 'implementing' });
+                input.reporter.parallelWorker?.({ story: context.story.id, storyTitle: context.story.title, provider: agent, selectedProvider: selection.provider ?? agent, selectedModel: selection.model, selectedVariant: selection.variant, phase: 'implementing' });
                 const run = makeAsyncRunner(agent, { onAmbiguity: input.onAmbiguity, permissions: input.permissions, selection,
                     process: { idleTimeoutMs: input.idleMs, signal, workerId } });
                 return providerProcessResultToAgentResult(agent, context.story.id, await run(context).completion);
@@ -292,10 +292,12 @@ function asyncRunner(input, provider, signal, workerId) {
         permissions: input.permissions,
         selection: {
             ...selection,
+            ...(provider.providerModel ? { provider: provider.providerModel } : {}),
             ...(provider.provider !== 'gemini' && globalBare !== undefined ? { bare: globalBare } : {}),
             nativeMultiAgent: false,
             ...(provider.model ? { model: provider.model } : {}),
             ...(provider.reasoningEffort ? { reasoningEffort: provider.reasoningEffort } : {}),
+            ...(provider.variant ? { variant: provider.variant } : {}),
         },
         process: { idleTimeoutMs: input.idleMs, signal, workerId },
     });

package/dist/loop/prd.js

@@ -2,6 +2,7 @@ import { createHash } from 'node:crypto';
 import { readFileSync, writeFileSync } from 'node:fs';
 import { parse, stringify } from 'yaml';
 import { z } from 'zod';
+import { AgentSchema } from '../agents/contracts.js';
 import { StoryQualityDeclarationSchema } from '../quality/types.js';
 import { validWriteScope } from './scheduler.js';
 import { AssessmentSchema } from '../routing/assessment.js';
@@ -42,7 +43,7 @@ export const StorySchema = z.object({
     area: z.string().min(1).optional(),
     /** Advisory relative file/directory scopes; not a filesystem permission boundary. */
     writes: z.array(z.string().min(1).max(500).refine(validWriteScope, 'Write scopes must be relative non-glob paths without traversal')).max(100).optional(),
-    agent: z.enum(['claude', 'codex', 'gemini', 'qwen']).optional(),
+    agent: AgentSchema.optional(),
     /** Inbox request that created this story. Used for idempotent append-only intake. */
     sourceChange: z.string().min(1).optional(),
     quality: StoryQualityDeclarationSchema.optional(),

package/dist/loop/reporter.js

@@ -257,6 +257,7 @@ export function makeReporter(dir, opts = {}, now = () => new Date()) {
                         startedAt: previous.startedAt,
                         selectedProvider: previous.selectedProvider,
                         selectedModel: previous.selectedModel,
+                        selectedVariant: previous.selectedVariant,
                         ...(previous.model ? { model: previous.model } : {}),
                         provider: previous.provider,
                         ...(previous.phase ? { phase: previous.phase } : {}),