@webpieces/pr-gate 0.3.291 → 0.3.293

package/src/scripts/workflow/merge-start.js

@@ -39,31 +39,48 @@ exports.MergeContext = MergeContext;
 class MergeStartResult {
     status;
     context;
-    constructor(status, context) {
+    runDir; // this sync's numbered `merge-<n>/` dir — passed to merge-END so it reads THIS marker
+    constructor(status, context, runDir) {
         this.status = status;
         this.context = context;
+        this.runDir = runDir;
     }
 }
 exports.MergeStartResult = MergeStartResult;
-// Detect the PR by its STABLE base branch — the PR always lives on `base`, never on the numbered
-// generation (base2/base3/…) you may currently be on, so pass baseBranchName(currentBranch).
+// Detect the PR by its STABLE feature branch — pass baseBranchName(currentBranch) so a leftover
+// `…wpN` from the old scheme still resolves to the one name the PR lives on.
 function detectPr(baseBranch) {
     const result = (0, child_process_1.spawnSync)('gh', ['pr', 'list', '--head', baseBranch, '--json', 'number', '--jq', '.[0].number'], { encoding: 'utf8' });
     return result.status === 0 ? (result.stdout ?? '').trim() : '';
 }
-// Snapshot the pre-merge state as `<currentBranch>PreMerge`. One overwritable slot per generation:
-// if a stale PreMerge from a crashed rerun of THIS branch exists, delete it first so we never
-// accumulate backups (the old scheme minted a fresh Backup1/Backup2/… on every run).
-function createBackup(currentBranch) {
-    process.stdout.write('\n' + SEP + '💾 Creating Pre-Merge Backup\n' + SEP + '\n');
-    const backupBranch = (0, branch_naming_1.preMergeBackupName)(currentBranch);
-    if ((0, child_process_1.spawnSync)('git', ['show-ref', '--verify', '--quiet', `refs/heads/${backupBranch}`]).status === 0) {
-        (0, git_exec_1.runGitChecked)(['branch', '-D', backupBranch], 'Failed to delete stale pre-merge backup');
+// The one number `n` for a sync and the two things it names: the pre-merge backup branch and its
+// paired conflict-context run dir.
+class SyncSlot {
+    backupBranch;
+    runDir;
+    constructor(backupBranch, runDir) {
+        this.backupBranch = backupBranch;
+        this.runDir = runDir;
     }
+}
+// Pick the first free `<branch>PreMerge<n>` slot number, then WIPE the paired `<home>/merge-<n>/` run
+// dir — a fresh sync means no merge is in progress, so any leftover `merge-<n>` is stale (its own sync
+// ended, or its branch was deleted) and MUST NOT leak its old per-file merge-explanation.md into this
+// merge's validation. Returns the backup branch name + the (now-empty) run dir path, both keyed on `n`.
+function chooseSyncSlot(home, currentBranch) {
+    const n = (0, branch_naming_1.nextFreePreMergeNumber)(currentBranch, (name) => (0, child_process_1.spawnSync)('git', ['show-ref', '--verify', '--quiet', `refs/heads/${name}`]).status === 0);
+    const runDir = (0, merge_state_1.mergeRunDirFor)(home, n);
+    fs.rmSync(runDir, { recursive: true, force: true });
+    return new SyncSlot((0, branch_naming_1.preMergeBackupName)(currentBranch, n), runDir);
+}
+// Snapshot the pre-merge state onto the caller-chosen `backupBranch` (`<currentBranch>PreMerge<n>`),
+// never overwriting. The slot number `n` is picked once in mergeStart and shared with the paired
+// `merge-<n>/` context dir. A clean sync deletes this snapshot at finalize; only conflict syncs keep it.
+function createBackup(currentBranch, backupBranch) {
+    process.stdout.write('\n' + SEP + '💾 Creating Pre-Merge Backup\n' + SEP + '\n');
     (0, git_exec_1.runGitChecked)(['checkout', '-b', backupBranch], 'Failed to create backup branch');
     (0, git_exec_1.runGitChecked)(['checkout', currentBranch], 'Failed to return to feature branch');
     process.stdout.write(`✅ Backup created: ${backupBranch}\n\n`);
-    return backupBranch;
 }
 function saveConflictContext(conflictedFiles, mergeDir, forkPoint, featureHead, mainHead) {
     for (const file of conflictedFiles) {
@@ -160,7 +177,7 @@ pnpm {{FINISH_COMMAND}}
 
 ## If you need to bail out
 
-A backup branch was created (e.g. \`<feature>PreMerge\`). To abandon:
+A numbered backup branch was created (e.g. \`<feature>PreMerge1\`). To abandon:
 
 \`\`\`
 git merge --abort 2>/dev/null; git checkout <feature> ; git branch -D {{SQUASH_BRANCH}}
@@ -185,11 +202,20 @@ function writeMergeProcessDoc(repoRoot, mergeDir, squashBranch, conflictedFiles,
     fs.writeFileSync(docPath, mergeProcessDoc(mergeDir, squashBranch, conflictedFiles, finishCommand));
     return docPath;
 }
-function printConflictHandback(docPath, mergeDir, squashBranch, conflictedFiles) {
+// The AI-facing "what just happened / what to do next" recap on the conflict path. Explicit and
+// numbered so an agent (or human) can't miss where the context lives or which command finishes.
+function printConflictHandback(docPath, mergeDir, squashBranch, conflictedFiles, finishCommand) {
     process.stdout.write('\n' + SEP + `⚠️  Conflicts in ${conflictedFiles.length} file(s) — handing control back to you\n` + SEP + '\n');
-    process.stdout.write(`You are on branch ${squashBranch} with conflicts in the working tree.\n\n`);
-    process.stdout.write(`FOLLOW THE MERGE PROCESS:  ${docPath}\n`);
-    process.stdout.write(`3-point context per file in: ${mergeDir}/updatemain-<file>/\n\n`);
+    process.stdout.write('Here is exactly what I did and what you need to do:\n\n');
+    process.stdout.write('What I did:\n');
+    process.stdout.write('   1. snapshotted your pre-merge state to a PreMerge branch\n');
+    process.stdout.write('   2. pulled origin/main and squash-merged your work onto it\n');
+    process.stdout.write(`   3. hit conflicts — you are now on the transient branch  ${squashBranch}\n\n`);
+    process.stdout.write('What you need to do:\n');
+    process.stdout.write(`   1. read the merge process doc:  ${docPath}\n`);
+    process.stdout.write(`   2. resolve each conflicted file below (its 3-point A/B/C context + diffs are in\n`);
+    process.stdout.write(`      ${mergeDir}/updatemain-<file>/), and write that file's merge-explanation.md\n`);
+    process.stdout.write(`   3. run  pnpm ${finishCommand}  — it validates, commits, and finalizes (do NOT git add/commit/push yourself)\n\n`);
     process.stdout.write('Conflicted files:\n');
     for (const file of conflictedFiles)
         process.stdout.write(`  - ${file}\n`);
@@ -200,12 +226,16 @@ function printConflictHandback(docPath, mergeDir, squashBranch, conflictedFiles)
 function handleConflictsHandback(repoRoot, mergeDir, currentBranch, squashBranch, backupBranch, prNumber, hashes, finishCommand) {
     const raw = (0, child_process_1.execSync)('git diff --name-only --diff-filter=U', { encoding: 'utf8' }).trim();
     const conflictedFiles = raw.split('\n').filter((f) => f.trim() !== '');
+    fs.mkdirSync(mergeDir, { recursive: true }); // run dir was wiped at sync start — create it fresh
     fs.writeFileSync(path.join(mergeDir, 'updatemain-conflicted-files.txt'), raw + '\n');
+    // Copy the A/B/C hashes into THIS run dir so the merge-process doc's `MERGE_DIR/updatemain-hashes.json`
+    // pointer is accurate (gatherInfo writes the source copy into the feature home before the slot is known).
+    fs.writeFileSync(path.join(mergeDir, 'updatemain-hashes.json'), JSON.stringify(hashes, null, 2) + '\n');
     saveConflictContext(conflictedFiles, mergeDir, hashes.hashForkPoint, hashes.hashFeatureHead, hashes.hashMainHead);
     const marker = new merge_state_1.MergeMarker(currentBranch, squashBranch, backupBranch, prNumber, conflictedFiles, hashes.hashForkPoint, hashes.hashFeatureHead, hashes.hashMainHead, false);
     (0, merge_state_1.writeMergeMarker)(mergeDir, marker);
     const docPath = writeMergeProcessDoc(repoRoot, mergeDir, squashBranch, conflictedFiles, finishCommand);
-    printConflictHandback(docPath, mergeDir, squashBranch, conflictedFiles);
+    printConflictHandback(docPath, mergeDir, squashBranch, conflictedFiles, finishCommand);
 }
 // Short sha of a ref (best-effort — '' if it can't resolve), for the branch-mutation log's
 // oldMain→newMain annotation.
@@ -228,11 +258,15 @@ function logConflict(repoRoot, verb, mergeDir) {
     ];
     (0, rules_config_1.logBranchMutation)(repoRoot, event);
 }
-async function mergeStart(repoRoot, verb, mergeDir, finishCommand) {
+async function mergeStart(repoRoot, verb, home, finishCommand) {
     const currentBranch = (0, child_process_1.execSync)('git branch --show-current', { encoding: 'utf8' }).trim();
     if (currentBranch.endsWith('Squash')) {
         throw new rules_config_1.CliExitError(1, `❌ On a leftover ${currentBranch} branch with no merge marker. Clean up: git branch -D ${currentBranch}`);
     }
+    // One number `n` for this sync drives BOTH the backup branch and its `merge-<n>/` context dir.
+    const slot = chooseSyncSlot(home, currentBranch);
+    const backupBranch = slot.backupBranch;
+    const mergeDir = slot.runDir;
     process.stdout.write('\n' + SEP + '🔄 Squash-Merge Update from Main\n' + SEP + '\n');
     // gatherInfo RETURNS (never exits): an already-even-with-main branch is NOT special-cased here —
     // we flow straight on. The squash merge below becomes a no-op that the `nothingStaged` path
@@ -245,7 +279,7 @@ async function mergeStart(repoRoot, verb, mergeDir, finishCommand) {
     }
     const prNumber = detectPr((0, branch_naming_1.baseBranchName)(currentBranch));
     process.stdout.write(prNumber ? `Existing PR #${prNumber} will be updated.\n` : 'No existing PR (one can be created later).\n');
-    const backupBranch = createBackup(currentBranch);
+    createBackup(currentBranch, backupBranch);
     const backupEvent = new rules_config_1.BranchMutationEvent(verb, 'BACKUP');
     backupEvent.fromBranch = currentBranch;
     backupEvent.toBranch = backupBranch;
@@ -268,7 +302,7 @@ async function mergeStart(repoRoot, verb, mergeDir, finishCommand) {
     if (merge.status !== 0) {
         handleConflictsHandback(repoRoot, mergeDir, currentBranch, squashBranch, backupBranch, prNumber, hashes, finishCommand);
         logConflict(repoRoot, verb, mergeDir);
-        return new MergeStartResult('conflict', null);
+        return new MergeStartResult('conflict', null, mergeDir);
     }
     (0, rules_config_1.logBranchMutation)(repoRoot, new rules_config_1.BranchMutationEvent(verb, 'SQUASH'));
     const nothingStaged = (0, child_process_1.spawnSync)('git', ['diff-index', '--quiet', '--cached', 'HEAD', '--']).status === 0;
@@ -278,6 +312,6 @@ async function mergeStart(repoRoot, verb, mergeDir, finishCommand) {
     else {
         (0, git_exec_1.runGitChecked)(['commit', '-m', `Squash merge of ${currentBranch}`], 'Failed to commit squash merge');
     }
-    return new MergeStartResult('clean', new MergeContext(currentBranch, squashBranch, backupBranch, prNumber));
+    return new MergeStartResult('clean', new MergeContext(currentBranch, squashBranch, backupBranch, prNumber), mergeDir);
 }
 //# sourceMappingURL=merge-start.js.map

package/src/scripts/workflow/merge-start.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge-start.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/merge-start.ts"],"names":[],"mappings":"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","sourcesContent":["import { execSync, spawnSync } from 'child_process';\nimport * as fs from 'fs';\nimport * as path from 'path';\nimport {\n    WEBPIECES_TMP_DIR, MERGE_EXPLANATION_FILE, CliExitError,\n    MutationVerb, BranchMutationEvent, logBranchMutation,\n} from '@webpieces/rules-config';\nimport { gatherInfo } from '../git-gatherInfo';\nimport { baseBranchName, preMergeBackupName } from './branch-naming';\nimport { runGitChecked } from './git-exec';\nimport { MergeMarker, perFileContextDir, writeMergeMarker } from './merge-state';\n\n// merge-START: the first half of the 3-point squash-merge lifecycle. Brings origin/main into a fresh\n// `<branch>Squash`, and on conflict writes the 3-point context files + the unvalidated marker + the\n// process doc, then hands control back to the AI. On a clean merge it commits the squash and returns\n// the branch context so the caller (runUpdateFromMain) can run merge-END to finalize. It NEVER\n// finalizes or posts a PR — that is merge-END's / wp-finish-upsert-pr's job. Shared so\n// runUpdateFromMain (and, via it, wp-update-start + wp-start-upsert-pr) all set up a merge through\n// one code path. `finishCommand` names the command the AI runs to finish after resolving conflicts\n// (standalone update → `wp-update-end`; PR flow → `wp-finish-upsert-pr`).\n\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\n';\n\ninterface HashPoints {\n    hashForkPoint: string;\n    hashFeatureHead: string;\n    hashMainHead: string;\n}\n\n// The four branch names merge-END needs to finalize a merge (swap squash→feature, push, clean up).\nexport class MergeContext {\n    currentBranch: string;\n    squashBranch: string;\n    backupBranch: string;\n    prNumber: string;\n\n    constructor(currentBranch: string, squashBranch: string, backupBranch: string, prNumber: string) {\n        this.currentBranch = currentBranch;\n        this.squashBranch = squashBranch;\n        this.backupBranch = backupBranch;\n        this.prNumber = prNumber;\n    }\n}\n\n// Outcome of merge-start: 'clean' carries the context for merge-END to finalize; 'conflict' means the\n// marker + context files were written and the caller should hand back to the AI (exit 2).\nexport class MergeStartResult {\n    status: 'clean' | 'conflict';\n    context: MergeContext | null;\n\n    constructor(status: 'clean' | 'conflict', context: MergeContext | null) {\n        this.status = status;\n        this.context = context;\n    }\n}\n\n// Detect the PR by its STABLE base branch — the PR always lives on `base`, never on the numbered\n// generation (base2/base3/…) you may currently be on, so pass baseBranchName(currentBranch).\nfunction detectPr(baseBranch: string): string {\n    const result = spawnSync(\n        'gh', ['pr', 'list', '--head', baseBranch, '--json', 'number', '--jq', '.[0].number'],\n        { encoding: 'utf8' },\n    );\n    return result.status === 0 ? (result.stdout ?? '').trim() : '';\n}\n\n// Snapshot the pre-merge state as `<currentBranch>PreMerge`. One overwritable slot per generation:\n// if a stale PreMerge from a crashed rerun of THIS branch exists, delete it first so we never\n// accumulate backups (the old scheme minted a fresh Backup1/Backup2/… on every run).\nfunction createBackup(currentBranch: string): string {\n    process.stdout.write('\\n' + SEP + '💾 Creating Pre-Merge Backup\\n' + SEP + '\\n');\n    const backupBranch = preMergeBackupName(currentBranch);\n    if (spawnSync('git', ['show-ref', '--verify', '--quiet', `refs/heads/${backupBranch}`]).status === 0) {\n        runGitChecked(['branch', '-D', backupBranch], 'Failed to delete stale pre-merge backup');\n    }\n    runGitChecked(['checkout', '-b', backupBranch], 'Failed to create backup branch');\n    runGitChecked(['checkout', currentBranch], 'Failed to return to feature branch');\n    process.stdout.write(`✅ Backup created: ${backupBranch}\\n\\n`);\n    return backupBranch;\n}\n\nfunction saveConflictContext(\n    conflictedFiles: string[], mergeDir: string, forkPoint: string, featureHead: string, mainHead: string,\n): void {\n    for (const file of conflictedFiles) {\n        const fileDir = perFileContextDir(mergeDir, file);\n        fs.mkdirSync(fileDir, { recursive: true });\n\n        const fork = spawnSync('git', ['show', `${forkPoint}:${file}`], { encoding: 'utf8' });\n        fs.writeFileSync(path.join(fileDir, 'A-forkpoint.txt'), fork.status === 0 ? (fork.stdout ?? '') : '(file did not exist)\\n');\n        const feature = spawnSync('git', ['show', `${featureHead}:${file}`], { encoding: 'utf8' });\n        fs.writeFileSync(path.join(fileDir, 'B-feature.txt'), feature.status === 0 ? (feature.stdout ?? '') : '(file did not exist)\\n');\n        const main = spawnSync('git', ['show', `${mainHead}:${file}`], { encoding: 'utf8' });\n        fs.writeFileSync(path.join(fileDir, 'C-main.txt'), main.status === 0 ? (main.stdout ?? '') : '(file did not exist)\\n');\n\n        const ba = spawnSync('git', ['diff', forkPoint, featureHead, '--', file], { encoding: 'utf8' });\n        fs.writeFileSync(path.join(fileDir, 'B-A.diff'), ba.stdout ?? '');\n        const ca = spawnSync('git', ['diff', forkPoint, mainHead, '--', file], { encoding: 'utf8' });\n        fs.writeFileSync(path.join(fileDir, 'C-A.diff'), ca.stdout ?? '');\n    }\n}\n\n// Single source of truth for the merge process. The script WRITES it at conflict time (rather\n// than the AI relying on a separate hand-maintained doc), parameterized with the live MERGE_DIR\n// and conflicted-file list, so the instructions can never drift from the actual layout. The body\n// is a template constant with {{...}} placeholders so this stays a small filler function.\nconst MERGE_PROCESS_TEMPLATE = `# AI-Assisted Squash-Merge Conflict Resolution (generated)\n\nThis file was generated by \\`pnpm wp-update-start\\` when the 3-point squash-merge hit conflicts.\nIt is the single source of truth for the merge process — follow it exactly.\n\nYou are on branch \\`{{SQUASH_BRANCH}}\\` with conflict markers in the working tree.\n\\`MERGE_DIR = {{MERGE_DIR}}\\`\n\n## How the gate works\n\n- Resolve every conflicted file in the working tree.\n- Run **\\`pnpm {{FINISH_COMMAND}}\\`** — the validation + finish gate. It scans for leftover conflict\n  markers, checks each conflicted file has a written merge explanation, validates, and commits the\n  merge. (In the PR flow this command is \\`wp-finish-upsert-pr\\`, which additionally runs the\n  \\`nx affected\\` build, renders the dashboard, and creates/updates the PR.)\n- **Do NOT run \\`git add\\` / \\`git commit\\` / \\`git push\\` / \\`gh pr\\` yourself.** They are blocked by\n  the \\`merge-in-progress-guard\\` hook until the gate validates. The gate does the commit.\n\n## STEP 1 — Load the merge context\n\nPer conflicted file, \\`MERGE_DIR/updatemain-<safe_path>/\\` holds (\\`<safe_path>\\` = path with \\`/\\`→\\`__\\`):\n\n\\`\\`\\`\nA-forkpoint.txt   # file at fork point (base)\nB-feature.txt     # file on your feature branch\nC-main.txt        # file on main\nB-A.diff          # what your feature changed (B−A)\nC-A.diff          # what main changed (C−A)\n\\`\\`\\`\n\n\\`updatemain-hashes.json\\` holds A/B/C commit hashes. To see why main changed:\n\\`git log <A>..<C> --oneline\\`.\n\n## STEP 2 — Resolve each conflicted file\n\nFor each file: read the working-tree file (the markers) and its \\`B-A.diff\\` / \\`C-A.diff\\` (intent),\nthen Edit to the resolved version, removing ALL conflict markers.\n\nStrategies: goals align & non-overlapping → merge both · one side removes what the other modifies\n→ prefer the removal · same lines, simple (imports/format) → merge both · same lines, complex or\nconflicting goals → ask the user · feature re-implements what main already squashed → prefer\nmain's, then re-apply only the genuinely new feature work.\n\n**Then write a merge explanation** for each conflicted file — NOT a comment in the source (that\nbreaks for JSON and deleted files). Write it next to that file's diffs, at:\n\n\\`\\`\\`\nMERGE_DIR/updatemain-<safe_path>/{{EXPLANATION_FILE}}\n\\`\\`\\`\n\n(\\`<safe_path>\\` = the conflict file path with \\`/\\` → \\`__\\`, the same dir that holds its\n\\`A-forkpoint.txt\\` / \\`B-A.diff\\` / \\`C-A.diff\\`.) In it, explain in a few sentences how you resolved\nthis file: which side you took where, what you combined from B-A.diff vs C-A.diff, and why. The\ngate fails if any conflicted file's explanation is missing or empty. Do not paste A/B/C context\nblocks into the source code.\n\n## STEP 3 — Run the gate (validates the merge AND finalizes it)\n\n\\`\\`\\`\npnpm {{FINISH_COMMAND}}\n\\`\\`\\`\n\n- Leftover conflict markers → fix those files and re-run.\n- Missing merge explanation → write it (see STEP 2) and re-run.\n- Build failure → fix the TypeScript/lint errors and re-run (the gate re-stages for you).\n- Missing review.json (PR flow only) → write it in the printed format (your PR review), then re-run.\n- On success it commits and finalizes the merge (in the PR flow it also renders the dashboard and\n  creates/updates the PR).\n\n## Conflicted files\n\n{{FILE_LIST}}\n\n## If you need to bail out\n\nA backup branch was created (e.g. \\`<feature>PreMerge\\`). To abandon:\n\n\\`\\`\\`\ngit merge --abort 2>/dev/null; git checkout <feature> ; git branch -D {{SQUASH_BRANCH}}\n\\`\\`\\`\n\nThen delete \\`{{MERGE_DIR}}/\\` for a clean slate.\n`;\n\nfunction mergeProcessDoc(mergeDir: string, squashBranch: string, conflictedFiles: string[], finishCommand: string): string {\n    const fileList = conflictedFiles.map((f: string): string => `- \\`${f}\\``).join('\\n');\n    return MERGE_PROCESS_TEMPLATE\n        .replace(/\\{\\{SQUASH_BRANCH\\}\\}/g, squashBranch)\n        .replace(/\\{\\{MERGE_DIR\\}\\}/g, mergeDir)\n        .replace(/\\{\\{EXPLANATION_FILE\\}\\}/g, MERGE_EXPLANATION_FILE)\n        .replace(/\\{\\{FINISH_COMMAND\\}\\}/g, finishCommand)\n        .replace(/\\{\\{FILE_LIST\\}\\}/g, fileList);\n}\n\n// Returns the absolute path of the written doc.\nfunction writeMergeProcessDoc(repoRoot: string, mergeDir: string, squashBranch: string, conflictedFiles: string[], finishCommand: string): string {\n    const docDir = path.join(repoRoot, WEBPIECES_TMP_DIR, 'instruct-ai');\n    fs.mkdirSync(docDir, { recursive: true });\n    const docPath = path.join(docDir, 'webpieces.mergeprocess.md');\n    fs.writeFileSync(docPath, mergeProcessDoc(mergeDir, squashBranch, conflictedFiles, finishCommand));\n    return docPath;\n}\n\nfunction printConflictHandback(docPath: string, mergeDir: string, squashBranch: string, conflictedFiles: string[]): void {\n    process.stdout.write('\\n' + SEP + `⚠️  Conflicts in ${conflictedFiles.length} file(s) — handing control back to you\\n` + SEP + '\\n');\n    process.stdout.write(`You are on branch ${squashBranch} with conflicts in the working tree.\\n\\n`);\n    process.stdout.write(`FOLLOW THE MERGE PROCESS:  ${docPath}\\n`);\n    process.stdout.write(`3-point context per file in: ${mergeDir}/updatemain-<file>/\\n\\n`);\n    process.stdout.write('Conflicted files:\\n');\n    for (const file of conflictedFiles) process.stdout.write(`  - ${file}\\n`);\n    process.stdout.write('\\n' + SEP);\n}\n\n// Write the conflict context files + the unvalidated marker + the process doc. Does NOT exit — the\n// caller decides (runUpdateFromMain exits 2 to hand back to the AI).\nfunction handleConflictsHandback(\n    repoRoot: string, mergeDir: string, currentBranch: string, squashBranch: string,\n    backupBranch: string, prNumber: string, hashes: HashPoints, finishCommand: string,\n): void {\n    const raw = execSync('git diff --name-only --diff-filter=U', { encoding: 'utf8' }).trim();\n    const conflictedFiles = raw.split('\\n').filter((f: string): boolean => f.trim() !== '');\n    fs.writeFileSync(path.join(mergeDir, 'updatemain-conflicted-files.txt'), raw + '\\n');\n    saveConflictContext(conflictedFiles, mergeDir, hashes.hashForkPoint, hashes.hashFeatureHead, hashes.hashMainHead);\n\n    const marker = new MergeMarker(\n        currentBranch, squashBranch, backupBranch, prNumber, conflictedFiles,\n        hashes.hashForkPoint, hashes.hashFeatureHead, hashes.hashMainHead, false,\n    );\n    writeMergeMarker(mergeDir, marker);\n    const docPath = writeMergeProcessDoc(repoRoot, mergeDir, squashBranch, conflictedFiles, finishCommand);\n    printConflictHandback(docPath, mergeDir, squashBranch, conflictedFiles);\n}\n\n// Short sha of a ref (best-effort — '' if it can't resolve), for the branch-mutation log's\n// oldMain→newMain annotation.\nfunction shortSha(ref: string): string {\n    const result = spawnSync('git', ['rev-parse', '--short', ref], { encoding: 'utf8' });\n    return result.status === 0 ? (result.stdout ?? '').trim() : '';\n}\n\n// Log the CONFLICT phase with the conflicted-file list + the artifact paths a resolver needs — the\n// per-file 3-point context dir and the generated merge-process doc — so the branch-mutation log alone\n// tells the next agent where to look (no reflog/log archaeology).\nfunction logConflict(repoRoot: string, verb: MutationVerb, mergeDir: string): void {\n    const raw = spawnSync('git', ['diff', '--name-only', '--diff-filter=U'], { cwd: repoRoot, encoding: 'utf8' });\n    const files = (raw.status === 0 ? (raw.stdout ?? '') : '').split('\\n').map((f: string): string => f.trim()).filter((f: string): boolean => f !== '');\n    const event = new BranchMutationEvent(verb, 'CONFLICT');\n    event.conflict = true;\n    event.conflictFiles = files;\n    event.artifacts = [\n        path.join(mergeDir, 'updatemain-<file>'),\n        path.join(repoRoot, WEBPIECES_TMP_DIR, 'instruct-ai', 'webpieces.mergeprocess.md'),\n    ];\n    logBranchMutation(repoRoot, event);\n}\n\nexport async function mergeStart(repoRoot: string, verb: MutationVerb, mergeDir: string, finishCommand: string): Promise<MergeStartResult> {\n    const currentBranch = execSync('git branch --show-current', { encoding: 'utf8' }).trim();\n    if (currentBranch.endsWith('Squash')) {\n        throw new CliExitError(1, `❌ On a leftover ${currentBranch} branch with no merge marker. Clean up: git branch -D ${currentBranch}`);\n    }\n\n    process.stdout.write('\\n' + SEP + '🔄 Squash-Merge Update from Main\\n' + SEP + '\\n');\n    // gatherInfo RETURNS (never exits): an already-even-with-main branch is NOT special-cased here —\n    // we flow straight on. The squash merge below becomes a no-op that the `nothingStaged` path\n    // (further down) handles, so the caller still proceeds to push + build. (Previously gatherInfo\n    // process.exit(0)'d on this case, silently killing wp-start-upsert-pr before push/build.)\n    const info = await gatherInfo();\n    const hashes = info.hashes;\n    if (info.alreadyUpToDate) {\n        process.stdout.write('ℹ️  Branch already even with main; nothing to merge, continuing to push/build.\\n');\n    }\n\n    const prNumber = detectPr(baseBranchName(currentBranch));\n    process.stdout.write(prNumber ? `Existing PR #${prNumber} will be updated.\\n` : 'No existing PR (one can be created later).\\n');\n\n    const backupBranch = createBackup(currentBranch);\n    const backupEvent = new BranchMutationEvent(verb, 'BACKUP');\n    backupEvent.fromBranch = currentBranch;\n    backupEvent.toBranch = backupBranch;\n    logBranchMutation(repoRoot, backupEvent);\n\n    const squashBranch = `${currentBranch}Squash`;\n    if (spawnSync('git', ['show-ref', '--verify', '--quiet', `refs/heads/${squashBranch}`]).status === 0) {\n        throw new CliExitError(1, `❌ Stale ${squashBranch} from a previous run. Delete it: git branch -D ${squashBranch}`);\n    }\n\n    const mainBeforePull = shortSha('main');\n    runGitChecked(['checkout', 'main'], 'Failed to checkout main');\n    logBranchMutation(repoRoot, new BranchMutationEvent(verb, 'CHECKOUT_MAIN'));\n    runGitChecked(['pull', 'origin', 'main'], 'Failed to pull origin/main');\n    const pullEvent = new BranchMutationEvent(verb, 'PULL');\n    pullEvent.oldMain = mainBeforePull;\n    pullEvent.newMain = shortSha('main');\n    logBranchMutation(repoRoot, pullEvent);\n    runGitChecked(['checkout', '-b', squashBranch], 'Failed to create squash branch');\n\n    process.stdout.write('\\n' + SEP + `🔀 Squash merging ${currentBranch}\\n` + SEP + '\\n');\n    const merge = spawnSync('git', ['merge', '--squash', currentBranch], { stdio: 'inherit' });\n    if (merge.status !== 0) {\n        handleConflictsHandback(repoRoot, mergeDir, currentBranch, squashBranch, backupBranch, prNumber, hashes, finishCommand);\n        logConflict(repoRoot, verb, mergeDir);\n        return new MergeStartResult('conflict', null);\n    }\n    logBranchMutation(repoRoot, new BranchMutationEvent(verb, 'SQUASH'));\n\n    const nothingStaged = spawnSync('git', ['diff-index', '--quiet', '--cached', 'HEAD', '--']).status === 0;\n    if (nothingStaged) {\n        process.stdout.write('ℹ️  Already up-to-date with main (nothing to merge).\\n');\n    } else {\n        runGitChecked(['commit', '-m', `Squash merge of ${currentBranch}`], 'Failed to commit squash merge');\n    }\n    return new MergeStartResult('clean', new MergeContext(currentBranch, squashBranch, backupBranch, prNumber));\n}\n"]}
+{"version":3,"file":"merge-start.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/merge-start.ts"],"names":[],"mappings":"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","sourcesContent":["import { execSync, spawnSync } from 'child_process';\nimport * as fs from 'fs';\nimport * as path from 'path';\nimport {\n    WEBPIECES_TMP_DIR, MERGE_EXPLANATION_FILE, CliExitError,\n    MutationVerb, BranchMutationEvent, logBranchMutation,\n} from '@webpieces/rules-config';\nimport { gatherInfo } from '../git-gatherInfo';\nimport { baseBranchName, nextFreePreMergeNumber, preMergeBackupName } from './branch-naming';\nimport { runGitChecked } from './git-exec';\nimport { MergeMarker, perFileContextDir, writeMergeMarker, mergeRunDirFor } from './merge-state';\n\n// merge-START: the first half of the 3-point squash-merge lifecycle. Brings origin/main into a fresh\n// `<branch>Squash`, and on conflict writes the 3-point context files + the unvalidated marker + the\n// process doc, then hands control back to the AI. On a clean merge it commits the squash and returns\n// the branch context so the caller (runUpdateFromMain) can run merge-END to finalize. It NEVER\n// finalizes or posts a PR — that is merge-END's / wp-finish-upsert-pr's job. Shared so\n// runUpdateFromMain (and, via it, wp-update-start + wp-start-upsert-pr) all set up a merge through\n// one code path. `finishCommand` names the command the AI runs to finish after resolving conflicts\n// (standalone update → `wp-update-end`; PR flow → `wp-finish-upsert-pr`).\n\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\n';\n\ninterface HashPoints {\n    hashForkPoint: string;\n    hashFeatureHead: string;\n    hashMainHead: string;\n}\n\n// The four branch names merge-END needs to finalize a merge (swap squash→feature, push, clean up).\nexport class MergeContext {\n    currentBranch: string;\n    squashBranch: string;\n    backupBranch: string;\n    prNumber: string;\n\n    constructor(currentBranch: string, squashBranch: string, backupBranch: string, prNumber: string) {\n        this.currentBranch = currentBranch;\n        this.squashBranch = squashBranch;\n        this.backupBranch = backupBranch;\n        this.prNumber = prNumber;\n    }\n}\n\n// Outcome of merge-start: 'clean' carries the context for merge-END to finalize; 'conflict' means the\n// marker + context files were written and the caller should hand back to the AI (exit 2).\nexport class MergeStartResult {\n    status: 'clean' | 'conflict';\n    context: MergeContext | null;\n    runDir: string; // this sync's numbered `merge-<n>/` dir — passed to merge-END so it reads THIS marker\n\n    constructor(status: 'clean' | 'conflict', context: MergeContext | null, runDir: string) {\n        this.status = status;\n        this.context = context;\n        this.runDir = runDir;\n    }\n}\n\n// Detect the PR by its STABLE feature branch — pass baseBranchName(currentBranch) so a leftover\n// `…wpN` from the old scheme still resolves to the one name the PR lives on.\nfunction detectPr(baseBranch: string): string {\n    const result = spawnSync(\n        'gh', ['pr', 'list', '--head', baseBranch, '--json', 'number', '--jq', '.[0].number'],\n        { encoding: 'utf8' },\n    );\n    return result.status === 0 ? (result.stdout ?? '').trim() : '';\n}\n\n// The one number `n` for a sync and the two things it names: the pre-merge backup branch and its\n// paired conflict-context run dir.\nclass SyncSlot {\n    backupBranch: string;\n    runDir: string;\n\n    constructor(backupBranch: string, runDir: string) {\n        this.backupBranch = backupBranch;\n        this.runDir = runDir;\n    }\n}\n\n// Pick the first free `<branch>PreMerge<n>` slot number, then WIPE the paired `<home>/merge-<n>/` run\n// dir — a fresh sync means no merge is in progress, so any leftover `merge-<n>` is stale (its own sync\n// ended, or its branch was deleted) and MUST NOT leak its old per-file merge-explanation.md into this\n// merge's validation. Returns the backup branch name + the (now-empty) run dir path, both keyed on `n`.\nfunction chooseSyncSlot(home: string, currentBranch: string): SyncSlot {\n    const n = nextFreePreMergeNumber(\n        currentBranch,\n        (name: string): boolean => spawnSync('git', ['show-ref', '--verify', '--quiet', `refs/heads/${name}`]).status === 0,\n    );\n    const runDir = mergeRunDirFor(home, n);\n    fs.rmSync(runDir, { recursive: true, force: true });\n    return new SyncSlot(preMergeBackupName(currentBranch, n), runDir);\n}\n\n// Snapshot the pre-merge state onto the caller-chosen `backupBranch` (`<currentBranch>PreMerge<n>`),\n// never overwriting. The slot number `n` is picked once in mergeStart and shared with the paired\n// `merge-<n>/` context dir. A clean sync deletes this snapshot at finalize; only conflict syncs keep it.\nfunction createBackup(currentBranch: string, backupBranch: string): void {\n    process.stdout.write('\\n' + SEP + '💾 Creating Pre-Merge Backup\\n' + SEP + '\\n');\n    runGitChecked(['checkout', '-b', backupBranch], 'Failed to create backup branch');\n    runGitChecked(['checkout', currentBranch], 'Failed to return to feature branch');\n    process.stdout.write(`✅ Backup created: ${backupBranch}\\n\\n`);\n}\n\nfunction saveConflictContext(\n    conflictedFiles: string[], mergeDir: string, forkPoint: string, featureHead: string, mainHead: string,\n): void {\n    for (const file of conflictedFiles) {\n        const fileDir = perFileContextDir(mergeDir, file);\n        fs.mkdirSync(fileDir, { recursive: true });\n\n        const fork = spawnSync('git', ['show', `${forkPoint}:${file}`], { encoding: 'utf8' });\n        fs.writeFileSync(path.join(fileDir, 'A-forkpoint.txt'), fork.status === 0 ? (fork.stdout ?? '') : '(file did not exist)\\n');\n        const feature = spawnSync('git', ['show', `${featureHead}:${file}`], { encoding: 'utf8' });\n        fs.writeFileSync(path.join(fileDir, 'B-feature.txt'), feature.status === 0 ? (feature.stdout ?? '') : '(file did not exist)\\n');\n        const main = spawnSync('git', ['show', `${mainHead}:${file}`], { encoding: 'utf8' });\n        fs.writeFileSync(path.join(fileDir, 'C-main.txt'), main.status === 0 ? (main.stdout ?? '') : '(file did not exist)\\n');\n\n        const ba = spawnSync('git', ['diff', forkPoint, featureHead, '--', file], { encoding: 'utf8' });\n        fs.writeFileSync(path.join(fileDir, 'B-A.diff'), ba.stdout ?? '');\n        const ca = spawnSync('git', ['diff', forkPoint, mainHead, '--', file], { encoding: 'utf8' });\n        fs.writeFileSync(path.join(fileDir, 'C-A.diff'), ca.stdout ?? '');\n    }\n}\n\n// Single source of truth for the merge process. The script WRITES it at conflict time (rather\n// than the AI relying on a separate hand-maintained doc), parameterized with the live MERGE_DIR\n// and conflicted-file list, so the instructions can never drift from the actual layout. The body\n// is a template constant with {{...}} placeholders so this stays a small filler function.\nconst MERGE_PROCESS_TEMPLATE = `# AI-Assisted Squash-Merge Conflict Resolution (generated)\n\nThis file was generated by \\`pnpm wp-update-start\\` when the 3-point squash-merge hit conflicts.\nIt is the single source of truth for the merge process — follow it exactly.\n\nYou are on branch \\`{{SQUASH_BRANCH}}\\` with conflict markers in the working tree.\n\\`MERGE_DIR = {{MERGE_DIR}}\\`\n\n## How the gate works\n\n- Resolve every conflicted file in the working tree.\n- Run **\\`pnpm {{FINISH_COMMAND}}\\`** — the validation + finish gate. It scans for leftover conflict\n  markers, checks each conflicted file has a written merge explanation, validates, and commits the\n  merge. (In the PR flow this command is \\`wp-finish-upsert-pr\\`, which additionally runs the\n  \\`nx affected\\` build, renders the dashboard, and creates/updates the PR.)\n- **Do NOT run \\`git add\\` / \\`git commit\\` / \\`git push\\` / \\`gh pr\\` yourself.** They are blocked by\n  the \\`merge-in-progress-guard\\` hook until the gate validates. The gate does the commit.\n\n## STEP 1 — Load the merge context\n\nPer conflicted file, \\`MERGE_DIR/updatemain-<safe_path>/\\` holds (\\`<safe_path>\\` = path with \\`/\\`→\\`__\\`):\n\n\\`\\`\\`\nA-forkpoint.txt   # file at fork point (base)\nB-feature.txt     # file on your feature branch\nC-main.txt        # file on main\nB-A.diff          # what your feature changed (B−A)\nC-A.diff          # what main changed (C−A)\n\\`\\`\\`\n\n\\`updatemain-hashes.json\\` holds A/B/C commit hashes. To see why main changed:\n\\`git log <A>..<C> --oneline\\`.\n\n## STEP 2 — Resolve each conflicted file\n\nFor each file: read the working-tree file (the markers) and its \\`B-A.diff\\` / \\`C-A.diff\\` (intent),\nthen Edit to the resolved version, removing ALL conflict markers.\n\nStrategies: goals align & non-overlapping → merge both · one side removes what the other modifies\n→ prefer the removal · same lines, simple (imports/format) → merge both · same lines, complex or\nconflicting goals → ask the user · feature re-implements what main already squashed → prefer\nmain's, then re-apply only the genuinely new feature work.\n\n**Then write a merge explanation** for each conflicted file — NOT a comment in the source (that\nbreaks for JSON and deleted files). Write it next to that file's diffs, at:\n\n\\`\\`\\`\nMERGE_DIR/updatemain-<safe_path>/{{EXPLANATION_FILE}}\n\\`\\`\\`\n\n(\\`<safe_path>\\` = the conflict file path with \\`/\\` → \\`__\\`, the same dir that holds its\n\\`A-forkpoint.txt\\` / \\`B-A.diff\\` / \\`C-A.diff\\`.) In it, explain in a few sentences how you resolved\nthis file: which side you took where, what you combined from B-A.diff vs C-A.diff, and why. The\ngate fails if any conflicted file's explanation is missing or empty. Do not paste A/B/C context\nblocks into the source code.\n\n## STEP 3 — Run the gate (validates the merge AND finalizes it)\n\n\\`\\`\\`\npnpm {{FINISH_COMMAND}}\n\\`\\`\\`\n\n- Leftover conflict markers → fix those files and re-run.\n- Missing merge explanation → write it (see STEP 2) and re-run.\n- Build failure → fix the TypeScript/lint errors and re-run (the gate re-stages for you).\n- Missing review.json (PR flow only) → write it in the printed format (your PR review), then re-run.\n- On success it commits and finalizes the merge (in the PR flow it also renders the dashboard and\n  creates/updates the PR).\n\n## Conflicted files\n\n{{FILE_LIST}}\n\n## If you need to bail out\n\nA numbered backup branch was created (e.g. \\`<feature>PreMerge1\\`). To abandon:\n\n\\`\\`\\`\ngit merge --abort 2>/dev/null; git checkout <feature> ; git branch -D {{SQUASH_BRANCH}}\n\\`\\`\\`\n\nThen delete \\`{{MERGE_DIR}}/\\` for a clean slate.\n`;\n\nfunction mergeProcessDoc(mergeDir: string, squashBranch: string, conflictedFiles: string[], finishCommand: string): string {\n    const fileList = conflictedFiles.map((f: string): string => `- \\`${f}\\``).join('\\n');\n    return MERGE_PROCESS_TEMPLATE\n        .replace(/\\{\\{SQUASH_BRANCH\\}\\}/g, squashBranch)\n        .replace(/\\{\\{MERGE_DIR\\}\\}/g, mergeDir)\n        .replace(/\\{\\{EXPLANATION_FILE\\}\\}/g, MERGE_EXPLANATION_FILE)\n        .replace(/\\{\\{FINISH_COMMAND\\}\\}/g, finishCommand)\n        .replace(/\\{\\{FILE_LIST\\}\\}/g, fileList);\n}\n\n// Returns the absolute path of the written doc.\nfunction writeMergeProcessDoc(repoRoot: string, mergeDir: string, squashBranch: string, conflictedFiles: string[], finishCommand: string): string {\n    const docDir = path.join(repoRoot, WEBPIECES_TMP_DIR, 'instruct-ai');\n    fs.mkdirSync(docDir, { recursive: true });\n    const docPath = path.join(docDir, 'webpieces.mergeprocess.md');\n    fs.writeFileSync(docPath, mergeProcessDoc(mergeDir, squashBranch, conflictedFiles, finishCommand));\n    return docPath;\n}\n\n// The AI-facing \"what just happened / what to do next\" recap on the conflict path. Explicit and\n// numbered so an agent (or human) can't miss where the context lives or which command finishes.\nfunction printConflictHandback(\n    docPath: string, mergeDir: string, squashBranch: string, conflictedFiles: string[], finishCommand: string,\n): void {\n    process.stdout.write('\\n' + SEP + `⚠️  Conflicts in ${conflictedFiles.length} file(s) — handing control back to you\\n` + SEP + '\\n');\n    process.stdout.write('Here is exactly what I did and what you need to do:\\n\\n');\n    process.stdout.write('What I did:\\n');\n    process.stdout.write('   1. snapshotted your pre-merge state to a PreMerge branch\\n');\n    process.stdout.write('   2. pulled origin/main and squash-merged your work onto it\\n');\n    process.stdout.write(`   3. hit conflicts — you are now on the transient branch  ${squashBranch}\\n\\n`);\n    process.stdout.write('What you need to do:\\n');\n    process.stdout.write(`   1. read the merge process doc:  ${docPath}\\n`);\n    process.stdout.write(`   2. resolve each conflicted file below (its 3-point A/B/C context + diffs are in\\n`);\n    process.stdout.write(`      ${mergeDir}/updatemain-<file>/), and write that file's merge-explanation.md\\n`);\n    process.stdout.write(`   3. run  pnpm ${finishCommand}  — it validates, commits, and finalizes (do NOT git add/commit/push yourself)\\n\\n`);\n    process.stdout.write('Conflicted files:\\n');\n    for (const file of conflictedFiles) process.stdout.write(`  - ${file}\\n`);\n    process.stdout.write('\\n' + SEP);\n}\n\n// Write the conflict context files + the unvalidated marker + the process doc. Does NOT exit — the\n// caller decides (runUpdateFromMain exits 2 to hand back to the AI).\nfunction handleConflictsHandback(\n    repoRoot: string, mergeDir: string, currentBranch: string, squashBranch: string,\n    backupBranch: string, prNumber: string, hashes: HashPoints, finishCommand: string,\n): void {\n    const raw = execSync('git diff --name-only --diff-filter=U', { encoding: 'utf8' }).trim();\n    const conflictedFiles = raw.split('\\n').filter((f: string): boolean => f.trim() !== '');\n    fs.mkdirSync(mergeDir, { recursive: true }); // run dir was wiped at sync start — create it fresh\n    fs.writeFileSync(path.join(mergeDir, 'updatemain-conflicted-files.txt'), raw + '\\n');\n    // Copy the A/B/C hashes into THIS run dir so the merge-process doc's `MERGE_DIR/updatemain-hashes.json`\n    // pointer is accurate (gatherInfo writes the source copy into the feature home before the slot is known).\n    fs.writeFileSync(path.join(mergeDir, 'updatemain-hashes.json'), JSON.stringify(hashes, null, 2) + '\\n');\n    saveConflictContext(conflictedFiles, mergeDir, hashes.hashForkPoint, hashes.hashFeatureHead, hashes.hashMainHead);\n\n    const marker = new MergeMarker(\n        currentBranch, squashBranch, backupBranch, prNumber, conflictedFiles,\n        hashes.hashForkPoint, hashes.hashFeatureHead, hashes.hashMainHead, false,\n    );\n    writeMergeMarker(mergeDir, marker);\n    const docPath = writeMergeProcessDoc(repoRoot, mergeDir, squashBranch, conflictedFiles, finishCommand);\n    printConflictHandback(docPath, mergeDir, squashBranch, conflictedFiles, finishCommand);\n}\n\n// Short sha of a ref (best-effort — '' if it can't resolve), for the branch-mutation log's\n// oldMain→newMain annotation.\nfunction shortSha(ref: string): string {\n    const result = spawnSync('git', ['rev-parse', '--short', ref], { encoding: 'utf8' });\n    return result.status === 0 ? (result.stdout ?? '').trim() : '';\n}\n\n// Log the CONFLICT phase with the conflicted-file list + the artifact paths a resolver needs — the\n// per-file 3-point context dir and the generated merge-process doc — so the branch-mutation log alone\n// tells the next agent where to look (no reflog/log archaeology).\nfunction logConflict(repoRoot: string, verb: MutationVerb, mergeDir: string): void {\n    const raw = spawnSync('git', ['diff', '--name-only', '--diff-filter=U'], { cwd: repoRoot, encoding: 'utf8' });\n    const files = (raw.status === 0 ? (raw.stdout ?? '') : '').split('\\n').map((f: string): string => f.trim()).filter((f: string): boolean => f !== '');\n    const event = new BranchMutationEvent(verb, 'CONFLICT');\n    event.conflict = true;\n    event.conflictFiles = files;\n    event.artifacts = [\n        path.join(mergeDir, 'updatemain-<file>'),\n        path.join(repoRoot, WEBPIECES_TMP_DIR, 'instruct-ai', 'webpieces.mergeprocess.md'),\n    ];\n    logBranchMutation(repoRoot, event);\n}\n\nexport async function mergeStart(repoRoot: string, verb: MutationVerb, home: string, finishCommand: string): Promise<MergeStartResult> {\n    const currentBranch = execSync('git branch --show-current', { encoding: 'utf8' }).trim();\n    if (currentBranch.endsWith('Squash')) {\n        throw new CliExitError(1, `❌ On a leftover ${currentBranch} branch with no merge marker. Clean up: git branch -D ${currentBranch}`);\n    }\n\n    // One number `n` for this sync drives BOTH the backup branch and its `merge-<n>/` context dir.\n    const slot = chooseSyncSlot(home, currentBranch);\n    const backupBranch = slot.backupBranch;\n    const mergeDir = slot.runDir;\n\n    process.stdout.write('\\n' + SEP + '🔄 Squash-Merge Update from Main\\n' + SEP + '\\n');\n    // gatherInfo RETURNS (never exits): an already-even-with-main branch is NOT special-cased here —\n    // we flow straight on. The squash merge below becomes a no-op that the `nothingStaged` path\n    // (further down) handles, so the caller still proceeds to push + build. (Previously gatherInfo\n    // process.exit(0)'d on this case, silently killing wp-start-upsert-pr before push/build.)\n    const info = await gatherInfo();\n    const hashes = info.hashes;\n    if (info.alreadyUpToDate) {\n        process.stdout.write('ℹ️  Branch already even with main; nothing to merge, continuing to push/build.\\n');\n    }\n\n    const prNumber = detectPr(baseBranchName(currentBranch));\n    process.stdout.write(prNumber ? `Existing PR #${prNumber} will be updated.\\n` : 'No existing PR (one can be created later).\\n');\n\n    createBackup(currentBranch, backupBranch);\n    const backupEvent = new BranchMutationEvent(verb, 'BACKUP');\n    backupEvent.fromBranch = currentBranch;\n    backupEvent.toBranch = backupBranch;\n    logBranchMutation(repoRoot, backupEvent);\n\n    const squashBranch = `${currentBranch}Squash`;\n    if (spawnSync('git', ['show-ref', '--verify', '--quiet', `refs/heads/${squashBranch}`]).status === 0) {\n        throw new CliExitError(1, `❌ Stale ${squashBranch} from a previous run. Delete it: git branch -D ${squashBranch}`);\n    }\n\n    const mainBeforePull = shortSha('main');\n    runGitChecked(['checkout', 'main'], 'Failed to checkout main');\n    logBranchMutation(repoRoot, new BranchMutationEvent(verb, 'CHECKOUT_MAIN'));\n    runGitChecked(['pull', 'origin', 'main'], 'Failed to pull origin/main');\n    const pullEvent = new BranchMutationEvent(verb, 'PULL');\n    pullEvent.oldMain = mainBeforePull;\n    pullEvent.newMain = shortSha('main');\n    logBranchMutation(repoRoot, pullEvent);\n    runGitChecked(['checkout', '-b', squashBranch], 'Failed to create squash branch');\n\n    process.stdout.write('\\n' + SEP + `🔀 Squash merging ${currentBranch}\\n` + SEP + '\\n');\n    const merge = spawnSync('git', ['merge', '--squash', currentBranch], { stdio: 'inherit' });\n    if (merge.status !== 0) {\n        handleConflictsHandback(repoRoot, mergeDir, currentBranch, squashBranch, backupBranch, prNumber, hashes, finishCommand);\n        logConflict(repoRoot, verb, mergeDir);\n        return new MergeStartResult('conflict', null, mergeDir);\n    }\n    logBranchMutation(repoRoot, new BranchMutationEvent(verb, 'SQUASH'));\n\n    const nothingStaged = spawnSync('git', ['diff-index', '--quiet', '--cached', 'HEAD', '--']).status === 0;\n    if (nothingStaged) {\n        process.stdout.write('ℹ️  Already up-to-date with main (nothing to merge).\\n');\n    } else {\n        runGitChecked(['commit', '-m', `Squash merge of ${currentBranch}`], 'Failed to commit squash merge');\n    }\n    return new MergeStartResult('clean', new MergeContext(currentBranch, squashBranch, backupBranch, prNumber), mergeDir);\n}\n"]}

package/src/scripts/workflow/merge-state.d.ts

@@ -16,6 +16,8 @@ export declare class MarkerScanResult {
     constructor(clean: boolean, filesWithMarkers: string[]);
 }
 export declare function mergeDirFor(repoRoot: string, featureName: string): string;
+export declare function mergeRunDirFor(home: string, n: number): string;
+export declare function findActiveMergeRunDir(home: string): string | null;
 export declare function perFileContextDir(mergeDir: string, file: string): string;
 export declare function markerPath(mergeDir: string): string;
 export declare function readMergeMarker(mergeDir: string): MergeMarker | null;

package/src/scripts/workflow/merge-state.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MarkerScanResult = exports.MergeMarker = void 0;
 exports.mergeDirFor = mergeDirFor;
+exports.mergeRunDirFor = mergeRunDirFor;
+exports.findActiveMergeRunDir = findActiveMergeRunDir;
 exports.perFileContextDir = perFileContextDir;
 exports.markerPath = markerPath;
 exports.readMergeMarker = readMergeMarker;
@@ -49,9 +51,39 @@ class MarkerScanResult {
 }
 exports.MarkerScanResult = MarkerScanResult;
 const CONFLICT_MARKER_RE = /^(<{7}|={7}|>{7})/m;
+// The per-feature "home" dir `.webpieces/merge-info/<slug>/`. It no longer holds the marker/context
+// directly — each sync gets its own numbered `merge-<n>/` run dir underneath (mergeRunDirFor), paired
+// with the sync's `<feature>PreMerge<n>` backup branch. This keeps merge N from ever reusing merge
+// N-1's stale per-file context / merge-explanation.md.
 function mergeDirFor(repoRoot, featureName) {
     return path.join(repoRoot, rules_config_1.WEBPIECES_TMP_DIR, rules_config_1.MERGE_INFO_DIR, featureName);
 }
+// The run dir for sync number `n`: `<home>/merge-<n>/`. Holds this sync's marker + per-file
+// `updatemain-<file>/` context. Numbered to match the sync's `<feature>PreMerge<n>` backup branch.
+function mergeRunDirFor(home, n) {
+    return path.join(home, `merge-${n}`);
+}
+// Locate the in-progress merge's run dir: the `<home>/merge-*/` subdir holding a marker. There is at
+// most one (a fresh sync can't start while a merge is in progress); if more than one somehow exists,
+// prefer an UNVALIDATED marker (the live conflict), else return the first found. Null when none.
+function findActiveMergeRunDir(home) {
+    if (!fs.existsSync(home))
+        return null;
+    let fallback = null;
+    for (const entry of fs.readdirSync(home)) {
+        if (!entry.startsWith('merge-'))
+            continue;
+        const dir = path.join(home, entry);
+        const marker = readMergeMarker(dir);
+        if (marker === null)
+            continue;
+        if (!marker.validated)
+            return dir;
+        if (fallback === null)
+            fallback = dir;
+    }
+    return fallback;
+}
 // Per-conflicted-file context dir holding A-forkpoint.txt / B-feature.txt / C-main.txt /
 // B-A.diff / C-A.diff (and the AI's merge-explanation.md). Shared so the writer
 // (saveConflictContext) and the reader (the explanation gate) agree on the layout: the conflict

package/src/scripts/workflow/merge-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge-state.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/merge-state.ts"],"names":[],"mappings":"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","sourcesContent":["import * as fs from 'fs';\nimport * as path from 'path';\nimport {\n    WEBPIECES_TMP_DIR,\n    MERGE_INFO_DIR,\n    MERGE_IN_PROGRESS_FILE,\n    MERGE_EXPLANATION_FILE,\n} from '@webpieces/rules-config';\n\n// Proof-obligation marker written when a 3-point squash-merge hits conflicts. Its mere\n// presence (with validated=false) is what the merge-in-progress-guard hook uses to block\n// commit/push/PR until `wp-finish-upsert-pr` validates the resolution and flips it true.\nexport class MergeMarker {\n    currentBranch: string;\n    squashBranch: string;\n    backupBranch: string;\n    prNumber: string;\n    conflictedFiles: string[];\n    forkPoint: string;\n    featureHead: string;\n    mainHead: string;\n    validated: boolean;\n\n    constructor(\n        currentBranch: string,\n        squashBranch: string,\n        backupBranch: string,\n        prNumber: string,\n        conflictedFiles: string[],\n        forkPoint: string,\n        featureHead: string,\n        mainHead: string,\n        validated: boolean,\n    ) {\n        this.currentBranch = currentBranch;\n        this.squashBranch = squashBranch;\n        this.backupBranch = backupBranch;\n        this.prNumber = prNumber;\n        this.conflictedFiles = conflictedFiles;\n        this.forkPoint = forkPoint;\n        this.featureHead = featureHead;\n        this.mainHead = mainHead;\n        this.validated = validated;\n    }\n}\n\nexport class MarkerScanResult {\n    clean: boolean;\n    filesWithMarkers: string[];\n\n    constructor(clean: boolean, filesWithMarkers: string[]) {\n        this.clean = clean;\n        this.filesWithMarkers = filesWithMarkers;\n    }\n}\n\nconst CONFLICT_MARKER_RE = /^(<{7}|={7}|>{7})/m;\n\nexport function mergeDirFor(repoRoot: string, featureName: string): string {\n    return path.join(repoRoot, WEBPIECES_TMP_DIR, MERGE_INFO_DIR, featureName);\n}\n\n// Per-conflicted-file context dir holding A-forkpoint.txt / B-feature.txt / C-main.txt /\n// B-A.diff / C-A.diff (and the AI's merge-explanation.md). Shared so the writer\n// (saveConflictContext) and the reader (the explanation gate) agree on the layout: the conflict\n// file path with `/` → `__`, prefixed `updatemain-`.\nexport function perFileContextDir(mergeDir: string, file: string): string {\n    return path.join(mergeDir, `updatemain-${file.replace(/\\//g, '__')}`);\n}\n\nexport function markerPath(mergeDir: string): string {\n    return path.join(mergeDir, MERGE_IN_PROGRESS_FILE);\n}\n\nexport function readMergeMarker(mergeDir: string): MergeMarker | null {\n    const filePath = markerPath(mergeDir);\n    if (!fs.existsSync(filePath)) return null;\n    const raw = JSON.parse(fs.readFileSync(filePath, 'utf8')) as MergeMarker;\n    return new MergeMarker(\n        raw.currentBranch,\n        raw.squashBranch,\n        raw.backupBranch,\n        raw.prNumber,\n        raw.conflictedFiles ?? [],\n        raw.forkPoint,\n        raw.featureHead,\n        raw.mainHead,\n        raw.validated === true,\n    );\n}\n\nexport function writeMergeMarker(mergeDir: string, marker: MergeMarker): void {\n    fs.mkdirSync(mergeDir, { recursive: true });\n    fs.writeFileSync(markerPath(mergeDir), JSON.stringify(marker, null, 2) + '\\n');\n}\n\nexport function clearMergeMarker(mergeDir: string): void {\n    const filePath = markerPath(mergeDir);\n    if (fs.existsSync(filePath)) fs.rmSync(filePath);\n}\n\n/**\n * Scoped conflict-marker scan: reads ONLY the given conflicted files (relative to repo\n * root), never the whole repo — stays O(conflicts) regardless of monorepo size.\n */\nexport function scanConflictMarkers(repoRoot: string, files: string[]): MarkerScanResult {\n    const filesWithMarkers: string[] = [];\n    for (const file of files) {\n        const abs = path.join(repoRoot, file);\n        if (!fs.existsSync(abs)) continue;\n        const content = fs.readFileSync(abs, 'utf8');\n        if (CONFLICT_MARKER_RE.test(content)) filesWithMarkers.push(file);\n    }\n    return new MarkerScanResult(filesWithMarkers.length === 0, filesWithMarkers);\n}\n\n/**\n * Explanation scan: every conflicted file the AI resolved must have a non-empty\n * MERGE_EXPLANATION_FILE sitting in its per-file context dir (next to the diffs), proving the AI\n * deliberately 3-point merged it and recording HOW. Returns the files whose explanation is\n * missing or empty. Works for every conflicted file regardless of type — including comment-less\n * files (JSON) and files resolved by deletion (no working-tree file to inspect).\n */\nexport function scanMergeExplanations(mergeDir: string, files: string[]): MarkerScanResult {\n    const filesMissingExplanation: string[] = [];\n    for (const file of files) {\n        const explPath = path.join(perFileContextDir(mergeDir, file), MERGE_EXPLANATION_FILE);\n        const present = fs.existsSync(explPath) && fs.readFileSync(explPath, 'utf8').trim() !== '';\n        if (!present) filesMissingExplanation.push(file);\n    }\n    return new MarkerScanResult(filesMissingExplanation.length === 0, filesMissingExplanation);\n}\n"]}
+{"version":3,"file":"merge-state.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/merge-state.ts"],"names":[],"mappings":"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","sourcesContent":["import * as fs from 'fs';\nimport * as path from 'path';\nimport {\n    WEBPIECES_TMP_DIR,\n    MERGE_INFO_DIR,\n    MERGE_IN_PROGRESS_FILE,\n    MERGE_EXPLANATION_FILE,\n} from '@webpieces/rules-config';\n\n// Proof-obligation marker written when a 3-point squash-merge hits conflicts. Its mere\n// presence (with validated=false) is what the merge-in-progress-guard hook uses to block\n// commit/push/PR until `wp-finish-upsert-pr` validates the resolution and flips it true.\nexport class MergeMarker {\n    currentBranch: string;\n    squashBranch: string;\n    backupBranch: string;\n    prNumber: string;\n    conflictedFiles: string[];\n    forkPoint: string;\n    featureHead: string;\n    mainHead: string;\n    validated: boolean;\n\n    constructor(\n        currentBranch: string,\n        squashBranch: string,\n        backupBranch: string,\n        prNumber: string,\n        conflictedFiles: string[],\n        forkPoint: string,\n        featureHead: string,\n        mainHead: string,\n        validated: boolean,\n    ) {\n        this.currentBranch = currentBranch;\n        this.squashBranch = squashBranch;\n        this.backupBranch = backupBranch;\n        this.prNumber = prNumber;\n        this.conflictedFiles = conflictedFiles;\n        this.forkPoint = forkPoint;\n        this.featureHead = featureHead;\n        this.mainHead = mainHead;\n        this.validated = validated;\n    }\n}\n\nexport class MarkerScanResult {\n    clean: boolean;\n    filesWithMarkers: string[];\n\n    constructor(clean: boolean, filesWithMarkers: string[]) {\n        this.clean = clean;\n        this.filesWithMarkers = filesWithMarkers;\n    }\n}\n\nconst CONFLICT_MARKER_RE = /^(<{7}|={7}|>{7})/m;\n\n// The per-feature \"home\" dir `.webpieces/merge-info/<slug>/`. It no longer holds the marker/context\n// directly — each sync gets its own numbered `merge-<n>/` run dir underneath (mergeRunDirFor), paired\n// with the sync's `<feature>PreMerge<n>` backup branch. This keeps merge N from ever reusing merge\n// N-1's stale per-file context / merge-explanation.md.\nexport function mergeDirFor(repoRoot: string, featureName: string): string {\n    return path.join(repoRoot, WEBPIECES_TMP_DIR, MERGE_INFO_DIR, featureName);\n}\n\n// The run dir for sync number `n`: `<home>/merge-<n>/`. Holds this sync's marker + per-file\n// `updatemain-<file>/` context. Numbered to match the sync's `<feature>PreMerge<n>` backup branch.\nexport function mergeRunDirFor(home: string, n: number): string {\n    return path.join(home, `merge-${n}`);\n}\n\n// Locate the in-progress merge's run dir: the `<home>/merge-*/` subdir holding a marker. There is at\n// most one (a fresh sync can't start while a merge is in progress); if more than one somehow exists,\n// prefer an UNVALIDATED marker (the live conflict), else return the first found. Null when none.\nexport function findActiveMergeRunDir(home: string): string | null {\n    if (!fs.existsSync(home)) return null;\n    let fallback: string | null = null;\n    for (const entry of fs.readdirSync(home)) {\n        if (!entry.startsWith('merge-')) continue;\n        const dir = path.join(home, entry);\n        const marker = readMergeMarker(dir);\n        if (marker === null) continue;\n        if (!marker.validated) return dir;\n        if (fallback === null) fallback = dir;\n    }\n    return fallback;\n}\n\n// Per-conflicted-file context dir holding A-forkpoint.txt / B-feature.txt / C-main.txt /\n// B-A.diff / C-A.diff (and the AI's merge-explanation.md). Shared so the writer\n// (saveConflictContext) and the reader (the explanation gate) agree on the layout: the conflict\n// file path with `/` → `__`, prefixed `updatemain-`.\nexport function perFileContextDir(mergeDir: string, file: string): string {\n    return path.join(mergeDir, `updatemain-${file.replace(/\\//g, '__')}`);\n}\n\nexport function markerPath(mergeDir: string): string {\n    return path.join(mergeDir, MERGE_IN_PROGRESS_FILE);\n}\n\nexport function readMergeMarker(mergeDir: string): MergeMarker | null {\n    const filePath = markerPath(mergeDir);\n    if (!fs.existsSync(filePath)) return null;\n    const raw = JSON.parse(fs.readFileSync(filePath, 'utf8')) as MergeMarker;\n    return new MergeMarker(\n        raw.currentBranch,\n        raw.squashBranch,\n        raw.backupBranch,\n        raw.prNumber,\n        raw.conflictedFiles ?? [],\n        raw.forkPoint,\n        raw.featureHead,\n        raw.mainHead,\n        raw.validated === true,\n    );\n}\n\nexport function writeMergeMarker(mergeDir: string, marker: MergeMarker): void {\n    fs.mkdirSync(mergeDir, { recursive: true });\n    fs.writeFileSync(markerPath(mergeDir), JSON.stringify(marker, null, 2) + '\\n');\n}\n\nexport function clearMergeMarker(mergeDir: string): void {\n    const filePath = markerPath(mergeDir);\n    if (fs.existsSync(filePath)) fs.rmSync(filePath);\n}\n\n/**\n * Scoped conflict-marker scan: reads ONLY the given conflicted files (relative to repo\n * root), never the whole repo — stays O(conflicts) regardless of monorepo size.\n */\nexport function scanConflictMarkers(repoRoot: string, files: string[]): MarkerScanResult {\n    const filesWithMarkers: string[] = [];\n    for (const file of files) {\n        const abs = path.join(repoRoot, file);\n        if (!fs.existsSync(abs)) continue;\n        const content = fs.readFileSync(abs, 'utf8');\n        if (CONFLICT_MARKER_RE.test(content)) filesWithMarkers.push(file);\n    }\n    return new MarkerScanResult(filesWithMarkers.length === 0, filesWithMarkers);\n}\n\n/**\n * Explanation scan: every conflicted file the AI resolved must have a non-empty\n * MERGE_EXPLANATION_FILE sitting in its per-file context dir (next to the diffs), proving the AI\n * deliberately 3-point merged it and recording HOW. Returns the files whose explanation is\n * missing or empty. Works for every conflicted file regardless of type — including comment-less\n * files (JSON) and files resolved by deletion (no working-tree file to inspect).\n */\nexport function scanMergeExplanations(mergeDir: string, files: string[]): MarkerScanResult {\n    const filesMissingExplanation: string[] = [];\n    for (const file of files) {\n        const explPath = path.join(perFileContextDir(mergeDir, file), MERGE_EXPLANATION_FILE);\n        const present = fs.existsSync(explPath) && fs.readFileSync(explPath, 'utf8').trim() !== '';\n        if (!present) filesMissingExplanation.push(file);\n    }\n    return new MarkerScanResult(filesMissingExplanation.length === 0, filesMissingExplanation);\n}\n"]}

package/src/scripts/workflow/open-pr-check.js

@@ -6,7 +6,7 @@ const rules_config_1 = require("@webpieces/rules-config");
 const branch_naming_1 = require("./branch-naming");
 const SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n';
 // The open PR (if any) tracking a feature branch, looked up by its STABLE base name (the PR always
-// lives on `base`, never on the numbered generation basewp2/basewp3/…). Returns '' ONLY when GitHub
+// lives on the stable feature name, and a leftover `…wpN` still resolves there). Returns '' ONLY when GitHub
 // answered and there is genuinely no open PR.
 //
 // This is a HARD GATE, not an advisory hint: it FAILS FAST if `gh` cannot answer (not installed, not

package/src/scripts/workflow/open-pr-check.js.map

@@ -1 +1 @@
-{"version":3,"file":"open-pr-check.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/open-pr-check.ts"],"names":[],"mappings":";;AAeA,0CAkBC;AAjCD,iDAA0C;AAC1C,0DAAuD;AACvD,mDAAiD;AAEjD,MAAM,GAAG,GAAG,0DAA0D,CAAC;AAEvE,mGAAmG;AACnG,oGAAoG;AACpG,8CAA8C;AAC9C,EAAE;AACF,qGAAqG;AACrG,qGAAqG;AACrG,sGAAsG;AACtG,iGAAiG;AACjG,qCAAqC;AACrC,SAAgB,eAAe,CAAC,QAAgB,EAAE,aAAqB;IACnE,MAAM,IAAI,GAAG,IAAA,8BAAc,EAAC,aAAa,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,IAAA,yBAAS,EACpB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAClG,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,CACtC,CAAC;IACF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC;QAC5G,MAAM,IAAI,2BAAY,CAAC,CAAC,EACpB,IAAI,GAAG,GAAG,GAAG,oEAAoE,GAAG,GAAG,GAAG,IAAI;YAC9F,8BAA8B,IAAI,MAAM,MAAM,MAAM;YACpD,6FAA6F;YAC7F,8FAA8F;YAC9F,4FAA4F;YAC5F,+EAA+E,CAClF,CAAC;IACN,CAAC;IACD,OAAO,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AACxC,CAAC","sourcesContent":["import { spawnSync } from 'child_process';\nimport { CliExitError } from '@webpieces/rules-config';\nimport { baseBranchName } from './branch-naming';\n\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\n';\n\n// The open PR (if any) tracking a feature branch, looked up by its STABLE base name (the PR always\n// lives on `base`, never on the numbered generation basewp2/basewp3/…). Returns '' ONLY when GitHub\n// answered and there is genuinely no open PR.\n//\n// This is a HARD GATE, not an advisory hint: it FAILS FAST if `gh` cannot answer (not installed, not\n// authenticated, offline). We must NOT degrade \"couldn't ask GitHub\" into \"no PR\" — a 3-point update\n// makes a new branch generation and the existing PR would be left pointing at the OLD branch (stale),\n// so running wp-update-start blind when a PR might exist is exactly the disaster we are guarding\n// against. Refuse rather than guess.\nexport function openPrForBranch(repoRoot: string, currentBranch: string): string {\n    const base = baseBranchName(currentBranch);\n    const result = spawnSync(\n        'gh', ['pr', 'list', '--head', base, '--state', 'open', '--json', 'number', '--jq', '.[0].number'],\n        { cwd: repoRoot, encoding: 'utf8' },\n    );\n    if (result.status !== 0) {\n        const detail = (result.stderr ?? '').trim() || (result.error ? result.error.message : 'gh exited non-zero');\n        throw new CliExitError(2,\n            '\\n' + SEP + '❌ Could not ask GitHub whether an open PR exists for this branch\\n' + SEP + '\\n' +\n            `gh failed for base branch \"${base}\": ${detail}\\n\\n` +\n            'This check must NOT be skipped: a 3-point update creates a NEW branch generation, so if a\\n' +\n            'PR already exists, wp-update-start would leave it pointing at the OLD branch. Fix gh first\\n' +\n            '(install / `gh auth login` / restore network), then re-run — or, if a PR does exist, use\\n' +\n            'the PR flow: pnpm wp-start-upsert-pr → /wp-merge → pnpm wp-finish-upsert-pr\\n',\n        );\n    }\n    return (result.stdout ?? '').trim();\n}\n"]}
+{"version":3,"file":"open-pr-check.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/open-pr-check.ts"],"names":[],"mappings":";;AAeA,0CAkBC;AAjCD,iDAA0C;AAC1C,0DAAuD;AACvD,mDAAiD;AAEjD,MAAM,GAAG,GAAG,0DAA0D,CAAC;AAEvE,mGAAmG;AACnG,6GAA6G;AAC7G,8CAA8C;AAC9C,EAAE;AACF,qGAAqG;AACrG,qGAAqG;AACrG,sGAAsG;AACtG,iGAAiG;AACjG,qCAAqC;AACrC,SAAgB,eAAe,CAAC,QAAgB,EAAE,aAAqB;IACnE,MAAM,IAAI,GAAG,IAAA,8BAAc,EAAC,aAAa,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,IAAA,yBAAS,EACpB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,EAClG,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,CACtC,CAAC;IACF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC;QAC5G,MAAM,IAAI,2BAAY,CAAC,CAAC,EACpB,IAAI,GAAG,GAAG,GAAG,oEAAoE,GAAG,GAAG,GAAG,IAAI;YAC9F,8BAA8B,IAAI,MAAM,MAAM,MAAM;YACpD,6FAA6F;YAC7F,8FAA8F;YAC9F,4FAA4F;YAC5F,+EAA+E,CAClF,CAAC;IACN,CAAC;IACD,OAAO,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AACxC,CAAC","sourcesContent":["import { spawnSync } from 'child_process';\nimport { CliExitError } from '@webpieces/rules-config';\nimport { baseBranchName } from './branch-naming';\n\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\n';\n\n// The open PR (if any) tracking a feature branch, looked up by its STABLE base name (the PR always\n// lives on the stable feature name, and a leftover `…wpN` still resolves there). Returns '' ONLY when GitHub\n// answered and there is genuinely no open PR.\n//\n// This is a HARD GATE, not an advisory hint: it FAILS FAST if `gh` cannot answer (not installed, not\n// authenticated, offline). We must NOT degrade \"couldn't ask GitHub\" into \"no PR\" — a 3-point update\n// makes a new branch generation and the existing PR would be left pointing at the OLD branch (stale),\n// so running wp-update-start blind when a PR might exist is exactly the disaster we are guarding\n// against. Refuse rather than guess.\nexport function openPrForBranch(repoRoot: string, currentBranch: string): string {\n    const base = baseBranchName(currentBranch);\n    const result = spawnSync(\n        'gh', ['pr', 'list', '--head', base, '--state', 'open', '--json', 'number', '--jq', '.[0].number'],\n        { cwd: repoRoot, encoding: 'utf8' },\n    );\n    if (result.status !== 0) {\n        const detail = (result.stderr ?? '').trim() || (result.error ? result.error.message : 'gh exited non-zero');\n        throw new CliExitError(2,\n            '\\n' + SEP + '❌ Could not ask GitHub whether an open PR exists for this branch\\n' + SEP + '\\n' +\n            `gh failed for base branch \"${base}\": ${detail}\\n\\n` +\n            'This check must NOT be skipped: a 3-point update creates a NEW branch generation, so if a\\n' +\n            'PR already exists, wp-update-start would leave it pointing at the OLD branch. Fix gh first\\n' +\n            '(install / `gh auth login` / restore network), then re-run — or, if a PR does exist, use\\n' +\n            'the PR flow: pnpm wp-start-upsert-pr → /wp-merge → pnpm wp-finish-upsert-pr\\n',\n        );\n    }\n    return (result.stdout ?? '').trim();\n}\n"]}

package/src/scripts/workflow/run-update.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runUpdateFromMain = runUpdateFromMain;
-const tslib_1 = require("tslib");
-const fs = tslib_1.__importStar(require("fs"));
 const rules_config_1 = require("@webpieces/rules-config");
 const git_readAiBranchName_1 = require("./git-readAiBranchName");
 const merge_state_1 = require("./merge-state");
@@ -17,23 +15,24 @@ async function runUpdateFromMain(repoRoot, verb, finishCommand) {
     return outcome;
 }
 async function runUpdate(repoRoot, verb, finishCommand) {
-    const mergeDir = (0, merge_state_1.mergeDirFor)(repoRoot, (0, git_readAiBranchName_1.getFeatureName)());
-    fs.mkdirSync(mergeDir, { recursive: true });
-    // Resume path: a marker means a merge is already in progress.
-    const existing = (0, merge_state_1.readMergeMarker)(mergeDir);
-    if (existing) {
-        if (!existing.validated)
+    const home = (0, merge_state_1.mergeDirFor)(repoRoot, (0, git_readAiBranchName_1.getFeatureName)());
+    // Resume path: an in-progress merge is the `merge-<n>/` run dir that holds a marker.
+    const activeDir = (0, merge_state_1.findActiveMergeRunDir)(home);
+    if (activeDir) {
+        const existing = (0, merge_state_1.readMergeMarker)(activeDir);
+        if (existing === null || !existing.validated)
             return 'unvalidatedResume';
-        // Already validated → just finalize the branch swap.
-        await (0, merge_end_1.mergeEnd)(repoRoot, verb, mergeDir, new merge_start_1.MergeContext(existing.currentBranch, existing.squashBranch, existing.backupBranch, existing.prNumber), null);
+        // Already validated → just finalize the branch swap (reads THIS run dir's marker).
+        await (0, merge_end_1.mergeEnd)(repoRoot, verb, activeDir, new merge_start_1.MergeContext(existing.currentBranch, existing.squashBranch, existing.backupBranch, existing.prNumber), null);
         return 'finalized';
     }
-    // Fresh update: start, then finalize on clean / hand back on conflict.
-    const result = await (0, merge_start_1.mergeStart)(repoRoot, verb, mergeDir, finishCommand);
+    // Fresh update: mergeStart picks the slot number, creates its own `merge-<n>/` run dir, and
+    // returns that path for merge-END to finalize against.
+    const result = await (0, merge_start_1.mergeStart)(repoRoot, verb, home, finishCommand);
     if (result.status === 'conflict' || result.context === null) {
         return 'conflict';
     }
-    await (0, merge_end_1.mergeEnd)(repoRoot, verb, mergeDir, result.context, null);
+    await (0, merge_end_1.mergeEnd)(repoRoot, verb, result.runDir, result.context, null);
     return 'finalized';
 }
 //# sourceMappingURL=run-update.js.map

package/src/scripts/workflow/run-update.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-update.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/run-update.ts"],"names":[],"mappings":";;AAsBA,8CAOC;;AA7BD,+CAAyB;AACzB,0DAA+F;AAC/F,iEAAwD;AACxD,+CAA6D;AAC7D,+CAAyD;AACzD,2CAAuC;AAiBhC,KAAK,UAAU,iBAAiB,CAAC,QAAgB,EAAE,IAAkB,EAAE,aAAqB;IAC/F,IAAA,gCAAiB,EAAC,QAAQ,EAAE,IAAI,kCAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACpE,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;IAC/D,MAAM,GAAG,GAAG,IAAI,kCAAmB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACjD,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC;IACtB,IAAA,gCAAiB,EAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACjC,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,QAAgB,EAAE,IAAkB,EAAE,aAAqB;IAChF,MAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC,QAAQ,EAAE,IAAA,qCAAc,GAAE,CAAC,CAAC;IACzD,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE5C,8DAA8D;IAC9D,MAAM,QAAQ,GAAG,IAAA,6BAAe,EAAC,QAAQ,CAAC,CAAC;IAC3C,IAAI,QAAQ,EAAE,CAAC;QACX,IAAI,CAAC,QAAQ,CAAC,SAAS;YAAE,OAAO,mBAAmB,CAAC;QACpD,qDAAqD;QACrD,MAAM,IAAA,oBAAQ,EACV,QAAQ,EAAE,IAAI,EAAE,QAAQ,EACxB,IAAI,0BAAY,CAAC,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,QAAQ,CAAC,EACzG,IAAI,CACP,CAAC;QACF,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,uEAAuE;IACvE,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAU,EAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;IACzE,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;QAC1D,OAAO,UAAU,CAAC;IACtB,CAAC;IACD,MAAM,IAAA,oBAAQ,EAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC/D,OAAO,WAAW,CAAC;AACvB,CAAC","sourcesContent":["import * as fs from 'fs';\nimport { MutationVerb, BranchMutationEvent, logBranchMutation } from '@webpieces/rules-config';\nimport { getFeatureName } from './git-readAiBranchName';\nimport { mergeDirFor, readMergeMarker } from './merge-state';\nimport { mergeStart, MergeContext } from './merge-start';\nimport { mergeEnd } from './merge-end';\n\n// The shared \"sync this feature branch from main\" engine — a thin composition of the two lifecycle\n// primitives (merge-START brings main in, merge-END finalizes). It is an INTERNAL function, not a\n// bin: `wp-update-start` (standalone) and `wp-start-upsert-pr` (PR flow) both call it. It NEVER\n// creates a PR and — unlike the old wp-git-update bin — it does NOT process.exit; it RETURNS an\n// outcome so each caller can print the handoff that fits its context.\n//\n// `finishCommand` is the command the AI is told to run after resolving conflicts — the standalone\n// caller passes `wp-update-end`, the PR flow passes `wp-finish-upsert-pr`.\n//\n// `verb` is the invoking bin, threaded through purely so every branch mutation (backup, checkout,\n// pull, squash, rename) is recorded in `.webpieces/hooks/branch-mutations.log` under the command the\n// user actually ran — the audit trail that used to exist only in `git reflog`.\n\nexport type UpdateOutcome = 'finalized' | 'conflict' | 'unvalidatedResume';\n\nexport async function runUpdateFromMain(repoRoot: string, verb: MutationVerb, finishCommand: string): Promise<UpdateOutcome> {\n    logBranchMutation(repoRoot, new BranchMutationEvent(verb, 'START'));\n    const outcome = await runUpdate(repoRoot, verb, finishCommand);\n    const end = new BranchMutationEvent(verb, 'END');\n    end.outcome = outcome;\n    logBranchMutation(repoRoot, end);\n    return outcome;\n}\n\nasync function runUpdate(repoRoot: string, verb: MutationVerb, finishCommand: string): Promise<UpdateOutcome> {\n    const mergeDir = mergeDirFor(repoRoot, getFeatureName());\n    fs.mkdirSync(mergeDir, { recursive: true });\n\n    // Resume path: a marker means a merge is already in progress.\n    const existing = readMergeMarker(mergeDir);\n    if (existing) {\n        if (!existing.validated) return 'unvalidatedResume';\n        // Already validated → just finalize the branch swap.\n        await mergeEnd(\n            repoRoot, verb, mergeDir,\n            new MergeContext(existing.currentBranch, existing.squashBranch, existing.backupBranch, existing.prNumber),\n            null,\n        );\n        return 'finalized';\n    }\n\n    // Fresh update: start, then finalize on clean / hand back on conflict.\n    const result = await mergeStart(repoRoot, verb, mergeDir, finishCommand);\n    if (result.status === 'conflict' || result.context === null) {\n        return 'conflict';\n    }\n    await mergeEnd(repoRoot, verb, mergeDir, result.context, null);\n    return 'finalized';\n}\n"]}
+{"version":3,"file":"run-update.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/run-update.ts"],"names":[],"mappings":";;AAqBA,8CAOC;AA5BD,0DAA+F;AAC/F,iEAAwD;AACxD,+CAAoF;AACpF,+CAAyD;AACzD,2CAAuC;AAiBhC,KAAK,UAAU,iBAAiB,CAAC,QAAgB,EAAE,IAAkB,EAAE,aAAqB;IAC/F,IAAA,gCAAiB,EAAC,QAAQ,EAAE,IAAI,kCAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACpE,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;IAC/D,MAAM,GAAG,GAAG,IAAI,kCAAmB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACjD,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC;IACtB,IAAA,gCAAiB,EAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACjC,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,QAAgB,EAAE,IAAkB,EAAE,aAAqB;IAChF,MAAM,IAAI,GAAG,IAAA,yBAAW,EAAC,QAAQ,EAAE,IAAA,qCAAc,GAAE,CAAC,CAAC;IAErD,qFAAqF;IACrF,MAAM,SAAS,GAAG,IAAA,mCAAqB,EAAC,IAAI,CAAC,CAAC;IAC9C,IAAI,SAAS,EAAE,CAAC;QACZ,MAAM,QAAQ,GAAG,IAAA,6BAAe,EAAC,SAAS,CAAC,CAAC;QAC5C,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS;YAAE,OAAO,mBAAmB,CAAC;QACzE,mFAAmF;QACnF,MAAM,IAAA,oBAAQ,EACV,QAAQ,EAAE,IAAI,EAAE,SAAS,EACzB,IAAI,0BAAY,CAAC,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,QAAQ,CAAC,EACzG,IAAI,CACP,CAAC;QACF,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,4FAA4F;IAC5F,uDAAuD;IACvD,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAU,EAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;IACrE,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;QAC1D,OAAO,UAAU,CAAC;IACtB,CAAC;IACD,MAAM,IAAA,oBAAQ,EAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACpE,OAAO,WAAW,CAAC;AACvB,CAAC","sourcesContent":["import { MutationVerb, BranchMutationEvent, logBranchMutation } from '@webpieces/rules-config';\nimport { getFeatureName } from './git-readAiBranchName';\nimport { mergeDirFor, readMergeMarker, findActiveMergeRunDir } from './merge-state';\nimport { mergeStart, MergeContext } from './merge-start';\nimport { mergeEnd } from './merge-end';\n\n// The shared \"sync this feature branch from main\" engine — a thin composition of the two lifecycle\n// primitives (merge-START brings main in, merge-END finalizes). It is an INTERNAL function, not a\n// bin: `wp-update-start` (standalone) and `wp-start-upsert-pr` (PR flow) both call it. It NEVER\n// creates a PR and — unlike the old wp-git-update bin — it does NOT process.exit; it RETURNS an\n// outcome so each caller can print the handoff that fits its context.\n//\n// `finishCommand` is the command the AI is told to run after resolving conflicts — the standalone\n// caller passes `wp-update-end`, the PR flow passes `wp-finish-upsert-pr`.\n//\n// `verb` is the invoking bin, threaded through purely so every branch mutation (backup, checkout,\n// pull, squash, rename) is recorded in `.webpieces/hooks/branch-mutations.log` under the command the\n// user actually ran — the audit trail that used to exist only in `git reflog`.\n\nexport type UpdateOutcome = 'finalized' | 'conflict' | 'unvalidatedResume';\n\nexport async function runUpdateFromMain(repoRoot: string, verb: MutationVerb, finishCommand: string): Promise<UpdateOutcome> {\n    logBranchMutation(repoRoot, new BranchMutationEvent(verb, 'START'));\n    const outcome = await runUpdate(repoRoot, verb, finishCommand);\n    const end = new BranchMutationEvent(verb, 'END');\n    end.outcome = outcome;\n    logBranchMutation(repoRoot, end);\n    return outcome;\n}\n\nasync function runUpdate(repoRoot: string, verb: MutationVerb, finishCommand: string): Promise<UpdateOutcome> {\n    const home = mergeDirFor(repoRoot, getFeatureName());\n\n    // Resume path: an in-progress merge is the `merge-<n>/` run dir that holds a marker.\n    const activeDir = findActiveMergeRunDir(home);\n    if (activeDir) {\n        const existing = readMergeMarker(activeDir);\n        if (existing === null || !existing.validated) return 'unvalidatedResume';\n        // Already validated → just finalize the branch swap (reads THIS run dir's marker).\n        await mergeEnd(\n            repoRoot, verb, activeDir,\n            new MergeContext(existing.currentBranch, existing.squashBranch, existing.backupBranch, existing.prNumber),\n            null,\n        );\n        return 'finalized';\n    }\n\n    // Fresh update: mergeStart picks the slot number, creates its own `merge-<n>/` run dir, and\n    // returns that path for merge-END to finalize against.\n    const result = await mergeStart(repoRoot, verb, home, finishCommand);\n    if (result.status === 'conflict' || result.context === null) {\n        return 'conflict';\n    }\n    await mergeEnd(repoRoot, verb, result.runDir, result.context, null);\n    return 'finalized';\n}\n"]}

package/src/scripts/wp-start-upsert-pr.js

@@ -33,7 +33,8 @@ async function main() {
     // uncommitted change build green yet push a stale commit. Fail early with instructions if dirty.
     (0, git_exec_1.assertCleanTree)(repoRoot);
     await updateBranchFromMain(repoRoot);
-    // Local branch may be a numbered generation (base2/…); the remote/PR branch is the stable base.
+    // Local branch, remote branch, and PR share the one stable feature name (baseBranchName also
+    // tolerates a leftover `…wpN` from the old scheme).
     (0, git_exec_1.ensurePushed)((0, branch_naming_1.baseBranchName)((0, child_process_1.execSync)('git branch --show-current', { encoding: 'utf8' }).trim()));
     // Advisory build gate — early feedback before the AI writes review.json. wp-finish-upsert-pr runs
     // the authoritative one. Both go through the same shared runBuildGate (only the framing differs).

package/src/scripts/wp-start-upsert-pr.js.map

@@ -1 +1 @@
-{"version":3,"file":"wp-start-upsert-pr.js","sourceRoot":"","sources":["../../../../../../packages/tooling/pr-gate/src/scripts/wp-start-upsert-pr.ts"],"names":[],"mappings":";;;AA6BA,oBA6BC;AAzDD,iDAAyC;AACzC,0DAAqH;AACrH,0EAAiE;AACjE,4DAA0D;AAC1D,8DAA2E;AAC3E,kDAAoE;AACpE,sDAA0D;AAE1D,mGAAmG;AACnG,gGAAgG;AAChG,mGAAmG;AACnG,4FAA4F;AAE5F,MAAM,GAAG,GAAG,0DAA0D,CAAC;AAEvE,gGAAgG;AAChG,mGAAmG;AACnG,0EAA0E;AAC1E,KAAK,UAAU,oBAAoB,CAAC,QAAgB;IAChD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,GAAG,+BAA+B,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC;IAChF,MAAM,OAAO,GAAG,MAAM,IAAA,8BAAiB,EAAC,QAAQ,EAAE,oBAAoB,EAAE,qBAAqB,CAAC,CAAC;IAC/F,IAAI,OAAO,KAAK,UAAU,IAAI,OAAO,KAAK,mBAAmB,EAAE,CAAC;QAC5D,MAAM,IAAI,2BAAY,CAAC,CAAC,EACpB,iHAAiH,CACpH,CAAC;IACN,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,IAAI;IACtB,MAAM,QAAQ,GAAG,IAAA,wBAAQ,EAAC,+BAA+B,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACxF,gGAAgG;IAChG,IAAA,4BAAa,EAAC,QAAQ,EAAE,2BAA2B,CAAC,CAAC;IAErD,iGAAiG;IACjG,mGAAmG;IACnG,iGAAiG;IACjG,IAAA,0BAAe,EAAC,QAAQ,CAAC,CAAC;IAE1B,MAAM,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IACrC,gGAAgG;IAChG,IAAA,uBAAY,EAAC,IAAA,8BAAc,EAAC,IAAA,wBAAQ,EAAC,2BAA2B,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAEjG,kGAAkG;IAClG,kGAAkG;IAClG,IAAA,6BAAY,EAAC,QAAQ,EAAE,IAAI,iCAAgB,CACvC,4BAA4B,EAAE,yBAAyB,EAAE,yCAAyC,CACrG,CAAC,CAAC;IAEH,sFAAsF;IACtF,MAAM,UAAU,GAAG,IAAA,6BAAc,EAAC,QAAQ,EAAE,IAAA,qCAAc,GAAE,CAAC,CAAC;IAC9D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,GAAG,gCAAgC,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC;IACjF,OAAO,CAAC,MAAM,CAAC,KAAK,CAChB,yFAAyF;QACzF,GAAG,IAAA,mCAAoB,EAAC,UAAU,CAAC,MAAM;QACzC,uCAAuC;QACvC,+GAA+G,CAClH,CAAC;AACN,CAAC;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM;IAAE,IAAA,sBAAO,EAAC,IAAI,CAAC,CAAC","sourcesContent":["#!/usr/bin/env node\nimport { execSync } from 'child_process';\nimport { reviewJsonPath, reviewJsonSchemaHint, writeTemplate, CliExitError, runMain } from '@webpieces/rules-config';\nimport { getFeatureName } from './workflow/git-readAiBranchName';\nimport { baseBranchName } from './workflow/branch-naming';\nimport { runBuildGate, BuildGateOptions } from './workflow/build-affected';\nimport { assertCleanTree, ensurePushed } from './workflow/git-exec';\nimport { runUpdateFromMain } from './workflow/run-update';\n\n// START of the AI-first PR flow (webpieces is AI-driven, so we invert trytami's human-first flow):\n// this command does the deterministic setup — update from main, push, run the build gate — then\n// hands the AI instructions to WRITE review.json and run `wp-finish-upsert-pr` (which reads it and\n// posts the PR). This command NEVER creates/updates a PR; all `gh` posting lives in finish.\n\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\n';\n\n// Step A — bring the branch up to date with main via the shared 3-point engine (in-process). On\n// conflict the merge process doc it writes names `wp-finish-upsert-pr` as the finish command (this\n// PR flow's finish, which validates + finalizes + builds + posts the PR).\nasync function updateBranchFromMain(repoRoot: string): Promise<void> {\n    process.stdout.write('\\n' + SEP + '① Updating branch from main\\n' + SEP + '\\n');\n    const outcome = await runUpdateFromMain(repoRoot, 'wp-start-upsert-pr', 'wp-finish-upsert-pr');\n    if (outcome === 'conflict' || outcome === 'unvalidatedResume') {\n        throw new CliExitError(2,\n            '\\n⏸️  Conflicts — resolve them, then run pnpm wp-finish-upsert-pr (it validates the merge AND finishes the PR).',\n        );\n    }\n}\n\nexport async function main(): Promise<void> {\n    const repoRoot = execSync('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();\n    // Refresh the AI-facing workflow doc so it's present + current for any failure message to cite.\n    writeTemplate(repoRoot, 'webpieces.git-workflow.md');\n\n    // Precondition: a fully-committed tree. This flow updates, pushes HEAD, and builds — the tooling\n    // must not commit your work for you, and pushing HEAD while building the working tree would let an\n    // uncommitted change build green yet push a stale commit. Fail early with instructions if dirty.\n    assertCleanTree(repoRoot);\n\n    await updateBranchFromMain(repoRoot);\n    // Local branch may be a numbered generation (base2/…); the remote/PR branch is the stable base.\n    ensurePushed(baseBranchName(execSync('git branch --show-current', { encoding: 'utf8' }).trim()));\n\n    // Advisory build gate — early feedback before the AI writes review.json. wp-finish-upsert-pr runs\n    // the authoritative one. Both go through the same shared runBuildGate (only the framing differs).\n    runBuildGate(repoRoot, new BuildGateOptions(\n        '② Build gate (nx affected)', 'pnpm wp-start-upsert-pr', 'Build failed — fix it before reviewing.',\n    ));\n\n    // Hand the AI its next step: write review.json, then run finish (which posts the PR).\n    const reviewPath = reviewJsonPath(repoRoot, getFeatureName());\n    process.stdout.write('\\n' + SEP + '③ Review the PR, then finish\\n' + SEP + '\\n');\n    process.stdout.write(\n        `Branch is updated, pushed, and the build gate passed. Now review your own changes and\\n` +\n        `${reviewJsonSchemaHint(reviewPath)}\\n\\n` +\n        `Then run:  pnpm wp-finish-upsert-pr\\n` +\n        `(It re-validates the build, renders the dashboard with your risk/violations, and creates/updates the PR.)\\n\\n`,\n    );\n}\n\nif (require.main === module) runMain(main);\n"]}
+{"version":3,"file":"wp-start-upsert-pr.js","sourceRoot":"","sources":["../../../../../../packages/tooling/pr-gate/src/scripts/wp-start-upsert-pr.ts"],"names":[],"mappings":";;;AA6BA,oBA8BC;AA1DD,iDAAyC;AACzC,0DAAqH;AACrH,0EAAiE;AACjE,4DAA0D;AAC1D,8DAA2E;AAC3E,kDAAoE;AACpE,sDAA0D;AAE1D,mGAAmG;AACnG,gGAAgG;AAChG,mGAAmG;AACnG,4FAA4F;AAE5F,MAAM,GAAG,GAAG,0DAA0D,CAAC;AAEvE,gGAAgG;AAChG,mGAAmG;AACnG,0EAA0E;AAC1E,KAAK,UAAU,oBAAoB,CAAC,QAAgB;IAChD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,GAAG,+BAA+B,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC;IAChF,MAAM,OAAO,GAAG,MAAM,IAAA,8BAAiB,EAAC,QAAQ,EAAE,oBAAoB,EAAE,qBAAqB,CAAC,CAAC;IAC/F,IAAI,OAAO,KAAK,UAAU,IAAI,OAAO,KAAK,mBAAmB,EAAE,CAAC;QAC5D,MAAM,IAAI,2BAAY,CAAC,CAAC,EACpB,iHAAiH,CACpH,CAAC;IACN,CAAC;AACL,CAAC;AAEM,KAAK,UAAU,IAAI;IACtB,MAAM,QAAQ,GAAG,IAAA,wBAAQ,EAAC,+BAA+B,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACxF,gGAAgG;IAChG,IAAA,4BAAa,EAAC,QAAQ,EAAE,2BAA2B,CAAC,CAAC;IAErD,iGAAiG;IACjG,mGAAmG;IACnG,iGAAiG;IACjG,IAAA,0BAAe,EAAC,QAAQ,CAAC,CAAC;IAE1B,MAAM,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IACrC,6FAA6F;IAC7F,oDAAoD;IACpD,IAAA,uBAAY,EAAC,IAAA,8BAAc,EAAC,IAAA,wBAAQ,EAAC,2BAA2B,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAEjG,kGAAkG;IAClG,kGAAkG;IAClG,IAAA,6BAAY,EAAC,QAAQ,EAAE,IAAI,iCAAgB,CACvC,4BAA4B,EAAE,yBAAyB,EAAE,yCAAyC,CACrG,CAAC,CAAC;IAEH,sFAAsF;IACtF,MAAM,UAAU,GAAG,IAAA,6BAAc,EAAC,QAAQ,EAAE,IAAA,qCAAc,GAAE,CAAC,CAAC;IAC9D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,GAAG,gCAAgC,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC;IACjF,OAAO,CAAC,MAAM,CAAC,KAAK,CAChB,yFAAyF;QACzF,GAAG,IAAA,mCAAoB,EAAC,UAAU,CAAC,MAAM;QACzC,uCAAuC;QACvC,+GAA+G,CAClH,CAAC;AACN,CAAC;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM;IAAE,IAAA,sBAAO,EAAC,IAAI,CAAC,CAAC","sourcesContent":["#!/usr/bin/env node\nimport { execSync } from 'child_process';\nimport { reviewJsonPath, reviewJsonSchemaHint, writeTemplate, CliExitError, runMain } from '@webpieces/rules-config';\nimport { getFeatureName } from './workflow/git-readAiBranchName';\nimport { baseBranchName } from './workflow/branch-naming';\nimport { runBuildGate, BuildGateOptions } from './workflow/build-affected';\nimport { assertCleanTree, ensurePushed } from './workflow/git-exec';\nimport { runUpdateFromMain } from './workflow/run-update';\n\n// START of the AI-first PR flow (webpieces is AI-driven, so we invert trytami's human-first flow):\n// this command does the deterministic setup — update from main, push, run the build gate — then\n// hands the AI instructions to WRITE review.json and run `wp-finish-upsert-pr` (which reads it and\n// posts the PR). This command NEVER creates/updates a PR; all `gh` posting lives in finish.\n\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\n';\n\n// Step A — bring the branch up to date with main via the shared 3-point engine (in-process). On\n// conflict the merge process doc it writes names `wp-finish-upsert-pr` as the finish command (this\n// PR flow's finish, which validates + finalizes + builds + posts the PR).\nasync function updateBranchFromMain(repoRoot: string): Promise<void> {\n    process.stdout.write('\\n' + SEP + '① Updating branch from main\\n' + SEP + '\\n');\n    const outcome = await runUpdateFromMain(repoRoot, 'wp-start-upsert-pr', 'wp-finish-upsert-pr');\n    if (outcome === 'conflict' || outcome === 'unvalidatedResume') {\n        throw new CliExitError(2,\n            '\\n⏸️  Conflicts — resolve them, then run pnpm wp-finish-upsert-pr (it validates the merge AND finishes the PR).',\n        );\n    }\n}\n\nexport async function main(): Promise<void> {\n    const repoRoot = execSync('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();\n    // Refresh the AI-facing workflow doc so it's present + current for any failure message to cite.\n    writeTemplate(repoRoot, 'webpieces.git-workflow.md');\n\n    // Precondition: a fully-committed tree. This flow updates, pushes HEAD, and builds — the tooling\n    // must not commit your work for you, and pushing HEAD while building the working tree would let an\n    // uncommitted change build green yet push a stale commit. Fail early with instructions if dirty.\n    assertCleanTree(repoRoot);\n\n    await updateBranchFromMain(repoRoot);\n    // Local branch, remote branch, and PR share the one stable feature name (baseBranchName also\n    // tolerates a leftover `…wpN` from the old scheme).\n    ensurePushed(baseBranchName(execSync('git branch --show-current', { encoding: 'utf8' }).trim()));\n\n    // Advisory build gate — early feedback before the AI writes review.json. wp-finish-upsert-pr runs\n    // the authoritative one. Both go through the same shared runBuildGate (only the framing differs).\n    runBuildGate(repoRoot, new BuildGateOptions(\n        '② Build gate (nx affected)', 'pnpm wp-start-upsert-pr', 'Build failed — fix it before reviewing.',\n    ));\n\n    // Hand the AI its next step: write review.json, then run finish (which posts the PR).\n    const reviewPath = reviewJsonPath(repoRoot, getFeatureName());\n    process.stdout.write('\\n' + SEP + '③ Review the PR, then finish\\n' + SEP + '\\n');\n    process.stdout.write(\n        `Branch is updated, pushed, and the build gate passed. Now review your own changes and\\n` +\n        `${reviewJsonSchemaHint(reviewPath)}\\n\\n` +\n        `Then run:  pnpm wp-finish-upsert-pr\\n` +\n        `(It re-validates the build, renders the dashboard with your risk/violations, and creates/updates the PR.)\\n\\n`,\n    );\n}\n\nif (require.main === module) runMain(main);\n"]}

package/src/scripts/wp-update-end.js

@@ -16,16 +16,18 @@ const merge_start_1 = require("./workflow/merge-start");
 // progress (a clean `wp-update-start` finalizes on its own — there is nothing left for this to do).
 async function main() {
     const repoRoot = (0, child_process_1.execSync)('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();
-    const mergeDir = (0, merge_state_1.mergeDirFor)(repoRoot, (0, git_readAiBranchName_1.getFeatureName)());
-    const marker = (0, merge_state_1.readMergeMarker)(mergeDir);
-    if (!marker) {
+    const home = (0, merge_state_1.mergeDirFor)(repoRoot, (0, git_readAiBranchName_1.getFeatureName)());
+    // The in-progress merge is the `merge-<n>/` run dir holding a marker.
+    const activeDir = (0, merge_state_1.findActiveMergeRunDir)(home);
+    const marker = activeDir ? (0, merge_state_1.readMergeMarker)(activeDir) : null;
+    if (!activeDir || !marker) {
         throw new rules_config_1.CliExitError(1, '❌ No merge in progress (no marker) — nothing to finalize.\n' +
             'Start one with:  pnpm wp-update-start  (a clean update finalizes itself).');
     }
     // Not yet validated => a conflict resolution the AI owns, so validate + commit it first; already
     // validated => clean merge (or previously validated) => finalize only.
     const conflictedFiles = marker.validated ? null : marker.conflictedFiles;
-    await (0, merge_end_1.mergeEnd)(repoRoot, 'wp-update-end', mergeDir, new merge_start_1.MergeContext(marker.currentBranch, marker.squashBranch, marker.backupBranch, marker.prNumber), conflictedFiles);
+    await (0, merge_end_1.mergeEnd)(repoRoot, 'wp-update-end', activeDir, new merge_start_1.MergeContext(marker.currentBranch, marker.squashBranch, marker.backupBranch, marker.prNumber), conflictedFiles);
     process.stdout.write('\n✅ Merge finalized on ' + marker.currentBranch + '.\n');
 }
 if (require.main === module)