@wipcomputer/wip-release 1.9.65 → 1.9.67

package/cli.js

@@ -5,7 +5,7 @@
  * Release tool CLI. Bumps version, updates docs, publishes.
  */
 
-import { release, detectCurrentVersion } from './core.mjs';
+import { release, detectCurrentVersion, collectMergedPRNotes } from './core.mjs';
 
 const args = process.argv.slice(2);
 const level = args.find(a => ['patch', 'minor', 'major'].includes(a));
@@ -31,6 +31,7 @@ let notesSource = (notes !== null && notes !== undefined && notes !== '') ? 'fla
 // 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)
+//   2.5. Merged PR notes          Auto-combined from git history (#237)
 //   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)
 //
@@ -71,6 +72,31 @@ let notesSource = (notes !== null && notes !== undefined && notes !== '') ? 'fla
     } catch {}
   }
 
+  // 2.5. Auto-combine release notes from merged PRs since last tag (#237)
+  // Only runs when no single RELEASE-NOTES file was found on disk.
+  // Scans git merge history for RELEASE-NOTES files committed on PR branches.
+  if (level && notesSource !== 'file') {
+    try {
+      const { collectMergedPRNotes, detectCurrentVersion: dcv, bumpSemver: bs } = await import('./core.mjs');
+      const cwd = process.cwd();
+      const cv = dcv(cwd);
+      const nv = bs(cv, level);
+      const combined = collectMergedPRNotes(cwd, cv, nv);
+      if (combined) {
+        if (flagNotes && flagNotes !== combined.notes) {
+          console.log(`  ! --notes flag ignored: merged PR notes take priority`);
+        }
+        notes = combined.notes;
+        notesSource = combined.notesSource;
+        if (combined.prCount > 1) {
+          console.log(`  \u2713 Combined release notes from ${combined.prCount} merged PRs`);
+        } else {
+          console.log(`  \u2713 Found release notes from merged PR`);
+        }
+      }
+    } catch {}
+  }
+
   // 3. Auto-detect dev update from ai/dev-updates/ (wins over --notes flag if longer)
   if (level && (!notes || (notesSource === 'flag' && notes.length < 200))) {
     try {
@@ -134,9 +160,11 @@ Flags:
 Release notes (REQUIRED, must be a file on disk):
   1. --notes-file=path          Explicit file path
   2. RELEASE-NOTES-v{ver}.md    In repo root (auto-detected)
-  3. ai/dev-updates/YYYY-MM-DD* Today's dev update (auto-detected)
+  3. Merged PR notes             Auto-combined from git history (#237)
+  4. ai/dev-updates/YYYY-MM-DD* Today's dev update (auto-detected)
   The --notes flag is NOT accepted. Write a file. Commit it on your branch.
   The file shows up in the PR diff so it can be reviewed before merge.
+  When batching multiple PRs, each PR's RELEASE-NOTES are auto-combined.
 
 Skill publish to website:
   Add .publish-skill.json to repo root: { "name": "my-tool" }

package/core.mjs

@@ -368,6 +368,161 @@ ${issueRefs || '- #XX (replace with actual issue numbers)'}
   return notesPath;
 }
 
+/**
+ * Collect release notes from merged PRs since the last tag.
+ *
+ * When multiple PRs are batched into a single release, each PR may have
+ * committed its own RELEASE-NOTES-v*.md file. This function finds those
+ * notes in git history and combines them into one document.
+ *
+ * Steps:
+ *   1. git log v{prev}..HEAD --merges --oneline to find merge commits
+ *   2. Extract PR number from "Merge pull request #XX from ..."
+ *   3. Check each merge commit's diff for RELEASE-NOTES*.md files
+ *   4. Read content via git show {sha}:{path}
+ *   5. Combine into a single document (newest first)
+ *
+ * Returns { notes, notesSource, prCount } or null if nothing found.
+ */
+export function collectMergedPRNotes(repoPath, currentVersion, newVersion) {
+  let lastTag;
+  try {
+    lastTag = execFileSync('git', ['describe', '--tags', '--abbrev=0'],
+      { cwd: repoPath, encoding: 'utf8' }).trim();
+  } catch {
+    return null; // No tags yet
+  }
+
+  // Find merge commits since last tag
+  let mergeLog;
+  try {
+    mergeLog = execFileSync('git', [
+      'log', `${lastTag}..HEAD`, '--merges', '--oneline'
+    ], { cwd: repoPath, encoding: 'utf8' }).trim();
+  } catch {
+    return null;
+  }
+
+  if (!mergeLog) return null;
+
+  const mergeLines = mergeLog.split('\n').filter(Boolean);
+  const prNotes = [];
+
+  for (const line of mergeLines) {
+    // Format: "abc1234 Merge pull request #XX from org/branch"
+    const prMatch = line.match(/^([a-f0-9]+)\s+Merge pull request #(\d+)\s+from\s+(.+)$/);
+    if (!prMatch) continue;
+
+    const [, shortHash, prNum, branchRef] = prMatch;
+
+    // Get the full hash for this merge commit
+    let fullHash;
+    try {
+      fullHash = execFileSync('git', ['rev-parse', shortHash],
+        { cwd: repoPath, encoding: 'utf8' }).trim();
+    } catch {
+      continue;
+    }
+
+    // List files changed in this merge commit.
+    // For merge commits, diff against first parent to see what the PR brought in.
+    // Plain diff-tree on a merge commit shows nothing without -m or -c.
+    let changedFiles;
+    try {
+      changedFiles = execFileSync('git', [
+        'diff', '--name-only', `${fullHash}^1`, fullHash
+      ], { cwd: repoPath, encoding: 'utf8' }).trim();
+    } catch {
+      continue;
+    }
+
+    // Look for RELEASE-NOTES*.md files
+    const noteFiles = changedFiles.split('\n')
+      .filter(f => /^RELEASE-NOTES.*\.md$/i.test(f.trim()));
+
+    if (noteFiles.length === 0) continue;
+
+    // Read the content of each release notes file from that commit
+    for (const noteFile of noteFiles) {
+      try {
+        const content = execFileSync('git', [
+          'show', `${fullHash}:${noteFile.trim()}`
+        ], { cwd: repoPath, encoding: 'utf8' }).trim();
+
+        if (content) {
+          prNotes.push({
+            prNum,
+            branch: branchRef,
+            content,
+            hash: shortHash,
+          });
+        }
+      } catch {
+        // File might have been deleted in the merge. Skip.
+      }
+    }
+  }
+
+  if (prNotes.length === 0) return null;
+
+  // If only one PR had notes, return it directly (no wrapping)
+  if (prNotes.length === 1) {
+    return {
+      notes: prNotes[0].content,
+      notesSource: 'file',
+      prCount: 1,
+    };
+  }
+
+  // Multiple PRs: combine into one document (newest first, already in log order)
+  const pkg = JSON.parse(readFileSync(join(repoPath, 'package.json'), 'utf8'));
+  const name = pkg.name?.replace(/^@[^/]+\//, '') || basename(repoPath);
+
+  const sections = [];
+  sections.push(`# Release Notes: ${name} v${newVersion}`);
+  sections.push('');
+  sections.push(`This release combines ${prNotes.length} merged pull requests.`);
+  sections.push('');
+
+  // Collect all issue refs for a combined summary
+  const allIssueRefs = new Set();
+
+  for (const pr of prNotes) {
+    sections.push(`---`);
+    sections.push('');
+    sections.push(`### PR #${pr.prNum}`);
+    sections.push('');
+
+    // Strip the top-level heading from individual notes to avoid duplicate titles
+    let body = pr.content;
+    body = body.replace(/^#\s+.*\n+/, '');
+    sections.push(body);
+    sections.push('');
+
+    // Collect issue references
+    const refs = body.match(/#\d+/g) || [];
+    for (const ref of refs) allIssueRefs.add(ref);
+  }
+
+  // Add combined issue references at the end
+  if (allIssueRefs.size > 0) {
+    sections.push('---');
+    sections.push('');
+    sections.push('## All issues referenced');
+    sections.push('');
+    for (const ref of allIssueRefs) {
+      sections.push(`- ${ref}`);
+    }
+    sections.push('');
+  }
+
+  return {
+    notes: sections.join('\n'),
+    notesSource: 'file',
+    prCount: prNotes.length,
+  };
+}
+
 /**
  * Check if a file was modified in commits since the last git tag.
  */

package/package.json

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