@cortexkit/opencode-antigravity-auth 1.0.1 → 1.1.0

package/dist/src/plugin/request.js

@@ -6,7 +6,7 @@ import { createStreamingTransformer, transformSseLine, transformStreamingPayload
 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 { cleanJSONSchemaForAntigravity, 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";
@@ -14,11 +14,14 @@ import { isGemini3Model, isImageGenerationModel, buildImageGenerationConfig, app
 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 { buildAgyAgentRequestMetadata, createAgyRequestSessionContext, orderAgyRequestPayloadInPlace, } from "./agy-request-metadata";
 import { appendGeminiDumpResponseText, createGeminiDumpResponseTransform, noteGeminiDumpResponse, } from "./gemini-dump";
 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",
@@ -26,17 +29,71 @@ const ANTIGRAVITY_ENVELOPE_FIELD_ORDER = [
     "model",
     "userAgent",
     "requestType",
-    "enabledCreditTypes",
 ];
-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") {
@@ -45,6 +102,9 @@ function getAgyMaxOutputTokens(model) {
     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) {
@@ -93,9 +153,9 @@ function buildSignatureSessionKey(sessionId, model, conversationKey, projectKey)
 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"})
+        // 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
@@ -349,6 +409,75 @@ function isValidRequestPart(part) {
         Object.prototype.hasOwnProperty.call(record, "codeExecutionResult") ||
         Object.prototype.hasOwnProperty.call(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)) {
@@ -734,6 +863,8 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
     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.
@@ -774,9 +905,6 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                     model: effectiveModel,
                 };
                 if (headerStyle === "antigravity") {
-                    if (typeof wrappedBody.requestId !== "string" || !wrappedBody.requestId) {
-                        wrappedBody.requestId = buildAntigravityRequestId("agent");
-                    }
                     if (typeof wrappedBody.userAgent !== "string" || !wrappedBody.userAgent) {
                         wrappedBody.userAgent = "antigravity";
                     }
@@ -805,8 +933,6 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                     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)
@@ -823,6 +949,11 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                         // 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
@@ -853,15 +984,41 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                     const hasCachedThinking = defaultSignatureStore.has(signatureSessionKey);
                     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);
             }
             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)}`);
+                // 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
@@ -887,20 +1044,6 @@ 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);
@@ -1019,25 +1162,27 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                     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).
@@ -1317,17 +1462,30 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                 }
                 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 : "");
                 resolvedProjectId = effectiveProjectId;
-                // System instruction injection removed — CLIProxyAPI v6.9.x no longer injects it
+                // 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",
@@ -1338,11 +1496,6 @@ export function prepareAntigravityRequest(input, init, accessToken, projectId, e
                         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);
             }
         }
@@ -1419,17 +1572,21 @@ export function buildThinkingWarmupBody(bodyText, isClaudeThinking) {
         return null;
     }
     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 }] }];
         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") {
         updateRequest(parsed.request);
@@ -1441,6 +1598,22 @@ export function buildThinkingWarmupBody(bodyText, isClaudeThinking) {
     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);
 }
 /**