@lumenflow/core 3.2.0 → 3.2.2

package/dist/wu-done-machine.js

@@ -0,0 +1,227 @@
+// Copyright (c) 2026 Hellmai Ltd
+// SPDX-License-Identifier: AGPL-3.0-only
+/**
+ * Typed XState v5 state machine for the wu:done pipeline.
+ *
+ * WU-1662: Defines the canonical execution model for wu:done as an explicit
+ * state machine with typed states, events, guards, and context.
+ *
+ * Pipeline stages:
+ *   idle -> validating -> preparing -> gating -> committing -> merging -> pushing -> cleaningUp -> done
+ *
+ * Each operational state has a failure transition to a shared `failed` state.
+ * The `failed` state supports a RETRY transition back to `validating`.
+ *
+ * Gate dedup (WU-1659): The `gating` state accepts GATES_SKIPPED only when
+ * prepPassed is true (wu:prep already ran gates successfully).
+ *
+ * Snapshot support: XState v5 provides built-in getPersistedSnapshot() and
+ * snapshot rehydration via createActor(machine, { snapshot }).
+ *
+ * This module is machine-definition only. No CLI behavior changes.
+ * WU-1663 wires the CLI orchestrator to this machine.
+ */
+import { assign, setup } from 'xstate';
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+/**
+ * Pipeline state identifiers.
+ */
+export const WU_DONE_STATES = {
+    IDLE: 'idle',
+    VALIDATING: 'validating',
+    PREPARING: 'preparing',
+    GATING: 'gating',
+    COMMITTING: 'committing',
+    MERGING: 'merging',
+    PUSHING: 'pushing',
+    CLEANING_UP: 'cleaningUp',
+    DONE: 'done',
+    FAILED: 'failed',
+};
+/**
+ * Pipeline event type identifiers.
+ */
+export const WU_DONE_EVENTS = {
+    START: 'wu.done.start',
+    VALIDATION_PASSED: 'wu.done.validation.passed',
+    VALIDATION_FAILED: 'wu.done.validation.failed',
+    PREPARATION_COMPLETE: 'wu.done.preparation.complete',
+    PREPARATION_FAILED: 'wu.done.preparation.failed',
+    GATES_PASSED: 'wu.done.gates.passed',
+    GATES_FAILED: 'wu.done.gates.failed',
+    GATES_SKIPPED: 'wu.done.gates.skipped',
+    COMMIT_COMPLETE: 'wu.done.commit.complete',
+    COMMIT_FAILED: 'wu.done.commit.failed',
+    MERGE_COMPLETE: 'wu.done.merge.complete',
+    MERGE_FAILED: 'wu.done.merge.failed',
+    PUSH_COMPLETE: 'wu.done.push.complete',
+    PUSH_FAILED: 'wu.done.push.failed',
+    CLEANUP_COMPLETE: 'wu.done.cleanup.complete',
+    CLEANUP_FAILED: 'wu.done.cleanup.failed',
+    RETRY: 'wu.done.retry',
+};
+// ---------------------------------------------------------------------------
+// Machine definition
+// ---------------------------------------------------------------------------
+/**
+ * The wu:done pipeline state machine.
+ *
+ * Represents the canonical execution stages of the wu:done command with
+ * explicit state/event/guard contracts and support for snapshot-based
+ * persistence and rehydration.
+ */
+export const wuDoneMachine = setup({
+    types: {
+        context: {},
+        events: {},
+        input: {},
+    },
+    guards: {
+        /** WU-1659: Allow gate skip only when wu:prep already passed gates. */
+        isPrepPassed: ({ context }) => context.prepPassed === true,
+    },
+}).createMachine({
+    id: 'wuDonePipeline',
+    initial: WU_DONE_STATES.IDLE,
+    context: ({ input }) => ({
+        wuId: input?.wuId ?? null,
+        worktreePath: input?.worktreePath ?? null,
+        prepPassed: input?.prepPassed ?? false,
+        error: null,
+        failedAt: null,
+        retryCount: 0,
+    }),
+    states: {
+        [WU_DONE_STATES.IDLE]: {
+            on: {
+                [WU_DONE_EVENTS.START]: {
+                    target: WU_DONE_STATES.VALIDATING,
+                    actions: assign({
+                        wuId: ({ event }) => event.wuId,
+                        worktreePath: ({ event }) => event.worktreePath,
+                    }),
+                },
+            },
+        },
+        [WU_DONE_STATES.VALIDATING]: {
+            on: {
+                [WU_DONE_EVENTS.VALIDATION_PASSED]: {
+                    target: WU_DONE_STATES.PREPARING,
+                },
+                [WU_DONE_EVENTS.VALIDATION_FAILED]: {
+                    target: WU_DONE_STATES.FAILED,
+                    actions: assign({
+                        error: ({ event }) => event.error,
+                        failedAt: WU_DONE_STATES.VALIDATING,
+                    }),
+                },
+            },
+        },
+        [WU_DONE_STATES.PREPARING]: {
+            on: {
+                [WU_DONE_EVENTS.PREPARATION_COMPLETE]: {
+                    target: WU_DONE_STATES.GATING,
+                },
+                [WU_DONE_EVENTS.PREPARATION_FAILED]: {
+                    target: WU_DONE_STATES.FAILED,
+                    actions: assign({
+                        error: ({ event }) => event.error,
+                        failedAt: WU_DONE_STATES.PREPARING,
+                    }),
+                },
+            },
+        },
+        [WU_DONE_STATES.GATING]: {
+            on: {
+                [WU_DONE_EVENTS.GATES_PASSED]: {
+                    target: WU_DONE_STATES.COMMITTING,
+                },
+                [WU_DONE_EVENTS.GATES_SKIPPED]: {
+                    target: WU_DONE_STATES.COMMITTING,
+                    guard: 'isPrepPassed',
+                },
+                [WU_DONE_EVENTS.GATES_FAILED]: {
+                    target: WU_DONE_STATES.FAILED,
+                    actions: assign({
+                        error: ({ event }) => event.error,
+                        failedAt: WU_DONE_STATES.GATING,
+                    }),
+                },
+            },
+        },
+        [WU_DONE_STATES.COMMITTING]: {
+            on: {
+                [WU_DONE_EVENTS.COMMIT_COMPLETE]: {
+                    target: WU_DONE_STATES.MERGING,
+                },
+                [WU_DONE_EVENTS.COMMIT_FAILED]: {
+                    target: WU_DONE_STATES.FAILED,
+                    actions: assign({
+                        error: ({ event }) => event.error,
+                        failedAt: WU_DONE_STATES.COMMITTING,
+                    }),
+                },
+            },
+        },
+        [WU_DONE_STATES.MERGING]: {
+            on: {
+                [WU_DONE_EVENTS.MERGE_COMPLETE]: {
+                    target: WU_DONE_STATES.PUSHING,
+                },
+                [WU_DONE_EVENTS.MERGE_FAILED]: {
+                    target: WU_DONE_STATES.FAILED,
+                    actions: assign({
+                        error: ({ event }) => event.error,
+                        failedAt: WU_DONE_STATES.MERGING,
+                    }),
+                },
+            },
+        },
+        [WU_DONE_STATES.PUSHING]: {
+            on: {
+                [WU_DONE_EVENTS.PUSH_COMPLETE]: {
+                    target: WU_DONE_STATES.CLEANING_UP,
+                },
+                [WU_DONE_EVENTS.PUSH_FAILED]: {
+                    target: WU_DONE_STATES.FAILED,
+                    actions: assign({
+                        error: ({ event }) => event.error,
+                        failedAt: WU_DONE_STATES.PUSHING,
+                    }),
+                },
+            },
+        },
+        [WU_DONE_STATES.CLEANING_UP]: {
+            on: {
+                [WU_DONE_EVENTS.CLEANUP_COMPLETE]: {
+                    target: WU_DONE_STATES.DONE,
+                },
+                [WU_DONE_EVENTS.CLEANUP_FAILED]: {
+                    target: WU_DONE_STATES.FAILED,
+                    actions: assign({
+                        error: ({ event }) => event.error,
+                        failedAt: WU_DONE_STATES.CLEANING_UP,
+                    }),
+                },
+            },
+        },
+        [WU_DONE_STATES.DONE]: {
+            type: 'final',
+        },
+        [WU_DONE_STATES.FAILED]: {
+            on: {
+                [WU_DONE_EVENTS.RETRY]: {
+                    target: WU_DONE_STATES.VALIDATING,
+                    actions: assign({
+                        error: null,
+                        failedAt: null,
+                        retryCount: ({ context }) => context.retryCount + 1,
+                    }),
+                },
+            },
+        },
+    },
+});
+//# sourceMappingURL=wu-done-machine.js.map

package/dist/wu-done-machine.js.map

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

package/dist/wu-done-main-sync.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Minimal git adapter interface for main sync validation.
+ * Avoids importing the full GitAdapter type to reduce coupling.
+ */
+interface MainSyncGitAdapter {
+    fetch: (remote?: string, branch?: string) => Promise<void>;
+    getCommitHash: (ref: string) => Promise<string>;
+    revList: (args: string[]) => Promise<string>;
+}
+/**
+ * WU-1577: Validate that local main is not behind origin/main before transaction.
+ *
+ * Defense-in-depth check inside the core layer. The CLI layer already has
+ * `ensureMainUpToDate()`, but this adds a guard directly before the
+ * transaction starts in `executeWorktreeCompletion()`.
+ *
+ * Fail-open: if the fetch or comparison fails (network issue), returns valid=true
+ * to avoid blocking legitimate work when there's no remote.
+ */
+export declare function validateMainNotBehindOrigin(gitAdapter: MainSyncGitAdapter): Promise<{
+    valid: boolean;
+    commitsBehind: number;
+    failOpen?: boolean;
+}>;
+/**
+ * WU-1577: Helper that throws if local main is behind origin.
+ *
+ * Used as a pre-flight guard before starting the wu:done transaction.
+ *
+ * @param mainCheckoutPath - Absolute path to the main checkout
+ * @param wuId - WU ID for error messages
+ * @throws When local main is behind origin/main
+ */
+export declare function ensureMainNotBehindOrigin(mainCheckoutPath: string, wuId: string): Promise<void>;
+export {};
+//# sourceMappingURL=wu-done-main-sync.d.ts.map

package/dist/wu-done-main-sync.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wu-done-main-sync.d.ts","sourceRoot":"","sources":["../src/wu-done-main-sync.ts"],"names":[],"mappings":"AAkBA;;;GAGG;AACH,UAAU,kBAAkB;IAC1B,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,aAAa,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAChD,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC9C;AAED;;;;;;;;;GASG;AACH,wBAAsB,2BAA2B,CAC/C,UAAU,EAAE,kBAAkB,GAC7B,OAAO,CAAC;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,CAyBxE;AAED;;;;;;;;GAQG;AACH,wBAAsB,yBAAyB,CAC7C,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAaf"}

package/dist/wu-done-main-sync.js

@@ -0,0 +1,67 @@
+// Copyright (c) 2026 Hellmai Ltd
+// SPDX-License-Identifier: AGPL-3.0-only
+/**
+ * WU-2014: Main branch sync validation for wu:done
+ *
+ * Extracted from wu-done-worktree.ts to isolate main-branch-behind-origin
+ * detection into a focused module.
+ *
+ * Functions:
+ *   validateMainNotBehindOrigin - Check if local main is behind origin/main
+ *   ensureMainNotBehindOrigin   - Throws if local main is behind origin
+ */
+import { createGitForPath } from './git-adapter.js';
+import { BRANCHES, REMOTES } from './wu-constants.js';
+import { createError, ErrorCodes } from './error-handler.js';
+/**
+ * WU-1577: Validate that local main is not behind origin/main before transaction.
+ *
+ * Defense-in-depth check inside the core layer. The CLI layer already has
+ * `ensureMainUpToDate()`, but this adds a guard directly before the
+ * transaction starts in `executeWorktreeCompletion()`.
+ *
+ * Fail-open: if the fetch or comparison fails (network issue), returns valid=true
+ * to avoid blocking legitimate work when there's no remote.
+ */
+export async function validateMainNotBehindOrigin(gitAdapter) {
+    try {
+        await gitAdapter.fetch(REMOTES.ORIGIN, BRANCHES.MAIN);
+        const localSha = await gitAdapter.getCommitHash(BRANCHES.MAIN);
+        const remoteSha = await gitAdapter.getCommitHash(`${REMOTES.ORIGIN}/${BRANCHES.MAIN}`);
+        if (localSha === remoteSha) {
+            return { valid: true, commitsBehind: 0 };
+        }
+        const behindRaw = await gitAdapter.revList([
+            '--count',
+            `${BRANCHES.MAIN}..${REMOTES.ORIGIN}/${BRANCHES.MAIN}`,
+        ]);
+        const commitsBehind = Number(behindRaw.trim()) || 0;
+        if (commitsBehind > 0) {
+            return { valid: false, commitsBehind };
+        }
+        return { valid: true, commitsBehind: 0 };
+    }
+    catch {
+        return { valid: true, commitsBehind: 0, failOpen: true };
+    }
+}
+/**
+ * WU-1577: Helper that throws if local main is behind origin.
+ *
+ * Used as a pre-flight guard before starting the wu:done transaction.
+ *
+ * @param mainCheckoutPath - Absolute path to the main checkout
+ * @param wuId - WU ID for error messages
+ * @throws When local main is behind origin/main
+ */
+export async function ensureMainNotBehindOrigin(mainCheckoutPath, wuId) {
+    const gitMainPreCheck = createGitForPath(mainCheckoutPath);
+    const result = await validateMainNotBehindOrigin(gitMainPreCheck);
+    if (!result.valid) {
+        throw createError(ErrorCodes.GIT_ERROR, `Local main is ${result.commitsBehind} commit(s) behind origin/main.\n\n` +
+            `wu:done aborted BEFORE file writes to prevent metadata leaks (WU-1577).\n\n` +
+            `Fix: git pull origin main\n` +
+            `Then retry: pnpm wu:done --id ${wuId}`, { wuId, commitsBehind: result.commitsBehind });
+    }
+}
+//# sourceMappingURL=wu-done-main-sync.js.map

package/dist/wu-done-main-sync.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wu-done-main-sync.js","sourceRoot":"","sources":["../src/wu-done-main-sync.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,yCAAyC;AAEzC;;;;;;;;;GASG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAY7D;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,UAA8B;IAE9B,IAAI,CAAC;QACH,MAAM,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEtD,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC/D,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;QAEvF,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,EAAE,CAAC;QAC3C,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACzC,SAAS;YACT,GAAG,QAAQ,CAAC,IAAI,KAAK,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,IAAI,EAAE;SACvD,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC;QAEpD,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YACtB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC;QACzC,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,EAAE,CAAC;IAC3C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC3D,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,gBAAwB,EACxB,IAAY;IAEZ,MAAM,eAAe,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAC,eAAe,CAAC,CAAC;IAClE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,WAAW,CACf,UAAU,CAAC,SAAS,EACpB,iBAAiB,MAAM,CAAC,aAAa,oCAAoC;YACvE,6EAA6E;YAC7E,6BAA6B;YAC7B,iCAAiC,IAAI,EAAE,EACzC,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,EAAE,CAC9C,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/wu-done-merge-phase.d.ts

@@ -0,0 +1,49 @@
+/**
+ * Input context for the merge phase.
+ */
+export interface MergePhaseContext {
+    /** WU ID */
+    id: string;
+    /** WU title */
+    title: string;
+    /** Lane branch name (null if not resolvable) */
+    laneBranch: string | null;
+    /** WU doc from main checkout */
+    docMain: Record<string, unknown>;
+    /** WU doc being updated (for code_paths check) */
+    docForUpdate: Record<string, unknown>;
+    /** Done command args */
+    args: {
+        noMerge?: boolean;
+        prDraft?: boolean;
+        noAutoRebase?: boolean;
+        [key: string]: unknown;
+    };
+    /** Worktree path (for rebase context) */
+    worktreePath: string;
+}
+/**
+ * Result of the merge phase.
+ */
+export interface MergePhaseResult {
+    /** Whether a merge was performed */
+    merged: boolean;
+    /** PR URL if PR was created */
+    prUrl: string | null;
+    /** Whether PR mode was used */
+    prModeEnabled: boolean;
+}
+/**
+ * Execute the merge/PR decision phase.
+ *
+ * After metadata is committed in the worktree, this function:
+ * - In PR mode: creates a pull request
+ * - In default mode: runs pre-flight checks and auto-merges
+ * - Throws if the lane branch is not found
+ *
+ * @param ctx - Merge phase context
+ * @returns Merge phase result
+ * @throws On lane branch not found or merge failure
+ */
+export declare function executeMergePhase(ctx: MergePhaseContext): Promise<MergePhaseResult>;
+//# sourceMappingURL=wu-done-merge-phase.d.ts.map

package/dist/wu-done-merge-phase.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wu-done-merge-phase.d.ts","sourceRoot":"","sources":["../src/wu-done-merge-phase.ts"],"names":[],"mappings":"AAiCA;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,YAAY;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,eAAe;IACf,KAAK,EAAE,MAAM,CAAC;IACd,gDAAgD;IAChD,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,gCAAgC;IAChC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,kDAAkD;IAClD,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,wBAAwB;IACxB,IAAI,EAAE;QACJ,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;IACF,yCAAyC;IACzC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,oCAAoC;IACpC,MAAM,EAAE,OAAO,CAAC;IAChB,+BAA+B;IAC/B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,+BAA+B;IAC/B,aAAa,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA0FzF"}

package/dist/wu-done-merge-phase.js

@@ -0,0 +1,121 @@
+// Copyright (c) 2026 Hellmai Ltd
+// SPDX-License-Identifier: AGPL-3.0-only
+/**
+ * WU-2014: Merge/PR decision phase for wu:done worktree completion.
+ *
+ * Extracted from wu-done-worktree.ts to isolate the merge-vs-PR decision tree.
+ * After metadata is committed in the worktree, this module decides whether to:
+ * 1. Create a PR (pr-mode)
+ * 2. Run pre-flight checks and auto-merge (default mode)
+ * 3. Skip merge entirely (noMerge flag)
+ *
+ * Functions:
+ *   executeMergePhase - Run the merge/PR decision logic after worktree commit
+ */
+import { BRANCHES, REMOTES, THRESHOLDS, LOG_PREFIX, BOX } from './wu-constants.js';
+import { PREFLIGHT, MERGE } from './wu-done-messages.js';
+import { getDriftLevel, DRIFT_LEVELS } from './branch-drift.js';
+import { createError, ErrorCodes } from './error-handler.js';
+import { isPRModeEnabled, createPR, printPRCreatedMessage } from './wu-done-pr.js';
+import { isBranchAlreadyMerged } from './wu-done-branch-utils.js';
+import { branchExists } from './wu-done-validators.js';
+import { withMergeLock } from './merge-lock.js';
+import { withAtomicMerge } from './atomic-merge.js';
+import { checkBranchDrift, checkBranchDivergence, checkMergeCommits, checkMergeConflicts, checkEmptyMerge, } from './wu-done-preflight-checks.js';
+/**
+ * Execute the merge/PR decision phase.
+ *
+ * After metadata is committed in the worktree, this function:
+ * - In PR mode: creates a pull request
+ * - In default mode: runs pre-flight checks and auto-merges
+ * - Throws if the lane branch is not found
+ *
+ * @param ctx - Merge phase context
+ * @returns Merge phase result
+ * @throws On lane branch not found or merge failure
+ */
+export async function executeMergePhase(ctx) {
+    const { id, title, laneBranch, docMain, docForUpdate, args, worktreePath } = ctx;
+    const prModeEnabled = isPRModeEnabled(docMain, args);
+    let merged = false;
+    let prUrl = null;
+    if (args.noMerge) {
+        return { merged: false, prUrl: null, prModeEnabled };
+    }
+    if (!laneBranch || !(await branchExists(laneBranch))) {
+        console.error(`\n${BOX.TOP}`);
+        console.error(`${BOX.SIDE}  MERGE FAILED: Lane branch not found`);
+        console.error(BOX.MID);
+        console.error(`${BOX.SIDE}  Expected branch: ${laneBranch || '(null)'}`);
+        console.error(`${BOX.SIDE}  WU lane: "${docForUpdate.lane}"`);
+        console.error(`${BOX.SIDE}  WU id: "${docForUpdate.id}"`);
+        console.error(BOX.BOT);
+        throw createError(ErrorCodes.BRANCH_ERROR, `Lane branch not found: ${laneBranch}`, {
+            laneBranch,
+            wuId: docForUpdate.id,
+        });
+    }
+    if (prModeEnabled) {
+        const prResult = await createPR({
+            branch: laneBranch,
+            id,
+            title,
+            doc: docMain,
+            draft: args.prDraft,
+        });
+        if (prResult.success && prResult.prUrl) {
+            printPRCreatedMessage(prResult.prUrl, id);
+            prUrl = prResult.prUrl;
+        }
+    }
+    else {
+        // Default mode: Auto-merge with pre-flight checks
+        console.log(PREFLIGHT.RUNNING);
+        const commitsBehind = await checkBranchDrift(laneBranch);
+        if (commitsBehind > 0) {
+            const driftLevel = getDriftLevel(commitsBehind);
+            if (driftLevel === DRIFT_LEVELS.WARNING) {
+                console.log(PREFLIGHT.BRANCH_DRIFT_WARNING(commitsBehind));
+            }
+            else if (driftLevel === DRIFT_LEVELS.INFO) {
+                console.log(PREFLIGHT.BRANCH_DRIFT_INFO(commitsBehind));
+            }
+            else if (driftLevel === DRIFT_LEVELS.OK) {
+                console.log(PREFLIGHT.BRANCH_BEHIND(commitsBehind, THRESHOLDS.BRANCH_DRIFT_MAX));
+            }
+        }
+        const alreadyMerged = await isBranchAlreadyMerged(laneBranch);
+        if (alreadyMerged) {
+            console.log(PREFLIGHT.ALREADY_MERGED);
+            console.log(PREFLIGHT.ALREADY_MERGED_EXPLANATION);
+        }
+        else {
+            await checkBranchDivergence(laneBranch, {
+                autoRebase: args.noAutoRebase !== true,
+                worktreePath,
+                wuId: id,
+            });
+            await checkMergeCommits(laneBranch, {
+                autoRebase: args.noAutoRebase !== true,
+                worktreePath,
+                wuId: id,
+            });
+            await checkMergeConflicts(laneBranch);
+            await checkEmptyMerge(laneBranch, docForUpdate);
+            console.log(MERGE.STARTING(laneBranch));
+            await withMergeLock(id, async () => {
+                await withAtomicMerge({
+                    id,
+                    laneBranch,
+                    command: `pnpm wu:done --id ${id}`,
+                    logPrefix: LOG_PREFIX.DONE,
+                });
+            });
+            console.log(MERGE.ATOMIC_SUCCESS);
+            merged = true;
+            console.log(MERGE.PUSHED(REMOTES.ORIGIN, BRANCHES.MAIN));
+        }
+    }
+    return { merged, prUrl, prModeEnabled };
+}
+//# sourceMappingURL=wu-done-merge-phase.js.map

package/dist/wu-done-merge-phase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wu-done-merge-phase.js","sourceRoot":"","sources":["../src/wu-done-merge-phase.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,yCAAyC;AAEzC;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACnF,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EACrB,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,GAChB,MAAM,+BAA+B,CAAC;AAuCvC;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,GAAsB;IAC5D,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC;IAEjF,MAAM,aAAa,GAAG,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACrD,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,KAAK,GAAkB,IAAI,CAAC;IAEhC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;IACvD,CAAC;IAED,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC,MAAM,YAAY,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;QACrD,OAAO,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;QAC9B,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,IAAI,uCAAuC,CAAC,CAAC;QAClE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACvB,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,IAAI,sBAAsB,UAAU,IAAI,QAAQ,EAAE,CAAC,CAAC;QACzE,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,IAAI,eAAe,YAAY,CAAC,IAAI,GAAG,CAAC,CAAC;QAC9D,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,IAAI,aAAa,YAAY,CAAC,EAAE,GAAG,CAAC,CAAC;QAC1D,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACvB,MAAM,WAAW,CAAC,UAAU,CAAC,YAAY,EAAE,0BAA0B,UAAU,EAAE,EAAE;YACjF,UAAU;YACV,IAAI,EAAE,YAAY,CAAC,EAAE;SACtB,CAAC,CAAC;IACL,CAAC;IAED,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC;YAC9B,MAAM,EAAE,UAAU;YAClB,EAAE;YACF,KAAK;YACL,GAAG,EAAE,OAAO;YACZ,KAAK,EAAE,IAAI,CAAC,OAAO;SACpB,CAAC,CAAC;QACH,IAAI,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;YACvC,qBAAqB,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC1C,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;QACzB,CAAC;IACH,CAAC;SAAM,CAAC;QACN,kDAAkD;QAClD,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAE/B,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACzD,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YACtB,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;YAChD,IAAI,UAAU,KAAK,YAAY,CAAC,OAAO,EAAE,CAAC;gBACxC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC,CAAC;YAC7D,CAAC;iBAAM,IAAI,UAAU,KAAK,YAAY,CAAC,IAAI,EAAE,CAAC;gBAC5C,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC,CAAC;YAC1D,CAAC;iBAAM,IAAI,UAAU,KAAK,YAAY,CAAC,EAAE,EAAE,CAAC;gBAC1C,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,aAAa,EAAE,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;YACnF,CAAC;QACH,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,qBAAqB,CAAC,UAAU,CAAC,CAAC;QAC9D,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;YACtC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,MAAM,qBAAqB,CAAC,UAAU,EAAE;gBACtC,UAAU,EAAE,IAAI,CAAC,YAAY,KAAK,IAAI;gBACtC,YAAY;gBACZ,IAAI,EAAE,EAAE;aACT,CAAC,CAAC;YAEH,MAAM,iBAAiB,CAAC,UAAU,EAAE;gBAClC,UAAU,EAAE,IAAI,CAAC,YAAY,KAAK,IAAI;gBACtC,YAAY;gBACZ,IAAI,EAAE,EAAE;aACT,CAAC,CAAC;YAEH,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAC;YAEtC,MAAM,eAAe,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;YAEhD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;YACxC,MAAM,aAAa,CAAC,EAAE,EAAE,KAAK,IAAI,EAAE;gBACjC,MAAM,eAAe,CAAC;oBACpB,EAAE;oBACF,UAAU;oBACV,OAAO,EAAE,qBAAqB,EAAE,EAAE;oBAClC,SAAS,EAAE,UAAU,CAAC,IAAI;iBAC3B,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAClC,MAAM,GAAG,IAAI,CAAC;YACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC;AAC1C,CAAC"}

package/dist/wu-done-merge.d.ts

@@ -0,0 +1,46 @@
+/**
+ * WU-2014: Merge operations for wu:done worktree completion.
+ *
+ * Extracted from wu-done-worktree.ts to isolate merge-with-retry logic.
+ * Rebase and conflict resolution live in wu-done-rebase.ts.
+ *
+ * Functions:
+ *   isMainAncestorOfBranch - Check if main is an ancestor of a branch
+ *   mergeLaneBranch        - Merge lane branch to main with retry
+ */
+import { type GitAdapter } from './git-adapter.js';
+/**
+ * Check if main is an ancestor of the given branch.
+ *
+ * @param gitAdapter - Git adapter instance
+ * @param branch - Branch to check
+ * @returns True if main is an ancestor of branch
+ */
+export declare function isMainAncestorOfBranch(gitAdapter: GitAdapter, branch: string): Promise<boolean>;
+/**
+ * Merge options for mergeLaneBranch.
+ * Fields mirror CheckBranchOptions (from wu-done-preflight-checks) plus retry config.
+ * Defined inline to avoid circular dependency.
+ */
+export interface MergeLaneBranchOptions {
+    /** Automatically rebase if diverged */
+    autoRebase?: boolean;
+    /** Path to worktree (required if autoRebase=true) */
+    worktreePath?: string | null;
+    /** WU ID for artifact cleanup (e.g., 'WU-1371') */
+    wuId?: string | null;
+    /** Override max retry attempts */
+    maxAttempts?: number;
+}
+/**
+ * Merge lane branch to main with exponential backoff retry (WU-1747)
+ *
+ * Uses retry strategy to handle concurrent completions gracefully.
+ * WU-1749 Bug 2: Will auto-rebase lane branch onto new main on retry.
+ *
+ * @param branch - Lane branch name
+ * @param options - Merge options
+ * @throws On merge failure after all retries
+ */
+export declare function mergeLaneBranch(branch: string, options?: MergeLaneBranchOptions): Promise<void>;
+//# sourceMappingURL=wu-done-merge.d.ts.map

package/dist/wu-done-merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wu-done-merge.d.ts","sourceRoot":"","sources":["../src/wu-done-merge.ts"],"names":[],"mappings":"AAGA;;;;;;;;;GASG;AAEH,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAOjE;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC,CAOlB;AAED;;;;GAIG;AACH,MAAM,WAAW,sBAAsB;IACrC,uCAAuC;IACvC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,qDAAqD;IACrD,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,mDAAmD;IACnD,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,kCAAkC;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,IAAI,CAAC,CA6Ff"}