dmux 5.1.0 → 5.3.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/README.md +46 -143
- package/dist/DmuxApp.d.ts.map +1 -1
- package/dist/DmuxApp.js +99 -56
- package/dist/DmuxApp.js.map +1 -1
- package/dist/actions/implementations/closeAction.d.ts.map +1 -1
- package/dist/actions/implementations/closeAction.js +55 -21
- package/dist/actions/implementations/closeAction.js.map +1 -1
- package/dist/actions/implementations/index.d.ts +1 -0
- package/dist/actions/implementations/index.d.ts.map +1 -1
- package/dist/actions/implementations/index.js +3 -0
- package/dist/actions/implementations/index.js.map +1 -1
- package/dist/actions/implementations/mergeAction.d.ts.map +1 -1
- package/dist/actions/implementations/mergeAction.js +61 -20
- package/dist/actions/implementations/mergeAction.js.map +1 -1
- package/dist/actions/index.d.ts.map +1 -1
- package/dist/actions/index.js +6 -0
- package/dist/actions/index.js.map +1 -1
- package/dist/actions/merge/conflictResolution.d.ts.map +1 -1
- package/dist/actions/merge/conflictResolution.js +19 -13
- package/dist/actions/merge/conflictResolution.js.map +1 -1
- package/dist/actions/merge/issueHandlers/mainDirtyHandler.d.ts.map +1 -1
- package/dist/actions/merge/issueHandlers/mainDirtyHandler.js +8 -6
- package/dist/actions/merge/issueHandlers/mainDirtyHandler.js.map +1 -1
- package/dist/actions/merge/issueHandlers/worktreeUncommittedHandler.d.ts +1 -1
- package/dist/actions/merge/issueHandlers/worktreeUncommittedHandler.d.ts.map +1 -1
- package/dist/actions/merge/issueHandlers/worktreeUncommittedHandler.js +9 -2
- package/dist/actions/merge/issueHandlers/worktreeUncommittedHandler.js.map +1 -1
- package/dist/actions/merge/mergeExecution.d.ts.map +1 -1
- package/dist/actions/merge/mergeExecution.js +2 -1
- package/dist/actions/merge/mergeExecution.js.map +1 -1
- package/dist/actions/merge/multiMergeOrchestrator.d.ts.map +1 -1
- package/dist/actions/merge/multiMergeOrchestrator.js +33 -14
- package/dist/actions/merge/multiMergeOrchestrator.js.map +1 -1
- package/dist/actions/types.d.ts +4 -2
- package/dist/actions/types.d.ts.map +1 -1
- package/dist/actions/types.js +19 -1
- package/dist/actions/types.js.map +1 -1
- package/dist/components/dialogs/AgentChoiceDialog.d.ts +2 -1
- package/dist/components/dialogs/AgentChoiceDialog.d.ts.map +1 -1
- package/dist/components/dialogs/AgentChoiceDialog.js +4 -5
- package/dist/components/dialogs/AgentChoiceDialog.js.map +1 -1
- package/dist/components/dialogs/SettingsDialog.d.ts.map +1 -1
- package/dist/components/dialogs/SettingsDialog.js +3 -1
- package/dist/components/dialogs/SettingsDialog.js.map +1 -1
- package/dist/components/panes/MergePane.d.ts +1 -0
- package/dist/components/panes/MergePane.d.ts.map +1 -1
- package/dist/components/panes/MergePane.js +14 -3
- package/dist/components/panes/MergePane.js.map +1 -1
- package/dist/components/panes/PaneCard.d.ts +1 -3
- package/dist/components/panes/PaneCard.d.ts.map +1 -1
- package/dist/components/panes/PaneCard.js +54 -37
- package/dist/components/panes/PaneCard.js.map +1 -1
- package/dist/components/panes/PanesGrid.d.ts +1 -0
- package/dist/components/panes/PanesGrid.d.ts.map +1 -1
- package/dist/components/panes/PanesGrid.js +60 -78
- package/dist/components/panes/PanesGrid.js.map +1 -1
- package/dist/components/popups/agentChoicePopup.d.ts +2 -2
- package/dist/components/popups/agentChoicePopup.js +85 -56
- package/dist/components/popups/agentChoicePopup.js.map +1 -1
- package/dist/components/popups/diffPeekPopup.d.ts +7 -0
- package/dist/components/popups/diffPeekPopup.d.ts.map +1 -0
- package/dist/components/popups/diffPeekPopup.js +99 -0
- package/dist/components/popups/diffPeekPopup.js.map +1 -0
- package/dist/components/popups/enabledAgentsPopup.d.ts +7 -0
- package/dist/components/popups/enabledAgentsPopup.d.ts.map +1 -0
- package/dist/components/popups/enabledAgentsPopup.js +196 -0
- package/dist/components/popups/enabledAgentsPopup.js.map +1 -0
- package/dist/components/popups/kebabMenuPopup.js +2 -2
- package/dist/components/popups/kebabMenuPopup.js.map +1 -1
- package/dist/components/popups/mergeUncommittedChoicePopup.d.ts +7 -0
- package/dist/components/popups/mergeUncommittedChoicePopup.d.ts.map +1 -0
- package/dist/components/popups/mergeUncommittedChoicePopup.js +289 -0
- package/dist/components/popups/mergeUncommittedChoicePopup.js.map +1 -0
- package/dist/components/popups/newPanePopup.js +8 -0
- package/dist/components/popups/newPanePopup.js.map +1 -1
- package/dist/components/popups/projectSelectPopup.d.ts +7 -0
- package/dist/components/popups/projectSelectPopup.d.ts.map +1 -0
- package/dist/components/popups/projectSelectPopup.js +124 -0
- package/dist/components/popups/projectSelectPopup.js.map +1 -0
- package/dist/components/popups/reopenWorktreePopup.js +33 -3
- package/dist/components/popups/reopenWorktreePopup.js.map +1 -1
- package/dist/components/popups/settingsPopup.js +25 -8
- package/dist/components/popups/settingsPopup.js.map +1 -1
- package/dist/components/popups/shared/DirectoryList.d.ts +14 -0
- package/dist/components/popups/shared/DirectoryList.d.ts.map +1 -0
- package/dist/components/popups/shared/DirectoryList.js +46 -0
- package/dist/components/popups/shared/DirectoryList.js.map +1 -0
- package/dist/components/popups/shared/index.d.ts +1 -0
- package/dist/components/popups/shared/index.d.ts.map +1 -1
- package/dist/components/popups/shared/index.js +1 -0
- package/dist/components/popups/shared/index.js.map +1 -1
- package/dist/components/popups/shortcutsPopup.js +15 -12
- package/dist/components/popups/shortcutsPopup.js.map +1 -1
- package/dist/components/popups/singleAgentChoicePopup.d.ts +7 -0
- package/dist/components/popups/singleAgentChoicePopup.d.ts.map +1 -0
- package/dist/components/popups/singleAgentChoicePopup.js +95 -0
- package/dist/components/popups/singleAgentChoicePopup.js.map +1 -0
- package/dist/components/ui/FooterHelp.js +1 -1
- package/dist/components/ui/FooterHelp.js.map +1 -1
- package/dist/hooks/useActionSystem.d.ts +1 -1
- package/dist/hooks/useActionSystem.d.ts.map +1 -1
- package/dist/hooks/useActionSystem.js +1 -1
- package/dist/hooks/useActionSystem.js.map +1 -1
- package/dist/hooks/useAgentDetection.d.ts +2 -2
- package/dist/hooks/useAgentDetection.d.ts.map +1 -1
- package/dist/hooks/useAgentDetection.js +18 -88
- package/dist/hooks/useAgentDetection.js.map +1 -1
- package/dist/hooks/useAutoUpdater.d.ts.map +1 -1
- package/dist/hooks/useAutoUpdater.js +43 -26
- package/dist/hooks/useAutoUpdater.js.map +1 -1
- package/dist/hooks/useInputHandling.d.ts +5 -0
- package/dist/hooks/useInputHandling.d.ts.map +1 -1
- package/dist/hooks/useInputHandling.js +89 -16
- package/dist/hooks/useInputHandling.js.map +1 -1
- package/dist/hooks/useNavigation.d.ts +1 -1
- package/dist/hooks/useNavigation.d.ts.map +1 -1
- package/dist/hooks/useNavigation.js +26 -4
- package/dist/hooks/useNavigation.js.map +1 -1
- package/dist/hooks/usePaneCreation.d.ts +5 -2
- package/dist/hooks/usePaneCreation.d.ts.map +1 -1
- package/dist/hooks/usePaneCreation.js +123 -23
- package/dist/hooks/usePaneCreation.js.map +1 -1
- package/dist/hooks/usePaneSync.d.ts +1 -1
- package/dist/hooks/usePaneSync.d.ts.map +1 -1
- package/dist/hooks/usePaneSync.js +14 -1
- package/dist/hooks/usePaneSync.js.map +1 -1
- package/dist/hooks/usePanes.js +1 -1
- package/dist/hooks/usePanes.js.map +1 -1
- package/dist/hooks/useServices.d.ts +1 -1
- package/dist/hooks/useServices.d.ts.map +1 -1
- package/dist/hooks/useServices.js +2 -2
- package/dist/hooks/useServices.js.map +1 -1
- package/dist/hooks/useWorktreeActions.d.ts.map +1 -1
- package/dist/hooks/useWorktreeActions.js +16 -8
- package/dist/hooks/useWorktreeActions.js.map +1 -1
- package/dist/index.js +199 -18
- package/dist/index.js.map +1 -1
- package/dist/layout/SpacerManager.d.ts.map +1 -1
- package/dist/layout/SpacerManager.js +2 -1
- package/dist/layout/SpacerManager.js.map +1 -1
- package/dist/server/embedded-assets.d.ts.map +1 -1
- package/dist/server/embedded-assets.js +37 -26
- package/dist/server/embedded-assets.js.map +1 -1
- package/dist/services/AutoUpdater.d.ts +4 -0
- package/dist/services/AutoUpdater.d.ts.map +1 -1
- package/dist/services/AutoUpdater.js +23 -0
- package/dist/services/AutoUpdater.js.map +1 -1
- package/dist/services/PaneEventService.d.ts.map +1 -1
- package/dist/services/PaneEventService.js +2 -5
- package/dist/services/PaneEventService.js.map +1 -1
- package/dist/services/PaneWorkerManager.d.ts.map +1 -1
- package/dist/services/PaneWorkerManager.js +2 -14
- package/dist/services/PaneWorkerManager.js.map +1 -1
- package/dist/services/PopupManager.d.ts +8 -2
- package/dist/services/PopupManager.d.ts.map +1 -1
- package/dist/services/PopupManager.js +149 -27
- package/dist/services/PopupManager.js.map +1 -1
- package/dist/services/TmuxService.d.ts +15 -1
- package/dist/services/TmuxService.d.ts.map +1 -1
- package/dist/services/TmuxService.js +29 -3
- package/dist/services/TmuxService.js.map +1 -1
- package/dist/services/WorktreeCleanupService.d.ts +22 -0
- package/dist/services/WorktreeCleanupService.d.ts.map +1 -0
- package/dist/services/WorktreeCleanupService.js +80 -0
- package/dist/services/WorktreeCleanupService.js.map +1 -0
- package/dist/types.d.ts +9 -3
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/agentDetection.d.ts +15 -8
- package/dist/utils/agentDetection.d.ts.map +1 -1
- package/dist/utils/agentDetection.js +49 -73
- package/dist/utils/agentDetection.js.map +1 -1
- package/dist/utils/agentLaunch.d.ts +63 -1
- package/dist/utils/agentLaunch.d.ts.map +1 -1
- package/dist/utils/agentLaunch.js +497 -24
- package/dist/utils/agentLaunch.js.map +1 -1
- package/dist/utils/agentPromptDispatch.d.ts +33 -0
- package/dist/utils/agentPromptDispatch.d.ts.map +1 -0
- package/dist/utils/agentPromptDispatch.js +99 -0
- package/dist/utils/agentPromptDispatch.js.map +1 -0
- package/dist/utils/asciiArt.d.ts.map +1 -1
- package/dist/utils/asciiArt.js +6 -7
- package/dist/utils/asciiArt.js.map +1 -1
- package/dist/utils/attachAgent.d.ts +21 -0
- package/dist/utils/attachAgent.d.ts.map +1 -0
- package/dist/utils/attachAgent.js +128 -0
- package/dist/utils/attachAgent.js.map +1 -0
- package/dist/utils/conflictResolutionPane.d.ts +2 -1
- package/dist/utils/conflictResolutionPane.d.ts.map +1 -1
- package/dist/utils/conflictResolutionPane.js +69 -36
- package/dist/utils/conflictResolutionPane.js.map +1 -1
- package/dist/utils/devSource.d.ts +7 -0
- package/dist/utils/devSource.d.ts.map +1 -0
- package/dist/utils/devSource.js +19 -0
- package/dist/utils/devSource.js.map +1 -0
- package/dist/utils/devWatchCommand.d.ts +8 -0
- package/dist/utils/devWatchCommand.d.ts.map +1 -0
- package/dist/utils/devWatchCommand.js +14 -0
- package/dist/utils/devWatchCommand.js.map +1 -0
- package/dist/utils/dirScanner.d.ts +30 -0
- package/dist/utils/dirScanner.d.ts.map +1 -0
- package/dist/utils/dirScanner.js +99 -0
- package/dist/utils/dirScanner.js.map +1 -0
- package/dist/utils/geminiTrust.d.ts +8 -0
- package/dist/utils/geminiTrust.d.ts.map +1 -0
- package/dist/utils/geminiTrust.js +67 -0
- package/dist/utils/geminiTrust.js.map +1 -0
- package/dist/utils/generated-agents-doc.d.ts +1 -1
- package/dist/utils/generated-agents-doc.js +3 -3
- package/dist/utils/git.d.ts +13 -0
- package/dist/utils/git.d.ts.map +1 -1
- package/dist/utils/git.js +20 -0
- package/dist/utils/git.js.map +1 -1
- package/dist/utils/hooks.js +1 -1
- package/dist/utils/hooks.js.map +1 -1
- package/dist/utils/hooksDocs.d.ts +2 -9
- package/dist/utils/hooksDocs.d.ts.map +1 -1
- package/dist/utils/hooksDocs.js +26 -6
- package/dist/utils/hooksDocs.js.map +1 -1
- package/dist/utils/mergeExecution.d.ts.map +1 -1
- package/dist/utils/mergeExecution.js +6 -3
- package/dist/utils/mergeExecution.js.map +1 -1
- package/dist/utils/paneCreation.d.ts +8 -2
- package/dist/utils/paneCreation.d.ts.map +1 -1
- package/dist/utils/paneCreation.js +129 -80
- package/dist/utils/paneCreation.js.map +1 -1
- package/dist/utils/paneGrouping.d.ts.map +1 -1
- package/dist/utils/paneGrouping.js +30 -0
- package/dist/utils/paneGrouping.js.map +1 -1
- package/dist/utils/projectActions.d.ts +5 -0
- package/dist/utils/projectActions.d.ts.map +1 -1
- package/dist/utils/projectActions.js +15 -4
- package/dist/utils/projectActions.js.map +1 -1
- package/dist/utils/promptStore.d.ts +7 -0
- package/dist/utils/promptStore.d.ts.map +1 -0
- package/dist/utils/promptStore.js +75 -0
- package/dist/utils/promptStore.js.map +1 -0
- package/dist/utils/reopenWorktree.d.ts +1 -1
- package/dist/utils/reopenWorktree.d.ts.map +1 -1
- package/dist/utils/reopenWorktree.js +26 -27
- package/dist/utils/reopenWorktree.js.map +1 -1
- package/dist/utils/runtimePaths.d.ts +2 -0
- package/dist/utils/runtimePaths.d.ts.map +1 -0
- package/dist/utils/runtimePaths.js +8 -0
- package/dist/utils/runtimePaths.js.map +1 -0
- package/dist/utils/settingsManager.d.ts.map +1 -1
- package/dist/utils/settingsManager.js +96 -4
- package/dist/utils/settingsManager.js.map +1 -1
- package/dist/utils/systemCheck.d.ts.map +1 -1
- package/dist/utils/systemCheck.js +0 -13
- package/dist/utils/systemCheck.js.map +1 -1
- package/dist/utils/welcomePane.d.ts +2 -1
- package/dist/utils/welcomePane.d.ts.map +1 -1
- package/dist/utils/welcomePane.js +3 -2
- package/dist/utils/welcomePane.js.map +1 -1
- package/dist/utils/welcomePaneManager.js +1 -1
- package/dist/utils/welcomePaneManager.js.map +1 -1
- package/dist/workers/PaneWorker.js.map +1 -1
- package/dist/workers/WorkerMessages.d.ts +2 -1
- package/dist/workers/WorkerMessages.d.ts.map +1 -1
- package/dist/workers/WorkerMessages.js.map +1 -1
- package/dist/workers/updateChecker.js +21 -6
- package/dist/workers/updateChecker.js.map +1 -1
- package/package.json +14 -12
- package/dist/components/popups/remotePopup.d.ts +0 -6
- package/dist/components/popups/remotePopup.d.ts.map +0 -1
- package/dist/components/popups/remotePopup.js +0 -166
- package/dist/components/popups/remotePopup.js.map +0 -1
- package/dist/hooks/useTunnelManagement.d.ts +0 -18
- package/dist/hooks/useTunnelManagement.d.ts.map +0 -1
- package/dist/hooks/useTunnelManagement.js +0 -55
- package/dist/hooks/useTunnelManagement.js.map +0 -1
- package/dist/server/actionsApi.d.ts +0 -37
- package/dist/server/actionsApi.d.ts.map +0 -1
- package/dist/server/actionsApi.js +0 -256
- package/dist/server/actionsApi.js.map +0 -1
- package/dist/server/index.d.ts +0 -21
- package/dist/server/index.d.ts.map +0 -1
- package/dist/server/index.js +0 -100
- package/dist/server/index.js.map +0 -1
- package/dist/server/routes/actionsRoutes.d.ts +0 -2
- package/dist/server/routes/actionsRoutes.d.ts.map +0 -1
- package/dist/server/routes/actionsRoutes.js +0 -110
- package/dist/server/routes/actionsRoutes.js.map +0 -1
- package/dist/server/routes/healthRoutes.d.ts +0 -13
- package/dist/server/routes/healthRoutes.d.ts.map +0 -1
- package/dist/server/routes/healthRoutes.js +0 -70
- package/dist/server/routes/healthRoutes.js.map +0 -1
- package/dist/server/routes/index.d.ts +0 -8
- package/dist/server/routes/index.d.ts.map +0 -1
- package/dist/server/routes/index.js +0 -67
- package/dist/server/routes/index.js.map +0 -1
- package/dist/server/routes/keysRoutes.d.ts +0 -33
- package/dist/server/routes/keysRoutes.d.ts.map +0 -1
- package/dist/server/routes/keysRoutes.js +0 -128
- package/dist/server/routes/keysRoutes.js.map +0 -1
- package/dist/server/routes/panesRoutes.d.ts +0 -2
- package/dist/server/routes/panesRoutes.d.ts.map +0 -1
- package/dist/server/routes/panesRoutes.js +0 -414
- package/dist/server/routes/panesRoutes.js.map +0 -1
- package/dist/server/routes/settingsRoutes.d.ts +0 -94
- package/dist/server/routes/settingsRoutes.d.ts.map +0 -1
- package/dist/server/routes/settingsRoutes.js +0 -159
- package/dist/server/routes/settingsRoutes.js.map +0 -1
- package/dist/server/routes/streamRoutes.d.ts +0 -18
- package/dist/server/routes/streamRoutes.d.ts.map +0 -1
- package/dist/server/routes/streamRoutes.js +0 -87
- package/dist/server/routes/streamRoutes.js.map +0 -1
- package/dist/server/routes/tunnelRoutes.d.ts +0 -11
- package/dist/server/routes/tunnelRoutes.d.ts.map +0 -1
- package/dist/server/routes/tunnelRoutes.js +0 -28
- package/dist/server/routes/tunnelRoutes.js.map +0 -1
- package/dist/server/routes.d.ts +0 -17
- package/dist/server/routes.d.ts.map +0 -1
- package/dist/server/routes.js +0 -17
- package/dist/server/routes.js.map +0 -1
- package/dist/services/TunnelService.d.ts +0 -10
- package/dist/services/TunnelService.d.ts.map +0 -1
- package/dist/services/TunnelService.js +0 -98
- package/dist/services/TunnelService.js.map +0 -1
|
@@ -0,0 +1,289 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
/**
|
|
3
|
+
* Standalone popup for merge uncommitted-change choices.
|
|
4
|
+
* Supports compact action options and file-level diff peeking.
|
|
5
|
+
*/
|
|
6
|
+
import React, { useMemo, useState } from 'react';
|
|
7
|
+
import { render, Box, Text, useInput, useApp, useStdout } from 'ink';
|
|
8
|
+
import * as fs from 'fs';
|
|
9
|
+
import { execSync } from 'child_process';
|
|
10
|
+
import { PopupContainer, PopupWrapper, writeCancelAndExit, writeSuccessAndExit, } from './shared/index.js';
|
|
11
|
+
import { POPUP_CONFIG } from './config.js';
|
|
12
|
+
const MAX_VISIBLE_FILES = 9;
|
|
13
|
+
const DIFF_MAX_BUFFER_BYTES = 10 * 1024 * 1024;
|
|
14
|
+
const DIFF_SCROLL_PAGE_SIZE = 10;
|
|
15
|
+
const QUICKLOOK_MIN_VISIBLE_LINES = 8;
|
|
16
|
+
const QUICKLOOK_HEADER_LINES = 3;
|
|
17
|
+
const QUICKLOOK_LAYOUT_CHROME_LINES = ((POPUP_CONFIG.containerPadding.y * 2)
|
|
18
|
+
+ QUICKLOOK_HEADER_LINES
|
|
19
|
+
+ 1 // header block marginBottom
|
|
20
|
+
+ POPUP_CONFIG.sectionSpacing
|
|
21
|
+
+ 1 // footer text line
|
|
22
|
+
);
|
|
23
|
+
function shellEscape(value) {
|
|
24
|
+
return `'${value.replace(/'/g, `'\\''`)}'`;
|
|
25
|
+
}
|
|
26
|
+
function getDiffText(data, filePath) {
|
|
27
|
+
const fileArg = shellEscape(filePath);
|
|
28
|
+
if (data.diffMode === 'target-branch') {
|
|
29
|
+
try {
|
|
30
|
+
const branchArg = shellEscape(data.targetBranch);
|
|
31
|
+
const output = execSync(`git --no-pager diff --no-color ${branchArg} -- ${fileArg}`, {
|
|
32
|
+
cwd: data.repoPath,
|
|
33
|
+
encoding: 'utf-8',
|
|
34
|
+
stdio: 'pipe',
|
|
35
|
+
maxBuffer: DIFF_MAX_BUFFER_BYTES,
|
|
36
|
+
});
|
|
37
|
+
if (output.trim().length > 0) {
|
|
38
|
+
return output;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
catch {
|
|
42
|
+
// Fall through to working tree diff fallback.
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
try {
|
|
46
|
+
const output = execSync(`git --no-pager diff --no-color -- ${fileArg}`, {
|
|
47
|
+
cwd: data.repoPath,
|
|
48
|
+
encoding: 'utf-8',
|
|
49
|
+
stdio: 'pipe',
|
|
50
|
+
maxBuffer: DIFF_MAX_BUFFER_BYTES,
|
|
51
|
+
});
|
|
52
|
+
if (output.trim().length > 0) {
|
|
53
|
+
return output;
|
|
54
|
+
}
|
|
55
|
+
return `No diff output for ${filePath}.`;
|
|
56
|
+
}
|
|
57
|
+
catch (error) {
|
|
58
|
+
if (error instanceof Error) {
|
|
59
|
+
return `Failed to load diff for ${filePath}: ${error.message}`;
|
|
60
|
+
}
|
|
61
|
+
return `Failed to load diff for ${filePath}.`;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
function getVisibleFileWindow(files, selectedFileIndex) {
|
|
65
|
+
const total = files.length;
|
|
66
|
+
if (total <= MAX_VISIBLE_FILES) {
|
|
67
|
+
return {
|
|
68
|
+
start: 0,
|
|
69
|
+
end: total,
|
|
70
|
+
visibleFiles: files,
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
if (selectedFileIndex < 0) {
|
|
74
|
+
return {
|
|
75
|
+
start: 0,
|
|
76
|
+
end: MAX_VISIBLE_FILES,
|
|
77
|
+
visibleFiles: files.slice(0, MAX_VISIBLE_FILES),
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
const centeredStart = selectedFileIndex - Math.floor(MAX_VISIBLE_FILES / 2);
|
|
81
|
+
const start = Math.max(0, Math.min(centeredStart, total - MAX_VISIBLE_FILES));
|
|
82
|
+
const end = start + MAX_VISIBLE_FILES;
|
|
83
|
+
return {
|
|
84
|
+
start,
|
|
85
|
+
end,
|
|
86
|
+
visibleFiles: files.slice(start, end),
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
function getDiffLineColor(line) {
|
|
90
|
+
if (line.startsWith('+++') || line.startsWith('---'))
|
|
91
|
+
return 'yellow';
|
|
92
|
+
if (line.startsWith('+'))
|
|
93
|
+
return 'green';
|
|
94
|
+
if (line.startsWith('-'))
|
|
95
|
+
return 'red';
|
|
96
|
+
if (line.startsWith('@@'))
|
|
97
|
+
return 'cyan';
|
|
98
|
+
if (line.startsWith('diff --git') || line.startsWith('index '))
|
|
99
|
+
return POPUP_CONFIG.titleColor;
|
|
100
|
+
return 'white';
|
|
101
|
+
}
|
|
102
|
+
const MergeUncommittedChoicePopupApp = ({ resultFile, data, }) => {
|
|
103
|
+
const { exit } = useApp();
|
|
104
|
+
const { stdout } = useStdout();
|
|
105
|
+
const optionCount = data.options.length;
|
|
106
|
+
const fileCount = data.files.length;
|
|
107
|
+
const totalRows = optionCount + fileCount;
|
|
108
|
+
const defaultIndex = Math.max(0, data.options.findIndex((option) => option.default));
|
|
109
|
+
const [selectedRow, setSelectedRow] = useState(Math.min(defaultIndex, Math.max(totalRows - 1, 0)));
|
|
110
|
+
const [quicklook, setQuicklook] = useState(null);
|
|
111
|
+
const selectedOption = selectedRow < optionCount ? data.options[selectedRow] : null;
|
|
112
|
+
const selectedFileIndex = selectedRow - optionCount;
|
|
113
|
+
const selectedFile = selectedFileIndex >= 0 ? data.files[selectedFileIndex] : null;
|
|
114
|
+
const fileWindow = useMemo(() => getVisibleFileWindow(data.files, selectedFileIndex), [data.files, selectedFileIndex]);
|
|
115
|
+
const terminalRows = stdout?.rows || process.stdout.rows || 40;
|
|
116
|
+
const maxVisibleDiffLines = Math.max(QUICKLOOK_MIN_VISIBLE_LINES, terminalRows - QUICKLOOK_LAYOUT_CHROME_LINES);
|
|
117
|
+
const openQuicklook = (filePath) => {
|
|
118
|
+
const diffText = getDiffText(data, filePath);
|
|
119
|
+
const lines = diffText.split('\n');
|
|
120
|
+
setQuicklook({
|
|
121
|
+
filePath,
|
|
122
|
+
lines: lines.length > 0 ? lines : ['No diff output available.'],
|
|
123
|
+
offset: 0,
|
|
124
|
+
});
|
|
125
|
+
};
|
|
126
|
+
useInput((input, key) => {
|
|
127
|
+
if (quicklook) {
|
|
128
|
+
const maxVisibleLines = maxVisibleDiffLines;
|
|
129
|
+
const maxOffset = Math.max(0, quicklook.lines.length - maxVisibleLines);
|
|
130
|
+
if (key.upArrow) {
|
|
131
|
+
setQuicklook((prev) => (prev
|
|
132
|
+
? { ...prev, offset: Math.max(0, prev.offset - 1) }
|
|
133
|
+
: prev));
|
|
134
|
+
return;
|
|
135
|
+
}
|
|
136
|
+
if (key.downArrow) {
|
|
137
|
+
setQuicklook((prev) => (prev
|
|
138
|
+
? { ...prev, offset: Math.min(maxOffset, prev.offset + 1) }
|
|
139
|
+
: prev));
|
|
140
|
+
return;
|
|
141
|
+
}
|
|
142
|
+
if (key.pageUp) {
|
|
143
|
+
setQuicklook((prev) => (prev
|
|
144
|
+
? { ...prev, offset: Math.max(0, prev.offset - DIFF_SCROLL_PAGE_SIZE) }
|
|
145
|
+
: prev));
|
|
146
|
+
return;
|
|
147
|
+
}
|
|
148
|
+
if (key.pageDown) {
|
|
149
|
+
setQuicklook((prev) => (prev
|
|
150
|
+
? { ...prev, offset: Math.min(maxOffset, prev.offset + DIFF_SCROLL_PAGE_SIZE) }
|
|
151
|
+
: prev));
|
|
152
|
+
return;
|
|
153
|
+
}
|
|
154
|
+
if (key.escape || key.return || input === ' ') {
|
|
155
|
+
setQuicklook(null);
|
|
156
|
+
}
|
|
157
|
+
return;
|
|
158
|
+
}
|
|
159
|
+
if (key.escape) {
|
|
160
|
+
writeCancelAndExit(resultFile, exit);
|
|
161
|
+
return;
|
|
162
|
+
}
|
|
163
|
+
if (totalRows === 0)
|
|
164
|
+
return;
|
|
165
|
+
if (key.upArrow) {
|
|
166
|
+
setSelectedRow((prev) => Math.max(0, prev - 1));
|
|
167
|
+
return;
|
|
168
|
+
}
|
|
169
|
+
if (key.downArrow) {
|
|
170
|
+
setSelectedRow((prev) => Math.min(totalRows - 1, prev + 1));
|
|
171
|
+
return;
|
|
172
|
+
}
|
|
173
|
+
if (key.return || input === ' ') {
|
|
174
|
+
if (selectedRow < optionCount) {
|
|
175
|
+
// Preserve safety for actions: only Enter confirms action rows.
|
|
176
|
+
if (!key.return)
|
|
177
|
+
return;
|
|
178
|
+
const option = data.options[selectedRow];
|
|
179
|
+
if (!option)
|
|
180
|
+
return;
|
|
181
|
+
writeSuccessAndExit(resultFile, option.id, exit);
|
|
182
|
+
return;
|
|
183
|
+
}
|
|
184
|
+
if (selectedFile) {
|
|
185
|
+
openQuicklook(selectedFile);
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
});
|
|
189
|
+
const hasFilesAbove = fileWindow.start > 0;
|
|
190
|
+
const hasFilesBelow = fileWindow.end < fileCount;
|
|
191
|
+
const quicklookVisibleLines = quicklook
|
|
192
|
+
? quicklook.lines.slice(quicklook.offset, quicklook.offset + maxVisibleDiffLines)
|
|
193
|
+
: [];
|
|
194
|
+
const quicklookEnd = quicklook
|
|
195
|
+
? Math.min(quicklook.offset + maxVisibleDiffLines, quicklook.lines.length)
|
|
196
|
+
: 0;
|
|
197
|
+
const footer = quicklook
|
|
198
|
+
? '↑↓ scroll • PgUp/PgDn • Space/Enter/ESC back'
|
|
199
|
+
: '↑↓ navigate • Enter select • Space/Enter peek • ESC cancel';
|
|
200
|
+
return (React.createElement(PopupWrapper, { resultFile: resultFile, allowEscapeToCancel: false },
|
|
201
|
+
React.createElement(PopupContainer, { footer: footer }, quicklook ? (React.createElement(Box, { flexDirection: "column" },
|
|
202
|
+
React.createElement(Box, { marginBottom: 1, flexDirection: "column" },
|
|
203
|
+
React.createElement(Text, { bold: true, color: POPUP_CONFIG.titleColor, wrap: "truncate-end" }, quicklook.filePath),
|
|
204
|
+
React.createElement(Text, { dimColor: true },
|
|
205
|
+
"Compared to ",
|
|
206
|
+
data.diffMode === 'target-branch' ? data.targetBranch : 'working tree base'),
|
|
207
|
+
React.createElement(Text, { dimColor: true },
|
|
208
|
+
"Lines ",
|
|
209
|
+
Math.min(quicklook.offset + 1, quicklook.lines.length),
|
|
210
|
+
"-",
|
|
211
|
+
quicklookEnd,
|
|
212
|
+
" of ",
|
|
213
|
+
quicklook.lines.length)),
|
|
214
|
+
React.createElement(Box, { flexDirection: "column" }, quicklookVisibleLines.map((line, index) => (React.createElement(Text, { key: `${quicklook.offset + index}`, color: getDiffLineColor(line), wrap: "truncate-end" }, line.length > 0 ? line : ' ')))))) : (React.createElement(React.Fragment, null,
|
|
215
|
+
React.createElement(Box, { marginBottom: 1, flexDirection: "column" },
|
|
216
|
+
React.createElement(Text, { bold: true, color: POPUP_CONFIG.titleColor }, data.title),
|
|
217
|
+
React.createElement(Text, { dimColor: true }, data.message)),
|
|
218
|
+
React.createElement(Box, { marginBottom: 1, flexDirection: "column" },
|
|
219
|
+
data.options.map((option, index) => {
|
|
220
|
+
const isSelected = selectedRow === index;
|
|
221
|
+
return (React.createElement(Box, { key: option.id },
|
|
222
|
+
React.createElement(Text, { color: isSelected
|
|
223
|
+
? POPUP_CONFIG.titleColor
|
|
224
|
+
: option.danger
|
|
225
|
+
? POPUP_CONFIG.errorColor
|
|
226
|
+
: 'white', bold: isSelected },
|
|
227
|
+
isSelected ? '▶ ' : ' ',
|
|
228
|
+
option.label)));
|
|
229
|
+
}),
|
|
230
|
+
selectedOption?.description && (React.createElement(Box, { marginLeft: 2 },
|
|
231
|
+
React.createElement(Text, { dimColor: true }, selectedOption.description)))),
|
|
232
|
+
React.createElement(Box, { flexDirection: "column" },
|
|
233
|
+
React.createElement(Text, { bold: true, color: POPUP_CONFIG.titleColor },
|
|
234
|
+
"Changed Files (",
|
|
235
|
+
fileCount,
|
|
236
|
+
")"),
|
|
237
|
+
React.createElement(Box, { borderStyle: "round", borderColor: selectedFile ? POPUP_CONFIG.titleColor : 'gray', paddingX: 1, flexDirection: "column" },
|
|
238
|
+
hasFilesAbove && React.createElement(Text, { dimColor: true }, "\u2191 more files above"),
|
|
239
|
+
fileWindow.visibleFiles.length === 0 ? (React.createElement(Text, { dimColor: true }, "No changed files provided.")) : (fileWindow.visibleFiles.map((file, index) => {
|
|
240
|
+
const actualFileIndex = fileWindow.start + index;
|
|
241
|
+
const rowIndex = optionCount + actualFileIndex;
|
|
242
|
+
const isSelected = rowIndex === selectedRow;
|
|
243
|
+
return (React.createElement(Text, { key: `${file}-${actualFileIndex}`, color: isSelected ? POPUP_CONFIG.successColor : 'white', bold: isSelected, wrap: "truncate-end" },
|
|
244
|
+
isSelected ? '▶ ' : ' ',
|
|
245
|
+
file));
|
|
246
|
+
})),
|
|
247
|
+
hasFilesBelow && React.createElement(Text, { dimColor: true }, "\u2193 more files below"))),
|
|
248
|
+
React.createElement(Box, { marginTop: 1, flexDirection: "column" }, selectedFile && (React.createElement(Text, { dimColor: true },
|
|
249
|
+
"Space or Enter on file opens diff peek against ",
|
|
250
|
+
data.targetBranch,
|
|
251
|
+
"."))))))));
|
|
252
|
+
};
|
|
253
|
+
function isChoiceOption(value) {
|
|
254
|
+
if (!value || typeof value !== 'object')
|
|
255
|
+
return false;
|
|
256
|
+
const candidate = value;
|
|
257
|
+
return typeof candidate.id === 'string' && typeof candidate.label === 'string';
|
|
258
|
+
}
|
|
259
|
+
function main() {
|
|
260
|
+
const resultFile = process.argv[2];
|
|
261
|
+
const dataFile = process.argv[3];
|
|
262
|
+
if (!resultFile || !dataFile) {
|
|
263
|
+
console.error('Error: Result file and data file required');
|
|
264
|
+
process.exit(1);
|
|
265
|
+
}
|
|
266
|
+
let data;
|
|
267
|
+
try {
|
|
268
|
+
const parsed = JSON.parse(fs.readFileSync(dataFile, 'utf-8'));
|
|
269
|
+
data = {
|
|
270
|
+
title: parsed.title || 'Uncommitted Changes',
|
|
271
|
+
message: parsed.message || '',
|
|
272
|
+
options: Array.isArray(parsed.options) ? parsed.options.filter(isChoiceOption) : [],
|
|
273
|
+
kind: 'merge_uncommitted',
|
|
274
|
+
repoPath: parsed.repoPath || process.cwd(),
|
|
275
|
+
targetBranch: parsed.targetBranch || 'HEAD',
|
|
276
|
+
files: Array.isArray(parsed.files)
|
|
277
|
+
? parsed.files.filter((file) => typeof file === 'string')
|
|
278
|
+
: [],
|
|
279
|
+
diffMode: parsed.diffMode === 'target-branch' ? 'target-branch' : 'working-tree',
|
|
280
|
+
};
|
|
281
|
+
}
|
|
282
|
+
catch {
|
|
283
|
+
console.error('Error: Failed to read or parse merge uncommitted popup data');
|
|
284
|
+
process.exit(1);
|
|
285
|
+
}
|
|
286
|
+
render(React.createElement(MergeUncommittedChoicePopupApp, { resultFile: resultFile, data: data }));
|
|
287
|
+
}
|
|
288
|
+
main();
|
|
289
|
+
//# sourceMappingURL=mergeUncommittedChoicePopup.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mergeUncommittedChoicePopup.js","sourceRoot":"","sources":["../../../src/components/popups/mergeUncommittedChoicePopup.tsx"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ import fs from "fs";
|
|
|
13
13
|
import path from "path";
|
|
14
14
|
const PROJECT_PATH_ARG = process.argv[3];
|
|
15
15
|
const FILE_SCAN_ROOT = PROJECT_PATH_ARG || process.cwd();
|
|
16
|
+
const PROJECT_NAME = path.basename(FILE_SCAN_ROOT);
|
|
16
17
|
// Debug logging to file
|
|
17
18
|
const DEBUG_LOG = path.join(FILE_SCAN_ROOT, '.dmux', 'file-picker-debug.log');
|
|
18
19
|
function debugLog(message, data) {
|
|
@@ -216,6 +217,13 @@ const NewPanePopupApp = ({ resultFile }) => {
|
|
|
216
217
|
};
|
|
217
218
|
return (React.createElement(PopupWrapper, { resultFile: resultFile, allowEscapeToCancel: true, shouldAllowCancel: shouldAllowCancel },
|
|
218
219
|
React.createElement(PopupContainer, { footer: PopupFooters.input() },
|
|
220
|
+
React.createElement(Box, { marginBottom: 0 },
|
|
221
|
+
React.createElement(Text, { dimColor: true }, "Project: "),
|
|
222
|
+
React.createElement(Text, { bold: true, color: "cyan" }, PROJECT_NAME),
|
|
223
|
+
React.createElement(Text, { dimColor: true },
|
|
224
|
+
" (",
|
|
225
|
+
FILE_SCAN_ROOT,
|
|
226
|
+
")")),
|
|
219
227
|
React.createElement(Box, { marginBottom: 1 },
|
|
220
228
|
React.createElement(Text, { dimColor: true }, "Enter a prompt for your AI agent.")),
|
|
221
229
|
React.createElement(Box, { width: "100%", borderStyle: POPUP_CONFIG.inputBorderStyle, borderColor: POPUP_CONFIG.inputBorderColor, paddingX: POPUP_CONFIG.inputPadding.x, paddingY: POPUP_CONFIG.inputPadding.y },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"newPanePopup.js","sourceRoot":"","sources":["../../../src/components/popups/newPanePopup.tsx"],"names":[],"mappings":";AAEA;;;GAGG;AAEH,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAA;AACzD,OAAO,EACL,cAAc,EAEd,YAAY,EACZ,mBAAmB,EACnB,QAAQ,GACT,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,cAAc,MAAM,6BAA6B,CAAA;AACxD,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC9E,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,IAAI,MAAM,MAAM,CAAA;AAEvB,MAAM,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACxC,MAAM,cAAc,GAAG,gBAAgB,IAAI,OAAO,CAAC,GAAG,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"newPanePopup.js","sourceRoot":"","sources":["../../../src/components/popups/newPanePopup.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"projectSelectPopup.d.ts","sourceRoot":"","sources":["../../../src/components/popups/projectSelectPopup.tsx"],"names":[],"mappings":";AAEA;;;GAGG"}
|
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
/**
|
|
3
|
+
* Standalone popup for selecting a project directory with autocomplete.
|
|
4
|
+
* Runs in a tmux popup modal and writes result to a file.
|
|
5
|
+
*/
|
|
6
|
+
import React, { useState, useMemo, useRef } from "react";
|
|
7
|
+
import { render, useApp, useInput } from "ink";
|
|
8
|
+
import * as fs from "fs";
|
|
9
|
+
import CleanTextInput from "../inputs/CleanTextInput.js";
|
|
10
|
+
import { PopupContainer, PopupWrapper, DirectoryList, writeSuccessAndExit, } from "./shared/index.js";
|
|
11
|
+
import { POPUP_CONFIG } from "./config.js";
|
|
12
|
+
import { expandTilde, parsePathInput, scanDirectories, } from "../../utils/dirScanner.js";
|
|
13
|
+
const ProjectSelectApp = ({ resultFile, defaultValue, }) => {
|
|
14
|
+
const [value, setValue] = useState(defaultValue);
|
|
15
|
+
// -1 = nothing highlighted, user must press ↓ to enter the list
|
|
16
|
+
const [selectedDirIndex, setSelectedDirIndex] = useState(-1);
|
|
17
|
+
const { exit } = useApp();
|
|
18
|
+
// Derive directories synchronously — no useEffect, no extra render cycle
|
|
19
|
+
const directories = useMemo(() => {
|
|
20
|
+
const { parentDir, prefix } = parsePathInput(value);
|
|
21
|
+
return scanDirectories(parentDir, prefix);
|
|
22
|
+
}, [value]);
|
|
23
|
+
// Reset selection when value changes (back to "nothing highlighted")
|
|
24
|
+
const prevValueRef = useRef(value);
|
|
25
|
+
if (value !== prevValueRef.current) {
|
|
26
|
+
prevValueRef.current = value;
|
|
27
|
+
if (selectedDirIndex !== -1) {
|
|
28
|
+
setSelectedDirIndex(-1);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
// Navigate into the highlighted directory (append to input)
|
|
32
|
+
const navigateIntoSelected = () => {
|
|
33
|
+
if (selectedDirIndex >= 0 && selectedDirIndex < directories.length) {
|
|
34
|
+
const selected = directories[selectedDirIndex];
|
|
35
|
+
if (selected) {
|
|
36
|
+
setValue(selected.fullPath + "/");
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
// Handle keyboard navigation
|
|
41
|
+
useInput((input, key) => {
|
|
42
|
+
// ESC: if something is highlighted, deselect it first;
|
|
43
|
+
// then clear input; then let PopupWrapper close
|
|
44
|
+
if (key.escape) {
|
|
45
|
+
if (selectedDirIndex >= 0) {
|
|
46
|
+
setSelectedDirIndex(-1);
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
if (value.length > 0) {
|
|
50
|
+
setValue("");
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
// ↑/↓ — navigate directory list
|
|
56
|
+
if (key.downArrow) {
|
|
57
|
+
if (directories.length > 0) {
|
|
58
|
+
setSelectedDirIndex((prev) => Math.min(directories.length - 1, prev + 1));
|
|
59
|
+
}
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
if (key.upArrow) {
|
|
63
|
+
setSelectedDirIndex((prev) => Math.max(-1, prev - 1));
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
// Tab — autocomplete first match (or highlighted match)
|
|
67
|
+
if (key.tab && directories.length > 0) {
|
|
68
|
+
const idx = selectedDirIndex >= 0 ? selectedDirIndex : 0;
|
|
69
|
+
const selected = directories[idx];
|
|
70
|
+
if (selected) {
|
|
71
|
+
setValue(selected.fullPath + "/");
|
|
72
|
+
}
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
});
|
|
76
|
+
const handleSubmit = (submittedValue) => {
|
|
77
|
+
const finalValue = submittedValue || value;
|
|
78
|
+
if (!finalValue.trim())
|
|
79
|
+
return;
|
|
80
|
+
// If a directory is highlighted, Enter navigates into it
|
|
81
|
+
if (selectedDirIndex >= 0) {
|
|
82
|
+
navigateIntoSelected();
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
// Nothing highlighted — submit the current value
|
|
86
|
+
const expanded = expandTilde(finalValue);
|
|
87
|
+
writeSuccessAndExit(resultFile, expanded, exit);
|
|
88
|
+
};
|
|
89
|
+
const shouldAllowCancel = () => {
|
|
90
|
+
if (selectedDirIndex >= 0)
|
|
91
|
+
return false;
|
|
92
|
+
if (value.length > 0)
|
|
93
|
+
return false;
|
|
94
|
+
return true;
|
|
95
|
+
};
|
|
96
|
+
const footer = `↓ browse • Tab complete • Enter submit • ${POPUP_CONFIG.cancelHint}`;
|
|
97
|
+
return (React.createElement(PopupWrapper, { resultFile: resultFile, allowEscapeToCancel: true, shouldAllowCancel: shouldAllowCancel },
|
|
98
|
+
React.createElement(PopupContainer, { footer: footer },
|
|
99
|
+
React.createElement(CleanTextInput, { value: value, onChange: setValue, onSubmit: handleSubmit, placeholder: "~/projects/my-app", maxWidth: 72, cursorPosition: value.length, disableUpDownArrows: true, disableEscape: true, ignoreFocus: true }),
|
|
100
|
+
React.createElement(DirectoryList, { directories: directories, selectedIndex: selectedDirIndex, maxVisible: 10 }))));
|
|
101
|
+
};
|
|
102
|
+
// Entry point
|
|
103
|
+
function main() {
|
|
104
|
+
const resultFile = process.argv[2];
|
|
105
|
+
const dataFile = process.argv[3];
|
|
106
|
+
if (!resultFile) {
|
|
107
|
+
console.error("Error: Result file path required");
|
|
108
|
+
process.exit(1);
|
|
109
|
+
}
|
|
110
|
+
let defaultValue = "";
|
|
111
|
+
if (dataFile) {
|
|
112
|
+
try {
|
|
113
|
+
const dataJson = fs.readFileSync(dataFile, "utf-8");
|
|
114
|
+
const data = JSON.parse(dataJson);
|
|
115
|
+
defaultValue = data.defaultValue || "";
|
|
116
|
+
}
|
|
117
|
+
catch {
|
|
118
|
+
// Ignore parse errors — use empty default
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
render(React.createElement(ProjectSelectApp, { resultFile: resultFile, defaultValue: defaultValue }));
|
|
122
|
+
}
|
|
123
|
+
main();
|
|
124
|
+
//# sourceMappingURL=projectSelectPopup.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"projectSelectPopup.js","sourceRoot":"","sources":["../../../src/components/popups/projectSelectPopup.tsx"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,7 @@ function formatRelativeTime(dateStr) {
|
|
|
33
33
|
const ReopenWorktreePopupApp = ({ resultFile, worktrees, }) => {
|
|
34
34
|
const [selectedIndex, setSelectedIndex] = useState(0);
|
|
35
35
|
const { exit } = useApp();
|
|
36
|
+
const maxVisible = 8;
|
|
36
37
|
useInput((input, key) => {
|
|
37
38
|
if (key.upArrow) {
|
|
38
39
|
setSelectedIndex(Math.max(0, selectedIndex - 1));
|
|
@@ -53,13 +54,37 @@ const ReopenWorktreePopupApp = ({ resultFile, worktrees, }) => {
|
|
|
53
54
|
React.createElement(Text, { dimColor: true }, "No closed worktrees found."),
|
|
54
55
|
React.createElement(Text, { dimColor: true }, "All worktrees have active panes.")))));
|
|
55
56
|
}
|
|
57
|
+
const totalWorktrees = worktrees.length;
|
|
58
|
+
let startIndex = 0;
|
|
59
|
+
let endIndex = Math.min(maxVisible, totalWorktrees);
|
|
60
|
+
if (selectedIndex >= endIndex) {
|
|
61
|
+
endIndex = selectedIndex + 1;
|
|
62
|
+
startIndex = Math.max(0, endIndex - maxVisible);
|
|
63
|
+
}
|
|
64
|
+
else if (selectedIndex < startIndex) {
|
|
65
|
+
startIndex = selectedIndex;
|
|
66
|
+
endIndex = Math.min(startIndex + maxVisible, totalWorktrees);
|
|
67
|
+
}
|
|
68
|
+
if (selectedIndex >= maxVisible / 2 && totalWorktrees > maxVisible) {
|
|
69
|
+
startIndex = Math.max(0, selectedIndex - Math.floor(maxVisible / 2));
|
|
70
|
+
endIndex = Math.min(startIndex + maxVisible, totalWorktrees);
|
|
71
|
+
startIndex = Math.max(0, endIndex - maxVisible);
|
|
72
|
+
}
|
|
73
|
+
const visibleWorktrees = worktrees.slice(startIndex, endIndex);
|
|
74
|
+
const showScrollIndicators = totalWorktrees > maxVisible;
|
|
56
75
|
return (React.createElement(PopupWrapper, { resultFile: resultFile },
|
|
57
76
|
React.createElement(PopupContainer, { footer: PopupFooters.choice() },
|
|
58
77
|
React.createElement(Box, { marginBottom: 1 },
|
|
59
|
-
React.createElement(Text, { dimColor: true }, "Select a worktree to reopen
|
|
60
|
-
React.createElement(Box, {
|
|
78
|
+
React.createElement(Text, { dimColor: true }, "Select a worktree to reopen:")),
|
|
79
|
+
showScrollIndicators && startIndex > 0 && (React.createElement(Box, { marginBottom: 1 },
|
|
80
|
+
React.createElement(Text, { dimColor: true },
|
|
81
|
+
"\u2191 ",
|
|
82
|
+
startIndex,
|
|
83
|
+
" more above"))),
|
|
84
|
+
React.createElement(Box, { flexDirection: "column" }, visibleWorktrees.map((worktree, idx) => {
|
|
85
|
+
const index = startIndex + idx;
|
|
61
86
|
const isSelected = index === selectedIndex;
|
|
62
|
-
return (React.createElement(Box, { key: worktree.slug, marginBottom:
|
|
87
|
+
return (React.createElement(Box, { key: worktree.slug, marginBottom: idx < visibleWorktrees.length - 1 ? 1 : 0 },
|
|
63
88
|
React.createElement(Box, { flexDirection: "column" },
|
|
64
89
|
React.createElement(Text, { color: isSelected ? POPUP_CONFIG.titleColor : 'white', bold: isSelected },
|
|
65
90
|
isSelected ? '▶ ' : ' ',
|
|
@@ -70,6 +95,11 @@ const ReopenWorktreePopupApp = ({ resultFile, worktrees, }) => {
|
|
|
70
95
|
formatRelativeTime(worktree.lastModified),
|
|
71
96
|
worktree.branch !== worktree.slug && ` • branch: ${worktree.branch}`)))));
|
|
72
97
|
})),
|
|
98
|
+
showScrollIndicators && endIndex < totalWorktrees && (React.createElement(Box, { marginTop: 1 },
|
|
99
|
+
React.createElement(Text, { dimColor: true },
|
|
100
|
+
"\u2193 ",
|
|
101
|
+
totalWorktrees - endIndex,
|
|
102
|
+
" more below"))),
|
|
73
103
|
React.createElement(Box, { marginTop: 1 },
|
|
74
104
|
React.createElement(Text, { dimColor: true, italic: true }, "* = has uncommitted changes")))));
|
|
75
105
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reopenWorktreePopup.js","sourceRoot":"","sources":["../../../src/components/popups/reopenWorktreePopup.tsx"],"names":[],"mappings":";AAEA;;;GAGG;AAEH,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACtF,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAezD;;GAEG;AACH,SAAS,kBAAkB,CAAC,OAAe;IACzC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,EAAE,CAAC,CAAC;IAE5C,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;QACjB,OAAO,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,QAAQ,WAAW,CAAC;IAC/D,CAAC;IACD,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;QAClB,OAAO,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,YAAY,CAAC;IACnE,CAAC;IACD,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;QACpB,OAAO,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,WAAW,cAAc,CAAC;IAC3E,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,sBAAsB,GAAuC,CAAC,EAClE,UAAU,EACV,SAAS,GACV,EAAE,EAAE;IACH,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IACtD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"reopenWorktreePopup.js","sourceRoot":"","sources":["../../../src/components/popups/reopenWorktreePopup.tsx"],"names":[],"mappings":"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"}
|