@brimveyn/aimux 1.6.1 → 1.7.0

package/README.md

@@ -202,6 +202,9 @@ not collide with a globally installed `aimux` instance.
   and focusing on the first change rather than the top of the file.
 - [shiki](https://shiki.style) — syntax highlighting for the git diff view
   and the source of the bundled theme catalog.
+- [herdr](https://github.com/ogulcancelik/herdr) by @ogulcancelik — the
+  per-CLI assistant status heuristics (working / waiting-input / idle)
+  used in the session bar are adapted from herdr's `detect.rs` rule tables.
 
 ## License
 

package/package.json

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

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

@@ -48,6 +48,12 @@ function hydrateAttachedSession(
       tabs: result.tabs,
       type: 'hydrate-workspace',
     })
+    // Dispatch the session-status snapshot *after* hydrate-workspace so
+    // sidebar chips reflect per-session state on attach without waiting
+    // for the next daemon-side status transition.
+    for (const entry of result.initialSessionStatuses) {
+      dispatch({ sessionId: entry.sessionId, status: entry.status, type: 'set-session-status' })
+    }
     resizeSnapshotPanes(workspaceSnapshot, layoutRef, backend)
     return
   }

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

@@ -1,25 +1,22 @@
 import type { MutableRefObject } from 'react'
 
 import type { SessionBackend } from '../session-backend/types'
-import type { AppAction, TabSession, TerminalModeState } from '../state/types'
+import type {
+  AppAction,
+  SessionStatus,
+  TabActivity,
+  TabSession,
+  TerminalModeState,
+} from '../state/types'
 
 import { logInputDebug } from '../debug/input-log'
 import { type TabRuntimeTimeouts } from './tab-runtime-timeouts'
 
-const IDLE_ACTIVITY_TIMEOUT_MS = 2_000
-
 interface BindBackendRuntimeEventsOptions {
   backend: SessionBackend
   dispatch: (action: AppAction) => void
   resizingRef: MutableRefObject<boolean>
-  timeouts: Pick<
-    TabRuntimeTimeouts,
-    | 'clearIdleTimer'
-    | 'clearStartupGrace'
-    | 'isStartupGraceActive'
-    | 'scheduleIdle'
-    | 'clearAllTimers'
-  >
+  timeouts: Pick<TabRuntimeTimeouts, 'clearIdleTimer' | 'clearStartupGrace' | 'clearAllTimers'>
 }
 
 function clearTabRuntimeState(
@@ -58,19 +55,14 @@ export function bindBackendRuntimeEvents({
       type: 'replace-tab-viewport',
       viewport,
     })
-    if (timeouts.isStartupGraceActive(tabId) || resizingRef.current) {
-      return
-    }
-
-    dispatch({ activity: 'busy', tabId, type: 'set-tab-activity' })
-    timeouts.scheduleIdle(tabId, IDLE_ACTIVITY_TIMEOUT_MS)
+    // Per-tab activity is driven by the backend's status-detection loop via
+    // the `tabActivity` event — no client-side idle timer needed.
   }
 
   const handleExit = (tabId: string, exitCode: number) => {
     logInputDebug('app.backend.event.exit', { exitCode, tabId })
     clearTabRuntimeState(timeouts, tabId)
-    dispatch({ exitCode, status: 'exited', tabId, type: 'set-tab-status' })
-    dispatch({ activity: undefined, tabId, type: 'set-tab-activity' })
+    dispatch({ tabId, type: 'close-tab' })
   }
 
   const handleError = (tabId: string, message: string) => {
@@ -79,14 +71,21 @@ export function bindBackendRuntimeEvents({
     dispatch({ message, tabId, type: 'set-tab-error' })
   }
 
-  const handleSessionActivity = (sessionId: string, busy: boolean) => {
-    dispatch({ busy, sessionId, type: 'set-session-busy' })
+  const handleSessionActivity = (sessionId: string, status: SessionStatus) => {
+    logInputDebug('app.backend.event.sessionActivity', { sessionId, status })
+    dispatch({ sessionId, status, type: 'set-session-status' })
+  }
+
+  const handleTabActivity = (tabId: string, activity: TabActivity) => {
+    logInputDebug('app.backend.event.tabActivity', { activity, tabId })
+    dispatch({ activity, tabId, type: 'set-tab-activity' })
   }
 
   backend.on('render', handleRender)
   backend.on('exit', handleExit)
   backend.on('error', handleError)
   backend.on('sessionActivity', handleSessionActivity)
+  backend.on('tabActivity', handleTabActivity)
 
   return () => {
     timeouts.clearAllTimers()
@@ -94,6 +93,7 @@ export function bindBackendRuntimeEvents({
     backend.off('exit', handleExit)
     backend.off('error', handleError)
     backend.off('sessionActivity', handleSessionActivity)
+    backend.off('tabActivity', handleTabActivity)
     void backend.destroy(true)
   }
 }

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

@@ -24,7 +24,7 @@ import {
   type SplitDirection,
   splitNode,
 } from '../state/layout-tree'
-import { filterSessions, filterSnippets } from '../state/selectors'
+import { filterAssistants, filterSessions, filterSnippets } from '../state/selectors'
 import { createDefaultTerminalModes } from '../state/terminal-modes'
 import {
   type AppAction,
@@ -36,7 +36,7 @@ import {
 import { saveCurrentWorkspace } from '../state/workspace-save'
 import { filterThemeIds } from '../ui/filter-themes'
 import { scrollGitDiff } from '../ui/git-view-controls'
-import { applyTheme } from '../ui/theme'
+import { applyTheme, getTransparent, setTransparent } from '../ui/theme'
 import { type ThemeId } from '../ui/themes'
 import {
   handleCreateSessionEffect,
@@ -68,9 +68,10 @@ export interface SideEffectContext {
 }
 
 function getSelectedAssistantOption(state: AppState) {
-  return (
-    getAllAssistantOptions(state.customCommands)[state.modal.selectedIndex] ?? getAssistantOption(0)
-  )
+  const all = getAllAssistantOptions(state.customCommands)
+  const filter = state.modal.type === 'new-tab' ? state.modal.editBuffer : null
+  const list = filterAssistants(all, filter)
+  return list[state.modal.selectedIndex] ?? list[0] ?? getAssistantOption(0)
 }
 
 function handleSessionSelection(ctx: SideEffectContext): void {
@@ -87,7 +88,7 @@ function handleSessionSelection(ctx: SideEffectContext): void {
     return
   }
 
-  dispatch({ type: 'open-create-session-modal' })
+  dispatch({ returnToSessionPicker: true, type: 'open-create-session-modal' })
 }
 
 function handleSelectedSessionDelete(ctx: SideEffectContext): void {
@@ -143,24 +144,28 @@ function pasteSnippetToActiveGroup(ctx: SideEffectContext): void {
   }
 }
 
-function saveCustomCommandSelection(state: AppState): void {
-  const option = getAllAssistantOptions(state.customCommands)[state.modal.selectedIndex]
-  if (!option || state.modal.editBuffer === null) {
+function saveCustomCommandSelection(ctx: SideEffectContext): void {
+  const { dispatch, state } = ctx
+  if (state.modal.type !== 'new-tab' || state.modal.editingCommand === null) {
     return
   }
+  const assistantId = state.modal.editingCommand
+  if (state.modal.editBuffer === null) return
 
   const trimmed = state.modal.editBuffer.trim()
   const newCustomCommands = { ...state.customCommands }
   if (trimmed) {
-    newCustomCommands[option.id] = trimmed
+    newCustomCommands[assistantId] = trimmed
   } else {
-    delete newCustomCommands[option.id]
+    delete newCustomCommands[assistantId]
   }
 
   saveConfig({
     ...loadConfig(),
     customCommands: newCustomCommands,
   })
+  dispatch({ customCommands: newCustomCommands, type: 'set-custom-commands' })
+  dispatch({ type: 'cancel-command-edit' })
 }
 
 function applyThemeEffect(
@@ -299,6 +304,7 @@ function launchAssistant(ctx: SideEffectContext, assistant: AssistantId): void {
     tabId: tab.id,
   })
   dispatch({ tab, type: 'add-tab' })
+  dispatch({ focusMode: 'terminal-input', type: 'set-focus-mode' })
   startTabSession(
     backend,
     dispatch,
@@ -435,7 +441,7 @@ export function executeSideEffect(effect: SideEffect, ctx: SideEffectContext): v
       return
     }
     case 'save-custom-command': {
-      saveCustomCommandSelection(state)
+      saveCustomCommandSelection(ctx)
       return
     }
     case 'apply-theme': {
@@ -471,6 +477,7 @@ export function executeSideEffect(effect: SideEffect, ctx: SideEffectContext): v
           mode: persistedGitPane?.mode ?? 'embedded',
           position: persistedGitPane?.position ?? 'bottom',
           ratio: persistedGitPane?.ratio ?? 0.5,
+          treeCompaction: persistedGitPane?.treeCompaction,
           visible: persistedGitPane?.visible ?? true,
         },
       })
@@ -487,6 +494,24 @@ export function executeSideEffect(effect: SideEffect, ctx: SideEffectContext): v
           mode: persistedGitPane?.mode ?? 'embedded',
           position: persistedGitPane?.position ?? 'bottom',
           ratio: persistedGitPane?.ratio ?? 0.5,
+          treeCompaction: persistedGitPane?.treeCompaction,
+          visible: persistedGitPane?.visible ?? true,
+        },
+      })
+      return
+    }
+    case 'persist-git-tree-compaction': {
+      const config = loadConfig()
+      const persistedGitPane = config.gitPane
+      saveConfig({
+        ...config,
+        gitPane: {
+          diffModeRatio: persistedGitPane?.diffModeRatio,
+          fileListMode: persistedGitPane?.fileListMode,
+          mode: persistedGitPane?.mode ?? 'embedded',
+          position: persistedGitPane?.position ?? 'bottom',
+          ratio: persistedGitPane?.ratio ?? 0.5,
+          treeCompaction: effect.enabled,
           visible: persistedGitPane?.visible ?? true,
         },
       })
@@ -527,6 +552,12 @@ export function executeSideEffect(effect: SideEffect, ctx: SideEffectContext): v
       handleSwitchSessionByIndex(ctx, effect.index)
       return
     }
+    case 'toggle-transparent': {
+      const next = !getTransparent()
+      setTransparent(next)
+      saveConfig({ ...loadConfig(), themeTransparent: next })
+      return
+    }
     default:
       effect satisfies never
   }

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

@@ -36,14 +36,7 @@ export function useBackendRuntime({
 }: BackendRuntimeOptions): TabRuntimeControls {
   const attachRequestIdRef = useRef(0)
   const timeouts = useTabRuntimeTimeouts(dispatch)
-  const {
-    clearAllTimers,
-    clearIdleTimer,
-    clearStartupGrace,
-    isStartupGraceActive,
-    scheduleIdle,
-    startStartupGrace,
-  } = timeouts
+  const { clearAllTimers, clearIdleTimer, clearStartupGrace, startStartupGrace } = timeouts
 
   useEffect(() => {
     if (!currentSessionId) {
@@ -81,20 +74,9 @@ export function useBackendRuntime({
         clearAllTimers,
         clearIdleTimer,
         clearStartupGrace,
-        isStartupGraceActive,
-        scheduleIdle,
       },
     })
-  }, [
-    backend,
-    clearAllTimers,
-    clearIdleTimer,
-    clearStartupGrace,
-    dispatch,
-    isStartupGraceActive,
-    resizingRef,
-    scheduleIdle,
-  ])
+  }, [backend, clearAllTimers, clearIdleTimer, clearStartupGrace, dispatch, resizingRef])
 
   return {
     clearIdleTimer,

package/src/app-runtime/use-directory-search.ts

@@ -2,7 +2,7 @@ import { useEffect } from 'react'
 
 import type { AppAction, ModalState } from '../state/types'
 
-import { searchProjectDirectories } from '../platform/project-search'
+import { searchProjectDirectories, warmDirectoryCache } from '../platform/project-search'
 
 const DEFAULT_DIRECTORY_SEARCH_DEBOUNCE_MS = 200
 
@@ -25,6 +25,11 @@ export function useDirectorySearch(
 ): void {
   const directoryQuery = getDirectoryQuery(modal)
 
+  useEffect(() => {
+    if (modal.type !== 'create-session') return
+    void warmDirectoryCache()
+  }, [modal.type])
+
   useEffect(() => {
     if (modal.type !== 'create-session') {
       return

package/src/app.tsx

@@ -37,7 +37,7 @@ import { loadSnippetCatalog } from './state/snippet-catalog'
 import { appReducer, createInitialState } from './state/store'
 import { KeymapContext } from './ui/keymap-context'
 import { RootView } from './ui/root'
-import { applyTheme } from './ui/theme'
+import { applyTheme, setTransparent } from './ui/theme'
 import { isKnownThemeId, registerUserThemes, type ThemeId } from './ui/themes'
 import {
   fetchLatestNpmVersion,
@@ -75,6 +75,7 @@ export function App({
         : undefined
     const initial = persisted ?? fromConfig ?? 'aimux'
     applyTheme(initial)
+    setTransparent(config.themeTransparent ?? false)
     return initial
   })
   const [state, dispatch] = useReducer(appReducer, undefined, () => {
@@ -88,10 +89,14 @@ export function App({
     const userGitPane = resolvedConfig.gitPane
     const fileListMode = userGitPane?.fileListMode ?? json.gitPane?.fileListMode ?? 'tree'
     const diffModeRatio = userGitPane?.diffModeRatio ?? json.gitPane?.diffModeRatio ?? 0.35
+    const treeCompaction = userGitPane?.treeCompaction ?? json.gitPane?.treeCompaction ?? true
+    const prefetchRadius = userGitPane?.prefetchRadius ?? json.gitPane?.prefetchRadius ?? 5
     const gitPaneOverrides = {
       ...json.gitPane,
       diffModeRatio,
       fileListMode,
+      prefetchRadius,
+      treeCompaction,
       ...(userGitPane?.visible !== undefined ? { visible: userGitPane.visible } : {}),
       ...(userGitPane?.mode !== undefined ? { mode: userGitPane.mode } : {}),
       ...(userGitPane?.position !== undefined ? { position: userGitPane.position } : {}),

package/src/config.ts

@@ -25,6 +25,8 @@ export const CONFIG_PATH = `${getProfileConfigDir()}/aimux.json`
 export interface PersistedGitPane {
   diffModeRatio?: number
   fileListMode?: GitFileListMode
+  treeCompaction?: boolean
+  prefetchRadius?: number
   visible: boolean
   mode: 'embedded' | 'pane'
   position: 'top' | 'bottom' | 'left' | 'right'
@@ -35,6 +37,7 @@ export interface AimuxConfig {
   version: 2
   customCommands: Record<string, string>
   themeId?: ThemeId
+  themeTransparent?: boolean
   gitPane?: PersistedGitPane
   sessionBarVisible?: boolean
   sessionBarPosition?: SessionBarPosition
@@ -62,7 +65,23 @@ function isPersistedGitPane(value: unknown): value is PersistedGitPane {
   const visibleOk = typeof v.visible === 'boolean'
   const fileListModeOk =
     v.fileListMode === undefined || v.fileListMode === 'tree' || v.fileListMode === 'flat'
-  if (!modeOk || !positionOk || !ratioOk || !diffModeRatioOk || !visibleOk || !fileListModeOk) {
+  const treeCompactionOk = v.treeCompaction === undefined || typeof v.treeCompaction === 'boolean'
+  const prefetchRadiusOk =
+    v.prefetchRadius === undefined ||
+    (typeof v.prefetchRadius === 'number' &&
+      Number.isFinite(v.prefetchRadius) &&
+      v.prefetchRadius >= 0 &&
+      v.prefetchRadius <= 50)
+  if (
+    !modeOk ||
+    !positionOk ||
+    !ratioOk ||
+    !diffModeRatioOk ||
+    !visibleOk ||
+    !fileListModeOk ||
+    !treeCompactionOk ||
+    !prefetchRadiusOk
+  ) {
     return false
   }
   // cross-field coherence: embedded => top|bottom; pane => left|right
@@ -108,6 +127,7 @@ export function loadConfigResult(): ConfigLoadResult {
       version?: number
       customCommands?: unknown
       themeId?: unknown
+      themeTransparent?: unknown
       gitPane?: unknown
       gitPanelVisible?: unknown
       gitPanelRatio?: unknown
@@ -131,6 +151,12 @@ export function loadConfigResult(): ConfigLoadResult {
       issues.push('ignored invalid themeId')
     }
 
+    const validThemeTransparent =
+      typeof parsed.themeTransparent === 'boolean' ? parsed.themeTransparent : undefined
+    if (parsed.themeTransparent !== undefined && validThemeTransparent === undefined) {
+      issues.push('ignored invalid themeTransparent')
+    }
+
     let validGitPane = isPersistedGitPane(parsed.gitPane) ? parsed.gitPane : undefined
     if (parsed.gitPane !== undefined && validGitPane === undefined) {
       issues.push('ignored invalid gitPane')
@@ -200,6 +226,7 @@ export function loadConfigResult(): ConfigLoadResult {
         sessionBarVisible: validSessionBarVisible,
         skippedUpdateVersion: validSkippedUpdateVersion,
         themeId: migrateThemeId(parsed.themeId),
+        themeTransparent: validThemeTransparent,
         version: 2,
         workspaceSnapshot: isWorkspaceSnapshotV1(parsed.workspaceSnapshot)
           ? parsed.workspaceSnapshot