@google/adk 2.2.1 → 2.4.0

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

@@ -56,7 +56,7 @@ function removeClientFunctionCallId(content) {
   }
 }
 __name(removeClientFunctionCallId, "removeClientFunctionCallId");
-function getContents(events, agentName, currentBranch, currentIsolationScope) {
+function getContents(events, agentName, currentBranch, currentIsolationScope, preserveFunctionCallIds = false) {
   const filteredEvents = [];
   for (const event of events) {
     if (!(0, import_compaction_utils.isEventVisibleInIsolationScope)(event, currentIsolationScope)) {
@@ -69,16 +69,23 @@ function getContents(events, agentName, currentBranch, currentIsolationScope) {
     if (!shouldIncludeEventInContext(event, currentBranch, currentIsolationScope)) {
       continue;
     }
-    filteredEvents.push(
-      isEventFromAnotherAgent(agentName, event) ? convertForeignEvent(event) : event
-    );
+    if (isEventFromAnotherAgent(agentName, event)) {
+      const converted = convertForeignEvent(event);
+      if (converted) {
+        filteredEvents.push(converted);
+      }
+    } else {
+      filteredEvents.push(event);
+    }
   }
   let resultEvents = rearrangeEventsForLatestFunctionResponse(filteredEvents);
   resultEvents = rearrangeEventsForAsyncFunctionResponsesInHistory(resultEvents);
   const contents = [];
   for (const event of resultEvents) {
     const content = (0, import_lodash_es.cloneDeep)(event.content);
-    removeClientFunctionCallId(content);
+    if (!preserveFunctionCallIds) {
+      removeClientFunctionCallId(content);
+    }
     contents.push(content);
   }
   return contents;
@@ -111,18 +118,20 @@ function isRequestInputEvent(event) {
   return false;
 }
 __name(isRequestInputEvent, "isRequestInputEvent");
-function getCurrentTurnContents(events, agentName, currentBranch, currentIsolationScope) {
+function getCurrentTurnContents(events, agentName, currentBranch, currentIsolationScope, preserveFunctionCallIds = false) {
+  var _a;
   for (let i = events.length - 1; i >= 0; i--) {
     const event = events[i];
     if (!shouldIncludeEventInContext(event, currentBranch, currentIsolationScope)) {
       continue;
     }
-    if (event.author === "user" || isEventFromAnotherAgent(agentName, event)) {
+    if (event.author === "user" || isEventFromAnotherAgent(agentName, event) && ((_a = event.content.parts) == null ? void 0 : _a.some(isVisibleForeignPart))) {
       return getContents(
         events.slice(turnStart(events, i)),
         agentName,
         currentBranch,
-        currentIsolationScope
+        currentIsolationScope,
+        preserveFunctionCallIds
       );
     }
   }
@@ -187,6 +196,13 @@ function isEventFromAnotherAgent(agentName, event) {
   return !!agentName && event.author !== agentName && event.author !== "user";
 }
 __name(isEventFromAnotherAgent, "isEventFromAnotherAgent");
+function isVisibleForeignPart(part) {
+  if (part.functionCall || part.functionResponse) {
+    return true;
+  }
+  return !part.thought && part.text !== "";
+}
+__name(isVisibleForeignPart, "isVisibleForeignPart");
 function convertForeignEvent(event) {
   var _a, _b, _c, _d, _e, _f;
   if (!((_b = (_a = event.content) == null ? void 0 : _a.parts) == null ? void 0 : _b.length)) {
@@ -201,7 +217,10 @@ function convertForeignEvent(event) {
     ]
   };
   for (const part of event.content.parts) {
-    if (part.text && !part.thought) {
+    if (!isVisibleForeignPart(part)) {
+      continue;
+    }
+    if (part.text) {
       (_c = content.parts) == null ? void 0 : _c.push({
         text: `[${event.author}] said: ${part.text}`
       });
@@ -218,9 +237,18 @@ function convertForeignEvent(event) {
         )}`
       });
     } else {
-      (_f = content.parts) == null ? void 0 : _f.push((0, import_lodash_es.cloneDeep)(part));
+      const {
+        thought: _thought,
+        thoughtSignature: _thoughtSignature,
+        ...rest
+      } = part;
+      (_f = content.parts) == null ? void 0 : _f.push((0, import_lodash_es.cloneDeep)(rest));
     }
   }
+  const preambleOnly = content.parts.length === 1;
+  if (preambleOnly) {
+    return void 0;
+  }
   return (0, import_event.createEvent)({
     invocationId: event.invocationId,
     author: "user",

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

@@ -30,6 +30,7 @@ __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_llm_agent = require("../llm_agent.js");
 var import_content_processor_utils = require("./content_processor_utils.js");
 /**
@@ -37,6 +38,31 @@ var import_content_processor_utils = require("./content_processor_utils.js");
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+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);
+}
+__name(isClaudeModelInstance, "isClaudeModelInstance");
+function shouldPreserveFunctionCallIds(agent, llmRequest) {
+  if (llmRequest.model && CLAUDE_MODEL_NAME_PATTERN.test(llmRequest.model)) {
+    return true;
+  }
+  let current = agent;
+  while (current) {
+    if ((0, import_llm_agent.isLlmAgent)(current)) {
+      if ((0, import_base_llm.isBaseLlm)(current.model)) {
+        return isClaudeModelInstance(current.model);
+      }
+      if (typeof current.model === "string" && current.model.length > 0) {
+        return CLAUDE_MODEL_NAME_PATTERN.test(current.model);
+      }
+    }
+    current = current.parentAgent;
+  }
+  return false;
+}
+__name(shouldPreserveFunctionCallIds, "shouldPreserveFunctionCallIds");
 const _ContentRequestProcessor = class _ContentRequestProcessor {
   /**
    * Fills {@link LlmRequest.contents} based on the session event history and
@@ -55,19 +81,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/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 && ((_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,28 @@ 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
+      });
+    }
   }
 };
 __name(_NlPlanningResponseProcessor, "NlPlanningResponseProcessor");

package/dist/cjs/artifacts/in_memory_artifact_service.js

@@ -63,6 +63,13 @@ const _InMemoryArtifactService = class _InMemoryArtifactService {
     const version = this.artifacts[path].length;
     const metadata = {
       version,
+      canonicalUri: getCanonicalUri(
+        appName,
+        userId,
+        sessionId,
+        filename,
+        version
+      ),
       customMetadata
     };
     if (!artifact.inlineData && artifact.text === void 0) {
@@ -189,6 +196,13 @@ function artifactPrefix(scope, ...parts) {
   return `${[scope, ...parts].map(encodeURIComponent).join("/")}/`;
 }
 __name(artifactPrefix, "artifactPrefix");
+function getCanonicalUri(appName, userId, sessionId, filename, version) {
+  if (fileHasUserNamespace(filename)) {
+    return `memory://apps/${appName}/users/${userId}/artifacts/${filename}/versions/${version}`;
+  }
+  return `memory://apps/${appName}/users/${userId}/sessions/${sessionId}/artifacts/${filename}/versions/${version}`;
+}
+__name(getCanonicalUri, "getCanonicalUri");
 function fileHasUserNamespace(filename) {
   return filename.startsWith("user:");
 }

package/dist/cjs/auth/auth_handler.js

@@ -28,6 +28,7 @@ __export(auth_handler_exports, {
   AuthHandler: () => AuthHandler
 });
 module.exports = __toCommonJS(auth_handler_exports);
+var import_lodash_es = require("lodash-es");
 var import_env_aware_utils = require("../utils/env_aware_utils.js");
 var import_oauth2_credential_exchanger = require("./oauth2/oauth2_credential_exchanger.js");
 var import_oauth2_utils = require("./oauth2/oauth2_utils.js");
@@ -38,6 +39,11 @@ var import_oauth2_utils = require("./oauth2/oauth2_utils.js");
  */
 const S256_CODE_CHALLENGE_METHOD = "S256";
 const _AuthHandler = class _AuthHandler {
+  /**
+   * @param authConfig The auth config this handler reads. It stays readable
+   *     and replaceable after construction; each method reads the current
+   *     value.
+   */
   constructor(authConfig) {
     this.authConfig = authConfig;
   }
@@ -70,14 +76,32 @@ const _AuthHandler = class _AuthHandler {
       state.set(credentialKey, exchangedCredential.credential);
     }
   }
+  /**
+   * Builds the auth request to send to the client.
+   *
+   * The result is always a new object, and its `exchangedAuthCredential` is
+   * never an object held by {@link authConfig}. A caller that fills in the
+   * response, for example `exchangedAuthCredential.oauth2.authResponseUri`,
+   * therefore leaves the handler's credentials unchanged.
+   *
+   * When the config is returned as is, because the scheme is not OAuth2 or
+   * OpenID Connect or the exchanged credential already has an auth URI, the
+   * result is a deep copy of the whole config. In the other branches only the
+   * exchanged credential is guaranteed independent: `authScheme` and
+   * `rawAuthCredential` are the handler's own objects.
+   *
+   * @return The auth config to request from the client.
+   * @throws Error: If an OAuth2 or OpenID Connect scheme has no raw
+   *     credential, no `oauth2` on it, or no client ID and secret.
+   */
   generateAuthRequest() {
     var _a, _b;
     const authSchemeType = this.authConfig.authScheme.type;
     if (!["oauth2", "openIdConnect"].includes(authSchemeType)) {
-      return this.authConfig;
+      return (0, import_lodash_es.cloneDeep)(this.authConfig);
     }
     if ((_b = (_a = this.authConfig.exchangedAuthCredential) == null ? void 0 : _a.oauth2) == null ? void 0 : _b.authUri) {
-      return this.authConfig;
+      return (0, import_lodash_es.cloneDeep)(this.authConfig);
     }
     if (!this.authConfig.rawAuthCredential) {
       throw new Error(`Auth Scheme ${authSchemeType} requires authCredential.`);
@@ -92,7 +116,7 @@ const _AuthHandler = class _AuthHandler {
         credentialKey: this.authConfig.credentialKey,
         authScheme: this.authConfig.authScheme,
         rawAuthCredential: this.authConfig.rawAuthCredential,
-        exchangedAuthCredential: this.authConfig.rawAuthCredential
+        exchangedAuthCredential: (0, import_lodash_es.cloneDeep)(this.authConfig.rawAuthCredential)
       };
     }
     if (!this.authConfig.rawAuthCredential.oauth2.clientId || !this.authConfig.rawAuthCredential.oauth2.clientSecret) {
@@ -114,6 +138,10 @@ const _AuthHandler = class _AuthHandler {
    * challenge derived from the credential's code verifier, and the returned
    * credential carries the verifier the later token exchange must send.
    *
+   * The URI leaves out `redirect_uri` when the credential has no
+   * `redirectUri`, so the provider uses the redirect registered for the
+   * client, and leaves out `scope` when the scheme lists no scopes.
+   *
    * @return An AuthCredential object containing the auth URI and state.
    * @throws Error: If the authorization endpoint is not configured in the
    *     auth scheme, or the credential requests a code challenge method other
@@ -157,9 +185,13 @@ const _AuthHandler = class _AuthHandler {
     const state = (0, import_env_aware_utils.randomUUID)();
     const url = new URL(authorizationEndpoint);
     url.searchParams.set("client_id", oauth2.clientId || "");
-    url.searchParams.set("redirect_uri", oauth2.redirectUri || "");
+    if (oauth2.redirectUri) {
+      url.searchParams.set("redirect_uri", oauth2.redirectUri);
+    }
     url.searchParams.set("response_type", "code");
-    url.searchParams.set("scope", scopes.join(" "));
+    if (scopes.length > 0) {
+      url.searchParams.set("scope", scopes.join(" "));
+    }
     url.searchParams.set("state", state);
     url.searchParams.set("access_type", "offline");
     url.searchParams.set("prompt", "consent");

package/dist/cjs/auth/auth_schemes.js

@@ -25,6 +25,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var auth_schemes_exports = {};
 __export(auth_schemes_exports, {
+  AuthSchemeType: () => AuthSchemeType,
   OAuthGrantType: () => OAuthGrantType,
   getOAuthGrantTypeFromFlow: () => getOAuthGrantTypeFromFlow
 });
@@ -34,6 +35,13 @@ module.exports = __toCommonJS(auth_schemes_exports);
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+var AuthSchemeType = /* @__PURE__ */ ((AuthSchemeType2) => {
+  AuthSchemeType2["API_KEY"] = "apiKey";
+  AuthSchemeType2["HTTP"] = "http";
+  AuthSchemeType2["OAUTH2"] = "oauth2";
+  AuthSchemeType2["OPEN_ID_CONNECT"] = "openIdConnect";
+  return AuthSchemeType2;
+})(AuthSchemeType || {});
 var OAuthGrantType = /* @__PURE__ */ ((OAuthGrantType2) => {
   OAuthGrantType2["CLIENT_CREDENTIALS"] = "client_credentials";
   OAuthGrantType2["AUTHORIZATION_CODE"] = "authorization_code";
@@ -59,6 +67,7 @@ function getOAuthGrantTypeFromFlow(flow) {
 __name(getOAuthGrantTypeFromFlow, "getOAuthGrantTypeFromFlow");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  AuthSchemeType,
   OAuthGrantType,
   getOAuthGrantTypeFromFlow
 });