@brimveyn/aimux 1.4.1 → 1.5.4

package/src/input/keymap/help-entries.ts

@@ -0,0 +1,44 @@
+import type { ModeId, ResolvedKeymapConfig } from '@brimveyn/aimux-config'
+
+import { describeBindings, type DescribedBinding } from './describe-bindings'
+
+export interface HelpEntry extends DescribedBinding {
+  mode: ModeId
+  modeLabel: string
+}
+
+export const HELP_MODE_LABELS: { modeId: ModeId; label: string }[] = [
+  { label: 'Navigation', modeId: 'navigation' },
+  { label: 'Terminal input', modeId: 'terminal-input' },
+  { label: 'Git mode', modeId: 'git-mode' },
+  { label: 'Git commit', modeId: 'modal.git-commit' },
+  { label: 'New tab', modeId: 'modal.new-tab' },
+  { label: 'New tab — command', modeId: 'modal.new-tab.command-edit' },
+  { label: 'Session picker', modeId: 'modal.session-picker' },
+  { label: 'Session picker — filter', modeId: 'modal.session-picker.filtering' },
+  { label: 'Session name', modeId: 'modal.session-name' },
+  { label: 'Create session', modeId: 'modal.create-session' },
+  { label: 'Rename tab', modeId: 'modal.rename-tab' },
+  { label: 'Snippet picker', modeId: 'modal.snippet-picker' },
+  { label: 'Snippet picker — filter', modeId: 'modal.snippet-picker.filtering' },
+  { label: 'Snippet editor', modeId: 'modal.snippet-editor' },
+  { label: 'Theme picker', modeId: 'modal.theme-picker' },
+  { label: 'Split picker', modeId: 'modal.split-picker' },
+  { label: 'Help', modeId: 'modal.help' },
+  { label: 'Help — filter', modeId: 'modal.help.filtering' },
+  { label: 'Update available', modeId: 'modal.update-available' },
+]
+
+export function collectHelpEntries(config: ResolvedKeymapConfig): HelpEntry[] {
+  const entries: HelpEntry[] = []
+  for (const { label, modeId } of HELP_MODE_LABELS) {
+    const bindings = describeBindings(config, modeId, {
+      dedupeByDescription: true,
+      withDescriptionOnly: true,
+    })
+    for (const binding of bindings) {
+      entries.push({ ...binding, mode: modeId, modeLabel: label })
+    }
+  }
+  return entries
+}

package/src/input/keymap/keymap-ref.ts

@@ -0,0 +1,11 @@
+import type { ResolvedKeymapConfig } from '@brimveyn/aimux-config'
+
+let activeKeymap: ResolvedKeymapConfig | null = null
+
+export function setActiveKeymap(config: ResolvedKeymapConfig | null): void {
+  activeKeymap = config
+}
+
+export function getActiveKeymap(): ResolvedKeymapConfig | null {
+  return activeKeymap
+}

package/src/input/keymap/sequence-resolver.ts

@@ -17,6 +17,8 @@ export class SequenceResolver {
   private timeoutHandle: ReturnType<typeof setTimeout> | null = null
   private onTimeout: ((binding: TrieBinding) => void) | null = null
   private onPendingChange: ((chords: KeyChord[] | null) => void) | null = null
+  private repeatTerminal: KeyChord | null = null
+  private repeatBinding: TrieBinding | null = null
 
   constructor(
     private readonly trie: KeyTrie,
@@ -37,16 +39,29 @@ export class SequenceResolver {
   feed(chord: KeyChord): ResolveResult {
     this.clearTimeout()
 
+    // Repeat: when not mid-sequence and the chord matches the last repeatable
+    // sequence's terminal key, re-fire it.
+    if (
+      this.currentNode === null &&
+      this.repeatTerminal !== null &&
+      this.repeatBinding !== null &&
+      chord === this.repeatTerminal
+    ) {
+      return { binding: this.repeatBinding, type: 'resolved' }
+    }
+
     const fromNode = this.currentNode ?? this.trie.root
     const match = this.trie.lookup(chord, fromNode)
 
     switch (match.type) {
       case 'exact': {
         this.resetState()
+        this.updateRepeatOnResolve(chord, match.binding)
         return { binding: match.binding, type: 'resolved' }
       }
 
       case 'prefix': {
+        this.clearRepeat()
         this.currentNode = match.node
         this.pendingBinding = null
         this.pendingChords.push(chord)
@@ -55,11 +70,12 @@ export class SequenceResolver {
       }
 
       case 'exact+prefix': {
+        this.clearRepeat()
         this.currentNode = match.node
         this.pendingBinding = match.binding
         this.pendingChords.push(chord)
         this.emitPendingChange()
-        this.startTimeout(match.binding)
+        this.startTimeout(chord, match.binding)
         return { type: 'pending' }
       }
 
@@ -69,6 +85,7 @@ export class SequenceResolver {
           this.resetState()
           return this.feed(chord)
         }
+        this.clearRepeat()
         return { type: 'passthrough' }
       }
     }
@@ -77,6 +94,7 @@ export class SequenceResolver {
   reset(): void {
     this.clearTimeout()
     this.resetState()
+    this.clearRepeat()
   }
 
   setTimeoutCallback(cb: (binding: TrieBinding) => void): void {
@@ -107,11 +125,26 @@ export class SequenceResolver {
     }
   }
 
-  private startTimeout(binding: TrieBinding): void {
+  private startTimeout(chord: KeyChord, binding: TrieBinding): void {
     this.timeoutHandle = setTimeout(() => {
       this.timeoutHandle = null
       this.resetState()
+      this.updateRepeatOnResolve(chord, binding)
       this.onTimeout?.(binding)
     }, this.config.timeoutMs)
   }
+
+  private updateRepeatOnResolve(chord: KeyChord, binding: TrieBinding): void {
+    if (binding.repeatable) {
+      this.repeatTerminal = chord
+      this.repeatBinding = binding
+    } else {
+      this.clearRepeat()
+    }
+  }
+
+  private clearRepeat(): void {
+    this.repeatTerminal = null
+    this.repeatBinding = null
+  }
 }

package/src/input/keymap/trie.ts

@@ -6,6 +6,7 @@ export type ActionFn = (ctx: ModeContext) => KeyResult | null
 export interface TrieBinding {
   result: KeyResult | ActionFn
   group?: string
+  repeatable?: boolean
 }
 
 export interface TrieNode {

package/src/input/modes/bridge.ts

@@ -5,7 +5,6 @@ type SupportedModalType = Exclude<ModalType, null>
 
 const DIRECT_FOCUS_MODE_IDS: Partial<Record<FocusMode, ModeId>> = {
   'git': 'git-mode',
-  'layout': 'layout',
   'navigation': 'navigation',
   'terminal-input': 'terminal-input',
 }
@@ -13,6 +12,7 @@ const DIRECT_FOCUS_MODE_IDS: Partial<Record<FocusMode, ModeId>> = {
 const COMMAND_EDIT_MODE_IDS: Partial<Record<SupportedModalType, ModeId>> = {
   'create-session': 'modal.create-session',
   'git-commit': 'modal.git-commit',
+  'help': 'modal.help.filtering',
   'new-tab': 'modal.new-tab.command-edit',
   'rename-tab': 'modal.rename-tab',
   'session-name': 'modal.session-name',

package/src/input/modes/handlers/shared.ts

@@ -68,19 +68,3 @@ export function handleCtrlNavigation(key: KeyInput): KeyResult | null {
 
   return null
 }
-
-export function handleCursorNavigation(key: KeyInput): KeyResult | null {
-  if (key.name === 'left' && !key.ctrl && !key.meta) {
-    return result([{ delta: -1, type: 'move-modal-cursor' }])
-  }
-  if (key.name === 'right' && !key.ctrl && !key.meta) {
-    return result([{ delta: 1, type: 'move-modal-cursor' }])
-  }
-  if (key.name === 'home' || (key.ctrl && key.name === 'a')) {
-    return result([{ to: 'home', type: 'move-modal-cursor' }])
-  }
-  if (key.name === 'end' || (key.ctrl && key.name === 'e')) {
-    return result([{ to: 'end', type: 'move-modal-cursor' }])
-  }
-  return null
-}

package/src/input/modes/transitions.ts

@@ -2,10 +2,10 @@ import type { ModeId } from './types'
 
 const TRANSITIONS: Record<ModeId, readonly ModeId[]> = {
   'git-mode': ['navigation', 'modal.git-commit'],
-  'layout': ['terminal-input', 'navigation', 'modal.split-picker'],
   'modal.create-session': ['navigation', 'modal.session-picker'],
   'modal.git-commit': ['git-mode'],
-  'modal.help': ['navigation'],
+  'modal.help': ['navigation', 'modal.help.filtering'],
+  'modal.help.filtering': ['modal.help'],
   'modal.new-tab': ['navigation', 'modal.new-tab.command-edit'],
   'modal.new-tab.command-edit': ['modal.new-tab'],
   'modal.rename-tab': ['navigation'],
@@ -20,7 +20,7 @@ const TRANSITIONS: Record<ModeId, readonly ModeId[]> = {
   'modal.snippet-editor': ['navigation', 'modal.snippet-picker'],
   'modal.snippet-picker': ['navigation', 'modal.snippet-picker.filtering', 'modal.snippet-editor'],
   'modal.snippet-picker.filtering': ['modal.snippet-picker'],
-  'modal.split-picker': ['navigation'],
+  'modal.split-picker': ['navigation', 'terminal-input'],
   'modal.theme-picker': ['navigation'],
   'modal.update-available': ['navigation'],
   'navigation': [
@@ -34,7 +34,7 @@ const TRANSITIONS: Record<ModeId, readonly ModeId[]> = {
     'modal.update-available',
     'git-mode',
   ],
-  'terminal-input': ['navigation', 'layout'],
+  'terminal-input': ['navigation', 'modal.split-picker'],
 }
 
 export function isValidTransition(from: ModeId, to: ModeId): boolean {

package/src/input/modes/types.ts

@@ -5,7 +5,6 @@ import type { AppAction, AppState, TabSession } from '../../state/types'
 export type ModeId =
   | 'navigation'
   | 'terminal-input'
-  | 'layout'
   | 'git-mode'
   | 'modal.new-tab'
   | 'modal.new-tab.command-edit'
@@ -19,6 +18,7 @@ export type ModeId =
   | 'modal.snippet-editor'
   | 'modal.theme-picker'
   | 'modal.help'
+  | 'modal.help.filtering'
   | 'modal.split-picker'
   | 'modal.git-commit'
   | 'modal.update-available'

package/src/platform/daemon-control.ts

@@ -21,10 +21,6 @@ export async function findSocketProcessPid(socketPath: string): Promise<number |
   }
 }
 
-export async function findDaemonPid(socketPath: string): Promise<number | null> {
-  return findSocketProcessPid(socketPath)
-}
-
 export async function findIpcDaemonPid(): Promise<number | null> {
   return findSocketProcessPid(getIpcDaemonSocketPath())
 }
@@ -53,10 +49,6 @@ export async function killProcess(pid: number): Promise<void> {
   }
 }
 
-export async function killDaemon(pid: number): Promise<void> {
-  await killProcess(pid)
-}
-
 async function waitForSocket(socketPath: string): Promise<boolean> {
   const deadline = Date.now() + 2_000
   while (Date.now() < deadline) {

package/src/state/reducers/git-panel-state.ts

@@ -49,18 +49,45 @@ function sameFiles(a: GitFileEntry[], b: GitFileEntry[]): boolean {
 
 export function reduceGitPanelState(state: AppState, action: AppAction): AppState | null {
   switch (action.type) {
-    case 'toggle-git-panel': {
-      const nextGitVisible = !state.sidebar.gitPanelVisible
-      const nextVisible = state.sidebar.visible || nextGitVisible
+    case 'toggle-git-pane': {
+      const nextVisible = !state.gitPane.visible
+      const sidebarMustShow = state.gitPane.mode === 'embedded' && nextVisible
       return {
         ...state,
-        sidebar: { ...state.sidebar, gitPanelVisible: nextGitVisible, visible: nextVisible },
+        gitPane: { ...state.gitPane, visible: nextVisible },
+        sidebar: sidebarMustShow ? { ...state.sidebar, visible: true } : state.sidebar,
       }
     }
-    case 'resize-git-panel': {
-      const nextRatio = clampRatio(state.sidebar.gitPanelRatio + action.delta)
-      if (nextRatio === state.sidebar.gitPanelRatio) return state
-      return { ...state, sidebar: { ...state.sidebar, gitPanelRatio: nextRatio } }
+    case 'resize-git-pane': {
+      const nextRatio = clampRatio(state.gitPane.ratio + action.delta)
+      if (nextRatio === state.gitPane.ratio) return state
+      return { ...state, gitPane: { ...state.gitPane, ratio: nextRatio } }
+    }
+    case 'set-git-pane-mode': {
+      if (state.gitPane.mode === action.mode) return state
+      const isEmbedded = action.mode === 'embedded'
+      const isValidEmbedded =
+        state.gitPane.position === 'top' || state.gitPane.position === 'bottom'
+      const isValidPane = state.gitPane.position === 'left' || state.gitPane.position === 'right'
+      let nextPosition: typeof state.gitPane.position
+      if (isEmbedded) {
+        nextPosition = isValidEmbedded ? state.gitPane.position : 'bottom'
+      } else {
+        nextPosition = isValidPane ? state.gitPane.position : 'left'
+      }
+      return {
+        ...state,
+        gitPane: { ...state.gitPane, mode: action.mode, position: nextPosition },
+      }
+    }
+    case 'set-git-pane-position': {
+      const validForMode =
+        state.gitPane.mode === 'embedded'
+          ? action.position === 'top' || action.position === 'bottom'
+          : action.position === 'left' || action.position === 'right'
+      if (!validForMode) return state
+      if (state.gitPane.position === action.position) return state
+      return { ...state, gitPane: { ...state.gitPane, position: action.position } }
     }
     case 'git-refresh-success': {
       const prev = state.gitPanel

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

@@ -2,6 +2,8 @@ import { basename } from 'node:path'
 
 import type { AppAction, AppState } from '../types'
 
+import { collectHelpEntries } from '../../input/keymap/help-entries'
+import { getActiveKeymap } from '../../input/keymap/keymap-ref'
 import { getAllAssistantOptions } from '../../pty/command-registry'
 import { THEME_IDS } from '../../ui/themes'
 import { filterSessions, filterSnippets } from '../selectors'
@@ -38,18 +40,22 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
           type: 'new-tab',
         },
       }
-    case 'open-help-modal':
+    case 'open-help-modal': {
+      const keymap = getActiveKeymap()
+      const entryCount = keymap ? collectHelpEntries(keymap).length : 0
       return {
         ...state,
         focusMode: 'modal',
         modal: {
           cursorPos: 0,
           editBuffer: null,
+          entryCount,
           selectedIndex: 0,
           sessionTargetId: null,
           type: 'help',
         },
       }
+    }
     case 'open-split-picker':
       return {
         ...state,
@@ -200,12 +206,45 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         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) {
+        // Still clamp selectedIndex in case the count shrank below it.
+        const clamped = Math.min(state.modal.selectedIndex, Math.max(0, action.count - 1))
+        if (clamped === state.modal.selectedIndex) return state
+        return { ...state, modal: { ...state.modal, selectedIndex: clamped } }
+      }
+      const clamped = Math.min(state.modal.selectedIndex, Math.max(0, action.count - 1))
+      return {
+        ...state,
+        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,
+        focusMode: 'command-edit',
+        modal: { ...state.modal, cursorPos: buf.length, editBuffer: buf },
+      }
+    }
     case 'close-modal': {
       const nextFocus: AppState['focusMode'] =
         state.modal.type === 'git-commit' ? 'git' : 'navigation'
       return { ...state, focusMode: nextFocus, modal: emptyModal() }
     }
     case 'move-modal-selection': {
+      if (state.modal.type === 'help') {
+        const count = state.modal.entryCount
+        if (count <= 0) return state
+        const raw = state.modal.selectedIndex + action.delta
+        const nextIndex = ((raw % count) + count) % count
+        if (nextIndex === state.modal.selectedIndex) return state
+        return { ...state, modal: { ...state.modal, selectedIndex: nextIndex } }
+      }
       if (
         state.modal.type !== 'new-tab' &&
         state.modal.type !== 'session-picker' &&
@@ -293,7 +332,9 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         nextCursor = cursor + action.char.length
       }
       const resetIndex =
-        state.modal.type === 'session-picker' || state.modal.type === 'snippet-picker'
+        state.modal.type === 'session-picker' ||
+        state.modal.type === 'snippet-picker' ||
+        state.modal.type === 'help'
           ? 0
           : state.modal.selectedIndex
       return {
@@ -360,7 +401,11 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
       if (state.modal.type === 'create-session' || state.modal.type === 'snippet-editor') {
         return { ...state, focusMode: 'navigation', modal: emptyModal() }
       }
-      if (state.modal.type === 'session-picker' || state.modal.type === 'snippet-picker') {
+      if (
+        state.modal.type === 'session-picker' ||
+        state.modal.type === 'snippet-picker' ||
+        state.modal.type === 'help'
+      ) {
         return {
           ...state,
           focusMode: 'modal',

package/src/state/selectors.ts

@@ -1,4 +1,4 @@
-import type { AppState, SessionRecord, SnippetRecord, TabSession } from './types'
+import type { SessionRecord, SnippetRecord } from './types'
 
 export function filterSessions(sessions: SessionRecord[], filter: string | null): SessionRecord[] {
   if (!filter) {
@@ -24,7 +24,3 @@ export function filterSnippets(snippets: SnippetRecord[], filter: string | null)
       snippet.name.toLowerCase().includes(lower) || snippet.content.toLowerCase().includes(lower)
   )
 }
-
-export function getActiveTab(state: AppState): TabSession | undefined {
-  return state.activeTabId ? state.tabs.find((tab) => tab.id === state.activeTabId) : undefined
-}

package/src/state/session-persistence.ts

@@ -1,10 +1,4 @@
-import {
-  allLeafIds,
-  createGroupId,
-  createLeaf,
-  type LayoutNode,
-  pruneLayoutTree,
-} from './layout-tree'
+import { allLeafIds, createGroupId, type LayoutNode, pruneLayoutTree } from './layout-tree'
 import {
   type AppState,
   DEFAULT_SCROLL_INTENT,
@@ -83,19 +77,6 @@ export function restoreTabsFromWorkspace(snapshot: WorkspaceSnapshotV1 | undefin
   }))
 }
 
-export function restoreLayoutTree(
-  snapshot: WorkspaceSnapshotV1 | undefined,
-  tabs: TabSession[]
-): LayoutNode | null {
-  if (snapshot?.layoutTree) {
-    const validTabIds = new Set(tabs.map((t) => t.id))
-    const pruned = pruneLayoutTree(snapshot.layoutTree, validTabIds)
-    if (pruned) return pruned
-  }
-  // Fallback: single leaf for the first tab
-  return tabs[0] ? createLeaf(tabs[0].id) : null
-}
-
 export function restoreLayoutTrees(
   snapshot: WorkspaceSnapshotV1 | undefined,
   tabs: TabSession[]

package/src/state/store.ts

@@ -1,4 +1,13 @@
-import type { AppAction, AppState, SessionBarPosition, SessionRecord, SnippetRecord } from './types'
+import type {
+  AppAction,
+  AppState,
+  GitPaneMode,
+  GitPanePosition,
+  GitPaneState,
+  SessionBarPosition,
+  SessionRecord,
+  SnippetRecord,
+} from './types'
 
 import { emptyGitMode, reduceGitModeState } from './reducers/git-mode-state'
 import { emptyGitPanel, reduceGitPanelState } from './reducers/git-panel-state'
@@ -15,12 +24,27 @@ const DEFAULT_TERMINAL_COLS = 80
 const DEFAULT_TERMINAL_ROWS = 24
 
 export interface InitialStateOverrides {
-  gitPanelVisible?: boolean
-  gitPanelRatio?: number
+  gitPane?: Partial<GitPaneState>
   sessionBarVisible?: boolean
   sessionBarPosition?: SessionBarPosition
 }
 
+const DEFAULT_GIT_PANE: GitPaneState = {
+  diffCount: { enabled: true },
+  mode: 'embedded',
+  path: { enabled: true },
+  position: 'bottom',
+  ratio: 0.5,
+  visible: true,
+}
+
+function resolveGitPanePosition(mode: GitPaneMode, position: GitPanePosition): GitPanePosition {
+  if (mode === 'embedded') {
+    return position === 'top' || position === 'bottom' ? position : 'bottom'
+  }
+  return position === 'left' || position === 'right' ? position : 'left'
+}
+
 export function createInitialState(
   customCommands: Record<string, string> = {},
   sessions: SessionRecord[] = [],
@@ -28,12 +52,23 @@ export function createInitialState(
   showSessionPicker = false,
   overrides: InitialStateOverrides = {}
 ): AppState {
+  const gitPaneMode = overrides.gitPane?.mode ?? DEFAULT_GIT_PANE.mode
+  const gitPanePosition = resolveGitPanePosition(
+    gitPaneMode,
+    overrides.gitPane?.position ?? DEFAULT_GIT_PANE.position
+  )
   return {
     activeTabId: null,
     currentSessionId: null,
     customCommands,
     focusMode: showSessionPicker ? 'modal' : 'navigation',
     gitMode: emptyGitMode(),
+    gitPane: {
+      ...DEFAULT_GIT_PANE,
+      ...overrides.gitPane,
+      mode: gitPaneMode,
+      position: gitPanePosition,
+    },
     gitPanel: emptyGitPanel(),
     layout: {
       terminalCols: DEFAULT_TERMINAL_COLS,
@@ -51,8 +86,6 @@ export function createInitialState(
     sessions,
     sessionsBusy: {},
     sidebar: {
-      gitPanelRatio: overrides.gitPanelRatio ?? 0.5,
-      gitPanelVisible: overrides.gitPanelVisible ?? true,
       maxWidth: DEFAULT_SIDEBAR_MAX_WIDTH,
       minWidth: DEFAULT_SIDEBAR_MIN_WIDTH,
       visible: true,

package/src/state/types.ts

@@ -6,13 +6,7 @@ export type TabStatus = 'starting' | 'running' | 'disconnected' | 'exited' | 'er
 
 export type TabActivity = 'busy' | 'idle'
 
-export type FocusMode =
-  | 'navigation'
-  | 'terminal-input'
-  | 'modal'
-  | 'command-edit'
-  | 'layout'
-  | 'git'
+export type FocusMode = 'navigation' | 'terminal-input' | 'modal' | 'command-edit' | 'git'
 
 export type ModalType =
   | 'new-tab'
@@ -89,8 +83,6 @@ export interface WorkspaceSnapshotV1 {
   sidebar: {
     visible: boolean
     width: number
-    gitPanelVisible?: boolean
-    gitPanelRatio?: number
   }
   tabs: PersistedTabSnapshot[]
   layoutTree?: import('./layout-tree').LayoutNode
@@ -136,8 +128,24 @@ export interface SidebarState {
   width: number
   minWidth: number
   maxWidth: number
-  gitPanelVisible: boolean
-  gitPanelRatio: number
+}
+
+export type GitPaneMode = 'embedded' | 'pane'
+export type GitPanePosition = 'top' | 'bottom' | 'left' | 'right'
+
+export type GitPanePathConfig =
+  | { enabled: false }
+  | { enabled: true; pathFn?: (path: string) => string }
+
+export type GitPaneDiffCountConfig = { enabled: boolean }
+
+export interface GitPaneState {
+  visible: boolean
+  mode: GitPaneMode
+  position: GitPanePosition
+  ratio: number
+  path: GitPanePathConfig
+  diffCount: GitPaneDiffCountConfig
 }
 
 export type GitFileStatus = 'M' | 'A' | 'D' | 'R' | 'C' | 'U' | '?'
@@ -222,6 +230,7 @@ export interface ModalThemePicker extends ModalBase {
 
 export interface ModalHelp extends ModalBase {
   type: 'help'
+  entryCount: number
 }
 
 export interface ModalSplitPicker extends ModalBase {
@@ -300,6 +309,7 @@ export interface AppState {
   snippets: SnippetRecord[]
   focusMode: FocusMode
   sidebar: SidebarState
+  gitPane: GitPaneState
   modal: ModalState
   layout: LayoutState
   customCommands: Record<AssistantId, string>
@@ -332,6 +342,8 @@ export type ModalAction =
   | { type: 'open-snippet-picker' }
   | { type: 'open-snippet-editor'; snippetId?: string }
   | { type: 'begin-snippet-filter' }
+  | { type: 'begin-help-filter' }
+  | { type: 'set-help-entry-count'; count: number }
   | { type: 'open-theme-picker' }
   | { type: 'open-update-available-modal'; currentVersion: string; latestVersion: string }
 
@@ -407,8 +419,10 @@ export type UIAction =
   | { type: 'resize-sidebar'; delta: number }
   | { type: 'set-focus-mode'; focusMode: FocusMode }
   | { type: 'set-terminal-size'; cols: number; rows: number }
-  | { type: 'toggle-git-panel' }
-  | { type: 'resize-git-panel'; delta: number }
+  | { type: 'toggle-git-pane' }
+  | { type: 'resize-git-pane'; delta: number }
+  | { type: 'set-git-pane-mode'; mode: GitPaneMode }
+  | { type: 'set-git-pane-position'; position: GitPanePosition }
   | { type: 'set-pending-chords'; chords: string[] | null }
   | { type: 'toggle-session-bar' }
   | { type: 'set-session-bar-position'; position: SessionBarPosition }

package/src/state/validation.ts

@@ -114,8 +114,6 @@ export function isWorkspaceSnapshotV1(value: unknown): value is WorkspaceSnapsho
     isObjectRecord(value.sidebar) &&
     isBoolean(value.sidebar.visible) &&
     isFiniteNumber(value.sidebar.width) &&
-    (value.sidebar.gitPanelVisible === undefined || isBoolean(value.sidebar.gitPanelVisible)) &&
-    (value.sidebar.gitPanelRatio === undefined || isFiniteNumber(value.sidebar.gitPanelRatio)) &&
     Array.isArray(value.tabs) &&
     value.tabs.every(
       (tab) =>

package/src/state/workspace-save.ts

@@ -24,8 +24,12 @@ export function saveCurrentWorkspace(state: AppState): void {
   saveConfig({
     ...loadConfig(),
     customCommands: state.customCommands,
-    gitPanelRatio: state.sidebar.gitPanelRatio,
-    gitPanelVisible: state.sidebar.gitPanelVisible,
+    gitPane: {
+      mode: state.gitPane.mode,
+      position: state.gitPane.position,
+      ratio: state.gitPane.ratio,
+      visible: state.gitPane.visible,
+    },
     sessionBarPosition: state.sessionBar.position,
     sessionBarVisible: state.sessionBar.visible,
   })