@telora/daemon 0.21.26 → 0.21.81

package/dist/focus-merge.js

@@ -1,556 +0,0 @@
-/**
- * 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 { runGitSync } from './git/index.js';
-import { fetchEffectiveWorkflow, reportGitState, getMergeConflictDeliveries } from './supabase.js';
-import { mergeToIntegration } from './git.js';
-import { mergeBackFromIntegration } from './git/index.js';
-import { mergeDeliveryBranch } from './delivery-lifecycle.js';
-import { createEscalation, hasOpenWorktreeDirtyEscalation, resolveOpenWorktreeDirtyEscalations, MERGE_CONFLICT_ESCALATION_KIND, MERGE_REFUSED_DIRTY_ESCALATION_KIND, } from './queries/issues.js';
-import { updateDeliveryMergeCommitSha } from './queries/deliveries.js';
-import { withRetry, sendMessage, ESCALATION_REASONS, ESCALATION_DISPOSITIONS } from '@telora/daemon-core';
-// Import from the defining module (spawner/lifecycle.ts), NOT the spawner/index
-// barrel: the barrel re-exports spawnFocusTeam from focus-executor, which
-// re-exports this module's mergeFocusBranch, so routing through the barrel here
-// would close a static import cycle (focus-merge -> spawner/index ->
-// focus-executor -> focus-merge).
-import { spawnResolutionAgent } from './spawner/lifecycle.js';
-import { getFocusWorktree } from './focus-worktree-state.js';
-import { worktreeHasUncommittedChanges } from './worktree/index.js';
-import { classifyMergeFailure } from './merge-failure-classify.js';
-import { createLogger } from './log.js';
-const log = createLogger({ module: 'focus-merge' });
-/**
- * Refuse a focus-branch merge when the worktree still has uncommitted changes.
- *
- * A merge of a dirty worktree would either silently drop the uncommitted work
- * or merge an unintended tree -- never acceptable. This guard runs before any
- * merge attempt: if the worktree is dirty it files an escalation (deduped
- * durably at focus grain across the sibling classes -- see
- * hasOpenWorktreeDirtyEscalation) and returns refused=true so the caller aborts
- * the merge. A read-only audit worktree that an agent dirtied is the canonical
- * case, but the guard is generic -- any dirty worktree refuses.
- *
- * Returns refused=false (proceed) when the worktree is clean or no path is
- * known.
- */
-export async function refuseMergeIfWorktreeDirty(params, deps = {}) {
-    const hasUncommitted = deps.worktreeHasUncommittedChanges ?? worktreeHasUncommittedChanges;
-    const createEsc = deps.createEscalation ?? createEscalation;
-    const hasOpenEsc = deps.hasOpenWorktreeDirtyEscalation ?? hasOpenWorktreeDirtyEscalation;
-    const { worktreePath, organizationId, sessionId, deliveryId, deliveryName, focusId, branchName, integrationBranch } = params;
-    if (!worktreePath || !hasUncommitted(worktreePath)) {
-        return { refused: false };
-    }
-    log.warn(`[focus-merge] REFUSING merge of "${deliveryName}" (${branchName} -> ${integrationBranch}): ` +
-        `worktree ${worktreePath} has uncommitted changes.`);
-    // Durable, focus-grain dedup: at most one open worktree-dirty escalation per
-    // FOCUS, collapsed across the sibling classes (advance_blocked /
-    // merge_conflict / merge_refused_dirty). If any sibling is already open for
-    // the focus, suppress -- one physical dirty-worktree fact yields one row,
-    // and the suppression survives a daemon restart (it reads the DB, holds no
-    // in-memory state). Fail open: if the lookup errors we still refuse the
-    // merge, and proceed to file rather than swallow a genuine first escalation.
-    let alreadyOpen = false;
-    try {
-        alreadyOpen = await hasOpenEsc(focusId);
-    }
-    catch (err) {
-        log.warn(`[focus-merge] Open worktree-dirty escalation lookup failed for "${deliveryName}", proceeding to file: ${err.message}`);
-    }
-    if (alreadyOpen) {
-        return { refused: true };
-    }
-    try {
-        await withRetry(() => createEsc({
-            organizationId,
-            sessionId,
-            issueId: null,
-            reasonType: ESCALATION_REASONS.ERROR_ENCOUNTERED,
-            disposition: ESCALATION_DISPOSITIONS.NEEDS_OPERATOR,
-            escalationKind: MERGE_REFUSED_DIRTY_ESCALATION_KIND,
-            anchor: { deliveryId, focusId, branch: branchName },
-            description: `Merge refused: focus worktree has uncommitted changes.\n\n` +
-                `**Focus/Delivery:** ${deliveryName}\n` +
-                `**Source branch:** ${branchName}\n` +
-                `**Target branch:** ${integrationBranch}\n` +
-                `**Worktree:** ${worktreePath}\n\n` +
-                `The merge was NOT performed (a dirty-worktree merge would drop or ` +
-                `mis-merge uncommitted work). For a read-only audit focus this means ` +
-                `the agent modified files it should not have.`,
-            whatWasTried: `Daemon was about to merge ${branchName} into ${integrationBranch} but \`git status --porcelain\` reported uncommitted changes in ${worktreePath}.`,
-            helpNeeded: `Inspect ${worktreePath}; commit or discard the uncommitted changes (for a read-only audit, discard them), then the merge can be retried.`,
-        }), { maxAttempts: 3, label: `escalation-dirty-worktree-merge-${deliveryId}` });
-        log.info(`Filed dirty-worktree merge-refusal escalation for "${deliveryName}"`);
-    }
-    catch (err) {
-        log.error(`[focus-merge] Failed to file dirty-worktree merge-refusal escalation for "${deliveryName}": ${err.message}`);
-    }
-    return { refused: true };
-}
-/**
- * Report merge_conflict git state for a delivery.
- *
- * Makes the merge failure visible in the frontend delivery detail view.
- */
-export async function reportMergeConflictState(deliveryId, branchName) {
-    try {
-        await reportGitState(deliveryId, 'merge_conflict', branchName);
-    }
-    catch (err) {
-        log.warn(`[focus-merge] reportGitState merge_conflict failed for ${deliveryId}:`, err.message);
-    }
-}
-/**
- * Create an escalation for a merge conflict and report the git state.
- *
- * Durable, focus-grain dedup: skips escalation creation if any sibling
- * worktree-dirty escalation (advance_blocked / merge_conflict /
- * merge_refused_dirty) is already open for the FOCUS. Because the lookup
- * queries the DB rather than an in-memory Set, the suppression survives a
- * daemon restart and collapses across the sibling paths. Always reports
- * merge_conflict git state regardless (git-state surfacing is not deduped --
- * only the human-facing escalation row is).
- *
- * Called by all focus-level merge callers when mergeToIntegration fails.
- */
-export async function escalateMergeConflict(params, deps = {}) {
-    const createEsc = deps.createEscalation ?? createEscalation;
-    const hasOpenEsc = deps.hasOpenWorktreeDirtyEscalation ?? hasOpenWorktreeDirtyEscalation;
-    const reportState = deps.reportGitState ?? reportGitState;
-    const { organizationId, sessionId, deliveryId, deliveryName, focusId, branchName, integrationBranch, mergeError } = params;
-    // A filing states only what the machine established. Discriminate on the git
-    // error the caller already holds BEFORE asserting a merge_conflict verdict.
-    const classification = classifyMergeFailure(mergeError);
-    // Missing / unconfigured integration ref: a CONFIGURATION gap, not a merge
-    // conflict and not an operator escalation (config gaps are state, not
-    // escalations). Surface it as state -- log it naming the missing ref -- and
-    // file nothing. Reporting merge_conflict git state here would assert a verdict
-    // the machine never established; prescribing conflict resolution would offer a
-    // remedy whose retry re-fails identically.
-    if (classification.isConfigGap) {
-        log.warn(`[focus-merge] Merge of "${deliveryName}" (${branchName} -> ${integrationBranch}) failed on a ` +
-            `missing/unconfigured integration ref -- a configuration gap, NOT a merge conflict. ` +
-            `No git state stamped and no operator escalation filed. Error: ${mergeError}`);
-        return;
-    }
-    // Any non-conflict failure we could not attribute to a content conflict: do
-    // NOT stamp a merge_conflict git state and do NOT file a merge_conflict
-    // escalation whose remedy the machine cannot verify. Report it honestly as a
-    // log line naming the real error; the branch is preserved for the next tick.
-    if (!classification.isContentConflict) {
-        log.warn(`[focus-merge] Merge of "${deliveryName}" (${branchName} -> ${integrationBranch}) failed for a ` +
-            `non-conflict reason (${classification.class}); not stamping a merge_conflict verdict. Error: ${mergeError}`);
-        return;
-    }
-    // Genuine content conflict -- the sole case that warrants the merge_conflict
-    // git state + conflict-resolution escalation below.
-    // Report merge_conflict git state (git-state surfacing is not deduped).
-    try {
-        await reportState(deliveryId, 'merge_conflict', branchName);
-    }
-    catch (err) {
-        log.warn(`[focus-merge] reportGitState merge_conflict failed for ${deliveryId}:`, err.message);
-    }
-    // Durable, focus-grain dedup across the sibling classes. Fail open: if the
-    // lookup errors we proceed to file rather than swallow a genuine first
-    // escalation.
-    let alreadyOpen = false;
-    try {
-        alreadyOpen = await hasOpenEsc(focusId);
-    }
-    catch (err) {
-        log.warn(`[focus-merge] Open worktree-dirty escalation lookup failed for "${deliveryName}", proceeding to file: ${err.message}`);
-    }
-    if (alreadyOpen) {
-        log.info(`Worktree-dirty escalation already open for focus ${focusId}, skipping duplicate merge-conflict row`);
-        return;
-    }
-    try {
-        await withRetry(() => createEsc({
-            organizationId,
-            sessionId,
-            issueId: null,
-            reasonType: ESCALATION_REASONS.ERROR_ENCOUNTERED,
-            disposition: ESCALATION_DISPOSITIONS.NEEDS_OPERATOR,
-            escalationKind: MERGE_CONFLICT_ESCALATION_KIND,
-            anchor: { deliveryId, focusId, branch: branchName },
-            description: `Merge conflict merging focus branch into integration.\n\n` +
-                `**Delivery:** ${deliveryName}\n` +
-                `**Source branch:** ${branchName}\n` +
-                `**Target branch:** ${integrationBranch}\n` +
-                `**Error:** ${mergeError}\n\n` +
-                `The branch has been preserved. Resolve the conflict and mark the escalation as resolved to trigger a retry.`,
-            whatWasTried: `Attempted automatic merge of ${branchName} into ${integrationBranch}.`,
-            helpNeeded: `Resolve the merge conflicts between ${branchName} and ${integrationBranch}, then mark this escalation as resolved.`,
-        }), { maxAttempts: 3, label: `escalation-focus-merge-conflict-${deliveryId}` });
-        log.info(`Created merge conflict escalation for delivery "${deliveryName}"`);
-    }
-    catch (err) {
-        log.error(`[focus-merge] Failed to create merge conflict escalation for "${deliveryName}": ${err.message}`);
-    }
-}
-/**
- * Best-effort: close any open merge_conflict escalation for the focuses behind a
- * branch group once the merge has actually gone through. A clean worktree does
- * NOT clear a content conflict -- only a successful merge does -- so the
- * merge-success path (not the advance-block clean path) owns merge_conflict
- * auto-resolution. Fire-and-forget with a logged catch so it never blocks the
- * merge bookkeeping.
- */
-function resolveMergeConflictEscalations(deliveries) {
-    const focusIds = new Set(deliveries.map((d) => d.focus_id).filter((id) => !!id));
-    for (const focusId of focusIds) {
-        resolveOpenWorktreeDirtyEscalations(focusId, [MERGE_CONFLICT_ESCALATION_KIND])
-            .then((n) => {
-            if (n > 0) {
-                log.info(`[focus-merge] Merge resolved for focus ${focusId}; auto-resolved ${n} merge-conflict escalation(s).`);
-            }
-        })
-            .catch((err) => log.warn(`[focus-merge] Auto-resolve of merge-conflict escalation failed for focus ${focusId}: ${err.message}`));
-    }
-}
-/**
- * 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 auto-resolves their open merge_conflict escalations.
- * On failure: logs quietly (the existing escalation remains active).
- */
-export async function checkResolvedMergeConflicts(config) {
-    let conflictDeliveries;
-    try {
-        conflictDeliveries = await getMergeConflictDeliveries(config.organizationId, config.productId);
-    }
-    catch (err) {
-        log.warn(`[focus-merge] Failed to fetch merge conflict deliveries:`, err.message);
-        return;
-    }
-    if (conflictDeliveries.length === 0)
-        return;
-    // Group deliveries by branch so we only merge once per branch
-    const byBranch = new Map();
-    for (const d of conflictDeliveries) {
-        if (!d.git_branch_name)
-            continue;
-        const group = byBranch.get(d.git_branch_name) ?? [];
-        group.push(d);
-        byBranch.set(d.git_branch_name, group);
-    }
-    for (const [branchName, deliveries] of byBranch) {
-        const representative = deliveries[0];
-        log.info(`[focus-merge] Retrying merge for branch ${branchName} ` +
-            `(${deliveries.length} delivery/ies in merge_conflict state)`);
-        const mergeResult = await mergeToIntegration({
-            config,
-            branchName,
-            deliveryName: representative.delivery_name,
-            deliveryId: representative.delivery_id,
-        });
-        if (mergeResult.success) {
-            log.info(`[focus-merge] Merge retry succeeded for branch ${branchName}`);
-            // Update all deliveries in this branch group. Dedup is durable now (an
-            // open escalation suppresses re-filing); now that the merge succeeded we
-            // also auto-resolve the open merge_conflict escalation(s) for the focus so
-            // a resolved-in-fact conflict stops sitting in the human inbox.
-            for (const d of deliveries) {
-                reportGitState(d.delivery_id, 'merged_to_integration').catch((err) => log.warn(`[focus-merge] reportGitState merged_to_integration failed for ${d.delivery_id}:`, err.message));
-            }
-            resolveMergeConflictEscalations(deliveries);
-        }
-        else {
-            log.info(`[focus-merge] Merge retry still failing for branch ${branchName}: ${mergeResult.error ?? 'unknown'}`);
-            // Attempt fallback resolution agent if a worktree exists for this focus
-            if (representative.focus_id) {
-                const worktreeInfo = getFocusWorktree(representative.focus_id);
-                if (worktreeInfo) {
-                    log.info(`[focus-merge] Spawning fallback resolution agent for branch ${branchName}`);
-                    // Merge integration back into the focus worktree to surface conflicts
-                    const mergeBackResult = await mergeBackFromIntegration({
-                        worktreePath: worktreeInfo.worktreePath,
-                        integrationBranch: config.integrationBranch,
-                    });
-                    if (mergeBackResult.status === 'conflict') {
-                        const fallbackResult = await spawnResolutionAgent({
-                            config,
-                            worktreePath: worktreeInfo.worktreePath,
-                            branchName,
-                            integrationBranch: config.integrationBranch,
-                            conflictFiles: mergeBackResult.conflictFiles ?? [],
-                            focusDescription: worktreeInfo.focusName || branchName,
-                            model: representative.pipeline_config?.model ?? null,
-                            focusId: representative.focus_id,
-                        });
-                        if (fallbackResult.success) {
-                            // Retry merge after resolution
-                            const retryResult = await mergeToIntegration({
-                                config,
-                                branchName,
-                                deliveryName: representative.delivery_name,
-                                deliveryId: representative.delivery_id,
-                            });
-                            if (retryResult.success) {
-                                log.info(`Merge succeeded after fallback resolution for branch ${branchName}`);
-                                for (const d of deliveries) {
-                                    reportGitState(d.delivery_id, 'merged_to_integration').catch((err) => log.warn(`reportGitState failed for ${d.delivery_id}:`, err.message));
-                                }
-                                resolveMergeConflictEscalations(deliveries);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-// ── Team lead conflict resolution ────────────────────────────────
-/** Default timeout for team lead to resolve merge conflicts (5 minutes). */
-const MERGE_CONFLICT_RESOLUTION_TIMEOUT_MS = 5 * 60 * 1000;
-/** Poll interval when waiting for conflict resolution (5 seconds). */
-const RESOLUTION_POLL_INTERVAL_MS = 5000;
-/**
- * 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 async function requestTeamLeadResolution(teamState, conflictFiles, branchName, integrationBranch, timeoutMs = MERGE_CONFLICT_RESOLUTION_TIMEOUT_MS) {
-    const { leadStdin, worktreePath, focusName } = teamState;
-    if (!leadStdin || !worktreePath) {
-        return { resolved: false, reason: 'No active team lead stdin or worktree' };
-    }
-    // Set concurrency guard
-    teamState.resolvingMergeConflict = true;
-    try {
-        // Send conflict resolution instructions to the team lead
-        const message = `MERGE CONFLICT RESOLUTION NEEDED\n\n` +
-            `The integration branch has changes that conflict with your focus branch.\n\n` +
-            `**Conflicted files:**\n${conflictFiles.map(f => `- ${f}`).join('\n')}\n\n` +
-            `**Source:** origin/${integrationBranch}\n` +
-            `**Target:** ${branchName}\n\n` +
-            `**Instructions:**\n` +
-            `1. Open each conflicted file and resolve the conflict markers (<<<<<<< / ======= / >>>>>>>)\n` +
-            `2. Stage each resolved file with: git add <file>\n` +
-            `3. Commit the merge resolution: git commit --no-edit\n` +
-            `4. Run: npm run typecheck plus the TARGETED tests for the files you resolved (NOT the whole suite -- the daemon runs whole-repo verify off-session at the coding -> verify edge).\n` +
-            `5. If typecheck or the targeted tests fail, fix the issues, commit, and re-run\n\n` +
-            `Do NOT run git merge --abort. Your goal is to produce a clean merge commit that passes typecheck and the targeted tests.`;
-        sendMessage(leadStdin, message);
-        log.info(`Sent merge conflict resolution request to team lead for "${focusName}"`);
-        // Poll git state to detect resolution
-        const deadline = Date.now() + timeoutMs;
-        const preResolutionHead = runGitSync(['rev-parse', 'HEAD'], worktreePath).output;
-        while (Date.now() < deadline) {
-            await new Promise(resolve => setTimeout(resolve, RESOLUTION_POLL_INTERVAL_MS));
-            // Check if unmerged files remain
-            const unmergedResult = runGitSync(['diff', '--name-only', '--diff-filter=U'], worktreePath);
-            const unmergedFiles = unmergedResult.success
-                ? unmergedResult.output.split('\n').filter(Boolean)
-                : [];
-            if (unmergedFiles.length === 0) {
-                // No unmerged files -- check if HEAD advanced (merge commit created)
-                const currentHead = runGitSync(['rev-parse', 'HEAD'], worktreePath).output;
-                if (currentHead !== preResolutionHead) {
-                    log.info(`Team lead resolved merge conflicts for "${focusName}"`);
-                    return { resolved: true };
-                }
-            }
-        }
-        // Timeout expired
-        log.warn(`[focus-merge] Team lead did not resolve merge conflicts within ${timeoutMs / 1000}s for "${focusName}"`);
-        return { resolved: false, reason: `Resolution timeout (${timeoutMs / 1000}s)` };
-    }
-    finally {
-        teamState.resolvingMergeConflict = false;
-    }
-}
-/**
- * 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. When empty (e.g.,
- * a focus whose deliveries all reached done before this merge cycle, or a
- * state-driven merge-back tick on a fully-done focus), the merge still
- * proceeds — the planning-phase / read-only safety nets live in
- * `shouldAttemptMerge`, not here.
- */
-export async function mergeFocusBranch(config, teamState, sessionId, branchName, workedDeliveryIds) {
-    log.info(`Merging focus branch ${branchName} for "${teamState.focusName}"`, {
-        focusId: teamState.focusId,
-        sessionId,
-    });
-    // Pick a representative delivery for merge operations (workflow lookup,
-    // escalation references, mergeDeliveryBranch). Prefer a worked delivery;
-    // fall back to any known delivery on the focus. Only return early if the
-    // focus has no deliveries at all — a degenerate case (orphan branch with
-    // no focus row) where the merge can't be safely attributed.
-    const representativeDeliveryId = workedDeliveryIds[0] ?? Array.from(teamState.knownDeliveryIds)[0];
-    if (!representativeDeliveryId) {
-        return { mergeSucceeded: false, exitReason: 'No deliveries on focus; cannot attribute merge.' };
-    }
-    // ── Refuse: never merge a dirty worktree ──────────────────────────────
-    // A merge of a worktree with uncommitted changes would drop or mis-merge
-    // that work. Refuse (and escalate) before doing anything else. For a
-    // read-only audit focus this is the merge-side backstop that keeps an
-    // unintended dirty tree out of integration.
-    const dirtyGuard = await refuseMergeIfWorktreeDirty({
-        worktreePath: teamState.worktreePath,
-        organizationId: teamState.organizationId,
-        sessionId,
-        deliveryId: representativeDeliveryId,
-        deliveryName: teamState.focusName,
-        focusId: teamState.focusId,
-        branchName,
-        integrationBranch: config.integrationBranch,
-    });
-    if (dirtyGuard.refused) {
-        return { mergeSucceeded: false, exitReason: 'merge_refused_dirty_worktree' };
-    }
-    // Fetch workflow for merge operations (used only for conflict rollback stage lookup)
-    let workflow;
-    try {
-        workflow = await fetchEffectiveWorkflow(representativeDeliveryId);
-    }
-    catch (err) {
-        log.warn(`[focus-executor] Failed to fetch workflow for merge, using fallback:`, err.message);
-        workflow = { id: 'fallback', stages: [] };
-    }
-    // ── Merge-back: sync integration into focus branch before merging out ──
-    // Merge integration HEAD into the focus branch to surface conflicts early
-    const worktreePath = teamState.worktreePath;
-    if (worktreePath) {
-        const mergeBackResult = await mergeBackFromIntegration({
-            worktreePath,
-            integrationBranch: config.integrationBranch,
-        });
-        if (mergeBackResult.status === 'conflict') {
-            const conflictFiles = mergeBackResult.conflictFiles ?? [];
-            log.info(`[focus-merge] Merge-back produced conflicts for "${teamState.focusName}": ` +
-                `${conflictFiles.join(', ') || 'unknown files'}`);
-            // If team lead is alive, delegate resolution to them
-            if (teamState.leadStdin && teamState.phase === 'executing') {
-                const resolution = await requestTeamLeadResolution(teamState, conflictFiles, branchName, config.integrationBranch);
-                if (resolution.resolved) {
-                    // Agent committed the merge resolution, proceed to integration merge
-                    log.info(`Conflict resolved by team lead for "${teamState.focusName}", proceeding`);
-                }
-                else {
-                    // Team lead could not resolve -- escalate
-                    await escalateMergeConflict({
-                        organizationId: teamState.organizationId,
-                        sessionId,
-                        deliveryId: representativeDeliveryId,
-                        deliveryName: teamState.focusName,
-                        focusId: teamState.focusId,
-                        branchName,
-                        integrationBranch: config.integrationBranch,
-                        mergeError: `Merge-back conflict unresolved: ${resolution.reason ?? 'unknown'}`,
-                    });
-                    return { mergeSucceeded: false, exitReason: 'merge_back_conflict_unresolved' };
-                }
-            }
-            else {
-                // No active team lead -- spawn a short-lived resolution agent
-                log.info(`No active team lead for "${teamState.focusName}", spawning fallback resolution agent`);
-                // Report resolving_conflict state for all unmerged deliveries
-                for (const deliveryId of teamState.knownDeliveryIds) {
-                    if (!teamState.mergedDeliveryIds.has(deliveryId)) {
-                        reportGitState(deliveryId, 'resolving_conflict').catch(err => log.warn(`reportGitState resolving_conflict failed for ${deliveryId}:`, err.message));
-                    }
-                }
-                const fallbackResult = await spawnResolutionAgent({
-                    config,
-                    worktreePath,
-                    branchName,
-                    integrationBranch: config.integrationBranch,
-                    conflictFiles,
-                    focusDescription: teamState.focusName,
-                    model: teamState.pipelineConfig?.model ?? null,
-                    focusId: teamState.focusId,
-                });
-                if (fallbackResult.success) {
-                    log.info(`Fallback resolution agent resolved conflicts for "${teamState.focusName}", proceeding`);
-                }
-                else {
-                    await escalateMergeConflict({
-                        organizationId: teamState.organizationId,
-                        sessionId,
-                        deliveryId: representativeDeliveryId,
-                        deliveryName: teamState.focusName,
-                        focusId: teamState.focusId,
-                        branchName,
-                        integrationBranch: config.integrationBranch,
-                        mergeError: `Fallback resolution agent failed: ${fallbackResult.error ?? 'unknown'}`,
-                    });
-                    return { mergeSucceeded: false, exitReason: 'merge_back_conflict_unresolved' };
-                }
-            }
-        }
-        if (mergeBackResult.status === 'error') {
-            log.error(`[focus-merge] Merge-back error for "${teamState.focusName}": ${mergeBackResult.message}`);
-            return { mergeSucceeded: false, exitReason: mergeBackResult.message };
-        }
-        // status === 'clean' -- proceed to merge to integration
-        log.info(`Merge-back clean for "${teamState.focusName}", proceeding to integration merge`);
-    }
-    const mergeOutcome = await mergeDeliveryBranch({
-        config,
-        branchName,
-        deliveryId: representativeDeliveryId,
-        deliveryName: teamState.focusName,
-        organizationId: teamState.organizationId,
-        sessionId,
-        workflow,
-        focusId: teamState.focusId,
-    });
-    // Report git state and merge commit SHA only for deliveries that were
-    // actually worked on, never for queued/planning deliveries on the same branch.
-    const deliveryIdsForGitState = new Set(workedDeliveryIds);
-    if (mergeOutcome.mergeSucceeded) {
-        for (const deliveryId of deliveryIdsForGitState) {
-            if (!teamState.mergedDeliveryIds.has(deliveryId)) {
-                reportGitState(deliveryId, 'merged_to_integration').catch(err => log.warn(`[focus-executor] reportGitState merged_to_integration failed for ${deliveryId}:`, err.message));
-                // Propagate the merge commit SHA to all deliveries so the git state
-                // detector can track their containment in main/remote independently.
-                if (mergeOutcome.commitSha) {
-                    updateDeliveryMergeCommitSha(deliveryId, mergeOutcome.commitSha).catch(err => log.warn(`updateDeliveryMergeCommitSha failed for ${deliveryId}:`, err.message));
-                }
-            }
-        }
-    }
-    else if (classifyMergeFailure(mergeOutcome.exitReason).isContentConflict) {
-        // Report merge_conflict state for worked deliveries only -- and only when
-        // the failure was a genuine content conflict. A non-conflict failure (e.g.
-        // a missing integration ref) must not be stamped as merge_conflict: that
-        // would assert a git state verdict the machine never established.
-        for (const deliveryId of deliveryIdsForGitState) {
-            if (!teamState.mergedDeliveryIds.has(deliveryId)) {
-                reportMergeConflictState(deliveryId, branchName).catch(err => log.warn(`reportMergeConflictState failed for ${deliveryId}:`, err.message));
-            }
-        }
-    }
-    else {
-        log.warn(`[focus-merge] Merge failed for "${teamState.focusName}" for a non-conflict reason; ` +
-            `not stamping merge_conflict git state. Reason: ${mergeOutcome.exitReason}`);
-    }
-    return {
-        mergeSucceeded: mergeOutcome.mergeSucceeded,
-        exitReason: mergeOutcome.exitReason,
-    };
-}
-//# sourceMappingURL=focus-merge.js.map

package/dist/focus-merge.js.map

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

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

@@ -1 +0,0 @@
-{"version":3,"file":"focus-phase.d.ts","sourceRoot":"","sources":["../src/focus-phase.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAG3D,MAAM,MAAM,mBAAmB,GAC3B,SAAS,GACT,QAAQ,GACR,WAAW,GACX,WAAW,GACX,cAAc,GACd,SAAS,CAAC;AAEd,MAAM,WAAW,kBAAkB;IACjC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,kBAAkB,EAAE,CAAC;IACjC,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC;CACzC;AAyCD;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,EAAE,WAAW,CAAC,eAAe,CAAoC,CAAC;AACrG,eAAO,MAAM,eAAe,EAAE,WAAW,CAAC,eAAe,CAA6B,CAAC;AACvF,eAAO,MAAM,iBAAiB,EAAE,WAAW,CAAC,eAAe,CAA+B,CAAC;AAC3F,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAAC,eAAe,CAAyC,CAAC;AAEvG,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,eAAe,GAAG,mBAAmB,CA2D5E;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAMtF;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,aAAa,CAAC;IAAE,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,GAC5D,OAAO,CAGT;AAED;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,EAAE,WAAW,CAAC,eAAe,CAG1D,CAAC;AAEH;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,aAAa,CAAC;IAAE,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,GAC5D,OAAO,CAeT;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,uBAAuB,EAAE,aAAa,CACjD,SAAS,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAiBjD,CAAC"}

package/dist/focus-phase.js.map

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

package/dist/focus-prompt-builder.d.ts

@@ -1,35 +0,0 @@
-/**
- * Focus team prompt builder.
- *
- * The core prompt building logic lives in team-prompt-base.ts (section builders
- * + buildFocusTeamPrompt). This file re-exports the main entry points for
- * backward compatibility and houses buildWakeMessage (wake-only, not part of
- * the role framework).
- *
- * Planning prompts have been extracted to planning-prompt-builder.ts
- * and are re-exported here for backward compatibility.
- */
-import type { FocusDeliveryInfo, FocusIssueInfo } from './types.js';
-export type { DeploymentProfileSnapshotContext, FocusTeamPromptContext } from './team-prompt-base.js';
-export { buildFocusTeamPrompt } from './team-prompt-base.js';
-/**
- * Build a re-engagement message listing all non-terminal deliveries that
- * the team must finish, scope, or cancel before the focus can wind down.
- *
- * Unlike `buildWakeMessage` (which only lists agent-actionable deliveries),
- * this message includes deliveries in `planning`, `verify_failed`, and other
- * non-terminal states so the team is reminded that work is still pending.
- * Used by the scope-coverage guard when the focus executor would
- * otherwise idle-terminate while non-terminal deliveries remain.
- */
-export declare function buildReEngagementMessage(nonTerminalDeliveries: FocusDeliveryInfo[], issues: FocusIssueInfo[]): string;
-/**
- * Build a wake message for an idle team when new work is available.
- *
- * The team already has role context and execution instructions from the
- * initial prompt. This message is a lean update with just the new work.
- */
-export declare function buildWakeMessage(deliveries: FocusDeliveryInfo[], issues: FocusIssueInfo[], knownDeliveryIds: Set<string>): string;
-export type { PlanningPass1Context, PlanningPass2Context } from './planning-prompt-builder.js';
-export { buildPlanningPass1Prompt, buildPlanningPass2Prompt, buildPlanningCombinedPrompt } from './planning-prompt-builder.js';
-//# sourceMappingURL=focus-prompt-builder.d.ts.map

package/dist/focus-prompt-builder.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"focus-prompt-builder.d.ts","sourceRoot":"","sources":["../src/focus-prompt-builder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EACV,iBAAiB,EACjB,cAAc,EACf,MAAM,YAAY,CAAC;AAKpB,YAAY,EAAE,gCAAgC,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACtG,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CACtC,qBAAqB,EAAE,iBAAiB,EAAE,EAC1C,MAAM,EAAE,cAAc,EAAE,GACvB,MAAM,CAoCR;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,iBAAiB,EAAE,EAC/B,MAAM,EAAE,cAAc,EAAE,EACxB,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,GAC5B,MAAM,CAqER;AAMD,YAAY,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAC/F,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC"}