@paean-ai/adk 0.2.25 → 0.2.27

package/dist/web/models/google_llm.js

@@ -73,11 +73,13 @@ class Gemini extends BaseLlm {
     this.headers = headers;
     this.isGemini3Preview = isGemini3PreviewModel(model);
     const canReadEnv = typeof process === "object";
+    const aiStudioApiKey = canReadEnv ? process.env["AI_STUDIO_API_KEY"] : void 0;
+    const useAiStudioMode = !!aiStudioApiKey;
     this.apiEndpoint = apiEndpoint;
     if (!this.apiEndpoint && canReadEnv) {
       this.apiEndpoint = process.env["GEMINI_API_ENDPOINT"];
     }
-    if (!this.apiEndpoint && this.isGemini3Preview) {
+    if (!this.apiEndpoint && this.isGemini3Preview && !useAiStudioMode) {
       this.apiEndpoint = GEMINI3_PREVIEW_API_ENDPOINT;
       logger.info("Using Gemini 3 preview endpoint: ".concat(this.apiEndpoint));
     }
@@ -88,6 +90,15 @@ class Gemini extends BaseLlm {
         useVertexAI = vertexAIfromEnv.toLowerCase() === "true" || vertexAIfromEnv === "1";
       }
     }
+    if (useAiStudioMode) {
+      if (useVertexAI) {
+        logger.info(
+          "AI_STUDIO_API_KEY set \u2014 overriding Vertex AI mode to use AI Studio (generativelanguage.googleapis.com)"
+        );
+      }
+      useVertexAI = false;
+      this.apiKey = aiStudioApiKey;
+    }
     if (this.isGemini3Preview && useVertexAI) {
       const availableApiKey = apiKey || (canReadEnv ? process.env["GOOGLE_GENAI_API_KEY"] || process.env["GEMINI_API_KEY"] : void 0);
       if (availableApiKey) {
@@ -266,10 +277,10 @@ class Gemini extends BaseLlm {
             }
             if (hasFunctionCalls) {
               if (pendingFCResponse && ((_i = pendingFCResponse.content) == null ? void 0 : _i.parts)) {
-                const newFCParts = (((_j = llmResponse.content) == null ? void 0 : _j.parts) || []).filter(
-                  (p) => p.functionCall
+                const newParts = (((_j = llmResponse.content) == null ? void 0 : _j.parts) || []).filter(
+                  (p) => p.functionCall || p.thoughtSignature
                 );
-                pendingFCResponse.content.parts.push(...newFCParts);
+                pendingFCResponse.content.parts.push(...newParts);
                 pendingFCResponse.usageMetadata = llmResponse.usageMetadata;
               } else {
                 pendingFCResponse = llmResponse;
@@ -300,7 +311,14 @@ class Gemini extends BaseLlm {
             const partsWithSig = pendingFCResponse.content.parts.filter(
               (p) => p.thoughtSignature
             ).length;
-            if (partsWithSig === 0) {
+            if (partsWithSig === 0 && thoughtSignature) {
+              for (const part of pendingFCResponse.content.parts) {
+                if (part.functionCall) {
+                  part.thoughtSignature = thoughtSignature;
+                  break;
+                }
+              }
+            } else if (partsWithSig === 0) {
               logger.warn(
                 "[Gemini3] No thoughtSignature on merged function call parts \u2014 may cause 400 on next request"
               );
@@ -477,6 +495,7 @@ class Gemini extends BaseLlm {
     return new GeminiLlmConnection(liveSession);
   }
   preprocessRequest(llmRequest) {
+    var _a;
     if (this.apiBackend === GoogleLLMVariant.GEMINI_API) {
       if (llmRequest.config) {
         llmRequest.config.labels = void 0;
@@ -490,6 +509,22 @@ class Gemini extends BaseLlm {
           }
         }
       }
+      if (((_a = llmRequest.config) == null ? void 0 : _a.tools) && llmRequest.config.tools.length > 1) {
+        const hasBuiltInSearch = llmRequest.config.tools.some(
+          (t) => "googleSearch" in t || "googleSearchRetrieval" in t
+        );
+        const hasFunctionDeclarations = llmRequest.config.tools.some(
+          (t) => "functionDeclarations" in t
+        );
+        if (hasBuiltInSearch && hasFunctionDeclarations) {
+          logger.warn(
+            "Gemini API (AI Studio) does not support combining built-in search tools with custom function declarations. Removing built-in search tool from this request."
+          );
+          llmRequest.config.tools = llmRequest.config.tools.filter(
+            (t) => !("googleSearch" in t) && !("googleSearchRetrieval" in t)
+          );
+        }
+      }
     }
   }
 }

package/dist/web/models/llm_response.js

@@ -3,6 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { FinishReason } from "@google/genai";
 function createLlmResponse(response) {
   var _a;
   const usageMetadata = response.usageMetadata;
@@ -16,6 +17,12 @@ function createLlmResponse(response) {
         finishReason: candidate.finishReason
       };
     }
+    if (candidate.finishReason === FinishReason.STOP) {
+      return {
+        usageMetadata,
+        finishReason: candidate.finishReason
+      };
+    }
     return {
       errorCode: candidate.finishReason,
       errorMessage: candidate.finishMessage,

package/dist/web/utils/variant_utils.js

@@ -16,7 +16,7 @@ function getBooleanEnvVar(envVar) {
     return false;
   }
   const envVarValue = (process.env[envVar] || "").toLowerCase();
-  return ["true", "1"].includes(envVar.toLowerCase());
+  return ["true", "1"].includes(envVarValue);
 }
 export {
   GoogleLLMVariant,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paean-ai/adk",
-  "version": "0.2.25",
+  "version": "0.2.27",
   "description": "Google ADK JS (paean-ai fork with streaming fixes)",
   "author": "paean-ai",
   "license": "Apache-2.0",