@eventcatalog/core 3.40.2 → 3.41.1

package/eventcatalog/src/components/Search/SearchModal.tsx

@@ -23,6 +23,7 @@ import {
   ArrowsRightLeftIcon,
 } from '@heroicons/react/24/outline';
 import { StarIcon as StarIconSolid, CircleStackIcon } from '@heroicons/react/24/solid';
+import { Bot } from 'lucide-react';
 import { useStore } from '@nanostores/react';
 import { favoritesStore, toggleFavorite as toggleFavoriteAction } from '../../stores/favorites-store';
 import { buildUrl } from '@utils/url-builder';
@@ -41,6 +42,7 @@ const INDEXED_RESULT_LOAD_LIMIT = 50;
 const SEARCH_RESULT_DISPLAY_LIMIT = 25;
 
 const typeIcons: any = {
+  Agent: Bot,
   Domain: RectangleGroupIcon,
   Service: ServerIcon,
   Event: BoltIcon,
@@ -64,6 +66,7 @@ const typeIcons: any = {
 };
 
 const typeColors: any = {
+  Agent: 'text-sky-500 dark:text-sky-400 bg-sky-50 dark:bg-sky-500/10 ring-sky-200 dark:ring-sky-500/30',
   Domain: 'text-orange-500 dark:text-orange-400 bg-orange-50 dark:bg-orange-500/10 ring-orange-200 dark:ring-orange-500/30',
   Service: 'text-pink-500 dark:text-pink-400 bg-pink-50 dark:bg-pink-500/10 ring-pink-200 dark:ring-pink-500/30',
   Event: 'text-orange-500 dark:text-orange-400 bg-orange-50 dark:bg-orange-500/10 ring-orange-200 dark:ring-orange-500/30',

package/eventcatalog/src/components/Search/search-utils.ts

@@ -191,6 +191,7 @@ export const getSearchFilters = ({ items, query }: { items: Array<{ type: string
 
   const counts: Record<string, number> = {
     all: items.length,
+    Agent: 0,
     Domain: 0,
     Service: 0,
     Message: 0,
@@ -228,6 +229,7 @@ export const getSearchFilters = ({ items, query }: { items: Array<{ type: string
   };
 
   addFilter('Domain', 'Domains');
+  addFilter('Agent', 'Agents');
   addFilter('Service', 'Services');
   addFilter('Message', 'Messages');
   addFilter('Container', 'Data Stores');

package/eventcatalog/src/components/SideNav/NestedSideBar/SearchBar.tsx

@@ -18,6 +18,7 @@ import {
   ArrowLeftRight,
   Package,
   Box,
+  Bot,
 } from 'lucide-react';
 import type { NavNode } from '@stores/sidebar-store/state';
 import { getBadgeClasses } from './utils';
@@ -83,6 +84,7 @@ export default function SearchBar({ nodes, onSelectResult, onSearchChange }: Pro
 
   const filterTypes = [
     { key: 'channel', label: 'Channels', badge: 'Channel', icon: ArrowLeftRight },
+    { key: 'agent', label: 'Agents', badge: 'Agent', icon: Bot },
     { key: 'command', label: 'Commands', badge: 'Command', icon: MessageSquare },
     { key: 'container', label: 'Data Stores', badge: 'Container', icon: Database },
     { key: 'data-product', label: 'Data Products', badge: 'Data Product', icon: Package },
@@ -114,6 +116,7 @@ export default function SearchBar({ nodes, onSelectResult, onSearchChange }: Pro
     const results: SearchResult[] = [];
 
     const badgeToFilterKey: Record<string, string> = {
+      Agent: 'agent',
       Domain: 'domain',
       Service: 'service',
       Event: 'event',

package/eventcatalog/src/components/SideNav/NestedSideBar/index.tsx

@@ -218,6 +218,9 @@ export default function NestedSideBar() {
         { pattern: /^\/docs\/domains\/([^/]+)\/([^/]+)/, type: 'domain' },
         { pattern: /^\/visualiser\/domains\/([^/]+)\/([^/]+)/, type: 'domain' },
         { pattern: /^\/architecture\/domains\/([^/]+)\/([^/]+)/, type: 'domain' },
+        // Agents
+        { pattern: /^\/docs\/agents\/([^/]+)\/([^/]+)/, type: 'agent' },
+        { pattern: /^\/visualiser\/agents\/([^/]+)\/([^/]+)/, type: 'agent' },
         // Services
         { pattern: /^\/docs\/services\/([^/]+)\/([^/]+)/, type: 'service' },
         { pattern: /^\/architecture\/services\/([^/]+)\/([^/]+)/, type: 'service' },

package/eventcatalog/src/components/Tables/Discover/DiscoverTable.tsx

@@ -14,10 +14,12 @@ import { UserIcon } from '@heroicons/react/24/outline';
 import { useEffect, useMemo, useState } from 'react';
 import type { TableConfiguration } from '@types';
 import { isSameVersion } from '@utils/collections/version-compare';
+import { resolveIconUrl } from '@utils/icon';
 import { FilterDropdown, CheckboxItem } from './FilterComponents';
 import { getDiscoverColumns } from './columns';
 
 export type CollectionType =
+  | 'agents'
   | 'events'
   | 'commands'
   | 'queries'
@@ -37,6 +39,8 @@ export interface DiscoverTableData {
   hasRepository?: boolean;
   isDeprecated?: boolean;
   hasDataDependencies?: boolean;
+  hasTools?: boolean;
+  hasModel?: boolean;
   hasInputs?: boolean;
   hasOutputs?: boolean;
   data: {
@@ -58,6 +62,9 @@ export interface DiscoverTableData {
     consumers?: Array<any>;
     receives?: Array<any>;
     sends?: Array<any>;
+    tools?: Array<any>;
+    model?: any;
+    agents?: Array<any>;
     services?: Array<any>;
     servicesThatWriteToContainer?: Array<any>;
     servicesThatReadFromContainer?: Array<any>;
@@ -80,6 +87,8 @@ export interface DiscoverTableProps<T extends DiscoverTableData> {
   owners?: Array<{ id: string; name: string; type?: 'user' | 'team' }>;
   producers?: Array<{ id: string; name: string }>;
   consumers?: Array<{ id: string; name: string }>;
+  agentProviders?: Array<{ id: string; name: string }>;
+  agentModels?: Array<{ id: string; name: string }>;
   propertyOptions?: PropertyOption[];
   tableConfiguration?: TableConfiguration;
   showDomainsFilter?: boolean;
@@ -88,6 +97,44 @@ export interface DiscoverTableProps<T extends DiscoverTableData> {
   showConsumersFilter?: boolean;
 }
 
+const getAgentModelId = (model: any) => [model?.name, model?.version].filter(Boolean).join(':');
+
+const getAgentProviderIconUrls = (provider?: string) => {
+  if (!provider) return null;
+  const providerIconName = provider
+    .trim()
+    .toLowerCase()
+    .replace(/\s+/g, '-')
+    .replace(/[^a-z0-9-]/g, '');
+
+  const hasThemedIcon = ['openai', 'anthropic'].includes(providerIconName);
+
+  return hasThemedIcon
+    ? {
+        light: resolveIconUrl(`/icons/agent/${providerIconName}-light.svg`),
+        dark: resolveIconUrl(`/icons/agent/${providerIconName}-dark.svg`),
+      }
+    : {
+        default: resolveIconUrl(`/icons/agent/${providerIconName}.svg`),
+      };
+};
+
+const AgentProviderIcon = ({ provider, className }: { provider: string; className: string }) => {
+  const providerIconUrls = getAgentProviderIconUrls(provider);
+  if (!providerIconUrls) return null;
+
+  if ('light' in providerIconUrls && 'dark' in providerIconUrls) {
+    return (
+      <>
+        <img src={providerIconUrls.light} alt="" className={`${className} dark:hidden`} loading="lazy" />
+        <img src={providerIconUrls.dark} alt="" className={`hidden ${className} dark:inline-block`} loading="lazy" />
+      </>
+    );
+  }
+
+  return <img src={providerIconUrls.default} alt="" className={className} loading="lazy" />;
+};
+
 export function DiscoverTable<T extends DiscoverTableData>({
   data: initialData,
   collectionType,
@@ -97,6 +144,8 @@ export function DiscoverTable<T extends DiscoverTableData>({
   owners = [],
   producers = [],
   consumers = [],
+  agentProviders = [],
+  agentModels = [],
   propertyOptions = [],
   tableConfiguration,
   showDomainsFilter = true,
@@ -129,6 +178,8 @@ export function DiscoverTable<T extends DiscoverTableData>({
   const [selectedOwners, setSelectedOwners] = useState<string[]>([]);
   const [selectedProducers, setSelectedProducers] = useState<string[]>([]);
   const [selectedConsumers, setSelectedConsumers] = useState<string[]>([]);
+  const [selectedAgentProviders, setSelectedAgentProviders] = useState<string[]>([]);
+  const [selectedAgentModels, setSelectedAgentModels] = useState<string[]>([]);
   const [selectedBadges, setSelectedBadges] = useState<string[]>([]);
   const [selectedProperties, setSelectedProperties] = useState<string[]>([]);
 
@@ -210,6 +261,22 @@ export function DiscoverTable<T extends DiscoverTableData>({
         }
       }
 
+      // Agent provider filter
+      if (selectedAgentProviders.length > 0) {
+        const provider = row.data.model?.provider;
+        if (!provider || !selectedAgentProviders.includes(provider)) {
+          return false;
+        }
+      }
+
+      // Agent model filter
+      if (selectedAgentModels.length > 0) {
+        const modelId = getAgentModelId(row.data.model);
+        if (!modelId || !selectedAgentModels.includes(modelId)) {
+          return false;
+        }
+      }
+
       // Badge filter
       if (selectedBadges.length > 0) {
         const itemBadges = row.data?.badges || [];
@@ -227,6 +294,8 @@ export function DiscoverTable<T extends DiscoverTableData>({
           if (prop === 'hasOwners' && !row.hasOwners) return false;
           if (prop === 'hasRepository' && !row.hasRepository) return false;
           if (prop === 'hasDataDependencies' && !row.hasDataDependencies) return false;
+          if (prop === 'hasModel' && !row.hasModel) return false;
+          if (prop === 'hasTools' && !row.hasTools) return false;
           if (prop === 'isDeprecated' && !row.isDeprecated) return false;
 
           // Message-specific checks
@@ -292,6 +361,8 @@ export function DiscoverTable<T extends DiscoverTableData>({
     selectedOwners,
     selectedProducers,
     selectedConsumers,
+    selectedAgentProviders,
+    selectedAgentModels,
     selectedBadges,
     selectedProperties,
     tableFilter,
@@ -379,6 +450,24 @@ export function DiscoverTable<T extends DiscoverTableData>({
     return counts;
   }, [initialData]);
 
+  const agentProviderCounts = useMemo(() => {
+    const counts: Record<string, number> = {};
+    initialData.forEach((item) => {
+      const provider = item.data.model?.provider;
+      if (provider) counts[provider] = (counts[provider] || 0) + 1;
+    });
+    return counts;
+  }, [initialData]);
+
+  const agentModelCounts = useMemo(() => {
+    const counts: Record<string, number> = {};
+    initialData.forEach((item) => {
+      const modelId = getAgentModelId(item.data.model);
+      if (modelId) counts[modelId] = (counts[modelId] || 0) + 1;
+    });
+    return counts;
+  }, [initialData]);
+
   const toggleDomain = (domainId: string) => {
     setSelectedDomains((prev) => (prev.includes(domainId) ? prev.filter((id) => id !== domainId) : [...prev, domainId]));
   };
@@ -395,6 +484,16 @@ export function DiscoverTable<T extends DiscoverTableData>({
     setSelectedConsumers((prev) => (prev.includes(consumerId) ? prev.filter((id) => id !== consumerId) : [...prev, consumerId]));
   };
 
+  const toggleAgentProvider = (providerId: string) => {
+    setSelectedAgentProviders((prev) =>
+      prev.includes(providerId) ? prev.filter((id) => id !== providerId) : [...prev, providerId]
+    );
+  };
+
+  const toggleAgentModel = (modelId: string) => {
+    setSelectedAgentModels((prev) => (prev.includes(modelId) ? prev.filter((id) => id !== modelId) : [...prev, modelId]));
+  };
+
   const toggleBadge = (badgeContent: string) => {
     setSelectedBadges((prev) => (prev.includes(badgeContent) ? prev.filter((b) => b !== badgeContent) : [...prev, badgeContent]));
   };
@@ -408,6 +507,8 @@ export function DiscoverTable<T extends DiscoverTableData>({
     setSelectedOwners([]);
     setSelectedProducers([]);
     setSelectedConsumers([]);
+    setSelectedAgentProviders([]);
+    setSelectedAgentModels([]);
     setSelectedBadges([]);
     setSelectedProperties([]);
     setShowOnlyLatest(true);
@@ -421,6 +522,8 @@ export function DiscoverTable<T extends DiscoverTableData>({
     selectedOwners.length +
     selectedProducers.length +
     selectedConsumers.length +
+    selectedAgentProviders.length +
+    selectedAgentModels.length +
     selectedBadges.length +
     selectedProperties.length +
     (!showOnlyLatest ? 1 : 0) +
@@ -438,9 +541,16 @@ export function DiscoverTable<T extends DiscoverTableData>({
   // Get selected consumer names for display
   const selectedConsumerNames = selectedConsumers.map((id) => consumers.find((c) => c.id === id)?.name || id);
 
+  const selectedAgentProviderNames = selectedAgentProviders.map(
+    (id) => agentProviders.find((provider) => provider.id === id)?.name || id
+  );
+  const selectedAgentModelNames = selectedAgentModels.map((id) => agentModels.find((model) => model.id === id)?.name || id);
+
   // Filter producers/consumers to only show those with count > 0
   const filteredProducers = producers.filter((p) => (producerCounts[p.id] || 0) > 0);
   const filteredConsumers = consumers.filter((c) => (consumerCounts[c.id] || 0) > 0);
+  const filteredAgentProviders = agentProviders.filter((provider) => (agentProviderCounts[provider.id] || 0) > 0);
+  const filteredAgentModels = agentModels.filter((model) => (agentModelCounts[model.id] || 0) > 0);
 
   // Split owners into users and teams for the filter dropdown
   const ownerUsers = owners.filter((o) => o.type !== 'team');
@@ -523,6 +633,61 @@ export function DiscoverTable<T extends DiscoverTableData>({
 
           {/* Catalog Filters Section */}
           <div className="space-y-3">
+            {collectionType === 'agents' && (filteredAgentProviders.length > 0 || filteredAgentModels.length > 0) && (
+              <>
+                {filteredAgentProviders.length > 0 && (
+                  <div>
+                    <label className="block text-xs font-medium text-[rgb(var(--ec-page-text)/0.8)] mb-1.5">Provider</label>
+                    <FilterDropdown
+                      label="Select providers..."
+                      selectedItems={selectedAgentProviderNames}
+                      onClear={() => setSelectedAgentProviders([])}
+                      onRemoveItem={(name) => {
+                        const provider = filteredAgentProviders.find((p) => p.name === name);
+                        if (provider) toggleAgentProvider(provider.id);
+                      }}
+                    >
+                      {filteredAgentProviders.map((provider) => (
+                        <CheckboxItem
+                          key={provider.id}
+                          label={provider.name}
+                          checked={selectedAgentProviders.includes(provider.id)}
+                          onChange={() => toggleAgentProvider(provider.id)}
+                          count={agentProviderCounts[provider.id] || 0}
+                          icon={<AgentProviderIcon provider={provider.name} className="h-3 w-3 rounded-sm object-contain" />}
+                        />
+                      ))}
+                    </FilterDropdown>
+                  </div>
+                )}
+
+                {filteredAgentModels.length > 0 && (
+                  <div>
+                    <label className="block text-xs font-medium text-[rgb(var(--ec-page-text)/0.8)] mb-1.5">Model</label>
+                    <FilterDropdown
+                      label="Select models..."
+                      selectedItems={selectedAgentModelNames}
+                      onClear={() => setSelectedAgentModels([])}
+                      onRemoveItem={(name) => {
+                        const model = filteredAgentModels.find((m) => m.name === name);
+                        if (model) toggleAgentModel(model.id);
+                      }}
+                    >
+                      {filteredAgentModels.map((model) => (
+                        <CheckboxItem
+                          key={model.id}
+                          label={model.name}
+                          checked={selectedAgentModels.includes(model.id)}
+                          onChange={() => toggleAgentModel(model.id)}
+                          count={agentModelCounts[model.id] || 0}
+                        />
+                      ))}
+                    </FilterDropdown>
+                  </div>
+                )}
+              </>
+            )}
+
             {/* Domains Filter */}
             {showDomainsFilter && domains.length > 0 && (
               <div>

package/eventcatalog/src/components/Tables/Discover/columns.tsx

@@ -20,6 +20,42 @@ import type { TableConfiguration } from '@types';
 
 const columnHelper = createColumnHelper<DiscoverTableData>();
 
+const getAgentProviderIconUrls = (provider?: string) => {
+  if (!provider) return null;
+  const providerIconName = provider
+    .trim()
+    .toLowerCase()
+    .replace(/\s+/g, '-')
+    .replace(/[^a-z0-9-]/g, '');
+
+  const hasThemedIcon = ['openai', 'anthropic'].includes(providerIconName);
+
+  return hasThemedIcon
+    ? {
+        light: resolveIconUrl(`/icons/agent/${providerIconName}-light.svg`),
+        dark: resolveIconUrl(`/icons/agent/${providerIconName}-dark.svg`),
+      }
+    : {
+        default: resolveIconUrl(`/icons/agent/${providerIconName}.svg`),
+      };
+};
+
+const AgentProviderIcon = ({ provider, className }: { provider: string; className: string }) => {
+  const providerIconUrls = getAgentProviderIconUrls(provider);
+  if (!providerIconUrls) return null;
+
+  if ('light' in providerIconUrls && 'dark' in providerIconUrls) {
+    return (
+      <>
+        <img src={providerIconUrls.light} alt="" className={`${className} dark:hidden`} loading="lazy" />
+        <img src={providerIconUrls.dark} alt="" className={`hidden ${className} dark:inline-block`} loading="lazy" />
+      </>
+    );
+  }
+
+  return <img src={providerIconUrls.default} alt="" className={className} loading="lazy" />;
+};
+
 // Badge cell component (proper React component to use hooks)
 const BadgesCell = ({
   badges,
@@ -107,6 +143,7 @@ const RowActionsMenu = ({ item, collectionType }: { item: DiscoverTableData; col
   const favorites = useStore(favoritesStore);
   const href = buildUrl(`/docs/${item.collection}/${item.data.id}/${item.data.version}`);
   const visualiserHref = buildUrl(`/visualiser/${item.collection}/${item.data.id}/${item.data.version}`);
+  const hasVisualiser = true;
   const nodeKey = `${item.collection}-${item.data.id}-${item.data.version}`;
   const badgeLabel =
     collectionType === 'external-systems'
@@ -169,13 +206,15 @@ const RowActionsMenu = ({ item, collectionType }: { item: DiscoverTableData; col
             <DocumentTextIcon className="h-3.5 w-3.5 text-[rgb(var(--ec-page-text-muted))]" />
             View documentation
           </a>
-          <a
-            href={visualiserHref}
-            className="flex items-center gap-2.5 px-3 py-2.5 text-xs font-medium text-[rgb(var(--ec-page-text))] transition-colors hover:bg-[rgb(var(--ec-content-hover))] hover:text-[rgb(var(--ec-accent))]"
-          >
-            <MapIcon className="h-3.5 w-3.5 text-[rgb(var(--ec-page-text-muted))]" />
-            View in visualiser
-          </a>
+          {hasVisualiser && (
+            <a
+              href={visualiserHref}
+              className="flex items-center gap-2.5 px-3 py-2.5 text-xs font-medium text-[rgb(var(--ec-page-text))] transition-colors hover:bg-[rgb(var(--ec-content-hover))] hover:text-[rgb(var(--ec-accent))]"
+            >
+              <MapIcon className="h-3.5 w-3.5 text-[rgb(var(--ec-page-text-muted))]" />
+              View in visualiser
+            </a>
+          )}
           <button
             type="button"
             onClick={handleToggleFavorite}
@@ -277,6 +316,82 @@ const CollectionListCell = ({
   );
 };
 
+// ============================================================================
+// AGENT COLUMNS
+// ============================================================================
+export const getAgentColumns = (tableConfiguration: TableConfiguration) => [
+  columnHelper.accessor('data.name', {
+    id: 'name',
+    header: () => <span>{tableConfiguration?.columns?.name?.label || 'Agent'}</span>,
+    cell: (info) => <ResourceNameCell item={info.row.original} />,
+    meta: {
+      filterVariant: 'name',
+    },
+  }),
+  createSummaryColumn(tableConfiguration),
+  columnHelper.accessor((row) => row.data.model?.provider, {
+    id: 'provider',
+    header: () => <span>{tableConfiguration?.columns?.provider?.label || 'Provider'}</span>,
+    cell: (info) => {
+      const provider = info.getValue() as string | undefined;
+      if (!provider) return <span className="text-xs text-[rgb(var(--ec-icon-color))]">-</span>;
+      return (
+        <span className="inline-flex items-center gap-2" title={provider} aria-label={provider}>
+          <AgentProviderIcon provider={provider} className="h-3 w-3 flex-shrink-0 rounded-sm object-contain" />
+          <span className="text-[0.8rem] font-medium text-[rgb(var(--ec-page-text))]">{provider}</span>
+        </span>
+      );
+    },
+    meta: {
+      showFilter: false,
+    },
+  }),
+  columnHelper.accessor('data.model', {
+    id: 'model',
+    header: () => <span>{tableConfiguration?.columns?.model?.label || 'Model'}</span>,
+    cell: (info) => {
+      const model = info.getValue() as any;
+      if (!model?.name) return <span className="text-xs text-[rgb(var(--ec-icon-color))]">-</span>;
+      return (
+        <div className="flex flex-col gap-0.5 text-[0.8rem]">
+          <span className="font-medium text-[rgb(var(--ec-page-text))]">{model.name}</span>
+        </div>
+      );
+    },
+    meta: {
+      showFilter: false,
+    },
+  }),
+  columnHelper.accessor('data.receives', {
+    id: 'receives',
+    header: () => (
+      <span className="flex items-center gap-1">
+        <ArrowDownIcon className="w-3.5 h-3.5" />
+        Receives
+      </span>
+    ),
+    cell: (info) => <CollectionListCell items={info.getValue()} />,
+    meta: {
+      showFilter: false,
+    },
+  }),
+  columnHelper.accessor('data.sends', {
+    id: 'sends',
+    header: () => (
+      <span className="flex items-center gap-1">
+        <ArrowUpIcon className="w-3.5 h-3.5" />
+        Sends
+      </span>
+    ),
+    cell: (info) => <CollectionListCell items={info.getValue()} />,
+    meta: {
+      showFilter: false,
+    },
+  }),
+  createBadgesColumn(tableConfiguration),
+  createActionsColumn('agents', tableConfiguration),
+];
+
 // ============================================================================
 // EVENT COLUMNS
 // ============================================================================
@@ -440,6 +555,14 @@ export const getDomainColumns = (tableConfiguration: TableConfiguration) => [
       showFilter: false,
     },
   }),
+  columnHelper.accessor('data.agents', {
+    id: 'agents',
+    header: () => <span>Agents</span>,
+    cell: (info) => <CollectionListCell items={info.getValue()} />,
+    meta: {
+      showFilter: false,
+    },
+  }),
   createBadgesColumn(tableConfiguration),
   createActionsColumn('domains', tableConfiguration),
 ];
@@ -552,6 +675,8 @@ export const getDataProductColumns = (tableConfiguration: TableConfiguration) =>
 // ============================================================================
 export const getDiscoverColumns = (collectionType: CollectionType, tableConfiguration: TableConfiguration) => {
   switch (collectionType) {
+    case 'agents':
+      return getAgentColumns(tableConfiguration);
     case 'events':
       return getEventColumns(tableConfiguration);
     case 'commands':

package/eventcatalog/src/components/Tables/Table.tsx

@@ -31,6 +31,7 @@ declare module '@tanstack/react-table' {
       | 'ownedCommands'
       | 'ownedQueries'
       | 'ownedEvents'
+      | 'ownedAgents'
       | 'ownedServices'
       | 'associatedTeams'
       | 'servicesThatWriteToContainer'
@@ -134,6 +135,7 @@ export type TData<T extends TCollectionTypes> = {
     role?: string;
     ownedCommands: any;
     ownedEvents: any;
+    ownedAgents: any;
     ownedServices: any;
     associatedTeams: any;
     ownedQueries: any;

package/eventcatalog/src/components/Tables/columns/TeamsTableColumns.tsx

@@ -121,4 +121,21 @@ export const columns = (tableConfiguration: TableConfiguration) => [
     footer: (info) => info.column.id,
     filterFn: filterCollectionByName('ownedServices'),
   }),
+
+  columnHelper.accessor('data.ownedAgents', {
+    id: 'ownedAgents',
+    header: () => <span>{tableConfiguration.columns?.ownedAgents?.label || 'Owned agents'}</span>,
+    meta: {
+      filterVariant: 'collection',
+      collectionFilterKey: 'ownedAgents',
+    },
+    cell: (info) => (
+      <CollectionListCell
+        items={info.getValue() as Array<{ collection: string; data: { id: string; name: string; version?: string } }> | undefined}
+        emptyText="No agents"
+      />
+    ),
+    footer: (info) => info.column.id,
+    filterFn: filterCollectionByName('ownedAgents'),
+  }),
 ];

package/eventcatalog/src/components/Tables/columns/UserTableColumns.tsx

@@ -141,6 +141,23 @@ export const columns = (tableConfiguration: TableConfiguration) => [
     filterFn: filterCollectionByName('ownedServices'),
   }),
 
+  columnHelper.accessor('data.ownedAgents', {
+    id: 'ownedAgents',
+    header: () => <span>{tableConfiguration.columns?.ownedAgents?.label || 'Owned agents'}</span>,
+    meta: {
+      filterVariant: 'collection',
+      collectionFilterKey: 'ownedAgents',
+    },
+    cell: (info) => (
+      <CollectionListCell
+        items={info.getValue() as Array<{ collection: string; data: { id: string; name: string; version?: string } }> | undefined}
+        emptyText="No agents"
+      />
+    ),
+    footer: (info) => info.column.id,
+    filterFn: filterCollectionByName('ownedAgents'),
+  }),
+
   columnHelper.accessor('data.associatedTeams', {
     id: 'associatedTeams',
     header: () => <span>{tableConfiguration.columns?.associatedTeams?.label || 'Teams'}</span>,