@google/adk 2.3.0 → 2.5.0

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

@@ -30,6 +30,8 @@ __export(content_request_processor_exports, {
 });
 module.exports = __toCommonJS(content_request_processor_exports);
 var import_compaction_utils = require("../../context/compaction_utils.js");
+var import_base_llm = require("../../models/base_llm.js");
+var import_google_llm = require("../../models/google_llm.js");
 var import_llm_agent = require("../llm_agent.js");
 var import_content_processor_utils = require("./content_processor_utils.js");
 /**
@@ -37,6 +39,47 @@ var import_content_processor_utils = require("./content_processor_utils.js");
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+const ANTHROPIC_LLM_SYMBOL = /* @__PURE__ */ Symbol.for("google.adk.anthropicLlm");
+const CLAUDE_MODEL_SYMBOL = /* @__PURE__ */ Symbol.for("google.adk.claudeModel");
+const CLAUDE_MODEL_NAME_PATTERN = /(?:^|\/)claude-/i;
+function isClaudeModelName(model) {
+  return CLAUDE_MODEL_NAME_PATTERN.test(model);
+}
+__name(isClaudeModelName, "isClaudeModelName");
+function hasAnthropicModelSymbol(model) {
+  return CLAUDE_MODEL_SYMBOL in model && model[CLAUDE_MODEL_SYMBOL] === true || ANTHROPIC_LLM_SYMBOL in model && model[ANTHROPIC_LLM_SYMBOL] === true;
+}
+__name(hasAnthropicModelSymbol, "hasAnthropicModelSymbol");
+function resolveConfiguredModel(agent) {
+  let current = agent;
+  while (current) {
+    if ((0, import_llm_agent.isLlmAgent)(current)) {
+      if ((0, import_base_llm.isBaseLlm)(current.model)) {
+        return current.model;
+      }
+      if (typeof current.model === "string" && current.model.length > 0) {
+        return current.model;
+      }
+    }
+    current = current.parentAgent;
+  }
+  return void 0;
+}
+__name(resolveConfiguredModel, "resolveConfiguredModel");
+function shouldPreserveFunctionCallIds(agent, llmRequest) {
+  const configuredModel = resolveConfiguredModel(agent);
+  if ((0, import_base_llm.isBaseLlm)(configuredModel)) {
+    if ((0, import_google_llm.isGemini)(configuredModel) && configuredModel.useInteractionsApi) {
+      return true;
+    }
+    if (hasAnthropicModelSymbol(configuredModel)) {
+      return true;
+    }
+  }
+  const effectiveModelName = llmRequest.model || ((0, import_base_llm.isBaseLlm)(configuredModel) ? configuredModel.model : configuredModel);
+  return Boolean(effectiveModelName && isClaudeModelName(effectiveModelName));
+}
+__name(shouldPreserveFunctionCallIds, "shouldPreserveFunctionCallIds");
 const _ContentRequestProcessor = class _ContentRequestProcessor {
   /**
    * Fills {@link LlmRequest.contents} based on the session event history and
@@ -55,19 +98,25 @@ const _ContentRequestProcessor = class _ContentRequestProcessor {
       invocationContext.session.events,
       invocationContext.isolationScope
     );
+    const preserveFunctionCallIds = shouldPreserveFunctionCallIds(
+      agent,
+      llmRequest
+    );
     if (agent.includeContents === "default") {
       llmRequest.contents = (0, import_content_processor_utils.getContents)(
         events,
         agent.name,
         invocationContext.branch,
-        invocationContext.isolationScope
+        invocationContext.isolationScope,
+        preserveFunctionCallIds
       );
     } else {
       llmRequest.contents = (0, import_content_processor_utils.getCurrentTurnContents)(
         events,
         agent.name,
         invocationContext.branch,
-        invocationContext.isolationScope
+        invocationContext.isolationScope,
+        preserveFunctionCallIds
       );
     }
     return;

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

@@ -29,6 +29,7 @@ __export(context_compactor_request_processor_exports, {
 });
 module.exports = __toCommonJS(context_compactor_request_processor_exports);
 var import_base_plugin = require("../../plugins/base_plugin.js");
+var import_instrumentation = require("../../telemetry/api/instrumentation.js");
 /**
  * @license
  * Copyright 2026 Google LLC
@@ -63,7 +64,10 @@ const _ContextCompactorRequestProcessor = class _ContextCompactorRequestProcesso
           trigger
         });
         const oldEvents = new Set(invocationContext.session.events);
-        await Promise.resolve(compactor.compact(invocationContext));
+        await (0, import_instrumentation.recordCompaction)(
+          { invocationContext, trigger },
+          async () => compactor.compact(invocationContext)
+        );
         await invocationContext.pluginManager.runAfterContextCompaction({
           invocationContext,
           trigger

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

@@ -78,7 +78,7 @@ const _InstructionsLlmRequestProcessor = class _InstructionsLlmRequestProcessor
       }
       (0, import_llm_request.appendInstructions)(llmRequest, [instructionWithState]);
     }
-    if (agent.outputSchema && ((_a = agent.tools) == null ? void 0 : _a.length) && !(0, import_output_schema_utils.canUseOutputSchemaWithTools)(agent.canonicalModel.model)) {
+    if (agent.outputSchema && agent.mode !== "task" && ((_a = agent.tools) == null ? void 0 : _a.length) && !(0, import_output_schema_utils.canUseOutputSchemaWithTools)(agent.canonicalModel)) {
       (0, import_llm_request.appendInstructions)(llmRequest, [
         'To output the final result, you must call the "set_model_response" function with the appropriate values. Do not output anything else.'
       ]);

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

@@ -31,6 +31,7 @@ __export(nl_planning_processor_exports, {
   NlPlanningResponseProcessor: () => NlPlanningResponseProcessor
 });
 module.exports = __toCommonJS(nl_planning_processor_exports);
+var import_event = require("../../events/event.js");
 var import_llm_request = require("../../models/llm_request.js");
 var import_base_planner = require("../../planners/base_planner.js");
 var import_built_in_planner = require("../../planners/built_in_planner.js");
@@ -85,20 +86,29 @@ const _NlPlanningRequestProcessor = class _NlPlanningRequestProcessor extends im
 __name(_NlPlanningRequestProcessor, "NlPlanningRequestProcessor");
 let NlPlanningRequestProcessor = _NlPlanningRequestProcessor;
 const _NlPlanningResponseProcessor = class _NlPlanningResponseProcessor extends import_base_llm_processor.BaseLlmResponseProcessor {
-  // eslint-disable-next-line require-yield -- this processor only rewrites the response and has no event to emit
   async *runAsync(invocationContext, llmResponse) {
-    var _a, _b;
+    var _a, _b, _c;
     const planner = getPlanner(invocationContext);
     if (!planner || !((_b = (_a = llmResponse.content) == null ? void 0 : _a.parts) == null ? void 0 : _b.length)) {
       return;
     }
+    const callbackContext = new import_context.Context({ invocationContext });
     const processedParts = planner.processPlanningResponse(
-      new import_context.Context({ invocationContext }),
+      callbackContext,
       llmResponse.content.parts
     );
     if (processedParts !== void 0) {
       llmResponse.content = { ...llmResponse.content, parts: processedParts };
     }
+    if (callbackContext.state.hasDelta()) {
+      yield (0, import_event.createEvent)({
+        invocationId: invocationContext.invocationId,
+        author: (_c = invocationContext.agent) == null ? void 0 : _c.name,
+        branch: invocationContext.branch,
+        actions: callbackContext.eventActions,
+        partial: llmResponse.partial ? true : void 0
+      });
+    }
   }
 };
 __name(_NlPlanningResponseProcessor, "NlPlanningResponseProcessor");

package/dist/cjs/artifacts/file_artifact_service.js

@@ -434,7 +434,7 @@ function getArtifactDir(rootDir, userId, sessionId, filename) {
   }
   const artifactDir = path.resolve(scopeRoot, cleanFilename);
   const relative = path.relative(scopeRoot, artifactDir);
-  if (relative.startsWith("..") || path.isAbsolute(relative)) {
+  if (relative === ".." || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative)) {
     throw new Error(`Artifact filename ${filename} escapes storage directory.`);
   }
   if (relative === "" || relative === ".") {