@wipcomputer/wip-release 1.9.8 → 1.9.10

package/cli.js

@@ -20,18 +20,26 @@ const dryRun = args.includes('--dry-run');
 const noPublish = args.includes('--no-publish');
 const skipProductCheck = args.includes('--skip-product-check');
 const skipStaleCheck = args.includes('--skip-stale-check');
+const skipWorktreeCheck = args.includes('--skip-worktree-check');
 const notesFilePath = flag('notes-file');
 let notes = flag('notes');
 let notesSource = notes ? 'flag' : 'none'; // track where notes came from
 
-// Auto-detect RELEASE-NOTES-v{version}.md if no --notes or --notes-file provided.
-// Also supports explicit --notes-file for custom paths.
+// Release notes priority (highest wins):
+//   1. --notes-file=path          Explicit file path (always wins)
+//   2. RELEASE-NOTES-v{ver}.md    In repo root (always wins over --notes flag)
+//   3. ai/dev-updates/YYYY-MM-DD* Today's dev update (wins over --notes flag if longer)
+//   4. --notes="text"             Flag fallback (only if nothing better exists)
+//
+// Rule: written release notes on disk ALWAYS beat a CLI one-liner.
+// The --notes flag is a fallback, not an override.
 {
   const { readFileSync, existsSync } = await import('node:fs');
   const { resolve, join } = await import('node:path');
+  const flagNotes = notes; // save original flag value for fallback
 
   if (notesFilePath) {
-    // Explicit --notes-file
+    // 1. Explicit --notes-file (highest priority)
     const resolved = resolve(notesFilePath);
     if (!existsSync(resolved)) {
       console.error(`  ✗ Notes file not found: ${resolved}`);
@@ -39,8 +47,8 @@ let notesSource = notes ? 'flag' : 'none'; // track where notes came from
     }
     notes = readFileSync(resolved, 'utf8').trim();
     notesSource = 'file';
-  } else if (!notes && level) {
-    // Auto-detect: compute the next version and look for RELEASE-NOTES-v{version}.md
+  } else if (level) {
+    // 2. Auto-detect RELEASE-NOTES-v{version}.md (ALWAYS checks, even if --notes provided)
     try {
       const { detectCurrentVersion, bumpSemver } = await import('./core.mjs');
       const cwd = process.cwd();
@@ -49,15 +57,19 @@ let notesSource = notes ? 'flag' : 'none'; // track where notes came from
       const dashed = newVersion.replace(/\./g, '-');
       const autoFile = join(cwd, `RELEASE-NOTES-v${dashed}.md`);
       if (existsSync(autoFile)) {
-        notes = readFileSync(autoFile, 'utf8').trim();
+        const fileContent = readFileSync(autoFile, 'utf8').trim();
+        if (flagNotes && flagNotes !== fileContent) {
+          console.log(`  ! --notes flag ignored: RELEASE-NOTES-v${dashed}.md takes priority`);
+        }
+        notes = fileContent;
         notesSource = 'file';
         console.log(`  ✓ Found RELEASE-NOTES-v${dashed}.md`);
       }
     } catch {}
   }
 
-  // Auto-detect dev update from ai/dev-updates/ if notes are missing or thin
-  if (level && (!notes || notes.length < 100)) {
+  // 3. Auto-detect dev update from ai/dev-updates/ (wins over --notes flag if longer)
+  if (level && (!notes || (notesSource === 'flag' && notes.length < 200))) {
     try {
       const { readdirSync } = await import('node:fs');
       const devUpdatesDir = join(process.cwd(), 'ai', 'dev-updates');
@@ -72,6 +84,9 @@ let notesSource = notes ? 'flag' : 'none'; // track where notes came from
           const devUpdatePath = join(devUpdatesDir, todayFiles[0]);
           const devUpdateContent = readFileSync(devUpdatePath, 'utf8').trim();
           if (devUpdateContent.length > (notes || '').length) {
+            if (flagNotes) {
+              console.log(`  ! --notes flag ignored: dev update takes priority`);
+            }
             notes = devUpdateContent;
             notesSource = 'dev-update';
             console.log(`  ✓ Found dev update: ai/dev-updates/${todayFiles[0]}`);
@@ -101,13 +116,14 @@ Flags:
   --no-publish             Bump + tag only, skip npm/GitHub
   --skip-product-check     Skip product docs check (dev update, roadmap, readme-first)
   --skip-stale-check       Skip stale remote branch check
+  --skip-worktree-check    Skip worktree guard (allow release from worktree)
 
-Release notes:
-  Auto-detects notes from three sources (first match wins):
-  1. --notes-file=path          Explicit file path
-  2. RELEASE-NOTES-v{ver}.md    In repo root (e.g. RELEASE-NOTES-v1-7-4.md)
-  3. ai/dev-updates/YYYY-MM-DD* Today's dev update files (most recent first)
-  Write dev updates as you work. wip-release picks them up automatically.
+Release notes (highest priority wins, files ALWAYS beat --notes flag):
+  1. --notes-file=path          Explicit file path (always wins)
+  2. RELEASE-NOTES-v{ver}.md    In repo root (wins over --notes)
+  3. ai/dev-updates/YYYY-MM-DD* Today's dev update (wins over --notes if longer)
+  4. --notes="text"             Fallback only (use for repos without release notes files)
+  Written notes on disk always take priority over a CLI one-liner.
 
 Pipeline:
   1. Bump package.json version
@@ -130,6 +146,7 @@ release({
   noPublish,
   skipProductCheck,
   skipStaleCheck,
+  skipWorktreeCheck,
 }).catch(err => {
   console.error(`  ✗ ${err.message}`);
   process.exit(1);

package/core.mjs

@@ -552,7 +552,7 @@ export function checkStaleBranches(repoPath, level) {
 /**
  * Run the full release pipeline.
  */
-export async function release({ repoPath, level, notes, notesSource, dryRun, noPublish, skipProductCheck, skipStaleCheck }) {
+export async function release({ repoPath, level, notes, notesSource, dryRun, noPublish, skipProductCheck, skipStaleCheck, skipWorktreeCheck }) {
   repoPath = repoPath || process.cwd();
   const currentVersion = detectCurrentVersion(repoPath);
   const newVersion = bumpSemver(currentVersion, level);
@@ -562,6 +562,36 @@ export async function release({ repoPath, level, notes, notesSource, dryRun, noP
   console.log(`  ${repoName}: ${currentVersion} -> ${newVersion} (${level})`);
   console.log(`  ${'─'.repeat(40)}`);
 
+  // -1. Worktree guard: block releases from linked worktrees
+  if (!skipWorktreeCheck) {
+    try {
+      const gitDir = execFileSync('git', ['rev-parse', '--git-dir'], {
+        cwd: repoPath, encoding: 'utf8'
+      }).trim();
+
+      // Linked worktrees have "/worktrees/" in their git-dir path
+      if (gitDir.includes('/worktrees/')) {
+        // Get the main working tree path from `git worktree list`
+        const worktreeList = execFileSync('git', ['worktree', 'list', '--porcelain'], {
+          cwd: repoPath, encoding: 'utf8'
+        });
+        const mainWorktree = worktreeList.split('\n')
+          .find(line => line.startsWith('worktree '));
+        const mainPath = mainWorktree ? mainWorktree.replace('worktree ', '') : '(unknown)';
+
+        console.log(`  \u2717 wip-release must run from the main working tree, not a worktree.`);
+        console.log(`    Current: ${repoPath}`);
+        console.log(`    Main working tree: ${mainPath}`);
+        console.log(`    Switch to the main working tree and run again.`);
+        console.log('');
+        return { currentVersion, newVersion, dryRun: false, failed: true };
+      }
+      console.log('  \u2713 Running from main working tree');
+    } catch {
+      // Git command failed... skip check gracefully
+    }
+  }
+
   // 0. License compliance gate
   const configPath = join(repoPath, '.license-guard.json');
   if (existsSync(configPath)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wipcomputer/wip-release",
-  "version": "1.9.8",
+  "version": "1.9.10",
   "type": "module",
   "description": "One-command release pipeline. Bumps version, updates changelog + SKILL.md, publishes to npm + GitHub.",
   "main": "core.mjs",