create-claude-cabinet 0.27.2 → 0.27.4

package/lib/cli.js

@@ -697,8 +697,13 @@ async function run() {
   if (dirState === 'existing-install') {
     const existing = readMetadata(projectDir);
     existingManifest = existing.manifest || {};
-    console.log(`  Found existing installation (v${existing.version}, installed ${existing.installedAt.split('T')[0]})`);
-    console.log('  Updating upstream-managed files and adding new files.');
+    if (existing.version) {
+      const installedDate = existing.installedAt ? existing.installedAt.split('T')[0] : 'unknown';
+      console.log(`  Found existing installation (v${existing.version}, installed ${installedDate})`);
+      console.log('  Updating upstream-managed files and adding new files.');
+    } else {
+      console.log('  Found .ccrc.json (migration-only, no prior install). Installing fresh.');
+    }
     if (!flags.yes && !flags.lean) {
       const { proceed } = await prompts({
         type: 'confirm',
@@ -948,12 +953,23 @@ async function run() {
           'skills/verify',
         ];
         const isSkill = tmpl.startsWith('skills/') && !alwaysCopyPhases.some(p => tmpl.startsWith(p));
+        // Instruction phases listed in MODULES as explicit file paths
+        // under this skill dir must bypass the phase-file guard in copy.js.
+        const instrPhases = new Set();
+        for (const mod of Object.values(MODULES)) {
+          for (const t of (mod.templates || [])) {
+            if (t.startsWith(tmpl + '/') && t.includes('/phases/')) {
+              instrPhases.add(t.slice(tmpl.length + 1));
+            }
+          }
+        }
         const results = await copyTemplates(srcPath, destPath, {
           dryRun: flags.dryRun,
           skipConflicts: flags.yes || dirState === 'existing-install',
           skipPhases: isSkill,
           projectRoot: projectDir,
           existingManifest,
+          instructionPhases: instrPhases,
         });
         totalCopied += results.copied.length;
         totalSkipped += results.skipped.length;
@@ -986,8 +1002,11 @@ async function run() {
           // file and the on-disk content differs from upstream (operator
           // edited it), preserve it. This keeps the documented "customize
           // by editing the phase file" affordance intact across upgrades.
+          // Exception: instruction phases explicitly listed in MODULES are
+          // CC-owned and must always overwrite (they're not customizable).
           const isPhaseFile = tmpl.includes('/phases/') || tmpl.includes('\\phases\\');
-          if (isPhaseFile && existingContent.trim() !== '' && existingContent.trim() !== incoming.trim()) {
+          const isInstructionPhase = isPhaseFile && mod.templates.includes(tmpl);
+          if (isPhaseFile && !isInstructionPhase && existingContent.trim() !== '' && existingContent.trim() !== incoming.trim()) {
             console.log(`  Preserved customized phase: ${tmpl}`);
             totalSkipped++;
             allManifest[mPath] = hashContent(existingContent);

package/lib/copy.js

@@ -11,13 +11,13 @@ function hashContent(content) {
  * Recursively copy files from src to dest, surfacing conflicts.
  * Returns { copied: string[], skipped: string[], overwritten: string[] }
  */
-async function copyTemplates(src, dest, { dryRun = false, skipConflicts = false, skipPhases = false, projectRoot = null, existingManifest = {} } = {}) {
+async function copyTemplates(src, dest, { dryRun = false, skipConflicts = false, skipPhases = false, projectRoot = null, existingManifest = {}, instructionPhases = new Set() } = {}) {
   const results = { copied: [], skipped: [], overwritten: [], manifest: {} };
-  await walkAndCopy(src, dest, src, results, dryRun, skipConflicts, skipPhases, projectRoot, existingManifest);
+  await walkAndCopy(src, dest, src, results, dryRun, skipConflicts, skipPhases, projectRoot, existingManifest, instructionPhases);
   return results;
 }
 
-async function walkAndCopy(srcRoot, destRoot, currentSrc, results, dryRun, skipConflicts, skipPhases, projectRoot, existingManifest) {
+async function walkAndCopy(srcRoot, destRoot, currentSrc, results, dryRun, skipConflicts, skipPhases, projectRoot, existingManifest, instructionPhases) {
   const entries = fs.readdirSync(currentSrc, { withFileTypes: true });
 
   for (const entry of entries) {
@@ -37,7 +37,7 @@ async function walkAndCopy(srcRoot, destRoot, currentSrc, results, dryRun, skipC
       if (!dryRun && !fs.existsSync(destPath)) {
         fs.mkdirSync(destPath, { recursive: true });
       }
-      await walkAndCopy(srcRoot, destRoot, srcPath, results, dryRun, skipConflicts, skipPhases, projectRoot, existingManifest);
+      await walkAndCopy(srcRoot, destRoot, srcPath, results, dryRun, skipConflicts, skipPhases, projectRoot, existingManifest, instructionPhases);
     } else {
       const incoming = fs.readFileSync(srcPath, 'utf8');
       const incomingHash = hashContent(incoming);
@@ -48,13 +48,17 @@ async function walkAndCopy(srcRoot, destRoot, currentSrc, results, dryRun, skipC
         // Phase file guard (act:98d74381) — independent of skipPhases flag.
         // If a phase file on disk has been customized (differs from template
         // and isn't empty), never overwrite it regardless of other flags.
+        // Exception: instruction phases (CC-owned, always overwrite) are
+        // exempt — they ship updated content that consumers must receive.
         if (relPath.includes('phases' + path.sep) || relPath.includes('phases/')) {
-          const trimmedExisting = existing.trim();
-          if (trimmedExisting !== '' && trimmedExisting !== incoming.trim()) {
-            results.skipped.push(relPath);
-            results.manifest[relPath] = hashContent(existing);
-            console.log(`  Preserved customized phase: ${displayPath}`);
-            continue;
+          if (!instructionPhases.has(relPath)) {
+            const trimmedExisting = existing.trim();
+            if (trimmedExisting !== '' && trimmedExisting !== incoming.trim()) {
+              results.skipped.push(relPath);
+              results.manifest[relPath] = hashContent(existing);
+              console.log(`  Preserved customized phase: ${displayPath}`);
+              continue;
+            }
           }
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-claude-cabinet",
-  "version": "0.27.2",
+  "version": "0.27.4",
   "description": "Claude Cabinet — opinionated process scaffolding for Claude Code projects",
   "bin": {
     "create-claude-cabinet": "bin/create-claude-cabinet.js"

package/templates/skills/cc-upgrade/phases/omega-migration-detect.md

@@ -71,6 +71,34 @@ anything else. If omega is still ACTIVE (conditions 1–4 above), run the
 full migration flow below FIRST; the sweep cleans up what teardown
 leaves behind, it does not replace migration.
 
+Also strip stale omega permission entries from `.claude/settings.local.json`
+if present. The migration cleans `~/.claude/settings.json` (global hooks/MCP)
+but misses per-project permission allowlists:
+
+```bash
+if [ -f .claude/settings.local.json ]; then
+  node -e "
+    const fs = require('fs');
+    const p = '.claude/settings.local.json';
+    const d = JSON.parse(fs.readFileSync(p, 'utf8'));
+    const perms = d.permissions || {};
+    let removed = 0;
+    for (const key of Object.keys(perms)) {
+      if (key.startsWith('mcp__omega-memory__') || key.startsWith('mcp__omega__')) {
+        delete perms[key];
+        removed++;
+      }
+    }
+    if (removed > 0) {
+      fs.writeFileSync(p, JSON.stringify(d, null, 2) + '\n');
+      console.log('Removed ' + removed + ' stale omega permission entries from settings.local.json');
+    }
+  "
+fi
+```
+
+Idempotent — no-ops when no omega entries exist.
+
 ## User-friendly prompt
 
 Default to **dry-run** — a non-Oren user just upgrading CC shouldn't