From db65beeb05ad74263dfcebd187a821e33aef2791 Mon Sep 17 00:00:00 2001
From: sgeraldes <199673787+sgeraldes@users.noreply.github.com>
Date: Wed, 14 Jan 2026 22:36:41 -0300
Subject: [PATCH] fix: prevent terminal history duplication on restart

Fixes a bug where terminal output was duplicated when restarting Wave Terminal.

The issue occurred because:
1. The terminal cache contains the fully rendered terminal state (scrollback + screen)
   up to a specific PTY offset X
2. The main terminal file was then loaded from offset X and re-rendered
3. This caused duplication because the cached state already included the rendered
   output from that data

The fix ensures that when loading from cache, we fetch the main file from the
cached ptyOffset, which returns only NEW data that arrived after the cache was
saved, preventing duplication of already-rendered content.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 frontend/app/view/term/termwrap.ts | 31 +++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/frontend/app/view/term/termwrap.ts b/frontend/app/view/term/termwrap.ts
index 6393b2165a..7b5bc8705b 100644
--- a/frontend/app/view/term/termwrap.ts
+++ b/frontend/app/view/term/termwrap.ts
@@ -188,6 +188,21 @@ function handleOsc7Command(data: string, blockId: string, loaded: boolean): bool
             await RpcApi.SetRTInfoCommand(TabRpcClient, rtInfoData).catch((e) =>
                 console.log("error setting RT info", e)
             );
+
+            // Smart auto-detection: Update tab basedir if not locked
+            const tabAtom = globalStore.get(atoms.activeTabAtom);
+            const currentBasedir = tabAtom?.meta?.["tab:basedir"];
+            const basedirLocked = tabAtom?.meta?.["tab:basedirlock"];
+
+            // Set tab basedir if not set yet, or if not locked and this is the first meaningful directory
+            if (!basedirLocked && (!currentBasedir || currentBasedir === "~")) {
+                await services.ObjectService.UpdateObjectMeta(
+                    WOS.makeORef("tab", tabAtom.oid),
+                    {
+                        "tab:basedir": pathPart,
+                    }
+                );
+            }
         });
     }, 0);
     return true;
@@ -702,6 +717,7 @@ export class TermWrap {
         let startTs = Date.now();
         const { data: cacheData, fileInfo: cacheFile } = await fetchWaveFile(this.blockId, TermCacheFileName);
         let ptyOffset = 0;
+        let loadedFromCache = false;
         if (cacheFile != null) {
             ptyOffset = cacheFile.meta["ptyoffset"] ?? 0;
             if (cacheData.byteLength > 0) {
@@ -720,13 +736,22 @@ export class TermWrap {
                 if (didResize) {
                     this.terminal.resize(curTermSize.cols, curTermSize.rows);
                 }
+                loadedFromCache = true;
             }
         }
-        const { data: mainData, fileInfo: mainFile } = await fetchWaveFile(this.blockId, TermFileName, ptyOffset);
+        // Only load main file data if we didn't load from cache, or load only NEW data after cache
+        // The cache contains the fully rendered terminal state, so loading from ptyOffset would duplicate data
+        const { data: mainData, fileInfo: mainFile } = await fetchWaveFile(
+            this.blockId,
+            TermFileName,
+            loadedFromCache ? ptyOffset : 0
+        );
         console.log(
-            `terminal loaded cachefile:${cacheData?.byteLength ?? 0} main:${mainData?.byteLength ?? 0} bytes, ${Date.now() - startTs}ms`
+            `terminal loaded cachefile:${cacheData?.byteLength ?? 0} main:${mainData?.byteLength ?? 0} bytes (cached=${loadedFromCache}, offset=${ptyOffset}), ${Date.now() - startTs}ms`
         );
-        if (mainFile != null) {
+        // If we loaded from cache, only append new data that arrived after the cache was saved
+        // If no cache, load all data from the beginning
+        if (mainFile != null && mainData != null && mainData.byteLength > 0) {
             await this.doTerminalWrite(mainData, null);
         }
     }