mcp-agent-foundry 1.0.0

package/dist/worktrees/pool.d.ts

@@ -0,0 +1,95 @@
+/**
+ * Worktree Pool
+ *
+ * Maintains a pool of pre-created worktrees for faster allocation.
+ * Reduces latency by having worktrees ready before tasks need them.
+ */
+import type { WorktreeManager } from './manager.js';
+import type { ResourceManager } from './resource-manager.js';
+import type { Worktree } from '../types.js';
+export interface PoolConfig {
+    /** Whether the pool is enabled */
+    enabled: boolean;
+    /** Minimum worktrees to keep ready */
+    minSize: number;
+    /** Maximum pool size */
+    maxSize: number;
+    /** Base branch for pre-warmed worktrees */
+    preWarmBranch?: string;
+}
+export interface PoolStats {
+    /** Number of worktrees available in the pool */
+    available: number;
+    /** Number of worktrees currently in use */
+    inUse: number;
+    /** Total number of worktrees managed */
+    total: number;
+    /** Number of pool hits (fast allocation from pool) */
+    hits: number;
+    /** Number of pool misses (had to create new worktree) */
+    misses: number;
+    /** Hit rate (hits / total acquisitions) */
+    hitRate: number;
+}
+export declare class WorktreePool {
+    private readonly worktreeManager;
+    private readonly resourceManager;
+    private readonly config;
+    private readonly logger;
+    private availableWorktrees;
+    private hits;
+    private misses;
+    private initialized;
+    constructor(worktreeManager: WorktreeManager, resourceManager: ResourceManager, config?: Partial<PoolConfig>);
+    /**
+     * Initialize the pool with pre-warmed worktrees.
+     */
+    initialize(): Promise<void>;
+    /**
+     * Acquire a worktree from the pool or create a new one.
+     * Returns null if allocation is not allowed (resource limits).
+     */
+    acquire(taskId: string): Promise<Worktree | null>;
+    /**
+     * Release a worktree back to the pool or dispose it.
+     * @param worktreeId - The worktree to release
+     * @param returnToPool - Whether to return to pool (true) or remove entirely (false)
+     */
+    release(worktreeId: string, returnToPool?: boolean): Promise<void>;
+    /**
+     * Replenish the pool to minimum size.
+     * Creates new worktrees in the background to maintain pool availability.
+     */
+    replenish(): Promise<void>;
+    /**
+     * Drain all worktrees from the pool.
+     * Removes all pre-warmed worktrees (useful for shutdown or reconfiguration).
+     */
+    drain(): Promise<void>;
+    /**
+     * Resize the pool to new limits.
+     * Drains excess worktrees or replenishes to meet new minimum.
+     */
+    resize(newMinSize: number, newMaxSize: number): Promise<void>;
+    /**
+     * Get pool statistics.
+     */
+    getStats(): PoolStats;
+    /**
+     * Check if pool is enabled.
+     */
+    isEnabled(): boolean;
+    /**
+     * Check if pool is initialized.
+     */
+    isInitialized(): boolean;
+    /**
+     * Get pool configuration.
+     */
+    getConfig(): PoolConfig;
+    /**
+     * Reset pool statistics.
+     */
+    resetStats(): void;
+}
+//# sourceMappingURL=pool.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../src/worktrees/pool.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAM5C,MAAM,WAAW,UAAU;IACzB,kCAAkC;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,sCAAsC;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,wBAAwB;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,2CAA2C;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,SAAS;IACxB,gDAAgD;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,2CAA2C;IAC3C,KAAK,EAAE,MAAM,CAAC;IACd,wCAAwC;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,yDAAyD;IACzD,MAAM,EAAE,MAAM,CAAC;IACf,2CAA2C;IAC3C,OAAO,EAAE,MAAM,CAAC;CACjB;AAaD,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAa;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IAGxB,OAAO,CAAC,kBAAkB,CAA0B;IACpD,OAAO,CAAC,IAAI,CAAK;IACjB,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,WAAW,CAAS;gBAG1B,eAAe,EAAE,eAAe,EAChC,eAAe,EAAE,eAAe,EAChC,MAAM,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC;IAQ9B;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAyBjC;;;OAGG;IACG,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IA2DvD;;;;OAIG;IACG,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,UAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BrE;;;OAGG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsChC;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA4B5B;;;OAGG;IACG,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BnE;;OAEG;IACH,QAAQ,IAAI,SAAS;IAYrB;;OAEG;IACH,SAAS,IAAI,OAAO;IAIpB;;OAEG;IACH,aAAa,IAAI,OAAO;IAIxB;;OAEG;IACH,SAAS,IAAI,UAAU;IAIvB;;OAEG;IACH,UAAU,IAAI,IAAI;CAKnB"}

package/dist/worktrees/pool.js

@@ -0,0 +1,271 @@
+/**
+ * Worktree Pool
+ *
+ * Maintains a pool of pre-created worktrees for faster allocation.
+ * Reduces latency by having worktrees ready before tasks need them.
+ */
+import { createLogger } from '../observability/logger.js';
+const DEFAULT_POOL_CONFIG = {
+    enabled: true,
+    minSize: 2,
+    maxSize: 5,
+    preWarmBranch: undefined, // Use default base branch
+};
+// ============================================================================
+// WorktreePool Class
+// ============================================================================
+export class WorktreePool {
+    worktreeManager;
+    resourceManager;
+    config;
+    logger;
+    // Pool state
+    availableWorktrees = new Set(); // worktree IDs ready to use
+    hits = 0;
+    misses = 0;
+    initialized = false;
+    constructor(worktreeManager, resourceManager, config) {
+        this.worktreeManager = worktreeManager;
+        this.resourceManager = resourceManager;
+        this.config = { ...DEFAULT_POOL_CONFIG, ...config };
+        this.logger = createLogger({ name: 'worktree-pool' });
+    }
+    /**
+     * Initialize the pool with pre-warmed worktrees.
+     */
+    async initialize() {
+        if (this.initialized) {
+            this.logger.debug('Pool already initialized');
+            return;
+        }
+        if (!this.config.enabled) {
+            this.logger.info('Pool disabled, skipping initialization');
+            this.initialized = true;
+            return;
+        }
+        this.logger.info('Initializing worktree pool', {
+            minSize: this.config.minSize,
+            maxSize: this.config.maxSize,
+        });
+        await this.replenish();
+        this.initialized = true;
+        this.logger.info('Worktree pool initialized', {
+            poolSize: this.availableWorktrees.size,
+        });
+    }
+    /**
+     * Acquire a worktree from the pool or create a new one.
+     * Returns null if allocation is not allowed (resource limits).
+     */
+    async acquire(taskId) {
+        // Check if we can allocate
+        const canAllocate = await this.resourceManager.canAllocate();
+        if (!canAllocate.allowed) {
+            this.logger.warn('Cannot acquire worktree', { reason: canAllocate.reason });
+            return null;
+        }
+        // Try to get from pool first
+        if (this.availableWorktrees.size > 0) {
+            const worktreeId = this.availableWorktrees.values().next().value;
+            if (worktreeId) {
+                this.availableWorktrees.delete(worktreeId);
+                const worktree = this.worktreeManager.get(worktreeId);
+                if (worktree) {
+                    // Assign to task
+                    await this.worktreeManager.assign(worktreeId, taskId);
+                    await this.worktreeManager.activate(worktreeId);
+                    this.hits++;
+                    this.logger.debug('Pool hit', {
+                        worktreeId,
+                        taskId,
+                        poolSize: this.availableWorktrees.size,
+                    });
+                    // Trigger background replenish
+                    this.replenish().catch((err) => this.logger.warn('Background replenish failed', { error: err }));
+                    return this.worktreeManager.get(worktreeId);
+                }
+            }
+        }
+        // Pool miss - create new worktree
+        this.misses++;
+        this.logger.debug('Pool miss, creating new worktree', { taskId });
+        try {
+            const worktree = await this.worktreeManager.create(taskId, this.config.preWarmBranch);
+            await this.worktreeManager.assign(worktree.id, taskId);
+            await this.worktreeManager.activate(worktree.id);
+            return this.worktreeManager.get(worktree.id);
+        }
+        catch (error) {
+            this.logger.error('Failed to create worktree', {
+                taskId,
+                error: error instanceof Error ? error : undefined,
+                errorMessage: error instanceof Error ? error.message : String(error),
+            });
+            return null;
+        }
+    }
+    /**
+     * Release a worktree back to the pool or dispose it.
+     * @param worktreeId - The worktree to release
+     * @param returnToPool - Whether to return to pool (true) or remove entirely (false)
+     */
+    async release(worktreeId, returnToPool = true) {
+        const worktree = this.worktreeManager.get(worktreeId);
+        if (!worktree) {
+            this.logger.warn('Worktree not found for release', { worktreeId });
+            return;
+        }
+        // Release from task
+        await this.worktreeManager.release(worktreeId);
+        if (returnToPool &&
+            this.config.enabled &&
+            this.availableWorktrees.size < this.config.maxSize) {
+            // Return to pool for reuse
+            // Note: In a production implementation, we'd reset the branch to clean state
+            this.availableWorktrees.add(worktreeId);
+            this.logger.debug('Worktree returned to pool', {
+                worktreeId,
+                poolSize: this.availableWorktrees.size,
+            });
+        }
+        else {
+            // Remove worktree entirely
+            await this.worktreeManager.remove(worktreeId, true);
+            this.logger.debug('Worktree removed (pool full or disabled)', { worktreeId });
+        }
+    }
+    /**
+     * Replenish the pool to minimum size.
+     * Creates new worktrees in the background to maintain pool availability.
+     */
+    async replenish() {
+        if (!this.config.enabled)
+            return;
+        const needed = this.config.minSize - this.availableWorktrees.size;
+        if (needed <= 0)
+            return;
+        this.logger.debug('Replenishing pool', {
+            needed,
+            current: this.availableWorktrees.size,
+        });
+        for (let i = 0; i < needed; i++) {
+            const canAllocate = await this.resourceManager.canAllocate();
+            if (!canAllocate.allowed) {
+                this.logger.debug('Cannot replenish, resource limit reached');
+                break;
+            }
+            try {
+                // Create worktree with pool identifier
+                const worktree = await this.worktreeManager.create(`pool-${Date.now()}-${i}`, this.config.preWarmBranch);
+                this.availableWorktrees.add(worktree.id);
+                this.logger.debug('Pool worktree created', {
+                    worktreeId: worktree.id,
+                    poolSize: this.availableWorktrees.size,
+                });
+            }
+            catch (error) {
+                this.logger.warn('Failed to create pool worktree', {
+                    error: error instanceof Error ? error.message : String(error),
+                });
+                break;
+            }
+        }
+    }
+    /**
+     * Drain all worktrees from the pool.
+     * Removes all pre-warmed worktrees (useful for shutdown or reconfiguration).
+     */
+    async drain() {
+        this.logger.info('Draining worktree pool', { count: this.availableWorktrees.size });
+        const errors = [];
+        for (const id of this.availableWorktrees) {
+            try {
+                await this.worktreeManager.remove(id, true);
+            }
+            catch (error) {
+                errors.push({
+                    id,
+                    error: error instanceof Error ? error.message : String(error),
+                });
+                this.logger.warn('Failed to remove pooled worktree', { id, error });
+            }
+        }
+        this.availableWorktrees.clear();
+        if (errors.length > 0) {
+            this.logger.warn('Pool drain completed with errors', {
+                errorCount: errors.length,
+            });
+        }
+        else {
+            this.logger.info('Pool drain completed successfully');
+        }
+    }
+    /**
+     * Resize the pool to new limits.
+     * Drains excess worktrees or replenishes to meet new minimum.
+     */
+    async resize(newMinSize, newMaxSize) {
+        this.logger.info('Resizing pool', {
+            oldMin: this.config.minSize,
+            oldMax: this.config.maxSize,
+            newMin: newMinSize,
+            newMax: newMaxSize,
+        });
+        this.config.minSize = newMinSize;
+        this.config.maxSize = newMaxSize;
+        // Drain excess if needed
+        while (this.availableWorktrees.size > newMaxSize) {
+            const id = this.availableWorktrees.values().next().value;
+            if (id) {
+                this.availableWorktrees.delete(id);
+                await this.worktreeManager.remove(id, true).catch(() => { });
+            }
+        }
+        // Replenish if needed
+        await this.replenish();
+        this.logger.info('Pool resize completed', {
+            poolSize: this.availableWorktrees.size,
+        });
+    }
+    /**
+     * Get pool statistics.
+     */
+    getStats() {
+        const total = this.hits + this.misses;
+        return {
+            available: this.availableWorktrees.size,
+            inUse: this.worktreeManager.listByStatus('active').length,
+            total: this.worktreeManager.list().length,
+            hits: this.hits,
+            misses: this.misses,
+            hitRate: total > 0 ? this.hits / total : 0,
+        };
+    }
+    /**
+     * Check if pool is enabled.
+     */
+    isEnabled() {
+        return this.config.enabled;
+    }
+    /**
+     * Check if pool is initialized.
+     */
+    isInitialized() {
+        return this.initialized;
+    }
+    /**
+     * Get pool configuration.
+     */
+    getConfig() {
+        return { ...this.config };
+    }
+    /**
+     * Reset pool statistics.
+     */
+    resetStats() {
+        this.hits = 0;
+        this.misses = 0;
+        this.logger.debug('Pool stats reset');
+    }
+}
+//# sourceMappingURL=pool.js.map

package/dist/worktrees/pool.js.map

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

package/dist/worktrees/recovery.d.ts

@@ -0,0 +1,94 @@
+/**
+ * Recovery Manager
+ *
+ * Handles startup recovery by reconciling persisted state with physical worktrees.
+ * Detects orphans, unlocks stuck worktrees, and cleans up abandoned resources.
+ */
+import type { Worktree } from '../types.js';
+import type { PersistedState, PersistedWorktreeState, PersistedTaskState } from '../persistence/state-schema.js';
+export type { PersistedState, PersistedWorktreeState, PersistedTaskState };
+export interface OrphanedWorktree {
+    id: string;
+    path: string;
+    branch: string;
+    reason: 'no_task' | 'task_completed' | 'task_failed' | 'unknown_state';
+    physicalExists: boolean;
+    branchExists: boolean;
+    hasUncommittedChanges: boolean;
+    lastActivityAt?: number;
+}
+export interface OrphanedTask {
+    taskId: string;
+    role: string;
+    status: string;
+    reason: 'no_worktree' | 'worktree_missing';
+    worktreeId?: string;
+}
+export interface OrphanedBranch {
+    name: string;
+    reason: 'no_worktree' | 'no_task';
+    lastCommitDate?: Date;
+}
+export interface ReconciliationResult {
+    orphanedWorktrees: OrphanedWorktree[];
+    orphanedTasks: OrphanedTask[];
+    orphanedBranches: OrphanedBranch[];
+    recoveredWorktrees: string[];
+    recoveredTasks: string[];
+    stuckWorktrees: string[];
+    cleanedUp: string[];
+    errors: Array<{
+        resource: string;
+        error: string;
+    }>;
+}
+export interface RecoveryOptions {
+    autoCleanOrphans: boolean;
+    maxStaleAgeMs: number;
+    preserveUncommittedChanges: boolean;
+    dryRun: boolean;
+}
+export declare class RecoveryManager {
+    private repoPath;
+    private worktreeBaseDir;
+    private branchPattern;
+    private git;
+    private logger;
+    constructor(repoPath: string, worktreeBaseDir?: string, branchPattern?: string);
+    /**
+     * Main recovery entry point - call on server startup
+     */
+    recoverOnStartup(persistedState: PersistedState | null, options?: Partial<RecoveryOptions>): Promise<ReconciliationResult>;
+    /**
+     * Discover all physical worktrees in the worktree directory
+     */
+    private discoverPhysicalWorktrees;
+    private getPhysicalWorktreeInfo;
+    /**
+     * Discover all task branches in the repository
+     */
+    private discoverTaskBranches;
+    /**
+     * Reconcile persisted state with physical reality
+     */
+    private reconcileWithPersistedState;
+    /**
+     * Handle case where we have no persisted state
+     */
+    private handleNoPersistedState;
+    private isStuckState;
+    /**
+     * Clean up orphaned resources
+     */
+    private cleanupOrphans;
+    private removeWorktree;
+    /**
+     * Unlock worktrees stuck in transitional states
+     */
+    unlockStuckWorktrees(stuckIds: string[], worktrees: Map<string, Worktree>): Promise<string[]>;
+    /**
+     * Prune worktrees that have been stale too long
+     */
+    pruneStaleWorktrees(worktrees: Map<string, Worktree>, maxAgeMs?: number): Promise<string[]>;
+}
+//# sourceMappingURL=recovery.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../../src/worktrees/recovery.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,aAAa,CAAC;AAC5D,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACtB,kBAAkB,EACnB,MAAM,gCAAgC,CAAC;AAGxC,YAAY,EAAE,cAAc,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,CAAC;AAM3E,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,GAAG,gBAAgB,GAAG,aAAa,GAAG,eAAe,CAAC;IACvE,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,EAAE,OAAO,CAAC;IACtB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,aAAa,GAAG,kBAAkB,CAAC;IAC3C,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,aAAa,GAAG,SAAS,CAAC;IAClC,cAAc,CAAC,EAAE,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,oBAAoB;IACnC,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;IACtC,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,gBAAgB,EAAE,cAAc,EAAE,CAAC;IACnC,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACpD;AAED,MAAM,WAAW,eAAe;IAC9B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,0BAA0B,EAAE,OAAO,CAAC;IACpC,MAAM,EAAE,OAAO,CAAC;CACjB;AA8BD,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,GAAG,CAAY;IACvB,OAAO,CAAC,MAAM,CAAS;gBAGrB,QAAQ,EAAE,MAAM,EAChB,eAAe,GAAE,MAAmC,EACpD,aAAa,GAAE,MAAgB;IASjC;;OAEG;IACG,gBAAgB,CACpB,cAAc,EAAE,cAAc,GAAG,IAAI,EACrC,OAAO,GAAE,OAAO,CAAC,eAAe,CAAM,GACrC,OAAO,CAAC,oBAAoB,CAAC;IAuEhC;;OAEG;YACW,yBAAyB;YA4BzB,uBAAuB;IAkCrC;;OAEG;YACW,oBAAoB;IA6BlC;;OAEG;YACW,2BAA2B;IAmFzC;;OAEG;YACW,sBAAsB;IAoCpC,OAAO,CAAC,YAAY;IAKpB;;OAEG;YACW,cAAc;YAmCd,cAAc;IAc5B;;OAEG;IACG,oBAAoB,CACxB,QAAQ,EAAE,MAAM,EAAE,EAClB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAC/B,OAAO,CAAC,MAAM,EAAE,CAAC;IAuBpB;;OAEG;IACG,mBAAmB,CACvB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,EAChC,QAAQ,GAAE,MAAsC,GAC/C,OAAO,CAAC,MAAM,EAAE,CAAC;CAsBrB"}