@atlisp/mcp 1.8.23 → 1.8.26

package/dist/handlers/resource-handlers.js

@@ -6,6 +6,7 @@ import { log } from '../logger.js';
 import { parseLispList, parseLispRecursive, lispPairsToObject, escapeLispString } from '../handler-utils.js';
 import { createError, ERROR_CODES } from '../errors.js';
 import config from '../config.js';
+import { tools } from '../tools/index.js';
 import fs from 'fs';
 import path from 'path';
 
@@ -1090,6 +1091,122 @@ async function getDwgContext() {
   }
 }
 
+async function getDrawingAnalysis(params = {}) {
+  const snapshot = await getCadSnapshot();
+  if (!snapshot || !snapshot.cadConnected) {
+    return { connected: false, error: 'CAD 未连接' };
+  }
+
+  try {
+    const detailedCode = `(progn
+  (vl-load-com)
+  (setq r nil)
+  ;; entity counts by type
+  (if (setq ss (ssget "_X"))
+    (progn
+      (setq total (sslength ss) i 0 cnt nil)
+      (while (< i total)
+        (setq typ (cdr (assoc 0 (entget (ssname ss i)))))
+        (setq cnt (if (assoc typ cnt) (subst (cons typ (1+ (cdr (assoc typ cnt)))) (assoc typ cnt) cnt) (cons (cons typ 1) cnt)))
+        (setq i (1+ i)))
+      (setq r (cons (cons "entityCount" total) r))
+      (setq r (cons (cons "entityByType" cnt) r)))
+    (setq r (cons (cons "entityCount" 0) r)))
+  ;; block usage
+  (setq blocks nil)
+  (vlax-for b (vla-get-blocks (vla-get-activedocument (vlax-get-acad-object)))
+    (if (and (= (vla-get-IsXref b) :vlax-false) (/= (vla-get-Name b) "*Model_Space") (/= (vla-get-Name b) "*Paper_Space"))
+      (setq blocks (cons (list "name" (vla-get-Name b) "count" (vla-get-Count b) "isDynamic" (vla-get-IsDynamicBlock b)) blocks))))
+  (setq r (cons (cons "blockUsage" blocks) r))
+  ;; layer summary
+  (setq layers nil le (tblnext "layer" t))
+  (while le
+    (setq ln (cdr (assoc 2 le)) lc (cdr (assoc 62 le)) ll (cdr (assoc 6 le)))
+    (setq layers (cons (list "name" ln "color" (if (< lc 0) (- lc) lc) "off" (< lc 0) "linetype" ll) layers))
+    (setq le (tblnext "layer" nil)))
+  (setq r (cons (cons "layers" layers) r))
+  ;; text stats
+  (if (setq ts (ssget "_X" '((0 . "TEXT,MTEXT"))))
+    (progn
+      (setq tc (sslength ts) th nil ti 0)
+      (while (< ti tc)
+        (setq h (cdr (assoc 40 (entget (ssname ts ti)))))
+        (if h (setq th (cons h th)))
+        (setq ti (1+ ti)))
+      (setq th (vl-sort th '<))
+      (setq r (cons (cons "textCount" tc) r))
+      (setq r (cons (cons "textHeights" (list "min" (car th) "max" (last th) "median" (nth (fix (/ (length th) 2)) th))) r)))
+    (setq r (cons (cons "textCount" 0) r)))
+  ;; system variables
+  (setq r (cons (cons "sysvars" (list
+    (cons "ltscale" (getvar "ltscale"))
+    (cons "dimscale" (getvar "dimscale"))
+    (cons "insunits" (getvar "insunits"))
+    (cons "measurement" (getvar "measurement"))
+    (cons "celtype" (getvar "celtype"))
+    (cons "clayer" (getvar "clayer"))
+    (cons "cecolor" (getvar "cecolor"))
+    (cons "osmode" (getvar "osmode"))
+    (cons "snapmode" (getvar "snapmode"))
+    (cons "gridmode" (getvar "gridmode"))
+    (cons "orthomode" (getvar "orthomode"))
+    (cons "plinetype" (getvar "plinetype"))
+    (cons "fillmode" (getvar "fillmode"))
+    (cons "pickstyle" (getvar "pickstyle"))
+  )) r))
+  (vl-prin1-to-string (reverse r)))`;
+
+    const resultStr = await cad.sendCommandWithResult(detailedCode);
+    const parsed = parseLispRecursive(resultStr);
+    if (!parsed || !Array.isArray(parsed)) {
+      return { connected: true, error: '分析结果解析失败' };
+    }
+    const analysis = {};
+    for (const pair of parsed) {
+      if (Array.isArray(pair) && pair.length >= 2) {
+        analysis[String(pair[0])] = pair[1];
+      }
+    }
+    return { connected: true, ...analysis };
+  } catch (e) {
+    log(`getDrawingAnalysis error: ${e.message}`);
+    return { connected: true, error: e.message };
+  }
+}
+
+function getToolCategories() {
+  const cats = {};
+  for (const t of tools) {
+    const cat = t.annotations?.category || '其他';
+    if (!cats[cat]) cats[cat] = { count: 0, tools: [] };
+    cats[cat].count++;
+    cats[cat].tools.push(t.name);
+  }
+  return Object.entries(cats).map(([category, info]) => ({
+    category, count: info.count, tools: info.tools,
+  })).sort((a, b) => b.count - a.count);
+}
+
+async function checkDrawingStandards() {
+  const standards = getDraftingStandards();
+  if (!standards || standards.error) {
+    return { ok: false, error: standards?.error || '制图规范未加载' };
+  }
+  try {
+    const issues = [];
+    for (const rule of standards.layers || []) {
+      const code = `(tblsearch "LAYER" "${escapeLispString(rule.name || rule.pattern)}")`;
+      const exists = await cad.sendCommandWithResult(code);
+      if (rule.required && (!exists || exists === 'nil' || exists === '')) {
+        issues.push({ type: 'missing_layer', message: `缺少必需图层: ${rule.name}` });
+      }
+    }
+    return { ok: issues.length === 0, issues };
+  } catch (e) {
+    return { ok: false, error: e.message };
+  }
+}
+
 function getToolRelationships() {
   return {
     selection: {
@@ -1385,6 +1502,12 @@ export async function readResource(uri) {
       return await getDwgContext();
     case 'atlisp://tools/relationships':
       return getToolRelationships();
+    case 'atlisp://dwg/analysis':
+      return await getDrawingAnalysis(params);
+    case 'atlisp://tools/categories':
+      return getToolCategories();
+    case 'atlisp://dwg/standards/check':
+      return await checkDrawingStandards();
     default:
       throw new Error(`资源不存在: ${uri}`);
   }

package/dist/handlers/skill-handlers.js

@@ -0,0 +1,152 @@
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+
+const SKILLS_DIR = path.join(os.homedir(), '.atlisp', 'skills');
+const REGISTRY_URL = process.env.SKILL_REGISTRY_URL || 'https://raw.githubusercontent.com/atlisp/skill-registry/main/index.json';
+const CACHE_PATH = path.join(os.homedir(), '.atlisp', 'skill-registry-cache.json');
+
+function readCache() {
+    try { if (fs.existsSync(CACHE_PATH)) return JSON.parse(fs.readFileSync(CACHE_PATH, 'utf-8')); } catch {}
+    return null;
+}
+
+function writeCache(data) {
+    try { fs.writeFileSync(CACHE_PATH, JSON.stringify(data, null, 2), 'utf-8'); } catch {}
+}
+
+async function fetchIndex() {
+    let index = readCache();
+    if (index && (Date.now() - index.fetchedAt < 3600000)) return index;
+    try {
+        const resp = await fetch(REGISTRY_URL, { headers: { 'User-Agent': 'atlisp-mcp' } });
+        if (resp.ok) {
+            index = await resp.json();
+            index.fetchedAt = Date.now();
+            writeCache(index);
+        }
+    } catch {}
+    return index;
+}
+
+export async function skill_search(a) {
+    const index = await fetchIndex();
+    if (!index?.skills) return { content: [{ type: 'text', text: '无法获取 skill 注册表索引' }], isError: true };
+    const q = (a.query || '').toLowerCase();
+    const results = index.skills.filter(s =>
+        s.name.toLowerCase().includes(q) ||
+        (s.description || '').toLowerCase().includes(q) ||
+        (s.tags || []).some(t => t.toLowerCase().includes(q))
+    );
+    if (!results.length) return { content: [{ type: 'text', text: `未找到匹配 "${a.query}" 的 skill` }] };
+    const lines = [`找到 ${results.length} 个 skill:\n`];
+    for (const s of results) {
+        lines.push(`**${s.name}**`);
+        if (s.description) lines.push(`  描述: ${s.description}`);
+        if (s.tags?.length) lines.push(`  标签: ${s.tags.join(', ')}`);
+        if (s.version) lines.push(`  版本: ${s.version}`);
+        lines.push('');
+    }
+    return { content: [{ type: 'text', text: lines.join('\n') }] };
+}
+
+export async function skill_install(a) {
+    if (!a.name) return { content: [{ type: 'text', text: '需要 skill 名称' }], isError: true };
+    const index = await fetchIndex();
+    if (!index?.skills) return { content: [{ type: 'text', text: '无法获取 skill 注册表索引' }], isError: true };
+    const skill = index.skills.find(s => s.name === a.name);
+    if (!skill) return { content: [{ type: 'text', text: `未找到 skill: ${a.name}` }], isError: true };
+    const downloadUrl = skill.download_url || skill.url;
+    if (!downloadUrl) return { content: [{ type: 'text', text: `Skill "${a.name}" 没有下载地址` }], isError: true };
+    let content;
+    try {
+        const resp = await fetch(downloadUrl, { headers: { 'User-Agent': 'atlisp-mcp' } });
+        if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
+        content = await resp.text();
+    } catch (e) {
+        return { content: [{ type: 'text', text: `下载失败: ${e.message}` }], isError: true };
+    }
+    try { fs.mkdirSync(SKILLS_DIR, { recursive: true }); } catch {}
+    const safeName = a.name.replace(/[^a-zA-Z0-9\u4e00-\u9fff_-]/g, '-').substring(0, 40);
+    const skillFile = path.join(SKILLS_DIR, `skill-${safeName}.md`);
+    if (fs.existsSync(skillFile)) {
+        return { content: [{ type: 'text', text: `Skill "${a.name}" 已安装 (${skillFile})` }], isError: true };
+    }
+    let finalContent = content;
+    if (!content.match(/^---\n/)) {
+        const tags = (skill.tags || []).join(', ');
+        finalContent = `---\nname: ${a.name}\ndescription: ${skill.description || ''}\ntags: ${tags}\n---\n\n${content}`;
+    }
+    fs.writeFileSync(skillFile, finalContent, 'utf-8');
+    return { content: [{ type: 'text', text: `${skill.name} 安装成功\n文件: ${skillFile}${skill.version ? `\n版本: ${skill.version}` : ''}` }] };
+}
+
+export async function skill_list_installed() {
+    if (!fs.existsSync(SKILLS_DIR)) return { content: [{ type: 'text', text: '暂无已安装的 skill' }] };
+    const results = [];
+    try {
+        const entries = fs.readdirSync(SKILLS_DIR, { withFileTypes: true });
+        for (const entry of entries) {
+            if (entry.isFile() && entry.name.endsWith('.md')) {
+                const fullPath = path.join(SKILLS_DIR, entry.name);
+                try {
+                    const raw = fs.readFileSync(fullPath, 'utf-8');
+                    const match = raw.match(/^---\n([\s\S]*?)\n---/);
+                    if (match) {
+                        const fm = {};
+                        for (const line of match[1].split('\n')) {
+                            const sep = line.indexOf(':');
+                            if (sep > 0) fm[line.slice(0, sep).trim()] = line.slice(sep + 1).trim();
+                        }
+                        results.push({ name: fm.name || entry.name.replace('.md', ''), description: fm.description || '', tags: fm.tags || '' });
+                    } else {
+                        results.push({ name: entry.name.replace('.md', ''), description: '', tags: '' });
+                    }
+                } catch {}
+            }
+        }
+    } catch {}
+    if (!results.length) return { content: [{ type: 'text', text: '暂无已安装的 skill' }] };
+    const lines = [`已安装 ${results.length} 个 skill:\n`];
+    for (const s of results) {
+        lines.push(`**${s.name}**${s.description ? ` — ${s.description}` : ''}`);
+        if (s.tags) lines.push(`  标签: ${s.tags}`);
+    }
+    return { content: [{ type: 'text', text: lines.join('\n') }] };
+}
+
+export async function skill_uninstall(a) {
+    if (!a.name) return { content: [{ type: 'text', text: '需要 skill 名称' }], isError: true };
+    if (!fs.existsSync(SKILLS_DIR)) return { content: [{ type: 'text', text: `未安装 skill: ${a.name}` }], isError: true };
+    let found = null;
+    try {
+        const entries = fs.readdirSync(SKILLS_DIR, { withFileTypes: true });
+        for (const entry of entries) {
+            if (entry.isFile() && entry.name.endsWith('.md')) {
+                const fullPath = path.join(SKILLS_DIR, entry.name);
+                try {
+                    const raw = fs.readFileSync(fullPath, 'utf-8');
+                    const match = raw.match(/^---\n([\s\S]*?)\n---/);
+                    if (match) {
+                        for (const line of match[1].split('\n')) {
+                            if (line.startsWith('name:') && line.slice(5).trim() === a.name) { found = fullPath; break; }
+                        }
+                    } else if (entry.name.replace('.md', '') === a.name) { found = fullPath; }
+                } catch {}
+                if (found) break;
+            }
+        }
+    } catch {}
+    if (!found) return { content: [{ type: 'text', text: `未安装 skill: ${a.name}` }], isError: true };
+    fs.unlinkSync(found);
+    return { content: [{ type: 'text', text: `${a.name} 已卸载` }] };
+}
+
+export async function skill_list_categories() {
+    const index = await fetchIndex();
+    if (!index?.skills) return { content: [{ type: 'text', text: '无法获取 skill 注册表索引' }], isError: true };
+    const cats = new Set();
+    for (const s of index.skills) for (const t of (s.tags || [])) cats.add(t);
+    const sorted = Array.from(cats).sort();
+    return { content: [{ type: 'text', text: sorted.length ? `注册表分类 (${sorted.length}):\n${sorted.join('\n')}` : '暂无分类' }] };
+}

package/dist/lisp-security.js

@@ -116,3 +116,68 @@ export function checkParens(code) {
   if (depth < 0) return { valid: false, error: `多余 ${-depth} 个左括号 (` };
   return { valid: true };
 }
+
+// === Session Sandbox (merged from lisp-sandbox.js) ===
+
+export const RULES = SECURITY_RULES;
+
+const sessionAllowlist = new Map();
+
+export function getSessionAllowlist(sessionId) {
+  if (!sessionAllowlist.has(sessionId)) {
+    sessionAllowlist.set(sessionId, new Set());
+  }
+  return sessionAllowlist.get(sessionId);
+}
+
+export function addToAllowlist(sessionId, ruleIndex) {
+  const list = getSessionAllowlist(sessionId);
+  list.add(ruleIndex);
+}
+
+export function removeFromAllowlist(sessionId, ruleIndex) {
+  const list = getSessionAllowlist(sessionId);
+  list.delete(ruleIndex);
+}
+
+export function clearSessionAllowlist(sessionId) {
+  sessionAllowlist.delete(sessionId);
+}
+
+export function validateLispCode(code, sessionId = null) {
+  const withoutComments = stripStringsAndComments(code);
+  const effectiveSeverity = getEffectiveSeverity();
+
+  const results = [];
+  let blocked = false;
+
+  for (let i = 0; i < RULES.length; i++) {
+    const rule = RULES[i];
+    if (rule.re.test(withoutComments)) {
+      const isAllowed = sessionId && getSessionAllowlist(sessionId).has(i);
+
+      const severity = effectiveSeverity === THREAT_ALLOW ? THREAT_ALLOW
+        : isAllowed ? THREAT_ALLOW
+        : effectiveSeverity;
+
+      results.push({
+        ruleIndex: i,
+        severity,
+        message: rule.msg,
+        blocked: severity === THREAT_BLOCK,
+        warned: severity === THREAT_WARN,
+        allowed: severity === THREAT_ALLOW,
+      });
+      if (severity === THREAT_BLOCK) {
+        blocked = true;
+      }
+    }
+  }
+
+  return {
+    valid: !blocked,
+    blocked,
+    results,
+    summary: blocked ? `安全限制: ${results.filter(r => r.blocked).map(r => r.message).join('; ')}` : '通过',
+  };
+}

package/dist/prompts/definitions/workflow-batch-doc.json

@@ -0,0 +1,27 @@
+{
+  "name": "workflow-batch-doc",
+  "description": "批量文档处理工作流：打开多个 DWG → 执行操作 → 保存/导出 → 关闭。适用于批量清理、替换文字、统一修改",
+  "arguments": [
+    { "name": "action", "description": "步骤: open/process/save/report", "required": true, "default": "process" },
+    { "name": "operation", "description": "操作类型: cleanup/find-replace/check-standards/export-pdf", "required": false, "default": "cleanup" },
+    { "name": "files", "description": "DWG 文件路径列表，用逗号分隔", "required": false }
+  ],
+  "templates": {
+    "open": {
+      "code": "",
+      "description": "1. 确定目标文件列表\n2. 对每个文件，循环调用 open_dwg({ filePath }) → 执行操作 → save_dwg/export_pdf → close_dwg\n\n示例流程：\n```\n文件列表 = [\"project/a.dwg\", \"project/b.dwg\"]\nfor each file in 文件列表:\n  open_dwg({ filePath })\n  ... 执行操作 ...\n  save_dwg()\n  close_dwg()\n```"
+    },
+    "process": {
+      "code": "",
+      "description": "选择 operation:\n- cleanup: 打开文件 → 执行 eval_lisp({ code: '(command \"_.PURGE\" \"_B\" \"*\" \"_N\")(command \"_.AUDIT\" \"_Y\")' }) → save_dwg → close_dwg\n- find-replace: 打开文件 → replace_text({ pattern, replacement }) → save_dwg → close_dwg\n- check-standards: 打开文件 → eval_lisp_with_result 检查图层/样式 → 记录结果 → close_dwg (不保存)\n- export-pdf: 打开文件 → export_pdf({ outputPath, layout: \"Model\" }) → close_dwg (不保存)\n\n对每个文件重复此流程，收集结果。"
+    },
+    "save": {
+      "code": "",
+      "description": "使用 save_dwg() 保存当前文件。如需另存为不同路径，传入 filePath 参数。\n完成后用 close_dwg({ save: false }) 关闭。"
+    },
+    "report": {
+      "code": "",
+      "description": "汇总所有文件的操作结果:\n- 已处理文件数\n- 每个文件的执行结果（成功/失败）\n- 失败原因\n\n使用 get_system_status 检查 CAD 最终状态。"
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlisp/mcp",
-  "version": "1.8.23",
+  "version": "1.8.26",
   "description": "MCP Server for @lisp on CAD,support AutoCAD/GstarCAD/ZWCAD/BricsCAD or CAD platform compatible with AutoLISP",
   "type": "module",
   "bin": {
@@ -16,9 +16,10 @@
   ],
   "scripts": {
     "start": "node src/atlisp-mcp.js",
-    "build": "npm run build:main && npm run build:worker",
+    "build": "npm run build:main && npm run build:worker && npm run build:rot",
     "build:main": "esbuild src/atlisp-mcp.js --bundle --platform=node --target=node18 --format=esm --outdir=dist --external:edge-js --packages=external --banner:js=\"#!/usr/bin/env node\"",
     "build:worker": "node -e \"const fs=require('fs');const path=require('path');for(const f of ['cad-worker.js','lisp-security.js','logger.js','config.js'])fs.copyFileSync('src/'+f,'dist/'+f);if(!fs.existsSync('dist/html'))fs.mkdirSync('dist/html');for(const f of fs.readdirSync('src/html'))fs.copyFileSync('src/html/'+f,'dist/html/'+f);if(!fs.existsSync('dist/handlers'))fs.mkdirSync('dist/handlers');for(const f of fs.readdirSync('src/handlers'))fs.copyFileSync('src/handlers/'+f,'dist/handlers/'+f);if(!fs.existsSync('dist/prompts/definitions'))fs.mkdirSync('dist/prompts/definitions',{recursive:true});for(const f of fs.readdirSync('src/prompts/definitions'))fs.copyFileSync('src/prompts/definitions/'+f,'dist/prompts/definitions/'+f)\"",
+    "build:rot": "powershell -Command \"& 'C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\csc.exe' /target:library /out:dist\\cad-rothelper.dll src\\cad-rothelper.cs\"",
     "prepublishOnly": "npm run build",
     "test": "vitest run",
     "test:watch": "vitest",