npm - @atlisp/mcp - Versions diffs - 1.6.9 → 1.6.10 - Mend

@atlisp/mcp 1.6.9 → 1.6.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/atlisp-mcp.js CHANGED Viewed

@@ -2,6 +2,7 @@
 // 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";
@@ -22,7 +23,7 @@ var FILE_EXTENSIONS = {
   "BricsCAD": [".des"]
 };
 var SERVER_NAME = "atlisp-mcp-server";
-var SERVER_VERSION = "1.6.4";
+var SERVER_VERSION = "1.6.7";
 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" },
@@ -115,7 +116,8 @@ 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);
@@ -136,7 +138,7 @@ if (!envResult.success) {
   process.exit(1);
 }
 var env = envResult.data;
-var configFilePath = env.CONFIG_FILE || cliArgs.configFile || path.join(os.homedir(), "@lisp", "atlisp.config.json");
+var configFilePath = env.CONFIG_FILE || cliArgs.configFile || path.join(os.homedir(), ".atlisp", "atlisp.config.json");
 var fileConfig = loadConfigFile(configFilePath);
 var config = {
   port: fileConfig?.port || parseInt(env.PORT || cliArgs.port, 10),
@@ -253,7 +255,8 @@ 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;
@@ -279,7 +282,8 @@ 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"]
     });
@@ -287,7 +291,8 @@ 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);
@@ -308,7 +313,8 @@ 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" });
@@ -353,7 +359,8 @@ 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);
@@ -370,13 +377,16 @@ 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 || "";
@@ -390,7 +400,8 @@ 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;
@@ -399,7 +410,8 @@ 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 };
@@ -408,7 +420,8 @@ 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;
@@ -417,7 +430,8 @@ 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;
@@ -426,7 +440,8 @@ 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() {
@@ -463,9 +478,11 @@ 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;
@@ -529,9 +546,11 @@ 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}`;
@@ -549,7 +568,8 @@ function rotateRequestLog() {
   }
 }
 function logRequest(req) {
-  if (!config_default.requestLogEnabled) return;
+  if (!config_default.requestLogEnabled)
+    return;
   try {
     ensureRequestLogDir();
     rotateRequestLog();
@@ -566,7 +586,8 @@ function logRequest(req) {
   }
 }
 function logResponse(req, res, duration) {
-  if (!config_default.requestLogEnabled) return;
+  if (!config_default.requestLogEnabled)
+    return;
   try {
     ensureRequestLogDir();
     const entry = {
@@ -664,11 +685,14 @@ 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 = "";
@@ -710,32 +734,44 @@ 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();
@@ -748,11 +784,16 @@ 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];
       }
@@ -763,12 +804,16 @@ 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() {
@@ -776,13 +821,15 @@ 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++;
@@ -805,7 +852,8 @@ 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];
@@ -817,7 +865,8 @@ function lispPairsToObject(pairs) {
   return obj;
 }
 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) {
@@ -828,8 +877,10 @@ 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) {
@@ -860,8 +911,8 @@ var RESOURCES = [
   { 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://dwg/block-refs", name: "Block References", description: "\u5757\u53C2\u7167\u5217\u8868\u53CA\u5C5E\u6027\u503C\u3001\u52A8\u6001\u5757\u7279\u6027\uFF0C\u652F\u6301\u8DEF\u5F84\u65B9\u5F0F atlisp://dwg/block-refs/{blockName}", mimeType: "application/json", subscribable: true },
+  { uri: "atlisp://dwg/tbl", name: "Tables", description: "CAD \u8868\u6570\u636E (layer, block, textstyle, dimstyle, linetype, ucs, view, viewport, regapp)\uFF0C\u652F\u6301\u8DEF\u5F84\u65B9\u5F0F atlisp://dwg/tbl/layer", mimeType: "application/json", subscribable: true },
   { uri: "atlisp://cad/dwgs", name: "DWG List", description: "\u6240\u6709\u6253\u5F00\u7684 DWG \u6587\u4EF6\u5217\u8868", mimeType: "application/json", subscribable: true },
   { uri: "atlisp://packages", name: "Packages", description: "\u5DF2\u5B89\u88C5\u5305\u5217\u8868", mimeType: "application/json", subscribable: true },
   { uri: "atlisp://platforms", name: "Platforms", description: "\u652F\u6301\u7684\u5E73\u53F0\u4FE1\u606F", mimeType: "application/json", subscribable: false },
@@ -870,20 +921,29 @@ 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] };
+  const entityMatch = uri.match(/^atlisp:\/\/dwg\/entity\/([^?]+)$/);
+  if (entityMatch)
+    return { type: "entity", handle: entityMatch[1] };
+  const tblMatch = uri.match(/^atlisp:\/\/dwg\/tbl\/([^?]+)$/);
+  if (tblMatch)
+    return { type: "tbl", tblName: tblMatch[1] };
+  const blockRefMatch = uri.match(/^atlisp:\/\/dwg\/block-refs\/([^?]+)$/);
+  if (blockRefMatch)
+    return { type: "block-refs", blockName: blockRefMatch[1] };
   return null;
 }
 async function listResources(subscribedUris = []) {
@@ -897,8 +957,16 @@ async function listResources(subscribedUris = []) {
 }
 async function readResource(uri) {
   const templateMatch = parseTemplateUri(uri);
-  if (templateMatch && templateMatch.type === "entity") {
-    return await getEntityByHandle(templateMatch.handle);
+  if (templateMatch) {
+    if (templateMatch.type === "entity") {
+      return await getEntityByHandle(templateMatch.handle);
+    }
+    if (templateMatch.type === "tbl") {
+      return await getTables({ tbl: templateMatch.tblName });
+    }
+    if (templateMatch.type === "block-refs") {
+      return await getBlockRefs({ blockName: templateMatch.blockName });
+    }
   }
   const { base, params } = parseQuery(uri);
   switch (base) {
@@ -931,8 +999,10 @@ 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}"))
@@ -952,7 +1022,8 @@ 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 {
@@ -964,7 +1035,8 @@ 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();
   }
@@ -991,8 +1063,10 @@ async function getCadInfo() {
 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);
@@ -1093,7 +1167,8 @@ async function getEntitiesSummary(cacheKey) {
 }
 function buildTextContentCode({ layer, bbox, offset, limit }) {
   const items = [`'(0 . "TEXT,MTEXT,ATTRIB,TCH_TEXT")`];
-  if (layer) items.push(`(cons 8 "${layer.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) {
@@ -1122,8 +1197,10 @@ function buildTextContentCode({ layer, bbox, offset, limit }) {
 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, offset: 0, limit: 5e3, texts: [] };
     setCache(cacheKey, result);
@@ -1148,11 +1225,13 @@ async function getTextContent(params = {}) {
     const data = lispPairsToObject(parsed);
     const rawTexts = Array.isArray(data.texts) ? data.texts : [];
     data.texts = rawTexts.map((item) => {
-      if (!Array.isArray(item)) return null;
+      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] || "");
+          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);
           }
@@ -1170,8 +1249,10 @@ async function getTextContent(params = {}) {
   }
 }
 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);
@@ -1181,8 +1262,10 @@ 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")))
@@ -1200,7 +1283,8 @@ 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]) };
@@ -1287,8 +1371,10 @@ function buildBlockRefsCode(filterBlockName) {
 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 (cached)
+    return cached;
+  if (!cad.connected)
+    await cad.connect();
   if (!cad.connected) {
     const result = { total: 0, blockRefs: [] };
     setCache(cacheKey, result);
@@ -1342,76 +1428,93 @@ async function getBlockRefs(params = {}) {
     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"] }
+var TBL_QUERIES = {
+  layer: { name: "layer", lisp: `(progn
+(setq @d nil)
+(vlax-for e (vla-get-layers (vla-get-activedocument (vlax-get-acad-object)))
+  (setq @d (cons (list
+    (cons 2 (vla-get-name e))
+    (cons 62 (vla-get-color e))
+    (cons 6 (vla-get-linetype e))
+    (cons 70 (logior (if (vla-get-freeze e) 1 0) (if (vla-get-lock e) 4 0)))
+    (cons 60 (if (vla-get-layeron e) 0 1))
+  ) @d)))
+(list (cons 'table 'layer) (cons 'total (length @d)) (cons 'data (list (reverse @d)))))` },
+  block: { name: "block", lisp: `(progn
+(setq @d nil)
+(vlax-for e (vla-get-blocks (vla-get-activedocument (vlax-get-acad-object)))
+  (if (not (and (vlax-property-available-p e 'isfoundation) (vlax-get e 'isfoundation)))
+    (setq @d (cons (list (cons 2 (vla-get-name e)) (cons 70 (if (and (vlax-property-available-p e 'isxref) (vlax-get e 'isxref)) 1 0))) @d))))
+(list (cons 'table 'block) (cons 'total (length @d)) (cons 'data (list (reverse @d)))))` },
+  style: { name: "style", lisp: `(progn
+(setq @d nil)
+(vlax-for e (vla-get-textstyles (vla-get-activedocument (vlax-get-acad-object)))
+  (setq @d (cons (list (cons 2 (vla-get-name e)) (cons 70 0)) @d)))
+(list (cons 'table 'style) (cons 'total (length @d)) (cons 'data (list (reverse @d)))))` },
+  dimstyle: { name: "dimstyle", lisp: `(progn
+(setq @d nil)
+(vlax-for e (vla-get-dimstyles (vla-get-activedocument (vlax-get-acad-object)))
+  (setq @d (cons (list (cons 2 (vla-get-name e)) (cons 70 0)) @d)))
+(list (cons 'table 'dimstyle) (cons 'total (length @d)) (cons 'data (list (reverse @d)))))` },
+  ltype: { name: "linetype", lisp: `(progn
+(setq @d nil)
+(vlax-for e (vla-get-linetypes (vla-get-activedocument (vlax-get-acad-object)))
+  (setq @d (cons (list (cons 2 (vla-get-name e)) (cons 70 0)) @d)))
+(list (cons 'table 'linetype) (cons 'total (length @d)) (cons 'data (list (reverse @d)))))` }
 };
 function buildTablesCode(tblName) {
-  const 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)))
-`;
+  const key = tblName.toLowerCase();
+  const query = TBL_QUERIES[key];
+  if (query) {
+    return `(progn (vl-load-com) ${query.lisp})`;
+  }
+  const parts = Object.values(TBL_QUERIES).map((q) => q.lisp);
+  return `(progn (vl-load-com) (list ${parts.join(" ")}))`;
 }
 function parseTableRecord(rec) {
-  if (!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 (!rec || !Array.isArray(rec))
+    return null;
+  const obj = {};
+  for (const pair of rec) {
     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;
+      const key = String(pair[0]);
+      const val = pair[1];
+      if (key === "2")
+        obj.name = String(val);
+      else if (key === "62")
+        obj.color = typeof val === "number" ? val : 7;
+      else if (key === "6")
+        obj.linetype = String(val);
+      else if (key === "70") {
+        obj.flags = typeof val === "number" ? val : 0;
+        obj.frozen = (val & 1) !== 0;
+        obj.locked = (val & 4) !== 0;
+      } else if (key === "60")
+        obj.on = val === 0;
+      else if (key === "1")
+        obj.font = String(val);
+      else if (key === "40")
+        obj.height = typeof val === "number" ? val : 0;
+      else if (key === "41")
+        obj.width = typeof val === "number" ? val : 1;
+      else if (key === "42")
+        obj.oblique = typeof val === "number" ? val : 0;
+      else if (key === "3")
+        obj.description = String(val);
+    }
+  }
+  return obj.name ? obj : null;
 }
 async function getTables(params = {}) {
-  const tblName = params.tbl || "all";
+  const tblName = params.tbl || params.type || "all";
   const cacheKey = `dwg:tbl:${tblName}`;
   const cached = getCached(cacheKey);
-  if (cached) return cached;
-  if (!cad.connected) await cad.connect();
-  if (!cad.connected) return { table: tblName, data: [] };
+  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);
@@ -1422,27 +1525,73 @@ async function getTables(params = {}) {
     }
     const parsed = parseLispRecursive(resultStr);
     if (!parsed || !Array.isArray(parsed)) {
-      const result2 = { table: tblName, data: [] };
+      const result2 = { table: tblName, total: 0, 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] : [];
+    if (parsed.length >= 3 && parsed[0] && String(parsed[0][0]).toUpperCase() === "TABLE") {
+      const tableName = String(parsed[0][1]).toLowerCase();
+      let total = 0;
+      let tblData = [];
+      for (const item of parsed) {
+        if (Array.isArray(item) && item.length >= 2) {
+          const key = String(item[0]).toUpperCase();
+          if (key === "TOTAL")
+            total = typeof item[1] === "number" ? item[1] : 0;
+          else if (key === "DATA") {
+            if (Array.isArray(item[1]) && item[1].length > 0 && item[1][0].length > 0 && !isNaN(parseInt(item[1][0][0]))) {
+              tblData = item[1];
+            }
+          }
+        }
+      }
+      if (tblData.length === 0 && parsed.length > 2) {
+        tblData = parsed.slice(2);
+      }
       result = {
-        table: String(data),
+        table: tableName,
+        total,
         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);
+        if (!Array.isArray(item) || item.length < 2)
+          return;
+        let tableKey = null;
+        const entry = { total: 0, data: [] };
+        if (Array.isArray(item[0]) && item[0].length >= 2 && String(item[0][0]).toLowerCase() === "table") {
+          tableKey = String(item[0][1]).toLowerCase();
+          for (let i = 1; i < item.length; i++) {
+            const sub = item[i];
+            if (!Array.isArray(sub) || sub.length < 2)
+              continue;
+            const subKey = String(sub[0]).toUpperCase();
+            if (subKey === "TOTAL")
+              entry.total = typeof sub[1] === "number" ? sub[1] : 0;
+            else if (subKey === "DATA") {
+              const raw = Array.isArray(sub[1]) ? sub[1] : sub.slice(1);
+              entry.data = raw.map(parseTableRecord).filter(Boolean);
+            }
+          }
+        } else {
+          tableKey = String(item[0]).toLowerCase();
+          for (let i = 1; i < item.length; i++) {
+            const sub = item[i];
+            if (!Array.isArray(sub) || sub.length < 2)
+              continue;
+            const subKey = String(sub[0]).toUpperCase();
+            if (subKey === "TOTAL") {
+              entry.total = typeof sub[1] === "number" ? sub[1] : 0;
+            } else if (subKey === "DATA") {
+              const raw = Array.isArray(sub[1]) ? sub[1] : sub.slice(1);
+              entry.data = raw.map(parseTableRecord).filter(Boolean);
+            }
+          }
         }
+        if (tableKey)
+          allData[tableKey] = entry;
       });
       result = allData;
     }
@@ -1458,9 +1607,12 @@ async function getTables(params = {}) {
 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);
@@ -1474,7 +1626,8 @@ 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 };
@@ -1483,13 +1636,20 @@ 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;
@@ -1500,15 +1660,22 @@ 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;
@@ -1534,9 +1701,12 @@ 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)
@@ -1560,7 +1730,8 @@ 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]) };
@@ -1587,7 +1758,8 @@ 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;
 }
@@ -1596,16 +1768,20 @@ 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" };
 }
@@ -1820,9 +1996,11 @@ 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();
       }
@@ -1844,7 +2022,8 @@ 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);
@@ -1972,7 +2151,8 @@ 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) {
@@ -2132,7 +2312,8 @@ 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);
@@ -2141,7 +2322,8 @@ var SessionTransport = class {
     }
   }
   async close() {
-    if (this._closed) return;
+    if (this._closed)
+      return;
     this._closed = true;
     if (this._pendingRequest) {
       const { reject, timeout } = this._pendingRequest;
@@ -2453,10 +2635,14 @@ ${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) {
@@ -3001,7 +3187,8 @@ 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);
   }
@@ -3092,9 +3279,15 @@ var RESOURCE_TEMPLATES = [
     mimeType: "application/json"
   },
   {
-    uriTemplate: "atlisp://dwg/entities?type={type}",
-    name: "Entities by Type",
-    description: "\u6309\u7C7B\u578B\u67E5\u8BE2\u5B9E\u4F53\u5217\u8868",
+    uriTemplate: "atlisp://dwg/entities",
+    name: "Entities Summary",
+    description: "\u8FD4\u56DE\u56FE\u5143\u603B\u6570\u548C\u6309\u7C7B\u578B\u7EDF\u8BA1\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",
     mimeType: "application/json"
   },
   {
@@ -3104,13 +3297,13 @@ var RESOURCE_TEMPLATES = [
     mimeType: "application/json"
   },
   {
-    uriTemplate: "atlisp://dwg/block-refs?blockName={blockName}",
+    uriTemplate: "atlisp://dwg/block-refs/{blockName}",
     name: "Block References",
     description: "\u83B7\u53D6\u5757\u53C2\u7167\u5217\u8868\uFF0C\u652F\u6301\u6309\u5757\u540D\u8FC7\u6EE4",
     mimeType: "application/json"
   },
   {
-    uriTemplate: "atlisp://dwg/tbl?tbl={tbl}",
+    uriTemplate: "atlisp://dwg/tbl/{tbl}",
     name: "CAD Tables",
     description: "\u83B7\u53D6 CAD \u8868\u6570\u636E (layer, block, textstyle, dimstyle, linetype, ucs, view, regapp)",
     mimeType: "application/json"
@@ -3240,7 +3433,8 @@ 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);
@@ -3260,14 +3454,17 @@ 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" }] };
 }
@@ -3275,7 +3472,8 @@ 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" }] };
@@ -3286,7 +3484,8 @@ 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" }] };
@@ -3297,7 +3496,8 @@ 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" }] };
@@ -3306,10 +3506,12 @@ 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 };
@@ -3364,7 +3566,8 @@ 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)
@@ -3404,12 +3607,15 @@ 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);
@@ -3417,7 +3623,8 @@ 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:
@@ -3437,10 +3644,12 @@ 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` }] };
@@ -3492,7 +3701,8 @@ 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) {
@@ -3512,7 +3722,8 @@ 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 {
@@ -3521,7 +3732,8 @@ 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 {
       }
@@ -3589,7 +3801,8 @@ 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}"))
@@ -3621,7 +3834,8 @@ 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":
@@ -3664,7 +3878,8 @@ 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}"))
@@ -3689,12 +3904,15 @@ 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
@@ -3726,7 +3944,8 @@ 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}"))
@@ -3762,7 +3981,8 @@ 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
@@ -3796,7 +4016,8 @@ 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":
@@ -3844,7 +4065,8 @@ 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}")
@@ -3871,7 +4093,8 @@ 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}"))
@@ -3908,7 +4131,8 @@ 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 };
@@ -3938,7 +4162,8 @@ 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)
@@ -3961,7 +4186,8 @@ 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}"))
@@ -3988,7 +4214,8 @@ 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)
@@ -4025,7 +4252,8 @@ 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, "\\\\")}")
@@ -4049,7 +4277,8 @@ 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)
@@ -4077,7 +4306,8 @@ 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"}
@@ -4099,7 +4329,8 @@ 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();
@@ -4141,7 +4372,8 @@ 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}"))
@@ -4172,7 +4404,8 @@ 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} "")
@@ -4192,12 +4425,17 @@ 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}
@@ -4214,7 +4452,8 @@ 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}"))
@@ -4243,7 +4482,8 @@ 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}"))
@@ -4279,7 +4519,8 @@ 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")
@@ -4296,7 +4537,8 @@ 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");
@@ -4309,7 +4551,8 @@ 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");
@@ -4322,7 +4565,8 @@ 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");
@@ -4335,7 +4579,8 @@ 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)
@@ -4355,7 +4600,8 @@ 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",
@@ -4386,7 +4632,8 @@ 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)
@@ -4407,7 +4654,8 @@ 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 };
   }
@@ -4432,7 +4680,8 @@ 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}"))
@@ -4463,7 +4712,8 @@ 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}")
@@ -4488,7 +4738,8 @@ 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)
@@ -4511,7 +4762,8 @@ 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}")
@@ -4536,7 +4788,8 @@ 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))))
@@ -4553,7 +4806,8 @@ 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}"))
@@ -4581,7 +4835,8 @@ 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,7 +4866,8 @@ 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)
@@ -4634,7 +4890,8 @@ 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 };
   }
@@ -4662,7 +4919,8 @@ 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);
@@ -4675,7 +4933,8 @@ 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}")
@@ -4702,7 +4961,8 @@ 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";
@@ -4735,7 +4995,8 @@ 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)))
@@ -4761,7 +5022,8 @@ 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 };
   }
@@ -4787,7 +5049,8 @@ 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}")
@@ -4812,7 +5075,8 @@ 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)
@@ -4832,7 +5096,8 @@ 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}")
@@ -4870,7 +5135,8 @@ 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}))
@@ -4894,7 +5160,8 @@ 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 };
@@ -4931,7 +5198,8 @@ 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}"))
@@ -4966,7 +5234,8 @@ 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") {
@@ -5207,7 +5476,8 @@ 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();
@@ -5413,10 +5683,11 @@ 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 fs8 = await import("fs");
-    fs8.writeFileSync(filePath, JSON.stringify(xdata.xdata, null, 2));
+    const fs9 = await import("fs");
+    fs9.writeFileSync(filePath, JSON.stringify(xdata.xdata, null, 2));
     return { handle, filePath, success: true };
   } catch (e) {
     return { error: e.message, success: false };
@@ -5425,8 +5696,8 @@ async function exportXdataToFile(handle, filePath) {
 async function importXdataFromFile(handle, filePath, appName) {
   await ensureConnected2();
   try {
-    const fs8 = await import("fs");
-    const data = fs8.readFileSync(filePath, "utf8");
+    const fs9 = await import("fs");
+    const data = fs9.readFileSync(filePath, "utf8");
     const xdata = JSON.parse(data);
     if (appName && xdata[appName]) {
       return await setXdata(handle, appName, xdata[appName]);
@@ -5446,7 +5717,8 @@ 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();
@@ -5647,11 +5919,14 @@ 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) {
@@ -5911,7 +6186,8 @@ 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();
@@ -6137,7 +6413,8 @@ 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();
@@ -6577,7 +6854,8 @@ 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];
@@ -6622,7 +6900,8 @@ ${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") }] };
@@ -8447,7 +8726,8 @@ 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 || {});
@@ -8507,10 +8787,12 @@ 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;
@@ -8518,10 +8800,12 @@ 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 };
@@ -8617,7 +8901,8 @@ 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) {
@@ -8650,9 +8935,11 @@ 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();
@@ -8660,14 +8947,16 @@ 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();
   };
 }
@@ -9029,7 +9318,7 @@ Options:
   --port <port>         HTTP port (default: 8110)
   --host <host>         HTTP host (default: 0.0.0.0)
   --stdio                Shorthand for --transport stdio
-  --config <path>       Path to config file (default: ~/.@lisp/atlisp.config.json)
+  --config <path>       Path to config file (default: ~/.atlisp/atlisp.config.json)
   --debug               Enable debug mode
 Environment Variables:
@@ -9079,7 +9368,8 @@ 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 {