dmux 3.1.1 → 3.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/CleanTextInput.d.ts +9 -0
- package/dist/CleanTextInput.d.ts.map +1 -1
- package/dist/CleanTextInput.js +127 -47
- package/dist/CleanTextInput.js.map +1 -1
- package/dist/DmuxApp.d.ts +2 -2
- package/dist/DmuxApp.d.ts.map +1 -1
- package/dist/DmuxApp.js +1396 -750
- package/dist/DmuxApp.js.map +1 -1
- package/dist/actions/paneActions.d.ts.map +1 -1
- package/dist/actions/paneActions.js +68 -11
- package/dist/actions/paneActions.js.map +1 -1
- package/dist/actions/types.d.ts +1 -0
- package/dist/actions/types.d.ts.map +1 -1
- package/dist/actions/types.js +1 -0
- package/dist/actions/types.js.map +1 -1
- package/dist/components/ActionInputDialog.d.ts.map +1 -1
- package/dist/components/ActionInputDialog.js +3 -2
- package/dist/components/ActionInputDialog.js.map +1 -1
- package/dist/components/DialogBox.d.ts +16 -0
- package/dist/components/DialogBox.d.ts.map +1 -0
- package/dist/components/DialogBox.js +12 -0
- package/dist/components/DialogBox.js.map +1 -0
- package/dist/components/FooterHelp.d.ts +9 -0
- package/dist/components/FooterHelp.d.ts.map +1 -1
- package/dist/components/FooterHelp.js +41 -5
- package/dist/components/FooterHelp.js.map +1 -1
- package/dist/components/PaneCard.d.ts +3 -1
- package/dist/components/PaneCard.d.ts.map +1 -1
- package/dist/components/PaneCard.js +50 -33
- package/dist/components/PaneCard.js.map +1 -1
- package/dist/components/PanesGrid.d.ts +3 -5
- package/dist/components/PanesGrid.d.ts.map +1 -1
- package/dist/components/PanesGrid.js +40 -10
- package/dist/components/PanesGrid.js.map +1 -1
- package/dist/dashboard.js +1 -1
- package/dist/decorative-pane.d.ts +3 -0
- package/dist/decorative-pane.d.ts.map +1 -0
- package/dist/decorative-pane.js +136 -0
- package/dist/decorative-pane.js.map +1 -0
- package/dist/hooks/useActionSystem.d.ts +14 -1
- package/dist/hooks/useActionSystem.d.ts.map +1 -1
- package/dist/hooks/useActionSystem.js +93 -4
- package/dist/hooks/useActionSystem.js.map +1 -1
- package/dist/hooks/useNavigation.js +1 -1
- package/dist/hooks/useNavigation.js.map +1 -1
- package/dist/hooks/usePaneCreation.d.ts +1 -2
- package/dist/hooks/usePaneCreation.d.ts.map +1 -1
- package/dist/hooks/usePaneCreation.js +13 -27
- package/dist/hooks/usePaneCreation.js.map +1 -1
- package/dist/hooks/usePaneRunner.d.ts.map +1 -1
- package/dist/hooks/usePaneRunner.js +8 -3
- package/dist/hooks/usePaneRunner.js.map +1 -1
- package/dist/hooks/usePanes.d.ts.map +1 -1
- package/dist/hooks/usePanes.js +210 -37
- package/dist/hooks/usePanes.js.map +1 -1
- package/dist/hooks/useWorktreeActions.d.ts.map +1 -1
- package/dist/hooks/useWorktreeActions.js +7 -13
- package/dist/hooks/useWorktreeActions.js.map +1 -1
- package/dist/index.js +217 -29
- package/dist/index.js.map +1 -1
- package/dist/popups/agentChoicePopup.d.ts +7 -0
- package/dist/popups/agentChoicePopup.d.ts.map +1 -0
- package/dist/popups/agentChoicePopup.js +74 -0
- package/dist/popups/agentChoicePopup.js.map +1 -0
- package/dist/popups/choicePopup.d.ts +7 -0
- package/dist/popups/choicePopup.d.ts.map +1 -0
- package/dist/popups/choicePopup.js +64 -0
- package/dist/popups/choicePopup.js.map +1 -0
- package/dist/popups/components/FileList.d.ts +13 -0
- package/dist/popups/components/FileList.d.ts.map +1 -0
- package/dist/popups/components/FileList.js +61 -0
- package/dist/popups/components/FileList.js.map +1 -0
- package/dist/popups/components/PopupContainer.d.ts +14 -0
- package/dist/popups/components/PopupContainer.d.ts.map +1 -0
- package/dist/popups/components/PopupContainer.js +15 -0
- package/dist/popups/components/PopupContainer.js.map +1 -0
- package/dist/popups/components/PopupInputBox.d.ts +11 -0
- package/dist/popups/components/PopupInputBox.d.ts.map +1 -0
- package/dist/popups/components/PopupInputBox.js +10 -0
- package/dist/popups/components/PopupInputBox.js.map +1 -0
- package/dist/popups/components/PopupWrapper.d.ts +37 -0
- package/dist/popups/components/PopupWrapper.d.ts.map +1 -0
- package/dist/popups/components/PopupWrapper.js +88 -0
- package/dist/popups/components/PopupWrapper.js.map +1 -0
- package/dist/popups/components/index.d.ts +8 -0
- package/dist/popups/components/index.d.ts.map +1 -0
- package/dist/popups/components/index.js +8 -0
- package/dist/popups/components/index.js.map +1 -0
- package/dist/popups/config.d.ts +40 -0
- package/dist/popups/config.d.ts.map +1 -0
- package/dist/popups/config.js +40 -0
- package/dist/popups/config.js.map +1 -0
- package/dist/popups/confirmPopup.d.ts +7 -0
- package/dist/popups/confirmPopup.d.ts.map +1 -0
- package/dist/popups/confirmPopup.js +72 -0
- package/dist/popups/confirmPopup.js.map +1 -0
- package/dist/popups/hooksPopup.d.ts +7 -0
- package/dist/popups/hooksPopup.d.ts.map +1 -0
- package/dist/popups/hooksPopup.js +71 -0
- package/dist/popups/hooksPopup.js.map +1 -0
- package/dist/popups/inputPopup.d.ts +7 -0
- package/dist/popups/inputPopup.d.ts.map +1 -0
- package/dist/popups/inputPopup.js +48 -0
- package/dist/popups/inputPopup.js.map +1 -0
- package/dist/popups/kebabMenuPopup.d.ts +7 -0
- package/dist/popups/kebabMenuPopup.d.ts.map +1 -0
- package/dist/popups/kebabMenuPopup.js +52 -0
- package/dist/popups/kebabMenuPopup.js.map +1 -0
- package/dist/popups/logsPopup.d.ts +12 -0
- package/dist/popups/logsPopup.d.ts.map +1 -0
- package/dist/popups/logsPopup.js +364 -0
- package/dist/popups/logsPopup.js.map +1 -0
- package/dist/popups/mergePopup.d.ts +7 -0
- package/dist/popups/mergePopup.d.ts.map +1 -0
- package/dist/popups/mergePopup.js +310 -0
- package/dist/popups/mergePopup.js.map +1 -0
- package/dist/popups/newPanePopup.d.ts +7 -0
- package/dist/popups/newPanePopup.d.ts.map +1 -0
- package/dist/popups/newPanePopup.js +234 -0
- package/dist/popups/newPanePopup.js.map +1 -0
- package/dist/popups/progressPopup.d.ts +8 -0
- package/dist/popups/progressPopup.d.ts.map +1 -0
- package/dist/popups/progressPopup.js +54 -0
- package/dist/popups/progressPopup.js.map +1 -0
- package/dist/popups/remotePopup.d.ts +6 -0
- package/dist/popups/remotePopup.d.ts.map +1 -0
- package/dist/popups/remotePopup.js +166 -0
- package/dist/popups/remotePopup.js.map +1 -0
- package/dist/popups/settingsPopup.d.ts +7 -0
- package/dist/popups/settingsPopup.d.ts.map +1 -0
- package/dist/popups/settingsPopup.js +212 -0
- package/dist/popups/settingsPopup.js.map +1 -0
- package/dist/popups/shortcutsPopup.d.ts +6 -0
- package/dist/popups/shortcutsPopup.d.ts.map +1 -0
- package/dist/popups/shortcutsPopup.js +74 -0
- package/dist/popups/shortcutsPopup.js.map +1 -0
- package/dist/popups/templates/SimpleInputPopup.d.ts +15 -0
- package/dist/popups/templates/SimpleInputPopup.d.ts.map +1 -0
- package/dist/popups/templates/SimpleInputPopup.js +28 -0
- package/dist/popups/templates/SimpleInputPopup.js.map +1 -0
- package/dist/server/embedded-assets.d.ts.map +1 -1
- package/dist/server/embedded-assets.js +2066 -968
- package/dist/server/embedded-assets.js.map +1 -1
- package/dist/server/index.js +1 -1
- package/dist/server/index.js.map +1 -1
- package/dist/server/routes.d.ts +1 -1
- package/dist/server/routes.d.ts.map +1 -1
- package/dist/server/routes.js +73 -6
- package/dist/server/routes.js.map +1 -1
- package/dist/services/ConfigWatcher.d.ts.map +1 -1
- package/dist/services/ConfigWatcher.js +10 -3
- package/dist/services/ConfigWatcher.js.map +1 -1
- package/dist/services/LogService.d.ts +112 -0
- package/dist/services/LogService.d.ts.map +1 -0
- package/dist/services/LogService.js +252 -0
- package/dist/services/LogService.js.map +1 -0
- package/dist/services/PaneWorkerManager.d.ts.map +1 -1
- package/dist/services/PaneWorkerManager.js +35 -9
- package/dist/services/PaneWorkerManager.js.map +1 -1
- package/dist/services/TunnelService.d.ts +1 -0
- package/dist/services/TunnelService.d.ts.map +1 -1
- package/dist/services/TunnelService.js +56 -15
- package/dist/services/TunnelService.js.map +1 -1
- package/dist/shared/StateManager.d.ts +49 -1
- package/dist/shared/StateManager.d.ts.map +1 -1
- package/dist/shared/StateManager.js +97 -2
- package/dist/shared/StateManager.js.map +1 -1
- package/dist/spacer-pane.d.ts +8 -0
- package/dist/spacer-pane.d.ts.map +1 -0
- package/dist/spacer-pane.js +40 -0
- package/dist/spacer-pane.js.map +1 -0
- package/dist/theme/colors.d.ts +25 -0
- package/dist/theme/colors.d.ts.map +1 -0
- package/dist/theme/colors.js +33 -0
- package/dist/theme/colors.js.map +1 -0
- package/dist/types.d.ts +14 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/asciiArt.d.ts +26 -0
- package/dist/utils/asciiArt.d.ts.map +1 -0
- package/dist/utils/asciiArt.js +88 -0
- package/dist/utils/asciiArt.js.map +1 -0
- package/dist/utils/conflictResolutionPane.d.ts.map +1 -1
- package/dist/utils/conflictResolutionPane.js +8 -4
- package/dist/utils/conflictResolutionPane.js.map +1 -1
- package/dist/utils/fileScanner.d.ts +23 -0
- package/dist/utils/fileScanner.d.ts.map +1 -0
- package/dist/utils/fileScanner.js +123 -0
- package/dist/utils/fileScanner.js.map +1 -0
- package/dist/utils/generated-agents-doc.d.ts +1 -1
- package/dist/utils/generated-agents-doc.js +1 -1
- package/dist/utils/hooks.d.ts.map +1 -1
- package/dist/utils/hooks.js +65 -36
- package/dist/utils/hooks.js.map +1 -1
- package/dist/utils/hooksDocs.d.ts +1 -1
- package/dist/utils/layoutManager.d.ts +45 -0
- package/dist/utils/layoutManager.d.ts.map +1 -0
- package/dist/utils/layoutManager.js +500 -0
- package/dist/utils/layoutManager.js.map +1 -0
- package/dist/utils/paneCreation.d.ts.map +1 -1
- package/dist/utils/paneCreation.js +125 -11
- package/dist/utils/paneCreation.js.map +1 -1
- package/dist/utils/popup.d.ts +97 -0
- package/dist/utils/popup.d.ts.map +1 -0
- package/dist/utils/popup.js +509 -0
- package/dist/utils/popup.js.map +1 -0
- package/dist/utils/postPaneCleanup.d.ts +12 -0
- package/dist/utils/postPaneCleanup.d.ts.map +1 -0
- package/dist/utils/postPaneCleanup.js +53 -0
- package/dist/utils/postPaneCleanup.js.map +1 -0
- package/dist/utils/shellPaneDetection.d.ts +44 -0
- package/dist/utils/shellPaneDetection.d.ts.map +1 -0
- package/dist/utils/shellPaneDetection.js +175 -0
- package/dist/utils/shellPaneDetection.js.map +1 -0
- package/dist/utils/tmux.d.ts +53 -1
- package/dist/utils/tmux.d.ts.map +1 -1
- package/dist/utils/tmux.js +352 -84
- package/dist/utils/tmux.js.map +1 -1
- package/dist/utils/welcomePane.d.ts +22 -0
- package/dist/utils/welcomePane.d.ts.map +1 -0
- package/dist/utils/welcomePane.js +119 -0
- package/dist/utils/welcomePane.js.map +1 -0
- package/dist/utils/welcomePaneManager.d.ts +36 -0
- package/dist/utils/welcomePaneManager.d.ts.map +1 -0
- package/dist/utils/welcomePaneManager.js +160 -0
- package/dist/utils/welcomePaneManager.js.map +1 -0
- package/dist/workers/PaneWorker.js +2 -0
- package/dist/workers/PaneWorker.js.map +1 -1
- package/package.json +5 -2
- package/dist/components/NewPaneDialog.d.ts +0 -9
- package/dist/components/NewPaneDialog.d.ts.map +0 -1
- package/dist/components/NewPaneDialog.js +0 -11
- package/dist/components/NewPaneDialog.js.map +0 -1
|
@@ -0,0 +1,310 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
/**
|
|
3
|
+
* Standalone popup for merge workflow
|
|
4
|
+
* Runs in a tmux popup modal and handles the entire merge process
|
|
5
|
+
*/
|
|
6
|
+
import React, { useState, useEffect } from 'react';
|
|
7
|
+
import { render, Box, Text, useInput, useApp } from 'ink';
|
|
8
|
+
import TextInput from 'ink-text-input';
|
|
9
|
+
import * as fs from 'fs';
|
|
10
|
+
import { POPUP_CONFIG } from './config.js';
|
|
11
|
+
import { PopupWrapper, writeSuccessAndExit, writeCancelAndExit, writeErrorAndExit } from './components/index.js';
|
|
12
|
+
const MergePopupApp = ({ resultFile, paneSlug, worktreePath, mainRepoPath, mainBranch, }) => {
|
|
13
|
+
const [step, setStep] = useState('validating');
|
|
14
|
+
const [validation, setValidation] = useState(null);
|
|
15
|
+
const [selectedIndex, setSelectedIndex] = useState(0);
|
|
16
|
+
const [commitMessage, setCommitMessage] = useState('');
|
|
17
|
+
const [generatedMessage, setGeneratedMessage] = useState('');
|
|
18
|
+
const [errorMessage, setErrorMessage] = useState('');
|
|
19
|
+
const [statusMessage, setStatusMessage] = useState('Validating merge...');
|
|
20
|
+
const [targetRepo, setTargetRepo] = useState(''); // Track which repo we're committing to
|
|
21
|
+
const { exit } = useApp();
|
|
22
|
+
// Validation on mount
|
|
23
|
+
useEffect(() => {
|
|
24
|
+
(async () => {
|
|
25
|
+
try {
|
|
26
|
+
// Import and run validation
|
|
27
|
+
const { validateMerge } = await import('../utils/mergeValidation.js');
|
|
28
|
+
const result = validateMerge(mainRepoPath, worktreePath, paneSlug);
|
|
29
|
+
setValidation(result);
|
|
30
|
+
if (!result.canMerge) {
|
|
31
|
+
// Check issue types
|
|
32
|
+
const mainDirty = result.issues.find((i) => i.type === 'main_dirty');
|
|
33
|
+
const worktreeUncommitted = result.issues.find((i) => i.type === 'worktree_uncommitted');
|
|
34
|
+
const nothingToMerge = result.issues.find((i) => i.type === 'nothing_to_merge');
|
|
35
|
+
if (nothingToMerge) {
|
|
36
|
+
setStep('error');
|
|
37
|
+
setErrorMessage('No new commits to merge');
|
|
38
|
+
}
|
|
39
|
+
else if (mainDirty) {
|
|
40
|
+
setStep('main_dirty');
|
|
41
|
+
setStatusMessage('Main branch has uncommitted changes');
|
|
42
|
+
}
|
|
43
|
+
else if (worktreeUncommitted) {
|
|
44
|
+
setStep('worktree_uncommitted');
|
|
45
|
+
setStatusMessage('Worktree has uncommitted changes');
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
setStep('error');
|
|
49
|
+
setErrorMessage(result.issues.map((i) => i.message).join('\n'));
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
setStep('confirm');
|
|
54
|
+
setStatusMessage(`Ready to merge "${paneSlug}" into ${result.mainBranch}`);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
catch (error) {
|
|
58
|
+
setStep('error');
|
|
59
|
+
setErrorMessage(`Validation failed: ${error}`);
|
|
60
|
+
}
|
|
61
|
+
})();
|
|
62
|
+
}, []);
|
|
63
|
+
// Handle AI commit message generation
|
|
64
|
+
const generateCommitMessage = async (repoPath) => {
|
|
65
|
+
setStep('generating_commit');
|
|
66
|
+
setStatusMessage('Generating commit message with AI...');
|
|
67
|
+
try {
|
|
68
|
+
const { generateCommitMessage } = await import('../utils/aiMerge.js');
|
|
69
|
+
const message = await generateCommitMessage(repoPath);
|
|
70
|
+
if (message) {
|
|
71
|
+
setGeneratedMessage(message);
|
|
72
|
+
setCommitMessage(message);
|
|
73
|
+
setStep('commit_input');
|
|
74
|
+
setStatusMessage('Review and edit commit message:');
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
// AI generation failed, go straight to manual input
|
|
78
|
+
setStep('commit_input');
|
|
79
|
+
setStatusMessage('Enter commit message (AI generation unavailable):');
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
catch (error) {
|
|
83
|
+
setStep('commit_input');
|
|
84
|
+
setStatusMessage('Enter commit message (AI generation failed):');
|
|
85
|
+
}
|
|
86
|
+
};
|
|
87
|
+
// Execute merge
|
|
88
|
+
const executeMerge = async () => {
|
|
89
|
+
setStep('merging');
|
|
90
|
+
setStatusMessage('Merging worktree into main...');
|
|
91
|
+
try {
|
|
92
|
+
const { mergeWorktreeIntoMain } = await import('../utils/mergeExecution.js');
|
|
93
|
+
const result = mergeWorktreeIntoMain(mainRepoPath, paneSlug);
|
|
94
|
+
if (!result.success) {
|
|
95
|
+
setStep('error');
|
|
96
|
+
setErrorMessage(`Merge failed: ${result.error}`);
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
99
|
+
// Merge successful
|
|
100
|
+
setStep('cleanup_confirm');
|
|
101
|
+
setStatusMessage('Merge complete! Close pane and cleanup?');
|
|
102
|
+
}
|
|
103
|
+
catch (error) {
|
|
104
|
+
setStep('error');
|
|
105
|
+
setErrorMessage(`Merge execution failed: ${error}`);
|
|
106
|
+
}
|
|
107
|
+
};
|
|
108
|
+
// Commit changes
|
|
109
|
+
const commitChanges = async (repoPath, message) => {
|
|
110
|
+
try {
|
|
111
|
+
const { stageAllChanges, commitChanges: doCommit } = await import('../utils/mergeValidation.js');
|
|
112
|
+
const stageResult = stageAllChanges(repoPath);
|
|
113
|
+
if (!stageResult.success) {
|
|
114
|
+
setStep('error');
|
|
115
|
+
setErrorMessage(`Failed to stage changes: ${stageResult.error}`);
|
|
116
|
+
return false;
|
|
117
|
+
}
|
|
118
|
+
const commitResult = doCommit(repoPath, message);
|
|
119
|
+
if (!commitResult.success) {
|
|
120
|
+
setStep('error');
|
|
121
|
+
setErrorMessage(`Commit failed: ${commitResult.error}`);
|
|
122
|
+
return false;
|
|
123
|
+
}
|
|
124
|
+
return true;
|
|
125
|
+
}
|
|
126
|
+
catch (error) {
|
|
127
|
+
setStep('error');
|
|
128
|
+
setErrorMessage(`Commit failed: ${error}`);
|
|
129
|
+
return false;
|
|
130
|
+
}
|
|
131
|
+
};
|
|
132
|
+
useInput((input, key) => {
|
|
133
|
+
if (key.escape && step !== 'merging' && step !== 'generating_commit') {
|
|
134
|
+
// User cancelled
|
|
135
|
+
writeCancelAndExit(resultFile, exit);
|
|
136
|
+
return;
|
|
137
|
+
}
|
|
138
|
+
// Step-specific handling
|
|
139
|
+
if (step === 'confirm') {
|
|
140
|
+
if (input === 'y' || input === 'Y' || key.return) {
|
|
141
|
+
executeMerge();
|
|
142
|
+
}
|
|
143
|
+
else if (input === 'n' || input === 'N') {
|
|
144
|
+
writeCancelAndExit(resultFile, exit);
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
else if (step === 'main_dirty' || step === 'worktree_uncommitted') {
|
|
148
|
+
const options = ['AI commit (auto)', 'AI commit (editable)', 'Manual commit', 'Cancel'];
|
|
149
|
+
if (key.upArrow) {
|
|
150
|
+
setSelectedIndex(Math.max(0, selectedIndex - 1));
|
|
151
|
+
}
|
|
152
|
+
else if (key.downArrow) {
|
|
153
|
+
setSelectedIndex(Math.min(options.length - 1, selectedIndex + 1));
|
|
154
|
+
}
|
|
155
|
+
else if (key.return) {
|
|
156
|
+
const repoPath = step === 'main_dirty' ? mainRepoPath : worktreePath;
|
|
157
|
+
setTargetRepo(repoPath);
|
|
158
|
+
switch (selectedIndex) {
|
|
159
|
+
case 0: // AI commit (auto)
|
|
160
|
+
(async () => {
|
|
161
|
+
await generateCommitMessage(repoPath);
|
|
162
|
+
if (commitMessage) {
|
|
163
|
+
if (await commitChanges(repoPath, commitMessage)) {
|
|
164
|
+
// Re-validate and proceed
|
|
165
|
+
setStep('validating');
|
|
166
|
+
setStatusMessage('Revalidating...');
|
|
167
|
+
// Trigger re-validation (simplified - would need proper re-run)
|
|
168
|
+
setTimeout(() => {
|
|
169
|
+
setStep('confirm');
|
|
170
|
+
setStatusMessage('Ready to merge');
|
|
171
|
+
}, 500);
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
})();
|
|
175
|
+
break;
|
|
176
|
+
case 1: // AI commit (editable)
|
|
177
|
+
generateCommitMessage(repoPath);
|
|
178
|
+
break;
|
|
179
|
+
case 2: // Manual commit
|
|
180
|
+
setStep('commit_input');
|
|
181
|
+
setStatusMessage('Enter commit message:');
|
|
182
|
+
break;
|
|
183
|
+
case 3: // Cancel
|
|
184
|
+
writeCancelAndExit(resultFile, exit);
|
|
185
|
+
break;
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
else if (step === 'cleanup_confirm') {
|
|
190
|
+
if (input === 'y' || input === 'Y' || key.return) {
|
|
191
|
+
// Cleanup and close
|
|
192
|
+
(async () => {
|
|
193
|
+
try {
|
|
194
|
+
const { cleanupAfterMerge } = await import('../utils/mergeExecution.js');
|
|
195
|
+
cleanupAfterMerge(mainRepoPath, worktreePath, paneSlug);
|
|
196
|
+
writeSuccessAndExit(resultFile, { merged: true, closedPane: true }, exit);
|
|
197
|
+
}
|
|
198
|
+
catch (error) {
|
|
199
|
+
setStep('error');
|
|
200
|
+
setErrorMessage(`Cleanup failed: ${error}`);
|
|
201
|
+
}
|
|
202
|
+
})();
|
|
203
|
+
}
|
|
204
|
+
else if (input === 'n' || input === 'N') {
|
|
205
|
+
// Just mark as merged, don't close
|
|
206
|
+
writeSuccessAndExit(resultFile, { merged: true, closedPane: false }, exit);
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
else if (step === 'error') {
|
|
210
|
+
// Any key exits on error
|
|
211
|
+
writeErrorAndExit(resultFile, errorMessage, exit);
|
|
212
|
+
}
|
|
213
|
+
});
|
|
214
|
+
return (React.createElement(PopupWrapper, { resultFile: resultFile, allowEscapeToCancel: false },
|
|
215
|
+
React.createElement(Box, { flexDirection: "column", paddingX: 2, paddingY: 1 },
|
|
216
|
+
React.createElement(Box, { marginBottom: 1 },
|
|
217
|
+
React.createElement(Text, { bold: true, color: POPUP_CONFIG.titleColor },
|
|
218
|
+
"\uD83D\uDD00 Merge: ",
|
|
219
|
+
paneSlug,
|
|
220
|
+
" \u2192 ",
|
|
221
|
+
mainBranch)),
|
|
222
|
+
React.createElement(Box, { marginBottom: 1 },
|
|
223
|
+
React.createElement(Text, null, statusMessage)),
|
|
224
|
+
step === 'validating' && (React.createElement(Box, null,
|
|
225
|
+
React.createElement(Text, { dimColor: true }, "Checking repository status..."))),
|
|
226
|
+
step === 'confirm' && (React.createElement(Box, { flexDirection: "column" },
|
|
227
|
+
React.createElement(Box, { marginBottom: 1 },
|
|
228
|
+
React.createElement(Text, null, "Proceed with merge?")),
|
|
229
|
+
React.createElement(Box, null,
|
|
230
|
+
React.createElement(Text, { dimColor: true }, "Y to confirm \u2022 N to cancel \u2022 ESC to exit")))),
|
|
231
|
+
(step === 'main_dirty' || step === 'worktree_uncommitted') && (React.createElement(Box, { flexDirection: "column" },
|
|
232
|
+
validation?.issues
|
|
233
|
+
.filter(i => i.type === step)
|
|
234
|
+
.map((issue, idx) => (React.createElement(Box, { key: idx, marginBottom: 1, flexDirection: "column" },
|
|
235
|
+
React.createElement(Text, null, issue.message),
|
|
236
|
+
issue.files && issue.files.length > 0 && (React.createElement(Box, { marginLeft: 2, flexDirection: "column" },
|
|
237
|
+
issue.files.slice(0, 5).map((file, i) => (React.createElement(Text, { key: i, dimColor: true },
|
|
238
|
+
"\u2022 ",
|
|
239
|
+
file))),
|
|
240
|
+
issue.files.length > 5 && (React.createElement(Text, { dimColor: true },
|
|
241
|
+
"... and ",
|
|
242
|
+
issue.files.length - 5,
|
|
243
|
+
" more"))))))),
|
|
244
|
+
React.createElement(Box, { flexDirection: "column", marginTop: 1, marginBottom: 1 }, ['AI commit (auto)', 'AI commit (editable)', 'Manual commit', 'Cancel'].map((option, idx) => (React.createElement(Box, { key: idx },
|
|
245
|
+
React.createElement(Text, { color: selectedIndex === idx ? POPUP_CONFIG.titleColor : 'white', bold: selectedIndex === idx },
|
|
246
|
+
selectedIndex === idx ? '▶ ' : ' ',
|
|
247
|
+
option))))),
|
|
248
|
+
React.createElement(Box, null,
|
|
249
|
+
React.createElement(Text, { dimColor: true }, "\u2191\u2193 to navigate \u2022 Enter to select \u2022 ESC to cancel")))),
|
|
250
|
+
step === 'generating_commit' && (React.createElement(Box, null,
|
|
251
|
+
React.createElement(Text, { dimColor: true }, "\u23F3 Generating commit message with AI..."))),
|
|
252
|
+
step === 'commit_input' && (React.createElement(Box, { flexDirection: "column" },
|
|
253
|
+
generatedMessage && (React.createElement(Box, { marginBottom: 1 },
|
|
254
|
+
React.createElement(Text, { dimColor: true },
|
|
255
|
+
"Generated: ",
|
|
256
|
+
generatedMessage.split('\n')[0]))),
|
|
257
|
+
React.createElement(Box, null,
|
|
258
|
+
React.createElement(Text, null, "Message: "),
|
|
259
|
+
React.createElement(TextInput, { value: commitMessage, onChange: setCommitMessage, onSubmit: async (value) => {
|
|
260
|
+
if (value.trim()) {
|
|
261
|
+
if (await commitChanges(targetRepo, value)) {
|
|
262
|
+
// Re-validate
|
|
263
|
+
setStep('validating');
|
|
264
|
+
setTimeout(() => {
|
|
265
|
+
setStep('confirm');
|
|
266
|
+
setStatusMessage('Ready to merge');
|
|
267
|
+
}, 500);
|
|
268
|
+
}
|
|
269
|
+
}
|
|
270
|
+
} })),
|
|
271
|
+
React.createElement(Box, { marginTop: 1 },
|
|
272
|
+
React.createElement(Text, { dimColor: true }, "Enter to submit \u2022 ESC to cancel")))),
|
|
273
|
+
step === 'merging' && (React.createElement(Box, null,
|
|
274
|
+
React.createElement(Text, { dimColor: true }, "\u23F3 Merging branches..."))),
|
|
275
|
+
step === 'cleanup_confirm' && (React.createElement(Box, { flexDirection: "column" },
|
|
276
|
+
React.createElement(Box, { marginBottom: 1 },
|
|
277
|
+
React.createElement(Text, { color: POPUP_CONFIG.successColor }, "\u2713 Merge successful!")),
|
|
278
|
+
React.createElement(Box, { marginBottom: 1 },
|
|
279
|
+
React.createElement(Text, null, "Close pane and cleanup worktree?")),
|
|
280
|
+
React.createElement(Box, null,
|
|
281
|
+
React.createElement(Text, { dimColor: true }, "Y to cleanup \u2022 N to keep pane \u2022 ESC to exit")))),
|
|
282
|
+
step === 'error' && (React.createElement(Box, { flexDirection: "column" },
|
|
283
|
+
React.createElement(Box, { marginBottom: 1 },
|
|
284
|
+
React.createElement(Text, { color: POPUP_CONFIG.errorColor }, "\u2717 Error")),
|
|
285
|
+
React.createElement(Box, { marginBottom: 1 },
|
|
286
|
+
React.createElement(Text, null, errorMessage)),
|
|
287
|
+
React.createElement(Box, null,
|
|
288
|
+
React.createElement(Text, { dimColor: true }, "Press any key to close")))))));
|
|
289
|
+
};
|
|
290
|
+
// Entry point
|
|
291
|
+
function main() {
|
|
292
|
+
const resultFile = process.argv[2];
|
|
293
|
+
const dataFile = process.argv[3];
|
|
294
|
+
if (!resultFile || !dataFile) {
|
|
295
|
+
console.error('Error: Result file and data file required');
|
|
296
|
+
process.exit(1);
|
|
297
|
+
}
|
|
298
|
+
let data;
|
|
299
|
+
try {
|
|
300
|
+
const dataJson = fs.readFileSync(dataFile, 'utf-8');
|
|
301
|
+
data = JSON.parse(dataJson);
|
|
302
|
+
}
|
|
303
|
+
catch (error) {
|
|
304
|
+
console.error('Error: Failed to read or parse data file');
|
|
305
|
+
process.exit(1);
|
|
306
|
+
}
|
|
307
|
+
render(React.createElement(MergePopupApp, { resultFile: resultFile, paneSlug: data.paneSlug, worktreePath: data.worktreePath, mainRepoPath: data.mainRepoPath, mainBranch: data.mainBranch }));
|
|
308
|
+
}
|
|
309
|
+
main();
|
|
310
|
+
//# sourceMappingURL=mergePopup.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mergePopup.js","sourceRoot":"","sources":["../../src/popups/mergePopup.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"newPanePopup.d.ts","sourceRoot":"","sources":["../../src/popups/newPanePopup.tsx"],"names":[],"mappings":";AAEA;;;GAGG"}
|
|
@@ -0,0 +1,234 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
/**
|
|
3
|
+
* Standalone popup for creating a new dmux pane
|
|
4
|
+
* Runs in a tmux popup modal and writes result to a file
|
|
5
|
+
*/
|
|
6
|
+
import React, { useState, useEffect } from "react";
|
|
7
|
+
import { render, Box, Text, useApp, useInput } from "ink";
|
|
8
|
+
import { PopupContainer, PopupWrapper, writeSuccessAndExit, FileList, } from "./components/index.js";
|
|
9
|
+
import { PopupFooters, POPUP_CONFIG } from "./config.js";
|
|
10
|
+
import CleanTextInput from "../CleanTextInput.js";
|
|
11
|
+
import { scanProjectFiles, fuzzyMatchFiles } from "../utils/fileScanner.js";
|
|
12
|
+
import fs from "fs";
|
|
13
|
+
import path from "path";
|
|
14
|
+
// Debug logging to file
|
|
15
|
+
const DEBUG_LOG = path.join(process.cwd(), '.dmux', 'file-picker-debug.log');
|
|
16
|
+
function debugLog(message, data) {
|
|
17
|
+
const timestamp = new Date().toISOString();
|
|
18
|
+
const logLine = `[${timestamp}] ${message} ${data ? JSON.stringify(data, null, 2) : ''}\n`;
|
|
19
|
+
try {
|
|
20
|
+
fs.appendFileSync(DEBUG_LOG, logLine);
|
|
21
|
+
}
|
|
22
|
+
catch (e) {
|
|
23
|
+
// Ignore write errors
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
const NewPanePopupApp = ({ resultFile }) => {
|
|
27
|
+
const [prompt, setPrompt] = useState("");
|
|
28
|
+
const { exit } = useApp();
|
|
29
|
+
// File autocomplete state
|
|
30
|
+
const [isFileListActive, setIsFileListActive] = useState(false);
|
|
31
|
+
const [filteredFiles, setFilteredFiles] = useState([]);
|
|
32
|
+
const [selectedFileIndex, setSelectedFileIndex] = useState(0);
|
|
33
|
+
const [atPosition, setAtPosition] = useState(-1); // Position of @ in text
|
|
34
|
+
const [cursorPosition, setCursorPosition] = useState(undefined);
|
|
35
|
+
const [currentCursor, setCurrentCursor] = useState(0); // Track cursor position from CleanTextInput
|
|
36
|
+
// Reset cursor position override after it's been applied
|
|
37
|
+
useEffect(() => {
|
|
38
|
+
if (cursorPosition !== undefined) {
|
|
39
|
+
// Clear the override on next render to allow normal cursor movement
|
|
40
|
+
const timer = setTimeout(() => setCursorPosition(undefined), 0);
|
|
41
|
+
return () => clearTimeout(timer);
|
|
42
|
+
}
|
|
43
|
+
}, [cursorPosition]);
|
|
44
|
+
// Detect @ and scan files (cursor-aware)
|
|
45
|
+
useEffect(() => {
|
|
46
|
+
debugLog('[@Detection] Running with:', {
|
|
47
|
+
prompt,
|
|
48
|
+
currentCursor,
|
|
49
|
+
promptLength: prompt.length
|
|
50
|
+
});
|
|
51
|
+
// Find the @ symbol that is before the cursor position
|
|
52
|
+
// Cursor position N means cursor is BETWEEN index N-1 and N
|
|
53
|
+
// So we search backwards from index N-1
|
|
54
|
+
let atBeforeCursor = -1;
|
|
55
|
+
for (let i = currentCursor - 1; i >= 0; i--) {
|
|
56
|
+
if (prompt[i] === '@') {
|
|
57
|
+
atBeforeCursor = i;
|
|
58
|
+
debugLog('[@Detection] Found @ at position:', { position: i });
|
|
59
|
+
break;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
if (atBeforeCursor !== -1) {
|
|
63
|
+
// Get the text after @ (until space or end of string)
|
|
64
|
+
const afterAt = prompt.slice(atBeforeCursor + 1);
|
|
65
|
+
const match = afterAt.match(/^([^\s]*)/);
|
|
66
|
+
const query = match ? match[1] : '';
|
|
67
|
+
const endOfQuery = atBeforeCursor + 1 + query.length;
|
|
68
|
+
debugLog('[@Detection] After @:', {
|
|
69
|
+
afterAt,
|
|
70
|
+
query,
|
|
71
|
+
atBeforeCursor,
|
|
72
|
+
endOfQuery,
|
|
73
|
+
cursorInRange: currentCursor >= atBeforeCursor && currentCursor <= endOfQuery
|
|
74
|
+
});
|
|
75
|
+
// Only show file list if cursor is within the @ reference
|
|
76
|
+
if (currentCursor >= atBeforeCursor && currentCursor <= endOfQuery) {
|
|
77
|
+
// Check if there's a space after the query (means reference is complete)
|
|
78
|
+
const charAfterQuery = afterAt[query.length];
|
|
79
|
+
const spacePosition = atBeforeCursor + 1 + query.length;
|
|
80
|
+
debugLog('[@Detection] charAfterQuery:', { char: charAfterQuery, spacePosition, currentCursor });
|
|
81
|
+
// Only hide if:
|
|
82
|
+
// 1. Query is not empty (has actual text)
|
|
83
|
+
// 2. There's a space after the query
|
|
84
|
+
// 3. Cursor is PAST the space (user moved beyond it)
|
|
85
|
+
// This prevents hiding when user is still typing (cursor before/at the space)
|
|
86
|
+
if (charAfterQuery === ' ' && query.length > 0 && currentCursor > spacePosition) {
|
|
87
|
+
// Reference is complete (e.g., "@BUG.md "), and cursor has moved past it
|
|
88
|
+
debugLog('[@Detection] Reference complete (cursor past space), hiding file list');
|
|
89
|
+
setIsFileListActive(false);
|
|
90
|
+
setFilteredFiles([]);
|
|
91
|
+
setAtPosition(-1);
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
// User is actively typing a query, show file list
|
|
95
|
+
debugLog('[@Detection] Showing file list for query:', { query });
|
|
96
|
+
try {
|
|
97
|
+
const projectPath = process.cwd();
|
|
98
|
+
const { files } = scanProjectFiles(projectPath);
|
|
99
|
+
const matches = fuzzyMatchFiles(query, files);
|
|
100
|
+
setFilteredFiles(matches);
|
|
101
|
+
setAtPosition(atBeforeCursor);
|
|
102
|
+
setIsFileListActive(true);
|
|
103
|
+
setSelectedFileIndex(0); // Reset selection when files change
|
|
104
|
+
}
|
|
105
|
+
catch (error) {
|
|
106
|
+
debugLog('[@Detection] Failed to scan files:', error);
|
|
107
|
+
setFilteredFiles([]);
|
|
108
|
+
setIsFileListActive(false);
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
// Cursor is outside the @ reference, hide file list
|
|
113
|
+
debugLog('[@Detection] Cursor outside reference, hiding file list');
|
|
114
|
+
setIsFileListActive(false);
|
|
115
|
+
setFilteredFiles([]);
|
|
116
|
+
setAtPosition(-1);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
else {
|
|
120
|
+
// No @ found before cursor, hide file list
|
|
121
|
+
debugLog('[@Detection] No @ found before cursor');
|
|
122
|
+
setIsFileListActive(false);
|
|
123
|
+
setFilteredFiles([]);
|
|
124
|
+
setAtPosition(-1);
|
|
125
|
+
}
|
|
126
|
+
}, [prompt, currentCursor]);
|
|
127
|
+
// Handle keyboard navigation - runs BEFORE other handlers
|
|
128
|
+
// This is critical: we need to intercept ESC for progressive behavior
|
|
129
|
+
useInput((input, key) => {
|
|
130
|
+
// Handle ESC with progressive behavior:
|
|
131
|
+
// 1. If file list is active, dismiss it
|
|
132
|
+
// 2. If text is present, clear it
|
|
133
|
+
// 3. If no text, allow PopupWrapper to close the popup
|
|
134
|
+
if (key.escape) {
|
|
135
|
+
if (isFileListActive) {
|
|
136
|
+
// Dismiss file list
|
|
137
|
+
debugLog('[ESC] Dismissing file list');
|
|
138
|
+
setIsFileListActive(false);
|
|
139
|
+
setFilteredFiles([]);
|
|
140
|
+
setAtPosition(-1);
|
|
141
|
+
return; // Prevent further handling
|
|
142
|
+
}
|
|
143
|
+
else if (prompt.length > 0) {
|
|
144
|
+
// Clear the text input
|
|
145
|
+
debugLog('[ESC] Clearing text input');
|
|
146
|
+
setPrompt('');
|
|
147
|
+
return; // Prevent further handling (don't close popup)
|
|
148
|
+
}
|
|
149
|
+
// If no file list and no text, let PopupWrapper close the popup
|
|
150
|
+
// (don't return, let the event propagate)
|
|
151
|
+
}
|
|
152
|
+
// Only handle other keys when file list is active
|
|
153
|
+
if (!isFileListActive) {
|
|
154
|
+
return; // Let CleanTextInput handle keys
|
|
155
|
+
}
|
|
156
|
+
// Arrow up - move selection up
|
|
157
|
+
if (key.upArrow) {
|
|
158
|
+
setSelectedFileIndex(prev => Math.max(0, prev - 1));
|
|
159
|
+
return;
|
|
160
|
+
}
|
|
161
|
+
// Arrow down - move selection down
|
|
162
|
+
if (key.downArrow) {
|
|
163
|
+
setSelectedFileIndex(prev => Math.min(filteredFiles.length - 1, prev + 1));
|
|
164
|
+
return;
|
|
165
|
+
}
|
|
166
|
+
// Tab or Enter - select file and insert it
|
|
167
|
+
if (key.tab || key.return) {
|
|
168
|
+
if (filteredFiles.length > 0 && selectedFileIndex < filteredFiles.length) {
|
|
169
|
+
const selectedFile = filteredFiles[selectedFileIndex];
|
|
170
|
+
// Replace the query after @ with the selected file path (keep the @)
|
|
171
|
+
const beforeAt = prompt.slice(0, atPosition);
|
|
172
|
+
const afterAt = prompt.slice(atPosition);
|
|
173
|
+
const afterAtMatch = afterAt.match(/^@[^\s]*/);
|
|
174
|
+
const queryLength = afterAtMatch ? afterAtMatch[0].length : 1;
|
|
175
|
+
const afterQuery = prompt.slice(atPosition + queryLength);
|
|
176
|
+
// Insert @filepath (with space after if there isn't one)
|
|
177
|
+
const fileReference = '@' + selectedFile;
|
|
178
|
+
const newPrompt = beforeAt + fileReference + (afterQuery.startsWith(' ') ? '' : ' ') + afterQuery;
|
|
179
|
+
setPrompt(newPrompt);
|
|
180
|
+
// Set cursor position to end of the inserted file reference
|
|
181
|
+
const newCursorPos = beforeAt.length + fileReference.length;
|
|
182
|
+
setCursorPosition(newCursorPos);
|
|
183
|
+
// Reset file list
|
|
184
|
+
setIsFileListActive(false);
|
|
185
|
+
setFilteredFiles([]);
|
|
186
|
+
setAtPosition(-1);
|
|
187
|
+
}
|
|
188
|
+
return;
|
|
189
|
+
}
|
|
190
|
+
});
|
|
191
|
+
const handleSubmit = (value) => {
|
|
192
|
+
// Don't submit if file list is active (Enter should select file, not submit)
|
|
193
|
+
if (isFileListActive) {
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
196
|
+
writeSuccessAndExit(resultFile, value || prompt, exit);
|
|
197
|
+
};
|
|
198
|
+
const shouldAllowCancel = () => {
|
|
199
|
+
// Block cancel (ESC key) if:
|
|
200
|
+
// 1. File list is currently active, OR
|
|
201
|
+
// 2. There's text in the prompt
|
|
202
|
+
// This runs BEFORE my useInput handler, so we check the current state
|
|
203
|
+
debugLog('[shouldAllowCancel]', { isFileListActive, hasPrompt: prompt.length > 0 });
|
|
204
|
+
if (isFileListActive) {
|
|
205
|
+
debugLog('[shouldAllowCancel] Blocking cancel - file list is active');
|
|
206
|
+
return false;
|
|
207
|
+
}
|
|
208
|
+
if (prompt.length > 0) {
|
|
209
|
+
debugLog('[shouldAllowCancel] Blocking cancel - prompt has text');
|
|
210
|
+
return false;
|
|
211
|
+
}
|
|
212
|
+
// Only allow cancel if no file list and no text
|
|
213
|
+
debugLog('[shouldAllowCancel] Allowing cancel');
|
|
214
|
+
return true;
|
|
215
|
+
};
|
|
216
|
+
return (React.createElement(PopupWrapper, { resultFile: resultFile, allowEscapeToCancel: true, shouldAllowCancel: shouldAllowCancel },
|
|
217
|
+
React.createElement(PopupContainer, { footer: PopupFooters.input() },
|
|
218
|
+
React.createElement(Box, { marginBottom: 1 },
|
|
219
|
+
React.createElement(Text, { dimColor: true }, "Enter a prompt for your AI agent.")),
|
|
220
|
+
React.createElement(Box, { width: "100%", borderStyle: POPUP_CONFIG.inputBorderStyle, borderColor: POPUP_CONFIG.inputBorderColor, paddingX: POPUP_CONFIG.inputPadding.x, paddingY: POPUP_CONFIG.inputPadding.y },
|
|
221
|
+
React.createElement(CleanTextInput, { value: prompt, onChange: setPrompt, onSubmit: handleSubmit, placeholder: "e.g., Add user authentication with JWT", maxWidth: 76, maxVisibleLines: 10, cursorPosition: cursorPosition, disableUpDownArrows: isFileListActive, disableEscape: isFileListActive, onCursorChange: setCurrentCursor, ignoreFocus: true })),
|
|
222
|
+
isFileListActive && (React.createElement(FileList, { files: filteredFiles, selectedIndex: selectedFileIndex, maxVisible: 10 })))));
|
|
223
|
+
};
|
|
224
|
+
// Entry point
|
|
225
|
+
function main() {
|
|
226
|
+
const resultFile = process.argv[2];
|
|
227
|
+
if (!resultFile) {
|
|
228
|
+
console.error("Error: Result file path required");
|
|
229
|
+
process.exit(1);
|
|
230
|
+
}
|
|
231
|
+
render(React.createElement(NewPanePopupApp, { resultFile: resultFile }));
|
|
232
|
+
}
|
|
233
|
+
main();
|
|
234
|
+
//# sourceMappingURL=newPanePopup.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"newPanePopup.js","sourceRoot":"","sources":["../../src/popups/newPanePopup.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"progressPopup.d.ts","sourceRoot":"","sources":["../../src/popups/progressPopup.tsx"],"names":[],"mappings":";AAEA;;;;GAIG"}
|