@telora/daemon 0.23.14 → 0.23.16

package/dist/merge/completion-merge-gate.js

@@ -0,0 +1,185 @@
+// PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
+// Pinned by: packages/daemon/src/completion/team-exit/teardown-merge-gate.test.ts,
+//   packages/daemon/src/completion/team-teardown/mid-flight-merge-gate.test.ts,
+//   packages/daemon/src/merge/attributed-capture-merge-gate.test.ts,
+//   packages/daemon/src/merge/completion-merge-gate.test.ts,
+//   packages/daemon/src/merge/merge-back-loop.test.ts, packages/daemon/src/merge/merge-gate-coverage.test.ts,
+//   packages/daemon/src/merge/resolved-conflict-merge-gate.test.ts,
+//   packages/daemon/src/merge/safe-remove-merge-gate.test.ts
+// PINNED-BY-END
+/**
+ * Whether a focus branch may reach integration: ONCE, when its focus is
+ * complete, by fast-forward to a candidate commit the full CI suite judged green.
+ *
+ * Every focus-to-integration entry point asks this gate -- the team-exit merge
+ * (completion/team-exit/merge-phase.ts attemptFocusMerge), the merge-back loop
+ * (merge/merge-back-loop.ts), the mid-flight merge
+ * (completion/team-teardown/team-lifecycle.ts), the merge-before-remove
+ * (merge/focus-worktree-removal.ts) and the resolved-conflict retry
+ * (merge/focus-merge.ts checkResolvedMergeConflicts) -- and every one holds a
+ * focus that is still mid-focus. Why: docs/DECISIONS.md, "A focus merges into
+ * integration once, at completion".
+ *
+ * The decision, in order (the first that fails holds):
+ *   1. COMPLETE: every focus delivery is done -- a cancelled one too holds, as
+ *      the agreed criterion reads ("every delivery done"), and so does a focus
+ *      with no delivery. Delivery facts, never product_focuses.status (humans
+ *      own focus completion).
+ *   2. APPROVED HEAD: the focus's newest current approval
+ *      (queries/focus-review/focus-review-approval.ts) is on the branch, the gate
+ *      did not fail at it (merge/approval-gate-state.ts), and every commit after it
+ *      is a merge git proves CLEAN (merge/merge-gate-coverage.ts isCleanMerge) --
+ *      an integration sync that adds nothing over git's automatic merge, judged by
+ *      step 4 rather than by review. A merge after it that DECIDED a conflict
+ *      changed code no review saw: the next step is REVIEW_MERGE, the focus back
+ *      to coding so its review judges that head. Commits under the approval obey
+ *      the capture rule (a daemon WIP capture is never gated by itself;
+ *      merge/merge-gate-coverage.ts judgeMergeGateCoverage).
+ *   3. CONTAINS INTEGRATION: the branch head contains the integration tip; else
+ *      the next step is MERGE_OUT -- one automatic merge, kept only when clean; a
+ *      conflict is aborted and handed to the team (merge/focus-merge.ts
+ *      attemptCompletionMergeOut). No resolver decides a conflict on this path.
+ *   4. GREEN CANDIDATE: the head's refs/ci-status reads success (ci/candidate-ref.ts).
+ *      Not pushed yet -> PUSH_CANDIDATE; pushed, no verdict -> WAIT_CI; red -> REWORK.
+ * A hold carries the step that would advance it (`next`) for the merge-back loop,
+ * which is the one driver of those steps; the other entry points just hold.
+ * An admission names the exact commit that passed (`candidateSha`), and
+ * integration advances only by fast-forward to that commit (git/merge.ts
+ * mergeToIntegration). Any unreadable input holds (fail closed).
+ *
+ * @module merge/completion-merge-gate
+ */
+import { DELIVERY_STATUS } from '@telora/daemon-core';
+import { stopFires } from '../supervision/stop-registry.js';
+import { judgeMergeGateCoverage, } from './merge-gate-coverage.js';
+/** Step 1: every delivery done (cancelled is not done), at least one delivery. Pure. */
+export function focusCompletionHold(deliveries) {
+    const open = deliveries.filter((d) => d.executionStatus !== DELIVERY_STATUS.DONE);
+    if (open.length > 0) {
+        const names = open.slice(0, 3).map((d) => `"${d.name}" (${d.executionStatus ?? 'unknown'})`).join(', ');
+        return `the focus is not complete: ${open.length} delivery(ies) not done -- ${names}${open.length > 3 ? ', ...' : ''}`;
+    }
+    if (deliveries.length === 0)
+        return 'the focus is not complete: no delivery is done';
+    return null;
+}
+/** The merges after the approved commit that git cannot prove clean (they decided a conflict, or edited). Pure. */
+export function unreviewedMergesAfter(commits, approval) {
+    return commits.filter((c) => !approval.contains.has(c.sha) && c.isMerge && c.cleanMerge !== true);
+}
+/**
+ * Step 2 over listed commits: everything after the approved commit must be a
+ * merge (an integration sync; one that is not clean is unreviewedMergesAfter's),
+ * and what the approval contains must be gated by it under the capture rule. Pure.
+ */
+export function approvedHeadHold(commits, approval) {
+    const after = commits.filter((c) => !approval.contains.has(c.sha));
+    const authoredAfter = after.filter((c) => !c.isMerge);
+    if (authoredAfter.length > 0) {
+        return `${authoredAfter.length} commit(s) after the approved head ${approval.sha.slice(0, 9)} -- the newest review must approve HEAD`;
+    }
+    const under = commits.filter((c) => approval.contains.has(c.sha));
+    const coverage = judgeMergeGateCoverage(under, [approval]);
+    if (coverage.allGated)
+        return null;
+    const captures = coverage.ungatedWipCaptures.length === 0
+        ? ''
+        : `, including ${coverage.ungatedWipCaptures.length} daemon WIP capture(s) (${coverage.ungatedWipCaptures.map((c) => c.sha.slice(0, 9)).join(', ')})`;
+    return `${coverage.ungated.length} commit(s) not past the focus's review gate${captures}`;
+}
+async function readApproval(target, deps) {
+    const approved = await deps.readApprovedReviewSha(target);
+    if (approved === null)
+        return { hold: 'no current review approves the focus head' };
+    const resolved = deps.resolveAnchor(target.repoPath, target.integrationBranch, approved);
+    if (resolved === null)
+        return { hold: `the approved commit ${approved.slice(0, 9)} is not on ${target.branchName}` };
+    const state = await deps.judgeApprovalGate(target, resolved.sha);
+    if (state === 'failed')
+        return { hold: `the approving review at ${resolved.sha.slice(0, 9)} anchors nothing: the gate verdict there FAILED` };
+    if (state === 'pending') {
+        return { hold: `the approving review at ${resolved.sha.slice(0, 9)} anchors nothing: no gate verdict is recorded there yet and a gate is configured for the focus` };
+    }
+    return { ...resolved, source: state === 'auto_approval' ? 'auto_approval' : 'approved_review' };
+}
+/** Steps 3-4: the candidate. Returns the admission when the head is green. */
+function candidateStage(target, deps) {
+    const head = deps.resolveBranchHead(target.repoPath, target.branchName);
+    if (head === null)
+        return { hold: `the head of ${target.branchName} could not be read` };
+    const tip = deps.resolveIntegrationTip(target);
+    if (tip === null)
+        return { hold: `the ${target.integrationBranch} tip could not be read` };
+    if (!deps.isAncestor(target.repoPath, tip, head)) {
+        return { hold: `${target.branchName} does not contain the ${target.integrationBranch} tip ${tip.slice(0, 9)} yet`, next: 'merge_out', headSha: head };
+    }
+    const status = deps.readCandidateStatus(target, head);
+    if (status === 'green')
+        return { candidateSha: head };
+    if (status === 'red')
+        return { hold: `CI is RED on the integration candidate ${head.slice(0, 9)}`, next: 'rework', headSha: head };
+    if (deps.readPushedCandidateSha(target) !== head) {
+        return { hold: `the integration candidate ${head.slice(0, 9)} has not been pushed for CI`, next: 'push_candidate', headSha: head };
+    }
+    return { hold: `CI has not judged the integration candidate ${head.slice(0, 9)} yet`, next: 'wait_ci', headSha: head };
+}
+async function decide(target, deps) {
+    const incomplete = focusCompletionHold(await deps.getFocusDeliveries(target.focusId));
+    if (incomplete !== null)
+        return { hold: incomplete, incomplete: true };
+    const approval = await readApproval(target, deps);
+    if ('hold' in approval)
+        return approval;
+    const commits = deps.listUnmergedCommits(target.repoPath, target.integrationBranch, target.branchName);
+    if (commits === null)
+        return { hold: `its gate coverage could not be read (the commits ${target.branchName} would add could not be listed)` };
+    const unapproved = approvedHeadHold(commits, approval);
+    if (unapproved !== null)
+        return { hold: unapproved };
+    const decided = unreviewedMergesAfter(commits, approval);
+    if (decided.length > 0 && commits[0]) {
+        return {
+            hold: `${decided.length} merge(s) after the approved head ${approval.sha.slice(0, 9)} decided a conflict (${decided.map((c) => c.sha.slice(0, 9)).join(', ')}) -- no review judged that code`,
+            next: 'review_merge',
+            headSha: commits[0].sha,
+        };
+    }
+    const candidate = candidateStage(target, deps);
+    if ('hold' in candidate)
+        return candidate;
+    return {
+        hold: null,
+        candidateSha: candidate.candidateSha,
+        admittedBy: `completion: ${approval.source} ${approval.sha.slice(0, 9)}, candidate ${candidate.candidateSha.slice(0, 9)} green`,
+    };
+}
+/**
+ * Whether a merge of `target` holds (why, and the step that advances it) or is
+ * admitted (at which commit). Never throws: a failed read holds. Whether it holds
+ * is the merge_gate_coverage stop-registry row's decision.
+ */
+export async function readMergeGateDecision(target, deps) {
+    let decision;
+    let readable = true;
+    try {
+        decision = await decide(target, deps);
+    }
+    catch (err) {
+        readable = false;
+        decision = { hold: `its gate coverage could not be read (${err.message})` };
+    }
+    if (!stopFires('merge_gate_coverage', { gateReadable: readable, admitted: decision.hold === null }))
+        return decision;
+    return decision.hold === null ? { hold: 'held by the merge_gate_coverage stop row' } : decision;
+}
+/**
+ * The decision for a branch whose focus may be unknown. With no focus there is
+ * no completion to read, so the merge holds.
+ */
+export function readMergeGateDecisionForBranch(target, deps) {
+    const { focusId, ...rest } = target;
+    if (focusId !== null)
+        return readMergeGateDecision({ ...rest, focusId }, deps);
+    return Promise.resolve({ hold: `no focus names ${target.branchName}, so it has no completion to merge on` });
+}
+//# sourceMappingURL=completion-merge-gate.js.map

package/dist/merge/completion-merge-gate.js.map

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

package/dist/merge/completion-merge-pending.d.ts

@@ -0,0 +1,30 @@
+/** What git says of the focus branch against integration. */
+export type BranchAheadRead = 'ahead' | 'contained' | 'unknown';
+/** Read whether `branchName` carries commits `integrationBranch` lacks; 'unknown' when git cannot tell. */
+export declare function readBranchAhead(repoPath: string, branchName: string, integrationBranch: string): BranchAheadRead;
+/** Whether a window opening now marks the merge pending: unless integration provably contains the branch. Pure. */
+export declare function completionMergePendingFor(read: BranchAheadRead): boolean;
+/** The writes the reconciliation makes; bound at the composition root (composition/state-cascade-context.ts). */
+export interface CompletionMergePendingDeps {
+    /** Mark the focus's completion merge pending (sets completion_merge_pending_at). */
+    mark: (focusId: string) => Promise<void>;
+    /** The merge landed: clear completion_merge_pending_at. */
+    clear: (focusId: string) => Promise<void>;
+}
+/** One focus's facts this pass. */
+export interface CompletionMergePendingFacts {
+    focusId: string;
+    reviewWindowOpen: boolean;
+    /** Every delivery done or cancelled (the arm clear's own terminality). */
+    deliveriesTerminal: boolean;
+    branch: BranchAheadRead;
+}
+/** Reset the reconciliation's memory -- tests start from a clean slate. */
+export declare function __resetCompletionMergePendingForTests(): void;
+/** The write this pass owes, if any. Pure. */
+export declare function completionMergePendingAction(facts: CompletionMergePendingFacts): 'mark' | 'clear' | null;
+/** Reconcile the mark for one focus. Never throws: a failed write is retried next pass. */
+export declare function reconcileCompletionMergePending(facts: CompletionMergePendingFacts, deps: CompletionMergePendingDeps, warn: (message: string) => void): Promise<'marked' | 'cleared' | null>;
+/** Note a write made outside the reconciliation (the window-open write marks; a landed merge clears). */
+export declare function noteCompletionMergePendingWritten(focusId: string, written: 'marked' | 'cleared'): void;
+//# sourceMappingURL=completion-merge-pending.d.ts.map

package/dist/merge/completion-merge-pending.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"completion-merge-pending.d.ts","sourceRoot":"","sources":["../../src/merge/completion-merge-pending.ts"],"names":[],"mappings":"AA6BA,6DAA6D;AAC7D,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,WAAW,GAAG,SAAS,CAAC;AAEhE,2GAA2G;AAC3G,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,eAAe,CAKhH;AAED,mHAAmH;AACnH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAExE;AAED,iHAAiH;AACjH,MAAM,WAAW,0BAA0B;IACzC,oFAAoF;IACpF,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,2DAA2D;IAC3D,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3C;AAED,mCAAmC;AACnC,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,0EAA0E;IAC1E,kBAAkB,EAAE,OAAO,CAAC;IAC5B,MAAM,EAAE,eAAe,CAAC;CACzB;AAKD,2EAA2E;AAC3E,wBAAgB,qCAAqC,IAAI,IAAI,CAE5D;AAED,8CAA8C;AAC9C,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,2BAA2B,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAIxG;AAED,2FAA2F;AAC3F,wBAAsB,+BAA+B,CACnD,KAAK,EAAE,2BAA2B,EAClC,IAAI,EAAE,0BAA0B,EAChC,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAC9B,OAAO,CAAC,QAAQ,GAAG,SAAS,GAAG,IAAI,CAAC,CAatC;AAED,yGAAyG;AACzG,wBAAgB,iCAAiC,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAG,SAAS,GAAG,IAAI,CAEtG"}

package/dist/merge/completion-merge-pending.js

@@ -0,0 +1,75 @@
+// PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
+// Pinned by: packages/daemon/src/merge/completion-rework-armed.test.ts
+// PINNED-BY-END
+/**
+ * The focus's PENDING completion merge, kept on product_focuses.
+ * completion_merge_pending_at: while it is set the lifecycle arm clear defers
+ * (migration 20261004142135), so a red candidate, a missing verdict or a
+ * conflicting final merge re-opens its work on a focus that is still ARMED, and
+ * the team returns to it without a new human arm.
+ *
+ * Reconciled every state-cascade pass (completion/state-cascade/state-cascade.ts)
+ * from the focus row's OWN branch, repository and integration branch -- never an
+ * in-memory worktree map a restart can lose -- and FAIL CLOSED:
+ *   - a window opens with the mark unless git PROVES integration contains the
+ *     branch; an unreadable read marks it (holding an arm one cycle too long is
+ *     recoverable; releasing one under pending re-work is not);
+ *   - an already-open window is re-marked once per process (a window opened by
+ *     an older daemon, or before a restart, carries the mark too);
+ *   - the mark is CLEARED only when every delivery is terminal, no window is
+ *     open, and git proves integration contains the branch -- the merge landed.
+ *     A clear that fails is retried next pass, so a lost clear after a merge
+ *     (mergeFocusBranch's own clear is best-effort) never holds the arm forever.
+ *
+ * @module merge/completion-merge-pending
+ */
+import { runGitSync } from '../git/types.js';
+/** Read whether `branchName` carries commits `integrationBranch` lacks; 'unknown' when git cannot tell. */
+export function readBranchAhead(repoPath, branchName, integrationBranch) {
+    const result = runGitSync(['rev-list', '--count', `${integrationBranch}..${branchName}`, '--'], repoPath);
+    const count = Number.parseInt(result.output.trim(), 10);
+    if (!result.success || !Number.isFinite(count))
+        return 'unknown';
+    return count > 0 ? 'ahead' : 'contained';
+}
+/** Whether a window opening now marks the merge pending: unless integration provably contains the branch. Pure. */
+export function completionMergePendingFor(read) {
+    return read !== 'contained';
+}
+/** What this process last wrote per focus, so a steady state writes nothing. */
+const lastWritten = new Map();
+/** Reset the reconciliation's memory -- tests start from a clean slate. */
+export function __resetCompletionMergePendingForTests() {
+    lastWritten.clear();
+}
+/** The write this pass owes, if any. Pure. */
+export function completionMergePendingAction(facts) {
+    if (facts.reviewWindowOpen)
+        return completionMergePendingFor(facts.branch) ? 'mark' : null;
+    if (facts.deliveriesTerminal && facts.branch === 'contained')
+        return 'clear';
+    return null;
+}
+/** Reconcile the mark for one focus. Never throws: a failed write is retried next pass. */
+export async function reconcileCompletionMergePending(facts, deps, warn) {
+    const action = completionMergePendingAction(facts);
+    if (action === null)
+        return null;
+    const done = action === 'mark' ? 'marked' : 'cleared';
+    if (lastWritten.get(facts.focusId) === done)
+        return null;
+    try {
+        await (action === 'mark' ? deps.mark(facts.focusId) : deps.clear(facts.focusId));
+        lastWritten.set(facts.focusId, done);
+        return done;
+    }
+    catch (err) {
+        warn(`completion-merge pending ${action} failed for focus ${facts.focusId}: ${err.message}`);
+        return null;
+    }
+}
+/** Note a write made outside the reconciliation (the window-open write marks; a landed merge clears). */
+export function noteCompletionMergePendingWritten(focusId, written) {
+    lastWritten.set(focusId, written);
+}
+//# sourceMappingURL=completion-merge-pending.js.map

package/dist/merge/completion-merge-pending.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"completion-merge-pending.js","sourceRoot":"","sources":["../../src/merge/completion-merge-pending.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,uEAAuE;AACvE,gBAAgB;AAEhB;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAK7C,2GAA2G;AAC3G,MAAM,UAAU,eAAe,CAAC,QAAgB,EAAE,UAAkB,EAAE,iBAAyB;IAC7F,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,iBAAiB,KAAK,UAAU,EAAE,EAAE,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC1G,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IACxD,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACjE,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC;AAC3C,CAAC;AAED,mHAAmH;AACnH,MAAM,UAAU,yBAAyB,CAAC,IAAqB;IAC7D,OAAO,IAAI,KAAK,WAAW,CAAC;AAC9B,CAAC;AAmBD,gFAAgF;AAChF,MAAM,WAAW,GAAG,IAAI,GAAG,EAAgC,CAAC;AAE5D,2EAA2E;AAC3E,MAAM,UAAU,qCAAqC;IACnD,WAAW,CAAC,KAAK,EAAE,CAAC;AACtB,CAAC;AAED,8CAA8C;AAC9C,MAAM,UAAU,4BAA4B,CAAC,KAAkC;IAC7E,IAAI,KAAK,CAAC,gBAAgB;QAAE,OAAO,yBAAyB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3F,IAAI,KAAK,CAAC,kBAAkB,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW;QAAE,OAAO,OAAO,CAAC;IAC7E,OAAO,IAAI,CAAC;AACd,CAAC;AAED,2FAA2F;AAC3F,MAAM,CAAC,KAAK,UAAU,+BAA+B,CACnD,KAAkC,EAClC,IAAgC,EAChC,IAA+B;IAE/B,MAAM,MAAM,GAAG,4BAA4B,CAAC,KAAK,CAAC,CAAC;IACnD,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACjC,MAAM,IAAI,GAAG,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IACtD,IAAI,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACzD,IAAI,CAAC;QACH,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QACjF,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,4BAA4B,MAAM,qBAAqB,KAAK,CAAC,OAAO,KAAM,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;QACxG,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,yGAAyG;AACzG,MAAM,UAAU,iCAAiC,CAAC,OAAe,EAAE,OAA6B;IAC9F,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACpC,CAAC"}

package/dist/merge/focus-merge.d.ts

@@ -11,7 +11,9 @@ import type { DaemonConfig, FocusTeamState, MergeConflictResolutionResult } from
 import type { CreateEscalationParams, CreateEscalationResult } from '../supervision/escalation-filing.js';
 import { getMergeConflictDeliveries } from '../queries/deliveries/deliveries.js';
 import type { AbandonedMergeRecovery } from './abandoned-merge-recovery.js';
-import type { BranchMergeGateTarget, MergeGateDecision } from './merge-gate-coverage.js';
+import type { BranchMergeGateTarget } from './merge-gate-coverage.js';
+import type { MergeGateDecision } from './completion-merge-gate.js';
+import type { CompletionMergeOutOutcome } from './completion-merge-driver.js';
 import { type MergeBackConflictDeps } from './merge-back-conflict.js';
 import { type MergeBackAttemptOutcome, type MergeBackFollowUpTarget } from './merge-back-followup.js';
 /**
@@ -125,11 +127,21 @@ export declare function requestTeamLeadResolution(teamState: FocusTeamState, con
  * the gated merge paths.
  */
 export declare function attemptMergeBackCompletion(config: DaemonConfig, target: MergeBackFollowUpTarget, deps: MergeBackConflictDeps): Promise<MergeBackAttemptOutcome>;
+/**
+ * The completion merge-out (merge/completion-merge-driver.ts): merge the
+ * integration tip into a COMPLETE focus's branch once, with git's automatic merge.
+ * A clean merge stays -- it is the next integration candidate, and the gate
+ * re-proves it clean (merge/merge-gate-coverage.ts isCleanMerge). A conflict is
+ * ABORTED, never resolved here: deciding it would change code after the review
+ * approved HEAD. The outcome names the conflicting paths and the integration
+ * commits the branch lacks, the team's work order.
+ */
+export declare function attemptCompletionMergeOut(config: DaemonConfig, target: MergeBackFollowUpTarget, deps: Pick<MergeBackConflictDeps, 'readHead' | 'readFocusOwnDelta'>): Promise<CompletionMergeOutOutcome>;
 /**
  * {@link mergeFocusBranch} with its merge-back collaborators bound -- the shape
  * every merge path is handed (the composition root binds the collaborators).
  */
-export type MergeFocusBranch = (config: DaemonConfig, teamState: FocusTeamState, sessionId: string, branchName: string, workedDeliveryIds: string[], dirtyWorktreePolicy?: DirtyWorktreePolicy) => Promise<{
+export type MergeFocusBranch = (config: DaemonConfig, teamState: FocusTeamState, sessionId: string, branchName: string, workedDeliveryIds: string[], admittedSha: string, dirtyWorktreePolicy?: DirtyWorktreePolicy) => Promise<{
     mergeSucceeded: boolean;
     exitReason: string;
 }>;
@@ -139,6 +151,9 @@ export type MergeFocusBranch = (config: DaemonConfig, teamState: FocusTeamState,
  * Uses the first delivery ID as the representative for merge operations
  * (all deliveries share the same branch in the focus model).
  *
+ * `admittedSha` is the candidate the completion merge gate admitted
+ * (merge/completion-merge-gate.ts): integration fast-forwards to exactly it.
+ *
  * `workedDeliveryIds` is the set of deliveries the team actually built in
  * this merge cycle. Git state and the merge commit SHA are recorded only
  * for these deliveries — never for queued/planning deliveries that happen
@@ -148,14 +163,14 @@ export type MergeFocusBranch = (config: DaemonConfig, teamState: FocusTeamState,
  * proceeds — the planning-phase / read-only safety nets live in
  * `shouldAttemptMerge`, not here.
  */
-export declare function mergeFocusBranch(deps: MergeFocusBranchDeps, config: DaemonConfig, teamState: FocusTeamState, sessionId: string, branchName: string, workedDeliveryIds: string[], dirtyWorktreePolicy?: DirtyWorktreePolicy): Promise<{
+export declare function mergeFocusBranch(deps: MergeFocusBranchDeps, config: DaemonConfig, teamState: FocusTeamState, sessionId: string, branchName: string, workedDeliveryIds: string[], admittedSha: string, dirtyWorktreePolicy?: DirtyWorktreePolicy): Promise<{
     mergeSucceeded: boolean;
     exitReason: string;
 }>;
 /** Injected seams of the resolved-conflict retry; bound at the composition root (composition/execution-merge-context.ts). */
 export interface ResolvedConflictRetryDeps {
     getMergeConflictDeliveries: typeof getMergeConflictDeliveries;
-    /** Hold the retry (an ungated commit or unreadable coverage, with why) or admit it (with its anchors) (merge/merge-gate-coverage.ts). */
+    /** Hold the retry (with why) or admit it at the green candidate (merge/completion-merge-gate.ts). */
     readMergeGate: (target: BranchMergeGateTarget) => Promise<MergeGateDecision>;
     /** Undo an abandoned merge in the focus worktree when nothing owns it (merge/abandoned-merge-recovery.ts). */
     recoverAbandonedMergeBack: (focusId: string) => Promise<AbandonedMergeRecovery>;
@@ -168,8 +183,8 @@ export interface ResolvedConflictRetryDeps {
  * Called once per poll cycle. Queries the API for deliveries with
  * merge_conflict git state, groups them by branch (to avoid duplicate
  * merges), and retries mergeToIntegration for each unique branch -- only when
- * every commit the merge would add has passed the focus's review or verify gate
- * (merge/merge-gate-coverage.ts). A held branch is not retried and gets no
+ * the completion merge gate admits the focus (merge/completion-merge-gate.ts).
+ * A held branch is not retried and gets no
  * resolution agent; its escalation stays open and the next poll asks again.
  *
  * On success: reports merged_to_integration for all deliveries on that

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

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

package/dist/merge/focus-merge.js

@@ -2,6 +2,8 @@
 // Pinned by: packages/daemon/src/completion/team-teardown/session-hold.test.ts,
 //   packages/daemon/src/integration/agent-owned-scoping-integration.test.ts,
 //   packages/daemon/src/integration/merge-back-resolver-timeout-regression.test.ts,
+//   packages/daemon/src/merge/completion-conflict-rework.test.ts,
+//   packages/daemon/src/merge/completion-merge-out.test.ts,
 //   packages/daemon/src/merge/dirty-worktree-merge-refusal.test.ts,
 //   packages/daemon/src/merge/focus-merge-empty-deliveries.test.ts,
 //   packages/daemon/src/merge/focus-merge-resolver-liveness.test.ts,
@@ -11,8 +13,9 @@
 // PINNED-BY-END
 import { runGitSync } from '../git/index.js';
 import { fetchEffectiveWorkflow } from '../queries/workflow-transitions/workflows.js';
+import { clearCompletionMergePending } from '../queries/focuses/focuses.js';
 import { mergeBackFromIntegration } from '../git/index.js';
-import { mergeToIntegration } from '../git/merge.js';
+import { hasOriginRemote, mergeToIntegration } from '../git/merge.js';
 import { mergeDeliveryBranch } from '../delivery/delivery-merge-ops.js';
 import { MERGE_CONFLICT_ESCALATION_KIND, MERGE_REFUSED_DIRTY_ESCALATION_KIND } from '../queries/escalations/escalations.js';
 import { resolveOpenWorktreeDirtyEscalations } from '../supervision/escalation-clearing.js';
@@ -25,7 +28,7 @@ import { noteMergeBackStarted } from './merge-back-activity.js';
 import { classifyMergeFailure } from './merge-failure-classify.js';
 import { NO_HUMAN_ACT } from '../queries/escalations/filing-observation.js';
 import { reportMergeConflictState } from './merge-conflict-escalation.js';
-import { handleMergeBackConflict, runContainedFallbackResolution, describeContainment, } from './merge-back-conflict.js';
+import { runContainedFallbackResolution, describeContainment, } from './merge-back-conflict.js';
 import { recordResolverSuccess } from './merge-back-followup.js';
 import { createLogger } from '../log/daemon-log.js';
 import { focusPipelineModelForPass } from '../config/model-resolution.js';
@@ -272,12 +275,50 @@ export async function attemptMergeBackCompletion(config, target, deps) {
     }, deps);
     return result.resolved ? { kind: 'merged' } : { kind: 'failed', error: result.error, restore: result.restore };
 }
+/**
+ * The completion merge-out (merge/completion-merge-driver.ts): merge the
+ * integration tip into a COMPLETE focus's branch once, with git's automatic merge.
+ * A clean merge stays -- it is the next integration candidate, and the gate
+ * re-proves it clean (merge/merge-gate-coverage.ts isCleanMerge). A conflict is
+ * ABORTED, never resolved here: deciding it would change code after the review
+ * approved HEAD. The outcome names the conflicting paths and the integration
+ * commits the branch lacks, the team's work order.
+ */
+export async function attemptCompletionMergeOut(config, target, deps) {
+    const { worktreePath, branchName } = target;
+    const mb = await mergeBackWithRecoveryHead(worktreePath, config.integrationBranch, branchName, deps);
+    if (mb.preMergeHead === null)
+        return { kind: 'error', message: mb.refusal };
+    const { preMergeHead, mergeBack } = mb;
+    if (mergeBack.status === 'clean')
+        return { kind: 'merged' };
+    if (mergeBack.status === 'error')
+        return { kind: 'error', message: mergeBack.message };
+    const integrationRef = hasOriginRemote(worktreePath) ? `origin/${config.integrationBranch}` : config.integrationBranch;
+    const missing = runGitSync(['log', '--format=%h %s', '-n', '30', `${preMergeHead}..${integrationRef}`, '--'], worktreePath);
+    const abort = runGitSync(['merge', '--abort'], worktreePath);
+    if (!abort.success || deps.readHead(worktreePath) !== preMergeHead) {
+        return { kind: 'error', message: `the conflicting merge-out of ${branchName} could not be aborted: ${abort.error}` };
+    }
+    log.info(`[focus-merge] Completion merge-out of ${integrationRef} into ${branchName} conflicts; aborted -- the conflict is the team's work`);
+    return {
+        kind: 'conflict',
+        conflict: {
+            integrationBranch: config.integrationBranch,
+            conflictPaths: mergeBack.conflictFiles ?? [],
+            missingCommits: missing.success ? missing.output.split('\n').map((l) => l.trim()).filter(Boolean) : [],
+        },
+    };
+}
 /**
  * Merge the focus branch to integration.
  *
  * Uses the first delivery ID as the representative for merge operations
  * (all deliveries share the same branch in the focus model).
  *
+ * `admittedSha` is the candidate the completion merge gate admitted
+ * (merge/completion-merge-gate.ts): integration fast-forwards to exactly it.
+ *
  * `workedDeliveryIds` is the set of deliveries the team actually built in
  * this merge cycle. Git state and the merge commit SHA are recorded only
  * for these deliveries — never for queued/planning deliveries that happen
@@ -287,7 +328,7 @@ export async function attemptMergeBackCompletion(config, target, deps) {
  * proceeds — the planning-phase / read-only safety nets live in
  * `shouldAttemptMerge`, not here.
  */
-export async function mergeFocusBranch(deps, config, teamState, sessionId, branchName, workedDeliveryIds, dirtyWorktreePolicy = 'escalate') {
+export async function mergeFocusBranch(deps, config, teamState, sessionId, branchName, workedDeliveryIds, admittedSha, dirtyWorktreePolicy = 'escalate') {
     log.info(`Merging focus branch ${branchName} for "${teamState.focusName}"`, {
         focusId: teamState.focusId,
         sessionId,
@@ -337,31 +378,11 @@ export async function mergeFocusBranch(deps, config, teamState, sessionId, branc
         log.warn(`[focus-executor] Failed to fetch workflow for merge, using fallback:`, err.message);
         workflow = { id: 'fallback', stages: [] };
     }
-    // ── Merge-back: sync integration into focus branch before merging out ──
-    // Merge integration HEAD into the focus branch to surface conflicts early
-    const worktreePath = teamState.worktreePath;
-    if (worktreePath) {
-        // A resolver that cannot finish is contained by restoring to the committed focus HEAD.
-        const mb = await mergeBackWithRecoveryHead(worktreePath, config.integrationBranch, branchName, deps);
-        if (mb.preMergeHead === null)
-            return { mergeSucceeded: false, exitReason: mb.refusal };
-        const { preMergeHead, mergeBack: mergeBackResult } = mb;
-        if (mergeBackResult.status === 'conflict') {
-            const conflictFiles = mergeBackResult.conflictFiles ?? [];
-            log.info(`[focus-merge] Merge-back produced conflicts for "${teamState.focusName}": ` +
-                `${conflictFiles.join(', ') || 'unknown files'}`);
-            const conflict = await handleMergeBackConflict({ config, teamState, sessionId, branchName, representativeDeliveryId, worktreePath, preMergeHead, conflictFiles }, deps);
-            if (!conflict.resolved) {
-                return { mergeSucceeded: false, exitReason: conflict.exitReason };
-            }
-        }
-        if (mergeBackResult.status === 'error') {
-            log.error(`[focus-merge] Merge-back error for "${teamState.focusName}": ${mergeBackResult.message}`);
-            return { mergeSucceeded: false, exitReason: mergeBackResult.message };
-        }
-        // status === 'clean' -- proceed to merge to integration
-        log.info(`Merge-back clean for "${teamState.focusName}", proceeding to integration merge`);
-    }
+    // No merge-back here: the completion gate admitted `admittedSha` only once it
+    // contained the integration tip, and integration fast-forwards to exactly it.
+    // If integration moved since, the fast-forward refuses and the next merge-back
+    // tick's merge-out (attemptCompletionMergeOut) brings the branch current --
+    // clean, or handed to the team. No resolver decides a conflict on this path.
     const mergeOutcome = await mergeDeliveryBranch({
         config,
         branchName,
@@ -371,11 +392,15 @@ export async function mergeFocusBranch(deps, config, teamState, sessionId, branc
         sessionId,
         workflow,
         focusId: teamState.focusId,
+        sourceSha: admittedSha,
     });
     // Report git state and merge commit SHA only for deliveries that were
     // actually worked on, never for queued/planning deliveries on the same branch.
     const deliveryIdsForGitState = new Set(workedDeliveryIds);
     if (mergeOutcome.mergeSucceeded) {
+        // The completion merge landed: end the pending mark that held the arm through it,
+        // which lets the deferred lifecycle clear release the arm (merge/completion-merge-pending.ts).
+        clearCompletionMergePending(teamState.focusId).catch((err) => log.warn(`[focus-merge] clearCompletionMergePending failed for focus ${teamState.focusId}: ${err.message}`));
         for (const deliveryId of deliveryIdsForGitState) {
             if (!teamState.mergedDeliveryIds.has(deliveryId)) {
                 reportGitState(deliveryId, 'merged_to_integration').catch(err => log.warn(`[focus-executor] reportGitState merged_to_integration failed for ${deliveryId}:`, err.message));
@@ -442,11 +467,12 @@ function markConflictRetryMerged(deliveries) {
  * The resolved-conflict retry's fallback: merge integration back into the
  * focus worktree, run the fallback resolution agent with failure containment
  * (a resolver that cannot finish leaves the worktree restored to its committed
- * HEAD, partial work preserved -- merge/merge-back-conflict.ts), and retry the
- * integration merge once it resolves. The open merge_conflict escalation that
- * put these deliveries here stays the record on failure.
+ * HEAD, partial work preserved -- merge/merge-back-conflict.ts). A resolved
+ * head is a new integration candidate: integration does not move here, the next
+ * poll's completion gate drives it through CI. The open merge_conflict escalation
+ * that put these deliveries here stays the record on failure.
  */
-async function retryViaContainedFallbackResolution(config, branchName, representative, deliveries, deps) {
+async function retryViaContainedFallbackResolution(config, branchName, representative, deps) {
     const worktreeInfo = representative.focus_id ? getFocusWorktree(representative.focus_id) : null;
     if (!worktreeInfo)
         return;
@@ -477,16 +503,9 @@ async function retryViaContainedFallbackResolution(config, branchName, represent
         log.warn(`[focus-merge] Fallback resolution failed for branch ${branchName}: ${fallback.error}. ${describeContainment(fallback.restore)}`);
         return;
     }
-    const retryResult = await mergeToIntegration({
-        config,
-        branchName,
-        deliveryName: representative.delivery_name,
-        deliveryId: representative.delivery_id,
-    });
-    if (retryResult.success) {
-        log.info(`Merge succeeded after fallback resolution for branch ${branchName}`);
-        markConflictRetryMerged(deliveries);
-    }
+    // The resolution is a new head no CI run has judged: integration does not move
+    // here. The next poll's gate drives it as a candidate (push, CI, fast-forward).
+    log.info(`[focus-merge] Fallback resolution finished the merge-back for ${branchName}; the completion merge gate judges the new head next.`);
 }
 /**
  * Check for deliveries stuck in merge_conflict state and retry the merge.
@@ -494,8 +513,8 @@ async function retryViaContainedFallbackResolution(config, branchName, represent
  * Called once per poll cycle. Queries the API for deliveries with
  * merge_conflict git state, groups them by branch (to avoid duplicate
  * merges), and retries mergeToIntegration for each unique branch -- only when
- * every commit the merge would add has passed the focus's review or verify gate
- * (merge/merge-gate-coverage.ts). A held branch is not retried and gets no
+ * the completion merge gate admits the focus (merge/completion-merge-gate.ts).
+ * A held branch is not retried and gets no
  * resolution agent; its escalation stays open and the next poll asks again.
  *
  * On success: reports merged_to_integration for all deliveries on that
@@ -537,6 +556,7 @@ export async function checkResolvedMergeConflicts(config, deps) {
             branchName,
             deliveryName: representative.delivery_name,
             deliveryId: representative.delivery_id,
+            sourceSha: gate.candidateSha,
         });
         if (mergeResult.success) {
             log.info(`[focus-merge] Merge retry succeeded for branch ${branchName} into ${integrationBranch} (${gate.admittedBy})`);
@@ -546,7 +566,7 @@ export async function checkResolvedMergeConflicts(config, deps) {
             log.info(`[focus-merge] Merge retry still failing for branch ${branchName}: ${mergeResult.error ?? 'unknown'}`);
             // Attempt fallback resolution agent if a worktree exists for this focus
             if (representative.focus_id) {
-                await retryViaContainedFallbackResolution(config, branchName, representative, deliveries, deps);
+                await retryViaContainedFallbackResolution(config, branchName, representative, deps);
             }
         }
     }