@telora/daemon 0.12.33

package/dist/strategy-lifecycle.js.map

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

package/dist/strategy-merge.d.ts

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

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

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

package/dist/strategy-merge.js

@@ -0,0 +1,371 @@
+/**
+ * Strategy branch merge logic.
+ *
+ * Handles merging a strategy's work branch into the integration branch,
+ * including workflow resolution and per-delivery git state reporting.
+ */
+import { 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 { getStrategyWorktree } from './strategy-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(`[strategy-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 strategy-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(`[strategy-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 strategy 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-strategy-merge-conflict-${deliveryId}` });
+        console.log(`[strategy-merge] Created merge conflict escalation for delivery "${deliveryName}"`);
+    }
+    catch (err) {
+        console.error(`[strategy-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(`[strategy-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(`[strategy-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(`[strategy-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(`[strategy-merge] reportGitState merged_to_integration failed for ${d.delivery_id}:`, err.message));
+            }
+        }
+        else {
+            console.log(`[strategy-merge] Merge retry still failing for branch ${branchName}: ${mergeResult.error ?? 'unknown'}`);
+            // Attempt fallback resolution agent if a worktree exists for this strategy
+            if (representative.strategy_id) {
+                const worktreeInfo = getStrategyWorktree(representative.strategy_id);
+                if (worktreeInfo) {
+                    console.log(`[strategy-merge] Spawning fallback resolution agent for branch ${branchName}`);
+                    // Merge integration back into the strategy 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 ?? [],
+                            strategyDescription: worktreeInfo.strategyName || 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(`[strategy-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(`[strategy-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, strategyName } = 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 strategy 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(`[strategy-merge] Sent merge conflict resolution request to team lead for "${strategyName}"`);
+        // 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(`[strategy-merge] Team lead resolved merge conflicts for "${strategyName}"`);
+                    return { resolved: true };
+                }
+            }
+        }
+        // Timeout expired
+        console.warn(`[strategy-merge] Team lead did not resolve merge conflicts within ${timeoutMs / 1000}s for "${strategyName}"`);
+        return { resolved: false, reason: `Resolution timeout (${timeoutMs / 1000}s)` };
+    }
+    finally {
+        teamState.resolvingMergeConflict = false;
+    }
+}
+/**
+ * Merge the strategy branch to integration.
+ *
+ * Uses the first delivery ID as the representative for merge operations
+ * (all deliveries share the same branch in the strategy model).
+ */
+export async function mergeStrategyBranch(config, teamState, sessionId, branchName, workedDeliveryIds) {
+    // Use first delivery as the representative for merge operations
+    const representativeDeliveryId = [...teamState.knownDeliveryIds][0];
+    if (!representativeDeliveryId) {
+        return { mergeSucceeded: false, exitReason: 'No deliveries to merge.' };
+    }
+    // Fetch workflow for merge operations (used only for conflict rollback stage lookup)
+    let workflow;
+    try {
+        workflow = await fetchEffectiveWorkflow(representativeDeliveryId);
+    }
+    catch (err) {
+        console.warn(`[strategy-executor] Failed to fetch workflow for merge, using fallback:`, err.message);
+        workflow = { id: 'fallback', stages: [] };
+    }
+    // ── Merge-back: sync integration into strategy branch before merging out ──
+    // Merge integration HEAD into the strategy 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(`[strategy-merge] Merge-back produced conflicts for "${teamState.strategyName}": ` +
+                `${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(`[strategy-merge] Conflict resolved by team lead for "${teamState.strategyName}", proceeding`);
+                }
+                else {
+                    // Team lead could not resolve -- escalate
+                    await escalateMergeConflict({
+                        organizationId: teamState.organizationId,
+                        sessionId,
+                        deliveryId: representativeDeliveryId,
+                        deliveryName: teamState.strategyName,
+                        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(`[strategy-merge] No active team lead for "${teamState.strategyName}", 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(`[strategy-merge] reportGitState resolving_conflict failed for ${deliveryId}:`, err.message));
+                    }
+                }
+                const fallbackResult = await spawnResolutionAgent({
+                    config,
+                    worktreePath,
+                    branchName,
+                    integrationBranch: config.integrationBranch,
+                    conflictFiles,
+                    strategyDescription: teamState.strategyName,
+                });
+                if (fallbackResult.success) {
+                    console.log(`[strategy-merge] Fallback resolution agent resolved conflicts for "${teamState.strategyName}", proceeding`);
+                }
+                else {
+                    await escalateMergeConflict({
+                        organizationId: teamState.organizationId,
+                        sessionId,
+                        deliveryId: representativeDeliveryId,
+                        deliveryName: teamState.strategyName,
+                        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(`[strategy-merge] Merge-back error for "${teamState.strategyName}": ${mergeBackResult.message}`);
+            return { mergeSucceeded: false, exitReason: mergeBackResult.message };
+        }
+        // status === 'clean' -- proceed to merge to integration
+        console.log(`[strategy-merge] Merge-back clean for "${teamState.strategyName}", proceeding to integration merge`);
+    }
+    const mergeOutcome = await mergeDeliveryBranch({
+        config,
+        branchName,
+        deliveryId: representativeDeliveryId,
+        deliveryName: teamState.strategyName,
+        organizationId: teamState.organizationId,
+        sessionId,
+        workflow,
+    });
+    // Report git state and merge commit SHA only for deliveries that were
+    // actually worked on (in coding status), not queued deliveries that never started.
+    // Use workedDeliveryIds if provided, otherwise fall back to all known deliveries.
+    const deliveryIdsForGitState = workedDeliveryIds
+        ? new Set(workedDeliveryIds)
+        : teamState.knownDeliveryIds;
+    if (mergeOutcome.mergeSucceeded) {
+        for (const deliveryId of deliveryIdsForGitState) {
+            if (!teamState.mergedDeliveryIds.has(deliveryId)) {
+                reportGitState(deliveryId, 'merged_to_integration').catch(err => console.warn(`[strategy-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(`[strategy-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(`[strategy-merge] reportMergeConflictState failed for ${deliveryId}:`, err.message));
+            }
+        }
+    }
+    return {
+        mergeSucceeded: mergeOutcome.mergeSucceeded,
+        exitReason: mergeOutcome.exitReason,
+    };
+}
+//# sourceMappingURL=strategy-merge.js.map

package/dist/strategy-merge.js.map

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

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

@@ -0,0 +1,62 @@
+/**
+ * Strategy team prompt builder.
+ *
+ * Constructs the prompt for the team lead agent with full strategy context
+ * including all deliveries, issues, and team execution instructions.
+ *
+ * Unlike the single-delivery prompt, this prompt gives the team lead
+ * visibility into ALL deliveries and their dependency ordering, and
+ * instructs it to use Agent Teams primitives for parallel execution.
+ *
+ * The prompt covers:
+ * - Worker auto-scaling and lifecycle (TEL-4)
+ * - Delivery stage progression (TEL-5)
+ * - Strategy completion and error handling (TEL-6)
+ * - Dynamic delivery pickup (TEL-10)
+ *
+ * Planning prompts have been extracted to planning-prompt-builder.ts
+ * and are re-exported here for backward compatibility.
+ */
+import type { AgentRole, StrategyDeliveryInfo, StrategyIssueInfo, StrategyExecutionConfig, PipelineConfig } from './types.js';
+import type { ProductContextDoc } from './queries/strategies.js';
+export interface DeploymentProfileSnapshotContext {
+    name: string;
+    inceptionPrompt: string | null;
+    guidelines: string | null;
+}
+export interface StrategyTeamPromptContext {
+    strategyId: string;
+    strategyName: string;
+    organizationId: string;
+    productId: string;
+    deliveries: StrategyDeliveryInfo[];
+    issues: StrategyIssueInfo[];
+    executionConfig: StrategyExecutionConfig;
+    pipelineConfig: PipelineConfig | null;
+    productContextDocs?: ProductContextDoc[];
+    deploymentProfileSnapshot?: DeploymentProfileSnapshotContext | null;
+    readOnly?: boolean;
+}
+/**
+ * Build the prompt for the strategy team lead agent.
+ */
+export declare function buildStrategyTeamPrompt(role: AgentRole, context: StrategyTeamPromptContext): 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: StrategyDeliveryInfo[], issues: StrategyIssueInfo[], knownDeliveryIds: Set<string>): string;
+/**
+ * Build a review directive for an active team.
+ *
+ * Sent via stdin when a user clicks "Review N" or when auto-review
+ * is triggered after all deliveries reach verify. The team lead
+ * examines code changes against scope and creates remediation issues
+ * or a new remediation delivery.
+ */
+export declare function buildReviewDirective(deliveries: StrategyDeliveryInfo[], issues: StrategyIssueInfo[]): string;
+export type { PlanningPass1Context, PlanningPass2Context } from './planning-prompt-builder.js';
+export { buildPlanningPass1Prompt, buildPlanningPass2Prompt, buildPlanningCombinedPrompt } from './planning-prompt-builder.js';
+//# sourceMappingURL=strategy-prompt-builder.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"strategy-prompt-builder.d.ts","sourceRoot":"","sources":["../src/strategy-prompt-builder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EACV,SAAS,EACT,oBAAoB,EACpB,iBAAiB,EACjB,uBAAuB,EACvB,cAAc,EACf,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,MAAM,WAAW,gCAAgC;IAC/C,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,MAAM,WAAW,yBAAyB;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAC5B,eAAe,EAAE,uBAAuB,CAAC;IACzC,cAAc,EAAE,cAAc,GAAG,IAAI,CAAC;IACtC,kBAAkB,CAAC,EAAE,iBAAiB,EAAE,CAAC;IACzC,yBAAyB,CAAC,EAAE,gCAAgC,GAAG,IAAI,CAAC;IACpE,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,yBAAyB,GACjC,MAAM,CA6ZR;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,oBAAoB,EAAE,EAClC,MAAM,EAAE,iBAAiB,EAAE,EAC3B,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,GAC5B,MAAM,CA4ER;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,oBAAoB,EAAE,EAClC,MAAM,EAAE,iBAAiB,EAAE,GAC1B,MAAM,CAyDR;AAMD,YAAY,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAC/F,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC"}