@google/adk 0.4.0 → 0.6.0

package/dist/web/tools/preload_memory_tool.js

@@ -0,0 +1,75 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { appendInstructions } from "../models/llm_request.js";
+import { logger } from "../utils/logger.js";
+import {
+  BaseTool
+} from "./base_tool.js";
+class PreloadMemoryTool extends BaseTool {
+  constructor() {
+    super({
+      // Name and description are not used because this tool only
+      // changes llm_request.
+      name: "preload_memory",
+      description: "preload_memory"
+    });
+  }
+  async runAsync({
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    args,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    toolContext
+  }) {
+    throw new Error("PreloadMemoryTool should not be called by model");
+  }
+  async processLlmRequest(request) {
+    var _a, _b, _c;
+    await super.processLlmRequest(request);
+    const userContent = request.toolContext.userContent;
+    if (!userContent || !userContent.parts || !((_a = userContent.parts[0]) == null ? void 0 : _a.text)) {
+      return;
+    }
+    const userQuery = userContent.parts[0].text;
+    let response;
+    try {
+      if (!request.toolContext.invocationContext.memoryService) {
+        return;
+      }
+      response = await request.toolContext.searchMemory(userQuery);
+    } catch (_) {
+      logger.warn("Failed to preload memory for query: ".concat(userQuery));
+      return;
+    }
+    if (!response.memories || response.memories.length === 0) {
+      return;
+    }
+    const memoryTextLines = [];
+    for (const memory of response.memories) {
+      const timeStr = memory.timestamp ? "Time: ".concat(memory.timestamp) : "";
+      if (timeStr) memoryTextLines.push(timeStr);
+      const memoryText = (_c = (_b = memory.content.parts) == null ? void 0 : _b.map((p) => {
+        var _a2;
+        return (_a2 = p.text) != null ? _a2 : "";
+      }).join(" ")) != null ? _c : "";
+      if (memoryText) {
+        memoryTextLines.push(
+          memory.author ? "".concat(memory.author, ": ").concat(memoryText) : memoryText
+        );
+      }
+    }
+    if (memoryTextLines.length === 0) {
+      return;
+    }
+    const fullMemoryText = memoryTextLines.join("\n");
+    const si = "The following content is from your previous conversations with the user.\nThey may be useful for answering the user's current query.\n<PAST_CONVERSATIONS>\n".concat(fullMemoryText, "\n</PAST_CONVERSATIONS>\n");
+    appendInstructions(request.llmRequest, [si]);
+  }
+}
+const PRELOAD_MEMORY = new PreloadMemoryTool();
+export {
+  PRELOAD_MEMORY,
+  PreloadMemoryTool
+};

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,69 @@ 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 */
+      },
+      level: "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 +85,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 +95,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.6.0";
 export {
   version
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/adk",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "Google ADK JS",
   "author": "Google",
   "license": "Apache-2.0",
@@ -37,7 +37,7 @@
     "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",
@@ -45,15 +45,18 @@
     "@mikro-orm/core": "^6.6.6",
     "@mikro-orm/reflection": "^6.6.6",
     "@modelcontextprotocol/sdk": "^1.26.0",
+    "express": "^4.22.1",
     "google-auth-library": "^10.3.0",
     "lodash-es": "^4.17.23",
+    "winston": "^3.19.0",
     "zod": "^4.2.1",
     "zod-to-json-schema": "^3.25.1"
   },
   "devDependencies": {
+    "@mikro-orm/sqlite": "^6.6.6",
+    "@types/express": "^4.17.25",
     "@types/lodash-es": "^4.17.12",
-    "openapi-types": "^12.1.3",
-    "@mikro-orm/sqlite": "^6.6.6"
+    "openapi-types": "^12.1.3"
   },
   "peerDependencies": {
     "@google-cloud/opentelemetry-cloud-monitoring-exporter": "^0.21.0",

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>;
-}

package/dist/web/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
-};