@google/adk 2.0.0 → 2.1.0

package/dist/cjs/runner/runner.js

@@ -41,6 +41,7 @@ var import_invocation_context = require("../agents/invocation_context.js");
 var import_llm_agent = require("../agents/llm_agent.js");
 var import_run_config = require("../agents/run_config.js");
 var import_scoped_artifact_service = require("../artifacts/scoped_artifact_service.js");
+var import_session_artifact_service = require("../artifacts/session_artifact_service.js");
 var import_built_in_code_executor = require("../code_executors/built_in_code_executor.js");
 var import_event = require("../events/event.js");
 var import_event_actions = require("../events/event_actions.js");
@@ -49,6 +50,7 @@ var import_tracing = require("../telemetry/tracing.js");
 var import_base_toolset = require("../tools/base_toolset.js");
 var import_logger = require("../utils/logger.js");
 var import_model_name = require("../utils/model_name.js");
+var import_redact_inline_data = require("../utils/redact_inline_data.js");
 var import_run_node_as_invocation = require("../workflow/run_node_as_invocation.js");
 /**
  * @license
@@ -56,7 +58,7 @@ var import_run_node_as_invocation = require("../workflow/run_node_as_invocation.
  * SPDX-License-Identifier: Apache-2.0
  */
 var _a;
-const RUNNER_SIGNATURE_SYMBOL = Symbol.for("google.adk.runner");
+const RUNNER_SIGNATURE_SYMBOL = /* @__PURE__ */ Symbol.for("google.adk.runner");
 function isRunner(obj) {
   return typeof obj === "object" && obj !== null && RUNNER_SIGNATURE_SYMBOL in obj && obj[RUNNER_SIGNATURE_SYMBOL] === true;
 }
@@ -163,7 +165,9 @@ const _Runner = class _Runner {
                 `Session lookup failed: appName must be provided in runner constructor (or via app.name)`
               );
             }
-            throw new Error(`Session not found: ${sessionId}`);
+            throw new Error(
+              `Session not found: ${sessionId} (appName=${this.appName}, userId=${userId})`
+            );
           }
           if (runConfig.supportCfc && (0, import_llm_agent.isLlmAgent)(this.agent)) {
             const modelName = this.agent.canonicalModel.model;
@@ -177,7 +181,7 @@ const _Runner = class _Runner {
             }
           }
           const invocationContext = new import_invocation_context.InvocationContext({
-            artifactService: this.artifactService ? new import_scoped_artifact_service.ScopedArtifactService(
+            artifactService: this.artifactService ? (0, import_session_artifact_service.isSessionArtifactService)(this.artifactService) ? this.artifactService : new import_scoped_artifact_service.ScopedArtifactService(
               this.artifactService,
               this.appName,
               userId,
@@ -191,6 +195,7 @@ const _Runner = class _Runner {
             session,
             userContent: newMessage,
             runConfig,
+            a2aMetadata: runConfig.a2aMetadata,
             pluginManager: this.pluginManager,
             abortSignal: params.abortSignal
           });
@@ -210,9 +215,8 @@ const _Runner = class _Runner {
             }
             if (runConfig.saveInputBlobsAsArtifacts) {
               newMessage = await this.saveArtifacts(
+                invocationContext.artifactService,
                 invocationContext.invocationId,
-                session.userId,
-                session.id,
                 newMessage
               );
               if ((_d = params.abortSignal) == null ? void 0 : _d.aborted) {
@@ -325,21 +329,15 @@ const _Runner = class _Runner {
    * Saves artifacts from the message parts and replaces the inline data with
    * a file name placeholder and optional file reference.
    *
+   * @param artifactService The session-scoped artifact service to save to.
    * @param invocationId The current invocation ID.
-   * @param userId The user ID of the session.
-   * @param sessionId The session ID of the session.
    * @param message The message containing parts to process.
    */
-  async saveArtifacts(invocationId, userId, sessionId, message) {
+  async saveArtifacts(artifactService, invocationId, message) {
     var _a2;
-    if (!this.artifactService || !((_a2 = message.parts) == null ? void 0 : _a2.length)) {
+    if (!artifactService || !((_a2 = message.parts) == null ? void 0 : _a2.length)) {
       return message;
     }
-    const sessionKey = {
-      appName: this.appName,
-      userId,
-      sessionId
-    };
     const newParts = [];
     let modified = false;
     for (let i = 0; i < message.parts.length; i++) {
@@ -351,20 +349,16 @@ const _Runner = class _Runner {
       try {
         const inlineData = part.inlineData;
         const fileName = inlineData.displayName || `artifact_${invocationId}_${i}`;
-        const version = await this.artifactService.saveArtifact({
-          ...sessionKey,
+        const version = await artifactService.saveArtifact({
           filename: fileName,
           artifact: part
         });
         newParts.push((0, import_genai.createPartFromText)(`[Uploaded Artifact: "${fileName}"]`));
         try {
-          const artifactVersion = await this.artifactService.getArtifactVersion(
-            {
-              ...sessionKey,
-              filename: fileName,
-              version
-            }
-          );
+          const artifactVersion = await artifactService.getArtifactVersion({
+            filename: fileName,
+            version
+          });
           if ((artifactVersion == null ? void 0 : artifactVersion.canonicalUri) && /^(gs|https?):/i.test(artifactVersion.canonicalUri)) {
             newParts.push({
               fileData: {
@@ -414,7 +408,7 @@ const _Runner = class _Runner {
    * Whether the agent to run can transfer to any other agent in the agent tree.
    *
    * @param agentToRun The agent to check for transferability.
-   * @returns True if the agent can transfer, False otherwise.
+   * @returns True if the agent can transfer, false otherwise.
    */
   isRoutableLlmAgent(agentToRun) {
     return isRoutableLlmAgent(agentToRun);
@@ -477,7 +471,7 @@ const _Runner = class _Runner {
             return;
           }
           const invocationContext = new import_invocation_context.InvocationContext({
-            artifactService: this.artifactService ? new import_scoped_artifact_service.ScopedArtifactService(
+            artifactService: this.artifactService ? (0, import_session_artifact_service.isSessionArtifactService)(this.artifactService) ? this.artifactService : new import_scoped_artifact_service.ScopedArtifactService(
               this.artifactService,
               this.appName,
               params.userId,
@@ -490,6 +484,7 @@ const _Runner = class _Runner {
             agent,
             session,
             runConfig,
+            a2aMetadata: runConfig.a2aMetadata,
             pluginManager: this.pluginManager,
             liveRequestQueue: params.liveRequestQueue,
             abortSignal: params.abortSignal,
@@ -567,6 +562,14 @@ function determineAgentForResumption(session, rootAgent, resumabilityConfig) {
   const event = findEventByLastFunctionResponseId(session.events);
   const isResumable = Boolean(resumabilityConfig == null ? void 0 : resumabilityConfig.isResumable);
   if (event && event.author && isResumable) {
+    const conflictingAuthors = (0, import_functions.getConflictingFunctionResponseAuthors)(
+      session.events
+    );
+    if (conflictingAuthors) {
+      throw new Error(
+        `Function responses in the last event resolve to function calls from more than one agent (at least "${conflictingAuthors[0]}" and "${conflictingAuthors[1]}"); cannot determine a single agent to resume.`
+      );
+    }
     const resumedAgent = rootAgent.findAgent(event.author);
     if (resumedAgent) {
       return resumedAgent;
@@ -578,7 +581,7 @@ function determineAgentForResumption(session, rootAgent, resumabilityConfig) {
     }
   }
   for (let i = session.events.length - 1; i >= 0; i--) {
-    import_logger.logger.debug("event:", JSON.stringify(session.events[i]));
+    import_logger.logger.debug("event:", (0, import_redact_inline_data.stringifyWithRedactedInlineData)(session.events[i]));
     const event2 = session.events[i];
     if (event2.author === "user" || !event2.author) {
       continue;

package/dist/cjs/sessions/database_session_service.js

@@ -5,9 +5,11 @@
   */
 
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -22,6 +24,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var database_session_service_exports = {};
 __export(database_session_service_exports, {
@@ -29,11 +39,8 @@ __export(database_session_service_exports, {
   isDatabaseConnectionString: () => isDatabaseConnectionString
 });
 module.exports = __toCommonJS(database_session_service_exports);
-var import_core = require("@mikro-orm/core");
 var import_env_aware_utils = require("../utils/env_aware_utils.js");
 var import_base_session_service = require("./base_session_service.js");
-var import_operations = require("./db/operations.js");
-var import_schema = require("./db/schema.js");
 var import_session = require("./session.js");
 var import_state = require("./state.js");
 /**
@@ -41,6 +48,37 @@ var import_state = require("./state.js");
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+let MikroORM;
+let LockMode;
+let ENTITIES;
+let StorageAppState;
+let StorageEvent;
+let StorageSession;
+let StorageUserState;
+let ensureDatabaseCreated;
+let getConnectionOptionsFromUri;
+let validateDatabaseSchemaVersion;
+let mikroOrmLoad;
+function loadMikroOrm() {
+  mikroOrmLoad != null ? mikroOrmLoad : mikroOrmLoad = importMikroOrm();
+  return mikroOrmLoad;
+}
+__name(loadMikroOrm, "loadMikroOrm");
+async function importMikroOrm() {
+  const [core, schema, operations] = await Promise.all([
+    Promise.resolve().then(() => __toESM(require("@mikro-orm/core"), 1)),
+    Promise.resolve().then(() => __toESM(require("./db/schema.js"), 1)),
+    Promise.resolve().then(() => __toESM(require("./db/operations.js"), 1))
+  ]);
+  ({ MikroORM, LockMode } = core);
+  ({ ENTITIES, StorageAppState, StorageEvent, StorageSession, StorageUserState } = schema);
+  ({
+    ensureDatabaseCreated,
+    getConnectionOptionsFromUri,
+    validateDatabaseSchemaVersion
+  } = operations);
+}
+__name(importMikroOrm, "importMikroOrm");
 function isDatabaseConnectionString(uri) {
   if (!uri) {
     return false;
@@ -58,22 +96,19 @@ const _DatabaseSessionService = class _DatabaseSessionService extends import_bas
       if (!connectionStringOrOptions.driver) {
         throw new Error("Driver is required when passing options object.");
       }
-      this.options = {
-        ...connectionStringOrOptions,
-        entities: import_schema.ENTITIES
-      };
+      this.options = connectionStringOrOptions;
     }
   }
   async init() {
     if (this.initialized) {
       return;
     }
-    if (this.connectionString && (!this.options || !this.options.driver)) {
-      this.options = await (0, import_operations.getConnectionOptionsFromUri)(this.connectionString);
-    }
-    this.orm = await import_core.MikroORM.init(this.options);
-    await (0, import_operations.ensureDatabaseCreated)(this.orm);
-    await (0, import_operations.validateDatabaseSchemaVersion)(this.orm);
+    await loadMikroOrm();
+    const options = this.connectionString ? await getConnectionOptionsFromUri(this.connectionString) : { ...this.options, entities: ENTITIES };
+    this.options = options;
+    this.orm = await MikroORM.init(options);
+    await ensureDatabaseCreated(this.orm);
+    await validateDatabaseSchemaVersion(this.orm);
     this.initialized = true;
   }
   async createSession({
@@ -86,7 +121,7 @@ const _DatabaseSessionService = class _DatabaseSessionService extends import_bas
     const em = this.orm.em.fork();
     const id = sessionId || (0, import_env_aware_utils.randomUUID)();
     const now = /* @__PURE__ */ new Date();
-    const existing = await em.findOne(import_schema.StorageSession, {
+    const existing = await em.findOne(StorageSession, {
       id,
       appName,
       userId
@@ -94,18 +129,18 @@ const _DatabaseSessionService = class _DatabaseSessionService extends import_bas
     if (existing) {
       throw new Error(`Session with id ${id} already exists.`);
     }
-    let appStateModel = await em.findOne(import_schema.StorageAppState, { appName });
+    let appStateModel = await em.findOne(StorageAppState, { appName });
     if (!appStateModel) {
-      appStateModel = em.create(import_schema.StorageAppState, {
+      appStateModel = em.create(StorageAppState, {
         appName,
         state: {},
         updateTime: now
       });
       em.persist(appStateModel);
     }
-    let userStateModel = await em.findOne(import_schema.StorageUserState, { appName, userId });
+    let userStateModel = await em.findOne(StorageUserState, { appName, userId });
     if (!userStateModel) {
-      userStateModel = em.create(import_schema.StorageUserState, {
+      userStateModel = em.create(StorageUserState, {
         appName,
         userId,
         state: {}
@@ -132,7 +167,7 @@ const _DatabaseSessionService = class _DatabaseSessionService extends import_bas
     if (Object.keys(userStateDelta).length > 0) {
       userStateModel.state = { ...userStateModel.state, ...userStateDelta };
     }
-    const storageSession = em.create(import_schema.StorageSession, {
+    const storageSession = em.create(StorageSession, {
       id,
       appName,
       userId,
@@ -164,7 +199,7 @@ const _DatabaseSessionService = class _DatabaseSessionService extends import_bas
   }) {
     await this.init();
     const em = this.orm.em.fork();
-    const storageSession = await em.findOne(import_schema.StorageSession, {
+    const storageSession = await em.findOne(StorageSession, {
       appName,
       userId,
       id: sessionId
@@ -180,13 +215,13 @@ const _DatabaseSessionService = class _DatabaseSessionService extends import_bas
     if (config == null ? void 0 : config.afterTimestamp) {
       eventWhere.timestamp = { $gt: new Date(config.afterTimestamp) };
     }
-    const storageEvents = await em.find(import_schema.StorageEvent, eventWhere, {
+    const storageEvents = await em.find(StorageEvent, eventWhere, {
       orderBy: { timestamp: "DESC" },
       limit: config == null ? void 0 : config.numRecentEvents
     });
     storageEvents.reverse();
-    const appStateModel = await em.findOne(import_schema.StorageAppState, { appName });
-    const userStateModel = await em.findOne(import_schema.StorageUserState, {
+    const appStateModel = await em.findOne(StorageAppState, { appName });
+    const userStateModel = await em.findOne(StorageUserState, {
       appName,
       userId
     });
@@ -222,7 +257,7 @@ const _DatabaseSessionService = class _DatabaseSessionService extends import_bas
     let storageSessions;
     let paginationMeta;
     if (limit !== void 0) {
-      const totalItems = await em.count(import_schema.StorageSession, where);
+      const totalItems = await em.count(StorageSession, where);
       const totalPages = limit === 0 ? 0 : Math.ceil(totalItems / limit);
       let effectiveOffset;
       let effectivePage;
@@ -233,15 +268,15 @@ const _DatabaseSessionService = class _DatabaseSessionService extends import_bas
         effectiveOffset = offset != null ? offset : 0;
         effectivePage = limit === 0 ? 1 : Math.floor(effectiveOffset / limit) + 1;
       }
-      storageSessions = await em.find(import_schema.StorageSession, where, {
+      storageSessions = await em.find(StorageSession, where, {
         orderBy,
         limit,
         offset: effectiveOffset
       });
       paginationMeta = { page: effectivePage, limit, totalItems, totalPages };
     } else if (offset) {
-      const totalItems = await em.count(import_schema.StorageSession, where);
-      storageSessions = await em.find(import_schema.StorageSession, where, {
+      const totalItems = await em.count(StorageSession, where);
+      storageSessions = await em.find(StorageSession, where, {
         orderBy,
         offset
       });
@@ -252,7 +287,7 @@ const _DatabaseSessionService = class _DatabaseSessionService extends import_bas
         totalPages: totalItems === 0 ? 0 : 1
       };
     } else {
-      storageSessions = await em.find(import_schema.StorageSession, where, { orderBy });
+      storageSessions = await em.find(StorageSession, where, { orderBy });
       const totalItems = storageSessions.length;
       paginationMeta = {
         page: 1,
@@ -261,14 +296,14 @@ const _DatabaseSessionService = class _DatabaseSessionService extends import_bas
         totalPages: totalItems === 0 ? 0 : 1
       };
     }
-    const appStateModel = await em.findOne(import_schema.StorageAppState, { appName });
+    const appStateModel = await em.findOne(StorageAppState, { appName });
     const appState = (appStateModel == null ? void 0 : appStateModel.state) || {};
     const userStateMap = {};
     if (userId) {
-      const u = await em.findOne(import_schema.StorageUserState, { appName, userId });
+      const u = await em.findOne(StorageUserState, { appName, userId });
       if (u) userStateMap[userId] = u.state;
     } else {
-      const allUserStates = await em.find(import_schema.StorageUserState, { appName });
+      const allUserStates = await em.find(StorageUserState, { appName });
       for (const u of allUserStates) {
         userStateMap[u.userId] = u.state;
       }
@@ -294,8 +329,8 @@ const _DatabaseSessionService = class _DatabaseSessionService extends import_bas
   }) {
     await this.init();
     const em = this.orm.em.fork();
-    await em.nativeDelete(import_schema.StorageSession, { appName, userId, id: sessionId });
-    await em.nativeDelete(import_schema.StorageEvent, { appName, userId, sessionId });
+    await em.nativeDelete(StorageSession, { appName, userId, id: sessionId });
+    await em.nativeDelete(StorageEvent, { appName, userId, sessionId });
   }
   async appendEvent({
     session,
@@ -309,34 +344,34 @@ const _DatabaseSessionService = class _DatabaseSessionService extends import_bas
     const trimmedEvent = (0, import_base_session_service.trimTempDeltaState)(event);
     await em.transactional(async (txEm) => {
       const storageSession = await txEm.findOne(
-        import_schema.StorageSession,
+        StorageSession,
         {
           appName: session.appName,
           userId: session.userId,
           id: session.id
         },
-        { lockMode: import_core.LockMode.PESSIMISTIC_WRITE }
+        { lockMode: LockMode.PESSIMISTIC_WRITE }
       );
       if (!storageSession) {
         throw new Error(`Session ${session.id} not found for appendEvent`);
       }
-      let appStateModel = await txEm.findOne(import_schema.StorageAppState, {
+      let appStateModel = await txEm.findOne(StorageAppState, {
         appName: session.appName
       });
       if (!appStateModel) {
-        appStateModel = txEm.create(import_schema.StorageAppState, {
+        appStateModel = txEm.create(StorageAppState, {
           appName: session.appName,
           state: {},
           updateTime: /* @__PURE__ */ new Date()
         });
         txEm.persist(appStateModel);
       }
-      let userStateModel = await txEm.findOne(import_schema.StorageUserState, {
+      let userStateModel = await txEm.findOne(StorageUserState, {
         appName: session.appName,
         userId: session.userId
       });
       if (!userStateModel) {
-        userStateModel = txEm.create(import_schema.StorageUserState, {
+        userStateModel = txEm.create(StorageUserState, {
           appName: session.appName,
           userId: session.userId,
           state: {}
@@ -345,7 +380,7 @@ const _DatabaseSessionService = class _DatabaseSessionService extends import_bas
       }
       if (storageSession.updateTime.getTime() > session.lastUpdateTime) {
         const events = await txEm.find(
-          import_schema.StorageEvent,
+          StorageEvent,
           {
             appName: session.appName,
             userId: session.userId,
@@ -384,7 +419,7 @@ const _DatabaseSessionService = class _DatabaseSessionService extends import_bas
           storageSession.state = { ...storageSession.state, ...sessionDelta };
         }
       }
-      const existingStorageEvent = await txEm.findOne(import_schema.StorageEvent, {
+      const existingStorageEvent = await txEm.findOne(StorageEvent, {
         id: trimmedEvent.id,
         appName: session.appName,
         userId: session.userId,
@@ -395,7 +430,7 @@ const _DatabaseSessionService = class _DatabaseSessionService extends import_bas
         existingStorageEvent.timestamp = new Date(trimmedEvent.timestamp);
         txEm.persist(existingStorageEvent);
       } else {
-        const newStorageEvent = txEm.create(import_schema.StorageEvent, {
+        const newStorageEvent = txEm.create(StorageEvent, {
           id: trimmedEvent.id,
           appName: session.appName,
           userId: session.userId,
@@ -406,8 +441,8 @@ const _DatabaseSessionService = class _DatabaseSessionService extends import_bas
         });
         txEm.persist(newStorageEvent);
       }
-      await txEm.commit();
       storageSession.updateTime = new Date(event.timestamp);
+      txEm.persist([appStateModel, userStateModel, storageSession]);
       const newMergedState = (0, import_base_session_service.mergeStates)(
         appStateModel.state,
         userStateModel.state,