@telora/daemon 0.21.26 → 0.21.81

package/dist/merge-back-loop.js

@@ -1,498 +0,0 @@
-/**
- * Continuous merge-back loop tick.
- *
- * Observes focus-branch state and merges to integration when safe.
- * Adds a state-driven recovery path on top of the existing event-driven
- * merge-back in focus-completion.handleTeamCompletion: any branch that
- * ends up ahead of integration -- whether because the team-exit event
- * was missed, the agent role was cleared mid-flight, the daemon
- * restarted, or any other reason -- eventually gets merged here.
- *
- * Per product, per focus-branch ahead of integration:
- *   - Skip if isWorktreeBeingWritten reports active.
- *   - Skip if the worktree has uncommitted changes (covered by primitive,
- *     but checked explicitly so the skip reason is logged at debug).
- *   - Skip if a pending merge-conflict escalation exists for this branch.
- *   - Otherwise: call mergeFocusBranch with a minimal synthetic teamState
- *     and let the existing escalateMergeConflict path fire on failure.
- *
- * Stuck-branch escalation (Delivery 4) extends this tick with per-branch
- * attempt tracking and creates 'stuck_focus_branch' escalations when a
- * branch sits ahead of integration past a configurable threshold.
- *
- * @module merge-back-loop
- */
-import { branchHasUnmergedCommits, worktreeHasUncommittedChanges } from './worktree/index.js';
-import { runGitSync } from './git/index.js';
-import { configForProduct } from './config.js';
-import { mergeFocusBranch as defaultMergeFocusBranch } from './focus-merge.js';
-import { getActiveFocuses } from './queries/deliveries.js';
-import { getFocusDeliveries as defaultGetFocusDeliveries } from './queries/focuses.js';
-import { listPendingEscalations as defaultListPendingEscalations, markEscalationResolved as defaultMarkEscalationResolved } from './queries/issues.js';
-import { fileEscalationIdempotent as defaultFileEscalationIdempotent, } from './queries/escalation-suppression.js';
-import { focusBlockageCauseKey } from './queries/cause-key.js';
-import { getAllFocusWorktrees } from './focus-worktree-state.js';
-import { isWorktreeBeingWritten as defaultIsWorktreeBeingWritten } from './worktree/index.js';
-import { ESCALATION_REASONS, ESCALATION_DISPOSITIONS, loadEnvConfig } from '@telora/daemon-core';
-import { createLogger } from './log.js';
-const log = createLogger({ module: 'merge-back-loop' });
-// ── Stuck-branch escalation kind (Delivery 4) ─────────────────────────
-export const STUCK_FOCUS_BRANCH_KIND = 'stuck_focus_branch';
-const branchAttempts = new Map();
-/** Reset attempt tracking — tests use this to start from a clean slate. */
-export function __resetMergeBackAttemptsForTesting() {
-    branchAttempts.clear();
-}
-/** Read the attempt state for a branch (for tests / introspection). */
-export function getBranchAttemptState(branchName) {
-    return branchAttempts.get(branchName);
-}
-function recordSuccess(branchName, now) {
-    const existing = branchAttempts.get(branchName) ?? {
-        lastSuccessAt: null,
-        lastFailureAt: null,
-        lastFailureReason: null,
-    };
-    branchAttempts.set(branchName, { ...existing, lastSuccessAt: now });
-}
-function recordFailure(branchName, now, reason) {
-    const existing = branchAttempts.get(branchName) ?? {
-        lastSuccessAt: null,
-        lastFailureAt: null,
-        lastFailureReason: null,
-    };
-    branchAttempts.set(branchName, { ...existing, lastFailureAt: now, lastFailureReason: reason });
-}
-function readStuckBranchThresholdMs(env) {
-    // Sourced from the typed env-config (validated at startup; default 24h).
-    return loadEnvConfig(env).TELORA_STUCK_BRANCH_THRESHOLD_HOURS * 3_600_000;
-}
-/**
- * Read the unix-epoch milliseconds timestamp of the oldest commit on
- * `branchName` not yet present on `targetBranch`. Returns null if there
- * are no unmerged commits or the git invocation fails.
- */
-export function getOldestUnmergedCommitMs(branchName, targetBranch, repoPath) {
-    const result = runGitSync(['log', '--format=%ct', `${targetBranch}..${branchName}`], repoPath);
-    if (!result.success)
-        return null;
-    const lines = result.output.trim().split('\n').filter(Boolean);
-    if (lines.length === 0)
-        return null;
-    // git log lists newest-first; the last line is the oldest commit.
-    const seconds = Number.parseInt(lines[lines.length - 1], 10);
-    if (!Number.isFinite(seconds) || Number.isNaN(seconds))
-        return null;
-    return seconds * 1000;
-}
-/**
- * Enumerate focus branches with commits ahead of integration.
- *
- * Combines getActiveFocuses (for org/name/readOnly context) with the
- * in-memory worktree state (for branchName + worktreePath). Returns one
- * entry per focus whose branch has unmerged commits.
- */
-export async function defaultEnumerateFocusBranchesAhead(config) {
-    const out = [];
-    const worktrees = getAllFocusWorktrees();
-    for (const product of config.products) {
-        const pc = configForProduct(config, product);
-        let focuses;
-        try {
-            focuses = await getActiveFocuses(pc.organizationId, product.id);
-        }
-        catch (err) {
-            log.warn(`[merge-back-loop] getActiveFocuses failed for product ${product.id}:`, err.message);
-            continue;
-        }
-        for (const focus of focuses) {
-            const wt = worktrees.get(focus.focus_id);
-            if (!wt)
-                continue;
-            const ahead = branchHasUnmergedCommits(wt.branchName, pc.integrationBranch, pc.repoPath);
-            if (!ahead)
-                continue;
-            out.push({
-                focusId: focus.focus_id,
-                focusName: focus.focus_name,
-                organizationId: pc.organizationId,
-                productId: product.id,
-                branchName: wt.branchName,
-                worktreePath: wt.worktreePath,
-                repoPath: pc.repoPath,
-                pipelineConfig: focus.pipeline_config ?? null,
-                readOnly: focus.read_only,
-            });
-        }
-    }
-    return out;
-}
-function defaultDeps() {
-    return {
-        enumerateFocusBranchesAhead: defaultEnumerateFocusBranchesAhead,
-        isWorktreeBeingWritten: defaultIsWorktreeBeingWritten,
-        worktreeHasUncommittedChanges,
-        listPendingEscalations: defaultListPendingEscalations,
-        markEscalationResolved: defaultMarkEscalationResolved,
-        fileEscalation: defaultFileEscalationIdempotent,
-        mergeFocusBranch: defaultMergeFocusBranch,
-        getFocusDeliveries: defaultGetFocusDeliveries,
-        getOldestUnmergedCommitMs,
-        now: () => Date.now(),
-    };
-}
-/**
- * Find a pending escalation matching a kind and branch name.
- * Uses the new metadata.branch_name field when present; falls back to
- * scanning description strings for backward compatibility with rows
- * created before the metadata column existed.
- */
-function findPendingEscalationForBranch(pending, kind, branchName) {
-    for (const e of pending) {
-        const md = e.metadata ?? null;
-        const branchFromMd = md && typeof md === 'object' ? md.branch_name : undefined;
-        if (e.escalationKind === kind && branchFromMd === branchName) {
-            return { id: e.id };
-        }
-        // Fallback for legacy rows without escalationKind/metadata.
-        if (e.escalationKind == null &&
-            kind === STUCK_FOCUS_BRANCH_KIND &&
-            typeof e.description === 'string' &&
-            e.description.includes(`Branch: ${branchName}`)) {
-            return { id: e.id };
-        }
-    }
-    return null;
-}
-/**
- * Find any pending merge-conflict escalation for this branch.
- * Old-style rows do not carry escalationKind; they're detected via the
- * description prefix used by escalateMergeConflict (focus-merge.ts:69).
- */
-function findPendingConflictForBranch(pending, branchName) {
-    for (const e of pending) {
-        if (e.reasonType === ESCALATION_REASONS.ERROR_ENCOUNTERED &&
-            typeof e.description === 'string' &&
-            e.description.includes(`Source branch:** ${branchName}`)) {
-            return { id: e.id };
-        }
-    }
-    return null;
-}
-/**
- * Build a minimal FocusTeamState shape that mergeFocusBranch can consume.
- * Many fields are unused by mergeFocusBranch's read-path; they default to
- * empty/null so the synthetic state stays observably distinct from real
- * in-flight teams.
- */
-function buildSyntheticTeamState(info, knownDeliveryIds) {
-    return {
-        focusId: info.focusId,
-        focusName: info.focusName,
-        roleId: '',
-        roleName: 'merge-back-loop',
-        organizationId: info.organizationId,
-        productId: info.productId,
-        executionConfig: { maxWorkers: 0, idlePollIntervalMs: 0, activePollIntervalMs: 0 },
-        pipelineConfig: info.pipelineConfig,
-        startedAt: new Date(),
-        phase: 'terminated',
-        knownDeliveryIds,
-        mergedDeliveryIds: new Set(),
-        planningPhase: false,
-        leadSessionId: null,
-        leadPid: null,
-        leadStdin: null,
-        branchName: info.branchName,
-        worktreePath: info.worktreePath,
-        integrationBaseSha: null,
-        reviewSpawnTip: null,
-        deliveryStageIds: new Map(),
-        resolvingMergeConflict: false,
-        shutdownReason: null,
-        readOnly: info.readOnly,
-        sessionType: 'coding',
-        lineage: 'coding',
-        completionDetector: null,
-        claudeSessionId: null,
-        lastProgressSnapshot: null,
-        noProgressCycles: 0,
-        commitNudgeAttempts: 0,
-        lastConsumedDirectiveHash: null,
-    };
-}
-/**
- * Statuses that mark deliveries as worked-on (ready for git state REPORTING).
- *
- * 'done' is included so focuses whose deliveries all reached done before the
- * branch was merged still get propagated. Without 'done' the merge-back loop
- * skips the focus with "no worked deliveries" and the branch stays stranded.
- *
- * NOTE: this set is REPORTING-only (per-delivery git-state telemetry inside
- * mergeFocusBranch). It is deliberately distinct from MERGE_ELIGIBLE_STATUSES:
- * 'coding' is worked-on for reporting but NOT a merge trigger, so unreviewed
- * coding-status code cannot reach integration ahead of the review gate.
- */
-const WORKED_STATUSES = new Set(['coding', 'verify', 'done']);
-/**
- * Statuses that make a focus branch ELIGIBLE to merge to integration.
- *
- * A delivery only becomes mergeable once it has passed the dev-complete bar:
- * `verify` (awaiting the review gate) or `done` (already approved). `coding` is
- * intentionally EXCLUDED so the merge-back loop never pushes unreviewed
- * coding-status work to integration before the review gate runs against it.
- * Separating this from WORKED_STATUSES keeps git-state reporting (which still
- * marks coding deliveries worked-on) decoupled from the merge decision.
- */
-const MERGE_ELIGIBLE_STATUSES = new Set(['verify', 'done']);
-/**
- * Build a `whatWasTried` summary string for stuck-branch escalations.
- */
-function summarizeAttempts(state) {
-    if (!state)
-        return 'No merge attempts recorded since daemon startup.';
-    const parts = [];
-    if (state.lastSuccessAt) {
-        parts.push(`last success at ${new Date(state.lastSuccessAt).toISOString()}`);
-    }
-    if (state.lastFailureAt) {
-        parts.push(`last failure at ${new Date(state.lastFailureAt).toISOString()}: ${state.lastFailureReason ?? 'unknown'}`);
-    }
-    if (parts.length === 0)
-        return 'No merge attempts recorded since daemon startup.';
-    return parts.join('; ');
-}
-/**
- * Decide whether to file a stuck-branch escalation for this branch.
- *
- * Conditions (all must hold):
- *   - branch has at least one unmerged commit (already guaranteed by enumerate)
- *   - oldest unmerged commit is older than threshold
- *   - worktree is NOT being written
- *   - no successful merge attempt has been recorded within the threshold window
- *   - no open OR dismissed stuck_focus_branch escalation carries this branch's
- *     cause key (idempotency + dismissal memory, enforced by the shared gate)
- */
-async function maybeFileStuckBranchEscalation(info, oldestUnmergedMs, worktreeActive, thresholdMs, now, fileEscalation) {
-    if (worktreeActive)
-        return;
-    if (oldestUnmergedMs == null)
-        return;
-    if (now - oldestUnmergedMs <= thresholdMs)
-        return;
-    const state = branchAttempts.get(info.branchName);
-    if (state?.lastSuccessAt && now - state.lastSuccessAt <= thresholdMs)
-        return;
-    // Per-branch cause key: one open row per stuck branch, and a dismissed one keeps
-    // it silent until the branch merges (dedup + dismissal memory in one gate). The
-    // pending-list dedup this replaced saw only OPEN rows, so a dismissal re-filed
-    // every 30s tick until merge -- the incident pattern this closes.
-    const causeKey = focusBlockageCauseKey(STUCK_FOCUS_BRANCH_KIND, info.focusId, info.branchName);
-    const ageHours = Math.floor((now - oldestUnmergedMs) / 3_600_000);
-    const description = `Focus branch sat ahead of integration for ~${ageHours}h with no successful merge.\n\n` +
-        `**Focus:** ${info.focusName}\n` +
-        `**Branch:** ${info.branchName}\n` +
-        `**Oldest unmerged commit:** ${new Date(oldestUnmergedMs).toISOString()}\n` +
-        `**Recent attempts:** ${summarizeAttempts(state)}`;
-    try {
-        await fileEscalation({
-            causeKey,
-            organizationId: info.organizationId,
-            sessionId: '',
-            issueId: null,
-            reasonType: ESCALATION_REASONS.ERROR_ENCOUNTERED,
-            // Operator triage: rebase/merge manually, mark complete, or clear the branch.
-            disposition: ESCALATION_DISPOSITIONS.NEEDS_OPERATOR,
-            // Provenance via the anchor; focus_id no longer denormalized into metadata.
-            anchor: { focusId: info.focusId, branch: info.branchName },
-            description,
-            whatWasTried: summarizeAttempts(state),
-            helpNeeded: `Inspect the branch (${info.branchName}) and integration history. ` +
-                `Either rebase/merge manually, mark the focus complete, or clear the branch ` +
-                `if its commits are no longer wanted.`,
-            escalationKind: STUCK_FOCUS_BRANCH_KIND,
-            metadata: {
-                // branch_name is the dedup discriminator for this branch-scoped class
-                // (findPendingEscalationForBranch reads it); there is no branch column.
-                branch_name: info.branchName,
-                oldest_commit_ts: oldestUnmergedMs,
-                last_failure_reason: state?.lastFailureReason ?? null,
-            },
-        });
-        log.info(`Filed stuck_focus_branch escalation for ${info.branchName} (${ageHours}h old)`);
-    }
-    catch (err) {
-        log.warn(`[merge-back-loop] fileEscalation failed for ${info.branchName}:`, err.message);
-    }
-}
-/**
- * Auto-resolve any open stuck-branch escalations for a branch we just merged.
- */
-async function resolveStuckBranchEscalations(branchName, pending, markResolved) {
-    const match = findPendingEscalationForBranch(pending, STUCK_FOCUS_BRANCH_KIND, branchName);
-    if (!match)
-        return;
-    try {
-        await markResolved(match.id, 'Branch merged automatically by merge-back-loop');
-        log.info(`Auto-resolved stuck_focus_branch escalation ${match.id} for ${branchName}`);
-    }
-    catch (err) {
-        log.warn(`[merge-back-loop] markEscalationResolved failed for ${match.id}:`, err.message);
-    }
-}
-/**
- * Run one merge-back tick across all products in the daemon config.
- *
- * Idempotent: when no branches are ahead of integration, the tick is a
- * no-op (no info-level log, debug only). When work happens, logs a
- * single info-level summary line.
- */
-export async function runMergeBackTick(config, depOverrides = {}) {
-    const deps = { ...defaultDeps(), ...depOverrides };
-    const counts = { scanned: 0, merged: 0, skipped: 0, conflicts: 0 };
-    const thresholdMs = readStuckBranchThresholdMs();
-    let branches;
-    try {
-        branches = await deps.enumerateFocusBranchesAhead(config);
-    }
-    catch (err) {
-        log.warn('enumerate failed:', err.message);
-        return counts;
-    }
-    // Pull pending escalations once per tick — used for both conflict-skip and
-    // stuck-branch dedup checks. Empty list on error so the tick continues.
-    let pending;
-    try {
-        pending = await deps.listPendingEscalations();
-    }
-    catch (err) {
-        log.warn('listPendingEscalations failed:', err.message);
-        pending = [];
-    }
-    counts.scanned = branches.length;
-    if (branches.length === 0) {
-        log.debug('tick: 0 branches ahead of integration');
-        return counts;
-    }
-    for (const info of branches) {
-        const now = deps.now();
-        // Gate 0: read-only audit focuses never merge to integration. The
-        // event-driven path enforces this via shouldAttemptMerge's readOnly
-        // check; mirror that here so a violating audit team (one that
-        // committed in violation of its constraint) can't bypass the guard
-        // through the state-driven loop.
-        if (info.readOnly) {
-            counts.skipped += 1;
-            log.debug(`skip ${info.branchName}: read-only focus`);
-            continue;
-        }
-        // Gate 1: in-memory writer / active session / recent commit / dirty
-        let writeSignal;
-        try {
-            writeSignal = await deps.isWorktreeBeingWritten(info.focusId);
-        }
-        catch (err) {
-            log.warn(`[merge-back-loop] isWorktreeBeingWritten failed for ${info.focusId}:`, err.message);
-            counts.skipped += 1;
-            continue;
-        }
-        if (writeSignal.active) {
-            counts.skipped += 1;
-            log.debug(`[merge-back-loop] skip ${info.branchName}: ${writeSignal.reason?.code ?? 'unknown'} -- ${writeSignal.reason?.message ?? ''}`);
-            continue;
-        }
-        // Gate 2: explicit dirty-worktree skip (redundant w/ isWorktreeBeingWritten,
-        // but logged separately so the skip is easy to read in the log).
-        if (deps.worktreeHasUncommittedChanges(info.worktreePath)) {
-            counts.skipped += 1;
-            log.debug(`skip ${info.branchName}: dirty worktree`);
-            continue;
-        }
-        // Gate 3: existing pending merge-conflict escalation for this branch
-        if (findPendingConflictForBranch(pending, info.branchName)) {
-            counts.skipped += 1;
-            log.debug(`skip ${info.branchName}: pending merge-conflict escalation`);
-            // Even when we skip the merge, the stuck-branch escalation may still
-            // need to fire if the branch has aged out. Skip that here too —
-            // a stuck conflict already has an escalation surface.
-            continue;
-        }
-        // Gather worked deliveries (see WORKED_STATUSES).
-        let deliveries = [];
-        try {
-            deliveries = await deps.getFocusDeliveries(info.focusId);
-        }
-        catch (err) {
-            log.warn(`[merge-back-loop] getFocusDeliveries failed for ${info.focusId}:`, err.message);
-        }
-        const allDeliveryIds = deliveries.map((d) => d.id);
-        const workedDeliveryIds = deliveries
-            .filter((d) => WORKED_STATUSES.has(d.executionStatus ?? ''))
-            .map((d) => d.id);
-        if (allDeliveryIds.length === 0) {
-            // Degenerate case: branch is ahead but the focus has no deliveries
-            // (e.g., orphaned branch with no focus row). Skip and consider the
-            // stuck-branch surface — operators decide whether to keep or clean up.
-            counts.skipped += 1;
-            log.debug(`skip ${info.branchName}: focus has no deliveries`);
-            const oldestMs = deps.getOldestUnmergedCommitMs(info.branchName, config.integrationBranch, info.repoPath);
-            await maybeFileStuckBranchEscalation(info, oldestMs, writeSignal.active, thresholdMs, now, deps.fileEscalation);
-            continue;
-        }
-        // Gate 4: merge-eligibility. A focus whose deliveries are ALL still in
-        // `coding` is not yet past the dev-complete bar -- its branch carries
-        // unreviewed code. Skip the merge so the review gate runs first; the work
-        // becomes merge-eligible once a delivery reaches verify/done (the
-        // terminate-path reconciliation in completion/event.ts advances finished
-        // coding work to verify, so genuinely-complete work is not stranded here).
-        //
-        // Deliberately do NOT file a stuck_focus_branch escalation on this path: a
-        // coding-only focus is INTENTIONALLY held by the review gate, not stuck in
-        // the merge-back sense. A genuinely wedged coding focus (nothing committed,
-        // no progress) is surfaced by the completion-path team_failure / no-progress
-        // watchdogs, not by merge-back. So a held coding focus never spuriously
-        // ages into a stuck_focus_branch escalation before the threshold.
-        const mergeEligible = deliveries.some((d) => MERGE_ELIGIBLE_STATUSES.has(d.executionStatus ?? ''));
-        if (!mergeEligible) {
-            counts.skipped += 1;
-            log.debug(`[merge-back-loop] skip ${info.branchName}: no verify/done delivery ` +
-                `(deliveries still coding) -- waiting for the review gate`);
-            continue;
-        }
-        // Pass ALL delivery IDs as knownDeliveryIds so mergeFocusBranch's
-        // representative fallback can find a delivery even when workedDeliveryIds
-        // is empty (e.g., done-only focus). workedDeliveryIds still drives
-        // per-delivery git-state telemetry inside mergeFocusBranch.
-        const teamState = buildSyntheticTeamState(info, new Set(allDeliveryIds));
-        // Pass a product-scoped config so mergeFocusBranch's downstream git
-        // operations (mergeToIntegration, etc.) run against the correct repo.
-        const productConfig = { ...config, repoPath: info.repoPath, productId: info.productId };
-        let mergeResult;
-        try {
-            mergeResult = await deps.mergeFocusBranch(productConfig, teamState, 
-            /* sessionId */ '', info.branchName, workedDeliveryIds);
-        }
-        catch (err) {
-            counts.conflicts += 1;
-            recordFailure(info.branchName, now, err.message);
-            log.warn(`[merge-back-loop] mergeFocusBranch threw for ${info.branchName}:`, err.message);
-            continue;
-        }
-        if (mergeResult.mergeSucceeded) {
-            counts.merged += 1;
-            recordSuccess(info.branchName, now);
-            await resolveStuckBranchEscalations(info.branchName, pending, deps.markEscalationResolved);
-        }
-        else {
-            counts.conflicts += 1;
-            recordFailure(info.branchName, now, mergeResult.exitReason);
-            // Re-evaluate stuck-branch escalation: a persistent failure should
-            // surface as 'stuck' once the branch ages out.
-            const oldestMs = deps.getOldestUnmergedCommitMs(info.branchName, config.integrationBranch, info.repoPath);
-            await maybeFileStuckBranchEscalation(info, oldestMs, writeSignal.active, thresholdMs, now, deps.fileEscalation);
-        }
-    }
-    log.info(`[merge-back-loop] tick: ${counts.scanned} branches scanned, ${counts.merged} merged, ${counts.skipped} skipped, ${counts.conflicts} conflicts`);
-    return counts;
-}
-//# sourceMappingURL=merge-back-loop.js.map

package/dist/merge-back-loop.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge-back-loop.js","sourceRoot":"","sources":["../src/merge-back-loop.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAAE,wBAAwB,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AAC9F,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,gBAAgB,IAAI,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,IAAI,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AACvF,OAAO,EAAE,sBAAsB,IAAI,6BAA6B,EAAE,sBAAsB,IAAI,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AACvJ,OAAO,EACL,wBAAwB,IAAI,+BAA+B,GAG5D,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,sBAAsB,IAAI,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AAC9F,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACjG,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,MAAM,GAAG,GAAG,YAAY,CAAC,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAC;AAGxD,yEAAyE;AAEzE,MAAM,CAAC,MAAM,uBAAuB,GAAG,oBAAoB,CAAC;AA8B5D,MAAM,cAAc,GAAG,IAAI,GAAG,EAA8B,CAAC;AAE7D,2EAA2E;AAC3E,MAAM,UAAU,kCAAkC;IAChD,cAAc,CAAC,KAAK,EAAE,CAAC;AACzB,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,qBAAqB,CAAC,UAAkB;IACtD,OAAO,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,aAAa,CAAC,UAAkB,EAAE,GAAW;IACpD,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI;QACjD,aAAa,EAAE,IAAI;QACnB,aAAa,EAAE,IAAI;QACnB,iBAAiB,EAAE,IAAI;KACxB,CAAC;IACF,cAAc,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,QAAQ,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,aAAa,CAAC,UAAkB,EAAE,GAAW,EAAE,MAAc;IACpE,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI;QACjD,aAAa,EAAE,IAAI;QACnB,aAAa,EAAE,IAAI;QACnB,iBAAiB,EAAE,IAAI;KACxB,CAAC;IACF,cAAc,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,QAAQ,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,EAAE,MAAM,EAAE,CAAC,CAAC;AACjG,CAAC;AA6BD,SAAS,0BAA0B,CAAC,GAAuB;IACzD,yEAAyE;IACzE,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,mCAAmC,GAAG,SAAS,CAAC;AAC5E,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CACvC,UAAkB,EAClB,YAAoB,EACpB,QAAgB;IAEhB,MAAM,MAAM,GAAG,UAAU,CACvB,CAAC,KAAK,EAAE,cAAc,EAAE,GAAG,YAAY,KAAK,UAAU,EAAE,CAAC,EACzD,QAAQ,CACT,CAAC;IACF,IAAI,CAAC,MAAM,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IACjC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/D,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACpC,kEAAkE;IAClE,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC7D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IACpE,OAAO,OAAO,GAAG,IAAI,CAAC;AACxB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,kCAAkC,CACtD,MAAoB;IAEpB,MAAM,GAAG,GAAyB,EAAE,CAAC;IACrC,MAAM,SAAS,GAAG,oBAAoB,EAAE,CAAC;IACzC,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACtC,MAAM,EAAE,GAAG,gBAAgB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,OAAO,CAAC;QACZ,IAAI,CAAC;YACH,OAAO,GAAG,MAAM,gBAAgB,CAAC,EAAE,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QAClE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,IAAI,CACN,yDAAyD,OAAO,CAAC,EAAE,GAAG,EACrE,GAAa,CAAC,OAAO,CACvB,CAAC;YACF,SAAS;QACX,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,MAAM,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACzC,IAAI,CAAC,EAAE;gBAAE,SAAS;YAClB,MAAM,KAAK,GAAG,wBAAwB,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,iBAAiB,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC;YACzF,IAAI,CAAC,KAAK;gBAAE,SAAS;YACrB,GAAG,CAAC,IAAI,CAAC;gBACP,OAAO,EAAE,KAAK,CAAC,QAAQ;gBACvB,SAAS,EAAE,KAAK,CAAC,UAAU;gBAC3B,cAAc,EAAE,EAAE,CAAC,cAAc;gBACjC,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,UAAU,EAAE,EAAE,CAAC,UAAU;gBACzB,YAAY,EAAE,EAAE,CAAC,YAAY;gBAC7B,QAAQ,EAAE,EAAE,CAAC,QAAQ;gBACrB,cAAc,EAAE,KAAK,CAAC,eAAe,IAAI,IAAI;gBAC7C,QAAQ,EAAE,KAAK,CAAC,SAAS;aAC1B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,WAAW;IAClB,OAAO;QACL,2BAA2B,EAAE,kCAAkC;QAC/D,sBAAsB,EAAE,6BAA6B;QACrD,6BAA6B;QAC7B,sBAAsB,EAAE,6BAA6B;QACrD,sBAAsB,EAAE,6BAA6B;QACrD,cAAc,EAAE,+BAA+B;QAC/C,gBAAgB,EAAE,uBAAuB;QACzC,kBAAkB,EAAE,yBAAyB;QAC7C,yBAAyB;QACzB,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;KACtB,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,8BAA8B,CACrC,OAAkE,EAClE,IAAY,EACZ,UAAkB;IAElB,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,MAAM,EAAE,GAAG,CAAC,CAAC,QAAQ,IAAI,IAAI,CAAC;QAC9B,MAAM,YAAY,GAAG,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAE,EAA8B,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5G,IAAI,CAAC,CAAC,cAAc,KAAK,IAAI,IAAI,YAAY,KAAK,UAAU,EAAE,CAAC;YAC7D,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;QACtB,CAAC;QACD,4DAA4D;QAC5D,IACE,CAAC,CAAC,cAAc,IAAI,IAAI;YACxB,IAAI,KAAK,uBAAuB;YAChC,OAAO,CAAC,CAAC,WAAW,KAAK,QAAQ;YACjC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,UAAU,EAAE,CAAC,EAC/C,CAAC;YACD,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;QACtB,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,SAAS,4BAA4B,CACnC,OAAkE,EAClE,UAAkB;IAElB,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,IAAI,CAAC,CAAC,UAAU,KAAK,kBAAkB,CAAC,iBAAiB;YACrD,OAAO,CAAC,CAAC,WAAW,KAAK,QAAQ;YACjC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,oBAAoB,UAAU,EAAE,CAAC,EAAE,CAAC;YAC7D,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;QACtB,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,SAAS,uBAAuB,CAAC,IAAwB,EAAE,gBAA6B;IACtF,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,iBAAiB;QAC3B,cAAc,EAAE,IAAI,CAAC,cAAc;QACnC,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,eAAe,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,kBAAkB,EAAE,CAAC,EAAE,oBAAoB,EAAE,CAAC,EAAE;QAClF,cAAc,EAAE,IAAI,CAAC,cAAc;QACnC,SAAS,EAAE,IAAI,IAAI,EAAE;QACrB,KAAK,EAAE,YAAY;QACnB,gBAAgB;QAChB,iBAAiB,EAAE,IAAI,GAAG,EAAU;QACpC,aAAa,EAAE,KAAK;QACpB,aAAa,EAAE,IAAI;QACnB,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,kBAAkB,EAAE,IAAI;QACxB,cAAc,EAAE,IAAI;QACpB,gBAAgB,EAAE,IAAI,GAAG,EAAE;QAC3B,sBAAsB,EAAE,KAAK;QAC7B,cAAc,EAAE,IAAI;QACpB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,WAAW,EAAE,QAAQ;QACrB,OAAO,EAAE,QAAQ;QACjB,kBAAkB,EAAE,IAAI;QACxB,eAAe,EAAE,IAAI;QACrB,oBAAoB,EAAE,IAAI;QAC1B,gBAAgB,EAAE,CAAC;QACnB,mBAAmB,EAAE,CAAC;QACtB,yBAAyB,EAAE,IAAI;KAChC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,eAAe,GAAG,IAAI,GAAG,CAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;AAEtE;;;;;;;;;GASG;AACH,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;AAEpE;;GAEG;AACH,SAAS,iBAAiB,CAAC,KAAqC;IAC9D,IAAI,CAAC,KAAK;QAAE,OAAO,kDAAkD,CAAC;IACtE,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;QACxB,KAAK,CAAC,IAAI,CAAC,mBAAmB,IAAI,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAC/E,CAAC;IACD,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;QACxB,KAAK,CAAC,IAAI,CAAC,mBAAmB,IAAI,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,iBAAiB,IAAI,SAAS,EAAE,CAAC,CAAC;IACxH,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,kDAAkD,CAAC;IAClF,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED;;;;;;;;;;GAUG;AACH,KAAK,UAAU,8BAA8B,CAC3C,IAAwB,EACxB,gBAA+B,EAC/B,cAAuB,EACvB,WAAmB,EACnB,GAAW,EACX,cAAmD;IAEnD,IAAI,cAAc;QAAE,OAAO;IAC3B,IAAI,gBAAgB,IAAI,IAAI;QAAE,OAAO;IACrC,IAAI,GAAG,GAAG,gBAAgB,IAAI,WAAW;QAAE,OAAO;IAElD,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAClD,IAAI,KAAK,EAAE,aAAa,IAAI,GAAG,GAAG,KAAK,CAAC,aAAa,IAAI,WAAW;QAAE,OAAO;IAE7E,iFAAiF;IACjF,gFAAgF;IAChF,+EAA+E;IAC/E,kEAAkE;IAClE,MAAM,QAAQ,GAAG,qBAAqB,CAAC,uBAAuB,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAE/F,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,gBAAgB,CAAC,GAAG,SAAS,CAAC,CAAC;IAClE,MAAM,WAAW,GACf,8CAA8C,QAAQ,iCAAiC;QACvF,cAAc,IAAI,CAAC,SAAS,IAAI;QAChC,eAAe,IAAI,CAAC,UAAU,IAAI;QAClC,+BAA+B,IAAI,IAAI,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,IAAI;QAC3E,wBAAwB,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;IAErD,IAAI,CAAC;QACH,MAAM,cAAc,CAAC;YACnB,QAAQ;YACR,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,SAAS,EAAE,EAAE;YACb,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,kBAAkB,CAAC,iBAAiB;YAChD,8EAA8E;YAC9E,WAAW,EAAE,uBAAuB,CAAC,cAAc;YACnD,4EAA4E;YAC5E,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE;YAC1D,WAAW;YACX,YAAY,EAAE,iBAAiB,CAAC,KAAK,CAAC;YACtC,UAAU,EACR,uBAAuB,IAAI,CAAC,UAAU,6BAA6B;gBACnE,6EAA6E;gBAC7E,sCAAsC;YACxC,cAAc,EAAE,uBAAuB;YACvC,QAAQ,EAAE;gBACR,sEAAsE;gBACtE,wEAAwE;gBACxE,WAAW,EAAE,IAAI,CAAC,UAAU;gBAC5B,gBAAgB,EAAE,gBAAgB;gBAClC,mBAAmB,EAAE,KAAK,EAAE,iBAAiB,IAAI,IAAI;aACtD;SACF,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CAAC,2CAA2C,IAAI,CAAC,UAAU,KAAK,QAAQ,QAAQ,CAAC,CAAC;IAC5F,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,IAAI,CACN,+CAA+C,IAAI,CAAC,UAAU,GAAG,EAChE,GAAa,CAAC,OAAO,CACvB,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,6BAA6B,CAC1C,UAAkB,EAClB,OAAkE,EAClE,YAAkD;IAElD,MAAM,KAAK,GAAG,8BAA8B,CAAC,OAAO,EAAE,uBAAuB,EAAE,UAAU,CAAC,CAAC;IAC3F,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,IAAI,CAAC;QACH,MAAM,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,gDAAgD,CAAC,CAAC;QAC/E,GAAG,CAAC,IAAI,CAAC,+CAA+C,KAAK,CAAC,EAAE,QAAQ,UAAU,EAAE,CAAC,CAAC;IACxF,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,IAAI,CACN,uDAAuD,KAAK,CAAC,EAAE,GAAG,EACjE,GAAa,CAAC,OAAO,CACvB,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,MAAoB,EACpB,eAA2C,EAAE;IAE7C,MAAM,IAAI,GAAsB,EAAE,GAAG,WAAW,EAAE,EAAE,GAAG,YAAY,EAAE,CAAC;IACtE,MAAM,MAAM,GAAwB,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;IACxF,MAAM,WAAW,GAAG,0BAA0B,EAAE,CAAC;IAEjD,IAAI,QAA8B,CAAC;IACnC,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC;IAC5D,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,IAAI,CAAC,mBAAmB,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;QACtD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,2EAA2E;IAC3E,wEAAwE;IACxE,IAAI,OAAkE,CAAC;IACvE,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAChD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,IAAI,CAAC,gCAAgC,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;QACnE,OAAO,GAAG,EAAE,CAAC;IACf,CAAC;IAED,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC;IACjC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,GAAG,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;QACnD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,kEAAkE;QAClE,oEAAoE;QACpE,8DAA8D;QAC9D,mEAAmE;QACnE,iCAAiC;QACjC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;YACpB,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,UAAU,mBAAmB,CAAC,CAAC;YACtD,SAAS;QACX,CAAC;QAED,oEAAoE;QACpE,IAAI,WAAW,CAAC;QAChB,IAAI,CAAC;YACH,WAAW,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAChE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,IAAI,CACN,uDAAuD,IAAI,CAAC,OAAO,GAAG,EACrE,GAAa,CAAC,OAAO,CACvB,CAAC;YACF,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;YACpB,SAAS;QACX,CAAC;QACD,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;YACvB,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;YACpB,GAAG,CAAC,KAAK,CACP,0BAA0B,IAAI,CAAC,UAAU,KAAK,WAAW,CAAC,MAAM,EAAE,IAAI,IAAI,SAAS,OAAO,WAAW,CAAC,MAAM,EAAE,OAAO,IAAI,EAAE,EAAE,CAC9H,CAAC;YACF,SAAS;QACX,CAAC;QAED,6EAA6E;QAC7E,iEAAiE;QACjE,IAAI,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YAC1D,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;YACpB,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,UAAU,kBAAkB,CAAC,CAAC;YACrD,SAAS;QACX,CAAC;QAED,qEAAqE;QACrE,IAAI,4BAA4B,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3D,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;YACpB,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,UAAU,qCAAqC,CAAC,CAAC;YACxE,qEAAqE;YACrE,gEAAgE;YAChE,sDAAsD;YACtD,SAAS;QACX,CAAC;QAED,kDAAkD;QAClD,IAAI,UAAU,GAAwB,EAAE,CAAC;QACzC,IAAI,CAAC;YACH,UAAU,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,IAAI,CACN,mDAAmD,IAAI,CAAC,OAAO,GAAG,EACjE,GAAa,CAAC,OAAO,CACvB,CAAC;QACJ,CAAC;QACD,MAAM,cAAc,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACnD,MAAM,iBAAiB,GAAG,UAAU;aACjC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;aAC3D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAEpB,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,mEAAmE;YACnE,mEAAmE;YACnE,uEAAuE;YACvE,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;YACpB,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,UAAU,2BAA2B,CAAC,CAAC;YAC9D,MAAM,QAAQ,GAAG,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,iBAAiB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1G,MAAM,8BAA8B,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YAChH,SAAS;QACX,CAAC;QAED,uEAAuE;QACvE,sEAAsE;QACtE,0EAA0E;QAC1E,kEAAkE;QAClE,yEAAyE;QACzE,2EAA2E;QAC3E,EAAE;QACF,2EAA2E;QAC3E,2EAA2E;QAC3E,4EAA4E;QAC5E,6EAA6E;QAC7E,wEAAwE;QACxE,kEAAkE;QAClE,MAAM,aAAa,GAAG,UAAU,CAAC,IAAI,CACnC,CAAC,CAAC,EAAE,EAAE,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe,IAAI,EAAE,CAAC,CAC5D,CAAC;QACF,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;YACpB,GAAG,CAAC,KAAK,CACP,0BAA0B,IAAI,CAAC,UAAU,4BAA4B;gBACrE,0DAA0D,CAC3D,CAAC;YACF,SAAS;QACX,CAAC;QAED,kEAAkE;QAClE,0EAA0E;QAC1E,mEAAmE;QACnE,4DAA4D;QAC5D,MAAM,SAAS,GAAG,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC;QACzE,oEAAoE;QACpE,sEAAsE;QACtE,MAAM,aAAa,GAAiB,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;QACtG,IAAI,WAAW,CAAC;QAChB,IAAI,CAAC;YACH,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CACvC,aAAa,EACb,SAAS;YACT,eAAe,CAAC,EAAE,EAClB,IAAI,CAAC,UAAU,EACf,iBAAiB,CAClB,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,SAAS,IAAI,CAAC,CAAC;YACtB,aAAa,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;YAC5D,GAAG,CAAC,IAAI,CACN,gDAAgD,IAAI,CAAC,UAAU,GAAG,EACjE,GAAa,CAAC,OAAO,CACvB,CAAC;YACF,SAAS;QACX,CAAC;QAED,IAAI,WAAW,CAAC,cAAc,EAAE,CAAC;YAC/B,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC;YACnB,aAAa,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YACpC,MAAM,6BAA6B,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAC7F,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,SAAS,IAAI,CAAC,CAAC;YACtB,aAAa,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;YAC5D,mEAAmE;YACnE,+CAA+C;YAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,iBAAiB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1G,MAAM,8BAA8B,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAClH,CAAC;IACH,CAAC;IAED,GAAG,CAAC,IAAI,CACN,2BAA2B,MAAM,CAAC,OAAO,sBAAsB,MAAM,CAAC,MAAM,YAAY,MAAM,CAAC,OAAO,aAAa,MAAM,CAAC,SAAS,YAAY,CAChJ,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/merge-detector.d.ts

@@ -1,55 +0,0 @@
-/**
- * Merge detection for focus branches.
- *
- * Scans the integration branch for merge commits that originated from
- * focus worktree branches. Records newly detected merges via the
- * product-api so they appear in the focus commit history.
- *
- * Called from the daemon poll loop. Uses fire-and-forget recording
- * to avoid blocking the poll cycle.
- */
-import type { DaemonConfig } from './types.js';
-/**
- * Parsed merge commit from git log.
- */
-export interface DetectedMerge {
-    /** The merge commit SHA on the integration branch. */
-    mergeCommitSha: string;
-    /** ISO timestamp of the merge commit. */
-    mergedAt: string;
-    /** Git author name of the merge commit. */
-    authorName: string;
-    /** Git author email of the merge commit. */
-    authorEmail: string;
-    /** SHAs of commits included in this merge (from second parent). */
-    constituentCommitShas: string[];
-}
-/**
- * Pure parse + classification core extracted from findMergeCommitsForBranch.
- *
- * Given the raw `git log --merges --first-parent --format=%H|%aI|%an|%ae|%P`
- * output, the set of commits unique to the focus branch, and a callback that
- * yields the constituent commits for a merge, selects the merges that actually
- * came from this focus. This is the MISCLASSIFICATION-prone logic, isolated so
- * it can be tested without a git process:
- *   - malformed lines (< 5 pipe fields) are skipped;
- *   - non-merge commits (< 2 parents) are skipped;
- *   - a merge is attributed to this focus ONLY when its SECOND parent is a
- *     commit unique to the focus branch -- this is what prevents matching an
- *     unrelated historical merge from another branch;
- *   - constituents are resolved lazily and only for attributed merges.
- *
- * Order is preserved from the input (git returns newest-first).
- */
-export declare function selectFocusMerges(mergeLogOutput: string, focusCommits: ReadonlySet<string>, getConstituents: (firstParent: string, secondParent: string) => string[]): DetectedMerge[];
-/**
- * Detect new merge commits for all active focuses.
- *
- * For each focus with a known worktree branch, scans the integration
- * branch for merge commits from that branch. Records any new merges
- * via the product-api with merged_by='detected'.
- *
- * Called from the poll loop in listener.ts.
- */
-export declare function detectFocusMerges(config: DaemonConfig): Promise<void>;
-//# sourceMappingURL=merge-detector.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"merge-detector.d.ts","sourceRoot":"","sources":["../src/merge-detector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAoB/C;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,sDAAsD;IACtD,cAAc,EAAE,MAAM,CAAC;IACvB,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,2CAA2C;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,4CAA4C;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,mEAAmE;IACnE,qBAAqB,EAAE,MAAM,EAAE,CAAC;CACjC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,iBAAiB,CAC/B,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,EACjC,eAAe,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,MAAM,EAAE,GACvE,aAAa,EAAE,CAiCjB;AAwID;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAgE3E"}