@oh-my-pi/pi-coding-agent 15.10.9 → 15.10.11

package/src/web/search/providers/anthropic.ts

@@ -16,6 +16,7 @@ import {
 	type FetchImpl,
 	stripClaudeToolPrefix,
 	withAuth,
+	wrapFetchForCch,
 } from "@oh-my-pi/pi-ai";
 import { $env } from "@oh-my-pi/pi-utils";
 import type {
@@ -64,7 +65,9 @@ function buildSystemBlocks(
 	model: string,
 	systemPrompt?: string,
 ): AnthropicSystemBlock[] | undefined {
-	const includeClaudeCode = !model.startsWith("claude-3-5-haiku");
+	// Match the streaming path: the CC billing header + system instruction are
+	// an OAuth fingerprint and must not be claimed on API-key requests.
+	const includeClaudeCode = auth.isOAuth && !model.startsWith("claude-3-5-haiku");
 	const extraInstructions = auth.isOAuth ? ["You are a helpful AI assistant with web search capabilities."] : [];
 
 	return buildAnthropicSystemBlocks(systemPrompt ? [systemPrompt] : undefined, {
@@ -118,7 +121,10 @@ async function callSearch(
 		body.system = systemBlocks;
 	}
 
-	const response = await fetchImpl(url, {
+	// OAuth requests inject the CC billing header (buildSystemBlocks); patch its
+	// cch attestation like the streaming path instead of shipping `cch=00000`.
+	const doFetch = auth.isOAuth ? wrapFetchForCch(fetchImpl) : fetchImpl;
+	const response = await doFetch(url, {
 		method: "POST",
 		headers,
 		body: JSON.stringify(body),

package/src/web/search/providers/codex.ts

@@ -7,8 +7,9 @@
  * SQLite store, never POSTs the broker sentinel to an OpenAI token endpoint.
  */
 import * as os from "node:os";
-import { type AuthStorage, type FetchImpl, getBundledModels } from "@oh-my-pi/pi-ai";
+import type { AuthStorage, FetchImpl } from "@oh-my-pi/pi-ai";
 import { decodeJwt } from "@oh-my-pi/pi-ai/oauth/openai-codex";
+import { getBundledModels } from "@oh-my-pi/pi-catalog/models";
 import { $env, readSseJson } from "@oh-my-pi/pi-utils";
 import packageJson from "../../../../package.json" with { type: "json" };
 import type { SearchResponse, SearchSource } from "../../../web/search/types";

package/src/web/search/providers/gemini.ts

@@ -8,13 +8,12 @@
  * sibling SQLite store and never POSTs the broker sentinel to a Google token
  * endpoint.
  */
+import type { AuthStorage, FetchImpl } from "@oh-my-pi/pi-ai";
 import {
 	ANTIGRAVITY_SYSTEM_INSTRUCTION,
-	type AuthStorage,
-	type FetchImpl,
 	getAntigravityUserAgent,
 	getGeminiCliHeaders,
-} from "@oh-my-pi/pi-ai";
+} from "@oh-my-pi/pi-catalog/wire/gemini-headers";
 import { fetchWithRetry } from "@oh-my-pi/pi-utils";
 
 import type { SearchCitation, SearchResponse, SearchSource } from "../../../web/search/types";

package/src/web/search/render.ts

@@ -65,7 +65,7 @@ function renderSearchErrorPanel(message: string, providerLabel: string | undefin
 	const body = theme.fg("error", `Error: ${replaceTabs(message)}`);
 	const outputBlock = new CachedOutputBlock();
 	return markFramedBlockComponent({
-		render(width: number): string[] {
+		render(width: number): readonly string[] {
 			return outputBlock.render({ header, state: "error", sections: [{ lines: [body] }], width }, theme);
 		},
 		invalidate() {
@@ -154,23 +154,25 @@ export function renderSearchResult(
 	const outputBlock = new CachedOutputBlock();
 
 	return markFramedBlockComponent({
-		render(width: number): string[] {
+		render(width: number): readonly string[] {
 			// Read mutable state at render time
 			const { expanded } = options;
 
 			// Answer lines: full markdown when expanded, capped markdown preview when collapsed.
 			const answerWidth = Math.max(20, width - 3);
 			const renderedAnswer = answerMarkdown ? answerMarkdown.render(answerWidth) : [];
-			let answerLines: string[];
+			let answerLines: readonly string[];
 			if (renderedAnswer.length === 0) {
 				answerLines = [theme.fg("muted", "No answer text returned")];
 			} else if (args?.maxAnswerLines !== undefined && !expanded) {
 				// CLI compact mode (`omp q`) caps the answer; the TUI passes no cap and shows it in full.
-				answerLines = renderedAnswer.slice(0, args.maxAnswerLines);
-				const remaining = renderedAnswer.length - answerLines.length;
+				// `renderedAnswer` is the Markdown component's shared cache — slice copies before appending.
+				const capped = renderedAnswer.slice(0, args.maxAnswerLines);
+				const remaining = renderedAnswer.length - capped.length;
 				if (remaining > 0) {
-					answerLines.push(theme.fg("muted", formatMoreItems(remaining, "line")));
+					capped.push(theme.fg("muted", formatMoreItems(remaining, "line")));
 				}
+				answerLines = capped;
 			} else {
 				answerLines = renderedAnswer;
 			}

package/dist/types/config/model-equivalence.d.ts

@@ -1,24 +0,0 @@
-import { type Api, type Model } from "@oh-my-pi/pi-ai";
-export type CanonicalModelSource = "override" | "bundled" | "heuristic" | "fallback";
-export interface ModelEquivalenceConfig {
-    overrides?: Record<string, string>;
-    exclude?: string[];
-}
-export interface CanonicalModelVariant {
-    canonicalId: string;
-    selector: string;
-    model: Model<Api>;
-    source: CanonicalModelSource;
-}
-export interface CanonicalModelRecord {
-    id: string;
-    name: string;
-    variants: CanonicalModelVariant[];
-}
-export interface CanonicalModelIndex {
-    records: CanonicalModelRecord[];
-    byId: Map<string, CanonicalModelRecord>;
-    bySelector: Map<string, string>;
-}
-export declare function formatCanonicalVariantSelector(model: Model<Api>): string;
-export declare function buildCanonicalModelIndex(models: readonly Model<Api>[], equivalence?: ModelEquivalenceConfig): CanonicalModelIndex;

package/dist/types/config/model-id-affixes.d.ts

@@ -1,12 +0,0 @@
-export declare function getModelLikeIdSegments(modelId: string): string[];
-export declare function getLongestModelLikeIdSegment(modelId: string): string | undefined;
-/**
- * Strip reseller / wrapper tags that are injected as bracketed affixes around an
- * upstream model id, e.g.
- *   "[Kiro] claude-opus-4-8"                -> "claude-opus-4-8"
- *   "[gcli转] gemini-3.1-pro-preview [假流]" -> "gemini-3.1-pro-preview"
- *
- * Candidates are returned most-stripped first: both ends, then leading-only, then trailing-only.
- */
-export declare function getBracketStrippedModelIdCandidates(modelId: string): string[];
-export declare function stripBracketedModelIdAffixes(modelId: string): string | undefined;

package/dist/types/config/model-provider-priority.d.ts

@@ -1 +0,0 @@
-export declare function buildModelProviderPriorityRank(configuredProviderOrder?: readonly string[]): Map<string, number>;

package/dist/types/exec/idle-timeout-watchdog.d.ts

@@ -1,18 +0,0 @@
-export type ExecutionAbortReason = "idle-timeout" | "signal";
-export interface IdleTimeoutWatchdogOptions {
-    timeoutMs?: number;
-    signal?: AbortSignal;
-    hardTimeoutGraceMs: number;
-    onAbort?: (reason: ExecutionAbortReason) => void;
-}
-export declare class IdleTimeoutWatchdog {
-    #private;
-    constructor(options: IdleTimeoutWatchdogOptions);
-    get abortedBySignal(): boolean;
-    get hardTimeoutPromise(): Promise<"hard-timeout">;
-    get signal(): AbortSignal;
-    get timedOut(): boolean;
-    touch(): void;
-    dispose(): void;
-}
-export declare function formatIdleTimeoutMessage(timeoutMs?: number): string;