dmux 5.4.0 → 5.5.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 +1 -0
- package/dist/DmuxApp.d.ts.map +1 -1
- package/dist/DmuxApp.js +225 -51
- package/dist/DmuxApp.js.map +1 -1
- package/dist/FileBrowserApp.d.ts +4 -0
- package/dist/FileBrowserApp.d.ts.map +1 -0
- package/dist/FileBrowserApp.js +693 -0
- package/dist/FileBrowserApp.js.map +1 -0
- package/dist/actions/implementations/closeAction.js +2 -2
- package/dist/actions/implementations/closeAction.js.map +1 -1
- package/dist/actions/implementations/mergeAction.d.ts.map +1 -1
- package/dist/actions/implementations/mergeAction.js +51 -16
- package/dist/actions/implementations/mergeAction.js.map +1 -1
- package/dist/actions/implementations/viewAction.d.ts.map +1 -1
- package/dist/actions/implementations/viewAction.js +7 -0
- package/dist/actions/implementations/viewAction.js.map +1 -1
- package/dist/actions/index.d.ts.map +1 -1
- package/dist/actions/index.js +12 -0
- package/dist/actions/index.js.map +1 -1
- package/dist/actions/merge/multiMergeOrchestrator.js +1 -1
- package/dist/actions/merge/multiMergeOrchestrator.js.map +1 -1
- package/dist/actions/types.d.ts +18 -4
- package/dist/actions/types.d.ts.map +1 -1
- package/dist/actions/types.js +82 -0
- package/dist/actions/types.js.map +1 -1
- package/dist/components/indicators/Spinner.d.ts +2 -0
- package/dist/components/indicators/Spinner.d.ts.map +1 -1
- package/dist/components/indicators/Spinner.js +4 -4
- package/dist/components/indicators/Spinner.js.map +1 -1
- package/dist/components/panes/KebabMenu.d.ts +2 -2
- package/dist/components/panes/KebabMenu.d.ts.map +1 -1
- package/dist/components/panes/KebabMenu.js +9 -4
- package/dist/components/panes/KebabMenu.js.map +1 -1
- package/dist/components/panes/PaneCard.d.ts.map +1 -1
- package/dist/components/panes/PaneCard.js +20 -4
- 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 +11 -3
- package/dist/components/panes/PanesGrid.js.map +1 -1
- package/dist/components/popups/kebabMenuPopup.js +9 -4
- package/dist/components/popups/kebabMenuPopup.js.map +1 -1
- package/dist/components/popups/notificationSoundsPopup.d.ts +25 -0
- package/dist/components/popups/notificationSoundsPopup.d.ts.map +1 -0
- package/dist/components/popups/notificationSoundsPopup.js +165 -0
- package/dist/components/popups/notificationSoundsPopup.js.map +1 -0
- package/dist/components/popups/settingsPopup.js +15 -1
- package/dist/components/popups/settingsPopup.js.map +1 -1
- package/dist/components/popups/shortcutsPopup.js +8 -3
- package/dist/components/popups/shortcutsPopup.js.map +1 -1
- package/dist/hooks/useActionSystem.d.ts +9 -5
- package/dist/hooks/useActionSystem.d.ts.map +1 -1
- package/dist/hooks/useActionSystem.js +21 -19
- package/dist/hooks/useActionSystem.js.map +1 -1
- package/dist/hooks/useInputHandling.d.ts +1 -0
- package/dist/hooks/useInputHandling.d.ts.map +1 -1
- package/dist/hooks/useInputHandling.js +300 -15
- package/dist/hooks/useInputHandling.js.map +1 -1
- package/dist/hooks/usePaneCreation.d.ts +4 -2
- package/dist/hooks/usePaneCreation.d.ts.map +1 -1
- package/dist/hooks/usePaneCreation.js +6 -0
- package/dist/hooks/usePaneCreation.js.map +1 -1
- package/dist/hooks/usePaneLoading.d.ts +1 -0
- package/dist/hooks/usePaneLoading.d.ts.map +1 -1
- package/dist/hooks/usePaneLoading.js +10 -7
- package/dist/hooks/usePaneLoading.js.map +1 -1
- package/dist/hooks/usePaneSync.js +2 -2
- package/dist/hooks/usePaneSync.js.map +1 -1
- package/dist/hooks/useProjectActivity.d.ts +7 -0
- package/dist/hooks/useProjectActivity.d.ts.map +1 -0
- package/dist/hooks/useProjectActivity.js +79 -0
- package/dist/hooks/useProjectActivity.js.map +1 -0
- package/dist/hooks/useServices.d.ts +2 -0
- package/dist/hooks/useServices.d.ts.map +1 -1
- package/dist/hooks/useServices.js +2 -0
- package/dist/hooks/useServices.js.map +1 -1
- package/dist/index.js +53 -12
- package/dist/index.js.map +1 -1
- package/dist/services/DmuxAttentionService.d.ts +33 -0
- package/dist/services/DmuxAttentionService.d.ts.map +1 -0
- package/dist/services/DmuxAttentionService.js +172 -0
- package/dist/services/DmuxAttentionService.js.map +1 -0
- package/dist/services/DmuxFocusService.d.ts +58 -0
- package/dist/services/DmuxFocusService.d.ts.map +1 -0
- package/dist/services/DmuxFocusService.js +671 -0
- package/dist/services/DmuxFocusService.js.map +1 -0
- package/dist/services/PaneAnalyzer.d.ts +11 -2
- package/dist/services/PaneAnalyzer.d.ts.map +1 -1
- package/dist/services/PaneAnalyzer.js +88 -22
- package/dist/services/PaneAnalyzer.js.map +1 -1
- package/dist/services/PopupManager.d.ts +24 -14
- package/dist/services/PopupManager.d.ts.map +1 -1
- package/dist/services/PopupManager.js +109 -62
- package/dist/services/PopupManager.js.map +1 -1
- package/dist/services/StatusDetector.d.ts +14 -0
- package/dist/services/StatusDetector.d.ts.map +1 -1
- package/dist/services/StatusDetector.js +60 -12
- package/dist/services/StatusDetector.js.map +1 -1
- package/dist/services/TmuxService.d.ts +37 -2
- package/dist/services/TmuxService.d.ts.map +1 -1
- package/dist/services/TmuxService.js +138 -16
- package/dist/services/TmuxService.js.map +1 -1
- package/dist/types/activity.d.ts +4 -0
- package/dist/types/activity.d.ts.map +1 -0
- package/dist/types/activity.js +2 -0
- package/dist/types/activity.js.map +1 -0
- package/dist/types.d.ts +11 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/devWatchExit.d.ts +2 -0
- package/dist/utils/devWatchExit.d.ts.map +1 -0
- package/dist/utils/devWatchExit.js +10 -0
- package/dist/utils/devWatchExit.js.map +1 -0
- package/dist/utils/dmuxCommand.d.ts +3 -0
- package/dist/utils/dmuxCommand.d.ts.map +1 -0
- package/dist/utils/dmuxCommand.js +18 -0
- package/dist/utils/dmuxCommand.js.map +1 -0
- package/dist/utils/fileBrowser.d.ts +61 -0
- package/dist/utils/fileBrowser.d.ts.map +1 -0
- package/dist/utils/fileBrowser.js +567 -0
- package/dist/utils/fileBrowser.js.map +1 -0
- package/dist/utils/focusDetection.d.ts +38 -0
- package/dist/utils/focusDetection.d.ts.map +1 -0
- package/dist/utils/focusDetection.js +57 -0
- package/dist/utils/focusDetection.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/git.d.ts +4 -0
- package/dist/utils/git.d.ts.map +1 -1
- package/dist/utils/git.js +15 -0
- package/dist/utils/git.js.map +1 -1
- package/dist/utils/mergeTargets.d.ts +17 -0
- package/dist/utils/mergeTargets.d.ts.map +1 -0
- package/dist/utils/mergeTargets.js +132 -0
- package/dist/utils/mergeTargets.js.map +1 -0
- package/dist/utils/mergeValidation.d.ts.map +1 -1
- package/dist/utils/mergeValidation.js +12 -5
- package/dist/utils/mergeValidation.js.map +1 -1
- package/dist/utils/notificationSoundPreview.d.ts +10 -0
- package/dist/utils/notificationSoundPreview.d.ts.map +1 -0
- package/dist/utils/notificationSoundPreview.js +54 -0
- package/dist/utils/notificationSoundPreview.js.map +1 -0
- package/dist/utils/notificationSounds.d.ts +17 -0
- package/dist/utils/notificationSounds.d.ts.map +1 -0
- package/dist/utils/notificationSounds.js +123 -0
- package/dist/utils/notificationSounds.js.map +1 -0
- package/dist/utils/paneAttentionHeuristics.d.ts +4 -0
- package/dist/utils/paneAttentionHeuristics.d.ts.map +1 -0
- package/dist/utils/paneAttentionHeuristics.js +135 -0
- package/dist/utils/paneAttentionHeuristics.js.map +1 -0
- package/dist/utils/paneCreation.d.ts +3 -1
- package/dist/utils/paneCreation.d.ts.map +1 -1
- package/dist/utils/paneCreation.js +23 -5
- package/dist/utils/paneCreation.js.map +1 -1
- package/dist/utils/paneVisibility.d.ts +12 -0
- package/dist/utils/paneVisibility.d.ts.map +1 -0
- package/dist/utils/paneVisibility.js +60 -0
- package/dist/utils/paneVisibility.js.map +1 -0
- package/dist/utils/processShutdown.d.ts +4 -0
- package/dist/utils/processShutdown.d.ts.map +1 -0
- package/dist/utils/processShutdown.js +27 -0
- package/dist/utils/processShutdown.js.map +1 -0
- package/dist/utils/promptStore.d.ts.map +1 -1
- package/dist/utils/promptStore.js +6 -0
- package/dist/utils/promptStore.js.map +1 -1
- package/dist/utils/reopenWorktree.d.ts.map +1 -1
- package/dist/utils/reopenWorktree.js +8 -0
- package/dist/utils/reopenWorktree.js.map +1 -1
- package/dist/utils/runtimePaths.d.ts +1 -0
- package/dist/utils/runtimePaths.d.ts.map +1 -1
- package/dist/utils/runtimePaths.js +3 -0
- package/dist/utils/runtimePaths.js.map +1 -1
- package/dist/utils/settingsManager.d.ts.map +1 -1
- package/dist/utils/settingsManager.js +41 -7
- package/dist/utils/settingsManager.js.map +1 -1
- package/dist/utils/tmuxConfigOnboarding.js +1 -1
- package/dist/utils/tmuxConfigOnboarding.js.map +1 -1
- package/dist/utils/tmuxRuntimeCompatibility.d.ts +11 -0
- package/dist/utils/tmuxRuntimeCompatibility.d.ts.map +1 -0
- package/dist/utils/tmuxRuntimeCompatibility.js +71 -0
- package/dist/utils/tmuxRuntimeCompatibility.js.map +1 -0
- package/dist/utils/worktreeMetadata.d.ts +9 -0
- package/dist/utils/worktreeMetadata.d.ts.map +1 -0
- package/dist/utils/worktreeMetadata.js +60 -0
- package/dist/utils/worktreeMetadata.js.map +1 -0
- package/dist/workers/PaneWorker.js +64 -128
- package/dist/workers/PaneWorker.js.map +1 -1
- package/dist/workers/WorkerMessages.d.ts +4 -1
- package/dist/workers/WorkerMessages.d.ts.map +1 -1
- package/dist/workers/WorkerMessages.js.map +1 -1
- package/native/macos/dmux-helper-Info.plist +30 -0
- package/native/macos/dmux-helper-icon.png +0 -0
- package/native/macos/dmux-helper.swift +831 -0
- package/native/macos/sounds/dmux-braam.caf +0 -0
- package/native/macos/sounds/dmux-brass.caf +0 -0
- package/native/macos/sounds/dmux-ding-bell.caf +0 -0
- package/native/macos/sounds/dmux-future.caf +0 -0
- package/native/macos/sounds/dmux-harp.caf +0 -0
- package/native/macos/sounds/dmux-quiet-bells.caf +0 -0
- package/native/macos/sounds/dmux-sonar.caf +0 -0
- package/native/macos/sounds/dmux-success.caf +0 -0
- package/native/macos/sounds/dmux-triumphant-trumpet.caf +0 -0
- package/native/macos/sounds/dmux-war-horn.caf +0 -0
- package/package.json +3 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usePaneLoading.d.ts","sourceRoot":"","sources":["../../src/hooks/usePaneLoading.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"usePaneLoading.d.ts","sourceRoot":"","sources":["../../src/hooks/usePaneLoading.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAe5C,MAAM,WAAW,UAAU;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,cAAc;IACtB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,UAAU,SAAI,GAAG,OAAO,CAAC;IAC9D,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,CAAC,CAoCD;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAoB9E;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,YAAY,EAAE,QAAQ,EAAE,EACxB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAgCf;AAED;;;;;;GAMG;AACH,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,QAAQ,EAAE,EACjB,UAAU,EAAE,MAAM,EAAE,EACpB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAoGrB;AAED;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,OAAO,GACrB,OAAO,CAAC,cAAc,CAAC,CAwEzB"}
|
|
@@ -8,6 +8,7 @@ import { PaneLifecycleManager } from '../services/PaneLifecycleManager.js';
|
|
|
8
8
|
import { TMUX_RETRY_DELAY } from '../constants/timing.js';
|
|
9
9
|
import { atomicWriteJson } from '../utils/atomicWrite.js';
|
|
10
10
|
import { getPaneTmuxTitle } from '../utils/paneTitle.js';
|
|
11
|
+
import { getVisiblePanes, syncHiddenStateFromCurrentWindow, } from '../utils/paneVisibility.js';
|
|
11
12
|
/**
|
|
12
13
|
* Fetches all tmux pane IDs and titles for the current session
|
|
13
14
|
* Retries up to maxRetries times with delay between attempts
|
|
@@ -17,7 +18,8 @@ export async function fetchTmuxPaneIds(maxRetries = 2) {
|
|
|
17
18
|
let retryCount = 0;
|
|
18
19
|
while (retryCount <= maxRetries) {
|
|
19
20
|
try {
|
|
20
|
-
const paneInfo = await tmuxService.getAllPaneInfo();
|
|
21
|
+
const paneInfo = await tmuxService.getAllPaneInfo('session');
|
|
22
|
+
const currentWindowPaneIds = await tmuxService.getAllPaneIds('window');
|
|
21
23
|
const allPaneIds = [];
|
|
22
24
|
const titleToId = new Map();
|
|
23
25
|
for (const pane of paneInfo) {
|
|
@@ -30,7 +32,7 @@ export async function fetchTmuxPaneIds(maxRetries = 2) {
|
|
|
30
32
|
}
|
|
31
33
|
}
|
|
32
34
|
if (allPaneIds.length > 0 || retryCount === maxRetries) {
|
|
33
|
-
return { allPaneIds, titleToId };
|
|
35
|
+
return { allPaneIds, titleToId, currentWindowPaneIds };
|
|
34
36
|
}
|
|
35
37
|
}
|
|
36
38
|
catch (error) {
|
|
@@ -44,7 +46,7 @@ export async function fetchTmuxPaneIds(maxRetries = 2) {
|
|
|
44
46
|
}
|
|
45
47
|
retryCount++;
|
|
46
48
|
}
|
|
47
|
-
return { allPaneIds: [], titleToId: new Map() };
|
|
49
|
+
return { allPaneIds: [], titleToId: new Map(), currentWindowPaneIds: [] };
|
|
48
50
|
}
|
|
49
51
|
/**
|
|
50
52
|
* Reads and parses the panes config file
|
|
@@ -177,7 +179,7 @@ export async function recreateKilledWorktreePanes(panes, allPaneIds, panesFile)
|
|
|
177
179
|
const { recalculateAndApplyLayout } = await import('../utils/layoutManager.js');
|
|
178
180
|
const { getTerminalDimensions } = await import('../utils/tmux.js');
|
|
179
181
|
const dimensions = getTerminalDimensions();
|
|
180
|
-
const contentPaneIds = updatedPanes.map(p => p.paneId);
|
|
182
|
+
const contentPaneIds = getVisiblePanes(updatedPanes).map(p => p.paneId);
|
|
181
183
|
recalculateAndApplyLayout(config.controlPaneId, contentPaneIds, dimensions.width, dimensions.height);
|
|
182
184
|
// LogService.getInstance().debug(
|
|
183
185
|
// `Recalculated layout after recreating worktree panes`,
|
|
@@ -203,9 +205,9 @@ export async function recreateKilledWorktreePanes(panes, allPaneIds, panesFile)
|
|
|
203
205
|
*/
|
|
204
206
|
export async function loadAndProcessPanes(panesFile, isInitialLoad) {
|
|
205
207
|
const loadedPanes = await loadPanesFromFile(panesFile);
|
|
206
|
-
let { allPaneIds, titleToId } = await fetchTmuxPaneIds();
|
|
208
|
+
let { allPaneIds, titleToId, currentWindowPaneIds } = await fetchTmuxPaneIds();
|
|
207
209
|
// Attempt to rebind panes whose IDs changed by matching on title (slug)
|
|
208
|
-
let reboundPanes = loadedPanes.map(p => rebindPaneByTitle(p, titleToId, allPaneIds));
|
|
210
|
+
let reboundPanes = syncHiddenStateFromCurrentWindow(loadedPanes.map(p => rebindPaneByTitle(p, titleToId, allPaneIds)), currentWindowPaneIds);
|
|
209
211
|
// CRITICAL FIX: On initial load, immediately filter out shell panes with stale IDs
|
|
210
212
|
// Shell panes cannot be recreated (no worktreePath), so keeping them causes:
|
|
211
213
|
// 1. Hang when trying to send keys to non-existent panes
|
|
@@ -242,8 +244,9 @@ export async function loadAndProcessPanes(panesFile, isInitialLoad) {
|
|
|
242
244
|
const freshData = await fetchTmuxPaneIds();
|
|
243
245
|
allPaneIds = freshData.allPaneIds;
|
|
244
246
|
titleToId = freshData.titleToId;
|
|
247
|
+
currentWindowPaneIds = freshData.currentWindowPaneIds;
|
|
245
248
|
// Re-rebind after recreation
|
|
246
|
-
reboundPanes = reboundPanes.map(p => rebindPaneByTitle(p, titleToId, allPaneIds));
|
|
249
|
+
reboundPanes = syncHiddenStateFromCurrentWindow(reboundPanes.map(p => rebindPaneByTitle(p, titleToId, allPaneIds)), currentWindowPaneIds);
|
|
247
250
|
}
|
|
248
251
|
return { panes: reboundPanes, allPaneIds, titleToId };
|
|
249
252
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usePaneLoading.js","sourceRoot":"","sources":["../../src/hooks/usePaneLoading.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAwB,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"usePaneLoading.js","sourceRoot":"","sources":["../../src/hooks/usePaneLoading.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ export async function enforcePaneTitles(panes, allPaneIds, controlPaneId) {
|
|
|
15
15
|
const sessionProjectRoot = StateManager.getInstance().getState().projectRoot;
|
|
16
16
|
const titleByPaneId = new Map();
|
|
17
17
|
try {
|
|
18
|
-
const paneInfo = await tmuxService.getAllPaneInfo();
|
|
18
|
+
const paneInfo = await tmuxService.getAllPaneInfo('session');
|
|
19
19
|
for (const pane of paneInfo) {
|
|
20
20
|
titleByPaneId.set(pane.paneId, pane.title);
|
|
21
21
|
}
|
|
@@ -67,7 +67,7 @@ export async function savePanesToFile(panesFile, panes, withWriteLock) {
|
|
|
67
67
|
try {
|
|
68
68
|
const tmuxService = TmuxService.getInstance();
|
|
69
69
|
const titleToId = new Map();
|
|
70
|
-
const paneInfo = await tmuxService.getAllPaneInfo();
|
|
70
|
+
const paneInfo = await tmuxService.getAllPaneInfo('session');
|
|
71
71
|
for (const pane of paneInfo) {
|
|
72
72
|
if (pane.paneId &&
|
|
73
73
|
pane.paneId.startsWith('%') &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usePaneSync.js","sourceRoot":"","sources":["../../src/hooks/usePaneSync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,aAAa,CAAC;AAE7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,KAAiB,EACjB,UAAoB,EACpB,aAAsB;IAEtB,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;IAC9C,MAAM,kBAAkB,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC;IAC7E,MAAM,aAAa,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEhD,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,cAAc,
|
|
1
|
+
{"version":3,"file":"usePaneSync.js","sourceRoot":"","sources":["../../src/hooks/usePaneSync.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { BeginProjectActivity, TrackProjectActivity } from '../types/activity.js';
|
|
2
|
+
export declare function useProjectActivity(defaultProjectRoot: string): {
|
|
3
|
+
beginProjectActivity: BeginProjectActivity;
|
|
4
|
+
trackProjectActivity: TrackProjectActivity;
|
|
5
|
+
isProjectBusy: (projectRoot?: string | null) => boolean;
|
|
6
|
+
};
|
|
7
|
+
//# sourceMappingURL=useProjectActivity.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useProjectActivity.d.ts","sourceRoot":"","sources":["../../src/hooks/useProjectActivity.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,oBAAoB,EAEpB,oBAAoB,EACrB,MAAM,sBAAsB,CAAC;AAkB9B,wBAAgB,kBAAkB,CAAC,kBAAkB,EAAE,MAAM;;;kCAgEV,MAAM,GAAG,IAAI;EAc/D"}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import { resolve as resolvePath } from 'path';
|
|
2
|
+
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
|
3
|
+
const BUSY_VISIBILITY_DELAY_MS = 120;
|
|
4
|
+
function normalizeProjectRoot(projectRoot, defaultProjectRoot) {
|
|
5
|
+
if (projectRoot === null)
|
|
6
|
+
return null;
|
|
7
|
+
return resolvePath(projectRoot || defaultProjectRoot);
|
|
8
|
+
}
|
|
9
|
+
export function useProjectActivity(defaultProjectRoot) {
|
|
10
|
+
const activitiesRef = useRef(new Map());
|
|
11
|
+
const nextIdRef = useRef(0);
|
|
12
|
+
const [version, setVersion] = useState(0);
|
|
13
|
+
useEffect(() => {
|
|
14
|
+
return () => {
|
|
15
|
+
for (const entry of activitiesRef.current.values()) {
|
|
16
|
+
if (entry.timer) {
|
|
17
|
+
clearTimeout(entry.timer);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
activitiesRef.current.clear();
|
|
21
|
+
};
|
|
22
|
+
}, []);
|
|
23
|
+
const beginProjectActivity = useCallback((projectRoot) => {
|
|
24
|
+
const activityId = nextIdRef.current++;
|
|
25
|
+
const entry = {
|
|
26
|
+
projectRoot: normalizeProjectRoot(projectRoot, defaultProjectRoot),
|
|
27
|
+
visible: false,
|
|
28
|
+
timer: null,
|
|
29
|
+
};
|
|
30
|
+
entry.timer = setTimeout(() => {
|
|
31
|
+
const currentEntry = activitiesRef.current.get(activityId);
|
|
32
|
+
if (!currentEntry)
|
|
33
|
+
return;
|
|
34
|
+
currentEntry.visible = true;
|
|
35
|
+
currentEntry.timer = null;
|
|
36
|
+
setVersion((prev) => prev + 1);
|
|
37
|
+
}, BUSY_VISIBILITY_DELAY_MS);
|
|
38
|
+
activitiesRef.current.set(activityId, entry);
|
|
39
|
+
return () => {
|
|
40
|
+
const currentEntry = activitiesRef.current.get(activityId);
|
|
41
|
+
if (!currentEntry)
|
|
42
|
+
return;
|
|
43
|
+
if (currentEntry.timer) {
|
|
44
|
+
clearTimeout(currentEntry.timer);
|
|
45
|
+
}
|
|
46
|
+
const wasVisible = currentEntry.visible;
|
|
47
|
+
activitiesRef.current.delete(activityId);
|
|
48
|
+
if (wasVisible) {
|
|
49
|
+
setVersion((prev) => prev + 1);
|
|
50
|
+
}
|
|
51
|
+
};
|
|
52
|
+
}, [defaultProjectRoot]);
|
|
53
|
+
const trackProjectActivity = useCallback(async (work, projectRoot) => {
|
|
54
|
+
const finish = beginProjectActivity(projectRoot);
|
|
55
|
+
try {
|
|
56
|
+
return await work();
|
|
57
|
+
}
|
|
58
|
+
finally {
|
|
59
|
+
finish();
|
|
60
|
+
}
|
|
61
|
+
}, [beginProjectActivity]);
|
|
62
|
+
const visibleActivities = useMemo(() => {
|
|
63
|
+
return Array.from(activitiesRef.current.values()).filter((entry) => entry.visible);
|
|
64
|
+
}, [version]);
|
|
65
|
+
const isProjectBusy = useCallback((projectRoot) => {
|
|
66
|
+
const normalized = normalizeProjectRoot(projectRoot, defaultProjectRoot);
|
|
67
|
+
return visibleActivities.some((entry) => {
|
|
68
|
+
if (entry.projectRoot === null)
|
|
69
|
+
return true;
|
|
70
|
+
return entry.projectRoot === normalized;
|
|
71
|
+
});
|
|
72
|
+
}, [defaultProjectRoot, visibleActivities]);
|
|
73
|
+
return {
|
|
74
|
+
beginProjectActivity,
|
|
75
|
+
trackProjectActivity,
|
|
76
|
+
isProjectBusy,
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
//# sourceMappingURL=useProjectActivity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useProjectActivity.js","sourceRoot":"","sources":["../../src/hooks/useProjectActivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAO1E,MAAM,wBAAwB,GAAG,GAAG,CAAC;AAQrC,SAAS,oBAAoB,CAC3B,WAAgC,EAChC,kBAA0B;IAE1B,IAAI,WAAW,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACtC,OAAO,WAAW,CAAC,WAAW,IAAI,kBAAkB,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,kBAA0B;IAC3D,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,GAAG,EAAyB,CAAC,CAAC;IAC/D,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAC5B,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAE1C,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,GAAG,EAAE;YACV,KAAK,MAAM,KAAK,IAAI,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;gBACnD,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;oBAChB,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;YACD,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAChC,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,oBAAoB,GAAG,WAAW,CAAuB,CAAC,WAAW,EAAE,EAAE;QAC7E,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;QACvC,MAAM,KAAK,GAAkB;YAC3B,WAAW,EAAE,oBAAoB,CAAC,WAAW,EAAE,kBAAkB,CAAC;YAClE,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,IAAI;SACZ,CAAC;QAEF,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,MAAM,YAAY,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC3D,IAAI,CAAC,YAAY;gBAAE,OAAO;YAC1B,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC;YAC5B,YAAY,CAAC,KAAK,GAAG,IAAI,CAAC;YAC1B,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;QACjC,CAAC,EAAE,wBAAwB,CAAC,CAAC;QAE7B,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAE7C,OAAO,GAAG,EAAE;YACV,MAAM,YAAY,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC3D,IAAI,CAAC,YAAY;gBAAE,OAAO;YAE1B,IAAI,YAAY,CAAC,KAAK,EAAE,CAAC;gBACvB,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YAED,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC;YACxC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAEzC,IAAI,UAAU,EAAE,CAAC;gBACf,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;YACjC,CAAC;QACH,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAEzB,MAAM,oBAAoB,GAAG,WAAW,CAAuB,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE;QACzF,MAAM,MAAM,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC;QACjD,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,EAAE,CAAC;QACtB,CAAC;gBAAS,CAAC;YACT,MAAM,EAAE,CAAC;QACX,CAAC;IACH,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAE3B,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,EAAE;QACrC,OAAO,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACrF,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,WAA2B,EAAE,EAAE;QAChE,MAAM,UAAU,GAAG,oBAAoB,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;QAEzE,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;YACtC,IAAI,KAAK,CAAC,WAAW,KAAK,IAAI;gBAAE,OAAO,IAAI,CAAC;YAC5C,OAAO,KAAK,CAAC,WAAW,KAAK,UAAU,CAAC;QAC1C,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAE5C,OAAO;QACL,oBAAoB;QACpB,oBAAoB;QACpB,aAAa;KACd,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { PopupManager } from "../services/PopupManager.js";
|
|
2
2
|
import type { ProjectSettings } from "../types.js";
|
|
3
3
|
import type { AgentName } from "../utils/agentLaunch.js";
|
|
4
|
+
import type { TrackProjectActivity } from "../types/activity.js";
|
|
4
5
|
interface UseServicesProps {
|
|
5
6
|
sidebarWidth: number;
|
|
6
7
|
projectRoot: string;
|
|
@@ -14,6 +15,7 @@ interface UseServicesProps {
|
|
|
14
15
|
projectSettings: ProjectSettings;
|
|
15
16
|
setStatusMessage: (msg: string) => void;
|
|
16
17
|
setIgnoreInput: (ignore: boolean) => void;
|
|
18
|
+
trackProjectActivity: TrackProjectActivity;
|
|
17
19
|
}
|
|
18
20
|
export declare function useServices(props: UseServicesProps): {
|
|
19
21
|
popupManager: PopupManager;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useServices.d.ts","sourceRoot":"","sources":["../../src/hooks/useServices.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAA2B,MAAM,6BAA6B,CAAA;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"useServices.d.ts","sourceRoot":"","sources":["../../src/hooks/useServices.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAA2B,MAAM,6BAA6B,CAAA;AACnF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAEhE,UAAU,gBAAgB;IAExB,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,eAAe,EAAE,OAAO,CAAA;IACxB,SAAS,EAAE,OAAO,CAAA;IAClB,aAAa,EAAE,MAAM,CAAA;IACrB,cAAc,EAAE,MAAM,CAAA;IACtB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,eAAe,EAAE,SAAS,EAAE,CAAA;IAC5B,eAAe,EAAE,GAAG,CAAA;IACpB,eAAe,EAAE,eAAe,CAAA;IAGhC,gBAAgB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IACvC,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAA;IACzC,oBAAoB,EAAE,oBAAoB,CAAA;CAC3C;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB;;EAyClD"}
|
|
@@ -14,6 +14,7 @@ export function useServices(props) {
|
|
|
14
14
|
availableAgents: props.availableAgents,
|
|
15
15
|
settingsManager: props.settingsManager,
|
|
16
16
|
projectSettings: props.projectSettings,
|
|
17
|
+
trackProjectActivity: props.trackProjectActivity,
|
|
17
18
|
};
|
|
18
19
|
return new PopupManager(config, props.setStatusMessage, props.setIgnoreInput);
|
|
19
20
|
}, [
|
|
@@ -29,6 +30,7 @@ export function useServices(props) {
|
|
|
29
30
|
props.projectSettings,
|
|
30
31
|
props.setStatusMessage,
|
|
31
32
|
props.setIgnoreInput,
|
|
33
|
+
props.trackProjectActivity,
|
|
32
34
|
]);
|
|
33
35
|
return {
|
|
34
36
|
popupManager,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useServices.js","sourceRoot":"","sources":["../../src/hooks/useServices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,EAAE,YAAY,EAA2B,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"useServices.js","sourceRoot":"","sources":["../../src/hooks/useServices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,EAAE,YAAY,EAA2B,MAAM,6BAA6B,CAAA;AAwBnF,MAAM,UAAU,WAAW,CAAC,KAAuB;IACjD,0BAA0B;IAC1B,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;QAChC,MAAM,MAAM,GAAuB;YACjC,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,eAAe,EAAE,KAAK,CAAC,eAAe;YACtC,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,eAAe,EAAE,KAAK,CAAC,eAAe;YACtC,eAAe,EAAE,KAAK,CAAC,eAAe;YACtC,eAAe,EAAE,KAAK,CAAC,eAAe;YACtC,oBAAoB,EAAE,KAAK,CAAC,oBAAoB;SACjD,CAAA;QAED,OAAO,IAAI,YAAY,CACrB,MAAM,EACN,KAAK,CAAC,gBAAgB,EACtB,KAAK,CAAC,cAAc,CACrB,CAAA;IACH,CAAC,EAAE;QACD,KAAK,CAAC,YAAY;QAClB,KAAK,CAAC,WAAW;QACjB,KAAK,CAAC,eAAe;QACrB,KAAK,CAAC,SAAS;QACf,KAAK,CAAC,aAAa;QACnB,KAAK,CAAC,cAAc;QACpB,KAAK,CAAC,aAAa;QACnB,KAAK,CAAC,eAAe;QACrB,KAAK,CAAC,eAAe;QACrB,KAAK,CAAC,eAAe;QACrB,KAAK,CAAC,gBAAgB;QACtB,KAAK,CAAC,cAAc;QACpB,KAAK,CAAC,oBAAoB;KAC3B,CAAC,CAAA;IAEF,OAAO;QACL,YAAY;KACb,CAAA;AACH,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -11,6 +11,7 @@ import { createHash } from 'crypto';
|
|
|
11
11
|
import { createRequire } from 'module';
|
|
12
12
|
import { createInterface } from 'node:readline/promises';
|
|
13
13
|
import DmuxApp from './DmuxApp.js';
|
|
14
|
+
import FileBrowserApp from './FileBrowserApp.js';
|
|
14
15
|
import { AutoUpdater } from './services/AutoUpdater.js';
|
|
15
16
|
import { StateManager } from './shared/StateManager.js';
|
|
16
17
|
import { LogService } from './services/LogService.js';
|
|
@@ -25,11 +26,17 @@ import { createPane } from './utils/paneCreation.js';
|
|
|
25
26
|
import { SettingsManager } from './utils/settingsManager.js';
|
|
26
27
|
import { atomicWriteJson } from './utils/atomicWrite.js';
|
|
27
28
|
import { buildDevWatchCommand, buildDevWatchRespawnCommand } from './utils/devWatchCommand.js';
|
|
29
|
+
import { shouldUseQuietDevWatchExit } from './utils/devWatchExit.js';
|
|
28
30
|
import { buildPaneExitedHookCommandForSession } from './utils/tmuxHookCommands.js';
|
|
31
|
+
import { ensureTmuxRuntimeCompatibility } from './utils/tmuxRuntimeCompatibility.js';
|
|
32
|
+
import { claimProcessShutdown } from './utils/processShutdown.js';
|
|
29
33
|
import { resolveEnabledAgentsSelection, } from './utils/agentLaunch.js';
|
|
30
34
|
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
|
31
35
|
const require = createRequire(import.meta.url);
|
|
32
36
|
const packageJson = require('../package.json');
|
|
37
|
+
function isFilesOnlyMode() {
|
|
38
|
+
return process.argv.slice(2).includes('--files-only');
|
|
39
|
+
}
|
|
33
40
|
class Dmux {
|
|
34
41
|
panesFile;
|
|
35
42
|
settingsFile;
|
|
@@ -86,6 +93,9 @@ class Dmux {
|
|
|
86
93
|
? this.getCurrentTmuxSessionName()
|
|
87
94
|
: null;
|
|
88
95
|
const sessionNameForCurrentTmux = currentTmuxSessionName || this.sessionName;
|
|
96
|
+
if (inTmux) {
|
|
97
|
+
ensureTmuxRuntimeCompatibility(sessionNameForCurrentTmux);
|
|
98
|
+
}
|
|
89
99
|
// Running dmux from another project while already inside a dmux session:
|
|
90
100
|
// offer to attach this project to the current sidebar/session instead.
|
|
91
101
|
if (inTmux &&
|
|
@@ -141,6 +151,8 @@ class Dmux {
|
|
|
141
151
|
sessionExists = false;
|
|
142
152
|
}
|
|
143
153
|
if (sessionExists) {
|
|
154
|
+
ensureTmuxRuntimeCompatibility(this.sessionName);
|
|
155
|
+
this.applySessionPaneBorderOptions(this.sessionName, 'pipe');
|
|
144
156
|
// Existing session:
|
|
145
157
|
// In dev mode, always ensure watcher loop is running from the intended source.
|
|
146
158
|
if (isDev) {
|
|
@@ -161,16 +173,11 @@ class Dmux {
|
|
|
161
173
|
// Expected - session doesn't exist, create new one
|
|
162
174
|
// Create new session first
|
|
163
175
|
execSync(`tmux new-session -d -s ${this.sessionName}`, { stdio: 'inherit' });
|
|
176
|
+
ensureTmuxRuntimeCompatibility(this.sessionName);
|
|
164
177
|
// Batch all session configuration commands into a single tmux call for faster startup
|
|
165
178
|
// This reduces 5 process spawns to 1, significantly improving startup time
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
`set-option -t ${this.sessionName} pane-active-border-style "fg=colour${TMUX_COLORS.activeBorder}"`,
|
|
169
|
-
`set-option -t ${this.sessionName} pane-border-style "fg=colour${TMUX_COLORS.inactiveBorder}"`,
|
|
170
|
-
`set-option -t ${this.sessionName} pane-border-format " #{pane_title} "`,
|
|
171
|
-
`select-pane -t ${this.sessionName} -T "dmux"`,
|
|
172
|
-
].join(' \\; ');
|
|
173
|
-
execSync(`tmux ${sessionOptions}`, { stdio: 'inherit' });
|
|
179
|
+
this.applySessionPaneBorderOptions(this.sessionName, 'inherit');
|
|
180
|
+
execSync(`tmux select-pane -t ${this.sessionName} -T "dmux"`, { stdio: 'inherit' });
|
|
174
181
|
// Send dmux command to the new session (use dev command if in dev mode)
|
|
175
182
|
// Determine the dmux command to use
|
|
176
183
|
let dmuxCommand;
|
|
@@ -207,6 +214,13 @@ class Dmux {
|
|
|
207
214
|
// Setting the title can cause visual artifacts in some tmux configurations
|
|
208
215
|
// Original code: execSync(`tmux select-pane -T "dmux v${version} - ${project}"`)
|
|
209
216
|
// See: Title updates are currently handled by enforcePaneTitles() in usePaneSync.ts
|
|
217
|
+
try {
|
|
218
|
+
const activeSessionName = this.getCurrentTmuxSessionName() || this.sessionName;
|
|
219
|
+
this.applySessionPaneBorderOptions(activeSessionName, 'pipe');
|
|
220
|
+
}
|
|
221
|
+
catch {
|
|
222
|
+
// Best effort - dmux still works without reapplying border format here.
|
|
223
|
+
}
|
|
210
224
|
// Get current pane ID (control pane for left sidebar)
|
|
211
225
|
let controlPaneId;
|
|
212
226
|
try {
|
|
@@ -914,6 +928,15 @@ class Dmux {
|
|
|
914
928
|
getAutoUpdater() {
|
|
915
929
|
return this.autoUpdater;
|
|
916
930
|
}
|
|
931
|
+
applySessionPaneBorderOptions(sessionName, stdio = 'pipe') {
|
|
932
|
+
const sessionOptions = [
|
|
933
|
+
`set-option -t ${sessionName} pane-border-status top`,
|
|
934
|
+
`set-option -t ${sessionName} pane-active-border-style "fg=colour${TMUX_COLORS.activeBorder}"`,
|
|
935
|
+
`set-option -t ${sessionName} pane-border-style "fg=colour${TMUX_COLORS.inactiveBorder}"`,
|
|
936
|
+
`set-option -t ${sessionName} pane-border-format " #{?@dmux_attention,#[bold]![ready] #[default],}#{pane_title} "`,
|
|
937
|
+
].join(' \\; ');
|
|
938
|
+
execSync(`tmux ${sessionOptions}`, { stdio });
|
|
939
|
+
}
|
|
917
940
|
setupResizeHook(sessionName = this.sessionName) {
|
|
918
941
|
try {
|
|
919
942
|
// Set up session-specific hook that sends SIGUSR1 to dmux process on resize
|
|
@@ -965,12 +988,23 @@ class Dmux {
|
|
|
965
988
|
}
|
|
966
989
|
}
|
|
967
990
|
setupGlobalSignalHandlers() {
|
|
968
|
-
|
|
991
|
+
let isCleaningUp = false;
|
|
992
|
+
const cleanTerminalExit = (signal) => {
|
|
993
|
+
if (isCleaningUp) {
|
|
994
|
+
return;
|
|
995
|
+
}
|
|
996
|
+
if (!claimProcessShutdown('signal-handler')) {
|
|
997
|
+
return;
|
|
998
|
+
}
|
|
999
|
+
isCleaningUp = true;
|
|
969
1000
|
// Clean up hooks
|
|
970
1001
|
if (process.env.TMUX) {
|
|
971
1002
|
this.cleanupResizeHook();
|
|
972
1003
|
this.cleanupPaneSplitHook();
|
|
973
1004
|
}
|
|
1005
|
+
if (shouldUseQuietDevWatchExit(signal)) {
|
|
1006
|
+
process.exit(0);
|
|
1007
|
+
}
|
|
974
1008
|
// Clear screen multiple times to ensure no artifacts
|
|
975
1009
|
process.stdout.write('\x1b[2J\x1b[H'); // Clear screen and move to home
|
|
976
1010
|
process.stdout.write('\x1b[3J'); // Clear scrollback buffer
|
|
@@ -980,7 +1014,6 @@ class Dmux {
|
|
|
980
1014
|
try {
|
|
981
1015
|
const tmuxService = TmuxService.getInstance();
|
|
982
1016
|
tmuxService.clearHistorySync();
|
|
983
|
-
await tmuxService.sendKeys('', 'C-l');
|
|
984
1017
|
}
|
|
985
1018
|
catch {
|
|
986
1019
|
// Intentionally silent - cleanup is best-effort
|
|
@@ -994,8 +1027,12 @@ class Dmux {
|
|
|
994
1027
|
}, 100);
|
|
995
1028
|
};
|
|
996
1029
|
// Handle Ctrl+C and SIGTERM
|
|
997
|
-
process.on('SIGINT',
|
|
998
|
-
|
|
1030
|
+
process.on('SIGINT', () => {
|
|
1031
|
+
cleanTerminalExit('SIGINT');
|
|
1032
|
+
});
|
|
1033
|
+
process.on('SIGTERM', () => {
|
|
1034
|
+
cleanTerminalExit('SIGTERM');
|
|
1035
|
+
});
|
|
999
1036
|
// Handle SIGUSR2 for pane split detection
|
|
1000
1037
|
// This signal is sent by tmux hook when a new pane is created
|
|
1001
1038
|
process.on('SIGUSR2', () => {
|
|
@@ -1017,6 +1054,10 @@ class Dmux {
|
|
|
1017
1054
|
}
|
|
1018
1055
|
// Validate system requirements before starting
|
|
1019
1056
|
(async () => {
|
|
1057
|
+
if (isFilesOnlyMode()) {
|
|
1058
|
+
render(React.createElement(FileBrowserApp), { exitOnCtrlC: false });
|
|
1059
|
+
return;
|
|
1060
|
+
}
|
|
1020
1061
|
const validationResult = await validateSystemRequirements();
|
|
1021
1062
|
printValidationResults(validationResult);
|
|
1022
1063
|
// Only proceed if system requirements are met
|