@eventcatalog/core 3.40.1 → 3.41.0

package/eventcatalog/src/utils/collections/teams.ts

@@ -15,8 +15,9 @@ export const getTeams = async (): Promise<Team[]> => {
   }
 
   // 1. Fetch all collections in parallel
-  const [allTeams, allDomains, allServices, allEvents, allCommands, allQueries] = await Promise.all([
+  const [allTeams, allAgents, allDomains, allServices, allEvents, allCommands, allQueries] = await Promise.all([
     getCollection('teams'),
+    getCollection('agents'),
     getCollection('domains'),
     getCollection('services'),
     getCollection('events'),
@@ -45,6 +46,7 @@ export const getTeams = async (): Promise<Team[]> => {
     }
   };
 
+  addToIndex(allAgents);
   addToIndex(allDomains);
   addToIndex(allServices);
   addToIndex(allEvents);
@@ -57,6 +59,7 @@ export const getTeams = async (): Promise<Team[]> => {
     const ownedItems = ownershipMap.get(teamId) || [];
 
     // Categorize items
+    const ownedAgents = ownedItems.filter((i) => i.collection === 'agents') as CollectionEntry<'agents'>[];
     const ownedDomains = ownedItems.filter((i) => i.collection === 'domains') as CollectionEntry<'domains'>[];
     const ownedServices = ownedItems.filter((i) => i.collection === 'services') as CollectionEntry<'services'>[];
     const ownedEvents = ownedItems.filter((i) => i.collection === 'events') as CollectionEntry<'events'>[];
@@ -67,6 +70,7 @@ export const getTeams = async (): Promise<Team[]> => {
       ...team,
       data: {
         ...team.data,
+        ownedAgents,
         ownedDomains,
         ownedServices,
         ownedCommands,

package/eventcatalog/src/utils/collections/types.ts

@@ -2,5 +2,6 @@ import type { CollectionEntry } from 'astro:content';
 
 // Shared types to avoid circular dependencies between domains.ts and services.ts
 export type Service = CollectionEntry<'services'>;
+export type Agent = CollectionEntry<'agents'>;
 export type Domain = CollectionEntry<'domains'>;
 export type UbiquitousLanguage = CollectionEntry<'ubiquitousLanguages'>;

package/eventcatalog/src/utils/collections/users.ts

@@ -16,8 +16,9 @@ export const getUsers = async (): Promise<User[]> => {
   }
 
   // 1. Fetch all collections in parallel
-  const [allUsers, allDomains, allServices, allEvents, allCommands, allQueries, allTeams] = await Promise.all([
+  const [allUsers, allAgents, allDomains, allServices, allEvents, allCommands, allQueries, allTeams] = await Promise.all([
     getCollection('users'),
+    getCollection('agents'),
     getCollection('domains'),
     getCollection('services'),
     getCollection('events'),
@@ -52,6 +53,7 @@ export const getUsers = async (): Promise<User[]> => {
     }
   };
 
+  addToIndex(allAgents);
   addToIndex(allDomains);
   addToIndex(allServices);
   addToIndex(allEvents);
@@ -84,6 +86,7 @@ export const getUsers = async (): Promise<User[]> => {
     const allOwnedItems = Array.from(new Set([...directOwnedItems, ...teamOwnedItems]));
 
     // Categorize items
+    const ownedAgents = allOwnedItems.filter((i) => i.collection === 'agents') as CollectionEntry<'agents'>[];
     const ownedDomains = allOwnedItems.filter((i) => i.collection === 'domains') as CollectionEntry<'domains'>[];
     const ownedServices = allOwnedItems.filter((i) => i.collection === 'services') as CollectionEntry<'services'>[];
     const ownedEvents = allOwnedItems.filter((i) => i.collection === 'events') as CollectionEntry<'events'>[];
@@ -94,6 +97,7 @@ export const getUsers = async (): Promise<User[]> => {
       ...user,
       data: {
         ...user.data,
+        ownedAgents,
         ownedDomains,
         ownedServices,
         ownedEvents,

package/eventcatalog/src/utils/collections/util.ts

@@ -173,6 +173,7 @@ export const findMatchingNodes = (
 };
 
 export const resourceToCollectionMap = {
+  agent: 'agents',
   service: 'services',
   event: 'events',
   command: 'commands',
@@ -189,6 +190,7 @@ export const resourceToCollectionMap = {
 } as const;
 
 export const collectionToResourceMap = {
+  agents: 'agent',
   services: 'service',
   events: 'event',
   commands: 'command',

package/eventcatalog/src/utils/eventcatalog-config/catalog.ts

@@ -10,6 +10,7 @@ const getConfigValue = (obj: any, key: string, defaultValue: any) => {
 export const isCollectionVisibleInCatalog = (collection: string) => {
   const sidebarConfig = config?.default?.docs?.sidebar || {};
   const collections = [
+    'agents',
     'events',
     'commands',
     'queries',

package/eventcatalog/src/utils/llms.ts

@@ -5,7 +5,7 @@ import { join } from 'path';
 import fs from 'fs';
 
 export const addSchemaToMarkdown = (collection: CollectionEntry<CollectionTypes>, file: string) => {
-  const resourceData = collection?.data;
+  const resourceData = collection?.data as any;
   const fileToResource = collection.filePath ?? '';
   let schemas: string[] = [];
 

package/eventcatalog/src/utils/node-graphs/agents-node-graph.ts

@@ -0,0 +1,4 @@
+import { getNodesAndEdges as getServiceLikeNodesAndEdges } from './services-node-graph';
+
+export const getNodesAndEdges = (props: Parameters<typeof getServiceLikeNodesAndEdges>[0]) =>
+  getServiceLikeNodesAndEdges({ ...props, collection: 'agents' });

package/eventcatalog/src/utils/node-graphs/container-node-graph.ts

@@ -68,7 +68,7 @@ export const getNodesAndEdges = async ({ id, version, defaultFlow, mode = 'simpl
         contextMenu: buildContextMenuForService({
           id: service.data.id,
           version: service.data.version,
-          specifications: service.data.specifications as { type: string; path: string }[],
+          specifications: (service.data as any).specifications as { type: string; path: string }[],
           repository: service.data.repository as { url: string },
         }),
       },
@@ -161,7 +161,7 @@ export const getNodesAndEdges = async ({ id, version, defaultFlow, mode = 'simpl
         contextMenu: buildContextMenuForService({
           id: service.data.id,
           version: service.data.version,
-          specifications: service.data.specifications as { type: string; path: string }[],
+          specifications: (service.data as any).specifications as { type: string; path: string }[],
           repository: service.data.repository as { url: string },
         }),
       },

package/eventcatalog/src/utils/node-graphs/domains-node-graph.ts

@@ -8,11 +8,13 @@ import {
   createEdge,
 } from '@utils/node-graphs/utils/utils';
 import { getNodesAndEdges as getServicesNodeAndEdges } from './services-node-graph';
+import { getNodesAndEdges as getAgentsNodeAndEdges } from './agents-node-graph';
 import { getNodesAndEdges as getDataProductsNodeAndEdges } from './data-products-node-graph';
 import merge from 'lodash.merge';
 import { createVersionedMap, findInMap } from '@utils/collections/util';
 import type { Node } from '@xyflow/react';
 import { getProducersOfMessage } from '@utils/collections/services';
+import { getProducersOfMessage as getAgentProducersOfMessage } from '@utils/collections/agents';
 
 type DagreGraph = any;
 
@@ -27,9 +29,10 @@ export const getNodesAndEdgesForDomainContextMap = async ({ defaultFlow = null }
     edges = [] as any;
 
   // 1. Parallel Fetching
-  const [allDomains, services, events, commands, queries] = await Promise.all([
+  const [allDomains, services, agents, events, commands, queries] = await Promise.all([
     getCollection('domains'),
     getCollection('services'),
+    getCollection('agents'),
     getCollection('events'),
     getCollection('commands'),
     getCollection('queries'),
@@ -40,19 +43,23 @@ export const getNodesAndEdgesForDomainContextMap = async ({ defaultFlow = null }
 
   // 2. Build optimized maps
   const serviceMap = createVersionedMap(services);
+  const agentMap = createVersionedMap(agents);
   const messageMap = createVersionedMap(messages);
 
   domains.forEach((domain, index) => {
     const nodeId = generateIdForNode(domain);
     const rawServices = domain.data.services ?? [];
+    const rawAgents = domain.data.agents ?? [];
 
     // Optimized service resolution
     const domainServices = rawServices
       .map((service) => findInMap(serviceMap, service.id, service.version))
       .filter((e) => e !== undefined);
+    const domainAgents = rawAgents.map((agent) => findInMap(agentMap, agent.id, agent.version)).filter((e) => e !== undefined);
+    const domainResources = [...domainServices, ...domainAgents];
 
     // Calculate domain node size based on services
-    const servicesCount = domainServices.length;
+    const servicesCount = domainResources.length;
     const SERVICES_PER_ROW = 1;
     const SERVICE_WIDTH = 330;
     const SERVICE_HEIGHT = 120;
@@ -109,8 +116,8 @@ export const getNodesAndEdgesForDomainContextMap = async ({ defaultFlow = null }
     } as Node);
 
     // Position services in a grid within the domain
-    if (domainServices) {
-      domainServices.forEach((service, serviceIndex) => {
+    if (domainResources) {
+      domainResources.forEach((service, serviceIndex) => {
         const row = Math.floor(serviceIndex / SERVICES_PER_ROW);
         const col = serviceIndex % SERVICES_PER_ROW;
 
@@ -123,7 +130,7 @@ export const getNodesAndEdgesForDomainContextMap = async ({ defaultFlow = null }
           id: generateIdForNode(service),
           sourcePosition: 'right',
           targetPosition: 'left',
-          type: 'services',
+          type: service.collection,
           position: {
             x: xPosition,
             y: yPosition,
@@ -133,7 +140,7 @@ export const getNodesAndEdgesForDomainContextMap = async ({ defaultFlow = null }
           draggable: false,
           data: {
             mode: 'full',
-            service,
+            ...(service.collection === 'agents' ? { agent: service.data } : { service: service.data }),
           },
         });
 
@@ -150,10 +157,12 @@ export const getNodesAndEdgesForDomainContextMap = async ({ defaultFlow = null }
         // Based on original code, it iterates `receives`.
 
         for (const receive of receives) {
-          const producers = getProducersOfMessage(services, receive);
+          const producers = [...getAgentProducersOfMessage(agents, receive), ...getProducersOfMessage(services, receive)];
 
           for (const producer of producers) {
-            const isSameDomain = domainServices.some((domainService) => domainService.data.id === producer.data.id);
+            const isSameDomain = domainResources.some(
+              (domainService) => domainService.collection === producer.collection && domainService.data.id === producer.data.id
+            );
 
             if (!isSameDomain) {
               edges.push(
@@ -200,9 +209,10 @@ export const getNodesAndEdges = async ({
     edges = new Map();
 
   // 1. Parallel Fetching
-  const [domains, services, dataProducts] = await Promise.all([
+  const [domains, services, agents, dataProducts] = await Promise.all([
     getCollection('domains'),
     getCollection('services'),
+    getCollection('agents'),
     getCollection('data-products'),
   ]);
 
@@ -218,10 +228,12 @@ export const getNodesAndEdges = async ({
 
   // 2. Build optimized maps
   const serviceMap = createVersionedMap(services);
+  const agentMap = createVersionedMap(agents);
   const domainMap = createVersionedMap(domains);
   const dataProductMap = createVersionedMap(dataProducts);
 
   const rawServices = domain?.data.services || [];
+  const rawAgents = domain?.data.agents || [];
   const rawSubDomains = domain?.data.domains || [];
   const rawDataProducts = (domain?.data as any)['data-products'] || [];
 
@@ -231,6 +243,11 @@ export const getNodesAndEdges = async ({
     .filter((s): s is any => !!s)
     .map((svc) => ({ id: svc.data.id, version: svc.data.version }));
 
+  const domainAgentsWithVersion = rawAgents
+    .map((agent) => findInMap(agentMap, agent.id, agent.version))
+    .filter((a): a is any => !!a)
+    .map((agent) => ({ id: agent.data.id, version: agent.data.version }));
+
   const domainSubDomainsWithVersion = rawSubDomains
     .map((subDomain) => findInMap(domainMap, subDomain.id, subDomain.version))
     .filter((d): d is any => !!d)
@@ -267,6 +284,22 @@ export const getNodesAndEdges = async ({
     serviceEdges.forEach((e) => edges.set(e.id, e));
   }
 
+  for (const agent of domainAgentsWithVersion) {
+    const { nodes: agentNodes, edges: agentEdges } = await getAgentsNodeAndEdges({
+      id: agent.id,
+      version: agent.version,
+      defaultFlow: flow,
+      mode,
+      renderAllEdges: true,
+      channelRenderMode,
+    });
+    agentNodes.forEach((n) => {
+      nodes.set(n.id, nodes.has(n.id) ? merge(nodes.get(n.id), n) : n);
+    });
+    // @ts-ignore
+    agentEdges.forEach((e) => edges.set(e.id, e));
+  }
+
   for (const dataProduct of domainDataProductsWithVersion) {
     const { nodes: dataProductNodes, edges: dataProductEdges } = await getDataProductsNodeAndEdges({
       id: dataProduct.id,

package/eventcatalog/src/utils/node-graphs/export-mermaid.ts

@@ -17,6 +17,10 @@ export interface MermaidExportOptions {
  * Format: [prefix, suffix]
  */
 const NODE_SHAPE_MAP: Record<string, [string, string]> = {
+  agents: ['[[', ']]'],
+  agent: ['[[', ']]'],
+  agentTool: ['[', ']'],
+  'agent-tool': ['[', ']'],
   services: ['[[', ']]'], // stadium shape
   service: ['[[', ']]'],
   events: ['>', ']'], // flag/asymmetric shape (message-like)
@@ -50,6 +54,10 @@ const NODE_SHAPE_MAP: Record<string, [string, string]> = {
  * Mermaid class definitions for styling different node types
  */
 const NODE_STYLE_CLASSES: Record<string, string> = {
+  agents: 'fill:#0ea5e9,stroke:#0369a1,color:#fff',
+  agent: 'fill:#0ea5e9,stroke:#0369a1,color:#fff',
+  agentTool: 'fill:#8b5cf6,stroke:#6d28d9,color:#fff',
+  'agent-tool': 'fill:#8b5cf6,stroke:#6d28d9,color:#fff',
   services: 'fill:#ec4899,stroke:#be185d,color:#fff',
   service: 'fill:#ec4899,stroke:#be185d,color:#fff',
   events: 'fill:#f97316,stroke:#c2410c,color:#fff',
@@ -124,6 +132,18 @@ export function getNodeLabel(node: Node): string {
   if (!data) return node.id;
 
   // Handle different node types and their data structures
+  if (type === 'agents' || type === 'agent') {
+    const agent = (data as any).agent;
+    const name = agent?.name || agent?.id || node.id;
+    const version = agent?.data?.version || agent?.version;
+    return formatLabelWithVersion(name, version);
+  }
+
+  if (type === 'agentTool' || type === 'agent-tool') {
+    const agentTool = (data as any).agentTool;
+    return agentTool?.name || agentTool?.id || node.id;
+  }
+
   if (type === 'services' || type === 'service') {
     const service = (data as any).service;
     const name = service?.name || service?.id || node.id;

package/eventcatalog/src/utils/node-graphs/export-node-graph.ts

@@ -18,6 +18,8 @@ interface NodeDataWithResources {
   entity?: ResourceData;
   message?: ResourceData;
   flow?: ResourceData;
+  agent?: ResourceData;
+  agentTool?: ResourceData;
   service?: ResourceData;
   step?: ResourceData;
   user?: ResourceData;
@@ -32,6 +34,8 @@ export const exportNodeGraphForStudio = (data: ReactFlowJsonObject) => {
     'entity',
     'message',
     'flow',
+    'agent',
+    'agentTool',
     'service',
     'step',
     'user',

package/eventcatalog/src/utils/node-graphs/flows-node-graph.ts

@@ -24,6 +24,7 @@ interface Props {
 
 interface Maps {
   messageMap: Map<string, any[]>;
+  agentMap: Map<string, any[]>;
   serviceMap: Map<string, any[]>;
   flowMap: Map<string, any[]>;
   containerMap: Map<string, any[]>;
@@ -39,6 +40,15 @@ const getServiceNode = (step: any, serviceMap: Map<string, any[]>) => {
   };
 };
 
+const getAgentNode = (step: any, agentMap: Map<string, any[]>) => {
+  const agent = findInMap(agentMap, step.agent.id, step.agent.version);
+  return {
+    ...step,
+    type: agent ? agent.collection : 'step',
+    agent,
+  };
+};
+
 const getFlowNode = (step: any, flowMap: Map<string, any[]>) => {
   const flow = findInMap(flowMap, step.flow.id, step.flow.version);
   return {
@@ -117,6 +127,7 @@ const buildFlowGraphInternal = (
   const stepNodeId = (stepId: any) => `step-${stepId}`;
 
   const hydratedSteps = steps.map((step: any) => {
+    if (step.agent) return getAgentNode(step, maps.agentMap);
     if (step.service) return getServiceNode(step, maps.serviceMap);
     if (step.flow) return getFlowNode(step, maps.flowMap);
     if (step.container) return getContainerNode(step, maps.containerMap);
@@ -143,6 +154,14 @@ const buildFlowGraphInternal = (
       type: step.type,
     } as NodeType;
 
+    if (step.agent) {
+      node.data.agent = { ...step.agent, ...step.agent.data };
+      node.data.contextMenu = buildContextMenuForResource({
+        collection: 'agents',
+        id: step.agent.data.id,
+        version: step.agent.data.version,
+      });
+    }
     if (step.service) {
       node.data.service = { ...step.service, ...step.service.data };
       node.data.contextMenu = buildContextMenuForService({
@@ -255,11 +274,12 @@ const buildFlowGraphInternal = (
 export const getNodesAndEdges = async ({ id, defaultFlow, version, mode = 'simple', renderAllEdges = false }: Props) => {
   const graph = defaultFlow || createDagreGraph({ ranksep: 360, nodesep: 200 });
 
-  const [flows, events, commands, queries, services, containers, dataProducts] = await Promise.all([
+  const [flows, events, commands, queries, agents, services, containers, dataProducts] = await Promise.all([
     getCollection('flows'),
     getCollection('events'),
     getCollection('commands'),
     getCollection('queries'),
+    getCollection('agents'),
     getCollection('services'),
     getCollection('containers'),
     getCollection('data-products'),
@@ -277,6 +297,7 @@ export const getNodesAndEdges = async ({ id, defaultFlow, version, mode = 'simpl
   const messages = [...events, ...commands, ...queries];
   const maps: Maps = {
     messageMap: createVersionedMap(messages),
+    agentMap: createVersionedMap(agents),
     serviceMap: createVersionedMap(services),
     flowMap: createVersionedMap(flows),
     containerMap: createVersionedMap(containers),