Skip to content

fix(terminal): cleanup broken tabs and show alerts on terminal errors #1780

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
bajrangCoder merged 2 commits into from
Dec 30, 2025
Merged

fix(terminal): cleanup broken tabs and show alerts on terminal errors #1780

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67a9401
fix(terminal): cleanup broken tabs and show alerts on terminal errors
bajrangCoder Dec 29, 2025
33a8a69
Apply suggestion from @gemini-code-assist[bot]
bajrangCoder Dec 29, 2025
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
61 changes: 57 additions & 4 deletions src/components/terminal/terminalManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import TerminalComponent from "./terminal";
import "@xterm/xterm/css/xterm.css";
import quickTools from "components/quickTools";
import toast from "components/toast";
import alert from "dialogs/alert";
import confirm from "dialogs/confirm";
import openFile from "lib/openFile";
import openFolder from "lib/openFolder";
Expand Down Expand Up @@ -108,6 +109,7 @@ class TerminalManager {
const manager = window.editorManager;
const activeFileId = manager?.activeFile?.id;
const restoredTerminals = [];
const failedSessions = [];

for (const session of sessions) {
if (!session?.pid) continue;
Expand All @@ -126,10 +128,20 @@ class TerminalManager {
`Failed to restore terminal session ${session.pid}:`,
error,
);
failedSessions.push(session.name || session.pid);
this.removePersistedSession(session.pid);
}
}

// Show alert for failed sessions (don't await to not block UI)
if (failedSessions.length > 0) {
const message =
failedSessions.length === 1
? `Failed to restore terminal: ${failedSessions[0]}`
: `Failed to restore ${failedSessions.length} terminals: ${failedSessions.join(", ")}`;
alert(strings["error"], message);
}

if (activeFileId && manager?.getFile) {
const fileToRestore = manager.getFile(activeFileId, "id");
fileToRestore?.makeActive();
Expand Down Expand Up @@ -236,6 +248,32 @@ class TerminalManager {
resolve(instance);
} catch (error) {
console.error("Failed to initialize terminal:", error);

// Cleanup on failure - dispose component and remove broken tab
try {
terminalComponent.dispose();
} catch (disposeError) {
console.error(
"Error disposing terminal component:",
disposeError,
);
}

try {
// Force remove the tab without confirmation
terminalFile._skipTerminalCloseConfirm = true;
terminalFile.remove(true);
} catch (removeError) {
console.error("Error removing terminal tab:", removeError);
}

// Show alert for terminal creation failure
const errorMessage = error?.message || "Unknown error";
alert(
strings["error"],
`Failed to create terminal: ${errorMessage}`,
);

reject(error);
}
}, 100);
Expand Down Expand Up @@ -533,9 +571,13 @@ class TerminalManager {

terminalComponent.onError = (error) => {
console.error(`Terminal ${terminalId} error:`, error);
window.toast?.("Terminal connection error");
// Close the terminal tab on error
this.closeTerminal(terminalId);

// Close the terminal and remove the tab
this.closeTerminal(terminalId, true);

// Show alert for connection error
const errorMessage = error?.message || "Connection lost";
alert(strings["error"], `Terminal connection error: ${errorMessage}`);
};

terminalComponent.onTitleChange = async (title) => {
Expand Down Expand Up @@ -624,7 +666,7 @@ class TerminalManager {
* Close a terminal session
* @param {string} terminalId - Terminal ID
*/
closeTerminal(terminalId) {
closeTerminal(terminalId, removeTab = false) {
const terminal = this.terminals.get(terminalId);
if (!terminal) return;

Expand All @@ -636,6 +678,7 @@ class TerminalManager {
// Cleanup resize observer
if (terminal.file._resizeObserver) {
terminal.file._resizeObserver.disconnect();
terminal.file._resizeObserver = null;
}

// Cleanup focus handlers
Expand All @@ -649,6 +692,16 @@ class TerminalManager {
// Remove from map
this.terminals.delete(terminalId);

// Optionally remove the tab as well
if (removeTab && terminal.file) {
try {
terminal.file._skipTerminalCloseConfirm = true;
terminal.file.remove(true);
} catch (removeError) {
console.error("Error removing terminal tab:", removeError);
}
}

if (this.getAllTerminals().size <= 0) {
Executor.stopService();
}
Expand Down