mcp-agent-foundry 1.0.0

package/dist/worktrees/manager.d.ts

@@ -0,0 +1,76 @@
+/**
+ * Worktree Manager for Agent Foundry
+ *
+ * Manages the lifecycle of git worktrees for parallel agent execution.
+ */
+import { BranchManager } from './branch-manager.js';
+import type { Worktree, WorktreeStatus, WorktreeConfig, WorktreeInstructions, WorktreeAllocationResult } from '../types.js';
+export declare class WorktreeManager {
+    private readonly config;
+    private readonly branchManager;
+    private readonly repoPath;
+    private readonly logger;
+    private worktrees;
+    constructor(repoPath: string, config: WorktreeConfig);
+    /**
+     * Initialize the worktree manager
+     */
+    initialize(): Promise<void>;
+    /**
+     * Sync in-memory state with actual git worktrees
+     */
+    syncWorktrees(): Promise<void>;
+    /**
+     * Create a new worktree for a task
+     */
+    create(taskId: string, baseBranch?: string): Promise<Worktree>;
+    /**
+     * Assign a worktree to an agent
+     */
+    assign(worktreeId: string, agentId: string): Promise<Worktree>;
+    /**
+     * Mark worktree as active (agent is using it)
+     */
+    activate(worktreeId: string): Promise<Worktree>;
+    /**
+     * Release a worktree (task completed)
+     */
+    release(worktreeId: string): Promise<Worktree>;
+    /**
+     * Remove a worktree
+     */
+    remove(worktreeId: string, deleteBranch?: boolean): Promise<void>;
+    /**
+     * Get worktree by ID
+     */
+    get(worktreeId: string): Worktree | undefined;
+    /**
+     * Get worktree by task ID
+     */
+    getByTaskId(taskId: string): Worktree | undefined;
+    /**
+     * List all worktrees
+     */
+    list(): Worktree[];
+    /**
+     * List worktrees by status
+     */
+    listByStatus(status: WorktreeStatus): Worktree[];
+    /**
+     * Generate instructions for an agent to use a worktree
+     */
+    generateInstructions(worktree: Worktree): WorktreeInstructions;
+    /**
+     * Allocate a worktree for a task (create + assign + generate instructions)
+     */
+    allocate(taskId: string, agentId: string): Promise<WorktreeAllocationResult>;
+    /**
+     * Cleanup stale worktrees
+     */
+    cleanup(): Promise<number>;
+    /**
+     * Get the branch manager for advanced operations
+     */
+    getBranchManager(): BranchManager;
+}
+//# sourceMappingURL=manager.d.ts.map

package/dist/worktrees/manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/worktrees/manager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAaH,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,KAAK,EACV,QAAQ,EACR,cAAc,EACd,cAAc,EACd,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,aAAa,CAAC;AAErB,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAGxB,OAAO,CAAC,SAAS,CAAoC;gBAEzC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc;IAYpD;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBjC;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA0BpC;;OAEG;IACG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAkCpE;;OAEG;IACG,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAkBpE;;OAEG;IACG,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAarD;;OAEG;IACG,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAcpD;;OAEG;IACG,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBrE;;OAEG;IACH,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAI7C;;OAEG;IACH,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAOjD;;OAEG;IACH,IAAI,IAAI,QAAQ,EAAE;IAIlB;;OAEG;IACH,YAAY,CAAC,MAAM,EAAE,cAAc,GAAG,QAAQ,EAAE;IAIhD;;OAEG;IACH,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,GAAG,oBAAoB;IAsB9D;;OAEG;IACG,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAuBlF;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IA4BhC;;OAEG;IACH,gBAAgB,IAAI,aAAa;CAGlC"}

package/dist/worktrees/manager.js

@@ -0,0 +1,277 @@
+/**
+ * Worktree Manager for Agent Foundry
+ *
+ * Manages the lifecycle of git worktrees for parallel agent execution.
+ */
+import { randomUUID } from 'crypto';
+import * as path from 'path';
+import * as fs from 'fs/promises';
+import { createWorktree, removeWorktree, listWorktrees, pruneWorktrees, isGitRepository, getRepoRoot } from '../utils/git.js';
+import { BranchManager } from './branch-manager.js';
+import { createLogger } from '../observability/logger.js';
+export class WorktreeManager {
+    config;
+    branchManager;
+    repoPath;
+    logger;
+    // In-memory worktree state
+    worktrees = new Map();
+    constructor(repoPath, config) {
+        this.repoPath = repoPath;
+        this.config = config;
+        this.logger = createLogger({ name: 'worktree-manager' });
+        this.branchManager = new BranchManager({
+            repoPath,
+            defaultBaseBranch: config.git.defaultBaseBranch,
+            branchPattern: config.git.branchPattern,
+        });
+    }
+    /**
+     * Initialize the worktree manager
+     */
+    async initialize() {
+        // Verify we're in a git repository
+        if (!(await isGitRepository(this.repoPath))) {
+            throw new Error(`Not a git repository: ${this.repoPath}`);
+        }
+        // Get actual repo root
+        const repoRoot = await getRepoRoot(this.repoPath);
+        // Create base directory for worktrees if it doesn't exist
+        const worktreeBaseDir = path.join(repoRoot, this.config.baseDir);
+        await fs.mkdir(worktreeBaseDir, { recursive: true });
+        // Sync with existing worktrees
+        await this.syncWorktrees();
+        this.logger.info('WorktreeManager initialized', {
+            repoPath: repoRoot,
+            baseDir: this.config.baseDir,
+            existingWorktrees: this.worktrees.size,
+        });
+    }
+    /**
+     * Sync in-memory state with actual git worktrees
+     */
+    async syncWorktrees() {
+        const gitWorktrees = await listWorktrees(this.repoPath);
+        const repoRoot = await getRepoRoot(this.repoPath);
+        const worktreeBaseDir = path.join(repoRoot, this.config.baseDir);
+        for (const gitWt of gitWorktrees) {
+            // Skip main worktree and worktrees outside our base directory
+            if (!gitWt.path.startsWith(worktreeBaseDir))
+                continue;
+            const id = path.basename(gitWt.path);
+            if (!this.worktrees.has(id)) {
+                // Discovered existing worktree - add to state
+                this.worktrees.set(id, {
+                    id,
+                    path: gitWt.path,
+                    branch: gitWt.branch || '',
+                    baseBranch: this.config.git.defaultBaseBranch,
+                    status: 'stale', // Mark as stale since we don't know its state
+                    createdAt: Date.now(),
+                    lastActivityAt: Date.now(),
+                });
+            }
+        }
+    }
+    /**
+     * Create a new worktree for a task
+     */
+    async create(taskId, baseBranch) {
+        const id = `task-${taskId}-${randomUUID().slice(0, 8)}`;
+        const branch = this.branchManager.generateBranchName(taskId);
+        const base = baseBranch || this.config.git.defaultBaseBranch;
+        const repoRoot = await getRepoRoot(this.repoPath);
+        const worktreePath = path.join(repoRoot, this.config.baseDir, id);
+        this.logger.info('Creating worktree', { id, branch, baseBranch: base, path: worktreePath });
+        // Check limits
+        if (this.worktrees.size >= this.config.limits.maxWorktrees) {
+            throw new Error(`Maximum worktrees (${this.config.limits.maxWorktrees}) reached`);
+        }
+        // Create the worktree
+        await createWorktree(this.repoPath, worktreePath, branch, base);
+        const worktree = {
+            id,
+            path: worktreePath,
+            branch,
+            baseBranch: base,
+            status: 'available',
+            taskId,
+            createdAt: Date.now(),
+            lastActivityAt: Date.now(),
+        };
+        this.worktrees.set(id, worktree);
+        this.logger.info('Worktree created', { id, branch, path: worktreePath });
+        return worktree;
+    }
+    /**
+     * Assign a worktree to an agent
+     */
+    async assign(worktreeId, agentId) {
+        const worktree = this.worktrees.get(worktreeId);
+        if (!worktree) {
+            throw new Error(`Worktree not found: ${worktreeId}`);
+        }
+        if (worktree.status !== 'available') {
+            throw new Error(`Worktree ${worktreeId} is not available (status: ${worktree.status})`);
+        }
+        worktree.status = 'assigned';
+        worktree.agentId = agentId;
+        worktree.lastActivityAt = Date.now();
+        this.logger.info('Worktree assigned', { worktreeId, agentId });
+        return worktree;
+    }
+    /**
+     * Mark worktree as active (agent is using it)
+     */
+    async activate(worktreeId) {
+        const worktree = this.worktrees.get(worktreeId);
+        if (!worktree) {
+            throw new Error(`Worktree not found: ${worktreeId}`);
+        }
+        worktree.status = 'active';
+        worktree.lastActivityAt = Date.now();
+        this.logger.info('Worktree activated', { worktreeId });
+        return worktree;
+    }
+    /**
+     * Release a worktree (task completed)
+     */
+    async release(worktreeId) {
+        const worktree = this.worktrees.get(worktreeId);
+        if (!worktree) {
+            throw new Error(`Worktree not found: ${worktreeId}`);
+        }
+        worktree.status = 'completing';
+        worktree.agentId = undefined;
+        worktree.lastActivityAt = Date.now();
+        this.logger.info('Worktree released', { worktreeId });
+        return worktree;
+    }
+    /**
+     * Remove a worktree
+     */
+    async remove(worktreeId, deleteBranch = false) {
+        const worktree = this.worktrees.get(worktreeId);
+        if (!worktree) {
+            throw new Error(`Worktree not found: ${worktreeId}`);
+        }
+        this.logger.info('Removing worktree', { worktreeId, deleteBranch });
+        // Remove git worktree
+        await removeWorktree(this.repoPath, worktree.path, true);
+        // Optionally delete the branch
+        if (deleteBranch) {
+            await this.branchManager.deleteBranch(worktree.branch, true);
+        }
+        this.worktrees.delete(worktreeId);
+        this.logger.info('Worktree removed', { worktreeId });
+    }
+    /**
+     * Get worktree by ID
+     */
+    get(worktreeId) {
+        return this.worktrees.get(worktreeId);
+    }
+    /**
+     * Get worktree by task ID
+     */
+    getByTaskId(taskId) {
+        for (const wt of this.worktrees.values()) {
+            if (wt.taskId === taskId)
+                return wt;
+        }
+        return undefined;
+    }
+    /**
+     * List all worktrees
+     */
+    list() {
+        return Array.from(this.worktrees.values());
+    }
+    /**
+     * List worktrees by status
+     */
+    listByStatus(status) {
+        return this.list().filter(wt => wt.status === status);
+    }
+    /**
+     * Generate instructions for an agent to use a worktree
+     */
+    generateInstructions(worktree) {
+        return {
+            workingDirectory: worktree.path,
+            branch: worktree.branch,
+            baseBranch: worktree.baseBranch,
+            commitPrefix: `[${worktree.taskId}]`,
+            instructions: `
+You are working in an isolated git worktree.
+
+WORKING DIRECTORY: ${worktree.path}
+BRANCH: ${worktree.branch}
+BASE BRANCH: ${worktree.baseBranch}
+
+IMPORTANT:
+1. All file operations should be relative to ${worktree.path}
+2. Commit your changes with prefix: [${worktree.taskId}]
+3. Do NOT switch branches - stay on ${worktree.branch}
+4. Do NOT merge or rebase - that will be handled after your task completes
+`.trim(),
+        };
+    }
+    /**
+     * Allocate a worktree for a task (create + assign + generate instructions)
+     */
+    async allocate(taskId, agentId) {
+        try {
+            const worktree = await this.create(taskId);
+            await this.assign(worktree.id, agentId);
+            await this.activate(worktree.id);
+            const instructions = this.generateInstructions(worktree);
+            return {
+                success: true,
+                worktree,
+                instructions,
+            };
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            this.logger.error('Failed to allocate worktree', { taskId, agentId, errorMessage: message });
+            return {
+                success: false,
+                error: message,
+            };
+        }
+    }
+    /**
+     * Cleanup stale worktrees
+     */
+    async cleanup() {
+        const staleThreshold = Date.now() - this.config.cleanup.staleThresholdMs;
+        let cleaned = 0;
+        for (const worktree of this.worktrees.values()) {
+            if ((worktree.status === 'stale' || worktree.status === 'available') &&
+                worktree.lastActivityAt < staleThreshold) {
+                try {
+                    await this.remove(worktree.id, true);
+                    cleaned++;
+                }
+                catch (error) {
+                    this.logger.warn('Failed to cleanup worktree', {
+                        worktreeId: worktree.id,
+                        error: error instanceof Error ? error.message : String(error)
+                    });
+                }
+            }
+        }
+        // Prune git worktree references
+        await pruneWorktrees(this.repoPath);
+        this.logger.info('Cleanup completed', { cleanedCount: cleaned });
+        return cleaned;
+    }
+    /**
+     * Get the branch manager for advanced operations
+     */
+    getBranchManager() {
+        return this.branchManager;
+    }
+}
+//# sourceMappingURL=manager.js.map

package/dist/worktrees/manager.js.map

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

package/dist/worktrees/pipeline-merge-orchestrator.d.ts

@@ -0,0 +1,55 @@
+/**
+ * Pipeline Merge Orchestrator
+ *
+ * Orchestrates merging of pipeline step worktrees in dependency order.
+ * Handles conflict detection and provides merge results.
+ */
+import { type StepDependency } from "../utils/merge-ordering.js";
+import type { StepWorktreeAllocation, PipelineMergeResult } from "../types.js";
+export interface MergeConflict {
+    stepId: string;
+    branch: string;
+    conflictedFiles: string[];
+    conflictMarkers?: Array<{
+        file: string;
+        startLine: number;
+        endLine: number;
+    }>;
+}
+export interface StepMergeResult {
+    stepId: string;
+    branch: string;
+    success: boolean;
+    mergeCommit?: string;
+    conflict?: MergeConflict;
+    error?: string;
+}
+export interface MergeOrchestratorConfig {
+    repoPath: string;
+    targetBranch: string;
+    strategy: "sequential" | "parallel-safe";
+    onConflict: "halt" | "skip" | "continue";
+}
+export declare class PipelineMergeOrchestrator {
+    private readonly config;
+    private readonly branchManager;
+    private readonly logger;
+    constructor(config: MergeOrchestratorConfig);
+    /**
+     * Check for merge conflicts between a branch and target without actually merging.
+     */
+    checkMergeConflicts(sourceBranch: string, targetBranch: string): Promise<MergeConflict | null>;
+    /**
+     * Merge a single step's branch into target.
+     */
+    mergeStep(stepId: string, allocation: StepWorktreeAllocation): Promise<StepMergeResult>;
+    /**
+     * Merge all pipeline worktrees in dependency order.
+     */
+    mergeInDependencyOrder(pipelineId: string, stepAllocations: Map<string, StepWorktreeAllocation>, steps: StepDependency[]): Promise<PipelineMergeResult>;
+    /**
+     * Delete branches after successful merge.
+     */
+    cleanupBranches(branches: string[]): Promise<void>;
+}
+//# sourceMappingURL=pipeline-merge-orchestrator.d.ts.map

package/dist/worktrees/pipeline-merge-orchestrator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pipeline-merge-orchestrator.d.ts","sourceRoot":"","sources":["../../src/worktrees/pipeline-merge-orchestrator.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAqB,KAAK,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEpF,OAAO,KAAK,EACV,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,eAAe,CAAC,EAAE,KAAK,CAAC;QACtB,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,YAAY,GAAG,eAAe,CAAC;IACzC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC;CAC1C;AAED,qBAAa,yBAAyB;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0B;IACjD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAEZ,MAAM,EAAE,uBAAuB;IAU3C;;OAEG;IACG,mBAAmB,CACvB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAoChC;;OAEG;IACG,SAAS,CACb,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,sBAAsB,GACjC,OAAO,CAAC,eAAe,CAAC;IAwE3B;;OAEG;IACG,sBAAsB,CAC1B,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,EACpD,KAAK,EAAE,cAAc,EAAE,GACtB,OAAO,CAAC,mBAAmB,CAAC;IAyF/B;;OAEG;IACG,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAazD"}

package/dist/worktrees/pipeline-merge-orchestrator.js

@@ -0,0 +1,221 @@
+/**
+ * Pipeline Merge Orchestrator
+ *
+ * Orchestrates merging of pipeline step worktrees in dependency order.
+ * Handles conflict detection and provides merge results.
+ */
+import { createGit } from "../utils/git.js";
+import { BranchManager } from "./branch-manager.js";
+import { computeMergeOrder } from "../utils/merge-ordering.js";
+import { createLogger } from "../observability/logger.js";
+export class PipelineMergeOrchestrator {
+    config;
+    branchManager;
+    logger;
+    constructor(config) {
+        this.config = config;
+        this.logger = createLogger({ name: "pipeline-merge-orchestrator" });
+        this.branchManager = new BranchManager({
+            repoPath: config.repoPath,
+            defaultBaseBranch: config.targetBranch,
+            branchPattern: "task/{taskId}",
+        });
+    }
+    /**
+     * Check for merge conflicts between a branch and target without actually merging.
+     */
+    async checkMergeConflicts(sourceBranch, targetBranch) {
+        const git = createGit(this.config.repoPath);
+        try {
+            // Ensure we're on target branch first
+            await git.checkout(targetBranch);
+            // Try a dry-run merge
+            await git.raw(["merge", "--no-commit", "--no-ff", sourceBranch]);
+            // If we get here, no conflicts - abort the merge
+            await git.raw(["merge", "--abort"]);
+            return null;
+        }
+        catch (error) {
+            // Check if it's a conflict
+            const status = await git.status();
+            if (status.conflicted.length > 0) {
+                // Abort the merge
+                try {
+                    await git.raw(["merge", "--abort"]);
+                }
+                catch {
+                    // Already aborted or not in merge state
+                }
+                return {
+                    stepId: "", // Will be filled by caller
+                    branch: sourceBranch,
+                    conflictedFiles: status.conflicted,
+                };
+            }
+            // Some other error
+            throw error;
+        }
+    }
+    /**
+     * Merge a single step's branch into target.
+     */
+    async mergeStep(stepId, allocation) {
+        const git = createGit(this.config.repoPath);
+        this.logger.info("Merging step branch", {
+            stepId,
+            branch: allocation.branch,
+            targetBranch: this.config.targetBranch,
+        });
+        try {
+            // Ensure we're on target branch
+            await git.checkout(this.config.targetBranch);
+            // Check for conflicts first
+            const conflict = await this.checkMergeConflicts(allocation.branch, this.config.targetBranch);
+            if (conflict) {
+                conflict.stepId = stepId;
+                this.logger.warn("Merge conflict detected", {
+                    stepId,
+                    conflictedFiles: conflict.conflictedFiles,
+                });
+                return {
+                    stepId,
+                    branch: allocation.branch,
+                    success: false,
+                    conflict,
+                };
+            }
+            // Perform the actual merge
+            await git.merge([
+                allocation.branch,
+                "-m",
+                `Merge step ${stepId} (${allocation.branch})`,
+            ]);
+            // Get the merge commit hash
+            const log = await git.log({ maxCount: 1 });
+            const mergeCommit = log.latest?.hash;
+            this.logger.info("Step merged successfully", { stepId, mergeCommit });
+            return {
+                stepId,
+                branch: allocation.branch,
+                success: true,
+                mergeCommit,
+            };
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            this.logger.error("Merge failed", { stepId, errorMessage: message });
+            // Try to abort any in-progress merge
+            try {
+                await git.raw(["merge", "--abort"]);
+            }
+            catch {
+                // Ignore
+            }
+            return {
+                stepId,
+                branch: allocation.branch,
+                success: false,
+                error: message,
+            };
+        }
+    }
+    /**
+     * Merge all pipeline worktrees in dependency order.
+     */
+    async mergeInDependencyOrder(pipelineId, stepAllocations, steps) {
+        const mergeOrder = computeMergeOrder(steps);
+        const mergedSteps = [];
+        const conflicts = [];
+        this.logger.info("Starting pipeline merge", {
+            pipelineId,
+            totalSteps: stepAllocations.size,
+            mergeBatches: mergeOrder.length,
+        });
+        for (let batchIndex = 0; batchIndex < mergeOrder.length; batchIndex++) {
+            const batch = mergeOrder[batchIndex];
+            this.logger.info("Processing merge batch", { batchIndex, steps: batch });
+            for (const stepId of batch) {
+                const allocation = stepAllocations.get(stepId);
+                if (!allocation) {
+                    this.logger.warn("No worktree allocation for step", { stepId });
+                    continue;
+                }
+                // Skip steps that didn't need worktrees (reviewers, etc.)
+                if (allocation.status !== "completed") {
+                    this.logger.debug("Skipping step with status", {
+                        stepId,
+                        status: allocation.status,
+                    });
+                    continue;
+                }
+                const result = await this.mergeStep(stepId, allocation);
+                if (result.success) {
+                    mergedSteps.push({
+                        stepId: result.stepId,
+                        branch: result.branch,
+                        mergeCommit: result.mergeCommit,
+                    });
+                }
+                else if (result.conflict) {
+                    conflicts.push({
+                        stepId: result.stepId,
+                        branch: result.branch,
+                        conflictedFiles: result.conflict.conflictedFiles,
+                        error: result.error,
+                    });
+                    if (this.config.onConflict === "halt") {
+                        this.logger.warn("Halting merge due to conflict", { stepId });
+                        break;
+                    }
+                }
+                else if (result.error) {
+                    conflicts.push({
+                        stepId: result.stepId,
+                        branch: result.branch,
+                        conflictedFiles: [],
+                        error: result.error,
+                    });
+                    if (this.config.onConflict === "halt") {
+                        break;
+                    }
+                }
+            }
+            // Check if we should stop due to conflicts
+            if (conflicts.length > 0 && this.config.onConflict === "halt") {
+                break;
+            }
+        }
+        const success = conflicts.length === 0;
+        this.logger.info("Pipeline merge completed", {
+            pipelineId,
+            success,
+            mergedCount: mergedSteps.length,
+            conflictCount: conflicts.length,
+        });
+        return {
+            pipelineId,
+            success,
+            mergedSteps,
+            conflicts,
+            completedAt: Date.now(),
+        };
+    }
+    /**
+     * Delete branches after successful merge.
+     */
+    async cleanupBranches(branches) {
+        for (const branch of branches) {
+            try {
+                await this.branchManager.deleteBranch(branch, true);
+                this.logger.debug("Deleted branch", { branch });
+            }
+            catch (error) {
+                this.logger.warn("Failed to delete branch", {
+                    branch,
+                    error: error instanceof Error ? error.message : String(error),
+                });
+            }
+        }
+    }
+}
+//# sourceMappingURL=pipeline-merge-orchestrator.js.map

package/dist/worktrees/pipeline-merge-orchestrator.js.map

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