@atlisp/mcp 1.0.5 → 1.0.7

package/README.md

@@ -11,6 +11,8 @@ MCP (Model Context Protocol) Server for @lisp on CAD - 为 CAD 环境提供 @lis
 - 获取 CAD 平台信息
 - 通过 MCP 协议提供标准化接口
 - 管理 @lisp 包（列出、搜索、安装）
+- 自动检测 CAD 状态（忙碌/空闲）
+- CAD 无文档时自动处理
 
 
 ## 安装
@@ -121,6 +123,9 @@ atlisp-mcp
 | `TRANSPORT` | `http` | 传输模式：`http` 或 `stdio` |
 | `PORT` | `8110` | HTTP 模式监听端口 |
 | `HOST` | `0.0.0.0` | HTTP 模式监听地址 |
+| `MESSAGE_TIMEOUT` | `60000` | 消息超时（毫秒） |
+| `BUSY_RETRIES` | `10` | CAD 忙碌时重试次数 |
+| `BUSY_DELAY` | `500` | CAD 忙碌重试间隔（毫秒） |
 
 ## API
 
@@ -144,7 +149,8 @@ HTTP 模式：`POST http://localhost:8110/mcp`
 | 工具名称 | 描述 | 参数 |
 |---------|------|------|
 | `connect_cad` | 连接到 CAD | 无 |
-| `eval_lisp` | 在 CAD 中执行 AutoLISP 代码 | `code`: 字符串 |
+| `eval_lisp` | 在 CAD 中执行 AutoLISP 代码（不返回结果） | `code`: 字符串 |
+| `eval_lisp_with_result` | 在 CAD 中执行 AutoLISP 代码并返回结果 | `code`: 字符串 |
 | `get_cad_info` | 获取当前 CAD 信息 | 无 |
 | `list_packages` | 列出已安装的 @lisp 包 | 无 |
 | `search_packages` | 搜索 @lisp 包 | `query`: 搜索关键词 |
@@ -153,6 +159,7 @@ HTTP 模式：`POST http://localhost:8110/mcp`
 | `get_file_extensions` | 获取指定平台的文件扩展名 | `platform`: 平台名称 |
 | `get_install_code` | 获取 @lisp 安装代码 | 无 |
 | `at_command` | 执行 @lisp 命令 | `command`: 命令 |
+| `new_document` | 在 CAD 中新建空白文档 | 无 |
 | `install_atlisp` | 在 CAD 中安装 @lisp | 无 |
 
 ## 支持的平台
@@ -168,6 +175,9 @@ HTTP 模式：`POST http://localhost:8110/mcp`
 2. .NET 代码通过 COM 互操作连接 CAD 应用程序
 3. 支持获取活动 CAD 实例或启动新实例
 4. 通过 `SendCommand` 方法向 CAD 发送 LISP 代码
+5. 执行命令前自动检测 CAD 状态（IsQuiescent）
+6. CAD 忙碌时自动等待（最多 10 次重试）
+7. CAD 无打开文档时返回错误
 
 ## 示例
 
@@ -195,6 +205,14 @@ curl -X POST http://localhost:8110/mcp \
   -d '{"jsonrpc":"2.0","id":3,"method":"tools/call","params":{"name":"search_packages","arguments":{"query":"base"}}}'
 ```
 
+### 新建文档
+
+```bash
+curl -X POST http://localhost:8110/mcp \
+  -H "Content-Type: application/json" \
+  -d '{"jsonrpc":"2.0","id":4,"method":"tools/call","params":{"name":"new_document","arguments":{}}}'
+```
+
 ## 注意事项
 
 - 仅支持 Windows 平台（依赖 COM 互操作）

package/package.json

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

package/src/cad-worker.js

@@ -2,6 +2,9 @@
 import edge from 'edge-js';
 import process from 'process';
 
+const BUSY_RETRIES = parseInt(process.env.BUSY_RETRIES || '10', 10);
+const BUSY_DELAY = parseInt(process.env.BUSY_DELAY || '500', 10);
+
 const cadConnect = edge.func(function() {/*
   async (input) => {
       // Try existing CAD instances
@@ -104,17 +107,6 @@ const cadSend = edge.func(function() {/*
           dynamic cad = System.Runtime.InteropServices.Marshal.GetActiveObject(progId);
           if (cad != null) {
               dynamic doc = cad.ActiveDocument;
-              if (doc == null || doc.Name == "") {
-                  // Try default template path
-                  string templatePath = @"C:\Users\Public\Documents\AutoCAD 2024\Sample\basics.dwg";
-                  if (System.IO.File.Exists(templatePath)) {
-                      cad.Documents.Open(templatePath, false);
-                  } else {
-                      cad.Documents.Add("");
-                  }
-                  System.Threading.Thread.Sleep(2000);
-              }
-              doc = cad.ActiveDocument;
               if (doc != null) {
                   doc.SendCommand(code);
                   return new { success = true };
@@ -123,7 +115,49 @@ const cadSend = edge.func(function() {/*
       } catch {}
       return new { success = false };
   }
-*/});
+ */});
+
+const cadSendWithResult = edge.func(function() {/*
+  async (input) => {
+      dynamic d = input;
+      string code = d.code.ToString();
+      string platform = d.platform.ToString();
+      string progId = platform + ".Application";
+      
+      string tempDir = System.IO.Path.GetTempPath();
+      string tempFile = System.IO.Path.Combine(tempDir, "atlisp_result_" + System.Guid.NewGuid().ToString("N") + ".txt");
+      
+      // Use print to write result directly to file
+      string lispCode = "(progn(setq f(open \"" + tempFile.Replace("\\", "\\\\") + "\" \"w\"))(print " + code + " f)(close f))";
+      
+      try {
+          dynamic cad = System.Runtime.InteropServices.Marshal.GetActiveObject(progId);
+          if (cad != null) {
+              dynamic doc = cad.ActiveDocument;
+              if (doc != null) {
+                  doc.SendCommand(lispCode + "\n");
+                  System.Threading.Thread.Sleep(500);
+                  
+                  if (System.IO.File.Exists(tempFile)) {
+                      string result = System.IO.File.ReadAllText(tempFile).Trim();
+                      try { System.IO.File.Delete(tempFile); } catch {}
+                      if (!string.IsNullOrEmpty(result)) {
+                          return new { success = true, result = result };
+                      }
+                      // Try evaluate result directly if file is empty
+                      return new { success = true, result = "" };
+                  }
+                  return new { success = true, result = "" };
+              }
+          }
+      } catch (Exception ex) {
+          try { if (System.IO.File.Exists(tempFile)) System.IO.File.Delete(tempFile); } catch {}
+          return new { success = false, error = ex.Message };
+      }
+      try { if (System.IO.File.Exists(tempFile)) System.IO.File.Delete(tempFile); } catch {}
+      return new { success = false };
+  }
+ */});
 
 process.stdin.setEncoding('utf8');
 
@@ -144,22 +178,73 @@ process.stdin.on('data', (data) => {
   }
 });
 
-const cadHasDoc = edge.func(function() {/*
+const cadIsBusy = edge.func(function() {/*
   async (input) => {
       string platform = input.ToString();
       string progId = platform + ".Application";
       try {
           dynamic cad = System.Runtime.InteropServices.Marshal.GetActiveObject(progId);
           if (cad != null) {
-              dynamic doc = cad.ActiveDocument;
-              if (doc != null && doc.Name != "") {
-                  return new { hasDoc = true, name = doc.Name };
+              bool isBusy = false;
+              if (platform == "ZWCAD") {
+                  isBusy = !(cad.GetZcadState().IsQuiescent);
+              } else {
+                  isBusy = !(cad.GetAcadState().IsQuiescent);
               }
+              return new { isBusy = isBusy };
           }
       } catch {}
-      return new { hasDoc = false };
+      return new { isBusy = false };
   }
-*/});
+ */});
+
+const cadHasDoc = edge.func(function() {/*
+  async (input) => {
+      string platform = input.ToString();
+      string progId = platform + ".Application";
+      try {
+          dynamic cad = System.Runtime.InteropServices.Marshal.GetActiveObject(progId);
+          if (cad != null) {
+              int docCount = cad.Documents.Count;
+              return new { hasDoc = docCount > 0, docCount = docCount };
+          }
+      } catch {}
+      return new { hasDoc = false, docCount = 0 };
+  }
+ */});
+
+const cadNewDoc = edge.func(function() {/*
+  async (input) => {
+      string platform = input.ToString();
+      string progId = platform + ".Application";
+      try {
+          dynamic cad = System.Runtime.InteropServices.Marshal.GetActiveObject(progId);
+          if (cad != null) {
+              cad.Documents.Add();
+              return new { success = true };
+          }
+      } catch (Exception ex) {
+          return new { success = false, error = ex.Message };
+      }
+      return new { success = false, error = "CAD not found" };
+  }
+ */});
+
+async function waitForIdle(platform) {
+  let retries = BUSY_RETRIES;
+  while (retries > 0) {
+    const checkResult = await new Promise((resolve, reject) => {
+      cadIsBusy(platform || 'AutoCAD', (e, r) => {
+        if (e) reject(e);
+        else resolve(r);
+      });
+    });
+    if (!checkResult.isBusy) return true;
+    retries--;
+    if (retries > 0) await new Promise(resolve => setTimeout(resolve, BUSY_DELAY));
+  }
+  return false;
+}
 
 async function handleMessage(msg) {
   if (msg.type === 'connect') {
@@ -178,20 +263,26 @@ async function handleMessage(msg) {
       });
     });
   }
-  if (msg.type === 'send') {
-    const checkResult = await new Promise((resolve, reject) => {
-      cadHasDoc(msg.platform, (e, r) => {
+  if (msg.type === 'newdoc') {
+    return new Promise((resolve, reject) => {
+      cadNewDoc(msg.platform || 'AutoCAD', (e, r) => {
         if (e) reject(e);
         else resolve(r);
       });
     });
-    if (!checkResult.hasDoc) {
-      const newDoc = await new Promise((resolve, reject) => {
-        cadSend({ code: "\n", platform: msg.platform }, (e, r) => {
-          if (e) reject(e);
-          else resolve(r);
-        });
+  }
+  if (msg.type === 'send') {
+    const docCheck = await new Promise((resolve, reject) => {
+      cadHasDoc(msg.platform || 'AutoCAD', (e, r) => {
+        if (e) reject(e);
+        else resolve(r);
       });
+    });
+    if (!docCheck.hasDoc) {
+      return { success: false, error: 'No open document' };
+    }
+    if (!(await waitForIdle(msg.platform))) {
+      return { success: false, error: 'CAD is busy, timeout' };
     }
     return new Promise((resolve, reject) => {
       cadSend({ code: msg.code, platform: msg.platform }, (e, r) => {
@@ -200,5 +291,33 @@ async function handleMessage(msg) {
       });
     });
   }
+  if (msg.type === 'sendResult') {
+    const docCheck = await new Promise((resolve, reject) => {
+      cadHasDoc(msg.platform || 'AutoCAD', (e, r) => {
+        if (e) reject(e);
+        else resolve(r);
+      });
+    });
+    if (!docCheck.hasDoc) {
+      return { success: false, error: 'No open document' };
+    }
+    if (!(await waitForIdle(msg.platform))) {
+      return { success: false, error: 'CAD is busy, timeout' };
+    }
+    return new Promise((resolve, reject) => {
+      cadSendWithResult({ code: msg.code, platform: msg.platform }, (e, r) => {
+        if (e) reject(e);
+        else resolve(r);
+      });
+    });
+  }
+  if (msg.type === 'isBusy') {
+    return new Promise((resolve, reject) => {
+      cadIsBusy(msg.platform || 'AutoCAD', (e, r) => {
+        if (e) reject(e);
+        else resolve(r);
+      });
+    });
+  }
   return { error: 'unknown message type' };
 }

package/src/cad.js

@@ -11,6 +11,8 @@ const FILE_EXTENSIONS = {
   'BricsCAD': ['.des']
 };
 
+const MESSAGE_TIMEOUT = parseInt(process.env.MESSAGE_TIMEOUT || '60000', 10);
+
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const workerPath = path.join(__dirname, 'cad-worker.js');
 
@@ -44,7 +46,7 @@ function sendMessage(msg) {
         responded = true;
         reject(new Error('Timeout waiting for worker'));
       }
-    }, 60000);
+    }, MESSAGE_TIMEOUT);
     
     const handler = (data) => {
       try {
@@ -114,8 +116,51 @@ class CadConnection {
     }
   }
 
+  async sendCommandWithResult(code) {
+    if (!this.connected) throw new Error('未连接 CAD');
+    try {
+      const result = await sendMessage({ type: 'sendResult', code: code, platform: _platform });
+      if (result && result.success) {
+        return result.result || '';
+      }
+      return null;
+    } catch (e) {
+      return null;
+    }
+  }
+
   getVersion() { return this.version; }
   getPlatform() { return this.product; }
+
+  async isBusy() {
+    if (!this.connected) return false;
+    try {
+      const result = await sendMessage({ type: 'isBusy', platform: _platform });
+      return result && result.isBusy;
+    } catch (e) {
+      return false;
+    }
+  }
+
+  async hasDoc() {
+    if (!this.connected) return { hasDoc: false, docCount: 0 };
+    try {
+      const result = await sendMessage({ type: 'hasdoc', platform: _platform });
+      return result || { hasDoc: false, docCount: 0 };
+    } catch (e) {
+      return { hasDoc: false, docCount: 0 };
+    }
+  }
+
+  async newDoc() {
+    if (!this.connected) throw new Error('未连接 CAD');
+    try {
+      const result = await sendMessage({ type: 'newdoc', platform: _platform });
+      return result && result.success;
+    } catch (e) {
+      return false;
+    }
+  }
   
   async getInfo() {
     if (!this.connected) return 'CAD 未连接';

package/src/index.js

@@ -1,7 +1,6 @@
 import express from 'express';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js';
 import {
   ListToolsRequestSchema,
   CallToolRequestSchema,
@@ -48,7 +47,16 @@ const tools = [
   },
   {
     name: 'eval_lisp',
-    description: '在 CAD 中执行 AutoLISP 代码',
+    description: '在 CAD 中执行 AutoLISP 代码（不返回结果）',
+    inputSchema: {
+      type: 'object',
+      properties: { code: { type: 'string', description: '要执行的 LISP 代码' } },
+      required: ['code']
+    }
+  },
+  {
+    name: 'eval_lisp_with_result',
+    description: '在 CAD 中执行 AutoLISP 代码并返回结果',
     inputSchema: {
       type: 'object',
       properties: { code: { type: 'string', description: '要执行的 LISP 代码' } },
@@ -111,6 +119,11 @@ const tools = [
       required: ['command']
     }
   },
+  {
+    name: 'new_document',
+    description: '在 CAD 中新建空白文档',
+    inputSchema: { type: 'object', properties: {} }
+  },
   {
     name: 'install_atlisp',
     description: '在 CAD 中安装 @lisp',
@@ -140,6 +153,15 @@ async function handleToolCall(name, args) {
       await cad.sendCommand(args.code + '\n');
       return { content: [{ type: 'text', text: `已发送命令: ${args.code}` }] };
 
+    case 'eval_lisp_with_result':
+      if (!cad.connected) { await cad.connect(); }
+      if (!cad.connected) return { content: [{ type: 'text', text: '未连接 CAD' }], isError: true };
+      const result = await cad.sendCommandWithResult(args.code);
+      if (result !== null) {
+        return { content: [{ type: 'text', text: result }] };
+      }
+      return { content: [{ type: 'text', text: '执行失败或无返回值' }], isError: true };
+
     case 'get_cad_info':
       if (!cad.connected) { await cad.connect(); }
       if (!cad.connected) return { content: [{ type: 'text', text: 'CAD 未连接' }] };
@@ -178,6 +200,15 @@ async function handleToolCall(name, args) {
       await cad.sendCommand(`@${args.command}\n`);
       return { content: [{ type: 'text', text: `已发送命令: @${args.command}` }] };
 
+    case 'new_document':
+      if (!cad.connected) { await cad.connect(); }
+      if (!cad.connected) return { content: [{ type: 'text', text: '未连接 CAD' }], isError: true };
+      const docResult = await cad.newDoc();
+      if (docResult) {
+        return { content: [{ type: 'text', text: '已在 CAD 中新建空白文档' }] };
+      }
+      return { content: [{ type: 'text', text: '新建文档失败' }], isError: true };
+
     case 'install_atlisp':
       if (!cad.connected) { await cad.connect(); }
       if (!cad.connected) return { content: [{ type: 'text', text: '未连接 CAD' }], isError: true };
@@ -191,7 +222,7 @@ async function handleToolCall(name, args) {
 }
 
 const mcpServer = new Server(
-  { name: 'atlisp-mcp-server', version: '1.0.0' },
+  { name: 'atlisp-mcp-server', version: '1.0.7' },
   { capabilities: { tools: {} } }
 );
 
@@ -251,7 +282,7 @@ if (TRANSPORT === 'stdio') {
           result: {
             protocolVersion: '2024-11-05',
             capabilities: { tools: {} },
-            serverInfo: { name: 'atlisp-mcp-server', version: '1.0.0' }
+            serverInfo: { name: 'atlisp-mcp-server', version: '1.0.7' }
           }
         });
       }