@atlisp/mcp 1.1.5 → 1.2.0

package/README.md

@@ -254,6 +254,7 @@ curl http://localhost:8110/health
 | `install_atlisp` | 安装 @lisp | 无 |
 | `get_function_usage` | 获取函数用法 | `name`: 函数名 |
 | `list_functions` | 列出所有函数 | 无 |
+| `load_atlisp_functionlib` | 从网络加载函数库（AI 提示词/编程） | `format`: json/list |
 
 ### MCP 方法
 

package/package.json

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

package/src/atlisp-mcp.js

@@ -113,6 +113,30 @@ const mcpLimiter = rateLimit({
 
 export { CAD_PLATFORMS, FILE_EXTENSIONS, MOCK_PACKAGES } from './constants.js';
 
+const FUNCTION_LIB_URL = process.env.FUNCTION_LIB_URL || 'http://s3.atlisp.cn/json/functions.json';
+let cachedFunctionLib = null;
+let cachedAt = null;
+const CACHE_TTL = 5 * 60 * 1000;
+
+export async function loadAtlibFunctionLib() {
+    const now = Date.now();
+    if (cachedFunctionLib && cachedAt && (now - cachedAt) < CACHE_TTL) {
+        return cachedFunctionLib;
+    }
+    try {
+        const response = await fetch(FUNCTION_LIB_URL, { headers: { 'User-Agent': 'atlisp-mcp' } });
+        if (response.ok) {
+            const data = await response.json();
+            cachedFunctionLib = data;
+            cachedAt = now;
+            return data;
+        }
+    } catch (e) {
+        log(`loadAtlibFunctionLib error: ${e.message}`);
+    }
+    return null;
+}
+
 const TOOL_HANDLERS = {
     connect_cad:           () => cadHandlers.connectCad(),
     eval_lisp:             (a) => cadHandlers.evalLisp(a.code),
@@ -129,17 +153,15 @@ const TOOL_HANDLERS = {
     init_atlisp:          () => cadHandlers.initAtlisp(),
     get_function_usage:    (a) => functionHandlers.getFunctionUsage(a.name, a.package),
     list_functions:        (a) => functionHandlers.listFunctions(a.package),
-    get_file_extensions:  (a) => {
-        const exts = FILE_EXTENSIONS[a.platform];
-        if (!exts) return { content: [{ type: 'text', text: `平台 ${a.platform} 不支持` }], isError: true };
-        return { content: [{ type: 'text', text: `${a.platform} 文件扩展名: ${exts.join(', ')}` }] };
+    load_atlisp_functionlib: async (a) => {
+        const data = await loadAtlibFunctionLib();
+        if (!data) return { content: [{ type: 'text', text: '加载函数库失败' }], isError: true };
+        if (a.format === 'list') {
+            const items = data.functions?.map(f => `${f.name}: ${f.description || ''}`) || [];
+            return { content: [{ type: 'text', text: items.join('\n') }] };
+        }
+        return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
     },
-    get_install_code:     () => ({
-        content: [{
-            type: 'text',
-            text: `复制以下代码到 CAD 命令行加载:\n(load "atlisp" "atlisp")\n(vlax-create-object "atlisp.atlisp.1")`
-        }]
-    }),
 };
 
 function getOrCreateSessionServer(sessionId) {
@@ -264,7 +286,7 @@ export const tools = [
     },
     {
 	name: 'get_function_usage',
-	description: '获取 @lisp 函数用法（从本地 JSON 库）',
+	description: '获取 @lisp 函数用法',
 	inputSchema: {
 	    type: 'object',
 	    properties: {
@@ -285,20 +307,14 @@ export const tools = [
 	}
     },
     {
-	name: 'get_file_extensions',
-	description: '获取 CAD 平台对应的文件扩展名',
+	name: 'load_atlisp_functionlib',
+	description: '从 http://s3.atlisp.cn/json/functions.json 加载 @lisp 函数库（用于 AI Agent 的提示词和编程调用）',
 	inputSchema: {
 	    type: 'object',
 	    properties: {
-		platform: { type: 'string', description: 'CAD 平台，如 AutoCAD, ZWCAD, GStarCAD, BricsCAD' }
-	    },
-	    required: ['platform']
+		format: { type: 'string', enum: ['json', 'list'], description: '返回格式：json（完整JSON）或 list（函数名:描述 列表），默认 json' }
+	    }
 	}
-    },
-    {
-	name: 'get_install_code',
-	description: '获取 @lisp 安装代码',
-	inputSchema: { type: 'object', properties: {} }
     }
 ];
 

package/src/handlers/cad-handlers.js

@@ -78,6 +78,18 @@ export async function installAtlisp() {
     return { content: [{ type: 'text', text: '已发送 @lisp 安装代码到 CAD' }] };
 }
 
+export async function listFunctionsInCad() {
+    if (!cad.connected) { await cad.connect(); }
+    if (!cad.connected) return { content: [{ type: 'text', text: '未连接 CAD' }], isError: true };
+    try {
+        const result = await cad.sendCommandWithResult('(atoms-family 0)', null);
+        if (result) return { content: [{ type: 'text', text: result }] };
+        return { content: [{ type: 'text', text: 'CAD 函数列表为空' }] };
+    } catch (e) {
+        return { content: [{ type: 'text', text: `错误: ${e.message}` }], isError: true };
+    }
+}
+
 export async function initAtlisp() {
     if (!cad.connected) { await cad.connect(); }
     if (!cad.connected) return { content: [{ type: 'text', text: '未连接 CAD' }], isError: true };

package/src/handlers/function-handlers.js

@@ -1,9 +1,10 @@
 import fs from 'fs/promises';
 import path from 'path';
 import { log } from '../logger.js';
+import * as cadHandlers from './cad-handlers.js';
 
 const FUNCTIONS_DIR = process.env.FUNCTIONS_DIR || '';
-const FUNCTIONS_URL = process.env.FUNCTIONS_URL || 'https://s3.atlisp.cn/json/';
+const FUNCTIONS_URL = process.env.FUNCTIONS_URL || 'http://s3.atlisp.cn/json/functions.json';
 
 async function fileExists(filePath) {
     try { await fs.access(filePath); return true; } catch { return false; }
@@ -13,40 +14,25 @@ export async function getFunctionUsage(funcName, packageName) {
     try {
         let results = [];
 
-        const url = packageName
-            ? `${FUNCTIONS_URL}${packageName}.json`
-            : `${FUNCTIONS_URL}all.json`;
-
         try {
-            const response = await fetch(url, { headers: { 'User-Agent': 'Mozilla/5.0' } });
+            const response = await fetch(FUNCTIONS_URL, { headers: { 'User-Agent': 'atlisp-mcp' } });
             if (response.ok) {
                 const data = await response.json();
-                if (data.functions) {
-                    const func = data.functions.find(f => f.name === funcName);
-                    if (func) results.push(func);
-                }
+                const funcs = data.functions || [];
+                const func = funcs.find(f => f.name === funcName || f.name === `${packageName}:${funcName}`);
+                if (func) results.push(func);
             }
         } catch (e) {
             log(`function-handlers fetch error: ${e.message}`);
         }
 
         if (results.length === 0 && FUNCTIONS_DIR && await fileExists(FUNCTIONS_DIR)) {
-            if (packageName) {
-                const filePath = path.join(FUNCTIONS_DIR, `${packageName}.json`);
-                if (await fileExists(filePath)) {
-                    const raw = await fs.readFile(filePath, 'utf-8');
-                    const data = JSON.parse(raw);
-                    const func = data.functions?.find(f => f.name === funcName);
-                    if (func) results.push(func);
-                }
-            } else {
-                const files = (await fs.readdir(FUNCTIONS_DIR)).filter(f => f.endsWith('.json'));
-                for (const file of files) {
-                    const raw = await fs.readFile(path.join(FUNCTIONS_DIR, file), 'utf-8');
-                    const data = JSON.parse(raw);
-                    const func = data.functions?.find(f => f.name === funcName);
-                    if (func) results.push(func);
-                }
+            const files = (await fs.readdir(FUNCTIONS_DIR)).filter(f => f.endsWith('.json'));
+            for (const file of files) {
+                const raw = await fs.readFile(path.join(FUNCTIONS_DIR, file), 'utf-8');
+                const data = JSON.parse(raw);
+                const func = data.functions?.find(f => f.name === funcName);
+                if (func) results.push(func);
             }
         }
 
@@ -71,18 +57,15 @@ export async function listFunctions(packageName) {
     try {
         let allFuncs = [];
 
-        const url = packageName
-            ? `${FUNCTIONS_URL}${packageName}.json`
-            : `${FUNCTIONS_URL}all.json`;
-
         try {
-            const response = await fetch(url, { headers: { 'User-Agent': 'Mozilla/5.0' } });
+            const response = await fetch(FUNCTIONS_URL, { headers: { 'User-Agent': 'atlisp-mcp' } });
             if (response.ok) {
                 const data = await response.json();
-                if (data.functions) {
-                    allFuncs = packageName
-                        ? data.functions
-                        : data.functions.map(f => `${f.name}: ${f.description || '-'}`);
+                const funcs = data.functions || [];
+                if (packageName) {
+                    allFuncs = funcs.filter(f => f.name.startsWith(`${packageName}:`));
+                } else {
+                    allFuncs = funcs.map(f => `${f.name}: ${f.description || '-'}`);
                 }
             }
         } catch (e) {
@@ -92,29 +75,32 @@ export async function listFunctions(packageName) {
         if (allFuncs.length === 0 && FUNCTIONS_DIR && await fileExists(FUNCTIONS_DIR)) {
             const files = (await fs.readdir(FUNCTIONS_DIR)).filter(f => f.endsWith('.json'));
             for (const file of files) {
-                const raw = await fs.readFile(path.join(FUNCTIONS_DIR, file), 'utf-8');
-                const data = JSON.parse(raw);
-                if (packageName) {
-                    if (data.package === packageName) {
-                        allFuncs = data.functions || [];
-                    }
-                } else {
-                    for (const f of (data.functions || [])) {
-                        allFuncs.push(`${f.name}: ${f.description || '-'}`);
+                try {
+                    const raw = await fs.readFile(path.join(FUNCTIONS_DIR, file), 'utf-8');
+                    const data = JSON.parse(raw);
+                    const funcs = data.functions || [];
+                    if (packageName) {
+                        allFuncs = funcs.filter(f => f.name.startsWith(`${packageName}:`));
+                    } else {
+                        for (const f of funcs) {
+                            allFuncs.push(`${f.name}: ${f.description || '-'}`);
+                        }
                     }
+                } catch (err) {
+                    log(`read file ${file} error: ${err.message}`);
                 }
             }
         }
 
         if (allFuncs.length === 0) {
-            return { content: [{ type: 'text', text: '函数库为空' }] };
+            return await cadHandlers.listFunctionsInCad();
         }
 
         if (packageName) {
             return { content: [{ type: 'text', text: `${packageName} 包函数 (${allFuncs.length}):\n${allFuncs.map(f => f.name).join('\n')}` }] };
         }
 
-        return { content: [{ type: 'text', text: `函数库共 ${allFuncs.length} 个函数` }] };
+        return { content: [{ type: 'text', text: allFuncs.join('\n') }] };
     } catch (e) {
         return { content: [{ type: 'text', text: `错误: ${e.message}` }], isError: true };
     }

package/src/handlers/package-handlers.js

@@ -1,17 +1,57 @@
+const PACKAGES_LIST_URL = process.env.PACKAGES_LIST_URL || 'http://s3.atlisp.cn/packages-list?fmt=json';
 import { cad } from '../cad.js';
 import { MOCK_PACKAGES } from '../constants.js';
+let cachedPackages = null;
+let cachedAt = null;
+const CACHE_TTL = 10 * 60 * 1000;
+
+async function fetchPackages() {
+    const now = Date.now();
+    if (cachedPackages && cachedAt && (now - cachedAt) < CACHE_TTL) {
+        return cachedPackages;
+    }
+    try {
+        const response = await fetch(PACKAGES_LIST_URL, { headers: { 'User-Agent': 'atlisp-mcp' } });
+        if (response.ok) {
+            const data = await response.json();
+            cachedPackages = data;
+            cachedAt = now;
+            return data;
+        }
+    } catch (e) {}
+    return null;
+}
 
 export async function listPackages() {
+    if (!cad.connected) await cad.connect();
+    if (!cad.connected) return { content: [{ type: 'text', text: '未连接 CAD' }], isError: true };
+    const result = await cad.sendCommandWithResult('(@::package-list-in-local)');
+    if (result && result !== 'nil') return { content: [{ type: 'text', text: result }] };
     const packages = MOCK_PACKAGES.map(p => `${p.name} v${p.version} - ${p.description}`);
     return { content: [{ type: 'text', text: `已安装的 @lisp 包:\n${packages.join('\n')}` }] };
 }
 
 export async function searchPackages(query) {
-    const results = MOCK_PACKAGES.filter(p => p.name.includes(query) || p.description.includes(query));
+    const data = await fetchPackages();
+    if (!data) {
+        return { content: [{ type: 'text', text: '无法获取包列表' }], isError: true };
+    }
+    const results = [];
+    const items = Array.isArray(data) ? data : (data.packages || []);
+    if (query) {
+        const q = query.toLowerCase();
+        for (const p of items) {
+            const name = (p.name || '').toLowerCase();
+            const desc = (p.description || '').toLowerCase();
+            if (name.includes(q) || desc.includes(q)) results.push(p);
+        }
+    } else {
+        for (const p of items) results.push(p);
+    }
     if (results.length === 0) {
         return { content: [{ type: 'text', text: `未找到包含 "${query}" 的包` }] };
     }
-    return { content: [{ type: 'text', text: `搜索结果:\n${results.map(p => `${p.name} v${p.version} - ${p.description}`).join('\n')}` }] };
+    return { content: [{ type: 'text', text: `搜索结果 (${results.length}):\n${results.map(p => `${p.name} v${p.version || ''} - ${p.description || ''}`).join('\n')}` }] };
 }
 
 export async function installPackage(packageName) {