starred/orca
1
0
Fork 0
mirror of https://github.com/stablyai/orca.git synced 2026-09-29 00:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(terminal): poll across frames in post-spawn PTY reconcile (#6649)

Browse Source 
Follow-up to #6644. The merged fix used a single post-spawn
requestAnimationFrame, which did not fully close the first-mount column
race: the pane's real layout can keep changing for several frames (split
equalize, sidebar/title reflow), so a one-shot re-fit could still measure a
stale width and leave the PTY pinned. The golden 'during initial mount' e2e
test failed ~1 in 9 runs with the single-frame version.

Poll for up to 12 frames, forwarding the settled size to the PTY only when
it differs from what the PTY was last told (mirroring the existing
ResizeObserver stability loop). Each resize is gated on an actual change, so
a TUI sees at most a couple of SIGWINCH during startup, not a loop.

Verified: golden test passes 6/6 with repeat-each + retries; full spec
15/15. Without this change the single-frame version is intermittently flaky.

Co-authored-by: Orca <help@stably.ai>
This commit is contained in:
Jinjing
2026-06-28 14:44:01 -07:00
committed by GitHub
co-authored by Orca
parent d3e6449373
commit 11a0a36087
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/src/components/terminal-pane/pty-connection.ts
+24 -3
View File
@@ -2125,20 +2125,41 @@ export function connectPanePty(
spawnCols: number,
spawnRows: number
): void => {
requestAnimationFrame(() => {
// Why: a single post-spawn frame is not enough — the pane's real layout can
// keep changing for several frames (split equalize, sidebar/title reflow),
// so a one-shot re-fit can still measure a stale width and leave the PTY
// pinned. Poll across frames and forward the settled size to the PTY
// whenever it differs from what the PTY was last told, mirroring the
// ResizeObserver stability loop. Each resize is gated on an actual change,
// so a TUI sees at most a couple of SIGWINCH during startup, not a loop.
const MAX_RECONCILE_FRAMES = 12
let lastSentCols = spawnCols
let lastSentRows = spawnRows
let frame = 0
const tick = (): void => {
if (disposed || transport.getPtyId() !== ptyId) {
return
}
// Mobile legitimately parks the PTY at phone dims; never fight that.
if (getFitOverrideForPty(ptyId) || isPtyLocked(ptyId)) {
return
}
safeFit(pane)
const cols = pane.terminal.cols
const rows = pane.terminal.rows
if (cols > 0 && rows > 0 && (cols !== spawnCols || rows !== spawnRows)) {
if (cols > 0 && rows > 0 && (cols !== lastSentCols || rows !== lastSentRows)) {
// Initial spawn-time sync is authoritative, so it bypasses the
// visibility gate that onResize honors (but not the mobile guards above).
transport.resize(cols, rows)
lastSentCols = cols
lastSentRows = rows
}
})
frame += 1
if (frame < MAX_RECONCILE_FRAMES) {
requestAnimationFrame(tick)
}
}
requestAnimationFrame(tick)
}
// Defer PTY spawn/attach to next frame so FitAddon has time to calculate