@brimveyn/aimux 1.14.9 → 1.14.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux",
-  "version": "1.14.9",
+  "version": "1.14.11",
   "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-runtime/side-effects.ts

@@ -57,6 +57,7 @@ import {
 } from '../state/layout-tree'
 import { filterAssistants, filterSessions, filterSnippets } from '../state/selectors'
 import { saveSessionCatalog } from '../state/session-catalog'
+import { pruneSnapshotOfWorktree } from '../state/session-persistence'
 import {
   filterTabsForActiveWorktree,
   getActiveWorktree,
@@ -1524,6 +1525,7 @@ function removeWorktreeRecordFromSession(
     activeWorktreeId: nextActive?.id,
     projectPath: nextActive?.path ?? entry.projectPath,
     updatedAt: new Date().toISOString(),
+    workspaceSnapshot: pruneSnapshotOfWorktree(entry.workspaceSnapshot, worktreeId),
     worktrees: remaining,
   }))
   saveSessionCatalog(sessions)

package/src/state/reducers/tab-state.ts

@@ -394,7 +394,12 @@ export function reduceTabState(state: AppState, action: AppAction): AppState | n
       if (state.tabs.length === 0) {
         return state
       }
-      const orderedTabs = orderTabsByWorktree(state.tabs, getCurrentSession(state))
+      const session = getCurrentSession(state)
+      const visibleTabs = filterTabsForActiveWorktree(state.tabs, session)
+      if (visibleTabs.length === 0) {
+        return state
+      }
+      const orderedTabs = orderTabsByWorktree(visibleTabs, session)
       const currentIndex = orderedTabs.findIndex((tab) => tab.id === state.activeTabId)
       const safeIndex = currentIndex === -1 ? 0 : currentIndex
       const nextIndex = (safeIndex + action.delta + orderedTabs.length) % orderedTabs.length

package/src/state/session-persistence.ts

@@ -126,6 +126,58 @@ export function restoreLayoutTrees(
   return { layoutTrees, tabGroupMap }
 }
 
+// When a worktree is removed, its tabs are killed live via disposeWorktreeTabs
+// — but the session's persisted workspaceSnapshot still references them by
+// worktreeId. Without this pruning, a subsequent load-session (session switch
+// or restart) resurrects the dead tabs and they reappear in h-l navigation.
+export function pruneSnapshotOfWorktree(
+  snapshot: WorkspaceSnapshotV1 | undefined,
+  worktreeId: string
+): WorkspaceSnapshotV1 | undefined {
+  if (!snapshot) return snapshot
+  const keptTabs = snapshot.tabs.filter((tab) => tab.worktreeId !== worktreeId)
+  if (keptTabs.length === snapshot.tabs.length) return snapshot
+  const validTabIds = new Set(keptTabs.map((tab) => tab.id))
+
+  let nextLayoutTrees: typeof snapshot.layoutTrees
+  let nextTabGroupMap: typeof snapshot.tabGroupMap
+  if (snapshot.layoutTrees) {
+    const trees: Record<string, LayoutNode> = {}
+    const groupMap: Record<string, string> = {}
+    for (const [groupId, tree] of Object.entries(snapshot.layoutTrees)) {
+      const pruned = pruneLayoutTree(tree, validTabIds)
+      if (pruned && pruned.type === 'split') {
+        trees[groupId] = pruned
+        for (const leafId of allLeafIds(pruned)) {
+          groupMap[leafId] = groupId
+        }
+      }
+    }
+    nextLayoutTrees = Object.keys(trees).length > 0 ? trees : undefined
+    nextTabGroupMap = Object.keys(groupMap).length > 0 ? groupMap : undefined
+  }
+
+  let nextLayoutTree = snapshot.layoutTree
+  if (nextLayoutTree) {
+    const pruned = pruneLayoutTree(nextLayoutTree, validTabIds)
+    nextLayoutTree = pruned && pruned.type === 'split' ? pruned : undefined
+  }
+
+  const nextActiveTabId =
+    snapshot.activeTabId != null && validTabIds.has(snapshot.activeTabId)
+      ? snapshot.activeTabId
+      : (keptTabs[0]?.id ?? null)
+
+  return {
+    ...snapshot,
+    activeTabId: nextActiveTabId,
+    layoutTree: nextLayoutTree,
+    layoutTrees: nextLayoutTrees,
+    tabGroupMap: nextTabGroupMap,
+    tabs: keptTabs,
+  }
+}
+
 export function normalizeGroupedTabOrder(
   tabs: TabSession[],
   layoutTrees: Record<string, LayoutNode>,

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

@@ -1,4 +1,4 @@
-import type { MouseEvent as OtuiMouseEvent } from '@opentui/core'
+import type { MouseEvent as OtuiMouseEvent, TextRenderable } from '@opentui/core'
 
 import { memo, type ReactNode, useCallback, useMemo } from 'react'
 
@@ -104,6 +104,27 @@ interface TerminalViewportProps {
   buffer: string
 }
 
+const NOOP = (): void => {}
+
+// aimux renders the exact visible window and owns scrollback through the backend
+// xterm buffer (viewportY); opentui's built-in text scroll (_scrollY) must never
+// engage. During any transient where the rendered content is briefly taller than
+// the box (resize lag, or — with the old default wrapMode="word" — a line that
+// wraps) a wheel event bumps _scrollY, and opentui's onResize never re-clamps it,
+// so the offset sticks for the renderable's life: the viewport shifts up, dead
+// rows appear at the bottom, and the prompt scrolls off-screen after `clear`.
+// Pin the offset to 0 and disable the built-in wheel handler outright (it also
+// drives horizontal scroll once wrapMode is "none"). The event still bubbles to
+// forwardScrollEvent, so local scrollback / mouse-forwarding keep working, and
+// selection is unaffected (it's driven by the renderer, not handleScroll).
+// handleScroll is protected; reach it via Reflect, mirroring the scrollY reset
+// already used in TerminalPane.
+const pinTerminalScroll = (node: TextRenderable | null): void => {
+  if (!node) return
+  Reflect.set(node, 'handleScroll', NOOP)
+  if (node.scrollY !== 0) node.scrollY = 0
+}
+
 const TerminalViewport = memo(function TerminalViewport({
   buffer,
   viewport,
@@ -112,7 +133,7 @@ const TerminalViewport = memo(function TerminalViewport({
   if (viewport && viewport.lines.length > 0) {
     const lines = viewport.lines
     return (
-      <text fg={t.text}>
+      <text ref={pinTerminalScroll} fg={t.text} wrapMode="none">
         {lines.map((line, lineIndex) => (
           // Terminal rows are a fixed positional grid; the row index is the identity.
           // eslint-disable-next-line react/no-array-index-key
@@ -125,7 +146,11 @@ const TerminalViewport = memo(function TerminalViewport({
     )
   }
 
-  return <text fg={t.text}>{buffer.length > 0 ? buffer : 'Waiting for workspace output...'}</text>
+  return (
+    <text ref={pinTerminalScroll} fg={t.text} wrapMode="none">
+      {buffer.length > 0 ? buffer : 'Waiting for workspace output...'}
+    </text>
+  )
 })
 
 export function TerminalPane({