@contractspec/bundle.library 2.5.0 → 2.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contractspec/bundle.library",
-  "version": "2.5.0",
+  "version": "2.6.1",
   "type": "module",
   "scripts": {
     "clean": "rm -rf dist",
@@ -2052,43 +2052,42 @@
     "react": "19.2.4"
   },
   "dependencies": {
-    "@apollo/client": "^4.1.4",
-    "@contractspec/lib.contracts-spec": "2.5.0",
-    "@contractspec/lib.contracts-library": "2.5.0",
-    "@contractspec/lib.contracts-runtime-server-mcp": "2.5.0",
-    "@contractspec/lib.design-system": "2.5.0",
-    "@contractspec/lib.example-shared-ui": "2.5.0",
-    "@contractspec/lib.logger": "2.5.0",
-    "@contractspec/lib.runtime-sandbox": "1.5.0",
-    "@contractspec/lib.schema": "2.5.0",
-    "@contractspec/lib.ui-kit-web": "2.5.0",
-    "@contractspec/lib.ui-link": "2.5.0",
-    "@contractspec/module.examples": "2.5.0",
+    "@apollo/client": "^4.1.6",
+    "@contractspec/lib.contracts-spec": "2.6.0",
+    "@contractspec/lib.contracts-library": "2.6.0",
+    "@contractspec/lib.contracts-runtime-server-mcp": "2.6.0",
+    "@contractspec/lib.design-system": "2.6.1",
+    "@contractspec/lib.example-shared-ui": "2.6.1",
+    "@contractspec/lib.logger": "2.6.0",
+    "@contractspec/lib.runtime-sandbox": "1.6.0",
+    "@contractspec/lib.schema": "2.6.0",
+    "@contractspec/lib.ui-kit-web": "2.6.0",
+    "@contractspec/lib.ui-link": "2.6.0",
+    "@contractspec/module.examples": "2.6.1",
     "@dnd-kit/core": "^6.1.0",
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
     "@electric-sql/pglite": "^0.3.14",
-    "@scaleway/sdk": "^3.2.0",
+    "@scaleway/sdk": "^3.2.1",
     "@scaleway/sdk-client": "^2.1.0",
     "drizzle-orm": "^0.45.1",
-    "elysia-mcp": "^0.1.0",
-    "framer-motion": "^12.34.0",
-    "lucide-react": "^0.564.0",
-    "posthog-js": "^1.347.2",
-    "posthog-node": "^5.24.15",
+    "framer-motion": "^12.34.3",
+    "lucide-react": "^0.575.0",
+    "posthog-js": "^1.353.0",
+    "posthog-node": "^5.25.0",
     "posthog-react-native": "^4.34.0",
-    "react-hook-form": "^7.70.0",
+    "react-hook-form": "^7.71.2",
     "zod": "^4.3.5",
-    "@contractspec/lib.contracts-integrations": "2.5.0",
-    "@contractspec/lib.contracts-runtime-server-rest": "2.5.0",
-    "@contractspec/lib.contracts-runtime-server-graphql": "2.5.0"
+    "@contractspec/lib.contracts-integrations": "2.6.0",
+    "@contractspec/lib.contracts-runtime-server-rest": "2.6.0",
+    "@contractspec/lib.contracts-runtime-server-graphql": "2.6.0"
   },
   "devDependencies": {
     "@types/react": "~19.2.14",
-    "@contractspec/tool.typescript": "2.5.0",
+    "@contractspec/tool.typescript": "2.6.0",
     "typescript": "^5.9.3",
     "@types/bun": "~1.3.9",
-    "@contractspec/tool.bun": "2.5.0"
+    "@contractspec/tool.bun": "2.6.0"
   },
   "publishConfig": {
     "access": "public",

package/src/application/mcp/common.ts

@@ -6,36 +6,11 @@ import type {
 import { PresentationRegistry } from '@contractspec/lib.contracts-spec/presentations';
 import { createMcpServer } from '@contractspec/lib.contracts-runtime-server-mcp/provider-mcp';
 import type { PresentationSpec } from '@contractspec/lib.contracts-spec/presentations';
-import { mcp } from 'elysia-mcp';
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { WebStandardStreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js';
+import { Elysia } from 'elysia';
 import { Logger } from '@contractspec/lib.logger';
-
-function createConsoleLikeLogger(logger: Logger) {
-  const isDebug = process.env.CONTRACTSPEC_MCP_DEBUG === '1';
-
-  const toMessage = (args: unknown[]) =>
-    args.map((a) => (typeof a === 'string' ? a : JSON.stringify(a))).join(' ');
-
-  return {
-    log: (...args: unknown[]) => {
-      if (!isDebug) return;
-      logger.info(toMessage(args));
-    },
-    info: (...args: unknown[]) => {
-      if (!isDebug) return;
-      logger.info(toMessage(args));
-    },
-    warn: (...args: unknown[]) => {
-      logger.warn(toMessage(args));
-    },
-    error: (...args: unknown[]) => {
-      logger.error(toMessage(args));
-    },
-    debug: (...args: unknown[]) => {
-      if (!isDebug) return;
-      logger.debug(toMessage(args));
-    },
-  };
-}
+import { randomUUID } from 'node:crypto';
 
 interface McpHttpHandlerConfig {
   path: string;
@@ -52,75 +27,193 @@ const baseCtx = {
   decide: async () => ({ effect: 'allow' as const }),
 };
 
-// export function createMcpNextjsHandler({
-//   path,
-//   serverName,
-//   ops,
-//   resources,
-//   prompts,
-//   presentationsV2,
-// }: McpHttpHandlerConfig) {
-//   return createMcpHandler(
-//     (server) => {
-//       createMcpServer(server, ops, resources, prompts, {
-//         toolCtx: () => baseCtx,
-//         promptCtx: () => ({ locale: 'en' }),
-//         resourceCtx: () => ({ locale: 'en' }),
-//         presentationsV2,
-//       });
-//     },
-//     {
-//       serverInfo: {
-//         name: serverName,
-//         version: '1.0.0',
-//       },
-//     },
-//     {
-//       // basePath: path,
-//       disableSse: true,
-//       verboseLogs: true,
-//     }
-//   );
-// }
+interface McpSessionState {
+  server: McpServer;
+  transport: WebStandardStreamableHTTPServerTransport;
+}
 
-export function createMcpElysiaHandler({
+function createJsonRpcErrorResponse(
+  status: number,
+  code: number,
+  message: string,
+  data?: string
+) {
+  return new Response(
+    JSON.stringify({
+      jsonrpc: '2.0',
+      error: {
+        code,
+        message,
+        ...(data ? { data } : {}),
+      },
+      id: null,
+    }),
+    {
+      status,
+      headers: {
+        'content-type': 'application/json',
+      },
+    }
+  );
+}
+
+function createSessionState({
   logger,
-  path,
   serverName,
   ops,
   resources,
   prompts,
   presentations,
-}: McpHttpHandlerConfig) {
-  logger.info('Setting up MCP handler...');
-  return mcp({
-    basePath: path,
-    // Do NOT use console.* in production paths; adapt to console-like interface for the plugin.
-    logger: createConsoleLikeLogger(logger),
-    serverInfo: {
+  stateful,
+}: McpHttpHandlerConfig & { stateful: boolean }): Promise<McpSessionState> {
+  const server = new McpServer(
+    {
       name: serverName,
       version: '1.0.0',
     },
-    // Cursor MCP HTTP clients may not persist Mcp-Session-Id headers reliably.
-    // Run in stateless + JSON response mode by default to maximize compatibility.
-    // Set CONTRACTSPEC_MCP_STATEFUL=1 to restore sessionful behavior.
-    stateless: process.env.CONTRACTSPEC_MCP_STATEFUL !== '1',
+    {
+      capabilities: {
+        tools: {},
+        resources: {},
+        prompts: {},
+        logging: {},
+      },
+    }
+  );
+
+  logger.info('Setting up MCP server...');
+  createMcpServer(server, ops, resources, prompts, {
+    logger,
+    toolCtx: () => baseCtx,
+    promptCtx: () => ({ locale: 'en' }),
+    resourceCtx: () => ({ locale: 'en' }),
+    presentations: new PresentationRegistry(presentations),
+  });
+
+  const transport = new WebStandardStreamableHTTPServerTransport({
+    sessionIdGenerator: stateful ? () => randomUUID() : undefined,
     enableJsonResponse: true,
-    capabilities: {
-      tools: {},
-      resources: {},
-      prompts: {},
-      logging: {},
-    },
-    setupServer: (server) => {
-      logger.info('Setting up MCP server...');
-      createMcpServer(server, ops, resources, prompts, {
+  });
+
+  return server.connect(transport).then(() => ({ server, transport }));
+}
+
+async function closeSessionState(state: McpSessionState) {
+  await Promise.allSettled([state.transport.close(), state.server.close()]);
+}
+
+function toErrorMessage(error: unknown) {
+  return error instanceof Error
+    ? (error.stack ?? error.message)
+    : String(error);
+}
+
+export function createMcpElysiaHandler({
+  logger,
+  path,
+  serverName,
+  ops,
+  resources,
+  prompts,
+  presentations,
+}: McpHttpHandlerConfig) {
+  logger.info('Setting up MCP handler...');
+
+  const isStateful = process.env.CONTRACTSPEC_MCP_STATEFUL === '1';
+  const sessions = new Map<string, McpSessionState>();
+
+  async function handleStateless(request: Request) {
+    const state = await createSessionState({
+      logger,
+      path,
+      serverName,
+      ops,
+      resources,
+      prompts,
+      presentations,
+      stateful: false,
+    });
+
+    try {
+      return await state.transport.handleRequest(request);
+    } finally {
+      await closeSessionState(state);
+    }
+  }
+
+  async function closeSession(sessionId: string) {
+    const state = sessions.get(sessionId);
+    if (!state) return;
+    sessions.delete(sessionId);
+    await closeSessionState(state);
+  }
+
+  async function handleStateful(request: Request) {
+    const requestedSessionId = request.headers.get('mcp-session-id');
+    let state: McpSessionState;
+    let createdState = false;
+
+    if (requestedSessionId) {
+      const existing = sessions.get(requestedSessionId);
+      if (!existing) {
+        return createJsonRpcErrorResponse(404, -32001, 'Session not found');
+      }
+      state = existing;
+    } else {
+      state = await createSessionState({
         logger,
-        toolCtx: () => baseCtx,
-        promptCtx: () => ({ locale: 'en' }),
-        resourceCtx: () => ({ locale: 'en' }),
-        presentations: new PresentationRegistry(presentations),
+        path,
+        serverName,
+        ops,
+        resources,
+        prompts,
+        presentations,
+        stateful: true,
       });
-    },
-  });
+      createdState = true;
+    }
+
+    try {
+      const response = await state.transport.handleRequest(request);
+      const activeSessionId = state.transport.sessionId;
+
+      if (activeSessionId && !sessions.has(activeSessionId)) {
+        sessions.set(activeSessionId, state);
+      }
+
+      if (request.method === 'DELETE' && activeSessionId) {
+        await closeSession(activeSessionId);
+      } else if (!activeSessionId && createdState) {
+        await closeSessionState(state);
+      }
+
+      return response;
+    } catch (error) {
+      if (createdState) {
+        await closeSessionState(state);
+      }
+      throw error;
+    }
+  }
+
+  return new Elysia({ name: `mcp-${serverName}` }).all(
+    path,
+    async ({ request }) => {
+      try {
+        if (isStateful) {
+          return await handleStateful(request);
+        }
+
+        return await handleStateless(request);
+      } catch (error) {
+        logger.error('Error handling MCP request', {
+          path,
+          method: request.method,
+          error: toErrorMessage(error),
+        });
+
+        return createJsonRpcErrorResponse(500, -32000, 'Internal error');
+      }
+    }
+  );
 }