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

package/package.json

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

package/src/commands/init.js

@@ -1,7 +1,10 @@
 import * as p from '@clack/prompts';
+import path from 'path';
+import fs from 'fs-extra';
 import { createRequire } from 'module';
-import { PRESETS, COMPONENTS } from '../core/constants.js';
+import { PRESETS, COMPONENTS, CLAUDE_DIR, TEMPLATES_DIR } from '../core/constants.js';
 import { Installer } from '../core/installer.js';
+import { mergeClaudeMd } from '../core/merger.js';
 
 const require = createRequire(import.meta.url);
 const pkg = require('../../package.json');
@@ -19,10 +22,8 @@ export async function initCommand(options) {
   const version = pkg.version;
   const components = PRESETS['full'];
 
-  // ─── Intro ──────────────────────────────────────────────
   p.intro(`ace v${version}`);
 
-  // ─── Conflict detection ─────────────────────────────────
   const installer = new Installer({
     force: options.force,
     dryRun: options.dryRun,
@@ -33,89 +34,100 @@ export async function initCommand(options) {
 
   let resolutions = {};
 
+  // ─── Conflict detection with categorized preview ───
   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`);
+    const preview = await buildInstallPreview(installer, components);
+    const hasExisting = preview.merge.length > 0 || preview.skip.length > 0 || preview.conflict.length > 0;
+
+    if (hasExisting) {
+      // Show safe merge section
+      if (preview.merge.length > 0) {
+        const mergeLines = preview.merge.map(m => `  ${m.dest} — ${m.detail}`);
+        p.log.info(['Safe merge:', ...mergeLines].join('\n'));
       }
 
-      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' },
-        ],
-        initialValue: 'skip',
-      });
-
-      if (p.isCancel(action) || action === 'cancel') {
-        p.cancel('Setup cancelled.');
-        process.exit(0);
+      // Show auto-skip section
+      if (preview.skip.length > 0) {
+        const skipLines = preview.skip.map(s => `  ${s} — preserves your data`);
+        p.log.message(['Auto-skip:', ...skipLines].join('\n'));
       }
 
-      for (const key of conflictKeys) {
-        resolutions[key] = action;
+      // Show conflict section + prompt
+      if (preview.conflict.length > 0) {
+        const conflictLines = preview.conflict.map(f => `  ${f}`);
+        p.log.warn([`${preview.conflict.length} existing file(s):`, ...conflictLines].join('\n'));
+
+        const action = await p.select({
+          message: `How to handle ${preview.conflict.length} existing files?`,
+          options: [
+            { value: 'skip', label: 'Keep existing', hint: 'recommended' },
+            { value: 'overwrite', label: 'Overwrite with latest' },
+            { value: 'cancel', label: 'Cancel' },
+          ],
+          initialValue: 'skip',
+        });
+
+        if (p.isCancel(action) || action === 'cancel') {
+          p.cancel('Setup cancelled.');
+          process.exit(0);
+        }
+
+        for (const componentName of components) {
+          resolutions[componentName] = action;
+        }
       }
     }
   }
 
   installer.resolutions = resolutions;
 
-  // ─── Dry-run notice ─────────────────────────────────────
   if (options.dryRun) {
     p.log.warn('dry-run — no changes will be made');
   }
 
-  // ─── Install ────────────────────────────────────────────
-  p.log.step('Installing to ~/.claude/');
+  // ─── Install with single spinner ───────────────────
+  const s = p.spinner();
+  const componentResults = [];
+
+  s.start('Installing...');
 
   for (const componentName of components) {
     const component = COMPONENTS[componentName];
     if (!component) continue;
 
     const label = componentLabels[componentName] || componentName;
+    s.message(`Installing ${label}...`);
+
     const beforeInstalled = installer.results.installed.length;
     const beforeMerged = installer.results.merged.length;
     const beforeSkipped = installer.results.skipped.length;
 
-    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) {
-        p.log.info(`${label} — merged`);
-      } else if (newSkipped > 0 && newInstalled === 0 && newMerged === 0) {
-        p.log.message(`${label} — unchanged`);
-      } else {
-        const count = newInstalled + newMerged;
-        const detail = count > 0 ? `${count} file${count > 1 ? 's' : ''}` : '';
-        p.log.success(`${label} — ${detail}`);
-      }
+      componentResults.push({
+        label,
+        installed: installer.results.installed.length - beforeInstalled,
+        merged: installer.results.merged.length - beforeMerged,
+        skipped: installer.results.skipped.length - beforeSkipped,
+        error: null,
+      });
     } catch (err) {
-      s.stop(label);
-      p.log.error(`${label} — ${err.message}`);
+      componentResults.push({
+        label,
+        installed: installer.results.installed.length - beforeInstalled,
+        merged: installer.results.merged.length - beforeMerged,
+        skipped: installer.results.skipped.length - beforeSkipped,
+        error: err.message,
+      });
       installer.results.errors.push({ component: componentName, error: err.message });
     }
   }
 
-  // ─── Summary ────────────────────────────────────────────
+  s.stop('Installed to ~/.claude/');
+
+  // ─── Summary table ─────────────────────────────────
+  p.log.message(formatSummaryTable(componentResults));
+
   const { installed, merged, skipped, errors } = installer.results;
   const parts = [];
   if (installed.length > 0) parts.push(`${installed.length} installed`);
@@ -128,12 +140,12 @@ export async function initCommand(options) {
     p.log.warn(`${parts.join(', ')}, ${errors.length} failed`);
   }
 
-  // ─── Next Steps ─────────────────────────────────────────
+  // ─── Next Steps ────────────────────────────────────
   p.note(
     [
       'Get started',
       '  1. cd <your-project> && ace spec init',
-      '  2. Open Claude Code, type: /opsx:propose 创建需求提案',
+      '  2. Open Claude Code, type: /opsx:propose',
       '',
       'Customize',
       '  Change role      edit ~/.claude/memory/user_profile.md',
@@ -144,10 +156,95 @@ export async function initCommand(options) {
     'Next steps'
   );
 
-  // ─── Outro ──────────────────────────────────────────────
   if (errors.length === 0) {
     p.outro('Done. Go to your project and run ace spec init.');
   } else {
     p.outro('Done with errors. Run ace doctor to diagnose.');
   }
 }
+
+// ─── Helpers ───────────────────────────────────────────
+
+/**
+ * Scan target directory and categorize existing files by handling strategy.
+ */
+async function buildInstallPreview(installer, components) {
+  const preview = { merge: [], skip: [], conflict: [] };
+
+  for (const componentName of components) {
+    const component = COMPONENTS[componentName];
+    if (!component || component.isPlugin) continue;
+
+    if (component.files) {
+      for (const file of component.files) {
+        const destPath = path.join(installer.targetDir, file.dest);
+        if (await fs.pathExists(destPath)) {
+          if (file.merge === 'claude-md' || file.merge === 'settings-json') {
+            preview.merge.push({ src: file.src, dest: file.dest, strategy: file.merge });
+          } else if (file.merge === 'skip-existing') {
+            preview.skip.push(file.dest);
+          } else {
+            preview.conflict.push(file.dest);
+          }
+        }
+      }
+    }
+
+    if (component.rulesDir) {
+      const srcDir = path.join(installer.templatesDir, component.rulesDir);
+      const destDir = path.join(installer.targetDir, component.rulesDir);
+      if (await fs.pathExists(srcDir)) {
+        const files = (await fs.readdir(srcDir)).filter(f => f.endsWith('.md'));
+        for (const f of files) {
+          if (await fs.pathExists(path.join(destDir, f))) {
+            preview.conflict.push(path.join(component.rulesDir, f).replace(/\\/g, '/'));
+          }
+        }
+      }
+    }
+
+    if (component.conditional) {
+      for (const file of component.conditional) {
+        if (file.roles?.includes(installer.role)) {
+          const destPath = path.join(installer.targetDir, file.dest);
+          if (await fs.pathExists(destPath)) {
+            preview.conflict.push(file.dest);
+          }
+        }
+      }
+    }
+  }
+
+  // Enrich merge files with detail
+  for (const item of preview.merge) {
+    if (item.strategy === 'claude-md') {
+      try {
+        const existing = await fs.readFile(path.join(installer.targetDir, item.dest), 'utf-8');
+        const template = await fs.readFile(path.join(installer.templatesDir, item.src), 'utf-8');
+        const { added } = mergeClaudeMd(existing, template);
+        item.detail = added.length > 0 ? `adds ${added.length} new @references` : 'up to date';
+      } catch {
+        item.detail = 'will merge';
+      }
+    } else if (item.strategy === 'settings-json') {
+      item.detail = 'merges permissions & plugins';
+    }
+  }
+
+  return preview;
+}
+
+/**
+ * Format component results into an aligned summary table.
+ */
+function formatSummaryTable(results) {
+  const maxLen = Math.max(...results.map(r => r.label.length));
+  return results.map(r => {
+    const padded = r.label.padEnd(maxLen);
+    if (r.error) return `\u25A0 ${padded}  ${r.error}`;
+    if (r.merged > 0 && r.installed === 0 && r.skipped === 0) return `\u25C6 ${padded}  merged`;
+    if (r.skipped > 0 && r.installed === 0 && r.merged === 0) return `\u2502 ${padded}  unchanged`;
+    const count = r.installed + r.merged;
+    return `\u25C6 ${padded}  ${count} file${count > 1 ? 's' : ''}`;
+  }).join('\n');
+}

package/templates/settings.json

@@ -18,7 +18,14 @@
       "Bash(openspec*)",
       "Bash(opc*)",
       "Bash(gh *)",
+      "Bash(where:*)",
+      "Bash(npx*)",
+      "Bash(python*)",
+      "Bash(pip*)",
       "Read",
+      "Write",
+      "Edit",
+      "NotebookEdit",
       "Glob",
       "Grep",
       "Skill(openspec:*)",