dmux 5.5.3 → 5.6.1
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/DmuxApp.d.ts.map +1 -1
- package/dist/DmuxApp.js +55 -22
- package/dist/DmuxApp.js.map +1 -1
- package/dist/components/panes/PanesGrid.d.ts +2 -1
- package/dist/components/panes/PanesGrid.d.ts.map +1 -1
- package/dist/components/panes/PanesGrid.js +37 -28
- package/dist/components/panes/PanesGrid.js.map +1 -1
- package/dist/components/popups/kebabMenuPopup.d.ts +8 -0
- package/dist/components/popups/kebabMenuPopup.d.ts.map +1 -1
- package/dist/components/popups/kebabMenuPopup.js +14 -4
- package/dist/components/popups/kebabMenuPopup.js.map +1 -1
- package/dist/components/popups/newPanePopup.d.ts +4 -1
- package/dist/components/popups/newPanePopup.d.ts.map +1 -1
- package/dist/components/popups/newPanePopup.js +53 -9
- package/dist/components/popups/newPanePopup.js.map +1 -1
- package/dist/components/popups/reopenWorktreePopup.d.ts +14 -0
- package/dist/components/popups/reopenWorktreePopup.d.ts.map +1 -1
- package/dist/components/popups/reopenWorktreePopup.js +74 -49
- package/dist/components/popups/reopenWorktreePopup.js.map +1 -1
- package/dist/components/popups/shared/PopupWrapper.d.ts.map +1 -1
- package/dist/components/popups/shared/PopupWrapper.js +12 -1
- package/dist/components/popups/shared/PopupWrapper.js.map +1 -1
- package/dist/components/popups/shortcutsPopup.d.ts +7 -0
- package/dist/components/popups/shortcutsPopup.d.ts.map +1 -1
- package/dist/components/popups/shortcutsPopup.js +13 -7
- package/dist/components/popups/shortcutsPopup.js.map +1 -1
- package/dist/components/ui/FooterHelp.d.ts +1 -0
- package/dist/components/ui/FooterHelp.d.ts.map +1 -1
- package/dist/components/ui/FooterHelp.js +5 -1
- package/dist/components/ui/FooterHelp.js.map +1 -1
- package/dist/hooks/useInputHandling.d.ts +3 -1
- package/dist/hooks/useInputHandling.d.ts.map +1 -1
- package/dist/hooks/useInputHandling.js +215 -62
- package/dist/hooks/useInputHandling.js.map +1 -1
- package/dist/hooks/usePaneLoading.d.ts +3 -1
- package/dist/hooks/usePaneLoading.d.ts.map +1 -1
- package/dist/hooks/usePaneLoading.js +37 -0
- package/dist/hooks/usePaneLoading.js.map +1 -1
- package/dist/hooks/usePaneSync.d.ts.map +1 -1
- package/dist/hooks/usePaneSync.js +8 -0
- package/dist/hooks/usePaneSync.js.map +1 -1
- package/dist/hooks/usePanes.d.ts +3 -1
- package/dist/hooks/usePanes.d.ts.map +1 -1
- package/dist/hooks/usePanes.js +68 -3
- package/dist/hooks/usePanes.js.map +1 -1
- package/dist/index.js +162 -49
- package/dist/index.js.map +1 -1
- package/dist/server/embedded-assets.js +1 -1
- package/dist/services/PopupManager.d.ts +3 -1
- package/dist/services/PopupManager.d.ts.map +1 -1
- package/dist/services/PopupManager.js +42 -9
- package/dist/services/PopupManager.js.map +1 -1
- package/dist/types.d.ts +8 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/agentLaunch.d.ts +1 -0
- package/dist/utils/agentLaunch.d.ts.map +1 -1
- package/dist/utils/agentLaunch.js +4 -0
- package/dist/utils/agentLaunch.js.map +1 -1
- package/dist/utils/attachAgent.d.ts.map +1 -1
- package/dist/utils/attachAgent.js +1 -0
- package/dist/utils/attachAgent.js.map +1 -1
- package/dist/utils/dmuxCommand.d.ts +2 -0
- package/dist/utils/dmuxCommand.d.ts.map +1 -1
- package/dist/utils/dmuxCommand.js +3 -0
- package/dist/utils/dmuxCommand.js.map +1 -1
- package/dist/utils/footerTips.d.ts +5 -0
- package/dist/utils/footerTips.d.ts.map +1 -0
- package/dist/utils/footerTips.js +57 -0
- package/dist/utils/footerTips.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/paneCreation.d.ts.map +1 -1
- package/dist/utils/paneCreation.js +3 -0
- package/dist/utils/paneCreation.js.map +1 -1
- package/dist/utils/paneGrouping.d.ts +2 -2
- package/dist/utils/paneGrouping.d.ts.map +1 -1
- package/dist/utils/paneGrouping.js +19 -3
- package/dist/utils/paneGrouping.js.map +1 -1
- package/dist/utils/popup.d.ts +20 -0
- package/dist/utils/popup.d.ts.map +1 -1
- package/dist/utils/popup.js +68 -1
- package/dist/utils/popup.js.map +1 -1
- package/dist/utils/projectActions.d.ts +4 -4
- package/dist/utils/projectActions.d.ts.map +1 -1
- package/dist/utils/projectActions.js +28 -6
- package/dist/utils/projectActions.js.map +1 -1
- package/dist/utils/remotePaneActions.d.ts +24 -0
- package/dist/utils/remotePaneActions.d.ts.map +1 -0
- package/dist/utils/remotePaneActions.js +187 -0
- package/dist/utils/remotePaneActions.js.map +1 -0
- package/dist/utils/reopenWorktree.d.ts.map +1 -1
- package/dist/utils/reopenWorktree.js +10 -6
- package/dist/utils/reopenWorktree.js.map +1 -1
- package/dist/utils/settingsManager.d.ts.map +1 -1
- package/dist/utils/settingsManager.js +7 -0
- package/dist/utils/settingsManager.js.map +1 -1
- package/dist/utils/sidebarProjects.d.ts +12 -0
- package/dist/utils/sidebarProjects.d.ts.map +1 -0
- package/dist/utils/sidebarProjects.js +59 -0
- package/dist/utils/sidebarProjects.js.map +1 -0
- package/dist/utils/worktreeMetadata.d.ts +3 -0
- package/dist/utils/worktreeMetadata.d.ts.map +1 -1
- package/dist/utils/worktreeMetadata.js +14 -0
- package/dist/utils/worktreeMetadata.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,187 @@
|
|
|
1
|
+
import { spawnSync } from 'child_process';
|
|
2
|
+
import fs from 'fs/promises';
|
|
3
|
+
import os from 'os';
|
|
4
|
+
import path from 'path';
|
|
5
|
+
import { buildRemotePaneActionCommand } from './dmuxCommand.js';
|
|
6
|
+
export const DMUX_CONTROLLER_PID_OPTION = '@dmux_controller_pid';
|
|
7
|
+
export const DMUX_CONTROL_PANE_OPTION = '@dmux_control_pane';
|
|
8
|
+
export const DMUX_REMOTE_PANE_ACTION_TABLE = 'dmux-pane-action';
|
|
9
|
+
export const DMUX_REMOTE_PANE_MODE_OPTION = '@dmux_remote_pane_mode';
|
|
10
|
+
export const REMOTE_PANE_ACTION_SHORTCUTS = [
|
|
11
|
+
'j',
|
|
12
|
+
'm',
|
|
13
|
+
'x',
|
|
14
|
+
'a',
|
|
15
|
+
'b',
|
|
16
|
+
'f',
|
|
17
|
+
'A',
|
|
18
|
+
'h',
|
|
19
|
+
'H',
|
|
20
|
+
'P',
|
|
21
|
+
'r',
|
|
22
|
+
'S',
|
|
23
|
+
];
|
|
24
|
+
const REMOTE_MENU_TRIGGER_BINDINGS = [
|
|
25
|
+
{ key: 'M-M', noPrefix: true },
|
|
26
|
+
];
|
|
27
|
+
const LEGACY_REMOTE_TRIGGER_BINDINGS = [
|
|
28
|
+
{ key: 'M-D', noPrefix: true },
|
|
29
|
+
];
|
|
30
|
+
function escapeForDoubleQuotes(value) {
|
|
31
|
+
return value.replace(/[\\$"`]/g, '\\$&');
|
|
32
|
+
}
|
|
33
|
+
function sanitizeSessionName(sessionName) {
|
|
34
|
+
return sessionName.replace(/[^A-Za-z0-9_.-]+/g, '-');
|
|
35
|
+
}
|
|
36
|
+
function buildQueueDrainPath(queuePath) {
|
|
37
|
+
return `${queuePath}.${process.pid}.${Date.now()}.drain`;
|
|
38
|
+
}
|
|
39
|
+
function buildRunRemotePaneActionCommand(shortcut) {
|
|
40
|
+
const remoteActionCommand = `${buildRemotePaneActionCommand(shortcut)} >/dev/null 2>&1`;
|
|
41
|
+
return `run-shell "${escapeForDoubleQuotes(remoteActionCommand)}"`;
|
|
42
|
+
}
|
|
43
|
+
function buildSafeTmuxCommand(command) {
|
|
44
|
+
return `run-shell "${escapeForDoubleQuotes(`tmux ${command} >/dev/null 2>&1 || true`)}"`;
|
|
45
|
+
}
|
|
46
|
+
export function isRemotePaneActionShortcut(value) {
|
|
47
|
+
return REMOTE_PANE_ACTION_SHORTCUTS.includes(value);
|
|
48
|
+
}
|
|
49
|
+
export function getCurrentTmuxSessionName() {
|
|
50
|
+
try {
|
|
51
|
+
const result = spawnSync('tmux', ['display-message', '-p', '#S'], {
|
|
52
|
+
encoding: 'utf-8',
|
|
53
|
+
stdio: 'pipe',
|
|
54
|
+
});
|
|
55
|
+
if (result.status !== 0) {
|
|
56
|
+
return null;
|
|
57
|
+
}
|
|
58
|
+
const sessionName = (result.stdout || '').trim();
|
|
59
|
+
return sessionName || null;
|
|
60
|
+
}
|
|
61
|
+
catch {
|
|
62
|
+
return null;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
export function getCurrentTmuxPaneId() {
|
|
66
|
+
try {
|
|
67
|
+
const result = spawnSync('tmux', ['display-message', '-p', '#{pane_id}'], {
|
|
68
|
+
encoding: 'utf-8',
|
|
69
|
+
stdio: 'pipe',
|
|
70
|
+
});
|
|
71
|
+
if (result.status !== 0) {
|
|
72
|
+
return null;
|
|
73
|
+
}
|
|
74
|
+
const paneId = (result.stdout || '').trim();
|
|
75
|
+
return paneId || null;
|
|
76
|
+
}
|
|
77
|
+
catch {
|
|
78
|
+
return null;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
export function getTmuxSessionOption(sessionName, optionName) {
|
|
82
|
+
try {
|
|
83
|
+
const result = spawnSync('tmux', ['show-options', '-v', '-t', sessionName, optionName], {
|
|
84
|
+
encoding: 'utf-8',
|
|
85
|
+
stdio: 'pipe',
|
|
86
|
+
});
|
|
87
|
+
if (result.status !== 0) {
|
|
88
|
+
return null;
|
|
89
|
+
}
|
|
90
|
+
const value = (result.stdout || '').trim();
|
|
91
|
+
return value || null;
|
|
92
|
+
}
|
|
93
|
+
catch {
|
|
94
|
+
return null;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
export function showTmuxMessage(message) {
|
|
98
|
+
try {
|
|
99
|
+
spawnSync('tmux', ['display-message', '-d', '2500', message], {
|
|
100
|
+
stdio: 'pipe',
|
|
101
|
+
});
|
|
102
|
+
}
|
|
103
|
+
catch {
|
|
104
|
+
// Best effort only.
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
export function getRemotePaneActionQueuePath(sessionName, homeDir = os.homedir()) {
|
|
108
|
+
return path.join(homeDir, '.dmux', 'run', `${sanitizeSessionName(sessionName)}.remote-pane-actions.jsonl`);
|
|
109
|
+
}
|
|
110
|
+
export async function enqueueRemotePaneAction(sessionName, targetPaneId, shortcut, homeDir) {
|
|
111
|
+
const queuePath = getRemotePaneActionQueuePath(sessionName, homeDir);
|
|
112
|
+
const request = {
|
|
113
|
+
type: 'pane-shortcut',
|
|
114
|
+
targetPaneId,
|
|
115
|
+
shortcut,
|
|
116
|
+
createdAt: new Date().toISOString(),
|
|
117
|
+
};
|
|
118
|
+
await fs.mkdir(path.dirname(queuePath), { recursive: true });
|
|
119
|
+
await fs.appendFile(queuePath, `${JSON.stringify(request)}\n`, 'utf-8');
|
|
120
|
+
return queuePath;
|
|
121
|
+
}
|
|
122
|
+
export async function clearRemotePaneActions(sessionName, homeDir) {
|
|
123
|
+
const queuePath = getRemotePaneActionQueuePath(sessionName, homeDir);
|
|
124
|
+
await fs.rm(queuePath, { force: true }).catch(() => undefined);
|
|
125
|
+
}
|
|
126
|
+
export async function drainRemotePaneActions(sessionName, homeDir) {
|
|
127
|
+
const queuePath = getRemotePaneActionQueuePath(sessionName, homeDir);
|
|
128
|
+
const drainPath = buildQueueDrainPath(queuePath);
|
|
129
|
+
try {
|
|
130
|
+
await fs.rename(queuePath, drainPath);
|
|
131
|
+
}
|
|
132
|
+
catch (error) {
|
|
133
|
+
if (error?.code === 'ENOENT') {
|
|
134
|
+
return [];
|
|
135
|
+
}
|
|
136
|
+
throw error;
|
|
137
|
+
}
|
|
138
|
+
try {
|
|
139
|
+
const raw = await fs.readFile(drainPath, 'utf-8');
|
|
140
|
+
return raw
|
|
141
|
+
.split('\n')
|
|
142
|
+
.map((line) => line.trim())
|
|
143
|
+
.filter(Boolean)
|
|
144
|
+
.flatMap((line) => {
|
|
145
|
+
try {
|
|
146
|
+
const parsed = JSON.parse(line);
|
|
147
|
+
const shortcut = String(parsed.shortcut || '');
|
|
148
|
+
if (parsed.type !== 'pane-shortcut'
|
|
149
|
+
|| typeof parsed.targetPaneId !== 'string'
|
|
150
|
+
|| !isRemotePaneActionShortcut(shortcut)) {
|
|
151
|
+
return [];
|
|
152
|
+
}
|
|
153
|
+
return [{
|
|
154
|
+
type: 'pane-shortcut',
|
|
155
|
+
targetPaneId: parsed.targetPaneId,
|
|
156
|
+
shortcut,
|
|
157
|
+
createdAt: typeof parsed.createdAt === 'string'
|
|
158
|
+
? parsed.createdAt
|
|
159
|
+
: new Date().toISOString(),
|
|
160
|
+
}];
|
|
161
|
+
}
|
|
162
|
+
catch {
|
|
163
|
+
return [];
|
|
164
|
+
}
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
finally {
|
|
168
|
+
await fs.rm(drainPath, { force: true }).catch(() => undefined);
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
export function buildRemotePaneActionBindingCommands() {
|
|
172
|
+
return REMOTE_MENU_TRIGGER_BINDINGS.map(({ key, noPrefix }) => noPrefix
|
|
173
|
+
? `bind-key -n ${key} ${buildRunRemotePaneActionCommand('m')}`
|
|
174
|
+
: `bind-key ${key} ${buildRunRemotePaneActionCommand('m')}`);
|
|
175
|
+
}
|
|
176
|
+
export function buildRemotePaneActionCleanupCommands() {
|
|
177
|
+
const commands = [
|
|
178
|
+
...REMOTE_MENU_TRIGGER_BINDINGS,
|
|
179
|
+
...LEGACY_REMOTE_TRIGGER_BINDINGS,
|
|
180
|
+
].map(({ key, noPrefix }) => buildSafeTmuxCommand(noPrefix ? `unbind-key -n ${key}` : `unbind-key ${key}`));
|
|
181
|
+
commands.push(buildSafeTmuxCommand(`unbind-key -T ${DMUX_REMOTE_PANE_ACTION_TABLE} Escape`), buildSafeTmuxCommand(`unbind-key -T ${DMUX_REMOTE_PANE_ACTION_TABLE} C-c`), buildSafeTmuxCommand(`unbind-key -T ${DMUX_REMOTE_PANE_ACTION_TABLE} Any`));
|
|
182
|
+
for (const shortcut of REMOTE_PANE_ACTION_SHORTCUTS) {
|
|
183
|
+
commands.push(buildSafeTmuxCommand(`unbind-key -T ${DMUX_REMOTE_PANE_ACTION_TABLE} ${shortcut}`));
|
|
184
|
+
}
|
|
185
|
+
return commands;
|
|
186
|
+
}
|
|
187
|
+
//# sourceMappingURL=remotePaneActions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remotePaneActions.js","sourceRoot":"","sources":["../../src/utils/remotePaneActions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reopenWorktree.d.ts","sourceRoot":"","sources":["../../src/utils/reopenWorktree.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,QAAQ,EAAc,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"reopenWorktree.d.ts","sourceRoot":"","sources":["../../src/utils/reopenWorktree.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,QAAQ,EAAc,MAAM,aAAa,CAAC;AAcxD,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,aAAa,EAAE,QAAQ,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,oBAAoB,CAAC,CAsL/B"}
|
|
@@ -5,7 +5,7 @@ import { setupSidebarLayout, getTerminalDimensions, splitPane, } from './tmux.js
|
|
|
5
5
|
import { SIDEBAR_WIDTH, recalculateAndApplyLayout } from './layoutManager.js';
|
|
6
6
|
import { atomicWriteJsonSync } from './atomicWrite.js';
|
|
7
7
|
import { buildWorktreePaneTitle } from './paneTitle.js';
|
|
8
|
-
import { AGENT_IDS,
|
|
8
|
+
import { AGENT_IDS, buildAgentResumeOrLaunchCommand, } from './agentLaunch.js';
|
|
9
9
|
import { ensureGeminiFolderTrusted } from './geminiTrust.js';
|
|
10
10
|
import { SettingsManager } from './settingsManager.js';
|
|
11
11
|
import { filterEnabledAgents, getInstalledAgents } from './agentDetection.js';
|
|
@@ -19,6 +19,7 @@ export async function reopenWorktree(options) {
|
|
|
19
19
|
const { slug, worktreePath, projectRoot, existingPanes, sessionConfigPath: optionsSessionConfigPath, sessionProjectRoot: optionsSessionProjectRoot, } = options;
|
|
20
20
|
const paneProjectName = path.basename(projectRoot);
|
|
21
21
|
const settings = new SettingsManager(projectRoot).getSettings();
|
|
22
|
+
const metadata = readWorktreeMetadata(worktreePath);
|
|
22
23
|
const sessionProjectRoot = optionsSessionProjectRoot
|
|
23
24
|
|| (optionsSessionConfigPath ? path.dirname(path.dirname(optionsSessionConfigPath)) : projectRoot);
|
|
24
25
|
const tmuxService = TmuxService.getInstance();
|
|
@@ -96,7 +97,7 @@ export async function reopenWorktree(options) {
|
|
|
96
97
|
await tmuxService.sendTmuxKeys(paneInfo, 'Enter');
|
|
97
98
|
// Wait for CD to complete
|
|
98
99
|
await new Promise((resolve) => setTimeout(resolve, 300));
|
|
99
|
-
// Detect which agent to use - prefer
|
|
100
|
+
// Detect which agent to use - prefer stored metadata, then fall back to enabled/installed order.
|
|
100
101
|
const installedAgents = await getInstalledAgents();
|
|
101
102
|
const enabledAgents = filterEnabledAgents(installedAgents, settings.enabledAgents);
|
|
102
103
|
const candidateAgents = enabledAgents.length > 0 ? enabledAgents : installedAgents;
|
|
@@ -106,21 +107,23 @@ export async function reopenWorktree(options) {
|
|
|
106
107
|
'opencode',
|
|
107
108
|
...AGENT_IDS.filter((agent) => !['claude', 'codex', 'opencode'].includes(agent)),
|
|
108
109
|
];
|
|
109
|
-
const
|
|
110
|
+
const configuredAgent = metadata?.agent;
|
|
111
|
+
const agent = configuredAgent && candidateAgents.includes(configuredAgent)
|
|
112
|
+
? configuredAgent
|
|
113
|
+
: preferredOrder.find((candidate) => candidateAgents.includes(candidate));
|
|
114
|
+
const permissionMode = metadata?.permissionMode ?? settings.permissionMode;
|
|
110
115
|
// Resume the agent session (or start interactive mode when no resume command is available).
|
|
111
116
|
if (agent) {
|
|
112
117
|
if (agent === 'gemini') {
|
|
113
118
|
ensureGeminiFolderTrusted(worktreePath);
|
|
114
119
|
}
|
|
115
|
-
const resumeCommand =
|
|
116
|
-
|| buildAgentCommand(agent, settings.permissionMode);
|
|
120
|
+
const resumeCommand = buildAgentResumeOrLaunchCommand(agent, permissionMode);
|
|
117
121
|
await tmuxService.sendShellCommand(paneInfo, resumeCommand);
|
|
118
122
|
await tmuxService.sendTmuxKeys(paneInfo, 'Enter');
|
|
119
123
|
}
|
|
120
124
|
// Keep focus on the new pane
|
|
121
125
|
await tmuxService.selectPane(paneInfo);
|
|
122
126
|
// Create the pane object
|
|
123
|
-
const metadata = readWorktreeMetadata(worktreePath);
|
|
124
127
|
const currentBranch = getCurrentBranch(worktreePath);
|
|
125
128
|
const newPane = {
|
|
126
129
|
id: `dmux-${Date.now()}`,
|
|
@@ -134,6 +137,7 @@ export async function reopenWorktree(options) {
|
|
|
134
137
|
projectName: paneProjectName,
|
|
135
138
|
worktreePath,
|
|
136
139
|
agent,
|
|
140
|
+
permissionMode,
|
|
137
141
|
autopilot: settings.enableAutopilotByDefault ?? false,
|
|
138
142
|
mergeTargetChain: metadata?.mergeTargetChain,
|
|
139
143
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reopenWorktree.js","sourceRoot":"","sources":["../../src/utils/reopenWorktree.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,SAAS,GACV,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,aAAa,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAE9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EACL,SAAS,EACT,
|
|
1
|
+
{"version":3,"file":"reopenWorktree.js","sourceRoot":"","sources":["../../src/utils/reopenWorktree.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settingsManager.d.ts","sourceRoot":"","sources":["../../src/utils/settingsManager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"settingsManager.d.ts","sourceRoot":"","sources":["../../src/utils/settingsManager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AA8ElF,eAAO,MAAM,mBAAmB,EAAE,iBAAiB,EAiGlD,CAAC;AAEF,qBAAa,eAAe;IAC1B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,cAAc,CAAoB;IAC1C,OAAO,CAAC,eAAe,CAAoB;gBAE/B,WAAW,CAAC,EAAE,MAAM;IAMhC,OAAO,CAAC,YAAY;IAsBpB,OAAO,CAAC,0BAA0B;IAMlC,OAAO,CAAC,0BAA0B;IAMlC,OAAO,CAAC,uBAAuB;IAwB/B;;OAEG;IACH,WAAW,IAAI,YAAY;IAe3B;;OAEG;IACH,UAAU,CAAC,CAAC,SAAS,MAAM,YAAY,EAAE,GAAG,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;IAKjE;;OAEG;IACH,iBAAiB,IAAI,YAAY;IAIjC;;OAEG;IACH,kBAAkB,IAAI,YAAY;IAIlC;;OAEG;IACH,aAAa,CAAC,CAAC,SAAS,MAAM,YAAY,EACxC,GAAG,EAAE,CAAC,EACN,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,EACtB,KAAK,EAAE,aAAa,GACnB,IAAI;IA4EP;;OAEG;IACH,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,aAAa,GAAG,IAAI;IAsG3E;;OAEG;IACH,aAAa,CAAC,GAAG,EAAE,MAAM,YAAY,EAAE,KAAK,EAAE,aAAa,GAAG,IAAI;IAUlE,OAAO,CAAC,kBAAkB;IAa1B,OAAO,CAAC,mBAAmB;IAa3B;;OAEG;IACH,iBAAiB,CAAC,GAAG,EAAE,MAAM,YAAY,GAAG,OAAO;IAOnD;;OAEG;IACH,iBAAiB,CAAC,GAAG,EAAE,MAAM,YAAY,GAAG,aAAa,GAAG,IAAI;CAWjE"}
|
|
@@ -40,6 +40,7 @@ const DEFAULT_SETTINGS = {
|
|
|
40
40
|
maxPaneWidth: DEFAULT_MAX_PANE_WIDTH,
|
|
41
41
|
enabledAgents: getDefaultEnabledAgents(),
|
|
42
42
|
enabledNotificationSounds: getDefaultNotificationSoundSelection(),
|
|
43
|
+
showFooterTips: true,
|
|
43
44
|
};
|
|
44
45
|
const AGENT_OPTIONS = getAgentDefinitions().map((agent) => ({
|
|
45
46
|
value: agent.id,
|
|
@@ -86,6 +87,12 @@ export const SETTING_DEFINITIONS = [
|
|
|
86
87
|
description: 'Select the macOS helper sounds that dmux randomizes between for background alerts',
|
|
87
88
|
type: 'action',
|
|
88
89
|
},
|
|
90
|
+
{
|
|
91
|
+
key: 'showFooterTips',
|
|
92
|
+
label: 'Show Footer Tips',
|
|
93
|
+
description: 'Rotate short dmux tips in the footer. Disable this if you prefer a quieter sidebar.',
|
|
94
|
+
type: 'boolean',
|
|
95
|
+
},
|
|
89
96
|
{
|
|
90
97
|
key: 'useTmuxHooks',
|
|
91
98
|
label: 'Use Tmux Hooks',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settingsManager.js","sourceRoot":"","sources":["../../src/utils/settingsManager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"settingsManager.js","sourceRoot":"","sources":["../../src/utils/settingsManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { DmuxPane, SidebarProject } from '../types.js';
|
|
2
|
+
export declare function sameSidebarProjectRoot(a: string, b: string): boolean;
|
|
3
|
+
export declare function hasSidebarProject(projects: SidebarProject[], projectRoot: string): boolean;
|
|
4
|
+
export declare function addSidebarProject(projects: SidebarProject[], project: SidebarProject): SidebarProject[];
|
|
5
|
+
export declare function removeSidebarProject(projects: SidebarProject[], projectRoot: string): SidebarProject[];
|
|
6
|
+
/**
|
|
7
|
+
* Normalize persistent sidebar projects so the session project is always present,
|
|
8
|
+
* explicit sidebar entries keep their order, and any pane-backed projects are
|
|
9
|
+
* preserved for backward compatibility.
|
|
10
|
+
*/
|
|
11
|
+
export declare function normalizeSidebarProjects(sidebarProjects: SidebarProject[] | undefined, panes: DmuxPane[], fallbackProjectRoot: string, fallbackProjectName: string): SidebarProject[];
|
|
12
|
+
//# sourceMappingURL=sidebarProjects.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sidebarProjects.d.ts","sourceRoot":"","sources":["../../src/utils/sidebarProjects.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAiB5D,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAEpE;AAED,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,cAAc,EAAE,EAC1B,WAAW,EAAE,MAAM,GAClB,OAAO,CAET;AAED,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,cAAc,EAAE,EAC1B,OAAO,EAAE,cAAc,GACtB,cAAc,EAAE,CAMlB;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,cAAc,EAAE,EAC1B,WAAW,EAAE,MAAM,GAClB,cAAc,EAAE,CAElB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,eAAe,EAAE,cAAc,EAAE,GAAG,SAAS,EAC7C,KAAK,EAAE,QAAQ,EAAE,EACjB,mBAAmB,EAAE,MAAM,EAC3B,mBAAmB,EAAE,MAAM,GAC1B,cAAc,EAAE,CA6BlB"}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import path from 'path';
|
|
2
|
+
import { getPaneProjectName, getPaneProjectRoot } from './paneProject.js';
|
|
3
|
+
function normalizeProjectRoot(projectRoot) {
|
|
4
|
+
return path.resolve(projectRoot);
|
|
5
|
+
}
|
|
6
|
+
function buildProjectEntry(projectRoot, projectName) {
|
|
7
|
+
const normalizedRoot = normalizeProjectRoot(projectRoot);
|
|
8
|
+
const derivedName = path.basename(normalizedRoot) || 'project';
|
|
9
|
+
return {
|
|
10
|
+
projectRoot: normalizedRoot,
|
|
11
|
+
projectName: projectName?.trim() || derivedName,
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
export function sameSidebarProjectRoot(a, b) {
|
|
15
|
+
return normalizeProjectRoot(a) === normalizeProjectRoot(b);
|
|
16
|
+
}
|
|
17
|
+
export function hasSidebarProject(projects, projectRoot) {
|
|
18
|
+
return projects.some((project) => sameSidebarProjectRoot(project.projectRoot, projectRoot));
|
|
19
|
+
}
|
|
20
|
+
export function addSidebarProject(projects, project) {
|
|
21
|
+
if (hasSidebarProject(projects, project.projectRoot)) {
|
|
22
|
+
return projects;
|
|
23
|
+
}
|
|
24
|
+
return [...projects, buildProjectEntry(project.projectRoot, project.projectName)];
|
|
25
|
+
}
|
|
26
|
+
export function removeSidebarProject(projects, projectRoot) {
|
|
27
|
+
return projects.filter((project) => !sameSidebarProjectRoot(project.projectRoot, projectRoot));
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Normalize persistent sidebar projects so the session project is always present,
|
|
31
|
+
* explicit sidebar entries keep their order, and any pane-backed projects are
|
|
32
|
+
* preserved for backward compatibility.
|
|
33
|
+
*/
|
|
34
|
+
export function normalizeSidebarProjects(sidebarProjects, panes, fallbackProjectRoot, fallbackProjectName) {
|
|
35
|
+
const normalizedProjects = [];
|
|
36
|
+
const seenRoots = new Set();
|
|
37
|
+
const addProject = (projectRoot, projectName) => {
|
|
38
|
+
const entry = buildProjectEntry(projectRoot, projectName);
|
|
39
|
+
const key = normalizeProjectRoot(entry.projectRoot);
|
|
40
|
+
if (seenRoots.has(key)) {
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
seenRoots.add(key);
|
|
44
|
+
normalizedProjects.push(entry);
|
|
45
|
+
};
|
|
46
|
+
addProject(fallbackProjectRoot, fallbackProjectName);
|
|
47
|
+
for (const project of sidebarProjects || []) {
|
|
48
|
+
if (!project?.projectRoot)
|
|
49
|
+
continue;
|
|
50
|
+
addProject(project.projectRoot, project.projectName);
|
|
51
|
+
}
|
|
52
|
+
for (const pane of panes) {
|
|
53
|
+
const projectRoot = getPaneProjectRoot(pane, fallbackProjectRoot);
|
|
54
|
+
const projectName = getPaneProjectName(pane, fallbackProjectRoot, fallbackProjectName);
|
|
55
|
+
addProject(projectRoot, projectName);
|
|
56
|
+
}
|
|
57
|
+
return normalizedProjects;
|
|
58
|
+
}
|
|
59
|
+
//# sourceMappingURL=sidebarProjects.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sidebarProjects.js","sourceRoot":"","sources":["../../src/utils/sidebarProjects.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import type { MergeTargetReference } from '../types.js';
|
|
2
|
+
import { type AgentName, type PermissionMode } from './agentLaunch.js';
|
|
2
3
|
export interface WorktreeMetadata {
|
|
4
|
+
agent?: AgentName;
|
|
5
|
+
permissionMode?: PermissionMode;
|
|
3
6
|
branchName?: string;
|
|
4
7
|
mergeTargetChain?: MergeTargetReference[];
|
|
5
8
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktreeMetadata.d.ts","sourceRoot":"","sources":["../../src/utils/worktreeMetadata.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"worktreeMetadata.d.ts","sourceRoot":"","sources":["../../src/utils/worktreeMetadata.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAG1B,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,oBAAoB,EAAE,CAAC;CAC3C;AA+CD,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CA+BlF;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,gBAAgB,GACzB,IAAI,CAIN"}
|
|
@@ -1,8 +1,15 @@
|
|
|
1
1
|
import fs from 'fs';
|
|
2
2
|
import path from 'path';
|
|
3
|
+
import { isAgentName, } from './agentLaunch.js';
|
|
3
4
|
import { atomicWriteJsonSync } from './atomicWrite.js';
|
|
4
5
|
const METADATA_DIR = '.dmux';
|
|
5
6
|
const METADATA_FILE = 'worktree-metadata.json';
|
|
7
|
+
const PERMISSION_MODES = new Set([
|
|
8
|
+
'',
|
|
9
|
+
'plan',
|
|
10
|
+
'acceptEdits',
|
|
11
|
+
'bypassPermissions',
|
|
12
|
+
]);
|
|
6
13
|
function isMergeTargetReference(value) {
|
|
7
14
|
if (!value || typeof value !== 'object')
|
|
8
15
|
return false;
|
|
@@ -39,6 +46,13 @@ export function readWorktreeMetadata(worktreePath) {
|
|
|
39
46
|
const metadataPath = getWorktreeMetadataPath(worktreePath);
|
|
40
47
|
const parsed = JSON.parse(fs.readFileSync(metadataPath, 'utf-8'));
|
|
41
48
|
const metadata = {};
|
|
49
|
+
if (typeof parsed.agent === 'string' && isAgentName(parsed.agent)) {
|
|
50
|
+
metadata.agent = parsed.agent;
|
|
51
|
+
}
|
|
52
|
+
if (typeof parsed.permissionMode === 'string'
|
|
53
|
+
&& PERMISSION_MODES.has(parsed.permissionMode)) {
|
|
54
|
+
metadata.permissionMode = parsed.permissionMode;
|
|
55
|
+
}
|
|
42
56
|
if (typeof parsed.branchName === 'string' && parsed.branchName.length > 0) {
|
|
43
57
|
metadata.branchName = parsed.branchName;
|
|
44
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktreeMetadata.js","sourceRoot":"","sources":["../../src/utils/worktreeMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"worktreeMetadata.js","sourceRoot":"","sources":["../../src/utils/worktreeMetadata.ts"],"names":[],"mappings":"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"}
|