@polderlabs/bizar 10.23.11 → 10.23.13

package/cli/commands/models.mjs

@@ -1015,7 +1015,14 @@ export function applyModelOverrides({ settingsJsonPath, pickedIds, liveIds = [],
     if (Object.keys(settings.env).length === 0) delete settings.env;
   }
   writeAtomic(path, JSON.stringify(settings, null, 2) + '\n');
-  return { wrote: true, syncedIds: synced, skippedStale: skipped, skippedDisabled, settingsPath: path };
+  return {
+    wrote: true,
+    syncedIds: synced,
+    skippedStale: skipped,
+    skippedDisabled,
+    settingsPath: path,
+    agentAliases: resolveNativeAgentAliases(settings.modelOverrides),
+  };
 }
 
 export function configuredFallbackModels(router) {
@@ -1054,16 +1061,35 @@ 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({
+  sonnet: 'claude-sonnet-5',
+  opus: 'claude-opus-5',
+  haiku: 'claude-haiku-4-5-20251001',
+});
+
+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 buildClaudeModelOverrides(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 {};
-  // Cover every built-in alias: the workflow runtime may normalize an Agent
-  // request through one of these names, and no alias may escape to an
-  // unconfigured Anthropic default.
-  return Object.fromEntries(CLAUDE_MODEL_OVERRIDE_KEYS
-    .map((key, index) => [key, unique[index % unique.length]]));
+  // 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],
+  ]));
 }
 
 /** Custom gateway IDs must be discoverable to Claude's SDK/subagent path. */

package/cli/config-paths.mjs

@@ -20,7 +20,10 @@ export function resolveGlobalModelRouter(options = {}) {
     ? env.BIZAR_MODEL_ROUTER_CONFIG.trim()
     : '';
   if (override) return isAbsolute(override) ? override : resolve(cwd, override);
-  return join(resolveBizarHome({ env, cwd }), 'config', 'claude', 'model-router.json');
+  // Claude Code reads hooks, agents, skills, and model-router from ~/.claude/.
+  // Use ~/.claude/model-router.json as the single canonical location so the
+  // hook and the CLI always agree on the same file.
+  return join(resolveClaudeConfigDir({ env, cwd }), 'model-router.json');
 }
 
 export function resolveGlobalLearningDir(options = {}) {

package/cli/provision.mjs

@@ -490,6 +490,8 @@ export function isBizarManagedModelRouter(value) {
 }
 
 export async function syncModelRouter({ dryRun = false, force = false } = {}) {
+  // Write to ~/.claude/model-router.json (resolveGlobalModelRouter now points there).
+  // This is the single canonical location — both the CLI and Claude Code hooks read it.
   const dest = resolveGlobalModelRouter();
   if (existsSync(dest)) {
     return { ok: true, message: `${dest} is operator-managed — preserved`, preserved: true };

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

@@ -38,9 +38,11 @@ Before every Workflow, Agent, or Agent-team call, read the global Bizar model ro
 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. Never pass only a string and never use
-`inherit`, `sonnet`, `opus`, or another provider default. If no configured ID
-exists, stop and ask the operator to run `bizar models`.
+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`.
 
 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,11 +57,12 @@ implementation around a broken workflow installation.
 
 For every Agent call, select the cheapest sufficient enabled configured model
 from the global Bizar router. User-selected models take precedence over tier
-candidates; `disabledProviders` excludes both. Always pass `model`. If no
-enabled configured candidate exists, stop with the configuration error. Never
-let Claude choose an unconfigured default and never retry by cycling models,
-aliases, providers, or tiers. A single configured transport failover is allowed
-only when the router explicitly supplies it.
+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.
 
 ## Worktree Discipline and integration
 

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

@@ -165,6 +165,22 @@ function readConfiguredParentModel(options = {}) {
   }
 }
 
+const NATIVE_AGENT_TRANSPORT_KEYS = Object.freeze({
+  sonnet: 'claude-sonnet-5',
+  opus: 'claude-opus-5',
+  haiku: 'claude-haiku-4-5-20251001',
+});
+
+function readTransportTarget(alias, options = {}) {
+  const key = NATIVE_AGENT_TRANSPORT_KEYS[alias];
+  if (!key) return '';
+  const overrides = options.modelOverrides || (() => {
+    const settingsPath = options.settingsPath || join(resolveClaudeConfigDir(), 'settings.json');
+    try { return JSON.parse(readFileSync(settingsPath, 'utf8'))?.modelOverrides; } catch { return null; }
+  })();
+  return typeof overrides?.[key] === 'string' ? overrides[key].trim() : '';
+}
+
 export async function guardAgentModel(input, options = {}) {
   if (!input || typeof input !== 'object') return {};
   if (input.hook_event_name !== 'PreToolUse' || input.tool_name !== 'Agent') return {};
@@ -190,13 +206,15 @@ export async function guardAgentModel(input, options = {}) {
   const allowed = configuredModels(registry);
   const userPicks = userSelectedModels(registry);
 
+  const configuredContext = typeof toolInput.additionalContext?.bizarConfiguredModel === 'string'
+    ? toolInput.additionalContext.bizarConfiguredModel.trim()
+    : '';
+
   // The native Agent tool rejects arbitrary gateway IDs in its `model` enum.
   // Inheritance is safe only when the auditable Bizar selection equals the
   // actual global Claude parent model and is a selected, enabled user pick.
   if (!requested || requested === 'inherit') {
-    const configured = typeof toolInput.additionalContext?.bizarConfiguredModel === 'string'
-      ? toolInput.additionalContext.bizarConfiguredModel.trim()
-      : '';
+    const configured = configuredContext;
     const parent = readConfiguredParentModel(options);
     if (!configured || configured !== parent || !userPicks.has(configured)) {
       return deny('Bizar Agent dispatch blocked: native Agent inheritance requires the global Claude parent model to exactly match an enabled Bizar user selection. Run `bizar models` and restart Claude Code.');
@@ -204,6 +222,14 @@ export async function guardAgentModel(input, options = {}) {
     return {};
   }
 
+  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.`);
+    }
+    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

@@ -3,7 +3,7 @@
  * sessionstart-model-sync.mjs — Claude Code SessionStart hook.
  *
  * Re-applies the operator's `userSelected.models` block (from
- * `~/.config/bizar/config/claude/model-router.json`) into the three
+ * `~/.claude/model-router.json`) into the three
  * Claude Code settings keys that the operator owns:
  *
  *   - modelPicker   → { options: [{ model, label }] } in user pick order
@@ -23,7 +23,7 @@
  *   This hook ONLY touches `modelPicker`, `modelOverrides`, and `model`.
  *   Env, mcpServers, permissions, hooks, and every other operator key is
  *   left untouched. The source of truth for picks
- *   (`~/.config/bizar/config/claude/model-router.json`) is also untouched.
+ *   (`~/.claude/model-router.json`) is also untouched.
  *
  * Failure policy:
  *   This is an advisory hook. Any failure (missing router, malformed JSON,

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 explicit enabled configured Bizar model; use no provider alias, inheritance, or 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 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.',
   '- 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/lib/dispatch.js

@@ -377,16 +377,34 @@ function defaultConfigPaths({ cwd = process.cwd(), env = process.env } = {}) {
   const configuredRouter = typeof env.BIZAR_MODEL_ROUTER_CONFIG === 'string'
     ? env.BIZAR_MODEL_ROUTER_CONFIG.trim()
     : '';
+  const claudeDir = typeof env.CLAUDE_CONFIG_DIR === 'string' && env.CLAUDE_CONFIG_DIR.trim()
+    ? (isAbsolute(env.CLAUDE_CONFIG_DIR.trim()) ? env.CLAUDE_CONFIG_DIR.trim() : resolve(cwd, env.CLAUDE_CONFIG_DIR.trim()))
+    : join(userHome, '.claude');
   return {
     modelRouter: configuredRouter
       ? (isAbsolute(configuredRouter) ? configuredRouter : resolve(cwd, configuredRouter))
-      : join(home, 'config', 'claude', 'model-router.json'),
+      : join(claudeDir, 'model-router.json'),
     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;
@@ -461,7 +479,8 @@ 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();
-  return { selectedProfiles, staticProfiles, activeSessionModel, budget, health, evidenceDir: resolveEvidenceDir() };
+  const agentAliases = loadAgentTransportAliases(paths.claudeSettings);
+  return { selectedProfiles, staticProfiles, activeSessionModel, budget, health, agentAliases, evidenceDir: resolveEvidenceDir() };
 }
 
 function resolveEvidenceDir({ cwd = process.cwd(), env = process.env } = {}) {
@@ -797,9 +816,10 @@ export function classifyDispatchOutcome(result, error, startMs) {
  * carry arbitrary gateway IDs, so the selected Bizar ID is audit context and
  * the guard permits inheritance only from an identical configured parent.
  */
-export function augmentPayload(opts, decision, agentName) {
+export function augmentPayload(opts, decision, agentName, transportAlias) {
   return {
     ...opts,
+    model: transportAlias,
     additionalContext: {
       ...(opts.additionalContext && typeof opts.additionalContext === 'object' ? opts.additionalContext : {}),
       bizarConfiguredModel: decision.modelId ?? null,
@@ -860,7 +880,14 @@ export async function dispatchAgent(agentFn, agentName, prompt, opts = {}, conte
       '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 augmented = augmentPayload(opts, decision, agentName);
+  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);
 
   // F-191 / IMP-018 audit trail — persist the decision before invoking
   // the agent. Best-effort: telemetry failures MUST NOT abort the

package/package.json

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

package/packages/sdk/dist/router/agent-model-registry.js

@@ -46,11 +46,15 @@ function modelIds(value) {
         : [];
 }
 function defaultConfigPath(_cwd = process.cwd()) {
-    // Anchor on BIZAR_HOME — the router file is operator-controlled state
-    // that must survive cwd changes and `bizar install --force` clean runs.
-    // The `_cwd` parameter is retained for the explicit `configPath` branch
-    // (relative `BIZAR_MODEL_ROUTER_CONFIG` overrides still resolve against
-    // it for tests that pre-stage the file in a tmp dir).
+    // Claude Code reads hooks, agents, skills, and model-router from ~/.claude/.
+    // Use ~/.claude/model-router.json as the single canonical location so the
+    // hook and SDK always agree.  Backward-compat fallback to BIZAR_HOME for
+    // existing installations that still have the file there.
+    const claudeConfigDir = join(osHomedir(), ".claude");
+    const claudePath = join(claudeConfigDir, "model-router.json");
+    if (existsSync(claudePath))
+        return claudePath;
+    // Fallback: BIZAR_HOME (for pre-10.23.12 installs).
     return join(bizarHome(), "config", "claude", "model-router.json");
 }
 export function loadModelRegistry(src = {}) {

package/packages/sdk/dist/version.d.ts

@@ -1,5 +1,5 @@
 /**
  * SDK version constant. Keep synchronized with the workspace package versions.
  */
-export declare const SDK_VERSION: "10.23.11";
+export declare const SDK_VERSION: "10.23.13";
 //# sourceMappingURL=version.d.ts.map

package/packages/sdk/dist/version.js

@@ -1,5 +1,5 @@
 /**
  * SDK version constant. Keep synchronized with the workspace package versions.
  */
-export const SDK_VERSION = "10.23.11";
+export const SDK_VERSION = "10.23.13";
 //# sourceMappingURL=version.js.map

package/packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polderlabs/bizar-sdk",
-  "version": "10.23.11",
+  "version": "10.23.13",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",