@shirayner/ace 0.1.1-snapshot.1 → 0.1.1-snapshot.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shirayner/ace",
-  "version": "0.1.1-snapshot.1",
+  "version": "0.1.1-snapshot.2",
   "description": "AI Coding Environment - One command to set up your Claude Code harness",
   "bin": {
     "ace": "./bin/ace.js"

package/src/commands/init.js

@@ -4,85 +4,46 @@ import { createRequire } from 'module';
 import { PRESETS, ROLES, COMPONENTS } from '../core/constants.js';
 import { Installer } from '../core/installer.js';
 import {
-  printBanner, sectionHeader, stepDone, stepSkip, stepFail,
-  fileEntry, summaryBox, doneMessage, doneWithErrors, separator,
-  conflictHeader, conflictFile,
-  colors, icons, componentIcons, componentLabels,
+  printBanner, stepDone, stepMerge, stepSkip, stepFail,
+  doneMessage, doneWithErrors,
+  colors, icons, componentLabels,
 } from '../core/ui.js';
 
 const require = createRequire(import.meta.url);
 const pkg = require('../../package.json');
 
 export async function initCommand(options) {
-  // ─── Banner ──────────────────────────────────────────────────────
   printBanner(pkg.version);
 
   let role = 'fullstack';
   let preset = options.preset;
 
-  // ─── Interactive prompts ─────────────────────────────────────────
+  // ─── Interactive: ask role only ─────────────────────────────
   if (options.interaction !== false) {
     const answers = await inquirer.prompt([
       {
         type: 'list',
         name: 'role',
-        message: `${icons.gear}  Your primary role?`,
+        message: 'Role',
         choices: Object.entries(ROLES).map(([key, val]) => ({
-          name: `${colors.white(val.label)} ${colors.dim('—')} ${colors.muted(val.description)}`,
+          name: `${colors.white(val.label)}  ${colors.dim(val.description)}`,
           value: key,
           short: val.label,
         })),
         default: 'fullstack',
         prefix: colors.brand('?'),
       },
-      {
-        type: 'list',
-        name: 'preset',
-        message: `${icons.package}  Installation scope?`,
-        choices: [
-          {
-            name: `${colors.white('Full')} ${colors.dim('—')} ${colors.muted('All components (rules, plugin, hooks, safety guards, memory)')}`,
-            value: 'full',
-            short: 'Full',
-          },
-          {
-            name: `${colors.white('Safe')} ${colors.dim('—')} ${colors.muted('Core + rules + plugin + safety guards + memory')}`,
-            value: 'safe',
-            short: 'Safe',
-          },
-          {
-            name: `${colors.white('Minimal')} ${colors.dim('—')} ${colors.muted('Core + rules + plugin only')}`,
-            value: 'minimal',
-            short: 'Minimal',
-          },
-        ],
-        default: 'full',
-        prefix: colors.brand('?'),
-      },
     ]);
     role = answers.role;
-    preset = answers.preset;
   }
 
   const components = PRESETS[preset];
   if (!components) {
-    console.error(colors.error(`  ${icons.cross} Unknown preset: ${preset}. Available: ${Object.keys(PRESETS).join(', ')}`));
+    console.error(`  ${colors.error(icons.cross)} Unknown preset: ${preset}. Use: ${Object.keys(PRESETS).join(', ')}`);
     process.exit(1);
   }
 
-  // ─── Config summary ──────────────────────────────────────────────
-  console.log();
-  console.log(`  ${colors.dim('│')}  ${colors.dim('Role')}     ${colors.white(ROLES[role].label)}`);
-  console.log(`  ${colors.dim('│')}  ${colors.dim('Preset')}   ${colors.white(preset)}`);
-  console.log(`  ${colors.dim('│')}  ${colors.dim('Scope')}    ${components.map(c => componentLabels[c] || c).join(colors.dim(', '))}`);
-  if (options.force) {
-    console.log(`  ${colors.dim('│')}  ${colors.warning(`${icons.warn} Force mode — existing files will be overwritten`)}`);
-  }
-  if (options.dryRun) {
-    console.log(`  ${colors.dim('│')}  ${colors.accent(`${icons.info} Dry-run mode — no changes will be made`)}`);
-  }
-
-  // ─── Conflict detection & category confirmation ──────────────────
+  // ─── Conflict detection ─────────────────────────────────────
   const installer = new Installer({
     force: options.force,
     dryRun: options.dryRun,
@@ -98,118 +59,88 @@ export async function initCommand(options) {
     const conflictKeys = Object.keys(conflicts);
 
     if (conflictKeys.length > 0) {
-      console.log();
-      sectionHeader(icons.warn, 'Existing files detected');
-      console.log(`  ${colors.dim('│')}  ${colors.muted('Some files already exist. Choose how to handle each category:')}`);
-      console.log(`  ${colors.dim('│')}  ${colors.muted(`CLAUDE.md ${icons.arrowR} always smart-merge (append new refs only)`)}`);
-      console.log(`  ${colors.dim('│')}  ${colors.muted(`settings.json ${icons.arrowR} always deep-merge (preserve your settings)`)}`);
-
-      for (const componentName of conflictKeys) {
-        const { files } = conflicts[componentName];
-        const icon = componentIcons[componentName] || icons.file;
-        const label = componentLabels[componentName] || componentName;
-
-        conflictHeader(label, icon, files.length);
-        for (const f of files) {
-          conflictFile(f.replace(/\\/g, '/'));
-        }
-      }
+      const totalFiles = conflictKeys.reduce((sum, k) => sum + conflicts[k].files.length, 0);
 
+      console.log(`  ${colors.warning(icons.warn)} ${totalFiles} existing file(s) found.`);
       console.log();
-      const conflictAnswers = await inquirer.prompt(
-        conflictKeys.map((componentName) => {
-          const icon = componentIcons[componentName] || icons.file;
-          const label = componentLabels[componentName] || componentName;
-          const count = conflicts[componentName].files.length;
-          return {
-            type: 'list',
-            name: componentName,
-            message: `${icon}  ${label} (${count} files)`,
-            choices: [
-              {
-                name: `${colors.muted('Skip')} ${colors.dim('— keep existing files')}`,
-                value: 'skip',
-                short: 'Skip',
-              },
-              {
-                name: `${colors.warning('Overwrite')} ${colors.dim('— replace with ace templates')}`,
-                value: 'overwrite',
-                short: 'Overwrite',
-              },
-            ],
-            default: 'skip',
-            prefix: colors.brand('?'),
-          };
-        })
-      );
-
-      resolutions = conflictAnswers;
+
+      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',
+            },
+          ],
+          default: 'skip',
+          prefix: colors.brand('?'),
+        },
+      ]);
+
+      for (const key of conflictKeys) {
+        resolutions[key] = action;
+      }
     }
   }
 
-  // Apply resolutions to installer
   installer.resolutions = resolutions;
 
-  // ─── Installation ────────────────────────────────────────────────
+  // ─── Install ────────────────────────────────────────────────
+  if (options.dryRun) {
+    console.log(`  ${colors.dim('dry-run — no changes will be made')}`);
+  }
   console.log();
-  sectionHeader(icons.rocket, 'Installing components');
 
   for (const componentName of components) {
     const component = COMPONENTS[componentName];
     if (!component) continue;
 
-    const icon = componentIcons[componentName] || icons.file;
     const label = componentLabels[componentName] || componentName;
-
     const beforeInstalled = installer.results.installed.length;
     const beforeMerged = installer.results.merged.length;
     const beforeSkipped = installer.results.skipped.length;
 
     try {
       await installer.installComponent(componentName, component);
+
       const newInstalled = installer.results.installed.length - beforeInstalled;
       const newMerged = installer.results.merged.length - beforeMerged;
       const newSkipped = installer.results.skipped.length - beforeSkipped;
 
-      const parts = [];
-      if (newInstalled > 0) parts.push(colors.success(`${newInstalled} installed`));
-      if (newMerged > 0) parts.push(colors.blue(`${newMerged} merged`));
-      if (newSkipped > 0) parts.push(colors.muted(`${newSkipped} skipped`));
-      const detail = parts.length > 0 ? ` ${colors.dim('—')} ${parts.join(colors.dim(', '))}` : '';
-
-      stepDone(`${icon}  ${label}${detail}`);
+      if (newMerged > 0 && newInstalled === 0 && newSkipped === 0) {
+        stepMerge(label, 'merged');
+      } else if (newSkipped > 0 && newInstalled === 0 && newMerged === 0) {
+        stepSkip(label, 'unchanged');
+      } else {
+        const count = newInstalled + newMerged;
+        const detail = count > 0 ? `${count} file${count > 1 ? 's' : ''}` : '';
+        stepDone(label, detail);
+      }
     } catch (err) {
-      stepFail(`${icon}  ${label} ${colors.dim('—')} ${colors.error(err.message)}`);
+      stepFail(label, err.message);
       installer.results.errors.push({ component: componentName, error: err.message });
     }
   }
 
-  const { installed, skipped, merged, errors } = installer.results;
-
-  // ─── Detailed file list ──────────────────────────────────────────
-  if (installed.length > 0 || merged.length > 0 || skipped.length > 0) {
-    separator();
-    sectionHeader(icons.file, 'File details');
-    for (const f of installed) fileEntry('install', f.replace(/\\/g, '/'));
-    for (const m of merged) {
-      const detail = m.added ? ` (${m.added.length} refs)` : '';
-      fileEntry('merge', `${m.file.replace(/\\/g, '/')}${detail}`);
-    }
-    for (const f of skipped) fileEntry('skip', f.replace(/\\/g, '/'));
-    for (const e of errors) fileEntry('error', `${(e.file || e.component).replace(/\\/g, '/')}: ${e.error}`);
-  }
-
-  // ─── Summary ─────────────────────────────────────────────────────
-  summaryBox({
-    installed: installed.length,
-    merged: merged.length,
-    skipped: skipped.length,
-    errors: errors.length,
-  });
+  // ─── Summary ────────────────────────────────────────────────
+  const { installed, merged, skipped, errors } = installer.results;
 
   if (errors.length === 0) {
-    doneMessage();
+    doneMessage({
+      installed: installed.length,
+      merged: merged.length,
+      skipped: skipped.length,
+    });
   } else {
-    doneWithErrors();
+    doneWithErrors({ errors: errors.length });
   }
 }

package/src/core/ui.js

@@ -1,177 +1,77 @@
 import chalk from 'chalk';
 
-// ─── Icons ───────────────────────────────────────────────────────────
+// ─── Icons (minimal set) ────────────────────────────────────
 export const icons = {
-  ace:       '◆',
-  check:     '✔',
-  cross:     '✖',
-  arrow:     '▶',
-  arrowR:    '→',
-  dot:       '●',
-  circle:    '○',
-  warn:      '⚠',
-  info:      'ℹ',
-  skip:      '◇',
-  merge:     '⇄',
-  folder:    '▸',
-  shield:    '🛡',
-  gear:      '⚙',
-  rocket:    '🚀',
-  sparkles:  '✨',
-  package:   '📦',
-  file:      '📄',
-  brain:     '🧠',
-  hook:      '🪝',
-  guard:     '🔒',
-  memory:    '💾',
-  plug:      '🔌',
+  ace:    '◆',
+  check:  '✔',
+  cross:  '✖',
+  warn:   '⚠',
+  skip:   '◇',
+  dot:    '·',
+  merge:  '~',
 };
 
-// ─── Colors ──────────────────────────────────────────────────────────
+// ─── Colors ─────────────────────────────────────────────────
 export const colors = {
-  brand:    chalk.hex('#7C3AED'),   // vibrant purple
-  accent:   chalk.hex('#06B6D4'),   // cyan
-  success:  chalk.hex('#10B981'),   // emerald
-  warning:  chalk.hex('#F59E0B'),   // amber
-  error:    chalk.hex('#EF4444'),   // red
-  dim:      chalk.hex('#6B7280'),   // gray
-  muted:    chalk.hex('#9CA3AF'),   // light gray
-  white:    chalk.hex('#F9FAFB'),   // near white
-  blue:     chalk.hex('#3B82F6'),   // blue
+  brand:   chalk.hex('#7C3AED'),
+  success: chalk.hex('#10B981'),
+  warning: chalk.hex('#F59E0B'),
+  error:   chalk.hex('#EF4444'),
+  dim:     chalk.hex('#6B7280'),
+  muted:   chalk.hex('#9CA3AF'),
+  white:   chalk.hex('#F9FAFB'),
+  blue:    chalk.hex('#3B82F6'),
 };
 
-// ─── ASCII Banner ────────────────────────────────────────────────────
+// ─── Banner (single line) ───────────────────────────────────
 export function printBanner(version) {
-  const purple = colors.brand;
-  const dim = colors.dim;
-
-  console.log();
-  console.log(purple('    ╔═══╗  ╔═══╗  ╔═══╗'));
-  console.log(purple('    ╠═══╣  ║     ╠═══╝'));
-  console.log(purple('    ║   ║  ╚═══╝  ╚═══╗'));
   console.log();
-  console.log(`    ${purple.bold('ace')} ${dim(`v${version}`)} ${dim('— AI Coding Environment')}`);
+  console.log(`  ${colors.brand.bold('◆ ace')} ${colors.dim(`v${version}`)}`);
   console.log();
 }
 
-// ─── Section Header ──────────────────────────────────────────────────
-export function sectionHeader(icon, title) {
-  console.log(`  ${icon}  ${colors.white.bold(title)}`);
-}
-
-// ─── Step indicator ──────────────────────────────────────────────────
-export function stepStart(label) {
-  process.stdout.write(`  ${colors.dim('│')}\n`);
-  process.stdout.write(`  ${colors.brand(icons.dot)}  ${label}\n`);
-}
-
-export function stepDone(label) {
-  process.stdout.write(`  ${colors.success(icons.check)}  ${label}\n`);
+// ─── Step indicators ────────────────────────────────────────
+export function stepDone(label, detail) {
+  const d = detail ? colors.dim(` ${detail}`) : '';
+  console.log(`  ${colors.success(icons.check)} ${label}${d}`);
 }
 
-export function stepSkip(label) {
-  process.stdout.write(`  ${colors.muted(icons.skip)}  ${colors.muted(label)}\n`);
+export function stepMerge(label, detail) {
+  const d = detail ? colors.dim(` ${detail}`) : '';
+  console.log(`  ${colors.blue(icons.merge)} ${label}${d}`);
 }
 
-export function stepWarn(label) {
-  process.stdout.write(`  ${colors.warning(icons.warn)}  ${label}\n`);
+export function stepSkip(label, detail) {
+  const d = detail ? colors.dim(` ${detail}`) : '';
+  console.log(`  ${colors.muted(icons.skip)} ${colors.muted(label)}${d}`);
 }
 
-export function stepFail(label) {
-  process.stdout.write(`  ${colors.error(icons.cross)}  ${label}\n`);
-}
-
-// ─── File list (compact) ─────────────────────────────────────────────
-export function fileEntry(action, filePath) {
-  const prefix = {
-    install:  `  ${colors.success('+')}`,
-    merge:    `  ${colors.blue('~')}`,
-    skip:     `  ${colors.muted('-')}`,
-    overwrite:`  ${colors.warning('!')}`,
-    error:    `  ${colors.error('✖')}`,
-  };
-  const color = {
-    install:  colors.success,
-    merge:    colors.blue,
-    skip:     colors.muted,
-    overwrite:colors.warning,
-    error:    colors.error,
-  };
-  console.log(`${prefix[action] || '   '} ${(color[action] || colors.dim)(filePath)}`);
-}
-
-// ─── Summary Box ─────────────────────────────────────────────────────
-export function summaryBox(stats) {
-  const { installed, merged, skipped, errors } = stats;
-
-  console.log();
-  console.log(`  ${colors.dim('╭─────────────────────────────────────╮')}`);
-  console.log(`  ${colors.dim('│')}  ${colors.white.bold('Installation Summary')}              ${colors.dim('│')}`);
-  console.log(`  ${colors.dim('├─────────────────────────────────────┤')}`);
-
-  if (installed > 0) {
-    console.log(`  ${colors.dim('│')}  ${colors.success(icons.check)} ${colors.success(`${installed} installed`)}${pad(installed, 'installed')}${colors.dim('│')}`);
-  }
-  if (merged > 0) {
-    console.log(`  ${colors.dim('│')}  ${colors.blue(icons.merge)} ${colors.blue(`${merged} merged`)}${pad(merged, 'merged')}${colors.dim('│')}`);
-  }
-  if (skipped > 0) {
-    console.log(`  ${colors.dim('│')}  ${colors.muted(icons.skip)} ${colors.muted(`${skipped} skipped`)}${pad(skipped, 'skipped')}${colors.dim('│')}`);
-  }
-  if (errors > 0) {
-    console.log(`  ${colors.dim('│')}  ${colors.error(icons.cross)} ${colors.error(`${errors} errors`)}${pad(errors, 'errors')}${colors.dim('│')}`);
-  }
-
-  console.log(`  ${colors.dim('╰─────────────────────────────────────╯')}`);
+export function stepFail(label, detail) {
+  const d = detail ? colors.dim(` ${detail}`) : '';
+  console.log(`  ${colors.error(icons.cross)} ${label}${d}`);
 }
 
-function pad(count, label) {
-  const text = `${count} ${label}`;
-  const total = 33;
-  const spaces = total - text.length - 4; // 4 = icon + spaces
-  return ' '.repeat(Math.max(1, spaces));
-}
+// ─── Done messages ──────────────────────────────────────────
+export function doneMessage(stats) {
+  const parts = [];
+  if (stats.installed > 0) parts.push(`${stats.installed} installed`);
+  if (stats.merged > 0) parts.push(`${stats.merged} merged`);
+  if (stats.skipped > 0) parts.push(`${stats.skipped} skipped`);
 
-// ─── Final message ───────────────────────────────────────────────────
-export function doneMessage() {
   console.log();
-  console.log(`  ${icons.rocket} ${colors.success.bold('Your AI coding environment is ready.')}`);
-  console.log(`  ${colors.dim(`Run ${chalk.white('ace doctor')} to verify the installation.`)}`);
+  console.log(`  ${colors.success(icons.check)} ${colors.success.bold('Done.')} ${colors.dim(parts.join(', '))}`);
+  console.log(`  ${colors.dim(`  Run ${chalk.white('ace doctor')} to verify.`)}`);
   console.log();
 }
 
-export function doneWithErrors() {
+export function doneWithErrors(stats) {
   console.log();
-  console.log(`  ${icons.warn} ${colors.warning.bold('Completed with errors.')}`);
-  console.log(`  ${colors.dim(`Run ${chalk.white('ace doctor')} to diagnose.`)}`);
-  console.log();
-}
-
-// ─── Separator ───────────────────────────────────────────────────────
-export function separator() {
-  console.log(`  ${colors.dim('│')}`);
-}
-
-// ─── Conflict prompt helpers ─────────────────────────────────────────
-export function conflictHeader(componentName, icon, fileCount) {
+  console.log(`  ${colors.warning(icons.warn)} ${colors.warning.bold('Done with errors.')} ${colors.dim(`${stats.errors} failed`)}`);
+  console.log(`  ${colors.dim(`  Run ${chalk.white('ace doctor')} to diagnose.`)}`);
   console.log();
-  console.log(`  ${colors.warning(icons.warn)}  ${icon}  ${colors.white.bold(componentName)} — ${colors.warning(`${fileCount} file(s) already exist`)}`);
-}
-
-export function conflictFile(filePath) {
-  console.log(`       ${colors.dim(icons.arrowR)} ${colors.muted(filePath)}`);
 }
 
-// ─── Component icons ─────────────────────────────────────────────────
-export const componentIcons = {
-  core:    icons.gear,
-  rules:   icons.brain,
-  plugin:  icons.plug,
-  hooks:   icons.hook,
-  hookify: icons.guard,
-  memory:  icons.memory,
-};
-
+// ─── Component labels ───────────────────────────────────────
 export const componentLabels = {
   core:    'Core Config',
   rules:   'Rules',