@dynamic-mockups/mcp 1.0.0 → 1.0.2

package/README.md

@@ -1,171 +1,125 @@
 # Dynamic Mockups MCP Server
 
-Official MCP (Model Context Protocol) server for the [Dynamic Mockups API](https://dynamicmockups.com). Generate product mockups directly from AI assistants like Claude, Cursor, Windsurf, and more.
+Official MCP server for [Dynamic Mockups](https://dynamicmockups.com) — a product mockup generator API. Create professional mockups directly from AI assistants like Claude, Cursor, and Windsurf.
 
-## Installation
-
-### Quick Start with npx
+## Requirements
 
-No installation required - just configure your MCP client:
+- Node.js 18 or higher
+- Dynamic Mockups API key — [get one here](https://app.dynamicmockups.com/dashboard-api)
 
-```json
-{
-  "mcpServers": {
-    "dynamic-mockups": {
-      "command": "npx",
-      "args": ["-y", "@dynamic-mockups/mcp"],
-      "env": {
-        "DYNAMIC_MOCKUPS_API_KEY": "your_api_key_here"
-      }
-    }
-  }
-}
-```
-
-### Get Your API Key
-
-1. Go to [Dynamic Mockups Dashboard](https://app.dynamicmockups.com/account/api-keys)
-2. Create a new API key
-3. Add it to your MCP client configuration
-
-## Configuration by Client
-
-### Claude Desktop
+## Installation
 
-Edit `~/Library/Application Support/Claude/claude_desktop_config.json` (macOS) or `%APPDATA%\Claude\claude_desktop_config.json` (Windows):
+Add the following to your MCP client configuration file:
 
 ```json
 {
-  "mcpServers": {
-    "dynamic-mockups": {
-      "command": "npx",
-      "args": ["-y", "@dynamic-mockups/mcp"],
-      "env": {
-        "DYNAMIC_MOCKUPS_API_KEY": "your_api_key_here"
+   "mcpServers": {
+      "dynamic-mockups": {
+         "command": "npx",
+         "args": ["-y", "@dynamic-mockups/mcp"],
+         "env": {
+            "DYNAMIC_MOCKUPS_API_KEY": "your_api_key_here"
+         }
       }
-    }
-  }
+   }
 }
 ```
 
-### Claude Code (CLI)
+### Lovable
 
-Add to `.mcp.json` in your project root:
-
-```json
-{
-  "mcpServers": {
-    "dynamic-mockups": {
-      "command": "npx",
-      "args": ["-y", "@dynamic-mockups/mcp"],
-      "env": {
-        "DYNAMIC_MOCKUPS_API_KEY": "your_api_key_here"
-      }
-    }
-  }
-}
-```
+For Lovable, simply enter:
+- **Server URL**: `https://mcp.dynamicmockups.com`
+- **API Key**: Your Dynamic Mockups API key ([get one here](https://app.dynamicmockups.com/dashboard-api))
 
-### Cursor
+### HTTP Transport
 
-Add to `.cursor/mcp.json` in your project:
+If you want to connect via HTTP instead of NPX, use:
 
 ```json
 {
-  "mcpServers": {
-    "dynamic-mockups": {
-      "command": "npx",
-      "args": ["-y", "@dynamic-mockups/mcp"],
-      "env": {
-        "DYNAMIC_MOCKUPS_API_KEY": "your_api_key_here"
-      }
-    }
-  }
-}
-```
-
-### Windsurf
-
-Add to `~/.codeium/windsurf/mcp_config.json`:
-
-```json
-{
-  "mcpServers": {
-    "dynamic-mockups": {
-      "command": "npx",
-      "args": ["-y", "@dynamic-mockups/mcp"],
-      "env": {
-        "DYNAMIC_MOCKUPS_API_KEY": "your_api_key_here"
+   "mcpServers": {
+      "dynamic-mockups": {
+         "type": "http",
+         "url": "https://mcp.dynamicmockups.com",
+         "headers": {
+            "x-api-key": "your_api_key_here"
+         }
       }
-    }
-  }
+   }
 }
 ```
 
-## Available Tools
-
-### API Information
-- **`get_api_info`** - Get API knowledge base (billing, rate limits, formats, best practices, support)
-
-### Catalogs
-- **`get_catalogs`** - Retrieve all available catalogs
-
-### Collections
-- **`get_collections`** - Retrieve collections (optionally filter by catalog)
-- **`create_collection`** - Create a new collection
-
-### Mockups
-- **`get_mockups`** - Get list of available mockups with optional filters
-- **`get_mockup_by_uuid`** - Retrieve a specific mockup by UUID
-
-### Rendering
-- **`create_render`** - Create a single mockup render with design assets
-- **`create_batch_render`** - Render multiple mockups in one request
-- **`export_print_files`** - Export print files for smart objects
-
-### PSD Files
-- **`upload_psd`** - Upload a PSD file with optional mockup template creation
-- **`delete_psd`** - Delete a PSD file with optional related mockups deletion
+### Config File Locations
+
+| Client | Config File Path |
+|--------|------------------|
+| Claude Desktop (macOS) | `~/Library/Application Support/Claude/claude_desktop_config.json` |
+| Claude Desktop (Windows) | `%APPDATA%\Claude\claude_desktop_config.json` |
+| Claude Code (CLI) | `.mcp.json` in project root |
+| Cursor | `.cursor/mcp.json` in project |
+| Windsurf | `~/.codeium/windsurf/mcp_config.json` |
+
+## Tools
+
+| Tool | Description |
+|------|-------------|
+| `get_api_info` | Get API knowledge base (billing, rate limits, formats, best practices, support) |
+| `get_catalogs` | Retrieve all available catalogs |
+| `get_collections` | Retrieve collections (optionally filter by catalog) |
+| `create_collection` | Create a new collection |
+| `get_mockups` | Get list of available mockups with optional filters |
+| `get_mockup_by_uuid` | Retrieve a specific mockup by UUID |
+| `create_render` | Create a single mockup render with design assets (1 credit) |
+| `create_batch_render` | Render multiple mockups in one request (1 credit per image) |
+| `export_print_files` | Export high-resolution print files for production |
+| `upload_psd` | Upload a PSD file and optionally create a mockup template |
+| `delete_psd` | Delete a PSD file with optional related mockups deletion |
 
 ## Usage Examples
 
-### Get Your Catalogs
-
 Ask your AI assistant:
-> "Get my Dynamic Mockups catalogs"
-
-### Get Mockups from a Collection
 
-> "Show me all mockups in my T-shirt collection"
-
-### Create a Render
-
-> "Create a mockup render using mockup UUID abc123 with my logo from https://example.com/logo.png"
-
-### Batch Render
-
-> "Render my design on all mockups in the Summer collection"
+| Use Case | Example Prompt |
+|----------|----------------|
+| List catalogs | "Get my Dynamic Mockups catalogs" |
+| Browse mockups | "Show me all mockups in my T-shirt collection" |
+| Single render | "Create a mockup render using any T-shirt mockup with my artwork from url: https://example.com/my-design.png" |
+| Batch render | "Render my artwork from url: https://example.com/my-design.png on all mockups in the Winter T-shirt collection" |
+| Create collection | "Create a new collection called Summer 2025 Hoodies" |
+| Upload PSD | "Upload my PSD mockup from url: https://example.com/my-mockup.psd and create a template from it" |
+| API info | "What are the rate limits and supported file formats for Dynamic Mockups?" |
+| Print files | "Export print-ready files at 300 DPI for my poster mockup" |
 
 ## Development
 
 ### Local Installation
 
 ```bash
-git clone https://github.com/dynamicmockups/mcp-server.git
+git clone https://github.com/dynamic-mockups/mcp.git
 cd mcp-server
 npm install
 ```
 
-### Run Locally
+### Run Locally (stdio mode - default)
 
 ```bash
 DYNAMIC_MOCKUPS_API_KEY=your_key npm start
 ```
 
+### Run Locally (HTTP mode)
+
+```bash
+DYNAMIC_MOCKUPS_API_KEY=your_key npm run start:http
+```
+
 ### Development Mode (with auto-reload)
 
 ```bash
+# stdio mode
 DYNAMIC_MOCKUPS_API_KEY=your_key npm run dev
+
+# HTTP mode
+DYNAMIC_MOCKUPS_API_KEY=your_key npm run dev:http
 ```
 
 ### Use Local Version in MCP Client
@@ -196,9 +150,10 @@ The server returns clear error messages for common issues:
 
 - [Dynamic Mockups Website](https://dynamicmockups.com)
 - [API Documentation](https://docs.dynamicmockups.com)
-- [Get API Key](https://app.dynamicmockups.com/account/api-keys)
-- [GitHub Issues](https://github.com/dynamicmockups/mcp-server/issues)
+- [Get API Key](https://app.dynamicmockups.com/dashboard-api)
+- [GitHub Repository](https://github.com/dynamic-mockups/mcp)
+- [GitHub Issues](https://github.com/dynamic-mockups/mcp/issues)
 
 ## License
 
-MIT
+MIT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-mockups/mcp",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Official Dynamic Mockups MCP Server - Generate product mockups with AI assistants",
   "type": "module",
   "main": "src/index.js",
@@ -9,7 +9,9 @@
   },
   "scripts": {
     "start": "node src/index.js",
-    "dev": "node --watch src/index.js"
+    "start:http": "node src/index.js --http",
+    "dev": "node --watch src/index.js",
+    "dev:http": "node --watch src/index.js --http"
   },
   "keywords": [
     "mcp",
@@ -34,7 +36,9 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.0.0",
-    "axios": "^1.6.0"
+    "axios": "^1.6.0",
+    "express": "^4.21.0",
+    "cors": "^2.8.5"
   },
   "engines": {
     "node": ">=18.0.0"

package/src/index.js

@@ -4,11 +4,19 @@
  * Dynamic Mockups MCP Server
  * Official MCP server for the Dynamic Mockups API
  * https://dynamicmockups.com
+ *
+ * Supports both stdio and HTTP/SSE transports:
+ * - stdio: Default when run directly (for Claude Desktop, Cursor, etc.)
+ * - HTTP/SSE: When imported and used with startHttpServer() (for web-based clients)
  */
 
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import express from "express";
+import cors from "cors";
+import { randomUUID } from "node:crypto";
 import axios from "axios";
 import { ResponseFormatter } from "./response-formatter.js";
 
@@ -80,32 +88,71 @@ const server = new Server(
 // HTTP Client
 // =============================================================================
 
-function createApiClient() {
+/**
+ * Creates an API client with the provided API key.
+ * For stdio transport: uses environment variable
+ * For HTTP transport: uses client-provided API key from Authorization header
+ *
+ * @param {string} apiKey - The API key to use for requests
+ */
+function createApiClient(apiKey) {
   return axios.create({
     baseURL: API_BASE_URL,
     headers: {
       "Accept": "application/json",
       "Content-Type": "application/json",
-      "x-api-key": API_KEY || "",
+      "x-api-key": apiKey || "",
     },
     timeout: 60000, // 60 second timeout for render operations
     validateStatus: (status) => status < 500, // Only throw on 5xx errors
   });
 }
 
-function validateApiKey() {
-  if (!API_KEY) {
+/**
+ * Validates that an API key is present.
+ * @param {string} apiKey - The API key to validate
+ */
+function validateApiKey(apiKey) {
+  if (!apiKey) {
     return ResponseFormatter.error(
       "API key not configured",
       {
-        solution: "Set the DYNAMIC_MOCKUPS_API_KEY environment variable in your MCP client configuration.",
-        get_key_at: "https://app.dynamicmockups.com/account/api-keys",
+        solution: "Provide your Dynamic Mockups API key. For HTTP transport, use the Authorization header (Bearer token). For stdio transport, set the DYNAMIC_MOCKUPS_API_KEY environment variable.",
+        get_key_at: "https://app.dynamicmockups.com/dashboard-api",
       }
     );
   }
   return null;
 }
 
+/**
+ * Extracts the API key from various sources.
+ * Priority: requestInfo headers > environment variable
+ *
+ * @param {Object} extra - Extra info passed to handlers (contains requestInfo for HTTP transport)
+ */
+function getApiKey(extra) {
+  // For HTTP transport: check Authorization header (Bearer token) or x-api-key header
+  if (extra?.requestInfo?.headers) {
+    const headers = extra.requestInfo.headers;
+
+    // Check Authorization: Bearer <token>
+    const authHeader = headers.authorization || headers.Authorization;
+    if (authHeader && authHeader.startsWith("Bearer ")) {
+      return authHeader.slice(7);
+    }
+
+    // Check x-api-key header
+    const apiKeyHeader = headers["x-api-key"] || headers["X-Api-Key"];
+    if (apiKeyHeader) {
+      return apiKeyHeader;
+    }
+  }
+
+  // Fallback to environment variable (for stdio transport)
+  return API_KEY;
+}
+
 // =============================================================================
 // Tool Definitions
 // =============================================================================
@@ -491,20 +538,22 @@ async function handleGetApiInfo(args) {
   return ResponseFormatter.ok(topicMap[topic] || API_KNOWLEDGE_BASE);
 }
 
-async function handleGetCatalogs() {
-  const error = validateApiKey();
+async function handleGetCatalogs(args, extra) {
+  const apiKey = getApiKey(extra);
+  const error = validateApiKey(apiKey);
   if (error) return error;
 
   try {
-    const response = await createApiClient().get("/catalogs");
+    const response = await createApiClient(apiKey).get("/catalogs");
     return ResponseFormatter.fromApiResponse(response);
   } catch (err) {
     return ResponseFormatter.fromError(err, "Failed to get catalogs");
   }
 }
 
-async function handleGetCollections(args = {}) {
-  const error = validateApiKey();
+async function handleGetCollections(args = {}, extra) {
+  const apiKey = getApiKey(extra);
+  const error = validateApiKey(apiKey);
   if (error) return error;
 
   try {
@@ -514,30 +563,32 @@ async function handleGetCollections(args = {}) {
       params.append("include_all_catalogs", args.include_all_catalogs);
     }
 
-    const response = await createApiClient().get(`/collections?${params}`);
+    const response = await createApiClient(apiKey).get(`/collections?${params}`);
     return ResponseFormatter.fromApiResponse(response);
   } catch (err) {
     return ResponseFormatter.fromError(err, "Failed to get collections");
   }
 }
 
-async function handleCreateCollection(args) {
-  const error = validateApiKey();
+async function handleCreateCollection(args, extra) {
+  const apiKey = getApiKey(extra);
+  const error = validateApiKey(apiKey);
   if (error) return error;
 
   try {
     const payload = { name: args.name };
     if (args.catalog_uuid) payload.catalog_uuid = args.catalog_uuid;
 
-    const response = await createApiClient().post("/collections", payload);
+    const response = await createApiClient(apiKey).post("/collections", payload);
     return ResponseFormatter.fromApiResponse(response, `Collection "${args.name}" created`);
   } catch (err) {
     return ResponseFormatter.fromError(err, "Failed to create collection");
   }
 }
 
-async function handleGetMockups(args = {}) {
-  const error = validateApiKey();
+async function handleGetMockups(args = {}, extra) {
+  const apiKey = getApiKey(extra);
+  const error = validateApiKey(apiKey);
   if (error) return error;
 
   try {
@@ -549,27 +600,29 @@ async function handleGetMockups(args = {}) {
     }
     if (args.name) params.append("name", args.name);
 
-    const response = await createApiClient().get(`/mockups?${params}`);
+    const response = await createApiClient(apiKey).get(`/mockups?${params}`);
     return ResponseFormatter.fromApiResponse(response);
   } catch (err) {
     return ResponseFormatter.fromError(err, "Failed to get mockups");
   }
 }
 
-async function handleGetMockupByUuid(args) {
-  const error = validateApiKey();
+async function handleGetMockupByUuid(args, extra) {
+  const apiKey = getApiKey(extra);
+  const error = validateApiKey(apiKey);
   if (error) return error;
 
   try {
-    const response = await createApiClient().get(`/mockup/${args.uuid}`);
+    const response = await createApiClient(apiKey).get(`/mockup/${args.uuid}`);
     return ResponseFormatter.fromApiResponse(response);
   } catch (err) {
     return ResponseFormatter.fromError(err, "Failed to get mockup");
   }
 }
 
-async function handleCreateRender(args) {
-  const error = validateApiKey();
+async function handleCreateRender(args, extra) {
+  const apiKey = getApiKey(extra);
+  const error = validateApiKey(apiKey);
   if (error) return error;
 
   try {
@@ -581,22 +634,23 @@ async function handleCreateRender(args) {
     if (args.export_options) payload.export_options = args.export_options;
     if (args.text_layers) payload.text_layers = args.text_layers;
 
-    const response = await createApiClient().post("/renders", payload);
+    const response = await createApiClient(apiKey).post("/renders", payload);
     return ResponseFormatter.fromApiResponse(response, "Render created (1 credit used)");
   } catch (err) {
     return ResponseFormatter.fromError(err, "Failed to create render");
   }
 }
 
-async function handleCreateBatchRender(args) {
-  const error = validateApiKey();
+async function handleCreateBatchRender(args, extra) {
+  const apiKey = getApiKey(extra);
+  const error = validateApiKey(apiKey);
   if (error) return error;
 
   try {
     const payload = { renders: args.renders };
     if (args.export_options) payload.export_options = args.export_options;
 
-    const response = await createApiClient().post("/renders/batch", payload);
+    const response = await createApiClient(apiKey).post("/renders/batch", payload);
     const count = args.renders?.length || 0;
     return ResponseFormatter.fromApiResponse(response, `Batch render complete (${count} credits used)`);
   } catch (err) {
@@ -604,8 +658,9 @@ async function handleCreateBatchRender(args) {
   }
 }
 
-async function handleExportPrintFiles(args) {
-  const error = validateApiKey();
+async function handleExportPrintFiles(args, extra) {
+  const apiKey = getApiKey(extra);
+  const error = validateApiKey(apiKey);
   if (error) return error;
 
   try {
@@ -617,15 +672,16 @@ async function handleExportPrintFiles(args) {
     if (args.export_options) payload.export_options = args.export_options;
     if (args.text_layers) payload.text_layers = args.text_layers;
 
-    const response = await createApiClient().post("/renders/print-files", payload);
+    const response = await createApiClient(apiKey).post("/renders/print-files", payload);
     return ResponseFormatter.fromApiResponse(response, "Print files exported");
   } catch (err) {
     return ResponseFormatter.fromError(err, "Failed to export print files");
   }
 }
 
-async function handleUploadPsd(args) {
-  const error = validateApiKey();
+async function handleUploadPsd(args, extra) {
+  const apiKey = getApiKey(extra);
+  const error = validateApiKey(apiKey);
   if (error) return error;
 
   try {
@@ -634,15 +690,16 @@ async function handleUploadPsd(args) {
     if (args.psd_category_id) payload.psd_category_id = args.psd_category_id;
     if (args.mockup_template) payload.mockup_template = args.mockup_template;
 
-    const response = await createApiClient().post("/psd/upload", payload);
+    const response = await createApiClient(apiKey).post("/psd/upload", payload);
     return ResponseFormatter.fromApiResponse(response, "PSD uploaded successfully");
   } catch (err) {
     return ResponseFormatter.fromError(err, "Failed to upload PSD");
   }
 }
 
-async function handleDeletePsd(args) {
-  const error = validateApiKey();
+async function handleDeletePsd(args, extra) {
+  const apiKey = getApiKey(extra);
+  const error = validateApiKey(apiKey);
   if (error) return error;
 
   try {
@@ -651,7 +708,7 @@ async function handleDeletePsd(args) {
       payload.delete_related_mockups = args.delete_related_mockups;
     }
 
-    const response = await createApiClient().post("/psd/delete", payload);
+    const response = await createApiClient(apiKey).post("/psd/delete", payload);
     return ResponseFormatter.fromApiResponse(response, "PSD deleted successfully");
   } catch (err) {
     return ResponseFormatter.fromError(err, "Failed to delete PSD");
@@ -682,7 +739,7 @@ const toolHandlers = {
 
 server.setRequestHandler(ListToolsRequestSchema, async () => ({ tools }));
 
-server.setRequestHandler(CallToolRequestSchema, async (request) => {
+server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
   const { name, arguments: args } = request.params;
 
   const handler = toolHandlers[name];
@@ -691,7 +748,8 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
   }
 
   try {
-    return await handler(args || {});
+    // Pass extra context (contains requestInfo with headers for HTTP transport)
+    return await handler(args || {}, extra);
   } catch (err) {
     return ResponseFormatter.fromError(err, `Error executing ${name}`);
   }
@@ -701,12 +759,189 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
 // Server Startup
 // =============================================================================
 
-async function main() {
+/**
+ * Start the MCP server with stdio transport (default)
+ * Used by: Claude Desktop, Claude Code, Cursor, Windsurf
+ */
+async function startStdioServer() {
   const transport = new StdioServerTransport();
   await server.connect(transport);
-  console.error(`Dynamic Mockups MCP Server v${SERVER_VERSION} running`);
+  console.error(`Dynamic Mockups MCP Server v${SERVER_VERSION} running (stdio)`);
+}
+
+/**
+ * Start the MCP server with Streamable HTTP transport
+ * Used by: Web-based clients like Lovable that require a URL endpoint
+ *
+ * Uses the modern StreamableHTTPServerTransport which supports both
+ * SSE streaming and direct HTTP responses per the MCP specification.
+ *
+ * @param {Object} options - Server options
+ * @param {number} options.port - Port to listen on (default: 3000)
+ * @param {string} options.host - Host to bind to (default: '0.0.0.0')
+ * @param {string|string[]} options.corsOrigin - CORS origin(s) (default: '*')
+ * @returns {Promise<{app: Express, httpServer: Server}>}
+ */
+async function startHttpServer(options = {}) {
+  const {
+    port = process.env.PORT || 3000,
+    host = process.env.HOST || "0.0.0.0",
+    corsOrigin = process.env.CORS_ORIGIN || "*",
+  } = options;
+
+  const app = express();
+
+  // CORS configuration - must allow MCP-specific headers and auth headers
+  app.use(cors({
+    origin: corsOrigin,
+    methods: ["GET", "POST", "DELETE", "OPTIONS"],
+    allowedHeaders: [
+      "Content-Type",
+      "Accept",
+      "Authorization",
+      "x-api-key",
+      "Mcp-Session-Id",
+      "Last-Event-Id",
+      "Mcp-Protocol-Version",
+    ],
+    exposedHeaders: ["Mcp-Session-Id"],
+    credentials: true,
+  }));
+
+  // Note: We don't use express.json() globally because StreamableHTTPServerTransport
+  // needs to read the raw body. We parse JSON only for non-MCP endpoints.
+
+  // Store active transports by session ID for multi-session support
+  const transports = new Map();
+
+  // Health check endpoint
+  app.get("/health", (req, res) => {
+    res.json({
+      status: "ok",
+      server: SERVER_NAME,
+      version: SERVER_VERSION,
+      transport: "streamable-http",
+      activeSessions: transports.size,
+    });
+  });
+
+  // API info endpoint (convenience endpoint, not MCP)
+  app.get("/api/info", (req, res) => {
+    res.json({
+      server: SERVER_NAME,
+      version: SERVER_VERSION,
+      api_key_configured: !!API_KEY,
+      tools: tools.map((t) => ({ name: t.name, description: t.description })),
+      endpoints: {
+        mcp: "/mcp",
+        health: "/health",
+      },
+    });
+  });
+
+  // MCP endpoint - handles all MCP communication (GET for SSE, POST for messages, DELETE for session termination)
+  // Available at both "/" and "/mcp" for flexibility
+  app.all(["/", "/mcp"], async (req, res) => {
+    // Check for existing session
+    const sessionId = req.headers["mcp-session-id"];
+
+    if (sessionId && transports.has(sessionId)) {
+      // Reuse existing transport for this session
+      const { transport } = transports.get(sessionId);
+      await transport.handleRequest(req, res);
+      return;
+    }
+
+    // For new connections (no session ID or unknown session), create new transport
+    if (req.method === "POST" || req.method === "GET") {
+      // Create a new MCP server instance for this connection
+      const connectionServer = new Server(
+        { name: SERVER_NAME, version: SERVER_VERSION },
+        { capabilities: { tools: {} } }
+      );
+
+      // Register the same handlers
+      connectionServer.setRequestHandler(ListToolsRequestSchema, async () => ({ tools }));
+      connectionServer.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
+        const { name, arguments: args } = request.params;
+        const handler = toolHandlers[name];
+        if (!handler) {
+          return ResponseFormatter.error(`Unknown tool: ${name}`);
+        }
+        try {
+          // Pass extra context (contains requestInfo with headers for API key extraction)
+          return await handler(args || {}, extra);
+        } catch (err) {
+          return ResponseFormatter.fromError(err, `Error executing ${name}`);
+        }
+      });
+
+      // Create Streamable HTTP transport with session support
+      const transport = new StreamableHTTPServerTransport({
+        sessionIdGenerator: () => randomUUID(),
+        onsessioninitialized: (newSessionId) => {
+          console.error(`Session initialized: ${newSessionId}`);
+          transports.set(newSessionId, { transport, server: connectionServer });
+        },
+        onsessionclosed: (closedSessionId) => {
+          console.error(`Session closed: ${closedSessionId}`);
+          transports.delete(closedSessionId);
+        },
+      });
+
+      // Connect server to transport
+      await connectionServer.connect(transport);
+
+      // Handle the request
+      await transport.handleRequest(req, res);
+      return;
+    }
+
+    // Unknown session for DELETE or other methods
+    res.status(400).json({
+      jsonrpc: "2.0",
+      error: {
+        code: -32000,
+        message: "Bad Request: No valid session found",
+      },
+      id: null,
+    });
+  });
+
+  // Legacy SSE endpoint for backwards compatibility
+  app.get("/sse", (req, res) => {
+    res.redirect(307, "/");
+  });
+
+  const httpServer = app.listen(port, host, () => {
+    console.error(`Dynamic Mockups MCP Server v${SERVER_VERSION} running`);
+    console.error(`Streamable HTTP transport available at http://${host}:${port}`);
+    console.error(`  - MCP endpoint: http://${host}:${port}/mcp`);
+    console.error(`  - Health check: http://${host}:${port}/health`);
+    console.error(`  - API info: http://${host}:${port}/api/info`);
+  });
+
+  return { app, httpServer };
+}
+
+/**
+ * Main entry point - determines transport based on command line args or environment
+ */
+async function main() {
+  const args = process.argv.slice(2);
+  const useHttp = args.includes("--http") || process.env.MCP_TRANSPORT === "http";
+
+  if (useHttp) {
+    await startHttpServer();
+  } else {
+    await startStdioServer();
+  }
 }
 
+// Export for programmatic use
+export { startHttpServer, startStdioServer, server, tools, toolHandlers };
+
+// Run if executed directly
 main().catch((err) => {
   console.error("Fatal error:", err);
   process.exit(1);