@atlisp/mcp 1.0.4 → 1.0.6

package/README.md

@@ -11,12 +11,22 @@ MCP (Model Context Protocol) Server for @lisp on CAD - 为 CAD 环境提供 @lis
 - 获取 CAD 平台信息
 - 通过 MCP 协议提供标准化接口
 - 管理 @lisp 包（列出、搜索、安装）
+- 自动检测 CAD 状态（忙碌/空闲）
+- CAD 无文档时自动处理
 
 
 ## 安装
 
+### Windows (PowerShell)
+
+```powershell
+iwr -useb https://atlisp.cn/install.ps1 | iex
+```
+
+### macOS / Linux
+
 ```bash
-npm i -g @atlisp/mcp 
+npm i -g @atlisp/mcp
 ```
 
 ## 使用方法
@@ -131,28 +141,13 @@ curl http://localhost:8110/health
 
 HTTP 模式：`POST http://localhost:8110/mcp`
 
-#### 列出工具
-
-```bash
-curl -X POST http://localhost:8110/mcp \
-  -H "Content-Type: application/json" \
-  -d '{"jsonrpc":"2.0","id":1,"method":"tools/list"}'
-```
-
-#### 调用工具
-
-```bash
-curl -X POST http://localhost:8110/mcp \
-  -H "Content-Type: application/json" \
-  -d '{"jsonrpc":"2.0","id":2,"method":"tools/call","params":{"name":"工具名","arguments":{参数}}}'
-```
-
 ## 可用工具
 
 | 工具名称 | 描述 | 参数 |
 |---------|------|------|
 | `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`: 搜索关键词 |
@@ -161,6 +156,7 @@ curl -X POST http://localhost:8110/mcp \
 | `get_file_extensions` | 获取指定平台的文件扩展名 | `platform`: 平台名称 |
 | `get_install_code` | 获取 @lisp 安装代码 | 无 |
 | `at_command` | 执行 @lisp 命令 | `command`: 命令 |
+| `new_document` | 在 CAD 中新建空白文档 | 无 |
 | `install_atlisp` | 在 CAD 中安装 @lisp | 无 |
 
 ## 支持的平台
@@ -170,18 +166,15 @@ curl -X POST http://localhost:8110/mcp \
 - **GStarCAD** (文件扩展名: `.des`)
 - **BricsCAD** (文件扩展名: `.des`)
 
-## 技术栈
-
-- **Runtime**: Node.js >= 18
-- **MCP SDK**: `@modelcontextprotocol/sdk`
-- **CAD 连接**: `edge-js` (通过 .NET COM 互操作)
-
 ## 工作原理
 
 1. MCP Server 通过 `edge-js` 调用 .NET 代码
 2. .NET 代码通过 COM 互操作连接 CAD 应用程序
 3. 支持获取活动 CAD 实例或启动新实例
 4. 通过 `SendCommand` 方法向 CAD 发送 LISP 代码
+5. 执行命令前自动检测 CAD 状态（IsQuiescent）
+6. CAD 忙碌时自动等待（最多 10 次重试）
+7. CAD 无打开文档时返回错误
 
 ## 示例
 
@@ -209,6 +202,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.4",
+    "version": "1.0.6",
     "description": "MCP Server for @lisp on CAD",
     "type": "module",
     "bin": {

package/src/cad-worker.js

@@ -105,7 +105,6 @@ const cadSend = edge.func(function() {/*
           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);
@@ -125,6 +124,53 @@ const cadSend = edge.func(function() {/*
   }
 */});
 
+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");
+      
+      string lispCode = code + "\n(setq _atlisp_result (princ-to-string " + code + "))(progn(setq f(open \"" + tempFile.Replace("\\", "\\\\") + "\" \"w\"))(write-line _atlisp_result f)(close f))\n";
+      
+      try {
+          dynamic cad = System.Runtime.InteropServices.Marshal.GetActiveObject(progId);
+          if (cad != null) {
+              dynamic doc = cad.ActiveDocument;
+              if (doc == null || doc.Name == "") {
+                  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(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 {}
+                      return new { success = true, result = 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');
 
 process.stdin.on('data', (data) => {
@@ -144,22 +190,57 @@ 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 handleMessage(msg) {
   if (msg.type === 'connect') {
@@ -178,20 +259,38 @@ async function handleMessage(msg) {
       });
     });
   }
+  if (msg.type === 'newdoc') {
+    return new Promise((resolve, reject) => {
+      cadNewDoc(msg.platform || 'AutoCAD', (e, r) => {
+        if (e) reject(e);
+        else resolve(r);
+      });
+    });
+  }
   if (msg.type === 'send') {
-    const checkResult = await new Promise((resolve, reject) => {
-      cadHasDoc(msg.platform, (e, r) => {
+    const docCheck = await new Promise((resolve, reject) => {
+      cadHasDoc(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 (!docCheck.hasDoc) {
+      return { success: false, error: 'No open document' };
+    }
+    let retries = 10;
+    while (retries > 0) {
+      const checkResult = await new Promise((resolve, reject) => {
+        cadIsBusy(msg.platform || 'AutoCAD', (e, r) => {
           if (e) reject(e);
           else resolve(r);
         });
       });
+      if (!checkResult.isBusy) break;
+      retries--;
+      if (retries > 0) await new Promise(resolve => setTimeout(resolve, 500));
+    }
+    if (retries === 0) {
+      return { success: false, error: 'CAD is busy, timeout' };
     }
     return new Promise((resolve, reject) => {
       cadSend({ code: msg.code, platform: msg.platform }, (e, r) => {
@@ -200,5 +299,45 @@ 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' };
+    }
+    let retries = 10;
+    while (retries > 0) {
+      const checkResult = await new Promise((resolve, reject) => {
+        cadIsBusy(msg.platform || 'AutoCAD', (e, r) => {
+          if (e) reject(e);
+          else resolve(r);
+        });
+      });
+      if (!checkResult.isBusy) break;
+      retries--;
+      if (retries > 0) await new Promise(resolve => setTimeout(resolve, 500));
+    }
+    if (retries === 0) {
+      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

@@ -114,8 +114,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

@@ -48,7 +48,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 +120,11 @@ const tools = [
       required: ['command']
     }
   },
+  {
+    name: 'new_document',
+    description: '在 CAD 中新建空白文档',
+    inputSchema: { type: 'object', properties: {} }
+  },
   {
     name: 'install_atlisp',
     description: '在 CAD 中安装 @lisp',
@@ -140,6 +154,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 +201,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 };