@lumenflow/core 3.2.0 → 3.2.2

package/dist/micro-worktree.js

@@ -0,0 +1,463 @@
+// Copyright (c) 2026 Hellmai Ltd
+// SPDX-License-Identifier: AGPL-3.0-only
+/**
+ * Micro-Worktree Operations
+ *
+ * Race-safe micro-worktree isolation pattern extracted from wu-create.ts (WU-1262).
+ * Provides shared infrastructure for commands that need to modify main branch
+ * atomically without switching checkout.
+ *
+ * Part of WU-1262: Race-safe WU creation using micro-worktrees
+ * Extended in WU-1274: Add wu:edit command for spec-only changes
+ * Extended in WU-1439: Migrate initiative:create and wu:create to shared helper
+ *
+ * Pattern:
+ * 1. Create temp branch without switching main checkout
+ * 2. Create micro-worktree in /tmp pointing to temp branch
+ * 3. Perform operations in micro-worktree
+ * 4. FF-only merge temp branch to main (retry with rebase if main moved)
+ * 5. Push to origin
+ * 6. Cleanup (always, even on failure)
+ *
+ * Benefits:
+ * - Main checkout never switches branches (no impact on other agents)
+ * - Race conditions handled via rebase+retry (up to MAX_MERGE_RETRIES attempts)
+ * - Cleanup guaranteed even on failure
+ *
+ * Consumers:
+ * @see {@link packages/@lumenflow/cli/src/wu-create.ts} - WU creation (WU-1262, WU-1439)
+ * @see {@link packages/@lumenflow/cli/src/wu-edit.ts} - Spec edits (WU-1274)
+ * @see {@link packages/@lumenflow/cli/src/initiative-create.ts} - Initiative creation (WU-1439)
+ */
+import { getGitForCwd, createGitForPath } from './git-adapter.js';
+import { execSync } from 'node:child_process';
+import { join } from 'node:path';
+import pRetry from 'p-retry';
+import { BRANCHES, REMOTES, GIT_REFS, PKG_MANAGER, SCRIPTS, PRETTIER_FLAGS, STDIO_MODES, } from './wu-constants.js';
+import { getConfig } from './lumenflow-config.js';
+import { MAX_MERGE_RETRIES, MAX_PUSH_RETRIES, DEFAULT_PUSH_RETRY_CONFIG, resolvePushRetryConfig, LUMENFLOW_FORCE_ENV, LUMENFLOW_FORCE_REASON_ENV, LUMENFLOW_WU_TOOL_ENV, DEFAULT_LOG_PREFIX, RetryExhaustionError, isRetryExhaustionError, formatRetryExhaustionError, shouldSkipRemoteOperations, getTempBranchName, createMicroWorktreeDir, findWorktreeByBranch, cleanupOrphanedMicroWorktree, cleanupMicroWorktree, pushRefspecWithForce, pushRefspecWithRetry, } from './micro-worktree-shared.js';
+/**
+ * Maximum retry attempts for ff-only merge when main moves
+ *
+ * This handles race conditions when multiple agents run wu:create or wu:edit
+ * concurrently. Each retry fetches latest main and rebases.
+ */
+export { MAX_MERGE_RETRIES, MAX_PUSH_RETRIES, DEFAULT_PUSH_RETRY_CONFIG, resolvePushRetryConfig, LUMENFLOW_FORCE_ENV, LUMENFLOW_FORCE_REASON_ENV, LUMENFLOW_WU_TOOL_ENV, DEFAULT_LOG_PREFIX, RetryExhaustionError, isRetryExhaustionError, formatRetryExhaustionError, shouldSkipRemoteOperations, getTempBranchName, createMicroWorktreeDir, findWorktreeByBranch, cleanupOrphanedMicroWorktree, cleanupMicroWorktree, pushRefspecWithForce, pushRefspecWithRetry, };
+export async function stageChangesWithDeletions(gitWorktree, files) {
+    // Normalise undefined/null to empty array for addWithDeletions
+    const filesToStage = files || [];
+    await gitWorktree.addWithDeletions(filesToStage);
+}
+/**
+ * WU-1365: Check if prettier is available in the project
+ *
+ * Checks if prettier is installed and executable. Returns false if:
+ * - prettier is not in node_modules
+ * - pnpm prettier command is not available
+ *
+ * This allows micro-worktree operations to skip formatting gracefully
+ * when prettier is not installed (e.g., in bootstrap or minimal setups).
+ *
+ * @returns {boolean} True if prettier is available, false otherwise
+ */
+export function isPrettierAvailable(cwd) {
+    try {
+        // Check if prettier is available via pnpm prettier --version
+        // No user input in this command - known-safe constant strings only.
+        // WU-1755: Accept optional cwd so prettier resolves from project root,
+        // not from /tmp/ micro-worktrees which have no node_modules.
+        const opts = {
+            encoding: 'utf-8',
+            stdio: STDIO_MODES.PIPE,
+        };
+        if (cwd) {
+            opts.cwd = cwd;
+        }
+        execSync(`${PKG_MANAGER} ${SCRIPTS.PRETTIER} --version`, opts);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * WU-1365: Pattern to detect prettier not found errors
+ */
+const PRETTIER_NOT_FOUND_PATTERNS = [
+    /ERR_PNPM_RECURSIVE_EXEC_FIRST_FAIL/,
+    /prettier.*not found/i,
+    /Cannot find module.*prettier/i,
+    /Command failed.*prettier/i,
+    /No script.*prettier/i,
+];
+/**
+ * WU-1365: Check if an error indicates prettier is not available
+ *
+ * @param {string} errMsg - Error message to check
+ * @returns {boolean} True if the error indicates prettier is not installed/available
+ */
+function isPrettierNotFoundError(errMsg) {
+    return PRETTIER_NOT_FOUND_PATTERNS.some((pattern) => pattern.test(errMsg));
+}
+/**
+ * Format files using prettier before committing
+ *
+ * WU-1435: Ensures committed files pass format gates.
+ * WU-1365: Gracefully handles missing prettier installation.
+ * Runs prettier --write on specified files within the micro-worktree.
+ *
+ * @param {string[]} files - Relative file paths to format
+ * @param {string} worktreePath - Path to the micro-worktree
+ * @param {string} logPrefix - Log prefix for console output
+ */
+export async function formatFiles(files, worktreePath, logPrefix = DEFAULT_LOG_PREFIX) {
+    if (!files || files.length === 0) {
+        return;
+    }
+    console.log(`${logPrefix} Formatting ${files.length} file(s)...`);
+    // Build absolute paths within the worktree
+    const absolutePaths = files.map((f) => join(worktreePath, f));
+    const pathArgs = absolutePaths.map((p) => JSON.stringify(p)).join(' ');
+    try {
+        // Note: This uses execSync with validated paths (built from worktreePath and file list)
+        execSync(`${PKG_MANAGER} ${SCRIPTS.PRETTIER} ${PRETTIER_FLAGS.WRITE} ${pathArgs}`, {
+            encoding: 'utf-8',
+            stdio: STDIO_MODES.PIPE,
+            cwd: worktreePath,
+        });
+        console.log(`${logPrefix} ✅ Files formatted`);
+    }
+    catch (err) {
+        const errMsg = err instanceof Error ? err.message : String(err);
+        // WU-1365: Check if the error is due to prettier not being available
+        if (isPrettierNotFoundError(errMsg)) {
+            console.warn(`${logPrefix} ⚠️  Skipping formatting: prettier not available.\n` +
+                `    To enable formatting, install prettier: pnpm add -D prettier\n` +
+                `    Files will be committed without formatting.`);
+            return;
+        }
+        // Log warning but don't fail - some files may not need formatting
+        console.warn(`${logPrefix} ⚠️  Formatting warning: ${errMsg}`);
+    }
+}
+/**
+ * Merge temp branch to main with ff-only and retry logic
+ *
+ * Handles race conditions when main branch advances between operation start
+ * and merge attempt. Retries with rebase up to MAX_MERGE_RETRIES times.
+ *
+ * @param {string} tempBranchName - Temp branch to merge
+ * @param {string} microWorktreePath - Path to micro-worktree (for rebase)
+ * @param {string} logPrefix - Log prefix for console output
+ * @throws {Error} If merge fails after all retries
+ */
+export async function mergeWithRetry(tempBranchName, microWorktreePath, logPrefix = DEFAULT_LOG_PREFIX) {
+    const gitWorktree = createGitForPath(microWorktreePath);
+    const mainGit = getGitForCwd();
+    for (let attempt = 1; attempt <= MAX_MERGE_RETRIES; attempt++) {
+        try {
+            console.log(`${logPrefix} Merging to main (attempt ${attempt}/${MAX_MERGE_RETRIES})...`);
+            await mainGit.merge(tempBranchName, { ffOnly: true });
+            console.log(`${logPrefix} ✅ Merged to main`);
+            return;
+        }
+        catch (mergeErr) {
+            if (attempt < MAX_MERGE_RETRIES) {
+                console.log(`${logPrefix} ⚠️  FF-only merge failed (main moved). Rebasing...`);
+                // Fetch latest main and rebase temp branch
+                await mainGit.fetch(REMOTES.ORIGIN, BRANCHES.MAIN);
+                await mainGit.merge(`${REMOTES.ORIGIN}/${BRANCHES.MAIN}`, { ffOnly: true }); // Update local main
+                await gitWorktree.rebase(BRANCHES.MAIN);
+            }
+            else {
+                const errMsg = mergeErr instanceof Error ? mergeErr.message : String(mergeErr);
+                throw new Error(`FF-only merge failed after ${MAX_MERGE_RETRIES} attempts. ` +
+                    `Main branch may have significant divergence.\n` +
+                    `Error: ${errMsg}`, { cause: mergeErr });
+            }
+        }
+    }
+}
+/**
+ * Push to origin/main with retry logic for race conditions
+ *
+ * WU-1179: When push fails because origin/main advanced (race condition with
+ * parallel agents), this function retries with fetch and rebase.
+ *
+ * WU-1348: The retry logic no longer resets the main checkout. Instead, it:
+ * 1. Fetches origin/main to get latest remote state
+ * 2. Rebases the temp branch onto origin/main (in the micro-worktree)
+ * 3. Re-merges the rebased temp branch to local main (ff-only)
+ * 4. Retries the push
+ *
+ * This preserves micro-worktree isolation - the main checkout files are never
+ * hard-reset, preventing file flash and preserving UnsafeAny uncommitted work.
+ *
+ * @param {Object} mainGit - GitAdapter instance for main checkout
+ * @param {Object} worktreeGit - GitAdapter instance for micro-worktree
+ * @param {string} remote - Remote name (e.g., 'origin')
+ * @param {string} branch - Branch name (e.g., 'main')
+ * @param {string} tempBranchName - Temp branch that was merged (for rebase)
+ * @param {string} logPrefix - Log prefix for console output
+ * @throws {Error} If push fails after all retries
+ */
+export async function pushWithRetry(mainGit, worktreeGit, remote, branch, tempBranchName, logPrefix = DEFAULT_LOG_PREFIX, operation) {
+    const maxRetries = MAX_PUSH_RETRIES;
+    // WU-1418: Save original LUMENFLOW_WU_TOOL value
+    const originalWuTool = process.env[LUMENFLOW_WU_TOOL_ENV];
+    try {
+        // WU-1418: Set LUMENFLOW_WU_TOOL to allow pre-push hook to recognize this as an automated operation
+        if (operation) {
+            process.env[LUMENFLOW_WU_TOOL_ENV] = operation;
+        }
+        for (let attempt = 1; attempt <= maxRetries; attempt++) {
+            try {
+                console.log(`${logPrefix} Pushing to ${remote}/${branch} (attempt ${attempt}/${maxRetries})...`);
+                await mainGit.push(remote, branch);
+                console.log(`${logPrefix} ✅ Pushed to ${remote}/${branch}`);
+                return;
+            }
+            catch (pushErr) {
+                if (attempt < maxRetries) {
+                    console.log(`${logPrefix} ⚠️  Push failed (origin moved). Fetching and rebasing before retry...`);
+                    // WU-1348: Do NOT reset main checkout - preserve micro-worktree isolation
+                    // Instead, fetch latest remote state and rebase the temp branch
+                    // Step 1: Fetch latest origin/main
+                    console.log(`${logPrefix} Fetching ${remote}/${branch}...`);
+                    await mainGit.fetch(remote, branch);
+                    // Step 2: Rebase temp branch onto updated origin/main
+                    console.log(`${logPrefix} Rebasing temp branch onto ${remote}/${branch}...`);
+                    await worktreeGit.rebase(`${remote}/${branch}`);
+                    // Step 3: Re-merge temp branch to local main (ff-only)
+                    // This updates local main to include the rebased commits
+                    console.log(`${logPrefix} Re-merging temp branch to ${branch}...`);
+                    await mainGit.merge(tempBranchName, { ffOnly: true });
+                }
+                else {
+                    const errMsg = pushErr instanceof Error ? pushErr.message : String(pushErr);
+                    throw new Error(`Push failed after ${maxRetries} attempts. ` +
+                        `Origin ${branch} may have significant traffic.\n\n` +
+                        `Suggestions:\n` +
+                        `  - Wait a few seconds and retry the operation\n` +
+                        `  - Check if another agent is rapidly pushing changes\n` +
+                        `Error: ${errMsg}`, { cause: pushErr });
+                }
+            }
+        }
+    }
+    finally {
+        // WU-1418: Restore original LUMENFLOW_WU_TOOL value
+        if (originalWuTool === undefined) {
+            Reflect.deleteProperty(process.env, LUMENFLOW_WU_TOOL_ENV);
+        }
+        else {
+            process.env[LUMENFLOW_WU_TOOL_ENV] = originalWuTool;
+        }
+    }
+}
+/**
+ * WU-1332: Push to origin with configurable retry using p-retry
+ *
+ * Enhanced version of pushWithRetry that uses p-retry for exponential backoff
+ * and supports configuration via PushRetryConfig. When push fails due to
+ * non-fast-forward (origin moved), automatically rebases and retries.
+ *
+ * WU-1348: The retry logic no longer resets the main checkout. Instead, it:
+ * 1. Fetches origin/main to get latest remote state
+ * 2. Rebases the temp branch onto origin/main (in the micro-worktree)
+ * 3. Re-merges the rebased temp branch to local main (ff-only)
+ * 4. Retries the push
+ *
+ * This preserves micro-worktree isolation - the main checkout files are never
+ * hard-reset, preventing file flash and preserving UnsafeAny uncommitted work.
+ *
+ * @param {Object} mainGit - GitAdapter instance for main checkout
+ * @param {Object} worktreeGit - GitAdapter instance for micro-worktree
+ * @param {string} remote - Remote name (e.g., 'origin')
+ * @param {string} branch - Branch name (e.g., 'main')
+ * @param {string} tempBranchName - Temp branch that was merged (for rebase)
+ * @param {string} logPrefix - Log prefix for console output
+ * @param {PushRetryConfig} config - Push retry configuration
+ * @throws {Error} If push fails after all retries or if retry is disabled
+ */
+export async function pushWithRetryConfig(mainGit, worktreeGit, remote, branch, tempBranchName, logPrefix = DEFAULT_LOG_PREFIX, config = DEFAULT_PUSH_RETRY_CONFIG, operation) {
+    // WU-1418: Save original LUMENFLOW_WU_TOOL value
+    const originalWuTool = process.env[LUMENFLOW_WU_TOOL_ENV];
+    try {
+        // WU-1418: Set LUMENFLOW_WU_TOOL to allow pre-push hook to recognize this as an automated operation
+        if (operation) {
+            process.env[LUMENFLOW_WU_TOOL_ENV] = operation;
+        }
+        // If retry is disabled, just try once and throw on failure
+        if (!config.enabled) {
+            console.log(`${logPrefix} Pushing to ${remote}/${branch} (retry disabled)...`);
+            await mainGit.push(remote, branch);
+            console.log(`${logPrefix} ✅ Pushed to ${remote}/${branch}`);
+            return;
+        }
+        let attemptNumber = 0;
+        await pRetry(async () => {
+            attemptNumber++;
+            console.log(`${logPrefix} Pushing to ${remote}/${branch} (attempt ${attemptNumber}/${config.retries})...`);
+            try {
+                await mainGit.push(remote, branch);
+                console.log(`${logPrefix} ✅ Pushed to ${remote}/${branch}`);
+            }
+            catch (pushErr) {
+                console.log(`${logPrefix} ⚠️  Push failed (origin moved). Fetching and rebasing before retry...`);
+                // WU-1348: Do NOT reset main checkout - preserve micro-worktree isolation
+                // Instead, fetch latest remote state and rebase the temp branch
+                // Fetch latest origin/main
+                console.log(`${logPrefix} Fetching ${remote}/${branch}...`);
+                await mainGit.fetch(remote, branch);
+                // Rebase temp branch onto updated origin/main
+                console.log(`${logPrefix} Rebasing temp branch onto ${remote}/${branch}...`);
+                await worktreeGit.rebase(`${remote}/${branch}`);
+                // Re-merge temp branch to local main (ff-only)
+                // This updates local main to include the rebased commits
+                console.log(`${logPrefix} Re-merging temp branch to ${branch}...`);
+                await mainGit.merge(tempBranchName, { ffOnly: true });
+                // Re-throw to trigger p-retry
+                throw pushErr;
+            }
+        }, {
+            retries: config.retries - 1, // p-retry counts retries after first attempt
+            minTimeout: config.min_delay_ms,
+            maxTimeout: config.max_delay_ms,
+            randomize: config.jitter,
+            onFailedAttempt: () => {
+                // Logging is handled in the try/catch above
+            },
+        }).catch(() => {
+            // p-retry exhausted all retries, throw descriptive error
+            throw new Error(`Push failed after ${config.retries} attempts. ` +
+                `Origin ${branch} may have significant traffic.\n\n` +
+                `Suggestions:\n` +
+                `  - Wait a few seconds and retry the operation\n` +
+                `  - Increase git.push_retry.retries in workspace.yaml software_delivery\n` +
+                `  - Check if another agent is rapidly pushing changes`);
+        });
+    }
+    finally {
+        // WU-1418: Restore original LUMENFLOW_WU_TOOL value
+        if (originalWuTool === undefined) {
+            Reflect.deleteProperty(process.env, LUMENFLOW_WU_TOOL_ENV);
+        }
+        else {
+            process.env[LUMENFLOW_WU_TOOL_ENV] = originalWuTool;
+        }
+    }
+}
+/**
+ * Push using refspec with LUMENFLOW_FORCE to bypass pre-push hooks
+ *
+ * WU-1081: Micro-worktree pushes to origin/main need to bypass pre-push hooks
+ * because they operate from temp branches in /tmp directories, which would
+ * otherwise be blocked by hook validation.
+ *
+ * Sets LUMENFLOW_FORCE=1 and LUMENFLOW_FORCE_REASON during the push,
+ * then restores original environment values (even on error).
+ *
+ * @param {GitAdapter} gitAdapter - GitAdapter instance to use for push
+ * @param {string} remote - Remote name (e.g., 'origin')
+ * @param {string} localRef - Local ref to push (e.g., 'tmp/wu-claim/wu-123')
+ * @param {string} remoteRef - Remote ref to update (e.g., 'main')
+ * @param {string} reason - Audit reason for the LUMENFLOW_FORCE bypass
+ * @returns {Promise<void>}
+ * @throws {Error} If push fails (env vars still restored)
+ */
+export async function withMicroWorktree(options) {
+    const { operation, id, logPrefix = `[${operation}]`, execute, pushOnly = false, pushRetryOverride, } = options;
+    const mainGit = getGitForCwd();
+    // WU-1308: Check if remote operations should be skipped (local-only mode)
+    const skipRemote = shouldSkipRemoteOperations();
+    // WU-2237: Clean up UnsafeAny orphaned temp branch/worktree from previous interrupted operations
+    // This makes the operation idempotent - a retry after crash/timeout will succeed
+    await cleanupOrphanedMicroWorktree(operation, id, mainGit, logPrefix);
+    // WU-1179/WU-1672: Fetch origin/main before starting to minimize race condition window.
+    // In pushOnly mode, fetch updates origin/main tracking ref without touching local main.
+    // WU-1308: Skip when git.requireRemote=false (local-only mode).
+    if (!skipRemote) {
+        console.log(`${logPrefix} Fetching ${REMOTES.ORIGIN}/${BRANCHES.MAIN} before starting...`);
+        await mainGit.fetch(REMOTES.ORIGIN, BRANCHES.MAIN);
+        if (pushOnly) {
+            console.log(`${logPrefix} ✅ Push-only mode will base from ${REMOTES.ORIGIN}/${BRANCHES.MAIN}; local main unchanged (WU-1672)`);
+        }
+        else {
+            // Update local main to match origin/main for standard mode.
+            await mainGit.merge(`${REMOTES.ORIGIN}/${BRANCHES.MAIN}`, { ffOnly: true });
+            console.log(`${logPrefix} ✅ Local main synced with ${REMOTES.ORIGIN}/${BRANCHES.MAIN}`);
+        }
+    }
+    else if (skipRemote) {
+        console.log(`${logPrefix} Local-only mode (git.requireRemote=false): skipping origin sync`);
+    }
+    const tempBranchName = getTempBranchName(operation, id);
+    const baseRef = pushOnly && !skipRemote ? `${REMOTES.ORIGIN}/${BRANCHES.MAIN}` : BRANCHES.MAIN;
+    const microWorktreePath = createMicroWorktreeDir(`${operation}-`);
+    console.log(`${logPrefix} Using micro-worktree isolation (WU-1262)`);
+    console.log(`${logPrefix} Temp branch: ${tempBranchName}`);
+    console.log(`${logPrefix} Micro-worktree: ${microWorktreePath}`);
+    if (pushOnly) {
+        console.log(`${logPrefix} Push-only mode: local main will not be modified (WU-1435/WU-1672)`);
+    }
+    try {
+        // Step 1: Create temp branch without switching
+        console.log(`${logPrefix} Creating temp branch...`);
+        await mainGit.createBranchNoCheckout(tempBranchName, baseRef);
+        // Step 2: Create micro-worktree pointing to temp branch
+        console.log(`${logPrefix} Creating micro-worktree...`);
+        await mainGit.worktreeAddExisting(microWorktreePath, tempBranchName);
+        // Step 3: Execute the operation in micro-worktree
+        const gitWorktree = createGitForPath(microWorktreePath);
+        const result = await execute({ worktreePath: microWorktreePath, gitWorktree });
+        // Step 4: Format files before committing (WU-1435)
+        await formatFiles(result.files, microWorktreePath, logPrefix);
+        // Step 5: Stage and commit in micro-worktree
+        // WU-1813: Use stageChangesWithDeletions to properly handle file deletions
+        console.log(`${logPrefix} Staging changes (including deletions)...`);
+        await stageChangesWithDeletions(gitWorktree, result.files);
+        console.log(`${logPrefix} Committing in micro-worktree...`);
+        await gitWorktree.commit(result.commitMessage);
+        console.log(`${logPrefix} ✅ Committed: ${result.commitMessage}`);
+        // Step 6: Push to origin (different paths for pushOnly vs standard)
+        // WU-1308: Skip push when git.requireRemote=false (local-only mode)
+        if (skipRemote) {
+            // Local-only mode: merge to local main but skip push
+            console.log(`${logPrefix} Local-only mode: merging to local main (skipping push)`);
+            await mainGit.merge(tempBranchName, { ffOnly: true });
+            console.log(`${logPrefix} ✅ Merged to local main (no remote push)`);
+            return { ...result, ref: BRANCHES.MAIN };
+        }
+        else if (pushOnly) {
+            // WU-1435: Push directly to origin/main without touching local main
+            // WU-1081: Use LUMENFLOW_FORCE to bypass pre-push hooks for micro-worktree pushes
+            // WU-1337: Use pushRefspecWithRetry to handle race conditions with rebase
+            // Resolve effective push_retry config from defaults + global + operation override
+            const config = getConfig();
+            const pushRetryConfig = resolvePushRetryConfig(config.git.push_retry, pushRetryOverride);
+            await pushRefspecWithRetry(gitWorktree, mainGit, REMOTES.ORIGIN, tempBranchName, BRANCHES.MAIN, `micro-worktree push for ${operation} (automated)`, logPrefix, pushRetryConfig);
+            // Fetch to update remote tracking ref (FETCH_HEAD)
+            console.log(`${logPrefix} Fetching ${REMOTES.ORIGIN}/${BRANCHES.MAIN}...`);
+            await mainGit.fetch(REMOTES.ORIGIN, BRANCHES.MAIN);
+            console.log(`${logPrefix} ✅ Fetched ${REMOTES.ORIGIN}/${BRANCHES.MAIN}`);
+            // Return FETCH_HEAD as ref for worktree creation
+            return { ...result, ref: GIT_REFS.FETCH_HEAD };
+        }
+        else {
+            // Standard path: merge to local main, then push
+            const gitWorktree = createGitForPath(microWorktreePath);
+            await mergeWithRetry(tempBranchName, microWorktreePath, logPrefix);
+            // WU-1179: Use pushWithRetry to handle race conditions
+            // On push failure, rollback local main and retry with rebase
+            // WU-1418: Pass operation name to set LUMENFLOW_WU_TOOL for pre-push hook bypass
+            await pushWithRetry(mainGit, gitWorktree, REMOTES.ORIGIN, BRANCHES.MAIN, tempBranchName, logPrefix, operation);
+            return { ...result, ref: BRANCHES.MAIN };
+        }
+    }
+    finally {
+        // Cleanup (always runs)
+        await cleanupMicroWorktree(microWorktreePath, tempBranchName, logPrefix);
+    }
+}
+//# sourceMappingURL=micro-worktree.js.map

package/dist/micro-worktree.js.map

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

package/dist/normalize-config-keys.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Normalize config keys from snake_case YAML convention to camelCase schema convention.
+ *
+ * Currently normalizes the `git` section. Other sections can be added as needed.
+ *
+ * @param raw - Raw parsed YAML config object
+ * @returns Config with normalized keys, ready for Zod parsing
+ */
+export declare function normalizeConfigKeys(raw: Record<string, unknown>): Record<string, unknown>;
+//# sourceMappingURL=normalize-config-keys.d.ts.map

package/dist/normalize-config-keys.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalize-config-keys.d.ts","sourceRoot":"","sources":["../src/normalize-config-keys.ts"],"names":[],"mappings":"AA2DA;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAYzF"}

package/dist/normalize-config-keys.js

@@ -0,0 +1,70 @@
+// Copyright (c) 2026 Hellmai Ltd
+// SPDX-License-Identifier: AGPL-3.0-only
+/**
+ * Config Key Normalization (WU-1765)
+ *
+ * Transforms snake_case YAML keys to camelCase before Zod parsing.
+ *
+ * Root cause: workspace.yaml conventionally uses snake_case keys
+ * (e.g., agent_branch_patterns), but the Zod schema expects camelCase
+ * (e.g., agentBranchPatterns). yaml.parse() returns keys as-is, and Zod
+ * silently drops unrecognized keys via its default strip mode.
+ *
+ * This module provides a focused normalization for the git config section
+ * where the mismatch causes real bugs (agent branch detection fails).
+ *
+ * @module normalize-config-keys
+ */
+/** Known snake_case → camelCase mappings for the git config section */
+const GIT_KEY_MAP = {
+    agent_branch_patterns: 'agentBranchPatterns',
+    agent_branch_patterns_override: 'agentBranchPatternsOverride',
+    disable_agent_pattern_registry: 'disableAgentPatternRegistry',
+    main_branch: 'mainBranch',
+    default_remote: 'defaultRemote',
+    require_remote: 'requireRemote',
+    lane_branch_prefix: 'laneBranchPrefix',
+    max_branch_drift: 'maxBranchDrift',
+};
+/**
+ * Normalize a single config section's keys using a key map.
+ *
+ * camelCase keys take precedence over snake_case when both exist,
+ * since the camelCase form is the canonical schema form.
+ */
+function normalizeSection(section, keyMap) {
+    const result = {};
+    for (const [key, value] of Object.entries(section)) {
+        const camelKey = keyMap[key];
+        if (camelKey) {
+            // Only set from snake_case if camelCase form is not already present
+            if (!(camelKey in section)) {
+                result[camelKey] = value;
+            }
+            // Don't copy the snake_case key to output
+        }
+        else {
+            result[key] = value;
+        }
+    }
+    return result;
+}
+/**
+ * Normalize config keys from snake_case YAML convention to camelCase schema convention.
+ *
+ * Currently normalizes the `git` section. Other sections can be added as needed.
+ *
+ * @param raw - Raw parsed YAML config object
+ * @returns Config with normalized keys, ready for Zod parsing
+ */
+export function normalizeConfigKeys(raw) {
+    if (!raw || typeof raw !== 'object') {
+        return raw ?? {};
+    }
+    const result = { ...raw };
+    if (result.git && typeof result.git === 'object' && !Array.isArray(result.git)) {
+        result.git = normalizeSection(result.git, GIT_KEY_MAP);
+    }
+    return result;
+}
+//# sourceMappingURL=normalize-config-keys.js.map

package/dist/normalize-config-keys.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalize-config-keys.js","sourceRoot":"","sources":["../src/normalize-config-keys.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,yCAAyC;AAEzC;;;;;;;;;;;;;;GAcG;AAEH,uEAAuE;AACvE,MAAM,WAAW,GAA2B;IAC1C,qBAAqB,EAAE,qBAAqB;IAC5C,8BAA8B,EAAE,6BAA6B;IAC7D,8BAA8B,EAAE,6BAA6B;IAC7D,WAAW,EAAE,YAAY;IACzB,cAAc,EAAE,eAAe;IAC/B,cAAc,EAAE,eAAe;IAC/B,kBAAkB,EAAE,kBAAkB;IACtC,gBAAgB,EAAE,gBAAgB;CACnC,CAAC;AAEF;;;;;GAKG;AACH,SAAS,gBAAgB,CACvB,OAAgC,EAChC,MAA8B;IAE9B,MAAM,MAAM,GAA4B,EAAE,CAAC;IAE3C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACnD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,QAAQ,EAAE,CAAC;YACb,oEAAoE;YACpE,IAAI,CAAC,CAAC,QAAQ,IAAI,OAAO,CAAC,EAAE,CAAC;gBAC3B,MAAM,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;YAC3B,CAAC;YACD,0CAA0C;QAC5C,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACtB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,mBAAmB,CAAC,GAA4B;IAC9D,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QACpC,OAAO,GAAG,IAAI,EAAE,CAAC;IACnB,CAAC;IAED,MAAM,MAAM,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC;IAE1B,IAAI,MAAM,CAAC,GAAG,IAAI,OAAO,MAAM,CAAC,GAAG,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/E,MAAM,CAAC,GAAG,GAAG,gBAAgB,CAAC,MAAM,CAAC,GAA8B,EAAE,WAAW,CAAC,CAAC;IACpF,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/object-guards.d.ts

@@ -0,0 +1,11 @@
+export declare const VALUE_TYPE: {
+    readonly OBJECT: "object";
+    readonly STRING: "string";
+    readonly NUMBER: "number";
+    readonly BOOLEAN: "boolean";
+};
+export declare function asRecord(value: unknown): Record<string, unknown> | null;
+export declare function isString(value: unknown): value is string;
+export declare function isNumber(value: unknown): value is number;
+export declare function isBoolean(value: unknown): value is boolean;
+//# sourceMappingURL=object-guards.d.ts.map

package/dist/object-guards.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"object-guards.d.ts","sourceRoot":"","sources":["../src/object-guards.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,UAAU;;;;;CAKb,CAAC;AAEX,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAIvE;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAExD;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAExD;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,OAAO,CAE1D"}

package/dist/object-guards.js

@@ -0,0 +1,23 @@
+// Copyright (c) 2026 Hellmai Ltd
+// SPDX-License-Identifier: AGPL-3.0-only
+export const VALUE_TYPE = {
+    OBJECT: 'object',
+    STRING: 'string',
+    NUMBER: 'number',
+    BOOLEAN: 'boolean',
+};
+export function asRecord(value) {
+    return value && typeof value === VALUE_TYPE.OBJECT && !Array.isArray(value)
+        ? value
+        : null;
+}
+export function isString(value) {
+    return typeof value === VALUE_TYPE.STRING;
+}
+export function isNumber(value) {
+    return typeof value === VALUE_TYPE.NUMBER;
+}
+export function isBoolean(value) {
+    return typeof value === VALUE_TYPE.BOOLEAN;
+}
+//# sourceMappingURL=object-guards.js.map

package/dist/object-guards.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"object-guards.js","sourceRoot":"","sources":["../src/object-guards.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,yCAAyC;AAEzC,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;CACV,CAAC;AAEX,MAAM,UAAU,QAAQ,CAAC,KAAc;IACrC,OAAO,KAAK,IAAI,OAAO,KAAK,KAAK,UAAU,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACzE,CAAC,CAAE,KAAiC;QACpC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,KAAc;IACrC,OAAO,OAAO,KAAK,KAAK,UAAU,CAAC,MAAM,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,KAAc;IACrC,OAAO,OAAO,KAAK,KAAK,UAAU,CAAC,MAAM,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,KAAc;IACtC,OAAO,OAAO,KAAK,KAAK,UAAU,CAAC,OAAO,CAAC;AAC7C,CAAC"}

package/dist/orchestration-advisory-loader.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Emit mandatory agent advisory based on code paths.
+ *
+ * @param {string[]} codePaths - Array of file paths
+ * @param {string} wuId - Work Unit ID
+ */
+export declare function emitMandatoryAgentAdvisory(codePaths: UnsafeAny, wuId: UnsafeAny): void;
+/**
+ * Check mandatory agent compliance.
+ *
+ * @param {string[]} codePaths - Array of file paths
+ * @param {string} _wuId - Work Unit ID (reserved for future telemetry lookup)
+ * @returns {{compliant: boolean, missing: string[]}}
+ */
+export declare function checkMandatoryAgentsCompliance(codePaths: UnsafeAny, _wuId: UnsafeAny): {
+    compliant: boolean;
+    missing: unknown[];
+};
+//# sourceMappingURL=orchestration-advisory-loader.d.ts.map

package/dist/orchestration-advisory-loader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"orchestration-advisory-loader.d.ts","sourceRoot":"","sources":["../src/orchestration-advisory-loader.ts"],"names":[],"mappings":"AAwDA;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,QA8B/E;AAED;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS;;;EAWpF"}