@google/adk 2.2.1 → 2.4.0

package/dist/cjs/tools/load_memory_tool.js

@@ -38,11 +38,13 @@ var import_base_tool = require("./base_tool.js");
  * SPDX-License-Identifier: Apache-2.0
  */
 const _LoadMemoryTool = class _LoadMemoryTool extends import_base_tool.BaseTool {
-  constructor() {
+  constructor(options = {}) {
+    var _a;
     super({
       name: "load_memory",
       description: "Loads the memory for the current user.\n\nNOTE: Currently this tool only uses text part from the memory."
     });
+    this.textOnlyContent = (_a = options.textOnlyContent) != null ? _a : false;
   }
   _getDeclaration() {
     return {
@@ -64,12 +66,12 @@ const _LoadMemoryTool = class _LoadMemoryTool extends import_base_tool.BaseTool
     args,
     toolContext
   }) {
-    try {
-      const query = args["query"];
-      if (!toolContext.invocationContext.memoryService) {
-        throw new Error("Memory service is not initialized.");
-      }
-      const searchMemoryResponse = await toolContext.searchMemory(query);
+    const query = args["query"];
+    if (!toolContext.invocationContext.memoryService) {
+      throw new Error("Memory service is not initialized.");
+    }
+    const searchMemoryResponse = await toolContext.searchMemory(query);
+    if (this.textOnlyContent) {
       return {
         memories: searchMemoryResponse.memories.map((m) => {
           var _a, _b;
@@ -84,10 +86,10 @@ const _LoadMemoryTool = class _LoadMemoryTool extends import_base_tool.BaseTool
           };
         })
       };
-    } catch (e) {
-      console.error("ERROR in LoadMemoryTool runAsync:", e);
-      throw e;
     }
+    return {
+      memories: searchMemoryResponse.memories
+    };
   }
   async processLlmRequest(request) {
     await super.processLlmRequest(request);

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

@@ -9,6 +9,10 @@ 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))
@@ -20,7 +24,13 @@ var __copyProps = (to, from, except, desc) => {
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var mcp_exports = {};
+__export(mcp_exports, {
+  genaiSchemaToJsonSchema: () => import_genai_schema_to_json.genaiSchemaToJsonSchema,
+  toGeminiSchema: () => import_gemini_schema_util.toGeminiSchema
+});
 module.exports = __toCommonJS(mcp_exports);
+var import_gemini_schema_util = require("../../utils/gemini_schema_util.js");
+var import_genai_schema_to_json = require("../../utils/genai_schema_to_json.js");
 __reExport(mcp_exports, require("./load_mcp_resource_tool.js"), module.exports);
 __reExport(mcp_exports, require("./mcp_session_manager.js"), module.exports);
 __reExport(mcp_exports, require("./mcp_tool.js"), module.exports);
@@ -32,6 +42,8 @@ __reExport(mcp_exports, require("./mcp_toolset.js"), module.exports);
  */
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  genaiSchemaToJsonSchema,
+  toGeminiSchema,
   ...require("./load_mcp_resource_tool.js"),
   ...require("./mcp_session_manager.js"),
   ...require("./mcp_tool.js"),

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

@@ -67,6 +67,18 @@ function buildTransportOptions(params) {
   };
 }
 __name(buildTransportOptions, "buildTransportOptions");
+function buildSseTransportOptions(params) {
+  const { transportOptions, header, headers } = params;
+  const callerHeaders = (transportOptions == null ? void 0 : transportOptions.requestInit) === void 0 ? header != null ? header : headers : transportOptions.requestInit.headers;
+  return {
+    ...transportOptions,
+    requestInit: {
+      ...transportOptions == null ? void 0 : transportOptions.requestInit,
+      headers: (0, import_client_labels.mergeTrackingHeaders)(callerHeaders)
+    }
+  };
+}
+__name(buildSseTransportOptions, "buildSseTransportOptions");
 const _MCPSessionManager = class _MCPSessionManager {
   constructor(connectionParams) {
     this.activeSessions = /* @__PURE__ */ new Set();
@@ -105,6 +117,19 @@ const _MCPSessionManager = class _MCPSessionManager {
           await client.connect(transport);
           break;
         }
+        case "SseConnectionParams": {
+          const { SSEClientTransport } = await (0, import_optional_peer.loadOptionalPeer)(
+            MCP_SDK,
+            () => Promise.resolve().then(() => __toESM(require("@modelcontextprotocol/sdk/client/sse.js"), 1))
+          );
+          const transport = new SSEClientTransport(
+            new URL(this.connectionParams.url),
+            buildSseTransportOptions(this.connectionParams)
+          );
+          transport.onerror = logTransportError;
+          await client.connect(transport);
+          break;
+        }
         default: {
           const _exhaustiveCheck = this.connectionParams;
           break;

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

@@ -61,20 +61,7 @@ const _MCPToolset = class _MCPToolset extends import_base_toolset.BaseToolset {
       };
       return new import_mcp_tool.MCPTool(toolWithPrefix, this.mcpSessionManager, tool.name);
     });
-    const filter = this.toolFilter;
-    if (!filter || Array.isArray(filter) && filter.length === 0) {
-      return tools;
-    }
-    if (Array.isArray(filter)) {
-      return tools.filter((tool) => filter.includes(tool.name));
-    }
-    if (context) {
-      return tools.filter((tool) => filter(tool, context));
-    }
-    import_logger.logger.warn(
-      "MCPToolset: a ToolPredicate toolFilter was provided but getTools() was called without a ReadonlyContext. The filter will not be applied."
-    );
-    return tools;
+    return tools.filter((tool) => this.isToolSelected(tool, context));
   }
   /**
    * Lists the names of the resources advertised by the MCP server.

package/dist/cjs/tools/openapi_tool/auth/auth_helpers.js

@@ -165,12 +165,11 @@ function bearerJwtScheme() {
 }
 __name(bearerJwtScheme, "bearerJwtScheme");
 function bearerTokenParam(authScheme, token) {
-  var _a;
   const param = {
     originalName: "Authorization",
     paramLocation: "header",
     paramSchema: { type: "string" },
-    description: (_a = authScheme.description) != null ? _a : "Bearer token",
+    description: authScheme.description || "Bearer token",
     name: `${INTERNAL_AUTH_PREFIX}Authorization`,
     required: true
   };

package/dist/cjs/tools/openapi_tool/auth/credential_exchangers/auto_auth_credential_exchanger.js

@@ -37,14 +37,48 @@ __export(auto_auth_credential_exchanger_exports, {
 });
 module.exports = __toCommonJS(auto_auth_credential_exchanger_exports);
 var import_auth_credential = require("../../../../auth/auth_credential.js");
+var import_auth_schemes = require("../../../../auth/auth_schemes.js");
 var import_oauth2_credential_exchanger = require("../../../../auth/oauth2/oauth2_credential_exchanger.js");
 var import_experimental = require("../../../../utils/experimental.js");
+var import_oauth2_exchanger = require("./oauth2_exchanger.js");
 var import_service_account_exchanger = require("./service_account_exchanger.js");
 /**
  * @license
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+function isPendingAuthorizationCode(authScheme, authCredential) {
+  var _a, _b, _c;
+  return !!authScheme && (0, import_oauth2_credential_exchanger.determineGrantType)(authScheme) === import_auth_schemes.OAuthGrantType.AUTHORIZATION_CODE && !((_a = authCredential.oauth2) == null ? void 0 : _a.accessToken) && !((_b = authCredential.oauth2) == null ? void 0 : _b.authCode) && !((_c = authCredential.oauth2) == null ? void 0 : _c.authResponseUri);
+}
+__name(isPendingAuthorizationCode, "isPendingAuthorizationCode");
+function createDefaultOAuth2Exchanger() {
+  const tokenFetcher = new import_oauth2_credential_exchanger.OAuth2CredentialExchanger();
+  return {
+    async exchange(params) {
+      const { authScheme, authCredential } = params;
+      if (authScheme && authCredential.http) {
+        return {
+          credential: authCredential,
+          wasExchanged: false
+        };
+      }
+      if (isPendingAuthorizationCode(authScheme, authCredential)) {
+        return {
+          credential: authCredential,
+          wasExchanged: false
+        };
+      }
+      const { credential, wasExchanged } = await tokenFetcher.exchange(params);
+      const bearer = (0, import_oauth2_exchanger.generateAuthToken)(credential);
+      return {
+        credential: bearer,
+        wasExchanged: wasExchanged || bearer !== credential
+      };
+    }
+  };
+}
+__name(createDefaultOAuth2Exchanger, "createDefaultOAuth2Exchanger");
 let AutoAuthCredentialExchanger = class {
   /**
    * @param customExchangers - Optional exchangers that add to or override the
@@ -52,14 +86,24 @@ let AutoAuthCredentialExchanger = class {
    *   exchanger instance to use for that type.
    */
   constructor(customExchangers) {
+    /**
+     * The exchanger used for each auth credential type.
+     *
+     * By default `OAUTH2` and `OPEN_ID_CONNECT` run
+     * {@link OAuth2CredentialExchanger} and convert any access token with
+     * {@link generateAuthToken}, and `SERVICE_ACCOUNT` maps to a
+     * {@link ServiceAccountCredentialExchanger}, with any custom exchangers from
+     * the constructor merged over them. The map is live: an entry added or
+     * replaced after construction is used by the next {@link exchange} call.
+     */
     this.exchangers = /* @__PURE__ */ new Map();
     this.exchangers.set(
       import_auth_credential.AuthCredentialTypes.OAUTH2,
-      new import_oauth2_credential_exchanger.OAuth2CredentialExchanger()
+      createDefaultOAuth2Exchanger()
     );
     this.exchangers.set(
       import_auth_credential.AuthCredentialTypes.OPEN_ID_CONNECT,
-      new import_oauth2_credential_exchanger.OAuth2CredentialExchanger()
+      createDefaultOAuth2Exchanger()
     );
     this.exchangers.set(
       import_auth_credential.AuthCredentialTypes.SERVICE_ACCOUNT,

package/dist/cjs/tools/openapi_tool/auth/credential_exchangers/oauth2_exchanger.js

@@ -40,6 +40,7 @@ __export(oauth2_exchanger_exports, {
 });
 module.exports = __toCommonJS(oauth2_exchanger_exports);
 var import_auth_credential = require("../../../../auth/auth_credential.js");
+var import_auth_schemes = require("../../../../auth/auth_schemes.js");
 var import_experimental = require("../../../../utils/experimental.js");
 /**
  * @license
@@ -52,7 +53,7 @@ function checkSchemeCredentialType(authScheme, authCredential) {
       "auth_credential is empty. Please create AuthCredential using OAuth2Auth."
     );
   }
-  if (authScheme.type !== "openIdConnect" && authScheme.type !== "oauth2") {
+  if (authScheme.type !== import_auth_schemes.AuthSchemeType.OPEN_ID_CONNECT && authScheme.type !== import_auth_schemes.AuthSchemeType.OAUTH2) {
     throw new Error(
       `Invalid security scheme, expect AuthSchemeType.openIdConnect or AuthSchemeType.oauth2 auth scheme, but got ${authScheme.type}`
     );
@@ -80,12 +81,12 @@ function generateAuthToken(authCredential) {
 }
 __name(generateAuthToken, "generateAuthToken");
 function exchangeCredential(authScheme, authCredential) {
-  var _a, _b;
+  var _a;
   checkSchemeCredentialType(authScheme, authCredential);
   if (authCredential.http) {
     return authCredential;
   }
-  if (((_a = authCredential.oauth2) == null ? void 0 : _a.accessToken) || ((_b = authCredential.oauth2) == null ? void 0 : _b.refreshToken)) {
+  if ((_a = authCredential.oauth2) == null ? void 0 : _a.accessToken) {
     return generateAuthToken(authCredential);
   }
   return null;

package/dist/cjs/tools/openapi_tool/auth/credential_exchangers/service_account_exchanger.js

@@ -37,6 +37,7 @@ __export(service_account_exchanger_exports, {
 });
 module.exports = __toCommonJS(service_account_exchanger_exports);
 var import_google_auth_library = require("google-auth-library");
+var import_node_crypto = require("node:crypto");
 var import_auth_credential = require("../../../../auth/auth_credential.js");
 var import_experimental = require("../../../../utils/experimental.js");
 var import_base_auth_credential_exchanger = require("./base_auth_credential_exchanger.js");
@@ -47,6 +48,83 @@ var import_base_auth_credential_exchanger = require("./base_auth_credential_exch
  */
 const DEFAULT_SCOPES = ["https://www.googleapis.com/auth/cloud-platform"];
 const MISSING_SERVICE_ACCOUNT_CREDENTIALS = "Service account credentials are missing. Please provide them, or set `useDefaultCredential: true` to use application default credentials in a hosted service like Cloud Run.";
+const GOOGLE_TOKEN_URI = "https://oauth2.googleapis.com/token";
+const JWT_BEARER_GRANT_TYPE = "urn:ietf:params:oauth:grant-type:jwt-bearer";
+const ASSERTION_LIFETIME_SECONDS = 3600;
+const TOKEN_REQUEST_TIMEOUT_MS = 3e4;
+function hasCustomTokenUri(creds) {
+  return !!creds.tokenUri && creds.tokenUri !== GOOGLE_TOKEN_URI;
+}
+__name(hasCustomTokenUri, "hasCustomTokenUri");
+function base64UrlJson(value) {
+  return Buffer.from(JSON.stringify(value)).toString("base64url");
+}
+__name(base64UrlJson, "base64UrlJson");
+function signJwtBearerAssertion(creds, scopes, issuedAt) {
+  const header = {
+    alg: "RS256",
+    typ: "JWT",
+    ...creds.privateKeyId ? { kid: creds.privateKeyId } : {}
+  };
+  const payload = {
+    iss: creds.clientEmail,
+    scope: scopes.join(" "),
+    aud: GOOGLE_TOKEN_URI,
+    iat: issuedAt,
+    exp: issuedAt + ASSERTION_LIFETIME_SECONDS
+  };
+  const signingInput = `${base64UrlJson(header)}.${base64UrlJson(payload)}`;
+  const signature = (0, import_node_crypto.createSign)("RSA-SHA256").update(signingInput).sign(creds.privateKey, "base64url");
+  return `${signingInput}.${signature}`;
+}
+__name(signJwtBearerAssertion, "signJwtBearerAssertion");
+async function readTokenErrorDetail(response) {
+  try {
+    const body = await response.json();
+    if (typeof body !== "object" || body === null) {
+      return void 0;
+    }
+    const parts = [];
+    if ("error" in body && typeof body.error === "string" && body.error.length > 0) {
+      parts.push(body.error);
+    }
+    if ("error_description" in body && typeof body.error_description === "string" && body.error_description.length > 0) {
+      parts.push(body.error_description);
+    }
+    return parts.length > 0 ? parts.join(": ") : void 0;
+  } catch {
+    return void 0;
+  }
+}
+__name(readTokenErrorDetail, "readTokenErrorDetail");
+async function requestJwtBearerToken(creds, scopes) {
+  const assertion = signJwtBearerAssertion(
+    creds,
+    scopes,
+    Math.floor(Date.now() / 1e3)
+  );
+  const response = await fetch(creds.tokenUri, {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body: new URLSearchParams({
+      grant_type: JWT_BEARER_GRANT_TYPE,
+      assertion
+    }),
+    signal: AbortSignal.timeout(TOKEN_REQUEST_TIMEOUT_MS)
+  });
+  if (!response.ok) {
+    const detail = await readTokenErrorDetail(response);
+    throw new Error(
+      detail ? `Token endpoint responded with HTTP ${response.status}: ${detail}` : `Token endpoint responded with HTTP ${response.status}`
+    );
+  }
+  const body = await response.json();
+  if (typeof body === "object" && body !== null && "access_token" in body && typeof body.access_token === "string") {
+    return body.access_token;
+  }
+  return void 0;
+}
+__name(requestJwtBearerToken, "requestJwtBearerToken");
 let ServiceAccountCredentialExchanger = class {
   async exchange(params) {
     const { authCredential } = params;
@@ -87,21 +165,27 @@ let ServiceAccountCredentialExchanger = class {
     }
   }
   async exchangeForExplicitCredential(saConfig) {
+    var _a;
     const creds = saConfig.serviceAccountCredential;
     if (!creds) {
       throw new import_base_auth_credential_exchanger.AuthCredentialMissingError(MISSING_SERVICE_ACCOUNT_CREDENTIALS);
     }
     try {
-      const client = new import_google_auth_library.JWT({
-        email: creds.clientEmail,
-        key: creds.privateKey,
-        keyId: creds.privateKeyId,
-        projectId: creds.projectId,
-        universeDomain: creds.universeDomain,
-        scopes: saConfig.scopes
-      });
-      const tokens = await client.authorize();
-      const token = tokens.access_token;
+      let token;
+      if (hasCustomTokenUri(creds)) {
+        token = await requestJwtBearerToken(creds, (_a = saConfig.scopes) != null ? _a : []);
+      } else {
+        const client = new import_google_auth_library.JWT({
+          email: creds.clientEmail,
+          key: creds.privateKey,
+          keyId: creds.privateKeyId,
+          projectId: creds.projectId,
+          universeDomain: creds.universeDomain,
+          scopes: saConfig.scopes
+        });
+        const tokens = await client.authorize();
+        token = tokens.access_token;
+      }
       if (!token) {
         throw new Error("Failed to get access token from explicit credentials");
       }

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

@@ -54,15 +54,27 @@ const VALID_SCHEMA_TYPES = /* @__PURE__ */ new Set([
   "string"
 ]);
 let OpenApiSpecParser = class {
+  /**
+   * @param options.preservePropertyNames Keeps the original parameter and
+   *     function names instead of converting them to snake_case.
+   * @param options.unconstrainedObjectBodyAsParameter Emits a whole-body
+   *     parameter named `body` when an object request body schema has no
+   *     properties. Defaults to `false`.
+   *     @deprecated Retained for backwards compatibility; empty object schemas
+   *     produce no parameters by default. This option will be removed in a
+   *     future release.
+   */
   constructor(options = {}) {
-    var _a;
+    var _a, _b;
     this.preservePropertyNames = (_a = options.preservePropertyNames) != null ? _a : false;
+    this.unconstrainedObjectBodyAsParameter = (_b = options.unconstrainedObjectBodyAsParameter) != null ? _b : false;
   }
   parse(openapiSpec) {
     const resolvedSpec = resolveReferences(openapiSpec);
     const sanitizedSpec = sanitizeSchemaTypes(resolvedSpec);
     return collectOperations(sanitizedSpec, {
-      preservePropertyNames: this.preservePropertyNames
+      preservePropertyNames: this.preservePropertyNames,
+      unconstrainedObjectBodyAsParameter: this.unconstrainedObjectBodyAsParameter
     });
   }
 };
@@ -197,17 +209,18 @@ function resolveServerUrl(server) {
 }
 __name(resolveServerUrl, "resolveServerUrl");
 function collectOperations(spec, options = {}) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const preservePropertyNames = (_a = options.preservePropertyNames) != null ? _a : false;
+  const unconstrainedObjectBodyAsParameter = (_b = options.unconstrainedObjectBodyAsParameter) != null ? _b : false;
   const operations = [];
-  const server = (_b = spec.servers) == null ? void 0 : _b[0];
+  const server = (_c = spec.servers) == null ? void 0 : _c[0];
   const baseUrl = server ? resolveServerUrl(server) : "";
   const globalSecurity = spec.security || [];
   let globalSchemeName;
   if (globalSecurity.length > 0) {
     globalSchemeName = Object.keys(globalSecurity[0])[0];
   }
-  const authSchemes = ((_c = spec.components) == null ? void 0 : _c.securitySchemes) || {};
+  const authSchemes = ((_d = spec.components) == null ? void 0 : _d.securitySchemes) || {};
   for (const [path, pathItem] of Object.entries(spec.paths || {})) {
     if (!pathItem) continue;
     const methods = [
@@ -230,7 +243,8 @@ function collectOperations(spec, options = {}) {
         operation.operationId = (0, import_case_utils.toSnakeCaseName)(`${path}_${method}`);
       }
       const parser = new import_operation_parser.OperationParser(operation, {
-        preservePropertyNames
+        preservePropertyNames,
+        unconstrainedObjectBodyAsParameter
       });
       let authSchemeName;
       if (operation.security && operation.security.length > 0) {

package/dist/cjs/tools/openapi_tool/openapi_spec_parser/operation_parser.js

@@ -52,13 +52,20 @@ let OperationParser = class {
    *     function names instead of converting them to snake_case.
    * @param options.shouldParse Whether to parse the operation during
    *     construction. Defaults to `true`.
+   * @param options.unconstrainedObjectBodyAsParameter Emits a whole-body
+   *     parameter named `body` when an object request body schema has no
+   *     properties. Defaults to `false`.
+   *     @deprecated Retained for backwards compatibility; empty object schemas
+   *     produce no parameters by default. This option will be removed in a
+   *     future release.
    */
   constructor(operation, options = {}) {
     this.params = [];
-    var _a, _b;
+    var _a, _b, _c;
     this.operation = typeof operation === "string" ? JSON.parse(operation) : operation;
     this.preservePropertyNames = (_a = options.preservePropertyNames) != null ? _a : false;
-    if ((_b = options.shouldParse) != null ? _b : true) {
+    this.unconstrainedObjectBodyAsParameter = (_b = options.unconstrainedObjectBodyAsParameter) != null ? _b : false;
+    if ((_c = options.shouldParse) != null ? _c : true) {
       this.processOperationParameters();
       this.processRequestBody();
       this.returnValue = this.processReturnValue();
@@ -78,6 +85,7 @@ let OperationParser = class {
     return (0, import_case_utils.renameReservedKeywords)((0, import_case_utils.toSnakeCaseName)(originalName));
   }
   processOperationParameters() {
+    var _a;
     const parameters = this.operation.parameters || [];
     for (const param of parameters) {
       if ("name" in param) {
@@ -88,9 +96,12 @@ let OperationParser = class {
         this.params.push({
           originalName,
           paramLocation: location,
-          paramSchema: schema,
+          paramSchema: {
+            ...schema,
+            description: schema.description || description || void 0
+          },
           description,
-          required: param.required || false,
+          required: (_a = param.required) != null ? _a : false,
           name: this.getParamName(originalName)
         });
       }
@@ -126,7 +137,7 @@ let OperationParser = class {
               });
             }
           }
-        } else {
+        } else if (this.unconstrainedObjectBodyAsParameter) {
           this.params.push({
             originalName: "",
             paramLocation: "body",
@@ -147,7 +158,7 @@ let OperationParser = class {
         });
       } else {
         this.params.push({
-          originalName: "body",
+          originalName: "",
           paramLocation: "body",
           paramSchema: schema,
           description,

package/dist/cjs/tools/openapi_tool/openapi_spec_parser/tool_auth_handler.js

@@ -50,6 +50,16 @@ var import_base_auth_credential_exchanger = require("../auth/credential_exchange
  * SPDX-License-Identifier: Apache-2.0
  */
 const DEFAULT_CREDENTIAL_KEY = "default_openapi_key";
+const INTERACTIVE_CREDENTIAL_TYPES = /* @__PURE__ */ new Set([
+  import_auth_credential.AuthCredentialTypes.OAUTH2,
+  import_auth_credential.AuthCredentialTypes.OPEN_ID_CONNECT
+]);
+function isMissingInteractiveToken(result) {
+  var _a, _b;
+  const { credential, wasExchanged } = result;
+  return !wasExchanged && INTERACTIVE_CREDENTIAL_TYPES.has(credential.authType) && !credential.http && !((_a = credential.oauth2) == null ? void 0 : _a.accessToken) && !((_b = credential.oauth2) == null ? void 0 : _b.refreshToken);
+}
+__name(isMissingInteractiveToken, "isMissingInteractiveToken");
 const _ToolContextCredentialStore = class _ToolContextCredentialStore {
   constructor(context) {
     this.context = context;
@@ -165,7 +175,8 @@ let ToolAuthHandler = class {
     };
   }
   /**
-   * Exchanges `credential`, or returns `undefined` when the exchange failed.
+   * Exchanges `credential`, or returns `undefined` when the exchange failed or
+   * produced an interactive credential that still holds no token.
    *
    * An exchange failure is transient far more often than it is fatal, so it
    * becomes a `pending` result the client can resume from rather than an
@@ -175,10 +186,11 @@ let ToolAuthHandler = class {
     var _a;
     const exchanger = (_a = this.credentialExchanger) != null ? _a : new import_auto_auth_credential_exchanger.AutoAuthCredentialExchanger();
     try {
-      return await exchanger.exchange({
+      const result = await exchanger.exchange({
         authScheme: this.authScheme,
         authCredential: credential
       });
+      return isMissingInteractiveToken(result) ? void 0 : result;
     } catch (e) {
       import_logger.logger.error(
         `Failed to exchange credential: ${e instanceof Error ? e.message : e}`

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

@@ -46,7 +46,7 @@ __export(openapi_toolset_exports, {
   OpenAPIToolset: () => OpenAPIToolset
 });
 module.exports = __toCommonJS(openapi_toolset_exports);
-var import_js_yaml = __toESM(require("js-yaml"), 1);
+var yaml = __toESM(require("js-yaml"), 1);
 var import_experimental = require("../../utils/experimental.js");
 var import_logger = require("../../utils/logger.js");
 var import_base_toolset = require("../base_toolset.js");
@@ -64,7 +64,7 @@ let OpenAPIToolset = class extends import_base_toolset.BaseToolset {
     let spec = options.specDict;
     if (!spec && options.specStr) {
       if (options.specType === "yaml" || !options.specType && options.specStr.trim().startsWith("---")) {
-        spec = import_js_yaml.default.load(options.specStr);
+        spec = yaml.load(options.specStr);
       } else if (options.specType === "json" || !options.specType) {
         spec = JSON.parse(options.specStr);
       } else {
@@ -75,7 +75,8 @@ let OpenAPIToolset = class extends import_base_toolset.BaseToolset {
       throw new Error("Either specDict or specStr must be provided.");
     }
     const parser = new import_openapi_spec_parser.OpenApiSpecParser({
-      preservePropertyNames: options.preservePropertyNames
+      preservePropertyNames: options.preservePropertyNames,
+      unconstrainedObjectBodyAsParameter: options.unconstrainedObjectBodyAsParameter
     });
     const parsedOperations = parser.parse(spec);
     for (const op of parsedOperations) {
@@ -96,7 +97,8 @@ let OpenAPIToolset = class extends import_base_toolset.BaseToolset {
         {
           preservePropertyNames: options.preservePropertyNames,
           headerProvider: options.headerProvider,
-          credentialKey: options.credentialKey
+          credentialKey: options.credentialKey,
+          unconstrainedObjectBodyAsParameter: options.unconstrainedObjectBodyAsParameter
         }
       );
       this.tools.push(tool);
@@ -111,15 +113,7 @@ let OpenAPIToolset = class extends import_base_toolset.BaseToolset {
     }
   }
   async getTools(context) {
-    return this.tools.filter((tool) => {
-      if (Array.isArray(this.toolFilter) && this.toolFilter.length > 0) {
-        return this.toolFilter.includes(tool.name);
-      }
-      if (context) {
-        return this.isToolSelected(tool, context);
-      }
-      return true;
-    });
+    return this.tools.filter((tool) => this.isToolSelected(tool, context));
   }
   getTool(toolName) {
     return this.tools.find((tool) => tool.name === toolName);

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

@@ -203,6 +203,22 @@ function encodePathParamValue(name, value) {
   return encodeURIComponent(value);
 }
 __name(encodePathParamValue, "encodePathParamValue");
+function serializeQueryValue(value) {
+  return typeof value === "object" && value !== null ? JSON.stringify(value) : String(value);
+}
+__name(serializeQueryValue, "serializeQueryValue");
+function appendQueryParam(queryParams, name, value) {
+  if (!Array.isArray(value)) {
+    queryParams.append(name, serializeQueryValue(value));
+    return;
+  }
+  for (const item of value) {
+    if (item !== void 0 && item !== null) {
+      queryParams.append(name, serializeQueryValue(item));
+    }
+  }
+}
+__name(appendQueryParam, "appendQueryParam");
 function prepareRequestParams(endpoint, parameters, args) {
   const headers = {};
   const queryParams = new URLSearchParams();
@@ -223,7 +239,7 @@ function prepareRequestParams(endpoint, parameters, args) {
       );
     } else if (location === "query") {
       if (argValue !== void 0 && argValue !== null && argValue !== "") {
-        queryParams.append(originalName, String(argValue));
+        appendQueryParam(queryParams, originalName, argValue);
       }
     } else if (location === "header") {
       headers[originalName] = String(argValue);