@google/adk 1.6.0 → 2.1.0

package/dist/esm/tools/built_in_tool.js

@@ -0,0 +1,51 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+var _a, _b;
+import { logger } from "../utils/logger.js";
+import {
+  BaseTool,
+  IN_MODEL_TOOL_SYMBOL
+} from "./base_tool.js";
+const _BuiltInTool = class _BuiltInTool extends (_b = BaseTool, _a = IN_MODEL_TOOL_SYMBOL, _b) {
+  constructor() {
+    super(...arguments);
+    /** Marks this tool as one the model runs itself. */
+    this[_a] = true;
+  }
+  async processLlmRequest(request) {
+    if (this._getDeclaration()) {
+      throw new Error(
+        `${this.name} extends BuiltInTool but returns a function declaration. A tool the model runs itself cannot declare a callable function; extend BaseTool instead.`
+      );
+    }
+    await this.applyBuiltInConfig(request);
+    if (!Object.hasOwn(request.llmRequest.toolsDict, this.name)) {
+      request.llmRequest.toolsDict[this.name] = this;
+    }
+  }
+  /**
+   * Answers a function call the model should not have made. The tool is
+   * already configured on the request and its results arrive as grounding
+   * metadata, so the model is told to use those rather than call again.
+   */
+  async runAsync() {
+    logger.warn(
+      `${this.name} runs inside the model but was called as a function; answering with guidance instead of executing anything.`
+    );
+    return {
+      error: `${this.name} runs inside the model and cannot be called as a function. It is already enabled on this request and its results arrive as grounding metadata; answer from those instead of calling it.`
+    };
+  }
+};
+__name(_BuiltInTool, "BuiltInTool");
+let BuiltInTool = _BuiltInTool;
+export {
+  BuiltInTool
+};

package/dist/esm/tools/consolidate_context_tool.js

@@ -1,5 +1,7 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2026 Google LLC
@@ -7,7 +9,7 @@ const require = topLevelCreateRequire(import.meta.url);
  */
 import { Type } from "@google/genai";
 import { BaseTool } from "./base_tool.js";
-class ConsolidateContextTool extends BaseTool {
+const _ConsolidateContextTool = class _ConsolidateContextTool extends BaseTool {
   constructor() {
     super({
       name: "consolidate_context",
@@ -45,7 +47,9 @@ class ConsolidateContextTool extends BaseTool {
       message: "Context consolidation requested."
     };
   }
-}
+};
+__name(_ConsolidateContextTool, "ConsolidateContextTool");
+let ConsolidateContextTool = _ConsolidateContextTool;
 export {
   ConsolidateContextTool
 };

package/dist/esm/tools/enterprise_web_search_tool.js

@@ -1,5 +1,7 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2026 Google LLC
@@ -10,7 +12,7 @@ import {
   isGeminiModel,
   isGeminiModelIdCheckDisabled
 } from "../utils/model_name.js";
-import { BaseTool } from "./base_tool.js";
+import { BuiltInTool } from "./built_in_tool.js";
 function applyEnterpriseWebSearch(llmRequest) {
   if (!llmRequest.model) {
     return;
@@ -31,22 +33,22 @@ function applyEnterpriseWebSearch(llmRequest) {
     `Enterprise Web Search tool is not supported for model ${llmRequest.model}`
   );
 }
-class EnterpriseWebSearchTool extends BaseTool {
+__name(applyEnterpriseWebSearch, "applyEnterpriseWebSearch");
+const _EnterpriseWebSearchTool = class _EnterpriseWebSearchTool extends BuiltInTool {
   constructor() {
     super({
       name: "enterprise_web_search",
       description: "Enterprise Web Search Tool"
     });
   }
-  runAsync() {
-    return Promise.resolve();
-  }
-  async processLlmRequest({
+  async applyBuiltInConfig({
     llmRequest
   }) {
     applyEnterpriseWebSearch(llmRequest);
   }
-}
+};
+__name(_EnterpriseWebSearchTool, "EnterpriseWebSearchTool");
+let EnterpriseWebSearchTool = _EnterpriseWebSearchTool;
 const ENTERPRISE_WEB_SEARCH = new EnterpriseWebSearchTool();
 export {
   ENTERPRISE_WEB_SEARCH,

package/dist/esm/tools/example_tool.js

@@ -1,5 +1,7 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2026 Google LLC
@@ -10,7 +12,7 @@ import { appendInstructions } from "../models/llm_request.js";
 import {
   BaseTool
 } from "./base_tool.js";
-class ExampleTool extends BaseTool {
+const _ExampleTool = class _ExampleTool extends BaseTool {
   constructor(examples) {
     super({
       // Name and description are not used because this tool only changes
@@ -36,7 +38,9 @@ class ExampleTool extends BaseTool {
       buildExampleSi(this.examples, parts[0].text, llmRequest.model)
     ]);
   }
-}
+};
+__name(_ExampleTool, "ExampleTool");
+let ExampleTool = _ExampleTool;
 export {
   ExampleTool
 };

package/dist/esm/tools/exit_loop_tool.js

@@ -1,12 +1,14 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { BaseTool } from "./base_tool.js";
-class ExitLoopTool extends BaseTool {
+const _ExitLoopTool = class _ExitLoopTool extends BaseTool {
   /** Creates an ExitLoopTool with its fixed name and description. */
   constructor() {
     super({
@@ -35,7 +37,9 @@ class ExitLoopTool extends BaseTool {
     toolContext.actions.skipSummarization = true;
     return "";
   }
-}
+};
+__name(_ExitLoopTool, "ExitLoopTool");
+let ExitLoopTool = _ExitLoopTool;
 const EXIT_LOOP = new ExitLoopTool();
 export {
   EXIT_LOOP,

package/dist/esm/tools/finish_task_tool.js

@@ -0,0 +1,92 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { Type } from "@google/genai";
+import { appendInstructions } from "../models/llm_request.js";
+import {
+  BaseTool
+} from "./base_tool.js";
+const FINISH_TASK_TOOL_NAME = "finish_task";
+const FINISH_TASK_SUCCESS_RESULT = "Task completed.";
+const DEFAULT_TASK_OUTPUT_SCHEMA = {
+  type: Type.OBJECT,
+  properties: {
+    result: {
+      type: Type.STRING,
+      description: "A brief summary of what the agent accomplished."
+    }
+  },
+  required: ["result"]
+};
+const _FinishTaskTool = class _FinishTaskTool extends BaseTool {
+  constructor(outputSchema) {
+    const schema = outputSchema != null ? outputSchema : DEFAULT_TASK_OUTPUT_SCHEMA;
+    let description = "Signal that this agent has completed its delegated task. Call this when you have finished your delegated task.";
+    if (outputSchema) {
+      description += " Pass the required output data in the parameters.";
+    }
+    super({ name: FINISH_TASK_TOOL_NAME, description });
+    this.outputSchema = schema;
+    this.wrapperKey = schema.type === Type.OBJECT ? void 0 : "result";
+  }
+  _getDeclaration() {
+    const parameters = this.wrapperKey ? {
+      type: Type.OBJECT,
+      properties: { [this.wrapperKey]: this.outputSchema },
+      required: [this.wrapperKey]
+    } : this.outputSchema;
+    return { name: this.name, description: this.description, parameters };
+  }
+  async processLlmRequest(request) {
+    await super.processLlmRequest(request);
+    appendInstructions(request.llmRequest, [
+      "Do NOT call `finish_task` prematurely. Use your available tools to fully complete every aspect of the task first. If the task is unclear, ask the user for clarification before proceeding. Once the task is fully complete, call `finish_task` by itself with no accompanying text output."
+    ]);
+  }
+  /**
+   * Extracts the task output from a `finish_task` call's arguments, applying the
+   * wrapper-key unwrapping when the schema is a non-object.
+   */
+  extractOutput(args) {
+    if (this.wrapperKey) {
+      return args[this.wrapperKey];
+    }
+    return args;
+  }
+  async runAsync({ args }) {
+    const value = this.wrapperKey ? args[this.wrapperKey] : args;
+    const missing = this.missingRequiredKeys(value);
+    if (missing.length > 0) {
+      return {
+        error: `Invoking \`${this.name}()\` failed due to missing required parameters: ${missing.join(", ")}. You could retry calling this tool, but it is IMPORTANT for you to provide all the mandatory parameters with correct types.`
+      };
+    }
+    return FINISH_TASK_SUCCESS_RESULT;
+  }
+  /** Returns any `required` keys the schema declares that are absent. */
+  missingRequiredKeys(value) {
+    var _a;
+    const required = this.wrapperKey ? value === void 0 || value === null ? [this.wrapperKey] : [] : (_a = this.outputSchema.required) != null ? _a : [];
+    if (this.wrapperKey) {
+      return required;
+    }
+    if (typeof value !== "object" || value === null) {
+      return required;
+    }
+    const obj = value;
+    return required.filter((key) => obj[key] === void 0);
+  }
+};
+__name(_FinishTaskTool, "FinishTaskTool");
+let FinishTaskTool = _FinishTaskTool;
+export {
+  FINISH_TASK_SUCCESS_RESULT,
+  FINISH_TASK_TOOL_NAME,
+  FinishTaskTool
+};

package/dist/esm/tools/forwarding_artifact_service.js

@@ -1,14 +1,24 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-class ForwardingArtifactService {
+var _a;
+const SESSION_ARTIFACT_SERVICE_SIGNATURE_SYMBOL = /* @__PURE__ */ Symbol.for(
+  "google.adk.sessionArtifactService"
+);
+_a = SESSION_ARTIFACT_SERVICE_SIGNATURE_SYMBOL;
+const _ForwardingArtifactService = class _ForwardingArtifactService {
   constructor(toolContext) {
     this.toolContext = toolContext;
-    this.invocationContext = toolContext.invocationContext;
+    /**
+     * Brands this class as a session-scoped artifact service.
+     */
+    this[_a] = true;
   }
   async saveArtifact(request) {
     return this.toolContext.saveArtifact(request.filename, request.artifact);
@@ -16,32 +26,31 @@ class ForwardingArtifactService {
   async loadArtifact(request) {
     return this.toolContext.loadArtifact(request.filename, request.version);
   }
-  async listArtifactKeys(_request) {
+  async listArtifactKeys() {
     return this.toolContext.listArtifacts();
   }
   getArtifactService() {
-    const service = this.invocationContext.artifactService;
+    const service = this.toolContext.invocationContext.artifactService;
     if (!service) {
       throw new Error("Artifact service is not initialized.");
     }
     return service;
   }
-  async deleteArtifact(request) {
-    return this.getArtifactService().deleteArtifact(request.filename);
+  async deleteArtifact(filename) {
+    return this.getArtifactService().deleteArtifact(filename);
   }
-  async listVersions(request) {
-    return this.getArtifactService().listVersions(request.filename);
+  async listVersions(filename) {
+    return this.getArtifactService().listVersions(filename);
   }
-  async listArtifactVersions(request) {
-    return this.getArtifactService().listArtifactVersions(request.filename);
+  async listArtifactVersions(filename) {
+    return this.getArtifactService().listArtifactVersions(filename);
   }
   async getArtifactVersion(request) {
-    return this.getArtifactService().getArtifactVersion({
-      filename: request.filename,
-      version: request.version
-    });
+    return this.getArtifactService().getArtifactVersion(request);
   }
-}
+};
+__name(_ForwardingArtifactService, "ForwardingArtifactService");
+let ForwardingArtifactService = _ForwardingArtifactService;
 export {
   ForwardingArtifactService
 };

package/dist/esm/tools/function_tool.js

@@ -1,5 +1,7 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -18,17 +20,19 @@ function toSchema(parameters) {
   }
   return parameters;
 }
-const FUNCTION_TOOL_SIGNATURE_SYMBOL = Symbol.for("google.adk.functionTool");
+__name(toSchema, "toSchema");
+const FUNCTION_TOOL_SIGNATURE_SYMBOL = /* @__PURE__ */ Symbol.for("google.adk.functionTool");
 function isFunctionTool(obj) {
   return typeof obj === "object" && obj !== null && FUNCTION_TOOL_SIGNATURE_SYMBOL in obj && obj[FUNCTION_TOOL_SIGNATURE_SYMBOL] === true;
 }
-class FunctionTool extends (_b = BaseTool, _a = FUNCTION_TOOL_SIGNATURE_SYMBOL, _b) {
+__name(isFunctionTool, "isFunctionTool");
+const _FunctionTool = class _FunctionTool extends (_b = BaseTool, _a = FUNCTION_TOOL_SIGNATURE_SYMBOL, _b) {
   /**
    * The constructor acts as the user-friendly factory.
    * @param options The configuration for the tool.
    */
   constructor(options) {
-    var _a2;
+    var _a2, _b2;
     const name = (_a2 = options.name) != null ? _a2 : options.execute.name;
     if (!name) {
       throw new Error(
@@ -44,6 +48,7 @@ class FunctionTool extends (_b = BaseTool, _a = FUNCTION_TOOL_SIGNATURE_SYMBOL,
     this[_a] = true;
     this.execute = options.execute;
     this.parameters = options.parameters;
+    this.requireConfirmation = (_b2 = options.requireConfirmation) != null ? _b2 : false;
   }
   /**
    * Returns the function declaration derived from the tool's name, description,
@@ -57,28 +62,92 @@ class FunctionTool extends (_b = BaseTool, _a = FUNCTION_TOOL_SIGNATURE_SYMBOL,
     };
   }
   /**
-   * Validates the model-provided arguments against the parameter schema and
-   * invokes the user-defined `execute` function.
+   * Invokes the user-defined `execute` function with the model-provided
+   * arguments, after parsing them when `parameters` is a Zod object schema.
+   * Any other `parameters` value is passed through unchecked.
    *
    * @param req The tool request containing arguments and tool context.
    * @returns A promise resolving to the function's return value.
+   * @throws {Error} Wrapped as `Error in tool '<name>': …` when a Zod
+   *     `parameters` schema rejects the arguments or `execute` throws.
    */
   async runAsync(req) {
     try {
-      let validatedArgs = req.args;
-      if (isZodObject(this.parameters)) {
-        validatedArgs = this.parameters.parse(req.args);
-      }
-      return await this.execute(
+      const validatedArgs = this.validateArgs(req.args);
+      const pending = await this.checkConfirmation(
         validatedArgs,
         req.toolContext
       );
+      if (pending !== void 0) {
+        return pending;
+      }
+      return await this.execute(validatedArgs, req.toolContext);
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : String(error);
       throw new Error(`Error in tool '${this.name}': ${errorMessage}`);
     }
   }
-}
+  /**
+   * Whether this call is gated on human approval — the static flag, or the
+   * predicate evaluated against the validated arguments.
+   *
+   * @param args The arguments the tool would run with.
+   * @param toolContext The context of the call, when there is one.
+   * @return Whether the call requires confirmation.
+   */
+  async checkRequireConfirmation(args, toolContext) {
+    if (typeof this.requireConfirmation !== "function") {
+      return this.requireConfirmation;
+    }
+    return this.requireConfirmation(this.validateArgs(args), toolContext);
+  }
+  /** Parses `args` against the parameter schema, when one is declared. */
+  validateArgs(args) {
+    if (isZodObject(this.parameters)) {
+      return this.parameters.parse(args);
+    }
+    return args;
+  }
+  /** Resolves `requireConfirmation`, which may be a flag or a predicate. */
+  async evaluateRequireConfirmation(input, toolContext) {
+    return typeof this.requireConfirmation === "function" ? this.requireConfirmation(input, toolContext) : this.requireConfirmation;
+  }
+  /**
+   * Evaluates the confirmation gate. Returns `undefined` if the tool may
+   * proceed; otherwise returns the function response payload to surface instead
+   * of running (a request-for-confirmation on the first pass, or a rejection
+   * once the user declined).
+   */
+  async checkConfirmation(input, toolContext) {
+    const requireConfirmation = await this.evaluateRequireConfirmation(
+      input,
+      toolContext
+    );
+    if (!requireConfirmation) {
+      return void 0;
+    }
+    if (!toolContext) {
+      throw new Error(
+        `Tool '${this.name}' requires confirmation but no tool context was provided.`
+      );
+    }
+    if (!toolContext.toolConfirmation) {
+      toolContext.requestConfirmation({
+        hint: `Please approve or reject the tool call ${this.name}() by responding with a FunctionResponse with an expected ToolConfirmation payload.`
+      });
+      toolContext.actions.skipSummarization = true;
+      return {
+        error: "This tool call requires confirmation, please approve or reject."
+      };
+    }
+    if (!toolContext.toolConfirmation.confirmed) {
+      return { error: "This tool call is rejected." };
+    }
+    return void 0;
+  }
+};
+__name(_FunctionTool, "FunctionTool");
+let FunctionTool = _FunctionTool;
 export {
   FunctionTool,
   isFunctionTool

package/dist/esm/tools/get_user_choice_tool.js

@@ -1,5 +1,7 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2026 Google LLC
@@ -13,12 +15,12 @@ const getUserChoiceTool = new LongRunningFunctionTool({
   parameters: z.object({
     options: z.array(z.string()).describe("List of options to present to the user.")
   }),
-  execute: async (input, context) => {
+  execute: /* @__PURE__ */ __name(async (input, context) => {
     if (context) {
       context.actions.skipSummarization = true;
     }
     return null;
-  }
+  }, "execute")
 });
 export {
   getUserChoiceTool

package/dist/esm/tools/google_maps_grounding_tool.js

@@ -1,5 +1,7 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2026 Google LLC
@@ -10,7 +12,7 @@ import {
   isGeminiModel,
   isGeminiModelIdCheckDisabled
 } from "../utils/model_name.js";
-import { BaseTool } from "./base_tool.js";
+import { BuiltInTool } from "./built_in_tool.js";
 function applyGoogleMapsGrounding(llmRequest) {
   if (!llmRequest.model) {
     return;
@@ -33,19 +35,19 @@ function applyGoogleMapsGrounding(llmRequest) {
     `Google maps tool is not supported for model ${llmRequest.model}`
   );
 }
-class GoogleMapsGroundingTool extends BaseTool {
+__name(applyGoogleMapsGrounding, "applyGoogleMapsGrounding");
+const _GoogleMapsGroundingTool = class _GoogleMapsGroundingTool extends BuiltInTool {
   constructor() {
     super({ name: "google_maps", description: "Google Maps Grounding Tool" });
   }
-  runAsync() {
-    return Promise.resolve();
-  }
-  async processLlmRequest({
+  async applyBuiltInConfig({
     llmRequest
   }) {
     applyGoogleMapsGrounding(llmRequest);
   }
-}
+};
+__name(_GoogleMapsGroundingTool, "GoogleMapsGroundingTool");
+let GoogleMapsGroundingTool = _GoogleMapsGroundingTool;
 const GOOGLE_MAPS_GROUNDING = new GoogleMapsGroundingTool();
 export {
   GOOGLE_MAPS_GROUNDING,

package/dist/esm/tools/google_search_tool.js

@@ -1,20 +1,19 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { isGemini1Model, isGeminiModel } from "../utils/model_name.js";
-import { BaseTool } from "./base_tool.js";
-class GoogleSearchTool extends BaseTool {
+import { BuiltInTool } from "./built_in_tool.js";
+const _GoogleSearchTool = class _GoogleSearchTool extends BuiltInTool {
   constructor() {
     super({ name: "google_search", description: "Google Search Tool" });
   }
-  runAsync() {
-    return Promise.resolve();
-  }
-  async processLlmRequest({
+  async applyBuiltInConfig({
     llmRequest
   }) {
     if (!llmRequest.model) {
@@ -43,7 +42,9 @@ class GoogleSearchTool extends BaseTool {
       `Google search tool is not supported for model ${llmRequest.model}`
     );
   }
-}
+};
+__name(_GoogleSearchTool, "GoogleSearchTool");
+let GoogleSearchTool = _GoogleSearchTool;
 const GOOGLE_SEARCH = new GoogleSearchTool();
 export {
   GOOGLE_SEARCH,