@google/adk 0.2.5 → 0.4.0

package/dist/cjs/plugins/security_plugin.js

@@ -1,6 +1,6 @@
 /**
   * @license
-  * Copyright 2025 Google LLC
+  * Copyright 2026 Google LLC
   * SPDX-License-Identifier: Apache-2.0
   */
 
@@ -47,7 +47,7 @@ var PolicyOutcome = /* @__PURE__ */ ((PolicyOutcome2) => {
   return PolicyOutcome2;
 })(PolicyOutcome || {});
 class InMemoryPolicyEngine {
-  async evaluate(context) {
+  async evaluate() {
     return Promise.resolve({
       outcome: "ALLOW" /* ALLOW */,
       reason: "For prototyping purpose, all tool calls are allowed."

package/dist/cjs/runner/in_memory_runner.js

@@ -1,6 +1,6 @@
 /**
   * @license
-  * Copyright 2025 Google LLC
+  * Copyright 2026 Google LLC
   * SPDX-License-Identifier: Apache-2.0
   */
 

package/dist/cjs/runner/runner.js

@@ -1,6 +1,6 @@
 /**
   * @license
-  * Copyright 2025 Google LLC
+  * Copyright 2026 Google LLC
   * SPDX-License-Identifier: Apache-2.0
   */
 
@@ -36,6 +36,7 @@ var import_built_in_code_executor = require("../code_executors/built_in_code_exe
 var import_event = require("../events/event.js");
 var import_event_actions = require("../events/event_actions.js");
 var import_plugin_manager = require("../plugins/plugin_manager.js");
+var import_tracing = require("../telemetry/tracing.js");
 var import_logger = require("../utils/logger.js");
 var import_model_name = require("../utils/model_name.js");
 /**
@@ -54,6 +55,37 @@ class Runner {
     this.memoryService = input.memoryService;
     this.credentialService = input.credentialService;
   }
+  /**
+   * Runs the agent with a new, ephemeral session.
+   *
+   * @param params.userId The user ID of the session.
+   * @param params.newMessage A new message to append to the session.
+   * @param params.stateDelta An optional state delta to apply to the session.
+   * @param params.runConfig The run config for the agent.
+   * @yields The Events generated by the agent.
+   */
+  async *runEphemeral(params) {
+    const session = await this.sessionService.createSession({
+      appName: this.appName,
+      userId: params.userId
+    });
+    const sessionId = session.id;
+    try {
+      yield* this.runAsync({
+        userId: params.userId,
+        sessionId,
+        newMessage: params.newMessage,
+        stateDelta: params.stateDelta,
+        runConfig: params.runConfig
+      });
+    } finally {
+      await this.sessionService.deleteSession({
+        appName: this.appName,
+        userId: params.userId,
+        sessionId
+      });
+    }
+  }
   /**
    * Runs the agent with the given message, and returns an async generator of
    * events.
@@ -67,109 +99,123 @@ class Runner {
    */
   // TODO - b/425992518: user, sessionId, and runConfig can be internalized.
   async *runAsync(params) {
-    var _a;
     const { userId, sessionId, stateDelta } = params;
     const runConfig = (0, import_run_config.createRunConfig)(params.runConfig);
     let newMessage = params.newMessage;
-    const span = import_api.trace.getTracer("gcp.vertex.agent").startSpan("invocation");
+    const span = import_tracing.tracer.startSpan("invocation");
+    const ctx = import_api.trace.setSpan(import_api.context.active(), span);
     try {
-      const session = await this.sessionService.getSession({
-        appName: this.appName,
-        userId,
-        sessionId
-      });
-      if (!session) {
-        if (!this.appName) {
-          throw new Error(
-            `Session lookup failed: appName must be provided in runner constructor`
-          );
-        }
-        throw new Error(`Session not found: ${sessionId}`);
-      }
-      if (runConfig.supportCfc && (0, import_llm_agent.isLlmAgent)(this.agent)) {
-        const modelName = this.agent.canonicalModel.model;
-        if (!(0, import_model_name.isGemini2OrAbove)(modelName)) {
-          throw new Error(
-            `CFC is not supported for model: ${modelName} in agent: ${this.agent.name}`
-          );
-        }
-        if (!(0, import_built_in_code_executor.isBuiltInCodeExecutor)(this.agent.codeExecutor)) {
-          this.agent.codeExecutor = new import_built_in_code_executor.BuiltInCodeExecutor();
-        }
-      }
-      const invocationContext = new import_invocation_context.InvocationContext({
-        artifactService: this.artifactService,
-        sessionService: this.sessionService,
-        memoryService: this.memoryService,
-        credentialService: this.credentialService,
-        invocationId: (0, import_invocation_context.newInvocationContextId)(),
-        agent: this.agent,
-        session,
-        userContent: newMessage,
-        runConfig,
-        pluginManager: this.pluginManager
-      });
-      const pluginUserMessage = await this.pluginManager.runOnUserMessageCallback({
-        userMessage: newMessage,
-        invocationContext
-      });
-      if (pluginUserMessage) {
-        newMessage = pluginUserMessage;
-      }
-      if (newMessage) {
-        if (!((_a = newMessage.parts) == null ? void 0 : _a.length)) {
-          throw new Error("No parts in the newMessage.");
-        }
-        if (runConfig.saveInputBlobsAsArtifacts) {
-          await this.saveArtifacts(
-            invocationContext.invocationId,
-            session.userId,
-            session.id,
-            newMessage
-          );
-        }
-        await this.sessionService.appendEvent({
-          session,
-          event: (0, import_event.createEvent)({
-            invocationId: invocationContext.invocationId,
-            author: "user",
-            actions: stateDelta ? (0, import_event_actions.createEventActions)({ stateDelta }) : void 0,
-            content: newMessage
-          })
-        });
-      }
-      invocationContext.agent = this.determineAgentForResumption(
-        session,
-        this.agent
-      );
-      const beforeRunCallbackResponse = await this.pluginManager.runBeforeRunCallback({ invocationContext });
-      if (beforeRunCallbackResponse) {
-        const earlyExitEvent = (0, import_event.createEvent)({
-          invocationId: invocationContext.invocationId,
-          author: "model",
-          content: beforeRunCallbackResponse
-        });
-        await this.sessionService.appendEvent({ session, event: earlyExitEvent });
-        yield earlyExitEvent;
-      } else {
-        for await (const event of invocationContext.agent.runAsync(
-          invocationContext
-        )) {
-          if (!event.partial) {
-            await this.sessionService.appendEvent({ session, event });
+      yield* (0, import_tracing.runAsyncGeneratorWithOtelContext)(
+        ctx,
+        this,
+        async function* () {
+          var _a;
+          const session = await this.sessionService.getSession({
+            appName: this.appName,
+            userId,
+            sessionId
+          });
+          if (!session) {
+            if (!this.appName) {
+              throw new Error(
+                `Session lookup failed: appName must be provided in runner constructor`
+              );
+            }
+            throw new Error(`Session not found: ${sessionId}`);
+          }
+          if (runConfig.supportCfc && (0, import_llm_agent.isLlmAgent)(this.agent)) {
+            const modelName = this.agent.canonicalModel.model;
+            if (!(0, import_model_name.isGemini2OrAbove)(modelName)) {
+              throw new Error(
+                `CFC is not supported for model: ${modelName} in agent: ${this.agent.name}`
+              );
+            }
+            if (!(0, import_built_in_code_executor.isBuiltInCodeExecutor)(this.agent.codeExecutor)) {
+              this.agent.codeExecutor = new import_built_in_code_executor.BuiltInCodeExecutor();
+            }
           }
-          const modifiedEvent = await this.pluginManager.runOnEventCallback({
-            invocationContext,
-            event
+          const invocationContext = new import_invocation_context.InvocationContext({
+            artifactService: this.artifactService,
+            sessionService: this.sessionService,
+            memoryService: this.memoryService,
+            credentialService: this.credentialService,
+            invocationId: (0, import_invocation_context.newInvocationContextId)(),
+            agent: this.agent,
+            session,
+            userContent: newMessage,
+            runConfig,
+            pluginManager: this.pluginManager
+          });
+          const pluginUserMessage = await this.pluginManager.runOnUserMessageCallback({
+            userMessage: newMessage,
+            invocationContext
           });
-          if (modifiedEvent) {
-            yield modifiedEvent;
-          } else {
-            yield event;
+          if (pluginUserMessage) {
+            newMessage = pluginUserMessage;
+          }
+          if (newMessage) {
+            if (!((_a = newMessage.parts) == null ? void 0 : _a.length)) {
+              throw new Error("No parts in the newMessage.");
+            }
+            if (runConfig.saveInputBlobsAsArtifacts) {
+              await this.saveArtifacts(
+                invocationContext.invocationId,
+                session.userId,
+                session.id,
+                newMessage
+              );
+            }
+            await this.sessionService.appendEvent({
+              session,
+              event: (0, import_event.createEvent)({
+                invocationId: invocationContext.invocationId,
+                author: "user",
+                actions: stateDelta ? (0, import_event_actions.createEventActions)({ stateDelta }) : void 0,
+                content: newMessage
+              })
+            });
+          }
+          invocationContext.agent = this.determineAgentForResumption(
+            session,
+            this.agent
+          );
+          if (newMessage) {
+            const beforeRunCallbackResponse = await this.pluginManager.runBeforeRunCallback({
+              invocationContext
+            });
+            if (beforeRunCallbackResponse) {
+              const earlyExitEvent = (0, import_event.createEvent)({
+                invocationId: invocationContext.invocationId,
+                author: "model",
+                content: beforeRunCallbackResponse
+              });
+              await this.sessionService.appendEvent({
+                session,
+                event: earlyExitEvent
+              });
+              yield earlyExitEvent;
+            } else {
+              for await (const event of invocationContext.agent.runAsync(
+                invocationContext
+              )) {
+                if (!event.partial) {
+                  await this.sessionService.appendEvent({ session, event });
+                }
+                const modifiedEvent = await this.pluginManager.runOnEventCallback({
+                  invocationContext,
+                  event
+                });
+                if (modifiedEvent) {
+                  yield modifiedEvent;
+                } else {
+                  yield event;
+                }
+              }
+              await this.pluginManager.runAfterRunCallback({ invocationContext });
+            }
           }
         }
-      }
-      await this.pluginManager.runAfterRunCallback({ invocationContext });
+      );
     } finally {
       span.end();
     }

package/dist/cjs/sessions/base_session_service.js

@@ -1,6 +1,6 @@
 /**
   * @license
-  * Copyright 2025 Google LLC
+  * Copyright 2026 Google LLC
   * SPDX-License-Identifier: Apache-2.0
   */
 
@@ -24,9 +24,12 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var base_session_service_exports = {};
 __export(base_session_service_exports, {
-  BaseSessionService: () => BaseSessionService
+  BaseSessionService: () => BaseSessionService,
+  mergeStates: () => mergeStates,
+  trimTempDeltaState: () => trimTempDeltaState
 });
 module.exports = __toCommonJS(base_session_service_exports);
+var import_lodash_es = require("lodash-es");
 var import_state = require("./state.js");
 /**
  * @license
@@ -34,6 +37,26 @@ var import_state = require("./state.js");
  * SPDX-License-Identifier: Apache-2.0
  */
 class BaseSessionService {
+  /**
+   * Gets a session or creates one if it doesn't exist.
+   *
+   * @param request The request to get or create a session.
+   * @return A promise that resolves to the session instance.
+   */
+  async getOrCreateSession(request) {
+    if (!request.sessionId) {
+      return this.createSession(request);
+    }
+    const session = await this.getSession({
+      appName: request.appName,
+      userId: request.userId,
+      sessionId: request.sessionId
+    });
+    if (session) {
+      return session;
+    }
+    return this.createSession(request);
+  }
   /**
    * Appends an event to a session.
    *
@@ -44,6 +67,7 @@ class BaseSessionService {
     if (event.partial) {
       return event;
     }
+    event = trimTempDeltaState(event);
     this.updateSessionState({ session, event });
     session.events.push(event);
     return event;
@@ -65,7 +89,33 @@ class BaseSessionService {
     }
   }
 }
+function trimTempDeltaState(event) {
+  if (!event.actions || !event.actions.stateDelta) {
+    return event;
+  }
+  const stateDelta = event.actions.stateDelta;
+  const filteredStateDelta = {};
+  for (const [key, value] of Object.entries(stateDelta)) {
+    if (!key.startsWith(import_state.State.TEMP_PREFIX)) {
+      filteredStateDelta[key] = value;
+    }
+  }
+  event.actions.stateDelta = filteredStateDelta;
+  return event;
+}
+function mergeStates(appState = {}, userState = {}, sessionState = {}) {
+  const merged = (0, import_lodash_es.cloneDeep)(sessionState);
+  for (const [k, v] of Object.entries(appState)) {
+    merged[import_state.State.APP_PREFIX + k] = v;
+  }
+  for (const [k, v] of Object.entries(userState)) {
+    merged[import_state.State.USER_PREFIX + k] = v;
+  }
+  return merged;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  BaseSessionService
+  BaseSessionService,
+  mergeStates,
+  trimTempDeltaState
 });