@atlisp/mcp 1.0.24 → 1.0.25

package/package.json

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

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;

package/src/constants.js

@@ -8,7 +8,7 @@ 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';
+export const SERVER_VERSION = '1.0.25';
 
 export const MOCK_PACKAGES = [
     { name: 'base', description: '基础函数库', version: '1.0.0' },