@iislee/opencodex 2.11.0

package/src/vision/index.ts

@@ -0,0 +1,467 @@
+import { createHash } from "node:crypto";
+import type { OcxConfig, OcxContentPart, OcxMessage, OcxParsedRequest, OcxProviderConfig, OcxTextContent } from "../types";
+import { modelInList } from "../types";
+import { describeImage, type DescribeOutcome, type VisionSettings } from "./describe";
+import { describeImageAnthropic } from "./anthropic-describe";
+import type { CodexAuthContext } from "../codex/auth-context";
+import { getAccountSet } from "../oauth/store";
+import type { ResolvedOpenAiForwardSidecar } from "../providers/openai-sidecar";
+import type { SidecarOutcomeRecorder } from "../web-search/executor";
+import { enforceAppOwnedMemoryBudget } from "../lib/app-owned-memory";
+import type { TranslatorBudget } from "../lib/translator-budget";
+
+export { describeImage } from "./describe";
+export { describeImageAnthropic, parseAnthropicVisionSSE } from "./anthropic-describe";
+
+const DEFAULT_VISION_MODEL = "gpt-5.4-mini";
+const DEFAULT_ANTHROPIC_VISION_MODEL = "claude-sonnet-5";
+const DEFAULT_TIMEOUT_MS = 45_000;
+const DEFAULT_MAX_DESCRIPTIONS_PER_TURN = 8;
+const DESCRIPTION_CACHE_MAX_ENTRIES = 256;
+export const VISION_DESCRIPTION_CACHE_MAX_BYTES = 1024 * 1024;
+const descriptionEncoder = new TextEncoder();
+/** Max images described in parallel — keeps first-token latency bounded without flooding the backend. */
+const VISION_CONCURRENCY = 3;
+/** Per-image description hard cap (chars) so multi-image turns can't blow the main model's context. */
+const DESC_MAX_CHARS = 2000;
+/** User-text context passed to the describer, capped. */
+const CONTEXT_MAX_CHARS = 800;
+
+export interface VisionDescriptionCache {
+  get(key: string): string | undefined;
+  set(key: string, value: string): void;
+  clear(): void;
+  snapshot?(): { count: number; bytes: number; oldestAt: number | null };
+  evictOldest?(): number;
+}
+
+class BoundedLruDescriptionCache implements VisionDescriptionCache {
+  private readonly entries = new Map<string, { value: string; sizeBytes: number; storedAt: number }>();
+  private bytes = 0;
+
+  constructor(private readonly maxEntries: number, private readonly maxBytes: number) {}
+
+  get(key: string): string | undefined {
+    const entry = this.entries.get(key);
+    if (entry === undefined) return undefined;
+    this.entries.delete(key);
+    entry.storedAt = Date.now();
+    this.entries.set(key, entry);
+    return entry.value;
+  }
+
+  set(key: string, value: string): void {
+    const existing = this.entries.get(key);
+    if (existing) {
+      this.entries.delete(key);
+      this.bytes -= existing.sizeBytes;
+    }
+    const sizeBytes = descriptionEncoder.encode(key).byteLength + descriptionEncoder.encode(value).byteLength;
+    if (sizeBytes > this.maxBytes || this.maxEntries <= 0) return;
+    while (this.entries.size + 1 > this.maxEntries || this.bytes + sizeBytes > this.maxBytes) {
+      if (this.evictOldest() === 0) return;
+    }
+    this.entries.set(key, { value, sizeBytes, storedAt: Date.now() });
+    this.bytes += sizeBytes;
+  }
+
+  clear(): void {
+    this.entries.clear();
+    this.bytes = 0;
+  }
+
+  snapshot(): { count: number; bytes: number; oldestAt: number | null } {
+    return {
+      count: this.entries.size,
+      bytes: this.bytes,
+      oldestAt: this.entries.values().next().value?.storedAt ?? null,
+    };
+  }
+
+  evictOldest(): number {
+    const oldest = this.entries.keys().next().value;
+    if (oldest === undefined) return 0;
+    const entry = this.entries.get(oldest);
+    if (!entry) return 0;
+    this.entries.delete(oldest);
+    this.bytes -= entry.sizeBytes;
+    return entry.sizeBytes;
+  }
+}
+
+let descriptionCacheLimits = {
+  maxEntries: DESCRIPTION_CACHE_MAX_ENTRIES,
+  maxBytes: VISION_DESCRIPTION_CACHE_MAX_BYTES,
+};
+
+function defaultDescriptionCache(): VisionDescriptionCache {
+  return new BoundedLruDescriptionCache(descriptionCacheLimits.maxEntries, descriptionCacheLimits.maxBytes);
+}
+
+let descriptionCache: VisionDescriptionCache = defaultDescriptionCache();
+
+/** Replace the process cache (primarily for deterministic tests). Passing undefined restores the default LRU. */
+export function setVisionDescriptionCache(cache?: VisionDescriptionCache): void {
+  descriptionCache = cache ?? defaultDescriptionCache();
+}
+
+export function resetVisionDescriptionCache(): void {
+  descriptionCache.clear();
+}
+
+export function setVisionDescriptionCacheLimitsForTests(
+  limits?: { maxEntries?: number; maxBytes?: number },
+): void {
+  descriptionCacheLimits = limits
+    ? { maxEntries: limits.maxEntries ?? DESCRIPTION_CACHE_MAX_ENTRIES, maxBytes: limits.maxBytes ?? VISION_DESCRIPTION_CACHE_MAX_BYTES }
+    : { maxEntries: DESCRIPTION_CACHE_MAX_ENTRIES, maxBytes: VISION_DESCRIPTION_CACHE_MAX_BYTES };
+  descriptionCache = defaultDescriptionCache();
+}
+
+export function visionDescriptionRetainedStoreSnapshot(): {
+  count: number;
+  bytes: number;
+  evictableBytes: number;
+  pinnedBytes: number;
+  oldestAt: number | null;
+} {
+  const snapshot = descriptionCache.snapshot?.();
+  if (!snapshot) return { count: 0, bytes: 0, evictableBytes: 0, pinnedBytes: 0, oldestAt: null };
+  return { ...snapshot, evictableBytes: snapshot.bytes, pinnedBytes: 0 };
+}
+
+export function evictOldestVisionDescriptionForBudget(): number {
+  return descriptionCache.evictOldest?.() ?? 0;
+}
+
+/** Runtime config is permissive: zero is intentional; malformed values fall back to the bounded default. */
+export function resolveMaxDescriptionsPerTurn(value: unknown): number {
+  if (value === 0) return 0;
+  return typeof value === "number" && Number.isInteger(value) && value > 0
+    ? value
+    : DEFAULT_MAX_DESCRIPTIONS_PER_TURN;
+}
+
+/** Run `worker` over `items` with bounded concurrency, preserving input order in the result array. */
+async function runBounded<T, R>(items: T[], limit: number, worker: (item: T) => Promise<R>): Promise<R[]> {
+  const results = new Array<R>(items.length);
+  let next = 0;
+  const runner = async (): Promise<void> => {
+    while (next < items.length) {
+      const i = next++;
+      results[i] = await worker(items[i]);
+    }
+  };
+  await Promise.all(Array.from({ length: Math.min(limit, items.length) }, runner));
+  return results;
+}
+
+function clamp(s: string, max: number): string {
+  return s.length <= max ? s : `${s.slice(0, max)}\n…[description truncated]`;
+}
+
+export interface AnthropicVisionProvider {
+  providerName: string;
+  provider: OcxProviderConfig;
+}
+
+/** First enabled Anthropic OAuth provider whose active stored account is not marked for reauth. */
+export function findAnthropicVisionProvider(config: OcxConfig): AnthropicVisionProvider | undefined {
+  for (const [providerName, provider] of Object.entries(config.providers)) {
+    if (provider.disabled === true || provider.adapter !== "anthropic" || provider.authMode !== "oauth") continue;
+    const accountSet = getAccountSet(providerName);
+    const active = accountSet?.accounts.find(account => account.id === accountSet.activeAccountId);
+    if (active && active.needsReauth !== true) return { providerName, provider };
+  }
+  return undefined;
+}
+
+export function resolveVisionBackend(
+  explicit: "openai" | "anthropic" | undefined,
+  anthropicSidecar: AnthropicVisionProvider | undefined,
+): "openai" | "anthropic" {
+  if (explicit === "openai" || explicit === "anthropic") return explicit;
+  return anthropicSidecar ? "anthropic" : "openai";
+}
+
+/** A user/developer/toolResult message can carry images (toolResult: e.g. Codex view_image output). */
+function carriesImages(role: string): boolean {
+  return role === "user" || role === "developer" || role === "toolResult";
+}
+
+function messagesHaveImage(parsed: OcxParsedRequest): boolean {
+  return parsed.context.messages.some(m =>
+    carriesImages(m.role) && Array.isArray(m.content) && (m.content as OcxContentPart[]).some(p => p.type === "image"));
+}
+
+export function shouldResolveOpenAiVisionSidecar(
+  config: OcxConfig,
+  provider: OcxProviderConfig,
+  modelId: string,
+  parsed: OcxParsedRequest,
+): boolean {
+  if (!modelInList(provider.noVisionModels, modelId) || !messagesHaveImage(parsed)) return false;
+  const cfg = config.visionSidecar ?? {};
+  if (cfg.enabled === false) return false;
+  return resolveVisionBackend(cfg.backend, findAnthropicVisionProvider(config)) === "openai";
+}
+
+export interface VisionPlan {
+  backend: "openai" | "anthropic";
+  forwardSidecar?: ResolvedOpenAiForwardSidecar;
+  anthropicSidecar?: AnthropicVisionProvider;
+  settings: VisionSettings;
+  maxDescriptionsPerTurn: number;
+}
+
+/**
+ * Decide whether the vision sidecar should pre-describe images for this request, returning the plan
+ * if so. Active when: the routed model is in `provider.noVisionModels`, the request actually carries
+ * an image, the sidecar isn't disabled, and the selected backend has usable auth. Returns undefined
+ * otherwise (the caller strips images before sending to a text-only model).
+ */
+export function planVisionSidecar(
+  config: OcxConfig,
+  provider: OcxProviderConfig,
+  modelId: string,
+  parsed: OcxParsedRequest,
+  openAiSidecar?: ResolvedOpenAiForwardSidecar,
+): VisionPlan | undefined {
+  if (!modelInList(provider.noVisionModels, modelId)) return undefined;
+  if (!messagesHaveImage(parsed)) return undefined;
+  const cfg = config.visionSidecar ?? {};
+  if (cfg.enabled === false) return undefined;
+  const anthropicSidecar = findAnthropicVisionProvider(config);
+  const backend = resolveVisionBackend(cfg.backend, anthropicSidecar);
+  const maxDescriptionsPerTurn = resolveMaxDescriptionsPerTurn(cfg.maxDescriptionsPerTurn);
+
+  if (backend === "anthropic") {
+    if (!anthropicSidecar) return undefined;
+    return {
+      backend,
+      anthropicSidecar,
+      settings: { model: cfg.model ?? DEFAULT_ANTHROPIC_VISION_MODEL, timeoutMs: cfg.timeoutMs ?? DEFAULT_TIMEOUT_MS },
+      maxDescriptionsPerTurn,
+    };
+  }
+
+  if (!openAiSidecar) return undefined;
+  return {
+    backend,
+    forwardSidecar: openAiSidecar,
+    settings: { model: cfg.model ?? DEFAULT_VISION_MODEL, timeoutMs: cfg.timeoutMs ?? DEFAULT_TIMEOUT_MS },
+    maxDescriptionsPerTurn,
+  };
+}
+
+interface ImageJob {
+  imageUrl: string;
+  detail?: string;
+  contextText: string;
+}
+
+/** Render one describe outcome as the replacement text part (clamped to the per-image budget). */
+function renderDescription(out: { text: string; error?: string }): OcxTextContent {
+  return {
+    type: "text",
+    text: out.error
+      ? `[An image was attached but could not be processed: ${out.error}]`
+      : `[Image content — described by a vision model because you cannot see images directly:\n${clamp(out.text.trim(), DESC_MAX_CHARS)}]`,
+  };
+}
+
+function sha256(value: string | Uint8Array): string {
+  return createHash("sha256").update(value).digest("hex");
+}
+
+function normalizedContext(contextText: string): string {
+  return contextText.trim().replace(/\s+/g, " ");
+}
+
+function descriptionIdentity(job: ImageJob, plan: VisionPlan): { key: string; persistent: boolean } {
+  let imageHash: string;
+  let persistent = false;
+  const data = /^data:[^;,]+;base64,(.*)$/s.exec(job.imageUrl);
+  if (data) {
+    imageHash = sha256(Buffer.from(data[1], "base64"));
+    persistent = true;
+  } else {
+    imageHash = sha256(job.imageUrl);
+  }
+  return {
+    key: JSON.stringify([
+      plan.backend,
+      plan.settings.model,
+      job.detail ?? "high",
+      imageHash,
+      sha256(normalizedContext(job.contextText)),
+    ]),
+    persistent,
+  };
+}
+
+async function executeDescription(
+  job: ImageJob,
+  plan: VisionPlan,
+  selectedForwardHeaders: Headers,
+  abortSignal?: AbortSignal,
+  recordSidecarOutcome?: SidecarOutcomeRecorder,
+): Promise<DescribeOutcome> {
+  if (plan.backend === "anthropic") {
+    const sidecar = plan.anthropicSidecar;
+    if (!sidecar) return { text: "", error: "anthropic vision sidecar is unavailable" };
+    return describeImageAnthropic(
+      job.imageUrl,
+      job.detail,
+      job.contextText,
+      sidecar.providerName,
+      sidecar.provider,
+      plan.settings,
+      abortSignal,
+    );
+  }
+  if (!plan.forwardSidecar) return { text: "", error: "OpenAI vision sidecar is unavailable" };
+  return describeImage(
+    job.imageUrl,
+    job.detail,
+    job.contextText,
+    plan.forwardSidecar.provider,
+    plan.forwardSidecar.headers,
+    plan.settings,
+    abortSignal,
+    recordSidecarOutcome,
+  );
+}
+
+/**
+ * Replace every image part in the request with a gpt-described text part, so a text-only model can
+ * reason about it. Mutates `parsed.context.messages` in place; uses the message's own text as the
+ * description context. All images are described with bounded concurrency (not serially) so a
+ * multi-image turn doesn't pay the sum of per-image latencies. Failures degrade to a short marker.
+ */
+export async function describeImagesInPlace(
+  parsed: OcxParsedRequest,
+  plan: VisionPlan,
+  selectedForwardHeaders: Headers,
+  abortSignal?: AbortSignal,
+  recordSidecarOutcome?: SidecarOutcomeRecorder,
+  translatorBudget?: TranslatorBudget,
+): Promise<void> {
+  // 1. Gather every image part across messages, each with its own message's text as context.
+  const jobs: ImageJob[] = [];
+  const targets: { msg: OcxMessage; parts: OcxContentPart[] }[] = [];
+  for (const msg of parsed.context.messages) {
+    if (!carriesImages(msg.role) || !Array.isArray(msg.content)) continue;
+    const parts = msg.content as OcxContentPart[];
+    if (!parts.some(p => p.type === "image")) continue;
+    const contextText = parts
+      .filter((p): p is OcxTextContent => p.type === "text")
+      .map(p => p.text)
+      .join(" ")
+      .slice(0, CONTEXT_MAX_CHARS);
+    for (const p of parts) {
+      if (p.type === "image") jobs.push({ imageUrl: p.imageUrl, detail: p.detail, contextText });
+    }
+    targets.push({ msg, parts });
+  }
+  if (jobs.length === 0) return;
+
+  // 2. Admit misses in source order. Cache hits and same-turn waiters do not consume the cap.
+  const inFlight = new Map<string, Promise<DescribeOutcome>>();
+  const executions: Array<() => Promise<void>> = [];
+  const outcomePromises: Array<Promise<DescribeOutcome>> = [];
+  let misses = 0;
+
+  for (const job of jobs) {
+    const identity = descriptionIdentity(job, plan);
+    const cached = identity.persistent ? descriptionCache.get(identity.key) : undefined;
+    if (cached !== undefined) {
+      outcomePromises.push(Promise.resolve({ text: cached }));
+      continue;
+    }
+
+    const existing = inFlight.get(identity.key);
+    if (existing) {
+      outcomePromises.push(existing);
+      continue;
+    }
+
+    if (misses >= plan.maxDescriptionsPerTurn) {
+      const capped = Promise.resolve<DescribeOutcome>({ text: "", error: "description cap reached for this turn" });
+      inFlight.set(identity.key, capped);
+      outcomePromises.push(capped);
+      continue;
+    }
+
+    misses += 1;
+    let resolveOutcome!: (outcome: DescribeOutcome) => void;
+    const pending = new Promise<DescribeOutcome>(resolve => { resolveOutcome = resolve; });
+    inFlight.set(identity.key, pending);
+    outcomePromises.push(pending);
+    executions.push(async () => {
+      let outcome: DescribeOutcome;
+      try {
+        outcome = await executeDescription(job, plan, selectedForwardHeaders, abortSignal, recordSidecarOutcome);
+      } catch (error) {
+        outcome = { text: "", error: error instanceof Error ? error.message : String(error) };
+      }
+      const successfulText = outcome.error ? "" : clamp(outcome.text.trim(), DESC_MAX_CHARS);
+      if (identity.persistent && successfulText) {
+        descriptionCache.set(identity.key, successfulText);
+        enforceAppOwnedMemoryBudget();
+      }
+      const resolvedOutcome = outcome.error ? outcome : { ...outcome, text: successfulText };
+      resolveOutcome(resolvedOutcome);
+    });
+  }
+
+  await runBounded(executions, VISION_CONCURRENCY, execute => execute());
+  const outcomes = await Promise.all(outcomePromises);
+
+  // 3. Rebuild each message, replacing image parts with their descriptions in order.
+  let oi = 0;
+  for (const { msg, parts } of targets) {
+    const newParts: OcxContentPart[] = [];
+    for (const p of parts) {
+      if (p.type !== "image") {
+        newParts.push(p);
+        continue;
+      }
+      const replacement = renderDescription(outcomes[oi++]);
+      const reservation = translatorBudget?.reserveTransient(
+        descriptionEncoder.encode(replacement.text).byteLength,
+        { kind: "request_copies" },
+      );
+      newParts.push(replacement);
+      reservation?.commitRetained();
+    }
+    msg.content = newParts;
+  }
+}
+
+/**
+ * Fail-closed image strip for sidecar-covered models when NO sidecar plan exists (no forward
+ * provider / missing forwarded auth / sidecar disabled): the upstream is text-only, so forwarding
+ * raw images would 400 or silently confuse it. Replace each image with an explicit marker so the
+ * model (and the user, via its reply) knows the image was dropped rather than ignored.
+ */
+export function stripImagesInPlace(parsed: OcxParsedRequest, translatorBudget?: TranslatorBudget): boolean {
+  let stripped = false;
+  for (const msg of parsed.context.messages) {
+    if (!carriesImages(msg.role) || !Array.isArray(msg.content)) continue;
+    const parts = msg.content as OcxContentPart[];
+    if (!parts.some(p => p.type === "image")) continue;
+    msg.content = parts.map(p => {
+      if (p.type !== "image") return p;
+      const replacement = { type: "text", text: "[image omitted: this model is text-only and the vision sidecar is unavailable (no ChatGPT login)]" } as OcxContentPart;
+      const reservation = translatorBudget?.reserveTransient(
+        descriptionEncoder.encode((replacement as OcxTextContent).text).byteLength,
+        { kind: "request_copies" },
+      );
+      reservation?.commitRetained();
+      return replacement;
+    });
+    stripped = true;
+  }
+  return stripped;
+}

package/src/web-search/anthropic-executor.ts

@@ -0,0 +1,189 @@
+import type { OcxProviderConfig } from "../types";
+import { getValidAccessToken } from "../oauth";
+import { ANTHROPIC_OAUTH_BETA, CLAUDE_CODE_SYSTEM_INSTRUCTION } from "../oauth/anthropic";
+import { CLAUDE_CODE_HEADERS, claudeCodeSessionId } from "../adapters/client-fingerprint";
+import { signalWithTimeout, cancelBodyOnAbort } from "../lib/abort";
+import { redactSecretString } from "../lib/redact";
+import { sidecarEnter } from "../lib/sidecar-tracker";
+import { fetchWithResetRetry } from "../lib/upstream-retry";
+import type { WebSearchSource } from "./parse";
+import { BASE_INSTRUCTION, IMAGE_INSTRUCTION, type SidecarOutcome, type SidecarSettings } from "./executor";
+
+/** Hardcoded per-turn search bound handed to the server tool (mirrors the loop's maxSearches intent). */
+const ANTHROPIC_MAX_USES = 3;
+/** Answer budget; the injected tool_result is clamped downstream, so this only bounds the sidecar turn. */
+const ANTHROPIC_MAX_TOKENS = 8192;
+
+function isRec(v: unknown): v is Record<string, unknown> {
+  return !!v && typeof v === "object" && !Array.isArray(v);
+}
+
+/**
+ * Fold an Anthropic Messages SSE stream (a web_search_20250305 turn) into a WebSearchResult.
+ *
+ * Anthropic streams the FULL `web_search_tool_result.content` array on `content_block_start` (not via
+ * deltas), so sources are collected there; the answer text arrives as `text_delta` events, and
+ * `citations_delta` (web_search_result_location) contributes any additional cited URLs. A
+ * `web_search_tool_result_error` content object yields no sources. Never throws.
+ */
+export async function parseAnthropicSidecarSSE(res: Response): Promise<SidecarOutcome> {
+  const sources: WebSearchSource[] = [];
+  const seen = new Set<string>();
+  const pushSource = (url: unknown, title: unknown): void => {
+    if (typeof url !== "string" || url.length === 0 || seen.has(url)) return;
+    seen.add(url);
+    sources.push(typeof title === "string" && title.length > 0 ? { url, title } : { url });
+  };
+
+  let text = "";
+  let sawToolResultError = false;
+  if (!res.body) return { text: "", sources, error: "anthropic sidecar returned no response body" };
+
+  const decoder = new TextDecoder();
+  const reader = res.body.getReader();
+  let buffer = "";
+
+  const handleFrame = (data: Record<string, unknown>): void => {
+    const type = typeof data.type === "string" ? data.type : "";
+    if (type === "content_block_start") {
+      const block = isRec(data.content_block) ? data.content_block : {};
+      if (block.type === "web_search_tool_result") {
+        if (Array.isArray(block.content)) {
+          for (const hit of block.content) {
+            if (isRec(hit) && hit.type === "web_search_result") pushSource(hit.url, hit.title);
+          }
+        } else if (isRec(block.content) && block.content.type === "web_search_tool_result_error") {
+          sawToolResultError = true;
+        }
+      }
+    } else if (type === "content_block_delta") {
+      const delta = isRec(data.delta) ? data.delta : {};
+      if (delta.type === "text_delta" && typeof delta.text === "string") {
+        text += delta.text;
+      } else if (delta.type === "citations_delta") {
+        const citation = isRec(delta.citation) ? delta.citation : {};
+        if (citation.type === "web_search_result_location") pushSource(citation.url, citation.title);
+      }
+    }
+  };
+
+  // Parse one SSE frame's `data:` payload and fold it. Shared by the streaming loop and the EOF flush.
+  const processFrame = (rawFrame: string): void => {
+    let dataLine = "";
+    for (const line of rawFrame.split("\n")) {
+      if (line.startsWith("data:")) dataLine += line.slice(line.startsWith("data: ") ? 6 : 5);
+    }
+    if (!dataLine || dataLine === "[DONE]") return;
+    let data: unknown;
+    try { data = JSON.parse(dataLine); } catch { return; }
+    if (isRec(data)) handleFrame(data);
+  };
+
+  try {
+    for (;;) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      // Normalize CRLF on the ACCUMULATED buffer so a `\r\n` pair split across two network chunks
+      // (chunk ends in `\r`, next starts with `\n`) still collapses to `\n` (audit round-2 F2).
+      buffer = (buffer + decoder.decode(value, { stream: true })).replace(/\r\n/g, "\n");
+      let sep: number;
+      while ((sep = buffer.indexOf("\n\n")) !== -1) {
+        const rawFrame = buffer.slice(0, sep);
+        buffer = buffer.slice(sep + 2);
+        processFrame(rawFrame);
+      }
+    }
+    // Flush the decoder and process any final unterminated frame (a stream that ends without \n\n).
+    buffer = (buffer + decoder.decode()).replace(/\r\n/g, "\n");
+    if (buffer.trim().length > 0) processFrame(buffer);
+  } catch {
+    /* mid-stream abort/decode failure: fall through with whatever text/sources were gathered */
+  }
+
+  const trimmed = text.trim();
+  if (trimmed.length === 0) {
+    return { text: "", sources, error: sawToolResultError ? "anthropic web search returned an error result" : "anthropic sidecar produced no answer" };
+  }
+  return { text: trimmed, sources };
+}
+
+/**
+ * Execute ONE web search via a Claude sidecar through the STORED anthropic OAuth credential — the
+ * Anthropic-backed analog of runWebSearch. Authenticates with getValidAccessToken (refresh handled)
+ * and reproduces the Claude Code OAuth fingerprint (identity system block first, oauth beta, client
+ * headers, stable session id) so the request is first-party-shaped. Never throws — returns `{error}`
+ * so the caller injects a graceful tool result.
+ */
+export async function runAnthropicWebSearch(
+  query: string,
+  providerName: string,
+  provider: OcxProviderConfig,
+  settings: SidecarSettings,
+  abortSignal?: AbortSignal,
+): Promise<SidecarOutcome> {
+  const base = provider.baseUrl.replace(/\/v1\/?$/, "");
+  const url = `${base}/v1/messages`;
+  let token: string;
+  try {
+    token = await getValidAccessToken(providerName);
+  } catch (e) {
+    return { text: "", sources: [], error: `anthropic sidecar auth failed: ${e instanceof Error ? e.message : String(e)}` };
+  }
+  const headers: Record<string, string> = {
+    "Content-Type": "application/json",
+    "anthropic-version": "2023-06-01",
+    "Accept": "text/event-stream",
+    "User-Agent": "@anthropic-ai/sdk/0.74.0",
+    "Authorization": `Bearer ${token}`,
+    "anthropic-beta": ANTHROPIC_OAUTH_BETA,
+    ...CLAUDE_CODE_HEADERS,
+    "X-Claude-Code-Session-Id": claudeCodeSessionId(token),
+    "x-client-request-id": crypto.randomUUID(),
+  };
+  if (provider.headers) Object.assign(headers, provider.headers);
+
+  const instruction = settings.describeImages ? BASE_INSTRUCTION + IMAGE_INSTRUCTION : BASE_INSTRUCTION;
+  const body = {
+    model: settings.model,
+    max_tokens: ANTHROPIC_MAX_TOKENS,
+    // sonnet-5 defaults to adaptive thinking when omitted; keep the sidecar fast/cheap (audit F2).
+    thinking: { type: "disabled" },
+    // OAuth fingerprint requires the Claude Code identity as the FIRST system block (audit F6/anthropic.ts).
+    system: [
+      { type: "text", text: CLAUDE_CODE_SYSTEM_INSTRUCTION },
+      { type: "text", text: instruction },
+    ],
+    messages: [{ role: "user", content: [{ type: "text", text: query }] }],
+    tools: [{ type: "web_search_20250305", name: "web_search", max_uses: ANTHROPIC_MAX_USES }],
+    stream: true,
+  };
+
+  const linkedSignal = signalWithTimeout(settings.timeoutMs, abortSignal);
+  const sidecarExit = sidecarEnter("web-search");
+  const t0 = Date.now();
+  try {
+    const res = await fetchWithResetRetry(
+      () => fetch(url, { method: "POST", headers, body: JSON.stringify(body), signal: linkedSignal.signal }),
+      { abortSignal: linkedSignal.signal, label: "web-search-sidecar-anthropic" },
+    );
+    if (!res.ok) {
+      const t = await res.text().catch(() => "");
+      console.warn(`[web-search] anthropic sidecar HTTP ${res.status} for query "${query.slice(0, 80)}" (${Date.now() - t0}ms)`);
+      // Redact before surfacing: the body can echo auth headers/tokens (#398 review).
+      return { text: "", sources: [], error: `sidecar HTTP ${res.status}: ${redactSecretString(t.slice(0, 200))}` };
+    }
+    const detachBodyGuard = cancelBodyOnAbort(res.body, linkedSignal.signal);
+    try {
+      return await parseAnthropicSidecarSSE(res);
+    } finally {
+      detachBodyGuard();
+    }
+  } catch (e) {
+    const kind = e instanceof Error && e.name === "TimeoutError" ? "timeout" : "connect_error";
+    console.warn(`[web-search] anthropic sidecar ${kind} for query "${query.slice(0, 80)}" (${Date.now() - t0}ms)`);
+    return { text: "", sources: [], error: e instanceof Error ? e.message : String(e) };
+  } finally {
+    sidecarExit();
+    linkedSignal.cleanup();
+  }
+}