@atlisp/mcp 1.6.8 → 1.6.10

package/dist/atlisp-mcp.js

@@ -138,7 +138,7 @@ if (!envResult.success) {
   process.exit(1);
 }
 var env = envResult.data;
-var configFilePath = env.CONFIG_FILE || cliArgs.configFile || path.join(os.homedir(), "@lisp", "atlisp.config.json");
+var configFilePath = env.CONFIG_FILE || cliArgs.configFile || path.join(os.homedir(), ".atlisp", "atlisp.config.json");
 var fileConfig = loadConfigFile(configFilePath);
 var config = {
   port: fileConfig?.port || parseInt(env.PORT || cliArgs.port, 10),
@@ -905,56 +905,14 @@ ${ENTITY_PROPERTIES_LISP}
         @e:i (1+ @e:i)))
 (vl-prin1-to-string (list @e:total (reverse @e:ents))))`;
 }
-function buildTextCode({ layer, bbox, offset, limit }) {
-  const items = [`'(0 . "TEXT,MTEXT,ATTRIB,TCH_TEXT")`];
-  if (layer)
-    items.push(`(cons 8 "${layer.replace(/"/g, '\\"')}")`);
-  if (bbox) {
-    const parts = bbox.split(",").map((s) => parseFloat(s.trim()));
-    if (parts.length === 4) {
-      const [x1, y1, x2, y2] = parts;
-      items.push(
-        `'(-4 . "<AND")`,
-        `'(-4 . ">=,>=,*") (list 10 ${x1} ${y1} 0.0)`,
-        `'(-4 . "<=,<=,*") (list 10 ${x2} ${y2} 0.0)`,
-        `'(-4 . "AND>")`
-      );
-    }
-  }
-  const filterExpr = `(list ${items.join(" ")})`;
-  return `(progn
-(defun @t:props (ent / ed ins)
-  (setq ed (entget ent) ins (cdr (assoc 10 ed)))
-  (list
-    (list "type" (vl-prin1-to-string (cdr (assoc 0 ed))))
-    (list "handle" (vl-prin1-to-string (cdr (assoc 5 ed))))
-    (list "layer" (vl-prin1-to-string (cdr (assoc 8 ed))))
-    (list "color" (if (assoc 62 ed) (cdr (assoc 62 ed)) 256))
-    (list "linetype" (vl-prin1-to-string (if (assoc 6 ed) (cdr (assoc 6 ed)) "ByLayer")))
-    (list "text" (vl-prin1-to-string (cdr (assoc 1 ed))))
-    (list "insert" (list (car ins) (cadr ins) (caddr ins)))
-    (list "height" (cdr (assoc 40 ed)))
-    (list "rotation" (cdr (assoc 50 ed)))
-    (list "style" (vl-prin1-to-string (if (assoc 7 ed) (cdr (assoc 7 ed)) "Standard")))))
-(defun @t:run nil
-  (setq ss (ssget "_X" ${filterExpr}))
-  (if (null ss)
-    (list "total" 0 "offset" ${offset} "limit" ${limit})
-    (progn
-      (setq total (sslength ss) texts nil i ${offset})
-      (while (and (< i total) (< (length texts) ${limit}))
-        (setq texts (append texts (list (@t:props (ssname ss i)))) i (1+ i)))
-      (list "total" total "offset" ${offset} "limit" ${limit} "texts" texts))))
-(@t:run))
-`;
-}
 var RESOURCES = [
   { uri: "atlisp://cad/info", name: "CAD Info", description: "CAD \u8FDE\u63A5\u4FE1\u606F", mimeType: "application/json", subscribable: true },
-  { uri: "atlisp://dwg/layers", name: "Layers", description: "\u56FE\u5C42\u5217\u8868", mimeType: "application/json", subscribable: true },
   { uri: "atlisp://dwg/entities", name: "Entities", description: "\u56FE\u5143\u5217\u8868\u3002\u65E0\u53C2\u6570\u65F6\u8FD4\u56DE\u603B\u6570\u548C\u6309\u7C7B\u578B\u7EDF\u8BA1\uFF1B\u6709\u53C2\u6570\u65F6\u8FD4\u56DE filtered \u56FE\u6587\u7684 entity:properties \u5168\u5C5E\u6027 JSON\uFF08ObjectName, Handle, Layer, Color, Center, Radius \u7B49\uFF09\uFF0C\u652F\u6301 ?type=LINE&layer=0&bbox=0,0,100,100", mimeType: "application/json", subscribable: true },
-  { uri: "atlisp://dwg/texts", name: "Texts", description: "\u6587\u672C\u5B9E\u4F53 key:value \u5217\u8868 (TEXT/MTEXT/ATTRIB/TCH_TEXT)\uFF0C\u652F\u6301 ?layer=0&bbox=0,0,100,100&limit=5000&offset=0", mimeType: "application/json", subscribable: true },
+  { uri: "atlisp://dwg/text-content", name: "Text Content", description: "\u6587\u672C\u5185\u5BB9\u53CA\u4F4D\u7F6E\uFF0C\u7528\u4E8E\u8BED\u4E49\u5206\u6790\u3002\u652F\u6301 ?layer=0&bbox=0,0,100,100&limit=5000&offset=0", mimeType: "application/json", subscribable: true },
   { uri: "atlisp://dwg/name", name: "DWG Name", description: "\u5F53\u524D DWG \u6587\u4EF6\u540D", mimeType: "application/json", subscribable: true },
   { uri: "atlisp://dwg/path", name: "DWG Path", description: "\u6587\u4EF6\u5B8C\u6574\u8DEF\u5F84", mimeType: "application/json", subscribable: true },
+  { uri: "atlisp://dwg/block-refs", name: "Block References", description: "\u5757\u53C2\u7167\u5217\u8868\u53CA\u5C5E\u6027\u503C\u3001\u52A8\u6001\u5757\u7279\u6027\uFF0C\u652F\u6301\u8DEF\u5F84\u65B9\u5F0F atlisp://dwg/block-refs/{blockName}", mimeType: "application/json", subscribable: true },
+  { uri: "atlisp://dwg/tbl", name: "Tables", description: "CAD \u8868\u6570\u636E (layer, block, textstyle, dimstyle, linetype, ucs, view, viewport, regapp)\uFF0C\u652F\u6301\u8DEF\u5F84\u65B9\u5F0F atlisp://dwg/tbl/layer", mimeType: "application/json", subscribable: true },
   { uri: "atlisp://cad/dwgs", name: "DWG List", description: "\u6240\u6709\u6253\u5F00\u7684 DWG \u6587\u4EF6\u5217\u8868", mimeType: "application/json", subscribable: true },
   { uri: "atlisp://packages", name: "Packages", description: "\u5DF2\u5B89\u88C5\u5305\u5217\u8868", mimeType: "application/json", subscribable: true },
   { uri: "atlisp://platforms", name: "Platforms", description: "\u652F\u6301\u7684\u5E73\u53F0\u4FE1\u606F", mimeType: "application/json", subscribable: false },
@@ -977,9 +935,15 @@ function parseQuery(uri) {
   return { base, params };
 }
 function parseTemplateUri(uri) {
-  const match = uri.match(/^atlisp:\/\/dwg\/entity\/([^?]+)$/);
-  if (match)
-    return { type: "entity", handle: match[1] };
+  const entityMatch = uri.match(/^atlisp:\/\/dwg\/entity\/([^?]+)$/);
+  if (entityMatch)
+    return { type: "entity", handle: entityMatch[1] };
+  const tblMatch = uri.match(/^atlisp:\/\/dwg\/tbl\/([^?]+)$/);
+  if (tblMatch)
+    return { type: "tbl", tblName: tblMatch[1] };
+  const blockRefMatch = uri.match(/^atlisp:\/\/dwg\/block-refs\/([^?]+)$/);
+  if (blockRefMatch)
+    return { type: "block-refs", blockName: blockRefMatch[1] };
   return null;
 }
 async function listResources(subscribedUris = []) {
@@ -993,23 +957,33 @@ async function listResources(subscribedUris = []) {
 }
 async function readResource(uri) {
   const templateMatch = parseTemplateUri(uri);
-  if (templateMatch && templateMatch.type === "entity") {
-    return await getEntityByHandle(templateMatch.handle);
+  if (templateMatch) {
+    if (templateMatch.type === "entity") {
+      return await getEntityByHandle(templateMatch.handle);
+    }
+    if (templateMatch.type === "tbl") {
+      return await getTables({ tbl: templateMatch.tblName });
+    }
+    if (templateMatch.type === "block-refs") {
+      return await getBlockRefs({ blockName: templateMatch.blockName });
+    }
   }
   const { base, params } = parseQuery(uri);
   switch (base) {
     case "atlisp://cad/info":
       return await getCadInfo();
-    case "atlisp://dwg/layers":
-      return await getLayers(params.name);
     case "atlisp://dwg/entities":
       return await getEntities(params);
-    case "atlisp://dwg/texts":
-      return await getTexts(params);
+    case "atlisp://dwg/text-content":
+      return await getTextContent(params);
     case "atlisp://dwg/name":
       return await getDwgName();
     case "atlisp://dwg/path":
       return await getDwgPath();
+    case "atlisp://dwg/block-refs":
+      return await getBlockRefs(params);
+    case "atlisp://dwg/tbl":
+      return await getTables(params);
     case "atlisp://cad/dwgs":
       return await getDwgList();
     case "atlisp://packages":
@@ -1086,58 +1060,6 @@ async function getCadInfo() {
   setCache("cad:info", result);
   return result;
 }
-async function getLayers(filterName = null) {
-  const cacheKey = filterName ? `dwg:layers:${filterName}` : "dwg:layers:all";
-  const cached = getCached(cacheKey);
-  if (cached)
-    return cached;
-  if (!cad.connected)
-    await cad.connect();
-  if (!cad.connected)
-    return [];
-  try {
-    const code = filterName ? `(vl-prin1-to-string (cdr (assoc 2 (tblnext "LAYER" T))))` : `(progn (setq res nil)(while (setq e (tblnext "LAYER" (null res)))(setq res (cons (list (vl-prin1-to-string (cdr (assoc 2 e))) (cdr (assoc 62 e)) (cdr (assoc 70 e))) res))) (reverse res))`;
-    const result = await cad.sendCommandWithResult(code);
-    if (!result || result === "" || result === "nil") {
-      setCache(cacheKey, []);
-      return [];
-    }
-    let layers = [];
-    try {
-      layers = JSON.parse(result);
-    } catch (e) {
-      const parsed = parseLispList(result);
-      if (parsed) {
-        layers = parsed;
-      } else {
-        layers = [];
-      }
-    }
-    if (!Array.isArray(layers)) {
-      if (typeof layers === "number") {
-        layers = [[result, layers, 0]];
-      } else if (typeof layers === "string") {
-        layers = [[layers, 7, 0]];
-      }
-    }
-    const mapped = layers.map((l) => {
-      const name = Array.isArray(l) ? l[0] : l;
-      const color = Array.isArray(l) && l[1] !== void 0 ? l[1] : 7;
-      const flags = Array.isArray(l) && l[2] !== void 0 ? l[2] : 0;
-      return {
-        name: String(name),
-        color,
-        locked: (flags & 4) !== 0,
-        frozen: (flags & 1) !== 0
-      };
-    });
-    setCache(cacheKey, mapped);
-    return mapped;
-  } catch (e) {
-    setCache(cacheKey, []);
-    return [];
-  }
-}
 async function getEntities(params = {}) {
   const cacheKey = `dwg:entities:${JSON.stringify(params)}`;
   const cached = getCached(cacheKey);
@@ -1243,27 +1165,51 @@ async function getEntitiesSummary(cacheKey) {
     return result;
   }
 }
-async function getTexts(params = {}) {
-  const cacheKey = `dwg:texts:${JSON.stringify(params)}`;
+function buildTextContentCode({ layer, bbox, offset, limit }) {
+  const items = [`'(0 . "TEXT,MTEXT,ATTRIB,TCH_TEXT")`];
+  if (layer)
+    items.push(`(cons 8 "${layer.replace(/"/g, '\\"')}")`);
+  if (bbox) {
+    const parts = bbox.split(",").map((s) => parseFloat(s.trim()));
+    if (parts.length === 4) {
+      const [x1, y1, x2, y2] = parts;
+      items.push(
+        `'(-4 . "<AND")`,
+        `'(-4 . ">=,>=,*") (list 10 ${x1} ${y1} 0.0)`,
+        `'(-4 . "<=,<=,*") (list 10 ${x2} ${y2} 0.0)`,
+        `'(-4 . "AND>")`
+      );
+    }
+  }
+  const filterExpr = `(list ${items.join(" ")})`;
+  return `(progn
+(setq ss (ssget "_X" ${filterExpr}))
+(if (null ss)
+  (list "total" 0 "offset" ${offset} "limit" ${limit} "texts" nil)
+  (progn
+    (setq total (sslength ss) i ${offset} texts nil)
+    (while (and (< i total) (< (length texts) ${limit}))
+      (setq ent (ssname ss i) ed (entget ent) ins (cdr (assoc 10 ed)))
+      (setq texts (append texts (list (list "text" (vl-prin1-to-string (cdr (assoc 1 ed))) "position" (list (car ins) (cadr ins) (caddr ins))))) i (1+ i)))
+    (list "total" total "offset" ${offset} "limit" ${limit} "texts" texts))))
+)`;
+}
+async function getTextContent(params = {}) {
+  const cacheKey = `dwg:text-content:${JSON.stringify(params)}`;
   const cached = getCached(cacheKey);
   if (cached)
     return cached;
   if (!cad.connected)
     await cad.connect();
   if (!cad.connected) {
-    const result = { total: 0, texts: [] };
+    const result = { total: 0, offset: 0, limit: 5e3, texts: [] };
     setCache(cacheKey, result);
     return result;
   }
   const offset = Math.max(0, parseInt(params.offset) || 0);
   const limit = Math.min(Math.max(1, parseInt(params.limit) || 5e3), 5e3);
   try {
-    const code = buildTextCode({
-      layer: params.layer || null,
-      bbox: params.bbox || null,
-      offset,
-      limit
-    });
+    const code = buildTextContentCode({ layer: params.layer, bbox: params.bbox, offset, limit });
     const resultStr = await cad.sendCommandWithResult(code);
     if (!resultStr || resultStr === "" || resultStr === "nil" || resultStr === "0") {
       const result = { total: 0, offset, limit, texts: [] };
@@ -1271,16 +1217,32 @@ async function getTexts(params = {}) {
       return result;
     }
     const parsed = parseLispRecursive(resultStr);
-    const textsIdx = parsed.indexOf("texts");
-    const rawTexts = textsIdx !== -1 && Array.isArray(parsed[textsIdx + 1]) ? parsed[textsIdx + 1] : [];
+    if (!parsed || !Array.isArray(parsed)) {
+      const result = { total: 0, offset, limit, texts: [] };
+      setCache(cacheKey, result);
+      return result;
+    }
     const data = lispPairsToObject(parsed);
-    data.texts = rawTexts.length > 0 ? rawTexts.map(propertyPairsToObject).filter(Boolean) : [];
-    data.offset = offset;
-    data.limit = limit;
+    const rawTexts = Array.isArray(data.texts) ? data.texts : [];
+    data.texts = rawTexts.map((item) => {
+      if (!Array.isArray(item))
+        return null;
+      const obj = {};
+      item.forEach((pair) => {
+        if (Array.isArray(pair) && pair.length >= 2) {
+          if (pair[0] === "text")
+            obj.text = String(pair[1] || "");
+          else if (pair[0] === "position" && Array.isArray(pair[1])) {
+            obj.position = pair[1].map((v) => typeof v === "number" ? v : 0);
+          }
+        }
+      });
+      return obj.text ? obj : null;
+    }).filter(Boolean);
     setCache(cacheKey, data);
     return data;
   } catch (e) {
-    log(`getTexts error: ${e.message}`);
+    log(`getTextContent error: ${e.message}`);
     const result = { total: 0, offset, limit, texts: [] };
     setCache(cacheKey, result);
     return result;
@@ -1332,6 +1294,316 @@ async function getDwgPath() {
     return { path: null, name: null };
   }
 }
+function buildBlockRefsCode(filterBlockName) {
+  const filterExpr = filterBlockName ? `(list (cons 2 "${filterBlockName.replace(/"/g, '\\"')}"))` : "nil";
+  return `(progn
+(vl-load-com)
+(defun @br:attr (ent / atts)
+  (if (= (type ent) 'VLA-OBJECT)
+    (progn
+      (setq atts (vlax-variant-value (vla-getattributes ent)))
+      (if (safearray-value atts)
+        (mapcar '(lambda (x) (cons (vla-get-tagstring x) (vla-get-textstring x)))
+          (vlax-safearray->list atts))
+        nil))
+    (if (setq att (entnext ent))
+      (progn
+        (setq atts nil)
+        (while (= (cdr (assoc 0 (entget att))) "ATTRIB")
+          (setq atts (cons (cons (cdr (assoc 2 (entget att))) (cdr (assoc 1 (entget att)))) atts))
+                att (entnext att))
+        (reverse atts))
+        nil))))
+
+(defun @br:dynprops (ent / obj props)
+  (if (= (type ent) 'VLA-OBJECT)
+    (progn
+      (setq obj ent)
+      (if (vlax-property-available-p obj 'isdynamicblock)
+        (if (vla-get-isdynamicblock obj)
+          (progn
+            (setq props (vlax-invoke obj 'getdynamicblockproperties))
+            (mapcar '(lambda (x)
+              (cons (vla-get-propertyname x)
+                (list (cons "value" (vla-get-value x))
+                      (cons "readOnly" (vla-get-readonly x))
+                      (cons "show" (vla-get-show x)))))
+              (vlax-safearray->list props)))
+          nil)
+        nil))
+    (if (and (setq obj (vlax-ename->vla-object ent))
+             (vlax-property-available-p obj 'isdynamicblock)
+             (vla-get-isdynamicblock obj))
+      (progn
+        (setq props (vlax-invoke obj 'getdynamicblockproperties))
+        (mapcar '(lambda (x)
+          (cons (vla-get-propertyname x)
+            (list (cons "value" (vla-get-value x))
+                  (cons "readOnly" (vla-get-readonly x))
+                  (cons "show" (vla-get-show x)))))
+          (vlax-safearray->list props)))
+      nil)))
+
+(defun @br:props (ent / obj blkname result)
+  (setq obj (vlax-ename->vla-object ent))
+  (setq result (list
+    (cons "handle" (cdr (assoc 5 (entget ent))))
+    (cons "layer" (cdr (assoc 8 (entget ent))))
+    (cons "blockName" (vla-get-name obj))
+    (cons "effectiveBlockName" (vla-get-effectivename obj))
+    (cons "insertionPoint" (vlax-safearray->list (vla-get-insertionpoint obj)))
+    (cons "rotation" (vla-get-rotation obj))
+    (cons "scale" (list (vla-get-xscale obj) (vla-get-yscale obj) (vla-get-zscale obj)))
+    (cons "isDynamic" (if (vlax-property-available-p obj 'isdynamicblock) (vla-get-isdynamicblock obj) nil))
+    (cons "attributes" (@br:attr obj))
+    (cons "dynamicProperties" (@br:dynprops obj))))
+  result)
+
+(setq ss (ssget "_X" (list (cons 0 "INSERT") ${filterExpr})))
+(if (null ss)
+  (list (cons "total" 0) (cons "blockRefs" nil))
+  (progn
+    (setq total (sslength ss) i 0 refs nil)
+    (while (< i total)
+      (setq refs (cons (@br:props (ssname ss i)) refs) i (1+ i)))
+    (list (cons "total" total) (cons "blockRefs" (reverse refs))))))`;
+}
+async function getBlockRefs(params = {}) {
+  const cacheKey = `dwg:block-refs:${params.blockName || "all"}`;
+  const cached = getCached(cacheKey);
+  if (cached)
+    return cached;
+  if (!cad.connected)
+    await cad.connect();
+  if (!cad.connected) {
+    const result = { total: 0, blockRefs: [] };
+    setCache(cacheKey, result);
+    return result;
+  }
+  try {
+    const code = buildBlockRefsCode(params.blockName);
+    const resultStr = await cad.sendCommandWithResult(code);
+    if (!resultStr || resultStr === "" || resultStr === "nil") {
+      const result2 = { total: 0, blockRefs: [] };
+      setCache(cacheKey, result2);
+      return result2;
+    }
+    const parsed = parseLispRecursive(resultStr);
+    if (!parsed || !Array.isArray(parsed)) {
+      const result2 = { total: 0, blockRefs: [] };
+      setCache(cacheKey, result2);
+      return result2;
+    }
+    const result = lispPairsToObject(parsed);
+    const blockRefs = Array.isArray(result.blockRefs) ? result.blockRefs : [];
+    const finalResult = {
+      total: typeof result.total === "number" ? result.total : blockRefs.length,
+      blockRefs: blockRefs.map((br) => {
+        const obj = {};
+        if (Array.isArray(br)) {
+          br.forEach((pair) => {
+            if (Array.isArray(pair) && pair.length >= 2) {
+              const key = pair[0];
+              let val = pair[1];
+              if (key === "insertionPoint" && Array.isArray(val)) {
+                val = val.map((v) => typeof v === "number" ? v : 0);
+              } else if (key === "scale" && Array.isArray(val)) {
+                val = val.map((v) => typeof v === "number" ? v : 1);
+              } else if (key === "isDynamic") {
+                val = val === true || val === "true" || val === 1;
+              }
+              obj[key] = val;
+            }
+          });
+        }
+        return obj;
+      })
+    };
+    setCache(cacheKey, finalResult);
+    return finalResult;
+  } catch (e) {
+    log(`getBlockRefs error: ${e.message}`);
+    const result = { total: 0, blockRefs: [] };
+    setCache(cacheKey, result);
+    return result;
+  }
+}
+var TBL_QUERIES = {
+  layer: { name: "layer", lisp: `(progn
+(setq @d nil)
+(vlax-for e (vla-get-layers (vla-get-activedocument (vlax-get-acad-object)))
+  (setq @d (cons (list
+    (cons 2 (vla-get-name e))
+    (cons 62 (vla-get-color e))
+    (cons 6 (vla-get-linetype e))
+    (cons 70 (logior (if (vla-get-freeze e) 1 0) (if (vla-get-lock e) 4 0)))
+    (cons 60 (if (vla-get-layeron e) 0 1))
+  ) @d)))
+(list (cons 'table 'layer) (cons 'total (length @d)) (cons 'data (list (reverse @d)))))` },
+  block: { name: "block", lisp: `(progn
+(setq @d nil)
+(vlax-for e (vla-get-blocks (vla-get-activedocument (vlax-get-acad-object)))
+  (if (not (and (vlax-property-available-p e 'isfoundation) (vlax-get e 'isfoundation)))
+    (setq @d (cons (list (cons 2 (vla-get-name e)) (cons 70 (if (and (vlax-property-available-p e 'isxref) (vlax-get e 'isxref)) 1 0))) @d))))
+(list (cons 'table 'block) (cons 'total (length @d)) (cons 'data (list (reverse @d)))))` },
+  style: { name: "style", lisp: `(progn
+(setq @d nil)
+(vlax-for e (vla-get-textstyles (vla-get-activedocument (vlax-get-acad-object)))
+  (setq @d (cons (list (cons 2 (vla-get-name e)) (cons 70 0)) @d)))
+(list (cons 'table 'style) (cons 'total (length @d)) (cons 'data (list (reverse @d)))))` },
+  dimstyle: { name: "dimstyle", lisp: `(progn
+(setq @d nil)
+(vlax-for e (vla-get-dimstyles (vla-get-activedocument (vlax-get-acad-object)))
+  (setq @d (cons (list (cons 2 (vla-get-name e)) (cons 70 0)) @d)))
+(list (cons 'table 'dimstyle) (cons 'total (length @d)) (cons 'data (list (reverse @d)))))` },
+  ltype: { name: "linetype", lisp: `(progn
+(setq @d nil)
+(vlax-for e (vla-get-linetypes (vla-get-activedocument (vlax-get-acad-object)))
+  (setq @d (cons (list (cons 2 (vla-get-name e)) (cons 70 0)) @d)))
+(list (cons 'table 'linetype) (cons 'total (length @d)) (cons 'data (list (reverse @d)))))` }
+};
+function buildTablesCode(tblName) {
+  const key = tblName.toLowerCase();
+  const query = TBL_QUERIES[key];
+  if (query) {
+    return `(progn (vl-load-com) ${query.lisp})`;
+  }
+  const parts = Object.values(TBL_QUERIES).map((q) => q.lisp);
+  return `(progn (vl-load-com) (list ${parts.join(" ")}))`;
+}
+function parseTableRecord(rec) {
+  if (!rec || !Array.isArray(rec))
+    return null;
+  const obj = {};
+  for (const pair of rec) {
+    if (Array.isArray(pair) && pair.length >= 2) {
+      const key = String(pair[0]);
+      const val = pair[1];
+      if (key === "2")
+        obj.name = String(val);
+      else if (key === "62")
+        obj.color = typeof val === "number" ? val : 7;
+      else if (key === "6")
+        obj.linetype = String(val);
+      else if (key === "70") {
+        obj.flags = typeof val === "number" ? val : 0;
+        obj.frozen = (val & 1) !== 0;
+        obj.locked = (val & 4) !== 0;
+      } else if (key === "60")
+        obj.on = val === 0;
+      else if (key === "1")
+        obj.font = String(val);
+      else if (key === "40")
+        obj.height = typeof val === "number" ? val : 0;
+      else if (key === "41")
+        obj.width = typeof val === "number" ? val : 1;
+      else if (key === "42")
+        obj.oblique = typeof val === "number" ? val : 0;
+      else if (key === "3")
+        obj.description = String(val);
+    }
+  }
+  return obj.name ? obj : null;
+}
+async function getTables(params = {}) {
+  const tblName = params.tbl || params.type || "all";
+  const cacheKey = `dwg:tbl:${tblName}`;
+  const cached = getCached(cacheKey);
+  if (cached)
+    return cached;
+  if (!cad.connected)
+    await cad.connect();
+  if (!cad.connected)
+    return { table: tblName, data: [] };
+  try {
+    const code = buildTablesCode(tblName);
+    const resultStr = await cad.sendCommandWithResult(code);
+    if (!resultStr || resultStr === "" || resultStr === "nil") {
+      const result2 = { table: tblName, data: [] };
+      setCache(cacheKey, result2);
+      return result2;
+    }
+    const parsed = parseLispRecursive(resultStr);
+    if (!parsed || !Array.isArray(parsed)) {
+      const result2 = { table: tblName, total: 0, data: [] };
+      setCache(cacheKey, result2);
+      return result2;
+    }
+    let result;
+    if (parsed.length >= 3 && parsed[0] && String(parsed[0][0]).toUpperCase() === "TABLE") {
+      const tableName = String(parsed[0][1]).toLowerCase();
+      let total = 0;
+      let tblData = [];
+      for (const item of parsed) {
+        if (Array.isArray(item) && item.length >= 2) {
+          const key = String(item[0]).toUpperCase();
+          if (key === "TOTAL")
+            total = typeof item[1] === "number" ? item[1] : 0;
+          else if (key === "DATA") {
+            if (Array.isArray(item[1]) && item[1].length > 0 && item[1][0].length > 0 && !isNaN(parseInt(item[1][0][0]))) {
+              tblData = item[1];
+            }
+          }
+        }
+      }
+      if (tblData.length === 0 && parsed.length > 2) {
+        tblData = parsed.slice(2);
+      }
+      result = {
+        table: tableName,
+        total,
+        data: tblData.map(parseTableRecord).filter(Boolean)
+      };
+    } else {
+      const allData = {};
+      parsed.forEach((item) => {
+        if (!Array.isArray(item) || item.length < 2)
+          return;
+        let tableKey = null;
+        const entry = { total: 0, data: [] };
+        if (Array.isArray(item[0]) && item[0].length >= 2 && String(item[0][0]).toLowerCase() === "table") {
+          tableKey = String(item[0][1]).toLowerCase();
+          for (let i = 1; i < item.length; i++) {
+            const sub = item[i];
+            if (!Array.isArray(sub) || sub.length < 2)
+              continue;
+            const subKey = String(sub[0]).toUpperCase();
+            if (subKey === "TOTAL")
+              entry.total = typeof sub[1] === "number" ? sub[1] : 0;
+            else if (subKey === "DATA") {
+              const raw = Array.isArray(sub[1]) ? sub[1] : sub.slice(1);
+              entry.data = raw.map(parseTableRecord).filter(Boolean);
+            }
+          }
+        } else {
+          tableKey = String(item[0]).toLowerCase();
+          for (let i = 1; i < item.length; i++) {
+            const sub = item[i];
+            if (!Array.isArray(sub) || sub.length < 2)
+              continue;
+            const subKey = String(sub[0]).toUpperCase();
+            if (subKey === "TOTAL") {
+              entry.total = typeof sub[1] === "number" ? sub[1] : 0;
+            } else if (subKey === "DATA") {
+              const raw = Array.isArray(sub[1]) ? sub[1] : sub.slice(1);
+              entry.data = raw.map(parseTableRecord).filter(Boolean);
+            }
+          }
+        }
+        if (tableKey)
+          allData[tableKey] = entry;
+      });
+      result = allData;
+    }
+    setCache(cacheKey, result);
+    return result;
+  } catch (e) {
+    log(`getTables error: ${e.message}`);
+    const result = { table: tblName, data: [] };
+    setCache(cacheKey, result);
+    return result;
+  }
+}
 async function getPackages(filterName = null) {
   const cacheKey = filterName ? `packages:${filterName}` : "packages:all";
   const cached = getCached(cacheKey);
@@ -3018,12 +3290,6 @@ var RESOURCE_TEMPLATES = [
     description: "\u6309 type/layer/bbox \u8FC7\u6EE4\u56FE\u5143\uFF0C\u8FD4\u56DE entity:properties \u5168\u5C5E\u6027 JSON\uFF08ObjectName, Handle, Layer, Color, Center, Radius \u7B49\uFF09",
     mimeType: "application/json"
   },
-  {
-    uriTemplate: "atlisp://dwg/layers?name={name}",
-    name: "Layer by Name",
-    description: "\u6309\u540D\u79F0\u67E5\u8BE2\u56FE\u5C42",
-    mimeType: "application/json"
-  },
   {
     uriTemplate: "atlisp://packages?search={query}",
     name: "Package Search",
@@ -3031,9 +3297,21 @@ var RESOURCE_TEMPLATES = [
     mimeType: "application/json"
   },
   {
-    uriTemplate: "atlisp://dwg/texts?layer={layer}&offset={offset}&limit={limit}",
-    name: "Text Entities",
-    description: "\u5206\u9875\u83B7\u53D6\u6587\u672C\u5B9E\u4F53",
+    uriTemplate: "atlisp://dwg/block-refs/{blockName}",
+    name: "Block References",
+    description: "\u83B7\u53D6\u5757\u53C2\u7167\u5217\u8868\uFF0C\u652F\u6301\u6309\u5757\u540D\u8FC7\u6EE4",
+    mimeType: "application/json"
+  },
+  {
+    uriTemplate: "atlisp://dwg/tbl/{tbl}",
+    name: "CAD Tables",
+    description: "\u83B7\u53D6 CAD \u8868\u6570\u636E (layer, block, textstyle, dimstyle, linetype, ucs, view, regapp)",
+    mimeType: "application/json"
+  },
+  {
+    uriTemplate: "atlisp://dwg/text-content?bbox={bbox}&layer={layer}&offset={offset}&limit={limit}",
+    name: "Text Content",
+    description: "\u6587\u672C\u5185\u5BB9\u53CA\u4F4D\u7F6E\uFF0C\u7528\u4E8E\u8BED\u4E49\u5206\u6790",
     mimeType: "application/json"
   }
 ];
@@ -8377,25 +8655,27 @@ var tools = [
 ];
 function notifyResourceChanges(toolName) {
   const resourceMap = {
-    connect_cad: ["atlisp://cad/info", "atlisp://dwg/layers", "atlisp://dwg/name", "atlisp://dwg/path", "atlisp://cad/dwgs", "atlisp://packages"],
-    new_document: ["atlisp://dwg/name", "atlisp://dwg/path", "atlisp://cad/dwgs", "atlisp://dwg/layers", "atlisp://dwg/entities", "atlisp://dwg/texts"],
+    connect_cad: ["atlisp://cad/info", "atlisp://dwg/tbl", "atlisp://dwg/name", "atlisp://dwg/path", "atlisp://cad/dwgs", "atlisp://packages"],
+    new_document: ["atlisp://dwg/name", "atlisp://dwg/path", "atlisp://cad/dwgs", "atlisp://dwg/tbl", "atlisp://dwg/entities", "atlisp://dwg/text-content"],
     install_package: ["atlisp://packages"],
     install_atlisp: ["atlisp://packages", "atlisp://cad/info"],
     init_atlisp: ["atlisp://packages", "atlisp://cad/info"],
-    create_layer: ["atlisp://dwg/layers"],
-    delete_layer: ["atlisp://dwg/layers"],
-    set_layer: ["atlisp://dwg/layers"],
-    set_current_layer: ["atlisp://dwg/layers"],
-    create_block: ["atlisp://dwg/blocks"],
-    open_dwg: ["atlisp://dwg/name", "atlisp://dwg/path", "atlisp://cad/dwgs", "atlisp://dwg/layers", "atlisp://dwg/entities"],
+    create_layer: ["atlisp://dwg/tbl"],
+    delete_layer: ["atlisp://dwg/tbl"],
+    set_layer: ["atlisp://dwg/tbl"],
+    set_current_layer: ["atlisp://dwg/tbl"],
+    create_block: ["atlisp://dwg/block-refs", "atlisp://dwg/tbl"],
+    open_dwg: ["atlisp://dwg/name", "atlisp://dwg/path", "atlisp://cad/dwgs", "atlisp://dwg/tbl", "atlisp://dwg/entities", "atlisp://dwg/block-refs", "atlisp://dwg/text-content"],
     save_dwg: ["atlisp://dwg/name", "atlisp://dwg/path"],
     export_pdf: [],
-    close_dwg: ["atlisp://dwg/name", "atlisp://dwg/path", "atlisp://cad/dwgs"],
-    batch_delete: ["atlisp://dwg/entities"],
-    batch_explode: ["atlisp://dwg/entities"],
+    close_dwg: ["atlisp://dwg/name", "atlisp://dwg/path", "atlisp://cad/dwgs", "atlisp://dwg/block-refs", "atlisp://dwg/text-content"],
+    delete_entity: ["atlisp://dwg/entities", "atlisp://dwg/block-refs"],
+    batch_delete: ["atlisp://dwg/entities", "atlisp://dwg/block-refs"],
+    batch_explode: ["atlisp://dwg/entities", "atlisp://dwg/block-refs"],
+    explode_block: ["atlisp://dwg/entities", "atlisp://dwg/block-refs"],
     batch_set_color: ["atlisp://dwg/entities"],
     batch_set_linetype: ["atlisp://dwg/entities"],
-    batch_move: ["atlisp://dwg/entities", "atlisp://dwg/layers"],
+    batch_move: ["atlisp://dwg/entities", "atlisp://dwg/tbl"],
     batch_rename: ["atlisp://dwg/entities"],
     batch_create_group: ["atlisp://dwg/groups"],
     batch_add_to_group: ["atlisp://dwg/groups"],
@@ -8421,10 +8701,10 @@ function notifyResourceChanges(toolName) {
     thicken_surface: ["atlisp://dwg/entities"],
     create_region: ["atlisp://dwg/entities"],
     create_loft_surface: ["atlisp://dwg/entities"],
-    create_dimension_style: [],
-    create_text_style: [],
-    create_linetype: [],
-    load_linetype: [],
+    create_dimension_style: ["atlisp://dwg/tbl"],
+    create_text_style: ["atlisp://dwg/tbl"],
+    create_linetype: ["atlisp://dwg/tbl"],
+    load_linetype: ["atlisp://dwg/tbl"],
     attach_pdf: ["atlisp://dwg/entities"],
     detach_pdf: ["atlisp://dwg/entities"],
     import_dxf: ["atlisp://dwg/entities"],
@@ -9038,7 +9318,7 @@ Options:
   --port <port>         HTTP port (default: 8110)
   --host <host>         HTTP host (default: 0.0.0.0)
   --stdio                Shorthand for --transport stdio
-  --config <path>       Path to config file (default: ~/.@lisp/atlisp.config.json)
+  --config <path>       Path to config file (default: ~/.atlisp/atlisp.config.json)
   --debug               Enable debug mode
 
 Environment Variables:

package/dist/cad-worker.js

@@ -124,29 +124,32 @@ const cadSendWithResult = edge.func(function() {/*
   async (input) => {
       string tempFile = null;
       string lispFile = null;
+      string userCodeFile = null;
       try {
           dynamic d = input;
           string code = d.code.ToString();
           string platform = d.platform.ToString();
 string encoding = d.encoding != null ? d.encoding.ToString() : "";
-           string progId = platform == "BricsCAD" ? "BricscadApp.AadApplication" : platform + ".Application";
+           string progId = platform == "BricsCAD" ? "BricscadApp.AcadApplication" : platform + ".Application";
            string tempDir = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "@lisp", "tmp");
           System.IO.Directory.CreateDirectory(tempDir);
           
           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");
+          userCodeFile = System.IO.Path.Combine(tempDir, "atlisp_user_" + System.Guid.NewGuid().ToString("N") + ".lsp");
+          
+          // 用户代码单独写入文件，避免拼接注入风险
+          System.IO.File.WriteAllText(userCodeFile, code, System.Text.Encoding.GetEncoding(System.Globalization.CultureInfo.CurrentCulture.TextInfo.ANSICodePage));
           
-          // 生成 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 + "))))"
+              + "(setq r(vl-catch-all-apply '(lambda ()(load \"" + userCodeFile.Replace("\\", "\\\\") + "\"))))"
               + "(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));
           
@@ -201,6 +204,7 @@ string encoding = d.encoding != null ? d.encoding.ToString() : "";
                               
                               try { System.IO.File.Delete(tempFile); } catch {}
                               try { System.IO.File.Delete(lispFile); } catch {}
+                              try { System.IO.File.Delete(userCodeFile); } catch {}
                               break;
                           } catch (System.IO.IOException) {
                               System.Threading.Thread.Sleep(200);
@@ -223,6 +227,9 @@ string encoding = d.encoding != null ? d.encoding.ToString() : "";
           if (lispFile != null) {
               try { if (System.IO.File.Exists(lispFile)) System.IO.File.Delete(lispFile); } catch {}
           }
+          if (userCodeFile != null) {
+              try { if (System.IO.File.Exists(userCodeFile)) System.IO.File.Delete(userCodeFile); } catch {}
+          }
           return new { success = false, error = ex.Message };
       }
       if (tempFile != null) {
@@ -231,6 +238,9 @@ string encoding = d.encoding != null ? d.encoding.ToString() : "";
       if (lispFile != null) {
           try { if (System.IO.File.Exists(lispFile)) System.IO.File.Delete(lispFile); } catch {}
       }
+      if (userCodeFile != null) {
+          try { if (System.IO.File.Exists(userCodeFile)) System.IO.File.Delete(userCodeFile); } catch {}
+      }
       return new { success = false };
   }
   */});

package/package.json

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