@softactivate/adk 1.1.0 → 1.2.0

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

@@ -53,13 +53,16 @@ class MCPTool extends import_base_tool.BaseTool {
   }
   async runAsync(request) {
     const session = await this.mcpSessionManager.createSession();
-    const callRequest = {};
-    callRequest.params = { name: this.originalName, arguments: request.args };
-    const result = await session.callTool(callRequest.params, void 0, {
-      signal: request.toolContext.abortSignal
-    });
-    await session.close();
-    return result;
+    try {
+      const callRequest = {};
+      callRequest.params = { name: this.originalName, arguments: request.args };
+      const result = await session.callTool(callRequest.params, void 0, {
+        signal: request.toolContext.abortSignal
+      });
+      return result;
+    } finally {
+      await this.mcpSessionManager.closeSession(session);
+    }
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -43,8 +43,12 @@ class MCPToolset extends import_base_toolset.BaseToolset {
   }
   async getTools(context) {
     const session = await this.mcpSessionManager.createSession();
-    const listResult = await session.listTools();
-    await session.close();
+    let listResult;
+    try {
+      listResult = await session.listTools();
+    } finally {
+      await this.mcpSessionManager.closeSession(session);
+    }
     import_logger.logger.debug(`number of tools: ${listResult.tools.length}`);
     for (const tool of listResult.tools) {
       import_logger.logger.debug(`tool: ${tool.name}`);
@@ -72,6 +76,10 @@ class MCPToolset extends import_base_toolset.BaseToolset {
     return tools;
   }
   async close() {
+    const sessions = this.mcpSessionManager.getActiveSessions();
+    await Promise.allSettled(
+      sessions.map((session) => this.mcpSessionManager.closeSession(session))
+    );
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -0,0 +1,78 @@
+/**
+  * @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 auth_helpers_exports = {};
+__export(auth_helpers_exports, {
+  applyCredential: () => applyCredential,
+  createApiKeyScheme: () => createApiKeyScheme,
+  createBearerScheme: () => createBearerScheme
+});
+module.exports = __toCommonJS(auth_helpers_exports);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+function applyCredential(url, headers, credential, authScheme) {
+  if (!credential) return url;
+  if (credential.apiKey) {
+    let inLocation;
+    let name = "key";
+    if (authScheme && authScheme.type === "apiKey") {
+      const apiKeyScheme = authScheme;
+      inLocation = apiKeyScheme.in;
+      name = apiKeyScheme.name;
+    }
+    if (inLocation === "header") {
+      headers[name] = credential.apiKey;
+    } else if (inLocation === "query") {
+      const separator = url.includes("?") ? "&" : "?";
+      url += `${separator}${name}=${encodeURIComponent(credential.apiKey)}`;
+    } else {
+      headers["Authorization"] = credential.apiKey;
+    }
+  } else if (credential.http && credential.http.credentials && credential.http.credentials.token) {
+    headers["Authorization"] = `Bearer ${credential.http.credentials.token}`;
+  }
+  return url;
+}
+function createApiKeyScheme(name, inLocation) {
+  return {
+    type: "apiKey",
+    name,
+    in: inLocation
+  };
+}
+function createBearerScheme() {
+  return {
+    type: "http",
+    scheme: "bearer"
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  applyCredential,
+  createApiKeyScheme,
+  createBearerScheme
+});

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

@@ -0,0 +1,84 @@
+/**
+  * @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 __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 auto_auth_credential_exchanger_exports = {};
+__export(auto_auth_credential_exchanger_exports, {
+  AutoAuthCredentialExchanger: () => AutoAuthCredentialExchanger
+});
+module.exports = __toCommonJS(auto_auth_credential_exchanger_exports);
+var import_auth_credential = require("../../../../auth/auth_credential.js");
+var import_oauth2_credential_exchanger = require("../../../../auth/oauth2/oauth2_credential_exchanger.js");
+var import_experimental = require("../../../../utils/experimental.js");
+var import_service_account_exchanger = require("./service_account_exchanger.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+let AutoAuthCredentialExchanger = class {
+  constructor() {
+    this.exchangers = /* @__PURE__ */ new Map();
+    this.exchangers.set(
+      import_auth_credential.AuthCredentialTypes.OAUTH2,
+      new import_oauth2_credential_exchanger.OAuth2CredentialExchanger()
+    );
+    this.exchangers.set(
+      import_auth_credential.AuthCredentialTypes.OPEN_ID_CONNECT,
+      new import_oauth2_credential_exchanger.OAuth2CredentialExchanger()
+    );
+    this.exchangers.set(
+      import_auth_credential.AuthCredentialTypes.SERVICE_ACCOUNT,
+      new import_service_account_exchanger.ServiceAccountCredentialExchanger()
+    );
+  }
+  async exchange(params) {
+    const { authCredential, authScheme } = params;
+    const exchanger = this.exchangers.get(authCredential.authType);
+    if (!exchanger) {
+      return {
+        credential: authCredential,
+        wasExchanged: false
+      };
+    }
+    return exchanger.exchange({ authScheme, authCredential });
+  }
+};
+__decorateClass([
+  import_experimental.experimental
+], AutoAuthCredentialExchanger.prototype, "exchange", 1);
+AutoAuthCredentialExchanger = __decorateClass([
+  import_experimental.experimental
+], AutoAuthCredentialExchanger);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  AutoAuthCredentialExchanger
+});

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

@@ -0,0 +1,133 @@
+/**
+  * @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 __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 service_account_exchanger_exports = {};
+__export(service_account_exchanger_exports, {
+  ServiceAccountCredentialExchanger: () => ServiceAccountCredentialExchanger
+});
+module.exports = __toCommonJS(service_account_exchanger_exports);
+var import_google_auth_library = require("google-auth-library");
+var import_auth_credential = require("../../../../auth/auth_credential.js");
+var import_base_credential_exchanger = require("../../../../auth/exchanger/base_credential_exchanger.js");
+var import_experimental = require("../../../../utils/experimental.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const DEFAULT_SCOPES = ["https://www.googleapis.com/auth/cloud-platform"];
+let ServiceAccountCredentialExchanger = class {
+  async exchange(params) {
+    const { authCredential } = params;
+    if (authCredential.authType !== import_auth_credential.AuthCredentialTypes.SERVICE_ACCOUNT || !authCredential.serviceAccount) {
+      throw new import_base_credential_exchanger.CredentialExchangeError(
+        "Invalid credential type for ServiceAccountCredentialExchanger"
+      );
+    }
+    const saConfig = authCredential.serviceAccount;
+    if (saConfig.useDefaultCredential) {
+      return this.exchangeForDefaultCredential(saConfig);
+    }
+    return this.exchangeForExplicitCredential(saConfig);
+  }
+  async exchangeForDefaultCredential(saConfig) {
+    try {
+      const auth = new import_google_auth_library.GoogleAuth({
+        scopes: saConfig.scopes || DEFAULT_SCOPES
+      });
+      const client = await auth.getClient();
+      const tokenResponse = await client.getAccessToken();
+      const token = tokenResponse.token;
+      if (!token) {
+        throw new Error("Failed to get access token from default credentials");
+      }
+      return {
+        credential: {
+          authType: import_auth_credential.AuthCredentialTypes.HTTP,
+          http: {
+            scheme: "bearer",
+            credentials: { token }
+          }
+        },
+        wasExchanged: true
+      };
+    } catch (error) {
+      throw new import_base_credential_exchanger.CredentialExchangeError(
+        `Failed to exchange default service account token: ${error.message}`
+      );
+    }
+  }
+  async exchangeForExplicitCredential(saConfig) {
+    const creds = saConfig.serviceAccountCredential;
+    if (!creds) {
+      throw new import_base_credential_exchanger.CredentialExchangeError(
+        "Service account credentials are missing."
+      );
+    }
+    try {
+      const client = new import_google_auth_library.JWT({
+        email: creds.clientEmail,
+        key: creds.privateKey,
+        scopes: saConfig.scopes
+      });
+      const tokens = await client.authorize();
+      const token = tokens.access_token;
+      if (!token) {
+        throw new Error("Failed to get access token from explicit credentials");
+      }
+      return {
+        credential: {
+          authType: import_auth_credential.AuthCredentialTypes.HTTP,
+          http: {
+            scheme: "bearer",
+            credentials: { token }
+          }
+        },
+        wasExchanged: true
+      };
+    } catch (error) {
+      throw new import_base_credential_exchanger.CredentialExchangeError(
+        `Failed to exchange explicit service account token: ${error.message}`
+      );
+    }
+  }
+};
+__decorateClass([
+  import_experimental.experimental
+], ServiceAccountCredentialExchanger.prototype, "exchange", 1);
+ServiceAccountCredentialExchanger = __decorateClass([
+  import_experimental.experimental
+], ServiceAccountCredentialExchanger);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ServiceAccountCredentialExchanger
+});

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

@@ -48,6 +48,7 @@ module.exports = __toCommonJS(load_skill_resource_tool_exports);
 var import_genai = require("@google/genai");
 var import_node_path = __toESM(require("node:path"), 1);
 var import_experimental = require("../../utils/experimental.js");
+var import_file_utils = require("../../utils/file_utils.js");
 var import_base_tool = require("../base_tool.js");
 /**
  * @license
@@ -55,30 +56,6 @@ var import_base_tool = require("../base_tool.js");
  * SPDX-License-Identifier: Apache-2.0
  */
 const BINARY_FILE_DETECTED_MSG = "Binary file detected. The content has been injected into the conversation history for you to analyze.";
-const EXTENSION_TO_MIME_TYPE = {
-  "pdf": "application/pdf",
-  "jpg": "image/jpeg",
-  "jpeg": "image/jpeg",
-  "png": "image/png",
-  "gif": "image/gif",
-  "csv": "text/csv",
-  "json": "application/json",
-  "xml": "application/xml",
-  "sh": "text/x-shellscript",
-  "bash": "text/x-shellscript",
-  "py": "text/x-python",
-  "js": "text/javascript",
-  "cjs": "text/javascript",
-  "mjs": "text/javascript",
-  "ts": "text/javascript",
-  "cts": "text/javascript",
-  "mts": "text/javascript"
-};
-function guessMimeType(filePath) {
-  var _a;
-  const ext = ((_a = filePath.split(".").pop()) == null ? void 0 : _a.toLowerCase()) || "";
-  return EXTENSION_TO_MIME_TYPE[ext] || "application/octet-stream";
-}
 let LoadSkillResourceTool = class extends import_base_tool.BaseTool {
   constructor(toolset) {
     super({
@@ -197,7 +174,7 @@ let LoadSkillResourceTool = class extends import_base_tool.BaseTool {
             content = (_b = skillResources.assets) == null ? void 0 : _b[resourcePath.substring("assets/".length)];
           }
           if (Buffer.isBuffer(content)) {
-            const mimeType = guessMimeType(resourcePath);
+            const mimeType = (0, import_file_utils.guessMimeType)(resourcePath);
             llmRequest.contents.push({
               role: "user",
               parts: [

package/dist/cjs/utils/file_utils.js

@@ -34,6 +34,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var file_utils_exports = {};
 __export(file_utils_exports, {
+  EXTENSION_TO_MIME_TYPE: () => EXTENSION_TO_MIME_TYPE,
+  guessMimeType: () => guessMimeType,
   materializeFiles: () => materializeFiles
 });
 module.exports = __toCommonJS(file_utils_exports);
@@ -88,7 +90,33 @@ async function materializeFiles(files, dir = process.cwd()) {
   }
   return createdFiles;
 }
+const EXTENSION_TO_MIME_TYPE = {
+  "pdf": "application/pdf",
+  "jpg": "image/jpeg",
+  "jpeg": "image/jpeg",
+  "png": "image/png",
+  "gif": "image/gif",
+  "csv": "text/csv",
+  "json": "application/json",
+  "xml": "application/xml",
+  "sh": "text/x-shellscript",
+  "bash": "text/x-shellscript",
+  "py": "text/x-python",
+  "js": "text/javascript",
+  "cjs": "text/javascript",
+  "mjs": "text/javascript",
+  "ts": "text/javascript",
+  "cts": "text/javascript",
+  "mts": "text/javascript"
+};
+function guessMimeType(filePath) {
+  var _a;
+  const ext = ((_a = filePath.split(".").pop()) == null ? void 0 : _a.toLowerCase()) || "";
+  return EXTENSION_TO_MIME_TYPE[ext] || "application/octet-stream";
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  EXTENSION_TO_MIME_TYPE,
+  guessMimeType,
   materializeFiles
 });

package/dist/cjs/utils/gemini_schema_util.js

@@ -108,6 +108,21 @@ function toGeminiSchema(mcpSchema) {
         mcp.type = "array";
       } else if (isNullable) {
         mcp.type = "null";
+      } else if (mcp.enum) {
+        const enumTypes = new Set(mcp.enum.map((v) => typeof v));
+        if (enumTypes.size === 1) {
+          const jsType = [...enumTypes][0];
+          if (jsType === "string") mcp.type = "string";
+          else if (jsType === "number") mcp.type = "number";
+          else if (jsType === "boolean") mcp.type = "boolean";
+        }
+      } else if (mcp.const !== void 0) {
+        const jsType = typeof mcp.const;
+        let inferredType;
+        if (jsType === "string") inferredType = "string";
+        else if (jsType === "number") inferredType = "number";
+        else if (jsType === "boolean") inferredType = "boolean";
+        mcp = { ...mcp, type: inferredType, enum: [mcp.const] };
       }
     }
     const geminiType = toGeminiType(mcp.type);
@@ -122,6 +137,9 @@ function toGeminiSchema(mcpSchema) {
     if (mcp.description) {
       geminiSchema.description = mcp.description;
     }
+    if (mcp.enum) {
+      geminiSchema.enum = mcp.enum.map(String);
+    }
     if (isNullable && mcp.type !== "null") {
       geminiSchema.nullable = true;
     }

package/dist/cjs/utils/partial_copy.js

@@ -0,0 +1,51 @@
+/**
+  * @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 partial_copy_exports = {};
+__export(partial_copy_exports, {
+  partialCopy: () => partialCopy
+});
+module.exports = __toCommonJS(partial_copy_exports);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+function partialCopy(source, targetKeys) {
+  const result = {};
+  const sourceAsUnknown = source;
+  targetKeys.forEach((key) => {
+    const keyStr = key;
+    if (keyStr in source) {
+      result[key] = sourceAsUnknown[keyStr];
+    } else {
+      result[key] = void 0;
+    }
+  });
+  return result;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  partialCopy
+});