@webpieces/pr-gate 0.4.485 → 0.4.487

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

@@ -27,6 +27,29 @@ let ForkPoint = class ForkPoint {
     forkPointOutputDir(repoRoot, featureName, workflow) {
         return workflow === 'review' ? (0, rules_config_1.prDirFor)(repoRoot, featureName) : this.mergeState.mergeDirFor(repoRoot, featureName);
     }
+    /**
+     * The 3-point FORK POINT: where this branch diverged from main. `git merge-base origin/main HEAD`,
+     * falling back to a local `main`, and '' when neither ref resolves.
+     *
+     * Deliberately does NOT fetch. The fork point is ABSOLUTE — advancing main cannot move it, because
+     * merge-base is the most recent common ancestor and main's new commits are not on this branch. (Verified
+     * on this repo: main went f415456 → ba8f674 → 61432d6 while merge-base with one branch stayed f415456
+     * throughout.) So a caller that needs only the fork point — see ChecklistScanner — pays no network cost
+     * and works offline. `findForkPoint` below still fetches, because the MERGE flow additionally needs
+     * main's CURRENT head as hash point C, which genuinely does require a fetch.
+     *
+     * Also writes no files and runs no merge-commit scan, so it cannot throw: `wp-checklist` must always
+     * succeed, and a raw merge-from-main is the merge flow's problem to report, not the checklist's.
+     */
+    resolveForkPoint(repoRoot) {
+        for (const ref of ['origin/main', 'main']) {
+            const result = (0, child_process_1.spawnSync)('git', ['merge-base', ref, 'HEAD'], { cwd: repoRoot, encoding: 'utf8' });
+            const sha = (result.stdout ?? '').trim();
+            if (result.status === 0 && sha !== '')
+                return sha;
+        }
+        return '';
+    }
     async findForkPoint(workflow) {
         if (workflow !== 'review' && workflow !== 'merge') {
             throw new rules_config_1.CliExitError(1, 'ERROR: Workflow argument required\n' +
@@ -43,9 +66,10 @@ let ForkPoint = class ForkPoint {
         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) {
+        // ONE implementation of the fork-point computation, shared with ChecklistScanner. The fetch above is
+        // what this flow needs beyond it (hash point C = main's current head), not the fork point itself.
+        const forkPoint = this.resolveForkPoint(repoRoot);
+        if (!forkPoint) {
             throw new rules_config_1.CliExitError(1, 'ERROR: Could not find common ancestor with origin/main');
         }
         process.stderr.write(`✅ Fork point found: ${forkPoint.slice(0, 7)}\n`);

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

@@ -1 +1 @@
-{"version":3,"file":"git-findForkPoint.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/git-findForkPoint.ts"],"names":[],"mappings":"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","sourcesContent":["import { execSync, spawnSync } from 'child_process';\nimport * as fs from 'fs';\nimport * as path from 'path';\nimport { prDirFor, CliExitError, RepoRootFinder } from '@webpieces/rules-config';\nimport { injectable, bindingScopeValues } from 'inversify';\nimport { AiBranchName } from './git-readAiBranchName';\nimport { MergeState } from './merge-state';\n\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\n';\n\n/** Computes the 3-point fork point and guards against improper merges-from-main. */\n@injectable(bindingScopeValues.Singleton)\nexport class ForkPoint {\n    constructor(\n        private readonly repoRootFinder: RepoRootFinder,\n        private readonly aiBranchName: AiBranchName,\n        private readonly mergeState: MergeState,\n    ) {}\n\n    // Single source of truth for the per-feature dir fork-point output is written to — the SAME nested\n    // home the readers use (git-gatherInfo / merge-start read updatemain-hashes.json from mergeDirFor;\n    // the review flow reads from prDirFor). Routing the writer through these same helpers is what keeps\n    // them from diverging again — guarded by git-findForkPoint.spec.ts.\n    forkPointOutputDir(repoRoot: string, featureName: string, workflow: string): string {\n        return workflow === 'review' ? prDirFor(repoRoot, featureName) : this.mergeState.mergeDirFor(repoRoot, featureName);\n    }\n\n    async findForkPoint(workflow: string): Promise<void> {\n        if (workflow !== 'review' && workflow !== 'merge') {\n            throw new CliExitError(1,\n                'ERROR: Workflow argument required\\n' +\n                'Usage: git-findForkPoint <workflow>\\n' +\n                \"  workflow: 'review' or 'merge'\",\n            );\n        }\n\n        const featureName = this.aiBranchName.getFeatureName();\n        const currentBranch = execSync('git branch --show-current', { encoding: 'utf8' }).trim();\n        const repoRoot = this.repoRootFinder.resolveRepoRoot(process.cwd());\n\n        const outputDir = this.forkPointOutputDir(repoRoot, featureName, workflow);\n        const prefix = workflow === 'review' ? 'review-' : 'updatemain-';\n        fs.mkdirSync(outputDir, { recursive: true });\n\n        spawnSync('git', ['fetch', 'origin', 'main'], { stdio: 'ignore' });\n\n        const featureHead = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim();\n        const originMain = execSync('git rev-parse origin/main', { encoding: 'utf8' }).trim();\n\n        process.stderr.write('Finding fork point using git merge-base...\\n');\n\n        const forkPointResult = spawnSync('git', ['merge-base', 'origin/main', 'HEAD'], { encoding: 'utf8' });\n        const forkPoint = (forkPointResult.stdout ?? '').trim();\n\n        if (!forkPoint || forkPointResult.status !== 0) {\n            throw new CliExitError(1, 'ERROR: Could not find common ancestor with origin/main');\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            this.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\n    private 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                    this.printMergeFromMainError(commit, parent, featureName, currentBranch);\n                    throw new CliExitError(1, '');\n                }\n            }\n        }\n        process.stderr.write('✅ No improper merges from main detected\\n');\n    }\n\n    private 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 the gated update (pnpm wp-start-update, or\\n');\n        process.stderr.write('   pnpm wp-start-upsert-pr when a PR is open)\\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. Fetch the latest main (works on the primary repo AND in a worktree):\\n');\n        process.stderr.write('   git fetch origin main\\n');\n        process.stderr.write('\\n');\n        process.stderr.write('2. Create a new branch OFF origin/main — do NOT `git checkout main`\\n');\n        process.stderr.write('   (it fatals inside a worktree: \"main is already checked out at <primary>\"):\\n');\n        process.stderr.write(`   git checkout -b ${featureName}-v2 origin/main\\n`);\n        process.stderr.write('\\n');\n        process.stderr.write('3. Squash merge your old branch — THIS STEP IS FOR THE HUMAN TO RUN:\\n');\n        process.stderr.write(`   git merge --squash ${currentBranch}\\n`);\n        process.stderr.write('   AI: `git merge` is blocked for you (redirect-how-to-merge-main) and you must NOT\\n');\n        process.stderr.write('   work around it. Ask the human to run that one command, and warn them:\\n');\n        process.stderr.write('   \"This is a raw git merge. It is only correct here because the branch is already\\n');\n        process.stderr.write('    broken and is being rebuilt onto origin/main. For a NORMAL update from main,\\n');\n        process.stderr.write('    push back and tell me to use the gated 3-point merge instead: `pnpm wp-start-update`\\n');\n        process.stderr.write('    (paired with `pnpm wp-finish-update`) when no PR is open, or `pnpm wp-start-upsert-pr`\\n');\n        process.stderr.write('    (paired with `pnpm wp-finish-upsert-pr`) when one is.\"\\n');\n        process.stderr.write('\\n');\n        process.stderr.write('4. 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('5. 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}\n"]}
+{"version":3,"file":"git-findForkPoint.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/git-findForkPoint.ts"],"names":[],"mappings":"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","sourcesContent":["import { execSync, spawnSync } from 'child_process';\nimport * as fs from 'fs';\nimport * as path from 'path';\nimport { prDirFor, CliExitError, RepoRootFinder } from '@webpieces/rules-config';\nimport { injectable, bindingScopeValues } from 'inversify';\nimport { AiBranchName } from './git-readAiBranchName';\nimport { MergeState } from './merge-state';\n\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\n';\n\n/** Computes the 3-point fork point and guards against improper merges-from-main. */\n@injectable(bindingScopeValues.Singleton)\nexport class ForkPoint {\n    constructor(\n        private readonly repoRootFinder: RepoRootFinder,\n        private readonly aiBranchName: AiBranchName,\n        private readonly mergeState: MergeState,\n    ) {}\n\n    // Single source of truth for the per-feature dir fork-point output is written to — the SAME nested\n    // home the readers use (git-gatherInfo / merge-start read updatemain-hashes.json from mergeDirFor;\n    // the review flow reads from prDirFor). Routing the writer through these same helpers is what keeps\n    // them from diverging again — guarded by git-findForkPoint.spec.ts.\n    forkPointOutputDir(repoRoot: string, featureName: string, workflow: string): string {\n        return workflow === 'review' ? prDirFor(repoRoot, featureName) : this.mergeState.mergeDirFor(repoRoot, featureName);\n    }\n\n    /**\n     * The 3-point FORK POINT: where this branch diverged from main. `git merge-base origin/main HEAD`,\n     * falling back to a local `main`, and '' when neither ref resolves.\n     *\n     * Deliberately does NOT fetch. The fork point is ABSOLUTE — advancing main cannot move it, because\n     * merge-base is the most recent common ancestor and main's new commits are not on this branch. (Verified\n     * on this repo: main went f415456 → ba8f674 → 61432d6 while merge-base with one branch stayed f415456\n     * throughout.) So a caller that needs only the fork point — see ChecklistScanner — pays no network cost\n     * and works offline. `findForkPoint` below still fetches, because the MERGE flow additionally needs\n     * main's CURRENT head as hash point C, which genuinely does require a fetch.\n     *\n     * Also writes no files and runs no merge-commit scan, so it cannot throw: `wp-checklist` must always\n     * succeed, and a raw merge-from-main is the merge flow's problem to report, not the checklist's.\n     */\n    resolveForkPoint(repoRoot: string): string {\n        for (const ref of ['origin/main', 'main']) {\n            const result = spawnSync('git', ['merge-base', ref, 'HEAD'], { cwd: repoRoot, encoding: 'utf8' });\n            const sha = (result.stdout ?? '').trim();\n            if (result.status === 0 && sha !== '') return sha;\n        }\n        return '';\n    }\n\n    async findForkPoint(workflow: string): Promise<void> {\n        if (workflow !== 'review' && workflow !== 'merge') {\n            throw new CliExitError(1,\n                'ERROR: Workflow argument required\\n' +\n                'Usage: git-findForkPoint <workflow>\\n' +\n                \"  workflow: 'review' or 'merge'\",\n            );\n        }\n\n        const featureName = this.aiBranchName.getFeatureName();\n        const currentBranch = execSync('git branch --show-current', { encoding: 'utf8' }).trim();\n        const repoRoot = this.repoRootFinder.resolveRepoRoot(process.cwd());\n\n        const outputDir = this.forkPointOutputDir(repoRoot, featureName, workflow);\n        const prefix = workflow === 'review' ? 'review-' : 'updatemain-';\n        fs.mkdirSync(outputDir, { recursive: true });\n\n        spawnSync('git', ['fetch', 'origin', 'main'], { stdio: 'ignore' });\n\n        const featureHead = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim();\n        const originMain = execSync('git rev-parse origin/main', { encoding: 'utf8' }).trim();\n\n        process.stderr.write('Finding fork point using git merge-base...\\n');\n\n        // ONE implementation of the fork-point computation, shared with ChecklistScanner. The fetch above is\n        // what this flow needs beyond it (hash point C = main's current head), not the fork point itself.\n        const forkPoint = this.resolveForkPoint(repoRoot);\n\n        if (!forkPoint) {\n            throw new CliExitError(1, 'ERROR: Could not find common ancestor with origin/main');\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            this.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\n    private 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                    this.printMergeFromMainError(commit, parent, featureName, currentBranch);\n                    throw new CliExitError(1, '');\n                }\n            }\n        }\n        process.stderr.write('✅ No improper merges from main detected\\n');\n    }\n\n    private 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 the gated update (pnpm wp-start-update, or\\n');\n        process.stderr.write('   pnpm wp-start-upsert-pr when a PR is open)\\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. Fetch the latest main (works on the primary repo AND in a worktree):\\n');\n        process.stderr.write('   git fetch origin main\\n');\n        process.stderr.write('\\n');\n        process.stderr.write('2. Create a new branch OFF origin/main — do NOT `git checkout main`\\n');\n        process.stderr.write('   (it fatals inside a worktree: \"main is already checked out at <primary>\"):\\n');\n        process.stderr.write(`   git checkout -b ${featureName}-v2 origin/main\\n`);\n        process.stderr.write('\\n');\n        process.stderr.write('3. Squash merge your old branch — THIS STEP IS FOR THE HUMAN TO RUN:\\n');\n        process.stderr.write(`   git merge --squash ${currentBranch}\\n`);\n        process.stderr.write('   AI: `git merge` is blocked for you (redirect-how-to-merge-main) and you must NOT\\n');\n        process.stderr.write('   work around it. Ask the human to run that one command, and warn them:\\n');\n        process.stderr.write('   \"This is a raw git merge. It is only correct here because the branch is already\\n');\n        process.stderr.write('    broken and is being rebuilt onto origin/main. For a NORMAL update from main,\\n');\n        process.stderr.write('    push back and tell me to use the gated 3-point merge instead: `pnpm wp-start-update`\\n');\n        process.stderr.write('    (paired with `pnpm wp-finish-update`) when no PR is open, or `pnpm wp-start-upsert-pr`\\n');\n        process.stderr.write('    (paired with `pnpm wp-finish-upsert-pr`) when one is.\"\\n');\n        process.stderr.write('\\n');\n        process.stderr.write('4. 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('5. 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}\n"]}

package/src/scripts/workflow/pr-context-writer.d.ts

@@ -0,0 +1,29 @@
+import { ChecklistReviewContext, DiffScope, ReviewJsonService } from '@webpieces/rules-config';
+/**
+ * Writes `pr-context.json` (the 3-point base/head sha + the FULL changed-file set) and returns the context
+ * every printed review instruction inlines.
+ *
+ * Extracted so `wp-start-upsert-pr` and `wp-checklist` cannot diverge. It used to live only in wp-start,
+ * which meant `wp-checklist` — the command wp-start tells the AI to run FIRST — silently rendered its
+ * reviewer blocks with NO `git diff` command and NO full-file-set path whenever wp-start had not run this
+ * cycle. A reviewer handed filenames and no way to read the diff is exactly the failure this instruction
+ * exists to prevent, and it failed silently, which is worse.
+ *
+ * `@injectable(bindingScopeValues.Singleton)` so it is injected by type and drawn in the DI design.
+ */
+export declare class PrContextWriter {
+    private readonly diffScope;
+    private readonly reviewJsonService;
+    constructor(diffScope: DiffScope, reviewJsonService: ReviewJsonService);
+    /**
+     * Compute + persist the context against the fork point the CALLER already resolved, so the sha a
+     * reviewer is told to diff against is byte-identical to the one the pattern matching used. Returns an
+     * EMPTY context when `forkPoint` is '' (no fork point from main) — callers must say so out loud rather
+     * than quietly omit the lines it would have filled; see ChecklistInstructionsService.diffLines.
+     *
+     * Two things mirror ChecklistScanner deliberately: no head argument to `getChangedFiles` (so the
+     * working tree and untracked files are included, not just commits), and `tsOnly:false` (the default
+     * drops every *.sql / Dockerfile / .env* file a checklist most wants to key on).
+     */
+    ensure(repoRoot: string, featureName: string, forkPoint: string): ChecklistReviewContext;
+}

package/src/scripts/workflow/pr-context-writer.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PrContextWriter = void 0;
+const tslib_1 = require("tslib");
+const rules_config_1 = require("@webpieces/rules-config");
+const inversify_1 = require("inversify");
+/**
+ * Writes `pr-context.json` (the 3-point base/head sha + the FULL changed-file set) and returns the context
+ * every printed review instruction inlines.
+ *
+ * Extracted so `wp-start-upsert-pr` and `wp-checklist` cannot diverge. It used to live only in wp-start,
+ * which meant `wp-checklist` — the command wp-start tells the AI to run FIRST — silently rendered its
+ * reviewer blocks with NO `git diff` command and NO full-file-set path whenever wp-start had not run this
+ * cycle. A reviewer handed filenames and no way to read the diff is exactly the failure this instruction
+ * exists to prevent, and it failed silently, which is worse.
+ *
+ * `@injectable(bindingScopeValues.Singleton)` so it is injected by type and drawn in the DI design.
+ */
+let PrContextWriter = class PrContextWriter {
+    diffScope;
+    reviewJsonService;
+    constructor(diffScope, reviewJsonService) {
+        this.diffScope = diffScope;
+        this.reviewJsonService = reviewJsonService;
+    }
+    /**
+     * Compute + persist the context against the fork point the CALLER already resolved, so the sha a
+     * reviewer is told to diff against is byte-identical to the one the pattern matching used. Returns an
+     * EMPTY context when `forkPoint` is '' (no fork point from main) — callers must say so out loud rather
+     * than quietly omit the lines it would have filled; see ChecklistInstructionsService.diffLines.
+     *
+     * Two things mirror ChecklistScanner deliberately: no head argument to `getChangedFiles` (so the
+     * working tree and untracked files are included, not just commits), and `tsOnly:false` (the default
+     * drops every *.sql / Dockerfile / .env* file a checklist most wants to key on).
+     */
+    ensure(repoRoot, featureName, forkPoint) {
+        if (forkPoint === '')
+            return new rules_config_1.ChecklistReviewContext();
+        const opts = new rules_config_1.ChangedFilesOptions();
+        opts.tsOnly = false;
+        const changed = this.diffScope.getChangedFiles(repoRoot, forkPoint, undefined, opts);
+        const p = this.reviewJsonService.writePrContext(repoRoot, featureName, new rules_config_1.PrContext(forkPoint, 'HEAD', changed));
+        return new rules_config_1.ChecklistReviewContext(forkPoint, p);
+    }
+};
+exports.PrContextWriter = PrContextWriter;
+exports.PrContextWriter = PrContextWriter = tslib_1.__decorate([
+    (0, inversify_1.injectable)(inversify_1.bindingScopeValues.Singleton),
+    tslib_1.__metadata("design:paramtypes", [rules_config_1.DiffScope,
+        rules_config_1.ReviewJsonService])
+], PrContextWriter);
+//# sourceMappingURL=pr-context-writer.js.map

package/src/scripts/workflow/pr-context-writer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pr-context-writer.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/pr-context-writer.ts"],"names":[],"mappings":";;;;AAAA,0DAEiC;AACjC,yCAA2D;AAE3D;;;;;;;;;;;GAWG;AAEI,IAAM,eAAe,GAArB,MAAM,eAAe;IAEH;IACA;IAFrB,YACqB,SAAoB,EACpB,iBAAoC;QADpC,cAAS,GAAT,SAAS,CAAW;QACpB,sBAAiB,GAAjB,iBAAiB,CAAmB;IACtD,CAAC;IAEJ;;;;;;;;;OASG;IACH,MAAM,CAAC,QAAgB,EAAE,WAAmB,EAAE,SAAiB;QAC3D,IAAI,SAAS,KAAK,EAAE;YAAE,OAAO,IAAI,qCAAsB,EAAE,CAAC;QAC1D,MAAM,IAAI,GAAG,IAAI,kCAAmB,EAAE,CAAC;QACvC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QACrF,MAAM,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAC3C,QAAQ,EAAE,WAAW,EAAE,IAAI,wBAAS,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,CACnE,CAAC;QACF,OAAO,IAAI,qCAAsB,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IACpD,CAAC;CACJ,CAAA;AA1BY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,sBAAU,EAAC,8BAAkB,CAAC,SAAS,CAAC;6CAGL,wBAAS;QACD,gCAAiB;GAHhD,eAAe,CA0B3B","sourcesContent":["import {\n    ChangedFilesOptions, ChecklistReviewContext, DiffScope, PrContext, ReviewJsonService,\n} from '@webpieces/rules-config';\nimport { injectable, bindingScopeValues } from 'inversify';\n\n/**\n * Writes `pr-context.json` (the 3-point base/head sha + the FULL changed-file set) and returns the context\n * every printed review instruction inlines.\n *\n * Extracted so `wp-start-upsert-pr` and `wp-checklist` cannot diverge. It used to live only in wp-start,\n * which meant `wp-checklist` — the command wp-start tells the AI to run FIRST — silently rendered its\n * reviewer blocks with NO `git diff` command and NO full-file-set path whenever wp-start had not run this\n * cycle. A reviewer handed filenames and no way to read the diff is exactly the failure this instruction\n * exists to prevent, and it failed silently, which is worse.\n *\n * `@injectable(bindingScopeValues.Singleton)` so it is injected by type and drawn in the DI design.\n */\n@injectable(bindingScopeValues.Singleton)\nexport class PrContextWriter {\n    constructor(\n        private readonly diffScope: DiffScope,\n        private readonly reviewJsonService: ReviewJsonService,\n    ) {}\n\n    /**\n     * Compute + persist the context against the fork point the CALLER already resolved, so the sha a\n     * reviewer is told to diff against is byte-identical to the one the pattern matching used. Returns an\n     * EMPTY context when `forkPoint` is '' (no fork point from main) — callers must say so out loud rather\n     * than quietly omit the lines it would have filled; see ChecklistInstructionsService.diffLines.\n     *\n     * Two things mirror ChecklistScanner deliberately: no head argument to `getChangedFiles` (so the\n     * working tree and untracked files are included, not just commits), and `tsOnly:false` (the default\n     * drops every *.sql / Dockerfile / .env* file a checklist most wants to key on).\n     */\n    ensure(repoRoot: string, featureName: string, forkPoint: string): ChecklistReviewContext {\n        if (forkPoint === '') return new ChecklistReviewContext();\n        const opts = new ChangedFilesOptions();\n        opts.tsOnly = false;\n        const changed = this.diffScope.getChangedFiles(repoRoot, forkPoint, undefined, opts);\n        const p = this.reviewJsonService.writePrContext(\n            repoRoot, featureName, new PrContext(forkPoint, 'HEAD', changed),\n        );\n        return new ChecklistReviewContext(forkPoint, p);\n    }\n}\n"]}