dmux 3.3.1 → 3.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/dist/actions/implementations/closeAction.d.ts.map +1 -1
- package/dist/actions/implementations/closeAction.js +22 -6
- package/dist/actions/implementations/closeAction.js.map +1 -1
- package/dist/actions/implementations/mergeAction.d.ts +3 -1
- package/dist/actions/implementations/mergeAction.d.ts.map +1 -1
- package/dist/actions/implementations/mergeAction.js +38 -4
- package/dist/actions/implementations/mergeAction.js.map +1 -1
- package/dist/actions/merge/multiMergeOrchestrator.d.ts +22 -0
- package/dist/actions/merge/multiMergeOrchestrator.d.ts.map +1 -0
- package/dist/actions/merge/multiMergeOrchestrator.js +452 -0
- package/dist/actions/merge/multiMergeOrchestrator.js.map +1 -0
- package/dist/actions/merge/types.d.ts +62 -0
- package/dist/actions/merge/types.d.ts.map +1 -0
- package/dist/actions/merge/types.js +7 -0
- package/dist/actions/merge/types.js.map +1 -0
- package/dist/chunks/styles.css_vue_type_style_index_0_src_true_lang-pW5mq51o.js +17 -0
- package/dist/components/popups/logsPopup.js +33 -17
- package/dist/components/popups/logsPopup.js.map +1 -1
- package/dist/dashboard.html +2 -2
- package/dist/dashboard.js +2 -2
- package/dist/hooks/useLayoutManagement.d.ts.map +1 -1
- package/dist/hooks/useLayoutManagement.js +43 -14
- package/dist/hooks/useLayoutManagement.js.map +1 -1
- package/dist/hooks/usePaneLoading.d.ts +3 -0
- package/dist/hooks/usePaneLoading.d.ts.map +1 -1
- package/dist/hooks/usePaneLoading.js +21 -1
- package/dist/hooks/usePaneLoading.js.map +1 -1
- package/dist/hooks/usePaneSync.d.ts +3 -0
- package/dist/hooks/usePaneSync.d.ts.map +1 -1
- package/dist/hooks/usePaneSync.js +11 -0
- package/dist/hooks/usePaneSync.js.map +1 -1
- package/dist/layout/TmuxLayoutApplier.d.ts.map +1 -1
- package/dist/layout/TmuxLayoutApplier.js +4 -9
- package/dist/layout/TmuxLayoutApplier.js.map +1 -1
- package/dist/server/embedded-assets.d.ts.map +1 -1
- package/dist/server/embedded-assets.js +26 -37
- package/dist/server/embedded-assets.js.map +1 -1
- package/dist/services/PaneAnalyzer.d.ts +12 -3
- package/dist/services/PaneAnalyzer.d.ts.map +1 -1
- package/dist/services/PaneAnalyzer.js +57 -8
- package/dist/services/PaneAnalyzer.js.map +1 -1
- package/dist/services/PopupManager.d.ts.map +1 -1
- package/dist/services/PopupManager.js +7 -1
- package/dist/services/PopupManager.js.map +1 -1
- package/dist/services/StatusDetector.d.ts.map +1 -1
- package/dist/services/StatusDetector.js +28 -9
- package/dist/services/StatusDetector.js.map +1 -1
- package/dist/services/TmuxService.d.ts +9 -3
- package/dist/services/TmuxService.d.ts.map +1 -1
- package/dist/services/TmuxService.js +12 -3
- package/dist/services/TmuxService.js.map +1 -1
- package/dist/terminal.html +2 -2
- package/dist/terminal.js +3 -3
- package/dist/utils/generated-agents-doc.d.ts +1 -1
- package/dist/utils/generated-agents-doc.js +1 -1
- package/dist/utils/hooksDocs.d.ts +1 -1
- package/dist/utils/layoutManager.d.ts.map +1 -1
- package/dist/utils/layoutManager.js +226 -202
- package/dist/utils/layoutManager.js.map +1 -1
- package/dist/utils/worktreeDiscovery.d.ts +39 -0
- package/dist/utils/worktreeDiscovery.d.ts.map +1 -0
- package/dist/utils/worktreeDiscovery.js +241 -0
- package/dist/utils/worktreeDiscovery.js.map +1 -0
- package/package.json +7 -7
- package/dist/chunks/_plugin-vue_export-helper-Cvoq67hi.js +0 -28
- /package/dist/{_plugin-vue_export-helper.css → styles.css} +0 -0
|
@@ -10,15 +10,21 @@ export function useLayoutManagement({ controlPaneId, hasActiveDialog, onForceRep
|
|
|
10
10
|
// Use refs to track state across resize events
|
|
11
11
|
const resizeTimeoutRef = useRef(null);
|
|
12
12
|
const isApplyingLayoutRef = useRef(false);
|
|
13
|
+
// Track if component is still mounted to avoid state updates after unmount
|
|
14
|
+
const isMountedRef = useRef(true);
|
|
13
15
|
useEffect(() => {
|
|
16
|
+
isMountedRef.current = true;
|
|
14
17
|
if (!controlPaneId) {
|
|
15
18
|
return; // No sidebar layout configured
|
|
16
19
|
}
|
|
17
|
-
// Enforce sidebar width immediately on mount
|
|
18
|
-
enforceControlPaneSize(controlPaneId, SIDEBAR_WIDTH)
|
|
20
|
+
// Enforce sidebar width immediately on mount (with error handling)
|
|
21
|
+
enforceControlPaneSize(controlPaneId, SIDEBAR_WIDTH).catch(error => {
|
|
22
|
+
LogService.getInstance().warn(`Initial layout enforcement failed: ${error}`, 'ResizeDebug');
|
|
23
|
+
});
|
|
19
24
|
const handleResize = () => {
|
|
20
|
-
// Skip if we're already applying a layout (prevents loops)
|
|
25
|
+
// Skip if we're already applying a layout (prevents loops and race conditions)
|
|
21
26
|
if (isApplyingLayoutRef.current) {
|
|
27
|
+
LogService.getInstance().debug('Skipping resize - layout already in progress', 'ResizeDebug');
|
|
22
28
|
return;
|
|
23
29
|
}
|
|
24
30
|
// Clear any pending resize
|
|
@@ -27,21 +33,43 @@ export function useLayoutManagement({ controlPaneId, hasActiveDialog, onForceRep
|
|
|
27
33
|
}
|
|
28
34
|
// Debounce: wait 500ms after last resize event (prevents excessive recalculations)
|
|
29
35
|
resizeTimeoutRef.current = setTimeout(async () => {
|
|
36
|
+
// Check if component is still mounted
|
|
37
|
+
if (!isMountedRef.current) {
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
30
40
|
// Only enforce if not showing dialogs (to avoid interference)
|
|
31
41
|
if (!hasActiveDialog) {
|
|
42
|
+
// Double-check we're not already applying (race condition protection)
|
|
43
|
+
if (isApplyingLayoutRef.current) {
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
32
46
|
isApplyingLayoutRef.current = true;
|
|
33
47
|
LogService.getInstance().debug('Starting resize handler', 'ResizeDebug');
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
48
|
+
try {
|
|
49
|
+
// Only enforce sidebar width when terminal resizes
|
|
50
|
+
await enforceControlPaneSize(controlPaneId, SIDEBAR_WIDTH);
|
|
51
|
+
// Check if still mounted before updating UI
|
|
52
|
+
if (!isMountedRef.current) {
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
LogService.getInstance().debug('enforceControlPaneSize complete, calling onForceRepaint', 'ResizeDebug');
|
|
56
|
+
// CRITICAL: Force Ink to repaint AFTER layout changes complete
|
|
57
|
+
// This ensures the dmux UI redraws last, preventing blank pane
|
|
58
|
+
onForceRepaint();
|
|
59
|
+
LogService.getInstance().debug('onForceRepaint called', 'ResizeDebug');
|
|
60
|
+
}
|
|
61
|
+
catch (error) {
|
|
62
|
+
// Log error but don't crash - layout will be retried on next resize
|
|
63
|
+
LogService.getInstance().warn(`Layout enforcement failed during resize: ${error}`, 'ResizeDebug');
|
|
64
|
+
}
|
|
65
|
+
finally {
|
|
66
|
+
// Reset flag after a brief delay (always reset, even on error)
|
|
67
|
+
setTimeout(() => {
|
|
68
|
+
if (isMountedRef.current) {
|
|
69
|
+
isApplyingLayoutRef.current = false;
|
|
70
|
+
}
|
|
71
|
+
}, 100);
|
|
72
|
+
}
|
|
45
73
|
}
|
|
46
74
|
}, 500);
|
|
47
75
|
};
|
|
@@ -51,6 +79,7 @@ export function useLayoutManagement({ controlPaneId, hasActiveDialog, onForceRep
|
|
|
51
79
|
process.on('SIGWINCH', handleResize);
|
|
52
80
|
process.on('SIGUSR1', handleResize);
|
|
53
81
|
return () => {
|
|
82
|
+
isMountedRef.current = false;
|
|
54
83
|
process.stdout.off('resize', handleResize);
|
|
55
84
|
process.off('SIGWINCH', handleResize);
|
|
56
85
|
process.off('SIGUSR1', handleResize);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLayoutManagement.js","sourceRoot":"","sources":["../../src/hooks/useLayoutManagement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAQvD;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,EAClC,aAAa,EACb,eAAe,EACf,cAAc,GACU;IACxB,+CAA+C;IAC/C,MAAM,gBAAgB,GAAG,MAAM,CAAwB,IAAI,CAAC,CAAC;IAC7D,MAAM,mBAAmB,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"useLayoutManagement.js","sourceRoot":"","sources":["../../src/hooks/useLayoutManagement.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,6 +34,9 @@ export declare function recreateMissingPanes(missingPanes: DmuxPane[], panesFile
|
|
|
34
34
|
/**
|
|
35
35
|
* Recreates worktree panes that were killed by the user (e.g., via Ctrl+b x)
|
|
36
36
|
* Called during periodic polling after initial load
|
|
37
|
+
*
|
|
38
|
+
* IMPORTANT: Checks PaneLifecycleManager to avoid recreating panes that are
|
|
39
|
+
* being intentionally closed (prevents race condition with close/merge actions)
|
|
37
40
|
*/
|
|
38
41
|
export declare function recreateKilledWorktreePanes(panes: DmuxPane[], allPaneIds: string[], panesFile: string): Promise<DmuxPane[]>;
|
|
39
42
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usePaneLoading.d.ts","sourceRoot":"","sources":["../../src/hooks/usePaneLoading.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"usePaneLoading.d.ts","sourceRoot":"","sources":["../../src/hooks/usePaneLoading.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAS5C,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;IAAE,UAAU,EAAE,MAAM,EAAE,CAAC;IAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAAC,CAuCxH;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,CA+Bf;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,CAmGrB;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,OAAO,GACrB,OAAO,CAAC,cAAc,CAAC,CAiCzB"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import fs from 'fs/promises';
|
|
2
2
|
import { splitPane } from '../utils/tmux.js';
|
|
3
3
|
import { rebindPaneByTitle } from '../utils/paneRebinding.js';
|
|
4
|
+
import { LogService } from '../services/LogService.js';
|
|
4
5
|
import { TmuxService } from '../services/TmuxService.js';
|
|
6
|
+
import { PaneLifecycleManager } from '../services/PaneLifecycleManager.js';
|
|
5
7
|
import { TMUX_RETRY_DELAY } from '../constants/timing.js';
|
|
6
8
|
/**
|
|
7
9
|
* Fetches all tmux pane IDs and titles for the current session
|
|
@@ -110,9 +112,27 @@ export async function recreateMissingPanes(missingPanes, panesFile) {
|
|
|
110
112
|
/**
|
|
111
113
|
* Recreates worktree panes that were killed by the user (e.g., via Ctrl+b x)
|
|
112
114
|
* Called during periodic polling after initial load
|
|
115
|
+
*
|
|
116
|
+
* IMPORTANT: Checks PaneLifecycleManager to avoid recreating panes that are
|
|
117
|
+
* being intentionally closed (prevents race condition with close/merge actions)
|
|
113
118
|
*/
|
|
114
119
|
export async function recreateKilledWorktreePanes(panes, allPaneIds, panesFile) {
|
|
115
|
-
const
|
|
120
|
+
const lifecycleManager = PaneLifecycleManager.getInstance();
|
|
121
|
+
// Filter out panes that are being intentionally closed
|
|
122
|
+
const worktreePanesToRecreate = panes.filter(pane => {
|
|
123
|
+
// Pane must be missing from tmux and have a worktree path
|
|
124
|
+
if (allPaneIds.includes(pane.paneId) || !pane.worktreePath) {
|
|
125
|
+
return false;
|
|
126
|
+
}
|
|
127
|
+
// CRITICAL: Check if this pane is being intentionally closed
|
|
128
|
+
// This is a safety belt - the main protection is that close action
|
|
129
|
+
// removes pane from config BEFORE killing tmux pane
|
|
130
|
+
if (lifecycleManager.isClosing(pane.id) || lifecycleManager.isClosing(pane.paneId)) {
|
|
131
|
+
LogService.getInstance().debug(`Skipping recreation of pane ${pane.id} (${pane.slug}) - intentionally being closed`, 'shellDetection');
|
|
132
|
+
return false;
|
|
133
|
+
}
|
|
134
|
+
return true;
|
|
135
|
+
});
|
|
116
136
|
if (worktreePanesToRecreate.length === 0)
|
|
117
137
|
return panes;
|
|
118
138
|
const tmuxService = TmuxService.getInstance();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usePaneLoading.js","sourceRoot":"","sources":["../../src/hooks/usePaneLoading.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,aAAa,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"usePaneLoading.js","sourceRoot":"","sources":["../../src/hooks/usePaneLoading.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,9 @@ export declare function savePanesToFile(panesFile: string, panes: DmuxPane[], wi
|
|
|
12
12
|
/**
|
|
13
13
|
* Rebinds all panes and filters out dead shell panes
|
|
14
14
|
* Keeps worktree panes even if not found (they can be recreated)
|
|
15
|
+
*
|
|
16
|
+
* IMPORTANT: Checks PaneLifecycleManager to avoid queuing panes for recreation
|
|
17
|
+
* if they are being intentionally closed (prevents race condition)
|
|
15
18
|
*/
|
|
16
19
|
export declare function rebindAndFilterPanes(loadedPanes: DmuxPane[], titleToId: Map<string, string>, allPaneIds: string[], isInitialLoad: boolean): {
|
|
17
20
|
activePanes: DmuxPane[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usePaneSync.d.ts","sourceRoot":"","sources":["../../src/hooks/usePaneSync.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"usePaneSync.d.ts","sourceRoot":"","sources":["../../src/hooks/usePaneSync.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAS5C;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,QAAQ,EAAE,EACjB,UAAU,EAAE,MAAM,EAAE,GACnB,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,QAAQ,EAAE,EACjB,aAAa,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAC5D,OAAO,CAAC,QAAQ,EAAE,CAAC,CAuDrB;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,QAAQ,EAAE,EACvB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,UAAU,EAAE,MAAM,EAAE,EACpB,aAAa,EAAE,OAAO,GACrB;IAAE,WAAW,EAAE,QAAQ,EAAE,CAAC;IAAC,iBAAiB,EAAE,OAAO,CAAC;IAAC,uBAAuB,EAAE,QAAQ,EAAE,CAAA;CAAE,CAiF9F;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,QAAQ,EAAE,EACvB,aAAa,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAC5D,OAAO,CAAC,IAAI,CAAC,CAsBf;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG9E;AAED;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAuBf"}
|
|
@@ -2,6 +2,7 @@ import fs from 'fs/promises';
|
|
|
2
2
|
import { rebindPaneByTitle } from '../utils/paneRebinding.js';
|
|
3
3
|
import { LogService } from '../services/LogService.js';
|
|
4
4
|
import { TmuxService } from '../services/TmuxService.js';
|
|
5
|
+
import { PaneLifecycleManager } from '../services/PaneLifecycleManager.js';
|
|
5
6
|
import { atomicWriteJson } from '../utils/atomicWrite.js';
|
|
6
7
|
/**
|
|
7
8
|
* Enforces that pane titles in tmux match the slugs in the config
|
|
@@ -84,9 +85,13 @@ export async function savePanesToFile(panesFile, panes, withWriteLock) {
|
|
|
84
85
|
/**
|
|
85
86
|
* Rebinds all panes and filters out dead shell panes
|
|
86
87
|
* Keeps worktree panes even if not found (they can be recreated)
|
|
88
|
+
*
|
|
89
|
+
* IMPORTANT: Checks PaneLifecycleManager to avoid queuing panes for recreation
|
|
90
|
+
* if they are being intentionally closed (prevents race condition)
|
|
87
91
|
*/
|
|
88
92
|
export function rebindAndFilterPanes(loadedPanes, titleToId, allPaneIds, isInitialLoad) {
|
|
89
93
|
const worktreePanesToRecreate = [];
|
|
94
|
+
const lifecycleManager = PaneLifecycleManager.getInstance();
|
|
90
95
|
// LogService.getInstance().debug(
|
|
91
96
|
// `Checking panes: loaded=${loadedPanes.length}, allPaneIds=[${allPaneIds.join(', ')}]`,
|
|
92
97
|
// 'shellDetection'
|
|
@@ -103,6 +108,12 @@ export function rebindAndFilterPanes(loadedPanes, titleToId, allPaneIds, isIniti
|
|
|
103
108
|
const activePanes = reboundPanes.filter(pane => {
|
|
104
109
|
// If we have tmux data and this pane is not found
|
|
105
110
|
if (allPaneIds.length > 0 && !allPaneIds.includes(pane.paneId)) {
|
|
111
|
+
// CRITICAL: Check if pane is being intentionally closed
|
|
112
|
+
// If so, remove it from tracking (don't recreate, don't keep)
|
|
113
|
+
if (lifecycleManager.isClosing(pane.id) || lifecycleManager.isClosing(pane.paneId)) {
|
|
114
|
+
LogService.getInstance().debug(`Pane ${pane.id} (${pane.slug}) is being intentionally closed - removing from list`, 'shellDetection');
|
|
115
|
+
return false; // Remove from list entirely
|
|
116
|
+
}
|
|
106
117
|
LogService.getInstance().debug(`Pane ${pane.id} (${pane.paneId}) not in tmux. Type: ${pane.type}`, 'shellDetection');
|
|
107
118
|
// Remove shell panes that are no longer present
|
|
108
119
|
if (pane.type === 'shell') {
|
|
@@ -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;
|
|
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;AAE1D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,KAAiB,EACjB,UAAoB;IAEpB,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;IAE9C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,IAAI,CAAC;gBACH,iDAAiD;gBACjD,MAAM,YAAY,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAEjE,6EAA6E;gBAC7E,IAAI,YAAY,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;oBAC/B,MAAM,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;oBACvD,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,CAC5B,sBAAsB,IAAI,CAAC,EAAE,KAAK,YAAY,QAAQ,IAAI,CAAC,IAAI,GAAG,EAClE,gBAAgB,CACjB,CAAC;gBACJ,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,qEAAqE;gBACrE,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,CAC5B,iCAAiC,IAAI,CAAC,EAAE,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EACrG,aAAa,CACd,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,SAAiB,EACjB,KAAiB,EACjB,aAA6D;IAE7D,OAAO,aAAa,CAAC,KAAK,IAAI,EAAE;QAC9B,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,wDAAwD;QACxD,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;YAC9C,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,aAAa,EAAE,CAAC;YACnD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;YAE5C,6BAA6B;YAC7B,KAAK,MAAM,EAAE,IAAI,QAAQ,EAAE,CAAC;gBAC1B,IAAI,CAAC;oBACH,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;oBACjD,8DAA8D;oBAC9D,IAAI,EAAE,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,IAAI,KAAK,KAAK,aAAa,EAAE,CAAC;wBACjE,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;oBAClC,CAAC;gBACH,CAAC;gBAAC,MAAM,CAAC;oBACP,qCAAqC;oBACrC,SAAS;gBACX,CAAC;YACH,CAAC;YAED,0CAA0C;YAC1C,0DAA0D;YAC1D,oEAAoE;YACpE,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;YAClD,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;QAC5E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,uFAAuF;YACvF,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,CAC5B,6CAA6C,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EACrG,aAAa,CACd,CAAC;YACF,WAAW,GAAG,KAAK,CAAC;QACtB,CAAC;QAED,gDAAgD;QAChD,IAAI,MAAM,GAAe,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QACvC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACtD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACnC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3B,MAAM,GAAG,MAAM,CAAC;YAClB,CAAC;QACH,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QAEV,sEAAsE;QACtE,MAAM,CAAC,KAAK,GAAG,WAAW,CAAC;QAC3B,MAAM,CAAC,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC9C,MAAM,eAAe,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAEzC,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAClC,WAAuB,EACvB,SAA8B,EAC9B,UAAoB,EACpB,aAAsB;IAEtB,MAAM,uBAAuB,GAAe,EAAE,CAAC;IAC/C,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,WAAW,EAAE,CAAC;IAE5D,kCAAkC;IAClC,2FAA2F;IAC3F,qBAAqB;IACrB,KAAK;IAEL,uCAAuC;IACvC,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;QAChD,MAAM,OAAO,GAAG,iBAAiB,CAAC,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QACrE,IAAI,OAAO,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;YACzC,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,CAC5B,QAAQ,UAAU,CAAC,EAAE,KAAK,UAAU,CAAC,MAAM,0CAA0C,EACrF,gBAAgB,CACjB,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,mDAAmD;IACnD,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC7C,kDAAkD;QAClD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/D,wDAAwD;YACxD,8DAA8D;YAC9D,IAAI,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBACnF,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,CAC5B,QAAQ,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,IAAI,sDAAsD,EACnF,gBAAgB,CACjB,CAAC;gBACF,OAAO,KAAK,CAAC,CAAC,4BAA4B;YAC5C,CAAC;YAED,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,CAC5B,QAAQ,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,MAAM,wBAAwB,IAAI,CAAC,IAAI,EAAE,EAClE,gBAAgB,CACjB,CAAC;YAEF,gDAAgD;YAChD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC1B,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,CAC5B,6BAA6B,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,IAAI,GAAG,EACrD,gBAAgB,CACjB,CAAC;gBACF,OAAO,KAAK,CAAC;YACf,CAAC;YAED,mEAAmE;YACnE,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACxC,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,CAC5B,iBAAiB,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,IAAI,gCAAgC,EACtE,gBAAgB,CACjB,CAAC;gBACF,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnC,OAAO,IAAI,CAAC,CAAC,sBAAsB;YACrC,CAAC;YAED,yDAAyD;YACzD,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,CAC5B,0BAA0B,IAAI,CAAC,EAAE,gCAAgC,EACjE,gBAAgB,CACjB,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,2DAA2D;IAC3D,MAAM,iBAAiB,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAC7C,CAAC,CAAC,IAAI,KAAK,OAAO,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAC9E,CAAC;IAEF,IAAI,iBAAiB,EAAE,CAAC;QACtB,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,CAC5B,oDAAoD,EACpD,gBAAgB,CACjB,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,CAAC;AACrE,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,SAAiB,EACjB,WAAuB,EACvB,aAA6D;IAE7D,MAAM,aAAa,CAAC,KAAK,IAAI,EAAE;QAC7B,oCAAoC;QACpC,IAAI,aAAa,GAAe,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QAC9C,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACtD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACnC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3B,aAAa,GAAG,MAAM,CAAC;YACzB,CAAC;QACH,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;QAEV,6BAA6B;QAC7B,aAAa,CAAC,KAAK,GAAG,WAAW,CAAC;QAClC,aAAa,CAAC,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACrD,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,CAC5B,uBAAuB,aAAa,CAAC,KAAK,CAAC,MAAM,QAAQ,EACzD,gBAAgB,CACjB,CAAC;QACF,MAAM,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACtE,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,kCAAkC,EAAE,gBAAgB,CAAC,CAAC;IACvF,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,WAAmB;IAC7D,MAAM,EAAE,qBAAqB,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;IAC9E,MAAM,qBAAqB,CAAC,WAAW,CAAC,CAAC;AAC3C,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,SAAiB,EACjB,gBAAwB,EACxB,YAAoB;IAEpB,MAAM,oBAAoB,GAAG,gBAAgB,KAAK,CAAC,IAAI,YAAY,GAAG,CAAC,CAAC;IACxE,IAAI,CAAC,oBAAoB;QAAE,OAAO;IAElC,IAAI,CAAC;QACH,mCAAmC;QACnC,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACzC,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,CAC5B,2BAA2B,MAAM,CAAC,aAAa,2BAA2B,EAC1E,gBAAgB,CACjB,CAAC;YACF,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;YACvE,MAAM,kBAAkB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YAC/C,4DAA4D;YAC5D,MAAM,CAAC,aAAa,GAAG,SAAS,CAAC;YACjC,sDAAsD;YACtD,MAAM,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,gCAAgC,EAAE,gBAAgB,CAAC,CAAC;IACrF,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TmuxLayoutApplier.d.ts","sourceRoot":"","sources":["../../src/layout/TmuxLayoutApplier.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEjE;;;;;;;;;;;;;GAaG;AACH,qBAAa,iBAAiB;IAGhB,OAAO,CAAC,MAAM;IAF1B,OAAO,CAAC,WAAW,CAA6B;gBAE5B,MAAM,EAAE,YAAY;IAExC;;;;;;;;OAQG;IACH,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAyBxD;;;;;;;;;;;;;OAaG;IACH,eAAe,CACb,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,EAAE,EACxB,MAAM,EAAE,mBAAmB,EAC3B,cAAc,EAAE,MAAM,GACrB,IAAI;
|
|
1
|
+
{"version":3,"file":"TmuxLayoutApplier.d.ts","sourceRoot":"","sources":["../../src/layout/TmuxLayoutApplier.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEjE;;;;;;;;;;;;;GAaG;AACH,qBAAa,iBAAiB;IAGhB,OAAO,CAAC,MAAM;IAF1B,OAAO,CAAC,WAAW,CAA6B;gBAE5B,MAAM,EAAE,YAAY;IAExC;;;;;;;;OAQG;IACH,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAyBxD;;;;;;;;;;;;;OAaG;IACH,eAAe,CACb,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,EAAE,EACxB,MAAM,EAAE,mBAAmB,EAC3B,cAAc,EAAE,MAAM,GACrB,IAAI;IA4CP;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAezB;;;OAGG;IACH,OAAO,CAAC,yBAAyB;IAUjC;;;OAGG;IACH,OAAO,CAAC,YAAY;CASrB"}
|
|
@@ -78,15 +78,10 @@ export class TmuxLayoutApplier {
|
|
|
78
78
|
if (layoutString) {
|
|
79
79
|
// Log pane state right before applying layout
|
|
80
80
|
this.logPaneState();
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
catch (layoutError) {
|
|
86
|
-
// Log the error for debugging
|
|
87
|
-
const errorMsg = layoutError?.message || String(layoutError);
|
|
88
|
-
LogService.getInstance().error(`Layout string application failed: ${errorMsg}`, 'Layout');
|
|
89
|
-
// LogService.getInstance().debug(`Failed layout string: ${layoutString}`, 'Layout');
|
|
81
|
+
// selectLayoutSync returns false on failure (doesn't throw)
|
|
82
|
+
const success = this.tmuxService.selectLayoutSync(layoutString);
|
|
83
|
+
if (!success) {
|
|
84
|
+
// LogService.getInstance().debug('Layout application failed, using fallback', 'Layout');
|
|
90
85
|
// Fallback to main-vertical if custom layout fails
|
|
91
86
|
this.applyMainVerticalFallback();
|
|
92
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TmuxLayoutApplier.js","sourceRoot":"","sources":["../../src/layout/TmuxLayoutApplier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAI7D;;;;;;;;;;;;;GAaG;AACH,MAAM,OAAO,iBAAiB;IAGR;IAFZ,WAAW,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;IAEhD,YAAoB,MAAoB;QAApB,WAAM,GAAN,MAAM,CAAc;IAAG,CAAC;IAE5C;;;;;;;;OAQG;IACH,mBAAmB,CAAC,KAAa,EAAE,MAAc;QAC/C,IAAI,CAAC;YACH,+DAA+D;YAC/D,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,sBAAsB,EAAE,CAAC;YAClE,MAAM,YAAY,GAAG,MAAM,GAAG,eAAe,CAAC;YAE9C,4CAA4C;YAC5C,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,uBAAuB,EAAE,CAAC;YAC/D,IAAI,WAAW,CAAC,KAAK,KAAK,KAAK,IAAI,WAAW,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;gBACvE,2DAA2D;gBAC3D,OAAO;YACT,CAAC;YAED,4EAA4E;YAC5E,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;YAC9D,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;QACrE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,+DAA+D;YAC/D,UAAU,CAAC,WAAW,EAAE,CAAC,IAAI,CAC3B,sCAAsC,KAAK,IAAI,MAAM,KAAK,KAAK,EAAE,EACjE,QAAQ,CACT,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,eAAe,CACb,aAAqB,EACrB,cAAwB,EACxB,MAA2B,EAC3B,cAAsB;QAEtB,MAAM,eAAe,GAAG,cAAc,CAAC,MAAM,CAAC;QAE9C,IAAI,eAAe,KAAK,CAAC,EAAE,CAAC;YAC1B,wCAAwC;YACxC,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;YACtC,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,8EAA8E;YAC9E,mFAAmF;YACnF,MAAM,YAAY,GAAG,yBAAyB,CAC5C,aAAa,EACb,cAAc,EACd,IAAI,CAAC,MAAM,CAAC,aAAa,EACzB,MAAM,CAAC,WAAW,EAClB,cAAc,EACd,MAAM,CAAC,IAAI,EACX,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAClC,CAAC;YAEF,IAAI,YAAY,EAAE,CAAC;gBACjB,8CAA8C;gBAC9C,IAAI,CAAC,YAAY,EAAE,CAAC;gBAEpB,
|
|
1
|
+
{"version":3,"file":"TmuxLayoutApplier.js","sourceRoot":"","sources":["../../src/layout/TmuxLayoutApplier.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"embedded-assets.d.ts","sourceRoot":"","sources":["../../src/server/embedded-assets.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"embedded-assets.d.ts","sourceRoot":"","sources":["../../src/server/embedded-assets.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAu1CxD,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAInE;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAGtD"}
|