@google/adk 1.6.0 → 2.1.0

package/dist/esm/sessions/in_memory_session_service.js

@@ -1,5 +1,7 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -18,7 +20,8 @@ import { State } from "./state.js";
 function isInMemoryConnectionString(uri) {
   return uri === "memory://";
 }
-class InMemorySessionService extends BaseSessionService {
+__name(isInMemoryConnectionString, "isInMemoryConnectionString");
+const _InMemorySessionService = class _InMemorySessionService extends BaseSessionService {
   constructor() {
     super(...arguments);
     /**
@@ -112,7 +115,9 @@ class InMemorySessionService extends BaseSessionService {
     page,
     order
   }) {
-    if (!this.sessions[appName] || !this.sessions[appName][userId]) {
+    const appSessions = this.sessions[appName];
+    const sessionsByUser = appSessions === void 0 ? [] : userId === void 0 ? Object.values(appSessions) : appSessions[userId] ? [appSessions[userId]] : [];
+    if (sessionsByUser.length === 0) {
       if (limit !== void 0) {
         const effectiveOffset2 = page !== void 0 ? (page - 1) * limit : offset != null ? offset : 0;
         const effectivePage2 = page !== void 0 ? page : limit === 0 ? 1 : Math.floor(effectiveOffset2 / limit) + 1;
@@ -132,15 +137,17 @@ class InMemorySessionService extends BaseSessionService {
         totalPages: 0
       });
     }
-    const all = Object.values(this.sessions[appName][userId]).map(
-      (session) => createSession({
-        id: session.id,
-        appName: session.appName,
-        userId: session.userId,
-        state: {},
-        events: [],
-        lastUpdateTime: session.lastUpdateTime
-      })
+    const all = sessionsByUser.flatMap(
+      (sessionsById) => Object.values(sessionsById).map(
+        (session) => createSession({
+          id: session.id,
+          appName: session.appName,
+          userId: session.userId,
+          state: {},
+          events: [],
+          lastUpdateTime: session.lastUpdateTime
+        })
+      )
     );
     if (order === "asc") {
       all.sort(
@@ -202,9 +209,9 @@ class InMemorySessionService extends BaseSessionService {
     const appName = session.appName;
     const userId = session.userId;
     const sessionId = session.id;
-    const warning = (message) => {
+    const warning = /* @__PURE__ */ __name((message) => {
       logger.warn(`Failed to append event to session ${sessionId}: ${message}`);
-    };
+    }, "warning");
     if (!this.sessions[appName]) {
       warning(`appName ${appName} not in sessions`);
       return event;
@@ -235,7 +242,9 @@ class InMemorySessionService extends BaseSessionService {
     storageSession.lastUpdateTime = event.timestamp;
     return event;
   }
-}
+};
+__name(_InMemorySessionService, "InMemorySessionService");
+let InMemorySessionService = _InMemorySessionService;
 export {
   InMemorySessionService,
   isInMemoryConnectionString

package/dist/esm/sessions/registry.js

@@ -1,10 +1,13 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { redactUriPassword } from "../utils/redact_uri.js";
 import {
   DatabaseSessionService,
   isDatabaseConnectionString
@@ -25,10 +28,15 @@ function getSessionServiceFromUri(uri) {
     return new DatabaseSessionService(uri);
   }
   if (isVertexAiConnectionString(uri)) {
-    return new VertexAiSessionService({});
+    return new VertexAiSessionService({
+      projectId: process.env.GOOGLE_CLOUD_PROJECT,
+      location: process.env.GOOGLE_CLOUD_LOCATION,
+      agentEngineId: process.env.GOOGLE_CLOUD_AGENT_ENGINE_ID
+    });
   }
-  throw new Error(`Unsupported session service URI: ${uri}`);
+  throw new Error(`Unsupported session service URI: ${redactUriPassword(uri)}`);
 }
+__name(getSessionServiceFromUri, "getSessionServiceFromUri");
 export {
   getSessionServiceFromUri
 };

package/dist/esm/sessions/session.js

@@ -1,5 +1,7 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -15,6 +17,7 @@ function createSession(params) {
     lastUpdateTime: params.lastUpdateTime || 0
   };
 }
+__name(createSession, "createSession");
 export {
   createSession
 };

package/dist/esm/sessions/state.js

@@ -1,14 +1,75 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 /**
  * @license
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-class State {
-  constructor(value = {}, delta = {}) {
+import { objectSchemaFields } from "../utils/schema.js";
+import { recordStateWrite } from "./state_write_order.js";
+const _StateSchemaError = class _StateSchemaError extends TypeError {
+  constructor(message) {
+    super(message);
+    this.name = "StateSchemaError";
+    Object.setPrototypeOf(this, _StateSchemaError.prototype);
+  }
+};
+__name(_StateSchemaError, "StateSchemaError");
+let StateSchemaError = _StateSchemaError;
+function isStateSchemaError(e) {
+  return e instanceof Error && e.name === "StateSchemaError";
+}
+__name(isStateSchemaError, "isStateSchemaError");
+const _State = class _State {
+  constructor(value = {}, delta = {}, schema) {
     this.value = value;
     this.delta = delta;
+    this.schema = schema;
+  }
+  /**
+   * Checks a whole delta against {@link schema}, for writes that reach the
+   * session without passing through this object — a node emitting an event
+   * that carries its own `stateDelta`.
+   */
+  validateDelta(delta) {
+    for (const [key, value] of Object.entries(delta)) {
+      this.validate(key, value);
+    }
+  }
+  /**
+   * Checks one key/value pair against {@link schema}, throwing
+   * {@link StateSchemaError} when the key is undeclared or its value does not
+   * match the declared type.
+   *
+   * Prefixed keys (`app:`, `user:`, `temp:`, or any other namespace) belong to
+   * a scope wider than this state and are never validated — the same carve-out
+   * adk-python makes.
+   */
+  validate(key, value) {
+    if (this.schema === void 0 || key.includes(":")) {
+      return;
+    }
+    const fields = objectSchemaFields(this.schema);
+    if (!fields) {
+      return;
+    }
+    if (!fields.has(key)) {
+      throw new StateSchemaError(
+        `Key '${key}' is not declared in the state schema. Declared fields: ` + JSON.stringify([...fields.keys()].sort())
+      );
+    }
+    const field = fields.get(key);
+    if (!field) {
+      return;
+    }
+    const parsed = field.safeParse(value);
+    if (!parsed.success) {
+      throw new StateSchemaError(
+        `Value for '${key}' does not match the type declared in the state schema: ${parsed.error.message}`
+      );
+    }
   }
   /**
    * Returns the value of the state dict for the given key.
@@ -34,8 +95,10 @@ class State {
    * @param value The value to set.
    */
   set(key, value) {
+    this.validate(key, value);
     this.value[key] = value;
     this.delta[key] = value;
+    recordStateWrite(this.value, this.delta, key);
   }
   /**
    * Whether the state has pending delta.
@@ -55,8 +118,12 @@ class State {
    * @param delta The delta to update the state with.
    */
   update(delta) {
+    this.validateDelta(delta);
     Object.assign(this.delta, delta);
     Object.assign(this.value, delta);
+    for (const key of Object.keys(delta)) {
+      recordStateWrite(this.value, this.delta, key);
+    }
   }
   /**
    * Returns the state as a plain JSON object.
@@ -64,10 +131,14 @@ class State {
   toRecord() {
     return { ...this.value, ...this.delta };
   }
-}
-State.APP_PREFIX = "app:";
-State.USER_PREFIX = "user:";
-State.TEMP_PREFIX = "temp:";
+};
+__name(_State, "State");
+_State.APP_PREFIX = "app:";
+_State.USER_PREFIX = "user:";
+_State.TEMP_PREFIX = "temp:";
+let State = _State;
 export {
-  State
+  State,
+  StateSchemaError,
+  isStateSchemaError
 };

package/dist/esm/sessions/state_write_order.js

@@ -0,0 +1,74 @@
+import {createRequire as topLevelCreateRequire} from 'module';
+const require = topLevelCreateRequire(import.meta.url);
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+let writeClock = 0;
+const stateStamps = /* @__PURE__ */ new WeakMap();
+const deltaStamps = /* @__PURE__ */ new WeakMap();
+function stampsFor(registry, target) {
+  let stamps = registry.get(target);
+  if (!stamps) {
+    stamps = /* @__PURE__ */ new Map();
+    registry.set(target, stamps);
+  }
+  return stamps;
+}
+__name(stampsFor, "stampsFor");
+function recordStateWrite(state, delta, key) {
+  const stamp = ++writeClock;
+  stampsFor(stateStamps, state).set(key, stamp);
+  if (delta && delta !== state) {
+    stampsFor(deltaStamps, delta).set(key, stamp);
+  }
+}
+__name(recordStateWrite, "recordStateWrite");
+function adoptDeltaStamp(state, delta, key) {
+  var _a;
+  const stamp = (_a = deltaStamps.get(delta)) == null ? void 0 : _a.get(key);
+  if (stamp !== void 0) {
+    stampsFor(stateStamps, state).set(key, stamp);
+  }
+}
+__name(adoptDeltaStamp, "adoptDeltaStamp");
+function shouldApplyDeltaWrite(state, delta, key) {
+  var _a, _b;
+  const written = (_a = deltaStamps.get(delta)) == null ? void 0 : _a.get(key);
+  const current = (_b = stateStamps.get(state)) == null ? void 0 : _b.get(key);
+  if (written !== void 0 && current !== void 0 && current > written) {
+    return false;
+  }
+  stampsFor(stateStamps, state).set(key, written != null ? written : ++writeClock);
+  return true;
+}
+__name(shouldApplyDeltaWrite, "shouldApplyDeltaWrite");
+function carryDeltaStamp(from, to, key) {
+  var _a;
+  const stamp = (_a = deltaStamps.get(from)) == null ? void 0 : _a.get(key);
+  if (stamp !== void 0) {
+    stampsFor(deltaStamps, to).set(key, stamp);
+  }
+}
+__name(carryDeltaStamp, "carryDeltaStamp");
+function carryDeltaStamps(from, to) {
+  const stamps = deltaStamps.get(from);
+  if (!stamps) {
+    return;
+  }
+  const carried = stampsFor(deltaStamps, to);
+  for (const [key, stamp] of stamps) {
+    carried.set(key, stamp);
+  }
+}
+__name(carryDeltaStamps, "carryDeltaStamps");
+export {
+  adoptDeltaStamp,
+  carryDeltaStamp,
+  carryDeltaStamps,
+  recordStateWrite,
+  shouldApplyDeltaWrite
+};

package/dist/esm/sessions/vertex_ai_session_service.js

@@ -2,6 +2,7 @@ import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __decorateClass = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
@@ -15,7 +16,7 @@ var __decorateClass = (decorators, target, key, kind) => {
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Client } from "@google-cloud/vertexai/build/src/genai/client.js";
+import { Client } from "@google-cloud/vertexai";
 import { isCompactedEvent } from "../events/compacted_event.js";
 import { experimental } from "../utils/experimental.js";
 import { logger } from "../utils/logger.js";
@@ -32,13 +33,17 @@ import { createSession } from "./session.js";
 const DEFAULT_MAX_ATTEMPTS = 30;
 const GRPC_NOT_FOUND = 5;
 const HTTP_NOT_FOUND = 404;
+const HTTP_BAD_REQUEST = 400;
+const WORKFLOW_CUSTOM_METADATA_KEY = "_workflow";
 function isVertexAiConnectionString(uri) {
   return (uri == null ? void 0 : uri.startsWith("vertexai://")) || false;
 }
+__name(isVertexAiConnectionString, "isVertexAiConnectionString");
 function quoteFilterLiteral(value) {
   const escaped = value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
   return `"${escaped}"`;
 }
+__name(quoteFilterLiteral, "quoteFilterLiteral");
 let VertexAiSessionService = class extends BaseSessionService {
   constructor(options) {
     super();
@@ -314,12 +319,17 @@ let VertexAiSessionService = class extends BaseSessionService {
     if (event.usageMetadata) {
       customMetadata._usage_metadata = event.usageMetadata;
     }
+    const workflowMetadata = toWorkflowMetadata(event);
+    if (workflowMetadata) {
+      customMetadata[WORKFLOW_CUSTOM_METADATA_KEY] = workflowMetadata;
+    }
     const config = partialCopy(event, [
-      "content",
-      "actions",
       "errorCode",
       "errorMessage"
     ]);
+    config.actions = toApiActions(event.actions);
+    const content = dropUnsupportedPartFields(event.content);
+    config.content = content;
     config.eventMetadata = {
       ...partialCopy(event, [
         "partial",
@@ -331,7 +341,7 @@ let VertexAiSessionService = class extends BaseSessionService {
       ]),
       customMetadata: Object.keys(customMetadata).length > 0 ? customMetadata : void 0
     };
-    config.rawEvent = JSON.parse(JSON.stringify(event));
+    config.rawEvent = JSON.parse(JSON.stringify({ ...event, content }));
     const params = {
       name: `reasoningEngines/${reasoningEngineId}/sessions/${session.id}`,
       author: event.author || "user",
@@ -342,27 +352,99 @@ let VertexAiSessionService = class extends BaseSessionService {
     try {
       await this.sessions.events.append(params);
     } catch (error) {
+      if (!isInvalidArgumentError(error)) {
+        throw error;
+      }
       logger.warn(
-        "Failed to append event with rawEvent, falling back...",
+        "Failed to append event with rawEvent; retrying without it. The event will be reconstructed from its structured fields and customMetadata on read.",
         error
       );
       delete config.rawEvent;
-      await this.sessions.events.append({
-        name: `reasoningEngines/${reasoningEngineId}/sessions/${session.id}`,
-        author: event.author || "user",
-        invocationId: event.invocationId || `inv-${Date.now()}`,
-        timestamp: new Date(event.timestamp).toISOString(),
-        config
-      });
+      await this.sessions.events.append(params);
     }
     return event;
   }
 };
+__name(VertexAiSessionService, "VertexAiSessionService");
 VertexAiSessionService = __decorateClass([
   experimental
 ], VertexAiSessionService);
+function toWorkflowMetadata(event) {
+  var _a, _b;
+  const metadata = {};
+  if (event.output !== void 0) {
+    metadata.output = event.output;
+  }
+  if (event.route !== void 0) {
+    metadata.route = event.route;
+  }
+  if (event.nodeInfo !== void 0) {
+    metadata.nodeInfo = event.nodeInfo;
+  }
+  if (event.isolationScope !== void 0) {
+    metadata.isolationScope = event.isolationScope;
+  }
+  if (((_a = event.actions) == null ? void 0 : _a.agentState) !== void 0) {
+    metadata.agentState = event.actions.agentState;
+  }
+  if (((_b = event.actions) == null ? void 0 : _b.endOfAgent) !== void 0) {
+    metadata.endOfAgent = event.actions.endOfAgent;
+  }
+  return Object.keys(metadata).length > 0 ? metadata : void 0;
+}
+__name(toWorkflowMetadata, "toWorkflowMetadata");
+function applyWorkflowMetadata(event, metadata) {
+  if (metadata.output !== void 0) {
+    event.output = metadata.output;
+  }
+  if (metadata.route !== void 0) {
+    event.route = metadata.route;
+  }
+  if (metadata.nodeInfo !== void 0) {
+    event.nodeInfo = metadata.nodeInfo;
+  }
+  if (metadata.isolationScope !== void 0) {
+    event.isolationScope = metadata.isolationScope;
+  }
+  if (metadata.agentState !== void 0) {
+    event.actions.agentState = metadata.agentState;
+  }
+  if (metadata.endOfAgent !== void 0) {
+    event.actions.endOfAgent = metadata.endOfAgent;
+  }
+}
+__name(applyWorkflowMetadata, "applyWorkflowMetadata");
+function toApiActions(actions) {
+  if (!actions) {
+    return void 0;
+  }
+  const { transferToAgent, ...rest } = actions;
+  return {
+    ...rest,
+    ...transferToAgent !== void 0 ? { transferAgent: transferToAgent } : {}
+  };
+}
+__name(toApiActions, "toApiActions");
+function dropUnsupportedPartFields(content) {
+  if (!(content == null ? void 0 : content.parts)) {
+    return content;
+  }
+  return {
+    ...content,
+    parts: content.parts.map((part) => {
+      const copy = { ...part };
+      delete copy.partMetadata;
+      return copy;
+    })
+  };
+}
+__name(dropUnsupportedPartFields, "dropUnsupportedPartFields");
+function isInvalidArgumentError(error) {
+  return (error == null ? void 0 : error.status) === HTTP_BAD_REQUEST;
+}
+__name(isInvalidArgumentError, "isInvalidArgumentError");
 function _fromApiEvent(apiEventObj) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const rawEvent = apiEventObj.rawEvent;
   if (rawEvent) {
     const event2 = JSON.parse(JSON.stringify(rawEvent));
@@ -379,7 +461,9 @@ function _fromApiEvent(apiEventObj) {
   let customMetadata = eventMetadata.customMetadata;
   let compactionData = null;
   let usageMetadataData = null;
+  let workflowData;
   if (customMetadata) {
+    customMetadata = { ...customMetadata };
     if (customMetadata._compaction) {
       compactionData = customMetadata._compaction;
       delete customMetadata._compaction;
@@ -388,6 +472,10 @@ function _fromApiEvent(apiEventObj) {
       usageMetadataData = customMetadata._usage_metadata;
       delete customMetadata._usage_metadata;
     }
+    if (customMetadata[WORKFLOW_CUSTOM_METADATA_KEY]) {
+      workflowData = customMetadata[WORKFLOW_CUSTOM_METADATA_KEY];
+      delete customMetadata[WORKFLOW_CUSTOM_METADATA_KEY];
+    }
     if (Object.keys(customMetadata).length === 0) {
       customMetadata = void 0;
     }
@@ -398,18 +486,20 @@ function _fromApiEvent(apiEventObj) {
     requestedAuthConfigs: actions.requestedAuthConfigs || {},
     requestedToolConfirmations: actions["requestedToolConfirmations"] || {},
     skipSummarization: actions["skipSummarization"],
-    transferToAgent: actions["transferAgent"],
+    // Earlier adk-js versions copied `event.actions` onto the request
+    // verbatim, so sessions they wrote store ADK's own `transferToAgent` key.
+    transferToAgent: (_b = actions["transferAgent"]) != null ? _b : actions["transferToAgent"],
     escalate: actions["escalate"],
     compaction: compactionData || void 0
   };
   const event = {
-    id: ((_b = apiEventObj.name) == null ? void 0 : _b.split("/").pop()) || "",
+    id: ((_c = apiEventObj.name) == null ? void 0 : _c.split("/").pop()) || "",
     invocationId: apiEventObj.invocationId || "",
     author: apiEventObj.author,
     actions: eventActions,
     content: apiEventObj.content,
     timestamp: apiEventObj.timestamp ? new Date(apiEventObj.timestamp).getTime() : Date.now(),
-    errorCode: (_c = apiEventObj.errorCode) == null ? void 0 : _c.toString(),
+    errorCode: (_d = apiEventObj.errorCode) == null ? void 0 : _d.toString(),
     errorMessage: apiEventObj.errorMessage,
     partial: eventMetadata["partial"],
     turnComplete: eventMetadata["turnComplete"],
@@ -417,6 +507,7 @@ function _fromApiEvent(apiEventObj) {
     branch: eventMetadata["branch"],
     customMetadata,
     longRunningToolIds: eventMetadata["longRunningToolIds"],
+    groundingMetadata: eventMetadata["groundingMetadata"],
     usageMetadata: usageMetadataData
   };
   if (compactionData) {
@@ -425,8 +516,12 @@ function _fromApiEvent(apiEventObj) {
     event.endTime = compactionData.endTime;
     event.compactedContent = compactionData.compactedContent;
   }
+  if (workflowData) {
+    applyWorkflowMetadata(event, workflowData);
+  }
   return event;
 }
+__name(_fromApiEvent, "_fromApiEvent");
 export {
   VertexAiSessionService,
   isVertexAiConnectionString,

package/dist/esm/skills/gcp_skill_registry.js

@@ -2,6 +2,7 @@ import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __decorateClass = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
@@ -70,6 +71,7 @@ let GCPSkillRegistry = class {
     return results;
   }
 };
+__name(GCPSkillRegistry, "GCPSkillRegistry");
 GCPSkillRegistry = __decorateClass([
   experimental
 ], GCPSkillRegistry);