@ia-ccun/code-agent-cli 0.0.54-beta.1 → 0.0.54-beta.3

package/bin/cli.js

@@ -6,15 +6,21 @@
  */
 
 // 设置终端标题
-process.title = 'aicode-cli';
-
-import { spawn } from 'child_process';
-import { fileURLToPath } from 'url';
-import { dirname, join } from 'path';
-import { existsSync, readFileSync, writeFileSync } from 'fs';
-import { getConfig, getConfigDir, loadConfig } from '../dist/config-loader.js';
-import { generateBanner } from '../dist/banner.js';
+process.title = "aicode-cli";
 
+// 防御 CWD 被删除的边缘场景: process.cwd() 会抛 ENOENT
+// 提前 chdir 到 homedir, 避免 banner / config-loader / pi-coding-agent 内部任何 cwd 调用炸
+import { homedir } from "os";
+try {
+  process.chdir(homedir());
+} catch {
+  // 极端情况: homedir 不可访问; 让后续抛清晰错误, 不要进 graceful-fs 模糊栈
+}
+import { spawn } from "child_process";
+import { fileURLToPath } from "url";
+import { dirname, join } from "path";
+import { existsSync, readFileSync, writeFileSync } from "fs";
+import { getConfig, getConfigDir, loadConfig } from "../dist/config-loader.js";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
@@ -22,9 +28,9 @@ const __dirname = dirname(__filename);
 function getLocalVersion() {
   let rootDir = __dirname;
   while (rootDir !== dirname(rootDir)) {
-    const pkgPath = join(rootDir, 'package.json');
+    const pkgPath = join(rootDir, "package.json");
     if (existsSync(pkgPath)) {
-      return JSON.parse(readFileSync(pkgPath, 'utf-8')).version;
+      return JSON.parse(readFileSync(pkgPath, "utf-8")).version;
     }
     rootDir = dirname(rootDir);
   }
@@ -33,33 +39,37 @@ function getLocalVersion() {
 
 // 获取版本缓存文件路径
 function getVersionCachePath() {
-  return join(process.env.HOME || process.env.USERPROFILE, '.aicode-cli', '.version-cache.json');
+  return join(
+    process.env.HOME || process.env.USERPROFILE,
+    ".aicode-cli",
+    ".version-cache.json",
+  );
 }
 
 // 解析命令行参数
 function parseArgs() {
   const args = process.argv.slice(2);
   let configDir;
-  
+
   // 处理 --version 参数，显示 CLI 自己的版本
-  if (args.includes('--version') || args.includes('-v')) {
-    const pkgPath = join(__dirname, '..', 'package.json');
+  if (args.includes("--version") || args.includes("-v")) {
+    const pkgPath = join(__dirname, "..", "package.json");
     if (existsSync(pkgPath)) {
-      const { version } = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+      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') {
+    if (arg === "--config" || arg === "-c") {
       configDir = args[i + 1];
       args.splice(i, 2);
       break;
     }
   }
-  
+
   return { remainingArgs: args, configDir };
 }
 
@@ -86,39 +96,39 @@ function replaceCLIVersionPlaceholder() {
     // 找到项目根目录的 package.json
     let rootDir = __dirname;
     while (rootDir !== dirname(rootDir)) {
-      const pkgPath = join(rootDir, 'package.json');
+      const pkgPath = join(rootDir, "package.json");
       if (existsSync(pkgPath)) {
-        const { version } = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+        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'),
+          join(homeDir, ".aicode-cli", "agent"),
+          join(homeDir, ".pi", "agent"),
         ];
-        
+
         for (const dir of configDirs) {
-          const modelsPath = join(dir, 'models.json');
+          const modelsPath = join(dir, "models.json");
           if (!existsSync(modelsPath)) continue;
-          
+
           try {
-            let content = readFileSync(modelsPath, 'utf-8');
+            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;
+              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');
+              writeFileSync(modelsPath, newContent, "utf-8");
             }
           } catch (e) {
             // 忽略错误
@@ -138,24 +148,21 @@ replaceCLIVersionPlaceholder();
 
 // 提前获取版本号（用于 banner 显示）
 const localVersion = getLocalVersion();
-process.env.AICODE_CLI_VERSION = localVersion || '';
+process.env.AICODE_CLI_VERSION = localVersion || "";
 
-// 显示 Banner
-if (config.banner === '__default__' || config.banner !== '') {
-  console.log(generateBanner(config.themeColor));
-}
+// banner 启动后打印已移交给 config/agent/extensions/aicode-banner.ts
+// 理由: 1) 避免 RPC 父进程的 stdout JSON-RPC 污染; 2) chdir 到 homedir 后再触发更稳
 
-// 检查新版本
 async function checkForUpdates() {
   try {
-    const { execFileSync } = await import('child_process');
+    const { execFileSync } = await import("child_process");
     // 读取本地版本 - 向上查找 package.json
     let rootDir = __dirname;
     let localVersion = null;
     while (rootDir !== dirname(rootDir)) {
-      const pkgPath = join(rootDir, 'package.json');
+      const pkgPath = join(rootDir, "package.json");
       if (existsSync(pkgPath)) {
-        localVersion = JSON.parse(readFileSync(pkgPath, 'utf-8')).version;
+        localVersion = JSON.parse(readFileSync(pkgPath, "utf-8")).version;
         break;
       }
       rootDir = dirname(rootDir);
@@ -163,30 +170,41 @@ async function checkForUpdates() {
     if (!localVersion) return;
 
     // 🔒 Security: Use execFileSync instead of execSync to prevent command injection
-    const registry = execFileSync('npm', ['config', 'get', 'registry'], { encoding: 'utf8', stdio: 'pipe' }).trim();
-    const latestVersion = execFileSync('npm', ['view', '@ia-ccun/code-agent-cli', 'version', '--registry=' + registry], { encoding: 'utf8', stdio: 'pipe' }).trim();
+    const registry = execFileSync("npm", ["config", "get", "registry"], {
+      encoding: "utf8",
+      stdio: "pipe",
+    }).trim();
+    const latestVersion = execFileSync(
+      "npm",
+      ["view", "@ia-ccun/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]);
-
-
+    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]);
 
     // 写入版本缓存
     try {
-      const cacheDir = join(process.env.HOME || process.env.USERPROFILE, '.aicode-cli');
+      const cacheDir = join(
+        process.env.HOME || process.env.USERPROFILE,
+        ".aicode-cli",
+      );
       if (!existsSync(cacheDir)) {
         // 🔒 Security: Use execFileSync for mkdir instead of execSync
-        execFileSync('mkdir', ['-p', cacheDir], { stdio: 'pipe' });
+        execFileSync("mkdir", ["-p", cacheDir], { stdio: "pipe" });
       }
       const cacheData = {
         localVersion,
         latestVersion,
         needsUpdate,
-        timestamp: Date.now()
+        timestamp: Date.now(),
       };
       writeFileSync(versionCachePath, JSON.stringify(cacheData, null, 2));
     } catch (e) {
@@ -198,7 +216,10 @@ async function checkForUpdates() {
 }
 checkForUpdates();
 
-const piAgentPathUrl = new URL('../node_modules/@earendil-works/pi-coding-agent/dist/cli.js', import.meta.url);
+const piAgentPathUrl = new URL(
+  "../node_modules/@earendil-works/pi-coding-agent/dist/cli.js",
+  import.meta.url,
+);
 const piAgentPath = fileURLToPath(piAgentPathUrl); // 解码中文路径
 
 // 获取版本缓存文件路径
@@ -209,30 +230,37 @@ const env = {
   ...process.env,
   AICODE_CLI_CONFIG_DIR: config.configDir,
   AICODE_CLI_NAME: config.name,
-  AICODE_CLI_VERSION: localVersion || '',
+  AICODE_CLI_VERSION: localVersion || "",
   AICODE_CLI_VERSION_CACHE: versionCachePath,
-  PI_SKIP_VERSION_CHECK: '1',
-  PI_OFFLINE: '1'  // 禁用包更新检查
+  PI_SKIP_VERSION_CHECK: "1",
+  PI_OFFLINE: "1", // 禁用包更新检查
 };
 
 // 传递配置目录给 pi
-// pi 使用 AICODE_CLI_CODING_AGENT_DIR 环境变量 (基于 piConfig.name)
-// 确保使用完整的绝对路径
-const fullPath = join(process.env.HOME || process.env.USERPROFILE, config.configDir);
-const agentDir = join(fullPath, 'agent');
+// pi 使用 ${APP_NAME.toUpperCase()}_CODING_AGENT_DIR 环境变量识别 agent 目录
+// 注意 "aicode-cli".toUpperCase() = "AICODE-CLI"（连字符，不是下划线）
+// 所以 pi 0.85+ 读的是 AICODE-CLI_CODING_AGENT_DIR（连字符），不是 AICODE_CLI_CODING_AGENT_DIR（下划线）
+// 下划线版本保留向后兼容 0.80~0.84
+const fullPath = join(
+  process.env.HOME || process.env.USERPROFILE,
+  config.configDir,
+);
+const agentDir = join(fullPath, "agent");
+env["AICODE-CLI_CODING_AGENT_DIR"] = agentDir;
 env.AICODE_CLI_CODING_AGENT_DIR = agentDir;
+env.PI_CODING_AGENT_DIR = agentDir;
 
 // 启动 pi-coding-agent
-const child = spawn('node', [piAgentPath, ...remainingArgs], {
-  stdio: 'inherit',
-  env
+const child = spawn("node", [piAgentPath, ...remainingArgs], {
+  stdio: "inherit",
+  env,
 });
 
-child.on('exit', (code) => {
+child.on("exit", (code) => {
   process.exit(code ?? 0);
 });
 
-child.on('error', (err) => {
-  console.error('Failed to start agent:', err);
+child.on("error", (err) => {
+  console.error("Failed to start agent:", err);
   process.exit(1);
 });