@polderlabs/bizar 10.23.13 → 10.23.15

package/cli/bin.mjs

@@ -129,6 +129,7 @@ function showHelp() {
     workflow <subcommand>  Session-bound autopilot workflow state
     hook <name>            Run a portable Claude Code hook
     worktree-merge <branch>  Merge a feature branch with archive tag (no work lost)
+    worker <subcommand>      Run an exact-model Claude process worker in a worktree
     models                 Configure the global model picker and Models.dev metadata
     evidence <subcommand>  Inspect model-routing evidence
     improve <subcommand>   Propose and verify bounded self-edits
@@ -613,6 +614,14 @@ async function main() {
       return;
     }
 
+    case 'worker': {
+      const mod = await importCommand('worker');
+      if (!mod) { process.exit(EXIT_ERROR); return; }
+      const found = await mod.run(cmd, cmdArgs, isHelpRequest);
+      if (found === false) process.exit(EXIT_USAGE);
+      break;
+    }
+
     case 'explain-run': {
       const mod = await importCommand('explain-run');
       if (!mod) {

package/cli/commands/models.mjs

@@ -991,6 +991,7 @@ export function applyModelOverrides({ settingsJsonPath, pickedIds, liveIds = [],
   // must be keys; configured gateway aliases are values. This also suppresses
   // print-mode `[claude-code:unrecognized_model]` diagnostics for Agent SDK calls.
   settings.modelOverrides = buildClaudeModelOverrides(synced);
+  const nativeAgentAliases = applyNativeAgentAliasTargets(settings, synced);
   if (requiresGatewayModelDiscovery(synced)) {
     settings.env = {
       ...(settings.env || {}),
@@ -1020,8 +1021,8 @@ export function applyModelOverrides({ settingsJsonPath, pickedIds, liveIds = [],
     syncedIds: synced,
     skippedStale: skipped,
     skippedDisabled,
+    nativeAgentAliases,
     settingsPath: path,
-    agentAliases: resolveNativeAgentAliases(settings.modelOverrides),
   };
 }
 
@@ -1043,9 +1044,8 @@ export function configuredEnabledModels(router) {
 }
 
 export const CLAUDE_MODEL_OVERRIDE_KEYS = Object.freeze([
-  'claude-fable-5',
-  'claude-opus-5',
   'claude-sonnet-5',
+  'claude-opus-5',
   'claude-haiku-4-5-20251001',
   'claude-opus-4-8',
   'claude-opus-4-7',
@@ -1061,20 +1061,45 @@ export const CLAUDE_MODEL_OVERRIDE_KEYS = Object.freeze([
   'claude-3-5-sonnet-20241022',
 ]);
 
-// These are Claude Code transport aliases, not model choices. Gateway model
-// IDs remain entirely operator-selected in the global Bizar router. Do not
-// use `fable`: its Claude-branded label is misleading for opted-out users.
-export const NATIVE_AGENT_TRANSPORT_KEYS = Object.freeze({
+// Claude Code's native Agent tool accepts these transport labels in the
+// installed runtime. They are labels only: Bizar binds them to the operator's
+// gateway IDs below; they never select an Anthropic provider by themselves.
+export const NATIVE_AGENT_ALIASES = Object.freeze(['sonnet', 'opus', 'haiku', 'fable']);
+
+const NATIVE_AGENT_OVERRIDE_KEYS = Object.freeze({
   sonnet: 'claude-sonnet-5',
   opus: 'claude-opus-5',
   haiku: 'claude-haiku-4-5-20251001',
+  fable: 'claude-fable-5',
 });
 
-export function resolveNativeAgentAliases(modelOverrides) {
-  const overrides = modelOverrides && typeof modelOverrides === 'object' ? modelOverrides : {};
-  return Object.fromEntries(Object.entries(NATIVE_AGENT_TRANSPORT_KEYS)
-    .filter(([, key]) => typeof overrides[key] === 'string' && overrides[key].trim())
-    .map(([alias, key]) => [overrides[key].trim(), alias]));
+export function buildNativeAgentAliasTargets(modelIds) {
+  const unique = [...new Set((Array.isArray(modelIds) ? modelIds : [])
+    .filter((id) => typeof id === 'string' && id.trim())
+    .map((id) => id.trim()))];
+  if (unique.length === 0) return {};
+  return Object.fromEntries(NATIVE_AGENT_ALIASES.map((alias, index) => [
+    alias,
+    unique[index] || unique[0],
+  ]));
+}
+
+export function applyNativeAgentAliasTargets(settings, modelIds) {
+  const targets = buildNativeAgentAliasTargets(modelIds);
+  const env = { ...(settings.env || {}) };
+  const envKeys = {
+    sonnet: 'ANTHROPIC_DEFAULT_SONNET_MODEL',
+    opus: 'ANTHROPIC_DEFAULT_OPUS_MODEL',
+    haiku: 'ANTHROPIC_DEFAULT_HAIKU_MODEL',
+    fable: 'ANTHROPIC_DEFAULT_FABLE_MODEL',
+  };
+  for (const alias of NATIVE_AGENT_ALIASES) {
+    const envKey = envKeys[alias];
+    if (targets[alias]) env[envKey] = targets[alias];
+    else delete env[envKey];
+  }
+  settings.env = env;
+  return targets;
 }
 
 export function buildClaudeModelOverrides(modelIds) {
@@ -1082,14 +1107,15 @@ export function buildClaudeModelOverrides(modelIds) {
     .filter((id) => typeof id === 'string' && id.trim())
     .map((id) => id.trim()))];
   if (unique.length === 0) return {};
-  // Reserve accepted native Agent aliases first so custom gateway IDs have a
-  // valid transport without putting the raw ID into Agent.model.
-  const transportIndex = new Map(Object.values(NATIVE_AGENT_TRANSPORT_KEYS)
-    .map((key, index) => [key, index]));
-  return Object.fromEntries(CLAUDE_MODEL_OVERRIDE_KEYS.map((key, index) => [
-    key,
-    unique[(transportIndex.get(key) ?? index) % unique.length],
-  ]));
+  const targets = buildNativeAgentAliasTargets(unique);
+  const nativeEntries = NATIVE_AGENT_ALIASES.map((alias) => [
+    NATIVE_AGENT_OVERRIDE_KEYS[alias],
+    targets[alias],
+  ]);
+  const remaining = CLAUDE_MODEL_OVERRIDE_KEYS
+    .filter((key) => !Object.values(NATIVE_AGENT_OVERRIDE_KEYS).includes(key))
+    .map((key, index) => [key, unique[index % unique.length]]);
+  return Object.fromEntries([...nativeEntries, ...remaining]);
 }
 
 /** Custom gateway IDs must be discoverable to Claude's SDK/subagent path. */

package/cli/commands/worker.mjs

@@ -0,0 +1,125 @@
+/**
+ * Exact-model process workers.
+ *
+ * This command is the separately launched alternative: it creates an isolated
+ * worktree and starts a top-level Claude process with the literal gateway ID
+ * selected through `bizar models`. No global settings are rewritten per
+ * worker, so parallel workers cannot race each other's model selection.
+ */
+import { spawn, spawnSync } from 'node:child_process';
+import { createWriteStream, existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from 'node:fs';
+import { basename, dirname, join } from 'node:path';
+import { randomUUID } from 'node:crypto';
+import { resolveBizarHome, resolveClaudeConfigDir, resolveGlobalModelRouter } from '../config-paths.mjs';
+
+function runGit(args, cwd) {
+  const result = spawnSync('git', args, { cwd, encoding: 'utf8' });
+  if (result.status !== 0) throw new Error((result.stderr || result.stdout || `git ${args.join(' ')} failed`).trim());
+  return result.stdout.trim();
+}
+
+function readRouter() {
+  const path = resolveGlobalModelRouter();
+  try { return JSON.parse(readFileSync(path, 'utf8')); } catch { throw new Error('Global Bizar model router is missing or invalid; run `bizar models`.'); }
+}
+
+export function enabledModels(router) {
+  const disabled = new Set((router.disabledProviders || []).filter((id) => typeof id === 'string').map((id) => id.trim().toLowerCase()));
+  return (router.userSelected?.models || []).filter((id) => typeof id === 'string' && id.trim() && ![...disabled].some((prefix) => id.toLowerCase().startsWith(prefix)));
+}
+
+function workerRoot() { return join(resolveBizarHome(), 'workers'); }
+function statePath(id) { return join(workerRoot(), `${id}.json`); }
+function writeState(state) {
+  mkdirSync(workerRoot(), { recursive: true, mode: 0o700 });
+  writeFileSync(statePath(state.id), JSON.stringify(state, null, 2) + '\n', { mode: 0o600 });
+}
+
+export function buildWorkerPlan({ repoRoot = process.cwd(), model, task, agent = 'todd' } = {}) {
+  if (!model || typeof model !== 'string') throw new Error('worker start requires --model <selected gateway model id>.');
+  if (!task || typeof task !== 'string') throw new Error('worker start requires --task <bounded task>.');
+  const router = readRouter();
+  if (!enabledModels(router).includes(model)) throw new Error(`Model ${model} is not an enabled global bizar models selection.`);
+  const root = runGit(['rev-parse', '--show-toplevel'], repoRoot);
+  const id = `worker-${randomUUID().slice(0, 8)}`;
+  const branch = `wt/${id}`;
+  const worktree = join(dirname(root), `${basename(root)}-${id}`);
+  const logPath = join(workerRoot(), `${id}.log`);
+  return { id, root, branch, worktree, model, task: task.trim(), agent, logPath };
+}
+
+export function workerClaudeArgs(plan) {
+  return [
+    '--print', '--name', `bizar-${plan.id}`, '--model', plan.model,
+    '--permission-mode', 'acceptEdits', '--agent', plan.agent,
+    `${plan.task}\n\nYou are an exact-model Bizar process worker in ${plan.worktree}. Work only in this worktree. Do not spawn subagents. Implement and test the bounded task, commit one logical change locally, never push, then report the commit and verification.`,
+  ];
+}
+
+function parseStart(args) {
+  const value = (name) => {
+    const eq = args.find((arg) => arg.startsWith(`${name}=`));
+    if (eq) return eq.slice(name.length + 1);
+    const index = args.indexOf(name);
+    return index >= 0 ? args[index + 1] : null;
+  };
+  return { model: value('--model'), task: value('--task'), agent: value('--agent') || 'todd', background: args.includes('--background') };
+}
+
+function listWorkers() {
+  if (!existsSync(workerRoot())) return [];
+  return readdirSync(workerRoot()).filter((name) => name.endsWith('.json')).flatMap((name) => {
+    try { return [JSON.parse(readFileSync(join(workerRoot(), name), 'utf8'))]; } catch { return []; }
+  }).sort((a, b) => String(b.startedAt || '').localeCompare(String(a.startedAt || '')));
+}
+
+function usage() {
+  console.log(`
+  bizar worker start --model <selected-id> --task <task> [--agent todd] [--background]
+  bizar worker list [--json]
+
+  Starts an isolated top-level Claude Code process in a wt/ worktree with the
+  exact selected gateway model. Use this when a separately launched worktree
+  process is useful. Merge completed branches with bizar worktree-merge <branch>.
+`);
+}
+
+export async function run(name, args, isHelpRequest) {
+  if (name !== 'worker') return false;
+  if (isHelpRequest || args.length === 0) { usage(); return true; }
+  const [subcommand] = args;
+  if (subcommand === 'list') {
+    const rows = listWorkers();
+    if (args.includes('--json')) process.stdout.write(JSON.stringify(rows, null, 2) + '\n');
+    else for (const row of rows) console.log(`${row.id}\t${row.status}\t${row.model}\t${row.branch}`);
+    return true;
+  }
+  if (subcommand !== 'start') { usage(); return false; }
+  const parsed = parseStart(args.slice(1));
+  const plan = buildWorkerPlan({ repoRoot: process.cwd(), ...parsed });
+  mkdirSync(workerRoot(), { recursive: true, mode: 0o700 });
+  runGit(['worktree', 'add', '-b', plan.branch, plan.worktree, 'HEAD'], plan.root);
+  const state = { ...plan, status: 'running', startedAt: new Date().toISOString(), pid: null };
+  const child = spawn(process.env.CLAUDE_BIN || 'claude', workerClaudeArgs(plan), {
+    cwd: plan.worktree,
+    env: { ...process.env, CLAUDE_CONFIG_DIR: resolveClaudeConfigDir() },
+    detached: parsed.background,
+    stdio: parsed.background ? ['ignore', 'pipe', 'pipe'] : 'inherit',
+  });
+  child.once('error', (error) => {
+    writeState({ ...state, status: 'failed', exitedAt: new Date().toISOString(), error: error.message });
+    console.error(`Unable to start exact-model worker: ${error.message}`);
+  });
+  state.pid = child.pid || null;
+  writeState(state);
+  child.once('exit', (code) => writeState({ ...state, status: code === 0 ? 'completed' : 'failed', exitedAt: new Date().toISOString(), exitCode: code ?? 1 }));
+  if (parsed.background) {
+    const log = createWriteStream(plan.logPath, { flags: 'a', mode: 0o600 });
+    child.stdout?.pipe(log); child.stderr?.pipe(log); child.unref();
+    console.log(JSON.stringify({ id: plan.id, status: 'running', model: plan.model, branch: plan.branch, worktree: plan.worktree }));
+    return true;
+  }
+  const code = await new Promise((done) => child.once('exit', (value) => done(value ?? 1)));
+  process.exitCode = code;
+  return true;
+}

package/config/claude/agents/office-manager.md

@@ -17,7 +17,7 @@ default for meaningful work.
 | Shape | Signals | Execution |
 |---|---|---|
 | Tiny direct | one obvious copy, typo, comment, whitespace, or single style-token edit; one target; no behavior or test change | inspect, make the micro-edit, run the smallest proving check yourself |
-| Single isolated worker | one bounded implementation after scope is clear | dispatch one worktree-isolated Agent with an explicit Bizar model; integrate and verify |
+| Single isolated worker | one bounded implementation after scope is clear | dispatch one worktree-isolated native Agent with its explicit Bizar model; use an exact-model process worker only when a separate Claude process is useful; integrate and verify |
 | Native workflow | repeatable diagnosis, research, review, or an implementation needing visible phase barriers | invoke the matching Bizar workflow with explicit Bizar routing |
 | Agent team | three or more sustained, independent roles need bounded cross-talk or coordinated handoff | use the native Agent-team capability; writers use worktrees and explicit Bizar models |
 | Parallel agents | two disjoint writable scopes with no cross-talk needed | dispatch concurrently with explicit models and worktree isolation |
@@ -34,15 +34,20 @@ version-sensitive claims. Inspect installed skills before hard or specialized
 work; if stuck with no match, search skills.sh and review the candidate before
 proposing installation.
 
-Before every Workflow, Agent, or Agent-team call, read the global Bizar model router and construct a
-small `args.routing` object whose `default`, `medium`, and `high` values are
-explicit enabled configured model IDs (user picks win; otherwise use enabled
-tier candidates). Include the user's task in the same args object under the
-workflow's documented task field. Native Agent accepts only its transport
-aliases (`sonnet`, `opus`, or `haiku`), never a raw gateway ID. Use the alias
-that `bizar models` synchronized for the selected ID, and include the selected
-ID in `additionalContext.bizarConfiguredModel` for guard verification. If no
-configured ID exists, stop and ask the operator to run `bizar models`.
+Before every Workflow, Agent, or Agent-team call, read the global Bizar model
+router and construct a small `args.routing` object whose `default`, `medium`,
+and `high` values are explicit enabled configured gateway IDs. Include the
+user's task in the same args object under the workflow's documented task field.
+Pass the chosen full gateway ID directly in every native Agent `model` field;
+current Claude Code supports full model IDs there. Include that same ID in
+`additionalContext.bizarConfiguredModel` for audit telemetry. Never use
+`inherit` or an unconfigured provider default. `bizar models` additionally
+maintains `sonnet`, `opus`, `haiku`, and `fable` aliases as compatibility
+shortcuts, but aliases must not limit dispatch to four selected models. The
+exact-model `bizar worker` command remains available where a separate top-level
+Claude process is useful, not as a fallback for normal native dispatch. If no
+configured model exists, stop and ask the operator to run `bizar models`; never
+omit model selection or cycle providers.
 
 Invoke the selected workflow by `name` first. If Claude reports that the Bizar
 name is unavailable, resolve the active Claude config directory and retry once
@@ -55,14 +60,16 @@ implementation around a broken workflow installation.
 
 ## Models
 
-For every Agent call, select the cheapest sufficient enabled configured model
+For every dispatch, select the cheapest sufficient enabled configured model
 from the global Bizar router. User-selected models take precedence over tier
-candidates; `disabledProviders` excludes both. Pass only the synchronized
-native transport alias, never a raw gateway ID; the guard verifies its mapping
-to the selected custom ID. If no enabled configured candidate exists, stop
-with the configuration error. Never let Claude choose an unconfigured default
-or retry by cycling aliases, providers, or tiers. A single configured transport
-failover is allowed only when the router explicitly supplies it.
+candidates; `disabledProviders` excludes both. Native aliases are transport
+labels bound by `bizar models`, not Anthropic selections. Use the full selected
+model ID directly for native Agents and teams; every enabled selection is
+eligible. Use `bizar worker` only when a separately launched process worktree
+is useful. If no enabled configured candidate exists, stop with the
+configuration error. Never let Claude choose an unconfigured default, inherit
+the session model, use an unmapped alias,
+or retry by cycling models, providers, or tiers.
 
 ## Worktree Discipline and integration
 

package/config/claude/hooks/agent-model-guard.mjs

@@ -169,15 +169,26 @@ const NATIVE_AGENT_TRANSPORT_KEYS = Object.freeze({
   sonnet: 'claude-sonnet-5',
   opus: 'claude-opus-5',
   haiku: 'claude-haiku-4-5-20251001',
+  fable: 'claude-fable-5',
+});
+
+const NATIVE_AGENT_TRANSPORT_ENV_KEYS = Object.freeze({
+  sonnet: 'ANTHROPIC_DEFAULT_SONNET_MODEL',
+  opus: 'ANTHROPIC_DEFAULT_OPUS_MODEL',
+  haiku: 'ANTHROPIC_DEFAULT_HAIKU_MODEL',
+  fable: 'ANTHROPIC_DEFAULT_FABLE_MODEL',
 });
 
 function readTransportTarget(alias, options = {}) {
   const key = NATIVE_AGENT_TRANSPORT_KEYS[alias];
   if (!key) return '';
-  const overrides = options.modelOverrides || (() => {
+  const settings = options.settings || (options.modelOverrides ? null : (() => {
     const settingsPath = options.settingsPath || join(resolveClaudeConfigDir(), 'settings.json');
-    try { return JSON.parse(readFileSync(settingsPath, 'utf8'))?.modelOverrides; } catch { return null; }
-  })();
+    try { return JSON.parse(readFileSync(settingsPath, 'utf8')); } catch { return null; }
+  })());
+  const envTarget = settings?.env?.[NATIVE_AGENT_TRANSPORT_ENV_KEYS[alias]];
+  if (typeof envTarget === 'string' && envTarget.trim()) return envTarget.trim();
+  const overrides = options.modelOverrides || settings?.modelOverrides;
   return typeof overrides?.[key] === 'string' ? overrides[key].trim() : '';
 }
 
@@ -224,12 +235,23 @@ export async function guardAgentModel(input, options = {}) {
 
   const transportTarget = readTransportTarget(requested, options);
   if (transportTarget) {
-    if (configuredContext !== transportTarget || !userPicks.has(transportTarget)) {
-      return deny(`Bizar Agent dispatch blocked: native alias ${requested} does not map to the audited enabled Bizar selection. Re-run \`bizar models\` and restart Claude Code.`);
+    // `modelOverrides` is the native Agent transport contract: Claude Code
+    // invokes this alias with the mapped gateway ID. The optional context is
+    // useful for telemetry, but must not make a valid configured alias fail
+    // when Mike's prompt carries a different (also selected) planning pick.
+    if (!userPicks.has(transportTarget)) {
+      return deny(`Bizar Agent dispatch blocked: native alias ${requested} does not map to an enabled Bizar selection. Re-run \`bizar models\` and restart Claude Code.`);
     }
     return {};
   }
 
+  // Claude Code accepts full model IDs for native Agent calls. A model picked
+  // through `bizar models` is therefore valid directly; do not collapse every
+  // user selection into the four family aliases.
+  if (userPicks.has(requested) && !hasFailoverContract) {
+    return {};
+  }
+
   // F-185 contract: when the orchestrator passes both `routingDecisionId`
   // and `fallback`, validate the fallback against the userSelected pool
   // but skip the live-discovery re-probe. The fallback's eligibility was

package/config/claude/hooks/sessionstart-model-sync.mjs

@@ -116,6 +116,28 @@ function requiresGatewayModelDiscovery(modelIds) {
   return modelIds.some((id) => !/^(?:claude(?:-|$)|anthropic(?:[./-]|$))/i.test(id));
 }
 
+// Bind Claude Code's four family aliases to the operator's selected gateway
+// IDs for compatibility. They never imply an Anthropic provider selection and
+// do not constrain full-ID native Agent dispatch.
+const NATIVE_AGENT_ALIASES = ['sonnet', 'opus', 'haiku', 'fable'];
+const NATIVE_AGENT_OVERRIDE_KEYS = {
+  sonnet: 'claude-sonnet-5',
+  opus: 'claude-opus-5',
+  haiku: 'claude-haiku-4-5-20251001',
+  fable: 'claude-fable-5',
+};
+const NATIVE_AGENT_ENV_KEYS = {
+  sonnet: 'ANTHROPIC_DEFAULT_SONNET_MODEL',
+  opus: 'ANTHROPIC_DEFAULT_OPUS_MODEL',
+  haiku: 'ANTHROPIC_DEFAULT_HAIKU_MODEL',
+  fable: 'ANTHROPIC_DEFAULT_FABLE_MODEL',
+};
+
+function nativeAgentAliasTargets(modelIds) {
+  if (modelIds.length === 0) return {};
+  return Object.fromEntries(NATIVE_AGENT_ALIASES.map((alias, index) => [alias, modelIds[index] || modelIds[0]]));
+}
+
 function readSettingsPath() {
   return join(resolveClaudeConfigDir(), 'settings.json');
 }
@@ -217,18 +239,24 @@ function syncOnce() {
   });
 
   const overrideKeys = [
-    'claude-fable-5', 'claude-opus-5', 'claude-sonnet-5',
-    'claude-haiku-4-5-20251001', 'claude-opus-4-8', 'claude-opus-4-7',
+    'claude-sonnet-5', 'claude-opus-5', 'claude-haiku-4-5-20251001', 'claude-fable-5',
+    'claude-opus-4-8', 'claude-opus-4-7',
     'claude-opus-4-6', 'claude-sonnet-4-6', 'claude-opus-4-5-20251101',
     'claude-sonnet-4-5-20250929', 'claude-opus-4-1-20250805',
     'claude-opus-4-20250514', 'claude-sonnet-4-20250514',
     'claude-3-7-sonnet-20250219', 'claude-3-5-haiku-20241022',
     'claude-3-5-sonnet-20241022',
   ];
+  const aliasTargets = nativeAgentAliasTargets(liveIds);
   settings.modelPicker = { options };
   settings.modelOverrides = Object.fromEntries(
-    overrideKeys.map((key, index) => [key, liveIds[index % liveIds.length]]),
+    overrideKeys.map((key, index) => {
+      const alias = NATIVE_AGENT_ALIASES.find((candidate) => NATIVE_AGENT_OVERRIDE_KEYS[candidate] === key);
+      return [key, alias ? aliasTargets[alias] : liveIds[index % liveIds.length]];
+    }),
   );
+  settings.env = { ...(settings.env || {}) };
+  for (const alias of NATIVE_AGENT_ALIASES) settings.env[NATIVE_AGENT_ENV_KEYS[alias]] = aliasTargets[alias];
   if (requiresGatewayModelDiscovery(liveIds)) {
     settings.env = {
       ...(settings.env || {}),

package/config/claude/hooks/worker-suggest.mjs

@@ -60,7 +60,7 @@ const ROUTE_POLICY = [
   'Adaptive Bizar routing policy:',
   '- If this is the primary session, you ARE @mike. First do only bounded read-only orientation. Then ask one concise clarification question describing the inferred outcome, the material choice/risk, and your proposed coordination mode. Wait for the answer before edits, branches, tests, or editor dispatch. If the user explicitly waives questions, continue autonomously.',
   '- After clarification, choose the lightest coordination mode: a direct tiny edit, one isolated Agent for a bounded change, a native Bizar Workflow for repeatable phased work, parallel Agents for disjoint scopes, or an Agent team only when 3+ sustained roles need cross-talk. Do not force a workflow or team when it adds no value.',
-  '- Every Agent or team member receives an enabled configured Bizar selection. Native Agent calls use only the synchronized sonnet/opus/haiku transport alias plus additionalContext.bizarConfiguredModel; the guard proves that alias maps to the selected custom gateway ID. Never pass raw gateway IDs or fall back to a provider default. Every editing worker uses call-level `isolation: "worktree"`. For genuinely disjoint writable scopes, dispatch concurrently; otherwise use one owner.',
+  '- Every Agent or team member receives one exact raw model ID from the enabled `bizar models` user selection. Pass that ID directly as `model`; never substitute a Claude family alias, provider default, or inherited session model. The guard allows only IDs in the global user-selected pool. If a selected custom model is denied, inspect `~/.claude/model-router.json`; do not retry with another model. Every editing worker uses call-level `isolation: "worktree"`. For genuinely disjoint writable scopes, dispatch concurrently; otherwise use one owner.',
   '- Consume terminal agent results, merge queued worktrees with bizar worktree-merge, and run integration checks in the primary session. A subagent may not recursively dispatch itself.',
   '- Do NOT execute any tool you do not have. If a tool you need is missing from your tools list, dispatch to a subagent that has it — do not pretend you have it.',
   '- If you are already running as a Bizar custom agent, follow your assigned role and do not recursively dispatch yourself.',

package/config/workflows/bizar-debug.js

@@ -22,12 +22,14 @@ const WORKFLOW_DEFAULT_MODEL = typeof WORKFLOW_INPUT.model === 'string'
     : ''
 const routeModel = (risk) => {
   const candidate = WORKFLOW_ROUTING[risk] || WORKFLOW_ROUTING.default || WORKFLOW_DEFAULT_MODEL
-  return typeof candidate === 'string' ? candidate.trim() : ''
+  if (typeof candidate !== 'string') return ''
+  const selected = candidate.trim()
+  return selected
 }
 if (!routeModel('medium') || !routeModel('high')) {
   return {
     status: 'blocked',
-    reason: 'No explicit configured Bizar model routing was supplied. Read the global Bizar model router and retry with args.routing; provider defaults are prohibited.',
+    reason: 'No explicit enabled Bizar model was supplied for workflow routing. Read the global model router and retry with args.routing; provider defaults are prohibited.',
   }
 }
 let WORKFLOW_DISPATCH_SEQUENCE = 0

package/config/workflows/bizar-implement.js

@@ -21,12 +21,14 @@ const WORKFLOW_DEFAULT_MODEL = typeof WORKFLOW_INPUT.model === 'string'
     : ''
 const routeModel = (risk) => {
   const candidate = WORKFLOW_ROUTING[risk] || WORKFLOW_ROUTING.default || WORKFLOW_DEFAULT_MODEL
-  return typeof candidate === 'string' ? candidate.trim() : ''
+  if (typeof candidate !== 'string') return ''
+  const selected = candidate.trim()
+  return selected
 }
 if (!routeModel('medium') || !routeModel('high')) {
   return {
     status: 'blocked',
-    reason: 'No explicit configured Bizar model routing was supplied. Read the global Bizar model router and retry with args.routing; provider defaults are prohibited.',
+    reason: 'No explicit enabled Bizar model was supplied for workflow routing. Read the global model router and retry with args.routing; provider defaults are prohibited.',
   }
 }
 let WORKFLOW_DISPATCH_SEQUENCE = 0

package/config/workflows/bizar-research.js

@@ -22,12 +22,14 @@ const WORKFLOW_DEFAULT_MODEL = typeof WORKFLOW_INPUT.model === 'string'
     : ''
 const routeModel = (risk) => {
   const candidate = WORKFLOW_ROUTING[risk] || WORKFLOW_ROUTING.default || WORKFLOW_DEFAULT_MODEL
-  return typeof candidate === 'string' ? candidate.trim() : ''
+  if (typeof candidate !== 'string') return ''
+  const selected = candidate.trim()
+  return selected
 }
 if (!routeModel('medium') || !routeModel('high')) {
   return {
     status: 'blocked',
-    reason: 'No explicit configured Bizar model routing was supplied. Read the global Bizar model router and retry with args.routing; provider defaults are prohibited.',
+    reason: 'No explicit enabled Bizar model was supplied for workflow routing. Read the global model router and retry with args.routing; provider defaults are prohibited.',
   }
 }
 let WORKFLOW_DISPATCH_SEQUENCE = 0

package/config/workflows/lib/dispatch.js

@@ -387,24 +387,9 @@ function defaultConfigPaths({ cwd = process.cwd(), env = process.env } = {}) {
     health: join(home, 'health.json'),
     budget: join(home, 'budget.json'),
     userSelected: join(home, 'userSelected.json'),
-    claudeSettings: join(claudeDir, 'settings.json'),
   };
 }
 
-const NATIVE_AGENT_TRANSPORT_KEYS = Object.freeze({
-  sonnet: 'claude-sonnet-5',
-  opus: 'claude-opus-5',
-  haiku: 'claude-haiku-4-5-20251001',
-});
-
-function loadAgentTransportAliases(settingsPath) {
-  const overrides = readJson(settingsPath)?.modelOverrides;
-  if (!overrides || typeof overrides !== 'object') return {};
-  return Object.fromEntries(Object.entries(NATIVE_AGENT_TRANSPORT_KEYS)
-    .filter(([, key]) => typeof overrides[key] === 'string' && overrides[key].trim())
-    .map(([alias, key]) => [overrides[key].trim(), alias]));
-}
-
 function readJson(path) {
   try {
     if (!existsSync(path)) return undefined;
@@ -479,8 +464,7 @@ export function loadDispatchContext({ cwd = process.cwd(), env = process.env } =
   const healthRaw = readJson(paths.health) ?? {};
   const health = (healthRaw && typeof healthRaw === 'object' && healthRaw.models) || {};
   const activeSessionModel = env.BIZAR_ACTIVE_SESSION_MODEL ?? loadActiveSessionModel();
-  const agentAliases = loadAgentTransportAliases(paths.claudeSettings);
-  return { selectedProfiles, staticProfiles, activeSessionModel, budget, health, agentAliases, evidenceDir: resolveEvidenceDir() };
+  return { selectedProfiles, staticProfiles, activeSessionModel, budget, health, evidenceDir: resolveEvidenceDir() };
 }
 
 function resolveEvidenceDir({ cwd = process.cwd(), env = process.env } = {}) {
@@ -812,14 +796,15 @@ export function classifyDispatchOutcome(result, error, startMs) {
 }
 
 /**
- * Build the augmented agent-call payload. The native Agent model field cannot
- * carry arbitrary gateway IDs, so the selected Bizar ID is audit context and
- * the guard permits inheritance only from an identical configured parent.
+ * Build the augmented native-Agent payload. Claude Code supports an explicit
+ * full model ID in an Agent invocation; use the selected gateway ID directly
+ * so every configured selection is usable by native agents and teams. The
+ * transport aliases remain a compatibility option for callers that need them.
  */
-export function augmentPayload(opts, decision, agentName, transportAlias) {
+export function augmentPayload(opts, decision, agentName, context = {}) {
   return {
     ...opts,
-    model: transportAlias,
+    model: decision.modelId,
     additionalContext: {
       ...(opts.additionalContext && typeof opts.additionalContext === 'object' ? opts.additionalContext : {}),
       bizarConfiguredModel: decision.modelId ?? null,
@@ -874,20 +859,14 @@ export async function dispatchAgent(agentFn, agentName, prompt, opts = {}, conte
   if (!agentName || typeof agentName !== 'string') {
     throw new TypeError('dispatchAgent requires a non-empty agentName');
   }
-  const decision = computeDecision(agentName, prompt, opts, context);
+  const ctx = context ?? loadDispatchContext();
+  const decision = computeDecision(agentName, prompt, opts, ctx);
   if (!decision.modelId) {
     throw new ModelRoutingError(
       'No enabled configured model is available for this Agent dispatch. Configure a model tier or user selection with `bizar models`; refusing to inherit an unconfigured provider default.',
     );
   }
-  const ctx = context ?? loadDispatchContext();
-  const transportAlias = ctx.agentAliases?.[decision.modelId];
-  if (!transportAlias) {
-    throw new ModelRoutingError(
-      `No native Agent transport alias maps to ${decision.modelId}. Re-run \`bizar models\` to synchronize global Claude settings, then restart Claude Code.`,
-    );
-  }
-  const augmented = augmentPayload(opts, decision, agentName, transportAlias);
+  const augmented = augmentPayload(opts, decision, agentName, ctx);
 
   // F-191 / IMP-018 audit trail — persist the decision before invoking
   // the agent. Best-effort: telemetry failures MUST NOT abort the

package/config/workflows/ultracode-research.js

@@ -20,12 +20,14 @@ const WORKFLOW_DEFAULT_MODEL = typeof WORKFLOW_INPUT.model === 'string'
     : ''
 const routeModel = (risk) => {
   const candidate = WORKFLOW_ROUTING[risk] || WORKFLOW_ROUTING.default || WORKFLOW_DEFAULT_MODEL
-  return typeof candidate === 'string' ? candidate.trim() : ''
+  if (typeof candidate !== 'string') return ''
+  const selected = candidate.trim()
+  return selected
 }
 if (!routeModel('medium') || !routeModel('high')) {
   return {
     status: 'blocked',
-    reason: 'No explicit configured Bizar model routing was supplied. Read the global Bizar model router and retry with args.routing; provider defaults are prohibited.',
+    reason: 'No explicit enabled Bizar model was supplied for workflow routing. Read the global model router and retry with args.routing; provider defaults are prohibited.',
   }
 }
 let WORKFLOW_DISPATCH_SEQUENCE = 0

package/config/workflows/ultracode-review.js

@@ -19,12 +19,14 @@ const WORKFLOW_DEFAULT_MODEL = typeof WORKFLOW_INPUT.model === 'string'
     : ''
 const routeModel = (risk) => {
   const candidate = WORKFLOW_ROUTING[risk] || WORKFLOW_ROUTING.default || WORKFLOW_DEFAULT_MODEL
-  return typeof candidate === 'string' ? candidate.trim() : ''
+  if (typeof candidate !== 'string') return ''
+  const selected = candidate.trim()
+  return selected
 }
 if (!routeModel('medium') || !routeModel('high')) {
   return {
     status: 'blocked',
-    reason: 'No explicit configured Bizar model routing was supplied. Read the global Bizar model router and retry with args.routing; provider defaults are prohibited.',
+    reason: 'No explicit enabled Bizar model was supplied for workflow routing. Read the global model router and retry with args.routing; provider defaults are prohibited.',
   }
 }
 let WORKFLOW_DISPATCH_SEQUENCE = 0

package/config/workflows/ultracode.js

@@ -21,12 +21,14 @@ const WORKFLOW_DEFAULT_MODEL = typeof WORKFLOW_INPUT.model === 'string'
     : ''
 const routeModel = (risk) => {
   const candidate = WORKFLOW_ROUTING[risk] || WORKFLOW_ROUTING.default || WORKFLOW_DEFAULT_MODEL
-  return typeof candidate === 'string' ? candidate.trim() : ''
+  if (typeof candidate !== 'string') return ''
+  const selected = candidate.trim()
+  return selected
 }
 if (!routeModel('medium') || !routeModel('high')) {
   return {
     status: 'blocked',
-    reason: 'No explicit configured Bizar model routing was supplied. Read the global Bizar model router and retry with args.routing; provider defaults are prohibited.',
+    reason: 'No explicit enabled Bizar model was supplied for workflow routing. Read the global model router and retry with args.routing; provider defaults are prohibited.',
   }
 }
 let WORKFLOW_DISPATCH_SEQUENCE = 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polderlabs/bizar",
-  "version": "10.23.13",
+  "version": "10.23.15",
   "description": "Autonomous, human-in-the-loop multi-agent harness for Claude Code with guarded workflows, typed SDK primitives, and MCP tools.",
   "type": "module",
   "bin": {