@eventcatalog/core 4.12.0-beta.3 → 4.12.0-beta.5

package/dist/analytics/analytics.cjs

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(analytics_exports);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "4.12.0-beta.3";
+var version = "4.12.0-beta.5";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-GGPT4I3K.js";
-import "../chunk-AVRFMQJX.js";
+} from "../chunk-YTT7Z7QA.js";
+import "../chunk-4BZILEBA.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

@@ -146,7 +146,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "4.12.0-beta.3";
+var version = "4.12.0-beta.5";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,9 +1,9 @@
 import {
   log_build_default
-} from "../chunk-5MBYZHYS.js";
+} from "../chunk-UVFZAJCT.js";
 import "../chunk-ZAZHAVKB.js";
-import "../chunk-GGPT4I3K.js";
-import "../chunk-AVRFMQJX.js";
+import "../chunk-YTT7Z7QA.js";
+import "../chunk-4BZILEBA.js";
 import "../chunk-JE6RX7SJ.js";
 export {
   log_build_default as default

package/dist/{chunk-AVRFMQJX.js → chunk-4BZILEBA.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "4.12.0-beta.3";
+var version = "4.12.0-beta.5";
 
 // src/constants.ts
 var VERSION = version;

package/dist/{chunk-TAGBLT3L.js → chunk-5U3IKG4U.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-AVRFMQJX.js";
+} from "./chunk-4BZILEBA.js";
 
 // src/utils/cli-logger.ts
 import pc from "picocolors";

package/dist/{chunk-56TJHDS2.js → chunk-IDSVEUSL.js}

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-TAGBLT3L.js";
+} from "./chunk-5U3IKG4U.js";
 import {
   cleanup,
   getEventCatalogConfigFile

package/dist/{chunk-5MBYZHYS.js → chunk-UVFZAJCT.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-ZAZHAVKB.js";
 import {
   raiseEvent
-} from "./chunk-GGPT4I3K.js";
+} from "./chunk-YTT7Z7QA.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/{chunk-GGPT4I3K.js → chunk-YTT7Z7QA.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-AVRFMQJX.js";
+} from "./chunk-4BZILEBA.js";
 
 // src/analytics/analytics.js
 import os from "os";

package/dist/constants.cjs

@@ -25,7 +25,7 @@ __export(constants_exports, {
 module.exports = __toCommonJS(constants_exports);
 
 // package.json
-var version = "4.12.0-beta.3";
+var version = "4.12.0-beta.5";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-AVRFMQJX.js";
+} from "./chunk-4BZILEBA.js";
 export {
   VERSION
 };

package/dist/eventcatalog.cjs

@@ -151,7 +151,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "4.12.0-beta.3";
+var version = "4.12.0-beta.5";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -1,11 +1,11 @@
+import {
+  log_build_default
+} from "./chunk-UVFZAJCT.js";
+import "./chunk-ZAZHAVKB.js";
 import {
   runMigrations
 } from "./chunk-XUAF2H54.js";
 import "./chunk-CA4U2JP7.js";
-import {
-  log_build_default
-} from "./chunk-5MBYZHYS.js";
-import "./chunk-ZAZHAVKB.js";
 import {
   FederationConflictError,
   FederationDiagnosticError,
@@ -14,14 +14,14 @@ import {
 import "./chunk-WRNH5C3U.js";
 import "./chunk-5EPNFDT5.js";
 import "./chunk-A2RZR3U4.js";
+import "./chunk-SDZQJTJW.js";
+import "./chunk-352FGP6W.js";
 import "./chunk-R7Z5ALYI.js";
 import {
   getFederationDiagnosticCounts,
   getVisibleFederationDiagnostics
 } from "./chunk-JJPB6EOZ.js";
 import "./chunk-FV56YFM4.js";
-import "./chunk-SDZQJTJW.js";
-import "./chunk-352FGP6W.js";
 import {
   getProjectOutDir,
   isAuthEnabled,
@@ -30,10 +30,10 @@ import {
 } from "./chunk-3SJDIENM.js";
 import {
   generate
-} from "./chunk-56TJHDS2.js";
+} from "./chunk-IDSVEUSL.js";
 import {
   logger
-} from "./chunk-TAGBLT3L.js";
+} from "./chunk-5U3IKG4U.js";
 import {
   resolve_catalog_dependencies_default
 } from "./chunk-EEZXGNF6.js";
@@ -47,7 +47,7 @@ import {
 import {
   watch
 } from "./chunk-U63GDPPY.js";
-import "./chunk-GGPT4I3K.js";
+import "./chunk-YTT7Z7QA.js";
 import {
   getAstroConfigPath
 } from "./chunk-VIJJ7JKH.js";
@@ -62,7 +62,7 @@ import {
 } from "./chunk-SAN4U2WU.js";
 import {
   VERSION
-} from "./chunk-AVRFMQJX.js";
+} from "./chunk-4BZILEBA.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/federation/federate.js

@@ -6,11 +6,11 @@ import {
 import "../chunk-WRNH5C3U.js";
 import "../chunk-5EPNFDT5.js";
 import "../chunk-A2RZR3U4.js";
+import "../chunk-SDZQJTJW.js";
+import "../chunk-352FGP6W.js";
 import "../chunk-R7Z5ALYI.js";
 import "../chunk-JJPB6EOZ.js";
 import "../chunk-FV56YFM4.js";
-import "../chunk-SDZQJTJW.js";
-import "../chunk-352FGP6W.js";
 import "../chunk-JE6RX7SJ.js";
 export {
   FederationConflictError,

package/dist/generate.cjs

@@ -112,7 +112,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "4.12.0-beta.3";
+var version = "4.12.0-beta.5";
 
 // src/constants.ts
 var VERSION = version;

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-56TJHDS2.js";
-import "./chunk-TAGBLT3L.js";
-import "./chunk-AVRFMQJX.js";
+} from "./chunk-IDSVEUSL.js";
+import "./chunk-5U3IKG4U.js";
+import "./chunk-4BZILEBA.js";
 import "./chunk-JE6RX7SJ.js";
 export {
   generate

package/dist/utils/cli-logger.cjs

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(cli_logger_exports);
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "4.12.0-beta.3";
+var version = "4.12.0-beta.5";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-TAGBLT3L.js";
-import "../chunk-AVRFMQJX.js";
+} from "../chunk-5U3IKG4U.js";
+import "../chunk-4BZILEBA.js";
 export {
   logger
 };

package/eventcatalog/astro.config.mjs

@@ -34,7 +34,7 @@ import preprocessExpressiveCodeConfig from './integrations/expressive-code-confi
 import catalogAssets from './integrations/catalog-assets.mjs';
 import runtimeDependencies from './integrations/runtime-dependencies.mjs';
 import { getRuntimePaths } from './integrations/runtime-paths.mjs';
-import { clientDependencies } from './integrations/client-dependencies.mjs';
+import { collectClientDependencies } from './integrations/client-dependencies.mjs';
 
 const projectDirectory = process.env.PROJECT_DIR || process.cwd();
 const { runtimeDirectory } = getRuntimePaths(projectDirectory, process.env.CATALOG_DIR);
@@ -219,7 +219,7 @@ export default defineConfig({
     },
     optimizeDeps: {
       exclude: [],
-      include: clientDependencies,
+      include: collectClientDependencies(),
     },
   },
 });

package/eventcatalog/integrations/client-dependencies.mjs

@@ -1,27 +1,126 @@
-// Core's browser components live in node_modules in an installed catalog. Vite
-// skips discovering dependencies imported from there, so explicitly pre-bundle
-// the graph and chat entrypoints, including their nested CommonJS dependencies.
-export const clientDependencies = [
-  '@eventcatalog/visualiser',
-  '@xyflow/react',
-  '@ai-sdk/react',
-  'ai',
-  'lucide-react',
-  '@heroicons/react/24/outline',
-  '@heroicons/react/24/solid',
-  '@heroicons/react/20/solid',
-  '@headlessui/react',
-  '@nanostores/react',
-  'nanostores',
-  'react',
-  'react-dom',
-  'semver',
-  'diff',
-  'diff2html',
-  // ArchitectureGraph embeds also need these ready before the first request.
-  // Discovering them mid-session can invalidate already-loaded chunks.
-  'd3-force',
-  'd3-selection',
-  'd3-zoom',
-  'd3-drag',
-];
+import fs from 'node:fs';
+import path from 'node:path';
+import { getRuntimeAliases, packageDirectory } from './eventcatalog-runtime.mjs';
+
+// In an installed catalog Core's browser components live in node_modules, and
+// Vite never discovers dependencies imported from there. Anything it serves
+// unoptimized reaches the browser raw, so a CommonJS package anywhere in the
+// tree (e.g. react-markdown > hast-util-to-jsx-runtime > style-to-js) breaks
+// hydration. Astro's own crawl (vitefu) only covers Core's direct CommonJS
+// dependencies. Collect every dependency Core's browser code imports instead,
+// so Vite pre-bundles each one together with its nested dependencies.
+//
+// Entrypoints are React components and processed <script> blocks in .astro
+// files. Local and aliased JavaScript/TypeScript imports are followed. Like the
+// server dependency scan this matches literal imports rather than parsing, so
+// commented-out imports can over-include; computed specifiers are not found.
+
+// Always needed by React islands, even before a component imports them directly.
+const baseDependencies = ['react', 'react-dom', 'react-dom/client', 'react/jsx-runtime', 'react/jsx-dev-runtime'];
+
+const scriptExtensions = ['.ts', '.tsx', '.js', '.jsx', '.mjs'];
+const typeOnlyImport = /\b(?:import|export)\s+type\s+[^'";]*?\bfrom\s*['"][^'"]+['"]/g;
+const importSpecifier = /\b(?:from\s*|import\s*(?:\(\s*)?)['"]([^'"]+)['"]/g;
+const astroScript = /<script\b([^>]*)>([\s\S]*?)<\/script>/g;
+
+const packageName = (specifier) =>
+  specifier
+    .split('/')
+    .slice(0, specifier.startsWith('@') ? 2 : 1)
+    .join('/');
+
+const isTestFile = (file) => /\.(?:test|spec)\.[cm]?[jt]sx?$/.test(file) || file.split(path.sep).includes('__tests__');
+
+function resolveFile(file) {
+  const candidates = [
+    file,
+    ...scriptExtensions.map((extension) => file + extension),
+    ...scriptExtensions.map((extension) => path.join(file, `index${extension}`)),
+  ];
+  return candidates.find(
+    (candidate) =>
+      scriptExtensions.includes(path.extname(candidate)) && fs.existsSync(candidate) && fs.statSync(candidate).isFile()
+  );
+}
+
+function findPackageJson(name, fromDirectory) {
+  for (let directory = fromDirectory; ; directory = path.dirname(directory)) {
+    const file = path.join(directory, 'node_modules', name, 'package.json');
+    if (fs.existsSync(file)) return JSON.parse(fs.readFileSync(file, 'utf-8'));
+    if (path.dirname(directory) === directory) return;
+  }
+}
+
+// Astro excludes its framework packages (those built on astro) from
+// pre-bundling because they ship raw .astro files. Match its detection.
+function isAstroPackage(name, coreDirectory) {
+  const pkg = findPackageJson(name, coreDirectory);
+  return name === 'astro' || Boolean(pkg?.dependencies?.astro || pkg?.peerDependencies?.astro);
+}
+
+function listFiles(directory) {
+  return fs.readdirSync(directory, { withFileTypes: true }).flatMap((entry) => {
+    if (entry.name.startsWith('.') || entry.name === 'node_modules') return [];
+    const file = path.join(directory, entry.name);
+    return entry.isDirectory() ? listFiles(file) : [file];
+  });
+}
+
+export function collectClientDependencies(coreDirectory = packageDirectory) {
+  const { dependencies = {} } = JSON.parse(fs.readFileSync(path.join(coreDirectory, '../package.json'), 'utf-8'));
+  // Only Core's own source aliases matter here; catalog-owned aliases point at
+  // the user's project, which Vite already scans normally.
+  const aliases = getRuntimeAliases({ projectDirectory: coreDirectory, runtimeDirectory: coreDirectory, coreDirectory }).filter(
+    ({ replacement }) => replacement.startsWith(path.join(coreDirectory, 'src'))
+  );
+  const resolveAlias = (specifier) => {
+    for (const { find, replacement } of aliases) {
+      if (find instanceof RegExp) {
+        if (find.test(specifier)) return specifier.replace(find, replacement);
+      } else if (specifier === find || specifier.startsWith(`${find}/`)) {
+        return replacement + specifier.slice(find.length);
+      }
+    }
+  };
+
+  const found = new Set(baseDependencies);
+  const visited = new Set();
+  const queue = [];
+
+  const scan = (code, importer) => {
+    for (const [, specifier] of code.replace(typeOnlyImport, '').matchAll(importSpecifier)) {
+      // Vite owns query imports (for example ?raw assets) and stylesheets.
+      if (/[?#]/.test(specifier) || /\.(?:css|scss|sass|less)$/.test(specifier)) continue;
+      const local = specifier.startsWith('.') ? path.resolve(path.dirname(importer), specifier) : resolveAlias(specifier);
+      if (local !== undefined) {
+        const file = resolveFile(local);
+        if (file && !visited.has(file)) queue.push(file);
+      } else if (Object.hasOwn(dependencies, packageName(specifier))) {
+        found.add(specifier);
+      }
+    }
+  };
+
+  for (const file of listFiles(path.join(coreDirectory, 'src'))) {
+    if (isTestFile(file)) continue;
+    if (/\.[jt]sx$/.test(file)) {
+      queue.push(file);
+    } else if (file.endsWith('.astro')) {
+      for (const [, attributes, code] of fs.readFileSync(file, 'utf-8').matchAll(astroScript)) {
+        // Inline, external and data scripts are not processed by Vite.
+        if (/\bis:inline\b|\bsrc\s*=|\btype\s*=\s*['"]?(?!module)/.test(attributes)) continue;
+        scan(code, file);
+      }
+    }
+  }
+
+  while (queue.length > 0) {
+    const file = queue.pop();
+    if (visited.has(file) || isTestFile(file)) continue;
+    visited.add(file);
+    scan(fs.readFileSync(file, 'utf-8'), file);
+  }
+
+  const astroPackages = new Set([...found].map(packageName).filter((name) => isAstroPackage(name, coreDirectory)));
+  return [...found].filter((specifier) => !astroPackages.has(packageName(specifier))).sort();
+}

package/eventcatalog/src/components/ChatPanel/ChatPanel.tsx

@@ -847,8 +847,10 @@ const ChatPanel = ({ isOpen, onClose, configured = false }: ChatPanelProps) => {
 
   return (
     <>
-      {/* Keyframes for fade-in animation - using constant to avoid re-injection */}
-      <style>{CHAT_PANEL_STYLES}</style>
+      {/* Keyframes for fade-in animation - using constant to avoid re-injection.
+          Injected raw: React 18's server renderer escapes the `>` selectors in
+          text children, which the client doesn't, causing a hydration mismatch. */}
+      <style dangerouslySetInnerHTML={{ __html: CHAT_PANEL_STYLES }} />
 
       {/* Panel - hidden when fullscreen modal is open */}
       {!isFullscreen && (

package/eventcatalog/src/components/SchemaExplorer/JSONSchemaViewer.tsx

@@ -1,4 +1,4 @@
-import { useState, useEffect, useRef, useMemo } from 'react';
+import { useState, useEffect, useRef, useMemo, useId } from 'react';
 
 interface JSONSchemaViewerProps {
   schema: any;
@@ -293,7 +293,8 @@ const NestedVariantSelector = ({
 const SchemaProperty = ({ name, details, isRequired, level, isListItem = false, expand }: SchemaPropertyProps) => {
   const [isExpanded, setIsExpanded] = useState(expand);
   const [selectedVariantIndex, setSelectedVariantIndex] = useState(0);
-  const contentId = useRef(`prop-${name}-${level}-${Math.random().toString(36).substring(2, 7)}`).current;
+  // useId keeps the server and client IDs identical during hydration.
+  const contentId = `prop-${name}-${level}-${useId()}`;
 
   useEffect(() => {
     setIsExpanded(expand);

package/eventcatalog/src/enterprise/ai/chat-api.ts

@@ -4,7 +4,16 @@
  */
 
 import type { APIContext } from 'astro';
-import { convertToModelMessages, stepCountIs, streamText, tool, type LanguageModel, type ModelMessage, type UIMessage } from 'ai';
+import {
+  convertToModelMessages,
+  createUIMessageStreamResponse,
+  isStepCount,
+  streamText,
+  toUIMessageStream,
+  tool,
+  type LanguageModel,
+  type UIMessage,
+} from 'ai';
 import { join } from 'node:path';
 import { isEventCatalogScaleEnabled, isEventCatalogStarterEnabled } from '@utils/feature';
 import { getCollection, getEntry } from 'astro:content';
@@ -211,204 +220,198 @@ export const POST = async ({ request }: APIContext<{ question: string; messages:
   const referrer = request.headers.get('referer');
 
   try {
-    const result = await streamText({
-      model,
-      system: getBaseSystemPrompt(referrer ?? ''),
-      messages: await convertToModelMessages(messages),
-      temperature: modelConfiguration?.temperature ?? 0.7,
-      stopWhen: stepCountIs(5),
-      // maxTokens: 4000, // Increased to handle large tool results
-      onError: (error) => {
-        console.error('[Chat] On error', error);
-      },
-      // maxOutputTokens: 40000,
-      // tools: tools,
-      tools: {
-        getResources: tool({
-          description: toolDescriptions.getResources,
-          inputSchema: z.object({
-            collection: collectionSchema.describe('The collection to get the resources from'),
-          }),
-          execute: async ({ collection }) => {
-            const result = await getResourcesImpl({ collection });
-            if ('error' in result) return result;
-            return result.resources;
-          },
+    const tools = {
+      getResources: tool({
+        description: toolDescriptions.getResources,
+        inputSchema: z.object({
+          collection: collectionSchema.describe('The collection to get the resources from'),
         }),
-        getResource: tool({
-          description: toolDescriptions.getResource,
-          inputSchema: z.object({
-            collection: collectionSchema.describe('The collection to get the resource from'),
-            id: z.string().describe('The id of the resource to get'),
-            version: z.string().describe('The version of the resource to get'),
-          }),
-          execute: async ({ collection, id, version }) => {
-            return await getResourceImpl({ collection, id, version });
-          },
+        execute: async ({ collection }) => {
+          const result = await getResourcesImpl({ collection });
+          if ('error' in result) return result;
+          return result.resources;
+        },
+      }),
+      getResource: tool({
+        description: toolDescriptions.getResource,
+        inputSchema: z.object({
+          collection: collectionSchema.describe('The collection to get the resource from'),
+          id: z.string().describe('The id of the resource to get'),
+          version: z.string().describe('The version of the resource to get'),
         }),
-        getProducersAndConsumersFromSchema: tool({
-          description: 'Use this tool to get the producers and consumers for a schema by its id and version',
-          inputSchema: z.object({
-            collection: messageCollectionSchema.describe('The collection to get the producers and consumers from'),
-            id: z.string().describe('The id of the message to get the producers and consumers for'),
-            version: z.string().describe('The version of the message to get the producers and consumers for'),
-          }),
-          execute: async ({ collection, id, version }) => {
-            const resource = await getEntry(collection as any, `${id}-${version}`);
-            const producers = resource.data.producers || [];
-            const consumers = resource.data.consumers || [];
-            return {
-              producers,
-              consumers,
-            };
-          },
+        execute: async ({ collection, id, version }) => {
+          return await getResourceImpl({ collection, id, version });
+        },
+      }),
+      getProducersAndConsumersFromSchema: tool({
+        description: 'Use this tool to get the producers and consumers for a schema by its id and version',
+        inputSchema: z.object({
+          collection: messageCollectionSchema.describe('The collection to get the producers and consumers from'),
+          id: z.string().describe('The id of the message to get the producers and consumers for'),
+          version: z.string().describe('The version of the message to get the producers and consumers for'),
         }),
-        getMessagesProducedOrConsumedByResource: tool({
-          description: toolDescriptions.getMessagesProducedOrConsumedByResource,
-          inputSchema: z.object({
-            resourceId: z.string().describe('The id of the resource to get the messages produced or consumed for'),
-            resourceVersion: z.string().describe('The version of the resource to get the messages produced or consumed for'),
-            resourceCollection: resourceCollectionSchema
-              .describe('The collection of the resource to get the messages produced or consumed for')
-              .default('services'),
-          }),
-          execute: async ({ resourceId, resourceVersion, resourceCollection }) => {
-            return await getMessagesImpl({ resourceId, resourceVersion, resourceCollection });
-          },
+        execute: async ({ collection, id, version }) => {
+          const resource = await getEntry(collection as any, `${id}-${version}`);
+          const producers = resource.data.producers || [];
+          const consumers = resource.data.consumers || [];
+          return {
+            producers,
+            consumers,
+          };
+        },
+      }),
+      getMessagesProducedOrConsumedByResource: tool({
+        description: toolDescriptions.getMessagesProducedOrConsumedByResource,
+        inputSchema: z.object({
+          resourceId: z.string().describe('The id of the resource to get the messages produced or consumed for'),
+          resourceVersion: z.string().describe('The version of the resource to get the messages produced or consumed for'),
+          resourceCollection: resourceCollectionSchema
+            .describe('The collection of the resource to get the messages produced or consumed for')
+            .default('services'),
         }),
-        getProducerAndConsumerForMessage: tool({
-          description: 'Use this tool to get the producers and consumers for a message by its id and version',
-          inputSchema: z.object({
-            messageId: z.string().describe('The id of the message to get the producers and consumers for'),
-            messageVersion: z.string().describe('The version of the message to get the producers and consumers for'),
-            messageCollection: messageCollectionSchema
-              .describe('The collection of the message to get the producers and consumers for')
-              .default('events'),
-          }),
-          execute: async ({ messageId, messageVersion, messageCollection }) => {
-            const services = await getCollection('services');
-            const message = await getEntry(messageCollection as any, `${messageId}-${messageVersion}`);
-            const consumers = await getProducersOfMessage(services, message as any);
-            return consumers;
-          },
+        execute: async ({ resourceId, resourceVersion, resourceCollection }) => {
+          return await getMessagesImpl({ resourceId, resourceVersion, resourceCollection });
+        },
+      }),
+      getProducerAndConsumerForMessage: tool({
+        description: 'Use this tool to get the producers and consumers for a message by its id and version',
+        inputSchema: z.object({
+          messageId: z.string().describe('The id of the message to get the producers and consumers for'),
+          messageVersion: z.string().describe('The version of the message to get the producers and consumers for'),
+          messageCollection: messageCollectionSchema
+            .describe('The collection of the message to get the producers and consumers for')
+            .default('events'),
         }),
-        getConsumersOfMessage: tool({
-          description: 'Use this tool to get the consumers for a message by its id and version',
-          inputSchema: z.object({
-            messageId: z.string().describe('The id of the message to get the consumers for'),
-            messageVersion: z.string().describe('The version of the message to get the consumers for'),
-            messageCollection: messageCollectionSchema
-              .describe('The collection of the message to get the consumers for')
-              .default('events'),
-          }),
-          execute: async ({ messageId, messageVersion, messageCollection }) => {
-            const services = await getCollection('services');
-            const message = await getEntry(messageCollection as any, `${messageId}-${messageVersion}`);
-            const consumers = await getConsumersOfMessage(services, message as any);
-            return consumers;
-          },
+        execute: async ({ messageId, messageVersion, messageCollection }) => {
+          const services = await getCollection('services');
+          const message = await getEntry(messageCollection as any, `${messageId}-${messageVersion}`);
+          const consumers = await getProducersOfMessage(services, message as any);
+          return consumers;
+        },
+      }),
+      getConsumersOfMessage: tool({
+        description: 'Use this tool to get the consumers for a message by its id and version',
+        inputSchema: z.object({
+          messageId: z.string().describe('The id of the message to get the consumers for'),
+          messageVersion: z.string().describe('The version of the message to get the consumers for'),
+          messageCollection: messageCollectionSchema
+            .describe('The collection of the message to get the consumers for')
+            .default('events'),
         }),
-        getSchemaForResource: tool({
-          description: toolDescriptions.getSchemaForResource,
-          inputSchema: z.object({
-            resourceId: z.string().describe('The id of the resource to get the schema for'),
-            resourceVersion: z.string().describe('The version of the resource to get the schema for'),
-            resourceCollection: resourceCollectionSchema
-              .describe('The collection of the resource to get the schema for')
-              .default('services'),
-          }),
-          execute: async ({ resourceId, resourceVersion, resourceCollection }) => {
-            return await getSchemaImpl({ resourceId, resourceVersion, resourceCollection });
-          },
+        execute: async ({ messageId, messageVersion, messageCollection }) => {
+          const services = await getCollection('services');
+          const message = await getEntry(messageCollection as any, `${messageId}-${messageVersion}`);
+          const consumers = await getConsumersOfMessage(services, message as any);
+          return consumers;
+        },
+      }),
+      getSchemaForResource: tool({
+        description: toolDescriptions.getSchemaForResource,
+        inputSchema: z.object({
+          resourceId: z.string().describe('The id of the resource to get the schema for'),
+          resourceVersion: z.string().describe('The version of the resource to get the schema for'),
+          resourceCollection: resourceCollectionSchema
+            .describe('The collection of the resource to get the schema for')
+            .default('services'),
         }),
-        getDataProductInputs: tool({
-          description: toolDescriptions.getDataProductInputs,
-          inputSchema: z.object({
-            dataProductId: z.string().describe('The id of the data product to get the inputs for'),
-            dataProductVersion: z.string().describe('The version of the data product to get the inputs for'),
-          }),
-          execute: async ({ dataProductId, dataProductVersion }) => {
-            return await getDataProductInputsImpl({ dataProductId, dataProductVersion });
-          },
+        execute: async ({ resourceId, resourceVersion, resourceCollection }) => {
+          return await getSchemaImpl({ resourceId, resourceVersion, resourceCollection });
+        },
+      }),
+      getDataProductInputs: tool({
+        description: toolDescriptions.getDataProductInputs,
+        inputSchema: z.object({
+          dataProductId: z.string().describe('The id of the data product to get the inputs for'),
+          dataProductVersion: z.string().describe('The version of the data product to get the inputs for'),
         }),
-        getDataProductOutputs: tool({
-          description: toolDescriptions.getDataProductOutputs,
-          inputSchema: z.object({
-            dataProductId: z.string().describe('The id of the data product to get the outputs for'),
-            dataProductVersion: z.string().describe('The version of the data product to get the outputs for'),
-          }),
-          execute: async ({ dataProductId, dataProductVersion }) => {
-            return await getDataProductOutputsImpl({ dataProductId, dataProductVersion });
-          },
+        execute: async ({ dataProductId, dataProductVersion }) => {
+          return await getDataProductInputsImpl({ dataProductId, dataProductVersion });
+        },
+      }),
+      getDataProductOutputs: tool({
+        description: toolDescriptions.getDataProductOutputs,
+        inputSchema: z.object({
+          dataProductId: z.string().describe('The id of the data product to get the outputs for'),
+          dataProductVersion: z.string().describe('The version of the data product to get the outputs for'),
         }),
-        getArchitectureDiagramAsMermaid: tool({
-          description: toolDescriptions.getArchitectureDiagramAsMermaid,
-          inputSchema: z.object({
-            resourceId: z.string().describe('The id of the resource to get the architecture diagram for'),
-            resourceVersion: z.string().describe('The version of the resource to get the architecture diagram for'),
-            resourceCollection: visualiserCollectionSchema
-              .describe(
-                'The collection of the resource (events, commands, queries, services, domains, systems, flows, containers, data-products)'
-              )
-              .default('services'),
-          }),
-          execute: async ({ resourceId, resourceVersion, resourceCollection }) => {
-            return await getArchitectureDiagramImpl({ resourceId, resourceVersion, resourceCollection });
-          },
+        execute: async ({ dataProductId, dataProductVersion }) => {
+          return await getDataProductOutputsImpl({ dataProductId, dataProductVersion });
+        },
+      }),
+      getArchitectureDiagramAsMermaid: tool({
+        description: toolDescriptions.getArchitectureDiagramAsMermaid,
+        inputSchema: z.object({
+          resourceId: z.string().describe('The id of the resource to get the architecture diagram for'),
+          resourceVersion: z.string().describe('The version of the resource to get the architecture diagram for'),
+          resourceCollection: visualiserCollectionSchema
+            .describe(
+              'The collection of the resource (events, commands, queries, services, domains, systems, flows, containers, data-products)'
+            )
+            .default('services'),
         }),
-        getCustomDocs: tool({
-          description: toolDescriptions.getCustomDocs,
-          inputSchema: z.object({
-            cursor: z.string().optional().describe('Pagination cursor from previous response'),
-            search: z.string().optional().describe('Search term to filter docs by title, id, or summary (case-insensitive)'),
-          }),
-          execute: async ({ cursor, search }) => {
-            return await getCustomDocsImpl({ cursor, search });
-          },
+        execute: async ({ resourceId, resourceVersion, resourceCollection }) => {
+          return await getArchitectureDiagramImpl({ resourceId, resourceVersion, resourceCollection });
+        },
+      }),
+      getCustomDocs: tool({
+        description: toolDescriptions.getCustomDocs,
+        inputSchema: z.object({
+          cursor: z.string().optional().describe('Pagination cursor from previous response'),
+          search: z.string().optional().describe('Search term to filter docs by title, id, or summary (case-insensitive)'),
         }),
-        searchCustomDocs: tool({
-          description: toolDescriptions.searchCustomDocs,
-          inputSchema: z.object({
-            query: z.string().describe('Full-text search query, e.g. keywords describing the topic to find'),
-            limit: z.number().optional().describe('Maximum number of results to return (default 10)'),
-          }),
-          execute: async ({ query, limit }) => {
-            return await searchCustomDocsImpl({ query, limit });
-          },
+        execute: async ({ cursor, search }) => {
+          return await getCustomDocsImpl({ cursor, search });
+        },
+      }),
+      searchCustomDocs: tool({
+        description: toolDescriptions.searchCustomDocs,
+        inputSchema: z.object({
+          query: z.string().describe('Full-text search query, e.g. keywords describing the topic to find'),
+          limit: z.number().optional().describe('Maximum number of results to return (default 10)'),
         }),
-        getCustomDoc: tool({
-          description: toolDescriptions.getCustomDoc,
-          inputSchema: z.object({
-            id: z.string().describe('The id or slug of the custom documentation page'),
-            section: z.string().optional().describe('Optional section heading to return only that section of the page'),
-          }),
-          execute: async ({ id, section }) => {
-            return await getCustomDocImpl({ id, section });
-          },
+        execute: async ({ query, limit }) => {
+          return await searchCustomDocsImpl({ query, limit });
+        },
+      }),
+      getCustomDoc: tool({
+        description: toolDescriptions.getCustomDoc,
+        inputSchema: z.object({
+          id: z.string().describe('The id or slug of the custom documentation page'),
+          section: z.string().optional().describe('Optional section heading to return only that section of the page'),
         }),
-        suggestFollowUpQuestions: tool({
-          description:
-            'Use this tool after answering a question to suggest 2-3 relevant follow-up questions the user might want to ask. These will be displayed as clickable suggestions.',
-          inputSchema: z.object({
-            questions: z
-              .array(z.string())
-              .min(1)
-              .max(3)
-              .describe('Array of 2-3 follow-up questions relevant to the conversation'),
-          }),
-          execute: async ({ questions }) => {
-            // This tool doesn't need to do anything - it just returns the questions
-            // which will be captured by the UI
-            return { suggestions: questions };
-          },
+        execute: async ({ id, section }) => {
+          return await getCustomDocImpl({ id, section });
+        },
+      }),
+      suggestFollowUpQuestions: tool({
+        description:
+          'Use this tool after answering a question to suggest 2-3 relevant follow-up questions the user might want to ask. These will be displayed as clickable suggestions.',
+        inputSchema: z.object({
+          questions: z.array(z.string()).min(1).max(3).describe('Array of 2-3 follow-up questions relevant to the conversation'),
         }),
-        ...extendedTools,
+        execute: async ({ questions }) => {
+          // This tool doesn't need to do anything - it just returns the questions
+          // which will be captured by the UI
+          return { suggestions: questions };
+        },
+      }),
+      ...extendedTools,
+    };
+
+    const result = streamText({
+      model,
+      instructions: getBaseSystemPrompt(referrer ?? ''),
+      messages: await convertToModelMessages(messages),
+      temperature: modelConfiguration?.temperature ?? 0.7,
+      stopWhen: isStepCount(5),
+      onError: (error) => {
+        console.error('[Chat] On error', error);
       },
+      tools,
     });
-    return result.toUIMessageStreamResponse({
-      headers: {
-        'Content-Type': 'text/event-stream',
-      },
+
+    return createUIMessageStreamResponse({
+      stream: toUIMessageStream({ stream: result.stream, tools }),
     });
   } catch (err: any) {
     console.error('[Chat] Error during streaming:', err);

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
-  "version": "4.12.0-beta.3",
+  "version": "4.12.0-beta.5",
   "publishConfig": {
     "access": "public"
   },
@@ -45,7 +45,7 @@
     "dist/"
   ],
   "dependencies": {
-    "@ai-sdk/react": "^3.0.17",
+    "@ai-sdk/react": "^4.0.109",
     "@astrojs/markdown-remark": "^7.3.1",
     "@astrojs/mdx": "^8.0.1",
     "@astrojs/node": "^11.1.6",
@@ -74,7 +74,7 @@
     "@tailwindcss/vite": "^4.3.1",
     "@tanstack/react-table": "^8.17.3",
     "@xyflow/react": "^12.3.6",
-    "ai": "^6.0.17",
+    "ai": "^7.0.106",
     "astro": "7.3.3",
     "astro-expressive-code": "^0.44.0",
     "astro-seo": "^0.8.4",
@@ -134,8 +134,8 @@
     "uuid": "^11.1.1",
     "zod": "^4.3.6",
     "@eventcatalog/linter": "1.1.20",
-    "@eventcatalog/visualiser": "^4.1.4",
-    "@eventcatalog/sdk": "2.29.1"
+    "@eventcatalog/sdk": "2.29.1",
+    "@eventcatalog/visualiser": "^4.1.4"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.10",