@google/adk 1.6.0 → 2.0.0

package/dist/cjs/agents/framework_function_calls.js

@@ -0,0 +1,64 @@
+/**
+  * @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 __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 });
+};
+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 framework_function_calls_exports = {};
+__export(framework_function_calls_exports, {
+  REQUEST_CONFIRMATION_FUNCTION_CALL_NAME: () => REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
+  REQUEST_CREDENTIAL_FUNCTION_CALL_NAME: () => REQUEST_CREDENTIAL_FUNCTION_CALL_NAME,
+  REQUEST_INPUT_FUNCTION_CALL_NAME: () => REQUEST_INPUT_FUNCTION_CALL_NAME,
+  reservedFunctionCallName: () => reservedFunctionCallName
+});
+module.exports = __toCommonJS(framework_function_calls_exports);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const REQUEST_CONFIRMATION_FUNCTION_CALL_NAME = "adk_request_confirmation";
+const REQUEST_CREDENTIAL_FUNCTION_CALL_NAME = "adk_request_credential";
+const REQUEST_INPUT_FUNCTION_CALL_NAME = "adk_request_input";
+const RESERVED_FUNCTION_CALL_NAMES = /* @__PURE__ */ new Set([
+  REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
+  REQUEST_CREDENTIAL_FUNCTION_CALL_NAME,
+  REQUEST_INPUT_FUNCTION_CALL_NAME
+]);
+function reservedFunctionCallName(content) {
+  var _a, _b;
+  for (const part of (_a = content == null ? void 0 : content.parts) != null ? _a : []) {
+    const name = (_b = part.functionCall) == null ? void 0 : _b.name;
+    if (name && RESERVED_FUNCTION_CALL_NAMES.has(name)) {
+      return name;
+    }
+  }
+  return void 0;
+}
+__name(reservedFunctionCallName, "reservedFunctionCallName");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
+  REQUEST_CREDENTIAL_FUNCTION_CALL_NAME,
+  REQUEST_INPUT_FUNCTION_CALL_NAME,
+  reservedFunctionCallName
+});

package/dist/cjs/agents/functions.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,8 +26,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var functions_exports = {};
 __export(functions_exports, {
   AF_FUNCTION_CALL_ID_PREFIX: () => import_event2.AF_FUNCTION_CALL_ID_PREFIX,
-  REQUEST_CONFIRMATION_FUNCTION_CALL_NAME: () => REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
-  REQUEST_EUC_FUNCTION_CALL_NAME: () => REQUEST_EUC_FUNCTION_CALL_NAME,
+  REQUEST_CONFIRMATION_FUNCTION_CALL_NAME: () => import_framework_function_calls2.REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
+  REQUEST_CREDENTIAL_FUNCTION_CALL_NAME: () => import_framework_function_calls2.REQUEST_CREDENTIAL_FUNCTION_CALL_NAME,
+  REQUEST_INPUT_FUNCTION_CALL_NAME: () => import_framework_function_calls2.REQUEST_INPUT_FUNCTION_CALL_NAME,
   findEventByFunctionCallId: () => findEventByFunctionCallId,
   findMatchingFunctionCall: () => findMatchingFunctionCall,
   functionsExportedForTestingOnly: () => functionsExportedForTestingOnly,
@@ -37,7 +39,8 @@ __export(functions_exports, {
   handleFunctionCallList: () => handleFunctionCallList,
   handleFunctionCallsAsync: () => handleFunctionCallsAsync,
   mergeParallelFunctionResponseEvents: () => mergeParallelFunctionResponseEvents,
-  populateClientFunctionCallId: () => import_event2.populateClientFunctionCallId
+  populateClientFunctionCallId: () => import_event2.populateClientFunctionCallId,
+  reservedFunctionCallName: () => import_framework_function_calls2.reservedFunctionCallName
 });
 module.exports = __toCommonJS(functions_exports);
 var import_genai = require("@google/genai");
@@ -46,15 +49,20 @@ var import_event = require("../events/event.js");
 var import_event_actions = require("../events/event_actions.js");
 var import_logger = require("../utils/logger.js");
 var import_context = require("./context.js");
+var import_framework_function_calls = require("./framework_function_calls.js");
 var import_tracing = require("../telemetry/tracing.js");
 var import_event2 = require("../events/event.js");
+var import_framework_function_calls2 = require("./framework_function_calls.js");
 /**
  * @license
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-const REQUEST_EUC_FUNCTION_CALL_NAME = "adk_request_credential";
-const REQUEST_CONFIRMATION_FUNCTION_CALL_NAME = "adk_request_confirmation";
+function toolEventAuthor(invocationContext) {
+  var _a, _b;
+  return (_b = (_a = invocationContext.agent) == null ? void 0 : _a.name) != null ? _b : "";
+}
+__name(toolEventAuthor, "toolEventAuthor");
 const functionsExportedForTestingOnly = {
   handleFunctionCallList,
   generateAuthEvent,
@@ -69,6 +77,7 @@ function getLongRunningFunctionCalls(functionCalls, toolsDict) {
   }
   return longRunningToolIds;
 }
+__name(getLongRunningFunctionCalls, "getLongRunningFunctionCalls");
 function generateAuthEvent(invocationContext, functionResponseEvent) {
   var _a;
   if (!((_a = functionResponseEvent.actions) == null ? void 0 : _a.requestedAuthConfigs) || (0, import_lodash_es.isEmpty)(functionResponseEvent.actions.requestedAuthConfigs)) {
@@ -79,20 +88,20 @@ function generateAuthEvent(invocationContext, functionResponseEvent) {
   for (const [functionCallId, authConfig] of Object.entries(
     functionResponseEvent.actions.requestedAuthConfigs
   )) {
-    const requestEucFunctionCall = {
-      name: REQUEST_EUC_FUNCTION_CALL_NAME,
+    const requestCredentialFunctionCall = {
+      name: import_framework_function_calls.REQUEST_CREDENTIAL_FUNCTION_CALL_NAME,
       args: {
         "function_call_id": functionCallId,
         "auth_config": authConfig
       },
       id: (0, import_event.generateClientFunctionCallId)()
     };
-    longRunningToolIds.add(requestEucFunctionCall.id);
-    parts.push({ functionCall: requestEucFunctionCall });
+    longRunningToolIds.add(requestCredentialFunctionCall.id);
+    parts.push({ functionCall: requestCredentialFunctionCall });
   }
   return (0, import_event.createEvent)({
     invocationId: invocationContext.invocationId,
-    author: invocationContext.agent.name,
+    author: toolEventAuthor(invocationContext),
     branch: invocationContext.branch,
     content: {
       parts,
@@ -101,6 +110,7 @@ function generateAuthEvent(invocationContext, functionResponseEvent) {
     longRunningToolIds: Array.from(longRunningToolIds)
   });
 }
+__name(generateAuthEvent, "generateAuthEvent");
 function generateRequestConfirmationEvent({
   invocationContext,
   functionCallEvent,
@@ -121,7 +131,7 @@ function generateRequestConfirmationEvent({
       continue;
     }
     const requestConfirmationFunctionCall = {
-      name: REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
+      name: import_framework_function_calls.REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
       args: {
         "originalFunctionCall": originalFunctionCall,
         "toolConfirmation": toolConfirmation
@@ -133,7 +143,7 @@ function generateRequestConfirmationEvent({
   }
   return (0, import_event.createEvent)({
     invocationId: invocationContext.invocationId,
-    author: invocationContext.agent.name,
+    author: toolEventAuthor(invocationContext),
     branch: invocationContext.branch,
     content: {
       parts,
@@ -143,6 +153,7 @@ function generateRequestConfirmationEvent({
     longRunningToolIds: Array.from(longRunningToolIds)
   });
 }
+__name(generateRequestConfirmationEvent, "generateRequestConfirmationEvent");
 async function callToolAsync(tool, args, toolContext) {
   return import_tracing.tracer.startActiveSpan(`execute_tool ${tool.name}`, async (span) => {
     try {
@@ -164,6 +175,7 @@ async function callToolAsync(tool, args, toolContext) {
     }
   });
 }
+__name(callToolAsync, "callToolAsync");
 function buildResponseEvent(tool, functionResult, toolContext, invocationContext) {
   let responseResult;
   if (typeof functionResult !== "object" || functionResult == null) {
@@ -186,12 +198,13 @@ function buildResponseEvent(tool, functionResult, toolContext, invocationContext
   };
   return (0, import_event.createEvent)({
     invocationId: invocationContext.invocationId,
-    author: invocationContext.agent.name,
+    author: toolEventAuthor(invocationContext),
     content,
     actions: toolContext.actions,
     branch: invocationContext.branch
   });
 }
+__name(buildResponseEvent, "buildResponseEvent");
 async function handleFunctionCallsAsync({
   invocationContext,
   functionCallEvent,
@@ -212,6 +225,7 @@ async function handleFunctionCallsAsync({
     toolConfirmationDict
   });
 }
+__name(handleFunctionCallsAsync, "handleFunctionCallsAsync");
 function normalizeCallbackResponse(response) {
   if (response == null) {
     return void 0;
@@ -224,6 +238,7 @@ function normalizeCallbackResponse(response) {
   }
   return response;
 }
+__name(normalizeCallbackResponse, "normalizeCallbackResponse");
 async function handleFunctionCallList({
   invocationContext,
   functionCalls,
@@ -326,7 +341,7 @@ async function handleFunctionCallList({
     }
     const functionResponseEvent = (0, import_event.createEvent)({
       invocationId: invocationContext.invocationId,
-      author: invocationContext.agent.name,
+      author: toolEventAuthor(invocationContext),
       content: (0, import_genai.createUserContent)({
         functionResponse: {
           id: toolContext.functionCallId,
@@ -369,6 +384,7 @@ async function handleFunctionCallList({
   }
   return mergedEvent;
 }
+__name(handleFunctionCallList, "handleFunctionCallList");
 function getToolAndContext({
   invocationContext,
   functionCall,
@@ -388,6 +404,7 @@ function getToolAndContext({
   const tool = toolsDict[functionCall.name];
   return { tool, toolContext };
 }
+__name(getToolAndContext, "getToolAndContext");
 function mergeParallelFunctionResponseEvents(functionResponseEvents) {
   if (!functionResponseEvents.length) {
     throw new Error("No function response events provided.");
@@ -415,6 +432,7 @@ function mergeParallelFunctionResponseEvents(functionResponseEvents) {
     timestamp: baseEvent.timestamp
   });
 }
+__name(mergeParallelFunctionResponseEvents, "mergeParallelFunctionResponseEvents");
 function findEventByFunctionCallId(events, functionCallId, endIndex = events.length) {
   for (let i = endIndex - 1; i >= 0; i--) {
     const event = events[i];
@@ -427,6 +445,7 @@ function findEventByFunctionCallId(events, functionCallId, endIndex = events.len
   }
   return void 0;
 }
+__name(findEventByFunctionCallId, "findEventByFunctionCallId");
 function findMatchingFunctionCall(events) {
   if (!events.length) {
     return void 0;
@@ -442,11 +461,13 @@ function findMatchingFunctionCall(events) {
     events.length - 1
   );
 }
+__name(findMatchingFunctionCall, "findMatchingFunctionCall");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AF_FUNCTION_CALL_ID_PREFIX,
   REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
-  REQUEST_EUC_FUNCTION_CALL_NAME,
+  REQUEST_CREDENTIAL_FUNCTION_CALL_NAME,
+  REQUEST_INPUT_FUNCTION_CALL_NAME,
   findEventByFunctionCallId,
   findMatchingFunctionCall,
   functionsExportedForTestingOnly,
@@ -457,5 +478,6 @@ function findMatchingFunctionCall(events) {
   handleFunctionCallList,
   handleFunctionCallsAsync,
   mergeParallelFunctionResponseEvents,
-  populateClientFunctionCallId
+  populateClientFunctionCallId,
+  reservedFunctionCallName
 });

package/dist/cjs/agents/instructions.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 });
@@ -34,6 +35,17 @@ var import_state = require("../sessions/state.js");
  * SPDX-License-Identifier: Apache-2.0
  */
 const ARTIFACT_PREFIX = "artifact.";
+const WORKFLOW_FIELD_KEY = /^[A-Za-z_]\w*\.[A-Za-z_]\w*$/;
+const SOURCE_NODE_PLACEHOLDER = /<\s*[A-Za-z_]\w*\.([A-Za-z_]\w*)\s+from\s+([A-Za-z_]\w*)\s*>/g;
+function resolveSourceNode(raw, field, nodeName, scope) {
+  var _a;
+  const out = (_a = scope.outputsByNode) == null ? void 0 : _a[nodeName];
+  if (out && typeof out === "object" && field in out) {
+    return formatValue(out[field], false);
+  }
+  return raw;
+}
+__name(resolveSourceNode, "resolveSourceNode");
 async function resolveKey(key, isOptional, rawMatch, readonlyContext) {
   const invocationContext = readonlyContext.invocationContext;
   if (key.startsWith(ARTIFACT_PREFIX)) {
@@ -52,17 +64,29 @@ async function resolveKey(key, isOptional, rawMatch, readonlyContext) {
     }
     return formatValue(artifact, true);
   }
-  if (!isValidStateName(key)) {
-    return rawMatch;
-  }
-  if (key in invocationContext.session.state) {
-    return formatValue(invocationContext.session.state[key], false);
+  if (isValidStateName(key)) {
+    if (key in invocationContext.session.state) {
+      return formatValue(invocationContext.session.state[key], false);
+    }
+    if (isOptional) {
+      return "";
+    }
+    throw new Error(`Context variable not found: \`${key}\`.`);
   }
-  if (isOptional) {
-    return "";
+  const scope = invocationContext.workflowInstructionScope;
+  if (scope && WORKFLOW_FIELD_KEY.test(key)) {
+    const field = key.slice(key.indexOf(".") + 1);
+    const input = scope.input;
+    if (input && typeof input === "object" && field in input) {
+      return formatValue(input[field], false);
+    }
+    if (isOptional) {
+      return "";
+    }
   }
-  throw new Error(`Context variable not found: \`${key}\`.`);
+  return rawMatch;
 }
+__name(resolveKey, "resolveKey");
 function formatValue(value, isArtifact = false) {
   if (typeof value === "string") {
     return value;
@@ -84,10 +108,17 @@ function formatValue(value, isArtifact = false) {
   }
   return String(value);
 }
+__name(formatValue, "formatValue");
 async function injectSessionState(template, readonlyContext) {
+  const scope = readonlyContext.invocationContext.workflowInstructionScope;
+  const sourceMatches = scope ? Array.from(template.matchAll(SOURCE_NODE_PLACEHOLDER)).map((match) => ({
+    raw: match[0],
+    index: match.index,
+    resolved: resolveSourceNode(match[0], match[1], match[2], scope)
+  })) : [];
   const pattern = /\{+[^{}]*}+/g;
   const matches = Array.from(template.matchAll(pattern));
-  if (matches.length === 0) {
+  if (matches.length === 0 && sourceMatches.length === 0) {
     return template;
   }
   const parsedMatches = matches.map((match) => {
@@ -97,7 +128,7 @@ async function injectSessionState(template, readonlyContext) {
     if (isOptional) {
       key = key.slice(0, -1);
     }
-    const isValid = key.startsWith(ARTIFACT_PREFIX) || isValidStateName(key);
+    const isValid = key.startsWith(ARTIFACT_PREFIX) || isValidStateName(key) || !!scope && WORKFLOW_FIELD_KEY.test(key);
     return {
       raw,
       key,
@@ -132,11 +163,16 @@ async function injectSessionState(template, readonlyContext) {
     );
   }
   await Promise.all(resolutions.values());
+  const allMatches = [...parsedMatches, ...sourceMatches].sort(
+    (a, b) => a.index - b.index
+  );
   const result = [];
   let lastEnd = 0;
-  for (const pm of parsedMatches) {
+  for (const pm of allMatches) {
     result.push(template.slice(lastEnd, pm.index));
-    if (pm.isValid) {
+    if ("resolved" in pm) {
+      result.push(pm.resolved);
+    } else if (pm.isValid) {
       const replacement = await resolutions.get(pm.key);
       result.push(replacement);
     } else {
@@ -147,6 +183,7 @@ async function injectSessionState(template, readonlyContext) {
   result.push(template.slice(lastEnd));
   return result.join("");
 }
+__name(injectSessionState, "injectSessionState");
 const isIdentifierPattern = /* @__PURE__ */ (() => {
   return /^[a-zA-Z_][a-zA-Z0-9_]*$/;
 })();
@@ -156,6 +193,7 @@ function isIdentifier(s) {
   }
   return isIdentifierPattern.test(s);
 }
+__name(isIdentifier, "isIdentifier");
 const VALID_PREFIXES = [import_state.State.APP_PREFIX, import_state.State.USER_PREFIX, import_state.State.TEMP_PREFIX];
 function isValidStateName(variableName) {
   const parts = variableName.split(":");
@@ -170,6 +208,7 @@ function isValidStateName(variableName) {
   }
   return false;
 }
+__name(isValidStateName, "isValidStateName");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   injectSessionState

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