@cortexkit/opencode-antigravity-auth 1.0.1 → 2.0.0

package/dist/src/plugin/request.js

@@ -1,54 +1,118 @@
-import crypto from "node:crypto";
-import { ANTIGRAVITY_ENDPOINT, ANTIGRAVITY_DEFAULT_PROJECT_ID, GEMINI_CLI_ENDPOINT, EMPTY_SCHEMA_PLACEHOLDER_NAME, EMPTY_SCHEMA_PLACEHOLDER_DESCRIPTION, SKIP_THOUGHT_SIGNATURE, getRandomizedHeaders, } from "../constants";
-import { cacheSignature, getCachedSignature } from "./cache";
-import { getKeepThinking } from "./config";
-import { createStreamingTransformer, transformSseLine, transformStreamingPayload, } from "./core/streaming";
-import { defaultSignatureStore } from "./stores/signature-store";
-import { DEBUG_MESSAGE_PREFIX, isDebugEnabled, isDebugTuiEnabled, logAntigravityDebugResponse, logCacheStats, } from "./debug";
-import { createLogger } from "./logger";
-import { cleanJSONSchemaForAntigravity, DEFAULT_THINKING_BUDGET, deepFilterThinkingBlocks, extractThinkingConfig, extractVariantThinkingConfig, extractUsageFromSsePayload, extractUsageMetadata, fixToolResponseGrouping, validateAndFixClaudeToolPairing, applyToolPairingFixes, injectParameterSignatures, injectToolHardeningInstruction, isThinkingCapableModel, normalizeThinkingConfig, parseAntigravityApiBody, resolveThinkingConfig, rewriteAntigravityPreviewAccessError, transformThinkingParts, } from "./request-helpers";
-import { CLAUDE_TOOL_SYSTEM_INSTRUCTION, CLAUDE_DESCRIPTION_PROMPT, } from "../constants";
-import { analyzeConversationState, closeToolLoopForThinking, needsThinkingRecovery, } from "./thinking-recovery";
-import { sanitizeCrossModelPayloadInPlace } from "./transform/cross-model-sanitizer";
-import { isGemini3Model, isImageGenerationModel, buildImageGenerationConfig, applyGeminiTransforms } from "./transform";
-import { resolveModelWithTier, resolveModelWithVariant, resolveModelForHeaderStyle, isClaudeModel, isClaudeThinkingModel, CLAUDE_THINKING_MAX_OUTPUT_TOKENS, computeClaudeMaxOutputTokens, appendClaudeThinkingHint, } from "./transform";
-import { detectErrorType } from "./recovery";
-import { getSessionFingerprint, buildFingerprintHeaders } from "./fingerprint";
-import { appendGeminiDumpResponseText, createGeminiDumpResponseTransform, noteGeminiDumpResponse, } from "./gemini-dump";
-const log = createLogger("request");
+import crypto from 'node:crypto';
+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 { buildAgyAgentRequestMetadata, createAgyRequestSessionContext, orderAgyRequestPayloadInPlace, } from './agy-request-metadata';
+import { cacheSignature, getCachedSignature } from './cache';
+import { getKeepThinking } from './config';
+import { createStreamingTransformer, transformSseLine, transformStreamingPayload, } from './core/streaming';
+import { DEBUG_MESSAGE_PREFIX, isDebugTuiEnabled, logAntigravityDebugResponse, logCacheStats, } from './debug';
+import { buildFingerprintHeaders, getSessionFingerprint, } from './fingerprint';
+import { appendGeminiDumpResponseText, createGeminiDumpResponseTransform, noteGeminiDumpResponse, } from './gemini-dump';
+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 { sanitizeCrossModelPayloadInPlace } from './transform/cross-model-sanitizer';
+const log = createLogger('request');
 const PLUGIN_SESSION_ID = `-${crypto.randomUUID()}`;
+const DEFAULT_AGY_REQUEST_SESSION = createAgyRequestSessionContext('');
 const sessionDisplayedThinkingHashes = new Set();
 const MIN_SIGNATURE_LENGTH = 50;
+const AGY_CLAUDE_THINKING_BUDGET = 1024;
 const ANTIGRAVITY_ENVELOPE_FIELD_ORDER = [
-    "project",
-    "requestId",
-    "request",
-    "model",
-    "userAgent",
-    "requestType",
-    "enabledCreditTypes",
+    'project',
+    'requestId',
+    'request',
+    'model',
+    'userAgent',
+    'requestType',
 ];
-function buildAntigravityRequestId(type = "agent") {
-    if (type === "checkpoint") {
-        return `checkpoint/${crypto.randomUUID()}`;
+const OPENCODE_TITLE_PROMPT_PREFIX = 'Generate a title for this conversation:';
+function getOpenCodeTitleSourceText(payload) {
+    if (!Array.isArray(payload.contents)) {
+        return undefined;
+    }
+    const texts = payload.contents.flatMap((content) => {
+        if (!content || typeof content !== 'object') {
+            return [];
+        }
+        const parts = content.parts;
+        if (!Array.isArray(parts)) {
+            return [];
+        }
+        return parts.flatMap((part) => part &&
+            typeof part === 'object' &&
+            typeof part.text === 'string'
+            ? [part.text]
+            : []);
+    });
+    const promptIndex = texts.findIndex((text) => text.startsWith(OPENCODE_TITLE_PROMPT_PREFIX));
+    return promptIndex >= 0
+        ? texts.slice(promptIndex + 1).find((text) => text.trim().length > 0)
+        : undefined;
+}
+function isOpenCodeTitleGenerationRequest(payload) {
+    return getOpenCodeTitleSourceText(payload) !== undefined;
+}
+function formatLocalImageTitle(sourceText) {
+    const normalized = sourceText
+        .trim()
+        .replace(/^(["“])(.*)(["”])$/s, '$2')
+        .replace(/\s+/g, ' ');
+    const characters = Array.from(normalized);
+    if (characters.length <= 50) {
+        return normalized || 'Image generation';
+    }
+    return `${characters.slice(0, 47).join('').trimEnd()}...`;
+}
+export function getImageModelLocalTitle(input, init) {
+    const url = fetchInputToUrl(input);
+    if (!/\/models\/[^/:]*(?:image|imagen)[^/:]*:streamGenerateContent/i.test(url)) {
+        return undefined;
+    }
+    const body = init?.body;
+    const bodyText = typeof body === 'string'
+        ? body
+        : body instanceof Uint8Array
+            ? new TextDecoder().decode(body)
+            : '';
+    if (!bodyText) {
+        return undefined;
+    }
+    try {
+        const sourceText = getOpenCodeTitleSourceText(JSON.parse(bodyText));
+        return sourceText === undefined
+            ? undefined
+            : formatLocalImageTitle(sourceText);
+    }
+    catch {
+        return undefined;
     }
-    return `agent/${crypto.randomUUID()}/${Date.now()}/${crypto.randomUUID()}/2`;
 }
 function getAgyMaxOutputTokens(model) {
     const lower = model.toLowerCase();
-    if (lower === "gemini-3.5-flash-low" || lower === "gemini-3.5-flash-extra-low" || lower === "gemini-3-flash-agent") {
+    if (lower === 'gemini-3.5-flash-low' ||
+        lower === 'gemini-3.5-flash-extra-low' ||
+        lower === 'gemini-3-flash-agent' ||
+        lower === 'gemini-3.6-flash-low' ||
+        lower === 'gemini-3.6-flash-medium' ||
+        lower === 'gemini-3.6-flash-high') {
         return 65536;
     }
-    if (lower === "gemini-3.1-pro-low" || lower === "gemini-pro-agent") {
+    if (lower === 'gemini-3.1-pro-low' || lower === 'gemini-pro-agent') {
         return 65535;
     }
-    if (lower === "claude-sonnet-4-6" || lower === "claude-opus-4-6-thinking") {
+    if (lower === 'claude-sonnet-4-6' || lower === 'claude-opus-4-6-thinking') {
         return 64000;
     }
+    if (lower === 'gpt-oss-120b-medium') {
+        return 32768;
+    }
     return undefined;
 }
 function applyAgyGenerationDefaults(model, generationConfig, headerStyle) {
-    if (headerStyle !== "antigravity") {
+    if (headerStyle !== 'antigravity') {
         return;
     }
     const maxOutputTokens = getAgyMaxOutputTokens(model);
@@ -72,13 +136,13 @@ function orderAntigravityEnvelope(body) {
     return ordered;
 }
 function buildSignatureSessionKey(sessionId, model, conversationKey, projectKey) {
-    const modelKey = typeof model === "string" && model.trim() ? model.toLowerCase() : "unknown";
-    const projectPart = typeof projectKey === "string" && projectKey.trim()
+    const modelKey = typeof model === 'string' && model.trim() ? model.toLowerCase() : 'unknown';
+    const projectPart = typeof projectKey === 'string' && projectKey.trim()
         ? projectKey.trim()
-        : "default";
-    const conversationPart = typeof conversationKey === "string" && conversationKey.trim()
+        : 'default';
+    const conversationPart = typeof conversationKey === 'string' && conversationKey.trim()
         ? conversationKey.trim()
-        : "default";
+        : 'default';
     return `${sessionId}:${modelKey}:${projectPart}:${conversationPart}`;
 }
 /**
@@ -90,22 +154,30 @@ function buildSignatureSessionKey(sessionId, model, conversationKey, projectKey)
  * by checking for JSON Schema primitive types. Everything else that's
  * a non-string `thinking` value gets flattened to "".
  */
-const JSON_SCHEMA_TYPES = new Set(["boolean", "string", "number", "integer", "array", "object"]);
+const JSON_SCHEMA_TYPES = new Set([
+    'boolean',
+    'string',
+    'number',
+    'integer',
+    'array',
+    'object',
+]);
 function thinkingSafeReplacer(key, value) {
-    if (key === "thinking" && typeof value === "object" && value !== null) {
-        // Preserve Schema objects in tool declarations (e.g., {type: "boolean"})
+    if (key === 'thinking' && typeof value === 'object' && value !== null) {
+        // Preserve tool schemas before and after Gemini uppercases their type.
         const rec = value;
-        if (typeof rec.type === "string" && JSON_SCHEMA_TYPES.has(rec.type)) {
+        if (typeof rec.type === 'string' &&
+            JSON_SCHEMA_TYPES.has(rec.type.toLowerCase())) {
             return value;
         }
         // Flatten any non-string, non-Schema thinking to empty string
-        return "";
+        return '';
     }
     return value;
 }
 /** Stringify with built-in thinking sanitization. Impossible to bypass. */
 function ensureThinkingFields(obj) {
-    if (!obj || typeof obj !== "object")
+    if (!obj || typeof obj !== 'object')
         return;
     if (Array.isArray(obj)) {
         for (const item of obj)
@@ -116,11 +188,11 @@ function ensureThinkingFields(obj) {
     // Fix: check for missing OR undefined OR non-string thinking field.
     // JSON.stringify silently drops undefined values, so key-exists-but-undefined
     // produces { type: "thinking", signature: "..." } with NO thinking field.
-    if (rec.type === "thinking" && typeof rec.thinking !== "string") {
-        rec.thinking = "";
+    if (rec.type === 'thinking' && typeof rec.thinking !== 'string') {
+        rec.thinking = '';
     }
-    if (rec.thought === true && typeof rec.text !== "string") {
-        rec.text = "";
+    if (rec.thought === true && typeof rec.text !== 'string') {
+        rec.text = '';
     }
     for (const val of Object.values(rec)) {
         ensureThinkingFields(val);
@@ -131,59 +203,67 @@ function safeStringify(obj) {
     return JSON.stringify(obj, thinkingSafeReplacer);
 }
 function shouldCacheThinkingSignatures(model) {
-    if (typeof model !== "string")
+    if (typeof model !== 'string')
         return false;
     const lower = model.toLowerCase();
     // Both Claude and Gemini 3 models require thought signature caching
     // for multi-turn conversations with function calling
-    return lower.includes("claude") || lower.includes("gemini-3");
+    return lower.includes('claude') || lower.includes('gemini-3');
 }
 function hashConversationSeed(seed) {
-    return crypto.createHash("sha256").update(seed, "utf8").digest("hex").slice(0, 16);
+    return crypto
+        .createHash('sha256')
+        .update(seed, 'utf8')
+        .digest('hex')
+        .slice(0, 16);
 }
 function extractTextFromContent(content) {
-    if (typeof content === "string") {
+    if (typeof content === 'string') {
         return content;
     }
     if (!Array.isArray(content)) {
-        return "";
+        return '';
     }
     for (const block of content) {
-        if (!block || typeof block !== "object") {
+        if (!block || typeof block !== 'object') {
             continue;
         }
         const anyBlock = block;
-        if (typeof anyBlock.text === "string") {
+        if (typeof anyBlock.text === 'string') {
             return anyBlock.text;
         }
-        if (anyBlock.text && typeof anyBlock.text === "object" && typeof anyBlock.text.text === "string") {
+        if (anyBlock.text &&
+            typeof anyBlock.text === 'object' &&
+            typeof anyBlock.text.text === 'string') {
             return anyBlock.text.text;
         }
     }
-    return "";
+    return '';
 }
 function extractConversationSeedFromMessages(messages) {
-    const system = messages.find((message) => message?.role === "system");
-    const users = messages.filter((message) => message?.role === "user");
+    const system = messages.find((message) => message?.role === 'system');
+    const users = messages.filter((message) => message?.role === 'user');
     const firstUser = users[0];
     const lastUser = users.length > 0 ? users[users.length - 1] : undefined;
-    const systemText = system ? extractTextFromContent(system.content) : "";
-    const userText = firstUser ? extractTextFromContent(firstUser.content) : "";
-    const fallbackUserText = !userText && lastUser ? extractTextFromContent(lastUser.content) : "";
-    return [systemText, userText || fallbackUserText].filter(Boolean).join("|");
+    const systemText = system ? extractTextFromContent(system.content) : '';
+    const userText = firstUser ? extractTextFromContent(firstUser.content) : '';
+    const fallbackUserText = !userText && lastUser ? extractTextFromContent(lastUser.content) : '';
+    return [systemText, userText || fallbackUserText].filter(Boolean).join('|');
 }
 function extractConversationSeedFromContents(contents) {
-    const users = contents.filter((content) => content?.role === "user");
+    const users = contents.filter((content) => content?.role === 'user');
     const firstUser = users[0];
     const lastUser = users.length > 0 ? users[users.length - 1] : undefined;
-    const primaryUser = firstUser && Array.isArray(firstUser.parts) ? extractTextFromContent(firstUser.parts) : "";
+    const primaryUser = firstUser && Array.isArray(firstUser.parts)
+        ? extractTextFromContent(firstUser.parts)
+        : '';
     if (primaryUser) {
         return primaryUser;
     }
     if (lastUser && Array.isArray(lastUser.parts)) {
         return extractTextFromContent(lastUser.parts);
     }
-    return "";
+    return '';
 }
 function resolveConversationKey(requestPayload) {
     const anyPayload = requestPayload;
@@ -202,20 +282,20 @@ function resolveConversationKey(requestPayload) {
         anyPayload.metadata?.threadId,
     ];
     for (const candidate of candidates) {
-        if (typeof candidate === "string" && candidate.trim()) {
+        if (typeof candidate === 'string' && candidate.trim()) {
             return candidate.trim();
         }
     }
-    const systemSeed = extractTextFromContent(anyPayload.systemInstruction?.parts
-        ?? anyPayload.systemInstruction
-        ?? anyPayload.system
-        ?? anyPayload.system_instruction);
+    const systemSeed = extractTextFromContent(anyPayload.systemInstruction?.parts ??
+        anyPayload.systemInstruction ??
+        anyPayload.system ??
+        anyPayload.system_instruction);
     const messageSeed = Array.isArray(anyPayload.messages)
         ? extractConversationSeedFromMessages(anyPayload.messages)
         : Array.isArray(anyPayload.contents)
             ? extractConversationSeedFromContents(anyPayload.contents)
-            : "";
-    const seed = [systemSeed, messageSeed].filter(Boolean).join("|");
+            : '';
+    const seed = [systemSeed, messageSeed].filter(Boolean).join('|');
     if (!seed) {
         return undefined;
     }
@@ -231,10 +311,10 @@ function resolveConversationKeyFromRequests(requestObjects) {
     return undefined;
 }
 function resolveProjectKey(candidate, fallback) {
-    if (typeof candidate === "string" && candidate.trim()) {
+    if (typeof candidate === 'string' && candidate.trim()) {
         return candidate.trim();
     }
-    if (typeof fallback === "string" && fallback.trim()) {
+    if (typeof fallback === 'string' && fallback.trim()) {
         return fallback.trim();
     }
     return undefined;
@@ -245,10 +325,10 @@ function formatDebugLinesForThinking(lines) {
         .filter((line) => line.length > 0)
         .slice(-50);
     const prelude = `[ThinkingResolution] source=debug_tui lines=${cleaned.length}`;
-    return `${DEBUG_MESSAGE_PREFIX}\n- ${prelude}\n${cleaned.map((line) => `- ${line}`).join("\n")}`;
+    return `${DEBUG_MESSAGE_PREFIX}\n- ${prelude}\n${cleaned.map((line) => `- ${line}`).join('\n')}`;
 }
 function injectDebugThinking(response, debugText) {
-    if (!response || typeof response !== "object") {
+    if (!response || typeof response !== 'object') {
         return response;
     }
     const resp = response;
@@ -256,9 +336,9 @@ function injectDebugThinking(response, debugText) {
         const candidates = resp.candidates.slice();
         const first = candidates[0];
         if (first &&
-            typeof first === "object" &&
+            typeof first === 'object' &&
             first.content &&
-            typeof first.content === "object" &&
+            typeof first.content === 'object' &&
             Array.isArray(first.content.parts)) {
             const parts = [{ thought: true, text: debugText }, ...first.content.parts];
             candidates[0] = { ...first, content: { ...first.content, parts } };
@@ -267,7 +347,7 @@ function injectDebugThinking(response, debugText) {
         return resp;
     }
     if (Array.isArray(resp.content)) {
-        const content = [{ type: "thinking", thinking: debugText }, ...resp.content];
+        const content = [{ type: 'thinking', thinking: debugText }, ...resp.content];
         return { ...resp, content };
     }
     if (!resp.reasoning_content) {
@@ -280,7 +360,7 @@ function injectDebugThinking(response, debugText) {
  * Injected via the same path as debug text (injectDebugThinking) to ensure consistent
  * signature caching and multi-turn handling.
  */
-const SYNTHETIC_THINKING_PLACEHOLDER = "[Thinking preserved]\n";
+const SYNTHETIC_THINKING_PLACEHOLDER = '[Thinking preserved]\n';
 function stripInjectedDebugFromParts(parts) {
     if (!Array.isArray(parts)) {
         return parts;
@@ -288,18 +368,20 @@ function stripInjectedDebugFromParts(parts) {
     // Use .map() with empty text sentinels instead of .filter() to preserve
     // array indices and prevent prompt cache invalidation.
     return parts.map((part) => {
-        if (!part || typeof part !== "object") {
+        if (!part || typeof part !== 'object') {
             return part;
         }
         const record = part;
-        const text = typeof record.text === "string"
+        const text = typeof record.text === 'string'
             ? record.text
-            : typeof record.thinking === "string"
+            : typeof record.thinking === 'string'
                 ? record.thinking
                 : undefined;
         // Replace debug blocks and synthetic thinking placeholders with empty text sentinel
-        if (text && (text.startsWith(DEBUG_MESSAGE_PREFIX) || text.startsWith(SYNTHETIC_THINKING_PLACEHOLDER.trim()))) {
-            const sentinel = { text: "." };
+        if (text &&
+            (text.startsWith(DEBUG_MESSAGE_PREFIX) ||
+                text.startsWith(SYNTHETIC_THINKING_PLACEHOLDER.trim()))) {
+            const sentinel = { text: '.' };
             if (record.cache_control !== undefined)
                 sentinel.cache_control = record.cache_control;
             return sentinel;
@@ -311,65 +393,150 @@ function stripInjectedDebugFromRequestPayload(payload) {
     const anyPayload = payload;
     if (Array.isArray(anyPayload.contents)) {
         anyPayload.contents = anyPayload.contents.map((content) => {
-            if (!content || typeof content !== "object") {
+            if (!content || typeof content !== 'object') {
                 return content;
             }
             if (Array.isArray(content.parts)) {
                 return { ...content, parts: stripInjectedDebugFromParts(content.parts) };
             }
             if (Array.isArray(content.content)) {
-                return { ...content, content: stripInjectedDebugFromParts(content.content) };
+                return {
+                    ...content,
+                    content: stripInjectedDebugFromParts(content.content),
+                };
             }
             return content;
         });
     }
     if (Array.isArray(anyPayload.messages)) {
         anyPayload.messages = anyPayload.messages.map((message) => {
-            if (!message || typeof message !== "object") {
+            if (!message || typeof message !== 'object') {
                 return message;
             }
             if (Array.isArray(message.content)) {
-                return { ...message, content: stripInjectedDebugFromParts(message.content) };
+                return {
+                    ...message,
+                    content: stripInjectedDebugFromParts(message.content),
+                };
             }
             return message;
         });
     }
 }
 function isValidRequestPart(part) {
-    if (!part || typeof part !== "object") {
+    if (!part || typeof part !== 'object') {
         return false;
     }
     const record = part;
-    return (Object.prototype.hasOwnProperty.call(record, "text") ||
-        Object.prototype.hasOwnProperty.call(record, "functionCall") ||
-        Object.prototype.hasOwnProperty.call(record, "functionResponse") ||
-        Object.prototype.hasOwnProperty.call(record, "inlineData") ||
-        Object.prototype.hasOwnProperty.call(record, "fileData") ||
-        Object.prototype.hasOwnProperty.call(record, "executableCode") ||
-        Object.prototype.hasOwnProperty.call(record, "codeExecutionResult") ||
-        Object.prototype.hasOwnProperty.call(record, "thought"));
+    return (Object.hasOwn(record, 'text') ||
+        Object.hasOwn(record, 'functionCall') ||
+        Object.hasOwn(record, 'functionResponse') ||
+        Object.hasOwn(record, 'inlineData') ||
+        Object.hasOwn(record, 'fileData') ||
+        Object.hasOwn(record, 'executableCode') ||
+        Object.hasOwn(record, 'codeExecutionResult') ||
+        Object.hasOwn(record, 'thought'));
+}
+function stripCacheControlFromParts(parts) {
+    if (!Array.isArray(parts)) {
+        return;
+    }
+    for (const part of parts) {
+        if (!part || typeof part !== 'object' || Array.isArray(part)) {
+            continue;
+        }
+        const record = part;
+        delete record.cache_control;
+        delete record.cacheControl;
+    }
+}
+function stripUnsupportedAntigravityFields(payload) {
+    delete payload.providerOptions;
+    delete payload.cached_content;
+    delete payload.cachedContent;
+    delete payload.cache_control;
+    delete payload.cacheControl;
+    const extraBody = payload.extra_body;
+    if (extraBody && typeof extraBody === 'object' && !Array.isArray(extraBody)) {
+        const extraBodyRecord = extraBody;
+        delete extraBodyRecord.cached_content;
+        delete extraBodyRecord.cachedContent;
+        delete extraBodyRecord.cache_control;
+        delete extraBodyRecord.cacheControl;
+        if (Object.keys(extraBodyRecord).length === 0) {
+            delete payload.extra_body;
+        }
+    }
+    const stripContentParts = (items) => {
+        if (!Array.isArray(items)) {
+            return;
+        }
+        for (const item of items) {
+            if (!item || typeof item !== 'object' || Array.isArray(item)) {
+                continue;
+            }
+            const record = item;
+            stripCacheControlFromParts(record.parts);
+            stripCacheControlFromParts(record.content);
+        }
+    };
+    stripContentParts(payload.contents);
+    stripContentParts(payload.messages);
+    for (const instructionKey of [
+        'systemInstruction',
+        'system_instruction',
+    ]) {
+        const instruction = payload[instructionKey];
+        if (instruction &&
+            typeof instruction === 'object' &&
+            !Array.isArray(instruction)) {
+            stripCacheControlFromParts(instruction.parts);
+        }
+    }
+}
+function configureAntigravityToolCalling(payload) {
+    if (!Array.isArray(payload.tools) || payload.tools.length === 0) {
+        delete payload.toolConfig;
+        return;
+    }
+    const toolConfig = payload.toolConfig &&
+        typeof payload.toolConfig === 'object' &&
+        !Array.isArray(payload.toolConfig)
+        ? payload.toolConfig
+        : {};
+    const functionCallingConfig = toolConfig.functionCallingConfig &&
+        typeof toolConfig.functionCallingConfig === 'object' &&
+        !Array.isArray(toolConfig.functionCallingConfig)
+        ? toolConfig.functionCallingConfig
+        : {};
+    functionCallingConfig.mode = 'VALIDATED';
+    toolConfig.functionCallingConfig = functionCallingConfig;
+    payload.toolConfig = toolConfig;
 }
 function sanitizeRequestPayloadForAntigravity(payload) {
     const anyPayload = payload;
     if (Array.isArray(anyPayload.contents)) {
         // Use .map() instead of .map().filter() to preserve array indices for prompt cache stability
-        anyPayload.contents = anyPayload.contents
-            .map((content) => {
-            if (!content || typeof content !== "object") {
+        anyPayload.contents = anyPayload.contents.map((content) => {
+            if (!content || typeof content !== 'object') {
                 // Preserve non-object entries as empty sentinel instead of filtering
-                return { role: "user", parts: [{ text: "." }] };
+                return { role: 'user', parts: [{ text: '.' }] };
             }
             const contentRecord = content;
-            const rawParts = Array.isArray(contentRecord.parts) ? contentRecord.parts : [];
+            const rawParts = Array.isArray(contentRecord.parts)
+                ? contentRecord.parts
+                : [];
             let foundFirstFunctionCall = false;
-            const sanitizedParts = rawParts.map((part) => {
+            const sanitizedParts = rawParts
+                .map((part) => {
                 // Replace invalid parts with sentinel to preserve array indices for cache stability
                 if (!isValidRequestPart(part)) {
-                    return { text: "." };
+                    return { text: '.' };
                 }
                 return part;
-            }).map((part) => {
-                if (part && typeof part === "object" && part.functionCall) {
+            })
+                .map((part) => {
+                if (part && typeof part === 'object' && part.functionCall) {
                     let sig = part.thoughtSignature || part.thought_signature;
                     // Only the first functionCall part in a block should have the signature.
                     // If it's the first one and missing a valid signature, inject the sentinel
@@ -397,7 +564,7 @@ function sanitizeRequestPayloadForAntigravity(payload) {
             });
             if (sanitizedParts.length === 0) {
                 // Preserve as empty text sentinel instead of filtering out
-                return { ...contentRecord, parts: [{ text: "." }] };
+                return { ...contentRecord, parts: [{ text: '.' }] };
             }
             return {
                 ...contentRecord,
@@ -407,23 +574,28 @@ function sanitizeRequestPayloadForAntigravity(payload) {
     }
     if (Array.isArray(anyPayload.messages)) {
         anyPayload.messages = anyPayload.messages.map((message) => {
-            if (!message || typeof message !== "object") {
-                return { role: "user", content: [{ type: "text", text: "." }] };
+            if (!message || typeof message !== 'object') {
+                return { role: 'user', content: [{ type: 'text', text: '.' }] };
             }
             const messageRecord = message;
-            const rawContent = Array.isArray(messageRecord.content) ? messageRecord.content : messageRecord.content;
+            const rawContent = Array.isArray(messageRecord.content)
+                ? messageRecord.content
+                : messageRecord.content;
             if (!Array.isArray(rawContent)) {
                 return messageRecord;
             }
             const sanitizedContent = rawContent.map((block) => {
-                if (!block || typeof block !== "object") {
-                    return { type: "text", text: "." };
+                if (!block || typeof block !== 'object') {
+                    return { type: 'text', text: '.' };
                 }
                 const blockRecord = block;
-                if (blockRecord.type === "text") {
+                if (blockRecord.type === 'text') {
                     const text = blockRecord.text;
-                    if (typeof text !== "string" || text.trim().length === 0) {
-                        const sentinel = { type: "text", text: "." };
+                    if (typeof text !== 'string' || text.trim().length === 0) {
+                        const sentinel = {
+                            type: 'text',
+                            text: '.',
+                        };
                         if (blockRecord.cache_control !== undefined)
                             sentinel.cache_control = blockRecord.cache_control;
                         return sentinel;
@@ -432,7 +604,7 @@ function sanitizeRequestPayloadForAntigravity(payload) {
                 return block;
             });
             if (sanitizedContent.length === 0) {
-                return { ...messageRecord, content: [{ type: "text", text: "." }] };
+                return { ...messageRecord, content: [{ type: 'text', text: '.' }] };
             }
             return {
                 ...messageRecord,
@@ -441,7 +613,9 @@ function sanitizeRequestPayloadForAntigravity(payload) {
         });
     }
     const systemInstruction = anyPayload.systemInstruction;
-    if (systemInstruction && typeof systemInstruction === "object" && !Array.isArray(systemInstruction)) {
+    if (systemInstruction &&
+        typeof systemInstruction === 'object' &&
+        !Array.isArray(systemInstruction)) {
         const sys = systemInstruction;
         if (Array.isArray(sys.parts)) {
             // Use .map() with sentinels instead of .filter() to preserve array indices
@@ -450,13 +624,16 @@ function sanitizeRequestPayloadForAntigravity(payload) {
                 if (isValidRequestPart(part))
                     return part;
                 const record = part;
-                const sentinel = { text: "." };
+                const sentinel = { text: '.' };
                 if (record?.cache_control !== undefined)
                     sentinel.cache_control = record.cache_control;
                 return sentinel;
             });
             // Only delete systemInstruction if ALL parts were invalid (all sentinels, no real content)
-            const hasRealContent = sanitizedSystemParts.some((p) => p && typeof p === "object" && typeof p.text === "string" && p.text !== ".");
+            const hasRealContent = sanitizedSystemParts.some((p) => p &&
+                typeof p === 'object' &&
+                typeof p.text === 'string' &&
+                p.text !== '.');
             if (hasRealContent) {
                 sys.parts = sanitizedSystemParts;
             }
@@ -467,31 +644,35 @@ function sanitizeRequestPayloadForAntigravity(payload) {
     }
 }
 function isGeminiToolUsePart(part) {
-    return !!(part && typeof part === "object" && (part.functionCall || part.tool_use || part.toolUse));
+    return !!(part &&
+        typeof part === 'object' &&
+        (part.functionCall || part.tool_use || part.toolUse));
 }
 function isGeminiThinkingPart(part) {
     return !!(part &&
-        typeof part === "object" &&
-        (part.thought === true || part.type === "thinking" || part.type === "reasoning"));
+        typeof part === 'object' &&
+        (part.thought === true ||
+            part.type === 'thinking' ||
+            part.type === 'reasoning'));
 }
 // Sentinel value used when signature recovery fails - allows Claude to handle gracefully
 // by redacting the thinking block instead of rejecting the request entirely.
 // Reference: LLM-API-Key-Proxy uses this pattern for Gemini 3 tool calls.
-const SENTINEL_SIGNATURE = "skip_thought_signature_validator";
+const SENTINEL_SIGNATURE = 'skip_thought_signature_validator';
 function getThinkingPartText(part) {
-    if (!part || typeof part !== "object") {
-        return "";
+    if (!part || typeof part !== 'object') {
+        return '';
     }
-    if (typeof part.text === "string") {
+    if (typeof part.text === 'string') {
         return part.text;
     }
-    if (typeof part.thinking === "string") {
+    if (typeof part.thinking === 'string') {
         return part.thinking;
     }
-    return "";
+    return '';
 }
 function hasCachedMatchingSignature(part, sessionId) {
-    if (!part || typeof part !== "object") {
+    if (!part || typeof part !== 'object') {
         return false;
     }
     const text = getThinkingPartText(part);
@@ -508,7 +689,7 @@ function hasCachedMatchingSignature(part, sessionId) {
     return part.signature === expectedSignature;
 }
 function ensureThoughtSignature(part, sessionId) {
-    if (!part || typeof part !== "object") {
+    if (!part || typeof part !== 'object') {
         return part;
     }
     if (!sessionId) {
@@ -521,20 +702,24 @@ function ensureThoughtSignature(part, sessionId) {
     if (part.thought === true) {
         return { ...part, thoughtSignature: SENTINEL_SIGNATURE };
     }
-    if (part.type === "thinking" || part.type === "reasoning" || part.type === "redacted_thinking") {
+    if (part.type === 'thinking' ||
+        part.type === 'reasoning' ||
+        part.type === 'redacted_thinking') {
         return { ...part, signature: SENTINEL_SIGNATURE };
     }
     return part;
 }
 function hasSignedThinkingPart(part, sessionId) {
-    if (!part || typeof part !== "object") {
+    if (!part || typeof part !== 'object') {
         return false;
     }
     if (part.thought === true) {
-        if (part.thoughtSignature === SENTINEL_SIGNATURE || part.thoughtSignature === SKIP_THOUGHT_SIGNATURE) {
+        if (part.thoughtSignature === SENTINEL_SIGNATURE ||
+            part.thoughtSignature === SKIP_THOUGHT_SIGNATURE) {
             return true;
         }
-        if (typeof part.thoughtSignature !== "string" || part.thoughtSignature.length < MIN_SIGNATURE_LENGTH) {
+        if (typeof part.thoughtSignature !== 'string' ||
+            part.thoughtSignature.length < MIN_SIGNATURE_LENGTH) {
             return false;
         }
         if (!sessionId) {
@@ -542,11 +727,15 @@ function hasSignedThinkingPart(part, sessionId) {
         }
         return hasCachedMatchingSignature(part, sessionId);
     }
-    if (part.type === "thinking" || part.type === "reasoning" || part.type === "redacted_thinking") {
-        if (part.signature === SENTINEL_SIGNATURE || part.signature === SKIP_THOUGHT_SIGNATURE) {
+    if (part.type === 'thinking' ||
+        part.type === 'reasoning' ||
+        part.type === 'redacted_thinking') {
+        if (part.signature === SENTINEL_SIGNATURE ||
+            part.signature === SKIP_THOUGHT_SIGNATURE) {
             return true;
         }
-        if (typeof part.signature !== "string" || part.signature.length < MIN_SIGNATURE_LENGTH) {
+        if (typeof part.signature !== 'string' ||
+            part.signature.length < MIN_SIGNATURE_LENGTH) {
             return false;
         }
         if (!sessionId) {
@@ -558,11 +747,13 @@ function hasSignedThinkingPart(part, sessionId) {
 }
 function ensureThinkingBeforeToolUseInContents(contents, signatureSessionKey) {
     return contents.map((content) => {
-        if (!content || typeof content !== "object" || !Array.isArray(content.parts)) {
+        if (!content ||
+            typeof content !== 'object' ||
+            !Array.isArray(content.parts)) {
             return content;
         }
         const role = content.role;
-        if (role !== "model" && role !== "assistant") {
+        if (role !== 'model' && role !== 'assistant') {
             return content;
         }
         const parts = content.parts;
@@ -571,22 +762,31 @@ function ensureThinkingBeforeToolUseInContents(contents, signatureSessionKey) {
             return content;
         }
         // Check if any thinking part has a valid signed signature
-        const hasSignedThinking = parts.some(p => isGeminiThinkingPart(p) && hasSignedThinkingPart(ensureThoughtSignature(p, signatureSessionKey), signatureSessionKey));
+        const hasSignedThinking = parts.some((p) => isGeminiThinkingPart(p) &&
+            hasSignedThinkingPart(ensureThoughtSignature(p, signatureSessionKey), signatureSessionKey));
         if (hasSignedThinking) {
             // Ensure signatures on thinking parts in-place — NO reordering to preserve array indices (cache-friendly)
-            return { ...content, parts: parts.map(p => isGeminiThinkingPart(p) ? ensureThoughtSignature(p, signatureSessionKey) : p) };
+            return {
+                ...content,
+                parts: parts.map((p) => isGeminiThinkingPart(p)
+                    ? ensureThoughtSignature(p, signatureSessionKey)
+                    : p),
+            };
         }
         // Replace thinking parts with sentinels in-place to preserve array indices (cache-friendly).
         // Deleting parts via .filter() shifts array indices → changes hash → busts prompt cache.
         const lastThinking = defaultSignatureStore.get(signatureSessionKey);
-        log.debug("Replacing thinking with sentinels in-place", { signatureSessionKey, hasCachedSig: !!lastThinking });
-        const newParts = parts.map(p => {
+        log.debug('Replacing thinking with sentinels in-place', {
+            signatureSessionKey,
+            hasCachedSig: !!lastThinking,
+        });
+        const newParts = parts.map((p) => {
             if (!isGeminiThinkingPart(p))
                 return p;
             const cc = p.cache_control;
             // Use plain empty text part — thinking-format sentinels get converted by the proxy
             // into Claude thinking blocks missing the required `thinking` field.
-            const sentinel = { text: "." };
+            const sentinel = { text: '.' };
             if (cc)
                 sentinel.cache_control = cc;
             return sentinel;
@@ -595,10 +795,10 @@ function ensureThinkingBeforeToolUseInContents(contents, signatureSessionKey) {
     });
 }
 function ensureMessageThinkingSignature(block, sessionId) {
-    if (!block || typeof block !== "object") {
+    if (!block || typeof block !== 'object') {
         return block;
     }
-    if (block.type !== "thinking" && block.type !== "redacted_thinking") {
+    if (block.type !== 'thinking' && block.type !== 'redacted_thinking') {
         return block;
     }
     const text = getThinkingPartText(block);
@@ -612,7 +812,9 @@ function ensureMessageThinkingSignature(block, sessionId) {
 }
 function hasToolUseInContents(contents) {
     return contents.some((content) => {
-        if (!content || typeof content !== "object" || !Array.isArray(content.parts)) {
+        if (!content ||
+            typeof content !== 'object' ||
+            !Array.isArray(content.parts)) {
             return false;
         }
         return content.parts.some(isGeminiToolUsePart);
@@ -620,7 +822,9 @@ function hasToolUseInContents(contents) {
 }
 function hasSignedThinkingInContents(contents, sessionId) {
     return contents.some((content) => {
-        if (!content || typeof content !== "object" || !Array.isArray(content.parts)) {
+        if (!content ||
+            typeof content !== 'object' ||
+            !Array.isArray(content.parts)) {
             return false;
         }
         return content.parts.some((part) => hasSignedThinkingPart(part, sessionId));
@@ -628,15 +832,21 @@ function hasSignedThinkingInContents(contents, sessionId) {
 }
 function hasToolUseInMessages(messages) {
     return messages.some((message) => {
-        if (!message || typeof message !== "object" || !Array.isArray(message.content)) {
+        if (!message ||
+            typeof message !== 'object' ||
+            !Array.isArray(message.content)) {
             return false;
         }
-        return message.content.some((block) => block && typeof block === "object" && (block.type === "tool_use" || block.type === "tool_result"));
+        return message.content.some((block) => block &&
+            typeof block === 'object' &&
+            (block.type === 'tool_use' || block.type === 'tool_result'));
     });
 }
 function hasSignedThinkingInMessages(messages, sessionId) {
     return messages.some((message) => {
-        if (!message || typeof message !== "object" || !Array.isArray(message.content)) {
+        if (!message ||
+            typeof message !== 'object' ||
+            !Array.isArray(message.content)) {
             return false;
         }
         return message.content.some((block) => hasSignedThinkingPart(block, sessionId));
@@ -644,40 +854,64 @@ function hasSignedThinkingInMessages(messages, sessionId) {
 }
 function ensureThinkingBeforeToolUseInMessages(messages, signatureSessionKey) {
     return messages.map((message) => {
-        if (!message || typeof message !== "object" || !Array.isArray(message.content)) {
+        if (!message ||
+            typeof message !== 'object' ||
+            !Array.isArray(message.content)) {
             return message;
         }
-        if (message.role !== "assistant") {
+        if (message.role !== 'assistant') {
             return message;
         }
         const blocks = message.content;
-        const hasToolUse = blocks.some((b) => b && typeof b === "object" && (b.type === "tool_use" || b.type === "tool_result"));
+        const hasToolUse = blocks.some((b) => b &&
+            typeof b === 'object' &&
+            (b.type === 'tool_use' || b.type === 'tool_result'));
         if (!hasToolUse) {
             return message;
         }
-        const isThinkingBlock = (b) => b && typeof b === "object" && (b.type === "thinking" || b.type === "redacted_thinking");
+        const isThinkingBlock = (b) => b &&
+            typeof b === 'object' &&
+            (b.type === 'thinking' || b.type === 'redacted_thinking');
         // Check if any thinking block has a valid signed signature
-        const hasSignedThinking = blocks.some((b) => isThinkingBlock(b) && hasSignedThinkingPart(ensureMessageThinkingSignature(b, signatureSessionKey), signatureSessionKey));
+        const hasSignedThinking = blocks.some((b) => isThinkingBlock(b) &&
+            hasSignedThinkingPart(ensureMessageThinkingSignature(b, signatureSessionKey), signatureSessionKey));
         if (hasSignedThinking) {
             // Ensure signatures on thinking blocks in-place — NO reordering to preserve array indices (cache-friendly)
-            return { ...message, content: blocks.map((b) => isThinkingBlock(b) ? ensureMessageThinkingSignature(b, signatureSessionKey) : b) };
+            return {
+                ...message,
+                content: blocks.map((b) => isThinkingBlock(b)
+                    ? ensureMessageThinkingSignature(b, signatureSessionKey)
+                    : b),
+            };
         }
         // Replace thinking blocks with sentinels in-place to preserve array indices (cache-friendly).
         // Deleting/reordering via .filter() shifts indices → changes hash → busts prompt cache.
         const lastThinking = defaultSignatureStore.get(signatureSessionKey);
-        log.debug("Replacing thinking with sentinels in-place (Messages format)", { signatureSessionKey, hasCachedSig: !!lastThinking });
-        return { ...message, content: blocks.map((b) => {
+        log.debug('Replacing thinking with sentinels in-place (Messages format)', {
+            signatureSessionKey,
+            hasCachedSig: !!lastThinking,
+        });
+        return {
+            ...message,
+            content: blocks.map((b) => {
                 if (!isThinkingBlock(b))
                     return b;
-                const thinkingText = lastThinking ? lastThinking.text : (typeof b.thinking === "string" ? b.thinking : typeof b.text === "string" ? b.text : "");
+                const _thinkingText = lastThinking
+                    ? lastThinking.text
+                    : typeof b.thinking === 'string'
+                        ? b.thinking
+                        : typeof b.text === 'string'
+                            ? b.text
+                            : '';
                 const cc = b.cache_control;
                 // Use plain empty text part — thinking-format sentinels get converted by the proxy
                 // into Claude thinking blocks missing the required `thinking` field.
-                const sentinel = { text: "." };
+                const sentinel = { text: '.' };
                 if (cc)
                     sentinel.cache_control = cc;
                 return sentinel;
-            }) };
+            }),
+        };
     });
 }
 /**
@@ -690,18 +924,18 @@ let _lastCacheStats = null;
 export function getLastCacheStats() {
     return _lastCacheStats;
 }
-const STREAM_ACTION = "streamGenerateContent";
+const STREAM_ACTION = 'streamGenerateContent';
 /**
  * Extract a URL string from any fetch() input shape (string, URL, or Request).
  */
 export function fetchInputToUrl(input) {
-    if (typeof input === "string")
+    if (typeof input === 'string')
         return input;
     if (input instanceof URL)
         return input.href;
     // Request-like object
     const url = input.url;
-    return typeof url === "string" ? url : String(input);
+    return typeof url === 'string' ? url : String(input);
 }
 /**
  * Detects requests headed to the Google Generative Language API so we can
@@ -710,12 +944,12 @@ export function fetchInputToUrl(input) {
  * interceptor entirely.
  */
 export function isGenerativeLanguageRequest(input) {
-    return fetchInputToUrl(input).includes("generativelanguage.googleapis.com");
+    return fetchInputToUrl(input).includes('generativelanguage.googleapis.com');
 }
-export function prepareAntigravityRequest(input, init, accessToken, projectId, endpointOverride, headerStyle = "antigravity", forceThinkingRecovery = false, options) {
+export function prepareAntigravityRequest(input, init, accessToken, projectId, endpointOverride, headerStyle = 'antigravity', forceThinkingRecovery = false, options) {
     const baseInit = { ...init };
     const headers = new Headers(init?.headers ?? {});
-    let resolvedProjectId = projectId?.trim() || "";
+    let resolvedProjectId = projectId?.trim() || '';
     let toolDebugMissing = 0;
     const toolDebugSummaries = [];
     let toolDebugPayload;
@@ -730,14 +964,16 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
             headerStyle,
         };
     }
-    headers.set("Authorization", `Bearer ${accessToken}`);
-    headers.delete("x-api-key");
-    headers.delete("x-goog-api-key");
-    headers.delete("x-session-affinity");
+    headers.set('Authorization', `Bearer ${accessToken}`);
+    headers.delete('x-api-key');
+    headers.delete('x-goog-api-key');
+    headers.delete('x-session-affinity');
+    headers.delete('x-session-id');
+    headers.delete('x-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.
-    headers.delete("x-goog-user-project");
+    headers.delete('x-goog-user-project');
     const urlString = fetchInputToUrl(input);
     const match = urlString.match(/\/models\/([^:]+):(\w+)/);
     if (!match) {
@@ -748,14 +984,14 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
             headerStyle,
         };
     }
-    const [, rawModel = "", rawAction = ""] = match;
+    const [, rawModel = '', rawAction = ''] = match;
     const requestedModel = rawModel;
     const resolved = resolveModelForHeaderStyle(rawModel, headerStyle);
     let effectiveModel = resolved.actualModel;
     const streaming = rawAction === STREAM_ACTION;
-    const defaultEndpoint = headerStyle === "gemini-cli" ? GEMINI_CLI_ENDPOINT : ANTIGRAVITY_ENDPOINT;
+    const defaultEndpoint = headerStyle === 'gemini-cli' ? GEMINI_CLI_ENDPOINT : ANTIGRAVITY_ENDPOINT;
     const baseEndpoint = endpointOverride ?? defaultEndpoint;
-    const transformedUrl = `${baseEndpoint}/v1internal:${rawAction}${streaming ? "?alt=sse" : ""}`;
+    const transformedUrl = `${baseEndpoint}/v1internal:${rawAction}${streaming ? '?alt=sse' : ''}`;
     const isClaude = isClaudeModel(resolved.actualModel);
     const isClaudeThinking = isClaudeThinkingModel(resolved.actualModel);
     const keepThinkingEnabled = getKeepThinking();
@@ -764,24 +1000,23 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
     let tierThinkingLevel = resolved.thinkingLevel;
     let signatureSessionKey = buildSignatureSessionKey(PLUGIN_SESSION_ID, effectiveModel, undefined, resolveProjectKey(projectId));
     let body = baseInit.body;
-    if (typeof baseInit.body === "string" && baseInit.body) {
+    if (typeof baseInit.body === 'string' && baseInit.body) {
         try {
             const parsedBody = JSON.parse(baseInit.body);
-            const isWrapped = typeof parsedBody.project === "string" && "request" in parsedBody;
+            const isWrapped = typeof parsedBody.project === 'string' && 'request' in parsedBody;
             if (isWrapped) {
                 const wrappedBody = {
                     ...parsedBody,
                     model: effectiveModel,
                 };
-                if (headerStyle === "antigravity") {
-                    if (typeof wrappedBody.requestId !== "string" || !wrappedBody.requestId) {
-                        wrappedBody.requestId = buildAntigravityRequestId("agent");
+                if (headerStyle === 'antigravity') {
+                    if (typeof wrappedBody.userAgent !== 'string' ||
+                        !wrappedBody.userAgent) {
+                        wrappedBody.userAgent = 'antigravity';
                     }
-                    if (typeof wrappedBody.userAgent !== "string" || !wrappedBody.userAgent) {
-                        wrappedBody.userAgent = "antigravity";
-                    }
-                    if (typeof wrappedBody.requestType !== "string" || !wrappedBody.requestType) {
-                        wrappedBody.requestType = "agent";
+                    if (typeof wrappedBody.requestType !== 'string' ||
+                        !wrappedBody.requestType) {
+                        wrappedBody.requestType = 'agent';
                     }
                 }
                 // Some callers may already send an Antigravity-wrapped body.
@@ -789,96 +1024,151 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                 // and attach a stable sessionId so multi-turn signature caching works.
                 const requestRoot = wrappedBody.request;
                 const requestObjects = [];
-                if (requestRoot && typeof requestRoot === "object") {
+                if (requestRoot && typeof requestRoot === 'object') {
                     requestObjects.push(requestRoot);
                     const nested = requestRoot.request;
-                    if (nested && typeof nested === "object") {
+                    if (nested && typeof nested === 'object') {
                         requestObjects.push(nested);
                     }
                 }
                 const conversationKey = resolveConversationKeyFromRequests(requestObjects);
                 // Strip tier suffix from model for cache key to prevent cache misses on tier change
                 // e.g., "claude-opus-4-6-thinking-high" -> "claude-opus-4-6-thinking"
-                const modelForCacheKey = effectiveModel.replace(/-(minimal|low|medium|high)$/i, "");
+                const modelForCacheKey = effectiveModel.replace(/-(minimal|low|medium|high)$/i, '');
                 signatureSessionKey = buildSignatureSessionKey(PLUGIN_SESSION_ID, modelForCacheKey, conversationKey, resolveProjectKey(parsedBody.project));
                 if (requestObjects.length > 0) {
                     sessionId = signatureSessionKey;
                 }
                 for (const req of requestObjects) {
-                    // Use stable session ID for signature caching across multi-turn conversations
-                    req.sessionId = signatureSessionKey;
                     stripInjectedDebugFromRequestPayload(req);
                     if (isClaude) {
                         // Step 0: Sanitize cross-model metadata (strips Gemini signatures when sending to Claude)
-                        sanitizeCrossModelPayloadInPlace(req, { targetModel: effectiveModel });
+                        sanitizeCrossModelPayloadInPlace(req, {
+                            targetModel: effectiveModel,
+                        });
                         // Step 1: Strip corrupted/unsigned thinking blocks FIRST
                         deepFilterThinkingBlocks(req, signatureSessionKey, getCachedSignature, true);
                         // Step 2: THEN inject signed thinking from cache (after stripping)
-                        if (isClaudeThinking && keepThinkingEnabled && Array.isArray(req.contents)) {
+                        if (isClaudeThinking &&
+                            keepThinkingEnabled &&
+                            Array.isArray(req.contents)) {
+                            ;
                             req.contents = ensureThinkingBeforeToolUseInContents(req.contents, signatureSessionKey);
                         }
-                        if (isClaudeThinking && keepThinkingEnabled && Array.isArray(req.messages)) {
+                        if (isClaudeThinking &&
+                            keepThinkingEnabled &&
+                            Array.isArray(req.messages)) {
+                            ;
                             req.messages = ensureThinkingBeforeToolUseInMessages(req.messages, signatureSessionKey);
                         }
                         // Step 3: Apply tool pairing fixes (ID assignment, response matching, orphan recovery)
                         applyToolPairingFixes(req, true);
                     }
+                    if (headerStyle === 'antigravity') {
+                        sanitizeRequestPayloadForAntigravity(req);
+                        stripUnsupportedAntigravityFields(req);
+                        configureAntigravityToolCalling(req);
+                    }
                 }
-                // Guard against assistant prefill: Claude rejects conversations ending
-                // with model/assistant messages. After context compaction, the conversation
-                // can end with a model message — append synthetic user message to fix.
-                if (isClaude) {
+                // 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]" }] });
+                            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 (lastMessage?.role === 'model' ||
+                                lastMessage?.role === 'assistant') {
+                                messages.push({ role: 'user', parts: [{ text: '[Continue]' }] });
                             }
                         }
                     }
                 }
                 if (isClaudeThinking && keepThinkingEnabled && sessionId) {
-                    const hasToolUse = requestObjects.some((req) => (Array.isArray(req.contents) && hasToolUseInContents(req.contents)) ||
-                        (Array.isArray(req.messages) && hasToolUseInMessages(req.messages)));
-                    const hasSignedThinking = requestObjects.some((req) => (Array.isArray(req.contents) && hasSignedThinkingInContents(req.contents, signatureSessionKey)) ||
-                        (Array.isArray(req.messages) && hasSignedThinkingInMessages(req.messages, signatureSessionKey)));
+                    const hasToolUse = requestObjects.some((req) => (Array.isArray(req.contents) &&
+                        hasToolUseInContents(req.contents)) ||
+                        (Array.isArray(req.messages) &&
+                            hasToolUseInMessages(req.messages)));
+                    const hasSignedThinking = requestObjects.some((req) => (Array.isArray(req.contents) &&
+                        hasSignedThinkingInContents(req.contents, signatureSessionKey)) ||
+                        (Array.isArray(req.messages) &&
+                            hasSignedThinkingInMessages(req.messages, signatureSessionKey)));
                     const hasCachedThinking = defaultSignatureStore.has(signatureSessionKey);
-                    needsSignedThinkingWarmup = hasToolUse && !hasSignedThinking && !hasCachedThinking;
+                    needsSignedThinkingWarmup =
+                        hasToolUse && !hasSignedThinking && !hasCachedThinking;
+                }
+                const wireRequest = requestObjects.at(-1);
+                if (wireRequest) {
+                    if (headerStyle === 'antigravity') {
+                        const metadata = buildAgyAgentRequestMetadata(options?.agySession ?? DEFAULT_AGY_REQUEST_SESSION, wireRequest, effectiveModel, options?.agyRequestTimestamp);
+                        wrappedBody.requestId = metadata.requestId;
+                        wireRequest.sessionId = metadata.sessionId;
+                        wireRequest.labels = metadata.labels;
+                        orderAgyRequestPayloadInPlace(wireRequest);
+                    }
+                    else {
+                        wireRequest.sessionId = signatureSessionKey;
+                    }
                 }
-                body = safeStringify(headerStyle === "antigravity" ? orderAntigravityEnvelope(wrappedBody) : wrappedBody);
+                body = safeStringify(headerStyle === 'antigravity'
+                    ? orderAntigravityEnvelope(wrappedBody)
+                    : wrappedBody);
             }
             else {
                 const requestPayload = { ...parsedBody };
+                if (headerStyle === 'antigravity' &&
+                    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
+                    // image quota and writing unrelated image files.
+                    effectiveModel = 'gemini-3.5-flash-low';
+                    tierThinkingBudget = 4000;
+                    tierThinkingLevel = undefined;
+                }
                 const rawGenerationConfig = requestPayload.generationConfig;
                 const extraBody = requestPayload.extra_body;
                 const variantConfig = extractVariantThinkingConfig(requestPayload.providerOptions, rawGenerationConfig);
-                const isGemini3 = effectiveModel.toLowerCase().includes("gemini-3");
-                log.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)}`);
+                const isGemini3 = effectiveModel.toLowerCase().includes('gemini-3');
+                log.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
+                // resolve the requested variant. It is never part of the Google wire schema.
+                delete requestPayload.providerOptions;
                 if (variantConfig?.thinkingLevel && isGemini3) {
                     // Gemini 3 native format - use thinkingLevel directly
                     const variantModelBase = rawModel
-                        .replace(/-preview-customtools$/i, "")
-                        .replace(/-preview$/i, "")
-                        .replace(/-(minimal|low|medium|high)$/i, "");
+                        .replace(/-preview-customtools$/i, '')
+                        .replace(/-preview$/i, '')
+                        .replace(/-(minimal|low|medium|high)$/i, '');
                     const variantResolved = resolveModelForHeaderStyle(`${variantModelBase}-${variantConfig.thinkingLevel}`, headerStyle);
                     effectiveModel = variantResolved.actualModel;
                     tierThinkingBudget = variantResolved.thinkingBudget;
-                    tierThinkingLevel = variantResolved.thinkingLevel ?? (variantResolved.thinkingBudget ? undefined : variantConfig.thinkingLevel);
+                    tierThinkingLevel =
+                        variantResolved.thinkingLevel ??
+                            (variantResolved.thinkingBudget
+                                ? undefined
+                                : variantConfig.thinkingLevel);
                 }
                 else if (variantConfig?.thinkingBudget) {
                     if (isGemini3) {
                         // Legacy format for Gemini 3 - convert with deprecation warning
-                        log.warn("[Deprecated] Using thinkingBudget for Gemini 3 model. Use thinkingLevel instead.");
-                        tierThinkingLevel = variantConfig.thinkingBudget <= 8192 ? "low"
-                            : variantConfig.thinkingBudget <= 16384 ? "medium" : "high";
+                        log.warn('[Deprecated] Using thinkingBudget for Gemini 3 model. Use thinkingLevel instead.');
+                        tierThinkingLevel =
+                            variantConfig.thinkingBudget <= 8192
+                                ? 'low'
+                                : variantConfig.thinkingBudget <= 16384
+                                    ? 'medium'
+                                    : 'high';
                         tierThinkingBudget = undefined;
                     }
                     else {
@@ -887,27 +1177,17 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                         tierThinkingLevel = undefined;
                     }
                 }
-                if (isClaude) {
-                    if (!requestPayload.toolConfig) {
-                        requestPayload.toolConfig = {};
-                    }
-                    if (typeof requestPayload.toolConfig === "object" && requestPayload.toolConfig !== null) {
-                        const toolConfig = requestPayload.toolConfig;
-                        if (!toolConfig.functionCallingConfig) {
-                            toolConfig.functionCallingConfig = {};
-                        }
-                        if (typeof toolConfig.functionCallingConfig === "object" && toolConfig.functionCallingConfig !== null) {
-                            toolConfig.functionCallingConfig.mode = "VALIDATED";
-                        }
-                    }
-                }
                 // 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 ? undefined : extractThinkingConfig(requestPayload, rawGenerationConfig, extraBody);
+                const userThinkingConfig = isImageModel
+                    ? undefined
+                    : extractThinkingConfig(requestPayload, rawGenerationConfig, extraBody);
                 const hasAssistantHistory = Array.isArray(requestPayload.contents) &&
-                    requestPayload.contents.some((c) => c?.role === "model" || c?.role === "assistant");
-                const effectiveUserThinkingConfig = isImageModel ? undefined : userThinkingConfig;
+                    requestPayload.contents.some((c) => c?.role === 'model' || c?.role === 'assistant');
+                const effectiveUserThinkingConfig = isImageModel
+                    ? undefined
+                    : userThinkingConfig;
                 // For image models, add imageConfig instead of thinkingConfig
                 if (isImageModel) {
                     const imageConfig = buildImageGenerationConfig();
@@ -923,11 +1203,26 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                     // Add safety settings for image generation (permissive to allow creative content)
                     if (!requestPayload.safetySettings) {
                         requestPayload.safetySettings = [
-                            { category: "HARM_CATEGORY_HARASSMENT", threshold: "BLOCK_ONLY_HIGH" },
-                            { category: "HARM_CATEGORY_HATE_SPEECH", threshold: "BLOCK_ONLY_HIGH" },
-                            { category: "HARM_CATEGORY_SEXUALLY_EXPLICIT", threshold: "BLOCK_ONLY_HIGH" },
-                            { category: "HARM_CATEGORY_DANGEROUS_CONTENT", threshold: "BLOCK_ONLY_HIGH" },
-                            { category: "HARM_CATEGORY_CIVIC_INTEGRITY", threshold: "BLOCK_ONLY_HIGH" },
+                            {
+                                category: 'HARM_CATEGORY_HARASSMENT',
+                                threshold: 'BLOCK_ONLY_HIGH',
+                            },
+                            {
+                                category: 'HARM_CATEGORY_HATE_SPEECH',
+                                threshold: 'BLOCK_ONLY_HIGH',
+                            },
+                            {
+                                category: 'HARM_CATEGORY_SEXUALLY_EXPLICIT',
+                                threshold: 'BLOCK_ONLY_HIGH',
+                            },
+                            {
+                                category: 'HARM_CATEGORY_DANGEROUS_CONTENT',
+                                threshold: 'BLOCK_ONLY_HIGH',
+                            },
+                            {
+                                category: 'HARM_CATEGORY_CIVIC_INTEGRITY',
+                                threshold: 'BLOCK_ONLY_HIGH',
+                            },
                         ];
                     }
                     // Image models don't support tools - remove them entirely
@@ -936,7 +1231,11 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                     // Replace system instruction with a simple image generation prompt
                     // Image models should not receive agentic coding assistant instructions
                     requestPayload.systemInstruction = {
-                        parts: [{ text: "You are an AI image generator. Generate images based on user descriptions. Focus on creating high-quality, visually appealing images that match the user's request." }]
+                        parts: [
+                            {
+                                text: "You are an AI image generator. Generate images based on user descriptions. Focus on creating high-quality, visually appealing images that match the user's request.",
+                            },
+                        ],
                     };
                 }
                 else {
@@ -947,11 +1246,11 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                         const thinkingBudget = tierThinkingBudget ?? normalizedThinking.thinkingBudget;
                         // Build thinking config based on model type
                         let thinkingConfig;
-                        if (isClaudeThinking && headerStyle !== "antigravity") {
+                        if (isClaudeThinking && headerStyle !== 'antigravity') {
                             // Claude-on-Gemini fallback uses snake_case keys.
                             thinkingConfig = {
                                 include_thoughts: normalizedThinking.includeThoughts ?? true,
-                                ...(typeof thinkingBudget === "number" && thinkingBudget > 0
+                                ...(typeof thinkingBudget === 'number' && thinkingBudget > 0
                                     ? { thinking_budget: thinkingBudget }
                                     : {}),
                             };
@@ -967,19 +1266,25 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                             // Gemini 2.5 and others use numeric budget
                             thinkingConfig = {
                                 includeThoughts: normalizedThinking.includeThoughts,
-                                ...(typeof thinkingBudget === "number" && thinkingBudget > 0 ? { thinkingBudget } : {}),
+                                ...(typeof thinkingBudget === 'number' && thinkingBudget > 0
+                                    ? { thinkingBudget }
+                                    : {}),
                             };
                         }
                         if (rawGenerationConfig) {
                             rawGenerationConfig.thinkingConfig = thinkingConfig;
                             applyAgyGenerationDefaults(effectiveModel, rawGenerationConfig, headerStyle);
-                            if (isClaudeThinking && typeof thinkingBudget === "number" && thinkingBudget > 0) {
-                                const currentMax = (rawGenerationConfig.maxOutputTokens ?? rawGenerationConfig.max_output_tokens);
-                                if (headerStyle === "antigravity" && !currentMax) {
+                            if (isClaudeThinking &&
+                                typeof thinkingBudget === 'number' &&
+                                thinkingBudget > 0) {
+                                const currentMax = (rawGenerationConfig.maxOutputTokens ??
+                                    rawGenerationConfig.max_output_tokens);
+                                if (headerStyle === 'antigravity' && !currentMax) {
                                     rawGenerationConfig.maxOutputTokens = 64000;
                                 }
                                 else if (!currentMax || currentMax <= thinkingBudget) {
-                                    rawGenerationConfig.maxOutputTokens = computeClaudeMaxOutputTokens(thinkingBudget);
+                                    rawGenerationConfig.maxOutputTokens =
+                                        computeClaudeMaxOutputTokens(thinkingBudget);
                                 }
                                 if (rawGenerationConfig.max_output_tokens !== undefined) {
                                     delete rawGenerationConfig.max_output_tokens;
@@ -988,11 +1293,16 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                             requestPayload.generationConfig = rawGenerationConfig;
                         }
                         else {
-                            const generationConfig = { thinkingConfig };
-                            if (isClaudeThinking && typeof thinkingBudget === "number" && thinkingBudget > 0) {
-                                generationConfig.maxOutputTokens = headerStyle === "antigravity"
-                                    ? 64000
-                                    : computeClaudeMaxOutputTokens(thinkingBudget);
+                            const generationConfig = {
+                                thinkingConfig,
+                            };
+                            if (isClaudeThinking &&
+                                typeof thinkingBudget === 'number' &&
+                                thinkingBudget > 0) {
+                                generationConfig.maxOutputTokens =
+                                    headerStyle === 'antigravity'
+                                        ? 64000
+                                        : computeClaudeMaxOutputTokens(thinkingBudget);
                             }
                             applyAgyGenerationDefaults(effectiveModel, generationConfig, headerStyle);
                             requestPayload.generationConfig = generationConfig;
@@ -1015,29 +1325,38 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                 }
                 delete requestPayload.thinkingConfig;
                 delete requestPayload.thinking;
-                if ("system_instruction" in requestPayload) {
+                if ('system_instruction' in requestPayload) {
                     requestPayload.systemInstruction = requestPayload.system_instruction;
                     delete requestPayload.system_instruction;
                 }
-                // Normalize cached_content → cachedContent (camelCase) but preserve the value.
-                // OpenCode uses cachedContent for prompt caching — deleting it busts cache.
-                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;
-                }
-                // Only delete the snake_case duplicate — preserve camelCase
-                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;
+                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).
@@ -1049,39 +1368,46 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                         const normalizeSchema = (schema) => {
                             const createPlaceholderSchema = (base = {}) => ({
                                 ...base,
-                                type: "object",
+                                type: 'object',
                                 properties: {
                                     [EMPTY_SCHEMA_PLACEHOLDER_NAME]: {
-                                        type: "boolean",
+                                        type: 'boolean',
                                         description: EMPTY_SCHEMA_PLACEHOLDER_DESCRIPTION,
                                     },
                                 },
                                 required: [EMPTY_SCHEMA_PLACEHOLDER_NAME],
                             });
-                            if (!schema || typeof schema !== "object" || Array.isArray(schema)) {
+                            if (!schema ||
+                                typeof schema !== 'object' ||
+                                Array.isArray(schema)) {
                                 toolDebugMissing += 1;
                                 return createPlaceholderSchema();
                             }
                             const cleaned = cleanJSONSchemaForAntigravity(schema);
-                            if (!cleaned || typeof cleaned !== "object" || Array.isArray(cleaned)) {
+                            if (!cleaned ||
+                                typeof cleaned !== 'object' ||
+                                Array.isArray(cleaned)) {
                                 toolDebugMissing += 1;
                                 return createPlaceholderSchema();
                             }
                             // Claude VALIDATED mode requires tool parameters to be an object schema
                             // with at least one property.
                             const hasProperties = cleaned.properties &&
-                                typeof cleaned.properties === "object" &&
+                                typeof cleaned.properties === 'object' &&
                                 Object.keys(cleaned.properties).length > 0;
-                            cleaned.type = "object";
+                            cleaned.type = 'object';
                             if (!hasProperties) {
                                 cleaned.properties = {
                                     [EMPTY_SCHEMA_PLACEHOLDER_NAME]: {
-                                        type: "boolean",
+                                        type: 'boolean',
                                         description: EMPTY_SCHEMA_PLACEHOLDER_DESCRIPTION,
                                     },
                                 };
                                 cleaned.required = Array.isArray(cleaned.required)
-                                    ? Array.from(new Set([...cleaned.required, EMPTY_SCHEMA_PLACEHOLDER_NAME]))
+                                    ? Array.from(new Set([
+                                        ...cleaned.required,
+                                        EMPTY_SCHEMA_PLACEHOLDER_NAME,
+                                    ]))
                                     : [EMPTY_SCHEMA_PLACEHOLDER_NAME];
                             }
                             return cleaned;
@@ -1109,21 +1435,26 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                                     tool.custom?.name ||
                                     `tool-${functionDeclarations.length}`;
                                 // Sanitize tool name: must be alphanumeric with underscores, no special chars
-                                name = String(name).replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 64);
+                                name = String(name)
+                                    .replace(/[^a-zA-Z0-9_-]/g, '_')
+                                    .slice(0, 64);
                                 const description = decl?.description ||
                                     tool.description ||
                                     tool.function?.description ||
                                     tool.custom?.description ||
-                                    "";
+                                    '';
                                 functionDeclarations.push({
                                     name,
-                                    description: String(description || ""),
+                                    description: String(description || ''),
                                     parameters: normalizeSchema(schema),
                                 });
-                                toolDebugSummaries.push(`decl=${name},src=${source},hasSchema=${schema ? "y" : "n"}`);
+                                toolDebugSummaries.push(`decl=${name},src=${source},hasSchema=${schema ? 'y' : 'n'}`);
                             };
-                            if (Array.isArray(tool.functionDeclarations) && tool.functionDeclarations.length > 0) {
-                                tool.functionDeclarations.forEach((decl) => pushDeclaration(decl, "functionDeclarations"));
+                            if (Array.isArray(tool.functionDeclarations) &&
+                                tool.functionDeclarations.length > 0) {
+                                tool.functionDeclarations.forEach((decl) => {
+                                    pushDeclaration(decl, 'functionDeclarations');
+                                });
                                 return;
                             }
                             // Fall back to function/custom style definitions.
@@ -1132,7 +1463,7 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                                 tool.parameters ||
                                 tool.input_schema ||
                                 tool.inputSchema) {
-                                pushDeclaration(tool.function ?? tool.custom ?? tool, "function/custom");
+                                pushDeclaration(tool.function ?? tool.custom ?? tool, 'function/custom');
                                 return;
                             }
                             // Preserve any non-function tool entries (e.g., codeExecution) untouched.
@@ -1165,7 +1496,10 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                     // Injects parameter signatures into descriptions and adds system instruction
                     // Can be disabled via config.claude_tool_hardening = false to reduce context size
                     const enableToolHardening = options?.claudeToolHardening ?? true;
-                    if (enableToolHardening && isClaude && Array.isArray(requestPayload.tools) && requestPayload.tools.length > 0) {
+                    if (enableToolHardening &&
+                        isClaude &&
+                        Array.isArray(requestPayload.tools) &&
+                        requestPayload.tools.length > 0) {
                         // Inject parameter signatures into tool descriptions
                         requestPayload.tools = injectParameterSignatures(requestPayload.tools, CLAUDE_DESCRIPTION_PROMPT);
                         // Inject tool hardening system instruction
@@ -1174,7 +1508,9 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                     // Append interleaved thinking hint for Claude thinking models with tools.
                     // Must come AFTER tool hardening so it is the last system instruction part,
                     // preserving the stable prefix for prompt cache matching.
-                    if (isClaudeThinking && Array.isArray(requestPayload.tools) && requestPayload.tools.length > 0) {
+                    if (isClaudeThinking &&
+                        Array.isArray(requestPayload.tools) &&
+                        requestPayload.tools.length > 0) {
                         appendClaudeThinkingHint(requestPayload);
                     }
                 }
@@ -1185,24 +1521,35 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                 // Handle both Gemini-style contents[] and Anthropic-style messages[] payloads.
                 if (isClaude) {
                     // Step 0: Sanitize cross-model metadata (strips Gemini signatures when sending to Claude)
-                    sanitizeCrossModelPayloadInPlace(requestPayload, { targetModel: effectiveModel });
+                    sanitizeCrossModelPayloadInPlace(requestPayload, {
+                        targetModel: effectiveModel,
+                    });
                     // Step 1: Strip corrupted/unsigned thinking blocks FIRST
                     deepFilterThinkingBlocks(requestPayload, signatureSessionKey, getCachedSignature, true);
                     // Step 2: THEN inject signed thinking from cache (after stripping)
-                    if (isClaudeThinking && keepThinkingEnabled && Array.isArray(requestPayload.contents)) {
+                    if (isClaudeThinking &&
+                        keepThinkingEnabled &&
+                        Array.isArray(requestPayload.contents)) {
                         requestPayload.contents = ensureThinkingBeforeToolUseInContents(requestPayload.contents, signatureSessionKey);
                     }
-                    if (isClaudeThinking && keepThinkingEnabled && Array.isArray(requestPayload.messages)) {
+                    if (isClaudeThinking &&
+                        keepThinkingEnabled &&
+                        Array.isArray(requestPayload.messages)) {
                         requestPayload.messages = ensureThinkingBeforeToolUseInMessages(requestPayload.messages, signatureSessionKey);
                     }
                     // Step 3: Check if warmup needed (AFTER injection attempt)
                     if (isClaudeThinking && keepThinkingEnabled) {
-                        const hasToolUse = (Array.isArray(requestPayload.contents) && hasToolUseInContents(requestPayload.contents)) ||
-                            (Array.isArray(requestPayload.messages) && hasToolUseInMessages(requestPayload.messages));
-                        const hasSignedThinking = (Array.isArray(requestPayload.contents) && hasSignedThinkingInContents(requestPayload.contents, signatureSessionKey)) ||
-                            (Array.isArray(requestPayload.messages) && hasSignedThinkingInMessages(requestPayload.messages, signatureSessionKey));
+                        const hasToolUse = (Array.isArray(requestPayload.contents) &&
+                            hasToolUseInContents(requestPayload.contents)) ||
+                            (Array.isArray(requestPayload.messages) &&
+                                hasToolUseInMessages(requestPayload.messages));
+                        const hasSignedThinking = (Array.isArray(requestPayload.contents) &&
+                            hasSignedThinkingInContents(requestPayload.contents, signatureSessionKey)) ||
+                            (Array.isArray(requestPayload.messages) &&
+                                hasSignedThinkingInMessages(requestPayload.messages, signatureSessionKey));
                         const hasCachedThinking = defaultSignatureStore.has(signatureSessionKey);
-                        needsSignedThinkingWarmup = hasToolUse && !hasSignedThinking && !hasCachedThinking;
+                        needsSignedThinkingWarmup =
+                            hasToolUse && !hasSignedThinking && !hasCachedThinking;
                     }
                 }
                 // For Claude models, ensure functionCall/tool use parts carry IDs (required by Anthropic).
@@ -1218,12 +1565,14 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                             return content;
                         }
                         const newParts = content.parts.map((part) => {
-                            if (part && typeof part === "object" && part.functionCall) {
+                            if (part && typeof part === 'object' && part.functionCall) {
                                 const call = { ...part.functionCall };
                                 if (!call.id) {
                                     call.id = `tool-call-${++toolCallCounter}`;
                                 }
-                                const nameKey = typeof call.name === "string" ? call.name : `tool-${toolCallCounter}`;
+                                const nameKey = typeof call.name === 'string'
+                                    ? call.name
+                                    : `tool-${toolCallCounter}`;
                                 // Push to the queue for this function name
                                 const queue = pendingCallIdsByName.get(nameKey) || [];
                                 queue.push(call.id);
@@ -1240,9 +1589,9 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                             return content;
                         }
                         const newParts = content.parts.map((part) => {
-                            if (part && typeof part === "object" && part.functionResponse) {
+                            if (part && typeof part === 'object' && part.functionResponse) {
                                 const resp = { ...part.functionResponse };
-                                if (!resp.id && typeof resp.name === "string") {
+                                if (!resp.id && typeof resp.name === 'string') {
                                     const queue = pendingCallIdsByName.get(resp.name);
                                     if (queue && queue.length > 0) {
                                         // Consume the first pending ID (FIFO order)
@@ -1286,68 +1635,90 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                     const conversationState = analyzeConversationState(requestPayload.contents);
                     // Force recovery if API returned thinking_block_order error (retry case)
                     // or if proactive check detects we need recovery
-                    if (forceThinkingRecovery || needsThinkingRecovery(conversationState)) {
+                    if (forceThinkingRecovery ||
+                        needsThinkingRecovery(conversationState)) {
                         // Set message for toast notification (shown in plugin.ts, respects quiet mode)
                         thinkingRecoveryMessage = forceThinkingRecovery
-                            ? "Thinking recovery: retrying with fresh turn (API error)"
-                            : "Thinking recovery: restarting turn (corrupted context)";
+                            ? 'Thinking recovery: retrying with fresh turn (API error)'
+                            : 'Thinking recovery: restarting turn (corrupted context)';
                         requestPayload.contents = closeToolLoopForThinking(requestPayload.contents);
                         defaultSignatureStore.delete(signatureSessionKey);
                     }
                 }
-                // Guard against assistant prefill: Claude rejects conversations ending
-                // with model/assistant messages. After context compaction, the conversation
-                // can end with a model message — append synthetic user message to fix.
-                if (isClaude) {
+                // 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 (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 (lastMessage?.role === 'model' ||
+                            lastMessage?.role === 'assistant') {
+                            ;
+                            requestPayload.messages.push({
+                                role: 'user',
+                                parts: [{ text: '[Continue]' }],
+                            });
                         }
                     }
                 }
-                if ("model" in requestPayload) {
+                if ('model' in requestPayload) {
                     delete requestPayload.model;
                 }
                 stripInjectedDebugFromRequestPayload(requestPayload);
                 sanitizeRequestPayloadForAntigravity(requestPayload);
+                if (headerStyle === 'antigravity') {
+                    stripUnsupportedAntigravityFields(requestPayload);
+                    configureAntigravityToolCalling(requestPayload);
+                }
                 // Use the stable default project ID (never a per-request random one):
                 // 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() ||
+                    (headerStyle === 'antigravity' ? ANTIGRAVITY_DEFAULT_PROJECT_ID : '');
                 resolvedProjectId = effectiveProjectId;
-                // System instruction injection removed — CLIProxyAPI v6.9.x no longer injects it
-                const wrappedBody = headerStyle === "antigravity"
+                // 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;
+                requestPayload.sessionId = agyMetadata?.sessionId ?? signatureSessionKey;
+                if (agyMetadata) {
+                    requestPayload.labels = agyMetadata.labels;
+                    orderAgyRequestPayloadInPlace(requestPayload);
+                }
+                const wrappedBody = headerStyle === 'antigravity'
                     ? {
                         project: effectiveProjectId,
-                        requestId: buildAntigravityRequestId("agent"),
+                        requestId: agyMetadata?.requestId,
                         request: requestPayload,
                         model: effectiveModel,
-                        userAgent: "antigravity",
-                        requestType: "agent",
+                        userAgent: 'antigravity',
+                        requestType: 'agent',
                     }
                     : {
                         project: effectiveProjectId,
                         model: effectiveModel,
                         request: requestPayload,
                     };
-                if (wrappedBody.request && typeof wrappedBody.request === 'object') {
-                    // Use stable session ID for signature caching across multi-turn conversations
-                    sessionId = signatureSessionKey;
-                    wrappedBody.request.sessionId = signatureSessionKey;
-                }
-                body = safeStringify(headerStyle === "antigravity" ? orderAntigravityEnvelope(wrappedBody) : wrappedBody);
+                body = safeStringify(headerStyle === 'antigravity'
+                    ? orderAntigravityEnvelope(wrappedBody)
+                    : wrappedBody);
             }
         }
         catch {
-            throw new Error("Failed to build Antigravity request body");
+            throw new Error('Failed to build Antigravity request body');
         }
     }
     // agy CLI does not send an Accept header on streamGenerateContent requests.
@@ -1355,36 +1726,36 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
     // Add interleaved thinking header for Claude thinking models
     // This enables real-time streaming of thinking tokens
     if (isClaudeThinking) {
-        const existing = headers.get("anthropic-beta");
-        const interleavedHeader = "interleaved-thinking-2025-05-14";
+        const existing = headers.get('anthropic-beta');
+        const interleavedHeader = 'interleaved-thinking-2025-05-14';
         if (existing) {
             if (!existing.includes(interleavedHeader)) {
-                headers.set("anthropic-beta", `${existing},${interleavedHeader}`);
+                headers.set('anthropic-beta', `${existing},${interleavedHeader}`);
             }
         }
         else {
-            headers.set("anthropic-beta", interleavedHeader);
+            headers.set('anthropic-beta', interleavedHeader);
         }
     }
-    if (headerStyle === "antigravity") {
+    if (headerStyle === 'antigravity') {
         // Use randomized headers as the fallback pool for Antigravity mode
-        const selectedHeaders = getRandomizedHeaders("antigravity", requestedModel);
+        const selectedHeaders = getRandomizedHeaders('antigravity', requestedModel);
         // 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)
         const fingerprint = options?.fingerprint ?? getSessionFingerprint();
         const fingerprintHeaders = buildFingerprintHeaders(fingerprint);
-        headers.set("User-Agent", fingerprintHeaders["User-Agent"] || selectedHeaders["User-Agent"]);
-        headers.set("Accept-Encoding", "gzip");
+        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"]);
+        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,
@@ -1400,7 +1771,7 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
         endpoint: transformedUrl,
         sessionId,
         toolDebugMissing,
-        toolDebugSummary: toolDebugSummaries.slice(0, 20).join(" | "),
+        toolDebugSummary: toolDebugSummaries.slice(0, 20).join(' | '),
         toolDebugPayload,
         needsSignedThinkingWarmup,
         headerStyle,
@@ -1418,29 +1789,50 @@ export function buildThinkingWarmupBody(bodyText, isClaudeThinking) {
     catch {
         return null;
     }
-    const warmupPrompt = "Warmup request for thinking signature.";
+    const warmupPrompt = 'Warmup request for thinking signature.';
+    const wireModel = typeof parsed.model === 'string' ? parsed.model : 'claude-sonnet-4-6';
+    const requestObjects = [];
     const updateRequest = (req) => {
-        req.contents = [{ role: "user", parts: [{ text: warmupPrompt }] }];
+        req.contents = [{ role: 'user', parts: [{ text: warmupPrompt }] }];
         delete req.tools;
         delete req.toolConfig;
         const generationConfig = (req.generationConfig ?? {});
         generationConfig.thinkingConfig = {
-            include_thoughts: true,
-            thinking_budget: DEFAULT_THINKING_BUDGET,
+            includeThoughts: true,
+            thinkingBudget: AGY_CLAUDE_THINKING_BUDGET,
         };
-        generationConfig.maxOutputTokens = computeClaudeMaxOutputTokens(DEFAULT_THINKING_BUDGET);
+        generationConfig.maxOutputTokens =
+            getAgyMaxOutputTokens(wireModel) ??
+                computeClaudeMaxOutputTokens(AGY_CLAUDE_THINKING_BUDGET);
         req.generationConfig = generationConfig;
+        requestObjects.push(req);
     };
-    if (parsed.request && typeof parsed.request === "object") {
+    if (parsed.request && typeof parsed.request === 'object') {
         updateRequest(parsed.request);
         const nested = parsed.request.request;
-        if (nested && typeof nested === "object") {
+        if (nested && typeof nested === 'object') {
             updateRequest(nested);
         }
     }
     else {
         updateRequest(parsed);
     }
+    const wireRequest = requestObjects.at(-1);
+    if (wireRequest) {
+        const numericSessionId = typeof wireRequest.sessionId === 'string'
+            ? wireRequest.sessionId
+            : DEFAULT_AGY_REQUEST_SESSION.numericSessionId;
+        const warmupSession = {
+            conversationId: crypto.randomUUID(),
+            trajectoryId: crypto.randomUUID(),
+            numericSessionId,
+        };
+        const metadata = buildAgyAgentRequestMetadata(warmupSession, wireRequest, wireModel);
+        parsed.requestId = metadata.requestId;
+        wireRequest.sessionId = metadata.sessionId;
+        wireRequest.labels = metadata.labels;
+        orderAgyRequestPayloadInPlace(wireRequest);
+    }
     return safeStringify(parsed);
 }
 /**
@@ -1451,9 +1843,9 @@ export function buildThinkingWarmupBody(bodyText, isClaudeThinking) {
  * Thinking/reasoning tokens are transformed and forwarded immediately as they arrive.
  */
 export async function transformAntigravityResponse(response, streaming, debugContext, requestedModel, projectId, endpoint, effectiveModel, sessionId, toolDebugMissing, toolDebugSummary, toolDebugPayload, debugLines, dumpContext) {
-    const contentType = response.headers.get("content-type") ?? "";
-    const isJsonResponse = contentType.includes("application/json");
-    const isEventStreamResponse = contentType.includes("text/event-stream");
+    const contentType = response.headers.get('content-type') ?? '';
+    const isJsonResponse = contentType.includes('application/json');
+    const isEventStreamResponse = contentType.includes('text/event-stream');
     // Generate text for thinking injection:
     // - If debug=true: inject full debug logs
     // - If keep_thinking=true (but no debug): inject placeholder to trigger signature caching
@@ -1466,7 +1858,7 @@ export async function transformAntigravityResponse(response, streaming, debugCon
     const cacheSignatures = shouldCacheThinkingSignatures(effectiveModel);
     if (!isJsonResponse && !isEventStreamResponse) {
         logAntigravityDebugResponse(debugContext, response, {
-            note: "Non-JSON response (body omitted)",
+            note: 'Non-JSON response (body omitted)',
         });
         return response;
     }
@@ -1476,11 +1868,13 @@ export async function transformAntigravityResponse(response, streaming, debugCon
     if (streaming && response.ok && isEventStreamResponse && response.body) {
         const headers = new Headers(response.headers);
         logAntigravityDebugResponse(debugContext, response, {
-            note: "Streaming SSE response (real-time transform)",
+            note: 'Streaming SSE response (real-time transform)',
         });
         noteGeminiDumpResponse(dumpContext, response);
         const rawDumpTransformer = createGeminiDumpResponseTransform(dumpContext);
-        const sourceBody = rawDumpTransformer ? response.body.pipeThrough(rawDumpTransformer) : response.body;
+        const sourceBody = rawDumpTransformer
+            ? response.body.pipeThrough(rawDumpTransformer)
+            : response.body;
         const streamingTransformer = createStreamingTransformer(defaultSignatureStore, {
             onCacheSignature: cacheSignature,
             onInjectDebug: injectDebugThinking,
@@ -1489,10 +1883,15 @@ export async function transformAntigravityResponse(response, streaming, debugCon
                     const cacheRead = usage.cachedContentTokenCount;
                     const totalInput = usage.promptTokenCount ?? usage.totalTokenCount;
                     const hitRate = totalInput > 0 ? Math.round((cacheRead / totalInput) * 100) : 0;
-                    const status = cacheRead > 0 ? "HIT" : "MISS";
+                    const status = cacheRead > 0 ? 'HIT' : 'MISS';
                     logCacheStats(effectiveModel, cacheRead, 0, totalInput);
                     log.debug(`[Cache] ${status} model=${effectiveModel} read=${cacheRead} total=${totalInput} hitRate=${hitRate}%`);
-                    _lastCacheStats = { model: effectiveModel, read: cacheRead, total: totalInput, hitRate };
+                    _lastCacheStats = {
+                        model: effectiveModel,
+                        read: cacheRead,
+                        total: totalInput,
+                        hitRate,
+                    };
                 }
             },
             transformThinkingParts,
@@ -1500,7 +1899,9 @@ export async function transformAntigravityResponse(response, streaming, debugCon
             signatureSessionKey: sessionId,
             debugText,
             cacheSignatures,
-            displayedThinkingHashes: effectiveModel && isGemini3Model(effectiveModel) ? sessionDisplayedThinkingHashes : undefined,
+            displayedThinkingHashes: effectiveModel && isGemini3Model(effectiveModel)
+                ? sessionDisplayedThinkingHashes
+                : undefined,
             // injectSyntheticThinking removed - keep_thinking now unified with debug via debugText
         });
         return new Response(sourceBody.pipeThrough(streamingTransformer), {
@@ -1525,48 +1926,50 @@ export async function transformAntigravityResponse(response, streaming, debugCon
             }
             // Inject Debug Info
             if (errorBody?.error) {
-                const rawErrorMessage = typeof errorBody.error.message === "string" && errorBody.error.message.length > 0
+                const rawErrorMessage = typeof errorBody.error.message === 'string' &&
+                    errorBody.error.message.length > 0
                     ? errorBody.error.message
-                    : "Unknown error";
+                    : 'Unknown error';
                 const errorType = detectErrorType(rawErrorMessage);
-                const debugInfo = `\n\n[Debug Info]\nRequested Model: ${requestedModel || "Unknown"}\nEffective Model: ${effectiveModel || "Unknown"}\nProject: ${projectId || "Unknown"}\nEndpoint: ${endpoint || "Unknown"}\nStatus: ${response.status}\nRequest ID: ${headers.get("x-request-id") || "N/A"}${toolDebugMissing !== undefined ? `\nTool Debug Missing: ${toolDebugMissing}` : ""}${toolDebugSummary ? `\nTool Debug Summary: ${toolDebugSummary}` : ""}${toolDebugPayload ? `\nTool Debug Payload: ${toolDebugPayload}` : ""}`;
-                const injectedDebug = debugText ? `\n\n${debugText}` : "";
+                const debugInfo = `\n\n[Debug Info]\nRequested Model: ${requestedModel || 'Unknown'}\nEffective Model: ${effectiveModel || 'Unknown'}\nProject: ${projectId || 'Unknown'}\nEndpoint: ${endpoint || 'Unknown'}\nStatus: ${response.status}\nRequest ID: ${headers.get('x-request-id') || 'N/A'}${toolDebugMissing !== undefined ? `\nTool Debug Missing: ${toolDebugMissing}` : ''}${toolDebugSummary ? `\nTool Debug Summary: ${toolDebugSummary}` : ''}${toolDebugPayload ? `\nTool Debug Payload: ${toolDebugPayload}` : ''}`;
+                const injectedDebug = debugText ? `\n\n${debugText}` : '';
                 errorBody.error.message = rawErrorMessage + debugInfo + injectedDebug;
                 // Check if this is a recoverable thinking error - throw to trigger retry
-                if (errorType === "thinking_block_order") {
-                    const recoveryError = new Error("THINKING_RECOVERY_NEEDED");
+                if (errorType === 'thinking_block_order') {
+                    const recoveryError = new Error('THINKING_RECOVERY_NEEDED');
                     recoveryError.recoveryType = errorType;
                     recoveryError.originalError = errorBody;
                     recoveryError.debugInfo = debugInfo;
                     throw recoveryError;
                 }
                 // Detect context length / prompt too long errors - signal to caller for toast
-                const errorMessage = errorBody.error.message?.toLowerCase() || "";
-                if (errorMessage.includes("prompt is too long") ||
-                    errorMessage.includes("context length exceeded") ||
-                    errorMessage.includes("context_length_exceeded") ||
-                    errorMessage.includes("maximum context length")) {
-                    headers.set("x-antigravity-context-error", "prompt_too_long");
+                const errorMessage = errorBody.error.message?.toLowerCase() || '';
+                if (errorMessage.includes('prompt is too long') ||
+                    errorMessage.includes('context length exceeded') ||
+                    errorMessage.includes('context_length_exceeded') ||
+                    errorMessage.includes('maximum context length')) {
+                    headers.set('x-antigravity-context-error', 'prompt_too_long');
                 }
                 // Detect tool pairing errors - signal to caller for toast
-                if (errorMessage.includes("tool_use") &&
-                    errorMessage.includes("tool_result") &&
-                    (errorMessage.includes("without") || errorMessage.includes("immediately after"))) {
-                    headers.set("x-antigravity-context-error", "tool_pairing");
+                if (errorMessage.includes('tool_use') &&
+                    errorMessage.includes('tool_result') &&
+                    (errorMessage.includes('without') ||
+                        errorMessage.includes('immediately after'))) {
+                    headers.set('x-antigravity-context-error', 'tool_pairing');
                 }
                 return new Response(JSON.stringify(errorBody), {
                     status: response.status,
                     statusText: response.statusText,
-                    headers
+                    headers,
                 });
             }
             if (errorBody?.error?.details && Array.isArray(errorBody.error.details)) {
                 const retryInfo = errorBody.error.details.find((detail) => detail['@type'] === 'type.googleapis.com/google.rpc.RetryInfo');
                 if (retryInfo?.retryDelay) {
                     const match = retryInfo.retryDelay.match(/^([\d.]+)s$/);
-                    if (match && match[1]) {
+                    if (match?.[1]) {
                         const retrySeconds = parseFloat(match[1]);
-                        if (!isNaN(retrySeconds) && retrySeconds > 0) {
+                        if (!Number.isNaN(retrySeconds) && retrySeconds > 0) {
                             const retryAfterSec = Math.ceil(retrySeconds).toString();
                             const retryAfterMs = Math.ceil(retrySeconds * 1000).toString();
                             headers.set('Retry-After', retryAfterSec);
@@ -1581,35 +1984,42 @@ export async function transformAntigravityResponse(response, streaming, debugCon
             statusText: response.statusText,
             headers,
         };
-        const usageFromSse = streaming && isEventStreamResponse ? extractUsageFromSsePayload(text) : null;
-        const parsed = !streaming || !isEventStreamResponse ? parseAntigravityApiBody(text) : null;
-        const patched = parsed ? rewriteAntigravityPreviewAccessError(parsed, response.status, requestedModel) : null;
+        const usageFromSse = streaming && isEventStreamResponse
+            ? extractUsageFromSsePayload(text)
+            : null;
+        const parsed = !streaming || !isEventStreamResponse
+            ? parseAntigravityApiBody(text)
+            : null;
+        const patched = parsed
+            ? rewriteAntigravityPreviewAccessError(parsed, response.status, requestedModel)
+            : null;
         const effectiveBody = patched ?? parsed ?? undefined;
-        const usage = usageFromSse ?? (effectiveBody ? extractUsageMetadata(effectiveBody) : null);
+        const usage = usageFromSse ??
+            (effectiveBody ? extractUsageMetadata(effectiveBody) : null);
         // Log cache stats when available
         if (usage && effectiveModel) {
             const cacheRead = usage.cachedContentTokenCount ?? 0;
             const totalInput = usage.promptTokenCount ?? usage.totalTokenCount ?? 0;
             const hitRate = totalInput > 0 ? Math.round((cacheRead / totalInput) * 100) : 0;
-            const status = cacheRead > 0 ? "HIT" : "MISS";
+            const status = cacheRead > 0 ? 'HIT' : 'MISS';
             logCacheStats(effectiveModel, cacheRead, 0, totalInput);
             log.debug(`[Cache] ${status} model=${effectiveModel} read=${cacheRead} total=${totalInput} hitRate=${hitRate}%`);
         }
         if (usage?.cachedContentTokenCount !== undefined) {
-            headers.set("x-antigravity-cached-content-token-count", String(usage.cachedContentTokenCount));
+            headers.set('x-antigravity-cached-content-token-count', String(usage.cachedContentTokenCount));
             if (usage.totalTokenCount !== undefined) {
-                headers.set("x-antigravity-total-token-count", String(usage.totalTokenCount));
+                headers.set('x-antigravity-total-token-count', String(usage.totalTokenCount));
             }
             if (usage.promptTokenCount !== undefined) {
-                headers.set("x-antigravity-prompt-token-count", String(usage.promptTokenCount));
+                headers.set('x-antigravity-prompt-token-count', String(usage.promptTokenCount));
             }
             if (usage.candidatesTokenCount !== undefined) {
-                headers.set("x-antigravity-candidates-token-count", String(usage.candidatesTokenCount));
+                headers.set('x-antigravity-candidates-token-count', String(usage.candidatesTokenCount));
             }
         }
         logAntigravityDebugResponse(debugContext, response, {
             body: text,
-            note: streaming ? "Streaming SSE payload (buffered fallback)" : undefined,
+            note: streaming ? 'Streaming SSE payload (buffered fallback)' : undefined,
             headersOverride: headers,
         });
         // Note: successful streaming responses are handled above via TransformStream.
@@ -1633,12 +2043,13 @@ export async function transformAntigravityResponse(response, streaming, debugCon
         return new Response(text, init);
     }
     catch (error) {
-        if (error instanceof Error && error.message === "THINKING_RECOVERY_NEEDED") {
+        if (error instanceof Error &&
+            error.message === 'THINKING_RECOVERY_NEEDED') {
             throw error;
         }
         logAntigravityDebugResponse(debugContext, response, {
             error,
-            note: "Failed to transform Antigravity response",
+            note: 'Failed to transform Antigravity response',
         });
         return responseFallback;
     }