@atlisp/mcp 1.6.7 → 1.6.9

package/dist/atlisp-mcp.js

@@ -2,7 +2,6 @@
 
 // src/atlisp-mcp.js
 import path10 from "path";
-import fs8 from "fs";
 import { fileURLToPath as fileURLToPath4 } from "url";
 import { createRequire } from "module";
 import express2 from "express";
@@ -23,7 +22,7 @@ var FILE_EXTENSIONS = {
   "BricsCAD": [".des"]
 };
 var SERVER_NAME = "atlisp-mcp-server";
-var SERVER_VERSION = "1.6.7";
+var SERVER_VERSION = "1.6.4";
 var MOCK_PACKAGES = [
   { name: "base", description: "\u57FA\u7840\u51FD\u6570\u5E93", version: "1.0.0" },
   { name: "at-pm", description: "\u5DE5\u7A0B\u9879\u76EE\u7BA1\u7406", version: "2.1.0" },
@@ -116,8 +115,7 @@ function parseArgs() {
   return result;
 }
 function loadConfigFile(filePath) {
-  if (!filePath || !fs.existsSync(filePath))
-    return null;
+  if (!filePath || !fs.existsSync(filePath)) return null;
   try {
     const raw = fs.readFileSync(filePath, "utf-8");
     const parsed = JSON.parse(raw);
@@ -255,8 +253,7 @@ function setupStdoutHandler(w) {
       const lines = buffer.split("\n");
       buffer = lines.pop() || "";
       for (const line of lines) {
-        if (!line.trim())
-          continue;
+        if (!line.trim()) continue;
         try {
           const result = JSON.parse(line);
           const rid = result.requestId;
@@ -282,8 +279,7 @@ function setupStdoutHandler(w) {
 }
 function getWorker(force = false) {
   if (!worker || !worker.connected || force) {
-    if (worker)
-      worker.kill();
+    if (worker) worker.kill();
     worker = spawn("node", [workerPath], {
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -291,8 +287,7 @@ function getWorker(force = false) {
     const w = worker;
     w.on("exit", (code) => {
       console.error("worker exited with code:", code);
-      if (w !== worker)
-        return;
+      if (w !== worker) return;
       w.connected = false;
       for (const [id, { reject, timeout }] of pendingRequests) {
         clearTimeout(timeout);
@@ -313,8 +308,7 @@ function getWorker(force = false) {
   return worker;
 }
 function startHeartbeat() {
-  if (heartbeatTimer)
-    clearInterval(heartbeatTimer);
+  if (heartbeatTimer) clearInterval(heartbeatTimer);
   heartbeatTimer = setInterval(async () => {
     try {
       const result = await sendMessage({ type: "ping" });
@@ -359,8 +353,7 @@ var CadConnection = class {
     return process.platform === "win32";
   }
   async connect(platform = null) {
-    if (!this.isAvailable())
-      return false;
+    if (!this.isAvailable()) return false;
     try {
       const msg = platform ? { type: "connect", platform } : { type: "connect" };
       const result = await sendMessage(msg);
@@ -377,16 +370,13 @@ var CadConnection = class {
     return false;
   }
   async sendCommand(code) {
-    if (!this.connected)
-      throw new Error("\u672A\u8FDE\u63A5 CAD");
+    if (!this.connected) throw new Error("\u672A\u8FDE\u63A5 CAD");
     const result = await sendMessage({ type: "send", code, platform: _platform });
-    if (result.success)
-      return true;
+    if (result.success) return true;
     throw new Error(result.error || "\u53D1\u9001\u5931\u8D25");
   }
   async sendCommandWithResult(code, encoding = null) {
-    if (!this.connected)
-      throw new Error("\u672A\u8FDE\u63A5 CAD");
+    if (!this.connected) throw new Error("\u672A\u8FDE\u63A5 CAD");
     const result = await sendMessage({ type: "sendResult", code, platform: _platform, encoding: encoding || "" });
     if (result.success) {
       return result.result || "";
@@ -400,8 +390,7 @@ var CadConnection = class {
     return this.product;
   }
   async isBusy() {
-    if (!this.connected)
-      return false;
+    if (!this.connected) return false;
     try {
       const result = await sendMessage({ type: "isBusy", platform: _platform });
       return result && result.isBusy;
@@ -410,8 +399,7 @@ var CadConnection = class {
     }
   }
   async hasDoc() {
-    if (!this.connected)
-      return { hasDoc: false, docCount: 0 };
+    if (!this.connected) return { hasDoc: false, docCount: 0 };
     try {
       const result = await sendMessage({ type: "hasdoc", platform: _platform });
       return result || { hasDoc: false, docCount: 0 };
@@ -420,8 +408,7 @@ var CadConnection = class {
     }
   }
   async newDoc() {
-    if (!this.connected)
-      throw new Error("\u672A\u8FDE\u63A5 CAD");
+    if (!this.connected) throw new Error("\u672A\u8FDE\u63A5 CAD");
     try {
       const result = await sendMessage({ type: "newdoc", platform: _platform });
       return result && result.success;
@@ -430,8 +417,7 @@ var CadConnection = class {
     }
   }
   async bringToFront() {
-    if (!this.connected)
-      throw new Error("\u672A\u8FDE\u63A5 CAD");
+    if (!this.connected) throw new Error("\u672A\u8FDE\u63A5 CAD");
     try {
       const result = await sendMessage({ type: "bringToFront", platform: _platform });
       return result && result.success;
@@ -440,8 +426,7 @@ var CadConnection = class {
     }
   }
   async getInfo() {
-    if (!this.connected)
-      return "CAD \u672A\u8FDE\u63A5";
+    if (!this.connected) return "CAD \u672A\u8FDE\u63A5";
     return `Platform: ${this.product}, Version: ${this.version}, Status: Connected`;
   }
   async disconnect() {
@@ -478,11 +463,9 @@ var MAX_LOG_SIZE = 10 * 1024 * 1024;
 var MAX_LOG_FILES = 5;
 var stream = null;
 function rotateLog() {
-  if (!fs2.existsSync(DEBUG_FILE))
-    return;
+  if (!fs2.existsSync(DEBUG_FILE)) return;
   const stat = fs2.statSync(DEBUG_FILE);
-  if (stat.size < MAX_LOG_SIZE)
-    return;
+  if (stat.size < MAX_LOG_SIZE) return;
   if (stream) {
     stream.end();
     stream = null;
@@ -546,11 +529,9 @@ function ensureRequestLogDir() {
   }
 }
 function rotateRequestLog() {
-  if (!fs2.existsSync(REQUEST_LOG_FILE))
-    return;
+  if (!fs2.existsSync(REQUEST_LOG_FILE)) return;
   const stat = fs2.statSync(REQUEST_LOG_FILE);
-  if (stat.size < 10 * 1024 * 1024)
-    return;
+  if (stat.size < 10 * 1024 * 1024) return;
   const dir = path3.dirname(REQUEST_LOG_FILE);
   for (let i = 5; i > 0; i--) {
     const oldPath = `${REQUEST_LOG_FILE}.${i}`;
@@ -568,8 +549,7 @@ function rotateRequestLog() {
   }
 }
 function logRequest(req) {
-  if (!config_default.requestLogEnabled)
-    return;
+  if (!config_default.requestLogEnabled) return;
   try {
     ensureRequestLogDir();
     rotateRequestLog();
@@ -586,8 +566,7 @@ function logRequest(req) {
   }
 }
 function logResponse(req, res, duration) {
-  if (!config_default.requestLogEnabled)
-    return;
+  if (!config_default.requestLogEnabled) return;
   try {
     ensureRequestLogDir();
     const entry = {
@@ -685,14 +664,11 @@ function clearCache(uri) {
   }
 }
 function parseLispList(str) {
-  if (!str || typeof str !== "string")
-    return null;
+  if (!str || typeof str !== "string") return null;
   const trimmed = str.trim();
-  if (!trimmed.startsWith("(") || !trimmed.endsWith(")"))
-    return null;
+  if (!trimmed.startsWith("(") || !trimmed.endsWith(")")) return null;
   const content = trimmed.slice(1, -1).trim();
-  if (!content)
-    return [];
+  if (!content) return [];
   const result = [];
   let depth = 0;
   let current = "";
@@ -734,44 +710,32 @@ function parseLispList(str) {
     }
     current += ch;
   }
-  if (current.trim())
-    result.push(current.trim());
+  if (current.trim()) result.push(current.trim());
   return result.map((item) => {
     const t = item.trim();
-    if (t === "nil")
-      return null;
-    if (t === "t")
-      return true;
-    if (t === "T")
-      return true;
+    if (t === "nil") return null;
+    if (t === "t") return true;
+    if (t === "T") return true;
     const num = Number(t);
-    if (!isNaN(num) && t !== "")
-      return num;
-    if (t.startsWith('"') && t.endsWith('"'))
-      return t.slice(1, -1);
+    if (!isNaN(num) && t !== "") return num;
+    if (t.startsWith('"') && t.endsWith('"')) return t.slice(1, -1);
     return t;
   });
 }
 function parseLispRecursive(str) {
-  if (!str || typeof str !== "string")
-    return null;
+  if (!str || typeof str !== "string") return null;
   str = str.trim();
-  if (!str)
-    return null;
+  if (!str) return null;
   let pos = 0;
   function skipWs() {
-    while (pos < str.length && /\s/.test(str[pos]))
-      pos++;
+    while (pos < str.length && /\s/.test(str[pos])) pos++;
   }
   function parseValue() {
     skipWs();
-    if (pos >= str.length)
-      return null;
+    if (pos >= str.length) return null;
     const ch = str[pos];
-    if (ch === "(")
-      return parseList();
-    if (ch === '"')
-      return parseString();
+    if (ch === "(") return parseList();
+    if (ch === '"') return parseString();
     if (ch === "'") {
       pos++;
       return parseValue();
@@ -784,16 +748,11 @@ function parseLispRecursive(str) {
     while (pos < str.length && str[pos] !== '"') {
       if (str[pos] === "\\" && pos + 1 < str.length) {
         pos++;
-        if (str[pos] === '"')
-          r += '"';
-        else if (str[pos] === "n")
-          r += "\n";
-        else if (str[pos] === "t")
-          r += "	";
-        else if (str[pos] === "\\")
-          r += "\\";
-        else
-          r += str[pos];
+        if (str[pos] === '"') r += '"';
+        else if (str[pos] === "n") r += "\n";
+        else if (str[pos] === "t") r += "	";
+        else if (str[pos] === "\\") r += "\\";
+        else r += str[pos];
       } else {
         r += str[pos];
       }
@@ -804,16 +763,12 @@ function parseLispRecursive(str) {
   }
   function parseAtom() {
     const start = pos;
-    while (pos < str.length && !/\s/.test(str[pos]) && str[pos] !== ")" && str[pos] !== "(")
-      pos++;
+    while (pos < str.length && !/\s/.test(str[pos]) && str[pos] !== ")" && str[pos] !== "(") pos++;
     const atom = str.slice(start, pos);
-    if (atom === "nil" || atom === "NIL")
-      return null;
-    if (atom === "t" || atom === "T")
-      return true;
+    if (atom === "nil" || atom === "NIL") return null;
+    if (atom === "t" || atom === "T") return true;
     const num = Number(atom);
-    if (!isNaN(num) && atom !== "")
-      return num;
+    if (!isNaN(num) && atom !== "") return num;
     return atom;
   }
   function parseList() {
@@ -821,15 +776,13 @@ function parseLispRecursive(str) {
     const items = [];
     while (pos < str.length) {
       skipWs();
-      if (pos >= str.length)
-        break;
+      if (pos >= str.length) break;
       if (str[pos] === ")") {
         pos++;
         return items;
       }
       const left = parseValue();
-      if (left === void 0)
-        break;
+      if (left === void 0) break;
       skipWs();
       if (str[pos] === "." && (pos + 1 >= str.length || /\s/.test(str[pos + 1]) || str[pos + 1] === ")")) {
         pos++;
@@ -852,8 +805,7 @@ function parseLispRecursive(str) {
   return parseValue();
 }
 function lispPairsToObject(pairs) {
-  if (!Array.isArray(pairs))
-    return pairs;
+  if (!Array.isArray(pairs)) return pairs;
   const obj = {};
   for (let i = 0; i < pairs.length - 1; i += 2) {
     const key = pairs[i];
@@ -864,36 +816,8 @@ function lispPairsToObject(pairs) {
   }
   return obj;
 }
-function parseEntity(arr) {
-  if (!Array.isArray(arr) || arr.length < 5)
-    return null;
-  const [type, handle, layer, color, linetype, ...rest] = arr;
-  const entity = {
-    type: String(type).toUpperCase().replace(/^"|"$/g, ""),
-    handle: String(handle),
-    layer: String(layer),
-    color,
-    linetype: String(linetype)
-  };
-  const entType = typeof entity.type === "string" ? entity.type.toUpperCase() : entity.type;
-  if (/^(TEXT|MTEXT|ATTRIB|TCH_TEXT)$/.test(entType) && rest[0] != null) {
-    entity.text = String(rest[0]);
-  }
-  if (/^(LINE|LWPOLYLINE|POLYLINE|ARC|CIRCLE|SPLINE|ELLIPSE|XLINE|RAY)$/.test(entType) && Array.isArray(rest[0])) {
-    entity.points = rest[0].map((pt) => {
-      if (Array.isArray(pt) && pt.length >= 2)
-        return { x: Number(pt[0]), y: Number(pt[1]), z: Number(pt[2] || 0) };
-      return null;
-    }).filter(Boolean);
-  }
-  if (entType === "INSERT" && rest[0] != null) {
-    entity.blockName = String(rest[0]);
-  }
-  return entity;
-}
 function propertyPairsToObject(pairs) {
-  if (!Array.isArray(pairs))
-    return null;
+  if (!Array.isArray(pairs)) return null;
   const obj = {};
   for (const pair of pairs) {
     if (Array.isArray(pair) && pair.length >= 2) {
@@ -904,10 +828,8 @@ function propertyPairsToObject(pairs) {
 }
 function buildEntityPropertiesCode({ type, layer, bbox }) {
   const items = [];
-  if (type)
-    items.push(`(cons 0 "${type.replace(/"/g, '\\"')}")`);
-  if (layer)
-    items.push(`(cons 8 "${layer.replace(/"/g, '\\"')}")`);
+  if (type) items.push(`(cons 0 "${type.replace(/"/g, '\\"')}")`);
+  if (layer) items.push(`(cons 8 "${layer.replace(/"/g, '\\"')}")`);
   if (bbox) {
     const parts = bbox.split(",").map((s) => parseFloat(s.trim()));
     if (parts.length === 4) {
@@ -932,52 +854,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 typ result item ins)
-  (setq ed (entget ent) typ (cdr (assoc 0 ed)))
-  (setq result (list (vl-prin1-to-string typ) (vl-prin1-to-string (cdr (assoc 5 ed))) (vl-prin1-to-string (cdr (assoc 8 ed)))
-    (if (setq item (assoc 62 ed)) (cdr item) "ByLayer")
-    (vl-prin1-to-string (if (setq item (assoc 6 ed)) (cdr item) "ByLayer"))))
-  (setq ins (cdr (assoc 10 ed)))
-  (append result (list (vl-prin1-to-string (cdr (assoc 1 ed))) (car ins) (cadr ins) (caddr ins)
-    (cdr (assoc 40 ed)) (cdr (assoc 50 ed))
-    (vl-prin1-to-string (if (setq item (assoc 7 ed)) (cdr item) "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\u5185\u5BB9\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 ?blockName=xxx", 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 ?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 },
@@ -986,23 +870,20 @@ var RESOURCES = [
 ];
 function parseQuery(uri) {
   const qIdx = uri.indexOf("?");
-  if (qIdx === -1)
-    return { base: uri, params: {} };
+  if (qIdx === -1) return { base: uri, params: {} };
   const base = uri.substring(0, qIdx);
   const params = {};
   uri.substring(qIdx + 1).split("&").forEach((p) => {
     const eqIdx = p.indexOf("=");
     const k = eqIdx === -1 ? p : p.substring(0, eqIdx);
     const v = eqIdx === -1 ? "" : p.substring(eqIdx + 1);
-    if (k)
-      params[k] = decodeURIComponent(v);
+    if (k) params[k] = decodeURIComponent(v);
   });
   return { base, params };
 }
 function parseTemplateUri(uri) {
   const match = uri.match(/^atlisp:\/\/dwg\/entity\/([^?]+)$/);
-  if (match)
-    return { type: "entity", handle: match[1] };
+  if (match) return { type: "entity", handle: match[1] };
   return null;
 }
 async function listResources(subscribedUris = []) {
@@ -1023,16 +904,18 @@ async function readResource(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":
@@ -1048,10 +931,8 @@ async function readResource(uri) {
   }
 }
 async function getEntityByHandle(handle) {
-  if (!cad.connected)
-    await cad.connect();
-  if (!cad.connected)
-    return { error: "CAD \u672A\u8FDE\u63A5" };
+  if (!cad.connected) await cad.connect();
+  if (!cad.connected) return { error: "CAD \u672A\u8FDE\u63A5" };
   const code = `(progn
         (vl-load-com)
         (if (setq ent (handent "${handle}"))
@@ -1071,8 +952,7 @@ async function getEntityByHandle(handle) {
     )`;
   try {
     const result = await cad.sendCommandWithResult(code);
-    if (!result || result === "nil")
-      return { error: `\u672A\u627E\u5230\u5B9E\u4F53: ${handle}` };
+    if (!result || result === "nil") return { error: `\u672A\u627E\u5230\u5B9E\u4F53: ${handle}` };
     try {
       return JSON.parse(result);
     } catch {
@@ -1084,8 +964,7 @@ async function getEntityByHandle(handle) {
 }
 async function getCadInfo() {
   const cached = getCached("cad:info");
-  if (cached)
-    return cached;
+  if (cached) return cached;
   if (!cad.connected) {
     await cad.connect();
   }
@@ -1109,65 +988,11 @@ 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);
-  if (cached)
-    return cached;
-  if (!cad.connected)
-    await cad.connect();
+  if (cached) return cached;
+  if (!cad.connected) await cad.connect();
   if (!cad.connected) {
     const result = { total: 0, entities: [] };
     setCache(cacheKey, result);
@@ -1266,27 +1091,48 @@ 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 (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: [] };
@@ -1294,26 +1140,38 @@ 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(parseEntity).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;
   }
 }
 async function getDwgName() {
-  if (!cad.connected)
-    await cad.connect();
-  if (!cad.connected)
-    return { name: null };
+  if (!cad.connected) await cad.connect();
+  if (!cad.connected) return { name: null };
   try {
     const code = `(vl-princ-to-string (getvar "dwgname"))`;
     const name = await cad.sendCommandWithResult(code);
@@ -1323,10 +1181,8 @@ async function getDwgName() {
   }
 }
 async function getDwgPath() {
-  if (!cad.connected)
-    await cad.connect();
-  if (!cad.connected)
-    return { path: null, name: null };
+  if (!cad.connected) await cad.connect();
+  if (!cad.connected) return { path: null, name: null };
   try {
     const code = `(progn
           (setq prefix (vl-princ-to-string (getvar "dwgprefix")))
@@ -1344,8 +1200,7 @@ async function getDwgPath() {
     }
     if (!parsed) {
       const listResult = parseLispList(result);
-      if (listResult && listResult.length >= 2)
-        parsed = listResult;
+      if (listResult && listResult.length >= 2) parsed = listResult;
     }
     if (parsed && Array.isArray(parsed) && parsed.length >= 2) {
       return { path: String(parsed[0]), name: String(parsed[1]) };
@@ -1355,15 +1210,257 @@ 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_INFO = {
+  layer: { name: "\u56FE\u5C42", fields: ["name", "color", "linetype", "frozen", "locked", "on"] },
+  block: { name: "\u5757\u5B9A\u4E49", fields: ["name", "path", "flags"] },
+  textstyle: { name: "\u6587\u5B57\u6837\u5F0F", fields: ["name", "font", "height", "width", "oblique"] },
+  dimstyle: { name: "\u6807\u6CE8\u6837\u5F0F", fields: ["name", "arrow", "textheight", "scale"] },
+  linetype: { name: "\u7EBF\u578B", fields: ["name", "description", "pattern"] },
+  ucs: { name: "UCS", fields: ["name", "origin", "xaxis", "yaxis"] },
+  view: { name: "\u89C6\u56FE", fields: ["name", "center", "height", "width"] },
+  viewport: { name: "\u89C6\u53E3", fields: ["name", "number", "flags"] },
+  regapp: { name: "\u6CE8\u518C\u5E94\u7528", fields: ["name"] },
+  viewport: { name: "\u89C6\u53E3\u914D\u7F6E", fields: ["name", "number"] },
+  plotstyle: { name: "\u6253\u5370\u6837\u5F0F", fields: ["name"] }
+};
+function buildTablesCode(tblName) {
+  const validTbls = Object.keys(TBL_INFO).join('","');
+  return `(progn
+(vl-load-com)
+(defun @tbl:get (tbl / res)
+  (setq res nil)
+  (while (setq rec (tblnext tbl (null res)))
+    (setq res (cons (list (cdr (assoc 2 rec)) rec) res)))
+  (reverse res))
+(defun @tbl:get-all nil
+  (list
+    (cons "layer" (@tbl:get "LAYER"))
+    (cons "block" (@tbl:get "BLOCK"))
+    (cons "textstyle" (@tbl:get "STYLE"))
+    (cons "dimstyle" (@tbl:get "DIMSTYLE"))
+    (cons "linetype" (@tbl:get "LTYPE"))
+    (cons "ucs" (@tbl:get "UCS"))
+    (cons "view" (@tbl:get "VIEW"))
+    (cons "regapp" (@tbl:get "REGAPP"))
+  ))
+(if (member (strcase "${tblName}") (list "${validTbls}"))
+  (list (cons "table" (strcase "${tblName}")) (cons "data" (@tbl:get (strcase "${tblName}"))))
+  (@tbl:get-all)))
+`;
+}
+function parseTableRecord(rec) {
+  if (!Array.isArray(rec) || rec.length < 2) return null;
+  const name = rec[0];
+  const data = rec[1];
+  if (!Array.isArray(data)) return { name };
+  const obj = { name: String(name) };
+  data.forEach((pair) => {
+    if (Array.isArray(pair) && pair.length >= 2) {
+      const key = pair[0];
+      let val = pair[1];
+      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;
+      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);
+      else if (key === 10 && Array.isArray(val)) obj.origin = val;
+      else if (key === 11 && Array.isArray(val)) obj.xaxis = val;
+      else if (key === 12 && Array.isArray(val)) obj.yaxis = val;
+    }
+  });
+  return obj;
+}
+async function getTables(params = {}) {
+  const tblName = params.tbl || "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, data: [] };
+      setCache(cacheKey, result2);
+      return result2;
+    }
+    const isSingleTable = parsed.length >= 2 && parsed[0] === "table";
+    let result;
+    if (isSingleTable) {
+      const data = Array.isArray(parsed[1]) ? parsed[1] : [];
+      const tblData = Array.isArray(parsed[2]) ? parsed[2] : [];
+      result = {
+        table: String(data),
+        data: tblData.map(parseTableRecord).filter(Boolean)
+      };
+    } else {
+      const allData = {};
+      parsed.forEach((item) => {
+        if (Array.isArray(item) && item.length >= 2) {
+          const key = item[0];
+          const vals = Array.isArray(item[1]) ? item[1] : [];
+          allData[key] = vals.map(parseTableRecord).filter(Boolean);
+        }
+      });
+      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);
-  if (cached)
-    return cached;
-  if (!cad.connected)
-    await cad.connect();
-  if (!cad.connected)
-    return [];
+  if (cached) return cached;
+  if (!cad.connected) await cad.connect();
+  if (!cad.connected) return [];
   try {
     const code = `(mapcar 'cdr @::*local-pkgs*)`;
     const result = await cad.sendCommandWithResult(code);
@@ -1377,8 +1474,7 @@ async function getPackages(filterName = null) {
     } catch {
       raw = parseLispList(result) || [];
     }
-    if (!Array.isArray(raw))
-      raw = [];
+    if (!Array.isArray(raw)) raw = [];
     const packages = raw.map((item) => {
       if (Array.isArray(item)) {
         const pkg = { name: "", version: "0.0.0", description: "", loaded: true };
@@ -1387,20 +1483,13 @@ async function getPackages(filterName = null) {
             const [[key, val]] = Object.entries(entry);
             const k = String(key);
             const v = String(val);
-            if (k === ":NAME")
-              pkg.name = v;
-            else if (k === ":VERSION")
-              pkg.version = v;
-            else if (k === ":DESCRIPTION")
-              pkg.description = v;
-            else if (k === ":FULL-NAME")
-              pkg.fullName = v;
-            else if (k === ":AUTHOR")
-              pkg.author = v;
-            else if (k === ":CATEGORY")
-              pkg.category = v;
-            else if (k === ":URL")
-              pkg.url = v;
+            if (k === ":NAME") pkg.name = v;
+            else if (k === ":VERSION") pkg.version = v;
+            else if (k === ":DESCRIPTION") pkg.description = v;
+            else if (k === ":FULL-NAME") pkg.fullName = v;
+            else if (k === ":AUTHOR") pkg.author = v;
+            else if (k === ":CATEGORY") pkg.category = v;
+            else if (k === ":URL") pkg.url = v;
           }
         }
         return pkg;
@@ -1411,22 +1500,15 @@ async function getPackages(filterName = null) {
       if (item && typeof item === "object") {
         const pkg = { name: "", version: "0.0.0", description: "", loaded: true };
         const nameVal = item.name || item.Name || item.NAME || item[":NAME"];
-        if (nameVal)
-          pkg.name = String(nameVal);
+        if (nameVal) pkg.name = String(nameVal);
         const verVal = item.version || item.Version || item.VERSION || item[":VERSION"];
-        if (verVal)
-          pkg.version = String(verVal);
+        if (verVal) pkg.version = String(verVal);
         const descVal = item.description || item.Description || item.DESCRIPTION || item[":DESCRIPTION"];
-        if (descVal)
-          pkg.description = String(descVal);
-        if (item.fullName || item.full_name)
-          pkg.fullName = String(item.fullName || item.full_name);
-        if (item.author || item.Author)
-          pkg.author = String(item.author || item.Author);
-        if (item.category || item.Category)
-          pkg.category = String(item.category || item.Category);
-        if (item.url || item.Url || item.URL)
-          pkg.url = String(item.url || item.Url || item.URL);
+        if (descVal) pkg.description = String(descVal);
+        if (item.fullName || item.full_name) pkg.fullName = String(item.fullName || item.full_name);
+        if (item.author || item.Author) pkg.author = String(item.author || item.Author);
+        if (item.category || item.Category) pkg.category = String(item.category || item.Category);
+        if (item.url || item.Url || item.URL) pkg.url = String(item.url || item.Url || item.URL);
         return pkg;
       }
       return null;
@@ -1452,12 +1534,9 @@ function getPlatforms() {
 async function getDwgList() {
   const cacheKey = "cad:dwgs";
   const cached = getCached(cacheKey);
-  if (cached)
-    return cached;
-  if (!cad.connected)
-    await cad.connect();
-  if (!cad.connected)
-    return [];
+  if (cached) return cached;
+  if (!cad.connected) await cad.connect();
+  if (!cad.connected) return [];
   try {
     const code = `(progn
           (vl-load-com)
@@ -1481,8 +1560,7 @@ async function getDwgList() {
         parsed = listResult;
       }
     }
-    if (!Array.isArray(parsed))
-      parsed = [];
+    if (!Array.isArray(parsed)) parsed = [];
     const dwgList = parsed.map((item) => {
       if (Array.isArray(item) && item.length >= 2) {
         return { name: String(item[0]), path: String(item[1]) };
@@ -1509,8 +1587,7 @@ function loadStandardsFile(filename) {
 var standardsCache = /* @__PURE__ */ new Map();
 function getCachedStandards(key) {
   const entry = standardsCache.get(key);
-  if (entry && Date.now() - entry.timestamp < 3e4)
-    return entry.data;
+  if (entry && Date.now() - entry.timestamp < 3e4) return entry.data;
   standardsCache.delete(key);
   return null;
 }
@@ -1519,20 +1596,16 @@ function setCachedStandards(key, data) {
 }
 function getDraftingStandards() {
   const cached = getCachedStandards("drafting");
-  if (cached)
-    return cached;
+  if (cached) return cached;
   const data = loadStandardsFile("drafting.json");
-  if (data)
-    setCachedStandards("drafting", data);
+  if (data) setCachedStandards("drafting", data);
   return data || { error: "\u5236\u56FE\u89C4\u8303\u6587\u4EF6\u52A0\u8F7D\u5931\u8D25" };
 }
 function getCodingStandards() {
   const cached = getCachedStandards("coding");
-  if (cached)
-    return cached;
+  if (cached) return cached;
   const data = loadStandardsFile("coding.json");
-  if (data)
-    setCachedStandards("coding", data);
+  if (data) setCachedStandards("coding", data);
   return data || { error: "\u7F16\u7801\u89C4\u8303\u6587\u4EF6\u52A0\u8F7D\u5931\u8D25" };
 }
 
@@ -1747,11 +1820,9 @@ var SseSession = class {
     return lines.join("\n") + "\n\n";
   }
   _setupDrain() {
-    if (typeof this.#res.on !== "function")
-      return;
+    if (typeof this.#res.on !== "function") return;
     this.#drainHandler = () => {
-      if (!this.#active)
-        return;
+      if (!this.#active) return;
       if (this.#backpressureBuffer.length > 0) {
         this._drainBuffer();
       }
@@ -1773,8 +1844,7 @@ var SseSession = class {
     }
   }
   _write(content) {
-    if (!this.#active)
-      return false;
+    if (!this.#active) return false;
     try {
       if (this.#backpressureBuffer.length > 0) {
         this.#backpressureBuffer.push(content);
@@ -1902,8 +1972,7 @@ function persistSessionData(clientId, sessionData) {
 function loadPersistedSessionData(clientId) {
   try {
     const filePath = getSessionStorePath(clientId);
-    if (!fs4.existsSync(filePath))
-      return null;
+    if (!fs4.existsSync(filePath)) return null;
     const raw = fs4.readFileSync(filePath, "utf-8");
     const store = JSON.parse(raw);
     if (Date.now() - store.savedAt > SESSION_STORE_TTL) {
@@ -2063,8 +2132,7 @@ var SessionTransport = class {
     this._started = true;
   }
   async send(message) {
-    if (this._closed)
-      return;
+    if (this._closed) return;
     if (this._pendingRequest) {
       const { resolve, reject, timeout } = this._pendingRequest;
       clearTimeout(timeout);
@@ -2073,8 +2141,7 @@ var SessionTransport = class {
     }
   }
   async close() {
-    if (this._closed)
-      return;
+    if (this._closed) return;
     this._closed = true;
     if (this._pendingRequest) {
       const { reject, timeout } = this._pendingRequest;
@@ -2386,14 +2453,10 @@ ${generateSuggestions(entities, layers)}`
 }
 function generateSuggestions(entities, layers) {
   const suggestions = [];
-  if (entities.total > 1e3)
-    suggestions.push("- \u56FE\u7EB8\u5B9E\u4F53\u8F83\u591A\uFF0C\u5EFA\u8BAE\u4F7F\u7528\u56FE\u5C42\u5206\u7C7B\u7BA1\u7406");
-  if (layers.length > 20)
-    suggestions.push("- \u56FE\u5C42\u8F83\u591A\uFF0C\u5EFA\u8BAE\u6E05\u7406\u672A\u4F7F\u7528\u7684\u56FE\u5C42");
-  if (entities.byType.LINE && entities.byType.LINE > 500)
-    suggestions.push("- \u7EBF\u6761\u8F83\u591A\uFF0C\u53EF\u8003\u8651\u4F7F\u7528 BLOCK \u51CF\u5C11\u5B9E\u4F53\u6570\u91CF");
-  if (!entities.byType.DIMENSION)
-    suggestions.push("- \u672A\u53D1\u73B0\u5C3A\u5BF8\u6807\u6CE8\uFF0C\u5EFA\u8BAE\u6DFB\u52A0\u6807\u6CE8");
+  if (entities.total > 1e3) suggestions.push("- \u56FE\u7EB8\u5B9E\u4F53\u8F83\u591A\uFF0C\u5EFA\u8BAE\u4F7F\u7528\u56FE\u5C42\u5206\u7C7B\u7BA1\u7406");
+  if (layers.length > 20) suggestions.push("- \u56FE\u5C42\u8F83\u591A\uFF0C\u5EFA\u8BAE\u6E05\u7406\u672A\u4F7F\u7528\u7684\u56FE\u5C42");
+  if (entities.byType.LINE && entities.byType.LINE > 500) suggestions.push("- \u7EBF\u6761\u8F83\u591A\uFF0C\u53EF\u8003\u8651\u4F7F\u7528 BLOCK \u51CF\u5C11\u5B9E\u4F53\u6570\u91CF");
+  if (!entities.byType.DIMENSION) suggestions.push("- \u672A\u53D1\u73B0\u5C3A\u5BF8\u6807\u6CE8\uFF0C\u5EFA\u8BAE\u6DFB\u52A0\u6807\u6CE8");
   return suggestions.length ? suggestions.join("\n") : "- \u56FE\u7EB8\u7ED3\u6784\u826F\u597D";
 }
 async function generateBatchLinesPrompt(args) {
@@ -2938,8 +3001,7 @@ var Metrics = class {
     bucket.sum += value;
     bucket.min = Math.min(bucket.min, value);
     bucket.max = Math.max(bucket.max, value);
-    if (!bucket.values)
-      bucket.values = [];
+    if (!bucket.values) bucket.values = [];
     bucket.values.push(value);
     this.histograms.set(key, bucket);
   }
@@ -3030,33 +3092,33 @@ var RESOURCE_TEMPLATES = [
     mimeType: "application/json"
   },
   {
-    uriTemplate: "atlisp://dwg/entities",
-    name: "Entities Summary",
-    description: "\u8FD4\u56DE\u56FE\u5143\u603B\u6570\u548C\u6309\u7C7B\u578B\u7EDF\u8BA1\u5217\u8868",
+    uriTemplate: "atlisp://dwg/entities?type={type}",
+    name: "Entities by Type",
+    description: "\u6309\u7C7B\u578B\u67E5\u8BE2\u5B9E\u4F53\u5217\u8868",
     mimeType: "application/json"
   },
   {
-    uriTemplate: "atlisp://dwg/entities?type={type}&layer={layer}&bbox={bbox}",
-    name: "Filtered Entities",
-    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",
+    uriTemplate: "atlisp://packages?search={query}",
+    name: "Package Search",
+    description: "\u641C\u7D22 @lisp \u5305",
     mimeType: "application/json"
   },
   {
-    uriTemplate: "atlisp://dwg/layers?name={name}",
-    name: "Layer by Name",
-    description: "\u6309\u540D\u79F0\u67E5\u8BE2\u56FE\u5C42",
+    uriTemplate: "atlisp://dwg/block-refs?blockName={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://packages?search={query}",
-    name: "Package Search",
-    description: "\u641C\u7D22 @lisp \u5305",
+    uriTemplate: "atlisp://dwg/tbl?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/texts?layer={layer}&offset={offset}&limit={limit}",
-    name: "Text Entities",
-    description: "\u5206\u9875\u83B7\u53D6\u6587\u672C\u5B9E\u4F53",
+    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"
   }
 ];
@@ -3178,8 +3240,7 @@ async function evalLisp(code, withResult = false, encoding = null) {
     return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   }
   const trimmed = (code || "").trim();
-  if (!trimmed)
-    return { content: [{ type: "text", text: "\u547D\u4EE4\u4E3A\u7A7A\uFF0C\u672A\u53D1\u9001" }] };
+  if (!trimmed) return { content: [{ type: "text", text: "\u547D\u4EE4\u4E3A\u7A7A\uFF0C\u672A\u53D1\u9001" }] };
   try {
     if (withResult) {
       const result = await cad.sendCommandWithResult(trimmed, encoding);
@@ -3199,17 +3260,14 @@ async function getCadInfo2() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "CAD \u672A\u8FDE\u63A5" }] };
+  if (!cad.connected) return { content: [{ type: "text", text: "CAD \u672A\u8FDE\u63A5" }] };
   const info = await cad.getInfo();
   return { content: [{ type: "text", text: info }] };
 }
 async function atCommand(command) {
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u8BF7\u5148\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u8BF7\u5148\u8FDE\u63A5 CAD" }], isError: true };
   const trimmed = (command || "").trim();
-  if (!trimmed)
-    return { content: [{ type: "text", text: "\u547D\u4EE4\u4E3A\u7A7A\uFF0C\u672A\u53D1\u9001" }] };
+  if (!trimmed) return { content: [{ type: "text", text: "\u547D\u4EE4\u4E3A\u7A7A\uFF0C\u672A\u53D1\u9001" }] };
   await cad.sendCommand(trimmed + "\n");
   return { content: [{ type: "text", text: "\u5DF2\u53D1\u9001\u547D\u4EE4" }] };
 }
@@ -3217,8 +3275,7 @@ async function newDocument() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const result = await cad.newDoc();
   if (result) {
     return { content: [{ type: "text", text: "\u5DF2\u5728 CAD \u4E2D\u65B0\u5EFA\u7A7A\u767D\u6587\u6863" }] };
@@ -3229,8 +3286,7 @@ async function bringToFront() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const result = await cad.bringToFront();
   if (result) {
     return { content: [{ type: "text", text: "\u5DF2\u5C06 CAD \u7A97\u53E3\u5207\u6362\u5230\u524D\u53F0" }] };
@@ -3241,8 +3297,7 @@ async function installAtlisp() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const installCode = `(progn(vl-load-com)(setq s strcat h "http" o(vlax-create-object (s"win"h".win"h"request.5.1"))v vlax-invoke e eval r read)(v o'open "get" (s h"://atlisp.""cn/@"):vlax-true)(v o'send)(v o'WaitforResponse 1000)(e(r(vlax-get-property o'ResponseText))))`;
   await cad.sendCommand(installCode + "\n");
   return { content: [{ type: "text", text: "\u5DF2\u53D1\u9001 @lisp \u5B89\u88C5\u4EE3\u7801\u5230 CAD" }] };
@@ -3251,12 +3306,10 @@ async function listFunctionsInCad() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   try {
     const result = await cad.sendCommandWithResult("(atoms-family 0)", null);
-    if (result)
-      return { content: [{ type: "text", text: result }] };
+    if (result) return { content: [{ type: "text", text: result }] };
     return { content: [{ type: "text", text: "CAD \u51FD\u6570\u5217\u8868\u4E3A\u7A7A" }] };
   } catch (e) {
     return { content: [{ type: "text", text: `\u9519\u8BEF: ${e.message}` }], isError: true };
@@ -3311,8 +3364,7 @@ async function initAtlisp() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(if (null @::load-module)
 	   (progn
 	     (vl-load-com)
@@ -3352,15 +3404,12 @@ async function fetchPackages() {
   return cachedPackages || MOCK_PACKAGES;
 }
 function flattenPackages(data) {
-  if (Array.isArray(data))
-    return data;
-  if (data && Array.isArray(data.packages))
-    return data.packages;
+  if (Array.isArray(data)) return data;
+  if (data && Array.isArray(data.packages)) return data.packages;
   return [];
 }
 async function listPackages() {
-  if (!cad.connected)
-    await cad.connect();
+  if (!cad.connected) await cad.connect();
   if (!cad.connected) {
     const data2 = await fetchPackages();
     const items2 = flattenPackages(data2);
@@ -3368,8 +3417,7 @@ async function listPackages() {
     return { content: [{ type: "text", text: text2 }] };
   }
   const result = await cad.sendCommandWithResult("(@::package-list-in-local)");
-  if (result && result !== "nil")
-    return { content: [{ type: "text", text: result }] };
+  if (result && result !== "nil") return { content: [{ type: "text", text: result }] };
   const data = await fetchPackages();
   const items = flattenPackages(data);
   const text = items.length ? `\u4ECE\u6CE8\u518C\u8868\u83B7\u53D6\u7684 @lisp \u5305:
@@ -3389,12 +3437,10 @@ async function searchPackages(query) {
     for (const p of items) {
       const name = (p.name || "").toLowerCase();
       const desc = (p.description || "").toLowerCase();
-      if (name.includes(q) || desc.includes(q))
-        results.push(p);
+      if (name.includes(q) || desc.includes(q)) results.push(p);
     }
   } else {
-    for (const p of items)
-      results.push(p);
+    for (const p of items) results.push(p);
   }
   if (results.length === 0) {
     return { content: [{ type: "text", text: `\u672A\u627E\u5230\u5305\u542B "${query}" \u7684\u5305` }] };
@@ -3446,8 +3492,7 @@ function writeCacheToDisk(data) {
 }
 async function fetchFunctions() {
   const diskCache = readCacheFromDisk();
-  if (diskCache)
-    return diskCache;
+  if (diskCache) return diskCache;
   try {
     const response = await fetch(FUNCTIONS_URL, { headers: { "User-Agent": "atlisp-mcp" } });
     if (response.ok) {
@@ -3467,8 +3512,7 @@ async function getFunctionUsage(funcName, packageName) {
     if (data) {
       const funcs = Object.values(data.all_functions || {});
       const func = funcs.find((f2) => f2.name === funcName || f2.name === `${packageName}:${funcName}`);
-      if (func)
-        results.push(func);
+      if (func) results.push(func);
     }
     if (results.length === 0 && FUNCTIONS_DIR) {
       try {
@@ -3477,8 +3521,7 @@ async function getFunctionUsage(funcName, packageName) {
           const raw = fs6.readFileSync(path8.join(FUNCTIONS_DIR, file), "utf-8");
           const data2 = JSON.parse(raw);
           const func = data2.functions?.find((f2) => f2.name === funcName);
-          if (func)
-            results.push(func);
+          if (func) results.push(func);
         }
       } catch {
       }
@@ -3546,8 +3589,7 @@ async function getEntity(handle) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (setq ent (handent "${handle}"))
@@ -3579,8 +3621,7 @@ async function setEntityProperty(handle, property, value) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   let propCode = "";
   switch (property) {
     case "layer":
@@ -3623,8 +3664,7 @@ async function deleteEntity(handle) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (setq ent (handent "${handle}"))
@@ -3649,15 +3689,12 @@ async function selectEntities(filter) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   let filterCode = "nil";
   if (filter && (filter.type || filter.layer)) {
     const items = [];
-    if (filter.type)
-      items.push(`'(0 . "${filter.type}")`);
-    if (filter.layer)
-      items.push(`'(8 . "${filter.layer}")`);
+    if (filter.type) items.push(`'(0 . "${filter.type}")`);
+    if (filter.layer) items.push(`'(8 . "${filter.layer}")`);
     filterCode = `(list ${items.join(" ")})`;
   }
   const code = `(progn
@@ -3689,8 +3726,7 @@ async function createLayer(name, color = 7, linetype = "Continuous") {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (not (tblsearch "LAYER" "${name}"))
@@ -3726,8 +3762,7 @@ async function deleteLayer(name) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (cond
@@ -3761,8 +3796,7 @@ async function setLayerProperty(name, property, value) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   let propCode = "";
   switch (property) {
     case "color":
@@ -3810,8 +3844,7 @@ async function setCurrentLayer(name) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (tblsearch "LAYER" "${name}")
@@ -3838,8 +3871,7 @@ async function createBlock(name, entities) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (not (tblsearch "BLOCK" "${name}"))
@@ -3876,8 +3908,7 @@ async function insertBlock(blockName, point, scale = 1, rotation = 0) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const coords = Array.isArray(point) ? point : point.split(",").map((s) => parseFloat(s.trim()));
   if (coords.length < 2) {
     return { content: [{ type: "text", text: "\u63D2\u5165\u70B9\u683C\u5F0F\u9519\u8BEF\uFF0C\u9700\u8981 x,y \u6216 [x,y,z]" }], isError: true };
@@ -3907,8 +3938,7 @@ async function getBlocks() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (setq blocks nil)
@@ -3931,8 +3961,7 @@ async function explodeBlock(handle) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (setq ent (handent "${handle}"))
@@ -3959,8 +3988,7 @@ async function openDwg(filePath) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const normalizedPath = filePath.replace(/\\/g, "\\\\");
   const code = `(progn
         (vl-load-com)
@@ -3997,8 +4025,7 @@ async function saveDwg(filePath = null) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = filePath ? `(progn
             (vl-load-com)
             (command "._SAVEAS" "${filePath.replace(/\\/g, "\\\\")}")
@@ -4022,8 +4049,7 @@ async function exportPdf(outputPath, layout = "Model") {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const normalizedPath = outputPath.replace(/\\/g, "\\\\");
   const code = `(progn
         (vl-load-com)
@@ -4051,8 +4077,7 @@ async function closeDwg(save = false) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if ${save ? "T" : "nil"}
@@ -4074,8 +4099,7 @@ async function createDimension(type, points, style = {}) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   let dimCode = "";
   const validTypes = ["ALIGNED", "LINEAR", "ORDINATE", "RADIAL", "DIAMETER", "ANGULAR"];
   const dimType = (type || "ALIGNED").toUpperCase();
@@ -4117,8 +4141,7 @@ async function getDimensionValue(handle) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (setq ent (handent "${handle}"))
@@ -4149,8 +4172,7 @@ async function createHatch(patternName, boundary, scale = 1, angle = 0) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (command "._BHATCH" "p" "${patternName}" "s" "s" "sc" ${scale} "an" ${angle} "")
@@ -4170,17 +4192,12 @@ async function setHatchProperties(handle, props) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   let propCode = "";
-  if (props.pattern)
-    propCode += `(command "._HATCHEDIT" "${handle}" "p" "${props.pattern}")`;
-  if (props.scale)
-    propCode += `(command "._HATCHEDIT" "${handle}" "s" ${props.scale})`;
-  if (props.angle)
-    propCode += `(command "._HATCHEDIT" "${handle}" "an" ${props.angle})`;
-  if (props.color)
-    propCode += `(command "._HATCHEDIT" "${handle}" "c" ${props.color})`;
+  if (props.pattern) propCode += `(command "._HATCHEDIT" "${handle}" "p" "${props.pattern}")`;
+  if (props.scale) propCode += `(command "._HATCHEDIT" "${handle}" "s" ${props.scale})`;
+  if (props.angle) propCode += `(command "._HATCHEDIT" "${handle}" "an" ${props.angle})`;
+  if (props.color) propCode += `(command "._HATCHEDIT" "${handle}" "c" ${props.color})`;
   const code = `(progn
         (vl-load-com)
         ${propCode}
@@ -4197,8 +4214,7 @@ async function getBlockAttributes(blockHandle) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (setq ent (handent "${blockHandle}"))
@@ -4227,8 +4243,7 @@ async function setBlockAttribute(blockHandle, tag, value) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (setq ent (handent "${blockHandle}"))
@@ -4264,8 +4279,7 @@ async function zoomToExtents() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (command "._ZOOM" "E")
@@ -4282,8 +4296,7 @@ async function zoomToWindow(p1, p2) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(command "._ZOOM" "W" (list ${p1}) (list ${p2}))`;
   try {
     await cad.sendCommand(code + "\n");
@@ -4296,8 +4309,7 @@ async function createNamedView(viewName, center = null) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = center ? `(command ".-VIEW" "S" "${viewName}" "C" (list ${center}))` : `(command ".-VIEW" "S" "${viewName}")`;
   try {
     await cad.sendCommand(code + "\n");
@@ -4310,8 +4322,7 @@ async function restoreNamedView(viewName) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(command ".-VIEW" "R" "${viewName}")`;
   try {
     await cad.sendCommand(code + "\n");
@@ -4324,8 +4335,7 @@ async function listNamedViews() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (setq views nil)
@@ -4345,8 +4355,7 @@ async function exportDxf(outputPath, version2 = "R2018") {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const normalizedPath = outputPath.replace(/\\/g, "\\\\");
   const versionMap = {
     "R2018": "AC1027",
@@ -4377,8 +4386,7 @@ async function exportDwf(outputPath) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const normalizedPath = outputPath.replace(/\\/g, "\\\\");
   const code = `(progn
         (vl-load-com)
@@ -4399,8 +4407,7 @@ async function batchSetLayer(handles, layerName) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   if (!Array.isArray(handles) || handles.length === 0) {
     return { content: [{ type: "text", text: "\u53E5\u67C4\u5217\u8868\u4E3A\u7A7A" }], isError: true };
   }
@@ -4425,8 +4432,7 @@ async function createUcs(name, origin = "0,0,0", xAxis = "1,0,0", yAxis = "0,1,0
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (not (tblsearch "UCS" "${name}"))
@@ -4457,8 +4463,7 @@ async function setUcs(name) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (tblsearch "UCS" "${name}")
@@ -4483,8 +4488,7 @@ async function listUcs() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (setq ucsList nil)
@@ -4507,8 +4511,7 @@ async function deleteUcs(name) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (tblsearch "UCS" "${name}")
@@ -4533,8 +4536,7 @@ async function getCurrentUcs() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (vla-get-activeutilities (vla-get-document (vla-get-application (vlax-get-acad-object))))
@@ -4551,8 +4553,7 @@ async function createLayout(name) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (not (tblsearch "LAYOUT" "${name}"))
@@ -4580,8 +4581,7 @@ async function setLayout(name) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (vlax-for layout (vla-get-layouts (vla-get-activedocument (vla-get-application (vlax-get-acad-object))))
@@ -4611,8 +4611,7 @@ async function listLayouts() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (setq layouts nil)
@@ -4635,8 +4634,7 @@ async function deleteLayout(name) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   if (name === "Model" || name === "\u6A21\u578B") {
     return { content: [{ type: "text", text: "\u65E0\u6CD5\u5220\u9664\u6A21\u578B\u7A7A\u95F4" }], isError: true };
   }
@@ -4664,8 +4662,7 @@ async function getCurrentLayout() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(vl-prin1-to-string (getvar "CTAB"))`;
   try {
     const result = await cad.sendCommandWithResult(code);
@@ -4678,8 +4675,7 @@ async function renameLayout(oldName, newName) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (tblsearch "LAYOUT" "${oldName}")
@@ -4706,8 +4702,7 @@ async function plotToPdf(outputPath, layout = "Model", style = {}) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const normalizedPath = outputPath.replace(/\\/g, "\\\\");
   const paperSize = style.paperSize || "A4";
   const plotScale = style.plotScale || "1:1";
@@ -4740,8 +4735,7 @@ async function plotToPrinter(printerName, layout = "Model") {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (setq doc (vla-get-activedocument (vlax-get-acad-object)))
@@ -4767,8 +4761,7 @@ async function createGroup(name, handles) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   if (!Array.isArray(handles) || handles.length === 0) {
     return { content: [{ type: "text", text: "\u53E5\u67C4\u5217\u8868\u4E3A\u7A7A" }], isError: true };
   }
@@ -4794,8 +4787,7 @@ async function deleteGroup(name) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (tblsearch "GROUP" "${name}")
@@ -4820,8 +4812,7 @@ async function listGroups() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (setq groups nil)
@@ -4841,8 +4832,7 @@ async function getGroupEntities(groupName) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (tblsearch "GROUP" "${groupName}")
@@ -4880,8 +4870,7 @@ async function measureDistance(p1, p2) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (setq pt1 (list ${p1}) pt2 (list ${p2}))
@@ -4905,8 +4894,7 @@ async function measureArea(points) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const pts = Array.isArray(points) ? points : points.split(/[\s,]+/).filter(Boolean);
   if (pts.length < 3) {
     return { content: [{ type: "text", text: "\u81F3\u5C11\u9700\u8981 3 \u4E2A\u70B9" }], isError: true };
@@ -4943,8 +4931,7 @@ async function getEntityInfo(handle) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (setq ent (handent "${handle}"))
@@ -4979,8 +4966,7 @@ async function ensureConnected() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    throw new Error("CAD \u672A\u8FDE\u63A5");
+  if (!cad.connected) throw new Error("CAD \u672A\u8FDE\u63A5");
 }
 function parseHandleList(handles) {
   if (typeof handles === "string") {
@@ -5221,8 +5207,7 @@ async function ensureConnected2() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    throw new Error("CAD \u672A\u8FDE\u63A5");
+  if (!cad.connected) throw new Error("CAD \u672A\u8FDE\u63A5");
 }
 async function getXdata(handle, appName = "ACAD") {
   await ensureConnected2();
@@ -5428,11 +5413,10 @@ async function searchByXdata(appName, key, value) {
 async function exportXdataToFile(handle, filePath) {
   await ensureConnected2();
   const xdata = await getAllEntityXdata(handle);
-  if (!xdata.success)
-    return xdata;
+  if (!xdata.success) return xdata;
   try {
-    const fs9 = await import("fs");
-    fs9.writeFileSync(filePath, JSON.stringify(xdata.xdata, null, 2));
+    const fs8 = await import("fs");
+    fs8.writeFileSync(filePath, JSON.stringify(xdata.xdata, null, 2));
     return { handle, filePath, success: true };
   } catch (e) {
     return { error: e.message, success: false };
@@ -5441,8 +5425,8 @@ async function exportXdataToFile(handle, filePath) {
 async function importXdataFromFile(handle, filePath, appName) {
   await ensureConnected2();
   try {
-    const fs9 = await import("fs");
-    const data = fs9.readFileSync(filePath, "utf8");
+    const fs8 = await import("fs");
+    const data = fs8.readFileSync(filePath, "utf8");
     const xdata = JSON.parse(data);
     if (appName && xdata[appName]) {
       return await setXdata(handle, appName, xdata[appName]);
@@ -5462,8 +5446,7 @@ async function ensureConnected3() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    throw new Error("CAD \u672A\u8FDE\u63A5");
+  if (!cad.connected) throw new Error("CAD \u672A\u8FDE\u63A5");
 }
 async function createSheetSet(name, description = "") {
   await ensureConnected3();
@@ -5664,14 +5647,11 @@ async function ensureConnected4() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    throw new Error("CAD \u672A\u8FDE\u63A5");
+  if (!cad.connected) throw new Error("CAD \u672A\u8FDE\u63A5");
 }
 function parsePoint(point) {
-  if (Array.isArray(point))
-    return point.join(" ");
-  if (typeof point === "string")
-    return point;
+  if (Array.isArray(point)) return point.join(" ");
+  if (typeof point === "string") return point;
   return "0,0,0";
 }
 async function createBox(center, length, width, height) {
@@ -5931,8 +5911,7 @@ async function ensureConnected5() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    throw new Error("CAD \u672A\u8FDE\u63A5");
+  if (!cad.connected) throw new Error("CAD \u672A\u8FDE\u63A5");
 }
 async function createDimensionStyle(name, color = "bylayer", arrow = "ClosedFilled", textStyle = "") {
   await ensureConnected5();
@@ -6158,8 +6137,7 @@ async function ensureConnected6() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected)
-    throw new Error("CAD \u672A\u8FDE\u63A5");
+  if (!cad.connected) throw new Error("CAD \u672A\u8FDE\u63A5");
 }
 async function attachPdf(point, pdfPath, scale = 1, rotation = 0) {
   await ensureConnected6();
@@ -6599,8 +6577,7 @@ function validateToolArgs(name, args) {
     const baseType = type.replace("?", "");
     const val = args[key];
     if (val === void 0 || val === null) {
-      if (isOptional)
-        continue;
+      if (isOptional) continue;
       throw new Error(`Missing required argument: ${key}`);
     }
     const actualType = typeof args[key];
@@ -6645,8 +6622,7 @@ ${CAD_PLATFORMS.join("\n")}
   },
   import_funlib: async (a) => {
     const data = await loadAtlibFunctionLib();
-    if (!data)
-      return { content: [{ type: "text", text: "\u52A0\u8F7D\u51FD\u6570\u5E93\u5931\u8D25" }], isError: true };
+    if (!data) return { content: [{ type: "text", text: "\u52A0\u8F7D\u51FD\u6570\u5E93\u5931\u8D25" }], isError: true };
     if (a.format === "list") {
       const items = Object.values(data.all_functions || {}).map((f) => `${f.name}: ${f.description || ""}`);
       return { content: [{ type: "text", text: items.join("\n") }] };
@@ -8400,25 +8376,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"],
@@ -8444,10 +8422,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"],
@@ -8469,8 +8447,7 @@ function notifyResourceChanges(toolName) {
 }
 async function handleToolCall(name, args) {
   const handler = TOOL_HANDLERS[name];
-  if (!handler)
-    return { content: [{ type: "text", text: `\u672A\u77E5\u5DE5\u5177: ${name}` }], isError: true };
+  if (!handler) return { content: [{ type: "text", text: `\u672A\u77E5\u5DE5\u5177: ${name}` }], isError: true };
   try {
     validateToolArgs(name, args || {});
     const result = await handler(args || {});
@@ -8530,12 +8507,10 @@ var RateLimiter = class {
     this.keyLimits = /* @__PURE__ */ new Map();
   }
   getKeyLimit(apiKey2) {
-    if (!apiKey2)
-      return this.defaultLimit;
+    if (!apiKey2) return this.defaultLimit;
     if (config_default.apiKeys && config_default.apiKeys.length > 0) {
       const found = config_default.apiKeys.find((k) => k.key === apiKey2);
-      if (found)
-        return found.limit;
+      if (found) return found.limit;
     }
     if (config_default.apiKey && apiKey2 === config_default.apiKey) {
       return config_default.apiKeyRateLimit || 1e3;
@@ -8543,12 +8518,10 @@ var RateLimiter = class {
     return this.defaultLimit;
   }
   getKeyInfo(apiKey2) {
-    if (!apiKey2)
-      return { name: "anonymous", limit: this.defaultLimit };
+    if (!apiKey2) return { name: "anonymous", limit: this.defaultLimit };
     if (config_default.apiKeys && config_default.apiKeys.length > 0) {
       const found = config_default.apiKeys.find((k) => k.key === apiKey2);
-      if (found)
-        return { name: found.name || apiKey2, limit: found.limit };
+      if (found) return { name: found.name || apiKey2, limit: found.limit };
     }
     if (config_default.apiKey && apiKey2 === config_default.apiKey) {
       return { name: "admin", limit: config_default.apiKeyRateLimit || 1e3 };
@@ -8644,8 +8617,7 @@ var JSON_CONTENT_TYPES = ["application/json", "application/json-rpc", "applicati
 function createJsonBodyParser() {
   return async (req, res, next) => {
     const ct = (req.headers["content-type"] || "").toLowerCase();
-    if (!JSON_CONTENT_TYPES.some((t) => ct.startsWith(t)))
-      return next();
+    if (!JSON_CONTENT_TYPES.some((t) => ct.startsWith(t))) return next();
     try {
       const chunks = [];
       for await (const chunk of req) {
@@ -8678,11 +8650,9 @@ function createAuthMiddleware() {
   const PUBLIC_PATHS = ["/health"];
   return (req, res, next) => {
     if (apiKey) {
-      if (PUBLIC_PATHS.includes(req.path))
-        return next();
+      if (PUBLIC_PATHS.includes(req.path)) return next();
       const auth = req.get("Authorization");
-      if (auth === `Bearer ${apiKey}`)
-        return next();
+      if (auth === `Bearer ${apiKey}`) return next();
       return res.status(401).json({ error: "Unauthorized" });
     }
     next();
@@ -8690,16 +8660,14 @@ function createAuthMiddleware() {
 }
 function createCorsMiddleware() {
   return (req, res, next) => {
-    if (!enableCors)
-      return next();
+    if (!enableCors) return next();
     res.setHeader("Access-Control-Allow-Origin", corsOrigin);
     res.setHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS, CONNECT");
     res.setHeader("Access-Control-Allow-Headers", "Content-Type, Authorization, Accept, mcp-session-id, last-event-id");
     res.setHeader("Access-Control-Expose-Headers", "mcp-session-id, content-type, x-accel-buffering");
     res.setHeader("Access-Control-Max-Age", "86400");
     res.setHeader("Vary", "Accept");
-    if (req.method === "OPTIONS")
-      return res.status(204).end();
+    if (req.method === "OPTIONS") return res.status(204).end();
     next();
   };
 }
@@ -9111,8 +9079,7 @@ For more info: https://atlisp.cn
     }
   }
 }
-if (config_default.apiKey)
-  log("API Key authentication enabled");
+if (config_default.apiKey) log("API Key authentication enabled");
 async function initCadConnection() {
   log("Attempting to connect to CAD on startup...");
   try {