@google/adk 1.6.0 → 2.1.0

package/dist/cjs/agents/loop_agent.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 });
@@ -22,12 +23,21 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __decorateClass = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp(target, key, result);
+  return result;
+};
 var loop_agent_exports = {};
 __export(loop_agent_exports, {
   LoopAgent: () => LoopAgent,
   isLoopAgent: () => isLoopAgent
 });
 module.exports = __toCommonJS(loop_agent_exports);
+var import_deprecated = require("../utils/deprecated.js");
 var import_base_agent = require("./base_agent.js");
 /**
  * @license
@@ -35,11 +45,12 @@ var import_base_agent = require("./base_agent.js");
  * SPDX-License-Identifier: Apache-2.0
  */
 var _a, _b;
-const LOOP_AGENT_SIGNATURE_SYMBOL = Symbol.for("google.adk.loopAgent");
+const LOOP_AGENT_SIGNATURE_SYMBOL = /* @__PURE__ */ Symbol.for("google.adk.loopAgent");
 function isLoopAgent(obj) {
   return typeof obj === "object" && obj !== null && LOOP_AGENT_SIGNATURE_SYMBOL in obj && obj[LOOP_AGENT_SIGNATURE_SYMBOL] === true;
 }
-class LoopAgent extends (_b = import_base_agent.BaseAgent, _a = LOOP_AGENT_SIGNATURE_SYMBOL, _b) {
+__name(isLoopAgent, "isLoopAgent");
+let LoopAgent = class extends (_b = import_base_agent.BaseAgent, _a = LOOP_AGENT_SIGNATURE_SYMBOL, _b) {
   constructor(config) {
     var _a2;
     super(config);
@@ -88,7 +99,13 @@ class LoopAgent extends (_b = import_base_agent.BaseAgent, _a = LOOP_AGENT_SIGNA
       }
     }
   }
-}
+};
+__name(LoopAgent, "LoopAgent");
+LoopAgent = __decorateClass([
+  (0, import_deprecated.deprecated)(
+    "LoopAgent is deprecated in favor of Workflow and will be removed in a future version. Workflow cannot yet be used as an LlmAgent sub-agent."
+  )
+], LoopAgent);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   LoopAgent,

package/dist/cjs/agents/parallel_agent.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 });
@@ -22,12 +23,21 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __decorateClass = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp(target, key, result);
+  return result;
+};
 var parallel_agent_exports = {};
 __export(parallel_agent_exports, {
   ParallelAgent: () => ParallelAgent,
   isParallelAgent: () => isParallelAgent
 });
 module.exports = __toCommonJS(parallel_agent_exports);
+var import_deprecated = require("../utils/deprecated.js");
 var import_base_agent = require("./base_agent.js");
 var import_invocation_context = require("./invocation_context.js");
 /**
@@ -36,11 +46,12 @@ var import_invocation_context = require("./invocation_context.js");
  * SPDX-License-Identifier: Apache-2.0
  */
 var _a, _b;
-const PARALLEL_AGENT_SIGNATURE_SYMBOL = Symbol.for("google.adk.parallelAgent");
+const PARALLEL_AGENT_SIGNATURE_SYMBOL = /* @__PURE__ */ Symbol.for("google.adk.parallelAgent");
 function isParallelAgent(obj) {
   return typeof obj === "object" && obj !== null && PARALLEL_AGENT_SIGNATURE_SYMBOL in obj && obj[PARALLEL_AGENT_SIGNATURE_SYMBOL] === true;
 }
-class ParallelAgent extends (_b = import_base_agent.BaseAgent, _a = PARALLEL_AGENT_SIGNATURE_SYMBOL, _b) {
+__name(isParallelAgent, "isParallelAgent");
+let ParallelAgent = class extends (_b = import_base_agent.BaseAgent, _a = PARALLEL_AGENT_SIGNATURE_SYMBOL, _b) {
   constructor() {
     super(...arguments);
     /**
@@ -64,13 +75,20 @@ class ParallelAgent extends (_b = import_base_agent.BaseAgent, _a = PARALLEL_AGE
   async *runLiveImpl(_context) {
     throw new Error("This is not supported yet for ParallelAgent.");
   }
-}
+};
+__name(ParallelAgent, "ParallelAgent");
+ParallelAgent = __decorateClass([
+  (0, import_deprecated.deprecated)(
+    "ParallelAgent is deprecated in favor of Workflow and will be removed in a future version. Workflow cannot yet be used as an LlmAgent sub-agent."
+  )
+], ParallelAgent);
 function createBranchCtxForSubAgent(agent, subAgent, originalContext) {
   const invocationContext = new import_invocation_context.InvocationContext(originalContext);
   const branchSuffix = `${agent.name}.${subAgent.name}`;
   invocationContext.branch = invocationContext.branch ? `${invocationContext.branch}.${branchSuffix}` : branchSuffix;
   return invocationContext;
 }
+__name(createBranchCtxForSubAgent, "createBranchCtxForSubAgent");
 async function* mergeAgentRuns(agentRuns) {
   const pendingPromises = /* @__PURE__ */ new Map();
   for (const [index, generator] of agentRuns.entries()) {
@@ -88,6 +106,7 @@ async function* mergeAgentRuns(agentRuns) {
     pendingPromises.set(index, nextPromise);
   }
 }
+__name(mergeAgentRuns, "mergeAgentRuns");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ParallelAgent,

package/dist/cjs/agents/processors/agent_transfer_llm_request_processor.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 });
@@ -39,23 +40,40 @@ var import_base_llm_processor = require("./base_llm_processor.js");
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-class AgentTransferLlmRequestProcessor extends import_base_llm_processor.BaseLlmRequestProcessor {
+const _AgentTransferLlmRequestProcessor = class _AgentTransferLlmRequestProcessor extends import_base_llm_processor.BaseLlmRequestProcessor {
   constructor() {
     super(...arguments);
     this.toolName = "transfer_to_agent";
-    this.tool = new import_function_tool.FunctionTool({
+  }
+  /**
+   * Builds the `transfer_to_agent` tool for one invocation.
+   *
+   * Built per call rather than shared, because the parameter is an enum of the
+   * agents actually reachable from here. That mirrors adk-python's
+   * `TransferToAgentTool`, and it stops the model inventing a target: an
+   * unknown name now fails argument validation and comes back to the model as
+   * a tool error it can retry, instead of silently setting `transferToAgent`
+   * to an agent that does not exist.
+   *
+   * The parameter is `agent_name`, not `agentName`. It is wire format — it
+   * appears in the declaration sent to the model and in the events that get
+   * persisted — and adk-python spells it `agent_name`, so a transcript
+   * produced by one runtime has to be readable by the other.
+   */
+  buildTool(targetNames) {
+    return new import_function_tool.FunctionTool({
       name: this.toolName,
       description: "Transfer the question to another agent. This tool hands off control to another agent when it is more suitable to answer the user question according to the agent description.",
       parameters: import_zod.z.object({
-        agentName: import_zod.z.string().describe("the agent name to transfer to.")
+        agent_name: import_zod.z.enum(targetNames).describe("the agent name to transfer to.")
       }),
-      execute: function(args, toolContext) {
+      execute: /* @__PURE__ */ __name((args, toolContext) => {
         if (!toolContext) {
           throw new Error("toolContext is required.");
         }
-        toolContext.actions.transferToAgent = args.agentName;
+        toolContext.actions.transferToAgent = args.agent_name;
         return "Transfer queued";
-      }
+      }, "execute")
     });
   }
   /**
@@ -81,7 +99,11 @@ class AgentTransferLlmRequestProcessor extends import_base_llm_processor.BaseLlm
       )
     ]);
     const toolContext = new import_context.Context({ invocationContext });
-    await this.tool.processLlmRequest({ toolContext, llmRequest });
+    const targetNames = transferTargets.map((t) => t.name);
+    await this.buildTool(targetNames).processLlmRequest({
+      toolContext,
+      llmRequest
+    });
   }
   buildTargetAgentsInfo(targetAgent) {
     return `
@@ -130,7 +152,9 @@ to your parent agent.
     }
     return targets;
   }
-}
+};
+__name(_AgentTransferLlmRequestProcessor, "AgentTransferLlmRequestProcessor");
+let AgentTransferLlmRequestProcessor = _AgentTransferLlmRequestProcessor;
 const AGENT_TRANSFER_LLM_REQUEST_PROCESSOR = new AgentTransferLlmRequestProcessor();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/agents/processors/base_llm_processor.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 });
@@ -33,10 +34,14 @@ module.exports = __toCommonJS(base_llm_processor_exports);
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-class BaseLlmRequestProcessor {
-}
-class BaseLlmResponseProcessor {
-}
+const _BaseLlmRequestProcessor = class _BaseLlmRequestProcessor {
+};
+__name(_BaseLlmRequestProcessor, "BaseLlmRequestProcessor");
+let BaseLlmRequestProcessor = _BaseLlmRequestProcessor;
+const _BaseLlmResponseProcessor = class _BaseLlmResponseProcessor {
+};
+__name(_BaseLlmResponseProcessor, "BaseLlmResponseProcessor");
+let BaseLlmResponseProcessor = _BaseLlmResponseProcessor;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BaseLlmRequestProcessor,

package/dist/cjs/agents/processors/basic_llm_request_processor.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 });
@@ -37,7 +38,7 @@ var import_base_llm_processor = require("./base_llm_processor.js");
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-class BasicLlmRequestProcessor extends import_base_llm_processor.BaseLlmRequestProcessor {
+const _BasicLlmRequestProcessor = class _BasicLlmRequestProcessor extends import_base_llm_processor.BaseLlmRequestProcessor {
   /**
    * Populates model name, generation config, output schema, and live connect
    * settings on the request from the agent and run config.
@@ -54,7 +55,7 @@ class BasicLlmRequestProcessor extends import_base_llm_processor.BaseLlmRequestP
     }
     llmRequest.model = agent.canonicalModel.model;
     llmRequest.config = { ...(_a = agent.generateContentConfig) != null ? _a : {} };
-    if (agent.outputSchema && (!((_b = agent.tools) == null ? void 0 : _b.length) || (0, import_output_schema_utils.canUseOutputSchemaWithTools)(agent.canonicalModel.model))) {
+    if (agent.outputSchema && agent.mode !== "task" && (!((_b = agent.tools) == null ? void 0 : _b.length) || (0, import_output_schema_utils.canUseOutputSchemaWithTools)(agent.canonicalModel.model))) {
       (0, import_llm_request.setOutputSchema)(llmRequest, agent.outputSchema);
     }
     if (invocationContext.runConfig) {
@@ -67,7 +68,9 @@ class BasicLlmRequestProcessor extends import_base_llm_processor.BaseLlmRequestP
       llmRequest.liveConnectConfig.proactivity = invocationContext.runConfig.proactivity;
     }
   }
-}
+};
+__name(_BasicLlmRequestProcessor, "BasicLlmRequestProcessor");
+let BasicLlmRequestProcessor = _BasicLlmRequestProcessor;
 const BASIC_LLM_REQUEST_PROCESSOR = new BasicLlmRequestProcessor();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/agents/processors/code_execution_request_processor.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 });
@@ -39,6 +40,7 @@ var import_event = require("../../events/event.js");
 var import_event_actions = require("../../events/event_actions.js");
 var import_state = require("../../sessions/state.js");
 var import_env_aware_utils = require("../../utils/env_aware_utils.js");
+var import_invocation_context = require("../invocation_context.js");
 var import_llm_agent = require("../llm_agent.js");
 var import_base_llm_processor = require("./base_llm_processor.js");
 /**
@@ -46,7 +48,7 @@ var import_base_llm_processor = require("./base_llm_processor.js");
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-class CodeExecutionRequestProcessor extends import_base_llm_processor.BaseLlmRequestProcessor {
+const _CodeExecutionRequestProcessor = class _CodeExecutionRequestProcessor extends import_base_llm_processor.BaseLlmRequestProcessor {
   async *runAsync(invocationContext, llmRequest) {
     if (!(0, import_llm_agent.isLlmAgent)(invocationContext.agent)) {
       return;
@@ -61,15 +63,17 @@ class CodeExecutionRequestProcessor extends import_base_llm_processor.BaseLlmReq
       return;
     }
     for (const content of llmRequest.contents) {
-      const delimeters = invocationContext.agent.codeExecutor.codeBlockDelimiters.length ? invocationContext.agent.codeExecutor.codeBlockDelimiters[0] : ["", ""];
+      const delimiters = invocationContext.agent.codeExecutor.codeBlockDelimiters.length ? invocationContext.agent.codeExecutor.codeBlockDelimiters[0] : ["", ""];
       (0, import_code_execution_utils.convertCodeExecutionParts)(
         content,
-        delimeters,
+        delimiters,
         invocationContext.agent.codeExecutor.executionResultDelimiters
       );
     }
   }
-}
+};
+__name(_CodeExecutionRequestProcessor, "CodeExecutionRequestProcessor");
+let CodeExecutionRequestProcessor = _CodeExecutionRequestProcessor;
 const DATA_FILE_UTIL_MAP = {
   "text/csv": {
     extension: ".csv",
@@ -114,7 +118,7 @@ Total columns: {df.shape[1]}
 
 {df_info}""")
 `;
-class CodeExecutionResponseProcessor {
+const _CodeExecutionResponseProcessor = class _CodeExecutionResponseProcessor {
   /**
    * Processes the LLM response asynchronously.
    *
@@ -133,7 +137,9 @@ class CodeExecutionResponseProcessor {
       yield event;
     }
   }
-}
+};
+__name(_CodeExecutionResponseProcessor, "CodeExecutionResponseProcessor");
+let CodeExecutionResponseProcessor = _CodeExecutionResponseProcessor;
 const responseProcessor = new CodeExecutionResponseProcessor();
 async function* runPreProcessor(invocationContext, llmRequest) {
   const agent = invocationContext.agent;
@@ -215,6 +221,7 @@ async function* runPreProcessor(invocationContext, llmRequest) {
     llmRequest.contents.push((0, import_lodash_es.cloneDeep)(executionResultEvent.content));
   }
 }
+__name(runPreProcessor, "runPreProcessor");
 async function* runPostProcessor(invocationContext, llmResponse) {
   const agent = invocationContext.agent;
   if (!(0, import_llm_agent.isLlmAgent)(agent)) {
@@ -276,6 +283,7 @@ async function* runPostProcessor(invocationContext, llmResponse) {
   );
   llmResponse.content = void 0;
 }
+__name(runPostProcessor, "runPostProcessor");
 function extractAndReplaceInlineFiles(codeExecutorContext, llmRequest) {
   var _a;
   const allInputFiles = codeExecutorContext.getInputFiles();
@@ -308,6 +316,7 @@ Available file: \`${fileName}\`
   }
   return allInputFiles;
 }
+__name(extractAndReplaceInlineFiles, "extractAndReplaceInlineFiles");
 function getOrSetExecutionId(invocationContext, codeExecutorContext) {
   var _a;
   const agent = invocationContext.agent;
@@ -321,6 +330,7 @@ function getOrSetExecutionId(invocationContext, codeExecutorContext) {
   }
   return executionId;
 }
+__name(getOrSetExecutionId, "getOrSetExecutionId");
 async function postProcessCodeExecutionResult(invocationContext, codeExecutorContext, codeExecutionResult) {
   if (!invocationContext.artifactService) {
     throw new Error("Artifact service is not initialized.");
@@ -348,12 +358,13 @@ async function postProcessCodeExecutionResult(invocationContext, codeExecutorCon
   }
   return (0, import_event.createEvent)({
     invocationId: invocationContext.invocationId,
-    author: invocationContext.agent.name,
+    author: (0, import_invocation_context.requireAgent)(invocationContext).name,
     branch: invocationContext.branch,
     content: resultContent,
     actions: eventActions
   });
 }
+__name(postProcessCodeExecutionResult, "postProcessCodeExecutionResult");
 function getDataFilePreprocessingCode(file) {
   function getNormalizedFileName(fileName) {
     const [varName2] = fileName.split(".");
@@ -363,6 +374,7 @@ function getDataFilePreprocessingCode(file) {
     }
     return normalizedName;
   }
+  __name(getNormalizedFileName, "getNormalizedFileName");
   if (!DATA_FILE_UTIL_MAP[file.mimeType]) {
     return void 0;
   }
@@ -378,6 +390,7 @@ ${varName} = ${loaderCode}
 explore_df(${varName})
 `;
 }
+__name(getDataFilePreprocessingCode, "getDataFilePreprocessingCode");
 const CODE_EXECUTION_REQUEST_PROCESSOR = new CodeExecutionRequestProcessor();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/agents/processors/content_processor_utils.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 });
@@ -35,6 +36,7 @@ var import_lodash_es = require("lodash-es");
 var import_compacted_event = require("../../events/compacted_event.js");
 var import_event = require("../../events/event.js");
 var import_branch_trie = require("../../utils/branch_trie.js");
+var import_compaction_utils = require("../../context/compaction_utils.js");
 var import_functions = require("../functions.js");
 /**
  * @license
@@ -52,24 +54,18 @@ function removeClientFunctionCallId(content) {
     }
   }
 }
-function getContents(events, agentName, currentBranch) {
-  var _a, _b, _c;
+__name(removeClientFunctionCallId, "removeClientFunctionCallId");
+function getContents(events, agentName, currentBranch, currentIsolationScope) {
   const filteredEvents = [];
   for (const event of events) {
-    if ((0, import_compacted_event.isCompactedEvent)(event)) {
-      filteredEvents.push(convertCompactedEvent(event));
-      continue;
-    }
-    if (!((_a = event.content) == null ? void 0 : _a.role) || ((_c = (_b = event.content.parts) == null ? void 0 : _b[0]) == null ? void 0 : _c.text) === "") {
+    if (!(0, import_compaction_utils.isEventVisibleInIsolationScope)(event, currentIsolationScope)) {
       continue;
     }
-    if (currentBranch && event.branch && !(0, import_branch_trie.isSegmentPrefix)(currentBranch, event.branch)) {
-      continue;
-    }
-    if (isAuthEvent(event)) {
+    if ((0, import_compacted_event.isCompactedEvent)(event)) {
+      filteredEvents.push(convertCompactedEvent(event));
       continue;
     }
-    if (isToolConfirmationEvent(event)) {
+    if (!shouldIncludeEventInContext(event, currentBranch, currentIsolationScope)) {
       continue;
     }
     filteredEvents.push(
@@ -86,27 +82,93 @@ function getContents(events, agentName, currentBranch) {
   }
   return contents;
 }
-function getCurrentTurnContents(events, agentName, currentBranch) {
+__name(getContents, "getContents");
+function shouldIncludeEventInContext(event, currentBranch, currentIsolationScope) {
+  var _a, _b, _c;
+  if (!((_a = event.content) == null ? void 0 : _a.role) || ((_c = (_b = event.content.parts) == null ? void 0 : _b[0]) == null ? void 0 : _c.text) === "") {
+    return false;
+  }
+  if (currentBranch && event.branch && !(0, import_branch_trie.isSegmentPrefix)(currentBranch, event.branch)) {
+    return false;
+  }
+  if (!(0, import_compaction_utils.isEventVisibleInIsolationScope)(event, currentIsolationScope)) {
+    return false;
+  }
+  return !isAuthEvent(event) && !isToolConfirmationEvent(event) && !isRequestInputEvent(event);
+}
+__name(shouldIncludeEventInContext, "shouldIncludeEventInContext");
+function isRequestInputEvent(event) {
+  var _a, _b, _c;
+  if (!((_a = event.content) == null ? void 0 : _a.parts)) {
+    return false;
+  }
+  for (const part of event.content.parts) {
+    if (((_b = part.functionCall) == null ? void 0 : _b.name) === import_functions.REQUEST_INPUT_FUNCTION_CALL_NAME || ((_c = part.functionResponse) == null ? void 0 : _c.name) === import_functions.REQUEST_INPUT_FUNCTION_CALL_NAME) {
+      return true;
+    }
+  }
+  return false;
+}
+__name(isRequestInputEvent, "isRequestInputEvent");
+function getCurrentTurnContents(events, agentName, currentBranch, currentIsolationScope) {
   for (let i = events.length - 1; i >= 0; i--) {
     const event = events[i];
+    if (!shouldIncludeEventInContext(event, currentBranch, currentIsolationScope)) {
+      continue;
+    }
     if (event.author === "user" || isEventFromAnotherAgent(agentName, event)) {
-      return getContents(events.slice(i), agentName, currentBranch);
+      return getContents(
+        events.slice(turnStart(events, i)),
+        agentName,
+        currentBranch,
+        currentIsolationScope
+      );
     }
   }
   return [];
 }
+__name(getCurrentTurnContents, "getCurrentTurnContents");
+function turnStart(events, anchor) {
+  var _a, _b, _c, _d, _e;
+  const answered = /* @__PURE__ */ new Set();
+  for (const event of events.slice(anchor)) {
+    for (const part of (_b = (_a = event.content) == null ? void 0 : _a.parts) != null ? _b : []) {
+      if ((_c = part.functionResponse) == null ? void 0 : _c.id) {
+        answered.add(part.functionResponse.id);
+      }
+    }
+  }
+  if (answered.size === 0) {
+    return anchor;
+  }
+  let start = anchor;
+  for (let i = anchor - 1; i >= 0; i--) {
+    const answersACall = ((_e = (_d = events[i].content) == null ? void 0 : _d.parts) != null ? _e : []).some(
+      (p) => {
+        var _a2;
+        return ((_a2 = p.functionCall) == null ? void 0 : _a2.id) ? answered.has(p.functionCall.id) : false;
+      }
+    );
+    if (answersACall) {
+      start = i;
+    }
+  }
+  return start;
+}
+__name(turnStart, "turnStart");
 function isAuthEvent(event) {
   var _a, _b, _c;
   if (!((_a = event.content) == null ? void 0 : _a.parts)) {
     return false;
   }
   for (const part of event.content.parts) {
-    if (((_b = part.functionCall) == null ? void 0 : _b.name) === import_functions.REQUEST_EUC_FUNCTION_CALL_NAME || ((_c = part.functionResponse) == null ? void 0 : _c.name) === import_functions.REQUEST_EUC_FUNCTION_CALL_NAME) {
+    if (((_b = part.functionCall) == null ? void 0 : _b.name) === import_functions.REQUEST_CREDENTIAL_FUNCTION_CALL_NAME || ((_c = part.functionResponse) == null ? void 0 : _c.name) === import_functions.REQUEST_CREDENTIAL_FUNCTION_CALL_NAME) {
       return true;
     }
   }
   return false;
 }
+__name(isAuthEvent, "isAuthEvent");
 function isToolConfirmationEvent(event) {
   var _a, _b, _c;
   if (!((_a = event.content) == null ? void 0 : _a.parts)) {
@@ -119,9 +181,11 @@ function isToolConfirmationEvent(event) {
   }
   return false;
 }
+__name(isToolConfirmationEvent, "isToolConfirmationEvent");
 function isEventFromAnotherAgent(agentName, event) {
   return !!agentName && event.author !== agentName && event.author !== "user";
 }
+__name(isEventFromAnotherAgent, "isEventFromAnotherAgent");
 function convertForeignEvent(event) {
   var _a, _b, _c, _d, _e, _f;
   if (!((_b = (_a = event.content) == null ? void 0 : _a.parts) == null ? void 0 : _b.length)) {
@@ -164,6 +228,7 @@ function convertForeignEvent(event) {
     timestamp: event.timestamp
   });
 }
+__name(convertForeignEvent, "convertForeignEvent");
 function mergeFunctionResponseEvents(events) {
   var _a;
   if (events.length === 0) {
@@ -205,6 +270,7 @@ function mergeFunctionResponseEvents(events) {
   }
   return mergedEvent;
 }
+__name(mergeFunctionResponseEvents, "mergeFunctionResponseEvents");
 function rearrangeEventsForLatestFunctionResponse(events) {
   if (events.length === 0) {
     return events;
@@ -283,6 +349,7 @@ function rearrangeEventsForLatestFunctionResponse(events) {
   resultEvents.push(mergeFunctionResponseEvents(functionResponseEvents));
   return resultEvents;
 }
+__name(rearrangeEventsForLatestFunctionResponse, "rearrangeEventsForLatestFunctionResponse");
 function rearrangeEventsForAsyncFunctionResponsesInHistory(events) {
   const functionCallIdToResponseEventIndex = /* @__PURE__ */ new Map();
   for (let i = 0; i < events.length; i++) {
@@ -333,6 +400,7 @@ function rearrangeEventsForAsyncFunctionResponsesInHistory(events) {
   }
   return resultEvents;
 }
+__name(rearrangeEventsForAsyncFunctionResponsesInHistory, "rearrangeEventsForAsyncFunctionResponsesInHistory");
 function safeStringify(obj) {
   if (typeof obj === "string") {
     return obj;
@@ -343,6 +411,7 @@ function safeStringify(obj) {
     return String(obj);
   }
 }
+__name(safeStringify, "safeStringify");
 function convertCompactedEvent(event) {
   const content = (0, import_genai.createUserContent)(
     `[Previous Context Summary]:
@@ -356,6 +425,7 @@ ${event.compactedContent}`
     timestamp: event.timestamp
   });
 }
+__name(convertCompactedEvent, "convertCompactedEvent");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getContents,

package/dist/cjs/agents/processors/content_request_processor.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 });
@@ -36,7 +37,7 @@ var import_content_processor_utils = require("./content_processor_utils.js");
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-class ContentRequestProcessor {
+const _ContentRequestProcessor = class _ContentRequestProcessor {
   /**
    * Fills {@link LlmRequest.contents} based on the session event history and
    * agent configuration.
@@ -50,23 +51,30 @@ class ContentRequestProcessor {
     if (!agent || !(0, import_llm_agent.isLlmAgent)(agent)) {
       return;
     }
-    const events = (0, import_compaction_utils.getActiveEvents)(invocationContext.session.events);
+    const events = (0, import_compaction_utils.getActiveEvents)(
+      invocationContext.session.events,
+      invocationContext.isolationScope
+    );
     if (agent.includeContents === "default") {
       llmRequest.contents = (0, import_content_processor_utils.getContents)(
         events,
         agent.name,
-        invocationContext.branch
+        invocationContext.branch,
+        invocationContext.isolationScope
       );
     } else {
       llmRequest.contents = (0, import_content_processor_utils.getCurrentTurnContents)(
         events,
         agent.name,
-        invocationContext.branch
+        invocationContext.branch,
+        invocationContext.isolationScope
       );
     }
     return;
   }
-}
+};
+__name(_ContentRequestProcessor, "ContentRequestProcessor");
+let ContentRequestProcessor = _ContentRequestProcessor;
 const CONTENT_REQUEST_PROCESSOR = new ContentRequestProcessor();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {