@atlisp/mcp 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@atlisp/mcp",
-    "version": "1.0.7",
+    "version": "1.0.9",
     "description": "MCP Server for @lisp on CAD",
     "type": "module",
     "bin": {

package/src/index.js

@@ -8,6 +8,7 @@ import {
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
+import crypto from 'crypto';
 import { cad } from './cad.js';
 
 const DEBUG_FILE = path.join(os.tmpdir(), 'mcp-server-debug.log');
@@ -197,8 +198,8 @@ async function handleToolCall(name, args) {
 
     case 'at_command':
       if (!cad.connected) return { content: [{ type: 'text', text: '请先连接 CAD' }], isError: true };
-      await cad.sendCommand(`@${args.command}\n`);
-      return { content: [{ type: 'text', text: `已发送命令: @${args.command}` }] };
+      await cad.sendCommand(`${args.command}\n`);
+      return { content: [{ type: 'text', text: `已发送命令: ${args.command}` }] };
 
     case 'new_document':
       if (!cad.connected) { await cad.connect(); }
@@ -221,21 +222,6 @@ async function handleToolCall(name, args) {
   }
 }
 
-const mcpServer = new Server(
-  { name: 'atlisp-mcp-server', version: '1.0.7' },
-  { capabilities: { tools: {} } }
-);
-
-mcpServer.setRequestHandler(ListToolsRequestSchema, async () => {
-  return { tools };
-});
-
-mcpServer.setRequestHandler(CallToolRequestSchema, async (request) => {
-  console.error('setRequestHandler called, name:', request.params.name);
-  const { name, arguments: args } = request.params;
-  return await handleToolCall(name, args || {});
-});
-
 async function initCadConnection() {
   log('Attempting to connect to CAD on startup...');
   try {
@@ -251,8 +237,25 @@ async function initCadConnection() {
   }
 }
 
+function createMcpServer() {
+  const server = new Server(
+    { name: 'atlisp-mcp-server', version: '1.0.9' },
+    { capabilities: { tools: {} } }
+  );
+
+  server.setRequestHandler(ListToolsRequestSchema, async () => ({ tools }));
+
+  server.setRequestHandler(CallToolRequestSchema, async (request) => {
+    const { name, arguments: args } = request.params;
+    return await handleToolCall(name, args || {});
+  });
+
+  return server;
+}
+
 if (TRANSPORT === 'stdio') {
   await initCadConnection();
+  const mcpServer = createMcpServer();
   const transport = new StdioServerTransport();
   await mcpServer.connect(transport);
   console.error('@lisp MCP Server 运行在 stdio 模式');
@@ -264,56 +267,82 @@ if (TRANSPORT === 'stdio') {
     res.json({ status: 'ok', cad: cad.connected ? 'connected' : 'disconnected' });
   });
 
+  let mcpServer = null;
+  const sessionId = crypto.randomUUID();
+
   app.post('/mcp', async (req, res) => {
-    log('POST /mcp called, body: ' + JSON.stringify(req.body));
-    try {
-      const message = req.body;
-      const id = message.id;
+    if (!mcpServer) {
+      mcpServer = createMcpServer();
+    }
+
+    const { method, params, id } = req.body || {};
+    const accept = req.get('Accept') || '';
+    log('accept: "' + accept + '", wantsSSE: ' + accept.includes('text/event-stream'));
+
+    res.setHeader('mcp-session-id', sessionId);
 
-      if (!id) {
-        log('No id, returning 204');
-        return res.status(204).end();
+    const sendResponse = (data) => {
+      const json = JSON.stringify(data);
+      if (accept.includes('text/event-stream')) {
+        res.setHeader('Content-Type', 'text/event-stream');
+        return res.end('data: ' + json + '\n\n');
+      } else {
+        res.setHeader('Content-Type', 'application/json');
+        return res.end(json);
       }
+    };
+
+    if (!id) {
+      return res.status(204).end();
+    }
 
-      if (message.method === 'initialize') {
-        return res.json({
+    try {
+      if (method === 'initialize') {
+        sendResponse({
           jsonrpc: '2.0',
-          id: id,
+          id,
           result: {
             protocolVersion: '2024-11-05',
             capabilities: { tools: {} },
-            serverInfo: { name: 'atlisp-mcp-server', version: '1.0.7' }
+            serverInfo: { name: 'atlisp-mcp-server', version: '1.0.9' }
           }
         });
       }
 
-      if (message.method === 'tools/list') {
-        return res.json({
+      if (method === 'tools/list') {
+        sendResponse({
           jsonrpc: '2.0',
-          id: id,
+          id,
           result: { tools }
         });
       }
 
-      if (message.method === 'tools/call') {
-        log('tools/call called, name: ' + message.params.name);
-        const result = await handleToolCall(message.params.name, message.params.arguments || {});
-        log('tools/call result: ' + JSON.stringify(result));
-        return res.json({
-          jsonrpc: '2.0',
-          id: id,
-          result
-        });
+      if (method === 'tools/call') {
+        const toolName = params?.name;
+        if (!toolName) {
+          sendResponse({
+            jsonrpc: '2.0',
+            id,
+            error: { code: -32602, message: 'Invalid params: missing tool name' }
+          });
+          return;
+        }
+        const toolArgs = params?.arguments || {};
+        const result = await handleToolCall(toolName, toolArgs);
+        sendResponse({ jsonrpc: '2.0', id, result });
+        return;
       }
 
-      res.json({
+      sendResponse({
         jsonrpc: '2.0',
-        id: id,
+        id,
         error: { code: -32601, message: 'Method not found' }
       });
     } catch (e) {
-      res.status(500).json({
+      log('MCP error: ' + e.message);
+      return res.status(500).json({
         jsonrpc: '2.0',
+        id,
         error: { code: -32603, message: e.message }
       });
     }
@@ -321,7 +350,6 @@ if (TRANSPORT === 'stdio') {
 
   app.listen(PORT, HOST, async () => {
     await initCadConnection();
-    const status = cad.connected ? '已连接 CAD' : '未连接 CAD';
-    console.error(`@lisp MCP Server 启动 - http://${HOST}:${PORT} - ${status}`);
+    console.error(`@lisp MCP Server 启动 - http://${HOST}:${PORT} - Streamable HTTP`);
   });
-}
+}