hjworktree-cli 2.3.0 → 2.4.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/.context-snapshots/context-snapshot-20260106-211500.md +85 -0
- package/README.md +18 -10
- package/dist/server/socketHandlers.d.ts.map +1 -1
- package/dist/server/socketHandlers.js +19 -18
- package/dist/server/socketHandlers.js.map +1 -1
- package/dist/shared/constants.d.ts +1 -3
- package/dist/shared/constants.d.ts.map +1 -1
- package/dist/shared/constants.js +1 -24
- package/dist/shared/constants.js.map +1 -1
- package/dist/shared/types/index.d.ts +3 -15
- package/dist/shared/types/index.d.ts.map +1 -1
- package/dist/shared/types/index.js +1 -1
- package/dist/shared/types/index.js.map +1 -1
- package/dist/web/assets/index-D-hASqdI.js +53 -0
- package/dist/web/assets/index-D-hASqdI.js.map +1 -0
- package/dist/web/assets/index-Dgl6wRHk.css +32 -0
- package/dist/web/index.html +2 -2
- package/package.json +1 -1
- package/server/socketHandlers.ts +24 -23
- package/shared/constants.ts +1 -27
- package/shared/types/index.ts +6 -21
- package/web/src/App.tsx +8 -6
- package/web/src/components/Layout/LeftNavBar.tsx +6 -17
- package/web/src/components/Modals/AddWorktreeModal.tsx +1 -21
- package/web/src/components/Steps/WorktreeStep.tsx +1 -8
- package/web/src/components/Terminal/SplitTerminalView.tsx +64 -0
- package/web/src/components/Terminal/TerminalPanel.tsx +3 -69
- package/web/src/components/Terminal/XTerminal.tsx +4 -6
- package/web/src/stores/useAppStore.ts +77 -35
- package/web/src/styles/global.css +127 -77
- package/dist/web/assets/index-CsixHL-D.css +0 -32
- package/dist/web/assets/index-De6xm4hO.js +0 -53
- package/dist/web/assets/index-De6xm4hO.js.map +0 -1
- package/web/src/components/Setup/AgentSelector.tsx +0 -27
- package/web/src/components/Steps/AgentStep.tsx +0 -20
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright (c) 2014 The xterm.js authors. All rights reserved.
|
|
3
|
+
* Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
|
|
4
|
+
* https://github.com/chjj/term.js
|
|
5
|
+
* @license MIT
|
|
6
|
+
*
|
|
7
|
+
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
8
|
+
* of this software and associated documentation files (the "Software"), to deal
|
|
9
|
+
* in the Software without restriction, including without limitation the rights
|
|
10
|
+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
11
|
+
* copies of the Software, and to permit persons to whom the Software is
|
|
12
|
+
* furnished to do so, subject to the following conditions:
|
|
13
|
+
*
|
|
14
|
+
* The above copyright notice and this permission notice shall be included in
|
|
15
|
+
* all copies or substantial portions of the Software.
|
|
16
|
+
*
|
|
17
|
+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
18
|
+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
19
|
+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
20
|
+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
21
|
+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
22
|
+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
23
|
+
* THE SOFTWARE.
|
|
24
|
+
*
|
|
25
|
+
* Originally forked from (with the author's permission):
|
|
26
|
+
* Fabrice Bellard's javascript vt100 for jslinux:
|
|
27
|
+
* http://bellard.org/jslinux/
|
|
28
|
+
* Copyright (c) 2011 Fabrice Bellard
|
|
29
|
+
* The original design remains. The terminal itself
|
|
30
|
+
* has been extended to include xterm CSI codes, among
|
|
31
|
+
* other features.
|
|
32
|
+
*/.xterm{cursor:text;position:relative;user-select:none;-ms-user-select:none;-webkit-user-select:none}.xterm.focus,.xterm:focus{outline:none}.xterm .xterm-helpers{position:absolute;top:0;z-index:5}.xterm .xterm-helper-textarea{padding:0;border:0;margin:0;position:absolute;opacity:0;left:-9999em;top:0;width:0;height:0;z-index:-5;white-space:nowrap;overflow:hidden;resize:none}.xterm .composition-view{background:#000;color:#fff;display:none;position:absolute;white-space:nowrap;z-index:1}.xterm .composition-view.active{display:block}.xterm .xterm-viewport{background-color:#000;overflow-y:scroll;cursor:default;position:absolute;right:0;left:0;top:0;bottom:0}.xterm .xterm-screen{position:relative}.xterm .xterm-screen canvas{position:absolute;left:0;top:0}.xterm .xterm-scroll-area{visibility:hidden}.xterm-char-measure-element{display:inline-block;visibility:hidden;position:absolute;top:0;left:-9999em;line-height:normal}.xterm.enable-mouse-events{cursor:default}.xterm.xterm-cursor-pointer,.xterm .xterm-cursor-pointer{cursor:pointer}.xterm.column-select.focus{cursor:crosshair}.xterm .xterm-accessibility:not(.debug),.xterm .xterm-message{position:absolute;left:0;top:0;bottom:0;right:0;z-index:10;color:transparent;pointer-events:none}.xterm .xterm-accessibility-tree:not(.debug) *::selection{color:transparent}.xterm .xterm-accessibility-tree{-webkit-user-select:text;user-select:text;white-space:pre}.xterm .live-region{position:absolute;left:-9999px;width:1px;height:1px;overflow:hidden}.xterm-dim{opacity:1!important}.xterm-underline-1{text-decoration:underline}.xterm-underline-2{text-decoration:double underline}.xterm-underline-3{text-decoration:wavy underline}.xterm-underline-4{text-decoration:dotted underline}.xterm-underline-5{text-decoration:dashed underline}.xterm-overline{text-decoration:overline}.xterm-overline.xterm-underline-1{text-decoration:overline underline}.xterm-overline.xterm-underline-2{text-decoration:overline double underline}.xterm-overline.xterm-underline-3{text-decoration:overline wavy underline}.xterm-overline.xterm-underline-4{text-decoration:overline dotted underline}.xterm-overline.xterm-underline-5{text-decoration:overline dashed underline}.xterm-strikethrough{text-decoration:line-through}.xterm-screen .xterm-decoration-container .xterm-decoration{z-index:6;position:absolute}.xterm-screen .xterm-decoration-container .xterm-decoration.xterm-decoration-top-layer{z-index:7}.xterm-decoration-overview-ruler{z-index:8;position:absolute;top:0;right:0;pointer-events:none}.xterm-decoration-top{z-index:2;position:relative}*{margin:0;padding:0;box-sizing:border-box}:root{--bg-primary: #0d1117;--bg-secondary: #161b22;--bg-tertiary: #21262d;--border-color: #30363d;--text-primary: #c9d1d9;--text-secondary: #8b949e;--text-muted: #6e7681;--accent-blue: #58a6ff;--accent-green: #3fb950;--accent-yellow: #d29922;--accent-red: #f85149;--accent-purple: #a371f7}html,body,#root{height:100%;width:100%}body{font-family:Inter,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,sans-serif;background-color:var(--bg-primary);color:var(--text-primary);line-height:1.5}.app{display:flex;flex-direction:column;height:100vh;overflow:hidden}.header{display:flex;align-items:center;justify-content:space-between;padding:12px 24px;background-color:var(--bg-secondary);border-bottom:1px solid var(--border-color)}.header h1{font-size:18px;font-weight:600;color:var(--text-primary)}.header .project-info{display:flex;align-items:center;gap:12px;color:var(--text-secondary);font-size:13px}.header .project-info .branch{display:flex;align-items:center;gap:4px;color:var(--accent-green)}.main-content{flex:1;display:flex;flex-direction:column;overflow:hidden}.setup-panel{flex:1;display:flex;flex-direction:column;align-items:center;justify-content:center;padding:40px;gap:32px}.setup-panel h2{font-size:24px;font-weight:600;margin-bottom:8px}.setup-panel p{color:var(--text-secondary);font-size:14px}.setup-section{width:100%;max-width:500px;background:var(--bg-secondary);border:1px solid var(--border-color);border-radius:8px;padding:20px}.setup-section label{display:block;font-size:14px;font-weight:500;margin-bottom:8px;color:var(--text-primary)}.setup-section select,.setup-section input{width:100%;padding:10px 12px;border:1px solid var(--border-color);border-radius:6px;background-color:var(--bg-tertiary);color:var(--text-primary);font-size:14px;font-family:inherit}.setup-section select:focus,.setup-section input:focus{outline:none;border-color:var(--accent-blue)}.setup-section .counter{display:flex;align-items:center;gap:16px}.setup-section .counter button{width:40px;height:40px;border:1px solid var(--border-color);border-radius:6px;background-color:var(--bg-tertiary);color:var(--text-primary);font-size:20px;cursor:pointer;transition:all .2s}.setup-section .counter button:hover{background-color:var(--bg-primary);border-color:var(--accent-blue)}.setup-section .counter button:disabled{opacity:.5;cursor:not-allowed}.setup-section .counter span{font-size:24px;font-weight:600;min-width:60px;text-align:center}.execute-button{padding:14px 48px;background-color:var(--accent-green);color:var(--bg-primary);border:none;border-radius:8px;font-size:16px;font-weight:600;cursor:pointer;transition:all .2s}.execute-button:hover{filter:brightness(1.1)}.execute-button:disabled{background-color:var(--bg-tertiary);color:var(--text-muted);cursor:not-allowed}.terminal-panel{display:flex;flex-direction:column;height:100%;overflow:hidden}.terminal-tabs{display:flex;align-items:center;gap:4px;padding:8px 16px;background-color:var(--bg-secondary);border-bottom:1px solid var(--border-color);overflow-x:auto}.terminal-tab{display:flex;align-items:center;gap:8px;padding:8px 16px;background-color:transparent;border:1px solid transparent;border-radius:6px;color:var(--text-secondary);font-size:13px;cursor:pointer;transition:all .2s;white-space:nowrap}.terminal-tab:hover{background-color:var(--bg-tertiary)}.terminal-tab.active{background-color:var(--bg-tertiary);border-color:var(--border-color);color:var(--text-primary)}.terminal-tab .status{width:8px;height:8px;border-radius:50%}.terminal-tab .status.running{background-color:var(--accent-green)}.terminal-tab .status.initializing{background-color:var(--accent-yellow)}.terminal-tab .status.stopped{background-color:var(--text-muted)}.terminal-tab .status.error{background-color:var(--accent-red)}.terminal-tab .close-btn{padding:2px 4px;background:transparent;border:none;color:var(--text-muted);cursor:pointer;border-radius:4px;line-height:1}.terminal-tab .close-btn:hover{background-color:var(--bg-primary);color:var(--accent-red)}.terminal-actions{display:flex;align-items:center;gap:8px;margin-left:auto;padding-left:16px}.terminal-actions button{padding:6px 12px;background-color:transparent;border:1px solid var(--border-color);border-radius:6px;color:var(--text-secondary);font-size:12px;cursor:pointer;transition:all .2s}.terminal-actions button:hover{background-color:var(--bg-tertiary);color:var(--text-primary)}.terminal-actions button.danger:hover{border-color:var(--accent-red);color:var(--accent-red)}.terminal-container{flex:1;position:relative;overflow:hidden}.terminal-wrapper{position:absolute;top:0;left:0;right:0;bottom:0;padding:8px}.terminal-wrapper.hidden{visibility:hidden}.terminal{height:100%;width:100%}.loading-overlay{position:fixed;top:0;left:0;right:0;bottom:0;background-color:#0d1117e6;display:flex;flex-direction:column;align-items:center;justify-content:center;gap:16px;z-index:1000}.loading-spinner{width:48px;height:48px;border:3px solid var(--border-color);border-top-color:var(--accent-blue);border-radius:50%;animation:spin 1s linear infinite}@keyframes spin{to{transform:rotate(360deg)}}.loading-overlay p{color:var(--text-secondary);font-size:14px}.connection-status{position:fixed;bottom:16px;right:16px;display:flex;align-items:center;gap:8px;padding:8px 12px;background-color:var(--bg-secondary);border:1px solid var(--border-color);border-radius:6px;font-size:12px;color:var(--text-secondary)}.connection-status .dot{width:8px;height:8px;border-radius:50%}.connection-status .dot.connected{background-color:var(--accent-green)}.connection-status .dot.disconnected{background-color:var(--accent-red)}.error-banner{padding:12px 16px;background-color:#f851491a;border:1px solid var(--accent-red);border-radius:6px;color:var(--accent-red);font-size:14px;text-align:center}.main-layout{display:flex;flex:1;overflow:hidden}.main-content-area{flex:1;display:flex;flex-direction:column;overflow:hidden}.main-content-area.with-lnb{margin-left:0}.main-content-area.full-width{width:100%}.left-nav-bar{width:260px;background-color:var(--bg-secondary);border-right:1px solid var(--border-color);display:flex;flex-direction:column;flex-shrink:0}.lnb-header{padding:20px;border-bottom:1px solid var(--border-color);font-size:14px;font-weight:600;color:var(--text-secondary);text-transform:uppercase;letter-spacing:.5px}.lnb-steps{padding:16px;display:flex;flex-direction:column;gap:8px}.lnb-step{display:flex;align-items:center;gap:12px;padding:14px 16px;background:transparent;border:1px solid transparent;border-radius:8px;text-align:left;cursor:pointer;transition:all .2s ease;width:100%;font-family:inherit}.lnb-step:hover:not(:disabled){background-color:var(--bg-tertiary)}.lnb-step:disabled{cursor:not-allowed;opacity:.5}.step-number{width:28px;height:28px;border-radius:50%;display:flex;align-items:center;justify-content:center;font-size:13px;font-weight:600;flex-shrink:0;transition:all .2s ease}.lnb-step.pending .step-number{background-color:var(--bg-tertiary);color:var(--text-muted);border:2px solid var(--border-color)}.lnb-step.pending .step-label{color:var(--text-muted)}.lnb-step.current{background-color:#58a6ff1a;border-color:var(--accent-blue)}.lnb-step.current .step-number{background-color:var(--accent-blue);color:var(--bg-primary)}.lnb-step.current .step-label{color:var(--text-primary);font-weight:500}.lnb-step.completed .step-number{background-color:var(--accent-green);color:var(--bg-primary)}.lnb-step.completed .step-label{color:var(--text-primary)}.step-label{font-size:14px;flex:1}.step-container{flex:1;display:flex;flex-direction:column;padding:40px;max-width:600px;margin:0 auto;width:100%}.step-header{text-align:center;margin-bottom:32px}.step-header h2{font-size:24px;font-weight:600;margin-bottom:8px;color:var(--text-primary)}.step-header p{color:var(--text-secondary);font-size:14px}.step-content{flex:1;display:flex;flex-direction:column;gap:24px}.step-navigation{display:flex;justify-content:space-between;padding-top:32px;margin-top:auto;border-top:1px solid var(--border-color)}.nav-button{padding:12px 32px;border-radius:8px;font-size:14px;font-weight:500;cursor:pointer;transition:all .2s ease;font-family:inherit}.nav-button.prev{background:transparent;border:1px solid var(--border-color);color:var(--text-secondary)}.nav-button.prev:hover:not(:disabled){background-color:var(--bg-tertiary);color:var(--text-primary)}.nav-button.prev:disabled{opacity:.3;cursor:not-allowed}.nav-button.next{background-color:var(--accent-blue);border:none;color:#fff}.nav-button.next:hover:not(:disabled){filter:brightness(1.1)}.nav-button.next:disabled{background-color:var(--bg-tertiary);color:var(--text-muted);cursor:not-allowed}.execution-summary{background-color:var(--bg-secondary);border:1px solid var(--border-color);border-radius:8px;padding:20px}.execution-summary h4{font-size:14px;font-weight:600;margin-bottom:16px;color:var(--text-primary);padding-bottom:12px;border-bottom:1px solid var(--border-color)}.summary-item{display:flex;justify-content:space-between;align-items:center;padding:8px 0}.summary-label{font-size:13px;color:var(--text-secondary)}.summary-value{font-size:13px;font-weight:500;color:var(--text-primary)}.left-nav-bar{width:280px;background-color:var(--bg-secondary);border-right:1px solid var(--border-color);display:flex;flex-direction:column;flex-shrink:0;overflow-y:auto}.lnb-section{border-bottom:1px solid var(--border-color)}.lnb-section-header{display:flex;align-items:center;justify-content:space-between;padding:16px;cursor:pointer;-webkit-user-select:none;user-select:none;transition:background-color .2s}.lnb-section-header:hover{background-color:var(--bg-tertiary)}.section-title{font-size:11px;font-weight:600;color:var(--text-muted);text-transform:uppercase;letter-spacing:.5px}.collapse-icon{font-size:14px;color:var(--text-muted)}.sessions-section{flex:1;display:flex;flex-direction:column;min-height:0}.session-count{font-size:11px;background-color:var(--bg-tertiary);color:var(--text-secondary);padding:2px 8px;border-radius:10px;margin-left:8px}.session-list{flex:1;overflow-y:auto;padding:8px}.session-group{margin-bottom:8px}.session-group-header{display:flex;align-items:center;gap:8px;padding:8px 12px;cursor:pointer;border-radius:6px;transition:background-color .2s}.session-group-header:hover{background-color:var(--bg-tertiary)}.group-collapse-icon{font-size:10px;color:var(--text-muted)}.group-name{font-size:12px;font-weight:500;color:var(--text-secondary);flex:1}.group-count{font-size:11px;color:var(--text-muted)}.session-group-items{padding-left:12px}.session-item{display:flex;align-items:center;gap:8px;padding:8px 12px;cursor:pointer;border-radius:6px;margin:2px 0;border:1px solid transparent;transition:all .2s}.session-item:hover{background-color:var(--bg-tertiary)}.session-item.active{background-color:#58a6ff1a;border-color:var(--accent-blue)}.session-item.selected{background-color:#58a6ff0d}.session-checkbox{width:14px;height:14px;cursor:pointer;accent-color:var(--accent-blue)}.status-indicator{width:8px;height:8px;border-radius:50%;flex-shrink:0}.session-name{flex:1;font-size:12px;color:var(--text-primary);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.session-close{padding:2px 6px;background:transparent;border:none;color:var(--text-muted);cursor:pointer;border-radius:4px;font-size:14px;line-height:1;opacity:0;transition:all .2s}.session-item:hover .session-close{opacity:1}.session-close:hover{background-color:var(--bg-primary);color:var(--accent-red)}.add-session-btn{margin:8px 16px 16px;padding:10px;background-color:transparent;border:1px dashed var(--border-color);border-radius:6px;color:var(--text-secondary);font-size:12px;cursor:pointer;transition:all .2s}.add-session-btn:hover{border-color:var(--accent-blue);color:var(--accent-blue);background-color:#58a6ff0d}.bulk-actions-bar{display:flex;align-items:center;gap:12px;padding:12px 16px;background-color:var(--bg-tertiary);border-top:1px solid var(--border-color)}.selected-count{font-size:12px;color:var(--text-secondary);flex:1}.bulk-delete-btn{padding:6px 12px;background-color:var(--accent-red);border:none;border-radius:4px;color:#fff;font-size:11px;font-weight:500;cursor:pointer;transition:filter .2s}.bulk-delete-btn:hover{filter:brightness(1.1)}.bulk-cancel-btn{padding:6px 12px;background-color:transparent;border:1px solid var(--border-color);border-radius:4px;color:var(--text-secondary);font-size:11px;cursor:pointer;transition:all .2s}.bulk-cancel-btn:hover{background-color:var(--bg-primary);color:var(--text-primary)}.modal-overlay{position:fixed;top:0;left:0;right:0;bottom:0;background-color:#000000b3;display:flex;align-items:center;justify-content:center;z-index:1000}.modal-content{background-color:var(--bg-secondary);border:1px solid var(--border-color);border-radius:12px;width:100%;max-width:440px;max-height:90vh;overflow:hidden;display:flex;flex-direction:column}.modal-confirm{max-width:400px}.modal-header{display:flex;align-items:center;justify-content:space-between;padding:20px 24px;border-bottom:1px solid var(--border-color)}.modal-header h2{font-size:16px;font-weight:600;color:var(--text-primary)}.modal-close{padding:4px 8px;background:transparent;border:none;color:var(--text-muted);font-size:20px;cursor:pointer;border-radius:4px;line-height:1}.modal-close:hover{background-color:var(--bg-tertiary);color:var(--text-primary)}.modal-body{padding:24px;overflow-y:auto}.modal-footer{display:flex;justify-content:flex-end;gap:12px;padding:16px 24px;border-top:1px solid var(--border-color)}.form-group{margin-bottom:20px}.form-group:last-child{margin-bottom:0}.form-group label{display:block;font-size:13px;font-weight:500;color:var(--text-primary);margin-bottom:8px}.form-group select{width:100%;padding:10px 12px;background-color:var(--bg-tertiary);border:1px solid var(--border-color);border-radius:6px;color:var(--text-primary);font-size:14px;font-family:inherit}.form-group select:focus{outline:none;border-color:var(--accent-blue)}.btn-primary{padding:10px 20px;background-color:var(--accent-blue);border:none;border-radius:6px;color:#fff;font-size:13px;font-weight:500;cursor:pointer;transition:filter .2s;font-family:inherit}.btn-primary:hover:not(:disabled){filter:brightness(1.1)}.btn-primary:disabled{background-color:var(--bg-tertiary);color:var(--text-muted);cursor:not-allowed}.btn-secondary{padding:10px 20px;background-color:transparent;border:1px solid var(--border-color);border-radius:6px;color:var(--text-secondary);font-size:13px;font-weight:500;cursor:pointer;transition:all .2s;font-family:inherit}.btn-secondary:hover:not(:disabled){background-color:var(--bg-tertiary);color:var(--text-primary)}.btn-danger{padding:10px 20px;background-color:var(--accent-red);border:none;border-radius:6px;color:#fff;font-size:13px;font-weight:500;cursor:pointer;transition:filter .2s;font-family:inherit}.btn-danger:hover:not(:disabled){filter:brightness(1.1)}.btn-danger:disabled{opacity:.5;cursor:not-allowed}.confirm-message{font-size:14px;color:var(--text-primary);margin-bottom:16px}.delete-list{list-style:none;padding:12px;background-color:var(--bg-tertiary);border-radius:6px;margin-bottom:16px;max-height:150px;overflow-y:auto}.delete-list li{display:flex;align-items:center;gap:8px;padding:6px 0;font-size:13px;color:var(--text-secondary)}.delete-list .status{width:6px;height:6px;border-radius:50%}.warning-text{font-size:12px;color:var(--accent-yellow);padding:12px;background-color:#d299221a;border-radius:6px}.terminal-panel.empty{display:flex;align-items:center;justify-content:center}.empty-message{text-align:center;color:var(--text-muted)}.empty-message p{margin:8px 0}.empty-message p:first-child{font-size:16px;color:var(--text-secondary)}.terminal-header{display:flex;align-items:center;gap:12px;padding:8px 16px;background-color:var(--bg-secondary);border-bottom:1px solid var(--border-color)}.terminal-grid-container{flex:1;display:flex;flex-direction:column;overflow:hidden;padding:8px;background-color:var(--bg-primary)}.terminal-grid-container.scrollable{overflow-y:auto}.terminal-grid{flex:1;display:grid;gap:8px;min-height:0}.terminal-grid.cols-2{grid-template-columns:repeat(2,1fr)}.terminal-grid-container.scrollable .terminal-grid{grid-auto-rows:minmax(350px,1fr)}.terminal-pane{position:relative;display:flex;flex-direction:column;border:2px solid var(--border-color);border-radius:8px;overflow:hidden;background-color:var(--bg-primary);min-height:300px;transition:border-color .2s,box-shadow .2s}.terminal-pane:hover{border-color:var(--text-muted)}.terminal-pane.active{border-color:var(--accent-green)}.pane-header{display:flex;align-items:center;gap:8px;padding:6px 10px;background-color:var(--bg-secondary);border-bottom:1px solid var(--border-color);min-height:32px}.pane-status{width:8px;height:8px;border-radius:50%;flex-shrink:0}.pane-status.running{background-color:var(--accent-green)}.pane-status.initializing{background-color:var(--accent-yellow)}.pane-status.stopped{background-color:var(--text-muted)}.pane-status.error{background-color:var(--accent-red)}.pane-title{flex:1;font-size:11px;font-weight:500;color:var(--text-primary);white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.pane-terminal{flex:1;position:relative;overflow:hidden}.pane-terminal .terminal{height:100%;width:100%;padding:4px}.empty-grid-message{display:flex;flex-direction:column;align-items:center;justify-content:center;height:100%;color:var(--text-muted);gap:16px}.empty-grid-message p{font-size:14px}
|
package/dist/web/index.html
CHANGED
|
@@ -7,8 +7,8 @@
|
|
|
7
7
|
<link rel="preconnect" href="https://fonts.googleapis.com">
|
|
8
8
|
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
|
9
9
|
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&family=JetBrains+Mono:wght@400;500&display=swap" rel="stylesheet">
|
|
10
|
-
<script type="module" crossorigin src="/assets/index-
|
|
11
|
-
<link rel="stylesheet" crossorigin href="/assets/index-
|
|
10
|
+
<script type="module" crossorigin src="/assets/index-D-hASqdI.js"></script>
|
|
11
|
+
<link rel="stylesheet" crossorigin href="/assets/index-Dgl6wRHk.css">
|
|
12
12
|
</head>
|
|
13
13
|
<body>
|
|
14
14
|
<div id="root"></div>
|
package/package.json
CHANGED
package/server/socketHandlers.ts
CHANGED
|
@@ -6,9 +6,7 @@ import type {
|
|
|
6
6
|
TerminalInputData,
|
|
7
7
|
TerminalResizeData,
|
|
8
8
|
TerminalKillData,
|
|
9
|
-
AgentId
|
|
10
9
|
} from '../shared/types/index.js';
|
|
11
|
-
import { AI_AGENTS } from '../shared/constants.js';
|
|
12
10
|
import fs, { realpathSync } from 'fs';
|
|
13
11
|
import path from 'path';
|
|
14
12
|
import { promisify } from 'util';
|
|
@@ -108,17 +106,11 @@ async function waitForSpawnInterval(): Promise<void> {
|
|
|
108
106
|
interface TerminalSession {
|
|
109
107
|
pty: IPty;
|
|
110
108
|
worktreePath: string;
|
|
111
|
-
|
|
112
|
-
socketId: string;
|
|
109
|
+
socketId: string | null; // null when disconnected but session alive
|
|
113
110
|
}
|
|
114
111
|
|
|
115
112
|
const sessions = new Map<string, TerminalSession>();
|
|
116
113
|
|
|
117
|
-
function getAgentCommand(agentType: AgentId): string {
|
|
118
|
-
const agent = AI_AGENTS.find(a => a.id === agentType);
|
|
119
|
-
return agent?.command || 'bash';
|
|
120
|
-
}
|
|
121
|
-
|
|
122
114
|
function getShell(): string {
|
|
123
115
|
if (process.platform === 'win32') {
|
|
124
116
|
return 'powershell.exe';
|
|
@@ -142,13 +134,29 @@ export function setupSocketHandlers(io: Server, cwd: string) {
|
|
|
142
134
|
|
|
143
135
|
// Terminal create
|
|
144
136
|
socket.on('terminal:create', async (data: TerminalCreateData) => {
|
|
145
|
-
const { sessionId, worktreePath
|
|
137
|
+
const { sessionId, worktreePath } = data;
|
|
138
|
+
|
|
139
|
+
console.log(`Creating terminal session: ${sessionId} at ${worktreePath}`);
|
|
140
|
+
|
|
141
|
+
// Check if session already exists (reattach scenario)
|
|
142
|
+
const existingSession = sessions.get(sessionId);
|
|
143
|
+
if (existingSession && existingSession.pty) {
|
|
144
|
+
console.log(`Reattaching to existing session: ${sessionId}`);
|
|
146
145
|
|
|
147
|
-
|
|
146
|
+
// Update socketId for the existing session
|
|
147
|
+
existingSession.socketId = socket.id;
|
|
148
|
+
|
|
149
|
+
// Re-register output handler for new socket
|
|
150
|
+
existingSession.pty.onData((output: string) => {
|
|
151
|
+
socket.emit('terminal:output', { sessionId, data: output });
|
|
152
|
+
});
|
|
153
|
+
|
|
154
|
+
socket.emit('terminal:created', { sessionId, reattached: true });
|
|
155
|
+
return;
|
|
156
|
+
}
|
|
148
157
|
|
|
149
158
|
try {
|
|
150
159
|
const shell = getShell();
|
|
151
|
-
const agentCommand = getAgentCommand(agentType);
|
|
152
160
|
|
|
153
161
|
// Validate path before spawning
|
|
154
162
|
const pathValidation = await validatePath(worktreePath);
|
|
@@ -184,7 +192,6 @@ export function setupSocketHandlers(io: Server, cwd: string) {
|
|
|
184
192
|
sessions.set(sessionId, {
|
|
185
193
|
pty: ptyProcess,
|
|
186
194
|
worktreePath,
|
|
187
|
-
agentType,
|
|
188
195
|
socketId: socket.id,
|
|
189
196
|
});
|
|
190
197
|
|
|
@@ -200,11 +207,6 @@ export function setupSocketHandlers(io: Server, cwd: string) {
|
|
|
200
207
|
sessions.delete(sessionId);
|
|
201
208
|
});
|
|
202
209
|
|
|
203
|
-
// Start the AI agent after a short delay
|
|
204
|
-
setTimeout(() => {
|
|
205
|
-
ptyProcess.write(`${agentCommand}\r`);
|
|
206
|
-
}, 500);
|
|
207
|
-
|
|
208
210
|
socket.emit('terminal:created', { sessionId });
|
|
209
211
|
} catch (error) {
|
|
210
212
|
console.error(`Failed to create terminal session: ${sessionId}`, error);
|
|
@@ -252,7 +254,7 @@ export function setupSocketHandlers(io: Server, cwd: string) {
|
|
|
252
254
|
const socketSessions = Array.from(sessions.entries())
|
|
253
255
|
.filter(([, session]) => session.socketId === socket.id);
|
|
254
256
|
|
|
255
|
-
for (const [
|
|
257
|
+
for (const [, session] of socketSessions) {
|
|
256
258
|
session.pty.write(data.data);
|
|
257
259
|
}
|
|
258
260
|
});
|
|
@@ -261,14 +263,13 @@ export function setupSocketHandlers(io: Server, cwd: string) {
|
|
|
261
263
|
socket.on('disconnect', () => {
|
|
262
264
|
console.log(`Client disconnected: ${socket.id}`);
|
|
263
265
|
|
|
264
|
-
//
|
|
266
|
+
// Keep sessions alive but mark socketId as null for potential reattach
|
|
265
267
|
const socketSessions = Array.from(sessions.entries())
|
|
266
268
|
.filter(([, session]) => session.socketId === socket.id);
|
|
267
269
|
|
|
268
270
|
for (const [sessionId, session] of socketSessions) {
|
|
269
|
-
console.log(`
|
|
270
|
-
session.
|
|
271
|
-
sessions.delete(sessionId);
|
|
271
|
+
console.log(`Detaching terminal session (keeping alive): ${sessionId}`);
|
|
272
|
+
session.socketId = null;
|
|
272
273
|
}
|
|
273
274
|
});
|
|
274
275
|
});
|
package/shared/constants.ts
CHANGED
|
@@ -1,29 +1,3 @@
|
|
|
1
|
-
import type { AgentType } from './types/index.js';
|
|
2
|
-
|
|
3
|
-
export const AI_AGENTS: AgentType[] = [
|
|
4
|
-
{
|
|
5
|
-
id: 'codex',
|
|
6
|
-
name: 'Codex CLI',
|
|
7
|
-
command: 'codex',
|
|
8
|
-
installCommand: 'npm install -g @openai/codex',
|
|
9
|
-
description: 'OpenAI Codex CLI - AI-powered coding assistant'
|
|
10
|
-
},
|
|
11
|
-
{
|
|
12
|
-
id: 'claude',
|
|
13
|
-
name: 'Claude Code',
|
|
14
|
-
command: 'claude',
|
|
15
|
-
installCommand: 'npm install -g @anthropic-ai/claude-code',
|
|
16
|
-
description: 'Anthropic Claude Code - Advanced AI coding assistant'
|
|
17
|
-
},
|
|
18
|
-
{
|
|
19
|
-
id: 'gemini',
|
|
20
|
-
name: 'Gemini CLI',
|
|
21
|
-
command: 'gemini',
|
|
22
|
-
installCommand: 'npm install -g @google/gemini-cli',
|
|
23
|
-
description: 'Google Gemini CLI - Multi-modal AI assistant'
|
|
24
|
-
}
|
|
25
|
-
];
|
|
26
|
-
|
|
27
1
|
export const MAX_PARALLEL_COUNT = 10;
|
|
28
2
|
export const MIN_PARALLEL_COUNT = 1;
|
|
29
3
|
export const DEFAULT_PARALLEL_COUNT = 3;
|
|
@@ -31,5 +5,5 @@ export const DEFAULT_PARALLEL_COUNT = 3;
|
|
|
31
5
|
export const BRANCH_POLL_INTERVAL = 5000; // 5 seconds
|
|
32
6
|
|
|
33
7
|
export const APP_NAME = 'hjWorktree CLI';
|
|
34
|
-
export const APP_VERSION = '2.
|
|
8
|
+
export const APP_VERSION = '2.4.0';
|
|
35
9
|
export const DEFAULT_PORT = 3847;
|
package/shared/types/index.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
// Navigation step types (
|
|
2
|
-
export type NavigationStep = 'branch' | '
|
|
1
|
+
// Navigation step types (3-step wizard)
|
|
2
|
+
export type NavigationStep = 'branch' | 'worktree' | 'running';
|
|
3
3
|
|
|
4
4
|
// Step status for LNB display
|
|
5
5
|
export type StepStatus = 'pending' | 'current' | 'completed';
|
|
@@ -13,18 +13,7 @@ export interface StepConfig {
|
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
// Step order constant
|
|
16
|
-
export const STEP_ORDER: NavigationStep[] = ['branch', '
|
|
17
|
-
|
|
18
|
-
// Agent types
|
|
19
|
-
export type AgentId = 'codex' | 'claude' | 'gemini';
|
|
20
|
-
|
|
21
|
-
export interface AgentType {
|
|
22
|
-
id: AgentId;
|
|
23
|
-
name: string;
|
|
24
|
-
command: string;
|
|
25
|
-
installCommand: string;
|
|
26
|
-
description: string;
|
|
27
|
-
}
|
|
16
|
+
export const STEP_ORDER: NavigationStep[] = ['branch', 'worktree', 'running'];
|
|
28
17
|
|
|
29
18
|
// Branch types
|
|
30
19
|
export interface Branch {
|
|
@@ -34,16 +23,15 @@ export interface Branch {
|
|
|
34
23
|
lastCommit?: string;
|
|
35
24
|
}
|
|
36
25
|
|
|
37
|
-
//
|
|
38
|
-
export type
|
|
26
|
+
// Terminal status types
|
|
27
|
+
export type TerminalStatus = 'initializing' | 'running' | 'stopped' | 'error';
|
|
39
28
|
|
|
40
29
|
export interface TerminalInfo {
|
|
41
30
|
sessionId: string;
|
|
42
31
|
worktreePath: string;
|
|
43
32
|
worktreeName: string;
|
|
44
33
|
branchName: string;
|
|
45
|
-
|
|
46
|
-
status: AgentStatus;
|
|
34
|
+
status: TerminalStatus;
|
|
47
35
|
}
|
|
48
36
|
|
|
49
37
|
// Worktree types
|
|
@@ -58,7 +46,6 @@ export interface Worktree {
|
|
|
58
46
|
export interface TerminalCreateData {
|
|
59
47
|
sessionId: string;
|
|
60
48
|
worktreePath: string;
|
|
61
|
-
agentType: AgentId;
|
|
62
49
|
}
|
|
63
50
|
|
|
64
51
|
export interface TerminalOutputData {
|
|
@@ -85,7 +72,6 @@ export interface TerminalKillData {
|
|
|
85
72
|
export interface CreateWorktreesRequest {
|
|
86
73
|
branch: string;
|
|
87
74
|
count: number;
|
|
88
|
-
agentType: AgentId;
|
|
89
75
|
}
|
|
90
76
|
|
|
91
77
|
export interface CreateWorktreesResponse {
|
|
@@ -95,7 +81,6 @@ export interface CreateWorktreesResponse {
|
|
|
95
81
|
// Single worktree creation
|
|
96
82
|
export interface CreateSingleWorktreeRequest {
|
|
97
83
|
branch: string;
|
|
98
|
-
agentType: AgentId;
|
|
99
84
|
}
|
|
100
85
|
|
|
101
86
|
export interface CreateSingleWorktreeResponse {
|
package/web/src/App.tsx
CHANGED
|
@@ -4,7 +4,6 @@ import { useSocket } from './hooks/useSocket.js';
|
|
|
4
4
|
import Header from './components/Layout/Header.js';
|
|
5
5
|
import MainLayout from './components/Layout/MainLayout.js';
|
|
6
6
|
import BranchStep from './components/Steps/BranchStep.js';
|
|
7
|
-
import AgentStep from './components/Steps/AgentStep.js';
|
|
8
7
|
import WorktreeStep from './components/Steps/WorktreeStep.js';
|
|
9
8
|
import TerminalPanel from './components/Terminal/TerminalPanel.js';
|
|
10
9
|
import ModalContainer from './components/Modals/ModalContainer.js';
|
|
@@ -13,18 +12,21 @@ function App() {
|
|
|
13
12
|
const { step, isLoading, loadingMessage, error } = useAppStore();
|
|
14
13
|
const { connected } = useSocket();
|
|
15
14
|
|
|
16
|
-
// Fetch initial data
|
|
15
|
+
// Fetch initial data and restore existing sessions
|
|
17
16
|
useEffect(() => {
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
const initApp = async () => {
|
|
18
|
+
await useAppStore.getState().fetchProjectInfo();
|
|
19
|
+
await useAppStore.getState().fetchBranches();
|
|
20
|
+
// Restore existing worktrees if any (for page refresh persistence)
|
|
21
|
+
await useAppStore.getState().restoreExistingWorktrees();
|
|
22
|
+
};
|
|
23
|
+
initApp();
|
|
20
24
|
}, []);
|
|
21
25
|
|
|
22
26
|
const renderStepContent = () => {
|
|
23
27
|
switch (step) {
|
|
24
28
|
case 'branch':
|
|
25
29
|
return <BranchStep />;
|
|
26
|
-
case 'agent':
|
|
27
|
-
return <AgentStep />;
|
|
28
30
|
case 'worktree':
|
|
29
31
|
return <WorktreeStep />;
|
|
30
32
|
case 'running':
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { useAppStore } from '../../stores/useAppStore.js';
|
|
3
|
-
import type { NavigationStep, StepStatus,
|
|
4
|
-
import { AI_AGENTS } from '../../../../shared/constants.js';
|
|
3
|
+
import type { NavigationStep, StepStatus, TerminalStatus } from '../../../../shared/types/index.js';
|
|
5
4
|
|
|
6
5
|
// Step configuration
|
|
7
6
|
const STEP_CONFIG = [
|
|
8
7
|
{ id: 'branch' as const, number: 1, label: 'Branch' },
|
|
9
|
-
{ id: '
|
|
10
|
-
{ id: 'worktree' as const, number: 3, label: 'Count' },
|
|
8
|
+
{ id: 'worktree' as const, number: 2, label: 'Count' },
|
|
11
9
|
];
|
|
12
10
|
|
|
13
11
|
interface StepItemProps {
|
|
@@ -79,7 +77,7 @@ function SetupSection() {
|
|
|
79
77
|
onClick={() => goToStep('running')}
|
|
80
78
|
type="button"
|
|
81
79
|
>
|
|
82
|
-
<span className="step-number">
|
|
80
|
+
<span className="step-number">3</span>
|
|
83
81
|
<span className="step-label">Running</span>
|
|
84
82
|
</button>
|
|
85
83
|
)}
|
|
@@ -90,10 +88,9 @@ function SetupSection() {
|
|
|
90
88
|
}
|
|
91
89
|
|
|
92
90
|
// Status indicator component
|
|
93
|
-
function StatusIndicator({ status }: { status:
|
|
94
|
-
const statusColors: Record<
|
|
91
|
+
function StatusIndicator({ status }: { status: TerminalStatus }) {
|
|
92
|
+
const statusColors: Record<TerminalStatus, string> = {
|
|
95
93
|
initializing: '#f59e0b',
|
|
96
|
-
installing: '#f59e0b',
|
|
97
94
|
running: '#22c55e',
|
|
98
95
|
stopped: '#6b7280',
|
|
99
96
|
error: '#ef4444',
|
|
@@ -112,8 +109,7 @@ function StatusIndicator({ status }: { status: AgentStatus }) {
|
|
|
112
109
|
interface SessionItemProps {
|
|
113
110
|
sessionId: string;
|
|
114
111
|
worktreeName: string;
|
|
115
|
-
|
|
116
|
-
status: AgentStatus;
|
|
112
|
+
status: TerminalStatus;
|
|
117
113
|
isActive: boolean;
|
|
118
114
|
isSelected: boolean;
|
|
119
115
|
onSelect: () => void;
|
|
@@ -124,7 +120,6 @@ interface SessionItemProps {
|
|
|
124
120
|
function SessionItem({
|
|
125
121
|
sessionId,
|
|
126
122
|
worktreeName,
|
|
127
|
-
agentType,
|
|
128
123
|
status,
|
|
129
124
|
isActive,
|
|
130
125
|
isSelected,
|
|
@@ -132,8 +127,6 @@ function SessionItem({
|
|
|
132
127
|
onToggleSelect,
|
|
133
128
|
onClose,
|
|
134
129
|
}: SessionItemProps) {
|
|
135
|
-
const agent = AI_AGENTS.find(a => a.id === agentType);
|
|
136
|
-
|
|
137
130
|
return (
|
|
138
131
|
<div
|
|
139
132
|
className={`session-item ${isActive ? 'active' : ''} ${isSelected ? 'selected' : ''}`}
|
|
@@ -152,9 +145,6 @@ function SessionItem({
|
|
|
152
145
|
<span className="session-name" title={worktreeName}>
|
|
153
146
|
{worktreeName}
|
|
154
147
|
</span>
|
|
155
|
-
<span className="session-agent" title={agent?.name}>
|
|
156
|
-
{agentType.charAt(0).toUpperCase()}
|
|
157
|
-
</span>
|
|
158
148
|
<button
|
|
159
149
|
className="session-close"
|
|
160
150
|
onClick={onClose}
|
|
@@ -256,7 +246,6 @@ function SessionsSection() {
|
|
|
256
246
|
key={session.sessionId}
|
|
257
247
|
sessionId={session.sessionId}
|
|
258
248
|
worktreeName={session.worktreeName}
|
|
259
|
-
agentType={session.agentType}
|
|
260
249
|
status={session.status}
|
|
261
250
|
isActive={session.sessionId === activeSessionId}
|
|
262
251
|
isSelected={selectedSessionIds.includes(session.sessionId)}
|
|
@@ -1,16 +1,13 @@
|
|
|
1
1
|
import React, { useState } from 'react';
|
|
2
2
|
import { useAppStore } from '../../stores/useAppStore.js';
|
|
3
|
-
import { AI_AGENTS } from '../../../../shared/constants.js';
|
|
4
|
-
import type { AgentId } from '../../../../shared/types/index.js';
|
|
5
3
|
|
|
6
4
|
function AddWorktreeModal() {
|
|
7
5
|
const { branches, closeModal, createSingleWorktree, isLoading } = useAppStore();
|
|
8
6
|
const [selectedBranch, setSelectedBranch] = useState<string>('');
|
|
9
|
-
const [selectedAgent, setSelectedAgent] = useState<AgentId>('claude');
|
|
10
7
|
|
|
11
8
|
const handleCreate = async () => {
|
|
12
9
|
if (!selectedBranch) return;
|
|
13
|
-
await createSingleWorktree(selectedBranch
|
|
10
|
+
await createSingleWorktree(selectedBranch);
|
|
14
11
|
};
|
|
15
12
|
|
|
16
13
|
return (
|
|
@@ -42,23 +39,6 @@ function AddWorktreeModal() {
|
|
|
42
39
|
))}
|
|
43
40
|
</select>
|
|
44
41
|
</div>
|
|
45
|
-
|
|
46
|
-
<div className="form-group">
|
|
47
|
-
<label>Agent</label>
|
|
48
|
-
<div className="agent-options">
|
|
49
|
-
{AI_AGENTS.map((agent) => (
|
|
50
|
-
<button
|
|
51
|
-
key={agent.id}
|
|
52
|
-
type="button"
|
|
53
|
-
className={`agent-option ${selectedAgent === agent.id ? 'selected' : ''}`}
|
|
54
|
-
onClick={() => setSelectedAgent(agent.id)}
|
|
55
|
-
disabled={isLoading}
|
|
56
|
-
>
|
|
57
|
-
<span className="agent-name">{agent.name}</span>
|
|
58
|
-
</button>
|
|
59
|
-
))}
|
|
60
|
-
</div>
|
|
61
|
-
</div>
|
|
62
42
|
</div>
|
|
63
43
|
|
|
64
44
|
<div className="modal-footer">
|
|
@@ -2,12 +2,9 @@ import React from 'react';
|
|
|
2
2
|
import StepContainer from '../Layout/StepContainer.js';
|
|
3
3
|
import WorktreeCountSelector from '../Setup/WorktreeCountSelector.js';
|
|
4
4
|
import { useAppStore } from '../../stores/useAppStore.js';
|
|
5
|
-
import { AI_AGENTS } from '../../../../shared/constants.js';
|
|
6
5
|
|
|
7
6
|
function WorktreeStep() {
|
|
8
|
-
const { execute, isLoading, selectedBranch,
|
|
9
|
-
|
|
10
|
-
const agentName = AI_AGENTS.find(a => a.id === selectedAgent)?.name || selectedAgent;
|
|
7
|
+
const { execute, isLoading, selectedBranch, worktreeCount } = useAppStore();
|
|
11
8
|
|
|
12
9
|
return (
|
|
13
10
|
<StepContainer
|
|
@@ -25,10 +22,6 @@ function WorktreeStep() {
|
|
|
25
22
|
<span className="summary-label">Branch:</span>
|
|
26
23
|
<span className="summary-value">{selectedBranch}</span>
|
|
27
24
|
</div>
|
|
28
|
-
<div className="summary-item">
|
|
29
|
-
<span className="summary-label">Agent:</span>
|
|
30
|
-
<span className="summary-value">{agentName}</span>
|
|
31
|
-
</div>
|
|
32
25
|
<div className="summary-item">
|
|
33
26
|
<span className="summary-label">Worktrees:</span>
|
|
34
27
|
<span className="summary-value">{worktreeCount}</span>
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import React, { useCallback } from 'react';
|
|
2
|
+
import { useAppStore } from '../../stores/useAppStore.js';
|
|
3
|
+
import XTerminal from './XTerminal.js';
|
|
4
|
+
import type { TerminalInfo } from '../../../../shared/types/index.js';
|
|
5
|
+
|
|
6
|
+
function SplitTerminalView() {
|
|
7
|
+
const {
|
|
8
|
+
terminals,
|
|
9
|
+
activeSessionId,
|
|
10
|
+
setActiveSession,
|
|
11
|
+
} = useAppStore();
|
|
12
|
+
|
|
13
|
+
// Handle single click to activate
|
|
14
|
+
const handleClick = useCallback((sessionId: string) => {
|
|
15
|
+
setActiveSession(sessionId);
|
|
16
|
+
}, [setActiveSession]);
|
|
17
|
+
|
|
18
|
+
// Render a terminal pane
|
|
19
|
+
const renderPane = (terminal: TerminalInfo) => {
|
|
20
|
+
const isActive = terminal.sessionId === activeSessionId;
|
|
21
|
+
|
|
22
|
+
return (
|
|
23
|
+
<div
|
|
24
|
+
key={terminal.sessionId}
|
|
25
|
+
className={`terminal-pane ${isActive ? 'active' : ''}`}
|
|
26
|
+
onClick={() => handleClick(terminal.sessionId)}
|
|
27
|
+
>
|
|
28
|
+
<div className="pane-header">
|
|
29
|
+
<span className={`pane-status ${terminal.status}`} />
|
|
30
|
+
<span className="pane-title">{terminal.worktreeName}</span>
|
|
31
|
+
</div>
|
|
32
|
+
<div className="pane-terminal">
|
|
33
|
+
<XTerminal
|
|
34
|
+
sessionId={terminal.sessionId}
|
|
35
|
+
worktreePath={terminal.worktreePath}
|
|
36
|
+
isActive={isActive}
|
|
37
|
+
/>
|
|
38
|
+
</div>
|
|
39
|
+
</div>
|
|
40
|
+
);
|
|
41
|
+
};
|
|
42
|
+
|
|
43
|
+
// Render split grid view
|
|
44
|
+
if (terminals.length === 0) {
|
|
45
|
+
return (
|
|
46
|
+
<div className="terminal-grid-container">
|
|
47
|
+
<div className="empty-grid-message">
|
|
48
|
+
<p>No active sessions</p>
|
|
49
|
+
<p>Use the Setup wizard or click "+ Add Session" in the sidebar</p>
|
|
50
|
+
</div>
|
|
51
|
+
</div>
|
|
52
|
+
);
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
return (
|
|
56
|
+
<div className="terminal-grid-container scrollable">
|
|
57
|
+
<div className="terminal-grid cols-2">
|
|
58
|
+
{terminals.map(terminal => renderPane(terminal))}
|
|
59
|
+
</div>
|
|
60
|
+
</div>
|
|
61
|
+
);
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
export default SplitTerminalView;
|
|
@@ -1,52 +1,18 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { useAppStore } from '../../stores/useAppStore.js';
|
|
3
|
-
import
|
|
4
|
-
import XTerminal from './XTerminal.js';
|
|
3
|
+
import SplitTerminalView from './SplitTerminalView.js';
|
|
5
4
|
|
|
6
5
|
function TerminalPanel() {
|
|
7
6
|
const {
|
|
8
7
|
terminals,
|
|
9
|
-
activeTerminalIndex,
|
|
10
|
-
activeSessionId,
|
|
11
|
-
setActiveSession,
|
|
12
|
-
removeTerminal,
|
|
13
|
-
clearAllTerminals,
|
|
14
8
|
openModal,
|
|
15
9
|
} = useAppStore();
|
|
16
|
-
const { emit } = useSocket();
|
|
17
|
-
|
|
18
|
-
const handleCloseTerminal = async (sessionId: string, e: React.MouseEvent) => {
|
|
19
|
-
e.stopPropagation();
|
|
20
|
-
|
|
21
|
-
// Kill the terminal via socket
|
|
22
|
-
emit('terminal:kill', { sessionId });
|
|
23
|
-
|
|
24
|
-
// Find the worktree name to delete
|
|
25
|
-
const terminal = terminals.find(t => t.sessionId === sessionId);
|
|
26
|
-
if (terminal) {
|
|
27
|
-
try {
|
|
28
|
-
await fetch(`/api/worktrees/${terminal.worktreeName}`, {
|
|
29
|
-
method: 'DELETE',
|
|
30
|
-
});
|
|
31
|
-
} catch (error) {
|
|
32
|
-
console.error('Failed to delete worktree:', error);
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
removeTerminal(sessionId);
|
|
37
|
-
};
|
|
38
10
|
|
|
39
11
|
const handleCloseAll = () => {
|
|
40
12
|
const sessionIds = terminals.map(t => t.sessionId);
|
|
41
13
|
openModal('confirmDelete', { sessionIds });
|
|
42
14
|
};
|
|
43
15
|
|
|
44
|
-
// Find active index based on sessionId
|
|
45
|
-
const currentActiveIndex = activeSessionId
|
|
46
|
-
? terminals.findIndex(t => t.sessionId === activeSessionId)
|
|
47
|
-
: activeTerminalIndex;
|
|
48
|
-
const effectiveActiveIndex = currentActiveIndex >= 0 ? currentActiveIndex : 0;
|
|
49
|
-
|
|
50
16
|
if (terminals.length === 0) {
|
|
51
17
|
return (
|
|
52
18
|
<div className="terminal-panel empty">
|
|
@@ -60,25 +26,7 @@ function TerminalPanel() {
|
|
|
60
26
|
|
|
61
27
|
return (
|
|
62
28
|
<div className="terminal-panel">
|
|
63
|
-
<div className="terminal-
|
|
64
|
-
{terminals.map((terminal, index) => (
|
|
65
|
-
<button
|
|
66
|
-
key={terminal.sessionId}
|
|
67
|
-
className={`terminal-tab ${terminal.sessionId === activeSessionId || index === effectiveActiveIndex ? 'active' : ''}`}
|
|
68
|
-
onClick={() => setActiveSession(terminal.sessionId)}
|
|
69
|
-
>
|
|
70
|
-
<span className={`status ${terminal.status}`} />
|
|
71
|
-
<span>{terminal.worktreeName}</span>
|
|
72
|
-
<button
|
|
73
|
-
className="close-btn"
|
|
74
|
-
onClick={(e) => handleCloseTerminal(terminal.sessionId, e)}
|
|
75
|
-
title="Close terminal"
|
|
76
|
-
>
|
|
77
|
-
×
|
|
78
|
-
</button>
|
|
79
|
-
</button>
|
|
80
|
-
))}
|
|
81
|
-
|
|
29
|
+
<div className="terminal-header">
|
|
82
30
|
<div className="terminal-actions">
|
|
83
31
|
<button className="danger" onClick={handleCloseAll}>
|
|
84
32
|
Close All
|
|
@@ -86,21 +34,7 @@ function TerminalPanel() {
|
|
|
86
34
|
</div>
|
|
87
35
|
</div>
|
|
88
36
|
|
|
89
|
-
<
|
|
90
|
-
{terminals.map((terminal, index) => (
|
|
91
|
-
<div
|
|
92
|
-
key={terminal.sessionId}
|
|
93
|
-
className={`terminal-wrapper ${index !== effectiveActiveIndex ? 'hidden' : ''}`}
|
|
94
|
-
>
|
|
95
|
-
<XTerminal
|
|
96
|
-
sessionId={terminal.sessionId}
|
|
97
|
-
worktreePath={terminal.worktreePath}
|
|
98
|
-
agentType={terminal.agentType}
|
|
99
|
-
isActive={index === effectiveActiveIndex}
|
|
100
|
-
/>
|
|
101
|
-
</div>
|
|
102
|
-
))}
|
|
103
|
-
</div>
|
|
37
|
+
<SplitTerminalView />
|
|
104
38
|
</div>
|
|
105
39
|
);
|
|
106
40
|
}
|