create-claude-cabinet 0.26.0 → 0.27.0

package/lib/cli.js

@@ -4,10 +4,9 @@ const fs = require('fs');
 const os = require('os');
 const crypto = require('crypto');
 const { copyTemplates } = require('./copy');
-const { mergeSettings } = require('./settings-merge');
+const { mergeSettings, healUserSettings } = require('./settings-merge');
 const { create: createMetadata, read: readMetadata } = require('./metadata');
 const { setupDb } = require('./db-setup');
-const { setupOmega } = require('./omega-setup');
 const { setupVerifyRuntime } = require('./verify-setup');
 const { reset } = require('./reset');
 
@@ -443,15 +442,6 @@ const MODULES = {
     lean: false,
     templates: ['skills/validate', 'scripts/skill-validator.sh'],
   },
-  'memory': {
-    name: 'Semantic Memory (omega)',
-    description: 'Rich session memory via omega-memory. Captures decisions, reasoning chains, and lessons between sessions. Requires Python 3.11+.',
-    mandatory: false,
-    default: true,
-    lean: false,
-    needsOmega: true,
-    templates: ['skills/memory', 'scripts/cabinet-memory-adapter.py', 'scripts/migrate-memory-to-omega.py', 'rules/memory-capture.md', 'hooks/omega-memory-guard.sh'],
-  },
   'verify': {
     name: 'Verification Harness (Cucumber + Playwright)',
     description: 'Walkthrough verification with human-in-the-loop verdict pauses. Replaces flat AC lists with re-runnable user-journey scenarios. Includes /verify skeleton skill + cabinet-verify npm runtime + opt-in integration phases for /plan, /execute, /debrief.',
@@ -529,6 +519,8 @@ function parseArgs(argv) {
     else if (arg === '--help' || arg === '-h') flags.help = true;
     else if (arg === '--reset') flags.reset = true;
     else if (arg === '--force') flags.force = true;
+    else if (arg === '--migrate-memory') flags.migrateMemory = true;
+    else if (arg === '--unmigrate-memory') flags.unmigrateMemory = true;
     else if (arg === '--modules' && i + 1 < args.length) {
       flags.modules = args[++i].split(',').map(s => s.trim()).filter(Boolean);
     }
@@ -546,11 +538,17 @@ function printHelp() {
     --yes, -y     Accept all defaults, no prompts
     --lean        Install core modules only (no work-tracking, compliance, validate)
     --no-db       Skip work tracking database setup
-    --modules <keys>  Comma-separated module keys to install (e.g., 'verify,memory').
+    --modules <keys>  Comma-separated module keys to install (e.g., 'verify').
                   Mandatory modules are always included.
     --dry-run     Show what would be copied without writing
     --reset       Remove Claude Cabinet files (uses manifest for safety)
-    --force       With --reset: remove even customized files
+    --force       With --reset: remove even customized files;
+                  with --migrate-memory: override already-migrated guard
+    --migrate-memory     One-time migration off omega-memory (v0.27.0+).
+                  Exports omega memories to built-in memory layout, then
+                  disables omega hooks/MCP. Idempotent — safe to re-run.
+                  Pair with --dry-run to preview.
+    --unmigrate-memory   Roll back --migrate-memory using its backup dir.
     --help, -h    Show this help
 
   Examples:
@@ -579,6 +577,48 @@ async function run() {
     return;
   }
 
+  if (flags.migrateMemory) {
+    const { migrateMemoryCmd } = require('./migrate-memory-cmd');
+    const projectDir = path.resolve(flags.targetDir);
+    console.log('');
+    console.log(`  🔄 Omega → built-in memory migration${flags.dryRun ? ' [dry-run]' : ''}`);
+    console.log('');
+    const result = await migrateMemoryCmd({
+      cwd: projectDir,
+      dryRun: flags.dryRun,
+      force: flags.force,
+    });
+    console.log('');
+    if (result.skipped) {
+      console.log(`  ${result.message || result.reason}`);
+    } else if (flags.dryRun) {
+      console.log(`  Dry run complete. ${result.steps.length} step(s) would execute.`);
+    } else {
+      console.log(`  ✓ Migration complete.`);
+      console.log(`    Backup: ${result.backupDir}`);
+      console.log(`    State:  ${result.state.state} (recorded in .ccrc.json.migrated_from_omega)`);
+      console.log(`    Rollback: npx create-claude-cabinet --unmigrate-memory`);
+    }
+    console.log('');
+    return;
+  }
+
+  if (flags.unmigrateMemory) {
+    const { unmigrateMemoryCmd } = require('./migrate-memory-cmd');
+    const projectDir = path.resolve(flags.targetDir);
+    console.log('');
+    console.log(`  ↩️  Rolling back omega → built-in migration${flags.dryRun ? ' [dry-run]' : ''}`);
+    console.log('');
+    const result = await unmigrateMemoryCmd({ cwd: projectDir, dryRun: flags.dryRun });
+    if (!result.ok) {
+      console.error(`  ✗ ${result.message}`);
+      process.exit(1);
+    }
+    console.log(`  ${result.message}`);
+    console.log('');
+    return;
+  }
+
   console.log('');
   console.log('  🗄️  Claude Cabinet v' + VERSION);
   console.log('  A cabinet of experts for your Claude Code project');
@@ -978,11 +1018,20 @@ async function run() {
 
   // --- Merge hooks into settings.json ---
   if (selectedModules.includes('hooks') && !flags.dryRun) {
-    const includeMemory = selectedModules.includes('memory');
-    const settingsPath = mergeSettings(projectDir, { includeDb, includeMemory });
+    const settingsPath = mergeSettings(projectDir, { includeDb });
     console.log(`  ⚙️  Merged hooks into ${path.relative(projectDir, settingsPath)}`);
   }
 
+  // --- Heal user-level ~/.claude/settings.json ---
+  // Strip CC hook entries with project-relative paths that fire (and fail) in
+  // every project including non-CC ones. Idempotent; no-op for clean configs.
+  if (!flags.dryRun) {
+    const removed = healUserSettings();
+    if (removed > 0) {
+      console.log(`  🧹 Removed ${removed} stale CC hook entr${removed === 1 ? 'y' : 'ies'} from ~/.claude/settings.json`);
+    }
+  }
+
   // --- Merge pib-db MCP server into .mcp.json ---
   if (selectedModules.includes('work-tracking') && !flags.dryRun) {
     try {
@@ -1015,20 +1064,6 @@ async function run() {
     }
   }
 
-  // --- Set up omega memory ---
-  const needsOmega = selectedModules.some(m => MODULES[m].needsOmega);
-  if (needsOmega && !flags.dryRun) {
-    try {
-      console.log('');
-      const omegaResults = setupOmega();
-      for (const r of omegaResults) console.log(`  🧠 ${r}`);
-    } catch (err) {
-      console.log(`  ⚠ Omega memory setup skipped: ${err.message}`);
-      console.log('    Memory module will be inactive until Python 3.11+ is available.');
-      console.log('    Re-run the installer after installing Python to enable it.');
-    }
-  }
-
   // --- Run module postInstall hooks ---
   // Modules with a `postInstall` field dispatch to a matching setup
   // function after templates are copied. Currently only 'verify-setup'

package/lib/metadata.js

@@ -22,8 +22,29 @@ function write(projectDir, data) {
   fs.writeFileSync(file, JSON.stringify(data, null, 2) + '\n');
 }
 
+/**
+ * Shallow-merge `partial` into the existing .ccrc.json and write back.
+ * Preserves any unknown top-level keys (e.g., `migrated_from_omega`)
+ * that this codepath doesn't know about — critical for cross-codepath
+ * fields written by other tools like --migrate-memory.
+ *
+ * Returns the merged result.
+ */
+function merge(projectDir, partial) {
+  const existing = read(projectDir) || {};
+  const data = { ...existing, ...partial };
+  write(projectDir, data);
+  return data;
+}
+
 function create(projectDir, { modules, skipped, version, manifest = {} }) {
+  // Read existing first so unknown top-level keys (e.g.
+  // `migrated_from_omega` set by --migrate-memory) survive the
+  // install/upgrade rewrite. Only the install-specific fields below
+  // are reset on each create() call.
+  const existing = read(projectDir) || {};
   const data = {
+    ...existing,
     version,
     installedAt: new Date().toISOString(),
     upstreamPackage: 'create-claude-cabinet',
@@ -43,4 +64,4 @@ function create(projectDir, { modules, skipped, version, manifest = {} }) {
   return data;
 }
 
-module.exports = { read, write, create, metadataPath, METADATA_FILE };
+module.exports = { read, write, merge, create, metadataPath, METADATA_FILE };