@softactivate/adk 1.1.0 → 1.2.0

package/dist/cjs/utils/streaming_utils.js

@@ -24,7 +24,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var streaming_utils_exports = {};
 __export(streaming_utils_exports, {
-  StreamingResponseAggregator: () => StreamingResponseAggregator
+  StreamingResponseAggregator: () => StreamingResponseAggregator,
+  isEmptyContentPart: () => isEmptyContentPart
 });
 module.exports = __toCommonJS(streaming_utils_exports);
 var import_genai = require("@google/genai");
@@ -37,15 +38,8 @@ var import_llm_response = require("../models/llm_response.js");
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-class StreamingResponseAggregator {
-  constructor(isProgressiveMode = (0, import_feature_registry.isFeatureEnabled)(
-    import_feature_registry.FeatureName.PROGRESSIVE_SSE_STREAMING
-  )) {
-    this.isProgressiveMode = isProgressiveMode;
-    // For non-progressive SSE streaming mode
-    this.text = "";
-    this.thoughtText = "";
-    // For progressive SSE streaming mode: accumulate parts in order
+class ProgressiveStrategy {
+  constructor() {
     this.partsSequence = [];
     this.currentTextBuffer = "";
     this.currentFcArgs = {};
@@ -172,11 +166,6 @@ class StreamingResponseAggregator {
     if (!fc) {
       return;
     }
-    if (part.thoughtSignature) {
-      this.lastThoughtSignature = part.thoughtSignature;
-    } else if (this.lastThoughtSignature) {
-      part.thoughtSignature = this.lastThoughtSignature.toString();
-    }
     if (fc.partialArgs || fc.willContinue) {
       if (!fc.id && !this.currentFcId) {
         fc.id = (0, import_functions.generateClientFunctionCallId)();
@@ -195,108 +184,102 @@ class StreamingResponseAggregator {
       }
     }
   }
-  async *processResponse(response) {
-    var _a, _b, _c;
-    this.response = response;
-    const llmResponse = (0, import_llm_response.createLlmResponse)(response);
-    this.usageMetadata = llmResponse.usageMetadata;
-    if (llmResponse.groundingMetadata) {
-      this.groundingMetadata = llmResponse.groundingMetadata;
-    }
-    if (llmResponse.citationMetadata) {
-      this.citationMetadata = llmResponse.citationMetadata;
-    }
-    if (llmResponse.finishReason) {
-      this.finishReason = llmResponse.finishReason;
-    }
+  async *processResponse(llmResponse) {
+    var _a;
     if (llmResponse.content && llmResponse.content.parts) {
       for (const part of llmResponse.content.parts) {
-        if (part.thoughtSignature) {
-          this.lastThoughtSignature = part.thoughtSignature;
-        } else if (part.functionCall && this.lastThoughtSignature) {
-          part.thoughtSignature = this.lastThoughtSignature.toString();
+        if (part.text) {
+          const isThought = (_a = part.thought) != null ? _a : false;
+          if (this.currentTextBuffer && isThought !== this.currentTextIsThought) {
+            this.flushTextBufferToSequence();
+          }
+          if (!this.currentTextBuffer) {
+            this.currentTextIsThought = isThought;
+          }
+          this.currentTextBuffer += part.text;
+        } else if (part.functionCall) {
+          this.processFunctionCallPart(part);
+        } else {
+          this.flushTextBufferToSequence();
+          this.partsSequence.push(part);
         }
       }
     }
-    if (this.isProgressiveMode) {
-      if (llmResponse.content && llmResponse.content.parts) {
-        for (const part of llmResponse.content.parts) {
-          if (part.text) {
-            const isThought = (_a = part.thought) != null ? _a : false;
-            if (this.currentTextBuffer && isThought !== this.currentTextIsThought) {
-              this.flushTextBufferToSequence();
-            }
-            if (!this.currentTextBuffer) {
-              this.currentTextIsThought = isThought;
-            }
-            this.currentTextBuffer += part.text;
-          } else if (part.functionCall) {
-            this.processFunctionCallPart(part);
+    llmResponse.partial = true;
+    yield llmResponse;
+  }
+  close() {
+    this.flushTextBufferToSequence();
+    this.flushFunctionCallToSequence();
+    const finalParts = this.partsSequence;
+    if (finalParts.length === 0) {
+      return void 0;
+    }
+    return finalParts;
+  }
+}
+class NonProgressiveStrategy {
+  constructor() {
+    this.text = "";
+    this.thoughtText = "";
+  }
+  async *processResponse(llmResponse) {
+    var _a;
+    if ((_a = llmResponse.content) == null ? void 0 : _a.parts) {
+      const nonTextParts = [];
+      let sawTextPart = false;
+      for (const part of llmResponse.content.parts) {
+        if (typeof part.text === "string") {
+          sawTextPart = true;
+          if (part.thought) {
+            this.thoughtText += part.text;
           } else {
-            this.flushTextBufferToSequence();
-            this.partsSequence.push(part);
+            this.text += part.text;
           }
+          continue;
         }
+        if (part.functionCall && !part.functionCall.id) {
+          part.functionCall.id = (0, import_functions.generateClientFunctionCallId)();
+        }
+        nonTextParts.push(part);
       }
-      llmResponse.partial = true;
-      yield llmResponse;
-      return;
-    }
-    if (llmResponse.content && llmResponse.content.parts && typeof ((_b = llmResponse.content.parts[0]) == null ? void 0 : _b.text) === "string") {
-      const part0 = llmResponse.content.parts[0];
-      const partText = part0.text || "";
-      if (part0.thought) {
-        this.thoughtText += partText;
-      } else {
-        this.text += partText;
-      }
-      llmResponse.partial = true;
-    } else if ((this.thoughtText || this.text) && (!llmResponse.content || !llmResponse.content.parts || !((_c = llmResponse.content.parts[0]) == null ? void 0 : _c.inlineData))) {
-      const parts = [];
-      if (this.thoughtText) {
-        parts.push({ text: this.thoughtText, thought: true });
+      if (nonTextParts.length > 0) {
+        if (this.thoughtText || this.text) {
+          const parts = [];
+          if (this.thoughtText) {
+            parts.push({ text: this.thoughtText, thought: true });
+          }
+          if (this.text) {
+            parts.push({ text: this.text });
+          }
+          yield {
+            content: {
+              role: "model",
+              parts
+            },
+            usageMetadata: llmResponse.usageMetadata,
+            partial: false
+          };
+          this.thoughtText = "";
+          this.text = "";
+        }
+        yield {
+          ...llmResponse,
+          content: {
+            role: llmResponse.content.role,
+            parts: nonTextParts
+          },
+          partial: false
+        };
+        return;
       }
-      if (this.text) {
-        parts.push({ text: this.text });
+      if (sawTextPart) {
+        llmResponse.partial = true;
       }
-      yield {
-        content: {
-          role: "model",
-          parts
-        },
-        usageMetadata: llmResponse.usageMetadata,
-        partial: false
-      };
-      this.thoughtText = "";
-      this.text = "";
     }
     yield llmResponse;
   }
   close() {
-    var _a, _b, _c, _d, _e, _f;
-    if (this.isProgressiveMode) {
-      this.flushTextBufferToSequence();
-      this.flushFunctionCallToSequence();
-      const finalParts = this.partsSequence;
-      if (finalParts.length === 0) {
-        return;
-      }
-      const candidate = (_b = (_a = this.response) == null ? void 0 : _a.candidates) == null ? void 0 : _b[0];
-      const finishReason = (_c = this.finishReason) != null ? _c : candidate == null ? void 0 : candidate.finishReason;
-      return {
-        content: {
-          role: "model",
-          parts: finalParts
-        },
-        groundingMetadata: this.groundingMetadata,
-        citationMetadata: this.citationMetadata,
-        errorCode: finishReason === import_genai.FinishReason.STOP ? void 0 : finishReason,
-        errorMessage: finishReason === import_genai.FinishReason.STOP ? void 0 : candidate == null ? void 0 : candidate.finishMessage,
-        usageMetadata: this.usageMetadata,
-        finishReason,
-        partial: false
-      };
-    }
     if (this.text || this.thoughtText) {
       const parts = [];
       if (this.thoughtText) {
@@ -305,26 +288,92 @@ class StreamingResponseAggregator {
       if (this.text) {
         parts.push({ text: this.text });
       }
-      const candidate = (_e = (_d = this.response) == null ? void 0 : _d.candidates) == null ? void 0 : _e[0];
-      const finishReason = (_f = this.finishReason) != null ? _f : candidate == null ? void 0 : candidate.finishReason;
-      return {
-        content: {
-          role: "model",
-          parts
-        },
-        groundingMetadata: this.groundingMetadata,
-        citationMetadata: this.citationMetadata,
-        errorCode: finishReason === import_genai.FinishReason.STOP ? void 0 : finishReason,
-        errorMessage: finishReason === import_genai.FinishReason.STOP ? void 0 : candidate == null ? void 0 : candidate.finishMessage,
-        usageMetadata: this.usageMetadata,
-        finishReason,
-        partial: false
-      };
+      return parts;
     }
     return void 0;
   }
 }
+class StreamingResponseAggregator {
+  constructor(isProgressiveMode = (0, import_feature_registry.isFeatureEnabled)(
+    import_feature_registry.FeatureName.PROGRESSIVE_SSE_STREAMING
+  )) {
+    this.isProgressiveMode = isProgressiveMode;
+    this.lastThoughtSignature = {};
+    this.sawFunctionCall = false;
+    this.strategy = this.isProgressiveMode ? new ProgressiveStrategy() : new NonProgressiveStrategy();
+  }
+  async *processResponse(response) {
+    var _a, _b;
+    const llmResponse = (0, import_llm_response.createLlmResponse)(response);
+    const parts = (_b = (_a = llmResponse.content) == null ? void 0 : _a.parts) != null ? _b : [];
+    if (parts.some((part) => part.functionCall)) {
+      this.sawFunctionCall = true;
+    }
+    if (this.sawFunctionCall && llmResponse.finishReason === import_genai.FinishReason.STOP && parts.length > 0 && parts.every(isEmptyContentPart)) {
+      if (llmResponse.usageMetadata) {
+        this.usageMetadata = llmResponse.usageMetadata;
+      }
+      if (llmResponse.groundingMetadata) {
+        this.groundingMetadata = llmResponse.groundingMetadata;
+      }
+      if (llmResponse.citationMetadata) {
+        this.citationMetadata = llmResponse.citationMetadata;
+      }
+      if (llmResponse.finishReason) {
+        this.finishReason = llmResponse.finishReason;
+      }
+      return;
+    }
+    this.response = response;
+    this.usageMetadata = llmResponse.usageMetadata;
+    if (llmResponse.groundingMetadata) {
+      this.groundingMetadata = llmResponse.groundingMetadata;
+    }
+    if (llmResponse.citationMetadata) {
+      this.citationMetadata = llmResponse.citationMetadata;
+    }
+    if (llmResponse.finishReason) {
+      this.finishReason = llmResponse.finishReason;
+    }
+    if (llmResponse.content && llmResponse.content.parts) {
+      for (const part of llmResponse.content.parts) {
+        if (part.thoughtSignature) {
+          this.lastThoughtSignature.value = part.thoughtSignature;
+        } else if (part.functionCall && this.lastThoughtSignature.value) {
+          part.thoughtSignature = this.lastThoughtSignature.value.toString();
+        }
+      }
+    }
+    yield* this.strategy.processResponse(llmResponse);
+  }
+  close() {
+    var _a, _b, _c;
+    const finalParts = this.strategy.close();
+    if (!finalParts) {
+      return void 0;
+    }
+    const candidate = (_b = (_a = this.response) == null ? void 0 : _a.candidates) == null ? void 0 : _b[0];
+    const finishReason = (_c = this.finishReason) != null ? _c : candidate == null ? void 0 : candidate.finishReason;
+    return {
+      content: {
+        role: "model",
+        parts: finalParts
+      },
+      groundingMetadata: this.groundingMetadata,
+      citationMetadata: this.citationMetadata,
+      errorCode: finishReason === import_genai.FinishReason.STOP ? void 0 : finishReason,
+      errorMessage: finishReason === import_genai.FinishReason.STOP ? void 0 : candidate == null ? void 0 : candidate.finishMessage,
+      usageMetadata: this.usageMetadata,
+      finishReason,
+      partial: false
+    };
+  }
+}
+function isEmptyContentPart(part) {
+  return !part.functionCall && !part.functionResponse && !part.fileData && !part.inlineData && !part.executableCode && !part.codeExecutionResult && (!part.text || part.text === "");
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  StreamingResponseAggregator
+  StreamingResponseAggregator,
+  isEmptyContentPart
 });

package/dist/cjs/utils/vertex_ai_utils.js

@@ -0,0 +1,50 @@
+/**
+  * @license
+  * Copyright 2026 Google LLC
+  * SPDX-License-Identifier: Apache-2.0
+  */
+
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var vertex_ai_utils_exports = {};
+__export(vertex_ai_utils_exports, {
+  getExpressModeApiKey: () => getExpressModeApiKey
+});
+module.exports = __toCommonJS(vertex_ai_utils_exports);
+var import_env_aware_utils = require("./env_aware_utils.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+function getExpressModeApiKey(project, location, expressModeApiKey) {
+  if ((project || location) && expressModeApiKey) {
+    throw new Error(
+      "Cannot specify project or location and expressModeApiKey. Either use project and location, or just the expressModeApiKey."
+    );
+  }
+  if ((0, import_env_aware_utils.getBooleanEnvVar)("GOOGLE_GENAI_USE_VERTEXAI")) {
+    return expressModeApiKey || process.env.GOOGLE_API_KEY;
+  }
+  return void 0;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getExpressModeApiKey
+});

package/dist/cjs/version.js

@@ -32,7 +32,7 @@ module.exports = __toCommonJS(version_exports);
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-const version = "1.1.0";
+const version = "1.2.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   version

package/dist/esm/agents/functions.js

@@ -160,6 +160,8 @@ function buildResponseEvent(tool, functionResult, toolContext, invocationContext
   let responseResult;
   if (typeof functionResult !== "object" || functionResult == null) {
     responseResult = { result: functionResult };
+  } else if (Array.isArray(functionResult)) {
+    responseResult = { results: functionResult };
   } else {
     responseResult = functionResult;
   }
@@ -380,6 +382,8 @@ async function handleFunctionCallList({
       functionResponse = { error: functionResponseError };
     } else if (typeof functionResponse !== "object" || functionResponse == null) {
       functionResponse = { result: functionResponse };
+    } else if (Array.isArray(functionResponse)) {
+      functionResponse = { results: functionResponse };
     }
     const functionResponseEvent = createEvent({
       invocationId: invocationContext.invocationId,

package/dist/esm/auth/oauth2/oauth2_discovery.js

@@ -123,6 +123,18 @@ class OAuth2DiscoveryManager {
     return void 0;
   }
 }
+function normaliseHostname(raw) {
+  const stripped = raw.replace(/^\[|\]$/g, "");
+  const m = stripped.match(/^::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})$/i);
+  if (m) {
+    const hi = parseInt(m[1], 16);
+    const lo = parseInt(m[2], 16);
+    return [hi >> 8 & 255, hi & 255, lo >> 8 & 255, lo & 255].join(".");
+  }
+  const mDot = stripped.match(/^::ffff:(\d+\.\d+\.\d+\.\d+)$/i);
+  if (mDot) return mDot[1];
+  return raw;
+}
 function validateDiscoveryUrl(urlStr) {
   try {
     const url = new URL(urlStr);
@@ -130,8 +142,8 @@ function validateDiscoveryUrl(urlStr) {
       logger.warn(`Unsafe protocol for discovery URL: ${url.protocol}`);
       return false;
     }
-    const host = url.hostname.toLowerCase();
-    if (host === "localhost" || host === "127.0.0.1" || host === "[::1]" || host.startsWith("10.") || host.startsWith("192.168.") || host.startsWith("169.254.")) {
+    const host = normaliseHostname(url.hostname.toLowerCase());
+    if (host === "localhost" || host === "127.0.0.1" || host === "[::1]" || host === "0.0.0.0" || host.startsWith("10.") || host.startsWith("192.168.") || host.startsWith("169.254.")) {
       logger.warn(`Unsafe host for discovery URL: ${host}`);
       return false;
     }
@@ -143,6 +155,18 @@ function validateDiscoveryUrl(urlStr) {
         return false;
       }
     }
+    const cgnatMatch = host.match(/^100\.(\d+)\./);
+    if (cgnatMatch) {
+      const secondOctet = parseInt(cgnatMatch[1], 10);
+      if (secondOctet >= 64 && secondOctet <= 127) {
+        logger.warn(`Unsafe host for discovery URL: ${host}`);
+        return false;
+      }
+    }
+    if (/^\[(f[cd][0-9a-f]{2}|fe[89ab][0-9a-f]):/i.test(url.hostname)) {
+      logger.warn(`Unsafe host for discovery URL: ${url.hostname}`);
+      return false;
+    }
     return true;
   } catch (e) {
     logger.warn(`Failed to parse URL for validation ${urlStr}: ${e}`);