@google/adk 1.4.0 → 1.6.0

package/dist/esm/agents/functions.js

@@ -9,11 +9,11 @@ import { createUserContent } from "@google/genai";
 import { isEmpty } from "lodash-es";
 import {
   createEvent,
+  generateClientFunctionCallId,
   getFunctionCalls,
   getFunctionResponses
 } from "../events/event.js";
 import { mergeEventActions } from "../events/event_actions.js";
-import { randomUUID } from "../utils/env_aware_utils.js";
 import { logger } from "../utils/logger.js";
 import { Context } from "./context.js";
 import {
@@ -21,7 +21,11 @@ import {
   tracer,
   traceToolCall
 } from "../telemetry/tracing.js";
-const AF_FUNCTION_CALL_ID_PREFIX = "adk-";
+import {
+  AF_FUNCTION_CALL_ID_PREFIX,
+  generateClientFunctionCallId as generateClientFunctionCallId2,
+  populateClientFunctionCallId
+} from "../events/event.js";
 const REQUEST_EUC_FUNCTION_CALL_NAME = "adk_request_credential";
 const REQUEST_CONFIRMATION_FUNCTION_CALL_NAME = "adk_request_confirmation";
 const functionsExportedForTestingOnly = {
@@ -29,20 +33,6 @@ const functionsExportedForTestingOnly = {
   generateAuthEvent,
   generateRequestConfirmationEvent
 };
-function generateClientFunctionCallId() {
-  return `${AF_FUNCTION_CALL_ID_PREFIX}${randomUUID()}`;
-}
-function populateClientFunctionCallId(modelResponseEvent) {
-  const functionCalls = getFunctionCalls(modelResponseEvent);
-  if (!functionCalls) {
-    return;
-  }
-  for (const functionCall of functionCalls) {
-    if (!functionCall.id) {
-      functionCall.id = generateClientFunctionCallId();
-    }
-  }
-}
 function getLongRunningFunctionCalls(functionCalls, toolsDict) {
   const longRunningToolIds = /* @__PURE__ */ new Set();
   for (const functionCall of functionCalls) {
@@ -195,6 +185,18 @@ async function handleFunctionCallsAsync({
     toolConfirmationDict
   });
 }
+function normalizeCallbackResponse(response) {
+  if (response == null) {
+    return void 0;
+  }
+  if (typeof response !== "object") {
+    return { result: response };
+  }
+  if (Array.isArray(response)) {
+    return { results: response };
+  }
+  return response;
+}
 async function handleFunctionCallList({
   invocationContext,
   functionCalls,
@@ -241,6 +243,7 @@ async function handleFunctionCallList({
         }
       }
     }
+    functionResponse = normalizeCallbackResponse(functionResponse);
     if (functionResponse == null) {
       try {
         functionResponse = await callToolAsync(tool, functionArgs, toolContext);
@@ -252,8 +255,8 @@ async function handleFunctionCallList({
             toolContext,
             error: e
           });
-          if (onToolErrorResponse) {
-            functionResponse = onToolErrorResponse;
+          if (onToolErrorResponse != null) {
+            functionResponse = normalizeCallbackResponse(onToolErrorResponse);
           } else {
             functionResponseError = e.message;
           }
@@ -282,17 +285,17 @@ async function handleFunctionCallList({
       }
     }
     if (alteredFunctionResponse != null) {
-      functionResponse = alteredFunctionResponse;
+      functionResponse = normalizeCallbackResponse(alteredFunctionResponse);
     }
-    if (tool.isLongRunning && !functionResponse) {
+    if (tool.isLongRunning && functionResponse == null) {
       continue;
     }
     if (functionResponseError) {
       functionResponse = { error: functionResponseError };
-    } else if (typeof functionResponse !== "object" || functionResponse == null) {
+    } else if (functionResponse == null) {
       functionResponse = { result: functionResponse };
-    } else if (Array.isArray(functionResponse)) {
-      functionResponse = { results: functionResponse };
+    } else {
+      functionResponse = normalizeCallbackResponse(functionResponse);
     }
     const functionResponseEvent = createEvent({
       invocationId: invocationContext.invocationId,
@@ -420,7 +423,7 @@ export {
   findMatchingFunctionCall,
   functionsExportedForTestingOnly,
   generateAuthEvent,
-  generateClientFunctionCallId,
+  generateClientFunctionCallId2 as generateClientFunctionCallId,
   generateRequestConfirmationEvent,
   getLongRunningFunctionCalls,
   handleFunctionCallList,

package/dist/esm/agents/llm_agent.js

@@ -13,12 +13,14 @@ import {
   createNewEventId,
   getFunctionCalls,
   getFunctionResponses,
-  isFinalResponse
+  isFinalResponse,
+  populateClientFunctionCallId
 } from "../events/event.js";
 import { isBaseLlm } from "../models/base_llm.js";
 import { LLMRegistry } from "../models/registry.js";
 import { isBaseTool } from "../tools/base_tool.js";
 import { logger } from "../utils/logger.js";
+import { canUseOutputSchemaWithTools } from "../utils/output_schema_utils.js";
 import { Context } from "./context.js";
 import {
   runAsyncGeneratorWithOtelContext,
@@ -31,8 +33,7 @@ import {
   generateAuthEvent,
   generateRequestConfirmationEvent,
   getLongRunningFunctionCalls,
-  handleFunctionCallsAsync,
-  populateClientFunctionCallId
+  handleFunctionCallsAsync
 } from "./functions.js";
 import { AUTH_PREPROCESSOR } from "../auth/auth_preprocessor.js";
 import { AGENT_TRANSFER_LLM_REQUEST_PROCESSOR } from "./processors/agent_transfer_llm_request_processor.js";
@@ -183,6 +184,7 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
    * This method is only for use by Agent Development Kit.
    * @param context The context to retrieve the session state.
    * @returns The resolved globalInstruction field.
+   * @deprecated Use GlobalInstructionPlugin instead.
    */
   async canonicalGlobalInstruction(context2) {
     if (typeof this.globalInstruction === "string") {
@@ -391,7 +393,7 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
       }
     }
     const allTools = [...this.tools];
-    if (this.outputSchema && allTools.length > 0) {
+    if (this.outputSchema && allTools.length > 0 && !canUseOutputSchemaWithTools(this.canonicalModel.model)) {
       const setModelResponseTool = new FunctionTool({
         name: "set_model_response",
         description: "Call this tool to submit your final response conforming to the output schema. Use this tool only when you have collected all the information and are ready to return the final answer.",

package/dist/esm/agents/loop_agent.js

@@ -44,9 +44,21 @@ class LoopAgent extends (_b = BaseAgent, _a = LOOP_AGENT_SIGNATURE_SYMBOL, _b) {
     }
     return;
   }
-  // eslint-disable-next-line require-yield
-  async *runLiveImpl(_context) {
-    throw new Error("This is not supported yet for LoopAgent.");
+  async *runLiveImpl(context) {
+    var _a2, _b2;
+    for (let iteration = 0; iteration < this.maxIterations; iteration++) {
+      for (const subAgent of this.subAgents) {
+        for await (const event of subAgent.runLive(context)) {
+          if ((_a2 = context.abortSignal) == null ? void 0 : _a2.aborted) {
+            return;
+          }
+          yield event;
+          if ((_b2 = event.actions) == null ? void 0 : _b2.escalate) {
+            return;
+          }
+        }
+      }
+    }
   }
 }
 export {

package/dist/esm/agents/processors/basic_llm_request_processor.js

@@ -6,6 +6,7 @@ const require = topLevelCreateRequire(import.meta.url);
  * SPDX-License-Identifier: Apache-2.0
  */
 import { setOutputSchema } from "../../models/llm_request.js";
+import { canUseOutputSchemaWithTools } from "../../utils/output_schema_utils.js";
 import { isLlmAgent } from "../llm_agent.js";
 import { BaseLlmRequestProcessor } from "./base_llm_processor.js";
 class BasicLlmRequestProcessor extends BaseLlmRequestProcessor {
@@ -18,14 +19,14 @@ class BasicLlmRequestProcessor extends BaseLlmRequestProcessor {
    */
   // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
-    var _a;
+    var _a, _b;
     const agent = invocationContext.agent;
     if (!isLlmAgent(agent)) {
       return;
     }
     llmRequest.model = agent.canonicalModel.model;
     llmRequest.config = { ...(_a = agent.generateContentConfig) != null ? _a : {} };
-    if (agent.outputSchema && (!agent.tools || agent.tools.length === 0)) {
+    if (agent.outputSchema && (!((_b = agent.tools) == null ? void 0 : _b.length) || canUseOutputSchemaWithTools(agent.canonicalModel.model))) {
       setOutputSchema(llmRequest, agent.outputSchema);
     }
     if (invocationContext.runConfig) {

package/dist/esm/agents/processors/content_processor_utils.js

@@ -15,6 +15,7 @@ import {
   getFunctionCalls,
   getFunctionResponses
 } from "../../events/event.js";
+import { isSegmentPrefix } from "../../utils/branch_trie.js";
 import {
   AF_FUNCTION_CALL_ID_PREFIX,
   REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
@@ -42,7 +43,7 @@ function getContents(events, agentName, currentBranch) {
     if (!((_a = event.content) == null ? void 0 : _a.role) || ((_c = (_b = event.content.parts) == null ? void 0 : _b[0]) == null ? void 0 : _c.text) === "") {
       continue;
     }
-    if (currentBranch && event.branch && !currentBranch.startsWith(event.branch)) {
+    if (currentBranch && event.branch && !isSegmentPrefix(currentBranch, event.branch)) {
       continue;
     }
     if (isAuthEvent(event)) {

package/dist/esm/agents/processors/content_request_processor.js

@@ -5,7 +5,7 @@ const require = topLevelCreateRequire(import.meta.url);
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { isCompactedEvent } from "../../events/compacted_event.js";
+import { getActiveEvents } from "../../context/compaction_utils.js";
 import { isLlmAgent } from "../llm_agent.js";
 import {
   getContents,
@@ -25,26 +25,7 @@ class ContentRequestProcessor {
     if (!agent || !isLlmAgent(agent)) {
       return;
     }
-    let events = invocationContext.session.events;
-    const compactedEvents = events.filter(isCompactedEvent);
-    const latestCompactedEvent = compactedEvents.length > 0 ? compactedEvents.reduce(
-      (latest, current) => current.endTime > latest.endTime ? current : latest
-    ) : void 0;
-    if (latestCompactedEvent) {
-      const remainingEvents = events.filter((event) => {
-        if (event === latestCompactedEvent) {
-          return false;
-        }
-        if (isCompactedEvent(event)) {
-          return false;
-        }
-        if (event.timestamp <= latestCompactedEvent.endTime) {
-          return false;
-        }
-        return true;
-      });
-      events = [latestCompactedEvent, ...remainingEvents];
-    }
+    const events = getActiveEvents(invocationContext.session.events);
     if (agent.includeContents === "default") {
       llmRequest.contents = getContents(
         events,

package/dist/esm/agents/processors/instructions_llm_request_processor.js

@@ -6,6 +6,7 @@ const require = topLevelCreateRequire(import.meta.url);
  * SPDX-License-Identifier: Apache-2.0
  */
 import { appendInstructions } from "../../models/llm_request.js";
+import { canUseOutputSchemaWithTools } from "../../utils/output_schema_utils.js";
 import { injectSessionState } from "../instructions.js";
 import { isLlmAgent } from "../llm_agent.js";
 import { ReadonlyContext } from "../readonly_context.js";
@@ -16,6 +17,7 @@ class InstructionsLlmRequestProcessor extends BaseLlmRequestProcessor {
    */
   // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
+    var _a;
     const agent = invocationContext.agent;
     if (!isLlmAgent(agent)) {
       return;
@@ -47,7 +49,7 @@ class InstructionsLlmRequestProcessor extends BaseLlmRequestProcessor {
       }
       appendInstructions(llmRequest, [instructionWithState]);
     }
-    if (agent.outputSchema && agent.tools && agent.tools.length > 0) {
+    if (agent.outputSchema && ((_a = agent.tools) == null ? void 0 : _a.length) && !canUseOutputSchemaWithTools(agent.canonicalModel.model)) {
       appendInstructions(llmRequest, [
         'To output the final result, you must call the "set_model_response" function with the appropriate values. Do not output anything else.'
       ]);

package/dist/esm/agents/routed_agent.js

@@ -38,6 +38,29 @@ let RoutedAgent = class extends (_b = BaseAgent, _a = ROUTED_AGENT_SIGNATURE_SYM
     }
     this.router = config.router;
   }
+  /**
+   * Creates a detached copy of this routed agent.
+   *
+   * The inherited {@link BaseAgent.clone} only deep-clones `subAgents`, but a
+   * `RoutedAgent` derives its routing targets from `config.agents`. Rebuilding
+   * through the base clone alone would re-read the already-parented original
+   * agents and throw "already has a parent agent". This override deep-clones the
+   * routing targets (unless the caller overrides `agents`) so the rebuilt
+   * constructor re-parents fresh, detached copies. The array-vs-record shape
+   * and, for records, the keys are preserved so the router keeps selecting the
+   * same targets.
+   *
+   * @param overrides Config fields to override on the clone. Overriding
+   *     `parentAgent` is rejected by the base implementation.
+   * @returns A new detached `RoutedAgent` of the same concrete class.
+   */
+  clone(overrides) {
+    const nextOverrides = { ...overrides };
+    if (!("agents" in nextOverrides)) {
+      nextOverrides.agents = cloneRoutingTargets(this.config.agents);
+    }
+    return super.clone(nextOverrides);
+  }
   /**
    * Runs the selected agent via text-based conversation.
    */
@@ -64,6 +87,14 @@ let RoutedAgent = class extends (_b = BaseAgent, _a = ROUTED_AGENT_SIGNATURE_SYM
 RoutedAgent = __decorateClass([
   experimental
 ], RoutedAgent);
+function cloneRoutingTargets(agents) {
+  if (Array.isArray(agents)) {
+    return agents.map((agent) => agent.clone());
+  }
+  return Object.fromEntries(
+    Object.entries(agents).map(([key, agent]) => [key, agent.clone()])
+  );
+}
 export {
   RoutedAgent,
   isRoutedAgent

package/dist/esm/agents/run_config.js

@@ -13,14 +13,15 @@ var StreamingMode = /* @__PURE__ */ ((StreamingMode2) => {
   return StreamingMode2;
 })(StreamingMode || {});
 function createRunConfig(params = {}) {
+  var _a;
   return {
     saveInputBlobsAsArtifacts: false,
     supportCfc: false,
     enableAffectiveDialog: false,
     streamingMode: "none" /* NONE */,
-    maxLlmCalls: validateMaxLlmCalls(params.maxLlmCalls || 500),
     pauseOnToolCalls: false,
-    ...params
+    ...params,
+    maxLlmCalls: validateMaxLlmCalls((_a = params.maxLlmCalls) != null ? _a : 500)
   };
 }
 function validateMaxLlmCalls(value) {

package/dist/esm/artifacts/in_memory_artifact_service.js

@@ -5,6 +5,7 @@ const require = topLevelCreateRequire(import.meta.url);
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { logger } from "../utils/logger.js";
 function isInMemoryConnectionString(uri) {
   return uri === "memory://";
 }
@@ -56,6 +57,12 @@ class InMemoryArtifactService {
     if (version === void 0) {
       version = versions.length - 1;
     }
+    if (!versions[version]) {
+      logger.warn(
+        `[InMemoryArtifactService] loadArtifact: Artifact ${filename} version ${version} not found`
+      );
+      return Promise.resolve(void 0);
+    }
     return Promise.resolve(versions[version].part);
   }
   listArtifactKeys({
@@ -63,16 +70,14 @@ class InMemoryArtifactService {
     userId,
     sessionId
   }) {
-    const sessionPrefix = `${appName}/${userId}/${sessionId}/`;
-    const usernamespacePrefix = `${appName}/${userId}/user/`;
+    const sessionPrefix = artifactPrefix("session", appName, userId, sessionId);
+    const userPrefix = artifactPrefix("user", appName, userId);
     const filenames = [];
     for (const path in this.artifacts) {
       if (path.startsWith(sessionPrefix)) {
-        const filename = path.replace(sessionPrefix, "");
-        filenames.push(filename);
-      } else if (path.startsWith(usernamespacePrefix)) {
-        const filename = path.replace(usernamespacePrefix, "");
-        filenames.push(filename);
+        filenames.push(decodeURIComponent(path.slice(sessionPrefix.length)));
+      } else if (path.startsWith(userPrefix)) {
+        filenames.push(decodeURIComponent(path.slice(userPrefix.length)));
       }
     }
     return Promise.resolve(filenames.sort());
@@ -143,9 +148,12 @@ class InMemoryArtifactService {
 }
 function artifactPath(appName, userId, sessionId, filename) {
   if (fileHasUserNamespace(filename)) {
-    return `${appName}/${userId}/user/${filename}`;
+    return `${artifactPrefix("user", appName, userId)}${encodeURIComponent(filename)}`;
   }
-  return `${appName}/${userId}/${sessionId}/${filename}`;
+  return `${artifactPrefix("session", appName, userId, sessionId)}${encodeURIComponent(filename)}`;
+}
+function artifactPrefix(scope, ...parts) {
+  return `${[scope, ...parts].map(encodeURIComponent).join("/")}/`;
 }
 function fileHasUserNamespace(filename) {
   return filename.startsWith("user:");

package/dist/esm/auth/credential_service/in_memory_credential_service.js

@@ -7,7 +7,18 @@ const require = topLevelCreateRequire(import.meta.url);
  */
 class InMemoryCredentialService {
   constructor() {
-    this.credentials = {};
+    /**
+     * A map from app name to a map from user ID to a map from credential key to
+     * credential.
+     *
+     * `appName`, `userId` and `credentialKey` are all attacker-influenced, so
+     * every level is created with `Object.create(null)`. On an ordinary `{}`
+     * literal a key of `__proto__` resolves to the inherited `__proto__`
+     * accessor rather than creating an own property, so nested assignment
+     * pollutes every object in the process, and a lookup of an inherited key
+     * such as `toString` returns a function instead of `undefined`.
+     */
+    this.credentials = /* @__PURE__ */ Object.create(null);
   }
   loadCredential(authConfig, toolContext) {
     const credentialBucket = this.getBucketForCurrentContext(toolContext);
@@ -22,10 +33,10 @@ class InMemoryCredentialService {
   getBucketForCurrentContext(toolContext) {
     const { appName, userId } = toolContext.invocationContext.session;
     if (!this.credentials[appName]) {
-      this.credentials[appName] = {};
+      this.credentials[appName] = /* @__PURE__ */ Object.create(null);
     }
     if (!this.credentials[appName][userId]) {
-      this.credentials[appName][userId] = {};
+      this.credentials[appName][userId] = /* @__PURE__ */ Object.create(null);
     }
     return this.credentials[appName][userId];
   }

package/dist/esm/code_executors/unsafe_local_code_executor.js

@@ -5,7 +5,7 @@ const require = topLevelCreateRequire(import.meta.url);
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { spawn } from "child_process";
+import { spawn } from "node:child_process";
 import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
@@ -17,13 +17,21 @@ import {
   CodeExecutionLanguage
 } from "./code_execution_utils.js";
 const IS_WINDOWS = os.platform() === "win32";
+const POWERSHELL_BASE_ARGS = [
+  "-NoLogo",
+  "-NoProfile",
+  "-ExecutionPolicy",
+  "Bypass",
+  "-File"
+];
+const CMD_BASE_ARGS = ["/D", "/c"];
+function isPowerShellCommand(commandPath) {
+  return /^(powershell|pwsh)(\.exe)?$/i.test(path.win32.basename(commandPath));
+}
 async function createTempScriptFile(code, language, shellCommandPath) {
-  const tempDir = path.join(
-    os.tmpdir(),
-    "adk_js_unsafe_code_executor",
-    Date.now().toString() + "_" + Math.random().toString(36).slice(2)
+  const tempDir = await fs.mkdtemp(
+    path.join(os.tmpdir(), "adk_js_unsafe_code_executor_")
   );
-  await fs.mkdir(tempDir, { recursive: true });
   const ext = getExtensionForLanguage(language, shellCommandPath) || ".js";
   const filePath = path.join(tempDir, `script${ext}`);
   await fs.writeFile(filePath, code);
@@ -43,6 +51,9 @@ function getExtensionForLanguage(language, shellCommandPath) {
     return ".bat";
   }
   if (language === CodeExecutionLanguage.SHELL) {
+    if (shellCommandPath && isPowerShellCommand(shellCommandPath)) {
+      return ".ps1";
+    }
     if (IS_WINDOWS) {
       if (shellCommandPath && shellCommandPath.toLowerCase().includes("cmd")) {
         return ".bat";
@@ -101,17 +112,17 @@ class UnsafeLocalCodeExecutor extends BaseCodeExecutor {
         command = this.pythonCommandPath;
       } else if (language === CodeExecutionLanguage.SHELL) {
         command = this.shellCommandPath;
-        if (this.shellCommandPath.toLowerCase().includes("powershell")) {
-          args = ["-NoLogo", "-ExecutionPolicy", "Bypass", "-File", filePath];
+        if (isPowerShellCommand(this.shellCommandPath)) {
+          args = [...POWERSHELL_BASE_ARGS, filePath];
         } else if (this.shellCommandPath.toLowerCase().includes("cmd")) {
-          args = ["/c", filePath];
+          args = [...CMD_BASE_ARGS, filePath];
         }
       } else if (language === CodeExecutionLanguage.POWERSHELL) {
         command = IS_WINDOWS ? "powershell" : "pwsh";
-        args = ["-NoLogo", "-ExecutionPolicy", "Bypass", "-File", filePath];
+        args = [...POWERSHELL_BASE_ARGS, filePath];
       } else if (language === CodeExecutionLanguage.WINDOWS_CMD) {
         command = "cmd.exe";
-        args = ["/c", filePath];
+        args = [...CMD_BASE_ARGS, filePath];
       }
       if (params.codeExecutionInput.args) {
         if (Array.isArray(params.codeExecutionInput.args)) {

package/dist/esm/common.js

@@ -56,17 +56,22 @@ import {
   FileContentEncoding
 } from "./code_executors/code_execution_utils.js";
 import { AgentControlledContextCompactor } from "./context/agent_controlled_context_compactor.js";
+import { AnchoredContextCompactor } from "./context/anchored_context_compactor.js";
 import { LlmSummarizer } from "./context/summarizers/llm_summarizer.js";
 import { TokenBasedContextCompactor } from "./context/token_based_context_compactor.js";
 import { TrajectoryThoughtPruningCompactor } from "./context/trajectory_thought_pruning_compactor.js";
 import { TruncatingContextCompactor } from "./context/truncating_context_compactor.js";
-import { isCompactedEvent } from "./events/compacted_event.js";
+import { isCompactedEvent, isScratchpadEvent } from "./events/compacted_event.js";
 import {
   createEvent,
+  generateClientFunctionCallId,
   getFunctionCalls,
   getFunctionResponses,
+  hasThoughts,
   hasTrailingCodeExecutionResult,
   isFinalResponse,
+  populateClientFunctionCallId,
+  pruneThoughts,
   stringifyContent
 } from "./events/event.js";
 import { createEventActions } from "./events/event_actions.js";
@@ -83,6 +88,7 @@ import { Gemini, geminiInitParams } from "./models/google_llm.js";
 import { LLMRegistry } from "./models/registry.js";
 import { RoutedLlm } from "./models/routed_llm.js";
 import { BasePlugin, ContextCompactionTrigger } from "./plugins/base_plugin.js";
+import { GlobalInstructionPlugin } from "./plugins/global_instruction_plugin.js";
 import { LoggingPlugin } from "./plugins/logging_plugin.js";
 import { PluginManager } from "./plugins/plugin_manager.js";
 import {
@@ -108,8 +114,14 @@ import { AgentTool, isAgentTool } from "./tools/agent_tool.js";
 import { BaseTool, isBaseTool } from "./tools/base_tool.js";
 import { BaseToolset, isBaseToolset } from "./tools/base_toolset.js";
 import { ConsolidateContextTool } from "./tools/consolidate_context_tool.js";
+import {
+  ENTERPRISE_WEB_SEARCH,
+  EnterpriseWebSearchTool
+} from "./tools/enterprise_web_search_tool.js";
+import { ExampleTool } from "./tools/example_tool.js";
 import { EXIT_LOOP, ExitLoopTool } from "./tools/exit_loop_tool.js";
 import { FunctionTool, isFunctionTool } from "./tools/function_tool.js";
+import { getUserChoiceTool } from "./tools/get_user_choice_tool.js";
 import {
   GOOGLE_MAPS_GROUNDING,
   GoogleMapsGroundingTool
@@ -120,11 +132,13 @@ import {
   LoadArtifactsTool
 } from "./tools/load_artifacts_tool.js";
 import { LOAD_MEMORY, LoadMemoryTool } from "./tools/load_memory_tool.js";
+import { LOAD_WEB_PAGE, loadWebPage } from "./tools/load_web_page.js";
 import { LongRunningFunctionTool } from "./tools/long_running_tool.js";
 import {
   PRELOAD_MEMORY,
   PreloadMemoryTool
 } from "./tools/preload_memory_tool.js";
+import { requestInputTool } from "./tools/request_input_tool.js";
 import { ToolConfirmation } from "./tools/tool_confirmation.js";
 import { URL_CONTEXT, UrlContextTool } from "./tools/url_context_tool.js";
 import { VertexAiSearchTool } from "./tools/vertex_ai_search_tool.js";
@@ -174,6 +188,7 @@ export {
   AgentControlledContextCompactor,
   AgentTool,
   AgentTransferLlmRequestProcessor,
+  AnchoredContextCompactor,
   ApigeeLlm,
   AuthCredentialTypes,
   AuthHandler,
@@ -199,8 +214,11 @@ export {
   ContextCompactorRequestProcessor,
   CredentialExchangeError,
   CredentialRefresherRegistry,
+  ENTERPRISE_WEB_SEARCH,
   EXIT_LOOP,
+  EnterpriseWebSearchTool,
   EventType,
+  ExampleTool,
   ExitLoopTool,
   FileContentEncoding,
   FunctionTool,
@@ -208,6 +226,7 @@ export {
   GOOGLE_MAPS_GROUNDING,
   GOOGLE_SEARCH,
   Gemini,
+  GlobalInstructionPlugin,
   GoogleLLMVariant,
   GoogleMapsGroundingTool,
   GoogleSearchTool,
@@ -223,6 +242,7 @@ export {
   LLMRegistry,
   LOAD_ARTIFACTS,
   LOAD_MEMORY,
+  LOAD_WEB_PAGE,
   ListSkillsTool,
   LiveRequestQueue,
   LlmAgent2 as LlmAgent,
@@ -281,11 +301,14 @@ export {
   findMatchingFunctionCall,
   functionsExportedForTestingOnly,
   geminiInitParams,
+  generateClientFunctionCallId,
   getAskUserConfirmationFunctionCalls,
   getClientLabels,
   getFunctionCalls,
   getFunctionResponses,
   getLogger,
+  getUserChoiceTool,
+  hasThoughts,
   hasTrailingCodeExecutionResult,
   isAgentTool,
   isBaseAgent,
@@ -304,10 +327,15 @@ export {
   isRoutableLlmAgent,
   isRoutedAgent,
   isRunner,
+  isScratchpadEvent,
   isSequentialAgent,
   loadAllSkillsInDir,
   loadSkillFromDir,
   loadSkillFromZipBuffer,
+  loadWebPage,
+  populateClientFunctionCallId,
+  pruneThoughts,
+  requestInputTool,
   runWithClientLabel,
   setLogLevel,
   setLogger,

package/dist/esm/context/agent_controlled_context_compactor.js

@@ -5,9 +5,9 @@ const require = topLevelCreateRequire(import.meta.url);
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { isCompactedEvent } from "../events/compacted_event.js";
 import { createEvent } from "../events/event.js";
 import { ContextCompactionTrigger } from "../plugins/base_plugin.js";
+import { getActiveEvents } from "./compaction_utils.js";
 class AgentControlledContextCompactor {
   constructor(options) {
     this.trigger = ContextCompactionTrigger.AgentControlled;
@@ -18,7 +18,7 @@ class AgentControlledContextCompactor {
   }
   async compact(invocationContext) {
     const events = invocationContext.session.events;
-    const activeEvents = this.getActiveEvents(events);
+    const activeEvents = getActiveEvents(events);
     const consolidateToolCallIndex = activeEvents.reduce(
       (acc, e, idx) => {
         var _a, _b;
@@ -66,15 +66,6 @@ class AgentControlledContextCompactor {
     delete invocationContext.session.state["temp:consolidate_context"];
     delete invocationContext.session.state["temp:consolidate_context_detail"];
   }
-  getActiveEvents(events) {
-    const latest = events.filter(isCompactedEvent).pop();
-    return latest ? [
-      latest,
-      ...events.filter(
-        (e) => !isCompactedEvent(e) && e.timestamp > latest.endTime
-      )
-    ] : events;
-  }
 }
 export {
   AgentControlledContextCompactor