@brimveyn/aimux-config 0.4.6 → 0.5.1

package/README.md

@@ -44,17 +44,21 @@ import { defineConfig, actions } from '@brimveyn/aimux-config'
 
 export default defineConfig({
   sessionBar: {
-    position: 'top',
-    visible: true,
+    initialPosition: 'top',
+    initialVisible: true,
   },
 
   keymaps: (k) =>
-    k.mode('navigation', (m) => m.map('<C-p>', actions.sessionPicker, 'Session picker')),
+    k.mode('navigation', (m) => m.map('<C-p>', actions.sessionPicker, 'Workspace picker')),
 })
 ```
 
 This example only uses surfaces that are wired into the runtime today.
 
+Important: typed config expresses startup intent. Fields such as
+`sessionBar.initialVisible` or `gitPane.initialMode` are reapplied on every
+launch; runtime UI changes do not write back into `aimux.config.ts`.
+
 ## Key Notation
 
 | Notation                           | Meaning                    |
@@ -136,7 +140,7 @@ explanation.
 Pre-built actions include:
 
 - tabs: `nextTab`, `prevTab`, `newTab`, `renameTab`, `closeTab`, `restartTab`
-- sessions: `sessionPicker`, `switchSessionByIndex(n)` and session modal actions
+- workspaces: `sessionPicker`, `switchSessionByIndex(n)` and workspace modal actions
 - snippets: `snippetPicker`, snippet editor and filter actions
 - themes: `themePicker`, `previewTheme`, `confirmTheme`, `restoreTheme`
 - panes: `splitVertical`, `splitHorizontal`, `focusPane`, `resizePane`, `closePane`
@@ -149,58 +153,44 @@ You can also bind a custom `ActionFn` for dynamic behavior.
 
 ## Themes
 
-aimux themes are [Shiki](https://shiki.style/themes) themes. Two house themes
-(`aimux`, `dracula-at-night`) ship alongside the full Shiki catalog — 67
-themes total. The same `Theme` object powers UI colors and code highlighting.
+`theme` is a startup override surface, not the persisted selected theme.
 
-Declare your own themes in config:
+Use it to choose the built-in light or dark family when there is no persisted
+`aimux.json.themeId`, and to apply palette overrides on top of the chosen base
+theme:
 
 ```ts
-import { defineConfig, themes } from '@brimveyn/aimux-config'
+import { defineConfig } from '@brimveyn/aimux-config'
 
 export default defineConfig({
-  theme: 'my-neon',
-  themes: {
-    // Palette shortcut — patch VSCode color keys on top of a base theme.
-    'my-neon': themes.define('My Neon', 'aimux', {
-      'textLink.foreground': '#ff00aa',
-      'terminal.ansiMagenta': '#00ffcc',
-    }),
-    // Or drop a full VSCode theme JSON verbatim:
-    'custom': themes.full({
-      name: 'custom',
-      displayName: 'Custom',
-      type: 'dark',
-      fg: '#eee',
-      bg: '#1a1a1a',
-      colors: {
-        /* VSCode workbench keys */
-      },
-      settings: [
-        /* TextMate token rules */
-      ],
-    }),
+  theme: {
+    initialMode: 'dark',
+    paletteOverrides: {
+      primary: '#7dd3fc',
+      warning: '#fbbf24',
+    },
   },
 })
 ```
 
-See [`../../docs/guide/themes.md`](../../docs/guide/themes.md) for picker
-shortcuts, the VSCode color key reference, and migration notes if you're
-coming from the old palette alias API.
+The runtime theme picker persists the selected theme id separately in
+`aimux.json`, and that persisted choice wins on restart. See
+[`../../docs/guide/themes.md`](../../docs/guide/themes.md) for picker behavior,
+palette guidance, and precedence details.
 
 ## Support Status
 
-| Surface      | Status             | Notes                                                                |
-| ------------ | ------------------ | -------------------------------------------------------------------- |
-| `keymaps`    | Supported          | Fully registered by the runtime                                      |
-| `sessionBar` | Supported          | Used during app initialization                                       |
-| `gitPane`    | Supported          | Placement and rendering of the git file list (see docs reference)    |
-| `theme`      | Supported          | Initial theme id; `aimux.json.themeId` wins if still known           |
-| `themes`     | Supported          | User themes; appear in the picker and power synthesized highlighting |
-| `backends`   | Typed surface only | Runtime wiring deferred                                              |
-| `sidebar`    | Typed surface only | Type exists, runtime not currently driven by this field              |
-| `hooks`      | Typed surface only | Type exists, runtime use not currently wired                         |
-| `snippets`   | Typed surface only | Runtime currently uses `aimux-snippets.json`                         |
+| Surface      | Status             | Notes                                                                                |
+| ------------ | ------------------ | ------------------------------------------------------------------------------------ |
+| `keymaps`    | Supported          | Fully registered by the runtime                                                      |
+| `sessionBar` | Supported          | Startup overrides; app-managed runtime state still persists separately               |
+| `gitPane`    | Supported          | Startup overrides for placement and rendering; runtime state persists separately     |
+| `theme`      | Supported          | `theme.initialMode` is a startup override; persisted `aimux.json.themeId` still wins |
+| `themes`     | Supported          | User themes; appear in the picker and power synthesized highlighting                 |
+| `backends`   | Typed surface only | Runtime wiring deferred                                                              |
+| `sidebar`    | Typed surface only | Type exists, runtime not currently driven by this field                              |
+| `hooks`      | Typed surface only | Type exists, runtime use not currently wired                                         |
+| `snippets`   | Typed surface only | Runtime currently uses `aimux-snippets.json`                                         |
 
 ## Backends Subpath
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux-config",
-  "version": "0.4.6",
+  "version": "0.5.1",
   "description": "TypeScript configuration API for aimux — keymaps, themes, and backends with a fluent builder.",
   "keywords": [
     "aimux",

package/src/actions.ts

@@ -1,5 +1,10 @@
 import type { ActionFn, AppAction, KeyResult, ModeContext, ModeId } from './types'
 
+import { isAutoCommitEnabled } from './auto-commit-runtime'
+
+const AUTO_COMMIT_DISABLED_MESSAGE =
+  'auto-commit is disabled — set autoCommit: { enabled: true } in aimux.config.ts'
+
 function r(
   actions: KeyResult['actions'] = [],
   effects: KeyResult['effects'] = [],
@@ -43,6 +48,12 @@ export function helpModal(scope?: ModeId): KeyResult {
 export const toggleSidebar: KeyResult = r([{ type: 'toggle-sidebar' }])
 export const toggleGitPane: KeyResult = r([{ type: 'toggle-git-pane' }])
 export const toggleSessionBar: KeyResult = r([{ type: 'toggle-session-bar' }])
+export const toggleAIUsage: ActionFn = (ctx: ModeContext) => {
+  if (ctx.state.modal.type === 'ai-usage') {
+    return r([{ type: 'close-modal' }], [], 'navigation')
+  }
+  return r([{ type: 'open-ai-usage-modal' }], [], 'modal.ai-usage')
+}
 
 export function setGitPaneMode(mode: 'embedded' | 'pane'): KeyResult {
   return r([{ mode, type: 'set-git-pane-mode' }])
@@ -545,7 +556,12 @@ export const gitCommitOpen: ActionFn = (ctx: ModeContext) => {
       },
     ])
   }
-  return r([...clearPendingDelete(ctx), { type: 'open-git-commit-modal' }], [], 'modal.git-commit')
+  const sessionId = ctx.state.currentSessionId ?? undefined
+  return r(
+    [...clearPendingDelete(ctx), { sessionId, type: 'open-git-commit-modal' }],
+    [],
+    'modal.git-commit'
+  )
 }
 
 export const gitPush: ActionFn = (ctx: ModeContext) => {
@@ -564,18 +580,88 @@ export const gitPush: ActionFn = (ctx: ModeContext) => {
 // Modal: git-commit
 // ---------------------------------------------------------------------------
 
-export const gitCommitCancel: KeyResult = r([{ type: 'close-modal' }], [], 'git-mode')
-
-export const gitCommitSubmit: ActionFn = (ctx: ModeContext) => {
-  const modal = ctx.state.modal
-  if (modal.type !== 'git-commit') {
-    return r([{ type: 'close-modal' }], [], 'git-mode')
-  }
+function extractGitCommitFields(modal: ModeContext['state']['modal']): {
+  title: string
+  body: string
+} | null {
+  if (modal.type !== 'git-commit') return null
   const editBuffer = modal.editBuffer ?? ''
   const activeIsTitle = modal.activeField === 'title'
   const title = (activeIsTitle ? editBuffer : modal.contentBuffer).trim()
   const body = (activeIsTitle ? modal.contentBuffer : editBuffer).trim()
-  return r([{ type: 'close-modal' }], [{ body, title, type: 'git-commit' }], 'git-mode')
+  return { body, title }
+}
+
+export const gitCommitCancel: ActionFn = (ctx: ModeContext) => {
+  const modal = ctx.state.modal
+  if (modal.type === 'git-commit' && modal.stage === 'confirm') {
+    return r([{ type: 'git-commit-leave-confirm' }], [], 'modal.git-commit')
+  }
+  return r([{ type: 'close-modal' }], [], 'git-mode')
+}
+
+export const gitCommitEnterConfirm: ActionFn = (ctx: ModeContext) => {
+  const modal = ctx.state.modal
+  if (modal.type !== 'git-commit') return null
+  if (!isAutoCommitEnabled()) {
+    return r([{ message: AUTO_COMMIT_DISABLED_MESSAGE, type: 'git-mode-set-message' }])
+  }
+  const fields = extractGitCommitFields(modal)
+  const hasTitle = !!fields && fields.title.length > 0
+  if (hasTitle) {
+    return r([{ type: 'git-commit-enter-confirm' }], [], 'modal.git-commit.confirm')
+  }
+  const sessionId = ctx.state.currentSessionId
+  if (!sessionId) {
+    return r([{ type: 'git-commit-enter-confirm' }], [], 'modal.git-commit.confirm')
+  }
+  return r(
+    [{ sessionId, type: 'git-commit-enter-generating' }],
+    [{ sessionId, type: 'generate-auto-commit-now' }],
+    'modal.git-commit.generating'
+  )
+}
+
+export const gitCommitLeaveConfirm: KeyResult = r(
+  [{ type: 'git-commit-leave-confirm' }],
+  [],
+  'modal.git-commit'
+)
+
+export const gitCommitLeaveGenerating: ActionFn = (ctx: ModeContext) => {
+  const sessionId = ctx.state.currentSessionId
+  const actionsList: AppAction[] = [{ type: 'git-commit-leave-generating' }]
+  if (sessionId) {
+    actionsList.push({ sessionId, type: 'auto-commit-clear' })
+  }
+  return r(actionsList, [], 'modal.git-commit')
+}
+
+export const gitCommitAutoAccept: ActionFn = (ctx: ModeContext) => {
+  if (!isAutoCommitEnabled()) {
+    return r([{ message: AUTO_COMMIT_DISABLED_MESSAGE, type: 'git-mode-set-message' }])
+  }
+  const fields = extractGitCommitFields(ctx.state.modal)
+  if (!fields) {
+    return r([{ type: 'close-modal' }], [], 'git-mode')
+  }
+  return r(
+    [{ type: 'close-modal' }],
+    [{ body: fields.body, title: fields.title, type: 'git-commit-auto' }],
+    'git-mode'
+  )
+}
+
+export const gitCommitSubmit: ActionFn = (ctx: ModeContext) => {
+  const fields = extractGitCommitFields(ctx.state.modal)
+  if (!fields) {
+    return r([{ type: 'close-modal' }], [], 'git-mode')
+  }
+  return r(
+    [{ type: 'close-modal' }],
+    [{ body: fields.body, title: fields.title, type: 'git-commit' }],
+    'git-mode'
+  )
 }
 
 export const gitCommitReturnKey: ActionFn = (ctx: ModeContext) => {

package/src/auto-commit-runtime.ts

@@ -0,0 +1,18 @@
+/**
+ * Module-level flag that mirrors `autoCommit.enabled` from the resolved config.
+ *
+ * Actions (which run outside React and can't subscribe to a React context) read
+ * this via `isAutoCommitEnabled()`. The app sets it once at startup via
+ * `setAutoCommitEnabled(resolvedConfig.autoCommit.enabled)` before any children
+ * render, so downstream readers always see the correct value.
+ */
+
+let enabled = false
+
+export function setAutoCommitEnabled(value: boolean): void {
+  enabled = value
+}
+
+export function isAutoCommitEnabled(): boolean {
+  return enabled
+}

package/src/defaults.ts

@@ -1,8 +1,17 @@
-import type { ResolvedKeymapConfig } from './types'
+import type { AutoCommitConfig, ResolvedKeymapConfig } from './types'
 
 import * as actions from './actions'
 import { KeymapBuilder } from './keymap-builder'
 
+export const DEFAULT_AUTO_COMMIT_CONFIG: AutoCommitConfig = {
+  enabled: false,
+  models: {
+    claude: 'claude-haiku-4-5',
+    codex: 'gpt-5-mini',
+  },
+  timeoutMs: 60_000,
+}
+
 /**
  * Build the default keymap — 1:1 transcription of all existing handlers.
  */
@@ -66,6 +75,7 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
     .mode(['navigation', 'terminal-input'], (m) =>
       m
         .map('<Leader>b', actions.toggleSessionBar, 'Toggle session bar')
+        .map('<Leader>u', actions.toggleAIUsage, 'Toggle AI usage')
         .map('<Leader>1', actions.switchSessionByIndex(1), 'Session 1')
         .map('<Leader>2', actions.switchSessionByIndex(2), 'Session 2')
         .map('<Leader>3', actions.switchSessionByIndex(3), 'Session 3')
@@ -138,6 +148,13 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .passthrough()
     )
 
+    // -----------------------------------------------------------------------
+    // Modal: ai-usage (info-only)
+    // -----------------------------------------------------------------------
+    .mode('modal.ai-usage', (m) =>
+      m.map('<Esc>', actions.closeModal, 'Close').map('<Leader>u', actions.toggleAIUsage, 'Close')
+    )
+
     // -----------------------------------------------------------------------
     // Modal: update-available
     // -----------------------------------------------------------------------
@@ -276,10 +293,30 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
       m
         .map('<Esc>', actions.gitCommitCancel, 'Cancel')
         .map('<C-CR>', actions.gitCommitSubmit, 'Commit')
+        .map('<C-a>', actions.gitCommitEnterConfirm, 'Auto-commit (stage all)')
         .map('<Tab>', actions.switchField, 'Next field')
         .map('<CR>', actions.gitCommitReturnKey, 'Newline / confirm')
         .passthrough()
     )
 
+    // -----------------------------------------------------------------------
+    // Modal: git-commit confirm (auto-commit stage all + commit)
+    // -----------------------------------------------------------------------
+    .mode('modal.git-commit.confirm', (m) =>
+      m
+        .map('<Esc>', actions.gitCommitLeaveConfirm, 'Cancel auto-commit')
+        .map('<CR>', actions.gitCommitAutoAccept, 'Stage all + commit')
+        .map('<C-CR>', actions.gitCommitAutoAccept, 'Stage all + commit')
+        .map('<Tab>', actions.switchField, 'Next field')
+        .passthrough()
+    )
+
+    // -----------------------------------------------------------------------
+    // Modal: git-commit generating (waiting for LLM)
+    // -----------------------------------------------------------------------
+    .mode('modal.git-commit.generating', (m) =>
+      m.map('<Esc>', actions.gitCommitLeaveGenerating, 'Cancel generation')
+    )
+
   return kb._build()
 }

package/src/index.ts

@@ -22,6 +22,7 @@ export { paletteToShikiTheme } from './palette-to-shiki'
 export { GroupBuilder, KeymapBuilder, ModeBindingBuilder } from './keymap-builder'
 export { getDefaultKeymapConfig } from './defaults'
 export { resolveConfig } from './resolver'
+export { isAutoCommitEnabled, setAutoCommitEnabled } from './auto-commit-runtime'
 
 // Type exports
 export type {
@@ -33,8 +34,11 @@ export type {
   AimuxThemeConfig,
   // User-facing config
   AimuxUserConfig,
+  AIUsageTool,
+  AIUsageToolConfig,
   AppAction,
   AppState,
+  AutoCommitConfig,
   BackendConfig,
   BindingDef,
   FocusMode,
@@ -68,6 +72,7 @@ export type {
   SnippetDef,
   SnippetRecord,
   SplitDirection,
+  StatusBarConfig,
   TabSession,
   Theme,
   ThemeId,

package/src/resolver.ts

@@ -1,12 +1,13 @@
 import type {
   AimuxUserConfig,
+  AutoCommitConfig,
   ModeId,
   ModeKeymapDef,
   ResolvedConfig,
   ResolvedKeymapConfig,
 } from './types'
 
-import { getDefaultKeymapConfig } from './defaults'
+import { DEFAULT_AUTO_COMMIT_CONFIG, getDefaultKeymapConfig } from './defaults'
 import { KeymapBuilder } from './keymap-builder'
 
 /**
@@ -16,15 +17,97 @@ import { KeymapBuilder } from './keymap-builder'
 export function resolveConfig(userConfig: AimuxUserConfig): ResolvedConfig {
   const keymaps = resolveKeymaps(userConfig)
 
+  const autoCommit: AutoCommitConfig = {
+    enabled: userConfig.autoCommit?.enabled ?? DEFAULT_AUTO_COMMIT_CONFIG.enabled,
+    models: { ...DEFAULT_AUTO_COMMIT_CONFIG.models, ...userConfig.autoCommit?.models },
+    timeoutMs: userConfig.autoCommit?.timeoutMs ?? DEFAULT_AUTO_COMMIT_CONFIG.timeoutMs,
+  }
+
   return {
+    autoCommit,
     backends: userConfig.backends ?? {},
-    gitPane: userConfig.gitPane ?? {},
+    gitPane: resolveGitPane(userConfig.gitPane),
     hooks: userConfig.hooks ?? {},
     keymaps,
-    sessionBar: userConfig.sessionBar ?? {},
+    sessionBar: resolveSessionBar(userConfig.sessionBar),
     sidebar: userConfig.sidebar ?? {},
     snippets: userConfig.snippets ?? [],
-    theme: userConfig.theme,
+    statusBar: userConfig.statusBar ?? {},
+    theme: resolveTheme(userConfig.theme),
+  }
+}
+
+function resolveTheme(userConfig: AimuxUserConfig['theme']): ResolvedConfig['theme'] {
+  if (!userConfig) return undefined
+  return {
+    initialMode: userConfig.initialMode ?? userConfig.mode,
+    paletteOverrides: userConfig.paletteOverrides,
+  }
+}
+
+function resolveSessionBar(
+  userConfig: AimuxUserConfig['sessionBar']
+): ResolvedConfig['sessionBar'] {
+  if (!userConfig) return {}
+  return {
+    initialPosition: userConfig.initialPosition ?? userConfig.position,
+    initialVisible: userConfig.initialVisible ?? userConfig.visible,
+  }
+}
+
+function resolvePaneInitialPosition(
+  userConfig: NonNullable<AimuxUserConfig['gitPane']>
+): 'left' | 'right' | undefined {
+  if (userConfig.initialPosition === 'left' || userConfig.initialPosition === 'right') {
+    return userConfig.initialPosition
+  }
+  if (userConfig.position === 'left' || userConfig.position === 'right') {
+    return userConfig.position
+  }
+  return undefined
+}
+
+function resolveEmbeddedInitialPosition(
+  userConfig: NonNullable<AimuxUserConfig['gitPane']>
+): 'top' | 'bottom' | undefined {
+  if (userConfig.initialPosition === 'top' || userConfig.initialPosition === 'bottom') {
+    return userConfig.initialPosition
+  }
+  if (userConfig.position === 'top' || userConfig.position === 'bottom') {
+    return userConfig.position
+  }
+  return undefined
+}
+
+function resolveGitPane(userConfig: AimuxUserConfig['gitPane']): ResolvedConfig['gitPane'] {
+  if (!userConfig) return {}
+
+  const initialMode = userConfig.initialMode ?? userConfig.mode
+  const paneInitialPosition = resolvePaneInitialPosition(userConfig)
+  const embeddedInitialPosition = resolveEmbeddedInitialPosition(userConfig)
+  const shared = {
+    diffCount: userConfig.diffCount,
+    initialDiffModeRatio: userConfig.initialDiffModeRatio ?? userConfig.diffModeRatio,
+    initialFileListMode: userConfig.initialFileListMode ?? userConfig.fileListMode,
+    initialRatio: userConfig.initialRatio ?? userConfig.ratio,
+    initialTreeCompaction: userConfig.initialTreeCompaction ?? userConfig.treeCompaction,
+    initialVisible: userConfig.initialVisible ?? userConfig.visible,
+    path: userConfig.path,
+    prefetchRadius: userConfig.prefetchRadius,
+  }
+
+  if (initialMode === 'pane') {
+    return {
+      ...shared,
+      initialMode: 'pane',
+      initialPosition: paneInitialPosition,
+    }
+  }
+
+  return {
+    ...shared,
+    ...(initialMode === 'embedded' ? { initialMode: 'embedded' as const } : {}),
+    initialPosition: embeddedInitialPosition,
   }
 }
 

package/src/types.ts

@@ -24,7 +24,10 @@ export type ModeId =
   | 'modal.help.filtering'
   | 'modal.split-picker'
   | 'modal.git-commit'
+  | 'modal.git-commit.confirm'
+  | 'modal.git-commit.generating'
   | 'modal.update-available'
+  | 'modal.ai-usage'
 
 // ─── Primitive app types ──────────────────────────────────────────────────────
 
@@ -63,6 +66,7 @@ export interface TerminalLine {
 
 export interface TerminalSnapshot {
   lines: TerminalLine[]
+  tailLines?: TerminalLine[]
   viewportY: number
   baseY: number
   cursorVisible: boolean
@@ -291,6 +295,7 @@ export interface ModalGitCommit extends ModalBase {
   type: 'git-commit'
   activeField: 'title' | 'body'
   contentBuffer: string
+  stage: 'edit' | 'generating' | 'confirm'
 }
 export interface ModalSnippetEditor extends ModalBase {
   type: 'snippet-editor'
@@ -304,6 +309,10 @@ export interface ModalUpdateAvailable extends ModalBase {
   latestVersion: string
 }
 
+export interface ModalAIUsage extends ModalBase {
+  type: 'ai-usage'
+}
+
 export type ModalState =
   | ModalClosed
   | ModalNewTab
@@ -318,6 +327,7 @@ export type ModalState =
   | ModalSnippetEditor
   | ModalGitCommit
   | ModalUpdateAvailable
+  | ModalAIUsage
 
 export interface LayoutState {
   terminalCols: number
@@ -331,6 +341,28 @@ export interface SessionBarState {
   position: SessionBarPosition
 }
 
+export type AutoCommitSuggestion =
+  | { kind: 'idle' }
+  | {
+      kind: 'generating'
+      tabId: string
+      workingTreeHash: string
+      abortController: AbortController
+      startedAt: number
+    }
+  | {
+      kind: 'ready'
+      tabId: string
+      workingTreeHash: string
+      title: string
+      body: string
+      generatedAt: number
+    }
+
+export interface AutoCommitState {
+  bySession: Record<string, AutoCommitSuggestion>
+}
+
 export interface AppState {
   tabs: TabSession[]
   activeTabId: string | null
@@ -349,6 +381,7 @@ export interface AppState {
   customCommands: Record<AssistantId, string>
   gitPanel: GitPanelState
   gitMode: GitModeState
+  autoCommit: AutoCommitState
   pendingChords: string[] | null
 }
 
@@ -380,13 +413,14 @@ export type ModalAction =
   | { type: 'set-theme-entry-count'; count: number }
   | { type: 'open-theme-picker' }
   | { type: 'open-update-available-modal'; currentVersion: string; latestVersion: string }
+  | { type: 'open-ai-usage-modal' }
 
 export type SessionAction =
   | { type: 'load-session'; sessionId: string; workspaceSnapshot?: WorkspaceSnapshotV1 }
   | { type: 'set-sessions'; sessions: SessionRecord[] }
   | { type: 'create-session-record'; session: SessionRecord }
   | { type: 'rename-session-record'; sessionId: string; name: string }
-  | { type: 'delete-session-record'; sessionId: string }
+  | { type: 'delete-session-record'; sessionId: string; openSessionPicker?: boolean }
   | { type: 'reorder-sessions'; orderedIds: string[] }
   | { type: 'set-session-status'; sessionId: string; status: SessionStatus }
 
@@ -503,12 +537,35 @@ export type GitModeAction =
       fromSection: GitFileSection
       toSection: GitFileSection | null
     }
-  | { type: 'open-git-commit-modal' }
+  | { type: 'open-git-commit-modal'; sessionId?: string }
+  | { type: 'git-commit-enter-confirm' }
+  | { type: 'git-commit-leave-confirm' }
+  | { type: 'git-commit-enter-generating'; sessionId: string }
+  | { type: 'git-commit-leave-generating' }
 
 export type DataAction =
   | { type: 'set-snippets'; snippets: SnippetRecord[] }
   | { type: 'delete-snippet'; snippetId: string }
 
+export type AutoCommitAction =
+  | {
+      type: 'auto-commit-generation-started'
+      sessionId: string
+      tabId: string
+      workingTreeHash: string
+      abortController: AbortController
+      startedAt: number
+    }
+  | {
+      type: 'auto-commit-generation-ready'
+      sessionId: string
+      workingTreeHash: string
+      title: string
+      body: string
+      generatedAt: number
+    }
+  | { type: 'auto-commit-clear'; sessionId: string }
+
 export type AppAction =
   | ModalAction
   | SessionAction
@@ -518,6 +575,7 @@ export type AppAction =
   | DataAction
   | GitPanelAction
   | GitModeAction
+  | AutoCommitAction
 
 // ─── Side effects ─────────────────────────────────────────────────────────────
 
@@ -552,6 +610,8 @@ export type SideEffect =
   | { type: 'git-restore'; path: string }
   | { type: 'git-rm'; path: string }
   | { type: 'git-commit'; title: string; body: string }
+  | { type: 'git-commit-auto'; title: string; body: string }
+  | { type: 'generate-auto-commit-now'; sessionId: string }
   | { type: 'git-push' }
   | { type: 'confirm-update-selection' }
   | { type: 'switch-session-by-index'; index: number }
@@ -692,7 +752,13 @@ export interface KeymapBuilderApi {
 // ─── Top-level user config ────────────────────────────────────────────────────
 
 export interface SessionBarConfig {
+  /** Startup override for the session bar visibility. Reapplied on each launch. */
+  initialVisible?: boolean
+  /** Startup override for the session bar position. Reapplied on each launch. */
+  initialPosition?: SessionBarPosition
+  /** @deprecated Use `initialVisible` instead. */
   visible?: boolean
+  /** @deprecated Use `initialPosition` instead. */
   position?: SessionBarPosition
 }
 
@@ -705,32 +771,78 @@ export type GitPanePathConfig =
 export type GitPaneDiffCountConfig = { enabled: boolean }
 
 interface GitPaneBaseConfig {
+  /** Startup override for git pane visibility. Reapplied on each launch. */
+  initialVisible?: boolean
+  /** Startup override for the pane split ratio. Reapplied on each launch. */
+  initialRatio?: number
+  /** Startup override for fullscreen diff ratio. Reapplied on each launch. */
+  initialDiffModeRatio?: number
+  /** Startup override for tree/flat file list mode. Reapplied on each launch. */
+  initialFileListMode?: GitFileListMode
+  /** Startup override for tree compaction. Reapplied on each launch. */
+  initialTreeCompaction?: boolean
+  path?: GitPanePathConfig
+  diffCount?: GitPaneDiffCountConfig
+  /** Prefetch N neighbouring diffs around the cursor; 0 disables. */
+  prefetchRadius?: number
+  /** @deprecated Use `initialVisible` instead. */
   visible?: boolean
+  /** @deprecated Use `initialRatio` instead. */
   ratio?: number
+  /** @deprecated Use `initialDiffModeRatio` instead. */
   diffModeRatio?: number
+  /** @deprecated Use `initialFileListMode` instead. */
   fileListMode?: GitFileListMode
+  /** @deprecated Use `initialTreeCompaction` instead. */
   treeCompaction?: boolean
-  path?: GitPanePathConfig
-  diffCount?: GitPaneDiffCountConfig
-  /** Prefetch N neighbouring diffs around the cursor; 0 disables. */
-  prefetchRadius?: number
 }
 
 export interface GitPaneEmbeddedConfig extends GitPaneBaseConfig {
+  initialMode?: 'embedded'
+  initialPosition?: 'top' | 'bottom'
+  /** @deprecated Use `initialMode` instead. */
   mode?: 'embedded'
+  /** @deprecated Use `initialPosition` instead. */
   position?: 'top' | 'bottom'
 }
 
 export interface GitPanePaneConfig extends GitPaneBaseConfig {
+  initialMode: 'pane'
+  initialPosition?: 'left' | 'right'
+  /** @deprecated Use `initialMode` instead. */
   mode: 'pane'
+  /** @deprecated Use `initialPosition` instead. */
   position?: 'left' | 'right'
 }
 
 export type GitPaneConfig = GitPaneEmbeddedConfig | GitPanePaneConfig
 
+export interface AutoCommitConfig {
+  enabled: boolean
+  timeoutMs: number
+  models: Partial<Record<string, string>>
+}
+
 export interface AimuxThemeConfig {
-  mode?: ThemeMode
+  /** Startup override for light/dark theme family. Reapplied on each launch. */
+  initialMode?: ThemeMode
   paletteOverrides?: Partial<AimuxPalette>
+  /** @deprecated Use `initialMode` instead. */
+  mode?: ThemeMode
+}
+
+export type AIUsageTool = 'claude' | 'codex'
+
+export interface AIUsageToolConfig {
+  enabled?: boolean
+  pollSeconds?: number
+  claudePlan?: 'auto' | 'pro' | 'max5' | 'max20'
+  codexWeeklyLimit?: number
+  tools?: AIUsageTool[]
+}
+
+export interface StatusBarConfig {
+  aiUsage?: AIUsageToolConfig
 }
 
 export interface AimuxUserConfig {
@@ -742,6 +854,8 @@ export interface AimuxUserConfig {
   gitPane?: GitPaneConfig
   hooks?: HooksConfig
   snippets?: SnippetDef[]
+  autoCommit?: Partial<AutoCommitConfig>
+  statusBar?: StatusBarConfig
 }
 
 // ─── Resolved config (internal) ───────────────────────────────────────────────
@@ -767,12 +881,46 @@ export interface ResolvedKeymapConfig {
 }
 
 export interface ResolvedConfig {
-  theme: AimuxThemeConfig | undefined
+  theme:
+    | {
+        initialMode?: ThemeMode
+        paletteOverrides?: Partial<AimuxPalette>
+      }
+    | undefined
   keymaps: ResolvedKeymapConfig
   backends: Record<string, BackendConfig>
   sidebar: SidebarConfig
-  sessionBar: SessionBarConfig
-  gitPane: GitPaneConfig
+  sessionBar: {
+    initialVisible?: boolean
+    initialPosition?: SessionBarPosition
+  }
+  gitPane:
+    | {
+        initialMode?: 'embedded'
+        initialPosition?: 'top' | 'bottom'
+        initialVisible?: boolean
+        initialRatio?: number
+        initialDiffModeRatio?: number
+        initialFileListMode?: GitFileListMode
+        initialTreeCompaction?: boolean
+        path?: GitPanePathConfig
+        diffCount?: GitPaneDiffCountConfig
+        prefetchRadius?: number
+      }
+    | {
+        initialMode: 'pane'
+        initialPosition?: 'left' | 'right'
+        initialVisible?: boolean
+        initialRatio?: number
+        initialDiffModeRatio?: number
+        initialFileListMode?: GitFileListMode
+        initialTreeCompaction?: boolean
+        path?: GitPanePathConfig
+        diffCount?: GitPaneDiffCountConfig
+        prefetchRadius?: number
+      }
   hooks: HooksConfig
   snippets: SnippetDef[]
+  autoCommit: AutoCommitConfig
+  statusBar: StatusBarConfig
 }