Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 7 additions & 27 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,6 @@
"@uiw/codemirror-theme-github": "^4.23.12",
"@uiw/react-codemirror": "4.25.1",
"@uiw/react-color-sketch": "^2.8.0",
"@xterm/addon-fit": "^0.10.0",
"@xterm/addon-web-links": "^0.11.0",
"@xterm/xterm": "^5.5.0",
"ai": "^5.0.119",
"ai-sdk-provider-claude-code": "^2.3.0",
"apache-arrow": "18.1.0",
Expand All @@ -114,6 +111,7 @@
"fix-path": "^4.0.0",
"focus-trap-react": "^11.0.3",
"framer-motion": "^11.18.2",
"ghostty-web": "^0.4.0",
"gitdiff-parser": "^0.3.1",
"glob": "^11.0.2",
"google-auth-library": "^10.3.0",
Expand Down
6 changes: 6 additions & 0 deletions src/main/terminal/terminal-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,12 @@ export class TerminalManager {
return false;
}

logger.info('Closing terminal:', {
terminalId,
baseDir: terminal.baseDir,
taskId: terminal.taskId,
});

try {
terminal.ptyProcess.kill();
this.terminals.delete(terminalId);
Expand Down
4 changes: 3 additions & 1 deletion src/renderer/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
<title>AiderDesk</title>
<!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
<!-- 'wasm-unsafe-eval' is required for WebAssembly modules that need dynamic code evaluation -->
<!-- 'data:' in connect-src is necessary for data URL connections, e.g., WebSocket or fetch to data URLs -->
<meta
http-equiv="Content-Security-Policy"
content="default-src 'self'; script-src 'self' https://unpkg.com; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com https://fonts.gstatic.com; img-src 'self' data: file:; font-src 'self' https://fonts.gstatic.com; connect-src 'self' http: https: ws: wss:;"
content="default-src 'self'; script-src 'self' https://unpkg.com 'wasm-unsafe-eval'; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com https://fonts.gstatic.com; img-src 'self' data: file:; font-src 'self' https://fonts.gstatic.com; connect-src 'self' http: https: ws: wss: data:;"
/>
<link rel="stylesheet" href="/src/fonts.css">
<link rel="icon" type="image/x-icon" href="/favicon.ico">
Expand Down
42 changes: 22 additions & 20 deletions src/renderer/src/components/project/TaskView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -653,26 +653,28 @@ export const TaskView = forwardRef<TaskViewRef, Props>(
</>
)}
</div>
<ResizableBox
className="flex flex-col flex-shrink-0"
height={terminalVisible ? (isMobile ? 150 : 200) : 0}
width={Infinity}
axis="y"
resizeHandles={terminalVisible ? ['n'] : []}
minConstraints={[Infinity, 100]}
maxConstraints={[Infinity, isMobile ? window.innerHeight / 3 : window.innerHeight / 2]}
onResize={handleTerminalViewResize}
>
<TerminalView
ref={terminalViewRef}
baseDir={projectDir}
taskId={task.id}
visible={terminalVisible}
className="border-t border-border-dark-light flex-grow"
onVisibilityChange={setTerminalVisible}
onCopyOutput={handleCopyTerminalOutput}
/>
</ResizableBox>
{terminalVisible && (
<ResizableBox
className="flex flex-col flex-shrink-0"
height={isMobile ? 150 : 200}
width={Infinity}
axis="y"
resizeHandles={['n']}
minConstraints={[Infinity, 100]}
maxConstraints={[Infinity, isMobile ? window.innerHeight / 3 : window.innerHeight / 2]}
onResize={handleTerminalViewResize}
>
<TerminalView
ref={terminalViewRef}
baseDir={project.baseDir}
taskId={task.id}
visible={terminalVisible}
className="border-t border-border-dark-light flex-grow"
onVisibilityChange={setTerminalVisible}
onCopyOutput={handleCopyTerminalOutput}
/>
</ResizableBox>
)}
</div>
<div className={clsx('relative w-full flex-shrink-0 flex flex-col border-t border-border-dark-light', editingMessageIndex !== null && 'pt-1')}>
<div className={clsx('p-4 pb-2', editingMessageIndex !== null && 'pt-1')}>
Expand Down
14 changes: 10 additions & 4 deletions src/renderer/src/components/terminal/Terminal.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
.xterm-viewport {
@apply scrollbar-thin scrollbar-track-bg-primary scrollbar-thumb-bg-secondary-light hover:scrollbar-thumb-bg-tertiary;
.terminal {
cursor: text !important;
}

.xterm-screen {
@apply px-3;
.terminal canvas {
cursor: text !important;
}



.terminal textarea {
caret-color: transparent;
}
Loading