@webpieces/pr-gate 0.3.354 → 0.3.356

package/src/scripts/git-gatherInfo.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GatherInfoResult = void 0;
-exports.gatherInfo = gatherInfo;
+exports.GatherInfo = exports.GatherInfoResult = void 0;
 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 rules_config_1 = require("@webpieces/rules-config");
+const core_context_1 = require("@webpieces/core-context");
+const inversify_1 = require("inversify");
 const git_readAiBranchName_1 = require("./workflow/git-readAiBranchName");
 const git_findForkPoint_1 = require("./workflow/git-findForkPoint");
 const merge_state_1 = require("./workflow/merge-state");
@@ -14,8 +15,7 @@ const git_exec_1 = require("./workflow/git-exec");
 const SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n';
 // Result of gathering merge context: whether the branch is already even with main (fork point == main
 // HEAD, so there is nothing to merge) plus the 3 hash points. A class (not an object literal) per the
-// codebase's data-structure convention. gatherInfo RETURNS this instead of calling process.exit — a
-// library function must never exit the process (see CliExitError / runMain).
+// codebase's data-structure convention. gatherInfo RETURNS this instead of calling process.exit.
 class GatherInfoResult {
     alreadyUpToDate;
     hashes;
@@ -25,68 +25,86 @@ class GatherInfoResult {
     }
 }
 exports.GatherInfoResult = GatherInfoResult;
-function validateCleanTree(currentBranch, repoRoot) {
-    if (currentBranch === 'main') {
-        throw new rules_config_1.CliExitError(1, '❌ Error: Already on main branch. No need to update from main.');
+/** Gathers the 3-point merge context (fetch main, find fork point, write hashes) for merge-start. */
+let GatherInfo = class GatherInfo {
+    aiBranchName;
+    forkPoint;
+    mergeState;
+    gitExec;
+    constructor(aiBranchName, forkPoint, mergeState, gitExec) {
+        this.aiBranchName = aiBranchName;
+        this.forkPoint = forkPoint;
+        this.mergeState = mergeState;
+        this.gitExec = gitExec;
     }
-    process.stderr.write(`Current branch: ${currentBranch}\n`);
-    // Require a fully-committed tree (tracked AND untracked). The old check used `git diff-index`,
-    // which is tracked-only, so a stale untracked dir slipped through and was later swept into the
-    // squash commit by `git add -A`. assertCleanTree uses `git status --porcelain` (untracked-aware,
-    // gitignore-respecting) and aborts with instructions — the tooling never commits your work for you.
-    (0, git_exec_1.assertCleanTree)(repoRoot);
-}
-function printHashPoints(hashes, currentBranch, mergeDir) {
-    process.stderr.write('📍 The 3 Hash Points:\n');
-    process.stderr.write(`  1. Fork point (A):   ${hashes.hashForkPoint}\n`);
-    process.stderr.write(`     (where ${currentBranch} diverged from main)\n`);
-    process.stderr.write('\n');
-    process.stderr.write(`  2. Feature HEAD (B): ${hashes.hashFeatureHead}\n`);
-    process.stderr.write(`     (tip of ${currentBranch})\n`);
-    process.stderr.write('\n');
-    process.stderr.write(`  3. Main HEAD (C):    ${hashes.hashMainHead}\n`);
-    process.stderr.write('     (current origin/main)\n');
-    process.stderr.write('\n');
-    process.stderr.write(`Merge directory: ${mergeDir}\n`);
-    process.stderr.write('\n');
-}
-// Gather the 3-point merge context for the current feature branch (fetches main, finds the fork
-// point, writes updatemain-hashes.json) and RETURN whether the branch is already even with main.
-// NEVER calls process.exit: it is called as a library (from merge-start). Callers decide what to
-// do with an up-to-date branch.
-async function gatherInfo() {
-    const currentBranch = (0, child_process_1.execSync)('git branch --show-current', { encoding: 'utf8' }).trim();
-    const featureName = (0, git_readAiBranchName_1.getFeatureName)();
-    const repoRoot = (0, child_process_1.execSync)('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();
-    const mergeDir = (0, merge_state_1.mergeDirFor)(repoRoot, featureName);
-    fs.mkdirSync(mergeDir, { recursive: true });
-    validateCleanTree(currentBranch, repoRoot);
-    process.stderr.write('\n');
-    process.stderr.write(SEP);
-    process.stderr.write('📍 Gathering Merge Context\n');
-    process.stderr.write(SEP);
-    process.stderr.write('\n');
-    process.stderr.write('Fetching latest changes from origin/main...\n');
-    (0, child_process_1.spawnSync)('git', ['fetch', 'origin', 'main'], { stdio: 'inherit' });
-    await (0, git_findForkPoint_1.findForkPoint)('merge');
-    const hashesFile = path.join(mergeDir, 'updatemain-hashes.json');
-    const hashes = JSON.parse(fs.readFileSync(hashesFile, 'utf8'));
-    printHashPoints(hashes, currentBranch, mergeDir);
-    if (hashes.hashForkPoint === hashes.hashMainHead) {
+    // Gather the 3-point merge context for the current feature branch and RETURN whether the branch is
+    // already even with main. NEVER calls process.exit: it is called as a library (from merge-start).
+    async gatherInfo() {
+        const currentBranch = (0, child_process_1.execSync)('git branch --show-current', { encoding: 'utf8' }).trim();
+        const featureName = this.aiBranchName.getFeatureName();
+        const repoRoot = (0, child_process_1.execSync)('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();
+        const mergeDir = this.mergeState.mergeDirFor(repoRoot, featureName);
+        fs.mkdirSync(mergeDir, { recursive: true });
+        this.validateCleanTree(currentBranch, repoRoot);
+        process.stderr.write('\n');
         process.stderr.write(SEP);
-        process.stderr.write('✅ Already up to date with main!\n');
+        process.stderr.write('📍 Gathering Merge Context\n');
         process.stderr.write(SEP);
         process.stderr.write('\n');
-        process.stderr.write('Your branch has not diverged from main.\n');
-        process.stderr.write('There are no new changes from main to merge.\n');
+        process.stderr.write('Fetching latest changes from origin/main...\n');
+        (0, child_process_1.spawnSync)('git', ['fetch', 'origin', 'main'], { stdio: 'inherit' });
+        await this.forkPoint.findForkPoint('merge');
+        const hashesFile = path.join(mergeDir, 'updatemain-hashes.json');
+        const hashes = JSON.parse(fs.readFileSync(hashesFile, 'utf8'));
+        this.printHashPoints(hashes, currentBranch, mergeDir);
+        if (hashes.hashForkPoint === hashes.hashMainHead) {
+            process.stderr.write(SEP);
+            process.stderr.write('✅ Already up to date with main!\n');
+            process.stderr.write(SEP);
+            process.stderr.write('\n');
+            process.stderr.write('Your branch has not diverged from main.\n');
+            process.stderr.write('There are no new changes from main to merge.\n');
+            process.stderr.write('\n');
+            process.stderr.write(SEP);
+            return new GatherInfoResult(true, hashes);
+        }
+        process.stderr.write('Main has advanced. Merge will be needed.\n');
         process.stderr.write('\n');
         process.stderr.write(SEP);
-        return new GatherInfoResult(true, hashes);
+        process.stderr.write('\n');
+        return new GatherInfoResult(false, hashes);
     }
-    process.stderr.write('Main has advanced. Merge will be needed.\n');
-    process.stderr.write('\n');
-    process.stderr.write(SEP);
-    process.stderr.write('\n');
-    return new GatherInfoResult(false, hashes);
-}
+    validateCleanTree(currentBranch, repoRoot) {
+        if (currentBranch === 'main') {
+            throw new rules_config_1.CliExitError(1, '❌ Error: Already on main branch. No need to update from main.');
+        }
+        process.stderr.write(`Current branch: ${currentBranch}\n`);
+        // Require a fully-committed tree (tracked AND untracked). assertCleanTree uses
+        // `git status --porcelain` (untracked-aware, gitignore-respecting) and aborts with instructions.
+        this.gitExec.assertCleanTree(repoRoot);
+    }
+    printHashPoints(hashes, currentBranch, mergeDir) {
+        process.stderr.write('📍 The 3 Hash Points:\n');
+        process.stderr.write(`  1. Fork point (A):   ${hashes.hashForkPoint}\n`);
+        process.stderr.write(`     (where ${currentBranch} diverged from main)\n`);
+        process.stderr.write('\n');
+        process.stderr.write(`  2. Feature HEAD (B): ${hashes.hashFeatureHead}\n`);
+        process.stderr.write(`     (tip of ${currentBranch})\n`);
+        process.stderr.write('\n');
+        process.stderr.write(`  3. Main HEAD (C):    ${hashes.hashMainHead}\n`);
+        process.stderr.write('     (current origin/main)\n');
+        process.stderr.write('\n');
+        process.stderr.write(`Merge directory: ${mergeDir}\n`);
+        process.stderr.write('\n');
+    }
+};
+exports.GatherInfo = GatherInfo;
+exports.GatherInfo = GatherInfo = tslib_1.__decorate([
+    (0, core_context_1.provideSingleton)(),
+    (0, inversify_1.injectable)(),
+    tslib_1.__metadata("design:paramtypes", [git_readAiBranchName_1.AiBranchName,
+        git_findForkPoint_1.ForkPoint,
+        merge_state_1.MergeState,
+        git_exec_1.GitExec])
+], GatherInfo);
 //# sourceMappingURL=git-gatherInfo.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"git-gatherInfo.js","sourceRoot":"","sources":["../../../../../../packages/tooling/pr-gate/src/scripts/git-gatherInfo.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 { CliExitError } from '@webpieces/rules-config';\nimport { getFeatureName } from './workflow/git-readAiBranchName';\nimport { findForkPoint } from './workflow/git-findForkPoint';\nimport { mergeDirFor } from './workflow/merge-state';\nimport { assertCleanTree } from './workflow/git-exec';\n\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\n';\n\ninterface HashPoints {\n    hashForkPoint: string;\n    hashFeatureHead: string;\n    hashMainHead: string;\n}\n\n// Result of gathering merge context: whether the branch is already even with main (fork point == main\n// HEAD, so there is nothing to merge) plus the 3 hash points. A class (not an object literal) per the\n// codebase's data-structure convention. gatherInfo RETURNS this instead of calling process.exit — a\n// library function must never exit the process (see CliExitError / runMain).\nexport class GatherInfoResult {\n    alreadyUpToDate: boolean;\n    hashes: HashPoints;\n\n    constructor(alreadyUpToDate: boolean, hashes: HashPoints) {\n        this.alreadyUpToDate = alreadyUpToDate;\n        this.hashes = hashes;\n    }\n}\n\nfunction validateCleanTree(currentBranch: string, repoRoot: string): void {\n    if (currentBranch === 'main') {\n        throw new CliExitError(1, '❌ Error: Already on main branch. No need to update from main.');\n    }\n    process.stderr.write(`Current branch: ${currentBranch}\\n`);\n    // Require a fully-committed tree (tracked AND untracked). The old check used `git diff-index`,\n    // which is tracked-only, so a stale untracked dir slipped through and was later swept into the\n    // squash commit by `git add -A`. assertCleanTree uses `git status --porcelain` (untracked-aware,\n    // gitignore-respecting) and aborts with instructions — the tooling never commits your work for you.\n    assertCleanTree(repoRoot);\n}\n\nfunction printHashPoints(hashes: HashPoints, currentBranch: string, mergeDir: string): void {\n    process.stderr.write('📍 The 3 Hash Points:\\n');\n    process.stderr.write(`  1. Fork point (A):   ${hashes.hashForkPoint}\\n`);\n    process.stderr.write(`     (where ${currentBranch} diverged from main)\\n`);\n    process.stderr.write('\\n');\n    process.stderr.write(`  2. Feature HEAD (B): ${hashes.hashFeatureHead}\\n`);\n    process.stderr.write(`     (tip of ${currentBranch})\\n`);\n    process.stderr.write('\\n');\n    process.stderr.write(`  3. Main HEAD (C):    ${hashes.hashMainHead}\\n`);\n    process.stderr.write('     (current origin/main)\\n');\n    process.stderr.write('\\n');\n    process.stderr.write(`Merge directory: ${mergeDir}\\n`);\n    process.stderr.write('\\n');\n}\n\n// Gather the 3-point merge context for the current feature branch (fetches main, finds the fork\n// point, writes updatemain-hashes.json) and RETURN whether the branch is already even with main.\n// NEVER calls process.exit: it is called as a library (from merge-start). Callers decide what to\n// do with an up-to-date branch.\nexport async function gatherInfo(): Promise<GatherInfoResult> {\n    const currentBranch = execSync('git branch --show-current', { encoding: 'utf8' }).trim();\n    const featureName = getFeatureName();\n    const repoRoot = execSync('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();\n    const mergeDir = mergeDirFor(repoRoot, featureName);\n    fs.mkdirSync(mergeDir, { recursive: true });\n\n    validateCleanTree(currentBranch, repoRoot);\n\n    process.stderr.write('\\n');\n    process.stderr.write(SEP);\n    process.stderr.write('📍 Gathering Merge Context\\n');\n    process.stderr.write(SEP);\n    process.stderr.write('\\n');\n    process.stderr.write('Fetching latest changes from origin/main...\\n');\n    spawnSync('git', ['fetch', 'origin', 'main'], { stdio: 'inherit' });\n\n    await findForkPoint('merge');\n\n    const hashesFile = path.join(mergeDir, 'updatemain-hashes.json');\n    const hashes = JSON.parse(fs.readFileSync(hashesFile, 'utf8')) as HashPoints;\n\n    printHashPoints(hashes, currentBranch, mergeDir);\n\n    if (hashes.hashForkPoint === hashes.hashMainHead) {\n        process.stderr.write(SEP);\n        process.stderr.write('✅ Already up to date with main!\\n');\n        process.stderr.write(SEP);\n        process.stderr.write('\\n');\n        process.stderr.write('Your branch has not diverged from main.\\n');\n        process.stderr.write('There are no new changes from main to merge.\\n');\n        process.stderr.write('\\n');\n        process.stderr.write(SEP);\n        return new GatherInfoResult(true, hashes);\n    }\n\n    process.stderr.write('Main has advanced. Merge will be needed.\\n');\n    process.stderr.write('\\n');\n    process.stderr.write(SEP);\n    process.stderr.write('\\n');\n    return new GatherInfoResult(false, hashes);\n}\n"]}
+{"version":3,"file":"git-gatherInfo.js","sourceRoot":"","sources":["../../../../../../packages/tooling/pr-gate/src/scripts/git-gatherInfo.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 { CliExitError } from '@webpieces/rules-config';\nimport { provideSingleton } from '@webpieces/core-context';\nimport { injectable } from 'inversify';\nimport { AiBranchName } from './workflow/git-readAiBranchName';\nimport { ForkPoint } from './workflow/git-findForkPoint';\nimport { MergeState } from './workflow/merge-state';\nimport { GitExec } from './workflow/git-exec';\n\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\n';\n\ninterface HashPoints {\n    hashForkPoint: string;\n    hashFeatureHead: string;\n    hashMainHead: string;\n}\n\n// Result of gathering merge context: whether the branch is already even with main (fork point == main\n// HEAD, so there is nothing to merge) plus the 3 hash points. A class (not an object literal) per the\n// codebase's data-structure convention. gatherInfo RETURNS this instead of calling process.exit.\nexport class GatherInfoResult {\n    alreadyUpToDate: boolean;\n    hashes: HashPoints;\n\n    constructor(alreadyUpToDate: boolean, hashes: HashPoints) {\n        this.alreadyUpToDate = alreadyUpToDate;\n        this.hashes = hashes;\n    }\n}\n\n/** Gathers the 3-point merge context (fetch main, find fork point, write hashes) for merge-start. */\n@provideSingleton()\n@injectable()\nexport class GatherInfo {\n    constructor(\n        private readonly aiBranchName: AiBranchName,\n        private readonly forkPoint: ForkPoint,\n        private readonly mergeState: MergeState,\n        private readonly gitExec: GitExec,\n    ) {}\n\n    // Gather the 3-point merge context for the current feature branch and RETURN whether the branch is\n    // already even with main. NEVER calls process.exit: it is called as a library (from merge-start).\n    async gatherInfo(): Promise<GatherInfoResult> {\n        const currentBranch = execSync('git branch --show-current', { encoding: 'utf8' }).trim();\n        const featureName = this.aiBranchName.getFeatureName();\n        const repoRoot = execSync('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();\n        const mergeDir = this.mergeState.mergeDirFor(repoRoot, featureName);\n        fs.mkdirSync(mergeDir, { recursive: true });\n\n        this.validateCleanTree(currentBranch, repoRoot);\n\n        process.stderr.write('\\n');\n        process.stderr.write(SEP);\n        process.stderr.write('📍 Gathering Merge Context\\n');\n        process.stderr.write(SEP);\n        process.stderr.write('\\n');\n        process.stderr.write('Fetching latest changes from origin/main...\\n');\n        spawnSync('git', ['fetch', 'origin', 'main'], { stdio: 'inherit' });\n\n        await this.forkPoint.findForkPoint('merge');\n\n        const hashesFile = path.join(mergeDir, 'updatemain-hashes.json');\n        const hashes = JSON.parse(fs.readFileSync(hashesFile, 'utf8')) as HashPoints;\n\n        this.printHashPoints(hashes, currentBranch, mergeDir);\n\n        if (hashes.hashForkPoint === hashes.hashMainHead) {\n            process.stderr.write(SEP);\n            process.stderr.write('✅ Already up to date with main!\\n');\n            process.stderr.write(SEP);\n            process.stderr.write('\\n');\n            process.stderr.write('Your branch has not diverged from main.\\n');\n            process.stderr.write('There are no new changes from main to merge.\\n');\n            process.stderr.write('\\n');\n            process.stderr.write(SEP);\n            return new GatherInfoResult(true, hashes);\n        }\n\n        process.stderr.write('Main has advanced. Merge will be needed.\\n');\n        process.stderr.write('\\n');\n        process.stderr.write(SEP);\n        process.stderr.write('\\n');\n        return new GatherInfoResult(false, hashes);\n    }\n\n    private validateCleanTree(currentBranch: string, repoRoot: string): void {\n        if (currentBranch === 'main') {\n            throw new CliExitError(1, '❌ Error: Already on main branch. No need to update from main.');\n        }\n        process.stderr.write(`Current branch: ${currentBranch}\\n`);\n        // Require a fully-committed tree (tracked AND untracked). assertCleanTree uses\n        // `git status --porcelain` (untracked-aware, gitignore-respecting) and aborts with instructions.\n        this.gitExec.assertCleanTree(repoRoot);\n    }\n\n    private printHashPoints(hashes: HashPoints, currentBranch: string, mergeDir: string): void {\n        process.stderr.write('📍 The 3 Hash Points:\\n');\n        process.stderr.write(`  1. Fork point (A):   ${hashes.hashForkPoint}\\n`);\n        process.stderr.write(`     (where ${currentBranch} diverged from main)\\n`);\n        process.stderr.write('\\n');\n        process.stderr.write(`  2. Feature HEAD (B): ${hashes.hashFeatureHead}\\n`);\n        process.stderr.write(`     (tip of ${currentBranch})\\n`);\n        process.stderr.write('\\n');\n        process.stderr.write(`  3. Main HEAD (C):    ${hashes.hashMainHead}\\n`);\n        process.stderr.write('     (current origin/main)\\n');\n        process.stderr.write('\\n');\n        process.stderr.write(`Merge directory: ${mergeDir}\\n`);\n        process.stderr.write('\\n');\n    }\n}\n"]}

package/src/scripts/pr-gate-app.d.ts

@@ -0,0 +1,25 @@
+import { StartUpdateCommand } from './commands/start-update-command';
+import { FinishUpdateCommand } from './commands/finish-update-command';
+import { StartUpsertPrCommand } from './commands/start-upsert-pr-command';
+import { FinishUpsertPrCommand } from './commands/finish-upsert-pr-command';
+/**
+ * The pr-gate application root. `container.get(PrGateApp)` resolves the entire workflow DAG (the 4
+ * command classes → the injected git/merge/dashboard services). `@DocumentDesign` marks it the
+ * top-of-DAG the DI-design analyzer roots on, so `role:app` pr-gate draws its design. Each `bin/*`
+ * entry resolves THIS and calls the matching command method.
+ */
+export declare class PrGateApp {
+    private readonly startUpdateCommand;
+    private readonly finishUpdateCommand;
+    private readonly startUpsertPrCommand;
+    private readonly finishUpsertPrCommand;
+    constructor(startUpdateCommand: StartUpdateCommand, finishUpdateCommand: FinishUpdateCommand, startUpsertPrCommand: StartUpsertPrCommand, finishUpsertPrCommand: FinishUpsertPrCommand);
+    /** `wp-start-update`: 3-point squash-update from main (no PR). */
+    startUpdate(): Promise<void>;
+    /** `wp-finish-update`: validate + finalize a resolved 3-point merge (no PR). */
+    finishUpdate(): Promise<void>;
+    /** `wp-start-upsert-pr`: update from main, push, advisory build gate, hand off review.json. */
+    startUpsertPr(): Promise<void>;
+    /** `wp-finish-upsert-pr`: finalize merge, authoritative build gate, dashboard, create/update PR. */
+    finishUpsertPr(): Promise<void>;
+}

package/src/scripts/pr-gate-app.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PrGateApp = void 0;
+const tslib_1 = require("tslib");
+const core_util_1 = require("@webpieces/core-util");
+const core_context_1 = require("@webpieces/core-context");
+const inversify_1 = require("inversify");
+const start_update_command_1 = require("./commands/start-update-command");
+const finish_update_command_1 = require("./commands/finish-update-command");
+const start_upsert_pr_command_1 = require("./commands/start-upsert-pr-command");
+const finish_upsert_pr_command_1 = require("./commands/finish-upsert-pr-command");
+/**
+ * The pr-gate application root. `container.get(PrGateApp)` resolves the entire workflow DAG (the 4
+ * command classes → the injected git/merge/dashboard services). `@DocumentDesign` marks it the
+ * top-of-DAG the DI-design analyzer roots on, so `role:app` pr-gate draws its design. Each `bin/*`
+ * entry resolves THIS and calls the matching command method.
+ */
+let PrGateApp = class PrGateApp {
+    startUpdateCommand;
+    finishUpdateCommand;
+    startUpsertPrCommand;
+    finishUpsertPrCommand;
+    constructor(startUpdateCommand, finishUpdateCommand, startUpsertPrCommand, finishUpsertPrCommand) {
+        this.startUpdateCommand = startUpdateCommand;
+        this.finishUpdateCommand = finishUpdateCommand;
+        this.startUpsertPrCommand = startUpsertPrCommand;
+        this.finishUpsertPrCommand = finishUpsertPrCommand;
+    }
+    /** `wp-start-update`: 3-point squash-update from main (no PR). */
+    startUpdate() {
+        return this.startUpdateCommand.run();
+    }
+    /** `wp-finish-update`: validate + finalize a resolved 3-point merge (no PR). */
+    finishUpdate() {
+        return this.finishUpdateCommand.run();
+    }
+    /** `wp-start-upsert-pr`: update from main, push, advisory build gate, hand off review.json. */
+    startUpsertPr() {
+        return this.startUpsertPrCommand.run();
+    }
+    /** `wp-finish-upsert-pr`: finalize merge, authoritative build gate, dashboard, create/update PR. */
+    finishUpsertPr() {
+        return this.finishUpsertPrCommand.run();
+    }
+};
+exports.PrGateApp = PrGateApp;
+exports.PrGateApp = PrGateApp = tslib_1.__decorate([
+    (0, core_util_1.DocumentDesign)(),
+    (0, core_context_1.provideSingleton)(),
+    (0, inversify_1.injectable)(),
+    tslib_1.__metadata("design:paramtypes", [start_update_command_1.StartUpdateCommand,
+        finish_update_command_1.FinishUpdateCommand,
+        start_upsert_pr_command_1.StartUpsertPrCommand,
+        finish_upsert_pr_command_1.FinishUpsertPrCommand])
+], PrGateApp);
+//# sourceMappingURL=pr-gate-app.js.map

package/src/scripts/pr-gate-app.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pr-gate-app.js","sourceRoot":"","sources":["../../../../../../packages/tooling/pr-gate/src/scripts/pr-gate-app.ts"],"names":[],"mappings":";;;;AAAA,oDAAsD;AACtD,0DAA2D;AAC3D,yCAAuC;AACvC,0EAAqE;AACrE,4EAAuE;AACvE,gFAA0E;AAC1E,kFAA4E;AAE5E;;;;;GAKG;AAII,IAAM,SAAS,GAAf,MAAM,SAAS;IAEG;IACA;IACA;IACA;IAJrB,YACqB,kBAAsC,EACtC,mBAAwC,EACxC,oBAA0C,EAC1C,qBAA4C;QAH5C,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,0BAAqB,GAArB,qBAAqB,CAAuB;IAC9D,CAAC;IAEJ,kEAAkE;IAClE,WAAW;QACP,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC;IACzC,CAAC;IAED,gFAAgF;IAChF,YAAY;QACR,OAAO,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC;IAC1C,CAAC;IAED,+FAA+F;IAC/F,aAAa;QACT,OAAO,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,CAAC;IAC3C,CAAC;IAED,oGAAoG;IACpG,cAAc;QACV,OAAO,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,CAAC;IAC5C,CAAC;CACJ,CAAA;AA3BY,8BAAS;oBAAT,SAAS;IAHrB,IAAA,0BAAc,GAAE;IAChB,IAAA,+BAAgB,GAAE;IAClB,IAAA,sBAAU,GAAE;6CAGgC,yCAAkB;QACjB,2CAAmB;QAClB,8CAAoB;QACnB,gDAAqB;GALxD,SAAS,CA2BrB","sourcesContent":["import { DocumentDesign } from '@webpieces/core-util';\nimport { provideSingleton } from '@webpieces/core-context';\nimport { injectable } from 'inversify';\nimport { StartUpdateCommand } from './commands/start-update-command';\nimport { FinishUpdateCommand } from './commands/finish-update-command';\nimport { StartUpsertPrCommand } from './commands/start-upsert-pr-command';\nimport { FinishUpsertPrCommand } from './commands/finish-upsert-pr-command';\n\n/**\n * The pr-gate application root. `container.get(PrGateApp)` resolves the entire workflow DAG (the 4\n * command classes → the injected git/merge/dashboard services). `@DocumentDesign` marks it the\n * top-of-DAG the DI-design analyzer roots on, so `role:app` pr-gate draws its design. Each `bin/*`\n * entry resolves THIS and calls the matching command method.\n */\n@DocumentDesign()\n@provideSingleton()\n@injectable()\nexport class PrGateApp {\n    constructor(\n        private readonly startUpdateCommand: StartUpdateCommand,\n        private readonly finishUpdateCommand: FinishUpdateCommand,\n        private readonly startUpsertPrCommand: StartUpsertPrCommand,\n        private readonly finishUpsertPrCommand: FinishUpsertPrCommand,\n    ) {}\n\n    /** `wp-start-update`: 3-point squash-update from main (no PR). */\n    startUpdate(): Promise<void> {\n        return this.startUpdateCommand.run();\n    }\n\n    /** `wp-finish-update`: validate + finalize a resolved 3-point merge (no PR). */\n    finishUpdate(): Promise<void> {\n        return this.finishUpdateCommand.run();\n    }\n\n    /** `wp-start-upsert-pr`: update from main, push, advisory build gate, hand off review.json. */\n    startUpsertPr(): Promise<void> {\n        return this.startUpsertPrCommand.run();\n    }\n\n    /** `wp-finish-upsert-pr`: finalize merge, authoritative build gate, dashboard, create/update PR. */\n    finishUpsertPr(): Promise<void> {\n        return this.finishUpsertPrCommand.run();\n    }\n}\n"]}

package/src/scripts/workflow/branch-naming.d.ts

@@ -1,8 +1,11 @@
-/** Stable base identity (remote / PR / feature-name slug source): trailing `Squash` and the
- *  generation marker stripped. `base` → `base`, `basewp2` → `base`, `basewp2Squash` → `base`. */
-export declare function baseBranchName(branch: string): string;
-/** Pre-merge snapshot name for slot `n`, ALWAYS numbered from 1: `<branch>PreMerge1`,
- *  `<branch>PreMerge2`, … The same `n` also names the paired conflict-context folder
- *  (`merge-info/<slug>/merge-<n>/`, see merge-state.mergeRunDirFor), so the branch and its context
- *  share one number. Clean syncs delete their snapshot at finalize; only conflict syncs leave one. */
-export declare function preMergeBackupName(branch: string, n: number): string;
+export declare class BranchNaming {
+    /** Stable base identity (remote / PR / feature-name slug source): trailing `Squash` and the
+     *  generation marker stripped. `base` → `base`, `basewp2` → `base`, `basewp2Squash` → `base`. */
+    baseBranchName(branch: string): string;
+    /** Pre-merge snapshot name for slot `n`, ALWAYS numbered from 1: `<branch>PreMerge1`,
+     *  `<branch>PreMerge2`, … The same `n` also names the paired conflict-context folder
+     *  (`merge-info/<slug>/merge-<n>/`, see merge-state.mergeRunDirFor), so the branch and its context
+     *  share one number. Clean syncs delete their snapshot at finalize; only conflict syncs leave one. */
+    preMergeBackupName(branch: string, n: number): string;
+    private parseGeneration;
+}

package/src/scripts/workflow/branch-naming.js

@@ -21,8 +21,10 @@
 // names that naturally end in digits, e.g. `deanhiller/upgrade-webpieces-0.3.213`. The tool no longer
 // PRODUCES `wpN`; the branch-creation-guard still reserves the suffix during the transition.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.baseBranchName = baseBranchName;
-exports.preMergeBackupName = preMergeBackupName;
+exports.BranchNaming = void 0;
+const tslib_1 = require("tslib");
+const core_context_1 = require("@webpieces/core-context");
+const inversify_1 = require("inversify");
 const GENERATION_RE = /^(.*)wp(\d+)$/;
 class Generation {
     base;
@@ -32,24 +34,31 @@ class Generation {
         this.gen = gen;
     }
 }
-function parseGeneration(branch) {
-    const withoutSquash = branch.replace(/Squash$/, '');
-    const match = withoutSquash.match(GENERATION_RE);
-    if (match && match[1] !== '') {
-        return new Generation(match[1], parseInt(match[2], 10));
+let BranchNaming = class BranchNaming {
+    /** Stable base identity (remote / PR / feature-name slug source): trailing `Squash` and the
+     *  generation marker stripped. `base` → `base`, `basewp2` → `base`, `basewp2Squash` → `base`. */
+    baseBranchName(branch) {
+        return this.parseGeneration(branch).base;
     }
-    return new Generation(withoutSquash, 1);
-}
-/** Stable base identity (remote / PR / feature-name slug source): trailing `Squash` and the
- *  generation marker stripped. `base` → `base`, `basewp2` → `base`, `basewp2Squash` → `base`. */
-function baseBranchName(branch) {
-    return parseGeneration(branch).base;
-}
-/** Pre-merge snapshot name for slot `n`, ALWAYS numbered from 1: `<branch>PreMerge1`,
- *  `<branch>PreMerge2`, … The same `n` also names the paired conflict-context folder
- *  (`merge-info/<slug>/merge-<n>/`, see merge-state.mergeRunDirFor), so the branch and its context
- *  share one number. Clean syncs delete their snapshot at finalize; only conflict syncs leave one. */
-function preMergeBackupName(branch, n) {
-    return `${branch}PreMerge${n}`;
-}
+    /** Pre-merge snapshot name for slot `n`, ALWAYS numbered from 1: `<branch>PreMerge1`,
+     *  `<branch>PreMerge2`, … The same `n` also names the paired conflict-context folder
+     *  (`merge-info/<slug>/merge-<n>/`, see merge-state.mergeRunDirFor), so the branch and its context
+     *  share one number. Clean syncs delete their snapshot at finalize; only conflict syncs leave one. */
+    preMergeBackupName(branch, n) {
+        return `${branch}PreMerge${n}`;
+    }
+    parseGeneration(branch) {
+        const withoutSquash = branch.replace(/Squash$/, '');
+        const match = withoutSquash.match(GENERATION_RE);
+        if (match && match[1] !== '') {
+            return new Generation(match[1], parseInt(match[2], 10));
+        }
+        return new Generation(withoutSquash, 1);
+    }
+};
+exports.BranchNaming = BranchNaming;
+exports.BranchNaming = BranchNaming = tslib_1.__decorate([
+    (0, core_context_1.provideSingleton)(),
+    (0, inversify_1.injectable)()
+], BranchNaming);
 //# sourceMappingURL=branch-naming.js.map

package/src/scripts/workflow/branch-naming.js.map

@@ -1 +1 @@
-{"version":3,"file":"branch-naming.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/branch-naming.ts"],"names":[],"mappings":";AAAA,6CAA6C;AAC7C,EAAE;AACF,sGAAsG;AACtG,oGAAoG;AACpG,gGAAgG;AAChG,kGAAkG;AAClG,oGAAoG;AACpG,iGAAiG;AACjG,EAAE;AACF,oGAAoG;AACpG,sGAAsG;AACtG,oGAAoG;AACpG,sGAAsG;AACtG,kGAAkG;AAClG,EAAE;AACF,sGAAsG;AACtG,iGAAiG;AACjG,iGAAiG;AACjG,oGAAoG;AACpG,sGAAsG;AACtG,6FAA6F;;AAyB7F,wCAEC;AAMD,gDAEC;AAjCD,MAAM,aAAa,GAAG,eAAe,CAAC;AAEtC,MAAM,UAAU;IACZ,IAAI,CAAS;IACb,GAAG,CAAS;IAEZ,YAAY,IAAY,EAAE,GAAW;QACjC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;CACJ;AAED,SAAS,eAAe,CAAC,MAAc;IACnC,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IACpD,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACjD,IAAI,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QAC3B,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,IAAI,UAAU,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED;iGACiG;AACjG,SAAgB,cAAc,CAAC,MAAc;IACzC,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;AACxC,CAAC;AAED;;;sGAGsG;AACtG,SAAgB,kBAAkB,CAAC,MAAc,EAAE,CAAS;IACxD,OAAO,GAAG,MAAM,WAAW,CAAC,EAAE,CAAC;AACnC,CAAC","sourcesContent":["// Branch-naming for the squash-merge scheme.\n//\n// A feature branch has ONE stable name that never changes: it is the local branch, the remote branch,\n// AND the single PR head — all identical, so \"which branch is my PR on?\" is never ambiguous. A sync\n// (re-merge from main) happens on a transient `<branch>Squash` branch and, when it finishes, is\n// force-pushed and RENAMED BACK to the same feature name (see merge-end.finalizeBranch). No `wpN`\n// generation number survives a sync — the old scheme numbered the LOCAL branch up (base → basewp2 →\n// basewp3) while the remote/PR stayed on `base`, which read as \"the PR moved\" when it never did.\n//\n// The pre-merge safety snapshot is a NUMBERED trail — `<branch>PreMerge1`, `<branch>PreMerge2`, … —\n// paired with a durable audit folder `merge-<n>/` of the SAME number (see merge-state). The number is\n// chosen MONOTONICALLY from the existing `merge-<n>/` dirs (merge-state.nextMergeSlotNumber), never\n// recycled. A CLEAN sync deletes its snapshot branch at finalize (no undo point needed) but KEEPS its\n// `merge-<n>/` audit record; a CONFLICT sync keeps both the snapshot branch and its `merge-<n>/`.\n//\n// `baseBranchName` still strips a trailing `Squash` (the transient temp-branch suffix) AND a trailing\n// `wp<digits>` — the latter only for BACKWARD COMPATIBILITY, so a consumer sitting on a leftover\n// `…wp5` branch from the old scheme still resolves to its stable name during the transition. The\n// generation marker `wp<N>` is a literal `wp` prefix (NOT a bare number) so it never mangles branch\n// names that naturally end in digits, e.g. `deanhiller/upgrade-webpieces-0.3.213`. The tool no longer\n// PRODUCES `wpN`; the branch-creation-guard still reserves the suffix during the transition.\n\nconst GENERATION_RE = /^(.*)wp(\\d+)$/;\n\nclass Generation {\n    base: string;\n    gen: number;\n\n    constructor(base: string, gen: number) {\n        this.base = base;\n        this.gen = gen;\n    }\n}\n\nfunction parseGeneration(branch: string): Generation {\n    const withoutSquash = branch.replace(/Squash$/, '');\n    const match = withoutSquash.match(GENERATION_RE);\n    if (match && match[1] !== '') {\n        return new Generation(match[1], parseInt(match[2], 10));\n    }\n    return new Generation(withoutSquash, 1);\n}\n\n/** Stable base identity (remote / PR / feature-name slug source): trailing `Squash` and the\n *  generation marker stripped. `base` → `base`, `basewp2` → `base`, `basewp2Squash` → `base`. */\nexport function baseBranchName(branch: string): string {\n    return parseGeneration(branch).base;\n}\n\n/** Pre-merge snapshot name for slot `n`, ALWAYS numbered from 1: `<branch>PreMerge1`,\n *  `<branch>PreMerge2`, … The same `n` also names the paired conflict-context folder\n *  (`merge-info/<slug>/merge-<n>/`, see merge-state.mergeRunDirFor), so the branch and its context\n *  share one number. Clean syncs delete their snapshot at finalize; only conflict syncs leave one. */\nexport function preMergeBackupName(branch: string, n: number): string {\n    return `${branch}PreMerge${n}`;\n}\n"]}
+{"version":3,"file":"branch-naming.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/branch-naming.ts"],"names":[],"mappings":";AAAA,6CAA6C;AAC7C,EAAE;AACF,sGAAsG;AACtG,oGAAoG;AACpG,gGAAgG;AAChG,kGAAkG;AAClG,oGAAoG;AACpG,iGAAiG;AACjG,EAAE;AACF,oGAAoG;AACpG,sGAAsG;AACtG,oGAAoG;AACpG,sGAAsG;AACtG,kGAAkG;AAClG,EAAE;AACF,sGAAsG;AACtG,iGAAiG;AACjG,iGAAiG;AACjG,oGAAoG;AACpG,sGAAsG;AACtG,6FAA6F;;;;AAE7F,0DAA2D;AAC3D,yCAAuC;AAEvC,MAAM,aAAa,GAAG,eAAe,CAAC;AAEtC,MAAM,UAAU;IACZ,IAAI,CAAS;IACb,GAAG,CAAS;IAEZ,YAAY,IAAY,EAAE,GAAW;QACjC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;CACJ;AAIM,IAAM,YAAY,GAAlB,MAAM,YAAY;IACrB;qGACiG;IACjG,cAAc,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC;IAC7C,CAAC;IAED;;;0GAGsG;IACtG,kBAAkB,CAAC,MAAc,EAAE,CAAS;QACxC,OAAO,GAAG,MAAM,WAAW,CAAC,EAAE,CAAC;IACnC,CAAC;IAEO,eAAe,CAAC,MAAc;QAClC,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACpD,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACjD,IAAI,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;YAC3B,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,IAAI,UAAU,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IAC5C,CAAC;CACJ,CAAA;AAvBY,oCAAY;uBAAZ,YAAY;IAFxB,IAAA,+BAAgB,GAAE;IAClB,IAAA,sBAAU,GAAE;GACA,YAAY,CAuBxB","sourcesContent":["// Branch-naming for the squash-merge scheme.\n//\n// A feature branch has ONE stable name that never changes: it is the local branch, the remote branch,\n// AND the single PR head — all identical, so \"which branch is my PR on?\" is never ambiguous. A sync\n// (re-merge from main) happens on a transient `<branch>Squash` branch and, when it finishes, is\n// force-pushed and RENAMED BACK to the same feature name (see merge-end.finalizeBranch). No `wpN`\n// generation number survives a sync — the old scheme numbered the LOCAL branch up (base → basewp2 →\n// basewp3) while the remote/PR stayed on `base`, which read as \"the PR moved\" when it never did.\n//\n// The pre-merge safety snapshot is a NUMBERED trail — `<branch>PreMerge1`, `<branch>PreMerge2`, … —\n// paired with a durable audit folder `merge-<n>/` of the SAME number (see merge-state). The number is\n// chosen MONOTONICALLY from the existing `merge-<n>/` dirs (merge-state.nextMergeSlotNumber), never\n// recycled. A CLEAN sync deletes its snapshot branch at finalize (no undo point needed) but KEEPS its\n// `merge-<n>/` audit record; a CONFLICT sync keeps both the snapshot branch and its `merge-<n>/`.\n//\n// `baseBranchName` still strips a trailing `Squash` (the transient temp-branch suffix) AND a trailing\n// `wp<digits>` — the latter only for BACKWARD COMPATIBILITY, so a consumer sitting on a leftover\n// `…wp5` branch from the old scheme still resolves to its stable name during the transition. The\n// generation marker `wp<N>` is a literal `wp` prefix (NOT a bare number) so it never mangles branch\n// names that naturally end in digits, e.g. `deanhiller/upgrade-webpieces-0.3.213`. The tool no longer\n// PRODUCES `wpN`; the branch-creation-guard still reserves the suffix during the transition.\n\nimport { provideSingleton } from '@webpieces/core-context';\nimport { injectable } from 'inversify';\n\nconst GENERATION_RE = /^(.*)wp(\\d+)$/;\n\nclass Generation {\n    base: string;\n    gen: number;\n\n    constructor(base: string, gen: number) {\n        this.base = base;\n        this.gen = gen;\n    }\n}\n\n@provideSingleton()\n@injectable()\nexport class BranchNaming {\n    /** Stable base identity (remote / PR / feature-name slug source): trailing `Squash` and the\n     *  generation marker stripped. `base` → `base`, `basewp2` → `base`, `basewp2Squash` → `base`. */\n    baseBranchName(branch: string): string {\n        return this.parseGeneration(branch).base;\n    }\n\n    /** Pre-merge snapshot name for slot `n`, ALWAYS numbered from 1: `<branch>PreMerge1`,\n     *  `<branch>PreMerge2`, … The same `n` also names the paired conflict-context folder\n     *  (`merge-info/<slug>/merge-<n>/`, see merge-state.mergeRunDirFor), so the branch and its context\n     *  share one number. Clean syncs delete their snapshot at finalize; only conflict syncs leave one. */\n    preMergeBackupName(branch: string, n: number): string {\n        return `${branch}PreMerge${n}`;\n    }\n\n    private parseGeneration(branch: string): Generation {\n        const withoutSquash = branch.replace(/Squash$/, '');\n        const match = withoutSquash.match(GENERATION_RE);\n        if (match && match[1] !== '') {\n            return new Generation(match[1], parseInt(match[2], 10));\n        }\n        return new Generation(withoutSquash, 1);\n    }\n}\n"]}

package/src/scripts/workflow/build-affected.d.ts

@@ -1,28 +1,8 @@
 export declare const DEFAULT_BUILD_COMMAND = "pnpm nx affected --target=ci --base=$(git merge-base origin/main HEAD)";
 /**
- * Resolve the exact build command this gate will run for a repo: the project's configured
- * PrGateConfig.buildCommand, or the default affected-ci command when none is set. Callers
- * print this so the AI knows precisely which command to run locally to get the gate passing.
- */
-export declare function resolveBuildCommand(repoRoot: string): string;
-/**
- * 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;
-/**
- * Run the build gate using the project's configured command (PrGateConfig.buildCommand). The
- * finish-upsert-pr gate and wp-start-upsert-pr both call THIS so they provably build with the same
- * command — the resolution the AI validates is built exactly as the PR command builds it.
- * Returns the exit code; callers print their own re-run hint.
- */
-export declare function runConfiguredBuildGate(repoRoot: string): number;
-/**
- * The two facts that differ between the wp-start (advisory) and wp-finish (authoritative) build
- * gates. Everything else — resolve command, run it, print the re-run hint, exit non-zero on failure
- * — is identical, so it lives once in runBuildGate and the difference is passed in here. A class (not
- * an object literal) per the codebase's data-structure convention.
+ * The two facts that differ between the wp-start (advisory) and wp-finish (authoritative) build gates.
+ * Everything else is identical, so it lives once in runBuildGate and the difference is passed in here.
+ * A class (not an object literal) per the codebase's data-structure convention.
  */
 export declare class BuildGateOptions {
     label: string;
@@ -30,10 +10,21 @@ export declare class BuildGateOptions {
     failureHeadline: string;
     constructor(label: string, rerunCommand: string, failureHeadline: string);
 }
-/**
- * Run the configured build gate with consistent framing, throwing CliExitError(buildCode) on failure
- * so the bin's main()/runMain owns the exit. Single source of truth: wp-start-upsert-pr and
- * wp-finish-upsert-pr both call THIS (only the BuildGateOptions differ) so a fix to the gate flow is
- * made once, not in two near-identical copies.
- */
-export declare function runBuildGate(repoRoot: string, opts: BuildGateOptions): void;
+/** Runs the nx-affected build gate the same way for the advisory and authoritative PR gates. */
+export declare class BuildAffected {
+    /**
+     * Resolve the exact build command this gate will run: the project's configured
+     * PrGateConfig.buildCommand, or the default affected-ci command when none is set.
+     */
+    resolveBuildCommand(repoRoot: string): string;
+    /** Run the build gate. Returns the process exit code (0 = pass). */
+    runBuildAffected(repoRoot: string, buildCommand?: string): number;
+    /** Run the build gate using the project's configured command (PrGateConfig.buildCommand). */
+    runConfiguredBuildGate(repoRoot: string): number;
+    /**
+     * Run the configured build gate with consistent framing, throwing CliExitError(buildCode) on
+     * failure so the bin's main()/runMain owns the exit. Single source of truth: wp-start-upsert-pr and
+     * wp-finish-upsert-pr both call THIS (only the BuildGateOptions differ).
+     */
+    runBuildGate(repoRoot: string, opts: BuildGateOptions): void;
+}