@telora/daemon 0.22.132 → 0.22.136

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

@@ -0,0 +1,119 @@
+/**
+ * Merge-back conflict handling with failure containment.
+ *
+ * When merging integration back into a focus branch conflicts, the daemon asks
+ * a resolver to finish the merge in the live focus worktree: the team lead when
+ * one is executing, otherwise a short-lived fallback resolution agent. This
+ * module owns what happens when that resolver CANNOT finish: the half-merged
+ * worktree (MERGE_HEAD, unmerged paths, partial edits) is preserved as a named
+ * ref + patch and restored to the committed focus HEAD captured before the
+ * merge-back, so no automatic path stays blocked on a dirty tree and the next
+ * actor starts from a sane worktree (Nexus request 8679bae1, 2026-09-17).
+ *
+ * Restore runs only when no live resolver still owns the tree: always after the
+ * fallback agent (it has exited or been killed by the time it returns), and on
+ * the team-lead path only once the lead is no longer alive.
+ *
+ * Sliced out of focus-merge.ts (file-size limit). It deliberately does NOT call
+ * mergeBackFromIntegration -- MERGE_OWNERSHIP_POLICY keeps that entry point in
+ * focus-merge.ts -- and the team-lead collaborators defined in focus-merge.ts are
+ * injected, so this module imports nothing from it and closes no cycle.
+ */
+import type { DaemonConfig, FocusTeamState, MergeConflictResolutionResult } from '../types/index.js';
+import { preserveAndRestoreFocusWorktree, type PreserveAndRestoreResult } from '../git/index.js';
+import { reportGitState } from '../queries/deliveries.js';
+import { spawnResolutionAgent } from '../spawn/lifecycle.js';
+import { escalateMergeConflict } from './merge-conflict-escalation.js';
+/** Collaborators of the merge-back conflict handler. */
+export interface MergeBackConflictDeps {
+    requestTeamLeadResolution: (teamState: FocusTeamState, conflictFiles: string[], branchName: string, integrationBranch: string) => Promise<MergeConflictResolutionResult>;
+    isResolverStillAlive: (teamState: FocusTeamState) => boolean;
+    spawnResolutionAgent: typeof spawnResolutionAgent;
+    preserveAndRestore: typeof preserveAndRestoreFocusWorktree;
+    escalateMergeConflict: typeof escalateMergeConflict;
+    reportGitState: typeof reportGitState;
+    /** Current HEAD of a worktree, or null when unreadable. */
+    readHead: (worktreePath: string) => string | null;
+    /** Clock for the per-branch resolver attempt bound (merge/merge-back-followup.ts). */
+    now: () => number;
+}
+/** Whether a worktree's HEAD already contains the integration tip (origin/<branch> when the repo has an origin). */
+export declare function integrationMergedIntoHead(worktreePath: string, integrationBranch: string): boolean;
+/**
+ * Pure over git: why a resolver's reported success is NOT a completed merge-back,
+ * or null when it is. Completed means HEAD moved past the committed focus HEAD,
+ * still contains it, and contains the integration tip. A clean tree alone is not
+ * enough: a resolver that aborts the merge and commits something unrelated leaves
+ * a clean tree with a new HEAD, and that is not a merge of integration.
+ */
+export declare function mergeBackIncompleteReason(worktreePath: string, preMergeHead: string, integrationBranch: string, readHead: (worktreePath: string) => string | null): string | null;
+/** Default git HEAD reader. */
+export declare function readWorktreeHead(worktreePath: string): string | null;
+/** The outcome of a contained resolution attempt. */
+export type ContainedResolutionResult = {
+    resolved: true;
+} | {
+    resolved: false;
+    error: string;
+    restore: PreserveAndRestoreResult | null;
+};
+/**
+ * Pure: the containment line appended to a merge_conflict escalation, so the
+ * record names where the partial work went and whether the tree is sane.
+ */
+export declare function describeContainment(restore: PreserveAndRestoreResult | null): string;
+/**
+ * Run the fallback resolution agent and contain its failure. Success requires a
+ * finished merge in a clean tree (spawnResolutionAgent) whose HEAD contains both
+ * `preMergeHead` and the integration tip ({@link mergeBackIncompleteReason}).
+ * Anything else -- timeout, spawn error, conflicts remaining, a merge left
+ * uncommitted, an aborted merge, an unrelated commit -- preserves the partial
+ * work and restores the worktree.
+ *
+ * Every run counts against the branch's bounded resolver episode
+ * (merge/merge-back-followup.ts). Each run gets an escalating budget and is seeded
+ * with the previous run's preserved partial resolution. While the episode is
+ * backing off or exhausted, or the run cannot be spent durably first, no agent is spawned: the fresh merge's markers are
+ * cleared (nothing worth preserving) and the attempt reports unresolved.
+ */
+export declare function runContainedFallbackResolution(params: ContainedResolutionParams, deps: Pick<MergeBackConflictDeps, 'spawnResolutionAgent' | 'preserveAndRestore' | 'readHead' | 'now'>): Promise<ContainedResolutionResult>;
+/** Inputs of runContainedFallbackResolution. */
+interface ContainedResolutionParams {
+    config: DaemonConfig;
+    worktreePath: string;
+    branchName: string;
+    integrationBranch: string;
+    conflictFiles: string[];
+    focusDescription: string;
+    model: string | null;
+    focusId: string | null;
+    /** The committed focus HEAD read before merge-back; callers refuse merge-back without one. */
+    preMergeHead: string;
+}
+/** Inputs of the merge-back conflict handler (all already resolved by mergeFocusBranch). */
+export interface MergeBackConflictArgs {
+    config: DaemonConfig;
+    teamState: FocusTeamState;
+    sessionId: string;
+    branchName: string;
+    representativeDeliveryId: string;
+    worktreePath: string;
+    /** The committed focus HEAD read before mergeBackFromIntegration ran (merge-back is refused without one). */
+    preMergeHead: string;
+    conflictFiles: string[];
+}
+/**
+ * Resolve a merge-back conflict via the live team lead or the fallback agent.
+ * On failure: contain it (when no live resolver owns the tree), file the
+ * merge_conflict record naming the containment, and report unresolved.
+ */
+export declare function handleMergeBackConflict(args: MergeBackConflictArgs, deps: MergeBackConflictDeps): Promise<MergeBackConflictOutcome>;
+type MergeBackConflictOutcome = {
+    resolved: true;
+} | {
+    resolved: false;
+    exitReason: 'merge_back_conflict_unresolved';
+    restore: PreserveAndRestoreResult | null;
+};
+export {};
+//# sourceMappingURL=merge-back-conflict.d.ts.map

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

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

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

@@ -0,0 +1,178 @@
+// 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
+// PINNED-BY-END
+import { runGitSync, hasOriginRemote } from '../git/index.js';
+import { withMergeBackInFlight } from './merge-back-activity.js';
+import { decideResolverAttempt, consumeResolverAttempt, getResolverAttemptState, recordResolverFailure, recordResolverSuccess, MAX_RESOLVER_ATTEMPTS, } from './merge-back-followup.js';
+import { createLogger } from '../shell/log.js';
+const log = createLogger({ module: 'focus-merge' });
+/** Whether a worktree's HEAD already contains the integration tip (origin/<branch> when the repo has an origin). */
+export function integrationMergedIntoHead(worktreePath, integrationBranch) {
+    const tip = hasOriginRemote(worktreePath) ? `origin/${integrationBranch}` : integrationBranch;
+    return runGitSync(['merge-base', '--is-ancestor', tip, 'HEAD'], worktreePath).success;
+}
+/** Whether `ancestor` is reachable from `descendant`. */
+function isAncestor(worktreePath, ancestor, descendant) {
+    return runGitSync(['merge-base', '--is-ancestor', ancestor, descendant], worktreePath).success;
+}
+/**
+ * Pure over git: why a resolver's reported success is NOT a completed merge-back,
+ * or null when it is. Completed means HEAD moved past the committed focus HEAD,
+ * still contains it, and contains the integration tip. A clean tree alone is not
+ * enough: a resolver that aborts the merge and commits something unrelated leaves
+ * a clean tree with a new HEAD, and that is not a merge of integration.
+ */
+export function mergeBackIncompleteReason(worktreePath, preMergeHead, integrationBranch, readHead) {
+    const head = readHead(worktreePath);
+    if (head === null)
+        return 'could not read HEAD after the resolver exited';
+    if (head === preMergeHead)
+        return 'resolver exited without committing the merge (HEAD did not advance)';
+    if (!isAncestor(worktreePath, preMergeHead, head))
+        return `resolver left HEAD ${head}, which no longer contains the committed focus HEAD ${preMergeHead}`;
+    if (!integrationMergedIntoHead(worktreePath, integrationBranch)) {
+        return `resolver left HEAD ${head}, which does not contain the ${integrationBranch} tip (the merge was not completed)`;
+    }
+    return null;
+}
+/** Default git HEAD reader. */
+export function readWorktreeHead(worktreePath) {
+    const r = runGitSync(['rev-parse', 'HEAD'], worktreePath);
+    return r.success && r.output.length > 0 ? r.output : null;
+}
+/**
+ * Pure: the containment line appended to a merge_conflict escalation, so the
+ * record names where the partial work went and whether the tree is sane.
+ */
+export function describeContainment(restore) {
+    if (restore === null) {
+        return 'The worktree was NOT restored: the resolver still owns it.';
+    }
+    const kept = restore.preservedRef || restore.patchPath
+        ? `Partial resolution preserved at ${restore.preservedRef ?? '(no ref)'}${restore.patchPath ? ` (patch: ${restore.patchPath})` : ''}.`
+        : `No partial resolution preserved${restore.preserveError ? ` (${restore.preserveError})` : ' (nothing differed from the committed HEAD)'}.`;
+    const tree = restore.clean
+        ? 'The focus worktree was restored to its committed HEAD (no MERGE_HEAD, no unmerged paths, no uncommitted edits).'
+        : `The focus worktree could NOT be confirmed clean after restore: ${restore.residue ?? 'unknown residue'}`;
+    return `${kept} ${tree}`;
+}
+/**
+ * Run the fallback resolution agent and contain its failure. Success requires a
+ * finished merge in a clean tree (spawnResolutionAgent) whose HEAD contains both
+ * `preMergeHead` and the integration tip ({@link mergeBackIncompleteReason}).
+ * Anything else -- timeout, spawn error, conflicts remaining, a merge left
+ * uncommitted, an aborted merge, an unrelated commit -- preserves the partial
+ * work and restores the worktree.
+ *
+ * Every run counts against the branch's bounded resolver episode
+ * (merge/merge-back-followup.ts). Each run gets an escalating budget and is seeded
+ * with the previous run's preserved partial resolution. While the episode is
+ * backing off or exhausted, or the run cannot be spent durably first, no agent is spawned: the fresh merge's markers are
+ * cleared (nothing worth preserving) and the attempt reports unresolved.
+ */
+export async function runContainedFallbackResolution(params, deps) {
+    // In flight until the run and its containment settle: abandoned-merge recovery must not touch the tree meanwhile.
+    return withMergeBackInFlight(params.worktreePath, () => runContainedFallbackResolutionNow(params, deps));
+}
+async function runContainedFallbackResolutionNow(params, deps) {
+    const { worktreePath, branchName, preMergeHead } = params;
+    const decision = decideResolverAttempt(getResolverAttemptState({ branchName, worktreePath }), deps.now());
+    if (decision.kind !== 'attempt') {
+        const error = decision.kind === 'exhausted'
+            ? `resolver attempts exhausted (${decision.failures} of ${MAX_RESOLVER_ATTEMPTS} failed); no agent spawned`
+            : `resolver backing off until ${new Date(decision.retryAt).toISOString()} after a failed run; no agent spawned`;
+        return { resolved: false, error, restore: deps.preserveAndRestore({ worktreePath, preMergeHead, branchName, preserve: false }) };
+    }
+    // Spend the run durably before it starts: a daemon that dies mid-run must not be granted it again.
+    if (!consumeResolverAttempt({ branchName, worktreePath }, deps.now())) {
+        const error = 'the resolver attempt could not be recorded durably; no agent spawned (fails closed to the bounded hand-off)';
+        return { resolved: false, error, restore: deps.preserveAndRestore({ worktreePath, preMergeHead, branchName, preserve: false }) };
+    }
+    const agent = await deps.spawnResolutionAgent({
+        config: params.config,
+        worktreePath,
+        branchName,
+        integrationBranch: params.integrationBranch,
+        conflictFiles: params.conflictFiles,
+        focusDescription: params.focusDescription,
+        model: params.model,
+        focusId: params.focusId,
+        budgetMultiplier: decision.budgetMultiplier,
+        priorPartialRef: decision.priorPartialRef,
+    });
+    let error = agent.error ?? 'unknown';
+    if (agent.success) {
+        const incomplete = mergeBackIncompleteReason(worktreePath, preMergeHead, params.integrationBranch, deps.readHead);
+        if (incomplete === null) {
+            recordResolverSuccess({ branchName, worktreePath });
+            return { resolved: true };
+        }
+        error = incomplete;
+    }
+    const restore = deps.preserveAndRestore({ worktreePath, preMergeHead, branchName });
+    recordResolverFailure({ branchName, worktreePath }, deps.now(), restore.preservedRef);
+    return { resolved: false, error: `${error} (resolver run ${decision.attempt} of ${MAX_RESOLVER_ATTEMPTS})`, restore };
+}
+/**
+ * Resolve a merge-back conflict via the live team lead or the fallback agent.
+ * On failure: contain it (when no live resolver owns the tree), file the
+ * merge_conflict record naming the containment, and report unresolved.
+ */
+export async function handleMergeBackConflict(args, deps) {
+    // In flight while the team lead or the fallback agent resolves (abandoned-merge recovery reads it).
+    return withMergeBackInFlight(args.worktreePath, () => handleMergeBackConflictNow(args, deps));
+}
+async function handleMergeBackConflictNow(args, deps) {
+    const { config, teamState, sessionId, branchName, representativeDeliveryId, worktreePath, preMergeHead, conflictFiles } = args;
+    let failure;
+    let restore = null;
+    if (teamState.leadStdin && teamState.phase === 'executing') {
+        const resolution = await deps.requestTeamLeadResolution(teamState, conflictFiles, branchName, config.integrationBranch);
+        if (resolution.resolved) {
+            log.info(`Conflict resolved by team lead for "${teamState.focusName}", proceeding`);
+            return { resolved: true };
+        }
+        failure = `Merge-back conflict unresolved: ${resolution.reason ?? 'unknown'}`;
+        if (!deps.isResolverStillAlive(teamState)) {
+            restore = deps.preserveAndRestore({ worktreePath, preMergeHead, branchName });
+        }
+    }
+    else {
+        log.info(`No active team lead for "${teamState.focusName}", spawning fallback resolution agent`);
+        for (const deliveryId of teamState.knownDeliveryIds) {
+            if (!teamState.mergedDeliveryIds.has(deliveryId)) {
+                deps.reportGitState(deliveryId, 'resolving_conflict').catch(err => log.warn(`reportGitState resolving_conflict failed for ${deliveryId}:`, err.message));
+            }
+        }
+        const result = await runContainedFallbackResolution({
+            config, worktreePath, branchName,
+            integrationBranch: config.integrationBranch,
+            conflictFiles,
+            focusDescription: teamState.focusName,
+            model: teamState.pipelineConfig?.model ?? null,
+            focusId: teamState.focusId,
+            preMergeHead,
+        }, deps);
+        if (result.resolved) {
+            log.info(`Fallback resolution agent resolved conflicts for "${teamState.focusName}", proceeding`);
+            return { resolved: true };
+        }
+        // "conflict" stays in the text: classifyMergeFailure reads it as a content conflict.
+        failure = `Merge-back conflict unresolved: fallback resolution agent failed: ${result.error}`;
+        restore = result.restore;
+    }
+    await deps.escalateMergeConflict({
+        organizationId: teamState.organizationId,
+        sessionId,
+        deliveryId: representativeDeliveryId,
+        deliveryName: teamState.focusName,
+        focusId: teamState.focusId,
+        branchName,
+        integrationBranch: config.integrationBranch,
+        mergeError: `${failure}. ${describeContainment(restore)}`,
+    });
+    return { resolved: false, exitReason: 'merge_back_conflict_unresolved', restore };
+}
+//# sourceMappingURL=merge-back-conflict.js.map

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

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

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

@@ -0,0 +1,109 @@
+import type { DaemonConfig, PipelineConfig } from '../types/index.js';
+import { type PreserveAndRestoreResult } from '../git/index.js';
+/** Follow-up resolver runs after the inline fallback, per conflict episode. */
+export declare const MERGE_BACK_FOLLOWUP_MAX_ATTEMPTS = 2;
+/** Every resolver run a conflict episode may spend: the inline fallback + the follow-ups. */
+export declare const MAX_RESOLVER_ATTEMPTS: number;
+/** Minimum gap between a failed resolver run and the next follow-up. */
+export declare const MERGE_BACK_FOLLOWUP_BACKOFF_MS: number;
+interface ResolverAttemptState {
+    /** Resolver runs consumed this episode. Counted BEFORE a run spawns, so a crash mid-run still spent it. */
+    failures: number;
+    lastFailureAt: number;
+    /** The partial resolution the latest failed run preserved, handed to the next run. */
+    lastPartialRef: string | null;
+    /** Set only once the resolver-exhausted observation was actually filed, so a failed filing is retried. */
+    exhaustionFiled: boolean;
+    /** A run was consumed and has not reported back yet (or the daemon died during it). */
+    inFlight?: boolean;
+    /** Why the durable record could not be trusted; the episode is then treated as exhausted. */
+    storageError?: string;
+}
+/** Which conflict episode: the focus branch, and a worktree of the repo whose git dir holds its durable record. */
+export interface ResolverEpisodeKey {
+    branchName: string;
+    worktreePath: string;
+}
+/**
+ * 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 declare function __resetResolverAttemptsForTesting(): void;
+/**
+ * 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 declare function resolverAttemptRecordPath(key: ResolverEpisodeKey): string | null;
+/**
+ * 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 declare function getResolverAttemptState(key: ResolverEpisodeKey): Readonly<ResolverAttemptState> | 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 declare function consumeResolverAttempt(key: ResolverEpisodeKey, now: number): boolean;
+/** Record a failed resolver run. A run already spent by {@link consumeResolverAttempt} is not counted twice. */
+export declare function recordResolverFailure(key: ResolverEpisodeKey, now: number, partialRef: string | null): void;
+/** A completed merge-back ends the episode. */
+export declare function recordResolverSuccess(key: ResolverEpisodeKey): void;
+/** 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 declare function budgetMultiplierForNextAttempt(state: Pick<ResolverAttemptState, 'failures'> | undefined): number;
+export type ResolverAttemptDecision = {
+    kind: 'attempt';
+    attempt: number;
+    budgetMultiplier: number;
+    priorPartialRef: string | null;
+} | {
+    kind: 'backoff';
+    retryAt: number;
+} | {
+    kind: 'exhausted';
+    failures: number;
+};
+/** Pure: may another resolver run start for this branch now? */
+export declare function decideResolverAttempt(state: Pick<ResolverAttemptState, 'failures' | 'lastFailureAt' | 'lastPartialRef'> | undefined, now: number): ResolverAttemptDecision;
+/** The outcome of one merge-back completion attempt. */
+export type MergeBackAttemptOutcome = {
+    kind: 'merged';
+} | {
+    kind: 'failed';
+    error: string;
+    restore: PreserveAndRestoreResult | null;
+} | {
+    kind: 'error';
+    message: string;
+};
+/** The focus branch the follow-up works on (the merge-back loop's per-branch info). */
+export interface MergeBackFollowUpTarget {
+    focusId: string;
+    organizationId: string;
+    focusName: string;
+    branchName: string;
+    worktreePath: string;
+    pipelineConfig: PipelineConfig | null;
+    readOnly: boolean;
+}
+export interface MergeBackFollowUpDeps {
+    /** Re-run merge-back and, on conflict, the contained fallback resolver (merge/focus-merge.ts). */
+    attempt: (config: DaemonConfig, target: MergeBackFollowUpTarget) => Promise<MergeBackAttemptOutcome>;
+    /** Resolve the open merge_conflict record(s) for the focus; returns how many. */
+    resolveConflictRecord: (focusId: string) => Promise<number>;
+    /** Whether the focus branch already contains the integration tip (a merge finished outside this loop). */
+    integrationMergedIn: (config: DaemonConfig, target: MergeBackFollowUpTarget) => boolean;
+    /** File the one cause-keyed resolver-exhausted observation for the branch (idempotent). */
+    fileExhausted: (target: MergeBackFollowUpTarget, failures: number, lastPartialRef: string | null) => Promise<void>;
+    now: () => number;
+}
+export type MergeBackFollowUpResult = 'merged' | 'failed' | 'backoff' | 'exhausted' | 'error' | 'skipped';
+/**
+ * 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 declare function runMergeBackFollowUp(config: DaemonConfig, target: MergeBackFollowUpTarget, deps: MergeBackFollowUpDeps): Promise<MergeBackFollowUpResult>;
+export {};
+//# sourceMappingURL=merge-back-followup.d.ts.map

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

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