@google/adk 1.2.0 → 1.4.0

package/dist/esm/plugins/security_plugin.js

@@ -16,6 +16,11 @@ var PolicyOutcome = /* @__PURE__ */ ((PolicyOutcome2) => {
   return PolicyOutcome2;
 })(PolicyOutcome || {});
 class InMemoryPolicyEngine {
+  /**
+   * Always returns {@link PolicyOutcome.ALLOW} for every tool call.
+   *
+   * @returns A promise resolving to an ALLOW result.
+   */
   async evaluate() {
     return Promise.resolve({
       outcome: "ALLOW" /* ALLOW */,
@@ -24,11 +29,22 @@ class InMemoryPolicyEngine {
   }
 }
 class SecurityPlugin extends BasePlugin {
+  /**
+   * @param params - Optional configuration. Defaults to {@link InMemoryPolicyEngine}
+   *   when no policy engine is provided.
+   */
   constructor(params) {
     var _a;
     super("security_plugin");
     this.policyEngine = (_a = params == null ? void 0 : params.policyEngine) != null ? _a : new InMemoryPolicyEngine();
   }
+  /**
+   * Intercepts tool calls, evaluating them against the policy engine before
+   * execution and handling confirmation flows for calls that require it.
+   *
+   * @returns A partial or error response object if the call is blocked or
+   *   awaiting confirmation, or `undefined` to allow execution to proceed.
+   */
   async beforeToolCallback({
     tool,
     toolArgs,

package/dist/esm/runner/in_memory_runner.js

@@ -14,19 +14,30 @@ class InMemoryRunner extends Runner {
    * Creates a new InMemoryRunner instance.
    *
    * @param params The configuration for the runner.
+   * @param params.app An optional application instance to run.
    * @param params.agent The root agent to run.
    * @param params.appName The application name. Defaults to `'InMemoryRunner'`.
    * @param params.plugins An optional list of plugins.
+   * @param params.resumabilityConfig An optional resumability configuration.
    */
   constructor(params) {
-    const { agent, appName = "InMemoryRunner", plugins = [] } = params;
+    var _a;
+    const {
+      agent,
+      appName = "InMemoryRunner",
+      plugins = [],
+      app,
+      resumabilityConfig
+    } = params;
     super({
+      app,
       appName,
       agent,
       plugins,
       artifactService: new InMemoryArtifactService(),
       sessionService: new InMemorySessionService(),
-      memoryService: new InMemoryMemoryService()
+      memoryService: new InMemoryMemoryService(),
+      resumabilityConfig: (_a = app == null ? void 0 : app.resumabilityConfig) != null ? _a : resumabilityConfig
     });
   }
 }

package/dist/esm/runner/runner.js

@@ -8,17 +8,19 @@ const require = topLevelCreateRequire(import.meta.url);
 var _a;
 import { createPartFromText } from "@google/genai";
 import { context, trace } from "@opentelemetry/api";
+import { findMatchingFunctionCall } from "../agents/functions.js";
 import {
   InvocationContext,
   newInvocationContextId
 } from "../agents/invocation_context.js";
 import { isLlmAgent } from "../agents/llm_agent.js";
 import { createRunConfig } from "../agents/run_config.js";
+import { ScopedArtifactService } from "../artifacts/scoped_artifact_service.js";
 import {
   BuiltInCodeExecutor,
   isBuiltInCodeExecutor
 } from "../code_executors/built_in_code_executor.js";
-import { createEvent, getFunctionCalls } from "../events/event.js";
+import { createEvent } from "../events/event.js";
 import { createEventActions } from "../events/event_actions.js";
 import { PluginManager } from "../plugins/plugin_manager.js";
 import {
@@ -41,14 +43,24 @@ class Runner {
    */
   constructor(input) {
     this[_a] = true;
-    var _a2;
-    this.appName = input.appName;
-    this.agent = input.agent;
-    this.pluginManager = new PluginManager((_a2 = input.plugins) != null ? _a2 : []);
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i;
+    const appName = (_b = (_a2 = input.app) == null ? void 0 : _a2.name) != null ? _b : input.appName;
+    const agent = (_d = (_c = input.app) == null ? void 0 : _c.rootAgent) != null ? _d : input.agent;
+    if (!agent) {
+      throw new Error(
+        "agent must be provided in runner constructor (or via app.rootAgent)"
+      );
+    }
+    this.appName = appName;
+    this.agent = agent;
+    const appPlugins = (_f = (_e = input.app) == null ? void 0 : _e.plugins) != null ? _f : [];
+    const configPlugins = (_g = input.plugins) != null ? _g : [];
+    this.pluginManager = new PluginManager([...appPlugins, ...configPlugins]);
     this.artifactService = input.artifactService;
     this.sessionService = input.sessionService;
     this.memoryService = input.memoryService;
     this.credentialService = input.credentialService;
+    this.resumabilityConfig = (_i = (_h = input.app) == null ? void 0 : _h.resumabilityConfig) != null ? _i : input.resumabilityConfig;
   }
   /**
    * Runs the agent with a new, ephemeral session.
@@ -98,6 +110,9 @@ class Runner {
     const { userId, sessionId, stateDelta } = params;
     const runConfig = createRunConfig(params.runConfig);
     let newMessage = params.newMessage;
+    if (newMessage && !newMessage.role) {
+      newMessage.role = "user";
+    }
     const span = tracer.startSpan("invocation");
     const ctx = trace.setSpan(context.active(), span);
     try {
@@ -117,7 +132,7 @@ class Runner {
           if (!session) {
             if (!this.appName) {
               throw new Error(
-                `Session lookup failed: appName must be provided in runner constructor`
+                `Session lookup failed: appName must be provided in runner constructor (or via app.name)`
               );
             }
             throw new Error(`Session not found: ${sessionId}`);
@@ -134,7 +149,12 @@ class Runner {
             }
           }
           const invocationContext = new InvocationContext({
-            artifactService: this.artifactService,
+            artifactService: this.artifactService ? new ScopedArtifactService(
+              this.artifactService,
+              this.appName,
+              userId,
+              sessionId
+            ) : void 0,
             sessionService: this.sessionService,
             memoryService: this.memoryService,
             credentialService: this.credentialService,
@@ -261,6 +281,11 @@ class Runner {
     if (!this.artifactService || !((_a2 = message.parts) == null ? void 0 : _a2.length)) {
       return;
     }
+    const sessionKey = {
+      appName: this.appName,
+      userId,
+      sessionId
+    };
     for (let i = 0; i < message.parts.length; i++) {
       const part = message.parts[i];
       if (!part.inlineData) {
@@ -268,9 +293,7 @@ class Runner {
       }
       const fileName = `artifact_${invocationId}_${i}`;
       await this.artifactService.saveArtifact({
-        appName: this.appName,
-        userId,
-        sessionId,
+        ...sessionKey,
         filename: fileName,
         artifact: part
       });
@@ -283,86 +306,78 @@ class Runner {
    * Determines the next agent to run to continue the session. This is primarily
    * used for session resumption.
    */
-  // TODO - b/425992518: This is where LRO integration should happen.
-  // Needs clean up before we can generalize it.
+  /**
+   * Determines the next agent to run to continue the session. This is primarily
+   * used for session resumption across tool and LRO boundaries.
+   */
   determineAgentForResumption(session, rootAgent) {
-    const event = findEventByLastFunctionResponseId(session.events);
-    if (event && event.author) {
-      return rootAgent.findAgent(event.author) || rootAgent;
-    }
-    for (let i = session.events.length - 1; i >= 0; i--) {
-      logger.info("event:", JSON.stringify(session.events[i]));
-      const event2 = session.events[i];
-      if (event2.author === "user" || !event2.author) {
-        continue;
-      }
-      if (event2.author === rootAgent.name) {
-        return rootAgent;
-      }
-      const agent = rootAgent.findSubAgent(event2.author);
-      if (!agent) {
-        logger.warn(
-          `Event from an unknown agent: ${event2.author}, event id: ${event2.id}`
-        );
-        continue;
-      }
-      if (this.isRoutableLlmAgent(agent)) {
-        return agent;
-      }
-    }
-    return rootAgent;
+    return determineAgentForResumption(
+      session,
+      rootAgent,
+      this.resumabilityConfig
+    );
   }
   /**
    * Whether the agent to run can transfer to any other agent in the agent tree.
    *
-   * An agent is transferable if:
-   *  - It is an instance of `LlmAgent`.
-   *  - All its ancestors are also transferable (i.e., they have
-   *    `disallowTransferToParent` set to false).
-   *
    * @param agentToRun The agent to check for transferability.
    * @returns True if the agent can transfer, False otherwise.
    */
   isRoutableLlmAgent(agentToRun) {
-    let agent = agentToRun;
-    while (agent) {
-      if (!isLlmAgent(agent)) {
-        return false;
-      }
-      if (agent.disallowTransferToParent) {
-        return false;
-      }
-      agent = agent.parentAgent;
-    }
-    return true;
+    return isRoutableLlmAgent(agentToRun);
   }
   // TODO - b/425992518: Implement runLive and related methods.
 }
-function findEventByLastFunctionResponseId(events) {
-  var _a2, _b, _c, _d;
-  if (!events.length) {
-    return null;
-  }
-  const lastEvent = events[events.length - 1];
-  const functionCallId = (_d = (_c = (_b = (_a2 = lastEvent.content) == null ? void 0 : _a2.parts) == null ? void 0 : _b.find(
-    (part) => part.functionResponse
-  )) == null ? void 0 : _c.functionResponse) == null ? void 0 : _d.id;
-  if (!functionCallId) {
-    return null;
+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 resumedAgent = rootAgent.findAgent(event.author);
+    if (resumedAgent) {
+      return resumedAgent;
+    }
+    logger.warn(
+      `Function response from an unknown agent: ${event.author}, event id: ${event.id}`
+    );
   }
-  for (let i = events.length - 2; i >= 0; i--) {
-    const event = events[i];
-    const functionCalls = getFunctionCalls(event);
-    if (!functionCalls) {
+  for (let i = session.events.length - 1; i >= 0; i--) {
+    logger.debug("event:", JSON.stringify(session.events[i]));
+    const event2 = session.events[i];
+    if (event2.author === "user" || !event2.author) {
       continue;
     }
-    for (const functionCall of functionCalls) {
-      if (functionCall.id === functionCallId) {
-        return event;
-      }
+    if (event2.author === rootAgent.name) {
+      return rootAgent;
+    }
+    const agent = rootAgent.findSubAgent(event2.author);
+    if (!agent) {
+      logger.warn(
+        `Event from an unknown agent: ${event2.author}, event id: ${event2.id}`
+      );
+      continue;
+    }
+    if (isRoutableLlmAgent(agent)) {
+      return agent;
     }
   }
-  return null;
+  return rootAgent;
+}
+function isRoutableLlmAgent(agentToRun) {
+  let agent = agentToRun;
+  while (agent) {
+    if (!isLlmAgent(agent)) {
+      return false;
+    }
+    if (agent.disallowTransferToParent) {
+      return false;
+    }
+    agent = agent.parentAgent;
+  }
+  return true;
+}
+function findEventByLastFunctionResponseId(events) {
+  var _a2;
+  return (_a2 = findMatchingFunctionCall(events)) != null ? _a2 : null;
 }
 function getAllToolsets(agent) {
   const toolsets = [];
@@ -386,5 +401,8 @@ function getAllToolsets(agent) {
 }
 export {
   Runner,
+  determineAgentForResumption,
+  findEventByLastFunctionResponseId,
+  isRoutableLlmAgent,
   isRunner
 };

package/dist/esm/sessions/base_session_service.js

@@ -40,7 +40,12 @@ class BaseSessionService {
     }
     event = trimTempDeltaState(event);
     this.updateSessionState({ session, event });
-    session.events.push(event);
+    const index = session.events.findIndex((e) => e.id === event.id);
+    if (index >= 0) {
+      session.events[index] = event;
+    } else {
+      session.events.push(event);
+    }
     return event;
   }
   /**
@@ -74,6 +79,15 @@ function trimTempDeltaState(event) {
   event.actions.stateDelta = filteredStateDelta;
   return event;
 }
+function trimTempState(state) {
+  const filteredState = {};
+  for (const [key, value] of Object.entries(state)) {
+    if (!key.startsWith(State.TEMP_PREFIX)) {
+      filteredState[key] = value;
+    }
+  }
+  return filteredState;
+}
 function mergeStates(appState = {}, userState = {}, sessionState = {}) {
   const merged = cloneDeep(sessionState);
   for (const [k, v] of Object.entries(appState)) {
@@ -87,5 +101,6 @@ function mergeStates(appState = {}, userState = {}, sessionState = {}) {
 export {
   BaseSessionService,
   mergeStates,
-  trimTempDeltaState
+  trimTempDeltaState,
+  trimTempState
 };

package/dist/esm/sessions/database_session_service.js

@@ -108,7 +108,7 @@ class DatabaseSessionService extends BaseSessionService {
           appStateDelta[key.replace(State.APP_PREFIX, "")] = value;
         } else if (key.startsWith(State.USER_PREFIX)) {
           userStateDelta[key.replace(State.USER_PREFIX, "")] = value;
-        } else {
+        } else if (!key.startsWith(State.TEMP_PREFIX)) {
           sessionState[key] = value;
         }
       }
@@ -357,7 +357,7 @@ class DatabaseSessionService extends BaseSessionService {
             appDelta[key.replace(State.APP_PREFIX, "")] = value;
           } else if (key.startsWith(State.USER_PREFIX)) {
             userDelta[key.replace(State.USER_PREFIX, "")] = value;
-          } else {
+          } else if (!key.startsWith(State.TEMP_PREFIX)) {
             sessionDelta[key] = value;
           }
         }
@@ -371,16 +371,28 @@ class DatabaseSessionService extends BaseSessionService {
           storageSession.state = { ...storageSession.state, ...sessionDelta };
         }
       }
-      const newStorageEvent = txEm.create(StorageEvent, {
+      const existingStorageEvent = await txEm.findOne(StorageEvent, {
         id: trimmedEvent.id,
         appName: session.appName,
         userId: session.userId,
-        sessionId: session.id,
-        invocationId: trimmedEvent.invocationId,
-        timestamp: new Date(trimmedEvent.timestamp),
-        eventData: trimmedEvent
+        sessionId: session.id
       });
-      txEm.persist(newStorageEvent);
+      if (existingStorageEvent) {
+        existingStorageEvent.eventData = trimmedEvent;
+        existingStorageEvent.timestamp = new Date(trimmedEvent.timestamp);
+        txEm.persist(existingStorageEvent);
+      } else {
+        const newStorageEvent = txEm.create(StorageEvent, {
+          id: trimmedEvent.id,
+          appName: session.appName,
+          userId: session.userId,
+          sessionId: session.id,
+          invocationId: trimmedEvent.invocationId,
+          timestamp: new Date(trimmedEvent.timestamp),
+          eventData: trimmedEvent
+        });
+        txEm.persist(newStorageEvent);
+      }
       await txEm.commit();
       storageSession.updateTime = new Date(event.timestamp);
       const newMergedState = mergeStates(
@@ -389,7 +401,12 @@ class DatabaseSessionService extends BaseSessionService {
         storageSession.state
       );
       session.state = newMergedState;
-      session.events.push(event);
+      const index = session.events.findIndex((e) => e.id === event.id);
+      if (index >= 0) {
+        session.events[index] = event;
+      } else {
+        session.events.push(event);
+      }
       session.lastUpdateTime = storageSession.updateTime.getTime();
     });
     return event;

package/dist/esm/sessions/db/schema.js

@@ -22,6 +22,7 @@ import {
 } from "../../events/event.js";
 const SCHEMA_VERSION_KEY = "schema_version";
 const SCHEMA_VERSION_1_JSON = "1";
+const STORAGE_KEY_COLUMN_LENGTH = 191;
 class CamelCaseToSnakeCaseJsonType extends JsonType {
   convertToDatabaseValue(value) {
     return JSON.stringify(transformToSnakeCaseEvent(value));
@@ -50,7 +51,11 @@ let StorageAppState = class {
   }
 };
 __decorateClass([
-  PrimaryKey({ type: "string", fieldName: "app_name" })
+  PrimaryKey({
+    type: "string",
+    fieldName: "app_name",
+    length: STORAGE_KEY_COLUMN_LENGTH
+  })
 ], StorageAppState.prototype, "appName", 2);
 __decorateClass([
   Property({ type: "json" })
@@ -73,10 +78,18 @@ let StorageUserState = class {
   }
 };
 __decorateClass([
-  PrimaryKey({ type: "string", fieldName: "app_name" })
+  PrimaryKey({
+    type: "string",
+    fieldName: "app_name",
+    length: STORAGE_KEY_COLUMN_LENGTH
+  })
 ], StorageUserState.prototype, "appName", 2);
 __decorateClass([
-  PrimaryKey({ type: "string", fieldName: "user_id" })
+  PrimaryKey({
+    type: "string",
+    fieldName: "user_id",
+    length: STORAGE_KEY_COLUMN_LENGTH
+  })
 ], StorageUserState.prototype, "userId", 2);
 __decorateClass([
   Property({ type: "json" })
@@ -100,13 +113,21 @@ let StorageSession = class {
   }
 };
 __decorateClass([
-  PrimaryKey({ type: "string" })
+  PrimaryKey({ type: "string", length: STORAGE_KEY_COLUMN_LENGTH })
 ], StorageSession.prototype, "id", 2);
 __decorateClass([
-  PrimaryKey({ type: "string", fieldName: "app_name" })
+  PrimaryKey({
+    type: "string",
+    fieldName: "app_name",
+    length: STORAGE_KEY_COLUMN_LENGTH
+  })
 ], StorageSession.prototype, "appName", 2);
 __decorateClass([
-  PrimaryKey({ type: "string", fieldName: "user_id" })
+  PrimaryKey({
+    type: "string",
+    fieldName: "user_id",
+    length: STORAGE_KEY_COLUMN_LENGTH
+  })
 ], StorageSession.prototype, "userId", 2);
 __decorateClass([
   Property({ type: "json" })
@@ -132,16 +153,28 @@ PrimaryKey.name;
 let StorageEvent = class {
 };
 __decorateClass([
-  PrimaryKey({ type: "string" })
+  PrimaryKey({ type: "string", length: STORAGE_KEY_COLUMN_LENGTH })
 ], StorageEvent.prototype, "id", 2);
 __decorateClass([
-  PrimaryKey({ type: "string", fieldName: "app_name" })
+  PrimaryKey({
+    type: "string",
+    fieldName: "app_name",
+    length: STORAGE_KEY_COLUMN_LENGTH
+  })
 ], StorageEvent.prototype, "appName", 2);
 __decorateClass([
-  PrimaryKey({ type: "string", fieldName: "user_id" })
+  PrimaryKey({
+    type: "string",
+    fieldName: "user_id",
+    length: STORAGE_KEY_COLUMN_LENGTH
+  })
 ], StorageEvent.prototype, "userId", 2);
 __decorateClass([
-  PrimaryKey({ type: "string", fieldName: "session_id" })
+  PrimaryKey({
+    type: "string",
+    fieldName: "session_id",
+    length: STORAGE_KEY_COLUMN_LENGTH
+  })
 ], StorageEvent.prototype, "sessionId", 2);
 __decorateClass([
   Property({ type: "string", fieldName: "invocation_id" })
@@ -166,6 +199,7 @@ export {
   ENTITIES,
   SCHEMA_VERSION_1_JSON,
   SCHEMA_VERSION_KEY,
+  STORAGE_KEY_COLUMN_LENGTH,
   StorageAppState,
   StorageEvent,
   StorageMetadata,

package/dist/esm/sessions/in_memory_session_service.js

@@ -10,7 +10,8 @@ import { randomUUID } from "../utils/env_aware_utils.js";
 import { logger } from "../utils/logger.js";
 import {
   BaseSessionService,
-  mergeStates
+  mergeStates,
+  trimTempState
 } from "./base_session_service.js";
 import { createSession } from "./session.js";
 import { State } from "./state.js";
@@ -41,11 +42,12 @@ class InMemorySessionService extends BaseSessionService {
     sessionId
   }) {
     var _a;
+    const filteredState = state ? trimTempState(state) : void 0;
     const session = createSession({
       id: sessionId || randomUUID(),
       appName,
       userId,
-      state,
+      state: filteredState,
       events: [],
       lastUpdateTime: Date.now()
     });

package/dist/esm/sessions/vertex_ai_session_service.js

@@ -22,7 +22,8 @@ import { logger } from "../utils/logger.js";
 import { getExpressModeApiKey } from "../utils/vertex_ai_utils.js";
 import { partialCopy } from "../utils/partial_copy.js";
 import {
-  BaseSessionService
+  BaseSessionService,
+  trimTempState
 } from "./base_session_service.js";
 import { createSession } from "./session.js";
 const DEFAULT_MAX_ATTEMPTS = 30;
@@ -31,6 +32,10 @@ const HTTP_NOT_FOUND = 404;
 function isVertexAiConnectionString(uri) {
   return (uri == null ? void 0 : uri.startsWith("vertexai://")) || false;
 }
+function quoteFilterLiteral(value) {
+  const escaped = value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+  return `"${escaped}"`;
+}
 let VertexAiSessionService = class extends BaseSessionService {
   constructor(options) {
     super();
@@ -83,11 +88,12 @@ let VertexAiSessionService = class extends BaseSessionService {
   }) {
     var _a;
     const reasoningEngineId = this.getReasoningEngineId(appName);
+    const filteredState = state ? trimTempState(state) : void 0;
     let apiResponse = await this.sessions.createInternal({
       name: `reasoningEngines/${reasoningEngineId}`,
       userId,
       config: {
-        ...state ? { sessionState: state } : {},
+        ...filteredState ? { sessionState: filteredState } : {},
         ...sessionId ? { sessionId } : {}
       }
     });
@@ -197,7 +203,7 @@ let VertexAiSessionService = class extends BaseSessionService {
       const response = await this.sessions.listInternal({
         name: `reasoningEngines/${reasoningEngineId}`,
         config: {
-          ...userId ? { filter: `user_id="${userId}"` } : {},
+          ...userId ? { filter: `user_id=${quoteFilterLiteral(userId)}` } : {},
           ...pageToken ? { pageToken } : {}
         }
       });
@@ -258,10 +264,19 @@ let VertexAiSessionService = class extends BaseSessionService {
   }
   async deleteSession({
     appName,
-    userId: _userId,
+    userId,
     sessionId
   }) {
     const reasoningEngineId = this.getReasoningEngineId(appName);
+    const session = await this.getSession({
+      appName,
+      userId,
+      sessionId,
+      config: { numRecentEvents: 0 }
+    });
+    if (!session) {
+      return;
+    }
     await this.sessions.delete({
       name: `reasoningEngines/${reasoningEngineId}/sessions/${sessionId}`
     });
@@ -399,5 +414,6 @@ function _fromApiEvent(apiEventObj) {
 }
 export {
   VertexAiSessionService,
-  isVertexAiConnectionString
+  isVertexAiConnectionString,
+  quoteFilterLiteral
 };