@yansigit/opencodex 2.31.2 → 2.31.3

package/src/adapters/google-wire-compiler.ts

@@ -94,10 +94,35 @@ function compileContents(value: unknown, toWireName: (name: string) => string):
   });
 }
 
+const GOOGLE_BUILTIN_TOOL_KEYS = new Set([
+  "googleSearch", "google_search",
+  "urlContext", "url_context",
+  "codeExecution", "code_execution",
+]);
+
+function isGoogleBuiltinToolObject(rawTool: unknown): boolean {
+  if (!isObject(rawTool)) return false;
+  const keys = Object.keys(rawTool);
+  return keys.length > 0 && keys.every(key => GOOGLE_BUILTIN_TOOL_KEYS.has(key));
+}
+
+function passthroughGoogleBuiltinTools(rawTool: unknown): unknown[] {
+  if (!isObject(rawTool) || Array.isArray(rawTool.functionDeclarations)) return [];
+  if (!isGoogleBuiltinToolObject(rawTool)) return [];
+  const out: Record<string, unknown> = {};
+  for (const key of Object.keys(rawTool)) {
+    if (key === "googleSearch" || key === "google_search") out.google_search = {};
+    else if (key === "urlContext" || key === "url_context") out.url_context = {};
+    else if (key === "codeExecution" || key === "code_execution") out.code_execution = rawTool[key] ?? {};
+  }
+  return Object.keys(out).length > 0 ? [out] : [];
+}
+
 function compileTools(value: unknown, toWireName: (name: string) => string): unknown[] | undefined {
   if (!Array.isArray(value)) return undefined;
   const tools = value.flatMap(rawTool => {
-    if (!isObject(rawTool) || !Array.isArray(rawTool.functionDeclarations)) return [];
+    const builtins = passthroughGoogleBuiltinTools(rawTool);
+    if (!isObject(rawTool) || !Array.isArray(rawTool.functionDeclarations)) return builtins;
     const functionDeclarations = rawTool.functionDeclarations.flatMap(rawDeclaration => {
       if (!isObject(rawDeclaration) || typeof rawDeclaration.name !== "string") return [];
       return [{
@@ -106,7 +131,10 @@ function compileTools(value: unknown, toWireName: (name: string) => string): unk
         parameters: sanitizeGeminiToolParameters(rawDeclaration.parameters),
       }];
     });
-    return functionDeclarations.length > 0 ? [{ functionDeclarations }] : [];
+    return [
+      ...builtins,
+      ...(functionDeclarations.length > 0 ? [{ functionDeclarations }] : []),
+    ];
   });
   return tools.length > 0 ? tools : undefined;
 }
@@ -238,3 +266,56 @@ export function repairGoogleInvalidRequestBody(body: string, errorPayload: strin
   }
   return changed ? JSON.stringify(parsed) : undefined;
 }
+
+function stripBuiltinToolsFromRoot(root: JsonObject): boolean {
+  if (!Array.isArray(root.tools)) return false;
+  const before = root.tools.length;
+  const filtered = root.tools.filter(rawTool => !isGoogleBuiltinToolObject(rawTool));
+  root.tools = filtered;
+  return filtered.length !== before;
+}
+
+/** One mixed-tool 400 replay: drop known built-in siblings and keep functionDeclarations. */
+export function stripGoogleBuiltinToolsFromWireBody(body: string): string | undefined {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(body) as unknown;
+  } catch {
+    return undefined;
+  }
+  if (!isObject(parsed)) return undefined;
+  const root = isObject(parsed.request) ? parsed.request : parsed;
+  if (!stripBuiltinToolsFromRoot(root)) return undefined;
+  return JSON.stringify(parsed);
+}
+
+export function isGoogleMixedBuiltinToolError(errorPayload: string): boolean {
+  const mentionsBuiltin = /\b(?:google[_ ]?search|url[_ ]?context|code[_ ]?execution|built[- ]?in(?:\s+tools?)?)\b/i.test(errorPayload);
+  if (!mentionsBuiltin) return false;
+
+  // A mixed-tool error names a builtin AND a function/tool term AND a coexistence verb.
+  // Builtin mention is gated above; each pattern below requires a coexistence verb to
+  // appear within a bounded window of a tool/function/declaration term (or the phrase
+  // itself implies coexistence, e.g. "mutually exclusive"). Bare "coexist"/"alongside"
+  // without a nearby tool/function term is NOT enough — a schema error can say fields
+  // "coexist" while merely mentioning a builtin.
+  const describesIncompatibleCoexistence = [
+    /\bmix\w*\b[^\n.!?]{0,80}\b(?:tool\w*|function(?:[_ ]declarations?)?|declaration\w*)\b/i,
+    /\b(?:tool\w*|function(?:[_ ]declarations?)?|declaration\w*)\b[^\n.!?]{0,80}\bmix\w*\b/i,
+    /\bcombin\w*\b[^\n.!?]{0,80}\bwith\b/i,
+    /\bcoexist\w*\b[^\n.!?]{0,80}\b(?:tool\w*|function(?:[_ ]declarations?)?|declaration\w*)\b/i,
+    /\b(?:tool\w*|function(?:[_ ]declarations?)?|declaration\w*)\b[^\n.!?]{0,80}\bcoexist\w*\b/i,
+    /\balongside\b[^\n.!?]{0,80}\b(?:tool\w*|function(?:[_ ]declarations?)?|declaration\w*)\b/i,
+    /\b(?:tool\w*|function(?:[_ ]declarations?)?|declaration\w*)\b[^\n.!?]{0,80}\balongside\b/i,
+    /\buse\w*\b[^\n.!?]{0,80}\btogether\b/i,
+    /\btogether\b[^\n.!?]{0,80}\b(?:tool\w*|function(?:[_ ]declarations?)?|declaration\w*)\b/i,
+    /\buse\w*\b[^\n.!?]{0,80}\bwith\b[^\n.!?]{0,80}\b(?:tool\w*|function(?:[_ ]declarations?)?|declaration\w*)\b/i,
+    /\b(?:tool\w*|function(?:[_ ]declarations?)?|declaration\w*)\b[^\n.!?]{0,80}\bwith\b[^\n.!?]{0,80}\buse\w*\b/i,
+    /\bnot supported with\b[^\n.!?]{0,80}\b(?:tool\w*|function(?:[_ ]declarations?)?|declaration\w*)\b/i,
+    /\bmutually exclusive\b/i,
+    /\bincompatib\w*\b[^\n.!?]{0,80}\b(?:coexist\w*|combin\w*|alongside|used together|mutually exclusive)\b/i,
+    /\b(?:coexist\w*|combin\w*|alongside|used together|mutually exclusive)\b[^\n.!?]{0,80}\bincompatib\w*\b/i,
+  ].some(pattern => pattern.test(errorPayload));
+
+  return describesIncompatibleCoexistence;
+}

package/src/adapters/google.ts

@@ -28,6 +28,12 @@ import { sanitizeGeminiToolParameters } from "./google-tool-schema";
 import { identifyRoutedModel } from "./identity";
 import { antigravityUsesReplayCache, applyAntigravityReplay, clearAntigravityReplay, observeAntigravityReplay } from "./google-antigravity-replay";
 import { resolveAntigravityEffortWireModel } from "../providers/antigravity-models";
+import {
+  extractCcaGroundingSources,
+  formatCcaGroundingSourcesAppendix,
+  isCcaSearchSuggestionHtml,
+} from "../web-search/gemini-executor";
+import type { WebSearchSource } from "../web-search/parse";
 import { googleVertexLocationConfigError } from "../providers/google-vertex-location";
 import { lookupReplayThoughtSignature } from "../responses/thought-signature-replay";
 import {
@@ -335,22 +341,29 @@ function messagesToGeminiFormat(
   return { systemInstruction, contents };
 }
 
-function toolsToGeminiFormat(parsed: OcxParsedRequest): unknown[] | undefined {
-  if (!parsed.context.tools?.length) return undefined;
+function toolsToGeminiFormat(
+  parsed: OcxParsedRequest,
+  wireModelId: string,
+): unknown[] | undefined {
+  const grounding = parsed._ccaInTurnGrounding;
   const allowed = isAllowedToolChoice(parsed.options.toolChoice)
     ? new Set(parsed.options.toolChoice.allowedTools)
     : undefined;
   const tools = allowed
-    ? parsed.context.tools.filter(t => toolAllowedByChoice(t, allowed, parsed.context.tools))
-    : parsed.context.tools;
-  if (tools.length === 0) return undefined;
-  return [{
-    functionDeclarations: tools.map(t => ({
-      name: namespacedToolName(t.namespace, t.name),
-      description: t.description,
-      parameters: t.parameters,
-    })),
-  }];
+    ? parsed.context.tools?.filter(t => toolAllowedByChoice(t, allowed, parsed.context.tools)) ?? []
+    : parsed.context.tools ?? [];
+  const functionDeclarations = tools.map(t => ({
+    name: namespacedToolName(t.namespace, t.name),
+    description: t.description,
+    parameters: t.parameters,
+  }));
+  const wireTools: unknown[] = [];
+  if (functionDeclarations.length > 0) wireTools.push({ functionDeclarations });
+  if (grounding && !/claude/i.test(wireModelId)) {
+    if (grounding.search) wireTools.push({ google_search: {} });
+    if (grounding.urlContext) wireTools.push({ url_context: {} });
+  }
+  return wireTools.length > 0 ? wireTools : undefined;
 }
 
 /**
@@ -509,11 +522,12 @@ function googleToolCallMetadataFromPart(
  * Keep that provider visibility bit authoritative here so the streaming and buffered parsers
  * cannot accidentally expose the same hidden reasoning through different event types.
  */
-function googlePartTextEvent(part: GoogleResponsePart): AdapterEvent | undefined {
+function googlePartTextEvent(part: GoogleResponsePart, filterCcaSearchSuggestionHtml = false): AdapterEvent | undefined {
   // A malformed scalar/object is not text and must not cross the AdapterEvent boundary. Dropping
   // only this optional field preserves the rest of the part without inventing assistant output by
   // coercion; an empty string keeps its existing no-event behavior.
   if (typeof part.text !== "string" || part.text.length === 0) return undefined;
+  if (filterCcaSearchSuggestionHtml && isCcaSearchSuggestionHtml(part.text)) return undefined;
   return part.thought === true
     ? { type: "reasoning_raw_delta", text: part.text }
     : { type: "text_delta", text: part.text };
@@ -669,6 +683,7 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
   let vertexReplayModel: string | undefined;
   let vertexReplaySession: string | undefined;
   let restoreGoogleToolName = (name: string): string => name;
+  const emitInTurnGroundingSourcesQueue: boolean[] = [];
   return {
     name: "google",
 
@@ -702,7 +717,7 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
         identityModelId,
         provider.googleMode === "cloud-code-assist",
       );
-      const tools = toolsToGeminiFormat(parsed);
+      const tools = toolsToGeminiFormat(parsed, routedModelId);
 
       const body: Record<string, unknown> = { contents };
       if (systemInstruction) body.systemInstruction = systemInstruction;
@@ -836,6 +851,7 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
         if (/claude/i.test(wireModelId)) {
           headers["anthropic-beta"] = "interleaved-thinking-2025-05-14";
         }
+        emitInTurnGroundingSourcesQueue.push(!!parsed._ccaInTurnGrounding);
         return { url, method: "POST", headers, body: JSON.stringify(envelope) };
       }
 
@@ -861,6 +877,7 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
         if (apiKey) {
           const url = `https://aiplatform.googleapis.com/v1/publishers/google/models/${parsed.modelId}:${method}${streamParam}`;
           headers["x-goog-api-key"] = apiKey;
+          emitInTurnGroundingSourcesQueue.push(!!parsed._ccaInTurnGrounding);
           return { url, method: "POST", headers, body: JSON.stringify(compiled.body) };
         }
         const project = provider.project || process.env.GOOGLE_CLOUD_PROJECT || process.env.GCLOUD_PROJECT;
@@ -873,6 +890,7 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
         const url = `https://${host}/v1/projects/${project}/locations/${location}/publishers/google/models/${parsed.modelId}:${method}${streamParam}`;
         const token = await getVertexAccessToken();
         headers["Authorization"] = `Bearer ${token}`;
+        emitInTurnGroundingSourcesQueue.push(!!parsed._ccaInTurnGrounding);
         return { url, method: "POST", headers, body: JSON.stringify(compiled.body) };
       }
 
@@ -884,10 +902,14 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
 
       const compiled = compileGoogleWireBody(body);
       restoreGoogleToolName = compiled.restoreToolName;
+      emitInTurnGroundingSourcesQueue.push(!!parsed._ccaInTurnGrounding);
       return { url, method: "POST", headers, body: JSON.stringify(compiled.body) };
     },
 
     async *parseStream(response: Response, budget: TranslatorBudget): AsyncGenerator<AdapterEvent> {
+      const emitInTurnGroundingSources = emitInTurnGroundingSourcesQueue.shift() ?? false;
+      const filterCcaSearchSuggestionHtml =
+        provider.googleMode === "cloud-code-assist" && emitInTurnGroundingSources;
       if (!response.body) {
         yield { type: "error", message: "No response body" };
         return;
@@ -912,6 +934,14 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
       let sawAnyFrame = false;
       let sawTerminalSignal = false;
       let pendingStreamThoughtSig: string | undefined;
+      const groundingSources: WebSearchSource[] = [];
+      let groundingSourcesEmitted = false;
+
+      const mergeGroundingSources = (groundingMetadata: unknown): void => {
+        for (const source of extractCcaGroundingSources(groundingMetadata)) {
+          if (!groundingSources.some(existing => existing.url === source.url)) groundingSources.push(source);
+        }
+      };
 
       const handleDataLine = async function* (line: string): AsyncGenerator<AdapterEvent, "continue" | "content" | "terminate"> {
         const payload = line.slice(5).trim();
@@ -1006,8 +1036,13 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
         const candidate = rawCandidate as {
           content?: unknown;
           finishReason?: string;
+          groundingMetadata?: unknown;
         };
 
+        if (emitInTurnGroundingSources && candidate.groundingMetadata) {
+          mergeGroundingSources(candidate.groundingMetadata);
+        }
+
         if (typeof candidate.finishReason === "string" && candidate.finishReason) {
           lastFinishReason = candidate.finishReason;
           sawTerminalSignal = true;
@@ -1055,7 +1090,7 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
             if (part.thought === true && sig && isLikelyRealThoughtSignature(sig)) {
               pendingStreamThoughtSig = sig;
             }
-            const textEvent = googlePartTextEvent(part);
+            const textEvent = googlePartTextEvent(part, filterCcaSearchSuggestionHtml);
             if (textEvent) {
               emittedContentEvent = true;
               yield textEvent;
@@ -1166,6 +1201,13 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
           yield { type: "error", message: "upstream stream ended without a terminal signal — possible truncation" };
           return;
         }
+        if (emitInTurnGroundingSources && !groundingSourcesEmitted && groundingSources.length > 0) {
+          const appendix = formatCcaGroundingSourcesAppendix(groundingSources);
+          if (appendix) {
+            groundingSourcesEmitted = true;
+            yield { type: "text_delta", text: appendix };
+          }
+        }
         const stopReason = lastFinishReason === "MAX_TOKENS"
           ? "max_tokens"
           : ["SAFETY", "RECITATION", "BLOCKLIST", "PROHIBITED_CONTENT", "SPII"].includes(lastFinishReason ?? "")

package/src/config.ts

@@ -735,6 +735,8 @@ const providerConfigSchema = z.object({
   // accepted, persisted, and then silently resolved to the `code_mode_only` default — the
   // operator asked for shell mode, got code mode, and was told nothing (#2106).
   codexToolMode: z.enum(["code_mode_only", "shell"]).optional(),
+  // Validated rather than passed through: same rationale as codexToolMode above.
+  projectContext: z.enum(["off", "on"]).optional(),
   responsesItemIdRepair: z.object({
     message: z.array(z.string().min(1)).optional(),
     reasoning: z.array(z.string().min(1)).optional(),

package/src/generated/compatibility-version.json

@@ -10,7 +10,7 @@
     },
     {
       "path": "package.json",
-      "sha256": "5f79caaeac059bcbe36457e17d5c74ebaf9a0ec4779e74f1099db586395cbcb8"
+      "sha256": "fa2d431959a8bfdaa38e582dc186e5cea86bd59a191cb47e590c4b769d31c497"
     },
     {
       "path": "scripts/model-metadata.source.json",
@@ -52,9 +52,13 @@
       "path": "src/adapters/cline-pass-deepseek-v4-tool-replay.ts",
       "sha256": "da664327db4e0bae8ab689230deec415ad3f6d0f18c596dcc5b94c8a8d08a345"
     },
+    {
+      "path": "src/adapters/command-code-project-context.ts",
+      "sha256": "72bcc19ad2ce2a3f743391d6388c67912e3cf3bfc244dd6b410638c2c34241a5"
+    },
     {
       "path": "src/adapters/command-code.ts",
-      "sha256": "de5e96d0c8d15ae11c7db6332b73387fe56d12ea38b87e8f2a9d8b805c3dc94d"
+      "sha256": "dbed5da61ccf72aa3a250270e8b25ada850c05fce06b10326b2fc132416aa24a"
     },
     {
       "path": "src/adapters/cursor.ts",
@@ -122,7 +126,7 @@
     },
     {
       "path": "src/adapters/cursor/live-transport.ts",
-      "sha256": "cc994819e61adca9fdf7ed22a84c726e02b61db93abdd7dd4eb21051f633c08e"
+      "sha256": "797e54c0aa7cd032aba8947016178d7346dded57506eb767ce635523f8ed5d71"
     },
     {
       "path": "src/adapters/cursor/mcp-config.ts",
@@ -136,6 +140,10 @@
       "path": "src/adapters/cursor/message-mapper.ts",
       "sha256": "aa83d8db1616a8f43badb15dfc6ee8601e0604a50cb91569555f0f4488418f1c"
     },
+    {
+      "path": "src/adapters/cursor/native-exec-bridge.ts",
+      "sha256": "0a5c5f67d0ab02563f57e3f0dfdac096c2586b9e46b8f51601063d6e531e5a40"
+    },
     {
       "path": "src/adapters/cursor/native-exec-common.ts",
       "sha256": "4682a899e9e626fc7fe7a481bf565468c44641d30414d2e3de560c703ce090b8"
@@ -226,7 +234,7 @@
     },
     {
       "path": "src/adapters/google-http.ts",
-      "sha256": "7777e3c6af84a53cf9fdb6caaf85f67e51160e9745f154548b0f21da44f990c0"
+      "sha256": "1432cd6bc49988200e87d8703f0659928efa937806e76f6522167ea62b360d56"
     },
     {
       "path": "src/adapters/google-tool-schema.ts",
@@ -238,11 +246,11 @@
     },
     {
       "path": "src/adapters/google-wire-compiler.ts",
-      "sha256": "5f3b21dc2fd6cbd584a83e2537d5a7012b179f76b575afd83ff17a3acdb7ad8d"
+      "sha256": "b6fc399cc8945e43ceaeb9580a69a28c10f6941e6c567802485f5589437f2086"
     },
     {
       "path": "src/adapters/google.ts",
-      "sha256": "74ad714b7c4ff969f9e80af8f9d6cbab6a3727b18394a07775be30fa0ff9bb56"
+      "sha256": "eae2446639701e12df75bade1fd871d6275efda162fe42ba09353c42f9b5f197"
     },
     {
       "path": "src/adapters/identity.ts",
@@ -1098,7 +1106,7 @@
     },
     {
       "path": "src/config.ts",
-      "sha256": "82609b9c2f6ae4bb7cc918e6737362daa23f2361909858a11b7e344d9d4d1097"
+      "sha256": "d87f6e979e9e4e51ac958ca2ab8e3e48401894f5cfa166924430ce45089528cc"
     },
     {
       "path": "src/config/provider-name.ts",
@@ -1694,7 +1702,7 @@
     },
     {
       "path": "src/lab/subject/behavior-fingerprint.ts",
-      "sha256": "9dc54211f2550f404dbe85505938c9b4c559548d3fa733db82860ddb50ea2d9f"
+      "sha256": "bbc988927141dc5e4d4f895b3ffbdded4a07153802ea62b1ad775d136f7a6022"
     },
     {
       "path": "src/lab/subject/installation-salt.ts",
@@ -2046,7 +2054,7 @@
     },
     {
       "path": "src/oauth/index.ts",
-      "sha256": "4b6603e57e1b5b13a37c27876ba1d85066e145b06507d40923ede0f6c0892625"
+      "sha256": "d867f09896669ab76d4886daa7ddd9b91476f3fbcbc6b9f41c518e3aab04e393"
     },
     {
       "path": "src/oauth/key-providers.ts",
@@ -2386,7 +2394,7 @@
     },
     {
       "path": "src/routing/compatibility/behavior.ts",
-      "sha256": "99a85b286aa66b5f46a2f95b9da32294a1bb3a9e8c00737d0aafa45063b37476"
+      "sha256": "1c3008ab085dc8bb0033f23b5eaa640553484036db1ad3e44ccbff1d12618225"
     },
     {
       "path": "src/routing/compatibility/catalog.ts",
@@ -2774,7 +2782,7 @@
     },
     {
       "path": "src/server/responses/core.ts",
-      "sha256": "889f74b70fb60c2c7bff2559fc923b64a883a5444aa4757ef1eb2c4a450e8e2d"
+      "sha256": "e0f29663b051f0ba820b1d0a5ca460a6dcde3f219be950db91e53f305d87a07d"
     },
     {
       "path": "src/server/responses/empty-completion-guard.ts",
@@ -2958,11 +2966,11 @@
     },
     {
       "path": "src/types/provider.ts",
-      "sha256": "6a37ade0ad24851f61705584e0c67f1c64335541ffcd5f337465ddd618249f39"
+      "sha256": "e1b496ef630fc6bbd2829eda217975a1aaa464ff27c9a2a5dabba44220c82dfb"
     },
     {
       "path": "src/types/request.ts",
-      "sha256": "4a5e832cbd05b3c9cdeba818d2cdeeb10cb5da93349140e0c093fd99d66799d0"
+      "sha256": "729aa89dcc03f4255a2e5fdb8f5000efc73625072a855d3e52eec543841bbc20"
     },
     {
       "path": "src/types/tools.ts",
@@ -3106,11 +3114,11 @@
     },
     {
       "path": "src/web-search/gemini-executor.ts",
-      "sha256": "51fc8703f43b34e0a437748d31577e30fa30e408b356129ee1680c0b59d7a0b1"
+      "sha256": "7a2d576680af12d9894896dac3bfaab9cec62a3f959857271bc041baba52f83e"
     },
     {
       "path": "src/web-search/index.ts",
-      "sha256": "f9de3df23c1184f0a7b09ae6ebe9857824dd23a79132bd11d3e36e9a5b6268e4"
+      "sha256": "6751c704b888ac114cca3b7f2e6dc840ceb33164b2d585e74aa3a3c399bee1fb"
     },
     {
       "path": "src/web-search/loop.ts",

package/src/lab/subject/behavior-fingerprint.ts

@@ -3,7 +3,7 @@ import { jcsStringify } from "../digest";
 import type { LabBehaviorSource, LabBehaviorValues } from "../live/types";
 
 const CLOSED_KEYS = new Set([
-  "wire.adapter", "wire.upstreamProtocol", "wire.responsesPath", "wire.commandCodeVersion", "wire.modelSuffixMode",
+  "wire.adapter", "wire.upstreamProtocol", "wire.responsesPath", "wire.commandCodeVersion", "wire.commandCodeProjectContext", "wire.modelSuffixMode",
   "auth.mode", "auth.transport",
   "responses.stateful", "responses.upstreamStreaming", "responses.serviceTier", "responses.fastWireKind", "responses.fastWireValue", "responses.snapshotRepair", "responses.itemIdRepair",
   "limits.contextWindow", "limits.maxInputTokens", "limits.maxOutputTokens",

package/src/oauth/index.ts

@@ -1073,6 +1073,9 @@ export function upsertOAuthProvider(config: OcxConfig, provider: string): void {
   if (existing?.commandCodeVersion !== undefined) {
     next.commandCodeVersion = existing.commandCodeVersion;
   }
+  if (existing?.projectContext !== undefined) {
+    next.projectContext = existing.projectContext;
+  }
   // User-configured price overlays are operator data, not preset state; a
   // re-login, add-account, or reauth must not silently drop them from the
   // Logs/Usage estimates.

package/src/routing/compatibility/behavior.ts

@@ -148,6 +148,9 @@ export function resolveProductionBehaviorValues(
     "wire.upstreamProtocol": behaviorRow("provider_config", upstreamProtocol),
     "wire.responsesPath": behaviorRow("provider_config", effective.responsesPath ?? null),
     "wire.commandCodeVersion": behaviorRow("provider_config", effective.commandCodeVersion ?? null),
+    ...(adapter === "command-code"
+      ? { "wire.commandCodeProjectContext": behaviorRow("provider_config", effective.projectContext ?? "off") }
+      : {}),
     "wire.modelSuffixMode": behaviorRow(
       "provider_config",
       effective.modelSuffixBracketStrip === true ? "bracket_strip" : "none",

package/src/server/responses/core.ts

@@ -125,7 +125,7 @@ import {
   rotateCursorAccountOnAuth,
 } from "../../oauth/cursor-routing";
 import { getAccountCredential } from "../../oauth/store";
-import { buildWebSearchTool, planWebSearch, runWithWebSearch, shouldResolveOpenAiWebSearchSidecar } from "../../web-search";
+import { buildWebSearchTool, mediaBridgeWillRun, planWebSearch, resolveCcaInTurnGrounding, runWithWebSearch, shouldResolveOpenAiWebSearchSidecar } from "../../web-search";
 import { buildImageTool, buildVideoTool, planImageBridge, planVideoBridge, runWithImageBridge, clampImageMaxRounds, IMAGE_GEN_TOOL_NAME, VIDEO_GEN_TOOL_NAME } from "../../images";
 import { describeImagesInPlace, isModelTextOnly, planVisionSidecar, resolveOpenAiVisionModel, shouldResolveOpenAiVisionSidecar, stripImagesInPlace } from "../../vision";
 import { createAdapterEventQueue, preflightAdapterEvents, type AdapterEventQueue } from "../../adapters/run-turn-queue";
@@ -4061,13 +4061,23 @@ async function handleResponsesInner(
   //   - non-runTurn: web-search wins over image when both eligible (documented priority)
   //   - runTurn: image bridge may run (it supports runTurn); web-search is skipped so runTurn
   //     can proceed for web-search-only turns
-  const wsPlan = !routedCompaction
-    ? planWebSearch(config, parsed, false, route.provider, route.modelId, openAiSidecar)
-    : undefined;
   const imgPlan = !routedCompaction ? await planImageBridge(config, parsed, route.provider) : undefined;
   const vidPlan = !routedCompaction ? await planVideoBridge(config, parsed, route.provider) : undefined;
-  const canRunWebSearch = !!wsPlan && !adapter.runTurn;
-  if ((imgPlan || vidPlan) && canRunWebSearch) {
+  const hasMediaPlan = !!(imgPlan || vidPlan);
+  // A media plan is not enough to suppress Gemini 2.x grounding: both bridges inject tools only
+  // on streaming turns. This is the potential-injection value used to resolve sidecar precedence.
+  const mediaMayInject = mediaBridgeWillRun(hasMediaPlan, false, !!adapter.runTurn, parsed.stream);
+  const wsPlan = !routedCompaction
+    ? planWebSearch(config, parsed, false, route.provider, route.modelId, openAiSidecar, mediaMayInject)
+    : undefined;
+  const webSearchWinsMedia = !!wsPlan && !adapter.runTurn;
+  const mediaWillRun = mediaBridgeWillRun(hasMediaPlan, !!wsPlan, !!adapter.runTurn, parsed.stream);
+  const ccaInTurnGrounding = !routedCompaction
+    ? resolveCcaInTurnGrounding(config, parsed, false, route.provider, route.modelId, mediaWillRun)
+    : undefined;
+  if (ccaInTurnGrounding) parsed._ccaInTurnGrounding = ccaInTurnGrounding;
+  const canRunWebSearch = webSearchWinsMedia && !ccaInTurnGrounding;
+  if (hasMediaPlan && webSearchWinsMedia) {
     // Web search takes priority when both are active — the media bridge cannot run
     // alongside runWithWebSearch. Surface a runtime signal so the user knows their
     // configured video/image bridge was skipped for this turn, rather than silently
@@ -4075,7 +4085,7 @@ async function handleResponsesInner(
     if (vidPlan) console.warn("[videos] video bridge skipped: web search is active for this turn");
     if (imgPlan) console.warn("[images] image bridge skipped: web search is active for this turn");
   }
-  if ((imgPlan || vidPlan) && (!wsPlan || adapter.runTurn)) {
+  if (mediaWillRun || (imgPlan && !parsed.stream && !webSearchWinsMedia)) {
     // The image bridge detects a hosted image_generation tool and requires streaming.
     // The video bridge activates from config and injects a tool — it also needs streaming
     // (the loop returns SSE). For video-only (no imgPlan) on a non-streaming request, skip

package/src/types/provider.ts

@@ -169,6 +169,13 @@ export interface OcxProviderConfig {
    * version here instead of waiting for a code change. Absent uses the adapter's current default.
    */
   commandCodeVersion?: string;
+  /**
+   * Command Code OAuth `/alpha/generate` project-context envelope. When `"on"`, the adapter
+   * fills `memory`, `taste`, and `skills` from bounded files under `process.cwd()`. Absent or
+   * `"off"` keeps the empty envelope (`memory: ""`, `taste: null`, `skills: null`). Does not
+   * enable taste learning (`x-taste-learning` stays `"false"`).
+   */
+  projectContext?: "off" | "on";
   /**
    * Responses upstream that stores nothing server-side (DeepSeek documents "the API
    * is stateless"). Stateful request parameters are dropped, `store` is pinned false,

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> };
   /**

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 };
 }