Clear terminal viewport before final close

Julius Marminge committed 9 months ago

Commit 0be98ea1 parent 2cd92ae1 file · +10 −4Browse files

Unified · Split

   const closeTerminal = useCallback(
     (terminalId: string) => {
       if (!activeThreadId || !api) return;
+      const isFinalTerminal = (activeThread?.terminalIds.length ?? 0) <= 1;
       const fallbackExitWrite = () =>
         api.terminal
           .write({ threadId: activeThreadId, terminalId, data: "exit\n" })
           .catch(() => undefined);
       if ("close" in api.terminal && typeof api.terminal.close === "function") {
-        void api.terminal
+        void (async () => {
-          .close({ threadId: activeThreadId, terminalId, deleteHistory: true })
+          if (isFinalTerminal) {
-          .catch(() => fallbackExitWrite());
+            await api.terminal
+              .clear({ threadId: activeThreadId, terminalId })
+              .catch(() => undefined);
+          }
+          await api.terminal.close({ threadId: activeThreadId, terminalId, deleteHistory: true });
+        })().catch(() => fallbackExitWrite());
       } else {
         void fallbackExitWrite();
       }
       });
       setTerminalFocusRequestId((value) => value + 1);
     },
-    [activeThreadId, api, dispatch],
+    [activeThread?.terminalIds.length, activeThreadId, api, dispatch],
   );
   const handleRuntimeModeChange = async (mode: "approval-required" | "full-access") => {