@google/adk 1.6.0 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/adk",
-  "version": "1.6.0",
+  "version": "2.1.0",
   "description": "Google ADK JS",
   "author": "Google",
   "license": "Apache-2.0",
@@ -22,10 +22,46 @@
   "exports": {
     ".": {
       "types": "./dist/types/index.d.ts",
+      "browser": "./dist/web/index_web.js",
       "import": "./dist/esm/index.js",
       "require": "./dist/cjs/index.js",
       "default": "./dist/esm/index.js"
-    }
+    },
+    "./dist/web/*": {
+      "types": "./dist/types/*",
+      "default": "./dist/web/*"
+    },
+    "./a2a": {
+      "types": "./dist/types/a2a/index.d.ts",
+      "import": "./dist/esm/a2a/index.js",
+      "require": "./dist/cjs/a2a/index.js",
+      "default": "./dist/esm/a2a/index.js"
+    },
+    "./artifacts/gcs": {
+      "types": "./dist/types/artifacts/gcs_artifact_service.d.ts",
+      "import": "./dist/esm/artifacts/gcs_artifact_service.js",
+      "require": "./dist/cjs/artifacts/gcs_artifact_service.js",
+      "default": "./dist/esm/artifacts/gcs_artifact_service.js"
+    },
+    "./sessions/database": {
+      "types": "./dist/types/sessions/database_session_service.d.ts",
+      "import": "./dist/esm/sessions/database_session_service.js",
+      "require": "./dist/cjs/sessions/database_session_service.js",
+      "default": "./dist/esm/sessions/database_session_service.js"
+    },
+    "./telemetry/gcp": {
+      "types": "./dist/types/telemetry/google_cloud.d.ts",
+      "import": "./dist/esm/telemetry/google_cloud.js",
+      "require": "./dist/cjs/telemetry/google_cloud.js",
+      "default": "./dist/esm/telemetry/google_cloud.js"
+    },
+    "./tools/mcp": {
+      "types": "./dist/types/tools/mcp/index.d.ts",
+      "import": "./dist/esm/tools/mcp/index.js",
+      "require": "./dist/cjs/tools/mcp/index.js",
+      "default": "./dist/esm/tools/mcp/index.js"
+    },
+    "./package.json": "./package.json"
   },
   "scripts": {
     "clean": "rm -rf dist",
@@ -41,27 +77,22 @@
   },
   "dependencies": {
     "@a2a-js/sdk": "^0.3.10",
-    "@google-cloud/opentelemetry-cloud-monitoring-exporter": "^0.21.0",
-    "@google-cloud/opentelemetry-cloud-trace-exporter": "^3.0.0",
-    "@google-cloud/storage": "^7.17.1",
     "@google-cloud/vertexai": "^1.12.0",
     "@google/genai": "^2.9.0",
-    "@mikro-orm/core": "^6.6.10",
-    "@mikro-orm/reflection": "^6.6.6",
-    "@modelcontextprotocol/sdk": "^1.26.0",
+    "@mikro-orm/core": "^7.2.0",
     "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/api-logs": "^0.205.0",
-    "@opentelemetry/exporter-logs-otlp-http": "^0.205.0",
-    "@opentelemetry/exporter-metrics-otlp-http": "^0.205.0",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.205.0",
+    "@opentelemetry/api-logs": "^0.222.0",
+    "@opentelemetry/exporter-logs-otlp-http": "^0.222.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "^0.222.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.222.0",
     "@opentelemetry/resource-detector-gcp": "^0.40.0",
     "@opentelemetry/resources": "^2.1.0",
-    "@opentelemetry/sdk-logs": "^0.205.0",
+    "@opentelemetry/sdk-logs": "^0.222.0",
     "@opentelemetry/sdk-metrics": "^2.1.0",
     "@opentelemetry/sdk-trace-base": "^2.1.0",
     "@opentelemetry/sdk-trace-node": "^2.1.0",
+    "@types/dockerode": "^4.0.1",
     "adm-zip": "^0.5.17",
-    "express": "^4.22.1",
     "google-auth-library": "^10.3.0",
     "js-yaml": "^4.1.1",
     "jsonpath-plus": "^10.4.0",
@@ -70,18 +101,64 @@
     "zod": "^4.2.1",
     "zod-to-json-schema": "^3.25.1"
   },
+  "optionalDependencies": {
+    "dockerode": "^5.0.1"
+  },
   "devDependencies": {
-    "@mikro-orm/sqlite": "^6.6.6",
+    "@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/sqlite": "^7.2.0",
+    "@modelcontextprotocol/sdk": "^1.26.0",
+    "@opentelemetry/context-async-hooks": "^2.1.0",
     "@types/adm-zip": "^0.5.8",
     "@types/express": "^4.17.25",
     "@types/lodash-es": "^4.17.12",
+    "express": "^4.22.1",
     "openapi-types": "^12.1.3"
   },
   "peerDependencies": {
-    "@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"
+    "@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": "^7.2.0",
+    "@mikro-orm/mssql": "^7.2.0",
+    "@mikro-orm/mysql": "^7.2.0",
+    "@mikro-orm/postgresql": "^7.2.0",
+    "@mikro-orm/sqlite": "^7.2.0",
+    "@modelcontextprotocol/sdk": "^1.26.0",
+    "express": "^4.22.1 || ^5.1.0"
+  },
+  "peerDependenciesMeta": {
+    "@google-cloud/opentelemetry-cloud-monitoring-exporter": {
+      "optional": true
+    },
+    "@google-cloud/opentelemetry-cloud-trace-exporter": {
+      "optional": true
+    },
+    "@google-cloud/storage": {
+      "optional": true
+    },
+    "@mikro-orm/mariadb": {
+      "optional": true
+    },
+    "@mikro-orm/mssql": {
+      "optional": true
+    },
+    "@mikro-orm/mysql": {
+      "optional": true
+    },
+    "@mikro-orm/postgresql": {
+      "optional": true
+    },
+    "@mikro-orm/sqlite": {
+      "optional": true
+    },
+    "@modelcontextprotocol/sdk": {
+      "optional": true
+    },
+    "express": {
+      "optional": true
+    }
   }
 }

package/dist/web/a2a/a2a_event.js

@@ -1,271 +0,0 @@
-import {createRequire as topLevelCreateRequire} from 'module';
-const require = topLevelCreateRequire(import.meta.url);
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-import { randomUUID } from "../utils/env_aware_utils.js";
-var MessageRole = /* @__PURE__ */ ((MessageRole2) => {
-  MessageRole2["USER"] = "user";
-  MessageRole2["AGENT"] = "agent";
-  return MessageRole2;
-})(MessageRole || {});
-var TaskState = /* @__PURE__ */ ((TaskState2) => {
-  TaskState2["SUBMITTED"] = "submitted";
-  TaskState2["WORKING"] = "working";
-  TaskState2["COMPLETED"] = "completed";
-  TaskState2["FAILED"] = "failed";
-  TaskState2["CANCELED"] = "canceled";
-  TaskState2["REJECTED"] = "rejected";
-  TaskState2["INPUT_REQUIRED"] = "input-required";
-  return TaskState2;
-})(TaskState || {});
-function isTaskStatusUpdateEvent(event) {
-  return (event == null ? void 0 : event.kind) === "status-update";
-}
-function isTaskArtifactUpdateEvent(event) {
-  return (event == null ? void 0 : event.kind) === "artifact-update";
-}
-function isMessage(event) {
-  return (event == null ? void 0 : event.kind) === "message";
-}
-function isTask(event) {
-  return (event == null ? void 0 : event.kind) === "task";
-}
-function getEventMetadata(event) {
-  if (isTaskArtifactUpdateEvent(event)) {
-    return event.artifact.metadata || {};
-  }
-  if (isTaskStatusUpdateEvent(event) || isTask(event) || isMessage(event)) {
-    return event.metadata || {};
-  }
-  return {};
-}
-function isFailedTaskStatusUpdateEvent(event) {
-  return (isTaskStatusUpdateEvent(event) || isTask(event)) && event.status.state === "failed" /* FAILED */;
-}
-function isTerminalTaskStatusUpdateEvent(event) {
-  return (isTaskStatusUpdateEvent(event) || isTask(event)) && [
-    "completed" /* COMPLETED */,
-    "failed" /* FAILED */,
-    "canceled" /* CANCELED */,
-    "rejected" /* REJECTED */
-  ].includes(event.status.state);
-}
-function isInputRequiredTaskStatusUpdateEvent(event) {
-  return (isTaskStatusUpdateEvent(event) || isTask(event)) && event.status.state === "input-required" /* INPUT_REQUIRED */;
-}
-function getFailedTaskStatusUpdateEventError(event) {
-  var _a;
-  if (!isFailedTaskStatusUpdateEvent(event)) {
-    return void 0;
-  }
-  const parts = ((_a = event.status.message) == null ? void 0 : _a.parts) || [];
-  if (parts.length === 0) {
-    return void 0;
-  }
-  if (parts[0].kind !== "text") {
-    return void 0;
-  }
-  return parts[0].text;
-}
-function createTaskSubmittedEvent({
-  taskId,
-  contextId,
-  message,
-  metadata
-}) {
-  return {
-    kind: "status-update",
-    taskId,
-    contextId,
-    final: false,
-    status: {
-      state: "submitted" /* SUBMITTED */,
-      message,
-      timestamp: (/* @__PURE__ */ new Date()).toISOString()
-    },
-    metadata
-  };
-}
-function createTask({
-  contextId,
-  message,
-  taskId,
-  metadata
-}) {
-  return {
-    kind: "task",
-    id: taskId || randomUUID(),
-    contextId,
-    history: [message],
-    status: {
-      state: "submitted" /* SUBMITTED */,
-      timestamp: (/* @__PURE__ */ new Date()).toISOString()
-    },
-    metadata
-  };
-}
-function createTaskWorkingEvent({
-  taskId,
-  contextId,
-  message,
-  metadata
-}) {
-  return {
-    kind: "status-update",
-    taskId,
-    contextId,
-    final: false,
-    status: {
-      state: "working" /* WORKING */,
-      message,
-      timestamp: (/* @__PURE__ */ new Date()).toISOString()
-    },
-    metadata
-  };
-}
-function createTaskCompletedEvent({
-  taskId,
-  contextId,
-  metadata
-}) {
-  return {
-    kind: "status-update",
-    taskId,
-    contextId,
-    final: true,
-    status: {
-      state: "completed" /* COMPLETED */,
-      timestamp: (/* @__PURE__ */ new Date()).toISOString()
-    },
-    metadata
-  };
-}
-function createTaskArtifactUpdateEvent({
-  taskId,
-  contextId,
-  artifactId,
-  parts = [],
-  metadata,
-  append,
-  lastChunk
-}) {
-  return {
-    kind: "artifact-update",
-    taskId,
-    contextId,
-    append,
-    lastChunk,
-    artifact: {
-      artifactId: artifactId || randomUUID(),
-      parts
-    },
-    metadata
-  };
-}
-function createTaskFailedEvent({
-  taskId,
-  contextId,
-  error,
-  metadata
-}) {
-  return {
-    kind: "status-update",
-    taskId,
-    contextId,
-    final: true,
-    status: {
-      state: "failed" /* FAILED */,
-      message: {
-        kind: "message",
-        messageId: randomUUID(),
-        role: "agent",
-        taskId,
-        contextId,
-        parts: [
-          {
-            kind: "text",
-            text: error.message
-          }
-        ]
-      },
-      timestamp: (/* @__PURE__ */ new Date()).toISOString()
-    },
-    metadata
-  };
-}
-function createTaskInputRequiredEvent({
-  taskId,
-  contextId,
-  parts,
-  metadata
-}) {
-  return {
-    kind: "status-update",
-    taskId,
-    contextId,
-    final: true,
-    status: {
-      state: "input-required" /* INPUT_REQUIRED */,
-      message: {
-        kind: "message",
-        messageId: randomUUID(),
-        role: "agent",
-        taskId,
-        contextId,
-        parts
-      },
-      timestamp: (/* @__PURE__ */ new Date()).toISOString()
-    },
-    metadata
-  };
-}
-function createInputMissingErrorEvent({
-  taskId,
-  contextId,
-  parts,
-  metadata
-}) {
-  return {
-    kind: "status-update",
-    taskId,
-    contextId,
-    final: true,
-    status: {
-      state: "input-required" /* INPUT_REQUIRED */,
-      message: {
-        kind: "message",
-        messageId: randomUUID(),
-        role: "agent",
-        taskId,
-        contextId,
-        parts
-      },
-      timestamp: (/* @__PURE__ */ new Date()).toISOString()
-    },
-    metadata
-  };
-}
-export {
-  MessageRole,
-  TaskState,
-  createInputMissingErrorEvent,
-  createTask,
-  createTaskArtifactUpdateEvent,
-  createTaskCompletedEvent,
-  createTaskFailedEvent,
-  createTaskInputRequiredEvent,
-  createTaskSubmittedEvent,
-  createTaskWorkingEvent,
-  getEventMetadata,
-  getFailedTaskStatusUpdateEventError,
-  isFailedTaskStatusUpdateEvent,
-  isInputRequiredTaskStatusUpdateEvent,
-  isMessage,
-  isTask,
-  isTaskArtifactUpdateEvent,
-  isTaskStatusUpdateEvent,
-  isTerminalTaskStatusUpdateEvent
-};

package/dist/web/a2a/a2a_remote_agent.js

@@ -1,196 +0,0 @@
-import {createRequire as topLevelCreateRequire} from 'module';
-const require = topLevelCreateRequire(import.meta.url);
-var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
-var __await = function(promise, isYieldStar) {
-  this[0] = promise;
-  this[1] = isYieldStar;
-};
-var __asyncGenerator = (__this, __arguments, generator) => {
-  var resume = (k, v, yes, no) => {
-    try {
-      var x = generator[k](v), isAwait = (v = x.value) instanceof __await, done = x.done;
-      Promise.resolve(isAwait ? v[0] : v).then((y) => isAwait ? resume(k === "return" ? k : "next", v[1] ? { done: y.done, value: y.value } : y, yes, no) : yes({ value: y, done })).catch((e) => resume("throw", e, yes, no));
-    } catch (e) {
-      no(e);
-    }
-  }, method = (k) => it[k] = (x) => new Promise((yes, no) => resume(k, x, yes, no)), it = {};
-  return generator = generator.apply(__this, __arguments), it[__knownSymbol("asyncIterator")] = () => it, method("next"), method("throw"), method("return"), it;
-};
-var __forAwait = (obj, it, method) => (it = obj[__knownSymbol("asyncIterator")]) ? it.call(obj) : (obj = obj[__knownSymbol("iterator")](), it = {}, method = (key, fn) => (fn = obj[key]) && (it[key] = (arg) => new Promise((yes, no, done) => (arg = fn.call(obj, arg), done = arg.done, Promise.resolve(arg.value).then((value) => yes({ value, done }), no)))), method("next"), method("return"), it);
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-import {
-  AGENT_CARD_PATH
-} from "@a2a-js/sdk";
-import { ClientFactory } from "@a2a-js/sdk/client";
-import { BaseAgent } from "../agents/base_agent.js";
-import { createEvent } from "../events/event.js";
-import { randomUUID } from "../utils/env_aware_utils.js";
-import { logger } from "../utils/logger.js";
-import { MessageRole } from "./a2a_event.js";
-import { A2ARemoteAgentRunProcessor } from "./a2a_remote_agent_run_processor.js";
-import {
-  getUserFunctionCallAt,
-  toMissingRemoteSessionParts
-} from "./a2a_remote_agent_utils.js";
-import { resolveAgentCard } from "./agent_card.js";
-import { toAdkEvent } from "./event_converter_utils.js";
-import { getA2ASessionMetadata } from "./metadata_converter_utils.js";
-import { toA2AParts } from "./part_converter_utils.js";
-class RemoteA2AAgent extends BaseAgent {
-  constructor(a2aConfig) {
-    super(a2aConfig);
-    this.a2aConfig = a2aConfig;
-    this.isInitialized = false;
-    if (!a2aConfig.agentCard && !a2aConfig.client) {
-      throw new Error("Either AgentCard or Client must be provided");
-    }
-  }
-  async init() {
-    if (this.isInitialized) {
-      return;
-    }
-    if (this.a2aConfig.client) {
-      this.client = this.a2aConfig.client;
-    }
-    if (this.a2aConfig.agentCard) {
-      this.card = await resolveAgentCard(this.a2aConfig.agentCard);
-      if (!this.client) {
-        const factory = this.a2aConfig.clientFactory || new ClientFactory();
-        this.client = await factory.createFromAgentCard(this.card);
-      }
-    }
-    this.isInitialized = true;
-  }
-  runAsyncImpl(context) {
-    return __asyncGenerator(this, null, function* () {
-      var _a, _b;
-      yield new __await(this.init());
-      try {
-        const events = context.session.events;
-        if (events.length === 0) {
-          throw new Error("No events in session to send");
-        }
-        const userFnCall = getUserFunctionCallAt(
-          context.session,
-          events.length - 1
-        );
-        let parts;
-        let taskId = void 0;
-        let contextId = void 0;
-        if (userFnCall) {
-          const event = userFnCall.response;
-          parts = toA2AParts(
-            ((_a = event.content) == null ? void 0 : _a.parts) || [],
-            event.longRunningToolIds
-          );
-          taskId = userFnCall.taskId;
-          contextId = userFnCall.contextId;
-        } else {
-          const missing = toMissingRemoteSessionParts(context, context.session);
-          parts = missing.parts;
-          contextId = missing.contextId;
-        }
-        const message = {
-          kind: "message",
-          messageId: randomUUID(),
-          role: MessageRole.USER,
-          parts,
-          metadata: getA2ASessionMetadata({
-            appName: context.session.appName,
-            userId: context.session.userId,
-            sessionId: context.session.id
-          })
-        };
-        if (taskId) message.taskId = taskId;
-        if (contextId) message.contextId = contextId;
-        const params = {
-          message,
-          configuration: this.a2aConfig.messageSendConfig
-        };
-        const processor = new A2ARemoteAgentRunProcessor(params);
-        if (this.a2aConfig.beforeRequestCallbacks) {
-          for (const callback of this.a2aConfig.beforeRequestCallbacks) {
-            yield new __await(callback(context, params));
-          }
-        }
-        const useStreaming = this.card ? ((_b = this.card.capabilities) == null ? void 0 : _b.streaming) !== false : true;
-        if (useStreaming) {
-          try {
-            for (var iter = __forAwait(this.client.sendMessageStream(params)), more, temp, error; more = !(temp = yield new __await(iter.next())).done; more = false) {
-              const chunk = temp.value;
-              if (this.a2aConfig.afterRequestCallbacks) {
-                for (const callback of this.a2aConfig.afterRequestCallbacks) {
-                  yield new __await(callback(context, chunk));
-                }
-              }
-              const adkEvent = toAdkEvent(
-                chunk,
-                context.invocationId,
-                this.name,
-                context.branch
-              );
-              if (!adkEvent) {
-                continue;
-              }
-              processor.updateCustomMetadata(adkEvent, chunk);
-              const eventsToEmit = processor.aggregatePartial(
-                context,
-                chunk,
-                adkEvent
-              );
-              for (const ev of eventsToEmit) {
-                yield ev;
-              }
-            }
-          } catch (temp) {
-            error = [temp];
-          } finally {
-            try {
-              more && (temp = iter.return) && (yield new __await(temp.call(iter)));
-            } finally {
-              if (error)
-                throw error[0];
-            }
-          }
-        } else {
-          const result = yield new __await(this.client.sendMessage(params));
-          if (this.a2aConfig.afterRequestCallbacks) {
-            for (const callback of this.a2aConfig.afterRequestCallbacks) {
-              yield new __await(callback(context, result));
-            }
-          }
-          const adkEvent = toAdkEvent(
-            result,
-            context.invocationId,
-            this.name,
-            context.branch
-          );
-          if (adkEvent) {
-            processor.updateCustomMetadata(adkEvent, result);
-            yield adkEvent;
-          }
-        }
-      } catch (e) {
-        const error2 = e;
-        logger.error("A2ARemoteAgent ".concat(this.name, " failed:"), error2);
-        yield createEvent({
-          author: this.name,
-          invocationId: context.invocationId,
-          errorMessage: error2.message,
-          turnComplete: true
-        });
-      }
-    });
-  }
-  runLiveImpl(_context) {
-    throw new Error("Live mode is not supported in A2ARemoteAgent yet.");
-  }
-}
-export {
-  AGENT_CARD_PATH,
-  RemoteA2AAgent
-};