dmux 5.3.0 → 5.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/DmuxApp.d.ts.map +1 -1
- package/dist/DmuxApp.js +226 -51
- package/dist/DmuxApp.js.map +1 -1
- package/dist/FileBrowserApp.d.ts +4 -0
- package/dist/FileBrowserApp.d.ts.map +1 -0
- package/dist/FileBrowserApp.js +693 -0
- package/dist/FileBrowserApp.js.map +1 -0
- package/dist/actions/implementations/closeAction.d.ts.map +1 -1
- package/dist/actions/implementations/closeAction.js +47 -5
- package/dist/actions/implementations/closeAction.js.map +1 -1
- package/dist/actions/implementations/mergeAction.d.ts.map +1 -1
- package/dist/actions/implementations/mergeAction.js +51 -16
- package/dist/actions/implementations/mergeAction.js.map +1 -1
- package/dist/actions/implementations/viewAction.d.ts.map +1 -1
- package/dist/actions/implementations/viewAction.js +7 -0
- package/dist/actions/implementations/viewAction.js.map +1 -1
- package/dist/actions/index.d.ts.map +1 -1
- package/dist/actions/index.js +24 -0
- package/dist/actions/index.js.map +1 -1
- package/dist/actions/merge/multiMergeOrchestrator.js +1 -1
- package/dist/actions/merge/multiMergeOrchestrator.js.map +1 -1
- package/dist/actions/types.d.ts +19 -4
- package/dist/actions/types.d.ts.map +1 -1
- package/dist/actions/types.js +91 -0
- package/dist/actions/types.js.map +1 -1
- package/dist/components/indicators/Spinner.d.ts +2 -0
- package/dist/components/indicators/Spinner.d.ts.map +1 -1
- package/dist/components/indicators/Spinner.js +4 -4
- package/dist/components/indicators/Spinner.js.map +1 -1
- package/dist/components/panes/KebabMenu.d.ts +2 -2
- package/dist/components/panes/KebabMenu.d.ts.map +1 -1
- package/dist/components/panes/KebabMenu.js +9 -4
- package/dist/components/panes/KebabMenu.js.map +1 -1
- package/dist/components/panes/PaneCard.d.ts.map +1 -1
- package/dist/components/panes/PaneCard.js +20 -4
- package/dist/components/panes/PaneCard.js.map +1 -1
- package/dist/components/panes/PanesGrid.d.ts +1 -0
- package/dist/components/panes/PanesGrid.d.ts.map +1 -1
- package/dist/components/panes/PanesGrid.js +11 -3
- package/dist/components/panes/PanesGrid.js.map +1 -1
- package/dist/components/popups/agentChoicePopup.js +29 -24
- package/dist/components/popups/agentChoicePopup.js.map +1 -1
- package/dist/components/popups/agentChoiceSelection.d.ts +8 -0
- package/dist/components/popups/agentChoiceSelection.d.ts.map +1 -0
- package/dist/components/popups/agentChoiceSelection.js +14 -0
- package/dist/components/popups/agentChoiceSelection.js.map +1 -0
- package/dist/components/popups/kebabMenuPopup.js +9 -4
- package/dist/components/popups/kebabMenuPopup.js.map +1 -1
- package/dist/components/popups/notificationSoundsPopup.d.ts +25 -0
- package/dist/components/popups/notificationSoundsPopup.d.ts.map +1 -0
- package/dist/components/popups/notificationSoundsPopup.js +165 -0
- package/dist/components/popups/notificationSoundsPopup.js.map +1 -0
- package/dist/components/popups/settingsPopup.js +361 -26
- package/dist/components/popups/settingsPopup.js.map +1 -1
- package/dist/components/popups/shortcutsPopup.js +11 -5
- package/dist/components/popups/shortcutsPopup.js.map +1 -1
- package/dist/constants/layout.d.ts +9 -0
- package/dist/constants/layout.d.ts.map +1 -0
- package/dist/constants/layout.js +9 -0
- package/dist/constants/layout.js.map +1 -0
- package/dist/hooks/useActionSystem.d.ts +9 -5
- package/dist/hooks/useActionSystem.d.ts.map +1 -1
- package/dist/hooks/useActionSystem.js +21 -19
- package/dist/hooks/useActionSystem.js.map +1 -1
- package/dist/hooks/useInputHandling.d.ts +1 -0
- package/dist/hooks/useInputHandling.d.ts.map +1 -1
- package/dist/hooks/useInputHandling.js +499 -79
- package/dist/hooks/useInputHandling.js.map +1 -1
- package/dist/hooks/usePaneCreation.d.ts +4 -2
- package/dist/hooks/usePaneCreation.d.ts.map +1 -1
- package/dist/hooks/usePaneCreation.js +6 -0
- package/dist/hooks/usePaneCreation.js.map +1 -1
- package/dist/hooks/usePaneLoading.d.ts +1 -0
- package/dist/hooks/usePaneLoading.d.ts.map +1 -1
- package/dist/hooks/usePaneLoading.js +10 -7
- package/dist/hooks/usePaneLoading.js.map +1 -1
- package/dist/hooks/usePaneSync.js +2 -2
- package/dist/hooks/usePaneSync.js.map +1 -1
- package/dist/hooks/usePanes.d.ts.map +1 -1
- package/dist/hooks/usePanes.js +18 -4
- package/dist/hooks/usePanes.js.map +1 -1
- package/dist/hooks/useProjectActivity.d.ts +7 -0
- package/dist/hooks/useProjectActivity.d.ts.map +1 -0
- package/dist/hooks/useProjectActivity.js +79 -0
- package/dist/hooks/useProjectActivity.js.map +1 -0
- package/dist/hooks/useServices.d.ts +3 -0
- package/dist/hooks/useServices.d.ts.map +1 -1
- package/dist/hooks/useServices.js +4 -0
- package/dist/hooks/useServices.js.map +1 -1
- package/dist/index.js +59 -15
- package/dist/index.js.map +1 -1
- package/dist/layout/LayoutCalculator.d.ts.map +1 -1
- package/dist/layout/LayoutCalculator.js +4 -1
- package/dist/layout/LayoutCalculator.js.map +1 -1
- package/dist/services/DmuxAttentionService.d.ts +33 -0
- package/dist/services/DmuxAttentionService.d.ts.map +1 -0
- package/dist/services/DmuxAttentionService.js +172 -0
- package/dist/services/DmuxAttentionService.js.map +1 -0
- package/dist/services/DmuxFocusService.d.ts +58 -0
- package/dist/services/DmuxFocusService.d.ts.map +1 -0
- package/dist/services/DmuxFocusService.js +671 -0
- package/dist/services/DmuxFocusService.js.map +1 -0
- package/dist/services/PaneAnalyzer.d.ts +11 -2
- package/dist/services/PaneAnalyzer.d.ts.map +1 -1
- package/dist/services/PaneAnalyzer.js +88 -22
- package/dist/services/PaneAnalyzer.js.map +1 -1
- package/dist/services/PopupManager.d.ts +31 -14
- package/dist/services/PopupManager.d.ts.map +1 -1
- package/dist/services/PopupManager.js +147 -68
- package/dist/services/PopupManager.js.map +1 -1
- package/dist/services/StatusDetector.d.ts +14 -0
- package/dist/services/StatusDetector.d.ts.map +1 -1
- package/dist/services/StatusDetector.js +60 -12
- package/dist/services/StatusDetector.js.map +1 -1
- package/dist/services/TmuxHookManager.d.ts.map +1 -1
- package/dist/services/TmuxHookManager.js +4 -2
- package/dist/services/TmuxHookManager.js.map +1 -1
- package/dist/services/TmuxService.d.ts +37 -2
- package/dist/services/TmuxService.d.ts.map +1 -1
- package/dist/services/TmuxService.js +138 -16
- package/dist/services/TmuxService.js.map +1 -1
- package/dist/types/activity.d.ts +4 -0
- package/dist/types/activity.d.ts.map +1 -0
- package/dist/types/activity.js +2 -0
- package/dist/types/activity.js.map +1 -0
- package/dist/types.d.ts +18 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/attachAgent.d.ts +4 -0
- package/dist/utils/attachAgent.d.ts.map +1 -1
- package/dist/utils/attachAgent.js +18 -7
- package/dist/utils/attachAgent.js.map +1 -1
- package/dist/utils/controlPaneRecovery.d.ts +2 -0
- package/dist/utils/controlPaneRecovery.d.ts.map +1 -0
- package/dist/utils/controlPaneRecovery.js +156 -0
- package/dist/utils/controlPaneRecovery.js.map +1 -0
- package/dist/utils/devWatchExit.d.ts +2 -0
- package/dist/utils/devWatchExit.d.ts.map +1 -0
- package/dist/utils/devWatchExit.js +10 -0
- package/dist/utils/devWatchExit.js.map +1 -0
- package/dist/utils/dmuxCommand.d.ts +3 -0
- package/dist/utils/dmuxCommand.d.ts.map +1 -0
- package/dist/utils/dmuxCommand.js +18 -0
- package/dist/utils/dmuxCommand.js.map +1 -0
- package/dist/utils/fileBrowser.d.ts +61 -0
- package/dist/utils/fileBrowser.d.ts.map +1 -0
- package/dist/utils/fileBrowser.js +567 -0
- package/dist/utils/fileBrowser.js.map +1 -0
- package/dist/utils/focusDetection.d.ts +38 -0
- package/dist/utils/focusDetection.d.ts.map +1 -0
- package/dist/utils/focusDetection.js +57 -0
- package/dist/utils/focusDetection.js.map +1 -0
- package/dist/utils/generated-agents-doc.d.ts +1 -1
- package/dist/utils/generated-agents-doc.js +1 -1
- package/dist/utils/git.d.ts +4 -0
- package/dist/utils/git.d.ts.map +1 -1
- package/dist/utils/git.js +15 -0
- package/dist/utils/git.js.map +1 -1
- package/dist/utils/layoutManager.d.ts +5 -1
- package/dist/utils/layoutManager.d.ts.map +1 -1
- package/dist/utils/layoutManager.js +103 -26
- package/dist/utils/layoutManager.js.map +1 -1
- package/dist/utils/mergeTargets.d.ts +17 -0
- package/dist/utils/mergeTargets.d.ts.map +1 -0
- package/dist/utils/mergeTargets.js +132 -0
- package/dist/utils/mergeTargets.js.map +1 -0
- package/dist/utils/mergeValidation.d.ts.map +1 -1
- package/dist/utils/mergeValidation.js +12 -5
- package/dist/utils/mergeValidation.js.map +1 -1
- package/dist/utils/notificationSoundPreview.d.ts +10 -0
- package/dist/utils/notificationSoundPreview.d.ts.map +1 -0
- package/dist/utils/notificationSoundPreview.js +54 -0
- package/dist/utils/notificationSoundPreview.js.map +1 -0
- package/dist/utils/notificationSounds.d.ts +17 -0
- package/dist/utils/notificationSounds.d.ts.map +1 -0
- package/dist/utils/notificationSounds.js +123 -0
- package/dist/utils/notificationSounds.js.map +1 -0
- package/dist/utils/paneAttentionHeuristics.d.ts +4 -0
- package/dist/utils/paneAttentionHeuristics.d.ts.map +1 -0
- package/dist/utils/paneAttentionHeuristics.js +135 -0
- package/dist/utils/paneAttentionHeuristics.js.map +1 -0
- package/dist/utils/paneCreation.d.ts +3 -1
- package/dist/utils/paneCreation.d.ts.map +1 -1
- package/dist/utils/paneCreation.js +23 -5
- package/dist/utils/paneCreation.js.map +1 -1
- package/dist/utils/paneVisibility.d.ts +12 -0
- package/dist/utils/paneVisibility.d.ts.map +1 -0
- package/dist/utils/paneVisibility.js +60 -0
- package/dist/utils/paneVisibility.js.map +1 -0
- package/dist/utils/processShutdown.d.ts +4 -0
- package/dist/utils/processShutdown.d.ts.map +1 -0
- package/dist/utils/processShutdown.js +27 -0
- package/dist/utils/processShutdown.js.map +1 -0
- package/dist/utils/promptStore.d.ts.map +1 -1
- package/dist/utils/promptStore.js +6 -0
- package/dist/utils/promptStore.js.map +1 -1
- package/dist/utils/reopenWorktree.d.ts.map +1 -1
- package/dist/utils/reopenWorktree.js +8 -0
- package/dist/utils/reopenWorktree.js.map +1 -1
- package/dist/utils/runtimePaths.d.ts +1 -0
- package/dist/utils/runtimePaths.d.ts.map +1 -1
- package/dist/utils/runtimePaths.js +3 -0
- package/dist/utils/runtimePaths.js.map +1 -1
- package/dist/utils/settingsManager.d.ts +3 -0
- package/dist/utils/settingsManager.d.ts.map +1 -1
- package/dist/utils/settingsManager.js +203 -11
- package/dist/utils/settingsManager.js.map +1 -1
- package/dist/utils/tmux.d.ts +5 -1
- package/dist/utils/tmux.d.ts.map +1 -1
- package/dist/utils/tmux.js +23 -5
- package/dist/utils/tmux.js.map +1 -1
- package/dist/utils/tmuxConfigOnboarding.js +1 -1
- package/dist/utils/tmuxConfigOnboarding.js.map +1 -1
- package/dist/utils/tmuxHookCommands.d.ts +14 -0
- package/dist/utils/tmuxHookCommands.d.ts.map +1 -0
- package/dist/utils/tmuxHookCommands.js +30 -0
- package/dist/utils/tmuxHookCommands.js.map +1 -0
- package/dist/utils/tmuxRuntimeCompatibility.d.ts +11 -0
- package/dist/utils/tmuxRuntimeCompatibility.d.ts.map +1 -0
- package/dist/utils/tmuxRuntimeCompatibility.js +71 -0
- package/dist/utils/tmuxRuntimeCompatibility.js.map +1 -0
- package/dist/utils/worktreeMetadata.d.ts +9 -0
- package/dist/utils/worktreeMetadata.d.ts.map +1 -0
- package/dist/utils/worktreeMetadata.js +60 -0
- package/dist/utils/worktreeMetadata.js.map +1 -0
- package/dist/workers/PaneWorker.js +64 -128
- package/dist/workers/PaneWorker.js.map +1 -1
- package/dist/workers/WorkerMessages.d.ts +4 -1
- package/dist/workers/WorkerMessages.d.ts.map +1 -1
- package/dist/workers/WorkerMessages.js.map +1 -1
- package/native/macos/dmux-helper-Info.plist +30 -0
- package/native/macos/dmux-helper-icon.png +0 -0
- package/native/macos/dmux-helper.swift +831 -0
- package/native/macos/sounds/dmux-braam.caf +0 -0
- package/native/macos/sounds/dmux-brass.caf +0 -0
- package/native/macos/sounds/dmux-ding-bell.caf +0 -0
- package/native/macos/sounds/dmux-future.caf +0 -0
- package/native/macos/sounds/dmux-harp.caf +0 -0
- package/native/macos/sounds/dmux-quiet-bells.caf +0 -0
- package/native/macos/sounds/dmux-sonar.caf +0 -0
- package/native/macos/sounds/dmux-success.caf +0 -0
- package/native/macos/sounds/dmux-triumphant-trumpet.caf +0 -0
- package/native/macos/sounds/dmux-war-horn.caf +0 -0
- package/package.json +3 -1
|
@@ -0,0 +1,132 @@
|
|
|
1
|
+
import fs from 'fs';
|
|
2
|
+
import { branchExists, getCurrentBranch, getPaneBranchName } from './git.js';
|
|
3
|
+
import { hasCommitsToMerge } from './mergeValidation.js';
|
|
4
|
+
import { deriveProjectRootFromWorktreePath } from './paneProject.js';
|
|
5
|
+
function cloneMergeTarget(target) {
|
|
6
|
+
return {
|
|
7
|
+
branchName: target.branchName,
|
|
8
|
+
slug: target.slug,
|
|
9
|
+
worktreePath: target.worktreePath,
|
|
10
|
+
};
|
|
11
|
+
}
|
|
12
|
+
export function formatMergeTargetLabel(target) {
|
|
13
|
+
if (target.slug && target.slug !== target.branchName) {
|
|
14
|
+
return `"${target.slug}" (${target.branchName})`;
|
|
15
|
+
}
|
|
16
|
+
return `"${target.slug || target.branchName}"`;
|
|
17
|
+
}
|
|
18
|
+
export function createMergeTargetChain(parentPane, projectRoot) {
|
|
19
|
+
if (!parentPane.worktreePath) {
|
|
20
|
+
return [];
|
|
21
|
+
}
|
|
22
|
+
const parentTarget = {
|
|
23
|
+
slug: parentPane.slug,
|
|
24
|
+
branchName: getPaneBranchName(parentPane),
|
|
25
|
+
worktreePath: parentPane.worktreePath,
|
|
26
|
+
};
|
|
27
|
+
if (Array.isArray(parentPane.mergeTargetChain) && parentPane.mergeTargetChain.length > 0) {
|
|
28
|
+
return [parentTarget, ...parentPane.mergeTargetChain.map(cloneMergeTarget)];
|
|
29
|
+
}
|
|
30
|
+
const mergeBaseRepoPath = deriveProjectRootFromWorktreePath(parentPane.worktreePath) || projectRoot;
|
|
31
|
+
const mergeBaseBranch = getCurrentBranch(mergeBaseRepoPath);
|
|
32
|
+
return [
|
|
33
|
+
parentTarget,
|
|
34
|
+
{
|
|
35
|
+
slug: mergeBaseBranch,
|
|
36
|
+
branchName: mergeBaseBranch,
|
|
37
|
+
worktreePath: mergeBaseRepoPath,
|
|
38
|
+
},
|
|
39
|
+
];
|
|
40
|
+
}
|
|
41
|
+
function getDefaultMergeTarget(pane) {
|
|
42
|
+
const projectRoot = deriveProjectRootFromWorktreePath(pane.worktreePath) || pane.projectRoot;
|
|
43
|
+
if (!projectRoot) {
|
|
44
|
+
return null;
|
|
45
|
+
}
|
|
46
|
+
const targetBranch = getCurrentBranch(projectRoot);
|
|
47
|
+
const target = {
|
|
48
|
+
slug: targetBranch,
|
|
49
|
+
branchName: targetBranch,
|
|
50
|
+
worktreePath: projectRoot,
|
|
51
|
+
};
|
|
52
|
+
return {
|
|
53
|
+
target,
|
|
54
|
+
targetRepoPath: projectRoot,
|
|
55
|
+
targetBranch,
|
|
56
|
+
targetLabel: formatMergeTargetLabel(target),
|
|
57
|
+
requiresConfirmation: false,
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
function getTargetUsability(target) {
|
|
61
|
+
if (!target.worktreePath || !fs.existsSync(target.worktreePath)) {
|
|
62
|
+
return { ok: false, reason: 'missing' };
|
|
63
|
+
}
|
|
64
|
+
const currentBranch = getCurrentBranch(target.worktreePath);
|
|
65
|
+
if (currentBranch !== target.branchName) {
|
|
66
|
+
return { ok: false, reason: 'branch_changed' };
|
|
67
|
+
}
|
|
68
|
+
return { ok: true };
|
|
69
|
+
}
|
|
70
|
+
function isTargetMergedIntoNextTarget(target, nextTarget) {
|
|
71
|
+
if (!nextTarget?.branchName || !target.worktreePath) {
|
|
72
|
+
return false;
|
|
73
|
+
}
|
|
74
|
+
if (!branchExists(target.worktreePath, target.branchName)) {
|
|
75
|
+
return false;
|
|
76
|
+
}
|
|
77
|
+
if (!branchExists(target.worktreePath, nextTarget.branchName)) {
|
|
78
|
+
return false;
|
|
79
|
+
}
|
|
80
|
+
return !hasCommitsToMerge(target.worktreePath, target.branchName, nextTarget.branchName);
|
|
81
|
+
}
|
|
82
|
+
export function resolveMergeTarget(pane) {
|
|
83
|
+
const mergeTargetChain = Array.isArray(pane.mergeTargetChain)
|
|
84
|
+
? pane.mergeTargetChain.filter((target) => !!target?.branchName)
|
|
85
|
+
: [];
|
|
86
|
+
if (mergeTargetChain.length === 0) {
|
|
87
|
+
return getDefaultMergeTarget(pane);
|
|
88
|
+
}
|
|
89
|
+
let fallbackFrom;
|
|
90
|
+
let fallbackReason;
|
|
91
|
+
for (let index = 0; index < mergeTargetChain.length; index += 1) {
|
|
92
|
+
const target = mergeTargetChain[index];
|
|
93
|
+
const nextTarget = mergeTargetChain[index + 1];
|
|
94
|
+
const usability = getTargetUsability(target);
|
|
95
|
+
if (!usability.ok) {
|
|
96
|
+
fallbackFrom ||= cloneMergeTarget(target);
|
|
97
|
+
fallbackReason ||= usability.reason;
|
|
98
|
+
continue;
|
|
99
|
+
}
|
|
100
|
+
if (nextTarget && isTargetMergedIntoNextTarget(target, nextTarget)) {
|
|
101
|
+
fallbackFrom ||= cloneMergeTarget(target);
|
|
102
|
+
fallbackReason ||= 'merged';
|
|
103
|
+
continue;
|
|
104
|
+
}
|
|
105
|
+
return {
|
|
106
|
+
target: cloneMergeTarget(target),
|
|
107
|
+
targetRepoPath: target.worktreePath,
|
|
108
|
+
targetBranch: target.branchName,
|
|
109
|
+
targetLabel: formatMergeTargetLabel(target),
|
|
110
|
+
requiresConfirmation: Boolean(fallbackFrom),
|
|
111
|
+
fallbackFrom,
|
|
112
|
+
fallbackReason,
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
return null;
|
|
116
|
+
}
|
|
117
|
+
export function buildFallbackMergeMessage(pane, resolution) {
|
|
118
|
+
const parentLabel = resolution.fallbackFrom
|
|
119
|
+
? formatMergeTargetLabel(resolution.fallbackFrom)
|
|
120
|
+
: 'the original parent worktree';
|
|
121
|
+
if (resolution.fallbackReason === 'merged') {
|
|
122
|
+
return `${parentLabel} has already been merged upstream. Merge "${pane.slug}" directly into ${resolution.targetLabel} instead?`;
|
|
123
|
+
}
|
|
124
|
+
if (resolution.fallbackReason === 'branch_changed') {
|
|
125
|
+
return `${parentLabel} is no longer checked out on its expected branch. Merge "${pane.slug}" directly into ${resolution.targetLabel} instead?`;
|
|
126
|
+
}
|
|
127
|
+
return `${parentLabel} is no longer available. Merge "${pane.slug}" directly into ${resolution.targetLabel} instead?`;
|
|
128
|
+
}
|
|
129
|
+
export function buildMissingMergeTargetMessage(pane) {
|
|
130
|
+
return `Unable to find a valid merge target for "${pane.slug}". Reopen its parent worktree or check out the expected target branch before merging.`;
|
|
131
|
+
}
|
|
132
|
+
//# sourceMappingURL=mergeTargets.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mergeTargets.js","sourceRoot":"","sources":["../../src/utils/mergeTargets.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeValidation.d.ts","sourceRoot":"","sources":["../../src/utils/mergeValidation.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,YAAY,GAAG,sBAAsB,GAAG,gBAAgB,GAAG,kBAAkB,CAAC;IACpF,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,OAAO,CAAC;IACpB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAuCxD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEzD;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"mergeValidation.d.ts","sourceRoot":"","sources":["../../src/utils/mergeValidation.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,YAAY,GAAG,sBAAsB,GAAG,gBAAgB,GAAG,kBAAkB,CAAC;IACpF,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,OAAO,CAAC;IACpB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAuCxD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEzD;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAqBjG;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,GACnB;IAAE,YAAY,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,MAAM,EAAE,CAAA;CAAE,CA0EpD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,GACrB,qBAAqB,CAuEvB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CA+BtF;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CA6CtC;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAanF"}
|
|
@@ -58,14 +58,19 @@ export function getCurrentBranch(repoPath) {
|
|
|
58
58
|
*/
|
|
59
59
|
export function hasCommitsToMerge(repoPath, fromBranch, toBranch) {
|
|
60
60
|
try {
|
|
61
|
-
const
|
|
61
|
+
const fromRef = fromBranch.trim() || 'HEAD';
|
|
62
|
+
const toRef = toBranch.trim() || 'HEAD';
|
|
63
|
+
const output = execSync(`git rev-list --count "${toRef}..${fromRef}"`, {
|
|
62
64
|
cwd: repoPath,
|
|
63
65
|
encoding: 'utf-8',
|
|
64
66
|
stdio: 'pipe',
|
|
65
67
|
});
|
|
66
|
-
|
|
68
|
+
const commitCount = Number.parseInt(output.trim(), 10);
|
|
69
|
+
return Number.isFinite(commitCount) && commitCount > 0;
|
|
67
70
|
}
|
|
68
|
-
catch {
|
|
71
|
+
catch (error) {
|
|
72
|
+
const errorMsg = error instanceof Error ? error.message : String(error);
|
|
73
|
+
LogService.getInstance().warn(`Failed commit check for ${toBranch}..${fromBranch} in ${repoPath}: ${errorMsg}`, 'mergeValidation');
|
|
69
74
|
return false;
|
|
70
75
|
}
|
|
71
76
|
}
|
|
@@ -161,10 +166,12 @@ export function validateMerge(mainRepoPath, worktreePath, worktreeBranch) {
|
|
|
161
166
|
canAutoResolve: true, // Can offer to commit with AI message
|
|
162
167
|
});
|
|
163
168
|
}
|
|
164
|
-
// Check if there's anything to merge
|
|
169
|
+
// Check if there's anything to merge from the worktree perspective.
|
|
170
|
+
// Main-repo uncommitted changes are handled by main_dirty and should not
|
|
171
|
+
// also be classified as "nothing to merge" (which causes incorrect skips).
|
|
165
172
|
const hasCommits = hasCommitsToMerge(mainRepoPath, worktreeBranch, mainBranch);
|
|
166
173
|
LogService.getInstance().info(`Merge check: hasCommits=${hasCommits}, worktreeHasChanges=${worktreeStatus.hasChanges}`, 'mergeValidation');
|
|
167
|
-
if (!hasCommits && !worktreeStatus.hasChanges) {
|
|
174
|
+
if (!hasCommits && !worktreeStatus.hasChanges && !mainStatus.hasChanges) {
|
|
168
175
|
LogService.getInstance().info('Adding nothing_to_merge issue', 'mergeValidation');
|
|
169
176
|
issues.push({
|
|
170
177
|
type: 'nothing_to_merge',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeValidation.js","sourceRoot":"","sources":["../../src/utils/mergeValidation.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,gBAAgB,IAAI,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAsBpE;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,QAAgB;IAC3C,IAAI,CAAC;QACH,UAAU,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,2BAA2B,QAAQ,EAAE,EAAE,iBAAiB,CAAC,CAAC;QACxF,MAAM,YAAY,GAAG,QAAQ,CAAC,wBAAwB,EAAE;YACtD,GAAG,EAAE,QAAQ;YACb,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,YAAY;aACvB,IAAI,EAAE;aACN,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;aAC3B,GAAG,CAAC,IAAI,CAAC,EAAE;YACV,wCAAwC;YACxC,8DAA8D;YAC9D,6DAA6D;YAC7D,2FAA2F;YAC3F,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YACjC,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACxC,MAAM,QAAQ,GAAG,UAAU,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YAClF,UAAU,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,gBAAgB,IAAI,QAAQ,QAAQ,GAAG,EAAE,iBAAiB,CAAC,CAAC;YAC1F,OAAO,QAAQ,CAAC;QAClB,CAAC,CAAC,CAAC;QAEL,UAAU,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,mBAAmB,QAAQ,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,iBAAiB,CAAC,CAAC;QAE1G,OAAO;YACL,UAAU,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC;YAC5B,KAAK;YACL,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE;SAC7B,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,UAAU,EAAE,KAAK;YACjB,KAAK,EAAE,EAAE;YACT,OAAO,EAAE,EAAE;SACZ,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,QAAgB;IAC/C,OAAO,oBAAoB,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,QAAgB,EAAE,UAAkB,EAAE,QAAgB;IACtF,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"mergeValidation.js","sourceRoot":"","sources":["../../src/utils/mergeValidation.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,gBAAgB,IAAI,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAsBpE;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,QAAgB;IAC3C,IAAI,CAAC;QACH,UAAU,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,2BAA2B,QAAQ,EAAE,EAAE,iBAAiB,CAAC,CAAC;QACxF,MAAM,YAAY,GAAG,QAAQ,CAAC,wBAAwB,EAAE;YACtD,GAAG,EAAE,QAAQ;YACb,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,YAAY;aACvB,IAAI,EAAE;aACN,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;aAC3B,GAAG,CAAC,IAAI,CAAC,EAAE;YACV,wCAAwC;YACxC,8DAA8D;YAC9D,6DAA6D;YAC7D,2FAA2F;YAC3F,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YACjC,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACxC,MAAM,QAAQ,GAAG,UAAU,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YAClF,UAAU,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,gBAAgB,IAAI,QAAQ,QAAQ,GAAG,EAAE,iBAAiB,CAAC,CAAC;YAC1F,OAAO,QAAQ,CAAC;QAClB,CAAC,CAAC,CAAC;QAEL,UAAU,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,mBAAmB,QAAQ,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,iBAAiB,CAAC,CAAC;QAE1G,OAAO;YACL,UAAU,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC;YAC5B,KAAK;YACL,OAAO,EAAE,YAAY,CAAC,IAAI,EAAE;SAC7B,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,UAAU,EAAE,KAAK;YACjB,KAAK,EAAE,EAAE;YACT,OAAO,EAAE,EAAE;SACZ,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,QAAgB;IAC/C,OAAO,oBAAoB,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,QAAgB,EAAE,UAAkB,EAAE,QAAgB;IACtF,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,EAAE,IAAI,MAAM,CAAC;QAC5C,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,EAAE,IAAI,MAAM,CAAC;QAExC,MAAM,MAAM,GAAG,QAAQ,CAAC,yBAAyB,KAAK,KAAK,OAAO,GAAG,EAAE;YACrE,GAAG,EAAE,QAAQ;YACb,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QACvD,OAAO,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,WAAW,GAAG,CAAC,CAAC;IACzD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,QAAQ,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACxE,UAAU,CAAC,WAAW,EAAE,CAAC,IAAI,CAC3B,2BAA2B,QAAQ,KAAK,UAAU,OAAO,QAAQ,KAAK,QAAQ,EAAE,EAChF,iBAAiB,CAClB,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAClC,QAAgB,EAChB,YAAoB,EACpB,YAAoB;IAEpB,IAAI,CAAC;QACH,0EAA0E;QAC1E,MAAM,MAAM,GAAG,QAAQ,CACrB,mCAAmC,YAAY,IAAI,YAAY,KAAK,YAAY,IAAI,YAAY,EAAE,EAClG;YACE,GAAG,EAAE,QAAQ;YACb,QAAQ,EAAE,OAAO;YACjB,KAAK,EAAE,MAAM;SACd,CACF,CAAC;QAEF,uCAAuC;QACvC,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAE9E,kEAAkE;QAClE,MAAM,aAAa,GAAa,EAAE,CAAC;QACnC,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACtC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;oBACpC,uCAAuC;oBACvC,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;wBAC7C,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;4BACtC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;4BACzC,IAAI,KAAK,EAAE,CAAC;gCACV,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;4BAC/B,CAAC;4BACD,MAAM;wBACR,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC;IACzC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,kDAAkD;QAClD,IAAI,CAAC;YACH,sDAAsD;YACtD,MAAM,QAAQ,GAAG,QAAQ,CACvB,qCAAqC,YAAY,MAAM,YAAY,EAAE,EACrE;gBACE,GAAG,EAAE,QAAQ;gBACb,QAAQ,EAAE,OAAO;gBACjB,KAAK,EAAE,MAAM;aACd,CACF,CAAC;YAEF,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAEhE,qEAAqE;YACrE,yEAAyE;YACzE,IAAI,MAAM,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;gBAC5B,0CAA0C;gBAC1C,MAAM,YAAY,GAAG,QAAQ,CAC3B,wBAAwB,YAAY,MAAM,YAAY,EAAE,EACxD;oBACE,GAAG,EAAE,QAAQ;oBACb,QAAQ,EAAE,OAAO;oBACjB,KAAK,EAAE,MAAM;iBACd,CACF,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAErC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC;YAC7D,CAAC;YAED,mCAAmC;YACnC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC;QACpD,CAAC;QAAC,MAAM,CAAC;YACP,iEAAiE;YACjE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC;QACpD,CAAC;IACH,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAC3B,YAAoB,EACpB,YAAoB,EACpB,cAAsB;IAEtB,MAAM,MAAM,GAAiB,EAAE,CAAC;IAEhC,0BAA0B;IAC1B,MAAM,UAAU,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAElD,gCAAgC;IAChC,MAAM,UAAU,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;IAC9C,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;QAC1B,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,gBAAgB,UAAU,2BAA2B;YAC9D,KAAK,EAAE,UAAU,CAAC,KAAK;YACvB,cAAc,EAAE,IAAI,EAAE,+BAA+B;SACtD,CAAC,CAAC;IACL,CAAC;IAED,4CAA4C;IAC5C,MAAM,cAAc,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;IAClD,UAAU,CAAC,WAAW,EAAE,CAAC,IAAI,CAC3B,+BAA+B,cAAc,CAAC,UAAU,WAAW,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,EACzG,iBAAiB,CAClB,CAAC;IACF,IAAI,cAAc,CAAC,UAAU,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,sBAAsB;YAC5B,OAAO,EAAE,kCAAkC;YAC3C,KAAK,EAAE,cAAc,CAAC,KAAK;YAC3B,cAAc,EAAE,IAAI,EAAE,sCAAsC;SAC7D,CAAC,CAAC;IACL,CAAC;IAED,oEAAoE;IACpE,yEAAyE;IACzE,2EAA2E;IAC3E,MAAM,UAAU,GAAG,iBAAiB,CAAC,YAAY,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;IAC/E,UAAU,CAAC,WAAW,EAAE,CAAC,IAAI,CAC3B,2BAA2B,UAAU,wBAAwB,cAAc,CAAC,UAAU,EAAE,EACxF,iBAAiB,CAClB,CAAC;IACF,IAAI,CAAC,UAAU,IAAI,CAAC,cAAc,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QACxE,UAAU,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,+BAA+B,EAAE,iBAAiB,CAAC,CAAC;QAClF,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,yBAAyB;YAClC,cAAc,EAAE,KAAK;SACtB,CAAC,CAAC;IACL,CAAC;IAED,mCAAmC;IACnC,MAAM,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,oBAAoB,CAC1D,YAAY,EACZ,cAAc,EACd,UAAU,CACX,CAAC;IAEF,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,0BAA0B;YACnC,KAAK,EAAE,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,iCAAiC,CAAC;YACrF,cAAc,EAAE,IAAI,EAAE,8BAA8B;SACrD,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,QAAQ,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC;QAC7B,MAAM;QACN,UAAU;QACV,cAAc;KACf,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,QAAgB;IAC9C,IAAI,CAAC;QACH,UAAU,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,2BAA2B,QAAQ,EAAE,EAAE,iBAAiB,CAAC,CAAC;QAExF,QAAQ,CAAC,YAAY,EAAE;YACrB,GAAG,EAAE,QAAQ;YACb,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;QAEH,wCAAwC;QACxC,IAAI,CAAC;YACH,QAAQ,CAAC,2BAA2B,EAAE;gBACpC,GAAG,EAAE,QAAQ;gBACb,KAAK,EAAE,MAAM;aACd,CAAC,CAAC;YACH,sCAAsC;YACtC,UAAU,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,8BAA8B,QAAQ,EAAE,EAAE,iBAAiB,CAAC,CAAC;QAC7F,CAAC;QAAC,MAAM,CAAC;YACP,kCAAkC;YAClC,UAAU,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,mCAAmC,QAAQ,EAAE,EAAE,iBAAiB,CAAC,CAAC;QAClG,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,QAAQ,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACxE,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,8BAA8B,QAAQ,KAAK,QAAQ,EAAE,EAAE,iBAAiB,CAAC,CAAC;QACzG,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,QAAQ;SAChB,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAC3B,QAAgB,EAChB,OAAe;IAEf,IAAI,CAAC;QACH,UAAU,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,0BAA0B,QAAQ,EAAE,EAAE,eAAe,CAAC,CAAC;QACrF,UAAU,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,mBAAmB,OAAO,EAAE,EAAE,eAAe,CAAC,CAAC;QAE7E,sDAAsD;QACtD,MAAM,WAAW,GAAG,QAAQ,CAAC,2BAA2B,EAAE;YACxD,GAAG,EAAE,QAAQ;YACb,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,WAAW,EAAE,CAAC;QACrB,qFAAqF;QACrF,mDAAmD;IACrD,CAAC;IAED,IAAI,CAAC;QACH,QAAQ,CAAC,kBAAkB,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,EAAE;YAC1D,GAAG,EAAE,QAAQ;YACb,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;QAEH,UAAU,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,yBAAyB,QAAQ,EAAE,EAAE,eAAe,CAAC,CAAC;QACpF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,sCAAsC;QACtC,IAAI,YAAY,GAAG,eAAe,CAAC;QACnC,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC;YAC7B,kDAAkD;YAClD,MAAM,SAAS,GAAG,KAA6C,CAAC;YAChE,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;gBACrB,MAAM,MAAM,GAAG,OAAO,SAAS,CAAC,MAAM,KAAK,QAAQ;oBACjD,CAAC,CAAC,SAAS,CAAC,MAAM;oBAClB,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAChC,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;oBAClB,YAAY,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC/B,CAAC;YACH,CAAC;QACH,CAAC;QACD,UAAU,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,oBAAoB,QAAQ,KAAK,YAAY,EAAE,EAAE,eAAe,CAAC,CAAC;QACjG,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,YAAY;SACpB,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,QAAgB;IAC3C,IAAI,CAAC;QACH,QAAQ,CAAC,sDAAsD,EAAE;YAC/D,GAAG,EAAE,QAAQ;YACb,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;QACH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;SAC9D,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { type DmuxHelperPreviewSoundMessage } from './focusDetection.js';
|
|
2
|
+
import type { NotificationSoundId } from './notificationSounds.js';
|
|
3
|
+
export interface NotificationSoundPreviewPlayer {
|
|
4
|
+
play(soundId: NotificationSoundId): void;
|
|
5
|
+
stop(): void;
|
|
6
|
+
}
|
|
7
|
+
export declare function buildNotificationSoundPreviewMessage(soundId: NotificationSoundId, platform?: NodeJS.Platform): DmuxHelperPreviewSoundMessage | null;
|
|
8
|
+
export declare function getDmuxHelperSocketPath(homeDirectory?: string): string;
|
|
9
|
+
export declare function createNotificationSoundPreviewPlayer(platform?: NodeJS.Platform, socketPath?: string): NotificationSoundPreviewPlayer;
|
|
10
|
+
//# sourceMappingURL=notificationSoundPreview.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"notificationSoundPreview.d.ts","sourceRoot":"","sources":["../../src/utils/notificationSoundPreview.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,KAAK,6BAA6B,EACnC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAGnE,MAAM,WAAW,8BAA8B;IAC7C,IAAI,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACzC,IAAI,IAAI,IAAI,CAAC;CACd;AAED,wBAAgB,oCAAoC,CAClD,OAAO,EAAE,mBAAmB,EAC5B,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAC3C,6BAA6B,GAAG,IAAI,CAUtC;AAED,wBAAgB,uBAAuB,CAAC,aAAa,GAAE,MAAqB,GAAG,MAAM,CAEpF;AAED,wBAAgB,oCAAoC,CAClD,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,UAAU,GAAE,MAAkC,GAC7C,8BAA8B,CAyChC"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import { createConnection } from 'node:net';
|
|
2
|
+
import os from 'os';
|
|
3
|
+
import path from 'path';
|
|
4
|
+
import { supportsNativeDmuxHelper, } from './focusDetection.js';
|
|
5
|
+
import { getNotificationSoundDefinition } from './notificationSounds.js';
|
|
6
|
+
export function buildNotificationSoundPreviewMessage(soundId, platform = process.platform) {
|
|
7
|
+
if (!supportsNativeDmuxHelper(platform)) {
|
|
8
|
+
return null;
|
|
9
|
+
}
|
|
10
|
+
const definition = getNotificationSoundDefinition(soundId);
|
|
11
|
+
return {
|
|
12
|
+
type: 'preview-sound',
|
|
13
|
+
soundName: definition.resourceFileName,
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
export function getDmuxHelperSocketPath(homeDirectory = os.homedir()) {
|
|
17
|
+
return path.join(homeDirectory, '.dmux', 'native-helper', 'run', 'dmux-helper.sock');
|
|
18
|
+
}
|
|
19
|
+
export function createNotificationSoundPreviewPlayer(platform = process.platform, socketPath = getDmuxHelperSocketPath()) {
|
|
20
|
+
let activeSocket = null;
|
|
21
|
+
const clearActiveSocket = (socketToClear) => {
|
|
22
|
+
if (activeSocket === socketToClear) {
|
|
23
|
+
activeSocket = null;
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
return {
|
|
27
|
+
play(soundId) {
|
|
28
|
+
this.stop();
|
|
29
|
+
const message = buildNotificationSoundPreviewMessage(soundId, platform);
|
|
30
|
+
if (!message) {
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
const socket = createConnection(socketPath);
|
|
34
|
+
activeSocket = socket;
|
|
35
|
+
socket.once('connect', () => {
|
|
36
|
+
socket.end(`${JSON.stringify(message)}\n`);
|
|
37
|
+
});
|
|
38
|
+
socket.once('error', () => {
|
|
39
|
+
clearActiveSocket(socket);
|
|
40
|
+
});
|
|
41
|
+
socket.once('close', () => {
|
|
42
|
+
clearActiveSocket(socket);
|
|
43
|
+
});
|
|
44
|
+
},
|
|
45
|
+
stop() {
|
|
46
|
+
if (!activeSocket) {
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
activeSocket.destroy();
|
|
50
|
+
activeSocket = null;
|
|
51
|
+
},
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
//# sourceMappingURL=notificationSoundPreview.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"notificationSoundPreview.js","sourceRoot":"","sources":["../../src/utils/notificationSoundPreview.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,UAAU,CAAC;AACzD,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EACL,wBAAwB,GAEzB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,8BAA8B,EAAE,MAAM,yBAAyB,CAAC;AAOzE,MAAM,UAAU,oCAAoC,CAClD,OAA4B,EAC5B,WAA4B,OAAO,CAAC,QAAQ;IAE5C,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,UAAU,GAAG,8BAA8B,CAAC,OAAO,CAAC,CAAC;IAC3D,OAAO;QACL,IAAI,EAAE,eAAe;QACrB,SAAS,EAAE,UAAU,CAAC,gBAAgB;KACvC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,gBAAwB,EAAE,CAAC,OAAO,EAAE;IAC1E,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,kBAAkB,CAAC,CAAC;AACvF,CAAC;AAED,MAAM,UAAU,oCAAoC,CAClD,WAA4B,OAAO,CAAC,QAAQ,EAC5C,aAAqB,uBAAuB,EAAE;IAE9C,IAAI,YAAY,GAAkB,IAAI,CAAC;IAEvC,MAAM,iBAAiB,GAAG,CAAC,aAAqB,EAAE,EAAE;QAClD,IAAI,YAAY,KAAK,aAAa,EAAE,CAAC;YACnC,YAAY,GAAG,IAAI,CAAC;QACtB,CAAC;IACH,CAAC,CAAC;IAEF,OAAO;QACL,IAAI,CAAC,OAA4B;YAC/B,IAAI,CAAC,IAAI,EAAE,CAAC;YAEZ,MAAM,OAAO,GAAG,oCAAoC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YACxE,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO;YACT,CAAC;YAED,MAAM,MAAM,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;YAC5C,YAAY,GAAG,MAAM,CAAC;YAEtB,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE;gBAC1B,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;gBACxB,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAC5B,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;gBACxB,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAC5B,CAAC,CAAC,CAAC;QACL,CAAC;QAED,IAAI;YACF,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,OAAO;YACT,CAAC;YAED,YAAY,CAAC,OAAO,EAAE,CAAC;YACvB,YAAY,GAAG,IAAI,CAAC;QACtB,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
export declare const NOTIFICATION_SOUND_IDS: readonly ["default-system-sound", "braam", "brass", "ding-bell", "future", "harp", "quiet-bells", "sonar", "success", "triumphant-trumpet", "war-horn"];
|
|
2
|
+
export type NotificationSoundId = typeof NOTIFICATION_SOUND_IDS[number];
|
|
3
|
+
export interface NotificationSoundDefinition {
|
|
4
|
+
id: NotificationSoundId;
|
|
5
|
+
label: string;
|
|
6
|
+
resourceFileName?: string;
|
|
7
|
+
defaultEnabled: boolean;
|
|
8
|
+
}
|
|
9
|
+
export declare const NOTIFICATION_SOUND_DEFINITIONS: readonly NotificationSoundDefinition[];
|
|
10
|
+
export declare function getNotificationSoundDefinitions(): NotificationSoundDefinition[];
|
|
11
|
+
export declare function getBundledNotificationSoundDefinitions(): NotificationSoundDefinition[];
|
|
12
|
+
export declare function getDefaultNotificationSoundSelection(): NotificationSoundId[];
|
|
13
|
+
export declare function isNotificationSoundId(value: string): value is NotificationSoundId;
|
|
14
|
+
export declare function resolveNotificationSoundsSelection(enabledNotificationSounds: readonly string[] | undefined): NotificationSoundId[];
|
|
15
|
+
export declare function getNotificationSoundDefinition(id: NotificationSoundId): NotificationSoundDefinition;
|
|
16
|
+
export declare function pickNotificationSound(enabledNotificationSounds: readonly string[] | undefined, randomValue?: number): NotificationSoundDefinition;
|
|
17
|
+
//# sourceMappingURL=notificationSounds.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"notificationSounds.d.ts","sourceRoot":"","sources":["../../src/utils/notificationSounds.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,sBAAsB,yJAYzB,CAAC;AAEX,MAAM,MAAM,mBAAmB,GAAG,OAAO,sBAAsB,CAAC,MAAM,CAAC,CAAC;AAExE,MAAM,WAAW,2BAA2B;IAC1C,EAAE,EAAE,mBAAmB,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,eAAO,MAAM,8BAA8B,EAAE,SAAS,2BAA2B,EAkEvE,CAAC;AAMX,wBAAgB,+BAA+B,IAAI,2BAA2B,EAAE,CAE/E;AAED,wBAAgB,sCAAsC,IAAI,2BAA2B,EAAE,CAItF;AAED,wBAAgB,oCAAoC,IAAI,mBAAmB,EAAE,CAI5E;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,mBAAmB,CAEjF;AAED,wBAAgB,kCAAkC,CAChD,yBAAyB,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,GACvD,mBAAmB,EAAE,CAavB;AAED,wBAAgB,8BAA8B,CAC5C,EAAE,EAAE,mBAAmB,GACtB,2BAA2B,CAO7B;AAED,wBAAgB,qBAAqB,CACnC,yBAAyB,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EACxD,WAAW,GAAE,MAAsB,GAClC,2BAA2B,CAK7B"}
|
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
export const NOTIFICATION_SOUND_IDS = [
|
|
2
|
+
'default-system-sound',
|
|
3
|
+
'braam',
|
|
4
|
+
'brass',
|
|
5
|
+
'ding-bell',
|
|
6
|
+
'future',
|
|
7
|
+
'harp',
|
|
8
|
+
'quiet-bells',
|
|
9
|
+
'sonar',
|
|
10
|
+
'success',
|
|
11
|
+
'triumphant-trumpet',
|
|
12
|
+
'war-horn',
|
|
13
|
+
];
|
|
14
|
+
export const NOTIFICATION_SOUND_DEFINITIONS = [
|
|
15
|
+
{
|
|
16
|
+
id: 'default-system-sound',
|
|
17
|
+
label: 'Default System Sound',
|
|
18
|
+
defaultEnabled: true,
|
|
19
|
+
},
|
|
20
|
+
{
|
|
21
|
+
id: 'braam',
|
|
22
|
+
label: 'Braam',
|
|
23
|
+
resourceFileName: 'dmux-braam.caf',
|
|
24
|
+
defaultEnabled: false,
|
|
25
|
+
},
|
|
26
|
+
{
|
|
27
|
+
id: 'brass',
|
|
28
|
+
label: 'Brass',
|
|
29
|
+
resourceFileName: 'dmux-brass.caf',
|
|
30
|
+
defaultEnabled: false,
|
|
31
|
+
},
|
|
32
|
+
{
|
|
33
|
+
id: 'ding-bell',
|
|
34
|
+
label: 'Ding Bell',
|
|
35
|
+
resourceFileName: 'dmux-ding-bell.caf',
|
|
36
|
+
defaultEnabled: false,
|
|
37
|
+
},
|
|
38
|
+
{
|
|
39
|
+
id: 'future',
|
|
40
|
+
label: 'Future',
|
|
41
|
+
resourceFileName: 'dmux-future.caf',
|
|
42
|
+
defaultEnabled: false,
|
|
43
|
+
},
|
|
44
|
+
{
|
|
45
|
+
id: 'harp',
|
|
46
|
+
label: 'Harp',
|
|
47
|
+
resourceFileName: 'dmux-harp.caf',
|
|
48
|
+
defaultEnabled: false,
|
|
49
|
+
},
|
|
50
|
+
{
|
|
51
|
+
id: 'quiet-bells',
|
|
52
|
+
label: 'Quiet Bells',
|
|
53
|
+
resourceFileName: 'dmux-quiet-bells.caf',
|
|
54
|
+
defaultEnabled: false,
|
|
55
|
+
},
|
|
56
|
+
{
|
|
57
|
+
id: 'sonar',
|
|
58
|
+
label: 'Sonar',
|
|
59
|
+
resourceFileName: 'dmux-sonar.caf',
|
|
60
|
+
defaultEnabled: false,
|
|
61
|
+
},
|
|
62
|
+
{
|
|
63
|
+
id: 'success',
|
|
64
|
+
label: 'Success',
|
|
65
|
+
resourceFileName: 'dmux-success.caf',
|
|
66
|
+
defaultEnabled: false,
|
|
67
|
+
},
|
|
68
|
+
{
|
|
69
|
+
id: 'triumphant-trumpet',
|
|
70
|
+
label: 'Triumphant Trumpet',
|
|
71
|
+
resourceFileName: 'dmux-triumphant-trumpet.caf',
|
|
72
|
+
defaultEnabled: false,
|
|
73
|
+
},
|
|
74
|
+
{
|
|
75
|
+
id: 'war-horn',
|
|
76
|
+
label: 'War Horn',
|
|
77
|
+
resourceFileName: 'dmux-war-horn.caf',
|
|
78
|
+
defaultEnabled: false,
|
|
79
|
+
},
|
|
80
|
+
];
|
|
81
|
+
const NOTIFICATION_SOUND_ID_SET = new Set(NOTIFICATION_SOUND_DEFINITIONS.map((definition) => definition.id));
|
|
82
|
+
export function getNotificationSoundDefinitions() {
|
|
83
|
+
return NOTIFICATION_SOUND_DEFINITIONS.map((definition) => ({ ...definition }));
|
|
84
|
+
}
|
|
85
|
+
export function getBundledNotificationSoundDefinitions() {
|
|
86
|
+
return NOTIFICATION_SOUND_DEFINITIONS
|
|
87
|
+
.filter((definition) => typeof definition.resourceFileName === 'string')
|
|
88
|
+
.map((definition) => ({ ...definition }));
|
|
89
|
+
}
|
|
90
|
+
export function getDefaultNotificationSoundSelection() {
|
|
91
|
+
return NOTIFICATION_SOUND_DEFINITIONS
|
|
92
|
+
.filter((definition) => definition.defaultEnabled)
|
|
93
|
+
.map((definition) => definition.id);
|
|
94
|
+
}
|
|
95
|
+
export function isNotificationSoundId(value) {
|
|
96
|
+
return NOTIFICATION_SOUND_ID_SET.has(value);
|
|
97
|
+
}
|
|
98
|
+
export function resolveNotificationSoundsSelection(enabledNotificationSounds) {
|
|
99
|
+
if (Array.isArray(enabledNotificationSounds)) {
|
|
100
|
+
const configured = new Set(enabledNotificationSounds.filter(isNotificationSoundId));
|
|
101
|
+
const resolved = NOTIFICATION_SOUND_DEFINITIONS
|
|
102
|
+
.map((definition) => definition.id)
|
|
103
|
+
.filter((id) => configured.has(id));
|
|
104
|
+
if (resolved.length > 0) {
|
|
105
|
+
return resolved;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
return getDefaultNotificationSoundSelection();
|
|
109
|
+
}
|
|
110
|
+
export function getNotificationSoundDefinition(id) {
|
|
111
|
+
const definition = NOTIFICATION_SOUND_DEFINITIONS.find((candidate) => candidate.id === id);
|
|
112
|
+
if (!definition) {
|
|
113
|
+
throw new Error(`Unknown notification sound: ${id}`);
|
|
114
|
+
}
|
|
115
|
+
return { ...definition };
|
|
116
|
+
}
|
|
117
|
+
export function pickNotificationSound(enabledNotificationSounds, randomValue = Math.random()) {
|
|
118
|
+
const selection = resolveNotificationSoundsSelection(enabledNotificationSounds);
|
|
119
|
+
const boundedRandomValue = Math.max(0, Math.min(0.999999999, randomValue));
|
|
120
|
+
const index = Math.floor(boundedRandomValue * selection.length);
|
|
121
|
+
return getNotificationSoundDefinition(selection[index] ?? selection[0]);
|
|
122
|
+
}
|
|
123
|
+
//# sourceMappingURL=notificationSounds.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"notificationSounds.js","sourceRoot":"","sources":["../../src/utils/notificationSounds.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { AgentName } from './agentLaunch.js';
|
|
2
|
+
export declare function hasAgentWorkingIndicators(content: string, agent?: AgentName): boolean;
|
|
3
|
+
export declare function isLikelyUserTyping(previousContent: string, currentContent: string): boolean;
|
|
4
|
+
//# sourceMappingURL=paneAttentionHeuristics.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"paneAttentionHeuristics.d.ts","sourceRoot":"","sources":["../../src/utils/paneAttentionHeuristics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAkElD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,SAAS,GAAG,OAAO,CAiDrF;AAED,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAkD3F"}
|
|
@@ -0,0 +1,135 @@
|
|
|
1
|
+
const GENERIC_PROGRESS_WORDS = [
|
|
2
|
+
'working',
|
|
3
|
+
'thinking',
|
|
4
|
+
'planning',
|
|
5
|
+
'pondering',
|
|
6
|
+
'crunching',
|
|
7
|
+
'analyzing',
|
|
8
|
+
'building',
|
|
9
|
+
'testing',
|
|
10
|
+
'running',
|
|
11
|
+
'searching',
|
|
12
|
+
'reviewing',
|
|
13
|
+
'understanding',
|
|
14
|
+
'loading',
|
|
15
|
+
'processing',
|
|
16
|
+
'writing',
|
|
17
|
+
'reading',
|
|
18
|
+
'editing',
|
|
19
|
+
'patching',
|
|
20
|
+
'generating',
|
|
21
|
+
'reasoning',
|
|
22
|
+
'compiling',
|
|
23
|
+
'indexing',
|
|
24
|
+
'summarizing',
|
|
25
|
+
'executing',
|
|
26
|
+
'refactoring',
|
|
27
|
+
'fixing',
|
|
28
|
+
'checking',
|
|
29
|
+
'scanning',
|
|
30
|
+
];
|
|
31
|
+
const SPINNER_PREFIX = '[⠁-⣿◐◓◑◒◴◷◶◵●○◦•·⋯⋮✦✧✶✻✽⏳⌛]';
|
|
32
|
+
const PROMPT_PATTERNS = [
|
|
33
|
+
/^\s*>\s*\S/,
|
|
34
|
+
/^\s*\$\s*\S/,
|
|
35
|
+
/^\s*❯\s*\S/,
|
|
36
|
+
/^\s*›\s*\S/,
|
|
37
|
+
/^\s*│\s*>\s*\S/,
|
|
38
|
+
/^\s*>\s*$/,
|
|
39
|
+
/^\s*❯\s*$/,
|
|
40
|
+
/^\s*│\s*>\s*$/,
|
|
41
|
+
];
|
|
42
|
+
function recentRelevantLines(content, maxLines = 8) {
|
|
43
|
+
return content
|
|
44
|
+
.split('\n')
|
|
45
|
+
.map((line) => line.replace(/\s+/g, ' ').trim())
|
|
46
|
+
.filter(Boolean)
|
|
47
|
+
.slice(-maxLines);
|
|
48
|
+
}
|
|
49
|
+
function commonPrefixLength(left, right) {
|
|
50
|
+
const maxLength = Math.min(left.length, right.length);
|
|
51
|
+
let index = 0;
|
|
52
|
+
while (index < maxLength && left[index] === right[index]) {
|
|
53
|
+
index += 1;
|
|
54
|
+
}
|
|
55
|
+
return index;
|
|
56
|
+
}
|
|
57
|
+
function looksLikePromptLine(line) {
|
|
58
|
+
return PROMPT_PATTERNS.some((pattern) => pattern.test(line));
|
|
59
|
+
}
|
|
60
|
+
export function hasAgentWorkingIndicators(content, agent) {
|
|
61
|
+
const lines = recentRelevantLines(content, 10);
|
|
62
|
+
if (lines.length === 0) {
|
|
63
|
+
return false;
|
|
64
|
+
}
|
|
65
|
+
const recentContent = lines.join('\n');
|
|
66
|
+
if (/\besc\s+to\s+(interrupt|cancel|stop|abort)\b/i.test(recentContent)) {
|
|
67
|
+
return true;
|
|
68
|
+
}
|
|
69
|
+
const progressWordPattern = new RegExp(`(?:${GENERIC_PROGRESS_WORDS.join('|')})(?:\\b|\\.\\.\\.|…|\\s)`, 'i');
|
|
70
|
+
const spinnerLinePattern = new RegExp(`^${SPINNER_PREFIX}\\s*(?:${GENERIC_PROGRESS_WORDS.join('|')})(?:\\b|\\.\\.\\.|…|\\s)`, 'i');
|
|
71
|
+
const progressSuffixPattern = new RegExp(`\\b(?:${GENERIC_PROGRESS_WORDS.join('|')})\\b.*(?:\\.\\.\\.|…|\\d{1,3}%|/\\d+)`, 'i');
|
|
72
|
+
if (lines.some((line) => spinnerLinePattern.test(line) || progressSuffixPattern.test(line))) {
|
|
73
|
+
return true;
|
|
74
|
+
}
|
|
75
|
+
switch (agent) {
|
|
76
|
+
case 'claude':
|
|
77
|
+
return lines.some((line) => /claude\s+is\s+working/i.test(line)
|
|
78
|
+
|| /(?:germinating|thinking|planning|writing|reading|analyzing|building|testing|running|searching|reviewing|understanding)[.…]*$/i.test(line)
|
|
79
|
+
|| progressWordPattern.test(line));
|
|
80
|
+
case 'opencode':
|
|
81
|
+
case 'codex':
|
|
82
|
+
case 'gemini':
|
|
83
|
+
case 'qwen':
|
|
84
|
+
case 'cursor':
|
|
85
|
+
case 'copilot':
|
|
86
|
+
case 'cline':
|
|
87
|
+
case 'amp':
|
|
88
|
+
case 'pi':
|
|
89
|
+
case 'crush':
|
|
90
|
+
return lines.some((line) => progressWordPattern.test(line));
|
|
91
|
+
default:
|
|
92
|
+
return lines.some((line) => progressWordPattern.test(line));
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
export function isLikelyUserTyping(previousContent, currentContent) {
|
|
96
|
+
if (!currentContent || previousContent === currentContent) {
|
|
97
|
+
return false;
|
|
98
|
+
}
|
|
99
|
+
const previousLines = previousContent.split('\n');
|
|
100
|
+
const currentLines = currentContent.split('\n');
|
|
101
|
+
if (Math.abs(currentLines.length - previousLines.length) > 2) {
|
|
102
|
+
return false;
|
|
103
|
+
}
|
|
104
|
+
const maxLength = Math.max(previousLines.length, currentLines.length);
|
|
105
|
+
const changedIndices = [];
|
|
106
|
+
for (let index = 0; index < maxLength; index += 1) {
|
|
107
|
+
if ((previousLines[index] || '') !== (currentLines[index] || '')) {
|
|
108
|
+
changedIndices.push(index);
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
if (changedIndices.length === 0 || changedIndices.length > 3) {
|
|
112
|
+
return false;
|
|
113
|
+
}
|
|
114
|
+
const bottomThreshold = maxLength - 4;
|
|
115
|
+
if (changedIndices.some((index) => index < bottomThreshold)) {
|
|
116
|
+
return false;
|
|
117
|
+
}
|
|
118
|
+
return changedIndices.some((index) => {
|
|
119
|
+
const previousLine = previousLines[index] || '';
|
|
120
|
+
const currentLine = currentLines[index] || '';
|
|
121
|
+
const delta = Math.abs(currentLine.length - previousLine.length);
|
|
122
|
+
const prefixLength = commonPrefixLength(previousLine, currentLine);
|
|
123
|
+
const maxLengthForLine = Math.max(previousLine.length, currentLine.length);
|
|
124
|
+
const mostlySharedPrefix = maxLengthForLine > 0 && prefixLength / maxLengthForLine >= 0.7;
|
|
125
|
+
if (delta > 32) {
|
|
126
|
+
return false;
|
|
127
|
+
}
|
|
128
|
+
if ((currentLine.startsWith(previousLine) || previousLine.startsWith(currentLine))
|
|
129
|
+
&& looksLikePromptLine(currentLine || previousLine)) {
|
|
130
|
+
return true;
|
|
131
|
+
}
|
|
132
|
+
return mostlySharedPrefix && looksLikePromptLine(currentLine || previousLine);
|
|
133
|
+
});
|
|
134
|
+
}
|
|
135
|
+
//# sourceMappingURL=paneAttentionHeuristics.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"paneAttentionHeuristics.js","sourceRoot":"","sources":["../../src/utils/paneAttentionHeuristics.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
import type { DmuxPane } from '../types.js';
|
|
1
|
+
import type { DmuxPane, MergeTargetReference } from '../types.js';
|
|
2
2
|
import { type AgentName } from './agentLaunch.js';
|
|
3
3
|
export interface CreatePaneOptions {
|
|
4
4
|
prompt: string;
|
|
5
5
|
agent?: AgentName;
|
|
6
6
|
slugSuffix?: string;
|
|
7
7
|
slugBase?: string;
|
|
8
|
+
startPointBranch?: string;
|
|
9
|
+
mergeTargetChain?: MergeTargetReference[];
|
|
8
10
|
projectName: string;
|
|
9
11
|
existingPanes: DmuxPane[];
|
|
10
12
|
projectRoot?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paneCreation.d.ts","sourceRoot":"","sources":["../../src/utils/paneCreation.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAc,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"paneCreation.d.ts","sourceRoot":"","sources":["../../src/utils/paneCreation.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAc,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAc9E,OAAO,EAUL,KAAK,SAAS,EACf,MAAM,kBAAkB,CAAC;AAW1B,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,QAAQ,EAAE,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,QAAQ,CAAC;IACf,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAgBD;;;GAGG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,iBAAiB,EAC1B,eAAe,EAAE,SAAS,EAAE,GAC3B,OAAO,CAAC,gBAAgB,CAAC,CAkgB3B;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAsHf"}
|