@specforge/mcp 2.5.1 → 3.0.0

package/dist/autopilot/git/merge-manager.js

@@ -0,0 +1,304 @@
+/**
+ * Merge Manager
+ *
+ * Handles squash merging for autopilot branches.
+ */
+import { exec } from 'child_process';
+import { promisify } from 'util';
+import { EventEmitter } from 'events';
+import { createBranchManager } from './branch-manager.js';
+const execAsync = promisify(exec);
+/**
+ * Merge Manager
+ *
+ * Handles squash merging of worker branches to epic branches,
+ * and epic branches to the base branch.
+ */
+export class MergeManager extends EventEmitter {
+    workingDirectory;
+    branchManager;
+    constructor(options) {
+        super();
+        this.workingDirectory = options.workingDirectory;
+        this.branchManager = createBranchManager({
+            workingDirectory: options.workingDirectory,
+            branchPrefix: options.branchPrefix,
+        });
+    }
+    /**
+     * Squash merge a branch into another
+     */
+    async squashMerge(sourceBranch, targetBranch, commitMessage) {
+        this.emit('merge:started', { sourceBranch, targetBranch });
+        try {
+            // Store current branch to restore later
+            const originalBranch = await this.branchManager.getCurrentBranch();
+            // Checkout target branch
+            await execAsync(`git checkout ${targetBranch}`, {
+                cwd: this.workingDirectory,
+            });
+            // Perform squash merge
+            try {
+                await execAsync(`git merge --squash ${sourceBranch}`, {
+                    cwd: this.workingDirectory,
+                });
+            }
+            catch (mergeError) {
+                // Check for conflicts
+                const conflictFiles = await this.getConflictFiles();
+                if (conflictFiles.length > 0) {
+                    this.emit('merge:conflict', { sourceBranch, targetBranch, files: conflictFiles });
+                    // Abort the merge
+                    await this.abortMerge();
+                    await this.checkoutBranch(originalBranch);
+                    return {
+                        success: false,
+                        sourceBranch,
+                        targetBranch,
+                        error: 'Merge conflicts detected',
+                        conflictFiles,
+                    };
+                }
+                throw mergeError;
+            }
+            // Check if there are changes to commit
+            const hasChanges = await this.hasChangesToCommit();
+            if (!hasChanges) {
+                // Nothing to merge
+                await this.checkoutBranch(originalBranch);
+                return {
+                    success: true,
+                    sourceBranch,
+                    targetBranch,
+                    error: 'No changes to merge',
+                };
+            }
+            // Create the squash commit
+            const escapedMessage = commitMessage.replace(/"/g, '\\"');
+            await execAsync(`git commit -m "${escapedMessage}"`, {
+                cwd: this.workingDirectory,
+            });
+            // Get the commit hash
+            const commitHash = await this.branchManager.getLatestCommit();
+            // Restore original branch
+            await this.checkoutBranch(originalBranch);
+            const result = {
+                success: true,
+                sourceBranch,
+                targetBranch,
+                commitHash,
+            };
+            this.emit('merge:completed', { result });
+            return result;
+        }
+        catch (error) {
+            const errorMessage = error.message;
+            // Try to clean up
+            try {
+                await this.abortMerge();
+            }
+            catch {
+                // Ignore abort errors
+            }
+            const result = {
+                success: false,
+                sourceBranch,
+                targetBranch,
+                error: errorMessage,
+            };
+            this.emit('merge:completed', { result });
+            return result;
+        }
+    }
+    /**
+     * Merge worker branch to epic branch
+     */
+    async mergeWorkerToEpic(workerId, epicNumber, ticketTitle) {
+        const sourceBranch = this.branchManager.getWorkerBranchName(workerId);
+        const targetBranch = this.branchManager.getEpicBranchName(epicNumber);
+        const commitMessage = `feat: ${ticketTitle}\n\nMerged from worker ${workerId}`;
+        return this.squashMerge(sourceBranch, targetBranch, commitMessage);
+    }
+    /**
+     * Merge epic branch to base branch
+     */
+    async mergeEpicToBase(epicNumber, epicTitle, baseBranch) {
+        const sourceBranch = this.branchManager.getEpicBranchName(epicNumber);
+        const targetBranch = baseBranch || await this.branchManager.getBaseBranch();
+        const commitMessage = `feat: Epic ${epicNumber} - ${epicTitle}\n\nImplemented by SpecForge Autopilot`;
+        return this.squashMerge(sourceBranch, targetBranch, commitMessage);
+    }
+    /**
+     * Reset worker branch to epic branch
+     */
+    async resetWorkerToEpic(workerId, epicNumber) {
+        const workerBranch = this.branchManager.getWorkerBranchName(workerId);
+        const epicBranch = this.branchManager.getEpicBranchName(epicNumber);
+        // Reset worker branch to epic branch
+        await execAsync(`git branch -f ${workerBranch} ${epicBranch}`, {
+            cwd: this.workingDirectory,
+        });
+    }
+    /**
+     * Check if there are changes to commit
+     */
+    async hasChangesToCommit() {
+        try {
+            const { stdout } = await execAsync('git diff --staged --name-only', {
+                cwd: this.workingDirectory,
+            });
+            return stdout.trim().length > 0;
+        }
+        catch {
+            return false;
+        }
+    }
+    /**
+     * Get conflict files
+     */
+    async getConflictFiles() {
+        try {
+            const { stdout } = await execAsync('git diff --name-only --diff-filter=U', {
+                cwd: this.workingDirectory,
+            });
+            return stdout.split('\n').filter(f => f.trim().length > 0);
+        }
+        catch {
+            return [];
+        }
+    }
+    /**
+     * Abort current merge
+     */
+    async abortMerge() {
+        try {
+            await execAsync('git merge --abort', {
+                cwd: this.workingDirectory,
+            });
+        }
+        catch {
+            // Reset to clean state
+            await execAsync('git reset --hard HEAD', {
+                cwd: this.workingDirectory,
+            });
+        }
+    }
+    /**
+     * Checkout a branch
+     */
+    async checkoutBranch(branchName) {
+        await execAsync(`git checkout ${branchName}`, {
+            cwd: this.workingDirectory,
+        });
+    }
+    /**
+     * Cherry-pick a commit
+     */
+    async cherryPick(commitHash, targetBranch) {
+        const originalBranch = await this.branchManager.getCurrentBranch();
+        try {
+            await this.checkoutBranch(targetBranch);
+            await execAsync(`git cherry-pick ${commitHash}`, {
+                cwd: this.workingDirectory,
+            });
+            const newCommitHash = await this.branchManager.getLatestCommit();
+            await this.checkoutBranch(originalBranch);
+            return {
+                success: true,
+                sourceBranch: commitHash,
+                targetBranch,
+                commitHash: newCommitHash,
+            };
+        }
+        catch (error) {
+            // Abort cherry-pick on failure
+            try {
+                await execAsync('git cherry-pick --abort', {
+                    cwd: this.workingDirectory,
+                });
+            }
+            catch {
+                // Ignore
+            }
+            await this.checkoutBranch(originalBranch);
+            return {
+                success: false,
+                sourceBranch: commitHash,
+                targetBranch,
+                error: error.message,
+            };
+        }
+    }
+    /**
+     * Rebase a branch onto another
+     */
+    async rebaseBranch(branchToRebase, ontoBranch) {
+        const originalBranch = await this.branchManager.getCurrentBranch();
+        try {
+            await this.checkoutBranch(branchToRebase);
+            await execAsync(`git rebase ${ontoBranch}`, {
+                cwd: this.workingDirectory,
+            });
+            const commitHash = await this.branchManager.getLatestCommit();
+            await this.checkoutBranch(originalBranch);
+            return {
+                success: true,
+                sourceBranch: branchToRebase,
+                targetBranch: ontoBranch,
+                commitHash,
+            };
+        }
+        catch (error) {
+            // Abort rebase on failure
+            try {
+                await execAsync('git rebase --abort', {
+                    cwd: this.workingDirectory,
+                });
+            }
+            catch {
+                // Ignore
+            }
+            await this.checkoutBranch(originalBranch);
+            return {
+                success: false,
+                sourceBranch: branchToRebase,
+                targetBranch: ontoBranch,
+                error: error.message,
+            };
+        }
+    }
+    /**
+     * Update epic branch from base
+     */
+    async updateEpicFromBase(epicNumber, baseBranch) {
+        const epicBranch = this.branchManager.getEpicBranchName(epicNumber);
+        const base = baseBranch || await this.branchManager.getBaseBranch();
+        return this.rebaseBranch(epicBranch, base);
+    }
+    /**
+     * Get branch manager
+     */
+    getBranchManager() {
+        return this.branchManager;
+    }
+    /**
+     * Set working directory
+     */
+    setWorkingDirectory(dir) {
+        this.workingDirectory = dir;
+        this.branchManager.setWorkingDirectory(dir);
+    }
+    /**
+     * Get working directory
+     */
+    getWorkingDirectory() {
+        return this.workingDirectory;
+    }
+}
+/**
+ * Create a merge manager
+ */
+export function createMergeManager(options) {
+    return new MergeManager(options);
+}
+//# sourceMappingURL=merge-manager.js.map

package/dist/autopilot/git/merge-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-manager.js","sourceRoot":"","sources":["../../../src/autopilot/git/merge-manager.ts"],"names":[],"mappings":"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"}

package/dist/autopilot/git/worktree-manager.d.ts

@@ -0,0 +1,128 @@
+/**
+ * Worktree Manager
+ *
+ * Manages git worktrees for parallel autopilot workers.
+ */
+import { EventEmitter } from 'events';
+import { BranchManager } from './branch-manager.js';
+/**
+ * Worktree info
+ */
+export interface WorktreeInfo {
+    path: string;
+    branch: string;
+    head: string;
+    isLocked: boolean;
+    isPrunable: boolean;
+}
+/**
+ * Worktree Manager Options
+ */
+export interface WorktreeManagerOptions {
+    workingDirectory: string;
+    worktreeBaseDir?: string;
+    branchPrefix?: string;
+}
+/**
+ * Worktree Manager Events
+ */
+export interface WorktreeManagerEvents {
+    'worktree:created': {
+        workerId: number;
+        path: string;
+        branch: string;
+    };
+    'worktree:removed': {
+        workerId: number;
+        path: string;
+    };
+    'worktree:error': {
+        workerId: number;
+        error: string;
+    };
+}
+/**
+ * Worktree Manager
+ *
+ * Creates and manages git worktrees for parallel worker execution.
+ */
+export declare class WorktreeManager extends EventEmitter {
+    private workingDirectory;
+    private worktreeBaseDir;
+    private branchManager;
+    private workerPaths;
+    constructor(options: WorktreeManagerOptions);
+    /**
+     * Initialize the worktree base directory
+     */
+    initialize(): Promise<void>;
+    /**
+     * Ensure .worktrees is in .gitignore
+     */
+    private ensureGitignore;
+    /**
+     * Create a worktree for a worker
+     */
+    createWorkerWorktree(workerId: number, baseBranch?: string): Promise<string>;
+    /**
+     * Remove a worker's worktree
+     */
+    removeWorkerWorktree(workerId: number): Promise<void>;
+    /**
+     * Get worktree path for a worker
+     */
+    getWorkerPath(workerId: number): string;
+    /**
+     * List all git worktrees
+     */
+    listWorktrees(): Promise<WorktreeInfo[]>;
+    /**
+     * Get worktree for a specific worker
+     */
+    getWorkerWorktree(workerId: number): Promise<WorktreeInfo | undefined>;
+    /**
+     * Prune stale worktrees
+     */
+    pruneWorktrees(): Promise<void>;
+    /**
+     * Cleanup all worker worktrees
+     */
+    cleanupAllWorktrees(): Promise<void>;
+    /**
+     * Get number of active worktrees
+     */
+    getActiveWorktreeCount(): number;
+    /**
+     * Check if a path exists
+     */
+    private pathExists;
+    /**
+     * Lock a worktree
+     */
+    lockWorktree(workerId: number, reason?: string): Promise<void>;
+    /**
+     * Unlock a worktree
+     */
+    unlockWorktree(workerId: number): Promise<void>;
+    /**
+     * Move a worktree to a new location
+     */
+    moveWorktree(workerId: number, newPath: string): Promise<void>;
+    /**
+     * Get the branch manager
+     */
+    getBranchManager(): BranchManager;
+    /**
+     * Get worktree base directory
+     */
+    getWorktreeBaseDir(): string;
+    /**
+     * Get working directory
+     */
+    getWorkingDirectory(): string;
+}
+/**
+ * Create a worktree manager
+ */
+export declare function createWorktreeManager(options: WorktreeManagerOptions): WorktreeManager;
+//# sourceMappingURL=worktree-manager.d.ts.map

package/dist/autopilot/git/worktree-manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-manager.d.ts","sourceRoot":"","sources":["../../../src/autopilot/git/worktree-manager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,aAAa,EAAuB,MAAM,qBAAqB,CAAC;AAIzE;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,kBAAkB,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IACvE,kBAAkB,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACvD,gBAAgB,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CACvD;AAED;;;;GAIG;AACH,qBAAa,eAAgB,SAAQ,YAAY;IAC/C,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,WAAW,CAAkC;gBAEzC,OAAO,EAAE,sBAAsB;IAU3C;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAOjC;;OAEG;YACW,eAAe;IAuB7B;;OAEG;IACG,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA6ClF;;OAEG;IACG,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgC3D;;OAEG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIvC;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAwC9C;;OAEG;IACG,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAM5E;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAMrC;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB1C;;OAEG;IACH,sBAAsB,IAAI,MAAM;IAIhC;;OAEG;YACW,UAAU;IASxB;;OAEG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpE;;OAEG;IACG,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOrD;;OAEG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpE;;OAEG;IACH,gBAAgB,IAAI,aAAa;IAIjC;;OAEG;IACH,kBAAkB,IAAI,MAAM;IAI5B;;OAEG;IACH,mBAAmB,IAAI,MAAM;CAG9B;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,sBAAsB,GAAG,eAAe,CAEtF"}