@ia-ccun/code-agent-cli 0.0.16 → 0.0.18

package/bin/cli.js

@@ -2,13 +2,16 @@
 
 /**
  * aicode-cli
- * AI Coding Agent CLI - 基于 @mariozechner/pi-coding-agent
+ * AI Coding Agent CLI
  */
 
-import { spawn, execSync } from 'child_process';
+// 设置终端标题
+process.title = 'aicode-cli';
+
+import { spawn } from 'child_process';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
-import { existsSync, readFileSync } from 'fs';
+import { existsSync, readFileSync, writeFileSync } from 'fs';
 import { getConfig, getConfigDir, loadConfig } from '../dist/config-loader.js';
 import { generateBanner } from '../dist/banner.js';
 
@@ -19,30 +22,30 @@ const __dirname = dirname(__filename);
 function parseArgs() {
   const args = process.argv.slice(2);
   let configDir;
-  let webMode = false;
-  let webPort;
-
+  
+  // 处理 --version 参数，显示 CLI 自己的版本
+  if (args.includes('--version') || args.includes('-v')) {
+    const pkgPath = join(__dirname, '..', 'package.json');
+    if (existsSync(pkgPath)) {
+      const { version } = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+      console.log(version);
+    }
+    process.exit(0);
+  }
+  
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
     if (arg === '--config' || arg === '-c') {
       configDir = args[i + 1];
       args.splice(i, 2);
-      i--;
-    } else if (arg === '--web' || arg === '--webui') {
-      webMode = true;
-      args.splice(i, 1);
-      i--;
-    } else if (arg === '--port' || arg === '-p') {
-      webPort = parseInt(args[i + 1], 10);
-      args.splice(i, 2);
-      i--;
+      break;
     }
   }
-
-  return { remainingArgs: args, configDir, webMode, webPort };
+  
+  return { remainingArgs: args, configDir };
 }
 
-const { remainingArgs, configDir: cliConfigDir, webMode, webPort } = parseArgs();
+const { remainingArgs, configDir: cliConfigDir } = parseArgs();
 
 // 优先使用命令行参数，其次使用环境变量，最后使用默认值
 const effectiveConfigDir = cliConfigDir || process.env.AICODE_CLI_CONFIG_DIR;
@@ -57,91 +60,106 @@ if (effectiveConfigDir) {
   config = getConfig();
 }
 
+// ============================================================================
+// 替换 models.json 中的 ${CLI_VERSION} 占位符
+// ============================================================================
+function replaceCLIVersionPlaceholder() {
+  try {
+    // 找到项目根目录的 package.json
+    let rootDir = __dirname;
+    while (rootDir !== dirname(rootDir)) {
+      const pkgPath = join(rootDir, 'package.json');
+      if (existsSync(pkgPath)) {
+        const { version } = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+        const versionString = `aicode-cli/${version}`;
+        
+        // 查找配置目录下的 models.json
+        const homeDir = process.env.HOME || process.env.USERPROFILE;
+        const configDirs = [
+          join(homeDir, '.aicode-cli', 'agent'),
+          join(homeDir, '.pi', 'agent'),
+        ];
+        
+        for (const dir of configDirs) {
+          const modelsPath = join(dir, 'models.json');
+          if (!existsSync(modelsPath)) continue;
+          
+          try {
+            let content = readFileSync(modelsPath, 'utf-8');
+            const config = JSON.parse(content);
+            
+            // 遍历所有 provider，替换 headers.User-Agent 中的占位符
+            for (const provider of Object.values(config.providers || {})) {
+              if (provider.headers && provider.headers['User-Agent']) {
+                const ua = provider.headers['User-Agent'];
+                if (ua && ua.startsWith('${') && ua.endsWith('}')) {
+                  provider.headers['User-Agent'] = versionString;
+                }
+              }
+            }
+            
+            const newContent = JSON.stringify(config, null, 2);
+            if (newContent !== content) {
+              writeFileSync(modelsPath, newContent, 'utf-8');
+            }
+          } catch (e) {
+            // 忽略错误
+          }
+        }
+        break;
+      }
+      rootDir = dirname(rootDir);
+    }
+  } catch (e) {
+    // 忽略错误
+  }
+}
 
+// 执行占位符替换
+replaceCLIVersionPlaceholder();
 
 // 显示 Banner
 if (config.banner === '__default__' || config.banner !== '') {
   console.log(generateBanner(config.themeColor));
 }
 
-// 检查新版本（后台异步执行，不阻塞启动）
-function checkForUpdates() {
-  setTimeout(async () => {
-    try {
-      // 读取本地版本
-      const pkgPath = new URL('../package.json', import.meta.url).pathname;
-      const localVersion = JSON.parse(readFileSync(pkgPath)).version;
-
-      // 获取当前 registry
-      const registry = execSync('npm config get registry', { encoding: 'utf8', stdio: 'pipe' }).trim();
-      const latestVersion = execSync(`npm view @nucc/code-agent-cli version --registry=${registry}`, { encoding: 'utf8', stdio: 'pipe' }).trim();
-
-      // 比较版本号
-      const localParts = localVersion.split('.').map(Number);
-      const latestParts = latestVersion.split('.').map(Number);
-      const needsUpdate = latestParts[0] > localParts[0] ||
-                         (latestParts[0] === localParts[0] && latestParts[1] > localParts[1]) ||
-                         (latestParts[0] === localParts[0] && latestParts[1] === localParts[1] && latestParts[2] > localParts[2]);
-
-      if (needsUpdate) {
-        console.log('\n\x1b[33m⚠️  发现新版本 v%s → v%s\x1b[0m', localVersion, latestVersion);
-        console.log('\x1b[36m   运行以下命令更新:\x1b[0m');
-        console.log('   npm install -g @nucc/code-agent-cli\n');
+// 检查新版本
+async function checkForUpdates() {
+  try {
+    const { execSync } = await import('child_process');
+    // 读取本地版本 - 向上查找 package.json
+    let rootDir = __dirname;
+    let localVersion = null;
+    while (rootDir !== dirname(rootDir)) {
+      const pkgPath = join(rootDir, 'package.json');
+      if (existsSync(pkgPath)) {
+        localVersion = JSON.parse(readFileSync(pkgPath, 'utf-8')).version;
+        break;
       }
-    } catch (e) {
-      // 忽略检查失败
+      rootDir = dirname(rootDir);
+    }
+    if (!localVersion) return;
+
+    // 获取当前 registry
+    const registry = execSync('npm config get registry', { encoding: 'utf8', stdio: 'pipe' }).trim();
+    const latestVersion = execSync(`npm view @nucc/code-agent-cli version --registry=${registry}`, { encoding: 'utf8', stdio: 'pipe' }).trim();
+
+    // 比较版本号
+    const localParts = localVersion.split('.').map(Number);
+    const latestParts = latestVersion.split('.').map(Number);
+    const needsUpdate = latestParts[0] > localParts[0] ||
+                       (latestParts[0] === localParts[0] && latestParts[1] > localParts[1]) ||
+                       (latestParts[0] === localParts[0] && latestParts[1] === localParts[1] && latestParts[2] > localParts[2]);
+
+    if (needsUpdate) {
+      console.log('\n⚠️  发现新版本 v%s → v%s', localVersion, latestVersion);
+      console.log('\n   运行以下命令更新:');
+      console.log('   npm install -g @nucc/code-agent-cli\n');
     }
-  }, 100); // 延迟 100ms 确保不影响主流程
-}
-
-// WebUI 模式
-if (webMode) {
-  const webuiDir = join(__dirname, '..', 'webui', 'server');
-
-  // 先构建 webui
-  console.log('🔨 Building WebUI...');
-  try {
-    execSync('npm run build', { cwd: webuiDir, stdio: 'inherit' });
   } catch (e) {
-    console.error('Failed to build WebUI:', e);
-    process.exit(1);
+    // 忽略检查失败
   }
-
-  // 启动 WebUI 服务器
-  const portArgs = webPort ? ['--port', String(webPort)] : [];
-  const webuiProcess = spawn('node', ['dist/index.js', ...portArgs], {
-    cwd: webuiDir,
-    stdio: 'inherit',
-    env: {
-      ...process.env,
-      AICODE_CLI_CONFIG_DIR: config.configDir,
-    }
-  });
-
-  // 自动打开浏览器
-  const port = webPort || 3002;
-  setTimeout(() => {
-    try {
-      execSync(`open http://localhost:${port}`, { stdio: 'ignore' });
-    } catch (e) {
-      // 忽略打开浏览器失败
-    }
-  }, 2000);
-
-  webuiProcess.on('exit', (code) => {
-    process.exit(code ?? 0);
-  });
-
-  webuiProcess.on('error', (err) => {
-    console.error('Failed to start WebUI:', err);
-    process.exit(1);
-  });
-
-  // WebUI 模式下不执行后续的 TUI 逻辑
-  checkForUpdates();
-  // 不阻塞，让 webui 进程继续运行
 }
-
 checkForUpdates();
 
 // 获取 node_modules 中 pi-coding-agent 的 CLI 路径
@@ -162,8 +180,6 @@ const fullPath = join(process.env.HOME || process.env.USERPROFILE, config.config
 const agentDir = join(fullPath, 'agent');
 env.AICODE_CLI_CODING_AGENT_DIR = agentDir;
 
-
-
 // 启动 pi-coding-agent
 const child = spawn('node', [piAgentPath.pathname, ...remainingArgs], {
   stdio: 'inherit',

package/config/agent/extensions/review.ts

@@ -916,6 +916,9 @@ export default function reviewExtension(pi: ExtensionAPI) {
 			fullPrompt += `\n\nThis project has additional instructions for code reviews:\n\n${projectGuidelines}`;
 		}
 
+		// 要求 AI 使用中文输出
+		fullPrompt += `\n\n---\n\n**重要：请使用中文撰写审查反馈。**`;
+
 		const modeHint = useFreshSession ? " (fresh session)" : "";
 		ctx.ui.notify(`Starting review: ${hint}${modeHint}`, "info");
 

package/config/agent/models.json

@@ -2,52 +2,26 @@
   "providers": {
     "openai": {
       "name": "OpenAI",
-      "baseUrl": "https://api.openai.com/v1",
+      "baseUrl": "https://ai-llm.xxx.com/v1",
       "api": "openai-completions",
       "apiKey": "YOUR_API_KEY_HERE",
+      "headers": {
+        "User-Agent": "aicode-cli",
+        "sourceIp": "!hostname -I 2>/dev/null | awk '{print $1}' || ipconfig getifaddr en0 2>/dev/null || echo ''"
+      },
       "models": [
         {
-          "id": "gpt-4o",
-          "name": "GPT-4o",
-          "contextWindow": 128000,
-          "maxTokens": 16384,
-          "reasoning": false,
-          "input": ["text"],
-          "cost": {
-            "input": 2.5,
-            "output": 10
-          }
-        },
-        {
-          "id": "gpt-4o-mini",
-          "name": "GPT-4o Mini",
-          "contextWindow": 128000,
-          "maxTokens": 16384,
-          "reasoning": false,
-          "input": ["text"],
-          "cost": {
-            "input": 0.075,
-            "output": 0.3
-          }
-        }
-      ]
-    },
-    "anthropic": {
-      "name": "Anthropic",
-      "baseUrl": "https://api.anthropic.com",
-      "api": "anthropic-messages",
-      "apiKey": "YOUR_API_KEY_HERE",
-      "models": [
-        {
-          "id": "claude-sonnet-4-20250514",
-          "name": "Claude Sonnet 4",
+          "id": "GLM-4.7-W8A8",
+          "name": "GLM4.7",
           "contextWindow": 200000,
-          "maxTokens": 8192,
-          "reasoning": true,
+          "maxTokens": 100000,
+          "reasoning": false,
           "input": ["text"],
           "cost": {
-            "input": 3,
-            "output": 15
+            "input": 5,
+            "output": 5,
+            "cacheRead": 0,
+            "cacheWrite": 0
           }
         }
       ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ia-ccun/code-agent-cli",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "AI Coding Agent CLI - 基于OpenClaw🦞底层Agent原理实现的的编码智能体（供学习使用）。",
   "type": "module",
   "main": "./dist/index.js",
@@ -32,9 +32,6 @@
     "postinstall": "node scripts/postinstall.js",
     "test": "echo \"Tests skipped\" && exit 0",
     "release": "npm version patch",
-    "webui:build": "cd webui/server && npm run build",
-    "webui:dev": "cd webui/server && npm run dev",
-    "webui": "npm run webui:build && node webui/server/dist/index.js",
     "prepare": "husky"
   },
   "dependencies": {

package/scripts/postinstall.js

@@ -68,6 +68,21 @@ if (existsSync(piAgentConfigJs)) {
   }
 }
 
+// Fix pi-coding-agent slash commands - change "Quit pi" to "Quit aicode-cli"
+const slashCommandsJs = join(__dirname, '..', 'node_modules', '@mariozechner', 'pi-coding-agent', 'dist', 'core', 'slash-commands.js');
+if (existsSync(slashCommandsJs)) {
+  try {
+    let content = readFileSync(slashCommandsJs, 'utf-8');
+    if (content.includes('Quit pi')) {
+      content = content.replace(/Quit pi/g, 'Quit aicode-cli');
+      writeFileSync(slashCommandsJs, content);
+      console.log(`✓ Updated slash command description`);
+    }
+  } catch (e) {
+    console.log(`⚠ Could not update slash commands: ${e.message}`);
+  }
+}
+
 // Ensure .aicode-cli directory exists
 if (!existsSync(aicodeCliDir)) {
   mkdirSync(aicodeCliDir, { recursive: true });
@@ -114,6 +129,27 @@ function copyDirRecursive(src, dest) {
   }
 }
 
+// Force copy directory recursively (always overwrite destination)
+function forceCopyDirRecursive(src, dest) {
+  if (!existsSync(src)) return;
+  
+  const stats = statSync(src);
+  if (stats.isDirectory()) {
+    if (!existsSync(dest)) {
+      mkdirSync(dest, { recursive: true });
+    }
+    readdirSync(src).forEach(file => {
+      forceCopyDirRecursive(join(src, file), join(dest, file));
+    });
+  } else {
+    const parentDir = dirname(dest);
+    if (!existsSync(parentDir)) {
+      mkdirSync(parentDir, { recursive: true });
+    }
+    copyFileSync(src, dest);
+  }
+}
+
 // Copy config.json if it doesn't exist
 const packageConfigFile = join(__dirname, '..', 'config.json');
 const userConfigFile = join(aicodeCliDir, 'config.json');
@@ -125,8 +161,58 @@ if (existsSync(packageConfigFile) && !existsSync(userConfigFile)) {
   console.log('⚠ config.json not found in package');
 }
 
-// Copy config/agent contents to ~/.aicode-cli/agent only if they don't exist (preserve user customizations)
+// ============================================================================
+// Files/folders that must be force-overwritten on every install
+// ============================================================================
 const packageConfigDir = join(__dirname, '..', 'config', 'agent');
+
+const FORCE_OVERWRITE_LIST = [
+  'extensions/working-msg.ts',
+  // Add more files or folders here to force overwrite on every install
+  // Examples:
+  // 'skills/some-skill',
+  // 'prompts/some-prompt.md',
+  // 'themes/dark.json',
+];
+
+// Function to force overwrite specific files/folders
+function forceOverwriteList(relativePaths) {
+  relativePaths.forEach(relativePath => {
+    const srcPath = join(packageConfigDir, relativePath);
+    const destPath = join(agentDir, relativePath);
+    
+    if (existsSync(srcPath)) {
+      try {
+        const stats = statSync(srcPath);
+        if (stats.isDirectory()) {
+          // Force copy directory
+          if (!existsSync(destPath)) {
+            mkdirSync(destPath, { recursive: true });
+          }
+          forceCopyDirRecursive(srcPath, destPath);
+          console.log(`✓ Force overwritten (dir): ${relativePath}`);
+        } else {
+          // Force copy file
+          const parentDir = dirname(destPath);
+          if (!existsSync(parentDir)) {
+            mkdirSync(parentDir, { recursive: true });
+          }
+          copyFileSync(srcPath, destPath);
+          console.log(`✓ Force overwritten: ${relativePath}`);
+        }
+      } catch (e) {
+        console.log(`⚠ Could not force overwrite ${relativePath}: ${e.message}`);
+        if (e.stack) {
+          console.log(e.stack);
+        }
+      }
+    } else {
+      console.log(`⚠ Source path does not exist: ${relativePath}`);
+    }
+  });
+}
+
+// Copy config/agent contents to ~/.aicode-cli/agent only if they don't exist (preserve user customizations)
 if (existsSync(packageConfigDir)) {
   console.log(`📁 Syncing default config files to ${agentDir} (preserving user customizations)`);
 
@@ -134,6 +220,11 @@ if (existsSync(packageConfigDir)) {
   copyDirRecursive(packageConfigDir, agentDir);
   console.log('✓ Default config files synced successfully');
 
+  // Force overwrite specified files/folders
+  if (FORCE_OVERWRITE_LIST.length > 0) {
+    forceOverwriteList(FORCE_OVERWRITE_LIST);
+  }
+
   // Check for extensions
   const extensionsDir = join(agentDir, 'extensions');
   if (existsSync(extensionsDir)) {
@@ -150,6 +241,44 @@ if (existsSync(packageConfigDir)) {
   console.log('⚠ Configuration directory not found in package');
 }
 
+// ============================================================================
+// Reset User-Agent placeholder in models.json (so CLI can replace it on each run)
+// ============================================================================
+const modelsPath = join(agentDir, 'models.json');
+if (existsSync(modelsPath)) {
+  try {
+    let content = readFileSync(modelsPath, 'utf-8');
+    // 只重置 headers.User-Agent 下的版本号为占位符
+    try {
+      const config = JSON.parse(content);
+      for (const provider of Object.values(config.providers || {})) {
+        if (provider.headers && provider.headers['User-Agent']) {
+          const ua = provider.headers['User-Agent'];
+          // 如果是以 aicode-cli/ 开头，替换为占位符
+          if (ua && ua.startsWith('aicode-cli/')) {
+            provider.headers['User-Agent'] = '${VERSION}';
+          }
+        }
+      }
+      const newContent = JSON.stringify(config, null, 2);
+      
+      if (newContent !== content) {
+        writeFileSync(modelsPath, newContent, 'utf-8');
+        console.log('✓ Reset User-Agent placeholder in models.json');
+      }
+    } catch (e) {
+      console.log(`⚠ Could not reset User-Agent placeholder: ${e.message}`);
+    }
+    
+    if (newContent !== content) {
+      writeFileSync(modelsPath, newContent, 'utf-8');
+      console.log('✓ Reset User-Agent placeholder in models.json');
+    }
+  } catch (e) {
+    console.log(`⚠ Could not reset User-Agent placeholder: ${e.message}`);
+  }
+}
+
 // Create symlink ~/.pi linking to ~/.aicode-cli (if not exists)
 try {
   if (!existsSync(piDir)) {
@@ -170,24 +299,19 @@ try {
   }
 }
 
-// Check if models.json exists
-const modelsPath = join(agentDir, 'models.json');
+// Check and display models config
 if (existsSync(modelsPath)) {
   try {
-    const models = JSON.parse(readFileSync(modelsPath, 'utf8'));
-    const modelCount = Object.keys(models).length;
-    if (modelCount > 0) {
-      console.log(`✓ Found ${modelCount} configured model(s):`);
-      console.log(`  - ${Object.keys(models).join(', ')}`);
-    } else {
-      console.log(`✓ Config file exists but no models configured`);
+    const models = JSON.parse(readFileSync(modelsPath, 'utf-8'));
+    if (models.providers) {
+      const providerCount = Object.keys(models.providers).length;
+      console.log(`✓ Found ${providerCount} configured provider(s)`);
     }
   } catch (e) {
     console.log(`⚠ Error reading models.json: ${e.message}`);
   }
 } else {
   console.log(`⚠ No models.json found at ${modelsPath}`);
-  console.log('\n📌 To configure models, create ~/.aicode-cli/agent/models.json');
 }
 
 console.log('\n✨ Setup complete!');