@google/adk 1.2.0 → 1.4.0

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

@@ -0,0 +1,82 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+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;
+};
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { Type } from "@google/genai";
+import { experimental } from "../../utils/experimental.js";
+import { logger } from "../../utils/logger.js";
+import { BaseTool } from "../base_tool.js";
+let SearchSkillsTool = class extends 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: Type.OBJECT,
+        properties: {
+          query: {
+            type: 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]) {
+          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([
+  experimental
+], SearchSkillsTool);
+export {
+  SearchSkillsTool
+};

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

@@ -18,6 +18,7 @@ var __decorateClass = (decorators, target, key, kind) => {
 import { appendInstructions } from "../../models/llm_request.js";
 import { formatSkillsAsXml } from "../../skills/prompt.js";
 import { experimental } from "../../utils/experimental.js";
+import { logger } from "../../utils/logger.js";
 import { BaseTool } from "../base_tool.js";
 import { BaseToolset } from "../base_toolset.js";
 import { ListSkillsTool } from "./list_skills_tool.js";
@@ -25,6 +26,7 @@ import { LoadSkillResourceTool } from "./load_skill_resource_tool.js";
 import { LoadSkillTool } from "./load_skill_tool.js";
 import { RunSkillInlineScriptTool } from "./run_skill_inline_script_tool.js";
 import { RunSkillScriptTool } from "./run_skill_script_tool.js";
+import { SearchSkillsTool } from "./search_skills_tool.js";
 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:
@@ -44,9 +46,11 @@ let SkillToolset = class extends BaseToolset {
   constructor(skills, options = {}) {
     super([], "adk_skill_toolset");
     this.toolCache = /* @__PURE__ */ new Map();
+    this.fetchedSkillCache = /* @__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.registry = options.registry;
     this.tools = [
       new ListSkillsTool(this),
       new LoadSkillTool(this),
@@ -54,24 +58,55 @@ let SkillToolset = class extends BaseToolset {
       new RunSkillScriptTool(this),
       new RunSkillInlineScriptTool(this)
     ];
+    if (this.registry) {
+      this.tools.push(new SearchSkillsTool(this));
+    }
   }
   async getTools(context) {
     const dynamicTools = await this.resolveAdditionalTools(context);
     return [...this.tools, ...dynamicTools];
   }
   async close() {
+    this.fetchedSkillCache.clear();
   }
   getSkill(name) {
     return this.skills[name];
   }
+  async getOrFetchSkill(name, invocationId) {
+    if (this.skills[name]) {
+      return this.skills[name];
+    }
+    if (!this.registry) {
+      return void 0;
+    }
+    const contextKey = invocationId || "default";
+    if (!this.fetchedSkillCache.has(contextKey)) {
+      this.fetchedSkillCache.set(contextKey, /* @__PURE__ */ new Map());
+    }
+    const cache = this.fetchedSkillCache.get(contextKey);
+    if (cache.has(name)) {
+      return cache.get(name);
+    }
+    try {
+      const skill = await this.registry.getSkill(name);
+      cache.set(name, skill);
+      return skill;
+    } catch (e) {
+      logger.warn(`Failed to fetch skill '${name}' from registry: ${e}`);
+      throw e;
+    }
+  }
   async processLlmRequest(toolContext, llmRequest) {
     await super.processLlmRequest(toolContext, llmRequest);
     const skills = Object.values(this.skills);
     const skillsXml = formatSkillsAsXml(skills);
-    appendInstructions(llmRequest, [
-      DEFAULT_SKILL_SYSTEM_INSTRUCTION,
-      skillsXml
-    ]);
+    const instructions = [DEFAULT_SKILL_SYSTEM_INSTRUCTION, skillsXml];
+    if (this.registry) {
+      instructions.push(
+        "\nIf the locally available skills are not sufficient to complete your task, you can use the `search_skills` tool to discover additional skills from the registry."
+      );
+    }
+    appendInstructions(llmRequest, instructions);
   }
   async resolveAdditionalTools(context) {
     if (!context) return [];
@@ -85,7 +120,7 @@ let SkillToolset = class extends BaseToolset {
     }
     const additionalToolNames = /* @__PURE__ */ new Set();
     for (const skillName of activatedSkills) {
-      const skill = this.skills[skillName];
+      const skill = await this.getOrFetchSkill(skillName, context.invocationId);
       if (skill && skill.frontmatter.metadata) {
         const tools = skill.frontmatter.metadata["adk_additional_tools"];
         if (tools) {

package/dist/esm/utils/async_hooks_shim.js

@@ -0,0 +1,24 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+class AsyncLocalStorage {
+  run(store, callback) {
+    const previous = this.store;
+    this.store = store;
+    try {
+      return callback();
+    } finally {
+      this.store = previous;
+    }
+  }
+  getStore() {
+    return this.store;
+  }
+}
+export {
+  AsyncLocalStorage
+};

package/dist/esm/utils/async_queue.js

@@ -0,0 +1,60 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+class AsyncQueue {
+  constructor() {
+    this.queue = [];
+    this.resolvers = [];
+    this.closed = false;
+  }
+  push(value) {
+    if (this.closed) return;
+    if (this.resolvers.length > 0) {
+      const { resolve } = this.resolvers.shift();
+      resolve({ value, done: false });
+    } else {
+      this.queue.push(value);
+    }
+  }
+  error(err) {
+    this.errorVal = err;
+    while (this.resolvers.length > 0) {
+      const { reject } = this.resolvers.shift();
+      reject(err);
+    }
+  }
+  close() {
+    this.closed = true;
+    while (this.resolvers.length > 0) {
+      const { resolve } = this.resolvers.shift();
+      resolve({ value: void 0, done: true });
+    }
+  }
+  [Symbol.asyncIterator]() {
+    return {
+      next: () => {
+        if (this.errorVal) {
+          const err = this.errorVal;
+          this.errorVal = void 0;
+          return Promise.reject(err);
+        }
+        if (this.queue.length > 0) {
+          return Promise.resolve({ value: this.queue.shift(), done: false });
+        }
+        if (this.closed) {
+          return Promise.resolve({ value: void 0, done: true });
+        }
+        return new Promise((resolve, reject) => {
+          this.resolvers.push({ resolve, reject });
+        });
+      }
+    };
+  }
+}
+export {
+  AsyncQueue
+};

package/dist/esm/utils/case_utils.js

@@ -0,0 +1,25 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+function camelCaseKeys(val) {
+  if (Array.isArray(val)) {
+    return val.map(camelCaseKeys);
+  }
+  if (val !== null && typeof val === "object" && val.constructor === Object) {
+    const obj = val;
+    const newObj = {};
+    for (const key of Object.keys(obj)) {
+      const camelKey = key.replace(/_([a-z])/g, (_, g) => g.toUpperCase());
+      newObj[camelKey] = camelCaseKeys(obj[key]);
+    }
+    return newObj;
+  }
+  return val;
+}
+export {
+  camelCaseKeys
+};

package/dist/esm/utils/client_labels.js

@@ -5,24 +5,60 @@ const require = topLevelCreateRequire(import.meta.url);
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { AsyncLocalStorage } from "node:async_hooks";
 import { version } from "../version.js";
 import { isBrowser } from "./env_aware_utils.js";
 const ADK_LABEL = "google-adk";
 const LANGUAGE_LABEL = "gl-typescript";
 const AGENT_ENGINE_TELEMETRY_TAG = "remote_reasoning_engine";
 const AGENT_ENGINE_TELEMETRY_ENV_VARIABLE_NAME = "GOOGLE_CLOUD_AGENT_ENGINE_ID";
+const clientLabelLocalStorage = new AsyncLocalStorage();
+const USER_AGENT_PATTERNS = [
+  ["Edge", /(?:Edg|Edge|EdgA)\/([0-9.]+)/i],
+  ["Firefox", /(?:Firefox|FxiOS)\/([0-9.]+)/i],
+  ["Chrome", /(?:Chrome|CriOS)\/([0-9.]+)/i],
+  ["Safari", /Version\/([0-9.]+).*Safari/i]
+];
+function parseUserAgent(userAgent) {
+  if (!userAgent) {
+    return "Browser";
+  }
+  for (const [name, regex] of USER_AGENT_PATTERNS) {
+    const match = userAgent.match(regex);
+    if (match) {
+      return `${name}/${match[1]}`;
+    }
+  }
+  return "Browser";
+}
 function _getDefaultLabels() {
   let frameworkLabel = `${ADK_LABEL}/${version}`;
   if (!isBrowser() && process.env[AGENT_ENGINE_TELEMETRY_ENV_VARIABLE_NAME]) {
     frameworkLabel = `${frameworkLabel}+${AGENT_ENGINE_TELEMETRY_TAG}`;
   }
-  const languageLabel = `${LANGUAGE_LABEL}/${isBrowser() ? window.navigator.userAgent : process.version}`;
+  const languageLabelDetail = isBrowser() ? (
+    // eslint-disable-next-line no-undef
+    parseUserAgent(window.navigator.userAgent)
+  ) : process.version;
+  const languageLabel = `${LANGUAGE_LABEL}/${languageLabelDetail}`;
   return [frameworkLabel, languageLabel];
 }
+function runWithClientLabel(clientLabel, callback) {
+  if (typeof clientLabel !== "string" || clientLabel.trim() === "") {
+    throw new Error("Client label must be a non-empty string.");
+  }
+  return clientLabelLocalStorage.run(clientLabel, callback);
+}
 function getClientLabels() {
   const labels = _getDefaultLabels();
+  const contextLabel = clientLabelLocalStorage.getStore();
+  if (contextLabel) {
+    labels.push(contextLabel);
+  }
   return labels;
 }
 export {
-  getClientLabels
+  getClientLabels,
+  parseUserAgent,
+  runWithClientLabel
 };

package/dist/esm/utils/env_aware_utils.js

@@ -10,6 +10,10 @@ function isBrowser() {
 }
 const UUID_MASK = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx";
 function randomUUID() {
+  var _a;
+  if ((_a = globalThis.crypto) == null ? void 0 : _a.randomUUID) {
+    return globalThis.crypto.randomUUID();
+  }
   let uuid = "";
   for (let i = 0; i < UUID_MASK.length; i++) {
     const randomValue = Math.random() * 16 | 0;
@@ -25,7 +29,16 @@ function randomUUID() {
 }
 function base64Encode(data) {
   if (isBrowser()) {
-    return window.btoa(data);
+    let strData = "";
+    if (typeof data === "string") {
+      strData = data;
+    } else {
+      const len = data.byteLength;
+      for (let i = 0; i < len; i++) {
+        strData += String.fromCharCode(data[i]);
+      }
+    }
+    return window.btoa(strData);
   }
   return Buffer.from(data).toString("base64");
 }

package/dist/esm/utils/live_connection_utils.js

@@ -0,0 +1,256 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { isGemini3xFlashLive } from "./model_name.js";
+class LiveResponseAggregator {
+  constructor(modelVersion) {
+    this.modelVersion = modelVersion;
+    this.text = "";
+    this.isThought = false;
+    this.toolCallParts = [];
+    this.pendingGroundingMetadata = void 0;
+    this.inputTranscriptionText = "";
+    this.outputTranscriptionText = "";
+  }
+  *processMessage(message) {
+    if (message.usageMetadata) {
+      yield {
+        usageMetadata: message.usageMetadata,
+        ...this.modelVersion ? { modelVersion: this.modelVersion } : {}
+      };
+    }
+    if (message.serverContent) {
+      const serverContent = message.serverContent;
+      const content = serverContent.modelTurn;
+      if (serverContent.groundingMetadata) {
+        this.pendingGroundingMetadata = serverContent.groundingMetadata;
+      }
+      if (!(content && content.parts) && serverContent.groundingMetadata && !serverContent.turnComplete) {
+        yield {
+          groundingMetadata: serverContent.groundingMetadata,
+          ...serverContent.interrupted !== void 0 ? { interrupted: serverContent.interrupted } : {},
+          ...this.modelVersion ? { modelVersion: this.modelVersion } : {}
+        };
+      }
+      if (content && content.parts) {
+        const llmResponse = {
+          content,
+          ...serverContent.interrupted !== void 0 ? { interrupted: serverContent.interrupted } : {},
+          ...this.modelVersion ? { modelVersion: this.modelVersion } : {}
+        };
+        if (!serverContent.turnComplete && serverContent.groundingMetadata) {
+          llmResponse.groundingMetadata = serverContent.groundingMetadata;
+        }
+        const hasInlineData = content.parts.some((p) => p.inlineData);
+        for (const part of content.parts) {
+          if (part.text) {
+            const currentIsThought = !!part.thought;
+            if (this.text && currentIsThought !== this.isThought) {
+              yield this.buildFullTextResponse(this.text, this.isThought);
+              this.text = "";
+              this.isThought = false;
+            }
+            this.text += part.text;
+            this.isThought = currentIsThought;
+            llmResponse.partial = true;
+          }
+        }
+        if (this.text && !content.parts.some((p) => p.text) && !hasInlineData) {
+          yield this.buildFullTextResponse(this.text, this.isThought);
+          this.text = "";
+          this.isThought = false;
+        }
+        yield llmResponse;
+      }
+      if (serverContent.inputTranscription) {
+        if (serverContent.inputTranscription.text) {
+          this.inputTranscriptionText += serverContent.inputTranscription.text;
+          yield {
+            inputTranscription: {
+              text: serverContent.inputTranscription.text,
+              finished: false
+            },
+            partial: true,
+            ...this.modelVersion ? { modelVersion: this.modelVersion } : {}
+          };
+        }
+        if (serverContent.inputTranscription.finished) {
+          yield {
+            inputTranscription: {
+              text: this.inputTranscriptionText,
+              finished: true
+            },
+            partial: false,
+            ...this.modelVersion ? { modelVersion: this.modelVersion } : {}
+          };
+          this.inputTranscriptionText = "";
+        }
+      }
+      if (serverContent.outputTranscription) {
+        if (serverContent.outputTranscription.text) {
+          this.outputTranscriptionText += serverContent.outputTranscription.text;
+          yield {
+            outputTranscription: {
+              text: serverContent.outputTranscription.text,
+              finished: false
+            },
+            partial: true,
+            ...this.modelVersion ? { modelVersion: this.modelVersion } : {}
+          };
+        }
+        if (serverContent.outputTranscription.finished) {
+          yield {
+            outputTranscription: {
+              text: this.outputTranscriptionText,
+              finished: true
+            },
+            partial: false,
+            ...this.modelVersion ? { modelVersion: this.modelVersion } : {}
+          };
+          this.outputTranscriptionText = "";
+        }
+      }
+      if (serverContent.interrupted || serverContent.turnComplete || serverContent.generationComplete) {
+        if (this.inputTranscriptionText) {
+          yield {
+            inputTranscription: {
+              text: this.inputTranscriptionText,
+              finished: true
+            },
+            partial: false,
+            ...this.modelVersion ? { modelVersion: this.modelVersion } : {}
+          };
+          this.inputTranscriptionText = "";
+        }
+        if (this.outputTranscriptionText) {
+          yield {
+            outputTranscription: {
+              text: this.outputTranscriptionText,
+              finished: true
+            },
+            partial: false,
+            ...this.modelVersion ? { modelVersion: this.modelVersion } : {}
+          };
+          this.outputTranscriptionText = "";
+        }
+      }
+      if (serverContent.turnComplete) {
+        let gMetadataToYield = this.pendingGroundingMetadata;
+        if (this.text) {
+          yield this.buildFullTextResponse(
+            this.text,
+            this.isThought,
+            gMetadataToYield
+          );
+          this.text = "";
+          this.isThought = false;
+          gMetadataToYield = void 0;
+        }
+        if (this.toolCallParts.length > 0) {
+          yield {
+            content: { role: "model", parts: this.toolCallParts },
+            ...this.modelVersion ? { modelVersion: this.modelVersion } : {}
+          };
+          this.toolCallParts = [];
+        }
+        const finalResponse = {
+          turnComplete: true,
+          ...this.modelVersion ? { modelVersion: this.modelVersion } : {}
+        };
+        if (serverContent.interrupted !== void 0) {
+          finalResponse.interrupted = serverContent.interrupted;
+        }
+        const finalGrounding = serverContent.groundingMetadata || gMetadataToYield;
+        if (finalGrounding !== void 0 && finalGrounding !== null) {
+          finalResponse.groundingMetadata = finalGrounding;
+        }
+        yield finalResponse;
+      }
+      if (serverContent.interrupted) {
+        if (this.text) {
+          yield this.buildFullTextResponse(this.text, this.isThought);
+          this.text = "";
+          this.isThought = false;
+        } else {
+          yield {
+            interrupted: serverContent.interrupted,
+            ...this.modelVersion ? { modelVersion: this.modelVersion } : {}
+          };
+        }
+      }
+    }
+    if (message.toolCall) {
+      if (this.text) {
+        yield this.buildFullTextResponse(this.text, this.isThought);
+        this.text = "";
+        this.isThought = false;
+      }
+      if (message.toolCall.functionCalls) {
+        this.toolCallParts.push(
+          ...message.toolCall.functionCalls.map((fc) => ({
+            functionCall: fc
+          }))
+        );
+      }
+      const isGemini3x = isGemini3xFlashLive(this.modelVersion);
+      if (isGemini3x && this.toolCallParts.length > 0) {
+        yield {
+          content: { role: "model", parts: this.toolCallParts },
+          ...this.modelVersion ? { modelVersion: this.modelVersion } : {}
+        };
+        this.toolCallParts = [];
+      }
+    }
+    if (message.sessionResumptionUpdate) {
+      yield {
+        liveSessionResumptionUpdate: message.sessionResumptionUpdate,
+        ...this.modelVersion ? { modelVersion: this.modelVersion } : {}
+      };
+    }
+    if (message.goAway) {
+      yield {
+        goAway: message.goAway,
+        ...this.modelVersion ? { modelVersion: this.modelVersion } : {}
+      };
+    }
+  }
+  /**
+   * Flushes any remaining aggregated components when the connection is closed.
+   */
+  *close() {
+    if (this.toolCallParts.length > 0) {
+      yield {
+        content: { role: "model", parts: this.toolCallParts },
+        ...this.modelVersion ? { modelVersion: this.modelVersion } : {}
+      };
+      this.toolCallParts = [];
+    }
+  }
+  buildFullTextResponse(text, isThought, groundingMetadata) {
+    const part = { text };
+    if (isThought) {
+      part.thought = true;
+    }
+    const response = {
+      content: {
+        role: "model",
+        parts: [part]
+      },
+      partial: false
+    };
+    if (groundingMetadata !== void 0 && groundingMetadata !== null) {
+      response.groundingMetadata = groundingMetadata;
+    }
+    if (this.modelVersion) {
+      response.modelVersion = this.modelVersion;
+    }
+    return response;
+  }
+}
+export {
+  LiveResponseAggregator
+};

package/dist/esm/utils/model_name.js

@@ -46,6 +46,13 @@ function isGemini2OrAbove(modelString) {
   const parsedVersion = parseVersion(versionString);
   return parsedVersion.valid && parsedVersion.major >= 2;
 }
+function isGemini3xFlashLive(modelString) {
+  if (!modelString) {
+    return false;
+  }
+  const modelName = extractModelName(modelString);
+  return modelName.startsWith("gemini-3.") && modelName.includes("-flash-live");
+}
 function isGeminiModelIdCheckDisabled() {
   return getBooleanEnvVar("ADK_DISABLE_GEMINI_MODEL_ID_CHECK");
 }
@@ -53,6 +60,7 @@ export {
   extractModelName,
   isGemini1Model,
   isGemini2OrAbove,
+  isGemini3xFlashLive,
   isGeminiModel,
   isGeminiModelIdCheckDisabled
 };