Skip to content

fix (desktop): ctrl-d fix to kill terminal pane #972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AviPeltz wants to merge 1 commit into from
Closed

fix (desktop): ctrl-d fix to kill terminal pane #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions ...derer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/Terminal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ export const Terminal = ({ tabId, workspaceId }: TerminalProps) => {
);
const terminalTheme = useTerminalTheme();
const restartTerminalRef = useRef<() => void>(() => {});
const ctrlDSentRef = useRef(false);

// Terminal connection state and mutations
const {
Expand Down Expand Up @@ -235,6 +236,7 @@ export const Terminal = ({ tabId, workspaceId }: TerminalProps) => {
isExitedRef,
wasKilledByUserRef,
pendingEventsRef,
ctrlDSentRef,
setExitStatus,
setConnectionError,
updateModesFromData,
Expand Down Expand Up @@ -408,6 +410,10 @@ export const Terminal = ({ tabId, workspaceId }: TerminalProps) => {
restartTerminal();
return;
}
// Track Ctrl+D (EOF character) for auto-close on exit
if (data === "\x04") {
ctrlDSentRef.current = true;
}
writeRef.current({ paneId, data });
};

Expand Down
16 changes: 15 additions & 1 deletion ...main/components/WorkspaceView/ContentView/TabsContent/Terminal/hooks/useTerminalStream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export interface UseTerminalStreamOptions {
isExitedRef: React.MutableRefObject<boolean>;
wasKilledByUserRef: React.MutableRefObject<boolean>;
pendingEventsRef: React.MutableRefObject<TerminalStreamEvent[]>;
ctrlDSentRef: React.MutableRefObject<boolean>;
setExitStatus: (status: "killed" | "exited" | null) => void;
setConnectionError: (error: string | null) => void;
updateModesFromData: (data: string) => void;
Expand All @@ -38,12 +39,14 @@ export function useTerminalStream({
isExitedRef,
wasKilledByUserRef,
pendingEventsRef,
ctrlDSentRef,
setExitStatus,
setConnectionError,
updateModesFromData,
updateCwdFromData,
}: UseTerminalStreamOptions): UseTerminalStreamReturn {
const setPaneStatus = useTabsStore((s) => s.setPaneStatus);
const removePane = useTabsStore((s) => s.removePane);
const firstStreamDataReceivedRef = useRef(false);

// Refs to use latest values in callbacks
Expand All @@ -54,10 +57,19 @@ export function useTerminalStream({

const handleTerminalExit = useCallback(
(exitCode: number, xterm: XTerm) => {
const wasKilledByUser = isTerminalKilledByUser(paneId);

// Auto-close pane on Ctrl+D (clean exit after EOF)
if (exitCode === 0 && ctrlDSentRef.current && !wasKilledByUser) {
ctrlDSentRef.current = false;
removePane(paneId);
return;
}
ctrlDSentRef.current = false;

isExitedRef.current = true;
isStreamReadyRef.current = false;

const wasKilledByUser = isTerminalKilledByUser(paneId);
wasKilledByUserRef.current = wasKilledByUser;
setExitStatus(wasKilledByUser ? "killed" : "exited");

Expand All @@ -83,8 +95,10 @@ export function useTerminalStream({
isExitedRef,
isStreamReadyRef,
wasKilledByUserRef,
ctrlDSentRef,
setExitStatus,
setPaneStatus,
removePane,
],
);

Expand Down