@brimveyn/aimux 1.7.4 → 1.9.0

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

@@ -44,6 +44,7 @@ export type ModalType =
   | 'split-picker'
   | 'git-commit'
   | 'update-available'
+  | 'ai-usage'
   | null
 
 export interface TerminalSpan {
@@ -62,6 +63,7 @@ export interface TerminalLine {
 
 export interface TerminalSnapshot {
   lines: TerminalLine[]
+  tailLines?: TerminalLine[]
   viewportY: number
   baseY: number
   cursorVisible: boolean
@@ -323,6 +325,7 @@ export interface ModalGitCommit extends ModalBase {
   type: 'git-commit'
   activeField: 'title' | 'body'
   contentBuffer: string
+  stage: 'edit' | 'generating' | 'confirm'
 }
 
 export interface ModalCreateSession extends ModalBase {
@@ -346,6 +349,10 @@ export interface ModalUpdateAvailable extends ModalBase {
   latestVersion: string
 }
 
+export interface ModalAIUsage extends ModalBase {
+  type: 'ai-usage'
+}
+
 export type DirectoryResultType = 'git-repo' | 'worktree' | 'workspace'
 
 export interface DirectoryResult {
@@ -367,6 +374,7 @@ export type ModalState =
   | ModalSnippetEditor
   | ModalGitCommit
   | ModalUpdateAvailable
+  | ModalAIUsage
 
 export interface LayoutState {
   terminalCols: number
@@ -397,6 +405,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
 }
@@ -431,6 +440,7 @@ export type ModalAction =
   | { type: 'open-theme-picker' }
   | { type: 'open-update-available-modal'; currentVersion: string; latestVersion: string }
   | { type: 'set-modal-selection-index'; index: number }
+  | { type: 'open-ai-usage-modal' }
 
 // -- Session actions --
 export type SessionAction =
@@ -438,7 +448,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 +537,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 +630,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 +652,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/components/ai-usage-indicator.tsx

@@ -0,0 +1,163 @@
+import type { AIUsageTool } from '@brimveyn/aimux-config'
+
+import { useAIUsageStore } from '../../state/ai-usage-store'
+import { dispatchGlobal } from '../../state/dispatch-ref'
+import { useBg, useTokens } from '../theme'
+
+const TOOL_ICON: Record<AIUsageTool, string> = {
+  claude: 'CC',
+  codex: 'CO',
+}
+
+const BAR_SEGMENTS = 4
+const BAR_FILLED_CHAR = '\u{2501}'
+const BAR_EMPTY_CHAR = '\u{2500}'
+
+function formatTokens(total: number): string {
+  if (total >= 1_000_000) return `${(total / 1_000_000).toFixed(1)}M`
+  if (total >= 1_000) return `${(total / 1_000).toFixed(1)}k`
+  return String(total)
+}
+
+function buildBar(percent: number): { empty: string; filled: string } {
+  let filledCount = 0
+  for (let i = 0; i < BAR_SEGMENTS; i++) {
+    if (percent > i * (100 / BAR_SEGMENTS)) filledCount++
+  }
+  return {
+    empty: BAR_EMPTY_CHAR.repeat(BAR_SEGMENTS - filledCount),
+    filled: BAR_FILLED_CHAR.repeat(filledCount),
+  }
+}
+
+function formatResetIn(snap: {
+  resetAt: string | null
+  timeRemaining: string | null
+}): string | null {
+  if (snap.resetAt) {
+    const diffMs = new Date(snap.resetAt).getTime() - Date.now()
+    if (diffMs > 0) {
+      const totalMin = Math.round(diffMs / 60_000)
+      const h = Math.floor(totalMin / 60)
+      const m = totalMin % 60
+      return `${String(h).padStart(2, '0')}:${String(m).padStart(2, '0')}h`
+    }
+  }
+  return snap.timeRemaining
+}
+
+export function AIUsageIndicator() {
+  const t = useTokens()
+  const bg = useBg('elevated')
+  const enabled = useAIUsageStore((s) => s.enabled)
+  const snapshots = useAIUsageStore((s) => s.snapshots)
+
+  if (!enabled) return null
+
+  const ordered: AIUsageTool[] = ['claude', 'codex']
+  const entries = ordered
+    .map((tool) => ({ snap: snapshots[tool], tool }))
+    .filter((entry) => entry.snap !== undefined)
+
+  const openModal = (e: { preventDefault: () => void; stopPropagation: () => void }) => {
+    e.preventDefault()
+    e.stopPropagation()
+    dispatchGlobal({ type: 'open-ai-usage-modal' })
+  }
+
+  if (entries.length === 0) {
+    return (
+      <box
+        flexDirection="row"
+        paddingLeft={1}
+        paddingRight={1}
+        backgroundColor={bg}
+        onMouseDown={openModal}
+      >
+        <text fg={t.muted}>…</text>
+      </box>
+    )
+  }
+
+  return (
+    <box flexDirection="row" gap={1}>
+      {entries.map(({ snap, tool }) => {
+        if (!snap) return null
+        const icon = TOOL_ICON[tool]
+
+        if (snap.error && !snap.stale) {
+          return (
+            <box
+              key={tool}
+              flexDirection="row"
+              paddingLeft={1}
+              paddingRight={1}
+              backgroundColor={bg}
+              onMouseDown={openModal}
+            >
+              <text fg={t.palette.error} selectable={false}>
+                {`${icon} —`}
+              </text>
+            </box>
+          )
+        }
+
+        if (snap.percent !== null) {
+          const p = Math.round(snap.percent)
+          let color = t.palette.success
+          if (p >= 85) {
+            color = t.palette.error
+          } else if (p >= 60) {
+            color = t.palette.warning
+          }
+          const { empty, filled } = buildBar(snap.percent)
+          const reset = formatResetIn(snap)
+          const pctText = `${String(p).padStart(2, ' ')}%`
+          return (
+            <box
+              key={tool}
+              flexDirection="row"
+              paddingLeft={1}
+              paddingRight={1}
+              backgroundColor={bg}
+              onMouseDown={openModal}
+            >
+              <text fg={color} selectable={false}>
+                {`${icon} `}
+              </text>
+              <text fg={color} selectable={false}>
+                {filled}
+              </text>
+              <text fg={t.muted} selectable={false}>
+                {empty}
+              </text>
+              <text fg={t.palette.ink} selectable={false}>
+                {` ${pctText}`}
+              </text>
+              {reset ? (
+                <text fg={t.muted} selectable={false}>
+                  {` · ${reset}`}
+                </text>
+              ) : null}
+            </box>
+          )
+        }
+
+        return (
+          <box
+            key={tool}
+            flexDirection="row"
+            paddingLeft={1}
+            paddingRight={1}
+            backgroundColor={bg}
+            onMouseDown={openModal}
+          >
+            <text fg={t.muted} selectable={false}>
+              {`${icon} ${formatTokens(snap.tokens.total)}`}
+            </text>
+          </box>
+        )
+      })}
+    </box>
+  )
+}

package/src/ui/components/ai-usage-modal.tsx

@@ -0,0 +1,186 @@
+import type { AIUsageTool } from '@brimveyn/aimux-config'
+import type { ReactNode } from 'react'
+
+import type { UsagePaceStage, UsageSnapshot, UsageWindow } from '../../services/ai-usage/types'
+
+import { useAIUsageStore } from '../../state/ai-usage-store'
+import { useTokens } from '../theme'
+import { uiTokens } from '../ui-tokens'
+import { ModalShell } from './modal-shell'
+
+const TOOL_TITLE: Record<AIUsageTool, string> = {
+  claude: 'Claude',
+  codex: 'Codex',
+}
+
+const BAR_SEGMENTS = 32
+const BAR_FILLED_CHAR = '\u{2501}'
+const BAR_EMPTY_CHAR = '\u{2500}'
+
+function buildBar(percent: number | null): { empty: string; filled: string } {
+  const p = percent ?? 0
+  let filledCount = 0
+  for (let i = 0; i < BAR_SEGMENTS; i++) {
+    if (p > i * (100 / BAR_SEGMENTS)) filledCount++
+  }
+  return {
+    empty: BAR_EMPTY_CHAR.repeat(BAR_SEGMENTS - filledCount),
+    filled: BAR_FILLED_CHAR.repeat(filledCount),
+  }
+}
+
+function formatRelative(iso: string, now: number = Date.now()): string {
+  const diffMs = now - new Date(iso).getTime()
+  if (!Number.isFinite(diffMs) || diffMs < 0) return 'just now'
+  const s = Math.floor(diffMs / 1000)
+  if (s < 10) return 'just now'
+  if (s < 60) return `${s}s ago`
+  const m = Math.floor(s / 60)
+  if (m < 60) return `${m}m ago`
+  const h = Math.floor(m / 60)
+  if (h < 24) return `${h}h ago`
+  const d = Math.floor(h / 24)
+  return `${d}d ago`
+}
+
+function paceStageIsAhead(stage: UsagePaceStage): boolean {
+  return stage === 'ahead' || stage === 'farAhead' || stage === 'slightlyAhead'
+}
+
+function paceStageIsBehind(stage: UsagePaceStage): boolean {
+  return stage === 'behind' || stage === 'farBehind' || stage === 'slightlyBehind'
+}
+
+export function AIUsageModal() {
+  const t = useTokens()
+  const snapshots = useAIUsageStore((s) => s.snapshots)
+
+  const tools: AIUsageTool[] = ['claude', 'codex']
+  const sections = tools
+    .map((tool) => ({ snap: snapshots[tool], tool }))
+    .filter((s): s is { snap: UsageSnapshot; tool: AIUsageTool } => s.snap !== undefined)
+
+  return (
+    <ModalShell
+      title="AI usage"
+      keybindsModeId="modal.ai-usage"
+      width={uiTokens.modalWidth.md}
+      listGap={1}
+    >
+      {sections.length === 0 ? (
+        <text fg={t.muted} selectable={false}>
+          no data yet — collecting…
+        </text>
+      ) : (
+        <box flexDirection="column" gap={1}>
+          {sections.map(({ snap, tool }) => (
+            <ToolSection key={tool} snap={snap} tool={tool} />
+          ))}
+        </box>
+      )}
+    </ModalShell>
+  )
+}
+
+interface ToolSectionProps {
+  snap: UsageSnapshot
+  tool: AIUsageTool
+}
+
+function ToolSection({ snap, tool }: ToolSectionProps) {
+  const t = useTokens()
+  const isHardError = Boolean(snap.error) && !snap.stale
+  const relative = formatRelative(snap.lastUpdated)
+
+  let body: ReactNode
+  if (isHardError) {
+    body = (
+      <text fg={t.palette.error} selectable={false}>
+        {`error: ${snap.error ?? ''}`}
+      </text>
+    )
+  } else if (snap.windows.length === 0) {
+    body = (
+      <text fg={t.muted} selectable={false}>
+        no window data
+      </text>
+    )
+  } else {
+    body = snap.windows.map((window) => <WindowRow key={window.kind} window={window} />)
+  }
+
+  return (
+    <box flexDirection="column">
+      <box flexDirection="row" justifyContent="space-between">
+        <text fg={t.accent} selectable={false}>
+          {TOOL_TITLE[tool]}
+        </text>
+        {snap.planTier ? (
+          <text fg={t.muted} selectable={false}>
+            {snap.planTier}
+          </text>
+        ) : null}
+      </box>
+      <text fg={t.muted} selectable={false}>
+        {`Updated ${relative}`}
+      </text>
+      {body}
+    </box>
+  )
+}
+
+function WindowRow({ window }: { window: UsageWindow }) {
+  const t = useTokens()
+  const percent = window.percent
+  const { empty, filled } = buildBar(percent)
+
+  let barColor = t.palette.success
+  if (percent !== null) {
+    if (percent >= 85) barColor = t.palette.error
+    else if (percent >= 60) barColor = t.palette.warning
+  }
+
+  const pctText = percent === null ? '—' : `${Math.round(percent)}% used`
+  const resetText = window.timeRemaining ? `Resets in ${window.timeRemaining}` : null
+
+  return (
+    <box flexDirection="column" paddingTop={1}>
+      <text fg={t.palette.ink} selectable={false}>
+        {window.label}
+      </text>
+      <box flexDirection="row">
+        <text fg={barColor} selectable={false}>
+          {filled}
+        </text>
+        <text fg={t.muted} selectable={false}>
+          {empty}
+        </text>
+      </box>
+      <box flexDirection="row" justifyContent="space-between">
+        <text fg={t.muted} selectable={false}>
+          {pctText}
+        </text>
+        {resetText ? (
+          <text fg={t.muted} selectable={false}>
+            {resetText}
+          </text>
+        ) : null}
+      </box>
+      {window.pace ? <PaceLine pace={window.pace} /> : null}
+    </box>
+  )
+}
+
+function PaceLine({ pace }: { pace: NonNullable<UsageWindow['pace']> }) {
+  const t = useTokens()
+  let color = t.muted
+  if (paceStageIsBehind(pace.stage)) color = t.palette.warning
+  else if (paceStageIsAhead(pace.stage)) color = t.palette.success
+
+  const suffix = pace.rightText ? ` · ${pace.rightText}` : ''
+  return (
+    <text fg={color} selectable={false}>
+      {`Pace: ${pace.label}${suffix}`}
+    </text>
+  )
+}

package/src/ui/components/create-session-modal.tsx

@@ -48,7 +48,7 @@ export function CreateSessionModal({
 
   return (
     <ModalShell
-      title="Create session"
+      title="Create workspace"
       keybindsModeId="modal.create-session"
       width={uiTokens.modalWidth.xl}
     >
@@ -88,7 +88,7 @@ export function CreateSessionModal({
       </box>
 
       <box flexDirection="column">
-        <text fg={nameActive ? t.palette.ink : t.muted}>Session name</text>
+        <text fg={nameActive ? t.palette.ink : t.muted}>Workspace name</text>
         <InputField active={nameActive} value={sessionName} />
       </box>
     </ModalShell>