@bitkyc08/opencodex 2.84.0 → 2.87.0

package/src/protocols/codecs/messages-ir.ts

@@ -0,0 +1,500 @@
+/**
+ * Anthropic Messages -> IR, directly (the Antigravity direct lane).
+ *
+ * The bridge decodes a Messages conversation twice: `anthropicToResponsesTranslation`
+ * (`src/claude/inbound.ts`) projects it into Responses items, then `parseRequest`
+ * (`src/responses/parser.ts`) turns those items into the IR. This module walks the Messages body
+ * once and builds the IR conversation itself: the system prompt (including the
+ * `stabilizePromptCache` relocation), user turns with images and documents, tool calls and
+ * results (including `tool_reference` markers, tool errors and blocked-skill elision), thinking
+ * and redacted thinking with their ocxr1 envelopes, the native reasoning replay map, and the
+ * tool catalog. It is the Messages twin of `chat-ir.ts`.
+ *
+ * Contract: for every Messages body the bridge accepts, `messagesConversationToIr(body, cc,
+ * budget, model)` equals the `context` of `parseRequest(anthropicToResponsesTranslation(body,
+ * cc).body)` (reasoning item ids are random on both sides), and every body the bridge refuses in
+ * its conversation walk is refused here with the same `AnthropicRequestError` message.
+ * `tests/responses/protocol-messages-ir-parity.test.ts` holds both sides over a fixture corpus.
+ * Envelopes are encoded and charged against the request budget exactly as the translator does,
+ * then decoded exactly as the parser does, so the signature an adapter reads is the same string.
+ *
+ * Request settings (model resolution, sampling, tool choice, format, prompt-cache key, reasoning)
+ * are not decoded here: they travel through the Responses core on `anthropicSettingsTranslation`.
+ * A hosted web-search tool never reaches this decoder: the lane's eligibility rule keeps it on the
+ * bridge, where the sidecar reads it.
+ */
+import {
+  anthropicDocumentData,
+  anthropicImageBlockUrl,
+  anthropicSystemLayout,
+  blockedSkillCallIds,
+  documentTitle,
+  effectiveBlockedSkillNames,
+  maybeElideSkillText,
+  skillElisionStub,
+  systemMessageText,
+} from "../../claude/inbound";
+import { toolsToResponses } from "../../claude/inbound-content-options";
+import { AnthropicRequestError, isRec, type Rec } from "../../claude/inbound-records";
+import { hasRoutedIdentity, nameRoutedIdentity } from "../../adapters/identity";
+import type { TranslatorBudget } from "../../lib/translator-budget";
+import { inlineDocumentFromDataUrl, inlineDocumentMarker } from "../../responses/inline-document";
+import { functionCallArgumentsFromText } from "../../responses/parser";
+import { decodeReasoningEnvelope, encodeReasoningEnvelope, OCX_REASONING_PREFIX } from "../../responses/reasoning-envelope";
+import { normalizeVisualizationContext } from "../../responses/visualization-directives";
+import type { PolicyRequestEvidence } from "../../routing/evaluator";
+import { createToolChoiceResolver, namespacedToolName } from "../../types";
+import type {
+  OcxAssistantMessage,
+  OcxClaudeCodeConfig,
+  OcxContentPart,
+  OcxContext,
+  OcxMessage,
+  OcxParsedRequest,
+  OcxTextContent,
+  OcxThinkingContent,
+  OcxTool,
+} from "../../types";
+import { normalizedParameters } from "./chat-ir";
+
+/** The translator refuses an undecodable proxy envelope with this message; the ingress retries it. */
+export const MALFORMED_REASONING_SIGNATURE = "malformed ocxr1 reasoning signature";
+
+function nameDestination(text: string, modelId: string): string {
+  return hasRoutedIdentity(text) ? nameRoutedIdentity(text, modelId) : text;
+}
+
+function reasoningItemId(): string {
+  return `rs_${crypto.randomUUID().replace(/-/g, "")}`;
+}
+
+/** The parser collapses a lone text part to a plain string; images and documents stay structured. */
+function collapsed(parts: OcxContentPart[]): string | OcxContentPart[] {
+  return parts.length === 1 && parts[0]!.type === "text" ? parts[0]!.text : parts;
+}
+
+/** One entry of a tool result as the translator lists it, before the parser reads it. */
+type ToolResultEntry = { text: string } | { image: string };
+
+/**
+ * A `tool_result` block's content as the IR carries it: the translator's `toolResultOutput`
+ * (error prefix, `tool_reference` markers, image references, document markers) read through the
+ * parser's `outputToToolResultContent` (text joined unless an image survives).
+ */
+function toolResultContent(block: Rec): string | OcxContentPart[] {
+  const isError = block.is_error === true;
+  const content = block.content;
+  if (typeof content === "string") return isError ? `[tool error] ${content}` : content;
+  if (!Array.isArray(content)) return isError ? "[tool error]" : "";
+  const out: ToolResultEntry[] = [];
+  for (const item of content) {
+    if (!isRec(item)) continue;
+    if (item.type === "text" && typeof item.text === "string") {
+      out.push({ text: item.text });
+    } else if (item.type === "tool_reference" && typeof item.tool_name === "string" && item.tool_name.length > 0) {
+      const prev = out[out.length - 1];
+      const lead = prev !== undefined && "text" in prev && !prev.text.endsWith("\n") ? "\n" : "";
+      out.push({ text: `${lead}Tool loaded: ${item.tool_name}\n` });
+    } else if (item.type === "image") {
+      const url = anthropicImageBlockUrl(item);
+      if (url !== null) out.push({ image: url });
+    } else if (item.type === "document") {
+      out.push({ text: inlineDocumentMarker(documentTitle(item)) });
+    }
+  }
+  if (isError) out.unshift({ text: "[tool error]" });
+  if (out.length === 0) return isError ? "[tool error]" : "";
+  const parts: OcxContentPart[] = [];
+  let hasImage = false;
+  for (const entry of out) {
+    if ("text" in entry) parts.push({ type: "text", text: entry.text });
+    else if (entry.image.length > 0) {
+      parts.push({ type: "image", imageUrl: entry.image });
+      hasImage = true;
+    }
+  }
+  if (!hasImage) return parts.map(part => (part.type === "text" ? part.text : "")).join("");
+  return parts;
+}
+
+/**
+ * The tool catalog: the translator's function declarations (a hosted web-search tool and
+ * schema-less server tools are not function tools) read through the parser's `buildTools` and
+ * deduplicated by name as its catalog merge does.
+ */
+function toolCatalog(raw: unknown): OcxTool[] {
+  if (!Array.isArray(raw)) return [];
+  const declared: OcxTool[] = [];
+  for (const entry of raw) {
+    if (!isRec(entry)) continue;
+    const type = typeof entry.type === "string" ? entry.type : "";
+    if (type.startsWith("web_search")) continue;
+    if (typeof entry.name !== "string" || entry.name.length === 0 || !isRec(entry.input_schema)) continue;
+    const tool: OcxTool = {
+      name: entry.name,
+      description: typeof entry.description === "string" ? entry.description : "",
+      parameters: normalizedParameters(entry.input_schema),
+      strict: typeof entry.strict === "boolean" ? entry.strict : false,
+    };
+    if (Array.isArray(entry.allowed_callers)) {
+      tool.allowedCallers = entry.allowed_callers.filter((caller): caller is string => typeof caller === "string");
+    }
+    declared.push(tool);
+  }
+  const seen = new Set<string>();
+  return declared.filter(tool => {
+    const key = namespacedToolName(tool.namespace, tool.name);
+    if (seen.has(key)) return false;
+    seen.add(key);
+    return true;
+  });
+}
+
+export interface MessagesIrConversation {
+  /** The resolved model the conversation was decoded for; identity naming and placeholders use it. */
+  modelId: string;
+  context: OcxContext;
+  /** The native reasoning blobs the translator would have recorded, keyed by blob. */
+  nativeReasoningReplay: ReadonlyMap<string, string>;
+}
+
+/**
+ * Decode a Messages body's conversation straight into the IR context. `modelId` is the resolved
+ * model the bridge body would carry. Throws `AnthropicRequestError` exactly where the translator's
+ * conversation walk would, and `TranslatorBudgetExceededError` where its envelope charges would.
+ */
+export function messagesConversationToIr(
+  raw: unknown,
+  cc: OcxClaudeCodeConfig | undefined,
+  budget: TranslatorBudget,
+  modelId: string,
+): MessagesIrConversation {
+  if (!isRec(raw)) throw new AnthropicRequestError("request body must be a JSON object");
+  if (typeof raw.model !== "string" || raw.model.length === 0) throw new AnthropicRequestError("model is required");
+  if (!Array.isArray(raw.messages) || raw.messages.length === 0) {
+    throw new AnthropicRequestError("messages must be a non-empty array");
+  }
+  const requestedModel = raw.model;
+  const now = Date.now();
+  const messages: OcxMessage[] = [];
+  const nativeReasoningReplay = new Map<string, string>();
+  const blockedNames = effectiveBlockedSkillNames(cc);
+  const blockedCalls = blockedSkillCallIds(raw.messages, blockedNames);
+  // The parser's pending reasoning: it belongs to the next assistant turn, and turn boundaries
+  // clear it after keeping any signed or redacted replay.
+  const pending: Array<{ part: OcxThinkingContent; envelopeSigned: boolean }> = [];
+
+  const placeholder = (): OcxAssistantMessage => {
+    const last = messages[messages.length - 1];
+    if (last && last.role === "assistant") return last;
+    const holder: OcxAssistantMessage = { role: "assistant", content: [], model: modelId, timestamp: now };
+    messages.push(holder);
+    return holder;
+  };
+  const holderWithReasoning = (): OcxAssistantMessage => {
+    const holder = placeholder();
+    if (pending.length > 0) {
+      holder.content.push(...pending.map(entry => entry.part));
+      pending.length = 0;
+    }
+    return holder;
+  };
+  const preservePendingReplay = (): void => {
+    const replay = pending.filter(entry => entry.envelopeSigned || entry.part.redacted?.length);
+    if (replay.length > 0) placeholder().content.push(...replay.map(entry => entry.part));
+  };
+  const pushUser = (content: string | OcxContentPart[]): void => {
+    preservePendingReplay();
+    pending.length = 0;
+    messages.push({ role: "user", content, timestamp: now });
+  };
+  const pushDeveloper = (text: string): void => {
+    preservePendingReplay();
+    pending.length = 0;
+    messages.push({ role: "developer", content: nameDestination(text, modelId), timestamp: now });
+  };
+  const pushAssistantText = (parts: OcxTextContent[]): void => {
+    messages.push({
+      role: "assistant",
+      content: pending.length > 0 ? [...pending.map(entry => entry.part), ...parts] : parts,
+      model: modelId,
+      timestamp: now,
+    });
+    pending.length = 0;
+  };
+  const pushToolCall = (id: string, name: string, input: unknown): void => {
+    holderWithReasoning().content.push({
+      type: "toolCall",
+      id,
+      name,
+      arguments: functionCallArgumentsFromText(id, JSON.stringify(input ?? {})),
+    });
+  };
+  const pushToolResult = (callId: string, content: string | OcxContentPart[]): void => {
+    // Reasoning replayed after the call it belongs to joins that call's assistant turn (#950).
+    if (pending.length > 0) {
+      outer: for (let i = messages.length - 1; i >= 0; i--) {
+        const message = messages[i]!;
+        if (message.role !== "assistant") continue;
+        for (const part of message.content) {
+          if (part.type === "toolCall" && part.id === callId) {
+            message.content = [...pending.map(entry => entry.part), ...message.content];
+            break outer;
+          }
+        }
+      }
+    }
+    pending.length = 0;
+    let owner: { name: string; namespace?: string } = { name: "" };
+    search: for (let i = messages.length - 1; i >= 0; i--) {
+      const message = messages[i]!;
+      if (message.role !== "assistant") continue;
+      for (const part of message.content) {
+        if (part.type === "toolCall" && part.id === callId) {
+          owner = { name: part.name, namespace: part.namespace };
+          break search;
+        }
+      }
+    }
+    messages.push({
+      role: "toolResult", toolCallId: callId, toolName: owner.name, toolNamespace: owner.namespace,
+      content, isError: false, timestamp: now,
+    });
+  };
+  /**
+   * One translator reasoning item, read as the parser reads it. `encrypted` is the item's
+   * `encrypted_content`; the placeholder signature is the item's serialized form, spelled in the
+   * schema's key order.
+   */
+  const pushReasoning = (id: string, summaryText: string, encrypted: string | undefined): void => {
+    const item: Rec = {
+      type: "reasoning",
+      id,
+      summary: summaryText.length > 0 ? [{ type: "summary_text", text: summaryText }] : [],
+      ...(encrypted !== undefined ? { encrypted_content: encrypted } : {}),
+    };
+    const envelope = encrypted !== undefined ? decodeReasoningEnvelope(encrypted) : null;
+    const thinkingText = envelope?.txt ?? summaryText;
+    if (envelope?.krc && thinkingText.length === 0) {
+      const previous = messages[messages.length - 1];
+      if (previous?.role === "assistant") previous.kiroRedactedReasoning = envelope.krc;
+      return;
+    }
+    if (!(thinkingText.length > 0 || envelope?.sig || envelope?.red?.length)) return;
+    const part: OcxThinkingContent = {
+      type: "thinking",
+      thinking: thinkingText,
+      signature: envelope?.sig ?? JSON.stringify(item),
+      ...(envelope?.red ? { redacted: envelope.red } : {}),
+      itemId: id,
+    };
+    const envelopeSigned = typeof envelope?.sig === "string";
+    const previous = pending[pending.length - 1];
+    if (!envelopeSigned && !part.redacted && previous && !previous.envelopeSigned && !previous.part.redacted) {
+      previous.part = { ...part, thinking: `${previous.part.thinking}\n${part.thinking}` };
+    } else {
+      pending.push({ part, envelopeSigned });
+    }
+  };
+
+  const userContent = (content: unknown): void => {
+    if (typeof content === "string") {
+      if (content.length > 0) pushUser(content);
+      return;
+    }
+    if (!Array.isArray(content)) return;
+    // Contiguous text, image and document blocks form one user turn; a tool_result ends it.
+    let parts: OcxContentPart[] = [];
+    let blocks = 0;
+    const flush = (): void => {
+      if (blocks > 0) pushUser(collapsed(parts));
+      parts = [];
+      blocks = 0;
+    };
+    for (const block of content) {
+      if (!isRec(block)) continue;
+      switch (block.type) {
+        case "text":
+          if (typeof block.text === "string") {
+            blocks++;
+            parts.push({ type: "text", text: maybeElideSkillText(block.text, blockedNames) });
+          }
+          break;
+        case "image": {
+          const url = anthropicImageBlockUrl(block);
+          if (url !== null) {
+            blocks++;
+            // An empty reference is a block the parser drops.
+            if (url.length > 0) parts.push({ type: "image", imageUrl: url });
+          }
+          break;
+        }
+        case "tool_result": {
+          flush();
+          if (typeof block.tool_use_id !== "string" || block.tool_use_id.length === 0) {
+            throw new AnthropicRequestError("tool_result requires tool_use_id");
+          }
+          pushToolResult(
+            block.tool_use_id,
+            blockedCalls.has(block.tool_use_id) ? skillElisionStub(block.tool_use_id) : toolResultContent(block),
+          );
+          break;
+        }
+        case "document": {
+          blocks++;
+          const document = anthropicDocumentData(block);
+          parts.push(document
+            ? inlineDocumentFromDataUrl(document.fileData, document.title)
+              ?? { type: "text", text: document.title ? `[file: ${document.title}]` : "[file: inline data]" }
+            : { type: "text", text: inlineDocumentMarker(documentTitle(block)) });
+          break;
+        }
+        default:
+          break;
+      }
+    }
+    flush();
+  };
+
+  const assistantContent = (content: unknown): void => {
+    if (typeof content === "string") {
+      if (content.length > 0) pushAssistantText([{ type: "text", text: content }]);
+      return;
+    }
+    if (!Array.isArray(content)) return;
+    let text: OcxTextContent[] = [];
+    const flush = (): void => {
+      if (text.length > 0) pushAssistantText(text);
+      text = [];
+    };
+    for (const block of content) {
+      if (!isRec(block)) continue;
+      switch (block.type) {
+        case "text":
+          if (typeof block.text === "string") text.push({ type: "text", text: block.text });
+          break;
+        case "tool_use":
+          flush();
+          if (typeof block.id !== "string" || block.id.length === 0 || typeof block.name !== "string" || block.name.length === 0) {
+            throw new AnthropicRequestError("tool_use requires id and name");
+          }
+          pushToolCall(block.id, block.name, block.input);
+          break;
+        case "thinking": {
+          flush();
+          const thinking = typeof block.thinking === "string" ? block.thinking : "";
+          const signature = typeof block.signature === "string" ? block.signature : "";
+          if (signature.startsWith(OCX_REASONING_PREFIX)) {
+            const owned = decodeReasoningEnvelope(signature, budget);
+            if (!owned) throw new AnthropicRequestError(MALFORMED_REASONING_SIGNATURE);
+            if (Object.hasOwn(owned, "sig")) {
+              throw new AnthropicRequestError("OpenCodex reasoning continuity cannot be replayed as an Anthropic signature");
+            }
+            if (owned.nat) {
+              // The provider's own blob goes back only to the model that minted it.
+              const nat = owned.nat.model === requestedModel ? owned.nat : undefined;
+              if (nat) {
+                const previous = nativeReasoningReplay.get(nat.enc);
+                nativeReasoningReplay.set(nat.enc, previous === undefined || previous === nat.tag ? nat.tag : "");
+                budget.chargeRetained(2 * nat.enc.length, { kind: "reasoning" });
+              }
+              if (thinking.length === 0 && !nat) break;
+              pushReasoning(nat?.id ?? reasoningItemId(), thinking, nat?.enc);
+              break;
+            }
+          }
+          const encrypted = signature.length === 0
+            ? undefined
+            : signature.startsWith(OCX_REASONING_PREFIX) ? signature : encodeReasoningEnvelope({ sig: signature }, budget);
+          if (encrypted) budget.chargeRetained(2 * encrypted.length, { kind: "reasoning" });
+          if (thinking.length === 0 && !encrypted) break;
+          pushReasoning(reasoningItemId(), thinking, encrypted);
+          break;
+        }
+        case "redacted_thinking": {
+          flush();
+          const data = typeof block.data === "string" ? block.data : "";
+          if (data.length > 0) {
+            const encrypted = encodeReasoningEnvelope({ red: [data] }, budget);
+            budget.chargeRetained(2 * encrypted.length, { kind: "reasoning" });
+            pushReasoning(reasoningItemId(), "", encrypted);
+          }
+          break;
+        }
+        default:
+          break;
+      }
+    }
+    flush();
+  };
+
+  for (const message of raw.messages) {
+    if (!isRec(message)) throw new AnthropicRequestError("each message must be an object");
+    if (message.role === "user") userContent(message.content);
+    else if (message.role === "assistant") assistantContent(message.content);
+    else if (message.role === "system") {
+      const text = systemMessageText(message.content);
+      if (text.length > 0) pushDeveloper(text);
+    } else throw new AnthropicRequestError(`unsupported message role: ${String(message.role)}`);
+  }
+
+  const system = anthropicSystemLayout(raw.system, cc);
+  if (system.dynamicNotice !== undefined) pushUser(system.dynamicNotice);
+  preservePendingReplay();
+
+  const tools = toolCatalog(raw.tools);
+  const context: OcxContext = {
+    ...(system.instructions ? { systemPrompt: [nameDestination(system.instructions, modelId)] } : {}),
+    messages,
+    ...(tools.length > 0 ? { tools } : {}),
+  };
+  return { modelId, context: normalizeVisualizationContext(context), nativeReasoningReplay };
+}
+
+/**
+ * Put a directly decoded conversation onto the request the core parsed from the settings-only
+ * body, re-decoding if the core settled a different model id than the one decoded for. The tool
+ * choice is checked against the decoded catalog, which the settings-only parse could not see.
+ */
+export function withDirectMessagesConversation(
+  base: OcxParsedRequest,
+  decoded: MessagesIrConversation,
+  decodeFor: (modelId: string) => MessagesIrConversation,
+): OcxParsedRequest {
+  const conversation = decoded.modelId === base.modelId ? decoded : decodeFor(base.modelId);
+  const choice = base.options.toolChoice;
+  if (choice && typeof choice === "object") {
+    const selectors = "allowedTools" in choice ? choice.allowedTools : [choice.name];
+    const resolver = createToolChoiceResolver(conversation.context.tools ?? []);
+    for (const selector of selectors) {
+      if (resolver.candidateCount(selector) > 1) throw new Error(`ambiguous tool_choice name: ${selector}`);
+    }
+  }
+  return { ...base, context: conversation.context };
+}
+
+/**
+ * The policy-routing evidence the core reads from the bridge body (`evidenceFromBody`): a
+ * non-empty translated tool catalog, and an image block in a user turn. Images inside a
+ * tool_result sit under `output` on the bridge body, which that scan does not read.
+ */
+export function messagesRouteEvidence(raw: unknown): PolicyRequestEvidence {
+  if (!isRec(raw)) return {};
+  const tools = toolsToResponses(raw.tools) !== undefined;
+  const image = Array.isArray(raw.messages) && raw.messages.some(message => isRec(message)
+    && message.role === "user" && Array.isArray(message.content)
+    && message.content.some(block => isRec(block) && block.type === "image" && imageReference(block)));
+  return {
+    ...(tools ? { toolsRequired: true } : {}),
+    ...(image ? { imageInputRequired: true } : {}),
+  };
+}
+
+function imageReference(block: Rec): boolean {
+  try {
+    return anthropicImageBlockUrl(block) !== null;
+  } catch {
+    return false;
+  }
+}
+

package/src/protocols/encoders/adapter-events.ts

@@ -61,6 +61,7 @@ export interface ClientWebSearch {
   status: "completed" | "failed";
   queries: string[];
   sources: { url: string; title?: string }[];
+  fetch?: { url: string; result: unknown };
 }
 
 /**
@@ -411,9 +412,9 @@ export function encodeAdapterEventStream(
     budget.closeCall(call.callId);
     currentToolCall = null;
   };
-  const closeCurrentWebSearch = (status: "completed" | "failed", queries: string[], sources?: { url: string; title?: string }[]) => {
+  const closeCurrentWebSearch = (status: "completed" | "failed", queries: string[], sources?: { url: string; title?: string }[], fetch?: ClientWebSearch["fetch"]) => {
     if (!currentWebSearch) return;
-    writer.webSearchDone({ itemId: currentWebSearch.itemId, status, queries, sources: sources ?? [] });
+    writer.webSearchDone({ itemId: currentWebSearch.itemId, status, queries, sources: sources ?? [], ...(fetch ? { fetch } : {}) });
     currentWebSearch = null;
   };
   const appendToolArgs = (call: OpenToolCall, fragment: string) => {
@@ -688,7 +689,7 @@ export function encodeAdapterEventStream(
               if (currentWebSearch) closeCurrentWebSearch("completed", []);
               currentWebSearch = { itemId: `ws_${uuid()}`, eventId: event.id };
             }
-            closeCurrentWebSearch(event.status ?? "completed", event.queries, safeWebSearchSources(event.sources));
+            closeCurrentWebSearch(event.status ?? "completed", event.queries, safeWebSearchSources(event.sources), event.fetch);
             break;
           }
           case "done": {
@@ -729,7 +730,7 @@ export function encodeAdapterEventStream(
             terminal = {
               status: "incomplete",
               incomplete: {
-                reason: event.reason,
+                reason: truncationReasonFor(event.reason) ?? event.reason,
                 ...(event.message ? { message: event.message } : {}),
                 ...(event.retryable !== undefined ? { retryable: event.retryable } : {}),
               },

package/src/protocols/encoders/messages.ts

@@ -16,6 +16,7 @@ import {
   type TranslatorBudget,
 } from "../../lib/translator-budget";
 import { isTransientUpstreamStatus } from "../../lib/upstream-retry";
+import { UNDECLARED_TOOL_CALL_ERROR_CODE } from "../../lib/errors";
 import { encodeReasoningEnvelope } from "../../responses/reasoning-envelope";
 import { responsesUsage, webSearchAction } from "../../bridge/internal";
 import {
@@ -344,13 +345,14 @@ function createAnthropicMessageWriter(
         type: "web_search_call",
         id: search.itemId,
         status: search.status,
-        action: webSearchAction(search.queries),
+        action: webSearchAction(search.queries, search.fetch),
         ...(search.sources.length > 0 ? { sources: search.sources } : {}),
+        ...(search.fetch ? { fetch_result: search.fetch.result } : {}),
       });
       const toolIndex = blockIndex++;
       emit("content_block_start", {
         type: "content_block_start", index: toolIndex,
-        content_block: { type: "server_tool_use", id: pair.id, name: "web_search" },
+        content_block: { type: "server_tool_use", id: pair.id, name: pair.name },
       }, { sideEffect: true });
       emit("content_block_delta", {
         type: "content_block_delta", index: toolIndex,
@@ -360,10 +362,10 @@ function createAnthropicMessageWriter(
       const resultIndex = blockIndex++;
       emit("content_block_start", {
         type: "content_block_start", index: resultIndex,
-        content_block: { type: "web_search_tool_result", tool_use_id: pair.id, content: pair.resultContent },
+        content_block: { type: pair.resultType, tool_use_id: pair.id, content: pair.resultContent },
       });
       emit("content_block_stop", { type: "content_block_stop", index: resultIndex });
-      if (pair.completed) webSearchRequests++;
+      if (pair.completed && pair.name === "web_search") webSearchRequests++;
     },
     terminal(terminal) {
       if (terminal.status === "completed") {
@@ -386,8 +388,9 @@ function createAnthropicMessageWriter(
         return;
       }
       const message = typeof error.message === "string" ? error.message : "upstream request failed";
-      fail(anthropicFailedStatus(error, message), message, true,
-        error.code === "context_length_exceeded" ? error.code : undefined);
+      const deterministic = error.code === UNDECLARED_TOOL_CALL_ERROR_CODE;
+      fail(anthropicFailedStatus(error, message), message, !deterministic,
+        deterministic || error.code === "context_length_exceeded" ? error.code as string : undefined);
     },
     overflow() {
       fail(413, "upstream translation buffer exceeded the safe limit", false, "translation_buffer_limit");

package/src/protocols/features.ts

@@ -152,6 +152,12 @@ export function featureEffectsForPath(
   present: Iterable<ProtocolFeature>,
 ): PathFeatureEffects {
   const nodes = protocolNodes(path);
+  // A Chat or Messages body decoded straight into the IR (the direct lane, `[inbound, ir, other]`)
+  // keeps exactly what its Responses projection keeps: the direct codecs are held to
+  // `parseRequest(projection)` by parity tests. The decode hop therefore reads the
+  // `<inbound>>responses` row, and the hop from the IR into `other` stays unknown as before.
+  const directIrDecode = inbound !== "responses" && path.length === 3
+    && path[0] === inbound && path[1] === "ir" && path[2] === "other";
   const effects: FeatureEffect[] = [];
   const unknown: ProtocolFeature[] = [];
   const seen = new Set<ProtocolFeature>();
@@ -160,8 +166,10 @@ export function featureEffectsForPath(
     seen.add(feature);
     let worst: FeatureDisposition = "passthrough";
     let unknownHop = false;
-    for (let i = 1; i < nodes.length; i++) {
-      const hop = featureHopDisposition(feature, nodes[i - 1]!, nodes[i]!);
+    const hops = directIrDecode
+      ? [featureHopDisposition(feature, inbound, "responses"), undefined]
+      : nodes.slice(1).map((node, i) => featureHopDisposition(feature, nodes[i]!, node));
+    for (const hop of hops) {
       if (hop === undefined) unknownHop = true;
       else if (RANK[hop] > RANK[worst]) worst = hop;
     }

package/src/protocols/path.ts

@@ -10,14 +10,23 @@ import { deliveryModeForPath, type DeliveryMode, type Protocol, type ProtocolHop
 /**
  * `native`: the ingress sent its own wire to a same-wire upstream.
  * `bridge`: the ingress projected the request into the Responses pipeline.
+ * `direct`: the ingress decoded its own wire straight into the IR the final adapter compiles
+ * from, with no internal Responses body in between (the Antigravity direct lane). Only a Chat or
+ * Messages ingress toward a non-protocol (`other`) upstream takes it; anything else falls back
+ * to the bridge rule so an inconsistent mark cannot claim a path that does not exist.
  */
-export type ProtocolLane = "native" | "bridge";
+export type ProtocolLane = "native" | "bridge" | "direct";
+
+function directApplies(inbound: Protocol, lane: ProtocolLane, upstream: UpstreamWire): boolean {
+  return lane === "direct" && inbound !== "responses" && upstream === "other";
+}
 
 export function requestPathForLane(inbound: Protocol, lane: ProtocolLane, upstream: UpstreamWire): ProtocolHop[] {
   if (inbound === "responses") {
     return upstream === "responses" ? ["responses", "responses"] : ["responses", "ir", upstream];
   }
   if (lane === "native") return [inbound, inbound];
+  if (directApplies(inbound, lane, upstream)) return [inbound, "ir", upstream];
   if (upstream === "responses") return [inbound, "responses"];
   return [inbound, "responses-internal", "ir", upstream];
 }
@@ -26,6 +35,7 @@ export function requestPathForLane(inbound: Protocol, lane: ProtocolLane, upstre
 export function responsePathForLane(inbound: Protocol, lane: ProtocolLane, upstream: UpstreamWire): ProtocolHop[] {
   if (inbound === "responses") return upstream === "responses" ? ["responses", "responses"] : [upstream, "ir", "responses"];
   if (lane === "native") return [inbound, inbound];
+  if (directApplies(inbound, lane, upstream)) return [upstream, "ir", inbound];
   if (upstream === "responses") return ["responses", inbound];
   return [upstream, "ir", "responses-internal", inbound];
 }