@eventcatalog/core 4.12.3 → 5.0.0-beta.0

package/eventcatalog/src/components/Settings/McpSettingsForm.tsx

@@ -1,49 +1,83 @@
-import { ExternalLink, Server, ServerCog } from 'lucide-react';
+import { ArrowUpRight, Boxes, ExternalLink, Library, ServerCog } from 'lucide-react';
 import { Row } from './Row';
-import { LiveCard, MCP_DOCS_URL, UpgradeRequired, UrlPanel } from './SettingsShared';
+import { MCP_DOCS_URL, UrlPanel } from './SettingsShared';
+
+export type DomainMcpServer = {
+  id: string;
+  name: string;
+  summary?: string;
+  /** Services and messages the domain's MCP server serves (including its subdomains and systems) */
+  services: number;
+  messages: number;
+  docsUrl: string;
+  url: string;
+};
+
+const plural = (count: number, noun: string) => `${count} ${noun}${count === 1 ? '' : 's'}`;
+
+// What the domain's MCP server covers, e.g. "5 services · 12 messages"
+const getScope = (server: DomainMcpServer) => `${plural(server.services, 'service')} · ${plural(server.messages, 'message')}`;
 
 interface Props {
-  hasScalePlan: boolean;
   inSSR: boolean;
   mcpUrl: string;
+  domainServers: DomainMcpServer[];
 }
 
-export const McpSettingsForm = ({ hasScalePlan, inSSR, mcpUrl }: Props) => {
-  const mcpAvailable = hasScalePlan && inSSR;
-
+export const McpSettingsForm = ({ inSSR, mcpUrl, domainServers }: Props) => {
   return (
     <div className="divide-y divide-[rgb(var(--ec-page-border))]">
       <Row
-        title="MCP Server"
-        description="Expose your catalog over the Model Context Protocol so AI agents (Claude Desktop, Cursor, etc.) can query your architecture as a live data source."
+        title="Catalog MCP Server"
+        description="Connect AI agents (Claude, Cursor, VS Code and any MCP client) to every resource in your catalog: domains, services, messages, flows, schemas and the teams that own them."
         canEdit={false}
         dirty={false}
       >
-        {mcpAvailable ? (
-          <McpAvailable url={mcpUrl} />
-        ) : !hasScalePlan ? (
-          <UpgradeRequired
-            tier="Scale"
-            blurb="The MCP Server is a Scale-plan feature. Upgrade to expose your catalog to AI agents over the Model Context Protocol."
-            docsUrl={MCP_DOCS_URL}
-          />
-        ) : (
-          <McpNeedsSSR />
-        )}
+        {inSSR ? <CatalogServer url={mcpUrl} /> : <McpNeedsSSR />}
       </Row>
+
+      {inSSR && domainServers.length > 0 && (
+        <Row
+          title="Domain MCP Servers"
+          description="Each domain has its own MCP server, scoped to the domain and the services, messages and flows in it. Connect a team's agent to just the part of the architecture it works on."
+          canEdit={false}
+          dirty={false}
+        >
+          <DomainServers servers={domainServers} />
+        </Row>
+      )}
     </div>
   );
 };
 
-const McpAvailable = ({ url }: { url: string }) => (
-  <div className="space-y-3">
-    <LiveCard
-      icon={<Server className="h-4 w-4" aria-hidden />}
-      title="MCP server is live"
-      description="Point Claude Desktop, Cursor, or any MCP-aware client at the endpoint below."
-    />
-    <div className="rounded-lg border border-[rgb(var(--ec-page-border))] bg-[rgb(var(--ec-page-bg)/0.4)] px-4 py-3">
-      <p className="text-[12px] font-medium text-[rgb(var(--ec-page-text))]">Endpoint</p>
+const LivePill = () => (
+  <span className="inline-flex flex-shrink-0 items-center gap-1.5 rounded-full border border-[rgb(var(--ec-badge-color-green-text)/0.3)] bg-[rgb(var(--ec-badge-color-green-background))] px-2 py-0.5 text-[11px] font-semibold text-[rgb(var(--ec-badge-color-green-text))]">
+    <span className="relative flex h-1.5 w-1.5" aria-hidden>
+      <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-current opacity-60" />
+      <span className="relative inline-flex h-1.5 w-1.5 rounded-full bg-current" />
+    </span>
+    Live
+  </span>
+);
+
+const CatalogServer = ({ url }: { url: string }) => (
+  <div className="overflow-hidden rounded-lg border border-[rgb(var(--ec-page-border))] bg-[rgb(var(--ec-card-bg,var(--ec-page-bg)))]">
+    <div className="flex items-start gap-3 px-4 py-3.5">
+      <span className="flex h-9 w-9 flex-shrink-0 items-center justify-center rounded-lg border border-[rgb(var(--ec-accent)/0.3)] bg-[rgb(var(--ec-accent-subtle))] text-[rgb(var(--ec-accent))]">
+        <Library className="h-4 w-4" aria-hidden />
+      </span>
+      <div className="min-w-0 flex-1">
+        <div className="flex items-center justify-between gap-3">
+          <p className="text-[13px] font-semibold text-[rgb(var(--ec-page-text))]">Your whole catalog</p>
+          <LivePill />
+        </div>
+        <p className="mt-0.5 text-[12px] leading-snug text-[rgb(var(--ec-page-text-muted))]">
+          Every domain, service, message, flow and schema, served to your AI agents from one URL.
+        </p>
+      </div>
+    </div>
+    <div className="border-t border-[rgb(var(--ec-page-border))] bg-[rgb(var(--ec-page-bg)/0.4)] px-4 py-3">
+      <p className="text-[11px] font-semibold uppercase tracking-wide text-[rgb(var(--ec-page-text-muted))]">Server URL</p>
       <UrlPanel url={url} />
       <a
         href={MCP_DOCS_URL}
@@ -51,13 +85,34 @@ const McpAvailable = ({ url }: { url: string }) => (
         rel="noreferrer"
         className="mt-3 inline-flex items-center gap-1 text-[12px] font-medium text-[rgb(var(--ec-accent))] hover:underline"
       >
-        Connect a client
-        <ExternalLink className="h-3 w-3" aria-hidden />
+        How to connect a client
+        <ArrowUpRight className="h-3.5 w-3.5" aria-hidden />
       </a>
     </div>
   </div>
 );
 
+const DomainServers = ({ servers }: { servers: DomainMcpServer[] }) => (
+  <ul className="divide-y divide-[rgb(var(--ec-page-border))] overflow-hidden rounded-lg border border-[rgb(var(--ec-page-border))] bg-[rgb(var(--ec-card-bg,var(--ec-page-bg)))]">
+    {servers.map((server) => (
+      <li key={server.id} className="px-4 py-3">
+        <div className="flex items-baseline justify-between gap-3">
+          <a
+            href={server.docsUrl}
+            title={server.summary}
+            className="inline-flex min-w-0 items-center gap-2 text-[13px] font-medium text-[rgb(var(--ec-page-text))] hover:text-[rgb(var(--ec-accent))]"
+          >
+            <Boxes className="h-3.5 w-3.5 flex-shrink-0 self-center text-[rgb(var(--ec-icon-color))]" aria-hidden />
+            <span className="truncate">{server.name}</span>
+          </a>
+          <span className="flex-shrink-0 text-[11px] text-[rgb(var(--ec-page-text-muted))]">{getScope(server)}</span>
+        </div>
+        <UrlPanel url={server.url} />
+      </li>
+    ))}
+  </ul>
+);
+
 const McpNeedsSSR = () => (
   <div className="overflow-hidden rounded-lg border border-[rgb(var(--ec-accent)/0.4)] bg-gradient-to-br from-[rgb(var(--ec-accent)/0.1)] via-[rgb(var(--ec-accent)/0.05)] to-transparent">
     <div className="flex items-start gap-3 px-4 py-3.5">

package/eventcatalog/src/components/Settings/SettingsShared.tsx

@@ -1,6 +1,6 @@
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { toast } from 'sonner';
-import { ExternalLink, Lock, Sparkles, Copy, Check as CheckIcon } from 'lucide-react';
+import { ExternalLink, Copy, Check as CheckIcon } from 'lucide-react';
 import { cn } from './Row';
 
 export const ASSISTANT_DOCS_URL =
@@ -8,65 +8,18 @@ export const ASSISTANT_DOCS_URL =
 export const ASSISTANT_CONFIGURATION_DOCS_URL =
   'https://www.eventcatalog.dev/docs/development/ask-your-architecture/eventcatalog-assistant/configuration';
 export const MCP_DOCS_URL = 'https://www.eventcatalog.dev/docs/development/ask-your-architecture/mcp-server/getting-started';
-export const PRICING_URL = 'https://www.eventcatalog.dev/pricing';
-
-interface UpgradeRequiredProps {
-  tier: string;
-  blurb: string;
-  docsUrl?: string;
-}
-
-export const UpgradeRequired = ({ tier, blurb, docsUrl }: UpgradeRequiredProps) => (
-  <div className="overflow-hidden rounded-lg border border-amber-500/40 bg-gradient-to-br from-amber-500/10 via-amber-500/5 to-transparent">
-    <div className="flex items-start gap-3 px-4 py-3.5">
-      <span className="flex h-8 w-8 flex-shrink-0 items-center justify-center rounded-md border border-amber-500/40 bg-amber-500/10 text-amber-500">
-        <Lock className="h-4 w-4" aria-hidden />
-      </span>
-      <div className="flex-1 min-w-0">
-        <div className="flex items-center gap-2">
-          <p className="text-[13px] font-semibold text-[rgb(var(--ec-page-text))]">Available on {tier}</p>
-          <span className="inline-flex items-center gap-1 rounded-full border border-amber-500/40 bg-amber-500/10 px-1.5 py-0.5 text-[10px] font-semibold uppercase tracking-wide text-amber-500">
-            <Sparkles className="h-2.5 w-2.5" aria-hidden />
-            Upgrade
-          </span>
-        </div>
-        <p className="mt-1 text-[12px] leading-snug text-[rgb(var(--ec-page-text-muted))]">{blurb}</p>
-        <div className="mt-3 flex flex-wrap items-center gap-3">
-          <a
-            href={PRICING_URL}
-            target="_blank"
-            rel="noreferrer"
-            className="inline-flex items-center gap-1 rounded-md bg-amber-500 px-3 py-1.5 text-[12px] font-semibold text-white shadow-sm transition-colors hover:bg-amber-600"
-          >
-            View plans
-            <ExternalLink className="h-3 w-3" aria-hidden />
-          </a>
-          {docsUrl && (
-            <a
-              href={docsUrl}
-              target="_blank"
-              rel="noreferrer"
-              className="inline-flex items-center gap-1 text-[12px] font-medium text-[rgb(var(--ec-page-text-muted))] hover:text-[rgb(var(--ec-page-text))]"
-            >
-              Learn more
-              <ExternalLink className="h-3 w-3" aria-hidden />
-            </a>
-          )}
-        </div>
-      </div>
-    </div>
-  </div>
-);
-
 interface UrlPanelProps {
   url: string;
 }
 
 export const UrlPanel = ({ url }: UrlPanelProps) => {
   const [copied, setCopied] = useState(false);
+  // The full URL (what clients connect to), once the page knows its origin in the browser
+  const [fullUrl, setFullUrl] = useState(url);
+  useEffect(() => setFullUrl(new URL(url, window.location.origin).href), [url]);
   const copy = async () => {
     try {
-      await navigator.clipboard.writeText(new URL(url, window.location.origin).href);
+      await navigator.clipboard.writeText(fullUrl);
       setCopied(true);
       setTimeout(() => setCopied(false), 1600);
     } catch {
@@ -81,7 +34,7 @@ export const UrlPanel = ({ url }: UrlPanelProps) => {
         rel="noreferrer"
         className="flex-1 truncate rounded-md border border-[rgb(var(--ec-page-border))] bg-[rgb(var(--ec-page-bg))] px-2.5 py-1.5 font-mono text-[12px] text-[rgb(var(--ec-page-text))] transition-colors hover:border-[rgb(var(--ec-accent)/0.5)] hover:text-[rgb(var(--ec-accent))]"
       >
-        {url}
+        {fullUrl}
       </a>
       <button
         type="button"
@@ -104,27 +57,6 @@ export const UrlPanel = ({ url }: UrlPanelProps) => {
   );
 };
 
-interface LiveCardProps {
-  icon: React.ReactNode;
-  title: string;
-  description: string;
-}
-
-export const LiveCard = ({ icon, title, description }: LiveCardProps) => (
-  <div className="flex items-center gap-3 rounded-lg border border-emerald-500/30 bg-emerald-500/5 px-4 py-3">
-    <span className="flex h-8 w-8 flex-shrink-0 items-center justify-center rounded-md border border-emerald-500/30 bg-emerald-500/10 text-emerald-500">
-      {icon}
-    </span>
-    <div className="flex-1 min-w-0">
-      <p className="text-[13px] font-medium text-[rgb(var(--ec-page-text))]">{title}</p>
-      <p className="text-[12px] leading-snug text-[rgb(var(--ec-page-text-muted))]">{description}</p>
-    </div>
-    <span className="flex-shrink-0 rounded-full border border-emerald-500/30 bg-emerald-500/10 px-2 py-0.5 text-[10px] font-semibold uppercase tracking-wide text-emerald-500">
-      Live
-    </span>
-  </div>
-);
-
 interface ToggleProps {
   checked: boolean;
   disabled?: boolean;

package/eventcatalog/src/components/SideNav/CustomDocsNav.astro

@@ -1,6 +1,6 @@
 ---
-import { getNavigationItems } from '@enterprise/custom-documentation/utils/custom-docs';
-import CustomDocsNavWrapper from '@enterprise/custom-documentation/components/CustomDocsNav/CustomDocsNavWrapper';
+import { getNavigationItems } from '@features/custom-documentation/utils/custom-docs';
+import CustomDocsNavWrapper from '@features/custom-documentation/components/CustomDocsNav/CustomDocsNavWrapper';
 
 const currentPath = Astro.url.pathname;
 const sidebarItems = await getNavigationItems();

package/eventcatalog/src/components/TrialBadge.astro

@@ -0,0 +1,82 @@
+---
+import catalog from '@utils/eventcatalog-config/catalog';
+import { isDevMode } from '@utils/feature';
+import { getLicenseDaysLeft, getTrialStatus, LICENSE_FAQ_URL, TRIAL_LENGTH_DAYS } from '@utils/trial';
+import { getLicenseStatus } from '@utils/license';
+import { buildUrl } from '@utils/url-builder';
+
+// Only shown while running `eventcatalog dev`, never in built or served catalogs.
+// A valid license.jwt replaces the trial, and only shows once it's about to expire.
+// An expired license.jwt shows instead of the trial. A Scale or Starter plan replaces the trial too.
+const license = isDevMode() ? await getLicenseStatus() : undefined;
+const licensedUntil = license?.state === 'licensed' ? license.expiresAt : undefined;
+const licenseDaysLeft = licensedUntil ? getLicenseDaysLeft(licensedUntil) : undefined;
+const licenseExpired = license?.state === 'expired';
+const expiredOn = license?.state === 'expired' ? license.expiresAt : undefined;
+const trial =
+  isDevMode() && !licensedUntil && !licenseExpired && license?.state !== 'plan' ? getTrialStatus(catalog?.tsd) : undefined;
+
+const days = (count?: number) => `${count} ${count === 1 ? 'day' : 'days'}`;
+const label = licenseExpired
+  ? 'License expired'
+  : licenseDaysLeft !== undefined
+    ? `License · ${days(licenseDaysLeft)} left`
+    : trial?.ended
+      ? 'Trial ended'
+      : `Trial · ${days(trial?.daysLeft)} left`;
+const title = licenseExpired
+  ? `Your EventCatalog commercial license ${expiredOn ? `expired on ${expiredOn.toLocaleDateString()}` : 'has expired'}. Renew it to keep using EventCatalog commercially.`
+  : licenseDaysLeft !== undefined
+    ? `Your EventCatalog commercial license expires on ${licensedUntil?.toLocaleDateString()}. Renew it to keep using EventCatalog commercially.`
+    : trial?.ended
+      ? `Your ${TRIAL_LENGTH_DAYS}-day EventCatalog trial ended on ${trial.endsAt.toLocaleDateString()}. Learn about licensing.`
+      : `You're on a ${TRIAL_LENGTH_DAYS}-day EventCatalog trial, ending on ${trial?.endsAt.toLocaleDateString()}. Learn about licensing.`;
+const warning = licenseExpired || licenseDaysLeft !== undefined || trial?.ended;
+// An expiring or expired license opens the license settings (where it's renewed), the trial the license FAQ
+const isLicense = licenseExpired || licenseDaysLeft !== undefined;
+const href = isLicense ? buildUrl('/settings/license') : LICENSE_FAQ_URL;
+---
+
+{
+  (licenseExpired || licenseDaysLeft !== undefined || trial) && (
+    <a
+      href={href}
+      target={isLicense ? undefined : '_blank'}
+      rel={isLicense ? undefined : 'noopener noreferrer'}
+      title={title}
+      data-trial-ended={trial?.ended ? 'true' : undefined}
+      data-license-expired={licenseExpired ? 'true' : undefined}
+      class:list={[
+        'inline-flex items-center gap-1.5 whitespace-nowrap rounded-full border px-2.5 py-1 text-xs font-medium transition-colors',
+        warning
+          ? 'border-[rgb(var(--ec-badge-color-amber-text)/0.3)] bg-[rgb(var(--ec-badge-color-amber-background))] text-[rgb(var(--ec-badge-color-amber-text))] hover:opacity-90'
+          : 'border-[rgb(var(--ec-accent)/0.3)] bg-[rgb(var(--ec-accent-subtle))] text-[rgb(var(--ec-accent))] hover:bg-[rgb(var(--ec-accent)/0.15)]',
+      ]}
+    >
+      <svg
+        viewBox="0 0 24 24"
+        class="h-3.5 w-3.5"
+        fill="none"
+        stroke="currentColor"
+        stroke-width="2"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        aria-hidden="true"
+      >
+        {licenseExpired ? (
+          <>
+            <path d="m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3" />
+            <path d="M12 9v4" />
+            <path d="M12 17h.01" />
+          </>
+        ) : (
+          <>
+            <circle cx="12" cy="12" r="10" />
+            <polyline points="12 6 12 12 16 14" />
+          </>
+        )}
+      </svg>
+      {label}
+    </a>
+  )
+}

package/eventcatalog/src/content.config.ts

@@ -6,14 +6,16 @@ import { badge, ownerReference } from './content.config-shared-collections';
 import { ADR_STATUS_VALUES } from './utils/collections/adr-constants';
 import fs from 'fs';
 import path from 'path';
-import { userTeamDirectoryLoader } from './enterprise/directory/user-team-directory';
+import { userTeamDirectoryLoader } from './features/directory/user-team-directory';
 import config from '@config';
 import { schemaLoader } from './utils/collections/schema-loader';
 import { globWithSafeWatcher, withFederatedContent, withIgnoredBuildArtifacts } from './utils/collections/glob-loader';
 import { withExtensionProperties } from './utils/collections/extension-properties';
+import { flowStepSchema } from './utils/collections/flow-step-schema';
+import { pointer } from './utils/collections/pointer-schema';
 
-// Enterprise Collections
-import { customPagesSchema, resourceDocsSchema, resourceDocCategoriesSchema } from './enterprise/collections';
+// Custom pages and resource docs collections
+import { customPagesSchema, resourceDocsSchema, resourceDocCategoriesSchema } from './features/collections';
 
 // Astro's root is the user's catalog. Keep loader paths relative to that root,
 // independently of where generated metadata or the installed package lives.
@@ -32,11 +34,6 @@ const pages = defineCollection({
     .optional(),
 });
 
-const pointer = z.object({
-  id: z.string(),
-  version: z.string().optional().default('latest'),
-});
-
 const detailPanelPropertySchema = z.object({
   visible: z.boolean().optional(),
 });
@@ -235,19 +232,6 @@ const baseSchema = z.object({
 
 const agentBaseSchema = baseSchema.omit({ specifications: true });
 
-const flowStep = z
-  .union([
-    // Can be a string or a number just to reference a step
-    z.union([z.string(), z.number()]),
-    z
-      .object({
-        id: z.union([z.string(), z.number()]),
-        label: z.string().optional(),
-      })
-      .optional(),
-  ])
-  .optional();
-
 const flows = defineCollection({
   loader: globWithSafeWatcher({
     pattern: withIgnoredBuildArtifacts(['**/flows/**/index.(md|mdx)', '**/flows/**/versioned/*/index.(md|mdx)']),
@@ -266,80 +250,7 @@ const flows = defineCollection({
             changelog: detailPanelPropertySchema.optional(),
           })
           .optional(),
-        steps: z.array(
-          z
-            .object({
-              id: z.union([z.string(), z.number()]),
-              type: z.enum(['node', 'message', 'agent', 'user', 'actor']).optional(),
-              title: z.string(),
-              summary: z.string().optional(),
-              message: pointer.optional(),
-              agent: pointer.optional(),
-              service: pointer.optional(),
-              // Catalog system reference. `systems` matches how authors write the
-              // pointer (same shape as `service`); `system` is accepted as an alias.
-              systems: pointer.optional(),
-              system: pointer.optional(),
-              flow: pointer.optional(),
-              container: pointer.optional(),
-              dataProduct: pointer.optional(),
-
-              actor: z
-                .object({
-                  name: z.string(),
-                  summary: z.string().optional(),
-                })
-                .optional(),
-              custom: z
-                .object({
-                  title: z.string(),
-                  icon: z.string().optional(),
-                  type: z.string().optional(),
-                  summary: z.string().optional(),
-                  url: z.string().url().optional(),
-                  color: z.string().optional(),
-                  properties: z.record(z.string(), z.union([z.string(), z.number()])).optional(),
-                  height: z.number().optional(),
-                  menu: z
-                    .array(
-                      z.object({
-                        label: z.string(),
-                        url: z.string().url().optional(),
-                      })
-                    )
-                    .optional(),
-                })
-                .optional(),
-              externalSystem: z
-                .object({
-                  name: z.string(),
-                  summary: z.string().optional(),
-                  url: z.string().url().optional(),
-                })
-                .optional(),
-              next_step: flowStep,
-              next_steps: z.array(flowStep).optional(),
-            })
-            .refine((data) => {
-              // Cant have both next_steps and next_steps
-              if (data.next_step && data.next_steps) return false;
-
-              // Either one or non types can be present
-              const typesUsed = [
-                data.message,
-                data.agent,
-                data.service,
-                data.systems,
-                data.system,
-                data.flow,
-                data.container,
-                data.dataProduct,
-                data.actor,
-                data.custom,
-              ].filter((v) => v).length;
-              return typesUsed === 0 || typesUsed === 1;
-            })
-        ),
+        steps: z.array(flowStepSchema),
       })
       .extend(baseSchema.shape)
   ),
@@ -499,6 +410,8 @@ const services = defineCollection({
         'systems/*/services/*/versioned/*/index.(md|mdx)',
         'domains/*/systems/*/services/*/index.(md|mdx)',
         'domains/*/systems/*/services/*/versioned/*/index.(md|mdx)',
+        'domains/*/subdomains/*/systems/*/services/*/index.(md|mdx)',
+        'domains/*/subdomains/*/systems/*/services/*/versioned/*/index.(md|mdx)',
 
         // Capture services in the root
         'services/*/index.(md|mdx)', // ✅ Capture only services markdown files
@@ -1311,7 +1224,7 @@ export const collections = {
   ubiquitousLanguages,
   entities,
 
-  // EventCatalog Pro Collections
+  // Documentation Collections
   customPages,
   resourceDocs,
   resourceDocCategories,

package/eventcatalog/src/{enterprise → features}/ai/chat-api.ts

@@ -1,8 +1,3 @@
-/**
- * Licensed under the EventCatalog Commercial License.
- * See /packages/core/eventcatalog/src/enterprise/LICENSE
- */
-
 import type { APIContext } from 'astro';
 import {
   convertToModelMessages,
@@ -15,7 +10,7 @@ import {
   type UIMessage,
 } from 'ai';
 import { join } from 'node:path';
-import { isEventCatalogScaleEnabled, isEventCatalogStarterEnabled } from '@utils/feature';
+import { isDevMode } from '@utils/feature';
 import { getCollection, getEntry } from 'astro:content';
 import { z } from 'astro/zod';
 import { getConsumersOfMessage, getProducersOfMessage } from '@utils/collections/services';
@@ -35,7 +30,7 @@ import {
   messageCollectionSchema,
   visualiserCollectionSchema,
   toolDescriptions,
-} from '@enterprise/tools/catalog-tools';
+} from '@features/tools/catalog-tools';
 
 const catalogDirectory = process.env.PROJECT_DIR || process.cwd();
 
@@ -49,24 +44,23 @@ export const defaultConfiguration = {
 };
 
 let hasChatConfiguration = false;
+// Why eventcatalog.chat.js didn't load (e.g. its model provider package isn't installed)
+let chatConfigurationError: string | undefined;
 let model: LanguageModel;
 let modelConfiguration: any;
 let extendedTools: any;
 
-const hasAssistantPlan = () => isEventCatalogStarterEnabled() || isEventCatalogScaleEnabled();
-
 try {
   const providerConfiguration = await import(/* @vite-ignore */ join(catalogDirectory, 'eventcatalog.chat.js'));
   model = await providerConfiguration.default();
   modelConfiguration = providerConfiguration.configuration || defaultConfiguration;
   hasChatConfiguration = true;
 
-  if (isEventCatalogScaleEnabled()) {
-    extendedTools = providerConfiguration.tools || {};
-  }
+  extendedTools = providerConfiguration.tools || {};
 } catch (error) {
   console.error('[Chat] Error loading chat configuration', error);
   hasChatConfiguration = false;
+  chatConfigurationError = error instanceof Error ? error.message : String(error);
 }
 
 // Built-in tools metadata for client visibility
@@ -176,19 +170,23 @@ interface Message {
   content: string;
 }
 
-export const GET = async ({ request }: APIContext<{ question: string; messages: Message[]; additionalContext?: string }>) => {
-  if (!hasAssistantPlan()) {
-    return new Response(JSON.stringify({ error: 'Chat is not enabled' }), {
-      status: 403,
-      headers: { 'Content-Type': 'application/json' },
-    });
-  }
+/**
+ * eventcatalog.chat.js exists (or the chat would be off) but didn't load. The chat panel shows how
+ * to fix it; the reason is only shared in dev mode, where it's the catalog owner asking.
+ */
+const chatConfigurationErrorResponse = () =>
+  new Response(
+    JSON.stringify({
+      error: 'The EventCatalog Assistant could not load eventcatalog.chat.js',
+      code: 'CHAT_CONFIGURATION_ERROR',
+      ...(isDevMode() && chatConfigurationError ? { reason: chatConfigurationError } : {}),
+    }),
+    { status: 503, headers: { 'Content-Type': 'application/json' } }
+  );
 
+export const GET = async ({ request }: APIContext<{ question: string; messages: Message[]; additionalContext?: string }>) => {
   if (!hasChatConfiguration) {
-    return new Response(JSON.stringify({ error: 'No chat configuration found' }), {
-      status: 404,
-      headers: { 'Content-Type': 'application/json' },
-    });
+    return chatConfigurationErrorResponse();
   }
 
   // Return available tools metadata
@@ -202,18 +200,8 @@ export const GET = async ({ request }: APIContext<{ question: string; messages:
 export const POST = async ({ request }: APIContext<{ question: string; messages: Message[]; additionalContext?: string }>) => {
   const { messages }: { messages: UIMessage[] } = await request.json();
 
-  if (!hasAssistantPlan()) {
-    return new Response(JSON.stringify({ error: 'Chat is not enabled, please upgrade to a paid plan to use this feature' }), {
-      status: 403,
-      headers: { 'Content-Type': 'application/json' },
-    });
-  }
-
   if (!hasChatConfiguration) {
-    return new Response(JSON.stringify({ error: 'No chat configuration found' }), {
-      status: 404,
-      headers: { 'Content-Type': 'application/json' },
-    });
+    return chatConfigurationErrorResponse();
   }
 
   // Get the URL of the request

package/eventcatalog/src/{enterprise → features}/analytics/adapters/ga4.ts

@@ -1,8 +1,3 @@
-/**
- * Licensed under the EventCatalog Commercial License.
- * See /packages/core/eventcatalog/src/enterprise/LICENSE
- */
-
 import type { AnalyticsAdapter, EventProperties } from '../tracker';
 
 declare global {

package/eventcatalog/src/{enterprise → features}/analytics/adapters/gtm.ts

@@ -1,8 +1,3 @@
-/**
- * Licensed under the EventCatalog Commercial License.
- * See /packages/core/eventcatalog/src/enterprise/LICENSE
- */
-
 import type { AnalyticsAdapter, EventProperties } from '../tracker';
 
 declare global {

package/eventcatalog/src/{enterprise → features}/analytics/adapters/posthog.ts

@@ -1,8 +1,3 @@
-/**
- * Licensed under the EventCatalog Commercial License.
- * See /packages/core/eventcatalog/src/enterprise/LICENSE
- */
-
 import type { AnalyticsAdapter, EventProperties } from '../tracker';
 
 declare global {

package/eventcatalog/src/{enterprise → features}/analytics/components/AnalyticsHead.astro

@@ -1,17 +1,15 @@
 ---
 import config from '@config';
-import { isIntegrationsEnabled } from '@utils/feature';
 
 const integrations = config.integrations;
 const cloudAnalytics = config.cloud?.analytics;
-const enabled = isIntegrationsEnabled() && integrations;
-const hasProviders = enabled && (integrations?.ga4 || integrations?.gtm || integrations?.posthog);
+const hasProviders = !!(integrations?.ga4 || integrations?.gtm || integrations?.posthog);
 const debug = integrations?.debug ?? false;
 const cloudDebug = cloudAnalytics?.debug ?? debug;
 const cloudAnalyticsEndpoint = cloudAnalytics?.endpoint || 'https://api.ecingest.dev/v1/analytics/ingest';
 const isCloudAnalyticsEnabled = cloudAnalytics?.enabled === true && !!cloudAnalytics?.trackingId;
 // Render the manager if there are providers OR if debug mode is on (so users can verify the pipeline)
-const shouldRender = isCloudAnalyticsEnabled || (enabled && (hasProviders || debug));
+const shouldRender = isCloudAnalyticsEnabled || (!!integrations && (hasProviders || debug));
 
 // Build script contents in frontmatter to avoid Prettier/JSX parsing issues with braces in inline scripts
 const ga4ConfigScript = integrations?.ga4