@brimveyn/aimux 1.2.5 → 1.3.1

package/src/session-backend/remote-session-backend.ts

@@ -1,15 +1,16 @@
 import { EventEmitter } from 'node:events'
 import { connect, Socket } from 'node:net'
 
-import type { AssistantId, WorkspaceSnapshotV1 } from '../state/types'
+import type { AssistantId, ScrollIntent, WorkspaceSnapshotV1 } from '../state/types'
 import type { SessionBackend, SessionBackendEvents } from './types'
 
-import { getDaemonSocketPath } from '../daemon/runtime-paths'
+import { getIpcDaemonSocketPath } from '../daemon/runtime-paths'
 import { logDebug } from '../debug/input-log'
 import {
   type AttachResult,
   type ClientRequest,
   encodeMessage,
+  IPC_PROTOCOL_MIN_VERSION,
   IPC_PROTOCOL_VERSION,
   MessageDecoder,
   parseServerMessage,
@@ -19,6 +20,7 @@ import {
 } from '../ipc/protocol'
 
 const IPC_REQUEST_TIMEOUT_MS = 10_000
+const RECONNECT_DELAY_MS = 250
 
 export class RemoteSessionBackend
   extends EventEmitter<SessionBackendEvents>
@@ -36,6 +38,15 @@ export class RemoteSessionBackend
   private decoder = new MessageDecoder<ServerResponse | ServerEvent>(parseServerMessage)
   private attached = false
   private currentSessionId: string | null = null
+  private attachOptions: {
+    sessionId: string
+    cols: number
+    rows: number
+    workspaceSnapshot?: WorkspaceSnapshotV1
+  } | null = null
+  private selectedProtocolVersion: number | null = null
+  private reconnectPromise: Promise<void> | null = null
+  private shouldReconnect = false
 
   private rejectPendingRequests(error: Error): void {
     for (const [id, pending] of this.pending.entries()) {
@@ -45,14 +56,19 @@ export class RemoteSessionBackend
     }
   }
 
-  private resetConnection(reason: string): void {
+  private closeSocket(reason: string, preserveSession = false): void {
     const socket = this.socket
     this.socket = null
     this.attached = false
-    this.currentSessionId = null
+    this.selectedProtocolVersion = null
     this.decoder.reset()
     this.rejectPendingRequests(new Error(reason))
 
+    if (!preserveSession) {
+      this.currentSessionId = null
+      this.attachOptions = null
+    }
+
     if (!socket) {
       return
     }
@@ -64,6 +80,14 @@ export class RemoteSessionBackend
     }
   }
 
+  private handleConnectionLoss(reason: string): void {
+    logDebug('backend.remote.connectionLoss', { reason, sessionId: this.currentSessionId })
+    this.closeSocket(reason, true)
+    if (this.shouldReconnect && this.attachOptions) {
+      void this.scheduleReconnect()
+    }
+  }
+
   private getConnectedSocket(): Socket {
     if (!this.socket || this.socket.destroyed) {
       throw new Error('Remote backend socket is unavailable')
@@ -140,57 +164,37 @@ export class RemoteSessionBackend
     }
   }
 
-  async attach(options: {
-    sessionId: string
-    cols: number
-    rows: number
-    workspaceSnapshot?: WorkspaceSnapshotV1
-  }): Promise<AttachResult> {
-    const socketPath = getDaemonSocketPath()
-    logDebug('backend.remote.attach.start', {
-      cols: options.cols,
-      rows: options.rows,
-      sessionId: options.sessionId,
-      snapshotTabs: options.workspaceSnapshot?.tabs.length ?? 0,
-      socketPath,
-    })
-    this.resetConnection('Connection replaced during attach')
+  private async connectAndHandshake(): Promise<void> {
+    const socketPath = getIpcDaemonSocketPath()
+    this.closeSocket('Connection replaced during attach', true)
 
     const socket = connect(socketPath)
     this.socket = socket
-    this.attached = false
-    this.currentSessionId = options.sessionId
 
     await new Promise<void>((resolve, reject) => {
       socket.once('connect', resolve)
       socket.once('error', reject)
     })
-    logDebug('backend.remote.attach.connected', { socketPath })
 
     socket.on('error', (error) => {
       if (this.socket !== socket) {
         return
       }
-      logDebug('backend.remote.socketError', { error: error.message })
-      this.resetConnection(`Remote backend socket error: ${error.message}`)
+      this.handleConnectionLoss(`Remote backend socket error: ${error.message}`)
     })
     socket.on('close', () => {
       if (this.socket !== socket) {
         return
       }
-      logDebug('backend.remote.socketClose')
-      this.resetConnection('Remote backend socket closed')
+      this.handleConnectionLoss('Remote backend socket closed')
     })
-
     socket.on('data', (chunk) => {
       if (this.socket !== socket) {
         return
       }
-      logDebug('backend.remote.data', { byteLength: chunk.length })
       try {
         for (const message of this.decoder.push(chunk)) {
           if ('id' in message) {
-            logDebug('backend.remote.response', { id: message.id, type: message.type })
             const pending = this.pending.get(message.id)
             if (pending) {
               clearTimeout(pending.timer)
@@ -203,41 +207,119 @@ export class RemoteSessionBackend
         }
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error)
-        logDebug('backend.remote.socketError', { error: message })
-        this.resetConnection(`Remote backend parse error: ${message}`)
+        this.handleConnectionLoss(`Remote backend parse error: ${message}`)
       }
     })
 
     const response = await this.send({
       id: crypto.randomUUID(),
-      payload: { ...options, protocolVersion: IPC_PROTOCOL_VERSION },
+      payload: { maxVersion: IPC_PROTOCOL_VERSION, minVersion: IPC_PROTOCOL_MIN_VERSION },
+      type: 'hello',
+    })
+
+    if (response.type !== 'helloResult') {
+      this.closeSocket('Unexpected hello response', true)
+      throw new Error(
+        response.type === 'error' ? response.payload.message : 'Unexpected hello response'
+      )
+    }
+
+    this.selectedProtocolVersion = response.payload.selectedVersion
+  }
+
+  private async performAttach(options: {
+    sessionId: string
+    cols: number
+    rows: number
+    workspaceSnapshot?: WorkspaceSnapshotV1
+  }): Promise<AttachResult> {
+    await this.connectAndHandshake()
+
+    const response = await this.send({
+      id: crypto.randomUUID(),
+      payload: {
+        ...options,
+        protocolVersion: this.selectedProtocolVersion ?? IPC_PROTOCOL_VERSION,
+      },
       type: 'attach',
     })
 
     if (response.type !== 'attachResult') {
-      logDebug('backend.remote.attach.unexpected', { type: response.type })
-      this.resetConnection(`Unexpected attach response: ${response.type}`)
+      this.closeSocket(`Unexpected attach response: ${response.type}`, true)
       throw new Error(
         response.type === 'error' ? response.payload.message : 'Unexpected attach response'
       )
     }
 
-    if (response.payload.protocolVersion !== IPC_PROTOCOL_VERSION) {
-      this.resetConnection(
-        `Protocol mismatch: client v${IPC_PROTOCOL_VERSION}, daemon v${response.payload.protocolVersion}`
+    if (response.payload.protocolVersion !== this.selectedProtocolVersion) {
+      this.closeSocket('Attach protocol mismatch', true)
+      throw new ProtocolMismatchError(
+        this.selectedProtocolVersion ?? IPC_PROTOCOL_VERSION,
+        response.payload.protocolVersion
       )
-      throw new ProtocolMismatchError(IPC_PROTOCOL_VERSION, response.payload.protocolVersion)
     }
 
     this.attached = true
+    return response.payload
+  }
+
+  private async scheduleReconnect(): Promise<void> {
+    if (this.reconnectPromise) {
+      return this.reconnectPromise
+    }
+
+    const reconnectOptions = this.attachOptions
+    this.reconnectPromise = (async () => {
+      while (this.shouldReconnect && reconnectOptions && this.attachOptions === reconnectOptions) {
+        try {
+          await this.performAttach(reconnectOptions)
+          logDebug('backend.remote.reconnect.success', {
+            sessionId: reconnectOptions.sessionId,
+          })
+          return
+        } catch (error) {
+          logDebug('backend.remote.reconnect.retry', {
+            error: error instanceof Error ? error.message : String(error),
+            sessionId: reconnectOptions.sessionId,
+          })
+          await Bun.sleep(RECONNECT_DELAY_MS)
+        }
+      }
+    })()
+
+    try {
+      await this.reconnectPromise
+    } finally {
+      this.reconnectPromise = null
+    }
+  }
+
+  async attach(options: {
+    sessionId: string
+    cols: number
+    rows: number
+    workspaceSnapshot?: WorkspaceSnapshotV1
+  }): Promise<AttachResult> {
+    this.shouldReconnect = true
+    this.currentSessionId = options.sessionId
+    this.attachOptions = options
+
+    logDebug('backend.remote.attach.start', {
+      cols: options.cols,
+      rows: options.rows,
+      sessionId: options.sessionId,
+      snapshotTabs: options.workspaceSnapshot?.tabs.length ?? 0,
+      socketPath: getIpcDaemonSocketPath(),
+    })
 
+    const result = await this.performAttach(options)
     logDebug('backend.remote.attach.success', {
-      activeTabId: response.payload.activeTabId,
+      activeTabId: result.activeTabId,
       sessionId: options.sessionId,
-      tabs: response.payload.tabs.length,
+      tabs: result.tabs.length,
     })
 
-    return response.payload
+    return result
   }
 
   createSession(options: {
@@ -255,11 +337,6 @@ export class RemoteSessionBackend
       return
     }
 
-    logDebug('backend.remote.createSession', {
-      sessionId: this.currentSessionId,
-      tabId: options.tabId,
-      title: options.title,
-    })
     void this.sendExpectOk({ id: crypto.randomUUID(), payload: options, type: 'createTab' }).catch(
       (error) => this.reportCommandError('createTab', error, options.tabId)
     )
@@ -270,11 +347,6 @@ export class RemoteSessionBackend
       logDebug('backend.remote.skipWriteBeforeAttach', { inputLength: input.length, tabId })
       return
     }
-    logDebug('backend.remote.write', {
-      inputLength: input.length,
-      sessionId: this.currentSessionId,
-      tabId,
-    })
     void this.sendExpectOk({
       id: crypto.randomUUID(),
       payload: { data: input, tabId },
@@ -286,7 +358,6 @@ export class RemoteSessionBackend
     if (!this.attached) {
       return
     }
-    logDebug('backend.remote.scroll', { deltaLines, sessionId: this.currentSessionId, tabId })
     void this.sendExpectOk({
       id: crypto.randomUUID(),
       payload: { deltaLines, tabId },
@@ -298,7 +369,6 @@ export class RemoteSessionBackend
     if (!this.attached) {
       return
     }
-    logDebug('backend.remote.scrollToBottom', { sessionId: this.currentSessionId, tabId })
     void this.sendExpectOk({
       id: crypto.randomUUID(),
       payload: { tabId },
@@ -306,11 +376,21 @@ export class RemoteSessionBackend
     }).catch((error) => this.reportCommandError('scrollToBottom', error, tabId))
   }
 
+  reapplyScrollIntent(tabId: string, intent: ScrollIntent): void {
+    if (!this.attached) {
+      return
+    }
+    void this.sendExpectOk({
+      id: crypto.randomUUID(),
+      payload: { intent, tabId },
+      type: 'reapplyScrollIntent',
+    }).catch((error) => this.reportCommandError('reapplyScrollIntent', error, tabId))
+  }
+
   setActiveTab(tabId: string | null): void {
     if (!this.attached) {
       return
     }
-    logDebug('backend.remote.setActiveTab', { sessionId: this.currentSessionId, tabId })
     void this.sendExpectOk({
       id: crypto.randomUUID(),
       payload: { tabId },
@@ -318,27 +398,27 @@ export class RemoteSessionBackend
     }).catch((error) => this.reportCommandError('setActiveTab', error))
   }
 
-  resizeAll(cols: number, rows: number): void {
+  resizeAll(cols: number, rows: number, intents?: Map<string, ScrollIntent>): void {
     if (!this.attached) {
       logDebug('backend.remote.skipResizeBeforeAttach', { cols, rows })
       return
     }
     logDebug('backend.remote.resize', { cols, rows, sessionId: this.currentSessionId })
+    const intentsRecord = intents ? Object.fromEntries(intents.entries()) : undefined
     void this.sendExpectOk({
       id: crypto.randomUUID(),
-      payload: { cols, rows },
+      payload: { cols, intents: intentsRecord, rows },
       type: 'resizeClient',
     }).catch((error) => this.reportCommandError('resizeClient', error))
   }
 
-  resizeTab(tabId: string, cols: number, rows: number): void {
+  resizeTab(tabId: string, cols: number, rows: number, intent?: ScrollIntent): void {
     if (!this.attached) {
       return
     }
-    logDebug('backend.remote.resizeTab', { cols, rows, sessionId: this.currentSessionId, tabId })
     void this.sendExpectOk({
       id: crypto.randomUUID(),
-      payload: { cols, rows, tabId },
+      payload: { cols, intent, rows, tabId },
       type: 'resizeTab',
     }).catch((error) => this.reportCommandError('resizeTab', error, tabId))
   }
@@ -347,7 +427,6 @@ export class RemoteSessionBackend
     if (!this.attached) {
       return
     }
-    logDebug('backend.remote.disposeSession', { sessionId: this.currentSessionId, tabId })
     void this.sendExpectOk({ id: crypto.randomUUID(), payload: { tabId }, type: 'closeTab' }).catch(
       (error) => this.reportCommandError('closeTab', error, tabId)
     )
@@ -357,7 +436,6 @@ export class RemoteSessionBackend
     if (!this.attached) {
       return
     }
-    logDebug('backend.remote.disposeAll', { sessionId: this.currentSessionId })
     void this.sendExpectOk({ id: crypto.randomUUID(), payload: {}, type: 'disposeAll' }).catch(
       (error) => this.reportCommandError('disposeAll', error)
     )
@@ -365,9 +443,11 @@ export class RemoteSessionBackend
 
   async destroy(keepSessions = true): Promise<void> {
     logDebug('backend.remote.destroy', { keepSessions })
-    if (!keepSessions) {
+    this.shouldReconnect = false
+    this.reconnectPromise = null
+    if (!keepSessions && this.attached) {
       this.disposeAll()
     }
-    this.resetConnection('Remote backend destroyed')
+    this.closeSocket('Remote backend destroyed')
   }
 }

package/src/session-backend/types.ts

@@ -1,6 +1,7 @@
 import type { EventEmitter } from 'node:events'
 
 import type {
+  ScrollIntent,
   TabSession,
   TerminalModeState,
   TerminalSnapshot,
@@ -38,9 +39,10 @@ export interface SessionBackend extends EventEmitter<SessionBackendEvents> {
   write(tabId: string, input: string): void
   scrollViewport(tabId: string, deltaLines: number): void
   scrollViewportToBottom(tabId: string): void
+  reapplyScrollIntent(tabId: string, intent: ScrollIntent): void
   setActiveTab(tabId: string | null): void
-  resizeAll(cols: number, rows: number): void
-  resizeTab(tabId: string, cols: number, rows: number): void
+  resizeAll(cols: number, rows: number, intents?: Map<string, ScrollIntent>): void
+  resizeTab(tabId: string, cols: number, rows: number, intent?: ScrollIntent): void
   disposeSession(tabId: string): void
   disposeAll(): void
   destroy(keepSessions?: boolean): Promise<void> | void

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

@@ -161,6 +161,20 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
           type: 'theme-picker',
         },
       }
+    case 'open-update-available-modal':
+      return {
+        ...state,
+        focusMode: 'modal',
+        modal: {
+          currentVersion: action.currentVersion,
+          cursorPos: 0,
+          editBuffer: null,
+          latestVersion: action.latestVersion,
+          selectedIndex: 0,
+          sessionTargetId: null,
+          type: 'update-available',
+        },
+      }
     case 'open-git-commit-modal':
       return {
         ...state,
@@ -198,7 +212,8 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         state.modal.type !== 'snippet-picker' &&
         state.modal.type !== 'theme-picker' &&
         state.modal.type !== 'create-session' &&
-        state.modal.type !== 'split-picker'
+        state.modal.type !== 'split-picker' &&
+        state.modal.type !== 'update-available'
       ) {
         return state
       }
@@ -215,6 +230,8 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         optionCount = filtered.length
       } else if (state.modal.type === 'theme-picker') {
         optionCount = THEME_COUNT
+      } else if (state.modal.type === 'update-available') {
+        optionCount = 2
       } else {
         const filtered = filterSessions(state.sessions, state.modal.editBuffer)
         optionCount = Math.max(1, filtered.length + 1)

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

@@ -1,5 +1,3 @@
-import type { AppAction, AppState, TabSession } from '../types'
-
 import {
   allLeafIds,
   createGroupId,
@@ -15,6 +13,13 @@ import {
 } from '../layout-tree'
 import { normalizeGroupedTabOrder } from '../session-persistence'
 import { createDefaultTerminalModes } from '../terminal-modes'
+import {
+  type AppAction,
+  type AppState,
+  DEFAULT_SCROLL_INTENT,
+  deriveScrollIntent,
+  type TabSession,
+} from '../types'
 
 const MAX_BUFFER_LENGTH = 50_000
 
@@ -385,6 +390,7 @@ export function reduceTabState(state: AppState, action: AppAction): AppState | n
           buffer: '',
           errorMessage: undefined,
           exitCode: undefined,
+          scrollIntent: DEFAULT_SCROLL_INTENT,
           status: 'starting',
           terminalModes: createDefaultTerminalModes(),
           viewport: undefined,
@@ -404,11 +410,23 @@ export function reduceTabState(state: AppState, action: AppAction): AppState | n
         ...state,
         tabs: updateTab(state.tabs, action.tabId, (tab) => ({
           ...tab,
+          scrollIntent:
+            action.source === 'resize' || action.source === 'switch'
+              ? (tab.scrollIntent ?? DEFAULT_SCROLL_INTENT)
+              : deriveScrollIntent(action.viewport),
           status: tab.status === 'starting' ? 'running' : tab.status,
           terminalModes: action.terminalModes,
           viewport: action.viewport,
         })),
       }
+    case 'set-scroll-intent':
+      return {
+        ...state,
+        tabs: updateTab(state.tabs, action.tabId, (tab) => ({
+          ...tab,
+          scrollIntent: action.intent,
+        })),
+      }
     case 'set-tab-activity':
       return {
         ...state,

package/src/state/session-catalog.ts

@@ -1,10 +1,11 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
-import { dirname, join } from 'node:path'
+import { join } from 'node:path'
 
 import type { SessionRecord } from './types'
 
-import { CONFIG_PATH, loadConfig, saveConfig } from '../config'
+import { loadConfig, saveConfig } from '../config'
 import { logDebug } from '../debug/input-log'
+import { getProfileConfigDir } from '../profile-paths'
 import { isSessionRecord } from './validation'
 
 interface SessionCatalogFile {
@@ -12,7 +13,7 @@ interface SessionCatalogFile {
   sessions: SessionRecord[]
 }
 
-const SESSIONS_PATH = join(dirname(CONFIG_PATH), 'aimux-sessions.json')
+const SESSIONS_PATH = join(getProfileConfigDir(), 'aimux-sessions.json')
 
 function readCatalogFile(): { file: SessionCatalogFile | null; issue?: string } {
   try {
@@ -79,7 +80,7 @@ export function loadSessionCatalog(): SessionRecord[] {
 
 export function saveSessionCatalog(sessions: SessionRecord[]): void {
   try {
-    mkdirSync(dirname(SESSIONS_PATH), { recursive: true })
+    mkdirSync(getProfileConfigDir(), { recursive: true })
     writeFileSync(SESSIONS_PATH, `${JSON.stringify({ sessions, version: 1 }, null, 2)}\n`)
     logDebug('sessions.catalog.save', { sessionCount: sessions.length })
   } catch (error) {

package/src/state/session-persistence.ts

@@ -1,5 +1,3 @@
-import type { AppState, TabSession, TabStatus, WorkspaceSnapshotV1 } from './types'
-
 import {
   allLeafIds,
   createGroupId,
@@ -7,6 +5,13 @@ import {
   type LayoutNode,
   pruneLayoutTree,
 } from './layout-tree'
+import {
+  type AppState,
+  DEFAULT_SCROLL_INTENT,
+  type TabSession,
+  type TabStatus,
+  type WorkspaceSnapshotV1,
+} from './types'
 
 export function createEmptyWorkspaceSnapshot(): WorkspaceSnapshotV1 {
   return {
@@ -47,6 +52,7 @@ export function serializeWorkspace(state: AppState): WorkspaceSnapshotV1 {
       errorMessage: tab.errorMessage,
       exitCode: tab.exitCode,
       id: tab.id,
+      scrollIntent: tab.scrollIntent,
       status: tab.status === 'disconnected' ? 'running' : tab.status,
       terminalModes: tab.terminalModes,
       title: tab.title,
@@ -69,6 +75,7 @@ export function restoreTabsFromWorkspace(snapshot: WorkspaceSnapshotV1 | undefin
     errorMessage: tab.errorMessage,
     exitCode: tab.exitCode,
     id: tab.id,
+    scrollIntent: tab.scrollIntent ?? DEFAULT_SCROLL_INTENT,
     status: getDisconnectedStatus(tab.status),
     terminalModes: tab.terminalModes,
     title: tab.title,

package/src/state/snippet-catalog.ts

@@ -1,8 +1,8 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
-import { dirname, join } from 'node:path'
+import { join } from 'node:path'
 
-import { CONFIG_PATH } from '../config'
 import { logDebug } from '../debug/input-log'
+import { getProfileConfigDir } from '../profile-paths'
 import { isSnippetRecord } from './validation'
 
 export interface SnippetRecord {
@@ -11,7 +11,7 @@ export interface SnippetRecord {
   content: string
 }
 
-const SNIPPETS_PATH = join(dirname(CONFIG_PATH), 'aimux-snippets.json')
+const SNIPPETS_PATH = join(getProfileConfigDir(), 'aimux-snippets.json')
 
 const DEFAULT_SNIPPETS: SnippetRecord[] = [
   {
@@ -78,7 +78,7 @@ export function loadSnippetCatalog(): SnippetRecord[] {
 
 export function saveSnippetCatalog(snippets: SnippetRecord[]): void {
   try {
-    mkdirSync(dirname(SNIPPETS_PATH), { recursive: true })
+    mkdirSync(getProfileConfigDir(), { recursive: true })
     writeFileSync(SNIPPETS_PATH, `${JSON.stringify({ snippets, version: 1 }, null, 2)}\n`)
   } catch (error) {
     logDebug('snippets.catalog.saveError', {

package/src/state/types.ts

@@ -26,6 +26,7 @@ export type ModalType =
   | 'help'
   | 'split-picker'
   | 'git-commit'
+  | 'update-available'
   | null
 
 export interface TerminalSpan {
@@ -49,6 +50,16 @@ export interface TerminalSnapshot {
   cursorVisible: boolean
 }
 
+export type ScrollIntent = { kind: 'bottom' } | { absoluteLine: number; kind: 'anchor' }
+
+export const DEFAULT_SCROLL_INTENT: ScrollIntent = { kind: 'bottom' }
+
+export function deriveScrollIntent(viewport: TerminalSnapshot): ScrollIntent {
+  return viewport.viewportY >= viewport.baseY
+    ? { kind: 'bottom' }
+    : { absoluteLine: viewport.viewportY, kind: 'anchor' }
+}
+
 export interface TerminalModeState {
   mouseTrackingMode: 'none' | 'x10' | 'vt200' | 'drag' | 'any'
   sendFocusMode: boolean
@@ -66,6 +77,7 @@ export interface PersistedTabSnapshot {
   buffer: string
   viewport?: TerminalSnapshot
   terminalModes: TerminalModeState
+  scrollIntent?: ScrollIntent
   errorMessage?: string
   exitCode?: number
 }
@@ -105,6 +117,7 @@ export interface TabSession {
   buffer: string
   viewport?: TerminalSnapshot
   terminalModes: TerminalModeState
+  scrollIntent?: ScrollIntent
   command: string
   errorMessage?: string
   exitCode?: number
@@ -228,6 +241,12 @@ export interface ModalSnippetEditor extends ModalBase {
   contentBuffer: string
 }
 
+export interface ModalUpdateAvailable extends ModalBase {
+  type: 'update-available'
+  currentVersion: string
+  latestVersion: string
+}
+
 export type DirectoryResultType = 'git-repo' | 'worktree' | 'workspace'
 
 export interface DirectoryResult {
@@ -248,6 +267,7 @@ export type ModalState =
   | ModalCreateSession
   | ModalSnippetEditor
   | ModalGitCommit
+  | ModalUpdateAvailable
 
 export interface LayoutState {
   terminalCols: number
@@ -303,6 +323,7 @@ export type ModalAction =
   | { type: 'open-snippet-editor'; snippetId?: string }
   | { type: 'begin-snippet-filter' }
   | { type: 'open-theme-picker' }
+  | { type: 'open-update-available-modal'; currentVersion: string; latestVersion: string }
 
 // -- Session actions --
 export type SessionAction =
@@ -336,7 +357,9 @@ export type TabAction =
       tabId: string
       viewport: TerminalSnapshot
       terminalModes: TerminalModeState
+      source?: 'resize' | 'scroll' | 'data' | 'switch'
     }
+  | { type: 'set-scroll-intent'; tabId: string; intent: ScrollIntent }
   | { type: 'set-tab-activity'; tabId: string; activity?: TabActivity }
   | { type: 'set-tab-status'; tabId: string; status: TabStatus; exitCode?: number }
   | { type: 'set-tab-error'; tabId: string; message: string }