@google/adk 2.2.0 → 2.3.0

package/dist/esm/cli/utils/logs.js

@@ -0,0 +1,111 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import * as util from "node:util";
+import { LogLevel, setLogger, setLogLevel } from "../../utils/logger.js";
+const LOGGING_FORMAT = "%(asctime)s - %(levelname)s - %(filename)s:%(lineno)d - %(message)s";
+const LOG_LEVEL_NAMES = {
+  [LogLevel.DEBUG]: "DEBUG",
+  [LogLevel.INFO]: "INFO",
+  [LogLevel.WARN]: "WARNING",
+  [LogLevel.ERROR]: "ERROR"
+};
+function formatDateTimestamp(date) {
+  const pad = /* @__PURE__ */ __name((n) => String(n).padStart(2, "0"), "pad");
+  return `${date.getFullYear()}${pad(date.getMonth() + 1)}${pad(date.getDate())}_${pad(date.getHours())}${pad(date.getMinutes())}${pad(date.getSeconds())}`;
+}
+__name(formatDateTimestamp, "formatDateTimestamp");
+function formatLogLine(level, messages) {
+  var _a;
+  const iso = (/* @__PURE__ */ new Date()).toISOString();
+  const levelName = (_a = LOG_LEVEL_NAMES[level]) != null ? _a : "INFO";
+  const formattedMessage = messages.map((m) => typeof m === "string" ? m : util.inspect(m, { depth: null })).join(" ");
+  return `${iso} - ${levelName} - ${formattedMessage}`;
+}
+__name(formatLogLine, "formatLogLine");
+function createWriterLogger(initialLevel, writeLine) {
+  let currentLevel = initialLevel;
+  const logAt = /* @__PURE__ */ __name((targetLevel, messages) => {
+    if (currentLevel <= targetLevel) {
+      writeLine(formatLogLine(targetLevel, messages));
+    }
+  }, "logAt");
+  return {
+    setLogLevel(level) {
+      currentLevel = level;
+    },
+    log(level, ...messages) {
+      logAt(level, messages);
+    },
+    debug(...messages) {
+      logAt(LogLevel.DEBUG, messages);
+    },
+    info(...messages) {
+      logAt(LogLevel.INFO, messages);
+    },
+    warn(...messages) {
+      logAt(LogLevel.WARN, messages);
+    },
+    error(...messages) {
+      logAt(LogLevel.ERROR, messages);
+    }
+  };
+}
+__name(createWriterLogger, "createWriterLogger");
+function logToStderr(level = LogLevel.INFO) {
+  setLogLevel(level);
+  setLogger(
+    createWriterLogger(level, (line) => {
+      process.stderr.write(`${line}
+`);
+    })
+  );
+}
+__name(logToStderr, "logToStderr");
+function logToTmpFolder(options = {}) {
+  const {
+    level = LogLevel.INFO,
+    subFolder = "agents_log",
+    logFilePrefix = "agent",
+    logFileTimestamp = formatDateTimestamp(/* @__PURE__ */ new Date())
+  } = options;
+  const logDir = path.join(os.tmpdir(), subFolder);
+  fs.mkdirSync(logDir, { recursive: true });
+  const logFilename = `${logFilePrefix}.${logFileTimestamp}.log`;
+  const logFilepath = path.join(logDir, logFilename);
+  fs.writeFileSync(logFilepath, "", "utf-8");
+  setLogLevel(level);
+  const fileLogger = createWriterLogger(level, (line) => {
+    fs.appendFileSync(logFilepath, `${line}
+`, "utf-8");
+  });
+  setLogger(fileLogger);
+  const latestLogLink = path.join(logDir, `${logFilePrefix}.latest.log`);
+  try {
+    try {
+      fs.lstatSync(latestLogLink);
+      fs.unlinkSync(latestLogLink);
+    } catch {
+    }
+    fs.symlinkSync(logFilepath, latestLogLink);
+  } catch (e) {
+    fileLogger.warn(`Failed to create symlink to latest log: ${String(e)}`);
+  }
+  fileLogger.info(`Log setup complete: ${logFilepath}`);
+  return logFilepath;
+}
+__name(logToTmpFolder, "logToTmpFolder");
+export {
+  LOGGING_FORMAT,
+  logToStderr,
+  logToTmpFolder
+};

package/dist/esm/code_executors/agent_engine_sandbox_code_executor.js

@@ -27,6 +27,7 @@ import { BaseCodeExecutor } from "./base_code_executor.js";
 import {
   CodeExecutionLanguage
 } from "./code_execution_utils.js";
+import { CONTEXT_KEY } from "./code_executor_context.js";
 const DEFAULT_MAX_ATTEMPTS = 180;
 const DEFAULT_SANDBOX_TTL = "31536000s";
 const DEFAULT_SANDBOX_DISPLAY_NAME = "default_sandbox";
@@ -208,12 +209,14 @@ let AgentEngineSandboxCodeExecutor = class extends BaseCodeExecutor {
     return this.agentEngineCreationPromise;
   }
   async getOrCreateSandbox(invocationContext, agentEngineName, language) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e;
     if (this.sandboxResourceName) {
       return this.sandboxResourceName;
     }
     const stateKey = `sandbox_name_${language.toLowerCase()}`;
-    let sandboxName = (_b = (_a = invocationContext.session) == null ? void 0 : _a.state) == null ? void 0 : _b[stateKey];
+    const state = (_a = invocationContext.session) == null ? void 0 : _a.state;
+    const codeExecutionContext = state == null ? void 0 : state[CONTEXT_KEY];
+    let sandboxName = (_b = state == null ? void 0 : state[stateKey]) != null ? _b : codeExecutionContext == null ? void 0 : codeExecutionContext[stateKey];
     let createNewSandbox = false;
     if (!sandboxName) {
       createNewSandbox = true;
@@ -270,6 +273,8 @@ let AgentEngineSandboxCodeExecutor = class extends BaseCodeExecutor {
           invocationContext.session.state = {};
         }
         invocationContext.session.state[stateKey] = sandboxName;
+        const context = (_e = (_c = invocationContext.session.state)[_d = CONTEXT_KEY]) != null ? _e : _c[_d] = {};
+        context[stateKey] = sandboxName;
       }
     }
     return sandboxName;

package/dist/esm/code_executors/code_execution_utils.js

@@ -29,33 +29,62 @@ function getEncodedFileContent(data) {
   return isBase64Encoded(data) ? data : base64Encode(data);
 }
 __name(getEncodedFileContent, "getEncodedFileContent");
+const FENCE_TAG_LANGUAGE_MAP = {
+  tool_code: "python" /* PYTHON */,
+  python: "python" /* PYTHON */,
+  py: "python" /* PYTHON */,
+  javascript: "javascript" /* JAVASCRIPT */,
+  js: "javascript" /* JAVASCRIPT */,
+  typescript: "typescript" /* TYPESCRIPT */,
+  ts: "typescript" /* TYPESCRIPT */,
+  bash: "shell" /* SHELL */,
+  sh: "shell" /* SHELL */,
+  shell: "shell" /* SHELL */
+};
+const NO_CODE_BLOCK = Object.freeze({
+  code: "",
+  language: "unspecified" /* UNSPECIFIED */
+});
+function getCodeBlockLanguage(leadingDelimiter) {
+  var _a;
+  const tag = leadingDelimiter.trim().replace(/^`+/, "").toLowerCase();
+  return (_a = FENCE_TAG_LANGUAGE_MAP[tag]) != null ? _a : "unspecified" /* UNSPECIFIED */;
+}
+__name(getCodeBlockLanguage, "getCodeBlockLanguage");
 function extractCodeAndTruncateContent(content, codeBlockDelimiters) {
+  return extractCodeBlockAndTruncateContent(content, codeBlockDelimiters).code;
+}
+__name(extractCodeAndTruncateContent, "extractCodeAndTruncateContent");
+function extractCodeBlockAndTruncateContent(content, codeBlockDelimiters) {
   var _a;
   if (!((_a = content.parts) == null ? void 0 : _a.length)) {
-    return "";
+    return { ...NO_CODE_BLOCK };
   }
   for (let i = 0; i < content.parts.length; i++) {
     const part = content.parts[i];
     if (part.executableCode && (i === content.parts.length - 1 || !content.parts[i + 1].codeExecutionResult)) {
       content.parts = content.parts.slice(0, i + 1);
-      return part.executableCode.code || "";
+      return {
+        code: part.executableCode.code || "",
+        language: "python" /* PYTHON */
+      };
     }
   }
   const textParts = content.parts.filter((part) => part.text);
   if (!textParts.length) {
-    return "";
+    return { ...NO_CODE_BLOCK };
   }
   const firstTextPart = cloneDeep(textParts[0]);
   const responseText = textParts.map((part) => part.text).join("\n");
   const leadingDelimiterPattern = codeBlockDelimiters.map((d) => d[0]).join("|");
   const trailingDelimiterPattern = codeBlockDelimiters.map((d) => d[1]).join("|");
   const match = new RegExp(
-    `(?<prefix>.*?)(${leadingDelimiterPattern})(?<codeStr>.*?)(${trailingDelimiterPattern})(?<suffix>.*?)$`,
+    `(?<prefix>.*?)(?<leading>${leadingDelimiterPattern})(?<codeStr>.*?)(${trailingDelimiterPattern})(?<suffix>.*?)$`,
     "s"
   ).exec(responseText);
-  const { prefix, codeStr } = (match == null ? void 0 : match.groups) || {};
+  const { prefix, leading, codeStr } = (match == null ? void 0 : match.groups) || {};
   if (!codeStr) {
-    return "";
+    return { ...NO_CODE_BLOCK };
   }
   content.parts = [];
   if (prefix) {
@@ -63,12 +92,11 @@ function extractCodeAndTruncateContent(content, codeBlockDelimiters) {
     content.parts.push(firstTextPart);
   }
   content.parts.push(buildExecutableCodePart(codeStr));
-  return codeStr;
+  return { code: codeStr, language: getCodeBlockLanguage(leading != null ? leading : "") };
 }
-__name(extractCodeAndTruncateContent, "extractCodeAndTruncateContent");
+__name(extractCodeBlockAndTruncateContent, "extractCodeBlockAndTruncateContent");
 function buildExecutableCodePart(code) {
   return {
-    text: code,
     executableCode: {
       code,
       language: Language.PYTHON
@@ -79,28 +107,28 @@ __name(buildExecutableCodePart, "buildExecutableCodePart");
 function buildCodeExecutionResultPart(codeExecutionResult) {
   if (codeExecutionResult.stderr) {
     return {
-      text: codeExecutionResult.stderr,
       codeExecutionResult: {
-        outcome: Outcome.OUTCOME_FAILED
+        outcome: Outcome.OUTCOME_FAILED,
+        output: codeExecutionResult.stderr
       }
     };
   }
   const finalResult = [];
-  if (codeExecutionResult.stdout || !codeExecutionResult.outputFiles) {
+  if (codeExecutionResult.stdout || !codeExecutionResult.outputFiles.length) {
     finalResult.push(`Code execution result:
 ${codeExecutionResult.stdout}
 `);
   }
-  if (codeExecutionResult.outputFiles) {
+  if (codeExecutionResult.outputFiles.length) {
     finalResult.push(
       `Saved artifacts:
-` + codeExecutionResult.outputFiles.map((f) => f.name).join(", ")
+` + codeExecutionResult.outputFiles.map((f) => `\`${f.name}\``).join(",")
     );
   }
   return {
-    text: finalResult.join("\n\n"),
     codeExecutionResult: {
-      outcome: Outcome.OUTCOME_OK
+      outcome: Outcome.OUTCOME_OK,
+      output: finalResult.join("\n\n")
     }
   };
 }
@@ -130,5 +158,7 @@ export {
   buildExecutableCodePart,
   convertCodeExecutionParts,
   extractCodeAndTruncateContent,
+  extractCodeBlockAndTruncateContent,
+  getCodeBlockLanguage,
   getEncodedFileContent
 };

package/dist/esm/code_executors/code_executor_context.js

@@ -17,8 +17,10 @@ const CODE_EXECUTION_RESULTS_KEY = "_code_execution_results";
 const _CodeExecutorContext = class _CodeExecutorContext {
   constructor(sessionState) {
     this.sessionState = sessionState;
-    var _a;
-    this.context = (_a = sessionState.get(CONTEXT_KEY)) != null ? _a : {};
+    if (!sessionState.has(CONTEXT_KEY)) {
+      sessionState.set(CONTEXT_KEY, {});
+    }
+    this.context = sessionState.get(CONTEXT_KEY);
     this.sessionState = sessionState;
   }
   /**
@@ -170,5 +172,6 @@ const _CodeExecutorContext = class _CodeExecutorContext {
 __name(_CodeExecutorContext, "CodeExecutorContext");
 let CodeExecutorContext = _CodeExecutorContext;
 export {
+  CONTEXT_KEY,
   CodeExecutorContext
 };

package/dist/esm/common.js

@@ -15,9 +15,20 @@ import {
   findEventByFunctionCallId,
   findMatchingFunctionCall,
   functionsExportedForTestingOnly,
+  handleFunctionCallsLive,
   isToolNotFound
 } from "./agents/functions.js";
-import { InvocationContext, requireAgent } from "./agents/invocation_context.js";
+import {
+  InvocationContext,
+  LlmCallsLimitExceededError,
+  isLlmCallsLimitExceededError,
+  requireAgent
+} from "./agents/invocation_context.js";
+import {
+  LangGraphAgent,
+  getLastHumanMessages,
+  isLangGraphAgent
+} from "./agents/langgraph_agent.js";
 import { LiveRequestQueue } from "./agents/live_request_queue.js";
 import { LlmAgent, LlmAgent as LlmAgent2, isLlmAgent } from "./agents/llm_agent.js";
 import { LoopAgent, isLoopAgent } from "./agents/loop_agent.js";
@@ -27,6 +38,7 @@ import {
   BaseLlmRequestProcessor,
   BaseLlmResponseProcessor
 } from "./agents/processors/base_llm_processor.js";
+import { CodeExecutionResponseProcessor } from "./agents/processors/code_execution_request_processor.js";
 import {
   CONTENT_REQUEST_PROCESSOR,
   ContentRequestProcessor
@@ -37,8 +49,9 @@ import {
   InteractionsRequestProcessor
 } from "./agents/processors/interactions_request_processor.js";
 import { ReadonlyContext } from "./agents/readonly_context.js";
+import { RemoteAgent, isRemoteAgent } from "./agents/remote_agent.js";
 import { RoutedAgent, isRoutedAgent } from "./agents/routed_agent.js";
-import { StreamingMode } from "./agents/run_config.js";
+import { StreamingMode, createRunConfig } from "./agents/run_config.js";
 import { SequentialAgent, isSequentialAgent } from "./agents/sequential_agent.js";
 import {
   getPendingUserInputRequests,
@@ -53,7 +66,11 @@ import { AuthCredentialTypes, isAuthCredential } from "./auth/auth_credential.js
 import { AuthHandler } from "./auth/auth_handler.js";
 import { AUTH_PREPROCESSOR, AuthPreprocessor } from "./auth/auth_preprocessor.js";
 import { AuthProviderRegistry } from "./auth/auth_provider_registry.js";
-import { OAuthGrantType } from "./auth/auth_schemes.js";
+import {
+  AuthSchemeType,
+  OAuthGrantType,
+  getOAuthGrantTypeFromFlow
+} from "./auth/auth_schemes.js";
 import { InMemoryCredentialService } from "./auth/credential_service/in_memory_credential_service.js";
 import { SessionStateCredentialService } from "./auth/credential_service/session_state_credential_service.js";
 import { CredentialExchangeError } from "./auth/exchanger/base_credential_exchanger.js";
@@ -95,6 +112,14 @@ import {
   stringifyContent
 } from "./events/event.js";
 import { createEventActions } from "./events/event_actions.js";
+import {
+  INTERNAL_METADATA_PREFIX,
+  RESTORED_EVENT_KEY,
+  markRestored,
+  publicEvent,
+  publicMetadata,
+  publicSession
+} from "./events/internal_metadata.js";
 import { EventType, toStructuredEvents } from "./events/structured_events.js";
 import {
   BaseExampleProvider,
@@ -110,6 +135,8 @@ import {
   stripAdkIdentityPreamble
 } from "./models/chrome_prompt_llm.js";
 import { Gemini, geminiInitParams } from "./models/google_llm.js";
+import { appendInstructions } from "./models/llm_request.js";
+import { createLlmResponse } from "./models/llm_response.js";
 import { LLMRegistry } from "./models/registry.js";
 import { RoutedLlm } from "./models/routed_llm.js";
 import { BasePlanner, isBasePlanner } from "./planners/base_planner.js";
@@ -140,6 +167,10 @@ import {
   SecurityPlugin,
   getAskUserConfirmationFunctionCalls
 } from "./plugins/security_plugin.js";
+import {
+  ToolCallIntegrityError,
+  ToolCallIntegrityPlugin
+} from "./plugins/tool_call_integrity_plugin.js";
 import { InMemoryRunner } from "./runner/in_memory_runner.js";
 import {
   Runner,
@@ -207,6 +238,8 @@ import {
 import { AsyncQueue } from "./utils/async_queue.js";
 import { renameReservedKeywords, toSnakeCaseName } from "./utils/case_utils.js";
 import { getClientLabels, runWithClientLabel } from "./utils/client_labels.js";
+import { toGeminiSchema } from "./utils/gemini_schema_util.js";
+import { genaiSchemaToJsonSchema } from "./utils/genai_schema_to_json.js";
 import {
   LogLevel,
   getLogger,
@@ -221,6 +254,7 @@ import {
   isGemini3xFlashLive,
   isGemini3xLive
 } from "./utils/model_name.js";
+import { toJsonSchema } from "./utils/schema.js";
 import { zodObjectToSchema } from "./utils/simple_zod_to_json.js";
 import { Task } from "./utils/task.js";
 import { GoogleLLMVariant } from "./utils/variant_utils.js";
@@ -276,6 +310,19 @@ export * from "./features/feature_registry.js";
 export * from "./memory/base_memory_service.js";
 export * from "./sessions/base_session_service.js";
 export * from "./tools/base_tool.js";
+import {
+  convertSessionToEvalFormat,
+  createEmptyState
+} from "./cli/utils/evals.js";
+import { CrewaiTool, isCrewaiTool } from "./tools/crewai_tool.js";
+import {
+  buildFunctionDeclarationForLangchain,
+  buildFunctionDeclarationForParamsForCrewai,
+  buildFunctionDeclarationUtil
+} from "./tools/function_tool.js";
+import { LangchainTool, isLangchainTool } from "./tools/langchain_tool.js";
+import { isBaseRetrievalTool } from "./tools/retrieval/base_retrieval_tool.js";
+import { ToolboxTool, isToolboxTool } from "./tools/toolbox_tool.js";
 export {
   ADK_HANDLE_MODEL_ERROR_TOOL_NAME,
   AUTH_PREPROCESSOR,
@@ -293,6 +340,7 @@ export {
   AuthHandler,
   AuthPreprocessor,
   AuthProviderRegistry,
+  AuthSchemeType,
   BaseAgent,
   BaseCodeExecutor,
   BaseEnvironment,
@@ -316,6 +364,7 @@ export {
   ChromeBuiltInLlm,
   ChromeModelUnavailableError,
   CodeExecutionLanguage,
+  CodeExecutionResponseProcessor,
   ConsolidateContextTool,
   ContentRequestProcessor,
   Context,
@@ -323,6 +372,7 @@ export {
   ContextCompactorRequestProcessor,
   CredentialExchangeError,
   CredentialRefresherRegistry,
+  CrewaiTool,
   DEFAULT_ROUTE,
   ENTERPRISE_WEB_SEARCH,
   EXIT_LOOP,
@@ -348,6 +398,7 @@ export {
   GoogleSearchTool,
   Graph,
   INTERACTIONS_REQUEST_PROCESSOR,
+  INTERNAL_METADATA_PREFIX,
   InMemoryArtifactService,
   InMemoryCredentialService,
   InMemoryMemoryService,
@@ -362,10 +413,13 @@ export {
   LLMRegistry,
   LOAD_ARTIFACTS,
   LOAD_MEMORY,
+  LangGraphAgent,
+  LangchainTool,
   ListSkillsTool,
   LiveRequestQueue,
   LlamaIndexRetrieval,
   LlmAgent2 as LlmAgent,
+  LlmCallsLimitExceededError,
   LlmSummarizer,
   LoadArtifactsTool,
   LoadMemoryTool,
@@ -396,9 +450,11 @@ export {
   REQUEST_CREDENTIAL_FUNCTION_CALL_NAME,
   REQUEST_INPUT_FUNCTION_CALL_NAME,
   RESERVED_TOOL_CALL_ERROR_TYPE,
+  RESTORED_EVENT_KEY,
   ReadonlyContext,
   ReflectAndRetryModelPlugin,
   ReflectAndRetryToolPlugin,
+  RemoteAgent,
   RequestInput,
   RoutedAgent,
   RoutedLlm,
@@ -416,11 +472,14 @@ export {
   StreamingMode,
   Task,
   TokenBasedContextCompactor,
+  ToolCallIntegrityError,
+  ToolCallIntegrityPlugin,
   ToolConfirmation,
   ToolContext,
   ToolErrorType,
   ToolExecutionError,
   ToolNode,
+  ToolboxTool,
   TrackingScope,
   TrajectoryThoughtPruningCompactor,
   TruncatingContextCompactor,
@@ -433,13 +492,21 @@ export {
   WebMCPToolset,
   Workflow,
   WorkflowNode,
+  appendInstructions,
   asRunnableRoot,
+  buildFunctionDeclarationForLangchain,
+  buildFunctionDeclarationForParamsForCrewai,
+  buildFunctionDeclarationUtil,
   commonPrefixOf,
+  convertSessionToEvalFormat,
+  createEmptyState,
   createEvent,
   createEventActions,
+  createLlmResponse,
   createNodeErrorEvent,
   createNodeState,
   createResumabilityConfig,
+  createRunConfig,
   createSession,
   createSubBranch,
   determineAgentForResumption,
@@ -448,16 +515,20 @@ export {
   findMatchingFunctionCall,
   functionsExportedForTestingOnly,
   geminiInitParams,
+  genaiSchemaToJsonSchema,
   generateClientFunctionCallId,
   getAskUserConfirmationFunctionCalls,
   getClientLabels,
   getFunctionCalls,
   getFunctionResponses,
+  getLastHumanMessages,
   getLogger,
   getModelContext,
+  getOAuthGrantTypeFromFlow,
   getPendingUserInputRequests,
   getUserChoiceTool,
   getUserInputRequests,
+  handleFunctionCallsLive,
   hasThoughts,
   hasTrailingCodeExecutionResult,
   isAgentTool,
@@ -467,10 +538,12 @@ export {
   isBaseExampleProvider,
   isBaseLlm,
   isBasePlanner,
+  isBaseRetrievalTool,
   isBaseTool,
   isBaseToolset,
   isBuiltInPlanner,
   isCompactedEvent,
+  isCrewaiTool,
   isFinalResponse,
   isFunctionTool,
   isGemini2OrAbove,
@@ -478,7 +551,10 @@ export {
   isGemini3xFlashLive,
   isGemini3xLive,
   isIntentMismatchError,
+  isLangGraphAgent,
+  isLangchainTool,
   isLlmAgent,
+  isLlmCallsLimitExceededError,
   isLoopAgent,
   isNodeErrorEvent,
   isNodeReportedError,
@@ -486,6 +562,7 @@ export {
   isNodeState,
   isNodeTimeoutError,
   isParallelAgent,
+  isRemoteAgent,
   isRequestInput,
   isRoutableLlmAgent,
   isRoutedAgent,
@@ -496,14 +573,19 @@ export {
   isSessionArtifactService,
   isStateSchemaError,
   isToolNotFound,
+  isToolboxTool,
   isWebMCPSupported,
   isWorkflow,
   logger,
+  markRestored,
   node,
   normalizeRetryExceptions,
   populateClientFunctionCallId,
   prepareRetryConfig,
   pruneThoughts,
+  publicEvent,
+  publicMetadata,
+  publicSession,
   renameReservedKeywords,
   requestInputTool,
   requireAgent,
@@ -515,6 +597,8 @@ export {
   setLogger,
   stringifyContent,
   stripAdkIdentityPreamble,
+  toGeminiSchema,
+  toJsonSchema,
   toSnakeCaseName,
   toStructuredEvents,
   validateAppName,

package/dist/esm/context/summarizers/llm_summarizer.js

@@ -29,7 +29,7 @@ const _LlmSummarizer = class _LlmSummarizer {
    * @throws {Error} If `events` is empty or the LLM returns no content.
    */
   async summarize(events) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b;
     if (events.length === 0) {
       throw new Error("Cannot summarize an empty list of events.");
     }
@@ -51,18 +51,20 @@ ${formattedEvents}`;
       toolsDict: {},
       liveConnectConfig: {}
     };
-    const responseGen = this.llm.generateContentAsync(request, false);
     let compactedContent = "";
-    const firstResponse = await responseGen.next();
-    if (firstResponse.done || !((_c = (_b = (_a = firstResponse.value.content) == null ? void 0 : _a.parts) == null ? void 0 : _b[0]) == null ? void 0 : _c.text)) {
-      throw new Error("LLM failed to return a valid summary.");
-    }
-    compactedContent += firstResponse.value.content.parts[0].text;
-    for await (const chunk of responseGen) {
-      if ((_f = (_e = (_d = chunk.content) == null ? void 0 : _d.parts) == null ? void 0 : _e[0]) == null ? void 0 : _f.text) {
-        compactedContent += chunk.content.parts[0].text;
+    for await (const response of this.llm.generateContentAsync(
+      request,
+      false
+    )) {
+      for (const part of (_b = (_a = response.content) == null ? void 0 : _a.parts) != null ? _b : []) {
+        if (part.text && !part.thought) {
+          compactedContent += part.text;
+        }
       }
     }
+    if (!compactedContent) {
+      throw new Error("LLM failed to return a valid summary.");
+    }
     return createCompactedEvent({
       author: "system",
       content: {

package/dist/esm/context/token_based_context_compactor.js

@@ -86,7 +86,8 @@ let TokenBasedContextCompactor = _TokenBasedContextCompactor;
 function latestPromptTokenCount(activeEvents, invocationContext) {
   var _a;
   for (let i = activeEvents.length - 1; i >= 0; i--) {
-    const count = (_a = activeEvents[i].usageMetadata) == null ? void 0 : _a.promptTokenCount;
+    const usage = activeEvents[i].usageMetadata;
+    const count = (_a = usage == null ? void 0 : usage.initialPromptTokenCount) != null ? _a : usage == null ? void 0 : usage.promptTokenCount;
     if (count !== void 0) {
       return count;
     }