@google/adk 2.0.0 → 2.2.0

package/dist/cjs/tools/openapi_tool/rest_api_tool.js

@@ -35,11 +35,13 @@ var rest_api_tool_exports = {};
 __export(rest_api_tool_exports, {
   RestApiTool: () => RestApiTool,
   createRestApiTool: () => createRestApiTool,
+  createRestApiToolFromJson: () => createRestApiToolFromJson,
   prepareRequestBody: () => prepareRequestBody,
   prepareRequestParams: () => prepareRequestParams
 });
 module.exports = __toCommonJS(rest_api_tool_exports);
 var import_experimental = require("../../utils/experimental.js");
+var import_gemini_schema_util = require("../../utils/gemini_schema_util.js");
 var import_base_tool = require("../base_tool.js");
 var import_auth_helpers = require("./auth/auth_helpers.js");
 var import_operation_parser = require("./openapi_spec_parser/operation_parser.js");
@@ -49,9 +51,30 @@ var import_tool_auth_handler = require("./openapi_spec_parser/tool_auth_handler.
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+const MAX_TOOL_NAME_LENGTH = 60;
+const SECURITY_SCHEME_TYPES = [
+  "apiKey",
+  "http",
+  "oauth2",
+  "openIdConnect"
+];
+function readSchemeType(value) {
+  return typeof value === "object" && value !== null && "type" in value ? value.type : void 0;
+}
+__name(readSchemeType, "readSchemeType");
+function isSecurityScheme(value) {
+  const type = readSchemeType(value);
+  return typeof type === "string" && SECURITY_SCHEME_TYPES.includes(type);
+}
+__name(isSecurityScheme, "isSecurityScheme");
+function serializeCookieHeader(cookies) {
+  return Object.entries(cookies).map(([name, value]) => `${name}=${encodeURIComponent(value)}`).join("; ");
+}
+__name(serializeCookieHeader, "serializeCookieHeader");
 let RestApiTool = class extends import_base_tool.BaseTool {
   constructor(name, description, endpoint, operation, authScheme, authCredential, options = {}) {
-    super({ name, description });
+    var _a;
+    super({ name: name.slice(0, MAX_TOOL_NAME_LENGTH), description });
     this.endpoint = endpoint;
     this.operation = operation;
     this.authScheme = authScheme;
@@ -60,7 +83,7 @@ let RestApiTool = class extends import_base_tool.BaseTool {
     this.authCredential = authCredential;
     this.headerProvider = options.headerProvider;
     this.credentialKey = options.credentialKey;
-    this.operationParser = new import_operation_parser.OperationParser(operation, options);
+    this.operationParser = (_a = options.operationParser) != null ? _a : new import_operation_parser.OperationParser(operation, options);
   }
   configureAuthScheme(authScheme) {
     this.authScheme = authScheme;
@@ -72,14 +95,16 @@ let RestApiTool = class extends import_base_tool.BaseTool {
     this.credentialKey = credentialKey;
   }
   _getDeclaration() {
-    const schema = this.operationParser.getJsonSchema();
     return {
       name: this.name,
       description: this.description,
-      parameters: schema
+      parameters: (0, import_gemini_schema_util.openApiSchemaToGeminiSchema)(
+        this.operationParser.getJsonSchema()
+      )
     };
   }
   async runAsync(request) {
+    var _a;
     const context = request.toolContext;
     const args = request.args;
     const authHandler = import_tool_auth_handler.ToolAuthHandler.fromToolContext(
@@ -101,7 +126,8 @@ let RestApiTool = class extends import_base_tool.BaseTool {
       url: initialUrl,
       headers,
       body: parsedBody,
-      bodyData
+      bodyData,
+      cookies
     } = prepareRequestParams(
       this.endpoint,
       this.operationParser.getParameters(),
@@ -117,30 +143,36 @@ let RestApiTool = class extends import_base_tool.BaseTool {
       initialUrl,
       headers,
       credential,
-      this.authScheme
+      (_a = authResult.authScheme) != null ? _a : this.authScheme
     );
     if (this.headerProvider) {
       const providerHeaders = this.headerProvider(context);
       Object.assign(headers, providerHeaders);
     }
-    try {
-      const response = await globalThis.fetch(url, {
-        method,
-        headers,
-        // eslint-disable-next-line no-undef
-        body
-      });
-      const contentType = response.headers.get("content-type");
-      if (contentType && contentType.includes("application/json")) {
-        return await response.json();
-      } else {
-        return await response.text();
-      }
-    } catch (error) {
+    const hasCookieHeader = Object.keys(headers).some(
+      (header) => header.toLowerCase() === "cookie"
+    );
+    if (Object.keys(cookies).length > 0 && !hasCookieHeader) {
+      headers["Cookie"] = serializeCookieHeader(cookies);
+    }
+    const response = await globalThis.fetch(url, {
+      method,
+      headers,
+      // eslint-disable-next-line no-undef
+      body
+    });
+    if (response.status >= 400) {
+      const errorDetails = await response.text();
       return {
-        error: `Failed to execute API call: ${error.message}`
+        error: `Tool ${this.name} execution failed. Analyze this execution error and your inputs. Retry with adjustments if applicable. But make sure don't retry more than 3 times. Execution Error: ${errorDetails}`
       };
     }
+    const text = await response.text();
+    try {
+      return JSON.parse(text);
+    } catch {
+      return { text };
+    }
   }
 };
 __name(RestApiTool, "RestApiTool");
@@ -174,6 +206,7 @@ __name(encodePathParamValue, "encodePathParamValue");
 function prepareRequestParams(endpoint, parameters, args) {
   const headers = {};
   const queryParams = new URLSearchParams();
+  const cookies = {};
   let body = void 0;
   const paramsMap = new Map(parameters.map((p) => [p.name, p]));
   const pathParams = {};
@@ -189,9 +222,13 @@ function prepareRequestParams(endpoint, parameters, args) {
         String(argValue)
       );
     } else if (location === "query") {
-      queryParams.append(originalName, String(argValue));
+      if (argValue !== void 0 && argValue !== null && argValue !== "") {
+        queryParams.append(originalName, String(argValue));
+      }
     } else if (location === "header") {
       headers[originalName] = String(argValue);
+    } else if (location === "cookie") {
+      cookies[originalName] = String(argValue);
     } else if (location === "body") {
       if (originalName === "body" || originalName === "array" || originalName === "") {
         body = argValue;
@@ -204,7 +241,8 @@ function prepareRequestParams(endpoint, parameters, args) {
     /\{([^{}]+)\}/g,
     (placeholder, name) => Object.hasOwn(pathParams, name) ? pathParams[name] : placeholder
   );
-  let url = `${endpoint.baseUrl}${resolvedPath}`;
+  const baseUrl = endpoint.baseUrl.endsWith("/") ? endpoint.baseUrl.slice(0, -1) : endpoint.baseUrl;
+  let url = `${baseUrl}${resolvedPath}`;
   const urlParts = url.split("?");
   if (urlParts.length > 1) {
     const pathQueryParams = new URLSearchParams(urlParts[1]);
@@ -217,34 +255,39 @@ function prepareRequestParams(endpoint, parameters, args) {
   if (queryString) {
     url += `?${queryString}`;
   }
-  return { url, headers, body, bodyData };
+  return { url, headers, body, bodyData, cookies };
 }
 __name(prepareRequestParams, "prepareRequestParams");
+function isRawBody(value) {
+  return typeof value === "string" || ArrayBuffer.isView(value) || value instanceof ArrayBuffer || value instanceof Blob;
+}
+__name(isRawBody, "isRawBody");
 function prepareRequestBody(requestBody, body, bodyData, headers) {
   const finalData = body !== void 0 ? body : Object.keys(bodyData).length > 0 ? bodyData : void 0;
   if (requestBody && "content" in requestBody) {
     const content = requestBody.content;
-    for (const [mimeType, _mediaTypeObject] of Object.entries(content)) {
-      if (finalData !== void 0) {
-        if (mimeType === "application/json" || mimeType.endsWith("+json")) {
-          headers["Content-Type"] = mimeType;
-          return typeof finalData === "string" ? finalData : JSON.stringify(finalData);
-        } else if (mimeType === "application/x-www-form-urlencoded") {
-          return new URLSearchParams(finalData);
-        } else if (mimeType === "multipart/form-data") {
-          const formData = new FormData();
-          if (typeof finalData === "object" && finalData !== null) {
-            for (const [key, value] of Object.entries(finalData)) {
-              formData.append(key, String(value));
-            }
+    const mimeType = Object.keys(content)[0];
+    if (mimeType && finalData !== void 0) {
+      if (mimeType === "application/json" || mimeType.endsWith("+json")) {
+        headers["Content-Type"] = mimeType;
+        return typeof finalData === "string" ? finalData : JSON.stringify(finalData);
+      } else if (mimeType === "application/x-www-form-urlencoded") {
+        return new URLSearchParams(finalData);
+      } else if (mimeType === "multipart/form-data") {
+        const formData = new FormData();
+        if (typeof finalData === "object" && finalData !== null) {
+          for (const [key, value] of Object.entries(finalData)) {
+            formData.append(key, String(value));
           }
-          return formData;
-        } else if (mimeType === "text/plain") {
-          headers["Content-Type"] = mimeType;
-          return String(finalData);
         }
+        return formData;
+      } else if (mimeType === "application/octet-stream") {
+        headers["Content-Type"] = mimeType;
+        return isRawBody(finalData) ? finalData : String(finalData);
+      } else if (mimeType === "text/plain") {
+        headers["Content-Type"] = mimeType;
+        return String(finalData);
       }
-      break;
     }
   } else if (finalData !== void 0) {
     headers["Content-Type"] = "application/json";
@@ -254,21 +297,38 @@ function prepareRequestBody(requestBody, body, bodyData, headers) {
 }
 __name(prepareRequestBody, "prepareRequestBody");
 function createRestApiTool(parsed, options = {}) {
+  var _a, _b;
+  const operationParser = parsed.parameters ? import_operation_parser.OperationParser.load(
+    parsed.operation,
+    parsed.parameters,
+    parsed.returnValue
+  ) : new import_operation_parser.OperationParser(parsed.operation, options);
   return new RestApiTool(
-    parsed.name,
-    parsed.description,
+    (_a = parsed.name) != null ? _a : operationParser.getFunctionName(),
+    (_b = parsed.description) != null ? _b : operationParser.getDescription(),
     parsed.endpoint,
     parsed.operation,
     parsed.authScheme,
-    void 0,
-    options
+    parsed.authCredential,
+    { ...options, operationParser }
   );
 }
 __name(createRestApiTool, "createRestApiTool");
+function createRestApiToolFromJson(parsedOperationJson) {
+  const parsed = JSON.parse(parsedOperationJson);
+  if (parsed.authScheme && !isSecurityScheme(parsed.authScheme)) {
+    throw new Error(
+      `Unsupported security scheme type: ${JSON.stringify(readSchemeType(parsed.authScheme))}. Expected one of: ${SECURITY_SCHEME_TYPES.join(", ")}.`
+    );
+  }
+  return createRestApiTool(parsed);
+}
+__name(createRestApiToolFromJson, "createRestApiToolFromJson");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   RestApiTool,
   createRestApiTool,
+  createRestApiToolFromJson,
   prepareRequestBody,
   prepareRequestParams
 });

package/dist/cjs/tools/preload_memory_tool.js

@@ -41,7 +41,7 @@ const _PreloadMemoryTool = class _PreloadMemoryTool extends import_base_tool.Bas
   constructor() {
     super({
       // Name and description are not used because this tool only
-      // changes llm_request.
+      // changes the LlmRequest.
       name: "preload_memory",
       description: "preload_memory"
     });

package/dist/cjs/tools/resume_inputs.js

@@ -0,0 +1,27 @@
+/**
+  * @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 __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 resume_inputs_exports = {};
+module.exports = __toCommonJS(resume_inputs_exports);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */

package/dist/cjs/tools/retrieval/base_retrieval_tool.js

@@ -0,0 +1,60 @@
+/**
+  * @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 __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+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 base_retrieval_tool_exports = {};
+__export(base_retrieval_tool_exports, {
+  BaseRetrievalTool: () => BaseRetrievalTool
+});
+module.exports = __toCommonJS(base_retrieval_tool_exports);
+var import_genai = require("@google/genai");
+var import_base_tool = require("../base_tool.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const _BaseRetrievalTool = class _BaseRetrievalTool extends import_base_tool.BaseTool {
+  _getDeclaration() {
+    return {
+      name: this.name,
+      description: this.description,
+      parameters: {
+        type: import_genai.Type.OBJECT,
+        properties: {
+          query: {
+            type: import_genai.Type.STRING,
+            description: "The query to retrieve."
+          }
+        }
+      }
+    };
+  }
+};
+__name(_BaseRetrievalTool, "BaseRetrievalTool");
+let BaseRetrievalTool = _BaseRetrievalTool;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BaseRetrievalTool
+});

package/dist/cjs/tools/retrieval/files_retrieval.js

@@ -0,0 +1,95 @@
+/**
+  * @license
+  * Copyright 2026 Google LLC
+  * SPDX-License-Identifier: Apache-2.0
+  */
+
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var files_retrieval_exports = {};
+__export(files_retrieval_exports, {
+  FilesRetrieval: () => FilesRetrieval
+});
+module.exports = __toCommonJS(files_retrieval_exports);
+var import_logger = require("../../utils/logger.js");
+var import_llama_index_retrieval = require("./llama_index_retrieval.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const LLAMA_INDEX_MODULE = "llamaindex";
+const DIRECTORY_READER_MODULE = "@llamaindex/readers/directory";
+async function importOptional(specifier) {
+  try {
+    return await Promise.resolve().then(() => __toESM(require(specifier)));
+  } catch (cause) {
+    throw new Error(
+      `FilesRetrieval needs the optional package '${specifier}', which is not installed. Install '${LLAMA_INDEX_MODULE}' and '@llamaindex/readers', or build the retriever yourself and pass it to LlamaIndexRetrieval.`,
+      { cause }
+    );
+  }
+}
+__name(importOptional, "importOptional");
+const _FilesRetrieval = class _FilesRetrieval extends import_llama_index_retrieval.LlamaIndexRetrieval {
+  constructor(params) {
+    super({
+      name: params.name,
+      description: params.description,
+      retriever: params.retriever
+    });
+    this.inputDir = params.inputDir;
+  }
+  /**
+   * Indexes every file under `inputDir` and returns a tool that retrieves
+   * from it.
+   *
+   * Requires the optional `llamaindex` and `@llamaindex/readers` packages,
+   * and a configured LlamaIndex embedding model.
+   */
+  static async create(params) {
+    import_logger.logger.info(`Loading data from ${params.inputDir}`);
+    const { SimpleDirectoryReader } = await importOptional(
+      DIRECTORY_READER_MODULE
+    );
+    const { VectorStoreIndex } = await importOptional(LLAMA_INDEX_MODULE);
+    const documents = await new SimpleDirectoryReader().loadData({
+      directoryPath: params.inputDir
+    });
+    const index = await VectorStoreIndex.fromDocuments(documents);
+    return new _FilesRetrieval({ ...params, retriever: index.asRetriever() });
+  }
+};
+__name(_FilesRetrieval, "FilesRetrieval");
+let FilesRetrieval = _FilesRetrieval;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  FilesRetrieval
+});

package/dist/cjs/tools/retrieval/llama_index_retrieval.js

@@ -0,0 +1,57 @@
+/**
+  * @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 __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+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 llama_index_retrieval_exports = {};
+__export(llama_index_retrieval_exports, {
+  LlamaIndexRetrieval: () => LlamaIndexRetrieval
+});
+module.exports = __toCommonJS(llama_index_retrieval_exports);
+var import_base_retrieval_tool = require("./base_retrieval_tool.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const _LlamaIndexRetrieval = class _LlamaIndexRetrieval extends import_base_retrieval_tool.BaseRetrievalTool {
+  constructor(params) {
+    super({ name: params.name, description: params.description });
+    this.retriever = params.retriever;
+  }
+  async runAsync({ args }) {
+    var _a;
+    const nodes = await this.retriever.retrieve(String((_a = args["query"]) != null ? _a : ""));
+    const top = nodes[0];
+    if (!top) {
+      throw new Error(`${this.name} retrieved no results for the query.`);
+    }
+    return top.node.text;
+  }
+};
+__name(_LlamaIndexRetrieval, "LlamaIndexRetrieval");
+let LlamaIndexRetrieval = _LlamaIndexRetrieval;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  LlamaIndexRetrieval
+});

package/dist/cjs/tools/skill/skill_toolset.js

@@ -109,7 +109,9 @@ let SkillToolset = class extends import_base_toolset.BaseToolset {
     return [...this.tools, ...dynamicTools];
   }
   async close() {
+    var _a, _b;
     this.fetchedSkillCache.clear();
+    await ((_b = (_a = this.registry) == null ? void 0 : _a.close) == null ? void 0 : _b.call(_a));
   }
   getSkill(name) {
     return this.skills[name];

package/dist/cjs/tools/tool_context.js

@@ -0,0 +1,41 @@
+/**
+  * @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 tool_context_exports = {};
+__export(tool_context_exports, {
+  CallbackContext: () => import_context.Context,
+  ToolContext: () => import_context.Context
+});
+module.exports = __toCommonJS(tool_context_exports);
+var import_context = require("../agents/context.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  CallbackContext,
+  ToolContext
+});

package/dist/cjs/tools/url_context_tool.js

@@ -30,20 +30,17 @@ __export(url_context_tool_exports, {
 });
 module.exports = __toCommonJS(url_context_tool_exports);
 var import_model_name = require("../utils/model_name.js");
-var import_base_tool = require("./base_tool.js");
+var import_built_in_tool = require("./built_in_tool.js");
 /**
  * @license
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-const _UrlContextTool = class _UrlContextTool extends import_base_tool.BaseTool {
+const _UrlContextTool = class _UrlContextTool extends import_built_in_tool.BuiltInTool {
   constructor() {
     super({ name: "url_context", description: "URL Context Tool" });
   }
-  runAsync() {
-    return Promise.resolve();
-  }
-  async processLlmRequest({
+  async applyBuiltInConfig({
     llmRequest
   }) {
     if (!llmRequest.model) {

package/dist/cjs/tools/vertex_ai_search_tool.js

@@ -30,14 +30,13 @@ __export(vertex_ai_search_tool_exports, {
 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");
+var import_built_in_tool = require("./built_in_tool.js");
 /**
  * @license
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-const logger = (0, import_logger.getLogger)();
-const _VertexAiSearchTool = class _VertexAiSearchTool extends import_base_tool.BaseTool {
+const _VertexAiSearchTool = class _VertexAiSearchTool extends import_built_in_tool.BuiltInTool {
   constructor(params) {
     super({ name: "vertex_ai_search", description: "vertex_ai_search" });
     const {
@@ -65,9 +64,6 @@ const _VertexAiSearchTool = class _VertexAiSearchTool extends import_base_tool.B
     this.maxResults = maxResults;
     this.bypassMultiToolsLimit = bypassMultiToolsLimit;
   }
-  runAsync() {
-    return Promise.resolve();
-  }
   /**
    * Builds the VertexAISearch configuration.
    *
@@ -84,7 +80,7 @@ const _VertexAiSearchTool = class _VertexAiSearchTool extends import_base_tool.B
       maxResults: this.maxResults
     };
   }
-  async processLlmRequest({
+  async applyBuiltInConfig({
     toolContext,
     llmRequest
   }) {
@@ -112,7 +108,7 @@ const _VertexAiSearchTool = class _VertexAiSearchTool extends import_base_tool.B
       );
       specsInfo = `${vertexAiSearchConfig.dataStoreSpecs.length} spec(s): [${specIds.join(", ")}]`;
     }
-    logger.debug(
+    import_logger.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({

package/dist/cjs/tools/vertex_rag_retrieval_tool.js

@@ -28,13 +28,13 @@ __export(vertex_rag_retrieval_tool_exports, {
   VertexRagRetrievalTool: () => VertexRagRetrievalTool
 });
 module.exports = __toCommonJS(vertex_rag_retrieval_tool_exports);
-var import_base_tool = require("./base_tool.js");
+var import_built_in_tool = require("./built_in_tool.js");
 /**
  * @license
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-const _VertexRagRetrievalTool = class _VertexRagRetrievalTool extends import_base_tool.BaseTool {
+const _VertexRagRetrievalTool = class _VertexRagRetrievalTool extends import_built_in_tool.BuiltInTool {
   constructor(config) {
     super({
       name: "vertex_rag_retrieval",
@@ -42,14 +42,7 @@ const _VertexRagRetrievalTool = class _VertexRagRetrievalTool extends import_bas
     });
     this.vertexRagStore = config;
   }
-  /**
-   * This tool is executed server-side by the Vertex AI RAG Engine.
-   * Local execution is not required.
-   */
-  runAsync() {
-    return Promise.resolve();
-  }
-  async processLlmRequest({
+  async applyBuiltInConfig({
     llmRequest
   }) {
     llmRequest.config = llmRequest.config || {};