@atlisp/mcp 1.8.30 → 1.8.31

package/README.md

@@ -189,6 +189,30 @@ atlisp-mcp --ws
 atlisp-mcp --port 9000 --host 127.0.0.1
 ```
 
+> **端口防冲突**：每个端口只允许一个实例运行。启动时自动检测端口是否已被其他 `atlisp-mcp` 进程占用（通过 `~/.atlisp/locks/atlisp-mcp-{port}.lock` PID 锁文件），占用则报错退出。不同端口可同时运行多个实例互不干扰。
+
+### 设置开机自启
+
+注册到用户登录后自动启动 HTTP 服务：
+
+```bash
+atlisp-mcp --install-autostart
+```
+
+移除自启：
+
+```bash
+atlisp-mcp --uninstall-autostart
+```
+
+查看自启状态：
+
+```bash
+atlisp-mcp --autostart-status
+```
+
+支持三种平台：Windows（Registry Run 键）、macOS（LaunchAgent）、Linux（XDG Autostart）。
+
 ### 健康检查
 
 ```bash
@@ -824,6 +848,9 @@ curl http://localhost:8110/metrics
 | `--config <path>` | 配置文件路径 |
 | `--ssl-key <path>` | SSL 私钥文件 |
 | `--ssl-cert <path>` | SSL 证书文件 |
+| `--install-autostart` | 注册用户登录后自动启动 HTTP 服务 |
+| `--uninstall-autostart` | 移除自动启动注册 |
+| `--autostart-status` | 查询自动启动是否已安装 |
 
 ---
 
@@ -880,7 +907,7 @@ curl http://localhost:8110/metrics
 | 中文乱码 | 使用 `encoding: gbk` 参数或用 `vl-prin1-to-string` 处理 |
 | 括号错误 | MCP Server 会自动检查并提示 |
 | CAD 未自动启动 | 检查 COM 权限，以管理员身份运行 |
-| 端口被占用 | 使用 `--port` 指定其他端口 |
+| 端口被占用 | 使用 `--port` 指定其他端口；同端口多实例冲突时，结束原进程或换端口 |
 | 全局命令找不到 | 检查 npm 全局安装路径是否在 PATH 中 |
 
 ---

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) => (path21) => {
-  var fn = map[path21];
+var __glob = (map) => (path23) => {
+  var fn = map[path23];
   if (fn) return fn();
-  throw new Error("Module not found in bundle: " + path21);
+  throw new Error("Module not found in bundle: " + path23);
 };
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
@@ -1894,8 +1894,8 @@ __export(renderer_exports, {
   renderPrompt: () => renderPrompt,
   renderTemplate: () => renderTemplate
 });
-function resolvePath(obj, path21) {
-  const parts = path21.split(/[.\[\]]/g).filter(Boolean);
+function resolvePath(obj, path23) {
+  const parts = path23.split(/[.\[\]]/g).filter(Boolean);
   let val = obj;
   for (const p of parts) {
     if (val == null) return void 0;
@@ -1905,8 +1905,8 @@ function resolvePath(obj, path21) {
 }
 function renderTemplate(template, args) {
   return template.replace(PARAM_RE, (match, rawExpr, expr) => {
-    const path21 = rawExpr || expr;
-    const val = resolvePath(args, path21);
+    const path23 = rawExpr || expr;
+    const val = resolvePath(args, path23);
     if (val == null) return "";
     const strVal = String(val);
     if (rawExpr) return strVal;
@@ -2338,8 +2338,8 @@ var init_sse_session = __esm({
       sendMessage(data) {
         return this.sendEvent(SSE_EVENTS.MESSAGE, data);
       }
-      sendEndpoint(path21) {
-        return this.sendEvent(SSE_EVENTS.ENDPOINT, path21);
+      sendEndpoint(path23) {
+        return this.sendEvent(SSE_EVENTS.ENDPOINT, path23);
       }
       sendError(code, message, id = null) {
         return this.sendEvent(SSE_EVENTS.ERROR, { code, message }, id);
@@ -14376,8 +14376,8 @@ async function exportXdataToFile(handle, filePath) {
     await ensureCadConnected();
     const xdataResult = await getAllEntityXdata(handle);
     const parsed = JSON.parse(xdataResult.content[0].text);
-    const fs17 = await import("fs");
-    fs17.writeFileSync(filePath, JSON.stringify(parsed.xdata, null, 2));
+    const fs19 = await import("fs");
+    fs19.writeFileSync(filePath, JSON.stringify(parsed.xdata, null, 2));
     return mcpSuccess(JSON.stringify({ handle, filePath }));
   } catch (e) {
     return mcpError(`\u9519\u8BEF: ${e.message}`);
@@ -14386,8 +14386,8 @@ async function exportXdataToFile(handle, filePath) {
 async function importXdataFromFile(handle, filePath, appName) {
   try {
     await ensureCadConnected();
-    const fs17 = await import("fs");
-    const data = fs17.readFileSync(filePath, "utf8");
+    const fs19 = await import("fs");
+    const data = fs19.readFileSync(filePath, "utf8");
     const xdata = JSON.parse(data);
     if (appName && xdata[appName]) {
       return await setXdata(handle, appName, xdata[appName]);
@@ -14436,13 +14436,13 @@ function lispPoint(pt) {
 }
 async function attachXref(args) {
   try {
-    const path21 = esc3(args.path);
+    const path23 = 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" "${path21}" "${overlay}" "${point}" "${scale}" "${rotation}") (princ)`
+      `(command "_.XATTACH" "${path23}" "${overlay}" "${point}" "${scale}" "${rotation}") (princ)`
     );
     return mcpSuccess(`\u5916\u90E8\u53C2\u7167\u5DF2\u9644\u7740: ${args.path}`);
   } catch (e) {
@@ -15586,8 +15586,8 @@ async function evaluateWatch(watch) {
         );
         const arr = parseLispList2(result) || [];
         const matched = Number(arr[0]) !== 0;
-        const path21 = String(arr[1] || "");
-        return { matched, data: { matched: Boolean(matched), path: path21 } };
+        const path23 = String(arr[1] || "");
+        return { matched, data: { matched: Boolean(matched), path: path23 } };
       }
       case "entity_selected": {
         result = await cad.sendCommandWithResult(
@@ -16203,9 +16203,9 @@ var init_agent_context = __esm({
 function validationError(msg) {
   return new MCPError(ERROR_CODES.INVALID_ARGS, msg);
 }
-function validateProps(args, props, required, path21 = "") {
+function validateProps(args, props, required, path23 = "") {
   for (const [key, prop] of Object.entries(props)) {
-    const fullKey = path21 ? `${path21}.${key}` : key;
+    const fullKey = path23 ? `${path23}.${key}` : key;
     const isOptional = !required.includes(key);
     const val = args[key];
     if (val === void 0 || val === null) {
@@ -18796,8 +18796,8 @@ init_subscription_manager();
 init_subscription_manager();
 init_sse_session();
 init_config();
-import path20 from "path";
-import fs16 from "fs";
+import path22 from "path";
+import fs18 from "fs";
 import http from "http";
 import https from "https";
 import { fileURLToPath as fileURLToPath8 } from "url";
@@ -19489,10 +19489,10 @@ function sendWelcome(ws, clientId) {
   }
 }
 function startPingPong(ws, clientId) {
-  let isAlive = true;
+  let isAlive2 = true;
   ws._isAlive = true;
   ws.on("pong", () => {
-    isAlive = true;
+    isAlive2 = true;
     ws._isAlive = true;
   });
   const interval = setInterval(() => {
@@ -19500,13 +19500,13 @@ function startPingPong(ws, clientId) {
       clearInterval(interval);
       return;
     }
-    if (!isAlive) {
+    if (!isAlive2) {
       clearInterval(interval);
       log(`WebSocket ping timeout, terminating [${clientId}]`);
       ws.terminate();
       return;
     }
-    isAlive = false;
+    isAlive2 = false;
     ws._isAlive = false;
     try {
       ws.ping();
@@ -19989,13 +19989,228 @@ function setupStreamableHttpRoutes(app) {
   });
 }
 
+// src/lockfile.js
+import fs16 from "fs";
+import path20 from "path";
+import os13 from "os";
+var LOCK_DIR = path20.join(os13.homedir(), ".atlisp", "locks");
+function ensureDir2() {
+  if (!fs16.existsSync(LOCK_DIR)) {
+    fs16.mkdirSync(LOCK_DIR, { recursive: true });
+  }
+}
+function lockPath(port) {
+  return path20.join(LOCK_DIR, `atlisp-mcp-${port}.lock`);
+}
+function isAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (e) {
+    return e.code === "EPERM";
+  }
+}
+function acquirePortLock(port, host) {
+  ensureDir2();
+  const lp = lockPath(port);
+  const payload = JSON.stringify({ pid: process.pid, port, host, started: (/* @__PURE__ */ new Date()).toISOString() });
+  for (let attempt = 0; attempt < 3; attempt++) {
+    try {
+      const fd = fs16.openSync(lp, "wx");
+      fs16.writeSync(fd, payload, 0, "utf-8");
+      fs16.closeSync(fd);
+      return { ok: true };
+    } catch (err) {
+      if (err.code !== "EEXIST") throw err;
+      try {
+        const existing = JSON.parse(fs16.readFileSync(lp, "utf-8"));
+        if (existing.pid && isAlive(existing.pid)) {
+          return { ok: false, pid: existing.pid, started: existing.started };
+        }
+      } catch {
+      }
+      try {
+        fs16.unlinkSync(lp);
+      } catch {
+      }
+    }
+  }
+  return { ok: false, pid: null, started: null };
+}
+function releasePortLock(port) {
+  try {
+    const lp = lockPath(port);
+    try {
+      const existing = JSON.parse(fs16.readFileSync(lp, "utf-8"));
+      if (existing.pid !== process.pid) return;
+    } catch {
+    }
+    fs16.unlinkSync(lp);
+  } catch {
+  }
+}
+
+// src/autostart.js
+import { execSync } from "child_process";
+import path21 from "path";
+import fs17 from "fs";
+import os14 from "os";
+var AUTOSTART_NAME = "atlisp-mcp";
+function getStartupCommand() {
+  const nodePath = process.execPath;
+  const scriptPath = process.argv[1];
+  return `"${nodePath}" "${scriptPath}" --transport http`;
+}
+function xdgAutostartDir() {
+  const xdg = process.env.XDG_CONFIG_HOME;
+  return path21.join(xdg || path21.join(os14.homedir(), ".config"), "autostart");
+}
+function installAutostart() {
+  const platform = process.platform;
+  if (platform === "win32") {
+    const cmd = getStartupCommand().replace(/"/g, '\\"');
+    try {
+      execSync(
+        `reg add "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run" /v "${AUTOSTART_NAME}" /t REG_SZ /d "${cmd}" /f`,
+        { stdio: "pipe", timeout: 5e3 }
+      );
+      console.error(`\u81EA\u52A8\u542F\u52A8\u5DF2\u5B89\u88C5 (HKCU\\...\\Run)`);
+      return true;
+    } catch (e) {
+      console.error(`\u5B89\u88C5\u81EA\u52A8\u542F\u52A8\u5931\u8D25: ${e.message}`);
+      return false;
+    }
+  }
+  if (platform === "darwin") {
+    const plistDir = path21.join(os14.homedir(), "Library", "LaunchAgents");
+    const plistPath = path21.join(plistDir, `com.atlisp.mcp.plist`);
+    const cmd = getStartupCommand().replace(/"/g, "&quot;");
+    const plist = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Label</key>
+    <string>com.atlisp.mcp</string>
+    <key>ProgramArguments</key>
+    <array>
+        <string>${process.execPath}</string>
+        <string>${process.argv[1]}</string>
+        <string>--transport</string>
+        <string>http</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>KeepAlive</key>
+    <false/>
+</dict>
+</plist>`;
+    try {
+      if (!fs17.existsSync(plistDir)) fs17.mkdirSync(plistDir, { recursive: true });
+      fs17.writeFileSync(plistPath, plist, "utf-8");
+      execSync(`launchctl load "${plistPath}"`, { stdio: "pipe", timeout: 5e3 });
+      console.error(`\u81EA\u52A8\u542F\u52A8\u5DF2\u5B89\u88C5 (LaunchAgent)`);
+      return true;
+    } catch (e) {
+      console.error(`\u5B89\u88C5\u81EA\u52A8\u542F\u52A8\u5931\u8D25: ${e.message}`);
+      return false;
+    }
+  }
+  if (platform === "linux") {
+    const dir = xdgAutostartDir();
+    const desktopPath = path21.join(dir, "atlisp-mcp.desktop");
+    const cmd = getStartupCommand();
+    const desktop = `[Desktop Entry]
+Type=Application
+Name=@lisp MCP Server
+Exec=${cmd}
+Terminal=false
+X-GNOME-Autostart-enabled=true
+`;
+    try {
+      if (!fs17.existsSync(dir)) fs17.mkdirSync(dir, { recursive: true });
+      fs17.writeFileSync(desktopPath, desktop, "utf-8");
+      console.error(`\u81EA\u52A8\u542F\u52A8\u5DF2\u5B89\u88C5 (XDG Autostart)`);
+      return true;
+    } catch (e) {
+      console.error(`\u5B89\u88C5\u81EA\u52A8\u542F\u52A8\u5931\u8D25: ${e.message}`);
+      return false;
+    }
+  }
+  console.error(`\u5F53\u524D\u5E73\u53F0 ${platform} \u4E0D\u652F\u6301\u81EA\u52A8\u542F\u52A8`);
+  return false;
+}
+function uninstallAutostart() {
+  const platform = process.platform;
+  if (platform === "win32") {
+    try {
+      execSync(
+        `reg delete "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run" /v "${AUTOSTART_NAME}" /f`,
+        { stdio: "pipe", timeout: 5e3 }
+      );
+      console.error("\u81EA\u52A8\u542F\u52A8\u5DF2\u5378\u8F7D");
+      return true;
+    } catch (e) {
+      console.error(`\u5378\u8F7D\u81EA\u52A8\u542F\u52A8\u5931\u8D25: ${e.message}`);
+      return false;
+    }
+  }
+  if (platform === "darwin") {
+    const plistPath = path21.join(os14.homedir(), "Library", "LaunchAgents", "com.atlisp.mcp.plist");
+    try {
+      execSync(`launchctl unload "${plistPath}"`, { stdio: "pipe", timeout: 5e3 });
+      fs17.unlinkSync(plistPath);
+      console.error("\u81EA\u52A8\u542F\u52A8\u5DF2\u5378\u8F7D");
+      return true;
+    } catch (e) {
+      console.error(`\u5378\u8F7D\u81EA\u52A8\u542F\u52A8\u5931\u8D25: ${e.message}`);
+      return false;
+    }
+  }
+  if (platform === "linux") {
+    const desktopPath = path21.join(xdgAutostartDir(), "atlisp-mcp.desktop");
+    try {
+      if (fs17.existsSync(desktopPath)) fs17.unlinkSync(desktopPath);
+      console.error("\u81EA\u52A8\u542F\u52A8\u5DF2\u5378\u8F7D");
+      return true;
+    } catch (e) {
+      console.error(`\u5378\u8F7D\u81EA\u52A8\u542F\u52A8\u5931\u8D25: ${e.message}`);
+      return false;
+    }
+  }
+  return false;
+}
+function autostartStatus() {
+  const platform = process.platform;
+  if (platform === "win32") {
+    try {
+      const out = execSync(
+        `reg query "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run" /v "${AUTOSTART_NAME}"`,
+        { stdio: "pipe", timeout: 5e3, encoding: "utf-8" }
+      );
+      const match = out.match(/(\S+\.js)/);
+      return { installed: true, command: match ? match[1] : out.trim() };
+    } catch {
+      return { installed: false };
+    }
+  }
+  if (platform === "darwin") {
+    const plistPath = path21.join(os14.homedir(), "Library", "LaunchAgents", "com.atlisp.mcp.plist");
+    return { installed: fs17.existsSync(plistPath) };
+  }
+  if (platform === "linux") {
+    const desktopPath = path21.join(xdgAutostartDir(), "atlisp-mcp.desktop");
+    return { installed: fs17.existsSync(desktopPath) };
+  }
+  return { installed: false, error: `${platform} \u4E0D\u652F\u6301\u81EA\u52A8\u542F\u52A8` };
+}
+
 // src/atlisp-mcp.js
 init_mcp_tools();
 init_function_handlers();
 init_constants();
-var __dirname7 = path20.dirname(fileURLToPath8(import.meta.url));
+var __dirname7 = path22.dirname(fileURLToPath8(import.meta.url));
 var require3 = createRequire2(import.meta.url);
-var { version: version2 } = require3(path20.join(__dirname7, "..", "package.json"));
+var { version: version2 } = require3(path22.join(__dirname7, "..", "package.json"));
 var isMcpScript = process.argv[1]?.includes("atlisp-mcp");
 if (isMcpScript) {
   const cliArgs2 = process.argv.slice(2);
@@ -20031,6 +20246,9 @@ Options:
   --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)
+  --install-autostart          Register server to auto-start after user login
+  --uninstall-autostart        Remove auto-start registration
+  --autostart-status           Check if auto-start is installed
 
 Environment Variables:
   TRANSPORT             Transport mode (http/stdio/ws)
@@ -20111,6 +20329,21 @@ For more info: https://atlisp.cn
       process.env.CLIENT_ID = cliArgs2[++i];
     } else if (arg === "--metrics-enabled" && cliArgs2[i + 1]) {
       process.env.METRICS_ENABLED = cliArgs2[++i];
+    } else if (arg === "--install-autostart") {
+      installAutostart();
+      process.exit(0);
+    } else if (arg === "--uninstall-autostart") {
+      uninstallAutostart();
+      process.exit(0);
+    } else if (arg === "--autostart-status") {
+      const s = autostartStatus();
+      if (s.installed) {
+        console.error(`\u81EA\u52A8\u542F\u52A8: \u5DF2\u5B89\u88C5`);
+        if (s.command) console.error(`  \u547D\u4EE4: ${s.command}`);
+      } else {
+        console.error(`\u81EA\u52A8\u542F\u52A8: \u672A\u5B89\u88C5`);
+      }
+      process.exit(0);
     }
   }
 }
@@ -20141,9 +20374,9 @@ async function startServer() {
   startPluginWatcher();
   let promptsWatcher = null;
   try {
-    const promptsDir = path20.join(__dirname7, "..", "prompts");
-    if (fs16.existsSync(promptsDir)) {
-      promptsWatcher = fs16.watch(promptsDir, (eventType, filename) => {
+    const promptsDir = path22.join(__dirname7, "..", "prompts");
+    if (fs18.existsSync(promptsDir)) {
+      promptsWatcher = fs18.watch(promptsDir, (eventType, filename) => {
         if (filename && filename.endsWith(".json")) {
           log(`Prompt changed: ${filename}`);
           broadcastPromptsListChanged();
@@ -20191,13 +20424,23 @@ async function startServer() {
     let httpsServer;
     if (useSsl) {
       const sslOptions = {
-        key: fs16.readFileSync(config_default.sslKey, "utf-8"),
-        cert: fs16.readFileSync(config_default.sslCert, "utf-8")
+        key: fs18.readFileSync(config_default.sslKey, "utf-8"),
+        cert: fs18.readFileSync(config_default.sslCert, "utf-8")
       };
       httpsServer = https.createServer(sslOptions, app);
     }
     const rawServer = httpsServer || http.createServer(app);
     createWebSocketServer(rawServer);
+    const lock = acquirePortLock(config_default.port, config_default.host);
+    if (!lock.ok) {
+      console.error(`
+\u9519\u8BEF: \u7AEF\u53E3 ${config_default.port} \u5DF2\u88AB\u53E6\u4E00\u4E2A atlisp-mcp \u5B9E\u4F8B\u5360\u7528`);
+      console.error(`  PID: ${lock.pid}`);
+      if (lock.started) console.error(`  \u542F\u52A8\u65F6\u95F4: ${lock.started}`);
+      console.error(`\u8BF7\u9009\u62E9\u5176\u4ED6\u7AEF\u53E3 (--port) \u6216\u7ED3\u675F\u5360\u7528\u8FDB\u7A0B\u540E\u91CD\u8BD5\u3002
+`);
+      process.exit(1);
+    }
     const httpServer = rawServer.listen(config_default.port, config_default.host, async () => {
       await initCadConnection();
       const proto = useSsl ? "https" : "http";
@@ -20219,6 +20462,7 @@ async function startServer() {
         removeSessionServer(sid);
       }
       await closeStreamableHttpServer();
+      releasePortLock(config_default.port);
       await cad.disconnect();
       closeLog();
       httpServer.close(() => {
@@ -20229,6 +20473,7 @@ async function startServer() {
     }
     process.on("SIGINT", () => shutdown("SIGINT"));
     process.on("SIGTERM", () => shutdown("SIGTERM"));
+    process.on("exit", () => releasePortLock(config_default.port));
   }
 }
 onDocumentChanged((info) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlisp/mcp",
-  "version": "1.8.30",
+  "version": "1.8.31",
   "description": "MCP Server for @lisp on CAD,support AutoCAD/GstarCAD/ZWCAD/BricsCAD or CAD platform compatible with AutoLISP",
   "type": "module",
   "bin": {