@brimveyn/aimux 1.6.2 → 1.7.0

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

@@ -6,7 +6,7 @@ import { collectHelpEntries } from '../../input/keymap/help-entries'
 import { getActiveKeymap } from '../../input/keymap/keymap-ref'
 import { getAllAssistantOptions } from '../../pty/command-registry'
 import { filterThemeIds } from '../../ui/filter-themes'
-import { filterSessions, filterSnippets } from '../selectors'
+import { filterAssistants, filterSessions, filterSnippets } from '../selectors'
 
 function emptyModal() {
   return {
@@ -29,15 +29,30 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
     case 'open-new-tab-modal':
       return {
         ...state,
-        focusMode: 'modal',
+        focusMode: 'command-edit',
         modal: {
           cursorPos: 0,
-          editBuffer: null,
+          editBuffer: '',
+          editingCommand: null,
           selectedIndex: 0,
           sessionTargetId: null,
           type: 'new-tab',
         },
       }
+    case 'open-edit-custom-command': {
+      if (state.modal.type !== 'new-tab') return state
+      const current = state.customCommands[action.assistantId] ?? ''
+      return {
+        ...state,
+        focusMode: 'command-edit',
+        modal: {
+          ...state.modal,
+          cursorPos: current.length,
+          editBuffer: current,
+          editingCommand: action.assistantId,
+        },
+      }
+    }
     case 'open-help-modal': {
       const keymap = getActiveKeymap()
       const scope = action.scope ?? null
@@ -47,7 +62,7 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         ...state,
         modal: {
           cursorPos: 0,
-          editBuffer: null,
+          editBuffer: '',
           entryCount: scopedEntries.length,
           scope,
           selectedIndex: 0,
@@ -72,10 +87,10 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
     case 'open-session-picker':
       return {
         ...state,
-        focusMode: 'modal',
+        focusMode: 'command-edit',
         modal: {
           cursorPos: 0,
-          editBuffer: null,
+          editBuffer: '',
           selectedIndex: 0,
           sessionTargetId: null,
           type: 'session-picker',
@@ -106,6 +121,7 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
           editBuffer: '',
           nameBuffer: '',
           pendingProjectPath: null,
+          returnToSessionPicker: action.returnToSessionPicker,
           selectedIndex: 0,
           sessionTargetId: null,
           type: 'create-session',
@@ -127,10 +143,10 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
     case 'open-snippet-picker':
       return {
         ...state,
-        focusMode: 'modal',
+        focusMode: 'command-edit',
         modal: {
           cursorPos: 0,
-          editBuffer: null,
+          editBuffer: '',
           selectedIndex: 0,
           sessionTargetId: null,
           type: 'snippet-picker',
@@ -158,10 +174,10 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
     case 'open-theme-picker':
       return {
         ...state,
-        focusMode: 'modal',
+        focusMode: 'command-edit',
         modal: {
           cursorPos: 0,
-          editBuffer: null,
+          editBuffer: '',
           entryCount: 0,
           selectedIndex: 0,
           sessionTargetId: null,
@@ -196,17 +212,6 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
           type: 'git-commit',
         },
       }
-    case 'begin-snippet-filter': {
-      if (state.modal.type !== 'snippet-picker') {
-        return state
-      }
-      const buf = state.modal.editBuffer ?? ''
-      return {
-        ...state,
-        focusMode: 'command-edit',
-        modal: { ...state.modal, cursorPos: buf.length, editBuffer: buf },
-      }
-    }
     case 'set-help-entry-count': {
       if (state.modal.type !== 'help') return state
       if (state.modal.entryCount === action.count) {
@@ -221,16 +226,6 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         modal: { ...state.modal, entryCount: action.count, selectedIndex: clamped },
       }
     }
-    case 'begin-help-filter': {
-      if (state.modal.type !== 'help') {
-        return state
-      }
-      const buf = state.modal.editBuffer ?? ''
-      return {
-        ...state,
-        modal: { ...state.modal, cursorPos: buf.length, editBuffer: buf },
-      }
-    }
     case 'set-theme-entry-count': {
       if (state.modal.type !== 'theme-picker') return state
       const clamped = Math.min(state.modal.selectedIndex, Math.max(0, action.count - 1))
@@ -242,17 +237,6 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         modal: { ...state.modal, entryCount: action.count, selectedIndex: clamped },
       }
     }
-    case 'begin-theme-filter': {
-      if (state.modal.type !== 'theme-picker') {
-        return state
-      }
-      const buf = state.modal.editBuffer ?? ''
-      return {
-        ...state,
-        focusMode: 'command-edit',
-        modal: { ...state.modal, cursorPos: buf.length, editBuffer: buf },
-      }
-    }
     case 'close-modal': {
       const closingType = state.modal.type
       // Help is a pure overlay — it never flipped focusMode, so leave it alone.
@@ -286,7 +270,12 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         return state
       }
       let optionCount: number
-      if (state.modal.type === 'new-tab' || state.modal.type === 'split-picker') {
+      if (state.modal.type === 'new-tab') {
+        optionCount = filterAssistants(
+          getAllAssistantOptions(state.customCommands),
+          state.modal.editBuffer
+        ).length
+      } else if (state.modal.type === 'split-picker') {
         optionCount = getAllAssistantOptions(state.customCommands).length
       } else if (state.modal.type === 'create-session') {
         optionCount = state.modal.directoryResults.length
@@ -312,6 +301,45 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         },
       }
     }
+    case 'set-modal-selection-index': {
+      if (
+        state.modal.type !== 'new-tab' &&
+        state.modal.type !== 'session-picker' &&
+        state.modal.type !== 'snippet-picker' &&
+        state.modal.type !== 'theme-picker' &&
+        state.modal.type !== 'create-session' &&
+        state.modal.type !== 'split-picker' &&
+        state.modal.type !== 'update-available' &&
+        state.modal.type !== 'help'
+      ) {
+        return state
+      }
+      let optionCount: number
+      if (state.modal.type === 'help') {
+        optionCount = state.modal.entryCount
+      } else if (state.modal.type === 'new-tab') {
+        optionCount = filterAssistants(
+          getAllAssistantOptions(state.customCommands),
+          state.modal.editBuffer
+        ).length
+      } else if (state.modal.type === 'split-picker') {
+        optionCount = getAllAssistantOptions(state.customCommands).length
+      } else if (state.modal.type === 'create-session') {
+        optionCount = state.modal.directoryResults.length
+      } else if (state.modal.type === 'snippet-picker') {
+        optionCount = filterSnippets(state.snippets, state.modal.editBuffer).length
+      } else if (state.modal.type === 'theme-picker') {
+        optionCount = filterThemeIds(state.modal.editBuffer).length
+      } else if (state.modal.type === 'update-available') {
+        optionCount = 2
+      } else {
+        optionCount = Math.max(1, filterSessions(state.sessions, state.modal.editBuffer).length + 1)
+      }
+      if (optionCount === 0) return state
+      const clamped = Math.max(0, Math.min(optionCount - 1, action.index))
+      if (clamped === state.modal.selectedIndex) return state
+      return { ...state, modal: { ...state.modal, selectedIndex: clamped } }
+    }
     case 'move-modal-cursor': {
       if (state.modal.editBuffer === null) return state
       const len = state.modal.editBuffer.length
@@ -324,23 +352,6 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
       if (next === current) return state
       return { ...state, modal: { ...state.modal, cursorPos: next } }
     }
-    case 'begin-command-edit': {
-      if (state.modal.type !== 'new-tab' && state.modal.type !== 'session-name') {
-        return state
-      }
-      if (state.modal.type === 'session-name') {
-        return { ...state, focusMode: 'command-edit' }
-      }
-      const allOptions = getAllAssistantOptions(state.customCommands)
-      const option = allOptions[state.modal.selectedIndex]
-      const assistantId = option?.id
-      const currentCmd = (assistantId && state.customCommands[assistantId]) ?? option?.command ?? ''
-      return {
-        ...state,
-        focusMode: 'command-edit',
-        modal: { ...state.modal, cursorPos: currentCmd.length, editBuffer: currentCmd },
-      }
-    }
     case 'update-command-edit': {
       if (state.modal.editBuffer === null) {
         return state
@@ -357,11 +368,14 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         nextBuffer = buffer.slice(0, cursor) + action.char + buffer.slice(cursor)
         nextCursor = cursor + action.char.length
       }
+      const isNewTabEditing = state.modal.type === 'new-tab' && state.modal.editingCommand !== null
       const resetIndex =
-        state.modal.type === 'session-picker' ||
-        state.modal.type === 'snippet-picker' ||
-        state.modal.type === 'theme-picker' ||
-        state.modal.type === 'help'
+        !isNewTabEditing &&
+        (state.modal.type === 'session-picker' ||
+          state.modal.type === 'snippet-picker' ||
+          state.modal.type === 'theme-picker' ||
+          state.modal.type === 'new-tab' ||
+          state.modal.type === 'help')
           ? 0
           : state.modal.selectedIndex
       return {
@@ -374,76 +388,30 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         },
       }
     }
-    case 'commit-command-edit': {
-      if (state.modal.editBuffer === null) {
-        return state
-      }
-      if (state.modal.type === 'create-session') {
-        return state
-      }
-      if (state.modal.type === 'snippet-editor') {
-        return state
-      }
-      if (state.modal.type === 'rename-tab') {
-        return state
-      }
-      if (state.modal.type === 'session-name') {
-        return state
-      }
-      if (state.modal.type === 'session-picker' || state.modal.type === 'snippet-picker') {
-        return {
-          ...state,
-          focusMode: 'modal',
-          modal: { ...state.modal, selectedIndex: 0 },
-        }
-      }
-      if (state.modal.type !== 'new-tab') {
-        return state
-      }
-      const allOpts = getAllAssistantOptions(state.customCommands)
-      const option = allOpts[state.modal.selectedIndex]
-      const assistantId = option?.id
-      if (!assistantId) {
+    case 'cancel-command-edit': {
+      if (state.modal.type === 'new-tab' && state.modal.editingCommand !== null) {
         return {
           ...state,
-          focusMode: 'modal',
-          modal: { ...state.modal, cursorPos: 0, editBuffer: null },
+          modal: {
+            ...state.modal,
+            cursorPos: 0,
+            editBuffer: '',
+            editingCommand: null,
+          },
         }
       }
-      const trimmed = state.modal.editBuffer.trim()
-      const newCustomCommands = { ...state.customCommands }
-      if (trimmed) {
-        newCustomCommands[assistantId] = trimmed
-      } else {
-        delete newCustomCommands[assistantId]
-      }
-      return {
-        ...state,
-        customCommands: newCustomCommands,
-        focusMode: 'modal',
-        modal: { ...state.modal, cursorPos: 0, editBuffer: null },
-      }
-    }
-    case 'cancel-command-edit': {
       if (state.modal.type === 'create-session' || state.modal.type === 'snippet-editor') {
         return { ...state, focusMode: 'navigation', modal: emptyModal() }
       }
-      if (state.modal.type === 'help') {
-        return {
-          ...state,
-          modal: { ...state.modal, cursorPos: 0, editBuffer: null, selectedIndex: 0 },
-        }
-      }
+      // Pickers and overlays with auto-filter — Esc closes the modal entirely.
       if (
         state.modal.type === 'session-picker' ||
         state.modal.type === 'snippet-picker' ||
-        state.modal.type === 'theme-picker'
+        state.modal.type === 'theme-picker' ||
+        state.modal.type === 'new-tab' ||
+        state.modal.type === 'help'
       ) {
-        return {
-          ...state,
-          focusMode: 'modal',
-          modal: { ...state.modal, cursorPos: 0, editBuffer: null, selectedIndex: 0 },
-        }
+        return { ...state, focusMode: 'navigation', modal: emptyModal() }
       }
       return {
         ...state,
@@ -524,17 +492,6 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         },
       }
     }
-    case 'begin-session-filter': {
-      if (state.modal.type !== 'session-picker') {
-        return state
-      }
-      const buf = state.modal.editBuffer ?? ''
-      return {
-        ...state,
-        focusMode: 'command-edit',
-        modal: { ...state.modal, cursorPos: buf.length, editBuffer: buf },
-      }
-    }
     case 'open-rename-tab-modal': {
       const activeTab = state.activeTabId
         ? state.tabs.find((tab) => tab.id === state.activeTabId)

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

@@ -64,8 +64,8 @@ export function reduceSessionState(state: AppState, action: AppAction): AppState
       const filteredNew = filterSessions(newSessions, state.modal.editBuffer)
       const maxIndex = filteredNew.length
       const clampedIndex = Math.min(state.modal.selectedIndex, maxIndex)
-      const nextBusy = { ...state.sessionsBusy }
-      delete nextBusy[action.sessionId]
+      const nextStatuses = { ...state.sessionStatuses }
+      delete nextStatuses[action.sessionId]
       return {
         ...state,
         activeTabId: action.sessionId === state.currentSessionId ? null : state.activeTabId,
@@ -79,7 +79,7 @@ export function reduceSessionState(state: AppState, action: AppAction): AppState
           type: 'session-picker',
         },
         sessions: newSessions,
-        sessionsBusy: nextBusy,
+        sessionStatuses: nextStatuses,
         tabs: action.sessionId === state.currentSessionId ? [] : state.tabs,
       }
     }
@@ -101,11 +101,18 @@ export function reduceSessionState(state: AppState, action: AppAction): AppState
       }
       return { ...state, sessions: ordered }
     }
-    case 'set-session-busy': {
-      if ((state.sessionsBusy[action.sessionId] ?? false) === action.busy) return state
+    case 'set-session-status': {
+      const prev = state.sessionStatuses[action.sessionId]
+      if (
+        prev !== undefined &&
+        prev.working === action.status.working &&
+        prev.waiting === action.status.waiting
+      ) {
+        return state
+      }
       return {
         ...state,
-        sessionsBusy: { ...state.sessionsBusy, [action.sessionId]: action.busy },
+        sessionStatuses: { ...state.sessionStatuses, [action.sessionId]: action.status },
       }
     }
     default:

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

@@ -432,16 +432,6 @@ export function reduceTabState(state: AppState, action: AppAction): AppState | n
         ...state,
         tabs: updateTab(state.tabs, action.tabId, (tab) => ({ ...tab, activity: action.activity })),
       }
-    case 'set-tab-status':
-      return {
-        ...state,
-        tabs: updateTab(state.tabs, action.tabId, (tab) => ({
-          ...tab,
-          activity: action.status === 'running' ? tab.activity : undefined,
-          exitCode: action.exitCode,
-          status: action.status,
-        })),
-      }
     case 'set-tab-error':
       return {
         ...state,

package/src/state/selectors.ts

@@ -1,5 +1,17 @@
+import type { AssistantOption } from '../pty/command-registry'
 import type { SessionRecord, SnippetRecord } from './types'
 
+export function filterAssistants(
+  options: AssistantOption[],
+  filter: string | null
+): AssistantOption[] {
+  if (!filter) return options
+  const lower = filter.toLowerCase()
+  return options.filter(
+    (o) => o.label.toLowerCase().includes(lower) || o.description.toLowerCase().includes(lower)
+  )
+}
+
 export function filterSessions(sessions: SessionRecord[], filter: string | null): SessionRecord[] {
   if (!filter) {
     return sessions

package/src/state/session-persistence.ts

@@ -20,7 +20,7 @@ export function createEmptyWorkspaceSnapshot(): WorkspaceSnapshotV1 {
   }
 }
 
-function getDisconnectedStatus(status: WorkspaceSnapshotV1['tabs'][number]['status']): TabStatus {
+function getDisconnectedStatus(status: TabStatus): TabStatus {
   if (status === 'running' || status === 'starting') {
     return 'disconnected'
   }
@@ -61,20 +61,25 @@ export function restoreTabsFromWorkspace(snapshot: WorkspaceSnapshotV1 | undefin
     return []
   }
 
-  return snapshot.tabs.map((tab) => ({
-    activity: 'idle',
-    assistant: tab.assistant,
-    buffer: tab.buffer,
-    command: tab.command,
-    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,
-    viewport: tab.viewport,
-  }))
+  return snapshot.tabs
+    .filter(
+      (tab): tab is typeof tab & { status: Exclude<typeof tab.status, 'exited'> } =>
+        tab.status !== 'exited'
+    )
+    .map((tab) => ({
+      activity: 'idle',
+      assistant: tab.assistant,
+      buffer: tab.buffer,
+      command: tab.command,
+      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,
+      viewport: tab.viewport,
+    }))
 }
 
 export function restoreLayoutTrees(

package/src/state/store.ts

@@ -67,7 +67,7 @@ export function createInitialState(
     activeTabId: null,
     currentSessionId: null,
     customCommands,
-    focusMode: showSessionPicker ? 'modal' : 'navigation',
+    focusMode: showSessionPicker ? 'command-edit' : 'navigation',
     gitMode: { ...emptyGitMode(), ...overrides.gitMode },
     gitPane: {
       ...DEFAULT_GIT_PANE,
@@ -82,7 +82,13 @@ export function createInitialState(
     },
     layoutTrees: {},
     modal: showSessionPicker
-      ? { editBuffer: null, selectedIndex: 0, sessionTargetId: null, type: 'session-picker' }
+      ? {
+          cursorPos: 0,
+          editBuffer: '',
+          selectedIndex: 0,
+          sessionTargetId: null,
+          type: 'session-picker',
+        }
       : emptyModal(),
     pendingChords: null,
     sessionBar: {
@@ -90,7 +96,7 @@ export function createInitialState(
       visible: overrides.sessionBarVisible ?? true,
     },
     sessions,
-    sessionsBusy: {},
+    sessionStatuses: {},
     sidebar: {
       maxWidth: DEFAULT_SIDEBAR_MAX_WIDTH,
       minWidth: DEFAULT_SIDEBAR_MIN_WIDTH,
@@ -125,6 +131,8 @@ export function appReducer(state: AppState, action: AppAction): AppState {
   switch (action.type) {
     case 'set-snippets':
       return { ...state, snippets: action.snippets }
+    case 'set-custom-commands':
+      return { ...state, customCommands: action.customCommands }
     case 'delete-snippet': {
       const newSnippets = state.snippets.filter((s) => s.id !== action.snippetId)
       const filteredNew = filterSnippets(newSnippets, state.modal.editBuffer)

package/src/state/types.ts

@@ -7,9 +7,27 @@ export type BuiltinAssistantId = 'claude' | 'codex' | 'opencode' | 'terminal'
 
 export type AssistantId = BuiltinAssistantId | (string & {})
 
-export type TabStatus = 'starting' | 'running' | 'disconnected' | 'exited' | 'error'
+export type TabStatus = 'starting' | 'running' | 'disconnected' | 'error'
 
-export type TabActivity = 'busy' | 'idle'
+/**
+ * Status values that may appear in legacy on-disk workspace snapshots but are
+ * not produced by the running app anymore. Filtered at restore time.
+ */
+export type LegacyPersistedTabStatus = TabStatus | 'exited'
+
+export type TabActivity = 'working' | 'waiting-input' | 'idle'
+
+/**
+ * Per-session status flags. Both can be true at once (e.g. one tab working,
+ * another waiting for user input) so we keep them as independent booleans
+ * rather than a single priority enum.
+ */
+export interface SessionStatus {
+  working: boolean
+  waiting: boolean
+}
+
+export const IDLE_SESSION_STATUS: SessionStatus = { waiting: false, working: false }
 
 export type FocusMode = 'navigation' | 'terminal-input' | 'modal' | 'command-edit' | 'git'
 
@@ -72,7 +90,7 @@ export interface PersistedTabSnapshot {
   assistant: AssistantId
   title: string
   command: string
-  status: Exclude<TabStatus, 'disconnected'>
+  status: Exclude<LegacyPersistedTabStatus, 'disconnected'>
   buffer: string
   viewport?: TerminalSnapshot
   terminalModes: TerminalModeState
@@ -264,6 +282,7 @@ export interface ModalClosed extends ModalBase {
 
 export interface ModalNewTab extends ModalBase {
   type: 'new-tab'
+  editingCommand: AssistantId | null
 }
 
 export interface ModalSessionPicker extends ModalBase {
@@ -310,6 +329,7 @@ export interface ModalCreateSession extends ModalBase {
   pendingProjectPath: string | null
   activeField: 'directory' | 'name'
   nameBuffer: string
+  returnToSessionPicker: boolean
 }
 
 export interface ModalSnippetEditor extends ModalBase {
@@ -364,7 +384,7 @@ export interface AppState {
   tabGroupMap: Record<string, string>
   sessions: SessionRecord[]
   currentSessionId: string | null
-  sessionsBusy: Record<string, boolean>
+  sessionStatuses: Record<string, SessionStatus>
   sessionBar: SessionBarState
   snippets: SnippetRecord[]
   focusMode: FocusMode
@@ -383,31 +403,27 @@ export interface AppState {
 export type ModalAction =
   | { type: 'move-modal-cursor'; delta?: number; to?: 'home' | 'end' }
   | { type: 'open-new-tab-modal' }
+  | { type: 'open-edit-custom-command'; assistantId: AssistantId }
   | { type: 'open-help-modal'; scope?: ModeId }
   | { type: 'open-split-picker'; direction: import('./layout-tree').SplitDirection }
   | { type: 'open-session-picker' }
   | { type: 'open-session-name-modal'; sessionTargetId?: string; initialName?: string }
   | { type: 'close-modal' }
   | { type: 'move-modal-selection'; delta: number }
-  | { type: 'begin-command-edit' }
   | { type: 'update-command-edit'; char: string }
-  | { type: 'commit-command-edit' }
   | { type: 'cancel-command-edit' }
-  | { type: 'open-create-session-modal' }
+  | { type: 'open-create-session-modal'; returnToSessionPicker: boolean }
   | { type: 'set-directory-results'; results: DirectoryResult[] }
   | { type: 'switch-create-session-field' }
   | { type: 'select-directory' }
-  | { type: 'begin-session-filter' }
   | { type: 'open-rename-tab-modal' }
   | { type: 'open-snippet-picker' }
   | { type: 'open-snippet-editor'; snippetId?: string }
-  | { type: 'begin-snippet-filter' }
-  | { type: 'begin-help-filter' }
-  | { type: 'begin-theme-filter' }
   | { type: 'set-help-entry-count'; count: number }
   | { type: 'set-theme-entry-count'; count: number }
   | { type: 'open-theme-picker' }
   | { type: 'open-update-available-modal'; currentVersion: string; latestVersion: string }
+  | { type: 'set-modal-selection-index'; index: number }
 
 // -- Session actions --
 export type SessionAction =
@@ -417,7 +433,7 @@ export type SessionAction =
   | { type: 'rename-session-record'; sessionId: string; name: string }
   | { type: 'delete-session-record'; sessionId: string }
   | { type: 'reorder-sessions'; orderedIds: string[] }
-  | { type: 'set-session-busy'; sessionId: string; busy: boolean }
+  | { type: 'set-session-status'; sessionId: string; status: SessionStatus }
 
 // -- Tab actions --
 export type TabAction =
@@ -447,7 +463,6 @@ export type TabAction =
     }
   | { 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 }
 
 // -- Layout actions --
@@ -558,6 +573,7 @@ export type GitModeAction =
 export type DataAction =
   | { type: 'set-snippets'; snippets: SnippetRecord[] }
   | { type: 'delete-snippet'; snippetId: string }
+  | { type: 'set-custom-commands'; customCommands: Record<AssistantId, string> }
 
 export type AppAction =
   | ModalAction

package/src/ui/breaking-update-screen.tsx

@@ -0,0 +1,31 @@
+import { useKeyboard } from '@opentui/react'
+
+import { ListItem } from './components/list-item'
+import { ModalShell } from './components/modal-shell'
+import { uiTokens } from './ui-tokens'
+
+interface BreakingUpdateScreenProps {
+  onConfirm: () => void
+}
+
+export function BreakingUpdateScreen({ onConfirm }: BreakingUpdateScreenProps) {
+  useKeyboard((key) => {
+    if (key.name === 'return') {
+      key.preventDefault()
+      onConfirm()
+    }
+  })
+
+  return (
+    <ModalShell title="Breaking update detected" width={uiTokens.modalWidth.md}>
+      <box flexDirection="column" gap={1}>
+        <box flexDirection="column" gap={0}>
+          <text>{"We're sorry, but this update contains breaking protocol changes."}</text>
+          <text>The terminal manager must be restarted.</text>
+          <text>You will lose your current terminal states.</text>
+        </box>
+        <ListItem active direction="row" title={<text>OK — Restart terminal manager</text>} />
+      </box>
+    </ModalShell>
+  )
+}