@eventcatalog/core 5.2.1 → 5.4.1

package/eventcatalog/src/features/mcp/apps/shared/app-view.tsx

@@ -7,7 +7,7 @@ import { config as configureZod } from 'zod';
 import { createRoot } from 'react-dom/client';
 import type { App, McpUiHostContext } from '@modelcontextprotocol/ext-apps';
 import { useApp } from '@modelcontextprotocol/ext-apps/react';
-import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
+import type { CallToolResult } from '@modelcontextprotocol/client';
 
 // MCP hosts block eval in views, so stop zod (used by the MCP Apps SDK) from probing for it
 configureZod({ jitless: true });

package/eventcatalog/src/features/mcp/custom-tool-input.ts

@@ -0,0 +1,38 @@
+import { fromJsonSchema, type JsonSchemaType, type StandardSchemaWithJSON } from '@modelcontextprotocol/server';
+import { asSchema, type FlexibleSchema } from 'ai';
+import { z } from 'zod';
+
+/** Zod 4.2+ (and other Standard JSON Schema) schemas, which the MCP SDK lists and validates itself */
+const hasJsonSchema = (schema: unknown): schema is StandardSchemaWithJSON =>
+  typeof schema === 'object' &&
+  schema !== null &&
+  typeof (schema as { '~standard'?: { jsonSchema?: { input?: unknown } } })['~standard']?.jsonSchema?.input === 'function';
+
+/**
+ * A custom tool's input schema (eventcatalog.chat.js, in the AI SDK's format) for the MCP SDK. Zod 4.2+ schemas are
+ * used as they are. The others the AI SDK takes (zod 3, jsonSchema()) are listed from their JSON Schema and validated
+ * by the schema itself, so coercion, defaults and transforms work as before: checking the JSON Schema first would turn
+ * away input the schema accepts, such as "5" for a coerced number. MCP SDK 2 can't list zod 3 schemas, and one failed
+ * tools/list for every tool.
+ */
+export const toCustomToolInput = async (schema: unknown): Promise<StandardSchemaWithJSON> => {
+  if (!schema) return z.object({});
+  if (hasJsonSchema(schema)) return schema;
+
+  const { jsonSchema, validate } = asSchema(schema as FlexibleSchema<unknown>);
+  const json = (await jsonSchema) as JsonSchemaType;
+  // jsonSchema() can leave out a validator, and then the arguments are checked against the JSON Schema
+  if (!validate) return fromJsonSchema(json);
+
+  return {
+    '~standard': {
+      version: 1,
+      vendor: 'eventcatalog',
+      jsonSchema: { input: () => json, output: () => json },
+      validate: async (value) => {
+        const result = await validate(value);
+        return result.success ? { value: result.value } : { issues: [{ message: result.error.message }] };
+      },
+    },
+  };
+};

package/eventcatalog/src/features/mcp/mcp-apps.ts

@@ -1,5 +1,4 @@
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import type { ToolAnnotations } from '@modelcontextprotocol/sdk/types.js';
+import type { Icon, McpServer, ToolAnnotations } from '@modelcontextprotocol/server';
 import type { McpUiDisplayMode } from '@modelcontextprotocol/ext-apps';
 import { registerAppResource, RESOURCE_MIME_TYPE, RESOURCE_URI_META_KEY } from '@modelcontextprotocol/ext-apps/server';
 import { z } from 'zod';
@@ -40,6 +39,8 @@ type ToolDefinition<Shape extends z.ZodRawShape> = {
   input: Shape;
   /** More `_meta` for the tool, e.g. host extensions such as ChatGPT's `openai/ui` entrypoints */
   meta?: Record<string, unknown>;
+  /** Icons listed with the tool (MCP 2025-11-25 tool icons, which ChatGPT shows on entrypoints) */
+  icons?: Icon[];
 };
 
 export type McpAppDefinition<Shape extends z.ZodRawShape, ViewShape extends z.ZodRawShape, Payload> = {
@@ -106,13 +107,14 @@ export function registerMcpApp<Shape extends z.ZodRawShape, ViewShape extends z.
   };
 
   const toolInput = z.object(app.tool.input);
-  server.registerTool<z.ZodRawShape, typeof toolInput>(
+  server.registerTool(
     app.tool.name,
     {
       title: app.tool.title,
       description: app.tool.description,
       inputSchema: toolInput,
       annotations: app.annotations,
+      ...(app.tool.icons && { icons: app.tool.icons }),
       _meta: loadView ? { ...appViewMeta(app.resource.uri), ...app.tool.meta } : undefined,
     },
     showInView
@@ -130,7 +132,7 @@ export function registerMcpApp<Shape extends z.ZodRawShape, ViewShape extends z.
   };
 
   const viewToolInput = z.object(app.viewTool.input);
-  server.registerTool<z.ZodRawShape, typeof viewToolInput>(
+  server.registerTool(
     app.viewTool.name,
     {
       title: app.viewTool.title,

package/eventcatalog/src/features/mcp/mcp-server.ts

@@ -1,7 +1,6 @@
 import type { APIRoute } from 'astro';
 import { Hono, type Context } from 'hono';
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { WebStandardStreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js';
+import { McpServer, WebStandardStreamableHTTPServerTransport, type StandardSchemaWithJSON } from '@modelcontextprotocol/server';
 import { z } from 'zod';
 import { join } from 'node:path';
 import * as catalogTools from '@features/tools/catalog-tools';
@@ -21,6 +20,7 @@ import type { SchemaViewerPayload } from './apps/schema-viewer/shared';
 import { RESOURCE_VIEWS, VIEWER_META_KEY, VIEWER_RESOURCE_URI, VIEWER_VIEW_TOOL, type ViewerPayload } from './apps/viewer/shared';
 import { toSchemaViewerSchemas } from './schema-viewer';
 import { getMcpAppViewLoader, mcpAppNote, registerMcpApp } from './mcp-apps';
+import { toCustomToolInput } from './custom-tool-input';
 import { buildUrl } from '@utils/url-builder';
 import { isCanvasEnabled } from '@utils/feature';
 import { CANVAS_TOOL_NAMES, registerCanvasTools } from '@features/studio/server/canvas-mcp';
@@ -74,19 +74,34 @@ function createToolHandler<T>(fn: (params: T) => Promise<any>, errorMessage: str
 
 // Load extended tools from user configuration
 let extendedTools: Record<string, any> = {};
-let extendedToolNames: string[] = [];
 
 try {
   const providerConfiguration = await import(/* @vite-ignore */ join(catalogDirectory, 'eventcatalog.chat.js'));
 
   if (providerConfiguration.tools) {
     extendedTools = providerConfiguration.tools;
-    extendedToolNames = Object.keys(extendedTools);
   }
 } catch (error) {
   // No chat configuration or tools defined - this is fine
 }
 
+// The extended tools the MCP server offers, each with its input for the MCP SDK. Worked out once (converting a
+// schema can be async), so the tools registered and the tools listed by GET /docs/mcp are the same ones.
+const extendedToolInputs = new Map<string, StandardSchemaWithJSON>();
+for (const [toolName, toolConfig] of Object.entries(extendedTools)) {
+  if (!toolConfig || typeof toolConfig !== 'object') continue;
+  if (!toolConfig.description || !toolConfig.execute) {
+    console.warn(`[MCP] Skipping invalid extended tool: ${toolName}`);
+    continue;
+  }
+  try {
+    extendedToolInputs.set(toolName, await toCustomToolInput(toolConfig.inputSchema || toolConfig.parameters));
+  } catch (error) {
+    console.warn(`[MCP] Skipping extended tool ${toolName}: its input schema could not be read (${error})`);
+  }
+}
+const extendedToolNames = [...extendedToolInputs.keys()];
+
 const MCP_SERVER_VERSION = '1.3.0';
 
 // Every built-in tool only reads the catalog, so clients can safely auto-approve them
@@ -633,24 +648,16 @@ function createMcpServer(
   }
 
   // Register extended tools from user configuration
-  for (const [toolName, toolConfig] of Object.entries(scope ? {} : extendedTools)) {
-    if (!toolConfig || typeof toolConfig !== 'object') continue;
-
-    // Extract tool properties (Vercel AI SDK format)
-    // The AI SDK tool() helper uses "inputSchema" for Zod schemas
-    const { title, description, parameters, inputSchema, annotations, execute } = toolConfig;
-
-    if (!description || !execute) {
-      console.warn(`[MCP] Skipping invalid extended tool: ${toolName}`);
-      continue;
-    }
+  for (const [toolName, input] of scope ? [] : extendedToolInputs) {
+    // Tool properties in the Vercel AI SDK format
+    const { title, description, annotations, execute } = extendedTools[toolName];
 
     server.registerTool(
       toolName,
       {
         ...(title && { title }),
-        description: description || `Custom tool: ${toolName}`,
-        inputSchema: inputSchema || parameters || z.object({}),
+        description,
+        inputSchema: input,
         ...(annotations && { annotations }),
       },
       async (params: any) => {

package/eventcatalog/src/features/studio/hooks/use-canvas-webmcp.ts

@@ -46,7 +46,7 @@ type ModelContextTool = {
   title?: string;
   description: string;
   inputSchema?: object;
-  annotations?: { readOnlyHint?: boolean; consequentialHint?: boolean };
+  annotations?: { readOnlyHint?: boolean; consequentialHint?: boolean; untrustedContentHint?: boolean };
   execute: (input: unknown, options?: { signal?: AbortSignal }) => Promise<ToolResult>;
 };
 type ModelContext = { registerTool: (tool: ModelContextTool, options?: { signal?: AbortSignal }) => Promise<void> | void };
@@ -204,7 +204,8 @@ const createCanvasTools = (get: () => CanvasWebMcpOptions, getStage: () => Agent
       description:
         'Reads the collaborative canvas open on this page: its nodes (ids, names, positions, the catalog resource they stand for), connections, comment threads, and who is on it. Call it first, and again to see what people changed.',
       input: z.object({}),
-      annotations: { readOnlyHint: true },
+      // Names, notes and comments come from people
+      annotations: { readOnlyHint: true, untrustedContentHint: true },
       execute: () =>
         withDoc((doc) => ({
           ...describeCanvas(doc),
@@ -342,7 +343,7 @@ const createCanvasTools = (get: () => CanvasWebMcpOptions, getStage: () => Agent
       description:
         'Selects nodes and moves the view to them, to point the user at something. Leave out nodeIds to show the whole canvas.',
       input: z.object({ nodeIds: z.array(z.string()).optional() }),
-      annotations: { readOnlyHint: true },
+      // Not read only: it changes the user's selection and view
       execute: ({ nodeIds }) => {
         if (nodeIds?.length) get().select(nodeIds);
         get().fitView(nodeIds);

package/eventcatalog/src/features/studio/server/canvas-mcp.ts

@@ -1,4 +1,4 @@
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { McpServer } from '@modelcontextprotocol/server';
 import type * as Y from 'yjs';
 import { z } from 'zod';
 import { buildUrl } from '@utils/url-builder';
@@ -37,7 +37,6 @@ import {
 } from '../agent-choreography';
 import { STUDIO_SOCKET_PATH, findStudioRuntime } from './runtime';
 import { getAgent } from '../agents';
-import { addToolIcons } from './tool-icons';
 
 /**
  * MCP tools for the collaborative canvas: agents create canvases, join the ones people are on, and
@@ -139,6 +138,7 @@ export function registerCanvasTools(server: McpServer, { catalogUrl, userAgent }
       // ChatGPT entrypoints (OpenAI MCP extensions): people can open canvases from the sidebar or as a tab in a
       // thread, which calls the tool with {} (the list of canvases)
       meta: { 'openai/ui': { entrypoints: [{ type: 'global' }, { type: 'thread' }] } },
+      icons: [CANVAS_ICON],
       input: {
         canvasId: canvasId.optional(),
         title: z.string().optional().describe('For a new canvas: what it is for'),
@@ -490,6 +490,4 @@ export function registerCanvasTools(server: McpServer, { catalogUrl, userAgent }
       return found ? text({ threadId, resolved }) : text({ error: `No comment thread "${threadId}"` }, true);
     }
   );
-
-  addToolIcons(server, { openCanvas: [CANVAS_ICON] });
 }

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "BUSL-1.1",
   "type": "module",
-  "version": "5.2.1",
+  "version": "5.4.1",
   "publishConfig": {
     "access": "public"
   },
@@ -65,8 +65,9 @@
     "@iconify-json/logos": "^1.2.4",
     "@mcp-b/webmcp-polyfill": "5.1.0",
     "@mermaid-js/layout-elk": "^0.2.0",
-    "@modelcontextprotocol/ext-apps": "^1.7.5",
-    "@modelcontextprotocol/sdk": "^1.32.0",
+    "@modelcontextprotocol/client": "2.3.1",
+    "@modelcontextprotocol/ext-apps": "2.0.3",
+    "@modelcontextprotocol/server": "2.3.1",
     "@nanostores/react": "^1.0.0",
     "@parcel/watcher": "^2.4.1",
     "@radix-ui/react-context-menu": "^2.2.6",
@@ -140,10 +141,11 @@
     "y-protocols": "^1.0.7",
     "yjs": "^13.6.33",
     "zod": "^4.6.6",
-    "@eventcatalog/exporters": "0.1.1",
-    "@eventcatalog/linter": "1.2.3",
-    "@eventcatalog/sdk": "2.31.1",
-    "@eventcatalog/visualiser": "^5.0.0"
+    "@eventcatalog/fitness": "0.1.0",
+    "@eventcatalog/visualiser": "^5.0.0",
+    "@eventcatalog/linter": "1.2.4",
+    "@eventcatalog/sdk": "2.31.2",
+    "@eventcatalog/exporters": "0.1.2"
   },
   "devDependencies": {
     "@astrojs/check": "^0.9.10",
@@ -188,6 +190,7 @@
     "start:catalog:server": "node scripts/start-server-locally.js",
     "preview:catalog": "node scripts/preview-catalog-locally.js",
     "generate:catalog": "node scripts/generate-catalog-locally.js",
+    "fitness:catalog": "node scripts/fitness-catalog-locally.js",
     "verify-build:catalog": "rimraf dist && pnpm run build:cd",
     "generate": "pnpm run build:bin && npx . generate",
     "format": "prettier --config .prettierrc --write \"**/*.{js,jsx,ts,tsx,json,astro}\"",

package/dist/runtime-dependencies/@modelcontextprotocol__sdk.mjs

@@ -1,3 +0,0 @@
-export * from "@modelcontextprotocol/sdk";
-import * as dependency from "@modelcontextprotocol/sdk";
-export default dependency.default;

package/dist/runtime-dependencies/@modelcontextprotocol__sdk__server__mcp.js.mjs

@@ -1,3 +0,0 @@
-export * from "@modelcontextprotocol/sdk/server/mcp.js";
-import * as dependency from "@modelcontextprotocol/sdk/server/mcp.js";
-export default dependency.default;

package/dist/runtime-dependencies/@modelcontextprotocol__sdk__server__webStandardStreamableHttp.js.mjs

@@ -1,3 +0,0 @@
-export * from "@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js";
-import * as dependency from "@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js";
-export default dependency.default;

package/dist/runtime-dependencies/@modelcontextprotocol__sdk__types.js.mjs

@@ -1,3 +0,0 @@
-export * from "@modelcontextprotocol/sdk/types.js";
-import * as dependency from "@modelcontextprotocol/sdk/types.js";
-export default dependency.default;

package/eventcatalog/src/features/studio/server/tool-icons.ts

@@ -1,30 +0,0 @@
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-
-/** A tool icon (MCP 2025-11-25) */
-export type ToolIcon = { src: string; mimeType?: string; sizes?: string[] };
-type ListTools = (request: unknown, extra: unknown) => Promise<{ tools: { name: string }[] }>;
-
-/** The SDK's request handlers (private in SDK 1.x, so checked rather than assumed) */
-const getRequestHandlers = (server: McpServer): Map<string, ListTools> | undefined => {
-  const handlers: unknown = Reflect.get(server.server, '_requestHandlers');
-  return handlers instanceof Map ? handlers : undefined;
-};
-
-/**
- * Adds icons to tools in tools/list (MCP 2025-11-25 tool icons, which ChatGPT shows on entrypoints). The MCP
- * TypeScript SDK 1.x doesn't list tool icons, so this wraps its tools/list handler. If a new SDK changes how
- * it keeps handlers, tools are listed without icons and this says so.
- */
-export const addToolIcons = (server: McpServer, icons: Record<string, ToolIcon[]>) => {
-  const handlers = getRequestHandlers(server);
-  const listTools = handlers?.get('tools/list');
-  if (!handlers || !listTools) {
-    console.warn('[EventCatalog MCP] Could not add tool icons: the MCP SDK no longer exposes its tools/list handler');
-    return false;
-  }
-  handlers.set('tools/list', async (request, extra) => {
-    const result = await listTools(request, extra);
-    return { ...result, tools: result.tools.map((tool) => (icons[tool.name] ? { ...tool, icons: icons[tool.name] } : tool)) };
-  });
-  return true;
-};

package/dist/{chunk-NCEZDQSW.js → chunk-QJ7KKN2D.js}

@@ -1,10 +1,3 @@
-import {
-  createFederationContentCache
-} from "./chunk-R7Z5ALYI.js";
-import {
-  getFederationDiagnostics,
-  resolveFederationRules
-} from "./chunk-JJPB6EOZ.js";
 import {
   withFederationOutputTransaction
 } from "./chunk-WRNH5C3U.js";
@@ -14,6 +7,13 @@ import {
 import {
   createFederationSourceProvider
 } from "./chunk-A2RZR3U4.js";
+import {
+  createFederationContentCache
+} from "./chunk-R7Z5ALYI.js";
+import {
+  getFederationDiagnostics,
+  resolveFederationRules
+} from "./chunk-JJPB6EOZ.js";
 import {
   getEventCatalogConfigFile
 } from "./chunk-4G7FSRPN.js";