@google/adk 1.5.0 → 1.6.0

package/dist/cjs/utils/env_aware_utils.js

@@ -32,6 +32,7 @@ __export(env_aware_utils_exports, {
   randomUUID: () => randomUUID
 });
 module.exports = __toCommonJS(env_aware_utils_exports);
+var import_node_crypto = require("node:crypto");
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -40,24 +41,25 @@ module.exports = __toCommonJS(env_aware_utils_exports);
 function isBrowser() {
   return typeof window !== "undefined";
 }
-const UUID_MASK = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx";
 function randomUUID() {
-  var _a;
+  var _a, _b;
   if ((_a = globalThis.crypto) == null ? void 0 : _a.randomUUID) {
     return globalThis.crypto.randomUUID();
   }
-  let uuid = "";
-  for (let i = 0; i < UUID_MASK.length; i++) {
-    const randomValue = Math.random() * 16 | 0;
-    if (UUID_MASK[i] === "x") {
-      uuid += randomValue.toString(16);
-    } else if (UUID_MASK[i] === "y") {
-      uuid += (randomValue & 3 | 8).toString(16);
-    } else {
-      uuid += UUID_MASK[i];
-    }
+  if ((_b = globalThis.crypto) == null ? void 0 : _b.getRandomValues) {
+    const bytes = globalThis.crypto.getRandomValues(new Uint8Array(16));
+    bytes[6] = bytes[6] & 15 | 64;
+    bytes[8] = bytes[8] & 63 | 128;
+    const hex = Array.from(bytes, (b) => b.toString(16).padStart(2, "0"));
+    return [
+      hex.slice(0, 4),
+      hex.slice(4, 6),
+      hex.slice(6, 8),
+      hex.slice(8, 10),
+      hex.slice(10, 16)
+    ].map((group) => group.join("")).join("-");
   }
-  return uuid;
+  return (0, import_node_crypto.randomUUID)();
 }
 function base64Encode(data) {
   if (isBrowser()) {

package/dist/cjs/utils/error_utils.js

@@ -0,0 +1,120 @@
+/**
+  * @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 __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 error_utils_exports = {};
+__export(error_utils_exports, {
+  formatError: () => formatError
+});
+module.exports = __toCommonJS(error_utils_exports);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const MAX_RESPONSE_BODY_LENGTH = 1e3;
+const TRUNCATION_MARKER = "... [truncated]";
+const UNKNOWN_ERROR = "Unknown error";
+const MIN_HTTP_STATUS = 100;
+const MAX_HTTP_STATUS = 599;
+function asRecord(value) {
+  return value !== null && typeof value === "object" ? value : void 0;
+}
+function firstString(...values) {
+  for (const value of values) {
+    if (typeof value === "string") {
+      return value;
+    }
+  }
+  return void 0;
+}
+function truncateBody(body) {
+  return body.length > MAX_RESPONSE_BODY_LENGTH ? body.slice(0, MAX_RESPONSE_BODY_LENGTH) + TRUNCATION_MARKER : body;
+}
+function baseMessage(err) {
+  if (err instanceof Error) {
+    return err.message;
+  }
+  if (typeof err === "string") {
+    return err;
+  }
+  return String(err);
+}
+function extractHttpDetails(err) {
+  var _a, _b;
+  const record = asRecord(err);
+  if (record === void 0) {
+    return void 0;
+  }
+  const response = asRecord(record["response"]);
+  const rawStatus = (_b = (_a = record["status"]) != null ? _a : record["code"]) != null ? _b : response == null ? void 0 : response["status"];
+  const status = typeof rawStatus === "number" && rawStatus >= MIN_HTTP_STATUS && rawStatus <= MAX_HTTP_STATUS ? rawStatus : void 0;
+  const statusText = firstString(
+    record["statusText"],
+    response == null ? void 0 : response["statusText"]
+  );
+  const body = firstString(
+    response == null ? void 0 : response["data"],
+    response == null ? void 0 : response["body"],
+    response == null ? void 0 : response["text"]
+  );
+  if (status === void 0 && body === void 0) {
+    return void 0;
+  }
+  const head = status === void 0 ? "HTTP error" : `HTTP ${status}${statusText === void 0 ? "" : ` ${statusText}`}`;
+  return body === void 0 ? head : `${head}: ${truncateBody(body)}`;
+}
+function formatErrorRecursive(err, seen) {
+  var _a;
+  if (err === null || err === void 0) {
+    return UNKNOWN_ERROR;
+  }
+  if (typeof err === "object") {
+    if (seen.has(err)) {
+      return baseMessage(err);
+    }
+    seen.add(err);
+  }
+  if (err instanceof AggregateError && err.errors.length > 0) {
+    return err.errors.map((sub) => formatErrorRecursive(sub, seen)).join(" | ");
+  }
+  const http = extractHttpDetails(err);
+  const base = baseMessage(err);
+  const cause = (_a = asRecord(err)) == null ? void 0 : _a["cause"];
+  const causeMessage = cause !== void 0 ? formatErrorRecursive(cause, seen) : void 0;
+  let message = base.length > 0 ? base : UNKNOWN_ERROR;
+  if (http !== void 0) {
+    message = `${message} (${http})`;
+  }
+  if (causeMessage !== void 0 && http === void 0 && !message.includes(causeMessage)) {
+    message = `${message}: ${causeMessage}`;
+  }
+  return message;
+}
+function formatError(err) {
+  return formatErrorRecursive(err, /* @__PURE__ */ new Set());
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  formatError
+});

package/dist/cjs/utils/file_utils.js

@@ -46,12 +46,15 @@ var path = __toESM(require("node:path"), 1);
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+function isInsideDir(resolvedPath, resolvedBaseDir) {
+  return resolvedPath === resolvedBaseDir || resolvedPath.startsWith(resolvedBaseDir + path.sep);
+}
 async function materializeFiles(files, dir = process.cwd()) {
   const resolvedBaseDir = path.resolve(dir);
   const createdFiles = [];
   for (const file of files) {
     const fullPath = path.resolve(dir, file.name);
-    if (!fullPath.startsWith(resolvedBaseDir)) {
+    if (!isInsideDir(fullPath, resolvedBaseDir)) {
       throw new Error(
         `Path traversal detected: ${file.name} resolves outside of ${dir}`
       );
@@ -73,7 +76,7 @@ async function materializeFiles(files, dir = process.cwd()) {
         break;
       }
     }
-    if (!finalPath.startsWith(resolvedBaseDir)) {
+    if (!isInsideDir(finalPath, resolvedBaseDir)) {
       throw new Error(
         `Path traversal detected: ${file.name} resolves outside of ${dir}`
       );

package/dist/cjs/utils/output_schema_utils.js

@@ -0,0 +1,43 @@
+/**
+  * @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 __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 output_schema_utils_exports = {};
+__export(output_schema_utils_exports, {
+  canUseOutputSchemaWithTools: () => canUseOutputSchemaWithTools
+});
+module.exports = __toCommonJS(output_schema_utils_exports);
+var import_model_name = require("./model_name.js");
+var import_variant_utils = require("./variant_utils.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+function canUseOutputSchemaWithTools(modelString) {
+  return (0, import_variant_utils.getGoogleLlmVariant)() === import_variant_utils.GoogleLLMVariant.VERTEX_AI && (0, import_model_name.isGemini2OrAbove)(modelString);
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  canUseOutputSchemaWithTools
+});

package/dist/cjs/utils/vertex_ai_utils.js

@@ -24,6 +24,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var vertex_ai_utils_exports = {};
 __export(vertex_ai_utils_exports, {
+  EXPRESS_MODE_UNSUPPORTED_MESSAGE: () => EXPRESS_MODE_UNSUPPORTED_MESSAGE,
   getExpressModeApiKey: () => getExpressModeApiKey
 });
 module.exports = __toCommonJS(vertex_ai_utils_exports);
@@ -33,6 +34,7 @@ var import_env_aware_utils = require("./env_aware_utils.js");
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+const EXPRESS_MODE_UNSUPPORTED_MESSAGE = "Vertex AI Express Mode (expressModeApiKey / GOOGLE_API_KEY) is not supported: the @google-cloud/vertexai Agent Engine client cannot send an API key. Provide projectId and location (with Application Default Credentials), or inject a preconfigured client.";
 function getExpressModeApiKey(project, location, expressModeApiKey) {
   if ((project || location) && expressModeApiKey) {
     throw new Error(
@@ -46,5 +48,6 @@ function getExpressModeApiKey(project, location, expressModeApiKey) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  EXPRESS_MODE_UNSUPPORTED_MESSAGE,
   getExpressModeApiKey
 });

package/dist/cjs/version.js

@@ -32,7 +32,7 @@ module.exports = __toCommonJS(version_exports);
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-const version = "1.5.0";
+const version = "1.6.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   version

package/dist/esm/a2a/a2a_remote_agent.js

@@ -107,7 +107,12 @@ class RemoteA2AAgent extends BaseAgent {
               await callback(context, chunk);
             }
           }
-          const adkEvent = toAdkEvent(chunk, context.invocationId, this.name);
+          const adkEvent = toAdkEvent(
+            chunk,
+            context.invocationId,
+            this.name,
+            context.branch
+          );
           if (!adkEvent) {
             continue;
           }
@@ -128,7 +133,12 @@ class RemoteA2AAgent extends BaseAgent {
             await callback(context, result);
           }
         }
-        const adkEvent = toAdkEvent(result, context.invocationId, this.name);
+        const adkEvent = toAdkEvent(
+          result,
+          context.invocationId,
+          this.name,
+          context.branch
+        );
         if (adkEvent) {
           processor.updateCustomMetadata(adkEvent, result);
           yield adkEvent;

package/dist/esm/a2a/agent_to_a2a.js

@@ -70,7 +70,6 @@ async function toA2a(agent, options = {}) {
   );
   const app = (_d = options.app) != null ? _d : express();
   if (!options.app) {
-    app.use(express.urlencoded({ limit: "50mb", extended: true }));
     app.use(express.json({ limit: "50mb" }));
   }
   app.use(

package/dist/esm/a2a/auth.js

@@ -0,0 +1,37 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { timingSafeEqual } from "node:crypto";
+const AUTHENTICATED_USER_NAME = "a2a-bearer-token";
+const BEARER_SCHEME_PREFIX = "bearer ";
+function timingSafeEqualStrings(a, b) {
+  const left = Buffer.from(a, "utf8");
+  const right = Buffer.from(b, "utf8");
+  return left.length === right.length && timingSafeEqual(left, right);
+}
+function bearerTokenUserBuilder(token) {
+  const expected = token.trim();
+  if (!expected) {
+    throw new Error(
+      "bearerTokenUserBuilder: an empty A2A bearer token is not a valid authenticator. Supply a real shared secret, or configure no token at all to run the A2A surface unauthenticated."
+    );
+  }
+  return async (req) => {
+    var _a;
+    const header = (_a = req.headers.authorization) != null ? _a : "";
+    const credential = header.toLowerCase().startsWith(BEARER_SCHEME_PREFIX) ? header.slice(BEARER_SCHEME_PREFIX.length) : "";
+    if (!timingSafeEqualStrings(credential, expected)) {
+      throw new Error(
+        "A2A request rejected: missing or invalid `Authorization: Bearer` credential."
+      );
+    }
+    return { isAuthenticated: true, userName: AUTHENTICATED_USER_NAME };
+  };
+}
+export {
+  bearerTokenUserBuilder
+};

package/dist/esm/a2a/event_converter_utils.js

@@ -43,34 +43,35 @@ function toA2AMessage(event, {
     metadata: getA2AEventMetadata(event, { appName, userId, sessionId })
   };
 }
-function toAdkEvent(event, invocationId, agentName) {
+function toAdkEvent(event, invocationId, agentName, branch) {
   if (isMessage(event)) {
-    return messageToAdkEvent(event, invocationId, agentName);
+    return messageToAdkEvent(event, invocationId, agentName, branch);
   }
   if (isTask(event)) {
-    return taskToAdkEvent(event, invocationId, agentName);
+    return taskToAdkEvent(event, invocationId, agentName, branch);
   }
   if (isTaskArtifactUpdateEvent(event)) {
-    return artifactUpdateToAdkEvent(event, invocationId, agentName);
+    return artifactUpdateToAdkEvent(event, invocationId, agentName, branch);
   }
   if (isTaskStatusUpdateEvent(event)) {
-    return event.final ? finalTaskStatusUpdateToAdkEvent(event, invocationId, agentName) : taskStatusUpdateToAdkEvent(event, invocationId, agentName);
+    return event.final ? finalTaskStatusUpdateToAdkEvent(event, invocationId, agentName, branch) : taskStatusUpdateToAdkEvent(event, invocationId, agentName, branch);
   }
   return void 0;
 }
-function messageToAdkEvent(msg, invocationId, agentName) {
+function messageToAdkEvent(msg, invocationId, agentName, branch) {
   const parts = toGenAIParts(msg.parts);
   const content = parts.length === 0 ? void 0 : msg.role === MessageRole.USER ? createUserContent(parts) : createModelContent(parts);
   return {
     ...createAdkEventFromMetadata(msg),
     invocationId,
     author: msg.role === MessageRole.USER ? MessageRole.USER : agentName,
+    branch,
     content,
     turnComplete: true,
     partial: false
   };
 }
-function artifactUpdateToAdkEvent(a2aEvent, invocationId, agentName) {
+function artifactUpdateToAdkEvent(a2aEvent, invocationId, agentName, branch) {
   var _a;
   const partsToConvert = ((_a = a2aEvent.artifact) == null ? void 0 : _a.parts) || [];
   if (partsToConvert.length === 0) {
@@ -81,12 +82,13 @@ function artifactUpdateToAdkEvent(a2aEvent, invocationId, agentName) {
     ...createAdkEventFromMetadata(a2aEvent),
     invocationId,
     author: agentName,
+    branch,
     content: createModelContent(toGenAIParts(partsToConvert)),
     longRunningToolIds: getLongRunningToolIDs(partsToConvert),
     partial
   };
 }
-function finalTaskStatusUpdateToAdkEvent(a2aEvent, invocationId, agentName) {
+function finalTaskStatusUpdateToAdkEvent(a2aEvent, invocationId, agentName, branch) {
   var _a;
   const partsToConvert = ((_a = a2aEvent.status.message) == null ? void 0 : _a.parts) || [];
   if (partsToConvert.length === 0) {
@@ -99,13 +101,14 @@ function finalTaskStatusUpdateToAdkEvent(a2aEvent, invocationId, agentName) {
     ...createAdkEventFromMetadata(a2aEvent),
     invocationId,
     author: agentName,
+    branch,
     errorMessage: isFailedTask ? getFailedTaskStatusUpdateEventError(a2aEvent) : void 0,
     content: hasContent ? createModelContent(parts) : void 0,
     longRunningToolIds: getLongRunningToolIDs(partsToConvert),
     turnComplete: true
   };
 }
-function taskStatusUpdateToAdkEvent(a2aEvent, invocationId, agentName) {
+function taskStatusUpdateToAdkEvent(a2aEvent, invocationId, agentName, branch) {
   const msg = a2aEvent.status.message;
   if (!msg) {
     return void 0;
@@ -118,12 +121,13 @@ function taskStatusUpdateToAdkEvent(a2aEvent, invocationId, agentName) {
     ...createAdkEventFromMetadata(a2aEvent),
     invocationId,
     author: agentName,
+    branch,
     content: createModelContent(parts),
     turnComplete: false,
     partial: true
   };
 }
-function taskToAdkEvent(a2aTask, invocationId, agentName) {
+function taskToAdkEvent(a2aTask, invocationId, agentName, branch) {
   var _a, _b;
   const parts = [];
   const longRunningToolIds = [];
@@ -151,16 +155,26 @@ function taskToAdkEvent(a2aTask, invocationId, agentName) {
     ...createAdkEventFromMetadata(a2aTask),
     invocationId,
     author: agentName,
+    branch,
     content: isFailed ? void 0 : createModelContent(parts),
     errorMessage: isFailed ? getFailedTaskStatusUpdateEventError(a2aTask) : void 0,
     longRunningToolIds,
     turnComplete: isTerminal
   };
 }
+const PEER_SETTABLE_ACTION_FIELDS = /* @__PURE__ */ new Set(["escalate"]);
 function createAdkEventFromMetadata(a2aEvent) {
   const metadata = a2aEvent.metadata || {};
   return createEvent({
-    branch: metadata[A2AMetadataKeys.BRANCH],
+    // `branch` is intentionally NOT restored from peer metadata here (unlike
+    // the other fields below): it is the mechanism getContents() (see
+    // content_processor_utils.ts) uses to keep sibling sub-agent branches'
+    // conversation contexts isolated from each other. A remote A2A peer that
+    // controls its own outgoing metadata could otherwise forge `adk_branch`
+    // (set it to a shared ancestor branch, or omit it) to leak its content
+    // into an unrelated sibling agent's LLM context. Every caller of the
+    // `*ToAdkEvent` functions in this file force-sets `branch` from its own
+    // local `InvocationContext` instead, the same way `author` is handled.
     author: metadata[A2AMetadataKeys.AUTHOR],
     partial: metadata[A2AMetadataKeys.PARTIAL],
     errorCode: metadata[A2AMetadataKeys.ERROR_CODE],
@@ -169,10 +183,21 @@ function createAdkEventFromMetadata(a2aEvent) {
     groundingMetadata: metadata[A2AMetadataKeys.GROUNDING_METADATA],
     usageMetadata: metadata[A2AMetadataKeys.USAGE_METADATA],
     customMetadata: metadata[A2AMetadataKeys.CUSTOM_METADATA],
-    actions: createEventActions({
-      escalate: !!metadata[A2AMetadataKeys.ESCALATE],
-      transferToAgent: metadata[A2AMetadataKeys.TRANSFER_TO_AGENT]
-    })
+    // Only fields in PEER_SETTABLE_ACTION_FIELDS may be restored from
+    // metadata a remote A2A peer controls. Every other action field either
+    // mutates the caller's own session or drives the caller's own control
+    // flow (e.g. `transferToAgent`, see llm_agent.ts), so it must never be
+    // rebuilt from peer-supplied data. Filtering through an allowlist here
+    // (rather than just omitting the unsafe field) means a future action
+    // field is unsafe-by-default: adding it to `candidateActions` alone
+    // does nothing until it's also added to the allowlist.
+    actions: createEventActions(
+      Object.fromEntries(
+        Object.entries({
+          escalate: !!metadata[A2AMetadataKeys.ESCALATE]
+        }).filter(([key]) => PEER_SETTABLE_ACTION_FIELDS.has(key))
+      )
+    )
   });
 }
 function getLongRunningToolIDs(parts) {

package/dist/esm/agents/functions.js

@@ -185,6 +185,18 @@ async function handleFunctionCallsAsync({
     toolConfirmationDict
   });
 }
+function normalizeCallbackResponse(response) {
+  if (response == null) {
+    return void 0;
+  }
+  if (typeof response !== "object") {
+    return { result: response };
+  }
+  if (Array.isArray(response)) {
+    return { results: response };
+  }
+  return response;
+}
 async function handleFunctionCallList({
   invocationContext,
   functionCalls,
@@ -231,6 +243,7 @@ async function handleFunctionCallList({
         }
       }
     }
+    functionResponse = normalizeCallbackResponse(functionResponse);
     if (functionResponse == null) {
       try {
         functionResponse = await callToolAsync(tool, functionArgs, toolContext);
@@ -242,8 +255,8 @@ async function handleFunctionCallList({
             toolContext,
             error: e
           });
-          if (onToolErrorResponse) {
-            functionResponse = onToolErrorResponse;
+          if (onToolErrorResponse != null) {
+            functionResponse = normalizeCallbackResponse(onToolErrorResponse);
           } else {
             functionResponseError = e.message;
           }
@@ -272,17 +285,17 @@ async function handleFunctionCallList({
       }
     }
     if (alteredFunctionResponse != null) {
-      functionResponse = alteredFunctionResponse;
+      functionResponse = normalizeCallbackResponse(alteredFunctionResponse);
     }
-    if (tool.isLongRunning && !functionResponse) {
+    if (tool.isLongRunning && functionResponse == null) {
       continue;
     }
     if (functionResponseError) {
       functionResponse = { error: functionResponseError };
-    } else if (typeof functionResponse !== "object" || functionResponse == null) {
+    } else if (functionResponse == null) {
       functionResponse = { result: functionResponse };
-    } else if (Array.isArray(functionResponse)) {
-      functionResponse = { results: functionResponse };
+    } else {
+      functionResponse = normalizeCallbackResponse(functionResponse);
     }
     const functionResponseEvent = createEvent({
       invocationId: invocationContext.invocationId,

package/dist/esm/agents/llm_agent.js

@@ -20,6 +20,7 @@ import { isBaseLlm } from "../models/base_llm.js";
 import { LLMRegistry } from "../models/registry.js";
 import { isBaseTool } from "../tools/base_tool.js";
 import { logger } from "../utils/logger.js";
+import { canUseOutputSchemaWithTools } from "../utils/output_schema_utils.js";
 import { Context } from "./context.js";
 import {
   runAsyncGeneratorWithOtelContext,
@@ -392,7 +393,7 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
       }
     }
     const allTools = [...this.tools];
-    if (this.outputSchema && allTools.length > 0) {
+    if (this.outputSchema && allTools.length > 0 && !canUseOutputSchemaWithTools(this.canonicalModel.model)) {
       const setModelResponseTool = new FunctionTool({
         name: "set_model_response",
         description: "Call this tool to submit your final response conforming to the output schema. Use this tool only when you have collected all the information and are ready to return the final answer.",

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

@@ -6,6 +6,7 @@ const require = topLevelCreateRequire(import.meta.url);
  * SPDX-License-Identifier: Apache-2.0
  */
 import { setOutputSchema } from "../../models/llm_request.js";
+import { canUseOutputSchemaWithTools } from "../../utils/output_schema_utils.js";
 import { isLlmAgent } from "../llm_agent.js";
 import { BaseLlmRequestProcessor } from "./base_llm_processor.js";
 class BasicLlmRequestProcessor extends BaseLlmRequestProcessor {
@@ -18,14 +19,14 @@ class BasicLlmRequestProcessor extends BaseLlmRequestProcessor {
    */
   // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
-    var _a;
+    var _a, _b;
     const agent = invocationContext.agent;
     if (!isLlmAgent(agent)) {
       return;
     }
     llmRequest.model = agent.canonicalModel.model;
     llmRequest.config = { ...(_a = agent.generateContentConfig) != null ? _a : {} };
-    if (agent.outputSchema && (!agent.tools || agent.tools.length === 0)) {
+    if (agent.outputSchema && (!((_b = agent.tools) == null ? void 0 : _b.length) || canUseOutputSchemaWithTools(agent.canonicalModel.model))) {
       setOutputSchema(llmRequest, agent.outputSchema);
     }
     if (invocationContext.runConfig) {

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

@@ -5,7 +5,7 @@ const require = topLevelCreateRequire(import.meta.url);
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { isCompactedEvent } from "../../events/compacted_event.js";
+import { getActiveEvents } from "../../context/compaction_utils.js";
 import { isLlmAgent } from "../llm_agent.js";
 import {
   getContents,
@@ -25,26 +25,7 @@ class ContentRequestProcessor {
     if (!agent || !isLlmAgent(agent)) {
       return;
     }
-    let events = invocationContext.session.events;
-    const compactedEvents = events.filter(isCompactedEvent);
-    const latestCompactedEvent = compactedEvents.length > 0 ? compactedEvents.reduce(
-      (latest, current) => current.endTime > latest.endTime ? current : latest
-    ) : void 0;
-    if (latestCompactedEvent) {
-      const remainingEvents = events.filter((event) => {
-        if (event === latestCompactedEvent) {
-          return false;
-        }
-        if (isCompactedEvent(event)) {
-          return false;
-        }
-        if (event.timestamp <= latestCompactedEvent.endTime) {
-          return false;
-        }
-        return true;
-      });
-      events = [latestCompactedEvent, ...remainingEvents];
-    }
+    const events = getActiveEvents(invocationContext.session.events);
     if (agent.includeContents === "default") {
       llmRequest.contents = getContents(
         events,

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

@@ -6,6 +6,7 @@ const require = topLevelCreateRequire(import.meta.url);
  * SPDX-License-Identifier: Apache-2.0
  */
 import { appendInstructions } from "../../models/llm_request.js";
+import { canUseOutputSchemaWithTools } from "../../utils/output_schema_utils.js";
 import { injectSessionState } from "../instructions.js";
 import { isLlmAgent } from "../llm_agent.js";
 import { ReadonlyContext } from "../readonly_context.js";
@@ -16,6 +17,7 @@ class InstructionsLlmRequestProcessor extends BaseLlmRequestProcessor {
    */
   // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
+    var _a;
     const agent = invocationContext.agent;
     if (!isLlmAgent(agent)) {
       return;
@@ -47,7 +49,7 @@ class InstructionsLlmRequestProcessor extends BaseLlmRequestProcessor {
       }
       appendInstructions(llmRequest, [instructionWithState]);
     }
-    if (agent.outputSchema && agent.tools && agent.tools.length > 0) {
+    if (agent.outputSchema && ((_a = agent.tools) == null ? void 0 : _a.length) && !canUseOutputSchemaWithTools(agent.canonicalModel.model)) {
       appendInstructions(llmRequest, [
         'To output the final result, you must call the "set_model_response" function with the appropriate values. Do not output anything else.'
       ]);