@google/adk 2.4.0 → 2.5.0

package/dist/esm/tools/application_integration_tool/clients/connections_client.js

@@ -17,10 +17,14 @@ var __decorateClass = (decorators, target, key, kind) => {
  * SPDX-License-Identifier: Apache-2.0
  */
 import { experimental } from "../../../utils/experimental.js";
-import { toJsonObject } from "../../../utils/json_utils.js";
+import {
+  isJsonObject,
+  toJsonObject
+} from "../../../utils/json_utils.js";
 import { CloudPlatformTokenSource, sendCloudRequest } from "./cloud_request.js";
 const CONNECTOR_URL = "https://connectors.googleapis.com";
 const OPERATION_POLL_INTERVAL_MS = 1e3;
+const MAX_OPERATION_POLL_ATTEMPTS = 60;
 function toStringValue(value) {
   return typeof value === "string" ? value : "";
 }
@@ -29,6 +33,16 @@ function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 __name(sleep, "sleep");
+function formatOperationError(error) {
+  if (typeof error === "string" && error.length > 0) {
+    return error;
+  }
+  if (isJsonObject(error) && typeof error["message"] === "string" && error["message"].length > 0) {
+    return error["message"];
+  }
+  return JSON.stringify(error);
+}
+__name(formatOperationError, "formatOperationError");
 function schemaRef(name) {
   return { $ref: `#/components/schemas/${name}` };
 }
@@ -110,6 +124,12 @@ const CONNECTOR_BASE_SPEC = {
         default: 120,
         description: "Timeout in seconds for execution of custom query"
       },
+      sortByColumns: {
+        type: "array",
+        items: { type: "string" },
+        default: [],
+        description: "Column to sort the results by"
+      },
       connectorOutputPayload: { type: "object" },
       nextPageToken: { type: "string" },
       "execute-connector_Response": {
@@ -436,7 +456,8 @@ function listOperationRequest(options) {
     connectionName: schemaRef("connectionName"),
     serviceName: schemaRef("serviceName"),
     host: schemaRef("host"),
-    entity: schemaRef("entity")
+    entity: schemaRef("entity"),
+    sortByColumns: schemaRef("sortByColumns")
   };
   if (options == null ? void 0 : options.includeDynamicAuthConfig) {
     properties["dynamicAuthConfig"] = schemaRef("dynamicAuthConfig");
@@ -483,7 +504,20 @@ function actionResponse(action) {
   };
 }
 __name(actionResponse, "actionResponse");
-function executeCustomQueryRequest() {
+function executeCustomQueryRequest(options) {
+  const properties = {
+    operation: schemaRef("operation"),
+    connectionName: schemaRef("connectionName"),
+    serviceName: schemaRef("serviceName"),
+    host: schemaRef("host"),
+    action: schemaRef("action"),
+    query: schemaRef("query"),
+    timeout: schemaRef("timeout"),
+    pageSize: schemaRef("pageSize")
+  };
+  if (options == null ? void 0 : options.includeDynamicAuthConfig) {
+    properties["dynamicAuthConfig"] = schemaRef("dynamicAuthConfig");
+  }
   return {
     type: "object",
     required: [
@@ -496,16 +530,7 @@ function executeCustomQueryRequest() {
       "timeout",
       "pageSize"
     ],
-    properties: {
-      operation: schemaRef("operation"),
-      connectionName: schemaRef("connectionName"),
-      serviceName: schemaRef("serviceName"),
-      host: schemaRef("host"),
-      action: schemaRef("action"),
-      query: schemaRef("query"),
-      timeout: schemaRef("timeout"),
-      pageSize: schemaRef("pageSize")
-    }
+    properties
   };
 }
 __name(executeCustomQueryRequest, "executeCustomQueryRequest");
@@ -533,7 +558,8 @@ let ConnectionsClient = class {
    * Reads the JSON schema of an entity and the operations it supports.
    *
    * @param entity The entity name.
-   * @throws Error When the API starts no operation for the entity.
+   * @throws Error When the API starts no operation for the entity, or the
+   *   operation fails or times out.
    */
   async getEntitySchemaAndOperations(entity) {
     const url = `${CONNECTOR_URL}/v1/projects/${this.project}/locations/${this.location}/connections/${this.connection}/connectionSchemaMetadata:getEntityType?entityId=${entity}`;
@@ -558,7 +584,8 @@ let ConnectionsClient = class {
    * Reads the input and output JSON schemas of an action.
    *
    * @param action The action name.
-   * @throws Error When the API starts no operation for the action.
+   * @throws Error When the API starts no operation for the action, or the
+   *   operation fails or times out.
    */
   async getActionSchema(action) {
     const url = `${CONNECTOR_URL}/v1/projects/${this.project}/locations/${this.location}/connections/${this.connection}/connectionSchemaMetadata:getAction?actionId=${action}`;
@@ -593,15 +620,31 @@ let ConnectionsClient = class {
       invalidRequestMessage: `Invalid request. Please check the provided values of project(${this.project}), location(${this.location}), connection(${this.connection}).`
     });
   }
-  /** Polls a long-running operation until it reports `done`. */
+  /**
+   * Polls a long-running operation until it reports `done`.
+   *
+   * @throws Error When the operation reports an `error` or does not finish
+   *   within `MAX_OPERATION_POLL_ATTEMPTS` polls.
+   */
   async pollOperation(operationId) {
     const url = `${CONNECTOR_URL}/v1/${operationId}`;
-    let operation = toJsonObject(await this.executeApiCall(url));
-    while (operation["done"] !== true) {
-      await sleep(OPERATION_POLL_INTERVAL_MS);
-      operation = toJsonObject(await this.executeApiCall(url));
+    for (let attempt = 0; attempt < MAX_OPERATION_POLL_ATTEMPTS; attempt++) {
+      if (attempt > 0) {
+        await sleep(OPERATION_POLL_INTERVAL_MS);
+      }
+      const operation = toJsonObject(await this.executeApiCall(url));
+      if (operation["error"]) {
+        throw new Error(
+          `Operation ${operationId} failed: ${formatOperationError(operation["error"])}`
+        );
+      }
+      if (operation["done"] === true) {
+        return operation;
+      }
     }
-    return operation;
+    throw new Error(
+      `Operation ${operationId} timed out after ${MAX_OPERATION_POLL_ATTEMPTS} poll attempts.`
+    );
   }
 };
 __name(ConnectionsClient, "ConnectionsClient");

package/dist/esm/tools/application_integration_tool/clients/integration_client.js

@@ -44,6 +44,7 @@ import {
 } from "./connections_client.js";
 const EXECUTE_CONNECTION_INTEGRATION = "ExecuteConnection";
 const EXECUTE_CUSTOM_QUERY_ACTION = "ExecuteCustomQuery";
+const REQUEST_SCHEMA_OPTIONS = Object.freeze({ includeDynamicAuthConfig: true });
 let IntegrationClient = class {
   constructor(options) {
     var _a, _b;
@@ -65,9 +66,7 @@ let IntegrationClient = class {
    *   that carries no parseable spec.
    */
   async getOpenApiSpecForIntegration() {
-    var _a;
     const url = `https://${this.location}-integrations.googleapis.com/v1/projects/${this.project}/locations/${this.location}:generateOpenApiSpec`;
-    const triggerId = (_a = this.triggers) != null ? _a : null;
     const invalidRequestMessage = `Invalid request. Please check the provided values of project(${this.project}), location(${this.location}), integration(${this.integration}).`;
     const body = await sendCloudRequest({
       url,
@@ -76,7 +75,7 @@ let IntegrationClient = class {
         apiTriggerResources: [
           {
             integrationResource: this.integration,
-            triggerId
+            triggerId: this.triggers
           }
         ],
         fileFormat: "JSON"
@@ -143,7 +142,10 @@ let IntegrationClient = class {
               toolName,
               toolInstructions
             });
-            schemas[`create_${entity}_Request`] = createOperationRequest(entity);
+            schemas[`create_${entity}_Request`] = createOperationRequest(
+              entity,
+              REQUEST_SCHEMA_OPTIONS
+            );
             break;
           case "update":
             connectorSpec.paths[path] = updateOperation({
@@ -151,7 +153,10 @@ let IntegrationClient = class {
               toolName,
               toolInstructions
             });
-            schemas[`update_${entity}_Request`] = updateOperationRequest(entity);
+            schemas[`update_${entity}_Request`] = updateOperationRequest(
+              entity,
+              REQUEST_SCHEMA_OPTIONS
+            );
             break;
           case "delete":
             connectorSpec.paths[path] = deleteOperation({
@@ -159,7 +164,9 @@ let IntegrationClient = class {
               toolName,
               toolInstructions
             });
-            schemas[`delete_${entity}_Request`] = deleteOperationRequest();
+            schemas[`delete_${entity}_Request`] = deleteOperationRequest(
+              REQUEST_SCHEMA_OPTIONS
+            );
             break;
           case "list":
             connectorSpec.paths[path] = listOperation({
@@ -168,7 +175,9 @@ let IntegrationClient = class {
               toolName,
               toolInstructions
             });
-            schemas[`list_${entity}_Request`] = listOperationRequest();
+            schemas[`list_${entity}_Request`] = listOperationRequest(
+              REQUEST_SCHEMA_OPTIONS
+            );
             break;
           case "get":
             connectorSpec.paths[path] = getOperation({
@@ -177,7 +186,9 @@ let IntegrationClient = class {
               toolName,
               toolInstructions
             });
-            schemas[`get_${entity}_Request`] = getOperationRequest();
+            schemas[`get_${entity}_Request`] = getOperationRequest(
+              REQUEST_SCHEMA_OPTIONS
+            );
             break;
           default:
             throw new Error(
@@ -191,10 +202,15 @@ let IntegrationClient = class {
       const actionDisplayName = displayName.replace(/ /g, "");
       let operation = "EXECUTE_ACTION";
       if (action === EXECUTE_CUSTOM_QUERY_ACTION) {
-        schemas[`${actionDisplayName}_Request`] = executeCustomQueryRequest();
+        schemas[`${actionDisplayName}_Request`] = executeCustomQueryRequest(
+          REQUEST_SCHEMA_OPTIONS
+        );
         operation = "EXECUTE_QUERY";
       } else {
-        schemas[`${actionDisplayName}_Request`] = actionRequest(actionDisplayName);
+        schemas[`${actionDisplayName}_Request`] = actionRequest(
+          actionDisplayName,
+          REQUEST_SCHEMA_OPTIONS
+        );
         schemas[`connectorInputPayload_${actionDisplayName}`] = connectorPayload(inputSchema);
       }
       schemas[`connectorOutputPayload_${actionDisplayName}`] = connectorPayload(outputSchema);

package/dist/esm/tools/application_integration_tool/integration_connector_tool.js

@@ -20,10 +20,7 @@ import { experimental } from "../../utils/experimental.js";
 import { logger } from "../../utils/logger.js";
 import { BaseTool } from "../base_tool.js";
 import { ToolAuthHandler } from "../openapi_tool/openapi_spec_parser/tool_auth_handler.js";
-const DYNAMIC_AUTH_EXCLUDE_FIELDS = Object.freeze([
-  "dynamic_auth_config",
-  "dynamicAuthConfig"
-]);
+const DYNAMIC_AUTH_CONFIG_FIELD = "dynamicAuthConfig";
 let IntegrationConnectorTool = class extends BaseTool {
   constructor(options) {
     var _a, _b, _c;
@@ -46,17 +43,15 @@ let IntegrationConnectorTool = class extends BaseTool {
       parameters = { ...rawParameters };
       if (rawParameters.properties) {
         const properties = { ...rawParameters.properties };
-        for (const field of [
-          ...IntegrationConnectorTool.EXCLUDE_FIELDS,
-          ...DYNAMIC_AUTH_EXCLUDE_FIELDS
-        ]) {
+        for (const field of IntegrationConnectorTool.EXCLUDE_FIELDS) {
           delete properties[field];
         }
+        delete properties[DYNAMIC_AUTH_CONFIG_FIELD];
         parameters.properties = properties;
       }
       if (rawParameters.required) {
         parameters.required = rawParameters.required.filter(
-          (field) => !IntegrationConnectorTool.EXCLUDE_FIELDS.includes(field) && !DYNAMIC_AUTH_EXCLUDE_FIELDS.includes(field) && !IntegrationConnectorTool.OPTIONAL_FIELDS.includes(field)
+          (field) => !IntegrationConnectorTool.EXCLUDE_FIELDS.includes(field) && field !== DYNAMIC_AUTH_CONFIG_FIELD && !IntegrationConnectorTool.OPTIONAL_FIELDS.includes(field)
         );
       }
     }
@@ -81,9 +76,7 @@ let IntegrationConnectorTool = class extends BaseTool {
     }
     const updatedArgs = {
       ...request.args,
-      connection_name: this.connectionName,
       connectionName: this.connectionName,
-      service_name: this.connectionServiceName,
       serviceName: this.connectionServiceName,
       host: this.connectionHost
     };
@@ -98,11 +91,14 @@ let IntegrationConnectorTool = class extends BaseTool {
     }
     if (authResult.authCredential) {
       const token = prepareDynamicEuc(authResult.authCredential);
-      const dynamicAuthPayload = {
-        "oauth2_auth_code_flow.access_token": token != null ? token : {}
+      if (!token) {
+        return {
+          error: "The resolved end-user credential has no access token."
+        };
+      }
+      updatedArgs[DYNAMIC_AUTH_CONFIG_FIELD] = {
+        "oauth2_auth_code_flow.access_token": token
       };
-      updatedArgs["dynamic_auth_config"] = dynamicAuthPayload;
-      updatedArgs["dynamicAuthConfig"] = dynamicAuthPayload;
     }
     logger.debug(`Running tool: ${this.name}`);
     return this.restApiTool.runAsync({
@@ -117,9 +113,7 @@ __name(IntegrationConnectorTool, "IntegrationConnectorTool");
  * excludes from the function declaration shown to the model.
  */
 IntegrationConnectorTool.EXCLUDE_FIELDS = Object.freeze([
-  "connection_name",
   "connectionName",
-  "service_name",
   "serviceName",
   "host",
   "entity",
@@ -131,13 +125,10 @@ IntegrationConnectorTool.EXCLUDE_FIELDS = Object.freeze([
  * `required` list in the function declaration shown to the model.
  */
 IntegrationConnectorTool.OPTIONAL_FIELDS = Object.freeze([
-  "page_size",
   "pageSize",
-  "page_token",
   "pageToken",
-  "filter",
-  "filter_clause",
-  "filterClause"
+  "filterClause",
+  "sortByColumns"
 ]);
 __decorateClass([
   experimental
@@ -150,7 +141,7 @@ IntegrationConnectorTool = __decorateClass([
 ], IntegrationConnectorTool);
 function prepareDynamicEuc(authCredential) {
   var _a, _b;
-  return ((_b = (_a = authCredential.http) == null ? void 0 : _a.credentials) == null ? void 0 : _b.token) || void 0;
+  return (_b = (_a = authCredential.http) == null ? void 0 : _a.credentials) == null ? void 0 : _b.token;
 }
 __name(prepareDynamicEuc, "prepareDynamicEuc");
 export {

package/dist/esm/tools/base_toolset.js

@@ -15,7 +15,7 @@ function isBaseToolset(obj) {
 __name(isBaseToolset, "isBaseToolset");
 _a = BASE_TOOLSET_SIGNATURE_SYMBOL;
 const _BaseToolset = class _BaseToolset {
-  constructor(toolFilter, prefix) {
+  constructor(toolFilter = [], prefix) {
     this.toolFilter = toolFilter;
     this.prefix = prefix;
     this[_a] = true;

package/dist/esm/tools/computer_use/base_computer.js

@@ -0,0 +1,99 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+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
+ */
+var _a;
+import {
+  FeatureName,
+  isFeatureEnabled
+} from "../../features/feature_registry.js";
+import { experimental } from "../../utils/experimental.js";
+var ComputerEnvironment = /* @__PURE__ */ ((ComputerEnvironment2) => {
+  ComputerEnvironment2["ENVIRONMENT_UNSPECIFIED"] = "ENVIRONMENT_UNSPECIFIED";
+  ComputerEnvironment2["ENVIRONMENT_BROWSER"] = "ENVIRONMENT_BROWSER";
+  return ComputerEnvironment2;
+})(ComputerEnvironment || {});
+function checkComputerUseEnabled() {
+  if (!isFeatureEnabled(FeatureName.COMPUTER_USE)) {
+    throw new Error(`Feature ${FeatureName.COMPUTER_USE} is not enabled.`);
+  }
+}
+__name(checkComputerUseEnabled, "checkComputerUseEnabled");
+const BASE_COMPUTER_SIGNATURE_SYMBOL = /* @__PURE__ */ Symbol.for("google.adk.baseComputer");
+function isBaseComputer(obj) {
+  return typeof obj === "object" && obj !== null && BASE_COMPUTER_SIGNATURE_SYMBOL in obj && obj[BASE_COMPUTER_SIGNATURE_SYMBOL] === true;
+}
+__name(isBaseComputer, "isBaseComputer");
+_a = BASE_COMPUTER_SIGNATURE_SYMBOL;
+let BaseComputer = class {
+  constructor() {
+    /** A unique symbol to identify ADK base computer class. */
+    this[_a] = true;
+    checkComputerUseEnabled();
+  }
+  /** Initializes the computer. */
+  async initialize() {
+  }
+  /** Cleans up the resources of the computer. */
+  async close() {
+  }
+  /**
+   * Called before each tool invocation to prepare resources.
+   *
+   * Override this to set up session-level resources (a sandbox, tokens, and so
+   * on), using the state of `toolContext` for persistence across invocations.
+   *
+   * @param _toolContext The tool context with session state access.
+   */
+  async prepare(_toolContext) {
+  }
+  /**
+   * Types text into the currently focused element.
+   *
+   * By default, this calls {@link keyCombination} once per character in `text`
+   * (and once for `"Enter"` when `pressEnter` is true). Because
+   * `keyCombination` is designed for key names and typically captures a new
+   * screenshot on every call, this fallback costs one round trip and screenshot
+   * per character, and relies on the backend accepting single characters in
+   * `keyCombination`. Subclasses should override this method to use native
+   * bulk text input.
+   *
+   * @param text The text to type.
+   * @param pressEnter Whether to press ENTER after typing.
+   * @returns The current state after typing.
+   */
+  async typeText(text, pressEnter = false) {
+    let state;
+    for (const char of text) {
+      state = await this.keyCombination([char]);
+    }
+    if (pressEnter) {
+      state = await this.keyCombination(["Enter"]);
+    }
+    return state != null ? state : this.currentState();
+  }
+};
+__name(BaseComputer, "BaseComputer");
+BaseComputer = __decorateClass([
+  experimental
+], BaseComputer);
+export {
+  BaseComputer,
+  ComputerEnvironment,
+  checkComputerUseEnabled,
+  isBaseComputer
+};