@telora/daemon 0.12.33

package/dist/delivery-lifecycle.js

@@ -0,0 +1,353 @@
+/**
+ * Delivery lifecycle - reusable functions for guard evaluation,
+ * stage transitions, and merge operations.
+ *
+ * Extracted from completion-handler.ts so that both the legacy
+ * per-delivery completion handler and the strategy team lead
+ * can use the same logic.
+ *
+ * Key functions:
+ * - evaluateAndTransition(): evaluate guards and determine next stage
+ * - mergeDeliveryBranch(): merge a branch to integration
+ * - advanceDeliveryStage(): update delivery to its next workflow stage
+ */
+import { updateDeliveryStatus, updateDeliveryMergeCommitSha, createEscalation, createTransitionEvaluation } from './supabase.js';
+import { mergeToIntegration } from './git.js';
+import { getStageByName, determineTransition } from './workflow-engine.js';
+import { evaluateGuardsAtTransition, executeTriggers, GuardEvaluationError } from './guard-engine.js';
+import { withRetry, ESCALATION_REASONS } from '@telora/daemon-core';
+// ── Guard evaluation (unified workflow system) ──────────────────────
+/**
+ * Evaluate guards at a stage transition for a delivery.
+ *
+ * This is the core guard evaluation logic extracted from completion-handler.ts.
+ * Can be called by:
+ * - The per-delivery completion handler (legacy)
+ * - The strategy team lead (after detecting delivery issue completion)
+ */
+export async function evaluateGuardsForDeliveryTransition(params) {
+    const { deliveryId, organizationId, workflowTransition, exitCode, policyFailureMode, deliveryName, sessionId, } = params;
+    const baseOutcome = {
+        blocked: false,
+        shouldMerge: false,
+        shouldTriggerRepoll: false,
+        sessionStatus: 'completed',
+        exitReason: '',
+    };
+    if (!workflowTransition) {
+        return baseOutcome;
+    }
+    try {
+        const guardResult = await evaluateGuardsAtTransition(deliveryId, organizationId, workflowTransition.id, exitCode);
+        // Log warnings (soft enforcement failures)
+        for (const warning of guardResult.warnings) {
+            console.warn(`[guard] Soft warning on "${deliveryName}": ` +
+                `guard "${warning.guard_name}" conditions not met`);
+        }
+        if (!guardResult.should_proceed) {
+            // Hard guard blocked the transition
+            console.log(`[guard] Transition blocked for "${deliveryName}": ` +
+                `${guardResult.blocks.length} hard guard(s) failed`);
+            // Execute blocking triggers
+            const triggerResult = await executeTriggers(deliveryId, organizationId, workflowTransition.id, guardResult.triggers_to_execute);
+            let exitReason = `Guard blocked: ${guardResult.blocks.map(b => b.guard_name).join(', ')}.`;
+            if (triggerResult.spawnedSessionIds.length > 0) {
+                exitReason += ` Spawned ${triggerResult.spawnedSessionIds.length} guard agent(s).`;
+            }
+            return {
+                blocked: true,
+                shouldMerge: false,
+                shouldTriggerRepoll: false,
+                sessionStatus: 'completed',
+                exitReason,
+            };
+        }
+        // All guards passed or only soft warnings -- execute pass/enter triggers
+        if (guardResult.triggers_to_execute.length > 0) {
+            await executeTriggers(deliveryId, organizationId, workflowTransition.id, guardResult.triggers_to_execute);
+        }
+    }
+    catch (err) {
+        const guardError = err instanceof GuardEvaluationError ? err : null;
+        const effectiveMode = resolveGuardFailureMode(policyFailureMode, guardError);
+        // Record evaluation error in audit trail
+        await recordGuardEvaluationError(err, guardError, deliveryId, organizationId, workflowTransition.id, effectiveMode);
+        if (effectiveMode === 'fail-closed') {
+            return await handleGuardFailClosed({
+                err: err,
+                guardError,
+                deliveryId,
+                deliveryName,
+                organizationId,
+                sessionId,
+                transitionId: workflowTransition.id,
+            });
+        }
+        // Fail-open: log and proceed
+        console.error(`[guard] GUARD EVALUATION FAILED for "${deliveryName}": ` +
+            `${err.message}. Proceeding without guard checks (fail-open).`);
+        return {
+            ...baseOutcome,
+            exitReason: `Warning: guard evaluation skipped due to error.`,
+        };
+    }
+    return baseOutcome;
+}
+// ── Stage advancement ───────────────────────────────────────────────
+/**
+ * Advance a delivery through its workflow stage.
+ *
+ * Given a delivery's current stage and workflow, determines the next stage,
+ * evaluates any guards on the transition, and updates the delivery status.
+ *
+ * Used by the strategy team lead when all issues in a delivery are completed.
+ */
+export async function advanceDeliveryStage(params) {
+    const { deliveryId, deliveryName, organizationId, workflow, currentStageId, exitCode, openIssueCount, sessionCount, policyFailureMode, sessionId, } = params;
+    // Determine transition via workflow engine
+    const transition = determineTransition({
+        workflow,
+        currentStageId,
+        exitCode,
+        openIssueCount,
+        attemptCount: sessionCount,
+        maxRetries: 5,
+    });
+    // Evaluate guards if there's a transition to a new stage
+    let guardOutcome = null;
+    if (transition.nextStage && transition.workflowTransition) {
+        guardOutcome = await evaluateGuardsForDeliveryTransition({
+            deliveryId,
+            organizationId,
+            workflowTransition: transition.workflowTransition,
+            exitCode,
+            policyFailureMode,
+            deliveryName,
+            sessionId,
+        });
+    }
+    // Determine final delivery status
+    let deliveryStatus;
+    let deliveryStageId;
+    let exitReason = transition.exitReason;
+    const guardBlocked = guardOutcome?.blocked ?? false;
+    if (guardBlocked) {
+        deliveryStatus = 'paused';
+        deliveryStageId = currentStageId;
+        exitReason = guardOutcome.exitReason;
+    }
+    else if (transition.nextStage) {
+        deliveryStatus = transition.nextStage.name;
+        deliveryStageId = transition.nextStage.id;
+    }
+    else {
+        // Staying on current stage means re-queuing
+        const queuedStage = getStageByName(workflow, 'queued');
+        deliveryStatus = queuedStage?.name ?? 'queued';
+        deliveryStageId = queuedStage?.id;
+    }
+    // Update delivery status
+    try {
+        await updateDeliveryStatus(deliveryId, deliveryStatus, deliveryStageId);
+        console.log(`Delivery "${deliveryName}" set to ${deliveryStatus}`);
+    }
+    catch (err) {
+        console.warn(`Failed to set delivery "${deliveryName}" to ${deliveryStatus}:`, err.message);
+    }
+    return {
+        advanced: transition.nextStage !== null && !guardBlocked,
+        deliveryStatus,
+        deliveryStageId,
+        guardBlocked,
+        shouldMerge: guardBlocked ? false : transition.shouldMerge,
+        exitReason,
+    };
+}
+// ── Merge operations ────────────────────────────────────────────────
+/**
+ * Merge a delivery's branch to the integration branch.
+ *
+ * Handles:
+ * - Merge to integration
+ * - Conflict escalation
+ * - Git state reporting
+ */
+export async function mergeDeliveryBranch(params) {
+    const { config, branchName, deliveryId, deliveryName, organizationId, sessionId, workflow } = params;
+    console.log(`Attempting to merge ${branchName} into ${config.integrationBranch}...`);
+    const onRollbackFailure = (details) => {
+        withRetry(() => createEscalation({
+            organizationId,
+            sessionId: sessionId ?? '',
+            issueId: null,
+            reasonType: ESCALATION_REASONS.ERROR_ENCOUNTERED,
+            description: `CRITICAL: Push failed AND rollback failed. Integration branch is corrupt.\n\n` +
+                `**Delivery:** ${deliveryName}\n` +
+                `**Branch:** ${details.branch}\n` +
+                `**Attempted rollback to:** ${details.attemptedRollbackRef}\n` +
+                `**Current HEAD:** ${details.currentHead}\n\n` +
+                `All merge operations are blocked until manual recovery.`,
+            whatWasTried: `Push to origin failed for ${details.branch}. Attempted rollback to ${details.attemptedRollbackRef} also failed.`,
+            helpNeeded: `Manually reset the branch: git reset --hard origin/${details.branch}. Then restart the daemon.`,
+        }), { maxAttempts: 3, label: 'escalation-rollback-failure' }).catch((escErr) => {
+            console.error(`CRITICAL: Failed to create escalation for rollback failure: ${escErr.message}`);
+        });
+    };
+    const mergeResult = await mergeToIntegration({ config, branchName, deliveryName, deliveryId, onRollbackFailure });
+    if (mergeResult.success) {
+        const exitReason = `Merged to ${config.integrationBranch}.`;
+        console.log(`Successfully merged ${branchName} to ${config.integrationBranch}`);
+        // Note: merged_to_integration git state is reported by the caller
+        // (mergeStrategyBranch) for all deliveries in the strategy to avoid duplicates.
+        // Persist the merge commit SHA on the delivery record (fire-and-forget)
+        if (mergeResult.commitSha) {
+            updateDeliveryMergeCommitSha(deliveryId, mergeResult.commitSha).catch(err => console.warn(`[mergeCommitSha] Failed to record merge commit SHA:`, err.message));
+        }
+        return { mergeSucceeded: true, exitReason, commitSha: mergeResult.commitSha };
+    }
+    // Handle merge conflicts
+    const conflictedFiles = mergeResult.conflictedFiles;
+    if (conflictedFiles && conflictedFiles.length > 0) {
+        const exitReason = `Agent completed but merge had conflicts in ${conflictedFiles.length} file(s). Escalated for resolution.`;
+        console.warn(`Merge conflict: ${conflictedFiles.join(', ')}`);
+        try {
+            await withRetry(() => createEscalation({
+                organizationId,
+                sessionId: sessionId ?? '',
+                issueId: null,
+                reasonType: ESCALATION_REASONS.ERROR_ENCOUNTERED,
+                description: `Merge conflict merging agent branch into integration.\n\n` +
+                    `**Delivery:** ${deliveryName}\n` +
+                    `**Source branch:** ${mergeResult.sourceBranch}\n` +
+                    `**Target branch:** ${mergeResult.targetBranch}\n` +
+                    `**Conflicted files:**\n${conflictedFiles.map(f => `- ${f}`).join('\n')}`,
+                whatWasTried: `Attempted automatic merge of ${branchName} into ${config.integrationBranch} after agent completed successfully.`,
+                helpNeeded: `Resolve the merge conflicts between ${mergeResult.sourceBranch} and ${mergeResult.targetBranch}, then re-queue the delivery.`,
+            }), { maxAttempts: 3, label: 'escalation-merge-conflict' });
+            console.log(`Created escalation for merge conflict`);
+        }
+        catch (escErr) {
+            console.error(`CRITICAL: Failed to create escalation for merge conflict after retries: ${escErr.message}. Delivery: "${deliveryName}"`);
+        }
+        const queuedStage = getStageByName(workflow, 'queued');
+        return {
+            mergeSucceeded: false,
+            exitReason,
+            overrideDeliveryStatus: queuedStage?.name ?? 'queued',
+            overrideDeliveryStageId: queuedStage?.id,
+        };
+    }
+    // General merge failure
+    const exitReason = `Merge failed: ${mergeResult.error}. Branch ${branchName} preserved for manual merge.`;
+    console.warn(`Merge to integration failed: ${mergeResult.error}`);
+    return { mergeSucceeded: false, exitReason };
+}
+// ── Guard failure helpers ───────────────────────────────────────────
+/**
+ * Resolve the effective failure mode for a guard evaluation error.
+ */
+function resolveGuardFailureMode(daemonMode, guardError) {
+    if (guardError?.hasHardEnforcementGuards) {
+        return 'fail-closed';
+    }
+    if (guardError?.fetchedGuards !== null && guardError?.fetchedGuards !== undefined) {
+        return 'fail-open';
+    }
+    return daemonMode;
+}
+/**
+ * Handle fail-closed for guard evaluation errors.
+ */
+async function handleGuardFailClosed(params) {
+    const { err, guardError, deliveryId, deliveryName, organizationId, sessionId, transitionId } = params;
+    const guardNames = guardError?.guardNames ?? [];
+    const guardInfo = guardNames.length > 0
+        ? ` Guards: ${guardNames.join(', ')}.`
+        : '';
+    console.error(`[guard] GUARD EVALUATION FAILED for "${deliveryName}": ` +
+        `${err.message}. Transition blocked per fail-closed configuration.${guardInfo}`);
+    const exitReason = `Guard evaluation failed, transition blocked per fail-closed configuration.${guardInfo}`;
+    try {
+        await updateDeliveryStatus(deliveryId, 'paused');
+    }
+    catch (statusErr) {
+        console.error(`[guard] Failed to pause delivery "${deliveryName}":`, statusErr.message);
+    }
+    try {
+        await withRetry(() => createEscalation({
+            organizationId,
+            sessionId: sessionId ?? '',
+            issueId: null,
+            reasonType: ESCALATION_REASONS.ERROR_ENCOUNTERED,
+            description: `Guard evaluation failed (fail-closed). Transition blocked.\n\n` +
+                `**Delivery:** ${deliveryName}\n` +
+                `**Transition:** ${transitionId}\n` +
+                `**Error:** ${err.message}\n` +
+                (guardNames.length > 0 ? `**Affected guards:** ${guardNames.join(', ')}\n` : '') +
+                `\nThe delivery has been paused. Review the error and re-queue when resolved.`,
+            whatWasTried: `Guard evaluation at stage transition failed after retries. ` +
+                `Fail-closed mode is active${guardError?.hasHardEnforcementGuards ? ' (hard enforcement guards detected)' : ''}.`,
+            helpNeeded: `Investigate the guard evaluation failure, resolve the underlying issue, then re-queue the delivery.`,
+        }), { maxAttempts: 3, label: 'escalation-guard-fail-closed' });
+        console.log(`[guard] Created escalation for guard evaluation failure (fail-closed)`);
+    }
+    catch (escErr) {
+        console.error(`CRITICAL: Failed to create escalation for guard fail-closed after retries: ${escErr.message}. ` +
+            `Delivery: "${deliveryName}"`);
+    }
+    return {
+        blocked: true,
+        shouldMerge: false,
+        shouldTriggerRepoll: false,
+        sessionStatus: 'completed',
+        exitReason,
+    };
+}
+/**
+ * Record guard evaluation errors in the audit trail (best-effort).
+ */
+async function recordGuardEvaluationError(err, guardError, deliveryId, organizationId, transitionId, effectiveMode) {
+    const errorDetails = {
+        error: err.message,
+        failure_mode: effectiveMode,
+    };
+    if (guardError?.fetchedGuards && guardError.fetchedGuards.length > 0) {
+        for (const guard of guardError.fetchedGuards) {
+            try {
+                await createTransitionEvaluation({
+                    organization_id: organizationId,
+                    entity_type: 'delivery',
+                    entity_id: deliveryId,
+                    transition_id: transitionId,
+                    guard_id: guard.id,
+                    result: 'error',
+                    blocked: effectiveMode === 'fail-closed',
+                    enforcement_level: guard.enforcement,
+                    evaluation_details: errorDetails,
+                });
+            }
+            catch (auditErr) {
+                console.warn(`[guard] Failed to record evaluation error for "${guard.name}":`, auditErr.message);
+            }
+        }
+    }
+    else {
+        try {
+            await createTransitionEvaluation({
+                organization_id: organizationId,
+                entity_type: 'delivery',
+                entity_id: deliveryId,
+                transition_id: transitionId,
+                guard_id: null,
+                result: 'error',
+                blocked: effectiveMode === 'fail-closed',
+                enforcement_level: null,
+                evaluation_details: errorDetails,
+            });
+        }
+        catch (auditErr) {
+            console.warn(`[guard] Failed to record evaluation error in audit trail:`, auditErr.message);
+        }
+    }
+}
+//# sourceMappingURL=delivery-lifecycle.js.map

package/dist/delivery-lifecycle.js.map

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

package/dist/delivery-merge.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Delivery branch merge operations.
+ *
+ * Handles merging a delivery's branch to the integration branch,
+ * conflict escalation, and git state reporting.
+ */
+import type { MergeOutcome, DeliveryBranchMergeParams } from './delivery-lifecycle.js';
+/**
+ * Merge a delivery's branch to the integration branch.
+ *
+ * Handles:
+ * - Merge to integration
+ * - Conflict escalation
+ * - Git state reporting
+ */
+export declare function mergeDeliveryBranch(params: DeliveryBranchMergeParams): Promise<MergeOutcome>;
+//# sourceMappingURL=delivery-merge.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"delivery-merge.d.ts","sourceRoot":"","sources":["../src/delivery-merge.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,KAAK,EAAE,YAAY,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAEvF;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,yBAAyB,GAChC,OAAO,CAAC,YAAY,CAAC,CAqFvB"}

package/dist/delivery-merge.js

@@ -0,0 +1,89 @@
+/**
+ * Delivery branch merge operations.
+ *
+ * Handles merging a delivery's branch to the integration branch,
+ * conflict escalation, and git state reporting.
+ */
+import { updateDeliveryMergeCommitSha, createEscalation } from './supabase.js';
+import { mergeToIntegration } from './git.js';
+import { getStageByName } from './workflow-engine.js';
+import { withRetry, ESCALATION_REASONS } from '@telora/daemon-core';
+/**
+ * Merge a delivery's branch to the integration branch.
+ *
+ * Handles:
+ * - Merge to integration
+ * - Conflict escalation
+ * - Git state reporting
+ */
+export async function mergeDeliveryBranch(params) {
+    const { config, branchName, deliveryId, deliveryName, organizationId, sessionId, workflow } = params;
+    console.log(`Attempting to merge ${branchName} into ${config.integrationBranch}...`);
+    const onRollbackFailure = (details) => {
+        withRetry(() => createEscalation({
+            organizationId,
+            sessionId: sessionId ?? '',
+            issueId: null,
+            reasonType: ESCALATION_REASONS.ERROR_ENCOUNTERED,
+            description: `CRITICAL: Push failed AND rollback failed. Integration branch is corrupt.\n\n` +
+                `**Delivery:** ${deliveryName}\n` +
+                `**Branch:** ${details.branch}\n` +
+                `**Attempted rollback to:** ${details.attemptedRollbackRef}\n` +
+                `**Current HEAD:** ${details.currentHead}\n\n` +
+                `All merge operations are blocked until manual recovery.`,
+            whatWasTried: `Push to origin failed for ${details.branch}. Attempted rollback to ${details.attemptedRollbackRef} also failed.`,
+            helpNeeded: `Manually reset the branch: git reset --hard origin/${details.branch}. Then restart the daemon.`,
+        }), { maxAttempts: 3, label: 'escalation-rollback-failure' }).catch((escErr) => {
+            console.error(`CRITICAL: Failed to create escalation for rollback failure: ${escErr.message}`);
+        });
+    };
+    const mergeResult = await mergeToIntegration({ config, branchName, deliveryName, deliveryId, onRollbackFailure });
+    if (mergeResult.success) {
+        const exitReason = `Merged to ${config.integrationBranch}.`;
+        console.log(`Successfully merged ${branchName} to ${config.integrationBranch}`);
+        // Note: merged_to_integration git state is reported by the caller
+        // (mergeStrategyBranch) for all deliveries in the strategy to avoid duplicates.
+        // Persist the merge commit SHA on the delivery record (fire-and-forget)
+        if (mergeResult.commitSha) {
+            updateDeliveryMergeCommitSha(deliveryId, mergeResult.commitSha).catch(err => console.warn(`[mergeCommitSha] Failed to record merge commit SHA:`, err.message));
+        }
+        return { mergeSucceeded: true, exitReason, commitSha: mergeResult.commitSha };
+    }
+    // Handle merge conflicts
+    const conflictedFiles = mergeResult.conflictedFiles;
+    if (conflictedFiles && conflictedFiles.length > 0) {
+        const exitReason = `Agent completed but merge had conflicts in ${conflictedFiles.length} file(s). Escalated for resolution.`;
+        console.warn(`Merge conflict: ${conflictedFiles.join(', ')}`);
+        try {
+            await withRetry(() => createEscalation({
+                organizationId,
+                sessionId: sessionId ?? '',
+                issueId: null,
+                reasonType: ESCALATION_REASONS.ERROR_ENCOUNTERED,
+                description: `Merge conflict merging agent branch into integration.\n\n` +
+                    `**Delivery:** ${deliveryName}\n` +
+                    `**Source branch:** ${mergeResult.sourceBranch}\n` +
+                    `**Target branch:** ${mergeResult.targetBranch}\n` +
+                    `**Conflicted files:**\n${conflictedFiles.map(f => `- ${f}`).join('\n')}`,
+                whatWasTried: `Attempted automatic merge of ${branchName} into ${config.integrationBranch} after agent completed successfully.`,
+                helpNeeded: `Resolve the merge conflicts between ${mergeResult.sourceBranch} and ${mergeResult.targetBranch}, then re-queue the delivery.`,
+            }), { maxAttempts: 3, label: 'escalation-merge-conflict' });
+            console.log(`Created escalation for merge conflict`);
+        }
+        catch (escErr) {
+            console.error(`CRITICAL: Failed to create escalation for merge conflict after retries: ${escErr.message}. Delivery: "${deliveryName}"`);
+        }
+        const queuedStage = getStageByName(workflow, 'queued');
+        return {
+            mergeSucceeded: false,
+            exitReason,
+            overrideDeliveryStatus: queuedStage?.name ?? 'queued',
+            overrideDeliveryStageId: queuedStage?.id,
+        };
+    }
+    // General merge failure
+    const exitReason = `Merge failed: ${mergeResult.error}. Branch ${branchName} preserved for manual merge.`;
+    console.warn(`Merge to integration failed: ${mergeResult.error}`);
+    return { mergeSucceeded: false, exitReason };
+}
+//# sourceMappingURL=delivery-merge.js.map

package/dist/delivery-merge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"delivery-merge.js","sourceRoot":"","sources":["../src/delivery-merge.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,4BAA4B,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAGpE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,MAAiC;IAEjC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IACrG,OAAO,CAAC,GAAG,CAAC,uBAAuB,UAAU,SAAS,MAAM,CAAC,iBAAiB,KAAK,CAAC,CAAC;IAErF,MAAM,iBAAiB,GAAG,CAAC,OAA8E,EAAE,EAAE;QAC3G,SAAS,CACP,GAAG,EAAE,CAAC,gBAAgB,CAAC;YACrB,cAAc;YACd,SAAS,EAAE,SAAS,IAAI,EAAE;YAC1B,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,kBAAkB,CAAC,iBAAiB;YAChD,WAAW,EAAE,+EAA+E;gBAC1F,iBAAiB,YAAY,IAAI;gBACjC,eAAe,OAAO,CAAC,MAAM,IAAI;gBACjC,8BAA8B,OAAO,CAAC,oBAAoB,IAAI;gBAC9D,qBAAqB,OAAO,CAAC,WAAW,MAAM;gBAC9C,yDAAyD;YAC3D,YAAY,EAAE,6BAA6B,OAAO,CAAC,MAAM,2BAA2B,OAAO,CAAC,oBAAoB,eAAe;YAC/H,UAAU,EAAE,sDAAsD,OAAO,CAAC,MAAM,4BAA4B;SAC7G,CAAC,EACF,EAAE,WAAW,EAAE,CAAC,EAAE,KAAK,EAAE,6BAA6B,EAAE,CACzD,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE;YACjB,OAAO,CAAC,KAAK,CAAC,+DAAgE,MAAgB,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5G,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,WAAW,GAAgB,MAAM,kBAAkB,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAE/H,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;QACxB,MAAM,UAAU,GAAG,aAAa,MAAM,CAAC,iBAAiB,GAAG,CAAC;QAC5D,OAAO,CAAC,GAAG,CAAC,uBAAuB,UAAU,OAAO,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAChF,kEAAkE;QAClE,gFAAgF;QAEhF,wEAAwE;QACxE,IAAI,WAAW,CAAC,SAAS,EAAE,CAAC;YAC1B,4BAA4B,CAAC,UAAU,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAC1E,OAAO,CAAC,IAAI,CAAC,qDAAqD,EAAG,GAAa,CAAC,OAAO,CAAC,CAC5F,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,CAAC,SAAS,EAAE,CAAC;IAChF,CAAC;IAED,yBAAyB;IACzB,MAAM,eAAe,GAAG,WAAW,CAAC,eAAe,CAAC;IACpD,IAAI,eAAe,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClD,MAAM,UAAU,GAAG,8CAA8C,eAAe,CAAC,MAAM,qCAAqC,CAAC;QAC7H,OAAO,CAAC,IAAI,CAAC,mBAAmB,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE9D,IAAI,CAAC;YACH,MAAM,SAAS,CACb,GAAG,EAAE,CAAC,gBAAgB,CAAC;gBACrB,cAAc;gBACd,SAAS,EAAE,SAAS,IAAI,EAAE;gBAC1B,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,kBAAkB,CAAC,iBAAiB;gBAChD,WAAW,EAAE,2DAA2D;oBACtE,iBAAiB,YAAY,IAAI;oBACjC,sBAAsB,WAAW,CAAC,YAAY,IAAI;oBAClD,sBAAsB,WAAW,CAAC,YAAY,IAAI;oBAClD,0BAA0B,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAC3E,YAAY,EAAE,gCAAgC,UAAU,SAAS,MAAM,CAAC,iBAAiB,sCAAsC;gBAC/H,UAAU,EAAE,uCAAuC,WAAW,CAAC,YAAY,QAAQ,WAAW,CAAC,YAAY,+BAA+B;aAC3I,CAAC,EACF,EAAE,WAAW,EAAE,CAAC,EAAE,KAAK,EAAE,2BAA2B,EAAE,CACvD,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;QACvD,CAAC;QAAC,OAAO,MAAM,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,CAAC,2EAA4E,MAAgB,CAAC,OAAO,gBAAgB,YAAY,GAAG,CAAC,CAAC;QACrJ,CAAC;QAED,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACvD,OAAO;YACL,cAAc,EAAE,KAAK;YACrB,UAAU;YACV,sBAAsB,EAAE,WAAW,EAAE,IAAI,IAAI,QAAQ;YACrD,uBAAuB,EAAE,WAAW,EAAE,EAAE;SACzC,CAAC;IACJ,CAAC;IAED,wBAAwB;IACxB,MAAM,UAAU,GAAG,iBAAiB,WAAW,CAAC,KAAK,YAAY,UAAU,8BAA8B,CAAC;IAC1G,OAAO,CAAC,IAAI,CAAC,gCAAgC,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC;IAClE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;AAC/C,CAAC"}

package/dist/dependency-resolver.d.ts

@@ -0,0 +1,77 @@
+/**
+ * Dependency resolution for the task DAG.
+ *
+ * Extracted from task-dag-builder.ts. Contains functions that analyze
+ * and resolve task dependencies, including cross-delivery dependencies,
+ * CG-level dependencies, and file overlap detection.
+ *
+ * Pure functions only (no side effects, no API calls).
+ *
+ * Dependency rules:
+ * 1. Delivery ordering: issues in delivery N are blocked by issues in delivery N-1
+ *    (respects priorityRank ordering)
+ * 2. Within a delivery: issues under the same Context Group can run in parallel
+ *    unless they share relevant files
+ * 3. File overlap detection: if two issues from different deliveries share files,
+ *    the lower-priority delivery's issue is blocked by the higher-priority one
+ * 4. Context Groups themselves can run in parallel unless they share relevant files
+ */
+import type { TaskNode, StrategyDeliveryInfo, StrategyIssueInfo } from './types.js';
+/**
+ * Parse relevant files from a newline-delimited string into a set of normalized paths.
+ * Supports glob patterns -- for overlap detection, we treat the base path as the key.
+ */
+export declare function parseRelevantFiles(relevantFiles: string | null): Set<string>;
+/**
+ * Check if two sets of file paths have any overlap.
+ * An overlap means the two issues touch the same files and should not
+ * be worked on in parallel.
+ */
+export declare function hasFileOverlap(filesA: Set<string>, filesB: Set<string>): boolean;
+/**
+ * Add cross-delivery dependencies.
+ *
+ * For each delivery after the first, its issues are blocked by the
+ * issues in the immediately preceding delivery. This ensures deliveries
+ * execute in priority order while allowing parallelism within a delivery.
+ *
+ * We also check for file overlap across non-adjacent deliveries.
+ */
+export declare function addCrossDeliveryDependencies(nodes: Map<string, TaskNode>, sortedDeliveries: StrategyDeliveryInfo[], issuesByDelivery: Map<string, StrategyIssueInfo[]>, _issueDeliveryRank: Map<string, number>): void;
+/**
+ * Add CG-level dependency enforcement within each delivery.
+ *
+ * For each Context Group that has a non-null `dependsOn` array,
+ * all child issues (Tasks/Bugs) under this CG are blocked by
+ * ALL child issues under each dependency CG. This creates a
+ * CG-level DAG: dependent CGs' issues can't start until
+ * dependency CGs' issues are all complete.
+ */
+export declare function addCGDependencies(nodes: Map<string, TaskNode>, sortedDeliveries: StrategyDeliveryInfo[], issuesByDelivery: Map<string, StrategyIssueInfo[]>, _contextGroups: Map<string, StrategyIssueInfo>): void;
+/**
+ * Compute CG execution waves for a delivery using topological sort.
+ * Wave 0 = CGs with no dependencies (parallelizable)
+ * Wave N = CGs whose dependencies are all in waves < N
+ * Returns Map<cgId, waveNumber>
+ *
+ * @throws Error if a cycle is detected in the CG dependency graph
+ */
+export declare function getCGExecutionWaves(issues: StrategyIssueInfo[], deliveryId: string): Map<string, number>;
+/**
+ * Add file overlap dependencies within the same delivery.
+ *
+ * Within a delivery, issues that share relevant files should run sequentially.
+ * Issues under the same context group with no file overlap can run in parallel.
+ */
+export declare function addFileOverlapDependencies(nodes: Map<string, TaskNode>, sortedDeliveries: StrategyDeliveryInfo[], issuesByDelivery: Map<string, StrategyIssueInfo[]>, contextGroups: Map<string, StrategyIssueInfo>): void;
+/**
+ * Add CG-level dependency enforcement for a single delivery's issues.
+ * Used by addIssuesToDAG for dynamically added deliveries.
+ */
+export declare function addCGDependenciesForDelivery(nodes: Map<string, TaskNode>, delivery: StrategyDeliveryInfo, issues: StrategyIssueInfo[], _contextGroups: Map<string, StrategyIssueInfo>): void;
+/**
+ * Add file-overlap dependencies within a single delivery's issues.
+ * Used by addIssuesToDAG for dynamically added deliveries.
+ */
+export declare function addFileOverlapForDelivery(nodes: Map<string, TaskNode>, issues: StrategyIssueInfo[], contextGroups: Map<string, StrategyIssueInfo>): void;
+//# sourceMappingURL=dependency-resolver.d.ts.map

package/dist/dependency-resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dependency-resolver.d.ts","sourceRoot":"","sources":["../src/dependency-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EACV,QAAQ,EACR,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAIpB;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,CAmB5E;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,OAAO,CAYhF;AAID;;;;;;;;GAQG;AACH,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,EAC5B,gBAAgB,EAAE,oBAAoB,EAAE,EACxC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,EAAE,CAAC,EAClD,kBAAkB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,IAAI,CA4BN;AAID;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,EAC5B,gBAAgB,EAAE,oBAAoB,EAAE,EACxC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,EAAE,CAAC,EAClD,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAC7C,IAAI,CAyCN;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,iBAAiB,EAAE,EAC3B,UAAU,EAAE,MAAM,GACjB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAyErB;AAID;;;;;GAKG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,EAC5B,gBAAgB,EAAE,oBAAoB,EAAE,EACxC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,EAAE,CAAC,EAClD,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAC5C,IAAI,CAmCN;AAID;;;GAGG;AACH,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,EAC5B,QAAQ,EAAE,oBAAoB,EAC9B,MAAM,EAAE,iBAAiB,EAAE,EAC3B,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAC7C,IAAI,CAqCN;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,EAC5B,MAAM,EAAE,iBAAiB,EAAE,EAC3B,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAC5C,IAAI,CAgCN"}