@atlisp/mcp 1.6.3 → 1.6.7

package/dist/atlisp-mcp.js

@@ -2,6 +2,7 @@
 
 // src/atlisp-mcp.js
 import path10 from "path";
+import fs8 from "fs";
 import { fileURLToPath as fileURLToPath4 } from "url";
 import { createRequire } from "module";
 import express2 from "express";
@@ -22,7 +23,7 @@ var FILE_EXTENSIONS = {
   "BricsCAD": [".des"]
 };
 var SERVER_NAME = "atlisp-mcp-server";
-var SERVER_VERSION = "1.6.3";
+var SERVER_VERSION = "1.6.7";
 var MOCK_PACKAGES = [
   { name: "base", description: "\u57FA\u7840\u51FD\u6570\u5E93", version: "1.0.0" },
   { name: "at-pm", description: "\u5DE5\u7A0B\u9879\u76EE\u7BA1\u7406", version: "2.1.0" },
@@ -115,7 +116,8 @@ function parseArgs() {
   return result;
 }
 function loadConfigFile(filePath) {
-  if (!filePath || !fs.existsSync(filePath)) return null;
+  if (!filePath || !fs.existsSync(filePath))
+    return null;
   try {
     const raw = fs.readFileSync(filePath, "utf-8");
     const parsed = JSON.parse(raw);
@@ -253,7 +255,8 @@ function setupStdoutHandler(w) {
       const lines = buffer.split("\n");
       buffer = lines.pop() || "";
       for (const line of lines) {
-        if (!line.trim()) continue;
+        if (!line.trim())
+          continue;
         try {
           const result = JSON.parse(line);
           const rid = result.requestId;
@@ -279,7 +282,8 @@ function setupStdoutHandler(w) {
 }
 function getWorker(force = false) {
   if (!worker || !worker.connected || force) {
-    if (worker) worker.kill();
+    if (worker)
+      worker.kill();
     worker = spawn("node", [workerPath], {
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -287,7 +291,8 @@ function getWorker(force = false) {
     const w = worker;
     w.on("exit", (code) => {
       console.error("worker exited with code:", code);
-      if (w !== worker) return;
+      if (w !== worker)
+        return;
       w.connected = false;
       for (const [id, { reject, timeout }] of pendingRequests) {
         clearTimeout(timeout);
@@ -308,7 +313,8 @@ function getWorker(force = false) {
   return worker;
 }
 function startHeartbeat() {
-  if (heartbeatTimer) clearInterval(heartbeatTimer);
+  if (heartbeatTimer)
+    clearInterval(heartbeatTimer);
   heartbeatTimer = setInterval(async () => {
     try {
       const result = await sendMessage({ type: "ping" });
@@ -353,7 +359,8 @@ var CadConnection = class {
     return process.platform === "win32";
   }
   async connect(platform = null) {
-    if (!this.isAvailable()) return false;
+    if (!this.isAvailable())
+      return false;
     try {
       const msg = platform ? { type: "connect", platform } : { type: "connect" };
       const result = await sendMessage(msg);
@@ -370,13 +377,16 @@ var CadConnection = class {
     return false;
   }
   async sendCommand(code) {
-    if (!this.connected) throw new Error("\u672A\u8FDE\u63A5 CAD");
+    if (!this.connected)
+      throw new Error("\u672A\u8FDE\u63A5 CAD");
     const result = await sendMessage({ type: "send", code, platform: _platform });
-    if (result.success) return true;
+    if (result.success)
+      return true;
     throw new Error(result.error || "\u53D1\u9001\u5931\u8D25");
   }
   async sendCommandWithResult(code, encoding = null) {
-    if (!this.connected) throw new Error("\u672A\u8FDE\u63A5 CAD");
+    if (!this.connected)
+      throw new Error("\u672A\u8FDE\u63A5 CAD");
     const result = await sendMessage({ type: "sendResult", code, platform: _platform, encoding: encoding || "" });
     if (result.success) {
       return result.result || "";
@@ -390,7 +400,8 @@ var CadConnection = class {
     return this.product;
   }
   async isBusy() {
-    if (!this.connected) return false;
+    if (!this.connected)
+      return false;
     try {
       const result = await sendMessage({ type: "isBusy", platform: _platform });
       return result && result.isBusy;
@@ -399,7 +410,8 @@ var CadConnection = class {
     }
   }
   async hasDoc() {
-    if (!this.connected) return { hasDoc: false, docCount: 0 };
+    if (!this.connected)
+      return { hasDoc: false, docCount: 0 };
     try {
       const result = await sendMessage({ type: "hasdoc", platform: _platform });
       return result || { hasDoc: false, docCount: 0 };
@@ -408,7 +420,8 @@ var CadConnection = class {
     }
   }
   async newDoc() {
-    if (!this.connected) throw new Error("\u672A\u8FDE\u63A5 CAD");
+    if (!this.connected)
+      throw new Error("\u672A\u8FDE\u63A5 CAD");
     try {
       const result = await sendMessage({ type: "newdoc", platform: _platform });
       return result && result.success;
@@ -417,7 +430,8 @@ var CadConnection = class {
     }
   }
   async bringToFront() {
-    if (!this.connected) throw new Error("\u672A\u8FDE\u63A5 CAD");
+    if (!this.connected)
+      throw new Error("\u672A\u8FDE\u63A5 CAD");
     try {
       const result = await sendMessage({ type: "bringToFront", platform: _platform });
       return result && result.success;
@@ -426,7 +440,8 @@ var CadConnection = class {
     }
   }
   async getInfo() {
-    if (!this.connected) return "CAD \u672A\u8FDE\u63A5";
+    if (!this.connected)
+      return "CAD \u672A\u8FDE\u63A5";
     return `Platform: ${this.product}, Version: ${this.version}, Status: Connected`;
   }
   async disconnect() {
@@ -463,9 +478,11 @@ var MAX_LOG_SIZE = 10 * 1024 * 1024;
 var MAX_LOG_FILES = 5;
 var stream = null;
 function rotateLog() {
-  if (!fs2.existsSync(DEBUG_FILE)) return;
+  if (!fs2.existsSync(DEBUG_FILE))
+    return;
   const stat = fs2.statSync(DEBUG_FILE);
-  if (stat.size < MAX_LOG_SIZE) return;
+  if (stat.size < MAX_LOG_SIZE)
+    return;
   if (stream) {
     stream.end();
     stream = null;
@@ -529,9 +546,11 @@ function ensureRequestLogDir() {
   }
 }
 function rotateRequestLog() {
-  if (!fs2.existsSync(REQUEST_LOG_FILE)) return;
+  if (!fs2.existsSync(REQUEST_LOG_FILE))
+    return;
   const stat = fs2.statSync(REQUEST_LOG_FILE);
-  if (stat.size < 10 * 1024 * 1024) return;
+  if (stat.size < 10 * 1024 * 1024)
+    return;
   const dir = path3.dirname(REQUEST_LOG_FILE);
   for (let i = 5; i > 0; i--) {
     const oldPath = `${REQUEST_LOG_FILE}.${i}`;
@@ -549,7 +568,8 @@ function rotateRequestLog() {
   }
 }
 function logRequest(req) {
-  if (!config_default.requestLogEnabled) return;
+  if (!config_default.requestLogEnabled)
+    return;
   try {
     ensureRequestLogDir();
     rotateRequestLog();
@@ -566,7 +586,8 @@ function logRequest(req) {
   }
 }
 function logResponse(req, res, duration) {
-  if (!config_default.requestLogEnabled) return;
+  if (!config_default.requestLogEnabled)
+    return;
   try {
     ensureRequestLogDir();
     const entry = {
@@ -589,6 +610,58 @@ var __dirname2 = path4.dirname(fileURLToPath2(import.meta.url));
 var STANDARDS_DIR = path4.join(__dirname2, "..", "standards");
 var CACHE_TTL = config_default.resourceCacheTtl;
 var resourceCache = /* @__PURE__ */ new Map();
+var ENTITY_PROPERTIES_LISP = `
+(defun entity:to-list (val)
+  (cond
+    ((= (type val) 'VARIANT) (entity:to-list (vlax-variant-value val)))
+    ((= (type val) 'SAFEARRAY) (vlax-safearray->list val))
+    (T val)))
+
+(defun entity:try-get (obj names / result val)
+  (foreach name names
+    (if (not (vl-catch-all-error-p
+               (setq val (vl-catch-all-apply
+                           (function vlax-get-property)
+                           (list obj name)))))
+      (setq result (cons (cons name (entity:to-list val)) result))))
+  (reverse result))
+
+(setq *common-props* '(ObjectName Handle Layer Color Linetype LinetypeScale Lineweight Visibility Material))
+
+(setq *entity-props*
+  '((AcDbLine StartPoint EndPoint Angle Delta Length Thickness Normal)
+    (AcDbCircle Center Radius Diameter Circumference Area Thickness Normal)
+    (AcDbArc Center Radius StartAngle EndAngle TotalAngle ArcLength Area Normal)
+    (AcDbPoint Position Thickness Normal)
+    (AcDbText TextString Position Height Width ObliqueAngle Rotation StyleName HorizontalAlignment VerticalAlignment Normal Backward UpsideDown)
+    (AcDbMText TextString Location Height Width Rotation StyleName AttachmentPoint DrawingDirection LinespacingFactor LinespacingDistance LinespacingStyle FlowDirection)
+    (AcDbBlockReference Name InsertionPoint Rotation XScale YScale ZScale Normal)
+    (AcDbPolyline Coordinates Closed ConstantWidth Elevation Normal Thickness LinetypeGeneration Area Length)
+    (AcDb2dPolyline Coordinates Closed Elevation Normal Thickness LinetypeGeneration Area Length Type Width)
+    (AcDb3dPolyline Coordinates Closed Type Normal Length Area)
+    (AcDbAlignedDimension DimLinePoint1 DimLinePoint2 ExtLinePoint1 ExtLinePoint2 TextPosition TextRotation Measurement)
+    (AcDbRotatedDimension DimLinePoint1 DimLinePoint2 ExtLinePoint1 ExtLinePoint2 TextPosition TextRotation Measurement Rotation)
+    (AcDbRadialDimension Center Diameter LeaderLength TextPosition)
+    (AcDbDiametricDimension Center Diameter LeaderLength TextPosition)
+    (AcDbAngularDimension AngleVertex AngleEndPoint ArcPoint TextPosition Measurement)
+    (AcDbHatch PatternName PatternType Area Elevation Normal NumberOfLoops AssociativeHatch HatchObjectType PatternAngle PatternScale PatternSpace ISOPenWidth)
+    (AcDbSpline Degree NumberOfControlPoints NumberOfFitPoints ControlPoints FitPoints Knots Weights Area Length Closed Periodic StartTanVector EndTanVector Elevation Normal)
+    (AcDbEllipse Center MajorRadius MinorRadius RadiusRatio StartAngle EndAngle Area Circumference Normal)
+    (AcDbRegion Area Perimeter Centroid MomentsOfInertia PrincipalMoments PrincipalDirections Normal)
+    (AcDb3dSolid Volume Area Centroid MomentsOfInertia PrincipalMoments PrincipalDirections)
+    (AcDbRasterImage ImageFile ImageWidth ImageHeight Origin Rotation Width Height ShowImage ClippingEnabled)
+    (AcDbLeader Coordinates ArrowheadType ArrowheadSize Color ScaleFactor StyleName TextString TextPosition Type Normal)
+    (AcDbViewport Center Width Height ScaleFactor CustomScale StandardScale GridOn SnapOn On DisplayLocked)
+    (AcDbTable TableStyleName Position Rows Columns Direction FlowDirection)))
+
+(defun entity:properties (ent / obj object-name result)
+  (setq obj (if (= (type ent) 'VLA-OBJECT) ent (vlax-ename->vla-object ent)))
+  (setq result (entity:try-get obj *common-props*))
+  (setq object-name (cdr (assoc 'ObjectName result)))
+  (if object-name
+    (setq result (append result (entity:try-get obj (cdr (assoc (read object-name) *entity-props*))))))
+  result)
+`;
 function getCached(key) {
   const entry = resourceCache.get(key);
   if (entry && Date.now() - entry.timestamp < CACHE_TTL) {
@@ -612,11 +685,14 @@ function clearCache(uri) {
   }
 }
 function parseLispList(str) {
-  if (!str || typeof str !== "string") return null;
+  if (!str || typeof str !== "string")
+    return null;
   const trimmed = str.trim();
-  if (!trimmed.startsWith("(") || !trimmed.endsWith(")")) return null;
+  if (!trimmed.startsWith("(") || !trimmed.endsWith(")"))
+    return null;
   const content = trimmed.slice(1, -1).trim();
-  if (!content) return [];
+  if (!content)
+    return [];
   const result = [];
   let depth = 0;
   let current = "";
@@ -658,32 +734,44 @@ function parseLispList(str) {
     }
     current += ch;
   }
-  if (current.trim()) result.push(current.trim());
+  if (current.trim())
+    result.push(current.trim());
   return result.map((item) => {
     const t = item.trim();
-    if (t === "nil") return null;
-    if (t === "t") return true;
-    if (t === "T") return true;
+    if (t === "nil")
+      return null;
+    if (t === "t")
+      return true;
+    if (t === "T")
+      return true;
     const num = Number(t);
-    if (!isNaN(num) && t !== "") return num;
-    if (t.startsWith('"') && t.endsWith('"')) return t.slice(1, -1);
+    if (!isNaN(num) && t !== "")
+      return num;
+    if (t.startsWith('"') && t.endsWith('"'))
+      return t.slice(1, -1);
     return t;
   });
 }
 function parseLispRecursive(str) {
-  if (!str || typeof str !== "string") return null;
+  if (!str || typeof str !== "string")
+    return null;
   str = str.trim();
-  if (!str) return null;
+  if (!str)
+    return null;
   let pos = 0;
   function skipWs() {
-    while (pos < str.length && /\s/.test(str[pos])) pos++;
+    while (pos < str.length && /\s/.test(str[pos]))
+      pos++;
   }
   function parseValue() {
     skipWs();
-    if (pos >= str.length) return null;
+    if (pos >= str.length)
+      return null;
     const ch = str[pos];
-    if (ch === "(") return parseList();
-    if (ch === '"') return parseString();
+    if (ch === "(")
+      return parseList();
+    if (ch === '"')
+      return parseString();
     if (ch === "'") {
       pos++;
       return parseValue();
@@ -696,11 +784,16 @@ function parseLispRecursive(str) {
     while (pos < str.length && str[pos] !== '"') {
       if (str[pos] === "\\" && pos + 1 < str.length) {
         pos++;
-        if (str[pos] === '"') r += '"';
-        else if (str[pos] === "n") r += "\n";
-        else if (str[pos] === "t") r += "	";
-        else if (str[pos] === "\\") r += "\\";
-        else r += str[pos];
+        if (str[pos] === '"')
+          r += '"';
+        else if (str[pos] === "n")
+          r += "\n";
+        else if (str[pos] === "t")
+          r += "	";
+        else if (str[pos] === "\\")
+          r += "\\";
+        else
+          r += str[pos];
       } else {
         r += str[pos];
       }
@@ -711,12 +804,16 @@ function parseLispRecursive(str) {
   }
   function parseAtom() {
     const start = pos;
-    while (pos < str.length && !/\s/.test(str[pos]) && str[pos] !== ")" && str[pos] !== "(") pos++;
+    while (pos < str.length && !/\s/.test(str[pos]) && str[pos] !== ")" && str[pos] !== "(")
+      pos++;
     const atom = str.slice(start, pos);
-    if (atom === "nil" || atom === "NIL") return null;
-    if (atom === "t" || atom === "T") return true;
+    if (atom === "nil" || atom === "NIL")
+      return null;
+    if (atom === "t" || atom === "T")
+      return true;
     const num = Number(atom);
-    if (!isNaN(num) && atom !== "") return num;
+    if (!isNaN(num) && atom !== "")
+      return num;
     return atom;
   }
   function parseList() {
@@ -724,13 +821,15 @@ function parseLispRecursive(str) {
     const items = [];
     while (pos < str.length) {
       skipWs();
-      if (pos >= str.length) break;
+      if (pos >= str.length)
+        break;
       if (str[pos] === ")") {
         pos++;
         return items;
       }
       const left = parseValue();
-      if (left === void 0) break;
+      if (left === void 0)
+        break;
       skipWs();
       if (str[pos] === "." && (pos + 1 >= str.length || /\s/.test(str[pos + 1]) || str[pos + 1] === ")")) {
         pos++;
@@ -753,7 +852,8 @@ function parseLispRecursive(str) {
   return parseValue();
 }
 function lispPairsToObject(pairs) {
-  if (!Array.isArray(pairs)) return pairs;
+  if (!Array.isArray(pairs))
+    return pairs;
   const obj = {};
   for (let i = 0; i < pairs.length - 1; i += 2) {
     const key = pairs[i];
@@ -765,7 +865,8 @@ function lispPairsToObject(pairs) {
   return obj;
 }
 function parseEntity(arr) {
-  if (!Array.isArray(arr) || arr.length < 5) return null;
+  if (!Array.isArray(arr) || arr.length < 5)
+    return null;
   const [type, handle, layer, color, linetype, ...rest] = arr;
   const entity = {
     type: String(type).toUpperCase().replace(/^"|"$/g, ""),
@@ -790,10 +891,23 @@ function parseEntity(arr) {
   }
   return entity;
 }
-function buildEntityCode({ type, layer, bbox }) {
+function propertyPairsToObject(pairs) {
+  if (!Array.isArray(pairs))
+    return null;
+  const obj = {};
+  for (const pair of pairs) {
+    if (Array.isArray(pair) && pair.length >= 2) {
+      obj[String(pair[0])] = pair[1] !== null && pair[1] !== void 0 ? pair[1] : null;
+    }
+  }
+  return obj;
+}
+function buildEntityPropertiesCode({ type, layer, bbox }) {
   const items = [];
-  if (type) items.push(`(cons 0 "${type.replace(/"/g, '\\"')}")`);
-  if (layer) items.push(`(cons 8 "${layer.replace(/"/g, '\\"')}")`);
+  if (type)
+    items.push(`(cons 0 "${type.replace(/"/g, '\\"')}")`);
+  if (layer)
+    items.push(`(cons 8 "${layer.replace(/"/g, '\\"')}")`);
   if (bbox) {
     const parts = bbox.split(",").map((s) => parseFloat(s.trim()));
     if (parts.length === 4) {
@@ -810,32 +924,18 @@ function buildEntityCode({ type, layer, bbox }) {
   const ssgetExpr = items.length ? `(ssget "_X" ${filterExpr})` : '(ssget "_X")';
   return `(progn
 (vl-load-com)
-(defun @e:safe-fn (f ent / r)
-  (setq r (vl-catch-all-apply f (list ent)))
-  (if (vl-catch-all-error-p r) nil r))
-(defun @e:dp (ent / ed typ gcl is)
-  (setq ed (entget ent) typ (cdr (assoc 0 ed)) gcl (assoc 62 ed) is (assoc 6 ed))
-  (append
-    (list typ (cdr (assoc 5 ed)) (cdr (assoc 8 ed))
-      (if gcl (cdr gcl) 256)
-      (if is (cdr is) "ByLayer"))
-    (cond
-      ((wcmatch typ "TEXT,MTEXT,ATTRIB,TCH_TEXT")
-       (list (@e:safe-fn '(lambda (e) (text:remove-fmt (text:get-mtext e))) ent)))
-      ((wcmatch typ "LINE,LWPOLYLINE,POLYLINE,ARC,CIRCLE,SPLINE,ELLIPSE,XLINE,RAY")
-       (list (@e:safe-fn 'curve:get-points ent)))
-      ((= typ "INSERT")
-       (list (@e:safe-fn 'block:get-effectivename ent)))
-      (t nil))))
+${ENTITY_PROPERTIES_LISP}
 (setq @e:total (if (setq @e:ss ${ssgetExpr}) (sslength @e:ss) 0)
       @e:ents nil @e:i 0)
-(while (and @e:ss (< @e:i @e:total)(< (length @e:ents) 3000))
-  (setq @e:ents (cons (@e:dp (ssname @e:ss @e:i)) @e:ents) @e:i (1+ @e:i)))
+(while (and @e:ss (< @e:i @e:total) (< (length @e:ents) 3000))
+  (setq @e:ents (cons (entity:properties (ssname @e:ss @e:i)) @e:ents)
+        @e:i (1+ @e:i)))
 (vl-prin1-to-string (list @e:total (reverse @e:ents))))`;
 }
 function buildTextCode({ layer, bbox, offset, limit }) {
   const items = [`'(0 . "TEXT,MTEXT,ATTRIB,TCH_TEXT")`];
-  if (layer) items.push(`(cons 8 "${layer.replace(/"/g, '\\"')}")`);
+  if (layer)
+    items.push(`(cons 8 "${layer.replace(/"/g, '\\"')}")`);
   if (bbox) {
     const parts = bbox.split(",").map((s) => parseFloat(s.trim()));
     if (parts.length === 4) {
@@ -874,7 +974,7 @@ function buildTextCode({ layer, bbox, offset, limit }) {
 var RESOURCES = [
   { uri: "atlisp://cad/info", name: "CAD Info", description: "CAD \u8FDE\u63A5\u4FE1\u606F", mimeType: "application/json", subscribable: true },
   { uri: "atlisp://dwg/layers", name: "Layers", description: "\u56FE\u5C42\u5217\u8868", mimeType: "application/json", subscribable: true },
-  { uri: "atlisp://dwg/entities", name: "Entities", description: "\u56FE\u5143\u5217\u8868\uFF0C\u8FD4\u56DE\u603B\u6570\u548C\u524D3000\u4E2A\u56FE\u5143\uFF0C\u6587\u672C\u9644\u52A0 text \u5B57\u6BB5\uFF0C\u66F2\u7EBF\u9644\u52A0 points \u6570\u7EC4\uFF0CINSERT \u9644\u52A0 blockName\uFF0C\u652F\u6301 ?type=LINE&layer=0&bbox=0,0,100,100 \u8FC7\u6EE4", mimeType: "application/json", subscribable: true },
+  { uri: "atlisp://dwg/entities", name: "Entities", description: "\u56FE\u5143\u5217\u8868\u3002\u65E0\u53C2\u6570\u65F6\u8FD4\u56DE\u603B\u6570\u548C\u6309\u7C7B\u578B\u7EDF\u8BA1\uFF1B\u6709\u53C2\u6570\u65F6\u8FD4\u56DE filtered \u56FE\u6587\u7684 entity:properties \u5168\u5C5E\u6027 JSON\uFF08ObjectName, Handle, Layer, Color, Center, Radius \u7B49\uFF09\uFF0C\u652F\u6301 ?type=LINE&layer=0&bbox=0,0,100,100", mimeType: "application/json", subscribable: true },
   { uri: "atlisp://dwg/texts", name: "Texts", description: "\u6587\u672C\u5B9E\u4F53\u5185\u5BB9\u5217\u8868 (TEXT/MTEXT/ATTRIB/TCH_TEXT)\uFF0C\u652F\u6301 ?layer=0&bbox=0,0,100,100&limit=5000&offset=0", mimeType: "application/json", subscribable: true },
   { uri: "atlisp://dwg/name", name: "DWG Name", description: "\u5F53\u524D DWG \u6587\u4EF6\u540D", mimeType: "application/json", subscribable: true },
   { uri: "atlisp://dwg/path", name: "DWG Path", description: "\u6587\u4EF6\u5B8C\u6574\u8DEF\u5F84", mimeType: "application/json", subscribable: true },
@@ -886,20 +986,23 @@ var RESOURCES = [
 ];
 function parseQuery(uri) {
   const qIdx = uri.indexOf("?");
-  if (qIdx === -1) return { base: uri, params: {} };
+  if (qIdx === -1)
+    return { base: uri, params: {} };
   const base = uri.substring(0, qIdx);
   const params = {};
   uri.substring(qIdx + 1).split("&").forEach((p) => {
     const eqIdx = p.indexOf("=");
     const k = eqIdx === -1 ? p : p.substring(0, eqIdx);
     const v = eqIdx === -1 ? "" : p.substring(eqIdx + 1);
-    if (k) params[k] = decodeURIComponent(v);
+    if (k)
+      params[k] = decodeURIComponent(v);
   });
   return { base, params };
 }
 function parseTemplateUri(uri) {
   const match = uri.match(/^atlisp:\/\/dwg\/entity\/([^?]+)$/);
-  if (match) return { type: "entity", handle: match[1] };
+  if (match)
+    return { type: "entity", handle: match[1] };
   return null;
 }
 async function listResources(subscribedUris = []) {
@@ -945,8 +1048,10 @@ async function readResource(uri) {
   }
 }
 async function getEntityByHandle(handle) {
-  if (!cad.connected) await cad.connect();
-  if (!cad.connected) return { error: "CAD \u672A\u8FDE\u63A5" };
+  if (!cad.connected)
+    await cad.connect();
+  if (!cad.connected)
+    return { error: "CAD \u672A\u8FDE\u63A5" };
   const code = `(progn
         (vl-load-com)
         (if (setq ent (handent "${handle}"))
@@ -966,7 +1071,8 @@ async function getEntityByHandle(handle) {
     )`;
   try {
     const result = await cad.sendCommandWithResult(code);
-    if (!result || result === "nil") return { error: `\u672A\u627E\u5230\u5B9E\u4F53: ${handle}` };
+    if (!result || result === "nil")
+      return { error: `\u672A\u627E\u5230\u5B9E\u4F53: ${handle}` };
     try {
       return JSON.parse(result);
     } catch {
@@ -978,7 +1084,8 @@ async function getEntityByHandle(handle) {
 }
 async function getCadInfo() {
   const cached = getCached("cad:info");
-  if (cached) return cached;
+  if (cached)
+    return cached;
   if (!cad.connected) {
     await cad.connect();
   }
@@ -1005,9 +1112,12 @@ async function getCadInfo() {
 async function getLayers(filterName = null) {
   const cacheKey = filterName ? `dwg:layers:${filterName}` : "dwg:layers:all";
   const cached = getCached(cacheKey);
-  if (cached) return cached;
-  if (!cad.connected) await cad.connect();
-  if (!cad.connected) return [];
+  if (cached)
+    return cached;
+  if (!cad.connected)
+    await cad.connect();
+  if (!cad.connected)
+    return [];
   try {
     const code = filterName ? `(vl-prin1-to-string (cdr (assoc 2 (tblnext "LAYER" T))))` : `(progn (setq res nil)(while (setq e (tblnext "LAYER" (null res)))(setq res (cons (list (vl-prin1-to-string (cdr (assoc 2 e))) (cdr (assoc 62 e)) (cdr (assoc 70 e))) res))) (reverse res))`;
     const result = await cad.sendCommandWithResult(code);
@@ -1054,8 +1164,10 @@ async function getLayers(filterName = null) {
 async function getEntities(params = {}) {
   const cacheKey = `dwg:entities:${JSON.stringify(params)}`;
   const cached = getCached(cacheKey);
-  if (cached) return cached;
-  if (!cad.connected) await cad.connect();
+  if (cached)
+    return cached;
+  if (!cad.connected)
+    await cad.connect();
   if (!cad.connected) {
     const result = { total: 0, entities: [] };
     setCache(cacheKey, result);
@@ -1066,7 +1178,7 @@ async function getEntities(params = {}) {
     return await getEntitiesSummary(cacheKey);
   }
   try {
-    const code = buildEntityCode({
+    const code = buildEntityPropertiesCode({
       type: params.type || null,
       layer: params.layer || null,
       bbox: params.bbox || null
@@ -1083,7 +1195,7 @@ async function getEntities(params = {}) {
     if (parsed && Array.isArray(parsed) && parsed.length >= 2) {
       total = typeof parsed[0] === "number" ? parsed[0] : 0;
       const rawEntities = Array.isArray(parsed[1]) ? parsed[1] : [];
-      entities = rawEntities.map(parseEntity).filter(Boolean);
+      entities = rawEntities.map(propertyPairsToObject).filter(Boolean);
     }
     const result = { total, entities };
     log(`getEntities: total=${total}, returned=${entities.length}`);
@@ -1157,8 +1269,10 @@ async function getEntitiesSummary(cacheKey) {
 async function getTexts(params = {}) {
   const cacheKey = `dwg:texts:${JSON.stringify(params)}`;
   const cached = getCached(cacheKey);
-  if (cached) return cached;
-  if (!cad.connected) await cad.connect();
+  if (cached)
+    return cached;
+  if (!cad.connected)
+    await cad.connect();
   if (!cad.connected) {
     const result = { total: 0, texts: [] };
     setCache(cacheKey, result);
@@ -1196,8 +1310,10 @@ async function getTexts(params = {}) {
   }
 }
 async function getDwgName() {
-  if (!cad.connected) await cad.connect();
-  if (!cad.connected) return { name: null };
+  if (!cad.connected)
+    await cad.connect();
+  if (!cad.connected)
+    return { name: null };
   try {
     const code = `(vl-princ-to-string (getvar "dwgname"))`;
     const name = await cad.sendCommandWithResult(code);
@@ -1207,8 +1323,10 @@ async function getDwgName() {
   }
 }
 async function getDwgPath() {
-  if (!cad.connected) await cad.connect();
-  if (!cad.connected) return { path: null, name: null };
+  if (!cad.connected)
+    await cad.connect();
+  if (!cad.connected)
+    return { path: null, name: null };
   try {
     const code = `(progn
           (setq prefix (vl-princ-to-string (getvar "dwgprefix")))
@@ -1226,7 +1344,8 @@ async function getDwgPath() {
     }
     if (!parsed) {
       const listResult = parseLispList(result);
-      if (listResult && listResult.length >= 2) parsed = listResult;
+      if (listResult && listResult.length >= 2)
+        parsed = listResult;
     }
     if (parsed && Array.isArray(parsed) && parsed.length >= 2) {
       return { path: String(parsed[0]), name: String(parsed[1]) };
@@ -1239,9 +1358,12 @@ async function getDwgPath() {
 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);
@@ -1255,7 +1377,8 @@ async function getPackages(filterName = null) {
     } catch {
       raw = parseLispList(result) || [];
     }
-    if (!Array.isArray(raw)) raw = [];
+    if (!Array.isArray(raw))
+      raw = [];
     const packages = raw.map((item) => {
       if (Array.isArray(item)) {
         const pkg = { name: "", version: "0.0.0", description: "", loaded: true };
@@ -1264,13 +1387,20 @@ async function getPackages(filterName = null) {
             const [[key, val]] = Object.entries(entry);
             const k = String(key);
             const v = String(val);
-            if (k === ":NAME") pkg.name = v;
-            else if (k === ":VERSION") pkg.version = v;
-            else if (k === ":DESCRIPTION") pkg.description = v;
-            else if (k === ":FULL-NAME") pkg.fullName = v;
-            else if (k === ":AUTHOR") pkg.author = v;
-            else if (k === ":CATEGORY") pkg.category = v;
-            else if (k === ":URL") pkg.url = v;
+            if (k === ":NAME")
+              pkg.name = v;
+            else if (k === ":VERSION")
+              pkg.version = v;
+            else if (k === ":DESCRIPTION")
+              pkg.description = v;
+            else if (k === ":FULL-NAME")
+              pkg.fullName = v;
+            else if (k === ":AUTHOR")
+              pkg.author = v;
+            else if (k === ":CATEGORY")
+              pkg.category = v;
+            else if (k === ":URL")
+              pkg.url = v;
           }
         }
         return pkg;
@@ -1281,15 +1411,22 @@ async function getPackages(filterName = null) {
       if (item && typeof item === "object") {
         const pkg = { name: "", version: "0.0.0", description: "", loaded: true };
         const nameVal = item.name || item.Name || item.NAME || item[":NAME"];
-        if (nameVal) pkg.name = String(nameVal);
+        if (nameVal)
+          pkg.name = String(nameVal);
         const verVal = item.version || item.Version || item.VERSION || item[":VERSION"];
-        if (verVal) pkg.version = String(verVal);
+        if (verVal)
+          pkg.version = String(verVal);
         const descVal = item.description || item.Description || item.DESCRIPTION || item[":DESCRIPTION"];
-        if (descVal) pkg.description = String(descVal);
-        if (item.fullName || item.full_name) pkg.fullName = String(item.fullName || item.full_name);
-        if (item.author || item.Author) pkg.author = String(item.author || item.Author);
-        if (item.category || item.Category) pkg.category = String(item.category || item.Category);
-        if (item.url || item.Url || item.URL) pkg.url = String(item.url || item.Url || item.URL);
+        if (descVal)
+          pkg.description = String(descVal);
+        if (item.fullName || item.full_name)
+          pkg.fullName = String(item.fullName || item.full_name);
+        if (item.author || item.Author)
+          pkg.author = String(item.author || item.Author);
+        if (item.category || item.Category)
+          pkg.category = String(item.category || item.Category);
+        if (item.url || item.Url || item.URL)
+          pkg.url = String(item.url || item.Url || item.URL);
         return pkg;
       }
       return null;
@@ -1315,9 +1452,12 @@ function getPlatforms() {
 async function getDwgList() {
   const cacheKey = "cad:dwgs";
   const cached = getCached(cacheKey);
-  if (cached) return cached;
-  if (!cad.connected) await cad.connect();
-  if (!cad.connected) return [];
+  if (cached)
+    return cached;
+  if (!cad.connected)
+    await cad.connect();
+  if (!cad.connected)
+    return [];
   try {
     const code = `(progn
           (vl-load-com)
@@ -1341,7 +1481,8 @@ async function getDwgList() {
         parsed = listResult;
       }
     }
-    if (!Array.isArray(parsed)) parsed = [];
+    if (!Array.isArray(parsed))
+      parsed = [];
     const dwgList = parsed.map((item) => {
       if (Array.isArray(item) && item.length >= 2) {
         return { name: String(item[0]), path: String(item[1]) };
@@ -1368,7 +1509,8 @@ function loadStandardsFile(filename) {
 var standardsCache = /* @__PURE__ */ new Map();
 function getCachedStandards(key) {
   const entry = standardsCache.get(key);
-  if (entry && Date.now() - entry.timestamp < 3e4) return entry.data;
+  if (entry && Date.now() - entry.timestamp < 3e4)
+    return entry.data;
   standardsCache.delete(key);
   return null;
 }
@@ -1377,16 +1519,20 @@ function setCachedStandards(key, data) {
 }
 function getDraftingStandards() {
   const cached = getCachedStandards("drafting");
-  if (cached) return cached;
+  if (cached)
+    return cached;
   const data = loadStandardsFile("drafting.json");
-  if (data) setCachedStandards("drafting", data);
+  if (data)
+    setCachedStandards("drafting", data);
   return data || { error: "\u5236\u56FE\u89C4\u8303\u6587\u4EF6\u52A0\u8F7D\u5931\u8D25" };
 }
 function getCodingStandards() {
   const cached = getCachedStandards("coding");
-  if (cached) return cached;
+  if (cached)
+    return cached;
   const data = loadStandardsFile("coding.json");
-  if (data) setCachedStandards("coding", data);
+  if (data)
+    setCachedStandards("coding", data);
   return data || { error: "\u7F16\u7801\u89C4\u8303\u6587\u4EF6\u52A0\u8F7D\u5931\u8D25" };
 }
 
@@ -1601,9 +1747,11 @@ var SseSession = class {
     return lines.join("\n") + "\n\n";
   }
   _setupDrain() {
-    if (typeof this.#res.on !== "function") return;
+    if (typeof this.#res.on !== "function")
+      return;
     this.#drainHandler = () => {
-      if (!this.#active) return;
+      if (!this.#active)
+        return;
       if (this.#backpressureBuffer.length > 0) {
         this._drainBuffer();
       }
@@ -1625,7 +1773,8 @@ var SseSession = class {
     }
   }
   _write(content) {
-    if (!this.#active) return false;
+    if (!this.#active)
+      return false;
     try {
       if (this.#backpressureBuffer.length > 0) {
         this.#backpressureBuffer.push(content);
@@ -1753,7 +1902,8 @@ function persistSessionData(clientId, sessionData) {
 function loadPersistedSessionData(clientId) {
   try {
     const filePath = getSessionStorePath(clientId);
-    if (!fs4.existsSync(filePath)) return null;
+    if (!fs4.existsSync(filePath))
+      return null;
     const raw = fs4.readFileSync(filePath, "utf-8");
     const store = JSON.parse(raw);
     if (Date.now() - store.savedAt > SESSION_STORE_TTL) {
@@ -1913,7 +2063,8 @@ var SessionTransport = class {
     this._started = true;
   }
   async send(message) {
-    if (this._closed) return;
+    if (this._closed)
+      return;
     if (this._pendingRequest) {
       const { resolve, reject, timeout } = this._pendingRequest;
       clearTimeout(timeout);
@@ -1922,7 +2073,8 @@ var SessionTransport = class {
     }
   }
   async close() {
-    if (this._closed) return;
+    if (this._closed)
+      return;
     this._closed = true;
     if (this._pendingRequest) {
       const { reject, timeout } = this._pendingRequest;
@@ -2234,10 +2386,14 @@ ${generateSuggestions(entities, layers)}`
 }
 function generateSuggestions(entities, layers) {
   const suggestions = [];
-  if (entities.total > 1e3) suggestions.push("- \u56FE\u7EB8\u5B9E\u4F53\u8F83\u591A\uFF0C\u5EFA\u8BAE\u4F7F\u7528\u56FE\u5C42\u5206\u7C7B\u7BA1\u7406");
-  if (layers.length > 20) suggestions.push("- \u56FE\u5C42\u8F83\u591A\uFF0C\u5EFA\u8BAE\u6E05\u7406\u672A\u4F7F\u7528\u7684\u56FE\u5C42");
-  if (entities.byType.LINE && entities.byType.LINE > 500) suggestions.push("- \u7EBF\u6761\u8F83\u591A\uFF0C\u53EF\u8003\u8651\u4F7F\u7528 BLOCK \u51CF\u5C11\u5B9E\u4F53\u6570\u91CF");
-  if (!entities.byType.DIMENSION) suggestions.push("- \u672A\u53D1\u73B0\u5C3A\u5BF8\u6807\u6CE8\uFF0C\u5EFA\u8BAE\u6DFB\u52A0\u6807\u6CE8");
+  if (entities.total > 1e3)
+    suggestions.push("- \u56FE\u7EB8\u5B9E\u4F53\u8F83\u591A\uFF0C\u5EFA\u8BAE\u4F7F\u7528\u56FE\u5C42\u5206\u7C7B\u7BA1\u7406");
+  if (layers.length > 20)
+    suggestions.push("- \u56FE\u5C42\u8F83\u591A\uFF0C\u5EFA\u8BAE\u6E05\u7406\u672A\u4F7F\u7528\u7684\u56FE\u5C42");
+  if (entities.byType.LINE && entities.byType.LINE > 500)
+    suggestions.push("- \u7EBF\u6761\u8F83\u591A\uFF0C\u53EF\u8003\u8651\u4F7F\u7528 BLOCK \u51CF\u5C11\u5B9E\u4F53\u6570\u91CF");
+  if (!entities.byType.DIMENSION)
+    suggestions.push("- \u672A\u53D1\u73B0\u5C3A\u5BF8\u6807\u6CE8\uFF0C\u5EFA\u8BAE\u6DFB\u52A0\u6807\u6CE8");
   return suggestions.length ? suggestions.join("\n") : "- \u56FE\u7EB8\u7ED3\u6784\u826F\u597D";
 }
 async function generateBatchLinesPrompt(args) {
@@ -2782,7 +2938,8 @@ var Metrics = class {
     bucket.sum += value;
     bucket.min = Math.min(bucket.min, value);
     bucket.max = Math.max(bucket.max, value);
-    if (!bucket.values) bucket.values = [];
+    if (!bucket.values)
+      bucket.values = [];
     bucket.values.push(value);
     this.histograms.set(key, bucket);
   }
@@ -2873,9 +3030,15 @@ var RESOURCE_TEMPLATES = [
     mimeType: "application/json"
   },
   {
-    uriTemplate: "atlisp://dwg/entities?type={type}",
-    name: "Entities by Type",
-    description: "\u6309\u7C7B\u578B\u67E5\u8BE2\u5B9E\u4F53\u5217\u8868",
+    uriTemplate: "atlisp://dwg/entities",
+    name: "Entities Summary",
+    description: "\u8FD4\u56DE\u56FE\u5143\u603B\u6570\u548C\u6309\u7C7B\u578B\u7EDF\u8BA1\u5217\u8868",
+    mimeType: "application/json"
+  },
+  {
+    uriTemplate: "atlisp://dwg/entities?type={type}&layer={layer}&bbox={bbox}",
+    name: "Filtered Entities",
+    description: "\u6309 type/layer/bbox \u8FC7\u6EE4\u56FE\u5143\uFF0C\u8FD4\u56DE entity:properties \u5168\u5C5E\u6027 JSON\uFF08ObjectName, Handle, Layer, Color, Center, Radius \u7B49\uFF09",
     mimeType: "application/json"
   },
   {
@@ -3015,7 +3178,8 @@ async function evalLisp(code, withResult = false, encoding = null) {
     return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   }
   const trimmed = (code || "").trim();
-  if (!trimmed) return { content: [{ type: "text", text: "\u547D\u4EE4\u4E3A\u7A7A\uFF0C\u672A\u53D1\u9001" }] };
+  if (!trimmed)
+    return { content: [{ type: "text", text: "\u547D\u4EE4\u4E3A\u7A7A\uFF0C\u672A\u53D1\u9001" }] };
   try {
     if (withResult) {
       const result = await cad.sendCommandWithResult(trimmed, encoding);
@@ -3035,14 +3199,17 @@ async function getCadInfo2() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "CAD \u672A\u8FDE\u63A5" }] };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "CAD \u672A\u8FDE\u63A5" }] };
   const info = await cad.getInfo();
   return { content: [{ type: "text", text: info }] };
 }
 async function atCommand(command) {
-  if (!cad.connected) return { content: [{ type: "text", text: "\u8BF7\u5148\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u8BF7\u5148\u8FDE\u63A5 CAD" }], isError: true };
   const trimmed = (command || "").trim();
-  if (!trimmed) return { content: [{ type: "text", text: "\u547D\u4EE4\u4E3A\u7A7A\uFF0C\u672A\u53D1\u9001" }] };
+  if (!trimmed)
+    return { content: [{ type: "text", text: "\u547D\u4EE4\u4E3A\u7A7A\uFF0C\u672A\u53D1\u9001" }] };
   await cad.sendCommand(trimmed + "\n");
   return { content: [{ type: "text", text: "\u5DF2\u53D1\u9001\u547D\u4EE4" }] };
 }
@@ -3050,7 +3217,8 @@ async function newDocument() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const result = await cad.newDoc();
   if (result) {
     return { content: [{ type: "text", text: "\u5DF2\u5728 CAD \u4E2D\u65B0\u5EFA\u7A7A\u767D\u6587\u6863" }] };
@@ -3061,7 +3229,8 @@ async function bringToFront() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const result = await cad.bringToFront();
   if (result) {
     return { content: [{ type: "text", text: "\u5DF2\u5C06 CAD \u7A97\u53E3\u5207\u6362\u5230\u524D\u53F0" }] };
@@ -3072,7 +3241,8 @@ async function installAtlisp() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const installCode = `(progn(vl-load-com)(setq s strcat h "http" o(vlax-create-object (s"win"h".win"h"request.5.1"))v vlax-invoke e eval r read)(v o'open "get" (s h"://atlisp.""cn/@"):vlax-true)(v o'send)(v o'WaitforResponse 1000)(e(r(vlax-get-property o'ResponseText))))`;
   await cad.sendCommand(installCode + "\n");
   return { content: [{ type: "text", text: "\u5DF2\u53D1\u9001 @lisp \u5B89\u88C5\u4EE3\u7801\u5230 CAD" }] };
@@ -3081,10 +3251,12 @@ async function listFunctionsInCad() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   try {
     const result = await cad.sendCommandWithResult("(atoms-family 0)", null);
-    if (result) return { content: [{ type: "text", text: result }] };
+    if (result)
+      return { content: [{ type: "text", text: result }] };
     return { content: [{ type: "text", text: "CAD \u51FD\u6570\u5217\u8868\u4E3A\u7A7A" }] };
   } catch (e) {
     return { content: [{ type: "text", text: `\u9519\u8BEF: ${e.message}` }], isError: true };
@@ -3139,7 +3311,8 @@ async function initAtlisp() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(if (null @::load-module)
 	   (progn
 	     (vl-load-com)
@@ -3179,12 +3352,15 @@ async function fetchPackages() {
   return cachedPackages || MOCK_PACKAGES;
 }
 function flattenPackages(data) {
-  if (Array.isArray(data)) return data;
-  if (data && Array.isArray(data.packages)) return data.packages;
+  if (Array.isArray(data))
+    return data;
+  if (data && Array.isArray(data.packages))
+    return data.packages;
   return [];
 }
 async function listPackages() {
-  if (!cad.connected) await cad.connect();
+  if (!cad.connected)
+    await cad.connect();
   if (!cad.connected) {
     const data2 = await fetchPackages();
     const items2 = flattenPackages(data2);
@@ -3192,7 +3368,8 @@ async function listPackages() {
     return { content: [{ type: "text", text: text2 }] };
   }
   const result = await cad.sendCommandWithResult("(@::package-list-in-local)");
-  if (result && result !== "nil") return { content: [{ type: "text", text: result }] };
+  if (result && result !== "nil")
+    return { content: [{ type: "text", text: result }] };
   const data = await fetchPackages();
   const items = flattenPackages(data);
   const text = items.length ? `\u4ECE\u6CE8\u518C\u8868\u83B7\u53D6\u7684 @lisp \u5305:
@@ -3212,10 +3389,12 @@ async function searchPackages(query) {
     for (const p of items) {
       const name = (p.name || "").toLowerCase();
       const desc = (p.description || "").toLowerCase();
-      if (name.includes(q) || desc.includes(q)) results.push(p);
+      if (name.includes(q) || desc.includes(q))
+        results.push(p);
     }
   } else {
-    for (const p of items) results.push(p);
+    for (const p of items)
+      results.push(p);
   }
   if (results.length === 0) {
     return { content: [{ type: "text", text: `\u672A\u627E\u5230\u5305\u542B "${query}" \u7684\u5305` }] };
@@ -3267,7 +3446,8 @@ function writeCacheToDisk(data) {
 }
 async function fetchFunctions() {
   const diskCache = readCacheFromDisk();
-  if (diskCache) return diskCache;
+  if (diskCache)
+    return diskCache;
   try {
     const response = await fetch(FUNCTIONS_URL, { headers: { "User-Agent": "atlisp-mcp" } });
     if (response.ok) {
@@ -3287,7 +3467,8 @@ async function getFunctionUsage(funcName, packageName) {
     if (data) {
       const funcs = Object.values(data.all_functions || {});
       const func = funcs.find((f2) => f2.name === funcName || f2.name === `${packageName}:${funcName}`);
-      if (func) results.push(func);
+      if (func)
+        results.push(func);
     }
     if (results.length === 0 && FUNCTIONS_DIR) {
       try {
@@ -3296,7 +3477,8 @@ async function getFunctionUsage(funcName, packageName) {
           const raw = fs6.readFileSync(path8.join(FUNCTIONS_DIR, file), "utf-8");
           const data2 = JSON.parse(raw);
           const func = data2.functions?.find((f2) => f2.name === funcName);
-          if (func) results.push(func);
+          if (func)
+            results.push(func);
         }
       } catch {
       }
@@ -3364,7 +3546,8 @@ async function getEntity(handle) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (setq ent (handent "${handle}"))
@@ -3396,7 +3579,8 @@ async function setEntityProperty(handle, property, value) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   let propCode = "";
   switch (property) {
     case "layer":
@@ -3439,7 +3623,8 @@ async function deleteEntity(handle) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (setq ent (handent "${handle}"))
@@ -3464,12 +3649,15 @@ async function selectEntities(filter) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   let filterCode = "nil";
   if (filter && (filter.type || filter.layer)) {
     const items = [];
-    if (filter.type) items.push(`'(0 . "${filter.type}")`);
-    if (filter.layer) items.push(`'(8 . "${filter.layer}")`);
+    if (filter.type)
+      items.push(`'(0 . "${filter.type}")`);
+    if (filter.layer)
+      items.push(`'(8 . "${filter.layer}")`);
     filterCode = `(list ${items.join(" ")})`;
   }
   const code = `(progn
@@ -3501,7 +3689,8 @@ async function createLayer(name, color = 7, linetype = "Continuous") {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (not (tblsearch "LAYER" "${name}"))
@@ -3537,7 +3726,8 @@ async function deleteLayer(name) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (cond
@@ -3571,7 +3761,8 @@ async function setLayerProperty(name, property, value) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   let propCode = "";
   switch (property) {
     case "color":
@@ -3619,7 +3810,8 @@ async function setCurrentLayer(name) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (tblsearch "LAYER" "${name}")
@@ -3646,7 +3838,8 @@ async function createBlock(name, entities) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (not (tblsearch "BLOCK" "${name}"))
@@ -3683,7 +3876,8 @@ async function insertBlock(blockName, point, scale = 1, rotation = 0) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const coords = Array.isArray(point) ? point : point.split(",").map((s) => parseFloat(s.trim()));
   if (coords.length < 2) {
     return { content: [{ type: "text", text: "\u63D2\u5165\u70B9\u683C\u5F0F\u9519\u8BEF\uFF0C\u9700\u8981 x,y \u6216 [x,y,z]" }], isError: true };
@@ -3713,7 +3907,8 @@ async function getBlocks() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (setq blocks nil)
@@ -3736,7 +3931,8 @@ async function explodeBlock(handle) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (setq ent (handent "${handle}"))
@@ -3763,7 +3959,8 @@ async function openDwg(filePath) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const normalizedPath = filePath.replace(/\\/g, "\\\\");
   const code = `(progn
         (vl-load-com)
@@ -3800,7 +3997,8 @@ async function saveDwg(filePath = null) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = filePath ? `(progn
             (vl-load-com)
             (command "._SAVEAS" "${filePath.replace(/\\/g, "\\\\")}")
@@ -3824,7 +4022,8 @@ async function exportPdf(outputPath, layout = "Model") {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const normalizedPath = outputPath.replace(/\\/g, "\\\\");
   const code = `(progn
         (vl-load-com)
@@ -3852,7 +4051,8 @@ async function closeDwg(save = false) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if ${save ? "T" : "nil"}
@@ -3874,7 +4074,8 @@ async function createDimension(type, points, style = {}) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   let dimCode = "";
   const validTypes = ["ALIGNED", "LINEAR", "ORDINATE", "RADIAL", "DIAMETER", "ANGULAR"];
   const dimType = (type || "ALIGNED").toUpperCase();
@@ -3916,7 +4117,8 @@ async function getDimensionValue(handle) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (setq ent (handent "${handle}"))
@@ -3947,7 +4149,8 @@ async function createHatch(patternName, boundary, scale = 1, angle = 0) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (command "._BHATCH" "p" "${patternName}" "s" "s" "sc" ${scale} "an" ${angle} "")
@@ -3967,12 +4170,17 @@ async function setHatchProperties(handle, props) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   let propCode = "";
-  if (props.pattern) propCode += `(command "._HATCHEDIT" "${handle}" "p" "${props.pattern}")`;
-  if (props.scale) propCode += `(command "._HATCHEDIT" "${handle}" "s" ${props.scale})`;
-  if (props.angle) propCode += `(command "._HATCHEDIT" "${handle}" "an" ${props.angle})`;
-  if (props.color) propCode += `(command "._HATCHEDIT" "${handle}" "c" ${props.color})`;
+  if (props.pattern)
+    propCode += `(command "._HATCHEDIT" "${handle}" "p" "${props.pattern}")`;
+  if (props.scale)
+    propCode += `(command "._HATCHEDIT" "${handle}" "s" ${props.scale})`;
+  if (props.angle)
+    propCode += `(command "._HATCHEDIT" "${handle}" "an" ${props.angle})`;
+  if (props.color)
+    propCode += `(command "._HATCHEDIT" "${handle}" "c" ${props.color})`;
   const code = `(progn
         (vl-load-com)
         ${propCode}
@@ -3989,7 +4197,8 @@ async function getBlockAttributes(blockHandle) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (setq ent (handent "${blockHandle}"))
@@ -4018,7 +4227,8 @@ async function setBlockAttribute(blockHandle, tag, value) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (setq ent (handent "${blockHandle}"))
@@ -4054,7 +4264,8 @@ async function zoomToExtents() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (command "._ZOOM" "E")
@@ -4071,7 +4282,8 @@ async function zoomToWindow(p1, p2) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(command "._ZOOM" "W" (list ${p1}) (list ${p2}))`;
   try {
     await cad.sendCommand(code + "\n");
@@ -4084,7 +4296,8 @@ async function createNamedView(viewName, center = null) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = center ? `(command ".-VIEW" "S" "${viewName}" "C" (list ${center}))` : `(command ".-VIEW" "S" "${viewName}")`;
   try {
     await cad.sendCommand(code + "\n");
@@ -4097,7 +4310,8 @@ async function restoreNamedView(viewName) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(command ".-VIEW" "R" "${viewName}")`;
   try {
     await cad.sendCommand(code + "\n");
@@ -4110,7 +4324,8 @@ async function listNamedViews() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (setq views nil)
@@ -4130,7 +4345,8 @@ async function exportDxf(outputPath, version2 = "R2018") {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const normalizedPath = outputPath.replace(/\\/g, "\\\\");
   const versionMap = {
     "R2018": "AC1027",
@@ -4161,7 +4377,8 @@ async function exportDwf(outputPath) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const normalizedPath = outputPath.replace(/\\/g, "\\\\");
   const code = `(progn
         (vl-load-com)
@@ -4182,7 +4399,8 @@ async function batchSetLayer(handles, layerName) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   if (!Array.isArray(handles) || handles.length === 0) {
     return { content: [{ type: "text", text: "\u53E5\u67C4\u5217\u8868\u4E3A\u7A7A" }], isError: true };
   }
@@ -4207,7 +4425,8 @@ async function createUcs(name, origin = "0,0,0", xAxis = "1,0,0", yAxis = "0,1,0
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (not (tblsearch "UCS" "${name}"))
@@ -4238,7 +4457,8 @@ async function setUcs(name) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (tblsearch "UCS" "${name}")
@@ -4263,7 +4483,8 @@ async function listUcs() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (setq ucsList nil)
@@ -4286,7 +4507,8 @@ async function deleteUcs(name) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (tblsearch "UCS" "${name}")
@@ -4311,7 +4533,8 @@ async function getCurrentUcs() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (vla-get-activeutilities (vla-get-document (vla-get-application (vlax-get-acad-object))))
@@ -4328,7 +4551,8 @@ async function createLayout(name) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (not (tblsearch "LAYOUT" "${name}"))
@@ -4356,7 +4580,8 @@ async function setLayout(name) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (vlax-for layout (vla-get-layouts (vla-get-activedocument (vla-get-application (vlax-get-acad-object))))
@@ -4386,7 +4611,8 @@ async function listLayouts() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (setq layouts nil)
@@ -4409,7 +4635,8 @@ async function deleteLayout(name) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   if (name === "Model" || name === "\u6A21\u578B") {
     return { content: [{ type: "text", text: "\u65E0\u6CD5\u5220\u9664\u6A21\u578B\u7A7A\u95F4" }], isError: true };
   }
@@ -4437,7 +4664,8 @@ async function getCurrentLayout() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(vl-prin1-to-string (getvar "CTAB"))`;
   try {
     const result = await cad.sendCommandWithResult(code);
@@ -4450,7 +4678,8 @@ async function renameLayout(oldName, newName) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (tblsearch "LAYOUT" "${oldName}")
@@ -4477,7 +4706,8 @@ async function plotToPdf(outputPath, layout = "Model", style = {}) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const normalizedPath = outputPath.replace(/\\/g, "\\\\");
   const paperSize = style.paperSize || "A4";
   const plotScale = style.plotScale || "1:1";
@@ -4510,7 +4740,8 @@ async function plotToPrinter(printerName, layout = "Model") {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (setq doc (vla-get-activedocument (vlax-get-acad-object)))
@@ -4536,7 +4767,8 @@ async function createGroup(name, handles) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   if (!Array.isArray(handles) || handles.length === 0) {
     return { content: [{ type: "text", text: "\u53E5\u67C4\u5217\u8868\u4E3A\u7A7A" }], isError: true };
   }
@@ -4562,7 +4794,8 @@ async function deleteGroup(name) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (tblsearch "GROUP" "${name}")
@@ -4587,7 +4820,8 @@ async function listGroups() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (setq groups nil)
@@ -4607,7 +4841,8 @@ async function getGroupEntities(groupName) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (tblsearch "GROUP" "${groupName}")
@@ -4645,7 +4880,8 @@ async function measureDistance(p1, p2) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (setq pt1 (list ${p1}) pt2 (list ${p2}))
@@ -4669,7 +4905,8 @@ async function measureArea(points) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const pts = Array.isArray(points) ? points : points.split(/[\s,]+/).filter(Boolean);
   if (pts.length < 3) {
     return { content: [{ type: "text", text: "\u81F3\u5C11\u9700\u8981 3 \u4E2A\u70B9" }], isError: true };
@@ -4706,7 +4943,8 @@ async function getEntityInfo(handle) {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  if (!cad.connected)
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   const code = `(progn
         (vl-load-com)
         (if (setq ent (handent "${handle}"))
@@ -4741,7 +4979,8 @@ async function ensureConnected() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) throw new Error("CAD \u672A\u8FDE\u63A5");
+  if (!cad.connected)
+    throw new Error("CAD \u672A\u8FDE\u63A5");
 }
 function parseHandleList(handles) {
   if (typeof handles === "string") {
@@ -4982,7 +5221,8 @@ async function ensureConnected2() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) throw new Error("CAD \u672A\u8FDE\u63A5");
+  if (!cad.connected)
+    throw new Error("CAD \u672A\u8FDE\u63A5");
 }
 async function getXdata(handle, appName = "ACAD") {
   await ensureConnected2();
@@ -5188,10 +5428,11 @@ async function searchByXdata(appName, key, value) {
 async function exportXdataToFile(handle, filePath) {
   await ensureConnected2();
   const xdata = await getAllEntityXdata(handle);
-  if (!xdata.success) return xdata;
+  if (!xdata.success)
+    return xdata;
   try {
-    const fs8 = await import("fs");
-    fs8.writeFileSync(filePath, JSON.stringify(xdata.xdata, null, 2));
+    const fs9 = await import("fs");
+    fs9.writeFileSync(filePath, JSON.stringify(xdata.xdata, null, 2));
     return { handle, filePath, success: true };
   } catch (e) {
     return { error: e.message, success: false };
@@ -5200,8 +5441,8 @@ async function exportXdataToFile(handle, filePath) {
 async function importXdataFromFile(handle, filePath, appName) {
   await ensureConnected2();
   try {
-    const fs8 = await import("fs");
-    const data = fs8.readFileSync(filePath, "utf8");
+    const fs9 = await import("fs");
+    const data = fs9.readFileSync(filePath, "utf8");
     const xdata = JSON.parse(data);
     if (appName && xdata[appName]) {
       return await setXdata(handle, appName, xdata[appName]);
@@ -5221,7 +5462,8 @@ async function ensureConnected3() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) throw new Error("CAD \u672A\u8FDE\u63A5");
+  if (!cad.connected)
+    throw new Error("CAD \u672A\u8FDE\u63A5");
 }
 async function createSheetSet(name, description = "") {
   await ensureConnected3();
@@ -5422,11 +5664,14 @@ async function ensureConnected4() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) throw new Error("CAD \u672A\u8FDE\u63A5");
+  if (!cad.connected)
+    throw new Error("CAD \u672A\u8FDE\u63A5");
 }
 function parsePoint(point) {
-  if (Array.isArray(point)) return point.join(" ");
-  if (typeof point === "string") return point;
+  if (Array.isArray(point))
+    return point.join(" ");
+  if (typeof point === "string")
+    return point;
   return "0,0,0";
 }
 async function createBox(center, length, width, height) {
@@ -5686,7 +5931,8 @@ async function ensureConnected5() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) throw new Error("CAD \u672A\u8FDE\u63A5");
+  if (!cad.connected)
+    throw new Error("CAD \u672A\u8FDE\u63A5");
 }
 async function createDimensionStyle(name, color = "bylayer", arrow = "ClosedFilled", textStyle = "") {
   await ensureConnected5();
@@ -5912,7 +6158,8 @@ async function ensureConnected6() {
   if (!cad.connected) {
     await cad.connect();
   }
-  if (!cad.connected) throw new Error("CAD \u672A\u8FDE\u63A5");
+  if (!cad.connected)
+    throw new Error("CAD \u672A\u8FDE\u63A5");
 }
 async function attachPdf(point, pdfPath, scale = 1, rotation = 0) {
   await ensureConnected6();
@@ -6352,7 +6599,8 @@ function validateToolArgs(name, args) {
     const baseType = type.replace("?", "");
     const val = args[key];
     if (val === void 0 || val === null) {
-      if (isOptional) continue;
+      if (isOptional)
+        continue;
       throw new Error(`Missing required argument: ${key}`);
     }
     const actualType = typeof args[key];
@@ -6397,7 +6645,8 @@ ${CAD_PLATFORMS.join("\n")}
   },
   import_funlib: async (a) => {
     const data = await loadAtlibFunctionLib();
-    if (!data) return { content: [{ type: "text", text: "\u52A0\u8F7D\u51FD\u6570\u5E93\u5931\u8D25" }], isError: true };
+    if (!data)
+      return { content: [{ type: "text", text: "\u52A0\u8F7D\u51FD\u6570\u5E93\u5931\u8D25" }], isError: true };
     if (a.format === "list") {
       const items = Object.values(data.all_functions || {}).map((f) => `${f.name}: ${f.description || ""}`);
       return { content: [{ type: "text", text: items.join("\n") }] };
@@ -8220,7 +8469,8 @@ function notifyResourceChanges(toolName) {
 }
 async function handleToolCall(name, args) {
   const handler = TOOL_HANDLERS[name];
-  if (!handler) return { content: [{ type: "text", text: `\u672A\u77E5\u5DE5\u5177: ${name}` }], isError: true };
+  if (!handler)
+    return { content: [{ type: "text", text: `\u672A\u77E5\u5DE5\u5177: ${name}` }], isError: true };
   try {
     validateToolArgs(name, args || {});
     const result = await handler(args || {});
@@ -8280,10 +8530,12 @@ var RateLimiter = class {
     this.keyLimits = /* @__PURE__ */ new Map();
   }
   getKeyLimit(apiKey2) {
-    if (!apiKey2) return this.defaultLimit;
+    if (!apiKey2)
+      return this.defaultLimit;
     if (config_default.apiKeys && config_default.apiKeys.length > 0) {
       const found = config_default.apiKeys.find((k) => k.key === apiKey2);
-      if (found) return found.limit;
+      if (found)
+        return found.limit;
     }
     if (config_default.apiKey && apiKey2 === config_default.apiKey) {
       return config_default.apiKeyRateLimit || 1e3;
@@ -8291,10 +8543,12 @@ var RateLimiter = class {
     return this.defaultLimit;
   }
   getKeyInfo(apiKey2) {
-    if (!apiKey2) return { name: "anonymous", limit: this.defaultLimit };
+    if (!apiKey2)
+      return { name: "anonymous", limit: this.defaultLimit };
     if (config_default.apiKeys && config_default.apiKeys.length > 0) {
       const found = config_default.apiKeys.find((k) => k.key === apiKey2);
-      if (found) return { name: found.name || apiKey2, limit: found.limit };
+      if (found)
+        return { name: found.name || apiKey2, limit: found.limit };
     }
     if (config_default.apiKey && apiKey2 === config_default.apiKey) {
       return { name: "admin", limit: config_default.apiKeyRateLimit || 1e3 };
@@ -8390,7 +8644,8 @@ var JSON_CONTENT_TYPES = ["application/json", "application/json-rpc", "applicati
 function createJsonBodyParser() {
   return async (req, res, next) => {
     const ct = (req.headers["content-type"] || "").toLowerCase();
-    if (!JSON_CONTENT_TYPES.some((t) => ct.startsWith(t))) return next();
+    if (!JSON_CONTENT_TYPES.some((t) => ct.startsWith(t)))
+      return next();
     try {
       const chunks = [];
       for await (const chunk of req) {
@@ -8423,9 +8678,11 @@ function createAuthMiddleware() {
   const PUBLIC_PATHS = ["/health"];
   return (req, res, next) => {
     if (apiKey) {
-      if (PUBLIC_PATHS.includes(req.path)) return next();
+      if (PUBLIC_PATHS.includes(req.path))
+        return next();
       const auth = req.get("Authorization");
-      if (auth === `Bearer ${apiKey}`) return next();
+      if (auth === `Bearer ${apiKey}`)
+        return next();
       return res.status(401).json({ error: "Unauthorized" });
     }
     next();
@@ -8433,14 +8690,16 @@ function createAuthMiddleware() {
 }
 function createCorsMiddleware() {
   return (req, res, next) => {
-    if (!enableCors) return next();
+    if (!enableCors)
+      return next();
     res.setHeader("Access-Control-Allow-Origin", corsOrigin);
     res.setHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS, CONNECT");
     res.setHeader("Access-Control-Allow-Headers", "Content-Type, Authorization, Accept, mcp-session-id, last-event-id");
     res.setHeader("Access-Control-Expose-Headers", "mcp-session-id, content-type, x-accel-buffering");
     res.setHeader("Access-Control-Max-Age", "86400");
     res.setHeader("Vary", "Accept");
-    if (req.method === "OPTIONS") return res.status(204).end();
+    if (req.method === "OPTIONS")
+      return res.status(204).end();
     next();
   };
 }
@@ -8852,7 +9111,8 @@ For more info: https://atlisp.cn
     }
   }
 }
-if (config_default.apiKey) log("API Key authentication enabled");
+if (config_default.apiKey)
+  log("API Key authentication enabled");
 async function initCadConnection() {
   log("Attempting to connect to CAD on startup...");
   try {