Merge pull request #76 from moazbuilds/fix/log-scroll-and-dublication

Fix/log scroll and dublication

Author: moazbuilds

src/cli/tui/routes/workflow/components/output/output-window.tsx

@@ -111,10 +111,17 @@ export function OutputWindow(props: OutputWindowProps) {
         // Trigger load when near the top (within 3 lines) - skip if already loading
         if (scrollTop <= 3 && props.hasMoreAbove && props.onLoadMore && !props.isLoadingEarlier) {
           debug('[OutputWindow] Loading earlier lines...')
+          const scrollHeightBefore = ref.scrollHeight
           const linesLoaded = props.onLoadMore()
           debug('[OutputWindow] Lines loaded: %d', linesLoaded)
           if (linesLoaded > 0) {
-            ref.scrollTop = linesLoaded  // Maintain view position
+            // SolidJS updates DOM synchronously, so we can measure and adjust immediately
+            const scrollHeightAfter = ref.scrollHeight
+            const heightAdded = scrollHeightAfter - scrollHeightBefore
+            // Maintain view position with small slack to prevent immediate re-trigger
+            const slack = 5
+            ref.scrollTop = scrollTop + heightAdded + slack
+            debug('[OutputWindow] Scroll adjusted: heightAdded=%d, slack=%d, newScrollTop=%d', heightAdded, slack, ref.scrollTop)
           }
         }
       }

src/cli/tui/routes/workflow/hooks/useLogStream.ts

@@ -109,7 +109,8 @@ function readLogFileIncremental(
     if (currentSize < state.lastFileSize) {
       logDebug('File truncated, doing full read. Old size: %d, new size: %d', state.lastFileSize, currentSize)
       const content = readFileSync(path, "utf-8")
-      const lines = content.split("\n")
+      // Filter empty lines to match incremental read behavior
+      const lines = content.split("\n").filter(line => line !== '')
       state.lastFileSize = currentSize
       state.lastLineCount = lines.length
       return {
@@ -123,8 +124,9 @@ function readLogFileIncremental(
     // For small files, just do a full read (simpler and fast enough)
     if (currentSize < INCREMENTAL_THRESHOLD_BYTES) {
       const content = readFileSync(path, "utf-8")
-      const lines = content.split("\n")
-      const newLinesCount = lines.length - state.lastLineCount
+      // Filter empty lines to match incremental read behavior
+      const lines = content.split("\n").filter(line => line !== '')
+      const newLinesCount = Math.max(0, lines.length - state.lastLineCount)
       state.lastFileSize = currentSize
       state.lastLineCount = lines.length
       return {
@@ -180,14 +182,15 @@ function readLogFileIncremental(
 
 /**
  * Read entire log file (used for initial load or after truncation)
+ * Filters empty lines to match incremental read behavior
  */
 function readLogFileFull(path: string): string[] {
   try {
     if (!existsSync(path)) {
       return []
     }
     const content = readFileSync(path, "utf-8")
-    return content.split("\n")
+    return content.split("\n").filter(line => line !== '')
   } catch {
     return []
   }
@@ -499,8 +502,9 @@ export function useLogStream(
           const currentFileSize = getFileSize(logPath)
 
           // Update incremental state
+          // IMPORTANT: Track RAW line count, not filtered, to match readLogFileIncremental
           incrementalState.lastFileSize = currentFileSize
-          incrementalState.lastLineCount = filteredLines.length
+          incrementalState.lastLineCount = fileLines.length
 
           // Update windowed state
           const trimCount = Math.max(0, filteredLines.length - maxWindow)