From dcca44b1804ee9bdfa159327bedd2a486e439105 Mon Sep 17 00:00:00 2001 From: Kiet Ho Date: Sat, 31 Jan 2026 18:49:17 -0800 Subject: [PATCH 1/2] No popup --- .../ContentView/TabsContent/Terminal/Terminal.tsx | 14 ++++++-------- .../Terminal/hooks/useTerminalColdRestore.ts | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) 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 9a9736fd98b..f4932efe1e0 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 @@ -6,11 +6,7 @@ import { useEffect, useRef, useState } from "react"; import { electronTrpc } from "renderer/lib/electron-trpc"; import { useTabsStore } from "renderer/stores/tabs/store"; import { useTerminalTheme } from "renderer/stores/theme"; -import { - ConnectionErrorOverlay, - RestoredModeOverlay, - SessionKilledOverlay, -} from "./components"; +import { ConnectionErrorOverlay, SessionKilledOverlay } from "./components"; import { getDefaultTerminalBg, type TerminalRendererRef } from "./helpers"; import { useFileLinkClick, @@ -218,6 +214,11 @@ export const Terminal = ({ paneId, tabId, workspaceId }: TerminalProps) => { xtermRef, }); + useEffect(() => { + if (!isRestoredMode || !isFocused) return; + handleStartShell(); + }, [isRestoredMode, isFocused, handleStartShell]); + const { xtermInstance, restartTerminal } = useTerminalLifecycle({ paneId, tabIdRef, @@ -308,9 +309,6 @@ export const Terminal = ({ paneId, tabId, workspaceId }: TerminalProps) => { {connectionError && ( )} - {isRestoredMode && ( - - )}
); diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/hooks/useTerminalColdRestore.ts b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/hooks/useTerminalColdRestore.ts index ca2ca7e91f8..42f0c246b81 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/hooks/useTerminalColdRestore.ts +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/hooks/useTerminalColdRestore.ts @@ -184,7 +184,7 @@ export function useTerminalColdRestore({ }); // Add visual separator - xterm.write("\r\n\x1b[90m─── New session ───\x1b[0m\r\n\r\n"); + xterm.write("\r\n\x1b[90m─── Session Contents Restored ───\x1b[0m\r\n\r\n"); // Reset state for new session isStreamReadyRef.current = false; From c59790ca7f49f788ce85bac48fba8886717130f3 Mon Sep 17 00:00:00 2001 From: Kiet Ho Date: Sat, 31 Jan 2026 18:53:07 -0800 Subject: [PATCH 2/2] No focus guard --- .../ContentView/TabsContent/Terminal/Terminal.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 f4932efe1e0..480afe2a633 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 @@ -215,9 +215,9 @@ export const Terminal = ({ paneId, tabId, workspaceId }: TerminalProps) => { }); useEffect(() => { - if (!isRestoredMode || !isFocused) return; + if (!isRestoredMode) return; handleStartShell(); - }, [isRestoredMode, isFocused, handleStartShell]); + }, [isRestoredMode, handleStartShell]); const { xtermInstance, restartTerminal } = useTerminalLifecycle({ paneId,