@shirayner/ace 0.1.1-snapshot.3 → 0.1.1-snapshot.4

package/bin/ace.js

@@ -2,7 +2,6 @@
 
 import { createRequire } from 'module';
 import { Command } from 'commander';
-import chalk from 'chalk';
 import { initCommand } from '../src/commands/init.js';
 import { doctorCommand } from '../src/commands/doctor.js';
 import { listCommand } from '../src/commands/list.js';
@@ -22,10 +21,8 @@ program
 program
   .command('init')
   .description('Initialize AI coding environment')
-  .option('-p, --preset <name>', 'Installation preset: full, minimal, safe', 'full')
   .option('-f, --force', 'Overwrite existing files', false)
   .option('--dry-run', 'Show what would be done without making changes', false)
-  .option('--no-interaction', 'Skip interactive prompts, use defaults')
   .action(initCommand);
 
 program

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shirayner/ace",
-  "version": "0.1.1-snapshot.3",
+  "version": "0.1.1-snapshot.4",
   "description": "AI Coding Environment - One command to set up your Claude Code harness",
   "bin": {
     "ace": "./bin/ace.js"
@@ -25,11 +25,12 @@
   },
   "type": "module",
   "dependencies": {
-    "commander": "^12.0.0",
+    "@clack/prompts": "^1.2.0",
     "chalk": "^5.3.0",
-    "inquirer": "^9.2.0",
-    "fs-extra": "^11.2.0",
+    "commander": "^12.0.0",
     "deepmerge": "^4.3.1",
+    "fs-extra": "^11.2.0",
+    "inquirer": "^9.2.0",
     "js-yaml": "^4.1.0",
     "ora": "^8.0.0"
   },

package/src/commands/init.js

@@ -1,120 +1,84 @@
-import inquirer from 'inquirer';
-import ora from 'ora';
+import * as p from '@clack/prompts';
 import { createRequire } from 'module';
-import { PRESETS, ROLES, COMPONENTS } from '../core/constants.js';
+import { PRESETS, COMPONENTS } from '../core/constants.js';
 import { Installer } from '../core/installer.js';
-import {
-  printBanner, renderScreen,
-  doneMessage, doneWithErrors,
-  colors, icons, componentLabels,
-} from '../core/ui.js';
 
 const require = createRequire(import.meta.url);
 const pkg = require('../../package.json');
 
-function formatStep(label, value) {
-  return `  ${colors.success(icons.check)} ${colors.dim(label)} ${colors.dim('·')} ${colors.white(value)}`;
-}
+const componentLabels = {
+  core: 'Core Config',
+  rules: 'Rules',
+  plugin: 'Plugin',
+  hooks: 'Hooks',
+  hookify: 'Safety Guards',
+  memory: 'Memory',
+};
 
 export async function initCommand(options) {
   const version = pkg.version;
-  let role = 'fullstack';
-  let preset = options.preset;
-  const completedSteps = [];
-
-  // ─── Step 1: Role ──────────────────────────────────────────
-  if (options.interaction !== false) {
-    renderScreen(version);
-
-    const result = await inquirer.prompt([{
-      type: 'list',
-      name: 'role',
-      message: 'Role',
-      choices: Object.entries(ROLES).map(([key, val]) => ({
-        name: `${colors.white(val.label)}  ${colors.dim(val.description)}`,
-        value: key,
-        short: val.label,
-      })),
-      default: 'fullstack',
-      prefix: colors.brand('?'),
-    }]);
-
-    role = result.role;
-    completedSteps.push(formatStep('Role', ROLES[role].label));
-  }
+  const components = PRESETS['full'];
 
-  const components = PRESETS[preset];
-  if (!components) {
-    console.error(`  ${colors.error(icons.cross)} Unknown preset: ${preset}. Use: ${Object.keys(PRESETS).join(', ')}`);
-    process.exit(1);
-  }
+  // ─── Intro ──────────────────────────────────────────────
+  p.intro(`ace v${version}`);
 
-  // ─── Step 2: Conflicts (conditional) ───────────────────────
+  // ─── Conflict detection ─────────────────────────────────
   const installer = new Installer({
     force: options.force,
     dryRun: options.dryRun,
-    role,
+    role: 'fullstack',
     components,
     quiet: true,
   });
 
   let resolutions = {};
 
-  if (!options.force && options.interaction !== false) {
+  if (!options.force) {
     const conflicts = await installer.detectConflicts();
     const conflictKeys = Object.keys(conflicts);
 
     if (conflictKeys.length > 0) {
       const totalFiles = conflictKeys.reduce((sum, k) => sum + conflicts[k].files.length, 0);
+      const mergeComponents = conflictKeys.filter(k => conflicts[k].hasMerge);
+
+      if (mergeComponents.length > 0) {
+        p.log.info('Safe merge: CLAUDE.md, settings.json (preserves your changes)');
+      }
+      if (totalFiles > 0) {
+        p.log.warn(`${totalFiles} existing file(s) found`);
+      }
 
-      renderScreen(version, completedSteps);
-      console.log(`  ${colors.warning(icons.warn)} ${totalFiles} existing file(s) found`);
-      console.log();
-
-      const { action } = await inquirer.prompt([{
-        type: 'list',
-        name: 'action',
-        message: 'How to handle?',
-        choices: [
-          {
-            name: `${colors.white('Keep existing')}  ${colors.dim('merge compatible, skip rest')}`,
-            value: 'skip',
-            short: 'Keep',
-          },
-          {
-            name: `${colors.warning('Overwrite all')}  ${colors.dim('replace with latest')}`,
-            value: 'overwrite',
-            short: 'Overwrite',
-          },
+      const action = await p.select({
+        message: 'How to handle existing files?',
+        options: [
+          { value: 'skip', label: 'Keep & merge', hint: 'recommended' },
+          { value: 'overwrite', label: 'Overwrite all', hint: 'replace with latest' },
+          { value: 'cancel', label: 'Cancel' },
         ],
-        default: 'skip',
-        prefix: colors.brand('?'),
-      }]);
+        initialValue: 'skip',
+      });
+
+      if (p.isCancel(action) || action === 'cancel') {
+        p.cancel('Setup cancelled.');
+        process.exit(0);
+      }
 
       for (const key of conflictKeys) {
         resolutions[key] = action;
       }
-
-      completedSteps.push(
-        formatStep('Conflicts', action === 'skip' ? 'Keep existing' : 'Overwrite all')
-      );
     }
   }
 
   installer.resolutions = resolutions;
 
-  // ─── Step 3: Install ───────────────────────────────────────
-  if (options.interaction !== false) {
-    renderScreen(version, completedSteps);
-  } else {
-    printBanner(version);
-  }
-
+  // ─── Dry-run notice ─────────────────────────────────────
   if (options.dryRun) {
-    console.log(`  ${colors.dim('dry-run — no changes will be made')}`);
-    console.log();
+    p.log.warn('dry-run — no changes will be made');
   }
 
+  // ─── Install ────────────────────────────────────────────
+  p.log.step('Installing to ~/.claude/');
+
   for (const componentName of components) {
     const component = COMPONENTS[componentName];
     if (!component) continue;
@@ -124,56 +88,66 @@ export async function initCommand(options) {
     const beforeMerged = installer.results.merged.length;
     const beforeSkipped = installer.results.skipped.length;
 
-    const spinner = ora({
-      text: label,
-      indent: 2,
-      color: 'magenta',
-    }).start();
+    const s = p.spinner();
+    s.start(label);
 
     try {
       await installer.installComponent(componentName, component);
+      s.stop(label);
 
       const newInstalled = installer.results.installed.length - beforeInstalled;
       const newMerged = installer.results.merged.length - beforeMerged;
       const newSkipped = installer.results.skipped.length - beforeSkipped;
 
       if (newMerged > 0 && newInstalled === 0 && newSkipped === 0) {
-        spinner.stopAndPersist({
-          symbol: colors.blue(icons.merge),
-          text: `${label} ${colors.dim('merged')}`,
-        });
+        p.log.info(`${label} — merged`);
       } else if (newSkipped > 0 && newInstalled === 0 && newMerged === 0) {
-        spinner.stopAndPersist({
-          symbol: colors.muted(icons.skip),
-          text: `${colors.muted(label)} ${colors.dim('unchanged')}`,
-        });
+        p.log.message(`${label} — unchanged`);
       } else {
         const count = newInstalled + newMerged;
-        const detail = count > 0 ? ` ${count} file${count > 1 ? 's' : ''}` : '';
-        spinner.stopAndPersist({
-          symbol: colors.success(icons.check),
-          text: `${label}${colors.dim(detail)}`,
-        });
+        const detail = count > 0 ? `${count} file${count > 1 ? 's' : ''}` : '';
+        p.log.success(`${label} — ${detail}`);
       }
     } catch (err) {
-      spinner.stopAndPersist({
-        symbol: colors.error(icons.cross),
-        text: `${label} ${colors.dim(err.message)}`,
-      });
+      s.stop(label);
+      p.log.error(`${label} — ${err.message}`);
       installer.results.errors.push({ component: componentName, error: err.message });
     }
   }
 
-  // ─── Summary ────────────────────────────────────────────────
+  // ─── Summary ────────────────────────────────────────────
   const { installed, merged, skipped, errors } = installer.results;
+  const parts = [];
+  if (installed.length > 0) parts.push(`${installed.length} installed`);
+  if (merged.length > 0) parts.push(`${merged.length} merged`);
+  if (skipped.length > 0) parts.push(`${skipped.length} skipped`);
+
+  if (errors.length === 0) {
+    p.log.success(parts.join(', '));
+  } else {
+    p.log.warn(`${parts.join(', ')}, ${errors.length} failed`);
+  }
 
+  // ─── Next Steps ─────────────────────────────────────────
+  p.note(
+    [
+      'Get started',
+      '  1. cd <your-project> && ace spec init',
+      '  2. Open Claude Code, type: /opsx:propose 创建需求提案',
+      '',
+      'Customize',
+      '  Change role      edit ~/.claude/memory/user_profile.md',
+      '  Adjust rules     edit ~/.claude/rules/ace/',
+      '  Safety guards    edit ~/.claude/hookify.ace.*.local.md',
+      '  Verify setup     ace doctor',
+    ].join('\n'),
+    'Next steps'
+  );
+
+  // ─── Outro ──────────────────────────────────────────────
   if (errors.length === 0) {
-    doneMessage({
-      installed: installed.length,
-      merged: merged.length,
-      skipped: skipped.length,
-    });
+    p.outro('Done. Go to your project and run ace spec init.');
   } else {
-    doneWithErrors({ errors: errors.length });
+    p.outro('Done with errors. Run ace doctor to diagnose.');
   }
 }