@google/adk 0.3.0 → 0.5.0

package/dist/web/agents/llm_agent.js

@@ -69,691 +69,47 @@ var __forAwait = (obj, it, method) => (it = obj[__knownSymbol("asyncIterator")])
  */
 var _a, _b;
 import { context, trace } from "@opentelemetry/api";
-import { cloneDeep } from "lodash-es";
-import { z } from "zod";
-import {
-  isBaseCodeExecutor
-} from "../code_executors/base_code_executor.js";
-import { isBuiltInCodeExecutor } from "../code_executors/built_in_code_executor.js";
-import {
-  buildCodeExecutionResultPart,
-  buildExecutableCodePart,
-  convertCodeExecutionParts,
-  extractCodeAndTruncateContent
-} from "../code_executors/code_execution_utils.js";
-import { CodeExecutorContext } from "../code_executors/code_executor_context.js";
 import {
   createEvent,
   createNewEventId,
   getFunctionCalls,
-  getFunctionResponses,
   isFinalResponse
 } from "../events/event.js";
-import { createEventActions } from "../events/event_actions.js";
 import { isBaseLlm } from "../models/base_llm.js";
-import {
-  appendInstructions,
-  setOutputSchema
-} from "../models/llm_request.js";
 import { LLMRegistry } from "../models/registry.js";
-import { State } from "../sessions/state.js";
-import { BaseTool } from "../tools/base_tool.js";
-import { FunctionTool } from "../tools/function_tool.js";
-import { ToolConfirmation } from "../tools/tool_confirmation.js";
-import { ToolContext } from "../tools/tool_context.js";
-import { base64Decode } from "../utils/env_aware_utils.js";
+import { isBaseTool } from "../tools/base_tool.js";
 import { logger } from "../utils/logger.js";
+import { Context } from "./context.js";
 import {
   runAsyncGeneratorWithOtelContext,
   traceCallLlm,
   tracer
 } from "../telemetry/tracing.js";
+import { isZodObject, zodObjectToSchema } from "../utils/simple_zod_to_json.js";
 import { BaseAgent } from "./base_agent.js";
-import {
-  BaseLlmRequestProcessor
-} from "./base_llm_processor.js";
-import { CallbackContext } from "./callback_context.js";
-import {
-  getContents,
-  getCurrentTurnContents
-} from "./content_processor_utils.js";
 import {
   generateAuthEvent,
   generateRequestConfirmationEvent,
   getLongRunningFunctionCalls,
-  handleFunctionCallList,
   handleFunctionCallsAsync,
-  populateClientFunctionCallId,
-  REQUEST_CONFIRMATION_FUNCTION_CALL_NAME
+  populateClientFunctionCallId
 } from "./functions.js";
-import { injectSessionState } from "./instructions.js";
+import { AGENT_TRANSFER_LLM_REQUEST_PROCESSOR } from "./processors/agent_transfer_llm_request_processor.js";
+import { BASIC_LLM_REQUEST_PROCESSOR } from "./processors/basic_llm_request_processor.js";
+import { CODE_EXECUTION_REQUEST_PROCESSOR } from "./processors/code_execution_request_processor.js";
+import { CONTENT_REQUEST_PROCESSOR } from "./processors/content_request_processor.js";
+import { IDENTITY_LLM_REQUEST_PROCESSOR } from "./processors/identity_llm_request_processor.js";
+import { INSTRUCTIONS_LLM_REQUEST_PROCESSOR } from "./processors/instructions_llm_request_processor.js";
+import { REQUEST_CONFIRMATION_LLM_REQUEST_PROCESSOR } from "./processors/request_confirmation_llm_request_processor.js";
 import { ReadonlyContext } from "./readonly_context.js";
 import { StreamingMode } from "./run_config.js";
 const ADK_AGENT_NAME_LABEL_KEY = "adk_agent_name";
 async function convertToolUnionToTools(toolUnion, context2) {
-  if (toolUnion instanceof BaseTool) {
+  if (isBaseTool(toolUnion)) {
     return [toolUnion];
   }
   return await toolUnion.getTools(context2);
 }
-class BasicLlmRequestProcessor extends BaseLlmRequestProcessor {
-  // eslint-disable-next-line require-yield
-  runAsync(invocationContext, llmRequest) {
-    return __asyncGenerator(this, null, function* () {
-      var _a2;
-      const agent = invocationContext.agent;
-      if (!isLlmAgent(agent)) {
-        return;
-      }
-      llmRequest.model = agent.canonicalModel.model;
-      llmRequest.config = __spreadValues({}, (_a2 = agent.generateContentConfig) != null ? _a2 : {});
-      if (agent.outputSchema) {
-        setOutputSchema(llmRequest, agent.outputSchema);
-      }
-      if (invocationContext.runConfig) {
-        llmRequest.liveConnectConfig.responseModalities = invocationContext.runConfig.responseModalities;
-        llmRequest.liveConnectConfig.speechConfig = invocationContext.runConfig.speechConfig;
-        llmRequest.liveConnectConfig.outputAudioTranscription = invocationContext.runConfig.outputAudioTranscription;
-        llmRequest.liveConnectConfig.inputAudioTranscription = invocationContext.runConfig.inputAudioTranscription;
-        llmRequest.liveConnectConfig.realtimeInputConfig = invocationContext.runConfig.realtimeInputConfig;
-        llmRequest.liveConnectConfig.enableAffectiveDialog = invocationContext.runConfig.enableAffectiveDialog;
-        llmRequest.liveConnectConfig.proactivity = invocationContext.runConfig.proactivity;
-      }
-    });
-  }
-}
-const BASIC_LLM_REQUEST_PROCESSOR = new BasicLlmRequestProcessor();
-class IdentityLlmRequestProcessor extends BaseLlmRequestProcessor {
-  // eslint-disable-next-line require-yield
-  runAsync(invocationContext, llmRequest) {
-    return __asyncGenerator(this, null, function* () {
-      const agent = invocationContext.agent;
-      const si = ['You are an agent. Your internal name is "'.concat(agent.name, '".')];
-      if (agent.description) {
-        si.push('The description about you is "'.concat(agent.description, '"'));
-      }
-      appendInstructions(llmRequest, si);
-    });
-  }
-}
-const IDENTITY_LLM_REQUEST_PROCESSOR = new IdentityLlmRequestProcessor();
-class InstructionsLlmRequestProcessor extends BaseLlmRequestProcessor {
-  /**
-   * Handles instructions and global instructions for LLM flow.
-   */
-  // eslint-disable-next-line require-yield
-  runAsync(invocationContext, llmRequest) {
-    return __asyncGenerator(this, null, function* () {
-      const agent = invocationContext.agent;
-      if (!(agent instanceof LlmAgent) || !(agent.rootAgent instanceof LlmAgent)) {
-        return;
-      }
-      const rootAgent = agent.rootAgent;
-      if (isLlmAgent(rootAgent) && rootAgent.globalInstruction) {
-        const { instruction, requireStateInjection } = yield new __await(rootAgent.canonicalGlobalInstruction(
-          new ReadonlyContext(invocationContext)
-        ));
-        let instructionWithState = instruction;
-        if (requireStateInjection) {
-          instructionWithState = yield new __await(injectSessionState(
-            instruction,
-            new ReadonlyContext(invocationContext)
-          ));
-        }
-        appendInstructions(llmRequest, [instructionWithState]);
-      }
-      if (agent.instruction) {
-        const { instruction, requireStateInjection } = yield new __await(agent.canonicalInstruction(
-          new ReadonlyContext(invocationContext)
-        ));
-        let instructionWithState = instruction;
-        if (requireStateInjection) {
-          instructionWithState = yield new __await(injectSessionState(
-            instruction,
-            new ReadonlyContext(invocationContext)
-          ));
-        }
-        appendInstructions(llmRequest, [instructionWithState]);
-      }
-    });
-  }
-}
-const INSTRUCTIONS_LLM_REQUEST_PROCESSOR = new InstructionsLlmRequestProcessor();
-class ContentRequestProcessor {
-  // eslint-disable-next-line require-yield
-  runAsync(invocationContext, llmRequest) {
-    return __asyncGenerator(this, null, function* () {
-      const agent = invocationContext.agent;
-      if (!agent || !isLlmAgent(agent)) {
-        return;
-      }
-      if (agent.includeContents === "default") {
-        llmRequest.contents = getContents(
-          invocationContext.session.events,
-          agent.name,
-          invocationContext.branch
-        );
-      } else {
-        llmRequest.contents = getCurrentTurnContents(
-          invocationContext.session.events,
-          agent.name,
-          invocationContext.branch
-        );
-      }
-      return;
-    });
-  }
-}
-const CONTENT_REQUEST_PROCESSOR = new ContentRequestProcessor();
-class AgentTransferLlmRequestProcessor extends BaseLlmRequestProcessor {
-  constructor() {
-    super(...arguments);
-    this.toolName = "transfer_to_agent";
-    this.tool = new FunctionTool({
-      name: this.toolName,
-      description: "Transfer the question to another agent. This tool hands off control to another agent when it is more suitable to answer the user question according to the agent description.",
-      parameters: z.object({
-        agentName: z.string().describe("the agent name to transfer to.")
-      }),
-      execute: function(args, toolContext) {
-        if (!toolContext) {
-          throw new Error("toolContext is required.");
-        }
-        toolContext.actions.transferToAgent = args.agentName;
-        return "Transfer queued";
-      }
-    });
-  }
-  // eslint-disable-next-line require-yield
-  runAsync(invocationContext, llmRequest) {
-    return __asyncGenerator(this, null, function* () {
-      if (!(invocationContext.agent instanceof LlmAgent)) {
-        return;
-      }
-      const transferTargets = this.getTransferTargets(invocationContext.agent);
-      if (!transferTargets.length) {
-        return;
-      }
-      appendInstructions(llmRequest, [
-        this.buildTargetAgentsInstructions(
-          invocationContext.agent,
-          transferTargets
-        )
-      ]);
-      const toolContext = new ToolContext({ invocationContext });
-      yield new __await(this.tool.processLlmRequest({ toolContext, llmRequest }));
-    });
-  }
-  buildTargetAgentsInfo(targetAgent) {
-    return "\nAgent name: ".concat(targetAgent.name, "\nAgent description: ").concat(targetAgent.description, "\n");
-  }
-  buildTargetAgentsInstructions(agent, targetAgents) {
-    let instructions = "\nYou have a list of other agents to transfer to:\n\n".concat(targetAgents.map(this.buildTargetAgentsInfo).join("\n"), "\n\nIf you are the best to answer the question according to your description, you\ncan answer it.\n\nIf another agent is better for answering the question according to its\ndescription, call `").concat(this.toolName, "` function to transfer the\nquestion to that agent. When transferring, do not generate any text other than\nthe function call.\n");
-    if (agent.parentAgent && !agent.disallowTransferToParent) {
-      instructions += "\nYour parent agent is ".concat(agent.parentAgent.name, ". If neither the other agents nor\nyou are best for answering the question according to the descriptions, transfer\nto your parent agent.\n");
-    }
-    return instructions;
-  }
-  getTransferTargets(agent) {
-    const targets = [];
-    targets.push(...agent.subAgents);
-    if (!agent.parentAgent || !isLlmAgent(agent.parentAgent)) {
-      return targets;
-    }
-    if (!agent.disallowTransferToParent) {
-      targets.push(agent.parentAgent);
-    }
-    if (!agent.disallowTransferToPeers) {
-      targets.push(
-        ...agent.parentAgent.subAgents.filter(
-          (peerAgent) => peerAgent.name !== agent.name
-        )
-      );
-    }
-    return targets;
-  }
-}
-const AGENT_TRANSFER_LLM_REQUEST_PROCESSOR = new AgentTransferLlmRequestProcessor();
-class RequestConfirmationLlmRequestProcessor extends BaseLlmRequestProcessor {
-  /** Handles tool confirmation information to build the LLM request. */
-  runAsync(invocationContext) {
-    return __asyncGenerator(this, null, function* () {
-      const agent = invocationContext.agent;
-      if (!isLlmAgent(agent)) {
-        return;
-      }
-      const events = invocationContext.session.events;
-      if (!events || events.length === 0) {
-        return;
-      }
-      const requestConfirmationFunctionResponses = {};
-      let confirmationEventIndex = -1;
-      for (let i = events.length - 1; i >= 0; i--) {
-        const event = events[i];
-        if (event.author !== "user") {
-          continue;
-        }
-        const responses = getFunctionResponses(event);
-        if (!responses) {
-          continue;
-        }
-        let foundConfirmation = false;
-        for (const functionResponse of responses) {
-          if (functionResponse.name !== REQUEST_CONFIRMATION_FUNCTION_CALL_NAME) {
-            continue;
-          }
-          foundConfirmation = true;
-          let toolConfirmation = null;
-          if (functionResponse.response && Object.keys(functionResponse.response).length === 1 && "response" in functionResponse.response) {
-            toolConfirmation = JSON.parse(
-              functionResponse.response["response"]
-            );
-          } else if (functionResponse.response) {
-            toolConfirmation = new ToolConfirmation({
-              hint: functionResponse.response["hint"],
-              payload: functionResponse.response["payload"],
-              confirmed: functionResponse.response["confirmed"]
-            });
-          }
-          if (functionResponse.id && toolConfirmation) {
-            requestConfirmationFunctionResponses[functionResponse.id] = toolConfirmation;
-          }
-        }
-        if (foundConfirmation) {
-          confirmationEventIndex = i;
-          break;
-        }
-      }
-      if (Object.keys(requestConfirmationFunctionResponses).length === 0) {
-        return;
-      }
-      for (let i = confirmationEventIndex - 1; i >= 0; i--) {
-        const event = events[i];
-        const functionCalls = getFunctionCalls(event);
-        if (!functionCalls) {
-          continue;
-        }
-        const toolsToResumeWithConfirmation = {};
-        const toolsToResumeWithArgs = {};
-        for (const functionCall of functionCalls) {
-          if (!functionCall.id || !(functionCall.id in requestConfirmationFunctionResponses)) {
-            continue;
-          }
-          const args = functionCall.args;
-          if (!args || !("originalFunctionCall" in args)) {
-            continue;
-          }
-          const originalFunctionCall = args["originalFunctionCall"];
-          if (originalFunctionCall.id) {
-            toolsToResumeWithConfirmation[originalFunctionCall.id] = requestConfirmationFunctionResponses[functionCall.id];
-            toolsToResumeWithArgs[originalFunctionCall.id] = originalFunctionCall;
-          }
-        }
-        if (Object.keys(toolsToResumeWithConfirmation).length === 0) {
-          continue;
-        }
-        for (let j = events.length - 1; j > confirmationEventIndex; j--) {
-          const eventToCheck = events[j];
-          const functionResponses = getFunctionResponses(eventToCheck);
-          if (!functionResponses) {
-            continue;
-          }
-          for (const fr of functionResponses) {
-            if (fr.id && fr.id in toolsToResumeWithConfirmation) {
-              delete toolsToResumeWithConfirmation[fr.id];
-              delete toolsToResumeWithArgs[fr.id];
-            }
-          }
-          if (Object.keys(toolsToResumeWithConfirmation).length === 0) {
-            break;
-          }
-        }
-        if (Object.keys(toolsToResumeWithConfirmation).length === 0) {
-          continue;
-        }
-        const toolsList = yield new __await(agent.canonicalTools(
-          new ReadonlyContext(invocationContext)
-        ));
-        const toolsDict = Object.fromEntries(
-          toolsList.map((tool) => [tool.name, tool])
-        );
-        const functionResponseEvent = yield new __await(handleFunctionCallList({
-          invocationContext,
-          functionCalls: Object.values(toolsToResumeWithArgs),
-          toolsDict,
-          beforeToolCallbacks: agent.canonicalBeforeToolCallbacks,
-          afterToolCallbacks: agent.canonicalAfterToolCallbacks,
-          filters: new Set(Object.keys(toolsToResumeWithConfirmation)),
-          toolConfirmationDict: toolsToResumeWithConfirmation
-        }));
-        if (functionResponseEvent) {
-          yield functionResponseEvent;
-        }
-        return;
-      }
-    });
-  }
-}
-const REQUEST_CONFIRMATION_LLM_REQUEST_PROCESSOR = new RequestConfirmationLlmRequestProcessor();
-class CodeExecutionRequestProcessor extends BaseLlmRequestProcessor {
-  runAsync(invocationContext, llmRequest) {
-    return __asyncGenerator(this, null, function* () {
-      if (!(invocationContext.agent instanceof LlmAgent)) {
-        return;
-      }
-      if (!invocationContext.agent.codeExecutor) {
-        return;
-      }
-      try {
-        for (var iter = __forAwait(runPreProcessor(invocationContext, llmRequest)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
-          const event = temp.value;
-          yield event;
-        }
-      } catch (temp) {
-        error = [temp];
-      } finally {
-        try {
-          more && (temp = iter.return) && (yield new __await(temp.call(iter)));
-        } finally {
-          if (error)
-            throw error[0];
-        }
-      }
-      if (!isBaseCodeExecutor(invocationContext.agent.codeExecutor)) {
-        return;
-      }
-      for (const content of llmRequest.contents) {
-        const delimeters = invocationContext.agent.codeExecutor.codeBlockDelimiters.length ? invocationContext.agent.codeExecutor.codeBlockDelimiters[0] : ["", ""];
-        convertCodeExecutionParts(
-          content,
-          delimeters,
-          invocationContext.agent.codeExecutor.executionResultDelimiters
-        );
-      }
-    });
-  }
-}
-const DATA_FILE_UTIL_MAP = {
-  "text/csv": {
-    extension: ".csv",
-    loaderCodeTemplate: "pd.read_csv('{filename}')"
-  }
-};
-const DATA_FILE_HELPER_LIB = "\nimport pandas as pd\n\ndef explore_df(df: pd.DataFrame) -> None:\n  \"\"\"Prints some information about a pandas DataFrame.\"\"\"\n\n  with pd.option_context(\n      'display.max_columns', None, 'display.expand_frame_repr', False\n  ):\n    # Print the column names to never encounter KeyError when selecting one.\n    df_dtypes = df.dtypes\n\n    # Obtain information about data types and missing values.\n    df_nulls = (len(df) - df.isnull().sum()).apply(\n        lambda x: f'{x} / {df.shape[0]} non-null'\n    )\n\n    # Explore unique total values in columns using `.unique()`.\n    df_unique_count = df.apply(lambda x: len(x.unique()))\n\n    # Explore unique values in columns using `.unique()`.\n    df_unique = df.apply(lambda x: crop(str(list(x.unique()))))\n\n    df_info = pd.concat(\n        (\n            df_dtypes.rename('Dtype'),\n            df_nulls.rename('Non-Null Count'),\n            df_unique_count.rename('Unique Values Count'),\n            df_unique.rename('Unique Values'),\n        ),\n        axis=1,\n    )\n    df_info.index.name = 'Columns'\n    print(f\"\"\"Total rows: {df.shape[0]}\nTotal columns: {df.shape[1]}\n\n{df_info}\"\"\")\n";
-class CodeExecutionResponseProcessor {
-  /**
-   * Processes the LLM response asynchronously.
-   *
-   * @param invocationContext The invocation context
-   * @param llmResponse The LLM response to process
-   * @returns An async generator yielding events
-   */
-  runAsync(invocationContext, llmResponse) {
-    return __asyncGenerator(this, null, function* () {
-      if (llmResponse.partial) {
-        return;
-      }
-      try {
-        for (var iter = __forAwait(runPostProcessor(
-          invocationContext,
-          llmResponse
-        )), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
-          const event = temp.value;
-          yield event;
-        }
-      } catch (temp) {
-        error = [temp];
-      } finally {
-        try {
-          more && (temp = iter.return) && (yield new __await(temp.call(iter)));
-        } finally {
-          if (error)
-            throw error[0];
-        }
-      }
-    });
-  }
-}
-const responseProcessor = new CodeExecutionResponseProcessor();
-function runPreProcessor(invocationContext, llmRequest) {
-  return __asyncGenerator(this, null, function* () {
-    const agent = invocationContext.agent;
-    if (!isLlmAgent(agent)) {
-      return;
-    }
-    const codeExecutor = agent.codeExecutor;
-    if (!codeExecutor || !isBaseCodeExecutor(codeExecutor)) {
-      return;
-    }
-    if (isBuiltInCodeExecutor(codeExecutor)) {
-      codeExecutor.processLlmRequest(llmRequest);
-      return;
-    }
-    if (!codeExecutor.optimizeDataFile) {
-      return;
-    }
-    const codeExecutorContext = new CodeExecutorContext(
-      new State(invocationContext.session.state)
-    );
-    if (codeExecutorContext.getErrorCount(invocationContext.invocationId) >= codeExecutor.errorRetryAttempts) {
-      return;
-    }
-    const allInputFiles = extractAndReplaceInlineFiles(
-      codeExecutorContext,
-      llmRequest
-    );
-    const processedFileNames = new Set(
-      codeExecutorContext.getProcessedFileNames()
-    );
-    const filesToProcess = allInputFiles.filter(
-      (f) => !processedFileNames.has(f.name)
-    );
-    for (const file of filesToProcess) {
-      const codeStr = getDataFilePreprocessingCode(file);
-      if (!codeStr) {
-        return;
-      }
-      const codeContent = {
-        role: "model",
-        parts: [
-          { text: "Processing input file: `".concat(file.name, "`") },
-          buildExecutableCodePart(codeStr)
-        ]
-      };
-      llmRequest.contents.push(cloneDeep(codeContent));
-      yield createEvent({
-        invocationId: invocationContext.invocationId,
-        author: agent.name,
-        branch: invocationContext.branch,
-        content: codeContent
-      });
-      const executionId = getOrSetExecutionId(
-        invocationContext,
-        codeExecutorContext
-      );
-      const codeExecutionResult = yield new __await(codeExecutor.executeCode({
-        invocationContext,
-        codeExecutionInput: {
-          code: codeStr,
-          inputFiles: [file],
-          executionId
-        }
-      }));
-      codeExecutorContext.updateCodeExecutionResult({
-        invocationId: invocationContext.invocationId,
-        code: codeStr,
-        resultStdout: codeExecutionResult.stdout,
-        resultStderr: codeExecutionResult.stderr
-      });
-      codeExecutorContext.addProcessedFileNames([file.name]);
-      const executionResultEvent = yield new __await(postProcessCodeExecutionResult(
-        invocationContext,
-        codeExecutorContext,
-        codeExecutionResult
-      ));
-      yield executionResultEvent;
-      llmRequest.contents.push(cloneDeep(executionResultEvent.content));
-    }
-  });
-}
-function runPostProcessor(invocationContext, llmResponse) {
-  return __asyncGenerator(this, null, function* () {
-    const agent = invocationContext.agent;
-    if (!isLlmAgent(agent)) {
-      return;
-    }
-    const codeExecutor = agent.codeExecutor;
-    if (!codeExecutor || !isBaseCodeExecutor(codeExecutor)) {
-      return;
-    }
-    if (!llmResponse || !llmResponse.content) {
-      return;
-    }
-    if (isBuiltInCodeExecutor(codeExecutor)) {
-      return;
-    }
-    const codeExecutorContext = new CodeExecutorContext(
-      new State(invocationContext.session.state)
-    );
-    if (codeExecutorContext.getErrorCount(invocationContext.invocationId) >= codeExecutor.errorRetryAttempts) {
-      return;
-    }
-    const responseContent = llmResponse.content;
-    const codeStr = extractCodeAndTruncateContent(
-      responseContent,
-      codeExecutor.codeBlockDelimiters
-    );
-    if (!codeStr) {
-      return;
-    }
-    yield createEvent({
-      invocationId: invocationContext.invocationId,
-      author: agent.name,
-      branch: invocationContext.branch,
-      content: responseContent
-    });
-    const executionId = getOrSetExecutionId(
-      invocationContext,
-      codeExecutorContext
-    );
-    const codeExecutionResult = yield new __await(codeExecutor.executeCode({
-      invocationContext,
-      codeExecutionInput: {
-        code: codeStr,
-        inputFiles: codeExecutorContext.getInputFiles(),
-        executionId
-      }
-    }));
-    codeExecutorContext.updateCodeExecutionResult({
-      invocationId: invocationContext.invocationId,
-      code: codeStr,
-      resultStdout: codeExecutionResult.stdout,
-      resultStderr: codeExecutionResult.stderr
-    });
-    yield yield new __await(postProcessCodeExecutionResult(
-      invocationContext,
-      codeExecutorContext,
-      codeExecutionResult
-    ));
-    llmResponse.content = void 0;
-  });
-}
-function extractAndReplaceInlineFiles(codeExecutorContext, llmRequest) {
-  var _a2;
-  const allInputFiles = codeExecutorContext.getInputFiles();
-  const savedFileNames = new Set(allInputFiles.map((f) => f.name));
-  for (let i = 0; i < llmRequest.contents.length; i++) {
-    const content = llmRequest.contents[i];
-    if (content.role !== "user" || !content.parts) {
-      continue;
-    }
-    for (let j = 0; j < content.parts.length; j++) {
-      const part = content.parts[j];
-      const mimeType = (_a2 = part.inlineData) == null ? void 0 : _a2.mimeType;
-      if (!mimeType || !part.inlineData || !DATA_FILE_UTIL_MAP[mimeType]) {
-        continue;
-      }
-      const fileName = "data_".concat(i + 1, "_").concat(j + 1).concat(DATA_FILE_UTIL_MAP[mimeType].extension);
-      part.text = "\nAvailable file: `".concat(fileName, "`\n");
-      const file = {
-        name: fileName,
-        content: base64Decode(part.inlineData.data),
-        mimeType
-      };
-      if (!savedFileNames.has(fileName)) {
-        codeExecutorContext.addInputFiles([file]);
-        allInputFiles.push(file);
-      }
-    }
-  }
-  return allInputFiles;
-}
-function getOrSetExecutionId(invocationContext, codeExecutorContext) {
-  var _a2;
-  const agent = invocationContext.agent;
-  if (!isLlmAgent(agent) || !((_a2 = agent.codeExecutor) == null ? void 0 : _a2.stateful)) {
-    return void 0;
-  }
-  let executionId = codeExecutorContext.getExecutionId();
-  if (!executionId) {
-    executionId = invocationContext.session.id;
-    codeExecutorContext.setExecutionId(executionId);
-  }
-  return executionId;
-}
-async function postProcessCodeExecutionResult(invocationContext, codeExecutorContext, codeExecutionResult) {
-  if (!invocationContext.artifactService) {
-    throw new Error("Artifact service is not initialized.");
-  }
-  const resultContent = {
-    role: "model",
-    parts: [buildCodeExecutionResultPart(codeExecutionResult)]
-  };
-  const eventActions = createEventActions({
-    stateDelta: codeExecutorContext.getStateDelta()
-  });
-  if (codeExecutionResult.stderr) {
-    codeExecutorContext.incrementErrorCount(invocationContext.invocationId);
-  } else {
-    codeExecutorContext.resetErrorCount(invocationContext.invocationId);
-  }
-  for (const outputFile of codeExecutionResult.outputFiles) {
-    const version = await invocationContext.artifactService.saveArtifact({
-      appName: invocationContext.appName || "",
-      userId: invocationContext.userId || "",
-      sessionId: invocationContext.session.id,
-      filename: outputFile.name,
-      artifact: {
-        inlineData: { data: outputFile.content, mimeType: outputFile.mimeType }
-      }
-    });
-    eventActions.artifactDelta[outputFile.name] = version;
-  }
-  return createEvent({
-    invocationId: invocationContext.invocationId,
-    author: invocationContext.agent.name,
-    branch: invocationContext.branch,
-    content: resultContent,
-    actions: eventActions
-  });
-}
-function getDataFilePreprocessingCode(file) {
-  function getNormalizedFileName(fileName) {
-    const [varName2] = fileName.split(".");
-    let normalizedName = varName2.replace(/[^a-zA-Z0-9_]/g, "_");
-    if (/^\d/.test(normalizedName)) {
-      normalizedName = "_" + normalizedName;
-    }
-    return normalizedName;
-  }
-  if (!DATA_FILE_UTIL_MAP[file.mimeType]) {
-    return void 0;
-  }
-  const varName = getNormalizedFileName(file.name);
-  const loaderCode = DATA_FILE_UTIL_MAP[file.mimeType].loaderCodeTemplate.replace("{filename}", file.name);
-  return "\n".concat(DATA_FILE_HELPER_LIB, "\n\n# Load the dataframe.\n").concat(varName, " = ").concat(loaderCode, "\n\n# Use `explore_df` to guide my analysis.\nexplore_df(").concat(varName, ")\n");
-}
-const CODE_EXECUTION_REQUEST_PROCESSOR = new CodeExecutionRequestProcessor();
 const LLM_AGENT_SIGNATURE_SYMBOL = Symbol.for("google.adk.llmAgent");
 function isLlmAgent(obj) {
   return typeof obj === "object" && obj !== null && LLM_AGENT_SIGNATURE_SYMBOL in obj && obj[LLM_AGENT_SIGNATURE_SYMBOL] === true;
@@ -772,8 +128,8 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
     this.disallowTransferToParent = (_d = config.disallowTransferToParent) != null ? _d : false;
     this.disallowTransferToPeers = (_e = config.disallowTransferToPeers) != null ? _e : false;
     this.includeContents = (_f = config.includeContents) != null ? _f : "default";
-    this.inputSchema = config.inputSchema;
-    this.outputSchema = config.outputSchema;
+    this.inputSchema = isZodObject(config.inputSchema) ? zodObjectToSchema(config.inputSchema) : config.inputSchema;
+    this.outputSchema = isZodObject(config.outputSchema) ? zodObjectToSchema(config.outputSchema) : config.outputSchema;
     this.outputKey = config.outputKey;
     this.beforeModelCallback = config.beforeModelCallback;
     this.afterModelCallback = config.afterModelCallback;
@@ -818,16 +174,6 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
         this.disallowTransferToParent = true;
         this.disallowTransferToPeers = true;
       }
-      if (this.subAgents && this.subAgents.length > 0) {
-        throw new Error(
-          "Invalid config for agent ".concat(this.name, ": if outputSchema is set, subAgents must be empty to disable agent transfer.")
-        );
-      }
-      if (this.tools && this.tools.length > 0) {
-        throw new Error(
-          "Invalid config for agent ".concat(this.name, ": if outputSchema is set, tools must be empty")
-        );
-      }
     }
   }
   /**
@@ -1091,7 +437,7 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
         }
       }
       for (const toolUnion of this.tools) {
-        const toolContext = new ToolContext({ invocationContext });
+        const toolContext = new Context({ invocationContext });
         const tools = yield new __await(convertToolUnionToTools(
           toolUnion,
           new ReadonlyContext(invocationContext)
@@ -1115,46 +461,56 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
         this,
         function() {
           return __asyncGenerator(this, null, function* () {
-            try {
-              for (var iter3 = __forAwait(this.callLlmAsync(
-                invocationContext,
-                llmRequest,
-                modelResponseEvent
-              )), more3, temp3, error3; more3 = !(temp3 = yield new __await(iter3.next())).done; more3 = false) {
-                const llmResponse = temp3.value;
+            const responsesGenerator = function() {
+              return __asyncGenerator(this, null, function* () {
                 try {
-                  for (var iter2 = __forAwait(this.postprocess(
+                  for (var iter3 = __forAwait(this.callLlmAsync(
                     invocationContext,
                     llmRequest,
-                    llmResponse,
                     modelResponseEvent
-                  )), more2, temp2, error2; more2 = !(temp2 = yield new __await(iter2.next())).done; more2 = false) {
-                    const event = temp2.value;
-                    modelResponseEvent.id = createNewEventId();
-                    modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
-                    yield event;
+                  )), more3, temp3, error3; more3 = !(temp3 = yield new __await(iter3.next())).done; more3 = false) {
+                    const llmResponse = temp3.value;
+                    try {
+                      for (var iter2 = __forAwait(this.postprocess(
+                        invocationContext,
+                        llmRequest,
+                        llmResponse,
+                        modelResponseEvent
+                      )), more2, temp2, error2; more2 = !(temp2 = yield new __await(iter2.next())).done; more2 = false) {
+                        const event = temp2.value;
+                        modelResponseEvent.id = createNewEventId();
+                        modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
+                        yield event;
+                      }
+                    } catch (temp2) {
+                      error2 = [temp2];
+                    } finally {
+                      try {
+                        more2 && (temp2 = iter2.return) && (yield new __await(temp2.call(iter2)));
+                      } finally {
+                        if (error2)
+                          throw error2[0];
+                      }
+                    }
                   }
-                } catch (temp2) {
-                  error2 = [temp2];
+                } catch (temp3) {
+                  error3 = [temp3];
                 } finally {
                   try {
-                    more2 && (temp2 = iter2.return) && (yield new __await(temp2.call(iter2)));
+                    more3 && (temp3 = iter3.return) && (yield new __await(temp3.call(iter3)));
                   } finally {
-                    if (error2)
-                      throw error2[0];
+                    if (error3)
+                      throw error3[0];
                   }
                 }
-              }
-            } catch (temp3) {
-              error3 = [temp3];
-            } finally {
-              try {
-                more3 && (temp3 = iter3.return) && (yield new __await(temp3.call(iter3)));
-              } finally {
-                if (error3)
-                  throw error3[0];
-              }
-            }
+              });
+            };
+            yield* __yieldStar(this.runAndHandleError(
+              responsesGenerator.call(this),
+              invocationContext,
+              llmRequest,
+              modelResponseEvent
+            ));
           });
         }
       ));
@@ -1163,7 +519,7 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
   }
   postprocess(invocationContext, llmRequest, llmResponse, modelResponseEvent) {
     return __asyncGenerator(this, null, function* () {
-      var _a2;
+      var _a2, _b2;
       for (const processor of this.responseProcessors) {
         try {
           for (var iter = __forAwait(processor.runAsync(
@@ -1201,6 +557,10 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
       if (!((_a2 = getFunctionCalls(mergedEvent)) == null ? void 0 : _a2.length)) {
         return;
       }
+      if ((_b2 = invocationContext.runConfig) == null ? void 0 : _b2.pauseOnToolCalls) {
+        invocationContext.endInvocation = true;
+        return;
+      }
       const functionResponseEvent = yield new __await(handleFunctionCallsAsync({
         invocationContext,
         functionCallEvent: mergedEvent,
@@ -1225,6 +585,8 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
       });
       if (toolConfirmationEvent) {
         yield toolConfirmationEvent;
+        invocationContext.endInvocation = true;
+        return;
       }
       yield functionResponseEvent;
       const nextAgentName = functionResponseEvent.actions.transferToAgent;
@@ -1296,12 +658,7 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
           ((_e = invocationContext.runConfig) == null ? void 0 : _e.streamingMode) === StreamingMode.SSE
         );
         try {
-          for (var iter = __forAwait(this.runAndHandleError(
-            responsesGenerator,
-            invocationContext,
-            llmRequest,
-            modelResponseEvent
-          )), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
+          for (var iter = __forAwait(responsesGenerator), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
             const llmResponse = temp.value;
             traceCallLlm({
               invocationContext,
@@ -1330,7 +687,7 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
     });
   }
   async handleBeforeModelCallback(invocationContext, llmRequest, modelResponseEvent) {
-    const callbackContext = new CallbackContext({
+    const callbackContext = new Context({
       invocationContext,
       eventActions: modelResponseEvent.actions
     });
@@ -1353,7 +710,7 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
     return void 0;
   }
   async handleAfterModelCallback(invocationContext, llmResponse, modelResponseEvent) {
-    const callbackContext = new CallbackContext({
+    const callbackContext = new Context({
       invocationContext,
       eventActions: modelResponseEvent.actions
     });
@@ -1394,7 +751,7 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
           }
         }
       } catch (modelError) {
-        const callbackContext = new CallbackContext({
+        const callbackContext = new Context({
           invocationContext,
           eventActions: modelResponseEvent.actions
         });
@@ -1407,11 +764,29 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
           if (onModelErrorCallbackResponse) {
             yield onModelErrorCallbackResponse;
           } else {
-            const errorResponse = JSON.parse(modelError.message);
-            yield {
-              errorCode: String(errorResponse.error.code),
-              errorMessage: errorResponse.error.message
-            };
+            let errorCode = "UNKNOWN_ERROR";
+            let errorMessage = modelError.message;
+            try {
+              const errorResponse = JSON.parse(modelError.message);
+              if (errorResponse == null ? void 0 : errorResponse.error) {
+                errorCode = String(errorResponse.error.code || "UNKNOWN_ERROR");
+                errorMessage = errorResponse.error.message || errorMessage;
+              }
+            } catch (e) {
+            }
+            if (modelResponseEvent.actions) {
+              yield createEvent({
+                invocationId: invocationContext.invocationId,
+                author: this.name,
+                errorCode,
+                errorMessage
+              });
+            } else {
+              yield {
+                errorCode,
+                errorMessage
+              };
+            }
           }
         } else {
           logger.error("Unknown error during response generation", modelError);
@@ -1429,7 +804,5 @@ class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
 }
 export {
   LlmAgent,
-  REQUEST_CONFIRMATION_LLM_REQUEST_PROCESSOR,
-  isLlmAgent,
-  responseProcessor
+  isLlmAgent
 };