@google/adk 1.6.0 → 2.0.0

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--)
@@ -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);

package/dist/esm/skills/loader.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 2026 Google LLC
@@ -7,6 +9,7 @@ const require = topLevelCreateRequire(import.meta.url);
  */
 import AdmZip from "adm-zip";
 import yaml from "js-yaml";
+import { isUtf8 } from "node:buffer";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import { logger } from "../utils/logger.js";
@@ -46,6 +49,10 @@ const IGNORED_EXTENSIONS = /* @__PURE__ */ new Set([
   ".tsbuildinfo",
   ".DS_Store"
 ]);
+function decodeSkillFileContent(data) {
+  return isUtf8(data) ? data.toString("utf-8") : data;
+}
+__name(decodeSkillFileContent, "decodeSkillFileContent");
 async function loadDir(directoryPath) {
   const files = {};
   async function walk(dir) {
@@ -63,14 +70,11 @@ async function loadDir(directoryPath) {
           continue;
         }
         const fileData = await fs.readFile(fullPath);
-        try {
-          files[relativePath] = fileData.toString("utf-8");
-        } catch (_e) {
-          files[relativePath] = fileData;
-        }
+        files[relativePath] = decodeSkillFileContent(fileData);
       }
     }
   }
+  __name(walk, "walk");
   try {
     const stats = await fs.stat(directoryPath);
     if (stats.isDirectory()) {
@@ -83,6 +87,7 @@ async function loadDir(directoryPath) {
   }
   return files;
 }
+__name(loadDir, "loadDir");
 function parseFrontmatterYaml(content) {
   if (!content.startsWith("---")) {
     throw new Error("SKILL.md must start with YAML frontmatter (---)");
@@ -103,6 +108,7 @@ function parseFrontmatterYaml(content) {
     throw new Error(`Invalid YAML in frontmatter: ${e.message}`);
   }
 }
+__name(parseFrontmatterYaml, "parseFrontmatterYaml");
 function validateFrontmatter(raw) {
   try {
     return FrontmatterSchema.parse(raw);
@@ -110,19 +116,23 @@ function validateFrontmatter(raw) {
     throw new Error(`Invalid YAML in frontmatter: ${e.message}`);
   }
 }
+__name(validateFrontmatter, "validateFrontmatter");
 function parseSkillMdContent(content) {
   const { raw, body } = parseFrontmatterYaml(content);
   return { frontmatter: validateFrontmatter(raw), body };
 }
+__name(parseSkillMdContent, "parseSkillMdContent");
 function isDangerousZipEntryName(entryName) {
   if (path.posix.isAbsolute(entryName) || path.win32.isAbsolute(entryName)) {
     return true;
   }
   return entryName.split(/[/\\]/).some((segment) => segment === "..");
 }
+__name(isDangerousZipEntryName, "isDangerousZipEntryName");
 function isBareSkillName(name) {
   return name !== "." && name !== ".." && path.basename(name) === name;
 }
+__name(isBareSkillName, "isBareSkillName");
 async function loadSkillFromDir(skillDir) {
   const resolvedDir = path.resolve(skillDir);
   const skill = await loadSkillFile(skillDir);
@@ -146,6 +156,7 @@ async function loadSkillFromDir(skillDir) {
     resources
   };
 }
+__name(loadSkillFromDir, "loadSkillFromDir");
 async function validateSkillDir(skillDir) {
   const problems = [];
   const resolvedDir = path.resolve(skillDir);
@@ -174,6 +185,7 @@ async function validateSkillDir(skillDir) {
   }
   return problems;
 }
+__name(validateSkillDir, "validateSkillDir");
 async function loadSkillFile(skillDir) {
   const resolvedDir = path.resolve(skillDir);
   let skillMdPath = "";
@@ -214,6 +226,7 @@ async function loadSkillFile(skillDir) {
     instructions: body
   };
 }
+__name(loadSkillFile, "loadSkillFile");
 async function loadAllSkillsInDir(skillsBasePath) {
   const resolvedPath = path.resolve(skillsBasePath);
   const skills = {};
@@ -251,6 +264,7 @@ async function loadAllSkillsInDir(skillsBasePath) {
       }
     }
   }
+  __name(scanDir, "scanDir");
   try {
     await fs.readdir(resolvedPath);
     await scanDir(resolvedPath);
@@ -259,6 +273,7 @@ async function loadAllSkillsInDir(skillsBasePath) {
   }
   return skills;
 }
+__name(loadAllSkillsInDir, "loadAllSkillsInDir");
 function loadSkillFromZipBuffer(zipBuffer) {
   const zip = new AdmZip(zipBuffer);
   const entries = zip.getEntries();
@@ -300,15 +315,12 @@ function loadSkillFromZipBuffer(zipBuffer) {
         const relativePath = entry.entryName.substring(normPrefix.length);
         if (!relativePath) continue;
         const data = entry.getData();
-        try {
-          res[relativePath] = data.toString("utf-8");
-        } catch (_e) {
-          res[relativePath] = data;
-        }
+        res[relativePath] = decodeSkillFileContent(data);
       }
     }
     return res;
   }
+  __name(loadZipDir, "loadZipDir");
   const refFiles = loadZipDir("references");
   for (const [key, val] of Object.entries(refFiles)) {
     references[key] = val;
@@ -333,6 +345,7 @@ function loadSkillFromZipBuffer(zipBuffer) {
     }
   };
 }
+__name(loadSkillFromZipBuffer, "loadSkillFromZipBuffer");
 export {
   loadAllSkillsInDir,
   loadSkillFromDir,

package/dist/esm/skills/prompt.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 2026 Google LLC
@@ -8,6 +10,7 @@ const require = topLevelCreateRequire(import.meta.url);
 function escapeHtml(unsafe) {
   return unsafe.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
 }
+__name(escapeHtml, "escapeHtml");
 function formatSkillsAsXml(skills) {
   if (!skills || skills.length === 0) {
     return "<available_skills>\n</available_skills>";
@@ -25,6 +28,7 @@ function formatSkillsAsXml(skills) {
   lines.push("</available_skills>");
   return lines.join("\n");
 }
+__name(formatSkillsAsXml, "formatSkillsAsXml");
 export {
   formatSkillsAsXml
 };

package/dist/esm/telemetry/google_cloud.js

@@ -1,18 +1,40 @@
 import {createRequire as topLevelCreateRequire} from 'module';
 const require = topLevelCreateRequire(import.meta.url);
+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 __name = (target, value) => __defProp(target, "name", { value, configurable: 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 __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 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { MetricExporter } from "@google-cloud/opentelemetry-cloud-monitoring-exporter";
-import { TraceExporter } from "@google-cloud/opentelemetry-cloud-trace-exporter";
 import { gcpDetector } from "@opentelemetry/resource-detector-gcp";
 import { detectResources } from "@opentelemetry/resources";
 import { PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
 import { BatchSpanProcessor } from "@opentelemetry/sdk-trace-base";
 import { GoogleAuth } from "google-auth-library";
 import { logger } from "../utils/logger.js";
+import { loadOptionalPeer } from "../utils/optional_peer.js";
 const GCP_PROJECT_ERROR_MESSAGE = "Cannot determine GCP Project. OTel GCP Exporters cannot be set up. Please make sure to log into correct GCP Project.";
 async function getGcpProjectId() {
   try {
@@ -23,6 +45,32 @@ async function getGcpProjectId() {
     return void 0;
   }
 }
+__name(getGcpProjectId, "getGcpProjectId");
+async function createCloudTraceProcessor(projectId) {
+  const { TraceExporter } = await loadOptionalPeer(
+    {
+      packageName: "@google-cloud/opentelemetry-cloud-trace-exporter",
+      feature: "getGcpExporters({enableTracing: true})"
+    },
+    () => Promise.resolve().then(() => __toESM(require("@google-cloud/opentelemetry-cloud-trace-exporter"), 1))
+  );
+  return new BatchSpanProcessor(new TraceExporter({ projectId }));
+}
+__name(createCloudTraceProcessor, "createCloudTraceProcessor");
+async function createCloudMetricReader(projectId) {
+  const { MetricExporter } = await loadOptionalPeer(
+    {
+      packageName: "@google-cloud/opentelemetry-cloud-monitoring-exporter",
+      feature: "getGcpExporters({enableMetrics: true})"
+    },
+    () => Promise.resolve().then(() => __toESM(require("@google-cloud/opentelemetry-cloud-monitoring-exporter"), 1))
+  );
+  return new PeriodicExportingMetricReader({
+    exporter: new MetricExporter({ projectId }),
+    exportIntervalMillis: 5e3
+  });
+}
+__name(createCloudMetricReader, "createCloudMetricReader");
 async function getGcpExporters(config = {}) {
   const {
     enableTracing = false,
@@ -35,19 +83,16 @@ async function getGcpExporters(config = {}) {
     return {};
   }
   return {
-    spanProcessors: enableTracing ? [new BatchSpanProcessor(new TraceExporter({ projectId }))] : [],
-    metricReaders: enableMetrics ? [
-      new PeriodicExportingMetricReader({
-        exporter: new MetricExporter({ projectId }),
-        exportIntervalMillis: 5e3
-      })
-    ] : [],
+    spanProcessors: enableTracing ? [await createCloudTraceProcessor(projectId)] : [],
+    metricReaders: enableMetrics ? [await createCloudMetricReader(projectId)] : [],
     logRecordProcessors: []
   };
 }
+__name(getGcpExporters, "getGcpExporters");
 function getGcpResource() {
   return detectResources({ detectors: [gcpDetector] });
 }
+__name(getGcpResource, "getGcpResource");
 export {
   getGcpExporters,
   getGcpResource

package/dist/esm/telemetry/setup.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
@@ -54,11 +56,13 @@ function maybeSetOtelProviders(otelHooksToSetup = [], otelResource) {
     logs.setGlobalLoggerProvider(loggerProvider);
   }
 }
+__name(maybeSetOtelProviders, "maybeSetOtelProviders");
 function getOtelResource() {
   return detectResources({
     detectors: []
   });
 }
+__name(getOtelResource, "getOtelResource");
 function getOtelExportersConfig() {
   return {
     enableTracing: !!(process.env.OTEL_EXPORTER_OTLP_ENDPOINT || process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT),
@@ -66,6 +70,7 @@ function getOtelExportersConfig() {
     enableLogging: !!(process.env.OTEL_EXPORTER_OTLP_ENDPOINT || process.env.OTEL_EXPORTER_OTLP_LOGS_ENDPOINT)
   };
 }
+__name(getOtelExportersConfig, "getOtelExportersConfig");
 function getOtelExporters(config = getOtelExportersConfig()) {
   const { enableTracing, enableMetrics, enableLogging } = config;
   return {
@@ -78,6 +83,7 @@ function getOtelExporters(config = getOtelExportersConfig()) {
     logRecordProcessors: enableLogging ? [new BatchLogRecordProcessor(new OTLPLogExporter())] : []
   };
 }
+__name(getOtelExporters, "getOtelExporters");
 export {
   maybeSetOtelProviders
 };