@webpieces/pr-gate 0.3.281 → 0.3.284

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

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.main = main;
 const child_process_1 = require("child_process");
+const rules_config_1 = require("@webpieces/rules-config");
 const git_readAiBranchName_1 = require("./workflow/git-readAiBranchName");
 const merge_state_1 = require("./workflow/merge-state");
 const merge_end_1 = require("./workflow/merge-end");
@@ -18,9 +19,8 @@ async function main() {
     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-update-start  (a clean update finalizes itself).\n');
-        process.exit(1);
+        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.
@@ -28,11 +28,6 @@ async function main() {
     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);
-    });
-}
+if (require.main === module)
+    (0, rules_config_1.runMain)(main);
 //# sourceMappingURL=wp-update-end.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"wp-update-end.js","sourceRoot":"","sources":["../../../../../../packages/tooling/pr-gate/src/scripts/wp-update-end.ts"],"names":[],"mappings":";;;AAcA,oBAoBC;AAjCD,iDAAyC;AACzC,0EAAiE;AACjE,wDAAsE;AACtE,oDAAgD;AAChD,wDAAsD;AAEtD,sGAAsG;AACtG,gGAAgG;AAChG,qGAAqG;AACrG,qGAAqG;AACrG,sGAAsG;AACtG,oGAAoG;AAE7F,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,6EAA6E,CAAC,CAAC;QACpG,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-update-end — finalize half of the 3-point squash-merge lifecycle. Run it AFTER `wp-update-start`\n// handed back conflicts and you resolved them. Given an in-progress merge marker it validates +\n// commits the AI's resolution (when the marker is not yet validated) and ALWAYS finalizes the branch\n// swap (squash→feature, push, stamp clean, clear marker). It does NOT run the build gate / dashboard\n// / PR — that is wp-finish-upsert-pr (the PR flow's finish). Refuses to run when there is no merge in\n// progress (a clean `wp-update-start` finalizes on its own — there is nothing left for this to do).\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-update-start  (a clean update finalizes itself).\\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"]}
+{"version":3,"file":"wp-update-end.js","sourceRoot":"","sources":["../../../../../../packages/tooling/pr-gate/src/scripts/wp-update-end.ts"],"names":[],"mappings":";;;AAeA,oBAqBC;AAnCD,iDAAyC;AACzC,0DAAgE;AAChE,0EAAiE;AACjE,wDAAsE;AACtE,oDAAgD;AAChD,wDAAsD;AAEtD,sGAAsG;AACtG,gGAAgG;AAChG,qGAAqG;AACrG,qGAAqG;AACrG,sGAAsG;AACtG,oGAAoG;AAE7F,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,MAAM,IAAI,2BAAY,CAAC,CAAC,EACpB,6DAA6D;YAC7D,2EAA2E,CAC9E,CAAC;IACN,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;IAAE,IAAA,sBAAO,EAAC,IAAI,CAAC,CAAC","sourcesContent":["#!/usr/bin/env node\nimport { execSync } from 'child_process';\nimport { CliExitError, runMain } from '@webpieces/rules-config';\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-update-end — finalize half of the 3-point squash-merge lifecycle. Run it AFTER `wp-update-start`\n// handed back conflicts and you resolved them. Given an in-progress merge marker it validates +\n// commits the AI's resolution (when the marker is not yet validated) and ALWAYS finalizes the branch\n// swap (squash→feature, push, stamp clean, clear marker). It does NOT run the build gate / dashboard\n// / PR — that is wp-finish-upsert-pr (the PR flow's finish). Refuses to run when there is no merge in\n// progress (a clean `wp-update-start` finalizes on its own — there is nothing left for this to do).\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        throw new CliExitError(1,\n            '❌ No merge in progress (no marker) — nothing to finalize.\\n' +\n            'Start one with:  pnpm wp-update-start  (a clean update finalizes itself).',\n        );\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) runMain(main);\n"]}

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

@@ -18,21 +18,15 @@ async function main() {
     const outcome = await (0, run_update_1.runUpdateFromMain)(repoRoot, 'wp-update-end');
     if (outcome === 'conflict') {
         // Context + marker + merge process doc already written by merge-start; hand back to the AI.
-        process.exit(2);
+        throw new rules_config_1.CliExitError(2, '');
     }
     if (outcome === 'unvalidatedResume') {
-        process.stdout.write('\n' + SEP + '⏸️  Merge in progress — not yet validated\n' + SEP + '\n');
-        process.stdout.write('Resolve the remaining conflicts in the working tree, then run:\n');
-        process.stdout.write('  pnpm wp-update-end\n\n');
-        process.exit(1);
+        throw new rules_config_1.CliExitError(1, '\n' + SEP + '⏸️  Merge in progress — not yet validated\n' + SEP + '\n' +
+            'Resolve the remaining conflicts in the working tree, then run:\n' +
+            '  pnpm wp-update-end\n');
     }
     process.stdout.write('\n✅ Updated from main — clean. No need to call wp-update-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);
-    });
-}
+if (require.main === module)
+    (0, rules_config_1.runMain)(main);
 //# sourceMappingURL=wp-update-start.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"wp-update-start.js","sourceRoot":"","sources":["../../../../../../packages/tooling/pr-gate/src/scripts/wp-update-start.ts"],"names":[],"mappings":";;;AAaA,oBAiBC;AA7BD,iDAAyC;AACzC,0DAAwD;AACxD,sDAA0D;AAE1D,oGAAoG;AACpG,2FAA2F;AAC3F,sGAAsG;AACtG,mGAAmG;AACnG,4FAA4F;AAE5F,MAAM,GAAG,GAAG,0DAA0D,CAAC;AAEhE,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,MAAM,OAAO,GAAG,MAAM,IAAA,8BAAiB,EAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;IACnE,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;QACzB,4FAA4F;QAC5F,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IACD,IAAI,OAAO,KAAK,mBAAmB,EAAE,CAAC;QAClC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,GAAG,6CAA6C,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC;QAC9F,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,kEAAkE,CAAC,CAAC;QACzF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QACjD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iEAAiE,CAAC,CAAC;AAC5F,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 { writeTemplate } from '@webpieces/rules-config';\nimport { runUpdateFromMain } from './workflow/run-update';\n\n// wp-update-start: the \"sync this feature branch from main\" entry point (the redirect target of the\n// redirect-how-to-merge-main guard). It runs the FULL 3-point squash-update via the shared\n// runUpdateFromMain engine: on a CLEAN merge it finalizes everything (no need to call wp-update-end);\n// on CONFLICT it writes the 3-point context + merge process doc and hands back — you resolve, then\n// run `wp-update-end` to finalize. It NEVER creates a PR (that is the wp-*-upsert-pr flow).\n\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\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    const outcome = await runUpdateFromMain(repoRoot, 'wp-update-end');\n    if (outcome === 'conflict') {\n        // Context + marker + merge process doc already written by merge-start; hand back to the AI.\n        process.exit(2);\n    }\n    if (outcome === 'unvalidatedResume') {\n        process.stdout.write('\\n' + SEP + '⏸️  Merge in progress — not yet validated\\n' + SEP + '\\n');\n        process.stdout.write('Resolve the remaining conflicts in the working tree, then run:\\n');\n        process.stdout.write('  pnpm wp-update-end\\n\\n');\n        process.exit(1);\n    }\n    process.stdout.write('\\n✅ Updated from main — clean. No need to call wp-update-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"]}
+{"version":3,"file":"wp-update-start.js","sourceRoot":"","sources":["../../../../../../packages/tooling/pr-gate/src/scripts/wp-update-start.ts"],"names":[],"mappings":";;;AAaA,oBAkBC;AA9BD,iDAAyC;AACzC,0DAA+E;AAC/E,sDAA0D;AAE1D,oGAAoG;AACpG,2FAA2F;AAC3F,sGAAsG;AACtG,mGAAmG;AACnG,4FAA4F;AAE5F,MAAM,GAAG,GAAG,0DAA0D,CAAC;AAEhE,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,MAAM,OAAO,GAAG,MAAM,IAAA,8BAAiB,EAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;IACnE,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;QACzB,4FAA4F;QAC5F,MAAM,IAAI,2BAAY,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAClC,CAAC;IACD,IAAI,OAAO,KAAK,mBAAmB,EAAE,CAAC;QAClC,MAAM,IAAI,2BAAY,CAAC,CAAC,EACpB,IAAI,GAAG,GAAG,GAAG,6CAA6C,GAAG,GAAG,GAAG,IAAI;YACvE,kEAAkE;YAClE,wBAAwB,CAC3B,CAAC;IACN,CAAC;IACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iEAAiE,CAAC,CAAC;AAC5F,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 { writeTemplate, CliExitError, runMain } from '@webpieces/rules-config';\nimport { runUpdateFromMain } from './workflow/run-update';\n\n// wp-update-start: the \"sync this feature branch from main\" entry point (the redirect target of the\n// redirect-how-to-merge-main guard). It runs the FULL 3-point squash-update via the shared\n// runUpdateFromMain engine: on a CLEAN merge it finalizes everything (no need to call wp-update-end);\n// on CONFLICT it writes the 3-point context + merge process doc and hands back — you resolve, then\n// run `wp-update-end` to finalize. It NEVER creates a PR (that is the wp-*-upsert-pr flow).\n\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\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    const outcome = await runUpdateFromMain(repoRoot, 'wp-update-end');\n    if (outcome === 'conflict') {\n        // Context + marker + merge process doc already written by merge-start; hand back to the AI.\n        throw new CliExitError(2, '');\n    }\n    if (outcome === 'unvalidatedResume') {\n        throw new CliExitError(1,\n            '\\n' + SEP + '⏸️  Merge in progress — not yet validated\\n' + SEP + '\\n' +\n            'Resolve the remaining conflicts in the working tree, then run:\\n' +\n            '  pnpm wp-update-end\\n',\n        );\n    }\n    process.stdout.write('\\n✅ Updated from main — clean. No need to call wp-update-end.\\n');\n}\n\nif (require.main === module) runMain(main);\n"]}