dmux 5.6.2 → 5.7.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.ja.md +93 -0
- package/README.md +7 -1
- package/dist/DmuxApp.d.ts.map +1 -1
- package/dist/DmuxApp.js +279 -40
- package/dist/DmuxApp.js.map +1 -1
- package/dist/actions/implementations/closeAction.d.ts.map +1 -1
- package/dist/actions/implementations/closeAction.js +93 -75
- package/dist/actions/implementations/closeAction.js.map +1 -1
- package/dist/actions/implementations/createPullRequestAction.d.ts +4 -0
- package/dist/actions/implementations/createPullRequestAction.d.ts.map +1 -0
- package/dist/actions/implementations/createPullRequestAction.js +218 -0
- package/dist/actions/implementations/createPullRequestAction.js.map +1 -0
- package/dist/actions/implementations/duplicateAction.d.ts.map +1 -1
- package/dist/actions/implementations/duplicateAction.js +3 -1
- package/dist/actions/implementations/duplicateAction.js.map +1 -1
- package/dist/actions/implementations/index.d.ts +1 -0
- package/dist/actions/implementations/index.d.ts.map +1 -1
- package/dist/actions/implementations/index.js +1 -0
- package/dist/actions/implementations/index.js.map +1 -1
- package/dist/actions/implementations/mergeAction.d.ts.map +1 -1
- package/dist/actions/implementations/mergeAction.js +17 -9
- package/dist/actions/implementations/mergeAction.js.map +1 -1
- package/dist/actions/implementations/renameAction.d.ts +0 -9
- package/dist/actions/implementations/renameAction.d.ts.map +1 -1
- package/dist/actions/implementations/renameAction.js +77 -13
- package/dist/actions/implementations/renameAction.js.map +1 -1
- package/dist/actions/implementations/toggleAutopilotAction.d.ts.map +1 -1
- package/dist/actions/implementations/toggleAutopilotAction.js +3 -1
- package/dist/actions/implementations/toggleAutopilotAction.js.map +1 -1
- package/dist/actions/implementations/viewAction.d.ts.map +1 -1
- package/dist/actions/implementations/viewAction.js +4 -2
- package/dist/actions/implementations/viewAction.js.map +1 -1
- package/dist/actions/index.d.ts.map +1 -1
- package/dist/actions/index.js +2 -0
- package/dist/actions/index.js.map +1 -1
- package/dist/actions/merge/issueHandlers/mergeConflictHandler.d.ts.map +1 -1
- package/dist/actions/merge/issueHandlers/mergeConflictHandler.js +3 -1
- package/dist/actions/merge/issueHandlers/mergeConflictHandler.js.map +1 -1
- package/dist/actions/paneActions.d.ts +1 -1
- package/dist/actions/paneActions.d.ts.map +1 -1
- package/dist/actions/paneActions.js +1 -1
- package/dist/actions/paneActions.js.map +1 -1
- package/dist/actions/types.d.ts +11 -2
- package/dist/actions/types.d.ts.map +1 -1
- package/dist/actions/types.js +9 -0
- package/dist/actions/types.js.map +1 -1
- package/dist/components/inputs/CleanTextInput.d.ts +1 -0
- package/dist/components/inputs/CleanTextInput.d.ts.map +1 -1
- package/dist/components/inputs/CleanTextInput.js +40 -42
- package/dist/components/inputs/CleanTextInput.js.map +1 -1
- package/dist/components/panes/PaneCard.d.ts +3 -1
- package/dist/components/panes/PaneCard.d.ts.map +1 -1
- package/dist/components/panes/PaneCard.js +18 -5
- package/dist/components/panes/PaneCard.js.map +1 -1
- package/dist/components/panes/PanesGrid.d.ts +4 -1
- package/dist/components/panes/PanesGrid.d.ts.map +1 -1
- package/dist/components/panes/PanesGrid.js +27 -15
- package/dist/components/panes/PanesGrid.js.map +1 -1
- package/dist/components/popups/config.d.ts +4 -4
- package/dist/components/popups/config.js +6 -6
- package/dist/components/popups/config.js.map +1 -1
- package/dist/components/popups/inputPopup.js +3 -3
- package/dist/components/popups/inputPopup.js.map +1 -1
- package/dist/components/popups/logsPopup.js +2 -1
- package/dist/components/popups/logsPopup.js.map +1 -1
- package/dist/components/popups/prReviewPopup.d.ts +12 -0
- package/dist/components/popups/prReviewPopup.d.ts.map +1 -0
- package/dist/components/popups/prReviewPopup.js +278 -0
- package/dist/components/popups/prReviewPopup.js.map +1 -0
- package/dist/components/popups/reopenWorktreePopup.js +1 -1
- package/dist/components/popups/reopenWorktreePopup.js.map +1 -1
- package/dist/components/popups/settingsPopup.js +72 -6
- package/dist/components/popups/settingsPopup.js.map +1 -1
- package/dist/components/ui/FooterHelp.d.ts.map +1 -1
- package/dist/components/ui/FooterHelp.js +5 -4
- package/dist/components/ui/FooterHelp.js.map +1 -1
- package/dist/hooks/useActionSystem.d.ts +12 -2
- package/dist/hooks/useActionSystem.d.ts.map +1 -1
- package/dist/hooks/useActionSystem.js +19 -1
- package/dist/hooks/useActionSystem.js.map +1 -1
- package/dist/hooks/useInputHandling.d.ts +2 -1
- package/dist/hooks/useInputHandling.d.ts.map +1 -1
- package/dist/hooks/useInputHandling.js +100 -31
- package/dist/hooks/useInputHandling.js.map +1 -1
- package/dist/hooks/usePaneLoading.d.ts.map +1 -1
- package/dist/hooks/usePaneLoading.js +29 -4
- package/dist/hooks/usePaneLoading.js.map +1 -1
- package/dist/hooks/usePaneSync.d.ts +2 -2
- package/dist/hooks/usePaneSync.d.ts.map +1 -1
- package/dist/hooks/usePaneSync.js +10 -7
- package/dist/hooks/usePaneSync.js.map +1 -1
- package/dist/hooks/usePanes.d.ts.map +1 -1
- package/dist/hooks/usePanes.js +10 -2
- package/dist/hooks/usePanes.js.map +1 -1
- package/dist/hooks/useShellDetection.d.ts.map +1 -1
- package/dist/hooks/useShellDetection.js +7 -1
- package/dist/hooks/useShellDetection.js.map +1 -1
- package/dist/index.js +35 -8
- package/dist/index.js.map +1 -1
- package/dist/panes/decorative-pane.js +57 -27
- package/dist/panes/decorative-pane.js.map +1 -1
- package/dist/server/embedded-assets.js +1 -1
- package/dist/services/DmuxFocusService.d.ts.map +1 -1
- package/dist/services/DmuxFocusService.js +19 -14
- package/dist/services/DmuxFocusService.js.map +1 -1
- package/dist/services/PaneAnalyzer.d.ts.map +1 -1
- package/dist/services/PaneAnalyzer.js +2 -1
- package/dist/services/PaneAnalyzer.js.map +1 -1
- package/dist/services/PaneEventService.d.ts +11 -0
- package/dist/services/PaneEventService.d.ts.map +1 -1
- package/dist/services/PaneEventService.js +31 -3
- package/dist/services/PaneEventService.js.map +1 -1
- package/dist/services/PaneWorkerManager.d.ts.map +1 -1
- package/dist/services/PaneWorkerManager.js +1 -0
- package/dist/services/PaneWorkerManager.js.map +1 -1
- package/dist/services/PopupManager.d.ts +17 -5
- package/dist/services/PopupManager.d.ts.map +1 -1
- package/dist/services/PopupManager.js +143 -32
- package/dist/services/PopupManager.js.map +1 -1
- package/dist/services/StatusDetector.d.ts +1 -0
- package/dist/services/StatusDetector.d.ts.map +1 -1
- package/dist/services/StatusDetector.js +47 -2
- package/dist/services/StatusDetector.js.map +1 -1
- package/dist/services/TmuxHookManager.d.ts.map +1 -1
- package/dist/services/TmuxHookManager.js +3 -2
- package/dist/services/TmuxHookManager.js.map +1 -1
- package/dist/services/TmuxService.d.ts +11 -0
- package/dist/services/TmuxService.d.ts.map +1 -1
- package/dist/services/TmuxService.js +27 -1
- package/dist/services/TmuxService.js.map +1 -1
- package/dist/theme/colors.d.ts +24 -10
- package/dist/theme/colors.d.ts.map +1 -1
- package/dist/theme/colors.js +143 -19
- package/dist/theme/colors.js.map +1 -1
- package/dist/theme/themePalette.d.ts +6 -0
- package/dist/theme/themePalette.d.ts.map +1 -0
- package/dist/theme/themePalette.js +18 -0
- package/dist/theme/themePalette.js.map +1 -0
- package/dist/types.d.ts +9 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/agentLaunch.d.ts +2 -0
- package/dist/utils/agentLaunch.d.ts.map +1 -1
- package/dist/utils/agentLaunch.js +10 -9
- package/dist/utils/agentLaunch.js.map +1 -1
- package/dist/utils/aiMerge.d.ts +4 -0
- package/dist/utils/aiMerge.d.ts.map +1 -1
- package/dist/utils/aiMerge.js +7 -4
- package/dist/utils/aiMerge.js.map +1 -1
- package/dist/utils/asciiArt.d.ts.map +1 -1
- package/dist/utils/asciiArt.js +2 -1
- package/dist/utils/asciiArt.js.map +1 -1
- package/dist/utils/attachAgent.d.ts.map +1 -1
- package/dist/utils/attachAgent.js +20 -1
- package/dist/utils/attachAgent.js.map +1 -1
- package/dist/utils/codexHooks.d.ts +25 -0
- package/dist/utils/codexHooks.d.ts.map +1 -0
- package/dist/utils/codexHooks.js +131 -0
- package/dist/utils/codexHooks.js.map +1 -0
- package/dist/utils/conflictResolutionPane.d.ts.map +1 -1
- package/dist/utils/conflictResolutionPane.js +6 -2
- package/dist/utils/conflictResolutionPane.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/githubPullRequest.d.ts +18 -0
- package/dist/utils/githubPullRequest.d.ts.map +1 -0
- package/dist/utils/githubPullRequest.js +196 -0
- package/dist/utils/githubPullRequest.js.map +1 -0
- package/dist/utils/input.d.ts +7 -6
- package/dist/utils/input.d.ts.map +1 -1
- package/dist/utils/input.js +47 -24
- package/dist/utils/input.js.map +1 -1
- package/dist/utils/mergeTargets.d.ts +1 -1
- package/dist/utils/mergeTargets.d.ts.map +1 -1
- package/dist/utils/mergeTargets.js +12 -8
- package/dist/utils/mergeTargets.js.map +1 -1
- package/dist/utils/mergeValidation.d.ts.map +1 -1
- package/dist/utils/mergeValidation.js +45 -11
- package/dist/utils/mergeValidation.js.map +1 -1
- package/dist/utils/paneColors.d.ts +7 -0
- package/dist/utils/paneColors.d.ts.map +1 -0
- package/dist/utils/paneColors.js +42 -0
- package/dist/utils/paneColors.js.map +1 -0
- package/dist/utils/paneCreation.d.ts.map +1 -1
- package/dist/utils/paneCreation.js +110 -36
- package/dist/utils/paneCreation.js.map +1 -1
- package/dist/utils/paneRebinding.d.ts +1 -1
- package/dist/utils/paneRebinding.js +1 -1
- package/dist/utils/paneTitle.d.ts +8 -1
- package/dist/utils/paneTitle.d.ts.map +1 -1
- package/dist/utils/paneTitle.js +58 -10
- package/dist/utils/paneTitle.js.map +1 -1
- package/dist/utils/paneTitlePrefix.d.ts +8 -0
- package/dist/utils/paneTitlePrefix.d.ts.map +1 -0
- package/dist/utils/paneTitlePrefix.js +20 -0
- package/dist/utils/paneTitlePrefix.js.map +1 -0
- package/dist/utils/popup.d.ts +1 -0
- package/dist/utils/popup.d.ts.map +1 -1
- package/dist/utils/popup.js +9 -2
- package/dist/utils/popup.js.map +1 -1
- package/dist/utils/prSummary.d.ts +34 -0
- package/dist/utils/prSummary.d.ts.map +1 -0
- package/dist/utils/prSummary.js +130 -0
- package/dist/utils/prSummary.js.map +1 -0
- package/dist/utils/projectActions.d.ts +6 -0
- package/dist/utils/projectActions.d.ts.map +1 -1
- package/dist/utils/projectActions.js +46 -0
- package/dist/utils/projectActions.js.map +1 -1
- package/dist/utils/reopenWorktree.d.ts.map +1 -1
- package/dist/utils/reopenWorktree.js +40 -7
- package/dist/utils/reopenWorktree.js.map +1 -1
- package/dist/utils/resumeBranches.d.ts.map +1 -1
- package/dist/utils/resumeBranches.js +9 -3
- package/dist/utils/resumeBranches.js.map +1 -1
- package/dist/utils/settingsManager.d.ts +11 -3
- package/dist/utils/settingsManager.d.ts.map +1 -1
- package/dist/utils/settingsManager.js +96 -21
- package/dist/utils/settingsManager.js.map +1 -1
- package/dist/utils/sidebarProjects.d.ts +10 -3
- package/dist/utils/sidebarProjects.d.ts.map +1 -1
- package/dist/utils/sidebarProjects.js +125 -10
- package/dist/utils/sidebarProjects.js.map +1 -1
- package/dist/utils/tmux.d.ts +4 -0
- package/dist/utils/tmux.d.ts.map +1 -1
- package/dist/utils/tmux.js +8 -0
- package/dist/utils/tmux.js.map +1 -1
- package/dist/utils/tmuxHookCommands.d.ts +6 -0
- package/dist/utils/tmuxHookCommands.d.ts.map +1 -1
- package/dist/utils/tmuxHookCommands.js +12 -0
- package/dist/utils/tmuxHookCommands.js.map +1 -1
- package/dist/utils/tmuxSendKeys.d.ts +2 -0
- package/dist/utils/tmuxSendKeys.d.ts.map +1 -0
- package/dist/utils/tmuxSendKeys.js +8 -0
- package/dist/utils/tmuxSendKeys.js.map +1 -0
- package/dist/utils/toastLayout.d.ts +10 -0
- package/dist/utils/toastLayout.d.ts.map +1 -0
- package/dist/utils/toastLayout.js +24 -0
- package/dist/utils/toastLayout.js.map +1 -0
- package/dist/utils/welcomePane.d.ts +5 -1
- package/dist/utils/welcomePane.d.ts.map +1 -1
- package/dist/utils/welcomePane.js +33 -3
- package/dist/utils/welcomePane.js.map +1 -1
- package/dist/utils/welcomePaneManager.d.ts +3 -1
- package/dist/utils/welcomePaneManager.d.ts.map +1 -1
- package/dist/utils/welcomePaneManager.js +40 -2
- package/dist/utils/welcomePaneManager.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 +17 -1
- package/dist/utils/worktreeMetadata.js.map +1 -1
- package/dist/workers/PaneWorker.js +77 -0
- package/dist/workers/PaneWorker.js.map +1 -1
- package/dist/workers/WorkerMessages.d.ts +9 -1
- package/dist/workers/WorkerMessages.d.ts.map +1 -1
- package/dist/workers/WorkerMessages.js.map +1 -1
- package/dist/workers/panePollingWorker.js +33 -2
- package/dist/workers/panePollingWorker.js.map +1 -1
- package/package.json +1 -1
package/dist/types.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { AgentName, PermissionMode } from './utils/agentLaunch.js';
|
|
2
2
|
import type { NotificationSoundId } from './utils/notificationSounds.js';
|
|
3
|
+
export type DmuxThemeName = 'red' | 'blue' | 'yellow' | 'orange' | 'green' | 'purple' | 'cyan' | 'magenta';
|
|
3
4
|
export type AgentStatus = 'idle' | 'analyzing' | 'waiting' | 'working';
|
|
4
5
|
export interface OptionChoice {
|
|
5
6
|
action: string;
|
|
@@ -11,6 +12,7 @@ export interface PotentialHarm {
|
|
|
11
12
|
description?: string;
|
|
12
13
|
}
|
|
13
14
|
export interface MergeTargetReference {
|
|
15
|
+
displayName?: string;
|
|
14
16
|
slug?: string;
|
|
15
17
|
branchName: string;
|
|
16
18
|
worktreePath?: string;
|
|
@@ -18,16 +20,20 @@ export interface MergeTargetReference {
|
|
|
18
20
|
export interface SidebarProject {
|
|
19
21
|
projectRoot: string;
|
|
20
22
|
projectName: string;
|
|
23
|
+
colorTheme?: DmuxThemeName;
|
|
24
|
+
colorThemeSource?: 'auto' | 'manual';
|
|
21
25
|
}
|
|
22
26
|
export interface DmuxPane {
|
|
23
27
|
id: string;
|
|
24
28
|
slug: string;
|
|
29
|
+
displayName?: string;
|
|
25
30
|
branchName?: string;
|
|
26
31
|
prompt: string;
|
|
27
32
|
paneId: string;
|
|
28
33
|
hidden?: boolean;
|
|
29
34
|
projectRoot?: string;
|
|
30
35
|
projectName?: string;
|
|
36
|
+
colorTheme?: DmuxThemeName;
|
|
31
37
|
type?: 'worktree' | 'shell';
|
|
32
38
|
shellType?: string;
|
|
33
39
|
worktreePath?: string;
|
|
@@ -77,6 +83,7 @@ export interface DmuxSettings {
|
|
|
77
83
|
enabledAgents?: AgentName[];
|
|
78
84
|
enabledNotificationSounds?: NotificationSoundId[];
|
|
79
85
|
showFooterTips?: boolean;
|
|
86
|
+
colorTheme?: DmuxThemeName;
|
|
80
87
|
useTmuxHooks?: boolean;
|
|
81
88
|
baseBranch?: string;
|
|
82
89
|
branchPrefix?: string;
|
|
@@ -84,11 +91,13 @@ export interface DmuxSettings {
|
|
|
84
91
|
maxPaneWidth?: number;
|
|
85
92
|
}
|
|
86
93
|
export type SettingsScope = 'global' | 'project';
|
|
94
|
+
export type EffectiveSettingsScope = SettingsScope | 'team';
|
|
87
95
|
export interface SettingDefinition {
|
|
88
96
|
key: keyof DmuxSettings | string;
|
|
89
97
|
label: string;
|
|
90
98
|
description: string;
|
|
91
99
|
type: 'boolean' | 'select' | 'text' | 'number' | 'action';
|
|
100
|
+
scopeBehavior?: 'choose' | 'session' | 'global' | 'project';
|
|
92
101
|
options?: Array<{
|
|
93
102
|
value: string;
|
|
94
103
|
label: string;
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,6 +70,8 @@ export declare function launchAgentInPane(opts: {
|
|
|
70
70
|
prompt: string;
|
|
71
71
|
slug: string;
|
|
72
72
|
projectRoot: string;
|
|
73
|
+
dmuxPaneId?: string;
|
|
74
|
+
codexHookEventFile?: string;
|
|
73
75
|
permissionMode?: '' | 'plan' | 'acceptEdits' | 'bypassPermissions';
|
|
74
76
|
}): Promise<void>;
|
|
75
77
|
//# sourceMappingURL=agentLaunch.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentLaunch.d.ts","sourceRoot":"","sources":["../../src/utils/agentLaunch.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"agentLaunch.d.ts","sourceRoot":"","sources":["../../src/utils/agentLaunch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { TmuxService } from '../services/TmuxService.js';
|
|
2
|
-
import { buildPromptReadAndDeleteSnippet, writePromptFile, } from './promptStore.js';
|
|
2
|
+
import { buildPromptReadAndDeleteSnippet, shellQuote, writePromptFile, } from './promptStore.js';
|
|
3
|
+
import { buildCodexPaneEnvironmentPrefix, } from './codexHooks.js';
|
|
3
4
|
export const AGENT_IDS = [
|
|
4
5
|
'claude',
|
|
5
6
|
'opencode',
|
|
@@ -472,6 +473,11 @@ export async function launchAgentInPane(opts) {
|
|
|
472
473
|
else if (agent === 'codex') {
|
|
473
474
|
const permissionFlags = getPermissionFlags('codex', permissionMode);
|
|
474
475
|
const permissionSuffix = permissionFlags ? ` ${permissionFlags}` : '';
|
|
476
|
+
const codexEnvPrefix = buildCodexPaneEnvironmentPrefix({
|
|
477
|
+
dmuxPaneId: opts.dmuxPaneId || '',
|
|
478
|
+
tmuxPaneId: paneId,
|
|
479
|
+
eventFile: opts.codexHookEventFile,
|
|
480
|
+
});
|
|
475
481
|
let codexCmd;
|
|
476
482
|
if (hasInitialPrompt) {
|
|
477
483
|
let promptFilePath = null;
|
|
@@ -483,19 +489,14 @@ export async function launchAgentInPane(opts) {
|
|
|
483
489
|
}
|
|
484
490
|
if (promptFilePath) {
|
|
485
491
|
const promptBootstrap = buildPromptReadAndDeleteSnippet(promptFilePath);
|
|
486
|
-
codexCmd = `${promptBootstrap}; codex "$DMUX_PROMPT_CONTENT"${permissionSuffix}`;
|
|
492
|
+
codexCmd = `${promptBootstrap}; ${codexEnvPrefix} codex --enable codex_hooks "$DMUX_PROMPT_CONTENT"${permissionSuffix}`;
|
|
487
493
|
}
|
|
488
494
|
else {
|
|
489
|
-
|
|
490
|
-
.replace(/\\/g, '\\\\')
|
|
491
|
-
.replace(/"/g, '\\"')
|
|
492
|
-
.replace(/`/g, '\\`')
|
|
493
|
-
.replace(/\$/g, '\\$');
|
|
494
|
-
codexCmd = `codex "${escapedPrompt}"${permissionSuffix}`;
|
|
495
|
+
codexCmd = `${codexEnvPrefix} codex --enable codex_hooks ${shellQuote(prompt)}${permissionSuffix}`;
|
|
495
496
|
}
|
|
496
497
|
}
|
|
497
498
|
else {
|
|
498
|
-
codexCmd =
|
|
499
|
+
codexCmd = `${codexEnvPrefix} codex --enable codex_hooks${permissionSuffix}`;
|
|
499
500
|
}
|
|
500
501
|
await tmuxService.sendShellCommand(paneId, codexCmd);
|
|
501
502
|
await tmuxService.sendTmuxKeys(paneId, 'Enter');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentLaunch.js","sourceRoot":"","sources":["../../src/utils/agentLaunch.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"agentLaunch.js","sourceRoot":"","sources":["../../src/utils/agentLaunch.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/aiMerge.d.ts
CHANGED
|
@@ -3,6 +3,10 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Uses AI to help resolve merge conflicts intelligently
|
|
5
5
|
*/
|
|
6
|
+
/**
|
|
7
|
+
* Call OpenRouter API for AI assistance with model fallback
|
|
8
|
+
*/
|
|
9
|
+
export declare function callOpenRouter(prompt: string, maxTokens?: number, timeoutMs?: number): Promise<string | null>;
|
|
6
10
|
/**
|
|
7
11
|
* Get comprehensive git diff with context for commit message generation
|
|
8
12
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aiMerge.d.ts","sourceRoot":"","sources":["../../src/utils/aiMerge.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"aiMerge.d.ts","sourceRoot":"","sources":["../../src/utils/aiMerge.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA2BH;;GAEG;AACH,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,GAAE,MAAa,EAAE,SAAS,GAAE,MAAc,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA0ChI;AAqBD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAuCxF;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAqCpF;AAqED;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAqEzE;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EAAE,GACtB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,MAAM,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiC/F"}
|
package/dist/utils/aiMerge.js
CHANGED
|
@@ -29,7 +29,7 @@ async function fetchWithTimeout(url, options, timeoutMs) {
|
|
|
29
29
|
/**
|
|
30
30
|
* Call OpenRouter API for AI assistance with model fallback
|
|
31
31
|
*/
|
|
32
|
-
async function callOpenRouter(prompt, maxTokens = 1000, timeoutMs = 12000) {
|
|
32
|
+
export async function callOpenRouter(prompt, maxTokens = 1000, timeoutMs = 12000) {
|
|
33
33
|
const apiKey = process.env.OPENROUTER_API_KEY;
|
|
34
34
|
if (!apiKey)
|
|
35
35
|
return null;
|
|
@@ -223,6 +223,9 @@ export async function aiResolveConflict(filePath, repoPath) {
|
|
|
223
223
|
};
|
|
224
224
|
}
|
|
225
225
|
// For now, use a simple strategy: try to intelligently merge both versions
|
|
226
|
+
const conflictStart = '<<<<<<<';
|
|
227
|
+
const conflictSeparator = '=======';
|
|
228
|
+
const conflictEnd = '>>>>>>>';
|
|
226
229
|
const prompt = `You are resolving a git merge conflict. Below is a file with conflict markers.
|
|
227
230
|
|
|
228
231
|
Your task: Provide the COMPLETE resolved file content that intelligently combines both versions. Do NOT include any explanations, just the final file content.
|
|
@@ -233,11 +236,11 @@ Conflict sections:
|
|
|
233
236
|
${conflicts
|
|
234
237
|
.map((c, i) => `
|
|
235
238
|
Conflict ${i + 1}:
|
|
236
|
-
|
|
239
|
+
${conflictStart} OURS (current branch)
|
|
237
240
|
${c.ours}
|
|
238
|
-
|
|
239
|
-
>>>>>>> THEIRS (incoming branch)
|
|
241
|
+
${conflictSeparator}
|
|
240
242
|
${c.theirs}
|
|
243
|
+
${conflictEnd} THEIRS (incoming branch)
|
|
241
244
|
`)
|
|
242
245
|
.join('\n')}
|
|
243
246
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aiMerge.js","sourceRoot":"","sources":["../../src/utils/aiMerge.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD;;GAEG;AACH,KAAK,UAAU,gBAAgB,CAAC,GAAW,EAAE,OAAoB,EAAE,SAAiB;IAClF,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,SAAS,CAAC,CAAC;IAElE,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAChC,GAAG,OAAO;YACV,MAAM,EAAE,UAAU,CAAC,MAAM;SAC1B,CAAC,CAAC;QACH,YAAY,CAAC,SAAS,CAAC,CAAC;QACxB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,YAAY,CAAC,SAAS,CAAC,CAAC;QACxB,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,cAAc,CAAC,MAAc,EAAE,YAAoB,IAAI,EAAE,YAAoB,KAAK;
|
|
1
|
+
{"version":3,"file":"aiMerge.js","sourceRoot":"","sources":["../../src/utils/aiMerge.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asciiArt.d.ts","sourceRoot":"","sources":["../../src/utils/asciiArt.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"asciiArt.d.ts","sourceRoot":"","sources":["../../src/utils/asciiArt.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,MAAM,EAAE,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CA8Cf;AAED;;GAEG;AACH,eAAO,MAAM,SAAS;;CAiBrB,CAAA"}
|
package/dist/utils/asciiArt.js
CHANGED
|
@@ -4,6 +4,7 @@ import fs from "fs";
|
|
|
4
4
|
import path from "path";
|
|
5
5
|
import { fileURLToPath } from "url";
|
|
6
6
|
import { resolveDistPath } from "./runtimePaths.js";
|
|
7
|
+
import { getActiveDmuxTheme } from "../theme/colors.js";
|
|
7
8
|
/**
|
|
8
9
|
* Render ASCII art centered in a tmux pane with fill characters
|
|
9
10
|
* Uses a persistent node script that re-renders on resize
|
|
@@ -47,7 +48,7 @@ export async function renderAsciiArt(options) {
|
|
|
47
48
|
const absolutePath = path.isAbsolute(scriptPath)
|
|
48
49
|
? scriptPath
|
|
49
50
|
: path.resolve(scriptPath);
|
|
50
|
-
await tmuxService.sendKeys(paneId, `'node "${absolutePath}"' Enter`);
|
|
51
|
+
await tmuxService.sendKeys(paneId, `'DMUX_THEME=${getActiveDmuxTheme()} node "${absolutePath}"' Enter`);
|
|
51
52
|
await new Promise((resolve) => setTimeout(resolve, 150));
|
|
52
53
|
}
|
|
53
54
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asciiArt.js","sourceRoot":"","sources":["../../src/utils/asciiArt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAA;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"asciiArt.js","sourceRoot":"","sources":["../../src/utils/asciiArt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAA;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAUvD;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAA8B;IAE9B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAC1B,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,EAAE,CAAA;IAE7C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IAE9D,mEAAmE;IACnE,MAAM,aAAa,GAAG;QACpB,eAAe,CAAC,OAAO,EAAE,oBAAoB,CAAC;QAC9C,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,CAAC;KAC1D,CAAA;IAED,IAAI,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA,CAAC,UAAU;IAC5C,KAAK,MAAM,CAAC,IAAI,aAAa,EAAE,CAAC;QAC9B,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;YACrB,UAAU,GAAG,CAAC,CAAA;YACd,MAAK;QACP,CAAC;IACH,CAAC;IAED,2BAA2B;IAC3B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,uCAAuC,UAAU,YAAY,aAAa,CAAC,IAAI,CAC7E,IAAI,CACL,EAAE,CACJ,CAAA;IACH,CAAC;IAED,wCAAwC;IACxC,IAAI,CAAC;QACH,MAAM,WAAW,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IAC3C,CAAC;IAAC,MAAM,CAAC;QACP,qDAAqD;IACvD,CAAC;IACD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAA;IAE3E,oDAAoD;IACpD,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QAC9C,CAAC,CAAC,UAAU;QACZ,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IAC5B,MAAM,WAAW,CAAC,QAAQ,CACxB,MAAM,EACN,eAAe,kBAAkB,EAAE,UAAU,YAAY,UAAU,CACpE,CAAA;IACD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;AAC1D,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,WAAW,EAAE;;;;;;;;;;;;;;;GAeZ;CACF,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attachAgent.d.ts","sourceRoot":"","sources":["../../src/utils/attachAgent.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,QAAQ,EAAc,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"attachAgent.d.ts","sourceRoot":"","sources":["../../src/utils/attachAgent.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,QAAQ,EAAc,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAYlD,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,QAAQ,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,SAAS,CAAC;IACjB,aAAa,EAAE,QAAQ,EAAE,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,wBAAgB,gCAAgC,CAC9C,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,CAAC,EACnD,aAAa,EAAE,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,GACnD,MAAM,CAmBR;AAED,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAsJ7B"}
|
|
@@ -15,6 +15,8 @@ import { recalculateAndApplyLayout } from './layoutManager.js';
|
|
|
15
15
|
import { buildWorktreePaneTitle } from './paneTitle.js';
|
|
16
16
|
import { SettingsManager } from './settingsManager.js';
|
|
17
17
|
import { LogService } from '../services/LogService.js';
|
|
18
|
+
import { installCodexPaneHooks } from './codexHooks.js';
|
|
19
|
+
import { resolveProjectColorTheme } from './paneColors.js';
|
|
18
20
|
/**
|
|
19
21
|
* Generate a unique sibling slug like `fix-auth-a2`, `fix-auth-a3`, etc.
|
|
20
22
|
*/
|
|
@@ -94,6 +96,20 @@ export async function attachAgentToWorktree(options) {
|
|
|
94
96
|
await tmuxService.sendTmuxKeys(paneInfo, 'Enter');
|
|
95
97
|
// Small delay for cd to complete
|
|
96
98
|
await new Promise(r => setTimeout(r, 300));
|
|
99
|
+
const dmuxPaneId = `dmux-${Date.now()}`;
|
|
100
|
+
let codexHookEventFile;
|
|
101
|
+
if (agent === 'codex') {
|
|
102
|
+
try {
|
|
103
|
+
codexHookEventFile = installCodexPaneHooks({
|
|
104
|
+
worktreePath: targetPane.worktreePath,
|
|
105
|
+
dmuxPaneId,
|
|
106
|
+
tmuxPaneId: paneInfo,
|
|
107
|
+
}).eventFile;
|
|
108
|
+
}
|
|
109
|
+
catch (error) {
|
|
110
|
+
LogService.getInstance().warn(`Failed to install Codex hooks for ${slug}: ${error instanceof Error ? error.message : String(error)}`, 'attachAgent', dmuxPaneId);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
97
113
|
// Launch the agent
|
|
98
114
|
await launchAgentInPane({
|
|
99
115
|
paneId: paneInfo,
|
|
@@ -101,6 +117,8 @@ export async function attachAgentToWorktree(options) {
|
|
|
101
117
|
prompt,
|
|
102
118
|
slug,
|
|
103
119
|
projectRoot,
|
|
120
|
+
dmuxPaneId,
|
|
121
|
+
codexHookEventFile,
|
|
104
122
|
permissionMode: settings.permissionMode,
|
|
105
123
|
});
|
|
106
124
|
// Auto-approve trust prompts for Claude
|
|
@@ -113,13 +131,14 @@ export async function attachAgentToWorktree(options) {
|
|
|
113
131
|
await tmuxService.selectPane(paneInfo);
|
|
114
132
|
// Build the sibling pane object — shares worktree/branch with target
|
|
115
133
|
const newPane = {
|
|
116
|
-
id:
|
|
134
|
+
id: dmuxPaneId,
|
|
117
135
|
slug,
|
|
118
136
|
branchName: targetPane.branchName,
|
|
119
137
|
prompt: prompt || 'No initial prompt',
|
|
120
138
|
paneId: paneInfo,
|
|
121
139
|
projectRoot,
|
|
122
140
|
projectName: targetPane.projectName,
|
|
141
|
+
colorTheme: targetPane.colorTheme || resolveProjectColorTheme(projectRoot, []),
|
|
123
142
|
worktreePath: targetPane.worktreePath,
|
|
124
143
|
agent,
|
|
125
144
|
permissionMode: settings.permissionMode,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attachAgent.js","sourceRoot":"","sources":["../../src/utils/attachAgent.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"attachAgent.js","sourceRoot":"","sources":["../../src/utils/attachAgent.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
export interface CodexHookInstallResult {
|
|
2
|
+
eventFile: string;
|
|
3
|
+
}
|
|
4
|
+
export declare function installCodexPaneHooks(opts: {
|
|
5
|
+
worktreePath: string;
|
|
6
|
+
dmuxPaneId: string;
|
|
7
|
+
tmuxPaneId: string;
|
|
8
|
+
}): CodexHookInstallResult;
|
|
9
|
+
export declare function buildCodexPaneEnvironmentPrefix(opts: {
|
|
10
|
+
dmuxPaneId: string;
|
|
11
|
+
tmuxPaneId: string;
|
|
12
|
+
eventFile?: string;
|
|
13
|
+
}): string;
|
|
14
|
+
export declare function buildCodexPaneExportSnippet(opts: {
|
|
15
|
+
dmuxPaneId: string;
|
|
16
|
+
tmuxPaneId: string;
|
|
17
|
+
eventFile?: string;
|
|
18
|
+
}): string;
|
|
19
|
+
export declare function enableCodexHooksFlag(command: string): string;
|
|
20
|
+
export declare function buildCodexHookedCommand(command: string, opts: {
|
|
21
|
+
dmuxPaneId: string;
|
|
22
|
+
tmuxPaneId: string;
|
|
23
|
+
eventFile?: string;
|
|
24
|
+
}): string;
|
|
25
|
+
//# sourceMappingURL=codexHooks.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codexHooks.d.ts","sourceRoot":"","sources":["../../src/utils/codexHooks.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;CACnB;AAiDD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE;IAC1C,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,sBAAsB,CA+DzB;AAmBD,wBAAgB,+BAA+B,CAAC,IAAI,EAAE;IACpD,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,MAAM,CAIT;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE;IAChD,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,MAAM,CAKT;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE;IACJ,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GACA,MAAM,CAER"}
|
|
@@ -0,0 +1,131 @@
|
|
|
1
|
+
import * as fs from 'fs';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
import { atomicWriteFileSync, atomicWriteJsonSync } from './atomicWrite.js';
|
|
4
|
+
import { shellQuote } from './promptStore.js';
|
|
5
|
+
function escapeForSingleQuotedJs(value) {
|
|
6
|
+
return value.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
|
|
7
|
+
}
|
|
8
|
+
function mergeDmuxStopHook(hooksPath, hookCommand) {
|
|
9
|
+
let hooksConfig = {};
|
|
10
|
+
if (fs.existsSync(hooksPath)) {
|
|
11
|
+
try {
|
|
12
|
+
hooksConfig = JSON.parse(fs.readFileSync(hooksPath, 'utf-8'));
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
hooksConfig = {};
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
if (!hooksConfig || typeof hooksConfig !== 'object' || Array.isArray(hooksConfig)) {
|
|
19
|
+
hooksConfig = {};
|
|
20
|
+
}
|
|
21
|
+
if (!hooksConfig.hooks || typeof hooksConfig.hooks !== 'object' || Array.isArray(hooksConfig.hooks)) {
|
|
22
|
+
hooksConfig.hooks = {};
|
|
23
|
+
}
|
|
24
|
+
const stopHooks = Array.isArray(hooksConfig.hooks.Stop) ? hooksConfig.hooks.Stop : [];
|
|
25
|
+
const nextStopHooks = stopHooks.filter((group) => {
|
|
26
|
+
const handlers = Array.isArray(group?.hooks) ? group.hooks : [];
|
|
27
|
+
return !handlers.some((handler) => (typeof handler?.command === 'string'
|
|
28
|
+
&& handler.command.includes('dmux-stop-hook.cjs')));
|
|
29
|
+
});
|
|
30
|
+
nextStopHooks.push({
|
|
31
|
+
hooks: [
|
|
32
|
+
{
|
|
33
|
+
type: 'command',
|
|
34
|
+
command: hookCommand,
|
|
35
|
+
timeout: 5,
|
|
36
|
+
statusMessage: 'Notifying dmux',
|
|
37
|
+
},
|
|
38
|
+
],
|
|
39
|
+
});
|
|
40
|
+
hooksConfig.hooks.Stop = nextStopHooks;
|
|
41
|
+
atomicWriteJsonSync(hooksPath, hooksConfig);
|
|
42
|
+
}
|
|
43
|
+
export function installCodexPaneHooks(opts) {
|
|
44
|
+
const codexDir = path.join(opts.worktreePath, '.codex');
|
|
45
|
+
const hookDir = path.join(codexDir, 'hooks');
|
|
46
|
+
const stateDir = path.join(codexDir, 'dmux');
|
|
47
|
+
fs.mkdirSync(hookDir, { recursive: true });
|
|
48
|
+
fs.mkdirSync(stateDir, { recursive: true });
|
|
49
|
+
const eventFile = path.join(stateDir, `${opts.dmuxPaneId}.json`);
|
|
50
|
+
const hookScriptPath = path.join(hookDir, 'dmux-stop-hook.cjs');
|
|
51
|
+
const hookScript = `#!/usr/bin/env node
|
|
52
|
+
const fs = require('fs');
|
|
53
|
+
|
|
54
|
+
let input = '';
|
|
55
|
+
process.stdin.setEncoding('utf8');
|
|
56
|
+
process.stdin.on('data', (chunk) => {
|
|
57
|
+
input += chunk;
|
|
58
|
+
});
|
|
59
|
+
process.stdin.on('end', () => {
|
|
60
|
+
let payload = {};
|
|
61
|
+
try {
|
|
62
|
+
payload = input.trim() ? JSON.parse(input) : {};
|
|
63
|
+
} catch (error) {
|
|
64
|
+
payload = { parse_error: String(error), raw: input };
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
const event = {
|
|
68
|
+
source: 'codex-stop-hook',
|
|
69
|
+
dmuxPaneId: process.env.DMUX_PANE_ID || '',
|
|
70
|
+
tmuxPaneId: process.env.DMUX_TMUX_PANE_ID || '',
|
|
71
|
+
expectedDmuxPaneId: '${escapeForSingleQuotedJs(opts.dmuxPaneId)}',
|
|
72
|
+
expectedTmuxPaneId: '${escapeForSingleQuotedJs(opts.tmuxPaneId)}',
|
|
73
|
+
hookEventName: payload.hook_event_name || payload.hookEventName || '',
|
|
74
|
+
turnId: payload.turn_id || payload.turnId || '',
|
|
75
|
+
lastAssistantMessage: payload.last_assistant_message || null,
|
|
76
|
+
transcriptPath: payload.transcript_path || null,
|
|
77
|
+
cwd: payload.cwd || process.cwd(),
|
|
78
|
+
timestamp: Date.now()
|
|
79
|
+
};
|
|
80
|
+
|
|
81
|
+
if (event.hookEventName && event.hookEventName !== 'Stop') {
|
|
82
|
+
process.exit(0);
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
if (event.dmuxPaneId !== event.expectedDmuxPaneId) {
|
|
86
|
+
process.exit(0);
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
try {
|
|
90
|
+
fs.writeFileSync('${escapeForSingleQuotedJs(eventFile)}', JSON.stringify(event, null, 2));
|
|
91
|
+
} catch (error) {
|
|
92
|
+
process.exit(0);
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
process.stdout.write(JSON.stringify({ continue: true }));
|
|
96
|
+
});
|
|
97
|
+
`;
|
|
98
|
+
atomicWriteFileSync(hookScriptPath, hookScript);
|
|
99
|
+
fs.chmodSync(hookScriptPath, 0o755);
|
|
100
|
+
const hooksPath = path.join(codexDir, 'hooks.json');
|
|
101
|
+
mergeDmuxStopHook(hooksPath, `node ${shellQuote(hookScriptPath)}`);
|
|
102
|
+
return { eventFile };
|
|
103
|
+
}
|
|
104
|
+
function buildCodexPaneAssignments(opts) {
|
|
105
|
+
const assignments = [
|
|
106
|
+
['DMUX_PANE_ID', opts.dmuxPaneId],
|
|
107
|
+
['DMUX_TMUX_PANE_ID', opts.tmuxPaneId],
|
|
108
|
+
];
|
|
109
|
+
if (opts.eventFile) {
|
|
110
|
+
assignments.push(['DMUX_CODEX_HOOK_EVENT_FILE', opts.eventFile]);
|
|
111
|
+
}
|
|
112
|
+
return assignments;
|
|
113
|
+
}
|
|
114
|
+
export function buildCodexPaneEnvironmentPrefix(opts) {
|
|
115
|
+
return buildCodexPaneAssignments(opts)
|
|
116
|
+
.map(([key, value]) => `${key}=${shellQuote(value)}`)
|
|
117
|
+
.join(' ');
|
|
118
|
+
}
|
|
119
|
+
export function buildCodexPaneExportSnippet(opts) {
|
|
120
|
+
return buildCodexPaneAssignments(opts)
|
|
121
|
+
.map(([key, value]) => `${key}=${shellQuote(value)}`)
|
|
122
|
+
.map((assignment) => `export ${assignment}`)
|
|
123
|
+
.join('; ');
|
|
124
|
+
}
|
|
125
|
+
export function enableCodexHooksFlag(command) {
|
|
126
|
+
return command.replace(/(^|;\s*)codex(?=\s|$)/, '$1codex --enable codex_hooks');
|
|
127
|
+
}
|
|
128
|
+
export function buildCodexHookedCommand(command, opts) {
|
|
129
|
+
return `${buildCodexPaneExportSnippet(opts)}; ${enableCodexHooksFlag(command)}`;
|
|
130
|
+
}
|
|
131
|
+
//# sourceMappingURL=codexHooks.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codexHooks.js","sourceRoot":"","sources":["../../src/utils/codexHooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflictResolutionPane.d.ts","sourceRoot":"","sources":["../../src/utils/conflictResolutionPane.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"conflictResolutionPane.d.ts","sourceRoot":"","sources":["../../src/utils/conflictResolutionPane.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAgB5C,OAAO,EASL,KAAK,SAAS,EACf,MAAM,kBAAkB,CAAC;AAI1B,MAAM,WAAW,6BAA6B;IAC5C,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,SAAS,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,QAAQ,EAAE,CAAC;CAC3B;AAED;;GAEG;AACH,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,QAAQ,CAAC,CAoLnB"}
|