@brimveyn/aimux 1.9.3 → 1.9.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux",
-  "version": "1.9.3",
+  "version": "1.9.6",
   "description": "A terminal multiplexer for AI CLIs. Run Claude, Codex, OpenCode side-by-side with tabbed navigation, split panes, and persistent sessions.",
   "keywords": [
     "ai",
@@ -60,7 +60,7 @@
     "bump": "bun run scripts/bump.ts"
   },
   "dependencies": {
-    "@brimveyn/aimux-config": "0.5.3",
+    "@brimveyn/aimux-config": "0.5.5",
     "@opentui/core": "^0.1.90",
     "@opentui/react": "^0.1.90",
     "@xterm/headless": "^6.0.0",

package/src/app-runtime/side-effects.ts

@@ -548,6 +548,16 @@ export function executeSideEffect(effect: SideEffect, ctx: SideEffectContext): v
       )
       return
     }
+    case 'git-stage-all': {
+      const paths = ctx.state.gitPanel.files.map((f) => f.path)
+      void enqueueGitOp(() => runGitActionAll(ctx, ['add', '-A'], paths))
+      return
+    }
+    case 'git-unstage-all': {
+      const paths = ctx.state.gitPanel.files.map((f) => f.path)
+      void enqueueGitOp(() => runGitActionAll(ctx, ['reset'], paths))
+      return
+    }
     case 'git-restore': {
       void enqueueGitOp(() => runGitAction(ctx, ['restore', '--', effect.path], effect.path))
       return
@@ -670,6 +680,25 @@ async function runGitAction(
   }
 }
 
+async function runGitActionAll(
+  ctx: SideEffectContext,
+  args: string[],
+  pathsToInvalidate: string[]
+): Promise<void> {
+  const cwd = ctx.getCurrentSessionProjectPath()
+  if (!cwd) return
+  const result = await $`git -C ${cwd} ${args}`.quiet().nothrow()
+  if (result.exitCode !== 0) {
+    const stderr = result.stderr.toString().trim()
+    ctx.dispatch({ message: stderr || 'git action failed', type: 'git-mode-set-message' })
+    return
+  }
+  ctx.dispatch({ message: null, type: 'git-mode-set-message' })
+  if (pathsToInvalidate.length > 0) {
+    ctx.dispatch({ paths: pathsToInvalidate, type: 'git-mode-invalidate-diffs' })
+  }
+}
+
 async function runGitRm(ctx: SideEffectContext, path: string): Promise<void> {
   const repoPath = ctx.state.gitPanel.files.find((f) => f.path === path)?.repoPath
   const cwd = repoPath ?? ctx.getCurrentSessionProjectPath()

package/src/app.tsx

@@ -35,7 +35,7 @@ import { loadSnippetCatalog } from './state/snippet-catalog'
 import { createInitialState } from './state/store'
 import { KeymapContext } from './ui/keymap-context'
 import { RootView } from './ui/root'
-import { applyTheme, setTransparent } from './ui/theme'
+import { applyTheme, setMode, setTransparent } from './ui/theme'
 import { isKnownThemeId, type ThemeId } from './ui/themes'
 import {
   fetchLatestNpmVersion,
@@ -71,10 +71,9 @@ export function App({
   const [themeId, setThemeId] = useState<ThemeId>(() => {
     const config = loadConfig()
     const persisted = config.themeId && isKnownThemeId(config.themeId) ? config.themeId : undefined
-    const fromConfig: ThemeId =
-      resolvedConfig.theme?.initialMode === 'light' ? 'aimux-light' : 'aimux-dark'
-    const initial: ThemeId = persisted ?? fromConfig
-    applyTheme(initial, resolvedConfig.theme?.paletteOverrides)
+    const initial: ThemeId = persisted ?? resolvedConfig.theme?.initialId ?? 'aimux'
+    applyTheme(initial)
+    if (resolvedConfig.theme?.initialMode) setMode(resolvedConfig.theme.initialMode)
     setTransparent(config.themeTransparent ?? false)
     return initial
   })

package/src/input/modes/types.ts

@@ -55,6 +55,8 @@ export type SideEffect =
   | { type: 'persist-git-tree-compaction'; enabled: boolean }
   | { type: 'git-stage'; path: string }
   | { type: 'git-unstage'; path: string }
+  | { type: 'git-stage-all' }
+  | { type: 'git-unstage-all' }
   | { type: 'git-restore'; path: string }
   | { type: 'git-rm'; path: string }
   | { type: 'git-commit'; title: string; body: string }

package/src/pty/terminal-snapshot.ts

@@ -2,7 +2,7 @@ import type { Terminal } from '@xterm/headless'
 
 import type { TerminalLine, TerminalSnapshot, TerminalSpan } from '../state/types'
 
-import { getCurrentTokens } from '../ui/theme'
+import { getCurrentTheme } from '../ui/theme'
 
 const SNAPSHOT_TAIL_LINE_COUNT = 10
 
@@ -115,17 +115,17 @@ function buildLine(
     let bg = getColorHex(current.getBgColor(), bgMode)
 
     if (current.isInverse()) {
-      const tokens = getCurrentTokens()
-      const resolvedFg = fg ?? tokens.palette.ink
-      const resolvedBg = bg ?? tokens.bg
+      const tokens = getCurrentTheme()
+      const resolvedFg = fg ?? tokens.text
+      const resolvedBg = bg ?? tokens.background
       ;[fg, bg] = [resolvedBg, resolvedFg]
     }
 
     const isCursorCell = cursorVisible && cursorColumn === column
     if (isCursorCell) {
-      const tokens = getCurrentTokens()
-      const resolvedFg = fg ?? tokens.palette.ink
-      const resolvedBg = bg ?? tokens.bg
+      const tokens = getCurrentTheme()
+      const resolvedFg = fg ?? tokens.text
+      const resolvedBg = bg ?? tokens.background
       ;[fg, bg] = [resolvedBg, resolvedFg]
     }
 

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

@@ -1,5 +1,6 @@
-import type { AppAction, AppState, FoldState, GitFileEntry, GitModeState } from '../types'
+import type { PreparedParsedDiff } from '../../ui/components/git/diff-renderer/prepare-diff'
 
+import { collectFoldables } from '../../ui/components/git/diff-renderer/build-rows'
 import {
   getSelectedGitRow,
   gitFileKey,
@@ -7,6 +8,14 @@ import {
   moveGitSelection,
   reconcileSelectedGitEntryKey,
 } from '../git-tree'
+import {
+  type AppAction,
+  type AppState,
+  type FoldState,
+  getParsedPayload,
+  type GitFileEntry,
+  type GitModeState,
+} from '../types'
 import { clearDiffCacheForPath, clearDiffCacheForPaths } from './diff-cache'
 import { sortFilesBySection } from './git-panel-state'
 
@@ -439,6 +448,29 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
       const bottom = Math.max(0, action.bottom)
       return applyFold(state, action.key, action.foldId, { bottom, top })
     }
+    case 'git-mode-fold-toggle-all': {
+      const parsed = getParsedPayload<PreparedParsedDiff>(state.gitMode.parsedFiles[action.key])
+      const file = parsed?.file
+      if (!file || !Array.isArray(file.hunks)) return state
+      const foldables = collectFoldables(file)
+      if (foldables.length === 0) return state
+      const current = state.gitMode.folds[action.key] ?? {}
+      const allExpanded = foldables.every(({ foldId, middle }) => {
+        const fs = current[foldId] ?? { bottom: 0, top: 0 }
+        return fs.top + fs.bottom >= middle
+      })
+      const nextFolds = { ...state.gitMode.folds }
+      if (allExpanded) {
+        delete nextFolds[action.key]
+      } else {
+        const perPath: Record<string, FoldState> = {}
+        for (const { foldId, middle } of foldables) {
+          perPath[foldId] = { bottom: 0, top: middle }
+        }
+        nextFolds[action.key] = perPath
+      }
+      return { ...state, gitMode: { ...state.gitMode, folds: nextFolds } }
+    }
     case 'git-mode-optimistic-move': {
       const currentKey = state.gitMode.selectedEntryKey
       const files = state.gitPanel.files

package/src/state/types.ts

@@ -650,6 +650,7 @@ export type GitModeAction =
       delta: number
     }
   | { type: 'git-mode-fold-set'; key: string; foldId: string; top: number; bottom: number }
+  | { type: 'git-mode-fold-toggle-all'; key: string }
   | {
       type: 'git-mode-optimistic-move'
       path: string

package/src/ui/components/git/diff-renderer/build-rows.ts

@@ -181,6 +181,27 @@ function contextNeighbors(
   return { hasChangeAfter, hasChangeBefore }
 }
 
+export interface Foldable {
+  foldId: string
+  middle: number
+}
+
+export function collectFoldables(file: FileDiffMetadata): Foldable[] {
+  const result: Foldable[] = []
+  for (const [hIdx, hunk] of file.hunks.entries()) {
+    for (const [cIdx, content] of hunk.hunkContent.entries()) {
+      if (content.type !== 'context') continue
+      const { hasChangeAfter, hasChangeBefore } = contextNeighbors(hunk.hunkContent, cIdx)
+      const preKeep = hasChangeBefore ? Math.min(KEEP_CONTEXT, content.lines) : 0
+      const postKeep = hasChangeAfter ? Math.min(KEEP_CONTEXT, content.lines - preKeep) : 0
+      const middle = content.lines - preKeep - postKeep
+      if (middle < MIN_FOLD_SIZE) continue
+      result.push({ foldId: `${hIdx}:${cIdx}`, middle })
+    }
+  }
+  return result
+}
+
 export function buildDiffSegments(file: FileDiffMetadata, folds: FoldMap = {}): DiffSegmentBuild {
   const segments: DiffSegment[] = []
   let offset = 0

package/src/ui/components/git/diff-renderer/fold-strip.tsx

@@ -1,4 +1,4 @@
-import { useBg, useTokens } from '../../../theme'
+import { useTheme } from '../../../theme'
 import { FOLD_STEP, type FoldInfo } from './build-rows'
 import { type FoldDispatch } from './pierre-diff'
 
@@ -8,11 +8,11 @@ interface Props {
 }
 
 function Button({ label, onPress }: { label: string; onPress: () => void }) {
-  const t = useTokens()
-  const bg = useBg('elevated')
+  const t = useTheme()
+  const bg = t.diffContextBg
   return (
     <box paddingLeft={1} paddingRight={1} backgroundColor={bg} onMouseDown={onPress}>
-      <text fg={t.palette.primary}>{label}</text>
+      <text fg={t.primary}>{label}</text>
     </box>
   )
 }
@@ -22,8 +22,8 @@ function Spacer() {
 }
 
 export function FoldStrip({ dispatch, fold }: Props) {
-  const t = useTokens()
-  const headerBg = useBg('elevated')
+  const t = useTheme()
+  const headerBg = t.diffContextBg
   const { bottomExpanded, foldId, hidden, topExpanded, total } = fold
   const stepUp = Math.min(FOLD_STEP, hidden)
   const stepDown = Math.min(FOLD_STEP, hidden)
@@ -71,7 +71,7 @@ export function FoldStrip({ dispatch, fold }: Props) {
 
   return (
     <box flexDirection="row" backgroundColor={headerBg} paddingLeft={1} paddingRight={1}>
-      <text fg={t.muted}>{`⋯ ${hidden} hidden `}</text>
+      <text fg={t.textMuted}>{`⋯ ${hidden} hidden `}</text>
       {controls}
     </box>
   )

package/src/ui/components/git/diff-renderer/pierre-diff.tsx

@@ -8,7 +8,7 @@ import type { ThemeId } from '../../../themes'
 import { useAppStore } from '../../../../state/app-store'
 import { dispatchGlobal } from '../../../../state/dispatch-ref'
 import { type FoldState } from '../../../../state/types'
-import { useTokens } from '../../../theme'
+import { useTheme } from '../../../theme'
 import { buildDiffSegments, firstChangeSegmentOffset, gutterWidth } from './build-rows'
 import { SplitView, type SplitViewHandle } from './split-view'
 import { StackedView, type StackedViewHandle } from './stacked-view'
@@ -45,7 +45,7 @@ export const PierreDiff = forwardRef<PierreDiffHandle, Props>(function PierreDif
   { cacheKey, diff, path, themeId, view },
   ref
 ) {
-  const t = useTokens()
+  const t = useTheme()
   const preparation = useDiffPreparation(cacheKey, diff, path, themeId)
   const file = preparation.file ?? undefined
   const highlights: DiffHighlights = preparation.highlights
@@ -123,7 +123,7 @@ export const PierreDiff = forwardRef<PierreDiffHandle, Props>(function PierreDif
   if (!file) {
     return (
       <box flexGrow={1} padding={1}>
-        <text fg={t.muted}>
+        <text fg={t.textMuted}>
           {preparation.preparing ? 'Preparing diff…' : '(could not parse diff)'}
         </text>
       </box>

package/src/ui/components/git/diff-renderer/split-view.tsx

@@ -20,7 +20,7 @@ import type { DiffHighlights, FoldDispatch } from './pierre-diff'
 
 import { getScrollViewportDelta } from '../../../../app-runtime/terminal-mouse-adapter'
 import { scrollGitDiff } from '../../../git-view-controls'
-import { useBg, useTokens, useTransparent } from '../../../theme'
+import { useTheme, useTransparent } from '../../../theme'
 import {
   type DiffSegment,
   estimatedSegmentHeight,
@@ -67,7 +67,8 @@ export const SplitView = forwardRef<SplitViewHandle, Props>(function SplitView(
   { contentWidth, file, foldDispatch, highlights, requestSegmentHighlights, segments },
   ref
 ) {
-  const separatorBg = useBg('base')
+  const t = useTheme()
+  const separatorBg = t.background
   const leftRef = useRef<ScrollBoxRenderable | null>(null)
   const rightRef = useRef<ScrollBoxRenderable | null>(null)
   const measuredHeightsRef = useRef<Record<string, number>>({})
@@ -224,12 +225,12 @@ function SideRow({
 }
 
 function HunkHeaderRow({ row }: { row: Extract<SplitRowOrHeader, { type: 'hunk-header' }> }) {
-  const t = useTokens()
-  const headerBg = useBg('elevated')
+  const t = useTheme()
+  const headerBg = t.diffContextBg
   return (
     <box flexDirection="row" backgroundColor={headerBg} paddingLeft={1} paddingRight={1}>
-      <text fg={t.muted}>{row.spec}</text>
-      {row.context ? <text fg={t.hover}> {row.context}</text> : null}
+      <text fg={t.text}>{row.spec}</text>
+      {row.context ? <text fg={t.textMuted}> {row.context}</text> : null}
     </box>
   )
 }
@@ -245,29 +246,29 @@ function HalfRow({
   height: number
   tokens: ThemedToken[][]
 }) {
-  const t = useTokens()
-  const headerBg = useBg('elevated')
+  const t = useTheme()
+  const headerBg = t.diffContextBg
   const transparent = useTransparent()
   if (cell.type === 'filler') {
     return <box backgroundColor={headerBg} height={height} />
   }
   let bg: string | undefined
   let sign = ' '
-  let signColor = t.muted
+  let signColor = t.textMuted
   if (cell.type === 'addition') {
-    bg = t.diffAddBg
+    bg = t.diffAddedBg
     sign = '+'
-    signColor = t.palette.success
+    signColor = t.diffAdded
   } else if (cell.type === 'deletion') {
-    bg = t.diffDeleteBg
+    bg = t.diffRemovedBg
     sign = '-'
-    signColor = t.palette.error
+    signColor = t.diffRemoved
   }
   const num = String(cell.lineNumber).padStart(gw, ' ')
   const lineTokens = tokens[cell.lineIdx]
   return (
     <box flexDirection="row" backgroundColor={transparent ? undefined : bg} height={height}>
-      <text fg={t.muted}>{` ${num} `}</text>
+      <text fg={t.textMuted}>{` ${num} `}</text>
       <text fg={signColor}>{`${sign} `}</text>
       <LineContent content={cell.content} tokens={lineTokens} />
     </box>
@@ -275,9 +276,9 @@ function HalfRow({
 }
 
 function LineContent({ content, tokens }: { content: string; tokens: ThemedToken[] | undefined }) {
-  const t = useTokens()
+  const t = useTheme()
   if (!tokens || tokens.length === 0) {
-    return <text fg={t.palette.ink}>{content}</text>
+    return <text fg={t.text}>{content}</text>
   }
   return (
     <text>
@@ -288,7 +289,7 @@ function LineContent({ content, tokens }: { content: string; tokens: ThemedToken
         if (s.italic) attributes |= TextAttributes.ITALIC
         if (s.underline) attributes |= TextAttributes.UNDERLINE
         return (
-          <span key={i} fg={s.fg ?? t.palette.ink} attributes={attributes}>
+          <span key={i} fg={s.fg ?? t.text} attributes={attributes}>
             {s.text}
           </span>
         )

package/src/ui/components/git/diff-renderer/stacked-view.tsx

@@ -20,7 +20,7 @@ import type { DiffHighlights, FoldDispatch } from './pierre-diff'
 
 import { getScrollViewportDelta } from '../../../../app-runtime/terminal-mouse-adapter'
 import { scrollGitDiff } from '../../../git-view-controls'
-import { useBg, useTokens, useTransparent } from '../../../theme'
+import { useTheme, useTransparent } from '../../../theme'
 import {
   type DiffSegment,
   estimatedSegmentHeight,
@@ -179,14 +179,14 @@ function UnifiedRowRender({
   highlights: DiffHighlights
   row: UnifiedRowOrHeader
 }) {
-  const t = useTokens()
-  const headerBg = useBg('elevated')
+  const t = useTheme()
+  const headerBg = t.diffContextBg
   const transparent = useTransparent()
   if (row.type === 'hunk-header') {
     return (
       <box flexDirection="row" backgroundColor={headerBg} paddingLeft={1} paddingRight={1}>
-        <text fg={t.muted}>{row.spec}</text>
-        {row.context ? <text fg={t.hover}> {row.context}</text> : null}
+        <text fg={t.text}>{row.spec}</text>
+        {row.context ? <text fg={t.textMuted}> {row.context}</text> : null}
       </box>
     )
   }
@@ -199,21 +199,21 @@ function UnifiedRowRender({
     const tokens = highlights.add[row.lineIdx]
     return (
       <box flexDirection="row" height={row.height}>
-        <text fg={t.muted}>{` ${pad(row.delLineNumber)} ${pad(row.addLineNumber)} `}</text>
-        <text fg={t.palette.ink}> </text>
+        <text fg={t.textMuted}>{` ${pad(row.delLineNumber)} ${pad(row.addLineNumber)} `}</text>
+        <text fg={t.text}> </text>
         <LineContent content={row.content} tokens={tokens} />
       </box>
     )
   }
-  const bg = row.type === 'addition' ? t.diffAddBg : t.diffDeleteBg
+  const bg = row.type === 'addition' ? t.diffAddedBg : t.diffRemovedBg
   const sign = row.type === 'addition' ? '+' : '-'
-  const signColor = row.type === 'addition' ? t.palette.success : t.palette.error
+  const signColor = row.type === 'addition' ? t.diffAdded : t.diffRemoved
   const delNum = row.type === 'deletion' ? row.lineNumber : undefined
   const addNum = row.type === 'addition' ? row.lineNumber : undefined
   const tokens = row.type === 'addition' ? highlights.add[row.lineIdx] : highlights.del[row.lineIdx]
   return (
     <box flexDirection="row" backgroundColor={transparent ? undefined : bg} height={row.height}>
-      <text fg={t.muted}>{` ${pad(delNum)} ${pad(addNum)} `}</text>
+      <text fg={t.textMuted}>{` ${pad(delNum)} ${pad(addNum)} `}</text>
       <text fg={signColor}>{`${sign} `}</text>
       <LineContent content={row.content} tokens={tokens} />
     </box>
@@ -221,9 +221,9 @@ function UnifiedRowRender({
 }
 
 function LineContent({ content, tokens }: { content: string; tokens: ThemedToken[] | undefined }) {
-  const t = useTokens()
+  const t = useTheme()
   if (!tokens || tokens.length === 0) {
-    return <text fg={t.palette.ink}>{content}</text>
+    return <text fg={t.text}>{content}</text>
   }
   return (
     <text>
@@ -234,7 +234,7 @@ function LineContent({ content, tokens }: { content: string; tokens: ThemedToken
         if (s.italic) attributes |= TextAttributes.ITALIC
         if (s.underline) attributes |= TextAttributes.UNDERLINE
         return (
-          <span key={i} fg={s.fg ?? t.palette.ink} attributes={attributes}>
+          <span key={i} fg={s.fg ?? t.text} attributes={attributes}>
             {s.text}
           </span>
         )