@lumenflow/core 3.1.3 → 3.2.1

package/dist/wu-done-merge.js

@@ -0,0 +1,123 @@
+// Copyright (c) 2026 Hellmai Ltd
+// SPDX-License-Identifier: AGPL-3.0-only
+/**
+ * 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 { getGitForCwd } from './git-adapter.js';
+import { BRANCHES, REMOTES, LOG_PREFIX, EMOJI, GIT_COMMANDS, GIT_FLAGS } from './wu-constants.js';
+import { MERGE } from './wu-done-messages.js';
+import { createError, ErrorCodes, getErrorMessage } from './error-handler.js';
+import { withRetry, createRetryConfig } from './retry-strategy.js';
+import { autoRebaseBranch } from './wu-done-rebase.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 async function isMainAncestorOfBranch(gitAdapter, branch) {
+    try {
+        await gitAdapter.raw([GIT_COMMANDS.MERGE_BASE, GIT_FLAGS.IS_ANCESTOR, BRANCHES.MAIN, branch]);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * 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 async function mergeLaneBranch(branch, options = {}) {
+    const gitAdapter = getGitForCwd();
+    console.log(MERGE.BRANCH_MERGE(branch));
+    // WU-1747: Use exponential backoff retry for merge operations
+    // WU-1749 Bug 2: Now rebases lane branch on retry instead of just pulling main
+    const retryConfig = createRetryConfig('wu_done', {
+        maxAttempts: options.maxAttempts,
+        onRetry: async (attempt, error, _delay) => {
+            console.log(`${LOG_PREFIX.DONE} ${EMOJI.WARNING} Merge attempt ${attempt} failed: ${getErrorMessage(error)}`);
+            // WU-1749 Bug 2: Rebase lane branch onto new main instead of just pulling
+            if (options.worktreePath) {
+                const mainIsAncestor = await isMainAncestorOfBranch(gitAdapter, branch);
+                if (mainIsAncestor) {
+                    console.log(`${LOG_PREFIX.DONE} ${EMOJI.INFO} Main is already an ancestor - skipping auto-rebase`);
+                    return;
+                }
+                console.log(`${LOG_PREFIX.DONE} ${EMOJI.INFO} Auto-rebasing lane branch onto latest main...`);
+                const rebaseResult = await autoRebaseBranch(branch, options.worktreePath, options.wuId);
+                if (rebaseResult.success) {
+                    console.log(`${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} Lane branch rebased - ff-only merge should succeed`);
+                }
+                else {
+                    console.log(`${LOG_PREFIX.DONE} ${EMOJI.WARNING} Auto-rebase failed: ${rebaseResult.error}`);
+                    // Fall back to pull --rebase for consistent linear-history sync
+                    try {
+                        await gitAdapter.raw([
+                            GIT_COMMANDS.PULL,
+                            GIT_FLAGS.REBASE,
+                            '--autostash',
+                            REMOTES.ORIGIN,
+                            BRANCHES.MAIN,
+                        ]);
+                        console.log(MERGE.UPDATED_MAIN(REMOTES.ORIGIN));
+                    }
+                    catch (pullErr) {
+                        console.log(`${LOG_PREFIX.DONE} ${EMOJI.WARNING} Pull also failed: ${getErrorMessage(pullErr)}`);
+                    }
+                }
+            }
+            else {
+                // No worktree path - pull --rebase before retry
+                console.log(`${LOG_PREFIX.DONE} ${EMOJI.INFO} Pulling latest main with --rebase before retry...`);
+                try {
+                    await gitAdapter.raw([
+                        GIT_COMMANDS.PULL,
+                        GIT_FLAGS.REBASE,
+                        '--autostash',
+                        REMOTES.ORIGIN,
+                        BRANCHES.MAIN,
+                    ]);
+                    console.log(MERGE.UPDATED_MAIN(REMOTES.ORIGIN));
+                }
+                catch (pullErr) {
+                    console.log(`${LOG_PREFIX.DONE} ${EMOJI.WARNING} Pull failed: ${getErrorMessage(pullErr)} - will retry anyway`);
+                }
+            }
+        },
+    });
+    try {
+        await withRetry(async () => {
+            await gitAdapter.merge(branch, { ffOnly: true });
+        }, retryConfig);
+        console.log(MERGE.SUCCESS(branch));
+    }
+    catch (e) {
+        // All retries exhausted
+        const mainIsAncestor = await isMainAncestorOfBranch(gitAdapter, branch);
+        const message = mainIsAncestor
+            ? MERGE.FF_FAILED_NON_DIVERGED_ERROR(branch, getErrorMessage(e))
+            : MERGE.FF_DIVERGED_ERROR(branch, getErrorMessage(e));
+        throw createError(ErrorCodes.GIT_ERROR, message, {
+            branch,
+            originalError: getErrorMessage(e),
+            retriesExhausted: true,
+            mainIsAncestor,
+        });
+    }
+}
+//# sourceMappingURL=wu-done-merge.js.map

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

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

package/dist/wu-done-merged-worktree.d.ts

@@ -0,0 +1,65 @@
+export interface AlreadyMergedDetectionParams {
+    /** WU identifier (e.g. 'WU-1') */
+    wuId: string;
+    /** Lane branch name (e.g. 'lane/framework-core/wu-1') */
+    laneBranch: string;
+    /** Expected worktree path on disk */
+    worktreePath: string | null;
+}
+export interface AlreadyMergedDetectionResult {
+    /** Whether the WU branch commits are reachable from main HEAD */
+    merged: boolean;
+    /** Whether the lane branch still exists */
+    branchExists: boolean;
+    /** Whether the worktree directory exists on disk */
+    worktreeExists: boolean;
+}
+export interface AlreadyMergedCompletionParams {
+    /** WU identifier */
+    id: string;
+    /** WU title (for stamp file) */
+    title: string;
+    /** WU lane (for status updates) */
+    lane: string;
+}
+export interface AlreadyMergedCompletionResult {
+    /** Whether all operations completed successfully */
+    success: boolean;
+    /** Whether stamp file was created (or already existed) */
+    stamped: boolean;
+    /** Whether WU YAML was updated to status: done */
+    yamlUpdated: boolean;
+    /** Whether backlog/status docs were updated */
+    backlogUpdated: boolean;
+    /** Any errors that occurred during partial completion */
+    errors: string[];
+}
+/**
+ * Detect whether a WU's branch commits are already merged to main
+ * and the worktree no longer exists on disk.
+ *
+ * This is the entry point for the "already-merged resilience" path
+ * in wu:done. Returns a detection result that the caller can use
+ * to decide whether to proceed with stamping/cleanup without a
+ * live worktree.
+ *
+ * @param params - Detection parameters
+ * @returns Detection result
+ */
+export declare function detectAlreadyMergedNoWorktree(params: AlreadyMergedDetectionParams): Promise<AlreadyMergedDetectionResult>;
+/**
+ * Execute completion operations for a WU whose branch is already
+ * merged to main but was never stamped/finalized.
+ *
+ * This performs all the state cleanup that wu:done normally does
+ * during its worktree completion path, but without requiring a
+ * live worktree.
+ *
+ * Operations are individually non-fatal: if stamp creation succeeds
+ * but backlog update fails, the result captures both outcomes.
+ *
+ * @param params - Completion parameters
+ * @returns Completion result with per-operation status
+ */
+export declare function executeAlreadyMergedCompletion(params: AlreadyMergedCompletionParams): Promise<AlreadyMergedCompletionResult>;
+//# sourceMappingURL=wu-done-merged-worktree.d.ts.map

package/dist/wu-done-merged-worktree.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wu-done-merged-worktree.d.ts","sourceRoot":"","sources":["../src/wu-done-merged-worktree.ts"],"names":[],"mappings":"AA0CA,MAAM,WAAW,4BAA4B;IAC3C,kCAAkC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,yDAAyD;IACzD,UAAU,EAAE,MAAM,CAAC;IACnB,qCAAqC;IACrC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,4BAA4B;IAC3C,iEAAiE;IACjE,MAAM,EAAE,OAAO,CAAC;IAChB,2CAA2C;IAC3C,YAAY,EAAE,OAAO,CAAC;IACtB,oDAAoD;IACpD,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,6BAA6B;IAC5C,oBAAoB;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,gCAAgC;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,mCAAmC;IACnC,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,6BAA6B;IAC5C,oDAAoD;IACpD,OAAO,EAAE,OAAO,CAAC;IACjB,0DAA0D;IAC1D,OAAO,EAAE,OAAO,CAAC;IACjB,kDAAkD;IAClD,WAAW,EAAE,OAAO,CAAC;IACrB,+CAA+C;IAC/C,cAAc,EAAE,OAAO,CAAC;IACxB,yDAAyD;IACzD,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAMD;;;;;;;;;;;GAWG;AACH,wBAAsB,6BAA6B,CACjD,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,4BAA4B,CAAC,CAgEvC;AAMD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,6BAA6B,GACpC,OAAO,CAAC,6BAA6B,CAAC,CAwFxC"}

package/dist/wu-done-merged-worktree.js

@@ -0,0 +1,197 @@
+// Copyright (c) 2026 Hellmai Ltd
+// SPDX-License-Identifier: AGPL-3.0-only
+/**
+ * WU-1746: Already-merged worktree recovery for wu:done
+ *
+ * When a WU branch has been manually merged to main and the worktree
+ * deleted (or nuked by git), wu:done normally cannot complete because
+ * it expects a live worktree. This module detects the "branch already
+ * merged, worktree gone" scenario and completes stamping and state
+ * updates gracefully without a live worktree.
+ *
+ * Detection logic:
+ * 1. If the lane branch still exists: check if branch tip === merge-base
+ *    (meaning all branch commits are reachable from main HEAD)
+ * 2. If the lane branch has been deleted: check if completion commits
+ *    are reachable from HEAD via git log search
+ *
+ * Completion logic:
+ * - Create stamp file (.lumenflow/stamps/WU-{id}.done)
+ * - Update WU YAML status to 'done'
+ * - Update backlog.md and status.md
+ * - Emit state store 'complete' event (if state store is available)
+ *
+ * All operations are non-fatal individually; partial completion is
+ * reported via the result object.
+ */
+import { existsSync } from 'node:fs';
+import { getGitForCwd } from './git-adapter.js';
+import { createStamp } from './stamp-utils.js';
+import { readWU, writeWU } from './wu-yaml.js';
+import { WU_PATHS } from './wu-paths.js';
+import { moveWUToDoneBacklog } from './wu-backlog-updater.js';
+import { updateStatusRemoveInProgress, addToStatusCompleted } from './wu-status-updater.js';
+import { BRANCHES, LOG_PREFIX, EMOJI, WU_STATUS } from './wu-constants.js';
+import { getErrorMessage } from './error-handler.js';
+// ──────────────────────────────────────────────
+// Detection
+// ──────────────────────────────────────────────
+/**
+ * Detect whether a WU's branch commits are already merged to main
+ * and the worktree no longer exists on disk.
+ *
+ * This is the entry point for the "already-merged resilience" path
+ * in wu:done. Returns a detection result that the caller can use
+ * to decide whether to proceed with stamping/cleanup without a
+ * live worktree.
+ *
+ * @param params - Detection parameters
+ * @returns Detection result
+ */
+export async function detectAlreadyMergedNoWorktree(params) {
+    const { laneBranch, worktreePath } = params;
+    // Check if worktree exists on disk
+    const worktreeExists = worktreePath ? existsSync(worktreePath) : false;
+    const gitAdapter = getGitForCwd();
+    try {
+        // Check if branch still exists
+        const branchStillExists = await gitAdapter.branchExists(laneBranch);
+        if (branchStillExists) {
+            // Branch exists: check if tip === merge-base (fully merged)
+            const branchTip = (await gitAdapter.getCommitHash(laneBranch)).trim();
+            const mergeBase = (await gitAdapter.mergeBase(BRANCHES.MAIN, laneBranch)).trim();
+            const isMerged = branchTip === mergeBase;
+            return {
+                merged: isMerged,
+                branchExists: true,
+                worktreeExists,
+            };
+        }
+        // Branch does not exist: check if WU commits are reachable from HEAD
+        // Search for completion commits mentioning the WU ID in the main history
+        if (!worktreeExists) {
+            try {
+                const logOutput = await gitAdapter.raw([
+                    'log',
+                    '--oneline',
+                    '--all',
+                    '--grep',
+                    params.wuId,
+                    '-1',
+                    BRANCHES.MAIN,
+                ]);
+                const commitFound = logOutput.trim().length > 0;
+                return {
+                    merged: commitFound,
+                    branchExists: false,
+                    worktreeExists: false,
+                };
+            }
+            catch {
+                // If git log fails, fall through to safe default
+            }
+        }
+        return {
+            merged: false,
+            branchExists: false,
+            worktreeExists,
+        };
+    }
+    catch {
+        // Fail-safe: on any git error, return false to avoid incorrect completion
+        return {
+            merged: false,
+            branchExists: false,
+            worktreeExists,
+        };
+    }
+}
+// ──────────────────────────────────────────────
+// Completion
+// ──────────────────────────────────────────────
+/**
+ * Execute completion operations for a WU whose branch is already
+ * merged to main but was never stamped/finalized.
+ *
+ * This performs all the state cleanup that wu:done normally does
+ * during its worktree completion path, but without requiring a
+ * live worktree.
+ *
+ * Operations are individually non-fatal: if stamp creation succeeds
+ * but backlog update fails, the result captures both outcomes.
+ *
+ * @param params - Completion parameters
+ * @returns Completion result with per-operation status
+ */
+export async function executeAlreadyMergedCompletion(params) {
+    const { id, title, lane: _lane } = params;
+    const errors = [];
+    let stamped = false;
+    let yamlUpdated = false;
+    let backlogUpdated = false;
+    console.log(`${LOG_PREFIX.DONE} ${EMOJI.INFO} WU-1746: Branch already merged to main, worktree gone.`);
+    console.log(`${LOG_PREFIX.DONE} ${EMOJI.INFO} Completing stamping and state cleanup without worktree...`);
+    // Step 1: Create stamp file
+    try {
+        const stampResult = createStamp({ id, title });
+        stamped = true;
+        if (stampResult.created) {
+            console.log(`${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} Created stamp: ${stampResult.path}`);
+        }
+        else {
+            console.log(`${LOG_PREFIX.DONE} ${EMOJI.INFO} Stamp already exists: ${stampResult.path}`);
+        }
+    }
+    catch (err) {
+        errors.push(`Stamp creation failed: ${getErrorMessage(err)}`);
+        console.warn(`${LOG_PREFIX.DONE} ${EMOJI.WARNING} Stamp creation failed: ${getErrorMessage(err)}`);
+    }
+    // Step 2: Update WU YAML status to done
+    try {
+        const wuPath = WU_PATHS.WU(id);
+        const doc = readWU(wuPath, id);
+        if (doc && typeof doc === 'object') {
+            const updatedDoc = {
+                ...doc,
+                status: WU_STATUS.DONE,
+                completed_at: new Date().toISOString().split('T')[0],
+            };
+            writeWU(wuPath, updatedDoc);
+            yamlUpdated = true;
+            console.log(`${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} Updated WU YAML status to done`);
+        }
+    }
+    catch (err) {
+        errors.push(`WU YAML update failed: ${getErrorMessage(err)}`);
+        console.warn(`${LOG_PREFIX.DONE} ${EMOJI.WARNING} WU YAML update failed: ${getErrorMessage(err)}`);
+    }
+    // Step 3: Update backlog and status files
+    try {
+        const backlogPath = WU_PATHS.BACKLOG();
+        await moveWUToDoneBacklog(backlogPath, id, title);
+        const statusPath = WU_PATHS.STATUS();
+        updateStatusRemoveInProgress(statusPath, id);
+        addToStatusCompleted(statusPath, id, title);
+        backlogUpdated = true;
+        console.log(`${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} Updated backlog and status files`);
+    }
+    catch (err) {
+        errors.push(`Backlog/status update failed: ${getErrorMessage(err)}`);
+        console.warn(`${LOG_PREFIX.DONE} ${EMOJI.WARNING} Backlog/status update failed: ${getErrorMessage(err)}`);
+    }
+    const success = errors.length === 0;
+    if (success) {
+        console.log(`${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} WU-1746: Already-merged completion finished successfully`);
+    }
+    else {
+        console.warn(`${LOG_PREFIX.DONE} ${EMOJI.WARNING} WU-1746: Completed with ${errors.length} error(s)`);
+    }
+    return {
+        success,
+        stamped,
+        yamlUpdated,
+        backlogUpdated,
+        errors,
+    };
+}
+//# sourceMappingURL=wu-done-merged-worktree.js.map

package/dist/wu-done-merged-worktree.js.map

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

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

@@ -0,0 +1,120 @@
+/**
+ * @file wu-done-messages.ts
+ * @description Constants and message templates for wu-done operations
+ * WU-1159: Eliminate string literals (DRY/SOLID compliance)
+ * WU-1281: Use centralized LOG_PREFIX and EMOJI from wu-constants.ts
+ *
+ * All log messages, error messages, and text templates extracted to constants.
+ * Prevents duplication and makes text maintainable.
+ */
+import { LOG_PREFIX } from './wu-constants.js';
+export { LOG_PREFIX };
+/**
+ * Recovery mode messages (WU-1159)
+ */
+export declare const RECOVERY: {
+    DETECTED: string;
+    RESUMING: string;
+    EXPLANATION: string;
+    CREATING_STAMP: string;
+    STAMP_CREATED: string;
+    UPDATING_YAML: string;
+    YAML_UPDATED: string;
+    UPDATING_DOCS: string;
+    DOCS_UPDATED: string;
+    COMMITTING: string;
+    COMMIT_SUCCESS: string;
+    COMMIT_FAILED: (error: unknown) => string;
+    MARKERS_VERIFIED: string;
+    PROCEEDING_CLEANUP: string;
+    SUCCESS: string;
+};
+/**
+ * Worktree operations
+ */
+export declare const WORKTREE: {
+    REMOVED: (path: string) => string;
+    NOT_FOUND: string;
+    REMOVE_FAILED: (path: string, error: unknown) => string;
+    PRESERVED_PR_MODE: string;
+};
+/**
+ * Branch operations
+ */
+export declare const BRANCH: {
+    DELETED_LOCAL: (branch: string) => string;
+    DELETED_REMOTE: (branch: string) => string;
+    DELETE_FAILED: (branch: string, error: unknown) => string;
+    DELETE_REMOTE_FAILED: (error: unknown) => string;
+    PRESERVED_PR_MODE: string;
+};
+/**
+ * Completion messages
+ */
+export declare const COMPLETION: {
+    SUCCESS_HEADER: (id: string, title: string) => string;
+    TRANSACTION_COMMIT: string;
+};
+/**
+ * State transition errors
+ */
+export declare const STATE_TRANSITION: {
+    VALIDATION_FAILED: (error: unknown) => string;
+};
+/**
+ * Auto-rebase messages (WU-1303)
+ */
+export declare const REBASE: {
+    STARTING: (branch: string, mainBranch: string) => string;
+    SUCCESS: string;
+    FAILED: (error: unknown) => string;
+    ABORTED: string;
+    MANUAL_FIX: (worktreePath: string, remote: string, mainBranch: string, branch: string) => string;
+};
+/**
+ * Pre-flight check messages (WU-755, WU-1303, WU-1370)
+ */
+export declare const PREFLIGHT: {
+    RUNNING: string;
+    BRANCH_BEHIND: (commitsBehind: number, threshold: number) => string;
+    BRANCH_DRIFT_INFO: (commitsBehind: number) => string;
+    BRANCH_DRIFT_WARNING: (commitsBehind: number) => string;
+    DIVERGENCE_DETECTED: (commitCount: number) => string;
+    NO_DIVERGENCE: string;
+    NO_CONFLICTS: string;
+    ALREADY_MERGED: string;
+    ALREADY_MERGED_EXPLANATION: string;
+    BRANCH_INFO: (branch: string, branchTip: string, mergeBase: string, mainHead: string) => string;
+    BRANCH_DRIFT_ERROR: (mainAhead: number, threshold: number, remote: string, mainBranch: string) => string;
+    DIVERGENCE_ERROR: (commitCount: number, remote: string, mainBranch: string, branch: string) => string;
+    CONFLICT_ERROR: (remote?: string, mainBranch?: string) => string;
+    MERGE_COMMITS_DETECTED: (count: number) => string;
+    MERGE_COMMITS_REBASING: string;
+    NO_MERGE_COMMITS: string;
+    EMPTY_MERGE_WARNING: (commitCount: number) => string;
+    EMPTY_MERGE_CHECK: string;
+    CODE_PATHS_NOT_MODIFIED: (missingFiles: string[]) => string;
+    CODE_PATHS_VERIFIED: string;
+};
+/**
+ * Merge operation messages (WU-1303)
+ */
+export declare const MERGE: {
+    STARTING: (_branch: string) => string;
+    BRANCH_MERGE: (branch: string) => string;
+    SUCCESS: (branch: string) => string;
+    ATOMIC_SUCCESS: string;
+    FF_FAILED_RETRY: string;
+    UPDATED_MAIN: (remote: string) => string;
+    PUSHED: (remote: string, mainBranch: string) => string;
+    FF_MERGE_ERROR: (branch: string, mergeError: unknown, pullError: unknown, remote?: string, mainBranch?: string) => string;
+    FF_DIVERGED_ERROR: (branch: string, originalError: unknown, mainBranch?: string) => string;
+    FF_FAILED_NON_DIVERGED_ERROR: (branch: string, originalError: unknown, mainBranch?: string) => string;
+};
+/**
+ * Pre-push gate messages (WU-1303)
+ */
+export declare const PREPUSH: {
+    WORKTREE_SKIP: string;
+};
+//# sourceMappingURL=wu-done-messages.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"wu-done-messages.d.ts","sourceRoot":"","sources":["../src/wu-done-messages.ts"],"names":[],"mappings":"AAGA;;;;;;;;GAQG;AAEH,OAAO,EAAE,UAAU,EAA4B,MAAM,mBAAmB,CAAC;AAGzE,OAAO,EAAE,UAAU,EAAE,CAAC;AAMtB;;GAEG;AACH,eAAO,MAAM,QAAQ;;;;;;;;;;;;2BAYI,OAAO,KAAG,MAAM;;;;CAKxC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,QAAQ;oBACH,MAAM,KAAG,MAAM;;0BAET,MAAM,SAAS,OAAO,KAAG,MAAM;;CAGtD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,MAAM;4BACO,MAAM,KAAG,MAAM;6BAEd,MAAM,KAAG,MAAM;4BAEhB,MAAM,SAAS,OAAO,KAAG,MAAM;kCAEzB,OAAO,KAAG,MAAM;;CAG/C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU;yBACA,MAAM,SAAS,MAAM,KAAG,MAAM;;CAGpD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB;+BACA,OAAO,KAAG,MAAM;CAE5C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,MAAM;uBACE,MAAM,cAAc,MAAM,KAAG,MAAM;;oBAGtC,OAAO,KAAG,MAAM;;+BAGL,MAAM,UAAU,MAAM,cAAc,MAAM,UAAU,MAAM,KAAG,MAAM;CAS/F,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS;;mCAEW,MAAM,aAAa,MAAM,KAAG,MAAM;uCAG9B,MAAM,KAAG,MAAM;0CAEZ,MAAM,KAAG,MAAM;uCAElB,MAAM,KAAG,MAAM;;;;;0BAM5B,MAAM,aAAa,MAAM,aAAa,MAAM,YAAY,MAAM,KAAG,MAAM;oCAMhF,MAAM,aACN,MAAM,UACT,MAAM,cACF,MAAM,KACjB,MAAM;oCAUM,MAAM,UACX,MAAM,cACF,MAAM,UACV,MAAM,KACb,MAAM;8BAUgB,MAAM,eAA+B,MAAM,KAAmB,MAAM;oCAU7D,MAAM,KAAG,MAAM;;;uCAKZ,MAAM,KAAG,MAAM;;4CAOV,MAAM,EAAE,KAAG,MAAM;;CAY1D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,KAAK;wBACI,MAAM,KAAG,MAAM;2BAEZ,MAAM,KAAG,MAAM;sBAEpB,MAAM,KAAG,MAAM;;;2BAIV,MAAM,KAAG,MAAM;qBAErB,MAAM,cAAc,MAAM,KAAG,MAAM;6BAG1C,MAAM,cACF,OAAO,aACR,OAAO,WACV,MAAM,eACF,MAAM,KACjB,MAAM;gCAUC,MAAM,iBACC,OAAO,eACV,MAAM,KACjB,MAAM;2CAQC,MAAM,iBACC,OAAO,eACV,MAAM,KACjB,MAAM;CAOV,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO;;CAEnB,CAAC"}