@brimveyn/aimux 1.3.1 → 1.4.1

package/README.md

@@ -11,6 +11,7 @@ A terminal multiplexer for AI CLIs. Manage multiple AI assistant sessions (Claud
 ## Features
 
 - **Multi-tab sessions** — Run Claude, Codex, and OpenCode in parallel with instant tab switching
+- **Session bar** — Numbered session chips at the top (or bottom) of the screen. Click to switch, drag to reorder, busy spinner for non-focused sessions with live PTY output. Toggle with `<leader>b`; jump with `<leader>1..9`. Position persists via `aimux.config.ts` or `aimux.json`.
 - **Split panes** — Split vertically (`|`) or horizontally (`-`) to view multiple assistants at once
 - **Draggable separators** — Resize split panes by dragging with the mouse
 - **Click-to-focus** — Click any pane or sidebar tab to focus it instantly
@@ -134,6 +135,8 @@ Press `?` in navigation mode for the full, live keybinding list (reflects your c
 | `Ctrl+S`              | Snippet picker       |
 | `Ctrl+T`              | Theme picker         |
 | `G`                   | Toggle git panel     |
+| `<leader>b`           | Toggle session bar   |
+| `<leader>1..9`        | Switch to session N  |
 | `?`                   | Show help            |
 | `Ctrl+C`              | Quit                 |
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux",
-  "version": "1.3.1",
+  "version": "1.4.1",
   "description": "A terminal multiplexer for AI CLIs. Run Claude, Codex, OpenCode side-by-side with tabbed navigation, split panes, and persistent sessions.",
   "keywords": [
     "ai",
@@ -52,12 +52,13 @@
     "demo:splits": "vhs assets/splits.tape",
     "demo:themes": "vhs assets/themes.tape",
     "restart-daemon": "AIMUX_PROFILE=dev bun run src/index.tsx restart-daemon",
+    "restart-terminal-manager": "AIMUX_PROFILE=dev bun run src/index.tsx restart-terminal-manager",
     "lint": "oxlint .",
     "format": "oxfmt --write .",
     "format:check": "oxfmt --check ."
   },
   "dependencies": {
-    "@brimveyn/aimux-config": "0.2.6",
+    "@brimveyn/aimux-config": "0.3.1",
     "@opentui/core": "^0.1.90",
     "@opentui/react": "^0.1.90",
     "@xterm/headless": "^6.0.0",

package/src/app-runtime/backend-runtime-events.ts

@@ -79,15 +79,21 @@ export function bindBackendRuntimeEvents({
     dispatch({ message, tabId, type: 'set-tab-error' })
   }
 
+  const handleSessionActivity = (sessionId: string, busy: boolean) => {
+    dispatch({ busy, sessionId, type: 'set-session-busy' })
+  }
+
   backend.on('render', handleRender)
   backend.on('exit', handleExit)
   backend.on('error', handleError)
+  backend.on('sessionActivity', handleSessionActivity)
 
   return () => {
     timeouts.clearAllTimers()
     backend.off('render', handleRender)
     backend.off('exit', handleExit)
     backend.off('error', handleError)
+    backend.off('sessionActivity', handleSessionActivity)
     void backend.destroy(true)
   }
 }

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

@@ -488,11 +488,29 @@ export function executeSideEffect(effect: SideEffect, ctx: SideEffectContext): v
       handleConfirmUpdateSelection(ctx)
       return
     }
+    case 'switch-session-by-index': {
+      handleSwitchSessionByIndex(ctx, effect.index)
+      return
+    }
     default:
       effect satisfies never
   }
 }
 
+function handleSwitchSessionByIndex(ctx: SideEffectContext, index: number): void {
+  const { backend, dispatch, state } = ctx
+  const ordered = state.sessions
+    .slice()
+    .sort((a, b) => (a.order ?? Number.MAX_SAFE_INTEGER) - (b.order ?? Number.MAX_SAFE_INTEGER))
+  const target = ordered[index - 1]
+  if (!target) {
+    logInputDebug('app.sessionBar.switchOutOfRange', { index, total: ordered.length })
+    return
+  }
+  if (target.id === state.currentSessionId) return
+  handleSwitchSessionEffect(state, backend, dispatch, target)
+}
+
 function handleConfirmUpdateSelection(ctx: SideEffectContext): void {
   const { state } = ctx
   if (state.modal.type !== 'update-available') {

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

@@ -1,4 +1,4 @@
-import { type MutableRefObject, useEffect, useMemo, useRef } from 'react'
+import { type MutableRefObject, useEffect, useLayoutEffect, useMemo, useRef } from 'react'
 
 import type { TerminalContentOrigin } from '../input/raw-input-handler'
 import type { SessionBackend } from '../session-backend/types'
@@ -28,20 +28,21 @@ function resizeSplitTabs(
   tabIds: string[],
   cols: number,
   rows: number,
-  intents: Map<string, ScrollIntent>
+  intents: Map<string, ScrollIntent>,
+  options?: { sync?: boolean }
 ): void {
   const bounds = getTerminalBounds(cols, rows)
   const resizedTabIds = new Set<string>()
 
   forEachSplitPaneRect(Object.values(layoutTrees), bounds, (tabId, rect) => {
     const size = toTerminalContentSize(rect)
-    backend.resizeTab(tabId, size.cols, size.rows, intents.get(tabId))
+    backend.resizeTab(tabId, size.cols, size.rows, intents.get(tabId), options)
     resizedTabIds.add(tabId)
   })
 
   for (const id of tabIds) {
     if (!resizedTabIds.has(id)) {
-      backend.resizeTab(id, cols, rows, intents.get(id))
+      backend.resizeTab(id, cols, rows, intents.get(id), options)
     }
   }
 }
@@ -55,6 +56,50 @@ interface UseTerminalResizeOptions {
   resizingRef: MutableRefObject<boolean>
 }
 
+interface RunResizeCascadeArgs {
+  backend: SessionBackend
+  dispatch: (action: AppAction) => void
+  resizingRef: MutableRefObject<boolean>
+  resizingTimerRef: MutableRefObject<ReturnType<typeof setTimeout> | null>
+  cols: number
+  rows: number
+  layoutTrees: AppState['layoutTrees']
+  stableTabIds: string[]
+  intents: Map<string, ScrollIntent>
+  sync: boolean
+}
+
+function runResizeCascade({
+  backend,
+  cols,
+  dispatch,
+  intents,
+  layoutTrees,
+  resizingRef,
+  resizingTimerRef,
+  rows,
+  stableTabIds,
+  sync,
+}: RunResizeCascadeArgs): void {
+  dispatch({ cols, rows, type: 'set-terminal-size' })
+  resizingRef.current = true
+  if (resizingTimerRef.current) {
+    clearTimeout(resizingTimerRef.current)
+  }
+  const trees = Object.values(layoutTrees)
+  const hasSplits = trees.some((t) => t.type === 'split')
+  const options = sync ? { sync: true } : undefined
+  if (hasSplits) {
+    resizeSplitTabs(backend, layoutTrees, stableTabIds, cols, rows, intents, options)
+  } else {
+    backend.resizeAll(cols, rows, intents, options)
+  }
+  resizingTimerRef.current = setTimeout(() => {
+    resizingRef.current = false
+    resizingTimerRef.current = null
+  }, RESIZE_ACTIVITY_SETTLE_MS)
+}
+
 export function useTerminalResize({
   backend,
   contentOriginRef,
@@ -66,6 +111,8 @@ export function useTerminalResize({
   const resizingTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
   const tabIdsRef = useRef<string[]>([])
   const intentsRef = useRef<Map<string, ScrollIntent>>(new Map())
+  const handledBySyncRef = useRef(false)
+  const sidebarMountedRef = useRef(false)
 
   const currentTabIds = state.tabs.map((t) => t.id)
   const tabIdsChanged =
@@ -84,8 +131,14 @@ export function useTerminalResize({
 
   const terminalSize = useMemo(() => {
     const sidebarWidth = state.sidebar.visible ? state.sidebar.width + 1 : 0
+    const sessionBarRows = state.sessionBar.visible ? 1 : 0
+    const sessionBarTopOffset =
+      state.sessionBar.visible && state.sessionBar.position === 'top' ? 1 : 0
     const reservedRows =
-      MAIN_AREA_VERTICAL_PADDING + STATUS_BAR_HEIGHT + TERMINAL_PANE_VERTICAL_CHROME
+      MAIN_AREA_VERTICAL_PADDING +
+      STATUS_BAR_HEIGHT +
+      TERMINAL_PANE_VERTICAL_CHROME +
+      sessionBarRows
     const cols = Math.max(
       MIN_TERMINAL_COLS,
       Math.floor(dimensions.width - sidebarWidth - MAIN_AREA_HORIZONTAL_CHROME)
@@ -96,7 +149,7 @@ export function useTerminalResize({
       cols,
       rows,
       x: sidebarWidth + 1,
-      y: 1,
+      y: 1 + sessionBarTopOffset,
     }
 
     return { cols, rows }
@@ -106,36 +159,53 @@ export function useTerminalResize({
     dimensions.width,
     state.sidebar.visible,
     state.sidebar.width,
+    state.sessionBar.visible,
+    state.sessionBar.position,
   ])
 
-  useEffect(() => {
-    dispatch({
+  useLayoutEffect(() => {
+    if (!sidebarMountedRef.current) {
+      sidebarMountedRef.current = true
+      return
+    }
+    runResizeCascade({
+      backend,
       cols: terminalSize.cols,
+      dispatch,
+      intents: intentsRef.current,
+      layoutTrees: state.layoutTrees,
+      resizingRef,
+      resizingTimerRef,
       rows: terminalSize.rows,
-      type: 'set-terminal-size',
+      stableTabIds,
+      sync: true,
     })
-    resizingRef.current = true
-    if (resizingTimerRef.current) {
-      clearTimeout(resizingTimerRef.current)
-    }
-    const trees = Object.values(state.layoutTrees)
-    const hasSplits = trees.some((t) => t.type === 'split')
-    if (hasSplits) {
-      resizeSplitTabs(
-        backend,
-        state.layoutTrees,
-        stableTabIds,
-        terminalSize.cols,
-        terminalSize.rows,
-        intentsRef.current
-      )
-    } else {
-      backend.resizeAll(terminalSize.cols, terminalSize.rows, intentsRef.current)
+    handledBySyncRef.current = true
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [
+    state.sidebar.visible,
+    state.sidebar.width,
+    state.sessionBar.visible,
+    state.sessionBar.position,
+  ])
+
+  useEffect(() => {
+    if (handledBySyncRef.current) {
+      handledBySyncRef.current = false
+      return
     }
-    resizingTimerRef.current = setTimeout(() => {
-      resizingRef.current = false
-      resizingTimerRef.current = null
-    }, RESIZE_ACTIVITY_SETTLE_MS)
+    runResizeCascade({
+      backend,
+      cols: terminalSize.cols,
+      dispatch,
+      intents: intentsRef.current,
+      layoutTrees: state.layoutTrees,
+      resizingRef,
+      resizingTimerRef,
+      rows: terminalSize.rows,
+      stableTabIds,
+      sync: false,
+    })
   }, [
     backend,
     dispatch,

package/src/app.tsx

@@ -31,7 +31,7 @@ import { getHandler, transitionTo } from './input/modes/registry'
 import { type TerminalContentOrigin } from './input/raw-input-handler'
 import { getProfileName } from './profile-paths'
 import { appStore } from './state/app-store'
-import { setActiveDispatch } from './state/dispatch-ref'
+import { setActiveDispatch, setActiveSideEffectRunner } from './state/dispatch-ref'
 import { loadSessionCatalog } from './state/session-catalog'
 import { loadSnippetCatalog } from './state/snippet-catalog'
 import { appReducer, createInitialState } from './state/store'
@@ -69,11 +69,22 @@ export function App({
     return config.themeId ?? 'aimux'
   })
   const [state, dispatch] = useReducer(appReducer, undefined, () => {
-    const { customCommands, gitPanelRatio, gitPanelVisible } = loadConfig()
-    return createInitialState(customCommands, loadSessionCatalog(), loadSnippetCatalog(), true, {
-      gitPanelRatio,
-      gitPanelVisible,
-    })
+    const json = loadConfig()
+    const sessionBarVisible = resolvedConfig.sessionBar?.visible ?? json.sessionBarVisible ?? true
+    const sessionBarPosition =
+      resolvedConfig.sessionBar?.position ?? json.sessionBarPosition ?? 'top'
+    return createInitialState(
+      json.customCommands,
+      loadSessionCatalog(),
+      loadSnippetCatalog(),
+      true,
+      {
+        gitPanelRatio: json.gitPanelRatio,
+        gitPanelVisible: json.gitPanelVisible,
+        sessionBarPosition,
+        sessionBarVisible,
+      }
+    )
   })
 
   useLayoutEffect(() => {
@@ -82,7 +93,10 @@ export function App({
 
   useLayoutEffect(() => {
     setActiveDispatch(dispatch)
-    return () => setActiveDispatch(null)
+    return () => {
+      setActiveDispatch(null)
+      setActiveSideEffectRunner(null)
+    }
   }, [dispatch])
 
   useEffect(() => {
@@ -251,6 +265,9 @@ export function App({
 
   // Keep the ref pointing at the latest closure so stable callbacks can invoke it
   processKeyResultRef.current = processKeyResult
+  // Expose the side-effect runner so non-keyboard call sites (mouse, IPC) can
+  // invoke the same effect pipeline with the current context.
+  setActiveSideEffectRunner((effect) => executeSideEffect(effect, sideEffectCtx))
 
   useLayoutEffect(() => {
     for (const handler of keymapHandlers) {

package/src/config.ts

@@ -1,6 +1,6 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
 
-import type { WorkspaceSnapshotV1 } from './state/types'
+import type { SessionBarPosition, WorkspaceSnapshotV1 } from './state/types'
 
 import { logDebug } from './debug/input-log'
 import { getProfileConfigDir } from './profile-paths'
@@ -15,6 +15,8 @@ export interface AimuxConfig {
   themeId?: ThemeId
   gitPanelVisible?: boolean
   gitPanelRatio?: number
+  sessionBarVisible?: boolean
+  sessionBarPosition?: SessionBarPosition
   workspaceSnapshot?: WorkspaceSnapshotV1
   skippedUpdateVersion?: string
 }
@@ -58,6 +60,8 @@ export function loadConfigResult(): ConfigLoadResult {
       themeId?: unknown
       gitPanelVisible?: unknown
       gitPanelRatio?: unknown
+      sessionBarVisible?: unknown
+      sessionBarPosition?: unknown
       workspaceSnapshot?: unknown
       skippedUpdateVersion?: unknown
     }
@@ -93,6 +97,20 @@ export function loadConfigResult(): ConfigLoadResult {
       issues.push('ignored invalid gitPanelRatio')
     }
 
+    const validSessionBarVisible =
+      typeof parsed.sessionBarVisible === 'boolean' ? parsed.sessionBarVisible : undefined
+    if (parsed.sessionBarVisible !== undefined && validSessionBarVisible === undefined) {
+      issues.push('ignored invalid sessionBarVisible')
+    }
+
+    const validSessionBarPosition =
+      parsed.sessionBarPosition === 'top' || parsed.sessionBarPosition === 'bottom'
+        ? parsed.sessionBarPosition
+        : undefined
+    if (parsed.sessionBarPosition !== undefined && validSessionBarPosition === undefined) {
+      issues.push('ignored invalid sessionBarPosition')
+    }
+
     if (
       parsed.workspaceSnapshot !== undefined &&
       !isWorkspaceSnapshotV1(parsed.workspaceSnapshot)
@@ -117,6 +135,8 @@ export function loadConfigResult(): ConfigLoadResult {
         customCommands: isCustomCommandsRecord(parsed.customCommands) ? parsed.customCommands : {},
         gitPanelRatio: validGitPanelRatio,
         gitPanelVisible: validGitPanelVisible,
+        sessionBarPosition: validSessionBarPosition,
+        sessionBarVisible: validSessionBarVisible,
         skippedUpdateVersion: validSkippedUpdateVersion,
         themeId: isThemeId(parsed.themeId) ? parsed.themeId : undefined,
         version: 2,

package/src/daemon/session-manager.ts

@@ -67,8 +67,14 @@ export class SessionManager extends EventEmitter<SessionManagerEvents> {
     this.getOrCreateRegistry(sessionId).write(tabId, data)
   }
 
-  resize(sessionId: string, cols: number, rows: number, intents?: Map<string, ScrollIntent>): void {
-    this.getOrCreateRegistry(sessionId).resizeAll(cols, rows, intents)
+  resize(
+    sessionId: string,
+    cols: number,
+    rows: number,
+    intents?: Map<string, ScrollIntent>,
+    options?: { sync?: boolean }
+  ): void {
+    this.getOrCreateRegistry(sessionId).resizeAll(cols, rows, intents, options)
   }
 
   resizeTab(
@@ -76,9 +82,10 @@ export class SessionManager extends EventEmitter<SessionManagerEvents> {
     tabId: string,
     cols: number,
     rows: number,
-    intent?: ScrollIntent
+    intent?: ScrollIntent,
+    options?: { sync?: boolean }
   ): void {
-    this.getOrCreateRegistry(sessionId).resizeTab(tabId, cols, rows, intent)
+    this.getOrCreateRegistry(sessionId).resizeTab(tabId, cols, rows, intent, options)
   }
 
   scroll(sessionId: string, tabId: string, deltaLines: number): void {

package/src/daemon/session-registry.ts

@@ -165,12 +165,23 @@ export class SessionRegistry extends EventEmitter<SessionRegistryEvents> {
     this.ptyManager.write(tabId, data)
   }
 
-  resizeAll(cols: number, rows: number, intents?: Map<string, ScrollIntent>): void {
-    this.ptyManager.resizeAll(cols, rows, intents)
+  resizeAll(
+    cols: number,
+    rows: number,
+    intents?: Map<string, ScrollIntent>,
+    options?: { sync?: boolean }
+  ): void {
+    this.ptyManager.resizeAll(cols, rows, intents, options)
   }
 
-  resizeTab(tabId: string, cols: number, rows: number, intent?: ScrollIntent): void {
-    this.ptyManager.resizeSession(tabId, cols, rows, intent)
+  resizeTab(
+    tabId: string,
+    cols: number,
+    rows: number,
+    intent?: ScrollIntent,
+    options?: { sync?: boolean }
+  ): void {
+    this.ptyManager.resizeSession(tabId, cols, rows, intent, options)
   }
 
   scrollViewport(tabId: string, deltaLines: number): void {

package/src/index.tsx

@@ -9,6 +9,7 @@ import { getRuntimeProfile } from './daemon/runtime-paths'
 import { logDebug } from './debug/input-log'
 import { runDoctor } from './doctor'
 import { runRestartDaemon } from './restart-daemon'
+import { runRestartTerminalManager } from './restart-terminal-manager'
 import { createSessionBackend } from './session-backend/bootstrap'
 import { runTerminalManager } from './terminal-manager/terminal-manager'
 import { runUpdate } from './update'
@@ -30,6 +31,10 @@ if (command === 'restart-daemon') {
   process.exit(await runRestartDaemon())
 }
 
+if (command === 'restart-terminal-manager') {
+  process.exit(await runRestartTerminalManager())
+}
+
 if (command === 'update') {
   process.exit(await runUpdate())
 }
@@ -46,7 +51,7 @@ if (command === 'terminal-manager') {
 
 if (command === '--help' || command === '-h') {
   process.stdout.write(
-    'aimux -- terminal multiplexer for AI CLIs\n\nUsage:\n  aimux                  Start aimux\n  aimux update           Update to latest version\n  aimux doctor           Diagnose setup issues\n  aimux restart-daemon   Restart IPC daemon\n\n'
+    'aimux -- terminal multiplexer for AI CLIs\n\nUsage:\n  aimux                           Start aimux\n  aimux update                    Update to latest version\n  aimux doctor                    Diagnose setup issues\n  aimux restart-daemon            Restart IPC daemon\n  aimux restart-terminal-manager  Restart terminal-manager (kills live sessions)\n\n'
   )
   process.exit(0)
 }

package/src/input/modes/types.ts

@@ -53,6 +53,7 @@ export type SideEffect =
   | { type: 'git-commit'; title: string; body: string }
   | { type: 'git-push' }
   | { type: 'confirm-update-selection' }
+  | { type: 'switch-session-by-index'; index: number }
 
 export interface KeyResult {
   actions: AppAction[]