6aspec 2.0.0-dev.2 → 2.0.0-dev.5

package/bin/6aspec

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 const path = require('path');
+const pkg = require('../package.json');
 const cli = require('../lib/cli');
 
 const args = process.argv.slice(2);
@@ -8,7 +9,7 @@ const command = args[0];
 
 if (!command || command === '--help' || command === '-h') {
   console.log(`
-\x1b[36m6Aspec\x1b[0m - 轻量级 spec 驱动开发框架
+\x1b[36m6Aspec\x1b[0m v${pkg.version} - 轻量级 spec 驱动开发框架
 
 用法:
   6aspec <command>
@@ -16,6 +17,7 @@ if (!command || command === '--help' || command === '-h') {
 命令:
   init      交互式初始化（选择工具 + 安装配置）
   update    更新已安装的工具配置（merge 模式）
+  version   显示当前 CLI 版本
   --help    显示帮助信息
 
 示例:
@@ -27,6 +29,20 @@ if (!command || command === '--help' || command === '-h') {
   process.exit(0);
 }
 
+if (command === '--version' || command === '-v' || command === 'version') {
+  const fs = require('fs');
+  const configPath = path.join(process.cwd(), '.6aspec/init.json');
+  let projectInfo = '';
+  if (fs.existsSync(configPath)) {
+    try {
+      const cfg = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+      projectInfo = `\n\x1b[2m  当前项目已安装: ${cfg.tools.join(', ')} (版本 ${cfg.version || 'unknown'})\x1b[0m`;
+    } catch {}
+  }
+  console.log(`\x1b[36m6Aspec\x1b[0m v${pkg.version}${projectInfo}`);
+  process.exit(0);
+}
+
 (async () => {
   try {
     switch (command) {

package/lib/cli.js

@@ -19,20 +19,58 @@ const TOOLS = [
   { id: 'claude', name: 'Claude Code', desc: 'Claude Code CLI 配置' },
 ];
 
-// ─── Welcome Screen ──────────────────────────────────────────────────
-
-function buildWelcomeScreen() {
-  const logo = [
-    `${CYAN}        ████        ${RESET}`,
-    `${CYAN}      ░░    ░░      ${RESET}`,
-    `${CYAN}        ████        ${RESET}`,
-    `${CYAN}        ████        ${RESET}`,
-    `${CYAN}        ████        ${RESET}`,
-    `${CYAN}      ░░    ░░      ${RESET}`,
-    `${CYAN}        ████        ${RESET}`,
+// Only the 6aspec-owned subdirectory is removed — user's own commands are untouched
+const TOOL_DIRS = {
+  cursor: ['.cursor/commands/6aspec'],
+  claude:  ['.claude/commands/6aspec'],
+};
+
+// ─── Welcome Screen with Animation ──────────────────────────────────
+
+// Braille spinner frames
+const SPINNER_CHARS = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+
+// 4-phase ornament pulse: dim → mid → bright → mid
+const ORN_FRAMES = [
+  { ch: '░░', c: DIM + CYAN },
+  { ch: '▒▒', c: CYAN },
+  { ch: '██', c: BOLD + CYAN },
+  { ch: '▒▒', c: CYAN },
+];
+
+// Logo: 18 lines tall to match right-side content height
+// Visible width of each line = 20 chars ("        ████        ")
+function buildLogoLines(ornIdx, spinIdx) {
+  const { ch, c } = ORN_FRAMES[ornIdx % ORN_FRAMES.length];
+  const sp = SPINNER_CHARS[spinIdx % SPINNER_CHARS.length];
+  const B = BOLD + CYAN;
+  const R = RESET;
+  const _ = '                    '; // 20-char blank line
+
+  return [
+    _,
+    `        ${B}████${R}        `,
+    `        ${B}████${R}        `,
+    `      ${c}${ch}${R}    ${c}${ch}${R}      `,
+    `      ${c}${ch}${R}    ${c}${ch}${R}      `,
+    `        ${B}████${R}        `,
+    `        ${B}████${R}        `,
+    `        ${B}████${R}        `,
+    `        ${B}████${R}        `,
+    `      ${c}${ch}${R}    ${c}${ch}${R}      `,
+    `      ${c}${ch}${R}    ${c}${ch}${R}      `,
+    `        ${B}████${R}        `,
+    `        ${B}████${R}        `,
+    _,
+    `     ${CYAN}${sp}${R}               `,
+    _,
+    _,
+    _,
   ];
+}
 
-  const right = [
+function buildRightLines() {
+  return [
     `${BOLD}${WHITE}Welcome to 6Aspec${RESET}`,
     `${DIM}A lightweight spec-driven framework${RESET}`,
     ``,
@@ -41,51 +79,89 @@ function buildWelcomeScreen() {
     `  ${GREEN}•${RESET} /6aspec:* slash commands`,
     ``,
     `${YELLOW}Quick start after setup:${RESET}`,
-  ];
-
-  const brownCmds = [
+    ``,
+    `  ${MAGENTA}Brownfield (existing project):${RESET}`,
     `  ${GREEN}/6aspec:brown:new${RESET}        Create a change`,
     `  ${GREEN}/6aspec:brown:continue${RESET}   Next artifact`,
     `  ${GREEN}/6aspec:brown:implement${RESET}  Implement tasks`,
-  ];
-
-  const greenCmds = [
+    ``,
+    `  ${MAGENTA}Greenfield (new project):${RESET}`,
     `  ${GREEN}/6aspec:green:new${RESET}        Create a module`,
     `  ${GREEN}/6aspec:green:continue${RESET}   Next artifact`,
     `  ${GREEN}/6aspec:green:execute-task${RESET} Execute tasks`,
   ];
+}
 
-  const footer = `${DIM}Press Enter to select tools...${RESET}`;
-
+function buildScreenLines(logoLines, rightLines) {
   const lines = [];
   lines.push('');
-
-  const totalRight = [...right, ``, `  ${MAGENTA}Brownfield (existing project):${RESET}`, ...brownCmds, ``, `  ${MAGENTA}Greenfield (new project):${RESET}`, ...greenCmds];
-
-  const maxLines = Math.max(logo.length, totalRight.length);
-
-  for (let i = 0; i < maxLines; i++) {
-    const l = i < logo.length ? logo[i] : '                    ';
-    const r = i < totalRight.length ? totalRight[i] : '';
+  const len = Math.max(logoLines.length, rightLines.length);
+  for (let i = 0; i < len; i++) {
+    const l = i < logoLines.length ? logoLines[i] : '                    ';
+    const r = i < rightLines.length ? rightLines[i] : '';
     lines.push(`    ${l}    ${r}`);
   }
-
   lines.push('');
-  lines.push(`    ${' '.repeat(20)}    ${footer}`);
+  lines.push(`    ${'                    '}    ${DIM}Press Enter to select tools...${RESET}`);
   lines.push('');
-
-  return lines.join('\n');
+  return lines;
 }
 
-// ─── Interactive Tool Selection (pure readline, no deps) ────────────
+// ─── Animated welcome: renders in-place until Enter is pressed ───────
 
-function waitForEnter() {
+function waitForEnterAnimated() {
   return new Promise((resolve) => {
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    rl.question('', () => {
-      rl.close();
-      resolve();
-    });
+    const rightLines = buildRightLines();
+
+    let ornIdx = 0;
+    let spinIdx = 0;
+    let screenLineCount = 0;
+    let firstRender = true;
+
+    function render() {
+      const logoLines = buildLogoLines(ornIdx, spinIdx);
+      const screenLines = buildScreenLines(logoLines, rightLines);
+      const output = screenLines.join('\n') + '\n';
+
+      if (firstRender) {
+        process.stdout.write(output);
+        screenLineCount = screenLines.length;
+        firstRender = false;
+      } else {
+        // Move cursor up to start of screen, overwrite in-place
+        process.stdout.write(`\x1b[${screenLineCount}A${output}`);
+      }
+    }
+
+    render();
+
+    const interval = setInterval(() => {
+      ornIdx = (ornIdx + 1) % ORN_FRAMES.length;
+      spinIdx = (spinIdx + 1) % SPINNER_CHARS.length;
+      render();
+    }, 150);
+
+    const isRaw = process.stdin.isTTY;
+    if (isRaw) process.stdin.setRawMode(true);
+    process.stdin.resume();
+    process.stdin.setEncoding('utf8');
+
+    function onKey(key) {
+      if (key === '\r' || key === '\n' || key === ' ') {
+        clearInterval(interval);
+        process.stdin.removeListener('data', onKey);
+        if (isRaw) process.stdin.setRawMode(false);
+        process.stdin.pause();
+        // Clear welcome screen
+        process.stdout.write(`\x1b[${screenLineCount}A\x1b[J`);
+        resolve();
+      } else if (key === '\u0003') {
+        clearInterval(interval);
+        process.exit(0);
+      }
+    }
+
+    process.stdin.on('data', onKey);
   });
 }
 
@@ -115,8 +191,13 @@ function selectTools(preSelected) {
       TOOLS.forEach((tool, i) => {
         const check = selected[i] ? `${GREEN}◉${RESET}` : `○`;
         const pointer = i === cursor ? `${CYAN}❯${RESET}` : ' ';
-        const locked = preSelected.includes(tool.id) && selected[i] ? ` ${DIM}(installed)${RESET}` : '';
-        console.log(`  ${pointer} ${check}  ${tool.name} ${DIM}- ${tool.desc}${RESET}${locked}`);
+        let hint = '';
+        if (preSelected.includes(tool.id)) {
+          hint = selected[i]
+            ? ` ${DIM}(installed)${RESET}`
+            : ` ${YELLOW}(will remove)${RESET}`;
+        }
+        console.log(`  ${pointer} ${check}  ${tool.name} ${DIM}- ${tool.desc}${RESET}${hint}`);
       });
       console.log('');
     }
@@ -189,6 +270,43 @@ function writeConfig(targetDir, tools) {
   return config;
 }
 
+// ─── Tool removal ───────────────────────────────────────────────────
+
+function removeDirRecursive(dirPath) {
+  if (!fs.existsSync(dirPath)) return;
+  const entries = fs.readdirSync(dirPath, { withFileTypes: true });
+  for (const entry of entries) {
+    const full = path.join(dirPath, entry.name);
+    if (entry.isDirectory()) removeDirRecursive(full);
+    else fs.unlinkSync(full);
+  }
+  fs.rmdirSync(dirPath);
+}
+
+function removeToolFiles(targetDir, tools) {
+  for (const tool of tools) {
+    const dirs = TOOL_DIRS[tool] || [];
+    for (const rel of dirs) {
+      const full = path.join(targetDir, rel);
+      if (fs.existsSync(full)) {
+        removeDirRecursive(full);
+        console.log(`${GREEN}[INFO]${RESET} 已删除 ${rel}`);
+      }
+    }
+  }
+}
+
+// Simple y/N prompt (readline, no raw mode needed)
+function promptConfirm(question) {
+  return new Promise((resolve) => {
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    rl.question(`${question} ${DIM}[y/N]${RESET} `, (answer) => {
+      rl.close();
+      resolve(answer.trim().toLowerCase() === 'y');
+    });
+  });
+}
+
 // ─── Parse non-interactive --tool flag ──────────────────────────────
 
 function parseToolFlag(args) {
@@ -221,8 +339,7 @@ async function init(args) {
     console.log(`\n${GREEN}[INFO]${RESET} 非交互模式：初始化 ${selectedTools.join(', ')}`);
   } else {
     // Interactive mode
-    process.stdout.write(buildWelcomeScreen());
-    await waitForEnter();
+    await waitForEnterAnimated();
     selectedTools = await selectTools(preSelected);
 
     if (selectedTools.length === 0) {
@@ -266,10 +383,26 @@ async function init(args) {
     }
   }
 
+  // Handle deselected tools (were installed, now unchecked)
+  const removedTools = preSelected.filter((t) => !selectedTools.includes(t));
+  if (removedTools.length > 0) {
+    console.log(`\n${YELLOW}[WARN]${RESET} 以下工具已取消选择: ${removedTools.join(', ')}`);
+    for (const tool of removedTools) {
+      const dirs = TOOL_DIRS[tool] || [];
+      dirs.forEach((d) => console.log(`  ${DIM}${d}${RESET}`));
+    }
+    const confirm = await promptConfirm('  是否同时删除这些文件？');
+    if (confirm) {
+      removeToolFiles(targetDir, removedTools);
+    } else {
+      console.log(`${DIM}  已跳过文件删除，文件保留在磁盘上。${RESET}`);
+    }
+  }
+
   // Save config
   const savedConfig = writeConfig(targetDir, selectedTools);
   console.log(`\n${GREEN}[SUCCESS]${RESET} 初始化完成！配置已保存到 ${CONFIG_FILE}`);
-  console.log(`${DIM}  工具: ${selectedTools.join(', ')}${RESET}`);
+  console.log(`${DIM}  工具: ${selectedTools.length > 0 ? selectedTools.join(', ') : '(none)'}${RESET}`);
   console.log(`${DIM}  版本: ${savedConfig.version}${RESET}\n`);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "6aspec",
-  "version": "2.0.0-dev.2",
+  "version": "2.0.0-dev.5",
   "description": "6Aspec - 轻量级 spec 驱动开发框架，支持 Cursor 和 Claude Code",
   "main": "lib/installer.js",
   "bin": {