@brimveyn/aimux 1.13.2 → 1.14.1

package/src/app-runtime/use-terminal-resize.ts

@@ -10,7 +10,7 @@ import {
 
 import type { TerminalContentOrigin } from '../input/raw-input-handler'
 import type { SessionBackend } from '../session-backend/types'
-import type { AppAction, AppState, ScrollIntent } from '../state/types'
+import type { AppAction, AppState } from '../state/types'
 import type { MeasuredPaneRect } from './use-pane-size-report'
 
 import { getGitPaneWidthFromRatio } from '../state/git-pane-sizing'
@@ -44,7 +44,6 @@ function resizeSplitTabs(
   tabIds: string[],
   cols: number,
   rows: number,
-  intents: Map<string, ScrollIntent>,
   options?: { sync?: boolean }
 ): void {
   const bounds = getTerminalBounds(cols, rows)
@@ -52,13 +51,13 @@ function resizeSplitTabs(
 
   forEachSplitPaneRect(Object.values(layoutTrees), bounds, (tabId, rect) => {
     const size = toTerminalContentSize(rect)
-    backend.resizeTab(tabId, size.cols, size.rows, intents.get(tabId), options)
+    backend.resizeTab(tabId, size.cols, size.rows, options)
     resizedTabIds.add(tabId)
   })
 
   for (const id of tabIds) {
     if (!resizedTabIds.has(id)) {
-      backend.resizeTab(id, cols, rows, intents.get(id), options)
+      backend.resizeTab(id, cols, rows, options)
     }
   }
 }
@@ -81,7 +80,6 @@ interface RunResizeCascadeArgs {
   rows: number
   layoutTrees: AppState['layoutTrees']
   stableTabIds: string[]
-  intents: Map<string, ScrollIntent>
   sync: boolean
 }
 
@@ -89,7 +87,6 @@ function runResizeCascade({
   backend,
   cols,
   dispatch,
-  intents,
   layoutTrees,
   resizingRef,
   resizingTimerRef,
@@ -107,9 +104,9 @@ function runResizeCascade({
       clearTimeout(resizingTimerRef.current)
     }
     if (hasSplits) {
-      resizeSplitTabs(backend, layoutTrees, stableTabIds, cols, rows, intents, options)
+      resizeSplitTabs(backend, layoutTrees, stableTabIds, cols, rows, options)
     } else {
-      backend.resizeAll(cols, rows, intents, options)
+      backend.resizeAll(cols, rows, options)
     }
     resizingTimerRef.current = setTimeout(() => {
       resizingRef.current = false
@@ -133,7 +130,6 @@ export function useTerminalResize({
 }: UseTerminalResizeOptions) {
   const resizingTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
   const tabIdsRef = useRef<string[]>([])
-  const intentsRef = useRef<Map<string, ScrollIntent>>(new Map())
   const handledBySyncRef = useRef(false)
   const sidebarMountedRef = useRef(false)
 
@@ -146,12 +142,6 @@ export function useTerminalResize({
   }
   const stableTabIds = tabIdsRef.current
 
-  intentsRef.current = new Map(
-    state.tabs
-      .filter((t): t is typeof t & { scrollIntent: ScrollIntent } => t.scrollIntent !== undefined)
-      .map((t) => [t.id, t.scrollIntent])
-  )
-
   const activeTabIdRef = useRef(state.activeTabId)
   activeTabIdRef.current = state.activeTabId
   // Last size we pushed to the backend per tab, used to dedupe the measurement
@@ -176,7 +166,7 @@ export function useTerminalResize({
         return
       }
       measuredRef.current.set(tabId, { cols, rows })
-      backend.resizeTab(tabId, cols, rows, intentsRef.current.get(tabId))
+      backend.resizeTab(tabId, cols, rows)
     },
     [backend, contentOriginRef]
   )
@@ -185,8 +175,7 @@ export function useTerminalResize({
   const terminalSize = useMemo(() => {
     const sidebarWidth = state.sidebar.visible ? state.sidebar.width : 0
     const sessionBarRows = state.sessionBar.visible ? 1 : 0
-    const sessionBarTopOffset =
-      state.sessionBar.visible && state.sessionBar.position === 'top' ? 1 : 0
+    const sessionBarTopOffset = sessionBarRows
     const reservedRows =
       MAIN_AREA_VERTICAL_PADDING +
       STATUS_BAR_HEIGHT +
@@ -215,7 +204,6 @@ export function useTerminalResize({
     state.sidebar.visible,
     state.sidebar.width,
     state.sessionBar.visible,
-    state.sessionBar.position,
     gitPaneInPaneMode,
     state.gitPane.position,
     state.gitPane.paneRatio,
@@ -230,7 +218,6 @@ export function useTerminalResize({
       backend,
       cols: terminalSize.cols,
       dispatch,
-      intents: intentsRef.current,
       layoutTrees: state.layoutTrees,
       resizingRef,
       resizingTimerRef,
@@ -244,7 +231,6 @@ export function useTerminalResize({
     state.sidebar.visible,
     state.sidebar.width,
     state.sessionBar.visible,
-    state.sessionBar.position,
     gitPaneInPaneMode,
     state.gitPane.position,
     state.gitPane.paneRatio,
@@ -259,7 +245,6 @@ export function useTerminalResize({
       backend,
       cols: terminalSize.cols,
       dispatch,
-      intents: intentsRef.current,
       layoutTrees: state.layoutTrees,
       resizingRef,
       resizingTimerRef,

package/src/app.tsx

@@ -100,8 +100,6 @@ export function App({
     const json = loadConfig()
     const sessionBarVisible =
       resolvedConfig.sessionBar?.initialVisible ?? json.sessionBarVisible ?? true
-    const sessionBarPosition =
-      resolvedConfig.sessionBar?.initialPosition ?? json.sessionBarPosition ?? 'top'
     const sidebarOverrides = json.sidebar
 
     // Merge config-file gitPane (persisted prefs) with user's resolved gitPane
@@ -149,7 +147,6 @@ export function App({
       sessionCatalog.length === 0,
       {
         gitPane: gitPaneOverrides,
-        sessionBarPosition,
         sessionBarVisible,
         sidebar: sidebarOverrides,
       }
@@ -258,8 +255,6 @@ export function App({
   activeTabIdRef.current = state.activeTabId
   const activeTabRef = useRef(activeTab)
   activeTabRef.current = activeTab
-  const activeTabScrollIntentRef = useRef(activeTab?.scrollIntent ?? null)
-  activeTabScrollIntentRef.current = activeTab?.scrollIntent ?? null
 
   const stateRef = useRef(state)
   stateRef.current = state
@@ -307,7 +302,6 @@ export function App({
 
   const { clearIdleTimer, clearStartupGrace, startStartupGrace } = useBackendRuntime({
     activeTabId: state.activeTabId,
-    activeTabScrollIntentRef,
     backend,
     currentSessionId: state.currentSessionId,
     currentSessionWorkspaceSnapshot,

package/src/config.ts

@@ -1,6 +1,6 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
 
-import type { GitFileListMode, SessionBarPosition, WorkspaceSnapshotV1 } from './state/types'
+import type { GitFileListMode, WorkspaceSnapshotV1 } from './state/types'
 
 import { logDebug } from './debug/input-log'
 import { getProfileConfigDir } from './profile-paths'
@@ -41,7 +41,6 @@ export interface AimuxConfig {
   gitPane?: PersistedGitPane
   sidebar?: PersistedSidebar
   sessionBarVisible?: boolean
-  sessionBarPosition?: SessionBarPosition
   workspaceSnapshot?: WorkspaceSnapshotV1
   skippedUpdateVersion?: string
 }
@@ -161,7 +160,6 @@ export function loadConfigResult(): ConfigLoadResult {
       gitPanelVisible?: unknown
       gitPanelRatio?: unknown
       sessionBarVisible?: unknown
-      sessionBarPosition?: unknown
       workspaceSnapshot?: unknown
       skippedUpdateVersion?: unknown
     }
@@ -233,14 +231,6 @@ export function loadConfigResult(): ConfigLoadResult {
       issues.push('ignored invalid sessionBarVisible')
     }
 
-    const validSessionBarPosition =
-      parsed.sessionBarPosition === 'top' || parsed.sessionBarPosition === 'bottom'
-        ? parsed.sessionBarPosition
-        : undefined
-    if (parsed.sessionBarPosition !== undefined && validSessionBarPosition === undefined) {
-      issues.push('ignored invalid sessionBarPosition')
-    }
-
     if (
       parsed.workspaceSnapshot !== undefined &&
       !isWorkspaceSnapshotV1(parsed.workspaceSnapshot)
@@ -264,7 +254,6 @@ export function loadConfigResult(): ConfigLoadResult {
       config: {
         customCommands: isCustomCommandsRecord(parsed.customCommands) ? parsed.customCommands : {},
         gitPane: validGitPane,
-        sessionBarPosition: validSessionBarPosition,
         sessionBarVisible: validSessionBarVisible,
         sidebar: validSidebar,
         skippedUpdateVersion: validSkippedUpdateVersion,

package/src/daemon/daemon.ts

@@ -472,12 +472,7 @@ export async function runDaemon(): Promise<void> {
                 case 'resizeClient': {
                   const sessionId = requireSession(socket, attachedSessions)
                   requireNegotiatedVersion(socket, negotiatedVersions)
-                  await manager.resize(
-                    sessionId,
-                    message.payload.cols,
-                    message.payload.rows,
-                    message.payload.intents
-                  )
+                  await manager.resize(sessionId, message.payload.cols, message.payload.rows)
                   sendOk(socket, message.id)
                   break
                 }
@@ -488,8 +483,7 @@ export async function runDaemon(): Promise<void> {
                     sessionId,
                     message.payload.tabId,
                     message.payload.cols,
-                    message.payload.rows,
-                    message.payload.intent
+                    message.payload.rows
                   )
                   sendOk(socket, message.id)
                   break
@@ -508,17 +502,6 @@ export async function runDaemon(): Promise<void> {
                   sendOk(socket, message.id)
                   break
                 }
-                case 'reapplyScrollIntent': {
-                  const sessionId = requireSession(socket, attachedSessions)
-                  requireNegotiatedVersion(socket, negotiatedVersions)
-                  await manager.reapplyScrollIntent(
-                    sessionId,
-                    message.payload.tabId,
-                    message.payload.intent
-                  )
-                  sendOk(socket, message.id)
-                  break
-                }
                 case 'setActiveTab': {
                   const sessionId = requireSession(socket, attachedSessions)
                   requireNegotiatedVersion(socket, negotiatedVersions)

package/src/daemon/session-manager.ts

@@ -1,7 +1,6 @@
 import { EventEmitter } from 'node:events'
 
 import type {
-  ScrollIntent,
   TabSession,
   TerminalModeState,
   TerminalSnapshot,
@@ -68,14 +67,8 @@ export class SessionManager extends EventEmitter<SessionManagerEvents> {
     this.getOrCreateRegistry(sessionId).write(tabId, data)
   }
 
-  resize(
-    sessionId: string,
-    cols: number,
-    rows: number,
-    intents?: Map<string, ScrollIntent>,
-    options?: { sync?: boolean }
-  ): void {
-    this.getOrCreateRegistry(sessionId).resizeAll(cols, rows, intents, options)
+  resize(sessionId: string, cols: number, rows: number, options?: { sync?: boolean }): void {
+    this.getOrCreateRegistry(sessionId).resizeAll(cols, rows, options)
   }
 
   resizeTab(
@@ -83,10 +76,9 @@ export class SessionManager extends EventEmitter<SessionManagerEvents> {
     tabId: string,
     cols: number,
     rows: number,
-    intent?: ScrollIntent,
     options?: { sync?: boolean }
   ): void {
-    this.getOrCreateRegistry(sessionId).resizeTab(tabId, cols, rows, intent, options)
+    this.getOrCreateRegistry(sessionId).resizeTab(tabId, cols, rows, options)
   }
 
   scroll(sessionId: string, tabId: string, deltaLines: number): void {
@@ -97,10 +89,6 @@ export class SessionManager extends EventEmitter<SessionManagerEvents> {
     this.getOrCreateRegistry(sessionId).scrollViewportToBottom(tabId)
   }
 
-  reapplyScrollIntent(sessionId: string, tabId: string, intent: ScrollIntent): void {
-    this.getOrCreateRegistry(sessionId).reapplyScrollIntent(tabId, intent)
-  }
-
   setActiveTab(sessionId: string, tabId: string | null): void {
     this.getOrCreateRegistry(sessionId).setActiveTab(tabId)
   }

package/src/daemon/session-registry.ts

@@ -1,5 +1,12 @@
 import { EventEmitter } from 'node:events'
 
+import type {
+  TabSession,
+  TerminalModeState,
+  TerminalSnapshot,
+  WorkspaceSnapshotV1,
+} from '../state/types'
+
 import { logDebug } from '../debug/input-log'
 import { PtyManager } from '../pty/pty-manager'
 import {
@@ -8,14 +15,6 @@ import {
   restoreTabsFromWorkspace,
 } from '../state/session-persistence'
 import { createDefaultTerminalModes } from '../state/terminal-modes'
-import {
-  DEFAULT_SCROLL_INTENT,
-  type ScrollIntent,
-  type TabSession,
-  type TerminalModeState,
-  type TerminalSnapshot,
-  type WorkspaceSnapshotV1,
-} from '../state/types'
 
 interface SessionRegistryEvents {
   render: [tabId: string, viewport: TerminalSnapshot, terminalModes: TerminalModeState]
@@ -91,7 +90,6 @@ export class SessionRegistry extends EventEmitter<SessionRegistryEvents> {
         const existing = this.tabs.get(persisted.id)
         if (existing) {
           existing.title = persisted.title
-          existing.scrollIntent = persisted.scrollIntent ?? DEFAULT_SCROLL_INTENT
           existing.worktreeId = persisted.worktreeId
         }
       }
@@ -147,7 +145,6 @@ export class SessionRegistry extends EventEmitter<SessionRegistryEvents> {
         buffer: '',
         command: [options.command, ...(options.args ?? [])].join(' '),
         id: options.tabId,
-        scrollIntent: DEFAULT_SCROLL_INTENT,
         status: 'starting',
         terminalModes: createDefaultTerminalModes(),
         title: options.title,
@@ -159,7 +156,6 @@ export class SessionRegistry extends EventEmitter<SessionRegistryEvents> {
       existing.exitCode = undefined
       existing.viewport = undefined
       existing.terminalModes = createDefaultTerminalModes()
-      existing.scrollIntent = DEFAULT_SCROLL_INTENT
       existing.assistant = options.assistant
       existing.title = options.title
       existing.command = [options.command, ...(options.args ?? [])].join(' ')
@@ -173,23 +169,12 @@ export class SessionRegistry extends EventEmitter<SessionRegistryEvents> {
     this.ptyManager.write(tabId, data)
   }
 
-  resizeAll(
-    cols: number,
-    rows: number,
-    intents?: Map<string, ScrollIntent>,
-    options?: { sync?: boolean }
-  ): void {
-    this.ptyManager.resizeAll(cols, rows, intents, options)
+  resizeAll(cols: number, rows: number, options?: { sync?: boolean }): void {
+    this.ptyManager.resizeAll(cols, rows, options)
   }
 
-  resizeTab(
-    tabId: string,
-    cols: number,
-    rows: number,
-    intent?: ScrollIntent,
-    options?: { sync?: boolean }
-  ): void {
-    this.ptyManager.resizeSession(tabId, cols, rows, intent, options)
+  resizeTab(tabId: string, cols: number, rows: number, options?: { sync?: boolean }): void {
+    this.ptyManager.resizeSession(tabId, cols, rows, options)
   }
 
   scrollViewport(tabId: string, deltaLines: number): void {
@@ -200,10 +185,6 @@ export class SessionRegistry extends EventEmitter<SessionRegistryEvents> {
     this.ptyManager.scrollViewportToBottom(tabId)
   }
 
-  reapplyScrollIntent(tabId: string, intent: ScrollIntent): void {
-    this.ptyManager.reapplyScrollIntent(tabId, intent)
-  }
-
   setActiveTab(tabId: string | null): void {
     if (tabId === null) {
       this.activeTabId = null

package/src/git/worktree-branch-poller.ts

@@ -0,0 +1,54 @@
+import { useEffect } from 'react'
+
+import { appStore } from '../state/app-store'
+import { dispatchGlobal } from '../state/dispatch-ref'
+import { getCurrentBranch } from '../ui/git-branch'
+
+const INTERVAL_MS = 4000
+
+// Single source of truth for "what git branch is each worktree on right now".
+// Polls every known worktree's path and dispatches update-worktree-record
+// when the live branch differs from the stored one. Components read
+// `worktree.branch` from state — no per-component polling, no flickers.
+//
+// Runs once when enabled; reads sessions from the store on each tick so
+// session updates do NOT re-create the effect (which would otherwise feedback
+// off our own dispatches).
+export function useWorktreeBranchPolling(enabled: boolean): void {
+  useEffect(() => {
+    if (!enabled) return
+
+    let cancelled = false
+    let timer: ReturnType<typeof setTimeout> | null = null
+
+    const tick = async () => {
+      const sessions = appStore.getState().sessions
+      await Promise.all(
+        sessions.flatMap((session) =>
+          (session.worktrees ?? []).map(async (worktree) => {
+            if (worktree.path == null || worktree.path === '') return
+            const branch = await getCurrentBranch(worktree.path)
+            if (cancelled) return
+            if (branch != null && branch !== worktree.branch) {
+              dispatchGlobal({
+                patch: { branch },
+                sessionId: session.id,
+                type: 'update-worktree-record',
+                worktreeId: worktree.id,
+              })
+            }
+          })
+        )
+      )
+      if (cancelled) return
+      timer = setTimeout(() => void tick(), INTERVAL_MS)
+    }
+
+    void tick()
+
+    return () => {
+      cancelled = true
+      if (timer != null) clearTimeout(timer)
+    }
+  }, [enabled])
+}

package/src/input/modes/types.ts

@@ -68,6 +68,8 @@ export type SideEffect =
   | { type: 'git-push' }
   | { type: 'confirm-update-selection' }
   | { type: 'switch-session-by-index'; index: number }
+  | { type: 'cycle-sidebar-item'; direction: 1 | -1 }
+  | { type: 'switch-tab-by-index'; index: number }
   | { type: 'delete-session'; sessionId: string }
   | { type: 'delete-worktree'; sessionId: string; worktreeId: string; force?: boolean }
   | {

package/src/input/terminal-text-extraction.ts

@@ -7,13 +7,12 @@ export function getLineText(line: TerminalLine): string {
 /**
  * Extract text from a range of terminal lines as a single string.
  *
- * Multi-row selections are lossy: trailing `[ \t]+` is stripped from each
- * joined segment to drop the viewport padding the snapshot layer fills blank
- * cells with. Without this, shell line continuations (`\` followed by padding
- * spaces then `\n`) paste as escaped-space sequences instead of continuations.
- *
- * Single-row selections are returned verbatim — trailing spaces the user
- * explicitly dragged over are preserved.
+ * Trailing `[ \t]+` is stripped from each joined segment to drop the viewport
+ * padding the snapshot layer fills blank cells with (every rendered row is now
+ * padded to the full terminal width to prevent ghosting). Without this, shell
+ * line continuations (`\` + padding spaces + `\n`) paste as escaped-space
+ * sequences, and a single-line copy dragged to/past end-of-line would pick up
+ * the synthetic padding spaces.
  */
 export function extractStreamText(
   lines: TerminalLine[],
@@ -38,7 +37,7 @@ export function extractStreamText(
   for (let row = clampedStart; row <= clampedEnd; row++) {
     const text = getLineText(lines[row] as TerminalLine)
     if (row === startRow && row === endRow) {
-      parts.push(text.slice(Math.max(0, startCol), Math.max(0, endCol)))
+      parts.push(rtrim(text.slice(Math.max(0, startCol), Math.max(0, endCol))))
     } else if (row === startRow) {
       parts.push(rtrim(text.slice(Math.max(0, startCol))))
     } else if (row === endRow) {

package/src/ipc/manager-protocol.ts

@@ -1,5 +1,4 @@
 import type {
-  ScrollIntent,
   TabSession,
   TerminalModeState,
   TerminalSnapshot,
@@ -14,8 +13,12 @@ import {
   negotiateProtocolVersion,
 } from './protocol'
 
-export const MANAGER_PROTOCOL_MIN_VERSION = 3
-export const MANAGER_PROTOCOL_VERSION = 4
+// v5: backend owns scroll position end to end. Removed the per-tab scroll
+// `intent`/`intents` from resize messages and the `reapplyScrollIntent`
+// message. Min is raised in lockstep so a pre-v5 peer (which could still send
+// the dropped message) can't negotiate a now-incompatible version.
+export const MANAGER_PROTOCOL_MIN_VERSION = 5
+export const MANAGER_PROTOCOL_VERSION = 5
 /**
  * Minimum version required to send `setBroadcastEnabled`. Older TMs (v3) will
  * not understand the message; the daemon must check the negotiated version
@@ -75,7 +78,6 @@ export type ManagerRequest =
         sessionId: string
         cols: number
         rows: number
-        intents?: Record<string, ScrollIntent>
       }
     }
   | {
@@ -86,7 +88,6 @@ export type ManagerRequest =
         tabId: string
         cols: number
         rows: number
-        intent?: ScrollIntent
       }
     }
   | {
@@ -99,11 +100,6 @@ export type ManagerRequest =
       type: 'scroll'
       payload: { sessionId: string; tabId: string; deltaLines: number }
     }
-  | {
-      id: string
-      type: 'reapplyScrollIntent'
-      payload: { sessionId: string; tabId: string; intent: ScrollIntent }
-    }
   | { id: string; type: 'setActiveTab'; payload: { sessionId: string; tabId: string | null } }
   | { id: string; type: 'closeTab'; payload: { sessionId: string; tabId: string } }
   | { id: string; type: 'disposeSession'; payload: { sessionId: string } }
@@ -178,18 +174,6 @@ function isTerminalSnapshot(value: unknown): value is TerminalSnapshot {
   )
 }
 
-function isScrollIntent(value: unknown): value is ScrollIntent {
-  if (!isObjectRecord(value)) return false
-  if (value.kind === 'bottom') return true
-  if (value.kind === 'anchor') return isFiniteNumber(value.absoluteLine)
-  return false
-}
-
-function isScrollIntentRecord(value: unknown): value is Record<string, ScrollIntent> {
-  if (!isObjectRecord(value)) return false
-  return Object.values(value).every(isScrollIntent)
-}
-
 function isTerminalModeState(value: unknown): value is TerminalModeState {
   return (
     isObjectRecord(value) &&
@@ -303,20 +287,12 @@ export function parseManagerRequest(value: unknown): ManagerRequest {
       assert(isString(value.payload.sessionId), 'resizeClient.sessionId must be a string')
       assert(isFiniteNumber(value.payload.cols), 'resizeClient.cols must be a number')
       assert(isFiniteNumber(value.payload.rows), 'resizeClient.rows must be a number')
-      assert(
-        value.payload.intents === undefined || isScrollIntentRecord(value.payload.intents),
-        'resizeClient.intents must be a scroll-intent record'
-      )
       return value as ManagerRequest
     case 'resizeTab':
       assert(isString(value.payload.sessionId), 'resizeTab.sessionId must be a string')
       assert(isString(value.payload.tabId), 'resizeTab.tabId must be a string')
       assert(isFiniteNumber(value.payload.cols), 'resizeTab.cols must be a number')
       assert(isFiniteNumber(value.payload.rows), 'resizeTab.rows must be a number')
-      assert(
-        value.payload.intent === undefined || isScrollIntent(value.payload.intent),
-        'resizeTab.intent must be a scroll intent'
-      )
       return value as ManagerRequest
     case 'scroll':
       assert(isString(value.payload.sessionId), 'scroll.sessionId must be a string')
@@ -327,14 +303,6 @@ export function parseManagerRequest(value: unknown): ManagerRequest {
       assert(isString(value.payload.sessionId), 'scrollToBottom.sessionId must be a string')
       assert(isString(value.payload.tabId), 'scrollToBottom.tabId must be a string')
       return value as ManagerRequest
-    case 'reapplyScrollIntent':
-      assert(isString(value.payload.sessionId), 'reapplyScrollIntent.sessionId must be a string')
-      assert(isString(value.payload.tabId), 'reapplyScrollIntent.tabId must be a string')
-      assert(
-        isScrollIntent(value.payload.intent),
-        'reapplyScrollIntent.intent must be a scroll intent'
-      )
-      return value as ManagerRequest
     case 'setActiveTab':
       assert(isString(value.payload.sessionId), 'setActiveTab.sessionId must be a string')
       assert(isNullableString(value.payload.tabId), 'setActiveTab.tabId must be a string or null')

package/src/ipc/protocol.ts

@@ -1,5 +1,4 @@
 import type {
-  ScrollIntent,
   SessionStatus,
   TabActivity,
   TabSession,
@@ -10,8 +9,13 @@ import type {
 
 import { isWorkspaceSnapshotV1 } from '../state/validation'
 
-export const IPC_PROTOCOL_MIN_VERSION = 8
-export const IPC_PROTOCOL_VERSION = 8
+// v9: scroll position is owned entirely by the backend emulator. Dropped the
+// per-tab scroll `intent`/`intents` from resize messages and removed the
+// `reapplyScrollIntent` message — the frontend no longer derives or sends it.
+// (v8 was the unfilled-viewport status-detector change; this is a further
+// breaking wire change, so the version steps again.)
+export const IPC_PROTOCOL_MIN_VERSION = 9
+export const IPC_PROTOCOL_VERSION = 9
 
 export interface ProtocolHelloRequest {
   minVersion: number
@@ -67,20 +71,15 @@ export type ClientRequest =
   | {
       id: string
       type: 'resizeClient'
-      payload: { cols: number; rows: number; intents?: Record<string, ScrollIntent> }
+      payload: { cols: number; rows: number }
     }
   | {
       id: string
       type: 'resizeTab'
-      payload: { tabId: string; cols: number; rows: number; intent?: ScrollIntent }
+      payload: { tabId: string; cols: number; rows: number }
     }
   | { id: string; type: 'scrollToBottom'; payload: { tabId: string } }
   | { id: string; type: 'scroll'; payload: { tabId: string; deltaLines: number } }
-  | {
-      id: string
-      type: 'reapplyScrollIntent'
-      payload: { tabId: string; intent: ScrollIntent }
-    }
   | { id: string; type: 'setActiveTab'; payload: { tabId: string | null } }
   | { id: string; type: 'closeTab'; payload: { tabId: string } }
   | { id: string; type: 'disposeAll'; payload: Record<string, never> }
@@ -180,18 +179,6 @@ function isTerminalSnapshot(value: unknown): value is TerminalSnapshot {
   )
 }
 
-function isScrollIntent(value: unknown): value is ScrollIntent {
-  if (!isObjectRecord(value)) return false
-  if (value.kind === 'bottom') return true
-  if (value.kind === 'anchor') return isFiniteNumber(value.absoluteLine)
-  return false
-}
-
-function isScrollIntentRecord(value: unknown): value is Record<string, ScrollIntent> {
-  if (!isObjectRecord(value)) return false
-  return Object.values(value).every(isScrollIntent)
-}
-
 function isTerminalModeState(value: unknown): value is TerminalModeState {
   return (
     isObjectRecord(value) &&
@@ -328,19 +315,11 @@ export function parseClientRequest(value: unknown): ClientRequest {
     case 'resizeClient':
       assert(isFiniteNumber(value.payload.cols), 'resizeClient.cols must be a number')
       assert(isFiniteNumber(value.payload.rows), 'resizeClient.rows must be a number')
-      assert(
-        value.payload.intents === undefined || isScrollIntentRecord(value.payload.intents),
-        'resizeClient.intents must be a scroll-intent record'
-      )
       return value as ClientRequest
     case 'resizeTab':
       assert(isString(value.payload.tabId), 'resizeTab.tabId must be a string')
       assert(isFiniteNumber(value.payload.cols), 'resizeTab.cols must be a number')
       assert(isFiniteNumber(value.payload.rows), 'resizeTab.rows must be a number')
-      assert(
-        value.payload.intent === undefined || isScrollIntent(value.payload.intent),
-        'resizeTab.intent must be a scroll intent'
-      )
       return value as ClientRequest
     case 'scroll':
       assert(isString(value.payload.tabId), 'scroll.tabId must be a string')
@@ -349,13 +328,6 @@ export function parseClientRequest(value: unknown): ClientRequest {
     case 'scrollToBottom':
       assert(isString(value.payload.tabId), 'scrollToBottom.tabId must be a string')
       return value as ClientRequest
-    case 'reapplyScrollIntent':
-      assert(isString(value.payload.tabId), 'reapplyScrollIntent.tabId must be a string')
-      assert(
-        isScrollIntent(value.payload.intent),
-        'reapplyScrollIntent.intent must be a scroll intent'
-      )
-      return value as ClientRequest
     case 'setActiveTab':
       assert(isNullableString(value.payload.tabId), 'setActiveTab.tabId must be a string or null')
       return value as ClientRequest