@google/adk 0.3.0 → 0.5.0

package/dist/web/sessions/in_memory_session_service.js

@@ -7,10 +7,14 @@ import { cloneDeep } from "lodash-es";
 import { randomUUID } from "../utils/env_aware_utils.js";
 import { logger } from "../utils/logger.js";
 import {
-  BaseSessionService
+  BaseSessionService,
+  mergeStates
 } from "./base_session_service.js";
 import { createSession } from "./session.js";
 import { State } from "./state.js";
+function isInMemoryConnectionString(uri) {
+  return uri === "memory://";
+}
 class InMemorySessionService extends BaseSessionService {
   constructor() {
     super(...arguments);
@@ -28,12 +32,13 @@ class InMemorySessionService extends BaseSessionService {
      */
     this.appState = {};
   }
-  createSession({
+  async createSession({
     appName,
     userId,
     state,
     sessionId
   }) {
+    var _a;
     const session = createSession({
       id: sessionId || randomUUID(),
       appName,
@@ -49,16 +54,21 @@ class InMemorySessionService extends BaseSessionService {
       this.sessions[appName][userId] = {};
     }
     this.sessions[appName][userId][session.id] = session;
-    return Promise.resolve(
-      this.mergeState(appName, userId, cloneDeep(session))
+    const copiedSession = cloneDeep(session);
+    copiedSession.state = mergeStates(
+      this.appState[appName],
+      (_a = this.userState[appName]) == null ? void 0 : _a[userId],
+      copiedSession.state
     );
+    return copiedSession;
   }
-  getSession({
+  async getSession({
     appName,
     userId,
     sessionId,
     config
   }) {
+    var _a;
     if (!this.sessions[appName] || !this.sessions[appName][userId] || !this.sessions[appName][userId][sessionId]) {
       return Promise.resolve(void 0);
     }
@@ -83,7 +93,12 @@ class InMemorySessionService extends BaseSessionService {
         }
       }
     }
-    return Promise.resolve(this.mergeState(appName, userId, copiedSession));
+    copiedSession.state = mergeStates(
+      this.appState[appName],
+      (_a = this.userState[appName]) == null ? void 0 : _a[userId],
+      copiedSession.state
+    );
+    return copiedSession;
   }
   listSessions({
     appName,
@@ -160,21 +175,8 @@ class InMemorySessionService extends BaseSessionService {
     storageSession.lastUpdateTime = event.timestamp;
     return event;
   }
-  mergeState(appName, userId, copiedSession) {
-    if (this.appState[appName]) {
-      for (const key of Object.keys(this.appState[appName])) {
-        copiedSession.state[State.APP_PREFIX + key] = this.appState[appName][key];
-      }
-    }
-    if (!this.userState[appName] || !this.userState[appName][userId]) {
-      return copiedSession;
-    }
-    for (const key of Object.keys(this.userState[appName][userId])) {
-      copiedSession.state[State.USER_PREFIX + key] = this.userState[appName][userId][key];
-    }
-    return copiedSession;
-  }
 }
 export {
-  InMemorySessionService
+  InMemorySessionService,
+  isInMemoryConnectionString
 };

package/dist/web/sessions/registry.js

@@ -0,0 +1,25 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import {
+  DatabaseSessionService,
+  isDatabaseConnectionString
+} from "./database_session_service.js";
+import {
+  InMemorySessionService,
+  isInMemoryConnectionString
+} from "./in_memory_session_service.js";
+function getSessionServiceFromUri(uri) {
+  if (isInMemoryConnectionString(uri)) {
+    return new InMemorySessionService();
+  }
+  if (isDatabaseConnectionString(uri)) {
+    return new DatabaseSessionService(uri);
+  }
+  throw new Error("Unsupported session service URI: ".concat(uri));
+}
+export {
+  getSessionServiceFromUri
+};

package/dist/web/tools/base_tool.js

@@ -54,6 +54,9 @@ class BaseTool {
     if (!functionDeclaration) {
       return;
     }
+    if (this.name in llmRequest.toolsDict) {
+      throw new Error("Duplicate tool name: ".concat(this.name));
+    }
     llmRequest.toolsDict[this.name] = this;
     const tool = findToolWithFunctionDeclarations(llmRequest);
     if (tool) {

package/dist/web/tools/base_toolset.js

@@ -3,9 +3,17 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+var _a;
+const BASE_TOOLSET_SIGNATURE_SYMBOL = Symbol.for("google.adk.baseToolset");
+function isBaseToolset(obj) {
+  return typeof obj === "object" && obj !== null && BASE_TOOLSET_SIGNATURE_SYMBOL in obj && obj[BASE_TOOLSET_SIGNATURE_SYMBOL] === true;
+}
+_a = BASE_TOOLSET_SIGNATURE_SYMBOL;
 class BaseToolset {
-  constructor(toolFilter) {
+  constructor(toolFilter, prefix) {
     this.toolFilter = toolFilter;
+    this.prefix = prefix;
+    this[_a] = true;
   }
   /**
    * Returns whether the tool should be exposed to LLM.
@@ -42,5 +50,6 @@ class BaseToolset {
   }
 }
 export {
-  BaseToolset
+  BaseToolset,
+  isBaseToolset
 };

package/dist/web/tools/exit_loop_tool.js

@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { BaseTool } from "./base_tool.js";
+class ExitLoopTool extends BaseTool {
+  constructor() {
+    super({
+      name: "exit_loop",
+      description: "Exits the loop.\n\nCall this function only when you are instructed to do so."
+    });
+  }
+  _getDeclaration() {
+    return {
+      name: this.name,
+      description: this.description
+    };
+  }
+  async runAsync({
+    toolContext
+  }) {
+    toolContext.actions.escalate = true;
+    toolContext.actions.skipSummarization = true;
+    return "";
+  }
+}
+const EXIT_LOOP = new ExitLoopTool();
+export {
+  EXIT_LOOP,
+  ExitLoopTool
+};

package/dist/web/tools/forwarding_artifact_service.js

@@ -35,6 +35,22 @@ class ForwardingArtifactService {
       request
     );
   }
+  listArtifactVersions(request) {
+    if (!this.toolContext.invocationContext.artifactService) {
+      throw new Error("Artifact service is not initialized.");
+    }
+    return this.toolContext.invocationContext.artifactService.listArtifactVersions(
+      request
+    );
+  }
+  getArtifactVersion(request) {
+    if (!this.toolContext.invocationContext.artifactService) {
+      throw new Error("Artifact service is not initialized.");
+    }
+    return this.toolContext.invocationContext.artifactService.getArtifactVersion(
+      request
+    );
+  }
 }
 export {
   ForwardingArtifactService

package/dist/web/tools/mcp/mcp_toolset.js

@@ -1,3 +1,22 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -8,8 +27,8 @@ import { BaseToolset } from "../base_toolset.js";
 import { MCPSessionManager } from "./mcp_session_manager.js";
 import { MCPTool } from "./mcp_tool.js";
 class MCPToolset extends BaseToolset {
-  constructor(connectionParams, toolFilter = []) {
-    super(toolFilter);
+  constructor(connectionParams, toolFilter = [], prefix) {
+    super(toolFilter, prefix);
     this.mcpSessionManager = new MCPSessionManager(connectionParams);
   }
   async getTools() {
@@ -19,9 +38,12 @@ class MCPToolset extends BaseToolset {
     for (const tool of listResult.tools) {
       logger.debug("tool: ".concat(tool.name));
     }
-    return listResult.tools.map(
-      (tool) => new MCPTool(tool, this.mcpSessionManager)
-    );
+    return listResult.tools.map((tool) => {
+      const toolWithPrefix = __spreadProps(__spreadValues({}, tool), {
+        name: this.prefix ? "".concat(this.prefix, "_").concat(tool.name) : tool.name
+      });
+      return new MCPTool(toolWithPrefix, this.mcpSessionManager);
+    });
   }
   async close() {
   }

package/dist/web/utils/env_aware_utils.js

@@ -40,9 +40,17 @@ function isBase64Encoded(data) {
     return false;
   }
 }
+function getBooleanEnvVar(envVar) {
+  if (!process.env) {
+    return false;
+  }
+  const envVarValue = (process.env[envVar] || "").toLowerCase();
+  return ["true", "1"].includes(envVarValue);
+}
 export {
   base64Decode,
   base64Encode,
+  getBooleanEnvVar,
   isBase64Encoded,
   isBrowser,
   randomUUID

package/dist/web/utils/logger.js

@@ -3,6 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import * as winston from "winston";
 var LogLevel = /* @__PURE__ */ ((LogLevel2) => {
   LogLevel2[LogLevel2["DEBUG"] = 0] = "DEBUG";
   LogLevel2[LogLevel2["INFO"] = 1] = "INFO";
@@ -10,58 +11,68 @@ var LogLevel = /* @__PURE__ */ ((LogLevel2) => {
   LogLevel2[LogLevel2["ERROR"] = 3] = "ERROR";
   return LogLevel2;
 })(LogLevel || {});
-let logLevel = 1 /* INFO */;
-function setLogLevel(level) {
-  logLevel = level;
-}
 class SimpleLogger {
-  log(level, ...args) {
-    if (level < logLevel) {
+  constructor() {
+    this.logLevel = 1 /* INFO */;
+    this.logger = winston.createLogger({
+      levels: {
+        "debug": 0 /* DEBUG */,
+        "info": 1 /* INFO */,
+        "warn": 2 /* WARN */,
+        "error": 3 /* ERROR */
+      },
+      format: winston.format.combine(
+        winston.format.label({ label: "ADK" }),
+        winston.format((info) => {
+          info.level = info.level.toUpperCase();
+          return info;
+        })(),
+        winston.format.colorize(),
+        winston.format.timestamp(),
+        winston.format.printf((info) => {
+          return "".concat(info.level, ": [").concat(info.label, "] ").concat(info.timestamp, " ").concat(info.message);
+        })
+      ),
+      transports: [new winston.transports.Console()]
+    });
+  }
+  setLogLevel(level) {
+    this.logLevel = level;
+  }
+  log(level, ...messages) {
+    if (this.logLevel > level) {
       return;
     }
-    switch (level) {
-      case 0 /* DEBUG */:
-        this.debug(...args);
-        break;
-      case 1 /* INFO */:
-        this.info(...args);
-        break;
-      case 2 /* WARN */:
-        this.warn(...args);
-        break;
-      case 3 /* ERROR */:
-        this.error(...args);
-        break;
-      default:
-        throw new Error("Unsupported log level: ".concat(level));
-    }
+    this.logger.log(level.toString(), messages.join(" "));
   }
-  debug(...args) {
-    if (logLevel > 0 /* DEBUG */) {
+  debug(...messages) {
+    if (this.logLevel > 0 /* DEBUG */) {
       return;
     }
-    console.debug(getColoredPrefix(0 /* DEBUG */), ...args);
+    this.logger.debug(messages.join(" "));
   }
-  info(...args) {
-    if (logLevel > 1 /* INFO */) {
+  info(...messages) {
+    if (this.logLevel > 1 /* INFO */) {
       return;
     }
-    console.info(getColoredPrefix(1 /* INFO */), ...args);
+    this.logger.info(messages.join(" "));
   }
-  warn(...args) {
-    if (logLevel > 2 /* WARN */) {
+  warn(...messages) {
+    if (this.logLevel > 2 /* WARN */) {
       return;
     }
-    console.warn(getColoredPrefix(2 /* WARN */), ...args);
+    this.logger.warn(messages.join(" "));
   }
-  error(...args) {
-    if (logLevel > 3 /* ERROR */) {
+  error(...messages) {
+    if (this.logLevel > 3 /* ERROR */) {
       return;
     }
-    console.error(getColoredPrefix(3 /* ERROR */), ...args);
+    this.logger.error(messages.join(" "));
   }
 }
 class NoOpLogger {
+  setLogLevel(_level) {
+  }
   log(_level, ..._args) {
   }
   debug(..._args) {
@@ -73,26 +84,6 @@ class NoOpLogger {
   error(..._args) {
   }
 }
-const LOG_LEVEL_STR = {
-  [0 /* DEBUG */]: "DEBUG",
-  [1 /* INFO */]: "INFO",
-  [2 /* WARN */]: "WARN",
-  [3 /* ERROR */]: "ERROR"
-};
-const CONSOLE_COLOR_MAP = {
-  [0 /* DEBUG */]: "\x1B[34m",
-  // Blue
-  [1 /* INFO */]: "\x1B[32m",
-  // Green
-  [2 /* WARN */]: "\x1B[33m",
-  // Yellow
-  [3 /* ERROR */]: "\x1B[31m"
-  // Red
-};
-const RESET_COLOR = "\x1B[0m";
-function getColoredPrefix(level) {
-  return "".concat(CONSOLE_COLOR_MAP[level], "[ADK ").concat(LOG_LEVEL_STR[level], "]:").concat(RESET_COLOR);
-}
 let currentLogger = new SimpleLogger();
 function setLogger(customLogger) {
   currentLogger = customLogger != null ? customLogger : new NoOpLogger();
@@ -103,7 +94,13 @@ function getLogger() {
 function resetLogger() {
   currentLogger = new SimpleLogger();
 }
+function setLogLevel(level) {
+  logger.setLogLevel(level);
+}
 const logger = {
+  setLogLevel(level) {
+    currentLogger.setLogLevel(level);
+  },
   log(level, ...args) {
     currentLogger.log(level, ...args);
   },

package/dist/web/utils/object_notation_utils.js

@@ -0,0 +1,47 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+function toCamelCase(obj, preserveKeys = []) {
+  return toNotation(obj, toCamelCaseKey, "", preserveKeys);
+}
+function toSnakeCase(obj, preserveKeys = []) {
+  return toNotation(obj, toSnakeCaseKey, "", preserveKeys);
+}
+const toCamelCaseKey = (key) => key.replace(
+  /_([a-z])/g,
+  (_match, letter) => letter.toUpperCase()
+);
+const toSnakeCaseKey = (key) => key.replace(/[A-Z]/g, (g) => "_" + g.toLowerCase());
+function toNotation(obj, converter, parentKey = "", preserveKeys = []) {
+  if (Array.isArray(obj)) {
+    return obj.map(
+      (item) => toNotation(item, converter, parentKey, preserveKeys)
+    );
+  }
+  if (typeof obj === "object" && obj !== null) {
+    const source = obj;
+    const result = {};
+    for (const key of Object.keys(source)) {
+      const convertedKey = converter(key);
+      const fullPath = parentKey !== "" ? parentKey + "." + key : key;
+      if (preserveKeys.includes(fullPath)) {
+        result[convertedKey] = source[key];
+      } else {
+        result[convertedKey] = toNotation(
+          source[key],
+          converter,
+          fullPath,
+          preserveKeys
+        );
+      }
+    }
+    return result;
+  }
+  return obj;
+}
+export {
+  toCamelCase,
+  toSnakeCase
+};

package/dist/web/utils/variant_utils.js

@@ -3,6 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { getBooleanEnvVar } from "./env_aware_utils.js";
 var GoogleLLMVariant = /* @__PURE__ */ ((GoogleLLMVariant2) => {
   GoogleLLMVariant2["VERTEX_AI"] = "VERTEX_AI";
   GoogleLLMVariant2["GEMINI_API"] = "GEMINI_API";
@@ -11,13 +12,6 @@ var GoogleLLMVariant = /* @__PURE__ */ ((GoogleLLMVariant2) => {
 function getGoogleLlmVariant() {
   return getBooleanEnvVar("GOOGLE_GENAI_USE_VERTEXAI") ? "VERTEX_AI" /* VERTEX_AI */ : "GEMINI_API" /* GEMINI_API */;
 }
-function getBooleanEnvVar(envVar) {
-  if (!process.env) {
-    return false;
-  }
-  const envVarValue = (process.env[envVar] || "").toLowerCase();
-  return ["true", "1"].includes(envVarValue);
-}
 export {
   GoogleLLMVariant,
   getGoogleLlmVariant

package/dist/web/version.js

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-const version = "0.3.0";
+const version = "0.5.0";
 export {
   version
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/adk",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "Google ADK JS",
   "author": "Google",
   "license": "Apache-2.0",
@@ -40,8 +40,12 @@
     "prepublishOnly": "npm run build:bundle"
   },
   "dependencies": {
+    "@a2a-js/sdk": "^0.3.10",
+    "winston": "^3.19.0",
     "@google/genai": "^1.37.0",
-    "@modelcontextprotocol/sdk": "^1.24.0",
+    "@mikro-orm/core": "^6.6.6",
+    "@mikro-orm/reflection": "^6.6.6",
+    "@modelcontextprotocol/sdk": "^1.26.0",
     "google-auth-library": "^10.3.0",
     "lodash-es": "^4.17.23",
     "zod": "^4.2.1",
@@ -49,12 +53,18 @@
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",
-    "openapi-types": "^12.1.3"
+    "openapi-types": "^12.1.3",
+    "@mikro-orm/sqlite": "^6.6.6"
   },
   "peerDependencies": {
     "@google-cloud/opentelemetry-cloud-monitoring-exporter": "^0.21.0",
     "@google-cloud/opentelemetry-cloud-trace-exporter": "^3.0.0",
     "@google-cloud/storage": "^7.17.1",
+    "@mikro-orm/mariadb": "^6.6.6",
+    "@mikro-orm/mssql": "^6.6.6",
+    "@mikro-orm/mysql": "^6.6.6",
+    "@mikro-orm/postgresql": "^6.6.6",
+    "@mikro-orm/sqlite": "^6.6.6",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/api-logs": "^0.205.0",
     "@opentelemetry/exporter-logs-otlp-http": "^0.205.0",

package/dist/cjs/agents/callback_context.js

@@ -1,101 +0,0 @@
-/**
-  * @license
-  * Copyright 2025 Google LLC
-  * SPDX-License-Identifier: Apache-2.0
-  */
-
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var callback_context_exports = {};
-__export(callback_context_exports, {
-  CallbackContext: () => CallbackContext
-});
-module.exports = __toCommonJS(callback_context_exports);
-var import_event_actions = require("../events/event_actions.js");
-var import_state = require("../sessions/state.js");
-var import_readonly_context = require("./readonly_context.js");
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-class CallbackContext extends import_readonly_context.ReadonlyContext {
-  constructor({
-    invocationContext,
-    eventActions
-  }) {
-    super(invocationContext);
-    this.eventActions = eventActions || (0, import_event_actions.createEventActions)();
-    this._state = new import_state.State(
-      invocationContext.session.state,
-      this.eventActions.stateDelta
-    );
-  }
-  /**
-   * The delta-aware state of the current session.
-   */
-  get state() {
-    return this._state;
-  }
-  /**
-   * Loads an artifact attached to the current session.
-   *
-   * @param filename The filename of the artifact.
-   * @param version The version of the artifact. If not provided, the latest
-   *     version will be used.
-   * @return A promise that resolves to the loaded artifact.
-   */
-  loadArtifact(filename, version) {
-    if (!this.invocationContext.artifactService) {
-      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
-    });
-  }
-  /**
-   * Saves an artifact attached to the current session.
-   *
-   * @param filename The filename of the artifact.
-   * @param artifact The artifact to save.
-   * @return A promise that resolves to the version of the saved artifact.
-   */
-  async saveArtifact(filename, artifact) {
-    if (!this.invocationContext.artifactService) {
-      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
-    });
-    this.eventActions.artifactDelta[filename] = version;
-    return version;
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  CallbackContext
-});