@google/adk 1.3.0 → 1.5.0

package/dist/web/tools/skill/run_skill_inline_script_tool.js

@@ -21,6 +21,15 @@ import { CodeExecutionLanguage } from "../../code_executors/code_execution_utils
 import { experimental } from "../../utils/experimental.js";
 import { materializeFiles } from "../../utils/file_utils.js";
 import { BaseTool } from "../base_tool.js";
+var RunSkillInlineScriptErrorCode = /* @__PURE__ */ ((RunSkillInlineScriptErrorCode2) => {
+  RunSkillInlineScriptErrorCode2["MISSING_SCRIPT_CONTENT"] = "MISSING_SCRIPT_CONTENT";
+  RunSkillInlineScriptErrorCode2["MISSING_LANGUAGE"] = "MISSING_LANGUAGE";
+  RunSkillInlineScriptErrorCode2["NO_CODE_EXECUTOR"] = "NO_CODE_EXECUTOR";
+  RunSkillInlineScriptErrorCode2["EXECUTION_ERROR"] = "EXECUTION_ERROR";
+  RunSkillInlineScriptErrorCode2["CONFIRMATION_REJECTED"] = "CONFIRMATION_REJECTED";
+  return RunSkillInlineScriptErrorCode2;
+})(RunSkillInlineScriptErrorCode || {});
+const REQUIRE_CONFIRMATION_MESSAGE = "This tool call needs external confirmation before completion.";
 let RunSkillInlineScriptTool = class extends BaseTool {
   constructor(toolset) {
     super({
@@ -70,13 +79,13 @@ let RunSkillInlineScriptTool = class extends BaseTool {
     if (!inlineScriptContent) {
       return {
         error: "Script content is required.",
-        errorCode: "MISSING_SCRIPT_CONTENT"
+        errorCode: "MISSING_SCRIPT_CONTENT" /* MISSING_SCRIPT_CONTENT */
       };
     }
     if (!language) {
       return {
         error: "Language is required.",
-        errorCode: "MISSING_LANGUAGE"
+        errorCode: "MISSING_LANGUAGE" /* MISSING_LANGUAGE */
       };
     }
     let codeExecutor = (_a = this.toolset) == null ? void 0 : _a.codeExecutor;
@@ -89,9 +98,17 @@ let RunSkillInlineScriptTool = class extends BaseTool {
     if (!codeExecutor) {
       return {
         error: "No code executor configured.",
-        errorCode: "NO_CODE_EXECUTOR"
+        errorCode: "NO_CODE_EXECUTOR" /* NO_CODE_EXECUTOR */
       };
     }
+    const confirmationResult = this.enforceConfirmation(
+      toolContext,
+      inlineScriptContent,
+      language
+    );
+    if (confirmationResult) {
+      return confirmationResult;
+    }
     try {
       const result = await codeExecutor.executeCode({
         invocationContext: toolContext.invocationContext,
@@ -107,14 +124,44 @@ let RunSkillInlineScriptTool = class extends BaseTool {
     } catch (e) {
       return {
         error: "Failed to execute inline script: ".concat(e.message),
-        errorCode: "EXECUTION_ERROR"
+        errorCode: "EXECUTION_ERROR" /* EXECUTION_ERROR */
+      };
+    }
+  }
+  /**
+   * Enforces a human-in-the-loop confirmation gate before executing an inline
+   * script, using the repo's standard tool-confirmation mechanism.
+   *
+   * - When no confirmation has been provided yet, a confirmation is requested
+   *   (surfacing the language and script that would run) and an intermediate
+   *   result is returned so the tool call pauses until the client responds.
+   * - When a confirmation exists but was not confirmed, a rejection error is
+   *   returned and execution is refused.
+   * - When the confirmation is confirmed, `undefined` is returned to allow the
+   *   caller to proceed with execution.
+   */
+  enforceConfirmation(toolContext, scriptContent, language) {
+    const confirmation = toolContext.toolConfirmation;
+    if (!confirmation) {
+      toolContext.requestConfirmation({
+        hint: "Confirmation is required before executing an inline skill script. " + "The agent requested to run the following ".concat(language, " script in the ") + "code executor. Only approve if you trust its contents:\n\n" + scriptContent,
+        payload: { language, scriptContent }
+      });
+      return { partial: REQUIRE_CONFIRMATION_MESSAGE };
+    }
+    if (!confirmation.confirmed) {
+      return {
+        error: "Inline script execution was not confirmed and was rejected.",
+        errorCode: "CONFIRMATION_REJECTED" /* CONFIRMATION_REJECTED */
       };
     }
+    return void 0;
   }
 };
 RunSkillInlineScriptTool = __decorateClass([
   experimental
 ], RunSkillInlineScriptTool);
 export {
+  RunSkillInlineScriptErrorCode,
   RunSkillInlineScriptTool
 };

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

@@ -41,9 +41,11 @@ let SkillToolset = class extends BaseToolset {
       new ListSkillsTool(this),
       new LoadSkillTool(this),
       new LoadSkillResourceTool(this),
-      new RunSkillScriptTool(this),
-      new RunSkillInlineScriptTool(this)
+      new RunSkillScriptTool(this)
     ];
+    if (options.allowInlineScripts) {
+      this.tools.push(new RunSkillInlineScriptTool(this));
+    }
     if (this.registry) {
       this.tools.push(new SearchSkillsTool(this));
     }

package/dist/web/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/web/utils/branch_trie.js

@@ -0,0 +1,13 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+function isSegmentPrefix(currentBranch, targetBranch) {
+  return !targetBranch || targetBranch === currentBranch || !!currentBranch && currentBranch.startsWith("".concat(targetBranch, "."));
+}
+export {
+  isSegmentPrefix
+};

package/dist/web/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 "".concat(name, "/").concat(match[1]);
+    }
+  }
+  return "Browser";
+}
 function _getDefaultLabels() {
   let frameworkLabel = "".concat(ADK_LABEL, "/").concat(version);
   if (!isBrowser() && process.env[AGENT_ENGINE_TELEMETRY_ENV_VARIABLE_NAME]) {
     frameworkLabel = "".concat(frameworkLabel, "+").concat(AGENT_ENGINE_TELEMETRY_TAG);
   }
-  const languageLabel = "".concat(LANGUAGE_LABEL, "/").concat(isBrowser() ? window.navigator.userAgent : process.version);
+  const languageLabelDetail = isBrowser() ? (
+    // eslint-disable-next-line no-undef
+    parseUserAgent(window.navigator.userAgent)
+  ) : process.version;
+  const languageLabel = "".concat(LANGUAGE_LABEL, "/").concat(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/web/utils/env_aware_utils.js

@@ -29,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/web/utils/streaming_utils.js

@@ -75,7 +75,7 @@ import {
   FinishReason
 } from "@google/genai";
 import { JSONPath } from "jsonpath-plus";
-import { generateClientFunctionCallId } from "../agents/functions.js";
+import { generateClientFunctionCallId } from "../events/event.js";
 import { FeatureName, isFeatureEnabled } from "../features/feature_registry.js";
 import { createLlmResponse } from "../models/llm_response.js";
 const UNSAFE_PROPERTY_KEYS = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
@@ -401,10 +401,16 @@ class StreamingResponseAggregator {
     const candidate = (_b = (_a = this.response) == null ? void 0 : _a.candidates) == null ? void 0 : _b[0];
     const finishReason = (_c = this.finishReason) != null ? _c : candidate == null ? void 0 : candidate.finishReason;
     return {
-      content: {
-        role: "model",
-        parts: finalParts != null ? finalParts : []
-      },
+      // Only attach a model `content` when there are actual parts to emit. When
+      // the turn accumulated no parts (e.g. a function call that was already
+      // flushed, followed by a trailing STOP chunk that carries only usage
+      // metadata) we still surface that trailing metadata, but MUST NOT emit
+      // `content: { parts: [] }`. An empty-parts model turn corrupts the session
+      // history: on the next request the Vertex AI backend rejects the whole
+      // call with HTTP 400 "Unable to submit request because it must include at
+      // least one parts field", which breaks multi-turn tool-using sessions
+      // right after the first tool call (google/adk-js#21, #22).
+      content: finalParts ? { role: "model", parts: finalParts } : void 0,
       groundingMetadata: this.groundingMetadata,
       citationMetadata: this.citationMetadata,
       errorCode: finishReason === FinishReason.STOP ? void 0 : finishReason,

package/dist/web/utils/task.js

@@ -0,0 +1,34 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+class Task {
+  constructor(executable) {
+    this.executable = executable;
+    this.isDone = false;
+    this.abortController = new AbortController();
+    const markDone = () => {
+      this.isDone = true;
+    };
+    this.promise = executable(this.abortController.signal);
+    this.promise.then(markDone).catch(markDone);
+  }
+  /**
+   * Cancels the task execution.
+   */
+  cancel() {
+    this.abortController.abort();
+  }
+  /**
+   * Returns true if the task has completed (either resolved or rejected).
+   */
+  done() {
+    return this.isDone;
+  }
+}
+export {
+  Task
+};

package/dist/web/version.js

@@ -5,7 +5,7 @@ const require = topLevelCreateRequire(import.meta.url);
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-const version = "1.3.0";
+const version = "1.5.0";
 export {
   version
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/adk",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "Google ADK JS",
   "author": "Google",
   "license": "Apache-2.0",
@@ -45,7 +45,7 @@
     "@google-cloud/opentelemetry-cloud-trace-exporter": "^3.0.0",
     "@google-cloud/storage": "^7.17.1",
     "@google-cloud/vertexai": "^1.12.0",
-    "@google/genai": "^1.37.0",
+    "@google/genai": "^2.9.0",
     "@mikro-orm/core": "^6.6.10",
     "@mikro-orm/reflection": "^6.6.6",
     "@modelcontextprotocol/sdk": "^1.26.0",