@google/adk 1.2.0 → 1.4.0

package/dist/cjs/agents/active_streaming_tool.js

@@ -27,6 +27,7 @@ __export(active_streaming_tool_exports, {
   ActiveStreamingTool: () => ActiveStreamingTool
 });
 module.exports = __toCommonJS(active_streaming_tool_exports);
+var import_task = require("../utils/task.js");
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -34,7 +35,11 @@ module.exports = __toCommonJS(active_streaming_tool_exports);
  */
 class ActiveStreamingTool {
   constructor(params = {}) {
-    this.task = params.task;
+    if (params.task instanceof Promise) {
+      this.task = new import_task.Task(() => params.task);
+    } else {
+      this.task = params.task;
+    }
     this.stream = params.stream;
   }
 }

package/dist/cjs/agents/base_agent.js

@@ -124,9 +124,27 @@ class BaseAgent {
         ctx,
         this,
         async function* () {
+          var _a2, _b;
+          const context2 = this.createInvocationContext(parentContext);
+          const beforeAgentCallbackEvent = await this.handleBeforeAgentCallback(context2);
+          if (beforeAgentCallbackEvent) {
+            yield beforeAgentCallbackEvent;
+          }
+          if (context2.endInvocation || ((_a2 = parentContext.abortSignal) == null ? void 0 : _a2.aborted)) {
+            return;
+          }
+          for await (const event of this.runLiveImpl(context2)) {
+            yield event;
+          }
+          if (context2.endInvocation || ((_b = parentContext.abortSignal) == null ? void 0 : _b.aborted)) {
+            return;
+          }
+          const afterAgentCallbackEvent = await this.handleAfterAgentCallback(context2);
+          if (afterAgentCallbackEvent) {
+            yield afterAgentCallbackEvent;
+          }
         }
       );
-      throw new Error("Live mode is not implemented yet.");
     } finally {
       span.end();
     }

package/dist/cjs/agents/context.js

@@ -83,9 +83,6 @@ class Context extends import_readonly_context.ReadonlyContext {
       throw new Error("Artifact service is not initialized.");
     }
     return this.invocationContext.artifactService.loadArtifact({
-      appName: this.invocationContext.appName,
-      userId: this.invocationContext.userId,
-      sessionId: this.invocationContext.session.id,
       filename,
       version
     });
@@ -102,9 +99,6 @@ class Context extends import_readonly_context.ReadonlyContext {
       throw new Error("Artifact service is not initialized.");
     }
     const version = await this.invocationContext.artifactService.saveArtifact({
-      appName: this.invocationContext.appName,
-      userId: this.invocationContext.userId,
-      sessionId: this.invocationContext.session.id,
       filename,
       artifact
     });
@@ -137,11 +131,7 @@ class Context extends import_readonly_context.ReadonlyContext {
     if (!this.invocationContext.artifactService) {
       throw new Error("Artifact service is not initialized.");
     }
-    return this.invocationContext.artifactService.listArtifactKeys({
-      appName: this.invocationContext.session.appName,
-      userId: this.invocationContext.session.userId,
-      sessionId: this.invocationContext.session.id
-    });
+    return this.invocationContext.artifactService.listArtifactKeys();
   }
   /**
    * Searches the memory of the current user.

package/dist/cjs/agents/functions.js

@@ -24,8 +24,11 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var functions_exports = {};
 __export(functions_exports, {
+  AF_FUNCTION_CALL_ID_PREFIX: () => AF_FUNCTION_CALL_ID_PREFIX,
   REQUEST_CONFIRMATION_FUNCTION_CALL_NAME: () => REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
   REQUEST_EUC_FUNCTION_CALL_NAME: () => REQUEST_EUC_FUNCTION_CALL_NAME,
+  findEventByFunctionCallId: () => findEventByFunctionCallId,
+  findMatchingFunctionCall: () => findMatchingFunctionCall,
   functionsExportedForTestingOnly: () => functionsExportedForTestingOnly,
   generateAuthEvent: () => generateAuthEvent,
   generateClientFunctionCallId: () => generateClientFunctionCallId,
@@ -34,8 +37,7 @@ __export(functions_exports, {
   handleFunctionCallList: () => handleFunctionCallList,
   handleFunctionCallsAsync: () => handleFunctionCallsAsync,
   mergeParallelFunctionResponseEvents: () => mergeParallelFunctionResponseEvents,
-  populateClientFunctionCallId: () => populateClientFunctionCallId,
-  removeClientFunctionCallId: () => removeClientFunctionCallId
+  populateClientFunctionCallId: () => populateClientFunctionCallId
 });
 module.exports = __toCommonJS(functions_exports);
 var import_genai = require("@google/genai");
@@ -73,18 +75,6 @@ function populateClientFunctionCallId(modelResponseEvent) {
     }
   }
 }
-function removeClientFunctionCallId(content) {
-  if (content && content.parts) {
-    for (const part of content.parts) {
-      if (part.functionCall && part.functionCall.id && part.functionCall.id.startsWith(AF_FUNCTION_CALL_ID_PREFIX)) {
-        part.functionCall.id = void 0;
-      }
-      if (part.functionResponse && part.functionResponse.id && part.functionResponse.id.startsWith(AF_FUNCTION_CALL_ID_PREFIX)) {
-        part.functionResponse.id = void 0;
-      }
-    }
-  }
-}
 function getLongRunningFunctionCalls(functionCalls, toolsDict) {
   const longRunningToolIds = /* @__PURE__ */ new Set();
   for (const functionCall of functionCalls) {
@@ -427,10 +417,40 @@ function mergeParallelFunctionResponseEvents(functionResponseEvents) {
     timestamp: baseEvent.timestamp
   });
 }
+function findEventByFunctionCallId(events, functionCallId, endIndex = events.length) {
+  for (let i = endIndex - 1; i >= 0; i--) {
+    const event = events[i];
+    const functionCalls = (0, import_event.getFunctionCalls)(event);
+    for (const functionCall of functionCalls) {
+      if (functionCall.id === functionCallId) {
+        return event;
+      }
+    }
+  }
+  return void 0;
+}
+function findMatchingFunctionCall(events) {
+  if (!events.length) {
+    return void 0;
+  }
+  const lastEvent = events[events.length - 1];
+  const functionResponses = (0, import_event.getFunctionResponses)(lastEvent);
+  if (!functionResponses.length || !functionResponses[0].id) {
+    return void 0;
+  }
+  return findEventByFunctionCallId(
+    events,
+    functionResponses[0].id,
+    events.length - 1
+  );
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  AF_FUNCTION_CALL_ID_PREFIX,
   REQUEST_CONFIRMATION_FUNCTION_CALL_NAME,
   REQUEST_EUC_FUNCTION_CALL_NAME,
+  findEventByFunctionCallId,
+  findMatchingFunctionCall,
   functionsExportedForTestingOnly,
   generateAuthEvent,
   generateClientFunctionCallId,
@@ -439,6 +459,5 @@ function mergeParallelFunctionResponseEvents(functionResponseEvents) {
   handleFunctionCallList,
   handleFunctionCallsAsync,
   mergeParallelFunctionResponseEvents,
-  populateClientFunctionCallId,
-  removeClientFunctionCallId
+  populateClientFunctionCallId
 });

package/dist/cjs/agents/instructions.js

@@ -33,50 +33,116 @@ var import_state = require("../sessions/state.js");
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-async function injectSessionState(template, readonlyContext) {
+const ARTIFACT_PREFIX = "artifact.";
+async function resolveKey(key, isOptional, rawMatch, readonlyContext) {
   const invocationContext = readonlyContext.invocationContext;
-  async function replaceMatchedKeyWithItsValue(match) {
-    let key = match[0].replace(/^\{+/, "").replace(/\}+$/, "").trim();
-    const isOptional = key.endsWith("?");
-    if (isOptional) {
-      key = key.slice(0, -1);
+  if (key.startsWith(ARTIFACT_PREFIX)) {
+    const fileName = key.substring(ARTIFACT_PREFIX.length);
+    if (invocationContext.artifactService === void 0) {
+      throw new Error("Artifact service is not initialized.");
     }
-    if (key.startsWith("artifact.")) {
-      const fileName = key.substring("artifact.".length);
-      if (invocationContext.artifactService === void 0) {
-        throw new Error("Artifact service is not initialized.");
+    const artifact = await invocationContext.artifactService.loadArtifact({
+      filename: fileName
+    });
+    if (!artifact) {
+      if (isOptional) {
+        return "";
       }
-      const artifact = await invocationContext.artifactService.loadArtifact({
-        appName: invocationContext.session.appName,
-        userId: invocationContext.session.userId,
-        sessionId: invocationContext.session.id,
-        filename: fileName
-      });
-      if (!artifact) {
-        throw new Error(`Artifact ${fileName} not found.`);
-      }
-      return String(artifact);
+      throw new Error(`Artifact ${fileName} not found.`);
     }
-    if (!isValidStateName(key)) {
-      return match[0];
+    return formatValue(artifact, true);
+  }
+  if (!isValidStateName(key)) {
+    return rawMatch;
+  }
+  if (key in invocationContext.session.state) {
+    return formatValue(invocationContext.session.state[key], false);
+  }
+  if (isOptional) {
+    return "";
+  }
+  throw new Error(`Context variable not found: \`${key}\`.`);
+}
+function formatValue(value, isArtifact = false) {
+  if (typeof value === "string") {
+    return value;
+  }
+  if (typeof value === "object" && value !== null) {
+    if (isArtifact && "text" in value && typeof value.text === "string") {
+      return value.text;
     }
-    if (key in invocationContext.session.state) {
-      return String(invocationContext.session.state[key]);
+    try {
+      const json = JSON.stringify(value);
+      if (json !== void 0) {
+        return json;
+      }
+    } catch (e) {
+      throw new Error(
+        `Failed to serialize value for instruction template: ${e instanceof Error ? e.message : String(e)}`
+      );
     }
+  }
+  return String(value);
+}
+async function injectSessionState(template, readonlyContext) {
+  const pattern = /\{+[^{}]*}+/g;
+  const matches = Array.from(template.matchAll(pattern));
+  if (matches.length === 0) {
+    return template;
+  }
+  const parsedMatches = matches.map((match) => {
+    const raw = match[0];
+    let key = raw.replace(/^\{+/, "").replace(/\}+$/, "").trim();
+    const isOptional = key.endsWith("?");
     if (isOptional) {
-      return "";
+      key = key.slice(0, -1);
+    }
+    const isValid = key.startsWith(ARTIFACT_PREFIX) || isValidStateName(key);
+    return {
+      raw,
+      key,
+      isOptional,
+      isValid,
+      index: match.index
+    };
+  });
+  const uniqueKeys = /* @__PURE__ */ new Map();
+  for (const pm of parsedMatches) {
+    if (!pm.isValid) {
+      continue;
+    }
+    const existing = uniqueKeys.get(pm.key);
+    if (existing) {
+      if (existing.isOptional && !pm.isOptional) {
+        existing.isOptional = false;
+      }
+    } else {
+      uniqueKeys.set(pm.key, {
+        key: pm.key,
+        isOptional: pm.isOptional,
+        raw: pm.raw
+      });
     }
-    throw new Error(`Context variable not found: \`${key}\`.`);
   }
-  const pattern = /\{+[^{}]*}+/g;
+  const resolutions = /* @__PURE__ */ new Map();
+  for (const info of uniqueKeys.values()) {
+    resolutions.set(
+      info.key,
+      resolveKey(info.key, info.isOptional, info.raw, readonlyContext)
+    );
+  }
+  await Promise.all(resolutions.values());
   const result = [];
   let lastEnd = 0;
-  const matches = template.matchAll(pattern);
-  for (const match of matches) {
-    result.push(template.slice(lastEnd, match.index));
-    const replacement = await replaceMatchedKeyWithItsValue(match);
-    result.push(replacement);
-    lastEnd = match.index + match[0].length;
+  for (const pm of parsedMatches) {
+    result.push(template.slice(lastEnd, pm.index));
+    if (pm.isValid) {
+      const replacement = await resolutions.get(pm.key);
+      result.push(replacement);
+    } else {
+      result.push(pm.raw);
+    }
+    lastEnd = pm.index + pm.raw.length;
   }
   result.push(template.slice(lastEnd));
   return result.join("");

package/dist/cjs/agents/invocation_context.js

@@ -58,11 +58,7 @@ class InvocationContext {
    * @param params The parameters for creating an invocation context.
    */
   constructor(params) {
-    /**
-     * A container to keep track of different kinds of costs incurred as a part of
-     * this invocation.
-     */
-    this.invocationCostManager = new InvocationCostManager();
+    var _a;
     this.artifactService = params.artifactService;
     this.sessionService = params.sessionService;
     this.memoryService = params.memoryService;
@@ -74,10 +70,10 @@ class InvocationContext {
     this.endInvocation = params.endInvocation || false;
     this.transcriptionCache = params.transcriptionCache;
     this.runConfig = params.runConfig;
-    this.liveRequestQueue = params.liveRequestQueue;
     this.activeStreamingTools = params.activeStreamingTools;
     this.pluginManager = params.pluginManager;
     this.abortSignal = params.abortSignal;
+    this.invocationCostManager = (_a = params.invocationCostManager) != null ? _a : new InvocationCostManager();
   }
   /**
    * The app name of the current session.

package/dist/cjs/agents/llm_agent.js

@@ -29,6 +29,7 @@ __export(llm_agent_exports, {
 });
 module.exports = __toCommonJS(llm_agent_exports);
 var import_api = require("@opentelemetry/api");
+var import_function_tool = require("../tools/function_tool.js");
 var import_event = require("../events/event.js");
 var import_base_llm = require("../models/base_llm.js");
 var import_registry = require("../models/registry.js");
@@ -39,6 +40,7 @@ var import_tracing = require("../telemetry/tracing.js");
 var import_simple_zod_to_json = require("../utils/simple_zod_to_json.js");
 var import_base_agent = require("./base_agent.js");
 var import_functions = require("./functions.js");
+var import_auth_preprocessor = require("../auth/auth_preprocessor.js");
 var import_agent_transfer_llm_request_processor = require("./processors/agent_transfer_llm_request_processor.js");
 var import_basic_llm_request_processor = require("./processors/basic_llm_request_processor.js");
 var import_code_execution_request_processor = require("./processors/code_execution_request_processor.js");
@@ -46,6 +48,7 @@ var import_content_request_processor = require("./processors/content_request_pro
 var import_context_compactor_request_processor = require("./processors/context_compactor_request_processor.js");
 var import_identity_llm_request_processor = require("./processors/identity_llm_request_processor.js");
 var import_instructions_llm_request_processor = require("./processors/instructions_llm_request_processor.js");
+var import_interactions_request_processor = require("./processors/interactions_request_processor.js");
 var import_request_confirmation_llm_request_processor = require("./processors/request_confirmation_llm_request_processor.js");
 var import_tool_filter_request_processor = require("./processors/tool_filter_request_processor.js");
 var import_readonly_context = require("./readonly_context.js");
@@ -91,10 +94,12 @@ class LlmAgent extends (_b = import_base_agent.BaseAgent, _a = LLM_AGENT_SIGNATU
     this.codeExecutor = config.codeExecutor;
     this.requestProcessors = (_g = config.requestProcessors) != null ? _g : [
       import_basic_llm_request_processor.BASIC_LLM_REQUEST_PROCESSOR,
+      import_auth_preprocessor.AUTH_PREPROCESSOR,
       import_identity_llm_request_processor.IDENTITY_LLM_REQUEST_PROCESSOR,
       import_instructions_llm_request_processor.INSTRUCTIONS_LLM_REQUEST_PROCESSOR,
       import_request_confirmation_llm_request_processor.REQUEST_CONFIRMATION_LLM_REQUEST_PROCESSOR,
       import_content_request_processor.CONTENT_REQUEST_PROCESSOR,
+      import_interactions_request_processor.INTERACTIONS_REQUEST_PROCESSOR,
       import_code_execution_request_processor.CODE_EXECUTION_REQUEST_PROCESSOR,
       import_tool_filter_request_processor.TOOL_FILTER_REQUEST_PROCESSOR
     ];
@@ -316,18 +321,26 @@ class LlmAgent extends (_b = import_base_agent.BaseAgent, _a = LLM_AGENT_SIGNATU
     event.actions.stateDelta[this.outputKey] = result;
   }
   async *runAsyncImpl(context2) {
-    var _a2;
+    var _a2, _b2;
     while (true) {
       let lastEvent = void 0;
+      let stepHadToolCalls = false;
       for await (const event of this.runOneStepAsync(context2)) {
         if ((_a2 = context2.abortSignal) == null ? void 0 : _a2.aborted) {
           return;
         }
         lastEvent = event;
+        if ((0, import_event.getFunctionCalls)(event).length > 0 || (0, import_event.getFunctionResponses)(event).length > 0) {
+          stepHadToolCalls = true;
+        }
         this.maybeSaveOutputToState(event);
         yield event;
       }
-      if (!lastEvent || (0, import_event.isFinalResponse)(lastEvent)) {
+      if (!lastEvent) {
+        break;
+      }
+      const isEmptyMetadataEvent = lastEvent.author === this.name && !lastEvent.partial && (!((_b2 = lastEvent.content) == null ? void 0 : _b2.parts) || lastEvent.content.parts.length === 0);
+      if ((0, import_event.isFinalResponse)(lastEvent) && !(isEmptyMetadataEvent && stepHadToolCalls)) {
         break;
       }
       if (lastEvent.partial) {
@@ -352,6 +365,20 @@ class LlmAgent extends (_b = import_base_agent.BaseAgent, _a = LLM_AGENT_SIGNATU
   // --------------------------------------------------------------------------
   // #START LlmFlow Logic
   // --------------------------------------------------------------------------
+  /**
+   * Runs the bidirectional (live) flow for this agent.
+   *
+   * Establishes a live connection to the model, drains the invocation's
+   * `liveRequestQueue` into the connection on a parallel task, and yields
+   * events derived from server messages until the queue closes, the model
+   * finishes, or an agent transfer occurs.
+   *
+   * If the live connection drops (network failure, server `goAway`) and a
+   * session resumption handle has been observed, the flow transparently
+   * reconnects using that handle up to {@link MAX_LIVE_RECONNECT_ATTEMPTS}
+   * times. Subsequent reconnects skip `sendHistory` because the server
+   * already holds the conversation state associated with the handle.
+   */
   // eslint-disable-next-line require-yield
   async *runLiveFlow(_invocationContext) {
     await Promise.resolve();
@@ -375,13 +402,28 @@ class LlmAgent extends (_b = import_base_agent.BaseAgent, _a = LLM_AGENT_SIGNATU
         yield event;
       }
     }
-    for (const toolUnion of this.tools) {
+    const allTools = [...this.tools];
+    if (this.outputSchema && allTools.length > 0) {
+      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.",
+        parameters: this.outputSchema,
+        execute: async (args, toolContext) => {
+          if (toolContext) {
+            toolContext.actions.skipSummarization = true;
+          }
+          return JSON.stringify(args);
+        }
+      });
+      allTools.push(setModelResponseTool);
+    }
+    for (const toolUnion of allTools) {
       const toolContext = new import_context.Context({ invocationContext });
       const tools = (await convertToolUnionToTools(
         toolUnion,
         new import_readonly_context.ReadonlyContext(invocationContext)
       )).filter((tool) => {
-        return !llmRequest.allowedTools || llmRequest.allowedTools.includes(tool.name);
+        return !llmRequest.allowedTools || llmRequest.allowedTools.includes(tool.name) || tool.name === "set_model_response";
       });
       for (const tool of tools) {
         await tool.processLlmRequest({ toolContext, llmRequest });
@@ -440,7 +482,7 @@ class LlmAgent extends (_b = import_base_agent.BaseAgent, _a = LLM_AGENT_SIGNATU
     span.end();
   }
   async *postprocess(invocationContext, llmRequest, llmResponse, modelResponseEvent) {
-    var _a2, _b2, _c, _d, _e;
+    var _a2, _b2, _c, _d, _e, _f;
     for (const processor of this.responseProcessors) {
       for await (const event of processor.runAsync(
         invocationContext,
@@ -452,7 +494,7 @@ class LlmAgent extends (_b = import_base_agent.BaseAgent, _a = LLM_AGENT_SIGNATU
         yield event;
       }
     }
-    if (!llmResponse.content && !llmResponse.errorCode && !llmResponse.interrupted) {
+    if ((!llmResponse.content || ((_b2 = llmResponse.content.parts) == null ? void 0 : _b2.length) === 0) && !llmResponse.errorCode && !llmResponse.interrupted) {
       return;
     }
     const mergedEvent = (0, import_event.createEvent)({
@@ -461,7 +503,14 @@ class LlmAgent extends (_b = import_base_agent.BaseAgent, _a = LLM_AGENT_SIGNATU
     });
     if (mergedEvent.content) {
       const functionCalls = (0, import_event.getFunctionCalls)(mergedEvent);
-      if (functionCalls == null ? void 0 : functionCalls.length) {
+      const setModelResponseCall = functionCalls.find(
+        (call) => call.name === "set_model_response"
+      );
+      if (setModelResponseCall) {
+        const args = setModelResponseCall.args;
+        mergedEvent.content.parts = [{ text: JSON.stringify(args) }];
+        mergedEvent.actions.skipSummarization = true;
+      } else if (functionCalls && functionCalls.length) {
         (0, import_functions.populateClientFunctionCallId)(mergedEvent);
         mergedEvent.longRunningToolIds = Array.from(
           (0, import_functions.getLongRunningFunctionCalls)(functionCalls, llmRequest.toolsDict)
@@ -469,10 +518,10 @@ class LlmAgent extends (_b = import_base_agent.BaseAgent, _a = LLM_AGENT_SIGNATU
       }
     }
     yield mergedEvent;
-    if (!((_b2 = (0, import_event.getFunctionCalls)(mergedEvent)) == null ? void 0 : _b2.length)) {
+    if (!((_c = (0, import_event.getFunctionCalls)(mergedEvent)) == null ? void 0 : _c.length)) {
       return;
     }
-    if ((_c = invocationContext.runConfig) == null ? void 0 : _c.pauseOnToolCalls) {
+    if ((_d = invocationContext.runConfig) == null ? void 0 : _d.pauseOnToolCalls) {
       invocationContext.endInvocation = true;
       return;
     }
@@ -483,7 +532,7 @@ class LlmAgent extends (_b = import_base_agent.BaseAgent, _a = LLM_AGENT_SIGNATU
       beforeToolCallbacks: this.canonicalBeforeToolCallbacks,
       afterToolCallbacks: this.canonicalAfterToolCallbacks
     });
-    if (!functionResponseEvent || ((_d = invocationContext.abortSignal) == null ? void 0 : _d.aborted)) {
+    if (!functionResponseEvent || ((_e = invocationContext.abortSignal) == null ? void 0 : _e.aborted)) {
       return;
     }
     const authEvent = (0, import_functions.generateAuthEvent)(
@@ -508,7 +557,7 @@ class LlmAgent extends (_b = import_base_agent.BaseAgent, _a = LLM_AGENT_SIGNATU
     if (nextAgentName) {
       const nextAgent = this.getAgentByName(invocationContext, nextAgentName);
       for await (const event of nextAgent.runAsync(invocationContext)) {
-        if ((_e = invocationContext.abortSignal) == null ? void 0 : _e.aborted) {
+        if ((_f = invocationContext.abortSignal) == null ? void 0 : _f.aborted) {
           return;
         }
         yield event;

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

@@ -58,6 +58,13 @@ class AgentTransferLlmRequestProcessor extends import_base_llm_processor.BaseLlm
       }
     });
   }
+  /**
+   * Appends transfer instructions and registers the `transfer_to_agent` tool
+   * when the agent has reachable transfer targets.
+   *
+   * @param invocationContext - The current invocation context.
+   * @param llmRequest - The request to augment with transfer instructions and the transfer tool.
+   */
   // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
     if (!(0, import_llm_agent.isLlmAgent)(invocationContext.agent)) {

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

@@ -37,6 +37,13 @@ var import_base_llm_processor = require("./base_llm_processor.js");
  * SPDX-License-Identifier: Apache-2.0
  */
 class BasicLlmRequestProcessor extends import_base_llm_processor.BaseLlmRequestProcessor {
+  /**
+   * Populates model name, generation config, output schema, and live connect
+   * settings on the request from the agent and run config.
+   *
+   * @param invocationContext - The current invocation context.
+   * @param llmRequest - The request object to populate in place.
+   */
   // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
     var _a;
@@ -46,7 +53,7 @@ class BasicLlmRequestProcessor extends import_base_llm_processor.BaseLlmRequestP
     }
     llmRequest.model = agent.canonicalModel.model;
     llmRequest.config = { ...(_a = agent.generateContentConfig) != null ? _a : {} };
-    if (agent.outputSchema) {
+    if (agent.outputSchema && (!agent.tools || agent.tools.length === 0)) {
       (0, import_llm_request.setOutputSchema)(llmRequest, agent.outputSchema);
     }
     if (invocationContext.runConfig) {

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

@@ -339,9 +339,6 @@ async function postProcessCodeExecutionResult(invocationContext, codeExecutorCon
   }
   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 }