@google/adk 0.6.0 → 1.0.0

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

@@ -0,0 +1,163 @@
+/**
+  * @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 skill_toolset_exports = {};
+__export(skill_toolset_exports, {
+  SkillToolset: () => SkillToolset
+});
+module.exports = __toCommonJS(skill_toolset_exports);
+var import_llm_request = require("../../models/llm_request.js");
+var import_prompt = require("../../skills/prompt.js");
+var import_experimental = require("../../utils/experimental.js");
+var import_base_tool = require("../base_tool.js");
+var import_base_toolset = require("../base_toolset.js");
+var import_list_skills_tool = require("./list_skills_tool.js");
+var import_load_skill_resource_tool = require("./load_skill_resource_tool.js");
+var import_load_skill_tool = require("./load_skill_tool.js");
+var import_run_skill_inline_script_tool = require("./run_skill_inline_script_tool.js");
+var import_run_skill_script_tool = require("./run_skill_script_tool.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const DEFAULT_SKILL_SYSTEM_INSTRUCTION = `You can use specialized 'skills' to help you with complex tasks. You MUST use the skill tools to interact with these skills.
+
+Skills are folders of instructions and resources that extend your capabilities for specialized tasks. Each skill folder contains:
+- **SKILL.md** (required): The main instruction file with skill metadata and detailed markdown instructions.
+- **references/** (Optional): Additional documentation or examples for skill usage.
+- **assets/** (Optional): Templates, scripts or other resources used by the skill.
+- **scripts/** (Optional): Executable scripts that can be run via bash.
+
+This is very important:
+
+1. If a skill seems relevant to the current user query, you MUST use the \`load_skill\` tool with \`name="<SKILL_NAME>"\` to read its full instructions before proceeding.
+2. Once you have read the instructions, follow them exactly as documented before replying to the user. For example, If the instruction lists multiple steps, please make sure you complete all of them in order.
+3. The \`load_skill_resource\` tool is for viewing files within a skill's directory (e.g., \`references/*\`, \`assets/*\`, \`scripts/*\`). Do NOT use other tools to access these files.
+4. Use \`run_skill_script\` to run scripts from a skill's \`scripts/\` directory. Use \`load_skill_resource\` to view script content first if needed.
+`;
+let SkillToolset = class extends import_base_toolset.BaseToolset {
+  constructor(skills, options = {}) {
+    super([], "adk_skill_toolset");
+    this.toolCache = /* @__PURE__ */ new Map();
+    this.skills = Array.isArray(skills) ? Object.fromEntries(skills.map((s) => [s.frontmatter.name, s])) : skills;
+    this.codeExecutor = options.codeExecutor;
+    this.additionalTools = options.additionalTools || [];
+    this.tools = [
+      new import_list_skills_tool.ListSkillsTool(this),
+      new import_load_skill_tool.LoadSkillTool(this),
+      new import_load_skill_resource_tool.LoadSkillResourceTool(this),
+      new import_run_skill_script_tool.RunSkillScriptTool(this),
+      new import_run_skill_inline_script_tool.RunSkillInlineScriptTool(this)
+    ];
+  }
+  async getTools(context) {
+    const dynamicTools = await this.resolveAdditionalTools(context);
+    return [...this.tools, ...dynamicTools];
+  }
+  async close() {
+  }
+  getSkill(name) {
+    return this.skills[name];
+  }
+  async processLlmRequest(toolContext, llmRequest) {
+    await super.processLlmRequest(toolContext, llmRequest);
+    const skills = Object.values(this.skills);
+    const skillsXml = (0, import_prompt.formatSkillsAsXml)(skills);
+    (0, import_llm_request.appendInstructions)(llmRequest, [
+      DEFAULT_SKILL_SYSTEM_INSTRUCTION,
+      skillsXml
+    ]);
+  }
+  async resolveAdditionalTools(context) {
+    if (!context) return [];
+    const agentName = context.agentName;
+    const stateKey = `_adk_activated_skill_${agentName}`;
+    const activatedSkills = context.state.get(stateKey) || [];
+    if (activatedSkills.length === 0) return [];
+    const cacheKey = `${agentName}:${activatedSkills.join(",")}`;
+    if (this.toolCache.has(cacheKey)) {
+      return this.toolCache.get(cacheKey);
+    }
+    const additionalToolNames = /* @__PURE__ */ new Set();
+    for (const skillName of activatedSkills) {
+      const skill = this.skills[skillName];
+      if (skill && skill.frontmatter.metadata) {
+        const tools = skill.frontmatter.metadata["adk_additional_tools"];
+        if (tools) {
+          tools.forEach((t) => additionalToolNames.add(t));
+        }
+      }
+    }
+    if (additionalToolNames.size === 0) {
+      this.toolCache.set(cacheKey, []);
+      return [];
+    }
+    const candidateTools = {};
+    for (const toolUnion of this.additionalTools) {
+      if (toolUnion instanceof import_base_tool.BaseTool) {
+        if (candidateTools[toolUnion.name]) {
+          throw new Error(`Duplicate tool name: ${toolUnion.name}`);
+        }
+        candidateTools[toolUnion.name] = toolUnion;
+      } else if (toolUnion instanceof import_base_toolset.BaseToolset) {
+        const tsTools = await toolUnion.getTools(context);
+        for (const t of tsTools) {
+          if (candidateTools[t.name]) {
+            throw new Error(`Duplicate tool name: ${t.name}`);
+          }
+          candidateTools[t.name] = t;
+        }
+      }
+    }
+    const resolvedTools = [];
+    const existingNames = new Set(this.tools.map((t) => t.name));
+    for (const name of additionalToolNames) {
+      if (candidateTools[name]) {
+        const tool = candidateTools[name];
+        if (!existingNames.has(tool.name)) {
+          resolvedTools.push(tool);
+          existingNames.add(tool.name);
+        }
+      }
+    }
+    this.toolCache.set(cacheKey, resolvedTools);
+    return resolvedTools;
+  }
+};
+SkillToolset = __decorateClass([
+  import_experimental.experimental
+], SkillToolset);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SkillToolset
+});

package/dist/cjs/utils/experimental.js

@@ -0,0 +1,74 @@
+/**
+  * @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 experimental_exports = {};
+__export(experimental_exports, {
+  experimental: () => experimental
+});
+module.exports = __toCommonJS(experimental_exports);
+var import_logger = require("./logger.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const warnedItems = /* @__PURE__ */ new Set();
+function experimental(target, propertyKey, descriptor) {
+  if (propertyKey === void 0) {
+    const className = target.name;
+    const newConstructor = class extends target {
+      constructor(...args) {
+        if (!warnedItems.has(className)) {
+          import_logger.logger.warn(
+            `Class ${className} is experimental and may change in the future.`
+          );
+          warnedItems.add(className);
+        }
+        super(...args);
+      }
+    };
+    return newConstructor;
+  }
+  if (propertyKey !== void 0 && descriptor !== void 0) {
+    const className = typeof target === "function" ? target.name : target.constructor.name;
+    const methodName = String(propertyKey);
+    const identifier = `${className}.${methodName}`;
+    const originalMethod = descriptor.value;
+    descriptor.value = function(...args) {
+      if (!warnedItems.has(identifier)) {
+        import_logger.logger.warn(
+          `Method ${identifier} is experimental and may change in the future.`
+        );
+        warnedItems.add(identifier);
+      }
+      return originalMethod.apply(this, args);
+    };
+    return descriptor;
+  }
+  throw new Error("Invalid decorator usage");
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  experimental
+});

package/dist/cjs/utils/failover_utils.js

@@ -0,0 +1,93 @@
+/**
+  * @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 failover_utils_exports = {};
+__export(failover_utils_exports, {
+  runWithRouting: () => runWithRouting
+});
+module.exports = __toCommonJS(failover_utils_exports);
+var import_logger = require("./logger.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+async function* runWithRouting(items, context, router, runFn) {
+  const initialKey = await router(items, context);
+  if (!initialKey) {
+    throw new Error("Initial routing failed, no item selected.");
+  }
+  let selectedKey = initialKey;
+  import_logger.logger.debug(`Router selected initial key: ${selectedKey}`);
+  let selectedItem = items[selectedKey];
+  if (!selectedItem) {
+    throw new Error(`Item not found for key: ${selectedKey}`);
+  }
+  const triedKeys = /* @__PURE__ */ new Set([selectedKey]);
+  while (true) {
+    const generatorOrPromise = runFn(selectedItem);
+    let firstYielded = false;
+    try {
+      if (isAsyncGenerator(generatorOrPromise)) {
+        for await (const result2 of generatorOrPromise) {
+          yield result2;
+          firstYielded = true;
+        }
+        return;
+      }
+      const result = await generatorOrPromise;
+      yield result;
+      return;
+    } catch (error) {
+      if (!firstYielded) {
+        const nextKey = await router(items, context, {
+          failedKeys: triedKeys,
+          lastError: error
+        });
+        import_logger.logger.debug(`Router selected next key: ${nextKey}`);
+        if (nextKey === void 0) {
+          throw error;
+        }
+        if (triedKeys.has(nextKey)) {
+          throw error;
+        }
+        selectedKey = nextKey;
+        selectedItem = items[selectedKey];
+        if (!selectedItem) {
+          throw new Error(`Item not found for key: ${selectedKey}`);
+        }
+        triedKeys.add(selectedKey);
+      } else {
+        throw error;
+      }
+    }
+  }
+}
+function isAsyncGenerator(obj) {
+  return typeof obj === "object" && typeof obj[Symbol.asyncIterator] === "function";
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  runWithRouting
+});

package/dist/cjs/utils/file_extension_utils.js

@@ -0,0 +1,77 @@
+/**
+  * @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 file_extension_utils_exports = {};
+__export(file_extension_utils_exports, {
+  getMimeTypeAndEncoding: () => getMimeTypeAndEncoding,
+  getScriptLanguageByExtension: () => getScriptLanguageByExtension
+});
+module.exports = __toCommonJS(file_extension_utils_exports);
+var import_code_execution_utils = require("../code_executors/code_execution_utils.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const MIME_TYPE_MAP = {
+  ".js": { mimeType: "text/javascript", encoding: import_code_execution_utils.FileContentEncoding.UTF8 },
+  ".py": { mimeType: "text/x-python", encoding: import_code_execution_utils.FileContentEncoding.UTF8 },
+  ".md": { mimeType: "text/markdown", encoding: import_code_execution_utils.FileContentEncoding.UTF8 },
+  ".txt": { mimeType: "text/plain", encoding: import_code_execution_utils.FileContentEncoding.UTF8 },
+  ".html": { mimeType: "text/html", encoding: import_code_execution_utils.FileContentEncoding.UTF8 },
+  ".css": { mimeType: "text/css", encoding: import_code_execution_utils.FileContentEncoding.UTF8 },
+  ".json": { mimeType: "application/json", encoding: import_code_execution_utils.FileContentEncoding.UTF8 },
+  ".csv": { mimeType: "text/csv", encoding: import_code_execution_utils.FileContentEncoding.UTF8 },
+  ".svg": { mimeType: "image/svg+xml", encoding: import_code_execution_utils.FileContentEncoding.UTF8 },
+  ".xml": { mimeType: "application/xml", encoding: import_code_execution_utils.FileContentEncoding.UTF8 },
+  ".yaml": { mimeType: "text/yaml", encoding: import_code_execution_utils.FileContentEncoding.UTF8 },
+  ".yml": { mimeType: "text/yaml", encoding: import_code_execution_utils.FileContentEncoding.UTF8 },
+  ".png": { mimeType: "image/png", encoding: import_code_execution_utils.FileContentEncoding.BASE64 },
+  ".jpg": { mimeType: "image/jpeg", encoding: import_code_execution_utils.FileContentEncoding.BASE64 },
+  ".jpeg": { mimeType: "image/jpeg", encoding: import_code_execution_utils.FileContentEncoding.BASE64 },
+  ".pdf": { mimeType: "application/pdf", encoding: import_code_execution_utils.FileContentEncoding.BASE64 }
+};
+const EXTENSION_TO_LANGUAGE = {
+  ".js": import_code_execution_utils.CodeExecutionLanguage.JAVASCRIPT,
+  ".ts": import_code_execution_utils.CodeExecutionLanguage.TYPESCRIPT,
+  ".py": import_code_execution_utils.CodeExecutionLanguage.PYTHON,
+  ".bat": import_code_execution_utils.CodeExecutionLanguage.WINDOWS_CMD,
+  ".cmd": import_code_execution_utils.CodeExecutionLanguage.WINDOWS_CMD,
+  ".ps1": import_code_execution_utils.CodeExecutionLanguage.POWERSHELL,
+  ".sh": import_code_execution_utils.CodeExecutionLanguage.SHELL
+};
+function getMimeTypeAndEncoding(ext) {
+  return MIME_TYPE_MAP[ext.toLowerCase()] || {
+    mimeType: "application/octet-stream",
+    encoding: import_code_execution_utils.FileContentEncoding.BASE64
+  };
+}
+function getScriptLanguageByExtension(ext) {
+  return EXTENSION_TO_LANGUAGE[ext.toLowerCase()] || import_code_execution_utils.CodeExecutionLanguage.UNSPECIFIED;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getMimeTypeAndEncoding,
+  getScriptLanguageByExtension
+});

package/dist/cjs/utils/file_utils.js

@@ -0,0 +1,94 @@
+/**
+  * @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 file_utils_exports = {};
+__export(file_utils_exports, {
+  materializeFiles: () => materializeFiles
+});
+module.exports = __toCommonJS(file_utils_exports);
+var fs = __toESM(require("node:fs/promises"), 1);
+var path = __toESM(require("node:path"), 1);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+async function materializeFiles(files, dir = process.cwd()) {
+  const resolvedBaseDir = path.resolve(dir);
+  const createdFiles = [];
+  for (const file of files) {
+    const fullPath = path.resolve(dir, file.name);
+    if (!fullPath.startsWith(resolvedBaseDir)) {
+      throw new Error(
+        `Path traversal detected: ${file.name} resolves outside of ${dir}`
+      );
+    }
+    const ext = path.extname(fullPath);
+    const dirName = path.dirname(fullPath);
+    const base = path.basename(fullPath, ext);
+    let finalPath = fullPath;
+    let counter = 2;
+    while (true) {
+      try {
+        await fs.access(finalPath);
+        const newName = `${base}_${counter}${ext}`;
+        finalPath = path.join(dirName, newName);
+        const originalDir = path.dirname(file.name);
+        file.name = originalDir === "." ? newName : path.join(originalDir, newName);
+        counter++;
+      } catch {
+        break;
+      }
+    }
+    if (!finalPath.startsWith(resolvedBaseDir)) {
+      throw new Error(
+        `Path traversal detected: ${file.name} resolves outside of ${dir}`
+      );
+    }
+    await fs.mkdir(path.dirname(finalPath), { recursive: true });
+    await fs.writeFile(
+      finalPath,
+      Buffer.from(file.content, file.contentEncoding)
+    );
+    createdFiles.push({
+      ...file,
+      name: path.relative(dir, finalPath)
+    });
+  }
+  return createdFiles;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  materializeFiles
+});

package/dist/cjs/utils/gemini_schema_util.js

@@ -55,22 +55,50 @@ function toGeminiType(mcpType) {
       return import_genai.Type.ARRAY;
     case "object":
       return import_genai.Type.OBJECT;
+    case "null":
+      return import_genai.Type.NULL;
     default:
       return import_genai.Type.TYPE_UNSPECIFIED;
   }
 }
+const getTypeFromArrayItem = (mcpType) => {
+  var _a, _b;
+  if (typeof mcpType === "string") {
+    return mcpType.toLowerCase();
+  }
+  return (_b = (_a = mcpType == null ? void 0 : mcpType.type) == null ? void 0 : _a.toLowerCase) == null ? void 0 : _b.call(_a);
+};
 function toGeminiSchema(mcpSchema) {
   if (!mcpSchema) {
     return void 0;
   }
   function recursiveConvert(mcp) {
-    if (!mcp.type && mcp.anyOf && Array.isArray(mcp.anyOf)) {
-      const nonNullOption = mcp.anyOf.find((opt) => {
-        const t = opt.type;
-        return t !== "null" && t !== "NULL";
-      });
-      if (nonNullOption) {
-        mcp = nonNullOption;
+    var _a;
+    const sourceType = (_a = mcp.anyOf) != null ? _a : mcp.type;
+    let isNullable = false;
+    let nonNullTypes;
+    if (Array.isArray(sourceType)) {
+      nonNullTypes = sourceType.filter(
+        (t) => getTypeFromArrayItem(t) !== "null"
+      );
+      isNullable = sourceType.some(
+        (t) => getTypeFromArrayItem(t) === "null"
+      );
+      if (nonNullTypes.length === 1) {
+        const nonNullType = nonNullTypes[0];
+        if (typeof nonNullType === "object") {
+          mcp = nonNullType;
+        } else {
+          const { type: _removed, anyOf: _removedAnyOf, ...rest } = mcp;
+          mcp = { ...rest, type: nonNullType };
+        }
+      } else if (nonNullTypes.length === 0 && isNullable) {
+        const { type: _removed, anyOf: _removedAnyOf, ...rest } = mcp;
+        mcp = { ...rest, type: "null" };
+      } else if (typeof mcp.anyOf === "undefined") {
+        const anyOfItems = mcp.type.map((t) => ({ type: t }));
+        const { type: _removed, ...rest } = mcp;
+        mcp = { ...rest, anyOf: anyOfItems };
       }
     }
     if (!mcp.type) {
@@ -78,13 +106,25 @@ function toGeminiSchema(mcpSchema) {
         mcp.type = "object";
       } else if (mcp.items) {
         mcp.type = "array";
+      } else if (isNullable) {
+        mcp.type = "null";
       }
     }
     const geminiType = toGeminiType(mcp.type);
-    const geminiSchema = {
-      type: geminiType,
-      description: mcp.description
-    };
+    const geminiSchema = {};
+    if (mcp.anyOf) {
+      geminiSchema.anyOf = mcp.anyOf.map(
+        (item) => recursiveConvert(item)
+      );
+    } else {
+      geminiSchema.type = geminiType;
+    }
+    if (mcp.description) {
+      geminiSchema.description = mcp.description;
+    }
+    if (isNullable && mcp.type !== "null") {
+      geminiSchema.nullable = true;
+    }
     if (geminiType === import_genai.Type.OBJECT) {
       geminiSchema.properties = {};
       if (mcp.properties) {
@@ -94,7 +134,9 @@ function toGeminiSchema(mcpSchema) {
           );
         }
       }
-      geminiSchema.required = mcp.required;
+      if (mcp.required) {
+        geminiSchema.required = mcp.required;
+      }
     } else if (geminiType === import_genai.Type.ARRAY) {
       if (mcp.items) {
         geminiSchema.items = recursiveConvert(mcp.items);