@vanillagreen/pi-claude-bridge 1.4.0 → 1.5.0

package/README.md

@@ -9,7 +9,7 @@ Forked from [`elidickinson/pi-claude-bridge`](https://github.com/elidickinson/pi
 
 ## Highlights
 
-- `claude-bridge/claude-opus-4-8`, Opus 4-7, Sonnet, and Haiku in `/model`.
+- `claude-bridge/claude-fable-5`, Opus 4.8, Opus 4.7, Sonnet, and Haiku in `/model`.
 - Pi tool calls run on Pi; Claude Code handles reasoning.
 - Tool-use turns block until Pi-delivered tool results reach Claude Code, including persistent subagent panes.
 - Session continuity across normal turns, `/compact`, tree navigation, and abort recovery.
@@ -45,6 +45,8 @@ Extra Pi context is off by default. Enable per item in the extension manager whe
 
 Open `/extensions:settings`; settings appear under the **Claude Bridge** tab.
 
+Project settings in `.pi/settings.json` apply only after Pi marks the workspace trusted; before trust, vstack Pi extensions read user/global settings only.
+
 ### General
 
 | Setting | What it does |
@@ -90,6 +92,10 @@ Pi does not have a native `max` thinking level; it exposes up to `xhigh`, and ea
 
 Keys may be bare model IDs (`claude-opus-4-8`), `claude-bridge/<id>`, or `*` for all bridge models. Values are `low`, `medium`, `high`, `xhigh`, or `max`.
 
+### Fable 5 caveat
+
+The bridge registers `claude-bridge/claude-fable-5` and `claude-bridge/claude-opus-4-8` even when Pi's Anthropic model registry has not shipped those entries yet. For Fable 5, the bridge asks Claude Code to use Opus 4.8 as the availability fallback and preserves Claude Code's content-safety fallback events so Pi labels rerouted turns as Opus 4.8. Content-safety fallback still depends on Claude Code's own Fable 5 support; use Claude Code 2.1.170 or newer, and set `ANTHROPIC_DEFAULT_FABLE_MODEL` / `ANTHROPIC_DEFAULT_OPUS_MODEL` yourself when routing provider-specific model IDs through Bedrock, Vertex, or Foundry.
+
 ## Extra usage and rate limits
 
 Claude Code's `/extra-usage` local command works through the Claude Agent SDK. In Pi, use `/claude-bridge:extra` to run that flow from claude-bridge. Persist automatic launch on extra-usage errors with **Allow extra usage helper** in `/extensions:settings`.
@@ -98,7 +104,7 @@ When Claude Code emits rate-limit reset metadata, the bridge shows one red ASCII
 
 Allowed-warning rate-limit events are filtered before user notification. The bridge normalizes unambiguous numeric utilization (`0 < value < 1` as fractional, `1 < value <= 100` as percent), suppresses low or unit-ambiguous values such as exact `1`, and only shows a neutral warning at 80%+ instead of claiming an unverified `% used` value. Check Claude Code `/usage` for exact allowed-warning utilization.
 
-If Claude Code accepts a turn but produces no assistant/tool output, the bridge treats that stream-idle stall as a retryable overload/rate-limit failure: it closes the stalled Claude Code subprocess, emits a normal assistant error with a backoff hint, and lets Flightdeck or `pi-agents-tmux` reuse their existing rate-limit retry ladder. Tune the first-output timeout with `CLAUDE_BRIDGE_STREAM_IDLE_TIMEOUT` (bare numbers are seconds; suffixes `ms`, `s`, and `m` are accepted). Default: `90s`; set `0` to disable.
+If Claude Code accepts a turn but produces no assistant/tool output, the bridge treats that stream-idle stall as a retryable overload/rate-limit failure: it closes the stalled Claude Code subprocess, emits a normal assistant error with a backoff hint, and lets `pi-agents-tmux` reuse its existing rate-limit retry ladder. Tune the first-output timeout with `CLAUDE_BRIDGE_STREAM_IDLE_TIMEOUT` (bare numbers are seconds; suffixes `ms`, `s`, and `m` are accepted). Default: `90s`; set `0` to disable.
 
 ## Debugging
 

package/bundle/index.js

@@ -21976,7 +21976,7 @@ function readSession(jsonlPath, projectPath) {
 // src/index.ts
 import { spawn as spawnProcess } from "child_process";
 import { createHash } from "crypto";
-import { accessSync, appendFileSync as appendFileSync3, chmodSync, constants as fsConstants, mkdirSync as mkdirSync3, readFileSync as readFileSync7, realpathSync as realpathSync3, statSync as statSync3 } from "fs";
+import { accessSync, appendFileSync as appendFileSync3, chmodSync, constants as fsConstants, mkdirSync as mkdirSync3, readFileSync as readFileSync6, realpathSync as realpathSync3, statSync as statSync3 } from "fs";
 import { resolve as pathResolve } from "path";
 import { homedir as homedir5 } from "os";
 import { delimiter, dirname as dirname5, join as join5 } from "path";
@@ -22237,9 +22237,41 @@ function convertPiMessages(messages, customToolNameToSdk) {
 }
 
 // src/models.ts
-var MODEL_IDS_IN_ORDER = ["claude-opus-4-8", "claude-opus-4-7", "claude-opus-4-6", "claude-sonnet-4-6", "claude-haiku-4-5"];
+var FABLE_MODEL_ID = "claude-fable-5";
+var FABLE_FALLBACK_MODEL_ID = "claude-opus-4-8";
+function fallbackModelForPrimaryModel(modelId) {
+  return modelId === FABLE_MODEL_ID ? FABLE_FALLBACK_MODEL_ID : void 0;
+}
+var MODEL_IDS_IN_ORDER = [
+  FABLE_MODEL_ID,
+  FABLE_FALLBACK_MODEL_ID,
+  "claude-opus-4-7",
+  "claude-opus-4-6",
+  "claude-sonnet-4-6",
+  "claude-haiku-4-5"
+];
+var FALLBACK_MODELS = {
+  [FABLE_MODEL_ID]: {
+    id: FABLE_MODEL_ID,
+    name: "Claude Fable 5",
+    reasoning: true,
+    thinkingLevelMap: { xhigh: "xhigh" },
+    input: ["text", "image"],
+    contextWindow: 1e6,
+    maxTokens: 128e3
+  },
+  [FABLE_FALLBACK_MODEL_ID]: {
+    id: FABLE_FALLBACK_MODEL_ID,
+    name: "Claude Opus 4.8",
+    reasoning: true,
+    thinkingLevelMap: { xhigh: "xhigh" },
+    input: ["text", "image"],
+    contextWindow: 1e6,
+    maxTokens: 128e3
+  }
+};
 function buildModels(piAiModels) {
-  return MODEL_IDS_IN_ORDER.map((id) => piAiModels.find((m4) => m4.id === id)).filter((m4) => m4 != null).map(({ id, name, reasoning, input, contextWindow, maxTokens, thinkingLevelMap }) => ({
+  return MODEL_IDS_IN_ORDER.map((id) => piAiModels.find((m4) => m4.id === id) ?? FALLBACK_MODELS[id]).filter((m4) => m4 != null).map(({ id, name, reasoning, input, contextWindow, maxTokens, thinkingLevelMap }) => ({
     id,
     name,
     reasoning,
@@ -22272,7 +22304,46 @@ function rewriteSkillsBlock(skillsBlock) {
 }
 
 // src/session-verify.ts
-import { statSync as statSync2, readFileSync as readFileSync3 } from "fs";
+import { closeSync as closeSync2, openSync as openSync2, readSync as readSync2, statSync as statSync2 } from "fs";
+import { StringDecoder } from "node:string_decoder";
+function forEachJsonlLine(path, onLine) {
+  const fd = openSync2(path, "r");
+  const buffer = Buffer.allocUnsafe(64 * 1024);
+  const decoder = new StringDecoder("utf8");
+  let pending = "";
+  try {
+    for (; ; ) {
+      const bytesRead = readSync2(fd, buffer, 0, buffer.length, null);
+      if (bytesRead === 0) break;
+      pending += decoder.write(buffer.subarray(0, bytesRead));
+      let start = 0;
+      for (; ; ) {
+        const newline = pending.indexOf("\n", start);
+        if (newline < 0) {
+          pending = pending.slice(start);
+          break;
+        }
+        const line = pending.slice(start, newline);
+        onLine(line.endsWith("\r") ? line.slice(0, -1) : line);
+        start = newline + 1;
+      }
+    }
+    pending += decoder.end();
+    if (pending.length > 0) onLine(pending.endsWith("\r") ? pending.slice(0, -1) : pending);
+  } finally {
+    closeSync2(fd);
+  }
+}
+function summarizeJsonl(path) {
+  const summary = { count: 0 };
+  forEachJsonlLine(path, (line) => {
+    if (!line.trim()) return;
+    summary.count += 1;
+    if (summary.firstLine === void 0) summary.firstLine = line;
+    summary.lastLine = line;
+  });
+  return summary;
+}
 function verifyWrittenSession(jsonlPath, expectedSessionId, expectedRecordCount) {
   const warnings = [];
   let st;
@@ -22282,21 +22353,20 @@ function verifyWrittenSession(jsonlPath, expectedSessionId, expectedRecordCount)
     warnings.push(`file missing after save \u2014 path=${jsonlPath} err=${e2.message}`);
     return warnings;
   }
-  let content;
+  let summary;
   try {
-    content = readFileSync3(jsonlPath, "utf8");
+    summary = summarizeJsonl(jsonlPath);
   } catch (e2) {
     warnings.push(`file unreadable \u2014 path=${jsonlPath} size=${st.size} err=${e2.message}`);
     return warnings;
   }
-  const lines = content.split("\n").filter((l2) => l2.trim().length > 0);
-  if (lines.length !== expectedRecordCount) {
-    warnings.push(`record count mismatch \u2014 expected=${expectedRecordCount} actual=${lines.length} path=${jsonlPath} bytes=${content.length}`);
+  if (summary.count !== expectedRecordCount) {
+    warnings.push(`record count mismatch \u2014 expected=${expectedRecordCount} actual=${summary.count} path=${jsonlPath} bytes=${st.size}`);
     return warnings;
   }
   try {
-    const firstRec = JSON.parse(lines[0]);
-    const lastRec = JSON.parse(lines[lines.length - 1]);
+    const firstRec = JSON.parse(summary.firstLine ?? "");
+    const lastRec = JSON.parse(summary.lastLine ?? "");
     if (firstRec.sessionId !== expectedSessionId || lastRec.sessionId !== expectedSessionId) {
       warnings.push(`sessionId drift \u2014 expected=${expectedSessionId} first=${firstRec.sessionId} last=${lastRec.sessionId}`);
     }
@@ -22564,7 +22634,7 @@ function summarizeMissingToolNames(missing) {
 }
 
 // src/config.ts
-import { existsSync as existsSync3, readFileSync as readFileSync4 } from "fs";
+import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
 import { homedir as homedir2 } from "os";
 import { dirname as dirname2, join as join2, resolve } from "path";
 var PACKAGE_ID = "@vanillagreen/pi-claude-bridge";
@@ -22600,13 +22670,39 @@ function projectSettingsPath(cwd) {
     current = parent;
   }
 }
+var PROJECT_TRUST_SYMBOL = /* @__PURE__ */ Symbol.for("vstack.pi.project-trust");
+function projectTrustRegistry() {
+  const host = globalThis;
+  const existing = host[PROJECT_TRUST_SYMBOL];
+  if (existing) return existing;
+  const created = {};
+  host[PROJECT_TRUST_SYMBOL] = created;
+  return created;
+}
+function recordProjectTrust(ctx2) {
+  if (!ctx2.cwd) return;
+  let trusted = true;
+  try {
+    trusted = ctx2.isProjectTrusted?.() === true;
+  } catch {
+    trusted = false;
+  }
+  const registry2 = projectTrustRegistry();
+  if (!registry2.projectSettings) registry2.projectSettings = /* @__PURE__ */ new Map();
+  registry2.projectSettings.set(projectSettingsPath(ctx2.cwd), trusted);
+}
+function projectSettingsTrusted(settingsPath) {
+  return projectTrustRegistry().projectSettings?.get(settingsPath) === true;
+}
 function settingsPaths(cwd) {
-  return [join2(piUserDir(), "settings.json"), projectSettingsPath(cwd)];
+  const user = join2(piUserDir(), "settings.json");
+  const project = projectSettingsPath(cwd);
+  return projectSettingsTrusted(project) ? [user, project] : [user];
 }
 function tryParseJson(path) {
   if (!existsSync3(path)) return {};
   try {
-    return JSON.parse(readFileSync4(path, "utf-8"));
+    return JSON.parse(readFileSync3(path, "utf-8"));
   } catch {
     return {};
   }
@@ -22616,7 +22712,7 @@ function readManagerConfig(cwd) {
   for (const path of settingsPaths(cwd)) {
     if (!existsSync3(path)) continue;
     try {
-      const parsed = JSON.parse(readFileSync4(path, "utf8"));
+      const parsed = JSON.parse(readFileSync3(path, "utf8"));
       const configRoot = asRecord(asRecord(asRecord(parsed?.vstack)?.extensionManager)?.config);
       const config2 = asRecord(configRoot?.[PACKAGE_ID]);
       if (config2) mergeDeep(merged, config2);
@@ -22709,7 +22805,9 @@ function managerToConfig(raw) {
 }
 function loadConfig(cwd) {
   const global2 = tryParseJson(join2(piUserDir(), "claude-bridge.json"));
-  const project = tryParseJson(join2(cwd, ".pi", "claude-bridge.json"));
+  const projectSettings = projectSettingsPath(cwd);
+  const trustedProject = projectSettingsTrusted(projectSettings);
+  const project = trustedProject ? tryParseJson(join2(dirname2(projectSettings), "claude-bridge.json")) : {};
   const manager = managerToConfig(readManagerConfig(cwd));
   const provider = normalizeProviderConfig({ ...global2.provider, ...project.provider, ...manager.provider });
   return {
@@ -22720,7 +22818,7 @@ function loadConfig(cwd) {
 }
 
 // src/agents-md.ts
-import { existsSync as existsSync4, readFileSync as readFileSync5 } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync4 } from "fs";
 import { homedir as homedir3 } from "os";
 import { dirname as dirname3, join as join3, resolve as resolve2 } from "path";
 var GLOBAL_AGENTS_PATH = join3(homedir3(), ".pi", "agent", "AGENTS.md");
@@ -22745,7 +22843,7 @@ function extractAgentsAppend() {
   const agentsPath = resolveAgentsMdPath();
   if (!agentsPath) return void 0;
   try {
-    const content = readFileSync5(agentsPath, "utf-8").trim();
+    const content = readFileSync4(agentsPath, "utf-8").trim();
     if (!content) return void 0;
     const sanitized = sanitizeAgentsContent(content);
     return sanitized.length > 0 ? `# CLAUDE.md
@@ -22765,7 +22863,7 @@ function sanitizeAgentsContent(content) {
 }
 
 // src/prompt-context.ts
-import { existsSync as existsSync5, readFileSync as readFileSync6 } from "fs";
+import { existsSync as existsSync5, readFileSync as readFileSync5 } from "fs";
 import { homedir as homedir4 } from "os";
 import { dirname as dirname4, join as join4, resolve as resolve3 } from "path";
 function piUserDir2() {
@@ -22776,7 +22874,7 @@ function piUserDir2() {
 function readTrimmed(path) {
   try {
     if (!existsSync5(path)) return void 0;
-    const content = readFileSync6(path, "utf8").trim();
+    const content = readFileSync5(path, "utf8").trim();
     return content.length > 0 ? content : void 0;
   } catch {
     return void 0;
@@ -37607,7 +37705,7 @@ function preflightClaudeExecutable(path, cwd) {
   }
   let fileType;
   try {
-    fileType = classifyClaudeExecutableBytes(readFileSync7(realPath).subarray(0, 16));
+    fileType = classifyClaudeExecutableBytes(readFileSync6(realPath).subarray(0, 16));
   } catch (err) {
     throw makeClaudePreflightError("Claude Code executable preflight failed: cannot read executable header before spawning Claude Code.", {
       code: codeValue(err, "EACCES"),
@@ -38511,6 +38609,13 @@ function finalizeCurrentStream(stopReason) {
   ctx().currentPiStream.end();
   ctx().currentPiStream = null;
 }
+function updateTurnOutputModel(modelId) {
+  const c2 = ctx();
+  if (typeof modelId !== "string" || !modelId || !c2.turnOutput) return;
+  if (c2.turnOutput.model === modelId) return;
+  debug(`provider: active Claude model changed ${c2.turnOutput.model} -> ${modelId}`);
+  c2.turnOutput.model = modelId;
+}
 function processStreamEvent(message, customToolNameToPi, model) {
   const c2 = ctx();
   if (!c2.currentPiStream || !c2.turnOutput) return;
@@ -38522,6 +38627,7 @@ function processStreamEvent(message, customToolNameToPi, model) {
   }
   if (event?.type === "message_start") {
     c2.resetToolTracking();
+    updateTurnOutputModel(event.message?.model);
     if (event.message?.usage) updateUsage(c2.turnOutput, event.message.usage, model);
     return;
   }
@@ -38660,6 +38766,7 @@ function processAssistantMessage(message, model, customToolNameToPi) {
   const c2 = ctx();
   const assistantMsg = message.message;
   if (!assistantMsg?.content) return;
+  updateTurnOutputModel(assistantMsg.model);
   if (c2.turnSawStreamEvent) {
     if (appendMissingToolUsesFromAssistant(assistantMsg, model, customToolNameToPi)) {
       c2.turnSawToolCall = true;
@@ -38706,6 +38813,8 @@ function processAssistantMessage(message, model, customToolNameToPi) {
       const toolBlock = c2.turnBlocks[idx];
       c2.currentPiStream?.push({ type: "toolcall_start", contentIndex: idx, partial: c2.turnOutput });
       c2.currentPiStream?.push({ type: "toolcall_end", contentIndex: idx, toolCall: toolBlock, partial: c2.turnOutput });
+    } else if (block.type === "fallback") {
+      updateTurnOutputModel(block.to?.model);
     } else {
       debug("processAssistantMessage: unhandled block type", block.type);
     }
@@ -38757,6 +38866,14 @@ async function consumeQuery(sdkQuery, customToolNameToPi, model, cwd, bridgeConf
       case "system":
         if (message.subtype === "init" && message.session_id) {
           capturedSessionId = message.session_id;
+        } else if (message.subtype === "model_refusal_fallback") {
+          const originalModel = message.original_model;
+          const fallbackModel = message.fallback_model;
+          updateTurnOutputModel(fallbackModel);
+          debug("consumeQuery: model_refusal_fallback", JSON.stringify({ originalModel, fallbackModel }));
+          if (originalModel === FABLE_MODEL_ID && fallbackModel === FABLE_FALLBACK_MODEL_ID) {
+            safeNotify("Claude bridge switched Fable 5 to Opus 4.8 after Claude Code safety fallback.", "info");
+          }
         }
         break;
       case "user":
@@ -38911,16 +39028,19 @@ function streamClaudeAgentSdk(model, context, options) {
   const { sessionId: resumeSessionId } = syncSharedSession(context.messages, cwd, customToolNameToSdk, model.id);
   const requestedEffort = options?.reasoning ? model.thinkingLevelMap?.[options.reasoning] ?? REASONING_TO_EFFORT[options.reasoning] : void 0;
   const effort = resolveConfiguredEffort(model.id, requestedEffort, providerSettings);
-  const extraArgs = { model: model.id };
+  const extraArgs = {};
   if (strictMcpConfigEnabled) extraArgs["strict-mcp-config"] = null;
   if (effort) extraArgs["thinking-display"] = "summarized";
+  const fallbackModel = fallbackModelForPrimaryModel(model.id);
   const childEnv = { ...process.env, ENABLE_CLAUDEAI_MCP_SERVERS: "0", DISABLE_AUTO_COMPACT: "1" };
   const queryOptions = {
     cwd,
+    model: model.id,
     env: childEnv,
     ...CLAUDE_BRIDGE_TOOL_ISOLATION,
     permissionMode: "bypassPermissions",
     includePartialMessages: true,
+    ...fallbackModel ? { fallbackModel } : {},
     ...providerSettings.fastMode ? { settings: { fastMode: true } } : {},
     systemPrompt: {
       type: "preset",
@@ -38940,6 +39060,7 @@ function streamClaudeAgentSdk(model, context, options) {
     "provider: fresh query",
     `model=${model.id} msgs=${context.messages.length} tools=${mcpTools.length}`,
     `resume=${resumeSessionId?.slice(0, 8) ?? "none"} effort=${effort ?? "default"}`,
+    `fallback=${fallbackModel ?? "none"}`,
     `appendSys=${appendSystemPrompt} promptCtx=${promptContextAppend.labels.join(",") || "none"} strictMcp=${strictMcpConfigEnabled} fastMode=${providerSettings.fastMode === true}`,
     `claudeExec=${claudeExecutablePreflight ? `${claudeExecutablePreflight.fileType}:${claudeExecutablePreflight.path}` : "sdk-default"}`,
     `prompt=${promptText.slice(0, 60)}${promptBlocks ? " [+images]" : ""}`
@@ -39200,6 +39321,7 @@ function index_default(pi) {
     }
   };
   pi.on("session_start", (event, ctx2) => {
+    recordProjectTrust(ctx2);
     piUI = ctx2.ui;
     if (event.reason === "new" || event.reason === "resume" || event.reason === "fork") {
       clearSession(`session_start:${event.reason}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanillagreen/pi-claude-bridge",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Pi provider bridge that runs Claude Code through the Claude Agent SDK, with opt-in forwarding for Pi prompt context.",
   "type": "module",
   "keywords": [

package/src/config.ts

@@ -76,8 +76,43 @@ function projectSettingsPath(cwd: string): string {
 	}
 }
 
+const PROJECT_TRUST_SYMBOL = Symbol.for("vstack.pi.project-trust");
+
+interface ProjectTrustRegistry {
+	projectSettings?: Map<string, boolean>;
+}
+
+function projectTrustRegistry(): ProjectTrustRegistry {
+	const host = globalThis as unknown as Record<PropertyKey, ProjectTrustRegistry | undefined>;
+	const existing = host[PROJECT_TRUST_SYMBOL];
+	if (existing) return existing;
+	const created: ProjectTrustRegistry = {};
+	host[PROJECT_TRUST_SYMBOL] = created;
+	return created;
+}
+
+export function recordProjectTrust(ctx: { cwd?: string; isProjectTrusted?: () => boolean }): void {
+	if (!ctx.cwd) return;
+	let trusted = true;
+	try {
+		trusted = ctx.isProjectTrusted?.() === true;
+	} catch {
+		trusted = false;
+	}
+	const registry = projectTrustRegistry();
+	if (!registry.projectSettings) registry.projectSettings = new Map();
+	registry.projectSettings.set(projectSettingsPath(ctx.cwd), trusted);
+}
+
+function projectSettingsTrusted(settingsPath: string): boolean {
+	return projectTrustRegistry().projectSettings?.get(settingsPath) === true;
+}
+
+
 function settingsPaths(cwd: string): string[] {
-	return [join(piUserDir(), "settings.json"), projectSettingsPath(cwd)];
+	const user = join(piUserDir(), "settings.json");
+	const project = projectSettingsPath(cwd);
+	return projectSettingsTrusted(project) ? [user, project] : [user];
 }
 
 export function tryParseJson(path: string): Partial<Config> {
@@ -202,7 +237,9 @@ function managerToConfig(raw: SettingsRecord): Partial<Config> {
 
 export function loadConfig(cwd: string): Config {
 	const global = tryParseJson(join(piUserDir(), "claude-bridge.json"));
-	const project = tryParseJson(join(cwd, ".pi", "claude-bridge.json"));
+	const projectSettings = projectSettingsPath(cwd);
+	const trustedProject = projectSettingsTrusted(projectSettings);
+	const project = trustedProject ? tryParseJson(join(dirname(projectSettings), "claude-bridge.json")) : {};
 	const manager = managerToConfig(readManagerConfig(cwd));
 	const provider = normalizeProviderConfig({ ...global.provider, ...project.provider, ...manager.provider });
 	return {

package/src/index.ts

@@ -11,13 +11,13 @@ import { resolve as pathResolve } from "path";
 import { homedir } from "os";
 import { delimiter, dirname, join } from "path";
 import { PROVIDER_ID, messageContentToText, convertPiMessages } from "./convert.js";
-import { buildModels } from "./models.js";
+import { FABLE_FALLBACK_MODEL_ID, FABLE_MODEL_ID, buildModels, fallbackModelForPrimaryModel } from "./models.js";
 import { MCP_SERVER_NAME, MCP_TOOL_PREFIX, extractSkillsBlock } from "./skills.js";
 import { verifyWrittenSession as _verifyWrittenSession } from "./session-verify.js";
 import { extractAllToolResults as _extractAllToolResults, type McpResult } from "./extract-tool-results.js";
 import { QueryContext, ctx, stackDepth, pushContext, popContext } from "./query-state.js";
 import { findUnpairedToolUses, summarizeMissingToolNames, type MissingToolResult } from "./tool-pairing-audit.js";
-import { loadConfig, normalizeEffortLevel, type Config } from "./config.js";
+import { loadConfig, normalizeEffortLevel, recordProjectTrust, type Config } from "./config.js";
 import { extractAgentsAppend } from "./agents-md.js";
 import { buildPromptContextAppend } from "./prompt-context.js";
 import { jsonSchemaToZodShape } from "./typebox-to-zod.js";
@@ -1401,6 +1401,14 @@ function finalizeCurrentStream(stopReason?: string): void {
 	ctx().currentPiStream = null;
 }
 
+function updateTurnOutputModel(modelId: unknown): void {
+	const c = ctx();
+	if (typeof modelId !== "string" || !modelId || !c.turnOutput) return;
+	if (c.turnOutput.model === modelId) return;
+	debug(`provider: active Claude model changed ${c.turnOutput.model} -> ${modelId}`);
+	c.turnOutput.model = modelId;
+}
+
 /** Maps Anthropic stream events to pi stream events (text, thinking, toolcall).
  *  On message_stop with tool_use: ends currentPiStream so pi can execute the tool. */
 export function processStreamEvent(
@@ -1419,6 +1427,7 @@ export function processStreamEvent(
 
 	if (event?.type === "message_start") {
 		c.resetToolTracking();
+		updateTurnOutputModel(event.message?.model);
 		if (event.message?.usage) updateUsage(c.turnOutput, event.message.usage, model);
 		return;
 	}
@@ -1579,6 +1588,7 @@ export function processAssistantMessage(message: SDKMessage, model: Model<any>,
 	const c = ctx();
 	const assistantMsg = (message as any).message;
 	if (!assistantMsg?.content) return;
+	updateTurnOutputModel(assistantMsg.model);
 	if (c.turnSawStreamEvent) {
 		// Claude Agent SDK can yield the completed assistant message before (or
 		// instead of) a stream_event message_stop for a tool-use turn. Treat that
@@ -1630,6 +1640,8 @@ export function processAssistantMessage(message: SDKMessage, model: Model<any>,
 			const toolBlock = c.turnBlocks[idx];
 			c.currentPiStream?.push({ type: "toolcall_start", contentIndex: idx, partial: c.turnOutput });
 			c.currentPiStream?.push({ type: "toolcall_end", contentIndex: idx, toolCall: toolBlock as any, partial: c.turnOutput });
+		} else if (block.type === "fallback") {
+			updateTurnOutputModel(block.to?.model);
 		} else {
 			debug("processAssistantMessage: unhandled block type", block.type);
 		}
@@ -1698,6 +1710,14 @@ async function consumeQuery(
 			case "system":
 				if ((message as any).subtype === "init" && (message as any).session_id) {
 					capturedSessionId = (message as any).session_id;
+				} else if ((message as any).subtype === "model_refusal_fallback") {
+					const originalModel = (message as any).original_model;
+					const fallbackModel = (message as any).fallback_model;
+					updateTurnOutputModel(fallbackModel);
+					debug("consumeQuery: model_refusal_fallback", JSON.stringify({ originalModel, fallbackModel }));
+					if (originalModel === FABLE_MODEL_ID && fallbackModel === FABLE_FALLBACK_MODEL_ID) {
+						safeNotify("Claude bridge switched Fable 5 to Opus 4.8 after Claude Code safety fallback.", "info");
+					}
 				}
 				break;
 			case "user":
@@ -1908,11 +1928,12 @@ function streamClaudeAgentSdk(model: Model<any>, context: Context, options?: Sim
 		: undefined;
 	const effort = resolveConfiguredEffort(model.id, requestedEffort, providerSettings);
 
-	const extraArgs: Record<string, string | null> = { model: model.id };
+	const extraArgs: Record<string, string | null> = {};
 	if (strictMcpConfigEnabled) extraArgs["strict-mcp-config"] = null;
 	// Opus 4.7 defaults thinking.display to "omitted" (empty thinking text in stream).
 	// Force summarized so thinking_delta events arrive. See anthropics/claude-agent-sdk-python#830.
 	if (effort) extraArgs["thinking-display"] = "summarized";
+	const fallbackModel = fallbackModelForPrimaryModel(model.id);
 
 	// Suppress claude.ai cloud MCP servers (Figma/Canva/etc. auto-discovered via OAuth
 	// when the user is logged into Anthropic). These are a separate code path from
@@ -1927,10 +1948,12 @@ function streamClaudeAgentSdk(model: Model<any>, context: Context, options?: Sim
 	const childEnv = { ...process.env, ENABLE_CLAUDEAI_MCP_SERVERS: "0", DISABLE_AUTO_COMPACT: "1" };
 	const queryOptions: NonNullable<Parameters<typeof query>[0]["options"]> = {
 		cwd,
+		model: model.id,
 		env: childEnv,
 		...CLAUDE_BRIDGE_TOOL_ISOLATION,
 		permissionMode: "bypassPermissions",
 		includePartialMessages: true,
+		...(fallbackModel ? { fallbackModel } : {}),
 		...(providerSettings.fastMode ? { settings: { fastMode: true } } : {}),
 		systemPrompt: {
 			type: "preset", preset: "claude_code",
@@ -1949,6 +1972,7 @@ function streamClaudeAgentSdk(model: Model<any>, context: Context, options?: Sim
 	debug("provider: fresh query",
 		`model=${model.id} msgs=${context.messages.length} tools=${mcpTools.length}`,
 		`resume=${resumeSessionId?.slice(0, 8) ?? "none"} effort=${effort ?? "default"}`,
+		`fallback=${fallbackModel ?? "none"}`,
 		`appendSys=${appendSystemPrompt} promptCtx=${promptContextAppend.labels.join(",") || "none"} strictMcp=${strictMcpConfigEnabled} fastMode=${providerSettings.fastMode === true}`,
 		`claudeExec=${claudeExecutablePreflight ? `${claudeExecutablePreflight.fileType}:${claudeExecutablePreflight.path}` : "sdk-default"}`,
 		`prompt=${promptText.slice(0, 60)}${promptBlocks ? " [+images]" : ""}`);
@@ -2248,6 +2272,7 @@ export default function (pi: ExtensionAPI) {
 		}
 	};
 	pi.on("session_start", (event, ctx) => {
+		recordProjectTrust(ctx);
 		piUI = ctx.ui;
 		if (event.reason === "new" || event.reason === "resume" || event.reason === "fork") {
 			clearSession(`session_start:${event.reason}`);

package/src/models.ts

@@ -2,13 +2,59 @@
 // `resolveModelId` returns the first partial match, so `opus` resolves to the first-listed opus entry.
 // Extracted from index.ts so tests can import without activating the extension.
 
-export const MODEL_IDS_IN_ORDER = ["claude-opus-4-8", "claude-opus-4-7", "claude-opus-4-6", "claude-sonnet-4-6", "claude-haiku-4-5"];
+export const FABLE_MODEL_ID = "claude-fable-5";
+export const FABLE_FALLBACK_MODEL_ID = "claude-opus-4-8";
+
+export function fallbackModelForPrimaryModel(modelId: string): string | undefined {
+	return modelId === FABLE_MODEL_ID ? FABLE_FALLBACK_MODEL_ID : undefined;
+}
+
+export const MODEL_IDS_IN_ORDER = [
+	FABLE_MODEL_ID,
+	FABLE_FALLBACK_MODEL_ID,
+	"claude-opus-4-7",
+	"claude-opus-4-6",
+	"claude-sonnet-4-6",
+	"claude-haiku-4-5",
+];
+
+type BridgeModelMetadata = {
+	id: string;
+	name: string;
+	reasoning: boolean;
+	thinkingLevelMap?: Record<string, string | null>;
+	input: ("text" | "image")[];
+	contextWindow: number;
+	maxTokens: number;
+};
+
+const FALLBACK_MODELS: Record<string, BridgeModelMetadata> = {
+	[FABLE_MODEL_ID]: {
+		id: FABLE_MODEL_ID,
+		name: "Claude Fable 5",
+		reasoning: true,
+		thinkingLevelMap: { xhigh: "xhigh" },
+		input: ["text", "image"],
+		contextWindow: 1000000,
+		maxTokens: 128000,
+	},
+	[FABLE_FALLBACK_MODEL_ID]: {
+		id: FABLE_FALLBACK_MODEL_ID,
+		name: "Claude Opus 4.8",
+		reasoning: true,
+		thinkingLevelMap: { xhigh: "xhigh" },
+		input: ["text", "image"],
+		contextWindow: 1000000,
+		maxTokens: 128000,
+	},
+};
 
 // Project pi-ai's model entries down to the fields pi's registerProvider expects,
-// and keep MODEL_IDS_IN_ORDER ordering. IDs missing from pi-ai are silently dropped.
+// keep MODEL_IDS_IN_ORDER ordering, and fill bridge-owned future IDs when pi-ai
+// has not shipped metadata for them yet. Unknown missing IDs are still dropped.
 export function buildModels<T extends { id: string; [key: string]: any }>(piAiModels: T[]) {
 	return MODEL_IDS_IN_ORDER
-		.map((id) => piAiModels.find((m) => m.id === id))
+		.map((id) => piAiModels.find((m) => m.id === id) ?? FALLBACK_MODELS[id])
 		.filter((m) => m != null)
 		// Forward thinkingLevelMap so per-model overrides (e.g. opus-4-7 mapping
 		// xhigh→xhigh instead of xhigh→max) are visible to the effort lookup.

package/src/session-verify.ts

@@ -2,7 +2,54 @@
 // callers decide how to surface them (debug log, piUI, diagDump, etc.).
 // Extracted from index.ts so tests can import without activating the extension.
 
-import { statSync, readFileSync } from "fs";
+import { closeSync, openSync, readSync, statSync } from "fs";
+import { StringDecoder } from "node:string_decoder";
+
+interface JsonlSummary {
+	count: number;
+	firstLine?: string;
+	lastLine?: string;
+}
+
+function forEachJsonlLine(path: string, onLine: (line: string) => void): void {
+	const fd = openSync(path, "r");
+	const buffer = Buffer.allocUnsafe(64 * 1024);
+	const decoder = new StringDecoder("utf8");
+	let pending = "";
+	try {
+		for (;;) {
+			const bytesRead = readSync(fd, buffer, 0, buffer.length, null);
+			if (bytesRead === 0) break;
+			pending += decoder.write(buffer.subarray(0, bytesRead));
+			let start = 0;
+			for (;;) {
+				const newline = pending.indexOf("\n", start);
+				if (newline < 0) {
+					pending = pending.slice(start);
+					break;
+				}
+				const line = pending.slice(start, newline);
+				onLine(line.endsWith("\r") ? line.slice(0, -1) : line);
+				start = newline + 1;
+			}
+		}
+		pending += decoder.end();
+		if (pending.length > 0) onLine(pending.endsWith("\r") ? pending.slice(0, -1) : pending);
+	} finally {
+		closeSync(fd);
+	}
+}
+
+function summarizeJsonl(path: string): JsonlSummary {
+	const summary: JsonlSummary = { count: 0 };
+	forEachJsonlLine(path, (line) => {
+		if (!line.trim()) return;
+		summary.count += 1;
+		if (summary.firstLine === undefined) summary.firstLine = line;
+		summary.lastLine = line;
+	});
+	return summary;
+}
 
 export function verifyWrittenSession(jsonlPath: string, expectedSessionId: string, expectedRecordCount: number): string[] {
 	const warnings = [];
@@ -13,21 +60,20 @@ export function verifyWrittenSession(jsonlPath: string, expectedSessionId: strin
 		warnings.push(`file missing after save — path=${jsonlPath} err=${e.message}`);
 		return warnings;
 	}
-	let content;
+	let summary;
 	try {
-		content = readFileSync(jsonlPath, "utf8");
+		summary = summarizeJsonl(jsonlPath);
 	} catch (e) {
 		warnings.push(`file unreadable — path=${jsonlPath} size=${st.size} err=${e.message}`);
 		return warnings;
 	}
-	const lines = content.split("\n").filter((l) => l.trim().length > 0);
-	if (lines.length !== expectedRecordCount) {
-		warnings.push(`record count mismatch — expected=${expectedRecordCount} actual=${lines.length} path=${jsonlPath} bytes=${content.length}`);
+	if (summary.count !== expectedRecordCount) {
+		warnings.push(`record count mismatch — expected=${expectedRecordCount} actual=${summary.count} path=${jsonlPath} bytes=${st.size}`);
 		return warnings;
 	}
 	try {
-		const firstRec = JSON.parse(lines[0]);
-		const lastRec = JSON.parse(lines[lines.length - 1]);
+		const firstRec = JSON.parse(summary.firstLine ?? "");
+		const lastRec = JSON.parse(summary.lastLine ?? "");
 		if (firstRec.sessionId !== expectedSessionId || lastRec.sessionId !== expectedSessionId) {
 			warnings.push(`sessionId drift — expected=${expectedSessionId} first=${firstRec.sessionId} last=${lastRec.sessionId}`);
 		}