@jsonstudio/rcc 0.89.1205 → 0.89.1457

package/dist/providers/core/runtime/gemini-cli-http-provider.js

@@ -7,13 +7,188 @@
  * - 认证：OAuth2 Bearer token
  * - 特性：多 project 支持、token 共享、模型回退
  */
-import { randomUUID } from 'node:crypto';
+import { createHash, randomUUID, randomBytes } from 'node:crypto';
+import { platform as osPlatform, arch as osArch, release as osRelease } from 'node:os';
 import { Transform } from 'node:stream';
 import { StringDecoder } from 'node:string_decoder';
 import { HttpTransportProvider } from './http-transport-provider.js';
 import { GeminiCLIProtocolClient } from '../../../client/gemini-cli/gemini-cli-protocol-client.js';
 import { getDefaultProjectId } from '../../auth/gemini-cli-userinfo-helper.js';
-import { ANTIGRAVITY_HELPER_DEFAULTS } from '../../auth/antigravity-userinfo-helper.js';
+import { resolveAntigravityApiBaseCandidates } from '../../auth/antigravity-userinfo-helper.js';
+import { getCamoufoxFingerprintProfile } from '../config/camoufox-launcher.js';
+const ANTIGRAVITY_OS_VERSIONS = {
+    darwin: ['10.15.7', '11.6.8', '12.6.3', '13.5.2', '14.2.1', '14.5'],
+    win32: ['10.0.19041', '10.0.19042', '10.0.19043', '10.0.22000', '10.0.22621', '10.0.22631'],
+    linux: ['5.15.0', '5.19.0', '6.1.0', '6.2.0', '6.5.0', '6.6.0']
+};
+const ANTIGRAVITY_ARCHS = ['x64', 'arm64'];
+const ANTIGRAVITY_VERSIONS = ['1.10.0', '1.10.5', '1.11.0', '1.11.2', '1.11.5', '1.12.0', '1.12.1'];
+const ANTIGRAVITY_IDE_TYPES = ['IDE_UNSPECIFIED', 'VSCODE', 'INTELLIJ', 'ANDROID_STUDIO', 'CLOUD_SHELL_EDITOR'];
+const ANTIGRAVITY_PLATFORMS = ['PLATFORM_UNSPECIFIED', 'WINDOWS', 'MACOS', 'LINUX'];
+const ANTIGRAVITY_SDK_CLIENTS = [
+    'google-cloud-sdk vscode_cloudshelleditor/0.1',
+    'google-cloud-sdk vscode/1.86.0',
+    'google-cloud-sdk vscode/1.87.0',
+    'google-cloud-sdk intellij/2024.1',
+    'google-cloud-sdk android-studio/2024.1',
+    'gcloud-python/1.2.0 grpc-google-iam-v1/0.12.6'
+];
+let antigravitySessionFingerprint = null;
+const randomFrom = (items) => items[Math.floor(Math.random() * items.length)];
+const generateAntigravityFingerprint = () => {
+    const platform = randomFrom(['darwin', 'win32', 'linux']);
+    const arch = randomFrom(ANTIGRAVITY_ARCHS);
+    const osVersion = randomFrom(ANTIGRAVITY_OS_VERSIONS[platform] ?? ANTIGRAVITY_OS_VERSIONS.linux);
+    const antigravityVersion = randomFrom(ANTIGRAVITY_VERSIONS);
+    const matchingPlatform = platform === 'darwin'
+        ? 'MACOS'
+        : platform === 'win32'
+            ? 'WINDOWS'
+            : platform === 'linux'
+                ? 'LINUX'
+                : randomFrom(ANTIGRAVITY_PLATFORMS);
+    return {
+        deviceId: randomUUID(),
+        sessionToken: randomBytes(16).toString('hex'),
+        userAgent: `antigravity/${antigravityVersion} ${platform}/${arch}`,
+        apiClient: randomFrom(ANTIGRAVITY_SDK_CLIENTS),
+        clientMetadata: {
+            ideType: randomFrom(ANTIGRAVITY_IDE_TYPES),
+            platform: matchingPlatform,
+            pluginType: 'GEMINI',
+            osVersion,
+            arch,
+            sqmId: `{${randomUUID().toUpperCase()}}`
+        },
+        quotaUser: `device-${randomBytes(8).toString('hex')}`,
+        createdAt: Date.now()
+    };
+};
+const getAntigravitySessionFingerprint = () => {
+    if (!antigravitySessionFingerprint) {
+        antigravitySessionFingerprint = generateAntigravityFingerprint();
+    }
+    return antigravitySessionFingerprint;
+};
+const collectCurrentAntigravityFingerprint = () => {
+    const platform = osPlatform();
+    const arch = osArch();
+    const osVersion = osRelease();
+    const matchingPlatform = platform === 'darwin'
+        ? 'MACOS'
+        : platform === 'win32'
+            ? 'WINDOWS'
+            : platform === 'linux'
+                ? 'LINUX'
+                : 'PLATFORM_UNSPECIFIED';
+    return {
+        deviceId: randomUUID(),
+        sessionToken: randomBytes(16).toString('hex'),
+        userAgent: `antigravity/1.11.5 ${platform}/${arch}`,
+        apiClient: 'google-cloud-sdk vscode_cloudshelleditor/0.1',
+        clientMetadata: {
+            ideType: 'VSCODE',
+            platform: matchingPlatform,
+            pluginType: 'GEMINI',
+            osVersion,
+            arch,
+            sqmId: `{${randomUUID().toUpperCase()}}`
+        },
+        quotaUser: `device-${randomBytes(16).toString('hex').slice(0, 16)}`,
+        createdAt: Date.now()
+    };
+};
+const buildAntigravityFingerprintHeaders = (fingerprint) => ({
+    'User-Agent': fingerprint.userAgent,
+    'X-Goog-Api-Client': fingerprint.apiClient,
+    'Client-Metadata': JSON.stringify(fingerprint.clientMetadata),
+    'X-Goog-QuotaUser': fingerprint.quotaUser,
+    'X-Client-Device-Id': fingerprint.deviceId,
+    ...(fingerprint.acceptEncoding ? { 'Accept-Encoding': fingerprint.acceptEncoding } : {})
+});
+const extractAntigravityAlias = (providerKey) => {
+    if (!providerKey) {
+        return undefined;
+    }
+    const parts = providerKey.split('.').filter(Boolean);
+    if (!parts.length) {
+        return undefined;
+    }
+    if (parts[0] !== 'antigravity') {
+        return undefined;
+    }
+    return parts.length >= 2 ? parts[1] : undefined;
+};
+const stableIdFromProfile = (profileId) => {
+    const hash = createHash('sha256').update(profileId).digest('hex');
+    const deviceId = `${hash.slice(0, 8)}-${hash.slice(8, 12)}-${hash.slice(12, 16)}-${hash.slice(16, 20)}-${hash.slice(20, 32)}`;
+    return {
+        deviceId,
+        quotaUser: `device-${hash.slice(0, 16)}`,
+        sqmId: `{${hash.slice(0, 8).toUpperCase()}-${hash.slice(8, 12).toUpperCase()}-${hash.slice(12, 16).toUpperCase()}-${hash.slice(16, 20).toUpperCase()}-${hash.slice(20, 32).toUpperCase()}}`
+    };
+};
+const buildFingerprintFromCamoufox = (profileId, env) => {
+    const camouKeys = Object.keys(env).filter((key) => key.startsWith('CAMOU_CONFIG_')).sort();
+    if (camouKeys.length === 0) {
+        return null;
+    }
+    const blob = camouKeys.map((key) => env[key]).join('');
+    let parsed = null;
+    try {
+        parsed = JSON.parse(blob);
+    }
+    catch {
+        return null;
+    }
+    const ua = typeof parsed['navigator.userAgent'] === 'string' ? parsed['navigator.userAgent'] : '';
+    const oscpu = typeof parsed['navigator.oscpu'] === 'string' ? parsed['navigator.oscpu'] : '';
+    const platformRaw = typeof parsed['navigator.platform'] === 'string' ? parsed['navigator.platform'] : oscpu;
+    const acceptEncoding = typeof parsed['headers.Accept-Encoding'] === 'string' ? parsed['headers.Accept-Encoding'] : undefined;
+    const platformLower = platformRaw.toLowerCase();
+    const platform = platformLower.includes('win') ? 'WINDOWS' : platformLower.includes('mac') ? 'MACOS' : 'LINUX';
+    const arch = platformLower.includes('arm64') || platformLower.includes('aarch64') ? 'arm64' : 'x64';
+    const stableIds = stableIdFromProfile(profileId);
+    return {
+        deviceId: stableIds.deviceId,
+        sessionToken: randomBytes(16).toString('hex'),
+        userAgent: ua || `antigravity/1.11.5 ${osPlatform()}/${osArch()}`,
+        apiClient: 'google-cloud-sdk vscode_cloudshelleditor/0.1',
+        acceptEncoding,
+        clientMetadata: {
+            ideType: 'IDE_UNSPECIFIED',
+            platform,
+            pluginType: 'GEMINI',
+            osVersion: oscpu || osRelease(),
+            arch,
+            sqmId: stableIds.sqmId
+        },
+        quotaUser: stableIds.quotaUser,
+        createdAt: Date.now()
+    };
+};
+const resolveAntigravityFingerprint = (runtime) => {
+    const alias = (runtime?.metadata && typeof runtime.metadata === 'object' && typeof runtime.metadata.alias === 'string'
+        ? String(runtime.metadata.alias)
+        : undefined) || extractAntigravityAlias(runtime?.providerKey);
+    const camoufox = getCamoufoxFingerprintProfile('antigravity', alias);
+    if (camoufox) {
+        const parsed = buildFingerprintFromCamoufox(camoufox.profileId, camoufox.env);
+        if (parsed) {
+            return parsed;
+        }
+    }
+    const env = (process.env.ROUTECODEX_ANTIGRAVITY_FINGERPRINT_MODE || process.env.RCC_ANTIGRAVITY_FINGERPRINT_MODE || '')
+        .trim()
+        .toLowerCase();
+    if (env === 'current' || env === 'host') {
+        return collectCurrentAntigravityFingerprint();
+    }
+    return getAntigravitySessionFingerprint();
+};
+// Legacy helper seed for Antigravity signature session key generation.
+// Kept for backwards compatibility (even when we avoid auto-injecting sessionId).
+const ANTIGRAVITY_PLUGIN_SESSION_ID = `-${randomUUID()}`;
 export class GeminiCLIHttpProvider extends HttpTransportProvider {
     constructor(config, dependencies) {
         const providerId = typeof config.config?.providerId === 'string' && config.config.providerId.trim().length
@@ -35,11 +210,28 @@ export class GeminiCLIHttpProvider extends HttpTransportProvider {
         };
         super(cfg, dependencies, 'gemini-cli-http-provider', new GeminiCLIProtocolClient());
     }
+    applyStreamModeHeaders(headers, wantsSse) {
+        if (!this.isAntigravityRuntime()) {
+            return super.applyStreamModeHeaders(headers, wantsSse);
+        }
+        // Antigravity: keep SSE Accept header behavior stable.
+        // We intentionally do not force "*/*" here because the upstream is sensitive to header triplets
+        // and we have observed successful runs with the default "text/event-stream" Accept.
+        return super.applyStreamModeHeaders(headers, wantsSse);
+    }
+    getBaseUrlCandidates(_context) {
+        if (!this.isAntigravityRuntime()) {
+            return undefined;
+        }
+        return resolveAntigravityApiBaseCandidates(this.getEffectiveBaseUrl());
+    }
     async preprocessRequest(request) {
         const processedRequest = await super.preprocessRequest(request);
         const adapter = this.resolvePayload(processedRequest);
         const payload = adapter.payload;
-        const isAntigravity = this.isAntigravityRuntime();
+        const metadata = processedRequest && typeof processedRequest === 'object' && typeof processedRequest.metadata === 'object'
+            ? processedRequest.metadata
+            : undefined;
         // 从 auth provider 获取 project_id（仅做最小的 OAuth token 解析，不在此处触发 OAuth 流程）
         if (!this.authProvider) {
             throw new Error('Gemini CLI: auth provider not found');
@@ -58,6 +250,16 @@ export class GeminiCLIHttpProvider extends HttpTransportProvider {
         };
         const tokenData = readTokenPayload();
         const projectId = getDefaultProjectId(tokenData || {});
+        const projectOverride = (() => {
+            const ext = this.config?.config?.extensions;
+            const candidates = [ext?.projectId, ext?.project_id, ext?.project];
+            for (const candidate of candidates) {
+                if (typeof candidate === 'string' && candidate.trim().length) {
+                    return candidate.trim();
+                }
+            }
+            return undefined;
+        })();
         // 构建 Gemini CLI 格式的请求（仅做传输层整理，不做 OpenAI→Gemini 语义转换）
         const model = typeof payload.model === 'string' && payload.model.trim().length > 0
             ? payload.model
@@ -66,10 +268,22 @@ export class GeminiCLIHttpProvider extends HttpTransportProvider {
             throw new Error('Gemini CLI: model is required');
         }
         payload.model = model;
-        // 若当前 token 中已有 project 元数据，则补充到请求中；否则让上游决定后续行为。
-        // 注意：Antigravity 运行时保持与早期成功快照一致，始终显式发送 project。
-        if (projectId) {
-            payload.project = projectId;
+        const isClaudeModel = this.isClaudeModelName(model);
+        // Project selection:
+        // - honor explicit payload.project (client/config),
+        // - otherwise honor provider config extensions project override,
+        // - otherwise fall back to token-derived default project_id if present.
+        const existingProject = typeof payload.project === 'string' && String(payload.project).trim().length
+            ? String(payload.project).trim()
+            : '';
+        if (!existingProject) {
+            const nextProject = projectOverride || projectId;
+            if (nextProject && nextProject.trim().length) {
+                payload.project = nextProject.trim();
+            }
+            else if (this.isAntigravityRuntime()) {
+                payload.project = this.generateSyntheticProjectId();
+            }
         }
         this.ensureRequestMetadata(payload);
         // 删除与 Gemini 协议无关的字段，避免影响 Cloud Code Assist schema 校验。
@@ -86,6 +300,43 @@ export class GeminiCLIHttpProvider extends HttpTransportProvider {
         // 如果上游/compat 层错误地产生了 payload.request（例如旧版本样本/回放），这里做一次扁平化，
         // 避免出现 body.request.request.contents 这种非法形状，导致上游生成空响应或被静默忽略。
         this.flattenRequestContainer(payload);
+        // Standard contract: Antigravity identity fields are carried in the JSON wrapper (not headers).
+        // gcli2api antigravity alignment:
+        // - requestId/requestType are sent as HTTP headers (provider finalizeRequestHeaders)
+        // - JSON wrapper should not force-inject extra identity/session fields
+        // Provider must not infer request semantics from user payload; modality hints must come from llmswitch-core metadata.
+        if (this.isAntigravityRuntime()) {
+            const record = payload;
+            if (!this.hasNonEmptyString(record.userAgent)) {
+                record.userAgent = 'antigravity';
+            }
+            if (!this.hasNonEmptyString(record.requestType)) {
+                const hasImageAttachment = metadata && (metadata.hasImageAttachment === true || metadata.hasImageAttachment === 'true');
+                const fallbackImageByModel = typeof model === 'string' && model.toLowerCase().includes('image');
+                record.requestType = hasImageAttachment || fallbackImageByModel ? 'image_gen' : 'agent';
+            }
+            const existingReqId = record.requestId;
+            if (typeof existingReqId !== 'string' || !existingReqId.trim().startsWith('req-')) {
+                record.requestId = `req-${randomUUID()}`;
+            }
+        }
+        // gcli2api antigravity alignment: keep JSON wrapper minimal.
+        // Preserve requestId/requestType in metadata for headers, then remove them from payload.
+        if (this.isAntigravityRuntime() && !isClaudeModel) {
+            const meta = processedRequest.metadata ?? {};
+            processedRequest.metadata = meta;
+            if (typeof payload.requestId === 'string' && payload.requestId.trim().length) {
+                meta.__antigravityRequestId = String(payload.requestId).trim();
+                delete payload.requestId;
+            }
+            if (typeof payload.requestType === 'string' && payload.requestType.trim().length) {
+                meta.__antigravityRequestType = String(payload.requestType).trim();
+                delete payload.requestType;
+            }
+            if (typeof payload.userAgent === 'string' && payload.userAgent.trim().length) {
+                delete payload.userAgent;
+            }
+        }
         return processedRequest;
     }
     wantsUpstreamSse(request, context) {
@@ -108,16 +359,81 @@ export class GeminiCLIHttpProvider extends HttpTransportProvider {
     async finalizeRequestHeaders(headers, request) {
         const finalized = await super.finalizeRequestHeaders(headers, request);
         if (this.isAntigravityRuntime()) {
-            finalized['User-Agent'] = ANTIGRAVITY_HELPER_DEFAULTS.userAgent;
-            if (!this.hasNonEmptyString(finalized['Accept-Encoding'])) {
-                // 对齐旧版成功快照：使用 gzip, deflate, br
-                finalized['Accept-Encoding'] = 'gzip, deflate, br';
+            const deleteHeaderInsensitive = (key) => {
+                const target = key.toLowerCase();
+                for (const k of Object.keys(finalized)) {
+                    if (k.toLowerCase() === target) {
+                        delete finalized[k];
+                    }
+                }
+            };
+            const payload = this.resolvePayload(request).payload;
+            const meta = request.metadata ?? {};
+            const runtime = this.getCurrentRuntimeMetadata();
+            const isClaudeModel = this.isClaudeModelName(payload?.model);
+            const isClaudeThinking = typeof payload?.model === 'string' && payload.model.toLowerCase().includes('thinking');
+            const fingerprint = resolveAntigravityFingerprint(runtime);
+            const fingerprintHeaders = buildAntigravityFingerprintHeaders(fingerprint);
+            finalized['User-Agent'] = fingerprintHeaders['User-Agent'];
+            finalized['X-Goog-Api-Client'] = fingerprintHeaders['X-Goog-Api-Client'];
+            finalized['Client-Metadata'] = fingerprintHeaders['Client-Metadata'];
+            finalized['X-Goog-QuotaUser'] = fingerprintHeaders['X-Goog-QuotaUser'];
+            finalized['X-Client-Device-Id'] = fingerprintHeaders['X-Client-Device-Id'];
+            if (fingerprintHeaders['Accept-Encoding']) {
+                finalized['Accept-Encoding'] = fingerprintHeaders['Accept-Encoding'];
+            }
+            if (isClaudeModel) {
+                if (!finalized['Accept-Encoding']) {
+                    finalized['Accept-Encoding'] = 'gzip';
+                }
+                if (isClaudeThinking) {
+                    const existing = finalized['anthropic-beta'];
+                    const interleaved = 'interleaved-thinking-2025-05-14';
+                    finalized['anthropic-beta'] = existing && existing.length
+                        ? (existing.includes(interleaved) ? existing : `${existing},${interleaved}`)
+                        : interleaved;
+                }
             }
-            // 保留 X-Goog-Api-Client / Client-Metadata，由上游决定是否使用；
-            // 不再强行删除 Accept 头，维持默认的 text/event-stream。
+            else {
+                // gcli2api/opencode antigravity alignment: use fingerprint headers for non-Claude too.
+                if (!finalized['Accept-Encoding']) {
+                    finalized['Accept-Encoding'] = 'gzip';
+                }
+            }
+            const requestId = (typeof payload.requestId === 'string' && payload.requestId.trim().length ? payload.requestId.trim() : '') ||
+                (typeof meta.__antigravityRequestId === 'string' && meta.__antigravityRequestId.trim().length
+                    ? String(meta.__antigravityRequestId).trim()
+                    : '');
+            const requestType = (typeof payload.requestType === 'string' && payload.requestType.trim().length ? payload.requestType.trim() : '') ||
+                (typeof meta.__antigravityRequestType === 'string' && meta.__antigravityRequestType.trim().length
+                    ? String(meta.__antigravityRequestType).trim()
+                    : '');
+            if (requestId)
+                finalized['requestId'] = requestId;
+            if (requestType)
+                finalized['requestType'] = requestType;
         }
         return finalized;
     }
+    buildHttpRequestBody(request) {
+        const built = super.buildHttpRequestBody(request);
+        if (!this.isAntigravityRuntime() || !built || typeof built !== 'object') {
+            return built;
+        }
+        // gcli2api antigravity alignment: requestId/requestType are headers; JSON wrapper stays minimal.
+        return built;
+    }
+    isClaudeModelName(model) {
+        return typeof model === 'string' && model.toLowerCase().includes('claude');
+    }
+    generateSyntheticProjectId() {
+        const adjectives = ['useful', 'bright', 'swift', 'calm', 'bold'];
+        const nouns = ['fuze', 'wave', 'spark', 'flow', 'core'];
+        const adj = adjectives[Math.floor(Math.random() * adjectives.length)];
+        const noun = nouns[Math.floor(Math.random() * nouns.length)];
+        const randomPart = randomUUID().slice(0, 5).toLowerCase();
+        return `${adj}-${noun}-${randomPart}`;
+    }
     async postprocessResponse(response, context) {
         const processingTime = Date.now() - context.startTime;
         if (response && typeof response === 'object') {
@@ -178,7 +494,11 @@ export class GeminiCLIHttpProvider extends HttpTransportProvider {
         return super.wrapUpstreamSseResponse(normalizer, context);
     }
     isAntigravityRuntime() {
-        return (this.oauthProviderId || '').toLowerCase() === 'antigravity';
+        const fromConfig = typeof this.config?.config?.providerId === 'string' && this.config.config.providerId.trim()
+            ? this.config.config.providerId.trim().toLowerCase()
+            : '';
+        const fromOAuth = typeof this.oauthProviderId === 'string' ? this.oauthProviderId.trim().toLowerCase() : '';
+        return fromConfig === 'antigravity' || fromOAuth === 'antigravity';
     }
     resolvePayload(source) {
         if (this.hasDataEnvelope(source)) {
@@ -231,62 +551,38 @@ export class GeminiCLIHttpProvider extends HttpTransportProvider {
     ensureRequestMetadata(payload) {
         const isAntigravity = this.isAntigravityRuntime();
         if (!this.hasNonEmptyString(payload.requestId)) {
+            // gcli2api antigravity alignment: requestId uses req- prefix (carried as HTTP header).
             payload.requestId = `req-${randomUUID()}`;
         }
-        // 对齐 gcli2api：Antigravity 运行时不发送 session_id，其它运行时保持原有行为。
-        if (!isAntigravity && !this.hasNonEmptyString(payload.session_id)) {
-            payload.session_id = `session-${randomUUID()}`;
-        }
-        if (!this.hasNonEmptyString(payload.userAgent)) {
-            payload.userAgent = this.oauthProviderId === 'antigravity' ? 'antigravity' : 'routecodex';
-        }
-        // 对齐 gcli2api：Antigravity 路径统一标记 requestType=agent，
-        // 不区分模型（claude / gemini 均走 agent 配额路径）。
-        if (isAntigravity && !this.hasNonEmptyString(payload.requestType)) {
-            payload.requestType = 'agent';
-        }
-        // 对齐 gcli2api：Antigravity 统一注入固定 systemInstruction，
-        // 将已有 systemInstruction.parts 追加在 Antigravity 提示词之后。
+        // Never inject legacy snake_case session_id.
         if (isAntigravity) {
-            const requestContainer = payload.request && typeof payload.request === 'object'
-                ? payload.request
-                : undefined;
-            const currentSystemInstruction = payload.systemInstruction ??
-                (requestContainer && requestContainer.systemInstruction);
-            const currentParts = currentSystemInstruction && typeof currentSystemInstruction === 'object' && !Array.isArray(currentSystemInstruction)
-                ? currentSystemInstruction.parts
-                : Array.isArray(currentSystemInstruction)
-                    ? currentSystemInstruction
-                    : undefined;
-            const antigravityPrompt = 'Please ignore the following [ignore]You are Antigravity, a powerful agentic AI coding assistant designed by the Google Deepmind team working on Advanced Agentic Coding.' +
-                'You are pair programming with a USER to solve their coding task. The task may require creating a new codebase, modifying or debugging an existing codebase, or simply answering a question.' +
-                '**Absolute paths only****Proactiveness**[/ignore]';
-            const nextParts = [{ text: antigravityPrompt }];
-            if (Array.isArray(currentParts) && currentParts.length > 0) {
-                for (const part of currentParts) {
-                    if (part && typeof part === 'object') {
-                        const text = String(part.text ?? '').trim();
-                        if (text.length) {
-                            nextParts.push({ text });
-                        }
-                    }
-                }
-            }
-            const nextSystemInstruction = {
-                parts: nextParts,
-                ...(currentSystemInstruction &&
-                    typeof currentSystemInstruction === 'object' &&
-                    !Array.isArray(currentSystemInstruction) &&
-                    typeof currentSystemInstruction.role === 'string'
-                    ? { role: currentSystemInstruction.role }
-                    : {})
-            };
-            payload.systemInstruction = nextSystemInstruction;
-            if (requestContainer && typeof requestContainer === 'object') {
-                requestContainer.systemInstruction = nextSystemInstruction;
-            }
+            delete payload.session_id;
         }
     }
+    isAntigravityMinimalCompatibilityEnabled() {
+        const raw = (process.env.ROUTECODEX_ANTIGRAVITY_HEADER_MODE || process.env.RCC_ANTIGRAVITY_HEADER_MODE || '')
+            .trim()
+            .toLowerCase();
+        // Legacy switch kept for older deployments; RouteCodex now follows gcli2api antigravity header style by default.
+        // This method is currently unused (we avoid forcing sessionId injection and keep requestId/requestType in headers).
+        if (!raw) {
+            return false;
+        }
+        if (raw === 'standard' || raw === 'full' || raw === 'headers') {
+            return false;
+        }
+        return raw === 'minimal' || raw === 'gcli2api';
+    }
+    buildAntigravitySignatureSessionKey(options) {
+        const modelKeyRaw = typeof options.model === 'string' ? options.model.trim().toLowerCase() : 'unknown';
+        // Antigravity contract: strip tier suffix to reduce cache misses when tier changes.
+        const modelKey = modelKeyRaw.replace(/-(minimal|low|medium|high)$/i, '');
+        const projectPart = typeof options.project === 'string' && options.project.trim().length ? options.project.trim() : 'default';
+        const conversationPart = typeof options.conversationKey === 'string' && options.conversationKey.trim().length
+            ? options.conversationKey.trim()
+            : 'default';
+        return `${ANTIGRAVITY_PLUGIN_SESSION_ID}:${modelKey}:${projectPart}:${conversationPart}`;
+    }
     flattenRequestContainer(payload) {
         const requestContainer = payload.request && typeof payload.request === 'object'
             ? payload.request
@@ -354,7 +650,9 @@ class GeminiSseNormalizer extends Transform {
                 // or assume separate handling. Safe approach: treat as bytes.
                 text = this.decoder.write(Buffer.from(String(chunk), 'utf8'));
             }
-            this.buffer += text.replace(/\r\n/g, '\n');
+            // Upstream can use CRLF (\r\n), and chunk boundaries may split \r and \n.
+            // Normalize by removing all \r so the event separator is always \n\n.
+            this.buffer += text.replace(/\r/g, '');
             this.processBuffered();
         }
         callback();
@@ -362,14 +660,9 @@ class GeminiSseNormalizer extends Transform {
     _flush(callback) {
         const remaining = this.decoder.end();
         if (remaining) {
-            this.buffer += remaining.replace(/\r\n/g, '\n');
+            this.buffer += remaining.replace(/\r/g, '');
         }
         this.processBuffered(true);
-        console.log('[GeminiSseNormalizer] Stream complete:', {
-            totalChunks: this.chunkCounter,
-            processedEvents: this.processedEventCounter,
-            emittedEvents: this.eventCounter
-        });
         if (this.lastDonePayload) {
             this.pushEvent('gemini.done', this.lastDonePayload);
             this.lastDonePayload = null;
@@ -389,24 +682,11 @@ class GeminiSseNormalizer extends Transform {
             this.processEvent(rawEvent);
         }
         if (flush && this.buffer.trim().length) {
-            console.log('[GeminiSseNormalizer] Final buffer flush:', {
-                bufferLength: this.buffer.length,
-                bufferPreview: this.buffer.slice(0, 300),
-                eventsFoundInLoop: eventsFound
-            });
             this.processEvent(this.buffer);
             this.buffer = '';
         }
-        else if (flush) {
-            console.log('[GeminiSseNormalizer] Flush called but buffer empty:', {
-                eventsFoundInLoop: eventsFound
-            });
-        }
     }
     processEvent(rawEvent) {
-        if (process.env.ROUTECODEX_DEBUG_GEMINI_RAW === '1') {
-            console.log('[DEBUG-GEMINI-INPUT]', JSON.stringify(rawEvent));
-        }
         this.processedEventCounter++;
         const trimmed = rawEvent.trim();
         if (!trimmed.length) {
@@ -429,22 +709,12 @@ class GeminiSseNormalizer extends Transform {
             this.capturedEvents.push(parsed);
             const response = parsed?.response;
             if (!response || typeof response !== 'object') {
-                // Log dropped events for debugging
-                console.warn('[GeminiSseNormalizer] Dropped event without valid response field:', {
-                    hasResponse: !!parsed?.response,
-                    parsedKeys: Object.keys(parsed || {}),
-                    payloadPreview: payloadText.slice(0, 150)
-                });
                 return;
             }
             this.emitCandidateParts(response);
         }
         catch (err) {
-            // Log parse failures for debugging
-            console.error('[GeminiSseNormalizer] Failed to parse SSE payload:', {
-                error: err instanceof Error ? err.message : String(err),
-                payloadPreview: payloadText.slice(0, 200)
-            });
+            // ignore parse errors; upstream stream snapshots (if enabled) are used for debugging
         }
     }
     emitCandidateParts(response) {
@@ -458,8 +728,9 @@ class GeminiSseNormalizer extends Transform {
             const partsRaw = content?.parts;
             const parts = Array.isArray(partsRaw) ? partsRaw : [];
             for (const part of parts) {
-                if (!part || typeof part !== 'object')
+                if (!part || typeof part !== 'object') {
                     continue;
+                }
                 // Send raw Gemini part - let llmswitch-core handle the conversion to target protocol
                 this.pushEvent('gemini.data', {
                     candidateIndex: index,