dmux 5.1.0 → 5.3.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 +46 -143
- package/dist/DmuxApp.d.ts.map +1 -1
- package/dist/DmuxApp.js +99 -56
- package/dist/DmuxApp.js.map +1 -1
- package/dist/actions/implementations/closeAction.d.ts.map +1 -1
- package/dist/actions/implementations/closeAction.js +55 -21
- package/dist/actions/implementations/closeAction.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 +3 -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 +61 -20
- package/dist/actions/implementations/mergeAction.js.map +1 -1
- package/dist/actions/index.d.ts.map +1 -1
- package/dist/actions/index.js +6 -0
- package/dist/actions/index.js.map +1 -1
- package/dist/actions/merge/conflictResolution.d.ts.map +1 -1
- package/dist/actions/merge/conflictResolution.js +19 -13
- package/dist/actions/merge/conflictResolution.js.map +1 -1
- package/dist/actions/merge/issueHandlers/mainDirtyHandler.d.ts.map +1 -1
- package/dist/actions/merge/issueHandlers/mainDirtyHandler.js +8 -6
- package/dist/actions/merge/issueHandlers/mainDirtyHandler.js.map +1 -1
- package/dist/actions/merge/issueHandlers/worktreeUncommittedHandler.d.ts +1 -1
- package/dist/actions/merge/issueHandlers/worktreeUncommittedHandler.d.ts.map +1 -1
- package/dist/actions/merge/issueHandlers/worktreeUncommittedHandler.js +9 -2
- package/dist/actions/merge/issueHandlers/worktreeUncommittedHandler.js.map +1 -1
- package/dist/actions/merge/mergeExecution.d.ts.map +1 -1
- package/dist/actions/merge/mergeExecution.js +2 -1
- package/dist/actions/merge/mergeExecution.js.map +1 -1
- package/dist/actions/merge/multiMergeOrchestrator.d.ts.map +1 -1
- package/dist/actions/merge/multiMergeOrchestrator.js +33 -14
- package/dist/actions/merge/multiMergeOrchestrator.js.map +1 -1
- package/dist/actions/types.d.ts +4 -2
- package/dist/actions/types.d.ts.map +1 -1
- package/dist/actions/types.js +19 -1
- package/dist/actions/types.js.map +1 -1
- package/dist/components/dialogs/AgentChoiceDialog.d.ts +2 -1
- package/dist/components/dialogs/AgentChoiceDialog.d.ts.map +1 -1
- package/dist/components/dialogs/AgentChoiceDialog.js +4 -5
- package/dist/components/dialogs/AgentChoiceDialog.js.map +1 -1
- package/dist/components/dialogs/SettingsDialog.d.ts.map +1 -1
- package/dist/components/dialogs/SettingsDialog.js +3 -1
- package/dist/components/dialogs/SettingsDialog.js.map +1 -1
- package/dist/components/panes/MergePane.d.ts +1 -0
- package/dist/components/panes/MergePane.d.ts.map +1 -1
- package/dist/components/panes/MergePane.js +14 -3
- package/dist/components/panes/MergePane.js.map +1 -1
- package/dist/components/panes/PaneCard.d.ts +1 -3
- package/dist/components/panes/PaneCard.d.ts.map +1 -1
- package/dist/components/panes/PaneCard.js +54 -37
- 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 +60 -78
- package/dist/components/panes/PanesGrid.js.map +1 -1
- package/dist/components/popups/agentChoicePopup.d.ts +2 -2
- package/dist/components/popups/agentChoicePopup.js +85 -56
- package/dist/components/popups/agentChoicePopup.js.map +1 -1
- package/dist/components/popups/diffPeekPopup.d.ts +7 -0
- package/dist/components/popups/diffPeekPopup.d.ts.map +1 -0
- package/dist/components/popups/diffPeekPopup.js +99 -0
- package/dist/components/popups/diffPeekPopup.js.map +1 -0
- package/dist/components/popups/enabledAgentsPopup.d.ts +7 -0
- package/dist/components/popups/enabledAgentsPopup.d.ts.map +1 -0
- package/dist/components/popups/enabledAgentsPopup.js +196 -0
- package/dist/components/popups/enabledAgentsPopup.js.map +1 -0
- package/dist/components/popups/kebabMenuPopup.js +2 -2
- package/dist/components/popups/kebabMenuPopup.js.map +1 -1
- package/dist/components/popups/mergeUncommittedChoicePopup.d.ts +7 -0
- package/dist/components/popups/mergeUncommittedChoicePopup.d.ts.map +1 -0
- package/dist/components/popups/mergeUncommittedChoicePopup.js +289 -0
- package/dist/components/popups/mergeUncommittedChoicePopup.js.map +1 -0
- package/dist/components/popups/newPanePopup.js +8 -0
- package/dist/components/popups/newPanePopup.js.map +1 -1
- package/dist/components/popups/projectSelectPopup.d.ts +7 -0
- package/dist/components/popups/projectSelectPopup.d.ts.map +1 -0
- package/dist/components/popups/projectSelectPopup.js +124 -0
- package/dist/components/popups/projectSelectPopup.js.map +1 -0
- package/dist/components/popups/reopenWorktreePopup.js +33 -3
- package/dist/components/popups/reopenWorktreePopup.js.map +1 -1
- package/dist/components/popups/settingsPopup.js +25 -8
- package/dist/components/popups/settingsPopup.js.map +1 -1
- package/dist/components/popups/shared/DirectoryList.d.ts +14 -0
- package/dist/components/popups/shared/DirectoryList.d.ts.map +1 -0
- package/dist/components/popups/shared/DirectoryList.js +46 -0
- package/dist/components/popups/shared/DirectoryList.js.map +1 -0
- package/dist/components/popups/shared/index.d.ts +1 -0
- package/dist/components/popups/shared/index.d.ts.map +1 -1
- package/dist/components/popups/shared/index.js +1 -0
- package/dist/components/popups/shared/index.js.map +1 -1
- package/dist/components/popups/shortcutsPopup.js +15 -12
- package/dist/components/popups/shortcutsPopup.js.map +1 -1
- package/dist/components/popups/singleAgentChoicePopup.d.ts +7 -0
- package/dist/components/popups/singleAgentChoicePopup.d.ts.map +1 -0
- package/dist/components/popups/singleAgentChoicePopup.js +95 -0
- package/dist/components/popups/singleAgentChoicePopup.js.map +1 -0
- package/dist/components/ui/FooterHelp.js +1 -1
- package/dist/components/ui/FooterHelp.js.map +1 -1
- package/dist/hooks/useActionSystem.d.ts +1 -1
- package/dist/hooks/useActionSystem.d.ts.map +1 -1
- package/dist/hooks/useActionSystem.js +1 -1
- package/dist/hooks/useActionSystem.js.map +1 -1
- package/dist/hooks/useAgentDetection.d.ts +2 -2
- package/dist/hooks/useAgentDetection.d.ts.map +1 -1
- package/dist/hooks/useAgentDetection.js +18 -88
- package/dist/hooks/useAgentDetection.js.map +1 -1
- package/dist/hooks/useAutoUpdater.d.ts.map +1 -1
- package/dist/hooks/useAutoUpdater.js +43 -26
- package/dist/hooks/useAutoUpdater.js.map +1 -1
- package/dist/hooks/useInputHandling.d.ts +5 -0
- package/dist/hooks/useInputHandling.d.ts.map +1 -1
- package/dist/hooks/useInputHandling.js +89 -16
- package/dist/hooks/useInputHandling.js.map +1 -1
- package/dist/hooks/useNavigation.d.ts +1 -1
- package/dist/hooks/useNavigation.d.ts.map +1 -1
- package/dist/hooks/useNavigation.js +26 -4
- package/dist/hooks/useNavigation.js.map +1 -1
- package/dist/hooks/usePaneCreation.d.ts +5 -2
- package/dist/hooks/usePaneCreation.d.ts.map +1 -1
- package/dist/hooks/usePaneCreation.js +123 -23
- package/dist/hooks/usePaneCreation.js.map +1 -1
- package/dist/hooks/usePaneSync.d.ts +1 -1
- package/dist/hooks/usePaneSync.d.ts.map +1 -1
- package/dist/hooks/usePaneSync.js +14 -1
- package/dist/hooks/usePaneSync.js.map +1 -1
- package/dist/hooks/usePanes.js +1 -1
- package/dist/hooks/usePanes.js.map +1 -1
- package/dist/hooks/useServices.d.ts +1 -1
- package/dist/hooks/useServices.d.ts.map +1 -1
- package/dist/hooks/useServices.js +2 -2
- package/dist/hooks/useServices.js.map +1 -1
- package/dist/hooks/useWorktreeActions.d.ts.map +1 -1
- package/dist/hooks/useWorktreeActions.js +16 -8
- package/dist/hooks/useWorktreeActions.js.map +1 -1
- package/dist/index.js +199 -18
- package/dist/index.js.map +1 -1
- package/dist/layout/SpacerManager.d.ts.map +1 -1
- package/dist/layout/SpacerManager.js +2 -1
- package/dist/layout/SpacerManager.js.map +1 -1
- package/dist/server/embedded-assets.d.ts.map +1 -1
- package/dist/server/embedded-assets.js +37 -26
- package/dist/server/embedded-assets.js.map +1 -1
- package/dist/services/AutoUpdater.d.ts +4 -0
- package/dist/services/AutoUpdater.d.ts.map +1 -1
- package/dist/services/AutoUpdater.js +23 -0
- package/dist/services/AutoUpdater.js.map +1 -1
- package/dist/services/PaneEventService.d.ts.map +1 -1
- package/dist/services/PaneEventService.js +2 -5
- package/dist/services/PaneEventService.js.map +1 -1
- package/dist/services/PaneWorkerManager.d.ts.map +1 -1
- package/dist/services/PaneWorkerManager.js +2 -14
- package/dist/services/PaneWorkerManager.js.map +1 -1
- package/dist/services/PopupManager.d.ts +8 -2
- package/dist/services/PopupManager.d.ts.map +1 -1
- package/dist/services/PopupManager.js +149 -27
- package/dist/services/PopupManager.js.map +1 -1
- package/dist/services/TmuxService.d.ts +15 -1
- package/dist/services/TmuxService.d.ts.map +1 -1
- package/dist/services/TmuxService.js +29 -3
- package/dist/services/TmuxService.js.map +1 -1
- package/dist/services/WorktreeCleanupService.d.ts +22 -0
- package/dist/services/WorktreeCleanupService.d.ts.map +1 -0
- package/dist/services/WorktreeCleanupService.js +80 -0
- package/dist/services/WorktreeCleanupService.js.map +1 -0
- package/dist/types.d.ts +9 -3
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/agentDetection.d.ts +15 -8
- package/dist/utils/agentDetection.d.ts.map +1 -1
- package/dist/utils/agentDetection.js +49 -73
- package/dist/utils/agentDetection.js.map +1 -1
- package/dist/utils/agentLaunch.d.ts +63 -1
- package/dist/utils/agentLaunch.d.ts.map +1 -1
- package/dist/utils/agentLaunch.js +497 -24
- package/dist/utils/agentLaunch.js.map +1 -1
- package/dist/utils/agentPromptDispatch.d.ts +33 -0
- package/dist/utils/agentPromptDispatch.d.ts.map +1 -0
- package/dist/utils/agentPromptDispatch.js +99 -0
- package/dist/utils/agentPromptDispatch.js.map +1 -0
- package/dist/utils/asciiArt.d.ts.map +1 -1
- package/dist/utils/asciiArt.js +6 -7
- package/dist/utils/asciiArt.js.map +1 -1
- package/dist/utils/attachAgent.d.ts +21 -0
- package/dist/utils/attachAgent.d.ts.map +1 -0
- package/dist/utils/attachAgent.js +128 -0
- package/dist/utils/attachAgent.js.map +1 -0
- package/dist/utils/conflictResolutionPane.d.ts +2 -1
- package/dist/utils/conflictResolutionPane.d.ts.map +1 -1
- package/dist/utils/conflictResolutionPane.js +69 -36
- package/dist/utils/conflictResolutionPane.js.map +1 -1
- package/dist/utils/devSource.d.ts +7 -0
- package/dist/utils/devSource.d.ts.map +1 -0
- package/dist/utils/devSource.js +19 -0
- package/dist/utils/devSource.js.map +1 -0
- package/dist/utils/devWatchCommand.d.ts +8 -0
- package/dist/utils/devWatchCommand.d.ts.map +1 -0
- package/dist/utils/devWatchCommand.js +14 -0
- package/dist/utils/devWatchCommand.js.map +1 -0
- package/dist/utils/dirScanner.d.ts +30 -0
- package/dist/utils/dirScanner.d.ts.map +1 -0
- package/dist/utils/dirScanner.js +99 -0
- package/dist/utils/dirScanner.js.map +1 -0
- package/dist/utils/geminiTrust.d.ts +8 -0
- package/dist/utils/geminiTrust.d.ts.map +1 -0
- package/dist/utils/geminiTrust.js +67 -0
- package/dist/utils/geminiTrust.js.map +1 -0
- package/dist/utils/generated-agents-doc.d.ts +1 -1
- package/dist/utils/generated-agents-doc.js +3 -3
- package/dist/utils/git.d.ts +13 -0
- package/dist/utils/git.d.ts.map +1 -1
- package/dist/utils/git.js +20 -0
- package/dist/utils/git.js.map +1 -1
- package/dist/utils/hooks.js +1 -1
- package/dist/utils/hooks.js.map +1 -1
- package/dist/utils/hooksDocs.d.ts +2 -9
- package/dist/utils/hooksDocs.d.ts.map +1 -1
- package/dist/utils/hooksDocs.js +26 -6
- package/dist/utils/hooksDocs.js.map +1 -1
- package/dist/utils/mergeExecution.d.ts.map +1 -1
- package/dist/utils/mergeExecution.js +6 -3
- package/dist/utils/mergeExecution.js.map +1 -1
- package/dist/utils/paneCreation.d.ts +8 -2
- package/dist/utils/paneCreation.d.ts.map +1 -1
- package/dist/utils/paneCreation.js +129 -80
- package/dist/utils/paneCreation.js.map +1 -1
- package/dist/utils/paneGrouping.d.ts.map +1 -1
- package/dist/utils/paneGrouping.js +30 -0
- package/dist/utils/paneGrouping.js.map +1 -1
- package/dist/utils/projectActions.d.ts +5 -0
- package/dist/utils/projectActions.d.ts.map +1 -1
- package/dist/utils/projectActions.js +15 -4
- package/dist/utils/projectActions.js.map +1 -1
- package/dist/utils/promptStore.d.ts +7 -0
- package/dist/utils/promptStore.d.ts.map +1 -0
- package/dist/utils/promptStore.js +75 -0
- package/dist/utils/promptStore.js.map +1 -0
- package/dist/utils/reopenWorktree.d.ts +1 -1
- package/dist/utils/reopenWorktree.d.ts.map +1 -1
- package/dist/utils/reopenWorktree.js +26 -27
- package/dist/utils/reopenWorktree.js.map +1 -1
- package/dist/utils/runtimePaths.d.ts +2 -0
- package/dist/utils/runtimePaths.d.ts.map +1 -0
- package/dist/utils/runtimePaths.js +8 -0
- package/dist/utils/runtimePaths.js.map +1 -0
- package/dist/utils/settingsManager.d.ts.map +1 -1
- package/dist/utils/settingsManager.js +96 -4
- package/dist/utils/settingsManager.js.map +1 -1
- package/dist/utils/systemCheck.d.ts.map +1 -1
- package/dist/utils/systemCheck.js +0 -13
- package/dist/utils/systemCheck.js.map +1 -1
- package/dist/utils/welcomePane.d.ts +2 -1
- package/dist/utils/welcomePane.d.ts.map +1 -1
- package/dist/utils/welcomePane.js +3 -2
- package/dist/utils/welcomePane.js.map +1 -1
- package/dist/utils/welcomePaneManager.js +1 -1
- package/dist/utils/welcomePaneManager.js.map +1 -1
- package/dist/workers/PaneWorker.js.map +1 -1
- package/dist/workers/WorkerMessages.d.ts +2 -1
- package/dist/workers/WorkerMessages.d.ts.map +1 -1
- package/dist/workers/WorkerMessages.js.map +1 -1
- package/dist/workers/updateChecker.js +21 -6
- package/dist/workers/updateChecker.js.map +1 -1
- package/package.json +14 -12
- package/dist/components/popups/remotePopup.d.ts +0 -6
- package/dist/components/popups/remotePopup.d.ts.map +0 -1
- package/dist/components/popups/remotePopup.js +0 -166
- package/dist/components/popups/remotePopup.js.map +0 -1
- package/dist/hooks/useTunnelManagement.d.ts +0 -18
- package/dist/hooks/useTunnelManagement.d.ts.map +0 -1
- package/dist/hooks/useTunnelManagement.js +0 -55
- package/dist/hooks/useTunnelManagement.js.map +0 -1
- package/dist/server/actionsApi.d.ts +0 -37
- package/dist/server/actionsApi.d.ts.map +0 -1
- package/dist/server/actionsApi.js +0 -256
- package/dist/server/actionsApi.js.map +0 -1
- package/dist/server/index.d.ts +0 -21
- package/dist/server/index.d.ts.map +0 -1
- package/dist/server/index.js +0 -100
- package/dist/server/index.js.map +0 -1
- package/dist/server/routes/actionsRoutes.d.ts +0 -2
- package/dist/server/routes/actionsRoutes.d.ts.map +0 -1
- package/dist/server/routes/actionsRoutes.js +0 -110
- package/dist/server/routes/actionsRoutes.js.map +0 -1
- package/dist/server/routes/healthRoutes.d.ts +0 -13
- package/dist/server/routes/healthRoutes.d.ts.map +0 -1
- package/dist/server/routes/healthRoutes.js +0 -70
- package/dist/server/routes/healthRoutes.js.map +0 -1
- package/dist/server/routes/index.d.ts +0 -8
- package/dist/server/routes/index.d.ts.map +0 -1
- package/dist/server/routes/index.js +0 -67
- package/dist/server/routes/index.js.map +0 -1
- package/dist/server/routes/keysRoutes.d.ts +0 -33
- package/dist/server/routes/keysRoutes.d.ts.map +0 -1
- package/dist/server/routes/keysRoutes.js +0 -128
- package/dist/server/routes/keysRoutes.js.map +0 -1
- package/dist/server/routes/panesRoutes.d.ts +0 -2
- package/dist/server/routes/panesRoutes.d.ts.map +0 -1
- package/dist/server/routes/panesRoutes.js +0 -414
- package/dist/server/routes/panesRoutes.js.map +0 -1
- package/dist/server/routes/settingsRoutes.d.ts +0 -94
- package/dist/server/routes/settingsRoutes.d.ts.map +0 -1
- package/dist/server/routes/settingsRoutes.js +0 -159
- package/dist/server/routes/settingsRoutes.js.map +0 -1
- package/dist/server/routes/streamRoutes.d.ts +0 -18
- package/dist/server/routes/streamRoutes.d.ts.map +0 -1
- package/dist/server/routes/streamRoutes.js +0 -87
- package/dist/server/routes/streamRoutes.js.map +0 -1
- package/dist/server/routes/tunnelRoutes.d.ts +0 -11
- package/dist/server/routes/tunnelRoutes.d.ts.map +0 -1
- package/dist/server/routes/tunnelRoutes.js +0 -28
- package/dist/server/routes/tunnelRoutes.js.map +0 -1
- package/dist/server/routes.d.ts +0 -17
- package/dist/server/routes.d.ts.map +0 -1
- package/dist/server/routes.js +0 -17
- package/dist/server/routes.js.map +0 -1
- package/dist/services/TunnelService.d.ts +0 -10
- package/dist/services/TunnelService.d.ts.map +0 -1
- package/dist/services/TunnelService.js +0 -98
- package/dist/services/TunnelService.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeExecution.js","sourceRoot":"","sources":["../../../src/actions/merge/mergeExecution.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"mergeExecution.js","sourceRoot":"","sources":["../../../src/actions/merge/mergeExecution.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAEtD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gCAAgC,CACpD,IAAc,EACd,OAAsB,EACtB,UAAkB,EAClB,YAAoB,EACpB,QAAyB;IAEzB,MAAM,EAAE,qBAAqB,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAC3D,+BAA+B,CAChC,CAAA;IAED,mCAAmC;IACnC,MAAM,MAAM,GAAG,qBAAqB,CAAC,IAAI,CAAC,YAAa,EAAE,UAAU,CAAC,CAAA;IAEpE,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,qBAAqB,EAAE,CAAC;QACpD,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YACtB,oBAAoB;YACpB,MAAM,EAAE,qBAAqB,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAA;YACxE,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAC1C,IAAI,CAAC,YAAa,EAClB,MAAM,CAAC,aAAa,IAAI,EAAE,CAC3B,CAAA;YAED,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACrB,gDAAgD;gBAChD,MAAM,cAAc,GAAG,aAAa,CAClC,IAAI,CAAC,YAAa,EAClB,kCAAkC,CACnC,CAAA;gBAED,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC;oBAC3B,0CAA0C;oBAC1C,OAAO,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;gBAC9D,CAAC;qBAAM,CAAC;oBACN,OAAO;wBACL,IAAI,EAAE,OAAO;wBACb,OAAO,EAAE,6BAA6B,cAAc,CAAC,KAAK,EAAE;wBAC5D,WAAW,EAAE,IAAI;qBAClB,CAAA;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,2CAA2C;gBAC3C,OAAO;oBACL,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,iBAAiB;oBACxB,OAAO,EAAE,qCAAqC,QAAQ,CAAC,WAAW,CAAC,IAAI,CACrE,IAAI,CACL,6BAA6B;oBAC9B,WAAW,EAAE,IAAI;iBAClB,CAAA;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,mCAAmC;YACnC,OAAO;gBACL,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,4BAA4B;gBACnC,OAAO,EAAE,iBAAiB,MAAM,CAAC,aAAa,EAAE,IAAI,CAClD,IAAI,CACL,+CAA+C;gBAChD,YAAY,EAAE,IAAI,CAAC,EAAE;gBACrB,WAAW,EAAE,IAAI;aAClB,CAAA;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,OAAO;YACL,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,iBAAiB,MAAM,CAAC,KAAK,EAAE;YACxC,WAAW,EAAE,IAAI;SAClB,CAAA;IACH,CAAC;IAED,4CAA4C;IAC5C,OAAO,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;AAC9D,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,IAAc,EACd,OAAsB,EACtB,UAAkB,EAClB,YAAoB,EACpB,oBAA6B,KAAK;IAElC,MAAM,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,GAAG,MAAM,MAAM,CACnE,+BAA+B,CAChC,CAAA;IAED,wEAAwE;IACxE,gFAAgF;IAChF,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,qBAAqB,CAAC,IAAI,CAAC,YAAa,EAAE,UAAU,CAAC,CAAA;QAEnE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACnB,2DAA2D;YAC3D,IACE,KAAK,CAAC,qBAAqB;gBAC3B,KAAK,CAAC,aAAa;gBACnB,KAAK,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAC9B,CAAC;gBACD,sCAAsC;gBACtC,OAAO;oBACL,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE,0BAA0B;oBACjC,OAAO,EAAE,oCAAoC,UAAU,oBAAoB,KAAK,CAAC,aAAa;yBAC3F,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;yBACX,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC/D,OAAO,EAAE;wBACP;4BACE,EAAE,EAAE,UAAU;4BACd,KAAK,EAAE,uBAAuB;4BAC9B,WAAW,EAAE,4CAA4C;4BACzD,OAAO,EAAE,IAAI;yBACd;wBACD;4BACE,EAAE,EAAE,cAAc;4BAClB,KAAK,EAAE,mBAAmB;4BAC1B,WAAW,EAAE,wCAAwC;yBACtD;wBACD;4BACE,EAAE,EAAE,OAAO;4BACX,KAAK,EAAE,aAAa;4BACpB,WAAW,EAAE,qBAAqB;yBACnC;qBACF;oBACD,QAAQ,EAAE,KAAK,EAAE,QAAgB,EAAE,EAAE;wBACnC,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;4BACzB,kBAAkB;4BAClB,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CACjC,+BAA+B,CAChC,CAAA;4BACD,UAAU,CAAC,IAAI,CAAC,YAAa,CAAC,CAAA;4BAC9B,OAAO;gCACL,IAAI,EAAE,MAAM;gCACZ,OAAO,EAAE,eAAe;gCACxB,WAAW,EAAE,IAAI;6BAClB,CAAA;wBACH,CAAC;wBAED,IAAI,QAAQ,KAAK,cAAc,EAAE,CAAC;4BAChC,gDAAgD;4BAChD,OAAO;gCACL,IAAI,EAAE,YAAY;gCAClB,KAAK,EAAE,4BAA4B;gCACnC,OAAO,EAAE,iBAAiB,KAAK,CAAC,aAAa,EAAE,IAAI,CACjD,IAAI,CACL,+CAA+C;gCAChD,YAAY,EAAE,IAAI,CAAC,EAAE;gCACrB,WAAW,EAAE,IAAI;6BAClB,CAAA;wBACH,CAAC;wBAED,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;4BAC5B,0CAA0C;4BAC1C,MAAM,EAAE,oCAAoC,EAAE,GAAG,MAAM,MAAM,CAC3D,yBAAyB,CAC1B,CAAA;4BACD,OAAO,oCAAoC,CACzC,IAAI,EACJ,OAAO,EACP,UAAU,EACV,YAAY,CACb,CAAA;wBACH,CAAC;wBAED,OAAO;4BACL,IAAI,EAAE,MAAM;4BACZ,OAAO,EAAE,gBAAgB;4BACzB,WAAW,EAAE,IAAI;yBAClB,CAAA;oBACH,CAAC;oBACD,WAAW,EAAE,IAAI;iBAClB,CAAA;YACH,CAAC;YAED,4DAA4D;YAC5D,OAAO;gBACL,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,cAAc;gBACrB,OAAO,EAAE,mBAAmB,UAAU,mBAAmB,KAAK,CAAC,KAAK,EAAE;gBACtE,WAAW,EAAE,IAAI;aAClB,CAAA;QACH,CAAC;IACH,CAAC;IAED,gEAAgE;IAChE,MAAM,KAAK,GAAG,qBAAqB,CAAC,YAAY,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAA;IAE1E,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QACnB,OAAO;YACL,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,cAAc;YACrB,OAAO,EAAE,wBAAwB,UAAU,KAAK,KAAK,CAAC,KAAK,EAAE;YAC7D,WAAW,EAAE,IAAI;SAClB,CAAA;IACH,CAAC;IAED,iDAAiD;IACjD,OAAO,CAAC,KAAK,CACX,yDAAyD,IAAI,CAAC,IAAI,EAAE,CACrE,CAAA;IACD,MAAM,WAAW,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE;QAClD,kBAAkB,EAAE,UAAU;KAC/B,CAAC,CAAA;IACF,OAAO,CAAC,KAAK,CAAC,kDAAkD,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IAE5E,6EAA6E;IAC7E,kEAAkE;IAClE,qFAAqF;IACrF,4CAA4C;IAC5C,gDAAgD;IAChD,2CAA2C;IAC3C,OAAO,CAAC,KAAK,CACX,uCAAuC,IAAI,CAAC,IAAI,yCAAyC,CAC1F,CAAA;IACD,OAAO,CAAC,KAAK,CACX,gCAAgC,OAAO,CAAC,KAAK,CAAC,MAAM,WAAW,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACzG,CAAA;IACD,OAAO,CAAC,KAAK,CACX,mCAAmC,IAAI,CAAC,EAAE,WAAW,IAAI,CAAC,IAAI,GAAG,CAClE,CAAA;IAED,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,mCAAmC,CAAC,CAAA;IACvE,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IAClD,OAAO,CAAC,KAAK,CACX,oDAAoD,WAAW,CAAC,IAAI,EAAE,CACvE,CAAA;IACD,OAAO,WAAW,CAAA;AACpB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multiMergeOrchestrator.d.ts","sourceRoot":"","sources":["../../../src/actions/merge/multiMergeOrchestrator.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAoB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"multiMergeOrchestrator.d.ts","sourceRoot":"","sources":["../../../src/actions/merge/multiMergeOrchestrator.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAoB,MAAM,YAAY,CAAC;AAUjF;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,SAAS,EAAE,YAAY,EAAE,GACxB,OAAO,CAAC,cAAc,EAAE,CAAC,CA6B3B;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,cAAc,EAAE,GACtB,OAAO,CAAC,YAAY,CAAC,CAGvB"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
* dialog handling and error recovery.
|
|
6
6
|
*/
|
|
7
7
|
import { getWorktreeDisplayLabel } from '../../utils/worktreeDiscovery.js';
|
|
8
|
+
import { getAgentDescription, getAgentLabel, isAgentName, } from '../../utils/agentLaunch.js';
|
|
8
9
|
/**
|
|
9
10
|
* Build the merge queue from detected worktrees
|
|
10
11
|
* - Runs validation on each worktree
|
|
@@ -203,7 +204,7 @@ async function handleMainDirtyForWorktree(item, progressPrefix, mainBranch, retr
|
|
|
203
204
|
return {
|
|
204
205
|
type: 'choice',
|
|
205
206
|
title: `${progressPrefix}: Main Branch Has Changes`,
|
|
206
|
-
message: `${mainBranch} in ${worktree.repoName} has uncommitted changes
|
|
207
|
+
message: `${mainBranch} in ${worktree.repoName} has uncommitted changes. Review files below, then choose how to proceed.`,
|
|
207
208
|
options: [
|
|
208
209
|
{
|
|
209
210
|
id: 'commit_automatic',
|
|
@@ -227,6 +228,13 @@ async function handleMainDirtyForWorktree(item, progressPrefix, mainBranch, retr
|
|
|
227
228
|
description: 'Continue with other repositories',
|
|
228
229
|
},
|
|
229
230
|
],
|
|
231
|
+
data: {
|
|
232
|
+
kind: 'merge_uncommitted',
|
|
233
|
+
repoPath: worktree.parentRepoPath,
|
|
234
|
+
targetBranch: mainBranch,
|
|
235
|
+
files,
|
|
236
|
+
diffMode: 'working-tree',
|
|
237
|
+
},
|
|
230
238
|
onSelect: async (optionId) => {
|
|
231
239
|
if (optionId === 'skip') {
|
|
232
240
|
return onComplete(false, 'skipped');
|
|
@@ -253,7 +261,7 @@ async function handleUncommittedForWorktree(item, progressPrefix, retryMerge, on
|
|
|
253
261
|
return {
|
|
254
262
|
type: 'choice',
|
|
255
263
|
title: `${progressPrefix}: Uncommitted Changes`,
|
|
256
|
-
message: `${worktree.repoName} worktree has uncommitted changes
|
|
264
|
+
message: `${worktree.repoName} worktree has uncommitted changes. Review files below, then choose how to proceed.`,
|
|
257
265
|
options: [
|
|
258
266
|
{
|
|
259
267
|
id: 'commit_automatic',
|
|
@@ -277,6 +285,13 @@ async function handleUncommittedForWorktree(item, progressPrefix, retryMerge, on
|
|
|
277
285
|
description: 'Continue with other repositories',
|
|
278
286
|
},
|
|
279
287
|
],
|
|
288
|
+
data: {
|
|
289
|
+
kind: 'merge_uncommitted',
|
|
290
|
+
repoPath: worktree.worktreePath,
|
|
291
|
+
targetBranch: validation.mainBranch,
|
|
292
|
+
files,
|
|
293
|
+
diffMode: 'target-branch',
|
|
294
|
+
},
|
|
280
295
|
onSelect: async (optionId) => {
|
|
281
296
|
if (optionId === 'skip') {
|
|
282
297
|
return onComplete(false, 'skipped');
|
|
@@ -354,19 +369,16 @@ async function handleConflictForWorktree(pane, context, item, progressPrefix, ma
|
|
|
354
369
|
async function launchConflictResolutionForSubWorktree(pane, context, item, queue, currentIndex, result, onComplete) {
|
|
355
370
|
const { worktree, validation } = item;
|
|
356
371
|
const { mainBranch } = validation;
|
|
357
|
-
// Check which agents are available
|
|
358
|
-
const {
|
|
359
|
-
const
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
availableAgents.push('opencode');
|
|
364
|
-
if (await findCodexCommand())
|
|
365
|
-
availableAgents.push('codex');
|
|
372
|
+
// Check which agents are available and enabled
|
|
373
|
+
const { filterEnabledAgents, getInstalledAgents } = await import('../../utils/agentDetection.js');
|
|
374
|
+
const { SettingsManager } = await import('../../utils/settingsManager.js');
|
|
375
|
+
const settings = new SettingsManager(worktree.parentRepoPath).getSettings();
|
|
376
|
+
const installedAgents = await getInstalledAgents();
|
|
377
|
+
const availableAgents = filterEnabledAgents(installedAgents, settings.enabledAgents);
|
|
366
378
|
if (availableAgents.length === 0) {
|
|
367
379
|
return {
|
|
368
380
|
type: 'error',
|
|
369
|
-
message: 'No AI agents available.
|
|
381
|
+
message: 'No enabled AI agents available. Enable an agent in Settings > Enabled Agents.',
|
|
370
382
|
dismissable: true,
|
|
371
383
|
};
|
|
372
384
|
}
|
|
@@ -382,11 +394,18 @@ async function launchConflictResolutionForSubWorktree(pane, context, item, queue
|
|
|
382
394
|
message: `Which agent should resolve conflicts in ${worktree.repoName}?`,
|
|
383
395
|
options: availableAgents.map(agent => ({
|
|
384
396
|
id: agent,
|
|
385
|
-
label: agent
|
|
386
|
-
description: agent
|
|
397
|
+
label: getAgentLabel(agent),
|
|
398
|
+
description: getAgentDescription(agent),
|
|
387
399
|
default: agent === 'claude',
|
|
388
400
|
})),
|
|
389
401
|
onSelect: async (agentId) => {
|
|
402
|
+
if (!isAgentName(agentId)) {
|
|
403
|
+
return {
|
|
404
|
+
type: 'error',
|
|
405
|
+
message: `Unsupported agent: ${agentId}`,
|
|
406
|
+
dismissable: true,
|
|
407
|
+
};
|
|
408
|
+
}
|
|
390
409
|
return createPaneWithAgent(agentId);
|
|
391
410
|
},
|
|
392
411
|
dismissable: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multiMergeOrchestrator.js","sourceRoot":"","sources":["../../../src/actions/merge/multiMergeOrchestrator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"multiMergeOrchestrator.js","sourceRoot":"","sources":["../../../src/actions/merge/multiMergeOrchestrator.ts"],"names":[],"mappings":"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"}
|
package/dist/actions/types.d.ts
CHANGED
|
@@ -63,6 +63,7 @@ export type ActionFunction = (pane: DmuxPane, context: ActionContext, params?: a
|
|
|
63
63
|
*/
|
|
64
64
|
export declare enum PaneAction {
|
|
65
65
|
VIEW = "view",
|
|
66
|
+
SET_SOURCE = "set_source",
|
|
66
67
|
CLOSE = "close",
|
|
67
68
|
MERGE = "merge",
|
|
68
69
|
RENAME = "rename",
|
|
@@ -72,7 +73,8 @@ export declare enum PaneAction {
|
|
|
72
73
|
OPEN_OUTPUT = "open_output",
|
|
73
74
|
COPY_PATH = "copy_path",
|
|
74
75
|
OPEN_IN_EDITOR = "open_in_editor",
|
|
75
|
-
TOGGLE_AUTOPILOT = "toggle_autopilot"
|
|
76
|
+
TOGGLE_AUTOPILOT = "toggle_autopilot",
|
|
77
|
+
ATTACH_AGENT = "attach_agent"
|
|
76
78
|
}
|
|
77
79
|
/**
|
|
78
80
|
* Action metadata for UI generation
|
|
@@ -98,5 +100,5 @@ export declare const ACTION_REGISTRY: Record<PaneAction, ActionMetadata>;
|
|
|
98
100
|
/**
|
|
99
101
|
* Get available actions for a pane based on its state
|
|
100
102
|
*/
|
|
101
|
-
export declare function getAvailableActions(pane: DmuxPane, projectSettings?: any): ActionMetadata[];
|
|
103
|
+
export declare function getAvailableActions(pane: DmuxPane, projectSettings?: any, isDevMode?: boolean): ActionMetadata[];
|
|
102
104
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/actions/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE5C;;GAEG;AACH,MAAM,MAAM,gBAAgB,GACxB,SAAS,GACT,OAAO,GACP,SAAS,GACT,QAAQ,GACR,OAAO,GACP,MAAM,GACN,UAAU,GACV,YAAY,CAAC;AAEjB;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,gBAAgB,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IAGf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC;IACxC,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC;IAGvC,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IACzB,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAGvD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAGpD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAGlB,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAGhD,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,CAAC;IACxC,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1D;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,CAC3B,IAAI,EAAE,QAAQ,EACd,OAAO,EAAE,aAAa,EACtB,MAAM,CAAC,EAAE,GAAG,KACT,OAAO,CAAC,YAAY,CAAC,CAAC;AAE3B;;GAEG;AACH,oBAAY,UAAU;IACpB,IAAI,SAAS;IACb,KAAK,UAAU;IACf,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,SAAS,cAAc;IACvB,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,WAAW,gBAAgB;IAC3B,SAAS,cAAc;IACvB,cAAc,mBAAmB;IACjC,gBAAgB,qBAAqB;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/actions/types.ts"],"names":[],"mappings":"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"}
|
package/dist/actions/types.js
CHANGED
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
export var PaneAction;
|
|
12
12
|
(function (PaneAction) {
|
|
13
13
|
PaneAction["VIEW"] = "view";
|
|
14
|
+
PaneAction["SET_SOURCE"] = "set_source";
|
|
14
15
|
PaneAction["CLOSE"] = "close";
|
|
15
16
|
PaneAction["MERGE"] = "merge";
|
|
16
17
|
PaneAction["RENAME"] = "rename";
|
|
@@ -21,6 +22,7 @@ export var PaneAction;
|
|
|
21
22
|
PaneAction["COPY_PATH"] = "copy_path";
|
|
22
23
|
PaneAction["OPEN_IN_EDITOR"] = "open_in_editor";
|
|
23
24
|
PaneAction["TOGGLE_AUTOPILOT"] = "toggle_autopilot";
|
|
25
|
+
PaneAction["ATTACH_AGENT"] = "attach_agent";
|
|
24
26
|
})(PaneAction || (PaneAction = {}));
|
|
25
27
|
/**
|
|
26
28
|
* Registry of all available actions with metadata
|
|
@@ -33,6 +35,13 @@ export const ACTION_REGISTRY = {
|
|
|
33
35
|
icon: '👁',
|
|
34
36
|
shortcut: 'j',
|
|
35
37
|
},
|
|
38
|
+
[PaneAction.SET_SOURCE]: {
|
|
39
|
+
id: PaneAction.SET_SOURCE,
|
|
40
|
+
label: '[DEV] Toggle Source (Pane/Root)',
|
|
41
|
+
description: 'Toggle between this pane as source and project root',
|
|
42
|
+
icon: 'S',
|
|
43
|
+
requires: { worktree: true },
|
|
44
|
+
},
|
|
36
45
|
[PaneAction.CLOSE]: {
|
|
37
46
|
id: PaneAction.CLOSE,
|
|
38
47
|
label: 'Close',
|
|
@@ -104,6 +113,13 @@ export const ACTION_REGISTRY = {
|
|
|
104
113
|
label: 'Toggle Autopilot',
|
|
105
114
|
description: 'Enable/disable automatic option acceptance',
|
|
106
115
|
icon: '🤖',
|
|
116
|
+
requires: { worktree: true },
|
|
117
|
+
},
|
|
118
|
+
[PaneAction.ATTACH_AGENT]: {
|
|
119
|
+
id: PaneAction.ATTACH_AGENT,
|
|
120
|
+
label: 'Add Agent to Worktree',
|
|
121
|
+
description: 'Add another agent to this worktree',
|
|
122
|
+
icon: '+',
|
|
107
123
|
shortcut: 'a',
|
|
108
124
|
requires: { worktree: true },
|
|
109
125
|
},
|
|
@@ -116,10 +132,12 @@ const HIDDEN_MENU_ACTIONS = new Set([
|
|
|
116
132
|
/**
|
|
117
133
|
* Get available actions for a pane based on its state
|
|
118
134
|
*/
|
|
119
|
-
export function getAvailableActions(pane, projectSettings) {
|
|
135
|
+
export function getAvailableActions(pane, projectSettings, isDevMode = false) {
|
|
120
136
|
return Object.values(ACTION_REGISTRY).filter(action => {
|
|
121
137
|
if (HIDDEN_MENU_ACTIONS.has(action.id))
|
|
122
138
|
return false;
|
|
139
|
+
if (action.id === PaneAction.SET_SOURCE && !isDevMode)
|
|
140
|
+
return false;
|
|
123
141
|
if (!action.requires)
|
|
124
142
|
return true;
|
|
125
143
|
const { worktree, testCommand, devCommand, runningProcess } = action.requires;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/actions/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAuFH;;GAEG;AACH,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/actions/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
+
import { type AgentName } from '../../utils/agentLaunch.js';
|
|
2
3
|
interface AgentChoiceDialogProps {
|
|
3
|
-
agentChoice:
|
|
4
|
+
agentChoice: AgentName | null;
|
|
4
5
|
}
|
|
5
6
|
declare const AgentChoiceDialog: React.FC<AgentChoiceDialogProps>;
|
|
6
7
|
export default AgentChoiceDialog;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AgentChoiceDialog.d.ts","sourceRoot":"","sources":["../../../src/components/dialogs/AgentChoiceDialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"AgentChoiceDialog.d.ts","sourceRoot":"","sources":["../../../src/components/dialogs/AgentChoiceDialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAEL,KAAK,SAAS,EACf,MAAM,4BAA4B,CAAC;AAEpC,UAAU,sBAAsB;IAC9B,WAAW,EAAE,SAAS,GAAG,IAAI,CAAC;CAC/B;AAED,QAAA,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAiBvD,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { Box, Text } from 'ink';
|
|
3
|
+
import { getAgentDefinitions, } from '../../utils/agentLaunch.js';
|
|
3
4
|
const AgentChoiceDialog = ({ agentChoice }) => {
|
|
5
|
+
const agents = getAgentDefinitions();
|
|
4
6
|
return (React.createElement(Box, { borderStyle: "round", borderColor: "cyan", paddingX: 1, marginTop: 1 },
|
|
5
7
|
React.createElement(Box, { flexDirection: "column" },
|
|
6
|
-
React.createElement(Text, null, "Select agent (\
|
|
7
|
-
React.createElement(Box, { marginTop: 1, gap: 3 },
|
|
8
|
-
React.createElement(Text, { color: agentChoice === 'claude' ? 'cyan' : 'white' }, agentChoice === 'claude' ? '▶ Claude Code' : ' Claude Code'),
|
|
9
|
-
React.createElement(Text, { color: agentChoice === 'opencode' ? 'cyan' : 'white' }, agentChoice === 'opencode' ? '▶ opencode' : ' opencode'),
|
|
10
|
-
React.createElement(Text, { color: agentChoice === 'codex' ? 'cyan' : 'white' }, agentChoice === 'codex' ? '▶ Codex' : ' Codex')))));
|
|
8
|
+
React.createElement(Text, null, "Select agent (\u2191/\u2193, Enter, ESC):"),
|
|
9
|
+
React.createElement(Box, { marginTop: 1, gap: 3 }, agents.map((agent) => (React.createElement(Text, { key: agent.id, color: agentChoice === agent.id ? 'cyan' : 'white' }, agentChoice === agent.id ? `▶ ${agent.name}` : ` ${agent.name}`)))))));
|
|
11
10
|
};
|
|
12
11
|
export default AgentChoiceDialog;
|
|
13
12
|
//# sourceMappingURL=AgentChoiceDialog.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AgentChoiceDialog.js","sourceRoot":"","sources":["../../../src/components/dialogs/AgentChoiceDialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"AgentChoiceDialog.js","sourceRoot":"","sources":["../../../src/components/dialogs/AgentChoiceDialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EACL,mBAAmB,GAEpB,MAAM,4BAA4B,CAAC;AAMpC,MAAM,iBAAiB,GAAqC,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE;IAC9E,MAAM,MAAM,GAAG,mBAAmB,EAAE,CAAC;IAErC,OAAO,CACL,oBAAC,GAAG,IAAC,WAAW,EAAC,OAAO,EAAC,WAAW,EAAC,MAAM,EAAC,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC;QACnE,oBAAC,GAAG,IAAC,aAAa,EAAC,QAAQ;YACzB,oBAAC,IAAI,oDAAuC;YAC5C,oBAAC,GAAG,IAAC,SAAS,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,IACtB,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CACrB,oBAAC,IAAI,IAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,WAAW,KAAK,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,IACpE,WAAW,KAAK,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,IAAI,EAAE,CAC5D,CACR,CAAC,CACE,CACF,CACF,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SettingsDialog.d.ts","sourceRoot":"","sources":["../../../src/components/dialogs/SettingsDialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAiB,MAAM,gBAAgB,CAAC;AAErF,UAAU,mBAAmB;IAC3B,QAAQ,EAAE,YAAY,CAAC;IACvB,cAAc,EAAE,YAAY,CAAC;IAC7B,eAAe,EAAE,YAAY,CAAC;IAC9B,kBAAkB,EAAE,iBAAiB,EAAE,CAAC;IACxC,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,YAAY,CAAC;IAChC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,QAAA,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"SettingsDialog.d.ts","sourceRoot":"","sources":["../../../src/components/dialogs/SettingsDialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAiB,MAAM,gBAAgB,CAAC;AAErF,UAAU,mBAAmB;IAC3B,QAAQ,EAAE,YAAY,CAAC;IACvB,cAAc,EAAE,YAAY,CAAC;IAC7B,eAAe,EAAE,YAAY,CAAC;IAC9B,kBAAkB,EAAE,iBAAiB,EAAE,CAAC;IACxC,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,YAAY,CAAC;IAChC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,QAAA,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAyJjD,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
|
@@ -37,7 +37,7 @@ const SettingsDialog = ({ settings, globalSettings, projectSettings, settingDefi
|
|
|
37
37
|
displayValue = option?.label || 'none';
|
|
38
38
|
}
|
|
39
39
|
else {
|
|
40
|
-
displayValue = String(currentValue);
|
|
40
|
+
displayValue = String(currentValue) || 'none';
|
|
41
41
|
}
|
|
42
42
|
scopeLabel = isProjectOverride ? ' - project setting' : (isGlobalSetting ? ' - global setting' : '');
|
|
43
43
|
}
|
|
@@ -72,6 +72,8 @@ const SettingsDialog = ({ settings, globalSettings, projectSettings, settingDefi
|
|
|
72
72
|
React.createElement(Text, { color: editingValueIndex === index ? 'cyan' : 'white', bold: editingValueIndex === index },
|
|
73
73
|
editingValueIndex === index ? '▶ ' : ' ',
|
|
74
74
|
option.label)))))),
|
|
75
|
+
currentDef.type === 'text' && (React.createElement(Box, null,
|
|
76
|
+
React.createElement(Text, { dimColor: true }, "(text input \u2014 use settings popup)"))),
|
|
75
77
|
React.createElement(Box, { marginTop: 1 },
|
|
76
78
|
React.createElement(Text, { dimColor: true }, "\u2191\u2193 to navigate \u2022 Enter to select \u2022 ESC to cancel")))),
|
|
77
79
|
mode === 'scope' && currentDef && (React.createElement(React.Fragment, null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SettingsDialog.js","sourceRoot":"","sources":["../../../src/components/dialogs/SettingsDialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAehC,MAAM,cAAc,GAAkC,CAAC,EACrD,QAAQ,EACR,cAAc,EACd,eAAe,EACf,kBAAkB,EAClB,aAAa,EACb,IAAI,EACJ,UAAU,EACV,iBAAiB,GAAG,CAAC,EACrB,UAAU,GAAG,CAAC,GACf,EAAE,EAAE;IACH,kDAAkD;IAClD,MAAM,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAE1F,OAAO,CACL,oBAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,WAAW,EAAC,OAAO,EAAC,WAAW,EAAC,MAAM,EAAC,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC;QAC1F,oBAAC,GAAG,IAAC,YAAY,EAAE,CAAC;YAClB,oBAAC,IAAI,IAAC,IAAI,QAAC,KAAK,EAAC,MAAM,eAAgB,CACnC;QAEL,IAAI,KAAK,MAAM,IAAI,CAClB;YACG,kBAAkB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACrC,MAAM,UAAU,GAAG,KAAK,KAAK,aAAa,CAAC;gBAE3C,oDAAoD;gBACpD,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC1B,OAAO,CACL,oBAAC,GAAG,IAAC,GAAG,EAAE,GAAG,CAAC,GAAG;wBACf,oBAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,UAAU;4BACzD,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;4BACxB,GAAG,CAAC,KAAK,CACL;wBACP,oBAAC,IAAI,IAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,UAAU;4BAC7D,GAAG;4CACC,CACH,CACP,CAAC;gBACJ,CAAC;gBAED,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAyB,CAAC,CAAC;gBAC7D,MAAM,iBAAiB,GAAG,GAAG,CAAC,GAAG,IAAI,eAAe,CAAC;gBACrD,MAAM,eAAe,GAAG,GAAG,CAAC,GAAG,IAAI,cAAc,CAAC;gBAElD,IAAI,YAAoB,CAAC;gBACzB,IAAI,UAAkB,CAAC;gBAEvB,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;oBACxD,YAAY,GAAG,MAAM,CAAC;oBACtB,UAAU,GAAG,EAAE,CAAC;gBAClB,CAAC;qBAAM,CAAC;oBACN,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;wBAC3B,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;oBAC7C,CAAC;yBAAM,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;wBAChD,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,YAAY,CAAC,CAAC;wBAC/D,YAAY,GAAG,MAAM,EAAE,KAAK,IAAI,MAAM,CAAC;oBACzC,CAAC;yBAAM,CAAC;wBACN,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"SettingsDialog.js","sourceRoot":"","sources":["../../../src/components/dialogs/SettingsDialog.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MergePane.d.ts","sourceRoot":"","sources":["../../../src/components/panes/MergePane.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"MergePane.d.ts","sourceRoot":"","sources":["../../../src/components/panes/MergePane.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAQhE,UAAU,cAAc;IACtB,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACpB;AAuBD,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,cAAc,qBAiW3F"}
|
|
@@ -2,6 +2,8 @@ import React, { useState, useEffect } from 'react';
|
|
|
2
2
|
import { Box, Text, useInput, useApp } from 'ink';
|
|
3
3
|
import { execSync } from 'child_process';
|
|
4
4
|
import CleanTextInput from '../inputs/CleanTextInput.js';
|
|
5
|
+
import { SettingsManager } from '../../utils/settingsManager.js';
|
|
6
|
+
import { getPermissionFlags } from '../../utils/agentLaunch.js';
|
|
5
7
|
export default function MergePane({ pane, onComplete, onCancel, mainBranch }) {
|
|
6
8
|
const { exit } = useApp();
|
|
7
9
|
const [status, setStatus] = useState('checking');
|
|
@@ -124,7 +126,8 @@ export default function MergePane({ pane, onComplete, onCancel, mainBranch }) {
|
|
|
124
126
|
}
|
|
125
127
|
// Step 4: Attempt merge in the main repository
|
|
126
128
|
setStatus('merging');
|
|
127
|
-
const
|
|
129
|
+
const mergeBranch = pane.branchName || pane.slug;
|
|
130
|
+
const mergeResult = runCommand(`git merge "${mergeBranch}" --no-ff`, mainRepoPath);
|
|
128
131
|
if (!mergeResult.success) {
|
|
129
132
|
// Check if it's a merge conflict
|
|
130
133
|
if (mergeResult.error?.includes('Automatic merge failed') || checkForConflicts(mainRepoPath)) {
|
|
@@ -152,11 +155,19 @@ export default function MergePane({ pane, onComplete, onCancel, mainBranch }) {
|
|
|
152
155
|
const mainRepoPath = pane.worktreePath?.replace(/\/\.dmux\/worktrees\/[^/]+$/, '');
|
|
153
156
|
// Exit the app and launch agent with conflict resolution prompt
|
|
154
157
|
const fullPrompt = agentPrompt || `Fix the merge conflicts in the following files: ${conflictFiles.join(', ')}. Resolve them appropriately based on the changes from branch ${pane.slug} (${pane.prompt}) and ensure the code remains functional.`;
|
|
158
|
+
const escapedPrompt = fullPrompt
|
|
159
|
+
.replace(/\\/g, '\\\\')
|
|
160
|
+
.replace(/"/g, '\\"')
|
|
161
|
+
.replace(/`/g, '\\`')
|
|
162
|
+
.replace(/\$/g, '\\$');
|
|
155
163
|
// Clear screen and exit
|
|
156
164
|
process.stdout.write('\x1b[2J\x1b[H');
|
|
157
165
|
// Launch Claude to resolve conflicts in the main repository
|
|
158
166
|
try {
|
|
159
|
-
|
|
167
|
+
const settings = new SettingsManager(mainRepoPath || process.cwd()).getSettings();
|
|
168
|
+
const permissionFlags = getPermissionFlags('claude', settings.permissionMode);
|
|
169
|
+
const permissionSuffix = permissionFlags ? ` ${permissionFlags}` : '';
|
|
170
|
+
execSync(`claude "${escapedPrompt}"${permissionSuffix}`, {
|
|
160
171
|
stdio: 'inherit',
|
|
161
172
|
cwd: mainRepoPath || process.cwd()
|
|
162
173
|
});
|
|
@@ -164,7 +175,7 @@ export default function MergePane({ pane, onComplete, onCancel, mainBranch }) {
|
|
|
164
175
|
catch {
|
|
165
176
|
// Try opencode as fallback
|
|
166
177
|
try {
|
|
167
|
-
execSync(`
|
|
178
|
+
execSync(`opencode --prompt "${escapedPrompt}"`, {
|
|
168
179
|
stdio: 'inherit',
|
|
169
180
|
cwd: mainRepoPath || process.cwd()
|
|
170
181
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MergePane.js","sourceRoot":"","sources":["../../../src/components/panes/MergePane.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"MergePane.js","sourceRoot":"","sources":["../../../src/components/panes/MergePane.tsx"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,8 @@ import React from 'react';
|
|
|
2
2
|
import type { DmuxPane } from '../../types.js';
|
|
3
3
|
interface PaneCardProps {
|
|
4
4
|
pane: DmuxPane;
|
|
5
|
+
isDevSource: boolean;
|
|
5
6
|
selected: boolean;
|
|
6
|
-
isFirstPane: boolean;
|
|
7
|
-
isLastPane: boolean;
|
|
8
|
-
isNextSelected: boolean;
|
|
9
7
|
}
|
|
10
8
|
declare const PaneCard: React.FC<PaneCardProps>;
|
|
11
9
|
export default PaneCard;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PaneCard.d.ts","sourceRoot":"","sources":["../../../src/components/panes/PaneCard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAe,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"PaneCard.d.ts","sourceRoot":"","sources":["../../../src/components/panes/PaneCard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAe,MAAM,OAAO,CAAC;AAGpC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG/C,UAAU,aAAa;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAyBD,QAAA,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAsEpC,CAAC;AAEH,eAAe,QAAQ,CAAC"}
|