mcp-agent-foundry 1.0.0

package/dist/utils/retry.js

@@ -0,0 +1,188 @@
+/**
+ * Retry Utility with Exponential Backoff
+ *
+ * Provides configurable retry logic with:
+ * - Exponential backoff with jitter
+ * - Configurable retry predicates
+ * - Rate limit awareness (respects retryAfterMs)
+ * - Callbacks for retry events
+ */
+import { ProviderError, RateLimitError, TimeoutError } from '../types.js';
+// ============================================================================
+// Constants
+// ============================================================================
+const DEFAULT_OPTIONS = {
+    maxAttempts: 3,
+    initialDelayMs: 1000,
+    maxDelayMs: 30000,
+    backoffMultiplier: 2,
+    jitterFactor: 0.1,
+    shouldRetry: isRetryableError,
+    onRetry: undefined,
+};
+// ============================================================================
+// Helper Functions
+// ============================================================================
+/**
+ * Determines if an error is retryable by default.
+ *
+ * Retryable errors:
+ * - RateLimitError (429 responses)
+ * - TimeoutError (request timeouts)
+ * - ProviderError with 5xx status codes (server errors)
+ *
+ * @param error The error to check
+ * @returns true if the error is retryable
+ */
+export function isRetryableError(error) {
+    // RateLimitError is always retryable
+    if (error instanceof RateLimitError) {
+        return true;
+    }
+    // TimeoutError is always retryable
+    if (error instanceof TimeoutError) {
+        return true;
+    }
+    // ProviderError with 5xx status is retryable
+    if (error instanceof ProviderError && error.statusCode !== undefined) {
+        return error.statusCode >= 500 && error.statusCode < 600;
+    }
+    return false;
+}
+/**
+ * Calculates the delay before the next retry attempt using exponential backoff with jitter.
+ *
+ * Formula: delay = min(initialDelay * (multiplier ^ attempt), maxDelay) * (1 +/- jitter)
+ *
+ * @param attempt The attempt number (0-indexed, where 0 is the first retry)
+ * @param options Retry configuration options
+ * @returns The delay in milliseconds before the next attempt
+ */
+export function calculateDelay(attempt, options) {
+    const { initialDelayMs = DEFAULT_OPTIONS.initialDelayMs, maxDelayMs = DEFAULT_OPTIONS.maxDelayMs, backoffMultiplier = DEFAULT_OPTIONS.backoffMultiplier, jitterFactor = DEFAULT_OPTIONS.jitterFactor, } = options;
+    // Calculate base delay with exponential backoff
+    const baseDelay = initialDelayMs * Math.pow(backoffMultiplier, attempt);
+    // Cap at maximum delay
+    const cappedDelay = Math.min(baseDelay, maxDelayMs);
+    // Apply jitter: randomize within +/- jitterFactor
+    const jitterRange = cappedDelay * jitterFactor;
+    const jitter = (Math.random() * 2 - 1) * jitterRange; // Random value between -jitterRange and +jitterRange
+    // Ensure delay is at least 0
+    return Math.max(0, Math.floor(cappedDelay + jitter));
+}
+/**
+ * Sleeps for a specified number of milliseconds.
+ *
+ * @param ms The number of milliseconds to sleep
+ * @returns A promise that resolves after the delay
+ */
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+/**
+ * Resolves retry options by merging with defaults.
+ *
+ * @param options User-provided options
+ * @returns Fully resolved options with all defaults applied
+ */
+function resolveOptions(options) {
+    return {
+        maxAttempts: options?.maxAttempts ?? DEFAULT_OPTIONS.maxAttempts,
+        initialDelayMs: options?.initialDelayMs ?? DEFAULT_OPTIONS.initialDelayMs,
+        maxDelayMs: options?.maxDelayMs ?? DEFAULT_OPTIONS.maxDelayMs,
+        backoffMultiplier: options?.backoffMultiplier ?? DEFAULT_OPTIONS.backoffMultiplier,
+        jitterFactor: options?.jitterFactor ?? DEFAULT_OPTIONS.jitterFactor,
+        shouldRetry: options?.shouldRetry ?? DEFAULT_OPTIONS.shouldRetry,
+        onRetry: options?.onRetry,
+    };
+}
+// ============================================================================
+// Main Retry Function
+// ============================================================================
+/**
+ * Executes a function with automatic retry on failure using exponential backoff.
+ *
+ * @param fn The async function to execute and potentially retry
+ * @param options Configuration options for retry behavior
+ * @returns The result of the function if successful
+ * @throws The last error encountered if all retry attempts fail
+ *
+ * @example
+ * ```typescript
+ * const result = await retry(
+ *   () => provider.complete(request),
+ *   {
+ *     maxAttempts: 5,
+ *     initialDelayMs: 500,
+ *     onRetry: (error, attempt, delay) => {
+ *       console.log(`Attempt ${attempt} failed, retrying in ${delay}ms`);
+ *     }
+ *   }
+ * );
+ * ```
+ */
+export async function retry(fn, options) {
+    const resolved = resolveOptions(options);
+    let lastError;
+    for (let attempt = 1; attempt <= resolved.maxAttempts; attempt++) {
+        try {
+            return await fn();
+        }
+        catch (error) {
+            const err = error instanceof Error ? error : new Error(String(error));
+            lastError = err;
+            // Check if we should retry
+            const isLastAttempt = attempt >= resolved.maxAttempts;
+            const shouldRetry = !isLastAttempt && resolved.shouldRetry(err, attempt);
+            if (!shouldRetry) {
+                throw err;
+            }
+            // Calculate delay
+            let delayMs;
+            // Respect RateLimitError.retryAfterMs if present
+            if (err instanceof RateLimitError && err.retryAfterMs !== undefined) {
+                delayMs = err.retryAfterMs;
+            }
+            else {
+                // Use exponential backoff (attempt - 1 because attempt is 1-indexed)
+                delayMs = calculateDelay(attempt - 1, resolved);
+            }
+            // Invoke retry callback if provided
+            if (resolved.onRetry) {
+                resolved.onRetry(err, attempt, delayMs);
+            }
+            // Wait before retrying
+            await sleep(delayMs);
+        }
+    }
+    // This should never be reached, but TypeScript needs it
+    throw lastError ?? new Error('Retry failed with no error');
+}
+// ============================================================================
+// Higher-Order Function Wrapper
+// ============================================================================
+/**
+ * Creates a retryable version of an async function.
+ *
+ * This higher-order function wraps any async function with retry logic,
+ * allowing you to create pre-configured retryable operations.
+ *
+ * @param fn The async function to wrap
+ * @param options Configuration options for retry behavior
+ * @returns A new function that executes with retry logic
+ *
+ * @example
+ * ```typescript
+ * const retryableComplete = withRetry(
+ *   () => provider.complete(request),
+ *   { maxAttempts: 5 }
+ * );
+ *
+ * // Later, execute with retry
+ * const result = await retryableComplete();
+ * ```
+ */
+export function withRetry(fn, options) {
+    return () => retry(fn, options);
+}
+//# sourceMappingURL=retry.js.map

package/dist/utils/retry.js.map

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

package/dist/worktrees/branch-manager.d.ts

@@ -0,0 +1,55 @@
+/**
+ * Branch Manager for Agent Foundry
+ *
+ * Handles git branch operations for worktree management.
+ */
+export interface BranchManagerConfig {
+    repoPath: string;
+    defaultBaseBranch: string;
+    branchPattern: string;
+}
+export declare class BranchManager {
+    private readonly config;
+    private readonly logger;
+    constructor(config: BranchManagerConfig);
+    /**
+     * Generate a branch name from the pattern and task ID
+     */
+    generateBranchName(taskId: string): string;
+    /**
+     * Create a new branch from base
+     */
+    createBranch(branchName: string, baseBranch?: string): Promise<void>;
+    /**
+     * Delete a branch
+     */
+    deleteBranch(branchName: string, force?: boolean): Promise<void>;
+    /**
+     * List branches matching a pattern
+     */
+    listBranches(pattern?: string): Promise<string[]>;
+    /**
+     * Merge a branch into target
+     */
+    mergeBranch(sourceBranch: string, targetBranch: string, options?: {
+        squash?: boolean;
+        noCommit?: boolean;
+    }): Promise<{
+        success: boolean;
+        conflicted: boolean;
+        conflicts?: string[];
+    }>;
+    /**
+     * Abort an in-progress merge
+     */
+    abortMerge(): Promise<void>;
+    /**
+     * Check if branch has unpushed commits
+     */
+    hasUnpushedCommits(branchName: string): Promise<boolean>;
+    /**
+     * Get commits between two branches
+     */
+    getCommitsBetween(baseBranch: string, headBranch: string): Promise<string[]>;
+}
+//# sourceMappingURL=branch-manager.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"branch-manager.d.ts","sourceRoot":"","sources":["../../src/worktrees/branch-manager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAEZ,MAAM,EAAE,mBAAmB;IAKvC;;OAEG;IACH,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAI1C;;OAEG;IACG,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB1E;;OAEG;IACG,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBpE;;OAEG;IACG,YAAY,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAYvD;;OAEG;IACG,WAAW,CACf,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAO,GACrD,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,UAAU,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IA6B3E;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC;;OAEG;IACG,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAW9D;;OAEG;IACG,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAKnF"}

package/dist/worktrees/branch-manager.js

@@ -0,0 +1,129 @@
+/**
+ * Branch Manager for Agent Foundry
+ *
+ * Handles git branch operations for worktree management.
+ */
+import { createGit, branchExists, getCurrentBranch } from '../utils/git.js';
+import { createLogger } from '../observability/logger.js';
+export class BranchManager {
+    config;
+    logger;
+    constructor(config) {
+        this.config = config;
+        this.logger = createLogger({ name: 'branch-manager' });
+    }
+    /**
+     * Generate a branch name from the pattern and task ID
+     */
+    generateBranchName(taskId) {
+        return this.config.branchPattern.replace('{taskId}', taskId);
+    }
+    /**
+     * Create a new branch from base
+     */
+    async createBranch(branchName, baseBranch) {
+        const git = createGit(this.config.repoPath);
+        const base = baseBranch || this.config.defaultBaseBranch;
+        // Check if branch already exists
+        if (await branchExists(this.config.repoPath, branchName)) {
+            this.logger.warn('Branch already exists', { branchName });
+            return;
+        }
+        this.logger.info('Creating branch', { branchName, baseBranch: base });
+        await git.checkoutBranch(branchName, base);
+        // Return to original branch
+        const current = await getCurrentBranch(this.config.repoPath);
+        if (current === branchName) {
+            await git.checkout(base);
+        }
+    }
+    /**
+     * Delete a branch
+     */
+    async deleteBranch(branchName, force = false) {
+        const git = createGit(this.config.repoPath);
+        if (!(await branchExists(this.config.repoPath, branchName))) {
+            this.logger.warn('Branch does not exist', { branchName });
+            return;
+        }
+        this.logger.info('Deleting branch', { branchName, force });
+        if (force) {
+            await git.branch(['-D', branchName]);
+        }
+        else {
+            await git.branch(['-d', branchName]);
+        }
+    }
+    /**
+     * List branches matching a pattern
+     */
+    async listBranches(pattern) {
+        const git = createGit(this.config.repoPath);
+        const branches = await git.branchLocal();
+        if (!pattern) {
+            return branches.all;
+        }
+        const regex = new RegExp(pattern.replace('*', '.*'));
+        return branches.all.filter(b => regex.test(b));
+    }
+    /**
+     * Merge a branch into target
+     */
+    async mergeBranch(sourceBranch, targetBranch, options = {}) {
+        const git = createGit(this.config.repoPath);
+        this.logger.info('Merging branch', { sourceBranch, targetBranch, options });
+        // Checkout target branch
+        await git.checkout(targetBranch);
+        try {
+            const mergeArgs = [sourceBranch];
+            if (options.squash)
+                mergeArgs.unshift('--squash');
+            if (options.noCommit)
+                mergeArgs.unshift('--no-commit');
+            await git.merge(mergeArgs);
+            return { success: true, conflicted: false };
+        }
+        catch (error) {
+            // Check for merge conflicts
+            const status = await git.status();
+            if (status.conflicted.length > 0) {
+                return {
+                    success: false,
+                    conflicted: true,
+                    conflicts: status.conflicted
+                };
+            }
+            throw error;
+        }
+    }
+    /**
+     * Abort an in-progress merge
+     */
+    async abortMerge() {
+        const git = createGit(this.config.repoPath);
+        await git.merge(['--abort']);
+    }
+    /**
+     * Check if branch has unpushed commits
+     */
+    async hasUnpushedCommits(branchName) {
+        const git = createGit(this.config.repoPath);
+        try {
+            const log = await git.log([`origin/${branchName}..${branchName}`]);
+            return log.total > 0;
+        }
+        catch {
+            // If remote doesn't exist, all commits are unpushed
+            return true;
+        }
+    }
+    /**
+     * Get commits between two branches
+     */
+    async getCommitsBetween(baseBranch, headBranch) {
+        const git = createGit(this.config.repoPath);
+        const log = await git.log([`${baseBranch}..${headBranch}`]);
+        return log.all.map(c => c.hash);
+    }
+}
+//# sourceMappingURL=branch-manager.js.map

package/dist/worktrees/branch-manager.js.map

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

package/dist/worktrees/conflict-handler.d.ts

@@ -0,0 +1,72 @@
+/**
+ * Conflict Handler
+ *
+ * Detects, parses, and resolves git merge conflicts with multiple strategies.
+ */
+import type { FileConflict, ConflictState, ConflictResolutionStrategy, ConflictResolutionResult, ManualResolution } from "../types.js";
+export declare class ConflictHandler {
+    private readonly worktreePath;
+    private readonly logger;
+    private cachedConflicts;
+    constructor(worktreePath: string);
+    /**
+     * Check if the worktree has merge conflicts.
+     */
+    hasConflicts(): Promise<boolean>;
+    /**
+     * Detect and parse all conflicts in the worktree.
+     */
+    detectConflicts(): Promise<FileConflict[]>;
+    /**
+     * Get conflict state for tracking.
+     */
+    getConflictState(taskId: string, worktreeId: string): Promise<ConflictState>;
+    /**
+     * Resolve conflicts using the specified strategy.
+     */
+    resolveConflicts(strategy: ConflictResolutionStrategy, manualResolutions?: ManualResolution[]): Promise<ConflictResolutionResult>;
+    /**
+     * Resolve all conflicts by accepting "ours" (current branch) version.
+     */
+    private resolveWithOurs;
+    /**
+     * Resolve all conflicts by accepting "theirs" (incoming branch) version.
+     */
+    private resolveWithTheirs;
+    /**
+     * Attempt automatic resolution by combining non-overlapping changes.
+     * Falls back to keeping both versions separated by a marker.
+     */
+    private resolveWithAuto;
+    /**
+     * Simple auto-merge: combine both versions with a separator comment.
+     * For code files, this often results in both changes being kept.
+     */
+    private autoMergeContent;
+    /**
+     * Apply manual resolutions provided by the user.
+     */
+    private resolveManually;
+    /**
+     * Complete the merge after all conflicts are resolved.
+     */
+    completeMerge(message?: string): Promise<{
+        success: boolean;
+        commitHash?: string;
+        error?: string;
+    }>;
+    /**
+     * Abort the merge and return to pre-merge state.
+     */
+    abortMerge(): Promise<void>;
+    /**
+     * Get merge head information.
+     */
+    getMergeInfo(): Promise<{
+        ours: string;
+        theirs: string;
+        oursRef: string;
+        theirsRef: string;
+    } | null>;
+}
+//# sourceMappingURL=conflict-handler.d.ts.map

package/dist/worktrees/conflict-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-handler.d.ts","sourceRoot":"","sources":["../../src/worktrees/conflict-handler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAmBH,OAAO,KAAK,EAEV,YAAY,EACZ,aAAa,EACb,0BAA0B,EAC1B,wBAAwB,EACxB,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAErB,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IACxB,OAAO,CAAC,eAAe,CAA8C;gBAEzD,YAAY,EAAE,MAAM;IAKhC;;OAEG;IACG,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAItC;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAqChD;;OAEG;IACG,gBAAgB,CACpB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,aAAa,CAAC;IAazB;;OAEG;IACG,gBAAgB,CACpB,QAAQ,EAAE,0BAA0B,EACpC,iBAAiB,CAAC,EAAE,gBAAgB,EAAE,GACrC,OAAO,CAAC,wBAAwB,CAAC;IAgCpC;;OAEG;YACW,eAAe;IA0B7B;;OAEG;YACW,iBAAiB;IA0B/B;;;OAGG;YACW,eAAe;IAiD7B;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAMxB;;OAEG;YACW,eAAe;IAqC7B;;OAEG;IACG,aAAa,CACjB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAyBrE;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAMjC;;OAEG;IACG,YAAY,IAAI,OAAO,CAAC;QAC5B,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;KACnB,GAAG,IAAI,CAAC;CAGV"}