@google/adk 2.4.0 → 2.5.0

package/dist/cjs/code_executors/container_code_executor.js

@@ -70,8 +70,16 @@ let ContainerCodeExecutor = class extends import_base_code_executor.BaseCodeExec
   constructor(options = {}) {
     var _a, _b, _c;
     super();
+    /** Started session containers, ordered from least to most recently used. */
     this.containers = /* @__PURE__ */ new Map();
+    /** Container starts that are still in flight, keyed by session. */
     this.initPromises = /* @__PURE__ */ new Map();
+    /**
+     * Number of `executeCode` calls in progress per session. A session with a
+     * call in progress is never evicted, so a run is not stopped midway.
+     */
+    this.activeExecutions = /* @__PURE__ */ new Map();
+    this.closing = false;
     if (!options.image && !options.dockerPath) {
       throw new Error(
         "Either image or dockerPath must be set for ContainerCodeExecutor."
@@ -83,6 +91,12 @@ let ContainerCodeExecutor = class extends import_base_code_executor.BaseCodeExec
         "timeoutSeconds must be greater than 0 for ContainerCodeExecutor."
       );
     }
+    this.maxContainers = options.maxContainers;
+    if (this.maxContainers !== void 0 && (!Number.isInteger(this.maxContainers) || this.maxContainers < 1)) {
+      throw new Error(
+        "maxContainers must be a positive integer for ContainerCodeExecutor."
+      );
+    }
     this.dockerPath = options.dockerPath ? path.resolve(options.dockerPath) : void 0;
     this.containerOptions = {
       image: (_b = options.image) != null ? _b : DEFAULT_IMAGE_TAG,
@@ -94,6 +108,7 @@ let ContainerCodeExecutor = class extends import_base_code_executor.BaseCodeExec
     defineFrozenFalse(this, "optimizeDataFile");
   }
   async executeCode(params) {
+    var _a, _b;
     const { code, language } = params.codeExecutionInput;
     const command = LANGUAGE_RUNTIME_COMMAND_MAP[language];
     if (!command) {
@@ -102,20 +117,31 @@ let ContainerCodeExecutor = class extends import_base_code_executor.BaseCodeExec
       );
     }
     const key = sessionKey(params.invocationContext);
-    const container = await this.ensureContainer(key);
-    const { stdout, stderr, exitCode } = await container.execute(
-      [...TIMEOUT_COMMAND, String(this.timeoutSeconds), ...command, code],
-      this.timeoutSeconds
-    );
-    import_logger.logger.debug(`Executed ${language} code:
+    this.activeExecutions.set(key, ((_a = this.activeExecutions.get(key)) != null ? _a : 0) + 1);
+    try {
+      const container = await this.ensureContainer(key);
+      const { stdout, stderr, exitCode } = await container.execute(
+        [...TIMEOUT_COMMAND, String(this.timeoutSeconds), ...command, code],
+        this.timeoutSeconds
+      );
+      import_logger.logger.debug(`Executed ${language} code:
 \`\`\`
 ${code}
 \`\`\``);
-    return {
-      stdout,
-      stderr: this.describeExit(stderr, exitCode),
-      outputFiles: []
-    };
+      return {
+        stdout,
+        stderr: this.describeExit(stderr, exitCode),
+        outputFiles: []
+      };
+    } finally {
+      const remaining = ((_b = this.activeExecutions.get(key)) != null ? _b : 1) - 1;
+      if (remaining > 0) {
+        this.activeExecutions.set(key, remaining);
+      } else {
+        this.activeExecutions.delete(key);
+      }
+      this.evictLeastRecentlyUsed();
+    }
   }
   /**
    * Turns a non-zero exit into stderr the model can see. An empty stderr maps
@@ -135,41 +161,134 @@ ${message}` : message;
     return stderr;
   }
   /**
-   * Stops and removes every session's container. Safe to call when none has
-   * been started; provided for deterministic teardown in tests and app
+   * Stops and removes every session's container. Waits for container starts
+   * that are still in flight, so no container is left running after it
+   * resolves. Safe to call when none has been started, and concurrent calls
+   * share one teardown. Provided for deterministic teardown in tests and app
    * shutdown.
    */
-  async close() {
-    const containers = [...this.containers.values()];
-    this.containers.clear();
-    this.initPromises.clear();
-    await Promise.all(containers.map((container) => container.stop()));
+  close() {
+    var _a;
+    (_a = this.closePromise) != null ? _a : this.closePromise = this.stopAll().finally(() => {
+      this.closePromise = void 0;
+    });
+    return this.closePromise;
+  }
+  async stopAll() {
+    this.closing = true;
+    try {
+      while (this.initPromises.size > 0) {
+        await Promise.allSettled([...this.initPromises.values()]);
+      }
+      const containers = [...this.containers.values()];
+      this.containers.clear();
+      this.initPromises.clear();
+      await Promise.allSettled(containers.map((container) => container.stop()));
+    } finally {
+      this.closing = false;
+    }
   }
-  /** Lazily builds/starts the given session's container exactly once. */
+  /**
+   * Returns the given session's container, starting it if needed. Concurrent
+   * calls for one session share a single in-flight start, and reuse marks the
+   * container as the most recently used.
+   */
   ensureContainer(key) {
-    let initPromise = this.initPromises.get(key);
-    if (!initPromise) {
-      initPromise = this.initContainer(key).catch((error) => {
+    const existing = this.containers.get(key);
+    if (existing) {
+      this.containers.delete(key);
+      this.containers.set(key, existing);
+      return Promise.resolve(existing);
+    }
+    const inFlight = this.initPromises.get(key);
+    if (inFlight) {
+      return inFlight;
+    }
+    const initPromise = this.initContainer(
+      key
+    ).finally(() => {
+      if (this.initPromises.get(key) === initPromise) {
         this.initPromises.delete(key);
-        throw error;
-      });
-      this.initPromises.set(key, initPromise);
+      }
+    });
+    this.initPromises.set(key, initPromise);
+    return initPromise;
+  }
+  /**
+   * Builds the image from `dockerPath` once and shares the build across every
+   * session. A failed build is cleared so the next call retries it.
+   */
+  ensureImageBuilt() {
+    var _a;
+    const dockerPath = this.dockerPath;
+    if (!dockerPath) {
+      return Promise.resolve();
     }
-    return initPromise.then(() => this.containers.get(key));
+    (_a = this.buildPromise) != null ? _a : this.buildPromise = new import_docker_container.DockerContainer(this.containerOptions).build(dockerPath).catch((error) => {
+      this.buildPromise = void 0;
+      throw error;
+    });
+    return this.buildPromise;
   }
   async initContainer(key) {
+    await this.ensureImageBuilt();
+    if (this.closing) {
+      throw new Error(
+        "ContainerCodeExecutor closed during container initialization."
+      );
+    }
     const container = new import_docker_container.DockerContainer(this.containerOptions);
-    if (this.dockerPath) {
-      await container.build(this.dockerPath);
+    try {
+      await container.start();
+      const { exitCode } = await container.execute(
+        ["which", "python3"],
+        this.timeoutSeconds
+      );
+      if (exitCode !== 0) {
+        throw new Error("python3 is not installed in the container.");
+      }
+    } catch (error) {
+      await container.stop().catch((stopError) => {
+        import_logger.logger.debug(
+          `Failed to stop container after failed start: ${stopError}`
+        );
+      });
+      throw error;
+    }
+    if (this.closing) {
+      await container.stop().catch((stopError) => {
+        import_logger.logger.debug(`Failed to stop container during close: ${stopError}`);
+      });
+      throw new Error(
+        "ContainerCodeExecutor closed during container initialization."
+      );
     }
-    await container.start();
     this.containers.set(key, container);
-    const { exitCode } = await container.execute(
-      ["which", "python3"],
-      this.timeoutSeconds
-    );
-    if (exitCode !== 0) {
-      throw new Error("python3 is not installed in the container.");
+    this.evictLeastRecentlyUsed();
+    return container;
+  }
+  /**
+   * Stops the least recently used idle session containers until the count is
+   * within `maxContainers`. A session with a call in progress is skipped, which
+   * includes the caller that just registered its container; if every session
+   * is busy, the overshoot stays until a call ends. The stop is not awaited so
+   * the caller is not delayed by another session's teardown.
+   */
+  evictLeastRecentlyUsed() {
+    if (this.maxContainers === void 0) {
+      return;
+    }
+    for (const [key, container] of this.containers) {
+      if (this.containers.size <= this.maxContainers) {
+        return;
+      }
+      if (this.activeExecutions.has(key)) {
+        continue;
+      }
+      this.containers.delete(key);
+      void container.stop().catch((error) => {
+        import_logger.logger.debug(`Failed to stop evicted container: ${error}`);
+      });
     }
   }
 };
@@ -178,7 +297,10 @@ ContainerCodeExecutor = __decorateClass([
   import_experimental.experimental
 ], ContainerCodeExecutor);
 function sessionKey(invocationContext) {
-  const session = invocationContext.session;
+  const session = invocationContext == null ? void 0 : invocationContext.session;
+  if (!session) {
+    return "default";
+  }
   return JSON.stringify([session.appName, session.userId, session.id]);
 }
 __name(sessionKey, "sessionKey");

package/dist/cjs/common.js

@@ -44,6 +44,7 @@ __export(common_exports, {
   AuthSchemeType: () => import_auth_schemes.AuthSchemeType,
   BaseAgent: () => import_base_agent.BaseAgent,
   BaseCodeExecutor: () => import_base_code_executor.BaseCodeExecutor,
+  BaseComputer: () => import_base_computer.BaseComputer,
   BaseEnvironment: () => import_base_environment.BaseEnvironment,
   BaseExampleProvider: () => import_base_example_provider.BaseExampleProvider,
   BaseLlm: () => import_base_llm.BaseLlm,
@@ -66,6 +67,9 @@ __export(common_exports, {
   ChromeModelUnavailableError: () => import_chrome_prompt_llm.ChromeModelUnavailableError,
   CodeExecutionLanguage: () => import_code_execution_utils.CodeExecutionLanguage,
   CodeExecutionResponseProcessor: () => import_code_execution_request_processor.CodeExecutionResponseProcessor,
+  ComputerEnvironment: () => import_base_computer.ComputerEnvironment,
+  ComputerUseTool: () => import_computer_use_tool.ComputerUseTool,
+  ComputerUseToolset: () => import_computer_use_toolset.ComputerUseToolset,
   ConsolidateContextTool: () => import_consolidate_context_tool.ConsolidateContextTool,
   ContentRequestProcessor: () => import_content_request_processor.ContentRequestProcessor,
   Context: () => import_context.Context,
@@ -150,6 +154,7 @@ __export(common_exports, {
   REQUEST_INPUT_FUNCTION_CALL_NAME: () => import_functions.REQUEST_INPUT_FUNCTION_CALL_NAME,
   RESERVED_TOOL_CALL_ERROR_TYPE: () => import_reflect_retry_model_plugin.RESERVED_TOOL_CALL_ERROR_TYPE,
   RESTORED_EVENT_KEY: () => import_internal_metadata.RESTORED_EVENT_KEY,
+  RUNNER_CLEANUP_TIMEOUT_MS: () => import_cleanup.RUNNER_CLEANUP_TIMEOUT_MS,
   ReadonlyContext: () => import_readonly_context.ReadonlyContext,
   ReflectAndRetryModelPlugin: () => import_reflect_retry_model_plugin.ReflectAndRetryModelPlugin,
   ReflectAndRetryToolPlugin: () => import_reflect_retry_tool_plugin.ReflectAndRetryToolPlugin,
@@ -165,6 +170,7 @@ __export(common_exports, {
   SequentialAgent: () => import_sequential_agent.SequentialAgent,
   SessionNotFoundError: () => import_session_not_found_error.SessionNotFoundError,
   SessionStateCredentialService: () => import_session_state_credential_service.SessionStateCredentialService,
+  StaleSessionError: () => import_stale_session_error.StaleSessionError,
   State: () => import_state.State,
   StateSchemaError: () => import_state.StateSchemaError,
   StreamingMode: () => import_run_config.StreamingMode,
@@ -190,13 +196,16 @@ __export(common_exports, {
   WebMCPToolset: () => import_webmcp_toolset.WebMCPToolset,
   Workflow: () => import_workflow.Workflow,
   WorkflowNode: () => import_workflow.WorkflowNode,
+  adaptComputerUseTool: () => import_computer_use_toolset.adaptComputerUseTool,
   appendInstructions: () => import_llm_request.appendInstructions,
   asRunnableRoot: () => import_workflow.asRunnableRoot,
   buildFunctionDeclarationForLangchain: () => import_function_tool2.buildFunctionDeclarationForLangchain,
   buildFunctionDeclarationForParamsForCrewai: () => import_function_tool2.buildFunctionDeclarationForParamsForCrewai,
   buildFunctionDeclarationUtil: () => import_function_tool2.buildFunctionDeclarationUtil,
+  closeRunners: () => import_cleanup.closeRunners,
   commonPrefixOf: () => import_workflow.commonPrefixOf,
   convertSessionToEvalFormat: () => import_evals.convertSessionToEvalFormat,
+  convertSessionToEvalInvocations: () => import_evals.convertSessionToEvalInvocations,
   createEmptyState: () => import_evals.createEmptyState,
   createEvent: () => import_event.createEvent,
   createEventActions: () => import_event_actions.createEventActions,
@@ -229,10 +238,12 @@ __export(common_exports, {
   handleFunctionCallsLive: () => import_functions.handleFunctionCallsLive,
   hasThoughts: () => import_event.hasThoughts,
   hasTrailingCodeExecutionResult: () => import_event.hasTrailingCodeExecutionResult,
+  injectSessionState: () => import_instructions.injectSessionState,
   isAgentTool: () => import_agent_tool.isAgentTool,
   isApp: () => import_app.isApp,
   isAuthCredential: () => import_auth_credential.isAuthCredential,
   isBaseAgent: () => import_base_agent.isBaseAgent,
+  isBaseComputer: () => import_base_computer.isBaseComputer,
   isBaseExampleProvider: () => import_base_example_provider.isBaseExampleProvider,
   isBaseLlm: () => import_base_llm.isBaseLlm,
   isBasePlanner: () => import_base_planner.isBasePlanner,
@@ -241,6 +252,8 @@ __export(common_exports, {
   isBaseToolset: () => import_base_toolset.isBaseToolset,
   isBuiltInPlanner: () => import_built_in_planner.isBuiltInPlanner,
   isCompactedEvent: () => import_compacted_event.isCompactedEvent,
+  isComputerUseTool: () => import_computer_use_tool.isComputerUseTool,
+  isComputerUseToolset: () => import_computer_use_toolset.isComputerUseToolset,
   isFinalResponse: () => import_event.isFinalResponse,
   isFunctionTool: () => import_function_tool.isFunctionTool,
   isGemini2OrAbove: () => import_model_name.isGemini2OrAbove,
@@ -258,6 +271,7 @@ __export(common_exports, {
   isNodeState: () => import_workflow.isNodeState,
   isNodeTimeoutError: () => import_workflow.isNodeTimeoutError,
   isParallelAgent: () => import_parallel_agent.isParallelAgent,
+  isParallelWorker: () => import_workflow.isParallelWorker,
   isRequestInput: () => import_workflow.isRequestInput,
   isRoutableLlmAgent: () => import_runner.isRoutableLlmAgent,
   isRoutedAgent: () => import_routed_agent.isRoutedAgent,
@@ -266,6 +280,7 @@ __export(common_exports, {
   isScratchpadEvent: () => import_compacted_event.isScratchpadEvent,
   isSequentialAgent: () => import_sequential_agent.isSequentialAgent,
   isSessionArtifactService: () => import_session_artifact_service.isSessionArtifactService,
+  isStaleSessionError: () => import_stale_session_error.isStaleSessionError,
   isStateSchemaError: () => import_state.isStateSchemaError,
   isToolNotFound: () => import_functions.isToolNotFound,
   isToolboxToolset: () => import_toolbox_toolset.isToolboxToolset,
@@ -275,6 +290,8 @@ __export(common_exports, {
   isZodSchema: () => import_simple_zod_to_json.isZodSchema,
   logger: () => import_logger.logger,
   markRestored: () => import_internal_metadata.markRestored,
+  mergeStates: () => import_base_session_service2.mergeStates,
+  newId: () => import_id_provider.newId,
   node: () => import_workflow.node,
   normalizeRetryExceptions: () => import_workflow.normalizeRetryExceptions,
   populateClientFunctionCallId: () => import_event.populateClientFunctionCallId,
@@ -287,9 +304,11 @@ __export(common_exports, {
   requestInputTool: () => import_request_input_tool.requestInputTool,
   requireAgent: () => import_invocation_context.requireAgent,
   requiresUserInput: () => import_user_input_request.requiresUserInput,
+  resetIdProvider: () => import_id_provider.resetIdProvider,
   resetLogger: () => import_logger.resetLogger,
   resolveScopeKey: () => import_reflect_retry_utils.resolveScopeKey,
   runWithClientLabel: () => import_client_labels.runWithClientLabel,
+  setIdProvider: () => import_id_provider.setIdProvider,
   setLogLevel: () => import_logger.setLogLevel,
   setLogger: () => import_logger.setLogger,
   stringifyContent: () => import_event.stringifyContent,
@@ -298,6 +317,8 @@ __export(common_exports, {
   toJsonSchema: () => import_schema.toJsonSchema,
   toSnakeCaseName: () => import_case_utils.toSnakeCaseName,
   toStructuredEvents: () => import_structured_events.toStructuredEvents,
+  trimTempDeltaState: () => import_base_session_service2.trimTempDeltaState,
+  trimTempState: () => import_base_session_service2.trimTempState,
   validateAppName: () => import_app.validateAppName,
   version: () => import_version.version,
   zodObjectToSchema: () => import_simple_zod_to_json.zodObjectToSchema
@@ -307,6 +328,7 @@ var import_active_streaming_tool = require("./agents/active_streaming_tool.js");
 var import_base_agent = require("./agents/base_agent.js");
 var import_context = require("./agents/context.js");
 var import_functions = require("./agents/functions.js");
+var import_instructions = require("./agents/instructions.js");
 var import_invocation_context = require("./agents/invocation_context.js");
 var import_langgraph_agent = require("./agents/langgraph_agent.js");
 var import_live_request_queue = require("./agents/live_request_queue.js");
@@ -387,11 +409,15 @@ var import_runner = require("./runner/runner.js");
 var import_base_session_service = require("./sessions/base_session_service.js");
 var import_in_memory_session_service = require("./sessions/in_memory_session_service.js");
 var import_session = require("./sessions/session.js");
+var import_stale_session_error = require("./sessions/stale_session_error.js");
 var import_state = require("./sessions/state.js");
 var import_agent_tool = require("./tools/agent_tool.js");
 var import_base_tool = require("./tools/base_tool.js");
 var import_base_toolset = require("./tools/base_toolset.js");
 var import_built_in_tool = require("./tools/built_in_tool.js");
+var import_base_computer = require("./tools/computer_use/base_computer.js");
+var import_computer_use_tool = require("./tools/computer_use/computer_use_tool.js");
+var import_computer_use_toolset = require("./tools/computer_use/computer_use_toolset.js");
 var import_consolidate_context_tool = require("./tools/consolidate_context_tool.js");
 var import_enterprise_web_search_tool = require("./tools/enterprise_web_search_tool.js");
 var import_example_tool = require("./tools/example_tool.js");
@@ -422,6 +448,7 @@ var import_case_utils = require("./utils/case_utils.js");
 var import_client_labels = require("./utils/client_labels.js");
 var import_gemini_schema_util = require("./utils/gemini_schema_util.js");
 var import_genai_schema_to_json = require("./utils/genai_schema_to_json.js");
+var import_id_provider = require("./utils/id_provider.js");
 var import_logger = require("./utils/logger.js");
 var import_model_name = require("./utils/model_name.js");
 var import_schema = require("./utils/schema.js");
@@ -435,15 +462,11 @@ var import_search_skills_tool = require("./tools/skill/search_skills_tool.js");
 __reExport(common_exports, require("./artifacts/base_artifact_service.js"), module.exports);
 __reExport(common_exports, require("./features/feature_registry.js"), module.exports);
 __reExport(common_exports, require("./memory/base_memory_service.js"), module.exports);
-__reExport(common_exports, require("./sessions/base_session_service.js"), module.exports);
+var import_base_session_service2 = require("./sessions/base_session_service.js");
 __reExport(common_exports, require("./tools/base_tool.js"), module.exports);
 var import_workflow = require("./workflow/index.js");
 var import_app = require("./apps/app.js");
-__reExport(common_exports, require("./artifacts/base_artifact_service.js"), module.exports);
-__reExport(common_exports, require("./features/feature_registry.js"), module.exports);
-__reExport(common_exports, require("./memory/base_memory_service.js"), module.exports);
-__reExport(common_exports, require("./sessions/base_session_service.js"), module.exports);
-__reExport(common_exports, require("./tools/base_tool.js"), module.exports);
+var import_cleanup = require("./cli/utils/cleanup.js");
 var import_evals = require("./cli/utils/evals.js");
 var import_function_tool2 = require("./tools/function_tool.js");
 var import_base_retrieval_tool2 = require("./tools/retrieval/base_retrieval_tool.js");
@@ -474,6 +497,7 @@ var import_toolbox_toolset = require("./tools/toolbox_toolset.js");
   AuthSchemeType,
   BaseAgent,
   BaseCodeExecutor,
+  BaseComputer,
   BaseEnvironment,
   BaseExampleProvider,
   BaseLlm,
@@ -496,6 +520,9 @@ var import_toolbox_toolset = require("./tools/toolbox_toolset.js");
   ChromeModelUnavailableError,
   CodeExecutionLanguage,
   CodeExecutionResponseProcessor,
+  ComputerEnvironment,
+  ComputerUseTool,
+  ComputerUseToolset,
   ConsolidateContextTool,
   ContentRequestProcessor,
   Context,
@@ -580,6 +607,7 @@ var import_toolbox_toolset = require("./tools/toolbox_toolset.js");
   REQUEST_INPUT_FUNCTION_CALL_NAME,
   RESERVED_TOOL_CALL_ERROR_TYPE,
   RESTORED_EVENT_KEY,
+  RUNNER_CLEANUP_TIMEOUT_MS,
   ReadonlyContext,
   ReflectAndRetryModelPlugin,
   ReflectAndRetryToolPlugin,
@@ -595,6 +623,7 @@ var import_toolbox_toolset = require("./tools/toolbox_toolset.js");
   SequentialAgent,
   SessionNotFoundError,
   SessionStateCredentialService,
+  StaleSessionError,
   State,
   StateSchemaError,
   StreamingMode,
@@ -620,13 +649,16 @@ var import_toolbox_toolset = require("./tools/toolbox_toolset.js");
   WebMCPToolset,
   Workflow,
   WorkflowNode,
+  adaptComputerUseTool,
   appendInstructions,
   asRunnableRoot,
   buildFunctionDeclarationForLangchain,
   buildFunctionDeclarationForParamsForCrewai,
   buildFunctionDeclarationUtil,
+  closeRunners,
   commonPrefixOf,
   convertSessionToEvalFormat,
+  convertSessionToEvalInvocations,
   createEmptyState,
   createEvent,
   createEventActions,
@@ -659,10 +691,12 @@ var import_toolbox_toolset = require("./tools/toolbox_toolset.js");
   handleFunctionCallsLive,
   hasThoughts,
   hasTrailingCodeExecutionResult,
+  injectSessionState,
   isAgentTool,
   isApp,
   isAuthCredential,
   isBaseAgent,
+  isBaseComputer,
   isBaseExampleProvider,
   isBaseLlm,
   isBasePlanner,
@@ -671,6 +705,8 @@ var import_toolbox_toolset = require("./tools/toolbox_toolset.js");
   isBaseToolset,
   isBuiltInPlanner,
   isCompactedEvent,
+  isComputerUseTool,
+  isComputerUseToolset,
   isFinalResponse,
   isFunctionTool,
   isGemini2OrAbove,
@@ -688,6 +724,7 @@ var import_toolbox_toolset = require("./tools/toolbox_toolset.js");
   isNodeState,
   isNodeTimeoutError,
   isParallelAgent,
+  isParallelWorker,
   isRequestInput,
   isRoutableLlmAgent,
   isRoutedAgent,
@@ -696,6 +733,7 @@ var import_toolbox_toolset = require("./tools/toolbox_toolset.js");
   isScratchpadEvent,
   isSequentialAgent,
   isSessionArtifactService,
+  isStaleSessionError,
   isStateSchemaError,
   isToolNotFound,
   isToolboxToolset,
@@ -705,6 +743,8 @@ var import_toolbox_toolset = require("./tools/toolbox_toolset.js");
   isZodSchema,
   logger,
   markRestored,
+  mergeStates,
+  newId,
   node,
   normalizeRetryExceptions,
   populateClientFunctionCallId,
@@ -717,9 +757,11 @@ var import_toolbox_toolset = require("./tools/toolbox_toolset.js");
   requestInputTool,
   requireAgent,
   requiresUserInput,
+  resetIdProvider,
   resetLogger,
   resolveScopeKey,
   runWithClientLabel,
+  setIdProvider,
   setLogLevel,
   setLogger,
   stringifyContent,
@@ -728,17 +770,13 @@ var import_toolbox_toolset = require("./tools/toolbox_toolset.js");
   toJsonSchema,
   toSnakeCaseName,
   toStructuredEvents,
+  trimTempDeltaState,
+  trimTempState,
   validateAppName,
   version,
   zodObjectToSchema,
   ...require("./artifacts/base_artifact_service.js"),
   ...require("./features/feature_registry.js"),
   ...require("./memory/base_memory_service.js"),
-  ...require("./sessions/base_session_service.js"),
-  ...require("./tools/base_tool.js"),
-  ...require("./artifacts/base_artifact_service.js"),
-  ...require("./features/feature_registry.js"),
-  ...require("./memory/base_memory_service.js"),
-  ...require("./sessions/base_session_service.js"),
   ...require("./tools/base_tool.js")
 });

package/dist/cjs/context/compaction_utils.js

@@ -65,6 +65,25 @@ function calculateRetainStartIndex(rawEvents, eventRetentionSize) {
       break;
     }
   }
+  const latestCalls = /* @__PURE__ */ new Map();
+  const callDependencies = rawEvents.map((event, index) => {
+    let earliestCall = index;
+    for (const response of (0, import_event.getFunctionResponses)(event)) {
+      if (response.id === void 0) continue;
+      const callIndex = latestCalls.get(response.id);
+      if (callIndex !== void 0) {
+        earliestCall = Math.min(earliestCall, callIndex);
+      }
+    }
+    for (const call of (0, import_event.getFunctionCalls)(event)) {
+      if (call.id === void 0) continue;
+      latestCalls.set(call.id, index);
+    }
+    return earliestCall;
+  });
+  for (let index = rawEvents.length - 1; index >= retainStartIndex; index--) {
+    retainStartIndex = Math.min(retainStartIndex, callDependencies[index]);
+  }
   return retainStartIndex;
 }
 __name(calculateRetainStartIndex, "calculateRetainStartIndex");

package/dist/cjs/events/event.js

@@ -43,7 +43,7 @@ __export(event_exports, {
   transformToSnakeCaseEvent: () => transformToSnakeCaseEvent
 });
 module.exports = __toCommonJS(event_exports);
-var import_env_aware_utils = require("../utils/env_aware_utils.js");
+var import_id_provider = require("../utils/id_provider.js");
 var import_object_notation_utils = require("../utils/object_notation_utils.js");
 var import_event_actions = require("./event_actions.js");
 /**
@@ -87,7 +87,7 @@ function getFunctionCalls(event) {
 __name(getFunctionCalls, "getFunctionCalls");
 const AF_FUNCTION_CALL_ID_PREFIX = "adk-";
 function generateClientFunctionCallId() {
-  return `${AF_FUNCTION_CALL_ID_PREFIX}${(0, import_env_aware_utils.randomUUID)()}`;
+  return `${AF_FUNCTION_CALL_ID_PREFIX}${(0, import_id_provider.newId)()}`;
 }
 __name(generateClientFunctionCallId, "generateClientFunctionCallId");
 function populateClientFunctionCallId(modelResponseEvent) {
@@ -169,13 +169,17 @@ function isEvent(obj) {
 }
 __name(isEvent, "isEvent");
 function createNewEventId() {
+  return (0, import_id_provider.newIdOr)(createRandomEventId);
+}
+__name(createNewEventId, "createNewEventId");
+function createRandomEventId() {
   let id = "";
   for (let i = 0; i < 8; i++) {
     id += ASCII_LETTERS_AND_NUMBERS[Math.floor(Math.random() * ASCII_LETTERS_AND_NUMBERS.length)];
   }
   return id;
 }
-__name(createNewEventId, "createNewEventId");
+__name(createRandomEventId, "createRandomEventId");
 const PRESERVE_KEYS_CAMEL_CASE = [
   "actions.stateDelta",
   "actions.artifactDelta",

package/dist/cjs/features/feature_registry.js

@@ -42,6 +42,7 @@ var import_logger = require("../utils/logger.js");
  * SPDX-License-Identifier: Apache-2.0
  */
 var FeatureName = /* @__PURE__ */ ((FeatureName2) => {
+  FeatureName2["COMPUTER_USE"] = "COMPUTER_USE";
   FeatureName2["PROGRESSIVE_SSE_STREAMING"] = "PROGRESSIVE_SSE_STREAMING";
   return FeatureName2;
 })(FeatureName || {});
@@ -52,6 +53,10 @@ var FeatureStage = /* @__PURE__ */ ((FeatureStage2) => {
   return FeatureStage2;
 })(FeatureStage || {});
 const FEATURE_REGISTRY = {
+  ["COMPUTER_USE" /* COMPUTER_USE */]: {
+    stage: "experimental" /* EXPERIMENTAL */,
+    defaultOn: true
+  },
   ["PROGRESSIVE_SSE_STREAMING" /* PROGRESSIVE_SSE_STREAMING */]: {
     stage: "experimental" /* EXPERIMENTAL */,
     defaultOn: false