@telora/daemon 0.21.26 → 0.21.81

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

@@ -0,0 +1,122 @@
+/**
+ * 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 type { DaemonConfig, FocusDeliveryInfo, PipelineConfig } from '../types/index.js';
+import { mergeFocusBranch as defaultMergeFocusBranch } from './focus-merge.js';
+import { listPendingEscalations as defaultListPendingEscalations, markEscalationResolved as defaultMarkEscalationResolved } from '../queries/issues.js';
+import { type FileEscalationIdempotentParams, type FileEscalationIdempotentResult } from '../queries/escalation-suppression.js';
+import { type MergeFailureClass } from './merge-failure-classify.js';
+export declare const STUCK_FOCUS_BRANCH_KIND = "stuck_focus_branch";
+export interface MergeBackFocusInfo {
+    focusId: string;
+    focusName: string;
+    organizationId: string;
+    productId: string;
+    branchName: string;
+    worktreePath: string;
+    /** Per-product git repo path. Required because the root daemon config's
+     *  repoPath is the default for the first product and is wrong when a
+     *  multi-product daemon processes branches for other products. */
+    repoPath: string;
+    pipelineConfig: PipelineConfig | null;
+    readOnly: boolean;
+}
+/**
+ * In-memory per-branch attempt tracking. Resets on daemon restart;
+ * stuck-branch escalation creation tolerates that — the next tick
+ * after restart simply re-evaluates the branch from scratch.
+ */
+export interface BranchAttemptState {
+    lastSuccessAt: number | null;
+    lastFailureAt: number | null;
+    lastFailureReason: string | null;
+    /** Classified condition of the most recent failure (null before any failure). */
+    lastFailureClass: MergeFailureClass | null;
+    /** Start of the current run of identical-class failures (null when none). */
+    firstRepeatAt: number | null;
+    /** Count of consecutive identical-class failures (0 when none). */
+    repeatCount: number;
+    /**
+     * When set, the branch is being throttled after a DETERMINISTIC failure and
+     * must not be re-attempted before this timestamp -- so a self-inflicted,
+     * unclearable failure does not re-run every 30s poll tick.
+     */
+    throttledUntil: number | null;
+}
+/** Reset attempt tracking — tests use this to start from a clean slate. */
+export declare function __resetMergeBackAttemptsForTesting(): void;
+/** Read the attempt state for a branch (for tests / introspection). */
+export declare function getBranchAttemptState(branchName: string): BranchAttemptState | undefined;
+export interface MergeBackTickResult {
+    scanned: number;
+    merged: number;
+    skipped: number;
+    conflicts: number;
+}
+export interface MergeBackLoopDeps {
+    enumerateFocusBranchesAhead: (config: DaemonConfig) => Promise<MergeBackFocusInfo[]>;
+    isWorktreeBeingWritten: (focusId: string) => Promise<{
+        active: boolean;
+        reason: {
+            code: string;
+            message: string;
+        } | null;
+    }>;
+    worktreeHasUncommittedChanges: (worktreePath: string) => boolean;
+    listPendingEscalations: typeof defaultListPendingEscalations;
+    markEscalationResolved: typeof defaultMarkEscalationResolved;
+    /**
+     * File the stuck-branch escalation through the cause-keyed idempotent gate:
+     * suppresses a re-file while an open OR dismissed row carries the per-branch
+     * cause key, so an operator dismissal is not re-filed on the next 30s tick.
+     */
+    fileEscalation: (params: FileEscalationIdempotentParams) => Promise<FileEscalationIdempotentResult>;
+    mergeFocusBranch: typeof defaultMergeFocusBranch;
+    getFocusDeliveries: (focusId: string) => Promise<FocusDeliveryInfo[]>;
+    getOldestUnmergedCommitMs: (branchName: string, integrationBranch: string, repoPath: string) => number | null;
+    now?: () => number;
+}
+/**
+ * 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 declare function getOldestUnmergedCommitMs(branchName: string, targetBranch: string, repoPath: string): number | null;
+/**
+ * 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 declare function defaultEnumerateFocusBranchesAhead(config: DaemonConfig): Promise<MergeBackFocusInfo[]>;
+/**
+ * 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 declare function runMergeBackTick(config: DaemonConfig, depOverrides?: Partial<MergeBackLoopDeps>): Promise<MergeBackTickResult>;
+//# sourceMappingURL=merge-back-loop.d.ts.map

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

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