@google/adk 2.3.0 → 2.4.0

package/dist/esm/index.js

@@ -30,7 +30,11 @@ import {
   DebugLoggingPlugin,
   isDebugLoggingPlugin
 } from "./plugins/debug_logging_plugin.js";
-import { DatabaseSessionService } from "./sessions/database_session_service.js";
+import {
+  DatabaseSessionService,
+  isStaleSessionError,
+  StaleSessionError
+} from "./sessions/database_session_service.js";
 import { getSessionServiceFromUri } from "./sessions/registry.js";
 import { VertexAiSessionService } from "./sessions/vertex_ai_session_service.js";
 import { GCPSkillRegistry } from "./skills/gcp_skill_registry.js";
@@ -74,6 +78,9 @@ import {
 import {
   IntegrationClient
 } from "./tools/application_integration_tool/clients/integration_client.js";
+import {
+  IntegrationConnectorTool
+} from "./tools/application_integration_tool/integration_connector_tool.js";
 import { LOAD_WEB_PAGE, loadWebPage } from "./tools/load_web_page.js";
 import {
   credentialToParam,
@@ -141,7 +148,11 @@ import {
   tryGetResetFunc
 } from "./cli/cli_eval.js";
 import { loadDotenvForAgent, walkToRootUntilFound } from "./cli/utils/envs.js";
-import { LOGGING_FORMAT, logToStderr, logToTmpFolder } from "./cli/utils/logs.js";
+import {
+  LOGGING_FORMAT,
+  logToTmpFolder,
+  setupAdkLogger
+} from "./cli/utils/logs.js";
 export * from "./tools/mcp/index.js";
 export {
   APIHubClient,
@@ -166,6 +177,7 @@ export {
   GcsArtifactService,
   INTERNAL_AUTH_PREFIX,
   IntegrationClient,
+  IntegrationConnectorTool,
   InvocationContext,
   LOAD_WEB_PAGE,
   LOGGING_FORMAT,
@@ -185,6 +197,7 @@ export {
   SecretManagerClient,
   ServiceAccountCredentialExchanger,
   SkillToolset,
+  StaleSessionError,
   TOOL_TRAJECTORY_SCORE_KEY,
   ToolAuthHandler,
   ToolContextCredentialStore,
@@ -218,6 +231,7 @@ export {
   getSessionServiceFromUri,
   getTypeHint,
   isDebugLoggingPlugin,
+  isStaleSessionError,
   listOperation,
   listOperationRequest,
   loadAllSkillsInDir,
@@ -225,7 +239,6 @@ export {
   loadSkillFromDir,
   loadSkillFromZipBuffer,
   loadWebPage,
-  logToStderr,
   logToTmpFolder,
   openidDictToSchemeCredential,
   openidUrlToSchemeCredential,
@@ -233,6 +246,7 @@ export {
   runEvals,
   serviceAccountDictToSchemeCredential,
   serviceAccountSchemeCredential,
+  setupAdkLogger,
   tokenToSchemeCredential,
   tryGetResetFunc,
   updateOperation,

package/dist/esm/plugins/base_plugin.js

@@ -246,29 +246,19 @@ const _BasePlugin = class _BasePlugin {
     return;
   }
   /**
-     * Callback executed when a tool call encounters an error.
-      tool: BaseTool;
-      toolArgs: Record<string, unknown>;
-      toolContext: Context;
-      result: Record<string, unknown>;
-    }): Promise<Record<string, unknown> | undefined> {
-      return;
-    }
-  
-    /**
-     * Callback executed when a tool call encounters an error.
-     *
-     * This callback provides an opportunity to handle tool errors gracefully,
-     * potentially providing alternative responses or recovery mechanisms.
-     *
-     * @param _params.tool The tool instance that encountered an error.
-     * @param _params.toolArgs The arguments that were passed to the tool.
-     * @param _params.toolContext The context specific to the tool execution.
-     * @param _params.error The exception that was raised during tool execution.
-     * @returns An optional dictionary. If a dictionary is returned, it will be
-     *     used as the tool response instead of propagating the error. Returning
-     *     `undefined` allows the original error to be raised.
-     */
+   * Callback executed when a tool call encounters an error.
+   *
+   * This callback provides an opportunity to handle tool errors gracefully,
+   * potentially providing alternative responses or recovery mechanisms.
+   *
+   * @param _params.tool The tool instance that encountered an error.
+   * @param _params.toolArgs The arguments that were passed to the tool.
+   * @param _params.toolContext The context specific to the tool execution.
+   * @param _params.error The exception that was raised during tool execution.
+   * @returns An optional dictionary. If a dictionary is returned, it will be
+   *     used as the tool response instead of propagating the error. Returning
+   *     `undefined` allows the original error to be raised.
+   */
   async onToolErrorCallback(_params) {
     return;
   }

package/dist/esm/sessions/base_session_service.js

@@ -43,12 +43,7 @@ const _BaseSessionService = class _BaseSessionService {
     }
     event = trimTempDeltaState(event);
     this.updateSessionState({ session, event });
-    const index = session.events.findIndex((e) => e.id === event.id);
-    if (index >= 0) {
-      session.events[index] = event;
-    } else {
-      session.events.push(event);
-    }
+    upsertSessionEvent(session, event);
     return event;
   }
   /**
@@ -78,6 +73,15 @@ const _BaseSessionService = class _BaseSessionService {
 };
 __name(_BaseSessionService, "BaseSessionService");
 let BaseSessionService = _BaseSessionService;
+function upsertSessionEvent(session, event) {
+  const index = session.events.findIndex((e) => e.id === event.id);
+  if (index >= 0) {
+    session.events[index] = event;
+  } else {
+    session.events.push(event);
+  }
+}
+__name(upsertSessionEvent, "upsertSessionEvent");
 function trimTempDeltaState(event) {
   if (!event.actions || !event.actions.stateDelta) {
     return event;
@@ -119,5 +123,6 @@ export {
   BaseSessionService,
   mergeStates,
   trimTempDeltaState,
-  trimTempState
+  trimTempState,
+  upsertSessionEvent
 };

package/dist/esm/sessions/database_session_service.js

@@ -29,12 +29,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
  * SPDX-License-Identifier: Apache-2.0
  */
 import { randomUUID } from "../utils/env_aware_utils.js";
+import { logger } from "../utils/logger.js";
 import {
   BaseSessionService,
   mergeStates,
-  trimTempDeltaState
+  trimTempDeltaState,
+  upsertSessionEvent
 } from "./base_session_service.js";
 import { createSession } from "./session.js";
+import { StaleSessionError } from "./stale_session_error.js";
 import { State } from "./state.js";
 let MikroORM;
 let LockMode;
@@ -67,6 +70,12 @@ async function importMikroOrm() {
   } = operations);
 }
 __name(importMikroOrm, "importMikroOrm");
+import { isStaleSessionError, StaleSessionError as StaleSessionError2 } from "./stale_session_error.js";
+function formatDateTime(dateOrEpochMs) {
+  const date = typeof dateOrEpochMs === "number" ? new Date(dateOrEpochMs) : dateOrEpochMs;
+  return date.toISOString().replace("T", " ").slice(0, 19);
+}
+__name(formatDateTime, "formatDateTime");
 function isDatabaseConnectionString(uri) {
   if (!uri) {
     return false;
@@ -75,16 +84,20 @@ function isDatabaseConnectionString(uri) {
 }
 __name(isDatabaseConnectionString, "isDatabaseConnectionString");
 const _DatabaseSessionService = class _DatabaseSessionService extends BaseSessionService {
-  constructor(connectionStringOrOptions) {
+  constructor(connectionStringOrOptions, options) {
+    var _a;
     super();
     this.initialized = false;
     if (typeof connectionStringOrOptions === "string") {
       this.connectionString = connectionStringOrOptions;
+      this.staleSession = (_a = options == null ? void 0 : options.staleSession) != null ? _a : "reject";
     } else {
       if (!connectionStringOrOptions.driver) {
         throw new Error("Driver is required when passing options object.");
       }
-      this.options = connectionStringOrOptions;
+      const { staleSession, ...mikroOptions } = connectionStringOrOptions;
+      this.options = mikroOptions;
+      this.staleSession = staleSession != null ? staleSession : "reject";
     }
   }
   async init() {
@@ -330,6 +343,7 @@ const _DatabaseSessionService = class _DatabaseSessionService extends BaseSessio
       return event;
     }
     const trimmedEvent = trimTempDeltaState(event);
+    let sessionWasStale = false;
     await em.transactional(async (txEm) => {
       const storageSession = await txEm.findOne(
         StorageSession,
@@ -343,6 +357,14 @@ const _DatabaseSessionService = class _DatabaseSessionService extends BaseSessio
       if (!storageSession) {
         throw new Error(`Session ${session.id} not found for appendEvent`);
       }
+      if (storageSession.updateTime.getTime() > session.lastUpdateTime) {
+        if (this.staleSession === "reject") {
+          throw new StaleSessionError(
+            `The last_update_time provided in the session object ${formatDateTime(session.lastUpdateTime)} is earlier than the update_time in the storage_session ${formatDateTime(storageSession.updateTime)}. Please check if it is a stale session.`
+          );
+        }
+        sessionWasStale = true;
+      }
       let appStateModel = await txEm.findOne(StorageAppState, {
         appName: session.appName
       });
@@ -366,24 +388,6 @@ const _DatabaseSessionService = class _DatabaseSessionService extends BaseSessio
         });
         txEm.persist(userStateModel);
       }
-      if (storageSession.updateTime.getTime() > session.lastUpdateTime) {
-        const events = await txEm.find(
-          StorageEvent,
-          {
-            appName: session.appName,
-            userId: session.userId,
-            sessionId: session.id
-          },
-          { orderBy: { timestamp: "ASC" } }
-        );
-        const mergedState = mergeStates(
-          appStateModel.state,
-          userStateModel.state,
-          storageSession.state
-        );
-        session.state = mergedState;
-        session.events = events.map((e) => e.eventData);
-      }
       if (event.actions && event.actions.stateDelta) {
         const appDelta = {};
         const userDelta = {};
@@ -437,14 +441,29 @@ const _DatabaseSessionService = class _DatabaseSessionService extends BaseSessio
         storageSession.state
       );
       session.state = newMergedState;
-      const index = session.events.findIndex((e) => e.id === event.id);
-      if (index >= 0) {
-        session.events[index] = event;
-      } else {
-        session.events.push(event);
-      }
+      upsertSessionEvent(session, event);
       session.lastUpdateTime = storageSession.updateTime.getTime();
     });
+    if (sessionWasStale) {
+      try {
+        const storageEvents = await em.find(
+          StorageEvent,
+          {
+            appName: session.appName,
+            userId: session.userId,
+            sessionId: session.id
+          },
+          { orderBy: { timestamp: "ASC" } }
+        );
+        session.events = storageEvents.map((se) => se.eventData);
+        upsertSessionEvent(session, event);
+      } catch (e) {
+        const message = e instanceof Error ? e.message : String(e);
+        logger.warn(
+          `Failed to reload events for stale session ${session.id} after appendEvent; the event was persisted but session.events may be missing concurrent appends: ${message}`
+        );
+      }
+    }
     return event;
   }
 };
@@ -452,5 +471,7 @@ __name(_DatabaseSessionService, "DatabaseSessionService");
 let DatabaseSessionService = _DatabaseSessionService;
 export {
   DatabaseSessionService,
-  isDatabaseConnectionString
+  StaleSessionError2 as StaleSessionError,
+  isDatabaseConnectionString,
+  isStaleSessionError
 };

package/dist/esm/sessions/stale_session_error.js

@@ -0,0 +1,31 @@
+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
+ */
+var _a, _b;
+const STALE_SESSION_ERROR_SIGNATURE_SYMBOL = /* @__PURE__ */ Symbol.for(
+  "google.adk.staleSessionError"
+);
+const _StaleSessionError = class _StaleSessionError extends (_b = Error, _a = STALE_SESSION_ERROR_SIGNATURE_SYMBOL, _b) {
+  constructor(message) {
+    super(message);
+    this[_a] = true;
+    this.name = "StaleSessionError";
+    Object.setPrototypeOf(this, _StaleSessionError.prototype);
+  }
+};
+__name(_StaleSessionError, "StaleSessionError");
+let StaleSessionError = _StaleSessionError;
+function isStaleSessionError(obj) {
+  return typeof obj === "object" && obj !== null && (STALE_SESSION_ERROR_SIGNATURE_SYMBOL in obj || obj instanceof Error && obj.name === "StaleSessionError");
+}
+__name(isStaleSessionError, "isStaleSessionError");
+export {
+  StaleSessionError,
+  isStaleSessionError
+};

package/dist/esm/skills/loader.js

@@ -8,10 +8,12 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  * SPDX-License-Identifier: Apache-2.0
  */
 import AdmZip from "adm-zip";
-import yaml from "js-yaml";
+import * as yaml from "js-yaml";
 import { isUtf8 } from "node:buffer";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
+import { InputValidationError } from "../errors/input_validation_error.js";
+import { NotFoundError } from "../errors/not_found_error.js";
 import { logger } from "../utils/logger.js";
 import {
   FrontmatterSchema
@@ -88,24 +90,37 @@ async function loadDir(directoryPath) {
   return files;
 }
 __name(loadDir, "loadDir");
+const FRONTMATTER_BOM = "\uFEFF";
+const FRONTMATTER_PATTERN = /^---[ \t]*\r?\n(?:([\s\S]*?)\r?\n)??---[ \t]*(?:\r?\n|$)/;
 function parseFrontmatterYaml(content) {
-  if (!content.startsWith("---")) {
-    throw new Error("SKILL.md must start with YAML frontmatter (---)");
+  var _a;
+  const text = content.startsWith(FRONTMATTER_BOM) ? content.slice(FRONTMATTER_BOM.length) : content;
+  if (!text.startsWith("---")) {
+    throw new InputValidationError(
+      "SKILL.md must start with YAML frontmatter (---)"
+    );
   }
-  const parts = content.split("---");
-  if (parts.length < 3) {
-    throw new Error("SKILL.md frontmatter not properly closed with ---");
+  const match = FRONTMATTER_PATTERN.exec(text);
+  if (!match) {
+    throw new InputValidationError(
+      "SKILL.md frontmatter not properly closed with ---"
+    );
   }
-  const frontmatterStr = parts[1];
-  const body = parts.filter((_, i) => i >= 2).join("---").trim();
+  const frontmatterStr = (_a = match[1]) != null ? _a : "";
+  const body = text.slice(match[0].length).trim();
   try {
     const parsed = yaml.load(frontmatterStr);
     if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-      throw new Error("SKILL.md frontmatter must be a YAML mapping");
+      throw new InputValidationError(
+        "SKILL.md frontmatter must be a YAML mapping"
+      );
     }
     return { raw: parsed, body };
   } catch (e) {
-    throw new Error(`Invalid YAML in frontmatter: ${e.message}`);
+    throw new InputValidationError(
+      `Invalid YAML in frontmatter: ${e.message}`,
+      { cause: e }
+    );
   }
 }
 __name(parseFrontmatterYaml, "parseFrontmatterYaml");
@@ -113,7 +128,10 @@ function validateFrontmatter(raw) {
   try {
     return FrontmatterSchema.parse(raw);
   } catch (e) {
-    throw new Error(`Invalid YAML in frontmatter: ${e.message}`);
+    throw new InputValidationError(
+      `Invalid YAML in frontmatter: ${e.message}`,
+      { cause: e }
+    );
   }
 }
 __name(validateFrontmatter, "validateFrontmatter");
@@ -160,6 +178,18 @@ __name(loadSkillFromDir, "loadSkillFromDir");
 async function validateSkillDir(skillDir) {
   const problems = [];
   const resolvedDir = path.resolve(skillDir);
+  try {
+    const stats = await fs.stat(resolvedDir);
+    if (!stats.isDirectory()) {
+      return [`'${resolvedDir}' is not a directory.`];
+    }
+  } catch (e) {
+    const code = e.code;
+    if (code === "ENOENT" || code === "ENOTDIR") {
+      return [`Directory '${resolvedDir}' does not exist.`];
+    }
+    return [`Failed to access '${resolvedDir}': ${e.message}`];
+  }
   let skill;
   try {
     skill = await loadSkillFile(resolvedDir);
@@ -209,7 +239,7 @@ async function loadSkillFile(skillDir) {
     );
   }
   if (!skillMdPath) {
-    throw new Error(
+    throw new NotFoundError(
       `SKILL.md (or any case variation like skill.md) not found in '${skillDir}'.`
     );
   }
@@ -217,7 +247,7 @@ async function loadSkillFile(skillDir) {
   const frontmatter = FrontmatterSchema.parse(parsed);
   const dirName = path.basename(resolvedDir);
   if (dirName !== frontmatter.name) {
-    throw new Error(
+    throw new InputValidationError(
       `Skill name '${frontmatter.name}' does not match directory name '${dirName}'.`
     );
   }
@@ -279,7 +309,9 @@ function loadSkillFromZipBuffer(zipBuffer) {
   const entries = zip.getEntries();
   for (const entry of entries) {
     if (isDangerousZipEntryName(entry.entryName)) {
-      throw new Error(`Dangerous zip entry ignored: ${entry.entryName}`);
+      throw new InputValidationError(
+        `Dangerous zip entry ignored: ${entry.entryName}`
+      );
     }
   }
   let skillMdContent = "";
@@ -291,15 +323,17 @@ function loadSkillFromZipBuffer(zipBuffer) {
     }
   }
   if (!skillMdContent) {
-    throw new Error("SKILL.md not found in zipped filesystem.");
+    throw new NotFoundError("SKILL.md not found in zipped filesystem.");
   }
   const { raw, body } = parseFrontmatterYaml(skillMdContent);
   const skillName = raw["name"];
   if (!skillName) {
-    throw new Error("SKILL.md frontmatter must contain 'name'");
+    throw new InputValidationError("SKILL.md frontmatter must contain 'name'");
   }
   if (typeof skillName !== "string" || !isBareSkillName(skillName)) {
-    throw new Error(`Invalid skill name in SKILL.md: ${String(skillName)}`);
+    throw new InputValidationError(
+      `Invalid skill name in SKILL.md: ${String(skillName)}`
+    );
   }
   const frontmatter = validateFrontmatter(raw);
   const references = {};

package/dist/esm/telemetry/setup.js

@@ -7,7 +7,7 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { metrics, trace } from "@opentelemetry/api";
+import { metrics } from "@opentelemetry/api";
 import { logs } from "@opentelemetry/api-logs";
 import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
 import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http";
@@ -39,7 +39,6 @@ function maybeSetOtelProviders(otelHooksToSetup = [], otelResource) {
       spanProcessors
     });
     tracerProvider.register();
-    trace.setGlobalTracerProvider(tracerProvider);
   }
   if (metricReaders.length > 0) {
     const meterProvider = new MeterProvider({

package/dist/esm/telemetry/tracing.js

@@ -7,7 +7,12 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { context, trace } from "@opentelemetry/api";
+import { ApiError } from "@google/genai";
+import {
+  context,
+  SpanStatusCode,
+  trace
+} from "@opentelemetry/api";
 import { version } from "../version.js";
 var GenAiAttr = /* @__PURE__ */ ((GenAiAttr2) => {
   GenAiAttr2["AGENT_DESCRIPTION"] = "gen_ai.agent.description";
@@ -106,15 +111,55 @@ function traceNodeExecution({
   });
 }
 __name(traceNodeExecution, "traceNodeExecution");
-function traceToolCall({
-  tool,
-  args,
-  functionResponseEvent,
-  invocationContext
-}) {
+function resolveErrorType(error) {
   var _a, _b;
-  const span = trace.getActiveSpan();
+  if (error !== null && (typeof error === "object" || typeof error === "function")) {
+    try {
+      const errorObject = error;
+      const customErrorType = (_a = errorObject.errorType) != null ? _a : errorObject.error_type;
+      if (typeof customErrorType === "string" || typeof customErrorType === "number") {
+        return String(customErrorType);
+      }
+      if (error instanceof ApiError) {
+        return String(error.status);
+      }
+      const constructorName = (_b = errorObject.constructor) == null ? void 0 : _b.name;
+      if (typeof constructorName === "string" && constructorName.length > 0) {
+        return constructorName;
+      }
+    } catch {
+    }
+  }
+  return typeof error;
+}
+__name(resolveErrorType, "resolveErrorType");
+function traceToolCall(params) {
+  var _a, _b, _c;
+  const {
+    tool,
+    args,
+    functionResponseEvent,
+    invocationContext,
+    error,
+    errorType
+  } = params;
+  const span = (_a = params.span) != null ? _a : trace.getActiveSpan();
   if (!span) return;
+  const hasError = Object.hasOwn(params, "error");
+  const failureType = hasError ? resolveErrorType(error) : errorType;
+  if (hasError) {
+    let exception;
+    try {
+      exception = error instanceof Error ? error : resolveErrorType(error);
+    } catch {
+      exception = resolveErrorType(error);
+    }
+    span.recordException(exception);
+  }
+  if (failureType !== void 0) {
+    span.setAttribute("error.type", failureType);
+    span.setStatus({ code: SpanStatusCode.ERROR, message: failureType });
+  }
   span.setAttributes({
     ["gen_ai.operation.name" /* OPERATION_NAME */]: "execute_tool",
     ["gen_ai.system" /* SYSTEM */]: GEN_AI_SYSTEM_VALUE,
@@ -131,9 +176,9 @@ function traceToolCall({
   });
   let toolCallId = "<not specified>";
   let toolResponse = "<not specified>";
-  if ((_a = functionResponseEvent.content) == null ? void 0 : _a.parts) {
+  if ((_b = functionResponseEvent == null ? void 0 : functionResponseEvent.content) == null ? void 0 : _b.parts) {
     const responseParts = functionResponseEvent.content.parts;
-    const functionResponse = (_b = responseParts[0]) == null ? void 0 : _b.functionResponse;
+    const functionResponse = (_c = responseParts[0]) == null ? void 0 : _c.functionResponse;
     if (functionResponse == null ? void 0 : functionResponse.id) {
       toolCallId = functionResponse.id;
     }
@@ -146,7 +191,7 @@ function traceToolCall({
   }
   span.setAttributes({
     ["gen_ai.tool.call.id" /* TOOL_CALL_ID */]: toolCallId,
-    ["gcp.vertex.agent.event_id" /* EVENT_ID */]: functionResponseEvent.id,
+    ...functionResponseEvent ? { ["gcp.vertex.agent.event_id" /* EVENT_ID */]: functionResponseEvent.id } : {},
     ["gcp.vertex.agent.tool_response" /* TOOL_RESPONSE */]: shouldAddRequestResponseToSpans() ? safeJsonSerialize(toolResponse) : "{}"
   });
 }
@@ -303,6 +348,7 @@ function shouldAddRequestResponseToSpans() {
 }
 __name(shouldAddRequestResponseToSpans, "shouldAddRequestResponseToSpans");
 export {
+  resolveErrorType,
   runAsyncGeneratorWithOtelContext,
   traceAgentInvocation,
   traceCallLlm,

package/dist/esm/tools/apihub_tool/apihub_toolset.js

@@ -16,7 +16,7 @@ var __decorateClass = (decorators, target, key, kind) => {
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import yaml from "js-yaml";
+import * as yaml from "js-yaml";
 import { toSnakeCaseName } from "../../utils/case_utils.js";
 import { experimental } from "../../utils/experimental.js";
 import { BaseToolset } from "../base_toolset.js";
@@ -24,15 +24,15 @@ import { OpenAPIToolset } from "../openapi_tool/openapi_toolset.js";
 import { APIHubClient } from "./clients/apihub_client.js";
 let APIHubToolset = class extends BaseToolset {
   constructor(options) {
-    var _a, _b, _c, _d;
-    super([]);
-    this.name = (_a = options.name) != null ? _a : "";
-    this.description = (_b = options.description) != null ? _b : "";
+    var _a, _b, _c, _d, _e;
+    super((_a = options.toolFilter) != null ? _a : []);
+    this.name = (_b = options.name) != null ? _b : "";
+    this.description = (_c = options.description) != null ? _c : "";
     this.apihubResourceName = options.apihubResourceName;
-    this.lazyLoadSpec = (_c = options.lazyLoadSpec) != null ? _c : false;
+    this.lazyLoadSpec = (_d = options.lazyLoadSpec) != null ? _d : false;
     this.authScheme = options.authScheme;
     this.authCredential = options.authCredential;
-    this.apihubClient = (_d = options.apihubClient) != null ? _d : new APIHubClient({
+    this.apihubClient = (_e = options.apihubClient) != null ? _e : new APIHubClient({
       accessToken: options.accessToken,
       serviceAccountJson: options.serviceAccountJson
     });
@@ -51,21 +51,12 @@ let APIHubToolset = class extends BaseToolset {
     const toolset = await this.loadToolset();
     return toolset ? toolset.getTools(context) : [];
   }
-  /**
-   * Returns the tool with the given name, or `undefined` when the spec
-   * produced no such tool.
-   *
-   * Unlike `OpenAPIToolset.getTool`, the result is a Promise, because the spec
-   * may still be loading.
-   *
-   * @param name The tool name, which is the operation ID in snake_case.
-   * @throws When the spec cannot be fetched or is not valid YAML or JSON.
-   */
-  async getTool(name) {
-    const toolset = await this.loadToolset();
-    return toolset == null ? void 0 : toolset.getTool(name);
-  }
   async close() {
+    if (!this.toolsetPromise) {
+      return;
+    }
+    const toolset = await this.toolsetPromise.catch(() => void 0);
+    await (toolset == null ? void 0 : toolset.close());
   }
   loadToolset() {
     if (!this.toolsetPromise) {
@@ -84,6 +75,9 @@ let APIHubToolset = class extends BaseToolset {
     const spec = await this.apihubClient.getSpecContent(
       this.apihubResourceName
     );
+    if (!spec.trim()) {
+      return void 0;
+    }
     const specDict = yaml.load(spec);
     if (!specDict) {
       return void 0;
@@ -93,7 +87,8 @@ let APIHubToolset = class extends BaseToolset {
     return new OpenAPIToolset({
       specDict,
       authScheme: this.authScheme,
-      authCredential: this.authCredential
+      authCredential: this.authCredential,
+      toolFilter: this.toolFilter
     });
   }
 };