@google/adk 0.4.0 → 0.5.0

package/dist/web/models/llm_response.js

@@ -12,6 +12,7 @@ function createLlmResponse(response) {
       return {
         content: candidate.content,
         groundingMetadata: candidate.groundingMetadata,
+        citationMetadata: candidate.citationMetadata,
         usageMetadata,
         finishReason: candidate.finishReason
       };
@@ -20,6 +21,7 @@ function createLlmResponse(response) {
       errorCode: candidate.finishReason,
       errorMessage: candidate.finishMessage,
       usageMetadata,
+      citationMetadata: candidate.citationMetadata,
       finishReason: candidate.finishReason
     };
   }

package/dist/web/plugins/base_plugin.js

@@ -198,7 +198,7 @@ class BasePlugin {
      * Callback executed when a tool call encounters an error.
       tool: BaseTool;
       toolArgs: Record<string, unknown>;
-      toolContext: ToolContext;
+      toolContext: Context;
       result: Record<string, unknown>;
     }): Promise<Record<string, unknown> | undefined> {
       return;

package/dist/web/runner/runner.js

@@ -310,7 +310,7 @@ class Runner {
       return rootAgent.findAgent(event.author) || rootAgent;
     }
     for (let i = session.events.length - 1; i >= 0; i--) {
-      logger.info("event: ", JSON.stringify(session.events[i]));
+      logger.info("event:", JSON.stringify(session.events[i]));
       const event2 = session.events[i];
       if (event2.author === "user" || !event2.author) {
         continue;

package/dist/web/sessions/database_session_service.js

@@ -57,7 +57,7 @@ class DatabaseSessionService extends BaseSessionService {
     super();
     this.initialized = false;
     if (typeof connectionStringOrOptions === "string") {
-      this.options = getConnectionOptionsFromUri(connectionStringOrOptions);
+      this.connectionString = connectionStringOrOptions;
     } else {
       if (!connectionStringOrOptions.driver) {
         throw new Error("Driver is required when passing options object.");
@@ -71,6 +71,9 @@ class DatabaseSessionService extends BaseSessionService {
     if (this.initialized) {
       return;
     }
+    if (this.connectionString && (!this.options || !this.options.driver)) {
+      this.options = await getConnectionOptionsFromUri(this.connectionString);
+    }
     this.orm = await MikroORM.init(this.options);
     await ensureDatabaseCreated(this.orm);
     await validateDatabaseSchemaVersion(this.orm);

package/dist/web/sessions/db/operations.js

@@ -1,31 +1,53 @@
+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 __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 __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
+));
 /**
  * @license
  * Copyright 2026 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 import { MikroORM } from "@mikro-orm/core";
-import { MariaDbDriver } from "@mikro-orm/mariadb";
-import { MsSqlDriver } from "@mikro-orm/mssql";
-import { MySqlDriver } from "@mikro-orm/mysql";
-import { PostgreSqlDriver } from "@mikro-orm/postgresql";
-import { SqliteDriver } from "@mikro-orm/sqlite";
 import {
   ENTITIES,
   SCHEMA_VERSION_1_JSON,
   SCHEMA_VERSION_KEY,
   StorageMetadata
 } from "./schema.js";
-function getConnectionOptionsFromUri(uri) {
+async function getConnectionOptionsFromUri(uri) {
   let driver;
   if (uri.startsWith("postgres://") || uri.startsWith("postgresql://")) {
+    const { PostgreSqlDriver } = await Promise.resolve().then(() => __toESM(require("@mikro-orm/postgresql"), 1));
     driver = PostgreSqlDriver;
   } else if (uri.startsWith("mysql://")) {
+    const { MySqlDriver } = await Promise.resolve().then(() => __toESM(require("@mikro-orm/mysql"), 1));
     driver = MySqlDriver;
   } else if (uri.startsWith("mariadb://")) {
+    const { MariaDbDriver } = await Promise.resolve().then(() => __toESM(require("@mikro-orm/mariadb"), 1));
     driver = MariaDbDriver;
   } else if (uri.startsWith("sqlite://")) {
+    const { SqliteDriver } = await Promise.resolve().then(() => __toESM(require("@mikro-orm/sqlite"), 1));
     driver = SqliteDriver;
   } else if (uri.startsWith("mssql://")) {
+    const { MsSqlDriver } = await Promise.resolve().then(() => __toESM(require("@mikro-orm/mssql"), 1));
     driver = MsSqlDriver;
   } else {
     throw new Error("Unsupported database URI: ".concat(uri));
@@ -54,7 +76,9 @@ async function ensureDatabaseCreated(ormOrUrlOrOptions) {
   if (ormOrUrlOrOptions instanceof MikroORM) {
     orm = ormOrUrlOrOptions;
   } else if (typeof ormOrUrlOrOptions === "string") {
-    orm = await MikroORM.init(getConnectionOptionsFromUri(ormOrUrlOrOptions));
+    orm = await MikroORM.init(
+      await getConnectionOptionsFromUri(ormOrUrlOrOptions)
+    );
   } else {
     orm = await MikroORM.init(ormOrUrlOrOptions);
   }

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/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/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/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/adk",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Google ADK JS",
   "author": "Google",
   "license": "Apache-2.0",
@@ -37,10 +37,11 @@
     "test": "vitest",
     "lint": "eslint 'src/**/*.ts'",
     "format": "prettier --write 'src/**/*.ts'",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build:bundle"
   },
   "dependencies": {
     "@a2a-js/sdk": "^0.3.10",
+    "winston": "^3.19.0",
     "@google/genai": "^1.37.0",
     "@mikro-orm/core": "^6.6.6",
     "@mikro-orm/reflection": "^6.6.6",

package/dist/cjs/agents/callback_context.js

@@ -1,101 +0,0 @@
-/**
-  * @license
-  * Copyright 2026 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
-});

package/dist/esm/agents/callback_context.js

@@ -1,71 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-import { createEventActions } from "../events/event_actions.js";
-import { State } from "../sessions/state.js";
-import { ReadonlyContext } from "./readonly_context.js";
-class CallbackContext extends ReadonlyContext {
-  constructor({
-    invocationContext,
-    eventActions
-  }) {
-    super(invocationContext);
-    this.eventActions = eventActions || createEventActions();
-    this._state = new 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;
-  }
-}
-export {
-  CallbackContext
-};

package/dist/types/agents/callback_context.d.ts

@@ -1,42 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-import { Part } from '@google/genai';
-import { EventActions } from '../events/event_actions.js';
-import { State } from '../sessions/state.js';
-import { InvocationContext } from './invocation_context.js';
-import { ReadonlyContext } from './readonly_context.js';
-/**
- * The context of various callbacks within an agent run.
- */
-export declare class CallbackContext extends ReadonlyContext {
-    private readonly _state;
-    readonly eventActions: EventActions;
-    constructor({ invocationContext, eventActions, }: {
-        invocationContext: InvocationContext;
-        eventActions?: EventActions;
-    });
-    /**
-     * The delta-aware state of the current session.
-     */
-    get state(): 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: string, version?: number): Promise<Part | undefined>;
-    /**
-     * 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.
-     */
-    saveArtifact(filename: string, artifact: Part): Promise<number>;
-}