diff --git a/apps/web/src/terminalUiStateStore.test.ts b/apps/web/src/terminalUiStateStore.test.ts index 6b043606f564b..b4030d453b41a 100644 --- a/apps/web/src/terminalUiStateStore.test.ts +++ b/apps/web/src/terminalUiStateStore.test.ts @@ -244,6 +244,25 @@ describe("terminalUiStateStore actions", () => { expect(layout().terminalIds).toEqual([DEFAULT_THREAD_TERMINAL_ID, "new"]); }); + it.each([ + ["unmounts right after the close", false], + ["sees the closing terminal once more before it unmounts", true], + ])("keeps a reopened terminal when the drawer %s", (_case, staleReconcile) => { + const store = useTerminalUiStateStore.getState(); + store.setTerminalOpen(THREAD_REF, true); + store.reconcileTerminalIds(THREAD_REF, [DEFAULT_THREAD_TERMINAL_ID], "manager-1"); + store.closeTerminal(THREAD_REF, DEFAULT_THREAD_TERMINAL_ID); + if (staleReconcile) { + store.reconcileTerminalIds(THREAD_REF, [DEFAULT_THREAD_TERMINAL_ID], "manager-1"); + } + // The drawer is gone now, so nothing reconciles the server dropping the terminal. + store.ensureTerminal(THREAD_REF, DEFAULT_THREAD_TERMINAL_ID, { open: true }); + store.reconcileTerminalIds(THREAD_REF, [], "manager-1"); + + expect(layout().terminalOpen).toBe(true); + expect(layout().terminalIds).toEqual([DEFAULT_THREAD_TERMINAL_ID]); + }); + it("keeps the surviving pane active when another client closes its split sibling", () => { const store = useTerminalUiStateStore.getState(); store.newTerminal(THREAD_REF, "first"); diff --git a/apps/web/src/terminalUiStateStore.ts b/apps/web/src/terminalUiStateStore.ts index 6e0d88e784d47..6bb939f795846 100644 --- a/apps/web/src/terminalUiStateStore.ts +++ b/apps/web/src/terminalUiStateStore.ts @@ -568,6 +568,22 @@ interface TerminalServerObservation { readonly snapshotId: string | symbol | undefined; } +function forgetObservedTerminalId( + serverObservationsByThreadKey: Record, + threadKey: string, + terminalId: string, +): Record { + const observation = serverObservationsByThreadKey[threadKey]; + if (!observation?.ids.includes(terminalId)) { + return serverObservationsByThreadKey; + } + const ids = observation.ids.filter((id) => id !== terminalId); + if (ids.length === 0) { + return removeRecordEntry(serverObservationsByThreadKey, threadKey); + } + return { ...serverObservationsByThreadKey, [threadKey]: { ...observation, ids } }; +} + interface TerminalUiStateStoreState { serverObservationsByThreadKey: Record; terminalUiStateByThreadKey: Record; @@ -642,15 +658,32 @@ export const useTerminalUiStateStore = create()( suppression.suppressed, ) : state.suppressedTerminalIdsByThreadKey; + // A listing from before this client placed the id is about an earlier terminal, so it + // must not make reconcile close the new one. + const nextServerObservationsByThreadKey = + suppression && + !suppression.suppressed && + !selectThreadTerminalUiState( + state.terminalUiStateByThreadKey, + threadRef, + ).terminalIds.includes(suppression.terminalId) + ? forgetObservedTerminalId( + state.serverObservationsByThreadKey, + terminalThreadKey(threadRef), + suppression.terminalId, + ) + : state.serverObservationsByThreadKey; if ( nextTerminalUiStateByThreadKey === state.terminalUiStateByThreadKey && - nextSuppressedTerminalIdsByThreadKey === state.suppressedTerminalIdsByThreadKey + nextSuppressedTerminalIdsByThreadKey === state.suppressedTerminalIdsByThreadKey && + nextServerObservationsByThreadKey === state.serverObservationsByThreadKey ) { return state; } return { terminalUiStateByThreadKey: nextTerminalUiStateByThreadKey, suppressedTerminalIdsByThreadKey: nextSuppressedTerminalIdsByThreadKey, + serverObservationsByThreadKey: nextServerObservationsByThreadKey, }; }); };