@google/adk 1.3.0 → 1.5.0

package/dist/cjs/a2a/agent_to_a2a.js

@@ -43,6 +43,7 @@ var import_express = require("@a2a-js/sdk/server/express");
 var import_express2 = __toESM(require("express"), 1);
 var import_run_config = require("../agents/run_config.js");
 var import_in_memory_session_service = require("../sessions/in_memory_session_service.js");
+var import_logger = require("../utils/logger.js");
 var import_agent_card = require("./agent_card.js");
 var import_agent_executor = require("./agent_executor.js");
 /**
@@ -50,8 +51,23 @@ var import_agent_executor = require("./agent_executor.js");
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+function resolveA2aUserBuilder(options) {
+  if (options.authentication) {
+    return options.authentication;
+  }
+  if (options.allowUnauthenticated === true) {
+    import_logger.logger.warn(
+      "SECURITY WARNING: Mounting the A2A server WITHOUT authentication because `allowUnauthenticated: true` was set. The agent and all of its tools are exposed to any network-reachable caller, which can invoke them with arbitrary input and read the output. Do NOT use this outside of local, trusted development."
+    );
+    return import_express.UserBuilder.noAuthentication;
+  }
+  throw new Error(
+    "toA2a: refusing to mount the A2A server without authentication. The A2A surface lets any network-reachable caller invoke this agent and its tools with arbitrary input and read the output, so it must be authenticated. Provide `authentication` (a UserBuilder that validates the request, e.g. a bearer token or OIDC credential) or, only for local/trusted development, explicitly set `allowUnauthenticated: true`."
+  );
+}
 async function toA2a(agent, options = {}) {
   var _a, _b, _c, _d;
+  const userBuilder = resolveA2aUserBuilder(options);
   const host = (_a = options.host) != null ? _a : "localhost";
   const port = (_b = options.port) != null ? _b : 8e3;
   const protocol = (_c = options.protocol) != null ? _c : "http";
@@ -97,14 +113,14 @@ async function toA2a(agent, options = {}) {
     `${basePath}/rest`,
     (0, import_express.restHandler)({
       requestHandler,
-      userBuilder: import_express.UserBuilder.noAuthentication
+      userBuilder
     })
   );
   app.use(
     `${basePath}/jsonrpc`,
     (0, import_express.jsonRpcHandler)({
       requestHandler,
-      userBuilder: import_express.UserBuilder.noAuthentication
+      userBuilder
     })
   );
   return app;

package/dist/cjs/a2a/event_converter_utils.js

@@ -69,13 +69,14 @@ function toAdkEvent(event, invocationId, agentName) {
   }
   return void 0;
 }
-function messageToAdkEvent(msg, invocationId, agentName, parentEvent) {
+function messageToAdkEvent(msg, invocationId, agentName) {
   const parts = (0, import_part_converter_utils.toGenAIParts)(msg.parts);
+  const content = parts.length === 0 ? void 0 : msg.role === import_a2a_event.MessageRole.USER ? (0, import_genai.createUserContent)(parts) : (0, import_genai.createModelContent)(parts);
   return {
-    ...createAdkEventFromMetadata(parentEvent || msg),
+    ...createAdkEventFromMetadata(msg),
     invocationId,
     author: msg.role === import_a2a_event.MessageRole.USER ? import_a2a_event.MessageRole.USER : agentName,
-    content: msg.role === import_a2a_event.MessageRole.USER ? (0, import_genai.createUserContent)(parts) : (0, import_genai.createModelContent)(parts),
+    content,
     turnComplete: true,
     partial: false
   };
@@ -121,6 +122,9 @@ function taskStatusUpdateToAdkEvent(a2aEvent, invocationId, agentName) {
     return void 0;
   }
   const parts = (0, import_part_converter_utils.toGenAIParts)(msg.parts);
+  if (parts.length === 0) {
+    return void 0;
+  }
   return {
     ...createAdkEventFromMetadata(a2aEvent),
     invocationId,
@@ -151,7 +155,7 @@ function taskToAdkEvent(a2aTask, invocationId, agentName) {
   }
   const isTerminal = (0, import_a2a_event.isTerminalTaskStatusUpdateEvent)(a2aTask) || (0, import_a2a_event.isInputRequiredTaskStatusUpdateEvent)(a2aTask);
   const isFailed = (0, import_a2a_event.isFailedTaskStatusUpdateEvent)(a2aTask);
-  if (parts.length === 0 && !isTerminal) {
+  if (parts.length === 0 && !isFailed) {
     return void 0;
   }
   return {

package/dist/cjs/a2a/metadata_converter_utils.js

@@ -88,7 +88,7 @@ function getA2AEventMetadata(adkEvent, {
     [A2AMetadataKeys.INVOCATION_ID]: adkEvent.invocationId,
     [A2AMetadataKeys.AUTHOR]: adkEvent.author,
     [A2AMetadataKeys.BRANCH]: adkEvent.branch,
-    [A2AMetadataKeys.ERROR_CODE]: adkEvent.errorMessage,
+    [A2AMetadataKeys.ERROR_CODE]: adkEvent.errorCode,
     [A2AMetadataKeys.ERROR_MESSAGE]: adkEvent.errorMessage,
     [A2AMetadataKeys.CITATION_METADATA]: adkEvent.citationMetadata,
     [A2AMetadataKeys.GROUNDING_METADATA]: adkEvent.groundingMetadata,

package/dist/cjs/agents/active_streaming_tool.js

@@ -27,6 +27,7 @@ __export(active_streaming_tool_exports, {
   ActiveStreamingTool: () => ActiveStreamingTool
 });
 module.exports = __toCommonJS(active_streaming_tool_exports);
+var import_task = require("../utils/task.js");
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -34,7 +35,11 @@ module.exports = __toCommonJS(active_streaming_tool_exports);
  */
 class ActiveStreamingTool {
   constructor(params = {}) {
-    this.task = params.task;
+    if (params.task instanceof Promise) {
+      this.task = new import_task.Task(() => params.task);
+    } else {
+      this.task = params.task;
+    }
     this.stream = params.stream;
   }
 }

package/dist/cjs/agents/base_agent.js

@@ -51,6 +51,7 @@ class BaseAgent {
      * A unique symbol to identify ADK agent classes.
      */
     this[_a] = true;
+    this.config = { ...config };
     this.name = validateAgentName(config.name);
     this.description = config.description;
     this.parentAgent = config.parentAgent;
@@ -68,6 +69,44 @@ class BaseAgent {
   get rootAgent() {
     return getRootAgent(this);
   }
+  /**
+   * Creates a copy of this agent with the given config fields overridden.
+   *
+   * Mirrors adk-python's `BaseAgent.clone(update=...)`. The clone is a detached
+   * root: its `parentAgent` is always `undefined`. Sub-agents are recursively
+   * cloned (and re-parented to the clone) unless `subAgents` is overridden.
+   * Rebuilding via the concrete constructor re-derives all state, so a cloned
+   * `LlmAgent` gets a fresh `requestProcessors` array rather than sharing the
+   * original's. See google/adk-js#534.
+   *
+   * @param overrides Config fields to override on the clone. Overriding
+   *     `parentAgent` is rejected, matching adk-python.
+   * @returns A new detached agent instance of the same concrete class.
+   */
+  clone(overrides) {
+    if (overrides && "parentAgent" in overrides) {
+      throw new Error(
+        "Cannot update `parentAgent` field in clone. Parent agent is set only when the parent agent is instantiated with the sub-agents."
+      );
+    }
+    const merged = { ...this.config, ...overrides };
+    merged.parentAgent = void 0;
+    const mergedRecord = merged;
+    for (const key of Object.keys(mergedRecord)) {
+      if (key === "subAgents" || overrides && key in overrides) {
+        continue;
+      }
+      const value = mergedRecord[key];
+      if (Array.isArray(value)) {
+        mergedRecord[key] = value.slice();
+      }
+    }
+    if (!overrides || !("subAgents" in overrides)) {
+      merged.subAgents = this.subAgents.map((subAgent) => subAgent.clone());
+    }
+    const ctor = this.constructor;
+    return new ctor(merged);
+  }
   /**
    * Entry method to run an agent via text-based conversation.
    *

package/dist/cjs/agents/context.js

@@ -83,9 +83,6 @@ class Context extends import_readonly_context.ReadonlyContext {
       throw new Error("Artifact service is not initialized.");
     }
     return this.invocationContext.artifactService.loadArtifact({
-      appName: this.invocationContext.appName,
-      userId: this.invocationContext.userId,
-      sessionId: this.invocationContext.session.id,
       filename,
       version
     });
@@ -102,9 +99,6 @@ class Context extends import_readonly_context.ReadonlyContext {
       throw new Error("Artifact service is not initialized.");
     }
     const version = await this.invocationContext.artifactService.saveArtifact({
-      appName: this.invocationContext.appName,
-      userId: this.invocationContext.userId,
-      sessionId: this.invocationContext.session.id,
       filename,
       artifact
     });
@@ -137,11 +131,7 @@ class Context extends import_readonly_context.ReadonlyContext {
     if (!this.invocationContext.artifactService) {
       throw new Error("Artifact service is not initialized.");
     }
-    return this.invocationContext.artifactService.listArtifactKeys({
-      appName: this.invocationContext.session.appName,
-      userId: this.invocationContext.session.userId,
-      sessionId: this.invocationContext.session.id
-    });
+    return this.invocationContext.artifactService.listArtifactKeys();
   }
   /**
    * Searches the memory of the current user.

package/dist/cjs/agents/functions.js

@@ -24,34 +24,35 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 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,
+  findEventByFunctionCallId: () => findEventByFunctionCallId,
+  findMatchingFunctionCall: () => findMatchingFunctionCall,
   functionsExportedForTestingOnly: () => functionsExportedForTestingOnly,
   generateAuthEvent: () => generateAuthEvent,
-  generateClientFunctionCallId: () => generateClientFunctionCallId,
+  generateClientFunctionCallId: () => import_event2.generateClientFunctionCallId,
   generateRequestConfirmationEvent: () => generateRequestConfirmationEvent,
   getLongRunningFunctionCalls: () => getLongRunningFunctionCalls,
   handleFunctionCallList: () => handleFunctionCallList,
   handleFunctionCallsAsync: () => handleFunctionCallsAsync,
   mergeParallelFunctionResponseEvents: () => mergeParallelFunctionResponseEvents,
-  populateClientFunctionCallId: () => populateClientFunctionCallId,
-  removeClientFunctionCallId: () => removeClientFunctionCallId
+  populateClientFunctionCallId: () => import_event2.populateClientFunctionCallId
 });
 module.exports = __toCommonJS(functions_exports);
 var import_genai = require("@google/genai");
 var import_lodash_es = require("lodash-es");
 var import_event = require("../events/event.js");
 var import_event_actions = require("../events/event_actions.js");
-var import_env_aware_utils = require("../utils/env_aware_utils.js");
 var import_logger = require("../utils/logger.js");
 var import_context = require("./context.js");
 var import_tracing = require("../telemetry/tracing.js");
+var import_event2 = require("../events/event.js");
 /**
  * @license
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-const AF_FUNCTION_CALL_ID_PREFIX = "adk-";
 const REQUEST_EUC_FUNCTION_CALL_NAME = "adk_request_credential";
 const REQUEST_CONFIRMATION_FUNCTION_CALL_NAME = "adk_request_confirmation";
 const functionsExportedForTestingOnly = {
@@ -59,32 +60,6 @@ const functionsExportedForTestingOnly = {
   generateAuthEvent,
   generateRequestConfirmationEvent
 };
-function generateClientFunctionCallId() {
-  return `${AF_FUNCTION_CALL_ID_PREFIX}${(0, import_env_aware_utils.randomUUID)()}`;
-}
-function populateClientFunctionCallId(modelResponseEvent) {
-  const functionCalls = (0, import_event.getFunctionCalls)(modelResponseEvent);
-  if (!functionCalls) {
-    return;
-  }
-  for (const functionCall of functionCalls) {
-    if (!functionCall.id) {
-      functionCall.id = generateClientFunctionCallId();
-    }
-  }
-}
-function removeClientFunctionCallId(content) {
-  if (content && content.parts) {
-    for (const part of content.parts) {
-      if (part.functionCall && part.functionCall.id && part.functionCall.id.startsWith(AF_FUNCTION_CALL_ID_PREFIX)) {
-        part.functionCall.id = void 0;
-      }
-      if (part.functionResponse && part.functionResponse.id && part.functionResponse.id.startsWith(AF_FUNCTION_CALL_ID_PREFIX)) {
-        part.functionResponse.id = void 0;
-      }
-    }
-  }
-}
 function getLongRunningFunctionCalls(functionCalls, toolsDict) {
   const longRunningToolIds = /* @__PURE__ */ new Set();
   for (const functionCall of functionCalls) {
@@ -110,7 +85,7 @@ function generateAuthEvent(invocationContext, functionResponseEvent) {
         "function_call_id": functionCallId,
         "auth_config": authConfig
       },
-      id: generateClientFunctionCallId()
+      id: (0, import_event.generateClientFunctionCallId)()
     };
     longRunningToolIds.add(requestEucFunctionCall.id);
     parts.push({ functionCall: requestEucFunctionCall });
@@ -151,7 +126,7 @@ function generateRequestConfirmationEvent({
         "originalFunctionCall": originalFunctionCall,
         "toolConfirmation": toolConfirmation
       },
-      id: generateClientFunctionCallId()
+      id: (0, import_event.generateClientFunctionCallId)()
     };
     longRunningToolIds.add(requestConfirmationFunctionCall.id);
     parts.push({ functionCall: requestConfirmationFunctionCall });
@@ -427,10 +402,40 @@ function mergeParallelFunctionResponseEvents(functionResponseEvents) {
     timestamp: baseEvent.timestamp
   });
 }
+function findEventByFunctionCallId(events, functionCallId, endIndex = events.length) {
+  for (let i = endIndex - 1; i >= 0; i--) {
+    const event = events[i];
+    const functionCalls = (0, import_event.getFunctionCalls)(event);
+    for (const functionCall of functionCalls) {
+      if (functionCall.id === functionCallId) {
+        return event;
+      }
+    }
+  }
+  return void 0;
+}
+function findMatchingFunctionCall(events) {
+  if (!events.length) {
+    return void 0;
+  }
+  const lastEvent = events[events.length - 1];
+  const functionResponses = (0, import_event.getFunctionResponses)(lastEvent);
+  if (!functionResponses.length || !functionResponses[0].id) {
+    return void 0;
+  }
+  return findEventByFunctionCallId(
+    events,
+    functionResponses[0].id,
+    events.length - 1
+  );
+}
 // 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,
+  findEventByFunctionCallId,
+  findMatchingFunctionCall,
   functionsExportedForTestingOnly,
   generateAuthEvent,
   generateClientFunctionCallId,
@@ -439,6 +444,5 @@ function mergeParallelFunctionResponseEvents(functionResponseEvents) {
   handleFunctionCallList,
   handleFunctionCallsAsync,
   mergeParallelFunctionResponseEvents,
-  populateClientFunctionCallId,
-  removeClientFunctionCallId
+  populateClientFunctionCallId
 });

package/dist/cjs/agents/instructions.js

@@ -42,9 +42,6 @@ async function resolveKey(key, isOptional, rawMatch, readonlyContext) {
       throw new Error("Artifact service is not initialized.");
     }
     const artifact = await invocationContext.artifactService.loadArtifact({
-      appName: invocationContext.session.appName,
-      userId: invocationContext.session.userId,
-      sessionId: invocationContext.session.id,
       filename: fileName
     });
     if (!artifact) {
@@ -53,19 +50,40 @@ async function resolveKey(key, isOptional, rawMatch, readonlyContext) {
       }
       throw new Error(`Artifact ${fileName} not found.`);
     }
-    return String(artifact);
+    return formatValue(artifact, true);
   }
   if (!isValidStateName(key)) {
     return rawMatch;
   }
   if (key in invocationContext.session.state) {
-    return String(invocationContext.session.state[key]);
+    return formatValue(invocationContext.session.state[key], false);
   }
   if (isOptional) {
     return "";
   }
   throw new Error(`Context variable not found: \`${key}\`.`);
 }
+function formatValue(value, isArtifact = false) {
+  if (typeof value === "string") {
+    return value;
+  }
+  if (typeof value === "object" && value !== null) {
+    if (isArtifact && "text" in value && typeof value.text === "string") {
+      return value.text;
+    }
+    try {
+      const json = JSON.stringify(value);
+      if (json !== void 0) {
+        return json;
+      }
+    } catch (e) {
+      throw new Error(
+        `Failed to serialize value for instruction template: ${e instanceof Error ? e.message : String(e)}`
+      );
+    }
+  }
+  return String(value);
+}
 async function injectSessionState(template, readonlyContext) {
   const pattern = /\{+[^{}]*}+/g;
   const matches = Array.from(template.matchAll(pattern));

package/dist/cjs/agents/invocation_context.js

@@ -58,11 +58,7 @@ class InvocationContext {
    * @param params The parameters for creating an invocation context.
    */
   constructor(params) {
-    /**
-     * A container to keep track of different kinds of costs incurred as a part of
-     * this invocation.
-     */
-    this.invocationCostManager = new InvocationCostManager();
+    var _a;
     this.artifactService = params.artifactService;
     this.sessionService = params.sessionService;
     this.memoryService = params.memoryService;
@@ -77,6 +73,7 @@ class InvocationContext {
     this.activeStreamingTools = params.activeStreamingTools;
     this.pluginManager = params.pluginManager;
     this.abortSignal = params.abortSignal;
+    this.invocationCostManager = (_a = params.invocationCostManager) != null ? _a : new InvocationCostManager();
   }
   /**
    * The app name of the current session.

package/dist/cjs/agents/llm_agent.js

@@ -48,6 +48,7 @@ var import_content_request_processor = require("./processors/content_request_pro
 var import_context_compactor_request_processor = require("./processors/context_compactor_request_processor.js");
 var import_identity_llm_request_processor = require("./processors/identity_llm_request_processor.js");
 var import_instructions_llm_request_processor = require("./processors/instructions_llm_request_processor.js");
+var import_interactions_request_processor = require("./processors/interactions_request_processor.js");
 var import_request_confirmation_llm_request_processor = require("./processors/request_confirmation_llm_request_processor.js");
 var import_tool_filter_request_processor = require("./processors/tool_filter_request_processor.js");
 var import_readonly_context = require("./readonly_context.js");
@@ -98,6 +99,7 @@ class LlmAgent extends (_b = import_base_agent.BaseAgent, _a = LLM_AGENT_SIGNATU
       import_instructions_llm_request_processor.INSTRUCTIONS_LLM_REQUEST_PROCESSOR,
       import_request_confirmation_llm_request_processor.REQUEST_CONFIRMATION_LLM_REQUEST_PROCESSOR,
       import_content_request_processor.CONTENT_REQUEST_PROCESSOR,
+      import_interactions_request_processor.INTERACTIONS_REQUEST_PROCESSOR,
       import_code_execution_request_processor.CODE_EXECUTION_REQUEST_PROCESSOR,
       import_tool_filter_request_processor.TOOL_FILTER_REQUEST_PROCESSOR
     ];
@@ -193,6 +195,7 @@ class LlmAgent extends (_b = import_base_agent.BaseAgent, _a = LLM_AGENT_SIGNATU
    * This method is only for use by Agent Development Kit.
    * @param context The context to retrieve the session state.
    * @returns The resolved globalInstruction field.
+   * @deprecated Use GlobalInstructionPlugin instead.
    */
   async canonicalGlobalInstruction(context2) {
     if (typeof this.globalInstruction === "string") {
@@ -480,7 +483,7 @@ class LlmAgent extends (_b = import_base_agent.BaseAgent, _a = LLM_AGENT_SIGNATU
     span.end();
   }
   async *postprocess(invocationContext, llmRequest, llmResponse, modelResponseEvent) {
-    var _a2, _b2, _c, _d, _e;
+    var _a2, _b2, _c, _d, _e, _f;
     for (const processor of this.responseProcessors) {
       for await (const event of processor.runAsync(
         invocationContext,
@@ -492,7 +495,7 @@ class LlmAgent extends (_b = import_base_agent.BaseAgent, _a = LLM_AGENT_SIGNATU
         yield event;
       }
     }
-    if (!llmResponse.content && !llmResponse.errorCode && !llmResponse.interrupted) {
+    if ((!llmResponse.content || ((_b2 = llmResponse.content.parts) == null ? void 0 : _b2.length) === 0) && !llmResponse.errorCode && !llmResponse.interrupted) {
       return;
     }
     const mergedEvent = (0, import_event.createEvent)({
@@ -509,17 +512,17 @@ class LlmAgent extends (_b = import_base_agent.BaseAgent, _a = LLM_AGENT_SIGNATU
         mergedEvent.content.parts = [{ text: JSON.stringify(args) }];
         mergedEvent.actions.skipSummarization = true;
       } else if (functionCalls && functionCalls.length) {
-        (0, import_functions.populateClientFunctionCallId)(mergedEvent);
+        (0, import_event.populateClientFunctionCallId)(mergedEvent);
         mergedEvent.longRunningToolIds = Array.from(
           (0, import_functions.getLongRunningFunctionCalls)(functionCalls, llmRequest.toolsDict)
         );
       }
     }
     yield mergedEvent;
-    if (!((_b2 = (0, import_event.getFunctionCalls)(mergedEvent)) == null ? void 0 : _b2.length)) {
+    if (!((_c = (0, import_event.getFunctionCalls)(mergedEvent)) == null ? void 0 : _c.length)) {
       return;
     }
-    if ((_c = invocationContext.runConfig) == null ? void 0 : _c.pauseOnToolCalls) {
+    if ((_d = invocationContext.runConfig) == null ? void 0 : _d.pauseOnToolCalls) {
       invocationContext.endInvocation = true;
       return;
     }
@@ -530,7 +533,7 @@ class LlmAgent extends (_b = import_base_agent.BaseAgent, _a = LLM_AGENT_SIGNATU
       beforeToolCallbacks: this.canonicalBeforeToolCallbacks,
       afterToolCallbacks: this.canonicalAfterToolCallbacks
     });
-    if (!functionResponseEvent || ((_d = invocationContext.abortSignal) == null ? void 0 : _d.aborted)) {
+    if (!functionResponseEvent || ((_e = invocationContext.abortSignal) == null ? void 0 : _e.aborted)) {
       return;
     }
     const authEvent = (0, import_functions.generateAuthEvent)(
@@ -555,7 +558,7 @@ class LlmAgent extends (_b = import_base_agent.BaseAgent, _a = LLM_AGENT_SIGNATU
     if (nextAgentName) {
       const nextAgent = this.getAgentByName(invocationContext, nextAgentName);
       for await (const event of nextAgent.runAsync(invocationContext)) {
-        if ((_e = invocationContext.abortSignal) == null ? void 0 : _e.aborted) {
+        if ((_f = invocationContext.abortSignal) == null ? void 0 : _f.aborted) {
           return;
         }
         yield event;

package/dist/cjs/agents/loop_agent.js

@@ -72,9 +72,21 @@ class LoopAgent extends (_b = import_base_agent.BaseAgent, _a = LOOP_AGENT_SIGNA
     }
     return;
   }
-  // eslint-disable-next-line require-yield
-  async *runLiveImpl(_context) {
-    throw new Error("This is not supported yet for LoopAgent.");
+  async *runLiveImpl(context) {
+    var _a2, _b2;
+    for (let iteration = 0; iteration < this.maxIterations; iteration++) {
+      for (const subAgent of this.subAgents) {
+        for await (const event of subAgent.runLive(context)) {
+          if ((_a2 = context.abortSignal) == null ? void 0 : _a2.aborted) {
+            return;
+          }
+          yield event;
+          if ((_b2 = event.actions) == null ? void 0 : _b2.escalate) {
+            return;
+          }
+        }
+      }
+    }
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -339,9 +339,6 @@ async function postProcessCodeExecutionResult(invocationContext, codeExecutorCon
   }
   for (const outputFile of codeExecutionResult.outputFiles) {
     const version = await invocationContext.artifactService.saveArtifact({
-      appName: invocationContext.appName || "",
-      userId: invocationContext.userId || "",
-      sessionId: invocationContext.session.id,
       filename: outputFile.name,
       artifact: {
         inlineData: { data: outputFile.content, mimeType: outputFile.mimeType }

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

@@ -26,19 +26,32 @@ var content_processor_utils_exports = {};
 __export(content_processor_utils_exports, {
   getContents: () => getContents,
   getCurrentTurnContents: () => getCurrentTurnContents,
-  mergeFunctionResponseEvents: () => mergeFunctionResponseEvents
+  mergeFunctionResponseEvents: () => mergeFunctionResponseEvents,
+  removeClientFunctionCallId: () => removeClientFunctionCallId
 });
 module.exports = __toCommonJS(content_processor_utils_exports);
 var import_genai = require("@google/genai");
 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_functions = require("../functions.js");
 /**
  * @license
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+function removeClientFunctionCallId(content) {
+  var _a, _b, _c, _d, _e;
+  for (const part of (_a = content == null ? void 0 : content.parts) != null ? _a : []) {
+    if ((_c = (_b = part.functionCall) == null ? void 0 : _b.id) == null ? void 0 : _c.startsWith(import_functions.AF_FUNCTION_CALL_ID_PREFIX)) {
+      part.functionCall.id = void 0;
+    }
+    if ((_e = (_d = part.functionResponse) == null ? void 0 : _d.id) == null ? void 0 : _e.startsWith(import_functions.AF_FUNCTION_CALL_ID_PREFIX)) {
+      part.functionResponse.id = void 0;
+    }
+  }
+}
 function getContents(events, agentName, currentBranch) {
   var _a, _b, _c;
   const filteredEvents = [];
@@ -50,7 +63,7 @@ function getContents(events, agentName, currentBranch) {
     if (!((_a = event.content) == null ? void 0 : _a.role) || ((_c = (_b = event.content.parts) == null ? void 0 : _b[0]) == null ? void 0 : _c.text) === "") {
       continue;
     }
-    if (currentBranch && event.branch && !currentBranch.startsWith(event.branch)) {
+    if (currentBranch && event.branch && !(0, import_branch_trie.isSegmentPrefix)(currentBranch, event.branch)) {
       continue;
     }
     if (isAuthEvent(event)) {
@@ -68,7 +81,7 @@ function getContents(events, agentName, currentBranch) {
   const contents = [];
   for (const event of resultEvents) {
     const content = (0, import_lodash_es.cloneDeep)(event.content);
-    (0, import_functions.removeClientFunctionCallId)(content);
+    removeClientFunctionCallId(content);
     contents.push(content);
   }
   return contents;
@@ -347,5 +360,6 @@ ${event.compactedContent}`
 0 && (module.exports = {
   getContents,
   getCurrentTurnContents,
-  mergeFunctionResponseEvents
+  mergeFunctionResponseEvents,
+  removeClientFunctionCallId
 });

package/dist/cjs/agents/processors/context_compactor_request_processor.js

@@ -50,20 +50,22 @@ class ContextCompactorRequestProcessor {
    * @param _llmRequest - Unused; present to satisfy the {@link BaseLlmRequestProcessor} interface.
    */
   async *runAsync(invocationContext, _llmRequest) {
+    var _a;
     for (const compactor of this.compactors) {
       const shouldCompact = await Promise.resolve(
         compactor.shouldCompact(invocationContext)
       );
       if (shouldCompact) {
+        const trigger = (_a = compactor.trigger) != null ? _a : import_base_plugin.ContextCompactionTrigger.Auto;
         await invocationContext.pluginManager.runBeforeContextCompaction({
           invocationContext,
-          trigger: import_base_plugin.ContextCompactionTrigger.Auto
+          trigger
         });
         const oldEvents = new Set(invocationContext.session.events);
         await Promise.resolve(compactor.compact(invocationContext));
         await invocationContext.pluginManager.runAfterContextCompaction({
           invocationContext,
-          trigger: import_base_plugin.ContextCompactionTrigger.Auto
+          trigger
         });
         const newEvents = invocationContext.session.events.filter(
           (e) => !oldEvents.has(e)