@atlisp/mcp 1.0.24 → 1.0.26

package/package.json

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

package/src/atlisp-mcp.js

@@ -75,16 +75,11 @@ const TOOL_HANDLERS = {
     search_packages:       (a) => packageHandlers.searchPackages(a.query),
     install_package:       (a) => packageHandlers.installPackage(a.packageName),
     get_platform_info:     () => ({ content: [{ type: 'text', text: `支持的 CAD 平台:\n${CAD_PLATFORMS.join('\n')}\n当前连接: ${cad.connected ? '已连接' : '未连接'}` }] }),
-    get_file_extensions:   (a) => {
-        const exts = FILE_EXTENSIONS[a.platform];
-        if (!exts) return { content: [{ type: 'text', text: `错误: 不支持的平台 "${a.platform}"` }], isError: true };
-        return { content: [{ type: 'text', text: `${a.platform} 文件扩展名: ${exts.join(', ')}` }] };
-    },
-    get_install_code:      () => ({ content: [{ type: 'text', text: `复制以下代码到 CAD 命令行安装 @lisp:\n\n(progn(vl-load-com)(setq s strcat h "http" o(vlax-create-object (s"win"h".win"h"request.5.1"))v vlax-invoke e eval r read)(v o'open "get" (s h"://atlisp.""cn/@"):vlax-true)(v o'send)(v o'WaitforResponse 1000)(e(r(vlax-get-property o'ResponseText))))` }] }),
     at_command:            (a) => cadHandlers.atCommand(a.command),
     new_document:          () => cadHandlers.newDocument(),
     bring_to_front:        () => cadHandlers.bringToFront(),
     install_atlisp:        () => cadHandlers.installAtlisp(),
+    init_atlisp:          () => cadHandlers.initAtlisp(),
     get_function_usage:    (a) => functionHandlers.getFunctionUsage(a.name, a.package),
     list_functions:        (a) => functionHandlers.listFunctions(a.package),
 };
@@ -149,20 +144,6 @@ export const tools = [
 	description: '获取 CAD 平台信息',
 	inputSchema: { type: 'object', properties: {} }
     },
-    {
-	name: 'get_file_extensions',
-	description: '获取指定平台的文件扩展名',
-	inputSchema: {
-	    type: 'object',
-	    properties: { platform: { type: 'string', enum: CAD_PLATFORMS, description: 'CAD 平台' } },
-	    required: ['platform']
-	}
-    },
-    {
-	name: 'get_install_code',
-	description: '获取 @lisp 安装代码',
-	inputSchema: { type: 'object', properties: {} }
-    },
     {
 	name: 'at_command',
 	description: '执行 @lisp 命令',
@@ -187,6 +168,11 @@ export const tools = [
 	description: '在 CAD 中安装 @lisp',
 	inputSchema: { type: 'object', properties: {} }
     },
+    {
+	name: 'init_atlisp',
+	description: '初始化 CAD 中的 @lisp 环境，加载函数库和初始变量',
+	inputSchema: { type: 'object', properties: {} }
+    },
     {
 	name: 'get_function_usage',
 	description: '获取 @lisp 函数用法（从本地 JSON 库）',
@@ -247,7 +233,7 @@ async function initCadConnection() {
 	const connected = await cad.connect();
 	if (connected) {
 	    log('Auto-connected to CAD: ' + cad.getPlatform() + ' ' + cad.getVersion());
-	    console.log('已自动连接到 CAD: ' + cad.getPlatform() + ' ' + cad.getVersion());
+	    console.error('已自动连接到 CAD: ' + cad.getPlatform() + ' ' + cad.getVersion());
 	} else {
 	    log('No CAD found on startup');
 	}
@@ -385,9 +371,9 @@ export async function startServer() {
     if (config.transport === 'stdio') {
         await initCadConnection();
         const mcpServer = createMcpServer();
-        const stdioTransport = new StdioServerTransport();
-        await mcpServer.connect(stdioTransport);
-        console.log(`${SERVER_NAME} 运行在 stdio 模式`);
+const transport = new StdioServerTransport();
+        await mcpServer.connect(transport);
+        console.error(`${SERVER_NAME} 运行在 stdio 模式`);
     } else {
         const app = express();
 
@@ -544,6 +530,56 @@ export async function startServer() {
             });
         }
 
+        app.post('/mcp/stream', mcpLimiter, async (req, res) => {
+            const body = req.body || {};
+            const { method, params, id } = body;
+            const accept = req.get('Accept') || '';
+            const wantsSse = accept.includes('text/event-stream');
+            const sessionId = req.get('mcp-session-id') || '';
+            log(`POST /mcp/stream - session: ${sessionId} - method: ${method} - wantsSSE: ${wantsSse}`);
+
+            if (wantsSse) {
+                if (!enableSse) {
+                    res.status(400).json({ error: 'SSE mode is disabled' });
+                    return;
+                }
+
+                const clientId = sessionId || crypto.randomUUID();
+                res.setHeader('mcp-session-id', clientId);
+
+                let session;
+                if (sessionId && sseSessionManager.has(sessionId)) {
+                    session = sseSessionManager.get(sessionId);
+                    if (!id) {
+                        res.status(204).end();
+                        return;
+                    }
+                    await handleMcpRequest(session, method, params, id);
+                    res.status(204).end();
+                    return;
+                }
+
+                session = new SseSession(res, { clientId });
+                sseSessionManager.add(clientId, session);
+
+                if (!id) {
+                    return;
+                }
+                await handleMcpRequest(session, method, params, id);
+                return;
+            }
+
+            res.setHeader('mcp-session-id', sessionId || crypto.randomUUID());
+            const { send } = createSseResponseHandler(res, wantsSse);
+
+            if (!id) return res.status(204).end();
+
+            await dispatchMcpMethod(
+                (response) => send(response, true),
+                method, params, id
+            );
+        });
+
         app.get('/mcp', (req, res) => {
             const accept = req.get('Accept') || '';
             if (accept.includes('text/event-stream')) {

package/src/cad-worker.js

@@ -135,9 +135,16 @@ const cadSendWithResult = edge.func(function() {/*
           tempFile = System.IO.Path.Combine(tempDir, "atlisp_result_" + System.Guid.NewGuid().ToString("N") + ".txt");
           lispFile = System.IO.Path.Combine(tempDir, "atlisp_code_" + System.Guid.NewGuid().ToString("N") + ".lsp");
           
-          // 生成 LISP 代码：执行 code，将结果打印到 tempFile
-          // 使用 princ 输出原始字符串
-          string lispCode = "(progn(setq f(open \"" + tempFile.Replace("\\", "\\\\") + "\" \"w\"))(princ (progn " + code + ") f)(close f)(princ))";
+          // 生成 LISP 代码：使用 vl-catch-all-apply 捕获结果和错误
+          // 返回 (success . result) 或 (nil . error-msg)
+          string lispCode = "(progn"
+              + "(setq f(open \"" + tempFile.Replace("\\", "\\\\") + "\" \"w\"))"
+              + "(setq r(vl-catch-all-apply '(lambda ()(progn " + code + "))))"
+              + "(if (vl-catch-all-error-p r)"
+              + "(princ(strcat \"ERROR:\"(vl-catch-all-error-message r)) f)"
+              + "(princ r f))"
+              + "(close f)"
+              + "(princ))";
           
             // 使用系统 ANSI 编码以兼容 GstarCAD / ZWCAD
             System.IO.File.WriteAllText(lispFile, lispCode, System.Text.Encoding.GetEncoding(System.Globalization.CultureInfo.CurrentCulture.TextInfo.ANSICodePage));
@@ -185,6 +192,11 @@ const cadSendWithResult = edge.func(function() {/*
                               
                               result = enc.GetString(bytes).Trim();
                               
+                              // 检查是否有错误前缀
+                              if (result.StartsWith("ERROR:")) {
+                                  return new { success = false, error = result.Substring(6).Trim() };
+                              }
+                              
                               try { System.IO.File.Delete(tempFile); } catch {}
                               try { System.IO.File.Delete(lispFile); } catch {}
                               break;
@@ -334,7 +346,7 @@ async function waitForIdle(platform) {
   return false;
 }
 
-function checkParens(code) {
+export function checkParens(code) {
   let depth = 0;
   let inString = false;
   for (let i = 0; i < code.length; i++) {

package/src/constants.js

@@ -8,7 +8,11 @@ export const FILE_EXTENSIONS = {
 
 export const PROTOCOL_VERSION = '2024-11-05';
 export const SERVER_NAME = 'atlisp-mcp-server';
-export const SERVER_VERSION = '1.0.24';
+<<<<<<< HEAD
+export const SERVER_VERSION = '1.0.25';
+=======
+export const SERVER_VERSION = '1.0.22';
+>>>>>>> 0627854 (chore: 升级 mcp-server 版本到 1.0.22)
 
 export const MOCK_PACKAGES = [
     { name: 'base', description: '基础函数库', version: '1.0.0' },

package/src/handlers/cad-handlers.js

@@ -77,3 +77,22 @@ export async function installAtlisp() {
     await cad.sendCommand(installCode + '\n');
     return { content: [{ type: 'text', text: '已发送 @lisp 安装代码到 CAD' }] };
 }
+
+export async function initAtlisp() {
+    if (!cad.connected) { await cad.connect(); }
+    if (!cad.connected) return { content: [{ type: 'text', text: '未连接 CAD' }], isError: true };
+    const code = `(if (null @::load-module)
+	   (progn
+	     (vl-load-com)
+	     (setq s strcat h"http"o(vlax-create-object (s"win"h".win"h"request.5.1"))
+		   v vlax-invoke e eval r read)(v o'open "get" (s h"://""atlisp.""cn/cloud"):vlax-true)
+		   (v o'send)
+		   (v o'WaitforResponse 1000)
+		   (e(r(vlax-get o'ResponseText)))))`;
+    try {
+        await cad.sendCommand(code + '\n');
+        return { content: [{ type: 'text', text: '已发送 @lisp 函数库加载代码到 CAD' }] };
+    } catch (e) {
+        return { content: [{ type: 'text', text: `错误: ${e.message}` }], isError: true };
+    }
+}