@webpieces/ai-hook-rules 0.3.184 → 0.3.185

package/src/scripts/git-updateFromMain.js

@@ -1,290 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.main = main;
-const tslib_1 = require("tslib");
-const child_process_1 = require("child_process");
-const fs = tslib_1.__importStar(require("fs"));
-const path = tslib_1.__importStar(require("path"));
-const readline = tslib_1.__importStar(require("readline"));
-const git_readAiBranchName_1 = require("./workflow/git-readAiBranchName");
-const git_gatherInfo_1 = require("./git-gatherInfo");
-const cleanTmp_1 = require("./workflow/cleanTmp");
-const SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n';
-function getAiMergePreference() {
-    const settingsFile = path.join(process.env['HOME'] ?? '', '.webpieces', 'settings.json');
-    if (!fs.existsSync(settingsFile))
-        return null;
-    const settings = JSON.parse(fs.readFileSync(settingsFile, 'utf8'));
-    if (settings.ai_merge_conflicts === true)
-        return 'yes';
-    if (settings.ai_merge_conflicts === false)
-        return 'no';
-    return null;
-}
-function saveAiMergePreference(useAi) {
-    const settingsDir = path.join(process.env['HOME'] ?? '', '.webpieces');
-    const settingsFile = path.join(settingsDir, 'settings.json');
-    fs.mkdirSync(settingsDir, { recursive: true });
-    let settings = {};
-    if (fs.existsSync(settingsFile)) {
-        settings = JSON.parse(fs.readFileSync(settingsFile, 'utf8'));
-    }
-    settings.ai_merge_conflicts = useAi;
-    fs.writeFileSync(settingsFile, JSON.stringify(settings, null, 2) + '\n');
-}
-function askQuestion(rl, question) {
-    return new Promise((resolve) => {
-        rl.question(question, resolve);
-    });
-}
-function saveConflictContext(conflictedFiles, mergeDir, forkPoint, featureHead, mainHead) {
-    for (const file of conflictedFiles) {
-        const safePath = file.replace(/\//g, '__');
-        const fileDir = path.join(mergeDir, `updatemain-${safePath}`);
-        fs.mkdirSync(fileDir, { recursive: true });
-        const forkContent = (0, child_process_1.spawnSync)('git', ['show', `${forkPoint}:${file}`], { encoding: 'utf8' });
-        fs.writeFileSync(path.join(fileDir, 'A-forkpoint.txt'), forkContent.status === 0 ? (forkContent.stdout ?? '') : '(file did not exist)\n');
-        const featureContent = (0, child_process_1.spawnSync)('git', ['show', `${featureHead}:${file}`], { encoding: 'utf8' });
-        fs.writeFileSync(path.join(fileDir, 'B-feature.txt'), featureContent.status === 0 ? (featureContent.stdout ?? '') : '(file did not exist)\n');
-        const mainContent = (0, child_process_1.spawnSync)('git', ['show', `${mainHead}:${file}`], { encoding: 'utf8' });
-        fs.writeFileSync(path.join(fileDir, 'C-main.txt'), mainContent.status === 0 ? (mainContent.stdout ?? '') : '(file did not exist)\n');
-        const baResult = (0, child_process_1.spawnSync)('git', ['diff', forkPoint, featureHead, '--', file], { encoding: 'utf8' });
-        fs.writeFileSync(path.join(fileDir, 'B-A.diff'), baResult.stdout ?? '');
-        const caResult = (0, child_process_1.spawnSync)('git', ['diff', forkPoint, mainHead, '--', file], { encoding: 'utf8' });
-        fs.writeFileSync(path.join(fileDir, 'C-A.diff'), caResult.stdout ?? '');
-    }
-}
-async function waitForCleanCommit(rl, prompt) {
-    let committed = false;
-    while (!committed) {
-        const ans = await askQuestion(rl, prompt);
-        process.stdout.write('\n');
-        if (ans.toLowerCase() === 'y') {
-            const isClean = (0, child_process_1.spawnSync)('git', ['diff-index', '--quiet', 'HEAD', '--']).status === 0;
-            if (isClean) {
-                committed = true;
-            }
-            else {
-                process.stdout.write('❌ You still have uncommitted changes\n\n');
-            }
-        }
-    }
-}
-async function resolveAiMerge(rl, repoRoot, mergeDir) {
-    process.stdout.write('\n' + SEP + '🤖 Calling AI to Resolve Conflicts\n' + SEP + '\n');
-    (0, child_process_1.spawnSync)('claude', [
-        '--allowed-tools', 'Edit Write Read Bash Glob Grep',
-        '--append-system-prompt',
-        'Read .claude/commands/wp-merge.md and follow ALL instructions in that file to resolve the merge conflicts.',
-        'Start resolving the merge conflicts now.',
-    ], { stdio: 'inherit', cwd: repoRoot });
-    process.stdout.write('\n' + SEP + '✅ AI Merge Summary ✅\n' + SEP + '\n');
-    process.stdout.write('Review what I did before committing:\n');
-    process.stdout.write("  1. Read each file's resolution details BELOW (quick read)\n");
-    process.stdout.write('  2. Diff each file in your IDE making sure AI did nothing extra\n');
-    process.stdout.write('  3. Delete any remaining A/B/C comment blocks in the code\n\n');
-    process.stdout.write(`Full merge context available in: ${mergeDir}\n\n`);
-    const mergeSummaryFile = path.join(mergeDir, 'merge-summary.md');
-    if (fs.existsSync(mergeSummaryFile)) {
-        process.stdout.write(fs.readFileSync(mergeSummaryFile, 'utf8'));
-    }
-    else {
-        process.stdout.write('ℹ️  No merge summary file was generated by AI.\n');
-        process.stdout.write(`   (Expected: ${mergeSummaryFile})\n`);
-    }
-    process.stdout.write('\n' + SEP + '⚠️  IMPORTANT: SCROLL UP to AI Merge Summary section\n' + SEP + '\n');
-    process.stdout.write('When done reviewing, run:\n\n  git add -A && git commit -m "Merge main into feature branch"\n\n');
-    await waitForCleanCommit(rl, 'Have you scrolled up to ✅ AI Merge Summary ✅ and done a quick read? Did you commit it per instructions? (y/n) ');
-    fs.writeFileSync(path.join(mergeDir, 'conflicts-resolved'), '');
-    process.stdout.write('\n' + SEP);
-}
-async function resolveManualMerge(rl, mergeDir) {
-    process.stdout.write('\n' + SEP + '🛠️  Manual Merge Required\n' + SEP + '\n');
-    let committed = false;
-    while (!committed) {
-        process.stdout.write('Please resolve conflicts manually\n');
-        process.stdout.write(`Merge context available in: ${mergeDir}\n\n`);
-        const ans = await askQuestion(rl, 'Are you done merging and committing? (y/n) ');
-        process.stdout.write('\n');
-        if (ans.toLowerCase() === 'y') {
-            const isClean = (0, child_process_1.spawnSync)('git', ['diff-index', '--quiet', 'HEAD', '--']).status === 0;
-            if (isClean) {
-                committed = true;
-            }
-            else {
-                process.stdout.write('❌ You still have uncommitted changes\n\n');
-            }
-        }
-    }
-    fs.writeFileSync(path.join(mergeDir, 'conflicts-resolved'), '');
-}
-async function handleConflicts(currentBranch, mergeDir, hashes, rl, repoRoot) {
-    process.stdout.write('\n' + SEP + '⚠️  Conflicts Detected\n' + SEP + '\n');
-    process.stdout.write('Conflicting files:\n');
-    const conflictedFilesRaw = (0, child_process_1.execSync)('git diff --name-only --diff-filter=U', { encoding: 'utf8' }).trim();
-    process.stdout.write(conflictedFilesRaw + '\n\n');
-    fs.writeFileSync(path.join(mergeDir, 'updatemain-conflicted-files.txt'), conflictedFilesRaw + '\n');
-    const conflictedFiles = conflictedFilesRaw.split('\n').filter((f) => f.trim() !== '');
-    saveConflictContext(conflictedFiles, mergeDir, hashes.hashForkPoint, hashes.hashFeatureHead, hashes.hashMainHead);
-    process.stdout.write(`✅ Merge context saved to: ${mergeDir}\n\n`);
-    const settingsFile = path.join(process.env['HOME'] ?? '', '.webpieces', 'settings.json');
-    const savedPref = getAiMergePreference();
-    let useAi;
-    if (savedPref !== null) {
-        useAi = savedPref === 'yes';
-        process.stdout.write(`Using saved preference: ${useAi ? 'AI merge' : 'Manual merge'} (from ${settingsFile})\n`);
-        process.stdout.write(`To change, edit ${settingsFile} and set "ai_merge_conflicts"\n\n`);
-    }
-    else {
-        process.stdout.write(SEP + `⚠️  Your choice will be saved to: ${settingsFile}\n` + '   You can edit this file later to change your preference.\n' + SEP + '\n');
-        const answer = await askQuestion(rl, 'Would you like AI to help resolve conflicts? (y/n) ');
-        process.stdout.write('\n');
-        useAi = answer.toLowerCase() === 'y';
-        saveAiMergePreference(useAi);
-        process.stdout.write(`✅ Saved preference: ${useAi ? 'AI merge' : 'Manual merge'}\n\n`);
-    }
-    if (useAi) {
-        await resolveAiMerge(rl, repoRoot, mergeDir);
-    }
-    else {
-        await resolveManualMerge(rl, mergeDir);
-    }
-    void currentBranch;
-}
-function printFinalSummary(currentBranch, backupBranch, prNumber, mergeDir, hasRemote) {
-    process.stdout.write('\n' + SEP);
-    if (hasRemote) {
-        process.stdout.write(prNumber ? `✅ Successfully Updated PR #${prNumber}\n` : '✅ Successfully Updated Remote Branch\n');
-    }
-    else {
-        process.stdout.write('✅ Branch Updated from Main\n');
-    }
-    process.stdout.write(SEP + '\n📋 Summary:\n');
-    process.stdout.write(`  Branch: ${currentBranch}\n`);
-    if (hasRemote && prNumber) {
-        process.stdout.write(`  PR: #${prNumber}\n`);
-    }
-    else if (!hasRemote) {
-        process.stdout.write('  Base: main (latest)\n');
-    }
-    else {
-        process.stdout.write('  PR: (none found - create with gh pr create)\n');
-    }
-    process.stdout.write(`  Backup: ${backupBranch}\n`);
-    process.stdout.write(`  Merge context: ${mergeDir}\n`);
-    process.stdout.write('\nNext steps:\n');
-    if (hasRemote) {
-        process.stdout.write('  1. Review changes on GitHub\n');
-        process.stdout.write('  2. Continue development or create more commits\n');
-    }
-    else {
-        process.stdout.write('  1. Test your changes\n');
-        process.stdout.write('  2. Create PR with: gh pr create\n');
-    }
-    process.stdout.write(`  3. Delete old backup when safe: git branch -D ${backupBranch}\n\n`);
-    process.stdout.write(SEP);
-}
-function createBackup(currentBranch) {
-    process.stdout.write('\n' + SEP + '💾 Creating Incremental Backup\n' + SEP + '\n');
-    let n = 1;
-    while ((0, child_process_1.spawnSync)('git', ['show-ref', '--verify', '--quiet', `refs/heads/${currentBranch}Backup${n}`]).status === 0) {
-        n += 1;
-    }
-    const backupBranch = `${currentBranch}Backup${n}`;
-    process.stdout.write(`Creating backup: ${backupBranch}\n`);
-    (0, child_process_1.spawnSync)('git', ['checkout', '-b', backupBranch], { stdio: 'inherit' });
-    (0, child_process_1.spawnSync)('git', ['checkout', currentBranch], { stdio: 'inherit' });
-    process.stdout.write(`✅ Backup created: ${backupBranch}\n\n`);
-    return backupBranch;
-}
-async function finalizeBranch(currentBranch, squashBranch, backupBranch, prNumber, mergeDir) {
-    process.stdout.write('\n' + SEP + '🗑️  Cleaning Up Old Branch\n' + SEP + '\n');
-    process.stdout.write(`Deleting local branch: ${currentBranch} (backed up as ${backupBranch})\n`);
-    (0, child_process_1.spawnSync)('git', ['branch', '-D', currentBranch], { stdio: 'inherit' });
-    process.stdout.write('\n');
-    const remoteExists = (0, child_process_1.spawnSync)('git', ['ls-remote', '--exit-code', '--heads', 'origin', currentBranch]).status === 0;
-    if (remoteExists) {
-        process.stdout.write(SEP + (prNumber ? `🔍 Updating Existing PR #${prNumber}\n` : '🔍 Updating Remote Branch (no PR found)\n') + SEP + '\n');
-        if (prNumber) {
-            process.stdout.write(`✅ Updating PR #${prNumber} with squashed changes\n`);
-        }
-        else {
-            process.stdout.write('⚠️  Remote branch exists but no PR found (PR check may have failed)\n   Syncing remote branch anyway...\n');
-        }
-        process.stdout.write(`\nForce pushing ${squashBranch} to origin/${currentBranch}...\n`);
-        (0, child_process_1.spawnSync)('git', ['push', '-u', '--force-with-lease', 'origin', `${squashBranch}:${currentBranch}`], { stdio: 'inherit' });
-        (0, child_process_1.spawnSync)('git', ['checkout', squashBranch], { stdio: 'inherit' });
-        (0, child_process_1.spawnSync)('git', ['branch', '-m', currentBranch], { stdio: 'inherit' });
-    }
-    else {
-        process.stdout.write(SEP + '📝 No Remote Branch to Update\n' + SEP + '\n');
-        (0, child_process_1.spawnSync)('git', ['checkout', squashBranch], { stdio: 'inherit' });
-        (0, child_process_1.spawnSync)('git', ['branch', '-m', currentBranch], { stdio: 'inherit' });
-        process.stdout.write(`ℹ️  No remote branch found for ${currentBranch} (local only)\n\n`);
-    }
-    printFinalSummary(currentBranch, backupBranch, prNumber, mergeDir, remoteExists);
-}
-async function main() {
-    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 = path.join(repoRoot, 'webpiecesTmp', `merge-${featureName}`);
-    fs.mkdirSync(mergeDir, { recursive: true });
-    process.stdout.write('\n' + SEP + '🔄 Squash-Merge Workflow\n' + SEP + '\n');
-    process.stdout.write('Gathering merge context...\n');
-    await (0, git_gatherInfo_1.main)();
-    const hashes = JSON.parse(fs.readFileSync(path.join(mergeDir, 'updatemain-hashes.json'), 'utf8'));
-    process.stdout.write('\nChecking for existing PR...\n');
-    const prResult = (0, child_process_1.spawnSync)('gh', ['pr', 'list', '--head', currentBranch, '--json', 'number', '--jq', '.[0].number'], { encoding: 'utf8' });
-    const prNumber = prResult.status === 0 ? (prResult.stdout ?? '').trim() : '';
-    process.stdout.write(prNumber ? `✅ Found existing PR #${prNumber} (will be updated after merge)\n\n` : 'ℹ️  No existing PR found (you can create one later with gh pr create)\n\n');
-    const backupBranch = createBackup(currentBranch);
-    process.stdout.write(SEP + '🔄 Creating Temporary Squash Branch\n' + SEP + '\n');
-    const squashBranch = `${currentBranch}Squash`;
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    if ((0, child_process_1.spawnSync)('git', ['show-ref', '--verify', '--quiet', `refs/heads/${squashBranch}`]).status === 0) {
-        process.stdout.write(`⚠️  Found existing ${squashBranch} from previous run\n`);
-        const answer = await askQuestion(rl, 'Delete and start fresh? (y/n) ');
-        process.stdout.write('\n');
-        if (answer.toLowerCase() === 'y') {
-            (0, child_process_1.spawnSync)('git', ['branch', '-D', squashBranch], { stdio: 'inherit' });
-        }
-        else {
-            process.stdout.write('❌ Aborting. Please clean up manually.\n');
-            rl.close();
-            process.exit(1);
-        }
-    }
-    process.stdout.write('Updating local main branch...\n');
-    (0, child_process_1.spawnSync)('git', ['checkout', 'main'], { stdio: 'inherit' });
-    (0, child_process_1.spawnSync)('git', ['pull', 'origin', 'main'], { stdio: 'inherit' });
-    process.stdout.write(`Creating new branch: ${squashBranch} from main...\n\n`);
-    (0, child_process_1.spawnSync)('git', ['checkout', '-b', squashBranch], { stdio: 'inherit' });
-    process.stdout.write(SEP + `🔀 Squash Merging ${currentBranch}\n` + SEP + '\n');
-    const mergeResult = (0, child_process_1.spawnSync)('git', ['merge', '--squash', currentBranch], { stdio: 'inherit' });
-    if (mergeResult.status === 0) {
-        process.stdout.write('\n✅ Squash merge successful (no conflicts)\n\n');
-        const nothingStaged = (0, child_process_1.spawnSync)('git', ['diff-index', '--quiet', '--cached', 'HEAD', '--']).status === 0;
-        if (nothingStaged) {
-            process.stdout.write('ℹ️  Branch already up-to-date with main (nothing to merge)\n');
-        }
-        else {
-            (0, child_process_1.spawnSync)('git', ['commit', '-m', `Squash merge of ${currentBranch}`], { stdio: 'inherit' });
-        }
-    }
-    else {
-        await handleConflicts(currentBranch, mergeDir, hashes, rl, repoRoot);
-    }
-    rl.close();
-    await finalizeBranch(currentBranch, squashBranch, backupBranch, prNumber, mergeDir);
-    await (0, cleanTmp_1.main)();
-}
-if (require.main === module) {
-    main().catch((err) => {
-        const message = err instanceof Error ? err.message : String(err);
-        process.stderr.write(message + '\n');
-        process.exit(1);
-    });
-}
-//# sourceMappingURL=git-updateFromMain.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"git-updateFromMain.js","sourceRoot":"","sources":["../../../../../../packages/tooling/ai-hook-rules/src/scripts/git-updateFromMain.ts"],"names":[],"mappings":"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","sourcesContent":["#!/usr/bin/env node\nimport { execSync, spawnSync } from 'child_process';\nimport * as fs from 'fs';\nimport * as path from 'path';\nimport * as readline from 'readline';\nimport { getFeatureName } from './workflow/git-readAiBranchName';\nimport { main as gatherInfo } from './git-gatherInfo';\nimport { main as cleanTmp } from './workflow/cleanTmp';\n\nconst SEP = '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\\n';\n\ninterface WebpiecesSettings {\n    ai_merge_conflicts?: boolean;\n}\n\ninterface HashPoints {\n    hashForkPoint: string;\n    hashFeatureHead: string;\n    hashMainHead: string;\n}\n\nfunction getAiMergePreference(): 'yes' | 'no' | null {\n    const settingsFile = path.join(process.env['HOME'] ?? '', '.webpieces', 'settings.json');\n    if (!fs.existsSync(settingsFile)) return null;\n    const settings = JSON.parse(fs.readFileSync(settingsFile, 'utf8')) as WebpiecesSettings;\n    if (settings.ai_merge_conflicts === true) return 'yes';\n    if (settings.ai_merge_conflicts === false) return 'no';\n    return null;\n}\n\nfunction saveAiMergePreference(useAi: boolean): void {\n    const settingsDir = path.join(process.env['HOME'] ?? '', '.webpieces');\n    const settingsFile = path.join(settingsDir, 'settings.json');\n    fs.mkdirSync(settingsDir, { recursive: true });\n    let settings: WebpiecesSettings = {};\n    if (fs.existsSync(settingsFile)) {\n        settings = JSON.parse(fs.readFileSync(settingsFile, 'utf8')) as WebpiecesSettings;\n    }\n    settings.ai_merge_conflicts = useAi;\n    fs.writeFileSync(settingsFile, JSON.stringify(settings, null, 2) + '\\n');\n}\n\nfunction askQuestion(rl: readline.Interface, question: string): Promise<string> {\n    return new Promise<string>((resolve: (answer: string) => void) => {\n        rl.question(question, resolve);\n    });\n}\n\nfunction saveConflictContext(conflictedFiles: string[], mergeDir: string, forkPoint: string, featureHead: string, mainHead: string): void {\n    for (const file of conflictedFiles) {\n        const safePath = file.replace(/\\//g, '__');\n        const fileDir = path.join(mergeDir, `updatemain-${safePath}`);\n        fs.mkdirSync(fileDir, { recursive: true });\n\n        const forkContent = spawnSync('git', ['show', `${forkPoint}:${file}`], { encoding: 'utf8' });\n        fs.writeFileSync(path.join(fileDir, 'A-forkpoint.txt'), forkContent.status === 0 ? (forkContent.stdout ?? '') : '(file did not exist)\\n');\n\n        const featureContent = spawnSync('git', ['show', `${featureHead}:${file}`], { encoding: 'utf8' });\n        fs.writeFileSync(path.join(fileDir, 'B-feature.txt'), featureContent.status === 0 ? (featureContent.stdout ?? '') : '(file did not exist)\\n');\n\n        const mainContent = spawnSync('git', ['show', `${mainHead}:${file}`], { encoding: 'utf8' });\n        fs.writeFileSync(path.join(fileDir, 'C-main.txt'), mainContent.status === 0 ? (mainContent.stdout ?? '') : '(file did not exist)\\n');\n\n        const baResult = spawnSync('git', ['diff', forkPoint, featureHead, '--', file], { encoding: 'utf8' });\n        fs.writeFileSync(path.join(fileDir, 'B-A.diff'), baResult.stdout ?? '');\n\n        const caResult = spawnSync('git', ['diff', forkPoint, mainHead, '--', file], { encoding: 'utf8' });\n        fs.writeFileSync(path.join(fileDir, 'C-A.diff'), caResult.stdout ?? '');\n    }\n}\n\nasync function waitForCleanCommit(rl: readline.Interface, prompt: string): Promise<void> {\n    let committed = false;\n    while (!committed) {\n        const ans = await askQuestion(rl, prompt);\n        process.stdout.write('\\n');\n        if (ans.toLowerCase() === 'y') {\n            const isClean = spawnSync('git', ['diff-index', '--quiet', 'HEAD', '--']).status === 0;\n            if (isClean) {\n                committed = true;\n            } else {\n                process.stdout.write('❌ You still have uncommitted changes\\n\\n');\n            }\n        }\n    }\n}\n\nasync function resolveAiMerge(rl: readline.Interface, repoRoot: string, mergeDir: string): Promise<void> {\n    process.stdout.write('\\n' + SEP + '🤖 Calling AI to Resolve Conflicts\\n' + SEP + '\\n');\n\n    spawnSync('claude', [\n        '--allowed-tools', 'Edit Write Read Bash Glob Grep',\n        '--append-system-prompt',\n        'Read .claude/commands/wp-merge.md and follow ALL instructions in that file to resolve the merge conflicts.',\n        'Start resolving the merge conflicts now.',\n    ], { stdio: 'inherit', cwd: repoRoot });\n\n    process.stdout.write('\\n' + SEP + '✅ AI Merge Summary ✅\\n' + SEP + '\\n');\n    process.stdout.write('Review what I did before committing:\\n');\n    process.stdout.write(\"  1. Read each file's resolution details BELOW (quick read)\\n\");\n    process.stdout.write('  2. Diff each file in your IDE making sure AI did nothing extra\\n');\n    process.stdout.write('  3. Delete any remaining A/B/C comment blocks in the code\\n\\n');\n    process.stdout.write(`Full merge context available in: ${mergeDir}\\n\\n`);\n\n    const mergeSummaryFile = path.join(mergeDir, 'merge-summary.md');\n    if (fs.existsSync(mergeSummaryFile)) {\n        process.stdout.write(fs.readFileSync(mergeSummaryFile, 'utf8'));\n    } else {\n        process.stdout.write('ℹ️  No merge summary file was generated by AI.\\n');\n        process.stdout.write(`   (Expected: ${mergeSummaryFile})\\n`);\n    }\n\n    process.stdout.write('\\n' + SEP + '⚠️  IMPORTANT: SCROLL UP to AI Merge Summary section\\n' + SEP + '\\n');\n    process.stdout.write('When done reviewing, run:\\n\\n  git add -A && git commit -m \"Merge main into feature branch\"\\n\\n');\n\n    await waitForCleanCommit(rl, 'Have you scrolled up to ✅ AI Merge Summary ✅ and done a quick read? Did you commit it per instructions? (y/n) ');\n    fs.writeFileSync(path.join(mergeDir, 'conflicts-resolved'), '');\n    process.stdout.write('\\n' + SEP);\n}\n\nasync function resolveManualMerge(rl: readline.Interface, mergeDir: string): Promise<void> {\n    process.stdout.write('\\n' + SEP + '🛠️  Manual Merge Required\\n' + SEP + '\\n');\n\n    let committed = false;\n    while (!committed) {\n        process.stdout.write('Please resolve conflicts manually\\n');\n        process.stdout.write(`Merge context available in: ${mergeDir}\\n\\n`);\n\n        const ans = await askQuestion(rl, 'Are you done merging and committing? (y/n) ');\n        process.stdout.write('\\n');\n\n        if (ans.toLowerCase() === 'y') {\n            const isClean = spawnSync('git', ['diff-index', '--quiet', 'HEAD', '--']).status === 0;\n            if (isClean) {\n                committed = true;\n            } else {\n                process.stdout.write('❌ You still have uncommitted changes\\n\\n');\n            }\n        }\n    }\n    fs.writeFileSync(path.join(mergeDir, 'conflicts-resolved'), '');\n}\n\nasync function handleConflicts(currentBranch: string, mergeDir: string, hashes: HashPoints, rl: readline.Interface, repoRoot: string): Promise<void> {\n    process.stdout.write('\\n' + SEP + '⚠️  Conflicts Detected\\n' + SEP + '\\n');\n    process.stdout.write('Conflicting files:\\n');\n\n    const conflictedFilesRaw = execSync('git diff --name-only --diff-filter=U', { encoding: 'utf8' }).trim();\n    process.stdout.write(conflictedFilesRaw + '\\n\\n');\n\n    fs.writeFileSync(path.join(mergeDir, 'updatemain-conflicted-files.txt'), conflictedFilesRaw + '\\n');\n    const conflictedFiles = conflictedFilesRaw.split('\\n').filter((f: string) => f.trim() !== '');\n\n    saveConflictContext(conflictedFiles, mergeDir, hashes.hashForkPoint, hashes.hashFeatureHead, hashes.hashMainHead);\n    process.stdout.write(`✅ Merge context saved to: ${mergeDir}\\n\\n`);\n\n    const settingsFile = path.join(process.env['HOME'] ?? '', '.webpieces', 'settings.json');\n    const savedPref = getAiMergePreference();\n    let useAi: boolean;\n\n    if (savedPref !== null) {\n        useAi = savedPref === 'yes';\n        process.stdout.write(`Using saved preference: ${useAi ? 'AI merge' : 'Manual merge'} (from ${settingsFile})\\n`);\n        process.stdout.write(`To change, edit ${settingsFile} and set \"ai_merge_conflicts\"\\n\\n`);\n    } else {\n        process.stdout.write(SEP + `⚠️  Your choice will be saved to: ${settingsFile}\\n` + '   You can edit this file later to change your preference.\\n' + SEP + '\\n');\n        const answer = await askQuestion(rl, 'Would you like AI to help resolve conflicts? (y/n) ');\n        process.stdout.write('\\n');\n        useAi = answer.toLowerCase() === 'y';\n        saveAiMergePreference(useAi);\n        process.stdout.write(`✅ Saved preference: ${useAi ? 'AI merge' : 'Manual merge'}\\n\\n`);\n    }\n\n    if (useAi) {\n        await resolveAiMerge(rl, repoRoot, mergeDir);\n    } else {\n        await resolveManualMerge(rl, mergeDir);\n    }\n\n    void currentBranch;\n}\n\nfunction printFinalSummary(currentBranch: string, backupBranch: string, prNumber: string, mergeDir: string, hasRemote: boolean): void {\n    process.stdout.write('\\n' + SEP);\n    if (hasRemote) {\n        process.stdout.write(prNumber ? `✅ Successfully Updated PR #${prNumber}\\n` : '✅ Successfully Updated Remote Branch\\n');\n    } else {\n        process.stdout.write('✅ Branch Updated from Main\\n');\n    }\n    process.stdout.write(SEP + '\\n📋 Summary:\\n');\n    process.stdout.write(`  Branch: ${currentBranch}\\n`);\n    if (hasRemote && prNumber) {\n        process.stdout.write(`  PR: #${prNumber}\\n`);\n    } else if (!hasRemote) {\n        process.stdout.write('  Base: main (latest)\\n');\n    } else {\n        process.stdout.write('  PR: (none found - create with gh pr create)\\n');\n    }\n    process.stdout.write(`  Backup: ${backupBranch}\\n`);\n    process.stdout.write(`  Merge context: ${mergeDir}\\n`);\n    process.stdout.write('\\nNext steps:\\n');\n    if (hasRemote) {\n        process.stdout.write('  1. Review changes on GitHub\\n');\n        process.stdout.write('  2. Continue development or create more commits\\n');\n    } else {\n        process.stdout.write('  1. Test your changes\\n');\n        process.stdout.write('  2. Create PR with: gh pr create\\n');\n    }\n    process.stdout.write(`  3. Delete old backup when safe: git branch -D ${backupBranch}\\n\\n`);\n    process.stdout.write(SEP);\n}\n\nfunction createBackup(currentBranch: string): string {\n    process.stdout.write('\\n' + SEP + '💾 Creating Incremental Backup\\n' + SEP + '\\n');\n    let n = 1;\n    while (spawnSync('git', ['show-ref', '--verify', '--quiet', `refs/heads/${currentBranch}Backup${n}`]).status === 0) {\n        n += 1;\n    }\n    const backupBranch = `${currentBranch}Backup${n}`;\n    process.stdout.write(`Creating backup: ${backupBranch}\\n`);\n    spawnSync('git', ['checkout', '-b', backupBranch], { stdio: 'inherit' });\n    spawnSync('git', ['checkout', currentBranch], { stdio: 'inherit' });\n    process.stdout.write(`✅ Backup created: ${backupBranch}\\n\\n`);\n    return backupBranch;\n}\n\nasync function finalizeBranch(currentBranch: string, squashBranch: string, backupBranch: string, prNumber: string, mergeDir: string): Promise<void> {\n    process.stdout.write('\\n' + SEP + '🗑️  Cleaning Up Old Branch\\n' + SEP + '\\n');\n    process.stdout.write(`Deleting local branch: ${currentBranch} (backed up as ${backupBranch})\\n`);\n    spawnSync('git', ['branch', '-D', currentBranch], { stdio: 'inherit' });\n    process.stdout.write('\\n');\n\n    const remoteExists = spawnSync('git', ['ls-remote', '--exit-code', '--heads', 'origin', currentBranch]).status === 0;\n\n    if (remoteExists) {\n        process.stdout.write(SEP + (prNumber ? `🔍 Updating Existing PR #${prNumber}\\n` : '🔍 Updating Remote Branch (no PR found)\\n') + SEP + '\\n');\n        if (prNumber) {\n            process.stdout.write(`✅ Updating PR #${prNumber} with squashed changes\\n`);\n        } else {\n            process.stdout.write('⚠️  Remote branch exists but no PR found (PR check may have failed)\\n   Syncing remote branch anyway...\\n');\n        }\n        process.stdout.write(`\\nForce pushing ${squashBranch} to origin/${currentBranch}...\\n`);\n        spawnSync('git', ['push', '-u', '--force-with-lease', 'origin', `${squashBranch}:${currentBranch}`], { stdio: 'inherit' });\n        spawnSync('git', ['checkout', squashBranch], { stdio: 'inherit' });\n        spawnSync('git', ['branch', '-m', currentBranch], { stdio: 'inherit' });\n    } else {\n        process.stdout.write(SEP + '📝 No Remote Branch to Update\\n' + SEP + '\\n');\n        spawnSync('git', ['checkout', squashBranch], { stdio: 'inherit' });\n        spawnSync('git', ['branch', '-m', currentBranch], { stdio: 'inherit' });\n        process.stdout.write(`ℹ️  No remote branch found for ${currentBranch} (local only)\\n\\n`);\n    }\n\n    printFinalSummary(currentBranch, backupBranch, prNumber, mergeDir, remoteExists);\n}\n\nexport async function main(): Promise<void> {\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 = path.join(repoRoot, 'webpiecesTmp', `merge-${featureName}`);\n    fs.mkdirSync(mergeDir, { recursive: true });\n\n    process.stdout.write('\\n' + SEP + '🔄 Squash-Merge Workflow\\n' + SEP + '\\n');\n    process.stdout.write('Gathering merge context...\\n');\n    await gatherInfo();\n\n    const hashes = JSON.parse(fs.readFileSync(path.join(mergeDir, 'updatemain-hashes.json'), 'utf8')) as HashPoints;\n\n    process.stdout.write('\\nChecking for existing PR...\\n');\n    const prResult = spawnSync('gh', ['pr', 'list', '--head', currentBranch, '--json', 'number', '--jq', '.[0].number'], { encoding: 'utf8' });\n    const prNumber = prResult.status === 0 ? (prResult.stdout ?? '').trim() : '';\n    process.stdout.write(prNumber ? `✅ Found existing PR #${prNumber} (will be updated after merge)\\n\\n` : 'ℹ️  No existing PR found (you can create one later with gh pr create)\\n\\n');\n\n    const backupBranch = createBackup(currentBranch);\n\n    process.stdout.write(SEP + '🔄 Creating Temporary Squash Branch\\n' + SEP + '\\n');\n    const squashBranch = `${currentBranch}Squash`;\n    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });\n\n    if (spawnSync('git', ['show-ref', '--verify', '--quiet', `refs/heads/${squashBranch}`]).status === 0) {\n        process.stdout.write(`⚠️  Found existing ${squashBranch} from previous run\\n`);\n        const answer = await askQuestion(rl, 'Delete and start fresh? (y/n) ');\n        process.stdout.write('\\n');\n        if (answer.toLowerCase() === 'y') {\n            spawnSync('git', ['branch', '-D', squashBranch], { stdio: 'inherit' });\n        } else {\n            process.stdout.write('❌ Aborting. Please clean up manually.\\n');\n            rl.close();\n            process.exit(1);\n        }\n    }\n\n    process.stdout.write('Updating local main branch...\\n');\n    spawnSync('git', ['checkout', 'main'], { stdio: 'inherit' });\n    spawnSync('git', ['pull', 'origin', 'main'], { stdio: 'inherit' });\n    process.stdout.write(`Creating new branch: ${squashBranch} from main...\\n\\n`);\n    spawnSync('git', ['checkout', '-b', squashBranch], { stdio: 'inherit' });\n\n    process.stdout.write(SEP + `🔀 Squash Merging ${currentBranch}\\n` + SEP + '\\n');\n    const mergeResult = spawnSync('git', ['merge', '--squash', currentBranch], { stdio: 'inherit' });\n\n    if (mergeResult.status === 0) {\n        process.stdout.write('\\n✅ Squash merge successful (no conflicts)\\n\\n');\n        const nothingStaged = spawnSync('git', ['diff-index', '--quiet', '--cached', 'HEAD', '--']).status === 0;\n        if (nothingStaged) {\n            process.stdout.write('ℹ️  Branch already up-to-date with main (nothing to merge)\\n');\n        } else {\n            spawnSync('git', ['commit', '-m', `Squash merge of ${currentBranch}`], { stdio: 'inherit' });\n        }\n    } else {\n        await handleConflicts(currentBranch, mergeDir, hashes, rl, repoRoot);\n    }\n\n    rl.close();\n    await finalizeBranch(currentBranch, squashBranch, backupBranch, prNumber, mergeDir);\n    await cleanTmp();\n}\n\nif (require.main === module) {\n    main().catch((err) => {\n        const message = err instanceof Error ? err.message : String(err);\n        process.stderr.write(message + '\\n');\n        process.exit(1);\n    });\n}\n"]}

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

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

package/src/scripts/workflow/cleanTmp.js

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFeatureName = getFeatureName;
-exports.main = main;
-const child_process_1 = require("child_process");
-function getFeatureName() {
-    const branch = (0, child_process_1.execSync)('git branch --show-current', { encoding: 'utf8' }).trim();
-    return branch.replace(/\//g, '-').replace(/Squash$/, '');
-}
-async function main() {
-    process.stdout.write(getFeatureName() + '\n');
-}
-if (require.main === module) {
-    main().catch((err) => {
-        const message = err instanceof Error ? err.message : String(err);
-        process.stderr.write(message + '\n');
-        process.exit(1);
-    });
-}
-//# sourceMappingURL=git-readAiBranchName.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"git-readAiBranchName.js","sourceRoot":"","sources":["../../../../../../../packages/tooling/ai-hook-rules/src/scripts/workflow/git-readAiBranchName.ts"],"names":[],"mappings":";;AAEA,wCAGC;AAED,oBAEC;AATD,iDAAyC;AAEzC,SAAgB,cAAc;IAC1B,MAAM,MAAM,GAAG,IAAA,wBAAQ,EAAC,2BAA2B,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAClF,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAC7D,CAAC;AAEM,KAAK,UAAU,IAAI;IACtB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,CAAC;AAClD,CAAC;AAED,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;IAC1B,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACjB,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;QACrC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;AACP,CAAC","sourcesContent":["import { execSync } from 'child_process';\n\nexport function getFeatureName(): string {\n    const branch = execSync('git branch --show-current', { encoding: 'utf8' }).trim();\n    return branch.replace(/\\//g, '-').replace(/Squash$/, '');\n}\n\nexport async function main(): Promise<void> {\n    process.stdout.write(getFeatureName() + '\\n');\n}\n\nif (require.main === module) {\n    main().catch((err) => {\n        const message = err instanceof Error ? err.message : String(err);\n        process.stderr.write(message + '\\n');\n        process.exit(1);\n    });\n}\n"]}