@webpieces/pr-gate 0.3.204 → 0.3.206

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webpieces/pr-gate",
-  "version": "0.3.204",
+  "version": "0.3.206",
   "description": "Gated PR system: 3-point squash-merge, merge validation gate, and red/yellow/green PR dashboard. Standalone scripts, no Nx dependency required.",
   "type": "commonjs",
   "main": "./src/index.js",
@@ -9,7 +9,9 @@
     "wp-git-gather": "./src/scripts/git-gatherInfo.js",
     "wp-finish-upsert-pr": "./src/scripts/git-finishUpsertPr.js",
     "wp-build-affected": "./src/scripts/wp-build-affected.js",
-    "wp-start-upsert-pr": "./src/scripts/wp-start-upsert-pr.js"
+    "wp-start-upsert-pr": "./src/scripts/wp-start-upsert-pr.js",
+    "wp-merge-start": "./src/scripts/wp-merge-start.js",
+    "wp-merge-end": "./src/scripts/wp-merge-end.js"
   },
   "files": [
     "src/**/*"
@@ -22,7 +24,7 @@
     "directory": "packages/tooling/pr-gate"
   },
   "dependencies": {
-    "@webpieces/rules-config": "0.3.204"
+    "@webpieces/rules-config": "0.3.206"
   },
   "publishConfig": {
     "access": "public"

package/src/scripts/workflow/git-findForkPoint.d.ts

@@ -1,2 +1,3 @@
+export declare function forkPointOutputDir(repoRoot: string, featureName: string, workflow: string): string;
 export declare function findForkPoint(workflow: string): Promise<void>;
 export declare function main(): Promise<void>;

package/src/scripts/workflow/git-findForkPoint.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.forkPointOutputDir = forkPointOutputDir;
 exports.findForkPoint = findForkPoint;
 exports.main = main;
 const tslib_1 = require("tslib");
@@ -66,6 +67,15 @@ function checkMergeCommits(mergeCommits, outputDir, prefix, featureName, current
     }
     process.stderr.write('✅ No improper merges from main detected\n');
 }
+// Single source of truth for the per-feature dir fork-point output is written to — the SAME nested
+// home the readers use (git-gatherInfo / merge-start read updatemain-hashes.json from mergeDirFor;
+// the review flow reads from prDirFor). Previously findForkPoint wrote to the legacy flat
+// `.webpieces/<workflow>-<feature>/` while readers looked under `.webpieces/merge-info/<feature>/`,
+// so the hash file was written to one path and read from another. Routing the writer through these
+// same helpers is what keeps them from diverging again — guarded by git-findForkPoint.spec.ts.
+function forkPointOutputDir(repoRoot, featureName, workflow) {
+    return workflow === 'review' ? (0, rules_config_1.prDirFor)(repoRoot, featureName) : (0, merge_state_1.mergeDirFor)(repoRoot, featureName);
+}
 async function findForkPoint(workflow) {
     if (workflow !== 'review' && workflow !== 'merge') {
         process.stderr.write('ERROR: Workflow argument required\n');
@@ -76,14 +86,7 @@ async function findForkPoint(workflow) {
     const featureName = (0, git_readAiBranchName_1.getFeatureName)();
     const currentBranch = (0, child_process_1.execSync)('git branch --show-current', { encoding: 'utf8' }).trim();
     const repoRoot = (0, child_process_1.execSync)('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();
-    // Single source of truth for the per-feature dir — the SAME nested home the readers use
-    // (git-gatherInfo / merge-start read updatemain-hashes.json from mergeDirFor). Previously this
-    // wrote to the legacy flat `.webpieces/<workflow>-<feature>/` while readers looked under
-    // `.webpieces/merge-info/<feature>/`, so the hash file was written to one path and read from
-    // another. Route both through mergeDirFor/prDirFor so they can never diverge again.
-    const outputDir = workflow === 'review'
-        ? (0, rules_config_1.prDirFor)(repoRoot, featureName)
-        : (0, merge_state_1.mergeDirFor)(repoRoot, featureName);
+    const outputDir = forkPointOutputDir(repoRoot, featureName, workflow);
     const prefix = workflow === 'review' ? 'review-' : 'updatemain-';
     fs.mkdirSync(outputDir, { recursive: true });
     (0, child_process_1.spawnSync)('git', ['fetch', 'origin', 'main'], { stdio: 'ignore' });

package/src/scripts/workflow/git-findForkPoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"git-findForkPoint.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/git-findForkPoint.ts"],"names":[],"mappings":";;AAuEA,sCA4DC;AAED,oBAEC;;AAvID,iDAAoD;AACpD,+CAAyB;AACzB,mDAA6B;AAC7B,0DAAmD;AACnD,iEAAwD;AACxD,+CAA4C;AAE5C,MAAM,GAAG,GAAG,0DAA0D,CAAC;AAEvE,SAAS,uBAAuB,CAAC,MAAc,EAAE,MAAc,EAAE,WAAmB,EAAE,aAAqB;IACvG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC/E,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,MAAM,IAAI,CAAC,CAAC;IAC3D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,MAAM,IAAI,CAAC,CAAC;IAC3D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,qEAAqE,CAAC,CAAC;IAC5F,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACpD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC/C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAClD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IACtC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAChE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,WAAW,OAAO,CAAC,CAAC;IAC/D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;IAC3D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,aAAa,IAAI,CAAC,CAAC;IACjE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;IAC1D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iDAAiD,aAAa,KAAK,CAAC,CAAC;IAC1F,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACzD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,WAAW,OAAO,CAAC,CAAC;IACrE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,aAAa,IAAI,CAAC,CAAC;IACrE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,iBAAiB,CAAC,YAAsB,EAAE,SAAiB,EAAE,MAAc,EAAE,WAAmB,EAAE,aAAqB;IAC5H,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,YAAY,CAAC,MAAM,gCAAgC,CAAC,CAAC;IAEnF,KAAK,MAAM,MAAM,IAAI,YAAY,EAAE,CAAC;QAChC,MAAM,aAAa,GAAG,IAAA,yBAAS,EAAC,KAAK,EAAE,CAAC,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3G,MAAM,OAAO,GAAG,CAAC,aAAa,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAExE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,MAAM,aAAa,GAAG,IAAA,yBAAS,EAAC,KAAK,EAAE,CAAC,YAAY,EAAE,eAAe,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;YAC/F,MAAM,YAAY,GAAG,IAAA,yBAAS,EAAC,KAAK,EAAE,CAAC,YAAY,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC;YAE9F,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC1D,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;oBAC7B,KAAK,EAAE,0BAA0B;oBACjC,WAAW,EAAE,MAAM;oBACnB,cAAc,EAAE,MAAM;oBACtB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBACtC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;gBAEZ,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,MAAM,sBAAsB,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC,CAAC;gBAC1F,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;gBACpE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,CAAC;QACL,CAAC;IACL,CAAC;IACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;AACtE,CAAC;AAEM,KAAK,UAAU,aAAa,CAAC,QAAgB;IAChD,IAAI,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QAChD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QAC5D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC9D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAC1D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,WAAW,GAAG,IAAA,qCAAc,GAAE,CAAC;IACrC,MAAM,aAAa,GAAG,IAAA,wBAAQ,EAAC,2BAA2B,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACzF,MAAM,QAAQ,GAAG,IAAA,wBAAQ,EAAC,+BAA+B,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAExF,wFAAwF;IACxF,+FAA+F;IAC/F,yFAAyF;IACzF,6FAA6F;IAC7F,oFAAoF;IACpF,MAAM,SAAS,GAAG,QAAQ,KAAK,QAAQ;QACnC,CAAC,CAAC,IAAA,uBAAQ,EAAC,QAAQ,EAAE,WAAW,CAAC;QACjC,CAAC,CAAC,IAAA,yBAAW,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IACzC,MAAM,MAAM,GAAG,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC;IACjE,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE7C,IAAA,yBAAS,EAAC,KAAK,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEnE,MAAM,WAAW,GAAG,IAAA,wBAAQ,EAAC,oBAAoB,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAChF,MAAM,UAAU,GAAG,IAAA,wBAAQ,EAAC,2BAA2B,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAEtF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAErE,MAAM,eAAe,GAAG,IAAA,yBAAS,EAAC,KAAK,EAAE,CAAC,YAAY,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IACtG,MAAM,SAAS,GAAG,CAAC,eAAe,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAExD,IAAI,CAAC,SAAS,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAC;QACjF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IACvE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;IAEpE,MAAM,kBAAkB,GAAG,IAAA,yBAAS,EAAC,KAAK,EAAE,CAAC,KAAK,EAAE,GAAG,SAAS,QAAQ,EAAE,UAAU,EAAE,aAAa,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5H,MAAM,eAAe,GAAG,CAAC,kBAAkB,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACjE,MAAM,YAAY,GAAG,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAExE,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,iBAAiB,CAAC,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;IACnF,CAAC;SAAM,CAAC;QACJ,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC;QAC9B,aAAa,EAAE,SAAS;QACxB,eAAe,EAAE,WAAW;QAC5B,YAAY,EAAE,UAAU;QACxB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;KACtC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAEZ,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,MAAM,aAAa,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC,CAAC;IAClF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,SAAS,IAAI,MAAM,eAAe,CAAC,CAAC;AAC1F,CAAC;AAEM,KAAK,UAAU,IAAI;IACtB,MAAM,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;AAC/C,CAAC;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;IAC1B,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACjB,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;QACrC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;AACP,CAAC","sourcesContent":["import { execSync, spawnSync } from 'child_process';\nimport * as fs from 'fs';\nimport * as path from 'path';\nimport { prDirFor } from '@webpieces/rules-config';\nimport { getFeatureName } from './git-readAiBranchName';\nimport { mergeDirFor } from './merge-state';\n\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\n';\n\nfunction printMergeFromMainError(commit: string, parent: string, featureName: string, currentBranch: string): void {\n    process.stderr.write('\\n');\n    process.stderr.write(SEP);\n    process.stderr.write('❌ This branch merged main without pnpm wp-git-update\\n');\n    process.stderr.write(SEP);\n    process.stderr.write('\\n');\n    process.stderr.write(`Merge commit detected: ${commit}\\n`);\n    process.stderr.write(`Parent from main:      ${parent}\\n`);\n    process.stderr.write('\\n');\n    process.stderr.write('This prevents clean squash-merge. To recover, follow these steps:\\n');\n    process.stderr.write('\\n');\n    process.stderr.write('1. Switch to main branch:\\n');\n    process.stderr.write('   git checkout main\\n');\n    process.stderr.write('\\n');\n    process.stderr.write('2. Pull latest changes:\\n');\n    process.stderr.write('   git pull\\n');\n    process.stderr.write('\\n');\n    process.stderr.write('3. Create new branch with a new name:\\n');\n    process.stderr.write(`   git checkout -b ${featureName}-v2\\n`);\n    process.stderr.write('\\n');\n    process.stderr.write('4. Squash merge your old branch:\\n');\n    process.stderr.write(`   git merge --squash ${currentBranch}\\n`);\n    process.stderr.write('\\n');\n    process.stderr.write('5. Commit the squashed changes:\\n');\n    process.stderr.write(`   git add -A && git commit -m \"Squashed from ${currentBranch}\"\\n`);\n    process.stderr.write('\\n');\n    process.stderr.write('6. If you have an existing PR:\\n');\n    process.stderr.write(`   - Create a NEW PR for ${featureName}-v2\\n`);\n    process.stderr.write(`   - Close the old PR for ${currentBranch}\\n`);\n    process.stderr.write('\\n');\n    process.stderr.write(SEP);\n    process.stderr.write('\\n');\n}\n\nfunction checkMergeCommits(mergeCommits: string[], outputDir: string, prefix: string, featureName: string, currentBranch: string): void {\n    process.stderr.write(`Found ${mergeCommits.length} merge commit(s) to check...\\n`);\n\n    for (const commit of mergeCommits) {\n        const parentsResult = spawnSync('git', ['rev-list', '--parents', '-n', '1', commit], { encoding: 'utf8' });\n        const parents = (parentsResult.stdout ?? '').trim().split(' ').slice(1);\n\n        for (const parent of parents) {\n            const ancestorCheck = spawnSync('git', ['merge-base', '--is-ancestor', parent, 'origin/main']);\n            const reverseCheck = spawnSync('git', ['merge-base', '--is-ancestor', 'origin/main', parent]);\n\n            if (ancestorCheck.status === 0 && reverseCheck.status === 0) {\n                const errorJson = JSON.stringify({\n                    error: 'Merge from main detected',\n                    mergeCommit: commit,\n                    parentFromMain: parent,\n                    timestamp: new Date().toISOString(),\n                }, null, 2);\n\n                fs.writeFileSync(path.join(outputDir, `${prefix}forkpoint-error.json`), errorJson + '\\n');\n                printMergeFromMainError(commit, parent, featureName, currentBranch);\n                process.exit(1);\n            }\n        }\n    }\n    process.stderr.write('✅ No improper merges from main detected\\n');\n}\n\nexport async function findForkPoint(workflow: string): Promise<void> {\n    if (workflow !== 'review' && workflow !== 'merge') {\n        process.stderr.write('ERROR: Workflow argument required\\n');\n        process.stderr.write('Usage: git-findForkPoint <workflow>\\n');\n        process.stderr.write(\"  workflow: 'review' or 'merge'\\n\");\n        process.exit(1);\n    }\n\n    const featureName = getFeatureName();\n    const currentBranch = execSync('git branch --show-current', { encoding: 'utf8' }).trim();\n    const repoRoot = execSync('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();\n\n    // Single source of truth for the per-feature dir — the SAME nested home the readers use\n    // (git-gatherInfo / merge-start read updatemain-hashes.json from mergeDirFor). Previously this\n    // wrote to the legacy flat `.webpieces/<workflow>-<feature>/` while readers looked under\n    // `.webpieces/merge-info/<feature>/`, so the hash file was written to one path and read from\n    // another. Route both through mergeDirFor/prDirFor so they can never diverge again.\n    const outputDir = workflow === 'review'\n        ? prDirFor(repoRoot, featureName)\n        : mergeDirFor(repoRoot, featureName);\n    const prefix = workflow === 'review' ? 'review-' : 'updatemain-';\n    fs.mkdirSync(outputDir, { recursive: true });\n\n    spawnSync('git', ['fetch', 'origin', 'main'], { stdio: 'ignore' });\n\n    const featureHead = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim();\n    const originMain = execSync('git rev-parse origin/main', { encoding: 'utf8' }).trim();\n\n    process.stderr.write('Finding fork point using git merge-base...\\n');\n\n    const forkPointResult = spawnSync('git', ['merge-base', 'origin/main', 'HEAD'], { encoding: 'utf8' });\n    const forkPoint = (forkPointResult.stdout ?? '').trim();\n\n    if (!forkPoint || forkPointResult.status !== 0) {\n        process.stderr.write('ERROR: Could not find common ancestor with origin/main\\n');\n        process.exit(1);\n    }\n\n    process.stderr.write(`✅ Fork point found: ${forkPoint.slice(0, 7)}\\n`);\n    process.stderr.write('Checking for improper merges from main...\\n');\n\n    const mergeCommitsResult = spawnSync('git', ['log', `${forkPoint}..HEAD`, '--merges', '--format=%H'], { encoding: 'utf8' });\n    const mergeCommitsRaw = (mergeCommitsResult.stdout ?? '').trim();\n    const mergeCommits = mergeCommitsRaw ? mergeCommitsRaw.split('\\n') : [];\n\n    if (mergeCommits.length > 0) {\n        checkMergeCommits(mergeCommits, outputDir, prefix, featureName, currentBranch);\n    } else {\n        process.stderr.write('✅ No merge commits found (clean history)\\n');\n    }\n\n    const hashesJson = JSON.stringify({\n        hashForkPoint: forkPoint,\n        hashFeatureHead: featureHead,\n        hashMainHead: originMain,\n        timestamp: new Date().toISOString(),\n    }, null, 2);\n\n    fs.writeFileSync(path.join(outputDir, `${prefix}hashes.json`), hashesJson + '\\n');\n    process.stderr.write(`✅ Hash points written to: ${outputDir}/${prefix}hashes.json\\n`);\n}\n\nexport async function main(): Promise<void> {\n    await findForkPoint(process.argv[2] ?? '');\n}\n\nif (require.main === module) {\n    main().catch((err) => {\n        const message = err instanceof Error ? err.message : String(err);\n        process.stderr.write(message + '\\n');\n        process.exit(1);\n    });\n}\n"]}
+{"version":3,"file":"git-findForkPoint.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/git-findForkPoint.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 { prDirFor } from '@webpieces/rules-config';\nimport { getFeatureName } from './git-readAiBranchName';\nimport { mergeDirFor } from './merge-state';\n\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\n';\n\nfunction printMergeFromMainError(commit: string, parent: string, featureName: string, currentBranch: string): void {\n    process.stderr.write('\\n');\n    process.stderr.write(SEP);\n    process.stderr.write('❌ This branch merged main without pnpm wp-git-update\\n');\n    process.stderr.write(SEP);\n    process.stderr.write('\\n');\n    process.stderr.write(`Merge commit detected: ${commit}\\n`);\n    process.stderr.write(`Parent from main:      ${parent}\\n`);\n    process.stderr.write('\\n');\n    process.stderr.write('This prevents clean squash-merge. To recover, follow these steps:\\n');\n    process.stderr.write('\\n');\n    process.stderr.write('1. Switch to main branch:\\n');\n    process.stderr.write('   git checkout main\\n');\n    process.stderr.write('\\n');\n    process.stderr.write('2. Pull latest changes:\\n');\n    process.stderr.write('   git pull\\n');\n    process.stderr.write('\\n');\n    process.stderr.write('3. Create new branch with a new name:\\n');\n    process.stderr.write(`   git checkout -b ${featureName}-v2\\n`);\n    process.stderr.write('\\n');\n    process.stderr.write('4. Squash merge your old branch:\\n');\n    process.stderr.write(`   git merge --squash ${currentBranch}\\n`);\n    process.stderr.write('\\n');\n    process.stderr.write('5. Commit the squashed changes:\\n');\n    process.stderr.write(`   git add -A && git commit -m \"Squashed from ${currentBranch}\"\\n`);\n    process.stderr.write('\\n');\n    process.stderr.write('6. If you have an existing PR:\\n');\n    process.stderr.write(`   - Create a NEW PR for ${featureName}-v2\\n`);\n    process.stderr.write(`   - Close the old PR for ${currentBranch}\\n`);\n    process.stderr.write('\\n');\n    process.stderr.write(SEP);\n    process.stderr.write('\\n');\n}\n\nfunction checkMergeCommits(mergeCommits: string[], outputDir: string, prefix: string, featureName: string, currentBranch: string): void {\n    process.stderr.write(`Found ${mergeCommits.length} merge commit(s) to check...\\n`);\n\n    for (const commit of mergeCommits) {\n        const parentsResult = spawnSync('git', ['rev-list', '--parents', '-n', '1', commit], { encoding: 'utf8' });\n        const parents = (parentsResult.stdout ?? '').trim().split(' ').slice(1);\n\n        for (const parent of parents) {\n            const ancestorCheck = spawnSync('git', ['merge-base', '--is-ancestor', parent, 'origin/main']);\n            const reverseCheck = spawnSync('git', ['merge-base', '--is-ancestor', 'origin/main', parent]);\n\n            if (ancestorCheck.status === 0 && reverseCheck.status === 0) {\n                const errorJson = JSON.stringify({\n                    error: 'Merge from main detected',\n                    mergeCommit: commit,\n                    parentFromMain: parent,\n                    timestamp: new Date().toISOString(),\n                }, null, 2);\n\n                fs.writeFileSync(path.join(outputDir, `${prefix}forkpoint-error.json`), errorJson + '\\n');\n                printMergeFromMainError(commit, parent, featureName, currentBranch);\n                process.exit(1);\n            }\n        }\n    }\n    process.stderr.write('✅ No improper merges from main detected\\n');\n}\n\n// Single source of truth for the per-feature dir fork-point output is written to — the SAME nested\n// home the readers use (git-gatherInfo / merge-start read updatemain-hashes.json from mergeDirFor;\n// the review flow reads from prDirFor). Previously findForkPoint wrote to the legacy flat\n// `.webpieces/<workflow>-<feature>/` while readers looked under `.webpieces/merge-info/<feature>/`,\n// so the hash file was written to one path and read from another. Routing the writer through these\n// same helpers is what keeps them from diverging again — guarded by git-findForkPoint.spec.ts.\nexport function forkPointOutputDir(repoRoot: string, featureName: string, workflow: string): string {\n    return workflow === 'review' ? prDirFor(repoRoot, featureName) : mergeDirFor(repoRoot, featureName);\n}\n\nexport async function findForkPoint(workflow: string): Promise<void> {\n    if (workflow !== 'review' && workflow !== 'merge') {\n        process.stderr.write('ERROR: Workflow argument required\\n');\n        process.stderr.write('Usage: git-findForkPoint <workflow>\\n');\n        process.stderr.write(\"  workflow: 'review' or 'merge'\\n\");\n        process.exit(1);\n    }\n\n    const featureName = getFeatureName();\n    const currentBranch = execSync('git branch --show-current', { encoding: 'utf8' }).trim();\n    const repoRoot = execSync('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();\n\n    const outputDir = forkPointOutputDir(repoRoot, featureName, workflow);\n    const prefix = workflow === 'review' ? 'review-' : 'updatemain-';\n    fs.mkdirSync(outputDir, { recursive: true });\n\n    spawnSync('git', ['fetch', 'origin', 'main'], { stdio: 'ignore' });\n\n    const featureHead = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim();\n    const originMain = execSync('git rev-parse origin/main', { encoding: 'utf8' }).trim();\n\n    process.stderr.write('Finding fork point using git merge-base...\\n');\n\n    const forkPointResult = spawnSync('git', ['merge-base', 'origin/main', 'HEAD'], { encoding: 'utf8' });\n    const forkPoint = (forkPointResult.stdout ?? '').trim();\n\n    if (!forkPoint || forkPointResult.status !== 0) {\n        process.stderr.write('ERROR: Could not find common ancestor with origin/main\\n');\n        process.exit(1);\n    }\n\n    process.stderr.write(`✅ Fork point found: ${forkPoint.slice(0, 7)}\\n`);\n    process.stderr.write('Checking for improper merges from main...\\n');\n\n    const mergeCommitsResult = spawnSync('git', ['log', `${forkPoint}..HEAD`, '--merges', '--format=%H'], { encoding: 'utf8' });\n    const mergeCommitsRaw = (mergeCommitsResult.stdout ?? '').trim();\n    const mergeCommits = mergeCommitsRaw ? mergeCommitsRaw.split('\\n') : [];\n\n    if (mergeCommits.length > 0) {\n        checkMergeCommits(mergeCommits, outputDir, prefix, featureName, currentBranch);\n    } else {\n        process.stderr.write('✅ No merge commits found (clean history)\\n');\n    }\n\n    const hashesJson = JSON.stringify({\n        hashForkPoint: forkPoint,\n        hashFeatureHead: featureHead,\n        hashMainHead: originMain,\n        timestamp: new Date().toISOString(),\n    }, null, 2);\n\n    fs.writeFileSync(path.join(outputDir, `${prefix}hashes.json`), hashesJson + '\\n');\n    process.stderr.write(`✅ Hash points written to: ${outputDir}/${prefix}hashes.json\\n`);\n}\n\nexport async function main(): Promise<void> {\n    await findForkPoint(process.argv[2] ?? '');\n}\n\nif (require.main === module) {\n    main().catch((err) => {\n        const message = err instanceof Error ? err.message : String(err);\n        process.stderr.write(message + '\\n');\n        process.exit(1);\n    });\n}\n"]}

package/src/scripts/wp-merge-end.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export declare function main(): Promise<void>;

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

@@ -0,0 +1,38 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.main = main;
+const child_process_1 = require("child_process");
+const git_readAiBranchName_1 = require("./workflow/git-readAiBranchName");
+const merge_state_1 = require("./workflow/merge-state");
+const merge_end_1 = require("./workflow/merge-end");
+const merge_start_1 = require("./workflow/merge-start");
+// wp-merge-end — manual entry to the SECOND half of the 3-point squash-merge lifecycle (debug /
+// recovery). Given an in-progress merge marker it validates + commits the AI's resolution (only when
+// the marker is not yet validated) and ALWAYS finalizes the branch swap (squash→feature, push, stamp
+// clean, clear marker). It does NOT run the build gate / dashboard / PR — that is wp-finish-upsert-pr.
+// Use it to recover a stuck-but-resolved merge, or to finalize a clean `wp-merge-start`. Refuses to
+// run when there is no merge in progress.
+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) {
+        process.stderr.write('❌ No merge in progress (no marker) — nothing to finalize.\n');
+        process.stderr.write('Start one with:  pnpm wp-git-update  (or pnpm wp-merge-start).\n');
+        process.exit(1);
+    }
+    // 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, mergeDir, 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) {
+    main().catch((err) => {
+        const message = err instanceof Error ? err.message : String(err);
+        process.stderr.write(message + '\n');
+        process.exit(1);
+    });
+}
+//# sourceMappingURL=wp-merge-end.js.map

package/src/scripts/wp-merge-end.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wp-merge-end.js","sourceRoot":"","sources":["../../../../../../packages/tooling/pr-gate/src/scripts/wp-merge-end.ts"],"names":[],"mappings":";;;AAcA,oBAoBC;AAjCD,iDAAyC;AACzC,0EAAiE;AACjE,wDAAsE;AACtE,oDAAgD;AAChD,wDAAsD;AAEtD,gGAAgG;AAChG,qGAAqG;AACrG,qGAAqG;AACrG,uGAAuG;AACvG,oGAAoG;AACpG,0CAA0C;AAEnC,KAAK,UAAU,IAAI;IACtB,MAAM,QAAQ,GAAG,IAAA,wBAAQ,EAAC,+BAA+B,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACxF,MAAM,QAAQ,GAAG,IAAA,yBAAW,EAAC,QAAQ,EAAE,IAAA,qCAAc,GAAE,CAAC,CAAC;IAEzD,MAAM,MAAM,GAAG,IAAA,6BAAe,EAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC;QACpF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kEAAkE,CAAC,CAAC;QACzF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,iGAAiG;IACjG,uEAAuE;IACvE,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC;IACzE,MAAM,IAAA,oBAAQ,EACV,QAAQ,EAAE,QAAQ,EAClB,IAAI,0BAAY,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,EACjG,eAAe,CAClB,CAAC;IACF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,GAAG,MAAM,CAAC,aAAa,GAAG,KAAK,CAAC,CAAC;AACnF,CAAC;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;IAC1B,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;QACxB,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;QACrC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;AACP,CAAC","sourcesContent":["#!/usr/bin/env node\nimport { execSync } from 'child_process';\nimport { getFeatureName } from './workflow/git-readAiBranchName';\nimport { mergeDirFor, readMergeMarker } from './workflow/merge-state';\nimport { mergeEnd } from './workflow/merge-end';\nimport { MergeContext } from './workflow/merge-start';\n\n// wp-merge-end — manual entry to the SECOND half of the 3-point squash-merge lifecycle (debug /\n// recovery). Given an in-progress merge marker it validates + commits the AI's resolution (only when\n// the marker is not yet validated) and ALWAYS finalizes the branch swap (squash→feature, push, stamp\n// clean, clear marker). It does NOT run the build gate / dashboard / PR — that is wp-finish-upsert-pr.\n// Use it to recover a stuck-but-resolved merge, or to finalize a clean `wp-merge-start`. Refuses to\n// run when there is no merge in progress.\n\nexport async function main(): Promise<void> {\n    const repoRoot = execSync('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();\n    const mergeDir = mergeDirFor(repoRoot, getFeatureName());\n\n    const marker = readMergeMarker(mergeDir);\n    if (!marker) {\n        process.stderr.write('❌ No merge in progress (no marker) — nothing to finalize.\\n');\n        process.stderr.write('Start one with:  pnpm wp-git-update  (or pnpm wp-merge-start).\\n');\n        process.exit(1);\n    }\n\n    // Not yet validated => a conflict resolution the AI owns, so validate + commit it first; already\n    // validated => clean merge (or previously validated) => finalize only.\n    const conflictedFiles = marker.validated ? null : marker.conflictedFiles;\n    await mergeEnd(\n        repoRoot, mergeDir,\n        new MergeContext(marker.currentBranch, marker.squashBranch, marker.backupBranch, marker.prNumber),\n        conflictedFiles,\n    );\n    process.stdout.write('\\n✅ Merge finalized on ' + marker.currentBranch + '.\\n');\n}\n\nif (require.main === module) {\n    main().catch((err: Error) => {\n        const message = err instanceof Error ? err.message : String(err);\n        process.stderr.write(message + '\\n');\n        process.exit(1);\n    });\n}\n"]}

package/src/scripts/wp-merge-start.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export declare function main(): Promise<void>;

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

@@ -0,0 +1,45 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.main = main;
+const tslib_1 = require("tslib");
+const child_process_1 = require("child_process");
+const fs = tslib_1.__importStar(require("fs"));
+const git_readAiBranchName_1 = require("./workflow/git-readAiBranchName");
+const merge_state_1 = require("./workflow/merge-state");
+const merge_start_1 = require("./workflow/merge-start");
+// wp-merge-start — manual entry to the FIRST half of the 3-point squash-merge lifecycle (debug /
+// recovery). Most callers want `pnpm wp-git-update`, which runs start AND finalize in one go. This
+// runs ONLY merge-START: it brings origin/main in and, on conflict, writes the 3-point context +
+// marker and hands back for resolution (exit 2). On a CLEAN merge it leaves the squash staged and
+// records a validated marker so a SEPARATE `pnpm wp-merge-end` can finalize the branch swap. It
+// refuses to run if a merge is already in progress (a marker is present).
+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)());
+    fs.mkdirSync(mergeDir, { recursive: true });
+    if ((0, merge_state_1.readMergeMarker)(mergeDir)) {
+        process.stderr.write('❌ A merge is already in progress (marker present) — refusing to start another.\n');
+        process.stderr.write('Resolve any conflicts, then run:  pnpm wp-finish-upsert-pr  (or pnpm wp-merge-end to only finalize).\n');
+        process.exit(1);
+    }
+    const result = await (0, merge_start_1.mergeStart)(repoRoot, mergeDir);
+    if (result.status === 'conflict' || result.context === null) {
+        // Conflicts: merge-START wrote the marker + context files and printed the handback.
+        process.exit(2);
+    }
+    // Clean merge: persist a validated marker so a separate `wp-merge-end` process can finalize
+    // (the in-memory context is otherwise lost between commands). hashes/conflictedFiles are unused
+    // by finalize, so they are empty here.
+    const ctx = result.context;
+    (0, merge_state_1.writeMergeMarker)(mergeDir, new merge_state_1.MergeMarker(ctx.currentBranch, ctx.squashBranch, ctx.backupBranch, ctx.prNumber, [], '', '', '', true));
+    process.stdout.write('\n✅ Clean squash staged on ' + ctx.squashBranch + '. Finalize with:  pnpm wp-merge-end\n');
+}
+if (require.main === module) {
+    main().catch((err) => {
+        const message = err instanceof Error ? err.message : String(err);
+        process.stderr.write(message + '\n');
+        process.exit(1);
+    });
+}
+//# sourceMappingURL=wp-merge-start.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"wp-merge-start.js","sourceRoot":"","sources":["../../../../../../packages/tooling/pr-gate/src/scripts/wp-merge-start.ts"],"names":[],"mappings":";;;AAcA,oBAyBC;;AAtCD,iDAAyC;AACzC,+CAAyB;AACzB,0EAAiE;AACjE,wDAAqG;AACrG,wDAAoD;AAEpD,iGAAiG;AACjG,mGAAmG;AACnG,iGAAiG;AACjG,kGAAkG;AAClG,gGAAgG;AAChG,0EAA0E;AAEnE,KAAK,UAAU,IAAI;IACtB,MAAM,QAAQ,GAAG,IAAA,wBAAQ,EAAC,+BAA+B,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACxF,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,IAAI,IAAA,6BAAe,EAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kFAAkF,CAAC,CAAC;QACzG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,wGAAwG,CAAC,CAAC;QAC/H,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAU,EAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACpD,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;QAC1D,oFAAoF;QACpF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,4FAA4F;IAC5F,gGAAgG;IAChG,uCAAuC;IACvC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC;IAC3B,IAAA,8BAAgB,EAAC,QAAQ,EAAE,IAAI,yBAAW,CACtC,GAAG,CAAC,aAAa,EAAE,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,CAC5F,CAAC,CAAC;IACH,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,GAAG,GAAG,CAAC,YAAY,GAAG,uCAAuC,CAAC,CAAC;AACrH,CAAC;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;IAC1B,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;QACxB,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;QACrC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;AACP,CAAC","sourcesContent":["#!/usr/bin/env node\nimport { execSync } from 'child_process';\nimport * as fs from 'fs';\nimport { getFeatureName } from './workflow/git-readAiBranchName';\nimport { mergeDirFor, readMergeMarker, writeMergeMarker, MergeMarker } from './workflow/merge-state';\nimport { mergeStart } from './workflow/merge-start';\n\n// wp-merge-start — manual entry to the FIRST half of the 3-point squash-merge lifecycle (debug /\n// recovery). Most callers want `pnpm wp-git-update`, which runs start AND finalize in one go. This\n// runs ONLY merge-START: it brings origin/main in and, on conflict, writes the 3-point context +\n// marker and hands back for resolution (exit 2). On a CLEAN merge it leaves the squash staged and\n// records a validated marker so a SEPARATE `pnpm wp-merge-end` can finalize the branch swap. It\n// refuses to run if a merge is already in progress (a marker is present).\n\nexport async function main(): Promise<void> {\n    const repoRoot = execSync('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();\n    const mergeDir = mergeDirFor(repoRoot, getFeatureName());\n    fs.mkdirSync(mergeDir, { recursive: true });\n\n    if (readMergeMarker(mergeDir)) {\n        process.stderr.write('❌ A merge is already in progress (marker present) — refusing to start another.\\n');\n        process.stderr.write('Resolve any conflicts, then run:  pnpm wp-finish-upsert-pr  (or pnpm wp-merge-end to only finalize).\\n');\n        process.exit(1);\n    }\n\n    const result = await mergeStart(repoRoot, mergeDir);\n    if (result.status === 'conflict' || result.context === null) {\n        // Conflicts: merge-START wrote the marker + context files and printed the handback.\n        process.exit(2);\n    }\n\n    // Clean merge: persist a validated marker so a separate `wp-merge-end` process can finalize\n    // (the in-memory context is otherwise lost between commands). hashes/conflictedFiles are unused\n    // by finalize, so they are empty here.\n    const ctx = result.context;\n    writeMergeMarker(mergeDir, new MergeMarker(\n        ctx.currentBranch, ctx.squashBranch, ctx.backupBranch, ctx.prNumber, [], '', '', '', true,\n    ));\n    process.stdout.write('\\n✅ Clean squash staged on ' + ctx.squashBranch + '. Finalize with:  pnpm wp-merge-end\\n');\n}\n\nif (require.main === module) {\n    main().catch((err: Error) => {\n        const message = err instanceof Error ? err.message : String(err);\n        process.stderr.write(message + '\\n');\n        process.exit(1);\n    });\n}\n"]}