@atlisp/agent 0.1.11 → 0.1.13

package/README.md

@@ -100,23 +100,52 @@ mcp:
 
 ## 环境变量
 
-配置可被环境变量覆盖（优先级最高）:
+配置可被环境变量覆盖（优先级最高）。支持两种方式：
+
+### 方式1: 命令行环境变量
 
 ```bash
 # LLM
 export LLM_PROVIDER=deepseek
+export LLM_BASE_URL=https://api.deepseek.com
 export LLM_MODEL=deepseek-v4-flash
-export DEEPSEEK_API_KEY=sk-xxxxx
+export LLM_API_KEY=sk-xxxxx
 export LLM_TEMPERATURE=0.7
 export LLM_MAX_TOKENS=2048
 
 # MCP
 export MCP_MODE=stdio
+export MCP_URL=http://localhost:8120
 export MCP_COMMAND=atlisp-mcp
-export MCP_ARGS="--stdio"
 
 # Agent
+export AGENT_ENABLED=true
+export AGENT_MAX_STEPS=500
 export AGENT_VERBOSE=true
+```
+
+### 方式2: .env 文件
+
+在 `~/.atlisp/.env` 文件中配置:
+
+```env
+# LLM 配置
+LLM_PROVIDER=deepseek
+LLM_BASE_URL=https://api.deepseek.com
+LLM_MODEL=deepseek-v4-flash
+LLM_API_KEY=sk-xxxxx
+LLM_TEMPERATURE=0.7
+LLM_MAX_TOKENS=2048
+
+# MCP 配置
+MCP_MODE=stdio
+MCP_URL=http://localhost:8120
+
+# Agent 配置
+AGENT_VERBOSE=true
+```
+
+优先级: 命令行环境变量 > .env 文件 > atlisp.json
 export AGENT_MAX_STEPS=20
 ```
 

package/config.js

@@ -15,6 +15,45 @@ function getConfigDir() {
   return path.join(os.homedir(), '.atlisp');
 }
 
+function getEnvPath() {
+  return path.join(os.homedir(), '.atlisp', '.env');
+}
+
+function loadEnvFile() {
+  const envPath = getEnvPath();
+  const envVars = {};
+
+  if (fs.existsSync(envPath)) {
+    try {
+      const content = fs.readFileSync(envPath, 'utf-8');
+      const lines = content.split('\n');
+      for (const line of lines) {
+        const trimmed = line.trim();
+        if (!trimmed || trimmed.startsWith('#')) continue;
+        const idx = trimmed.indexOf('=');
+        if (idx > 0) {
+          const key = trimmed.substring(0, idx).trim();
+          let val = trimmed.substring(idx + 1).trim();
+          if ((val.startsWith('"') && val.endsWith('"')) || (val.startsWith("'") && val.endsWith("'"))) {
+            val = val.slice(1, -1);
+          }
+          envVars[key] = val;
+        }
+      }
+    } catch (e) {
+      console.error(`[Config] .env 文件加载失败: ${e.message}`);
+    }
+  }
+
+  for (const [key, val] of Object.entries(process.env)) {
+    if (val !== undefined && val !== '') {
+      envVars[key] = val;
+    }
+  }
+
+  return envVars;
+}
+
 function getDefaultConfig() {
   return {
     agent: {
@@ -71,8 +110,7 @@ function loadConfigFile() {
     }
   }
 
-  saveDefaultConfig(jsonPath);
-  return {};
+  return null;
 }
 
 function deepMerge(target, source) {
@@ -91,8 +129,13 @@ let config = null;
 
 function loadConfig() {
   const fileConfig = loadConfigFile();
-  let merged = deepMerge(getDefaultConfig(), fileConfig);
 
+  if (fileConfig === null) {
+    const jsonPath = getConfigPath();
+    saveDefaultConfig(jsonPath);
+  }
+
+  let merged = deepMerge(getDefaultConfig(), fileConfig);
   return merged;
 }
 
@@ -104,15 +147,42 @@ function getConfig() {
 }
 
 export function getAgentConfig() {
-  return getConfig().agent;
+  const config = getConfig().agent;
+  const envVars = loadEnvFile();
+
+  const envOverrides = {};
+  if (envVars.AGENT_ENABLED) envOverrides.enabled = envVars.AGENT_ENABLED === 'true';
+  if (envVars.AGENT_MAX_STEPS) envOverrides.maxSteps = parseInt(envVars.AGENT_MAX_STEPS);
+  if (envVars.AGENT_VERBOSE) envOverrides.verbose = envVars.AGENT_VERBOSE === 'true';
+
+  return { ...config, ...envOverrides };
 }
 
 export function getLlmConfig() {
-  return getConfig().llm;
+  const config = getConfig().llm;
+  const envVars = loadEnvFile();
+
+  const envOverrides = {};
+  if (envVars.LLM_PROVIDER) envOverrides.provider = envVars.LLM_PROVIDER;
+  if (envVars.LLM_BASE_URL) envOverrides.baseURL = envVars.LLM_BASE_URL;
+  if (envVars.LLM_MODEL) envOverrides.model = envVars.LLM_MODEL;
+  if (envVars.LLM_API_KEY) envOverrides.apiKey = envVars.LLM_API_KEY;
+  if (envVars.LLM_TEMPERATURE) envOverrides.temperature = parseFloat(envVars.LLM_TEMPERATURE);
+  if (envVars.LLM_MAX_TOKENS) envOverrides.maxTokens = parseInt(envVars.LLM_MAX_TOKENS);
+
+  return { ...config, ...envOverrides };
 }
 
 export function getMcpConfig() {
-  return getConfig().mcp;
+  const config = getConfig().mcp;
+  const envVars = loadEnvFile();
+
+  const envOverrides = {};
+  if (envVars.MCP_MODE) envOverrides.mode = envVars.MCP_MODE;
+  if (envVars.MCP_URL) envOverrides.url = envVars.MCP_URL;
+  if (envVars.MCP_COMMAND) envOverrides.command = envVars.MCP_COMMAND;
+
+  return { ...config, ...envOverrides };
 }
 
 export { getConfig };

package/mcp/stdio-client.js

@@ -16,8 +16,10 @@ export class StdioMcpClient {
   async connect() {
     return new Promise((resolve, reject) => {
       try {
-        this.proc = spawn(this.command, this.args, {
+        const npxPath = process.platform === 'win32' ? 'npx.cmd' : 'npx';
+        this.proc = spawn(npxPath, ['-y', this.command, ...this.args], {
           stdio: ['pipe', 'pipe', 'pipe'],
+          shell: true,
         });
 
         this.proc.stdout.on('data', (data) => {

package/package.json

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