@lumenflow/core 3.2.0 → 3.2.2

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

@@ -0,0 +1,44 @@
+#!/usr/bin/env node
+import { type GitAdapter } from './git-adapter.js';
+/**
+ * Assert that no conflict artifacts remain in the git index.
+ *
+ * Checks for:
+ * 1. Unmerged files (UU, AA, AU, UA etc.)
+ * 2. Leftover conflict markers in staged files (via git diff --check)
+ *
+ * @param gitCwd - Git adapter instance
+ * @param files - Optional list of specific files to check
+ * @param options - Check options
+ */
+export declare function assertNoConflictArtifactsInIndex(gitCwd: GitAdapter, files?: string[], options?: {
+    checkStaged?: boolean;
+}): Promise<void>;
+/**
+ * Auto-resolve conflicts in append-only files during rebase
+ * WU-1749 Bug 3: Keeps both additions for append-only files
+ *
+ * @param {object} gitCwd - Git adapter instance
+ * @param {string} worktreePath - Path to worktree
+ * @returns {Promise<{resolved: boolean, files: string[]}>} Resolution result
+ */
+export declare function autoResolveAppendOnlyConflicts(gitCwd: GitAdapter, worktreePath: string): Promise<{
+    resolved: boolean;
+    files: string[];
+}>;
+/**
+ * Auto-rebase branch onto main
+ * WU-1303: Auto-rebase on wu:done to handle diverged branches automatically
+ * WU-1371: Added wuId parameter for post-rebase artifact cleanup
+ * WU-1749 Bug 3: Auto-resolve append-only file conflicts during rebase
+ *
+ * @param {string} branch - Lane branch name
+ * @param {string} worktreePath - Path to worktree
+ * @param {string} [wuId] - WU ID for artifact cleanup (e.g., 'WU-1371')
+ * @returns {Promise<{success: boolean, error?: string}>} Rebase result
+ */
+export declare function autoRebaseBranch(branch: string, worktreePath: string, wuId?: string | null): Promise<{
+    success: boolean;
+    error?: string;
+}>;
+//# sourceMappingURL=wu-done-rebase.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"wu-done-rebase.d.ts","sourceRoot":"","sources":["../src/wu-done-rebase.ts"],"names":[],"mappings":";AAmBA,OAAO,EAAoB,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AA2KrE;;;;;;;;;;GAUG;AACH,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,UAAU,EAClB,KAAK,CAAC,EAAE,MAAM,EAAE,EAChB,OAAO,GAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAO,GACtC,OAAO,CAAC,IAAI,CAAC,CA8Bf;AAED;;;;;;;GAOG;AACH,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,UAAU,EAClB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAwCjD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GACnB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAkJ/C"}

package/dist/wu-done-rebase.js

@@ -0,0 +1,360 @@
+#!/usr/bin/env node
+// Copyright (c) 2026 Hellmai Ltd
+// SPDX-License-Identifier: AGPL-3.0-only
+/**
+ * WU-2014: Rebase operations and conflict resolution for wu:done
+ *
+ * Extracted from wu-done-worktree.ts to enforce single responsibility.
+ * Handles auto-rebase of lane branches onto main, including auto-resolution
+ * of conflicts in append-only files (wu-events.jsonl, backlog, status).
+ *
+ * Functions:
+ *   autoRebaseBranch             - Auto-rebase lane branch onto main
+ *   autoResolveAppendOnlyConflicts - Resolve conflicts in append-only files
+ *   assertNoConflictArtifactsInIndex - Verify no leftover conflict markers
+ */
+import path from 'node:path';
+import { writeFile } from 'node:fs/promises';
+import { createGitForPath } from './git-adapter.js';
+import { BRANCHES, REMOTES, LOG_PREFIX, EMOJI, COMMIT_FORMATS, GIT_COMMANDS, LUMENFLOW_PATHS, } from './wu-constants.js';
+import { REBASE } from './wu-done-messages.js';
+import { WU_EVENTS_FILE_NAME } from './wu-state-store.js';
+import { validateWUEvent } from './wu-state-schema.js';
+import { WU_PATHS } from './wu-paths.js';
+// WU-1371: Import rebase artifact cleanup functions
+import { detectRebasedArtifacts, cleanupRebasedArtifacts } from './rebase-artifact-cleanup.js';
+// WU-1061: Import docs regeneration utilities
+import { maybeRegenerateAndStageDocs, DOC_OUTPUT_FILES, formatDocOutputs, } from './wu-done-docs-generate.js';
+import { getErrorMessage } from './error-handler.js';
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+/**
+ * List of append-only files that can be auto-resolved during rebase
+ * WU-1749 Bug 3: These files can safely have conflicts resolved by keeping both additions
+ *
+ * Uses WU_PATHS constants and WU_EVENTS_FILE_NAME to avoid hardcoded path strings
+ * that would break if paths are rearranged.
+ */
+const APPEND_ONLY_FILES = [
+    // State store events file (append-only by design) - WU-1430: Use centralized constant
+    path.join(LUMENFLOW_PATHS.STATE_DIR, WU_EVENTS_FILE_NAME),
+    // Status and backlog are generated from state store but may conflict during rebase
+    WU_PATHS.STATUS(),
+    WU_PATHS.BACKLOG(),
+];
+// WU-1430: Use centralized constant
+const WU_EVENTS_PATH = path.join(LUMENFLOW_PATHS.STATE_DIR, WU_EVENTS_FILE_NAME);
+const WU_EVENTS_PATH_POSIX = WU_EVENTS_PATH.split(path.sep).join('/');
+const REBASE_CONFLICT_GIT = {
+    DIFF_UNMERGED_ARGS: [GIT_COMMANDS.DIFF, '--name-only', '--diff-filter=U'],
+    // Keep whitespace checking disabled intentionally: we only want structural conflict artifacts
+    // (leftover merge markers), not generic whitespace findings in this safety check.
+    DIFF_CHECK_ARGS: [
+        '-c',
+        'core.whitespace=',
+        GIT_COMMANDS.DIFF,
+        '--check',
+        '--cached',
+        '--',
+    ],
+    SHOW_OURS: (filePath) => ['show', `:2:${filePath}`],
+    SHOW_THEIRS: (filePath) => ['show', `:3:${filePath}`],
+    CHECKOUT_THEIRS: (filePath) => ['checkout', '--theirs', filePath],
+};
+const REBASE_CONFLICT_MESSAGES = {
+    UNMERGED_FILES_REMAIN: (files) => `Unmerged files remain in index:\n  ${files}\nResolve conflicts before continuing.`,
+    STAGED_ARTIFACTS_OR_CHECK_FAILURE: (details) => `git diff --check reported conflict artifacts or failed to run cleanly. Resolve conflicts before continuing.\n${details}`,
+};
+const REBASE_CONFLICT_LIMITS = {
+    MAX_CONTINUE_ATTEMPTS: 6,
+};
+function toPosixPath(filePath) {
+    return filePath.split(path.sep).join('/');
+}
+function isAppendOnlyConflictFile(filePath) {
+    const normalizedFilePath = toPosixPath(filePath);
+    return APPEND_ONLY_FILES.some((appendFile) => {
+        const normalizedAppendFile = toPosixPath(appendFile);
+        return (normalizedFilePath === normalizedAppendFile ||
+            normalizedFilePath.endsWith(`/${normalizedAppendFile}`));
+    });
+}
+function normalizeEventForKey(event) {
+    const normalized = {};
+    for (const key of Object.keys(event).sort()) {
+        normalized[key] = event[key];
+    }
+    return normalized;
+}
+function parseWuEventsJsonl(content, sourceLabel) {
+    const lines = String(content)
+        .split('\n')
+        .map((line) => line.trim())
+        .filter(Boolean);
+    return lines.map((line, index) => {
+        let parsed;
+        try {
+            parsed = JSON.parse(line);
+        }
+        catch (error) {
+            throw new Error(`wu-events.jsonl ${sourceLabel} has malformed JSON on line ${index + 1}: ${getErrorMessage(error)}`, { cause: error });
+        }
+        const validation = validateWUEvent(parsed);
+        if (!validation.success) {
+            const issues = validation.error.issues
+                .map((issue) => `${issue.path.join('.')}: ${issue.message}`)
+                .join(', ');
+            throw new Error(`wu-events.jsonl ${sourceLabel} has invalid event on line ${index + 1}: ${issues}`);
+        }
+        return { event: validation.data, line };
+    });
+}
+async function resolveWuEventsJsonlConflict(gitCwd, filePath, worktreePath) {
+    const ours = await gitCwd.raw(REBASE_CONFLICT_GIT.SHOW_OURS(filePath));
+    const theirs = await gitCwd.raw(REBASE_CONFLICT_GIT.SHOW_THEIRS(filePath));
+    const theirsEvents = parseWuEventsJsonl(theirs, 'theirs');
+    const oursEvents = parseWuEventsJsonl(ours, 'ours');
+    const seen = new Set();
+    const mergedLines = [];
+    for (const { event, line } of theirsEvents) {
+        const key = JSON.stringify(normalizeEventForKey(event));
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        mergedLines.push(line);
+    }
+    for (const { event, line } of oursEvents) {
+        const key = JSON.stringify(normalizeEventForKey(event));
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        mergedLines.push(line);
+    }
+    const resolvedPath = path.isAbsolute(filePath) ? filePath : path.join(worktreePath, filePath);
+    await writeFile(resolvedPath, mergedLines.join('\n') + '\n', 'utf-8');
+    await gitCwd.add(filePath);
+}
+// ---------------------------------------------------------------------------
+// Exported functions
+// ---------------------------------------------------------------------------
+/**
+ * Assert that no conflict artifacts remain in the git index.
+ *
+ * Checks for:
+ * 1. Unmerged files (UU, AA, AU, UA etc.)
+ * 2. Leftover conflict markers in staged files (via git diff --check)
+ *
+ * @param gitCwd - Git adapter instance
+ * @param files - Optional list of specific files to check
+ * @param options - Check options
+ */
+export async function assertNoConflictArtifactsInIndex(gitCwd, files, options = {}) {
+    const unresolvedFilesOutput = await gitCwd.raw([...REBASE_CONFLICT_GIT.DIFF_UNMERGED_ARGS]);
+    const unresolvedFiles = unresolvedFilesOutput
+        .split('\n')
+        .map((line) => line.trim())
+        .filter(Boolean);
+    if (unresolvedFiles.length > 0) {
+        throw new Error(REBASE_CONFLICT_MESSAGES.UNMERGED_FILES_REMAIN(unresolvedFiles.join('\n  ')));
+    }
+    if (options.checkStaged === false) {
+        return;
+    }
+    const checkArgs = [...REBASE_CONFLICT_GIT.DIFF_CHECK_ARGS];
+    if (files && files.length > 0) {
+        checkArgs.push(...files);
+    }
+    try {
+        const checkOutput = await gitCwd.raw(checkArgs);
+        if (checkOutput.trim().length > 0) {
+            throw new Error(checkOutput.trim());
+        }
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        throw new Error(REBASE_CONFLICT_MESSAGES.STAGED_ARTIFACTS_OR_CHECK_FAILURE(message), {
+            cause: error,
+        });
+    }
+}
+/**
+ * Auto-resolve conflicts in append-only files during rebase
+ * WU-1749 Bug 3: Keeps both additions for append-only files
+ *
+ * @param {object} gitCwd - Git adapter instance
+ * @param {string} worktreePath - Path to worktree
+ * @returns {Promise<{resolved: boolean, files: string[]}>} Resolution result
+ */
+export async function autoResolveAppendOnlyConflicts(gitCwd, worktreePath) {
+    const resolvedFiles = [];
+    try {
+        // Use git's unmerged index view so AA/AU/UA/etc are all handled (not only UU).
+        const unmergedOutput = await gitCwd.raw([...REBASE_CONFLICT_GIT.DIFF_UNMERGED_ARGS]);
+        const conflictFiles = unmergedOutput
+            .split('\n')
+            .map((line) => line.trim())
+            .filter(Boolean);
+        for (const filePath of conflictFiles) {
+            // Check if this is an append-only file
+            const isAppendOnly = isAppendOnlyConflictFile(filePath);
+            if (isAppendOnly) {
+                console.log(`${LOG_PREFIX.DONE} ${EMOJI.INFO} Auto-resolving append-only conflict: ${filePath}`);
+                if (toPosixPath(filePath).endsWith(WU_EVENTS_PATH_POSIX)) {
+                    // For the event log we must keep BOTH sides (loss breaks state machine).
+                    // Merge strategy: union by event identity (validated), prefer theirs ordering then ours additions.
+                    await resolveWuEventsJsonlConflict(gitCwd, filePath, worktreePath);
+                }
+                else {
+                    // Backlog/status are derived; prefer main's version during rebase and regenerate later.
+                    await gitCwd.raw(REBASE_CONFLICT_GIT.CHECKOUT_THEIRS(filePath));
+                    await gitCwd.add(filePath);
+                }
+                resolvedFiles.push(filePath);
+            }
+        }
+        return { resolved: resolvedFiles.length > 0, files: resolvedFiles };
+    }
+    catch (error) {
+        console.log(`${LOG_PREFIX.DONE} ${EMOJI.WARNING} Could not auto-resolve conflicts: ${getErrorMessage(error)}`);
+        return { resolved: false, files: [] };
+    }
+}
+/**
+ * Auto-rebase branch onto main
+ * WU-1303: Auto-rebase on wu:done to handle diverged branches automatically
+ * WU-1371: Added wuId parameter for post-rebase artifact cleanup
+ * WU-1749 Bug 3: Auto-resolve append-only file conflicts during rebase
+ *
+ * @param {string} branch - Lane branch name
+ * @param {string} worktreePath - Path to worktree
+ * @param {string} [wuId] - WU ID for artifact cleanup (e.g., 'WU-1371')
+ * @returns {Promise<{success: boolean, error?: string}>} Rebase result
+ */
+export async function autoRebaseBranch(branch, worktreePath, wuId) {
+    console.log(REBASE.STARTING(branch, BRANCHES.MAIN));
+    // WU-1541: Use explicit baseDir instead of process.chdir for git operations
+    const gitWorktree = createGitForPath(worktreePath);
+    const previousEditor = process.env.GIT_EDITOR;
+    process.env.GIT_EDITOR = 'true';
+    try {
+        // Fetch latest main (using worktree git context)
+        await gitWorktree.fetch(REMOTES.ORIGIN, BRANCHES.MAIN);
+        // Attempt rebase
+        try {
+            await gitWorktree.rebase(`${REMOTES.ORIGIN}/${BRANCHES.MAIN}`);
+        }
+        catch (rebaseError) {
+            // WU-1749 Bug 3: Check if conflicts are in append-only files that can be auto-resolved
+            console.log(`${LOG_PREFIX.DONE} ${EMOJI.INFO} Rebase hit conflicts, checking for auto-resolvable...`);
+            const resolution = await autoResolveAppendOnlyConflicts(gitWorktree, worktreePath);
+            if (resolution.resolved) {
+                console.log(`${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} Auto-resolved ${resolution.files.length} append-only conflict(s)`);
+                await assertNoConflictArtifactsInIndex(gitWorktree, resolution.files);
+                // Continue the rebase after resolving conflicts
+                let continueAttempts = 0;
+                while (true) {
+                    try {
+                        await gitWorktree.raw(['rebase', '--continue']);
+                        break;
+                    }
+                    catch (continueError) {
+                        continueAttempts += 1;
+                        if (continueAttempts >= REBASE_CONFLICT_LIMITS.MAX_CONTINUE_ATTEMPTS) {
+                            throw continueError;
+                        }
+                        const nextResolution = await autoResolveAppendOnlyConflicts(gitWorktree, worktreePath);
+                        if (!nextResolution.resolved) {
+                            // Still have non-auto-resolvable conflicts
+                            throw continueError;
+                        }
+                        await assertNoConflictArtifactsInIndex(gitWorktree, nextResolution.files);
+                    }
+                }
+            }
+            else {
+                // No auto-resolvable conflicts - rethrow original error
+                throw rebaseError;
+            }
+        }
+        // WU-1371: Detect and cleanup rebased completion artifacts
+        // After rebase, check if main's completion artifacts (stamps, status=done)
+        // were pulled into the worktree. These must be cleaned before continuing.
+        // WU-1817: Now passes gitCwd to verify artifacts exist on origin/main
+        if (wuId) {
+            const artifacts = await detectRebasedArtifacts(worktreePath, wuId, gitWorktree);
+            if (artifacts.hasArtifacts) {
+                console.log(`${LOG_PREFIX.DONE} ${EMOJI.WARNING} Detected rebased completion artifacts`);
+                const cleanup = await cleanupRebasedArtifacts(worktreePath, wuId);
+                if (cleanup.cleaned) {
+                    // Stage and commit the cleanup
+                    await gitWorktree.add('.');
+                    await gitWorktree.commit(COMMIT_FORMATS.REBASE_ARTIFACT_CLEANUP(wuId));
+                    console.log(`${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} Cleaned rebased artifacts and committed`);
+                }
+            }
+        }
+        // WU-1657: Reconcile generated docs after rebase to avoid format-check loops.
+        // A rebase can pull generated docs changes from main that need regeneration and/or formatting.
+        if (wuId) {
+            const docsResult = await maybeRegenerateAndStageDocs({
+                baseBranch: `${REMOTES.ORIGIN}/${BRANCHES.MAIN}`,
+                repoRoot: worktreePath,
+            });
+            if (!docsResult.regenerated) {
+                const changedDocOutputs = await gitWorktree.raw([
+                    'diff',
+                    '--name-only',
+                    `${REMOTES.ORIGIN}/${BRANCHES.MAIN}...HEAD`,
+                    '--',
+                    ...DOC_OUTPUT_FILES,
+                ]);
+                if (changedDocOutputs.trim().length > 0) {
+                    console.log(`${LOG_PREFIX.DONE} ${EMOJI.INFO} Reconciling rebased generated docs outputs...`);
+                    formatDocOutputs(worktreePath);
+                    await gitWorktree.add([...DOC_OUTPUT_FILES]);
+                }
+            }
+            const stagedDocOutputs = await gitWorktree.raw([
+                'diff',
+                '--cached',
+                '--name-only',
+                '--',
+                ...DOC_OUTPUT_FILES,
+            ]);
+            if (stagedDocOutputs.trim().length > 0) {
+                await gitWorktree.commit(COMMIT_FORMATS.REBASE_ARTIFACT_CLEANUP(wuId));
+                console.log(`${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} Committed rebased generated docs reconciliation`);
+            }
+        }
+        // Force-push lane branch with lease (safe force push)
+        await gitWorktree.raw(['push', '--force-with-lease', REMOTES.ORIGIN, branch]);
+        console.log(REBASE.SUCCESS);
+        return { success: true };
+    }
+    catch (e) {
+        // Rebase failed (likely conflicts) - abort and report
+        console.error(REBASE.FAILED(getErrorMessage(e)));
+        try {
+            // Abort the failed rebase to leave worktree clean
+            await gitWorktree.raw(['rebase', '--abort']);
+            console.log(REBASE.ABORTED);
+        }
+        catch {
+            // Ignore abort errors - may already be clean
+        }
+        return {
+            success: false,
+            error: REBASE.MANUAL_FIX(worktreePath, REMOTES.ORIGIN, BRANCHES.MAIN, branch),
+        };
+    }
+    finally {
+        if (previousEditor === undefined) {
+            delete process.env.GIT_EDITOR;
+        }
+        else {
+            process.env.GIT_EDITOR = previousEditor;
+        }
+    }
+}
+//# sourceMappingURL=wu-done-rebase.js.map

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

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

package/dist/wu-done-retry-helpers.d.ts

@@ -0,0 +1,75 @@
+/**
+ * Count previous completion attempt commits for a WU on the current branch
+ *
+ * WU-1584 Fix #1: Detect duplicate commits from retries
+ *
+ * Searches commit history for commits matching the completion pattern
+ * for the specified WU ID.
+ *
+ * @param {string} wuId - WU ID (e.g., 'WU-1584')
+ * @param {object} gitAdapter - Git adapter instance
+ * @returns {Promise<number>} Number of completion attempt commits found
+ */
+export declare function countPreviousCompletionAttempts(wuId: UnsafeAny, gitAdapter: UnsafeAny): Promise<number>;
+/**
+ * Squash previous completion attempt commits into a single commit
+ *
+ * WU-1584 Fix #1: Running wu:done N times should result in exactly 1 completion commit
+ *
+ * Uses git reset --soft to combine multiple completion attempts while
+ * preserving the staged changes for the new completion commit.
+ *
+ * @param {string} wuId - WU ID for logging
+ * @param {number} count - Number of commits to squash
+ * @param {object} gitAdapter - Git adapter instance
+ * @param {SquashCompletionAttemptsOptions} [options] - Options
+ * @returns {Promise<{ squashed: boolean, count: number }>} Result
+ */
+export interface SquashCompletionAttemptsOptions {
+    /** Use --soft when true; --hard when false (recovery) */
+    preserveIndex?: boolean;
+}
+export declare function squashPreviousCompletionAttempts(wuId: UnsafeAny, count: UnsafeAny, gitAdapter: UnsafeAny, options?: SquashCompletionAttemptsOptions): Promise<{
+    squashed: boolean;
+    count: any;
+}>;
+/**
+ * Prepare zombie recovery with squash of previous attempts
+ *
+ * WU-1584 Fix #2: Recovery loop should squash previous attempt commits
+ *
+ * When recovering from zombie state (status=done but worktree exists),
+ * first squash UnsafeAny previous completion attempts to avoid "rebase hell".
+ *
+ * @param {string} wuId - WU ID
+ * @param {object} gitAdapter - Git adapter instance
+ * @returns {Promise<{ squashedCount: number }>} Result
+ */
+export declare function prepareRecoveryWithSquash(wuId: UnsafeAny, gitAdapter: UnsafeAny): Promise<{
+    squashedCount: any;
+}>;
+/**
+ * Handle parallel completions with auto-rebase
+ *
+ * WU-1584 Fix #3: detectParallelCompletions() should trigger rebase, not just warn
+ *
+ * When parallel completions are detected (main has advanced since claim),
+ * triggers auto-rebase instead of proceeding with merge that will fail.
+ *
+ * @param {string} wuId - WU ID
+ * @param {object} doc - WU YAML document containing baseline_main_sha
+ * @param {object} gitAdapter - Git adapter instance
+ * @param {HandleParallelCompletionsOptions} options - Options
+ * @returns {Promise<{ parallelDetected: boolean, rebaseTriggered: boolean }>}
+ */
+export interface HandleParallelCompletionsOptions {
+    /** Path to worktree */
+    worktreePath?: string;
+    /** Whether auto-rebase is enabled (default: true) */
+    autoRebase?: boolean;
+}
+export declare function handleParallelCompletions(wuId: UnsafeAny, doc: UnsafeAny, gitAdapter: UnsafeAny, options?: HandleParallelCompletionsOptions): Promise<{
+    parallelDetected: boolean;
+    rebaseTriggered: boolean;
+}>;
+//# sourceMappingURL=wu-done-retry-helpers.d.ts.map

package/dist/wu-done-retry-helpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wu-done-retry-helpers.d.ts","sourceRoot":"","sources":["../src/wu-done-retry-helpers.ts"],"names":[],"mappings":"AAqCA;;;;;;;;;;;GAWG;AACH,wBAAsB,+BAA+B,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,mBAgC3F;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,+BAA+B;IAC9C,yDAAyD;IACzD,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,wBAAsB,gCAAgC,CACpD,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,SAAS,EAChB,UAAU,EAAE,SAAS,EACrB,OAAO,GAAE,+BAAoC;;;GAmD9C;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS;;GAqBrF;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,gCAAgC;IAC/C,uBAAuB;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qDAAqD;IACrD,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,SAAS,EACf,GAAG,EAAE,SAAS,EACd,UAAU,EAAE,SAAS,EACrB,OAAO,GAAE,gCAAqC;;;GA6E/C"}