dmux 3.1.1 → 3.3.0

package/dist/components/popups/logsPopup.d.ts

@@ -0,0 +1,12 @@
+#!/usr/bin/env node
+/**
+ * Logs Popup - Scrollable log viewer for dmux
+ *
+ * Displays all logs with filtering options:
+ * - All logs
+ * - Errors only
+ * - Warnings only
+ * - By pane
+ */
+export {};
+//# sourceMappingURL=logsPopup.d.ts.map

package/dist/components/popups/logsPopup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logsPopup.d.ts","sourceRoot":"","sources":["../../../src/components/popups/logsPopup.tsx"],"names":[],"mappings":";AACA;;;;;;;;GAQG"}

package/dist/components/popups/logsPopup.js

@@ -0,0 +1,372 @@
+#!/usr/bin/env node
+/**
+ * Logs Popup - Scrollable log viewer for dmux
+ *
+ * Displays all logs with filtering options:
+ * - All logs
+ * - Errors only
+ * - Warnings only
+ * - By pane
+ */
+import React, { useState, useMemo } from 'react';
+import { render, Box, Text, useInput, useStdout, useApp } from 'ink';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { execSync } from 'child_process';
+import { POPUP_CONFIG } from './config.js';
+import { PopupWrapper, writeSuccessAndExit } from './shared/index.js';
+const LogsPopupApp = ({ allLogs, stats, resultFile }) => {
+    const { stdout } = useStdout();
+    const { exit } = useApp();
+    const terminalHeight = stdout?.rows || 50;
+    const [filterMode, setFilterMode] = useState('all');
+    const [selectedPane, setSelectedPane] = useState(null);
+    const [copied, setCopied] = useState(false);
+    // Calculate line count for each log entry
+    const getLogLineCount = (log) => {
+        let lines = 1; // Main message line
+        if (log.paneId)
+            lines++; // Pane attribution line
+        if (log.stack)
+            lines++; // Stack trace line
+        return lines;
+    };
+    // Calculate initial scroll offset to start at bottom
+    const headerFooterLines = 8;
+    const availableLogLines = Math.max(terminalHeight - headerFooterLines, 10);
+    const initialTotalLines = allLogs.reduce((sum, log) => sum + getLogLineCount(log), 0);
+    const initialScrollOffset = Math.max(0, initialTotalLines - availableLogLines);
+    const [scrollOffset, setScrollOffset] = useState(initialScrollOffset);
+    // Extract available panes
+    const availablePanes = useMemo(() => {
+        const paneIds = new Set();
+        allLogs.forEach(log => {
+            if (log.paneId) {
+                paneIds.add(log.paneId);
+            }
+        });
+        return Array.from(paneIds);
+    }, [allLogs]);
+    // Filter logs based on current filter mode
+    const filteredLogs = useMemo(() => {
+        let filtered = [...allLogs];
+        switch (filterMode) {
+            case 'errors':
+                filtered = filtered.filter(log => log.level === 'error');
+                break;
+            case 'warnings':
+                filtered = filtered.filter(log => log.level === 'warn');
+                break;
+            case 'pane':
+                // When in pane mode, only show logs with pane IDs
+                if (selectedPane) {
+                    filtered = filtered.filter(log => log.paneId === selectedPane);
+                }
+                else {
+                    // No specific pane selected - show only logs with pane IDs
+                    filtered = filtered.filter(log => log.paneId);
+                }
+                break;
+            default:
+                // Show all
+                break;
+        }
+        return filtered;
+    }, [allLogs, filterMode, selectedPane]);
+    // Update scroll offset when filter changes to show bottom
+    React.useEffect(() => {
+        const totalLines = filteredLogs.reduce((sum, log) => sum + getLogLineCount(log), 0);
+        const maxScroll = Math.max(0, totalLines - availableLogLines);
+        setScrollOffset(maxScroll);
+    }, [filterMode, filteredLogs, availableLogLines]);
+    const halfPageSize = Math.floor(availableLogLines / 2);
+    useInput((input, key) => {
+        if (key.escape) {
+            writeSuccessAndExit(resultFile, {}, exit);
+            return;
+        }
+        // Copy visible logs to clipboard
+        if (input === 'c') {
+            // Format visible logs as text
+            const logsText = filteredLogs.map(log => {
+                const date = new Date(log.timestamp);
+                const timestamp = date.toLocaleTimeString('en-US', {
+                    hour12: false,
+                    hour: '2-digit',
+                    minute: '2-digit',
+                    second: '2-digit'
+                });
+                const level = log.level.toUpperCase();
+                const source = log.source || 'unknown';
+                let text = `${timestamp} [${source}] ${level}: ${log.message}`;
+                if (log.paneId) {
+                    text += ` (pane: ${log.paneId})`;
+                }
+                if (log.stack) {
+                    text += `\n  Stack: ${log.stack}`;
+                }
+                return text;
+            }).join('\n');
+            try {
+                // Try pbcopy (macOS)
+                execSync(`pbcopy`, { input: logsText, stdio: 'pipe' });
+                setCopied(true);
+                setTimeout(() => setCopied(false), 2000);
+            }
+            catch {
+                try {
+                    // Try xclip (Linux)
+                    execSync(`xclip -selection clipboard`, { input: logsText, stdio: 'pipe' });
+                    setCopied(true);
+                    setTimeout(() => setCopied(false), 2000);
+                }
+                catch {
+                    // Clipboard not available
+                }
+            }
+            return;
+        }
+        // Open logs in text editor
+        if (input === 'o') {
+            // Format visible logs as text
+            const logsText = filteredLogs.map(log => {
+                const date = new Date(log.timestamp);
+                const timestamp = date.toLocaleTimeString('en-US', {
+                    hour12: false,
+                    hour: '2-digit',
+                    minute: '2-digit',
+                    second: '2-digit'
+                });
+                const level = log.level.toUpperCase();
+                const source = log.source || 'unknown';
+                let text = `${timestamp} [${source}] ${level}: ${log.message}`;
+                if (log.paneId) {
+                    text += ` (pane: ${log.paneId})`;
+                }
+                if (log.stack) {
+                    text += `\n  Stack: ${log.stack}`;
+                }
+                return text;
+            }).join('\n');
+            // Write to temp file
+            const tempFile = path.join(os.tmpdir(), `dmux-logs-${Date.now()}.txt`);
+            try {
+                fs.writeFileSync(tempFile, logsText);
+            }
+            catch (error) {
+                console.error('[logsPopup] Failed to write temp log file:', error);
+                return;
+            }
+            // Open in editor (same pattern as openInEditor action)
+            const editor = process.env.EDITOR || 'code';
+            try {
+                execSync(`${editor} "${tempFile}"`, { stdio: 'pipe' });
+                setCopied(true);
+                setTimeout(() => setCopied(false), 2000);
+            }
+            catch {
+                // Editor failed, file still exists for manual opening
+            }
+            return;
+        }
+        // Filter mode selection
+        if (input === '1') {
+            setFilterMode('all');
+            setSelectedPane(null);
+        }
+        else if (input === '2') {
+            setFilterMode('errors');
+            setSelectedPane(null);
+        }
+        else if (input === '3') {
+            setFilterMode('warnings');
+            setSelectedPane(null);
+        }
+        else if (input === '4') {
+            setFilterMode('pane');
+            // Start with first pane if available
+            if (availablePanes.length > 0 && !selectedPane) {
+                setSelectedPane(availablePanes[0]);
+            }
+        }
+        // Left/right arrow keys to cycle through panes when in pane mode
+        if (filterMode === 'pane' && availablePanes.length > 0) {
+            if (key.leftArrow) {
+                const currentIndex = selectedPane ? availablePanes.indexOf(selectedPane) : 0;
+                const newIndex = currentIndex > 0 ? currentIndex - 1 : availablePanes.length - 1;
+                setSelectedPane(availablePanes[newIndex]);
+                return; // Don't scroll
+            }
+            if (key.rightArrow) {
+                const currentIndex = selectedPane ? availablePanes.indexOf(selectedPane) : 0;
+                const newIndex = currentIndex < availablePanes.length - 1 ? currentIndex + 1 : 0;
+                setSelectedPane(availablePanes[newIndex]);
+                return; // Don't scroll
+            }
+        }
+        // Calculate max scroll based on total line count
+        const totalLines = filteredLogs.reduce((sum, log) => sum + getLogLineCount(log), 0);
+        const maxScroll = Math.max(0, totalLines - availableLogLines);
+        // Half-page scrolling with arrow keys
+        if (key.upArrow) {
+            setScrollOffset(Math.max(0, scrollOffset - halfPageSize));
+        }
+        if (key.downArrow) {
+            setScrollOffset(Math.min(maxScroll, scrollOffset + halfPageSize));
+        }
+        // Mouse wheel scrolling (tmux sends these as escape sequences)
+        // Scroll up: ESC[64;row;colM or button 4
+        // Scroll down: ESC[65;row;colM or button 5
+        if (input.includes('[64;') || input.includes('ScrollUp')) {
+            setScrollOffset(Math.max(0, scrollOffset - halfPageSize));
+        }
+        if (input.includes('[65;') || input.includes('ScrollDown')) {
+            setScrollOffset(Math.min(maxScroll, scrollOffset + halfPageSize));
+        }
+    });
+    // Format timestamp
+    const formatTime = (timestamp) => {
+        const date = new Date(timestamp);
+        return date.toLocaleTimeString('en-US', {
+            hour12: false,
+            hour: '2-digit',
+            minute: '2-digit',
+            second: '2-digit'
+        });
+    };
+    // Get color for log level
+    const getLevelColor = (level) => {
+        switch (level) {
+            case 'error': return 'red';
+            case 'warn': return 'yellow';
+            case 'info': return 'cyan';
+            case 'debug': return 'gray';
+        }
+    };
+    // Filter tabs
+    const renderFilterTabs = () => {
+        const tabs = [
+            { key: '1', label: 'All', mode: 'all' },
+            { key: '2', label: 'Errors', mode: 'errors' },
+            { key: '3', label: 'Warnings', mode: 'warnings' },
+            { key: '4', label: filterMode === 'pane' && selectedPane ? `Pane: ${selectedPane}` : 'By Pane', mode: 'pane' },
+        ];
+        return (React.createElement(Box, { flexDirection: "row", gap: 1 }, tabs.map(tab => (React.createElement(Text, { key: tab.key, color: filterMode === tab.mode ? POPUP_CONFIG.titleColor : 'gray', bold: filterMode === tab.mode },
+            "[",
+            tab.key,
+            "] ",
+            tab.label)))));
+    };
+    // Render log entry with color-coded severity levels
+    const renderLogEntry = (log) => {
+        const time = formatTime(log.timestamp);
+        const color = getLevelColor(log.level);
+        const levelLabel = log.level.toUpperCase().padEnd(5, ' ');
+        const isCritical = log.level === 'error' || log.level === 'warn';
+        return (React.createElement(Box, { key: log.id, flexDirection: "column", marginBottom: 0 },
+            React.createElement(Text, null,
+                React.createElement(Text, { dimColor: true }, time),
+                React.createElement(Text, { color: color, bold: isCritical, backgroundColor: log.level === 'error' ? 'red' : undefined },
+                    ' [',
+                    levelLabel,
+                    '] '),
+                React.createElement(Text, { dimColor: true },
+                    "[",
+                    log.source || 'dmux',
+                    "]"),
+                React.createElement(Text, { color: isCritical ? color : undefined, bold: log.level === 'error' },
+                    ' ',
+                    log.message)),
+            log.paneId && (React.createElement(Box, { marginLeft: 2 },
+                React.createElement(Text, { dimColor: true },
+                    "\u2514\u2500 Pane: ",
+                    log.paneId))),
+            log.stack && (React.createElement(Box, { marginLeft: 2 },
+                React.createElement(Text, { color: "red" },
+                    "Stack: ",
+                    log.stack.split('\n')[0])))));
+    };
+    // Calculate which logs fit in the viewport considering multi-line entries
+    const getVisibleLogs = () => {
+        const visible = [];
+        let totalLines = 0;
+        let startIndex = 0;
+        // Calculate starting index based on scroll offset
+        let skippedLines = 0;
+        for (let i = 0; i < filteredLogs.length; i++) {
+            const lineCount = getLogLineCount(filteredLogs[i]);
+            if (skippedLines + lineCount > scrollOffset) {
+                startIndex = i;
+                break;
+            }
+            skippedLines += lineCount;
+        }
+        // Add logs until we fill the viewport
+        for (let i = startIndex; i < filteredLogs.length; i++) {
+            const lineCount = getLogLineCount(filteredLogs[i]);
+            if (totalLines + lineCount > availableLogLines)
+                break;
+            visible.push(filteredLogs[i]);
+            totalLines += lineCount;
+        }
+        return visible;
+    };
+    const visibleLogs = getVisibleLogs();
+    // Calculate total line count for scroll calculations
+    const totalLines = filteredLogs.reduce((sum, log) => sum + getLogLineCount(log), 0);
+    const canScrollUp = scrollOffset > 0;
+    const hasMore = scrollOffset < totalLines - availableLogLines;
+    return (React.createElement(PopupWrapper, { resultFile: resultFile, allowEscapeToCancel: false },
+        React.createElement(Box, { flexDirection: "column" },
+            React.createElement(Box, { flexDirection: "column", borderStyle: "single", borderColor: POPUP_CONFIG.borderColor, paddingX: 1 },
+                React.createElement(Box, null,
+                    React.createElement(Text, { dimColor: true },
+                        stats.total,
+                        " total \u2022 ",
+                        stats.errors,
+                        " errors \u2022 ",
+                        stats.warnings,
+                        " warnings")),
+                React.createElement(Box, { marginTop: 1 }, renderFilterTabs())),
+            React.createElement(Box, { flexDirection: "column", height: availableLogLines, paddingX: 1, paddingY: 1 }, filteredLogs.length === 0 ? (React.createElement(Box, null,
+                React.createElement(Text, { dimColor: true }, "No logs to display"))) : (visibleLogs.map((log) => renderLogEntry(log)))),
+            React.createElement(Box, { borderStyle: "single", borderColor: POPUP_CONFIG.borderColor, paddingX: 1 },
+                React.createElement(Text, { dimColor: true },
+                    "\u2191\u2193: Scroll \u2022 1-4: Filter",
+                    filterMode === 'pane' && availablePanes.length > 0 && (React.createElement(Text, { dimColor: true },
+                        " \u2022 \u2190\u2192: ",
+                        selectedPane || 'All Panes')),
+                    ' • [c]: Copy • [o]: Open in editor',
+                    ' • ESC: Close',
+                    filteredLogs.length > availableLogLines && (React.createElement(Text, { dimColor: true },
+                        " \u2022 Showing ",
+                        scrollOffset + 1,
+                        "-",
+                        Math.min(scrollOffset + availableLogLines, filteredLogs.length),
+                        " of ",
+                        filteredLogs.length)),
+                    copied && React.createElement(Text, { color: "green" }, " \u2022 \u2713 Copied!"))))));
+};
+// Entry point
+function main() {
+    const resultFile = process.argv[2];
+    const dataFile = process.argv[3];
+    if (!resultFile || !dataFile) {
+        console.error('Error: Result file and data file paths required');
+        console.error(`Got: resultFile=${resultFile}, dataFile=${dataFile}`);
+        process.exit(1);
+    }
+    let logsData;
+    try {
+        const dataJson = fs.readFileSync(dataFile, 'utf-8');
+        logsData = JSON.parse(dataJson);
+    }
+    catch (error) {
+        console.error('Error: Failed to read or parse logs data file:', error);
+        process.exit(1);
+    }
+    render(React.createElement(LogsPopupApp, { allLogs: logsData.logs, stats: logsData.stats, resultFile: resultFile }));
+}
+main();
+//# sourceMappingURL=logsPopup.js.map

package/dist/components/popups/logsPopup.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logsPopup.js","sourceRoot":"","sources":["../../../src/components/popups/logsPopup.tsx"],"names":[],"mappings":";AACA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAErE,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAmBtE,MAAM,YAAY,GAAgC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE;IACnF,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAAC;IAC/B,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC;IAC1B,MAAM,cAAc,GAAG,MAAM,EAAE,IAAI,IAAI,EAAE,CAAC;IAE1C,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAa,KAAK,CAAC,CAAC;IAChE,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAgB,IAAI,CAAC,CAAC;IACtE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE5C,0CAA0C;IAC1C,MAAM,eAAe,GAAG,CAAC,GAAa,EAAU,EAAE;QAChD,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,oBAAoB;QACnC,IAAI,GAAG,CAAC,MAAM;YAAE,KAAK,EAAE,CAAC,CAAC,wBAAwB;QACjD,IAAI,GAAG,CAAC,KAAK;YAAE,KAAK,EAAE,CAAC,CAAC,mBAAmB;QAC3C,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,qDAAqD;IACrD,MAAM,iBAAiB,GAAG,CAAC,CAAC;IAC5B,MAAM,iBAAiB,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,GAAG,iBAAiB,EAAE,EAAE,CAAC,CAAC;IAE3E,MAAM,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACtF,MAAM,mBAAmB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,iBAAiB,GAAG,iBAAiB,CAAC,CAAC;IAE/E,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAEtE,0BAA0B;IAC1B,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,EAAE;QAClC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACpB,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,2CAA2C;IAC3C,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;QAChC,IAAI,QAAQ,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC;QAE5B,QAAQ,UAAU,EAAE,CAAC;YACnB,KAAK,QAAQ;gBACX,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC;gBACzD,MAAM;YACR,KAAK,UAAU;gBACb,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC;gBACxD,MAAM;YACR,KAAK,MAAM;gBACT,kDAAkD;gBAClD,IAAI,YAAY,EAAE,CAAC;oBACjB,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,YAAY,CAAC,CAAC;gBACjE,CAAC;qBAAM,CAAC;oBACN,2DAA2D;oBAC3D,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAChD,CAAC;gBACD,MAAM;YACR;gBACE,WAAW;gBACX,MAAM;QACV,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC;IAExC,0DAA0D;IAC1D,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,UAAU,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QACpF,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,GAAG,iBAAiB,CAAC,CAAC;QAC9D,eAAe,CAAC,SAAS,CAAC,CAAC;IAC7B,CAAC,EAAE,CAAC,UAAU,EAAE,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAElD,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAAC;IAEvD,QAAQ,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QACtB,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;YACf,mBAAmB,CAAC,UAAU,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YAC1C,OAAO;QACT,CAAC;QAED,iCAAiC;QACjC,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;YAClB,8BAA8B;YAC9B,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBACtC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBACrC,MAAM,SAAS,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE;oBACjD,MAAM,EAAE,KAAK;oBACb,IAAI,EAAE,SAAS;oBACf,MAAM,EAAE,SAAS;oBACjB,MAAM,EAAE,SAAS;iBAClB,CAAC,CAAC;gBACH,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;gBACtC,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,SAAS,CAAC;gBACvC,IAAI,IAAI,GAAG,GAAG,SAAS,KAAK,MAAM,KAAK,KAAK,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC;gBAC/D,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;oBACf,IAAI,IAAI,WAAW,GAAG,CAAC,MAAM,GAAG,CAAC;gBACnC,CAAC;gBACD,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;oBACd,IAAI,IAAI,cAAc,GAAG,CAAC,KAAK,EAAE,CAAC;gBACpC,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEd,IAAI,CAAC;gBACH,qBAAqB;gBACrB,QAAQ,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;gBACvD,SAAS,CAAC,IAAI,CAAC,CAAC;gBAChB,UAAU,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;YAC3C,CAAC;YAAC,MAAM,CAAC;gBACP,IAAI,CAAC;oBACH,oBAAoB;oBACpB,QAAQ,CAAC,4BAA4B,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;oBAC3E,SAAS,CAAC,IAAI,CAAC,CAAC;oBAChB,UAAU,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;gBAC3C,CAAC;gBAAC,MAAM,CAAC;oBACP,0BAA0B;gBAC5B,CAAC;YACH,CAAC;YACD,OAAO;QACT,CAAC;QAED,2BAA2B;QAC3B,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;YAClB,8BAA8B;YAC9B,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBACtC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBACrC,MAAM,SAAS,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE;oBACjD,MAAM,EAAE,KAAK;oBACb,IAAI,EAAE,SAAS;oBACf,MAAM,EAAE,SAAS;oBACjB,MAAM,EAAE,SAAS;iBAClB,CAAC,CAAC;gBACH,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;gBACtC,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,SAAS,CAAC;gBACvC,IAAI,IAAI,GAAG,GAAG,SAAS,KAAK,MAAM,KAAK,KAAK,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC;gBAC/D,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;oBACf,IAAI,IAAI,WAAW,GAAG,CAAC,MAAM,GAAG,CAAC;gBACnC,CAAC;gBACD,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;oBACd,IAAI,IAAI,cAAc,GAAG,CAAC,KAAK,EAAE,CAAC;gBACpC,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEd,qBAAqB;YACrB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,aAAa,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACvE,IAAI,CAAC;gBACH,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YACvC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,4CAA4C,EAAE,KAAK,CAAC,CAAC;gBACnE,OAAO;YACT,CAAC;YAED,uDAAuD;YACvD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC;YAC5C,IAAI,CAAC;gBACH,QAAQ,CAAC,GAAG,MAAM,KAAK,QAAQ,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;gBACvD,SAAS,CAAC,IAAI,CAAC,CAAC;gBAChB,UAAU,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;YAC3C,CAAC;YAAC,MAAM,CAAC;gBACP,sDAAsD;YACxD,CAAC;YACD,OAAO;QACT,CAAC;QAED,wBAAwB;QACxB,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;YAClB,aAAa,CAAC,KAAK,CAAC,CAAC;YACrB,eAAe,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;aAAM,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;YACzB,aAAa,CAAC,QAAQ,CAAC,CAAC;YACxB,eAAe,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;aAAM,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;YACzB,aAAa,CAAC,UAAU,CAAC,CAAC;YAC1B,eAAe,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;aAAM,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;YACzB,aAAa,CAAC,MAAM,CAAC,CAAC;YACtB,qCAAqC;YACrC,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gBAC/C,eAAe,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;YACrC,CAAC;QACH,CAAC;QAED,iEAAiE;QACjE,IAAI,UAAU,KAAK,MAAM,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvD,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;gBAClB,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7E,MAAM,QAAQ,GAAG,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;gBACjF,eAAe,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC1C,OAAO,CAAC,eAAe;YACzB,CAAC;YACD,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;gBACnB,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7E,MAAM,QAAQ,GAAG,YAAY,GAAG,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACjF,eAAe,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC1C,OAAO,CAAC,eAAe;YACzB,CAAC;QACH,CAAC;QAED,iDAAiD;QACjD,MAAM,UAAU,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QACpF,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,GAAG,iBAAiB,CAAC,CAAC;QAE9D,sCAAsC;QACtC,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAChB,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;YAClB,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC;QACpE,CAAC;QAED,+DAA+D;QAC/D,yCAAyC;QACzC,2CAA2C;QAC3C,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACzD,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC;QAC5D,CAAC;QACD,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YAC3D,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC;QACpE,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,mBAAmB;IACnB,MAAM,UAAU,GAAG,CAAC,SAAiB,EAAU,EAAE;QAC/C,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE;YACtC,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,SAAS;SAClB,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,0BAA0B;IAC1B,MAAM,aAAa,GAAG,CAAC,KAAe,EAAU,EAAE;QAChD,QAAQ,KAAK,EAAE,CAAC;YACd,KAAK,OAAO,CAAC,CAAC,OAAO,KAAK,CAAC;YAC3B,KAAK,MAAM,CAAC,CAAC,OAAO,QAAQ,CAAC;YAC7B,KAAK,MAAM,CAAC,CAAC,OAAO,MAAM,CAAC;YAC3B,KAAK,OAAO,CAAC,CAAC,OAAO,MAAM,CAAC;QAC9B,CAAC;IACH,CAAC,CAAC;IAGF,cAAc;IACd,MAAM,gBAAgB,GAAG,GAAG,EAAE;QAC5B,MAAM,IAAI,GAAG;YACX,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAmB,EAAE;YACrD,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAsB,EAAE;YAC3D,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,UAAwB,EAAE;YAC/D,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,KAAK,MAAM,IAAI,YAAY,CAAC,CAAC,CAAC,SAAS,YAAY,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,MAAoB,EAAE;SAC7H,CAAC;QAEF,OAAO,CACL,oBAAC,GAAG,IAAC,aAAa,EAAC,KAAK,EAAC,GAAG,EAAE,CAAC,IAC5B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CACf,oBAAC,IAAI,IACH,GAAG,EAAE,GAAG,CAAC,GAAG,EACZ,KAAK,EAAE,UAAU,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,EACjE,IAAI,EAAE,UAAU,KAAK,GAAG,CAAC,IAAI;;YAE3B,GAAG,CAAC,GAAG;;YAAI,GAAG,CAAC,KAAK,CACjB,CACR,CAAC,CACE,CACP,CAAC;IACJ,CAAC,CAAC;IAEF,oDAAoD;IACpD,MAAM,cAAc,GAAG,CAAC,GAAa,EAAE,EAAE;QACvC,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvC,MAAM,KAAK,GAAG,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC1D,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,KAAK,OAAO,IAAI,GAAG,CAAC,KAAK,KAAK,MAAM,CAAC;QAEjE,OAAO,CACL,oBAAC,GAAG,IAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,aAAa,EAAC,QAAQ,EAAC,YAAY,EAAE,CAAC;YACtD,oBAAC,IAAI;gBACH,oBAAC,IAAI,IAAC,QAAQ,UAAE,IAAI,CAAQ;gBAC5B,oBAAC,IAAI,IAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;oBAC7F,IAAI;oBACJ,UAAU;oBACV,IAAI,CACA;gBACP,oBAAC,IAAI,IAAC,QAAQ;;oBAAG,GAAG,CAAC,MAAM,IAAI,MAAM;wBAAS;gBAC9C,oBAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,KAAK,KAAK,OAAO;oBACrE,GAAG;oBACH,GAAG,CAAC,OAAO,CACP,CACF;YACN,GAAG,CAAC,MAAM,IAAI,CACb,oBAAC,GAAG,IAAC,UAAU,EAAE,CAAC;gBAChB,oBAAC,IAAI,IAAC,QAAQ;;oBACF,GAAG,CAAC,MAAM,CACf,CACH,CACP;YACA,GAAG,CAAC,KAAK,IAAI,CACZ,oBAAC,GAAG,IAAC,UAAU,EAAE,CAAC;gBAChB,oBAAC,IAAI,IAAC,KAAK,EAAC,KAAK;;oBACP,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAC3B,CACH,CACP,CACG,CACP,CAAC;IACJ,CAAC,CAAC;IAEF,0EAA0E;IAC1E,MAAM,cAAc,GAAG,GAAG,EAAE;QAC1B,MAAM,OAAO,GAAe,EAAE,CAAC;QAC/B,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,UAAU,GAAG,CAAC,CAAC;QAEnB,kDAAkD;QAClD,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7C,MAAM,SAAS,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;YACnD,IAAI,YAAY,GAAG,SAAS,GAAG,YAAY,EAAE,CAAC;gBAC5C,UAAU,GAAG,CAAC,CAAC;gBACf,MAAM;YACR,CAAC;YACD,YAAY,IAAI,SAAS,CAAC;QAC5B,CAAC;QAED,sCAAsC;QACtC,KAAK,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACtD,MAAM,SAAS,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;YACnD,IAAI,UAAU,GAAG,SAAS,GAAG,iBAAiB;gBAAE,MAAM;YACtD,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9B,UAAU,IAAI,SAAS,CAAC;QAC1B,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,qDAAqD;IACrD,MAAM,UAAU,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACpF,MAAM,WAAW,GAAG,YAAY,GAAG,CAAC,CAAC;IACrC,MAAM,OAAO,GAAG,YAAY,GAAG,UAAU,GAAG,iBAAiB,CAAC;IAE9D,OAAO,CACL,oBAAC,YAAY,IAAC,UAAU,EAAE,UAAU,EAAE,mBAAmB,EAAE,KAAK;QAC9D,oBAAC,GAAG,IAAC,aAAa,EAAC,QAAQ;YAEzB,oBAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,WAAW,EAAC,QAAQ,EAAC,WAAW,EAAE,YAAY,CAAC,WAAW,EAAE,QAAQ,EAAE,CAAC;gBACjG,oBAAC,GAAG;oBACF,oBAAC,IAAI,IAAC,QAAQ;wBAAE,KAAK,CAAC,KAAK;;wBAAW,KAAK,CAAC,MAAM;;wBAAY,KAAK,CAAC,QAAQ;oCAAiB,CACzF;gBACN,oBAAC,GAAG,IAAC,SAAS,EAAE,CAAC,IACd,gBAAgB,EAAE,CACf,CACF;YAGN,oBAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,IAC5E,YAAY,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAC3B,oBAAC,GAAG;gBACF,oBAAC,IAAI,IAAC,QAAQ,+BAA0B,CACpC,CACP,CAAC,CAAC,CAAC,CACF,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAC9C,CACG;YAGN,oBAAC,GAAG,IAAC,WAAW,EAAC,QAAQ,EAAC,WAAW,EAAE,YAAY,CAAC,WAAW,EAAE,QAAQ,EAAE,CAAC;gBAC1E,oBAAC,IAAI,IAAC,QAAQ;;oBAEX,UAAU,KAAK,MAAM,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,IAAI,CACrD,oBAAC,IAAI,IAAC,QAAQ;;wBAAS,YAAY,IAAI,WAAW,CAAQ,CAC3D;oBACA,oCAAoC;oBACpC,eAAe;oBACf,YAAY,CAAC,MAAM,GAAG,iBAAiB,IAAI,CAC1C,oBAAC,IAAI,IAAC,QAAQ;;wBAAa,YAAY,GAAG,CAAC;;wBAAG,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,iBAAiB,EAAE,YAAY,CAAC,MAAM,CAAC;;wBAAM,YAAY,CAAC,MAAM,CAAQ,CAC/I;oBACA,MAAM,IAAI,oBAAC,IAAI,IAAC,KAAK,EAAC,OAAO,6BAAoB,CAC7C,CACH,CACF,CACO,CAChB,CAAC;AACJ,CAAC,CAAC;AAEF,cAAc;AACd,SAAS,IAAI;IACX,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAEjC,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC7B,OAAO,CAAC,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACjE,OAAO,CAAC,KAAK,CAAC,mBAAmB,UAAU,cAAc,QAAQ,EAAE,CAAC,CAAC;QACrE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,IAAI,QAA0C,CAAC;IAC/C,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACpD,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,gDAAgD,EAAE,KAAK,CAAC,CAAC;QACvE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,CAAC,oBAAC,YAAY,IAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,GAAI,CAAC,CAAC;AAClG,CAAC;AAED,IAAI,EAAE,CAAC"}

package/dist/components/popups/mergePopup.d.ts

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+/**
+ * Standalone popup for merge workflow
+ * Runs in a tmux popup modal and handles the entire merge process
+ */
+export {};
+//# sourceMappingURL=mergePopup.d.ts.map

package/dist/components/popups/mergePopup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergePopup.d.ts","sourceRoot":"","sources":["../../../src/components/popups/mergePopup.tsx"],"names":[],"mappings":";AAEA;;;GAGG"}