@google/adk 1.5.0 → 2.0.0

package/dist/cjs/agents/invocation_context.js

@@ -9,6 +9,7 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -25,7 +26,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var invocation_context_exports = {};
 __export(invocation_context_exports, {
   InvocationContext: () => InvocationContext,
-  newInvocationContextId: () => newInvocationContextId
+  newInvocationContextId: () => newInvocationContextId,
+  requireAgent: () => requireAgent
 });
 module.exports = __toCommonJS(invocation_context_exports);
 var import_env_aware_utils = require("../utils/env_aware_utils.js");
@@ -34,7 +36,7 @@ var import_env_aware_utils = require("../utils/env_aware_utils.js");
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-class InvocationCostManager {
+const _InvocationCostManager = class _InvocationCostManager {
   constructor() {
     this.numberOfLlmCalls = 0;
   }
@@ -52,13 +54,15 @@ class InvocationCostManager {
       );
     }
   }
-}
-class InvocationContext {
+};
+__name(_InvocationCostManager, "InvocationCostManager");
+let InvocationCostManager = _InvocationCostManager;
+const _InvocationContext = class _InvocationContext {
   /**
    * @param params The parameters for creating an invocation context.
    */
   constructor(params) {
-    var _a;
+    var _a, _b;
     this.artifactService = params.artifactService;
     this.sessionService = params.sessionService;
     this.memoryService = params.memoryService;
@@ -73,7 +77,12 @@ class InvocationContext {
     this.activeStreamingTools = params.activeStreamingTools;
     this.pluginManager = params.pluginManager;
     this.abortSignal = params.abortSignal;
-    this.invocationCostManager = (_a = params.invocationCostManager) != null ? _a : new InvocationCostManager();
+    this.workflowInstructionScope = params.workflowInstructionScope;
+    this.isolationScope = params.isolationScope;
+    this.nodeToolDepth = (_a = params.nodeToolDepth) != null ? _a : 0;
+    this.invocationCostManager = (_b = params.invocationCostManager) != null ? _b : new InvocationCostManager();
+    this.liveRequestQueue = params.liveRequestQueue;
+    this.liveSessionResumptionHandle = params.liveSessionResumptionHandle;
   }
   /**
    * The app name of the current session.
@@ -95,12 +104,37 @@ class InvocationContext {
   incrementLlmCallCount() {
     this.invocationCostManager.incrementAndEnforceLlmCallsLimit(this.runConfig);
   }
-}
+  /**
+   * Returns a copy of this context with `overrides` applied. The spread carries
+   * every own field over (including the shared cost manager), so the copy keeps
+   * a single LLM-call counter for the invocation.
+   *
+   * Note: this copies own enumerable fields by value — scalar mutable fields
+   * (e.g. `endInvocation`) are decoupled from the original, while object-valued
+   * fields (`session`, …) stay shared by reference.
+   */
+  clone(overrides = {}) {
+    return new _InvocationContext({ ...this, ...overrides });
+  }
+};
+__name(_InvocationContext, "InvocationContext");
+let InvocationContext = _InvocationContext;
 function newInvocationContextId() {
   return `e-${(0, import_env_aware_utils.randomUUID)()}`;
 }
+__name(newInvocationContextId, "newInvocationContextId");
+function requireAgent(ctx) {
+  if (!ctx.agent) {
+    throw new Error(
+      "InvocationContext.agent is not set: this invocation is running a node directly, so there is no agent at this level."
+    );
+  }
+  return ctx.agent;
+}
+__name(requireAgent, "requireAgent");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   InvocationContext,
-  newInvocationContextId
+  newInvocationContextId,
+  requireAgent
 });

package/dist/cjs/agents/live_request_queue.js

@@ -9,6 +9,7 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -32,7 +33,7 @@ module.exports = __toCommonJS(live_request_queue_exports);
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-class LiveRequestQueue {
+const _LiveRequestQueue = class _LiveRequestQueue {
   constructor() {
     // Keeps track of the data that are waiting to be sent.
     this.queue = [];
@@ -59,17 +60,38 @@ class LiveRequestQueue {
   /**
    * Retrieves a request from the queue. If the queue is empty, it will
    * wait until a request is available.
+   *
+   * @param abortSignal When provided, a parked (pending) read is released by
+   *     rejecting with an abort error once the signal fires. The live send
+   *     loop passes the connection's abort signal so a waiter is not stranded
+   *     across reconnect/teardown, where it could otherwise steal a request
+   *     from the next connection's send loop.
    * @returns A promise that resolves with the next available request.
    */
-  async get() {
+  async get(abortSignal) {
     if (this.queue.length > 0) {
       return this.queue.shift();
     }
     if (this.isClosed) {
       return { close: true };
     }
-    return new Promise((resolve) => {
-      this.resolveFnFifoQueue.push(resolve);
+    if (abortSignal == null ? void 0 : abortSignal.aborted) {
+      throw new Error("LiveRequestQueue.get() was aborted.");
+    }
+    return new Promise((resolve, reject) => {
+      const onAbort = /* @__PURE__ */ __name(() => {
+        const index = this.resolveFnFifoQueue.indexOf(resolveFn);
+        if (index !== -1) {
+          this.resolveFnFifoQueue.splice(index, 1);
+        }
+        reject(new Error("LiveRequestQueue.get() was aborted."));
+      }, "onAbort");
+      const resolveFn = /* @__PURE__ */ __name((req) => {
+        abortSignal == null ? void 0 : abortSignal.removeEventListener("abort", onAbort);
+        resolve(req);
+      }, "resolveFn");
+      this.resolveFnFifoQueue.push(resolveFn);
+      abortSignal == null ? void 0 : abortSignal.addEventListener("abort", onAbort, { once: true });
     });
   }
   /**
@@ -129,7 +151,9 @@ class LiveRequestQueue {
       }
     }
   }
-}
+};
+__name(_LiveRequestQueue, "LiveRequestQueue");
+let LiveRequestQueue = _LiveRequestQueue;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   LiveRequestQueue