Skip to content

fix: stop terminal resize loop on dead shell session #2095

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
charlesvien merged 2 commits into from
May 7, 2026
Merged

fix: stop terminal resize loop on dead shell session #2095

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
868f64c
fix: stop terminal resize loop on dead shell session
May 7, 2026
28489ab
refactor: extract disconnectResizeObserver helper
pauldambra May 7, 2026
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
22 changes: 14 additions & 8 deletions apps/code/src/renderer/features/terminal/services/TerminalManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,11 @@ class TerminalManagerImpl {
handleExit(sessionId: string, exitCode?: number): void {
const instance = this.instances.get(sessionId);
if (instance) {
// Without this, ResizeObserver keeps firing shell.resize against the dead
Comment thread
pauldambra marked this conversation as resolved.
// session on every layout shift, producing a TRPC error per call and
// wedging the renderer.
instance.isReady = false;
Comment thread
pauldambra marked this conversation as resolved.
Comment thread
pauldambra marked this conversation as resolved.
this.disconnectResizeObserver(instance);
this.emit("exit", {
sessionId,
Comment thread
pauldambra marked this conversation as resolved.
persistenceKey: instance.persistenceKey,
Expand All @@ -281,6 +286,13 @@ class TerminalManagerImpl {
}
}

private disconnectResizeObserver(instance: TerminalInstance): void {
if (instance.resizeObserver) {
instance.resizeObserver.disconnect();
instance.resizeObserver = null;
}
}

private scheduleSave(sessionId: string, instance: TerminalInstance): void {
if (instance.saveTimeout) {
clearTimeout(instance.saveTimeout);
Expand All @@ -307,10 +319,7 @@ class TerminalManagerImpl {
return;
}

if (instance.resizeObserver) {
instance.resizeObserver.disconnect();
instance.resizeObserver = null;
}
this.disconnectResizeObserver(instance);

instance.attachedElement = element;

Expand Down Expand Up @@ -355,10 +364,7 @@ class TerminalManagerImpl {
return;
}

if (instance.resizeObserver) {
instance.resizeObserver.disconnect();
instance.resizeObserver = null;
}
this.disconnectResizeObserver(instance);

const serialized = instance.serializeAddon.serialize();
this.emit("stateChange", {
Expand Down
Loading