@google/adk 2.4.0 → 2.5.0

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

@@ -178,15 +178,37 @@ function isEventFromAnotherAgent(agentName, event) {
   return !!agentName && event.author !== agentName && event.author !== "user";
 }
 __name(isEventFromAnotherAgent, "isEventFromAnotherAgent");
+function withoutTextAndThought(part) {
+  const {
+    text: _text,
+    thought: _thought,
+    thoughtSignature: _thoughtSignature,
+    ...rest
+  } = part;
+  return rest;
+}
+__name(withoutTextAndThought, "withoutTextAndThought");
+function hasNonTextPayload(part) {
+  return Object.values(withoutTextAndThought(part)).some(
+    (v) => v !== void 0
+  );
+}
+__name(hasNonTextPayload, "hasNonTextPayload");
 function isVisibleForeignPart(part) {
   if (part.functionCall || part.functionResponse) {
     return true;
   }
-  return !part.thought && part.text !== "";
+  if (part.thought) {
+    return false;
+  }
+  if (part.text) {
+    return true;
+  }
+  return hasNonTextPayload(part);
 }
 __name(isVisibleForeignPart, "isVisibleForeignPart");
 function convertForeignEvent(event) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   if (!((_b = (_a = event.content) == null ? void 0 : _a.parts) == null ? void 0 : _b.length)) {
     return event;
   }
@@ -202,29 +224,34 @@ function convertForeignEvent(event) {
     if (!isVisibleForeignPart(part)) {
       continue;
     }
-    if (part.text) {
-      (_c = content.parts) == null ? void 0 : _c.push({
-        text: `[${event.author}] said: ${part.text}`
-      });
-    } else if (part.functionCall) {
+    if (part.functionCall) {
+      if (!part.thought && part.text) {
+        (_c = content.parts) == null ? void 0 : _c.push({
+          text: `[${event.author}] said: ${part.text}`
+        });
+      }
       (_d = content.parts) == null ? void 0 : _d.push({
         text: `[${event.author}] called tool \`${part.functionCall.name}\` with parameters: ${safeStringify(
           part.functionCall.args
         )}`
       });
     } else if (part.functionResponse) {
-      (_e = content.parts) == null ? void 0 : _e.push({
+      if (!part.thought && part.text) {
+        (_e = content.parts) == null ? void 0 : _e.push({
+          text: `[${event.author}] said: ${part.text}`
+        });
+      }
+      (_f = content.parts) == null ? void 0 : _f.push({
         text: `[${event.author}] tool \`${part.functionResponse.name}\` returned result: ${safeStringify(
           part.functionResponse.response
         )}`
       });
-    } else {
-      const {
-        thought: _thought,
-        thoughtSignature: _thoughtSignature,
-        ...rest
-      } = part;
-      (_f = content.parts) == null ? void 0 : _f.push(cloneDeep(rest));
+    } else if (!part.thought && part.text) {
+      (_g = content.parts) == null ? void 0 : _g.push({
+        text: `[${event.author}] said: ${part.text}`
+      });
+    } else if (hasNonTextPayload(part)) {
+      (_h = content.parts) == null ? void 0 : _h.push(cloneDeep(withoutTextAndThought(part)));
     }
   }
   const preambleOnly = content.parts.length === 1;

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

@@ -9,34 +9,51 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  */
 import { getActiveEvents } from "../../context/compaction_utils.js";
 import { isBaseLlm } from "../../models/base_llm.js";
+import { isGemini } from "../../models/google_llm.js";
 import { isLlmAgent } from "../llm_agent.js";
 import {
   getContents,
   getCurrentTurnContents
 } from "./content_processor_utils.js";
+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 isClaudeModelInstance(model) {
-  return CLAUDE_MODEL_SYMBOL in model && model[CLAUDE_MODEL_SYMBOL] === true || CLAUDE_MODEL_NAME_PATTERN.test(model.model);
+const CLAUDE_MODEL_NAME_PATTERN = /(?:^|\/)claude-/i;
+function isClaudeModelName(model) {
+  return CLAUDE_MODEL_NAME_PATTERN.test(model);
 }
-__name(isClaudeModelInstance, "isClaudeModelInstance");
-function shouldPreserveFunctionCallIds(agent, llmRequest) {
-  if (llmRequest.model && CLAUDE_MODEL_NAME_PATTERN.test(llmRequest.model)) {
-    return true;
-  }
+__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 (isLlmAgent(current)) {
       if (isBaseLlm(current.model)) {
-        return isClaudeModelInstance(current.model);
+        return current.model;
       }
       if (typeof current.model === "string" && current.model.length > 0) {
-        return CLAUDE_MODEL_NAME_PATTERN.test(current.model);
+        return current.model;
       }
     }
     current = current.parentAgent;
   }
-  return false;
+  return void 0;
+}
+__name(resolveConfiguredModel, "resolveConfiguredModel");
+function shouldPreserveFunctionCallIds(agent, llmRequest) {
+  const configuredModel = resolveConfiguredModel(agent);
+  if (isBaseLlm(configuredModel)) {
+    if (isGemini(configuredModel) && configuredModel.useInteractionsApi) {
+      return true;
+    }
+    if (hasAnthropicModelSymbol(configuredModel)) {
+      return true;
+    }
+  }
+  const effectiveModelName = llmRequest.model || (isBaseLlm(configuredModel) ? configuredModel.model : configuredModel);
+  return Boolean(effectiveModelName && isClaudeModelName(effectiveModelName));
 }
 __name(shouldPreserveFunctionCallIds, "shouldPreserveFunctionCallIds");
 const _ContentRequestProcessor = class _ContentRequestProcessor {

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

@@ -8,6 +8,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  * SPDX-License-Identifier: Apache-2.0
  */
 import { ContextCompactionTrigger } from "../../plugins/base_plugin.js";
+import { recordCompaction } from "../../telemetry/api/instrumentation.js";
 const _ContextCompactorRequestProcessor = class _ContextCompactorRequestProcessor {
   /**
    * @param compactors - Ordered list of compactors to evaluate; the first one
@@ -37,7 +38,10 @@ const _ContextCompactorRequestProcessor = class _ContextCompactorRequestProcesso
           trigger
         });
         const oldEvents = new Set(invocationContext.session.events);
-        await Promise.resolve(compactor.compact(invocationContext));
+        await recordCompaction(
+          { invocationContext, trigger },
+          async () => compactor.compact(invocationContext)
+        );
         await invocationContext.pluginManager.runAfterContextCompaction({
           invocationContext,
           trigger

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

@@ -51,7 +51,7 @@ const _InstructionsLlmRequestProcessor = class _InstructionsLlmRequestProcessor
       }
       appendInstructions(llmRequest, [instructionWithState]);
     }
-    if (agent.outputSchema && ((_a = agent.tools) == null ? void 0 : _a.length) && !canUseOutputSchemaWithTools(agent.canonicalModel)) {
+    if (agent.outputSchema && agent.mode !== "task" && ((_a = agent.tools) == null ? void 0 : _a.length) && !canUseOutputSchemaWithTools(agent.canonicalModel)) {
       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/esm/agents/processors/nl_planning_processor.js

@@ -79,7 +79,8 @@ const _NlPlanningResponseProcessor = class _NlPlanningResponseProcessor extends
         invocationId: invocationContext.invocationId,
         author: (_c = invocationContext.agent) == null ? void 0 : _c.name,
         branch: invocationContext.branch,
-        actions: callbackContext.eventActions
+        actions: callbackContext.eventActions,
+        partial: llmResponse.partial ? true : void 0
       });
     }
   }

package/dist/esm/artifacts/file_artifact_service.js

@@ -394,7 +394,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 === ".") {