@telora/daemon 0.15.3 → 0.15.5

package/dist/strategy-lifecycle.js

@@ -1,544 +0,0 @@
-/**
- * Strategy lifecycle management.
- *
- * Handles persistent worktree provisioning for active strategies and
- * coordinated teardown when strategies are deactivated. Replaces the
- * separate detectDeactivatedStrategies() and checkQaForDeactivatedStrategies()
- * flows with a single unified lifecycle.
- */
-import { existsSync, readdirSync, statSync } from 'node:fs';
-import { join, resolve } from 'node:path';
-import { installAuditPreCommitHook } from './audit-hooks.js';
-import { getReadyStrategies, getActiveStrategies, reportGitState } from './supabase.js';
-import { createWorktree, syncIntegrationWithMain, runGitSync, safeRemoveStrategyWorktree, commitWipChanges, generateMcpConfigInWorktree, ensureIntegrationBranch, ensureMergeWorktree } from './git.js';
-import { generateStrategyBranchName, terminateTeam, waitForTeamExit } from './strategy-executor.js';
-import { getActiveTeams } from './strategy-team-state.js';
-import { recordStrategyTeardown } from './spawn-cooldown.js';
-import { getStrategyWorktree, setStrategyWorktree, removeStrategyWorktree, getAllStrategyWorktrees, hasStrategyWorktree, } from './strategy-worktree-state.js';
-import { getStrategyDeliveries } from './queries/strategies.js';
-import { isStatusAgentActionable } from './stage-classifier.js';
-import { escalateMergeConflict } from './strategy-merge.js';
-import { getQaEnvironment, removeQaEnvironment } from './qa-state.js';
-import { stopQaDevServer } from './qa-dev-server.js';
-import { updateQaStatus } from './supabase.js';
-// ── Persistent worktree provisioning ─────────────────────────────────
-/**
- * Ensure persistent worktrees exist for all active strategies.
- *
- * Called each poll cycle BEFORE processReadyStrategies(). Creates
- * worktrees for active strategies that don't have one yet.
- * Syncs integration with main once per cycle (not per strategy).
- */
-export async function ensureStrategyWorktrees(config, roles) {
-    let readyStrategies;
-    try {
-        readyStrategies = await getReadyStrategies(config.organizationId, config.productId);
-    }
-    catch (err) {
-        console.warn(`[strategy-lifecycle] Failed to query ready strategies for worktree provisioning: ${err.message}`);
-        return;
-    }
-    // Find strategies that need worktrees
-    const needsWorktree = readyStrategies.filter(s => !hasStrategyWorktree(s.strategy_id));
-    if (needsWorktree.length === 0)
-        return;
-    // Ensure git infrastructure exists (normally handled by initGit on startup,
-    // but guard here as a safety net in case of partial initialization).
-    try {
-        await ensureIntegrationBranch(config);
-        ensureMergeWorktree(config);
-    }
-    catch (err) {
-        console.warn(`[strategy-lifecycle] Failed to ensure git infrastructure: ${err.message}`);
-        return;
-    }
-    // Sync integration with main once before creating any worktrees
-    try {
-        const syncResult = await syncIntegrationWithMain(config);
-        if (syncResult.success) {
-            console.log(`[strategy-lifecycle] Synced integration with main before worktree provisioning`);
-        }
-        else {
-            console.warn(`[strategy-lifecycle] Could not sync integration with main: ${syncResult.error}`);
-        }
-    }
-    catch (err) {
-        console.warn(`[strategy-lifecycle] Sync failed (continuing): ${err instanceof Error ? err.message : String(err)}`);
-    }
-    for (const strategy of needsWorktree) {
-        const role = roles.get(strategy.assigned_agent_role_id);
-        if (!role) {
-            console.warn(`[strategy-lifecycle] Unknown agent role ${strategy.assigned_agent_role_id} for strategy "${strategy.strategy_name}", skipping worktree`);
-            continue;
-        }
-        const branchName = generateStrategyBranchName(role, strategy.strategy_name, strategy.strategy_id);
-        const worktreePath = join(config.worktreeDir, branchName.replace(/\//g, '-'));
-        // Check if a valid worktree already exists on disk (e.g., after daemon restart
-        // or reactivation). Adopt it instead of destroying and rebuilding.
-        if (existsSync(worktreePath)) {
-            const gitDirResult = runGitSync(['rev-parse', '--git-dir'], worktreePath);
-            const branchResult = runGitSync(['rev-parse', '--abbrev-ref', 'HEAD'], worktreePath);
-            if (gitDirResult.success && branchResult.success && branchResult.output === branchName) {
-                // Valid worktree on the expected branch -- adopt it
-                console.log(`[strategy-lifecycle] Adopting existing worktree for "${strategy.strategy_name}": ${worktreePath}`);
-                setStrategyWorktree(strategy.strategy_id, {
-                    strategyId: strategy.strategy_id,
-                    strategyName: strategy.strategy_name,
-                    worktreePath,
-                    branchName,
-                    createdAt: new Date(),
-                    hasQaDevServer: false,
-                });
-                // Rebase onto integration to bring it current
-                const rebaseResult = runGitSync(['rebase', config.integrationBranch], worktreePath);
-                if (!rebaseResult.success) {
-                    runGitSync(['rebase', '--abort'], worktreePath);
-                    console.warn(`[strategy-lifecycle] Could not rebase adopted worktree for "${strategy.strategy_name}" onto integration. Continuing with existing state.`);
-                }
-                else {
-                    console.log(`[strategy-lifecycle] Rebased adopted worktree for "${strategy.strategy_name}" onto ${config.integrationBranch}`);
-                }
-                // Generate .mcp.json with absolute path to MCP server
-                generateMcpConfigInWorktree(worktreePath, config);
-                // Install audit pre-commit hook for read-only strategies
-                if (strategy.read_only) {
-                    installAuditPreCommitHook(worktreePath);
-                    console.log(`[strategy-lifecycle] Installed audit pre-commit hook for "${strategy.strategy_name}"`);
-                }
-                continue;
-            }
-            // Directory exists but is not a valid worktree for this branch -- fall through to createWorktree
-            console.log(`[strategy-lifecycle] Existing directory at ${worktreePath} is not a valid worktree for ${branchName}, recreating`);
-        }
-        try {
-            const createdPath = await createWorktree(config, branchName);
-            setStrategyWorktree(strategy.strategy_id, {
-                strategyId: strategy.strategy_id,
-                strategyName: strategy.strategy_name,
-                worktreePath: createdPath,
-                branchName,
-                createdAt: new Date(),
-                hasQaDevServer: false,
-            });
-            console.log(`[strategy-lifecycle] Created persistent worktree for "${strategy.strategy_name}": ${createdPath}`);
-            // Install audit pre-commit hook for read-only strategies
-            if (strategy.read_only) {
-                installAuditPreCommitHook(createdPath);
-                console.log(`[strategy-lifecycle] Installed audit pre-commit hook for "${strategy.strategy_name}"`);
-            }
-        }
-        catch (err) {
-            console.error(`[strategy-lifecycle] Failed to create worktree for "${strategy.strategy_name}": ${err instanceof Error ? err.message : String(err)}`);
-            // Continue with other strategies
-        }
-    }
-}
-// ── Coordinated teardown ─────────────────────────────────────────────
-/**
- * Tear down a single strategy: stop QA, terminate team, remove worktree.
- *
- * Each step is independently try/caught so a failure in one
- * does not prevent the others from running.
- */
-export async function teardownStrategy(config, strategyId, strategyName) {
-    console.log(`[strategy-lifecycle] Tearing down strategy "${strategyName}"`);
-    // Record teardown for spawn cooldown (prevents immediate respawn crash loops)
-    recordStrategyTeardown(strategyId);
-    // 1. Stop QA dev server if running
-    try {
-        const qaState = getQaEnvironment(strategyId);
-        if (qaState?.pid) {
-            console.log(`[strategy-lifecycle] Stopping QA dev server for "${strategyName}" (PID: ${qaState.pid})`);
-            await stopQaDevServer(qaState.pid);
-        }
-    }
-    catch (err) {
-        console.warn(`[strategy-lifecycle] Failed to stop QA dev server for "${strategyName}": ${err.message}`);
-    }
-    // 2. Clear QA in-memory state
-    try {
-        removeQaEnvironment(strategyId);
-    }
-    catch (err) {
-        console.warn(`[strategy-lifecycle] Failed to clear QA state for "${strategyName}": ${err.message}`);
-    }
-    // 3. Clear QA DB state
-    try {
-        await updateQaStatus(strategyId, {
-            qaStatus: null,
-            qaUrl: null,
-            qaPort: null,
-            qaWorktreePath: null,
-            qaReadyAt: null,
-            qaError: null,
-        });
-    }
-    catch (err) {
-        console.warn(`[strategy-lifecycle] Failed to clear QA DB state for "${strategyName}": ${err.message}`);
-    }
-    // 4. Terminate agent team and wait for process exit
-    try {
-        const activeTeams = getActiveTeams();
-        const team = activeTeams.get(strategyId);
-        if (team && team.phase !== 'shutting_down' && team.phase !== 'terminated') {
-            console.log(`[strategy-lifecycle] Terminating team for "${strategyName}"`);
-            terminateTeam(strategyId);
-            // Wait for process to actually exit (default 30s, then SIGKILL)
-            const exited = await waitForTeamExit(strategyId);
-            if (!exited) {
-                console.warn(`[strategy-lifecycle] Team for "${strategyName}" did not exit cleanly after SIGKILL`);
-            }
-        }
-    }
-    catch (err) {
-        console.warn(`[strategy-lifecycle] Failed to terminate team for "${strategyName}": ${err.message}`);
-    }
-    // 4b. Commit any uncommitted WIP changes left by the agent
-    try {
-        const worktreeInfo = getStrategyWorktree(strategyId);
-        if (worktreeInfo) {
-            commitWipChanges(worktreeInfo.worktreePath, strategyName);
-        }
-    }
-    catch (err) {
-        console.warn(`[strategy-lifecycle] WIP commit failed for "${strategyName}": ${err.message}`);
-    }
-    // 5. Remove strategy worktree via canonical path (merge-before-remove + conditional state cleanup).
-    // If the team was killed mid-work (OOM, signal, crash) before handleTeamCompletion ran,
-    // there may be commits that never got a merge attempt. safeRemoveStrategyWorktree closes that gap.
-    try {
-        const worktreeInfo = getStrategyWorktree(strategyId);
-        if (worktreeInfo) {
-            console.log(`[strategy-lifecycle] Removing worktree for "${strategyName}": ${worktreeInfo.worktreePath}`);
-            const removeResult = await safeRemoveStrategyWorktree({
-                config,
-                worktreePath: worktreeInfo.worktreePath,
-                branchName: worktreeInfo.branchName,
-                deliveryName: strategyName,
-                deliveryId: strategyId,
-                strategyId,
-            });
-            // Escalate if merge failed (worktree preserved with unmerged work)
-            if (removeResult.merged && removeResult.mergeError) {
-                escalateMergeConflict({
-                    organizationId: config.organizationId,
-                    sessionId: '',
-                    deliveryId: strategyId,
-                    deliveryName: strategyName,
-                    branchName: worktreeInfo.branchName,
-                    integrationBranch: config.integrationBranch,
-                    mergeError: removeResult.mergeError,
-                }).catch(err => console.warn(`[strategy-lifecycle] escalateMergeConflict failed for "${strategyName}": ${err.message}`));
-            }
-        }
-    }
-    catch (err) {
-        console.warn(`[strategy-lifecycle] Failed to remove worktree for "${strategyName}": ${err.message}`);
-    }
-    console.log(`[strategy-lifecycle] Teardown complete for "${strategyName}"`);
-}
-/**
- * Detect deactivated strategies and tear them down.
- *
- * Replaces both detectDeactivatedStrategies() from strategy-executor.ts
- * and checkQaForDeactivatedStrategies() from qa-orchestrator.ts.
- * A single pass handles both team termination and QA cleanup.
- */
-export async function checkForDeactivatedStrategies(config) {
-    const allWorktrees = getAllStrategyWorktrees();
-    const activeTeams = getActiveTeams();
-    // Nothing to check if no worktrees and no teams
-    if (allWorktrees.size === 0 && activeTeams.size === 0)
-        return;
-    let activeStrategyIds;
-    try {
-        // Use getActiveStrategies (not getReadyStrategies) -- a strategy is "active" even
-        // when all deliveries are done. Worktrees must persist for QA and idle queues.
-        const activeStrategies = await getActiveStrategies(config.organizationId, config.productId);
-        activeStrategyIds = new Set(activeStrategies.map(s => s.strategy_id));
-    }
-    catch (err) {
-        // If the endpoint isn't deployed yet, skip deactivation checks entirely.
-        // Better to leave worktrees alive than to tear them down incorrectly.
-        console.warn(`[strategy-lifecycle] Cannot determine active strategies (skipping deactivation check): ${err.message}`);
-        return;
-    }
-    // In multi-product setups, the global worktree/team maps contain strategies
-    // from ALL products. Only check strategies we can confirm belong to THIS
-    // product — otherwise Product B's poll tears down Product A's strategies.
-    //
-    // Strategy ownership is determined by:
-    // 1. Active team with matching productId (definitive)
-    // 2. Worktree for a strategy that appears in this product's active set
-    //    (if it's active for this product, it's this product's strategy)
-    //
-    // Orphan worktrees (no team, not in active set) have unknown product
-    // ownership and are left alone — startup recovery handles them.
-    const trackedStrategyIds = new Set();
-    for (const [id, team] of activeTeams) {
-        if (team.productId === config.productId) {
-            trackedStrategyIds.add(id);
-        }
-    }
-    for (const strategyId of trackedStrategyIds) {
-        if (activeStrategyIds.has(strategyId))
-            continue;
-        const worktreeInfo = getStrategyWorktree(strategyId);
-        const team = activeTeams.get(strategyId);
-        const name = worktreeInfo?.strategyName ?? team?.strategyName ?? strategyId;
-        // Skip teams already shutting down
-        if (team && (team.phase === 'shutting_down' || team.phase === 'terminated') && !worktreeInfo) {
-            continue;
-        }
-        const reason = worktreeInfo && !team
-            ? 'worktree exists but strategy no longer active'
-            : team && !worktreeInfo
-                ? 'team running but strategy no longer active'
-                : 'strategy no longer active';
-        console.log(`[strategy-lifecycle] Strategy "${name}" deactivated (${reason}) -- coordinated teardown`);
-        await teardownStrategy(config, strategyId, name);
-    }
-}
-// ── Startup recovery ─────────────────────────────────────────────
-/**
- * Rebuild the strategy-worktree-state after a daemon restart.
- *
- * Two-phase approach:
- *   Phase 1 (DB-first): If hydrateFromDb() populated the Map, validate
- *     each entry against disk and enrich with strategy names. Removes
- *     stale entries (worktree deleted from disk) and cleans up entries
- *     for deactivated strategies.
- *   Phase 2 (disk fallback): Scans for agent-* directories NOT already
- *     in the Map. Covers first-run after migration and manually created
- *     worktrees. Matches by ID prefix against active strategies.
- *
- * Also removes legacy qa-* directories from the pre-persistent worktree era.
- *
- * Must run AFTER hydrateFromDb() and crash recovery but BEFORE startListeners().
- */
-export async function rebuildStrategyWorktreeState(config) {
-    const { worktreeDir, repoPath, organizationId, productId } = config;
-    if (!existsSync(worktreeDir)) {
-        console.log('[strategy-lifecycle] No worktree directory — nothing to rebuild');
-        return;
-    }
-    // Query active strategies for enrichment and deactivation detection
-    let activeStrategies;
-    try {
-        activeStrategies = await getActiveStrategies(organizationId, productId);
-    }
-    catch (err) {
-        console.warn(`[strategy-lifecycle] Cannot determine active strategies for state rebuild (preserving all): ${err.message}`);
-        return;
-    }
-    const strategyById = new Map(activeStrategies.map(s => [s.strategy_id, s]));
-    const strategyByPrefix = new Map(activeStrategies.map(s => [s.strategy_id.slice(0, 8), s]));
-    let validated = 0;
-    let removedStale = 0;
-    let deactivatedCleaned = 0;
-    // ── Phase 1: Validate DB-hydrated entries ──────────────────────
-    const allWorktrees = getAllStrategyWorktrees();
-    if (allWorktrees.size > 0) {
-        console.log(`[strategy-lifecycle] Validating ${allWorktrees.size} DB-hydrated worktree(s) against disk`);
-        for (const [strategyId, info] of [...allWorktrees]) {
-            if (!existsSync(info.worktreePath)) {
-                // Worktree was manually deleted — remove from state (also fires async DB remove)
-                console.log(`[strategy-lifecycle] DB-hydrated worktree no longer on disk: ${info.worktreePath}`);
-                removeStrategyWorktree(strategyId);
-                removedStale++;
-                continue;
-            }
-            const strategy = strategyById.get(strategyId);
-            if (strategy) {
-                // Active — enrich with strategy name (not stored in DB)
-                info.strategyName = strategy.strategy_name;
-                validated++;
-                console.log(`[strategy-lifecycle] Validated worktree for "${strategy.strategy_name}": ${info.worktreePath}`);
-            }
-            else {
-                // Deactivated — clean up via canonical path
-                console.log(`[strategy-lifecycle] DB-hydrated worktree for deactivated strategy: ${info.worktreePath}`);
-                try {
-                    const result = await safeRemoveStrategyWorktree({
-                        config,
-                        worktreePath: info.worktreePath,
-                        branchName: info.branchName,
-                        deliveryName: info.strategyName || strategyId,
-                        deliveryId: strategyId,
-                        strategyId,
-                    });
-                    if (result.removed)
-                        deactivatedCleaned++;
-                }
-                catch (err) {
-                    console.warn(`[strategy-lifecycle] Failed to clean up deactivated worktree: ${err.message}`);
-                }
-            }
-        }
-    }
-    // ── Phase 2: Disk scan for orphans not in the Map ─────────────
-    // Catches pre-migration worktrees and manually created ones.
-    let agentDirs;
-    try {
-        agentDirs = readdirSync(worktreeDir).filter(entry => {
-            if (!entry.startsWith('agent-'))
-                return false;
-            try {
-                return statSync(join(worktreeDir, entry)).isDirectory();
-            }
-            catch {
-                return false;
-            }
-        });
-    }
-    catch (err) {
-        console.warn(`[strategy-lifecycle] Failed to scan worktree directory: ${err.message}`);
-        agentDirs = [];
-    }
-    // Filter to directories whose full path is NOT already tracked
-    const trackedPaths = new Set([...getAllStrategyWorktrees().values()].map(w => w.worktreePath));
-    const orphanDirs = agentDirs.filter(dirName => {
-        const fullPath = resolve(join(worktreeDir, dirName));
-        return !trackedPaths.has(fullPath);
-    });
-    let diskRegistered = 0;
-    if (orphanDirs.length > 0) {
-        console.log(`[strategy-lifecycle] Found ${orphanDirs.length} untracked agent-* dir(s) on disk (migration fallback)`);
-        // Parse git worktree list for branch names
-        const pathToBranch = new Map();
-        const worktreeListResult = runGitSync(['worktree', 'list', '--porcelain'], repoPath);
-        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;
-                }
-            }
-        }
-        for (const dirName of orphanDirs) {
-            const fullPath = resolve(join(worktreeDir, dirName));
-            const branchName = pathToBranch.get(fullPath) ?? dirName.replace(/-/g, '/');
-            const idMatch = dirName.match(/-([0-9a-f]{8})$/);
-            const idPrefix = idMatch ? idMatch[1] : null;
-            const strategy = idPrefix ? strategyByPrefix.get(idPrefix) : undefined;
-            if (strategy) {
-                setStrategyWorktree(strategy.strategy_id, {
-                    strategyId: strategy.strategy_id,
-                    strategyName: strategy.strategy_name,
-                    worktreePath: fullPath,
-                    branchName,
-                    createdAt: new Date(),
-                    hasQaDevServer: false,
-                });
-                diskRegistered++;
-                console.log(`[strategy-lifecycle] Registered orphan worktree for "${strategy.strategy_name}": ${fullPath}`);
-            }
-            else {
-                // Deactivated — canonical removal
-                console.log(`[strategy-lifecycle] Cleaning up orphan deactivated worktree: ${fullPath} [${branchName}]`);
-                try {
-                    const result = await safeRemoveStrategyWorktree({
-                        config,
-                        worktreePath: fullPath,
-                        branchName,
-                        deliveryName: dirName,
-                        deliveryId: dirName,
-                    });
-                    if (result.removed)
-                        deactivatedCleaned++;
-                }
-                catch (err) {
-                    console.warn(`[strategy-lifecycle] Failed to clean up orphan worktree ${dirName}: ${err.message}`);
-                }
-            }
-        }
-    }
-    // ── Phase 3: Legacy qa-* cleanup ──────────────────────────────
-    let legacyCleaned = 0;
-    try {
-        const legacyQaDirs = readdirSync(worktreeDir).filter(entry => {
-            if (!entry.startsWith('qa-'))
-                return false;
-            try {
-                return statSync(join(worktreeDir, entry)).isDirectory();
-            }
-            catch {
-                return false;
-            }
-        });
-        for (const qaDir of legacyQaDirs) {
-            const qaPath = join(worktreeDir, qaDir);
-            console.log(`[strategy-lifecycle] Removing legacy qa-* directory: ${qaPath}`);
-            try {
-                const removeResult = runGitSync(['worktree', 'remove', '--force', qaPath], repoPath);
-                if (!removeResult.success) {
-                    const { rmSync } = await import('node:fs');
-                    rmSync(qaPath, { recursive: true, force: true });
-                    runGitSync(['worktree', 'prune'], repoPath);
-                }
-                legacyCleaned++;
-            }
-            catch (err) {
-                console.warn(`[strategy-lifecycle] Failed to remove legacy QA directory ${qaDir}: ${err.message}`);
-            }
-        }
-    }
-    catch {
-        // Non-fatal — legacy cleanup is best-effort
-    }
-    const parts = [
-        `${validated} validated from DB`,
-        removedStale > 0 ? `${removedStale} stale removed` : null,
-        diskRegistered > 0 ? `${diskRegistered} registered from disk` : null,
-        deactivatedCleaned > 0 ? `${deactivatedCleaned} deactivated cleaned` : null,
-        legacyCleaned > 0 ? `${legacyCleaned} legacy qa-* removed` : null,
-    ].filter(Boolean);
-    console.log(`[strategy-lifecycle] State rebuild complete: ${parts.join(', ')}`);
-}
-// ── Git state reconciliation ──────────────────────────────────────
-/**
- * Reconcile git state for active strategy worktrees after startup.
- *
- * Checks all rebuilt strategy worktrees and re-reports `worktree_active`
- * for deliveries in coding/queued status. This ensures the DB reflects
- * accurate git state even if previous reportGitState calls were lost
- * (network blip, circuit breaker, daemon crash).
- *
- * Must run AFTER rebuildStrategyWorktreeState().
- */
-export async function reconcileGitState(_config) {
-    const worktrees = getAllStrategyWorktrees();
-    if (worktrees.size === 0) {
-        return;
-    }
-    console.log(`[strategy-lifecycle] Reconciling git state for ${worktrees.size} strategy worktree(s)...`);
-    let reconciled = 0;
-    for (const [strategyId, worktree] of worktrees) {
-        try {
-            const deliveries = await getStrategyDeliveries(strategyId);
-            const activeDeliveries = deliveries.filter(d => isStatusAgentActionable(d.executionStatus ?? ''));
-            for (const delivery of activeDeliveries) {
-                await reportGitState(delivery.id, 'worktree_active', worktree.branchName);
-                reconciled++;
-            }
-        }
-        catch (err) {
-            console.warn(`[strategy-lifecycle] Failed to reconcile git state for "${worktree.strategyName}": ` +
-                `${err.message}`);
-        }
-    }
-    if (reconciled > 0) {
-        console.log(`[strategy-lifecycle] Reconciled git state for ${reconciled} delivery(ies)`);
-    }
-    else {
-        console.log('[strategy-lifecycle] No deliveries needed git state reconciliation');
-    }
-}
-//# sourceMappingURL=strategy-lifecycle.js.map

package/dist/strategy-lifecycle.js.map

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

package/dist/strategy-merge.d.ts

@@ -1,77 +0,0 @@
-/**
- * Strategy branch merge logic.
- *
- * Handles merging a strategy's work branch into the integration branch,
- * including workflow resolution and per-delivery git state reporting.
- */
-import type { DaemonConfig, StrategyTeamState, MergeConflictResolutionResult } from './types.js';
-/**
- * Parameters for merge conflict escalation/reporting.
- */
-export interface MergeConflictParams {
-    organizationId: string;
-    sessionId: string;
-    deliveryId: string;
-    deliveryName: string;
-    branchName: string;
-    integrationBranch: string;
-    mergeError: string;
-}
-/**
- * Report merge_conflict git state for a delivery.
- *
- * Makes the merge failure visible in the frontend delivery detail view.
- */
-export declare function reportMergeConflictState(deliveryId: string, branchName: string): Promise<void>;
-/**
- * Create an escalation for a merge conflict and report the git state.
- *
- * Idempotent: skips escalation creation if one is already pending for
- * the same delivery (tracked in-memory via pendingMergeConflictDeliveries).
- * Always reports merge_conflict git state regardless.
- *
- * Called by all strategy-level merge callers when mergeToIntegration fails.
- */
-export declare function escalateMergeConflict(params: MergeConflictParams): Promise<void>;
-/**
- * Clear the pending merge conflict flag for a delivery (e.g., after successful retry).
- */
-export declare function clearMergeConflictFlag(deliveryId: string): void;
-/**
- * Check for deliveries stuck in merge_conflict state and retry the merge.
- *
- * Called once per poll cycle. Queries the API for deliveries with
- * merge_conflict git state, groups them by branch (to avoid duplicate
- * merges), and retries mergeToIntegration for each unique branch.
- *
- * On success: reports merged_to_integration for all deliveries on that
- * branch and clears their pending merge conflict flags.
- * On failure: logs quietly (the existing escalation remains active).
- */
-export declare function checkResolvedMergeConflicts(config: DaemonConfig): Promise<void>;
-/**
- * Request the team lead to resolve merge conflicts in the worktree.
- *
- * Sends a user message via stdin with conflict details and instructions,
- * then polls git state to detect when conflicts are resolved (no more
- * unmerged files and a merge commit exists).
- *
- * Returns when resolution is detected or timeout expires.
- */
-export declare function requestTeamLeadResolution(teamState: StrategyTeamState, conflictFiles: string[], branchName: string, integrationBranch: string, timeoutMs?: number): Promise<MergeConflictResolutionResult>;
-/**
- * Merge the strategy branch to integration.
- *
- * Uses the first delivery ID as the representative for merge operations
- * (all deliveries share the same branch in the strategy model).
- *
- * `workedDeliveryIds` is the set of deliveries the team actually built in
- * this merge cycle. Git state and the merge commit SHA are recorded only
- * for these deliveries — never for queued/planning deliveries that happen
- * to share the same strategy branch but were never touched.
- */
-export declare function mergeStrategyBranch(config: DaemonConfig, teamState: StrategyTeamState, sessionId: string, branchName: string, workedDeliveryIds: string[]): Promise<{
-    mergeSucceeded: boolean;
-    exitReason: string;
-}>;
-//# sourceMappingURL=strategy-merge.d.ts.map

package/dist/strategy-merge.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"strategy-merge.d.ts","sourceRoot":"","sources":["../src/strategy-merge.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EAEjB,6BAA6B,EAC9B,MAAM,YAAY,CAAC;AAepB;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CASf;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAyCf;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAE/D;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,IAAI,CAAC,CA4Gf;AAUD;;;;;;;;GAQG;AACH,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE,iBAAiB,EAC5B,aAAa,EAAE,MAAM,EAAE,EACvB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,SAAS,GAAE,MAA6C,GACvD,OAAO,CAAC,6BAA6B,CAAC,CA4DxC;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,YAAY,EACpB,SAAS,EAAE,iBAAiB,EAC5B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EAAE,GAC1B,OAAO,CAAC;IAAE,cAAc,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,CA6J1D"}