@google/adk 1.5.0 → 1.6.0

package/dist/cjs/a2a/a2a_remote_agent.js

@@ -130,7 +130,12 @@ class RemoteA2AAgent extends import_base_agent.BaseAgent {
               await callback(context, chunk);
             }
           }
-          const adkEvent = (0, import_event_converter_utils.toAdkEvent)(chunk, context.invocationId, this.name);
+          const adkEvent = (0, import_event_converter_utils.toAdkEvent)(
+            chunk,
+            context.invocationId,
+            this.name,
+            context.branch
+          );
           if (!adkEvent) {
             continue;
           }
@@ -151,7 +156,12 @@ class RemoteA2AAgent extends import_base_agent.BaseAgent {
             await callback(context, result);
           }
         }
-        const adkEvent = (0, import_event_converter_utils.toAdkEvent)(result, context.invocationId, this.name);
+        const adkEvent = (0, import_event_converter_utils.toAdkEvent)(
+          result,
+          context.invocationId,
+          this.name,
+          context.branch
+        );
         if (adkEvent) {
           processor.updateCustomMetadata(adkEvent, result);
           yield adkEvent;

package/dist/cjs/a2a/agent_to_a2a.js

@@ -102,7 +102,6 @@ async function toA2a(agent, options = {}) {
   );
   const app = (_d = options.app) != null ? _d : (0, import_express2.default)();
   if (!options.app) {
-    app.use(import_express2.default.urlencoded({ limit: "50mb", extended: true }));
     app.use(import_express2.default.json({ limit: "50mb" }));
   }
   app.use(

package/dist/cjs/a2a/auth.js

@@ -0,0 +1,65 @@
+/**
+  * @license
+  * Copyright 2026 Google LLC
+  * SPDX-License-Identifier: Apache-2.0
+  */
+
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var auth_exports = {};
+__export(auth_exports, {
+  bearerTokenUserBuilder: () => bearerTokenUserBuilder
+});
+module.exports = __toCommonJS(auth_exports);
+var import_node_crypto = require("node:crypto");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const AUTHENTICATED_USER_NAME = "a2a-bearer-token";
+const BEARER_SCHEME_PREFIX = "bearer ";
+function timingSafeEqualStrings(a, b) {
+  const left = Buffer.from(a, "utf8");
+  const right = Buffer.from(b, "utf8");
+  return left.length === right.length && (0, import_node_crypto.timingSafeEqual)(left, right);
+}
+function bearerTokenUserBuilder(token) {
+  const expected = token.trim();
+  if (!expected) {
+    throw new Error(
+      "bearerTokenUserBuilder: an empty A2A bearer token is not a valid authenticator. Supply a real shared secret, or configure no token at all to run the A2A surface unauthenticated."
+    );
+  }
+  return async (req) => {
+    var _a;
+    const header = (_a = req.headers.authorization) != null ? _a : "";
+    const credential = header.toLowerCase().startsWith(BEARER_SCHEME_PREFIX) ? header.slice(BEARER_SCHEME_PREFIX.length) : "";
+    if (!timingSafeEqualStrings(credential, expected)) {
+      throw new Error(
+        "A2A request rejected: missing or invalid `Authorization: Bearer` credential."
+      );
+    }
+    return { isAuthenticated: true, userName: AUTHENTICATED_USER_NAME };
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  bearerTokenUserBuilder
+});

package/dist/cjs/a2a/event_converter_utils.js

@@ -54,34 +54,35 @@ function toA2AMessage(event, {
     metadata: (0, import_metadata_converter_utils.getA2AEventMetadata)(event, { appName, userId, sessionId })
   };
 }
-function toAdkEvent(event, invocationId, agentName) {
+function toAdkEvent(event, invocationId, agentName, branch) {
   if ((0, import_a2a_event.isMessage)(event)) {
-    return messageToAdkEvent(event, invocationId, agentName);
+    return messageToAdkEvent(event, invocationId, agentName, branch);
   }
   if ((0, import_a2a_event.isTask)(event)) {
-    return taskToAdkEvent(event, invocationId, agentName);
+    return taskToAdkEvent(event, invocationId, agentName, branch);
   }
   if ((0, import_a2a_event.isTaskArtifactUpdateEvent)(event)) {
-    return artifactUpdateToAdkEvent(event, invocationId, agentName);
+    return artifactUpdateToAdkEvent(event, invocationId, agentName, branch);
   }
   if ((0, import_a2a_event.isTaskStatusUpdateEvent)(event)) {
-    return event.final ? finalTaskStatusUpdateToAdkEvent(event, invocationId, agentName) : taskStatusUpdateToAdkEvent(event, invocationId, agentName);
+    return event.final ? finalTaskStatusUpdateToAdkEvent(event, invocationId, agentName, branch) : taskStatusUpdateToAdkEvent(event, invocationId, agentName, branch);
   }
   return void 0;
 }
-function messageToAdkEvent(msg, invocationId, agentName) {
+function messageToAdkEvent(msg, invocationId, agentName, branch) {
   const parts = (0, import_part_converter_utils.toGenAIParts)(msg.parts);
   const content = parts.length === 0 ? void 0 : msg.role === import_a2a_event.MessageRole.USER ? (0, import_genai.createUserContent)(parts) : (0, import_genai.createModelContent)(parts);
   return {
     ...createAdkEventFromMetadata(msg),
     invocationId,
     author: msg.role === import_a2a_event.MessageRole.USER ? import_a2a_event.MessageRole.USER : agentName,
+    branch,
     content,
     turnComplete: true,
     partial: false
   };
 }
-function artifactUpdateToAdkEvent(a2aEvent, invocationId, agentName) {
+function artifactUpdateToAdkEvent(a2aEvent, invocationId, agentName, branch) {
   var _a;
   const partsToConvert = ((_a = a2aEvent.artifact) == null ? void 0 : _a.parts) || [];
   if (partsToConvert.length === 0) {
@@ -92,12 +93,13 @@ function artifactUpdateToAdkEvent(a2aEvent, invocationId, agentName) {
     ...createAdkEventFromMetadata(a2aEvent),
     invocationId,
     author: agentName,
+    branch,
     content: (0, import_genai.createModelContent)((0, import_part_converter_utils.toGenAIParts)(partsToConvert)),
     longRunningToolIds: getLongRunningToolIDs(partsToConvert),
     partial
   };
 }
-function finalTaskStatusUpdateToAdkEvent(a2aEvent, invocationId, agentName) {
+function finalTaskStatusUpdateToAdkEvent(a2aEvent, invocationId, agentName, branch) {
   var _a;
   const partsToConvert = ((_a = a2aEvent.status.message) == null ? void 0 : _a.parts) || [];
   if (partsToConvert.length === 0) {
@@ -110,13 +112,14 @@ function finalTaskStatusUpdateToAdkEvent(a2aEvent, invocationId, agentName) {
     ...createAdkEventFromMetadata(a2aEvent),
     invocationId,
     author: agentName,
+    branch,
     errorMessage: isFailedTask ? (0, import_a2a_event.getFailedTaskStatusUpdateEventError)(a2aEvent) : void 0,
     content: hasContent ? (0, import_genai.createModelContent)(parts) : void 0,
     longRunningToolIds: getLongRunningToolIDs(partsToConvert),
     turnComplete: true
   };
 }
-function taskStatusUpdateToAdkEvent(a2aEvent, invocationId, agentName) {
+function taskStatusUpdateToAdkEvent(a2aEvent, invocationId, agentName, branch) {
   const msg = a2aEvent.status.message;
   if (!msg) {
     return void 0;
@@ -129,12 +132,13 @@ function taskStatusUpdateToAdkEvent(a2aEvent, invocationId, agentName) {
     ...createAdkEventFromMetadata(a2aEvent),
     invocationId,
     author: agentName,
+    branch,
     content: (0, import_genai.createModelContent)(parts),
     turnComplete: false,
     partial: true
   };
 }
-function taskToAdkEvent(a2aTask, invocationId, agentName) {
+function taskToAdkEvent(a2aTask, invocationId, agentName, branch) {
   var _a, _b;
   const parts = [];
   const longRunningToolIds = [];
@@ -162,16 +166,26 @@ function taskToAdkEvent(a2aTask, invocationId, agentName) {
     ...createAdkEventFromMetadata(a2aTask),
     invocationId,
     author: agentName,
+    branch,
     content: isFailed ? void 0 : (0, import_genai.createModelContent)(parts),
     errorMessage: isFailed ? (0, import_a2a_event.getFailedTaskStatusUpdateEventError)(a2aTask) : void 0,
     longRunningToolIds,
     turnComplete: isTerminal
   };
 }
+const PEER_SETTABLE_ACTION_FIELDS = /* @__PURE__ */ new Set(["escalate"]);
 function createAdkEventFromMetadata(a2aEvent) {
   const metadata = a2aEvent.metadata || {};
   return (0, import_event.createEvent)({
-    branch: metadata[import_metadata_converter_utils.A2AMetadataKeys.BRANCH],
+    // `branch` is intentionally NOT restored from peer metadata here (unlike
+    // the other fields below): it is the mechanism getContents() (see
+    // content_processor_utils.ts) uses to keep sibling sub-agent branches'
+    // conversation contexts isolated from each other. A remote A2A peer that
+    // controls its own outgoing metadata could otherwise forge `adk_branch`
+    // (set it to a shared ancestor branch, or omit it) to leak its content
+    // into an unrelated sibling agent's LLM context. Every caller of the
+    // `*ToAdkEvent` functions in this file force-sets `branch` from its own
+    // local `InvocationContext` instead, the same way `author` is handled.
     author: metadata[import_metadata_converter_utils.A2AMetadataKeys.AUTHOR],
     partial: metadata[import_metadata_converter_utils.A2AMetadataKeys.PARTIAL],
     errorCode: metadata[import_metadata_converter_utils.A2AMetadataKeys.ERROR_CODE],
@@ -180,10 +194,21 @@ function createAdkEventFromMetadata(a2aEvent) {
     groundingMetadata: metadata[import_metadata_converter_utils.A2AMetadataKeys.GROUNDING_METADATA],
     usageMetadata: metadata[import_metadata_converter_utils.A2AMetadataKeys.USAGE_METADATA],
     customMetadata: metadata[import_metadata_converter_utils.A2AMetadataKeys.CUSTOM_METADATA],
-    actions: (0, import_event_actions.createEventActions)({
-      escalate: !!metadata[import_metadata_converter_utils.A2AMetadataKeys.ESCALATE],
-      transferToAgent: metadata[import_metadata_converter_utils.A2AMetadataKeys.TRANSFER_TO_AGENT]
-    })
+    // Only fields in PEER_SETTABLE_ACTION_FIELDS may be restored from
+    // metadata a remote A2A peer controls. Every other action field either
+    // mutates the caller's own session or drives the caller's own control
+    // flow (e.g. `transferToAgent`, see llm_agent.ts), so it must never be
+    // rebuilt from peer-supplied data. Filtering through an allowlist here
+    // (rather than just omitting the unsafe field) means a future action
+    // field is unsafe-by-default: adding it to `candidateActions` alone
+    // does nothing until it's also added to the allowlist.
+    actions: (0, import_event_actions.createEventActions)(
+      Object.fromEntries(
+        Object.entries({
+          escalate: !!metadata[import_metadata_converter_utils.A2AMetadataKeys.ESCALATE]
+        }).filter(([key]) => PEER_SETTABLE_ACTION_FIELDS.has(key))
+      )
+    )
   });
 }
 function getLongRunningToolIDs(parts) {

package/dist/cjs/agents/functions.js

@@ -212,6 +212,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,
@@ -258,6 +270,7 @@ async function handleFunctionCallList({
         }
       }
     }
+    functionResponse = normalizeCallbackResponse(functionResponse);
     if (functionResponse == null) {
       try {
         functionResponse = await callToolAsync(tool, functionArgs, toolContext);
@@ -269,8 +282,8 @@ async function handleFunctionCallList({
             toolContext,
             error: e
           });
-          if (onToolErrorResponse) {
-            functionResponse = onToolErrorResponse;
+          if (onToolErrorResponse != null) {
+            functionResponse = normalizeCallbackResponse(onToolErrorResponse);
           } else {
             functionResponseError = e.message;
           }
@@ -299,17 +312,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 = (0, import_event.createEvent)({
       invocationId: invocationContext.invocationId,

package/dist/cjs/agents/llm_agent.js

@@ -35,6 +35,7 @@ var import_base_llm = require("../models/base_llm.js");
 var import_registry = require("../models/registry.js");
 var import_base_tool = require("../tools/base_tool.js");
 var import_logger = require("../utils/logger.js");
+var import_output_schema_utils = require("../utils/output_schema_utils.js");
 var import_context = require("./context.js");
 var import_tracing = require("../telemetry/tracing.js");
 var import_simple_zod_to_json = require("../utils/simple_zod_to_json.js");
@@ -404,7 +405,7 @@ class LlmAgent extends (_b = import_base_agent.BaseAgent, _a = LLM_AGENT_SIGNATU
       }
     }
     const allTools = [...this.tools];
-    if (this.outputSchema && allTools.length > 0) {
+    if (this.outputSchema && allTools.length > 0 && !(0, import_output_schema_utils.canUseOutputSchemaWithTools)(this.canonicalModel.model)) {
       const setModelResponseTool = new import_function_tool.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/cjs/agents/processors/basic_llm_request_processor.js

@@ -29,6 +29,7 @@ __export(basic_llm_request_processor_exports, {
 });
 module.exports = __toCommonJS(basic_llm_request_processor_exports);
 var import_llm_request = require("../../models/llm_request.js");
+var import_output_schema_utils = require("../../utils/output_schema_utils.js");
 var import_llm_agent = require("../llm_agent.js");
 var import_base_llm_processor = require("./base_llm_processor.js");
 /**
@@ -46,14 +47,14 @@ class BasicLlmRequestProcessor extends import_base_llm_processor.BaseLlmRequestP
    */
   // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
-    var _a;
+    var _a, _b;
     const agent = invocationContext.agent;
     if (!(0, import_llm_agent.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) || (0, import_output_schema_utils.canUseOutputSchemaWithTools)(agent.canonicalModel.model))) {
       (0, import_llm_request.setOutputSchema)(llmRequest, agent.outputSchema);
     }
     if (invocationContext.runConfig) {

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

@@ -28,7 +28,7 @@ __export(content_request_processor_exports, {
   ContentRequestProcessor: () => ContentRequestProcessor
 });
 module.exports = __toCommonJS(content_request_processor_exports);
-var import_compacted_event = require("../../events/compacted_event.js");
+var import_compaction_utils = require("../../context/compaction_utils.js");
 var import_llm_agent = require("../llm_agent.js");
 var import_content_processor_utils = require("./content_processor_utils.js");
 /**
@@ -50,26 +50,7 @@ class ContentRequestProcessor {
     if (!agent || !(0, import_llm_agent.isLlmAgent)(agent)) {
       return;
     }
-    let events = invocationContext.session.events;
-    const compactedEvents = events.filter(import_compacted_event.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 ((0, import_compacted_event.isCompactedEvent)(event)) {
-          return false;
-        }
-        if (event.timestamp <= latestCompactedEvent.endTime) {
-          return false;
-        }
-        return true;
-      });
-      events = [latestCompactedEvent, ...remainingEvents];
-    }
+    const events = (0, import_compaction_utils.getActiveEvents)(invocationContext.session.events);
     if (agent.includeContents === "default") {
       llmRequest.contents = (0, import_content_processor_utils.getContents)(
         events,

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

@@ -29,6 +29,7 @@ __export(instructions_llm_request_processor_exports, {
 });
 module.exports = __toCommonJS(instructions_llm_request_processor_exports);
 var import_llm_request = require("../../models/llm_request.js");
+var import_output_schema_utils = require("../../utils/output_schema_utils.js");
 var import_instructions = require("../instructions.js");
 var import_llm_agent = require("../llm_agent.js");
 var import_readonly_context = require("../readonly_context.js");
@@ -44,6 +45,7 @@ class InstructionsLlmRequestProcessor extends import_base_llm_processor.BaseLlmR
    */
   // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
+    var _a;
     const agent = invocationContext.agent;
     if (!(0, import_llm_agent.isLlmAgent)(agent)) {
       return;
@@ -75,7 +77,7 @@ class InstructionsLlmRequestProcessor extends import_base_llm_processor.BaseLlmR
       }
       (0, import_llm_request.appendInstructions)(llmRequest, [instructionWithState]);
     }
-    if (agent.outputSchema && agent.tools && agent.tools.length > 0) {
+    if (agent.outputSchema && ((_a = agent.tools) == null ? void 0 : _a.length) && !(0, import_output_schema_utils.canUseOutputSchemaWithTools)(agent.canonicalModel.model)) {
       (0, import_llm_request.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/cjs/artifacts/in_memory_artifact_service.js

@@ -98,16 +98,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());
@@ -178,9 +176,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/cjs/auth/credential_service/in_memory_credential_service.js

@@ -34,7 +34,18 @@ module.exports = __toCommonJS(in_memory_credential_service_exports);
  */
 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);
@@ -49,10 +60,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/cjs/code_executors/unsafe_local_code_executor.js

@@ -37,7 +37,7 @@ __export(unsafe_local_code_executor_exports, {
   UnsafeLocalCodeExecutor: () => UnsafeLocalCodeExecutor
 });
 module.exports = __toCommonJS(unsafe_local_code_executor_exports);
-var import_child_process = require("child_process");
+var import_node_child_process = require("node:child_process");
 var fs = __toESM(require("node:fs/promises"), 1);
 var os = __toESM(require("node:os"), 1);
 var path = __toESM(require("node:path"), 1);
@@ -52,13 +52,21 @@ var import_code_execution_utils = require("./code_execution_utils.js");
  * SPDX-License-Identifier: Apache-2.0
  */
 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);
@@ -78,6 +86,9 @@ function getExtensionForLanguage(language, shellCommandPath) {
     return ".bat";
   }
   if (language === import_code_execution_utils.CodeExecutionLanguage.SHELL) {
+    if (shellCommandPath && isPowerShellCommand(shellCommandPath)) {
+      return ".ps1";
+    }
     if (IS_WINDOWS) {
       if (shellCommandPath && shellCommandPath.toLowerCase().includes("cmd")) {
         return ".bat";
@@ -136,17 +147,17 @@ class UnsafeLocalCodeExecutor extends import_base_code_executor.BaseCodeExecutor
         command = this.pythonCommandPath;
       } else if (language === import_code_execution_utils.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 === import_code_execution_utils.CodeExecutionLanguage.POWERSHELL) {
         command = IS_WINDOWS ? "powershell" : "pwsh";
-        args = ["-NoLogo", "-ExecutionPolicy", "Bypass", "-File", filePath];
+        args = [...POWERSHELL_BASE_ARGS, filePath];
       } else if (language === import_code_execution_utils.CodeExecutionLanguage.WINDOWS_CMD) {
         command = "cmd.exe";
-        args = ["/c", filePath];
+        args = [...CMD_BASE_ARGS, filePath];
       }
       if (params.codeExecutionInput.args) {
         if (Array.isArray(params.codeExecutionInput.args)) {
@@ -158,7 +169,7 @@ class UnsafeLocalCodeExecutor extends import_base_code_executor.BaseCodeExecutor
         }
       }
       const executionResult = await new Promise((resolve) => {
-        const child = (0, import_child_process.spawn)(command, args, {
+        const child = (0, import_node_child_process.spawn)(command, args, {
           timeout: this.timeoutSeconds * 1e3,
           killSignal: "SIGKILL",
           cwd: tempDir

package/dist/cjs/common.js

@@ -150,6 +150,7 @@ __export(common_exports, {
   getFunctionCalls: () => import_event.getFunctionCalls,
   getFunctionResponses: () => import_event.getFunctionResponses,
   getLogger: () => import_logger.getLogger,
+  getUserChoiceTool: () => import_get_user_choice_tool.getUserChoiceTool,
   hasThoughts: () => import_event.hasThoughts,
   hasTrailingCodeExecutionResult: () => import_event.hasTrailingCodeExecutionResult,
   isAgentTool: () => import_agent_tool.isAgentTool,
@@ -177,6 +178,7 @@ __export(common_exports, {
   loadWebPage: () => import_load_web_page.loadWebPage,
   populateClientFunctionCallId: () => import_event.populateClientFunctionCallId,
   pruneThoughts: () => import_event.pruneThoughts,
+  requestInputTool: () => import_request_input_tool.requestInputTool,
   runWithClientLabel: () => import_client_labels.runWithClientLabel,
   setLogLevel: () => import_logger.setLogLevel,
   setLogger: () => import_logger.setLogger,
@@ -258,6 +260,7 @@ var import_enterprise_web_search_tool = require("./tools/enterprise_web_search_t
 var import_example_tool = require("./tools/example_tool.js");
 var import_exit_loop_tool = require("./tools/exit_loop_tool.js");
 var import_function_tool = require("./tools/function_tool.js");
+var import_get_user_choice_tool = require("./tools/get_user_choice_tool.js");
 var import_google_maps_grounding_tool = require("./tools/google_maps_grounding_tool.js");
 var import_google_search_tool = require("./tools/google_search_tool.js");
 var import_load_artifacts_tool = require("./tools/load_artifacts_tool.js");
@@ -265,6 +268,7 @@ var import_load_memory_tool = require("./tools/load_memory_tool.js");
 var import_load_web_page = require("./tools/load_web_page.js");
 var import_long_running_tool = require("./tools/long_running_tool.js");
 var import_preload_memory_tool = require("./tools/preload_memory_tool.js");
+var import_request_input_tool = require("./tools/request_input_tool.js");
 var import_tool_confirmation = require("./tools/tool_confirmation.js");
 var import_url_context_tool = require("./tools/url_context_tool.js");
 var import_vertex_ai_search_tool = require("./tools/vertex_ai_search_tool.js");
@@ -431,6 +435,7 @@ __reExport(common_exports, require("./tools/base_tool.js"), module.exports);
   getFunctionCalls,
   getFunctionResponses,
   getLogger,
+  getUserChoiceTool,
   hasThoughts,
   hasTrailingCodeExecutionResult,
   isAgentTool,
@@ -458,6 +463,7 @@ __reExport(common_exports, require("./tools/base_tool.js"), module.exports);
   loadWebPage,
   populateClientFunctionCallId,
   pruneThoughts,
+  requestInputTool,
   runWithClientLabel,
   setLogLevel,
   setLogger,

package/dist/cjs/context/agent_controlled_context_compactor.js

@@ -27,9 +27,9 @@ __export(agent_controlled_context_compactor_exports, {
   AgentControlledContextCompactor: () => AgentControlledContextCompactor
 });
 module.exports = __toCommonJS(agent_controlled_context_compactor_exports);
-var import_compacted_event = require("../events/compacted_event.js");
 var import_event = require("../events/event.js");
 var import_base_plugin = require("../plugins/base_plugin.js");
+var import_compaction_utils = require("./compaction_utils.js");
 /**
  * @license
  * Copyright 2026 Google LLC
@@ -45,7 +45,7 @@ class AgentControlledContextCompactor {
   }
   async compact(invocationContext) {
     const events = invocationContext.session.events;
-    const activeEvents = this.getActiveEvents(events);
+    const activeEvents = (0, import_compaction_utils.getActiveEvents)(events);
     const consolidateToolCallIndex = activeEvents.reduce(
       (acc, e, idx) => {
         var _a, _b;
@@ -93,15 +93,6 @@ class AgentControlledContextCompactor {
     delete invocationContext.session.state["temp:consolidate_context"];
     delete invocationContext.session.state["temp:consolidate_context_detail"];
   }
-  getActiveEvents(events) {
-    const latest = events.filter(import_compacted_event.isCompactedEvent).pop();
-    return latest ? [
-      latest,
-      ...events.filter(
-        (e) => !(0, import_compacted_event.isCompactedEvent)(e) && e.timestamp > latest.endTime
-      )
-    ] : events;
-  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {