@paean-ai/adk 0.2.24 → 0.2.26

package/dist/cjs/models/google_llm.js

@@ -65,11 +65,13 @@ class Gemini extends import_base_llm.BaseLlm {
     this.headers = headers;
     this.isGemini3Preview = (0, import_model_name.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;
       import_logger.logger.info(`Using Gemini 3 preview endpoint: ${this.apiEndpoint}`);
     }
@@ -80,6 +82,15 @@ class Gemini extends import_base_llm.BaseLlm {
         useVertexAI = vertexAIfromEnv.toLowerCase() === "true" || vertexAIfromEnv === "1";
       }
     }
+    if (useAiStudioMode) {
+      if (useVertexAI) {
+        import_logger.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) {
@@ -131,7 +142,7 @@ class Gemini extends import_base_llm.BaseLlm {
    * @yields LlmResponse: The model response.
    */
   async *generateContentAsync(llmRequest, stream = false) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
     this.preprocessRequest(llmRequest);
     this.maybeAppendUserContent(llmRequest);
     import_logger.logger.info(
@@ -154,6 +165,7 @@ class Gemini extends import_base_llm.BaseLlm {
       let text = "";
       let usageMetadata;
       let lastResponse;
+      let pendingFCResponse = null;
       for await (const response of streamResult) {
         lastResponse = response;
         const llmResponse = (0, import_llm_response.createLlmResponse)(response);
@@ -182,7 +194,9 @@ class Gemini extends import_base_llm.BaseLlm {
           } else {
             text += firstPart.text;
           }
-          llmResponse.partial = true;
+          if (!hasFunctionCalls) {
+            llmResponse.partial = true;
+          }
           if (this.isGemini3Preview && hasFunctionCalls) {
             thoughtText = "";
             thoughtSignature = void 0;
@@ -252,18 +266,50 @@ class Gemini extends import_base_llm.BaseLlm {
               }
             }
           }
-          const partsWithSig = llmResponse.content.parts.filter(
+        }
+        if (hasFunctionCalls) {
+          if (pendingFCResponse && ((_i = pendingFCResponse.content) == null ? void 0 : _i.parts)) {
+            const newParts = (((_j = llmResponse.content) == null ? void 0 : _j.parts) || []).filter(
+              (p) => p.functionCall || p.thoughtSignature
+            );
+            pendingFCResponse.content.parts.push(...newParts);
+            pendingFCResponse.usageMetadata = llmResponse.usageMetadata;
+          } else {
+            pendingFCResponse = llmResponse;
+          }
+          continue;
+        }
+        if (pendingFCResponse) {
+          if (!((_l = (_k = llmResponse.content) == null ? void 0 : _k.parts) == null ? void 0 : _l.length)) {
+            continue;
+          }
+          yield pendingFCResponse;
+          pendingFCResponse = null;
+        }
+        yield llmResponse;
+      }
+      if (pendingFCResponse) {
+        if (this.isGemini3Preview && ((_m = pendingFCResponse.content) == null ? void 0 : _m.parts)) {
+          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) {
             import_logger.logger.warn(
-              `[Gemini3] No thoughtSignature on function call parts \u2014 may cause 400 on next request`
+              `[Gemini3] No thoughtSignature on merged function call parts \u2014 may cause 400 on next request`
             );
           }
         }
-        yield llmResponse;
+        yield pendingFCResponse;
+        pendingFCResponse = null;
       }
-      if ((text || thoughtText) && ((_j = (_i = lastResponse == null ? void 0 : lastResponse.candidates) == null ? void 0 : _i[0]) == null ? void 0 : _j.finishReason) === import_genai.FinishReason.STOP) {
+      if ((text || thoughtText) && ((_o = (_n = lastResponse == null ? void 0 : lastResponse.candidates) == null ? void 0 : _n[0]) == null ? void 0 : _o.finishReason) === import_genai.FinishReason.STOP) {
         const parts = [];
         if (thoughtText) {
           const thoughtPart = { text: thoughtText, thought: true };
@@ -285,12 +331,12 @@ class Gemini extends import_base_llm.BaseLlm {
       }
     } else {
       const response = await this.apiClient.models.generateContent({
-        model: (_k = llmRequest.model) != null ? _k : this.model,
+        model: (_p = llmRequest.model) != null ? _p : this.model,
         contents: llmRequest.contents,
         config: llmRequest.config
       });
       const llmResponse = (0, import_llm_response.createLlmResponse)(response);
-      if (this.isGemini3Preview && ((_l = llmResponse.content) == null ? void 0 : _l.parts)) {
+      if (this.isGemini3Preview && ((_q = llmResponse.content) == null ? void 0 : _q.parts)) {
         let thoughtSig;
         let hasThoughtPartWithSignature = false;
         for (const part of llmResponse.content.parts) {

package/dist/cjs/models/llm_response.js

@@ -27,6 +27,7 @@ __export(llm_response_exports, {
   createLlmResponse: () => createLlmResponse
 });
 module.exports = __toCommonJS(llm_response_exports);
+var import_genai = require("@google/genai");
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -45,6 +46,12 @@ function createLlmResponse(response) {
         finishReason: candidate.finishReason
       };
     }
+    if (candidate.finishReason === import_genai.FinishReason.STOP) {
+      return {
+        usageMetadata,
+        finishReason: candidate.finishReason
+      };
+    }
     return {
       errorCode: candidate.finishReason,
       errorMessage: candidate.finishMessage,

package/dist/esm/agents/functions.js

@@ -89,6 +89,9 @@ function generateAuthEvent(invocationContext, functionResponseEvent) {
     longRunningToolIds.add(requestEucFunctionCall.id);
     parts.push({ functionCall: requestEucFunctionCall });
   }
+  if (parts.length === 0) {
+    return void 0;
+  }
   return createEvent({
     invocationId: invocationContext.invocationId,
     author: invocationContext.agent.name,
@@ -130,6 +133,9 @@ function generateRequestConfirmationEvent({
     longRunningToolIds.add(requestConfirmationFunctionCall.id);
     parts.push({ functionCall: requestConfirmationFunctionCall });
   }
+  if (parts.length === 0) {
+    return void 0;
+  }
   return createEvent({
     invocationId: invocationContext.invocationId,
     author: invocationContext.agent.name,
@@ -193,8 +199,9 @@ async function handleFunctionCallList({
       }
     );
     if (!toolAndContext) {
+      const argsPreview = functionCall.args ? JSON.stringify(functionCall.args).substring(0, 300) : "(none)";
       logger.warn(
-        `Function "${functionCall.name}" not found in toolsDict (${Object.keys(toolsDict).length} tools registered).`
+        `Function "${functionCall.name}" not found in toolsDict (${Object.keys(toolsDict).length} tools registered). Args: ${argsPreview}`
       );
       const errorResponseEvent = createEvent({
         invocationId: invocationContext.invocationId,
@@ -243,6 +250,10 @@ async function handleFunctionCallList({
           toolContext
         );
       } catch (e) {
+        const argsPreview = JSON.stringify(functionArgs).substring(0, 500);
+        logger.error(
+          `Tool execution error: "${tool.name}" threw ${e instanceof Error ? e.message : String(e)}. Args: ${argsPreview}`
+        );
         if (e instanceof Error) {
           const onToolErrorResponse = await invocationContext.pluginManager.runOnToolErrorCallback(
             {
@@ -360,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/esm/agents/llm_agent.js

@@ -899,12 +899,12 @@ const _LlmAgent = class _LlmAgent extends BaseAgent {
         consecutiveErrors++;
         if (consecutiveErrors <= _LlmAgent.MAX_AGENT_LOOP_ERROR_RETRIES) {
           logger.warn(
-            `[runAsyncImpl] Error event (${lastEvent.errorCode}), retrying agent loop (${consecutiveErrors}/${_LlmAgent.MAX_AGENT_LOOP_ERROR_RETRIES})`
+            `[runAsyncImpl] Error event (${lastEvent.errorCode}: ${lastEvent.errorMessage || "no message"}), retrying agent loop (${consecutiveErrors}/${_LlmAgent.MAX_AGENT_LOOP_ERROR_RETRIES})`
           );
           continue;
         }
         logger.error(
-          `[runAsyncImpl] Max agent-loop error retries exhausted for ${lastEvent.errorCode}`
+          `[runAsyncImpl] Max agent-loop error retries exhausted for ${lastEvent.errorCode}: ${lastEvent.errorMessage || "no message"}`
         );
         break;
       }
@@ -993,7 +993,7 @@ const _LlmAgent = class _LlmAgent extends BaseAgent {
     }
   }
   async *postprocess(invocationContext, llmRequest, llmResponse, modelResponseEvent) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     for (const processor of this.responseProcessors) {
       for await (const event of processor.runAsync(invocationContext, llmResponse)) {
         yield event;
@@ -1002,6 +1002,28 @@ const _LlmAgent = class _LlmAgent extends BaseAgent {
     if (!llmResponse.content && !llmResponse.errorCode && !llmResponse.interrupted) {
       return;
     }
+    if (llmResponse.content && !llmResponse.errorCode) {
+      if (!llmResponse.content.parts || llmResponse.content.parts.length === 0) {
+        logger.debug(
+          `[postprocess] Skipping LLM response with no parts (role=${llmResponse.content.role})`
+        );
+        return;
+      }
+      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;
+        }
+      );
+      if (allEmpty) {
+        logger.debug(
+          `[postprocess] Skipping empty-content LLM response (${llmResponse.content.parts.length} empty parts)`
+        );
+        return;
+      }
+    }
     const mergedEvent = createEvent({
       ...modelResponseEvent,
       ...llmResponse
@@ -1023,8 +1045,11 @@ const _LlmAgent = class _LlmAgent extends BaseAgent {
         }
       }
     }
+    logger.debug(
+      `[postprocess] Yielding mergedEvent: role=${(_b = mergedEvent.content) == null ? void 0 : _b.role}, parts=${(_d = (_c = mergedEvent.content) == null ? void 0 : _c.parts) == null ? void 0 : _d.length}, hasFCs=${((_e = getFunctionCalls(mergedEvent)) == null ? void 0 : _e.length) || 0}, partial=${mergedEvent.partial}`
+    );
     yield mergedEvent;
-    if (!((_b = getFunctionCalls(mergedEvent)) == null ? void 0 : _b.length)) {
+    if (!((_f = getFunctionCalls(mergedEvent)) == null ? void 0 : _f.length)) {
       return;
     }
     const functionResponseEvent = await handleFunctionCallsAsync({
@@ -1049,6 +1074,9 @@ const _LlmAgent = class _LlmAgent extends BaseAgent {
     if (toolConfirmationEvent) {
       yield toolConfirmationEvent;
     }
+    logger.debug(
+      `[postprocess] Yielding functionResponseEvent: role=${(_g = functionResponseEvent.content) == null ? void 0 : _g.role}, parts=${(_i = (_h = functionResponseEvent.content) == null ? void 0 : _h.parts) == null ? void 0 : _i.length}`
+    );
     yield functionResponseEvent;
     const nextAgentName = functionResponseEvent.actions.transferToAgent;
     if (nextAgentName) {
@@ -1130,7 +1158,7 @@ const _LlmAgent = class _LlmAgent extends BaseAgent {
           if (llmResponse.errorCode && _LlmAgent.LLM_RETRYABLE_ERROR_CODES.has(llmResponse.errorCode) && !contentYielded && attempt < maxRetries) {
             shouldRetry = true;
             logger.warn(
-              `[callLlmAsync] Transient LLM error: ${llmResponse.errorCode}, usage: ${JSON.stringify(llmResponse.usageMetadata)}`
+              `[callLlmAsync] Transient LLM error: ${llmResponse.errorCode}${llmResponse.errorMessage ? ": " + llmResponse.errorMessage : ""}, finishReason: ${llmResponse.finishReason || "none"}, usage: ${JSON.stringify(llmResponse.usageMetadata)}`
             );
             break;
           }