Merge branch 'main' into snyk-upgrade-ea160fcc3b1079e3fb39a7b3e0f5d3e7

Author: RomneyDa

core/llm/llms/CometAPI.ts

@@ -1,5 +1,5 @@
-import { LLMOptions } from "../../index.js";
 import { allModelProviders } from "@continuedev/llm-info";
+import { LLMOptions } from "../../index.js";
 import OpenAI from "./OpenAI.js";
 
 /**
@@ -183,6 +183,7 @@ class CometAPI extends OpenAI {
    */
   private static RECOMMENDED_MODELS = [
     // GPT series
+    "gpt-5.1",
     "gpt-5-chat-latest",
     "chatgpt-4o-latest",
     "gpt-5-mini",

core/llm/llms/Gemini.ts

@@ -23,6 +23,14 @@ import {
   convertContinueToolToGeminiFunction,
 } from "./gemini-types";
 
+interface GeminiToolCallDelta extends ToolCallDelta {
+  extra_content?: {
+    google?: {
+      thought_signature?: string;
+    };
+  };
+}
+
 class Gemini extends BaseLLM {
   static providerName = "gemini";
 
@@ -266,18 +274,37 @@ class Gemini extends BaseLLM {
                   ? [{ text: msg.content }]
                   : msg.content.map(this.continuePartToGeminiPart),
             };
-            if (msg.toolCalls) {
-              msg.toolCalls.forEach((toolCall) => {
-                if (toolCall.function?.name) {
-                  assistantMsg.parts.push({
-                    functionCall: {
-                      name: toolCall.function.name,
-                      args: safeParseToolCallArgs(toolCall),
-                    },
-                  });
-                }
-              });
+
+            if (msg.toolCalls && msg.toolCalls.length) {
+              (msg.toolCalls as GeminiToolCallDelta[]).forEach(
+                (toolCall, index) => {
+                  if (toolCall.function?.name) {
+                    const signatureForCall =
+                      toolCall?.extra_content?.google?.thought_signature;
+
+                    let thoughtSignature: string | undefined;
+                    if (index === 0) {
+                      if (typeof signatureForCall === "string") {
+                        thoughtSignature = signatureForCall;
+                      } else {
+                        // Fallback per https://ai.google.dev/gemini-api/docs/thought-signatures
+                        // for histories that were not generated by Gemini or are missing signatures.
+                        thoughtSignature = "skip_thought_signature_validator";
+                      }
+                    }
+
+                    assistantMsg.parts.push({
+                      functionCall: {
+                        name: toolCall.function.name,
+                        args: safeParseToolCallArgs(toolCall),
+                      },
+                      ...(thoughtSignature && { thoughtSignature }),
+                    });
+                  }
+                },
+              );
             }
+
             return assistantMsg;
           }
           return {
@@ -370,6 +397,7 @@ class Gemini extends BaseLLM {
             if ("text" in part) {
               textParts.push({ type: "text", text: part.text });
             } else if ("functionCall" in part) {
+              const thoughtSignature = part.thoughtSignature;
               toolCalls.push({
                 type: "function",
                 id: part.functionCall.id ?? uuidv4(),
@@ -380,6 +408,13 @@ class Gemini extends BaseLLM {
                       ? part.functionCall.args
                       : JSON.stringify(part.functionCall.args),
                 },
+                ...(thoughtSignature && {
+                  extra_content: {
+                    google: {
+                      thought_signature: thoughtSignature,
+                    },
+                  },
+                }),
               });
             } else {
               // Note: function responses shouldn't be streamed, images not supported

core/llm/llms/gemini-types.ts

@@ -192,6 +192,7 @@ export type GeminiFunctionCallContentPart = {
     name: string;
     args: JSONSchema7Object;
   };
+  thoughtSignature?: string;
 };
 
 export type GeminiFunctionResponseContentPart = {

core/llm/toolSupport.ts

@@ -120,7 +120,7 @@ export const PROVIDER_TOOL_SUPPORT: Record<string, (model: string) => boolean> =
     },
     xAI: (model) => {
       const lowerCaseModel = model.toLowerCase();
-      return ["grok-3", "grok-4", "grok-code"].some((val) =>
+      return ["grok-3", "grok-4", "grok-4-1", "grok-code"].some((val) =>
         lowerCaseModel.includes(val),
       );
     },
@@ -392,10 +392,11 @@ export function isRecommendedAgentModel(modelName: string): boolean {
     [/o[134]/],
     [/deepseek/, /r1|reasoner/],
     [/gemini/, /2\.5/, /pro/],
-    [/gpt-5/],
+    [/gpt/, /-5|5\.1/],
     [/claude/, /sonnet/, /3\.7|3-7|-4/],
     [/claude/, /opus/, /-4/],
     [/grok-code/],
+    [/grok-4-1|grok-4\.1/],
     [/claude/, /4-5/],
   ];
   for (const combo of recs) {