@brimveyn/aimux 1.20.4 → 1.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux",
-  "version": "1.20.4",
+  "version": "1.21.0",
   "description": "A terminal multiplexer for AI CLIs. Run Claude, Codex, OpenCode, Kimi side-by-side with tabbed navigation, split panes, and persistent sessions.",
   "keywords": [
     "ai",
@@ -66,7 +66,7 @@
     "bump:terminal_manager": "bun run scripts/bump-protocol.ts terminal-manager"
   },
   "dependencies": {
-    "@brimveyn/aimux-config": "0.8.5",
+    "@brimveyn/aimux-config": "0.8.6",
     "@opentui/core": "^0.1.90",
     "@opentui/react": "^0.1.90",
     "@resvg/resvg-wasm": "^2.6.2",

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

@@ -913,62 +913,17 @@ export function executeSideEffect(effect: SideEffect, ctx: SideEffectContext): v
     }
     case 'persist-git-diff-mode-ratio': {
       const config = loadConfig()
-      const persistedGitPane = config.gitPane
-      const paneRatio = persistedGitPane?.paneRatio ?? persistedGitPane?.ratio ?? 0.5
-      const embeddedRatio = persistedGitPane?.embeddedRatio ?? persistedGitPane?.ratio ?? 0.5
-      saveConfig({
-        ...config,
-        gitPane: {
-          diffModeRatio: effect.ratio,
-          embeddedRatio,
-          fileListMode: persistedGitPane?.fileListMode,
-          mode: persistedGitPane?.mode ?? 'embedded',
-          paneRatio,
-          position: persistedGitPane?.position ?? 'bottom',
-          treeCompaction: persistedGitPane?.treeCompaction,
-          visible: persistedGitPane?.visible ?? true,
-        },
-      })
+      saveConfig({ ...config, gitPane: { ...config.gitPane, diffModeRatio: effect.ratio } })
       return
     }
     case 'persist-git-file-list-mode': {
       const config = loadConfig()
-      const persistedGitPane = config.gitPane
-      const paneRatio = persistedGitPane?.paneRatio ?? persistedGitPane?.ratio ?? 0.5
-      const embeddedRatio = persistedGitPane?.embeddedRatio ?? persistedGitPane?.ratio ?? 0.5
-      saveConfig({
-        ...config,
-        gitPane: {
-          diffModeRatio: persistedGitPane?.diffModeRatio,
-          embeddedRatio,
-          fileListMode: effect.mode,
-          mode: persistedGitPane?.mode ?? 'embedded',
-          paneRatio,
-          position: persistedGitPane?.position ?? 'bottom',
-          treeCompaction: persistedGitPane?.treeCompaction,
-          visible: persistedGitPane?.visible ?? true,
-        },
-      })
+      saveConfig({ ...config, gitPane: { ...config.gitPane, fileListMode: effect.mode } })
       return
     }
     case 'persist-git-tree-compaction': {
       const config = loadConfig()
-      const persistedGitPane = config.gitPane
-      const paneRatio = persistedGitPane?.paneRatio ?? persistedGitPane?.ratio ?? 0.5
-      const embeddedRatio = persistedGitPane?.embeddedRatio ?? persistedGitPane?.ratio ?? 0.5
-      saveConfig({
-        ...config,
-        gitPane: {
-          diffModeRatio: persistedGitPane?.diffModeRatio,
-          embeddedRatio,
-          fileListMode: persistedGitPane?.fileListMode,
-          mode: persistedGitPane?.mode ?? 'embedded',
-          paneRatio,
-          position: persistedGitPane?.position ?? 'bottom',
-          treeCompaction: effect.enabled,
-          visible: persistedGitPane?.visible ?? true,
-        },
-      })
+      saveConfig({ ...config, gitPane: { ...config.gitPane, treeCompaction: effect.enabled } })
       return
     }
     case 'git-stage': {

package/src/app-runtime/split-drag-controller.ts

@@ -16,8 +16,7 @@ export interface AxisDragState {
   screenStart: number
 }
 
-export interface AnchoredRatioDragState {
-  anchor: 'start' | 'end'
+export interface RatioDragState {
   axis: ScreenAxis
   screenStart: number
   totalSize: number
@@ -38,10 +37,7 @@ export function getAxisDeltaFromDrag(event: OtuiMouseEvent, drag: AxisDragState)
   return getScreenPosition(event, drag.axis) - drag.screenStart
 }
 
-export function getAnchoredRatioFromDrag(
-  event: OtuiMouseEvent,
-  drag: AnchoredRatioDragState
-): number {
-  const offset = getScreenPosition(event, drag.axis) - drag.screenStart
-  return drag.anchor === 'start' ? offset / drag.totalSize : 1 - offset / drag.totalSize
+/** Cursor position as a 0..1 fraction of the dragged container. */
+export function getRatioFromDrag(event: OtuiMouseEvent, drag: RatioDragState): number {
+  return (getScreenPosition(event, drag.axis) - drag.screenStart) / drag.totalSize
 }

package/src/app-runtime/use-mouse-handlers.ts

@@ -5,7 +5,7 @@ import { useEffect, useRef } from 'react'
 import type { TerminalContentOrigin } from '../input/raw-input-handler'
 import type { SessionBackend } from '../session-backend/types'
 import type { SplitDirection } from '../state/layout-tree'
-import type { AppAction, AppState, TabSession, TerminalLine } from '../state/types'
+import type { AppAction, AppState, BarSide, TabSession, TerminalLine } from '../state/types'
 
 import { logInputDebug } from '../debug/input-log'
 import { MultiClickDetector } from '../input/multi-click-detector'
@@ -23,20 +23,19 @@ import { recordMultiClickClipboardWrite } from './multi-click-clipboard-guard'
 import { requestRenderUpTree } from './render-invalidation'
 import { shouldWriteSelectionToClipboard } from './selection-clipboard-dedup'
 import {
-  type AnchoredRatioDragState,
   type AxisDragState,
-  getAnchoredRatioFromDrag,
   getAxisDeltaFromDrag,
+  getRatioFromDrag,
   getSplitRatioFromDrag,
+  type RatioDragState,
   type SplitDragState,
 } from './split-drag-controller'
 import { getForwardedMouseSequence, getScrollViewportDelta } from './terminal-mouse-adapter'
 
 type ResizeDragState =
   | ({ kind: 'split' } & SplitDragState)
-  | ({ initialWidth: number; kind: 'sidebar' } & AxisDragState)
-  | ({ initialWidth: number; kind: 'git-pane'; side: 'left' | 'right' } & AxisDragState)
-  | ({ kind: 'embedded-git'; position: 'top' | 'bottom' } & AnchoredRatioDragState)
+  | ({ initialWidth: number; kind: 'bar'; side: BarSide } & AxisDragState)
+  | ({ index: number; kind: 'bar-boundary'; side: BarSide } & RatioDragState)
 
 interface MultiClickDragState {
   mode: MultiClickMode
@@ -322,40 +321,32 @@ export function useMouseHandlers({
     separatorDragRef.current = { kind: 'split', ...info }
   }
 
-  const handleSidebarResizeStart = (info: { initialWidth: number; screenStart: number }) => {
-    separatorDragRef.current = {
-      axis: 'x',
-      initialWidth: info.initialWidth,
-      kind: 'sidebar',
-      screenStart: info.screenStart,
-    }
-  }
-
-  const handleGitPaneResizeStart = (info: {
+  const handleBarResizeStart = (info: {
     initialWidth: number
     screenStart: number
-    side: 'left' | 'right'
+    side: BarSide
   }) => {
     separatorDragRef.current = {
       axis: 'x',
       initialWidth: info.initialWidth,
-      kind: 'git-pane',
+      kind: 'bar',
       screenStart: info.screenStart,
       side: info.side,
     }
   }
 
-  const handleEmbeddedGitResizeStart = (info: {
+  const handleBarBoundaryResizeStart = (info: {
     containerStart: number
-    position: 'top' | 'bottom'
+    index: number
+    side: BarSide
     totalSize: number
   }) => {
     separatorDragRef.current = {
-      anchor: info.position === 'top' ? 'start' : 'end',
       axis: 'y',
-      kind: 'embedded-git',
-      position: info.position,
+      index: info.index,
+      kind: 'bar-boundary',
       screenStart: info.containerStart,
+      side: info.side,
       totalSize: info.totalSize,
     }
   }
@@ -377,27 +368,22 @@ export function useMouseHandlers({
         })
         break
       }
-      case 'sidebar': {
-        const nextWidth = Math.round(drag.initialWidth + getAxisDeltaFromDrag(event, drag))
-        dispatch({ type: 'set-sidebar-width', width: nextWidth })
-        break
-      }
-      case 'git-pane': {
-        const delta = getAxisDeltaFromDrag(event, drag)
-        const direction = drag.side === 'left' ? 1 : -1
-        const nextWidth = drag.initialWidth + delta * direction
+      case 'bar': {
+        // The right bar grows as the cursor moves left, hence the flipped sign.
+        const delta = getAxisDeltaFromDrag(event, drag) * (drag.side === 'left' ? 1 : -1)
         dispatch({
-          ratio: nextWidth / 80,
-          target: 'pane',
-          type: 'set-git-pane-ratio',
+          side: drag.side,
+          type: 'set-bar-width',
+          width: Math.round(drag.initialWidth + delta),
         })
         break
       }
-      case 'embedded-git': {
+      case 'bar-boundary': {
         dispatch({
-          ratio: getAnchoredRatioFromDrag(event, drag),
-          target: 'embedded',
-          type: 'set-git-pane-ratio',
+          index: drag.index,
+          ratio: getRatioFromDrag(event, drag),
+          side: drag.side,
+          type: 'set-bar-boundary',
         })
         break
       }
@@ -586,13 +572,12 @@ export function useMouseHandlers({
   }
 
   return {
-    handleEmbeddedGitResizeStart,
-    handleGitPaneResizeStart,
+    handleBarBoundaryResizeStart,
+    handleBarResizeStart,
     handlePaneActivate,
     handleSeparatorDrag,
     handleSeparatorDragEnd,
     handleSeparatorDragStart,
-    handleSidebarResizeStart,
     handleSplitResize,
     handleTerminalClick,
     handleTerminalDrag,

package/src/app-runtime/use-terminal-resize.ts

@@ -13,7 +13,7 @@ import type { SessionBackend } from '../session-backend/types'
 import type { AppAction, AppState } from '../state/types'
 import type { MeasuredPaneRect } from './use-pane-size-report'
 
-import { getGitPaneWidthFromRatio } from '../state/git-pane-sizing'
+import { getBarWidth } from '../state/bars'
 import {
   createTerminalBounds,
   forEachSplitPaneRect,
@@ -223,9 +223,12 @@ export function useTerminalResize({
     [backend, contentOriginRef]
   )
 
-  const gitPaneInPaneMode = state.gitPane.mode === 'pane' && state.gitPane.visible
+  // `getBarWidth` is the single authority on bar width — the Bar component
+  // renders from the same function. A mismatch silently corrupts PTY columns
+  // and mouse hit-testing.
+  const leftBarWidth = getBarWidth(state.bars.left)
+  const rightBarWidth = getBarWidth(state.bars.right)
   const terminalSize = useMemo(() => {
-    const sidebarWidth = state.sidebar.visible ? state.sidebar.width : 0
     const sessionBarRows = state.sessionBar.visible ? 1 : 0
     const sessionBarTopOffset = sessionBarRows
     const reservedRows =
@@ -233,18 +236,16 @@ export function useTerminalResize({
       STATUS_BAR_HEIGHT +
       TERMINAL_PANE_VERTICAL_CHROME +
       sessionBarRows
-    const gitPaneWidth = gitPaneInPaneMode ? getGitPaneWidthFromRatio(state.gitPane.paneRatio) : 0
-    const gitOnLeft = gitPaneInPaneMode && state.gitPane.position === 'left'
     const cols = Math.max(
       MIN_TERMINAL_COLS,
-      Math.floor(dimensions.width - sidebarWidth - gitPaneWidth - MAIN_AREA_HORIZONTAL_CHROME)
+      Math.floor(dimensions.width - leftBarWidth - rightBarWidth - MAIN_AREA_HORIZONTAL_CHROME)
     )
     const rows = Math.max(MIN_TERMINAL_ROWS, Math.floor(dimensions.height - reservedRows))
 
     contentOriginRef.current = {
       cols,
       rows,
-      x: sidebarWidth + (gitOnLeft ? gitPaneWidth : 0) + 1,
+      x: leftBarWidth + 1,
       y: 1 + sessionBarTopOffset,
     }
 
@@ -253,12 +254,9 @@ export function useTerminalResize({
     contentOriginRef,
     dimensions.height,
     dimensions.width,
-    state.sidebar.visible,
-    state.sidebar.width,
+    leftBarWidth,
+    rightBarWidth,
     state.sessionBar.visible,
-    gitPaneInPaneMode,
-    state.gitPane.position,
-    state.gitPane.paneRatio,
   ])
 
   useLayoutEffect(() => {
@@ -280,14 +278,7 @@ export function useTerminalResize({
     })
     handledBySyncRef.current = true
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [
-    state.sidebar.visible,
-    state.sidebar.width,
-    state.sessionBar.visible,
-    gitPaneInPaneMode,
-    state.gitPane.position,
-    state.gitPane.paneRatio,
-  ])
+  }, [leftBarWidth, rightBarWidth, state.sessionBar.visible])
 
   useEffect(() => {
     if (handledBySyncRef.current) {

package/src/app.tsx

@@ -106,40 +106,14 @@ export function App({
     const json = loadConfig()
     const sessionBarVisible =
       resolvedConfig.sessionBar?.initialVisible ?? json.sessionBarVisible ?? true
-    const sidebarOverrides = json.sidebar
-
     // Merge config-file gitPane (persisted prefs) with user's resolved gitPane
     // (programmatic config). User config wins; file provides persisted prior state.
     const userGitPane = resolvedConfig.gitPane
-    const fileListMode = userGitPane?.initialFileListMode ?? json.gitPane?.fileListMode ?? 'tree'
-    const diffModeRatio = userGitPane?.initialDiffModeRatio ?? json.gitPane?.diffModeRatio ?? 0.35
-    const treeCompaction =
-      userGitPane?.initialTreeCompaction ?? json.gitPane?.treeCompaction ?? true
-    const prefetchRadius = userGitPane?.prefetchRadius ?? json.gitPane?.prefetchRadius ?? 5
-    const persistedPaneRatio = json.gitPane?.paneRatio ?? json.gitPane?.ratio ?? 0.5
-    const persistedEmbeddedRatio = json.gitPane?.embeddedRatio ?? json.gitPane?.ratio ?? 0.5
     const gitPaneOverrides = {
-      ...json.gitPane,
-      diffModeRatio,
-      embeddedRatio:
-        userGitPane?.initialMode === 'embedded' && userGitPane?.initialRatio !== undefined
-          ? userGitPane.initialRatio
-          : persistedEmbeddedRatio,
-      fileListMode,
-      paneRatio:
-        userGitPane?.initialMode === 'pane' && userGitPane?.initialRatio !== undefined
-          ? userGitPane.initialRatio
-          : persistedPaneRatio,
-      prefetchRadius,
-      treeCompaction,
-      ...(userGitPane?.initialVisible !== undefined ? { visible: userGitPane.initialVisible } : {}),
-      ...(userGitPane?.initialMode !== undefined ? { mode: userGitPane.initialMode } : {}),
-      ...(userGitPane?.initialPosition !== undefined
-        ? { position: userGitPane.initialPosition }
-        : {}),
-      ...(userGitPane?.initialDiffModeRatio !== undefined
-        ? { diffModeRatio: userGitPane.initialDiffModeRatio }
-        : {}),
+      diffModeRatio: userGitPane?.initialDiffModeRatio ?? json.gitPane?.diffModeRatio ?? 0.35,
+      fileListMode: userGitPane?.initialFileListMode ?? json.gitPane?.fileListMode ?? 'tree',
+      prefetchRadius: userGitPane?.prefetchRadius ?? json.gitPane?.prefetchRadius ?? 5,
+      treeCompaction: userGitPane?.initialTreeCompaction ?? json.gitPane?.treeCompaction ?? true,
       ...(userGitPane?.path !== undefined ? { path: userGitPane.path } : {}),
       ...(userGitPane?.diffCount !== undefined ? { diffCount: userGitPane.diffCount } : {}),
     }
@@ -152,9 +126,9 @@ export function App({
       mergedSnippets,
       sessionCatalog.length === 0,
       {
+        bars: json.bars,
         gitPane: gitPaneOverrides,
         sessionBarVisible,
-        sidebar: sidebarOverrides,
         worktreeTemplates:
           resolvedConfig.worktreeTemplates.length > 0
             ? resolvedConfig.worktreeTemplates
@@ -382,13 +356,12 @@ export function App({
   })
 
   const {
-    handleEmbeddedGitResizeStart,
-    handleGitPaneResizeStart,
+    handleBarBoundaryResizeStart,
+    handleBarResizeStart,
     handlePaneActivate,
     handleSeparatorDrag,
     handleSeparatorDragEnd,
     handleSeparatorDragStart,
-    handleSidebarResizeStart,
     handleSplitResize,
     handleTerminalClick,
     handleTerminalDrag,
@@ -563,12 +536,11 @@ export function App({
         onTerminalMouseUp={handleTerminalMouseUp}
         onPaneActivate={handlePaneActivate}
         onSplitResize={handleSplitResize}
-        onEmbeddedGitResizeStart={handleEmbeddedGitResizeStart}
-        onGitPaneResizeStart={handleGitPaneResizeStart}
+        onBarBoundaryResizeStart={handleBarBoundaryResizeStart}
+        onBarResizeStart={handleBarResizeStart}
         onSeparatorDragStart={handleSeparatorDragStart}
         onSeparatorDrag={handleSeparatorDrag}
         onSeparatorDragEnd={handleSeparatorDragEnd}
-        onSidebarResizeStart={handleSidebarResizeStart}
         onMeasure={terminalSize.onMeasure}
         terminalCols={terminalSize.cols}
         terminalRows={terminalSize.rows}

package/src/config.ts

@@ -22,24 +22,48 @@ export function getConfigPath(): string {
   return `${getProfileConfigDir()}/aimux.json`
 }
 
+/**
+ * `visible` / `mode` / `position` / `*Ratio` are legacy placement fields, read
+ * once by `deriveBarsFromLegacy` and no longer written. They must stay
+ * optional: rejecting the whole block would silently drop the git *content*
+ * preferences (`fileListMode`, `diffModeRatio`, `treeCompaction`).
+ */
 export interface PersistedGitPane {
   diffModeRatio?: number
   fileListMode?: GitFileListMode
   treeCompaction?: boolean
   prefetchRadius?: number
-  visible: boolean
-  mode: 'embedded' | 'pane'
-  position: 'top' | 'bottom' | 'left' | 'right'
+  visible?: boolean
+  mode?: 'embedded' | 'pane'
+  position?: 'top' | 'bottom' | 'left' | 'right'
   paneRatio?: number
   embeddedRatio?: number
   ratio?: number
 }
 
+/** Legacy; still written for downgrade safety, read only as a bars fallback. */
 export interface PersistedSidebar {
   visible: boolean
   width: number
 }
 
+export interface PersistedBarWidget {
+  id: string
+  grow: number
+  visible: boolean
+}
+
+export interface PersistedBar {
+  visible: boolean
+  width: number
+  widgets: PersistedBarWidget[]
+}
+
+export interface PersistedBars {
+  left: PersistedBar
+  right: PersistedBar
+}
+
 export interface WorktreeTemplatePane {
   id: string
   assistant: string
@@ -67,6 +91,7 @@ export interface AimuxConfig {
   themeTransparent?: boolean
   themeMode?: ThemeMode
   gitPane?: PersistedGitPane
+  bars?: PersistedBars
   sidebar?: PersistedSidebar
   sessionBarVisible?: boolean
   workspaceSnapshot?: WorkspaceSnapshotV1
@@ -79,8 +104,9 @@ export interface AimuxConfig {
 function isPersistedGitPane(value: unknown): value is PersistedGitPane {
   if (typeof value !== 'object' || value === null) return false
   const v = value as Record<string, unknown>
-  const modeOk = v.mode === 'embedded' || v.mode === 'pane'
+  const modeOk = v.mode === undefined || v.mode === 'embedded' || v.mode === 'pane'
   const positionOk =
+    v.position === undefined ||
     v.position === 'top' ||
     v.position === 'bottom' ||
     v.position === 'left' ||
@@ -106,7 +132,7 @@ function isPersistedGitPane(value: unknown): value is PersistedGitPane {
       Number.isFinite(v.diffModeRatio) &&
       v.diffModeRatio > 0 &&
       v.diffModeRatio < 1)
-  const visibleOk = typeof v.visible === 'boolean'
+  const visibleOk = v.visible === undefined || typeof v.visible === 'boolean'
   const fileListModeOk =
     v.fileListMode === undefined || v.fileListMode === 'tree' || v.fileListMode === 'flat'
   const treeCompactionOk = v.treeCompaction === undefined || typeof v.treeCompaction === 'boolean'
@@ -130,12 +156,69 @@ function isPersistedGitPane(value: unknown): value is PersistedGitPane {
   ) {
     return false
   }
-  // cross-field coherence: embedded => top|bottom; pane => left|right
-  if (v.mode === 'embedded' && v.position !== 'top' && v.position !== 'bottom') return false
-  if (v.mode === 'pane' && v.position !== 'left' && v.position !== 'right') return false
   return true
 }
 
+function isPersistedBar(value: unknown): value is PersistedBar {
+  if (typeof value !== 'object' || value === null) return false
+  const v = value as Record<string, unknown>
+  if (typeof v.visible !== 'boolean') return false
+  if (typeof v.width !== 'number' || !Number.isFinite(v.width) || v.width <= 0) return false
+  if (!Array.isArray(v.widgets)) return false
+  return v.widgets.every((raw) => {
+    if (typeof raw !== 'object' || raw === null) return false
+    const widget = raw as Record<string, unknown>
+    return (
+      typeof widget.id === 'string' &&
+      widget.id.length > 0 &&
+      typeof widget.grow === 'number' &&
+      Number.isFinite(widget.grow) &&
+      widget.grow > 0 &&
+      typeof widget.visible === 'boolean'
+    )
+  })
+}
+
+export function isPersistedBars(value: unknown): value is PersistedBars {
+  if (typeof value !== 'object' || value === null) return false
+  const v = value as Record<string, unknown>
+  return isPersistedBar(v.left) && isPersistedBar(v.right)
+}
+
+/**
+ * One-time upgrade from the pre-bars layout (a left sidebar plus a git pane
+ * with its own mode/position). Runs whenever `bars` is absent so an existing
+ * install keeps the layout it had.
+ */
+export function deriveBarsFromLegacy(
+  sidebar: PersistedSidebar | undefined,
+  gitPane: PersistedGitPane | undefined
+): PersistedBars {
+  const gitVisible = gitPane?.visible ?? true
+  const embeddedRatio = gitPane?.embeddedRatio ?? gitPane?.ratio ?? 0.5
+  const gitGrow = Math.max(1, Math.round(embeddedRatio * 100))
+  const git = { grow: gitGrow, id: 'git', visible: gitVisible }
+  const workspaces = { grow: Math.max(1, 100 - gitGrow), id: 'workspaces', visible: true }
+
+  const left: PersistedBar = {
+    visible: sidebar?.visible ?? true,
+    widgets: gitPane?.position === 'top' ? [git, workspaces] : [workspaces, git],
+    width: sidebar?.width ?? 28,
+  }
+  const right: PersistedBar = { visible: false, widgets: [], width: 40 }
+
+  // A legacy `pane` git panel on the right was already its own right-hand
+  // column — it maps straight onto the right bar. On the left it shared the
+  // edge with the sidebar, which the single-bar model expresses as a stack.
+  if (gitPane?.mode === 'pane' && gitPane.position === 'right') {
+    left.widgets = [{ ...workspaces, grow: 100 }]
+    right.visible = true
+    right.widgets = [{ ...git, grow: 100 }]
+    right.width = Math.round((gitPane.paneRatio ?? gitPane.ratio ?? 0.5) * 80)
+  }
+  return { left, right }
+}
+
 function isRatioValid(value: unknown): boolean {
   return typeof value === 'number' && Number.isFinite(value) && value > 0.15 && value < 0.85
 }
@@ -259,6 +342,7 @@ export function loadConfigResult(): ConfigLoadResult {
       themeTransparent?: unknown
       themeMode?: unknown
       gitPane?: unknown
+      bars?: unknown
       sidebar?: unknown
       gitPanelVisible?: unknown
       gitPanelRatio?: unknown
@@ -305,6 +389,11 @@ export function loadConfigResult(): ConfigLoadResult {
       issues.push('ignored invalid sidebar')
     }
 
+    const validBars = isPersistedBars(parsed.bars) ? parsed.bars : undefined
+    if (parsed.bars !== undefined && validBars === undefined) {
+      issues.push('ignored invalid bars')
+    }
+
     // Legacy migration: previous schema stored gitPanelVisible/gitPanelRatio at
     // top level. If the new `gitPane` field is absent, synthesize it from legacy
     // keys so users don't lose their toggle/ratio on upgrade.
@@ -359,6 +448,7 @@ export function loadConfigResult(): ConfigLoadResult {
 
     return {
       config: {
+        bars: validBars ?? deriveBarsFromLegacy(validSidebar, validGitPane),
         customCommands: isCustomCommandsRecord(parsed.customCommands) ? parsed.customCommands : {},
         gitPane: validGitPane,
         prunedOrphanAimuxBranches: parsed.prunedOrphanAimuxBranches === true ? true : undefined,

package/src/git/pr-merge.ts

@@ -0,0 +1,64 @@
+import { logDebug } from '../debug/input-log'
+import { runCli } from '../services/ai-usage/spawn'
+
+export interface RepoMergeMethods {
+  mergeCommitAllowed: boolean
+  squashMergeAllowed: boolean
+  rebaseMergeAllowed: boolean
+}
+
+/**
+ * Mirrors the method GitHub pre-selects on the merge button: a merge commit
+ * when the repo allows one, then squash, then rebase. `gh pr merge` refuses to
+ * guess when several are enabled, so we have to name one explicitly.
+ */
+export function pickMergeFlag(methods: RepoMergeMethods): string | null {
+  if (methods.mergeCommitAllowed) return '--merge'
+  if (methods.squashMergeAllowed) return '--squash'
+  if (methods.rebaseMergeAllowed) return '--rebase'
+  return null
+}
+
+export type MergeResult = { ok: true } | { ok: false; message: string }
+
+async function repoMergeMethods(gh: string, cwd: string): Promise<RepoMergeMethods | null> {
+  const result = await runCli(
+    gh,
+    ['repo', 'view', '--json', 'mergeCommitAllowed,squashMergeAllowed,rebaseMergeAllowed'],
+    15_000,
+    cwd
+  )
+  if (!result.ok) return null
+  try {
+    const raw = JSON.parse(result.stdout) as Record<string, unknown>
+    return {
+      mergeCommitAllowed: raw.mergeCommitAllowed === true,
+      rebaseMergeAllowed: raw.rebaseMergeAllowed === true,
+      squashMergeAllowed: raw.squashMergeAllowed === true,
+    }
+  } catch {
+    return null
+  }
+}
+
+export async function approveAndMergePr(cwd: string): Promise<MergeResult> {
+  const gh = Bun.which('gh')
+  if (gh === null) return { message: 'gh CLI not found', ok: false }
+
+  const methods = await repoMergeMethods(gh, cwd)
+  if (methods === null) return { message: 'could not read repo merge settings', ok: false }
+  const flag = pickMergeFlag(methods)
+  if (flag === null) return { message: 'repo allows no merge method', ok: false }
+
+  // GitHub rejects approving your own PR, and a missing approval is not a
+  // reason to skip the merge — best effort, log it, move on.
+  const approve = await runCli(gh, ['pr', 'review', '--approve'], 15_000, cwd)
+  if (!approve.ok) logDebug('git.pr.approveSkipped', { error: approve.error })
+
+  const merge = await runCli(gh, ['pr', 'merge', flag], 60_000, cwd)
+  if (!merge.ok) {
+    const detail = merge.stderr.trim().split('\n')[0] ?? 'merge failed'
+    return { message: detail.slice(0, 160), ok: false }
+  }
+  return { ok: true }
+}