@telora/daemon 0.22.245 → 0.22.289

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

@@ -1,21 +1,20 @@
 // PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
-// Pinned by: packages/daemon/src/completion/mid-flight-merge-gate.test.ts,
-//   packages/daemon/src/completion/teardown-merge-gate.test.ts,
+// 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/merge-gate-coverage.test.ts,
 //   packages/daemon/src/merge/resolved-conflict-merge-gate.test.ts,
-//   packages/daemon/src/worktree/safe-remove-merge-gate.test.ts
+//   packages/daemon/src/merge/safe-remove-merge-gate.test.ts
 // PINNED-BY-END
 /**
  * Whether a focus branch's merge to integration carries only GATED work.
  *
  * A focus branch reaches integration on team teardown, through the merge-back
  * loop, mid-flight while its team executes, before its worktree is removed, and
- * when a merge conflict is retried. The teardown merge used to send a branch
- * whenever it had commits, so stopping a team mid-fix put the lead's
- * uncommitted, unreviewed edits on integration: wip-preserve captured them as a
- * commit and the merge phase merged that commit two seconds later (2026-09-15,
- * WIP commit 188f626b1).
+ * when a merge conflict is retried. Having commits is never enough to merge: a
+ * daemon capture of a stopped team's uncommitted, unreviewed edits is itself a
+ * commit.
+ * History: docs/daemon/history-platform.md (merge/merge-gate-coverage.ts).
  *
  * Every commit the merge would add (integration..branch) is judged, except a
  * merge git proves CLEAN: a two-parent merge whose `git show --remerge-diff` is
@@ -27,12 +26,12 @@
  * A judged commit is GATED when it is an ancestor-or-equal of an anchor that
  * passed one of the focus's gates:
  *   - a commit with a PASSING recorded deterministic verdict
- *     (verify/commit-verdict-record.ts; the newest verdict recorded for the
+ *     (verify/gate-verdicts/commit-verdict-record.ts; the newest verdict recorded for the
  *     commit under any gate), or
  *   - the commit the focus's newest CURRENT approval judged
- *     (queries/focus-review-approval.ts): a focus_reviews row with outcome
+ *     (queries/focus-review/focus-review-approval.ts): a focus_reviews row with outcome
  *     'approved' and its reviewed_sha, or a clean full-coverage auto-approval of
- *     the exact commit the review covered (completion/review-auto-approval-record.ts),
+ *     the exact commit the review covered (merge/review-auto-approval-record.ts),
  *     either revoked by a newer gaps_found review of the same commit. The review
  *     coverage watermark (product_focuses.reviewed_through_sha) is NOT an anchor:
  *     it advances for a gaps_found review too, so it would authorize the window a
@@ -43,19 +42,17 @@
  *     no gate is configured for the focus -- a product with no gate still merges on
  *     review. A FAILED verdict there, or none yet where a gate is configured,
  *     anchors nothing, and the hold names it: review_complete cannot see verdicts
- *     (host-local files) and no failure revokes an approval, so on 2026-09-25 a
- *     review approved 1c3e3e506 three minutes after its gate failed and the
- *     teardown merged it to integration. An auto-approval anchors as before: it is
- *     recorded only after the done-route passed the verdict gate.
+ *     (host-local files) and no failure revokes an approval. An auto-approval
+ *     anchors: it is recorded only after the done-route passed the verdict gate.
  * A daemon capture of uncommitted agent work (the worktree/safety.ts subjects)
  * is never gated by itself -- a verify tick or a review spawn that lands on the
  * capture as HEAD judges half-finished work -- so it is covered only by a LATER
  * gated commit that contains it.
  *
  * Every focus-to-integration entry point merges only when EVERY commit is gated:
- * the team-exit merge (completion/merge-phase.ts attemptFocusMerge), the
+ * 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-lifecycle.ts checkAndMergeCompletedDeliveries), the
+ * (completion/team-teardown/team-lifecycle.ts checkAndMergeCompletedDeliveries), the
  * merge-before-remove of a focus worktree (worktree/provision.ts
  * safeRemoveFocusWorktree) and the resolved-conflict retry
  * (merge/focus-merge.ts checkResolvedMergeConflicts). A branch no focus row
@@ -67,12 +64,9 @@
  *
  * @module merge-gate-coverage
  */
-import { listReviewAutoApprovals } from '../completion/review-auto-approval-record.js';
 import { runGitSync } from '../git/types.js';
-import { readLatestApprovedReviewSha } from '../queries/focus-review-approval.js';
-import { judgeApprovalGateState } from './approval-gate-state.js';
-import { readCommitVerdict } from '../verify/commit-verdict-record.js';
 import { SAFETY_COMMIT_SUBJECT_PREFIX, WIP_CAPTURE_SUBJECT_PREFIX } from '../worktree/safety.js';
+import { stopFires } from '../supervision/stop-registry.js';
 const SHA_RE = /^[0-9a-f]{7,64}$/i;
 const FIELD_SEP = '\x1f';
 /** True for a commit the daemon wrote to capture an agent's uncommitted work. Pure. */
@@ -137,17 +131,6 @@ export function resolveGatedAnchor(repoPath, integrationBranch, sha) {
         return null;
     return { sha: full.output.trim(), contains: new Set(ancestry.output.split('\n').map((l) => l.trim()).filter(Boolean)) };
 }
-export function defaultMergeGateCoverageDeps() {
-    return {
-        listUnmergedCommits,
-        resolveAnchor: resolveGatedAnchor,
-        readApprovedReviewSha: (target) => readLatestApprovedReviewSha(target.focusId, {
-            autoApprovals: listReviewAutoApprovals(target.productId, target.focusId),
-        }),
-        hasPassingVerdict: (target, sha) => readCommitVerdict(target.productId, target.focusId, sha)?.outcome === 'passed',
-        judgeApprovalGate: (target, sha) => judgeApprovalGateState(target, sha),
-    };
-}
 /**
  * Judge the commits a merge of `target` would add. Verdicts (local records) are
  * read newest-first only for commits no anchor already contains, stopping once
@@ -156,7 +139,7 @@ export function defaultMergeGateCoverageDeps() {
  * state at its commit allows (see the module header). Any unreadable input
  * returns 'unreadable' (the caller holds the merge).
  */
-export async function evaluateMergeGateCoverage(target, deps = defaultMergeGateCoverageDeps()) {
+export async function evaluateMergeGateCoverage(target, deps) {
     const { repoPath, integrationBranch, branchName } = target;
     const commits = deps.listUnmergedCommits(repoPath, integrationBranch, branchName);
     if (commits === null) {
@@ -212,11 +195,16 @@ export async function evaluateMergeGateCoverage(target, deps = defaultMergeGateC
 }
 /** Why the merge must hold, or null when it may proceed. Pure. */
 export function mergeGateHoldReason(result) {
+    // Whether the merge holds is the merge_gate_coverage stop-registry row's decision.
+    const holds = stopFires('merge_gate_coverage', {
+        coverageReadable: result.kind === 'judged',
+        ungatedCommits: result.kind === 'judged' ? result.coverage.ungated.length : 0,
+    });
+    if (!holds)
+        return null;
     if (result.kind === 'unreadable')
         return `its gate coverage could not be read (${result.reason})`;
     const { ungated, ungatedWipCaptures } = result.coverage;
-    if (ungated.length === 0)
-        return null;
     const captures = ungatedWipCaptures.length === 0
         ? ''
         : `, including ${ungatedWipCaptures.length} daemon WIP capture(s) (${ungatedWipCaptures.map((c) => c.sha.slice(0, 9)).join(', ')})`;
@@ -242,7 +230,7 @@ export function mergeGateDecision(result) {
     return { hold: null, admittedBy: mergeGateAdmission(result.anchors) };
 }
 /** Whether a merge of `target` holds (and why) or is admitted (and by what). Never throws: a failed read holds. */
-export async function readMergeGateDecision(target, deps = defaultMergeGateCoverageDeps()) {
+export async function readMergeGateDecision(target, deps) {
     try {
         return mergeGateDecision(await evaluateMergeGateCoverage(target, deps));
     }
@@ -255,7 +243,7 @@ export async function readMergeGateDecision(target, deps = defaultMergeGateCover
  * there is no verdict or approving review to read, so every non-merge commit is
  * ungated and the merge holds.
  */
-export function readMergeGateDecisionForBranch(target, deps = defaultMergeGateCoverageDeps()) {
+export function readMergeGateDecisionForBranch(target, deps) {
     const { focusId, ...rest } = target;
     if (focusId !== null)
         return readMergeGateDecision({ ...rest, focusId }, deps);

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

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

package/dist/merge/merge-to-main.d.ts

@@ -0,0 +1,78 @@
+/**
+ * The integration -> main merge (the single write-to-main point).
+ *
+ * mergeIntegrationToMain is the one
+ * place refs/heads/main advances, so the fail-closed CI green-wait gate lives
+ * here. It composes the git primitives (git/merge-strategies.ts mechanics,
+ * git/merge.ts shared helpers) with the CI merge-gate decision (ci/ci-status.ts),
+ * so it sits in merge/ beside the other merge orchestration, above both.
+ *
+ * History: docs/daemon/history-platform.md (merge/merge-to-main.ts).
+ */
+import type { DaemonConfig } from '../types/index.js';
+import { type MergeResult, type MergeStrategy } from '../git/types.js';
+import { type CiStatusReader, type CiMergeGateDecision } from '../ci/ci-status.js';
+export interface MergeIntegrationToMainParams {
+    config: DaemonConfig;
+    /** Focus ID for log attribution / push-failure escalations. */
+    focusId: string;
+    /** Focus name for logging/commit messages. */
+    focusName: string;
+    /** Whether to also push main to remote (CD). */
+    pushToRemote: boolean;
+    /**
+     * Merge strategy honored when integrating into main. Defaults to
+     * `merge-commit` (which itself attempts fast-forward first, then falls
+     * back to `--no-ff`) so legacy callers that omit the field get the
+     * pre-existing behavior.
+     */
+    mergeStrategy?: MergeStrategy;
+    /**
+     * The green-wait CI status reader, evaluated at THIS write point -- the single
+     * place `refs/heads/main` is advanced -- so the gate governs every daemon route
+     * to main identically, not whichever call path performed the merge. REQUIRED so
+     * no caller can advance main without making the CI decision explicit:
+     *   - a reader (`resolveCiStatusReader()`) => the merged SHA's status is read
+     *     and `resolveCiMergeGate` decides; pending/red/unknown HOLD (fail-closed),
+     *     green proceeds. On a hold the ref is NOT advanced and the result carries
+     *     `ciHeld` (not an error -- nothing was written, nothing to roll back).
+     *   - `undefined` => an explicit, visible opt-out (used by tests and legacy
+     *     callers with no CI source); the gate is skipped and the merge proceeds
+     *     exactly as before.
+     */
+    getCiStatus: CiStatusReader | undefined;
+}
+/**
+ * Resolved remote name + URL describing the push target for a CD push.
+ * Exported only so the focus-completion / focus-team-lifecycle log lines
+ * can surface the remote without re-querying git.
+ */
+export interface PushedRemoteInfo {
+    /** Remote name (always `origin` today). */
+    name: string;
+    /** Remote URL as configured in the repo. */
+    url: string;
+}
+/**
+ * Merge the integration branch into the default (main) branch.
+ *
+ * Called when a focus completes with CI enabled. Optionally pushes
+ * to remote when CD is also enabled. The push step is gated by
+ * `pushToRemote` and only runs when an `origin` remote is configured.
+ *
+ * Uses the merge worktree and merge lock (same as mergeToIntegration)
+ * to avoid concurrent merge conflicts. The merge worktree checks main out
+ * DETACHED and advances refs/heads/main via `git update-ref`, so the merge
+ * completes even when main is attached in the daemon's primary worktree
+ * (where `git checkout main` would fail with "'main' is already used by
+ * worktree"). Clean worktrees holding main are re-synced afterward.
+ *
+ * The result's `pushedTo` field is set only when CD push happened and
+ * succeeded. Callers can read it to emit a focus-attributed log line
+ * with the resolved remote name + URL.
+ */
+export declare function mergeIntegrationToMain(params: MergeIntegrationToMainParams): Promise<MergeResult & {
+    pushedTo?: PushedRemoteInfo;
+    ciHeld?: CiMergeGateDecision;
+}>;
+//# sourceMappingURL=merge-to-main.d.ts.map

package/dist/merge/merge-to-main.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-to-main.d.ts","sourceRoot":"","sources":["../../src/merge/merge-to-main.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAc,KAAK,WAAW,EAAE,KAAK,aAAa,EAAwB,MAAM,iBAAiB,CAAC;AAIzG,OAAO,EAGL,KAAK,cAAc,EAEnB,KAAK,mBAAmB,EACzB,MAAM,oBAAoB,CAAC;AAU5B,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,YAAY,CAAC;IACrB,+DAA+D;IAC/D,OAAO,EAAE,MAAM,CAAC;IAChB,8CAA8C;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,gDAAgD;IAChD,YAAY,EAAE,OAAO,CAAC;IACtB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B;;;;;;;;;;;;OAYG;IACH,WAAW,EAAE,cAAc,GAAG,SAAS,CAAC;CACzC;AAED;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC/B,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,4CAA4C;IAC5C,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,WAAW,GAAG;IAAE,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAAC,MAAM,CAAC,EAAE,mBAAmB,CAAA;CAAE,CAAC,CAqPtF"}

package/dist/merge/merge-to-main.js

@@ -0,0 +1,252 @@
+// PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
+// Pinned by: packages/daemon/src/composition/subsystem-contexts.test.ts,
+//   packages/daemon/src/git/merge-confirm-clean-refusal.test.ts,
+//   packages/daemon/src/merge/merge-integration-to-main.test.ts
+// PINNED-BY-END
+import { runGitSync, getMergeWorktreePath } from '../git/types.js';
+import { withMergeLock } from '../git/merge-lock.js';
+import { getDefaultBranch } from '../git/branch.js';
+import { resolveRef } from '../git/utils.js';
+import { resolveCiMergeGate, classifyCiMergeWait, } from '../ci/ci-status.js';
+import { describeWaitReachability } from '../supervision/wait-reachability.js';
+import { createLogger } from '../log/daemon-log.js';
+import { applyMergeStrategy, recoverDirtyMergeWorktree } from '../git/merge-strategies.js';
+import { hasOriginRemote, worktreesWithBranchCheckedOut, hasTrackedChanges, handlePushFailureWithRollback } from '../git/merge.js';
+const log = createLogger({ module: 'CI' });
+/**
+ * Merge the integration branch into the default (main) branch.
+ *
+ * Called when a focus completes with CI enabled. Optionally pushes
+ * to remote when CD is also enabled. The push step is gated by
+ * `pushToRemote` and only runs when an `origin` remote is configured.
+ *
+ * Uses the merge worktree and merge lock (same as mergeToIntegration)
+ * to avoid concurrent merge conflicts. The merge worktree checks main out
+ * DETACHED and advances refs/heads/main via `git update-ref`, so the merge
+ * completes even when main is attached in the daemon's primary worktree
+ * (where `git checkout main` would fail with "'main' is already used by
+ * worktree"). Clean worktrees holding main are re-synced afterward.
+ *
+ * The result's `pushedTo` field is set only when CD push happened and
+ * succeeded. Callers can read it to emit a focus-attributed log line
+ * with the resolved remote name + URL.
+ */
+export function mergeIntegrationToMain(params) {
+    const { config, focusName, pushToRemote, mergeStrategy = 'merge-commit', getCiStatus } = params;
+    return withMergeLock(async () => {
+        const mwt = getMergeWorktreePath(config);
+        const mainBranch = getDefaultBranch(config.repoPath);
+        // Same self-heal as mergeToIntegration: this route shares the merge worktree,
+        // so an earlier failed merge's residue would break the detached checkout
+        // below. REFUSE if the worktree cannot be CONFIRMED clean afterward.
+        const recovery = recoverDirtyMergeWorktree(mwt);
+        if (!recovery.clean) {
+            return {
+                success: false,
+                error: `Merge worktree could not be confirmed clean before merging ${config.integrationBranch} into ` +
+                    `${mainBranch}; residue survived recovery: ${recovery.residue ?? 'unknown'}`,
+                sourceBranch: config.integrationBranch,
+                targetBranch: mainBranch,
+            };
+        }
+        const withRemote = hasOriginRemote(config.repoPath);
+        // Fail early when a CD push was requested but no remote is configured.
+        // Returning a push-failure result (rather than silently skipping) lets
+        // the caller's shouldFileCdPushEscalation check fire so the operator
+        // sees a visible escalation instead of a silent no-op.
+        if (pushToRemote && !withRemote) {
+            return {
+                success: false,
+                error: 'Push failed: no origin remote configured for this repository',
+                sourceBranch: config.integrationBranch,
+                targetBranch: mainBranch,
+            };
+        }
+        // Fetch latest refs
+        if (withRemote) {
+            runGitSync(['fetch', 'origin'], config.repoPath);
+        }
+        // ── Green-wait gate (the single write-to-main point) ────────────────
+        // This is the ONE place refs/heads/main advances, so the CI verdict is
+        // evaluated HERE -- not in whichever completion/eager code path called us.
+        // Every daemon route to main inherits the same fail-closed gate. With a
+        // reader wired, the SHA about to reach main (the integration tip) must be
+        // GREEN; pending/red/unknown HOLD without advancing the ref (nothing was
+        // written -- no rollback, and the caller reports a hold, never an error or
+        // an escalation). An explicit `undefined` reader skips the gate (opt-out).
+        if (getCiStatus) {
+            let mergedSha = '';
+            try {
+                // resolveRef checks the git exit status, so an unresolvable
+                // integrationBranch yields null rather than git's stdout echo of the
+                // branch NAME -- which would otherwise reach the CI gate as if it were
+                // a commit SHA (echo-into-SHA-field bug class).
+                mergedSha = resolveRef(config.repoPath, config.integrationBranch) ?? '';
+            }
+            catch (err) {
+                log.warn(`Could not resolve integration tip SHA for the CI gate: ${err.message}`);
+            }
+            if (mergedSha) {
+                let status = 'unknown';
+                try {
+                    status = await getCiStatus({ sha: mergedSha, integrationBranch: config.integrationBranch, config });
+                }
+                catch (err) {
+                    log.warn(`CI status read failed for ${mergedSha.slice(0, 12)}: ${err.message}`);
+                }
+                const gate = resolveCiMergeGate(status);
+                if (!gate.proceed) {
+                    // Classify whether this hold can still fire: a settled RED result on
+                    // this (unchanged) sha never re-evaluates without a NEW commit -- a
+                    // stall that reads as patience -- whereas a pending run can still be
+                    // finished by the CI runner. Record the distinction on the hold and in
+                    // the log so a stall is legible from the daemon log alone.
+                    const wait = classifyCiMergeWait(status, mergedSha);
+                    const marker = describeWaitReachability(wait);
+                    log.info(`Holding ${config.integrationBranch}->${mainBranch} for "${focusName}": ${gate.reason} ` +
+                        `(sha ${mergedSha.slice(0, 12)}) [${marker}].`);
+                    return {
+                        success: false,
+                        ciHeld: { ...gate, reachable: wait.reachable, reachabilityReason: marker },
+                        sourceBranch: config.integrationBranch,
+                        targetBranch: mainBranch,
+                    };
+                }
+                log.info(`CI gate passed for "${focusName}": ${gate.reason} (sha ${mergedSha.slice(0, 12)}).`);
+            }
+        }
+        // Record where main was BEFORE we touch anything, so push failure can roll
+        // the ref back, and classify any worktrees that currently have main attached
+        // (the daemon's primary repoPath usually keeps main checked out). Advancing
+        // the ref out-of-band leaves such a worktree with a stale tree, so after a
+        // successful merge we re-sync every worktree that has NO tracked uncommitted
+        // changes -- `git reset --hard` restores tracked files and preserves
+        // untracked ones, so a worktree dirty only with untracked scratch (the
+        // common dev-box state) is still safe to sync. Worktrees with tracked WIP are
+        // left untouched (never clobber a developer's edits) but flagged loudly
+        // afterward. Classification MUST happen before the advance: afterward the
+        // phantom diff masquerades as tracked changes and defeats the check.
+        const mainRefBefore = runGitSync(['rev-parse', mainBranch], config.repoPath);
+        const mainWorktrees = worktreesWithBranchCheckedOut(config.repoPath, mainBranch, mwt);
+        const resyncableMainWorktrees = mainWorktrees.filter(wt => !hasTrackedChanges(wt));
+        const trackedDirtyMainWorktrees = mainWorktrees.filter(wt => hasTrackedChanges(wt));
+        // Detached checkout of main's tip in the merge worktree. We deliberately
+        // do NOT attach the main branch (`git checkout main`): main is frequently
+        // checked out in the daemon's primary worktree, and git refuses to attach
+        // the same branch in two worktrees ("'main' is already used by worktree").
+        // Detaching lets us build the merge result and advance the ref via
+        // update-ref, which bypasses that guard.
+        const checkoutResult = runGitSync(['checkout', '--detach', mainBranch], mwt);
+        if (!checkoutResult.success) {
+            return {
+                success: false,
+                error: `Failed to checkout ${mainBranch}: ${checkoutResult.error}`,
+                sourceBranch: config.integrationBranch,
+                targetBranch: mainBranch,
+            };
+        }
+        // Bring the detached HEAD up to the latest remote main (best-effort ff).
+        // If remote main has diverged, a later push would be rejected and rolled
+        // back; we don't merge it here to keep the integration->main result clean.
+        if (withRemote) {
+            runGitSync(['merge', '--ff-only', `origin/${mainBranch}`], mwt);
+        }
+        // Save pre-merge state for rollback
+        const preMergeRef = runGitSync(['rev-parse', 'HEAD'], mwt);
+        // Dispatch to the requested strategy. The strategy helpers operate on the
+        // merge worktree's current HEAD (here a detached HEAD at main's tip), so
+        // they work identically whether or not main is attached.
+        let result = applyMergeStrategy(mwt, config.integrationBranch, mainBranch, mergeStrategy);
+        if (!result.success) {
+            return {
+                ...result,
+                error: `${result.error ?? 'Unknown error'} (merging ${config.integrationBranch} into ${mainBranch} via ${mergeStrategy})`,
+                sourceBranch: config.integrationBranch,
+                targetBranch: mainBranch,
+            };
+        }
+        // Capture merge commit SHA
+        const shaResult = runGitSync(['rev-parse', 'HEAD'], mwt);
+        if (!result.commitSha && shaResult.success) {
+            result = { ...result, commitSha: shaResult.output };
+        }
+        const newMainSha = shaResult.success ? shaResult.output : result.commitSha;
+        // Advance refs/heads/main out-of-band to the merge result. update-ref is a
+        // plumbing command without the checked-out-branch guard that `git checkout`
+        // and `git branch -f` enforce, so this succeeds even when main is attached
+        // in the primary worktree.
+        if (newMainSha) {
+            const updateRef = runGitSync(['update-ref', `refs/heads/${mainBranch}`, newMainSha], mwt);
+            if (!updateRef.success) {
+                return {
+                    success: false,
+                    error: `Failed to advance ${mainBranch} ref to merge result: ${updateRef.error}`,
+                    sourceBranch: config.integrationBranch,
+                    targetBranch: mainBranch,
+                };
+            }
+        }
+        // Push main to remote (gated on CD opt-in).
+        let pushedTo;
+        if (withRemote && pushToRemote) {
+            const pushResult = runGitSync(['push', 'origin', mainBranch], mwt);
+            if (!pushResult.success) {
+                // Roll the main ref back to its pre-merge value before the generic
+                // rollback (which resets the detached HEAD and marks corruption on a
+                // failed rollback) runs.
+                if (mainRefBefore.success) {
+                    runGitSync(['update-ref', `refs/heads/${mainBranch}`, mainRefBefore.output], mwt);
+                }
+                if (preMergeRef.success) {
+                    return handlePushFailureWithRollback({
+                        repoPath: mwt,
+                        branch: mainBranch,
+                        preMergeRef: preMergeRef.output,
+                        pushError: pushResult.error,
+                        sourceBranch: config.integrationBranch,
+                        targetBranch: mainBranch,
+                    });
+                }
+                return {
+                    success: false,
+                    error: `Push failed (no pre-merge ref for rollback): ${pushResult.error}`,
+                    sourceBranch: config.integrationBranch,
+                    targetBranch: mainBranch,
+                };
+            }
+            const urlResult = runGitSync(['remote', 'get-url', 'origin'], mwt, { timeoutMs: 3_000 });
+            pushedTo = { name: 'origin', url: urlResult.success ? urlResult.output : '' };
+        }
+        // Re-sync worktrees that held main and had no tracked changes before the ref
+        // advance, so the out-of-band update leaves no phantom diff. `reset --hard`
+        // restores tracked files to the new main and leaves untracked files intact,
+        // so this is safe for both clean and untracked-only worktrees.
+        if (newMainSha) {
+            for (const wt of resyncableMainWorktrees) {
+                const reset = runGitSync(['reset', '--hard', newMainSha], wt);
+                if (!reset.success) {
+                    log.warn(`[CI] Advanced ${mainBranch} but failed to re-sync worktree ${wt}: ${reset.error}`);
+                }
+            }
+            // Worktrees with tracked WIP can't be reset without clobbering work, but
+            // leaving them silently stale is exactly what confused downstream tooling
+            // (the /sync that committed a stale tree). Flag each loudly with the
+            // recovery command so the staleness is never silent.
+            for (const wt of trackedDirtyMainWorktrees) {
+                log.warn(`[CI] Advanced ${mainBranch} to ${newMainSha} but worktree ${wt} has uncommitted ` +
+                    `TRACKED changes -- left unsynced to avoid clobbering work. Its tree now lags ` +
+                    `${mainBranch} and will show a phantom diff (e.g. to /sync). Commit or stash there, ` +
+                    `then 'git -C ${wt} reset --hard ${mainBranch}' to reconcile.`);
+            }
+        }
+        const action = pushToRemote ? 'merged and pushed' : 'merged';
+        log.info(`Successfully ${action} ${config.integrationBranch} into ${mainBranch}`);
+        return {
+            success: true,
+            commitSha: result.commitSha,
+            preMergeRef: preMergeRef.success ? preMergeRef.output : undefined,
+            pushedTo,
+        };
+    }, `mergeIntegrationToMain:${focusName}`);
+}
+//# sourceMappingURL=merge-to-main.js.map

package/dist/merge/merge-to-main.js.map

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

package/dist/merge/resolution-agent.d.ts

@@ -0,0 +1,83 @@
+/**
+ * The merge-conflict resolution agent: a short-lived, single-purpose Claude
+ * Code one-shot the merge paths spawn when a conflict has no team lead to
+ * resolve it (merge/focus-merge.ts, merge/merge-back-conflict.ts). Its budget
+ * is sized from the conflict set (merge/resolution-budget.ts); its session row
+ * and process ownership go through session/one-shot-process-ownership.ts.
+ *
+ * History: docs/daemon/history-team-lifecycle.md (spawn/lifecycle.ts, where it
+ * was defined beside the audit assessor spawn).
+ */
+import { type ChildProcess, type SpawnOptions } from 'node:child_process';
+import type { DaemonConfig } from '../types/index.js';
+import { type OneShotOwnershipDeps } from '../session/one-shot-process-ownership.js';
+import { openSystemSession, closeSystemSession } from '../queries/sessions/system-session.js';
+import type { Logger } from '../log/daemon-log.js';
+/**
+ * The resolution agent's prompt. Its steps come from the shared merge-resolution
+ * wording (the same the team-lead message and the prompt section send). Pure --
+ * exported for testing.
+ */
+export declare function buildResolutionAgentPrompt(p: {
+    worktreePath: string;
+    branchName: string;
+    integrationBranch: string;
+    conflictFiles: string[];
+    focusDescription: string;
+    /** A previous run's preserved partial resolution (refs/telora/resolver-partial/...), or null. */
+    priorPartialRef?: string | null;
+}): string;
+/**
+ * The process, timer, log, session and ownership effects of {@link spawnResolutionAgent}.
+ * Every effect is required: production binds them at the composition root
+ * (composition/resolution-agent-effects.ts), and a test passes its
+ * own to observe the real spawn/timeout log lines, the kill timer's budget and
+ * the ownership record without mock.module.
+ */
+export interface ResolutionAgentEffects {
+    spawn: (command: string, args: string[], options: SpawnOptions) => ChildProcess;
+    setTimeout: (fn: () => void, ms: number) => ReturnType<typeof setTimeout>;
+    /** Signals the resolver's process GROUP (it is spawned detached) by its leader pid. */
+    kill: (pid: number, signal: NodeJS.Signals) => void;
+    log: Pick<Logger, 'info' | 'warn' | 'error'>;
+    openSession: typeof openSystemSession;
+    closeSession: typeof closeSystemSession;
+    ownership: OneShotOwnershipDeps;
+}
+/**
+ * Spawn a short-lived, single-purpose Claude Code agent for merge conflict resolution.
+ *
+ * Used when no active team exists for a focus but merge conflicts need resolution.
+ * The agent receives a focused prompt with conflict details, resolves in the existing
+ * worktree, and exits. It runs under a role-less 'merge' agent_sessions row whose
+ * process ownership is recorded (session/one-shot-process-ownership.ts). No
+ * streaming, no team mode.
+ */
+export declare function spawnResolutionAgent(params: {
+    config: DaemonConfig;
+    worktreePath: string;
+    branchName: string;
+    integrationBranch: string;
+    conflictFiles: string[];
+    focusDescription: string;
+    /** Focus's pipelineConfig.model. Null/undefined falls back to the CLI default. */
+    model?: string | null;
+    /**
+     * Focus this merge runs under. Scopes the 'merge' agent_sessions row to the
+     * product so its run-time reaches OEE Availability. Null when unknown (the
+     * row is still created, just unscoped).
+     */
+    focusId?: string | null;
+    /**
+     * Scales the conflict-sized budget (an escalated retry). Absent => 1. The
+     * budget itself is computed from the conflict set or the product's configured
+     * `resolutionAgentTimeoutMs` (merge/resolution-budget.ts).
+     */
+    budgetMultiplier?: number;
+    /** A previous run's preserved partial resolution, named in the prompt. */
+    priorPartialRef?: string | null;
+}, fx: ResolutionAgentEffects): Promise<{
+    success: boolean;
+    error?: string;
+}>;
+//# sourceMappingURL=resolution-agent.d.ts.map

package/dist/merge/resolution-agent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolution-agent.d.ts","sourceRoot":"","sources":["../../src/merge/resolution-agent.ts"],"names":[],"mappings":"AAMA;;;;;;;;;GASG;AAEH,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAE1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGtD,OAAO,EAIL,KAAK,oBAAoB,EAC1B,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC9F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAInD;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,CAAC,EAAE;IAC5C,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iGAAiG;IACjG,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC,GAAG,MAAM,CA4BT;AAED;;;;;;GAMG;AACH,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,YAAY,KAAK,YAAY,CAAC;IAChF,UAAU,EAAE,CAAC,EAAE,EAAE,MAAM,IAAI,EAAE,EAAE,EAAE,MAAM,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAC1E,uFAAuF;IACvF,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;IACpD,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;IAC7C,WAAW,EAAE,OAAO,iBAAiB,CAAC;IACtC,YAAY,EAAE,OAAO,kBAAkB,CAAC;IACxC,SAAS,EAAE,oBAAoB,CAAC;CACjC;AAED;;;;;;;;GAQG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,MAAM,EAAE,YAAY,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,kFAAkF;IAClF,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,0EAA0E;IAC1E,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC,EAAE,EAAE,EAAE,sBAAsB,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAyH5E"}