@webpieces/pr-gate 0.0.0

package/src/scripts/git-updateFromMain.js

@@ -0,0 +1,157 @@
+#!/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 path = tslib_1.__importStar(require("path"));
+const git_readAiBranchName_1 = require("./workflow/git-readAiBranchName");
+const git_gatherInfo_1 = require("./git-gatherInfo");
+const cleanTmp_1 = require("./workflow/cleanTmp");
+const git_exec_1 = require("./workflow/git-exec");
+const merge_state_1 = require("./workflow/merge-state");
+const SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n';
+function detectPr(currentBranch) {
+    const result = (0, child_process_1.spawnSync)('gh', ['pr', 'list', '--head', currentBranch, '--json', 'number', '--jq', '.[0].number'], { encoding: 'utf8' });
+    return result.status === 0 ? (result.stdout ?? '').trim() : '';
+}
+function createBackup(currentBranch) {
+    process.stdout.write('\n' + SEP + '💾 Creating Incremental Backup\n' + SEP + '\n');
+    let n = 1;
+    while ((0, child_process_1.spawnSync)('git', ['show-ref', '--verify', '--quiet', `refs/heads/${currentBranch}Backup${n}`]).status === 0) {
+        n += 1;
+    }
+    const backupBranch = `${currentBranch}Backup${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) {
+        const safePath = file.replace(/\//g, '__');
+        const fileDir = path.join(mergeDir, `updatemain-${safePath}`);
+        fs.mkdirSync(fileDir, { recursive: true });
+        const fork = (0, child_process_1.spawnSync)('git', ['show', `${forkPoint}:${file}`], { encoding: 'utf8' });
+        fs.writeFileSync(path.join(fileDir, 'A-forkpoint.txt'), fork.status === 0 ? (fork.stdout ?? '') : '(file did not exist)\n');
+        const feature = (0, child_process_1.spawnSync)('git', ['show', `${featureHead}:${file}`], { encoding: 'utf8' });
+        fs.writeFileSync(path.join(fileDir, 'B-feature.txt'), feature.status === 0 ? (feature.stdout ?? '') : '(file did not exist)\n');
+        const main = (0, child_process_1.spawnSync)('git', ['show', `${mainHead}:${file}`], { encoding: 'utf8' });
+        fs.writeFileSync(path.join(fileDir, 'C-main.txt'), main.status === 0 ? (main.stdout ?? '') : '(file did not exist)\n');
+        const ba = (0, child_process_1.spawnSync)('git', ['diff', forkPoint, featureHead, '--', file], { encoding: 'utf8' });
+        fs.writeFileSync(path.join(fileDir, 'B-A.diff'), ba.stdout ?? '');
+        const ca = (0, child_process_1.spawnSync)('git', ['diff', forkPoint, mainHead, '--', file], { encoding: 'utf8' });
+        fs.writeFileSync(path.join(fileDir, 'C-A.diff'), ca.stdout ?? '');
+    }
+}
+function printConflictHandback(mergeDir, squashBranch, conflictedFiles) {
+    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`);
+    process.stdout.write(`3-point context per file in: ${mergeDir}/updatemain-<file>/\n`);
+    process.stdout.write('  A-forkpoint.txt (base) · B-feature.txt (yours) · C-main.txt (main) · B-A.diff · C-A.diff\n\n');
+    process.stdout.write('RESOLVE NOW (in the working tree):\n');
+    process.stdout.write('  1. Edit each conflicted file, combining your changes (B−A) with main\'s (C−A).\n');
+    process.stdout.write('  2. Do NOT git commit / git push / gh pr — these are blocked until validated.\n');
+    process.stdout.write('  3. When every file is resolved, run:  pnpm wp-git-merge-complete\n');
+    process.stdout.write('     (runs the conflict-marker scan + build; commits only if green)\n');
+    process.stdout.write('  4. Then re-run  pnpm wp-upsert-pr  (or pnpm wp-git-update) to finalize & push.\n\n');
+    process.stdout.write('Conflicted files:\n');
+    for (const file of conflictedFiles)
+        process.stdout.write(`  - ${file}\n`);
+    process.stdout.write('\n' + SEP);
+}
+function handleConflictsHandback(mergeDir, currentBranch, squashBranch, backupBranch, prNumber, hashes) {
+    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.writeFileSync(path.join(mergeDir, 'updatemain-conflicted-files.txt'), raw + '\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);
+    printConflictHandback(mergeDir, squashBranch, conflictedFiles);
+    process.exit(2);
+}
+function finalizeBranch(currentBranch, squashBranch, backupBranch, prNumber) {
+    process.stdout.write('\n' + SEP + '🗑️  Finalizing\n' + SEP + '\n');
+    (0, git_exec_1.runGitChecked)(['branch', '-D', currentBranch], 'Failed to delete old feature branch');
+    const remoteExists = (0, child_process_1.spawnSync)('git', ['ls-remote', '--exit-code', '--heads', 'origin', currentBranch]).status === 0;
+    if (remoteExists) {
+        process.stdout.write(prNumber ? `Updating PR #${prNumber} (force-with-lease)...\n` : 'Updating remote branch (force-with-lease)...\n');
+        (0, git_exec_1.runGitChecked)(['push', '-u', '--force-with-lease', 'origin', `${squashBranch}:${currentBranch}`], 'Failed to push to origin');
+    }
+    else {
+        process.stdout.write('No remote branch — local only.\n');
+    }
+    (0, git_exec_1.runGitChecked)(['checkout', squashBranch], 'Failed to checkout squash branch');
+    (0, git_exec_1.runGitChecked)(['branch', '-m', currentBranch], 'Failed to rename squash branch');
+    process.stdout.write(`\n✅ Branch ${currentBranch} updated from main. Backup: ${backupBranch}\n`);
+    process.stdout.write(`   Delete backup when safe: git branch -D ${backupBranch}\n\n`);
+}
+async function handleResume(mergeDir, marker) {
+    if (!marker.validated) {
+        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-git-merge-complete\n\n');
+        process.exit(1);
+    }
+    process.stdout.write('Resuming: merge validated — finalizing.\n');
+    finalizeBranch(marker.currentBranch, marker.squashBranch, marker.backupBranch, marker.prNumber);
+    (0, merge_state_1.clearMergeMarker)(mergeDir);
+    await (0, cleanTmp_1.main)();
+}
+async function runFreshUpdate(mergeDir) {
+    const currentBranch = (0, child_process_1.execSync)('git branch --show-current', { encoding: 'utf8' }).trim();
+    if (currentBranch.endsWith('Squash')) {
+        process.stderr.write(`❌ On a leftover ${currentBranch} branch with no merge marker. Clean up: git branch -D ${currentBranch}\n`);
+        process.exit(1);
+    }
+    process.stdout.write('\n' + SEP + '🔄 Squash-Merge Update from Main\n' + SEP + '\n');
+    await (0, git_gatherInfo_1.main)();
+    const hashes = JSON.parse(fs.readFileSync(path.join(mergeDir, 'updatemain-hashes.json'), 'utf8'));
+    const prNumber = detectPr(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);
+    const squashBranch = `${currentBranch}Squash`;
+    if ((0, child_process_1.spawnSync)('git', ['show-ref', '--verify', '--quiet', `refs/heads/${squashBranch}`]).status === 0) {
+        process.stderr.write(`❌ Stale ${squashBranch} from a previous run. Delete it: git branch -D ${squashBranch}\n`);
+        process.exit(1);
+    }
+    (0, git_exec_1.runGitChecked)(['checkout', 'main'], 'Failed to checkout main');
+    (0, git_exec_1.runGitChecked)(['pull', 'origin', 'main'], 'Failed to pull origin/main');
+    (0, git_exec_1.runGitChecked)(['checkout', '-b', squashBranch], 'Failed to create squash branch');
+    process.stdout.write('\n' + SEP + `🔀 Squash merging ${currentBranch}\n` + SEP + '\n');
+    const merge = (0, child_process_1.spawnSync)('git', ['merge', '--squash', currentBranch], { stdio: 'inherit' });
+    if (merge.status !== 0) {
+        handleConflictsHandback(mergeDir, currentBranch, squashBranch, backupBranch, prNumber, hashes);
+        return;
+    }
+    const nothingStaged = (0, child_process_1.spawnSync)('git', ['diff-index', '--quiet', '--cached', 'HEAD', '--']).status === 0;
+    if (nothingStaged) {
+        process.stdout.write('ℹ️  Already up-to-date with main (nothing to merge).\n');
+    }
+    else {
+        (0, git_exec_1.runGitChecked)(['commit', '-m', `Squash merge of ${currentBranch}`], 'Failed to commit squash merge');
+    }
+    finalizeBranch(currentBranch, squashBranch, backupBranch, prNumber);
+    await (0, cleanTmp_1.main)();
+}
+async function main() {
+    const repoRoot = (0, child_process_1.execSync)('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();
+    const featureName = (0, git_readAiBranchName_1.getFeatureName)();
+    const mergeDir = (0, merge_state_1.mergeDirFor)(repoRoot, featureName);
+    fs.mkdirSync(mergeDir, { recursive: true });
+    const existing = (0, merge_state_1.readMergeMarker)(mergeDir);
+    if (existing) {
+        await handleResume(mergeDir, existing);
+        return;
+    }
+    await runFreshUpdate(mergeDir);
+}
+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=git-updateFromMain.js.map

package/src/scripts/git-updateFromMain.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-updateFromMain.js","sourceRoot":"","sources":["../../../../../../packages/tooling/pr-gate/src/scripts/git-updateFromMain.ts"],"names":[],"mappings":"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","sourcesContent":["#!/usr/bin/env node\nimport { execSync, spawnSync } from 'child_process';\nimport * as fs from 'fs';\nimport * as path from 'path';\nimport { getFeatureName } from './workflow/git-readAiBranchName';\nimport { main as gatherInfo } from './git-gatherInfo';\nimport { main as cleanTmp } from './workflow/cleanTmp';\nimport { runGitChecked } from './workflow/git-exec';\nimport {\n    MergeMarker,\n    mergeDirFor,\n    readMergeMarker,\n    writeMergeMarker,\n    clearMergeMarker,\n} from './workflow/merge-state';\n\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\n';\n\ninterface HashPoints {\n    hashForkPoint: string;\n    hashFeatureHead: string;\n    hashMainHead: string;\n}\n\nfunction detectPr(currentBranch: string): string {\n    const result = spawnSync(\n        'gh', ['pr', 'list', '--head', currentBranch, '--json', 'number', '--jq', '.[0].number'],\n        { encoding: 'utf8' },\n    );\n    return result.status === 0 ? (result.stdout ?? '').trim() : '';\n}\n\nfunction createBackup(currentBranch: string): string {\n    process.stdout.write('\\n' + SEP + '💾 Creating Incremental Backup\\n' + SEP + '\\n');\n    let n = 1;\n    while (spawnSync('git', ['show-ref', '--verify', '--quiet', `refs/heads/${currentBranch}Backup${n}`]).status === 0) {\n        n += 1;\n    }\n    const backupBranch = `${currentBranch}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 safePath = file.replace(/\\//g, '__');\n        const fileDir = path.join(mergeDir, `updatemain-${safePath}`);\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\nfunction printConflictHandback(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    process.stdout.write(`3-point context per file in: ${mergeDir}/updatemain-<file>/\\n`);\n    process.stdout.write('  A-forkpoint.txt (base) · B-feature.txt (yours) · C-main.txt (main) · B-A.diff · C-A.diff\\n\\n');\n    process.stdout.write('RESOLVE NOW (in the working tree):\\n');\n    process.stdout.write('  1. Edit each conflicted file, combining your changes (B−A) with main\\'s (C−A).\\n');\n    process.stdout.write('  2. Do NOT git commit / git push / gh pr — these are blocked until validated.\\n');\n    process.stdout.write('  3. When every file is resolved, run:  pnpm wp-git-merge-complete\\n');\n    process.stdout.write('     (runs the conflict-marker scan + build; commits only if green)\\n');\n    process.stdout.write('  4. Then re-run  pnpm wp-upsert-pr  (or pnpm wp-git-update) to finalize & push.\\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\nfunction handleConflictsHandback(\n    mergeDir: string, currentBranch: string, squashBranch: string,\n    backupBranch: string, prNumber: string, hashes: HashPoints,\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    printConflictHandback(mergeDir, squashBranch, conflictedFiles);\n    process.exit(2);\n}\n\nfunction finalizeBranch(\n    currentBranch: string, squashBranch: string, backupBranch: string, prNumber: string,\n): void {\n    process.stdout.write('\\n' + SEP + '🗑️  Finalizing\\n' + SEP + '\\n');\n    runGitChecked(['branch', '-D', currentBranch], 'Failed to delete old feature branch');\n\n    const remoteExists = spawnSync('git', ['ls-remote', '--exit-code', '--heads', 'origin', currentBranch]).status === 0;\n    if (remoteExists) {\n        process.stdout.write(prNumber ? `Updating PR #${prNumber} (force-with-lease)...\\n` : 'Updating remote branch (force-with-lease)...\\n');\n        runGitChecked(['push', '-u', '--force-with-lease', 'origin', `${squashBranch}:${currentBranch}`], 'Failed to push to origin');\n    } else {\n        process.stdout.write('No remote branch — local only.\\n');\n    }\n    runGitChecked(['checkout', squashBranch], 'Failed to checkout squash branch');\n    runGitChecked(['branch', '-m', currentBranch], 'Failed to rename squash branch');\n\n    process.stdout.write(`\\n✅ Branch ${currentBranch} updated from main. Backup: ${backupBranch}\\n`);\n    process.stdout.write(`   Delete backup when safe: git branch -D ${backupBranch}\\n\\n`);\n}\n\nasync function handleResume(mergeDir: string, marker: MergeMarker): Promise<void> {\n    if (!marker.validated) {\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-git-merge-complete\\n\\n');\n        process.exit(1);\n    }\n    process.stdout.write('Resuming: merge validated — finalizing.\\n');\n    finalizeBranch(marker.currentBranch, marker.squashBranch, marker.backupBranch, marker.prNumber);\n    clearMergeMarker(mergeDir);\n    await cleanTmp();\n}\n\nasync function runFreshUpdate(mergeDir: string): Promise<void> {\n    const currentBranch = execSync('git branch --show-current', { encoding: 'utf8' }).trim();\n    if (currentBranch.endsWith('Squash')) {\n        process.stderr.write(`❌ On a leftover ${currentBranch} branch with no merge marker. Clean up: git branch -D ${currentBranch}\\n`);\n        process.exit(1);\n    }\n\n    process.stdout.write('\\n' + SEP + '🔄 Squash-Merge Update from Main\\n' + SEP + '\\n');\n    await gatherInfo();\n    const hashes = JSON.parse(fs.readFileSync(path.join(mergeDir, 'updatemain-hashes.json'), 'utf8')) as HashPoints;\n\n    const prNumber = detectPr(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 squashBranch = `${currentBranch}Squash`;\n    if (spawnSync('git', ['show-ref', '--verify', '--quiet', `refs/heads/${squashBranch}`]).status === 0) {\n        process.stderr.write(`❌ Stale ${squashBranch} from a previous run. Delete it: git branch -D ${squashBranch}\\n`);\n        process.exit(1);\n    }\n\n    runGitChecked(['checkout', 'main'], 'Failed to checkout main');\n    runGitChecked(['pull', 'origin', 'main'], 'Failed to pull origin/main');\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(mergeDir, currentBranch, squashBranch, backupBranch, prNumber, hashes);\n        return;\n    }\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    finalizeBranch(currentBranch, squashBranch, backupBranch, prNumber);\n    await cleanTmp();\n}\n\nexport async function main(): Promise<void> {\n    const repoRoot = execSync('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();\n    const featureName = getFeatureName();\n    const mergeDir = mergeDirFor(repoRoot, featureName);\n    fs.mkdirSync(mergeDir, { recursive: true });\n\n    const existing = readMergeMarker(mergeDir);\n    if (existing) {\n        await handleResume(mergeDir, existing);\n        return;\n    }\n    await runFreshUpdate(mergeDir);\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/workflow/build-affected.d.ts

@@ -0,0 +1,7 @@
+export declare const DEFAULT_BUILD_COMMAND = "pnpm nx affected --target=ci --base=origin/main";
+/**
+ * Run the build gate. Returns the process exit code (0 = pass). `buildCommand` overrides
+ * the default (sourced from PrGateConfig.buildCommand by callers); empty/undefined uses the
+ * default affected-ci command.
+ */
+export declare function runBuildAffected(repoRoot: string, buildCommand?: string): number;

package/src/scripts/workflow/build-affected.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_BUILD_COMMAND = void 0;
+exports.runBuildAffected = runBuildAffected;
+const child_process_1 = require("child_process");
+// Single source of truth for the build gate. Both `wp-build-affected` (CI + local) and the
+// merge validation gate (`wp-git-merge-complete`) run THIS, so "what CI runs" and "what the
+// PR command runs" can never drift. nx `affected` only rebuilds changed projects, so this
+// stays fast on a large monorepo.
+exports.DEFAULT_BUILD_COMMAND = 'pnpm nx affected --target=ci --base=origin/main';
+/**
+ * Run the build gate. Returns the process exit code (0 = pass). `buildCommand` overrides
+ * the default (sourced from PrGateConfig.buildCommand by callers); empty/undefined uses the
+ * default affected-ci command.
+ */
+function runBuildAffected(repoRoot, buildCommand) {
+    const cmd = buildCommand !== undefined && buildCommand.trim() !== '' ? buildCommand : exports.DEFAULT_BUILD_COMMAND;
+    process.stdout.write(`\n▶ Build gate: ${cmd}\n\n`);
+    const result = (0, child_process_1.spawnSync)(cmd, { stdio: 'inherit', cwd: repoRoot, shell: true });
+    return result.status ?? 1;
+}
+//# sourceMappingURL=build-affected.js.map

package/src/scripts/workflow/build-affected.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"build-affected.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/build-affected.ts"],"names":[],"mappings":";;;AAaA,4CAKC;AAlBD,iDAA0C;AAE1C,2FAA2F;AAC3F,4FAA4F;AAC5F,0FAA0F;AAC1F,kCAAkC;AACrB,QAAA,qBAAqB,GAAG,iDAAiD,CAAC;AAEvF;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,QAAgB,EAAE,YAAqB;IACpE,MAAM,GAAG,GAAG,YAAY,KAAK,SAAS,IAAI,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,6BAAqB,CAAC;IAC5G,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,GAAG,MAAM,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,GAAG,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAChF,OAAO,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC;AAC9B,CAAC","sourcesContent":["import { spawnSync } from 'child_process';\n\n// Single source of truth for the build gate. Both `wp-build-affected` (CI + local) and the\n// merge validation gate (`wp-git-merge-complete`) run THIS, so \"what CI runs\" and \"what the\n// PR command runs\" can never drift. nx `affected` only rebuilds changed projects, so this\n// stays fast on a large monorepo.\nexport const DEFAULT_BUILD_COMMAND = 'pnpm nx affected --target=ci --base=origin/main';\n\n/**\n * Run the build gate. Returns the process exit code (0 = pass). `buildCommand` overrides\n * the default (sourced from PrGateConfig.buildCommand by callers); empty/undefined uses the\n * default affected-ci command.\n */\nexport function runBuildAffected(repoRoot: string, buildCommand?: string): number {\n    const cmd = buildCommand !== undefined && buildCommand.trim() !== '' ? buildCommand : DEFAULT_BUILD_COMMAND;\n    process.stdout.write(`\\n▶ Build gate: ${cmd}\\n\\n`);\n    const result = spawnSync(cmd, { stdio: 'inherit', cwd: repoRoot, shell: true });\n    return result.status ?? 1;\n}\n"]}

package/src/scripts/workflow/cleanTmp.d.ts

@@ -0,0 +1 @@
+export declare function main(): Promise<void>;

package/src/scripts/workflow/cleanTmp.js

@@ -0,0 +1,57 @@
+"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 path = tslib_1.__importStar(require("path"));
+const CUTOFF_DAYS = 30;
+const SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n';
+async function main() {
+    const repoRoot = (0, child_process_1.execSync)('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();
+    const tmpBase = path.join(repoRoot, 'webpiecesTmp');
+    if (!fs.existsSync(tmpBase)) {
+        return;
+    }
+    process.stdout.write('\n');
+    process.stdout.write(SEP);
+    process.stdout.write('🧹 Cleaning Old Temporary Directories\n');
+    process.stdout.write(SEP);
+    process.stdout.write('\n');
+    process.stdout.write(`Location: ${tmpBase}\n`);
+    process.stdout.write(`Retention: ${CUTOFF_DAYS} days\n`);
+    process.stdout.write('\n');
+    const cutoffMs = CUTOFF_DAYS * 24 * 60 * 60 * 1000;
+    const now = Date.now();
+    let deletedCount = 0;
+    const entries = fs.readdirSync(tmpBase);
+    for (const entry of entries) {
+        const fullPath = path.join(tmpBase, entry);
+        const stat = fs.statSync(fullPath);
+        if (!stat.isDirectory())
+            continue;
+        if (now - stat.mtimeMs < cutoffMs)
+            continue;
+        process.stdout.write(`  🗑️  Deleting: ${entry}\n`);
+        fs.rmSync(fullPath, { recursive: true, force: true });
+        deletedCount += 1;
+    }
+    if (deletedCount === 0) {
+        process.stdout.write(`  ✅ No directories older than ${CUTOFF_DAYS} days found\n`);
+    }
+    else {
+        process.stdout.write('\n');
+        process.stdout.write(`  ✅ Deleted ${deletedCount} old director${deletedCount === 1 ? 'y' : 'ies'}\n`);
+    }
+    process.stdout.write('\n');
+    process.stdout.write(SEP);
+    process.stdout.write('\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=cleanTmp.js.map

package/src/scripts/workflow/cleanTmp.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cleanTmp.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/cleanTmp.ts"],"names":[],"mappings":"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","sourcesContent":["import { execSync } from 'child_process';\nimport * as fs from 'fs';\nimport * as path from 'path';\n\nconst CUTOFF_DAYS = 30;\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\n';\n\nexport async function main(): Promise<void> {\n    const repoRoot = execSync('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();\n    const tmpBase = path.join(repoRoot, 'webpiecesTmp');\n\n    if (!fs.existsSync(tmpBase)) {\n        return;\n    }\n\n    process.stdout.write('\\n');\n    process.stdout.write(SEP);\n    process.stdout.write('🧹 Cleaning Old Temporary Directories\\n');\n    process.stdout.write(SEP);\n    process.stdout.write('\\n');\n    process.stdout.write(`Location: ${tmpBase}\\n`);\n    process.stdout.write(`Retention: ${CUTOFF_DAYS} days\\n`);\n    process.stdout.write('\\n');\n\n    const cutoffMs = CUTOFF_DAYS * 24 * 60 * 60 * 1000;\n    const now = Date.now();\n    let deletedCount = 0;\n\n    const entries = fs.readdirSync(tmpBase);\n    for (const entry of entries) {\n        const fullPath = path.join(tmpBase, entry);\n        const stat = fs.statSync(fullPath);\n        if (!stat.isDirectory()) continue;\n        if (now - stat.mtimeMs < cutoffMs) continue;\n\n        process.stdout.write(`  🗑️  Deleting: ${entry}\\n`);\n        fs.rmSync(fullPath, { recursive: true, force: true });\n        deletedCount += 1;\n    }\n\n    if (deletedCount === 0) {\n        process.stdout.write(`  ✅ No directories older than ${CUTOFF_DAYS} days found\\n`);\n    } else {\n        process.stdout.write('\\n');\n        process.stdout.write(`  ✅ Deleted ${deletedCount} old director${deletedCount === 1 ? 'y' : 'ies'}\\n`);\n    }\n\n    process.stdout.write('\\n');\n    process.stdout.write(SEP);\n    process.stdout.write('\\n');\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/workflow/git-exec.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Run a git command that is expected to succeed; abort the process with a clear message
+ * if it fails. Used for fetch/pull/checkout/commit where silently continuing on failure
+ * would operate on stale or wrong state.
+ */
+export declare function runGitChecked(args: string[], errMsg: string): void;

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

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runGitChecked = runGitChecked;
+const child_process_1 = require("child_process");
+/**
+ * Run a git command that is expected to succeed; abort the process with a clear message
+ * if it fails. Used for fetch/pull/checkout/commit where silently continuing on failure
+ * would operate on stale or wrong state.
+ */
+function runGitChecked(args, errMsg) {
+    const result = (0, child_process_1.spawnSync)('git', args, { stdio: 'inherit' });
+    if (result.status !== 0) {
+        process.stderr.write(`❌ ${errMsg} (git ${args.join(' ')} exited ${String(result.status)})\n`);
+        process.exit(1);
+    }
+}
+//# sourceMappingURL=git-exec.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"git-exec.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/git-exec.ts"],"names":[],"mappings":";;AAOA,sCAMC;AAbD,iDAA0C;AAE1C;;;;GAIG;AACH,SAAgB,aAAa,CAAC,IAAc,EAAE,MAAc;IACxD,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,KAAK,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;IAC5D,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,SAAS,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9F,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;AACL,CAAC","sourcesContent":["import { spawnSync } from 'child_process';\n\n/**\n * Run a git command that is expected to succeed; abort the process with a clear message\n * if it fails. Used for fetch/pull/checkout/commit where silently continuing on failure\n * would operate on stale or wrong state.\n */\nexport function runGitChecked(args: string[], errMsg: string): void {\n    const result = spawnSync('git', args, { stdio: 'inherit' });\n    if (result.status !== 0) {\n        process.stderr.write(`❌ ${errMsg} (git ${args.join(' ')} exited ${String(result.status)})\\n`);\n        process.exit(1);\n    }\n}\n"]}

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

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

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

@@ -0,0 +1,120 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findForkPoint = findForkPoint;
+exports.main = main;
+const tslib_1 = require("tslib");
+const child_process_1 = require("child_process");
+const fs = tslib_1.__importStar(require("fs"));
+const path = tslib_1.__importStar(require("path"));
+const git_readAiBranchName_1 = require("./git-readAiBranchName");
+const SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n';
+function printMergeFromMainError(commit, parent, featureName, currentBranch) {
+    process.stderr.write('\n');
+    process.stderr.write(SEP);
+    process.stderr.write('❌ This branch merged main without pnpm wp-git-update\n');
+    process.stderr.write(SEP);
+    process.stderr.write('\n');
+    process.stderr.write(`Merge commit detected: ${commit}\n`);
+    process.stderr.write(`Parent from main:      ${parent}\n`);
+    process.stderr.write('\n');
+    process.stderr.write('This prevents clean squash-merge. To recover, follow these steps:\n');
+    process.stderr.write('\n');
+    process.stderr.write('1. Switch to main branch:\n');
+    process.stderr.write('   git checkout main\n');
+    process.stderr.write('\n');
+    process.stderr.write('2. Pull latest changes:\n');
+    process.stderr.write('   git pull\n');
+    process.stderr.write('\n');
+    process.stderr.write('3. Create new branch with a new name:\n');
+    process.stderr.write(`   git checkout -b ${featureName}-v2\n`);
+    process.stderr.write('\n');
+    process.stderr.write('4. Squash merge your old branch:\n');
+    process.stderr.write(`   git merge --squash ${currentBranch}\n`);
+    process.stderr.write('\n');
+    process.stderr.write('5. Commit the squashed changes:\n');
+    process.stderr.write(`   git add -A && git commit -m "Squashed from ${currentBranch}"\n`);
+    process.stderr.write('\n');
+    process.stderr.write('6. If you have an existing PR:\n');
+    process.stderr.write(`   - Create a NEW PR for ${featureName}-v2\n`);
+    process.stderr.write(`   - Close the old PR for ${currentBranch}\n`);
+    process.stderr.write('\n');
+    process.stderr.write(SEP);
+    process.stderr.write('\n');
+}
+function checkMergeCommits(mergeCommits, outputDir, prefix, featureName, currentBranch) {
+    process.stderr.write(`Found ${mergeCommits.length} merge commit(s) to check...\n`);
+    for (const commit of mergeCommits) {
+        const parentsResult = (0, child_process_1.spawnSync)('git', ['rev-list', '--parents', '-n', '1', commit], { encoding: 'utf8' });
+        const parents = (parentsResult.stdout ?? '').trim().split(' ').slice(1);
+        for (const parent of parents) {
+            const ancestorCheck = (0, child_process_1.spawnSync)('git', ['merge-base', '--is-ancestor', parent, 'origin/main']);
+            const reverseCheck = (0, child_process_1.spawnSync)('git', ['merge-base', '--is-ancestor', 'origin/main', parent]);
+            if (ancestorCheck.status === 0 && reverseCheck.status === 0) {
+                const errorJson = JSON.stringify({
+                    error: 'Merge from main detected',
+                    mergeCommit: commit,
+                    parentFromMain: parent,
+                    timestamp: new Date().toISOString(),
+                }, null, 2);
+                fs.writeFileSync(path.join(outputDir, `${prefix}forkpoint-error.json`), errorJson + '\n');
+                printMergeFromMainError(commit, parent, featureName, currentBranch);
+                process.exit(1);
+            }
+        }
+    }
+    process.stderr.write('✅ No improper merges from main detected\n');
+}
+async function findForkPoint(workflow) {
+    if (workflow !== 'review' && workflow !== 'merge') {
+        process.stderr.write('ERROR: Workflow argument required\n');
+        process.stderr.write('Usage: git-findForkPoint <workflow>\n');
+        process.stderr.write("  workflow: 'review' or 'merge'\n");
+        process.exit(1);
+    }
+    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();
+    const outputDir = path.join(repoRoot, 'webpiecesTmp', `${workflow}-${featureName}`);
+    const prefix = workflow === 'review' ? 'review-' : 'updatemain-';
+    fs.mkdirSync(outputDir, { recursive: true });
+    (0, child_process_1.spawnSync)('git', ['fetch', 'origin', 'main'], { stdio: 'ignore' });
+    const featureHead = (0, child_process_1.execSync)('git rev-parse HEAD', { encoding: 'utf8' }).trim();
+    const originMain = (0, child_process_1.execSync)('git rev-parse origin/main', { encoding: 'utf8' }).trim();
+    process.stderr.write('Finding fork point using git merge-base...\n');
+    const forkPointResult = (0, child_process_1.spawnSync)('git', ['merge-base', 'origin/main', 'HEAD'], { encoding: 'utf8' });
+    const forkPoint = (forkPointResult.stdout ?? '').trim();
+    if (!forkPoint || forkPointResult.status !== 0) {
+        process.stderr.write('ERROR: Could not find common ancestor with origin/main\n');
+        process.exit(1);
+    }
+    process.stderr.write(`✅ Fork point found: ${forkPoint.slice(0, 7)}\n`);
+    process.stderr.write('Checking for improper merges from main...\n');
+    const mergeCommitsResult = (0, child_process_1.spawnSync)('git', ['log', `${forkPoint}..HEAD`, '--merges', '--format=%H'], { encoding: 'utf8' });
+    const mergeCommitsRaw = (mergeCommitsResult.stdout ?? '').trim();
+    const mergeCommits = mergeCommitsRaw ? mergeCommitsRaw.split('\n') : [];
+    if (mergeCommits.length > 0) {
+        checkMergeCommits(mergeCommits, outputDir, prefix, featureName, currentBranch);
+    }
+    else {
+        process.stderr.write('✅ No merge commits found (clean history)\n');
+    }
+    const hashesJson = JSON.stringify({
+        hashForkPoint: forkPoint,
+        hashFeatureHead: featureHead,
+        hashMainHead: originMain,
+        timestamp: new Date().toISOString(),
+    }, null, 2);
+    fs.writeFileSync(path.join(outputDir, `${prefix}hashes.json`), hashesJson + '\n');
+    process.stderr.write(`✅ Hash points written to: ${outputDir}/${prefix}hashes.json\n`);
+}
+async function main() {
+    await findForkPoint(process.argv[2] ?? '');
+}
+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=git-findForkPoint.js.map

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

@@ -0,0 +1 @@
+{"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 { getFeatureName } from './git-readAiBranchName';\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    const outputDir = path.join(repoRoot, 'webpiecesTmp', `${workflow}-${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"]}

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

@@ -0,0 +1,2 @@
+export declare function getFeatureName(): string;
+export declare function main(): Promise<void>;

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

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFeatureName = getFeatureName;
+exports.main = main;
+const child_process_1 = require("child_process");
+function getFeatureName() {
+    const branch = (0, child_process_1.execSync)('git branch --show-current', { encoding: 'utf8' }).trim();
+    return branch.replace(/\//g, '-').replace(/Squash$/, '');
+}
+async function main() {
+    process.stdout.write(getFeatureName() + '\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=git-readAiBranchName.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"git-readAiBranchName.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/git-readAiBranchName.ts"],"names":[],"mappings":";;AAEA,wCAGC;AAED,oBAEC;AATD,iDAAyC;AAEzC,SAAgB,cAAc;IAC1B,MAAM,MAAM,GAAG,IAAA,wBAAQ,EAAC,2BAA2B,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAClF,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAC7D,CAAC;AAEM,KAAK,UAAU,IAAI;IACtB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,CAAC;AAClD,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 } from 'child_process';\n\nexport function getFeatureName(): string {\n    const branch = execSync('git branch --show-current', { encoding: 'utf8' }).trim();\n    return branch.replace(/\\//g, '-').replace(/Squash$/, '');\n}\n\nexport async function main(): Promise<void> {\n    process.stdout.write(getFeatureName() + '\\n');\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/workflow/git-validateUpToDate.d.ts

@@ -0,0 +1 @@
+export declare function main(): Promise<void>;

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

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.main = main;
+const child_process_1 = require("child_process");
+const SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n';
+async function main() {
+    const branch = (0, child_process_1.execSync)('git branch --show-current', { encoding: 'utf8' }).trim();
+    if (branch === 'main') {
+        process.stdout.write('✅ On main branch - no validation needed\n');
+        return;
+    }
+    process.stdout.write('Validating branch is up to date with origin/main...\n');
+    process.stdout.write(`Current branch: ${branch}\n`);
+    process.stdout.write('\n');
+    process.stdout.write('Fetching latest from origin/main...\n');
+    (0, child_process_1.spawnSync)('git', ['fetch', 'origin', 'main', '--quiet'], { stdio: 'inherit' });
+    const isUpToDate = (0, child_process_1.spawnSync)('git', ['merge-base', '--is-ancestor', 'origin/main', 'HEAD']).status === 0;
+    if (isUpToDate) {
+        process.stdout.write('✅ Branch is up to date with origin/main\n');
+        return;
+    }
+    const behindResult = (0, child_process_1.spawnSync)('git', ['rev-list', '--count', 'HEAD..origin/main'], { encoding: 'utf8' });
+    const commitsBehind = (behindResult.stdout ?? '').trim();
+    const recentResult = (0, child_process_1.spawnSync)('git', ['log', '--oneline', 'HEAD..origin/main'], { encoding: 'utf8' });
+    const recentLines = (recentResult.stdout ?? '').split('\n').filter((l) => l).slice(0, 5).join('\n');
+    process.stdout.write('\n');
+    process.stdout.write(SEP);
+    process.stdout.write('❌ ERROR: Branch is NOT up to date with origin/main\n');
+    process.stdout.write(SEP);
+    process.stdout.write('\n');
+    process.stdout.write(`Your branch is ${commitsBehind} commit(s) behind origin/main\n`);
+    process.stdout.write('\n');
+    process.stdout.write('Recent commits in origin/main not in your branch:\n');
+    process.stdout.write(recentLines + '\n');
+    process.stdout.write('\n');
+    process.stdout.write(SEP);
+    process.stdout.write('⚠️  CRITICAL: You must update your branch first!\n');
+    process.stdout.write(SEP);
+    process.stdout.write('\n');
+    process.stdout.write('1. Update your branch with latest main:\n');
+    process.stdout.write('   pnpm wp-git-update\n');
+    process.stdout.write('\n');
+    process.stdout.write('2. ⚠️  IMPORTANT: REVIEW THE CODE AFTER MERGE!\n');
+    process.stdout.write('   - Check for merge conflicts\n');
+    process.stdout.write('   - Review how your changes interact with new main code\n');
+    process.stdout.write('   - Test that everything still works\n');
+    process.stdout.write('   - This is where things often go wrong!\n');
+    process.stdout.write('\n');
+    process.stdout.write('3. After reviewing, run your command again\n');
+    process.stdout.write('\n');
+    process.stdout.write(SEP);
+    process.stdout.write('Why this matters:\n');
+    process.stdout.write(SEP);
+    process.stdout.write('\n');
+    process.stdout.write('- Your test plan should cover how your changes work with\n');
+    process.stdout.write('  the LATEST code from main, not outdated code\n');
+    process.stdout.write('- Merging main might introduce conflicts or integration\n');
+    process.stdout.write('  issues that need testing\n');
+    process.stdout.write('- Your changes might interact unexpectedly with new code\n');
+    process.stdout.write('  from main\n');
+    process.stdout.write('\n');
+    process.stdout.write(SEP);
+    process.exit(1);
+}
+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=git-validateUpToDate.js.map