@polderlabs/bizar 10.23.1 → 10.23.3

package/cli/commands/models.mjs

@@ -923,16 +923,16 @@ export function partitionStalePicks({ liveIds, pickedIds, disabledProviders }) {
 
 /**
  * Sync `userSelected.models` into Claude Code's settings.json under
- * `modelOverrides` using the self-map pattern (`<id>` → `<id>`). This
+ * `modelOverrides` using recognized Claude IDs as keys and gateway IDs as
+ * values. This
  * suppresses `[claude-code:unrecognized_model]` diagnostics on every turn
  * for any picked ID the gateway serves. Stale IDs (not returned by the
  * gateway) are excluded so the diagnostic still surfaces them.
  *
  * Behavior:
  *   - Reads `settings.json` if present; preserves every other field.
- *   - Writes `modelOverrides` as a sparse object: only picked IDs that
- *     are also in `liveIds`. Self-map pattern keeps dispatch behavior
- *     identical (Claude Code dispatches the literal ID).
+ *   - Writes `modelOverrides` as a sparse object for picked IDs that are
+ *     also in `liveIds`; Claude Code still dispatches each literal value.
  *   - Atomic replace via temp-file + rename (matches `applyModels`).
  *   - When `settingsJsonPath` is provided (tests), uses that instead of
  *     `~/.claude/settings.json`.
@@ -962,13 +962,13 @@ export function applyModelOverrides({ settingsJsonPath, pickedIds, liveIds = [],
   }
   const live = new Set(Array.isArray(liveIds) ? liveIds : []);
   const incoming = Array.isArray(pickedIds) ? pickedIds.filter((id) => typeof id === 'string' && id.trim()) : [];
-  // 10.22.0 / Phase 4: strip disabled-provider ids BEFORE the self-map
-  // so Claude Code never sees an `anthropic/*` self-map entry. The
+  // 10.22.0 / Phase 4: strip disabled-provider ids BEFORE the mapping
+  // so Claude Code never sees an `anthropic/*` override value. The
   // skipped ids are reported back so the operator can see what was
   // dropped (without crashing on the disabled list).
   const disabled = Array.isArray(disabledProviders) ? disabledProviders : readDisabledProviders();
   const { kept: picks, stripped: skippedDisabled } = filterCandidatesByDisabledProviders(incoming, disabled);
-  // Self-map only IDs the live gateway serves. Stale IDs intentionally stay
+  // Map only IDs the live gateway serves. Stale IDs intentionally stay
   // out so the `[claude-code:unrecognized_model]` diagnostic still fires
   // for them — the operator should re-run `bizar models` to drop them.
   const synced = live.size === 0
@@ -987,9 +987,10 @@ export function applyModelOverrides({ settingsJsonPath, pickedIds, liveIds = [],
       return { wrote: false, syncedIds: [], skippedStale: skipped, skippedDisabled, settingsPath: path };
     }
   }
-  // Self-map pattern — Claude Code uses modelOverrides to suppress
-  // `[claude-code:unrecognized_model]` for any ID that maps to itself.
-  settings.modelOverrides = Object.fromEntries(synced.map((id) => [id, id]));
+  // Claude Code ignores unknown override keys. Recognized Anthropic model IDs
+  // 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 previousModel = typeof settings.model === 'string' ? settings.model : null;
   const previousContext = profiles?.[previousModel]?.limits?.contextTokens;
   const nextModel = synced[0] || null;
@@ -1022,6 +1023,39 @@ export function configuredFallbackModels(router) {
   return filterCandidatesByDisabledProviders(ids, disabled).kept;
 }
 
+export function configuredEnabledModels(router) {
+  const disabled = extractDisabledProviders(router);
+  const selected = currentSelection(router, { disabledProviders: disabled }).models;
+  return selected.length > 0 ? selected : configuredFallbackModels(router);
+}
+
+export const CLAUDE_MODEL_OVERRIDE_KEYS = Object.freeze([
+  'claude-fable-5',
+  'claude-opus-5',
+  'claude-sonnet-5',
+  'claude-haiku-4-5-20251001',
+  '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',
+]);
+
+export function buildClaudeModelOverrides(modelIds) {
+  const unique = [...new Set((Array.isArray(modelIds) ? modelIds : [])
+    .filter((id) => typeof id === 'string' && id.trim())
+    .map((id) => id.trim()))];
+  return Object.fromEntries(unique.slice(0, CLAUDE_MODEL_OVERRIDE_KEYS.length)
+    .map((id, index) => [CLAUDE_MODEL_OVERRIDE_KEYS[index], id]));
+}
+
 /**
  * Derive a human-readable label for a model ID. Used to populate the
  * `modelPicker` array in settings.json so Claude Code's `/model` picker

package/cli/commands/validate.mjs

@@ -15,7 +15,7 @@
  *   - 7 rules mirrored from `config/rules/` → `~/.claude/rules/`
  *   - guarded autonomy hooks, including approval, compaction, and advisor context
  *   - shipped slash commands in `~/.claude/commands/`
- *   - permissions.allow includes mcp__bizar__*
+ *   - permissions follow the current hook-enforced policy
  *   - the complete hook-enforced approval floor is wired
  *   - ~/.config/bizar/ exists (loop/runtime state)
  *
@@ -27,7 +27,7 @@ import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs';
 import { join } from 'node:path';
 import { spawnSync } from 'node:child_process';
 import { resolveBizarHome, resolveClaudeConfigDir, resolveGlobalModelRouter } from '../config-paths.mjs';
-import { configuredFallbackModels } from './models.mjs';
+import { configuredEnabledModels, listModels, resolveEndpoint } from './models.mjs';
 
 function claudeDir() { return resolveClaudeConfigDir(); }
 function bizarHome() { return resolveBizarHome(); }
@@ -159,14 +159,14 @@ const CHECKS = {
     return `MCP command OK: ${actual}`;
   },
 
-  'permissions-allow-bizar': async () => {
+  'permissions-policy-current': async () => {
     const cfg = readJsonSafe(settingsJsonPath());
     const allow = cfg?.permissions?.allow || [];
-    const hasBizar = allow.some((p) => typeof p === 'string' && p.startsWith('mcp__bizar__'));
-    if (!hasBizar) {
-      throw new Error('permissions.allow does not include any mcp__bizar__* entries');
+    const staleWildcard = allow.find((p) => typeof p === 'string' && p === 'mcp__*');
+    if (staleWildcard) {
+      throw new Error('legacy mcp__* wildcard remains in permissions.allow');
     }
-    return `${allow.filter((p) => p.startsWith('mcp__bizar__')).length} mcp__bizar__* allowed`;
+    return `hook-enforced policy active (${allow.length} explicit allow entries)`;
   },
 
   'permissions-deny-dangerous': async () => {
@@ -188,8 +188,9 @@ const CHECKS = {
     if (!Array.isArray(arr) || arr.length === 0) {
       throw new Error('no PreToolUse hooks wired in settings.json');
     }
-    const m = arr.find((h) => h.matcher && h.matcher.includes('Write') && h.matcher.includes('Edit'));
-    if (!m) throw new Error('PreToolUse matcher missing Write|Edit pattern');
+    const m = arr.find((h) => h.matcher === '*'
+      || (h.matcher && h.matcher.includes('Write') && h.matcher.includes('Edit')));
+    if (!m) throw new Error('PreToolUse matcher does not cover Write and Edit');
     return `${arr.length} PreToolUse hook(s) wired (matcher: ${m.matcher})`;
   },
 
@@ -348,24 +349,21 @@ const CHECKS = {
   },
 
   'provider-reachable': async () => {
-    const url = process.env.ANTHROPIC_BASE_URL || process.env.BIZAR_MODEL_ROUTER_URL;
-    if (!url) {
+    const { endpoint, authToken } = resolveEndpoint();
+    if (!endpoint) {
       const path = resolveGlobalModelRouter();
       const router = readJsonSafe(path);
-      const fallback = router ? configuredFallbackModels(router) : [];
+      const fallback = router ? configuredEnabledModels(router) : [];
       if (fallback.length === 0) {
         throw new Error(`no gateway URL or enabled configured model in ${path}; implicit defaults are prohibited`);
       }
       return `no gateway URL; explicit configured fallback is ${fallback[0]}`;
     }
-    const ac = new AbortController();
-    const timer = setTimeout(() => ac.abort(), 4000);
     try {
-      const res = await fetch(`${url}/v1/models`, { signal: ac.signal });
-      if (!res.ok) throw new Error(`provider at ${url} returned HTTP ${res.status}`);
-      return `provider reachable at ${url}`;
-    } finally {
-      clearTimeout(timer);
+      const models = await listModels({ endpoint, authToken, timeoutMs: 4000 });
+      return `provider reachable at ${endpoint} (${models.length} models)`;
+    } catch (err) {
+      throw new Error(`provider at ${endpoint} unreachable: ${err.message ?? err}`);
     }
   },
 
@@ -387,7 +385,7 @@ const CHECK_ORDER = [
   'claude-settings-schema',
   'mcp-server-bizar-registered',
   'mcp-server-bizar-command',
-  'permissions-allow-bizar',
+  'permissions-policy-current',
   'permissions-deny-dangerous',
   'hooks-pretooluse-wired',
   'hooks-posttooluse-wired',
@@ -431,7 +429,7 @@ export function showValidateHelp() {
     integrated with Claude Code:
       • claude CLI reachable + version
       • ~/.claude/settings.json parses + Bizar MCP server registered
-      • permissions.allow includes mcp__bizar__*
+      • permissions follow the current hook-enforced policy
       • hook-enforced approval and destructive-action floor
       • all 14 Claude Code lifecycle events wired in settings.json
       • all 16 agent files installed with unique Claude Code names

package/cli/doctor.mjs

@@ -41,7 +41,7 @@ import {
   REQUIRED_COMMANDS,
   REQUIRED_HOOKS,
 } from './commands/validate.mjs';
-import { configuredFallbackModels } from './commands/models.mjs';
+import { configuredEnabledModels, listModels, resolveEndpoint } from './commands/models.mjs';
 
 const REQUIRED_RULES = [
   'general.md', 'git.md', 'javascript.md', 'python.md',
@@ -181,8 +181,8 @@ async function checkBizarHome() {
 }
 
 async function checkProviderReachable() {
-  const url = process.env.ANTHROPIC_BASE_URL || process.env.BIZAR_MODEL_ROUTER_URL;
-  if (!url) {
+  const { endpoint, authToken } = resolveEndpoint();
+  if (!endpoint) {
     const routerPath = resolveGlobalModelRouter();
     let router;
     try {
@@ -190,22 +190,18 @@ async function checkProviderReachable() {
     } catch {
       throw new Error(`no provider URL and no readable global model router at ${routerPath}`);
     }
-    const configured = configuredFallbackModels(router);
+    const configured = configuredEnabledModels(router);
     if (configured.length === 0) {
       throw new Error('no enabled configured model; implicit provider defaults are prohibited');
     }
     return `no gateway URL; explicit configured fallback is ${configured[0]}`;
   }
-  let res;
   try {
-    res = await fetch(`${url}/v1/models`, { signal: AbortSignal.timeout(3000) });
+    const models = await listModels({ endpoint, authToken, timeoutMs: 3000 });
+    return `provider at ${endpoint} ok (${models.length} models)`;
   } catch (err) {
-    throw new Error(`provider at ${url} unreachable: ${err.message ?? err}`);
+    throw new Error(`provider at ${endpoint} unreachable: ${err.message ?? err}`);
   }
-  if (!res.ok) {
-    throw new Error(`provider at ${url} responded HTTP ${res.status}`);
-  }
-  return `provider at ${url} ok`;
 }
 
 // ── runner ──────────────────────────────────────────────────────────────────

package/cli/provision.mjs

@@ -32,6 +32,7 @@ import { homedir } from 'node:os';
 import { dirname, join, resolve, sep } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { resolveBizarHome } from './config-paths.mjs';
+import { buildClaudeModelOverrides, configuredEnabledModels } from './commands/models.mjs';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -944,11 +945,13 @@ export function writeClaudeSettings({ dryRun = false, force = false } = {}) {
   const legacyRouterPath = join(CLAUDE_DIR, 'model-router.json');
   let installModel;
   let installContextTokens;
+  let installModels = [];
   for (const p of [bizarRouterPath, legacyRouterPath]) {
     if (!existsSync(p)) continue;
     const parsed = readJsonSafe(p, null);
     if (!parsed || typeof parsed !== 'object') continue;
     installModel = configuredInstallModel(parsed);
+    installModels = configuredEnabledModels(parsed);
     installContextTokens = installModel ? configuredModelContextTokens(parsed, installModel) : undefined;
     if (installModel) break;
     // The Bizar path is authoritative even when it has no enabled candidates.
@@ -956,7 +959,7 @@ export function writeClaudeSettings({ dryRun = false, force = false } = {}) {
   }
   if (installModel) {
     bizarSettings.model = installModel;
-    bizarSettings.modelOverrides = { [installModel]: installModel };
+    bizarSettings.modelOverrides = buildClaudeModelOverrides(installModels);
     const configuredContext = pickEnv('CLAUDE_CODE_MAX_CONTEXT_TOKENS') || installContextTokens;
     if (configuredContext) bizarSettings.env.CLAUDE_CODE_MAX_CONTEXT_TOKENS = String(configuredContext);
   } else {

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

@@ -7,7 +7,7 @@
  * Claude Code settings keys that the operator owns:
  *
  *   - modelPicker   → { options: [{ model, label }] } in user pick order
- *   - modelOverrides → { <id>: <id> } self-map for every live pick
+ *   - modelOverrides → { <recognized Claude id>: <gateway id> }
  *   - model         → reset to the first user pick if the current value
  *                     starts with `claude-` (the dead gateway namespace —
  *                     the live gateway rejects it with model_not_found)
@@ -223,8 +223,19 @@ function syncOnce() {
     return option;
   });
 
+  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-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',
+  ];
   settings.modelPicker = { options };
-  settings.modelOverrides = Object.fromEntries(liveIds.map((id) => [id, id]));
+  settings.modelOverrides = Object.fromEntries(
+    liveIds.slice(0, overrideKeys.length).map((id, index) => [overrideKeys[index], id]),
+  );
 
   let modelChanged = false;
   if (typeof settings.model !== 'string' || !liveIds.includes(settings.model)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polderlabs/bizar",
-  "version": "10.23.1",
+  "version": "10.23.3",
   "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/version.d.ts

@@ -1,5 +1,5 @@
 /**
  * SDK version constant. Keep synchronized with the workspace package versions.
  */
-export declare const SDK_VERSION: "10.23.1";
+export declare const SDK_VERSION: "10.23.3";
 //# 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.1";
+export const SDK_VERSION = "10.23.3";
 //# sourceMappingURL=version.js.map

package/packages/sdk/package.json

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