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

package/bin/cli.js

@@ -8,19 +8,28 @@
 // 设置终端标题
 process.title = "aicode-cli";
 
-// 防御 CWD 被删除的边缘场景: process.cwd() 会抛 ENOENT
-// 提前 chdir 到 homedir, 避免 banner / config-loader / pi-coding-agent 内部任何 cwd 调用炸
-import { homedir } from "os";
+// 防御 CWD 被删: 在所有 import 之前 chdir (node ESM 解析 import 时会读 cwd)
+// 不 import os.homedir() 因为那需要模块解析, 此时 cwd 还没改
+// 用 process.env.PWD 优先 (用户启动目录) → HOME fallback (防 PWD 缺失 ENOENT)
+// 先 PWD 试 (用户启动目录), 失败 fallback HOME (cwd 被删时 PWD 也指向已删目录, chdir 会抛 ENOENT)
+// catch 后再退一步: HOME 也失败则 chdir 到 / (绝对保证不会 ENOENT)
 try {
-  process.chdir(homedir());
+  process.chdir(process.env.PWD);
 } catch {
-  // 极端情况: homedir 不可访问; 让后续抛清晰错误, 不要进 graceful-fs 模糊栈
+  try {
+    process.chdir(process.env.HOME || "/");
+  } catch {
+    try {
+      process.chdir("/");
+    } catch {}
+  }
 }
+
 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 { getConfig, loadConfig } from "../dist/config-loader.js";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
@@ -30,7 +39,11 @@ function getLocalVersion() {
   while (rootDir !== dirname(rootDir)) {
     const pkgPath = join(rootDir, "package.json");
     if (existsSync(pkgPath)) {
-      return JSON.parse(readFileSync(pkgPath, "utf-8")).version;
+      try {
+        return JSON.parse(readFileSync(pkgPath, "utf-8")).version;
+      } catch {
+        return null;
+      }
     }
     rootDir = dirname(rootDir);
   }
@@ -55,8 +68,12 @@ function parseArgs() {
   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);
+      try {
+        const { version } = JSON.parse(readFileSync(pkgPath, "utf-8"));
+        console.log(version);
+      } catch (_e) {
+        // ignore
+      }
     }
     process.exit(0);
   }
@@ -130,7 +147,7 @@ function replaceCLIVersionPlaceholder() {
             if (newContent !== content) {
               writeFileSync(modelsPath, newContent, "utf-8");
             }
-          } catch (e) {
+          } catch {
             // 忽略错误
           }
         }
@@ -138,7 +155,7 @@ function replaceCLIVersionPlaceholder() {
       }
       rootDir = dirname(rootDir);
     }
-  } catch (e) {
+  } catch {
     // 忽略错误
   }
 }
@@ -207,10 +224,10 @@ async function checkForUpdates() {
         timestamp: Date.now(),
       };
       writeFileSync(versionCachePath, JSON.stringify(cacheData, null, 2));
-    } catch (e) {
+    } catch {
       // 忽略缓存写入失败
     }
-  } catch (e) {
+  } catch {
     // 忽略检查失败
   }
 }

package/config/agent/extensions/custom-footer.ts

@@ -6,10 +6,30 @@
  * [gold]  [dim]       [dim]       [color ctx]  [accent]
  */
 
+import { basename } from "node:path";
 import type { AssistantMessage } from "@earendil-works/pi-ai";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 
+/**
+ * 解析 footer 显示用的项目名.
+ * 优先用 process.env.PWD (shell 启动时设进 env, cli.js 入口 chdir(homedir()) 也不改它),
+ * 退化到 process.cwd(). /user/xxx 启动显示 xxx, 跟 git 无关.
+ * cwd 被删时 fallback 到 'project'.
+ */
+function resolveProjectName(): string {
+	const pwd = process.env.PWD;
+	if (pwd) {
+		const name = basename(pwd);
+		if (name) return name;
+	}
+	try {
+		return basename(process.cwd()) || "project";
+	} catch {
+		return "project";
+	}
+}
+
 function fmtTokens(n: number): string {
 	if (n < 1000) return n.toString();
 	if (n < 10000) return `${(n / 1000).toFixed(1)}k`;
@@ -22,7 +42,7 @@ const gold = (s: string) => `\x1b[38;2;73;188;207m${s}\x1b[0m`;
 
 // 获取本地版本号
 function getVersion() {
-  return process.env.AICODE_CLI_VERSION || null;
+	return process.env.AICODE_CLI_VERSION || null;
 }
 
 export default function (pi: ExtensionAPI) {
@@ -43,7 +63,7 @@ export default function (pi: ExtensionAPI) {
 			try {
 				const { existsSync, readFileSync } = await import("fs");
 				if (existsSync(cachePath)) {
-					const cache = JSON.parse(readFileSync(cachePath, 'utf-8'));
+					const cache = JSON.parse(readFileSync(cachePath, "utf-8"));
 					// 缓存有效期 1 小时
 					if (cache.needsUpdate && Date.now() - cache.timestamp < 3600000) {
 						// 在输入框上方显示版本更新提示
@@ -68,8 +88,8 @@ export default function (pi: ExtensionAPI) {
 					const sepWidth = 3; // " │ "
 
 					// ── Segment 1: project name (branch) ─────────────────────
-					const pwd = process.cwd();
-					const projectName = pwd.split('/').pop() || "project";
+					// /user/xxx 启动显示 xxx (走 PWD env, 跟 chdir 解耦)
+					const projectName = resolveProjectName();
 					const branch = footerData.getGitBranch();
 					const pathRaw = projectName + (branch ? ` (${branch})` : "");
 
@@ -109,8 +129,11 @@ export default function (pi: ExtensionAPI) {
 					// ── Assemble: figure out what fits ──────────────────────
 					// Always show: path | ctx | model. Stats only if room.
 					// Available width for path after reserving right segments
-					const rightBlockWidth = (statsRaw ? visibleWidth(statsRaw) + sepWidth : 0)
-						+ visibleWidth(ctxRaw) + sepWidth + visibleWidth(modelRaw);
+					const rightBlockWidth =
+						(statsRaw ? visibleWidth(statsRaw) + sepWidth : 0) +
+						visibleWidth(ctxRaw) +
+						sepWidth +
+						visibleWidth(modelRaw);
 					const pathBudget = width - rightBlockWidth - sepWidth; // -sepWidth for first separator
 
 					let pathDisplay: string;
@@ -136,12 +159,12 @@ export default function (pi: ExtensionAPI) {
 
 					// Thinking level coloring — semaphore, hardcoded to decouple from border
 					const thinkingColors: Record<string, string> = {
-						off:     "\x1b[38;2;51;45;62m",   // surface1 — invisible
-						minimal: "\x1b[38;2;67;61;78m",   // surface2 — barely there
-						low:     "\x1b[38;2;166;227;161m", // green
-						medium:  "\x1b[38;2;137;180;250m", // blue
-						high:    "\x1b[38;2;250;179;135m", // peach
-						xhigh:   "\x1b[38;2;243;139;168m", // red
+						off: "\x1b[38;2;51;45;62m", // surface1 — invisible
+						minimal: "\x1b[38;2;67;61;78m", // surface2 — barely there
+						low: "\x1b[38;2;166;227;161m", // green
+						medium: "\x1b[38;2;137;180;250m", // blue
+						high: "\x1b[38;2;250;179;135m", // peach
+						xhigh: "\x1b[38;2;243;139;168m", // red
 					};
 					const thinkAnsi = thinkingColors[thinking] ?? thinkingColors.off;
 					let modelColored = theme.fg("accent", `⚡ ${modelName}`);
@@ -155,11 +178,11 @@ export default function (pi: ExtensionAPI) {
 
 					// quots
 					const quotes = [
-                        "敬畏生产，双人复核，稳妥变更",
-                        "让代码更有温度",
-                        "民生所系，支付所向",
-                        "智慧风控，安全同行",
-                        "绿色支付，低碳生活",
+						"敬畏生产，双人复核，稳妥变更",
+						"让代码更有温度",
+						"民生所系，支付所向",
+						"智慧风控，安全同行",
+						"绿色支付，低碳生活",
 						"保持热爱，奔赴山海",
 						"每一行代码都是故事",
 						"技术只是手段，创意才是灵魂",
@@ -193,8 +216,8 @@ export default function (pi: ExtensionAPI) {
 					// ── Plan mode segment ────────────────────────────────────
 					if (planModeEnabled) {
 						segments.push(theme.fg("success", "⏸ 计划模式"));
-					}else{
-				    	segments.push(theme.fg("error", "▶ 自动模式"));
+					} else {
+						segments.push(theme.fg("error", "▶ 自动模式"));
 					}
 
 					segments.push(theme.fg("muted", quote));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ia-ccun/code-agent-cli",
-  "version": "0.0.54-beta.3",
+  "version": "0.0.54-beta.5",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/scripts/regression/cases/08-cwd-resilience.sh

@@ -0,0 +1,84 @@
+#!/usr/bin/env bash
+# 08-cwd-resilience.sh
+# 验证：aicode-cli 在不同 cwd 场景下都能稳定启动, 不因 cwd 状态错位
+#
+# 0.85→1.1.0 升级后引入的 CWD 双重错位:
+#   - cli.js 入口 process.chdir(homedir()) 防 ENOENT → 毁了 process.cwd() 语义
+#   - custom-footer 用 process.env.PWD 修 footer 显示 → 仍修不了 aicode 进程 cwd
+#   - cli.js 改为 process.chdir(process.env.PWD || homedir()) → 全修好
+#
+# 这个 case 锁定以上 3 层修复都不退化:
+#   1. cwd 正常: 启动 aicode 进程不死, stdout 无 ENOENT
+#   2. cwd 被删 (预防 ENOENT): 不崩, cli.js 入口 chdir 兜底生效
+#   3. PWD 未设 (degenerate): fallback 到 homedir, 不崩
+
+set -uo pipefail
+CURRENT_CASE="08-cwd-resilience"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/../lib/common.sh"
+
+header "$CURRENT_CASE" "aicode CWD resilience across edge cases"
+
+# ----- Test 1: 从正常项目目录启动, 不应 ENOENT -----
+PROJECT_DIR="$(cd "$SCRIPT_DIR/../../.." && pwd)"
+header "$CURRENT_CASE" "test 1: normal cwd (project root)"
+(
+    cd "$PROJECT_DIR"
+    if ! spawn_rpc 15 true; then
+        echo "FAIL_SPAWN"
+        cleanup_rpc 2>/dev/null
+        exit 1
+    fi
+    if grep -q "Error: ENOENT" "$REGRESSION_LOG" 2>/dev/null; then
+        echo "FAIL_ENOENT"
+        cleanup_rpc
+        exit 1
+    fi
+    cleanup_rpc
+) && pass "normal cwd startup: no ENOENT" ||
+    fail "normal cwd: ENOENT or spawn failed" "cli.js 入口 chdir 防御退化"
+
+# ----- Test 2: 从 deleted cwd 启动 (复现 0.85 ENOENT 场景) -----
+header "$CURRENT_CASE" "test 2: cwd deleted (ENOENT resilience)"
+(
+    # 创建临时目录, 然后删它, 模拟 cwd 被删
+    TESTDIR=$(mktemp -d -t aicode-cwd-test.XXXXXX)
+    cd "$TESTDIR"
+    rmdir "$TESTDIR"
+    # 现在 shell cwd 指向已删目录
+    if ! spawn_rpc 15 true; then
+        echo "FAIL_SPAWN"
+        cleanup_rpc 2>/dev/null
+        exit 1
+    fi
+    # 等 RPC 启动事件
+    sleep 2
+    if grep -q "Error: ENOENT" "$REGRESSION_LOG" 2>/dev/null; then
+        echo "FAIL_ENOENT"
+        cleanup_rpc
+        exit 1
+    fi
+    cleanup_rpc
+) && pass "deleted cwd startup: no ENOENT" ||
+    fail "deleted cwd: ENOENT or spawn failed" "cli.js 入口 chdir 防御失效"
+
+# ----- Test 3: PWD env 未设 (degenerate shell) -----
+header "$CURRENT_CASE" "test 3: PWD unset, fallback to homedir"
+(
+    unset PWD
+    if ! spawn_rpc 15 true; then
+        echo "FAIL_SPAWN"
+        cleanup_rpc 2>/dev/null
+        exit 1
+    fi
+    sleep 2
+    if grep -q "Error: ENOENT" "$REGRESSION_LOG" 2>/dev/null; then
+        echo "FAIL_ENOENT"
+        cleanup_rpc
+        exit 1
+    fi
+    cleanup_rpc
+) && pass "PWD unset startup: no ENOENT" ||
+    fail "PWD unset: ENOENT or spawn failed" "homedir fallback 失效"
+
+summary

package/scripts/regression/results/.last_pid

@@ -1 +1 @@
-41096
+34210

package/scripts/regression/results/.last_workdir

@@ -1 +1 @@
-/Users/jianjiang/.aicode-regression-41074-9749000
+/Users/jianjiang/.aicode-regression-34084-6197000