@google/adk 1.0.0 → 1.1.0

package/dist/cjs/tools/agent_tool.js

@@ -116,7 +116,7 @@ class AgentTool extends (_b = import_base_tool.BaseTool, _a = AGENT_TOOL_SIGNATU
       memoryService: (_b2 = toolContext.invocationContext.memoryService) != null ? _b2 : new import_in_memory_memory_service.InMemoryMemoryService(),
       credentialService: toolContext.invocationContext.credentialService
     });
-    const session = await runner.sessionService.createSession({
+    const session = await runner.sessionService.getOrCreateSession({
       appName: this.agent.name,
       userId: toolContext.invocationContext.userId,
       sessionId: toolContext.invocationContext.session.id,

package/dist/cjs/tools/mcp/mcp_tool.js

@@ -35,10 +35,11 @@ var import_base_tool = require("../base_tool.js");
  * SPDX-License-Identifier: Apache-2.0
  */
 class MCPTool extends import_base_tool.BaseTool {
-  constructor(mcpTool, mcpSessionManager) {
+  constructor(mcpTool, mcpSessionManager, originalName) {
     super({ name: mcpTool.name, description: mcpTool.description || "" });
     this.mcpTool = mcpTool;
     this.mcpSessionManager = mcpSessionManager;
+    this.originalName = originalName || mcpTool.name;
   }
   _getDeclaration() {
     return {
@@ -53,7 +54,7 @@ class MCPTool extends import_base_tool.BaseTool {
   async runAsync(request) {
     const session = await this.mcpSessionManager.createSession();
     const callRequest = {};
-    callRequest.params = { name: this.mcpTool.name, arguments: request.args };
+    callRequest.params = { name: this.originalName, arguments: request.args };
     const result = await session.callTool(callRequest.params, void 0, {
       signal: request.toolContext.abortSignal
     });

package/dist/cjs/tools/mcp/mcp_toolset.js

@@ -53,7 +53,7 @@ class MCPToolset extends import_base_toolset.BaseToolset {
         ...tool,
         name: this.prefix ? `${this.prefix}_${tool.name}` : tool.name
       };
-      return new import_mcp_tool.MCPTool(toolWithPrefix, this.mcpSessionManager);
+      return new import_mcp_tool.MCPTool(toolWithPrefix, this.mcpSessionManager, tool.name);
     });
   }
   async close() {

package/dist/cjs/tools/url_context_tool.js

@@ -0,0 +1,73 @@
+/**
+  * @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 url_context_tool_exports = {};
+__export(url_context_tool_exports, {
+  URL_CONTEXT: () => URL_CONTEXT,
+  UrlContextTool: () => UrlContextTool
+});
+module.exports = __toCommonJS(url_context_tool_exports);
+var import_model_name = require("../utils/model_name.js");
+var import_base_tool = require("./base_tool.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+class UrlContextTool extends import_base_tool.BaseTool {
+  constructor() {
+    super({ name: "url_context", description: "URL Context Tool" });
+  }
+  runAsync() {
+    return Promise.resolve();
+  }
+  async processLlmRequest({
+    llmRequest
+  }) {
+    if (!llmRequest.model) {
+      return;
+    }
+    if (!(0, import_model_name.isGeminiModel)(llmRequest.model)) {
+      throw new Error(
+        `URL context tool is not supported for model ${llmRequest.model}`
+      );
+    }
+    if (!(0, import_model_name.isGemini2OrAbove)(llmRequest.model)) {
+      throw new Error(
+        `URL context tool requires Gemini 2 or above, but got ${llmRequest.model}`
+      );
+    }
+    llmRequest.config = llmRequest.config || {};
+    llmRequest.config.tools = llmRequest.config.tools || [];
+    llmRequest.config.tools.push({
+      urlContext: {}
+    });
+  }
+}
+const URL_CONTEXT = new UrlContextTool();
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  URL_CONTEXT,
+  UrlContextTool
+});

package/dist/cjs/tools/vertex_ai_search_tool.js

@@ -0,0 +1,127 @@
+/**
+  * @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 vertex_ai_search_tool_exports = {};
+__export(vertex_ai_search_tool_exports, {
+  VertexAiSearchTool: () => VertexAiSearchTool
+});
+module.exports = __toCommonJS(vertex_ai_search_tool_exports);
+var import_logger = require("../utils/logger.js");
+var import_model_name = require("../utils/model_name.js");
+var import_base_tool = require("./base_tool.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const logger = (0, import_logger.getLogger)();
+class VertexAiSearchTool extends import_base_tool.BaseTool {
+  constructor(params) {
+    super({ name: "vertex_ai_search", description: "vertex_ai_search" });
+    const {
+      dataStoreId,
+      dataStoreSpecs,
+      searchEngineId,
+      filter,
+      maxResults,
+      bypassMultiToolsLimit = false
+    } = params;
+    if (dataStoreId === void 0 && searchEngineId === void 0 || dataStoreId !== void 0 && searchEngineId !== void 0) {
+      throw new Error(
+        "Either dataStoreId or searchEngineId must be specified."
+      );
+    }
+    if (dataStoreSpecs !== void 0 && searchEngineId === void 0) {
+      throw new Error(
+        "searchEngineId must be specified if dataStoreSpecs is specified."
+      );
+    }
+    this.dataStoreId = dataStoreId;
+    this.dataStoreSpecs = dataStoreSpecs;
+    this.searchEngineId = searchEngineId;
+    this.filter = filter;
+    this.maxResults = maxResults;
+    this.bypassMultiToolsLimit = bypassMultiToolsLimit;
+  }
+  runAsync() {
+    return Promise.resolve();
+  }
+  /**
+   * Builds the VertexAISearch configuration.
+   *
+   * Override this method in a subclass to dynamically customize the search
+   * configuration based on the context (e.g., set filter based on session
+   * state).
+   */
+  buildVertexAiSearchConfig(_readonlyContext) {
+    return {
+      datastore: this.dataStoreId,
+      dataStoreSpecs: this.dataStoreSpecs,
+      engine: this.searchEngineId,
+      filter: this.filter,
+      maxResults: this.maxResults
+    };
+  }
+  async processLlmRequest({
+    toolContext,
+    llmRequest
+  }) {
+    if (!llmRequest.model) {
+      return;
+    }
+    const modelCheckDisabled = (0, import_model_name.isGeminiModelIdCheckDisabled)();
+    llmRequest.config = llmRequest.config || {};
+    llmRequest.config.tools = llmRequest.config.tools || [];
+    if (!(0, import_model_name.isGeminiModel)(llmRequest.model) && !modelCheckDisabled) {
+      throw new Error(
+        `Vertex AI search tool is not supported for model ${llmRequest.model}`
+      );
+    }
+    if ((0, import_model_name.isGemini1Model)(llmRequest.model) && llmRequest.config.tools.length > 0 && !this.bypassMultiToolsLimit) {
+      throw new Error(
+        "Vertex AI search tool cannot be used with other tools in Gemini 1.x."
+      );
+    }
+    const vertexAiSearchConfig = this.buildVertexAiSearchConfig(toolContext);
+    let specsInfo;
+    if (vertexAiSearchConfig.dataStoreSpecs) {
+      const specIds = vertexAiSearchConfig.dataStoreSpecs.map(
+        (spec) => spec.dataStore ? spec.dataStore.split("/").pop() : "unnamed"
+      );
+      specsInfo = `${vertexAiSearchConfig.dataStoreSpecs.length} spec(s): [${specIds.join(", ")}]`;
+    }
+    logger.debug(
+      `Adding Vertex AI Search tool config to LLM request: datastore=${vertexAiSearchConfig.datastore}, engine=${vertexAiSearchConfig.engine}, filter=${vertexAiSearchConfig.filter}, maxResults=${vertexAiSearchConfig.maxResults}, dataStoreSpecs=${specsInfo}`
+    );
+    llmRequest.config.tools.push({
+      retrieval: {
+        vertexAiSearch: vertexAiSearchConfig
+      }
+    });
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  VertexAiSearchTool
+});

package/dist/cjs/utils/model_name.js

@@ -27,9 +27,11 @@ __export(model_name_exports, {
   extractModelName: () => extractModelName,
   isGemini1Model: () => isGemini1Model,
   isGemini2OrAbove: () => isGemini2OrAbove,
-  isGeminiModel: () => isGeminiModel
+  isGeminiModel: () => isGeminiModel,
+  isGeminiModelIdCheckDisabled: () => isGeminiModelIdCheckDisabled
 });
 module.exports = __toCommonJS(model_name_exports);
+var import_env_aware_utils = require("./env_aware_utils.js");
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -75,10 +77,14 @@ function isGemini2OrAbove(modelString) {
   const parsedVersion = parseVersion(versionString);
   return parsedVersion.valid && parsedVersion.major >= 2;
 }
+function isGeminiModelIdCheckDisabled() {
+  return (0, import_env_aware_utils.getBooleanEnvVar)("ADK_DISABLE_GEMINI_MODEL_ID_CHECK");
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   extractModelName,
   isGemini1Model,
   isGemini2OrAbove,
-  isGeminiModel
+  isGeminiModel,
+  isGeminiModelIdCheckDisabled
 });

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.0.0";
+const version = "1.1.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   version

package/dist/esm/common.js

@@ -102,6 +102,8 @@ import {
   PreloadMemoryTool
 } from "./tools/preload_memory_tool.js";
 import { ToolConfirmation } from "./tools/tool_confirmation.js";
+import { URL_CONTEXT, UrlContextTool } from "./tools/url_context_tool.js";
+import { VertexAiSearchTool } from "./tools/vertex_ai_search_tool.js";
 import { LogLevel, getLogger, setLogLevel, setLogger } from "./utils/logger.js";
 import { isGemini2OrAbove } from "./utils/model_name.js";
 import { zodObjectToSchema } from "./utils/simple_zod_to_json.js";
@@ -197,6 +199,9 @@ export {
   TokenBasedContextCompactor,
   ToolConfirmation,
   TruncatingContextCompactor,
+  URL_CONTEXT,
+  UrlContextTool,
+  VertexAiSearchTool,
   createEvent,
   createEventActions,
   createSession,