@brimveyn/aimux 1.7.4 → 1.8.0

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

@@ -12,6 +12,7 @@ import {
   getSnapshotTrees,
   toTerminalContentSize,
 } from '../state/layout-resize'
+import { getSnapshotScrollIntents } from '../state/session-persistence'
 
 export class LocalSessionBackend
   extends EventEmitter<SessionBackendEvents>
@@ -66,15 +67,22 @@ export class LocalSessionBackend
     })
     this.currentSessionId = options.sessionId
     const trees = getSnapshotTrees(options.workspaceSnapshot)
+    const intents = getSnapshotScrollIntents(options.workspaceSnapshot)
     const splitTrees = trees.filter((t) => t.type === 'split')
     if (splitTrees.length > 0) {
       const bounds = createTerminalBounds(options.cols, options.rows)
       forEachSplitPaneRect(splitTrees, bounds, (tabId, rect) => {
         const size = toTerminalContentSize(rect)
-        this.sessionManager.resizeTab(options.sessionId, tabId, size.cols, size.rows)
+        this.sessionManager.resizeTab(
+          options.sessionId,
+          tabId,
+          size.cols,
+          size.rows,
+          intents.get(tabId)
+        )
       })
     } else {
-      this.sessionManager.resize(options.sessionId, options.cols, options.rows)
+      this.sessionManager.resize(options.sessionId, options.cols, options.rows, intents)
     }
     const attachResult = this.sessionManager.attachSession(
       options.sessionId,

package/src/state/ai-usage-store.ts

@@ -0,0 +1,29 @@
+import type { AIUsageTool } from '@brimveyn/aimux-config'
+
+import { useStore } from 'zustand'
+import { createStore } from 'zustand/vanilla'
+
+import type { UsageSnapshot } from '../services/ai-usage/types'
+
+export interface AIUsageState {
+  enabled: boolean
+  snapshots: Partial<Record<AIUsageTool, UsageSnapshot>>
+  setEnabled: (enabled: boolean) => void
+  setSnapshot: (snap: UsageSnapshot) => void
+  clear: () => void
+}
+
+export const aiUsageStore = createStore<AIUsageState>((set) => ({
+  clear: () => set({ snapshots: {} }),
+  enabled: false,
+  setEnabled: (enabled: boolean) => set({ enabled }),
+  setSnapshot: (snap: UsageSnapshot) =>
+    set((state) => ({
+      snapshots: { ...state.snapshots, [snap.tool]: snap },
+    })),
+  snapshots: {},
+}))
+
+export function useAIUsageStore<T>(selector: (state: AIUsageState) => T): T {
+  return useStore(aiUsageStore, selector)
+}

package/src/state/reducers/auto-commit-state.ts

@@ -0,0 +1,59 @@
+import type { AppAction, AppState, AutoCommitState } from '../types'
+
+function setBySession(
+  state: AutoCommitState,
+  sessionId: string,
+  next: AutoCommitState['bySession'][string]
+): AutoCommitState {
+  return { bySession: { ...state.bySession, [sessionId]: next } }
+}
+
+export function reduceAutoCommitState(
+  state: AutoCommitState,
+  action: AppAction
+): AutoCommitState | null {
+  switch (action.type) {
+    case 'auto-commit-generation-started': {
+      return setBySession(state, action.sessionId, {
+        abortController: action.abortController,
+        kind: 'generating',
+        startedAt: action.startedAt,
+        tabId: action.tabId,
+        workingTreeHash: action.workingTreeHash,
+      })
+    }
+    case 'auto-commit-generation-ready': {
+      const current = state.bySession[action.sessionId]
+      if (!current || current.kind !== 'generating') return null
+      if (current.workingTreeHash !== action.workingTreeHash) return null
+      return setBySession(state, action.sessionId, {
+        body: action.body,
+        generatedAt: action.generatedAt,
+        kind: 'ready',
+        tabId: current.tabId,
+        title: action.title,
+        workingTreeHash: current.workingTreeHash,
+      })
+    }
+    case 'auto-commit-clear': {
+      const current = state.bySession[action.sessionId]
+      if (!current || current.kind === 'idle') return null
+      if (current.kind === 'generating') {
+        try {
+          current.abortController.abort()
+        } catch {
+          // ignore
+        }
+      }
+      return setBySession(state, action.sessionId, { kind: 'idle' })
+    }
+    default:
+      return null
+  }
+}
+
+export function reduceAutoCommit(state: AppState, action: AppAction): AppState | null {
+  const next = reduceAutoCommitState(state.autoCommit, action)
+  if (next === null) return null
+  return { ...state, autoCommit: next }
+}

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

@@ -7,6 +7,7 @@ import { getActiveKeymap } from '../../input/keymap/keymap-ref'
 import { getAllAssistantOptions } from '../../pty/command-registry'
 import { filterThemeIds } from '../../ui/filter-themes'
 import { filterAssistants, filterSessions, filterSnippets } from '../selectors'
+import { reduceAutoCommitState } from './auto-commit-state'
 
 function emptyModal() {
   return {
@@ -199,7 +200,8 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
           type: 'update-available',
         },
       }
-    case 'open-git-commit-modal':
+    case 'open-git-commit-modal': {
+      const sessionId = action.sessionId
       return {
         ...state,
         focusMode: 'command-edit',
@@ -209,10 +211,112 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
           cursorPos: 0,
           editBuffer: '',
           selectedIndex: 0,
-          sessionTargetId: null,
+          sessionTargetId: sessionId ?? null,
+          stage: 'edit',
           type: 'git-commit',
         },
       }
+    }
+    case 'git-commit-enter-confirm': {
+      if (state.modal.type !== 'git-commit') return state
+      return {
+        ...state,
+        focusMode: 'command-edit',
+        modal: { ...state.modal, stage: 'confirm' },
+      }
+    }
+    case 'git-commit-leave-confirm': {
+      if (state.modal.type !== 'git-commit') return state
+      return {
+        ...state,
+        focusMode: 'command-edit',
+        modal: { ...state.modal, stage: 'edit' },
+      }
+    }
+    case 'git-commit-enter-generating': {
+      if (state.modal.type !== 'git-commit') return state
+      return {
+        ...state,
+        focusMode: 'modal',
+        modal: { ...state.modal, sessionTargetId: action.sessionId, stage: 'generating' },
+      }
+    }
+    case 'git-commit-leave-generating': {
+      if (state.modal.type !== 'git-commit') return state
+      return {
+        ...state,
+        focusMode: 'command-edit',
+        modal: { ...state.modal, stage: 'edit' },
+      }
+    }
+    case 'auto-commit-generation-ready': {
+      if (
+        state.modal.type !== 'git-commit' ||
+        state.modal.stage !== 'generating' ||
+        state.modal.sessionTargetId !== action.sessionId
+      ) {
+        return null
+      }
+      const nextAutoCommit = reduceAutoCommitState(state.autoCommit, action)
+      if (!nextAutoCommit) {
+        // Stale result (hash mismatch or slice was cleared mid-flight): don't
+        // strand the modal in `generating` — flip back to edit so the user
+        // isn't stuck staring at a spinner that will never resolve.
+        return {
+          ...state,
+          focusMode: 'command-edit',
+          modal: { ...state.modal, stage: 'edit' },
+        }
+      }
+      return {
+        ...state,
+        autoCommit: nextAutoCommit,
+        focusMode: 'command-edit',
+        modal: {
+          ...state.modal,
+          activeField: 'title',
+          contentBuffer: action.body,
+          cursorPos: action.title.length,
+          editBuffer: action.title,
+          stage: 'confirm',
+        },
+      }
+    }
+    case 'git-commit-use-background-suggestion': {
+      if (state.modal.type !== 'git-commit' || state.modal.sessionTargetId !== action.sessionId) {
+        return null
+      }
+      const suggestion = state.autoCommit.bySession[action.sessionId]
+      if (!suggestion || suggestion.kind !== 'ready') return null
+      return {
+        ...state,
+        focusMode: 'command-edit',
+        modal: {
+          ...state.modal,
+          activeField: 'title',
+          contentBuffer: suggestion.body,
+          cursorPos: suggestion.title.length,
+          editBuffer: suggestion.title,
+          stage: 'confirm',
+        },
+      }
+    }
+    case 'auto-commit-clear': {
+      if (
+        state.modal.type !== 'git-commit' ||
+        state.modal.stage !== 'generating' ||
+        state.modal.sessionTargetId !== action.sessionId
+      ) {
+        return null
+      }
+      const nextAutoCommit = reduceAutoCommitState(state.autoCommit, action)
+      return {
+        ...state,
+        autoCommit: nextAutoCommit ?? state.autoCommit,
+        focusMode: 'command-edit',
+        modal: { ...state.modal, stage: 'edit' },
+      }
+    }
     case 'set-help-entry-count': {
       if (state.modal.type !== 'help') return state
       if (state.modal.entryCount === action.count) {

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

@@ -53,27 +53,39 @@ export function reduceSessionState(state: AppState, action: AppAction): AppState
         ),
       }
     case 'delete-session-record': {
+      const deletingCurrent = action.sessionId === state.currentSessionId
       const newSessions = state.sessions.filter((session) => session.id !== action.sessionId)
-      const filteredNew = filterSessions(newSessions, state.modal.editBuffer)
-      const maxIndex = filteredNew.length
-      const clampedIndex = Math.min(state.modal.selectedIndex, maxIndex)
       const nextStatuses = { ...state.sessionStatuses }
       delete nextStatuses[action.sessionId]
+      if (action.openSessionPicker) {
+        const filteredNew = filterSessions(newSessions, state.modal.editBuffer)
+        const maxIndex = filteredNew.length
+        const clampedIndex = Math.min(state.modal.selectedIndex, maxIndex)
+        return {
+          ...state,
+          activeTabId: deletingCurrent ? null : state.activeTabId,
+          currentSessionId: deletingCurrent ? null : state.currentSessionId,
+          focusMode: 'modal',
+          modal: {
+            editBuffer: null,
+            selectedIndex: clampedIndex,
+            sessionTargetId: null,
+            type: 'session-picker',
+          },
+          sessions: newSessions,
+          sessionStatuses: nextStatuses,
+          tabs: deletingCurrent ? [] : state.tabs,
+        }
+      }
       return {
         ...state,
-        activeTabId: action.sessionId === state.currentSessionId ? null : state.activeTabId,
-        currentSessionId:
-          action.sessionId === state.currentSessionId ? null : state.currentSessionId,
-        focusMode: 'modal',
-        modal: {
-          editBuffer: null,
-          selectedIndex: clampedIndex,
-          sessionTargetId: null,
-          type: 'session-picker',
-        },
+        activeTabId: deletingCurrent ? null : state.activeTabId,
+        currentSessionId: deletingCurrent ? null : state.currentSessionId,
+        focusMode: deletingCurrent ? 'navigation' : state.focusMode,
+        modal: deletingCurrent ? CLOSED_MODAL : state.modal,
         sessions: newSessions,
         sessionStatuses: nextStatuses,
-        tabs: action.sessionId === state.currentSessionId ? [] : state.tabs,
+        tabs: deletingCurrent ? [] : state.tabs,
       }
     }
     case 'reorder-sessions': {

package/src/state/session-persistence.ts

@@ -2,6 +2,7 @@ import { allLeafIds, createGroupId, type LayoutNode, pruneLayoutTree } from './l
 import {
   type AppState,
   DEFAULT_SCROLL_INTENT,
+  type ScrollIntent,
   type TabSession,
   type TabStatus,
   type WorkspaceSnapshotV1,
@@ -82,6 +83,18 @@ export function restoreTabsFromWorkspace(snapshot: WorkspaceSnapshotV1 | undefin
     }))
 }
 
+export function getSnapshotScrollIntents(
+  snapshot: WorkspaceSnapshotV1 | undefined
+): Map<string, ScrollIntent> {
+  if (!snapshot || snapshot.version !== 1) {
+    return new Map()
+  }
+
+  return new Map(
+    snapshot.tabs.map((tab) => [tab.id, tab.scrollIntent ?? DEFAULT_SCROLL_INTENT] as const)
+  )
+}
+
 export function restoreLayoutTrees(
   snapshot: WorkspaceSnapshotV1 | undefined,
   tabs: TabSession[]
@@ -192,11 +205,7 @@ export function restoreWorkspaceState(
     activeTabId,
     focusMode: 'navigation',
     layoutTrees,
-    sidebar: {
-      ...state.sidebar,
-      visible: workspaceSnapshot?.sidebar.visible ?? state.sidebar.visible,
-      width: workspaceSnapshot?.sidebar.width ?? state.sidebar.width,
-    },
+    sidebar: state.sidebar,
     tabGroupMap,
     tabs: orderedTabs,
   }

package/src/state/store.ts

@@ -1,15 +1,4 @@
-import type {
-  AppAction,
-  AppState,
-  GitModeState,
-  GitPaneMode,
-  GitPanePosition,
-  GitPaneState,
-  SessionBarPosition,
-  SessionRecord,
-  SnippetRecord,
-} from './types'
-
+import { reduceAutoCommit } from './reducers/auto-commit-state'
 import { emptyGitMode, reduceGitModeState } from './reducers/git-mode-state'
 import { emptyGitPanel, reduceGitPanelState } from './reducers/git-panel-state'
 import { emptyModal, reduceModalState } from './reducers/modal-state'
@@ -17,6 +6,18 @@ import { reduceSessionState } from './reducers/session-state'
 import { reduceTabState } from './reducers/tab-state'
 import { reduceUIState } from './reducers/ui-state'
 import { filterSnippets } from './selectors'
+import {
+  type AppAction,
+  type AppState,
+  EMPTY_AUTO_COMMIT_STATE,
+  type GitModeState,
+  type GitPaneMode,
+  type GitPanePosition,
+  type GitPaneState,
+  type SessionBarPosition,
+  type SessionRecord,
+  type SnippetRecord,
+} from './types'
 
 const DEFAULT_SIDEBAR_WIDTH = 28
 const DEFAULT_SIDEBAR_MIN_WIDTH = 18
@@ -27,6 +28,7 @@ const DEFAULT_TERMINAL_ROWS = 24
 export interface InitialStateOverrides {
   gitMode?: Partial<GitModeState>
   gitPane?: Partial<GitPaneState>
+  sidebar?: Pick<AppState['sidebar'], 'visible' | 'width'>
   sessionBarVisible?: boolean
   sessionBarPosition?: SessionBarPosition
 }
@@ -52,6 +54,10 @@ function resolveGitPanePosition(mode: GitPaneMode, position: GitPanePosition): G
   return position === 'left' || position === 'right' ? position : 'left'
 }
 
+function clampSidebarWidth(width: number): number {
+  return Math.min(DEFAULT_SIDEBAR_MAX_WIDTH, Math.max(DEFAULT_SIDEBAR_MIN_WIDTH, width))
+}
+
 export function createInitialState(
   customCommands: Record<string, string> = {},
   sessions: SessionRecord[] = [],
@@ -66,6 +72,7 @@ export function createInitialState(
   )
   return {
     activeTabId: null,
+    autoCommit: EMPTY_AUTO_COMMIT_STATE,
     currentSessionId: null,
     customCommands,
     focusMode: showSessionPicker ? 'command-edit' : 'navigation',
@@ -101,8 +108,8 @@ export function createInitialState(
     sidebar: {
       maxWidth: DEFAULT_SIDEBAR_MAX_WIDTH,
       minWidth: DEFAULT_SIDEBAR_MIN_WIDTH,
-      visible: true,
-      width: DEFAULT_SIDEBAR_WIDTH,
+      visible: overrides.sidebar?.visible ?? true,
+      width: clampSidebarWidth(overrides.sidebar?.width ?? DEFAULT_SIDEBAR_WIDTH),
     },
     snippets,
     tabGroupMap: {},
@@ -129,6 +136,9 @@ export function appReducer(state: AppState, action: AppAction): AppState {
   const gitModeState = reduceGitModeState(state, action)
   if (gitModeState) return gitModeState
 
+  const autoCommitState = reduceAutoCommit(state, action)
+  if (autoCommitState) return autoCommitState
+
   switch (action.type) {
     case 'set-snippets':
       return { ...state, snippets: action.snippets }

package/src/state/types.ts

@@ -62,6 +62,7 @@ export interface TerminalLine {
 
 export interface TerminalSnapshot {
   lines: TerminalLine[]
+  tailLines?: TerminalLine[]
   viewportY: number
   baseY: number
   cursorVisible: boolean
@@ -323,6 +324,7 @@ export interface ModalGitCommit extends ModalBase {
   type: 'git-commit'
   activeField: 'title' | 'body'
   contentBuffer: string
+  stage: 'edit' | 'generating' | 'confirm'
 }
 
 export interface ModalCreateSession extends ModalBase {
@@ -397,6 +399,7 @@ export interface AppState {
   customCommands: Record<AssistantId, string>
   gitPanel: GitPanelState
   gitMode: GitModeState
+  autoCommit: AutoCommitState
   /** Chord prefix the sequence resolver is currently waiting on, or null when idle. */
   pendingChords: string[] | null
 }
@@ -438,7 +441,7 @@ export type SessionAction =
   | { 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 }
 
@@ -527,6 +530,50 @@ export type GitPanelAction =
   | { type: 'git-refresh-error'; kind: GitPanelError }
   | { type: 'git-panel-reset' }
 
+// -- Auto-commit state & actions --
+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 const EMPTY_AUTO_COMMIT_STATE: AutoCommitState = { bySession: {} }
+
+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 GitModeAction =
   | { type: 'enter-git-mode' }
   | { type: 'exit-git-mode' }
@@ -576,7 +623,12 @@ 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' }
+  | { type: 'git-commit-use-background-suggestion'; sessionId: string }
 
 // -- Data actions --
 export type DataAction =
@@ -593,3 +645,4 @@ export type AppAction =
   | DataAction
   | GitPanelAction
   | GitModeAction
+  | AutoCommitAction

package/src/state/workspace-save.ts

@@ -35,6 +35,10 @@ export function saveCurrentWorkspace(state: AppState): void {
     },
     sessionBarPosition: state.sessionBar.position,
     sessionBarVisible: state.sessionBar.visible,
+    sidebar: {
+      visible: state.sidebar.visible,
+      width: state.sidebar.width,
+    },
   })
   saveSessionCatalog(
     buildSessionsWithCurrentSnapshot(state.sessions, state.currentSessionId, state)

package/src/ui/ai-usage/controller.ts

@@ -0,0 +1,35 @@
+export interface AIUsagePopoverState {
+  anchorX: number
+  anchorY: number
+}
+
+type Listener = (state: AIUsagePopoverState | null) => void
+
+let current: AIUsagePopoverState | null = null
+const listeners = new Set<Listener>()
+
+export function openAIUsagePopover(anchorX: number, anchorY: number): void {
+  current = { anchorX, anchorY }
+  for (const l of listeners) l(current)
+}
+
+export function closeAIUsagePopover(): void {
+  if (current === null) return
+  current = null
+  for (const l of listeners) l(null)
+}
+
+export function toggleAIUsagePopover(anchorX: number, anchorY: number): void {
+  if (current) {
+    closeAIUsagePopover()
+  } else {
+    openAIUsagePopover(anchorX, anchorY)
+  }
+}
+
+export function subscribeAIUsagePopover(listener: Listener): () => void {
+  listeners.add(listener)
+  return () => {
+    listeners.delete(listener)
+  }
+}