@yansigit/opencodex 2.31.1 → 2.31.3

package/src/types/request.ts

@@ -94,6 +94,12 @@ export interface OcxParsedRequest {
    * executes searches via the gpt-5.4-mini sidecar (see src/web-search). Absent when not requested.
    */
   _webSearch?: Record<string, unknown>;
+  /**
+   * Antigravity Gemini in-turn CCA grounding: google_search and optional url_context ride the main
+   * routed fetch instead of the web-search sidecar loop. Set by core.ts when resolveCcaInTurnGrounding
+   * matches; consumed by the Google adapter at buildRequest/parseStream time.
+   */
+  _ccaInTurnGrounding?: { search: boolean; urlContext: boolean };
   /** Hosted image_generation tool config stashed for the image bridge sidecar (see src/images). */
   _imageGeneration?: { toolNames: Set<string>; originalTool?: Record<string, unknown> };
   /**
@@ -245,9 +251,13 @@ export interface OcxRequestOptions {
   /**
    * Responses `text.format` (json_schema / json_object), preserved for adapters whose
    * upstream wire has an equivalent. The openai-chat adapter re-nests it as chat
-   * `response_format`, the exact inverse of responseFormatToText in src/chat/inbound.ts.
-   * The native passthrough ignores it (it forwards `_rawBody.text` verbatim) and Kiro
-   * keeps rejecting structured output via `_structuredOutput`.
+   * `response_format`, the exact inverse of responseFormatToText in src/chat/inbound.ts; the
+   * Google adapter lowers supported requests to Gemini JSON mode (`responseMimeType` /
+   * `responseSchema`) but skips requests with tools, Claude models, or image-capable models.
+   * The `openai-chat` adapter can omit it for models in `noStructuredOutputModels`; Kiro
+   * rejects structured output via `_structuredOutput`; and Cursor has no structured-output
+   * wire field and rejects the request before transport.
+   * Native passthrough does not consume this option and forwards `_rawBody.text` verbatim.
    */
   textFormat?: {
     type: "json_schema" | "json_object";

package/src/usage/log.ts

@@ -28,6 +28,8 @@ export type AttemptRecoveryKind =
   | "key-429"
   | "rate-limit-429"
   | "anthropic-oauth-429"
+  | "cursor-oauth-auth"
+  | "cursor-oauth-429"
   | "image-413"
   | "opaque-blob-rejection"
   | "empty-completion";
@@ -218,6 +220,8 @@ const ATTEMPT_RECOVERY_KINDS = new Set<AttemptRecoveryKind>([
   "key-429",
   "rate-limit-429",
   "anthropic-oauth-429",
+  "cursor-oauth-auth",
+  "cursor-oauth-429",
   "image-413",
   "opaque-blob-rejection",
   "empty-completion",

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

@@ -19,6 +19,7 @@ import { ANTIGRAVITY_REQUEST_UA } from "../adapters/google-antigravity-wire";
 import { resolveAntigravityEffortWireModel } from "../providers/antigravity-models";
 import { getProviderRegistryEntry } from "../providers/registry";
 import { MAX_SIDECAR_RESPONSE_BYTES, type WebSearchSource } from "./parse";
+import { appendSafeWebSearchSource } from "./sources";
 import { BASE_INSTRUCTION, IMAGE_INSTRUCTION, type SidecarOutcome, type SidecarSettings } from "./executor";
 
 const CCA_FALLBACK_BASE = "https://daily-cloudcode-pa.googleapis.com";
@@ -117,25 +118,46 @@ export async function runGeminiWebSearch(
 }
 
 /** Map a CCA generateContent payload (possibly wrapped in {response}) to text + grounding sources. */
+export function extractCcaGroundingSources(groundingMetadata: unknown): WebSearchSource[] {
+  const sources: WebSearchSource[] = [];
+  const gm = isRec(groundingMetadata) ? groundingMetadata : undefined;
+  if (!gm || !Array.isArray(gm.groundingChunks)) return sources;
+  for (const chunk of gm.groundingChunks) {
+    const web = isRec(chunk) && isRec(chunk.web) ? chunk.web : undefined;
+    if (!web) continue;
+    // Route through the shared safe-source validator: enforces http(s) scheme,
+    // control-character filtering, dedup, and per-message count/byte budgets.
+    appendSafeWebSearchSource(sources, { url: web.uri, title: web.title });
+  }
+  return sources;
+}
+
+/** Skip search-suggestion HTML widgets Google may attach alongside grounded answers. */
+export function isCcaSearchSuggestionHtml(text: string): boolean {
+  const trimmed = text.trim();
+  if (!trimmed.startsWith("<")) return false;
+  return /<style[\s>]/i.test(trimmed) || /search[_-]?suggest/i.test(trimmed) || /grounding-widget/i.test(trimmed);
+}
+
+export function formatCcaGroundingSourcesAppendix(sources: readonly WebSearchSource[]): string {
+  if (sources.length === 0) return "";
+  const lines = ["", "Sources:"];
+  sources.slice(0, 8).forEach((s, i) => {
+    lines.push(`[${i + 1}] ${s.title ? `${s.title} — ` : ""}${s.url}`);
+  });
+  return lines.join("\n");
+}
+
 export function mapCcaGroundedResponse(payload: unknown): SidecarOutcome {
   const root = isRec(payload) && isRec(payload.response) ? payload.response : payload;
   if (!isRec(root)) return { text: "", sources: [], error: "gemini sidecar returned a non-JSON or empty body" };
   const candidate = Array.isArray(root.candidates) && isRec(root.candidates[0]) ? root.candidates[0] : undefined;
   if (!candidate) return { text: "", sources: [], error: "gemini sidecar returned no candidates" };
   const parts = isRec(candidate.content) && Array.isArray(candidate.content.parts) ? candidate.content.parts : [];
-  const text = parts.map(p => (isRec(p) && typeof p.text === "string" ? p.text : "")).join("");
-  const sources: WebSearchSource[] = [];
-  const seen = new Set<string>();
-  const gm = isRec(candidate.groundingMetadata) ? candidate.groundingMetadata : undefined;
-  if (gm && Array.isArray(gm.groundingChunks)) {
-    for (const chunk of gm.groundingChunks) {
-      const web = isRec(chunk) && isRec(chunk.web) ? chunk.web : undefined;
-      const uri = web && typeof web.uri === "string" ? web.uri : undefined;
-      if (!uri || seen.has(uri)) continue;
-      seen.add(uri);
-      sources.push({ url: uri, ...(typeof web?.title === "string" && web.title.length > 0 ? { title: web.title } : {}) });
-    }
-  }
+  const text = parts
+    .map(p => (isRec(p) && typeof p.text === "string" && !isCcaSearchSuggestionHtml(p.text) ? p.text : ""))
+    .join("");
+  const sources = extractCcaGroundingSources(candidate.groundingMetadata);
   if (text.length === 0) return { text: "", sources, error: "gemini sidecar returned no text" };
   return { text, sources };
 }

package/src/web-search/index.ts

@@ -1,4 +1,4 @@
-import type { OcxConfig, OcxParsedRequest, OcxProviderConfig } from "../types";
+import type { OcxConfig, OcxContentPart, OcxParsedRequest, OcxProviderConfig } from "../types";
 import { modelInList, toolChoiceToolPredicate } from "../types";
 import { isModelTextOnly } from "../vision";
 import type { SidecarSettings } from "./executor";
@@ -166,6 +166,86 @@ export function resolveSidecarBackend(
   return "openai";
 }
 
+export interface CcaInTurnGrounding {
+  search: boolean;
+  urlContext: boolean;
+}
+
+const HTTP_URL_RE = /https?:\/\/[^\s<>"')\]]+/i;
+const EXPLICIT_SIDECAR_BACKENDS = new Set<WebSearchBackendId>(["openai", "anthropic", "xai", "exa"]);
+
+function isGemini3ModelId(modelId: string): boolean {
+  return /gemini-3/i.test(modelId);
+}
+
+/** Whether a planned media bridge will actually inject tools on this turn. */
+export function mediaBridgeWillRun(
+  hasMediaPlan: boolean,
+  hasWebSearchPlan: boolean,
+  adapterRunsTurn: boolean,
+  isStreaming = true,
+): boolean {
+  return hasMediaPlan && isStreaming && (!hasWebSearchPlan || adapterRunsTurn);
+}
+
+function messageTextContainsHttpUrl(content: string | OcxContentPart[]): boolean {
+  if (typeof content === "string") return HTTP_URL_RE.test(content);
+  for (const part of content) {
+    if (part.type === "image") {
+      const url = part.imageUrl;
+      if (url && !url.startsWith("data:") && /^https?:/i.test(url)) return true;
+      continue;
+    }
+    if (part.type === "text" && HTTP_URL_RE.test(part.text ?? "")) return true;
+  }
+  return false;
+}
+
+/** True when request text carries http(s) URLs that become remote-url placeholders upstream. */
+export function requestNeedsCcaUrlContext(parsed: OcxParsedRequest): boolean {
+  for (const msg of parsed.context.messages) {
+    if (msg.role === "user" || msg.role === "developer") {
+      if (messageTextContainsHttpUrl(msg.content)) return true;
+      continue;
+    }
+    if (msg.role === "toolResult" && typeof msg.content === "string" && HTTP_URL_RE.test(msg.content)) return true;
+    if (msg.role === "assistant") {
+      for (const part of msg.content) {
+        if (part.type === "text" && HTTP_URL_RE.test(part.text ?? "")) return true;
+      }
+    }
+  }
+  return false;
+}
+
+/**
+ * Antigravity Gemini in-turn google_search / url_context on the main routed fetch. Returns undefined
+ * when the request should use the web-search sidecar (Claude-on-CCA, explicit sidecar backend, or
+ * Gemini &lt;3 with Codex function tools, including media bridge tools that will be injected later).
+ */
+export function resolveCcaInTurnGrounding(
+  config: OcxConfig,
+  parsed: OcxParsedRequest,
+  isPassthrough: boolean,
+  provider: OcxProviderConfig,
+  modelId: string,
+  hasMediaBridge = false,
+): CcaInTurnGrounding | undefined {
+  if (!parsed._webSearch || isPassthrough) return undefined;
+  if (provider.googleMode !== "cloud-code-assist") return undefined;
+  if (/claude/i.test(modelId)) return undefined;
+  if (!toolChoiceToolPredicate(parsed.options.toolChoice)(buildWebSearchTool())) return undefined;
+  const cfg = config.webSearchSidecar ?? {};
+  if (cfg.enabled === false) return undefined;
+  if (cfg.backend !== undefined && EXPLICIT_SIDECAR_BACKENDS.has(cfg.backend)) return undefined;
+  const hasCodexTools = (parsed.context.tools?.length ?? 0) > 0 || hasMediaBridge;
+  if (hasCodexTools && !isGemini3ModelId(modelId)) return undefined;
+  return {
+    search: true,
+    urlContext: requestNeedsCcaUrlContext(parsed),
+  };
+}
+
 export interface SidecarPlan {
   /** Which executor runs the search. Anthropic does not require a forward provider. */
   backend: WebSearchBackendId;
@@ -215,7 +295,11 @@ export function planWebSearch(
   provider: OcxProviderConfig,
   modelId: string,
   openAiSidecar?: ResolvedOpenAiForwardSidecar,
+  // Core passes the potential media plan here so sidecar precedence can be resolved
+  // before deciding whether the media bridge actually runs.
+  hasMediaBridge = false,
 ): SidecarPlan | undefined {
+  if (resolveCcaInTurnGrounding(config, parsed, isPassthrough, provider, modelId, hasMediaBridge)) return undefined;
   if (!parsed._webSearch || isPassthrough) return undefined;
   if (!toolChoiceToolPredicate(parsed.options.toolChoice)(buildWebSearchTool())) return undefined;
   const cfg = config.webSearchSidecar ?? {};