@telora/daemon 0.15.3 → 0.15.5

package/dist/worktree-strategy.js

@@ -1,214 +0,0 @@
-/**
- * Strategy worktree lifecycle: canonical removal and orphan cleanup.
- *
- * safeRemoveStrategyWorktree is the single code path for all strategy
- * worktree removals -- it merges before removing and conditionally
- * clears in-memory state.
- *
- * cleanupOrphanStrategyWorktrees scans the worktree directory on startup
- * and removes worktrees that no longer match any active strategy.
- */
-import { existsSync, readdirSync, statSync } from 'node:fs';
-import { join, resolve } from 'node:path';
-import { runGitSync } from './git-types.js';
-import { mergeToIntegration } from './git-merge.js';
-import { getActiveStrategies } from './queries/deliveries.js';
-import { removeStrategyWorktree as removeStrategyWorktreeState } from './strategy-worktree-state.js';
-import { sanitizeGitSegment } from './git-utils.js';
-import { branchHasUnmergedCommits, removeWorktree } from './worktree-safety.js';
-// ── Canonical worktree removal ────────────────────────────────────
-/**
- * Canonical strategy worktree removal: merge-before-remove + conditional cleanup.
- *
- * Every code path that removes a strategy worktree should route through this
- * function. It encapsulates the full lifecycle:
- *   1. Check for unmerged commits on the branch
- *   2. Attempt merge to integration if needed
- *   3. Call removeWorktree with safety guards (handles uncommitted changes)
- *   4. Conditionally clear in-memory state based on whether removal succeeded
- *
- * Returns structured result so callers can count cleaned/preserved and log.
- */
-export async function safeRemoveStrategyWorktree(params) {
-    const { config, worktreePath, branchName, deliveryName, deliveryId, strategyId } = params;
-    const { repoPath, integrationBranch } = config;
-    // 1. Attempt merge if there are unmerged commits
-    let mergeSucceeded = false;
-    let merged = false;
-    let mergeError;
-    try {
-        if (branchHasUnmergedCommits(branchName, integrationBranch, repoPath)) {
-            console.log(`[worktree] Attempting merge for ${branchName} before removal`);
-            const mergeResult = await mergeToIntegration({
-                config,
-                branchName,
-                deliveryName,
-                deliveryId: deliveryId ?? deliveryName,
-            });
-            mergeSucceeded = mergeResult.success;
-            merged = true;
-            if (mergeResult.success) {
-                console.log(`[worktree] Merge succeeded for ${branchName}`);
-            }
-            else {
-                mergeError = mergeResult.error ?? 'unknown';
-                console.warn(`[worktree] Merge failed for ${branchName}: ${mergeError}. ` +
-                    `Safety guards will preserve the branch.`);
-            }
-        }
-        else {
-            mergeSucceeded = true; // Nothing to merge
-        }
-    }
-    catch (err) {
-        mergeError = err.message;
-        console.warn(`[worktree] Merge attempt failed for ${branchName}: ${mergeError}`);
-    }
-    // 2. Remove worktree (safety guards handle uncommitted changes and unmerged commits)
-    let removed = false;
-    try {
-        removed = removeWorktree(repoPath, worktreePath, {
-            branchName,
-            integrationBranch,
-            deliveryName,
-            mergeSucceeded,
-        });
-    }
-    catch (err) {
-        console.warn(`[worktree] Failed to remove worktree ${worktreePath}: ${err.message}`);
-    }
-    // 3. Conditionally clear in-memory state
-    if (strategyId) {
-        if (removed) {
-            removeStrategyWorktreeState(strategyId);
-        }
-        else {
-            console.log(`[worktree] Worktree preserved for strategy ${strategyId} -- keeping in-memory state`);
-        }
-    }
-    return { removed, merged, mergeError };
-}
-// ── Orphan strategy worktree cleanup ──────────────────────────────
-/**
- * Clean up orphan strategy worktrees on daemon startup.
- *
- * Scans the worktree directory and cross-references against active
- * strategies (those with assigned agent roles and queued deliveries).
- * Worktrees that don't match any active strategy are orphans from a
- * previous daemon run and are cleaned up.
- *
- * Conservative approach:
- * - Safety-commits any uncommitted changes before removal
- * - Checks for unmerged commits before deleting
- * - Logs all actions for auditability
- *
- * @returns Count of orphans cleaned up and preserved
- */
-export async function cleanupOrphanStrategyWorktrees(config) {
-    const { worktreeDir, repoPath, organizationId, productId } = config;
-    let cleaned = 0;
-    let preserved = 0;
-    if (!existsSync(worktreeDir)) {
-        return { cleaned, preserved };
-    }
-    // 1. List all subdirectories in the worktree directory
-    let entries;
-    try {
-        entries = readdirSync(worktreeDir).filter((entry) => {
-            try {
-                return statSync(join(worktreeDir, entry)).isDirectory();
-            }
-            catch (e) {
-                console.debug(`[worktree] Failed to stat ${entry} (may have been deleted):`, e.message);
-                return false;
-            }
-        });
-    }
-    catch (err) {
-        console.warn(`[worktree] Failed to scan worktree directory: ${err instanceof Error ? err.message : String(err)}`);
-        return { cleaned, preserved };
-    }
-    if (entries.length === 0) {
-        return { cleaned, preserved };
-    }
-    // 2. Query active strategies
-    let activeStrategyBranchDirs;
-    try {
-        const activeStrategiesList = await getActiveStrategies(organizationId, productId);
-        activeStrategyBranchDirs = new Set();
-        for (const s of activeStrategiesList) {
-            const shortId = s.strategy_id.slice(0, 8);
-            const sanitizedRole = sanitizeGitSegment(s.agent_role_name ?? 'reviewer');
-            const sanitizedName = sanitizeGitSegment(s.strategy_name);
-            const expectedDir = `agent-${sanitizedRole}-${sanitizedName}-${shortId}`;
-            if (entries.includes(expectedDir)) {
-                activeStrategyBranchDirs.add(expectedDir);
-            }
-            else {
-                // Fallback: match by strategy ID prefix in case sanitization differs
-                for (const entry of entries) {
-                    if (entry.endsWith(shortId)) {
-                        activeStrategyBranchDirs.add(entry);
-                    }
-                }
-            }
-        }
-    }
-    catch (err) {
-        console.warn(`[worktree] Failed to query active strategies for orphan detection: ` +
-            `${err instanceof Error ? err.message : String(err)}. Skipping orphan cleanup.`);
-        return { cleaned, preserved };
-    }
-    // 3. Identify orphans: agent worktree dirs not matching any active strategy
-    const orphanDirs = entries.filter((entry) => {
-        if (!entry.startsWith('agent-'))
-            return false;
-        return !activeStrategyBranchDirs.has(entry);
-    });
-    if (orphanDirs.length === 0) {
-        console.log('[worktree] No orphan strategy worktrees found');
-        return { cleaned, preserved };
-    }
-    console.log(`[worktree] Found ${orphanDirs.length} orphan strategy worktree(s)`);
-    // 4. Parse git worktree list to get branch names for each path
-    const worktreeListResult = runGitSync(['worktree', 'list', '--porcelain'], repoPath);
-    const pathToBranch = new Map();
-    if (worktreeListResult.success) {
-        let currentPath = null;
-        for (const line of worktreeListResult.output.split('\n')) {
-            if (line.startsWith('worktree ')) {
-                currentPath = line.slice('worktree '.length);
-            }
-            else if (line.startsWith('branch refs/heads/') && currentPath) {
-                pathToBranch.set(resolve(currentPath), line.slice('branch refs/heads/'.length));
-                currentPath = null;
-            }
-            else if (line === '') {
-                currentPath = null;
-            }
-        }
-    }
-    // 5. Clean up each orphan via canonical removal path
-    for (const dir of orphanDirs) {
-        const worktreePath = resolve(join(worktreeDir, dir));
-        const branchName = pathToBranch.get(worktreePath) ?? dir.replace(/-/g, '/');
-        const deliveryName = branchName.split('/').slice(2).join('/') || dir;
-        console.log(`[worktree] Cleaning up orphan strategy worktree: ${worktreePath} [${branchName}]`);
-        const result = await safeRemoveStrategyWorktree({
-            config,
-            worktreePath,
-            branchName,
-            deliveryName,
-            deliveryId: dir, // No real delivery ID -- use dir name for traceability
-        });
-        if (result.removed) {
-            cleaned++;
-        }
-        else {
-            preserved++;
-        }
-    }
-    console.log(`[worktree] Orphan strategy worktree cleanup: ${cleaned} cleaned, ${preserved} preserved`);
-    return { cleaned, preserved };
-}
-//# sourceMappingURL=worktree-strategy.js.map

package/dist/worktree-strategy.js.map

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