Skip to content

fix(desktop): trigger TUI resize on reattach and focus #792

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
Kitenite merged 9 commits into from
Jan 18, 2026
Merged

fix(desktop): trigger TUI resize on reattach and focus #792

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
52bc9b6
fix(desktop): trigger TUI repaint on pane focus change
Kitenite Jan 17, 2026
a35282b
refactor(desktop): remove redundant pane focus resize nudge
Kitenite Jan 17, 2026
3c83209
Revert "refactor(desktop): remove redundant pane focus resize nudge"
Kitenite Jan 17, 2026
19c4da7
refactor(desktop): remove redundant pane focus resize nudge
Kitenite Jan 17, 2026
ca3ec28
Revert "refactor(desktop): remove redundant pane focus resize nudge"
Kitenite Jan 17, 2026
1d4e03c
Reapply "refactor(desktop): remove redundant pane focus resize nudge"
Kitenite Jan 17, 2026
76432c5
Revert "Reapply "refactor(desktop): remove redundant pane focus resiz…
Kitenite Jan 17, 2026
d2458d4
fix(desktop): simplify terminal reattach resize handling
Kitenite Jan 18, 2026
a8afc85
Lint
Kitenite Jan 18, 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
73 changes: 8 additions & 65 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 @@ -34,7 +34,6 @@ import { TerminalSearch } from "./TerminalSearch";
import type { TerminalProps, TerminalStreamEvent } from "./types";
import {
getScrollOffsetFromBottom,
restoreScrollPosition,
shellEscapePaths,
smoothScrollToBottom,
} from "./utils";
Expand Down Expand Up @@ -465,7 +464,6 @@ export const Terminal = ({ tabId, workspaceId }: TerminalProps) => {
}
}, [handleTerminalExit, setConnectionError]);

// biome-ignore lint/correctness/useExhaustiveDependencies: refs (resizeRef, updateCwdRef, rendererRef) used intentionally to read latest values without recreating callback
const maybeApplyInitialState = useCallback(() => {
if (!didFirstRenderRef.current) return;
const result = pendingInitialStateRef.current;
Expand All @@ -477,7 +475,7 @@ export const Terminal = ({ tabId, workspaceId }: TerminalProps) => {

// Clear before applying to prevent double-apply on concurrent triggers.
pendingInitialStateRef.current = null;
const restoreSequence = ++restoreSequenceRef.current;
const _restoreSequence = ++restoreSequenceRef.current;

try {
// Canonical initial content: prefer snapshot (daemon mode) over scrollback (non-daemon)
Expand Down Expand Up @@ -567,24 +565,10 @@ export const Terminal = ({ tabId, workspaceId }: TerminalProps) => {
}
flushPendingEvents();

// Fit xterm to container and trigger SIGWINCH
// Fit terminal to container - triggers resize which sends SIGWINCH
requestAnimationFrame(() => {
if (xtermRef.current !== xterm) return;

fitAddon.fit();
const cols = xterm.cols;
const rows = xterm.rows;

if (cols > 0 && rows > 0) {
// Resize down then up to guarantee SIGWINCH
resizeRef.current({ paneId, cols, rows: rows - 1 });
setTimeout(() => {
if (xtermRef.current !== xterm) return;
resizeRef.current({ paneId, cols, rows });
// Force xterm to repaint after SIGWINCH completes
xterm.refresh(0, rows - 1);
}, 100);
}
});
});

Expand All @@ -600,56 +584,15 @@ export const Terminal = ({ tabId, workspaceId }: TerminalProps) => {
const rehydrateSequences = result.snapshot?.rehydrateSequences ?? "";

const finalizeRestore = () => {
const redraw = () => {
requestAnimationFrame(() => {
try {
if (restoreSequenceRef.current !== restoreSequence) return;
if (xtermRef.current !== xterm) return;

fitAddon.fit();
if (xtermRef.current !== xterm) return;

// Reattached sessions can sometimes render partially until the user resizes the pane.
// WebGL off fully fixes this, which strongly suggests a WebGL texture-atlas repaint bug.
// Clearing the atlas forces xterm-webgl to rebuild glyphs and repaint without a resize nudge.
const cols = xterm.cols;
const rows = xterm.rows;
if (cols <= 0 || rows <= 0) return;

// Keep PTY dimensions in sync even when FitAddon doesn't change cols/rows.
resizeRef.current({ paneId, cols, rows });

if (!result.isNew) {
const renderer = rendererRef.current?.current;
if (renderer?.kind === "webgl") {
// Clear twice: once immediately, and once after fonts settle.
// This reduces restore artifacts (especially for TUIs like opencode)
// and prevents stale glyphs when fonts swap in.
renderer.clearTextureAtlas?.();
}
}
xterm.refresh(0, rows - 1);
restoreScrollPosition(xterm, result.viewportY);
} catch (error) {
console.warn(
"[Terminal] redraw() failed after restoration:",
error,
);
}
});
};

// Redraw once immediately, and once again after fonts settle.
redraw();
void document.fonts?.ready.then(() => {
if (restoreSequenceRef.current !== restoreSequence) return;
if (xtermRef.current !== xterm) return;
redraw();
});

// Enable streaming AFTER xterm has processed the restoration writes.
// This prevents live PTY output from interleaving with snapshot replay.
isStreamReadyRef.current = true;

// Fit terminal to container - triggers resize which sends SIGWINCH
requestAnimationFrame(() => {
if (xtermRef.current !== xterm) return;
fitAddon.fit();
});
if (DEBUG_TERMINAL) {
console.log(
`[Terminal] isStreamReady=true (finalizeRestore): ${paneId}, pendingEvents=${pendingEventsRef.current.length}`,
Expand Down
Loading