@google/adk 2.0.0 → 2.2.0

package/dist/cjs/sessions/db/schema.js

@@ -23,17 +23,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __decorateClass = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
-  for (var i = decorators.length - 1, decorator; i >= 0; i--)
-    if (decorator = decorators[i])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result) __defProp(target, key, result);
-  return result;
-};
 var schema_exports = {};
 __export(schema_exports, {
   ENTITIES: () => ENTITIES,
+  EVENT_TIMESTAMP_PRECISION: () => EVENT_TIMESTAMP_PRECISION,
   SCHEMA_VERSION_1_JSON: () => SCHEMA_VERSION_1_JSON,
   SCHEMA_VERSION_KEY: () => SCHEMA_VERSION_KEY,
   STORAGE_KEY_COLUMN_LENGTH: () => STORAGE_KEY_COLUMN_LENGTH,
@@ -41,7 +34,12 @@ __export(schema_exports, {
   StorageEvent: () => StorageEvent,
   StorageMetadata: () => StorageMetadata,
   StorageSession: () => StorageSession,
-  StorageUserState: () => StorageUserState
+  StorageUserState: () => StorageUserState,
+  storageAppStateSchema: () => storageAppStateSchema,
+  storageEventSchema: () => storageEventSchema,
+  storageMetadataSchema: () => storageMetadataSchema,
+  storageSessionSchema: () => storageSessionSchema,
+  storageUserStateSchema: () => storageUserStateSchema
 });
 module.exports = __toCommonJS(schema_exports);
 var import_core = require("@mikro-orm/core");
@@ -54,6 +52,7 @@ var import_event = require("../../events/event.js");
 const SCHEMA_VERSION_KEY = "schema_version";
 const SCHEMA_VERSION_1_JSON = "1";
 const STORAGE_KEY_COLUMN_LENGTH = 191;
+const EVENT_TIMESTAMP_PRECISION = 6;
 const _CamelCaseToSnakeCaseJsonType = class _CamelCaseToSnakeCaseJsonType extends import_core.JsonType {
   convertToDatabaseValue(value) {
     return JSON.stringify((0, import_event.transformToSnakeCaseEvent)(value));
@@ -67,175 +66,125 @@ const _CamelCaseToSnakeCaseJsonType = class _CamelCaseToSnakeCaseJsonType extend
 };
 __name(_CamelCaseToSnakeCaseJsonType, "CamelCaseToSnakeCaseJsonType");
 let CamelCaseToSnakeCaseJsonType = _CamelCaseToSnakeCaseJsonType;
-let StorageMetadata = class {
+const KEY_COLUMN = {
+  type: "string",
+  length: STORAGE_KEY_COLUMN_LENGTH,
+  primary: true
+};
+const _StorageMetadata = class _StorageMetadata {
 };
-__name(StorageMetadata, "StorageMetadata");
-__decorateClass([
-  (0, import_core.PrimaryKey)({ type: "string" })
-], StorageMetadata.prototype, "key", 2);
-__decorateClass([
-  (0, import_core.Property)({ type: "string" })
-], StorageMetadata.prototype, "value", 2);
-StorageMetadata = __decorateClass([
-  (0, import_core.Entity)({ tableName: "adk_internal_metadata" })
-], StorageMetadata);
-let StorageAppState = class {
+__name(_StorageMetadata, "StorageMetadata");
+let StorageMetadata = _StorageMetadata;
+const storageMetadataSchema = new import_core.EntitySchema({
+  class: StorageMetadata,
+  tableName: "adk_internal_metadata",
+  properties: {
+    key: { type: "string", primary: true },
+    value: { type: "string" }
+  }
+});
+const _StorageAppState = class _StorageAppState {
   constructor() {
     this.updateTime = /* @__PURE__ */ new Date();
   }
 };
-__name(StorageAppState, "StorageAppState");
-__decorateClass([
-  (0, import_core.PrimaryKey)({
-    type: "string",
-    fieldName: "app_name",
-    length: STORAGE_KEY_COLUMN_LENGTH
-  })
-], StorageAppState.prototype, "appName", 2);
-__decorateClass([
-  (0, import_core.Property)({ type: "json" })
-], StorageAppState.prototype, "state", 2);
-__decorateClass([
-  (0, import_core.Property)({
-    type: "datetime",
-    fieldName: "update_time",
-    onCreate: /* @__PURE__ */ __name(() => /* @__PURE__ */ new Date(), "onCreate"),
-    onUpdate: /* @__PURE__ */ __name(() => /* @__PURE__ */ new Date(), "onUpdate")
-  })
-], StorageAppState.prototype, "updateTime", 2);
-StorageAppState = __decorateClass([
-  (0, import_core.Entity)({ tableName: "app_states" })
-], StorageAppState);
-import_core.PrimaryKey.name;
-let StorageUserState = class {
+__name(_StorageAppState, "StorageAppState");
+let StorageAppState = _StorageAppState;
+const storageAppStateSchema = new import_core.EntitySchema({
+  class: StorageAppState,
+  tableName: "app_states",
+  properties: {
+    appName: { ...KEY_COLUMN, fieldName: "app_name" },
+    state: { type: "json" },
+    updateTime: {
+      type: "datetime",
+      fieldName: "update_time",
+      onCreate: /* @__PURE__ */ __name(() => /* @__PURE__ */ new Date(), "onCreate"),
+      onUpdate: /* @__PURE__ */ __name(() => /* @__PURE__ */ new Date(), "onUpdate")
+    }
+  }
+});
+import_core.PrimaryKeyProp;
+const _StorageUserState = class _StorageUserState {
   constructor() {
     this.updateTime = /* @__PURE__ */ new Date();
   }
 };
-__name(StorageUserState, "StorageUserState");
-__decorateClass([
-  (0, import_core.PrimaryKey)({
-    type: "string",
-    fieldName: "app_name",
-    length: STORAGE_KEY_COLUMN_LENGTH
-  })
-], StorageUserState.prototype, "appName", 2);
-__decorateClass([
-  (0, import_core.PrimaryKey)({
-    type: "string",
-    fieldName: "user_id",
-    length: STORAGE_KEY_COLUMN_LENGTH
-  })
-], StorageUserState.prototype, "userId", 2);
-__decorateClass([
-  (0, import_core.Property)({ type: "json" })
-], StorageUserState.prototype, "state", 2);
-__decorateClass([
-  (0, import_core.Property)({
-    type: "datetime",
-    fieldName: "update_time",
-    onCreate: /* @__PURE__ */ __name(() => /* @__PURE__ */ new Date(), "onCreate"),
-    onUpdate: /* @__PURE__ */ __name(() => /* @__PURE__ */ new Date(), "onUpdate")
-  })
-], StorageUserState.prototype, "updateTime", 2);
-StorageUserState = __decorateClass([
-  (0, import_core.Entity)({ tableName: "user_states" })
-], StorageUserState);
-import_core.PrimaryKey.name;
-let StorageSession = class {
+__name(_StorageUserState, "StorageUserState");
+let StorageUserState = _StorageUserState;
+const storageUserStateSchema = new import_core.EntitySchema({
+  class: StorageUserState,
+  tableName: "user_states",
+  properties: {
+    appName: { ...KEY_COLUMN, fieldName: "app_name" },
+    userId: { ...KEY_COLUMN, fieldName: "user_id" },
+    state: { type: "json" },
+    updateTime: {
+      type: "datetime",
+      fieldName: "update_time",
+      onCreate: /* @__PURE__ */ __name(() => /* @__PURE__ */ new Date(), "onCreate"),
+      onUpdate: /* @__PURE__ */ __name(() => /* @__PURE__ */ new Date(), "onUpdate")
+    }
+  }
+});
+import_core.PrimaryKeyProp;
+const _StorageSession = class _StorageSession {
   constructor() {
     this.createTime = /* @__PURE__ */ new Date();
     this.updateTime = /* @__PURE__ */ new Date();
   }
 };
-__name(StorageSession, "StorageSession");
-__decorateClass([
-  (0, import_core.PrimaryKey)({ type: "string", length: STORAGE_KEY_COLUMN_LENGTH })
-], StorageSession.prototype, "id", 2);
-__decorateClass([
-  (0, import_core.PrimaryKey)({
-    type: "string",
-    fieldName: "app_name",
-    length: STORAGE_KEY_COLUMN_LENGTH
-  })
-], StorageSession.prototype, "appName", 2);
-__decorateClass([
-  (0, import_core.PrimaryKey)({
-    type: "string",
-    fieldName: "user_id",
-    length: STORAGE_KEY_COLUMN_LENGTH
-  })
-], StorageSession.prototype, "userId", 2);
-__decorateClass([
-  (0, import_core.Property)({ type: "json" })
-], StorageSession.prototype, "state", 2);
-__decorateClass([
-  (0, import_core.Property)({
-    type: "datetime",
-    fieldName: "create_time",
-    onCreate: /* @__PURE__ */ __name(() => /* @__PURE__ */ new Date(), "onCreate")
-  })
-], StorageSession.prototype, "createTime", 2);
-__decorateClass([
-  (0, import_core.Property)({
-    type: "datetime",
-    fieldName: "update_time",
-    onCreate: /* @__PURE__ */ __name(() => /* @__PURE__ */ new Date(), "onCreate")
-  })
-], StorageSession.prototype, "updateTime", 2);
-StorageSession = __decorateClass([
-  (0, import_core.Entity)({ tableName: "sessions" })
-], StorageSession);
-import_core.PrimaryKey.name;
-let StorageEvent = class {
+__name(_StorageSession, "StorageSession");
+let StorageSession = _StorageSession;
+const storageSessionSchema = new import_core.EntitySchema({
+  class: StorageSession,
+  tableName: "sessions",
+  properties: {
+    id: KEY_COLUMN,
+    appName: { ...KEY_COLUMN, fieldName: "app_name" },
+    userId: { ...KEY_COLUMN, fieldName: "user_id" },
+    state: { type: "json" },
+    createTime: {
+      type: "datetime",
+      fieldName: "create_time",
+      onCreate: /* @__PURE__ */ __name(() => /* @__PURE__ */ new Date(), "onCreate")
+    },
+    updateTime: {
+      type: "datetime",
+      fieldName: "update_time",
+      onCreate: /* @__PURE__ */ __name(() => /* @__PURE__ */ new Date(), "onCreate")
+    }
+  }
+});
+import_core.PrimaryKeyProp;
+const _StorageEvent = class _StorageEvent {
 };
-__name(StorageEvent, "StorageEvent");
-__decorateClass([
-  (0, import_core.PrimaryKey)({ type: "string", length: STORAGE_KEY_COLUMN_LENGTH })
-], StorageEvent.prototype, "id", 2);
-__decorateClass([
-  (0, import_core.PrimaryKey)({
-    type: "string",
-    fieldName: "app_name",
-    length: STORAGE_KEY_COLUMN_LENGTH
-  })
-], StorageEvent.prototype, "appName", 2);
-__decorateClass([
-  (0, import_core.PrimaryKey)({
-    type: "string",
-    fieldName: "user_id",
-    length: STORAGE_KEY_COLUMN_LENGTH
-  })
-], StorageEvent.prototype, "userId", 2);
-__decorateClass([
-  (0, import_core.PrimaryKey)({
-    type: "string",
-    fieldName: "session_id",
-    length: STORAGE_KEY_COLUMN_LENGTH
-  })
-], StorageEvent.prototype, "sessionId", 2);
-__decorateClass([
-  (0, import_core.Property)({ type: "string", fieldName: "invocation_id" })
-], StorageEvent.prototype, "invocationId", 2);
-__decorateClass([
-  (0, import_core.Property)({ type: "datetime" })
-], StorageEvent.prototype, "timestamp", 2);
-__decorateClass([
-  (0, import_core.Property)({ type: CamelCaseToSnakeCaseJsonType, fieldName: "event_data" })
-], StorageEvent.prototype, "eventData", 2);
-StorageEvent = __decorateClass([
-  (0, import_core.Entity)({ tableName: "events" })
-], StorageEvent);
+__name(_StorageEvent, "StorageEvent");
+let StorageEvent = _StorageEvent;
+const storageEventSchema = new import_core.EntitySchema({
+  class: StorageEvent,
+  tableName: "events",
+  properties: {
+    id: KEY_COLUMN,
+    appName: { ...KEY_COLUMN, fieldName: "app_name" },
+    userId: { ...KEY_COLUMN, fieldName: "user_id" },
+    sessionId: { ...KEY_COLUMN, fieldName: "session_id" },
+    invocationId: { type: "string", fieldName: "invocation_id" },
+    timestamp: { type: "datetime", length: EVENT_TIMESTAMP_PRECISION },
+    eventData: { type: CamelCaseToSnakeCaseJsonType, fieldName: "event_data" }
+  }
+});
 const ENTITIES = [
-  StorageMetadata,
-  StorageAppState,
-  StorageUserState,
-  StorageSession,
-  StorageEvent
+  storageMetadataSchema,
+  storageAppStateSchema,
+  storageUserStateSchema,
+  storageSessionSchema,
+  storageEventSchema
 ];
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ENTITIES,
+  EVENT_TIMESTAMP_PRECISION,
   SCHEMA_VERSION_1_JSON,
   SCHEMA_VERSION_KEY,
   STORAGE_KEY_COLUMN_LENGTH,
@@ -243,5 +192,10 @@ const ENTITIES = [
   StorageEvent,
   StorageMetadata,
   StorageSession,
-  StorageUserState
+  StorageUserState,
+  storageAppStateSchema,
+  storageEventSchema,
+  storageMetadataSchema,
+  storageSessionSchema,
+  storageUserStateSchema
 });

package/dist/cjs/sessions/registry.js

@@ -45,7 +45,11 @@ function getSessionServiceFromUri(uri) {
     return new import_database_session_service.DatabaseSessionService(uri);
   }
   if ((0, import_vertex_ai_session_service.isVertexAiConnectionString)(uri)) {
-    return new import_vertex_ai_session_service.VertexAiSessionService({});
+    return new import_vertex_ai_session_service.VertexAiSessionService({
+      projectId: process.env.GOOGLE_CLOUD_PROJECT,
+      location: process.env.GOOGLE_CLOUD_LOCATION,
+      agentEngineId: process.env.GOOGLE_CLOUD_AGENT_ENGINE_ID
+    });
   }
   throw new Error(`Unsupported session service URI: ${(0, import_redact_uri.redactUriPassword)(uri)}`);
 }

package/dist/cjs/sessions/vertex_ai_session_service.js

@@ -38,7 +38,7 @@ __export(vertex_ai_session_service_exports, {
   quoteFilterLiteral: () => quoteFilterLiteral
 });
 module.exports = __toCommonJS(vertex_ai_session_service_exports);
-var import_client = require("@google-cloud/vertexai/build/src/genai/client.js");
+var import_vertexai = require("@google-cloud/vertexai");
 var import_compacted_event = require("../events/compacted_event.js");
 var import_experimental = require("../utils/experimental.js");
 var import_logger = require("../utils/logger.js");
@@ -84,7 +84,7 @@ let VertexAiSessionService = class extends import_base_session_service.BaseSessi
           this.expressModeApiKey ? import_vertex_ai_utils.EXPRESS_MODE_UNSUPPORTED_MESSAGE : "Project ID and Location are required."
         );
       }
-      const client = new import_client.Client({
+      const client = new import_vertexai.Client({
         project: this.projectId,
         location: this.location
       });

package/dist/cjs/telemetry/setup.js

@@ -100,7 +100,7 @@ function getOtelExporters(config = getOtelExportersConfig()) {
         exporter: new import_exporter_metrics_otlp_http.OTLPMetricExporter()
       })
     ] : [],
-    logRecordProcessors: enableLogging ? [new import_sdk_logs.BatchLogRecordProcessor(new import_exporter_logs_otlp_http.OTLPLogExporter())] : []
+    logRecordProcessors: enableLogging ? [new import_sdk_logs.BatchLogRecordProcessor({ exporter: new import_exporter_logs_otlp_http.OTLPLogExporter() })] : []
   };
 }
 __name(getOtelExporters, "getOtelExporters");

package/dist/cjs/telemetry/tracing.js

@@ -248,13 +248,23 @@ function traceSendData({
   );
 }
 __name(traceSendData, "traceSendData");
+function redactHttpOptions(httpOptions) {
+  const redacted = { ...httpOptions };
+  delete redacted.headers;
+  delete redacted.extraBody;
+  return redacted;
+}
+__name(redactHttpOptions, "redactHttpOptions");
 function buildLlmRequestForTrace(llmRequest) {
   const result = {
     model: llmRequest.model,
     contents: []
   };
   if (llmRequest.config) {
-    const { responseSchema, ...cleanConfig } = llmRequest.config;
+    const { responseSchema: _responseSchema, ...cleanConfig } = llmRequest.config;
+    if (cleanConfig.httpOptions) {
+      cleanConfig.httpOptions = redactHttpOptions(cleanConfig.httpOptions);
+    }
     result.config = cleanConfig;
   }
   result.contents = llmRequest.contents.map((content) => {

package/dist/cjs/tools/agent_tool.js

@@ -44,7 +44,7 @@ var import_forwarding_artifact_service = require("./forwarding_artifact_service.
  * SPDX-License-Identifier: Apache-2.0
  */
 var _a, _b;
-const AGENT_TOOL_SIGNATURE_SYMBOL = Symbol.for("google.adk.agentTool");
+const AGENT_TOOL_SIGNATURE_SYMBOL = /* @__PURE__ */ Symbol.for("google.adk.agentTool");
 function isAgentTool(obj) {
   return typeof obj === "object" && obj !== null && AGENT_TOOL_SIGNATURE_SYMBOL in obj && obj[AGENT_TOOL_SIGNATURE_SYMBOL] === true;
 }
@@ -67,8 +67,7 @@ const _AgentTool = class _AgentTool extends (_b = import_base_tool.BaseTool, _a
         name: this.name,
         description: this.description,
         // TODO(b/425992518): We should not use the agent's input schema as is.
-        // It should be validated and possibly transformed. Consider similar
-        // logic to one we have in Python ADK.
+        // It should be validated and possibly transformed first.
         parameters: this.agent.inputSchema
       };
     } else {
@@ -102,8 +101,8 @@ const _AgentTool = class _AgentTool extends (_b = import_base_tool.BaseTool, _a
       role: "user",
       parts: [
         {
-          // TODO(b/425992518): Should be validated. Consider similar
-          // logic to one we have in Python ADK.
+          // TODO(b/425992518): Args should be validated against the agent's
+          // input schema before being forwarded.
           text: hasInputSchema ? JSON.stringify(args) : args["request"]
         }
       ]

package/dist/cjs/tools/base_tool.js

@@ -26,7 +26,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var base_tool_exports = {};
 __export(base_tool_exports, {
   BaseTool: () => BaseTool,
-  isBaseTool: () => isBaseTool
+  IN_MODEL_TOOL_SYMBOL: () => IN_MODEL_TOOL_SYMBOL,
+  isBaseTool: () => isBaseTool,
+  isInModelTool: () => isInModelTool
 });
 module.exports = __toCommonJS(base_tool_exports);
 var import_variant_utils = require("../utils/variant_utils.js");
@@ -36,7 +38,12 @@ var import_variant_utils = require("../utils/variant_utils.js");
  * SPDX-License-Identifier: Apache-2.0
  */
 var _a;
-const BASE_TOOL_SIGNATURE_SYMBOL = Symbol.for("google.adk.baseTool");
+const BASE_TOOL_SIGNATURE_SYMBOL = /* @__PURE__ */ Symbol.for("google.adk.baseTool");
+const IN_MODEL_TOOL_SYMBOL = /* @__PURE__ */ Symbol.for("google.adk.inModelTool");
+function isInModelTool(tool) {
+  return typeof tool === "object" && tool !== null && tool[IN_MODEL_TOOL_SYMBOL] === true;
+}
+__name(isInModelTool, "isInModelTool");
 function isBaseTool(obj) {
   return typeof obj === "object" && obj !== null && BASE_TOOL_SIGNATURE_SYMBOL in obj && obj[BASE_TOOL_SIGNATURE_SYMBOL] === true;
 }
@@ -103,7 +110,8 @@ const _BaseTool = class _BaseTool {
     if (!functionDeclaration) {
       return;
     }
-    if (this.name in llmRequest.toolsDict) {
+    const registered = Object.hasOwn(llmRequest.toolsDict, this.name) ? llmRequest.toolsDict[this.name] : void 0;
+    if (registered && !isInModelTool(registered)) {
       throw new Error(`Duplicate tool name: ${this.name}`);
     }
     llmRequest.toolsDict[this.name] = this;
@@ -140,5 +148,7 @@ __name(findToolWithFunctionDeclarations, "findToolWithFunctionDeclarations");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BaseTool,
-  isBaseTool
+  IN_MODEL_TOOL_SYMBOL,
+  isBaseTool,
+  isInModelTool
 });

package/dist/cjs/tools/base_toolset.js

@@ -35,7 +35,7 @@ module.exports = __toCommonJS(base_toolset_exports);
  * SPDX-License-Identifier: Apache-2.0
  */
 var _a;
-const BASE_TOOLSET_SIGNATURE_SYMBOL = Symbol.for("google.adk.baseToolset");
+const BASE_TOOLSET_SIGNATURE_SYMBOL = /* @__PURE__ */ Symbol.for("google.adk.baseToolset");
 function isBaseToolset(obj) {
   return typeof obj === "object" && obj !== null && BASE_TOOLSET_SIGNATURE_SYMBOL in obj && obj[BASE_TOOLSET_SIGNATURE_SYMBOL] === true;
 }
@@ -75,10 +75,10 @@ const _BaseToolset = class _BaseToolset {
    *   process the llm request. e.g. ComputerUseToolset can add computer use
    *   tool to the llm request.
    *
-   * @param toolContext The context of the tool.
-   * @param llmRequest The outgoing LLM request, mutable this method.
+   * @param _toolContext The context of the tool.
+   * @param _llmRequest The outgoing LLM request, mutable this method.
    */
-  async processLlmRequest(toolContext, llmRequest) {
+  async processLlmRequest(_toolContext, _llmRequest) {
   }
 };
 __name(_BaseToolset, "BaseToolset");

package/dist/cjs/tools/built_in_tool.js

@@ -0,0 +1,75 @@
+/**
+  * @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 built_in_tool_exports = {};
+__export(built_in_tool_exports, {
+  BuiltInTool: () => BuiltInTool
+});
+module.exports = __toCommonJS(built_in_tool_exports);
+var import_logger = require("../utils/logger.js");
+var import_base_tool = require("./base_tool.js");
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+var _a, _b;
+const _BuiltInTool = class _BuiltInTool extends (_b = import_base_tool.BaseTool, _a = import_base_tool.IN_MODEL_TOOL_SYMBOL, _b) {
+  constructor() {
+    super(...arguments);
+    /** Marks this tool as one the model runs itself. */
+    this[_a] = true;
+  }
+  async processLlmRequest(request) {
+    if (this._getDeclaration()) {
+      throw new Error(
+        `${this.name} extends BuiltInTool but returns a function declaration. A tool the model runs itself cannot declare a callable function; extend BaseTool instead.`
+      );
+    }
+    await this.applyBuiltInConfig(request);
+    if (!Object.hasOwn(request.llmRequest.toolsDict, this.name)) {
+      request.llmRequest.toolsDict[this.name] = this;
+    }
+  }
+  /**
+   * Answers a function call the model should not have made. The tool is
+   * already configured on the request and its results arrive as grounding
+   * metadata, so the model is told to use those rather than call again.
+   */
+  async runAsync() {
+    import_logger.logger.warn(
+      `${this.name} runs inside the model but was called as a function; answering with guidance instead of executing anything.`
+    );
+    return {
+      error: `${this.name} runs inside the model and cannot be called as a function. It is already enabled on this request and its results arrive as grounding metadata; answer from those instead of calling it.`
+    };
+  }
+};
+__name(_BuiltInTool, "BuiltInTool");
+let BuiltInTool = _BuiltInTool;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BuiltInTool
+});

package/dist/cjs/tools/enterprise_web_search_tool.js

@@ -31,7 +31,7 @@ __export(enterprise_web_search_tool_exports, {
 });
 module.exports = __toCommonJS(enterprise_web_search_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
@@ -58,17 +58,14 @@ function applyEnterpriseWebSearch(llmRequest) {
   );
 }
 __name(applyEnterpriseWebSearch, "applyEnterpriseWebSearch");
-const _EnterpriseWebSearchTool = class _EnterpriseWebSearchTool extends import_base_tool.BaseTool {
+const _EnterpriseWebSearchTool = class _EnterpriseWebSearchTool extends import_built_in_tool.BuiltInTool {
   constructor() {
     super({
       name: "enterprise_web_search",
       description: "Enterprise Web Search Tool"
     });
   }
-  runAsync() {
-    return Promise.resolve();
-  }
-  async processLlmRequest({
+  async applyBuiltInConfig({
     llmRequest
   }) {
     applyEnterpriseWebSearch(llmRequest);

package/dist/cjs/tools/example_tool.js

@@ -59,7 +59,7 @@ const _ExampleTool = class _ExampleTool extends import_base_tool.BaseTool {
       return;
     }
     (0, import_llm_request.appendInstructions)(llmRequest, [
-      (0, import_example_util.buildExampleSi)(this.examples, parts[0].text, llmRequest.model)
+      await (0, import_example_util.buildExampleSi)(this.examples, parts[0].text, llmRequest.model)
     ]);
   }
 };