@google/adk 1.1.0 → 1.3.0

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

@@ -0,0 +1,133 @@
+/**
+  * @license
+  * Copyright 2026 Google LLC
+  * SPDX-License-Identifier: Apache-2.0
+  */
+
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __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 openapi_toolset_exports = {};
+__export(openapi_toolset_exports, {
+  OpenAPIToolset: () => OpenAPIToolset
+});
+module.exports = __toCommonJS(openapi_toolset_exports);
+var import_js_yaml = __toESM(require("js-yaml"), 1);
+var import_experimental = require("../../utils/experimental.js");
+var import_base_toolset = require("../base_toolset.js");
+var import_openapi_spec_parser = require("./openapi_spec_parser/openapi_spec_parser.js");
+var import_rest_api_tool = require("./rest_api_tool.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+let OpenAPIToolset = class extends import_base_toolset.BaseToolset {
+  constructor(options = {}) {
+    super(options.toolFilter || [], options.prefix);
+    this.tools = [];
+    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);
+      } else {
+        spec = JSON.parse(options.specStr);
+      }
+    }
+    if (!spec) {
+      throw new Error("Either specDict or specStr must be provided.");
+    }
+    const parser = new import_openapi_spec_parser.OpenApiSpecParser({
+      preservePropertyNames: options.preservePropertyNames
+    });
+    const parsedOperations = parser.parse(spec);
+    for (const op of parsedOperations) {
+      let toolName = op.name;
+      if (this.prefix) {
+        toolName = `${this.prefix}_${toolName}`;
+      }
+      const tool = (0, import_rest_api_tool.createRestApiTool)(
+        {
+          name: toolName,
+          description: op.description,
+          endpoint: op.endpoint,
+          operation: op.operation,
+          authScheme: op.authScheme
+        },
+        {
+          preservePropertyNames: options.preservePropertyNames,
+          headerProvider: options.headerProvider,
+          credentialKey: options.credentialKey
+        }
+      );
+      this.tools.push(tool);
+    }
+    if (options.authScheme || options.authCredential) {
+      for (const tool of this.tools) {
+        if (options.authScheme) tool.configureAuthScheme(options.authScheme);
+        if (options.authCredential)
+          tool.configureAuthCredential(options.authCredential);
+      }
+    }
+  }
+  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;
+    });
+  }
+  async close() {
+    return Promise.resolve();
+  }
+};
+__decorateClass([
+  import_experimental.experimental
+], OpenAPIToolset.prototype, "getTools", 1);
+__decorateClass([
+  import_experimental.experimental
+], OpenAPIToolset.prototype, "close", 1);
+OpenAPIToolset = __decorateClass([
+  import_experimental.experimental
+], OpenAPIToolset);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  OpenAPIToolset
+});

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

@@ -0,0 +1,256 @@
+/**
+  * @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 rest_api_tool_exports = {};
+__export(rest_api_tool_exports, {
+  RestApiTool: () => RestApiTool,
+  createRestApiTool: () => createRestApiTool,
+  prepareRequestBody: () => prepareRequestBody,
+  prepareRequestParams: () => prepareRequestParams
+});
+module.exports = __toCommonJS(rest_api_tool_exports);
+var import_experimental = require("../../utils/experimental.js");
+var import_base_tool = require("../base_tool.js");
+var import_auth_helpers = require("./auth/auth_helpers.js");
+var import_operation_parser = require("./openapi_spec_parser/operation_parser.js");
+var import_tool_auth_handler = require("./openapi_spec_parser/tool_auth_handler.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+let RestApiTool = class extends import_base_tool.BaseTool {
+  constructor(name, description, endpoint, operation, authScheme, authCredential, options = {}) {
+    super({ name, description });
+    this.endpoint = endpoint;
+    this.operation = operation;
+    this.authScheme = authScheme;
+    this.authCredential = authCredential;
+    this.authScheme = authScheme;
+    this.authCredential = authCredential;
+    this.headerProvider = options.headerProvider;
+    this.credentialKey = options.credentialKey;
+    this.operationParser = new import_operation_parser.OperationParser(operation, options);
+  }
+  configureAuthScheme(authScheme) {
+    this.authScheme = authScheme;
+  }
+  configureAuthCredential(authCredential) {
+    this.authCredential = authCredential;
+  }
+  configureCredentialKey(credentialKey) {
+    this.credentialKey = credentialKey;
+  }
+  _getDeclaration() {
+    const schema = this.operationParser.getJsonSchema();
+    return {
+      name: this.name,
+      description: this.description,
+      parameters: schema
+    };
+  }
+  async runAsync(request) {
+    const context = request.toolContext;
+    const args = request.args;
+    const authHandler = import_tool_auth_handler.ToolAuthHandler.fromToolContext(
+      context,
+      this.authScheme,
+      this.authCredential,
+      { credentialKey: this.credentialKey }
+    );
+    const authResult = await authHandler.prepareAuthCredentials();
+    if (authResult.state === "pending") {
+      return {
+        pending: true,
+        message: "Needs your authorization to access your data."
+      };
+    }
+    const credential = authResult.authCredential;
+    const method = this.endpoint.method.toUpperCase();
+    const {
+      url: initialUrl,
+      headers,
+      body: parsedBody,
+      bodyData
+    } = prepareRequestParams(
+      this.endpoint,
+      this.operationParser.getParameters(),
+      args
+    );
+    const body = prepareRequestBody(
+      this.operation.requestBody,
+      parsedBody,
+      bodyData,
+      headers
+    );
+    const url = (0, import_auth_helpers.applyCredential)(
+      initialUrl,
+      headers,
+      credential,
+      this.authScheme
+    );
+    if (this.headerProvider) {
+      const providerHeaders = this.headerProvider(context);
+      Object.assign(headers, providerHeaders);
+    }
+    try {
+      const response = await globalThis.fetch(url, {
+        method,
+        headers,
+        // eslint-disable-next-line no-undef
+        body
+      });
+      const contentType = response.headers.get("content-type");
+      if (contentType && contentType.includes("application/json")) {
+        return await response.json();
+      } else {
+        return await response.text();
+      }
+    } catch (error) {
+      return {
+        error: `Failed to execute API call: ${error.message}`
+      };
+    }
+  }
+};
+__decorateClass([
+  import_experimental.experimental
+], RestApiTool.prototype, "configureAuthScheme", 1);
+__decorateClass([
+  import_experimental.experimental
+], RestApiTool.prototype, "configureAuthCredential", 1);
+__decorateClass([
+  import_experimental.experimental
+], RestApiTool.prototype, "configureCredentialKey", 1);
+__decorateClass([
+  import_experimental.experimental
+], RestApiTool.prototype, "_getDeclaration", 1);
+__decorateClass([
+  import_experimental.experimental
+], RestApiTool.prototype, "runAsync", 1);
+RestApiTool = __decorateClass([
+  import_experimental.experimental
+], RestApiTool);
+function prepareRequestParams(endpoint, parameters, args) {
+  const headers = {};
+  const queryParams = new URLSearchParams();
+  let body = void 0;
+  const paramsMap = new Map(parameters.map((p) => [p.name, p]));
+  const pathParams = {};
+  const bodyData = {};
+  for (const [argName, argValue] of Object.entries(args)) {
+    const param = paramsMap.get(argName);
+    if (!param) continue;
+    const originalName = param.originalName;
+    const location = param.paramLocation;
+    if (location === "path") {
+      pathParams[originalName] = String(argValue);
+    } else if (location === "query") {
+      queryParams.append(originalName, String(argValue));
+    } else if (location === "header") {
+      headers[originalName] = String(argValue);
+    } else if (location === "body") {
+      if (originalName === "body" || originalName === "array" || originalName === "") {
+        body = argValue;
+      } else {
+        bodyData[originalName] = argValue;
+      }
+    }
+  }
+  let url = `${endpoint.baseUrl}${endpoint.path}`;
+  for (const [key, value] of Object.entries(pathParams)) {
+    url = url.replace(`{${key}}`, value);
+  }
+  const urlParts = url.split("?");
+  if (urlParts.length > 1) {
+    const pathQueryParams = new URLSearchParams(urlParts[1]);
+    for (const [key, value] of pathQueryParams.entries()) {
+      queryParams.append(key, value);
+    }
+    url = urlParts[0];
+  }
+  const queryString = queryParams.toString();
+  if (queryString) {
+    url += `?${queryString}`;
+  }
+  return { url, headers, body, bodyData };
+}
+function prepareRequestBody(requestBody, body, bodyData, headers) {
+  const finalData = body !== void 0 ? body : Object.keys(bodyData).length > 0 ? bodyData : void 0;
+  if (requestBody && "content" in requestBody) {
+    const content = requestBody.content;
+    for (const [mimeType, _mediaTypeObject] of Object.entries(content)) {
+      if (finalData !== void 0) {
+        if (mimeType === "application/json" || mimeType.endsWith("+json")) {
+          headers["Content-Type"] = mimeType;
+          return typeof finalData === "string" ? finalData : JSON.stringify(finalData);
+        } else if (mimeType === "application/x-www-form-urlencoded") {
+          return new URLSearchParams(finalData);
+        } else if (mimeType === "multipart/form-data") {
+          const formData = new FormData();
+          if (typeof finalData === "object" && finalData !== null) {
+            for (const [key, value] of Object.entries(finalData)) {
+              formData.append(key, String(value));
+            }
+          }
+          return formData;
+        } else if (mimeType === "text/plain") {
+          headers["Content-Type"] = mimeType;
+          return String(finalData);
+        }
+      }
+      break;
+    }
+  } else if (finalData !== void 0) {
+    headers["Content-Type"] = "application/json";
+    return typeof finalData === "string" ? finalData : JSON.stringify(finalData);
+  }
+  return void 0;
+}
+function createRestApiTool(parsed, options = {}) {
+  return new RestApiTool(
+    parsed.name,
+    parsed.description,
+    parsed.endpoint,
+    parsed.operation,
+    parsed.authScheme,
+    void 0,
+    options
+  );
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  RestApiTool,
+  createRestApiTool,
+  prepareRequestBody,
+  prepareRequestParams
+});

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({
@@ -107,7 +84,10 @@ let LoadSkillResourceTool = class extends import_base_tool.BaseTool {
       }
     };
   }
-  async runAsync({ args }) {
+  async runAsync({
+    args,
+    toolContext
+  }) {
     var _a, _b, _c;
     const skillName = args["skill_name"];
     let resourcePath = args["path"];
@@ -124,7 +104,18 @@ let LoadSkillResourceTool = class extends import_base_tool.BaseTool {
       };
     }
     resourcePath = import_node_path.default.posix.normalize(resourcePath);
-    const skill = this.toolset.getSkill(skillName);
+    let skill;
+    try {
+      skill = await this.toolset.getOrFetchSkill(
+        skillName,
+        toolContext.invocationId
+      );
+    } catch (e) {
+      return {
+        error: `Failed to fetch skill '${skillName}' from registry: ${e.message || e}`,
+        error_code: "REGISTRY_ERROR"
+      };
+    }
     if (!skill) {
       return {
         error: `Skill '${skillName}' not found.`,
@@ -187,7 +178,15 @@ let LoadSkillResourceTool = class extends import_base_tool.BaseTool {
         if (response["status"] === BINARY_FILE_DETECTED_MSG) {
           const skillName = response["skill_name"];
           const resourcePath = response["path"];
-          const skill = this.toolset.getSkill(skillName);
+          let skill;
+          try {
+            skill = await this.toolset.getOrFetchSkill(
+              skillName,
+              request.toolContext.invocationId
+            );
+          } catch (_e) {
+            continue;
+          }
           if (!skill) continue;
           const skillResources = skill.resources || {};
           let content;
@@ -197,7 +196,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/tools/skill/load_skill_tool.js

@@ -78,7 +78,18 @@ let LoadSkillTool = class extends import_base_tool.BaseTool {
         error_code: "MISSING_SKILL_NAME"
       };
     }
-    const skill = this.toolset.getSkill(skillName);
+    let skill;
+    try {
+      skill = await this.toolset.getOrFetchSkill(
+        skillName,
+        toolContext.invocationId
+      );
+    } catch (e) {
+      return {
+        error: `Failed to fetch skill '${skillName}' from registry: ${e.message || e}`,
+        error_code: "REGISTRY_ERROR"
+      };
+    }
     if (!skill) {
       return {
         error: `Skill '${skillName}' not found.`,

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

@@ -111,7 +111,18 @@ let RunSkillScriptTool = class extends import_base_tool.BaseTool {
         errorCode: "MISSING_SCRIPT_PATH"
       };
     }
-    const skill = this.toolset.getSkill(skillName);
+    let skill;
+    try {
+      skill = await this.toolset.getOrFetchSkill(
+        skillName,
+        toolContext.invocationId
+      );
+    } catch (e) {
+      return {
+        error: `Failed to fetch skill '${skillName}' from registry: ${e.message || e}`,
+        errorCode: "REGISTRY_ERROR"
+      };
+    }
     if (!skill) {
       return {
         error: `Skill '${skillName}' not found.`,

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

@@ -0,0 +1,108 @@
+/**
+  * @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 search_skills_tool_exports = {};
+__export(search_skills_tool_exports, {
+  SearchSkillsTool: () => SearchSkillsTool
+});
+module.exports = __toCommonJS(search_skills_tool_exports);
+var import_genai = require("@google/genai");
+var import_experimental = require("../../utils/experimental.js");
+var import_logger = require("../../utils/logger.js");
+var import_base_tool = require("../base_tool.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+let SearchSkillsTool = class extends import_base_tool.BaseTool {
+  constructor(toolset) {
+    var _a, _b;
+    if (!toolset.registry) {
+      throw new Error("SearchSkillsTool requires a configured skill registry.");
+    }
+    super({
+      name: "search_skills",
+      description: ((_b = (_a = toolset.registry).searchToolDescription) == null ? void 0 : _b.call(_a)) || "Searches for relevant skills in the registry based on a semantic or keyword query."
+    });
+    this.toolset = toolset;
+  }
+  _getDeclaration() {
+    return {
+      name: this.name,
+      description: this.description,
+      parameters: {
+        type: import_genai.Type.OBJECT,
+        properties: {
+          query: {
+            type: import_genai.Type.STRING,
+            description: "Semantic or keyword search query."
+          }
+        },
+        required: ["query"]
+      }
+    };
+  }
+  async runAsync({ args }) {
+    const query = args["query"];
+    if (!query) {
+      return {
+        error: "Argument 'query' is required.",
+        error_code: "INVALID_ARGUMENTS"
+      };
+    }
+    try {
+      const results = await this.toolset.registry.searchSkills(query);
+      return results.filter((r) => {
+        if (this.toolset.skills[r.name]) {
+          import_logger.logger.warn(
+            `Skill naming conflict: skill '${r.name}' already exists locally. Registry skill is filtered.`
+          );
+          return false;
+        }
+        return true;
+      });
+    } catch (e) {
+      return {
+        error: `Failed to search skills from registry: ${e.message || e}`,
+        error_code: "REGISTRY_ERROR"
+      };
+    }
+  }
+};
+SearchSkillsTool = __decorateClass([
+  import_experimental.experimental
+], SearchSkillsTool);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SearchSkillsTool
+});