@telora/daemon 0.15.1 → 0.15.3

package/dist/focus-merge.js

@@ -0,0 +1,378 @@
+/**
+ * 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-types.js';
+import { fetchEffectiveWorkflow, reportGitState, getMergeConflictDeliveries } from './supabase.js';
+import { mergeToIntegration } from './git.js';
+import { mergeBackFromIntegration } from './git-merge.js';
+import { mergeDeliveryBranch } from './delivery-lifecycle.js';
+import { createEscalation } from './queries/issues.js';
+import { updateDeliveryMergeCommitSha } from './queries/deliveries.js';
+import { withRetry, sendMessage, ESCALATION_REASONS } from '@telora/daemon-core';
+import { spawnResolutionAgent } from './spawner.js';
+import { getFocusWorktree } from './focus-worktree-state.js';
+// Track deliveries with pending merge conflict escalations to avoid duplicates
+const pendingMergeConflictDeliveries = new Set();
+/**
+ * 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) {
+        console.warn(`[focus-merge] reportGitState merge_conflict failed for ${deliveryId}:`, err.message);
+    }
+}
+/**
+ * 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 async function escalateMergeConflict(params) {
+    const { organizationId, sessionId, deliveryId, deliveryName, branchName, integrationBranch, mergeError } = params;
+    // Always report merge_conflict git state
+    await reportMergeConflictState(deliveryId, branchName);
+    // Skip duplicate escalation
+    if (pendingMergeConflictDeliveries.has(deliveryId)) {
+        console.log(`[focus-merge] Merge conflict escalation already pending for delivery ${deliveryId}, skipping duplicate`);
+        return;
+    }
+    pendingMergeConflictDeliveries.add(deliveryId);
+    try {
+        await withRetry(() => createEscalation({
+            organizationId,
+            sessionId,
+            issueId: null,
+            reasonType: ESCALATION_REASONS.ERROR_ENCOUNTERED,
+            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}` });
+        console.log(`[focus-merge] Created merge conflict escalation for delivery "${deliveryName}"`);
+    }
+    catch (err) {
+        console.error(`[focus-merge] Failed to create merge conflict escalation for "${deliveryName}": ${err.message}`);
+        // Remove from pending set so a retry can create it later
+        pendingMergeConflictDeliveries.delete(deliveryId);
+    }
+}
+/**
+ * Clear the pending merge conflict flag for a delivery (e.g., after successful retry).
+ */
+export function clearMergeConflictFlag(deliveryId) {
+    pendingMergeConflictDeliveries.delete(deliveryId);
+}
+/**
+ * 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 async function checkResolvedMergeConflicts(config) {
+    let conflictDeliveries;
+    try {
+        conflictDeliveries = await getMergeConflictDeliveries(config.organizationId, config.productId);
+    }
+    catch (err) {
+        console.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];
+        console.log(`[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) {
+            console.log(`[focus-merge] Merge retry succeeded for branch ${branchName}`);
+            // Update all deliveries in this branch group
+            for (const d of deliveries) {
+                clearMergeConflictFlag(d.delivery_id);
+                reportGitState(d.delivery_id, 'merged_to_integration').catch((err) => console.warn(`[focus-merge] reportGitState merged_to_integration failed for ${d.delivery_id}:`, err.message));
+            }
+        }
+        else {
+            console.log(`[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) {
+                    console.log(`[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,
+                        });
+                        if (fallbackResult.success) {
+                            // Retry merge after resolution
+                            const retryResult = await mergeToIntegration({
+                                config,
+                                branchName,
+                                deliveryName: representative.delivery_name,
+                                deliveryId: representative.delivery_id,
+                            });
+                            if (retryResult.success) {
+                                console.log(`[focus-merge] Merge succeeded after fallback resolution for branch ${branchName}`);
+                                for (const d of deliveries) {
+                                    clearMergeConflictFlag(d.delivery_id);
+                                    reportGitState(d.delivery_id, 'merged_to_integration').catch((err) => console.warn(`[focus-merge] reportGitState failed for ${d.delivery_id}:`, err.message));
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+// ── 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 build && npm test\n` +
+            `5. If build+test fails, 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 build and tests.`;
+        sendMessage(leadStdin, message);
+        console.log(`[focus-merge] 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) {
+                    console.log(`[focus-merge] Team lead resolved merge conflicts for "${focusName}"`);
+                    return { resolved: true };
+                }
+            }
+        }
+        // Timeout expired
+        console.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.
+ */
+export async function mergeFocusBranch(config, teamState, sessionId, branchName, workedDeliveryIds) {
+    // Empty-set guard: planning teams may exit before any deliveries are
+    // worked (human cleared the agent role mid-planning, planning failed,
+    // etc.). With workedDeliveryIds required, this also covers the old
+    // "no deliveries to merge" case.
+    if (workedDeliveryIds.length === 0) {
+        return { mergeSucceeded: false, exitReason: 'No worked deliveries to merge.' };
+    }
+    // Use first worked delivery as the representative for merge operations
+    const representativeDeliveryId = workedDeliveryIds[0];
+    // Fetch workflow for merge operations (used only for conflict rollback stage lookup)
+    let workflow;
+    try {
+        workflow = await fetchEffectiveWorkflow(representativeDeliveryId);
+    }
+    catch (err) {
+        console.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 ?? [];
+            console.log(`[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
+                    console.log(`[focus-merge] 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,
+                        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
+                console.log(`[focus-merge] 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 => console.warn(`[focus-merge] reportGitState resolving_conflict failed for ${deliveryId}:`, err.message));
+                    }
+                }
+                const fallbackResult = await spawnResolutionAgent({
+                    config,
+                    worktreePath,
+                    branchName,
+                    integrationBranch: config.integrationBranch,
+                    conflictFiles,
+                    focusDescription: teamState.focusName,
+                });
+                if (fallbackResult.success) {
+                    console.log(`[focus-merge] Fallback resolution agent resolved conflicts for "${teamState.focusName}", proceeding`);
+                }
+                else {
+                    await escalateMergeConflict({
+                        organizationId: teamState.organizationId,
+                        sessionId,
+                        deliveryId: representativeDeliveryId,
+                        deliveryName: teamState.focusName,
+                        branchName,
+                        integrationBranch: config.integrationBranch,
+                        mergeError: `Fallback resolution agent failed: ${fallbackResult.error ?? 'unknown'}`,
+                    });
+                    return { mergeSucceeded: false, exitReason: 'merge_back_conflict_unresolved' };
+                }
+            }
+        }
+        if (mergeBackResult.status === 'error') {
+            console.error(`[focus-merge] Merge-back error for "${teamState.focusName}": ${mergeBackResult.message}`);
+            return { mergeSucceeded: false, exitReason: mergeBackResult.message };
+        }
+        // status === 'clean' -- proceed to merge to integration
+        console.log(`[focus-merge] 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 => console.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 => console.warn(`[focus-merge] updateDeliveryMergeCommitSha failed for ${deliveryId}:`, err.message));
+                }
+            }
+        }
+    }
+    else {
+        // Report merge_conflict state for worked deliveries only
+        for (const deliveryId of deliveryIdsForGitState) {
+            if (!teamState.mergedDeliveryIds.has(deliveryId)) {
+                reportMergeConflictState(deliveryId, branchName).catch(err => console.warn(`[focus-merge] reportMergeConflictState failed for ${deliveryId}:`, err.message));
+            }
+        }
+    }
+    return {
+        mergeSucceeded: mergeOutcome.mergeSucceeded,
+        exitReason: mergeOutcome.exitReason,
+    };
+}
+//# sourceMappingURL=focus-merge.js.map

package/dist/focus-merge.js.map

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

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

@@ -0,0 +1,35 @@
+/**
+ * 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`, `iterating`, 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

@@ -0,0 +1 @@
+{"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;AAIpB,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,CA+CR;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,CA2ER;AAMD,YAAY,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAC/F,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC"}

package/dist/focus-prompt-builder.js

@@ -0,0 +1,138 @@
+/**
+ * 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 { isStatusAgentActionable } from './stage-classifier.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`, `iterating`, 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 function buildReEngagementMessage(nonTerminalDeliveries, issues) {
+    const parts = [];
+    parts.push('## Remaining Work -- Scope, Finish, or Cancel');
+    parts.push('');
+    parts.push('The focus still has non-terminal deliveries. The team must');
+    parts.push('finish, scope, or cancel each one before the focus can wind');
+    parts.push('down. Do not exit. Pick the highest-priority delivery (lowest');
+    parts.push('priorityRank) and continue from there.');
+    parts.push('');
+    const sorted = [...nonTerminalDeliveries].sort((a, b) => a.priorityRank - b.priorityRank);
+    for (const delivery of sorted) {
+        parts.push(`### ${delivery.name} [${delivery.executionStatus ?? 'draft'}]`);
+        parts.push(`**Delivery ID:** ${delivery.id}  |  **Rank:** ${delivery.priorityRank}`);
+        if (delivery.description) {
+            parts.push(`**Description:** ${delivery.description}`);
+        }
+        const deliveryIssues = issues.filter(i => i.deliveryId === delivery.id);
+        const workIssues = deliveryIssues.filter(i => i.issueType !== 'Context Group');
+        if (workIssues.length === 0) {
+            parts.push('**Issues:** none scoped yet');
+        }
+        else {
+            const statusCounts = new Map();
+            for (const issue of workIssues) {
+                statusCounts.set(issue.status, (statusCounts.get(issue.status) ?? 0) + 1);
+            }
+            const countParts = [];
+            for (const s of ['To Do', 'In Progress', 'Done', 'Blocked', 'In Review']) {
+                const count = statusCounts.get(s);
+                if (count !== undefined) {
+                    countParts.push(`${count} ${s}`);
+                }
+            }
+            parts.push(`**Issues (${countParts.join(', ')}):**`);
+        }
+        parts.push('');
+    }
+    parts.push('Do NOT poll. The daemon will send the next message when state changes.');
+    parts.push('');
+    return parts.join('\n');
+}
+/**
+ * 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 function buildWakeMessage(deliveries, issues, knownDeliveryIds) {
+    const parts = [];
+    parts.push('## New Work Available');
+    parts.push('');
+    const actionableDeliveries = deliveries.filter(d => isStatusAgentActionable(d.executionStatus ?? ''));
+    if (actionableDeliveries.length === 0) {
+        parts.push('No actionable deliveries at this time.');
+        parts.push('');
+        return parts.join('\n');
+    }
+    for (const delivery of actionableDeliveries) {
+        const isNew = !knownDeliveryIds.has(delivery.id);
+        const tag = isNew ? ' (NEW)' : '';
+        parts.push(`### ${delivery.name} [${delivery.executionStatus}]${tag}`);
+        parts.push(`**Delivery ID:** ${delivery.id}`);
+        if (delivery.stageDescription) {
+            parts.push(`**Stage directive:** ${delivery.stageDescription}`);
+        }
+        if (delivery.description) {
+            parts.push(`**Description:** ${delivery.description}`);
+        }
+        // Compact issue listing
+        const deliveryIssues = issues.filter(i => i.deliveryId === delivery.id);
+        const actionableIssues = deliveryIssues.filter(i => i.issueType !== 'Context Group');
+        if (actionableIssues.length > 0) {
+            const statusCounts = new Map();
+            for (const issue of actionableIssues) {
+                statusCounts.set(issue.status, (statusCounts.get(issue.status) ?? 0) + 1);
+            }
+            const countParts = [];
+            for (const s of ['To Do', 'In Progress', 'Done', 'Blocked', 'In Review']) {
+                const count = statusCounts.get(s);
+                if (count !== undefined) {
+                    countParts.push(`${count} ${s}`);
+                }
+            }
+            parts.push(`**Issues (${countParts.join(', ')}):**`);
+        }
+        const wakeContextGroups = deliveryIssues.filter(i => i.issueType === 'Context Group');
+        for (const issue of deliveryIssues) {
+            if (issue.issueType === 'Context Group') {
+                const children = deliveryIssues.filter(i => i.parentIssueId === issue.id);
+                const depsSuffix = issue.dependsOn && issue.dependsOn.length > 0
+                    ? ` [depends on: ${issue.dependsOn.map(depId => {
+                        const depCg = wakeContextGroups.find(cg => cg.id === depId);
+                        return depCg ? `"${depCg.title}"` : depId;
+                    }).join(', ')}]`
+                    : '';
+                if (children.length > 0) {
+                    const childSummaries = children.map(c => `${c.key} (${c.status})`).join(', ');
+                    parts.push(`  Context Group: "${issue.title}"${depsSuffix} -- children: ${childSummaries}`);
+                }
+                else {
+                    parts.push(`  Context Group: "${issue.title}"${depsSuffix}`);
+                }
+            }
+            else if (!issue.parentIssueId) {
+                parts.push(`  - ${issue.key}: ${issue.title} (${issue.status})`);
+            }
+        }
+        parts.push('');
+    }
+    parts.push('Do NOT poll for new deliveries. The daemon will send them to you directly.');
+    parts.push('');
+    return parts.join('\n');
+}
+export { buildPlanningPass1Prompt, buildPlanningPass2Prompt, buildPlanningCombinedPrompt } from './planning-prompt-builder.js';
+//# sourceMappingURL=focus-prompt-builder.js.map

package/dist/focus-prompt-builder.js.map

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

package/dist/focus-provisioning.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Persistent worktree provisioning for active focuses.
+ *
+ * Creates worktrees for active focuses that don't have one yet,
+ * adopts existing worktrees on disk, and rebases onto integration.
+ */
+import type { DaemonConfig, AgentRole } from './types.js';
+/**
+ * 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 declare function ensureFocusWorktrees(config: DaemonConfig, roles: Map<string, AgentRole>): Promise<void>;
+//# sourceMappingURL=focus-provisioning.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"focus-provisioning.d.ts","sourceRoot":"","sources":["../src/focus-provisioning.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAW1D;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAC5B,OAAO,CAAC,IAAI,CAAC,CAsGf"}