@telora/daemon 0.22.131 → 0.22.136

package/dist/merge/merge-back-followup.js

@@ -0,0 +1,316 @@
+// PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
+// Pinned by: packages/daemon/src/integration/merge-back-resolver-timeout-regression.test.ts,
+//   packages/daemon/src/merge/merge-back-conflict.test.ts,
+//   packages/daemon/src/merge/merge-back-followup.test.ts, packages/daemon/src/merge/merge-back-loop.test.ts,
+//   packages/daemon/src/merge/resolver-exhausted-observation.test.ts
+// PINNED-BY-END
+/**
+ * Follow-up for a merge-back conflict the fallback resolver could not finish.
+ *
+ * Before: the fallback resolver failed, the daemon filed a merge_conflict
+ * escalation (agent_resolvable) and returned merge_back_conflict_unresolved --
+ * and that filing was the only exit. The merge-back loop skipped the branch
+ * while it was open, and no coding spawn picked it up because a focus whose
+ * deliveries sit in verify is never offered for spawn. The focus parked until
+ * an operator reset the worktree and merged by hand (Nexus request 8679bae1,
+ * 2026-09-17).
+ *
+ * Now the filing is a RECORD and this module is the path forward. While a
+ * merge-back merge_conflict is open on a focus branch, the merge-back loop tick
+ * (which already runs only on a worktree no team is writing and that is clean)
+ * calls {@link runMergeBackFollowUp}. That re-runs merge-back and, on conflict,
+ * the fallback resolver with an ESCALATING budget, seeded with the partial
+ * resolution the previous attempt preserved. It is bounded: at most
+ * {@link MAX_RESOLVER_ATTEMPTS} resolver runs per conflict episode (the inline
+ * fallback plus {@link MERGE_BACK_FOLLOWUP_MAX_ATTEMPTS} follow-ups), at least
+ * {@link MERGE_BACK_FOLLOWUP_BACKOFF_MS} apart. When the merge-back completes,
+ * the open merge_conflict record is resolved, so the loop's normal gated merge
+ * and the focus's review proceed with no human act.
+ *
+ * Past the bound the machine stops spending on the conflict and files ONE
+ * cause-keyed observation proposing needs_operator. It names the preserved
+ * partial resolution and the attempts spent. The createEscalation chokepoint
+ * keeps it in the agent_resolvable lane, and the routing hand-off
+ * (queries/agent-resolvable-promotion.ts) gives it to a routing decider, which
+ * alone may make it human-facing. The daemon has no human-facing route of its
+ * own (packages/daemon/CLAUDE.md). A plain merge_conflict filing that no agent
+ * session reaches is never handed off, so without this observation an exhausted
+ * conflict would sit unseen.
+ *
+ * The attempt state is durable: a small record per branch under the repo's
+ * common git dir (telora/resolver-attempts/), read back after a daemon restart,
+ * so restarting between failures does not buy another round. A run is spent in
+ * that record BEFORE it spawns, so a crash mid-run does not buy it back either.
+ * The ledger fails closed: a record that cannot be located, read, parsed or
+ * written makes the episode read as exhausted (hand-off), never as new. A completed
+ * merge-back (a clean merge-back from any path, or a resolver success) deletes
+ * it. Every failed attempt also leaves its partial work under
+ * refs/telora/resolver-partial/.
+ *
+ * A LEAF of the merge cluster: it imports nothing from focus-merge.ts or
+ * merge-back-conflict.ts. The attempt itself, which must call
+ * mergeBackFromIntegration from its sanctioned module, is injected.
+ */
+import { existsSync, mkdirSync, readFileSync, realpathSync, renameSync, rmSync, writeFileSync } from 'node:fs';
+import { dirname, isAbsolute, join, resolve } from 'node:path';
+import { runGitSync, slugBranchForRef } from '../git/index.js';
+import { createLogger } from '../shell/log.js';
+const log = createLogger({ module: 'focus-merge' });
+/** Follow-up resolver runs after the inline fallback, per conflict episode. */
+export const MERGE_BACK_FOLLOWUP_MAX_ATTEMPTS = 2;
+/** Every resolver run a conflict episode may spend: the inline fallback + the follow-ups. */
+export const MAX_RESOLVER_ATTEMPTS = 1 + MERGE_BACK_FOLLOWUP_MAX_ATTEMPTS;
+/** Minimum gap between a failed resolver run and the next follow-up. */
+export const MERGE_BACK_FOLLOWUP_BACKOFF_MS = 5 * 60 * 1000;
+/**
+ * Read-through cache of the durable records, keyed by the record's own path (canonical git common dir +
+ * branch), so two repositories with the same branch name never share an episode. null = no open episode.
+ */
+const attemptsByRecord = new Map();
+/**
+ * Test seam: drop the in-memory cache, exactly what a daemon restart does. Durable
+ * records are untouched (each test repo is its own tmpdir, so none leak).
+ */
+export function __resetResolverAttemptsForTesting() {
+    attemptsByRecord.clear();
+}
+/**
+ * Where a branch's episode is recorded: <git-common-dir>/telora/resolver-attempts/<branch-slug>.json,
+ * beside the preserved partial patches, so it survives a daemon restart and belongs to the repo.
+ * The common dir is canonicalised, so every worktree of one repo resolves to the same record.
+ * Null when the worktree's git dir cannot be read.
+ */
+export function resolverAttemptRecordPath(key) {
+    const common = runGitSync(['rev-parse', '--git-common-dir'], key.worktreePath);
+    if (!common.success || common.output.length === 0)
+        return null;
+    const dir = isAbsolute(common.output) ? common.output : join(key.worktreePath, common.output);
+    let canonical;
+    try {
+        canonical = realpathSync(dir);
+    }
+    catch {
+        return null;
+    }
+    return join(canonical, 'telora', 'resolver-attempts', `${slugBranchForRef(key.branchName)}.json`);
+}
+/** Cache slot for an episode whose record cannot be located: still per worktree and branch, never shared. */
+function unlocatedCacheKey(key) {
+    return `unlocated:${resolve(key.worktreePath)}\0${key.branchName}`;
+}
+/** Fail closed: an episode whose count cannot be trusted has spent every run, so it goes to the exhaustion hand-off. */
+function untrusted(storageError, prior) {
+    return {
+        failures: MAX_RESOLVER_ATTEMPTS,
+        lastFailureAt: prior?.lastFailureAt ?? 0,
+        lastPartialRef: prior?.lastPartialRef ?? null,
+        exhaustionFiled: prior?.exhaustionFiled ?? false,
+        storageError,
+    };
+}
+function parseRecord(text) {
+    const v = JSON.parse(text);
+    if (typeof v.failures !== 'number' || !Number.isInteger(v.failures) || v.failures < 0 || typeof v.lastFailureAt !== 'number')
+        return null;
+    return {
+        failures: v.failures,
+        lastFailureAt: v.lastFailureAt,
+        lastPartialRef: typeof v.lastPartialRef === 'string' ? v.lastPartialRef : null,
+        exhaustionFiled: v.exhaustionFiled === true,
+        ...(v.inFlight === true ? { inFlight: true } : {}),
+    };
+}
+function readRecord(path) {
+    if (!existsSync(path))
+        return null;
+    try {
+        const state = parseRecord(readFileSync(path, 'utf-8'));
+        if (state !== null)
+            return state;
+        throw new Error('record does not have the expected shape');
+    }
+    catch (err) {
+        const reason = `unreadable resolver attempt record ${path}: ${err.message}`;
+        log.error(`[merge-back-followup] ${reason}; treating the episode as exhausted (never as new)`);
+        return untrusted(reason);
+    }
+}
+/** Persist a branch's episode; false when it could not be made durable (the cache is then marked untrusted). */
+function writeRecord(key, state) {
+    const path = resolverAttemptRecordPath(key);
+    if (path === null) {
+        const reason = `no readable git dir for ${key.worktreePath}`;
+        log.error(`[merge-back-followup] cannot persist the resolver attempt record for ${key.branchName}: ${reason}`);
+        return false;
+    }
+    try {
+        if (state === null) {
+            rmSync(path, { force: true });
+        }
+        else {
+            mkdirSync(dirname(path), { recursive: true });
+            writeFileSync(`${path}.tmp`, JSON.stringify(state));
+            renameSync(`${path}.tmp`, path);
+        }
+        attemptsByRecord.set(path, state);
+        return true;
+    }
+    catch (err) {
+        const reason = `could not persist the resolver attempt record ${path}: ${err.message}`;
+        log.error(`[merge-back-followup] ${reason}`);
+        // A failed delete leaves the durable record over-counting, which is the safe side; a failed write does not.
+        attemptsByRecord.set(path, state === null ? null : untrusted(reason, state));
+        return false;
+    }
+}
+/**
+ * The current episode for a branch, or undefined when none is open. Hydrates from the durable record after a
+ * restart. A record that cannot be located or read fails closed: it reads as an exhausted episode.
+ */
+export function getResolverAttemptState(key) {
+    const path = resolverAttemptRecordPath(key);
+    const cacheKey = path ?? unlocatedCacheKey(key);
+    if (!attemptsByRecord.has(cacheKey)) {
+        attemptsByRecord.set(cacheKey, path === null ? untrusted(`no readable git dir for ${key.worktreePath}`) : readRecord(path));
+    }
+    return attemptsByRecord.get(cacheKey) ?? undefined;
+}
+/**
+ * Durably spend one resolver run BEFORE it spawns (write-ahead), so a daemon that dies mid-run cannot grant the
+ * run again. False when the spend could not be persisted: the caller must not spawn.
+ */
+export function consumeResolverAttempt(key, now) {
+    const prior = getResolverAttemptState(key);
+    if (prior?.storageError)
+        return false;
+    return writeRecord(key, {
+        failures: (prior?.failures ?? 0) + 1,
+        lastFailureAt: now,
+        lastPartialRef: prior?.lastPartialRef ?? null,
+        exhaustionFiled: prior?.exhaustionFiled ?? false,
+        inFlight: true,
+    });
+}
+/** Record a failed resolver run. A run already spent by {@link consumeResolverAttempt} is not counted twice. */
+export function recordResolverFailure(key, now, partialRef) {
+    const prior = getResolverAttemptState(key);
+    if (prior?.storageError)
+        return;
+    writeRecord(key, {
+        failures: (prior?.failures ?? 0) + (prior?.inFlight ? 0 : 1),
+        lastFailureAt: now,
+        lastPartialRef: partialRef ?? prior?.lastPartialRef ?? null,
+        exhaustionFiled: prior?.exhaustionFiled ?? false,
+    });
+}
+/** A completed merge-back ends the episode. */
+export function recordResolverSuccess(key) {
+    if (getResolverAttemptState(key) !== undefined)
+        writeRecord(key, null);
+}
+function markExhaustionFiled(key) {
+    const state = getResolverAttemptState(key);
+    if (!state)
+        return;
+    if (state.storageError) {
+        attemptsByRecord.set(resolverAttemptRecordPath(key) ?? unlocatedCacheKey(key), { ...state, exhaustionFiled: true });
+        return;
+    }
+    writeRecord(key, { ...state, exhaustionFiled: true });
+}
+/** Pure: the budget multiplier for the next run. The 1st run gets 1x, the 2nd 2x, the 3rd 3x (each still clamped by the budget ceiling). */
+export function budgetMultiplierForNextAttempt(state) {
+    return (state?.failures ?? 0) + 1;
+}
+/** Pure: may another resolver run start for this branch now? */
+export function decideResolverAttempt(state, now) {
+    const failures = state?.failures ?? 0;
+    if (failures >= MAX_RESOLVER_ATTEMPTS)
+        return { kind: 'exhausted', failures };
+    if (state && failures > 0 && now - state.lastFailureAt < MERGE_BACK_FOLLOWUP_BACKOFF_MS) {
+        return { kind: 'backoff', retryAt: state.lastFailureAt + MERGE_BACK_FOLLOWUP_BACKOFF_MS };
+    }
+    return {
+        kind: 'attempt',
+        attempt: failures + 1,
+        budgetMultiplier: budgetMultiplierForNextAttempt(state),
+        priorPartialRef: state?.lastPartialRef ?? null,
+    };
+}
+/**
+ * One follow-up step for a focus branch with an open merge-back merge_conflict.
+ * The caller has already established that no team is writing the worktree and
+ * that it is clean. Never throws.
+ */
+export async function runMergeBackFollowUp(config, target, deps) {
+    if (target.readOnly)
+        return 'skipped';
+    const state = getResolverAttemptState(target);
+    const decision = decideResolverAttempt(state, deps.now());
+    if (decision.kind === 'exhausted') {
+        // Spent: spawn nothing more, but notice a merge someone else finished so the record does not hold the branch forever.
+        if (deps.integrationMergedIn(config, target))
+            return completeFollowUp(target, deps);
+        await handOffExhausted(target, deps, decision.failures);
+        return 'exhausted';
+    }
+    if (decision.kind === 'backoff')
+        return 'backoff';
+    log.info(`[merge-back-followup] "${target.focusName}" (${target.branchName}): follow-up merge-back attempt ` +
+        `${decision.attempt} of ${MAX_RESOLVER_ATTEMPTS} for the open merge_conflict`);
+    let outcome;
+    try {
+        outcome = await deps.attempt(config, target);
+    }
+    catch (err) {
+        log.warn(`[merge-back-followup] attempt threw for ${target.branchName}: ${err.message}`);
+        return 'error';
+    }
+    if (outcome.kind === 'error') {
+        log.warn(`[merge-back-followup] merge-back could not run for ${target.branchName}: ${outcome.message}`);
+        return 'error';
+    }
+    if (outcome.kind === 'failed') {
+        // A run the ledger could not record leaves no durable trace, so a restart before the next tick would read a
+        // fresh episode and never hand off. Route an untrusted episode to the hand-off in this same tick.
+        const after = getResolverAttemptState(target);
+        if (after?.storageError) {
+            await handOffExhausted(target, deps, after.failures);
+            return 'exhausted';
+        }
+        return 'failed';
+    }
+    return completeFollowUp(target, deps);
+}
+/** File the one resolver-exhausted observation for an exhausted episode, unless already filed; never throws. */
+async function handOffExhausted(target, deps, failures) {
+    const state = getResolverAttemptState(target);
+    if (!state || state.exhaustionFiled)
+        return;
+    log.warn(`[merge-back-followup] "${target.focusName}" (${target.branchName}): ${failures} resolver run(s) ` +
+        `failed to finish the merge-back (limit ${MAX_RESOLVER_ATTEMPTS}). No further runs this episode; filing the ` +
+        `resolver-exhausted observation for routing. Last partial resolution: ${state.lastPartialRef ?? 'none preserved'}.` +
+        `${state.storageError ? ` The attempt record is untrusted (${state.storageError}), so no further run is granted.` : ''}`);
+    try {
+        await deps.fileExhausted(target, failures, state.lastPartialRef);
+        markExhaustionFiled(target);
+    }
+    catch (err) {
+        log.warn(`[merge-back-followup] filing the resolver-exhausted observation failed for ${target.branchName}; ` +
+            `retrying next tick: ${err.message}`);
+    }
+}
+/** The merge-back is complete: end the episode and resolve the merge_conflict record. */
+async function completeFollowUp(target, deps) {
+    recordResolverSuccess(target);
+    try {
+        const n = await deps.resolveConflictRecord(target.focusId);
+        log.info(`[merge-back-followup] "${target.focusName}" (${target.branchName}): merge-back completed; ` +
+            `resolved ${n} merge_conflict record(s). The gated merge and review proceed on the next ticks.`);
+    }
+    catch (err) {
+        log.warn(`[merge-back-followup] resolving the merge_conflict record failed for focus ${target.focusId}: ${err.message}`);
+    }
+    return 'merged';
+}
+//# sourceMappingURL=merge-back-followup.js.map

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

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

package/dist/merge/merge-back-loop.d.ts

@@ -101,6 +101,8 @@ export interface MergeBackLoopDeps {
     readMergeGateHold: (target: MergeGateTarget) => Promise<string | null>;
     getFocusDeliveries: (focusId: string) => Promise<FocusDeliveryInfo[]>;
     getOldestUnmergedCommitMs: (branchName: string, integrationBranch: string, repoPath: string) => number | null;
+    /** Bounded follow-up resolution for a branch held by a pending merge-conflict record (merge/merge-back-followup.ts). */
+    followUpMergeBackConflict?: (productConfig: DaemonConfig, info: MergeBackFocusInfo) => Promise<unknown>;
     now?: () => number;
 }
 /**

package/dist/merge/merge-back-loop.d.ts.map

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

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

@@ -1,11 +1,14 @@
 // PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
 // Pinned by: packages/daemon/src/completion/teardown-merge-gate.test.ts,
-//   packages/daemon/src/merge/merge-back-loop.test.ts
+//   packages/daemon/src/integration/merge-back-resolver-timeout-regression.test.ts,
+//   packages/daemon/src/merge/merge-back-loop.test.ts,
+//   packages/daemon/src/merge/resolver-exhausted-observation.test.ts
 // PINNED-BY-END
 import { branchHasUnmergedCommits, worktreeHasUncommittedChanges } from '../worktree/index.js';
 import { runGitSync } from '../git/index.js';
 import { configForProduct } from '../shell/config.js';
-import { mergeFocusBranch as defaultMergeFocusBranch } from './focus-merge.js';
+import { mergeFocusBranch as defaultMergeFocusBranch, defaultMergeBackFollowUpDeps } from './focus-merge.js';
+import { runMergeBackFollowUp } from './merge-back-followup.js';
 import { readMergeGateHold } from './merge-gate-coverage.js';
 import { getActiveFocuses } from '../queries/focus-discovery.js';
 import { getFocusDeliveries as defaultGetFocusDeliveries } from '../queries/focuses.js';
@@ -15,7 +18,7 @@ import { focusBlockageCauseKey } from '../queries/cause-key.js';
 import { classifyMergeFailure } from './merge-failure-classify.js';
 import { NO_HUMAN_ACT } from '../queries/filing-observation.js';
 import { getAllFocusWorktrees } from '../focus/focus-worktree-state.js';
-import { isWorktreeBeingWritten as defaultIsWorktreeBeingWritten } from '../worktree/index.js';
+import { isWorktreeBeingWrittenAfterMergeRecovery as defaultIsWorktreeBeingWritten } from './abandoned-merge-recovery.js';
 import { ESCALATION_REASONS, ESCALATION_DISPOSITIONS, loadEnvConfig } from '@telora/daemon-core';
 import { createLogger } from '../shell/log.js';
 const log = createLogger({ module: 'merge-back-loop' });
@@ -157,7 +160,7 @@ export async function defaultEnumerateFocusBranchesAhead(config) {
 function defaultDeps() {
     return {
         enumerateFocusBranchesAhead: defaultEnumerateFocusBranchesAhead,
-        isWorktreeBeingWritten: defaultIsWorktreeBeingWritten,
+        isWorktreeBeingWritten: (focusId) => defaultIsWorktreeBeingWritten(focusId),
         worktreeHasUncommittedChanges,
         listPendingEscalations: defaultListPendingEscalations,
         markEscalationResolved: defaultMarkEscalationResolved,
@@ -166,6 +169,7 @@ function defaultDeps() {
         readMergeGateHold: (target) => readMergeGateHold(target),
         getFocusDeliveries: defaultGetFocusDeliveries,
         getOldestUnmergedCommitMs,
+        followUpMergeBackConflict: (productConfig, info) => runMergeBackFollowUp(productConfig, info, defaultMergeBackFollowUpDeps()),
         now: () => Date.now(),
     };
 }
@@ -547,11 +551,10 @@ export async function runMergeBackTick(config, depOverrides = {}) {
             log.debug(`skip ${info.branchName}: dirty worktree`);
             continue;
         }
-        // Gate 3: existing pending merge-conflict escalation for this branch
+        // Gate 3: a pending merge-conflict record holds the merge; its bounded follow-up (merge/merge-back-followup.ts) runs instead.
         if (findPendingConflictForBranch(pending, info.branchName)) {
             counts.skipped += 1;
-            log.debug(`skip ${info.branchName}: pending merge-conflict escalation`);
-            // No stuck-branch escalation here: a stuck conflict already has an escalation surface.
+            await deps.followUpMergeBackConflict?.(configForProduct(config, { id: info.productId, repoPath: info.repoPath }), info);
             continue;
         }
         // Gather worked deliveries (see WORKED_STATUSES).
@@ -563,9 +566,7 @@ export async function runMergeBackTick(config, depOverrides = {}) {
             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);
+        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
@@ -610,13 +611,11 @@ export async function runMergeBackTick(config, depOverrides = {}) {
         // 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 };
+        // Product-scoped: git ops run against the product's repo; its resolutionAgentTimeoutMs reaches a spawned fallback resolver.
+        const productConfig = configForProduct(config, { id: info.productId, repoPath: info.repoPath });
         let mergeResult;
         try {
-            mergeResult = await deps.mergeFocusBranch(productConfig, teamState, 
-            /* sessionId */ '', info.branchName, workedDeliveryIds);
+            mergeResult = await deps.mergeFocusBranch(productConfig, teamState, /* sessionId */ '', info.branchName, workedDeliveryIds);
         }
         catch (err) {
             counts.conflicts += 1;

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

@@ -1 +1 @@
-{"version":3,"file":"merge-back-loop.js","sourceRoot":"","sources":["../../src/merge/merge-back-loop.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"merge-back-loop.js","sourceRoot":"","sources":["../../src/merge/merge-back-loop.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,yEAAyE;AACzE,oFAAoF;AACpF,uDAAuD;AACvD,qEAAqE;AACrE,gBAAgB;AA8BhB,OAAO,EAAE,wBAAwB,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AAC/F,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,gBAAgB,IAAI,uBAAuB,EAAE,4BAA4B,EAAE,MAAM,kBAAkB,CAAC;AAC7G,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAwB,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,kBAAkB,IAAI,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AACxF,OAAO,EAAE,sBAAsB,IAAI,6BAA6B,EAAE,sBAAsB,IAAI,6BAA6B,EAAE,sBAAsB,IAAI,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AACtN,OAAO,EACL,wBAAwB,IAAI,+BAA+B,GAG5D,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAA0B,MAAM,6BAA6B,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,wCAAwC,IAAI,6BAA6B,EAAE,MAAM,+BAA+B,CAAC;AAC1H,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACjG,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,MAAM,GAAG,GAAG,YAAY,CAAC,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAC;AAGxD,yEAAyE;AAEzE,MAAM,CAAC,MAAM,uBAAuB,GAAG,oBAAoB,CAAC;AA0C5D,MAAM,mBAAmB,GAAuB;IAC9C,aAAa,EAAE,IAAI;IACnB,aAAa,EAAE,IAAI;IACnB,iBAAiB,EAAE,IAAI;IACvB,gBAAgB,EAAE,IAAI;IACtB,aAAa,EAAE,IAAI;IACnB,WAAW,EAAE,CAAC;IACd,cAAc,EAAE,IAAI;CACrB,CAAC;AAEF,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,2EAA2E;IAC3E,2DAA2D;IAC3D,cAAc,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,mBAAmB,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC;AACjF,CAAC;AAED;;;;;;GAMG;AACH,SAAS,aAAa,CACpB,UAAkB,EAClB,GAAW,EACX,MAAc;IAEd,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,mBAAmB,CAAC;IACvE,MAAM,cAAc,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACpD,MAAM,UAAU,GAAG,QAAQ,CAAC,gBAAgB,KAAK,cAAc,CAAC,KAAK,CAAC;IACtE,MAAM,KAAK,GAAuB;QAChC,GAAG,QAAQ;QACX,aAAa,EAAE,GAAG;QAClB,iBAAiB,EAAE,MAAM;QACzB,gBAAgB,EAAE,cAAc,CAAC,KAAK;QACtC,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,IAAI,QAAQ,CAAC,aAAa,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG;QACzF,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACtD,cAAc,EAAE,QAAQ,CAAC,cAAc;KACxC,CAAC;IACF,cAAc,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IACtC,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,cAAc,CAAC,KAAK,EAAE,eAAe,EAAE,cAAc,CAAC,eAAe,EAAE,CAAC;AACxG,CAAC;AAED,+EAA+E;AAC/E,SAAS,WAAW,CAAC,UAAkB,EAAE,KAAa;IACpD,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,mBAAmB,CAAC;IACvE,cAAc,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;AACzE,CAAC;AAED;;iDAEiD;AACjD,MAAM,oCAAoC,GAAG,CAAC,CAAC;AAE/C,SAAS,yBAAyB,CAAC,GAAuB;IACxD,wEAAwE;IACxE,iFAAiF;IACjF,+EAA+E;IAC/E,+EAA+E;IAC/E,0EAA0E;IAC1E,0EAA0E;IAC1E,MAAM,GAAG,GAAG,aAAa,CAAC,GAAG,CAAuC,CAAC;IACrE,MAAM,OAAO,GAAG,GAAG,CAAC,yCAAyC,CAAC;IAC9D,MAAM,QAAQ,GACZ,OAAO,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,GAAG,CAAC;QACpE,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,oCAAoC,CAAC;IAC3C,OAAO,QAAQ,GAAG,MAAM,CAAC;AAC3B,CAAC;AAkCD,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,CAAC,yDAAyD,OAAO,CAAC,EAAE,GAAG,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;YACzG,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,CAAC,OAAO,EAAE,EAAE,CAAC,6BAA6B,CAAC,OAAO,CAAC;QAC3E,6BAA6B;QAC7B,sBAAsB,EAAE,6BAA6B;QACrD,sBAAsB,EAAE,6BAA6B;QACrD,cAAc,EAAE,+BAA+B;QAC/C,gBAAgB,EAAE,uBAAuB;QACzC,iBAAiB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC;QACxD,kBAAkB,EAAE,yBAAyB;QAC7C,yBAAyB;QACzB,yBAAyB,EAAE,CAAC,aAAa,EAAE,IAAI,EAAE,EAAE,CAAC,oBAAoB,CAAC,aAAa,EAAE,IAAI,EAAE,4BAA4B,EAAE,CAAC;QAC7H,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,gBAAgB,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC;QACpD,KAAK,CAAC,IAAI,CAAC,cAAc,KAAK,CAAC,gBAAgB,cAAc,KAAK,CAAC,WAAW,eAAe,CAAC,CAAC;IACjG,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,gFAAgF;IAChF,yEAAyE;IACzE,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,WAAW,EAAE,uBAAuB,CAAC,cAAc;YACnD,QAAQ,EAAE,YAAY,EAAE,8DAA8D;YACtF,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;;;GAGG;AACH,KAAK,UAAU,6BAA6B,CAAC,IAAwB,EAAE,OAAkE,EAAE,IAAuB;IAChK,MAAM,KAAK,GAAG,8BAA8B,CAAC,OAAO,EAAE,uBAAuB,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAChG,MAAM,QAAQ,GAAG,EAAE,SAAS,EAAE,CAAC,qBAAqB,CAAC,uBAAuB,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,eAAe,EAAE,YAAY,EAAW,CAAC;IAC1L,MAAM,CAAC,IAAI,CAAC,sBAAsB,IAAI,6BAA6B,CAAC,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACpI,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,EAAE,EAAE,YAAY,EAAE,gDAAgD,CAAC,CAAC;QAC5G,GAAG,CAAC,IAAI,CAAC,+CAA+C,KAAK,CAAC,EAAE,QAAQ,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IAC7F,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,IAAI,CAAC,uDAAuD,KAAK,CAAC,EAAE,GAAG,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;IACvG,CAAC;AACH,CAAC;AAED,4EAA4E;AAC5E,SAAS,8BAA8B,CAAC,YAA+B;IACrE,QAAQ,YAAY,EAAE,CAAC;QACrB,KAAK,eAAe;YAClB,OAAO,wFAAwF,CAAC;QAClG,KAAK,gBAAgB;YACnB,OAAO,mHAAmH,CAAC;QAC7H;YACE,OAAO,8DAA8D,CAAC;IAC1E,CAAC;AACH,CAAC;AAED,uEAAuE;AACvE,SAAS,2BAA2B,CAAC,YAA+B,EAAE,MAAc;IAClF,QAAQ,YAAY,EAAE,CAAC;QACrB,KAAK,eAAe;YAClB,OAAO,wEAAwE,MAAM,uIAAuI,CAAC;QAC/N,KAAK,gBAAgB;YACnB,OAAO,gLAAgL,CAAC;QAC1L;YACE,OAAO,eAAe,MAAM,gFAAgF,CAAC;IACjH,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,8BAA8B,CAC3C,IAAwB,EACxB,KAAyB,EACzB,YAA+B,EAC/B,GAAW,EACX,QAAgB,EAChB,cAAmD;IAEnD,0EAA0E;IAC1E,kEAAkE;IAClE,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IACxC,IAAI,KAAK,CAAC,aAAa,IAAI,IAAI,IAAI,GAAG,GAAG,KAAK,CAAC,aAAa,GAAG,QAAQ;QAAE,OAAO,KAAK,CAAC;IAEtF,MAAM,QAAQ,GAAG,qBAAqB,CAAC,uBAAuB,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/F,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC,CAAC;IACjE,MAAM,WAAW,GACf,yBAAyB,IAAI,CAAC,SAAS,YAAY,IAAI,CAAC,UAAU,0BAA0B;QAC5F,IAAI,YAAY,KAAK,KAAK,CAAC,WAAW,gBAAgB,OAAO,OAAO;QACpE,GAAG,8BAA8B,CAAC,YAAY,CAAC,6CAA6C;QAC5F,yBAAyB,CAAC;IAC5B,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,WAAW,EAAE,uBAAuB,CAAC,cAAc;YACnD,QAAQ,EAAE,YAAY,EAAE,wDAAwD;YAChF,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,EAAE,2BAA2B,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC;YACtE,cAAc,EAAE,uBAAuB;YACvC,QAAQ,EAAE;gBACR,WAAW,EAAE,IAAI,CAAC,UAAU;gBAC5B,aAAa,EAAE,YAAY;gBAC3B,YAAY,EAAE,KAAK,CAAC,WAAW;gBAC/B,eAAe,EAAE,KAAK,CAAC,aAAa;gBACpC,mBAAmB,EAAE,KAAK,CAAC,iBAAiB,IAAI,IAAI;aACrD;SACF,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,CACN,6BAA6B,IAAI,CAAC,UAAU,kBAAkB,YAAY,KAAK,KAAK,CAAC,WAAW,GAAG;YACnG,KAAK,OAAO,8CAA8C,CAC3D,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,IAAI,CACN,2EAA2E,IAAI,CAAC,UAAU,GAAG,EAC5F,GAAa,CAAC,OAAO,CACvB,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,KAAK,UAAU,kBAAkB,CAC/B,IAAwB,EACxB,GAA6F,EAC7F,GAAW,EACX,QAAgB,EAChB,cAAmD;IAEnD,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,GAAG,CAAC;IACrD,IAAI,eAAe,EAAE,CAAC;QACpB,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,GAAG,QAAQ,CAAC,CAAC;QAC7C,GAAG,CAAC,IAAI,CACN,qBAAqB,IAAI,CAAC,UAAU,kCAAkC,YAAY,IAAI;YACtF,WAAW,KAAK,CAAC,WAAW,QAAQ,8BAA8B,CAAC,YAAY,CAAC,IAAI;YACpF,2BAA2B,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,4BAA4B,CACrF,CAAC;QACF,MAAM,8BAA8B,CAAC,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;IACjG,CAAC;SAAM,CAAC;QACN,GAAG,CAAC,IAAI,CACN,qBAAqB,IAAI,CAAC,UAAU,+BAA+B,YAAY,IAAI;YACnF,WAAW,KAAK,CAAC,WAAW,iEAAiE,CAC9F,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;IACjD,MAAM,QAAQ,GAAG,yBAAyB,EAAE,CAAC;IAE7C,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,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAErC,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,wEAAwE;QACxE,yEAAyE;QACzE,0EAA0E;QAC1E,4DAA4D;QAC5D,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACvD,IAAI,UAAU,EAAE,cAAc,IAAI,GAAG,GAAG,UAAU,CAAC,cAAc,EAAE,CAAC;YAClE,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;YACpB,GAAG,CAAC,KAAK,CACP,0BAA0B,IAAI,CAAC,UAAU,kCAAkC;gBAC3E,IAAI,UAAU,CAAC,gBAAgB,IAAI,SAAS,UAAU;gBACtD,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,WAAW,EAAE,EAAE,CACvD,CAAC;YACF,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,CAAC,uDAAuD,IAAI,CAAC,OAAO,GAAG,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;YACzG,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,CAAC,0BAA0B,IAAI,CAAC,UAAU,KAAK,WAAW,CAAC,MAAM,EAAE,IAAI,IAAI,SAAS,OAAO,WAAW,CAAC,MAAM,EAAE,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC;YACzI,SAAS;QACX,CAAC;QAED,iGAAiG;QACjG,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,8HAA8H;QAC9H,IAAI,4BAA4B,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3D,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;YACpB,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YACxH,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,CAAC,mDAAmD,IAAI,CAAC,OAAO,GAAG,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;QACvG,CAAC;QACD,MAAM,cAAc,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACnD,MAAM,iBAAiB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAElH,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,CAAC,0BAA0B,IAAI,CAAC,UAAU,oFAAoF,CAAC,CAAC;YACzI,SAAS;QACX,CAAC;QAED,8FAA8F;QAC9F,sFAAsF;QACtF,MAAM,MAAM,GAAoB,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC7N,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACtD,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YACtB,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;YACpB,GAAG,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,UAAU,KAAK,QAAQ,gBAAgB,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC;YAC5G,MAAM,8BAA8B,CAAC,IAAI,EAAE,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,iBAAiB,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YACnL,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,4HAA4H;QAC5H,MAAM,aAAa,GAAiB,gBAAgB,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9G,IAAI,WAAW,CAAC;QAChB,IAAI,CAAC;YACH,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;QAC9H,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,SAAS,IAAI,CAAC,CAAC;YACtB,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;YACxE,GAAG,CAAC,IAAI,CAAC,gDAAgD,IAAI,CAAC,UAAU,GAAG,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;YACrG,MAAM,kBAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YACxE,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,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAC3D,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,SAAS,IAAI,CAAC,CAAC;YACtB,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;YACxE,2EAA2E;YAC3E,2EAA2E;YAC3E,MAAM,kBAAkB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YACxE,mEAAmE;YACnE,4EAA4E;YAC5E,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/merge-conflict-escalation.d.ts

@@ -14,6 +14,8 @@
  */
 import { createEscalation, hasOpenWorktreeDirtyEscalation } from '../queries/escalations.js';
 import { reportGitState } from '../queries/deliveries.js';
+import { type EscalationSuppressionDeps } from '../queries/escalation-suppression.js';
+import type { MergeBackFollowUpTarget } from './merge-back-followup.js';
 /**
  * Parameters for merge conflict escalation/reporting.
  */
@@ -57,4 +59,14 @@ export interface MergeConflictEscalationDeps {
  * Called by all focus-level merge callers when mergeToIntegration fails.
  */
 export declare function escalateMergeConflict(params: MergeConflictParams, deps?: MergeConflictEscalationDeps): Promise<void>;
+/**
+ * The one observation a conflict episode files when its bounded resolver runs are
+ * spent (merge/merge-back-followup.ts). Cause-keyed per focus + branch, so repeats
+ * are suppressed. Merging integration into a focus branch is git work, so it names
+ * no human-only act: the routing decider decides who finishes it.
+ *
+ * `suppressionDeps` is the test seam onto the REAL idempotent filer (its row
+ * lookup + create); production callers omit it.
+ */
+export declare function fileResolverExhaustedObservation(target: MergeBackFollowUpTarget, failures: number, lastPartialRef: string | null, suppressionDeps?: EscalationSuppressionDeps): Promise<void>;
 //# sourceMappingURL=merge-conflict-escalation.d.ts.map

package/dist/merge/merge-conflict-escalation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-conflict-escalation.d.ts","sourceRoot":"","sources":["../../src/merge/merge-conflict-escalation.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EACL,gBAAgB,EAChB,8BAA8B,EAE/B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAY1D;;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,OAAO,EAAE,MAAM,CAAC;IAChB,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;;;;GAIG;AACH,MAAM,WAAW,2BAA2B;IAC1C,gBAAgB,CAAC,EAAE,OAAO,gBAAgB,CAAC;IAC3C,8BAA8B,CAAC,EAAE,OAAO,8BAA8B,CAAC;IACvE,cAAc,CAAC,EAAE,OAAO,cAAc,CAAC;CACxC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,mBAAmB,EAC3B,IAAI,GAAE,2BAAgC,GACrC,OAAO,CAAC,IAAI,CAAC,CAgGf"}
+{"version":3,"file":"merge-conflict-escalation.d.ts","sourceRoot":"","sources":["../../src/merge/merge-conflict-escalation.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EACL,gBAAgB,EAChB,8BAA8B,EAE/B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI1D,OAAO,EAA4B,KAAK,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AAEhH,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AASxE;;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,OAAO,EAAE,MAAM,CAAC;IAChB,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;;;;GAIG;AACH,MAAM,WAAW,2BAA2B;IAC1C,gBAAgB,CAAC,EAAE,OAAO,gBAAgB,CAAC;IAC3C,8BAA8B,CAAC,EAAE,OAAO,8BAA8B,CAAC;IACvE,cAAc,CAAC,EAAE,OAAO,cAAc,CAAC;CACxC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,mBAAmB,EAC3B,IAAI,GAAE,2BAAgC,GACrC,OAAO,CAAC,IAAI,CAAC,CAgGf;AAED;;;;;;;;GAQG;AACH,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,uBAAuB,EAC/B,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,GAAG,IAAI,EAC7B,eAAe,GAAE,yBAA8B,GAC9C,OAAO,CAAC,IAAI,CAAC,CAsBf"}

package/dist/merge/merge-conflict-escalation.js

@@ -1,6 +1,9 @@
 // PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
-// Pinned by: packages/daemon/src/merge/merge-conflict-escalation-dedup.test.ts,
-//   packages/daemon/src/merge/merge-failure-classification.test.ts
+// Pinned by: packages/daemon/src/integration/merge-back-resolver-timeout-regression.test.ts,
+//   packages/daemon/src/merge/merge-back-conflict.test.ts,
+//   packages/daemon/src/merge/merge-conflict-escalation-dedup.test.ts,
+//   packages/daemon/src/merge/merge-failure-classification.test.ts,
+//   packages/daemon/src/merge/resolver-exhausted-observation.test.ts
 // PINNED-BY-END
 /**
  * Merge-conflict escalation, reporting and retry.
@@ -21,6 +24,8 @@ import { reportGitState } from '../queries/deliveries.js';
 import { withRetry, ESCALATION_REASONS, ESCALATION_DISPOSITIONS } from '@telora/daemon-core';
 import { classifyMergeFailure } from './merge-failure-classify.js';
 import { NO_HUMAN_ACT } from '../queries/filing-observation.js';
+import { fileEscalationIdempotent } from '../queries/escalation-suppression.js';
+import { focusBlockageCauseKey } from '../queries/cause-key.js';
 import { createLogger } from '../shell/log.js';
 // Deliberately still 'focus-merge': these lines were sliced out of that module
 // and their `[focus-merge]` prefixes are matched by operators and by
@@ -132,4 +137,34 @@ export async function escalateMergeConflict(params, deps = {}) {
         log.error(`[focus-merge] Failed to create merge conflict escalation for "${deliveryName}": ${err.message}`);
     }
 }
+/**
+ * The one observation a conflict episode files when its bounded resolver runs are
+ * spent (merge/merge-back-followup.ts). Cause-keyed per focus + branch, so repeats
+ * are suppressed. Merging integration into a focus branch is git work, so it names
+ * no human-only act: the routing decider decides who finishes it.
+ *
+ * `suppressionDeps` is the test seam onto the REAL idempotent filer (its row
+ * lookup + create); production callers omit it.
+ */
+export async function fileResolverExhaustedObservation(target, failures, lastPartialRef, suppressionDeps = {}) {
+    await fileEscalationIdempotent({
+        causeKey: focusBlockageCauseKey(MERGE_CONFLICT_ESCALATION_KIND, target.focusId, `resolver_exhausted:${target.branchName}`),
+        organizationId: target.organizationId,
+        sessionId: '',
+        issueId: null,
+        reasonType: ESCALATION_REASONS.ERROR_ENCOUNTERED,
+        disposition: ESCALATION_DISPOSITIONS.NEEDS_OPERATOR,
+        humanAct: NO_HUMAN_ACT,
+        anchor: { focusId: target.focusId, branch: target.branchName },
+        description: `The merge of integration into a focus branch conflicts, and ${failures} bounded resolver run(s) ` +
+            `(escalating budgets) could not finish it.\n\n**Focus:** ${target.focusName}\n**Source branch:** ${target.branchName}\n` +
+            `**Preserved partial resolution:** ${lastPartialRef ?? 'none'}\n` +
+            `The focus worktree is clean at its committed HEAD; the merge_conflict record stays open.`,
+        whatWasTried: `${failures} contained fallback resolver run(s), each restored and preserved on failure.`,
+        helpNeeded: `Finish the merge of integration into ${target.branchName} (a coding pass on the focus can do it, starting from ` +
+            `${lastPartialRef ?? 'the conflict markers'}), or decide the branch should not merge.`,
+        escalationKind: MERGE_CONFLICT_ESCALATION_KIND,
+        metadata: { branch_name: target.branchName, resolver_failures: failures, preserved_partial_ref: lastPartialRef },
+    }, suppressionDeps);
+}
 //# sourceMappingURL=merge-conflict-escalation.js.map