@google/adk 2.4.0 → 2.5.0

package/dist/cjs/index.js

@@ -53,6 +53,8 @@ __export(index_exports, {
   LOGGING_FORMAT: () => import_logs.LOGGING_FORMAT,
   LoadSkillResourceTool: () => import_load_skill_resource_tool.LoadSkillResourceTool,
   LocalEnvironment: () => import_local_environment.LocalEnvironment,
+  LocalEvalSetResultsManager: () => import_cli_eval.LocalEvalSetResultsManager,
+  LocalEvalSetsManager: () => import_cli_eval.LocalEvalSetsManager,
   MISSING_EVAL_DEPENDENCIES_MESSAGE: () => import_cli_eval.MISSING_EVAL_DEPENDENCIES_MESSAGE,
   OAuth2BearerExchanger: () => import_oauth2_exchanger.OAuth2BearerExchanger,
   OpenAPIToolset: () => import_openapi_toolset.OpenAPIToolset,
@@ -67,7 +69,6 @@ __export(index_exports, {
   SecretManagerClient: () => import_secret_client.SecretManagerClient,
   ServiceAccountCredentialExchanger: () => import_service_account_exchanger.ServiceAccountCredentialExchanger,
   SkillToolset: () => import_skill_toolset.SkillToolset,
-  StaleSessionError: () => import_database_session_service.StaleSessionError,
   TOOL_TRAJECTORY_SCORE_KEY: () => import_cli_eval.TOOL_TRAJECTORY_SCORE_KEY,
   ToolAuthHandler: () => import_tool_auth_handler.ToolAuthHandler,
   ToolContextCredentialStore: () => import_tool_auth_handler.ToolContextCredentialStore,
@@ -77,7 +78,9 @@ __export(index_exports, {
   VertexAiSessionService: () => import_vertex_ai_session_service.VertexAiSessionService,
   actionRequest: () => import_connections_client.actionRequest,
   actionResponse: () => import_connections_client.actionResponse,
+  agentRuntimeRequestHooks: () => import_agent_runtime.agentRuntimeRequestHooks,
   connectorPayload: () => import_connections_client.connectorPayload,
+  convertEvalSetToSchema: () => import_cli_eval.convertEvalSetToSchema,
   createApiParameter: () => import_common.createApiParameter,
   createOperation: () => import_connections_client.createOperation,
   createOperationRequest: () => import_connections_client.createOperationRequest,
@@ -86,7 +89,6 @@ __export(index_exports, {
   credentialToParam: () => import_auth_helpers.credentialToParam,
   deleteOperation: () => import_connections_client.deleteOperation,
   deleteOperationRequest: () => import_connections_client.deleteOperationRequest,
-  dictToAuthScheme: () => import_auth_helpers.dictToAuthScheme,
   exchangeCredential: () => import_oauth2_exchanger.exchangeCredential,
   executeCustomQueryRequest: () => import_connections_client.executeCustomQueryRequest,
   generateAuthToken: () => import_oauth2_exchanger.generateAuthToken,
@@ -101,26 +103,30 @@ __export(index_exports, {
   getSessionServiceFromUri: () => import_registry2.getSessionServiceFromUri,
   getTypeHint: () => import_common.getTypeHint,
   isDebugLoggingPlugin: () => import_debug_logging_plugin.isDebugLoggingPlugin,
-  isStaleSessionError: () => import_database_session_service.isStaleSessionError,
   listOperation: () => import_connections_client.listOperation,
   listOperationRequest: () => import_connections_client.listOperationRequest,
   loadAllSkillsInDir: () => import_loader.loadAllSkillsInDir,
   loadDotenvForAgent: () => import_envs.loadDotenvForAgent,
+  loadEvalSetFromFile: () => import_cli_eval.loadEvalSetFromFile,
   loadSkillFromDir: () => import_loader.loadSkillFromDir,
   loadSkillFromZipBuffer: () => import_loader.loadSkillFromZipBuffer,
   loadWebPage: () => import_load_web_page.loadWebPage,
   logToTmpFolder: () => import_logs.logToTmpFolder,
-  openidDictToSchemeCredential: () => import_auth_helpers.openidDictToSchemeCredential,
+  normalizeEvalCase: () => import_cli_eval.normalizeEvalCase,
+  openidRecordToSchemeCredential: () => import_auth_helpers.openidRecordToSchemeCredential,
   openidUrlToSchemeCredential: () => import_auth_helpers.openidUrlToSchemeCredential,
   parseAndGetEvalsToRun: () => import_cli_eval.parseAndGetEvalsToRun,
+  recordToAuthScheme: () => import_auth_helpers.recordToAuthScheme,
   runEvals: () => import_cli_eval.runEvals,
-  serviceAccountDictToSchemeCredential: () => import_auth_helpers.serviceAccountDictToSchemeCredential,
+  runWithAgentEngineContext: () => import_agent_engine.runWithAgentEngineContext,
+  serviceAccountRecordToSchemeCredential: () => import_auth_helpers.serviceAccountRecordToSchemeCredential,
   serviceAccountSchemeCredential: () => import_auth_helpers.serviceAccountSchemeCredential,
   setupAdkLogger: () => import_logs.setupAdkLogger,
   tokenToSchemeCredential: () => import_auth_helpers.tokenToSchemeCredential,
   tryGetResetFunc: () => import_cli_eval.tryGetResetFunc,
   updateOperation: () => import_connections_client.updateOperation,
   updateOperationRequest: () => import_connections_client.updateOperationRequest,
+  validatePathSegment: () => import_path_validation.validatePathSegment,
   validateSkillDir: () => import_loader.validateSkillDir,
   walkToRootUntilFound: () => import_envs.walkToRootUntilFound
 });
@@ -170,12 +176,15 @@ var import_run_skill_inline_script_tool = require("./tools/skill/run_skill_inlin
 var import_run_skill_script_tool = require("./tools/skill/run_skill_script_tool.js");
 var import_skill_toolset = require("./tools/skill/skill_toolset.js");
 __reExport(index_exports, require("./integrations/agent_registry/agent_registry.js"), module.exports);
-__reExport(index_exports, require("./telemetry/google_cloud.js"), module.exports);
-__reExport(index_exports, require("./telemetry/setup.js"), module.exports);
+var import_agent_engine = require("./telemetry/export/agent_engine.js");
+var import_agent_runtime = require("./telemetry/export/agent_runtime.js");
+__reExport(index_exports, require("./telemetry/export/google_cloud.js"), module.exports);
+__reExport(index_exports, require("./telemetry/export/setup.js"), module.exports);
 __reExport(index_exports, require("./tools/google_api_tool/index.js"), module.exports);
 var import_cli_eval = require("./cli/cli_eval.js");
 var import_envs = require("./cli/utils/envs.js");
 var import_logs = require("./cli/utils/logs.js");
+var import_path_validation = require("./cli/utils/path_validation.js");
 __reExport(index_exports, require("./tools/mcp/index.js"), module.exports);
 /**
  * @license
@@ -213,6 +222,8 @@ __reExport(index_exports, require("./tools/mcp/index.js"), module.exports);
   LOGGING_FORMAT,
   LoadSkillResourceTool,
   LocalEnvironment,
+  LocalEvalSetResultsManager,
+  LocalEvalSetsManager,
   MISSING_EVAL_DEPENDENCIES_MESSAGE,
   OAuth2BearerExchanger,
   OpenAPIToolset,
@@ -227,7 +238,6 @@ __reExport(index_exports, require("./tools/mcp/index.js"), module.exports);
   SecretManagerClient,
   ServiceAccountCredentialExchanger,
   SkillToolset,
-  StaleSessionError,
   TOOL_TRAJECTORY_SCORE_KEY,
   ToolAuthHandler,
   ToolContextCredentialStore,
@@ -237,7 +247,9 @@ __reExport(index_exports, require("./tools/mcp/index.js"), module.exports);
   VertexAiSessionService,
   actionRequest,
   actionResponse,
+  agentRuntimeRequestHooks,
   connectorPayload,
+  convertEvalSetToSchema,
   createApiParameter,
   createOperation,
   createOperationRequest,
@@ -246,7 +258,6 @@ __reExport(index_exports, require("./tools/mcp/index.js"), module.exports);
   credentialToParam,
   deleteOperation,
   deleteOperationRequest,
-  dictToAuthScheme,
   exchangeCredential,
   executeCustomQueryRequest,
   generateAuthToken,
@@ -261,33 +272,37 @@ __reExport(index_exports, require("./tools/mcp/index.js"), module.exports);
   getSessionServiceFromUri,
   getTypeHint,
   isDebugLoggingPlugin,
-  isStaleSessionError,
   listOperation,
   listOperationRequest,
   loadAllSkillsInDir,
   loadDotenvForAgent,
+  loadEvalSetFromFile,
   loadSkillFromDir,
   loadSkillFromZipBuffer,
   loadWebPage,
   logToTmpFolder,
-  openidDictToSchemeCredential,
+  normalizeEvalCase,
+  openidRecordToSchemeCredential,
   openidUrlToSchemeCredential,
   parseAndGetEvalsToRun,
+  recordToAuthScheme,
   runEvals,
-  serviceAccountDictToSchemeCredential,
+  runWithAgentEngineContext,
+  serviceAccountRecordToSchemeCredential,
   serviceAccountSchemeCredential,
   setupAdkLogger,
   tokenToSchemeCredential,
   tryGetResetFunc,
   updateOperation,
   updateOperationRequest,
+  validatePathSegment,
   validateSkillDir,
   walkToRootUntilFound,
   ...require("./a2a/index.js"),
   ...require("./common.js"),
   ...require("./integrations/agent_registry/agent_registry.js"),
-  ...require("./telemetry/google_cloud.js"),
-  ...require("./telemetry/setup.js"),
+  ...require("./telemetry/export/google_cloud.js"),
+  ...require("./telemetry/export/setup.js"),
   ...require("./tools/google_api_tool/index.js"),
   ...require("./tools/mcp/index.js")
 });

package/dist/cjs/models/google_llm.js

@@ -31,6 +31,7 @@ __export(google_llm_exports, {
 });
 module.exports = __toCommonJS(google_llm_exports);
 var import_genai = require("@google/genai");
+var import_computer_use_toolset = require("../tools/computer_use/computer_use_toolset.js");
 var import_env_aware_utils = require("../utils/env_aware_utils.js");
 var import_logger = require("../utils/logger.js");
 var import_variant_utils = require("../utils/variant_utils.js");
@@ -102,6 +103,7 @@ const _Gemini = class _Gemini extends (_b = import_base_llm.BaseLlm, _a = GEMINI
    */
   async *generateContentAsync(llmRequest, stream = false, abortSignal) {
     var _a2, _b2;
+    await adaptComputerUseRequest(llmRequest);
     if (this.useInteractionsApi) {
       yield* (0, import_interactions_utils.generateContentViaInteractions)(this.apiClient, llmRequest, stream);
       return;
@@ -265,8 +267,14 @@ const _Gemini = class _Gemini extends (_b = import_base_llm.BaseLlm, _a = GEMINI
         for (const content of llmRequest.contents) {
           if (!content.parts) continue;
           for (const part of content.parts) {
-            removeDisplayNameIfPresent(part.inlineData);
-            removeDisplayNameIfPresent(part.fileData);
+            if (part.inlineData) {
+              part.inlineData = { ...part.inlineData };
+              removeDisplayNameIfPresent(part.inlineData);
+            }
+            if (part.fileData) {
+              part.fileData = { ...part.fileData };
+              removeDisplayNameIfPresent(part.fileData);
+            }
           }
         }
       }
@@ -287,6 +295,29 @@ _Gemini.supportedModels = [
   /projects\/.+\/locations\/.+\/publishers\/google\/models\/gemini.+/
 ];
 let Gemini = _Gemini;
+async function adaptComputerUseRequest(llmRequest) {
+  var _a2, _b2;
+  if (!((_b2 = (_a2 = llmRequest.config) == null ? void 0 : _a2.tools) == null ? void 0 : _b2.some(
+    (tool) => "computerUse" in tool && tool.computerUse
+  ))) {
+    return;
+  }
+  llmRequest.config.systemInstruction = void 0;
+  const waitTool = Object.hasOwn(llmRequest.toolsDict, "wait") ? llmRequest.toolsDict["wait"] : void 0;
+  await (0, import_computer_use_toolset.adaptComputerUseTool)({
+    methodName: "wait",
+    adapter: /* @__PURE__ */ __name((waitFunc) => ({
+      name: "wait_5_seconds",
+      description: "Waits for 5 seconds.",
+      execute: /* @__PURE__ */ __name((_args, toolContext) => waitFunc({ seconds: 5 }, toolContext), "execute")
+    }), "adapter"),
+    llmRequest
+  });
+  if (waitTool && Object.hasOwn(llmRequest.toolsDict, "wait_5_seconds")) {
+    llmRequest.toolsDict["wait"] = waitTool;
+  }
+}
+__name(adaptComputerUseRequest, "adaptComputerUseRequest");
 function removeDisplayNameIfPresent(dataObj) {
   if (dataObj && dataObj.displayName) {
     dataObj.displayName = void 0;

package/dist/cjs/models/interactions_utils.js

@@ -375,6 +375,9 @@ function convertToolsConfigToInteractionsFormat(config) {
     if (t.urlContext) {
       interactionTools.push({ type: "url_context" });
     }
+    if (t.computerUse) {
+      interactionTools.push({ type: "computer_use" });
+    }
   }
   return interactionTools;
 }

package/dist/cjs/plugins/base_plugin.js

@@ -82,9 +82,9 @@ const _BasePlugin = class _BasePlugin {
    *
    * @param _params.invocationContext The context for the entire invocation, containing
    *     session information, the root agent, etc.
-   * @returns An optional `Event` to be returned to the ADK. Returning a value
-   *     to halt execution of the runner and ends the runner with that event.
-   *     Return `undefined` to proceed normally.
+   * @returns An optional `Content` to be returned to the ADK. Returning a value
+   *     halts execution of the runner and ends the run with an event containing
+   *     that content. Return `undefined` to proceed normally.
    */
   async beforeRunCallback(_params) {
     return;
@@ -107,10 +107,12 @@ const _BasePlugin = class _BasePlugin {
     return;
   }
   /**
-   * Callback executed after an ADK runner run has completed.
+   * Callback executed after successful completion, abort, or early iterator close.
    *
    * This is the final callback in the ADK lifecycle, suitable for cleanup,
-   * final logging, or reporting tasks.
+   * final logging, or reporting tasks. It is skipped when execution fails;
+   * {@link onRunErrorCallback} is called instead. Receiving this callback does
+   * not imply success: recognized cancellation still propagates to the caller.
    *
    * @param _params.invocationContext The context for the entire invocation.
    * @returns undefined
@@ -118,6 +120,23 @@ const _BasePlugin = class _BasePlugin {
   async afterRunCallback(_params) {
     return;
   }
+  /**
+   * Observes an error escaping an agent's execution or lifecycle callbacks.
+   *
+   * Notification-only: return values are ignored and callback failures are
+   * logged. The original execution error always propagates.
+   */
+  async onAgentErrorCallback(_params) {
+  }
+  /**
+   * Observes an error in the run lifecycle, including before/after-run callbacks.
+   *
+   * Notification-only: return values are ignored and callback failures are
+   * logged. The original execution error always propagates. A completion-hook
+   * failure during early iterator close is reported but does not prevent closing.
+   */
+  async onRunErrorCallback(_params) {
+  }
   /**
    * Callback executed before an agent's primary logic is invoked.
    *
@@ -136,14 +155,14 @@ const _BasePlugin = class _BasePlugin {
   /**
    * Callback executed after an agent's primary logic has completed.
    *
-   * This callback can be used to inspect, log, or modify the agent's final
-   * result before it is returned.
+   * This callback can be used to inspect, log, or append an additional event
+   * after the agent's execution completes.
    *
    * @param _params.agent The agent that has just run.
    * @param _params.callbackContext The context for the agent invocation.
-   * @returns An optional `Content` object. If a value is returned, it will
-   *     replace the agent's original result. Returning `undefined` uses the
-   *     original, unmodified result.
+   * @returns An optional `Content` object. If a value is returned, it will be
+   *     emitted as an additional event appended after the agent's execution.
+   *     Returning `undefined` emits no additional content event.
    */
   async afterAgentCallback(_params) {
     return;
@@ -188,8 +207,8 @@ const _BasePlugin = class _BasePlugin {
    *
    * @param _params.callbackContext The context for the current agent call.
    * @param _params.llmRequest The prepared request object to be sent to the model.
-   * @returns An optional value. The interpretation of a non-`undefined`
-   *     trigger an early exit and returns the response immediately. Returning
+   * @returns An optional `LlmResponse`. Returning a non-`undefined` value
+   *     triggers an early exit and returns that response immediately. Returning
    *     `undefined` allows the LLM request to proceed normally.
    */
   async beforeModelCallback(_params) {
@@ -211,7 +230,7 @@ const _BasePlugin = class _BasePlugin {
     return;
   }
   /**
-   * Callback executed when a model call encounters an error.
+   * Callback executed when a model call encounters an `Error`.
    *
    * This callback provides an opportunity to handle model errors gracefully,
    * potentially providing alternative responses or recovery mechanisms.
@@ -219,10 +238,11 @@ const _BasePlugin = class _BasePlugin {
    * @param _params.callbackContext The context for the current agent call.
    * @param _params.llmRequest The request that was sent to the model when the error
    *     occurred.
-   * @param _params.error The exception that was raised during model execution.
-   * @returns An optional LlmResponse. If an LlmResponse is returned, it will be
-   *     used instead of propagating the error. Returning `undefined` allows
-   *     the original error to be raised.
+   * @param _params.error The `Error` instance thrown during model execution.
+   * @returns An optional `LlmResponse`. If an `LlmResponse` is returned, it
+   *     will be used instead of the default error response. Returning
+   *     `undefined` causes an error response/event with `errorCode` and
+   *     `errorMessage` derived from `error` to be yielded.
    */
   async onModelErrorCallback(_params) {
     return;
@@ -272,7 +292,8 @@ const _BasePlugin = class _BasePlugin {
     return;
   }
   /**
-   * Callback executed when a tool call encounters an error.
+   * Callback executed when a tool call encounters an `Error` or cannot be
+   * resolved.
    *
    * This callback provides an opportunity to handle tool errors gracefully,
    * potentially providing alternative responses or recovery mechanisms.
@@ -280,10 +301,13 @@ const _BasePlugin = class _BasePlugin {
    * @param _params.tool The tool instance that encountered an error.
    * @param _params.toolArgs The arguments that were passed to the tool.
    * @param _params.toolContext The context specific to the tool execution.
-   * @param _params.error The exception that was raised during tool execution.
+   * @param _params.error The `Error` that was raised during tool resolution or
+   *     execution.
    * @returns An optional dictionary. If a dictionary is returned, it will be
-   *     used as the tool response instead of propagating the error. Returning
-   *     `undefined` allows the original error to be raised.
+   *     used as the tool response instead of the default error response.
+   *     Returning `undefined` causes `{error: error.message}` to be returned as
+   *     the tool response (unlike adk-python, which re-raises). Non-`Error`
+   *     throwables bypass this callback and become `{error: thrownValue}`.
    */
   async onToolErrorCallback(_params) {
     return;

package/dist/cjs/plugins/plugin_manager.js

@@ -109,6 +109,33 @@ const _PluginManager = class _PluginManager {
     }
     return void 0;
   }
+  /** Notifies every plugin without allowing one failure to hide another. */
+  async runNotificationCallbacks(callback, callbackName) {
+    for (const plugin of this.plugins) {
+      try {
+        await callback(plugin);
+      } catch (error) {
+        import_logger.logger.error(
+          `Error in plugin '${plugin.name}' during '${callbackName}' callback:`,
+          error
+        );
+      }
+    }
+  }
+  /** Runs the notification-only agent error callback for every plugin. */
+  async runOnAgentErrorCallback(params) {
+    await this.runNotificationCallbacks(
+      (plugin) => plugin.onAgentErrorCallback(params),
+      "onAgentErrorCallback"
+    );
+  }
+  /** Runs the notification-only run error callback for every plugin. */
+  async runOnRunErrorCallback(params) {
+    await this.runNotificationCallbacks(
+      (plugin) => plugin.onRunErrorCallback(params),
+      "onRunErrorCallback"
+    );
+  }
   /**
    * Runs the `onUserMessageCallback` for all plugins.
    */