@lumenflow/core 2.18.1 → 2.18.3

package/dist/micro-worktree-shared.d.ts

@@ -0,0 +1,134 @@
+/**
+ * Shared micro-worktree helpers used by multiple workflows.
+ *
+ * Extracted from micro-worktree.ts (WU-1626) to support atomic merge flows
+ * without importing the full withMicroWorktree orchestration module.
+ */
+import type { GitAdapter } from './git-adapter.js';
+import type { PushRetryConfig } from './lumenflow-config-schema.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 declare const MAX_MERGE_RETRIES = 3;
+/**
+ * Maximum retry attempts for push when origin/main advances
+ *
+ * WU-1179: When push fails due to race condition (origin advanced while we
+ * were working), rollback local main to origin/main and retry.
+ * Each retry: fetch -> rebase temp branch -> re-merge -> push.
+ *
+ * @deprecated Use DEFAULT_PUSH_RETRY_CONFIG.retries instead (WU-1332)
+ */
+export declare const MAX_PUSH_RETRIES = 3;
+/**
+ * WU-1332: Default push retry configuration
+ *
+ * Provides sensible defaults for micro-worktree push operations.
+ * Can be overridden via .lumenflow.config.yaml git.push_retry section.
+ */
+export declare const DEFAULT_PUSH_RETRY_CONFIG: PushRetryConfig;
+/**
+ * Resolve effective push retry config from defaults + global config + operation override.
+ *
+ * Priority (lowest to highest):
+ * 1. DEFAULT_PUSH_RETRY_CONFIG
+ * 2. Global config from `.lumenflow.config.yaml` (`git.push_retry`)
+ * 3. Operation-specific override from caller
+ */
+export declare function resolvePushRetryConfig(globalConfig?: Partial<PushRetryConfig>, operationOverride?: Partial<PushRetryConfig>): PushRetryConfig;
+/**
+ * Environment variable name for LUMENFLOW_FORCE bypass
+ *
+ * WU-1081: Exported for use in micro-worktree push operations.
+ */
+export declare const LUMENFLOW_FORCE_ENV = "LUMENFLOW_FORCE";
+/**
+ * Environment variable name for LUMENFLOW_FORCE_REASON audit trail
+ *
+ * WU-1081: Exported for use in micro-worktree push operations.
+ */
+export declare const LUMENFLOW_FORCE_REASON_ENV = "LUMENFLOW_FORCE_REASON";
+/**
+ * Environment variable name for LUMENFLOW_WU_TOOL
+ *
+ * WU-1365: Exported for use by CLI commands that use micro-worktree operations.
+ * The pre-push hook checks this env var to allow micro-worktree pushes to main.
+ * Valid values are: wu-create, wu-edit, wu-done, wu-delete, wu-claim, wu-block,
+ * wu-unblock, initiative-create, initiative-edit, release, lumenflow-upgrade
+ */
+export declare const LUMENFLOW_WU_TOOL_ENV = "LUMENFLOW_WU_TOOL";
+/**
+ * Default log prefix for micro-worktree operations
+ *
+ * Extracted to constant to satisfy sonarjs/no-duplicate-string rule.
+ */
+export declare const DEFAULT_LOG_PREFIX = "[micro-wt]";
+/**
+ * WU-1336: Typed error for retry exhaustion in micro-worktree operations
+ *
+ * Thrown when push retries are exhausted due to race conditions with parallel agents.
+ * CLI commands should use `isRetryExhaustionError` to detect this error type and
+ * `formatRetryExhaustionError` to generate actionable user-facing messages.
+ */
+export declare class RetryExhaustionError extends Error {
+    readonly name = "RetryExhaustionError";
+    readonly operation: string;
+    readonly retries: number;
+    constructor(operation: string, retries: number);
+}
+/**
+ * WU-1336: Options for formatting retry exhaustion error messages
+ */
+export interface FormatRetryExhaustionOptions {
+    command: string;
+}
+/**
+ * WU-1336: Type guard to check if an error is a retry exhaustion error
+ *
+ * Detects both the typed `RetryExhaustionError` class and legacy error messages
+ * that match the "Push failed after N attempts" pattern.
+ */
+export declare function isRetryExhaustionError(error: unknown): error is Error;
+/**
+ * WU-1336: Format retry exhaustion error with actionable next steps
+ */
+export declare function formatRetryExhaustionError(error: Error, options: FormatRetryExhaustionOptions): string;
+/**
+ * WU-1308: Check if remote operations should be skipped based on git.requireRemote config
+ */
+export declare function shouldSkipRemoteOperations(): boolean;
+/**
+ * Temp branch prefix for micro-worktree operations
+ */
+export declare function getTempBranchName(operation: string, id: string): string;
+/**
+ * Create micro-worktree in /tmp directory
+ */
+export declare function createMicroWorktreeDir(prefix: string): string;
+/**
+ * Parse git worktree list output to find worktrees by branch
+ */
+export declare function findWorktreeByBranch(worktreeListOutput: string, branchName: string): string | null;
+/**
+ * Clean up orphaned micro-worktree and temp branch from a previous interrupted operation
+ */
+export declare function cleanupOrphanedMicroWorktree(operation: string, id: string, gitAdapter: GitAdapter, logPrefix?: string): Promise<{
+    cleanedWorktree: boolean;
+    cleanedBranch: boolean;
+}>;
+/**
+ * Cleanup micro-worktree and temp branch
+ */
+export declare function cleanupMicroWorktree(worktreePath: string, branchName: string, logPrefix?: string): Promise<void>;
+/**
+ * Push using refspec with LUMENFLOW_FORCE to bypass pre-push hooks
+ */
+export declare function pushRefspecWithForce(gitAdapter: GitAdapter, remote: string, localRef: string, remoteRef: string, reason: string): Promise<void>;
+/**
+ * WU-1337: Push using refspec with LUMENFLOW_FORCE and retry logic
+ */
+export declare function pushRefspecWithRetry(gitWorktree: GitAdapter, mainGit: GitAdapter, remote: string, localRef: string, remoteRef: string, reason: string, logPrefix?: string, config?: PushRetryConfig): Promise<void>;
+//# sourceMappingURL=micro-worktree-shared.d.ts.map

package/dist/micro-worktree-shared.d.ts.map

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

package/dist/micro-worktree-shared.js

@@ -0,0 +1,350 @@
+/**
+ * Shared micro-worktree helpers used by multiple workflows.
+ *
+ * Extracted from micro-worktree.ts (WU-1626) to support atomic merge flows
+ * without importing the full withMicroWorktree orchestration module.
+ */
+import { getGitForCwd } from './git-adapter.js';
+import { existsSync, rmSync, mkdtempSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import pRetry from 'p-retry';
+import { BRANCHES } from './wu-constants.js';
+import { getConfig } from './lumenflow-config.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 const MAX_MERGE_RETRIES = 3;
+/**
+ * Maximum retry attempts for push when origin/main advances
+ *
+ * WU-1179: When push fails due to race condition (origin advanced while we
+ * were working), rollback local main to origin/main and retry.
+ * Each retry: fetch -> rebase temp branch -> re-merge -> push.
+ *
+ * @deprecated Use DEFAULT_PUSH_RETRY_CONFIG.retries instead (WU-1332)
+ */
+export const MAX_PUSH_RETRIES = 3;
+/**
+ * WU-1332: Default push retry configuration
+ *
+ * Provides sensible defaults for micro-worktree push operations.
+ * Can be overridden via .lumenflow.config.yaml git.push_retry section.
+ */
+export const DEFAULT_PUSH_RETRY_CONFIG = {
+    enabled: true,
+    retries: 3,
+    min_delay_ms: 100,
+    max_delay_ms: 1000,
+    jitter: true,
+};
+/**
+ * Resolve effective push retry config from defaults + global config + operation override.
+ *
+ * Priority (lowest to highest):
+ * 1. DEFAULT_PUSH_RETRY_CONFIG
+ * 2. Global config from `.lumenflow.config.yaml` (`git.push_retry`)
+ * 3. Operation-specific override from caller
+ */
+export function resolvePushRetryConfig(globalConfig, operationOverride) {
+    return {
+        ...DEFAULT_PUSH_RETRY_CONFIG,
+        ...(globalConfig || {}),
+        ...(operationOverride || {}),
+    };
+}
+/**
+ * Environment variable name for LUMENFLOW_FORCE bypass
+ *
+ * WU-1081: Exported for use in micro-worktree push operations.
+ */
+export const LUMENFLOW_FORCE_ENV = 'LUMENFLOW_FORCE';
+/**
+ * Environment variable name for LUMENFLOW_FORCE_REASON audit trail
+ *
+ * WU-1081: Exported for use in micro-worktree push operations.
+ */
+export const LUMENFLOW_FORCE_REASON_ENV = 'LUMENFLOW_FORCE_REASON';
+/**
+ * Environment variable name for LUMENFLOW_WU_TOOL
+ *
+ * WU-1365: Exported for use by CLI commands that use micro-worktree operations.
+ * The pre-push hook checks this env var to allow micro-worktree pushes to main.
+ * Valid values are: wu-create, wu-edit, wu-done, wu-delete, wu-claim, wu-block,
+ * wu-unblock, initiative-create, initiative-edit, release, lumenflow-upgrade
+ */
+export const LUMENFLOW_WU_TOOL_ENV = 'LUMENFLOW_WU_TOOL';
+/**
+ * Default log prefix for micro-worktree operations
+ *
+ * Extracted to constant to satisfy sonarjs/no-duplicate-string rule.
+ */
+export const DEFAULT_LOG_PREFIX = '[micro-wt]';
+/**
+ * WU-1336: Pattern to detect retry exhaustion errors from error messages
+ *
+ * Matches error messages like "Push failed after N attempts"
+ * Used for backwards compatibility with legacy error messages.
+ */
+const RETRY_EXHAUSTION_PATTERN = /Push failed after \d+ attempts/;
+/**
+ * WU-1336: Typed error for retry exhaustion in micro-worktree operations
+ *
+ * Thrown when push retries are exhausted due to race conditions with parallel agents.
+ * CLI commands should use `isRetryExhaustionError` to detect this error type and
+ * `formatRetryExhaustionError` to generate actionable user-facing messages.
+ */
+export class RetryExhaustionError extends Error {
+    name = 'RetryExhaustionError';
+    operation;
+    retries;
+    constructor(operation, retries) {
+        super(`Push failed after ${retries} attempts. ` +
+            `Origin main may have significant traffic during ${operation}.`);
+        this.operation = operation;
+        this.retries = retries;
+        Object.setPrototypeOf(this, RetryExhaustionError.prototype);
+    }
+}
+/**
+ * WU-1336: Type guard to check if an error is a retry exhaustion error
+ *
+ * Detects both the typed `RetryExhaustionError` class and legacy error messages
+ * that match the "Push failed after N attempts" pattern.
+ */
+export function isRetryExhaustionError(error) {
+    if (error instanceof RetryExhaustionError) {
+        return true;
+    }
+    if (error instanceof Error) {
+        return RETRY_EXHAUSTION_PATTERN.test(error.message);
+    }
+    return false;
+}
+/**
+ * WU-1336: Format retry exhaustion error with actionable next steps
+ */
+export function formatRetryExhaustionError(error, options) {
+    const { command } = options;
+    return (`${error.message}\n\n` +
+        `Next steps:\n` +
+        `  1. Wait a few seconds and retry the operation:\n` +
+        `     ${command}\n` +
+        `  2. If the issue persists, check if another agent is rapidly pushing changes\n` +
+        `  3. Consider increasing git.push_retry.retries in .lumenflow.config.yaml`);
+}
+/**
+ * WU-1308: Check if remote operations should be skipped based on git.requireRemote config
+ */
+export function shouldSkipRemoteOperations() {
+    const config = getConfig();
+    return config.git.requireRemote === false;
+}
+/**
+ * Temp branch prefix for micro-worktree operations
+ */
+export function getTempBranchName(operation, id) {
+    return `${BRANCHES.TEMP_PREFIX}${operation}/${id.toLowerCase()}`;
+}
+/**
+ * Create micro-worktree in /tmp directory
+ */
+export function createMicroWorktreeDir(prefix) {
+    return mkdtempSync(join(tmpdir(), prefix));
+}
+/**
+ * Parse git worktree list output to find worktrees by branch
+ */
+export function findWorktreeByBranch(worktreeListOutput, branchName) {
+    const branchRef = `refs/heads/${branchName}`;
+    const lines = worktreeListOutput.split('\n');
+    let currentWorktreePath = null;
+    for (const line of lines) {
+        if (line.startsWith('worktree ')) {
+            currentWorktreePath = line.substring('worktree '.length);
+        }
+        else if (line.startsWith('branch ') && line.substring('branch '.length) === branchRef) {
+            return currentWorktreePath;
+        }
+        else if (line === '') {
+            currentWorktreePath = null;
+        }
+    }
+    return null;
+}
+/**
+ * Clean up orphaned micro-worktree and temp branch from a previous interrupted operation
+ */
+export async function cleanupOrphanedMicroWorktree(operation, id, gitAdapter, logPrefix = DEFAULT_LOG_PREFIX) {
+    const tempBranchName = getTempBranchName(operation, id);
+    let cleanedWorktree = false;
+    let cleanedBranch = false;
+    try {
+        const worktreeListOutput = await gitAdapter.worktreeList();
+        const orphanWorktreePath = findWorktreeByBranch(worktreeListOutput, tempBranchName);
+        if (orphanWorktreePath) {
+            console.log(`${logPrefix} Found orphaned worktree for ${tempBranchName}: ${orphanWorktreePath}`);
+            try {
+                await gitAdapter.worktreeRemove(orphanWorktreePath, { force: true });
+                console.log(`${logPrefix} ✅ Removed orphaned worktree: ${orphanWorktreePath}`);
+                cleanedWorktree = true;
+            }
+            catch (err) {
+                const errMsg = err instanceof Error ? err.message : String(err);
+                console.warn(`${logPrefix} ⚠️  Could not remove orphaned worktree: ${errMsg}`);
+                tryFilesystemCleanup(orphanWorktreePath);
+                cleanedWorktree = true;
+            }
+        }
+    }
+    catch (err) {
+        const errMsg = err instanceof Error ? err.message : String(err);
+        console.warn(`${logPrefix} ⚠️  Could not check worktree list: ${errMsg}`);
+    }
+    try {
+        const branchExists = await gitAdapter.branchExists(tempBranchName);
+        if (branchExists) {
+            console.log(`${logPrefix} Found orphaned temp branch: ${tempBranchName}`);
+            await gitAdapter.deleteBranch(tempBranchName, { force: true });
+            console.log(`${logPrefix} ✅ Deleted orphaned temp branch: ${tempBranchName}`);
+            cleanedBranch = true;
+        }
+    }
+    catch (err) {
+        const errMsg = err instanceof Error ? err.message : String(err);
+        console.warn(`${logPrefix} ⚠️  Could not delete orphaned branch: ${errMsg}`);
+    }
+    return { cleanedWorktree, cleanedBranch };
+}
+function tryFilesystemCleanup(worktreePath) {
+    try {
+        if (existsSync(worktreePath)) {
+            rmSync(worktreePath, { recursive: true, force: true });
+        }
+    }
+    catch {
+        // Ignore filesystem cleanup errors
+    }
+}
+async function removeWorktreeSafe(gitAdapter, worktreePath, logPrefix, contextLabel = '') {
+    const label = contextLabel ? ` ${contextLabel}` : '';
+    try {
+        await gitAdapter.worktreeRemove(worktreePath, { force: true });
+        if (contextLabel) {
+            console.log(`${logPrefix} ✅ Removed${label} worktree: ${worktreePath}`);
+        }
+    }
+    catch (err) {
+        const errMsg = err instanceof Error ? err.message : String(err);
+        console.warn(`${logPrefix} ⚠️  Could not remove${label} worktree: ${errMsg}`);
+        tryFilesystemCleanup(worktreePath);
+    }
+}
+/**
+ * Cleanup micro-worktree and temp branch
+ */
+export async function cleanupMicroWorktree(worktreePath, branchName, logPrefix = DEFAULT_LOG_PREFIX) {
+    console.log(`${logPrefix} Cleaning up micro-worktree...`);
+    const mainGit = getGitForCwd();
+    if (existsSync(worktreePath)) {
+        await removeWorktreeSafe(mainGit, worktreePath, logPrefix);
+    }
+    await cleanupRegisteredWorktreeForBranch(mainGit, branchName, worktreePath, logPrefix);
+    await deleteBranchSafe(mainGit, branchName, logPrefix);
+    console.log(`${logPrefix} ✅ Cleanup complete`);
+}
+async function cleanupRegisteredWorktreeForBranch(gitAdapter, branchName, expectedPath, logPrefix) {
+    try {
+        const worktreeListOutput = await gitAdapter.worktreeList();
+        const registeredPath = findWorktreeByBranch(worktreeListOutput, branchName);
+        if (registeredPath && registeredPath !== expectedPath) {
+            console.log(`${logPrefix} Found additional registered worktree: ${registeredPath}`);
+            await removeWorktreeSafe(gitAdapter, registeredPath, logPrefix, 'registered');
+        }
+    }
+    catch (err) {
+        const errMsg = err instanceof Error ? err.message : String(err);
+        console.warn(`${logPrefix} ⚠️  Could not check worktree list: ${errMsg}`);
+    }
+}
+async function deleteBranchSafe(gitAdapter, branchName, logPrefix) {
+    try {
+        const branchExists = await gitAdapter.branchExists(branchName);
+        if (branchExists) {
+            await gitAdapter.deleteBranch(branchName, { force: true });
+        }
+    }
+    catch (err) {
+        const errMsg = err instanceof Error ? err.message : String(err);
+        console.warn(`${logPrefix} ⚠️  Could not delete branch: ${errMsg}`);
+    }
+}
+/**
+ * Push using refspec with LUMENFLOW_FORCE to bypass pre-push hooks
+ */
+export async function pushRefspecWithForce(gitAdapter, remote, localRef, remoteRef, reason) {
+    const originalForce = process.env[LUMENFLOW_FORCE_ENV];
+    const originalReason = process.env[LUMENFLOW_FORCE_REASON_ENV];
+    try {
+        process.env[LUMENFLOW_FORCE_ENV] = '1';
+        process.env[LUMENFLOW_FORCE_REASON_ENV] = reason;
+        await gitAdapter.pushRefspec(remote, localRef, remoteRef);
+    }
+    finally {
+        if (originalForce === undefined) {
+            Reflect.deleteProperty(process.env, LUMENFLOW_FORCE_ENV);
+        }
+        else {
+            process.env[LUMENFLOW_FORCE_ENV] = originalForce;
+        }
+        if (originalReason === undefined) {
+            Reflect.deleteProperty(process.env, LUMENFLOW_FORCE_REASON_ENV);
+        }
+        else {
+            process.env[LUMENFLOW_FORCE_REASON_ENV] = originalReason;
+        }
+    }
+}
+/**
+ * WU-1337: Push using refspec with LUMENFLOW_FORCE and retry logic
+ */
+export async function pushRefspecWithRetry(gitWorktree, mainGit, remote, localRef, remoteRef, reason, logPrefix = DEFAULT_LOG_PREFIX, config = DEFAULT_PUSH_RETRY_CONFIG) {
+    if (!config.enabled) {
+        console.log(`${logPrefix} Pushing to ${remote}/${remoteRef} (push-only, retry disabled)...`);
+        await pushRefspecWithForce(gitWorktree, remote, localRef, remoteRef, reason);
+        console.log(`${logPrefix} ✅ Pushed to ${remote}/${remoteRef}`);
+        return;
+    }
+    let attemptNumber = 0;
+    await pRetry(async () => {
+        attemptNumber++;
+        console.log(`${logPrefix} Pushing to ${remote}/${remoteRef} (push-only, attempt ${attemptNumber}/${config.retries})...`);
+        try {
+            await pushRefspecWithForce(gitWorktree, remote, localRef, remoteRef, reason);
+            console.log(`${logPrefix} ✅ Pushed to ${remote}/${remoteRef}`);
+        }
+        catch (pushErr) {
+            console.log(`${logPrefix} ⚠️  Push failed (origin moved). Fetching and rebasing before retry...`);
+            console.log(`${logPrefix} Fetching ${remote}/${remoteRef}...`);
+            await mainGit.fetch(remote, remoteRef);
+            const remoteTrackingRef = `${remote}/${remoteRef}`;
+            console.log(`${logPrefix} Rebasing temp branch onto ${remoteTrackingRef}...`);
+            await gitWorktree.rebase(remoteTrackingRef);
+            throw pushErr;
+        }
+    }, {
+        retries: config.retries - 1,
+        minTimeout: config.min_delay_ms,
+        maxTimeout: config.max_delay_ms,
+        randomize: config.jitter,
+        onFailedAttempt: () => {
+            // Logging handled in the retry body
+        },
+    }).catch(() => {
+        throw new RetryExhaustionError('push-only', config.retries);
+    });
+}
+//# sourceMappingURL=micro-worktree-shared.js.map

package/dist/micro-worktree-shared.js.map

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