dmux 2.2.0 → 3.0.0

package/dist/utils/aiMerge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"aiMerge.d.ts","sourceRoot":"","sources":["../../src/utils/aiMerge.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAuFH;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAiCxF;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAqCpF;AAqED;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAkEzE;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EAAE,GACtB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,MAAM,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiC/F"}

package/dist/utils/aiMerge.js

@@ -0,0 +1,298 @@
+/**
+ * AI-Assisted Merge Utilities
+ *
+ * Uses AI to help resolve merge conflicts intelligently
+ */
+import { execSync } from 'child_process';
+import fs from 'fs/promises';
+import path from 'path';
+/**
+ * Fetch with timeout wrapper
+ */
+async function fetchWithTimeout(url, options, timeoutMs) {
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
+    try {
+        const response = await fetch(url, {
+            ...options,
+            signal: controller.signal,
+        });
+        clearTimeout(timeoutId);
+        return response;
+    }
+    catch (error) {
+        clearTimeout(timeoutId);
+        throw error;
+    }
+}
+/**
+ * Call OpenRouter API for AI assistance
+ */
+async function callOpenRouter(prompt, maxTokens = 1000, timeoutMs = 12000) {
+    const apiKey = process.env.OPENROUTER_API_KEY;
+    if (!apiKey)
+        return null;
+    try {
+        const response = await fetchWithTimeout('https://openrouter.ai/api/v1/chat/completions', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'Authorization': `Bearer ${apiKey}`,
+            },
+            body: JSON.stringify({
+                model: 'openai/gpt-4o-mini',
+                messages: [
+                    {
+                        role: 'user',
+                        content: prompt,
+                    },
+                ],
+                max_tokens: maxTokens,
+                temperature: 0.3,
+            }),
+        }, timeoutMs);
+        if (response.ok) {
+            const data = (await response.json());
+            return data.choices[0].message.content.trim();
+        }
+    }
+    catch {
+        return null;
+    }
+    return null;
+}
+/**
+ * Call Claude Code CLI for AI assistance
+ */
+async function callClaudeCode(prompt, timeoutMs = 15000) {
+    try {
+        const result = execSync(`echo "${prompt.replace(/"/g, '\\"')}" | claude --no-interactive --max-turns 1 2>/dev/null`, {
+            encoding: 'utf-8',
+            stdio: 'pipe',
+            timeout: timeoutMs,
+        });
+        return result.trim() || null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Get comprehensive git diff with context for commit message generation
+ */
+export function getComprehensiveDiff(repoPath) {
+    try {
+        // Get staged changes first, then fall back to unstaged if nothing staged
+        let diff = execSync('git diff --cached', {
+            cwd: repoPath,
+            encoding: 'utf-8',
+            stdio: 'pipe',
+        });
+        let staged = true;
+        // If nothing staged, check unstaged changes
+        if (!diff.trim()) {
+            diff = execSync('git diff', {
+                cwd: repoPath,
+                encoding: 'utf-8',
+                stdio: 'pipe',
+            });
+            staged = false;
+        }
+        // Get file summary
+        const statusCmd = staged ? 'git diff --cached --stat' : 'git diff --stat';
+        const summary = execSync(statusCmd, {
+            cwd: repoPath,
+            encoding: 'utf-8',
+            stdio: 'pipe',
+        });
+        return { diff, summary };
+    }
+    catch {
+        return { diff: '', summary: '' };
+    }
+}
+/**
+ * Get AI-generated commit message from git diff
+ * Returns null if generation fails, so caller can handle fallback
+ */
+export async function generateCommitMessage(repoPath) {
+    try {
+        const { diff, summary } = getComprehensiveDiff(repoPath);
+        if (!diff.trim()) {
+            return null; // No changes, let caller handle
+        }
+        // Include more context (up to 5000 chars) for better commit messages
+        const contextDiff = diff.length > 5000 ? diff.slice(0, 5000) + '\n...(truncated)' : diff;
+        const prompt = `Generate a concise conventional commit message (e.g., "feat: add feature", "fix: bug") for these changes. Respond with ONLY the commit message, nothing else:\n\nFile changes:\n${summary}\n\nDiff:\n${contextDiff}`;
+        // Try OpenRouter first
+        let message = await callOpenRouter(prompt, 50);
+        if (message) {
+            // Clean up the response
+            message = message.replace(/^["']|["']$/g, '').trim();
+            if (message && message.length < 100) {
+                return message;
+            }
+        }
+        // Try Claude Code as fallback
+        message = await callClaudeCode(prompt);
+        if (message) {
+            message = message.replace(/^["']|["']$/g, '').trim();
+            if (message && message.length < 100) {
+                return message;
+            }
+        }
+        // Both methods failed
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Read a file with conflict markers
+ */
+async function readConflictFile(filePath) {
+    return await fs.readFile(filePath, 'utf-8');
+}
+function parseConflicts(content) {
+    const sections = [];
+    const lines = content.split('\n');
+    let i = 0;
+    while (i < lines.length) {
+        if (lines[i].startsWith('<<<<<<<')) {
+            let ours = '';
+            let theirs = '';
+            let base = '';
+            i++;
+            // Read "ours" section
+            while (i < lines.length && !lines[i].startsWith('=======')) {
+                ours += lines[i] + '\n';
+                i++;
+            }
+            i++; // Skip =======
+            // Read "theirs" section (or base if 3-way)
+            while (i < lines.length && !lines[i].startsWith('>>>>>>>') && !lines[i].startsWith('|||||||')) {
+                if (lines[i].startsWith('|||||||')) {
+                    break;
+                }
+                theirs += lines[i] + '\n';
+                i++;
+            }
+            // Check for 3-way merge (with base)
+            if (i < lines.length && lines[i].startsWith('|||||||')) {
+                base = theirs;
+                theirs = '';
+                i++; // Skip |||||||
+                while (i < lines.length && !lines[i].startsWith('>>>>>>>')) {
+                    theirs += lines[i] + '\n';
+                    i++;
+                }
+            }
+            sections.push({
+                ours: ours.trim(),
+                theirs: theirs.trim(),
+                base: base.trim() || undefined,
+            });
+        }
+        i++;
+    }
+    return sections;
+}
+/**
+ * Use AI to resolve a merge conflict
+ */
+export async function aiResolveConflict(filePath, repoPath) {
+    try {
+        const fullPath = path.join(repoPath, filePath);
+        const content = await readConflictFile(fullPath);
+        const conflicts = parseConflicts(content);
+        if (conflicts.length === 0) {
+            return {
+                success: true,
+                resolvedContent: content,
+            };
+        }
+        // For now, use a simple strategy: try to intelligently merge both versions
+        const prompt = `You are resolving a git merge conflict. Below is a file with conflict markers.
+
+Your task: Provide the COMPLETE resolved file content that intelligently combines both versions. Do NOT include any explanations, just the final file content.
+
+File: ${filePath}
+
+Conflict sections:
+${conflicts
+            .map((c, i) => `
+Conflict ${i + 1}:
+<<<<<<< OURS (current branch)
+${c.ours}
+=======
+>>>>>>> THEIRS (incoming branch)
+${c.theirs}
+`)
+            .join('\n')}
+
+Full file content:
+${content}
+
+Respond with ONLY the complete resolved file content, no explanations:`;
+        // Try OpenRouter with longer timeout for conflict resolution
+        let resolved = await callOpenRouter(prompt, 2000, 20000);
+        if (!resolved) {
+            // Try Claude Code with longer timeout for conflict resolution
+            resolved = await callClaudeCode(prompt, 20000);
+        }
+        if (!resolved) {
+            return {
+                success: false,
+                error: 'AI resolution unavailable',
+            };
+        }
+        // Remove any markdown code fences if present
+        resolved = resolved.replace(/^```[\w]*\n/gm, '').replace(/\n```$/gm, '');
+        return {
+            success: true,
+            resolvedContent: resolved,
+        };
+    }
+    catch (error) {
+        return {
+            success: false,
+            error: error instanceof Error ? error.message : String(error),
+        };
+    }
+}
+/**
+ * Resolve all conflicts in a repository using AI
+ */
+export async function aiResolveAllConflicts(repoPath, conflictFiles) {
+    const resolvedFiles = [];
+    const failedFiles = [];
+    for (const file of conflictFiles) {
+        const result = await aiResolveConflict(file, repoPath);
+        if (result.success && result.resolvedContent) {
+            try {
+                // Write resolved content
+                await fs.writeFile(path.join(repoPath, file), result.resolvedContent, 'utf-8');
+                // Stage the resolved file
+                execSync(`git add "${file}"`, {
+                    cwd: repoPath,
+                    stdio: 'pipe',
+                });
+                resolvedFiles.push(file);
+            }
+            catch {
+                failedFiles.push(file);
+            }
+        }
+        else {
+            failedFiles.push(file);
+        }
+    }
+    return {
+        success: failedFiles.length === 0,
+        resolvedFiles,
+        failedFiles,
+        error: failedFiles.length > 0 ? `Failed to resolve: ${failedFiles.join(', ')}` : undefined,
+    };
+}
+//# sourceMappingURL=aiMerge.js.map

package/dist/utils/aiMerge.js.map

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

package/dist/utils/conflictResolutionPane.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Conflict Resolution Pane Creation
+ *
+ * Utilities for creating a new pane specifically for AI-assisted merge conflict resolution
+ */
+import type { DmuxPane } from '../types.js';
+export interface ConflictResolutionPaneOptions {
+    sourceBranch: string;
+    targetBranch: string;
+    targetRepoPath: string;
+    agent: 'claude' | 'opencode';
+    projectName: string;
+    existingPanes: DmuxPane[];
+}
+/**
+ * Create a pane for resolving merge conflicts with AI assistance
+ */
+export declare function createConflictResolutionPane(options: ConflictResolutionPaneOptions): Promise<DmuxPane>;
+//# sourceMappingURL=conflictResolutionPane.d.ts.map

package/dist/utils/conflictResolutionPane.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflictResolutionPane.d.ts","sourceRoot":"","sources":["../../src/utils/conflictResolutionPane.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAG5C,MAAM,WAAW,6BAA6B;IAC5C,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,QAAQ,EAAE,CAAC;CAC3B;AAED;;GAEG;AACH,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,QAAQ,CAAC,CAgInB"}

package/dist/utils/conflictResolutionPane.js

@@ -0,0 +1,214 @@
+/**
+ * Conflict Resolution Pane Creation
+ *
+ * Utilities for creating a new pane specifically for AI-assisted merge conflict resolution
+ */
+import { execSync } from 'child_process';
+import { applySmartLayout } from './tmux.js';
+/**
+ * Create a pane for resolving merge conflicts with AI assistance
+ */
+export async function createConflictResolutionPane(options) {
+    const { sourceBranch, targetBranch, targetRepoPath, agent, projectName, existingPanes } = options;
+    // Generate slug for this conflict resolution session
+    const slug = `merge-${sourceBranch}-into-${targetBranch}`.substring(0, 50);
+    // Get current pane info
+    const originalPaneId = execSync('tmux display-message -p "#{pane_id}"', {
+        encoding: 'utf-8',
+    }).trim();
+    // Get current pane count
+    const paneCount = parseInt(execSync('tmux list-panes | wc -l', { encoding: 'utf-8' }).trim());
+    // Enable pane borders to show titles
+    try {
+        execSync(`tmux set-option -g pane-border-status top`, { stdio: 'pipe' });
+    }
+    catch {
+        // Ignore if already set or fails
+    }
+    // Create new pane
+    const paneInfo = execSync(`tmux split-window -h -P -F '#{pane_id}'`, {
+        encoding: 'utf-8',
+    }).trim();
+    // Wait for pane creation to settle
+    await new Promise((resolve) => setTimeout(resolve, 500));
+    // Set pane title
+    try {
+        execSync(`tmux select-pane -t '${paneInfo}' -T "${slug}"`, {
+            stdio: 'pipe',
+        });
+    }
+    catch {
+        // Ignore if setting title fails
+    }
+    // Apply smart layout based on pane count
+    const newPaneCount = paneCount + 1;
+    applySmartLayout(newPaneCount);
+    // CD into the target repository (where we'll resolve conflicts)
+    try {
+        execSync(`tmux send-keys -t '${paneInfo}' 'cd "${targetRepoPath}"' Enter`, {
+            stdio: 'pipe',
+        });
+        await new Promise((resolve) => setTimeout(resolve, 500));
+    }
+    catch (error) {
+        console.error('[conflictResolutionPane] Failed to cd into target repo:', error);
+    }
+    // Construct the AI prompt for conflict resolution
+    const prompt = `There are conflicts merging ${sourceBranch} into ${targetBranch}. Both are valid changes, so please keep both feature sets and merge them intelligently. Check git status to see the conflicting files, then resolve each conflict to preserve both sets of changes.`;
+    // Launch agent with the conflict resolution prompt
+    if (agent === 'claude') {
+        const escapedPrompt = prompt
+            .replace(/\\/g, '\\\\')
+            .replace(/"/g, '\\"')
+            .replace(/`/g, '\\`')
+            .replace(/\$/g, '\\$');
+        const claudeCmd = `claude "${escapedPrompt}" --permission-mode=acceptEdits`;
+        const escapedCmd = claudeCmd.replace(/'/g, "'\\''");
+        execSync(`tmux send-keys -t '${paneInfo}' '${escapedCmd}'`, {
+            stdio: 'pipe',
+        });
+        execSync(`tmux send-keys -t '${paneInfo}' Enter`, { stdio: 'pipe' });
+        // Auto-approve trust prompts for Claude
+        autoApproveTrustPrompt(paneInfo).catch(() => {
+            // Ignore errors in background monitoring
+        });
+    }
+    else if (agent === 'opencode') {
+        const openCoderCmd = `opencode`;
+        const escapedOpenCmd = openCoderCmd.replace(/'/g, "'\\''");
+        execSync(`tmux send-keys -t '${paneInfo}' '${escapedOpenCmd}'`, {
+            stdio: 'pipe',
+        });
+        execSync(`tmux send-keys -t '${paneInfo}' Enter`, { stdio: 'pipe' });
+        // Wait for opencode to start, then paste the prompt
+        await new Promise((resolve) => setTimeout(resolve, 1500));
+        const bufName = `dmux_prompt_${Date.now()}`;
+        const promptEsc = prompt.replace(/\\/g, '\\\\').replace(/'/g, "'\\''");
+        execSync(`tmux set-buffer -b '${bufName}' -- '${promptEsc}'`, {
+            stdio: 'pipe',
+        });
+        execSync(`tmux paste-buffer -b '${bufName}' -t '${paneInfo}'`, {
+            stdio: 'pipe',
+        });
+        await new Promise((resolve) => setTimeout(resolve, 200));
+        execSync(`tmux delete-buffer -b '${bufName}'`, { stdio: 'pipe' });
+        execSync(`tmux send-keys -t '${paneInfo}' Enter`, { stdio: 'pipe' });
+    }
+    // Keep focus on the new pane
+    execSync(`tmux select-pane -t '${paneInfo}'`, { stdio: 'pipe' });
+    // Create the pane object
+    const newPane = {
+        id: `dmux-${Date.now()}`,
+        slug,
+        prompt,
+        paneId: paneInfo,
+        agent,
+        // Note: No worktreePath - this pane operates directly in the target repo
+    };
+    // Switch back to the original pane
+    execSync(`tmux select-pane -t '${originalPaneId}'`, { stdio: 'pipe' });
+    // Re-set the title for the dmux pane
+    try {
+        execSync(`tmux select-pane -t '${originalPaneId}' -T "dmux-${projectName}"`, { stdio: 'pipe' });
+    }
+    catch {
+        // Ignore if setting title fails
+    }
+    return newPane;
+}
+/**
+ * Auto-approve Claude trust prompts (reused from paneCreation.ts)
+ */
+async function autoApproveTrustPrompt(paneInfo) {
+    // Wait for Claude to start up before checking for prompts
+    await new Promise((resolve) => setTimeout(resolve, 800));
+    const maxChecks = 100;
+    const checkInterval = 100;
+    let lastContent = '';
+    let stableContentCount = 0;
+    let promptHandled = false;
+    const trustPromptPatterns = [
+        /Do you trust the files in this folder\?/i,
+        /Trust the files in this workspace\?/i,
+        /Do you trust the authors of the files/i,
+        /Do you want to trust this workspace\?/i,
+        /trust.*files.*folder/i,
+        /trust.*workspace/i,
+        /Do you trust/i,
+        /Trust this folder/i,
+        /trust.*directory/i,
+        /permission.*grant/i,
+        /allow.*access/i,
+        /workspace.*trust/i,
+        /accept.*edits/i,
+        /permission.*mode/i,
+        /allow.*claude/i,
+        /\[y\/n\]/i,
+        /\(y\/n\)/i,
+        /Yes\/No/i,
+        /\[Y\/n\]/i,
+        /press.*enter.*accept/i,
+        /press.*enter.*continue/i,
+        /❯\s*1\.\s*Yes,\s*proceed/i,
+        /Enter to confirm.*Esc to exit/i,
+        /1\.\s*Yes,\s*proceed/i,
+        /2\.\s*No,\s*exit/i,
+    ];
+    for (let i = 0; i < maxChecks; i++) {
+        await new Promise((resolve) => setTimeout(resolve, checkInterval));
+        try {
+            const paneContent = execSync(`tmux capture-pane -t '${paneInfo}' -p -S -30`, { encoding: 'utf-8', stdio: 'pipe' });
+            if (paneContent === lastContent) {
+                stableContentCount++;
+            }
+            else {
+                stableContentCount = 0;
+                lastContent = paneContent;
+            }
+            const hasTrustPrompt = trustPromptPatterns.some((pattern) => pattern.test(paneContent));
+            const hasClaudePermissionPrompt = paneContent.includes('Do you trust') ||
+                paneContent.includes('trust the files') ||
+                paneContent.includes('permission') ||
+                paneContent.includes('allow') ||
+                (paneContent.includes('folder') && paneContent.includes('?'));
+            if ((hasTrustPrompt || hasClaudePermissionPrompt) && !promptHandled) {
+                if (stableContentCount >= 2) {
+                    const isNewClaudeFormat = /❯\s*1\.\s*Yes,\s*proceed/i.test(paneContent) ||
+                        /Enter to confirm.*Esc to exit/i.test(paneContent);
+                    if (isNewClaudeFormat) {
+                        execSync(`tmux send-keys -t '${paneInfo}' Enter`, {
+                            stdio: 'pipe',
+                        });
+                    }
+                    else {
+                        execSync(`tmux send-keys -t '${paneInfo}' 'y'`, { stdio: 'pipe' });
+                        await new Promise((resolve) => setTimeout(resolve, 50));
+                        execSync(`tmux send-keys -t '${paneInfo}' Enter`, {
+                            stdio: 'pipe',
+                        });
+                        await new Promise((resolve) => setTimeout(resolve, 100));
+                        execSync(`tmux send-keys -t '${paneInfo}' Enter`, {
+                            stdio: 'pipe',
+                        });
+                    }
+                    promptHandled = true;
+                    await new Promise((resolve) => setTimeout(resolve, 500));
+                    const updatedContent = execSync(`tmux capture-pane -t '${paneInfo}' -p -S -10`, { encoding: 'utf-8', stdio: 'pipe' });
+                    const promptGone = !trustPromptPatterns.some((p) => p.test(updatedContent));
+                    if (promptGone) {
+                        break;
+                    }
+                }
+            }
+            if (!hasTrustPrompt &&
+                !hasClaudePermissionPrompt &&
+                (paneContent.includes('Claude') || paneContent.includes('Assistant'))) {
+                break;
+            }
+        }
+        catch {
+            // Continue checking
+        }
+    }
+}
+//# sourceMappingURL=conflictResolutionPane.js.map

package/dist/utils/conflictResolutionPane.js.map

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

package/dist/utils/mergeExecution.d.ts

@@ -0,0 +1,52 @@
+/**
+ * Merge Execution Utilities
+ *
+ * Handles the actual merge operations with proper error handling
+ */
+export interface MergeResult {
+    success: boolean;
+    error?: string;
+    conflictFiles?: string[];
+    needsManualResolution?: boolean;
+}
+/**
+ * Merge main branch into worktree branch
+ * This is step 1 of the two-phase merge: get latest changes from main
+ */
+export declare function mergeMainIntoWorktree(worktreePath: string, mainBranch: string): MergeResult;
+/**
+ * Merge worktree branch into main (should be clean after resolving conflicts)
+ * This is step 2 of the two-phase merge: bring changes back to main
+ */
+export declare function mergeWorktreeIntoMain(mainRepoPath: string, worktreeBranch: string): MergeResult;
+/**
+ * Get list of files with merge conflicts
+ */
+export declare function getConflictingFiles(repoPath: string): string[];
+/**
+ * Abort an in-progress merge
+ */
+export declare function abortMerge(repoPath: string): {
+    success: boolean;
+    error?: string;
+};
+/**
+ * Check if repository is in a merge state
+ */
+export declare function isInMergeState(repoPath: string): boolean;
+/**
+ * Complete a merge after conflicts are resolved
+ */
+export declare function completeMerge(repoPath: string, message?: string): MergeResult;
+/**
+ * Clean up worktree and branch after successful merge
+ */
+export declare function cleanupAfterMerge(mainRepoPath: string, worktreePath: string, branchName: string): {
+    success: boolean;
+    error?: string;
+};
+/**
+ * Get merge status summary for user display
+ */
+export declare function getMergeStatus(repoPath: string): string;
+//# sourceMappingURL=mergeExecution.d.ts.map

package/dist/utils/mergeExecution.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeExecution.d.ts","sourceRoot":"","sources":["../../src/utils/mergeExecution.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,GACjB,WAAW,CA6Bb;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,GACrB,WAAW,CA4Bb;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAe9D;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAajF;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAaxD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,WAAW,CA2B7E;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,GACjB;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAqBtC;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAYvD"}