@atlisp/mcp 1.8.25 → 1.8.27

package/dist/atlisp-mcp.js

@@ -851,7 +851,7 @@ var init_cad = __esm({
           throw new Error(result.error || "\u53D1\u9001\u5931\u8D25");
         });
       }
-      async sendCommandWithResult(code, encoding = null) {
+      async sendCommandWithResult(code, encoding = null, raw = false) {
         if (!this.connected) throw new Error("\u672A\u8FDE\u63A5 CAD");
         return new Promise((resolve, reject) => {
           this._commandQueue.enqueue({
@@ -863,7 +863,12 @@ var init_cad = __esm({
             reject
           }, PRIORITY_NORMAL);
         }).then((result) => {
-          if (result.success) return result.result || "";
+          if (result.success) {
+            if (raw && result.rawBase64 !== void 0) {
+              return { text: result.result || "", rawBase64: result.rawBase64 };
+            }
+            return result.result || "";
+          }
           throw new Error(result.error || "\u53D1\u9001\u5931\u8D25");
         });
       }
@@ -1224,8 +1229,8 @@ var init_cad = __esm({
       async sendCommand(code) {
         return _resolveConn().sendCommand(code);
       },
-      async sendCommandWithResult(code, encoding) {
-        return _resolveConn().sendCommandWithResult(code, encoding);
+      async sendCommandWithResult(code, encoding, raw) {
+        return _resolveConn().sendCommandWithResult(code, encoding, raw);
       },
       getVersion() {
         return _resolveConn().getVersion();
@@ -8529,6 +8534,7 @@ __export(cad_handlers_exports, {
   newDocument: () => newDocument,
   setSystemVariable: () => setSystemVariable
 });
+import iconv from "iconv-lite";
 async function connectCad(platform = null) {
   log(`connect_cad called${platform ? ` (target: ${platform})` : ""}, cad.connected before: ${cad.connected}`);
   try {
@@ -8611,9 +8617,15 @@ var init_cad_handlers = __esm({
 ${detail}`);
       }
       if (withResult) {
-        const result = await cad.sendCommandWithResult(trimmed, encoding);
-        if (result !== null) {
-          return mcpSuccess(result);
+        const useRaw = encoding ? true : false;
+        const resp = await cad.sendCommandWithResult(trimmed, encoding, useRaw);
+        if (resp !== null) {
+          if (useRaw && resp.rawBase64) {
+            const buf = Buffer.from(resp.rawBase64, "base64");
+            const decoded = iconv.decode(buf, encoding);
+            return mcpSuccess(decoded);
+          }
+          return mcpSuccess(resp);
         }
         return mcpError("\u6267\u884C\u5931\u8D25\u6216\u65E0\u8FD4\u56DE\u503C");
       }
@@ -18771,7 +18783,7 @@ import { randomUUID as randomUUID6, createHash } from "crypto";
 import fs14 from "fs";
 import path18 from "path";
 import { fileURLToPath as fileURLToPath7 } from "url";
-import iconv from "iconv-lite";
+import iconv2 from "iconv-lite";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 
 // src/cad-event-bus.js
@@ -18982,7 +18994,7 @@ function createJsonBodyParser() {
       let charset = m ? m[1].toLowerCase() : "utf-8";
       const charsetMap = { "gb2312": "gbk", "gb18030": "gbk", "gbk": "gbk", "936": "gbk" };
       charset = charsetMap[charset] || charset;
-      const str = iconv.decode(buf, charset);
+      const str = iconv2.decode(buf, charset);
       req.body = JSON.parse(str);
       next();
     } catch (e) {

package/dist/cad-worker.js

@@ -248,6 +248,7 @@ string encoding = d.encoding != null ? d.encoding.ToString() : "";
 
                   int retries = 10;
                   string result = "";
+                  string rawBase64 = "";
                   while (retries > 0 && !System.IO.File.Exists(tempFile)) {
                       System.Threading.Thread.Sleep(200);
                       retries--;
@@ -257,6 +258,7 @@ string encoding = d.encoding != null ? d.encoding.ToString() : "";
                       while (retries > 0) {
                           try {
                               byte[] bytes = System.IO.File.ReadAllBytes(tempFile);
+                              rawBase64 = System.Convert.ToBase64String(bytes);
                               System.Text.Encoding enc;
 
                               if (!string.IsNullOrEmpty(encoding)) {
@@ -294,9 +296,9 @@ string encoding = d.encoding != null ? d.encoding.ToString() : "";
                           }
                       }
                       if (!string.IsNullOrEmpty(result)) {
-                          return new { success = true, result = result };
+                          return new { success = true, result = result, rawBase64 = rawBase64 };
                       }
-                      return new { success = true, result = "" };
+                      return new { success = true, result = "", rawBase64 = rawBase64 };
                   }
                   return new { success = true, result = "" };
               }

package/dist/handlers/batch-doc-handlers.js

@@ -0,0 +1,242 @@
+import { cad } from '../cad.js';
+import { escapeLispString } from '../handler-utils.js';
+
+function ensureCad() {
+    if (!cad.connected) throw new Error('未连接 CAD');
+}
+
+function esc(s) {
+    return escapeLispString(String(s));
+}
+
+function buildFileList(files) {
+    return files.map(f => `"${esc(f)}"`).join(' ');
+}
+
+export async function batchDocCheckStandards(args) {
+    ensureCad();
+    const { files, requiredLayers, forbiddenLayerPrefixes, requiredTextStyles, requiredDimStyles, maxLayerCount } = args;
+    if (!files?.length) return { content: [{ type: 'text', text: '需要 files 参数' }], isError: true };
+
+    const fileList = buildFileList(files);
+    const reqLayers = (requiredLayers || []).map(l => `"${esc(l)}"`).join(' ');
+    const forPrefixes = (forbiddenLayerPrefixes || []).map(p => `"${esc(p)}"`).join(' ');
+    const reqTStyles = (requiredTextStyles || []).map(s => `"${esc(s)}"`).join(' ');
+    const reqDStyles = (requiredDimStyles || []).map(s => `"${esc(s)}"`).join(' ');
+
+    const lisp = `(progn
+    (vl-load-com)
+    (setq files (list ${fileList}))
+    (setq req-layers (list ${reqLayers}))
+    (setq for-prefixes (list ${forPrefixes}))
+    (setq req-tstyles (list ${reqTStyles}))
+    (setq req-dstyles (list ${reqDStyles}))
+    (setq max-layer ${maxLayerCount || 9999})
+    (setq all-reports (list))
+    (foreach f files
+        (setq report (list (cons "file" f) (cons "ok" T) (cons "issues" (list))))
+        (if (findfile f)
+            (progn
+                (command "._OPEN" f)
+                (setq issues (list))
+                ;; check required layers
+                (foreach l req-layers
+                    (if (not (tblsearch "LAYER" l))
+                        (setq issues (cons (list "missing_layer" (strcat "缺少必需图层: " l)) issues))))
+                ;; check forbidden layer prefixes
+                (setq all-layers (list))
+                (setq i 0)
+                (while (setq e (tblnext "LAYER" (if (= i 0) T nil)))
+                    (setq all-layers (cons (cdr (assoc 2 e)) all-layers))
+                    (setq i (1+ i)))
+                (foreach p for-prefixes
+                    (foreach l all-layers
+                        (if (wcmatch (strcase l) (strcat (strcase p) "*"))
+                            (setq issues (cons (list "forbidden_layer" (strcat "禁止图层前缀: " l " 匹配 " p)) issues)))))
+                ;; check layer count
+                (if (> (length all-layers) max-layer)
+                    (setq issues (cons (list "too_many_layers" (strcat "图层数量 " (itoa (length all-layers)) " 超过限制 " (itoa max-layer))) issues)))
+                ;; check required text styles
+                (foreach s req-tstyles
+                    (if (not (tblsearch "STYLE" s))
+                        (setq issues (cons (list "missing_text_style" (strcat "缺少必需文字样式: " s)) issues))))
+                ;; check required dim styles
+                (foreach s req-dstyles
+                    (if (not (tblsearch "DIMSTYLE" s))
+                        (setq issues (cons (list "missing_dim_style" (strcat "缺少必需标注样式: " s)) issues))))
+                (if issues
+                    (progn
+                        (setq report (cons (cons "ok" nil) report))
+                        (setq report (cons (cons "issues" issues) report)))
+                )
+                (command "_.CLOSE" "_N")
+            )
+            (setq report (cons (cons "ok" nil) (cons (cons "issues" (list (list "file_not_found" "文件不存在"))) report)))
+        )
+        (setq all-reports (cons report all-reports))
+    )
+    (princ all-reports)
+    (princ))
+`;
+
+    try {
+        const raw = await cad.sendCommandWithResult(lisp);
+        let reports;
+        try {
+            reports = typeof raw === 'string' ? JSON.parse(raw) : raw;
+        } catch {
+            reports = [{ file: 'parse_error', ok: false, issues: [{ type: 'parse_error', msg: String(raw).substring(0, 200) }] }];
+        }
+        return { content: [{ type: 'text', text: JSON.stringify(reports, null, 2) }] };
+    } catch (e) {
+        return { content: [{ type: 'text', text: `批量检查失败: ${e.message}` }], isError: true };
+    }
+}
+
+export async function batchDocFindReplace(args) {
+    ensureCad();
+    const { files, pattern, replacement, caseSensitive, textTypes } = args;
+    if (!files?.length) return { content: [{ type: 'text', text: '需要 files 参数' }], isError: true };
+    if (!pattern) return { content: [{ type: 'text', text: '需要 pattern 参数' }], isError: true };
+
+    const fileList = buildFileList(files);
+    const caseFlag = caseSensitive ? 'nil' : 'T';
+    const types = textTypes || ['ALL'];
+    const textFilter = types.includes('ALL')
+        ? '(cons 0 "TEXT,MTEXT")'
+        : `(cons 0 "${types.join(',')}")`;
+
+    const lisp = `(progn
+    (vl-load-com)
+    (setq files (list ${fileList}))
+    (setq find-pat "${esc(pattern)}")
+    (setq repl-text "${esc(replacement)}")
+    (setq all-results (list))
+    (foreach f files
+        (setq result (list (cons "file" f) (cons "ok" T) (cons "count" 0)))
+        (if (findfile f)
+            (progn
+                (command "._OPEN" f)
+                (setq count 0)
+                (setq ss (ssget "_X" ${textFilter}))
+                (if ss
+                    (progn
+                        (setq i 0)
+                        (while (< i (sslength ss))
+                            (setq e (ssname ss i))
+                            (setq elist (entget e))
+                            (setq old (cdr (assoc 1 elist)))
+                            (if old
+                                (progn
+                                    (setq new (vl-string-subst repl-text find-pat old))
+                                    (if (/= new old)
+                                        (progn
+                                            (setq elist (subst (cons 1 new) (assoc 1 elist) elist))
+                                            (entmod elist)
+                                            (setq count (1+ count))
+                                        )
+                                    )
+                                )
+                            )
+                            (setq i (1+ i))
+                        )
+                    )
+                )
+                (setq result (cons (cons "count" count) result))
+                (command "_.QSAVE")
+                (command "_.CLOSE" "_Y")
+            )
+            (setq result (cons (cons "ok" nil) (cons (cons "error" "文件不存在") result)))
+        )
+        (setq all-results (cons result all-results))
+    )
+    (princ (vl-prin1-to-string all-results))
+    (princ))
+`;
+
+    try {
+        const raw = await cad.sendCommandWithResult(lisp);
+        let results;
+        try {
+            results = typeof raw === 'string' ? JSON.parse(raw) : raw;
+        } catch {
+            results = [{ file: 'parse_error', ok: false, error: String(raw).substring(0, 200) }];
+        }
+        const total = results.reduce((s, r) => s + (r.count || 0), 0);
+        const text = `替换完成: 共处理 ${results.length} 个文件，${total} 处替换\n${JSON.stringify(results, null, 2)}`;
+        return { content: [{ type: 'text', text }] };
+    } catch (e) {
+        return { content: [{ type: 'text', text: `批量替换失败: ${e.message}` }], isError: true };
+    }
+}
+
+export async function batchDocCleanup(args) {
+    ensureCad();
+    const { files, purgeBlocks, purgeLayers, purgeStyles, runAudit, runOverkill, saveAndClose } = args;
+    if (!files?.length) return { content: [{ type: 'text', text: '需要 files 参数' }], isError: true };
+
+    const fileList = buildFileList(files);
+    const doBlocks = purgeBlocks !== false;
+    const doLayers = purgeLayers !== false;
+    const doStyles = purgeStyles !== false;
+    const doAudit = runAudit !== false;
+
+    const lisp = `(progn
+    (vl-load-com)
+    (setq files (list ${fileList}))
+    (setq all-results (list))
+    (foreach f files
+        (setq result (list (cons "file" f) (cons "ok" T)))
+        (if (findfile f)
+            (progn
+                (command "._OPEN" f)
+                (setq details (list))
+                ;; audit
+                (if ${doAudit}
+                    (progn
+                        (command "_.AUDIT" "_Y")
+                        (setq details (cons "audit_done" details))
+                    )
+                )
+                ;; purge
+                (if ${doBlocks} (command "_.PURGE" "_B" "*" "_N"))
+                (if ${doLayers} (command "_.PURGE" "_LA" "*" "_N"))
+                (if ${doStyles} (command "_.PURGE" "_ST" "*" "_N"))
+                (setq details (cons "purge_done" details))
+                ;; overkill
+                (if ${runOverkill}
+                    (progn
+                        (command "_.OVERKILL" (ssget "_X") "" "_Y")
+                        (setq details (cons "overkill_done" details))
+                    )
+                )
+                (setq result (cons (cons "actions" details) result))
+                (if ${saveAndClose}
+                    (progn
+                        (command "_.QSAVE")
+                        (command "_.CLOSE" "_Y")
+                    )
+                    (command "_.CLOSE" "_N")
+                )
+            )
+            (setq result (cons (cons "ok" nil) (cons (cons "error" "文件不存在") result)))
+        )
+        (setq all-results (cons result all-results))
+    )
+    (princ (vl-prin1-to-string all-results))
+    (princ))
+`;
+
+    try {
+        const raw = await cad.sendCommandWithResult(lisp);
+        let results;
+        try {
+            results = typeof raw === 'string' ? JSON.parse(raw) : raw;
+        } catch {
+            results = [{ file: 'parse_error', ok: false, error: String(raw).substring(0, 200) }];
+        }
+        return { content: [{ type: 'text', text: JSON.stringify(results, null, 2) }] };
+    } catch (e) {
+        return { content: [{ type: 'text', text: `批量清理失败: ${e.message}` }], isError: true };
+    }
+}

package/dist/handlers/cad-handlers.js

@@ -1,3 +1,4 @@
+import iconv from 'iconv-lite';
 import { cad } from '../cad.js';
 import { log } from '../logger.js';
 import { withCadConnection, mcpSuccess, mcpError, escapeLispString } from '../handler-utils.js';
@@ -32,9 +33,15 @@ export const evalLisp = withCadConnection(async (code, withResult = false, encod
     }
 
     if (withResult) {
-        const result = await cad.sendCommandWithResult(trimmed, encoding);
-        if (result !== null) {
-            return mcpSuccess(result);
+        const useRaw = encoding ? true : false;
+        const resp = await cad.sendCommandWithResult(trimmed, encoding, useRaw);
+        if (resp !== null) {
+            if (useRaw && resp.rawBase64) {
+                const buf = Buffer.from(resp.rawBase64, 'base64');
+                const decoded = iconv.decode(buf, encoding);
+                return mcpSuccess(decoded);
+            }
+            return mcpSuccess(resp);
         }
         return mcpError('执行失败或无返回值');
     }

package/dist/pipelines/analyze-and-report.json

@@ -0,0 +1,16 @@
+{
+  "name": "analyze-and-report",
+  "description": "分析当前图纸实体并生成统计报告。先获取所有实体，再逐个获取详细信息",
+  "steps": [
+    {
+      "name": "entities",
+      "tool": "stream_entities",
+      "args": { "chunk": 500, "offset": 0 }
+    },
+    {
+      "name": "info",
+      "tool": "get_cad_info",
+      "args": {}
+    }
+  ]
+}

package/dist/pipelines/batch-export-pdfs.json

@@ -0,0 +1,11 @@
+{
+  "name": "batch-export-pdfs",
+  "description": "遍历所有布局并逐个导出为 PDF。先列出布局，再对每个布局执行导出",
+  "steps": [
+    {
+      "name": "layouts",
+      "tool": "list_layouts",
+      "args": {}
+    }
+  ]
+}

package/dist/pipelines/batch-layer-move.json

@@ -0,0 +1,19 @@
+{
+  "name": "batch-layer-move",
+  "description": "按条件选择实体并移动到目标图层。先选择指定类型/图层的实体，再移动到新图层",
+  "steps": [
+    {
+      "name": "selection",
+      "tool": "select_entities",
+      "args": { "filter": { "type": "LINE", "layer": "0" } }
+    },
+    {
+      "name": "move",
+      "tool": "batch_set_layer",
+      "args": {
+        "handles": "$ref:selection.result",
+        "layerName": "TargetLayer"
+      }
+    }
+  ]
+}

package/dist/pipelines/export-current-drawing.json

@@ -0,0 +1,18 @@
+{
+  "name": "export-current-drawing",
+  "description": "导出当前图纸为 PDF。先获取图纸信息，再执行导出",
+  "steps": [
+    {
+      "name": "info",
+      "tool": "get_cad_info",
+      "args": {}
+    },
+    {
+      "name": "export",
+      "tool": "export_pdf",
+      "args": {
+        "outputPath": "$ref:info.docName.pdf"
+      }
+    }
+  ]
+}

package/dist/pipelines/purge-and-save.json

@@ -0,0 +1,16 @@
+{
+  "name": "purge-and-save",
+  "description": "清理未使用的块、图层、样式，然后保存当前图形",
+  "steps": [
+    {
+      "name": "purge_blocks",
+      "tool": "purge_all",
+      "args": {}
+    },
+    {
+      "name": "save",
+      "tool": "save_dwg",
+      "args": {}
+    }
+  ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlisp/mcp",
-  "version": "1.8.25",
+  "version": "1.8.27",
   "description": "MCP Server for @lisp on CAD,support AutoCAD/GstarCAD/ZWCAD/BricsCAD or CAD platform compatible with AutoLISP",
   "type": "module",
   "bin": {