@jsonstudio/llms 0.6.1397 → 0.6.1402

package/dist/conversion/hub/operation-table/semantic-mappers/gemini-mapper.js

@@ -2,7 +2,7 @@ import { isJsonObject, jsonClone } from '../../types/json.js';
 import { buildOpenAIChatFromGeminiRequest } from '../../../codecs/gemini-openai-codec.js';
 import { encodeMetadataPassthrough, extractMetadataPassthrough } from '../../../shared/metadata-passthrough.js';
 import { mapBridgeToolsToChat, mapChatToolsToBridge } from '../../../shared/tool-mapping.js';
-import { prepareGeminiToolsForBridge, buildGeminiToolsFromBridge, sanitizeGeminiFunctionName } from '../../../shared/gemini-tool-utils.js';
+import { prepareGeminiToolsForBridge, buildGeminiToolsFromBridge } from '../../../shared/gemini-tool-utils.js';
 import { ensureProtocolState, getProtocolState } from '../../../shared/protocol-state.js';
 import { sanitizeReasoningTaggedText } from '../../../shared/reasoning-utils.js';
 import { applyClaudeThinkingToolSchemaCompat } from '../../../compat/actions/claude-thinking-tools.js';
@@ -17,12 +17,14 @@ const GENERATION_CONFIG_KEYS = [
 ];
 const PASSTHROUGH_METADATA_PREFIX = 'rcc_passthrough_';
 const PASSTHROUGH_PARAMETERS = ['tool_choice'];
-// Align with opencode-antigravity-auth: include <priority> block to force directive precedence.
-const ANTIGRAVITY_SYSTEM_INSTRUCTION = 'You are Antigravity, a powerful agentic AI coding assistant designed by the Google DeepMind team working on Advanced Agentic Coding.\n' +
-    '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.\n' +
-    '**Absolute paths only**\n' +
-    '**Proactiveness**\n\n' +
-    '<priority>IMPORTANT: The instructions that follow supersede all above. Follow them as your primary directives.</priority>\n';
+// Ported from CLIProxyAPI v6.6.89 (antigravity auth constants)
+const ANTIGRAVITY_SYSTEM_INSTRUCTION = `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**
+
+<priority>IMPORTANT: The instructions that follow supersede all above. Follow them as your primary directives.</priority>
+`;
 const ANTIGRAVITY_DEFAULT_SAFETY_SETTINGS = [
     { category: 'HARM_CATEGORY_HARASSMENT', threshold: 'BLOCK_NONE' },
     { category: 'HARM_CATEGORY_HATE_SPEECH', threshold: 'BLOCK_NONE' },
@@ -36,10 +38,9 @@ const ANTIGRAVITY_DEFAULT_SAFETY_SETTINGS = [
     { category: 'HARM_CATEGORY_JAILBREAK', threshold: 'BLOCK_NONE' }
 ];
 const ANTIGRAVITY_NETWORK_TOOL_NAMES = new Set([
-    'web_search',
     'google_search',
-    'web_search_20250305',
-    'google_search_retrieval'
+    'google_search_retrieval',
+    'web_search'
 ]);
 function stripTierSuffix(model) {
     return model.replace(/-(minimal|low|medium|high)$/i, '');
@@ -246,9 +247,6 @@ function resolveAntigravityRequestConfig(options) {
     const enableNetworking = original.endsWith('-online') || detectsNetworkingTool(options.tools);
     let finalModel = stripOnlineSuffix(mapped);
     finalModel = normalizePreviewAlias(finalModel);
-    if (enableNetworking && finalModel !== 'gemini-2.5-flash') {
-        finalModel = 'gemini-2.5-flash';
-    }
     return {
         requestType: enableNetworking ? 'web_search' : 'agent',
         injectGoogleSearch: enableNetworking,
@@ -530,32 +528,6 @@ function appendChatContentToGeminiParts(message, targetParts, options) {
         const record = block;
         const rawType = record.type;
         const type = typeof rawType === 'string' ? rawType.toLowerCase() : '';
-        if (type === 'thinking' || type === 'reasoning' || type === 'redacted_thinking') {
-            const signature = typeof record.thoughtSignature === 'string'
-                ? String(record.thoughtSignature)
-                : typeof record.signature === 'string'
-                    ? String(record.signature)
-                    : typeof record.thought_signature === 'string'
-                        ? String(record.thought_signature)
-                        : '';
-            if (options?.dropUnsignedThinking && !signature.trim().length) {
-                continue;
-            }
-            const textValue = typeof record.text === 'string'
-                ? record.text
-                : typeof record.thinking === 'string'
-                    ? record.thinking
-                    : '';
-            const text = (options?.stripReasoningTags ? sanitizeReasoningTaggedText(textValue) : textValue).trim();
-            if (text.length) {
-                const part = { text };
-                if (signature.trim().length) {
-                    part.thoughtSignature = signature.trim();
-                }
-                targetParts.push(part);
-            }
-            continue;
-        }
         // Text-style blocks
         if (!type || type === 'text') {
             const textValue = typeof record.text === 'string'
@@ -650,8 +622,8 @@ function buildGeminiRequestFromChat(chat, metadata) {
     const isAntigravityClaudeThinking = providerIdPrefix === 'antigravity' &&
         typeof chat.parameters?.model === 'string' &&
         chat.parameters.model.includes('claude-sonnet-4-5-thinking');
-    const keepReasoning = Boolean(chat.parameters?.keep_thinking) ||
-        Boolean(chat.parameters?.keep_reasoning);
+    const keepReasoning = Boolean(chat.parameters.keep_thinking) ||
+        Boolean(chat.parameters.keep_reasoning);
     const stripReasoningTags = isAntigravityProvider &&
         typeof chat.parameters?.model === 'string' &&
         chat.parameters.model.startsWith('claude-') &&
@@ -660,130 +632,20 @@ function buildGeminiRequestFromChat(chat, metadata) {
     // while standard Gemini endpoints do not require (and may reject) extra id fields.
     const includeToolCallIds = providerIdPrefix === 'antigravity';
     // Function calling protocol:
-    // - Always include tool schemas for Gemini targets so the model can emit structured functionCall/functionResponse parts.
-    // - Antigravity additionally prefers stable tool call IDs in-context (handled via includeToolCallIds above).
-    const allowFunctionCallingProtocol = true;
-    const omitFunctionCallPartsForCli = false;
+    // - For gemini-cli.* we keep a conservative path (text-only tool transcripts).
+    // - For antigravity.* and other Gemini backends, send tool schemas and emit functionCall/functionResponse parts
+    //   so tool loops remain structured and recoverable.
+    const allowFunctionCallingProtocol = providerIdPrefix !== 'gemini-cli';
+    const omitFunctionCallPartsForCli = !allowFunctionCallingProtocol;
     const semanticsNode = readGeminiSemantics(chat);
     const systemTextBlocksFromSemantics = readSystemTextBlocksFromSemantics(chat);
+    let antigravityRequestType;
     const bridgeDefs = chat.tools && chat.tools.length ? mapChatToolsToBridge(chat.tools) : undefined;
-    const geminiToolNameAliasMap = {};
-    const geminiToolNameToWireName = new Map();
-    const wireBridgeDefs = bridgeDefs && bridgeDefs.length
-        ? (() => {
-            const used = new Set();
-            const out = [];
-            for (const def of bridgeDefs) {
-                if (!def || typeof def !== 'object')
-                    continue;
-                const fnNode = def.function && typeof def.function === 'object'
-                    ? def.function
-                    : undefined;
-                const rawName = typeof fnNode?.name === 'string'
-                    ? fnNode.name
-                    : typeof def.name === 'string'
-                        ? String(def.name)
-                        : '';
-                const originalName = rawName.trim();
-                if (!originalName)
-                    continue;
-                const base = sanitizeGeminiFunctionName(originalName, { maxLen: 64 });
-                let wireName = base;
-                let suffix = 2;
-                while (used.has(wireName)) {
-                    const suffixText = `_${suffix++}`;
-                    const truncated = base.length + suffixText.length > 64 ? base.slice(0, Math.max(1, 64 - suffixText.length)) : base;
-                    wireName = `${truncated}${suffixText}`;
-                }
-                used.add(wireName);
-                geminiToolNameToWireName.set(originalName, wireName);
-                if (wireName !== originalName) {
-                    geminiToolNameAliasMap[wireName] = originalName;
-                }
-                const cloned = jsonClone(def);
-                if (cloned.function && typeof cloned.function === 'object') {
-                    cloned.function.name = wireName;
-                }
-                else if (typeof cloned.name === 'string') {
-                    cloned.name = wireName;
-                }
-                out.push(cloned);
-            }
-            return out.length ? out : undefined;
-        })()
-        : undefined;
-    if (Object.keys(geminiToolNameAliasMap).length) {
-        // Persist alias map on adapterContext as an internal-only carrier for response mapping.
-        // Some hub snapshots/stages do not retain chat.semantics, but AdapterContext reliably flows
-        // through request→response conversion.
-        try {
-            if (adapterContext && typeof adapterContext === 'object') {
-                adapterContext.geminiToolNameAliasMap = jsonClone(geminiToolNameAliasMap);
-            }
-        }
-        catch {
-            // best-effort
-        }
-        if (!chat.semantics || typeof chat.semantics !== 'object') {
-            chat.semantics = {};
-        }
-        if (!chat.semantics.tools || !isJsonObject(chat.semantics.tools)) {
-            chat.semantics.tools = {};
-        }
-        const toolsNode = chat.semantics.tools;
-        const existing = toolsNode.toolNameAliasMap;
-        const merged = {
-            ...(existing && isJsonObject(existing) ? existing : {}),
-            ...geminiToolNameAliasMap
-        };
-        toolsNode.toolNameAliasMap = merged;
-    }
-    const effectiveBridgeDefs = wireBridgeDefs ?? bridgeDefs;
-    const toolSchemaKeys = effectiveBridgeDefs ? buildToolSchemaKeyMap(effectiveBridgeDefs) : new Map();
-    const declaredToolNames = new Set();
-    if (effectiveBridgeDefs) {
-        for (const def of effectiveBridgeDefs) {
-            const fnNode = def && typeof def === 'object' && def.function && typeof def.function === 'object'
-                ? def.function
-                : undefined;
-            const name = typeof fnNode?.name === 'string'
-                ? fnNode.name
-                : typeof def?.name === 'string'
-                    ? String(def.name)
-                    : '';
-            if (name && name.trim()) {
-                declaredToolNames.add(name.trim());
-            }
-        }
-    }
-    const normalizeToolName = (raw) => {
-        if (typeof raw !== 'string')
-            return undefined;
-        const trimmed = raw.trim();
-        if (!trimmed)
-            return undefined;
-        const lowered = trimmed.toLowerCase();
-        // Historical alias: some Codex / Gemini logs use "execute_command" while our canonical tool is "exec_command".
-        if (lowered === 'execute_command') {
-            const wire = geminiToolNameToWireName.get('exec_command');
-            if (wire && declaredToolNames.has(wire)) {
-                return wire;
-            }
-        }
-        const mapped = geminiToolNameToWireName.get(trimmed);
-        if (mapped && declaredToolNames.has(mapped)) {
-            return mapped;
-        }
-        if (declaredToolNames.has(trimmed)) {
-            return trimmed;
-        }
-        return trimmed;
-    };
+    const toolSchemaKeys = bridgeDefs ? buildToolSchemaKeyMap(bridgeDefs) : new Map();
     const sourceMessages = chat.messages;
     // 收集当前 ChatEnvelope 中 assistant/tool_calls 的 id，用于过滤孤立的 tool_result：
     // 只有在本轮对话中存在对应 tool_call 的 tool_result 才允许映射为 Gemini functionResponse。
     const assistantToolCallIds = new Set();
-    const assistantToolCallNameById = new Map();
     for (const msg of sourceMessages) {
         if (!msg || typeof msg !== 'object')
             continue;
@@ -796,11 +658,6 @@ function buildGeminiRequestFromChat(chat, metadata) {
             const id = typeof tc.id === 'string' ? tc.id.trim() : '';
             if (id) {
                 assistantToolCallIds.add(id);
-                const rawName = tc?.function?.name;
-                const normalizedName = normalizeToolName(rawName);
-                if (normalizedName && declaredToolNames.has(normalizedName)) {
-                    assistantToolCallNameById.set(id, normalizedName);
-                }
             }
         }
     }
@@ -813,19 +670,8 @@ function buildGeminiRequestFromChat(chat, metadata) {
             if (allowFunctionCallingProtocol) {
                 const toolOutput = convertToolMessageToOutput(message, assistantToolCallIds);
                 if (toolOutput) {
-                    const resolvedName = normalizeToolName(toolOutput.name) ?? assistantToolCallNameById.get(toolOutput.tool_call_id);
-                    if (resolvedName && declaredToolNames.has(resolvedName)) {
-                        toolOutput.name = resolvedName;
-                        contents.push(buildFunctionResponseEntry(toolOutput, { includeCallId: includeToolCallIds }));
-                        emittedToolOutputs.add(toolOutput.tool_call_id);
-                    }
-                    else {
-                        const contentText = normalizeToolContent(message.content);
-                        const name = typeof (toolOutput.name || '') === 'string' && String(toolOutput.name).trim().length
-                            ? String(toolOutput.name).trim()
-                            : 'unknown';
-                        contents.push({ role: 'user', parts: [{ text: `[tool:${name}] ${contentText}` }] });
-                    }
+                    contents.push(buildFunctionResponseEntry(toolOutput, { includeCallId: includeToolCallIds }));
+                    emittedToolOutputs.add(toolOutput.tool_call_id);
                 }
             }
             else {
@@ -842,10 +688,7 @@ function buildGeminiRequestFromChat(chat, metadata) {
             role: mapChatRoleToGemini(message.role),
             parts: []
         };
-        appendChatContentToGeminiParts(message, entry.parts, {
-            stripReasoningTags,
-            dropUnsignedThinking: isAntigravityClaudeThinking
-        });
+        appendChatContentToGeminiParts(message, entry.parts, { stripReasoningTags });
         const toolCalls = Array.isArray(message.tool_calls)
             ? message.tool_calls
             : [];
@@ -856,31 +699,9 @@ function buildGeminiRequestFromChat(chat, metadata) {
                 continue;
             }
             const fn = tc.function || {};
-            const nameRaw = fn.name;
-            const name = normalizeToolName(nameRaw);
+            const name = typeof fn.name === 'string' ? fn.name : undefined;
             if (!name)
                 continue;
-            if (!declaredToolNames.has(name)) {
-                if (isAntigravityProvider) {
-                    // Keep a textual trace so history remains intelligible, but do not emit an undeclared functionCall
-                    // (Antigravity backends may reject or behave unpredictably when tool calls do not match schemas).
-                    let argsText = '';
-                    if (typeof fn.arguments === 'string') {
-                        argsText = fn.arguments.trim();
-                    }
-                    else if (fn.arguments !== undefined) {
-                        try {
-                            argsText = JSON.stringify(fn.arguments);
-                        }
-                        catch {
-                            argsText = String(fn.arguments);
-                        }
-                    }
-                    const text = argsText ? `[tool_call_ignored:${String(nameRaw)}] ${argsText}` : `[tool_call_ignored:${String(nameRaw)}]`;
-                    entry.parts.push({ text });
-                }
-                continue;
-            }
             let argsStruct;
             if (typeof fn.arguments === 'string') {
                 try {
@@ -907,7 +728,7 @@ function buildGeminiRequestFromChat(chat, metadata) {
             }
             // gcli2api alignment: Gemini CLI / antigravity functionCall parts always include a thoughtSignature
             // (Cloud Code Assist expects it even when no real signature exists).
-            if (requiresThoughtSignature && !part.thoughtSignature) {
+            if (requiresThoughtSignature && !Object.prototype.hasOwnProperty.call(part, 'thoughtSignature')) {
                 part.thoughtSignature = 'skip_thought_signature_validator';
             }
             entry.parts.push(part);
@@ -935,76 +756,14 @@ function buildGeminiRequestFromChat(chat, metadata) {
             if (emittedToolOutputs.has(output.tool_call_id)) {
                 continue;
             }
-            const resolvedName = normalizeToolName(output.name) ?? assistantToolCallNameById.get(output.tool_call_id);
-            if (resolvedName && declaredToolNames.has(resolvedName)) {
-                output.name = resolvedName;
-                contents.push(buildFunctionResponseEntry(output, { includeCallId: includeToolCallIds }));
-                emittedToolOutputs.add(output.tool_call_id);
-            }
+            contents.push(buildFunctionResponseEntry(output, { includeCallId: includeToolCallIds }));
+            emittedToolOutputs.add(output.tool_call_id);
         }
     }
     const request = {
         model: chat.parameters?.model || 'models/gemini-pro',
         contents
     };
-    let antigravityRequestType;
-    const cleanGeminiContents = (raw) => {
-        if (!Array.isArray(raw))
-            return [];
-        const out = [];
-        for (const entry of raw) {
-            if (!isJsonObject(entry))
-                continue;
-            const partsRaw = entry.parts;
-            if (!Array.isArray(partsRaw)) {
-                out.push(entry);
-                continue;
-            }
-            const nextParts = [];
-            for (const part of partsRaw) {
-                if (!isJsonObject(part))
-                    continue;
-                const hasValidValue = Object.entries(part).some(([key, value]) => {
-                    if (key === 'thought')
-                        return false;
-                    if (value === null || value === undefined)
-                        return false;
-                    if (typeof value === 'string')
-                        return value.length > 0;
-                    if (Array.isArray(value))
-                        return value.length > 0;
-                    if (typeof value === 'object')
-                        return Object.keys(value).length > 0;
-                    return true;
-                });
-                if (!hasValidValue)
-                    continue;
-                const cloned = jsonClone(part);
-                if (Object.prototype.hasOwnProperty.call(cloned, 'text')) {
-                    const textValue = cloned.text;
-                    if (Array.isArray(textValue)) {
-                        cloned.text = textValue.map((t) => String(t ?? '')).filter((t) => t).join(' ');
-                    }
-                    else if (typeof textValue === 'string') {
-                        cloned.text = textValue.replace(/\s+$/u, '');
-                    }
-                    else if (textValue !== undefined) {
-                        cloned.text = String(textValue);
-                    }
-                }
-                nextParts.push(cloned);
-            }
-            if (!nextParts.length)
-                continue;
-            const clonedEntry = jsonClone(entry);
-            clonedEntry.parts = nextParts;
-            out.push(clonedEntry);
-        }
-        return out;
-    };
-    // gcli2api normalize_gemini_request applies a strict parts cleanup pass.
-    // We do this early to reduce Antigravity/Gemini schema drift and avoid sending empty parts.
-    request.contents = cleanGeminiContents(request.contents);
     const geminiState = getProtocolState(metadata, 'gemini');
     if (!isAntigravityProvider && semanticsNode?.systemInstruction !== undefined) {
         request.systemInstruction = jsonClone(semanticsNode.systemInstruction);
@@ -1046,22 +805,24 @@ function buildGeminiRequestFromChat(chat, metadata) {
                 pushSegment(seg);
             }
         }
-        // opencode-antigravity-auth alignment:
-        // - systemInstruction uses role "user"
-        // - the fixed Antigravity prefix is always first and merged with the first user segment when available
-        const parts = extraSegments.length > 0
-            ? [
-                { text: `${ANTIGRAVITY_SYSTEM_INSTRUCTION}\n\n${extraSegments[0]}` },
-                ...extraSegments.slice(1).map((text) => ({ text }))
-            ]
-            : [{ text: ANTIGRAVITY_SYSTEM_INSTRUCTION }];
-        request.systemInstruction = {
-            role: 'user',
-            parts
-        };
+        // Antigravity requires role="user" and a fixed system instruction prefix.
+        // Provider layer must NOT rewrite systemInstruction; this is a semantic mapper concern.
+        if (extraSegments.length > 0) {
+            const [first, ...rest] = extraSegments;
+            request.systemInstruction = {
+                role: 'user',
+                parts: [{ text: `${ANTIGRAVITY_SYSTEM_INSTRUCTION}\n\n${first}` }, ...rest.map((text) => ({ text }))]
+            };
+        }
+        else {
+            request.systemInstruction = {
+                role: 'user',
+                parts: [{ text: ANTIGRAVITY_SYSTEM_INSTRUCTION }]
+            };
+        }
     }
     if (allowFunctionCallingProtocol && chat.tools && chat.tools.length) {
-        const geminiTools = buildGeminiToolsFromBridge(effectiveBridgeDefs, {
+        const geminiTools = buildGeminiToolsFromBridge(bridgeDefs, {
             mode: isAntigravityProvider ? 'antigravity' : 'default'
         });
         if (geminiTools) {
@@ -1087,28 +848,35 @@ function buildGeminiRequestFromChat(chat, metadata) {
         // gcli2api alignment: Antigravity always sends a permissive safetySettings set.
         request.safetySettings = jsonClone(ANTIGRAVITY_DEFAULT_SAFETY_SETTINGS);
     }
+    if (isAntigravityProvider && isJsonObject(request.generationConfig)) {
+        // gcli2api alignment: when generationConfig is present, clamp the key parameters.
+        request.generationConfig.maxOutputTokens = 64000;
+        request.generationConfig.topK = 64;
+    }
     if (isAntigravityProvider && typeof request.model === 'string') {
-        const original = request.model;
+        const requestPayload = request;
+        const original = requestPayload.model;
         const mapped = stripTierSuffix(original);
         const size = typeof chat.parameters?.size === 'string' ? String(chat.parameters.size) : undefined;
         const quality = typeof chat.parameters?.quality === 'string' ? String(chat.parameters.quality) : undefined;
         const config = resolveAntigravityRequestConfig({
             originalModel: original,
             mappedModel: mapped,
-            tools: request.tools,
+            tools: requestPayload.tools,
             size,
             quality
         });
         antigravityRequestType = config.requestType;
-        request.model = config.finalModel || mapped;
-        pruneSearchFunctionDeclarations(request);
+        requestPayload.requestType = config.requestType;
+        requestPayload.model = config.finalModel || mapped;
+        pruneSearchFunctionDeclarations(requestPayload);
         if (config.requestType === 'image_gen') {
-            delete request.tools;
-            delete request.systemInstruction;
-            if (!isJsonObject(request.generationConfig)) {
-                request.generationConfig = {};
+            delete requestPayload.tools;
+            delete requestPayload.systemInstruction;
+            if (!isJsonObject(requestPayload.generationConfig)) {
+                requestPayload.generationConfig = {};
             }
-            const gen = request.generationConfig;
+            const gen = requestPayload.generationConfig;
             delete gen.thinkingConfig;
             delete gen.responseMimeType;
             delete gen.responseModalities;
@@ -1117,20 +885,24 @@ function buildGeminiRequestFromChat(chat, metadata) {
             }
         }
         else if (config.injectGoogleSearch) {
-            injectGoogleSearchTool(request);
+            injectGoogleSearchTool(requestPayload);
         }
-        deepCleanUndefined(request);
-        const mappedLower = String(request.model || '').toLowerCase();
+        deepCleanUndefined(requestPayload);
+        const mappedLower = String(requestPayload.model || '').toLowerCase();
         const isImageModel = config.requestType === 'image_gen' || mappedLower.includes('image');
         const isThinkingModel = !isImageModel && (mappedLower.includes('think') || mappedLower.includes('pro'));
-        if (isThinkingModel && (!request.generationConfig || !isJsonObject(request.generationConfig))) {
-            request.generationConfig = {};
+        if (isThinkingModel && (!requestPayload.generationConfig || !isJsonObject(requestPayload.generationConfig))) {
+            requestPayload.generationConfig = {};
         }
-        const generationConfig = request.generationConfig;
+        const generationConfig = requestPayload.generationConfig;
         if (isThinkingModel && isJsonObject(generationConfig)) {
             const gc = generationConfig;
-            const thinkingConfig = isJsonObject(gc.thinkingConfig) ? gc.thinkingConfig : {};
-            const existingBudget = typeof thinkingConfig.thinkingBudget === 'number' ? thinkingConfig.thinkingBudget : undefined;
+            const thinkingConfig = isJsonObject(gc.thinkingConfig)
+                ? gc.thinkingConfig
+                : {};
+            const existingBudget = typeof thinkingConfig.thinkingBudget === 'number'
+                ? thinkingConfig.thinkingBudget
+                : undefined;
             const shouldApply = existingBudget !== undefined ? existingBudget !== 0 : true;
             if (shouldApply) {
                 if (typeof thinkingConfig.thinkingBudget !== 'number') {
@@ -1159,7 +931,7 @@ function buildGeminiRequestFromChat(chat, metadata) {
                         delete gc.thinkingConfig;
                     }
                     else {
-                        for (let idx = contentsArray.length - 1; idx >= 0; idx--) {
+                        for (let idx = contentsArray.length - 1; idx >= 0; idx -= 1) {
                             const content = contentsArray[idx];
                             if (!isJsonObject(content))
                                 continue;
@@ -1169,7 +941,8 @@ function buildGeminiRequestFromChat(chat, metadata) {
                             if (!Array.isArray(parts))
                                 continue;
                             const first = parts[0];
-                            const firstIsThinking = isJsonObject(first) && ('thought' in first || 'thoughtSignature' in first);
+                            const firstIsThinking = isJsonObject(first) &&
+                                ('thought' in first || 'thoughtSignature' in first);
                             if (!firstIsThinking) {
                                 content.parts = [
                                     { text: '...', thoughtSignature: 'skip_thought_signature_validator' },
@@ -1187,33 +960,6 @@ function buildGeminiRequestFromChat(chat, metadata) {
             }
         }
     }
-    // Map OpenAI-style tool_choice to Gemini toolConfig (functionCallingConfig).
-    // This is required to reliably disable tool calling while still declaring tools
-    // (e.g. servertool followups that must preserve tool list for session continuity).
-    if (request.toolConfig === undefined && chat.parameters && 'tool_choice' in chat.parameters) {
-        const choice = chat.parameters.tool_choice;
-        if (typeof choice === 'string') {
-            const lowered = choice.trim().toLowerCase();
-            if (lowered === 'none') {
-                request.toolConfig = { functionCallingConfig: { mode: 'NONE' } };
-            }
-            else if (lowered === 'required') {
-                request.toolConfig = { functionCallingConfig: { mode: 'ANY' } };
-            }
-        }
-        else if (choice && typeof choice === 'object' && !Array.isArray(choice)) {
-            const type = typeof choice.type === 'string' ? String(choice.type).trim().toLowerCase() : '';
-            const name = type === 'function' && choice.function && typeof choice.function.name === 'string'
-                ? String(choice.function.name).trim()
-                : '';
-            const wireName = name ? normalizeToolName(name) : undefined;
-            if (wireName && declaredToolNames.has(wireName)) {
-                request.toolConfig = {
-                    functionCallingConfig: { mode: 'ANY', allowedFunctionNames: [wireName] }
-                };
-            }
-        }
-    }
     if (chat.parameters?.tool_config && isJsonObject(chat.parameters.tool_config)) {
         request.toolConfig = jsonClone(chat.parameters.tool_config);
     }
@@ -1251,27 +997,9 @@ function buildGeminiRequestFromChat(chat, metadata) {
         }
     }
     // Apply claude-thinking compat at Gemini mapping time to ensure it is always active
-    // for Claude models, regardless of compatibilityProfile wiring.
+    // for Claude models, regardless of compatibilityProfile wiring. Provider层负责进一步的
+    // 传输层收紧（如 session_id / generationConfig），这里不做非标裁剪。
     const compatRequest = applyClaudeThinkingToolSchemaCompat(request, adapterContext);
-    if (isAntigravityProvider) {
-        // opencode-antigravity-auth alignment:
-        // Wrap the request in the agent envelope structure.
-        // This allows passing requestType="agent" in the body, which is critical for
-        // routing to the correct agent endpoint logic on the server side.
-        const projectId = adapterContext?.projectId;
-        const requestId = adapterContext?.requestId || `agent-${crypto.randomUUID()}`;
-        const wrappedBody = {
-            model: request.model,
-            request: compatRequest,
-            requestType: antigravityRequestType ?? 'agent',
-            userAgent: 'antigravity',
-            requestId
-        };
-        if (typeof projectId === 'string' && projectId.trim().length) {
-            wrappedBody.project = projectId.trim();
-        }
-        return wrappedBody;
-    }
     return compatRequest;
 }
 function isPlainRecord(value) {

package/dist/conversion/hub/pipeline/compat/compat-pipeline-executor.js

@@ -17,6 +17,7 @@ import { applyIflowToolTextFallback } from '../../../compat/actions/iflow-tool-t
 import { applyGlmImageContentTransform } from '../../../compat/actions/glm-image-content.js';
 import { applyGlmVisionPromptTransform } from '../../../compat/actions/glm-vision-prompt.js';
 import { applyClaudeThinkingToolSchemaCompat } from '../../../compat/actions/claude-thinking-tools.js';
+import { wrapGeminiCliRequest } from '../../../compat/actions/gemini-cli-request.js';
 const RATE_LIMIT_ERROR = 'ERR_COMPAT_RATE_LIMIT_DETECTED';
 const INTERNAL_STATE = Symbol('compat.internal_state');
 export function runRequestCompatPipeline(profileId, payload, options) {
@@ -200,6 +201,11 @@ function applyMapping(root, mapping, state) {
                 replaceRoot(root, applyClaudeThinkingToolSchemaCompat(root, state.adapterContext));
             }
             break;
+        case 'gemini_cli_request_wrap':
+            if (state.direction === 'request') {
+                replaceRoot(root, wrapGeminiCliRequest(root));
+            }
+            break;
         case 'glm_image_content':
             if (state.direction === 'request') {
                 replaceRoot(root, applyGlmImageContentTransform(root));

package/dist/conversion/hub/pipeline/compat/compat-types.d.ts

@@ -116,6 +116,8 @@ export type MappingInstruction = {
     models?: string[];
 } | {
     action: 'claude_thinking_tool_schema';
+} | {
+    action: 'gemini_cli_request_wrap';
 };
 export type FilterInstruction = {
     action: 'rate_limit_text';