@webpieces/pr-gate 0.3.353 → 0.3.355

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

@@ -1,98 +1,105 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uncommittedFiles = uncommittedFiles;
-exports.untrackedFiles = untrackedFiles;
-exports.assertCleanTree = assertCleanTree;
-exports.assertNoUntracked = assertNoUntracked;
-exports.runGitChecked = runGitChecked;
-exports.ensurePushed = ensurePushed;
+exports.GitExec = void 0;
+const tslib_1 = require("tslib");
 const child_process_1 = require("child_process");
 const rules_config_1 = require("@webpieces/rules-config");
+const core_context_1 = require("@webpieces/core-context");
+const inversify_1 = require("inversify");
 const SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n';
 // The AI-facing doc the failure messages point at (generated under `.webpieces/instruct-ai`, at the
 // REPO ROOT — resolved absolute so the AI opens it regardless of the cwd it reads the message from).
 const GIT_WORKFLOW_DOC_NAME = 'webpieces.git-workflow.md';
-// Run a read-only git query from the repo root; abort if git itself errors. Kept `cwd`-explicit (not
-// process.cwd()) because `git ls-files --others` is scoped to the cwd subtree — running from a subdir
-// would miss untracked files elsewhere in the repo.
-function gitQuery(args, cwd, failMsg) {
-    const out = (0, child_process_1.spawnSync)('git', args, { encoding: 'utf8', cwd });
-    if (out.status !== 0) {
-        throw new rules_config_1.CliExitError(1, `❌ ${failMsg}`);
+/** Shared git precondition checks + push logic for the PR/merge workflow. */
+let GitExec = class GitExec {
+    repoRootFinder;
+    constructor(repoRootFinder) {
+        this.repoRootFinder = repoRootFinder;
     }
-    return out.stdout.trim();
-}
-// Tracked changes (staged + unstaged) AND untracked files, EXCLUDING gitignored paths — so `.webpieces/`
-// tooling artifacts never count. Empty string = fully committed. Exported for unit testing.
-function uncommittedFiles(cwd) {
-    return gitQuery(['status', '--porcelain'], cwd, 'Failed to run `git status --porcelain` to check the working tree.');
-}
-// Untracked files only (respects .gitignore). Empty string = none. Exported for unit testing.
-function untrackedFiles(cwd) {
-    return gitQuery(['ls-files', '--others', '--exclude-standard'], cwd, 'Failed to list untracked files (git ls-files --others).');
-}
-/**
- * Precondition for every PR/merge entry point: the working tree must be fully committed. The webpieces
- * tooling deliberately does NOT `git add`/`commit` the developer's work for them — a blanket `git add
- * -A` once swept a stale untracked directory into a squash commit, and building the working tree while
- * pushing HEAD let an uncommitted fix pass the build gate yet push a stale commit. Aborts with
- * instructions if anything is uncommitted (tracked or untracked, excluding gitignored).
- */
-function assertCleanTree(cwd) {
-    const dirty = uncommittedFiles(cwd);
-    if (dirty === '')
-        return;
-    throw new rules_config_1.CliExitError(1, '\n' + SEP +
-        '❌ ERROR: You have uncommitted or untracked changes\n' +
-        SEP + '\n' +
-        'The webpieces PR tooling will NOT commit your work for you. Commit your\n' +
-        'changes, and either commit or delete any untracked files, then re-run.\n\n' +
-        'Working tree (git status --porcelain):\n' +
-        dirty + '\n\n' +
-        `See ${new rules_config_1.RepoRootFinder().docPathFrom(cwd, GIT_WORKFLOW_DOC_NAME)} for the full merge + PR process.\n` +
-        SEP);
-}
-/**
- * Narrower guard for the merge-resolve commit point, where tracked resolutions are legitimately in the
- * tree but untracked files must NOT be swept into the squash commit (replaces the old blanket `git add
- * -A`). Lists any untracked files and aborts so the AI commits or deletes them explicitly.
- */
-function assertNoUntracked(cwd) {
-    const untracked = untrackedFiles(cwd);
-    if (untracked === '')
-        return;
-    throw new rules_config_1.CliExitError(1, '\n' + SEP +
-        '❌ ERROR: Untracked files present during merge finalize\n' +
-        SEP + '\n' +
-        'The tooling will not sweep untracked files into the squash commit. Commit\n' +
-        'or delete these, then re-run:\n\n' +
-        untracked + '\n\n' +
-        `See ${new rules_config_1.RepoRootFinder().docPathFrom(cwd, GIT_WORKFLOW_DOC_NAME)} for the full merge + PR process.\n` +
-        SEP);
-}
-/**
- * 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) {
-        throw new rules_config_1.CliExitError(1, `❌ ${errMsg} (git ${args.join(' ')} exited ${String(result.status)})`);
+    // Tracked changes (staged + unstaged) AND untracked files, EXCLUDING gitignored paths — so
+    // `.webpieces/` tooling artifacts never count. Empty string = fully committed.
+    uncommittedFiles(cwd) {
+        return this.gitQuery(['status', '--porcelain'], cwd, 'Failed to run `git status --porcelain` to check the working tree.');
     }
-}
-/**
- * Push HEAD to origin/<currentBranch>. Single source of truth shared by wp-start-upsert-pr and
- * wp-finish-upsert-pr (they pushed with identical copy-pasted logic). Uses --force-with-lease for an
- * existing remote branch (the 3-point squash rewrites history) and -u for a brand-new branch.
- */
-function ensurePushed(currentBranch) {
-    const remoteExists = (0, child_process_1.spawnSync)('git', ['ls-remote', '--exit-code', '--heads', 'origin', currentBranch]).status === 0;
-    if (remoteExists) {
-        runGitChecked(['push', '--force-with-lease', 'origin', `HEAD:${currentBranch}`], 'Failed to push branch');
+    // Untracked files only (respects .gitignore). Empty string = none.
+    untrackedFiles(cwd) {
+        return this.gitQuery(['ls-files', '--others', '--exclude-standard'], cwd, 'Failed to list untracked files (git ls-files --others).');
     }
-    else {
-        runGitChecked(['push', '-u', 'origin', `HEAD:${currentBranch}`], 'Failed to push new branch');
+    /**
+     * Precondition for every PR/merge entry point: the working tree must be fully committed. The
+     * webpieces tooling deliberately does NOT `git add`/`commit` the developer's work for them. Aborts
+     * with instructions if anything is uncommitted (tracked or untracked, excluding gitignored).
+     */
+    assertCleanTree(cwd) {
+        const dirty = this.uncommittedFiles(cwd);
+        if (dirty === '')
+            return;
+        throw new rules_config_1.CliExitError(1, '\n' + SEP +
+            '❌ ERROR: You have uncommitted or untracked changes\n' +
+            SEP + '\n' +
+            'The webpieces PR tooling will NOT commit your work for you. Commit your\n' +
+            'changes, and either commit or delete any untracked files, then re-run.\n\n' +
+            'Working tree (git status --porcelain):\n' +
+            dirty + '\n\n' +
+            `See ${this.repoRootFinder.docPathFrom(cwd, GIT_WORKFLOW_DOC_NAME)} for the full merge + PR process.\n` +
+            SEP);
     }
-}
+    /**
+     * Narrower guard for the merge-resolve commit point, where tracked resolutions are legitimately in
+     * the tree but untracked files must NOT be swept into the squash commit. Lists any untracked files
+     * and aborts so the AI commits or deletes them explicitly.
+     */
+    assertNoUntracked(cwd) {
+        const untracked = this.untrackedFiles(cwd);
+        if (untracked === '')
+            return;
+        throw new rules_config_1.CliExitError(1, '\n' + SEP +
+            '❌ ERROR: Untracked files present during merge finalize\n' +
+            SEP + '\n' +
+            'The tooling will not sweep untracked files into the squash commit. Commit\n' +
+            'or delete these, then re-run:\n\n' +
+            untracked + '\n\n' +
+            `See ${this.repoRootFinder.docPathFrom(cwd, GIT_WORKFLOW_DOC_NAME)} for the full merge + PR process.\n` +
+            SEP);
+    }
+    /**
+     * 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.
+     */
+    runGitChecked(args, errMsg) {
+        const result = (0, child_process_1.spawnSync)('git', args, { stdio: 'inherit' });
+        if (result.status !== 0) {
+            throw new rules_config_1.CliExitError(1, `❌ ${errMsg} (git ${args.join(' ')} exited ${String(result.status)})`);
+        }
+    }
+    /**
+     * Push HEAD to origin/<currentBranch>. Uses --force-with-lease for an existing remote branch (the
+     * 3-point squash rewrites history) and -u for a brand-new branch.
+     */
+    ensurePushed(currentBranch) {
+        const remoteExists = (0, child_process_1.spawnSync)('git', ['ls-remote', '--exit-code', '--heads', 'origin', currentBranch]).status === 0;
+        if (remoteExists) {
+            this.runGitChecked(['push', '--force-with-lease', 'origin', `HEAD:${currentBranch}`], 'Failed to push branch');
+        }
+        else {
+            this.runGitChecked(['push', '-u', 'origin', `HEAD:${currentBranch}`], 'Failed to push new branch');
+        }
+    }
+    // Run a read-only git query from the repo root; abort if git itself errors. Kept `cwd`-explicit
+    // because `git ls-files --others` is scoped to the cwd subtree.
+    gitQuery(args, cwd, failMsg) {
+        const out = (0, child_process_1.spawnSync)('git', args, { encoding: 'utf8', cwd });
+        if (out.status !== 0) {
+            throw new rules_config_1.CliExitError(1, `❌ ${failMsg}`);
+        }
+        return out.stdout.trim();
+    }
+};
+exports.GitExec = GitExec;
+exports.GitExec = GitExec = tslib_1.__decorate([
+    (0, core_context_1.provideSingleton)(),
+    (0, inversify_1.injectable)(),
+    tslib_1.__metadata("design:paramtypes", [rules_config_1.RepoRootFinder])
+], GitExec);
 //# sourceMappingURL=git-exec.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"git-exec.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/git-exec.ts"],"names":[],"mappings":"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","sourcesContent":["import { spawnSync } from 'child_process';\nimport { CliExitError, RepoRootFinder } from '@webpieces/rules-config';\n\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\n';\n// The AI-facing doc the failure messages point at (generated under `.webpieces/instruct-ai`, at the\n// REPO ROOT — resolved absolute so the AI opens it regardless of the cwd it reads the message from).\nconst GIT_WORKFLOW_DOC_NAME = 'webpieces.git-workflow.md';\n\n// Run a read-only git query from the repo root; abort if git itself errors. Kept `cwd`-explicit (not\n// process.cwd()) because `git ls-files --others` is scoped to the cwd subtree — running from a subdir\n// would miss untracked files elsewhere in the repo.\nfunction gitQuery(args: string[], cwd: string, failMsg: string): string {\n    const out = spawnSync('git', args, { encoding: 'utf8', cwd });\n    if (out.status !== 0) {\n        throw new CliExitError(1, `❌ ${failMsg}`);\n    }\n    return out.stdout.trim();\n}\n\n// Tracked changes (staged + unstaged) AND untracked files, EXCLUDING gitignored paths — so `.webpieces/`\n// tooling artifacts never count. Empty string = fully committed. Exported for unit testing.\nexport function uncommittedFiles(cwd: string): string {\n    return gitQuery(['status', '--porcelain'], cwd, 'Failed to run `git status --porcelain` to check the working tree.');\n}\n\n// Untracked files only (respects .gitignore). Empty string = none. Exported for unit testing.\nexport function untrackedFiles(cwd: string): string {\n    return gitQuery(['ls-files', '--others', '--exclude-standard'], cwd, 'Failed to list untracked files (git ls-files --others).');\n}\n\n/**\n * Precondition for every PR/merge entry point: the working tree must be fully committed. The webpieces\n * tooling deliberately does NOT `git add`/`commit` the developer's work for them — a blanket `git add\n * -A` once swept a stale untracked directory into a squash commit, and building the working tree while\n * pushing HEAD let an uncommitted fix pass the build gate yet push a stale commit. Aborts with\n * instructions if anything is uncommitted (tracked or untracked, excluding gitignored).\n */\nexport function assertCleanTree(cwd: string): void {\n    const dirty = uncommittedFiles(cwd);\n    if (dirty === '') return;\n    throw new CliExitError(1,\n        '\\n' + SEP +\n        '❌ ERROR: You have uncommitted or untracked changes\\n' +\n        SEP + '\\n' +\n        'The webpieces PR tooling will NOT commit your work for you. Commit your\\n' +\n        'changes, and either commit or delete any untracked files, then re-run.\\n\\n' +\n        'Working tree (git status --porcelain):\\n' +\n        dirty + '\\n\\n' +\n        `See ${new RepoRootFinder().docPathFrom(cwd, GIT_WORKFLOW_DOC_NAME)} for the full merge + PR process.\\n` +\n        SEP,\n    );\n}\n\n/**\n * Narrower guard for the merge-resolve commit point, where tracked resolutions are legitimately in the\n * tree but untracked files must NOT be swept into the squash commit (replaces the old blanket `git add\n * -A`). Lists any untracked files and aborts so the AI commits or deletes them explicitly.\n */\nexport function assertNoUntracked(cwd: string): void {\n    const untracked = untrackedFiles(cwd);\n    if (untracked === '') return;\n    throw new CliExitError(1,\n        '\\n' + SEP +\n        '❌ ERROR: Untracked files present during merge finalize\\n' +\n        SEP + '\\n' +\n        'The tooling will not sweep untracked files into the squash commit. Commit\\n' +\n        'or delete these, then re-run:\\n\\n' +\n        untracked + '\\n\\n' +\n        `See ${new RepoRootFinder().docPathFrom(cwd, GIT_WORKFLOW_DOC_NAME)} for the full merge + PR process.\\n` +\n        SEP,\n    );\n}\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        throw new CliExitError(1, `❌ ${errMsg} (git ${args.join(' ')} exited ${String(result.status)})`);\n    }\n}\n\n/**\n * Push HEAD to origin/<currentBranch>. Single source of truth shared by wp-start-upsert-pr and\n * wp-finish-upsert-pr (they pushed with identical copy-pasted logic). Uses --force-with-lease for an\n * existing remote branch (the 3-point squash rewrites history) and -u for a brand-new branch.\n */\nexport function ensurePushed(currentBranch: string): void {\n    const remoteExists = spawnSync('git', ['ls-remote', '--exit-code', '--heads', 'origin', currentBranch]).status === 0;\n    if (remoteExists) {\n        runGitChecked(['push', '--force-with-lease', 'origin', `HEAD:${currentBranch}`], 'Failed to push branch');\n    } else {\n        runGitChecked(['push', '-u', 'origin', `HEAD:${currentBranch}`], 'Failed to push new branch');\n    }\n}\n"]}
+{"version":3,"file":"git-exec.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/pr-gate/src/scripts/workflow/git-exec.ts"],"names":[],"mappings":"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","sourcesContent":["import { spawnSync } from 'child_process';\nimport { CliExitError, RepoRootFinder } from '@webpieces/rules-config';\nimport { provideSingleton } from '@webpieces/core-context';\nimport { injectable } from 'inversify';\n\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\n';\n// The AI-facing doc the failure messages point at (generated under `.webpieces/instruct-ai`, at the\n// REPO ROOT — resolved absolute so the AI opens it regardless of the cwd it reads the message from).\nconst GIT_WORKFLOW_DOC_NAME = 'webpieces.git-workflow.md';\n\n/** Shared git precondition checks + push logic for the PR/merge workflow. */\n@provideSingleton()\n@injectable()\nexport class GitExec {\n    constructor(private readonly repoRootFinder: RepoRootFinder) {}\n\n    // Tracked changes (staged + unstaged) AND untracked files, EXCLUDING gitignored paths — so\n    // `.webpieces/` tooling artifacts never count. Empty string = fully committed.\n    uncommittedFiles(cwd: string): string {\n        return this.gitQuery(['status', '--porcelain'], cwd, 'Failed to run `git status --porcelain` to check the working tree.');\n    }\n\n    // Untracked files only (respects .gitignore). Empty string = none.\n    untrackedFiles(cwd: string): string {\n        return this.gitQuery(['ls-files', '--others', '--exclude-standard'], cwd, 'Failed to list untracked files (git ls-files --others).');\n    }\n\n    /**\n     * Precondition for every PR/merge entry point: the working tree must be fully committed. The\n     * webpieces tooling deliberately does NOT `git add`/`commit` the developer's work for them. Aborts\n     * with instructions if anything is uncommitted (tracked or untracked, excluding gitignored).\n     */\n    assertCleanTree(cwd: string): void {\n        const dirty = this.uncommittedFiles(cwd);\n        if (dirty === '') return;\n        throw new CliExitError(1,\n            '\\n' + SEP +\n            '❌ ERROR: You have uncommitted or untracked changes\\n' +\n            SEP + '\\n' +\n            'The webpieces PR tooling will NOT commit your work for you. Commit your\\n' +\n            'changes, and either commit or delete any untracked files, then re-run.\\n\\n' +\n            'Working tree (git status --porcelain):\\n' +\n            dirty + '\\n\\n' +\n            `See ${this.repoRootFinder.docPathFrom(cwd, GIT_WORKFLOW_DOC_NAME)} for the full merge + PR process.\\n` +\n            SEP,\n        );\n    }\n\n    /**\n     * Narrower guard for the merge-resolve commit point, where tracked resolutions are legitimately in\n     * the tree but untracked files must NOT be swept into the squash commit. Lists any untracked files\n     * and aborts so the AI commits or deletes them explicitly.\n     */\n    assertNoUntracked(cwd: string): void {\n        const untracked = this.untrackedFiles(cwd);\n        if (untracked === '') return;\n        throw new CliExitError(1,\n            '\\n' + SEP +\n            '❌ ERROR: Untracked files present during merge finalize\\n' +\n            SEP + '\\n' +\n            'The tooling will not sweep untracked files into the squash commit. Commit\\n' +\n            'or delete these, then re-run:\\n\\n' +\n            untracked + '\\n\\n' +\n            `See ${this.repoRootFinder.docPathFrom(cwd, GIT_WORKFLOW_DOC_NAME)} for the full merge + PR process.\\n` +\n            SEP,\n        );\n    }\n\n    /**\n     * Run a git command that is expected to succeed; abort the process with a clear message if it\n     * fails. Used for fetch/pull/checkout/commit where silently continuing on failure would operate on\n     * stale or wrong state.\n     */\n    runGitChecked(args: string[], errMsg: string): void {\n        const result = spawnSync('git', args, { stdio: 'inherit' });\n        if (result.status !== 0) {\n            throw new CliExitError(1, `❌ ${errMsg} (git ${args.join(' ')} exited ${String(result.status)})`);\n        }\n    }\n\n    /**\n     * Push HEAD to origin/<currentBranch>. Uses --force-with-lease for an existing remote branch (the\n     * 3-point squash rewrites history) and -u for a brand-new branch.\n     */\n    ensurePushed(currentBranch: string): void {\n        const remoteExists = spawnSync('git', ['ls-remote', '--exit-code', '--heads', 'origin', currentBranch]).status === 0;\n        if (remoteExists) {\n            this.runGitChecked(['push', '--force-with-lease', 'origin', `HEAD:${currentBranch}`], 'Failed to push branch');\n        } else {\n            this.runGitChecked(['push', '-u', 'origin', `HEAD:${currentBranch}`], 'Failed to push new branch');\n        }\n    }\n\n    // Run a read-only git query from the repo root; abort if git itself errors. Kept `cwd`-explicit\n    // because `git ls-files --others` is scoped to the cwd subtree.\n    private gitQuery(args: string[], cwd: string, failMsg: string): string {\n        const out = spawnSync('git', args, { encoding: 'utf8', cwd });\n        if (out.status !== 0) {\n            throw new CliExitError(1, `❌ ${failMsg}`);\n        }\n        return out.stdout.trim();\n    }\n}\n"]}

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

@@ -1,3 +1,12 @@
-export declare function forkPointOutputDir(repoRoot: string, featureName: string, workflow: string): string;
-export declare function findForkPoint(workflow: string): Promise<void>;
-export declare function main(): Promise<void>;
+import { AiBranchName } from './git-readAiBranchName';
+import { MergeState } from './merge-state';
+/** Computes the 3-point fork point and guards against improper merges-from-main. */
+export declare class ForkPoint {
+    private readonly aiBranchName;
+    private readonly mergeState;
+    constructor(aiBranchName: AiBranchName, mergeState: MergeState);
+    forkPointOutputDir(repoRoot: string, featureName: string, workflow: string): string;
+    findForkPoint(workflow: string): Promise<void>;
+    private checkMergeCommits;
+    private printMergeFromMainError;
+}

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

@@ -1,123 +1,132 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.forkPointOutputDir = forkPointOutputDir;
-exports.findForkPoint = findForkPoint;
-exports.main = main;
+exports.ForkPoint = 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("./git-readAiBranchName");
 const merge_state_1 = require("./merge-state");
 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-start-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. Fetch the latest main (works on the primary repo AND in a worktree):\n');
-    process.stderr.write('   git fetch origin main\n');
-    process.stderr.write('\n');
-    process.stderr.write('2. Create a new branch OFF origin/main — do NOT `git checkout main`\n');
-    process.stderr.write('   (it fatals inside a worktree: "main is already checked out at <primary>"):\n');
-    process.stderr.write(`   git checkout -b ${featureName}-v2 origin/main\n`);
-    process.stderr.write('\n');
-    process.stderr.write('3. Squash merge your old branch:\n');
-    process.stderr.write(`   git merge --squash ${currentBranch}\n`);
-    process.stderr.write('\n');
-    process.stderr.write('4. 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('5. 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);
-                throw new rules_config_1.CliExitError(1, '');
-            }
-        }
+/** Computes the 3-point fork point and guards against improper merges-from-main. */
+let ForkPoint = class ForkPoint {
+    aiBranchName;
+    mergeState;
+    constructor(aiBranchName, mergeState) {
+        this.aiBranchName = aiBranchName;
+        this.mergeState = mergeState;
     }
-    process.stderr.write('✅ No improper merges from main detected\n');
-}
-// Single source of truth for the per-feature dir fork-point output is written to — the SAME nested
-// home the readers use (git-gatherInfo / merge-start read updatemain-hashes.json from mergeDirFor;
-// the review flow reads from prDirFor). Previously findForkPoint wrote to the legacy flat
-// `.webpieces/<workflow>-<feature>/` while readers looked under `.webpieces/merge-info/<feature>/`,
-// so the hash file was written to one path and read from another. Routing the writer through these
-// same helpers is what keeps them from diverging again — guarded by git-findForkPoint.spec.ts.
-function forkPointOutputDir(repoRoot, featureName, workflow) {
-    return workflow === 'review' ? (0, rules_config_1.prDirFor)(repoRoot, featureName) : (0, merge_state_1.mergeDirFor)(repoRoot, featureName);
-}
-async function findForkPoint(workflow) {
-    if (workflow !== 'review' && workflow !== 'merge') {
-        throw new rules_config_1.CliExitError(1, 'ERROR: Workflow argument required\n' +
-            'Usage: git-findForkPoint <workflow>\n' +
-            "  workflow: 'review' or 'merge'");
+    // Single source of truth for the per-feature dir fork-point output is written to — the SAME nested
+    // home the readers use (git-gatherInfo / merge-start read updatemain-hashes.json from mergeDirFor;
+    // the review flow reads from prDirFor). Routing the writer through these same helpers is what keeps
+    // them from diverging again — guarded by git-findForkPoint.spec.ts.
+    forkPointOutputDir(repoRoot, featureName, workflow) {
+        return workflow === 'review' ? (0, rules_config_1.prDirFor)(repoRoot, featureName) : this.mergeState.mergeDirFor(repoRoot, featureName);
     }
-    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 = forkPointOutputDir(repoRoot, featureName, workflow);
-    const prefix = workflow === 'review' ? 'review-' : 'updatemain-';
-    fs.mkdirSync(outputDir, { recursive: true });
-    (0, child_process_1.spawnSync)('git', ['fetch', 'origin', 'main'], { stdio: 'ignore' });
-    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) {
-        throw new rules_config_1.CliExitError(1, 'ERROR: Could not find common ancestor with origin/main');
+    async findForkPoint(workflow) {
+        if (workflow !== 'review' && workflow !== 'merge') {
+            throw new rules_config_1.CliExitError(1, 'ERROR: Workflow argument required\n' +
+                'Usage: git-findForkPoint <workflow>\n' +
+                "  workflow: 'review' or 'merge'");
+        }
+        const featureName = this.aiBranchName.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 = this.forkPointOutputDir(repoRoot, featureName, workflow);
+        const prefix = workflow === 'review' ? 'review-' : 'updatemain-';
+        fs.mkdirSync(outputDir, { recursive: true });
+        (0, child_process_1.spawnSync)('git', ['fetch', 'origin', 'main'], { stdio: 'ignore' });
+        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) {
+            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`);
+        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) {
+            this.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`);
     }
-    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);
+    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');
+                    this.printMergeFromMainError(commit, parent, featureName, currentBranch);
+                    throw new rules_config_1.CliExitError(1, '');
+                }
+            }
+        }
+        process.stderr.write('✅ No improper merges from main detected\n');
     }
-    else {
-        process.stderr.write('✅ No merge commits found (clean history)\n');
+    printMergeFromMainError(commit, parent, featureName, currentBranch) {
+        process.stderr.write('\n');
+        process.stderr.write(SEP);
+        process.stderr.write('❌ This branch merged main without pnpm wp-start-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. Fetch the latest main (works on the primary repo AND in a worktree):\n');
+        process.stderr.write('   git fetch origin main\n');
+        process.stderr.write('\n');
+        process.stderr.write('2. Create a new branch OFF origin/main — do NOT `git checkout main`\n');
+        process.stderr.write('   (it fatals inside a worktree: "main is already checked out at <primary>"):\n');
+        process.stderr.write(`   git checkout -b ${featureName}-v2 origin/main\n`);
+        process.stderr.write('\n');
+        process.stderr.write('3. Squash merge your old branch:\n');
+        process.stderr.write(`   git merge --squash ${currentBranch}\n`);
+        process.stderr.write('\n');
+        process.stderr.write('4. 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('5. 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');
     }
-    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)
-    (0, rules_config_1.runMain)(main);
+};
+exports.ForkPoint = ForkPoint;
+exports.ForkPoint = ForkPoint = tslib_1.__decorate([
+    (0, core_context_1.provideSingleton)(),
+    (0, inversify_1.injectable)(),
+    tslib_1.__metadata("design:paramtypes", [git_readAiBranchName_1.AiBranchName,
+        merge_state_1.MergeState])
+], ForkPoint);
 //# sourceMappingURL=git-findForkPoint.js.map

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, runMain } from '@webpieces/rules-config';\nimport { getFeatureName } from './git-readAiBranchName';\nimport { mergeDirFor } from './merge-state';\n\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\n';\n\nfunction printMergeFromMainError(commit: string, parent: string, featureName: string, currentBranch: string): void {\n    process.stderr.write('\\n');\n    process.stderr.write(SEP);\n    process.stderr.write('❌ This branch merged main without pnpm wp-start-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. 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:\\n');\n    process.stderr.write(`   git merge --squash ${currentBranch}\\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\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                throw new CliExitError(1, '');\n            }\n        }\n    }\n    process.stderr.write('✅ No improper merges from main detected\\n');\n}\n\n// Single source of truth for the per-feature dir fork-point output is written to — the SAME nested\n// home the readers use (git-gatherInfo / merge-start read updatemain-hashes.json from mergeDirFor;\n// the review flow reads from prDirFor). Previously findForkPoint wrote to the legacy flat\n// `.webpieces/<workflow>-<feature>/` while readers looked under `.webpieces/merge-info/<feature>/`,\n// so the hash file was written to one path and read from another. Routing the writer through these\n// same helpers is what keeps them from diverging again — guarded by git-findForkPoint.spec.ts.\nexport function forkPointOutputDir(repoRoot: string, featureName: string, workflow: string): string {\n    return workflow === 'review' ? prDirFor(repoRoot, featureName) : mergeDirFor(repoRoot, featureName);\n}\n\nexport async function findForkPoint(workflow: string): Promise<void> {\n    if (workflow !== 'review' && workflow !== 'merge') {\n        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 = getFeatureName();\n    const currentBranch = execSync('git branch --show-current', { encoding: 'utf8' }).trim();\n    const repoRoot = execSync('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();\n\n    const outputDir = forkPointOutputDir(repoRoot, featureName, workflow);\n    const prefix = workflow === 'review' ? 'review-' : 'updatemain-';\n    fs.mkdirSync(outputDir, { recursive: true });\n\n    spawnSync('git', ['fetch', 'origin', 'main'], { stdio: 'ignore' });\n\n    const featureHead = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim();\n    const originMain = execSync('git rev-parse origin/main', { encoding: 'utf8' }).trim();\n\n    process.stderr.write('Finding fork point using git merge-base...\\n');\n\n    const forkPointResult = spawnSync('git', ['merge-base', 'origin/main', 'HEAD'], { encoding: 'utf8' });\n    const forkPoint = (forkPointResult.stdout ?? '').trim();\n\n    if (!forkPoint || forkPointResult.status !== 0) {\n        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        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) runMain(main);\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 } from '@webpieces/rules-config';\nimport { provideSingleton } from '@webpieces/core-context';\nimport { injectable } 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@provideSingleton()\n@injectable()\nexport class ForkPoint {\n    constructor(\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 = execSync('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();\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 pnpm wp-start-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. 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:\\n');\n        process.stderr.write(`   git merge --squash ${currentBranch}\\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/git-readAiBranchName.d.ts

@@ -1,2 +1,7 @@
-export declare function getFeatureName(): string;
-export declare function main(): Promise<void>;
+import { BranchNaming } from './branch-naming';
+/** The stable feature identity used to key the merge-context + PR-body dirs. */
+export declare class AiBranchName {
+    private readonly branchNaming;
+    constructor(branchNaming: BranchNaming);
+    getFeatureName(): string;
+}