Skip to content

fix(desktop): guard terminal resume against in-flight connect #5137

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

Merged
saddlepaddle merged 1 commit into from
Jun 5, 2026
Merged

fix(desktop): guard terminal resume against in-flight connect #5137

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
8 changes: 5 additions & 3 deletions apps/desktop/src/renderer/lib/terminal/terminal-ws-transport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,13 @@ function handleResume(transport: TerminalTransport) {
if (transport._terminated) return;
if (!transport.currentUrl || !transport._terminal) return;
transport._reconnectAttempt = 0;
// Bail if a connect is already in flight. State "connecting" also covers the
// /hosts/ pre-flight window, where transport.socket is still null but
// reconnecting would orphan the socket the pending pre-flight is about to open.
const socket = transport.socket;
if (
socket &&
(socket.readyState === WebSocket.OPEN ||
socket.readyState === WebSocket.CONNECTING)
transport.connectionState === "connecting" ||
socket?.readyState === WebSocket.OPEN
) {
return;
}
Expand Down
Loading