@atlisp/mcp 1.0.21 → 1.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@atlisp/mcp",
-    "version": "1.0.21",
+    "version": "1.0.23",
     "description": "MCP Server for @lisp on CAD",
     "type": "module",
     "bin": {

package/src/atlisp-mcp.js

@@ -382,11 +382,11 @@ async function handleMcpRequest(session, method, params, id) {
 }
 
 export async function startServer() {
-    if (transport === 'stdio') {
+    if (config.transport === 'stdio') {
         await initCadConnection();
         const mcpServer = createMcpServer();
-        const transport = new StdioServerTransport();
-        await mcpServer.connect(transport);
+        const stdioTransport = new StdioServerTransport();
+        await mcpServer.connect(stdioTransport);
         console.log(`${SERVER_NAME} 运行在 stdio 模式`);
     } else {
         const app = express();

package/src/cad-worker.js

@@ -137,7 +137,7 @@ const cadSendWithResult = edge.func(function() {/*
           
           // 生成 LISP 代码：执行 code，将结果打印到 tempFile
           // 使用 princ 输出原始字符串
-          string lispCode = "(progn(setq f(open \"" + tempFile.Replace("\\", "\\\\") + "\" \"w\"))(princ " + code + " f)(close f)(princ))";
+          string lispCode = "(progn(setq f(open \"" + tempFile.Replace("\\", "\\\\") + "\" \"w\"))(princ (progn " + code + ") f)(close f)(princ))";
           
             // 使用系统 ANSI 编码以兼容 GstarCAD / ZWCAD
             System.IO.File.WriteAllText(lispFile, lispCode, System.Text.Encoding.GetEncoding(System.Globalization.CultureInfo.CurrentCulture.TextInfo.ANSICodePage));
@@ -337,22 +337,22 @@ async function waitForIdle(platform) {
 function checkParens(code) {
   let depth = 0;
   let inString = false;
-  let escapeNext = false;
   for (let i = 0; i < code.length; i++) {
     const ch = code[i];
-    if (escapeNext) {
-      escapeNext = false;
-      continue;
-    }
-    if (ch === '\\') {
-      escapeNext = true;
+    if (inString) {
+      if (ch === '\\' && i + 1 < code.length) {
+        i++;
+        continue;
+      }
+      if (ch === '"') {
+        inString = false;
+      }
       continue;
     }
     if (ch === '"') {
-      inString = !inString;
+      inString = true;
       continue;
     }
-    if (inString) continue;
     if (ch === ';') {
       while (i < code.length && code[i] !== '\n') i++;
       continue;
@@ -427,7 +427,7 @@ async function handleMessage(msg) {
     if (!parenCheck.valid) {
       return { success: false, error: `括号错误: ${parenCheck.error} (位置 ${parenCheck.pos})` };
     }
-    if (!(await waitForIdle(msg.platform))) {
+    if (!(await waitForIdle(msg.platform || 'AutoCAD'))) {
       return { success: false, error: 'CAD is busy, timeout' };
     }
     log(`send: ${msg.code}`);

package/src/constants.js

@@ -8,7 +8,7 @@ export const FILE_EXTENSIONS = {
 
 export const PROTOCOL_VERSION = '2024-11-05';
 export const SERVER_NAME = 'atlisp-mcp-server';
-export const SERVER_VERSION = '1.0.20';
+export const SERVER_VERSION = '1.0.24';
 
 export const MOCK_PACKAGES = [
     { name: 'base', description: '基础函数库', version: '1.0.0' },

package/src/handlers/resource-handlers.js

@@ -312,16 +312,29 @@ async function getDwgPath() {
     if (!cad.connected) return { path: null, name: null };
     
     try {
-        const code = `(strcat (vl-princ-to-string (getvar "dwgprefix")) (vl-princ-to-string (getvar "dwgname")))`;
-        const fullPath = await cad.sendCommandWithResult(code);
+        const code = `(progn
+          (setq prefix (vl-princ-to-string (getvar "dwgprefix")))
+          (setq name (vl-princ-to-string (getvar "dwgname")))
+          (list (strcat prefix name) name)
+        )`;
+        const result = await cad.sendCommandWithResult(code);
         
-        const nameCode = `(vl-princ-to-string (getvar "dwgname"))`;
-        const name = await cad.sendCommandWithResult(nameCode);
+        if (!result || result === "nil" || result === "") {
+            return { path: null, name: null };
+        }
+
+        let parsed = null;
+        try { parsed = JSON.parse(result); } catch {}
+        if (!parsed) {
+            const listResult = parseLispList(result);
+            if (listResult && listResult.length >= 2) parsed = listResult;
+        }
+
+        if (parsed && Array.isArray(parsed) && parsed.length >= 2) {
+            return { path: String(parsed[0]), name: String(parsed[1]) };
+        }
         
-        return {
-            path: fullPath || null,
-            name: name || null
-        };
+        return { path: result, name: result };
     } catch (e) {
         return { path: null, name: null };
     }

package/src/sse-session.js

@@ -197,7 +197,7 @@ export class SseSession {
     }
 
     sendEndpoint(path) {
-        return this._write(`: endpoint ${path}\n\n`);
+        return this.sendEvent(SSE_EVENTS.ENDPOINT, path);
     }
 
     sendError(code, message, id = null) {
@@ -205,7 +205,7 @@ export class SseSession {
     }
 
     sendPing() {
-        return this._write(': ping ' + Date.now() + '\n\n');
+        return this.sendEvent(SSE_EVENTS.PING, { timestamp: Date.now() });
     }
 
     sendProgress(current, total, message = '') {
@@ -213,7 +213,7 @@ export class SseSession {
     }
 
     sendCapabilities(capabilities) {
-        return this._write(`: capabilities ${JSON.stringify(capabilities)}\n\n`);
+        return this.sendEvent(SSE_EVENTS.CAPABILITIES, capabilities);
     }
 
     sendResponse(jsonrpcResponse, id = null) {