claudeos-core 1.5.0 → 1.6.0

package/README.zh-CN.md

@@ -65,14 +65,16 @@ ClaudeOS-Core 生成的文档知道你的项目使用 `ApiResponse.ok()`（而
 |---|---|---|
 | **Java / Spring Boot** | `build.gradle`、`pom.xml`、5种包模式自动回退 | 10 大类，59 小项 |
 | **Kotlin / Spring Boot** | `build.gradle.kts`、kotlin 插件、`settings.gradle.kts`、CQRS/BFF 自动检测 | 12 大类，95 小项 |
-| **Node.js / Express / NestJS** | `package.json` | 9 大类，57 小项 |
-| **Next.js / React / Vue** | `package.json`（next、react、vue） | 9 大类，55 小项 |
+| **Node.js / Express** | `package.json` | 9 大类，57 小项 |
+| **Node.js / NestJS** | `package.json` (`@nestjs/core`) | 10 大类，68 小项 |
+| **Next.js / React** | `package.json`, `next.config.*`, FSD 支持 | 9 大类，55 小项 |
+| **Vue / Nuxt** | `package.json`, `nuxt.config.*`, Composition API | 9 大类，58 小项 |
 | **Python / Django** | `requirements.txt`、`pyproject.toml` | 10 大类，55 小项 |
 | **Python / FastAPI** | `requirements.txt`、`pyproject.toml` | 10 大类，58 小项 |
 | **Node.js / Fastify** | `package.json` | 10 大类，62 小项 |
 | **Angular** | `package.json`、`angular.json` | 12 大类，78 小项 |
 
-自动检测：语言及版本、框架及版本、ORM（MyBatis、JPA、Exposed、Prisma、TypeORM、SQLAlchemy 等）、数据库（PostgreSQL、MySQL、Oracle、MongoDB、SQLite）、包管理器（Gradle、Maven、npm、yarn、pnpm、pip、poetry）、架构（CQRS、BFF — 从模块名检测）、多模块结构（从 settings.gradle 检测）。
+自动检测：语言及版本、框架及版本、ORM（MyBatis、JPA、Exposed、Prisma、TypeORM、SQLAlchemy 等）、数据库（PostgreSQL、MySQL、Oracle、MongoDB、SQLite）、包管理器（Gradle、Maven、npm、yarn、pnpm、pip、poetry）、架构（CQRS、BFF — 从模块名检测）、多模块结构（从 settings.gradle 检测）、单体仓库（Turborepo、pnpm-workspace、Lerna、npm/yarn workspaces）。
 
 **你不需要指定任何内容，一切自动检测。**
 
@@ -87,7 +89,7 @@ ClaudeOS-Core 生成的文档知道你的项目使用 `ApiResponse.ok()`（而
 | E | DDD/六角形 | `{domain}/adapter/in/web/` | `user/adapter/in/web/UserController.java` |
 | C | 扁平 | `controller/*.java` | `controller/UserController.java` → 从类名提取 `user` |
 
-无 Controller 的纯 Service 域也会通过 `service/`、`dao/`、`aggregator/`、`mapper/`、`repository/` 目录被检测。跳过：`common`、`config`、`util`、`core`、`front`、`admin`、`v1`、`v2` 等。
+无 Controller 的纯 Service 域也会通过 `service/`、`dao/`、`aggregator/`、`facade/`、`usecase/`、`orchestrator/`、`mapper/`、`repository/` 目录被检测。跳过：`common`、`config`、`util`、`core`、`front`、`admin`、`v1`、`v2` 等。
 
 
 ### Kotlin 多模块域检测
@@ -178,7 +180,7 @@ npx claudeos-core init --lang ko     # 한국어
 
 > **注意：** 此设置仅更改生成文档的语言。代码分析（Pass 1–2）始终以英文运行，仅生成结果（Pass 3）以所选语言编写。代码示例保持原始编程语言语法。
 
-就这样。5–18 分钟后，所有文档生成完毕，即可使用。
+就这样。5–18 分钟后，所有文档生成完毕，即可使用。CLI 会在每个 Pass 完成后显示耗时，并在完成横幅中显示总耗时。
 
 ### 手动逐步安装
 
@@ -530,6 +532,15 @@ Use both together.
 **Q：重新运行会怎样？**
 如果之前的 Pass 1/2 结果存在，交互式提示让您选择：**Continue**（从中断处继续）或 **Fresh**（删除全部重新开始）。使用 `--force` 跳过提示，始终重新开始。Pass 3 始终重新运行。旧版本可从 Master Plans 恢复。
 
+**Q：NestJS 是否有专用模板，还是使用 Express 的模板？**
+NestJS 使用专用的 `node-nestjs` 模板，包含 NestJS 特定的分析类别：`@Module`、`@Injectable`、`@Controller` 装饰器、Guards、Pipes、Interceptors、DI 容器、CQRS 模式和 `Test.createTestingModule`。Express 项目使用独立的 `node-express` 模板。
+
+**Q：Vue / Nuxt 项目怎么样？**
+Vue/Nuxt 使用专用的 `vue-nuxt` 模板，覆盖 Composition API、`<script setup>`、defineProps/defineEmits、Pinia 存储、`useFetch`/`useAsyncData`、Nitro 服务器路由和 `@nuxt/test-utils`。Next.js/React 项目使用 `node-nextjs` 模板。
+
+**Q：支持 Turborepo / pnpm workspaces / Lerna 单体仓库吗？**
+支持。ClaudeOS-Core 检测 `turbo.json`、`pnpm-workspace.yaml`、`lerna.json` 或 `package.json#workspaces`，并自动扫描子包的 `package.json` 文件以发现框架/ORM/数据库依赖。域扫描覆盖 `apps/*/src/` 和 `packages/*/src/` 模式。从单体仓库根目录运行。
+
 **Q：支持 Kotlin 吗？**
 支持。ClaudeOS-Core 从 `build.gradle.kts` 或 `build.gradle` 中的 kotlin 插件自动检测 Kotlin。使用专用的 `kotlin-spring` 模板进行 Kotlin 特定分析（data class、sealed class、协程、扩展函数、MockK 等）。
 
@@ -548,50 +559,66 @@ pass-prompts/templates/
 ├── common/                  # 共享头部/尾部
 ├── java-spring/             # Java / Spring Boot
 ├── kotlin-spring/           # Kotlin / Spring Boot（CQRS、BFF、多模块）
-├── node-express/            # Node.js / Express / NestJS
-├── node-nextjs/             # Next.js / React / Vue
-├── python-django/           # Python / Django (DRF)
+├── node-express/            # Node.js / Express
+├── node-nestjs/             # Node.js / NestJS (Module, DI, Guard, Pipe, Interceptor)
 ├── node-fastify/            # Node.js / Fastify
+├── node-nextjs/             # Next.js / React
+├── vue-nuxt/                # Vue / Nuxt (Composition API, Pinia, Nitro)
 ├── angular/                 # Angular
+├── python-django/           # Python / Django (DRF)
 └── python-fastapi/          # Python / FastAPI
 ```
 
-`plan-installer` 自动检测你的技术栈，然后组装类型特定的提示。对于多栈项目，会分别生成 `pass1-backend-prompt.md` 和 `pass1-frontend-prompt.md`，而 `pass3-prompt.md` 则合并两个栈的生成目标。
+`plan-installer` 自动检测你的技术栈，然后组装类型特定的提示。NestJS 和 Vue/Nuxt 使用专门的模板，包含特定于框架的分析类别（如 NestJS 的 `@Module`/`@Injectable`/Guards，Vue 的 `<script setup>`/Pinia/useFetch）。对于多栈项目，会分别生成 `pass1-backend-prompt.md` 和 `pass1-frontend-prompt.md`，而 `pass3-prompt.md` 则合并两个栈的生成目标。
 
 ---
 
 ## Monorepo 支持
 
-ClaudeOS-Core 读取**当前目录**的 `package.json`。在 Monorepo（Turborepo、Nx、Lerna、pnpm workspaces）环境中，根 `package.json` 通常不包含 `next`、`express`、`react` 等框架依赖——它们在各个应用目录中。
+ClaudeOS-Core 自动检测 JS/TS 单体仓库并扫描子包依赖。
 
-**从应用目录运行，而不是 Monorepo 根目录：**
+**支持的单体仓库标记**（自动检测）：
+- `turbo.json`（Turborepo）
+- `pnpm-workspace.yaml`（pnpm workspaces）
+- `lerna.json`（Lerna）
+- `package.json#workspaces`（npm/yarn workspaces）
 
-```bash
-# 示例：Turborepo 的 apps/my-app
-cd apps/my-app
-npx claudeos-core init
+**从单体仓库根目录运行** — ClaudeOS-Core 读取 `apps/*/package.json` 和 `packages/*/package.json` 以发现跨子包的框架/ORM/数据库依赖：
 
-# 示例：Nx 工作空间
-cd apps/frontend
+```bash
+cd my-monorepo
 npx claudeos-core init
 ```
 
-每个应用获得独立的 Standards、Rules、Skills 和 Guides，针对该应用的技术栈和模式定制。
+**自动检测内容：**
+- `apps/web/package.json` 中的依赖（如 `next`, `react`）→ 前端技术栈
+- `apps/api/package.json` 中的依赖（如 `express`, `prisma`）→ 后端技术栈
+- `packages/db/package.json` 中的依赖（如 `drizzle-orm`）→ ORM/数据库
+- `pnpm-workspace.yaml` 中的自定义工作区路径（如 `services/*`）
 
-**典型 Monorepo 结构：**
+**域扫描也覆盖单体仓库布局：**
+- `apps/api/src/modules/*/` 和 `apps/api/src/*/` 用于后端域
+- `apps/web/app/*/`、`apps/web/src/app/*/`、`apps/web/pages/*/` 用于前端域
+- `packages/*/src/*/` 用于共享包域
 
 ```
-my-monorepo/                    ← 不要在这里运行（根目录没有框架依赖）
+my-monorepo/                    ← 在这里运行：npx claudeos-core init
+├── turbo.json                  ← 自动检测为 Turborepo
 ├── apps/
-│   ├── web/                    ← 在这里运行：cd apps/web && npx claudeos-core init
-│   ├── api/                    ← 在这里运行：cd apps/api && npx claudeos-core init
-│   └── storybook/
+│   ├── web/                    ← 从 apps/web/package.json 检测到 Next.js
+│   │   ├── app/dashboard/      ← 检测到前端域
+│   │   └── package.json        ← { "dependencies": { "next": "^14" } }
+│   └── api/                    ← 从 apps/api/package.json 检测到 Express
+│       ├── src/modules/users/  ← 检测到后端域
+│       └── package.json        ← { "dependencies": { "express": "^4" } }
 ├── packages/
-│   ├── ui/
-│   └── utils/
-└── package.json                ← 只有 devDependencies（turbo、eslint 等）
+│   ├── db/                     ← 从 packages/db/package.json 检测到 Drizzle
+│   └── ui/
+└── package.json                ← { "workspaces": ["apps/*", "packages/*"] }
 ```
 
+> **注意：** Kotlin/Java 单体仓库的多模块检测使用 `settings.gradle.kts`（参见上方 [Kotlin 多模块域检测](#kotlin-多模块域检测)），不需要 JS 单体仓库标记。
+
 ## 故障排除
 
 **"claude: command not found"** — Claude Code CLI 未安装或不在 PATH 中。参见 [Claude Code 文档](https://code.claude.com/docs/en/overview)。
@@ -614,7 +641,7 @@ my-monorepo/                    ← 不要在这里运行（根目录没有框
 
 - **新技术栈模板** — Ruby/Rails、Go/Gin、PHP/Laravel、Rust/Axum
 - **Monorepo 深度支持** — 独立子项目根目录、Workspace 检测
-- **测试覆盖** — 持续扩展测试套件（当前 87 项测试，覆盖技术栈检测、域分组、计划验证、结构扫描和验证工具）
+- **测试覆盖** — 持续扩展测试套件（当前 256 项测试，覆盖全部扫描器、技术栈检测、域分组、计划解析、提示生成、CLI 选择器、单体仓库检测和验证工具）
 
 ---
 

package/bin/cli.js

@@ -19,7 +19,7 @@
 
 const path = require("path");
 const { TOOLS_DIR, PROJECT_ROOT, log, run, readFile } = require("./lib/cli-utils");
-const { cmdInit } = require("./commands/init");
+const { cmdInit, InitError } = require("./commands/init");
 
 // Set env var so sub-tools (plan-installer, etc.) correctly resolve the project root
 process.env.CLAUDEOS_ROOT = PROJECT_ROOT;
@@ -131,6 +131,10 @@ if (!commands[command]) {
 }
 
 Promise.resolve(commands[command]()).catch((e) => {
-  console.error(e.message || e);
+  if (e instanceof InitError) {
+    log(`\n  ❌ ${e.message}\n`);
+  } else {
+    console.error(e.message || e);
+  }
   process.exit(1);
 });

package/bin/commands/init.js

@@ -35,7 +35,21 @@ function claudeWaitMsg(lang, passLabel) {
   return (CLAUDE_WAIT_TMPL[lang] || CLAUDE_WAIT_TMPL.en).replace("{{PASS}}", passLabel);
 }
 
+class InitError extends Error {
+  constructor(msg) { super(msg); this.name = "InitError"; }
+}
+
+function formatElapsed(ms) {
+  const sec = Math.floor(ms / 1000);
+  if (sec < 60) return `${sec}s`;
+  const min = Math.floor(sec / 60);
+  const rem = sec % 60;
+  return rem > 0 ? `${min}m ${rem}s` : `${min}m`;
+}
+
 async function cmdInit(parsedArgs) {
+  const totalStart = Date.now();
+
   // ─── Prerequisites check ───────────────────────────────────
   const hasProjectMarker = [".git", "package.json", "build.gradle", "build.gradle.kts", "pom.xml", "pyproject.toml", "requirements.txt"].some(
     m => fs.existsSync(path.join(PROJECT_ROOT, m))
@@ -48,26 +62,18 @@ async function cmdInit(parsedArgs) {
 
   const nodeVersion = parseInt(process.versions.node.split(".")[0]);
   if (nodeVersion < 18) {
-    log(`\n  ❌ Node.js v18+ required (current: v${process.versions.node})`);
-    log("  Install: https://nodejs.org/\n");
-    process.exit(1);
+    throw new InitError(`Node.js v18+ required (current: v${process.versions.node})\n  Install: https://nodejs.org/`);
   }
 
   const claudeExists = run("claude --version", { silent: true, ignoreError: true });
   if (!claudeExists) {
-    log("\n  ❌ Claude Code CLI not found.");
-    log("  Install: https://code.claude.com/docs/en/overview");
-    log("  Then run: claude (and complete authentication)\n");
-    process.exit(1);
+    throw new InitError("Claude Code CLI not found.\n  Install: https://code.claude.com/docs/en/overview\n  Then run: claude (and complete authentication)");
   }
 
   // Verify Claude is authenticated (quick prompt test)
   const claudeAuth = run('claude -p "echo ok"', { silent: true, ignoreError: true });
   if (!claudeAuth) {
-    log("\n  ⚠️  Claude Code may not be authenticated.");
-    log("  Run: claude (and complete authentication)");
-    log("  Then retry: npx claudeos-core init\n");
-    process.exit(1);
+    throw new InitError("Claude Code may not be authenticated.\n  Run: claude (and complete authentication)\n  Then retry: npx claudeos-core init");
   }
 
   // ─── Language selection (required) ────────────────────────────
@@ -75,10 +81,11 @@ async function cmdInit(parsedArgs) {
   if (!lang) {
     lang = await selectLangInteractive();
   }
+  if (!lang) {
+    throw new InitError("Cancelled.");
+  }
   if (!isValidLang(lang)) {
-    log(`\n  ❌ Unsupported language: "${lang}"`);
-    log(`  Supported: ${LANG_CODES.join(", ")}\n`);
-    process.exit(1);
+    throw new InitError(`Unsupported language: "${lang}"\n  Supported: ${LANG_CODES.join(", ")}`);
   }
   process.env.CLAUDEOS_LANG = lang;
 
@@ -96,6 +103,7 @@ async function cmdInit(parsedArgs) {
       } else {
         const status = { pass1Done: existingPass1.length, pass2Done: pass2Exists };
         const mode = await selectResumeMode(lang, status);
+        if (!mode) throw new InitError("Cancelled.");
         if (mode === "fresh") {
           for (const f of existingPass1) fs.unlinkSync(path.join(GENERATED_DIR, f));
           if (pass2Exists) fs.unlinkSync(path.join(GENERATED_DIR, "pass2-merged.json"));
@@ -168,15 +176,11 @@ async function cmdInit(parsedArgs) {
       readFile(path.join(GENERATED_DIR, "domain-groups.json"))
     );
   } catch (e) {
-    log(`    ❌ domain-groups.json is missing or malformed: ${e.message}`);
-    log("    Re-run plan-installer or check claudeos-core/generated/");
-    process.exit(1);
+    throw new InitError(`domain-groups.json is missing or malformed: ${e.message}\n    Re-run plan-installer or check claudeos-core/generated/`);
   }
   const totalGroups = domainGroups.totalGroups;
   if (!totalGroups || typeof totalGroups !== "number" || totalGroups < 1) {
-    log(`    ❌ domain-groups.json has invalid totalGroups: ${totalGroups}`);
-    log("    Re-run plan-installer or check claudeos-core/generated/");
-    process.exit(1);
+    throw new InitError(`domain-groups.json has invalid totalGroups: ${totalGroups}\n    Re-run plan-installer or check claudeos-core/generated/`);
   }
 
   // Load pass1 prompts by type
@@ -194,8 +198,7 @@ async function cmdInit(parsedArgs) {
   }
 
   if (!domainGroups.groups || totalGroups !== domainGroups.groups.length) {
-    log(`    ❌ domain-groups.json is malformed: expected ${totalGroups} groups, found ${domainGroups.groups ? domainGroups.groups.length : 0}`);
-    process.exit(1);
+    throw new InitError(`domain-groups.json is malformed: expected ${totalGroups} groups, found ${domainGroups.groups ? domainGroups.groups.length : 0}`);
   }
   for (let i = 1; i <= totalGroups; i++) {
     const group = domainGroups.groups[i - 1];
@@ -217,15 +220,14 @@ async function cmdInit(parsedArgs) {
           log(`    ⏭️  pass1-${i}.json already exists, skipping`);
           continue;
         }
-      } catch { /* malformed — re-run */ }
+      } catch (_e) { /* malformed — re-run */ }
       log(`    ⚠️  pass1-${i}.json exists but is malformed, re-running`);
     }
 
     // Select prompt for this type
     const template = pass1Prompts[groupType] || pass1Prompts["backend"];
     if (!template) {
-      log(`    ❌ No pass1 prompt found for type: ${groupType}. Aborting.`);
-      process.exit(1);
+      throw new InitError(`No pass1 prompt found for type: ${groupType}`);
     }
 
     // Placeholder substitution
@@ -235,19 +237,19 @@ async function cmdInit(parsedArgs) {
     prompt = injectProjectRoot(prompt);
 
     log(claudeWaitMsg(lang, `Pass 1-${i}/${totalGroups}`));
+    const t1 = Date.now();
     const ok = runClaudePrompt(prompt, { ignoreError: true });
+    const elapsed1 = formatElapsed(Date.now() - t1);
 
     if (!ok) {
-      log(`    ❌ Pass 1-${i} failed. Aborting.`);
-      process.exit(1);
+      throw new InitError(`Pass 1-${i} failed`);
     }
 
     if (!fileExists(pass1Json)) {
-      log(`    ❌ pass1-${i}.json was not created. Aborting.`);
-      process.exit(1);
+      throw new InitError(`pass1-${i}.json was not created`);
     }
 
-    log(`    ✅ pass1-${i}.json created`);
+    log(`    ✅ pass1-${i}.json created (${elapsed1})`);
   }
   log("");
 
@@ -260,25 +262,24 @@ async function cmdInit(parsedArgs) {
   } else {
     const pass2PromptFile = path.join(GENERATED_DIR, "pass2-prompt.md");
     if (!fileExists(pass2PromptFile)) {
-      log("    ❌ pass2-prompt.md not found. Re-run plan-installer.");
-      process.exit(1);
+      throw new InitError("pass2-prompt.md not found. Re-run plan-installer.");
     }
     let prompt = injectProjectRoot(readFile(pass2PromptFile));
 
     log(claudeWaitMsg(lang, "Pass 2"));
+    const t2 = Date.now();
     const ok = runClaudePrompt(prompt, { ignoreError: true });
+    const elapsed2 = formatElapsed(Date.now() - t2);
 
     if (!ok) {
-      log("    ❌ Pass 2 failed. Aborting.");
-      process.exit(1);
+      throw new InitError("Pass 2 failed");
     }
 
     if (!fileExists(pass2Json)) {
-      log("    ❌ pass2-merged.json was not created. Aborting.");
-      process.exit(1);
+      throw new InitError("pass2-merged.json was not created");
     }
 
-    log("    ✅ pass2-merged.json created");
+    log(`    ✅ pass2-merged.json created (${elapsed2})`);
   }
   log("");
 
@@ -287,23 +288,23 @@ async function cmdInit(parsedArgs) {
 
   const pass3PromptFile = path.join(GENERATED_DIR, "pass3-prompt.md");
   if (!fileExists(pass3PromptFile)) {
-    log("    ❌ pass3-prompt.md not found. Re-run plan-installer.");
-    process.exit(1);
+    throw new InitError("pass3-prompt.md not found. Re-run plan-installer.");
   }
   let prompt = injectProjectRoot(readFile(pass3PromptFile));
 
   log(claudeWaitMsg(lang, "Pass 3"));
-  const ok = runClaudePrompt(prompt, { ignoreError: true });
+  const t3 = Date.now();
+  const ok3 = runClaudePrompt(prompt, { ignoreError: true });
+  const elapsed3 = formatElapsed(Date.now() - t3);
 
-  if (!ok) {
-    log("    ❌ Pass 3 failed. Aborting.");
-    process.exit(1);
+  if (!ok3) {
+    throw new InitError("Pass 3 failed");
   }
 
   if (!fileExists(path.join(PROJECT_ROOT, "CLAUDE.md"))) {
-    log("    ❌ CLAUDE.md was not created. Pass 3 may have failed silently.");
-    process.exit(1);
+    throw new InitError("CLAUDE.md was not created. Pass 3 may have failed silently.");
   }
+  log(`    ✅ Pass 3 complete (${elapsed3})`);
   log("");
 
   // ─── [7] Run verification tools ───────────────────────────────
@@ -338,6 +339,7 @@ async function cmdInit(parsedArgs) {
   log(`║   Domains analyzed:  ${pad(totalGroups + " groups", 29)}║`);
   log(`║   Analysis passes:   ${pad(pass1Files + " pass1 files", 29)}║`);
   log(`║   Output language:   ${pad(SUPPORTED_LANGS[lang] || lang, 29)}║`);
+  log(`║   Total time:       ${pad(formatElapsed(Date.now() - totalStart), 29)}║`);
   log("║                                                    ║");
   log("║   Verify anytime:                                  ║");
   log("║   npx claudeos-core health                         ║");
@@ -348,4 +350,4 @@ async function cmdInit(parsedArgs) {
   log("");
 }
 
-module.exports = { cmdInit };
+module.exports = { cmdInit, InitError };

package/bin/lib/cli-utils.js

@@ -7,6 +7,7 @@
 const { execSync } = require("child_process");
 const fs = require("fs");
 const path = require("path");
+const { ensureDir, existsSafe } = require("../../lib/safe-fs");
 
 // ─── Path configuration ──────────────────────────────────────────
 const TOOLS_DIR = path.resolve(__dirname, "../..");
@@ -77,16 +78,11 @@ function runClaudePrompt(prompt, options = {}) {
 }
 
 // ─── Filesystem ─────────────────────────────────────────────────
-function ensureDir(dir) {
-  if (!fs.existsSync(dir)) {
-    fs.mkdirSync(dir, { recursive: true });
-  }
-}
-
-function fileExists(p) {
-  return fs.existsSync(p);
-}
+// ensureDir: delegated to lib/safe-fs.js (single source of truth)
+// fileExists: alias for existsSafe from lib/safe-fs.js
+const fileExists = existsSafe;
 
+// readFile: intentionally throws on error (CLI needs hard failure, unlike safe-fs fallback)
 function readFile(p) {
   return fs.readFileSync(p, "utf-8");
 }
@@ -110,7 +106,7 @@ function countFiles() {
     const scan = (dir) => {
       if (!fs.existsSync(dir)) return;
       let realDir;
-      try { realDir = fs.realpathSync(dir); } catch { realDir = dir; }
+      try { realDir = fs.realpathSync(dir); } catch (_e) { realDir = dir; }
       if (visited.has(realDir)) return;
       visited.add(realDir);
       for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {

package/bin/lib/lang-selector.js

@@ -32,8 +32,7 @@ function selectLangInteractive() {
         const num = parseInt(trimmed);
         if (num >= 1 && num <= LANG_CODES.length) { resolve(LANG_CODES[num - 1]); return; }
         if (isValidLang(trimmed)) { resolve(trimmed); return; }
-        log(`\n  ❌ Invalid selection: "${trimmed}"`);
-        process.exit(1);
+        resolve(null);
       });
       return;
     }
@@ -110,8 +109,7 @@ function selectLangInteractive() {
         const num = parseInt(trimmed);
         if (num >= 1 && num <= total) { resolve(LANG_CODES[num - 1]); return; }
         if (isValidLang(trimmed)) { resolve(trimmed); return; }
-        log(`\n  ❌ Invalid selection: "${trimmed}"`);
-        process.exit(1);
+        resolve(null);
       });
       return;
     }
@@ -129,15 +127,19 @@ function selectLangInteractive() {
       // Ctrl+C
       if (k === "\x03") {
         process.stdin.setRawMode(false);
-        log("\n  Cancelled.\n");
-        process.exit(0);
+        process.stdin.pause();
+        process.stdin.removeAllListeners("data");
+        resolve(null);
+        return;
       }
 
       // ESC (single byte only — arrow keys send \x1b[ or \x1bO which are 3 bytes)
       if (k === "\x1b" && key.length === 1) {
         process.stdin.setRawMode(false);
-        log("\n  Cancelled.\n");
-        process.exit(0);
+        process.stdin.pause();
+        process.stdin.removeAllListeners("data");
+        resolve(null);
+        return;
       }
 
       // Up arrow (normal mode \x1b[A and application mode \x1bOA)

package/bin/lib/resume-selector.js

@@ -112,8 +112,7 @@ function selectResumeMode(lang, status) {
         const num = parseInt(answer.trim());
         if (num === 1) { resolve("continue"); return; }
         if (num === 2) { resolve("fresh"); return; }
-        log("\n  Cancelled.\n");
-        process.exit(0);
+        resolve(null);
       });
       return;
     }
@@ -164,8 +163,7 @@ function selectResumeMode(lang, status) {
         const num = parseInt(answer.trim());
         if (num === 1) { resolve("continue"); return; }
         if (num === 2) { resolve("fresh"); return; }
-        log("\n  Cancelled.\n");
-        process.exit(0);
+        resolve(null);
       });
       return;
     }
@@ -183,15 +181,19 @@ function selectResumeMode(lang, status) {
       // Ctrl+C
       if (k === "\x03") {
         process.stdin.setRawMode(false);
-        log("\n  Cancelled.\n");
-        process.exit(0);
+        process.stdin.pause();
+        process.stdin.removeAllListeners("data");
+        resolve(null);
+        return;
       }
 
       // ESC
       if (k === "\x1b" && key.length === 1) {
         process.stdin.setRawMode(false);
-        log("\n  Cancelled.\n");
-        process.exit(0);
+        process.stdin.pause();
+        process.stdin.removeAllListeners("data");
+        resolve(null);
+        return;
       }
 
       // Up arrow

package/content-validator/index.js

@@ -19,6 +19,7 @@
 const fs = require("fs");
 const path = require("path");
 const { glob } = require("glob");
+const { updateStaleReport } = require("../lib/stale-report");
 
 const ROOT = process.env.CLAUDEOS_ROOT || path.resolve(__dirname, "../..");
 const RULES_DIR = path.join(ROOT, ".claude/rules");
@@ -50,7 +51,7 @@ async function main() {
       const pa = JSON.parse(fs.readFileSync(paPath, "utf-8"));
       detectedLanguage = pa.stack?.language || null;
       outputLang = pa.lang || "en";
-    } catch { /* ignore */ }
+    } catch (_e) { /* ignore */ }
   }
 
   // Language-aware section keywords for CLAUDE.md validation
@@ -323,23 +324,17 @@ async function main() {
   }
 
   // Record in stale-report
-  if (fs.existsSync(GEN_DIR)) {
-    const rp = path.join(GEN_DIR, "stale-report.json");
-    let ex = {};
-    if (fs.existsSync(rp)) {
-      try { ex = JSON.parse(fs.readFileSync(rp, "utf-8")); } catch { ex = {}; }
-    }
-    ex.contentValidation = { checkedAt: new Date().toISOString(), checked, errors: errors.length, warnings: warnings.length, details: { errors, warnings } };
-    ex.summary = { ...ex.summary, contentErrors: errors.length, contentWarnings: warnings.length };
-    fs.writeFileSync(rp, JSON.stringify(ex, null, 2));
-  }
+  updateStaleReport(GEN_DIR, "contentValidation",
+    { checkedAt: new Date().toISOString(), checked, errors: errors.length, warnings: warnings.length, details: { errors, warnings } },
+    { contentErrors: errors.length, contentWarnings: warnings.length }
+  );
 
   console.log(`  Total: ${errors.length} errors, ${warnings.length} warnings\n`);
   process.exit(errors.length > 0 ? 1 : 0);
 }
 
 if (require.main === module) {
-  main().catch(console.error);
+  main().catch(e => { console.error(`\n  ❌ Unexpected error: ${e.message || e}`); process.exit(1); });
 }
 
 module.exports = { main };

package/health-checker/index.js

@@ -17,6 +17,7 @@
 const { execSync } = require("child_process");
 const fs = require("fs");
 const path = require("path");
+const { updateStaleReport } = require("../lib/stale-report");
 
 const ROOT = process.env.CLAUDEOS_ROOT || path.resolve(__dirname, "../..");
 const TOOLS = path.resolve(__dirname, "..");
@@ -104,28 +105,17 @@ function main() {
   console.log("  ══════════════════════════════\n");
 
   // ─── Update stale-report.json ────────────────────────────
-  if (fs.existsSync(GEN)) {
-    const rp = path.join(GEN, "stale-report.json");
-    let ex = {};
-    if (fs.existsSync(rp)) {
-      try { ex = JSON.parse(fs.readFileSync(rp, "utf-8")); } catch { ex = {}; }
-    }
-    ex.generatedAt = new Date().toISOString();
-    ex.healthCheck = { results, status: hasErr ? "fail" : "pass" };
-    if (!ex.summary) ex.summary = {};
-    ex.summary = {
-      ...ex.summary,
-      totalIssues: results.filter((r) => r.status === "fail").length,
-      healthStatus: hasErr ? "fail" : "ok",
-    };
-    fs.writeFileSync(rp, JSON.stringify(ex, null, 2));
-  }
+  updateStaleReport(GEN, "generatedAt", new Date().toISOString());
+  updateStaleReport(GEN, "healthCheck",
+    { results, status: hasErr ? "fail" : "pass" },
+    { totalIssues: results.filter((r) => r.status === "fail").length, healthStatus: hasErr ? "fail" : "ok" }
+  );
 
   process.exit(hasErr ? 1 : 0);
 }
 
 if (require.main === module) {
-  main();
+  try { main(); } catch (e) { console.error(`\n  ❌ Unexpected error: ${e.message || e}`); process.exit(1); }
 }
 
 module.exports = { main };