dmux 5.7.1 → 5.8.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/README.md +2 -1
- package/dist/DmuxApp.d.ts.map +1 -1
- package/dist/DmuxApp.js +14 -5
- package/dist/DmuxApp.js.map +1 -1
- package/dist/components/popups/newPanePopup.d.ts.map +1 -1
- package/dist/components/popups/newPanePopup.js +13 -2
- package/dist/components/popups/newPanePopup.js.map +1 -1
- package/dist/hooks/useInputHandling.d.ts.map +1 -1
- package/dist/hooks/useInputHandling.js +1 -0
- package/dist/hooks/useInputHandling.js.map +1 -1
- package/dist/hooks/usePaneCreation.d.ts +1 -0
- package/dist/hooks/usePaneCreation.d.ts.map +1 -1
- package/dist/hooks/usePaneCreation.js +4 -0
- package/dist/hooks/usePaneCreation.js.map +1 -1
- package/dist/hooks/usePaneLoading.d.ts.map +1 -1
- package/dist/hooks/usePaneLoading.js +16 -1
- package/dist/hooks/usePaneLoading.js.map +1 -1
- package/dist/i18n/index.d.ts +33 -0
- package/dist/i18n/index.d.ts.map +1 -0
- package/dist/i18n/index.js +70 -0
- package/dist/i18n/index.js.map +1 -0
- package/dist/i18n/locales/en.d.ts +4 -0
- package/dist/i18n/locales/en.d.ts.map +1 -0
- package/dist/i18n/locales/en.js +114 -0
- package/dist/i18n/locales/en.js.map +1 -0
- package/dist/i18n/locales/ja.d.ts +4 -0
- package/dist/i18n/locales/ja.d.ts.map +1 -0
- package/dist/i18n/locales/ja.js +114 -0
- package/dist/i18n/locales/ja.js.map +1 -0
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/services/DmuxAttentionService.d.ts +8 -0
- package/dist/services/DmuxAttentionService.d.ts.map +1 -1
- package/dist/services/DmuxAttentionService.js +52 -2
- package/dist/services/DmuxAttentionService.js.map +1 -1
- package/dist/services/DmuxFocusService.d.ts +1 -0
- package/dist/services/DmuxFocusService.d.ts.map +1 -1
- package/dist/services/DmuxFocusService.js +7 -0
- package/dist/services/DmuxFocusService.js.map +1 -1
- package/dist/services/PopupManager.d.ts.map +1 -1
- package/dist/services/PopupManager.js +15 -4
- package/dist/services/PopupManager.js.map +1 -1
- package/dist/services/StatusDetector.d.ts +1 -1
- package/dist/services/StatusDetector.d.ts.map +1 -1
- package/dist/services/StatusDetector.js +6 -3
- package/dist/services/StatusDetector.js.map +1 -1
- package/dist/types.d.ts +5 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/agentLaunch.d.ts +4 -0
- package/dist/utils/agentLaunch.d.ts.map +1 -1
- package/dist/utils/agentLaunch.js +28 -10
- package/dist/utils/agentLaunch.js.map +1 -1
- package/dist/utils/attachAgent.d.ts +1 -0
- package/dist/utils/attachAgent.d.ts.map +1 -1
- package/dist/utils/attachAgent.js +17 -1
- package/dist/utils/attachAgent.js.map +1 -1
- package/dist/utils/claudeHooks.d.ts +9 -0
- package/dist/utils/claudeHooks.d.ts.map +1 -0
- package/dist/utils/claudeHooks.js +104 -0
- package/dist/utils/claudeHooks.js.map +1 -0
- package/dist/utils/codexHooks.d.ts +5 -0
- package/dist/utils/codexHooks.d.ts.map +1 -1
- package/dist/utils/codexHooks.js +17 -3
- package/dist/utils/codexHooks.js.map +1 -1
- package/dist/utils/generated-agents-doc.d.ts +1 -1
- package/dist/utils/generated-agents-doc.js +1 -1
- package/dist/utils/paneAttentionHeuristics.d.ts +2 -0
- package/dist/utils/paneAttentionHeuristics.d.ts.map +1 -1
- package/dist/utils/paneAttentionHeuristics.js +32 -0
- package/dist/utils/paneAttentionHeuristics.js.map +1 -1
- package/dist/utils/paneBootstrapConfig.d.ts +2 -0
- package/dist/utils/paneBootstrapConfig.d.ts.map +1 -1
- package/dist/utils/paneBootstrapRunner.js +20 -4
- package/dist/utils/paneBootstrapRunner.js.map +1 -1
- package/dist/utils/paneCreation.d.ts +1 -0
- package/dist/utils/paneCreation.d.ts.map +1 -1
- package/dist/utils/paneCreation.js +5 -1
- package/dist/utils/paneCreation.js.map +1 -1
- package/dist/utils/reopenWorktree.d.ts.map +1 -1
- package/dist/utils/reopenWorktree.js +18 -1
- package/dist/utils/reopenWorktree.js.map +1 -1
- package/dist/utils/settingsManager.d.ts +6 -0
- package/dist/utils/settingsManager.d.ts.map +1 -1
- package/dist/utils/settingsManager.js +154 -0
- package/dist/utils/settingsManager.js.map +1 -1
- package/dist/utils/worktreeMetadata.d.ts +1 -0
- package/dist/utils/worktreeMetadata.d.ts.map +1 -1
- package/dist/utils/worktreeMetadata.js +3 -0
- package/dist/utils/worktreeMetadata.js.map +1 -1
- package/dist/workers/PaneWorker.js +56 -22
- package/dist/workers/PaneWorker.js.map +1 -1
- package/dist/workers/WorkerMessages.d.ts +5 -2
- package/dist/workers/WorkerMessages.d.ts.map +1 -1
- package/dist/workers/WorkerMessages.js.map +1 -1
- package/native/macos/dmux-helper.swift +1 -18
- package/native/macos/prebuilt/dmux-helper.app/Contents/MacOS/dmux-helper +0 -0
- package/package.json +1 -1
|
@@ -5,13 +5,14 @@ import { ensurePaneBorderStatusForCurrentSession, setupSidebarLayout, getTermina
|
|
|
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, buildAgentResumeOrLaunchCommand, } from './agentLaunch.js';
|
|
8
|
+
import { AGENT_IDS, buildAgentResumeOrLaunchCommand, shouldEnableCodexGoals, } 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';
|
|
12
12
|
import { getCurrentBranch } from './git.js';
|
|
13
13
|
import { readWorktreeMetadata } from './worktreeMetadata.js';
|
|
14
14
|
import { buildCodexHookedCommand, installCodexPaneHooks, } from './codexHooks.js';
|
|
15
|
+
import { installClaudePaneHooks } from './claudeHooks.js';
|
|
15
16
|
import { resolveProjectColorTheme } from './paneColors.js';
|
|
16
17
|
/**
|
|
17
18
|
* Reopens a closed worktree by creating a new pane in the existing worktree
|
|
@@ -117,6 +118,7 @@ export async function reopenWorktree(options) {
|
|
|
117
118
|
? configuredAgent
|
|
118
119
|
: preferredOrder.find((candidate) => candidateAgents.includes(candidate)));
|
|
119
120
|
const permissionMode = metadata?.permissionMode ?? settings.permissionMode;
|
|
121
|
+
const goalMode = metadata?.goalMode ?? settings.enableGoalModeByDefault ?? false;
|
|
120
122
|
const dmuxPaneId = `dmux-${Date.now()}`;
|
|
121
123
|
// Resume the agent session (or start interactive mode when no resume command is available).
|
|
122
124
|
if (agent) {
|
|
@@ -140,8 +142,22 @@ export async function reopenWorktree(options) {
|
|
|
140
142
|
dmuxPaneId,
|
|
141
143
|
tmuxPaneId: paneInfo,
|
|
142
144
|
eventFile: codexHookEventFile,
|
|
145
|
+
}, {
|
|
146
|
+
enableGoals: shouldEnableCodexGoals(agent, goalMode),
|
|
143
147
|
});
|
|
144
148
|
}
|
|
149
|
+
if (agent === 'claude') {
|
|
150
|
+
try {
|
|
151
|
+
installClaudePaneHooks({
|
|
152
|
+
worktreePath,
|
|
153
|
+
dmuxPaneId,
|
|
154
|
+
tmuxPaneId: paneInfo,
|
|
155
|
+
});
|
|
156
|
+
}
|
|
157
|
+
catch {
|
|
158
|
+
// Hook installation is best effort; Claude can still resume normally.
|
|
159
|
+
}
|
|
160
|
+
}
|
|
145
161
|
await tmuxService.sendShellCommand(paneInfo, resumeCommand);
|
|
146
162
|
await tmuxService.sendTmuxKeys(paneInfo, 'Enter');
|
|
147
163
|
}
|
|
@@ -165,6 +181,7 @@ export async function reopenWorktree(options) {
|
|
|
165
181
|
agent,
|
|
166
182
|
permissionMode,
|
|
167
183
|
autopilot: settings.enableAutopilotByDefault ?? false,
|
|
184
|
+
goalMode,
|
|
168
185
|
mergeTargetChain: metadata?.mergeTargetChain,
|
|
169
186
|
};
|
|
170
187
|
// Pre-save pane to config before destroying welcome pane (first content pane only),
|
|
@@ -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,uCAAuC,EACvC,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,+BAA+B,
|
|
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,uCAAuC,EACvC,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,+BAA+B,EAC/B,sBAAsB,GAEvB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EACL,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAiB3D;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAA8B;IAE9B,MAAM,EACJ,KAAK,EAAE,cAAc,EACrB,IAAI,EACJ,YAAY,EACZ,WAAW,EACX,aAAa,EACb,iBAAiB,EAAE,wBAAwB,EAC3C,kBAAkB,EAAE,yBAAyB,GAC9C,GAAG,OAAO,CAAC;IACZ,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE,CAAC;IAChE,MAAM,QAAQ,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAC;IACpD,MAAM,kBAAkB,GAAG,yBAAyB;WAC/C,CAAC,wBAAwB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IAErG,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;IAC9C,MAAM,cAAc,GAAG,WAAW,CAAC,oBAAoB,EAAE,CAAC;IAE1D,uCAAuC;IACvC,MAAM,UAAU,GAAG,wBAAwB;WACtC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC;IAChE,IAAI,aAAiC,CAAC;IACtC,IAAI,qBAAqB,GAAqB,EAAE,CAAC;IAEjD,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAe,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACrD,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;QACrC,qBAAqB,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;QAE5F,sDAAsD;QACtD,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;YAC3D,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,aAAa,GAAG,cAAc,CAAC;gBAC/B,MAAM,CAAC,aAAa,GAAG,aAAa,CAAC;gBACrC,MAAM,CAAC,eAAe,GAAG,aAAa,CAAC;gBACvC,MAAM,CAAC,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;gBAC9C,mBAAmB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;QAED,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,aAAa,GAAG,cAAc,CAAC;YAC/B,MAAM,CAAC,aAAa,GAAG,aAAa,CAAC;YACrC,MAAM,CAAC,eAAe,GAAG,aAAa,CAAC;YACvC,MAAM,CAAC,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YAC9C,mBAAmB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,aAAa,GAAG,cAAc,CAAC;IACjC,CAAC;IAED,qCAAqC;IACrC,IAAI,CAAC;QACH,uCAAuC,EAAE,CAAC;IAC5C,CAAC;IAAC,MAAM,CAAC;QACP,iCAAiC;IACnC,CAAC;IAED,8CAA8C;IAC9C,MAAM,kBAAkB,GAAG,aAAa,CAAC,MAAM,KAAK,CAAC,CAAC;IAEtD,IAAI,QAAgB,CAAC;IAErB,IAAI,kBAAkB,EAAE,CAAC;QACvB,QAAQ,GAAG,kBAAkB,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QAC1D,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IAC3D,CAAC;SAAM,CAAC;QACN,+CAA+C;QAC/C,MAAM,WAAW,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACrD,MAAM,UAAU,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACvD,QAAQ,GAAG,SAAS,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IAEzD,iBAAiB;IACjB,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,WAAW,KAAK,kBAAkB;YAClD,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,sBAAsB,CAAC,IAAI,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;QAC/D,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACtD,CAAC;IAAC,MAAM,CAAC;QACP,gCAAgC;IAClC,CAAC;IAED,uBAAuB;IACvB,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,UAAU,GAAG,qBAAqB,EAAE,CAAC;QAC3C,MAAM,iBAAiB,GAAG,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;QAE1E,MAAM,yBAAyB,CAC7B,aAAa,EACb,iBAAiB,EACjB,UAAU,CAAC,KAAK,EAChB,UAAU,CAAC,MAAM,CAClB,CAAC;QAEF,MAAM,WAAW,CAAC,aAAa,EAAE,CAAC;IACpC,CAAC;IAED,uBAAuB;IACvB,MAAM,WAAW,CAAC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,YAAY,GAAG,CAAC,CAAC;IACrE,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAElD,0BAA0B;IAC1B,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IAEzD,iGAAiG;IACjG,MAAM,eAAe,GAAG,MAAM,kBAAkB,EAAE,CAAC;IACnD,MAAM,aAAa,GAAG,mBAAmB,CAAC,eAAe,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC;IACnF,MAAM,eAAe,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC;IACnF,MAAM,cAAc,GAAgB;QAClC,QAAQ;QACR,OAAO;QACP,UAAU;QACV,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAC5B,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CACjD;KACF,CAAC;IACF,MAAM,eAAe,GAAG,QAAQ,EAAE,KAAK,CAAC;IACxC,MAAM,KAAK,GAAG,cAAc;WACvB,CAAC,eAAe,IAAI,eAAe,CAAC,QAAQ,CAAC,eAAe,CAAC;YAC9D,CAAC,CAAC,eAAe;YACjB,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC/E,MAAM,cAAc,GAAG,QAAQ,EAAE,cAAc,IAAI,QAAQ,CAAC,cAAc,CAAC;IAC3E,MAAM,QAAQ,GAAG,QAAQ,EAAE,QAAQ,IAAI,QAAQ,CAAC,uBAAuB,IAAI,KAAK,CAAC;IACjF,MAAM,UAAU,GAAG,QAAQ,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;IAExC,4FAA4F;IAC5F,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;YACvB,yBAAyB,CAAC,YAAY,CAAC,CAAC;QAC1C,CAAC;QAED,IAAI,aAAa,GAAG,+BAA+B,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QAC3E,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;YACtB,IAAI,kBAAsC,CAAC;YAC3C,IAAI,CAAC;gBACH,kBAAkB,GAAG,qBAAqB,CAAC;oBACzC,YAAY;oBACZ,UAAU;oBACV,UAAU,EAAE,QAAQ;iBACrB,CAAC,CAAC,SAAS,CAAC;YACf,CAAC;YAAC,MAAM,CAAC;gBACP,qEAAqE;YACvE,CAAC;YAED,aAAa,GAAG,uBAAuB,CAAC,aAAa,EAAE;gBACrD,UAAU;gBACV,UAAU,EAAE,QAAQ;gBACpB,SAAS,EAAE,kBAAkB;aAC9B,EAAE;gBACD,WAAW,EAAE,sBAAsB,CAAC,KAAK,EAAE,QAAQ,CAAC;aACrD,CAAC,CAAC;QACL,CAAC;QAED,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;YACvB,IAAI,CAAC;gBACH,sBAAsB,CAAC;oBACrB,YAAY;oBACZ,UAAU;oBACV,UAAU,EAAE,QAAQ;iBACrB,CAAC,CAAC;YACL,CAAC;YAAC,MAAM,CAAC;gBACP,sEAAsE;YACxE,CAAC;QACH,CAAC;QAED,MAAM,WAAW,CAAC,gBAAgB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QAC5D,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAED,6BAA6B;IAC7B,MAAM,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAEvC,yBAAyB;IACzB,MAAM,aAAa,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAErD,MAAM,OAAO,GAAa;QACxB,EAAE,EAAE,UAAU;QACd,IAAI;QACJ,WAAW,EAAE,QAAQ,EAAE,WAAW;QAClC,UAAU,EAAE,CAAC,QAAQ,EAAE,UAAU,IAAI,aAAa,CAAC,KAAK,IAAI;YAC1D,CAAC,CAAC,CAAC,QAAQ,EAAE,UAAU,IAAI,aAAa,CAAC;YACzC,CAAC,CAAC,SAAS;QACb,MAAM,EAAE,oBAAoB;QAC5B,MAAM,EAAE,QAAQ;QAChB,WAAW;QACX,WAAW,EAAE,eAAe;QAC5B,UAAU,EAAE,wBAAwB,CAAC,WAAW,EAAE,qBAAqB,CAAC;QACxE,YAAY;QACZ,KAAK;QACL,cAAc;QACd,SAAS,EAAE,QAAQ,CAAC,wBAAwB,IAAI,KAAK;QACrD,QAAQ;QACR,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB;KAC7C,CAAC;IAEF,oFAAoF;IACpF,4EAA4E;IAC5E,IAAI,kBAAkB,EAAE,CAAC;QACvB,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAC3D,MAAM,MAAM,GAAe,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YAErD,MAAM,CAAC,KAAK,GAAG,CAAC,GAAG,aAAa,EAAE,OAAO,CAAC,CAAC;YAC3C,MAAM,CAAC,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YAC9C,mBAAmB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC1C,CAAC;QAAC,MAAM,CAAC;YACP,qBAAqB;QACvB,CAAC;IACH,CAAC;IAED,sFAAsF;IACtF,mDAAmD;IACnD,IAAI,CAAC;QACH,MAAM,EAAE,6BAA6B,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAClF,6BAA6B,CAAC,kBAAkB,CAAC,CAAC;IACpD,CAAC;IAAC,MAAM,CAAC;QACP,gDAAgD;IAClD,CAAC;IAED,mCAAmC;IACnC,MAAM,WAAW,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAE7C,OAAO;QACL,IAAI,EAAE,OAAO;KACd,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import type { DmuxSettings, SettingsScope, EffectiveSettingsScope, SettingDefinition } from '../types.js';
|
|
2
2
|
export declare const DEFAULT_COLOR_THEME_SETTING_KEY = "defaultColorTheme";
|
|
3
3
|
export declare const SETTING_DEFINITIONS: SettingDefinition[];
|
|
4
|
+
/**
|
|
5
|
+
* Get localized setting definitions using i18n
|
|
6
|
+
* Returns a new array with translated labels and descriptions.
|
|
7
|
+
*/
|
|
8
|
+
export declare function getLocalizedSettingDefinitions(): SettingDefinition[];
|
|
4
9
|
export declare class SettingsManager {
|
|
5
10
|
private globalPath;
|
|
6
11
|
private projectPath;
|
|
@@ -11,6 +16,7 @@ export declare class SettingsManager {
|
|
|
11
16
|
constructor(projectRoot?: string);
|
|
12
17
|
private loadSettingsFile;
|
|
13
18
|
private loadSettings;
|
|
19
|
+
reloadSettings(): void;
|
|
14
20
|
private getValidGlobalMinPaneWidth;
|
|
15
21
|
private getValidGlobalMaxPaneWidth;
|
|
16
22
|
private resolveGlobalPaneWidths;
|
|
@@ -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,sBAAsB,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,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAqL1G,eAAO,MAAM,+BAA+B,sBAAsB,CAAC;AA8FnE,eAAO,MAAM,mBAAmB,EAAE,iBAAiB,EAuIlD,CAAC;AAEF;;;GAGG;AACH,wBAAgB,8BAA8B,IAAI,iBAAiB,EAAE,CAqBpE;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,cAAc,CAAoB;IAC1C,OAAO,CAAC,eAAe,CAAoB;IAC3C,OAAO,CAAC,YAAY,CAAoB;gBAE5B,WAAW,CAAC,EAAE,MAAM;IAQhC,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,YAAY;IAMpB,cAAc,IAAI,IAAI;IAItB,OAAO,CAAC,0BAA0B;IAMlC,OAAO,CAAC,0BAA0B;IAMlC,OAAO,CAAC,uBAAuB;IAwB/B;;OAEG;IACH,WAAW,IAAI,YAAY;IAgB3B;;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;IAkFP;;OAEG;IACH,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,aAAa,GAAG,IAAI;IA4G3E;;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,eAAe,IAAI,YAAY;IAI/B;;OAEG;IACH,iBAAiB,CAAC,GAAG,EAAE,MAAM,YAAY,GAAG,sBAAsB,GAAG,IAAI;CAY1E"}
|
|
@@ -5,13 +5,18 @@ import { DEFAULT_MIN_PANE_WIDTH, DEFAULT_MAX_PANE_WIDTH, MAX_MIN_PANE_WIDTH, MAX
|
|
|
5
5
|
import { isValidBranchName } from './git.js';
|
|
6
6
|
import { getAgentDefinitions, getDefaultEnabledAgents, isAgentName, } from './agentLaunch.js';
|
|
7
7
|
import { getDefaultNotificationSoundSelection, isNotificationSoundId, } from './notificationSounds.js';
|
|
8
|
+
import { t } from '../i18n/index.js';
|
|
8
9
|
import { DEFAULT_DMUX_THEME, DMUX_THEME_NAMES, isDmuxThemeName, } from '../theme/themePalette.js';
|
|
9
10
|
const GLOBAL_SETTINGS_PATH = join(homedir(), '.dmux.global.json');
|
|
10
11
|
const TEAM_DEFAULTS_FILENAME = '.dmux.defaults.json';
|
|
11
12
|
const PERMISSION_MODES = ['', 'plan', 'acceptEdits', 'bypassPermissions'];
|
|
13
|
+
const LANGUAGE_OPTIONS = ['en', 'ja'];
|
|
12
14
|
function isPermissionMode(value) {
|
|
13
15
|
return PERMISSION_MODES.includes(value);
|
|
14
16
|
}
|
|
17
|
+
function isLanguage(value) {
|
|
18
|
+
return LANGUAGE_OPTIONS.includes(value);
|
|
19
|
+
}
|
|
15
20
|
function isValidMaxPaneWidth(value) {
|
|
16
21
|
return (typeof value === 'number' &&
|
|
17
22
|
Number.isInteger(value) &&
|
|
@@ -36,6 +41,12 @@ function sanitizeLoadedSettings(value) {
|
|
|
36
41
|
if (typeof parsed.enableAutopilotByDefault === 'boolean') {
|
|
37
42
|
sanitized.enableAutopilotByDefault = parsed.enableAutopilotByDefault;
|
|
38
43
|
}
|
|
44
|
+
if (typeof parsed.enableGoalModeByDefault === 'boolean') {
|
|
45
|
+
sanitized.enableGoalModeByDefault = parsed.enableGoalModeByDefault;
|
|
46
|
+
}
|
|
47
|
+
if (typeof parsed.enableNotifications === 'boolean') {
|
|
48
|
+
sanitized.enableNotifications = parsed.enableNotifications;
|
|
49
|
+
}
|
|
39
50
|
if (typeof parsed.promptForGitOptionsOnCreate === 'boolean') {
|
|
40
51
|
sanitized.promptForGitOptionsOnCreate = parsed.promptForGitOptionsOnCreate;
|
|
41
52
|
}
|
|
@@ -55,6 +66,9 @@ function sanitizeLoadedSettings(value) {
|
|
|
55
66
|
if (typeof parsed.colorTheme === 'string' && isDmuxThemeName(parsed.colorTheme)) {
|
|
56
67
|
sanitized.colorTheme = parsed.colorTheme;
|
|
57
68
|
}
|
|
69
|
+
if (typeof parsed.language === 'string' && isLanguage(parsed.language)) {
|
|
70
|
+
sanitized.language = parsed.language;
|
|
71
|
+
}
|
|
58
72
|
if (typeof parsed.useTmuxHooks === 'boolean') {
|
|
59
73
|
sanitized.useTmuxHooks = parsed.useTmuxHooks;
|
|
60
74
|
}
|
|
@@ -87,12 +101,15 @@ const DEFAULT_SETTINGS = {
|
|
|
87
101
|
// Most permissive defaults for new dmux setups.
|
|
88
102
|
permissionMode: 'bypassPermissions',
|
|
89
103
|
enableAutopilotByDefault: true,
|
|
104
|
+
enableGoalModeByDefault: false,
|
|
105
|
+
enableNotifications: true,
|
|
90
106
|
promptForGitOptionsOnCreate: false,
|
|
91
107
|
minPaneWidth: DEFAULT_MIN_PANE_WIDTH,
|
|
92
108
|
maxPaneWidth: DEFAULT_MAX_PANE_WIDTH,
|
|
93
109
|
enabledAgents: getDefaultEnabledAgents(),
|
|
94
110
|
enabledNotificationSounds: getDefaultNotificationSoundSelection(),
|
|
95
111
|
showFooterTips: true,
|
|
112
|
+
language: 'en',
|
|
96
113
|
colorTheme: DEFAULT_DMUX_THEME,
|
|
97
114
|
};
|
|
98
115
|
const AGENT_OPTIONS = getAgentDefinitions().map((agent) => ({
|
|
@@ -100,7 +117,99 @@ const AGENT_OPTIONS = getAgentDefinitions().map((agent) => ({
|
|
|
100
117
|
label: agent.name,
|
|
101
118
|
}));
|
|
102
119
|
export const DEFAULT_COLOR_THEME_SETTING_KEY = 'defaultColorTheme';
|
|
120
|
+
const LOCALIZED_SETTING_TRANSLATIONS = {
|
|
121
|
+
language: {
|
|
122
|
+
label: 'settings.language',
|
|
123
|
+
description: 'settings.languageDescription',
|
|
124
|
+
},
|
|
125
|
+
permissionMode: {
|
|
126
|
+
label: 'settings.permissionMode',
|
|
127
|
+
description: 'settings.permissionModeDescription',
|
|
128
|
+
optionLabels: {
|
|
129
|
+
'': 'settings.permissionModeDefault',
|
|
130
|
+
plan: 'settings.permissionModePlan',
|
|
131
|
+
acceptEdits: 'settings.permissionModeAcceptEdits',
|
|
132
|
+
bypassPermissions: 'settings.permissionModeBypassPermissions',
|
|
133
|
+
},
|
|
134
|
+
},
|
|
135
|
+
enableAutopilotByDefault: {
|
|
136
|
+
label: 'settings.enableAutopilot',
|
|
137
|
+
description: 'settings.enableAutopilotDescription',
|
|
138
|
+
},
|
|
139
|
+
enableGoalModeByDefault: {
|
|
140
|
+
label: 'settings.enableGoalMode',
|
|
141
|
+
description: 'settings.enableGoalModeDescription',
|
|
142
|
+
},
|
|
143
|
+
enableNotifications: {
|
|
144
|
+
label: 'settings.enableNotifications',
|
|
145
|
+
description: 'settings.enableNotificationsDescription',
|
|
146
|
+
},
|
|
147
|
+
defaultAgent: {
|
|
148
|
+
label: 'settings.defaultAgent',
|
|
149
|
+
description: 'settings.defaultAgentDescription',
|
|
150
|
+
optionLabels: {
|
|
151
|
+
'': 'settings.defaultAgentAsk',
|
|
152
|
+
},
|
|
153
|
+
},
|
|
154
|
+
enabledAgents: {
|
|
155
|
+
label: 'settings.enabledAgents',
|
|
156
|
+
description: 'settings.enabledAgentsDescription',
|
|
157
|
+
},
|
|
158
|
+
enabledNotificationSounds: {
|
|
159
|
+
label: 'settings.notificationSounds',
|
|
160
|
+
description: 'settings.notificationSoundsDescription',
|
|
161
|
+
},
|
|
162
|
+
showFooterTips: {
|
|
163
|
+
label: 'settings.showFooterTips',
|
|
164
|
+
description: 'settings.showFooterTipsDescription',
|
|
165
|
+
},
|
|
166
|
+
colorTheme: {
|
|
167
|
+
label: 'settings.colorTheme',
|
|
168
|
+
description: 'settings.colorThemeDescription',
|
|
169
|
+
},
|
|
170
|
+
useTmuxHooks: {
|
|
171
|
+
label: 'settings.useTmuxHooks',
|
|
172
|
+
description: 'settings.useTmuxHooksDescription',
|
|
173
|
+
},
|
|
174
|
+
baseBranch: {
|
|
175
|
+
label: 'settings.baseBranch',
|
|
176
|
+
description: 'settings.baseBranchDescription',
|
|
177
|
+
},
|
|
178
|
+
branchPrefix: {
|
|
179
|
+
label: 'settings.branchPrefix',
|
|
180
|
+
description: 'settings.branchPrefixDescription',
|
|
181
|
+
optionLabels: {
|
|
182
|
+
'': 'settings.noPrefix',
|
|
183
|
+
},
|
|
184
|
+
},
|
|
185
|
+
promptForGitOptionsOnCreate: {
|
|
186
|
+
label: 'settings.promptForGitOptionsOnCreate',
|
|
187
|
+
description: 'settings.promptForGitOptionsOnCreateDescription',
|
|
188
|
+
},
|
|
189
|
+
minPaneWidth: {
|
|
190
|
+
label: 'settings.minPaneWidth',
|
|
191
|
+
description: 'settings.minPaneWidthDescription',
|
|
192
|
+
},
|
|
193
|
+
maxPaneWidth: {
|
|
194
|
+
label: 'settings.maxPaneWidth',
|
|
195
|
+
description: 'settings.maxPaneWidthDescription',
|
|
196
|
+
},
|
|
197
|
+
hooks: {
|
|
198
|
+
label: 'settings.manageHooks',
|
|
199
|
+
description: 'settings.manageHooksDescription',
|
|
200
|
+
},
|
|
201
|
+
};
|
|
103
202
|
export const SETTING_DEFINITIONS = [
|
|
203
|
+
{
|
|
204
|
+
key: 'language',
|
|
205
|
+
label: 'Language',
|
|
206
|
+
description: 'Select the display language for dmux',
|
|
207
|
+
type: 'select',
|
|
208
|
+
options: [
|
|
209
|
+
{ value: 'en', label: 'English' },
|
|
210
|
+
{ value: 'ja', label: '日本語' },
|
|
211
|
+
],
|
|
212
|
+
},
|
|
104
213
|
{
|
|
105
214
|
key: 'permissionMode',
|
|
106
215
|
label: 'Agent Permission Mode',
|
|
@@ -119,6 +228,18 @@ export const SETTING_DEFINITIONS = [
|
|
|
119
228
|
description: 'Automatically accept options when no risk is detected for new panes',
|
|
120
229
|
type: 'boolean',
|
|
121
230
|
},
|
|
231
|
+
{
|
|
232
|
+
key: 'enableGoalModeByDefault',
|
|
233
|
+
label: 'Enable Goal Mode by Default',
|
|
234
|
+
description: 'Start new panes in agent goal mode when the selected agent supports it',
|
|
235
|
+
type: 'boolean',
|
|
236
|
+
},
|
|
237
|
+
{
|
|
238
|
+
key: 'enableNotifications',
|
|
239
|
+
label: 'Enable Notifications',
|
|
240
|
+
description: 'Allow dmux to show native attention notifications and same-window attention flashes',
|
|
241
|
+
type: 'boolean',
|
|
242
|
+
},
|
|
122
243
|
{
|
|
123
244
|
key: 'defaultAgent',
|
|
124
245
|
label: 'Default Agent',
|
|
@@ -214,6 +335,30 @@ export const SETTING_DEFINITIONS = [
|
|
|
214
335
|
type: 'action',
|
|
215
336
|
},
|
|
216
337
|
];
|
|
338
|
+
/**
|
|
339
|
+
* Get localized setting definitions using i18n
|
|
340
|
+
* Returns a new array with translated labels and descriptions.
|
|
341
|
+
*/
|
|
342
|
+
export function getLocalizedSettingDefinitions() {
|
|
343
|
+
return SETTING_DEFINITIONS.map((definition) => {
|
|
344
|
+
const translation = LOCALIZED_SETTING_TRANSLATIONS[definition.key];
|
|
345
|
+
const localized = {
|
|
346
|
+
...definition,
|
|
347
|
+
label: translation ? t(translation.label) : definition.label,
|
|
348
|
+
description: translation ? t(translation.description) : definition.description,
|
|
349
|
+
};
|
|
350
|
+
if (definition.options) {
|
|
351
|
+
localized.options = definition.options.map((option) => {
|
|
352
|
+
const optionKey = translation?.optionLabels?.[option.value];
|
|
353
|
+
return {
|
|
354
|
+
...option,
|
|
355
|
+
label: optionKey ? t(optionKey) : option.label,
|
|
356
|
+
};
|
|
357
|
+
});
|
|
358
|
+
}
|
|
359
|
+
return localized;
|
|
360
|
+
});
|
|
361
|
+
}
|
|
217
362
|
export class SettingsManager {
|
|
218
363
|
globalPath;
|
|
219
364
|
projectPath;
|
|
@@ -246,6 +391,9 @@ export class SettingsManager {
|
|
|
246
391
|
this.globalSettings = this.loadSettingsFile(this.globalPath, 'global settings');
|
|
247
392
|
this.projectSettings = this.loadSettingsFile(this.projectPath, 'project settings');
|
|
248
393
|
}
|
|
394
|
+
reloadSettings() {
|
|
395
|
+
this.loadSettings();
|
|
396
|
+
}
|
|
249
397
|
getValidGlobalMinPaneWidth() {
|
|
250
398
|
return isValidMinPaneWidth(this.globalSettings.minPaneWidth)
|
|
251
399
|
? this.globalSettings.minPaneWidth
|
|
@@ -323,6 +471,9 @@ export class SettingsManager {
|
|
|
323
471
|
if (key === 'permissionMode' && typeof value === 'string' && !isPermissionMode(value)) {
|
|
324
472
|
throw new Error(`Invalid permissionMode: "${value}"`);
|
|
325
473
|
}
|
|
474
|
+
if (key === 'language' && (typeof value !== 'string' || !isLanguage(value))) {
|
|
475
|
+
throw new Error(`Invalid language: "${String(value)}"`);
|
|
476
|
+
}
|
|
326
477
|
if (key === 'colorTheme' && !isDmuxThemeName(value)) {
|
|
327
478
|
throw new Error(`Invalid colorTheme: "${String(value)}"`);
|
|
328
479
|
}
|
|
@@ -393,6 +544,9 @@ export class SettingsManager {
|
|
|
393
544
|
if (typeof settings.permissionMode === 'string' && !isPermissionMode(settings.permissionMode)) {
|
|
394
545
|
throw new Error(`Invalid permissionMode: "${settings.permissionMode}"`);
|
|
395
546
|
}
|
|
547
|
+
if (settings.language !== undefined && !isLanguage(settings.language)) {
|
|
548
|
+
throw new Error(`Invalid language: "${String(settings.language)}"`);
|
|
549
|
+
}
|
|
396
550
|
if (settings.colorTheme !== undefined && !isDmuxThemeName(settings.colorTheme)) {
|
|
397
551
|
throw new Error(`Invalid colorTheme: "${String(settings.colorTheme)}"`);
|
|
398
552
|
}
|
|
@@ -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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"}
|
|
@@ -3,6 +3,7 @@ import { type AgentName, type PermissionMode } from './agentLaunch.js';
|
|
|
3
3
|
export interface WorktreeMetadata {
|
|
4
4
|
agent?: AgentName;
|
|
5
5
|
permissionMode?: PermissionMode;
|
|
6
|
+
goalMode?: boolean;
|
|
6
7
|
displayName?: string;
|
|
7
8
|
branchName?: string;
|
|
8
9
|
mergeTargetChain?: MergeTargetReference[];
|
|
@@ -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;AACxD,OAAO,EAEL,KAAK,SAAS,EACd,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAI1B,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,oBAAoB,EAAE,CAAC;CAC3C;AAmDD,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,
|
|
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;AAI1B,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,oBAAoB,EAAE,CAAC;CAC3C;AAmDD,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CA0ClF;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,gBAAgB,GACzB,IAAI,CASN"}
|
|
@@ -58,6 +58,9 @@ export function readWorktreeMetadata(worktreePath) {
|
|
|
58
58
|
&& PERMISSION_MODES.has(parsed.permissionMode)) {
|
|
59
59
|
metadata.permissionMode = parsed.permissionMode;
|
|
60
60
|
}
|
|
61
|
+
if (typeof parsed.goalMode === 'boolean') {
|
|
62
|
+
metadata.goalMode = parsed.goalMode;
|
|
63
|
+
}
|
|
61
64
|
if (typeof parsed.displayName === 'string') {
|
|
62
65
|
const displayName = sanitizePaneDisplayName(parsed.displayName);
|
|
63
66
|
if (displayName.length > 0) {
|
|
@@ -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,EACL,WAAW,GAGZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"worktreeMetadata.js","sourceRoot":"","sources":["../../src/utils/worktreeMetadata.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import * as fs from 'fs';
|
|
|
4
4
|
import path from 'path';
|
|
5
5
|
import { capturePaneContent } from '../utils/paneCapture.js';
|
|
6
6
|
import { TmuxService } from '../services/TmuxService.js';
|
|
7
|
-
import { buildPaneActivityFingerprint, hasAgentWorkingIndicators, isLikelyUserTyping, } from '../utils/paneAttentionHeuristics.js';
|
|
7
|
+
import { buildPaneActivityFingerprint, getAgentHookStatus, hasAgentWorkingIndicators, isLikelyUserTyping, } from '../utils/paneAttentionHeuristics.js';
|
|
8
8
|
class PaneWorker {
|
|
9
9
|
static CAPTURE_LINE_COUNT = 50;
|
|
10
10
|
static USER_TYPING_SETTLE_MS = 3500;
|
|
@@ -26,9 +26,9 @@ class PaneWorker {
|
|
|
26
26
|
lastAgentActivityAt = 0;
|
|
27
27
|
awaitingAgentAfterUserInteraction = false;
|
|
28
28
|
statusBeforeAnalyzing = 'idle';
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
29
|
+
agentStopEventFile;
|
|
30
|
+
lastAgentStopEventTimestamp = 0;
|
|
31
|
+
lastAgentStopEventId = '';
|
|
32
32
|
tmux = TmuxService.getInstance();
|
|
33
33
|
constructor(config) {
|
|
34
34
|
this.paneId = config.paneId;
|
|
@@ -36,7 +36,7 @@ class PaneWorker {
|
|
|
36
36
|
this.agent = config.agent;
|
|
37
37
|
this.worktreePath = config.worktreePath;
|
|
38
38
|
this.pollIntervalMs = config.pollInterval || 1000;
|
|
39
|
-
this.
|
|
39
|
+
this.agentStopEventFile = this.resolveAgentStopEventFile();
|
|
40
40
|
this.setupMessageHandler();
|
|
41
41
|
this.startPolling();
|
|
42
42
|
this.emit('ready', {});
|
|
@@ -92,7 +92,7 @@ class PaneWorker {
|
|
|
92
92
|
const output = capturePaneContent(this.tmuxPaneId, PaneWorker.CAPTURE_LINE_COUNT);
|
|
93
93
|
const activityFingerprint = buildPaneActivityFingerprint(output);
|
|
94
94
|
const now = Date.now();
|
|
95
|
-
if (this.
|
|
95
|
+
if (this.maybeHandleAgentTurnStopped(output, activityFingerprint)) {
|
|
96
96
|
return;
|
|
97
97
|
}
|
|
98
98
|
const lines = output.split('\n');
|
|
@@ -219,19 +219,25 @@ class PaneWorker {
|
|
|
219
219
|
this.updateStatus('analyzing');
|
|
220
220
|
this.requestAnalysis(content, reason);
|
|
221
221
|
}
|
|
222
|
-
|
|
223
|
-
if (
|
|
222
|
+
resolveAgentStopEventFile() {
|
|
223
|
+
if (!this.worktreePath) {
|
|
224
224
|
return undefined;
|
|
225
225
|
}
|
|
226
|
-
|
|
226
|
+
if (this.agent === 'codex') {
|
|
227
|
+
return path.join(this.worktreePath, '.codex', 'dmux', `${this.paneId}.json`);
|
|
228
|
+
}
|
|
229
|
+
if (this.agent === 'claude') {
|
|
230
|
+
return path.join(this.worktreePath, '.claude', 'dmux', `${this.paneId}.json`);
|
|
231
|
+
}
|
|
232
|
+
return undefined;
|
|
227
233
|
}
|
|
228
|
-
|
|
229
|
-
if (!this.
|
|
234
|
+
maybeHandleAgentTurnStopped(output, fingerprint) {
|
|
235
|
+
if (!this.agentStopEventFile) {
|
|
230
236
|
return false;
|
|
231
237
|
}
|
|
232
238
|
let raw;
|
|
233
239
|
try {
|
|
234
|
-
raw = fs.readFileSync(this.
|
|
240
|
+
raw = fs.readFileSync(this.agentStopEventFile, 'utf-8');
|
|
235
241
|
}
|
|
236
242
|
catch {
|
|
237
243
|
return false;
|
|
@@ -245,10 +251,12 @@ class PaneWorker {
|
|
|
245
251
|
}
|
|
246
252
|
const timestamp = Number(event.timestamp || 0);
|
|
247
253
|
const turnId = typeof event.turnId === 'string' ? event.turnId : '';
|
|
248
|
-
|
|
254
|
+
const sessionId = typeof event.sessionId === 'string' ? event.sessionId : '';
|
|
255
|
+
const eventId = turnId || (sessionId ? `${sessionId}:${timestamp}` : '');
|
|
256
|
+
if (!timestamp || timestamp < this.lastAgentStopEventTimestamp) {
|
|
249
257
|
return false;
|
|
250
258
|
}
|
|
251
|
-
if (timestamp === this.
|
|
259
|
+
if (timestamp === this.lastAgentStopEventTimestamp && eventId === this.lastAgentStopEventId) {
|
|
252
260
|
return false;
|
|
253
261
|
}
|
|
254
262
|
if (event.dmuxPaneId !== this.paneId) {
|
|
@@ -257,24 +265,37 @@ class PaneWorker {
|
|
|
257
265
|
if (event.tmuxPaneId && event.tmuxPaneId !== this.tmuxPaneId) {
|
|
258
266
|
return false;
|
|
259
267
|
}
|
|
260
|
-
this.
|
|
261
|
-
this.
|
|
268
|
+
this.lastAgentStopEventTimestamp = timestamp;
|
|
269
|
+
this.lastAgentStopEventId = eventId;
|
|
270
|
+
const eventStatus = getAgentHookStatus(event);
|
|
271
|
+
if (!eventStatus) {
|
|
272
|
+
return false;
|
|
273
|
+
}
|
|
274
|
+
if (eventStatus === 'working' || this.isGoalContinuationEvent(event, output)) {
|
|
275
|
+
this.markAgentActive(output, fingerprint, Date.now());
|
|
276
|
+
return true;
|
|
277
|
+
}
|
|
262
278
|
this.awaitingAgentAfterUserInteraction = false;
|
|
263
|
-
this.settledStateConfirmed =
|
|
279
|
+
this.settledStateConfirmed = eventStatus === 'idle' || eventStatus === 'waiting';
|
|
264
280
|
this.lastStaticContent = output;
|
|
265
281
|
this.lastStaticFingerprint = fingerprint;
|
|
266
282
|
this.captureHistory = [{ raw: output, fingerprint }];
|
|
267
283
|
const previousStatus = this.currentStatus;
|
|
268
|
-
this.currentStatus =
|
|
284
|
+
this.currentStatus = eventStatus;
|
|
269
285
|
this.emit('status-change', {
|
|
270
|
-
status:
|
|
286
|
+
status: eventStatus,
|
|
271
287
|
previousStatus,
|
|
272
288
|
captureSnapshot: output,
|
|
273
289
|
});
|
|
290
|
+
if (eventStatus !== 'idle') {
|
|
291
|
+
return true;
|
|
292
|
+
}
|
|
274
293
|
const payload = {
|
|
275
294
|
captureSnapshot: output,
|
|
276
|
-
|
|
277
|
-
|
|
295
|
+
agent: this.agent,
|
|
296
|
+
eventFile: this.agentStopEventFile,
|
|
297
|
+
source: typeof event.source === 'string' ? event.source : 'agent-stop-hook',
|
|
298
|
+
stopHookActive: false,
|
|
278
299
|
};
|
|
279
300
|
if (turnId) {
|
|
280
301
|
payload.turnId = turnId;
|
|
@@ -282,9 +303,22 @@ class PaneWorker {
|
|
|
282
303
|
if (typeof event.lastAssistantMessage === 'string' && event.lastAssistantMessage.trim()) {
|
|
283
304
|
payload.lastAssistantMessage = event.lastAssistantMessage;
|
|
284
305
|
}
|
|
285
|
-
this.emit('
|
|
306
|
+
this.emit('agent-turn-stopped', payload);
|
|
286
307
|
return true;
|
|
287
308
|
}
|
|
309
|
+
isGoalContinuationEvent(event, output) {
|
|
310
|
+
if (event.stopHookActive === true || event.stop_hook_active === true) {
|
|
311
|
+
return true;
|
|
312
|
+
}
|
|
313
|
+
if (this.agent !== 'claude' && this.agent !== 'codex') {
|
|
314
|
+
return false;
|
|
315
|
+
}
|
|
316
|
+
const recentOutput = output.split('\n').slice(-20).join('\n');
|
|
317
|
+
return (/\/goal\s+active/i.test(recentOutput)
|
|
318
|
+
|| /\bgoal\s+active\b/i.test(recentOutput)
|
|
319
|
+
|| /\bactive\s+goal\b/i.test(recentOutput)
|
|
320
|
+
|| /\bgoal\s+is\s+active\b/i.test(recentOutput));
|
|
321
|
+
}
|
|
288
322
|
handleAnalysisComplete(payload) {
|
|
289
323
|
if (payload?.status) {
|
|
290
324
|
this.updateStatus(payload.status);
|