@brimveyn/aimux 1.14.6 → 1.14.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux",
-  "version": "1.14.6",
+  "version": "1.14.8",
   "description": "A terminal multiplexer for AI CLIs. Run Claude, Codex, OpenCode side-by-side with tabbed navigation, split panes, and persistent sessions.",
   "keywords": [
     "ai",

package/src/app.tsx

@@ -247,8 +247,14 @@ export function App({
   }, [])
 
   const resizingRef = useRef(false)
+  // Seeded with state.layout's DEFAULT 80x24; reassigned below once
+  // useTerminalResize has produced the open-loop estimate from real dimensions.
+  // Reading state.layout here is wrong: on the first render state.layout is
+  // still the bootstrap default, and useBackendRuntime's attach effect would
+  // then hand 80x24 to the backend, resizing the daemon-persisted PTYs (or
+  // newly-spawned ones) to the wrong size and stranding the assistant's
+  // already-drawn content in the top-left until a workspace switch.
   const layoutRef = useRef(state.layout)
-  layoutRef.current = state.layout
   const activeTab = useMemo(
     () => state.tabs.find((tab) => tab.id === state.activeTabId),
     [state.activeTabId, state.tabs]
@@ -282,6 +288,18 @@ export function App({
   const contentOriginRef = useRef<TerminalContentOrigin>({ cols: 0, rows: 0, x: 0, y: 0 })
   const currentSessionWorkspaceSnapshot = currentSession?.workspaceSnapshot
 
+  // Must run before useBackendRuntime so its open-loop terminalSize seeds
+  // layoutRef before the attach effect reads it. See the comment on layoutRef.
+  const terminalSize = useTerminalResize({
+    backend,
+    contentOriginRef,
+    dimensions,
+    dispatch,
+    resizingRef,
+    state,
+  })
+  layoutRef.current = { terminalCols: terminalSize.cols, terminalRows: terminalSize.rows }
+
   const syntaxOverlayFlag = resolvedConfig.theme?.beta?.experimentalSyntaxHighlight === true
   const syntaxOverlayFlagRef = useRef(syntaxOverlayFlag)
   syntaxOverlayFlagRef.current = syntaxOverlayFlag
@@ -334,15 +352,6 @@ export function App({
     stateRef,
   })
 
-  const terminalSize = useTerminalResize({
-    backend,
-    contentOriginRef,
-    dimensions,
-    dispatch,
-    resizingRef,
-    state,
-  })
-
   const {
     handleEmbeddedGitResizeStart,
     handleGitPaneResizeStart,

package/src/ui/components/layout/terminal-pane.tsx

@@ -330,6 +330,37 @@ export function TerminalPane({
   )
   const forwardScrollEvent = useCallback(
     (event: OtuiMouseEvent) => {
+      // opentui's processMouseEvent dispatches a scroll to the deepest renderable
+      // (the <text> inside this box) BEFORE bubbling up to our handler.
+      // TextBufferRenderable's built-in onMouseEvent unconditionally calls
+      // handleScroll, which mutates its private _scrollY. preventDefault on the
+      // bubbled event can't roll that back — the scroll already happened. And
+      // nothing in React ever resets _scrollY for the lifetime of the renderable.
+      //
+      // Net effect: every wheel event over the terminal nudges the rendered
+      // text away from state.viewport.lines by one wheel step. The drift
+      // accumulates until the user refreshes aimux (re-mounts the text).
+      // Reset _scrollY here, right after the child finished scrolling.
+      const scrollTarget = event.target
+      if (scrollTarget !== null && typeof scrollTarget === 'object') {
+        const currentScrollY = Reflect.get(scrollTarget, 'scrollY')
+        if (typeof currentScrollY === 'number' && currentScrollY !== 0) {
+          try {
+            Reflect.set(scrollTarget, 'scrollY', 0)
+          } catch {
+            // Not all renderables expose a setter; best-effort only.
+          }
+        }
+        const currentScrollX = Reflect.get(scrollTarget, 'scrollX')
+        if (typeof currentScrollX === 'number' && currentScrollX !== 0) {
+          try {
+            Reflect.set(scrollTarget, 'scrollX', 0)
+          } catch {
+            // Not all renderables expose a setter; best-effort only.
+          }
+        }
+      }
+
       if (!canForwardMouse && !canUseLocalScrollback) {
         return
       }