@atlisp/agent 0.1.9 → 0.1.11

package/agent.js

@@ -2,6 +2,7 @@ import { createProvider } from './providers/index.js';
 import { createMcpClient, connectMcp } from './mcp/index.js';
 import { buildSystemMessage, buildToolsDescription } from './prompt.js';
 import { getAgentConfig } from './config.js';
+import { spawn } from 'child_process';
 
 export class Agent {
   constructor(options = {}) {
@@ -14,11 +15,94 @@ export class Agent {
     this.verbose = this.config.verbose || false;
   }
 
+  async startMcpService() {
+    return new Promise((resolve, reject) => {
+      console.error('[Agent] 正在启动 npx @atlisp/mcp...');
+
+      const mcpProc = spawn('npx', ['-y', '@atlisp/mcp', '--http'], {
+        stdio: ['ignore', 'pipe', 'pipe'],
+        detached: true,
+        shell: true,
+      });
+
+      let output = '';
+      mcpProc.stdout.on('data', (data) => {
+        output += data.toString();
+      });
+      mcpProc.stderr.on('data', (data) => {
+        output += data.toString();
+      });
+
+      const timeout = setTimeout(() => {
+        mcpProc.kill();
+        reject(new Error('MCP 服务启动超时'));
+      }, 30000);
+
+      const checkConnection = async () => {
+        try {
+          const tools = await this.mcp.listTools();
+          if (tools?.tools?.length > 0) {
+            clearTimeout(timeout);
+            console.error('[Agent] MCP 服务已启动');
+            resolve(true);
+            return;
+          }
+        } catch {}
+
+        if (output.includes('started') || output.includes('listen') || output.includes('8120')) {
+          clearTimeout(timeout);
+          console.error('[Agent] MCP 服务已启动');
+          resolve(true);
+          return;
+        }
+
+        setTimeout(checkConnection, 1000);
+      };
+
+      setTimeout(checkConnection, 3000);
+    });
+  }
+
+  async checkMcpAvailable() {
+    try {
+      const tools = await this.mcp.listTools();
+      return tools?.tools?.length > 0;
+    } catch (e) {
+      if (this.mcp.config?.mode === 'http') {
+        console.error('[Agent] MCP HTTP 模式连接失败，请确保 MCP 服务已启动');
+        console.error(`[Agent] 尝试连接: ${this.mcp.config?.url || 'http://localhost:8110'}`);
+      }
+      return false;
+    }
+  }
+
   async initialize() {
     console.error('[Agent] 初始化...');
 
-    await connectMcp(this.mcp);
-    console.error('[Agent] MCP 连接成功');
+    try {
+      await connectMcp(this.mcp);
+      console.error('[Agent] MCP 连接成功');
+    } catch (e) {
+      const isHttpMode = this.mcp.config?.mode === 'http' || !this.mcp.config?.command;
+      if (isHttpMode) {
+        console.error('[Agent] MCP HTTP 模式连接失败，尝试启动 MCP 服务...');
+        await this.startMcpService();
+      } else {
+        throw e;
+      }
+    }
+
+    const available = await this.checkMcpAvailable();
+    if (!available) {
+      console.error('\n========================================');
+      console.error('[错误] 无法连接到 MCP 服务');
+      console.error('');
+      console.error('请先运行 atlisp-mcp 服务：');
+      console.error('  - 方式1: npx -y atlisp-mcp');
+      console.error('  - 方式2: 在 CAD 中加载 @lisp 后执行 (@MCP)');
+      console.error('========================================\n');
+      throw new Error('MCP 服务不可用，请先启动 atlisp-mcp 服务');
+    }
 
     this.tools = await this.mcp.listTools();
     console.error(`[Agent] 已加载 ${this.tools?.tools?.length || 0} 个工具`);

package/config.js

@@ -31,8 +31,8 @@ function getDefaultConfig() {
       maxTokens: 2048,
     },
     mcp: {
-      mode: 'http',
-      url: 'http://localhost:8110',
+      mode: 'stdio',
+      url: 'http://localhost:8120',
       command: 'atlisp-mcp',
       args: ['--stdio'],
     },

package/install.ps1

@@ -218,6 +218,14 @@ function Install-Package {
     Test-NpmAvailable
 
     Write-Host ""
+    Write-Host "Installing @atlisp/mcp from npm registry..." -ForegroundColor Cyan
+    npm install -g @atlisp/mcp --silent
+
+    if ($LASTEXITCODE -ne 0) {
+        Write-Host "Error: npm install @atlisp/mcp failed" -ForegroundColor Red
+        exit 1
+    }
+
     Write-Host "Installing $packageName from npm registry..." -ForegroundColor Cyan
     npm install -g @atlisp/agent --silent
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlisp/agent",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "AI Agent for @lisp - Connects to MCP Server for CAD operations",
   "type": "module",
   "main": "index.js",