dmux 5.6.3 → 5.7.0

package/dist/components/popups/prReviewPopup.js

@@ -0,0 +1,278 @@
+#!/usr/bin/env node
+/**
+ * Dedicated popup for reviewing an AI-generated PR summary.
+ * - Editable summary (title on first line, blank, markdown body) — scrollable
+ * - Changed files list — navigable with arrow keys
+ * - Per-file diff peek — Enter opens, arrows/PgUp/PgDn scroll, ESC/Space/Enter closes
+ *
+ * Modes: summary | files | diff. Tab toggles summary <-> files.
+ * Ctrl+S submits, ESC cancels (from summary/files; from diff it returns to files).
+ */
+import React, { useMemo, useState } from 'react';
+import { render, Box, Text, useInput, useApp, useStdout } from 'ink';
+import * as fs from 'fs';
+import { execSync } from 'child_process';
+import { PopupContainer, PopupWrapper, writeSuccessAndExit, } from './shared/index.js';
+import CleanTextInput from '../inputs/CleanTextInput.js';
+import { POPUP_CONFIG } from './config.js';
+const DIFF_MAX_BUFFER_BYTES = 10 * 1024 * 1024;
+const DIFF_SCROLL_PAGE = 10;
+const MAX_VISIBLE_FILES = 7;
+function shellEscape(value) {
+    return `'${value.replace(/'/g, `'\\''`)}'`;
+}
+function getDiffText(data, file) {
+    const fileArg = shellEscape(file);
+    const base = shellEscape(data.targetBranch);
+    const head = shellEscape(data.sourceBranch);
+    try {
+        const output = execSync(`git --no-pager diff --no-color ${base}...${head} -- ${fileArg}`, {
+            cwd: data.repoPath,
+            encoding: 'utf-8',
+            stdio: 'pipe',
+            maxBuffer: DIFF_MAX_BUFFER_BYTES,
+        });
+        if (output.trim().length > 0)
+            return output;
+        return `No diff output for ${file}.`;
+    }
+    catch (error) {
+        const msg = error instanceof Error ? error.message : String(error);
+        return `Failed to load diff for ${file}: ${msg}`;
+    }
+}
+function getDiffLineColor(line) {
+    if (line.startsWith('+++') || line.startsWith('---'))
+        return 'yellow';
+    if (line.startsWith('+'))
+        return 'green';
+    if (line.startsWith('-'))
+        return 'red';
+    if (line.startsWith('@@'))
+        return 'cyan';
+    if (line.startsWith('diff --git') || line.startsWith('index '))
+        return POPUP_CONFIG.titleColor;
+    return 'white';
+}
+function getVisibleWindow(items, idx, max) {
+    const total = items.length;
+    if (total <= max)
+        return { start: 0, end: total };
+    const centered = idx - Math.floor(max / 2);
+    const start = Math.max(0, Math.min(centered, total - max));
+    return { start, end: start + max };
+}
+const PRReviewPopupApp = ({ resultFile, data }) => {
+    const { exit } = useApp();
+    const { stdout } = useStdout();
+    const [value, setValue] = useState(data.defaultValue);
+    const [mode, setMode] = useState('summary');
+    const [fileIndex, setFileIndex] = useState(0);
+    const [diff, setDiff] = useState(null);
+    const [submitError, setSubmitError] = useState(null);
+    const terminalRows = stdout?.rows || process.stdout.rows || 40;
+    // Layout budgets — approximate, clamp to sane ranges.
+    const summaryMaxVisibleLines = Math.max(6, Math.min(16, Math.floor(terminalRows * 0.42)));
+    const diffMaxVisible = Math.max(10, terminalRows - 10);
+    const fileWindow = useMemo(() => getVisibleWindow(data.files, fileIndex, MAX_VISIBLE_FILES), [data.files, fileIndex]);
+    const openDiff = () => {
+        const file = data.files[fileIndex];
+        if (!file)
+            return;
+        const text = getDiffText(data, file);
+        const lines = text.split('\n');
+        setDiff({
+            lines: lines.length > 0 ? lines : ['(empty)'],
+            offset: 0,
+            filePath: file,
+        });
+        setMode('diff');
+    };
+    const submit = () => {
+        const trimmed = value.replace(/\r\n/g, '\n').trim();
+        if (!trimmed) {
+            setSubmitError('Title cannot be empty');
+            setMode('summary');
+            return;
+        }
+        writeSuccessAndExit(resultFile, value, exit);
+    };
+    useInput((input, key) => {
+        if (mode === 'diff') {
+            if (!diff)
+                return;
+            const maxOffset = Math.max(0, diff.lines.length - diffMaxVisible);
+            if (key.upArrow) {
+                setDiff({ ...diff, offset: Math.max(0, diff.offset - 1) });
+                return;
+            }
+            if (key.downArrow) {
+                setDiff({ ...diff, offset: Math.min(maxOffset, diff.offset + 1) });
+                return;
+            }
+            if (key.pageUp) {
+                setDiff({ ...diff, offset: Math.max(0, diff.offset - DIFF_SCROLL_PAGE) });
+                return;
+            }
+            if (key.pageDown) {
+                setDiff({ ...diff, offset: Math.min(maxOffset, diff.offset + DIFF_SCROLL_PAGE) });
+                return;
+            }
+            if (key.escape || key.return || input === ' ') {
+                setDiff(null);
+                setMode('files');
+                return;
+            }
+            return;
+        }
+        // Ctrl+S or Ctrl+D submits from either edit mode.
+        if (key.ctrl && (input === 's' || input === 'd')) {
+            submit();
+            return;
+        }
+        if (mode === 'files') {
+            if (key.escape) {
+                setMode('summary');
+                return;
+            }
+            if (key.tab) {
+                setMode('submit');
+                return;
+            }
+            if (key.upArrow) {
+                setFileIndex((p) => Math.max(0, p - 1));
+                return;
+            }
+            if (key.downArrow) {
+                setFileIndex((p) => Math.min(Math.max(0, data.files.length - 1), p + 1));
+                return;
+            }
+            if (key.return || input === ' ') {
+                openDiff();
+                return;
+            }
+            return;
+        }
+        if (mode === 'submit') {
+            if (key.escape) {
+                setMode('summary');
+                return;
+            }
+            if (key.tab) {
+                setMode('summary');
+                return;
+            }
+            if (key.return) {
+                submit();
+                return;
+            }
+            return;
+        }
+        // mode === 'summary'
+        if (key.tab) {
+            if (data.files.length > 0) {
+                setMode('files');
+            }
+            else {
+                setMode('submit');
+            }
+            return;
+        }
+        // Everything else passes through to CleanTextInput.
+    });
+    if (mode === 'diff' && diff) {
+        const visible = diff.lines.slice(diff.offset, diff.offset + diffMaxVisible);
+        const end = Math.min(diff.offset + diffMaxVisible, diff.lines.length);
+        return (React.createElement(PopupWrapper, { resultFile: resultFile, allowEscapeToCancel: false },
+            React.createElement(PopupContainer, { footer: "\u2191\u2193 scroll \u2022 PgUp/PgDn \u2022 Enter/Space/ESC back" },
+                React.createElement(Box, { marginBottom: 1, flexDirection: "column" },
+                    React.createElement(Text, { bold: true, color: POPUP_CONFIG.titleColor, wrap: "truncate-end" }, diff.filePath),
+                    React.createElement(Text, { dimColor: true },
+                        data.sourceBranch,
+                        " vs ",
+                        data.targetBranch,
+                        " \u2022 Lines ",
+                        Math.min(diff.offset + 1, diff.lines.length),
+                        "-",
+                        end,
+                        " of ",
+                        diff.lines.length)),
+                React.createElement(Box, { flexDirection: "column" }, visible.map((line, i) => (React.createElement(Text, { key: `${diff.offset + i}`, color: getDiffLineColor(line), wrap: "truncate-end" }, line.length > 0 ? line : ' ')))))));
+    }
+    const footer = mode === 'summary'
+        ? 'Edit summary • Tab → next • Ctrl+S submit • ESC cancel'
+        : mode === 'files'
+            ? '↑↓ file • Enter peek diff • Tab → submit • ESC ← summary'
+            : 'Enter to create PR • Tab ← summary • ESC ← summary';
+    // ESC from any non-summary mode returns focus to summary; ESC from summary cancels.
+    const allowEscapeToCancel = mode === 'summary';
+    const summaryActive = mode === 'summary';
+    const filesActive = mode === 'files';
+    const submitActive = mode === 'submit';
+    const hasFilesAbove = fileWindow.start > 0;
+    const hasFilesBelow = fileWindow.end < data.files.length;
+    return (React.createElement(PopupWrapper, { resultFile: resultFile, allowEscapeToCancel: allowEscapeToCancel },
+        React.createElement(PopupContainer, { footer: footer },
+            React.createElement(Box, { marginBottom: 0 },
+                React.createElement(Text, { bold: true, color: POPUP_CONFIG.titleColor }, "PR Title & Description")),
+            data.message ? (React.createElement(Box, { marginBottom: 1, flexDirection: "column" }, data.message.split('\n').slice(0, 2).map((line, idx) => (React.createElement(Text, { key: idx, dimColor: true, wrap: "truncate-end" }, line))))) : null,
+            submitError ? (React.createElement(Box, { marginBottom: 1 },
+                React.createElement(Text, { color: POPUP_CONFIG.errorColor }, submitError))) : null,
+            React.createElement(Box, { borderStyle: "bold", borderColor: summaryActive ? POPUP_CONFIG.titleColor : 'gray', paddingX: 1, marginBottom: 1, flexDirection: "column" },
+                React.createElement(CleanTextInput, { value: value, onChange: setValue, placeholder: 'feat: short title\n\n## Summary\n- ...', ignoreFocus: true, disableEscape: true, maxVisibleLines: summaryMaxVisibleLines, disabled: !summaryActive })),
+            React.createElement(Box, null,
+                React.createElement(Text, { bold: true, color: POPUP_CONFIG.titleColor },
+                    "Changed Files (",
+                    data.files.length,
+                    ")")),
+            React.createElement(Box, { borderStyle: "round", borderColor: filesActive ? POPUP_CONFIG.titleColor : 'gray', paddingX: 1, flexDirection: "column" },
+                hasFilesAbove ? React.createElement(Text, { dimColor: true }, "\u2191 more above") : null,
+                data.files.length === 0 ? (React.createElement(Text, { dimColor: true },
+                    "No files changed against ",
+                    data.targetBranch,
+                    ".")) : (data.files.slice(fileWindow.start, fileWindow.end).map((f, i) => {
+                    const actualIdx = fileWindow.start + i;
+                    const isSelected = actualIdx === fileIndex && filesActive;
+                    const isCursor = actualIdx === fileIndex && !filesActive;
+                    return (React.createElement(Text, { key: `${f}-${actualIdx}`, color: isSelected ? POPUP_CONFIG.successColor : 'white', bold: isSelected, dimColor: !filesActive && !isCursor, wrap: "truncate-end" },
+                        isSelected ? '▶ ' : '  ',
+                        f));
+                })),
+                hasFilesBelow ? React.createElement(Text, { dimColor: true }, "\u2193 more below") : null),
+            React.createElement(Box, { marginTop: 1, justifyContent: "flex-end" },
+                React.createElement(Box, { borderStyle: "round", borderColor: submitActive ? POPUP_CONFIG.successColor : 'gray', paddingX: 2 },
+                    React.createElement(Text, { color: submitActive ? POPUP_CONFIG.successColor : 'white', bold: submitActive },
+                        submitActive ? '▶ ' : '  ',
+                        "Create PR"))))));
+};
+function main() {
+    const resultFile = process.argv[2];
+    const dataFile = process.argv[3];
+    if (!resultFile || !dataFile) {
+        console.error('Error: Result file and data file required');
+        process.exit(1);
+    }
+    let data;
+    try {
+        const parsed = JSON.parse(fs.readFileSync(dataFile, 'utf-8'));
+        data = {
+            title: parsed.title || 'Pull Request',
+            message: parsed.message || '',
+            defaultValue: parsed.defaultValue || '',
+            repoPath: parsed.repoPath || process.cwd(),
+            sourceBranch: parsed.sourceBranch || 'HEAD',
+            targetBranch: parsed.targetBranch || 'main',
+            files: Array.isArray(parsed.files)
+                ? parsed.files.filter((f) => typeof f === 'string')
+                : [],
+            aiFailed: parsed.aiFailed === true,
+        };
+    }
+    catch {
+        console.error('Error: Failed to read or parse pr review popup data');
+        process.exit(1);
+    }
+    render(React.createElement(PRReviewPopupApp, { resultFile: resultFile, data: data }));
+}
+main();
+//# sourceMappingURL=prReviewPopup.js.map

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

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

package/dist/components/popups/reopenWorktreePopup.js

@@ -369,7 +369,7 @@ function main() {
     render(React.createElement(ReopenWorktreePopupApp, { resultFile: resultFile, projectName: data.projectName, worktrees: data.worktrees, initialState: data.initialState ?? {
             includeWorktrees: true,
             includeLocalBranches: true,
-            includeRemoteBranches: false,
+            includeRemoteBranches: true,
             remoteLoaded: false,
             filterQuery: '',
         }, projectRoot: data.projectRoot, activePaneSlugs: data.activePaneSlugs }));

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

@@ -1 +1 @@
-{"version":3,"file":"reopenWorktreePopup.js","sourceRoot":"","sources":["../../../src/components/popups/reopenWorktreePopup.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"reopenWorktreePopup.js","sourceRoot":"","sources":["../../../src/components/popups/reopenWorktreePopup.tsx"],"names":[],"mappings":"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"}

package/dist/components/popups/settingsPopup.js

@@ -7,13 +7,24 @@ import React, { useEffect, useRef, useState } from 'react';
 import { render, Box, Text, useInput, useApp } from 'ink';
 import TextInput from 'ink-text-input';
 import { readFileSync } from 'fs';
-import { SettingsManager } from '../../utils/settingsManager.js';
+import { DEFAULT_COLOR_THEME_SETTING_KEY, SettingsManager, } from '../../utils/settingsManager.js';
 import { enforceControlPaneSize } from '../../utils/tmux.js';
 import { SIDEBAR_WIDTH } from '../../utils/layoutManager.js';
 import { resolveEnabledAgentsSelection } from '../../utils/agentLaunch.js';
 import { resolveNotificationSoundsSelection } from '../../utils/notificationSounds.js';
+import { SIDEBAR_PROJECT_COLOR_THEME_SETTING_KEY } from '../../utils/sidebarProjects.js';
 import { POPUP_CONFIG } from './config.js';
 import { PopupWrapper, writeSuccessAndExit, writeCancelAndExit, } from './shared/index.js';
+const THEME_PREVIEW_COLORS = {
+    red: '#ff5f5f',
+    blue: '#5f87ff',
+    yellow: '#ffd75f',
+    orange: '#ff8700',
+    green: '#5fd75f',
+    purple: '#af87ff',
+    cyan: '#5fd7d7',
+    magenta: '#ff5fd7',
+};
 const SettingsPopupApp = ({ resultFile, settingDefinitions, settings, globalSettings, projectSettings, projectRoot, controlPaneId, selectedIndex: initialSelectedIndex = 0, }) => {
     const [mode, setMode] = useState('list');
     const [selectedIndex, setSelectedIndex] = useState(initialSelectedIndex);
@@ -33,6 +44,27 @@ const SettingsPopupApp = ({ resultFile, settingDefinitions, settings, globalSett
     const { exit } = useApp();
     const currentDef = editingKey ? settingDefinitions.find(d => d.key === editingKey) : null;
     const isTextEditing = mode === 'edit' && currentDef?.type === 'text';
+    const getDirectSaveScope = (definition) => {
+        if (!definition) {
+            return null;
+        }
+        if (definition.scopeBehavior === 'global'
+            || definition.scopeBehavior === 'project'
+            || definition.scopeBehavior === 'session') {
+            return definition.scopeBehavior;
+        }
+        return null;
+    };
+    const getOptionColor = (definition, optionValue, isSelected) => {
+        if (!isSelected) {
+            return 'white';
+        }
+        if (definition.key === DEFAULT_COLOR_THEME_SETTING_KEY
+            || definition.key === SIDEBAR_PROJECT_COLOR_THEME_SETTING_KEY) {
+            return THEME_PREVIEW_COLORS[optionValue] || POPUP_CONFIG.titleColor;
+        }
+        return POPUP_CONFIG.titleColor;
+    };
     const getNumberBounds = (definition) => {
         let min = definition.min ?? Number.MIN_SAFE_INTEGER;
         let max = definition.max ?? Number.MAX_SAFE_INTEGER;
@@ -264,6 +296,9 @@ const SettingsPopupApp = ({ resultFile, settingDefinitions, settings, globalSett
         }
         return null;
     };
+    const getCurrentSettingValue = (key) => {
+        return currentSettings[key];
+    };
     useInput((input, key) => {
         // When editing a text field, only handle escape — let TextInput handle everything else
         if (isTextEditing && !key.escape)
@@ -369,7 +404,7 @@ const SettingsPopupApp = ({ resultFile, settingDefinitions, settings, globalSett
                     widthEditBaselineRef.current = null;
                 }
                 // Set initial value based on current setting
-                const currentValue = currentSettings[currentDef.key];
+                const currentValue = getCurrentSettingValue(currentDef.key);
                 if (currentDef.type === 'boolean') {
                     setEditingValueIndex(currentValue ? 0 : 1);
                 }
@@ -405,6 +440,28 @@ const SettingsPopupApp = ({ resultFile, settingDefinitions, settings, globalSett
                     })();
                     return;
                 }
+                const directSaveScope = getDirectSaveScope(currentDef);
+                if (currentDef && directSaveScope) {
+                    let newValue = '';
+                    if (currentDef.type === 'boolean') {
+                        newValue = editingValueIndex === 0;
+                    }
+                    else if (currentDef.type === 'select' && currentDef.options) {
+                        newValue = currentDef.options[editingValueIndex]?.value ?? '';
+                    }
+                    else if (currentDef.type === 'text') {
+                        newValue = textValue;
+                    }
+                    else if (currentDef.type === 'number') {
+                        newValue = numberValue;
+                    }
+                    writeSuccessWithPendingAndExit({
+                        key: currentDef.key,
+                        value: newValue,
+                        scope: directSaveScope,
+                    });
+                    return;
+                }
                 // Go to scope selection for regular settings
                 setMode('scope');
                 setScopeIndex(0);
@@ -455,7 +512,7 @@ const SettingsPopupApp = ({ resultFile, settingDefinitions, settings, globalSett
                                 actionSummary ? `${actionSummary} • ` : '',
                                 "press Enter)")));
                     }
-                    const currentValue = currentSettings[def.key];
+                    const currentValue = getCurrentSettingValue(def.key);
                     const isProjectOverride = def.key in currentProjectSettings;
                     const isGlobalSetting = def.key in currentGlobalSettings;
                     let displayValue;
@@ -475,7 +532,14 @@ const SettingsPopupApp = ({ resultFile, settingDefinitions, settings, globalSett
                         else {
                             displayValue = String(currentValue) || 'none';
                         }
-                        if (def.key === 'minPaneWidth' || def.key === 'maxPaneWidth') {
+                        const directSaveScope = getDirectSaveScope(def);
+                        if (def.key === SIDEBAR_PROJECT_COLOR_THEME_SETTING_KEY) {
+                            scopeLabel = '';
+                        }
+                        else if (directSaveScope) {
+                            scopeLabel = ` - ${directSaveScope}`;
+                        }
+                        else if (def.key === 'minPaneWidth' || def.key === 'maxPaneWidth') {
                             scopeLabel = ' - global';
                         }
                         else {
@@ -510,7 +574,7 @@ const SettingsPopupApp = ({ resultFile, settingDefinitions, settings, globalSett
                             editingValueIndex === 1 ? '▶ ' : '  ',
                             "Disable")))),
                 currentDef.type === 'select' && currentDef.options && (React.createElement(React.Fragment, null, currentDef.options.map((option, index) => (React.createElement(Box, { key: option.value },
-                    React.createElement(Text, { color: editingValueIndex === index ? POPUP_CONFIG.titleColor : 'white', bold: editingValueIndex === index },
+                    React.createElement(Text, { color: getOptionColor(currentDef, option.value, editingValueIndex === index), bold: editingValueIndex === index },
                         editingValueIndex === index ? '▶ ' : '  ',
                         option.label)))))),
                 currentDef.type === 'text' && (React.createElement(Box, null,
@@ -524,7 +588,9 @@ const SettingsPopupApp = ({ resultFile, settingDefinitions, settings, globalSett
                         ? 'Type value • Enter scope • ESC back'
                         : currentDef.type === 'number'
                             ? '←→ adjust • Shift+←→ ±10 • Enter apply • ESC back'
-                            : '↑↓ choose • Enter scope • ESC back')))),
+                            : getDirectSaveScope(currentDef)
+                                ? '↑↓ choose • Enter apply • ESC back'
+                                : '↑↓ choose • Enter scope • ESC back')))),
             mode === 'scope' && currentDef && (React.createElement(React.Fragment, null,
                 React.createElement(Box, { marginBottom: 1 },
                     React.createElement(Text, { bold: true },