pi-claude-agent-sdk 0.8.2 → 0.8.4

package/README.md

@@ -21,13 +21,13 @@ pi install npm:pi-claude-agent-sdk
 
 ## Provider
 
-Use `/model` to select `claude-bridge/claude-fable-5`, `claude-bridge/claude-opus-5`, `claude-bridge/claude-opus-4-8`, `claude-bridge/claude-opus-4-7`, `claude-bridge/claude-opus-4-6`, `claude-bridge/claude-sonnet-5`, `claude-bridge/claude-sonnet-4-6`, or `claude-bridge/claude-haiku-4-5`.
+Use `/model` to select `claude-bridge/claude-fable-5-1`, `claude-bridge/claude-fable-5`, `claude-bridge/claude-opus-5`, `claude-bridge/claude-opus-4-8`, `claude-bridge/claude-opus-4-7`, `claude-bridge/claude-opus-4-6`, `claude-bridge/claude-sonnet-5`, `claude-bridge/claude-sonnet-4-6`, or `claude-bridge/claude-haiku-4-5`. The `fable` shortcut resolves to Fable 5.1. Fable 5.1 needs Claude Code **2.1.251 or newer**; if the SDK's bundled CLI is older, set `provider.pathToClaudeCodeExecutable` to a current `claude` binary.
 
 Behind the scenes, pi's tools are bridged to Claude Code but it should all work like normal in pi. Bash commands get a 120-second default timeout (matching Claude Code's default) since pi's bash has no timeout by default. Skills in pi are copied over to Claude Code's system prompt so should work as they would with any other pi provider. Steering works mid-turn: a message sent while Claude is running a tool reaches it at that tool boundary, not after the whole turn finishes.
 
 **Authentication:** the bridge requires an Anthropic OAuth credential (or API key) configured in Pi and uses Pi's normal token refresh. Claude Code login and inherited Claude/Anthropic authentication settings are deliberately ignored, so configure Anthropic authentication in Pi before using the provider.
 
-**1M Context:** Opus 5, Opus 4.8, and Opus 4.7 get 1M context by default. Opus 4.6 only gets 1M if you're on a Max plan or pay for Extra Usage. Sonnet 4.6 only gets 1M if you pay for Extra Usage. You will need to set `provider.plan` and/or `provider.longContextExtraUsage` for 1M context in Opus 4.6/Sonnet 4.6 as described in [Configuration](#configuration).
+**1M Context:** Fable 5.1, Fable 5, Opus 5, Opus 4.8, and Opus 4.7 get 1M context by default. Opus 4.6 only gets 1M if you're on a Max plan or pay for Extra Usage. Sonnet 4.6 only gets 1M if you pay for Extra Usage. You will need to set `provider.plan` and/or `provider.longContextExtraUsage` for 1M context in Opus 4.6/Sonnet 4.6 as described in [Configuration](#configuration).
 
 ## Configuration
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-claude-agent-sdk",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "private": false,
   "description": "Pi extension that uses Claude Code (via Agent SDK) as a model provider.",
   "keywords": [

package/src/convert.ts

@@ -116,10 +116,16 @@ export type DroppedContent = {
 	other: Map<string, number>;
 };
 
-/** Convert pi message array to Anthropic API format. */
+/** Convert pi message array to Anthropic API format.
+ *
+ *  `dropThinking` strips every thinking block, including ones we minted. Fable 5.1
+ *  binds thinking to the conversation prefix, so a rebuild that keeps the blocks
+ *  and rewrites system/tools is a 400. Removing a leading run of thinking is the
+ *  documented-safe alternative. */
 export function convertPiMessages(
 	messages: PiMessage[],
 	customToolNameToSdk?: Map<string, string>,
+	dropThinking = false,
 ): { anthropicMessages: SessionMessage[]; sanitizedIds: Map<string, string>; dropped: DroppedContent } {
 	const anthropicMessages = [];
 	const sanitizedIds = new Map();
@@ -160,7 +166,7 @@ export function convertPiMessages(
 					// by any other provider — including pi's own Anthropic provider — is
 					// not ours to hand back, and Anthropic rejects ones it can't verify.
 					const sig = block.thinkingSignature;
-					if (msg.provider === PROVIDER_ID && sig) {
+					if (!dropThinking && msg.provider === PROVIDER_ID && sig) {
 						blocks.push({ type: "thinking", thinking: block.thinking ?? "", signature: sig });
 					} else {
 						dropped.thinking++;

package/src/index.ts

@@ -9,7 +9,7 @@ import { appendFileSync, mkdirSync, realpathSync, statSync } from "fs";
 import { homedir } from "os";
 import { dirname, join } from "path";
 import { PROVIDER_ID, messageContentToText, convertPiMessages } from "./convert.js";
-import { applyLongContext, buildModels, claudeCodeModelId, type LongContextSettings } from "./models.js";
+import { adaptiveThinkingAlwaysOn, applyLongContext, buildModels, claudeCodeModelId, thinkingBoundToPrefix, type LongContextSettings } from "./models.js";
 import { MCP_SERVER_NAME, MCP_TOOL_PREFIX } from "./skills.js";
 import { verifyWrittenSession as _verifyWrittenSession } from "./session-verify.js";
 import { extractAllToolResults as _extractAllToolResults, type McpResult } from "./extract-tool-results.js";
@@ -17,6 +17,7 @@ import { QueryContext, ctx } from "./query-state.js";
 import { makePromptStream, userMessage, type PromptStream } from "./prompt-stream.js";
 import { claudeCodeSettings, loadConfig, markStartupNoticeShown, type Config } from "./config.js";
 import {
+	getSharedPromptCaptures,
 	projectPromptCapture,
 	PromptCaptures,
 } from "./prompt-capture.js";
@@ -133,6 +134,10 @@ function diagDump(label: string, data: Record<string, unknown>) {
 //
 // On session_shutdown (including /reload), clearSession() resets this so a fresh
 // registration can occur for the next session.
+//
+// The prompt-capture table is shared the same way (PROMPT_CAPTURES_KEY): skipping
+// re-registration is not enough when the first copy's before_agent_start handler
+// is dropped and a second copy records into a different Map.
 const ACTIVE_STREAM_SIMPLE_KEY = Symbol.for("claude-bridge:activeStreamSimple");
 
 // MODELS is buildModels(getModels("anthropic")) — projection kept in models.js.
@@ -210,8 +215,9 @@ function convertAndImportMessages(
 	messages: Context["messages"],
 	customToolNameToSdk?: Map<string, string>,
 	carried?: readonly CarriedAttachment[],
+	dropThinking = false,
 ): void {
-	const { anthropicMessages, sanitizedIds, dropped } = convertPiMessages(messages, customToolNameToSdk);
+	const { anthropicMessages, sanitizedIds, dropped } = convertPiMessages(messages, customToolNameToSdk, dropThinking);
 
 	debug(`convertAndImportMessages: ${messages.length} pi msgs → ${anthropicMessages.length} anthropic msgs`);
 	debug(`convertAndImportMessages: imported roles:`, anthropicMessages.map((m, i) => {
@@ -671,7 +677,7 @@ function syncSharedSession(
 		...(preserveId ? { sessionId: previousSessionId } : {}),
 		...(modelId ? { model: modelId } : {}),
 	});
-	convertAndImportMessages(session, priorMessages, customToolNameToSdk, carried);
+	convertAndImportMessages(session, priorMessages, customToolNameToSdk, carried, thinkingBoundToPrefix(modelId ?? ""));
 	session.save();
 	// records, not messages: `messages` filters out the attachment records that
 	// carrying an `@file` expansion across a rebuild writes into the same file.
@@ -790,8 +796,10 @@ function showStartupNoticeOnce(): void {
 }
 
 // Captures of what pi assembled per agent; see src/prompt-capture.ts for why this
-// is keyed rather than held in a single slot.
-const promptCaptures = new PromptCaptures(256, (diagnostic) => {
+// is keyed rather than held in a single slot. Process-wide: a second evaluation
+// of this module (user vs project package root, or a subagent) must record into
+// the same table the first evaluation's streamSimple reads.
+const promptCaptures = getSharedPromptCaptures(() => new PromptCaptures(256, (diagnostic) => {
 	const first = diagnostic.matches[0];
 	debug(
 		`prompt-capture: no match for ${diagnostic.systemPrompt.length}-char system prompt. `
@@ -801,7 +809,7 @@ const promptCaptures = new PromptCaptures(256, (diagnostic) => {
 			: "no known captures to compare against."
 		) + ` known keys=${diagnostic.matches.length}`,
 	);
-});
+}));
 
 /** Whatever a settled session left behind, named in one greppable line.
  *
@@ -1567,7 +1575,9 @@ function streamClaudeAgentSdk(model: Model<any>, context: Context, options?: Sim
 	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";
+	// Fable 5 / 5.1 always think and also default to omitted, even when we pass no effort
+	// (CC then uses the model default, high).
+	if (effort || adaptiveThinkingAlwaysOn(model.id)) extraArgs["thinking-display"] = "summarized";
 
 	// 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

package/src/models.ts

@@ -2,14 +2,42 @@
 // `resolveModel` 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-fable-5", "claude-opus-5", "claude-opus-4-8", "claude-opus-4-7", "claude-opus-4-6", "claude-sonnet-5", "claude-sonnet-4-6", "claude-haiku-4-5"];
+export const MODEL_IDS_IN_ORDER = ["claude-fable-5-1", "claude-fable-5", "claude-opus-5", "claude-opus-4-8", "claude-opus-4-7", "claude-opus-4-6", "claude-sonnet-5", "claude-sonnet-4-6", "claude-haiku-4-5"];
+
+const TWO_HUNDRED_K_CONTEXT = 200_000;
+const ONE_M_CONTEXT = 1_000_000;
+
+/** Catalog stubs for IDs Claude Code already serves that the installed pi-ai has
+ *  not listed yet. Prefer pi-ai when it has the entry. Fable 5.1 shipped
+ *  2026-09-01; pi-ai 0.84.4 (2026-08-28) does not include it. */
+export const FALLBACK_MODELS: Record<string, {
+	id: string;
+	name: string;
+	reasoning: boolean;
+	input: string[];
+	contextWindow: number;
+	maxTokens: number;
+	thinkingLevelMap?: Record<string, string | null>;
+}> = {
+	"claude-fable-5-1": {
+		id: "claude-fable-5-1",
+		name: "Claude Fable 5.1",
+		reasoning: true,
+		input: ["text", "image"],
+		contextWindow: ONE_M_CONTEXT,
+		maxTokens: 128_000,
+		// Same shape as pi-ai's claude-fable-5: adaptive thinking, xhigh visible.
+		thinkingLevelMap: { off: null, xhigh: "xhigh", max: "max" },
+	},
+};
 
 // 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.
-// Context-dependent display labels are applied after plan/long-context config is known.
+// and keep MODEL_IDS_IN_ORDER ordering. IDs missing from pi-ai are silently dropped
+// unless FALLBACK_MODELS has a stub. Context-dependent display labels are applied
+// after plan/long-context config is known.
 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 pi-ai's per-model overrides (e.g. opus-4-8
 		// mapping xhigh→xhigh and max→max) are visible to the effort lookup.
@@ -32,9 +60,6 @@ export type ClaudeCodeRuntimeModel = {
 	contextWindow: number;
 };
 
-const TWO_HUNDRED_K_CONTEXT = 200_000;
-const ONE_M_CONTEXT = 1_000_000;
-
 // Measured Claude Agent SDK subscription/OAuth behavior. Do not infer this from
 // pi-ai's advertised contextWindow: bare Opus 4.7 serves 1M, bare Opus 4.8 does
 // not, and [1m] entitlement differs by model. See diag/CONTEXT-SIZE.md.
@@ -53,6 +78,11 @@ export function resolveClaudeCodeRuntimeModel(modelId: string, settings: LongCon
 				contextWindow: useOneM ? ONE_M_CONTEXT : TWO_HUNDRED_K_CONTEXT,
 			};
 		}
+		case "claude-fable-5-1":
+			// 1M is the default and the maximum, billed at standard rates across the
+			// whole window (no Extra Usage). CC still takes the [1m] suffix to request
+			// that window, same as Fable 5 / Opus 5.
+			return { cliModelId: "claude-fable-5-1[1m]", contextWindow: ONE_M_CONTEXT };
 		case "claude-fable-5":
 			return { cliModelId: "claude-fable-5[1m]", contextWindow: ONE_M_CONTEXT };
 		case "claude-sonnet-5":
@@ -74,9 +104,27 @@ export function claudeCodeModelId(model: { id: string }, settings: LongContextSe
 	return resolveClaudeCodeRuntimeModel(model.id, settings).cliModelId;
 }
 
+/** Adaptive thinking is always on. `thinking: enabled` with budget_tokens and
+ *  `disabled` both 400; omit thinking or send adaptive. `thinking.display`
+ *  defaults to omitted, so the stream has no thinking text unless we ask. */
+export function adaptiveThinkingAlwaysOn(modelId: string): boolean {
+	return modelId === "claude-fable-5-1" || modelId.startsWith("claude-fable-5-1[")
+		|| modelId === "claude-fable-5" || modelId.startsWith("claude-fable-5[");
+}
+
+/** Fable 5.1 binds each thinking block to the conversation prefix. Replaying a
+ *  block after a rebuild (new system prompt or tools) 400s with "The block is
+ *  bound to a different conversation". Resume is fine; rebuilds must drop
+ *  thinking. https://platform.claude.com/docs/en/models/fable-5-1/whats-new-fable-5-1#editing-earlier-turns-invalidates-thinking-blocks */
+export function thinkingBoundToPrefix(modelId: string): boolean {
+	return modelId === "claude-fable-5-1" || modelId.startsWith("claude-fable-5-1[");
+}
+
 export function resolveModel<T extends { id: string }>(models: T[], input: string): T | undefined {
 	const lower = input.toLowerCase();
-	return models.find((m) => m.id === lower || m.id.includes(lower));
+	// Exact match first: otherwise `claude-fable-5` would hit `claude-fable-5-1`
+	// via includes() when the newer id is listed first for the `fable` shortcut.
+	return models.find((m) => m.id === lower) ?? models.find((m) => m.id.includes(lower));
 }
 
 // Produce the model metadata registered with pi. The registered contextWindow must

package/src/prompt-capture.ts

@@ -162,7 +162,10 @@ export class PromptCaptures {
 				+ `Claude Code would receive none of this turn's context files, skills or custom instructions. `
 				+ `The usual cause is an extension loaded after claude-bridge that rewrites the system prompt from before_agent_start — `
 				+ `one that wraps it is fine, one that rebuilds or strips it leaves nothing to match. `
-				+ `(Also possible: pi rebuilt the prompt outside before_agent_start — a late-registered tool or fresh resource discovery.)`,
+				+ `(Also possible: pi rebuilt the prompt outside before_agent_start — a late-registered tool or fresh resource discovery.)`
+				+ (this.captures.size === 0
+					? ` Zero known also means before_agent_start never recorded into this table — often a second copy of this extension loaded from another package root after the first registered the provider.`
+					: ""),
 			);
 		}
 
@@ -232,6 +235,30 @@ export class PromptCaptures {
 	}
 }
 
+/** Process-wide slot for the capture table.
+ *
+ *  `src/index.ts` is evaluated once per package root. Pi's pre-trust pass loads
+ *  the user install, which registers the provider; the post-trust pass then
+ *  loads the project install as a different module and drops the first copy's
+ *  event handlers. A per-module Map means `before_agent_start` records into a
+ *  table the live `streamSimple` never reads.
+ *
+ *  Symbol.for shares one table across those evaluations, the same way
+ *  `ACTIVE_STREAM_SIMPLE_KEY` shares the stream. Do not use `instanceof
+ *  PromptCaptures` to recognize the stored value: two package roots evaluate
+ *  two copies of the class, so a cross-realm check would replace the table
+ *  the first copy's stream already closed over. */
+export const PROMPT_CAPTURES_KEY = Symbol.for("claude-bridge:promptCaptures");
+
+export function getSharedPromptCaptures(create: () => PromptCaptures): PromptCaptures {
+	const g = globalThis as Record<symbol, unknown>;
+	const existing = g[PROMPT_CAPTURES_KEY];
+	if (existing) return existing as PromptCaptures;
+	const created = create();
+	g[PROMPT_CAPTURES_KEY] = created;
+	return created;
+}
+
 export function projectPromptCapture(
 	capture: PromptCapture,
 	options: { skillReadTool: SkillReadTool },