@google/adk 2.0.0 → 2.2.0

package/dist/esm/agents/functions.js

@@ -7,6 +7,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+var _a, _b;
 import { createUserContent } from "@google/genai";
 import { isEmpty } from "lodash-es";
 import {
@@ -15,7 +16,11 @@ import {
   getFunctionCalls,
   getFunctionResponses
 } from "../events/event.js";
-import { mergeEventActions } from "../events/event_actions.js";
+import {
+  isDefaultEventActions,
+  mergeEventActions
+} from "../events/event_actions.js";
+import { BaseTool } from "../tools/base_tool.js";
 import { logger } from "../utils/logger.js";
 import { Context } from "./context.js";
 import {
@@ -28,8 +33,8 @@ import {
   traceToolCall
 } from "../telemetry/tracing.js";
 function toolEventAuthor(invocationContext) {
-  var _a, _b;
-  return (_b = (_a = invocationContext.agent) == null ? void 0 : _a.name) != null ? _b : "";
+  var _a2, _b2;
+  return (_b2 = (_a2 = invocationContext.agent) == null ? void 0 : _a2.name) != null ? _b2 : "";
 }
 __name(toolEventAuthor, "toolEventAuthor");
 import {
@@ -59,8 +64,8 @@ function getLongRunningFunctionCalls(functionCalls, toolsDict) {
 }
 __name(getLongRunningFunctionCalls, "getLongRunningFunctionCalls");
 function generateAuthEvent(invocationContext, functionResponseEvent) {
-  var _a;
-  if (!((_a = functionResponseEvent.actions) == null ? void 0 : _a.requestedAuthConfigs) || isEmpty(functionResponseEvent.actions.requestedAuthConfigs)) {
+  var _a2, _b2, _c;
+  if (!((_a2 = functionResponseEvent.actions) == null ? void 0 : _a2.requestedAuthConfigs) || isEmpty(functionResponseEvent.actions.requestedAuthConfigs)) {
     return void 0;
   }
   const parts = [];
@@ -85,7 +90,7 @@ function generateAuthEvent(invocationContext, functionResponseEvent) {
     branch: invocationContext.branch,
     content: {
       parts,
-      role: functionResponseEvent.content.role
+      role: (_c = (_b2 = functionResponseEvent.content) == null ? void 0 : _b2.role) != null ? _c : "user"
     },
     longRunningToolIds: Array.from(longRunningToolIds)
   });
@@ -96,8 +101,8 @@ function generateRequestConfirmationEvent({
   functionCallEvent,
   functionResponseEvent
 }) {
-  var _a, _b;
-  if (!((_a = functionResponseEvent.actions) == null ? void 0 : _a.requestedToolConfirmations) || isEmpty(functionResponseEvent.actions.requestedToolConfirmations)) {
+  var _a2, _b2, _c, _d;
+  if (!((_a2 = functionResponseEvent.actions) == null ? void 0 : _a2.requestedToolConfirmations) || isEmpty(functionResponseEvent.actions.requestedToolConfirmations)) {
     return;
   }
   const parts = [];
@@ -106,7 +111,7 @@ function generateRequestConfirmationEvent({
   for (const [functionCallId, toolConfirmation] of Object.entries(
     functionResponseEvent.actions.requestedToolConfirmations
   )) {
-    const originalFunctionCall = (_b = functionCalls.find((call) => call.id === functionCallId)) != null ? _b : void 0;
+    const originalFunctionCall = (_b2 = functionCalls.find((call) => call.id === functionCallId)) != null ? _b2 : void 0;
     if (!originalFunctionCall) {
       continue;
     }
@@ -127,7 +132,7 @@ function generateRequestConfirmationEvent({
     branch: invocationContext.branch,
     content: {
       parts,
-      role: functionResponseEvent.content.role
+      role: (_d = (_c = functionResponseEvent.content) == null ? void 0 : _c.role) != null ? _d : "user"
     },
     actions: functionResponseEvent.actions,
     longRunningToolIds: Array.from(longRunningToolIds)
@@ -192,7 +197,8 @@ async function handleFunctionCallsAsync({
   beforeToolCallbacks,
   afterToolCallbacks,
   filters,
-  toolConfirmationDict
+  toolConfirmationDict,
+  resumeInputsDict
 }) {
   const functionCalls = getFunctionCalls(functionCallEvent);
   return await handleFunctionCallList({
@@ -202,7 +208,8 @@ async function handleFunctionCallsAsync({
     beforeToolCallbacks,
     afterToolCallbacks,
     filters,
-    toolConfirmationDict
+    toolConfirmationDict,
+    resumeInputsDict
   });
 }
 __name(handleFunctionCallsAsync, "handleFunctionCallsAsync");
@@ -219,6 +226,70 @@ function normalizeCallbackResponse(response) {
   return response;
 }
 __name(normalizeCallbackResponse, "normalizeCallbackResponse");
+const RESOLUTION_FAILURE_CAUSES = `Possible causes:
+  1. The model hallucinated the name.
+  2. The tool is not registered on this agent, or a plugin filtered it out of this request.
+  3. The name does not match the registered tool's name exactly.
+  4. The tool is registered but never enters the toolsDict, because its \`_getDeclaration()\` returns undefined (as prompt-injecting tools like \`ExampleTool\` and \`PreloadMemoryTool\` do).`;
+const TOOL_NOT_FOUND_SYMBOL = /* @__PURE__ */ Symbol.for("google.adk.toolNotFound");
+function isToolNotFound(tool) {
+  return typeof tool === "object" && tool !== null && tool[TOOL_NOT_FOUND_SYMBOL] === true;
+}
+__name(isToolNotFound, "isToolNotFound");
+const _ToolNotFoundPlaceholder = class _ToolNotFoundPlaceholder extends (_b = BaseTool, _a = TOOL_NOT_FOUND_SYMBOL, _b) {
+  constructor(name, resolutionError) {
+    super({ name, description: "Tool not found" });
+    this.resolutionError = resolutionError;
+    this[_a] = true;
+  }
+  async runAsync() {
+    throw this.resolutionError;
+  }
+};
+__name(_ToolNotFoundPlaceholder, "ToolNotFoundPlaceholder");
+let ToolNotFoundPlaceholder = _ToolNotFoundPlaceholder;
+async function answerUnresolvableCall({
+  invocationContext,
+  functionCall,
+  toolsDict,
+  toolContext
+}) {
+  return tracer.startActiveSpan(
+    `execute_tool ${functionCall.name || "<unnamed>"}`,
+    async (span) => {
+      var _a2, _b2;
+      try {
+        const toolName = functionCall.name || "<unnamed>";
+        const error = new Error(
+          `Function ${toolName} is not found in the toolsDict.`
+        );
+        const tool = new ToolNotFoundPlaceholder(toolName, error);
+        const onToolErrorResponse = await invocationContext.pluginManager.runOnToolErrorCallback({
+          tool,
+          toolArgs: (_a2 = functionCall.args) != null ? _a2 : {},
+          toolContext,
+          error
+        });
+        if (onToolErrorResponse == null) {
+          const callableTools = Object.keys(toolsDict);
+          logger.warn(
+            `Could not resolve tool '${toolName}' for function call '${(_b2 = functionCall.id) != null ? _b2 : ""}'. Callable tools: ${callableTools.length ? callableTools.join(", ") : "(none)"}.
+` + RESOLUTION_FAILURE_CAUSES
+          );
+        }
+        return buildResponseEvent(
+          tool,
+          onToolErrorResponse != null ? onToolErrorResponse : { error: error.message },
+          toolContext,
+          invocationContext
+        );
+      } finally {
+        span.end();
+      }
+    }
+  );
+}
+__name(answerUnresolvableCall, "answerUnresolvableCall");
 async function handleFunctionCallList({
   invocationContext,
   functionCalls,
@@ -226,9 +297,10 @@ async function handleFunctionCallList({
   beforeToolCallbacks,
   afterToolCallbacks,
   filters,
-  toolConfirmationDict
+  toolConfirmationDict,
+  resumeInputsDict
 }) {
-  var _a;
+  var _a2;
   const functionResponseEvents = [];
   const filteredFunctionCalls = functionCalls.filter((functionCall) => {
     return !filters || functionCall.id && filters.has(functionCall.id);
@@ -238,14 +310,30 @@ async function handleFunctionCallList({
     if (toolConfirmationDict && functionCall.id) {
       toolConfirmation = toolConfirmationDict[functionCall.id];
     }
-    const { tool, toolContext } = getToolAndContext({
+    let resumeInputs = void 0;
+    if (resumeInputsDict && functionCall.id) {
+      resumeInputs = resumeInputsDict[functionCall.id];
+    }
+    const toolContext = new Context({
       invocationContext,
-      functionCall,
-      toolsDict,
-      toolConfirmation
+      functionCallId: functionCall.id || void 0,
+      toolConfirmation,
+      resumeInputs
     });
+    const tool = functionCall.name && Object.hasOwn(toolsDict, functionCall.name) ? toolsDict[functionCall.name] : void 0;
+    if (!tool) {
+      functionResponseEvents.push(
+        await answerUnresolvableCall({
+          invocationContext,
+          functionCall,
+          toolsDict,
+          toolContext
+        })
+      );
+      continue;
+    }
     logger.debug(`execute_tool ${tool.name}`);
-    const functionArgs = (_a = functionCall.args) != null ? _a : {};
+    const functionArgs = (_a2 = functionCall.args) != null ? _a2 : {};
     let functionResponse = null;
     let functionResponseError;
     functionResponse = await invocationContext.pluginManager.runBeforeToolCallback({
@@ -310,6 +398,16 @@ async function handleFunctionCallList({
       functionResponse = normalizeCallbackResponse(alteredFunctionResponse);
     }
     if (tool.isLongRunning && functionResponse == null) {
+      if (!isDefaultEventActions(toolContext.actions)) {
+        functionResponseEvents.push(
+          createEvent({
+            invocationId: invocationContext.invocationId,
+            author: toolEventAuthor(invocationContext),
+            actions: toolContext.actions,
+            branch: invocationContext.branch
+          })
+        );
+      }
       continue;
     }
     if (functionResponseError) {
@@ -365,26 +463,6 @@ async function handleFunctionCallList({
   return mergedEvent;
 }
 __name(handleFunctionCallList, "handleFunctionCallList");
-function getToolAndContext({
-  invocationContext,
-  functionCall,
-  toolsDict,
-  toolConfirmation
-}) {
-  if (!functionCall.name || !(functionCall.name in toolsDict)) {
-    throw new Error(
-      `Function ${functionCall.name} is not found in the toolsDict.`
-    );
-  }
-  const toolContext = new Context({
-    invocationContext,
-    functionCallId: functionCall.id || void 0,
-    toolConfirmation
-  });
-  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.");
@@ -426,22 +504,46 @@ function findEventByFunctionCallId(events, functionCallId, endIndex = events.len
   return void 0;
 }
 __name(findEventByFunctionCallId, "findEventByFunctionCallId");
-function findMatchingFunctionCall(events) {
+function resolveFunctionResponseMatch(events) {
+  var _a2, _b2;
   if (!events.length) {
-    return void 0;
+    return { resolved: void 0, conflictingAuthors: void 0 };
   }
   const lastEvent = events[events.length - 1];
   const functionResponses = getFunctionResponses(lastEvent);
-  if (!functionResponses.length || !functionResponses[0].id) {
-    return void 0;
+  if (!functionResponses.length) {
+    return { resolved: void 0, conflictingAuthors: void 0 };
   }
-  return findEventByFunctionCallId(
-    events,
-    functionResponses[0].id,
-    events.length - 1
-  );
+  let resolved;
+  let conflictingAuthors;
+  for (const functionResponse of functionResponses) {
+    if (!functionResponse.id) {
+      continue;
+    }
+    const match = findEventByFunctionCallId(
+      events,
+      functionResponse.id,
+      events.length - 1
+    );
+    if (!match) {
+      continue;
+    }
+    if (!conflictingAuthors && resolved && resolved.author !== match.author) {
+      conflictingAuthors = [(_a2 = resolved.author) != null ? _a2 : "", (_b2 = match.author) != null ? _b2 : ""];
+    }
+    resolved = match;
+  }
+  return { resolved, conflictingAuthors };
+}
+__name(resolveFunctionResponseMatch, "resolveFunctionResponseMatch");
+function findMatchingFunctionCall(events) {
+  return resolveFunctionResponseMatch(events).resolved;
 }
 __name(findMatchingFunctionCall, "findMatchingFunctionCall");
+function getConflictingFunctionResponseAuthors(events) {
+  return resolveFunctionResponseMatch(events).conflictingAuthors;
+}
+__name(getConflictingFunctionResponseAuthors, "getConflictingFunctionResponseAuthors");
 export {
   AF_FUNCTION_CALL_ID_PREFIX,
   REQUEST_CONFIRMATION_FUNCTION_CALL_NAME2 as REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
@@ -453,9 +555,11 @@ export {
   generateAuthEvent,
   generateClientFunctionCallId2 as generateClientFunctionCallId,
   generateRequestConfirmationEvent,
+  getConflictingFunctionResponseAuthors,
   getLongRunningFunctionCalls,
   handleFunctionCallList,
   handleFunctionCallsAsync,
+  isToolNotFound,
   mergeParallelFunctionResponseEvents,
   populateClientFunctionCallId,
   reservedFunctionCallName

package/dist/esm/agents/invocation_context.js

@@ -52,6 +52,7 @@ const _InvocationContext = class _InvocationContext {
     this.workflowInstructionScope = params.workflowInstructionScope;
     this.isolationScope = params.isolationScope;
     this.nodeToolDepth = (_a = params.nodeToolDepth) != null ? _a : 0;
+    this.a2aMetadata = params.a2aMetadata;
     this.invocationCostManager = (_b = params.invocationCostManager) != null ? _b : new InvocationCostManager();
     this.liveRequestQueue = params.liveRequestQueue;
     this.liveSessionResumptionHandle = params.liveSessionResumptionHandle;

package/dist/esm/agents/llm_agent.js

@@ -23,8 +23,10 @@ import {
   isFinalResponse,
   populateClientFunctionCallId
 } from "../events/event.js";
+import { isDefaultEventActions } from "../events/event_actions.js";
 import { isBaseLlm } from "../models/base_llm.js";
 import { LLMRegistry } from "../models/registry.js";
+import { isBuiltInPlanner } from "../planners/built_in_planner.js";
 import { isBaseTool } from "../tools/base_tool.js";
 import { logger } from "../utils/logger.js";
 import { canUseOutputSchemaWithTools } from "../utils/output_schema_utils.js";
@@ -53,6 +55,10 @@ import { ContextCompactorRequestProcessor } from "./processors/context_compactor
 import { IDENTITY_LLM_REQUEST_PROCESSOR } from "./processors/identity_llm_request_processor.js";
 import { INSTRUCTIONS_LLM_REQUEST_PROCESSOR } from "./processors/instructions_llm_request_processor.js";
 import { INTERACTIONS_REQUEST_PROCESSOR } from "./processors/interactions_request_processor.js";
+import {
+  NL_PLANNING_REQUEST_PROCESSOR,
+  NL_PLANNING_RESPONSE_PROCESSOR
+} from "./processors/nl_planning_processor.js";
 import { REQUEST_CONFIRMATION_LLM_REQUEST_PROCESSOR } from "./processors/request_confirmation_llm_request_processor.js";
 import { REQUEST_INPUT_LLM_REQUEST_PROCESSOR } from "./processors/request_input_llm_request_processor.js";
 import { TOOL_FILTER_REQUEST_PROCESSOR } from "./processors/tool_filter_request_processor.js";
@@ -119,7 +125,7 @@ async function convertToolUnionToTools(toolUnion, context2) {
   return await toolUnion.getTools(context2);
 }
 __name(convertToolUnionToTools, "convertToolUnionToTools");
-const LLM_AGENT_SIGNATURE_SYMBOL = Symbol.for("google.adk.llmAgent");
+const LLM_AGENT_SIGNATURE_SYMBOL = /* @__PURE__ */ Symbol.for("google.adk.llmAgent");
 function isLlmAgent(obj) {
   return typeof obj === "object" && obj !== null && LLM_AGENT_SIGNATURE_SYMBOL in obj && obj[LLM_AGENT_SIGNATURE_SYMBOL] === true;
 }
@@ -154,6 +160,7 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
     this.beforeToolCallback = config.beforeToolCallback;
     this.afterToolCallback = config.afterToolCallback;
     this.codeExecutor = config.codeExecutor;
+    this.planner = config.planner;
     this.requestProcessors = (_i = config.requestProcessors) != null ? _i : [
       BASIC_LLM_REQUEST_PROCESSOR,
       AUTH_PREPROCESSOR,
@@ -162,6 +169,10 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
       REQUEST_CONFIRMATION_LLM_REQUEST_PROCESSOR,
       REQUEST_INPUT_LLM_REQUEST_PROCESSOR,
       CONTENT_REQUEST_PROCESSOR,
+      // Planning clears the thought flags that the planning response
+      // processor sets, so it must run after the contents are built and
+      // before code execution rewrites them.
+      NL_PLANNING_REQUEST_PROCESSOR,
       INTERACTIONS_REQUEST_PROCESSOR,
       CODE_EXECUTION_REQUEST_PROCESSOR,
       TOOL_FILTER_REQUEST_PROCESSOR
@@ -182,7 +193,9 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
         );
       }
     }
-    this.responseProcessors = (_j = config.responseProcessors) != null ? _j : [];
+    this.responseProcessors = (_j = config.responseProcessors) != null ? _j : [
+      NL_PLANNING_RESPONSE_PROCESSOR
+    ];
     const agentTransferDisabled = this.disallowTransferToParent && this.disallowTransferToPeers && !((_k = this.subAgents) == null ? void 0 : _k.length);
     if (!agentTransferDisabled) {
       this.requestProcessors.push(AGENT_TRANSFER_LLM_REQUEST_PROCESSOR);
@@ -201,6 +214,11 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
           "Response schema must be set via LlmAgent.output_schema."
         );
       }
+      if (config.generateContentConfig.thinkingConfig && isBuiltInPlanner(this.planner) && this.planner.thinkingConfig) {
+        logger.warn(
+          `Agent ${this.name}: both generateContentConfig.thinkingConfig and planner.thinkingConfig are set. The planner's thinkingConfig takes precedence.`
+        );
+      }
     } else {
       this.generateContentConfig = {};
     }
@@ -453,7 +471,7 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
       if (!lastEvent) {
         break;
       }
-      const isEmptyMetadataEvent = lastEvent.author === this.name && !lastEvent.partial && (!((_b2 = lastEvent.content) == null ? void 0 : _b2.parts) || lastEvent.content.parts.length === 0);
+      const isEmptyMetadataEvent = lastEvent.author === this.name && !lastEvent.partial && (!((_b2 = lastEvent.content) == null ? void 0 : _b2.parts) || lastEvent.content.parts.length === 0) && isDefaultEventActions(lastEvent.actions);
       if (isFinalResponse(lastEvent) && !(isEmptyMetadataEvent && stepHadToolCalls)) {
         break;
       }
@@ -1228,9 +1246,9 @@ const _LlmAgent = class _LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNAT
   // --------------------------------------------------------------------------
   // #END LlmFlow Logic
   // --------------------------------------------------------------------------
-  // TODO - b/425992518: omitted Py LlmAgent features.
-  // - code_executor
-  // - configurable agents by yaml config
+  // TODO - b/425992518: LlmAgent features not implemented yet.
+  // - codeExecutor
+  // - configuring agents from a YAML file
 };
 __name(_LlmAgent, "LlmAgent");
 let LlmAgent = _LlmAgent;

package/dist/esm/agents/loop_agent.js

@@ -19,7 +19,7 @@ var __decorateClass = (decorators, target, key, kind) => {
 var _a, _b;
 import { deprecated } from "../utils/deprecated.js";
 import { BaseAgent } from "./base_agent.js";
-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;
 }

package/dist/esm/agents/parallel_agent.js

@@ -20,7 +20,7 @@ var _a, _b;
 import { deprecated } from "../utils/deprecated.js";
 import { BaseAgent } from "./base_agent.js";
 import { InvocationContext } from "./invocation_context.js";
-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;
 }

package/dist/esm/agents/processors/agent_transfer_llm_request_processor.js

@@ -17,17 +17,34 @@ const _AgentTransferLlmRequestProcessor = class _AgentTransferLlmRequestProcesso
   constructor() {
     super(...arguments);
     this.toolName = "transfer_to_agent";
-    this.tool = new 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 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: z.object({
-        agentName: z.string().describe("the agent name to transfer to.")
+        agent_name: z.enum(targetNames).describe("the agent name to transfer to.")
       }),
-      execute: /* @__PURE__ */ __name(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")
     });
@@ -55,7 +72,11 @@ const _AgentTransferLlmRequestProcessor = class _AgentTransferLlmRequestProcesso
       )
     ]);
     const toolContext = new 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 `

package/dist/esm/agents/processors/code_execution_request_processor.js

@@ -42,10 +42,10 @@ const _CodeExecutionRequestProcessor = class _CodeExecutionRequestProcessor exte
       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] : ["", ""];
       convertCodeExecutionParts(
         content,
-        delimeters,
+        delimiters,
         invocationContext.agent.codeExecutor.executionResultDelimiters
       );
     }

package/dist/esm/agents/processors/content_processor_utils.js

@@ -18,12 +18,14 @@ import {
   getFunctionResponses
 } from "../../events/event.js";
 import { isSegmentPrefix } from "../../utils/branch_trie.js";
+import { isEventVisibleInIsolationScope } from "../../context/compaction_utils.js";
 import {
   AF_FUNCTION_CALL_ID_PREFIX,
   REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
   REQUEST_CREDENTIAL_FUNCTION_CALL_NAME,
   REQUEST_INPUT_FUNCTION_CALL_NAME
 } from "../functions.js";
+const UNSTRINGIFIABLE_VALUE = "<unstringifiable value>";
 function removeClientFunctionCallId(content) {
   var _a, _b, _c, _d, _e;
   for (const part of (_a = content == null ? void 0 : content.parts) != null ? _a : []) {
@@ -39,6 +41,9 @@ __name(removeClientFunctionCallId, "removeClientFunctionCallId");
 function getContents(events, agentName, currentBranch, currentIsolationScope) {
   const filteredEvents = [];
   for (const event of events) {
+    if (!isEventVisibleInIsolationScope(event, currentIsolationScope)) {
+      continue;
+    }
     if (isCompactedEvent(event)) {
       filteredEvents.push(convertCompactedEvent(event));
       continue;
@@ -69,7 +74,7 @@ function shouldIncludeEventInContext(event, currentBranch, currentIsolationScope
   if (currentBranch && event.branch && !isSegmentPrefix(currentBranch, event.branch)) {
     return false;
   }
-  if (isOutsideIsolationScope(event, currentIsolationScope)) {
+  if (!isEventVisibleInIsolationScope(event, currentIsolationScope)) {
     return false;
   }
   return !isAuthEvent(event) && !isToolConfirmationEvent(event) && !isRequestInputEvent(event);
@@ -134,10 +139,6 @@ function turnStart(events, anchor) {
   return start;
 }
 __name(turnStart, "turnStart");
-function isOutsideIsolationScope(event, currentIsolationScope) {
-  return event.isolationScope !== void 0 && event.isolationScope !== currentIsolationScope;
-}
-__name(isOutsideIsolationScope, "isOutsideIsolationScope");
 function isAuthEvent(event) {
   var _a, _b, _c;
   if (!((_a = event.content) == null ? void 0 : _a.parts)) {
@@ -388,9 +389,16 @@ function safeStringify(obj) {
     return obj;
   }
   try {
-    return JSON.stringify(obj);
-  } catch (_e) {
+    const json = JSON.stringify(obj);
+    if (typeof json === "string") {
+      return json;
+    }
+  } catch {
+  }
+  try {
     return String(obj);
+  } catch {
+    return UNSTRINGIFIABLE_VALUE;
   }
 }
 __name(safeStringify, "safeStringify");

package/dist/esm/agents/processors/content_request_processor.js

@@ -27,7 +27,10 @@ const _ContentRequestProcessor = class _ContentRequestProcessor {
     if (!agent || !isLlmAgent(agent)) {
       return;
     }
-    const events = getActiveEvents(invocationContext.session.events);
+    const events = getActiveEvents(
+      invocationContext.session.events,
+      invocationContext.isolationScope
+    );
     if (agent.includeContents === "default") {
       llmRequest.contents = getContents(
         events,