@google/adk 2.1.0 → 2.2.0

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

@@ -0,0 +1,87 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { appendInstructions } from "../../models/llm_request.js";
+import { isBasePlanner } from "../../planners/base_planner.js";
+import { isBuiltInPlanner } from "../../planners/built_in_planner.js";
+import { Context } from "../context.js";
+import { isLlmAgent } from "../llm_agent.js";
+import { ReadonlyContext } from "../readonly_context.js";
+import {
+  BaseLlmRequestProcessor,
+  BaseLlmResponseProcessor
+} from "./base_llm_processor.js";
+function getPlanner(invocationContext) {
+  const agent = invocationContext.agent;
+  if (!isLlmAgent(agent) || !isBasePlanner(agent.planner)) {
+    return void 0;
+  }
+  return agent.planner;
+}
+__name(getPlanner, "getPlanner");
+function removeThought(part) {
+  const { thought: _thought, ...rest } = part;
+  return rest;
+}
+__name(removeThought, "removeThought");
+function removeThoughtFromContents(contents) {
+  return contents.map(
+    (content) => content.parts ? { ...content, parts: content.parts.map(removeThought) } : content
+  );
+}
+__name(removeThoughtFromContents, "removeThoughtFromContents");
+const _NlPlanningRequestProcessor = class _NlPlanningRequestProcessor extends BaseLlmRequestProcessor {
+  // eslint-disable-next-line require-yield -- this processor only mutates the request and has no event to emit
+  async *runAsync(invocationContext, llmRequest) {
+    const planner = getPlanner(invocationContext);
+    if (!planner) {
+      return;
+    }
+    if (isBuiltInPlanner(planner)) {
+      planner.applyThinkingConfig(llmRequest);
+    }
+    const planningInstruction = planner.buildPlanningInstruction(
+      new ReadonlyContext(invocationContext),
+      llmRequest
+    );
+    if (planningInstruction) {
+      appendInstructions(llmRequest, [planningInstruction]);
+    }
+    llmRequest.contents = removeThoughtFromContents(llmRequest.contents);
+  }
+};
+__name(_NlPlanningRequestProcessor, "NlPlanningRequestProcessor");
+let NlPlanningRequestProcessor = _NlPlanningRequestProcessor;
+const _NlPlanningResponseProcessor = class _NlPlanningResponseProcessor extends 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;
+    const planner = getPlanner(invocationContext);
+    if (!planner || !((_b = (_a = llmResponse.content) == null ? void 0 : _a.parts) == null ? void 0 : _b.length)) {
+      return;
+    }
+    const processedParts = planner.processPlanningResponse(
+      new Context({ invocationContext }),
+      llmResponse.content.parts
+    );
+    if (processedParts !== void 0) {
+      llmResponse.content = { ...llmResponse.content, parts: processedParts };
+    }
+  }
+};
+__name(_NlPlanningResponseProcessor, "NlPlanningResponseProcessor");
+let NlPlanningResponseProcessor = _NlPlanningResponseProcessor;
+const NL_PLANNING_REQUEST_PROCESSOR = new NlPlanningRequestProcessor();
+const NL_PLANNING_RESPONSE_PROCESSOR = new NlPlanningResponseProcessor();
+export {
+  NL_PLANNING_REQUEST_PROCESSOR,
+  NL_PLANNING_RESPONSE_PROCESSOR,
+  NlPlanningRequestProcessor,
+  NlPlanningResponseProcessor
+};

package/dist/esm/artifacts/gcs_artifact_service.js

@@ -67,9 +67,7 @@ const _GcsArtifactService = class _GcsArtifactService {
         version
       })
     );
-    const customMetadata = {
-      ...request.customMetadata
-    };
+    const customMetadata = stringifyMetadataValues(request.customMetadata);
     if (request.artifact.inlineData) {
       if (request.artifact.inlineData.displayName) {
         customMetadata[GCS_DISPLAY_NAME_METADATA_KEY] = request.artifact.inlineData.displayName;
@@ -193,10 +191,9 @@ const _GcsArtifactService = class _GcsArtifactService {
     const [files] = await bucket.getFiles({ prefix: searchPrefix });
     const versions = [];
     for (const file of files) {
-      const version = file.name.split("/").pop();
-      const v = parseInt(version, 10);
-      if (!isNaN(v)) {
-        versions.push(v);
+      const suffix = file.name.slice(searchPrefix.length);
+      if (/^\d+$/.test(suffix)) {
+        versions.push(Number(suffix));
       }
     }
     return versions.sort((a, b) => a - b);
@@ -262,6 +259,15 @@ function getFileName({
   return version !== void 0 ? `${prefix}/${version}` : prefix;
 }
 __name(getFileName, "getFileName");
+function stringifyMetadataValues(customMetadata) {
+  return Object.fromEntries(
+    Object.entries(customMetadata != null ? customMetadata : {}).map(([key, value]) => [
+      key,
+      String(value)
+    ])
+  );
+}
+__name(stringifyMetadataValues, "stringifyMetadataValues");
 function extractArtifactKeys(files, fileNamePrefix, keyPrefix = "") {
   const keys = /* @__PURE__ */ new Set();
   for (const file of files) {

package/dist/esm/auth/auth_credential.js

@@ -1,5 +1,7 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -13,6 +15,14 @@ var AuthCredentialTypes = /* @__PURE__ */ ((AuthCredentialTypes2) => {
   AuthCredentialTypes2["SERVICE_ACCOUNT"] = "serviceAccount";
   return AuthCredentialTypes2;
 })(AuthCredentialTypes || {});
+const AUTH_CREDENTIAL_TYPES = new Set(
+  Object.values(AuthCredentialTypes)
+);
+function isAuthCredential(value) {
+  return typeof value === "object" && value !== null && "authType" in value && AUTH_CREDENTIAL_TYPES.has(value.authType);
+}
+__name(isAuthCredential, "isAuthCredential");
 export {
-  AuthCredentialTypes
+  AuthCredentialTypes,
+  isAuthCredential
 };

package/dist/esm/code_executors/code_execution_utils.js

@@ -116,9 +116,9 @@ function convertCodeExecutionParts(content, codeBlockDelimiter, executionResultD
       text: codeBlockDelimiter[0] + (lastPart.executableCode.code || "") + codeBlockDelimiter[1]
     };
   } else if (content.parts.length == 1 && lastPart.codeExecutionResult) {
-    content.parts[content.parts.length - 1] = {
-      text: executionResultDelimiters[0] + lastPart.codeExecutionResult.output + executionResultDelimiters[1]
-    };
+    const output = lastPart.codeExecutionResult.output;
+    const text = output == null ? "" : executionResultDelimiters[0] + output + executionResultDelimiters[1];
+    content.parts[content.parts.length - 1] = { text };
     content.role = "user";
   }
 }

package/dist/esm/common.js

@@ -49,7 +49,7 @@ import { createResumabilityConfig } from "./apps/resumability_config.js";
 import { InMemoryArtifactService } from "./artifacts/in_memory_artifact_service.js";
 import { ScopedArtifactService } from "./artifacts/scoped_artifact_service.js";
 import { isSessionArtifactService } from "./artifacts/session_artifact_service.js";
-import { AuthCredentialTypes } from "./auth/auth_credential.js";
+import { AuthCredentialTypes, isAuthCredential } from "./auth/auth_credential.js";
 import { AuthHandler } from "./auth/auth_handler.js";
 import { AUTH_PREPROCESSOR, AuthPreprocessor } from "./auth/auth_preprocessor.js";
 import { AuthProviderRegistry } from "./auth/auth_provider_registry.js";
@@ -100,6 +100,7 @@ import {
   BaseExampleProvider,
   isBaseExampleProvider
 } from "./examples/base_example_provider.js";
+import { VertexAiExampleStore } from "./examples/example.js";
 import { InMemoryMemoryService } from "./memory/in_memory_memory_service.js";
 import { ApigeeLlm } from "./models/apigee_llm.js";
 import { BaseLlm, isBaseLlm } from "./models/base_llm.js";
@@ -111,6 +112,9 @@ import {
 import { Gemini, geminiInitParams } from "./models/google_llm.js";
 import { LLMRegistry } from "./models/registry.js";
 import { RoutedLlm } from "./models/routed_llm.js";
+import { BasePlanner, isBasePlanner } from "./planners/base_planner.js";
+import { BuiltInPlanner, isBuiltInPlanner } from "./planners/built_in_planner.js";
+import { PlanReActPlanner } from "./planners/plan_re_act_planner.js";
 import {
   GLOBAL_SCOPE_KEY,
   REFLECT_AND_RETRY_RESPONSE_TYPE,
@@ -190,19 +194,33 @@ import {
   ToolConfirmation,
   isIntentMismatchError
 } from "./tools/tool_confirmation.js";
+import { CallbackContext, ToolContext } from "./tools/tool_context.js";
 import { URL_CONTEXT, UrlContextTool } from "./tools/url_context_tool.js";
 import { VertexAiSearchTool } from "./tools/vertex_ai_search_tool.js";
 import { VertexRagRetrievalTool } from "./tools/vertex_rag_retrieval_tool.js";
+import { WebMCPTool } from "./tools/webmcp/webmcp_tool.js";
+import { WebMCPToolset } from "./tools/webmcp/webmcp_toolset.js";
+import {
+  getModelContext,
+  isWebMCPSupported
+} from "./tools/webmcp/webmcp_types.js";
 import { AsyncQueue } from "./utils/async_queue.js";
+import { renameReservedKeywords, toSnakeCaseName } from "./utils/case_utils.js";
 import { getClientLabels, runWithClientLabel } from "./utils/client_labels.js";
 import {
   LogLevel,
   getLogger,
+  logger,
   resetLogger,
   setLogLevel,
   setLogger
 } from "./utils/logger.js";
-import { isGemini2OrAbove, isGemini3xFlashLive } from "./utils/model_name.js";
+import {
+  isGemini2OrAbove,
+  isGemini35LiveTranslate,
+  isGemini3xFlashLive,
+  isGemini3xLive
+} from "./utils/model_name.js";
 import { zodObjectToSchema } from "./utils/simple_zod_to_json.js";
 import { Task } from "./utils/task.js";
 import { GoogleLLMVariant } from "./utils/variant_utils.js";
@@ -283,6 +301,7 @@ export {
   BaseLlmRequestProcessor,
   BaseLlmResponseProcessor,
   BaseNode,
+  BasePlanner,
   BasePlugin,
   BaseRetrievalTool,
   BaseSessionService,
@@ -290,8 +309,10 @@ export {
   BaseToolset,
   BranchPath,
   BuiltInCodeExecutor,
+  BuiltInPlanner,
   BuiltInTool,
   CONTENT_REQUEST_PROCESSOR,
+  CallbackContext,
   ChromeBuiltInLlm,
   ChromeModelUnavailableError,
   CodeExecutionLanguage,
@@ -366,6 +387,7 @@ export {
   PRELOAD_MEMORY,
   ParallelAgent,
   ParallelWorker,
+  PlanReActPlanner,
   PluginManager,
   PolicyOutcome,
   PreloadMemoryTool,
@@ -395,6 +417,7 @@ export {
   Task,
   TokenBasedContextCompactor,
   ToolConfirmation,
+  ToolContext,
   ToolErrorType,
   ToolExecutionError,
   ToolNode,
@@ -403,8 +426,11 @@ export {
   TruncatingContextCompactor,
   URL_CONTEXT,
   UrlContextTool,
+  VertexAiExampleStore,
   VertexAiSearchTool,
   VertexRagRetrievalTool,
+  WebMCPTool,
+  WebMCPToolset,
   Workflow,
   WorkflowNode,
   asRunnableRoot,
@@ -428,6 +454,7 @@ export {
   getFunctionCalls,
   getFunctionResponses,
   getLogger,
+  getModelContext,
   getPendingUserInputRequests,
   getUserChoiceTool,
   getUserInputRequests,
@@ -435,16 +462,21 @@ export {
   hasTrailingCodeExecutionResult,
   isAgentTool,
   isApp,
+  isAuthCredential,
   isBaseAgent,
   isBaseExampleProvider,
   isBaseLlm,
+  isBasePlanner,
   isBaseTool,
   isBaseToolset,
+  isBuiltInPlanner,
   isCompactedEvent,
   isFinalResponse,
   isFunctionTool,
   isGemini2OrAbove,
+  isGemini35LiveTranslate,
   isGemini3xFlashLive,
+  isGemini3xLive,
   isIntentMismatchError,
   isLlmAgent,
   isLoopAgent,
@@ -464,12 +496,15 @@ export {
   isSessionArtifactService,
   isStateSchemaError,
   isToolNotFound,
+  isWebMCPSupported,
   isWorkflow,
+  logger,
   node,
   normalizeRetryExceptions,
   populateClientFunctionCallId,
   prepareRetryConfig,
   pruneThoughts,
+  renameReservedKeywords,
   requestInputTool,
   requireAgent,
   requiresUserInput,
@@ -480,6 +515,7 @@ export {
   setLogger,
   stringifyContent,
   stripAdkIdentityPreamble,
+  toSnakeCaseName,
   toStructuredEvents,
   validateAppName,
   version,

package/dist/esm/examples/example.js

@@ -1,7 +1,92 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { BaseExampleProvider } from "./base_example_provider.js";
+const SIMILARITY_SCORE_THRESHOLD = 0.5;
+const DEFAULT_TOP_K = 10;
+const _VertexAiExampleStore = class _VertexAiExampleStore extends BaseExampleProvider {
+  /**
+   * Initializes the VertexAiExampleStore.
+   *
+   * @param examplesStoreName The resource name of the vertex example store, in
+   *   the format of
+   *   `projects/{project}/locations/{location}/exampleStores/{example_store}`.
+   * @param apiClient A client that reaches the Vertex AI Example Store API.
+   *   adk-js does not bundle the `vertexai` dependency the Python SDK relies
+   *   on, so the caller supplies this client.
+   */
+  constructor(examplesStoreName, apiClient) {
+    super();
+    this.examplesStoreName = examplesStoreName;
+    this.apiClient = apiClient;
+  }
+  /**
+   * Retrieves relevant examples from the Vertex AI Example Store for the given
+   * query.
+   */
+  async getExamples(query) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    const request = {
+      storedContentsExampleParameters: {
+        contentSearchKey: {
+          contents: [{ role: "user", parts: [{ text: query }] }],
+          searchKeyGenerationMethod: { lastEntry: {} }
+        }
+      },
+      topK: DEFAULT_TOP_K,
+      exampleStore: this.examplesStoreName
+    };
+    const response = await this.apiClient.searchExamples(request);
+    const returnedExamples = [];
+    for (const result of (_a = response.results) != null ? _a : []) {
+      if (((_b = result.similarityScore) != null ? _b : 0) < SIMILARITY_SCORE_THRESHOLD) {
+        continue;
+      }
+      const storedExample = (_c = result.example) == null ? void 0 : _c.storedContentsExample;
+      const expectedContents = ((_e = (_d = storedExample == null ? void 0 : storedExample.contentsExample) == null ? void 0 : _d.expectedContents) != null ? _e : []).map((entry) => entry.content).filter((content) => content !== void 0);
+      const expectedOutput = [];
+      for (const content of expectedContents) {
+        const expectedParts = [];
+        for (const part of (_f = content.parts) != null ? _f : []) {
+          if (part.text) {
+            expectedParts.push({ text: part.text });
+          } else if (part.functionCall) {
+            expectedParts.push({
+              functionCall: {
+                name: part.functionCall.name,
+                args: { ...(_g = part.functionCall.args) != null ? _g : {} }
+              }
+            });
+          } else if (part.functionResponse) {
+            expectedParts.push({
+              functionResponse: {
+                name: part.functionResponse.name,
+                response: { ...(_h = part.functionResponse.response) != null ? _h : {} }
+              }
+            });
+          }
+        }
+        expectedOutput.push({ role: content.role, parts: expectedParts });
+      }
+      returnedExamples.push({
+        input: {
+          role: "user",
+          parts: [{ text: (_i = storedExample == null ? void 0 : storedExample.searchKey) != null ? _i : "" }]
+        },
+        output: expectedOutput
+      });
+    }
+    return returnedExamples;
+  }
+};
+__name(_VertexAiExampleStore, "VertexAiExampleStore");
+let VertexAiExampleStore = _VertexAiExampleStore;
+export {
+  VertexAiExampleStore
+};

package/dist/esm/examples/example_util.js

@@ -7,6 +7,8 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { getFunctionResponses } from "../events/event.js";
+import { logger } from "../utils/logger.js";
 import {
   isBaseExampleProvider
 } from "./base_example_provider.js";
@@ -68,17 +70,37 @@ function convertExamplesToText(examples, model) {
   return `${EXAMPLES_INTRO}${examplesStr}${EXAMPLES_END}`;
 }
 __name(convertExamplesToText, "convertExamplesToText");
-function buildExampleSi(examples, query, model) {
+function getLatestMessageFromUser(session) {
+  var _a, _b;
+  const events = session.events;
+  if (!events || events.length === 0) {
+    return "";
+  }
+  const event = events[events.length - 1];
+  if (event.author === "user" && getFunctionResponses(event).length === 0) {
+    if (((_a = event.content) == null ? void 0 : _a.parts) && ((_b = event.content.parts[0]) == null ? void 0 : _b.text)) {
+      return event.content.parts[0].text;
+    } else {
+      logger.warn("No message from user for fetching example.");
+    }
+  }
+  return "";
+}
+__name(getLatestMessageFromUser, "getLatestMessageFromUser");
+const _getLatestMessageFromUser = getLatestMessageFromUser;
+async function buildExampleSi(examples, query, model) {
   if (Array.isArray(examples)) {
     return convertExamplesToText(examples, model);
   }
   if (isBaseExampleProvider(examples)) {
-    return convertExamplesToText(examples.getExamples(query), model);
+    return convertExamplesToText(await examples.getExamples(query), model);
   }
   throw new Error("Invalid example configuration");
 }
 __name(buildExampleSi, "buildExampleSi");
 export {
+  _getLatestMessageFromUser,
   buildExampleSi,
-  convertExamplesToText
+  convertExamplesToText,
+  getLatestMessageFromUser
 };

package/dist/esm/examples/index.js

@@ -0,0 +1,11 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export * from "./base_example_provider.js";
+export * from "./example.js";
+export * from "./example_util.js";
+export * from "./vertex_ai_example_store.js";

package/dist/esm/examples/vertex_ai_example_store.js

@@ -0,0 +1,11 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { VertexAiExampleStore } from "./example.js";
+export {
+  VertexAiExampleStore
+};

package/dist/esm/index.js

@@ -37,12 +37,42 @@ import {
   validateSkillDir
 } from "./skills/loader.js";
 import { LOAD_WEB_PAGE, loadWebPage } from "./tools/load_web_page.js";
+import {
+  credentialToParam,
+  dictToAuthScheme,
+  INTERNAL_AUTH_PREFIX,
+  openidDictToSchemeCredential,
+  openidUrlToSchemeCredential,
+  serviceAccountDictToSchemeCredential,
+  serviceAccountSchemeCredential,
+  tokenToSchemeCredential
+} from "./tools/openapi_tool/auth/auth_helpers.js";
+import { AutoAuthCredentialExchanger } from "./tools/openapi_tool/auth/credential_exchangers/auto_auth_credential_exchanger.js";
+import {
+  AuthCredentialMissingError,
+  BaseAuthCredentialExchanger
+} from "./tools/openapi_tool/auth/credential_exchangers/base_auth_credential_exchanger.js";
+import {
+  exchangeCredential,
+  OAuth2BearerExchanger
+} from "./tools/openapi_tool/auth/credential_exchangers/oauth2_exchanger.js";
+import { ServiceAccountCredentialExchanger } from "./tools/openapi_tool/auth/credential_exchangers/service_account_exchanger.js";
+import {
+  createApiParameter,
+  generateParamDoc,
+  generateReturnDoc,
+  getTypeHint
+} from "./tools/openapi_tool/common/common.js";
 import { OpenApiSpecParser } from "./tools/openapi_tool/openapi_spec_parser/openapi_spec_parser.js";
 import { OperationParser } from "./tools/openapi_tool/openapi_spec_parser/operation_parser.js";
-import { ToolAuthHandler } from "./tools/openapi_tool/openapi_spec_parser/tool_auth_handler.js";
+import {
+  ToolAuthHandler,
+  ToolContextCredentialStore
+} from "./tools/openapi_tool/openapi_spec_parser/tool_auth_handler.js";
 import { OpenAPIToolset } from "./tools/openapi_tool/openapi_toolset.js";
 import {
   createRestApiTool,
+  createRestApiToolFromJson,
   RestApiTool
 } from "./tools/openapi_tool/rest_api_tool.js";
 import { FilesRetrieval } from "./tools/retrieval/files_retrieval.js";
@@ -59,6 +89,9 @@ export * from "./telemetry/setup.js";
 export * from "./tools/mcp/index.js";
 export {
   AgentEngineSandboxCodeExecutor,
+  AuthCredentialMissingError,
+  AutoAuthCredentialExchanger,
+  BaseAuthCredentialExchanger,
   CodeExecutionLanguage,
   ContainerCodeExecutor,
   DatabaseSessionService,
@@ -66,10 +99,12 @@ export {
   FilesRetrieval,
   GCPSkillRegistry,
   GcsArtifactService,
+  INTERNAL_AUTH_PREFIX,
   InvocationContext,
   LOAD_WEB_PAGE,
   LoadSkillResourceTool,
   LocalEnvironment,
+  OAuth2BearerExchanger,
   OpenAPIToolset,
   OpenApiSpecParser,
   OperationParser,
@@ -77,18 +112,33 @@ export {
   RunSkillInlineScriptErrorCode,
   RunSkillInlineScriptTool,
   RunSkillScriptTool,
+  ServiceAccountCredentialExchanger,
   SkillToolset,
   ToolAuthHandler,
+  ToolContextCredentialStore,
   UnsafeLocalCodeExecutor,
   VertexAiMemoryBankService,
   VertexAiRagMemoryService,
   VertexAiSessionService,
+  createApiParameter,
   createRestApiTool,
+  createRestApiToolFromJson,
+  credentialToParam,
+  dictToAuthScheme,
+  exchangeCredential,
+  generateParamDoc,
+  generateReturnDoc,
   getArtifactServiceFromUri,
   getSessionServiceFromUri,
+  getTypeHint,
   loadAllSkillsInDir,
   loadSkillFromDir,
   loadSkillFromZipBuffer,
   loadWebPage,
+  openidDictToSchemeCredential,
+  openidUrlToSchemeCredential,
+  serviceAccountDictToSchemeCredential,
+  serviceAccountSchemeCredential,
+  tokenToSchemeCredential,
   validateSkillDir
 };

package/dist/esm/memory/vertex_ai_memory_bank_service.js

@@ -40,7 +40,7 @@ const ENABLE_CONSOLIDATION_KEY = "enable_consolidation";
 const MAX_DIRECT_MEMORIES_PER_GENERATE_CALL = 5;
 function shouldFilterOutEvent(content) {
   return !((content == null ? void 0 : content.parts) || []).some(
-    (p) => p.text || p.inlineData || p.fileData
+    (p) => p.text || p.inlineData || p.fileData || p.functionCall || p.functionResponse || p.executableCode || p.codeExecutionResult || p.toolCall || p.toolResponse
   );
 }
 __name(shouldFilterOutEvent, "shouldFilterOutEvent");
@@ -126,6 +126,15 @@ const _VertexAiMemoryBankService = class _VertexAiMemoryBankService {
   }
   /**
    * Adds explicit memory items using Vertex Memory Bank.
+   *
+   * When a `MemoryEntry.id` is set, it is forwarded as the `memoryId` of the
+   * created memory, so the caller picks the last component of the memory
+   * resource name instead of letting the service generate one. An explicit
+   * `customMetadata['memoryId']` takes precedence over `MemoryEntry.id`.
+   *
+   * The id is forwarded unvalidated, so an id the API rejects fails the create
+   * call. Vertex accepts up to 63 characters from `[a-z0-9-]`, starting with a
+   * letter and ending with a letter or number.
    */
   async addMemory(request) {
     if (isConsolidationEnabled(request.customMetadata)) {
@@ -201,7 +210,8 @@ const _VertexAiMemoryBankService = class _VertexAiMemoryBankService {
       const memoryRevisionLabels = revisionLabelsForMemory(memory);
       const config = buildCreateMemoryConfig({
         customMetadata: memoryMetadata,
-        memoryRevisionLabels
+        memoryRevisionLabels,
+        memoryId: memory.id
       });
       const params = {
         name: `reasoningEngines/${this.agentEngineId}`,
@@ -302,6 +312,9 @@ function buildCreateMemoryConfig(params) {
       };
     }
   }
+  if (params.memoryId !== void 0 && config["memoryId"] === void 0) {
+    config["memoryId"] = params.memoryId;
+  }
   const revisionLabels = {
     ...customRevisionLabels,
     ...params.memoryRevisionLabels
@@ -435,9 +448,8 @@ function mergeCustomMetadataForMemory(params) {
   if (params.customMetadata) {
     Object.assign(mergedMetadata, params.customMetadata);
   }
-  const memoryWithMetadata = params.memory;
-  if (memoryWithMetadata.customMetadata) {
-    Object.assign(mergedMetadata, memoryWithMetadata.customMetadata);
+  if (params.memory.customMetadata) {
+    Object.assign(mergedMetadata, params.memory.customMetadata);
   }
   if (Object.keys(mergedMetadata).length === 0) {
     return void 0;

package/dist/esm/models/base_llm.js

@@ -8,7 +8,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  * SPDX-License-Identifier: Apache-2.0
  */
 var _a;
-import { getClientLabels } from "../utils/client_labels.js";
+import { getTrackingHeaders } from "../utils/client_labels.js";
 const BASE_MODEL_SYMBOL = /* @__PURE__ */ Symbol.for("google.adk.baseModel");
 function isBaseLlm(obj) {
   return typeof obj === "object" && obj !== null && BASE_MODEL_SYMBOL in obj && obj[BASE_MODEL_SYMBOL] === true;
@@ -30,12 +30,7 @@ const _BaseLlm = class _BaseLlm {
     this.model = model;
   }
   get trackingHeaders() {
-    const labels = getClientLabels();
-    const headerValue = labels.join(" ");
-    return {
-      "x-goog-api-client": headerValue,
-      "user-agent": headerValue
-    };
+    return getTrackingHeaders();
   }
   /**
    * Appends a user content, so that model can continue to output.