@cortexkit/opencode-antigravity-auth 3.0.4 → 3.0.6

package/dist/src/plugin/request.js

@@ -1,6 +1,6 @@
 import crypto from 'node:crypto';
 import { applyAgyNativeGenerationConfig, getAgyNativeModel, isGeminiArgonModel, isRetiredAgyModel, } from '@cortexkit/antigravity-auth-core';
-import { ANTIGRAVITY_DEFAULT_PROJECT_ID, ANTIGRAVITY_ENDPOINT, CLAUDE_DESCRIPTION_PROMPT, CLAUDE_TOOL_SYSTEM_INSTRUCTION, EMPTY_SCHEMA_PLACEHOLDER_DESCRIPTION, EMPTY_SCHEMA_PLACEHOLDER_NAME, GEMINI_CLI_ENDPOINT, getRandomizedHeaders, SKIP_THOUGHT_SIGNATURE, } from '../constants';
+import { ANTIGRAVITY_DEFAULT_PROJECT_ID, ANTIGRAVITY_ENDPOINT, CLAUDE_DESCRIPTION_PROMPT, CLAUDE_TOOL_SYSTEM_INSTRUCTION, EMPTY_SCHEMA_PLACEHOLDER_DESCRIPTION, EMPTY_SCHEMA_PLACEHOLDER_NAME, getRandomizedHeaders, SKIP_THOUGHT_SIGNATURE, } from '../constants';
 import { buildAgyAgentRequestMetadata, createAgyRequestSessionContext, orderAgyRequestPayloadInPlace, } from './agy-request-metadata';
 import { cacheSignature, getCachedSignature, } from './cache';
 import { getKeepThinking } from './config';
@@ -8,12 +8,13 @@ import { createStreamingTransformer, transformSseLine, transformStreamingPayload
 import { DEBUG_MESSAGE_PREFIX, isDebugTuiEnabled, logAntigravityDebugResponse, logCacheStats, } from './debug';
 import { buildFingerprintHeaders, generateFingerprint, getSessionFingerprint, } from './fingerprint';
 import { appendGeminiDumpResponseText, createGeminiDumpResponseTransform, noteGeminiDumpResponse, } from './gemini-dump';
+import { isCanonicalGoogleOrigin } from "./google-origin.js";
 import { createLogger } from './logger';
 import { detectErrorType } from './recovery';
 import { applyToolPairingFixes, cleanJSONSchemaForAntigravity, deepFilterThinkingBlocks, extractThinkingConfig, extractUsageFromSsePayload, extractUsageMetadata, extractVariantThinkingConfig, fixToolResponseGrouping, injectParameterSignatures, injectToolHardeningInstruction, isThinkingCapableModel, normalizeThinkingConfig, parseAntigravityApiBody, resolveThinkingConfig, rewriteAntigravityPreviewAccessError, transformThinkingParts, validateAndFixClaudeToolPairing, } from './request-helpers';
 import { defaultSignatureStore } from './stores/signature-store';
 import { analyzeConversationState, closeToolLoopForThinking, needsThinkingRecovery, } from './thinking-recovery';
-import { appendClaudeThinkingHint, applyGeminiTransforms, buildImageGenerationConfig, computeClaudeMaxOutputTokens, isClaudeModel, isClaudeThinkingModel, isGemini3Model, isImageGenerationModel, resolveModelForHeaderStyle, } from './transform';
+import { appendClaudeThinkingHint, applyGeminiTransforms, buildImageGenerationConfig, computeClaudeMaxOutputTokens, isClaudeModel, isClaudeThinkingModel, isGemini3Model, isImageGenerationModel, resolveAntigravityModel, } from './transform';
 import { sanitizeCrossModelPayloadInPlace } from './transform/cross-model-sanitizer';
 const log = createLogger('request');
 const PLUGIN_SESSION_ID = `-${crypto.randomUUID()}`;
@@ -112,10 +113,7 @@ function getAgyMaxOutputTokens(model) {
     }
     return undefined;
 }
-function applyAgyGenerationDefaults(model, generationConfig, headerStyle) {
-    if (headerStyle !== 'antigravity') {
-        return;
-    }
+function applyAgyGenerationDefaults(model, generationConfig) {
     if (getAgyNativeModel(model)) {
         applyAgyNativeGenerationConfig(model, generationConfig);
         return;
@@ -1039,9 +1037,9 @@ export function fetchInputToUrl(input) {
  * interceptor entirely.
  */
 export function isGenerativeLanguageRequest(input) {
-    return fetchInputToUrl(input).includes('generativelanguage.googleapis.com');
+    return isCanonicalGoogleOrigin(fetchInputToUrl(input));
 }
-function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId, endpointOverride, headerStyle = 'antigravity', forceThinkingRecovery = false, options) {
+function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId, endpointOverride, forceThinkingRecovery = false, options) {
     const baseInit = { ...init };
     const headers = new Headers(init?.headers ?? {});
     let resolvedProjectId = projectId?.trim() || '';
@@ -1056,7 +1054,7 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
             request: input,
             init: { ...baseInit, headers },
             streaming: false,
-            headerStyle,
+            headerStyle: 'antigravity',
         };
     }
     headers.set('Authorization', `Bearer ${accessToken}`);
@@ -1069,8 +1067,10 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
     headers.delete('x-opencode-parent-session-id');
     // Strip x-goog-user-project header to prevent 403 auth/license conflicts.
     // This header is added by OpenCode/AI SDK and can force project-level checks
-    // that are not required for Antigravity/Gemini CLI OAuth requests.
+    // that are not required for Antigravity OAuth requests.
     headers.delete('x-goog-user-project');
+    headers.delete('X-Goog-Api-Client');
+    headers.delete('Client-Metadata');
     const urlString = fetchInputToUrl(input);
     const match = urlString.match(/\/models\/([^:]+):(\w+)/);
     if (!match) {
@@ -1078,15 +1078,15 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
             request: input,
             init: { ...baseInit, headers },
             streaming: false,
-            headerStyle,
+            headerStyle: 'antigravity',
         };
     }
     const [, rawModel = '', rawAction = ''] = match;
     const requestedModel = rawModel;
-    const resolved = resolveModelForHeaderStyle(rawModel, headerStyle);
+    const resolved = resolveAntigravityModel(rawModel);
     let effectiveModel = resolved.actualModel;
     const streaming = rawAction === STREAM_ACTION;
-    const defaultEndpoint = headerStyle === 'gemini-cli' ? GEMINI_CLI_ENDPOINT : ANTIGRAVITY_ENDPOINT;
+    const defaultEndpoint = ANTIGRAVITY_ENDPOINT;
     const baseEndpoint = endpointOverride ?? defaultEndpoint;
     const transformedUrl = `${baseEndpoint}/v1internal:${rawAction}${streaming ? '?alt=sse' : ''}`;
     const isClaude = isClaudeModel(resolved.actualModel);
@@ -1106,15 +1106,13 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
                     ...parsedBody,
                     model: effectiveModel,
                 };
-                if (headerStyle === 'antigravity') {
-                    if (typeof wrappedBody.userAgent !== 'string' ||
-                        !wrappedBody.userAgent) {
-                        wrappedBody.userAgent = 'antigravity';
-                    }
-                    if (typeof wrappedBody.requestType !== 'string' ||
-                        !wrappedBody.requestType) {
-                        wrappedBody.requestType = 'agent';
-                    }
+                if (typeof wrappedBody.userAgent !== 'string' ||
+                    !wrappedBody.userAgent) {
+                    wrappedBody.userAgent = 'antigravity';
+                }
+                if (typeof wrappedBody.requestType !== 'string' ||
+                    !wrappedBody.requestType) {
+                    wrappedBody.requestType = 'agent';
                 }
                 // Some callers may already send an Antigravity-wrapped body.
                 // We still need to sanitize Claude thinking blocks (remove cache_control)
@@ -1161,34 +1159,26 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
                         // Step 3: Apply tool pairing fixes (ID assignment, response matching, orphan recovery)
                         applyToolPairingFixes(req, true);
                     }
-                    if (headerStyle === 'antigravity') {
-                        sanitizeRequestPayloadForAntigravity(req);
-                        stripUnsupportedAntigravityFields(req);
-                        configureAntigravityToolCalling(req, effectiveModel);
-                        normalizeNativeFunctionResponseRoles(req);
-                    }
+                    sanitizeRequestPayloadForAntigravity(req);
+                    stripUnsupportedAntigravityFields(req);
+                    configureAntigravityToolCalling(req, effectiveModel);
+                    normalizeNativeFunctionResponseRoles(req);
                 }
-                // AGY rejects every request that ends with a model turn. Enforce this at
-                // the final wire boundary because host races, recovery, or sanitization can
-                // otherwise leave a model/assistant entry last. Claude fallback transports
-                // have the same assistant-prefill restriction.
-                if (headerStyle === 'antigravity' || isClaude) {
-                    for (const req of requestObjects) {
-                        if (Array.isArray(req.contents)) {
-                            const contents = req.contents;
-                            const lastContent = contents[contents.length - 1];
-                            if (lastContent?.role === 'model' ||
-                                lastContent?.role === 'assistant') {
-                                contents.push({ role: 'user', parts: [{ text: '[Continue]' }] });
-                            }
+                for (const req of requestObjects) {
+                    if (Array.isArray(req.contents)) {
+                        const contents = req.contents;
+                        const lastContent = contents[contents.length - 1];
+                        if (lastContent?.role === 'model' ||
+                            lastContent?.role === 'assistant') {
+                            contents.push({ role: 'user', parts: [{ text: '[Continue]' }] });
                         }
-                        if (Array.isArray(req.messages)) {
-                            const messages = req.messages;
-                            const lastMessage = messages[messages.length - 1];
-                            if (lastMessage?.role === 'model' ||
-                                lastMessage?.role === 'assistant') {
-                                messages.push({ role: 'user', parts: [{ text: '[Continue]' }] });
-                            }
+                    }
+                    if (Array.isArray(req.messages)) {
+                        const messages = req.messages;
+                        const lastMessage = messages[messages.length - 1];
+                        if (lastMessage?.role === 'model' ||
+                            lastMessage?.role === 'assistant') {
+                            messages.push({ role: 'user', parts: [{ text: '[Continue]' }] });
                         }
                     }
                 }
@@ -1207,7 +1197,7 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
                 }
                 const wireRequest = requestObjects.at(-1);
                 if (wireRequest) {
-                    if (headerStyle === 'antigravity') {
+                    {
                         const generationConfig = wireRequest.generationConfig;
                         const config = generationConfig &&
                             typeof generationConfig === 'object' &&
@@ -1223,18 +1213,12 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
                         wireRequest.labels = metadata.labels;
                         orderAgyRequestPayloadInPlace(wireRequest);
                     }
-                    else {
-                        wireRequest.sessionId = signatureSessionKey;
-                    }
                 }
-                body = safeStringify(headerStyle === 'antigravity'
-                    ? orderAntigravityEnvelope(wrappedBody)
-                    : wrappedBody);
+                body = safeStringify(orderAntigravityEnvelope(wrappedBody));
             }
             else {
                 const requestPayload = { ...parsedBody };
-                if (headerStyle === 'antigravity' &&
-                    isImageGenerationModel(effectiveModel) &&
+                if (isImageGenerationModel(effectiveModel) &&
                     isOpenCodeTitleGenerationRequest(requestPayload)) {
                     // OpenCode runs title generation through the active model. Route that
                     // text-only helper call away from image generation to avoid consuming
@@ -1245,7 +1229,8 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
                 }
                 const rawGenerationConfig = requestPayload.generationConfig;
                 const extraBody = requestPayload.extra_body;
-                const variantConfig = extractVariantThinkingConfig(requestPayload.providerOptions, rawGenerationConfig);
+                const variantConfig = options?.variant ??
+                    extractVariantThinkingConfig(requestPayload.providerOptions, rawGenerationConfig);
                 const isGemini3 = effectiveModel.toLowerCase().includes('gemini-3');
                 wire.logger.debug(`[ThinkingResolution] rawModel=${rawModel} resolvedModel=${effectiveModel} resolvedTier=${tierThinkingLevel ?? 'none'} variantLevel=${variantConfig?.thinkingLevel ?? 'none'} variantBudget=${variantConfig?.thinkingBudget ?? 'none'} providerOptions.google=${JSON.stringify(requestPayload.providerOptions?.google ?? null)} generationConfig.thinkingConfig=${JSON.stringify(rawGenerationConfig?.thinkingConfig ?? null)}`);
                 // providerOptions belongs to the host AI SDK and is only used above to
@@ -1260,7 +1245,7 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
                         .replace(/-preview-customtools$/i, '')
                         .replace(/-preview$/i, '')
                         .replace(/-(minimal|low|medium|high)$/i, '');
-                    const variantResolved = resolveModelForHeaderStyle(`${variantModelBase}-${variantConfig.thinkingLevel}`, headerStyle);
+                    const variantResolved = resolveAntigravityModel(`${variantModelBase}-${variantConfig.thinkingLevel}`);
                     effectiveModel = variantResolved.actualModel;
                     tierThinkingBudget = variantResolved.thinkingBudget;
                     tierThinkingLevel =
@@ -1290,7 +1275,9 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
                 // Resolve thinking configuration based on user settings and model capabilities
                 // Image generation models don't support thinking - skip thinking config entirely
                 const isImageModel = isImageGenerationModel(effectiveModel);
-                const userThinkingConfig = isImageModel
+                // A catalog selection owns thinking; body settings may be host defaults
+                // for a different effort and must not disable the selected effort.
+                const userThinkingConfig = isImageModel || options?.variant
                     ? undefined
                     : extractThinkingConfig(requestPayload, rawGenerationConfig, extraBody);
                 const hasAssistantHistory = Array.isArray(requestPayload.contents) &&
@@ -1356,16 +1343,7 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
                         const thinkingBudget = tierThinkingBudget ?? normalizedThinking.thinkingBudget;
                         // Build thinking config based on model type
                         let thinkingConfig;
-                        if (isClaudeThinking && headerStyle !== 'antigravity') {
-                            // Claude-on-Gemini fallback uses snake_case keys.
-                            thinkingConfig = {
-                                include_thoughts: normalizedThinking.includeThoughts ?? true,
-                                ...(typeof thinkingBudget === 'number' && thinkingBudget > 0
-                                    ? { thinking_budget: thinkingBudget }
-                                    : {}),
-                            };
-                        }
-                        else if (tierThinkingLevel) {
+                        if (tierThinkingLevel) {
                             // Gemini 3 uses thinkingLevel string (low/medium/high)
                             thinkingConfig = {
                                 includeThoughts: normalizedThinking.includeThoughts,
@@ -1384,13 +1362,13 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
                         }
                         if (rawGenerationConfig) {
                             rawGenerationConfig.thinkingConfig = thinkingConfig;
-                            applyAgyGenerationDefaults(effectiveModel, rawGenerationConfig, headerStyle);
+                            applyAgyGenerationDefaults(effectiveModel, rawGenerationConfig);
                             if (isClaudeThinking &&
                                 typeof thinkingBudget === 'number' &&
                                 thinkingBudget > 0) {
                                 const currentMax = (rawGenerationConfig.maxOutputTokens ??
                                     rawGenerationConfig.max_output_tokens);
-                                if (headerStyle === 'antigravity' && !currentMax) {
+                                if (!currentMax) {
                                     rawGenerationConfig.maxOutputTokens = 64000;
                                 }
                                 else if (!currentMax || currentMax <= thinkingBudget) {
@@ -1410,22 +1388,19 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
                             if (isClaudeThinking &&
                                 typeof thinkingBudget === 'number' &&
                                 thinkingBudget > 0) {
-                                generationConfig.maxOutputTokens =
-                                    headerStyle === 'antigravity'
-                                        ? 64000
-                                        : computeClaudeMaxOutputTokens(thinkingBudget);
+                                generationConfig.maxOutputTokens = 64000;
                             }
-                            applyAgyGenerationDefaults(effectiveModel, generationConfig, headerStyle);
+                            applyAgyGenerationDefaults(effectiveModel, generationConfig);
                             requestPayload.generationConfig = generationConfig;
                         }
                     }
                     else if (rawGenerationConfig?.thinkingConfig) {
                         delete rawGenerationConfig.thinkingConfig;
-                        applyAgyGenerationDefaults(effectiveModel, rawGenerationConfig, headerStyle);
+                        applyAgyGenerationDefaults(effectiveModel, rawGenerationConfig);
                         requestPayload.generationConfig = rawGenerationConfig;
                     }
                     else if (rawGenerationConfig) {
-                        applyAgyGenerationDefaults(effectiveModel, rawGenerationConfig, headerStyle);
+                        applyAgyGenerationDefaults(effectiveModel, rawGenerationConfig);
                         requestPayload.generationConfig = rawGenerationConfig;
                     }
                 } // End of else block for non-image models
@@ -1440,36 +1415,6 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
                     requestPayload.systemInstruction = requestPayload.system_instruction;
                     delete requestPayload.system_instruction;
                 }
-                if (headerStyle !== 'antigravity') {
-                    // Gemini CLI accepts explicit cachedContent references. Normalize its
-                    // snake_case aliases only on that transport; agy relies on implicit
-                    // prefix caching and does not send any of these fields.
-                    const cachedContentFromExtra = typeof requestPayload.extra_body === 'object' &&
-                        requestPayload.extra_body
-                        ? (requestPayload.extra_body
-                            .cached_content ??
-                            requestPayload.extra_body
-                                .cachedContent)
-                        : undefined;
-                    const cachedContent = requestPayload.cached_content ??
-                        requestPayload.cachedContent ??
-                        cachedContentFromExtra;
-                    if (cachedContent) {
-                        requestPayload.cachedContent = cachedContent;
-                    }
-                    delete requestPayload.cached_content;
-                    if (requestPayload.extra_body &&
-                        typeof requestPayload.extra_body === 'object') {
-                        delete requestPayload.extra_body
-                            .cached_content;
-                        delete requestPayload.extra_body
-                            .cachedContent;
-                        if (Object.keys(requestPayload.extra_body)
-                            .length === 0) {
-                            delete requestPayload.extra_body;
-                        }
-                    }
-                }
                 // Normalize tools. For Claude models, keep full function declarations (names + schemas).
                 const hasTools = Array.isArray(requestPayload.tools) && requestPayload.tools.length > 0;
                 if (hasTools) {
@@ -1756,31 +1701,25 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
                         wire.signatures.signatureStore.delete(signatureSessionKey);
                     }
                 }
-                // AGY rejects every request that ends with a model turn. Enforce this at
-                // the final wire boundary because host races, recovery, or sanitization can
-                // otherwise leave a model/assistant entry last. Claude fallback transports
-                // have the same assistant-prefill restriction.
-                if (headerStyle === 'antigravity' || isClaude) {
-                    if (Array.isArray(requestPayload.contents)) {
-                        const lastContent = requestPayload.contents[requestPayload.contents.length - 1];
-                        if (lastContent?.role === 'model' ||
-                            lastContent?.role === 'assistant') {
-                            requestPayload.contents.push({
-                                role: 'user',
-                                parts: [{ text: '[Continue]' }],
-                            });
-                        }
+                if (Array.isArray(requestPayload.contents)) {
+                    const lastContent = requestPayload.contents[requestPayload.contents.length - 1];
+                    if (lastContent?.role === 'model' ||
+                        lastContent?.role === 'assistant') {
+                        requestPayload.contents.push({
+                            role: 'user',
+                            parts: [{ text: '[Continue]' }],
+                        });
                     }
-                    if (Array.isArray(requestPayload.messages)) {
-                        const lastMessage = requestPayload.messages[requestPayload.messages.length - 1];
-                        if (lastMessage?.role === 'model' ||
-                            lastMessage?.role === 'assistant') {
-                            ;
-                            requestPayload.messages.push({
-                                role: 'user',
-                                parts: [{ text: '[Continue]' }],
-                            });
-                        }
+                }
+                if (Array.isArray(requestPayload.messages)) {
+                    const lastMessage = requestPayload.messages[requestPayload.messages.length - 1];
+                    if (lastMessage?.role === 'model' ||
+                        lastMessage?.role === 'assistant') {
+                        ;
+                        requestPayload.messages.push({
+                            role: 'user',
+                            parts: [{ text: '[Continue]' }],
+                        });
                     }
                 }
                 if ('model' in requestPayload) {
@@ -1788,7 +1727,7 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
                 }
                 stripInjectedDebugFromRequestPayload(requestPayload);
                 sanitizeRequestPayloadForAntigravity(requestPayload);
-                if (headerStyle === 'antigravity') {
+                {
                     const generationConfig = requestPayload.generationConfig;
                     const config = generationConfig &&
                         typeof generationConfig === 'object' &&
@@ -1818,36 +1757,25 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
                 // a fresh random project each request busts the prompt cache and
                 // fragments server-side quota/session state. ensureProjectContext
                 // already floors empty cases to this default; this is defense in depth.
-                const effectiveProjectId = projectId?.trim() ||
-                    (headerStyle === 'antigravity' ? ANTIGRAVITY_DEFAULT_PROJECT_ID : '');
+                const effectiveProjectId = projectId?.trim() || ANTIGRAVITY_DEFAULT_PROJECT_ID;
                 resolvedProjectId = effectiveProjectId;
                 // Keep internal signature-cache identity separate from AGY wire session metadata.
                 sessionId = signatureSessionKey;
-                const agyMetadata = headerStyle === 'antigravity'
-                    ? buildAgyAgentRequestMetadata(options?.agySession ?? DEFAULT_AGY_REQUEST_SESSION, requestPayload, effectiveModel, options?.agyRequestTimestamp)
-                    : null;
+                const agyMetadata = buildAgyAgentRequestMetadata(options?.agySession ?? DEFAULT_AGY_REQUEST_SESSION, requestPayload, effectiveModel, options?.agyRequestTimestamp);
                 requestPayload.sessionId = agyMetadata?.sessionId ?? signatureSessionKey;
                 if (agyMetadata) {
                     requestPayload.labels = agyMetadata.labels;
                     orderAgyRequestPayloadInPlace(requestPayload);
                 }
-                const wrappedBody = headerStyle === 'antigravity'
-                    ? {
-                        project: effectiveProjectId,
-                        requestId: agyMetadata?.requestId,
-                        request: requestPayload,
-                        model: effectiveModel,
-                        userAgent: 'antigravity',
-                        requestType: 'agent',
-                    }
-                    : {
-                        project: effectiveProjectId,
-                        model: effectiveModel,
-                        request: requestPayload,
-                    };
-                body = safeStringify(headerStyle === 'antigravity'
-                    ? orderAntigravityEnvelope(wrappedBody)
-                    : wrappedBody);
+                const wrappedBody = {
+                    project: effectiveProjectId,
+                    requestId: agyMetadata?.requestId,
+                    request: requestPayload,
+                    model: effectiveModel,
+                    userAgent: 'antigravity',
+                    requestType: 'agent',
+                };
+                body = safeStringify(orderAntigravityEnvelope(wrappedBody));
             }
         }
         catch {
@@ -1870,9 +1798,9 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
             headers.set('anthropic-beta', interleavedHeader);
         }
     }
-    if (headerStyle === 'antigravity') {
+    {
         // Use randomized headers as the fallback pool for Antigravity mode
-        const selectedHeaders = getRandomizedHeaders('antigravity', requestedModel);
+        const selectedHeaders = getRandomizedHeaders();
         // Antigravity mode: Match Antigravity Manager behavior
         // AM only sends User-Agent on content requests — no X-Goog-Api-Client, no Client-Metadata header
         // (ideType=ANTIGRAVITY goes in request body metadata via project.ts, not as a header)
@@ -1881,15 +1809,6 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
         headers.set('User-Agent', fingerprintHeaders['User-Agent'] || selectedHeaders['User-Agent']);
         headers.set('Accept-Encoding', 'gzip');
     }
-    else {
-        // Gemini CLI mode: match official google-gemini/gemini-cli User-Agent format
-        const geminiCliHeaders = getRandomizedHeaders('gemini-cli', requestedModel);
-        headers.set('User-Agent', geminiCliHeaders['User-Agent']);
-        if (geminiCliHeaders['X-Goog-Api-Client'])
-            headers.set('X-Goog-Api-Client', geminiCliHeaders['X-Goog-Api-Client']);
-        if (geminiCliHeaders['Client-Metadata'])
-            headers.set('Client-Metadata', geminiCliHeaders['Client-Metadata']);
-    }
     return {
         request: transformedUrl,
         init: {
@@ -1907,7 +1826,7 @@ function prepareAntigravityRequestIn(wire, input, init, accessToken, projectId,
         toolDebugSummary: toolDebugSummaries.slice(0, 20).join(' | '),
         toolDebugPayload,
         needsSignedThinkingWarmup,
-        headerStyle,
+        headerStyle: 'antigravity',
         thinkingRecoveryMessage,
     };
 }