diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/Terminal.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/Terminal.tsx index 66c7f041da2..14bfdda99a6 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/Terminal.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/Terminal.tsx @@ -322,10 +322,9 @@ export const Terminal = ({ tabId, workspaceId }: TerminalProps) => { if (initialCommands || initialCwd) { clearPaneInitialDataRef.current(paneId); } - const hasPendingEvents = pendingEventsRef.current.length > 0; - if (result.isNew || !hasPendingEvents) { - applyInitialState(result); - } + // Always apply initial state (scrollback) first, then flush pending events + // This ensures we don't lose terminal history when reattaching + applyInitialState(result); setSubscriptionEnabled(true); flushPendingEvents(); },