@atlisp/mcp 1.5.0 → 1.5.2

package/dist/atlisp-mcp.js

@@ -1,114 +1,17 @@
 #!/usr/bin/env node
 
 // src/atlisp-mcp.js
-import path7 from "path";
-import fs6 from "fs";
+import path8 from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 import { createRequire } from "module";
-import os4 from "os";
-import express from "express";
-import rawBody from "raw-body";
-import iconv from "iconv-lite";
-import rateLimit from "express-rate-limit";
-import { randomUUID as randomUUID4 } from "crypto";
-import { AsyncLocalStorage } from "async_hooks";
-import { Server } from "@modelcontextprotocol/sdk/server/index.js";
+import express2 from "express";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 
-// src/session-transport.js
-import { randomUUID } from "crypto";
-var SESSION_TIMEOUT = 30 * 60 * 1e3;
-var SessionTransport = class {
-  constructor(sessionId) {
-    this.sessionId = sessionId || randomUUID();
-    this.onclose = null;
-    this.onerror = null;
-    this.onmessage = null;
-    this._pendingRequest = null;
-    this._started = false;
-    this._closed = false;
-    this._cleanupTimer = null;
-  }
-  async start() {
-    if (this._started) {
-      throw new Error("Transport already started");
-    }
-    this._started = true;
-  }
-  async send(message) {
-    if (this._closed) return;
-    if (this._pendingRequest) {
-      const { resolve, reject, timeout } = this._pendingRequest;
-      clearTimeout(timeout);
-      this._pendingRequest = null;
-      resolve(message);
-    }
-  }
-  async close() {
-    if (this._closed) return;
-    this._closed = true;
-    if (this._pendingRequest) {
-      const { reject, timeout } = this._pendingRequest;
-      clearTimeout(timeout);
-      this._pendingRequest = null;
-      reject(new Error("Transport closed"));
-    }
-    this._clearCleanupTimer();
-    this.onclose?.();
-  }
-  async handleRequest(message, timeoutMs = 6e4) {
-    if (this._closed) {
-      throw new Error("Transport closed");
-    }
-    if (!message || !message.method) {
-      throw new Error("Invalid message");
-    }
-    if (!message.id) {
-      this.onmessage?.(message);
-      return null;
-    }
-    return new Promise((resolve, reject) => {
-      const timeout = setTimeout(() => {
-        if (this._pendingRequest?.resolve === resolve) {
-          this._pendingRequest = null;
-          reject(new Error("Request timeout"));
-        }
-      }, timeoutMs);
-      this._pendingRequest = { resolve, reject, timeout };
-      this.onmessage?.(message);
-    });
-  }
-  resetCleanupTimer() {
-    this._clearCleanupTimer();
-    this._cleanupTimer = setTimeout(() => {
-      this.close();
-    }, SESSION_TIMEOUT);
-  }
-  _clearCleanupTimer() {
-    if (this._cleanupTimer) {
-      clearTimeout(this._cleanupTimer);
-      this._cleanupTimer = null;
-    }
-  }
-};
-
-// src/atlisp-mcp.js
-import {
-  ListToolsRequestSchema,
-  CallToolRequestSchema,
-  ListResourcesRequestSchema,
-  ReadResourceRequestSchema,
-  SubscribeRequestSchema,
-  UnsubscribeRequestSchema,
-  ListPromptsRequestSchema,
-  GetPromptRequestSchema
-} from "@modelcontextprotocol/sdk/types.js";
-
 // src/cad.js
 import { spawn } from "child_process";
 import path from "path";
 import { fileURLToPath } from "url";
-import { randomUUID as randomUUID2 } from "crypto";
+import { randomUUID } from "crypto";
 
 // src/constants.js
 var CAD_PLATFORMS = ["AutoCAD", "ZWCAD", "GStarCAD", "BricsCAD"];
@@ -133,6 +36,27 @@ var MOCK_PACKAGES = [
 ];
 
 // src/config.js
+import { z } from "zod";
+var envSchema = z.object({
+  PORT: z.string().optional().default("8110"),
+  HOST: z.string().optional().default("0.0.0.0"),
+  TRANSPORT: z.enum(["http", "stdio"]).optional().default("http"),
+  MCP_API_KEY: z.string().optional().default(""),
+  ENABLE_SSE: z.string().optional().default("true"),
+  MESSAGE_TIMEOUT: z.string().optional().default("60000"),
+  HEARTBEAT_INTERVAL: z.string().optional().default("30000"),
+  BUSY_RETRIES: z.string().optional().default("10"),
+  BUSY_DELAY: z.string().optional().default("500"),
+  ENABLE_CORS: z.string().optional().default("true"),
+  CORS_ORIGIN: z.string().optional().default("*"),
+  RATE_LIMIT_WINDOW: z.string().optional().default("60000"),
+  RATE_LIMIT_MAX: z.string().optional().default("100"),
+  RESOURCE_CACHE_TTL: z.string().optional().default("5000"),
+  FUNCTION_LIB_CACHE_TTL: z.string().optional().default("300000"),
+  DEBUG: z.string().optional().default("false"),
+  DEBUG_FILE: z.string().optional().default(""),
+  FUNCTION_LIB_URL: z.string().optional().default("http://s3.atlisp.cn/json/functions.json")
+});
 function parseArgs() {
   const args = process.argv.slice(2);
   const result = { transport: "http", port: "8110", host: "0.0.0.0" };
@@ -153,23 +77,31 @@ function parseArgs() {
   return result;
 }
 var cliArgs = parseArgs();
+var envResult = envSchema.safeParse(process.env);
+if (!envResult.success) {
+  console.error("\u73AF\u5883\u53D8\u91CF\u914D\u7F6E\u9519\u8BEF:", envResult.error.flatten().fieldErrors);
+  process.exit(1);
+}
+var env = envResult.data;
 var config = {
-  port: parseInt(process.env.PORT || cliArgs.port, 10),
-  host: process.env.HOST || cliArgs.host,
-  transport: process.env.TRANSPORT || cliArgs.transport,
-  apiKey: process.env.MCP_API_KEY || "",
-  enableSse: process.env.ENABLE_SSE !== "false",
-  messageTimeout: parseInt(process.env.MESSAGE_TIMEOUT || "60000", 10),
-  heartbeatInterval: parseInt(process.env.HEARTBEAT_INTERVAL || "30000", 10),
-  busyRetries: parseInt(process.env.BUSY_RETRIES || "10", 10),
-  busyDelay: parseInt(process.env.BUSY_DELAY || "500", 10),
-  enableCors: process.env.ENABLE_CORS !== "false",
-  corsOrigin: process.env.CORS_ORIGIN || "*",
-  rateLimitWindow: parseInt(process.env.RATE_LIMIT_WINDOW || "60000", 10),
-  rateLimitMax: parseInt(process.env.RATE_LIMIT_MAX || "100", 10),
-  resourceCacheTtl: parseInt(process.env.RESOURCE_CACHE_TTL || "5000", 10),
-  debug: process.env.DEBUG === "true",
-  debugFile: process.env.DEBUG_FILE || ""
+  port: parseInt(env.PORT || cliArgs.port, 10),
+  host: env.HOST || cliArgs.host,
+  transport: process.env.TRANSPORT && env.TRANSPORT ? env.TRANSPORT : cliArgs.transport,
+  apiKey: env.MCP_API_KEY,
+  enableSse: env.ENABLE_SSE === "true",
+  messageTimeout: parseInt(env.MESSAGE_TIMEOUT, 10),
+  heartbeatInterval: parseInt(env.HEARTBEAT_INTERVAL, 10),
+  busyRetries: parseInt(env.BUSY_RETRIES, 10),
+  busyDelay: parseInt(env.BUSY_DELAY, 10),
+  enableCors: env.ENABLE_CORS === "true",
+  corsOrigin: env.CORS_ORIGIN,
+  rateLimitWindow: parseInt(env.RATE_LIMIT_WINDOW, 10),
+  rateLimitMax: parseInt(env.RATE_LIMIT_MAX, 10),
+  resourceCacheTtl: parseInt(env.RESOURCE_CACHE_TTL, 10),
+  functionLibCacheTtl: parseInt(env.FUNCTION_LIB_CACHE_TTL, 10),
+  debug: env.DEBUG === "true",
+  debugFile: env.DEBUG_FILE,
+  functionLibUrl: env.FUNCTION_LIB_URL
 };
 var config_default = config;
 
@@ -308,7 +240,7 @@ function startHeartbeat() {
 }
 function sendMessage(msg) {
   const w = getWorker();
-  const requestId = randomUUID2();
+  const requestId = randomUUID();
   return new Promise((resolve, reject) => {
     const timeout = setTimeout(() => {
       const pending = pendingRequests.get(requestId);
@@ -442,7 +374,7 @@ var cad = new CadConnection();
 import fs from "fs";
 import path2 from "path";
 import os from "os";
-var DEBUG_FILE = process.env.DEBUG_FILE || path2.join(os.tmpdir(), "mcp-server-debug.log");
+var DEBUG_FILE = config_default.debugFile || path2.join(os.tmpdir(), "mcp-server-debug.log");
 var MAX_LOG_SIZE = 10 * 1024 * 1024;
 var MAX_LOG_FILES = 5;
 var stream = null;
@@ -476,10 +408,28 @@ function getStream() {
   }
   return stream;
 }
-function log(msg) {
-  const entry = `${(/* @__PURE__ */ new Date()).toISOString()} ${msg}
-`;
-  getStream().write(entry);
+function formatMessage(level, message, meta = {}) {
+  const entry = {
+    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    level,
+    message,
+    ...meta,
+    pid: process.pid,
+    hostname: os.hostname()
+  };
+  return JSON.stringify(entry);
+}
+function log(message, meta = {}) {
+  getStream().write(formatMessage("INFO", message, meta) + "\n");
+  if (config_default.debug) {
+    console.log(`[INFO] ${message}`, meta);
+  }
+}
+function error(message, meta = {}) {
+  getStream().write(formatMessage("ERROR", message, meta) + "\n");
+  if (config_default.debug) {
+    console.error(`[ERROR] ${message}`, meta);
+  }
 }
 function closeLog() {
   if (stream) {
@@ -488,1076 +438,1302 @@ function closeLog() {
   }
 }
 
-// src/handlers/cad-handlers.js
-async function connectCad(platform = null) {
-  log(`connect_cad called${platform ? ` (target: ${platform})` : ""}, cad.connected before: ${cad.connected}`);
-  try {
-    log("calling cad.connect()...");
-    const connected = await cad.connect(platform);
-    log("cad.connect() returned: " + connected + ", cad.connected: " + cad.connected);
-    if (connected) {
-      return { content: [{ type: "text", text: `\u5DF2\u8FDE\u63A5\u5230 ${cad.getPlatform()} ${cad.getVersion()}` }] };
-    }
-  } catch (e) {
-    log("connect_cad error: " + e.message);
+// src/handlers/resource-handlers.js
+import fs2 from "fs";
+import path3 from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+var __dirname2 = path3.dirname(fileURLToPath2(import.meta.url));
+var STANDARDS_DIR = path3.join(__dirname2, "..", "standards");
+var CACHE_TTL = config_default.resourceCacheTtl;
+var resourceCache = /* @__PURE__ */ new Map();
+function getCached(key) {
+  const entry = resourceCache.get(key);
+  if (entry && Date.now() - entry.timestamp < CACHE_TTL) {
+    return entry.data;
   }
-  return { content: [{ type: "text", text: "\u672A\u80FD\u8FDE\u63A5\u6216\u542F\u52A8 CAD\uFF0C\u8BF7\u786E\u4FDD CAD \u5DF2\u5B89\u88C5" }], isError: true };
+  resourceCache.delete(key);
+  return null;
 }
-async function evalLisp(code, withResult = false, encoding = null) {
-  if (!cad.connected) {
-    await cad.connect();
-  }
-  if (!cad.connected) {
-    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" }] };
-  try {
-    if (withResult) {
-      const result = await cad.sendCommandWithResult(trimmed, encoding);
-      if (result !== null) {
-        return { content: [{ type: "text", text: result }] };
+function setCache(key, data) {
+  resourceCache.set(key, { data, timestamp: Date.now() });
+}
+function clearCache(uri) {
+  if (uri) {
+    for (const key of resourceCache.keys()) {
+      if (key.startsWith(uri.split("://")[1]?.split("/")[0] + ":")) {
+        resourceCache.delete(key);
       }
-      return { content: [{ type: "text", text: "\u6267\u884C\u5931\u8D25\u6216\u65E0\u8FD4\u56DE\u503C" }], isError: true };
-    } else {
-      await cad.sendCommand(trimmed + "\n");
-      return { content: [{ type: "text", text: `\u5DF2\u53D1\u9001\u547D\u4EE4` }] };
     }
-  } catch (e) {
-    return { content: [{ type: "text", text: `\u9519\u8BEF: ${e.message}` }], isError: true };
+  } else {
+    resourceCache.clear();
   }
 }
-async function getCadInfo() {
-  if (!cad.connected) {
-    await cad.connect();
+function parseLispList(str) {
+  if (!str || typeof str !== "string") return null;
+  const trimmed = str.trim();
+  if (!trimmed.startsWith("(") || !trimmed.endsWith(")")) return null;
+  const content = trimmed.slice(1, -1).trim();
+  if (!content) return [];
+  const result = [];
+  let depth = 0;
+  let current = "";
+  let inString = false;
+  let escaped = false;
+  for (let i = 0; i < content.length; i++) {
+    const ch = content[i];
+    if (escaped) {
+      current += ch;
+      escaped = false;
+      continue;
+    }
+    if (ch === "\\") {
+      current += ch;
+      escaped = true;
+      continue;
+    }
+    if (ch === '"') {
+      current += ch;
+      inString = !inString;
+      continue;
+    }
+    if (inString) {
+      current += ch;
+      continue;
+    }
+    if (ch === "(" || ch === "[") {
+      current += ch;
+      depth++;
+    } else if (ch === ")" || ch === "]") {
+      current += ch;
+      depth--;
+    } else if (ch === " " && depth === 0) {
+      if (current.trim()) {
+        result.push(current.trim());
+        current = "";
+      }
+      continue;
+    }
+    current += ch;
   }
-  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 };
-  const trimmed = (command || "").trim();
-  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" }] };
+  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;
+    const num = Number(t);
+    if (!isNaN(num) && t !== "") return num;
+    if (t.startsWith('"') && t.endsWith('"')) return t.slice(1, -1);
+    return t;
+  });
 }
-async function newDocument() {
-  if (!cad.connected) {
-    await cad.connect();
+function parseLispRecursive(str) {
+  if (!str || typeof str !== "string") return null;
+  str = str.trim();
+  if (!str) return null;
+  let pos = 0;
+  function skipWs() {
+    while (pos < str.length && /\s/.test(str[pos])) pos++;
   }
-  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" }] };
+  function parseValue() {
+    skipWs();
+    if (pos >= str.length) return null;
+    const ch = str[pos];
+    if (ch === "(") return parseList();
+    if (ch === '"') return parseString();
+    if (ch === "'") {
+      pos++;
+      return parseValue();
+    }
+    return parseAtom();
   }
-  return { content: [{ type: "text", text: "\u65B0\u5EFA\u6587\u6863\u5931\u8D25" }], isError: true };
-}
-async function bringToFront() {
-  if (!cad.connected) {
-    await cad.connect();
-  }
-  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" }] };
-  }
-  return { content: [{ type: "text", text: "\u5207\u6362\u524D\u53F0\u5931\u8D25" }], isError: true };
-}
-async function installAtlisp() {
-  if (!cad.connected) {
-    await cad.connect();
-  }
-  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" }] };
-}
-async function listFunctionsInCad() {
-  if (!cad.connected) {
-    await cad.connect();
-  }
-  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 }] };
-    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 };
+  function parseString() {
+    pos++;
+    let r = "";
+    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];
+      } else {
+        r += str[pos];
+      }
+      pos++;
+    }
+    pos++;
+    return r;
   }
-}
-async function getSystemStatus() {
-  const status = {
-    mcp: { version: process.env.npm_package_version || "unknown" },
-    worker: { alive: false },
-    cad: { connected: false, platform: null, version: null, busy: false, hasDoc: false },
-    lisp: { available: false, testResult: null, error: null },
-    packages: null
-  };
-  try {
-    status.worker.alive = await cad.ping();
-  } catch {
-    status.worker.alive = false;
+  function parseAtom() {
+    const start = 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;
+    const num = Number(atom);
+    if (!isNaN(num) && atom !== "") return num;
+    return atom;
   }
-  status.cad.connected = cad.connected;
-  if (cad.connected) {
-    status.cad.platform = cad.getPlatform();
-    status.cad.version = cad.getVersion();
-    try {
-      status.cad.busy = await cad.isBusy();
-    } catch {
-    }
-    try {
-      const doc = await cad.hasDoc();
-      status.cad.hasDoc = doc.hasDoc;
-    } catch {
-    }
-    try {
-      const r = await cad.sendCommandWithResult("(+ 1 2)");
-      if (r !== null && r !== void 0) {
-        status.lisp.available = true;
-        status.lisp.testResult = String(r).trim();
+  function parseList() {
+    pos++;
+    const items = [];
+    while (pos < str.length) {
+      skipWs();
+      if (pos >= str.length) break;
+      if (str[pos] === ")") {
+        pos++;
+        return items;
       }
-    } catch (e) {
-      status.lisp.error = e.message;
-    }
-    try {
-      const pkgResult = await cad.sendCommandWithResult("(@::package-list-in-local)");
-      if (pkgResult && pkgResult !== "nil") {
-        status.packages = pkgResult;
+      const left = parseValue();
+      if (left === void 0) break;
+      skipWs();
+      if (str[pos] === "." && (pos + 1 >= str.length || /\s/.test(str[pos + 1]) || str[pos + 1] === ")")) {
+        pos++;
+        skipWs();
+        if (pos < str.length && str[pos] !== ")") {
+          const right = parseValue();
+          items.push([left, right]);
+          skipWs();
+        } else {
+          items.push(left);
+        }
+      } else {
+        items.push(left);
       }
-    } catch {
     }
+    return items;
   }
-  return { content: [{ type: "text", text: JSON.stringify(status, null, 2) }] };
-}
-async function initAtlisp() {
-  if (!cad.connected) {
-    await cad.connect();
-  }
-  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
-  const code = `(if (null @::load-module)
-	   (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/cloud"):vlax-true)
-		   (v o'send)
-		   (v o'WaitforResponse 1000)
-		   (e(r(vlax-get o'ResponseText)))))`;
-  try {
-    await cad.sendCommand(code + "\n");
-    return { content: [{ type: "text", text: "\u5DF2\u53D1\u9001 @lisp \u51FD\u6570\u5E93\u52A0\u8F7D\u4EE3\u7801\u5230 CAD" }] };
-  } catch (e) {
-    return { content: [{ type: "text", text: `\u9519\u8BEF: ${e.message}` }], isError: true };
-  }
+  return parseValue();
 }
-
-// src/handlers/package-handlers.js
-var PACKAGES_LIST_URL = process.env.PACKAGES_LIST_URL || "http://s3.atlisp.cn/packages-list?fmt=json";
-var cachedPackages = null;
-var cachedAt = null;
-var CACHE_TTL = 10 * 60 * 1e3;
-async function fetchPackages() {
-  const now = Date.now();
-  if (cachedPackages && cachedAt && now - cachedAt < CACHE_TTL) {
-    return cachedPackages;
-  }
-  try {
-    const response = await fetch(PACKAGES_LIST_URL, { headers: { "User-Agent": "atlisp-mcp" } });
-    if (response.ok) {
-      const data = await response.json();
-      cachedPackages = data;
-      cachedAt = now;
-      return data;
+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;
     }
-  } catch (e) {
-  }
-  return cachedPackages || MOCK_PACKAGES;
-}
-function flattenPackages(data) {
-  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) {
-    const data2 = await fetchPackages();
-    const items2 = flattenPackages(data2);
-    const text2 = items2.length ? items2.map((p) => `${p.name} v${p.version || ""} - ${p.description || ""}`).join("\n") : "\u65E0\u53EF\u7528\u5305";
-    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 }] };
-  const data = await fetchPackages();
-  const items = flattenPackages(data);
-  const text = items.length ? `\u4ECE\u6CE8\u518C\u8868\u83B7\u53D6\u7684 @lisp \u5305:
-${items.map((p) => `${p.name} v${p.version || ""} - ${p.description || ""}`).join("\n")}` : MOCK_PACKAGES.map((p) => `${p.name} v${p.version} - ${p.description}`).join("\n");
-  return { content: [{ type: "text", text: `\u5DF2\u5B89\u88C5\u7684 @lisp \u5305:
-${text}` }] };
+  return obj;
 }
-async function searchPackages(query) {
-  const data = await fetchPackages();
-  if (!data) {
-    return { content: [{ type: "text", text: "\u65E0\u6CD5\u83B7\u53D6\u5305\u5217\u8868" }], isError: true };
+function parseEntity(arr) {
+  if (!Array.isArray(arr) || arr.length < 5) return null;
+  const [type, handle, layer, color, linetype, ...rest] = arr;
+  const entity = {
+    type: String(type).toUpperCase().replace(/^"|"$/g, ""),
+    handle: String(handle),
+    layer: String(layer),
+    color,
+    linetype: String(linetype)
+  };
+  const entType = typeof entity.type === "string" ? entity.type.toUpperCase() : entity.type;
+  if (/^(TEXT|MTEXT|ATTRIB|TCH_TEXT)$/.test(entType) && rest[0] != null) {
+    entity.text = String(rest[0]);
   }
-  const items = flattenPackages(data);
-  const results = [];
-  if (query) {
-    const q = query.toLowerCase();
-    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);
-    }
-  } else {
-    for (const p of items) results.push(p);
+  if (/^(LINE|LWPOLYLINE|POLYLINE|ARC|CIRCLE|SPLINE|ELLIPSE|XLINE|RAY)$/.test(entType) && Array.isArray(rest[0])) {
+    entity.points = rest[0].map((pt) => {
+      if (Array.isArray(pt) && pt.length >= 2)
+        return { x: Number(pt[0]), y: Number(pt[1]), z: Number(pt[2] || 0) };
+      return null;
+    }).filter(Boolean);
   }
-  if (results.length === 0) {
-    return { content: [{ type: "text", text: `\u672A\u627E\u5230\u5305\u542B "${query}" \u7684\u5305` }] };
+  if (entType === "INSERT" && rest[0] != null) {
+    entity.blockName = String(rest[0]);
   }
-  return { content: [{ type: "text", text: `\u641C\u7D22\u7ED3\u679C (${results.length}):
-${results.map((p) => `${p.name} v${p.version || ""} - ${p.description || ""}`).join("\n")}` }] };
+  return entity;
 }
-async function installPackage(packageName) {
-  const data = await fetchPackages();
-  const items = flattenPackages(data);
-  const pkg = items.find((p) => p.name === packageName);
-  if (!pkg) {
-    return { content: [{ type: "text", text: `\u9519\u8BEF: \u5305 "${packageName}" \u4E0D\u5B58\u5728` }], isError: true };
+function buildEntityCode({ type, layer, bbox }) {
+  const items = [];
+  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) {
+      const [x1, y1, x2, y2] = parts;
+      items.push(
+        `'(-4 . "<AND")`,
+        `'(-4 . ">=,>=,*") (list 10 ${x1} ${y1} 0.0)`,
+        `'(-4 . "<=,<=,*") (list 10 ${x2} ${y2} 0.0)`,
+        `'(-4 . "AND>")`
+      );
+    }
   }
-  if (cad.connected) {
-    await cad.sendCommand(`(@::load-module '${packageName})
-`);
-  }
-  return { content: [{ type: "text", text: `\u5305 "${packageName}" \u5B89\u88C5\u547D\u4EE4\u5DF2\u53D1\u9001\uFF01` }] };
+  const filterExpr = items.length ? `(list ${items.join(" ")})` : "nil";
+  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))))
+(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)))
+(vl-prin1-to-string (list @e:total (reverse @e:ents))))`;
 }
-
-// src/handlers/function-handlers.js
-import fs2 from "fs";
-import path3 from "path";
-import os2 from "os";
-var FUNCTIONS_DIR = process.env.FUNCTIONS_DIR || "";
-var FUNCTIONS_URL = process.env.FUNCTIONS_URL || "http://s3.atlisp.cn/json/functions.json";
-var CACHE_DIR = path3.join(os2.homedir(), ".atlisp", "cache");
-var FUNCLIB_CACHE_FILE = path3.join(CACHE_DIR, "functions.json");
-var FUNCLIB_CACHE_TTL = 24 * 60 * 60 * 1e3;
-function readCacheFromDisk() {
-  try {
-    const stat = fs2.statSync(FUNCLIB_CACHE_FILE);
-    if (Date.now() - stat.mtimeMs < FUNCLIB_CACHE_TTL) {
-      const raw = fs2.readFileSync(FUNCLIB_CACHE_FILE, "utf-8");
-      return JSON.parse(raw);
+function buildTextCode({ layer, bbox, offset, limit }) {
+  const items = [`'(0 . "TEXT,MTEXT,ATTRIB,TCH_TEXT")`];
+  if (layer) items.push(`(cons 8 "${layer.replace(/"/g, '\\"')}")`);
+  if (bbox) {
+    const parts = bbox.split(",").map((s) => parseFloat(s.trim()));
+    if (parts.length === 4) {
+      const [x1, y1, x2, y2] = parts;
+      items.push(
+        `'(-4 . "<AND")`,
+        `'(-4 . ">=,>=,*") (list 10 ${x1} ${y1} 0.0)`,
+        `'(-4 . "<=,<=,*") (list 10 ${x2} ${y2} 0.0)`,
+        `'(-4 . "AND>")`
+      );
     }
-  } catch {
   }
-  return null;
+  const filterExpr = `(list ${items.join(" ")})`;
+  return `(progn
+(defun @t:props (ent / ed typ result item ins)
+  (setq ed (entget ent) typ (cdr (assoc 0 ed)))
+  (setq result (list (vl-prin1-to-string typ) (vl-prin1-to-string (cdr (assoc 5 ed))) (vl-prin1-to-string (cdr (assoc 8 ed)))
+    (if (setq item (assoc 62 ed)) (cdr item) "ByLayer")
+    (vl-prin1-to-string (if (setq item (assoc 6 ed)) (cdr item) "ByLayer"))))
+  (setq ins (cdr (assoc 10 ed)))
+  (append result (list (car ins) (cadr ins) (caddr ins)
+    (vl-prin1-to-string (cdr (assoc 1 ed))) (cdr (assoc 40 ed)) (cdr (assoc 50 ed))
+    (vl-prin1-to-string (if (setq item (assoc 7 ed)) (cdr item) "Standard")))))
+(defun @t:run nil
+  (setq ss (ssget "_X" ${filterExpr}))
+  (if (null ss)
+    (list "total" 0 "offset" ${offset} "limit" ${limit})
+    (progn
+      (setq total (sslength ss) texts nil i ${offset})
+      (while (and (< i total) (< (length texts) ${limit}))
+        (setq texts (append texts (list (@t:props (ssname ss i)))) i (1+ i)))
+      (list "total" total "offset" ${offset} "limit" ${limit} "texts" texts))))
+(@t:run))
+`;
 }
-function writeCacheToDisk(data) {
-  try {
-    fs2.mkdirSync(CACHE_DIR, { recursive: true });
-    fs2.writeFileSync(FUNCLIB_CACHE_FILE, JSON.stringify(data), "utf-8");
-  } catch (e) {
-    log(`function-handlers writeCache error: ${e.message}`);
+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/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 },
+  { uri: "atlisp://cad/dwgs", name: "DWG List", description: "\u6240\u6709\u6253\u5F00\u7684 DWG \u6587\u4EF6\u5217\u8868", mimeType: "application/json", subscribable: true },
+  { uri: "atlisp://packages", name: "Packages", description: "\u5DF2\u5B89\u88C5\u5305\u5217\u8868", mimeType: "application/json", subscribable: true },
+  { uri: "atlisp://platforms", name: "Platforms", description: "\u652F\u6301\u7684\u5E73\u53F0\u4FE1\u606F", mimeType: "application/json", subscribable: false },
+  { uri: "atlisp://standards/drafting", name: "Drafting Standards", description: "CAD \u5236\u56FE\u89C4\u8303", mimeType: "application/json", subscribable: false },
+  { uri: "atlisp://standards/coding", name: "Coding Standards", description: "@lisp \u7F16\u7801\u89C4\u8303", mimeType: "application/json", subscribable: false }
+];
+function parseQuery(uri) {
+  const qIdx = uri.indexOf("?");
+  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);
+  });
+  return { base, params };
+}
+async function listResources(subscribedUris = []) {
+  return RESOURCES.map((r) => ({
+    uri: r.uri,
+    name: r.name,
+    description: r.description,
+    mimeType: r.mimeType,
+    subscribed: subscribedUris.includes(r.uri)
+  }));
+}
+async function readResource(uri) {
+  const { base, params } = parseQuery(uri);
+  switch (base) {
+    case "atlisp://cad/info":
+      return await getCadInfo();
+    case "atlisp://dwg/layers":
+      return await getLayers(params.name);
+    case "atlisp://dwg/entities":
+      return await getEntities(params);
+    case "atlisp://dwg/texts":
+      return await getTexts(params);
+    case "atlisp://dwg/name":
+      return await getDwgName();
+    case "atlisp://dwg/path":
+      return await getDwgPath();
+    case "atlisp://cad/dwgs":
+      return await getDwgList();
+    case "atlisp://packages":
+      return await getPackages(params.name);
+    case "atlisp://platforms":
+      return getPlatforms();
+    case "atlisp://standards/drafting":
+      return getDraftingStandards();
+    case "atlisp://standards/coding":
+      return getCodingStandards();
+    default:
+      throw new Error(`\u8D44\u6E90\u4E0D\u5B58\u5728: ${uri}`);
   }
 }
-async function fetchFunctions() {
-  const diskCache = readCacheFromDisk();
-  if (diskCache) return diskCache;
+async function getCadInfo() {
+  const cached = getCached("cad:info");
+  if (cached) return cached;
+  if (!cad.connected) {
+    await cad.connect();
+  }
+  if (!cad.connected) {
+    const result2 = { connected: false, platform: null, version: null, busy: false };
+    setCache("cad:info", result2);
+    return result2;
+  }
+  let busy = false;
   try {
-    const response = await fetch(FUNCTIONS_URL, { headers: { "User-Agent": "atlisp-mcp" } });
-    if (response.ok) {
-      const data = await response.json();
-      writeCacheToDisk(data);
-      return data;
-    }
+    busy = await cad.isBusy();
   } catch (e) {
-    log(`function-handlers fetch error: ${e.message}`);
+    log(`Error checking CAD busy status: ${e.message}`);
   }
-  return diskCache;
+  const result = {
+    connected: true,
+    platform: cad.getPlatform(),
+    version: cad.getVersion(),
+    busy
+  };
+  setCache("cad:info", result);
+  return result;
 }
-async function getFunctionUsage(funcName, packageName) {
+async function getLayers(filterName = null) {
+  const cacheKey = filterName ? `dwg:layers:${filterName}` : "dwg:layers:all";
+  const cached = getCached(cacheKey);
+  if (cached) return cached;
+  if (!cad.connected) await cad.connect();
+  if (!cad.connected) return [];
   try {
-    let results = [];
-    const data = await fetchFunctions();
-    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);
+    const code = filterName ? `(vl-prin1-to-string (cdr (assoc 2 (tblnext "LAYER" T))))` : `(progn (setq res nil)(while (setq e (tblnext "LAYER" (null res)))(setq res (cons (list (vl-prin1-to-string (cdr (assoc 2 e))) (cdr (assoc 62 e)) (cdr (assoc 70 e))) res))) (reverse res))`;
+    const result = await cad.sendCommandWithResult(code);
+    if (!result || result === "" || result === "nil") {
+      setCache(cacheKey, []);
+      return [];
     }
-    if (results.length === 0 && FUNCTIONS_DIR) {
-      try {
-        const files = fs2.readdirSync(FUNCTIONS_DIR).filter((f2) => f2.endsWith(".json"));
-        for (const file of files) {
-          const raw = fs2.readFileSync(path3.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);
-        }
-      } catch {
+    let layers = [];
+    try {
+      layers = JSON.parse(result);
+    } catch (e) {
+      const parsed = parseLispList(result);
+      if (parsed) {
+        layers = parsed;
+      } else {
+        layers = [];
       }
     }
-    if (results.length === 0) {
-      return { content: [{ type: "text", text: `\u672A\u627E\u5230\u51FD\u6570: ${funcName}` }], isError: true };
+    if (!Array.isArray(layers)) {
+      if (typeof layers === "number") {
+        layers = [[result, layers, 0]];
+      } else if (typeof layers === "string") {
+        layers = [[layers, 7, 0]];
+      }
     }
-    const f = results[0];
-    const text = `\u51FD\u6570: ${f.name}
-\u63CF\u8FF0: ${f.description || "-"}
-\u53C2\u6570: ${f.params?.join(", ") || "-"}
-\u8FD4\u56DE\u503C: ${f.return || "-"}
-\u793A\u4F8B: ${f.usage || "-"}`;
-    return { content: [{ type: "text", text }] };
+    const mapped = layers.map((l) => {
+      const name = Array.isArray(l) ? l[0] : l;
+      const color = Array.isArray(l) && l[1] !== void 0 ? l[1] : 7;
+      const flags = Array.isArray(l) && l[2] !== void 0 ? l[2] : 0;
+      return {
+        name: String(name),
+        color,
+        locked: (flags & 4) !== 0,
+        frozen: (flags & 1) !== 0
+      };
+    });
+    setCache(cacheKey, mapped);
+    return mapped;
   } catch (e) {
-    return { content: [{ type: "text", text: `\u9519\u8BEF: ${e.message}` }], isError: true };
+    setCache(cacheKey, []);
+    return [];
   }
 }
-async function listSymbols(packageName) {
+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 (!cad.connected) {
+    const result = { total: 0, entities: [] };
+    setCache(cacheKey, result);
+    return result;
+  }
   try {
-    let allFuncs = [];
-    const data = await fetchFunctions();
-    if (data) {
-      const funcs = Object.values(data.all_functions || {});
-      if (packageName) {
-        allFuncs = funcs.filter((f) => f.name.startsWith(`${packageName}:`));
-      } else {
-        allFuncs = funcs.map((f) => `${f.name}: ${f.description || "-"}`);
-      }
-    }
-    if (allFuncs.length === 0 && FUNCTIONS_DIR) {
-      try {
-        const files = fs2.readdirSync(FUNCTIONS_DIR).filter((f) => f.endsWith(".json"));
-        for (const file of files) {
-          const raw = fs2.readFileSync(path3.join(FUNCTIONS_DIR, file), "utf-8");
-          const data2 = JSON.parse(raw);
-          const funcs = Object.values(data2.all_functions || {});
-          if (packageName) {
-            allFuncs = funcs.filter((f) => f.name.startsWith(`${packageName}:`));
-          } else {
-            for (const f of funcs) {
-              allFuncs.push(`${f.name}: ${f.description || "-"}`);
-            }
-          }
-        }
-      } catch (err) {
-        log(`listSymbols readDir error: ${err.message}`);
-      }
-    }
-    if (allFuncs.length === 0) {
-      return await listFunctionsInCad();
+    const code = buildEntityCode({
+      type: params.type || null,
+      layer: params.layer || null,
+      bbox: params.bbox || null
+    });
+    const resultStr = await cad.sendCommandWithResult(code);
+    if (!resultStr || resultStr === "" || resultStr === "nil") {
+      const result2 = { total: 0, entities: [] };
+      setCache(cacheKey, result2);
+      return result2;
     }
-    if (packageName) {
-      return { content: [{ type: "text", text: `${packageName} \u5305\u51FD\u6570 (${allFuncs.length}):
-${allFuncs.map((f) => f.name).join("\n")}` }] };
+    let total = 0;
+    let entities = [];
+    const parsed = parseLispRecursive(resultStr);
+    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);
     }
-    return { content: [{ type: "text", text: allFuncs.join("\n") }] };
+    const result = { total, entities };
+    log(`getEntities: total=${total}, returned=${entities.length}`);
+    setCache(cacheKey, result);
+    return result;
   } catch (e) {
-    return { content: [{ type: "text", text: `\u9519\u8BEF: ${e.message}` }], isError: true };
+    log(`getEntities error: ${e.message}`);
+    const result = { total: 0, entities: [] };
+    setCache(cacheKey, result);
+    return result;
   }
 }
-
-// src/handlers/resource-handlers.js
-import fs3 from "fs";
-import path4 from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
-var __dirname2 = path4.dirname(fileURLToPath2(import.meta.url));
-var STANDARDS_DIR = path4.join(__dirname2, "..", "standards");
-var CACHE_TTL2 = config_default.resourceCacheTtl;
-var resourceCache = /* @__PURE__ */ new Map();
-function getCached(key) {
-  const entry = resourceCache.get(key);
-  if (entry && Date.now() - entry.timestamp < CACHE_TTL2) {
-    return entry.data;
+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 (!cad.connected) {
+    const result = { total: 0, texts: [] };
+    setCache(cacheKey, result);
+    return result;
   }
-  resourceCache.delete(key);
-  return null;
-}
-function setCache(key, data) {
-  resourceCache.set(key, { data, timestamp: Date.now() });
-}
-function clearCache(uri) {
-  if (uri) {
-    for (const key of resourceCache.keys()) {
-      if (key.startsWith(uri.split("://")[1]?.split("/")[0] + ":")) {
-        resourceCache.delete(key);
-      }
+  const offset = Math.max(0, parseInt(params.offset) || 0);
+  const limit = Math.min(Math.max(1, parseInt(params.limit) || 5e3), 5e3);
+  try {
+    const code = buildTextCode({
+      layer: params.layer || null,
+      bbox: params.bbox || null,
+      offset,
+      limit
+    });
+    const resultStr = await cad.sendCommandWithResult(code);
+    if (!resultStr || resultStr === "" || resultStr === "nil" || resultStr === "0") {
+      const result = { total: 0, offset, limit, texts: [] };
+      setCache(cacheKey, result);
+      return result;
     }
-  } else {
-    resourceCache.clear();
+    const parsed = parseLispRecursive(resultStr);
+    const textsIdx = parsed.indexOf("texts");
+    const rawTexts = textsIdx !== -1 && Array.isArray(parsed[textsIdx + 1]) ? parsed[textsIdx + 1] : [];
+    const data = lispPairsToObject(parsed);
+    data.texts = rawTexts.length > 0 ? rawTexts.map(parseEntity).filter(Boolean) : [];
+    data.offset = offset;
+    data.limit = limit;
+    setCache(cacheKey, data);
+    return data;
+  } catch (e) {
+    log(`getTexts error: ${e.message}`);
+    const result = { total: 0, offset, limit, texts: [] };
+    setCache(cacheKey, result);
+    return result;
   }
 }
-function parseLispList(str) {
-  if (!str || typeof str !== "string") return null;
-  const trimmed = str.trim();
-  if (!trimmed.startsWith("(") || !trimmed.endsWith(")")) return null;
-  const content = trimmed.slice(1, -1).trim();
-  if (!content) return [];
-  const result = [];
-  let depth = 0;
-  let current = "";
-  let inString = false;
-  let escaped = false;
-  for (let i = 0; i < content.length; i++) {
-    const ch = content[i];
-    if (escaped) {
-      current += ch;
-      escaped = false;
-      continue;
-    }
-    if (ch === "\\") {
-      current += ch;
-      escaped = true;
-      continue;
+async function getDwgName() {
+  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);
+    return { name: name || null };
+  } catch (e) {
+    return { name: null };
+  }
+}
+async function getDwgPath() {
+  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")))
+          (setq name (vl-princ-to-string (getvar "dwgname")))
+          (list (strcat prefix name) name)
+        )`;
+    const result = await cad.sendCommandWithResult(code);
+    if (!result || result === "nil" || result === "") {
+      return { path: null, name: null };
     }
-    if (ch === '"') {
-      current += ch;
-      inString = !inString;
-      continue;
+    let parsed = null;
+    try {
+      parsed = JSON.parse(result);
+    } catch {
     }
-    if (inString) {
-      current += ch;
-      continue;
+    if (!parsed) {
+      const listResult = parseLispList(result);
+      if (listResult && listResult.length >= 2) parsed = listResult;
     }
-    if (ch === "(" || ch === "[") {
-      current += ch;
-      depth++;
-    } else if (ch === ")" || ch === "]") {
-      current += ch;
-      depth--;
-    } else if (ch === " " && depth === 0) {
-      if (current.trim()) {
-        result.push(current.trim());
-        current = "";
-      }
-      continue;
+    if (parsed && Array.isArray(parsed) && parsed.length >= 2) {
+      return { path: String(parsed[0]), name: String(parsed[1]) };
     }
-    current += ch;
+    return { path: result, name: result };
+  } catch (e) {
+    return { path: null, name: null };
   }
-  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;
-    const num = Number(t);
-    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;
-  str = str.trim();
-  if (!str) return null;
-  let pos = 0;
-  function skipWs() {
-    while (pos < str.length && /\s/.test(str[pos])) pos++;
-  }
-  function parseValue() {
-    skipWs();
-    if (pos >= str.length) return null;
-    const ch = str[pos];
-    if (ch === "(") return parseList();
-    if (ch === '"') return parseString();
-    if (ch === "'") {
-      pos++;
-      return parseValue();
-    }
-    return parseAtom();
-  }
-  function parseString() {
-    pos++;
-    let r = "";
-    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];
-      } else {
-        r += str[pos];
-      }
-      pos++;
+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 [];
+  try {
+    const code = `(mapcar 'cdr @::*local-pkgs*)`;
+    const result = await cad.sendCommandWithResult(code);
+    if (!result || result === "" || result === "nil") {
+      setCache(cacheKey, []);
+      return [];
     }
-    pos++;
-    return r;
-  }
-  function parseAtom() {
-    const start = 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;
-    const num = Number(atom);
-    if (!isNaN(num) && atom !== "") return num;
-    return atom;
-  }
-  function parseList() {
-    pos++;
-    const items = [];
-    while (pos < str.length) {
-      skipWs();
-      if (pos >= str.length) break;
-      if (str[pos] === ")") {
-        pos++;
-        return items;
-      }
-      const left = parseValue();
-      if (left === void 0) break;
-      skipWs();
-      if (str[pos] === "." && (pos + 1 >= str.length || /\s/.test(str[pos + 1]) || str[pos + 1] === ")")) {
-        pos++;
-        skipWs();
-        if (pos < str.length && str[pos] !== ")") {
-          const right = parseValue();
-          items.push([left, right]);
-          skipWs();
-        } else {
-          items.push(left);
+    let raw = [];
+    try {
+      raw = JSON.parse(result);
+    } catch {
+      raw = parseLispList(result) || [];
+    }
+    if (!Array.isArray(raw)) raw = [];
+    const packages = raw.map((item) => {
+      if (Array.isArray(item)) {
+        const pkg = { name: "", version: "0.0.0", description: "", loaded: true };
+        for (const entry of item) {
+          if (entry && typeof entry === "object" && !Array.isArray(entry)) {
+            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;
+          }
         }
-      } else {
-        items.push(left);
+        return pkg;
       }
+      if (typeof item === "string" || typeof item === "number") {
+        return { name: String(item), version: "0.0.0", loaded: true };
+      }
+      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);
+        const verVal = item.version || item.Version || item.VERSION || item[":VERSION"];
+        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);
+        return pkg;
+      }
+      return null;
+    }).filter(Boolean);
+    if (filterName) {
+      const filtered = packages.filter((p) => p.name === filterName);
+      setCache(cacheKey, filtered);
+      return filtered;
     }
-    return items;
+    setCache(cacheKey, packages);
+    return packages;
+  } catch (e) {
+    setCache(cacheKey, []);
+    return [];
   }
-  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;
+function getPlatforms() {
+  return CAD_PLATFORMS.map((name) => ({
+    name,
+    extensions: FILE_EXTENSIONS[name] || []
+  }));
 }
-function parseEntity(arr) {
-  if (!Array.isArray(arr) || arr.length < 5) return null;
-  const [type, handle, layer, color, linetype, ...rest] = arr;
-  const entity = {
-    type: String(type).toUpperCase().replace(/^"|"$/g, ""),
-    handle: String(handle),
-    layer: String(layer),
-    color,
-    linetype: String(linetype)
-  };
-  const entType = typeof entity.type === "string" ? entity.type.toUpperCase() : entity.type;
-  if (/^(TEXT|MTEXT|ATTRIB|TCH_TEXT)$/.test(entType) && rest[0] != null) {
-    entity.text = String(rest[0]);
-  }
-  if (/^(LINE|LWPOLYLINE|POLYLINE|ARC|CIRCLE|SPLINE|ELLIPSE|XLINE|RAY)$/.test(entType) && Array.isArray(rest[0])) {
-    entity.points = rest[0].map((pt) => {
-      if (Array.isArray(pt) && pt.length >= 2)
-        return { x: Number(pt[0]), y: Number(pt[1]), z: Number(pt[2] || 0) };
+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 [];
+  try {
+    const code = `(progn
+          (vl-load-com)
+          (setq result nil)
+          (vlax-for doc (vla-get-Documents (vla-get-Application (vlax-get-acad-object)))
+            (setq result (cons (list (vla-get-Name doc) (vla-get-FullName doc)) result))
+          )
+          (reverse result)
+        )`;
+    const result = await cad.sendCommandWithResult(code);
+    if (!result || result === "" || result === "nil") {
+      setCache(cacheKey, []);
+      return [];
+    }
+    let parsed = [];
+    try {
+      parsed = JSON.parse(result);
+    } catch (e) {
+      const listResult = parseLispList(result);
+      if (listResult) {
+        parsed = listResult;
+      }
+    }
+    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]) };
+      }
       return null;
     }).filter(Boolean);
+    setCache(cacheKey, dwgList);
+    return dwgList;
+  } catch (e) {
+    setCache(cacheKey, []);
+    return [];
   }
-  if (entType === "INSERT" && rest[0] != null) {
-    entity.blockName = String(rest[0]);
+}
+function loadStandardsFile(filename) {
+  const filePath = path3.join(STANDARDS_DIR, filename);
+  try {
+    const raw = fs2.readFileSync(filePath, "utf-8");
+    return JSON.parse(raw);
+  } catch (e) {
+    log(`Error loading standards file ${filename}: ${e.message}`);
+    return null;
   }
-  return entity;
 }
-function buildEntityCode({ type, layer, bbox }) {
-  const items = [];
-  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) {
-      const [x1, y1, x2, y2] = parts;
-      items.push(
-        `'(-4 . "<AND")`,
-        `'(-4 . ">=,>=,*") (list 10 ${x1} ${y1} 0.0)`,
-        `'(-4 . "<=,<=,*") (list 10 ${x2} ${y2} 0.0)`,
-        `'(-4 . "AND>")`
-      );
+var standardsCache = /* @__PURE__ */ new Map();
+function getCachedStandards(key) {
+  const entry = standardsCache.get(key);
+  if (entry && Date.now() - entry.timestamp < 3e4) return entry.data;
+  standardsCache.delete(key);
+  return null;
+}
+function setCachedStandards(key, data) {
+  standardsCache.set(key, { data, timestamp: Date.now() });
+}
+function getDraftingStandards() {
+  const cached = getCachedStandards("drafting");
+  if (cached) return cached;
+  const data = loadStandardsFile("drafting.json");
+  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;
+  const data = loadStandardsFile("coding.json");
+  if (data) setCachedStandards("coding", data);
+  return data || { error: "\u7F16\u7801\u89C4\u8303\u6587\u4EF6\u52A0\u8F7D\u5931\u8D25" };
+}
+
+// src/session-manager.js
+var Session = class {
+  constructor(clientId) {
+    this.clientId = clientId;
+    this.subscriptions = /* @__PURE__ */ new Set();
+    this.createdAt = Date.now();
+    this.connected = false;
+  }
+};
+var SessionManager = class {
+  #sessions = /* @__PURE__ */ new Map();
+  createSession(clientId) {
+    let session = this.#sessions.get(clientId);
+    if (!session) {
+      session = new Session(clientId);
+      this.#sessions.set(clientId, session);
     }
+    return session;
   }
-  const filterExpr = items.length ? `(list ${items.join(" ")})` : "nil";
-  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))))
-(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)))
-(vl-prin1-to-string (list @e:total (reverse @e:ents))))`;
-}
-function buildTextCode({ layer, bbox, offset, limit }) {
-  const items = [`'(0 . "TEXT,MTEXT,ATTRIB,TCH_TEXT")`];
-  if (layer) items.push(`(cons 8 "${layer.replace(/"/g, '\\"')}")`);
-  if (bbox) {
-    const parts = bbox.split(",").map((s) => parseFloat(s.trim()));
-    if (parts.length === 4) {
-      const [x1, y1, x2, y2] = parts;
-      items.push(
-        `'(-4 . "<AND")`,
-        `'(-4 . ">=,>=,*") (list 10 ${x1} ${y1} 0.0)`,
-        `'(-4 . "<=,<=,*") (list 10 ${x2} ${y2} 0.0)`,
-        `'(-4 . "AND>")`
-      );
+  getSession(clientId) {
+    return this.#sessions.get(clientId) || null;
+  }
+  hasSession(clientId) {
+    return this.#sessions.has(clientId);
+  }
+  removeSession(clientId) {
+    return this.#sessions.delete(clientId);
+  }
+  subscribe(clientId, uri) {
+    const session = this.#sessions.get(clientId);
+    if (session) {
+      session.subscriptions.add(uri);
+      return true;
     }
+    return false;
   }
-  const filterExpr = `(list ${items.join(" ")})`;
-  return `(progn
-(defun @t:props (ent / ed typ result item ins)
-  (setq ed (entget ent) typ (cdr (assoc 0 ed)))
-  (setq result (list (vl-prin1-to-string typ) (vl-prin1-to-string (cdr (assoc 5 ed))) (vl-prin1-to-string (cdr (assoc 8 ed)))
-    (if (setq item (assoc 62 ed)) (cdr item) "ByLayer")
-    (vl-prin1-to-string (if (setq item (assoc 6 ed)) (cdr item) "ByLayer"))))
-  (setq ins (cdr (assoc 10 ed)))
-  (append result (list (car ins) (cadr ins) (caddr ins)
-    (vl-prin1-to-string (cdr (assoc 1 ed))) (cdr (assoc 40 ed)) (cdr (assoc 50 ed))
-    (vl-prin1-to-string (if (setq item (assoc 7 ed)) (cdr item) "Standard")))))
-(defun @t:run nil
-  (setq ss (ssget "_X" ${filterExpr}))
-  (if (null ss)
-    (list "total" 0 "offset" ${offset} "limit" ${limit})
-    (progn
-      (setq total (sslength ss) texts nil i ${offset})
-      (while (and (< i total) (< (length texts) ${limit}))
-        (setq texts (append texts (list (@t:props (ssname ss i)))) i (1+ i)))
-      (list "total" total "offset" ${offset} "limit" ${limit} "texts" texts))))
-(@t:run))
-`;
+  unsubscribe(clientId, uri) {
+    const session = this.#sessions.get(clientId);
+    if (session) {
+      return session.subscriptions.delete(uri);
+    }
+    return false;
+  }
+  getSubscriptions(clientId) {
+    const session = this.#sessions.get(clientId);
+    return session ? Array.from(session.subscriptions) : [];
+  }
+  isSubscribed(clientId, uri) {
+    const session = this.#sessions.get(clientId);
+    return session ? session.subscriptions.has(uri) : false;
+  }
+  getAllSubscribedUris() {
+    const all = /* @__PURE__ */ new Set();
+    for (const session of this.#sessions.values()) {
+      for (const uri of session.subscriptions) {
+        all.add(uri);
+      }
+    }
+    return all;
+  }
+  list() {
+    return Array.from(this.#sessions.entries()).map(([id, s]) => ({
+      clientId: id,
+      subscriptions: Array.from(s.subscriptions),
+      createdAt: s.createdAt,
+      connected: s.connected
+    }));
+  }
+  count() {
+    return this.#sessions.size;
+  }
+  clear() {
+    this.#sessions.clear();
+  }
+};
+
+// src/subscription-manager.js
+var sessionManager = new SessionManager();
+var _notifyFn = null;
+function setNotify(fn) {
+  _notifyFn = fn;
 }
-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/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 },
-  { uri: "atlisp://cad/dwgs", name: "DWG List", description: "\u6240\u6709\u6253\u5F00\u7684 DWG \u6587\u4EF6\u5217\u8868", mimeType: "application/json", subscribable: true },
-  { uri: "atlisp://packages", name: "Packages", description: "\u5DF2\u5B89\u88C5\u5305\u5217\u8868", mimeType: "application/json", subscribable: true },
-  { uri: "atlisp://platforms", name: "Platforms", description: "\u652F\u6301\u7684\u5E73\u53F0\u4FE1\u606F", mimeType: "application/json", subscribable: false },
-  { uri: "atlisp://standards/drafting", name: "Drafting Standards", description: "CAD \u5236\u56FE\u89C4\u8303", mimeType: "application/json", subscribable: false },
-  { uri: "atlisp://standards/coding", name: "Coding Standards", description: "@lisp \u7F16\u7801\u89C4\u8303", mimeType: "application/json", subscribable: false }
-];
-function parseQuery(uri) {
-  const qIdx = uri.indexOf("?");
-  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);
-  });
-  return { base, params };
+function subscribe(uri, sessionId) {
+  if (sessionId) {
+    return sessionManager.subscribe(sessionId, uri);
+  }
+  return true;
 }
-async function listResources(subscribedUris = []) {
-  return RESOURCES.map((r) => ({
-    uri: r.uri,
-    name: r.name,
-    description: r.description,
-    mimeType: r.mimeType,
-    subscribed: subscribedUris.includes(r.uri)
-  }));
+function unsubscribe(uri, sessionId) {
+  if (sessionId) {
+    return sessionManager.unsubscribe(sessionId, uri);
+  }
+  return true;
 }
-async function readResource(uri) {
-  const { base, params } = parseQuery(uri);
-  switch (base) {
-    case "atlisp://cad/info":
-      return await getCadInfo2();
-    case "atlisp://dwg/layers":
-      return await getLayers(params.name);
-    case "atlisp://dwg/entities":
-      return await getEntities(params);
-    case "atlisp://dwg/texts":
-      return await getTexts(params);
-    case "atlisp://dwg/name":
-      return await getDwgName();
-    case "atlisp://dwg/path":
-      return await getDwgPath();
-    case "atlisp://cad/dwgs":
-      return await getDwgList();
-    case "atlisp://packages":
-      return await getPackages(params.name);
-    case "atlisp://platforms":
-      return getPlatforms();
-    case "atlisp://standards/drafting":
-      return getDraftingStandards();
-    case "atlisp://standards/coding":
-      return getCodingStandards();
-    default:
-      throw new Error(`\u8D44\u6E90\u4E0D\u5B58\u5728: ${uri}`);
+function list(sessionId) {
+  if (sessionId) {
+    return sessionManager.getSubscriptions(sessionId);
+  }
+  return Array.from(sessionManager.getAllSubscribedUris());
+}
+function isSubscribed(uri, sessionId) {
+  if (sessionId) {
+    return sessionManager.isSubscribed(sessionId, uri);
+  }
+  return sessionManager.getAllSubscribedUris().has(uri);
+}
+function notify(uri, data) {
+  if (_notifyFn) {
+    _notifyFn(uri, data);
+  }
+}
+
+// src/sse-session.js
+import { randomUUID as randomUUID2 } from "crypto";
+var DEFAULT_HEARTBEAT_INTERVAL = 3e4;
+var DEFAULT_RETRY_INTERVAL = 3e4;
+var MAX_SENT_MESSAGES = 1e3;
+var SSE_EVENTS = {
+  MESSAGE: "message",
+  ENDPOINT: "endpoint",
+  PING: "ping",
+  ERROR: "error",
+  PROGRESS: "progress",
+  CAPABILITIES: "capabilities"
+};
+var SseSession = class {
+  #res;
+  #clientId;
+  #active = true;
+  #heartbeatTimer = null;
+  #lastEventId = 0;
+  #heartbeatInterval;
+  #retryInterval;
+  #sessionData = {};
+  #sentMessages = [];
+  #backpressureBuffer = [];
+  #drainHandler = null;
+  constructor(res, options = {}) {
+    this.#res = res;
+    this.#clientId = options.clientId || randomUUID2();
+    this.#heartbeatInterval = options.heartbeatInterval || DEFAULT_HEARTBEAT_INTERVAL;
+    this.#retryInterval = options.retryInterval || DEFAULT_RETRY_INTERVAL;
+    this.#sessionData = options.sessionData || {};
+    if (options.resumeFromId && options.resumeFromId > 0) {
+      this.#lastEventId = options.resumeFromId;
+    }
+    this._setupSseHeaders();
+    this._sendRetry();
+    this._setupDrain();
+  }
+  get clientId() {
+    return this.#clientId;
   }
-}
-async function getCadInfo2() {
-  const cached = getCached("cad:info");
-  if (cached) return cached;
-  if (!cad.connected) {
-    await cad.connect();
+  get isActive() {
+    return this.#active;
   }
-  if (!cad.connected) {
-    const result2 = { connected: false, platform: null, version: null, busy: false };
-    setCache("cad:info", result2);
-    return result2;
+  get lastEventId() {
+    return this.#lastEventId;
   }
-  let busy = false;
-  try {
-    busy = await cad.isBusy();
-  } catch (e) {
-    log(`Error checking CAD busy status: ${e.message}`);
+  get sessionData() {
+    return this.#sessionData;
   }
-  const result = {
-    connected: true,
-    platform: cad.getPlatform(),
-    version: cad.getVersion(),
-    busy
-  };
-  setCache("cad:info", result);
-  return result;
-}
-async function getLayers(filterName = null) {
-  const cacheKey = filterName ? `dwg:layers:${filterName}` : "dwg:layers:all";
-  const cached = getCached(cacheKey);
-  if (cached) return cached;
-  if (!cad.connected) await cad.connect();
-  if (!cad.connected) return [];
-  try {
-    const code = filterName ? `(vl-prin1-to-string (cdr (assoc 2 (tblnext "LAYER" T))))` : `(progn (setq res nil)(while (setq e (tblnext "LAYER" (null res)))(setq res (cons (list (vl-prin1-to-string (cdr (assoc 2 e))) (cdr (assoc 62 e)) (cdr (assoc 70 e))) res))) (reverse res))`;
-    const result = await cad.sendCommandWithResult(code);
-    if (!result || result === "" || result === "nil") {
-      setCache(cacheKey, []);
-      return [];
+  get sentMessages() {
+    return [...this.#sentMessages];
+  }
+  getMessagesSince(eventId) {
+    return this.#sentMessages.filter((m) => m.id > eventId);
+  }
+  setSessionData(key, value) {
+    this.#sessionData[key] = value;
+  }
+  getSessionData(key) {
+    return this.#sessionData[key];
+  }
+  get retryInterval() {
+    return this.#retryInterval;
+  }
+  setRetryInterval(ms) {
+    this.#retryInterval = ms;
+  }
+  _sendRetry() {
+    this._write(`retry: ${this.#retryInterval}
+
+`);
+  }
+  _setupSseHeaders() {
+    this.#res.setHeader("Content-Type", "text/event-stream");
+    this.#res.setHeader("Cache-Control", "no-cache");
+    this.#res.setHeader("Connection", "keep-alive");
+    this.#res.setHeader("Transfer-Encoding", "chunked");
+    this.#res.setHeader("X-Accel-Buffering", "no");
+    if (typeof this.#res.flush !== "function") {
+      this.#res.flush = () => {
+      };
     }
-    let layers = [];
+  }
+  _formatEvent(event, data, id = null) {
+    const lines = [];
+    if (id !== null) {
+      lines.push(`id: ${id}`);
+    }
+    lines.push(`event: ${event}`);
+    if (data !== null && data !== void 0) {
+      const jsonStr = JSON.stringify(data);
+      lines.push(`data: ${jsonStr}`);
+    } else {
+      lines.push("data:");
+    }
+    return lines.join("\n") + "\n\n";
+  }
+  _setupDrain() {
+    if (typeof this.#res.on !== "function") return;
+    this.#drainHandler = () => {
+      if (!this.#active) return;
+      if (this.#backpressureBuffer.length > 0) {
+        this._drainBuffer();
+      }
+    };
+    this.#res.on("drain", this.#drainHandler);
+  }
+  _drainBuffer() {
+    const batch = this.#backpressureBuffer.splice(0, 50);
+    for (const item of batch) {
+      const ok = this.#res.write(item);
+      if (!ok) {
+        this.#backpressureBuffer.unshift(...batch.slice(batch.indexOf(item)));
+        return;
+      }
+    }
+    this._flush();
+    if (this.#backpressureBuffer.length > 0) {
+      this._drainBuffer();
+    }
+  }
+  _write(content) {
+    if (!this.#active) return false;
     try {
-      layers = JSON.parse(result);
-    } catch (e) {
-      const parsed = parseLispList(result);
-      if (parsed) {
-        layers = parsed;
-      } else {
-        layers = [];
+      if (this.#backpressureBuffer.length > 0) {
+        this.#backpressureBuffer.push(content);
+        return true;
+      }
+      const result = this.#res.write(content);
+      if (typeof this.#res.flush === "function") {
+        this.#res.flush();
+      }
+      if (result === false) {
+        this.#backpressureBuffer.push(content);
+        return true;
       }
+      return true;
+    } catch (e) {
+      this.#active = false;
+      this.close();
+      return false;
     }
-    if (!Array.isArray(layers)) {
-      if (typeof layers === "number") {
-        layers = [[result, layers, 0]];
-      } else if (typeof layers === "string") {
-        layers = [[layers, 7, 0]];
+  }
+  _flush() {
+    try {
+      if (typeof this.#res.flush === "function") {
+        this.#res.flush();
       }
+    } catch (e) {
     }
-    const mapped = layers.map((l) => {
-      const name = Array.isArray(l) ? l[0] : l;
-      const color = Array.isArray(l) && l[1] !== void 0 ? l[1] : 7;
-      const flags = Array.isArray(l) && l[2] !== void 0 ? l[2] : 0;
-      return {
-        name: String(name),
-        color,
-        locked: (flags & 4) !== 0,
-        frozen: (flags & 1) !== 0
-      };
-    });
-    setCache(cacheKey, mapped);
-    return mapped;
-  } catch (e) {
-    setCache(cacheKey, []);
-    return [];
   }
-}
-async function getEntities(params = {}) {
-  const cacheKey = `dwg:entities:${JSON.stringify(params)}`;
-  const cached = getCached(cacheKey);
-  if (cached) return cached;
-  if (!cad.connected) await cad.connect();
-  if (!cad.connected) {
-    const result = { total: 0, entities: [] };
-    setCache(cacheKey, result);
-    return result;
+  flushBackpressure() {
+    if (this.#backpressureBuffer.length > 0) {
+      this._drainBuffer();
+    }
   }
-  try {
-    const code = buildEntityCode({
-      type: params.type || null,
-      layer: params.layer || null,
-      bbox: params.bbox || null
-    });
-    const resultStr = await cad.sendCommandWithResult(code);
-    if (!resultStr || resultStr === "" || resultStr === "nil") {
-      const result2 = { total: 0, entities: [] };
-      setCache(cacheKey, result2);
-      return result2;
+  sendEvent(event, data, id = null) {
+    this.#lastEventId++;
+    const eventId = id !== null ? id : this.#lastEventId;
+    const formatted = this._formatEvent(event, data, eventId);
+    this.#sentMessages.push({ event, data, id: eventId, timestamp: Date.now() });
+    if (this.#sentMessages.length > MAX_SENT_MESSAGES) {
+      this.#sentMessages.splice(0, this.#sentMessages.length - MAX_SENT_MESSAGES);
     }
-    let total = 0;
-    let entities = [];
-    const parsed = parseLispRecursive(resultStr);
-    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);
+    this._write(formatted);
+    this._flush();
+    return true;
+  }
+  sendMessage(data) {
+    return this.sendEvent(SSE_EVENTS.MESSAGE, data);
+  }
+  sendEndpoint(path9) {
+    return this.sendEvent(SSE_EVENTS.ENDPOINT, path9);
+  }
+  sendError(code, message, id = null) {
+    return this.sendEvent(SSE_EVENTS.ERROR, { code, message }, id);
+  }
+  sendPing() {
+    return this.sendEvent(SSE_EVENTS.PING, { timestamp: Date.now() });
+  }
+  sendProgress(current, total, message = "") {
+    return this.sendEvent(SSE_EVENTS.PROGRESS, { current, total, message });
+  }
+  sendCapabilities(capabilities) {
+    return this.sendEvent(SSE_EVENTS.CAPABILITIES, capabilities);
+  }
+  sendResponse(jsonrpcResponse, id = null) {
+    const eventId = id !== null ? id : this.#lastEventId;
+    return this.sendEvent(SSE_EVENTS.MESSAGE, jsonrpcResponse, eventId);
+  }
+  startHeartbeat(interval = null) {
+    this.stopHeartbeat();
+    const ms = interval || this.#heartbeatInterval;
+    this.#heartbeatTimer = setInterval(() => {
+      if (!this.#active) {
+        this.stopHeartbeat();
+        return;
+      }
+      if (!this.sendPing()) {
+        this.stopHeartbeat();
+        this.close();
+      }
+    }, ms);
+  }
+  stopHeartbeat() {
+    if (this.#heartbeatTimer) {
+      clearInterval(this.#heartbeatTimer);
+      this.#heartbeatTimer = null;
+    }
+  }
+  close() {
+    this.#active = false;
+    this.stopHeartbeat();
+    if (this.#drainHandler) {
+      this.#res.removeListener("drain", this.#drainHandler);
+      this.#drainHandler = null;
+    }
+    this.#backpressureBuffer = [];
+    try {
+      this.#res.end();
+    } catch (e) {
     }
-    const result = { total, entities };
-    log(`getEntities: total=${total}, returned=${entities.length}`);
-    setCache(cacheKey, result);
-    return result;
-  } catch (e) {
-    log(`getEntities error: ${e.message}`);
-    const result = { total: 0, entities: [] };
-    setCache(cacheKey, result);
-    return result;
   }
+};
+
+// src/sse-session-manager.js
+import fs3 from "fs";
+import path4 from "path";
+import os2 from "os";
+var SESSION_STORE_DIR = path4.join(os2.homedir(), ".atlisp", "sessions");
+var SESSION_STORE_TTL = 24 * 60 * 60 * 1e3;
+function getSessionStorePath(clientId) {
+  return path4.join(SESSION_STORE_DIR, `${clientId}.json`);
 }
-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 (!cad.connected) {
-    const result = { total: 0, texts: [] };
-    setCache(cacheKey, result);
-    return result;
-  }
-  const offset = Math.max(0, parseInt(params.offset) || 0);
-  const limit = Math.min(Math.max(1, parseInt(params.limit) || 5e3), 5e3);
+function persistSessionData(clientId, sessionData) {
   try {
-    const code = buildTextCode({
-      layer: params.layer || null,
-      bbox: params.bbox || null,
-      offset,
-      limit
-    });
-    const resultStr = await cad.sendCommandWithResult(code);
-    if (!resultStr || resultStr === "" || resultStr === "nil" || resultStr === "0") {
-      const result = { total: 0, offset, limit, texts: [] };
-      setCache(cacheKey, result);
-      return result;
-    }
-    const parsed = parseLispRecursive(resultStr);
-    const textsIdx = parsed.indexOf("texts");
-    const rawTexts = textsIdx !== -1 && Array.isArray(parsed[textsIdx + 1]) ? parsed[textsIdx + 1] : [];
-    const data = lispPairsToObject(parsed);
-    data.texts = rawTexts.length > 0 ? rawTexts.map(parseEntity).filter(Boolean) : [];
-    data.offset = offset;
-    data.limit = limit;
-    setCache(cacheKey, data);
-    return data;
+    fs3.mkdirSync(SESSION_STORE_DIR, { recursive: true });
+    const store = {
+      clientId,
+      sessionData,
+      savedAt: Date.now()
+    };
+    fs3.writeFileSync(getSessionStorePath(clientId), JSON.stringify(store), "utf-8");
   } catch (e) {
-    log(`getTexts error: ${e.message}`);
-    const result = { total: 0, offset, limit, texts: [] };
-    setCache(cacheKey, result);
-    return result;
+    console.error("Failed to persist session:", e.message);
   }
 }
-async function getDwgName() {
-  if (!cad.connected) await cad.connect();
-  if (!cad.connected) return { name: null };
+function loadPersistedSessionData(clientId) {
   try {
-    const code = `(vl-princ-to-string (getvar "dwgname"))`;
-    const name = await cad.sendCommandWithResult(code);
-    return { name: name || null };
+    const filePath = getSessionStorePath(clientId);
+    if (!fs3.existsSync(filePath)) return null;
+    const raw = fs3.readFileSync(filePath, "utf-8");
+    const store = JSON.parse(raw);
+    if (Date.now() - store.savedAt > SESSION_STORE_TTL) {
+      fs3.unlinkSync(filePath);
+      return null;
+    }
+    return store.sessionData || {};
   } catch (e) {
-    return { name: null };
+    return null;
   }
 }
-async function getDwgPath() {
-  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")))
-          (setq name (vl-princ-to-string (getvar "dwgname")))
-          (list (strcat prefix name) name)
-        )`;
-    const result = await cad.sendCommandWithResult(code);
-    if (!result || result === "nil" || result === "") {
-      return { path: null, name: null };
+var SseSessionManager = class {
+  #sessions = /* @__PURE__ */ new Map();
+  #eventHandlers = /* @__PURE__ */ new Map();
+  constructor() {
+    this.#sessions = /* @__PURE__ */ new Map();
+    this.#eventHandlers = /* @__PURE__ */ new Map();
+  }
+  add(clientId, session) {
+    if (!(session instanceof SseSession)) {
+      throw new Error("session must be an SseSession instance");
     }
-    let parsed = null;
-    try {
-      parsed = JSON.parse(result);
-    } catch {
+    const persisted = loadPersistedSessionData(clientId);
+    if (persisted) {
+      for (const [key, value] of Object.entries(persisted)) {
+        session.setSessionData(key, value);
+      }
     }
-    if (!parsed) {
-      const listResult = parseLispList(result);
-      if (listResult && listResult.length >= 2) parsed = listResult;
+    this.#sessions.set(clientId, session);
+    session.startHeartbeat();
+  }
+  remove(clientId) {
+    const session = this.#sessions.get(clientId);
+    if (session) {
+      persistSessionData(clientId, session.sessionData);
+      session.close();
+      this.#sessions.delete(clientId);
+      return true;
     }
-    if (parsed && Array.isArray(parsed) && parsed.length >= 2) {
-      return { path: String(parsed[0]), name: String(parsed[1]) };
+    return false;
+  }
+  get(clientId) {
+    return this.#sessions.get(clientId) || null;
+  }
+  has(clientId) {
+    return this.#sessions.has(clientId);
+  }
+  list() {
+    return Array.from(this.#sessions.keys()).map((id) => ({
+      clientId: id,
+      isActive: this.#sessions.get(id)?.isActive ?? false
+    }));
+  }
+  listActive() {
+    return this.list().filter((s) => s.isActive);
+  }
+  count() {
+    return this.#sessions.size;
+  }
+  sendToClient(clientId, event, data, id = null) {
+    const session = this.#sessions.get(clientId);
+    if (!session || !session.isActive) {
+      return false;
     }
-    return { path: result, name: result };
-  } catch (e) {
-    return { path: null, name: null };
+    return session.sendEvent(event, data, id);
   }
-}
-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 [];
-  try {
-    const code = `(mapcar 'cdr @::*local-pkgs*)`;
-    const result = await cad.sendCommandWithResult(code);
-    if (!result || result === "" || result === "nil") {
-      setCache(cacheKey, []);
-      return [];
+  sendMessageToClient(clientId, data) {
+    return this.sendToClient(clientId, SSE_EVENTS.MESSAGE, data);
+  }
+  sendErrorToClient(clientId, code, message, id = null) {
+    return this.sendToClient(clientId, SSE_EVENTS.ERROR, { code, message }, id);
+  }
+  sendProgressToClient(clientId, current, total, message = "") {
+    return this.sendToClient(clientId, SSE_EVENTS.PROGRESS, { current, total, message });
+  }
+  broadcast(event, data) {
+    let successCount = 0;
+    for (const [clientId, session] of this.#sessions) {
+      if (session.isActive && session.sendEvent(event, data)) {
+        successCount++;
+      }
+    }
+    return successCount;
+  }
+  broadcastMessage(data) {
+    return this.broadcast(SSE_EVENTS.MESSAGE, data);
+  }
+  broadcastError(code, message) {
+    return this.broadcast(SSE_EVENTS.ERROR, { code, message });
+  }
+  on(event, handler) {
+    if (!this.#eventHandlers.has(event)) {
+      this.#eventHandlers.set(event, /* @__PURE__ */ new Set());
+    }
+    this.#eventHandlers.get(event).add(handler);
+  }
+  off(event, handler) {
+    const handlers = this.#eventHandlers.get(event);
+    if (handlers) {
+      handlers.delete(handler);
+    }
+  }
+  emit(event, data) {
+    const handlers = this.#eventHandlers.get(event);
+    if (handlers) {
+      for (const handler of handlers) {
+        try {
+          handler(data);
+        } catch (e) {
+        }
+      }
+    }
+  }
+  cleanupInactive() {
+    for (const [clientId, session] of this.#sessions) {
+      if (!session.isActive) {
+        session.close();
+        this.#sessions.delete(clientId);
+      }
+    }
+  }
+  closeAll() {
+    for (const [clientId, session] of this.#sessions) {
+      persistSessionData(clientId, session.sessionData);
+      session.close();
+    }
+    this.#sessions.clear();
+  }
+};
+
+// src/routes.js
+import express from "express";
+import { randomUUID as randomUUID4 } from "crypto";
+import iconv from "iconv-lite";
+import rateLimit from "express-rate-limit";
+
+// src/mcp-server-state.js
+import { AsyncLocalStorage } from "async_hooks";
+
+// src/session-transport.js
+import { randomUUID as randomUUID3 } from "crypto";
+var SESSION_TIMEOUT = 30 * 60 * 1e3;
+var SessionTransport = class {
+  constructor(sessionId) {
+    this.sessionId = sessionId || randomUUID3();
+    this.onclose = null;
+    this.onerror = null;
+    this.onmessage = null;
+    this._pendingRequest = null;
+    this._started = false;
+    this._closed = false;
+    this._cleanupTimer = null;
+  }
+  async start() {
+    if (this._started) {
+      throw new Error("Transport already started");
     }
-    let raw = [];
-    try {
-      raw = JSON.parse(result);
-    } catch {
-      raw = parseLispList(result) || [];
+    this._started = true;
+  }
+  async send(message) {
+    if (this._closed) return;
+    if (this._pendingRequest) {
+      const { resolve, reject, timeout } = this._pendingRequest;
+      clearTimeout(timeout);
+      this._pendingRequest = null;
+      resolve(message);
     }
-    if (!Array.isArray(raw)) raw = [];
-    const packages = raw.map((item) => {
-      if (Array.isArray(item)) {
-        const pkg = { name: "", version: "0.0.0", description: "", loaded: true };
-        for (const entry of item) {
-          if (entry && typeof entry === "object" && !Array.isArray(entry)) {
-            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;
-          }
-        }
-        return pkg;
-      }
-      if (typeof item === "string" || typeof item === "number") {
-        return { name: String(item), version: "0.0.0", loaded: true };
-      }
-      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);
-        const verVal = item.version || item.Version || item.VERSION || item[":VERSION"];
-        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);
-        return pkg;
-      }
-      return null;
-    }).filter(Boolean);
-    if (filterName) {
-      const filtered = packages.filter((p) => p.name === filterName);
-      setCache(cacheKey, filtered);
-      return filtered;
+  }
+  async close() {
+    if (this._closed) return;
+    this._closed = true;
+    if (this._pendingRequest) {
+      const { reject, timeout } = this._pendingRequest;
+      clearTimeout(timeout);
+      this._pendingRequest = null;
+      reject(new Error("Transport closed"));
     }
-    setCache(cacheKey, packages);
-    return packages;
-  } catch (e) {
-    setCache(cacheKey, []);
-    return [];
+    this._clearCleanupTimer();
+    this.onclose?.();
   }
-}
-function getPlatforms() {
-  return CAD_PLATFORMS.map((name) => ({
-    name,
-    extensions: FILE_EXTENSIONS[name] || []
-  }));
-}
-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 [];
-  try {
-    const code = `(progn
-          (vl-load-com)
-          (setq result nil)
-          (vlax-for doc (vla-get-Documents (vla-get-Application (vlax-get-acad-object)))
-            (setq result (cons (list (vla-get-Name doc) (vla-get-FullName doc)) result))
-          )
-          (reverse result)
-        )`;
-    const result = await cad.sendCommandWithResult(code);
-    if (!result || result === "" || result === "nil") {
-      setCache(cacheKey, []);
-      return [];
+  async handleRequest(message, timeoutMs = 6e4) {
+    if (this._closed) {
+      throw new Error("Transport closed");
     }
-    let parsed = [];
-    try {
-      parsed = JSON.parse(result);
-    } catch (e) {
-      const listResult = parseLispList(result);
-      if (listResult) {
-        parsed = listResult;
-      }
+    if (!message || !message.method) {
+      throw new Error("Invalid message");
     }
-    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]) };
-      }
+    if (!message.id) {
+      this.onmessage?.(message);
       return null;
-    }).filter(Boolean);
-    setCache(cacheKey, dwgList);
-    return dwgList;
-  } catch (e) {
-    setCache(cacheKey, []);
-    return [];
+    }
+    return new Promise((resolve, reject) => {
+      const timeout = setTimeout(() => {
+        if (this._pendingRequest?.resolve === resolve) {
+          this._pendingRequest = null;
+          reject(new Error("Request timeout"));
+        }
+      }, timeoutMs);
+      this._pendingRequest = { resolve, reject, timeout };
+      this.onmessage?.(message);
+    });
   }
-}
-function loadStandardsFile(filename) {
-  const filePath = path4.join(STANDARDS_DIR, filename);
-  try {
-    const raw = fs3.readFileSync(filePath, "utf-8");
-    return JSON.parse(raw);
-  } catch (e) {
-    log(`Error loading standards file ${filename}: ${e.message}`);
-    return null;
+  resetCleanupTimer() {
+    this._clearCleanupTimer();
+    this._cleanupTimer = setTimeout(() => {
+      this.close();
+    }, SESSION_TIMEOUT);
   }
-}
-var standardsCache = /* @__PURE__ */ new Map();
-function getCachedStandards(key) {
-  const entry = standardsCache.get(key);
-  if (entry && Date.now() - entry.timestamp < 3e4) return entry.data;
-  standardsCache.delete(key);
-  return null;
-}
-function setCachedStandards(key, data) {
-  standardsCache.set(key, { data, timestamp: Date.now() });
-}
-function getDraftingStandards() {
-  const cached = getCachedStandards("drafting");
-  if (cached) return cached;
-  const data = loadStandardsFile("drafting.json");
-  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;
-  const data = loadStandardsFile("coding.json");
-  if (data) setCachedStandards("coding", data);
-  return data || { error: "\u7F16\u7801\u89C4\u8303\u6587\u4EF6\u52A0\u8F7D\u5931\u8D25" };
-}
+  _clearCleanupTimer() {
+    if (this._cleanupTimer) {
+      clearTimeout(this._cleanupTimer);
+      this._cleanupTimer = null;
+    }
+  }
+};
+
+// src/mcp-handlers.js
+import {
+  ListToolsRequestSchema,
+  CallToolRequestSchema,
+  ListResourcesRequestSchema,
+  ReadResourceRequestSchema,
+  SubscribeRequestSchema,
+  UnsubscribeRequestSchema,
+  ListPromptsRequestSchema,
+  GetPromptRequestSchema
+} from "@modelcontextprotocol/sdk/types.js";
+import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 
 // src/handlers/prompt-handlers.js
 import fs4 from "fs";
@@ -2329,574 +2505,453 @@ ${code}
   };
 }
 
-// src/session-manager.js
-var Session = class {
-  constructor(clientId) {
-    this.clientId = clientId;
-    this.subscriptions = /* @__PURE__ */ new Set();
-    this.createdAt = Date.now();
-    this.connected = false;
-  }
+// src/mcp-handlers.js
+var SERVER_CAPABILITIES = {
+  tools: {},
+  resources: { subscribe: true, listChanged: true },
+  prompts: {}
 };
-var SessionManager = class {
-  #sessions = /* @__PURE__ */ new Map();
-  createSession(clientId) {
-    let session = this.#sessions.get(clientId);
-    if (!session) {
-      session = new Session(clientId);
-      this.#sessions.set(clientId, session);
-    }
-    return session;
-  }
-  getSession(clientId) {
-    return this.#sessions.get(clientId) || null;
-  }
-  hasSession(clientId) {
-    return this.#sessions.has(clientId);
-  }
-  removeSession(clientId) {
-    return this.#sessions.delete(clientId);
-  }
-  subscribe(clientId, uri) {
-    const session = this.#sessions.get(clientId);
-    if (session) {
-      session.subscriptions.add(uri);
-      return true;
+function createMcpServer(handlers = {}) {
+  const { tools: tools2 = [], handleToolCall: handleToolCall2 = () => ({ content: [] }) } = handlers;
+  const server = new Server(
+    { name: SERVER_NAME, version: SERVER_VERSION },
+    { capabilities: SERVER_CAPABILITIES }
+  );
+  server.setRequestHandler(ListToolsRequestSchema, async () => ({ tools: tools2 }));
+  server.setRequestHandler(CallToolRequestSchema, async (request) => {
+    const { name, arguments: args } = request.params;
+    return await handleToolCall2(name, args || {});
+  });
+  server.setRequestHandler(ListResourcesRequestSchema, async (request) => {
+    const ctx = mcpContext.getStore();
+    const sessionId = ctx?.sessionId;
+    const subscribedUris = sessionId ? list(sessionId) : list();
+    return {
+      resources: await listResources(subscribedUris)
+    };
+  });
+  server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
+    const { uri } = request.params;
+    try {
+      const data = await readResource(uri);
+      return {
+        contents: [{
+          uri,
+          mimeType: "application/json",
+          text: JSON.stringify(data)
+        }]
+      };
+    } catch (e) {
+      return {
+        contents: [],
+        isError: true,
+        error: { code: -32603, message: e.message }
+      };
     }
-    return false;
-  }
-  unsubscribe(clientId, uri) {
-    const session = this.#sessions.get(clientId);
-    if (session) {
-      return session.subscriptions.delete(uri);
+  });
+  server.setRequestHandler(SubscribeRequestSchema, async (request) => {
+    const { uri } = request.params;
+    const ctx = mcpContext.getStore();
+    subscribe(uri, ctx?.sessionId);
+    return { success: true };
+  });
+  server.setRequestHandler(UnsubscribeRequestSchema, async (request) => {
+    const { uri } = request.params;
+    const ctx = mcpContext.getStore();
+    unsubscribe(uri, ctx?.sessionId);
+    return { success: true };
+  });
+  server.setRequestHandler(ListPromptsRequestSchema, async () => ({
+    prompts: await listPrompts()
+  }));
+  server.setRequestHandler(GetPromptRequestSchema, async (request) => {
+    const { name, arguments: args } = request.params;
+    return await getPrompt(name, args || {});
+  });
+  return server;
+}
+
+// src/handlers/cad-handlers.js
+async function connectCad(platform = null) {
+  log(`connect_cad called${platform ? ` (target: ${platform})` : ""}, cad.connected before: ${cad.connected}`);
+  try {
+    log("calling cad.connect()...");
+    const connected = await cad.connect(platform);
+    log("cad.connect() returned: " + connected + ", cad.connected: " + cad.connected);
+    if (connected) {
+      return { content: [{ type: "text", text: `\u5DF2\u8FDE\u63A5\u5230 ${cad.getPlatform()} ${cad.getVersion()}` }] };
     }
-    return false;
+  } catch (e) {
+    log("connect_cad error: " + e.message);
   }
-  getSubscriptions(clientId) {
-    const session = this.#sessions.get(clientId);
-    return session ? Array.from(session.subscriptions) : [];
+  return { content: [{ type: "text", text: "\u672A\u80FD\u8FDE\u63A5\u6216\u542F\u52A8 CAD\uFF0C\u8BF7\u786E\u4FDD CAD \u5DF2\u5B89\u88C5" }], isError: true };
+}
+async function evalLisp(code, withResult = false, encoding = null) {
+  if (!cad.connected) {
+    await cad.connect();
   }
-  isSubscribed(clientId, uri) {
-    const session = this.#sessions.get(clientId);
-    return session ? session.subscriptions.has(uri) : false;
+  if (!cad.connected) {
+    return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
   }
-  getAllSubscribedUris() {
-    const all = /* @__PURE__ */ new Set();
-    for (const session of this.#sessions.values()) {
-      for (const uri of session.subscriptions) {
-        all.add(uri);
+  const trimmed = (code || "").trim();
+  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);
+      if (result !== null) {
+        return { content: [{ type: "text", text: result }] };
       }
+      return { content: [{ type: "text", text: "\u6267\u884C\u5931\u8D25\u6216\u65E0\u8FD4\u56DE\u503C" }], isError: true };
+    } else {
+      await cad.sendCommand(trimmed + "\n");
+      return { content: [{ type: "text", text: `\u5DF2\u53D1\u9001\u547D\u4EE4` }] };
     }
-    return all;
-  }
-  list() {
-    return Array.from(this.#sessions.entries()).map(([id, s]) => ({
-      clientId: id,
-      subscriptions: Array.from(s.subscriptions),
-      createdAt: s.createdAt,
-      connected: s.connected
-    }));
-  }
-  count() {
-    return this.#sessions.size;
-  }
-  clear() {
-    this.#sessions.clear();
-  }
-};
-
-// src/subscription-manager.js
-var sessionManager = new SessionManager();
-var _notifyFn = null;
-function setNotify(fn) {
-  _notifyFn = fn;
-}
-function subscribe(uri, sessionId) {
-  if (sessionId) {
-    return sessionManager.subscribe(sessionId, uri);
+  } catch (e) {
+    return { content: [{ type: "text", text: `\u9519\u8BEF: ${e.message}` }], isError: true };
   }
-  return true;
 }
-function unsubscribe(uri, sessionId) {
-  if (sessionId) {
-    return sessionManager.unsubscribe(sessionId, uri);
+async function getCadInfo2() {
+  if (!cad.connected) {
+    await cad.connect();
   }
-  return true;
+  if (!cad.connected) return { content: [{ type: "text", text: "CAD \u672A\u8FDE\u63A5" }] };
+  const info = await cad.getInfo();
+  return { content: [{ type: "text", text: info }] };
 }
-function list(sessionId) {
-  if (sessionId) {
-    return sessionManager.getSubscriptions(sessionId);
-  }
-  return Array.from(sessionManager.getAllSubscribedUris());
+async function atCommand(command) {
+  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" }] };
+  await cad.sendCommand(trimmed + "\n");
+  return { content: [{ type: "text", text: "\u5DF2\u53D1\u9001\u547D\u4EE4" }] };
 }
-function isSubscribed(uri, sessionId) {
-  if (sessionId) {
-    return sessionManager.isSubscribed(sessionId, uri);
+async function newDocument() {
+  if (!cad.connected) {
+    await cad.connect();
   }
-  return sessionManager.getAllSubscribedUris().has(uri);
-}
-function notify(uri, data) {
-  if (_notifyFn) {
-    _notifyFn(uri, data);
+  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" }] };
   }
+  return { content: [{ type: "text", text: "\u65B0\u5EFA\u6587\u6863\u5931\u8D25" }], isError: true };
 }
-
-// src/sse-session.js
-import { randomUUID as randomUUID3 } from "crypto";
-var DEFAULT_HEARTBEAT_INTERVAL = 3e4;
-var DEFAULT_RETRY_INTERVAL = 3e4;
-var MAX_SENT_MESSAGES = 1e3;
-var SSE_EVENTS = {
-  MESSAGE: "message",
-  ENDPOINT: "endpoint",
-  PING: "ping",
-  ERROR: "error",
-  PROGRESS: "progress",
-  CAPABILITIES: "capabilities"
-};
-var SseSession = class {
-  #res;
-  #clientId;
-  #active = true;
-  #heartbeatTimer = null;
-  #lastEventId = 0;
-  #heartbeatInterval;
-  #retryInterval;
-  #sessionData = {};
-  #sentMessages = [];
-  #backpressureBuffer = [];
-  #drainHandler = null;
-  constructor(res, options = {}) {
-    this.#res = res;
-    this.#clientId = options.clientId || randomUUID3();
-    this.#heartbeatInterval = options.heartbeatInterval || DEFAULT_HEARTBEAT_INTERVAL;
-    this.#retryInterval = options.retryInterval || DEFAULT_RETRY_INTERVAL;
-    this.#sessionData = options.sessionData || {};
-    if (options.resumeFromId && options.resumeFromId > 0) {
-      this.#lastEventId = options.resumeFromId;
-    }
-    this._setupSseHeaders();
-    this._sendRetry();
-    this._setupDrain();
-  }
-  get clientId() {
-    return this.#clientId;
-  }
-  get isActive() {
-    return this.#active;
-  }
-  get lastEventId() {
-    return this.#lastEventId;
-  }
-  get sessionData() {
-    return this.#sessionData;
-  }
-  get sentMessages() {
-    return [...this.#sentMessages];
-  }
-  getMessagesSince(eventId) {
-    return this.#sentMessages.filter((m) => m.id > eventId);
-  }
-  setSessionData(key, value) {
-    this.#sessionData[key] = value;
-  }
-  getSessionData(key) {
-    return this.#sessionData[key];
-  }
-  get retryInterval() {
-    return this.#retryInterval;
+async function bringToFront() {
+  if (!cad.connected) {
+    await cad.connect();
   }
-  setRetryInterval(ms) {
-    this.#retryInterval = ms;
+  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" }] };
   }
-  _sendRetry() {
-    this._write(`retry: ${this.#retryInterval}
-
-`);
+  return { content: [{ type: "text", text: "\u5207\u6362\u524D\u53F0\u5931\u8D25" }], isError: true };
+}
+async function installAtlisp() {
+  if (!cad.connected) {
+    await cad.connect();
   }
-  _setupSseHeaders() {
-    this.#res.setHeader("Content-Type", "text/event-stream");
-    this.#res.setHeader("Cache-Control", "no-cache");
-    this.#res.setHeader("Connection", "keep-alive");
-    this.#res.setHeader("Transfer-Encoding", "chunked");
-    this.#res.setHeader("X-Accel-Buffering", "no");
-    if (typeof this.#res.flush !== "function") {
-      this.#res.flush = () => {
-      };
-    }
+  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" }] };
+}
+async function listFunctionsInCad() {
+  if (!cad.connected) {
+    await cad.connect();
   }
-  _formatEvent(event, data, id = null) {
-    const lines = [];
-    if (id !== null) {
-      lines.push(`id: ${id}`);
-    }
-    lines.push(`event: ${event}`);
-    if (data !== null && data !== void 0) {
-      const jsonStr = JSON.stringify(data);
-      lines.push(`data: ${jsonStr}`);
-    } else {
-      lines.push("data:");
-    }
-    return lines.join("\n") + "\n\n";
+  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 }] };
+    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 };
   }
-  _setupDrain() {
-    if (typeof this.#res.on !== "function") return;
-    this.#drainHandler = () => {
-      if (!this.#active) return;
-      if (this.#backpressureBuffer.length > 0) {
-        this._drainBuffer();
-      }
-    };
-    this.#res.on("drain", this.#drainHandler);
+}
+async function getSystemStatus() {
+  const status = {
+    mcp: { version: process.env.npm_package_version || "unknown" },
+    worker: { alive: false },
+    cad: { connected: false, platform: null, version: null, busy: false, hasDoc: false },
+    lisp: { available: false, testResult: null, error: null },
+    packages: null
+  };
+  try {
+    status.worker.alive = await cad.ping();
+  } catch {
+    status.worker.alive = false;
   }
-  _drainBuffer() {
-    const batch = this.#backpressureBuffer.splice(0, 50);
-    for (const item of batch) {
-      const ok = this.#res.write(item);
-      if (!ok) {
-        this.#backpressureBuffer.unshift(...batch.slice(batch.indexOf(item)));
-        return;
-      }
+  status.cad.connected = cad.connected;
+  if (cad.connected) {
+    status.cad.platform = cad.getPlatform();
+    status.cad.version = cad.getVersion();
+    try {
+      status.cad.busy = await cad.isBusy();
+    } catch {
     }
-    this._flush();
-    if (this.#backpressureBuffer.length > 0) {
-      this._drainBuffer();
+    try {
+      const doc = await cad.hasDoc();
+      status.cad.hasDoc = doc.hasDoc;
+    } catch {
     }
-  }
-  _write(content) {
-    if (!this.#active) return false;
     try {
-      if (this.#backpressureBuffer.length > 0) {
-        this.#backpressureBuffer.push(content);
-        return true;
-      }
-      const result = this.#res.write(content);
-      if (typeof this.#res.flush === "function") {
-        this.#res.flush();
-      }
-      if (result === false) {
-        this.#backpressureBuffer.push(content);
-        return true;
+      const r = await cad.sendCommandWithResult("(+ 1 2)");
+      if (r !== null && r !== void 0) {
+        status.lisp.available = true;
+        status.lisp.testResult = String(r).trim();
       }
-      return true;
     } catch (e) {
-      this.#active = false;
-      this.close();
-      return false;
+      status.lisp.error = e.message;
     }
-  }
-  _flush() {
     try {
-      if (typeof this.#res.flush === "function") {
-        this.#res.flush();
+      const pkgResult = await cad.sendCommandWithResult("(@::package-list-in-local)");
+      if (pkgResult && pkgResult !== "nil") {
+        status.packages = pkgResult;
       }
-    } catch (e) {
-    }
-  }
-  flushBackpressure() {
-    if (this.#backpressureBuffer.length > 0) {
-      this._drainBuffer();
-    }
-  }
-  sendEvent(event, data, id = null) {
-    this.#lastEventId++;
-    const eventId = id !== null ? id : this.#lastEventId;
-    const formatted = this._formatEvent(event, data, eventId);
-    this.#sentMessages.push({ event, data, id: eventId, timestamp: Date.now() });
-    if (this.#sentMessages.length > MAX_SENT_MESSAGES) {
-      this.#sentMessages.splice(0, this.#sentMessages.length - MAX_SENT_MESSAGES);
+    } catch {
     }
-    this._write(formatted);
-    this._flush();
-    return true;
   }
-  sendMessage(data) {
-    return this.sendEvent(SSE_EVENTS.MESSAGE, data);
+  return { content: [{ type: "text", text: JSON.stringify(status, null, 2) }] };
+}
+async function initAtlisp() {
+  if (!cad.connected) {
+    await cad.connect();
   }
-  sendEndpoint(path8) {
-    return this.sendEvent(SSE_EVENTS.ENDPOINT, path8);
+  if (!cad.connected) return { content: [{ type: "text", text: "\u672A\u8FDE\u63A5 CAD" }], isError: true };
+  const code = `(if (null @::load-module)
+	   (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/cloud"):vlax-true)
+		   (v o'send)
+		   (v o'WaitforResponse 1000)
+		   (e(r(vlax-get o'ResponseText)))))`;
+  try {
+    await cad.sendCommand(code + "\n");
+    return { content: [{ type: "text", text: "\u5DF2\u53D1\u9001 @lisp \u51FD\u6570\u5E93\u52A0\u8F7D\u4EE3\u7801\u5230 CAD" }] };
+  } catch (e) {
+    return { content: [{ type: "text", text: `\u9519\u8BEF: ${e.message}` }], isError: true };
   }
-  sendError(code, message, id = null) {
-    return this.sendEvent(SSE_EVENTS.ERROR, { code, message }, id);
+}
+
+// src/handlers/package-handlers.js
+var PACKAGES_LIST_URL = process.env.PACKAGES_LIST_URL || "http://s3.atlisp.cn/packages-list?fmt=json";
+var cachedPackages = null;
+var cachedAt = null;
+var CACHE_TTL2 = 10 * 60 * 1e3;
+async function fetchPackages() {
+  const now = Date.now();
+  if (cachedPackages && cachedAt && now - cachedAt < CACHE_TTL2) {
+    return cachedPackages;
   }
-  sendPing() {
-    return this.sendEvent(SSE_EVENTS.PING, { timestamp: Date.now() });
+  try {
+    const response = await fetch(PACKAGES_LIST_URL, { headers: { "User-Agent": "atlisp-mcp" } });
+    if (response.ok) {
+      const data = await response.json();
+      cachedPackages = data;
+      cachedAt = now;
+      return data;
+    }
+  } catch (e) {
   }
-  sendProgress(current, total, message = "") {
-    return this.sendEvent(SSE_EVENTS.PROGRESS, { current, total, message });
+  return cachedPackages || MOCK_PACKAGES;
+}
+function flattenPackages(data) {
+  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) {
+    const data2 = await fetchPackages();
+    const items2 = flattenPackages(data2);
+    const text2 = items2.length ? items2.map((p) => `${p.name} v${p.version || ""} - ${p.description || ""}`).join("\n") : "\u65E0\u53EF\u7528\u5305";
+    return { content: [{ type: "text", text: text2 }] };
   }
-  sendCapabilities(capabilities) {
-    return this.sendEvent(SSE_EVENTS.CAPABILITIES, capabilities);
+  const result = await cad.sendCommandWithResult("(@::package-list-in-local)");
+  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:
+${items.map((p) => `${p.name} v${p.version || ""} - ${p.description || ""}`).join("\n")}` : MOCK_PACKAGES.map((p) => `${p.name} v${p.version} - ${p.description}`).join("\n");
+  return { content: [{ type: "text", text: `\u5DF2\u5B89\u88C5\u7684 @lisp \u5305:
+${text}` }] };
+}
+async function searchPackages(query) {
+  const data = await fetchPackages();
+  if (!data) {
+    return { content: [{ type: "text", text: "\u65E0\u6CD5\u83B7\u53D6\u5305\u5217\u8868" }], isError: true };
   }
-  sendResponse(jsonrpcResponse, id = null) {
-    const eventId = id !== null ? id : this.#lastEventId;
-    return this.sendEvent(SSE_EVENTS.MESSAGE, jsonrpcResponse, eventId);
+  const items = flattenPackages(data);
+  const results = [];
+  if (query) {
+    const q = query.toLowerCase();
+    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);
+    }
+  } else {
+    for (const p of items) results.push(p);
   }
-  startHeartbeat(interval = null) {
-    this.stopHeartbeat();
-    const ms = interval || this.#heartbeatInterval;
-    this.#heartbeatTimer = setInterval(() => {
-      if (!this.#active) {
-        this.stopHeartbeat();
-        return;
-      }
-      if (!this.sendPing()) {
-        this.stopHeartbeat();
-        this.close();
-      }
-    }, ms);
+  if (results.length === 0) {
+    return { content: [{ type: "text", text: `\u672A\u627E\u5230\u5305\u542B "${query}" \u7684\u5305` }] };
   }
-  stopHeartbeat() {
-    if (this.#heartbeatTimer) {
-      clearInterval(this.#heartbeatTimer);
-      this.#heartbeatTimer = null;
-    }
+  return { content: [{ type: "text", text: `\u641C\u7D22\u7ED3\u679C (${results.length}):
+${results.map((p) => `${p.name} v${p.version || ""} - ${p.description || ""}`).join("\n")}` }] };
+}
+async function installPackage(packageName) {
+  const data = await fetchPackages();
+  const items = flattenPackages(data);
+  const pkg = items.find((p) => p.name === packageName);
+  if (!pkg) {
+    return { content: [{ type: "text", text: `\u9519\u8BEF: \u5305 "${packageName}" \u4E0D\u5B58\u5728` }], isError: true };
   }
-  close() {
-    this.#active = false;
-    this.stopHeartbeat();
-    if (this.#drainHandler) {
-      this.#res.removeListener("drain", this.#drainHandler);
-      this.#drainHandler = null;
-    }
-    this.#backpressureBuffer = [];
-    try {
-      this.#res.end();
-    } catch (e) {
-    }
+  if (cad.connected) {
+    await cad.sendCommand(`(@::load-module '${packageName})
+`);
   }
-};
+  return { content: [{ type: "text", text: `\u5305 "${packageName}" \u5B89\u88C5\u547D\u4EE4\u5DF2\u53D1\u9001\uFF01` }] };
+}
 
-// src/sse-session-manager.js
+// src/handlers/function-handlers.js
 import fs5 from "fs";
 import path6 from "path";
 import os3 from "os";
-var SESSION_STORE_DIR = path6.join(os3.homedir(), ".atlisp", "sessions");
-var SESSION_STORE_TTL = 24 * 60 * 60 * 1e3;
-function getSessionStorePath(clientId) {
-  return path6.join(SESSION_STORE_DIR, `${clientId}.json`);
-}
-function persistSessionData(clientId, sessionData) {
+var FUNCTIONS_DIR = process.env.FUNCTIONS_DIR || "";
+var FUNCTIONS_URL = process.env.FUNCTIONS_URL || "http://s3.atlisp.cn/json/functions.json";
+var CACHE_DIR = path6.join(os3.homedir(), ".atlisp", "cache");
+var FUNCLIB_CACHE_FILE = path6.join(CACHE_DIR, "functions.json");
+var FUNCLIB_CACHE_TTL = 24 * 60 * 60 * 1e3;
+function readCacheFromDisk() {
   try {
-    fs5.mkdirSync(SESSION_STORE_DIR, { recursive: true });
-    const store = {
-      clientId,
-      sessionData,
-      savedAt: Date.now()
-    };
-    fs5.writeFileSync(getSessionStorePath(clientId), JSON.stringify(store), "utf-8");
+    const stat = fs5.statSync(FUNCLIB_CACHE_FILE);
+    if (Date.now() - stat.mtimeMs < FUNCLIB_CACHE_TTL) {
+      const raw = fs5.readFileSync(FUNCLIB_CACHE_FILE, "utf-8");
+      return JSON.parse(raw);
+    }
+  } catch {
+  }
+  return null;
+}
+function writeCacheToDisk(data) {
+  try {
+    fs5.mkdirSync(CACHE_DIR, { recursive: true });
+    fs5.writeFileSync(FUNCLIB_CACHE_FILE, JSON.stringify(data), "utf-8");
   } catch (e) {
-    console.error("Failed to persist session:", e.message);
+    log(`function-handlers writeCache error: ${e.message}`);
   }
 }
-function loadPersistedSessionData(clientId) {
+async function fetchFunctions() {
+  const diskCache = readCacheFromDisk();
+  if (diskCache) return diskCache;
   try {
-    const filePath = getSessionStorePath(clientId);
-    if (!fs5.existsSync(filePath)) return null;
-    const raw = fs5.readFileSync(filePath, "utf-8");
-    const store = JSON.parse(raw);
-    if (Date.now() - store.savedAt > SESSION_STORE_TTL) {
-      fs5.unlinkSync(filePath);
-      return null;
+    const response = await fetch(FUNCTIONS_URL, { headers: { "User-Agent": "atlisp-mcp" } });
+    if (response.ok) {
+      const data = await response.json();
+      writeCacheToDisk(data);
+      return data;
     }
-    return store.sessionData || {};
   } catch (e) {
-    return null;
+    log(`function-handlers fetch error: ${e.message}`);
   }
+  return diskCache;
 }
-var SseSessionManager = class {
-  #sessions = /* @__PURE__ */ new Map();
-  #eventHandlers = /* @__PURE__ */ new Map();
-  constructor() {
-    this.#sessions = /* @__PURE__ */ new Map();
-    this.#eventHandlers = /* @__PURE__ */ new Map();
-  }
-  add(clientId, session) {
-    if (!(session instanceof SseSession)) {
-      throw new Error("session must be an SseSession instance");
+async function getFunctionUsage(funcName, packageName) {
+  try {
+    let results = [];
+    const data = await fetchFunctions();
+    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);
     }
-    const persisted = loadPersistedSessionData(clientId);
-    if (persisted) {
-      for (const [key, value] of Object.entries(persisted)) {
-        session.setSessionData(key, value);
+    if (results.length === 0 && FUNCTIONS_DIR) {
+      try {
+        const files = fs5.readdirSync(FUNCTIONS_DIR).filter((f2) => f2.endsWith(".json"));
+        for (const file of files) {
+          const raw = fs5.readFileSync(path6.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);
+        }
+      } catch {
       }
     }
-    this.#sessions.set(clientId, session);
-    session.startHeartbeat();
-  }
-  remove(clientId) {
-    const session = this.#sessions.get(clientId);
-    if (session) {
-      persistSessionData(clientId, session.sessionData);
-      session.close();
-      this.#sessions.delete(clientId);
-      return true;
-    }
-    return false;
-  }
-  get(clientId) {
-    return this.#sessions.get(clientId) || null;
-  }
-  has(clientId) {
-    return this.#sessions.has(clientId);
-  }
-  list() {
-    return Array.from(this.#sessions.keys()).map((id) => ({
-      clientId: id,
-      isActive: this.#sessions.get(id)?.isActive ?? false
-    }));
-  }
-  listActive() {
-    return this.list().filter((s) => s.isActive);
-  }
-  count() {
-    return this.#sessions.size;
-  }
-  sendToClient(clientId, event, data, id = null) {
-    const session = this.#sessions.get(clientId);
-    if (!session || !session.isActive) {
-      return false;
+    if (results.length === 0) {
+      return { content: [{ type: "text", text: `\u672A\u627E\u5230\u51FD\u6570: ${funcName}` }], isError: true };
     }
-    return session.sendEvent(event, data, id);
-  }
-  sendMessageToClient(clientId, data) {
-    return this.sendToClient(clientId, SSE_EVENTS.MESSAGE, data);
-  }
-  sendErrorToClient(clientId, code, message, id = null) {
-    return this.sendToClient(clientId, SSE_EVENTS.ERROR, { code, message }, id);
-  }
-  sendProgressToClient(clientId, current, total, message = "") {
-    return this.sendToClient(clientId, SSE_EVENTS.PROGRESS, { current, total, message });
+    const f = results[0];
+    const text = `\u51FD\u6570: ${f.name}
+\u63CF\u8FF0: ${f.description || "-"}
+\u53C2\u6570: ${f.params?.join(", ") || "-"}
+\u8FD4\u56DE\u503C: ${f.return || "-"}
+\u793A\u4F8B: ${f.usage || "-"}`;
+    return { content: [{ type: "text", text }] };
+  } catch (e) {
+    return { content: [{ type: "text", text: `\u9519\u8BEF: ${e.message}` }], isError: true };
   }
-  broadcast(event, data) {
-    let successCount = 0;
-    for (const [clientId, session] of this.#sessions) {
-      if (session.isActive && session.sendEvent(event, data)) {
-        successCount++;
+}
+async function listSymbols(packageName) {
+  try {
+    let allFuncs = [];
+    const data = await fetchFunctions();
+    if (data) {
+      const funcs = Object.values(data.all_functions || {});
+      if (packageName) {
+        allFuncs = funcs.filter((f) => f.name.startsWith(`${packageName}:`));
+      } else {
+        allFuncs = funcs.map((f) => `${f.name}: ${f.description || "-"}`);
       }
     }
-    return successCount;
-  }
-  broadcastMessage(data) {
-    return this.broadcast(SSE_EVENTS.MESSAGE, data);
-  }
-  broadcastError(code, message) {
-    return this.broadcast(SSE_EVENTS.ERROR, { code, message });
-  }
-  on(event, handler) {
-    if (!this.#eventHandlers.has(event)) {
-      this.#eventHandlers.set(event, /* @__PURE__ */ new Set());
-    }
-    this.#eventHandlers.get(event).add(handler);
-  }
-  off(event, handler) {
-    const handlers = this.#eventHandlers.get(event);
-    if (handlers) {
-      handlers.delete(handler);
-    }
-  }
-  emit(event, data) {
-    const handlers = this.#eventHandlers.get(event);
-    if (handlers) {
-      for (const handler of handlers) {
-        try {
-          handler(data);
-        } catch (e) {
+    if (allFuncs.length === 0 && FUNCTIONS_DIR) {
+      try {
+        const files = fs5.readdirSync(FUNCTIONS_DIR).filter((f) => f.endsWith(".json"));
+        for (const file of files) {
+          const raw = fs5.readFileSync(path6.join(FUNCTIONS_DIR, file), "utf-8");
+          const data2 = JSON.parse(raw);
+          const funcs = Object.values(data2.all_functions || {});
+          if (packageName) {
+            allFuncs = funcs.filter((f) => f.name.startsWith(`${packageName}:`));
+          } else {
+            for (const f of funcs) {
+              allFuncs.push(`${f.name}: ${f.description || "-"}`);
+            }
+          }
         }
+      } catch (err) {
+        log(`listSymbols readDir error: ${err.message}`);
       }
     }
-  }
-  cleanupInactive() {
-    for (const [clientId, session] of this.#sessions) {
-      if (!session.isActive) {
-        session.close();
-        this.#sessions.delete(clientId);
-      }
+    if (allFuncs.length === 0) {
+      return await listFunctionsInCad();
     }
-  }
-  closeAll() {
-    for (const [clientId, session] of this.#sessions) {
-      persistSessionData(clientId, session.sessionData);
-      session.close();
+    if (packageName) {
+      return { content: [{ type: "text", text: `${packageName} \u5305\u51FD\u6570 (${allFuncs.length}):
+${allFuncs.map((f) => f.name).join("\n")}` }] };
     }
-    this.#sessions.clear();
+    return { content: [{ type: "text", text: allFuncs.join("\n") }] };
+  } catch (e) {
+    return { content: [{ type: "text", text: `\u9519\u8BEF: ${e.message}` }], isError: true };
   }
-};
+}
 
-// src/atlisp-mcp.js
-var __dirname4 = path7.dirname(fileURLToPath4(import.meta.url));
-var require2 = createRequire(import.meta.url);
-var { version } = require2(path7.join(__dirname4, "..", "package.json"));
+// src/function-lib.js
+import path7 from "path";
+import fs6 from "fs";
+import os4 from "os";
 var CACHE_DIR2 = path7.join(os4.homedir(), ".atlisp", "cache");
 var FUNCLIB_CACHE_FILE2 = path7.join(CACHE_DIR2, "functions.json");
-var FUNCLIB_CACHE_TTL2 = 24 * 60 * 60 * 1e3;
-var isMcpScript = process.argv[1]?.includes("atlisp-mcp");
-if (isMcpScript) {
-  const args = process.argv.slice(2);
-  for (let i = 0; i < args.length; i++) {
-    if (args[i] === "--version" || args[i] === "-v") {
-      console.log(`atlisp-mcp v${version}`);
-      process.exit(0);
-    } else if (args[i] === "--help" || args[i] === "-h") {
-      console.log(`
-@lisp MCP Server v${version}
-
-Usage: atlisp-mcp [options]
-
-Options:
-  -v, --version         Show version number
-  --transport <type>   Transport type: http or stdio (default: http)
-  --port <port>        HTTP port (default: 8110)
-  --host <host>        HTTP host (default: 0.0.0.0)
-  --stdio              Shorthand for --transport stdio
-  -h, --help           Show this help message
-
-Examples:
-  atlisp-mcp                       # Start HTTP server on port 8110
-  atlisp-mcp --port 3000           # Start HTTP server on port 3000
-  atlisp-mcp --stdio               # Start in stdio mode for MCP clients
-  atlisp-mcp --transport stdio     # Same as --stdio
-`);
-      process.exit(0);
-    } else if (args[i] === "--transport" && args[i + 1]) {
-      process.env.TRANSPORT = args[i + 1];
-      i++;
-    } else if (args[i] === "--stdio") {
-      process.env.TRANSPORT = "stdio";
-    } else if (args[i] === "--port" && args[i + 1]) {
-      process.env.PORT = args[i + 1];
-      i++;
-    } else if (args[i] === "--host" && args[i + 1]) {
-      process.env.HOST = args[i + 1];
-      i++;
-    }
-  }
-}
-var { decode: charsetDecode, encodingExists } = iconv;
-var mcpContext = new AsyncLocalStorage();
-var sseSessionManager = new SseSessionManager();
-var SERVER_CAPABILITIES = {
-  tools: {},
-  resources: { subscribe: true, listChanged: true },
-  prompts: {}
-};
-var { port, host, transport, apiKey, rateLimitWindow, rateLimitMax } = config_default;
-if (apiKey) log("API Key authentication enabled");
-var mcpLimiter = rateLimit({
-  windowMs: rateLimitWindow,
-  max: rateLimitMax,
-  standardHeaders: true,
-  legacyHeaders: false,
-  message: { error: "\u8BF7\u6C42\u8FC7\u4E8E\u9891\u7E41\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5" }
-});
-var FUNCTION_LIB_URL = process.env.FUNCTION_LIB_URL || "http://s3.atlisp.cn/json/functions.json";
+var CACHE_TTL3 = config_default.functionLibCacheTtl || 5 * 60 * 1e3;
+var FUNCTION_LIB_URL = config_default.functionLibUrl || "http://s3.atlisp.cn/json/functions.json";
 var cachedFunctionLib = null;
 var cachedAt2 = null;
-var CACHE_TTL3 = 5 * 60 * 1e3;
 async function readCacheFromDisk2() {
   try {
     const stat = fs6.statSync(FUNCLIB_CACHE_FILE2);
-    if (Date.now() - stat.mtimeMs < FUNCLIB_CACHE_TTL2) {
+    if (Date.now() - stat.mtimeMs < CACHE_TTL3) {
       const raw = fs6.readFileSync(FUNCLIB_CACHE_FILE2, "utf-8");
       return JSON.parse(raw);
     }
@@ -2909,7 +2964,7 @@ function writeCacheToDisk2(data) {
     fs6.mkdirSync(CACHE_DIR2, { recursive: true });
     fs6.writeFileSync(FUNCLIB_CACHE_FILE2, JSON.stringify(data), "utf-8");
   } catch (e) {
-    log(`writeCacheToDisk error: ${e.message}`);
+    error(`writeCacheToDisk error: ${e.message}`);
   }
 }
 async function loadAtlibFunctionLib() {
@@ -2932,16 +2987,64 @@ async function loadAtlibFunctionLib() {
       writeCacheToDisk2(data);
       return data;
     }
-  } catch (e) {
-    log(`loadAtlibFunctionLib error: ${e.message}`);
+  } catch (e) {
+    error(`loadAtlibFunctionLib error: ${e.message}`);
+  }
+  return cachedFunctionLib;
+}
+
+// src/mcp-tools.js
+var toolInputSchema = {
+  connect_cad: { platform: "string?" },
+  eval_lisp: { code: "string" },
+  eval_lisp_with_result: { code: "string", encoding: "string?" },
+  get_cad_info: {},
+  list_packages: {},
+  search_packages: { query: "string" },
+  install_package: { packageName: "string" },
+  get_platform_info: {},
+  at_command: { command: "string" },
+  new_document: {},
+  bring_to_front: {},
+  install_atlisp: {},
+  init_atlisp: {},
+  get_function_usage: { name: "string", package: "string?" },
+  list_symbols: { package: "string?" },
+  get_system_status: {},
+  import_funlib: { format: "string?" },
+  list_prompts: {},
+  get_prompt: { name: "string", args: "object?" }
+};
+function validateToolArgs(name, args) {
+  const schema = toolInputSchema[name];
+  if (!schema) {
+    throw new Error(`Unknown tool: ${name}`);
+  }
+  for (const [key, type] of Object.entries(schema)) {
+    const isOptional = type.endsWith("?");
+    const baseType = type.replace("?", "");
+    if (!args[key]) {
+      if (isOptional) continue;
+      throw new Error(`Missing required argument: ${key}`);
+    }
+    const actualType = typeof args[key];
+    if (baseType === "string" && actualType !== "string") {
+      throw new Error(`Invalid type for argument ${key}: expected string, got ${actualType}`);
+    }
+    if (baseType === "object" && (actualType !== "object" || actualType === null)) {
+      throw new Error(`Invalid type for argument ${key}: expected object, got ${actualType}`);
+    }
+    if (baseType === "number" && actualType !== "number") {
+      throw new Error(`Invalid type for argument ${key}: expected number, got ${actualType}`);
+    }
   }
-  return cachedFunctionLib;
+  return true;
 }
 var TOOL_HANDLERS = {
   connect_cad: (a) => connectCad(a?.platform),
   eval_lisp: (a) => evalLisp(a.code),
   eval_lisp_with_result: (a) => evalLisp(a.code, true, a.encoding),
-  get_cad_info: () => getCadInfo(),
+  get_cad_info: () => getCadInfo2(),
   list_packages: () => listPackages(),
   search_packages: (a) => searchPackages(a.query),
   install_package: (a) => installPackage(a.packageName),
@@ -2974,36 +3077,6 @@ ${CAD_PLATFORMS.join("\n")}
     return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
   }
 };
-function getOrCreateSessionServer(sessionId) {
-  let entry = sessionServers.get(sessionId);
-  if (!entry) {
-    const server = createMcpServer();
-    const transport2 = new SessionTransport(sessionId);
-    server.connect(transport2);
-    entry = { server, transport: transport2 };
-    sessionServers.set(sessionId, entry);
-    sessionTransports.set(sessionId, transport2);
-  }
-  return entry;
-}
-function removeSessionServer(sessionId) {
-  const entry = sessionServers.get(sessionId);
-  if (entry) {
-    entry.transport.close().catch(() => {
-    });
-    entry.server.close().catch(() => {
-    });
-    sessionServers.delete(sessionId);
-    sessionTransports.delete(sessionId);
-  }
-}
-function broadcastToAllSessions(uri) {
-  for (const [sid, entry] of sessionServers) {
-    entry.server.sendResourceUpdated({ uri }).catch((err) => {
-      log(`Failed to send resource update to session ${sid}: ${err.message}`);
-    });
-  }
-}
 var tools = [
   {
     name: "connect_cad",
@@ -3116,7 +3189,7 @@ var tools = [
     inputSchema: {
       type: "object",
       properties: {
-        package: { type: "string", description: "\u5305\u540D\uFF0C\u5982 string\uFF08\u53EF\u9009\uFF09" }
+        package: { type: "string", description: "\u5305\u540D\uFF08\u53EF\u9009\uFF09" }
       }
     }
   },
@@ -3153,18 +3226,6 @@ var tools = [
     }
   }
 ];
-async function handleToolCall(name, args) {
-  const handler = TOOL_HANDLERS[name];
-  if (!handler) return { content: [{ type: "text", text: `\u672A\u77E5\u5DE5\u5177: ${name}` }], isError: true };
-  try {
-    const result = await handler(args || {});
-    notifyResourceChanges(name);
-    return result;
-  } catch (e) {
-    log(`Tool call error [${name}]: ${e.message}`);
-    return { content: [{ type: "text", text: `\u5DE5\u5177\u6267\u884C\u9519\u8BEF: ${e.message}` }], isError: true };
-  }
-}
 function notifyResourceChanges(toolName) {
   const resourceMap = {
     connect_cad: ["atlisp://cad/info", "atlisp://dwg/layers", "atlisp://dwg/name", "atlisp://dwg/path", "atlisp://cad/dwgs", "atlisp://packages"],
@@ -3183,227 +3244,324 @@ function notifyResourceChanges(toolName) {
     }
   }
 }
-async function initCadConnection() {
-  log("Attempting to connect to CAD on startup...");
+async function handleToolCall(name, args) {
+  const handler = TOOL_HANDLERS[name];
+  if (!handler) return { content: [{ type: "text", text: `\u672A\u77E5\u5DE5\u5177: ${name}` }], isError: true };
   try {
-    const connected = await cad.connect();
-    if (connected) {
-      log("Auto-connected to CAD: " + cad.getPlatform() + " " + cad.getVersion());
-      console.error("\u5DF2\u81EA\u52A8\u8FDE\u63A5\u5230 CAD: " + cad.getPlatform() + " " + cad.getVersion());
-    } else {
-      log("No CAD found on startup");
-    }
+    validateToolArgs(name, args || {});
+    const result = await handler(args || {});
+    notifyResourceChanges(name);
+    return result;
   } catch (e) {
-    log("Auto-connect failed: " + e.message);
+    error(`Tool call error [${name}]: ${e.message}`, { tool: name, args });
+    return { content: [{ type: "text", text: `\u5DE5\u5177\u6267\u884C\u9519\u8BEF: ${e.message}` }], isError: true };
   }
 }
+
+// src/mcp-server-state.js
+var mcpContext = new AsyncLocalStorage();
 var sessionServers = /* @__PURE__ */ new Map();
 var sessionTransports = /* @__PURE__ */ new Map();
-function createMcpServer() {
-  const server = new Server(
-    { name: SERVER_NAME, version: SERVER_VERSION },
-    { capabilities: SERVER_CAPABILITIES }
-  );
-  server.setRequestHandler(ListToolsRequestSchema, async () => ({ tools }));
-  server.setRequestHandler(CallToolRequestSchema, async (request) => {
-    const { name, arguments: args } = request.params;
-    return await handleToolCall(name, args || {});
-  });
-  server.setRequestHandler(ListResourcesRequestSchema, async (request) => {
-    const ctx = mcpContext.getStore();
-    const sessionId = ctx?.sessionId;
-    const subscribedUris = sessionId ? list(sessionId) : list();
-    return {
-      resources: await listResources(subscribedUris)
-    };
-  });
-  server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
-    const { uri } = request.params;
+var mcpHandlers = { tools, handleToolCall };
+async function getOrCreateSessionServer(sessionId) {
+  let entry = sessionServers.get(sessionId);
+  if (!entry) {
+    const server = createMcpServer(mcpHandlers);
+    const transport = new SessionTransport(sessionId);
+    server.connect(transport);
+    entry = { server, transport };
+    sessionServers.set(sessionId, entry);
+    sessionTransports.set(sessionId, transport);
+  }
+  return entry;
+}
+function createStdioServer(handlers) {
+  mcpHandlers = handlers;
+  return createMcpServer(handlers);
+}
+function removeSessionServer(sessionId) {
+  const entry = sessionServers.get(sessionId);
+  if (entry) {
+    entry.transport.close().catch(() => {
+    });
+    entry.server.close().catch(() => {
+    });
+    sessionServers.delete(sessionId);
+    sessionTransports.delete(sessionId);
+  }
+}
+function broadcastToAllSessions(uri) {
+  for (const [sid, entry] of sessionServers) {
+    entry.server.sendResourceUpdated({ uri }).catch((err) => {
+      error(`Failed to send resource update to session ${sid}: ${err.message}`, { sessionId: sid, uri });
+    });
+  }
+}
+
+// src/routes.js
+var sseSessionManager = new SseSessionManager();
+var { apiKey, enableCors, corsOrigin, rateLimitWindow, rateLimitMax } = config_default;
+var mcpLimiter = rateLimit({
+  windowMs: rateLimitWindow,
+  max: rateLimitMax,
+  standardHeaders: true,
+  legacyHeaders: false,
+  message: { error: "\u8BF7\u6C42\u8FC7\u4E8E\u9891\u7E41\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5" }
+});
+var JSON_CONTENT_TYPES = ["application/json", "application/json-rpc", "application/vnd.api+json"];
+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();
     try {
-      const data = await readResource(uri);
-      return {
-        contents: [{
-          uri,
-          mimeType: "application/json",
-          text: JSON.stringify(data)
-        }]
-      };
+      const chunks = [];
+      for await (const chunk of req) {
+        chunks.push(chunk);
+      }
+      const totalLength = chunks.reduce((acc, c) => acc + c.length, 0);
+      if (totalLength > 10 * 1024 * 1024) {
+        throw new Error("Request body too large");
+      }
+      const buf = Buffer.concat(chunks);
+      const m = ct.match(/charset\s*=\s*([^\s;]+)/i);
+      let charset = m ? m[1].toLowerCase() : "utf-8";
+      const charsetMap = { "gb2312": "gbk", "gb18030": "gbk", "gbk": "gbk", "936": "gbk" };
+      charset = charsetMap[charset] || charset;
+      const str = iconv.decode(buf, charset);
+      req.body = JSON.parse(str);
+      next();
     } catch (e) {
-      return {
-        contents: [],
-        isError: true,
-        error: { code: -32603, message: e.message }
-      };
+      res.status(400).json({ error: "Invalid JSON body", message: e.message });
     }
+  };
+}
+function createLoggingMiddleware() {
+  return (req, res, next) => {
+    log(`${req.method} ${req.path}`, { method: req.method, path: req.path, query: req.query });
+    next();
+  };
+}
+function createAuthMiddleware() {
+  const PUBLIC_PATHS = ["/health"];
+  return (req, res, next) => {
+    if (apiKey) {
+      if (PUBLIC_PATHS.includes(req.path)) return next();
+      const auth = req.get("Authorization");
+      if (auth === `Bearer ${apiKey}`) return next();
+      return res.status(401).json({ error: "Unauthorized" });
+    }
+    next();
+  };
+}
+function createCorsMiddleware() {
+  return (req, res, 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();
+    next();
+  };
+}
+function createErrorHandler() {
+  return (err, req, res, next) => {
+    error(`Unhandled error: ${err.message}`, { stack: err.stack, path: req.path });
+    res.status(500).json({ error: "Internal server error", message: err.message });
+  };
+}
+function setupRoutes(app) {
+  app.use(createJsonBodyParser());
+  app.use(createLoggingMiddleware());
+  app.use(createAuthMiddleware());
+  app.use(createCorsMiddleware());
+  app.get("/health", (req, res) => {
+    res.json({ status: "ok", cad: cad.connected ? "connected" : "disconnected" });
   });
-  server.setRequestHandler(SubscribeRequestSchema, async (request) => {
-    const { uri } = request.params;
-    const ctx = mcpContext.getStore();
-    subscribe(uri, ctx?.sessionId);
-    return { success: true };
+  app.get("/api/docs", (req, res) => {
+    res.json({
+      openapi: "3.0.0",
+      info: { title: "@lisp MCP Server", version: "1.5.0" },
+      paths: {
+        "/mcp": { post: { summary: "MCP JSON-RPC endpoint" } },
+        "/sse": { get: { summary: "Server-Sent Events endpoint" } },
+        "/message": { post: { summary: "SSE message endpoint" } },
+        "/health": { get: { summary: "Health check" } }
+      }
+    });
   });
-  server.setRequestHandler(UnsubscribeRequestSchema, async (request) => {
-    const { uri } = request.params;
-    const ctx = mcpContext.getStore();
-    unsubscribe(uri, ctx?.sessionId);
-    return { success: true };
+  app.all("/mcp", mcpLimiter, handleMcpPost);
+  app.all("/mcp/:path", mcpLimiter, handleMcpPost);
+  app.get("/mcp/stream", mcpLimiter, handleMcpPost);
+  app.get("/sse", handleSse);
+  app.post("/message", mcpLimiter, handleMessage);
+  app.use(createErrorHandler());
+  return app;
+}
+async function handleMcpPost(req, res) {
+  const sessionId = req.headers["mcp-session-id"] || req.query.sessionId || randomUUID4();
+  sessionManager.createSession(sessionId);
+  const body = req.body;
+  if (!body || !body.method) {
+    return res.status(400).json({ error: "Invalid request" });
+  }
+  const { server, transport } = await getOrCreateSessionServer(sessionId);
+  transport.resetCleanupTimer();
+  await mcpContext.run({ sessionId }, async () => {
+    try {
+      const response = await transport.handleRequest(body);
+      if (response) {
+        const headers = { "Content-Type": "application/json" };
+        if (transport.sessionId) {
+          headers["mcp-session-id"] = transport.sessionId;
+        }
+        res.writeHead(200, headers);
+        res.end(JSON.stringify(response));
+      } else {
+        if (!res.headersSent) {
+          res.status(202).end();
+        }
+      }
+    } catch (err) {
+      error(`Transport error [${sessionId}]: ${err.message}`);
+      if (!res.headersSent) {
+        res.status(500).json({ error: "Internal server error", message: err.message });
+      }
+    }
   });
-  server.setRequestHandler(ListPromptsRequestSchema, async () => ({
-    prompts: await listPrompts()
-  }));
-  server.setRequestHandler(GetPromptRequestSchema, async (request) => {
-    const { name, arguments: args } = request.params;
-    return await getPrompt(name, args || {});
+}
+async function handleSse(req, res) {
+  const sessionId = randomUUID4();
+  sessionManager.createSession(sessionId);
+  getOrCreateSessionServer(sessionId);
+  const sseSession = new SseSession(res, { clientId: sessionId });
+  sseSessionManager.add(sessionId, sseSession);
+  sseSession.sendEndpoint(`/message?sessionId=${sessionId}`);
+  req.on("close", () => {
+    sseSessionManager.remove(sessionId);
+    removeSessionServer(sessionId);
   });
-  return server;
+}
+async function handleMessage(req, res) {
+  const sessionId = req.query.sessionId;
+  if (!sessionId) {
+    return res.status(400).json({ error: "Missing sessionId" });
+  }
+  const sseSession = sseSessionManager.get(sessionId);
+  if (!sseSession) {
+    return res.status(404).json({ error: "Session not found" });
+  }
+  sessionManager.createSession(sessionId);
+  const { server, transport } = await getOrCreateSessionServer(sessionId);
+  transport.resetCleanupTimer();
+  const body = req.body;
+  if (body && body.method) {
+    try {
+      const response = await transport.handleRequest(body);
+      if (response) {
+        sseSession.sendResponse(response);
+      }
+      if (!res.headersSent) {
+        res.status(202).end();
+      }
+    } catch (err) {
+      error(`SSE message error [${sessionId}]: ${err.message}`);
+      if (!res.headersSent) {
+        res.status(500).json({ error: "Internal server error" });
+      }
+    }
+  } else {
+    res.status(400).json({ error: "Invalid request" });
+  }
+}
+
+// src/atlisp-mcp.js
+var __dirname4 = path8.dirname(fileURLToPath4(import.meta.url));
+var require2 = createRequire(import.meta.url);
+var { version } = require2(path8.join(__dirname4, "..", "package.json"));
+var sseSessionManager2 = new SseSessionManager();
+var isMcpScript = process.argv[1]?.includes("atlisp-mcp");
+if (isMcpScript) {
+  const args = process.argv.slice(2);
+  for (let i = 0; i < args.length; i++) {
+    if (args[i] === "--version" || args[i] === "-v") {
+      console.log(`atlisp-mcp v${version}`);
+      process.exit(0);
+    } else if (args[i] === "--help" || args[i] === "-h") {
+      console.log(`
+@lisp MCP Server v${version}
+
+Usage: atlisp-mcp [options]
+
+Options:
+  -v, --version         Show version number
+  --transport <type>   Transport type: http or stdio (default: http)
+  --port <port>        HTTP port (default: 8110)
+  --host <host>        HTTP host (default: 0.0.0.0)
+  --stdio              Shorthand for --transport stdio
+  -h, --help           Show this help message
+
+Examples:
+  atlisp-mcp                       # Start HTTP server on port 8110
+  atlisp-mcp --port 3000           # Start HTTP server on port 3000
+  atlisp-mcp --stdio               # Start in stdio mode for MCP clients
+  atlisp-mcp --transport stdio     # Same as --stdio
+`);
+      process.exit(0);
+    } else if (args[i] === "--transport" && args[i + 1]) {
+      process.env.TRANSPORT = args[i + 1];
+      i++;
+    } else if (args[i] === "--stdio") {
+      process.env.TRANSPORT = "stdio";
+    } else if (args[i] === "--port" && args[i + 1]) {
+      process.env.PORT = args[i + 1];
+      i++;
+    } else if (args[i] === "--host" && args[i + 1]) {
+      process.env.HOST = args[i + 1];
+      i++;
+    }
+  }
+}
+if (config_default.apiKey) log("API Key authentication enabled");
+async function initCadConnection() {
+  log("Attempting to connect to CAD on startup...");
+  try {
+    const connected = await cad.connect();
+    if (connected) {
+      log(`Auto-connected to CAD: ${cad.getPlatform()} ${cad.getVersion()}`);
+      console.error(`\u5DF2\u81EA\u52A8\u8FDE\u63A5\u5230 CAD: ${cad.getPlatform()} ${cad.getVersion()}`);
+    } else {
+      log("No CAD found on startup");
+    }
+  } catch (e) {
+    error(`Auto-connect failed: ${e.message}`);
+  }
 }
 async function startServer() {
   if (config_default.transport === "stdio") {
     await initCadConnection();
-    const mcpServer = createMcpServer();
-    const transport2 = new StdioServerTransport();
+    const mcpServer = createStdioServer({ tools, handleToolCall });
+    const transport = new StdioServerTransport();
     const sessionId = "stdio-session";
     sessionManager.createSession(sessionId);
     await mcpContext.run({ sessionId }, async () => {
-      await mcpServer.connect(transport2);
+      await mcpServer.connect(transport);
     });
     console.error(`${SERVER_NAME} \u8FD0\u884C\u5728 stdio \u6A21\u5F0F`);
     setNotify((uri, data) => {
       mcpServer.sendResourceUpdated({ uri }).catch((err) => {
-        log(`Failed to send resource update: ${err.message}`);
+        error(`Failed to send resource update: ${err.message}`);
       });
     });
   } else {
-    const app = express();
-    const JSON_CONTENT_TYPES = ["application/json", "application/json-rpc", "application/vnd.api+json"];
-    app.use(async (req, res, next) => {
-      const ct = (req.headers["content-type"] || "").toLowerCase();
-      if (!JSON_CONTENT_TYPES.some((t) => ct.startsWith(t))) return next();
-      try {
-        const buf = await rawBody(req, { limit: "10mb" });
-        const m = ct.match(/charset\s*=\s*([^\s;]+)/i);
-        let charset = m ? m[1].toLowerCase() : "utf-8";
-        const charsetMap = { "gb2312": "gbk", "gb18030": "gbk", "gbk": "gbk", "936": "gbk" };
-        charset = charsetMap[charset] || charset;
-        const str = encodingExists(charset) ? charsetDecode(buf, charset) : buf.toString("utf-8");
-        req.body = JSON.parse(str);
-        next();
-      } catch (e) {
-        res.status(400).json({ error: "Invalid JSON body", message: e.message });
-      }
-    });
-    app.use((req, res, next) => {
-      log(`${req.method} ${req.path}`);
-      next();
-    });
-    const PUBLIC_PATHS = ["/health"];
-    if (apiKey) {
-      app.use((req, res, next) => {
-        if (PUBLIC_PATHS.includes(req.path)) return next();
-        const auth = req.get("Authorization");
-        if (auth === `Bearer ${apiKey}`) return next();
-        res.status(401).json({ error: "Unauthorized" });
-      });
-    }
-    app.get("/health", (req, res) => {
-      res.json({ status: "ok", cad: cad.connected ? "connected" : "disconnected" });
-    });
-    if (config_default.enableCors) {
-      app.use((req, res, next) => {
-        res.setHeader("Access-Control-Allow-Origin", config_default.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();
-        next();
-      });
-    }
+    const app = express2();
+    setupRoutes(app);
     setNotify((uri, data) => {
       broadcastToAllSessions(uri);
-      for (const session of sseSessionManager.listActive()) {
-        sseSessionManager.sendToClient(session.clientId, "resource_updated", { uri });
-      }
-    });
-    async function handleMcpPost(req, res) {
-      const sessionId = req.headers["mcp-session-id"] || req.query.sessionId || randomUUID4();
-      sessionManager.createSession(sessionId);
-      const body = req.body;
-      if (!body || !body.method) {
-        return res.status(400).json({ error: "Invalid request" });
-      }
-      const { server, transport: transport2 } = getOrCreateSessionServer(sessionId);
-      transport2.resetCleanupTimer();
-      await mcpContext.run({ sessionId }, async () => {
-        try {
-          const response = await transport2.handleRequest(body);
-          if (response) {
-            const headers = { "Content-Type": "application/json" };
-            if (transport2.sessionId) {
-              headers["mcp-session-id"] = transport2.sessionId;
-            }
-            res.writeHead(200, headers);
-            res.end(JSON.stringify(response));
-          } else {
-            if (!res.headersSent) {
-              res.status(202).end();
-            }
-          }
-        } catch (error) {
-          log(`Transport error [${sessionId}]: ${error.message}`);
-          if (!res.headersSent) {
-            res.status(500).json({ error: "Internal server error", message: error.message });
-          }
-        }
-      });
-    }
-    app.all("/mcp", mcpLimiter, handleMcpPost);
-    app.all("/mcp/:path", mcpLimiter, handleMcpPost);
-    app.get("/mcp/stream", mcpLimiter, handleMcpPost);
-    const sseEndpoint = "/sse";
-    app.get(sseEndpoint, async (req, res) => {
-      const sessionId = randomUUID4();
-      sessionManager.createSession(sessionId);
-      getOrCreateSessionServer(sessionId);
-      const sseSession = new SseSession(res, { clientId: sessionId });
-      sseSessionManager.add(sessionId, sseSession);
-      sseSession.sendEndpoint(`/message?sessionId=${sessionId}`);
-      req.on("close", () => {
-        sseSessionManager.remove(sessionId);
-        removeSessionServer(sessionId);
-      });
-    });
-    app.post("/message", mcpLimiter, async (req, res) => {
-      const sessionId = req.query.sessionId;
-      if (!sessionId) {
-        return res.status(400).json({ error: "Missing sessionId" });
-      }
-      const sseSession = sseSessionManager.get(sessionId);
-      if (!sseSession) {
-        return res.status(404).json({ error: "Session not found" });
-      }
-      sessionManager.createSession(sessionId);
-      const { server, transport: transport2 } = getOrCreateSessionServer(sessionId);
-      transport2.resetCleanupTimer();
-      const body = req.body;
-      if (body && body.method) {
-        try {
-          const response = await transport2.handleRequest(body);
-          if (response) {
-            sseSession.sendResponse(response);
-          }
-          if (!res.headersSent) {
-            res.status(202).end();
-          }
-        } catch (error) {
-          log(`SSE message error [${sessionId}]: ${error.message}`);
-          if (!res.headersSent) {
-            res.status(500).json({ error: "Internal server error" });
-          }
-        }
-      } else {
-        res.status(400).json({ error: "Invalid request" });
+      for (const session of sseSessionManager2.listActive()) {
+        sseSessionManager2.sendToClient(session.clientId, "resource_updated", { uri });
       }
     });
     const httpServer = app.listen(config_default.port, config_default.host, async () => {
@@ -3413,7 +3571,7 @@ async function startServer() {
     async function shutdown(signal) {
       console.error(`
 \u6536\u5230 ${signal}\uFF0C\u6B63\u5728\u4F18\u96C5\u5173\u95ED...`);
-      sseSessionManager.closeAll();
+      sseSessionManager2.closeAll();
       sessionManager.clear();
       for (const [sid] of sessionServers) {
         removeSessionServer(sid);
@@ -3433,8 +3591,6 @@ if (!process.env.VITEST) {
 export {
   CAD_PLATFORMS,
   FILE_EXTENSIONS,
-  MOCK_PACKAGES,
-  createMcpServer,
   handleToolCall,
   loadAtlibFunctionLib,
   startServer,