@paean-ai/adk 0.2.25 → 0.2.27

package/dist/esm/models/google_llm.js

@@ -40,11 +40,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: ${this.apiEndpoint}`);
     }
@@ -55,6 +57,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) {
@@ -233,10 +244,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;
@@ -257,7 +268,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`
             );
@@ -436,6 +454,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;
@@ -449,6 +468,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/esm/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/esm/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/dist/types/models/google_llm.d.ts

@@ -20,6 +20,10 @@ export interface GeminiParams {
     /**
      * The API key to use for the Gemini API. If not provided, it will look for
      * the GOOGLE_GENAI_API_KEY or GEMINI_API_KEY environment variable.
+     *
+     * Alternatively, set AI_STUDIO_API_KEY env var to force all models
+     * (including Gemini 3 preview) through the standard AI Studio endpoint
+     * (generativelanguage.googleapis.com) instead of aiplatform.googleapis.com.
      */
     apiKey?: string;
     /**

package/dist/web/agents/functions.js

@@ -371,6 +371,7 @@ function mergeParallelFunctionResponseEvents(functionResponseEvents) {
   const actionsList = functionResponseEvents.map((event) => event.actions || {});
   const mergedActions = mergeEventActions(actionsList);
   return createEvent({
+    invocationId: baseEvent.invocationId,
     author: baseEvent.author,
     branch: baseEvent.branch,
     content: { role: "user", parts: mergedParts },

package/dist/web/agents/llm_agent.js

@@ -453,6 +453,9 @@ function runPreProcessor(invocationContext, llmRequest) {
     }
     const codeExecutorContext = new CodeExecutorContext(new State(invocationContext.session.state));
     if (codeExecutorContext.getErrorCount(invocationContext.invocationId) >= codeExecutor.errorRetryAttempts) {
+      logger.warn(
+        "[CodeExecutor] Pre-processor skipped: error count exceeded max retry attempts (".concat(codeExecutor.errorRetryAttempts, ") for invocation ").concat(invocationContext.invocationId)
+      );
       return;
     }
     const allInputFiles = extractAndReplaceInlineFiles(codeExecutorContext, llmRequest);
@@ -521,6 +524,9 @@ function runPostProcessor(invocationContext, llmResponse) {
     }
     const codeExecutorContext = new CodeExecutorContext(new State(invocationContext.session.state));
     if (codeExecutorContext.getErrorCount(invocationContext.invocationId) >= codeExecutor.errorRetryAttempts) {
+      logger.warn(
+        "[CodeExecutor] Post-processor skipped: error count exceeded max retry attempts (".concat(codeExecutor.errorRetryAttempts, ") for invocation ").concat(invocationContext.invocationId)
+      );
       return;
     }
     const responseContent = llmResponse.content;
@@ -1104,6 +1110,7 @@ const _LlmAgent = class _LlmAgent extends BaseAgent {
         const allEmpty = llmResponse.content.parts.every(
           (p) => {
             if (p.functionCall || p.functionResponse || p.executableCode || p.codeExecutionResult) return false;
+            if (p.inlineData || p.fileData) return false;
             if ("text" in p && typeof p.text === "string" && p.text.length > 0) return false;
             return true;
           }

package/dist/web/events/event.js

@@ -24,7 +24,7 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
  */
 import { createEventActions } from "./event_actions.js";
 function createEvent(params = {}) {
-  const event = __spreadProps(__spreadValues({}, params), {
+  return __spreadProps(__spreadValues({}, params), {
     id: params.id || createNewEventId(),
     invocationId: params.invocationId || "",
     author: params.author,
@@ -33,7 +33,6 @@ function createEvent(params = {}) {
     branch: params.branch,
     timestamp: params.timestamp || Date.now()
   });
-  return event;
 }
 function isFinalResponse(event) {
   if (event.actions.skipSummarization || event.longRunningToolIds && event.longRunningToolIds.length > 0) {