@atlisp/mcp 1.8.0 → 1.8.2

package/dist/atlisp-mcp.js

@@ -70,8 +70,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);
@@ -215,6 +214,7 @@ __export(cad_exports, {
   cad: () => cad,
   default: () => cad_default,
   getWorker: () => getWorker,
+  onDocumentChanged: () => onDocumentChanged,
   resetWorker: () => resetWorker,
   sendMessage: () => sendMessage
 });
@@ -222,6 +222,20 @@ import { spawn } from "child_process";
 import path2 from "path";
 import { fileURLToPath } from "url";
 import { randomUUID } from "crypto";
+function onDocumentChanged(callback) {
+  _docChangeCallbacks.push(callback);
+}
+function emitDocumentChanged(info) {
+  if (info.docName === _activeDocName) return;
+  _activeDocName = info.docName || "";
+  for (const cb of _docChangeCallbacks) {
+    try {
+      cb(info);
+    } catch (e) {
+      console.error("doc change callback error:", e.message);
+    }
+  }
+}
 function resetWorker() {
   for (const [id, { reject, timeout }] of pendingRequests) {
     clearTimeout(timeout);
@@ -271,8 +285,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;
@@ -285,6 +298,8 @@ function setupStdoutHandler(w) {
             } else {
               resolve(result);
             }
+          } else if (result.type === "event" && result.eventType === "documentChanged") {
+            emitDocumentChanged({ docName: result.docName, docPath: result.docPath });
           }
         } catch (parseErr) {
           console.error("JSON parse error in worker output:", parseErr.message);
@@ -298,8 +313,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"]
     });
@@ -307,8 +321,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);
@@ -329,14 +342,23 @@ 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" });
       if (!result?.pong) {
         console.error("heartbeat failed, worker may be dead");
         resetWorker();
+        return;
+      }
+      if (_platform) {
+        try {
+          const docResult = await sendMessage({ type: "getActiveDocInfo", platform: _platform });
+          if (docResult?.docName) {
+            emitDocumentChanged({ docName: docResult.docName, docPath: docResult.docPath || "" });
+          }
+        } catch (e) {
+        }
       }
     } catch (e) {
       console.error("heartbeat error:", e.message);
@@ -365,7 +387,7 @@ function sendMessage(msg) {
     }
   });
 }
-var MESSAGE_TIMEOUT, HEARTBEAT_INTERVAL, MAX_RESTART_ATTEMPTS, RESTART_BACKOFF_BASE, __dirname, workerPath, worker, _platform, heartbeatTimer, pendingRequests, stdoutHandlerSetup, MAX_BUFFER_SIZE, restartCount, restartTimer, PRIORITY_NORMAL, MAX_QUEUE_SIZE, CommandQueue, commandQueue, CadConnection, cad, cad_default;
+var MESSAGE_TIMEOUT, HEARTBEAT_INTERVAL, MAX_RESTART_ATTEMPTS, RESTART_BACKOFF_BASE, __dirname, workerPath, worker, _platform, heartbeatTimer, pendingRequests, stdoutHandlerSetup, MAX_BUFFER_SIZE, restartCount, restartTimer, PRIORITY_NORMAL, MAX_QUEUE_SIZE, _docChangeCallbacks, _activeDocName, _monitorStarted, CommandQueue, commandQueue, CadConnection, cad, cad_default;
 var init_cad = __esm({
   "src/cad.js"() {
     init_constants();
@@ -386,6 +408,9 @@ var init_cad = __esm({
     restartTimer = null;
     PRIORITY_NORMAL = 1;
     MAX_QUEUE_SIZE = 500;
+    _docChangeCallbacks = [];
+    _activeDocName = null;
+    _monitorStarted = false;
     CommandQueue = class {
       #queues = [[], [], []];
       #processing = false;
@@ -418,16 +443,13 @@ var init_cad = __esm({
         return null;
       }
       async _process() {
-        if (this.#processing)
-          return;
+        if (this.#processing) return;
         this.#processing = true;
         while (this._hasPending()) {
           const cmd = this._dequeue();
-          if (!cmd)
-            continue;
+          if (!cmd) continue;
           const dedupKey = this._dedupKey(cmd);
-          if (dedupKey)
-            this.#dedupMap.delete(dedupKey);
+          if (dedupKey) this.#dedupMap.delete(dedupKey);
           try {
             const result = await sendMessage(cmd);
             cmd.resolve(result);
@@ -442,8 +464,7 @@ var init_cad = __esm({
       }
       _dequeue() {
         for (const q of this.#queues) {
-          if (q.length > 0)
-            return q.shift();
+          if (q.length > 0) return q.shift();
         }
         return null;
       }
@@ -471,8 +492,7 @@ var init_cad = __esm({
         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);
@@ -481,6 +501,13 @@ var init_cad = __esm({
             this.product = result.platform;
             _platform = result.platform;
             this.connected = true;
+            _activeDocName = null;
+            if (!_monitorStarted) {
+              _monitorStarted = true;
+              sendMessage({ type: "startMonitor", platform: _platform }).catch(() => {
+                _monitorStarted = false;
+              });
+            }
             return true;
           }
         } catch (e) {
@@ -489,8 +516,7 @@ var init_cad = __esm({
         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");
         return new Promise((resolve, reject) => {
           commandQueue.enqueue({
             type: "send",
@@ -500,14 +526,12 @@ var init_cad = __esm({
             reject
           }, PRIORITY_NORMAL);
         }).then((result) => {
-          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");
         return new Promise((resolve, reject) => {
           commandQueue.enqueue({
             type: "sendResult",
@@ -518,8 +542,7 @@ var init_cad = __esm({
             reject
           }, PRIORITY_NORMAL);
         }).then((result) => {
-          if (result.success)
-            return result.result || "";
+          if (result.success) return result.result || "";
           throw new Error(result.error || "\u53D1\u9001\u5931\u8D25");
         });
       }
@@ -530,8 +553,7 @@ var init_cad = __esm({
         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;
@@ -540,8 +562,7 @@ var init_cad = __esm({
         }
       }
       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 };
@@ -550,8 +571,7 @@ var init_cad = __esm({
         }
       }
       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;
@@ -560,8 +580,7 @@ var init_cad = __esm({
         }
       }
       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;
@@ -569,9 +588,17 @@ var init_cad = __esm({
           return false;
         }
       }
+      async getActiveDocInfo() {
+        if (!this.connected) return { docName: "", docPath: "", docCount: 0 };
+        try {
+          const result = await sendMessage({ type: "getActiveDocInfo", platform: _platform });
+          return result || { docName: "", docPath: "", docCount: 0 };
+        } catch (e) {
+          return { docName: "", docPath: "", docCount: 0 };
+        }
+      }
       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() {
@@ -579,6 +606,8 @@ var init_cad = __esm({
         this.version = null;
         this.product = null;
         _platform = null;
+        _activeDocName = null;
+        _monitorStarted = false;
         commandQueue.clear();
         resetWorker();
       }
@@ -595,6 +624,8 @@ var init_cad = __esm({
         this.version = null;
         this.product = null;
         _platform = null;
+        _activeDocName = null;
+        _monitorStarted = false;
         commandQueue.clear();
         resetWorker();
       }
@@ -612,16 +643,14 @@ __export(renderer_exports, {
   renderTemplate: () => renderTemplate
 });
 function escapeLispString2(str) {
-  if (typeof str !== "string")
-    return "";
+  if (typeof str !== "string") return "";
   return str.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 }
 function resolvePath(obj, path12) {
   const parts = path12.split(/[.\[\]]/g).filter(Boolean);
   let val = obj;
   for (const p of parts) {
-    if (val == null)
-      return void 0;
+    if (val == null) return void 0;
     val = val[p];
   }
   return val;
@@ -630,11 +659,9 @@ function renderTemplate(template, args) {
   return template.replace(PARAM_RE, (match, rawExpr, expr) => {
     const path12 = rawExpr || expr;
     const val = resolvePath(args, path12);
-    if (val == null)
-      return "";
+    if (val == null) return "";
     const strVal = String(val);
-    if (rawExpr)
-      return strVal;
+    if (rawExpr) return strVal;
     return escapeLispString2(strVal);
   });
 }
@@ -693,9 +720,8 @@ import express2 from "express";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 
 // src/logger.js
-init_config();
 import fs2 from "fs";
-import fsp from "fs/promises";
+init_config();
 import path3 from "path";
 import os2 from "os";
 var DEBUG_FILE = config_default.debugFile || path3.join(os2.tmpdir(), "mcp-server-debug.log");
@@ -704,11 +730,9 @@ var MAX_LOG_FILES = 5;
 var stream = null;
 function rotateLog() {
   try {
-    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;
@@ -782,11 +806,9 @@ function ensureRequestLogDir() {
 }
 function rotateRequestLog() {
   try {
-    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;
     if (requestStream) {
       requestStream.end();
       requestStream = null;
@@ -811,8 +833,7 @@ function rotateRequestLog() {
   }
 }
 function logRequest(req) {
-  if (!config_default.requestLogEnabled)
-    return;
+  if (!config_default.requestLogEnabled) return;
   try {
     ensureRequestLogDir();
     rotateRequestLog();
@@ -833,8 +854,7 @@ function logRequest(req) {
   }
 }
 function logResponse(req, res, duration) {
-  if (!config_default.requestLogEnabled)
-    return;
+  if (!config_default.requestLogEnabled) return;
   try {
     ensureRequestLogDir();
     if (!requestStream) {
@@ -890,36 +910,27 @@ var TBL_QUERIES = {
 (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))))
+    (setq @d (cons (@:get-props e '("Name" "Count" "Handle" "ObjectName" "IsXRef" "IsXRefOverlay" "IsDynamicBlock" "HasAttributes" "HasExtensionDictionary" "Path" "Description" "Layout" "BlockScope")) @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 1 (vla-get-fontfile e))
-    (cons 3 (vla-get-bigfontfile e))
-    (cons 40 (vla-get-height e))
-    (cons 41 (vla-get-width e))
-    (cons 42 (/ (* 180.0 (vla-get-obliqueangle e)) pi))
-    (cons 70 (vla-get-textgenerationflag e))
-  ) @d)))
+  (setq @d (cons (@:get-props e '("Name" "FontFile" "BigFontFile" "Height" "Width" "ObliqueAngle" "TextGenerationFlag" "Handle" "ObjectName")) @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)))
+  (setq @d (cons (@:get-props e '("Name" "Handle" "ObjectName")) @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)))
+  (setq @d (cons (@:get-props e '("Name" "Description" "PatternLength" "Handle" "ObjectName")) @d)))
 (list (cons 'table 'linetype) (cons 'total (length @d)) (cons 'data (list (reverse @d)))))` }
 };
 var TBL_KEY_ALIAS = {
   textstyle: "style",
   textstyles: "style",
-  ltype: "linetype",
   linetype: "ltype"
 };
 
@@ -1022,27 +1033,21 @@ async function ensureCadConnected() {
   }
 }
 function escapeLispString(str) {
-  if (typeof str !== "string")
-    return "";
+  if (typeof str !== "string") return "";
   return str.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 }
 function tryNumber(val) {
-  if (typeof val === "number")
-    return val;
+  if (typeof val === "number") return val;
   const n = Number(val);
-  if (!isNaN(n) && val !== "")
-    return n;
+  if (!isNaN(n) && val !== "") return n;
   return val;
 }
 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 = "";
@@ -1084,39 +1089,29 @@ 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" || t === "NIL")
-      return null;
-    if (t === "t" || t === "T")
-      return true;
-    if (t.startsWith('"') && t.endsWith('"'))
-      return t.slice(1, -1);
+    if (t === "nil" || t === "NIL") return null;
+    if (t === "t" || t === "T") return true;
+    if (t.startsWith('"') && t.endsWith('"')) return t.slice(1, -1);
     return tryNumber(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();
@@ -1129,16 +1124,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];
       }
@@ -1149,13 +1139,10 @@ 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;
     return tryNumber(atom);
   }
   function parseList() {
@@ -1163,15 +1150,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++;
@@ -1193,19 +1178,6 @@ function parseLispRecursive(str) {
   }
   return parseValue();
 }
-function lispPairsToObject(pairs) {
-  if (!Array.isArray(pairs))
-    return pairs;
-  const obj = {};
-  for (let i = 0; i < pairs.length - 1; i += 2) {
-    const key = pairs[i];
-    const val = pairs[i + 1];
-    if (typeof key === "string" || typeof key === "number") {
-      obj[String(key)] = Array.isArray(val) ? lispPairsToObject(val) : val;
-    }
-  }
-  return obj;
-}
 
 // src/handlers/resource-readers.js
 var ENTITY_PROPERTIES_LISP = `
@@ -1261,8 +1233,7 @@ var ENTITY_PROPERTIES_LISP = `
   result)
 `;
 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) {
@@ -1273,10 +1244,8 @@ function propertyPairsToObject(pairs) {
 }
 function buildEntityPropertiesCode({ type, layer, bbox }) {
   const items = [];
-  if (type)
-    items.push(`(cons 0 "${escapeLispString(type)}")`);
-  if (layer)
-    items.push(`(cons 8 "${escapeLispString(layer)}")`);
+  if (type) items.push(`(cons 0 "${escapeLispString(type)}")`);
+  if (layer) items.push(`(cons 8 "${escapeLispString(layer)}")`);
   if (bbox) {
     const parts = bbox.split(",").map((s) => parseFloat(s.trim()));
     if (parts.length === 4) {
@@ -1302,10 +1271,8 @@ ${ENTITY_PROPERTIES_LISP}
 (vl-prin1-to-string (list @e:total (reverse @e:ents))))`;
 }
 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 "${escapeLispString(handle)}"))
@@ -1325,8 +1292,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 {
@@ -1338,8 +1304,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();
   }
@@ -1364,10 +1329,8 @@ 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) {
     return { total: 0, entities: [] };
   }
@@ -1455,9 +1418,14 @@ async function getEntitiesSummary(cacheKey) {
   }
 }
 function buildTextContentCode({ layer, bbox, offset, limit }) {
-  const items = [`'(0 . "TEXT,MTEXT,ATTRIB,TCH_TEXT")`];
-  if (layer)
-    items.push(`(cons 8 "${escapeLispString(layer)}")`);
+  const items = [
+    `'(-4 . "<OR")`,
+    `'(0 . "TEXT")`,
+    `'(0 . "MTEXT")`,
+    `'(0 . "ATTRIB")`,
+    `'(-4 . "OR>")`
+  ];
+  if (layer) items.push(`(cons 8 "${escapeLispString(layer)}")`);
   if (bbox) {
     const parts = bbox.split(",").map((s) => parseFloat(s.trim()));
     if (parts.length === 4) {
@@ -1472,6 +1440,7 @@ function buildTextContentCode({ layer, bbox, offset, limit }) {
   }
   const filterExpr = `(list ${items.join(" ")})`;
   return `(progn
+(vl-load-com)
 (setq ss (ssget "_X" ${filterExpr}))
 (if (null ss)
   (list "total" 0 "offset" ${offset} "limit" ${limit} "texts" nil)
@@ -1481,15 +1450,13 @@ function buildTextContentCode({ layer, bbox, offset, 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) {
     return { total: 0, offset: 0, limit: 5e3, texts: [] };
   }
@@ -1498,42 +1465,47 @@ async function getTextContent(params = {}) {
   try {
     const code = buildTextContentCode({ layer: params.layer, bbox: params.bbox, offset, limit });
     const resultStr = await cad.sendCommandWithResult(code);
-    if (!resultStr || resultStr === "" || resultStr === "nil" || resultStr === "0") {
-      return { total: 0, offset, limit, texts: [] };
-    }
+    log(`[DEBUG text-content] resultStr length=${resultStr?.length} first300=${resultStr?.substring(0, 300)}`);
     const parsed = parseLispRecursive(resultStr);
     if (!parsed || !Array.isArray(parsed)) {
-      return { total: 0, offset, limit, texts: [] };
+      throw new Error(`text-content: \u89E3\u6790 Lisp \u7ED3\u679C\u5931\u8D25: raw="${String(resultStr).substring(0, 500)}"`);
+    }
+    const data = {};
+    let rawTexts = [];
+    for (let i = 0; i < parsed.length - 1; i += 2) {
+      const key = parsed[i];
+      const val = parsed[i + 1];
+      if (typeof key === "string" || typeof key === "number") {
+        if (key === "texts" && Array.isArray(val)) {
+          rawTexts = val;
+        } else {
+          data[String(key)] = val;
+        }
+      }
     }
-    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] || "");
-          else if (pair[0] === "position" && Array.isArray(pair[1])) {
-            obj.position = pair[1].map((v) => typeof v === "number" ? v : 0);
-          }
+      for (let i = 0; i < item.length - 1; i += 2) {
+        const key = item[i];
+        const val = item[i + 1];
+        if (key === "text") obj.text = String(val || "");
+        else if (key === "position") {
+          obj.position = Array.isArray(val) ? val.map((v) => typeof v === "number" ? v : 0) : [];
         }
-      });
+      }
       return obj.text ? obj : null;
     }).filter(Boolean);
     setCache(cacheKey, data);
     return data;
   } catch (e) {
     log(`getTextContent error: ${e.message}`);
-    return { total: 0, offset, limit, texts: [] };
+    throw e;
   }
 }
 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);
@@ -1543,10 +1515,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")))
@@ -1565,8 +1535,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]) };
@@ -1577,100 +1546,92 @@ async function getDwgPath() {
   }
 }
 function buildBlockRefsCode(filterBlockName) {
-  const filterExpr = filterBlockName ? `(list (cons 2 "${escapeLispString(filterBlockName)}"))` : "nil";
+  const filterItems = ['(cons 0 "INSERT")'];
+  if (filterBlockName) {
+    filterItems.push(`(cons 2 "${escapeLispString(filterBlockName)}")`);
+  }
+  const filterCode = `(list ${filterItems.join(" ")})`;
   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)
+(defun @br:try (obj prop / r)
+  (if (vl-catch-all-error-p
+        (setq r (vl-catch-all-apply
+                  (function (lambda () (vlax-get obj prop))))))
+    nil
+    r))
+
+(defun @br:get-attrs (ent / att atts)
+  (if (setq att (entnext ent))
     (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)))
+      (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: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)
+(defun @br:get-dynprops (obj / r)
+  (setq r (vl-catch-all-apply
+            (function (lambda ()
+              (mapcar '(lambda (x)
+                (cons (vla-get-propertyname x)
+                  (list (cons "value" (vlax-get x 'value))
+                        (cons "readOnly" (vlax-get x 'readonly))
+                        (cons "show" (vlax-get x 'show)))))
+                (vlax-safearray->list (vlax-invoke obj 'getdynamicblockproperties)))))))
+  (if (vl-catch-all-error-p r) nil r))
+
+(defun @br:props (ent / obj ed r)
+  (setq r (vl-catch-all-apply
+            (function (lambda ()
+              (setq obj (vlax-ename->vla-object ent)
+                    ed (entget ent))
+              (list
+                (cons "handle" (cdr (assoc 5 ed)))
+                (cons "layer" (cdr (assoc 8 ed)))
+                (cons "blockName" (vla-get-name obj))
+                (cons "effectiveBlockName" (@br:try obj 'effectivename))
+                (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" (@br:try obj 'isdynamicblock))
+                (cons "attributes" (@br:get-attrs ent))
+                (cons "dynamicProperties" (@br:get-dynprops obj)))))))
+  (if (vl-catch-all-error-p r) nil r))
 
-(setq ss (ssget "_X" (list (cons 0 "INSERT") ${filterExpr})))
+(setq ss (ssget "_X" ${filterCode}))
 (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))))))`;
+      (setq r (@br:props (ssname ss i)))
+      (if r (setq refs (cons r refs)))
+      (setq i (1+ i)))
+    (list (cons "total" total) (cons "blockRefs" (list (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 (cached) return cached;
+  if (!cad.connected) await cad.connect();
   if (!cad.connected) {
     return { total: 0, blockRefs: [] };
   }
   try {
     const code = buildBlockRefsCode(params.blockName);
     const resultStr = await cad.sendCommandWithResult(code);
-    if (!resultStr || resultStr === "" || resultStr === "nil") {
-      return { total: 0, blockRefs: [] };
-    }
     const parsed = parseLispRecursive(resultStr);
     if (!parsed || !Array.isArray(parsed)) {
-      return { total: 0, blockRefs: [] };
+      throw new Error(`block-refs: \u89E3\u6790 Lisp \u7ED3\u679C\u5931\u8D25: raw="${String(resultStr).substring(0, 500)}"`);
+    }
+    const result = {};
+    for (const pair of parsed) {
+      if (Array.isArray(pair) && pair.length >= 2) {
+        result[String(pair[0])] = pair[1];
+      }
     }
-    const result = lispPairsToObject(parsed);
     const blockRefs = Array.isArray(result.blockRefs) ? result.blockRefs : [];
     const finalResult = {
       total: typeof result.total === "number" ? result.total : blockRefs.length,
@@ -1680,7 +1641,7 @@ async function getBlockRefs(params = {}) {
           br.forEach((pair) => {
             if (Array.isArray(pair) && pair.length >= 2) {
               const key = pair[0];
-              let val = pair[1];
+              let val = pair.length === 2 ? pair[1] : pair.slice(1);
               if (key === "insertionPoint" && Array.isArray(val)) {
                 val = val.map((v) => typeof v === "number" ? v : 0);
               } else if (key === "scale" && Array.isArray(val)) {
@@ -1699,51 +1660,67 @@ async function getBlockRefs(params = {}) {
     return finalResult;
   } catch (e) {
     log(`getBlockRefs error: ${e.message}`);
-    return { total: 0, blockRefs: [] };
+    throw e;
   }
 }
+var VLA_HELPER_LISP = `(defun @:get-props (obj prop-names / result p p-sym val)
+  (setq result nil)
+  (foreach p prop-names
+    (setq p-sym (read p))
+    (if (vlax-property-available-p obj p-sym)
+      (progn
+        (setq val (vl-catch-all-apply 'vlax-get (list obj p-sym)))
+        (if (not (vl-catch-all-error-p val))
+          (progn
+             (cond
+              ((= (type val) 'VLA-OBJECT) (setq val (strcat "@" (vla-get-objectname val))))
+              ((or (= (type val) 'STR) (= (type val) 'SAFEARRAY) (listp val)) (setq val (vl-prin1-to-string val))))
+            (setq result (cons (cons p val) result)))))))
+  (reverse result))`;
 function buildTablesCode(tblName) {
   const raw = tblName.toLowerCase();
   const key = TBL_KEY_ALIAS[raw] || raw;
   const query = TBL_QUERIES[key];
+  const isVlaTable = key !== "layer";
   if (query) {
+    if (isVlaTable) {
+      return `(progn (vl-load-com) ${VLA_HELPER_LISP} ${query.lisp})`;
+    }
     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(" ")}))`;
+  const parts = Object.values(TBL_QUERIES).map((q) => `(vl-catch-all-apply '(lambda () ${q.lisp}))`);
+  return `(progn (vl-load-com) ${VLA_HELPER_LISP} (list ${parts.join(" ")}))`;
 }
-function parseTableRecord(rec) {
-  if (!rec || !Array.isArray(rec))
-    return null;
+function parseTableRecord(rec, tableName) {
+  if (!rec || !Array.isArray(rec)) return null;
   const obj = {};
+  const isLayer = tableName === "layer";
   for (const pair of rec) {
     if (Array.isArray(pair) && pair.length >= 2) {
       const key = String(pair[0]);
       const val = pair[1];
-      if (key === "2")
-        obj.name = String(val);
-      else if (key === "62")
-        obj.color = typeof val === "number" ? val : 7;
-      else if (key === "6")
-        obj.linetype = String(val);
-      else if (key === "70") {
-        obj.flags = typeof val === "number" ? val : 0;
-        obj.frozen = (val & 1) !== 0;
-        obj.locked = (val & 4) !== 0;
-      } else if (key === "60")
-        obj.on = val === 0;
-      else if (key === "1")
-        obj.font = String(val);
-      else if (key === "40")
-        obj.height = typeof val === "number" ? val : 0;
-      else if (key === "41")
-        obj.width = typeof val === "number" ? val : 1;
-      else if (key === "42")
-        obj.oblique = typeof val === "number" ? val : 0;
-      else if (key === "3")
-        obj.bigfont = String(val);
-      else if (key === "50")
-        obj.flags = typeof val === "number" ? val : 0;
+      const isDxfCode = typeof pair[0] === "number";
+      if (isDxfCode) {
+        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;
+          if (isLayer) {
+            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.bigfont = String(val);
+        else if (key === "50") obj.flags = typeof val === "number" ? val : 0;
+      } else {
+        if (key === "Name") obj.name = val;
+        obj[key] = val;
+      }
     }
   }
   return obj.name ? obj : null;
@@ -1752,12 +1729,9 @@ async function getTables(params = {}) {
   const tblName = params.tbl || params.type || "all";
   const cacheKey = `dwg:tbl:${tblName}`;
   const cached = getCached(cacheKey);
-  if (cached)
-    return cached;
-  if (!cad.connected)
-    await cad.connect();
-  if (!cad.connected)
-    return { table: tblName, data: [] };
+  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);
@@ -1776,10 +1750,9 @@ async function getTables(params = {}) {
       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;
+          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]))) {
+            if (Array.isArray(item[1]) && item[1].length > 0) {
               tblData = item[1];
             }
           }
@@ -1791,46 +1764,41 @@ async function getTables(params = {}) {
       result = {
         table: tableName,
         total,
-        data: tblData.map(parseTableRecord).filter(Boolean)
+        data: tblData.map((r) => parseTableRecord(r, tableName)).filter(Boolean)
       };
     } else {
       const allData = {};
       parsed.forEach((item) => {
-        if (!Array.isArray(item) || item.length < 2)
-          return;
+        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;
+            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;
+            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);
+              entry.data = raw.map((r) => parseTableRecord(r, tableKey)).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;
+            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);
+              entry.data = raw.map((r) => parseTableRecord(r, tableKey)).filter(Boolean);
             }
           }
         }
-        if (tableKey)
-          allData[tableKey] = entry;
+        if (tableKey) allData[tableKey] = entry;
       });
       result = allData;
     }
@@ -1844,12 +1812,9 @@ 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);
@@ -1862,8 +1827,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 };
@@ -1872,20 +1836,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;
@@ -1896,22 +1853,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;
@@ -1936,12 +1886,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)
@@ -1959,13 +1906,12 @@ async function getDwgList() {
     try {
       parsed = JSON.parse(result);
     } catch (e) {
-      const listResult = parseLispList(result);
-      if (listResult) {
+      const listResult = parseLispRecursive(result);
+      if (Array.isArray(listResult)) {
         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]) };
@@ -1991,8 +1937,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;
 }
@@ -2001,49 +1946,40 @@ 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" };
 }
 
 // src/handlers/resource-handlers.js
 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 entityMatch = uri.match(/^atlisp:\/\/dwg\/entity\/([^?]+)$/);
-  if (entityMatch)
-    return { type: "entity", handle: entityMatch[1] };
+  if (entityMatch) return { type: "entity", handle: entityMatch[1] };
   const tblMatch = uri.match(/^atlisp:\/\/dwg\/tbl\/([^?]+)$/);
-  if (tblMatch)
-    return { type: "tbl", tblName: tblMatch[1] };
+  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] };
+  if (blockRefMatch) return { type: "block-refs", blockName: blockRefMatch[1] };
   return null;
 }
 async function listResources(subscribedUris = []) {
@@ -2203,10 +2139,8 @@ function isPrefixUri(uri) {
   return uri.endsWith("/");
 }
 function matchesSubscription(subscribedUri, targetUri) {
-  if (subscribedUri === targetUri)
-    return true;
-  if (isPrefixUri(subscribedUri) && targetUri.startsWith(subscribedUri))
-    return true;
+  if (subscribedUri === targetUri) return true;
+  if (isPrefixUri(subscribedUri) && targetUri.startsWith(subscribedUri)) return true;
   return false;
 }
 function isSubscribed(uri, sessionId) {
@@ -2216,8 +2150,7 @@ function isSubscribed(uri, sessionId) {
   }
   const allUris = sessionManager.getAllSubscribedUris();
   for (const su of allUris) {
-    if (matchesSubscription(su, uri))
-      return true;
+    if (matchesSubscription(su, uri)) return true;
   }
   return false;
 }
@@ -2326,11 +2259,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();
       }
@@ -2352,8 +2283,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);
@@ -2482,8 +2412,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) {
@@ -2547,8 +2476,7 @@ var SseSessionManager = class {
       session.close();
       this.#sessions.delete(clientId);
       const idx = this.#accessOrder.indexOf(clientId);
-      if (idx !== -1)
-        this.#accessOrder.splice(idx, 1);
+      if (idx !== -1) this.#accessOrder.splice(idx, 1);
       return true;
     }
     return false;
@@ -2635,8 +2563,7 @@ var SseSessionManager = class {
         session.close();
         this.#sessions.delete(clientId);
         const idx = this.#accessOrder.indexOf(clientId);
-        if (idx !== -1)
-          this.#accessOrder.splice(idx, 1);
+        if (idx !== -1) this.#accessOrder.splice(idx, 1);
       }
     }
   }
@@ -2684,8 +2611,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);
@@ -2694,8 +2620,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;
@@ -2769,12 +2694,10 @@ var DEFS_DIR = path7.join(__dirname3, "definitions");
 var PROMPTS_DIR = path7.join(__dirname3, "..", "..", "prompts");
 var builtinDefs = null;
 function loadBuiltinDefs() {
-  if (builtinDefs)
-    return builtinDefs;
+  if (builtinDefs) return builtinDefs;
   builtinDefs = {};
   try {
-    if (!fs5.existsSync(DEFS_DIR))
-      return builtinDefs;
+    if (!fs5.existsSync(DEFS_DIR)) return builtinDefs;
     const files = fs5.readdirSync(DEFS_DIR).filter((f) => f.endsWith(".json"));
     for (const file of files) {
       try {
@@ -2836,15 +2759,12 @@ function formatLispPoints(pointsStr) {
   return `(list ${ptList.join(" ")})`;
 }
 function getDimensionStyleLisp(style) {
-  if (style === "horizontal" || style === "vertical")
-    return "DIMLINEAR";
+  if (style === "horizontal" || style === "vertical") return "DIMLINEAR";
   return "DIMALIGNED";
 }
 function getDimensionStyleLabel(style) {
-  if (style === "horizontal")
-    return "\u6C34\u5E73";
-  if (style === "vertical")
-    return "\u5782\u76F4";
+  if (style === "horizontal") return "\u6C34\u5E73";
+  if (style === "vertical") return "\u5782\u76F4";
   return "aligned";
 }
 async function handleComplexPrompt(def, args) {
@@ -2878,14 +2798,10 @@ async function handleComplexPrompt(def, args) {
       } catch {
       }
       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 {
         messages: [{
           role: "user",
@@ -3078,8 +2994,7 @@ ${code}
   }
   const defs = loadBuiltinDefs();
   const def = defs[name];
-  if (!def)
-    throw new Error(`Unknown prompt: ${name}`);
+  if (!def) throw new Error(`Unknown prompt: ${name}`);
   if (def.handler) {
     return handleComplexPrompt(def, args);
   }
@@ -3104,8 +3019,7 @@ import path8 from "path";
 init_config();
 var MAX_HISTORY_VALUES = 1e3;
 function percentile(sorted, p) {
-  if (sorted.length === 0)
-    return 0;
+  if (sorted.length === 0) return 0;
   const idx = Math.ceil(p * sorted.length) - 1;
   return sorted[Math.max(0, Math.min(idx, sorted.length - 1))];
 }
@@ -3396,8 +3310,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);
@@ -3417,17 +3330,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" }] };
 }
@@ -3435,8 +3345,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" }] };
@@ -3447,8 +3356,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" }] };
@@ -3459,8 +3367,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" }] };
@@ -3469,12 +3376,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 };
@@ -3531,8 +3436,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)
@@ -3574,15 +3478,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);
@@ -3590,8 +3491,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:
@@ -3611,12 +3511,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` }] };
@@ -3705,8 +3603,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 {
@@ -3715,8 +3612,7 @@ async function getFunctionUsage(funcName, packageName) {
           const raw = fs6.readFileSync(path9.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 (e) {
         log(`function-handlers: FUNCTIONS_DIR read error: ${e.message}`);
@@ -3786,8 +3682,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 "${escapeLispString(handle)}"))
@@ -3819,8 +3714,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":
@@ -3863,8 +3757,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 "${escapeLispString(handle)}"))
@@ -3889,15 +3782,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 . "${escapeLispString(filter.type)}")`);
-    if (filter.layer)
-      items.push(`'(8 . "${escapeLispString(filter.layer)}")`);
+    if (filter.type) items.push(`'(0 . "${escapeLispString(filter.type)}")`);
+    if (filter.layer) items.push(`'(8 . "${escapeLispString(filter.layer)}")`);
     filterCode = `(list ${items.join(" ")})`;
   }
   const code = `(progn
@@ -3930,8 +3820,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" "${escapeLispString(name)}"))
@@ -3967,8 +3856,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
@@ -4002,8 +3890,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":
@@ -4051,8 +3938,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" "${escapeLispString(name)}")
@@ -4080,8 +3966,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" "${escapeLispString(name)}"))
@@ -4118,8 +4003,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 };
@@ -4149,8 +4033,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)
@@ -4173,8 +4056,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 "${escapeLispString(handle)}"))
@@ -4210,8 +4092,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 };
   try {
     validateFilePath(filePath);
   } catch (e) {
@@ -4252,8 +4133,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 };
   if (filePath) {
     try {
       validateFilePath(filePath);
@@ -4284,8 +4164,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 };
   try {
     validateFilePath(outputPath);
   } catch (e) {
@@ -4317,8 +4196,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"}
@@ -4345,8 +4223,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();
@@ -4388,8 +4265,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 "${escapeLispString(handle)}"))
@@ -4420,8 +4296,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" "${escapeLispString(patternName)}" "s" "s" "sc" ${scale} "an" ${angle} "")
@@ -4441,17 +4316,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" "${escapeLispString(handle)}" "p" "${escapeLispString(props.pattern)}")`;
-  if (props.scale)
-    propCode += `(command "._HATCHEDIT" "${escapeLispString(handle)}" "s" ${parseFloat(props.scale) || 1})`;
-  if (props.angle)
-    propCode += `(command "._HATCHEDIT" "${escapeLispString(handle)}" "an" ${parseFloat(props.angle) || 0})`;
-  if (props.color)
-    propCode += `(command "._HATCHEDIT" "${escapeLispString(handle)}" "c" ${parseInt(props.color) || 256})`;
+  if (props.pattern) propCode += `(command "._HATCHEDIT" "${escapeLispString(handle)}" "p" "${escapeLispString(props.pattern)}")`;
+  if (props.scale) propCode += `(command "._HATCHEDIT" "${escapeLispString(handle)}" "s" ${parseFloat(props.scale) || 1})`;
+  if (props.angle) propCode += `(command "._HATCHEDIT" "${escapeLispString(handle)}" "an" ${parseFloat(props.angle) || 0})`;
+  if (props.color) propCode += `(command "._HATCHEDIT" "${escapeLispString(handle)}" "c" ${parseInt(props.color) || 256})`;
   const code = `(progn
         (vl-load-com)
         ${propCode}
@@ -4468,8 +4338,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 "${escapeLispString(blockHandle)}"))
@@ -4498,8 +4367,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 "${escapeLispString(blockHandle)}"))
@@ -4535,8 +4403,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")
@@ -4553,8 +4420,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 ${toSafePoint(p1)}) (list ${toSafePoint(p2)}))`;
   try {
     await cad.sendCommand(code + "\n");
@@ -4567,8 +4433,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" "${escapeLispString(viewName)}" "C" (list ${toSafePoint(center)}))` : `(command ".-VIEW" "S" "${escapeLispString(viewName)}")`;
   try {
     await cad.sendCommand(code + "\n");
@@ -4581,8 +4446,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" "${escapeLispString(viewName)}")`;
   try {
     await cad.sendCommand(code + "\n");
@@ -4595,8 +4459,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)
@@ -4616,8 +4479,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 versionMap = {
     "R2018": "AC1027",
     "R2015": "AC1024",
@@ -4647,8 +4509,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 code = `(progn
         (vl-load-com)
         (vla-export (vla-get-activedocument (vlax-get-acad-object)) "${escapeLispString(outputPath)}" "dwf")
@@ -4668,8 +4529,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 };
   }
@@ -4699,8 +4559,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" "${escapeLispString(name)}"))
@@ -4731,8 +4590,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" "${escapeLispString(name)}")
@@ -4757,8 +4615,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)
@@ -4781,8 +4638,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" "${escapeLispString(name)}")
@@ -4807,8 +4663,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))))
@@ -4825,8 +4680,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" "${escapeLispString(name)}"))
@@ -4854,8 +4708,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))))
@@ -4885,8 +4738,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)
@@ -4909,8 +4761,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 };
   }
@@ -4938,8 +4789,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);
@@ -4952,8 +4802,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" "${escapeLispString(oldName)}")
@@ -4985,8 +4834,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 paperSize = style.paperSize || "A4";
   const code = `(progn
         (vl-load-com)
@@ -5016,8 +4864,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)))
@@ -5043,8 +4890,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 };
   }
@@ -5070,8 +4916,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" "${escapeLispString(name)}")
@@ -5096,8 +4941,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)
@@ -5117,8 +4961,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" "${escapeLispString(groupName)}")
@@ -5156,8 +4999,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 ${toSafePoint3(p1)}) pt2 (list ${toSafePoint3(p2)}))
@@ -5181,8 +5023,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 };
@@ -5219,8 +5060,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 "${escapeLispString(handle)}"))
@@ -5260,8 +5100,7 @@ function parseHandleList(handles) {
       handles = handles.split(",").map((h) => h.trim());
     }
   }
-  if (!Array.isArray(handles))
-    handles = [handles];
+  if (!Array.isArray(handles)) handles = [handles];
   return handles;
 }
 async function batchRename(handles, newNameTemplate, startNum = 1) {
@@ -5635,8 +5474,7 @@ async function copyXdata(sourceHandle, targetHandle, appName = null) {
       const xdataResult = await getXdata(sourceHandle, appName);
       if (xdataResult.content?.[0]) {
         const parsed = JSON.parse(xdataResult.content[0].text);
-        if (parsed.xdata)
-          return await setXdata(targetHandle, appName, parsed.xdata);
+        if (parsed.xdata) return await setXdata(targetHandle, appName, parsed.xdata);
       }
       return mcpError("\u6E90\u5B9E\u4F53\u672A\u627E\u5230\u6269\u5C55\u6570\u636E");
     } else {
@@ -5871,10 +5709,8 @@ async function createSheetSetArchive(sheetSetName, archivePath) {
 // src/handlers/3d-handlers.js
 init_cad();
 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) {
@@ -8346,8 +8182,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];
@@ -8392,8 +8227,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") }] };
@@ -8603,8 +8437,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 || {});
@@ -8665,12 +8498,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;
@@ -8678,12 +8509,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 };
@@ -8779,8 +8608,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) {
@@ -8813,11 +8641,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();
@@ -8825,16 +8651,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();
   };
 }
@@ -9251,8 +9075,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 {
@@ -9317,10 +9140,8 @@ async function startServer() {
       await cad.disconnect();
       closeLog();
       httpServer.close(() => {
-        if (httpsServer)
-          httpsServer.close(() => process.exit(0));
-        else
-          process.exit(0);
+        if (httpsServer) httpsServer.close(() => process.exit(0));
+        else process.exit(0);
       });
       setTimeout(() => process.exit(1), 5e3);
     }
@@ -9328,6 +9149,22 @@ async function startServer() {
     process.on("SIGTERM", () => shutdown("SIGTERM"));
   }
 }
+onDocumentChanged((info) => {
+  const uris = [
+    "atlisp://dwg/name",
+    "atlisp://dwg/path",
+    "atlisp://cad/dwgs",
+    "atlisp://dwg/tbl",
+    "atlisp://dwg/entities",
+    "atlisp://dwg/block-refs",
+    "atlisp://dwg/text-content",
+    "atlisp://dwg/groups"
+  ];
+  for (const uri of uris) {
+    clearCache(uri);
+    notify(uri, { docName: info.docName, docPath: info.docPath });
+  }
+});
 if (!process.env.VITEST) {
   await startServer();
 }