@telora/daemon 0.15.1 → 0.15.3

package/dist/focus-lifecycle.js

@@ -0,0 +1,544 @@
+/**
+ * Focus lifecycle management.
+ *
+ * Handles persistent worktree provisioning for active focuses and
+ * coordinated teardown when focuses are deactivated. Replaces the
+ * separate detectDeactivatedFocuses() and checkQaForDeactivatedFocuses()
+ * 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 { getReadyFocuses, getActiveFocuses, reportGitState } from './supabase.js';
+import { createWorktree, syncIntegrationWithMain, runGitSync, safeRemoveFocusWorktree, commitWipChanges, generateMcpConfigInWorktree, ensureIntegrationBranch, ensureMergeWorktree } from './git.js';
+import { generateFocusBranchName, terminateTeam, waitForTeamExit } from './focus-executor.js';
+import { getActiveTeams } from './focus-team-state.js';
+import { recordFocusTeardown } from './spawn-cooldown.js';
+import { getFocusWorktree, setFocusWorktree, removeFocusWorktree, getAllFocusWorktrees, hasFocusWorktree, } from './focus-worktree-state.js';
+import { getFocusDeliveries } from './queries/focuses.js';
+import { isStatusAgentActionable } from './stage-classifier.js';
+import { escalateMergeConflict } from './focus-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 focuses.
+ *
+ * Called each poll cycle BEFORE processReadyFocuses(). Creates
+ * worktrees for active focuses that don't have one yet.
+ * Syncs integration with main once per cycle (not per focus).
+ */
+export async function ensureFocusWorktrees(config, roles) {
+    let readyFocuses;
+    try {
+        readyFocuses = await getReadyFocuses(config.organizationId, config.productId);
+    }
+    catch (err) {
+        console.warn(`[focus-lifecycle] Failed to query ready focuses for worktree provisioning: ${err.message}`);
+        return;
+    }
+    // Find focuses that need worktrees
+    const needsWorktree = readyFocuses.filter(s => !hasFocusWorktree(s.focus_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(`[focus-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(`[focus-lifecycle] Synced integration with main before worktree provisioning`);
+        }
+        else {
+            console.warn(`[focus-lifecycle] Could not sync integration with main: ${syncResult.error}`);
+        }
+    }
+    catch (err) {
+        console.warn(`[focus-lifecycle] Sync failed (continuing): ${err instanceof Error ? err.message : String(err)}`);
+    }
+    for (const focus of needsWorktree) {
+        const role = roles.get(focus.assigned_agent_role_id);
+        if (!role) {
+            console.warn(`[focus-lifecycle] Unknown agent role ${focus.assigned_agent_role_id} for focus "${focus.focus_name}", skipping worktree`);
+            continue;
+        }
+        const branchName = generateFocusBranchName(role, focus.focus_name, focus.focus_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(`[focus-lifecycle] Adopting existing worktree for "${focus.focus_name}": ${worktreePath}`);
+                setFocusWorktree(focus.focus_id, {
+                    focusId: focus.focus_id,
+                    focusName: focus.focus_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(`[focus-lifecycle] Could not rebase adopted worktree for "${focus.focus_name}" onto integration. Continuing with existing state.`);
+                }
+                else {
+                    console.log(`[focus-lifecycle] Rebased adopted worktree for "${focus.focus_name}" onto ${config.integrationBranch}`);
+                }
+                // Generate .mcp.json with absolute path to MCP server
+                generateMcpConfigInWorktree(worktreePath, config);
+                // Install audit pre-commit hook for read-only focuses
+                if (focus.read_only) {
+                    installAuditPreCommitHook(worktreePath);
+                    console.log(`[focus-lifecycle] Installed audit pre-commit hook for "${focus.focus_name}"`);
+                }
+                continue;
+            }
+            // Directory exists but is not a valid worktree for this branch -- fall through to createWorktree
+            console.log(`[focus-lifecycle] Existing directory at ${worktreePath} is not a valid worktree for ${branchName}, recreating`);
+        }
+        try {
+            const createdPath = await createWorktree(config, branchName);
+            setFocusWorktree(focus.focus_id, {
+                focusId: focus.focus_id,
+                focusName: focus.focus_name,
+                worktreePath: createdPath,
+                branchName,
+                createdAt: new Date(),
+                hasQaDevServer: false,
+            });
+            console.log(`[focus-lifecycle] Created persistent worktree for "${focus.focus_name}": ${createdPath}`);
+            // Install audit pre-commit hook for read-only focuses
+            if (focus.read_only) {
+                installAuditPreCommitHook(createdPath);
+                console.log(`[focus-lifecycle] Installed audit pre-commit hook for "${focus.focus_name}"`);
+            }
+        }
+        catch (err) {
+            console.error(`[focus-lifecycle] Failed to create worktree for "${focus.focus_name}": ${err instanceof Error ? err.message : String(err)}`);
+            // Continue with other focuses
+        }
+    }
+}
+// ── Coordinated teardown ─────────────────────────────────────────────
+/**
+ * Tear down a single focus: 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 teardownFocus(config, focusId, focusName) {
+    console.log(`[focus-lifecycle] Tearing down focus "${focusName}"`);
+    // Record teardown for spawn cooldown (prevents immediate respawn crash loops)
+    recordFocusTeardown(focusId);
+    // 1. Stop QA dev server if running
+    try {
+        const qaState = getQaEnvironment(focusId);
+        if (qaState?.pid) {
+            console.log(`[focus-lifecycle] Stopping QA dev server for "${focusName}" (PID: ${qaState.pid})`);
+            await stopQaDevServer(qaState.pid);
+        }
+    }
+    catch (err) {
+        console.warn(`[focus-lifecycle] Failed to stop QA dev server for "${focusName}": ${err.message}`);
+    }
+    // 2. Clear QA in-memory state
+    try {
+        removeQaEnvironment(focusId);
+    }
+    catch (err) {
+        console.warn(`[focus-lifecycle] Failed to clear QA state for "${focusName}": ${err.message}`);
+    }
+    // 3. Clear QA DB state
+    try {
+        await updateQaStatus(focusId, {
+            qaStatus: null,
+            qaUrl: null,
+            qaPort: null,
+            qaWorktreePath: null,
+            qaReadyAt: null,
+            qaError: null,
+        });
+    }
+    catch (err) {
+        console.warn(`[focus-lifecycle] Failed to clear QA DB state for "${focusName}": ${err.message}`);
+    }
+    // 4. Terminate agent team and wait for process exit
+    try {
+        const activeTeams = getActiveTeams();
+        const team = activeTeams.get(focusId);
+        if (team && team.phase !== 'shutting_down' && team.phase !== 'terminated') {
+            console.log(`[focus-lifecycle] Terminating team for "${focusName}"`);
+            terminateTeam(focusId);
+            // Wait for process to actually exit (default 30s, then SIGKILL)
+            const exited = await waitForTeamExit(focusId);
+            if (!exited) {
+                console.warn(`[focus-lifecycle] Team for "${focusName}" did not exit cleanly after SIGKILL`);
+            }
+        }
+    }
+    catch (err) {
+        console.warn(`[focus-lifecycle] Failed to terminate team for "${focusName}": ${err.message}`);
+    }
+    // 4b. Commit any uncommitted WIP changes left by the agent
+    try {
+        const worktreeInfo = getFocusWorktree(focusId);
+        if (worktreeInfo) {
+            commitWipChanges(worktreeInfo.worktreePath, focusName);
+        }
+    }
+    catch (err) {
+        console.warn(`[focus-lifecycle] WIP commit failed for "${focusName}": ${err.message}`);
+    }
+    // 5. Remove focus 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. safeRemoveFocusWorktree closes that gap.
+    try {
+        const worktreeInfo = getFocusWorktree(focusId);
+        if (worktreeInfo) {
+            console.log(`[focus-lifecycle] Removing worktree for "${focusName}": ${worktreeInfo.worktreePath}`);
+            const removeResult = await safeRemoveFocusWorktree({
+                config,
+                worktreePath: worktreeInfo.worktreePath,
+                branchName: worktreeInfo.branchName,
+                deliveryName: focusName,
+                deliveryId: focusId,
+                focusId,
+            });
+            // Escalate if merge failed (worktree preserved with unmerged work)
+            if (removeResult.merged && removeResult.mergeError) {
+                escalateMergeConflict({
+                    organizationId: config.organizationId,
+                    sessionId: '',
+                    deliveryId: focusId,
+                    deliveryName: focusName,
+                    branchName: worktreeInfo.branchName,
+                    integrationBranch: config.integrationBranch,
+                    mergeError: removeResult.mergeError,
+                }).catch(err => console.warn(`[focus-lifecycle] escalateMergeConflict failed for "${focusName}": ${err.message}`));
+            }
+        }
+    }
+    catch (err) {
+        console.warn(`[focus-lifecycle] Failed to remove worktree for "${focusName}": ${err.message}`);
+    }
+    console.log(`[focus-lifecycle] Teardown complete for "${focusName}"`);
+}
+/**
+ * Detect deactivated focuses and tear them down.
+ *
+ * Replaces both detectDeactivatedFocuses() from focus-executor.ts
+ * and checkQaForDeactivatedFocuses() from qa-orchestrator.ts.
+ * A single pass handles both team termination and QA cleanup.
+ */
+export async function checkForDeactivatedFocuses(config) {
+    const allWorktrees = getAllFocusWorktrees();
+    const activeTeams = getActiveTeams();
+    // Nothing to check if no worktrees and no teams
+    if (allWorktrees.size === 0 && activeTeams.size === 0)
+        return;
+    let activeFocusIds;
+    try {
+        // Use getActiveFocuses (not getReadyFocuses) -- a focus is "active" even
+        // when all deliveries are done. Worktrees must persist for QA and idle queues.
+        const activeFocuses = await getActiveFocuses(config.organizationId, config.productId);
+        activeFocusIds = new Set(activeFocuses.map(s => s.focus_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(`[focus-lifecycle] Cannot determine active focuses (skipping deactivation check): ${err.message}`);
+        return;
+    }
+    // In multi-product setups, the global worktree/team maps contain focuses
+    // from ALL products. Only check focuses we can confirm belong to THIS
+    // product — otherwise Product B's poll tears down Product A's focuses.
+    //
+    // Focus ownership is determined by:
+    // 1. Active team with matching productId (definitive)
+    // 2. Worktree for a focus that appears in this product's active set
+    //    (if it's active for this product, it's this product's focus)
+    //
+    // Orphan worktrees (no team, not in active set) have unknown product
+    // ownership and are left alone — startup recovery handles them.
+    const trackedFocusIds = new Set();
+    for (const [id, team] of activeTeams) {
+        if (team.productId === config.productId) {
+            trackedFocusIds.add(id);
+        }
+    }
+    for (const focusId of trackedFocusIds) {
+        if (activeFocusIds.has(focusId))
+            continue;
+        const worktreeInfo = getFocusWorktree(focusId);
+        const team = activeTeams.get(focusId);
+        const name = worktreeInfo?.focusName ?? team?.focusName ?? focusId;
+        // Skip teams already shutting down
+        if (team && (team.phase === 'shutting_down' || team.phase === 'terminated') && !worktreeInfo) {
+            continue;
+        }
+        const reason = worktreeInfo && !team
+            ? 'worktree exists but focus no longer active'
+            : team && !worktreeInfo
+                ? 'team running but focus no longer active'
+                : 'focus no longer active';
+        console.log(`[focus-lifecycle] Focus "${name}" deactivated (${reason}) -- coordinated teardown`);
+        await teardownFocus(config, focusId, name);
+    }
+}
+// ── Startup recovery ─────────────────────────────────────────────
+/**
+ * Rebuild the focus-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 focus names. Removes
+ *     stale entries (worktree deleted from disk) and cleans up entries
+ *     for deactivated focuses.
+ *   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 focuses.
+ *
+ * Also removes legacy qa-* directories from the pre-persistent worktree era.
+ *
+ * Must run AFTER hydrateFromDb() and crash recovery but BEFORE startListeners().
+ */
+export async function rebuildFocusWorktreeState(config) {
+    const { worktreeDir, repoPath, organizationId, productId } = config;
+    if (!existsSync(worktreeDir)) {
+        console.log('[focus-lifecycle] No worktree directory — nothing to rebuild');
+        return;
+    }
+    // Query active focuses for enrichment and deactivation detection
+    let activeFocuses;
+    try {
+        activeFocuses = await getActiveFocuses(organizationId, productId);
+    }
+    catch (err) {
+        console.warn(`[focus-lifecycle] Cannot determine active focuses for state rebuild (preserving all): ${err.message}`);
+        return;
+    }
+    const focusById = new Map(activeFocuses.map(s => [s.focus_id, s]));
+    const focusByPrefix = new Map(activeFocuses.map(s => [s.focus_id.slice(0, 8), s]));
+    let validated = 0;
+    let removedStale = 0;
+    let deactivatedCleaned = 0;
+    // ── Phase 1: Validate DB-hydrated entries ──────────────────────
+    const allWorktrees = getAllFocusWorktrees();
+    if (allWorktrees.size > 0) {
+        console.log(`[focus-lifecycle] Validating ${allWorktrees.size} DB-hydrated worktree(s) against disk`);
+        for (const [focusId, info] of [...allWorktrees]) {
+            if (!existsSync(info.worktreePath)) {
+                // Worktree was manually deleted — remove from state (also fires async DB remove)
+                console.log(`[focus-lifecycle] DB-hydrated worktree no longer on disk: ${info.worktreePath}`);
+                removeFocusWorktree(focusId);
+                removedStale++;
+                continue;
+            }
+            const focus = focusById.get(focusId);
+            if (focus) {
+                // Active — enrich with focus name (not stored in DB)
+                info.focusName = focus.focus_name;
+                validated++;
+                console.log(`[focus-lifecycle] Validated worktree for "${focus.focus_name}": ${info.worktreePath}`);
+            }
+            else {
+                // Deactivated — clean up via canonical path
+                console.log(`[focus-lifecycle] DB-hydrated worktree for deactivated focus: ${info.worktreePath}`);
+                try {
+                    const result = await safeRemoveFocusWorktree({
+                        config,
+                        worktreePath: info.worktreePath,
+                        branchName: info.branchName,
+                        deliveryName: info.focusName || focusId,
+                        deliveryId: focusId,
+                        focusId,
+                    });
+                    if (result.removed)
+                        deactivatedCleaned++;
+                }
+                catch (err) {
+                    console.warn(`[focus-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(`[focus-lifecycle] Failed to scan worktree directory: ${err.message}`);
+        agentDirs = [];
+    }
+    // Filter to directories whose full path is NOT already tracked
+    const trackedPaths = new Set([...getAllFocusWorktrees().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(`[focus-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 focus = idPrefix ? focusByPrefix.get(idPrefix) : undefined;
+            if (focus) {
+                setFocusWorktree(focus.focus_id, {
+                    focusId: focus.focus_id,
+                    focusName: focus.focus_name,
+                    worktreePath: fullPath,
+                    branchName,
+                    createdAt: new Date(),
+                    hasQaDevServer: false,
+                });
+                diskRegistered++;
+                console.log(`[focus-lifecycle] Registered orphan worktree for "${focus.focus_name}": ${fullPath}`);
+            }
+            else {
+                // Deactivated — canonical removal
+                console.log(`[focus-lifecycle] Cleaning up orphan deactivated worktree: ${fullPath} [${branchName}]`);
+                try {
+                    const result = await safeRemoveFocusWorktree({
+                        config,
+                        worktreePath: fullPath,
+                        branchName,
+                        deliveryName: dirName,
+                        deliveryId: dirName,
+                    });
+                    if (result.removed)
+                        deactivatedCleaned++;
+                }
+                catch (err) {
+                    console.warn(`[focus-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(`[focus-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(`[focus-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(`[focus-lifecycle] State rebuild complete: ${parts.join(', ')}`);
+}
+// ── Git state reconciliation ──────────────────────────────────────
+/**
+ * Reconcile git state for active focus worktrees after startup.
+ *
+ * Checks all rebuilt focus 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 rebuildFocusWorktreeState().
+ */
+export async function reconcileGitState(_config) {
+    const worktrees = getAllFocusWorktrees();
+    if (worktrees.size === 0) {
+        return;
+    }
+    console.log(`[focus-lifecycle] Reconciling git state for ${worktrees.size} focus worktree(s)...`);
+    let reconciled = 0;
+    for (const [focusId, worktree] of worktrees) {
+        try {
+            const deliveries = await getFocusDeliveries(focusId);
+            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(`[focus-lifecycle] Failed to reconcile git state for "${worktree.focusName}": ` +
+                `${err.message}`);
+        }
+    }
+    if (reconciled > 0) {
+        console.log(`[focus-lifecycle] Reconciled git state for ${reconciled} delivery(ies)`);
+    }
+    else {
+        console.log('[focus-lifecycle] No deliveries needed git state reconciliation');
+    }
+}
+//# sourceMappingURL=focus-lifecycle.js.map

package/dist/focus-lifecycle.js.map

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

package/dist/focus-merge.d.ts

@@ -0,0 +1,77 @@
+/**
+ * Focus branch merge logic.
+ *
+ * Handles merging a focus's work branch into the integration branch,
+ * including workflow resolution and per-delivery git state reporting.
+ */
+import type { DaemonConfig, FocusTeamState, 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 focus-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: FocusTeamState, conflictFiles: string[], branchName: string, integrationBranch: string, timeoutMs?: number): Promise<MergeConflictResolutionResult>;
+/**
+ * Merge the focus branch to integration.
+ *
+ * Uses the first delivery ID as the representative for merge operations
+ * (all deliveries share the same branch in the focus 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 focus branch but were never touched.
+ */
+export declare function mergeFocusBranch(config: DaemonConfig, teamState: FocusTeamState, sessionId: string, branchName: string, workedDeliveryIds: string[]): Promise<{
+    mergeSucceeded: boolean;
+    exitReason: string;
+}>;
+//# sourceMappingURL=focus-merge.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"focus-merge.d.ts","sourceRoot":"","sources":["../src/focus-merge.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EAEd,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,cAAc,EACzB,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,gBAAgB,CACpC,MAAM,EAAE,YAAY,EACpB,SAAS,EAAE,cAAc,EACzB,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"}