forge-dev-framework 1.1.0 → 1.2.0

package/dist/git/worktree.js

@@ -1,202 +0,0 @@
-/**
- * Git Worktree Management for FORGE
- *
- * Implements isolated worktree strategy for parallel agent execution.
- * Each task gets its own worktree to prevent merge conflicts during development.
- *
- * Commands (from FORGE spec):
- * - git worktree add .worktrees/{taskId} -b forge/{taskId}
- * - git worktree remove .worktrees/{taskId}
- */
-import { execa } from "execa";
-export class WorktreeError extends Error {
-    code;
-    constructor(message, code) {
-        super(message);
-        this.code = code;
-        this.name = "WorktreeError";
-    }
-}
-/**
- * Create a new git worktree for a task.
- *
- * Creates a branch `forge/{taskId}` and checks it out into `.worktrees/{taskId}`.
- * This gives each agent an isolated filesystem to work in.
- *
- * @param options - Task identification and branch configuration
- * @returns Path to the new worktree
- * @throws WorktreeError if worktree creation fails
- */
-export async function createWorktree(options) {
-    const { taskId, branchName = `forge/${taskId}`, baseBranch = "main" } = options;
-    const worktreePath = `.worktrees/${taskId}`;
-    try {
-        // Create the .worktrees directory if it doesn't exist
-        await execa("mkdir", ["-p", ".worktrees"]);
-        // Create the worktree with a new branch
-        await execa("git", ["worktree", "add", "-b", branchName, worktreePath, baseBranch]);
-        return worktreePath;
-    }
-    catch (error) {
-        if (error instanceof Error) {
-            throw new WorktreeError(`Failed to create worktree for task ${taskId}: ${error.message}`, error.code);
-        }
-        throw new WorktreeError(`Failed to create worktree for task ${taskId}`);
-    }
-}
-/**
- * Get information about a worktree.
- *
- * @param taskId - Task ID to look up
- * @returns Worktree information or null if not found
- */
-export async function getWorktree(taskId) {
-    try {
-        const { stdout } = await execa("git", ["worktree", "list", "--porcelain"]);
-        const lines = stdout.split("\n");
-        let currentPath = null;
-        let currentBranch = null;
-        let currentCommit = null;
-        for (const line of lines) {
-            if (line.startsWith("worktree ")) {
-                // Check if this is our target worktree
-                const path = line.slice("worktree ".length);
-                if (path.endsWith(`.worktrees/${taskId}`) || path.endsWith(`.worktrees/${taskId}/`)) {
-                    currentPath = path;
-                }
-            }
-            else if (currentPath && line.startsWith("branch ")) {
-                currentBranch = line.slice("branch ".length).replace("refs/heads/", "");
-            }
-            else if (currentPath && line.startsWith("commit ")) {
-                currentCommit = line.slice("commit ".length);
-            }
-            else if (line === "") {
-                // End of a worktree block
-                if (currentPath && currentBranch && currentCommit) {
-                    return {
-                        taskId,
-                        branchName: currentBranch,
-                        path: currentPath,
-                        commit: currentCommit,
-                    };
-                }
-                // Reset
-                currentPath = null;
-                currentBranch = null;
-                currentCommit = null;
-            }
-        }
-        return null;
-    }
-    catch (error) {
-        throw new WorktreeError(`Failed to get worktree info for task ${taskId}`);
-    }
-}
-/**
- * Merge a worktree's branch back into the base branch.
- *
- * Should only be called after CI passes. The worktree is removed after merge.
- *
- * @param taskId - Task ID whose branch to merge
- * @param targetBranch - Branch to merge into (default: main)
- * @throws WorktreeError if merge fails or has conflicts
- */
-export async function mergeWorktree(taskId, targetBranch = "main") {
-    const worktree = await getWorktree(taskId);
-    if (!worktree) {
-        throw new WorktreeError(`Worktree for task ${taskId} not found`);
-    }
-    try {
-        // Checkout the target branch in the main repository
-        await execa("git", ["checkout", targetBranch]);
-        // Merge the worktree branch
-        const branchName = worktree.branchName;
-        await execa("git", ["merge", "--no-ff", branchName, "-m", `Merge ${branchName} into ${targetBranch}`]);
-        // Clean up the worktree after successful merge
-        await cleanupWorktree(taskId);
-    }
-    catch (error) {
-        if (error instanceof Error) {
-            throw new WorktreeError(`Failed to merge worktree for task ${taskId}: ${error.message}`, error.code);
-        }
-        throw new WorktreeError(`Failed to merge worktree for task ${taskId}`);
-    }
-}
-/**
- * Remove a worktree.
- *
- * Safely removes the worktree after cleaning up any uncommitted changes.
- *
- * @param taskId - Task ID whose worktree to remove
- * @throws WorktreeError if removal fails
- */
-export async function cleanupWorktree(taskId) {
-    const worktree = await getWorktree(taskId);
-    if (!worktree) {
-        // Already cleaned up, nothing to do
-        return;
-    }
-    try {
-        // Remove the worktree
-        await execa("git", ["worktree", "remove", worktree.path]);
-    }
-    catch (error) {
-        if (error instanceof Error) {
-            throw new WorktreeError(`Failed to cleanup worktree for task ${taskId}: ${error.message}`, error.code);
-        }
-        throw new WorktreeError(`Failed to cleanup worktree for task ${taskId}`);
-    }
-}
-/**
- * List all FORGE worktrees.
- *
- * @returns Array of worktree information for all active tasks
- */
-export async function listWorktrees() {
-    try {
-        const { stdout } = await execa("git", ["worktree", "list", "--porcelain"]);
-        const lines = stdout.split("\n");
-        const worktrees = [];
-        let currentPath = null;
-        let currentBranch = null;
-        let currentCommit = null;
-        for (const line of lines) {
-            if (line.startsWith("worktree ")) {
-                const path = line.slice("worktree ".length);
-                // Only include FORGE worktrees
-                if (path.includes(".worktrees/")) {
-                    currentPath = path;
-                }
-            }
-            else if (currentPath && line.startsWith("branch ")) {
-                currentBranch = line.slice("branch ".length).replace("refs/heads/", "");
-            }
-            else if (currentPath && line.startsWith("commit ")) {
-                currentCommit = line.slice("commit ".length);
-            }
-            else if (line === "") {
-                // End of a worktree block
-                if (currentPath && currentBranch && currentCommit) {
-                    // Extract taskId from path
-                    const taskId = currentPath.match(/\.worktrees\/([^/]+)/)?.[1] || "unknown";
-                    worktrees.push({
-                        taskId,
-                        branchName: currentBranch,
-                        path: currentPath,
-                        commit: currentCommit,
-                    });
-                }
-                // Reset
-                currentPath = null;
-                currentBranch = null;
-                currentCommit = null;
-            }
-        }
-        return worktrees;
-    }
-    catch (error) {
-        throw new WorktreeError("Failed to list worktrees");
-    }
-}
-//# sourceMappingURL=worktree.js.map

package/dist/git/worktree.js.map

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