@atlisp/mcp 1.8.23 → 1.8.26

package/dist/atlisp-mcp.js

@@ -7,10 +7,10 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   if (typeof require !== "undefined") return require.apply(this, arguments);
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
-var __glob = (map) => (path20) => {
-  var fn = map[path20];
+var __glob = (map) => (path21) => {
+  var fn = map[path21];
   if (fn) return fn();
-  throw new Error("Module not found in bundle: " + path20);
+  throw new Error("Module not found in bundle: " + path21);
 };
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
@@ -37,7 +37,7 @@ function parseArgs() {
     } else if (args[i] === "--ws") {
       result.transport = "ws";
     } else if (args[i] === "--port" && args[i + 1]) {
-      result.port = args[i + 1];
+      result.port = parseInt(args[i + 1], 10);
       i++;
     } else if (args[i] === "--host" && args[i + 1]) {
       result.host = args[i + 1];
@@ -111,41 +111,42 @@ var envSchema, configSchema, cliArgs, envResult, env, configFilePath, fileConfig
 var init_config = __esm({
   "src/config.js"() {
     envSchema = z.object({
-      PORT: z.string().optional().default("8110"),
+      PORT: z.coerce.number().optional().default(8110),
       HOST: z.string().optional().default("0.0.0.0"),
       TRANSPORT: z.enum(["http", "stdio", "ws"]).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"),
+      ENABLE_SSE: z.coerce.boolean().optional().default(true),
+      MESSAGE_TIMEOUT: z.coerce.number().optional().default(6e4),
+      HEARTBEAT_INTERVAL: z.coerce.number().optional().default(3e4),
+      BUSY_RETRIES: z.coerce.number().optional().default(10),
+      BUSY_DELAY: z.coerce.number().optional().default(500),
+      ENABLE_CORS: z.coerce.boolean().optional().default(true),
+      CORS_ORIGIN: z.string().optional().default("https://atlisp.cn"),
+      RATE_LIMIT_WINDOW: z.coerce.number().optional().default(6e4),
+      RATE_LIMIT_MAX: z.coerce.number().optional().default(100),
+      RESOURCE_CACHE_TTL: z.coerce.number().optional().default(5e3),
+      FUNCTION_LIB_CACHE_TTL: z.coerce.number().optional().default(3e5),
+      DEBUG: z.coerce.boolean().optional().default(false),
       DEBUG_FILE: z.string().optional().default(""),
       FUNCTION_LIB_URL: z.string().optional().default("http://s3.atlisp.cn/json/functions.json"),
       CONFIG_FILE: z.string().optional().default(""),
-      API_KEY_RATE_LIMIT: z.string().optional().default("1000"),
-      METRICS_ENABLED: z.string().optional().default("true"),
-      REQUEST_LOG_ENABLED: z.string().optional().default("true"),
+      API_KEY_RATE_LIMIT: z.coerce.number().optional().default(1e3),
+      METRICS_ENABLED: z.coerce.boolean().optional().default(true),
+      REQUEST_LOG_ENABLED: z.coerce.boolean().optional().default(true),
       SSL_KEY_PATH: z.string().optional().default(""),
       SSL_CERT_PATH: z.string().optional().default(""),
       LLM_API_KEY: z.string().optional().default(""),
       LLM_API_URL: z.string().optional().default("https://api.openai.com/v1/chat/completions"),
       LLM_MODEL: z.string().optional().default("gpt-4o-mini"),
-      LLM_MAX_TOKENS: z.string().optional().default("4096"),
-      LLM_TEMPERATURE: z.string().optional().default("0.7"),
-      WORKER_POOL_SIZE: z.string().optional().default("2"),
+      LLM_MAX_TOKENS: z.coerce.number().optional().default(4096),
+      LLM_TEMPERATURE: z.coerce.number().optional().default(0.7),
+      WORKER_POOL_SIZE: z.coerce.number().optional().default(2),
       LINT_PRESET: z.string().optional().default(""),
       LINT_CONFIG_PATH: z.string().optional().default(""),
       LINT_LEVEL: z.string().optional().default(""),
-      NO_LINT: z.string().optional().default(""),
-      SECURITY_LEVEL: z.string().optional().default("strict")
+      NO_LINT: z.coerce.boolean().optional().default(false),
+      SECURITY_LEVEL: z.string().optional().default("strict"),
+      CLIENT_ID: z.string().optional().default("")
     });
     configSchema = z.object({
       port: z.number().optional(),
@@ -188,7 +189,8 @@ var init_config = __esm({
       lintConfigPath: z.string().optional(),
       lintLevel: z.string().optional(),
       noLint: z.boolean().optional(),
-      securityLevel: z.enum(["strict", "standard", "relaxed"]).optional()
+      securityLevel: z.enum(["strict", "standard", "relaxed"]).optional(),
+      clientId: z.string().optional()
     });
     cliArgs = parseArgs();
     envResult = envSchema.safeParse(process.env);
@@ -200,43 +202,44 @@ var init_config = __esm({
     configFilePath = env.CONFIG_FILE || cliArgs.configFile || path.join(os.homedir(), ".atlisp", "atlisp.config.json");
     fileConfig = loadConfigFile(configFilePath);
     config = {
-      port: fileConfig?.port || parseInt(cliArgs.port || env.PORT, 10),
-      host: fileConfig?.host || cliArgs.host || env.HOST,
+      port: fileConfig?.port ?? cliArgs.port ?? env.PORT,
+      host: fileConfig?.host ?? cliArgs.host ?? env.HOST,
       transport: fileConfig?.transport ?? cliArgs.transport ?? env.TRANSPORT,
-      apiKey: fileConfig?.apiKey || env.MCP_API_KEY,
-      enableSse: fileConfig?.enableSse ?? env.ENABLE_SSE === "true",
-      messageTimeout: fileConfig?.messageTimeout || parseInt(env.MESSAGE_TIMEOUT, 10),
-      heartbeatInterval: fileConfig?.heartbeatInterval || parseInt(env.HEARTBEAT_INTERVAL, 10),
-      busyRetries: fileConfig?.busyRetries || parseInt(env.BUSY_RETRIES, 10),
-      busyDelay: fileConfig?.busyDelay || parseInt(env.BUSY_DELAY, 10),
-      enableCors: fileConfig?.enableCors ?? env.ENABLE_CORS === "true",
-      corsOrigin: fileConfig?.corsOrigin || env.CORS_ORIGIN,
-      rateLimitWindow: fileConfig?.rateLimitWindow || parseInt(env.RATE_LIMIT_WINDOW, 10),
-      rateLimitMax: fileConfig?.rateLimitMax || parseInt(env.RATE_LIMIT_MAX, 10),
-      resourceCacheTtl: fileConfig?.resourceCacheTtl || parseInt(env.RESOURCE_CACHE_TTL, 10),
-      functionLibCacheTtl: fileConfig?.functionLibCacheTtl || parseInt(env.FUNCTION_LIB_CACHE_TTL, 10),
-      debug: fileConfig?.debug ?? env.DEBUG === "true",
-      debugFile: fileConfig?.debugFile || env.DEBUG_FILE,
-      functionLibUrl: fileConfig?.functionLibUrl || env.FUNCTION_LIB_URL,
+      apiKey: fileConfig?.apiKey ?? env.MCP_API_KEY,
+      enableSse: fileConfig?.enableSse ?? env.ENABLE_SSE,
+      messageTimeout: fileConfig?.messageTimeout ?? env.MESSAGE_TIMEOUT,
+      heartbeatInterval: fileConfig?.heartbeatInterval ?? env.HEARTBEAT_INTERVAL,
+      busyRetries: fileConfig?.busyRetries ?? env.BUSY_RETRIES,
+      busyDelay: fileConfig?.busyDelay ?? env.BUSY_DELAY,
+      enableCors: fileConfig?.enableCors ?? env.ENABLE_CORS,
+      corsOrigin: fileConfig?.corsOrigin ?? env.CORS_ORIGIN,
+      rateLimitWindow: fileConfig?.rateLimitWindow ?? env.RATE_LIMIT_WINDOW,
+      rateLimitMax: fileConfig?.rateLimitMax ?? env.RATE_LIMIT_MAX,
+      resourceCacheTtl: fileConfig?.resourceCacheTtl ?? env.RESOURCE_CACHE_TTL,
+      functionLibCacheTtl: fileConfig?.functionLibCacheTtl ?? env.FUNCTION_LIB_CACHE_TTL,
+      debug: fileConfig?.debug ?? env.DEBUG,
+      debugFile: fileConfig?.debugFile ?? env.DEBUG_FILE,
+      functionLibUrl: fileConfig?.functionLibUrl ?? env.FUNCTION_LIB_URL,
       configFile: configFilePath,
-      apiKeyRateLimit: fileConfig?.apiKeyRateLimit || parseInt(env.API_KEY_RATE_LIMIT, 10),
-      apiKeys: fileConfig?.apiKeys || [],
-      metricsEnabled: fileConfig?.metricsEnabled ?? env.METRICS_ENABLED === "true",
-      requestLogEnabled: fileConfig?.requestLogEnabled ?? env.REQUEST_LOG_ENABLED !== "false",
-      sslKey: fileConfig?.sslKey || env.SSL_KEY_PATH || cliArgs.sslKey,
-      sslCert: fileConfig?.sslCert || env.SSL_CERT_PATH || cliArgs.sslCert,
-      llmApiKey: fileConfig?.llmApiKey || env.LLM_API_KEY,
-      llmApiUrl: fileConfig?.llmApiUrl || env.LLM_API_URL,
-      llmModel: fileConfig?.llmModel || env.LLM_MODEL,
-      llmMaxTokens: fileConfig?.llmMaxTokens || parseInt(env.LLM_MAX_TOKENS, 10),
-      llmTemperature: fileConfig?.llmTemperature || parseFloat(env.LLM_TEMPERATURE),
-      maxPoolSize: fileConfig?.maxPoolSize || 3,
-      workerPoolSize: fileConfig?.workerPoolSize || parseInt(env.WORKER_POOL_SIZE, 10),
-      lintPreset: fileConfig?.lintPreset || cliArgs.lintPreset || env.LINT_PRESET || void 0,
-      lintConfigPath: fileConfig?.lintConfigPath || cliArgs.lintConfigPath || env.LINT_CONFIG_PATH || void 0,
-      lintLevel: fileConfig?.lintLevel || cliArgs.lintLevel || env.LINT_LEVEL || void 0,
-      noLint: fileConfig?.noLint ?? cliArgs.noLint ?? env.NO_LINT === "true",
-      securityLevel: fileConfig?.securityLevel ?? cliArgs.securityLevel ?? (env.SECURITY_LEVEL || "strict")
+      apiKeyRateLimit: fileConfig?.apiKeyRateLimit ?? env.API_KEY_RATE_LIMIT,
+      apiKeys: fileConfig?.apiKeys ?? [],
+      metricsEnabled: fileConfig?.metricsEnabled ?? env.METRICS_ENABLED,
+      requestLogEnabled: fileConfig?.requestLogEnabled ?? env.REQUEST_LOG_ENABLED,
+      sslKey: fileConfig?.sslKey ?? env.SSL_KEY_PATH ?? cliArgs.sslKey,
+      sslCert: fileConfig?.sslCert ?? env.SSL_CERT_PATH ?? cliArgs.sslCert,
+      llmApiKey: fileConfig?.llmApiKey ?? env.LLM_API_KEY,
+      llmApiUrl: fileConfig?.llmApiUrl ?? env.LLM_API_URL,
+      llmModel: fileConfig?.llmModel ?? env.LLM_MODEL,
+      llmMaxTokens: fileConfig?.llmMaxTokens ?? env.LLM_MAX_TOKENS,
+      llmTemperature: fileConfig?.llmTemperature ?? env.LLM_TEMPERATURE,
+      maxPoolSize: fileConfig?.maxPoolSize ?? 3,
+      workerPoolSize: fileConfig?.workerPoolSize ?? env.WORKER_POOL_SIZE,
+      lintPreset: fileConfig?.lintPreset ?? cliArgs.lintPreset ?? (env.LINT_PRESET || void 0),
+      lintConfigPath: fileConfig?.lintConfigPath ?? cliArgs.lintConfigPath ?? (env.LINT_CONFIG_PATH || void 0),
+      lintLevel: fileConfig?.lintLevel ?? cliArgs.lintLevel ?? (env.LINT_LEVEL || void 0),
+      noLint: fileConfig?.noLint ?? cliArgs.noLint ?? env.NO_LINT,
+      securityLevel: fileConfig?.securityLevel ?? cliArgs.securityLevel ?? (env.SECURITY_LEVEL || "strict"),
+      clientId: fileConfig?.clientId ?? (env.CLIENT_ID || "")
     };
     if (config.lintConfigPath) process.env.LINT_CONFIG_PATH = config.lintConfigPath;
     if (config.lintPreset) process.env.LINT_PRESET = config.lintPreset;
@@ -453,15 +456,89 @@ var init_metrics = __esm({
   }
 });
 
+// src/cad-circuit-breaker.js
+var CB_CLOSED, CB_OPEN, CB_HALF_OPEN, CB_FAILURE_THRESHOLD, CB_RESET_TIMEOUT, CircuitBreaker;
+var init_cad_circuit_breaker = __esm({
+  "src/cad-circuit-breaker.js"() {
+    CB_CLOSED = 0;
+    CB_OPEN = 1;
+    CB_HALF_OPEN = 2;
+    CB_FAILURE_THRESHOLD = 5;
+    CB_RESET_TIMEOUT = 1e4;
+    CircuitBreaker = class {
+      constructor(connectionId, onOpen, onHalfOpen) {
+        this._connId = connectionId;
+        this._state = CB_CLOSED;
+        this._failureCount = 0;
+        this._lastFailureTime = 0;
+        this._timer = null;
+        this._onOpen = onOpen;
+        this._onHalfOpen = onHalfOpen;
+      }
+      get state() {
+        return this._state;
+      }
+      get failureCount() {
+        return this._failureCount;
+      }
+      allowRequest() {
+        if (this._state === CB_OPEN) {
+          const elapsed = Date.now() - this._lastFailureTime;
+          if (elapsed >= CB_RESET_TIMEOUT) {
+            this._state = CB_HALF_OPEN;
+            if (this._onHalfOpen) this._onHalfOpen(this._connId);
+          } else {
+            return false;
+          }
+        }
+        return true;
+      }
+      recordSuccess() {
+        this._state = CB_CLOSED;
+        this._failureCount = 0;
+        if (this._timer) {
+          clearTimeout(this._timer);
+          this._timer = null;
+        }
+      }
+      recordFailure() {
+        this._failureCount++;
+        this._lastFailureTime = Date.now();
+        if (this._failureCount >= CB_FAILURE_THRESHOLD && this._state !== CB_OPEN) {
+          this._state = CB_OPEN;
+          if (this._onOpen) this._onOpen(this._connId);
+          this._timer = setTimeout(() => {
+            this._state = CB_HALF_OPEN;
+            if (this._onHalfOpen) this._onHalfOpen(this._connId);
+          }, CB_RESET_TIMEOUT);
+        }
+      }
+      reset() {
+        this._state = CB_CLOSED;
+        this._failureCount = 0;
+        this._lastFailureTime = 0;
+        if (this._timer) {
+          clearTimeout(this._timer);
+          this._timer = null;
+        }
+      }
+    };
+  }
+});
+
 // src/cad.js
 var cad_exports = {};
 __export(cad_exports, {
+  CommandQueue: () => CommandQueue,
+  ReadBatcher: () => ReadBatcher,
   _setInstanceResolver: () => _setInstanceResolver,
   cad: () => cad,
   createCadConnection: () => createCadConnection,
   default: () => cad_default,
   getActiveConnection: () => getActiveConnection,
+  isReadCommand: () => isReadCommand,
   onDocumentChanged: () => onDocumentChanged,
+  resolveCadConnection: () => resolveCadConnection,
   setActiveConnection: () => setActiveConnection
 });
 import { spawn } from "child_process";
@@ -506,22 +583,21 @@ function _resolveConn() {
   }
   return _activeConnection;
 }
-var __dirname, workerPath, MESSAGE_TIMEOUT, HEARTBEAT_INTERVAL, MAX_RESTART_ATTEMPTS, RESTART_BACKOFF_BASE, CB_CLOSED, CB_OPEN, CB_HALF_OPEN, CB_FAILURE_THRESHOLD, CB_RESET_TIMEOUT, MAX_BUFFER_SIZE, PRIORITY_HIGH, PRIORITY_NORMAL, MAX_QUEUE_SIZE, READ_PREFIXES, _docChangeCallbacks, ReadBatcher, CommandQueue, CadConnection, _activeConnection, _resolveInstanceConn, cad, cad_default;
+function resolveCadConnection() {
+  return _resolveConn();
+}
+var __dirname, workerPath, MESSAGE_TIMEOUT, HEARTBEAT_INTERVAL, MAX_RESTART_ATTEMPTS, RESTART_BACKOFF_BASE, MAX_BUFFER_SIZE, PRIORITY_HIGH, PRIORITY_NORMAL, MAX_QUEUE_SIZE, READ_PREFIXES, _docChangeCallbacks, ReadBatcher, CommandQueue, CadConnection, _activeConnection, _resolveInstanceConn, cad, cad_default;
 var init_cad = __esm({
   "src/cad.js"() {
     init_config();
     init_metrics();
+    init_cad_circuit_breaker();
     __dirname = path2.dirname(fileURLToPath(import.meta.url));
     workerPath = path2.join(__dirname, "cad-worker.js");
     MESSAGE_TIMEOUT = config_default.messageTimeout;
     HEARTBEAT_INTERVAL = config_default.heartbeatInterval;
     MAX_RESTART_ATTEMPTS = 5;
     RESTART_BACKOFF_BASE = 1e3;
-    CB_CLOSED = 0;
-    CB_OPEN = 1;
-    CB_HALF_OPEN = 2;
-    CB_FAILURE_THRESHOLD = 5;
-    CB_RESET_TIMEOUT = 1e4;
     MAX_BUFFER_SIZE = 1024 * 1024;
     PRIORITY_HIGH = 0;
     PRIORITY_NORMAL = 1;
@@ -708,10 +784,6 @@ var init_cad = __esm({
       _heartbeatTimer = null;
       _pendingRequests = /* @__PURE__ */ new Map();
       _commandQueue = null;
-      _cbState = CB_CLOSED;
-      _cbFailureCount = 0;
-      _cbLastFailureTime = 0;
-      _cbTimer = null;
       _restartCount = 0;
       _restartTimer = null;
       _activeDocName = null;
@@ -721,6 +793,11 @@ var init_cad = __esm({
       constructor() {
         this._connectionId = randomUUID().slice(0, 8);
         this._commandQueue = new CommandQueue(this);
+        this._cb = new CircuitBreaker(
+          this._connectionId,
+          (id) => console.error(`[${id}] Circuit breaker OPEN`),
+          (id) => console.error(`[${id}] Circuit breaker HALF_OPEN, allowing trial request`)
+        );
       }
       get _workerPoolSize() {
         return config_default.workerPoolSize || 2;
@@ -728,11 +805,15 @@ var init_cad = __esm({
       isAvailable() {
         return process.platform === "win32";
       }
-      async connect(platform = null) {
+      async connect(platform = null, options = {}) {
         if (!this.isAvailable()) return false;
-        this._cbSuccess();
+        this._cb.recordSuccess();
         try {
           const msg = platform ? { type: "connect", platform } : { type: "connect" };
+          if (options.moniker) {
+            msg.moniker = options.moniker;
+            msg.monikerKey = options.key || "moniker";
+          }
           const result = await this._sendMessage(msg);
           if (result && result.success) {
             this._version = result.version;
@@ -770,7 +851,7 @@ var init_cad = __esm({
           throw new Error(result.error || "\u53D1\u9001\u5931\u8D25");
         });
       }
-      async sendCommandWithResult(code, encoding = null) {
+      async sendCommandWithResult(code, encoding = null, raw = false) {
         if (!this.connected) throw new Error("\u672A\u8FDE\u63A5 CAD");
         return new Promise((resolve, reject) => {
           this._commandQueue.enqueue({
@@ -782,7 +863,12 @@ var init_cad = __esm({
             reject
           }, PRIORITY_NORMAL);
         }).then((result) => {
-          if (result.success) return result.result || "";
+          if (result.success) {
+            if (raw && result.rawBase64 !== void 0) {
+              return { text: result.result || "", rawBase64: result.rawBase64 };
+            }
+            return result.result || "";
+          }
           throw new Error(result.error || "\u53D1\u9001\u5931\u8D25");
         });
       }
@@ -845,21 +931,8 @@ var init_cad = __esm({
         return `Platform: ${this._product}, Version: ${this._version}, Status: Connected`;
       }
       async disconnect() {
-        this.connected = false;
-        setCadConnected(false);
-        this._version = null;
-        this._product = null;
-        this._platform = null;
-        this._activeDocName = null;
-        this._monitorStarted = false;
-        this._commandQueue.clear();
-        this._cbState = CB_CLOSED;
-        this._cbFailureCount = 0;
-        if (this._cbTimer) {
-          clearTimeout(this._cbTimer);
-          this._cbTimer = null;
-        }
-        this._resetWorker();
+        this._reset();
+        this._cb.reset();
       }
       async ping() {
         try {
@@ -878,12 +951,6 @@ var init_cad = __esm({
         this._activeDocName = null;
         this._monitorStarted = false;
         this._commandQueue.clear();
-        this._cbState = CB_CLOSED;
-        this._cbFailureCount = 0;
-        if (this._cbTimer) {
-          clearTimeout(this._cbTimer);
-          this._cbTimer = null;
-        }
         this._resetWorker();
       }
       _getQueueSize() {
@@ -892,44 +959,6 @@ var init_cad = __esm({
       _getRestartCount() {
         return this._restartCount;
       }
-      // --- Circuit breaker ---
-      _cbSuccess() {
-        this._cbState = CB_CLOSED;
-        this._cbFailureCount = 0;
-        if (this._cbTimer) {
-          clearTimeout(this._cbTimer);
-          this._cbTimer = null;
-        }
-      }
-      _cbFailure() {
-        this._cbFailureCount++;
-        this._cbLastFailureTime = Date.now();
-        if (this._cbFailureCount >= CB_FAILURE_THRESHOLD && this._cbState !== CB_OPEN) {
-          this._cbState = CB_OPEN;
-          console.error(`[${this._connectionId}] Circuit breaker OPEN after ${this._cbFailureCount} failures`);
-          this._cbTimer = setTimeout(() => {
-            this._cbState = CB_HALF_OPEN;
-            console.error(`[${this._connectionId}] Circuit breaker HALF_OPEN, allowing trial request`);
-          }, CB_RESET_TIMEOUT);
-        }
-      }
-      _cbAllowRequest() {
-        if (this._cbState === CB_OPEN) {
-          const elapsed = Date.now() - this._cbLastFailureTime;
-          if (elapsed >= CB_RESET_TIMEOUT) {
-            this._cbState = CB_HALF_OPEN;
-            console.error(`[${this._connectionId}] Circuit breaker auto-transition to HALF_OPEN`);
-          } else {
-            return false;
-          }
-        }
-        return true;
-      }
-      // --- Worker management ---
-      _isReadOnlyMessage(msg) {
-        if (msg.code) return isReadCommand(msg.code);
-        return false;
-      }
       _spawnWorker(type) {
         const w = spawn("node", [workerPath], { stdio: ["pipe", "pipe", "pipe"] });
         w.connected = true;
@@ -940,7 +969,7 @@ var init_cad = __esm({
           w.connected = false;
           if (type === "primary") {
             if (w !== this._primaryWorker) return;
-            this._cbFailure();
+            this._cb.recordFailure();
             const exitError = new Error(`Primary worker exited with code ${code}`);
             for (const [id, entry] of this._pendingRequests) {
               clearTimeout(entry.timeout);
@@ -977,7 +1006,7 @@ var init_cad = __esm({
             this._primaryWorker = null;
           }
           this._primaryWorker = this._spawnWorker("primary");
-          this._cbSuccess();
+          this._cb.recordSuccess();
           if (!this._heartbeatTimer) this._startHeartbeat();
           this._restartCount = 0;
         }
@@ -1118,14 +1147,9 @@ var init_cad = __esm({
         }, delay);
       }
       async _sendMessage(msg) {
-        if (!this._cbAllowRequest()) {
+        if (!this._cb.allowRequest()) {
           console.error(`[${this._connectionId}] Circuit breaker OPEN, auto-recovering...`);
-          this._cbState = CB_CLOSED;
-          this._cbFailureCount = 0;
-          if (this._cbTimer) {
-            clearTimeout(this._cbTimer);
-            this._cbTimer = null;
-          }
+          this._cb.reset();
           await this._resetWorker();
           await this._getWorker(false);
         }
@@ -1141,17 +1165,17 @@ var init_cad = __esm({
             const p = self._pendingRequests.get(requestId);
             if (p) {
               self._pendingRequests.delete(requestId);
-              if (!noCircuitBreaker) self._cbFailure();
+              if (!noCircuitBreaker) self._cb.recordFailure();
               reject(new Error("Timeout waiting for worker"));
             }
           }, MESSAGE_TIMEOUT);
           const entry = {
             resolve: (v) => {
-              if (!noCircuitBreaker && !entry._skipCb) self._cbSuccess();
+              if (!noCircuitBreaker && !entry._skipCb) self._cb.recordSuccess();
               resolve(v);
             },
             reject: (e) => {
-              if (!noCircuitBreaker && !entry._skipCb) self._cbFailure();
+              if (!noCircuitBreaker && !entry._skipCb) self._cb.recordFailure();
               reject(e);
             },
             timeout
@@ -1162,11 +1186,15 @@ var init_cad = __esm({
           } catch (e) {
             clearTimeout(timeout);
             self._pendingRequests.delete(requestId);
-            if (!noCircuitBreaker) self._cbFailure();
+            if (!noCircuitBreaker) self._cb.recordFailure();
             reject(new Error(`Failed to write to worker: ${e.message}`));
           }
         });
       }
+      _isReadOnlyMessage(msg) {
+        if (msg.code) return isReadCommand(msg.code);
+        return false;
+      }
     };
     _activeConnection = new CadConnection();
     _resolveInstanceConn = null;
@@ -1175,79 +1203,79 @@ var init_cad = __esm({
         return _resolveConn().connected;
       },
       set connected(v) {
-        _activeConnection.connected = v;
+        _resolveConn().connected = v;
       },
       get version() {
-        return _activeConnection._version;
+        return _resolveConn()._version;
       },
       set version(v) {
-        _activeConnection._version = v;
+        _resolveConn()._version = v;
       },
       get product() {
-        return _activeConnection._product;
+        return _resolveConn()._product;
       },
       set product(v) {
-        _activeConnection._product = v;
+        _resolveConn()._product = v;
       },
       get _platform() {
-        return _activeConnection._platform;
+        return _resolveConn()._platform;
       },
       set _platform(v) {
-        _activeConnection._platform = v;
+        _resolveConn()._platform = v;
       },
       async connect(platform) {
-        return _activeConnection.connect(platform);
+        return _resolveConn().connect(platform);
       },
       async sendCommand(code) {
         return _resolveConn().sendCommand(code);
       },
-      async sendCommandWithResult(code, encoding) {
-        return _resolveConn().sendCommandWithResult(code, encoding);
+      async sendCommandWithResult(code, encoding, raw) {
+        return _resolveConn().sendCommandWithResult(code, encoding, raw);
       },
       getVersion() {
-        return _activeConnection.getVersion();
+        return _resolveConn().getVersion();
       },
       getPlatform() {
-        return _activeConnection.getPlatform();
+        return _resolveConn().getPlatform();
       },
       getConnectionId() {
-        return _activeConnection.getConnectionId();
+        return _resolveConn().getConnectionId();
       },
       isAvailable() {
-        return _activeConnection.isAvailable();
+        return _resolveConn().isAvailable();
       },
       async isBusy() {
-        return _activeConnection.isBusy();
+        return _resolveConn().isBusy();
       },
       async hasDoc() {
-        return _activeConnection.hasDoc();
+        return _resolveConn().hasDoc();
       },
       async newDoc() {
-        return _activeConnection.newDoc();
+        return _resolveConn().newDoc();
       },
       async bringToFront() {
-        return _activeConnection.bringToFront();
+        return _resolveConn().bringToFront();
       },
       async getActiveDocInfo() {
-        return _activeConnection.getActiveDocInfo();
+        return _resolveConn().getActiveDocInfo();
       },
       async getInfo() {
-        return _activeConnection.getInfo();
+        return _resolveConn().getInfo();
       },
       async disconnect() {
-        return _activeConnection.disconnect();
+        return _resolveConn().disconnect();
       },
       async ping() {
-        return _activeConnection.ping();
+        return _resolveConn().ping();
       },
       _reset() {
-        return _activeConnection._reset();
+        return _resolveConn()._reset();
       },
       _getQueueSize() {
-        return _activeConnection._getQueueSize();
+        return _resolveConn()._getQueueSize();
       },
       _getRestartCount() {
-        return _activeConnection._getRestartCount();
+        return _resolveConn()._getRestartCount();
       }
     };
     cad_default = CadConnection;
@@ -1258,7 +1286,7 @@ var init_cad = __esm({
 import path3 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { createRequire } from "module";
-var CAD_PLATFORMS, FILE_EXTENSIONS, __dirname2, require2, version, SERVER_NAME, SERVER_VERSION, SERVER_CAPABILITIES, MOCK_PACKAGES;
+var CAD_PLATFORMS, FILE_EXTENSIONS, __dirname2, require2, version, SERVER_NAME, SERVER_VERSION, SERVER_CAPABILITIES, MOCK_PACKAGES, CAD_RESOURCE_URIS;
 var init_constants = __esm({
   "src/constants.js"() {
     CAD_PLATFORMS = ["AutoCAD", "ZWCAD", "GStarCAD", "BricsCAD"];
@@ -1281,6 +1309,17 @@ var init_constants = __esm({
       completions: {}
     };
     MOCK_PACKAGES = [];
+    CAD_RESOURCE_URIS = [
+      "atlisp://cad/info",
+      "atlisp://dwg/name",
+      "atlisp://dwg/path",
+      "atlisp://dwg/entities",
+      "atlisp://dwg/tbl",
+      "atlisp://dwg/block-refs",
+      "atlisp://dwg/text-content",
+      "atlisp://cad/dwgs",
+      "atlisp://packages"
+    ];
   }
 });
 
@@ -1481,7 +1520,10 @@ var init_resource_defs = __esm({
       { 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 },
       { uri: "atlisp://dwg/context", name: "DWG Context", description: "\u5F53\u524D\u56FE\u7EB8\u4E0A\u4E0B\u6587\u6458\u8981\u3002\u8FD4\u56DE\u6587\u6863\u540D/\u8DEF\u5F84/\u5E03\u5C40/UCS/\u56FE\u5C42\u5217\u8868/\u5B9E\u4F53\u7EDF\u8BA1/\u7CFB\u7EDF\u53D8\u91CF\u7EC4\u5408\u4FE1\u606F\uFF0C\u5E2E\u52A9\u5FEB\u901F\u4E86\u89E3\u5F53\u524D CAD \u72B6\u6001", mimeType: "application/json", subscribable: true },
-      { uri: "atlisp://tools/relationships", name: "Tool Relationships", description: "\u5DE5\u5177\u4F9D\u8D56\u5173\u7CFB\u56FE\u3002\u63CF\u8FF0\u5DE5\u5177\u95F4\u7684\u8C03\u7528\u94FE\u5173\u7CFB\uFF08\u5982 select_entities \u2192 batch_delete\uFF09\uFF0C\u5E2E\u52A9\u7406\u89E3\u5DE5\u5177\u7EC4\u5408\u4F7F\u7528\u65B9\u5F0F", mimeType: "application/json", subscribable: false }
+      { uri: "atlisp://tools/relationships", name: "Tool Relationships", description: "\u5DE5\u5177\u4F9D\u8D56\u5173\u7CFB\u56FE\u3002\u63CF\u8FF0\u5DE5\u5177\u95F4\u7684\u8C03\u7528\u94FE\u5173\u7CFB\uFF08\u5982 select_entities \u2192 batch_delete\uFF09\uFF0C\u5E2E\u52A9\u7406\u89E3\u5DE5\u5177\u7EC4\u5408\u4F7F\u7528\u65B9\u5F0F", mimeType: "application/json", subscribable: false },
+      { uri: "atlisp://dwg/analysis", name: "Drawing Analysis", description: "\u5F53\u524D\u56FE\u7EB8\u7EFC\u5408\u5206\u6790\uFF1A\u5B9E\u4F53\u7C7B\u578B\u7EDF\u8BA1\u3001\u5757\u4F7F\u7528\u7EDF\u8BA1\u3001\u56FE\u5C42\u6458\u8981\u3001\u6587\u5B57\u7EDF\u8BA1\u3001\u7CFB\u7EDF\u53D8\u91CF\u5FEB\u7167\u3002\u652F\u6301 ?type=summary\uFF08\u9ED8\u8BA4\uFF09\u6216 ?type=detailed", mimeType: "application/json", subscribable: true },
+      { uri: "atlisp://tools/categories", name: "Tool Categories", description: "\u5DE5\u5177\u5206\u7C7B\u6982\u89C8\u3002\u5217\u51FA\u6240\u6709\u5206\u7C7B\u53CA\u5176\u5305\u542B\u7684\u5DE5\u5177\u6570\u91CF", mimeType: "application/json", subscribable: false },
+      { uri: "atlisp://dwg/standards/check", name: "Drawing Standards Check", description: "\u68C0\u67E5\u5F53\u524D\u56FE\u7EB8\u662F\u5426\u7B26\u5408\u52A0\u8F7D\u7684\u5236\u56FE\u89C4\u8303\uFF08\u56FE\u5C42\u547D\u540D\u3001\u989C\u8272\u3001\u7EBF\u578B\u7B49\u89C4\u5219\uFF09", mimeType: "application/json", subscribable: false }
     ];
     TBL_QUERIES = {
       layer: { name: "layer", lisp: `(progn
@@ -1528,49 +1570,70 @@ var init_resource_defs = __esm({
 });
 
 // src/handlers/resource-cache.js
+function _getCache() {
+  const key = _instanceKey || _defaultKey;
+  if (!_instanceCaches.has(key)) {
+    _instanceCaches.set(key, /* @__PURE__ */ new Map());
+  }
+  return _instanceCaches.get(key);
+}
+function _ttl() {
+  return config_default.resourceCacheTtl;
+}
 function ensureCleanup() {
   if (cleanupTimer) return;
   cleanupTimer = setInterval(() => {
     const now = Date.now();
-    for (const [key, entry] of resourceCache) {
-      if (now - entry.timestamp >= CACHE_TTL) {
-        resourceCache.delete(key);
+    const ttl = _ttl();
+    for (const cache of _instanceCaches.values()) {
+      for (const [key, entry] of cache) {
+        if (now - entry.timestamp >= ttl) {
+          cache.delete(key);
+        }
       }
     }
   }, CLEANUP_INTERVAL);
   cleanupTimer.unref();
 }
+function setInstanceKey(key) {
+  _instanceKey = key || null;
+}
 function getCached(key) {
-  const entry = resourceCache.get(key);
-  if (entry && Date.now() - entry.timestamp < CACHE_TTL) {
+  const cache = _getCache();
+  const entry = cache.get(key);
+  if (entry && Date.now() - entry.timestamp < _ttl()) {
     return entry.data;
   }
-  resourceCache.delete(key);
+  cache.delete(key);
   return null;
 }
 function setCache(key, data) {
-  resourceCache.set(key, { data, timestamp: Date.now() });
+  _getCache().set(key, { data, timestamp: Date.now() });
 }
 function clearCache(uri) {
-  const prefix = URI_CACHE_PREFIX[uri];
-  if (prefix) {
-    for (const key of resourceCache.keys()) {
-      if (key === prefix || key.startsWith(prefix + ":")) {
-        resourceCache.delete(key);
+  const basePrefix = URI_CACHE_PREFIX[uri];
+  if (basePrefix) {
+    const cache = _getCache();
+    for (const key of cache.keys()) {
+      if (key === basePrefix || key.startsWith(basePrefix + ":")) {
+        cache.delete(key);
       }
     }
   } else if (!uri) {
-    resourceCache.clear();
+    const key = _instanceKey || _defaultKey;
+    _instanceCaches.delete(key);
+    _instanceCaches.set(key, /* @__PURE__ */ new Map());
   }
 }
-var CACHE_TTL, resourceCache, CLEANUP_INTERVAL, cleanupTimer, URI_CACHE_PREFIX;
+var CLEANUP_INTERVAL, cleanupTimer, _instanceKey, _instanceCaches, _defaultKey, URI_CACHE_PREFIX;
 var init_resource_cache = __esm({
   "src/handlers/resource-cache.js"() {
     init_config();
-    CACHE_TTL = config_default.resourceCacheTtl;
-    resourceCache = /* @__PURE__ */ new Map();
     CLEANUP_INTERVAL = 6e4;
     cleanupTimer = null;
+    _instanceKey = null;
+    _instanceCaches = /* @__PURE__ */ new Map();
+    _defaultKey = "__default__";
     ensureCleanup();
     URI_CACHE_PREFIX = {
       "atlisp://cad/info": "cad:info",
@@ -1591,6 +1654,23 @@ function createError(code, details = {}) {
   const def = ERROR_DEFS[code] || ERROR_DEFS[ERROR_CODES.INTERNAL_ERROR];
   return new MCPError(code, def.message, details);
 }
+function toMcpError(error2) {
+  if (error2 instanceof MCPError) return error2;
+  if (error2 instanceof Error) {
+    return new MCPError(ERROR_CODES.INTERNAL_ERROR, error2.message, { stack: error2.stack });
+  }
+  return new MCPError(ERROR_CODES.INTERNAL_ERROR, String(error2));
+}
+function mcpErrorResponse(error2) {
+  const mcpErr = toMcpError(error2);
+  const json = mcpErr.toJSON();
+  return {
+    content: [{ type: "text", text: `[${json.code}] ${json.message}
+\u63D0\u793A: ${json.hint}
+\u5EFA\u8BAE\u5DE5\u5177: ${json.suggestedTools.join(", ") || "\u65E0"}` }],
+    isError: true
+  };
+}
 function mcpSuccessResponse(text) {
   return { content: [{ type: "text", text: String(text) }] };
 }
@@ -1604,9 +1684,14 @@ var init_errors = __esm({
       LISP_PAREN_MISMATCH: "LISP_PAREN_MISMATCH",
       TIMEOUT: "TIMEOUT",
       INVALID_PARAMS: "INVALID_PARAMS",
+      INVALID_ARGS: "INVALID_ARGS",
       METHOD_NOT_FOUND: "METHOD_NOT_FOUND",
+      HANDLER_NOT_FOUND: "HANDLER_NOT_FOUND",
       RESOURCE_NOT_FOUND: "RESOURCE_NOT_FOUND",
       PACKAGE_NOT_FOUND: "PACKAGE_NOT_FOUND",
+      OPERATION_FAILED: "OPERATION_FAILED",
+      RATE_LIMITED: "RATE_LIMITED",
+      SESSION_NOT_FOUND: "SESSION_NOT_FOUND",
       INTERNAL_ERROR: "INTERNAL_ERROR"
     };
     ERROR_DEFS = {
@@ -1640,6 +1725,31 @@ var init_errors = __esm({
         hint: "\u8BF7\u68C0\u67E5\u5DE5\u5177\u53C2\u6570\u683C\u5F0F\u662F\u5426\u6B63\u786E\u3002\u4F7F\u7528 search_tools \u6216 list_tools_by_category \u67E5\u770B\u5DE5\u5177\u53C2\u6570\u8981\u6C42",
         tools: ["search_tools", "list_tools_by_category"]
       },
+      [ERROR_CODES.INVALID_ARGS]: {
+        message: "\u53C2\u6570\u6821\u9A8C\u5931\u8D25",
+        hint: "\u5DE5\u5177\u6240\u9700\u53C2\u6570\u7F3A\u5931\u6216\u683C\u5F0F\u9519\u8BEF\u3002\u8BF7\u68C0\u67E5\u53C2\u6570\u7C7B\u578B\u548C\u5FC5\u586B\u5B57\u6BB5\uFF0C\u4F7F\u7528 search_tools \u67E5\u770B\u5DE5\u5177\u53C2\u6570\u8981\u6C42",
+        tools: ["search_tools", "list_tools_by_category"]
+      },
+      [ERROR_CODES.HANDLER_NOT_FOUND]: {
+        message: "\u5DE5\u5177\u672A\u627E\u5230",
+        hint: "\u5DE5\u5177\u540D\u79F0\u4E0D\u5B58\u5728\u3002\u4F7F\u7528 search_tools \u641C\u7D22\u53EF\u7528\u5DE5\u5177\uFF0C\u6216 list_tools_by_category \u6D4F\u89C8\u5168\u90E8\u5206\u7C7B",
+        tools: ["search_tools", "list_tools_by_category"]
+      },
+      [ERROR_CODES.OPERATION_FAILED]: {
+        message: "\u64CD\u4F5C\u6267\u884C\u5931\u8D25",
+        hint: "\u5DE5\u5177\u6267\u884C\u8FC7\u7A0B\u4E2D\u53D1\u751F\u9519\u8BEF\u3002\u53EF\u91CD\u8BD5\u64CD\u4F5C\uFF0C\u6216\u68C0\u67E5\u65E5\u5FD7\u83B7\u53D6\u8BE6\u7EC6\u4FE1\u606F",
+        tools: ["get_system_status", "get_cad_info"]
+      },
+      [ERROR_CODES.RATE_LIMITED]: {
+        message: "\u8C03\u7528\u9891\u7387\u8D85\u9650",
+        hint: "\u5DE5\u5177\u8C03\u7528\u8FC7\u4E8E\u9891\u7E41\u3002\u8BF7\u7B49\u5F85\u4E00\u6BB5\u65F6\u95F4\u540E\u518D\u8BD5",
+        tools: []
+      },
+      [ERROR_CODES.SESSION_NOT_FOUND]: {
+        message: "\u4F1A\u8BDD\u672A\u627E\u5230",
+        hint: "\u6307\u5B9A ID \u7684\u4F1A\u8BDD\u4E0D\u5B58\u5728\u3002\u8BF7\u68C0\u67E5 sessionId \u53C2\u6570\u662F\u5426\u6B63\u786E",
+        tools: ["lisp_repl_list"]
+      },
       [ERROR_CODES.METHOD_NOT_FOUND]: {
         message: "\u65B9\u6CD5\u4E0D\u5B58\u5728",
         hint: "\u5DE5\u5177\u540D\u79F0\u8F93\u5165\u9519\u8BEF\u3002\u4F7F\u7528 search_tools \u641C\u7D22\u53EF\u7528\u5DE5\u5177\uFF0C\u6216 list_tools_by_category \u6D4F\u89C8\u5168\u90E8\u5206\u7C7B",
@@ -1784,8 +1894,8 @@ __export(renderer_exports, {
   renderPrompt: () => renderPrompt,
   renderTemplate: () => renderTemplate
 });
-function resolvePath(obj, path20) {
-  const parts = path20.split(/[.\[\]]/g).filter(Boolean);
+function resolvePath(obj, path21) {
+  const parts = path21.split(/[.\[\]]/g).filter(Boolean);
   let val = obj;
   for (const p of parts) {
     if (val == null) return void 0;
@@ -1795,8 +1905,8 @@ function resolvePath(obj, path20) {
 }
 function renderTemplate(template, args) {
   return template.replace(PARAM_RE, (match, rawExpr, expr) => {
-    const path20 = rawExpr || expr;
-    const val = resolvePath(args, path20);
+    const path21 = rawExpr || expr;
+    const val = resolvePath(args, path21);
     if (val == null) return "";
     const strVal = String(val);
     if (rawExpr) return strVal;
@@ -2228,8 +2338,8 @@ var init_sse_session = __esm({
       sendMessage(data) {
         return this.sendEvent(SSE_EVENTS.MESSAGE, data);
       }
-      sendEndpoint(path20) {
-        return this.sendEvent(SSE_EVENTS.ENDPOINT, path20);
+      sendEndpoint(path21) {
+        return this.sendEvent(SSE_EVENTS.ENDPOINT, path21);
       }
       sendError(code, message, id = null) {
         return this.sendEvent(SSE_EVENTS.ERROR, { code, message }, id);
@@ -2951,7 +3061,8 @@ var init_info_tools = __esm({
         }
       },
       { name: "search_tools", description: "\u6309\u5173\u952E\u8BCD\u641C\u7D22\u53EF\u7528\u5DE5\u5177", inputSchema: { type: "object", properties: { query: { type: "string", description: "\u641C\u7D22\u5173\u952E\u8BCD(\u5339\u914D\u540D\u79F0\u548C\u63CF\u8FF0)" } }, required: ["query"] } },
-      { name: "list_tools_by_category", description: "\u6309\u5206\u7C7B\u5217\u51FA\u5DE5\u5177", inputSchema: { type: "object", properties: { category: { type: "string", description: "\u5206\u7C7B\u540D\u79F0(\u53EF\u9009,\u4E0D\u4F20\u5219\u5217\u51FA\u6240\u6709\u5206\u7C7B)" } } } }
+      { name: "list_tools_by_category", description: "\u6309\u5206\u7C7B\u5217\u51FA\u5DE5\u5177", inputSchema: { type: "object", properties: { category: { type: "string", description: "\u5206\u7C7B\u540D\u79F0(\u53EF\u9009,\u4E0D\u4F20\u5219\u5217\u51FA\u6240\u6709\u5206\u7C7B)" } } } },
+      { name: "get_tool_info", description: "\u83B7\u53D6\u5DE5\u5177\u7684\u8BE6\u7EC6\u4FE1\u606F\uFF08\u53C2\u6570\u3001\u5206\u7C7B\u3001\u53EA\u8BFB/\u7834\u574F\u6027\u6807\u8BB0\u7B49\uFF09", inputSchema: { type: "object", properties: { name: { type: "string", description: "\u5DE5\u5177\u540D\u79F0" } }, required: ["name"] } }
     ];
   }
 });
@@ -5492,12 +5603,12 @@ var init_pool_tools = __esm({
         inputSchema: {
           type: "object",
           properties: {
-            key: { type: "string", description: "\u5B9E\u4F8B\u6807\u8BC6\u952E\u540D\uFF08\u5982 autocad, zwcad, mycad\uFF09" },
+            key: { type: "string", description: "\u5B9E\u4F8B\u6807\u8BC6\u952E\u540D\uFF08\u5982 autocad, zwcad, mycad\uFF1B\u4E0D\u4F20\u65F6\u7531 pid \u81EA\u52A8\u6D3E\u751F\uFF09" },
             platform: { type: "string", description: "CAD \u5E73\u53F0: AutoCAD, ZWCAD, GStarCAD, BricsCAD\uFF08\u53EF\u9009\uFF0C\u81EA\u52A8\u68C0\u6D4B\uFF09" },
+            pid: { type: "number", description: "\u76EE\u6807\u8FDB\u7A0B PID\uFF08\u53EF\u9009\uFF0C\u901A\u8FC7 ROT \u67E5\u627E\u540E\u8FDE\u63A5\uFF0C\u53EF\u4E0E pid \u81EA\u52A8\u6D3E\u751F key\uFF09" },
             label: { type: "string", description: "\u5B9E\u4F8B\u663E\u793A\u6807\u7B7E\uFF08\u53EF\u9009\uFF09" },
             makeActive: { type: "boolean", description: "\u8FDE\u63A5\u540E\u8BBE\u4E3A\u6D3B\u52A8\u5B9E\u4F8B\uFF08\u9ED8\u8BA4 true\uFF09" }
-          },
-          required: ["key"]
+          }
         }
       },
       {
@@ -6457,7 +6568,66 @@ var init_debug_tools = __esm({
   }
 });
 
+// src/tools/concurrent-tools.js
+var tools42;
+var init_concurrent_tools = __esm({
+  "src/tools/concurrent-tools.js"() {
+    tools42 = [
+      {
+        name: "batch_concurrent_tasks",
+        description: "\u5E76\u53D1\u6267\u884C\u591A\u5B9E\u4F8B\u5DE5\u5177 \u2014 \u5C06\u591A\u4E2A\u5DE5\u5177\u8C03\u7528\u540C\u65F6\u8DEF\u7531\u5230\u4E0D\u540C CAD \u5B9E\u4F8B\u5E76\u884C\u6267\u884C\u3002\u5185\u90E8\u4F7F\u7528 Promise.allSettled\uFF0C\u4E00\u4E2A\u5931\u8D25\u4E0D\u5F71\u54CD\u5176\u4ED6\u3002",
+        inputSchema: {
+          type: "object",
+          properties: {
+            tasks: {
+              type: "array",
+              items: {
+                type: "object",
+                properties: {
+                  tool: { type: "string", description: "\u5DE5\u5177\u540D\u79F0" },
+                  args: { type: "object", description: "\u5DE5\u5177\u53C2\u6570\uFF08\u4E0D\u542B instance\uFF09" },
+                  instance: { type: "string", description: "\u76EE\u6807\u5B9E\u4F8B key" }
+                },
+                required: ["tool", "instance"]
+              },
+              description: "\u8981\u5E76\u53D1\u6267\u884C\u7684\u4EFB\u52A1\u5217\u8868"
+            }
+          },
+          required: ["tasks"]
+        }
+      }
+    ];
+  }
+});
+
 // src/tools/index.js
+function getToolCategory(name) {
+  const n = name;
+  if (/^(draw_|create_3d_|create_box|create_cone|create_cylinder|create_sphere|create_torus|create_wedge|extrude_|revolve_|boolean_|slice_solid|thicken_|offset_surface|create_loft_|create_region)/.test(n)) return "\u7ED8\u56FE\u4E0E3D";
+  if (/^(move_|copy_|rotate_|scale_|mirror_|offset_|array_|batch_)/.test(n)) return "\u4FEE\u6539";
+  if (/^(trim_|extend_|fillet|chamfer|break_|join_|stretch)/.test(n)) return "\u7F16\u8F91";
+  if (/^(create_layer|delete_layer|set_layer|layer_)/.test(n)) return "\u56FE\u5C42";
+  if (/^(create_block|insert_block|explode_block|get_block|set_block|batch_get_block|batch_set_block)/.test(n)) return "\u5757";
+  if (/^(create_dim|list_dim|set_dim|create_hatch|set_hatch)/.test(n)) return "\u6807\u6CE8\u4E0E\u586B\u5145";
+  if (/^(create_ucs|set_ucs|delete_ucs|list_ucs|get_current_ucs|create_layout|delete_layout|rename_layout|set_layout|list_layouts|get_current_layout)/.test(n)) return "\u5750\u6807\u7CFB\u4E0E\u5E03\u5C40";
+  if (/^(create_viewport|set_viewport|lock_viewport|unlock_viewport|maximize_viewport)/.test(n)) return "\u89C6\u53E3";
+  if (/^find_/.test(n)) return "\u7A7A\u95F4\u67E5\u8BE2";
+  if (/^(select_|get_entity|set_entity|delete_entity|get_bounding_box)/.test(n)) return "\u9009\u62E9\u4E0E\u5C5E\u6027";
+  if (/^(open_dwg|save_dwg|export_|import_|close_dwg|publish_)/.test(n)) return "\u6587\u4EF6";
+  if (/^(plot_|save_pdf|batch_plot|publish_layouts)/.test(n)) return "\u6253\u5370";
+  if (/^(get_xdata|set_xdata|delete_xdata|list_xdata|copxy_xdata|search_by_xdata|export_xdata|import_xdata)/.test(n)) return "\u6269\u5C55\u6570\u636E";
+  if (/^(create_sheet|open_sheet|list_sheet|add_sheet|delete_sheet|publish_sheet|sheet_|reorder_sheet|create_subset|list_subset|set_sheet)/.test(n)) return "\u56FE\u7EB8\u96C6";
+  if (/^(attach_|detach_|reload_|list_attached|get_pdf|create_dgn|create_dwf|import_dxf|import_dgn|export_dgn|create_hyper|remove_hyper|xref|bind_xref|clip_xref|path_xref)/.test(n)) return "\u53C2\u7167\u4E0E\u5E95\u56FE";
+  if (/^(create_text|create_mleader|create_linetype|list_text|list_linetype|list_mleader|load_linetype|create_dimension_style|set_dimstyle|list_dimension_styles|set_mleader_style)/.test(n)) return "\u6837\u5F0F";
+  if (/^(purge_|drawing_audit|drawing_recover|overkill)/.test(n)) return "\u6E05\u7406";
+  if (/^(find_text|replace_text|set_text_|justify_|convert_text|explode_text)/.test(n)) return "\u6587\u5B57";
+  if (/^(eval_lisp|connect_cad|get_cad|get_platform|get_system|at_command|new_document|bring_to_front|install_atlisp|init_atlisp|get_system_status)/.test(n)) return "\u7CFB\u7EDF";
+  if (/^(list_packages|search_packages|install_package|get_function_usage|list_symbols|import_funlib)/.test(n)) return "\u5305\u4E0E\u51FD\u6570";
+  if (/^(watch_|lisp_repl|webhook_|sandbox_|audit_|cad_pool_|external_|list_data|export_to|import_external)/.test(n)) return "\u9AD8\u7EA7";
+  if (/^(list_prompts|get_prompt|search_tools|list_tools_by_category|get_tool_info)/.test(n)) return "\u5143\u5DE5\u5177";
+  if (/^(agent_)/.test(n)) return "Agent\u4E0A\u4E0B\u6587";
+  return "\u5176\u4ED6";
+}
 function addAnnotations(tool) {
   const isDeprecated = DEPRECATED_TOOLS.has(tool.name);
   const isPoolTool = tool.name.startsWith("cad_pool_") || tool.name === "session_pin_instance" || tool.name === "session_unpin_instance";
@@ -6477,11 +6647,12 @@ function addAnnotations(tool) {
       destructiveHint: tool.name.startsWith("delete_") || tool.name.startsWith("purge_") || tool.name.startsWith("boolean_") || EXTRA_DESTRUCTIVE.has(tool.name),
       idempotentHint: READ_ONLY_TOOLS.has(tool.name) || IDEMPOTENT_WRITE_TOOLS.has(tool.name),
       openWorldHint: OPEN_WORLD_TOOLS.has(tool.name),
+      category: getToolCategory(tool.name),
       ...isDeprecated ? { deprecatedReason: "This tool has been superseded. Check documentation for alternatives." } : {}
     }
   };
 }
-var READ_ONLY_TOOLS, DEPRECATED_TOOLS, EXTRA_DESTRUCTIVE, IDEMPOTENT_WRITE_TOOLS, OPEN_WORLD_TOOLS, tools42, toolsByName;
+var READ_ONLY_TOOLS, DEPRECATED_TOOLS, EXTRA_DESTRUCTIVE, IDEMPOTENT_WRITE_TOOLS, OPEN_WORLD_TOOLS, tools43, toolsByName;
 var init_tools = __esm({
   "src/tools/index.js"() {
     init_cad_tools();
@@ -6525,6 +6696,7 @@ var init_tools = __esm({
     init_batch_transaction_tools();
     init_lint_tools();
     init_debug_tools();
+    init_concurrent_tools();
     READ_ONLY_TOOLS = /* @__PURE__ */ new Set([
       "get_cad_info",
       "get_platform_info",
@@ -6664,7 +6836,7 @@ var init_tools = __esm({
       "import_page_setup",
       "load_linetype"
     ]);
-    tools42 = [
+    tools43 = [
       ...tools,
       ...tools2,
       ...tools3,
@@ -6705,9 +6877,10 @@ var init_tools = __esm({
       ...tools39,
       ...tools37,
       ...tools40,
-      ...tools41
+      ...tools41,
+      ...tools42
     ].map(addAnnotations);
-    toolsByName = new Map(tools42.map((t) => [t.name, t]));
+    toolsByName = new Map(tools43.map((t) => [t.name, t]));
   }
 });
 
@@ -6760,7 +6933,7 @@ function parseLispList(str) {
   });
 }
 function createMcpServer(handlers = {}) {
-  const { tools: tools43 = [], handleToolCall: handleToolCall2 = () => ({ content: [] }) } = handlers;
+  const { tools: tools44 = [], handleToolCall: handleToolCall2 = () => ({ content: [] }) } = handlers;
   const server = new Server(
     { name: SERVER_NAME, version: SERVER_VERSION },
     {
@@ -6783,8 +6956,8 @@ function createMcpServer(handlers = {}) {
     const params = request.params || {};
     const cursor = decodeCursor(params.cursor);
     const PAGE_SIZE = 100;
-    const page = tools43.slice(cursor, cursor + PAGE_SIZE);
-    const nextCursor = cursor + PAGE_SIZE < tools43.length ? encodeCursor(cursor + PAGE_SIZE) : void 0;
+    const page = tools44.slice(cursor, cursor + PAGE_SIZE);
+    const nextCursor = cursor + PAGE_SIZE < tools44.length ? encodeCursor(cursor + PAGE_SIZE) : void 0;
     return { tools: page, nextCursor };
   });
   server.setRequestHandler(CallToolRequestSchema, async (request) => {
@@ -7133,11 +7306,11 @@ function createMcpServer(handlers = {}) {
         if (p.toLowerCase().startsWith(prefix)) values.push(p);
       }
     } else if (ref?.type === "tool") {
-      for (const t of tools43) {
+      for (const t of tools44) {
         if (t.name.toLowerCase().startsWith(prefix)) values.push(t.name);
       }
     } else if (ref?.type === "ref/parameter") {
-      const toolDef = tools43.find((t) => t.name === ref.name);
+      const toolDef = tools44.find((t) => t.name === ref.name);
       if (toolDef?.inputSchema?.properties) {
         const paramName = argument.name;
         const paramDef = toolDef.inputSchema.properties[paramName];
@@ -8361,6 +8534,7 @@ __export(cad_handlers_exports, {
   newDocument: () => newDocument,
   setSystemVariable: () => setSystemVariable
 });
+import iconv from "iconv-lite";
 async function connectCad(platform = null) {
   log(`connect_cad called${platform ? ` (target: ${platform})` : ""}, cad.connected before: ${cad.connected}`);
   try {
@@ -8443,9 +8617,15 @@ var init_cad_handlers = __esm({
 ${detail}`);
       }
       if (withResult) {
-        const result = await cad.sendCommandWithResult(trimmed, encoding);
-        if (result !== null) {
-          return mcpSuccess(result);
+        const useRaw = encoding ? true : false;
+        const resp = await cad.sendCommandWithResult(trimmed, encoding, useRaw);
+        if (resp !== null) {
+          if (useRaw && resp.rawBase64) {
+            const buf = Buffer.from(resp.rawBase64, "base64");
+            const decoded = iconv.decode(buf, encoding);
+            return mcpSuccess(decoded);
+          }
+          return mcpSuccess(resp);
         }
         return mcpError("\u6267\u884C\u5931\u8D25\u6216\u65E0\u8FD4\u56DE\u503C");
       }
@@ -10670,6 +10850,87 @@ var init_lint_handlers = __esm({
   }
 });
 
+// src/handlers/meta-handlers.js
+var meta_handlers_exports = {};
+__export(meta_handlers_exports, {
+  get_prompt_handler: () => get_prompt_handler,
+  get_tool_info: () => get_tool_info,
+  list_prompts_handler: () => list_prompts_handler,
+  list_tools_by_category: () => list_tools_by_category,
+  search_tools: () => search_tools
+});
+async function search_tools(a) {
+  const q = (a.query || "").toLowerCase();
+  const results = tools43.filter((t) => t.name.toLowerCase().includes(q) || (t.description || "").toLowerCase().includes(q));
+  const text = results.length ? `\u627E\u5230 ${results.length} \u4E2A\u5DE5\u5177:
+${results.map((t) => `${t.name}: ${t.description}`).join("\n")}` : `\u672A\u627E\u5230\u5305\u542B "${a.query}" \u7684\u5DE5\u5177`;
+  return { content: [{ type: "text", text }] };
+}
+async function list_tools_by_category(a) {
+  const categories = {};
+  for (const t of tools43) {
+    const cat = t.annotations?.category || "\u5176\u4ED6";
+    if (!categories[cat]) categories[cat] = [];
+    categories[cat].push(t.name);
+  }
+  if (a.category) {
+    const names = categories[a.category];
+    return { content: [{ type: "text", text: names ? `${a.category} (${names.length}):
+${names.join("\n")}` : `\u672A\u627E\u5230\u5206\u7C7B: ${a.category}` }] };
+  }
+  const lines = [];
+  for (const [cat, names] of Object.entries(categories)) {
+    lines.push(`## ${cat} (${names.length})`);
+  }
+  lines.push(`
+\u5171 ${Object.keys(categories).length} \u4E2A\u5206\u7C7B`);
+  return { content: [{ type: "text", text: lines.join("\n") }] };
+}
+async function get_tool_info(a) {
+  if (!a.name) return { content: [{ type: "text", text: "\u9700\u8981 name \u53C2\u6570\uFF08\u5DE5\u5177\u540D\u79F0\uFF09" }], isError: true };
+  const tool = tools43.find((t) => t.name === a.name);
+  if (!tool) return { content: [{ type: "text", text: `\u672A\u627E\u5230\u5DE5\u5177: ${a.name}` }], isError: true };
+  const ann = tool.annotations || {};
+  const required = (tool.inputSchema?.required || []).join(", ") || "\u65E0";
+  const props = tool.inputSchema?.properties || {};
+  const params = Object.entries(props).map(([k, v]) => {
+    const req = required.includes(k) ? "\u5FC5\u586B" : "\u53EF\u9009";
+    const desc = v.description || "";
+    return `  ${k} (${req}): ${desc}`;
+  }).join("\n");
+  const lines = [
+    `## ${tool.name}`,
+    `\u63CF\u8FF0: ${tool.description || "\u65E0"}`,
+    `\u5206\u7C7B: ${ann.category || "\u5176\u4ED6"}`,
+    `\u53EA\u8BFB: ${ann.readOnlyHint ? "\u662F" : "\u5426"}`,
+    `\u7834\u574F\u6027: ${ann.destructiveHint ? "\u662F" : "\u5426"}`,
+    `\u5E42\u7B49: ${ann.idempotentHint ? "\u662F" : "\u5426"}`,
+    `\u5F00\u653E\u4E16\u754C: ${ann.openWorldHint ? "\u662F" : "\u5426"}`,
+    ``,
+    `\u53C2\u6570:`,
+    params || "  \u65E0\u53C2\u6570"
+  ];
+  if (ann.deprecatedReason) {
+    lines.push(`
+\u5DF2\u5F03\u7528: ${ann.deprecatedReason}`);
+  }
+  return { content: [{ type: "text", text: lines.join("\n") }] };
+}
+async function list_prompts_handler() {
+  const prompts = await listPrompts2();
+  return { content: [{ type: "text", text: JSON.stringify(prompts) }] };
+}
+async function get_prompt_handler(a) {
+  const prompt = await getPrompt2(a.name, a.args || {});
+  return { content: prompt.messages.map((m) => ({ type: "text", text: m.content.text || m.content })) };
+}
+var init_meta_handlers = __esm({
+  "src/handlers/meta-handlers.js"() {
+    init_tools();
+    init_prompt_handlers();
+  }
+});
+
 // src/handlers/package-handlers.js
 var package_handlers_exports = {};
 __export(package_handlers_exports, {
@@ -10679,7 +10940,7 @@ __export(package_handlers_exports, {
 });
 async function fetchPackages() {
   const now = Date.now();
-  if (cachedPackages && cachedAt2 && now - cachedAt2 < CACHE_TTL2) {
+  if (cachedPackages && cachedAt2 && now - cachedAt2 < CACHE_TTL) {
     return cachedPackages;
   }
   try {
@@ -10756,7 +11017,7 @@ async function installPackage(packageName) {
   }
   return { content: [{ type: "text", text: `\u5305 "${packageName}" \u5B89\u88C5\u547D\u4EE4\u5DF2\u53D1\u9001\uFF01` }] };
 }
-var PACKAGES_LIST_URL, cachedPackages, cachedAt2, CACHE_TTL2;
+var PACKAGES_LIST_URL, cachedPackages, cachedAt2, CACHE_TTL;
 var init_package_handlers = __esm({
   "src/handlers/package-handlers.js"() {
     init_logger();
@@ -10765,7 +11026,7 @@ var init_package_handlers = __esm({
     PACKAGES_LIST_URL = process.env.PACKAGES_LIST_URL || "http://s3.atlisp.cn/packages-list?fmt=json";
     cachedPackages = null;
     cachedAt2 = null;
-    CACHE_TTL2 = 10 * 60 * 1e3;
+    CACHE_TTL = 10 * 60 * 1e3;
   }
 });
 
@@ -12589,6 +12850,192 @@ var init_sheetset_handlers = __esm({
   }
 });
 
+// src/handlers/skill-handlers.js
+var skill_handlers_exports = {};
+__export(skill_handlers_exports, {
+  skill_install: () => skill_install,
+  skill_list_categories: () => skill_list_categories,
+  skill_list_installed: () => skill_list_installed,
+  skill_search: () => skill_search,
+  skill_uninstall: () => skill_uninstall
+});
+import fs8 from "fs";
+import path12 from "path";
+import os7 from "os";
+function readCache() {
+  try {
+    if (fs8.existsSync(CACHE_PATH)) return JSON.parse(fs8.readFileSync(CACHE_PATH, "utf-8"));
+  } catch {
+  }
+  return null;
+}
+function writeCache(data) {
+  try {
+    fs8.writeFileSync(CACHE_PATH, JSON.stringify(data, null, 2), "utf-8");
+  } catch {
+  }
+}
+async function fetchIndex() {
+  let index = readCache();
+  if (index && Date.now() - index.fetchedAt < 36e5) return index;
+  try {
+    const resp = await fetch(REGISTRY_URL, { headers: { "User-Agent": "atlisp-mcp" } });
+    if (resp.ok) {
+      index = await resp.json();
+      index.fetchedAt = Date.now();
+      writeCache(index);
+    }
+  } catch {
+  }
+  return index;
+}
+async function skill_search(a) {
+  const index = await fetchIndex();
+  if (!index?.skills) return { content: [{ type: "text", text: "\u65E0\u6CD5\u83B7\u53D6 skill \u6CE8\u518C\u8868\u7D22\u5F15" }], isError: true };
+  const q = (a.query || "").toLowerCase();
+  const results = index.skills.filter(
+    (s) => s.name.toLowerCase().includes(q) || (s.description || "").toLowerCase().includes(q) || (s.tags || []).some((t) => t.toLowerCase().includes(q))
+  );
+  if (!results.length) return { content: [{ type: "text", text: `\u672A\u627E\u5230\u5339\u914D "${a.query}" \u7684 skill` }] };
+  const lines = [`\u627E\u5230 ${results.length} \u4E2A skill:
+`];
+  for (const s of results) {
+    lines.push(`**${s.name}**`);
+    if (s.description) lines.push(`  \u63CF\u8FF0: ${s.description}`);
+    if (s.tags?.length) lines.push(`  \u6807\u7B7E: ${s.tags.join(", ")}`);
+    if (s.version) lines.push(`  \u7248\u672C: ${s.version}`);
+    lines.push("");
+  }
+  return { content: [{ type: "text", text: lines.join("\n") }] };
+}
+async function skill_install(a) {
+  if (!a.name) return { content: [{ type: "text", text: "\u9700\u8981 skill \u540D\u79F0" }], isError: true };
+  const index = await fetchIndex();
+  if (!index?.skills) return { content: [{ type: "text", text: "\u65E0\u6CD5\u83B7\u53D6 skill \u6CE8\u518C\u8868\u7D22\u5F15" }], isError: true };
+  const skill = index.skills.find((s) => s.name === a.name);
+  if (!skill) return { content: [{ type: "text", text: `\u672A\u627E\u5230 skill: ${a.name}` }], isError: true };
+  const downloadUrl = skill.download_url || skill.url;
+  if (!downloadUrl) return { content: [{ type: "text", text: `Skill "${a.name}" \u6CA1\u6709\u4E0B\u8F7D\u5730\u5740` }], isError: true };
+  let content;
+  try {
+    const resp = await fetch(downloadUrl, { headers: { "User-Agent": "atlisp-mcp" } });
+    if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
+    content = await resp.text();
+  } catch (e) {
+    return { content: [{ type: "text", text: `\u4E0B\u8F7D\u5931\u8D25: ${e.message}` }], isError: true };
+  }
+  try {
+    fs8.mkdirSync(SKILLS_DIR, { recursive: true });
+  } catch {
+  }
+  const safeName = a.name.replace(/[^a-zA-Z0-9\u4e00-\u9fff_-]/g, "-").substring(0, 40);
+  const skillFile = path12.join(SKILLS_DIR, `skill-${safeName}.md`);
+  if (fs8.existsSync(skillFile)) {
+    return { content: [{ type: "text", text: `Skill "${a.name}" \u5DF2\u5B89\u88C5 (${skillFile})` }], isError: true };
+  }
+  let finalContent = content;
+  if (!content.match(/^---\n/)) {
+    const tags = (skill.tags || []).join(", ");
+    finalContent = `---
+name: ${a.name}
+description: ${skill.description || ""}
+tags: ${tags}
+---
+
+${content}`;
+  }
+  fs8.writeFileSync(skillFile, finalContent, "utf-8");
+  return { content: [{ type: "text", text: `${skill.name} \u5B89\u88C5\u6210\u529F
+\u6587\u4EF6: ${skillFile}${skill.version ? `
+\u7248\u672C: ${skill.version}` : ""}` }] };
+}
+async function skill_list_installed() {
+  if (!fs8.existsSync(SKILLS_DIR)) return { content: [{ type: "text", text: "\u6682\u65E0\u5DF2\u5B89\u88C5\u7684 skill" }] };
+  const results = [];
+  try {
+    const entries = fs8.readdirSync(SKILLS_DIR, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.isFile() && entry.name.endsWith(".md")) {
+        const fullPath = path12.join(SKILLS_DIR, entry.name);
+        try {
+          const raw = fs8.readFileSync(fullPath, "utf-8");
+          const match = raw.match(/^---\n([\s\S]*?)\n---/);
+          if (match) {
+            const fm = {};
+            for (const line of match[1].split("\n")) {
+              const sep = line.indexOf(":");
+              if (sep > 0) fm[line.slice(0, sep).trim()] = line.slice(sep + 1).trim();
+            }
+            results.push({ name: fm.name || entry.name.replace(".md", ""), description: fm.description || "", tags: fm.tags || "" });
+          } else {
+            results.push({ name: entry.name.replace(".md", ""), description: "", tags: "" });
+          }
+        } catch {
+        }
+      }
+    }
+  } catch {
+  }
+  if (!results.length) return { content: [{ type: "text", text: "\u6682\u65E0\u5DF2\u5B89\u88C5\u7684 skill" }] };
+  const lines = [`\u5DF2\u5B89\u88C5 ${results.length} \u4E2A skill:
+`];
+  for (const s of results) {
+    lines.push(`**${s.name}**${s.description ? ` \u2014 ${s.description}` : ""}`);
+    if (s.tags) lines.push(`  \u6807\u7B7E: ${s.tags}`);
+  }
+  return { content: [{ type: "text", text: lines.join("\n") }] };
+}
+async function skill_uninstall(a) {
+  if (!a.name) return { content: [{ type: "text", text: "\u9700\u8981 skill \u540D\u79F0" }], isError: true };
+  if (!fs8.existsSync(SKILLS_DIR)) return { content: [{ type: "text", text: `\u672A\u5B89\u88C5 skill: ${a.name}` }], isError: true };
+  let found = null;
+  try {
+    const entries = fs8.readdirSync(SKILLS_DIR, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.isFile() && entry.name.endsWith(".md")) {
+        const fullPath = path12.join(SKILLS_DIR, entry.name);
+        try {
+          const raw = fs8.readFileSync(fullPath, "utf-8");
+          const match = raw.match(/^---\n([\s\S]*?)\n---/);
+          if (match) {
+            for (const line of match[1].split("\n")) {
+              if (line.startsWith("name:") && line.slice(5).trim() === a.name) {
+                found = fullPath;
+                break;
+              }
+            }
+          } else if (entry.name.replace(".md", "") === a.name) {
+            found = fullPath;
+          }
+        } catch {
+        }
+        if (found) break;
+      }
+    }
+  } catch {
+  }
+  if (!found) return { content: [{ type: "text", text: `\u672A\u5B89\u88C5 skill: ${a.name}` }], isError: true };
+  fs8.unlinkSync(found);
+  return { content: [{ type: "text", text: `${a.name} \u5DF2\u5378\u8F7D` }] };
+}
+async function skill_list_categories() {
+  const index = await fetchIndex();
+  if (!index?.skills) return { content: [{ type: "text", text: "\u65E0\u6CD5\u83B7\u53D6 skill \u6CE8\u518C\u8868\u7D22\u5F15" }], isError: true };
+  const cats = /* @__PURE__ */ new Set();
+  for (const s of index.skills) for (const t of s.tags || []) cats.add(t);
+  const sorted = Array.from(cats).sort();
+  return { content: [{ type: "text", text: sorted.length ? `\u6CE8\u518C\u8868\u5206\u7C7B (${sorted.length}):
+${sorted.join("\n")}` : "\u6682\u65E0\u5206\u7C7B" }] };
+}
+var SKILLS_DIR, REGISTRY_URL, CACHE_PATH;
+var init_skill_handlers = __esm({
+  "src/handlers/skill-handlers.js"() {
+    SKILLS_DIR = path12.join(os7.homedir(), ".atlisp", "skills");
+    REGISTRY_URL = process.env.SKILL_REGISTRY_URL || "https://raw.githubusercontent.com/atlisp/skill-registry/main/index.json";
+    CACHE_PATH = path12.join(os7.homedir(), ".atlisp", "skill-registry-cache.json");
+  }
+});
+
 // src/handlers/spatial-handlers.js
 var spatial_handlers_exports = {};
 __export(spatial_handlers_exports, {
@@ -13960,13 +14407,13 @@ function lispPoint(pt) {
 }
 async function attachXref(args) {
   try {
-    const path20 = esc3(args.path);
+    const path21 = esc3(args.path);
     const point = lispPoint(args.point);
     const scale = args.scale || 1;
     const rotation = args.rotation || 0;
     const overlay = args.overlay ? "_O" : "_A";
     const result = await cad.sendCommandWithResult(
-      `(command "_.XATTACH" "${path20}" "${overlay}" "${point}" "${scale}" "${rotation}") (princ)`
+      `(command "_.XATTACH" "${path21}" "${overlay}" "${point}" "${scale}" "${rotation}") (princ)`
     );
     return mcpSuccess(`\u5916\u90E8\u53C2\u7167\u5DF2\u9644\u7740: ${args.path}`);
   } catch (e) {
@@ -14294,6 +14741,7 @@ var init_ = __esm({
       "./handlers/function-handlers.js": () => Promise.resolve().then(() => (init_function_handlers(), function_handlers_exports)),
       "./handlers/layer-handlers.js": () => Promise.resolve().then(() => (init_layer_handlers(), layer_handlers_exports)),
       "./handlers/lint-handlers.js": () => Promise.resolve().then(() => (init_lint_handlers(), lint_handlers_exports)),
+      "./handlers/meta-handlers.js": () => Promise.resolve().then(() => (init_meta_handlers(), meta_handlers_exports)),
       "./handlers/package-handlers.js": () => Promise.resolve().then(() => (init_package_handlers(), package_handlers_exports)),
       "./handlers/parametric-handlers.js": () => Promise.resolve().then(() => (init_parametric_handlers(), parametric_handlers_exports)),
       "./handlers/pdf-annotation-handlers.js": () => Promise.resolve().then(() => (init_pdf_annotation_handlers(), pdf_annotation_handlers_exports)),
@@ -14302,6 +14750,7 @@ var init_ = __esm({
       "./handlers/query-print-handlers.js": () => Promise.resolve().then(() => (init_query_print_handlers(), query_print_handlers_exports)),
       "./handlers/resource-handlers.js": () => Promise.resolve().then(() => (init_resource_handlers(), resource_handlers_exports)),
       "./handlers/sheetset-handlers.js": () => Promise.resolve().then(() => (init_sheetset_handlers(), sheetset_handlers_exports)),
+      "./handlers/skill-handlers.js": () => Promise.resolve().then(() => (init_skill_handlers(), skill_handlers_exports)),
       "./handlers/spatial-handlers.js": () => Promise.resolve().then(() => (init_spatial_handlers(), spatial_handlers_exports)),
       "./handlers/style-handlers.js": () => Promise.resolve().then(() => (init_style_handlers(), style_handlers_exports)),
       "./handlers/text-handlers.js": () => Promise.resolve().then(() => (init_text_handlers(), text_handlers_exports)),
@@ -14314,8 +14763,8 @@ var init_ = __esm({
 });
 
 // src/handler-loader.js
-import fs8 from "fs";
-import path12 from "path";
+import fs9 from "fs";
+import path13 from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
 function toolNameToFuncName(toolName) {
   if (FUNCTION_OVERRIDES[toolName]) return FUNCTION_OVERRIDES[toolName];
@@ -14365,10 +14814,10 @@ async function getHandlerModule(name) {
 async function initHandlerModules() {
   if (_handlerModulesInit) return;
   _handlerModulesInit = true;
-  const handlerDir = path12.join(__dirname5, "handlers");
+  const handlerDir = path13.join(__dirname5, "handlers");
   let names;
   try {
-    names = await fs8.promises.readdir(handlerDir);
+    names = await fs9.promises.readdir(handlerDir);
   } catch {
     log("Handler directory not found, using static manifest");
     return;
@@ -14379,6 +14828,7 @@ async function initHandlerModules() {
       handlerModules[name] = () => globImport_handlers_handlers_js(`./handlers/${name}-handlers.js`);
     }
   }
+  watchHandlers();
 }
 async function getHandler(toolName) {
   const resolved = await resolveHandler(toolName);
@@ -14387,12 +14837,40 @@ async function getHandler(toolName) {
   if (!mod || typeof mod[resolved.funcName] !== "function") return null;
   return mod[resolved.funcName];
 }
-var __dirname5, _handlerModulesInit, _handlerNameMapInit, handlerModules, moduleCache, resolvedCache, FUNCTION_OVERRIDES;
+function watchHandlers() {
+  if (_watcherInitialized) return;
+  _watcherInitialized = true;
+  const handlerDir = path13.join(__dirname5, "handlers");
+  let debounceTimer = null;
+  try {
+    if (!fs9.existsSync(handlerDir)) return;
+    fs9.watch(handlerDir, (eventType, filename) => {
+      if (!filename || !filename.endsWith("-handlers.js")) return;
+      if (debounceTimer) clearTimeout(debounceTimer);
+      debounceTimer = setTimeout(async () => {
+        const name = filename.replace("-handlers.js", "");
+        moduleCache.delete(name);
+        resolvedCache.clear();
+        _handlerNameMapInit = false;
+        _handlerModulesInit = false;
+        try {
+          await initHandlerModules();
+          log(`Handler hot-reloaded: ${filename}`);
+        } catch (e) {
+          log(`Handler reload failed for ${filename}: ${e.message}`);
+        }
+      }, 300);
+    });
+  } catch (e) {
+    log(`Handler watch error: ${e.message}`);
+  }
+}
+var __dirname5, _handlerModulesInit, _handlerNameMapInit, handlerModules, moduleCache, resolvedCache, FUNCTION_OVERRIDES, _watcherInitialized;
 var init_handler_loader = __esm({
   "src/handler-loader.js"() {
     init_logger();
     init_();
-    __dirname5 = path12.dirname(fileURLToPath5(import.meta.url));
+    __dirname5 = path13.dirname(fileURLToPath5(import.meta.url));
     _handlerModulesInit = false;
     _handlerNameMapInit = false;
     handlerModules = {};
@@ -14404,16 +14882,18 @@ var init_handler_loader = __esm({
       get_dimension: "getDimensionValue",
       eval_lisp_with_result: "evalLisp"
     };
+    _watcherInitialized = false;
   }
 });
 
 // src/streaming.js
-async function streamEntitiesByType({ type = null, layer = null, chunk = STREAM_CHUNK_SIZE, offset = 0 }) {
-  const hasFilter = type || layer;
-  const filters = [];
-  if (type) filters.push(`(cons 0 "${type}")`);
-  if (layer) filters.push(`(cons 8 "${layer}")`);
-  const ssgetExpr = filters.length > 0 ? `(ssget "_X" (list ${filters.join(" ")}))` : `(ssget "_X")`;
+function escapeLispStr(str) {
+  if (typeof str !== "string") return "";
+  return str.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+}
+async function streamEntities({ filterExpr, extractFields, itemMapper, offset, limit, hasFilter, warnThreshold, overLimitMsg, resultProp }) {
+  const ssgetExpr = filterExpr ? `(ssget "_X" ${filterExpr})` : `(ssget "_X")`;
+  const extractCode = extractFields.length === 1 ? `(list ${extractFields.join(" ")})` : `(list ${extractFields.join(" ")})`;
   const lisp = `(progn
     (setq ss ${ssgetExpr})
     (setq total (if ss (sslength ss) 0))
@@ -14425,10 +14905,10 @@ async function streamEntitiesByType({ type = null, layer = null, chunk = STREAM_
           (setq result (list total))
           (setq i ${offset})
           (setq count 0)
-          (while (and (< i total) (< count ${chunk}))
+          (while (and (< i total) (< count ${limit}))
             (setq e (ssname ss i))
             (setq elist (entget e))
-            (setq result (cons (list (cdr (assoc 0 elist)) (cdr (assoc 5 elist)) (cdr (assoc 8 elist))) result))
+            (setq result (cons ${extractCode} result))
             (setq i (1+ i))
             (setq count (1+ count)))
           (reverse result)))))`;
@@ -14442,108 +14922,68 @@ async function streamEntitiesByType({ type = null, layer = null, chunk = STREAM_
         offset: 0,
         count: 0,
         hasMore: false,
-        entities: [],
-        error: `\u5B9E\u4F53\u6570\u91CF (${parsed[1]}) \u8D85\u8FC7\u6700\u5927\u9650\u5236 (${MAX_ENTITY_LIMIT})\uFF0C\u8BF7\u4F7F\u7528 type/layer \u8FC7\u6EE4`
+        [resultProp]: [],
+        error: `\u5B9E\u4F53\u6570\u91CF (${parsed[1]}) \u8D85\u8FC7\u6700\u5927\u9650\u5236 (${MAX_ENTITY_LIMIT})\uFF0C${overLimitMsg}`
       };
     }
-    const entities = parsed.slice(1);
-    const result = {
-      total,
-      offset,
-      count: entities.length,
-      hasMore: offset + entities.length < total,
-      entities
-    };
-    if (!hasFilter && total > UNFILTERED_WARN_THRESHOLD) {
-      result.warning = `\u672A\u63D0\u4F9B type/layer \u8FC7\u6EE4\uFF0C\u5168\u56FE\u626B\u63CF\u4E86 ${total} \u4E2A\u5B9E\u4F53\u3002\u5EFA\u8BAE\u6DFB\u52A0 type \u6216 layer \u53C2\u6570\u4EE5\u5927\u5E45\u63D0\u5347\u6027\u80FD\u548C\u964D\u4F4E\u5185\u5B58\u5360\u7528\u3002`;
+    const items = parsed.slice(1).map(itemMapper);
+    const result = { total, offset, count: items.length, hasMore: offset + items.length < total, [resultProp]: items };
+    if (!hasFilter && total > warnThreshold) {
+      result.warning = `\u672A\u63D0\u4F9B\u8FC7\u6EE4\u6761\u4EF6\uFF0C\u5168\u56FE\u626B\u63CF\u4E86 ${total} \u4E2A\u5B9E\u4F53\u3002\u5EFA\u8BAE\u6DFB\u52A0\u8FC7\u6EE4\u53C2\u6570\u4EE5\u63D0\u5347\u6027\u80FD\u3002`;
     }
     return result;
   } catch {
-    return { total: 0, offset: 0, count: 0, hasMore: false, entities: [] };
+    return { total: 0, offset: 0, count: 0, hasMore: false, [resultProp]: [] };
   }
 }
+async function streamEntitiesByType({ type = null, layer = null, chunk = STREAM_CHUNK_SIZE, offset = 0 }) {
+  const filters = [];
+  if (type) filters.push(`(cons 0 "${escapeLispStr(type)}")`);
+  if (layer) filters.push(`(cons 8 "${escapeLispStr(layer)}")`);
+  const filterExpr = filters.length > 0 ? `(list ${filters.join(" ")})` : null;
+  return streamEntities({
+    filterExpr,
+    extractFields: ["(list (cdr (assoc 0 elist)) (cdr (assoc 5 elist)) (cdr (assoc 8 elist)))"],
+    itemMapper: (item) => ({ type: item[0], handle: item[1], layer: item[2] }),
+    offset,
+    limit: chunk,
+    hasFilter: !!(type || layer),
+    warnThreshold: UNFILTERED_WARN_THRESHOLD,
+    overLimitMsg: "\u8BF7\u4F7F\u7528 type/layer \u8FC7\u6EE4",
+    resultProp: "entities"
+  });
+}
 async function streamTextContent({ layer = null, bbox = null, offset = 0, limit = 100 }) {
   const textFilters = [`(cons 0 "TEXT")`, `(cons 0 "MTEXT")`];
-  if (layer) textFilters.push(`(cons 8 "${layer}")`);
-  const lisp = `(progn
-    (setq ss (ssget "_X" (list '(-4 . "<OR") ${textFilters.join(" ")} '(-4 . "OR>"))))
-    (setq total (if ss (sslength ss) 0))
-    (if (> total ${MAX_ENTITY_LIMIT})
-      (list -1 total)
-      (if (>= ${offset} total)
-        (list total)
-        (progn
-          (setq result (list total))
-          (setq i ${offset})
-          (setq count 0)
-          (while (and (< i total) (< count ${limit}))
-            (setq e (ssname ss i))
-            (setq elist (entget e))
-            (setq txt (cdr (assoc 1 elist)))
-            (setq result (cons (list (cdr (assoc 5 elist)) txt (cdr (assoc 10 elist))) result))
-            (setq i (1+ i))
-            (setq count (1+ count)))
-          (reverse result)))))`;
-  const raw = await cad.sendCommandWithResult(lisp);
-  try {
-    const parsed = JSON.parse(raw);
-    const total = parsed[0] || 0;
-    if (total === -1) {
-      return {
-        total: parsed[1] || 0,
-        offset: 0,
-        count: 0,
-        hasMore: false,
-        texts: [],
-        error: `\u6587\u672C\u5B9E\u4F53\u6570\u91CF (${parsed[1]}) \u8D85\u8FC7\u6700\u5927\u9650\u5236 (${MAX_ENTITY_LIMIT})\uFF0C\u8BF7\u4F7F\u7528 layer \u8FC7\u6EE4`
-      };
-    }
-    const texts = parsed.slice(1).map((t) => ({ handle: t[0], text: t[1], point: t[2] }));
-    return { total, offset, count: texts.length, hasMore: offset + texts.length < total, texts };
-  } catch {
-    return { total: 0, offset: 0, count: 0, hasMore: false, texts: [] };
-  }
+  if (layer) textFilters.push(`(cons 8 "${escapeLispStr(layer)}")`);
+  const filterExpr = `(list '(-4 . "<OR") ${textFilters.join(" ")} '(-4 . "OR>"))`;
+  return streamEntities({
+    filterExpr,
+    extractFields: ["(list (cdr (assoc 5 elist)) (cdr (assoc 1 elist)) (cdr (assoc 10 elist)))"],
+    itemMapper: (item) => ({ handle: item[0], text: item[1], point: item[2] }),
+    offset,
+    limit,
+    hasFilter: !!layer,
+    warnThreshold: UNFILTERED_WARN_THRESHOLD,
+    overLimitMsg: "\u8BF7\u4F7F\u7528 layer \u8FC7\u6EE4",
+    resultProp: "texts"
+  });
 }
 async function streamBlockRefs({ blockName = null, offset = 0, limit = 100 }) {
   const filters = [`(cons 0 "INSERT")`];
-  if (blockName) filters.push(`(cons 2 "${blockName}")`);
-  const lisp = `(progn
-    (setq ss (ssget "_X" (list ${filters.join(" ")})))
-    (setq total (if ss (sslength ss) 0))
-    (if (> total ${MAX_ENTITY_LIMIT})
-      (list -1 total)
-      (if (>= ${offset} total)
-        (list total)
-        (progn
-          (setq result (list total))
-          (setq i ${offset})
-          (setq count 0)
-          (while (and (< i total) (< count ${limit}))
-            (setq e (ssname ss i))
-            (setq elist (entget e))
-            (setq result (cons (list (cdr (assoc 2 elist)) (cdr (assoc 5 elist)) (cdr (assoc 10 elist))) result))
-            (setq i (1+ i))
-            (setq count (1+ count)))
-          (reverse result)))))`;
-  const raw = await cad.sendCommandWithResult(lisp);
-  try {
-    const parsed = JSON.parse(raw);
-    const total = parsed[0] || 0;
-    if (total === -1) {
-      return {
-        total: parsed[1] || 0,
-        offset: 0,
-        count: 0,
-        hasMore: false,
-        refs: [],
-        error: `\u5757\u53C2\u7167\u6570\u91CF (${parsed[1]}) \u8D85\u8FC7\u6700\u5927\u9650\u5236 (${MAX_ENTITY_LIMIT})\uFF0C\u8BF7\u4F7F\u7528 blockName \u8FC7\u6EE4`
-      };
-    }
-    const refs = parsed.slice(1).map((r) => ({ blockName: r[0], handle: r[1], insertionPoint: r[2] }));
-    return { total, offset, count: refs.length, hasMore: offset + refs.length < total, refs };
-  } catch {
-    return { total: 0, offset: 0, count: 0, hasMore: false, refs: [] };
-  }
+  if (blockName) filters.push(`(cons 2 "${escapeLispStr(blockName)}")`);
+  const filterExpr = filters.length > 0 ? `(list ${filters.join(" ")})` : null;
+  return streamEntities({
+    filterExpr,
+    extractFields: ["(list (cdr (assoc 2 elist)) (cdr (assoc 5 elist)) (cdr (assoc 10 elist)))"],
+    itemMapper: (item) => ({ blockName: item[0], handle: item[1], insertionPoint: item[2] }),
+    offset,
+    limit,
+    hasFilter: !!blockName,
+    warnThreshold: UNFILTERED_WARN_THRESHOLD,
+    overLimitMsg: "\u8BF7\u4F7F\u7528 blockName \u8FC7\u6EE4",
+    resultProp: "refs"
+  });
 }
 var STREAM_CHUNK_SIZE, MAX_ENTITY_LIMIT, UNFILTERED_WARN_THRESHOLD;
 var init_streaming = __esm({
@@ -14555,6 +14995,74 @@ var init_streaming = __esm({
   }
 });
 
+// src/cad-rot-helper.js
+import edge from "edge-js";
+import path14 from "path";
+import { fileURLToPath as fileURLToPath6 } from "url";
+function getRotHelper() {
+  if (_rotHelper) return _rotHelper;
+  const dllPath = path14.join(projectRoot, "dist", "cad-rothelper.dll");
+  try {
+    _rotHelper = edge.func({
+      assemblyFile: dllPath,
+      typeName: "CadRotHelper.RotEnumerator",
+      methodName: "EnumerateAll"
+    });
+    return _rotHelper;
+  } catch (e) {
+    error(`ROT \u5E2E\u52A9\u5668\u52A0\u8F7D\u5931\u8D25: ${e.message}`);
+    return null;
+  }
+}
+async function discoverCadInstances() {
+  const helper = getRotHelper();
+  if (!helper) {
+    log("ROT \u5E2E\u52A9\u5668\u4E0D\u53EF\u7528\uFF0C\u8DF3\u8FC7 CAD \u5B9E\u4F8B\u53D1\u73B0");
+    return [];
+  }
+  return new Promise((resolve) => {
+    helper(null, (err, result) => {
+      if (err) {
+        error(`ROT \u679A\u4E3E\u5931\u8D25: ${err.message}`);
+        resolve([]);
+        return;
+      }
+      if (!Array.isArray(result)) {
+        resolve([]);
+        return;
+      }
+      const seen = /* @__PURE__ */ new Set();
+      const instances = [];
+      for (const entry of result) {
+        if (!entry.appName) continue;
+        const pidKey = `${entry.appName}-${entry.pid}`;
+        if (seen.has(pidKey)) continue;
+        seen.add(pidKey);
+        const key = `${entry.appName.toLowerCase()}-${entry.pid}`;
+        instances.push({
+          key,
+          platform: entry.appName,
+          pid: entry.pid,
+          hwnd: entry.hwnd,
+          version: entry.version,
+          moniker: entry.name
+        });
+      }
+      log(`ROT \u53D1\u73B0: ${instances.length} \u4E2A CAD \u5B9E\u4F8B (${instances.map((i) => `${i.platform}#${i.pid}`).join(", ")})`);
+      resolve(instances);
+    });
+  });
+}
+var __filename, projectRoot, _rotHelper;
+var init_cad_rot_helper = __esm({
+  "src/cad-rot-helper.js"() {
+    init_logger();
+    __filename = fileURLToPath6(import.meta.url);
+    projectRoot = path14.dirname(path14.dirname(__filename));
+    _rotHelper = null;
+  }
+});
+
 // src/cad-pool.js
 var POOL_STRATEGIES, CadConnectionPool, pool;
 var init_cad_pool = __esm({
@@ -14562,6 +15070,8 @@ var init_cad_pool = __esm({
     init_cad();
     init_logger();
     init_config();
+    init_cad_rot_helper();
+    init_resource_cache();
     POOL_STRATEGIES = {
       ROUND_ROBIN: "round-robin",
       LEAST_BUSY: "least-busy",
@@ -14570,9 +15080,8 @@ var init_cad_pool = __esm({
     CadConnectionPool = class {
       _instances = /* @__PURE__ */ new Map();
       _maxPoolSize = 3;
-      _activeKey = "default";
+      _activeKey = null;
       _strategy = POOL_STRATEGIES.MANUAL;
-      _rrIndex = 0;
       _reconnectTimers = /* @__PURE__ */ new Map();
       _reconnectCounts = /* @__PURE__ */ new Map();
       _maxReconnectAttempts = 10;
@@ -14582,30 +15091,8 @@ var init_cad_pool = __esm({
         this._maxPoolSize = config_default.maxPoolSize || 3;
       }
       getConnection(key) {
-        this._ensureDefault();
         return this._instances.get(key)?.connection || null;
       }
-      /**
-       * Ensure the default entry exists. Created lazily to avoid
-       * calling getActiveConnection() at module import time (which
-       * breaks tests that mock cad.js).
-       */
-      _ensureDefault() {
-        if (!this._instances.has("default")) {
-          const defaultConn = getActiveConnection();
-          this._instances.set("default", {
-            key: "default",
-            connection: defaultConn,
-            platform: null,
-            version: null,
-            connected: false,
-            lastPing: Date.now(),
-            createdAt: Date.now(),
-            label: "\u9ED8\u8BA4 CAD",
-            autoReconnect: true
-          });
-        }
-      }
       /**
        * Connect to a CAD instance and add it to the pool.
        * @param {string} key - Instance identifier
@@ -14613,14 +15100,30 @@ var init_cad_pool = __esm({
        * @param {object} [options] - Additional options
        * @param {string} [options.label] - Human-readable label
        * @param {boolean} [options.autoReconnect=true] - Auto-reconnect on failure
+       * @param {number} [options.pid] - Target process PID (find via ROT)
        * @param {boolean} [options.makeActive=true] - Set as active after connecting
        */
       async connect(key = "default", platform = null, options = {}) {
-        this._ensureDefault();
-        const { label, autoReconnect = true, makeActive = true } = options || {};
+        const { label, autoReconnect = true, makeActive = true, pid } = options || {};
         if (this._instances.size >= this._maxPoolSize && !this._instances.has(key)) {
           throw new Error(`\u8FDE\u63A5\u6C60\u5DF2\u6EE1 (${this._maxPoolSize})\uFF0C\u65E0\u6CD5\u6DFB\u52A0\u65B0\u5B9E\u4F8B "${key}"`);
         }
+        if (pid != null) {
+          const instances = await discoverCadInstances();
+          const match = instances.find((i) => i.pid === pid);
+          if (!match) {
+            error(`\u8FDE\u63A5\u6C60: \u672A\u627E\u5230 PID ${pid} \u7684 CAD \u5B9E\u4F8B`);
+            return false;
+          }
+          platform = platform || match.platform;
+          if (key === "default" || key === pid.toString()) {
+            key = match.key;
+          }
+          if (match.moniker) {
+            if (!options) options = {};
+            options._moniker = match.moniker;
+          }
+        }
         let entry = this._instances.get(key);
         if (entry && entry.connected) {
           return true;
@@ -14642,7 +15145,9 @@ var init_cad_pool = __esm({
         }
         const conn = entry.connection;
         try {
-          const ok = await conn.connect(platform);
+          const moniker = options._moniker || entry.moniker;
+          const connectOpts = moniker ? { moniker, key } : {};
+          const ok = await conn.connect(platform, connectOpts);
           if (ok) {
             entry.connected = true;
             entry.platform = conn.getPlatform();
@@ -14666,17 +15171,6 @@ var init_cad_pool = __esm({
        * Disconnect and remove an instance from the pool.
        */
       async disconnect(key) {
-        this._ensureDefault();
-        if (key === "default") {
-          const entry2 = this._instances.get("default");
-          if (entry2) {
-            await entry2.connection.disconnect();
-            entry2.connected = false;
-            entry2.platform = null;
-            entry2.version = null;
-          }
-          return true;
-        }
         const entry = this._instances.get(key);
         if (!entry) return false;
         this._clearReconnectTimer(key);
@@ -14687,7 +15181,12 @@ var init_cad_pool = __esm({
         }
         this._instances.delete(key);
         if (this._activeKey === key) {
-          this.setActive("default");
+          const remaining = Array.from(this._instances.keys());
+          if (remaining.length > 0) {
+            this.setActive(remaining[0]);
+          } else {
+            this._activeKey = null;
+          }
         }
         log(`\u8FDE\u63A5\u6C60: \u5B9E\u4F8B "${key}" \u5DF2\u65AD\u5F00\u5E76\u79FB\u9664`);
         return true;
@@ -14696,7 +15195,6 @@ var init_cad_pool = __esm({
        * Set the active instance. All cad.* calls will be routed here.
        */
       setActive(key) {
-        this._ensureDefault();
         const entry = this._instances.get(key);
         if (!entry) {
           error(`\u8FDE\u63A5\u6C60: \u5B9E\u4F8B "${key}" \u4E0D\u5B58\u5728`);
@@ -14704,47 +15202,88 @@ var init_cad_pool = __esm({
         }
         this._activeKey = key;
         setActiveConnection(entry.connection);
+        setInstanceKey(key);
         cad.connected = entry.connected;
         log(`\u8FDE\u63A5\u6C60: \u5DF2\u5207\u6362\u5230\u5B9E\u4F8B "${key}"`);
+        if (this._onInstanceSwitch) {
+          try {
+            this._onInstanceSwitch(key, entry);
+          } catch (e) {
+            error(`\u5207\u6362\u56DE\u8C03\u7528\u9519\u8BEF: ${e.message}`);
+          }
+        }
         return true;
       }
+      /**
+       * Register a callback invoked after every instance switch.
+       * @param {function} fn - (key, entry) => void
+       */
+      onInstanceSwitch(fn) {
+        this._onInstanceSwitch = fn;
+      }
       /**
        * Discover and add all running CAD instances.
-       * Tries each platform to find running CAD processes.
+       * Uses ROT enumeration to find all instances (including multiple of the same platform).
+       * Falls back to GetActiveObject per platform when ROT is unavailable.
        */
       async discover() {
-        this._ensureDefault();
-        const platforms = ["AutoCAD", "ZWCAD", "GStarCAD", "BricsCAD"];
-        let foundCount = 0;
-        for (const platform of platforms) {
-          const key = platform.toLowerCase();
+        const resultEntries = [];
+        const rotInstances = await discoverCadInstances();
+        const rotHadResults = rotInstances.length > 0;
+        for (const inst of rotInstances) {
+          const key = inst.key;
           if (this._instances.has(key) && this._instances.get(key).connected) {
-            foundCount++;
+            resultEntries.push(this._instances.get(key));
             continue;
           }
-          try {
-            const tempConn = createCadConnection();
-            const ok = await tempConn.connect(platform);
-            if (ok) {
-              const label = `${platform} ${tempConn.getVersion() || ""}`.trim();
-              this._instances.set(key, {
-                key,
-                connection: tempConn,
-                platform: tempConn.getPlatform(),
-                version: tempConn.getVersion(),
-                connected: true,
-                lastPing: Date.now(),
-                createdAt: Date.now(),
-                label,
-                autoReconnect: true
-              });
-              foundCount++;
-              log(`\u8FDE\u63A5\u6C60: \u53D1\u73B0 ${label}`);
+          this._instances.set(key, {
+            key,
+            connection: null,
+            platform: inst.platform,
+            pid: inst.pid,
+            version: inst.version,
+            moniker: inst.moniker,
+            connected: false,
+            lastPing: Date.now(),
+            createdAt: Date.now(),
+            label: `${inst.platform} #${inst.pid} ${inst.version || ""}`.trim(),
+            autoReconnect: false
+          });
+          log(`\u8FDE\u63A5\u6C60: \u53D1\u73B0 ${inst.platform} \u5B9E\u4F8B PID=${inst.pid}`);
+          resultEntries.push(this._instances.get(key));
+        }
+        if (!rotHadResults) {
+          const connectWithTimeout = (conn, platform, ms = 4e3) => Promise.race([
+            conn.connect(platform),
+            new Promise((_, reject) => setTimeout(() => reject(new Error("timeout")), ms))
+          ]);
+          for (const platform of ["AutoCAD", "ZWCAD", "GStarCAD", "BricsCAD"]) {
+            const key = platform.toLowerCase();
+            if (this._instances.has(key) && this._instances.get(key).connected) continue;
+            try {
+              const tempConn = createCadConnection();
+              const ok = await connectWithTimeout(tempConn, platform);
+              if (ok) {
+                const label = `${platform} ${tempConn.getVersion() || ""}`.trim();
+                this._instances.set(key, {
+                  key,
+                  connection: tempConn,
+                  platform: tempConn.getPlatform(),
+                  version: tempConn.getVersion(),
+                  connected: true,
+                  lastPing: Date.now(),
+                  createdAt: Date.now(),
+                  label,
+                  autoReconnect: true
+                });
+                log(`\u8FDE\u63A5\u6C60: \u53D1\u73B0 ${label}`);
+                resultEntries.push(this._instances.get(key));
+              }
+            } catch (e) {
             }
-          } catch (e) {
           }
         }
-        return Array.from(this._instances.values()).map((e) => ({
+        return resultEntries.map((e) => ({
           key: e.key,
           connected: e.connected,
           platform: e.platform,
@@ -14757,7 +15296,6 @@ var init_cad_pool = __esm({
        * Health check for all instances.
        */
       async healthCheck() {
-        this._ensureDefault();
         const results = [];
         for (const [key, entry] of this._instances) {
           try {
@@ -14803,14 +15341,21 @@ var init_cad_pool = __esm({
        * Get the active instance.
        */
       getActive() {
-        this._ensureDefault();
         return this._instances.get(this._activeKey) || null;
       }
       /**
        * Get stats for all instances.
        */
       getStats() {
-        this._ensureDefault();
+        if (this._instances.size === 0) {
+          return {
+            total: 0,
+            maxPoolSize: this._maxPoolSize,
+            active: null,
+            strategy: this._strategy,
+            instances: []
+          };
+        }
         return {
           total: this._instances.size,
           maxPoolSize: this._maxPoolSize,
@@ -14822,7 +15367,7 @@ var init_cad_pool = __esm({
             platform: i.platform,
             version: i.version,
             label: i.label,
-            queueSize: i.connection._getQueueSize ? i.connection._getQueueSize() : 0,
+            queueSize: i.connection?._getQueueSize ? i.connection._getQueueSize() : 0,
             lastPingAgo: Date.now() - (i.lastPing || 0),
             uptime: i.connected ? Math.round((Date.now() - i.createdAt) / 1e3) : 0
           }))
@@ -14832,7 +15377,7 @@ var init_cad_pool = __esm({
        * List all instances.
        */
       listInstances() {
-        this._ensureDefault();
+        if (this._instances.size === 0) return [];
         return Array.from(this._instances.values()).map((i) => ({
           key: i.key,
           connected: i.connected,
@@ -14844,7 +15389,7 @@ var init_cad_pool = __esm({
         }));
       }
       /**
-       * Disconnect all instances.
+       * Disconnect all instances in parallel.
        */
       async disconnectAll() {
         this.stopHealthCheck();
@@ -14853,27 +15398,16 @@ var init_cad_pool = __esm({
         }
         this._reconnectTimers.clear();
         this._reconnectCounts.clear();
-        for (const [key, entry] of this._instances) {
+        const entries = Array.from(this._instances.entries());
+        this._instances.clear();
+        this._activeKey = null;
+        await Promise.allSettled(entries.map(async ([key, entry]) => {
           try {
             await entry.connection.disconnect();
           } catch (e) {
             error(`\u8FDE\u63A5\u6C60: \u65AD\u5F00 "${key}" \u51FA\u9519: ${e.message}`);
           }
-        }
-        this._instances.clear();
-        this._activeKey = "default";
-        const defaultConn = getActiveConnection();
-        this._instances.set("default", {
-          key: "default",
-          connection: defaultConn,
-          platform: null,
-          version: null,
-          connected: false,
-          lastPing: Date.now(),
-          createdAt: Date.now(),
-          label: "\u9ED8\u8BA4 CAD",
-          autoReconnect: true
-        });
+        }));
         log("\u8FDE\u63A5\u6C60: \u6240\u6709\u5B9E\u4F8B\u5DF2\u65AD\u5F00");
       }
       // --- Internal ---
@@ -14933,7 +15467,7 @@ var init_cad_pool = __esm({
 });
 
 // src/trigger-engine.js
-function escapeLispStr(v) {
+function escapeLispStr2(v) {
   if (typeof v !== "string") return v;
   return v.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 }
@@ -14941,10 +15475,10 @@ function buildFilterExpr(filter) {
   if (!filter || typeof filter !== "object") return "nil";
   const parts = [];
   if (filter.type) {
-    parts.push(`(cons 0 "${escapeLispStr(filter.type)}")`);
+    parts.push(`(cons 0 "${escapeLispStr2(filter.type)}")`);
   }
   if (filter.layer) {
-    parts.push(`(cons 8 "${escapeLispStr(filter.layer)}")`);
+    parts.push(`(cons 8 "${escapeLispStr2(filter.layer)}")`);
   }
   if (parts.length === 0) return "nil";
   return `(list ${parts.join(" ")})`;
@@ -14993,7 +15527,7 @@ async function evaluateWatch(watch) {
         return { matched, data: { count } };
       }
       case "layer_exists": {
-        const lName = escapeLispStr(watch.layerName || "");
+        const lName = escapeLispStr2(watch.layerName || "");
         result = await cad.sendCommandWithResult(
           `(progn (if (tblsearch "LAYER" "${lName}") (list 1) (list 0)))`
         );
@@ -15001,7 +15535,7 @@ async function evaluateWatch(watch) {
         return { matched: exists, data: { exists, layerName: watch.layerName } };
       }
       case "doc_name": {
-        const pattern = escapeLispStr(watch.pattern || "*");
+        const pattern = escapeLispStr2(watch.pattern || "*");
         result = await cad.sendCommandWithResult(
           `(progn (setq _dn (getvar "dwgname")) (setq _dm (if (wcmatch _dn "${pattern}") 1 0)) (list _dm _dn))`
         );
@@ -15011,14 +15545,14 @@ async function evaluateWatch(watch) {
         return { matched, data: { matched: Boolean(matched), name } };
       }
       case "doc_path": {
-        const pattern = escapeLispStr(watch.pattern || "*");
+        const pattern = escapeLispStr2(watch.pattern || "*");
         result = await cad.sendCommandWithResult(
           `(progn (setq _dp (getvar "dwgprefix")) (setq _dm (if (wcmatch _dp "${pattern}") 1 0)) (list _dm _dp))`
         );
         const arr = parseLispList2(result) || [];
         const matched = Number(arr[0]) !== 0;
-        const path20 = String(arr[1] || "");
-        return { matched, data: { matched: Boolean(matched), path: path20 } };
+        const path21 = String(arr[1] || "");
+        return { matched, data: { matched: Boolean(matched), path: path21 } };
       }
       case "entity_selected": {
         result = await cad.sendCommandWithResult(
@@ -15188,53 +15722,6 @@ function stripStringsAndComments(code) {
   const withoutStrings = code.replace(/"([^"\\]*(?:\\.[^"\\]*)*)"/g, "");
   return withoutStrings.replace(/;.*$/gm, "");
 }
-var THREAT_BLOCK, THREAT_WARN, THREAT_ALLOW, CVT, SECURITY_RULES, _cachedLevel;
-var init_lisp_security = __esm({
-  "src/lisp-security.js"() {
-    init_logger();
-    init_config();
-    THREAT_BLOCK = "block";
-    THREAT_WARN = "warn";
-    THREAT_ALLOW = "allow";
-    CVT = {
-      strict: THREAT_BLOCK,
-      standard: THREAT_WARN,
-      relaxed: THREAT_ALLOW
-    };
-    SECURITY_RULES = [
-      { re: /\bstartapp\s*[(\s]/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u4F7F\u7528 startapp \u51FD\u6570" },
-      { re: /\bvl-bt\b/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u4F7F\u7528 vl-bt \u51FD\u6570" },
-      { re: /\bvlax-import-type-library\b/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u5BFC\u5165\u7C7B\u578B\u5E93" },
-      { re: /\bdos_command_string\s*[(\s]/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u4F7F\u7528 dos_command_string" },
-      { re: /\beval\s*[(\s]/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u4F7F\u7528 eval \u51FD\u6570" },
-      { re: /\bcommand\s*["\s]*[_(]?\s*["']?\.?\s*_?(?:shell|quit|exit|close|open|new|recover|audit|purge|wblock|export)/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u4F7F\u7528\u5371\u9669 CAD \u547D\u4EE4" },
-      { re: /\bload\s*[(\s"]/i, baseSeverity: THREAT_BLOCK, msg: "load \u51FD\u6570\u53EF\u80FD\u52A0\u8F7D\u5916\u90E8\u4EE3\u7801" },
-      { re: /\b(?:read-line|read-char|write-line|write-char)\s*[(\s]/i, baseSeverity: THREAT_BLOCK, msg: "\u6587\u4EF6 I/O \u64CD\u4F5C\u53EF\u80FD\u5F71\u54CD\u7CFB\u7EDF" },
-      { re: /\bvl-file-copy\s*[(\s]/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u6587\u4EF6\u590D\u5236" },
-      { re: /\bvl-file-delete\s*[(\s]/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u6587\u4EF6\u5220\u9664" },
-      { re: /\bvl-file-rename\s*[(\s]/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u6587\u4EF6\u91CD\u547D\u540D" },
-      { re: /\bvl-registry-write[\s\)]/i, baseSeverity: THREAT_BLOCK, msg: "vl-registry-write \u4F1A\u4FEE\u6539\u6CE8\u518C\u8868" },
-      { re: /\bvl-exit-with-value\b/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u4F7F\u7528 vl-exit-with-value" },
-      { re: /\bvl-exit-with-error\b/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u4F7F\u7528 vl-exit-with-error" },
-      { re: /\bvlax-add-cmd\b/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u6CE8\u518C\u65B0\u547D\u4EE4" },
-      { re: /\bvla-Delete\b/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u76F4\u63A5\u5220\u9664 vla \u5BF9\u8C61" },
-      { re: /\bvla-Save\s*[(\s]/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u76F4\u63A5\u4FDD\u5B58\u6587\u6863" },
-      { re: /\bdirectory\s*[(\s]/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u4F7F\u7528 directory \u51FD\u6570" },
-      { re: /\bvla-deletefile\b/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u5220\u9664\u6587\u4EF6" },
-      { re: /\bvla-copyfile\b/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u590D\u5236\u6587\u4EF6" },
-      { re: /\bvla-movefile\b/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u79FB\u52A8\u6587\u4EF6" }
-    ];
-    _cachedLevel = null;
-    try {
-      onConfigChange(() => {
-        _cachedLevel = null;
-      });
-    } catch (_) {
-    }
-  }
-});
-
-// src/lisp-sandbox.js
 function getSessionAllowlist(sessionId) {
   if (!sessionAllowlist.has(sessionId)) {
     sessionAllowlist.set(sessionId, /* @__PURE__ */ new Set());
@@ -15278,12 +15765,49 @@ function validateLispCode(code, sessionId = null) {
     summary: blocked ? `\u5B89\u5168\u9650\u5236: ${results.filter((r) => r.blocked).map((r) => r.message).join("; ")}` : "\u901A\u8FC7"
   };
 }
-var RULES2, sessionAllowlist;
-var init_lisp_sandbox = __esm({
-  "src/lisp-sandbox.js"() {
+var THREAT_BLOCK, THREAT_WARN, THREAT_ALLOW, CVT, SECURITY_RULES, _cachedLevel, RULES2, sessionAllowlist;
+var init_lisp_security = __esm({
+  "src/lisp-security.js"() {
     init_logger();
     init_config();
-    init_lisp_security();
+    THREAT_BLOCK = "block";
+    THREAT_WARN = "warn";
+    THREAT_ALLOW = "allow";
+    CVT = {
+      strict: THREAT_BLOCK,
+      standard: THREAT_WARN,
+      relaxed: THREAT_ALLOW
+    };
+    SECURITY_RULES = [
+      { re: /\bstartapp\s*[(\s]/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u4F7F\u7528 startapp \u51FD\u6570" },
+      { re: /\bvl-bt\b/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u4F7F\u7528 vl-bt \u51FD\u6570" },
+      { re: /\bvlax-import-type-library\b/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u5BFC\u5165\u7C7B\u578B\u5E93" },
+      { re: /\bdos_command_string\s*[(\s]/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u4F7F\u7528 dos_command_string" },
+      { re: /\beval\s*[(\s]/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u4F7F\u7528 eval \u51FD\u6570" },
+      { re: /\bcommand\s*["\s]*[_(]?\s*["']?\.?\s*_?(?:shell|quit|exit|close|open|new|recover|audit|purge|wblock|export)/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u4F7F\u7528\u5371\u9669 CAD \u547D\u4EE4" },
+      { re: /\bload\s*[(\s"]/i, baseSeverity: THREAT_BLOCK, msg: "load \u51FD\u6570\u53EF\u80FD\u52A0\u8F7D\u5916\u90E8\u4EE3\u7801" },
+      { re: /\b(?:read-line|read-char|write-line|write-char)\s*[(\s]/i, baseSeverity: THREAT_BLOCK, msg: "\u6587\u4EF6 I/O \u64CD\u4F5C\u53EF\u80FD\u5F71\u54CD\u7CFB\u7EDF" },
+      { re: /\bvl-file-copy\s*[(\s]/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u6587\u4EF6\u590D\u5236" },
+      { re: /\bvl-file-delete\s*[(\s]/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u6587\u4EF6\u5220\u9664" },
+      { re: /\bvl-file-rename\s*[(\s]/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u6587\u4EF6\u91CD\u547D\u540D" },
+      { re: /\bvl-registry-write[\s\)]/i, baseSeverity: THREAT_BLOCK, msg: "vl-registry-write \u4F1A\u4FEE\u6539\u6CE8\u518C\u8868" },
+      { re: /\bvl-exit-with-value\b/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u4F7F\u7528 vl-exit-with-value" },
+      { re: /\bvl-exit-with-error\b/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u4F7F\u7528 vl-exit-with-error" },
+      { re: /\bvlax-add-cmd\b/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u6CE8\u518C\u65B0\u547D\u4EE4" },
+      { re: /\bvla-Delete\b/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u76F4\u63A5\u5220\u9664 vla \u5BF9\u8C61" },
+      { re: /\bvla-Save\s*[(\s]/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u76F4\u63A5\u4FDD\u5B58\u6587\u6863" },
+      { re: /\bdirectory\s*[(\s]/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u4F7F\u7528 directory \u51FD\u6570" },
+      { re: /\bvla-deletefile\b/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u5220\u9664\u6587\u4EF6" },
+      { re: /\bvla-copyfile\b/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u590D\u5236\u6587\u4EF6" },
+      { re: /\bvla-movefile\b/i, baseSeverity: THREAT_BLOCK, msg: "\u7981\u6B62\u79FB\u52A8\u6587\u4EF6" }
+    ];
+    _cachedLevel = null;
+    try {
+      onConfigChange(() => {
+        _cachedLevel = null;
+      });
+    } catch (_) {
+    }
     RULES2 = SECURITY_RULES;
     sessionAllowlist = /* @__PURE__ */ new Map();
   }
@@ -15404,13 +15928,13 @@ ${analysis.errors.map((e) => `  L${e.line}: [${e.rule}] ${e.message}`).join("\n"
 });
 
 // src/webhook-engine.js
-import fs9 from "fs";
-import path13 from "path";
-import os7 from "os";
+import fs10 from "fs";
+import path15 from "path";
+import os8 from "os";
 function loadWebhooks() {
   try {
-    if (fs9.existsSync(WEBHOOKS_FILE)) {
-      webhooks = JSON.parse(fs9.readFileSync(WEBHOOKS_FILE, "utf-8"));
+    if (fs10.existsSync(WEBHOOKS_FILE)) {
+      webhooks = JSON.parse(fs10.readFileSync(WEBHOOKS_FILE, "utf-8"));
     }
   } catch (e) {
     error(`Webhook load error: ${e.message}`);
@@ -15418,8 +15942,8 @@ function loadWebhooks() {
 }
 function saveWebhooks() {
   try {
-    ensureDir(path13.dirname(WEBHOOKS_FILE));
-    fs9.writeFileSync(WEBHOOKS_FILE, JSON.stringify(webhooks, null, 2), "utf-8");
+    ensureDir(path15.dirname(WEBHOOKS_FILE));
+    fs10.writeFileSync(WEBHOOKS_FILE, JSON.stringify(webhooks, null, 2), "utf-8");
   } catch (e) {
     error(`Webhook save error: ${e.message}`);
   }
@@ -15476,10 +16000,10 @@ function listWebhooks() {
 }
 function getWebhookLog(id) {
   const sanitized = String(id).replace(/[^a-zA-Z0-9_-]/g, "_");
-  const logPath = path13.join(os7.homedir(), ".atlisp", `webhook-${sanitized}.log`);
+  const logPath = path15.join(os8.homedir(), ".atlisp", `webhook-${sanitized}.log`);
   try {
-    if (!fs9.existsSync(logPath)) return [];
-    return fs9.readFileSync(logPath, "utf-8").split("\n").filter(Boolean).map((l) => JSON.parse(l));
+    if (!fs10.existsSync(logPath)) return [];
+    return fs10.readFileSync(logPath, "utf-8").split("\n").filter(Boolean).map((l) => JSON.parse(l));
   } catch (e) {
     error(`Webhook log read error [${sanitized}]: ${e.message}`);
     return [];
@@ -15490,30 +16014,30 @@ var init_webhook_engine = __esm({
   "src/webhook-engine.js"() {
     init_logger();
     init_handler_utils();
-    WEBHOOKS_FILE = path13.join(os7.homedir(), ".atlisp", "webhooks.json");
+    WEBHOOKS_FILE = path15.join(os8.homedir(), ".atlisp", "webhooks.json");
     webhooks = [];
     loadWebhooks();
   }
 });
 
 // src/audit-log.js
-import fs10 from "fs";
-import path14 from "path";
-import os8 from "os";
+import fs11 from "fs";
+import path16 from "path";
+import os9 from "os";
 import zlib from "zlib";
 function rotateIfNeeded() {
   try {
-    if (fs10.existsSync(AUDIT_FILE) && fs10.statSync(AUDIT_FILE).size > MAX_LOG_SIZE2) {
+    if (fs11.existsSync(AUDIT_FILE) && fs11.statSync(AUDIT_FILE).size > MAX_LOG_SIZE2) {
       const rotated = AUDIT_FILE.replace(".log", `.${Date.now()}.log`);
-      fs10.renameSync(AUDIT_FILE, rotated);
+      fs11.renameSync(AUDIT_FILE, rotated);
       try {
-        const compressed = zlib.gzipSync(fs10.readFileSync(rotated));
-        fs10.writeFileSync(rotated + ".gz", compressed);
-        fs10.unlinkSync(rotated);
+        const compressed = zlib.gzipSync(fs11.readFileSync(rotated));
+        fs11.writeFileSync(rotated + ".gz", compressed);
+        fs11.unlinkSync(rotated);
       } catch (e) {
         error(`Audit log compression failed, keeping raw file: ${e.message}`);
         try {
-          fs10.unlinkSync(rotated + ".gz");
+          fs11.unlinkSync(rotated + ".gz");
         } catch {
         }
       }
@@ -15537,15 +16061,15 @@ function writeAuditEntry(entry) {
       user: entry.user || "",
       role: entry.role || ""
     }) + "\n";
-    fs10.appendFileSync(AUDIT_FILE, line, "utf-8");
+    fs11.appendFileSync(AUDIT_FILE, line, "utf-8");
   } catch (e) {
     error(`Audit log write error: ${e.message}`);
   }
 }
 function queryAuditLog(filters = {}) {
   try {
-    if (!fs10.existsSync(AUDIT_FILE)) return { total: 0, offset: 0, count: 0, entries: [] };
-    const content = fs10.readFileSync(AUDIT_FILE, "utf-8");
+    if (!fs11.existsSync(AUDIT_FILE)) return { total: 0, offset: 0, count: 0, entries: [] };
+    const content = fs11.readFileSync(AUDIT_FILE, "utf-8");
     const lines = content.trim().split("\n").filter(Boolean);
     let entries = lines.map((l) => {
       try {
@@ -15577,8 +16101,8 @@ function queryAuditLog(filters = {}) {
 }
 function getAuditStats() {
   try {
-    if (!fs10.existsSync(AUDIT_FILE)) return { totalEntries: 0, tools: {}, errors: 0 };
-    const content = fs10.readFileSync(AUDIT_FILE, "utf-8");
+    if (!fs11.existsSync(AUDIT_FILE)) return { totalEntries: 0, tools: {}, errors: 0 };
+    const content = fs11.readFileSync(AUDIT_FILE, "utf-8");
     const lines = content.trim().split("\n").filter(Boolean);
     const toolCounts = {};
     let errors = 0;
@@ -15594,7 +16118,7 @@ function getAuditStats() {
       totalEntries: lines.length,
       tools: toolCounts,
       errors,
-      fileSize: fs10.existsSync(AUDIT_FILE) ? fs10.statSync(AUDIT_FILE).size : 0,
+      fileSize: fs11.existsSync(AUDIT_FILE) ? fs11.statSync(AUDIT_FILE).size : 0,
       filePath: AUDIT_FILE
     };
   } catch (e) {
@@ -15606,8 +16130,8 @@ var init_audit_log = __esm({
   "src/audit-log.js"() {
     init_logger();
     init_handler_utils();
-    AUDIT_DIR = path14.join(os8.homedir(), "@lisp", "logs");
-    AUDIT_FILE = path14.join(AUDIT_DIR, "audit.log");
+    AUDIT_DIR = path16.join(os9.homedir(), "@lisp", "logs");
+    AUDIT_FILE = path16.join(AUDIT_DIR, "audit.log");
     MAX_LOG_SIZE2 = 10 * 1024 * 1024;
     MAX_LOG_AGE = 90 * 24 * 60 * 60 * 1e3;
   }
@@ -15641,14 +16165,17 @@ var init_agent_context = __esm({
 });
 
 // src/tool-validators.js
-function validateProps(args, props, required, path20 = "") {
+function validationError(msg) {
+  return new MCPError(ERROR_CODES.INVALID_ARGS, msg);
+}
+function validateProps(args, props, required, path21 = "") {
   for (const [key, prop] of Object.entries(props)) {
-    const fullKey = path20 ? `${path20}.${key}` : key;
+    const fullKey = path21 ? `${path21}.${key}` : key;
     const isOptional = !required.includes(key);
     const val = args[key];
     if (val === void 0 || val === null) {
       if (isOptional) continue;
-      throw new Error(`Missing required argument: ${fullKey}`);
+      throw validationError(`Missing required argument: ${fullKey}`);
     }
     if (prop.type === "object" && prop.properties && typeof val === "object" && !Array.isArray(val)) {
       const subRequired = prop.required || [];
@@ -15663,46 +16190,46 @@ function validateProps(args, props, required, path20 = "") {
     const actualType = typeof val;
     const expectedType = prop.type || "string";
     if (expectedType === "string" && actualType !== "string" && actualType !== "number") {
-      throw new Error(`Invalid type for argument ${fullKey}: expected string, got ${actualType}`);
+      throw validationError(`Invalid type for argument ${fullKey}: expected string, got ${actualType}`);
     }
     if ((expectedType === "object" || expectedType === "array") && (actualType !== "object" || val === null)) {
-      throw new Error(`Invalid type for argument ${fullKey}: expected ${expectedType}, got ${actualType}`);
+      throw validationError(`Invalid type for argument ${fullKey}: expected ${expectedType}, got ${actualType}`);
     }
     if (expectedType === "array" && !Array.isArray(val)) {
-      throw new Error(`Invalid type for argument ${fullKey}: expected array, got ${actualType}`);
+      throw validationError(`Invalid type for argument ${fullKey}: expected array, got ${actualType}`);
     }
     if (expectedType === "object" && Array.isArray(val)) {
-      throw new Error(`Invalid type for argument ${fullKey}: expected object, got array`);
+      throw validationError(`Invalid type for argument ${fullKey}: expected object, got array`);
     }
     if ((expectedType === "number" || expectedType === "integer") && actualType !== "number") {
       if (expectedType === "integer" && !Number.isInteger(val)) {
-        throw new Error(`Invalid type for argument ${fullKey}: expected integer, got ${actualType}`);
+        throw validationError(`Invalid type for argument ${fullKey}: expected integer, got ${actualType}`);
       }
       if (expectedType === "number") {
-        throw new Error(`Invalid type for argument ${fullKey}: expected number, got ${actualType}`);
+        throw validationError(`Invalid type for argument ${fullKey}: expected number, got ${actualType}`);
       }
     }
     if (expectedType === "boolean" && actualType !== "boolean") {
-      throw new Error(`Invalid type for argument ${fullKey}: expected boolean, got ${actualType}`);
+      throw validationError(`Invalid type for argument ${fullKey}: expected boolean, got ${actualType}`);
     }
     if (prop.enum && !prop.enum.includes(val)) {
-      throw new Error(`Invalid value for argument ${fullKey}: must be one of ${prop.enum.join(", ")}`);
+      throw validationError(`Invalid value for argument ${fullKey}: must be one of ${prop.enum.join(", ")}`);
     }
     if (expectedType === "string" && typeof prop.maxLength === "number" && String(val).length > prop.maxLength) {
-      throw new Error(`Argument ${fullKey} exceeds max length of ${prop.maxLength}`);
+      throw validationError(`Argument ${fullKey} exceeds max length of ${prop.maxLength}`);
     }
     if ((expectedType === "number" || expectedType === "integer") && prop.minimum != null && val < prop.minimum) {
-      throw new Error(`Argument ${fullKey} must be >= ${prop.minimum}`);
+      throw validationError(`Argument ${fullKey} must be >= ${prop.minimum}`);
     }
     if ((expectedType === "number" || expectedType === "integer") && prop.maximum != null && val > prop.maximum) {
-      throw new Error(`Argument ${fullKey} must be <= ${prop.maximum}`);
+      throw validationError(`Argument ${fullKey} must be <= ${prop.maximum}`);
     }
   }
 }
 function validateToolArgs(name, args) {
   const toolDef = toolsByName.get(name);
   if (!toolDef) {
-    throw new Error(`Unknown tool: ${name}`);
+    throw validationError(`Unknown tool: ${name}`);
   }
   const schema = toolDef.inputSchema;
   if (!schema || !schema.properties) return true;
@@ -15710,7 +16237,7 @@ function validateToolArgs(name, args) {
   const required = schema.required || [];
   for (const req of required) {
     if (!(req in (args || {}))) {
-      throw new Error(`Missing required argument: ${req}`);
+      throw validationError(`Missing required argument: ${req}`);
     }
   }
   validateProps(args || {}, props, required);
@@ -15719,6 +16246,7 @@ function validateToolArgs(name, args) {
 var init_tool_validators = __esm({
   "src/tool-validators.js"() {
     init_tools();
+    init_errors();
   }
 });
 
@@ -15829,7 +16357,7 @@ function registerTool(toolDef, handler) {
   }
   customTools.push(toolDef);
   customHandlers.set(toolDef.name, handler);
-  tools42.push(toolDef);
+  tools43.push(toolDef);
   return true;
 }
 function callCustomTool(name, args) {
@@ -15849,73 +16377,92 @@ var init_tool_registry = __esm({
 });
 
 // src/tool-executor.js
+function resolveConn(instance) {
+  if (instance) return pool.getConnection(instance) || resolveCadConnection();
+  return cad;
+}
+async function writeAuditSuccess(name, args, options) {
+  writeAuditEntry({
+    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    tool: name,
+    args: args || {},
+    sessionId: options.sessionId || "",
+    result: "success"
+  });
+}
+async function writeAuditError(name, args, options, error2) {
+  writeAuditEntry({
+    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    tool: name,
+    args: args || {},
+    sessionId: options.sessionId || "",
+    result: "error",
+    error: error2.message
+  });
+}
+async function beginUndo(instance) {
+  const conn = resolveConn(instance);
+  if (conn?.connected) {
+    try {
+      await conn.sendCommand('(command "_.UNDO" "_BEGIN")');
+      return true;
+    } catch (e) {
+      error(`UNDO_BEGIN failed: ${e.message}`);
+    }
+  }
+  return false;
+}
+async function endUndo(instance) {
+  const conn = resolveConn(instance);
+  try {
+    await conn.sendCommand('(command "_.UNDO" "_END")');
+  } catch (_) {
+  }
+}
 async function handleToolCall(name, args, options = {}) {
   const handler = TOOL_HANDLERS[name];
   if (!handler) {
     const customResult = callCustomTool(name, args);
     if (customResult !== null) return customResult;
-    return { content: [{ type: "text", text: `\u672A\u77E5\u5DE5\u5177: ${name}` }], isError: true };
+    return mcpErrorResponse(new MCPError(ERROR_CODES.HANDLER_NOT_FOUND, `\u672A\u77E5\u5DE5\u5177: ${name}`));
   }
   const isReadOnly = READ_ONLY_TOOLS.has(name);
   const notifyProgress = options.notifyProgress || null;
   const rateCheck = checkToolRateLimit(name, isReadOnly, options.sessionId);
   if (!rateCheck.allowed) {
-    return { content: [{ type: "text", text: `\u5DE5\u5177\u8C03\u7528\u9891\u7387\u8D85\u9650 (${isReadOnly ? "\u8BFB" : "\u5199"}\u64CD\u4F5C)\uFF0C\u8BF7 ${rateCheck.retryAfter} \u79D2\u540E\u91CD\u8BD5` }], isError: true };
+    return mcpErrorResponse(new MCPError(ERROR_CODES.RATE_LIMITED, `\u5DE5\u5177\u8C03\u7528\u9891\u7387\u8D85\u9650\uFF0C\u8BF7 ${rateCheck.retryAfter} \u79D2\u540E\u91CD\u8BD5`));
   }
   return progressContext.run({ notifyProgress }, async () => {
     setNotifyProgress(notifyProgress);
+    const instance = args?.instance || null;
     let undoBegun = false;
     try {
       validateToolArgs(name, args || {});
-      const instance = args?.instance || null;
       if (instance) {
         const ctx = mcpContext.getStore();
         ctx._toolInstance = instance;
       }
       if (!isReadOnly) {
-        const targetConn = instance ? pool.getConnection(instance) : cad;
-        if (targetConn?.connected) {
-          try {
-            await targetConn.sendCommand('(command "_.UNDO" "_BEGIN")');
-            undoBegun = true;
-          } catch (e) {
-            error(`UNDO_BEGIN failed: ${e.message}`);
-          }
-        }
+        undoBegun = await beginUndo(instance);
       }
       const np = getNotifyProgress();
       if (np) np(1, 1, `\u6B63\u5728\u6267\u884C ${name}...`);
       const result = await handler(args || {});
       if (np) np(1, 1, `${name} \u6267\u884C\u5B8C\u6210`);
-      writeAuditEntry({
-        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-        tool: name,
-        args: args || {},
-        sessionId: options.sessionId || "",
-        result: result?.isError ? "error" : "success"
-      });
+      await writeAuditSuccess(name, args, options);
       notifyResourceChanges(name);
       return result;
     } catch (e) {
       error(`Tool call error [${name}]: ${e.message}`, { tool: name, args });
-      writeAuditEntry({
-        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-        tool: name,
-        args: args || {},
-        sessionId: options.sessionId || "",
-        result: "error",
-        error: e.message
-      });
-      return { content: [{ type: "text", text: `\u5DE5\u5177\u6267\u884C\u9519\u8BEF: ${e.message}` }], isError: true };
+      await writeAuditError(name, args, options, e);
+      if (e.message.startsWith("Missing required") || e.message.startsWith("Invalid type")) {
+        return mcpErrorResponse(new MCPError(ERROR_CODES.INVALID_ARGS, e.message));
+      }
+      return mcpErrorResponse(e);
     } finally {
       const ctx = mcpContext.getStore();
       if (ctx) ctx._toolInstance = null;
-      if (undoBegun) {
-        try {
-          await cad.sendCommand('(command "_.UNDO" "_END")');
-        } catch (_) {
-        }
-      }
+      if (undoBegun) await endUndo(instance);
     }
   });
 }
@@ -15932,14 +16479,12 @@ var init_tool_executor = __esm({
     init_cad();
     init_cad_pool();
     init_audit_log();
+    init_errors();
     init_tool_registry();
   }
 });
 
 // src/mcp-tools.js
-import fs11 from "fs";
-import path15 from "path";
-import os9 from "os";
 import { formatCode as formatCode2 } from "@atlisp/lint/dist/formatter.js";
 import { lintProject as lintProject2 } from "@atlisp/lint/dist/project.js";
 import { RULES as RULES3 } from "@atlisp/lint/dist/rules.js";
@@ -15956,7 +16501,6 @@ var TOOL_HANDLERS;
 var init_mcp_tools = __esm({
   "src/mcp-tools.js"() {
     init_handler_loader();
-    init_prompt_handlers();
     init_streaming();
     init_constants();
     init_cad();
@@ -15964,13 +16508,24 @@ var init_mcp_tools = __esm({
     init_tools();
     init_mcp_server_state();
     init_trigger_engine();
-    init_lisp_sandbox();
+    init_lisp_security();
     init_lint_analyzer();
     init_repl_engine();
     init_webhook_engine();
     init_audit_log();
     init_agent_context();
+    init_resource_handlers();
+    init_subscription_manager();
+    init_skill_handlers();
+    init_meta_handlers();
     init_tool_executor();
+    pool.onInstanceSwitch(() => {
+      for (const uri of CAD_RESOURCE_URIS) {
+        if (isSubscribed(uri)) {
+          notify2(uri, null);
+        }
+      }
+    });
     TOOL_HANDLERS = {
       // === CAD Connection ===
       connect_cad: lazy("connect_cad", (a) => a?.platform),
@@ -16007,14 +16562,8 @@ ${CAD_PLATFORMS.join("\n")}
         return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
       },
       // === Prompts ===
-      list_prompts: async () => {
-        const prompts = await listPrompts2();
-        return { content: [{ type: "text", text: JSON.stringify(prompts) }] };
-      },
-      get_prompt: async (a) => {
-        const prompt = await getPrompt2(a.name, a.args || {});
-        return { content: prompt.messages.map((m) => ({ type: "text", text: m.content.text || m.content })) };
-      },
+      list_prompts: list_prompts_handler,
+      get_prompt: get_prompt_handler,
       // === Entity Operations ===
       get_entity: lazy("get_entity", (a) => a?.handle),
       set_entity: lazy("set_entity", (a) => [a?.handle, a?.property, a?.value]),
@@ -16301,6 +16850,35 @@ ${CAD_PLATFORMS.join("\n")}
       draw_ray: lazy("draw_ray", (a) => [a.point, a.direction]),
       draw_leader: lazy("draw_leader", (a) => [a.points, a.annotation]),
       draw_table: lazy("draw_table", (a) => [a.insertionPoint, a.rows, a.columns, a.rowHeight, a.colWidth]),
+      // === Batch Concurrent ===
+      batch_concurrent_tasks: async (a) => {
+        if (!a.tasks || !Array.isArray(a.tasks) || a.tasks.length === 0) {
+          return { content: [{ type: "text", text: "\u9700\u8981 tasks \u6570\u7EC4" }], isError: true };
+        }
+        if (a.tasks.length > 50) {
+          return { content: [{ type: "text", text: "\u6700\u591A\u652F\u6301 50 \u4E2A\u5E76\u53D1\u4EFB\u52A1" }], isError: true };
+        }
+        const results = await Promise.allSettled(a.tasks.map(async (task, idx) => {
+          const handler = TOOL_HANDLERS[task.tool];
+          if (!handler) return { index: idx, tool: task.tool, instance: task.instance, ok: false, error: `\u672A\u77E5\u5DE5\u5177: ${task.tool}` };
+          const ctx = mcpContext.getStore();
+          const prevInstance = ctx?._toolInstance || null;
+          if (ctx && task.instance) ctx._toolInstance = task.instance;
+          try {
+            const result = await handler(task.args || {});
+            return { index: idx, tool: task.tool, instance: task.instance, ok: !result.isError, data: result.content?.[0]?.text || result };
+          } catch (e) {
+            return { index: idx, tool: task.tool, instance: task.instance, ok: false, error: e.message };
+          } finally {
+            if (ctx) ctx._toolInstance = prevInstance;
+          }
+        }));
+        const output = results.map((r, idx) => {
+          if (r.status === "fulfilled") return r.value;
+          return { index: idx, tool: a.tasks[idx].tool, instance: a.tasks[idx].instance, ok: false, error: r.reason?.message || "Unknown error" };
+        });
+        return { content: [{ type: "text", text: JSON.stringify(output, null, 2) }] };
+      },
       // === Batch Transaction ===
       batch_transaction: lazy("batch_transaction"),
       // === Watch / Trigger ===
@@ -16457,6 +17035,14 @@ ${CAD_PLATFORMS.join("\n")}
       },
       cad_pool_switch: (a) => {
         const ok = pool.setActive(a.key);
+        if (ok) {
+          clearCache();
+          for (const uri of CAD_RESOURCE_URIS) {
+            if (isSubscribed(uri)) {
+              notify2(uri, null);
+            }
+          }
+        }
         return { content: [{ type: "text", text: ok ? `\u5DF2\u5207\u6362\u5230\u5B9E\u4F8B ${a.key}` : `\u5B9E\u4F8B ${a.key} \u4E0D\u5B58\u5728` }] };
       },
       cad_pool_health: async () => {
@@ -16468,8 +17054,9 @@ ${CAD_PLATFORMS.join("\n")}
         return { content: [{ type: "text", text: JSON.stringify(stats, null, 2) }] };
       },
       cad_pool_connect: async (a) => {
-        const ok = await pool.connect(a.key, a.platform, { label: a.label, makeActive: a.makeActive !== false });
-        return { content: [{ type: "text", text: ok ? `\u5B9E\u4F8B "${a.key}" \u5DF2\u8FDE\u63A5` : `\u5B9E\u4F8B "${a.key}" \u8FDE\u63A5\u5931\u8D25` }] };
+        const ok = await pool.connect(a.key, a.platform, { label: a.label, pid: a.pid, makeActive: a.makeActive !== false });
+        const label = a.key || (a.pid != null ? `PID ${a.pid}` : "default");
+        return { content: [{ type: "text", text: ok ? `\u5B9E\u4F8B "${label}" \u5DF2\u8FDE\u63A5` : `\u5B9E\u4F8B "${label}" \u8FDE\u63A5\u5931\u8D25` }] };
       },
       cad_pool_disconnect: async (a) => {
         const ok = await pool.disconnect(a.key);
@@ -16519,261 +17106,15 @@ ${CAD_PLATFORMS.join("\n")}
         return { content: [{ type: "text", text: "\u4E0A\u4E0B\u6587\u5DF2\u6E05\u9664" }] };
       },
       // === Meta Tools ===
-      search_tools: async (a) => {
-        const q = (a.query || "").toLowerCase();
-        const results = tools42.filter((t) => t.name.toLowerCase().includes(q) || (t.description || "").toLowerCase().includes(q));
-        const text = results.length ? `\u627E\u5230 ${results.length} \u4E2A\u5DE5\u5177:
-${results.map((t) => `${t.name}: ${t.description}`).join("\n")}` : `\u672A\u627E\u5230\u5305\u542B "${a.query}" \u7684\u5DE5\u5177`;
-        return { content: [{ type: "text", text }] };
-      },
-      list_tools_by_category: async (a) => {
-        const categories = {};
-        for (const t of tools42) {
-          let cat = "\u5176\u4ED6";
-          const n = t.name;
-          if (/^(draw_|create_3d_|create_box|create_cone|create_cylinder|create_sphere|create_torus|create_wedge|extrude_|revolve_|boolean_|slice_solid|thicken_|offset_surface|create_loft_|create_region)/.test(n)) cat = "\u7ED8\u56FE\u4E0E3D";
-          else if (/^(move_|copy_|rotate_|scale_|mirror_|offset_|array_|batch_)/.test(n)) cat = "\u4FEE\u6539";
-          else if (/^(trim_|extend_|fillet|chamfer|break_|join_|stretch)/.test(n)) cat = "\u7F16\u8F91";
-          else if (/^(create_layer|delete_layer|set_layer|layer_)/.test(n)) cat = "\u56FE\u5C42";
-          else if (/^(create_block|insert_block|explode_block|get_block|set_block|batch_get_block|batch_set_block)/.test(n)) cat = "\u5757";
-          else if (/^(create_dim|list_dim|set_dim|create_hatch|set_hatch)/.test(n)) cat = "\u6807\u6CE8\u4E0E\u586B\u5145";
-          else if (/^(create_ucs|set_ucs|delete_ucs|list_ucs|get_current_ucs|create_layout|delete_layout|rename_layout|set_layout|list_layouts|get_current_layout)/.test(n)) cat = "\u5750\u6807\u7CFB\u4E0E\u5E03\u5C40";
-          else if (/^(create_viewport|set_viewport|lock_viewport|unlock_viewport|maximize_viewport)/.test(n)) cat = "\u89C6\u53E3";
-          else if (/^find_/.test(n)) cat = "\u7A7A\u95F4\u67E5\u8BE2";
-          else if (/^(select_|get_entity|set_entity|delete_entity|get_bounding_box)/.test(n)) cat = "\u9009\u62E9\u4E0E\u5C5E\u6027";
-          else if (/^(open_dwg|save_dwg|export_|import_|close_dwg|publish_)/.test(n)) cat = "\u6587\u4EF6";
-          else if (/^(plot_|save_pdf|batch_plot|publish_layouts)/.test(n)) cat = "\u6253\u5370";
-          else if (/^(get_xdata|set_xdata|delete_xdata|list_xdata|copxy_xdata|search_by_xdata|export_xdata|import_xdata)/.test(n)) cat = "\u6269\u5C55\u6570\u636E";
-          else if (/^(create_sheet|open_sheet|list_sheet|add_sheet|delete_sheet|publish_sheet|sheet_|reorder_sheet|create_subset|list_subset|set_sheet)/.test(n)) cat = "\u56FE\u7EB8\u96C6";
-          else if (/^(attach_|detach_|reload_|list_attached|get_pdf|create_dgn|create_dwf|import_dxf|import_dgn|export_dgn|create_hyper|remove_hyper|xref|bind_xref|clip_xref|path_xref)/.test(n)) cat = "\u53C2\u7167\u4E0E\u5E95\u56FE";
-          else if (/^(create_text|create_mleader|create_linetype|list_text|list_linetype|list_mleader|load_linetype|create_dimension_style|set_dimstyle|list_dimension_styles|set_mleader_style)/.test(n)) cat = "\u6837\u5F0F";
-          else if (/^(purge_|drawing_audit|drawing_recover|overkill)/.test(n)) cat = "\u6E05\u7406";
-          else if (/^(find_text|replace_text|set_text_|justify_|convert_text|explode_text)/.test(n)) cat = "\u6587\u5B57";
-          else if (/^(eval_lisp|connect_cad|get_cad|get_platform|get_system|at_command|new_document|bring_to_front|install_atlisp|init_atlisp|get_system_status)/.test(n)) cat = "\u7CFB\u7EDF";
-          else if (/^(list_packages|search_packages|install_package|get_function_usage|list_symbols|import_funlib)/.test(n)) cat = "\u5305\u4E0E\u51FD\u6570";
-          else if (/^(pipeline_|watch_|lisp_repl|webhook_|sandbox_|audit_|cad_pool_|external_|list_data|export_to|import_external)/.test(n)) cat = "\u9AD8\u7EA7";
-          else if (/^(list_prompts|get_prompt|search_tools|list_tools_by_category)/.test(n)) cat = "\u5143\u5DE5\u5177";
-          else if (/^(agent_)/.test(n)) cat = "Agent\u4E0A\u4E0B\u6587";
-          if (!categories[cat]) categories[cat] = [];
-          categories[cat].push(t.name);
-        }
-        if (a.category) {
-          const names = categories[a.category];
-          return { content: [{ type: "text", text: names ? `${a.category} (${names.length}):
-${names.join("\n")}` : `\u672A\u627E\u5230\u5206\u7C7B: ${a.category}` }] };
-        }
-        const lines = [];
-        for (const [cat, names] of Object.entries(categories)) {
-          lines.push(`## ${cat} (${names.length})`);
-        }
-        lines.push(`
-\u5171 ${Object.keys(categories).length} \u4E2A\u5206\u7C7B`);
-        return { content: [{ type: "text", text: lines.join("\n") }] };
-      },
+      search_tools,
+      list_tools_by_category,
+      get_tool_info,
       // === Skill Management ===
-      skill_search: async (a) => {
-        const registryUrl = process.env.SKILL_REGISTRY_URL || "https://raw.githubusercontent.com/atlisp/skill-registry/main/index.json";
-        const cachePath = path15.join(os9.homedir(), ".atlisp", "skill-registry-cache.json");
-        let cache = null;
-        try {
-          if (fs11.existsSync(cachePath)) cache = JSON.parse(fs11.readFileSync(cachePath, "utf-8"));
-        } catch {
-        }
-        let index = cache && Date.now() - cache.fetchedAt < 36e5 ? cache : null;
-        if (!index) {
-          try {
-            const resp = await fetch(registryUrl, { headers: { "User-Agent": "atlisp-mcp" } });
-            if (resp.ok) {
-              index = await resp.json();
-              index.fetchedAt = Date.now();
-              try {
-                fs11.writeFileSync(cachePath, JSON.stringify(index, null, 2), "utf-8");
-              } catch {
-              }
-            }
-          } catch {
-          }
-        }
-        if (!index || !index.skills) return { content: [{ type: "text", text: "\u65E0\u6CD5\u83B7\u53D6 skill \u6CE8\u518C\u8868\u7D22\u5F15" }], isError: true };
-        const q = (a.query || "").toLowerCase();
-        const results = index.skills.filter(
-          (s) => s.name.toLowerCase().includes(q) || (s.description || "").toLowerCase().includes(q) || (s.tags || []).some((t) => t.toLowerCase().includes(q))
-        );
-        if (!results.length) return { content: [{ type: "text", text: `\u672A\u627E\u5230\u5339\u914D "${a.query}" \u7684 skill` }] };
-        const lines = [`\u627E\u5230 ${results.length} \u4E2A skill:
-`];
-        for (const s of results) {
-          lines.push(`**${s.name}**`);
-          if (s.description) lines.push(`  \u63CF\u8FF0: ${s.description}`);
-          if (s.tags?.length) lines.push(`  \u6807\u7B7E: ${s.tags.join(", ")}`);
-          if (s.version) lines.push(`  \u7248\u672C: ${s.version}`);
-          lines.push("");
-        }
-        return { content: [{ type: "text", text: lines.join("\n") }] };
-      },
-      skill_install: async (a) => {
-        if (!a.name) return { content: [{ type: "text", text: "\u9700\u8981 skill \u540D\u79F0" }], isError: true };
-        const registryUrl = process.env.SKILL_REGISTRY_URL || "https://raw.githubusercontent.com/atlisp/skill-registry/main/index.json";
-        const cachePath = path15.join(os9.homedir(), ".atlisp", "skill-registry-cache.json");
-        let cache = null;
-        try {
-          if (fs11.existsSync(cachePath)) cache = JSON.parse(fs11.readFileSync(cachePath, "utf-8"));
-        } catch {
-        }
-        let index = cache;
-        if (!index || Date.now() - index.fetchedAt > 36e5) {
-          try {
-            const resp = await fetch(registryUrl, { headers: { "User-Agent": "atlisp-mcp" } });
-            if (resp.ok) {
-              index = await resp.json();
-              index.fetchedAt = Date.now();
-              try {
-                fs11.writeFileSync(cachePath, JSON.stringify(index, null, 2), "utf-8");
-              } catch {
-              }
-            }
-          } catch {
-          }
-        }
-        if (!index || !index.skills) return { content: [{ type: "text", text: "\u65E0\u6CD5\u83B7\u53D6 skill \u6CE8\u518C\u8868\u7D22\u5F15" }], isError: true };
-        const skill = index.skills.find((s) => s.name === a.name);
-        if (!skill) return { content: [{ type: "text", text: `\u672A\u627E\u5230 skill: ${a.name}` }], isError: true };
-        const downloadUrl = skill.download_url || skill.url;
-        if (!downloadUrl) return { content: [{ type: "text", text: `Skill "${a.name}" \u6CA1\u6709\u4E0B\u8F7D\u5730\u5740` }], isError: true };
-        let content;
-        try {
-          const resp = await fetch(downloadUrl, { headers: { "User-Agent": "atlisp-mcp" } });
-          if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
-          content = await resp.text();
-        } catch (e) {
-          return { content: [{ type: "text", text: `\u4E0B\u8F7D\u5931\u8D25: ${e.message}` }], isError: true };
-        }
-        const skillsDir = path15.join(os9.homedir(), ".atlisp", "skills");
-        try {
-          fs11.mkdirSync(skillsDir, { recursive: true });
-        } catch {
-        }
-        const safeName = a.name.replace(/[^a-zA-Z0-9\u4e00-\u9fff_-]/g, "-").substring(0, 40);
-        const skillFile = path15.join(skillsDir, `skill-${safeName}.md`);
-        if (fs11.existsSync(skillFile)) {
-          return { content: [{ type: "text", text: `Skill "${a.name}" \u5DF2\u5B89\u88C5 (${skillFile})` }], isError: true };
-        }
-        let finalContent = content;
-        if (!content.match(/^---\n/)) {
-          const tags = (skill.tags || []).join(", ");
-          finalContent = `---
-name: ${a.name}
-description: ${skill.description || ""}
-tags: ${tags}
----
-
-${content}`;
-        }
-        fs11.writeFileSync(skillFile, finalContent, "utf-8");
-        return { content: [{ type: "text", text: `\u2705 ${skill.name} \u5B89\u88C5\u6210\u529F
-\u6587\u4EF6: ${skillFile}${skill.version ? `
-\u7248\u672C: ${skill.version}` : ""}` }] };
-      },
-      skill_list_installed: async () => {
-        const skillsDir = path15.join(os9.homedir(), ".atlisp", "skills");
-        if (!fs11.existsSync(skillsDir)) return { content: [{ type: "text", text: "\u6682\u65E0\u5DF2\u5B89\u88C5\u7684 skill" }] };
-        const results = [];
-        try {
-          const entries = fs11.readdirSync(skillsDir, { withFileTypes: true });
-          for (const entry of entries) {
-            if (entry.isFile() && entry.name.endsWith(".md")) {
-              const fullPath = path15.join(skillsDir, entry.name);
-              try {
-                const raw = fs11.readFileSync(fullPath, "utf-8");
-                const match = raw.match(/^---\n([\s\S]*?)\n---/);
-                if (match) {
-                  const fm = {};
-                  for (const line of match[1].split("\n")) {
-                    const sep = line.indexOf(":");
-                    if (sep > 0) fm[line.slice(0, sep).trim()] = line.slice(sep + 1).trim();
-                  }
-                  results.push({ name: fm.name || entry.name.replace(".md", ""), description: fm.description || "", tags: fm.tags || "" });
-                } else {
-                  results.push({ name: entry.name.replace(".md", ""), description: "", tags: "" });
-                }
-              } catch {
-              }
-            }
-          }
-        } catch {
-        }
-        if (!results.length) return { content: [{ type: "text", text: "\u6682\u65E0\u5DF2\u5B89\u88C5\u7684 skill" }] };
-        const lines = [`\u5DF2\u5B89\u88C5 ${results.length} \u4E2A skill:
-`];
-        for (const s of results) {
-          lines.push(`**${s.name}**${s.description ? ` \u2014 ${s.description}` : ""}`);
-          if (s.tags) lines.push(`  \u6807\u7B7E: ${s.tags}`);
-        }
-        return { content: [{ type: "text", text: lines.join("\n") }] };
-      },
-      skill_uninstall: async (a) => {
-        if (!a.name) return { content: [{ type: "text", text: "\u9700\u8981 skill \u540D\u79F0" }], isError: true };
-        const skillsDir = path15.join(os9.homedir(), ".atlisp", "skills");
-        if (!fs11.existsSync(skillsDir)) return { content: [{ type: "text", text: `\u672A\u5B89\u88C5 skill: ${a.name}` }], isError: true };
-        let found = null;
-        try {
-          const entries = fs11.readdirSync(skillsDir, { withFileTypes: true });
-          for (const entry of entries) {
-            if (entry.isFile() && entry.name.endsWith(".md")) {
-              const fullPath = path15.join(skillsDir, entry.name);
-              try {
-                const raw = fs11.readFileSync(fullPath, "utf-8");
-                const match = raw.match(/^---\n([\s\S]*?)\n---/);
-                if (match) {
-                  for (const line of match[1].split("\n")) {
-                    if (line.startsWith("name:") && line.slice(5).trim() === a.name) {
-                      found = fullPath;
-                      break;
-                    }
-                  }
-                } else if (entry.name.replace(".md", "") === a.name) {
-                  found = fullPath;
-                }
-              } catch {
-              }
-              if (found) break;
-            }
-          }
-        } catch {
-        }
-        if (!found) return { content: [{ type: "text", text: `\u672A\u5B89\u88C5 skill: ${a.name}` }], isError: true };
-        fs11.unlinkSync(found);
-        return { content: [{ type: "text", text: `\u2705 ${a.name} \u5DF2\u5378\u8F7D` }] };
-      },
-      skill_list_categories: async () => {
-        const registryUrl = process.env.SKILL_REGISTRY_URL || "https://raw.githubusercontent.com/atlisp/skill-registry/main/index.json";
-        const cachePath = path15.join(os9.homedir(), ".atlisp", "skill-registry-cache.json");
-        let cache = null;
-        try {
-          if (fs11.existsSync(cachePath)) cache = JSON.parse(fs11.readFileSync(cachePath, "utf-8"));
-        } catch {
-        }
-        let index = cache && Date.now() - cache.fetchedAt < 36e5 ? cache : null;
-        if (!index) {
-          try {
-            const resp = await fetch(registryUrl, { headers: { "User-Agent": "atlisp-mcp" } });
-            if (resp.ok) {
-              index = await resp.json();
-              try {
-                fs11.writeFileSync(cachePath, JSON.stringify(index, null, 2), "utf-8");
-              } catch {
-              }
-            }
-          } catch {
-          }
-        }
-        if (!index || !index.skills) return { content: [{ type: "text", text: "\u65E0\u6CD5\u83B7\u53D6 skill \u6CE8\u518C\u8868\u7D22\u5F15" }], isError: true };
-        const cats = /* @__PURE__ */ new Set();
-        for (const s of index.skills) for (const t of s.tags || []) cats.add(t);
-        const sorted = Array.from(cats).sort();
-        return { content: [{ type: "text", text: sorted.length ? `\u6CE8\u518C\u8868\u5206\u7C7B (${sorted.length}):
-${sorted.join("\n")}` : "\u6682\u65E0\u5206\u7C7B" }] };
-      }
+      skill_search,
+      skill_install,
+      skill_list_installed,
+      skill_uninstall,
+      skill_list_categories
     };
   }
 });
@@ -16864,7 +17205,7 @@ var init_mcp_server_state = __esm({
     progressContext = new AsyncLocalStorage();
     sessionServers = /* @__PURE__ */ new Map();
     sessionTransports = /* @__PURE__ */ new Map();
-    mcpHandlers = { tools: tools42, handleToolCall };
+    mcpHandlers = { tools: tools43, handleToolCall };
     _stdioServer = null;
     _pendingResourceUpdated = /* @__PURE__ */ new Set();
     _resourceUpdatedTimer = null;
@@ -16888,11 +17229,12 @@ function mcpError(text) {
   return { content: [{ type: "text", text: String(text) }], isError: true };
 }
 async function ensureCadConnected() {
-  const { cad: cad2 } = await Promise.resolve().then(() => (init_cad(), cad_exports));
-  if (!cad2.connected) {
-    await cad2.connect();
+  const { cad: cad2, resolveCadConnection: resolveCadConnection2 } = await Promise.resolve().then(() => (init_cad(), cad_exports));
+  const conn = resolveCadConnection2();
+  if (!conn.connected) {
+    await conn.connect();
   }
-  if (!cad2.connected) {
+  if (!conn.connected) {
     throw createError(ERROR_CODES.CAD_NOT_CONNECTED);
   }
 }
@@ -17077,7 +17419,7 @@ __export(resource_handlers_exports, {
   readResource: () => readResource
 });
 import fs13 from "fs";
-import path16 from "path";
+import path17 from "path";
 function propertyPairsToObject(pairs) {
   if (!Array.isArray(pairs)) return null;
   const obj = {};
@@ -17849,7 +18191,7 @@ async function getDwgList() {
   }
 }
 function loadStandardsFile(filename) {
-  const filePath = path16.join(STANDARDS_DIR, filename);
+  const filePath = path17.join(STANDARDS_DIR, filename);
   try {
     const raw = fs13.readFileSync(filePath, "utf-8");
     return JSON.parse(raw);
@@ -17949,6 +18291,119 @@ async function getDwgContext() {
     };
   }
 }
+async function getDrawingAnalysis(params = {}) {
+  const snapshot = await getCadSnapshot();
+  if (!snapshot || !snapshot.cadConnected) {
+    return { connected: false, error: "CAD \u672A\u8FDE\u63A5" };
+  }
+  try {
+    const detailedCode = `(progn
+  (vl-load-com)
+  (setq r nil)
+  ;; entity counts by type
+  (if (setq ss (ssget "_X"))
+    (progn
+      (setq total (sslength ss) i 0 cnt nil)
+      (while (< i total)
+        (setq typ (cdr (assoc 0 (entget (ssname ss i)))))
+        (setq cnt (if (assoc typ cnt) (subst (cons typ (1+ (cdr (assoc typ cnt)))) (assoc typ cnt) cnt) (cons (cons typ 1) cnt)))
+        (setq i (1+ i)))
+      (setq r (cons (cons "entityCount" total) r))
+      (setq r (cons (cons "entityByType" cnt) r)))
+    (setq r (cons (cons "entityCount" 0) r)))
+  ;; block usage
+  (setq blocks nil)
+  (vlax-for b (vla-get-blocks (vla-get-activedocument (vlax-get-acad-object)))
+    (if (and (= (vla-get-IsXref b) :vlax-false) (/= (vla-get-Name b) "*Model_Space") (/= (vla-get-Name b) "*Paper_Space"))
+      (setq blocks (cons (list "name" (vla-get-Name b) "count" (vla-get-Count b) "isDynamic" (vla-get-IsDynamicBlock b)) blocks))))
+  (setq r (cons (cons "blockUsage" blocks) r))
+  ;; layer summary
+  (setq layers nil le (tblnext "layer" t))
+  (while le
+    (setq ln (cdr (assoc 2 le)) lc (cdr (assoc 62 le)) ll (cdr (assoc 6 le)))
+    (setq layers (cons (list "name" ln "color" (if (< lc 0) (- lc) lc) "off" (< lc 0) "linetype" ll) layers))
+    (setq le (tblnext "layer" nil)))
+  (setq r (cons (cons "layers" layers) r))
+  ;; text stats
+  (if (setq ts (ssget "_X" '((0 . "TEXT,MTEXT"))))
+    (progn
+      (setq tc (sslength ts) th nil ti 0)
+      (while (< ti tc)
+        (setq h (cdr (assoc 40 (entget (ssname ts ti)))))
+        (if h (setq th (cons h th)))
+        (setq ti (1+ ti)))
+      (setq th (vl-sort th '<))
+      (setq r (cons (cons "textCount" tc) r))
+      (setq r (cons (cons "textHeights" (list "min" (car th) "max" (last th) "median" (nth (fix (/ (length th) 2)) th))) r)))
+    (setq r (cons (cons "textCount" 0) r)))
+  ;; system variables
+  (setq r (cons (cons "sysvars" (list
+    (cons "ltscale" (getvar "ltscale"))
+    (cons "dimscale" (getvar "dimscale"))
+    (cons "insunits" (getvar "insunits"))
+    (cons "measurement" (getvar "measurement"))
+    (cons "celtype" (getvar "celtype"))
+    (cons "clayer" (getvar "clayer"))
+    (cons "cecolor" (getvar "cecolor"))
+    (cons "osmode" (getvar "osmode"))
+    (cons "snapmode" (getvar "snapmode"))
+    (cons "gridmode" (getvar "gridmode"))
+    (cons "orthomode" (getvar "orthomode"))
+    (cons "plinetype" (getvar "plinetype"))
+    (cons "fillmode" (getvar "fillmode"))
+    (cons "pickstyle" (getvar "pickstyle"))
+  )) r))
+  (vl-prin1-to-string (reverse r)))`;
+    const resultStr = await cad.sendCommandWithResult(detailedCode);
+    const parsed = parseLispRecursive(resultStr);
+    if (!parsed || !Array.isArray(parsed)) {
+      return { connected: true, error: "\u5206\u6790\u7ED3\u679C\u89E3\u6790\u5931\u8D25" };
+    }
+    const analysis = {};
+    for (const pair of parsed) {
+      if (Array.isArray(pair) && pair.length >= 2) {
+        analysis[String(pair[0])] = pair[1];
+      }
+    }
+    return { connected: true, ...analysis };
+  } catch (e) {
+    log(`getDrawingAnalysis error: ${e.message}`);
+    return { connected: true, error: e.message };
+  }
+}
+function getToolCategories() {
+  const cats = {};
+  for (const t of tools43) {
+    const cat = t.annotations?.category || "\u5176\u4ED6";
+    if (!cats[cat]) cats[cat] = { count: 0, tools: [] };
+    cats[cat].count++;
+    cats[cat].tools.push(t.name);
+  }
+  return Object.entries(cats).map(([category, info]) => ({
+    category,
+    count: info.count,
+    tools: info.tools
+  })).sort((a, b) => b.count - a.count);
+}
+async function checkDrawingStandards() {
+  const standards = getDraftingStandards();
+  if (!standards || standards.error) {
+    return { ok: false, error: standards?.error || "\u5236\u56FE\u89C4\u8303\u672A\u52A0\u8F7D" };
+  }
+  try {
+    const issues = [];
+    for (const rule of standards.layers || []) {
+      const code = `(tblsearch "LAYER" "${escapeLispString(rule.name || rule.pattern)}")`;
+      const exists = await cad.sendCommandWithResult(code);
+      if (rule.required && (!exists || exists === "nil" || exists === "")) {
+        issues.push({ type: "missing_layer", message: `\u7F3A\u5C11\u5FC5\u9700\u56FE\u5C42: ${rule.name}` });
+      }
+    }
+    return { ok: issues.length === 0, issues };
+  } catch (e) {
+    return { ok: false, error: e.message };
+  }
+}
 function getToolRelationships() {
   return {
     selection: {
@@ -18204,6 +18659,12 @@ async function readResource(uri) {
       return await getDwgContext();
     case "atlisp://tools/relationships":
       return getToolRelationships();
+    case "atlisp://dwg/analysis":
+      return await getDrawingAnalysis(params);
+    case "atlisp://tools/categories":
+      return getToolCategories();
+    case "atlisp://dwg/standards/check":
+      return await checkDrawingStandards();
     default:
       throw new Error(`\u8D44\u6E90\u4E0D\u5B58\u5728: ${uri}`);
   }
@@ -18219,6 +18680,7 @@ var init_resource_handlers = __esm({
     init_handler_utils();
     init_errors();
     init_config();
+    init_tools();
     ENTITY_PROPERTIES_LISP = `
 (defun entity:to-list (val)
   (cond
@@ -18298,11 +18760,11 @@ init_subscription_manager();
 init_subscription_manager();
 init_sse_session();
 init_config();
-import path19 from "path";
+import path20 from "path";
 import fs16 from "fs";
 import http from "http";
 import https from "https";
-import { fileURLToPath as fileURLToPath7 } from "url";
+import { fileURLToPath as fileURLToPath8 } from "url";
 import { createRequire as createRequire2 } from "module";
 import express2 from "express";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
@@ -18315,12 +18777,13 @@ init_cad_pool();
 init_subscription_manager();
 init_mcp_server_state();
 init_sse_session();
+import os10 from "os";
 import express from "express";
 import { randomUUID as randomUUID6, createHash } from "crypto";
 import fs14 from "fs";
-import path17 from "path";
-import { fileURLToPath as fileURLToPath6 } from "url";
-import iconv from "iconv-lite";
+import path18 from "path";
+import { fileURLToPath as fileURLToPath7 } from "url";
+import iconv2 from "iconv-lite";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 
 // src/cad-event-bus.js
@@ -18432,7 +18895,6 @@ var TOOL_PERMISSIONS = {
   "measure_*": "read",
   "stream_*": "read",
   "watch_list": "read",
-  "pipeline_list": "read",
   // Write tools
   "create_*": "write",
   "set_*": "write",
@@ -18452,8 +18914,6 @@ var TOOL_PERMISSIONS = {
   "import_*": "import",
   // Admin
   "config_*": "admin",
-  "pipeline_save": "admin",
-  "pipeline_delete": "admin",
   "webhook_*": "admin",
   "watch_remove": "admin"
 };
@@ -18487,11 +18947,11 @@ function getApiKeyRole(apiKey2, config2) {
 
 // src/routes.js
 init_constants();
-var __dirname6 = path17.dirname(fileURLToPath6(import.meta.url));
-var htmlDir = path17.join(__dirname6, "html");
+var __dirname6 = path18.dirname(fileURLToPath7(import.meta.url));
+var htmlDir = path18.join(__dirname6, "html");
 function loadHtml(name, replacements = {}) {
   if (!htmlCache[name]) {
-    htmlCache[name] = fs14.readFileSync(path17.join(htmlDir, `${name}.html`), "utf-8");
+    htmlCache[name] = fs14.readFileSync(path18.join(htmlDir, `${name}.html`), "utf-8");
   }
   let html = htmlCache[name];
   for (const [key, value] of Object.entries(replacements)) {
@@ -18504,7 +18964,7 @@ var cachedToolsJson = null;
 var cachedToolsJsonAt = 0;
 function getToolsJson() {
   if (cachedToolsJson && Date.now() - cachedToolsJsonAt < 3e4) return cachedToolsJson;
-  cachedToolsJson = JSON.stringify(tools42.map((t) => ({
+  cachedToolsJson = JSON.stringify(tools43.map((t) => ({
     name: t.name,
     description: t.description,
     inputSchema: t.inputSchema
@@ -18534,7 +18994,7 @@ function createJsonBodyParser() {
       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);
+      const str = iconv2.decode(buf, charset);
       req.body = JSON.parse(str);
       next();
     } catch (e) {
@@ -18574,15 +19034,45 @@ function createAuthMiddleware() {
     return res.status(401).json({ error: "Unauthorized" });
   };
 }
+function originMatches(pattern, origin) {
+  if (pattern === "*") return true;
+  if (!origin) return false;
+  const getHost = (s) => s.replace(/^https?:\/\//, "").replace(/:\d+$/, "").toLowerCase();
+  const oHost = getHost(origin);
+  let pHost = getHost(pattern);
+  if (pHost.startsWith("*.")) {
+    const suffix = pHost.slice(1);
+    return oHost === suffix.slice(1) || oHost.endsWith(suffix);
+  }
+  return oHost === pHost;
+}
 function createCorsMiddleware() {
+  const allowedOrigins = corsOrigin.split(",").map((s) => s.trim()).filter(Boolean);
+  const allowAll = allowedOrigins.includes("*");
   return (req, res, next) => {
     if (!enableCors) return next();
-    res.setHeader("Access-Control-Allow-Origin", corsOrigin);
+    const origin = req.headers.origin;
+    const isPnaPreflight = req.method === "OPTIONS" && req.headers["access-control-request-private-network"] === "true";
+    if (allowAll) {
+      if (isPnaPreflight && origin) {
+        res.setHeader("Access-Control-Allow-Origin", origin);
+        res.setHeader("Vary", "Origin");
+      } else {
+        res.setHeader("Access-Control-Allow-Origin", corsOrigin);
+      }
+    } else if (origin && allowedOrigins.some((p) => originMatches(p, origin))) {
+      res.setHeader("Access-Control-Allow-Origin", origin);
+      res.setHeader("Vary", "Origin");
+    } else if (!origin) {
+      res.setHeader("Access-Control-Allow-Origin", allowedOrigins[0] || "*");
+    } else {
+      return res.status(403).json({ error: "Origin not allowed" });
+    }
     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");
+    res.setHeader("Access-Control-Allow-Private-Network", "true");
     if (req.method === "OPTIONS") return res.status(204).end();
     next();
   };
@@ -18673,7 +19163,7 @@ function setupRoutes(app) {
       },
       mcp: {
         sessions: sessionServers.size,
-        tools: tools42.length,
+        tools: tools43.length,
         sseSessions: sseCount
       },
       pool: {
@@ -18683,6 +19173,11 @@ function setupRoutes(app) {
       }
     });
   });
+  app.get("/go", (req, res) => {
+    const remoteUrl = "https://atlisp.cn/agent";
+    const cid = config_default.clientId || os10.hostname();
+    res.redirect(302, `${remoteUrl}?clientId=${encodeURIComponent(cid)}`);
+  });
   app.get("/health/full", async (req, res) => {
     const memUsage = process.memoryUsage();
     const poolStats = pool ? pool.getStats() : {};
@@ -18696,7 +19191,7 @@ function setupRoutes(app) {
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       cad: { connected: cad.connected, platform: cad.getPlatform?.(), version: cad.getVersion?.(), commandQueueSize: cad._getQueueSize ? cad._getQueueSize() : 0, restartCount: cad._getRestartCount ? cad._getRestartCount() : 0 },
       system: { uptime: process.uptime(), memory: { rssMB: Math.round(memUsage.rss / 1024 / 1024), heapUsedMB: Math.round(memUsage.heapUsed / 1024 / 1024), heapTotalMB: Math.round(memUsage.heapTotal / 1024 / 1024) }, cpu: process.cpuUsage() },
-      mcp: { sessions: sessionServers.size, tools: tools42.length, sseSessions: sseCount },
+      mcp: { sessions: sessionServers.size, tools: tools43.length, sseSessions: sseCount },
       pool: poolStats
     });
   });
@@ -18734,7 +19229,7 @@ function setupRoutes(app) {
   app.get("/api/docs", (req, res) => {
     const html = loadHtml("api-docs", {
       VERSION: SERVER_VERSION,
-      TOOLS_COUNT: tools42.length
+      TOOLS_COUNT: tools43.length
     });
     res.setHeader("Content-Type", "text/html; charset=utf-8");
     res.send(html);
@@ -18755,7 +19250,7 @@ function setupRoutes(app) {
       SESSIONS_COUNT: sessionServers.size,
       CAD_STATUS_CLASS: cadConnected ? "status-ok" : "status-error",
       CAD_STATUS_TEXT: cadStatusText,
-      TOOLS_COUNT: tools42.length
+      TOOLS_COUNT: tools43.length
     });
     res.setHeader("Content-Type", "text/html; charset=utf-8");
     res.send(html);
@@ -18947,7 +19442,7 @@ function sendWelcome(ws, clientId) {
         server: { name: SERVER_NAME, version: SERVER_VERSION },
         capabilities: SERVER_CAPABILITIES,
         clientId,
-        toolCount: tools42.length,
+        toolCount: tools43.length,
         cadConnected: cad.connected,
         cadPlatform: cad.connected ? cad.getPlatform() : null,
         cadVersion: cad.connected ? cad.getVersion() : null
@@ -19199,9 +19694,9 @@ function createWebSocketServer(httpServer) {
 // src/plugin-loader.js
 init_logger();
 import fs15 from "fs";
-import path18 from "path";
-import os10 from "os";
-var PLUGIN_DIR = path18.join(os10.homedir(), ".atlisp", "mcp-plugins");
+import path19 from "path";
+import os11 from "os";
+var PLUGIN_DIR = path19.join(os11.homedir(), ".atlisp", "mcp-plugins");
 var loadedPlugins = [];
 var watchCallbacks = [];
 var watcher = null;
@@ -19226,7 +19721,7 @@ function clearModuleCache(pluginPath) {
   if (key) delete import.meta[key];
 }
 async function loadSinglePlugin(file) {
-  const pluginPath = path18.join(PLUGIN_DIR, file);
+  const pluginPath = path19.join(PLUGIN_DIR, file);
   clearModuleCache(pluginPath);
   try {
     const plugin = await import(`${pluginPath}?t=${Date.now()}`);
@@ -19276,7 +19771,7 @@ function startPluginWatcher() {
       if (!filename || !filename.endsWith(".js") || filename.startsWith("_")) return;
       const existingIndex = loadedPlugins.findIndex((p) => p.name === filename.replace(".js", "") || p._file === filename);
       if (eventType === "rename") {
-        const filePath = path18.join(PLUGIN_DIR, filename);
+        const filePath = path19.join(PLUGIN_DIR, filename);
         if (!fs15.existsSync(filePath)) {
           if (existingIndex !== -1) {
             loadedPlugins.splice(existingIndex, 1);
@@ -19316,6 +19811,91 @@ function stopPluginWatcher() {
 init_tool_registry();
 init_mcp_server_state();
 
+// src/health-reporter.js
+init_config();
+init_cad();
+init_cad_pool();
+init_mcp_server_state();
+init_subscription_manager();
+init_logger();
+import os12 from "os";
+var REPORT_URL = "https://atlisp.cn/api/mcp/health";
+var REPORT_INTERVAL = 3e4;
+var intervalHandle = null;
+function gatherHealth() {
+  let cadResponseTime = 0;
+  if (cad.connected) {
+    const t0 = Date.now();
+    try {
+      cad.ping();
+    } catch {
+    }
+    cadResponseTime = Date.now() - t0;
+  }
+  const memUsage = process.memoryUsage();
+  let sseCount = 0;
+  try {
+    sseCount = sessionManager?.count?.() || 0;
+  } catch {
+  }
+  return {
+    clientId: config_default.clientId || os12.hostname(),
+    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    status: "ok",
+    cad: {
+      connected: cad.connected,
+      platform: cad.getPlatform ? cad.getPlatform() : null,
+      version: cad.getVersion ? cad.getVersion() : null,
+      responseTime: cadResponseTime,
+      commandQueueSize: cad._getQueueSize ? cad._getQueueSize() : 0,
+      restartCount: cad._getRestartCount ? cad._getRestartCount() : 0
+    },
+    system: {
+      uptime: process.uptime(),
+      memory: {
+        rss: Math.round(memUsage.rss / 1024 / 1024),
+        heapUsed: Math.round(memUsage.heapUsed / 1024 / 1024),
+        heapTotal: Math.round(memUsage.heapTotal / 1024 / 1024)
+      }
+    },
+    mcp: {
+      sessions: sessionServers.size,
+      sseSessions: sseCount
+    },
+    pool: pool ? {
+      total: pool.getStats().total,
+      active: pool.getStats().active,
+      instances: pool.getStats().instances
+    } : null
+  };
+}
+async function report() {
+  try {
+    const data = gatherHealth();
+    const res = await fetch(REPORT_URL, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(data),
+      signal: AbortSignal.timeout(1e4)
+    });
+    if (!res.ok) {
+      error(`Health report failed: ${res.status}`);
+    }
+  } catch (e) {
+    error(`Health report error: ${e.message}`);
+  }
+}
+function startHealthReporter() {
+  report();
+  intervalHandle = setInterval(report, REPORT_INTERVAL);
+}
+function stopHealthReporter() {
+  if (intervalHandle) {
+    clearInterval(intervalHandle);
+    intervalHandle = null;
+  }
+}
+
 // src/streamable-http.js
 init_logger();
 init_mcp_handlers();
@@ -19326,7 +19906,7 @@ var mcpServer = null;
 var streamableTransport = null;
 async function initStreamableHttpServer() {
   if (mcpServer) return;
-  mcpServer = createMcpServer({ tools: tools42, handleToolCall });
+  mcpServer = createMcpServer({ tools: tools43, handleToolCall });
   streamableTransport = new StreamableHTTPServerTransport2({
     sessionIdGenerator: () => randomUUID8()
   });
@@ -19377,9 +19957,9 @@ function setupStreamableHttpRoutes(app) {
 init_mcp_tools();
 init_function_handlers();
 init_constants();
-var __dirname7 = path19.dirname(fileURLToPath7(import.meta.url));
+var __dirname7 = path20.dirname(fileURLToPath8(import.meta.url));
 var require3 = createRequire2(import.meta.url);
-var { version: version2 } = require3(path19.join(__dirname7, "..", "package.json"));
+var { version: version2 } = require3(path20.join(__dirname7, "..", "package.json"));
 var isMcpScript = process.argv[1]?.includes("atlisp-mcp");
 if (isMcpScript) {
   const cliArgs2 = process.argv.slice(2);
@@ -19413,6 +19993,7 @@ Options:
   --no-lint                    Disable lint pre-check for eval_lisp
   --lint-off                   Same as --no-lint
   --api-key <key>              API key for authentication
+  --client-id <id>             Client identifier for remote health report
   --security-level <type>      Security level: strict, standard, relaxed (default: strict)
 
 Environment Variables:
@@ -19433,7 +20014,8 @@ Environment Variables:
   LINT_LEVEL            Lint level (error/warn/off)
   NO_LINT               Disable lint (true/false)
   REQUEST_LOG_ENABLED   Enable request logging (true/false, default: true)
-  CORS_ORIGIN           CORS origin (default: *)
+  CORS_ORIGIN           CORS origin (default: https://atlisp.cn)
+  CLIENT_ID             Client identifier for remote health report
   RATE_LIMIT_WINDOW     Rate limit window in ms (default: 60000)
   RATE_LIMIT_MAX        Max requests per window (default: 100)
 
@@ -19489,6 +20071,8 @@ For more info: https://atlisp.cn
       process.env.SSL_CERT_PATH = cliArgs2[++i];
     } else if (arg === "--api-key" && cliArgs2[i + 1]) {
       process.env.MCP_API_KEY = cliArgs2[++i];
+    } else if (arg === "--client-id" && cliArgs2[i + 1]) {
+      process.env.CLIENT_ID = cliArgs2[++i];
     } else if (arg === "--metrics-enabled" && cliArgs2[i + 1]) {
       process.env.METRICS_ENABLED = cliArgs2[++i];
     }
@@ -19511,7 +20095,7 @@ async function initCadConnection() {
 }
 async function startServer() {
   await loadPlugins();
-  initPlugins({ cad, config: config_default, log, registerTool, tools: tools42 });
+  initPlugins({ cad, config: config_default, log, registerTool, tools: tools43 });
   onPluginChange((type, name) => {
     log(`Plugin changed: ${type} ${name}`);
     broadcastToolListChanged();
@@ -19521,7 +20105,7 @@ async function startServer() {
   startPluginWatcher();
   let promptsWatcher = null;
   try {
-    const promptsDir = path19.join(__dirname7, "..", "prompts");
+    const promptsDir = path20.join(__dirname7, "..", "prompts");
     if (fs16.existsSync(promptsDir)) {
       promptsWatcher = fs16.watch(promptsDir, (eventType, filename) => {
         if (filename && filename.endsWith(".json")) {
@@ -19535,7 +20119,7 @@ async function startServer() {
   }
   if (config_default.transport === "stdio") {
     await initCadConnection();
-    const mcpServer2 = createStdioServer({ tools: tools42, handleToolCall });
+    const mcpServer2 = createStdioServer({ tools: tools43, handleToolCall });
     const transport = new StdioServerTransport();
     const sessionId = "stdio-session";
     sessionManager.createSession(sessionId);
@@ -19583,10 +20167,12 @@ async function startServer() {
       const proto = useSsl ? "https" : "http";
       const mode = config_default.transport === "ws" ? "WebSocket" : config_default.transport === "streamable-http" ? "Streamable HTTP" : "\u591A\u4F1A\u8BDD";
       console.error(`@lisp MCP Server \u542F\u52A8 - ${proto}://${config_default.host}:${config_default.port} (${mode}\u6A21\u5F0F)`);
+      startHealthReporter();
     });
     async function shutdown(signal) {
       console.error(`
 \u6536\u5230 ${signal}\uFF0C\u6B63\u5728\u4F18\u96C5\u5173\u95ED...`);
+      stopHealthReporter();
       stopPluginWatcher();
       if (promptsWatcher) {
         promptsWatcher.close();
@@ -19636,5 +20222,5 @@ export {
   handleToolCall,
   loadAtlibFunctionLib,
   startServer,
-  tools42 as tools
+  tools43 as tools
 };