@brimveyn/aimux-config 0.8.4 → 0.8.6

package/README.md

@@ -188,7 +188,7 @@ palette guidance, and precedence details.
 | `theme`      | Supported          | `theme.initialMode` is a startup override; persisted `aimux.json.themeId` still wins |
 | `themes`     | Supported          | User themes; appear in the picker and power synthesized highlighting                 |
 | `backends`   | Typed surface only | Runtime wiring deferred                                                              |
-| `sidebar`    | Typed surface only | Type exists, runtime not currently driven by this field                              |
+| `sidebar`    | Ignored            | Superseded by the app-managed `bars` state in `aimux.json`                           |
 | `hooks`      | Typed surface only | Type exists, runtime use not currently wired                                         |
 | `snippets`   | Typed surface only | Runtime currently uses `aimux-snippets.json`                                         |
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux-config",
-  "version": "0.8.4",
+  "version": "0.8.6",
   "description": "TypeScript configuration API for aimux — keymaps, themes, and backends with a fluent builder.",
   "keywords": [
     "aimux",

package/src/actions.ts

@@ -51,8 +51,14 @@ export const openFlashJump: KeyResult = r(
   'modal.flash-jump'
 )
 
-export const toggleSidebar: KeyResult = r([{ type: 'toggle-sidebar' }])
-export const toggleGitPane: KeyResult = r([{ type: 'toggle-git-pane' }])
+export function toggleBar(side: 'left' | 'right'): KeyResult {
+  return r([{ side, type: 'toggle-bar' }])
+}
+export const toggleSidebar: KeyResult = toggleBar('left')
+export function toggleWidget(widgetId: string): KeyResult {
+  return r([{ type: 'toggle-widget', widgetId }])
+}
+export const toggleGitPane: KeyResult = toggleWidget('git')
 export const toggleSessionBar: KeyResult = r([{ type: 'toggle-session-bar' }])
 export const toggleAIUsage: ActionFn = (ctx: ModeContext) => {
   if (ctx.state.modal.type === 'ai-usage') {
@@ -61,13 +67,6 @@ export const toggleAIUsage: ActionFn = (ctx: ModeContext) => {
   return r([{ type: 'open-ai-usage-modal' }], [], 'modal.ai-usage')
 }
 
-export function setGitPaneMode(mode: 'embedded' | 'pane'): KeyResult {
-  return r([{ mode, type: 'set-git-pane-mode' }])
-}
-
-export function setGitPanePosition(position: 'top' | 'bottom' | 'left' | 'right'): KeyResult {
-  return r([{ position, type: 'set-git-pane-position' }])
-}
 export const enterGitMode: KeyResult = r([{ type: 'enter-git-mode' }], [], 'git-mode')
 
 export function switchSessionByIndex(index: number): KeyResult {
@@ -139,12 +138,20 @@ export function reorderSession(delta: number): KeyResult {
   return r([{ delta, type: 'reorder-active-session' }])
 }
 
+export function resizeBar(side: 'left' | 'right', delta: number): KeyResult {
+  return r([{ delta, side, type: 'resize-bar' }])
+}
+
 export function resizeSidebar(delta: number): KeyResult {
-  return r([{ delta, type: 'resize-sidebar' }])
+  return resizeBar('left', delta)
+}
+
+export function resizeWidget(widgetId: string, delta: number): KeyResult {
+  return r([{ delta, type: 'resize-widget', widgetId }])
 }
 
 export function resizeGitPane(delta: number): KeyResult {
-  return r([{ delta, type: 'resize-git-pane' }])
+  return resizeWidget('git', delta)
 }
 
 export function resizeGitDiffPane(delta: number): ActionFn {
@@ -480,9 +487,11 @@ export const closePane: ActionFn = (ctx: ModeContext) => {
 }
 
 // Navigation-specific dynamic actions
+// Reveals whichever bar hosts the workspace list — it is not pinned to the left.
 export const ctrlZSidebar: ActionFn = (ctx: ModeContext) => {
-  if (!ctx.state.sidebar.visible) {
-    return r([{ type: 'toggle-sidebar' }])
+  const side = ctx.state.bars.left.widgets.some((w) => w.id === 'workspaces') ? 'left' : 'right'
+  if (!ctx.state.bars[side].visible) {
+    return r([{ side, type: 'toggle-bar' }])
   }
   return r([])
 }
@@ -498,7 +507,7 @@ export const leaveTerminalInput: KeyResult = r(
   'navigation'
 )
 
-export const toggleSidebarFromInput: KeyResult = r([{ type: 'toggle-sidebar' }])
+export const toggleSidebarFromInput: KeyResult = toggleBar('left')
 
 // Session name modal
 export const confirmSessionRename: ActionFn = (ctx: ModeContext) => {

package/src/defaults.ts

@@ -19,10 +19,13 @@ export const DEFAULT_AUTO_COMMIT_CONFIG: AutoCommitConfig = {
 
 export const DEFAULT_AUTO_RENAME_CONFIG: AutoRenameConfig = {
   enabled: true,
+  maxAttempts: 3,
+  minPromptWords: 3,
   models: {
     claude: 'claude-haiku-4-5',
     codex: 'gpt-5-mini',
   },
+  settleMs: 2_500,
   timeoutMs: 15_000,
 }
 
@@ -99,6 +102,7 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
     .mode(['navigation', 'terminal-input'], (m) =>
       m
         .map('<Leader>b', actions.toggleSessionBar, 'Toggle session bar')
+        .map('<Leader>B', actions.toggleBar('right'), 'Toggle right bar')
         .map('<Leader>u', actions.toggleAIUsage, 'Toggle AI usage')
         .map('<Leader>1', actions.switchTabByIndex(1), 'Tab 1')
         .map('<Leader>2', actions.switchTabByIndex(2), 'Tab 2')

package/src/resolver.ts

@@ -32,7 +32,16 @@ export function resolveConfig(userConfig: AimuxUserConfig): ResolvedConfig {
 
   const autoRename: AutoRenameConfig = {
     enabled: userConfig.autoRename?.enabled ?? DEFAULT_AUTO_RENAME_CONFIG.enabled,
+    maxAttempts: Math.max(
+      1,
+      userConfig.autoRename?.maxAttempts ?? DEFAULT_AUTO_RENAME_CONFIG.maxAttempts
+    ),
+    minPromptWords: Math.max(
+      1,
+      userConfig.autoRename?.minPromptWords ?? DEFAULT_AUTO_RENAME_CONFIG.minPromptWords
+    ),
     models: { ...DEFAULT_AUTO_RENAME_CONFIG.models, ...userConfig.autoRename?.models },
+    settleMs: Math.max(0, userConfig.autoRename?.settleMs ?? DEFAULT_AUTO_RENAME_CONFIG.settleMs),
     timeoutMs: userConfig.autoRename?.timeoutMs ?? DEFAULT_AUTO_RENAME_CONFIG.timeoutMs,
   }
 
@@ -96,60 +105,17 @@ function resolveSessionBar(
   }
 }
 
-function resolvePaneInitialPosition(
-  userConfig: NonNullable<AimuxUserConfig['gitPane']>
-): 'left' | 'right' | undefined {
-  if (userConfig.initialPosition === 'left' || userConfig.initialPosition === 'right') {
-    return userConfig.initialPosition
-  }
-  if (userConfig.position === 'left' || userConfig.position === 'right') {
-    return userConfig.position
-  }
-  return undefined
-}
-
-function resolveEmbeddedInitialPosition(
-  userConfig: NonNullable<AimuxUserConfig['gitPane']>
-): 'top' | 'bottom' | undefined {
-  if (userConfig.initialPosition === 'top' || userConfig.initialPosition === 'bottom') {
-    return userConfig.initialPosition
-  }
-  if (userConfig.position === 'top' || userConfig.position === 'bottom') {
-    return userConfig.position
-  }
-  return undefined
-}
-
+/** Placement fields are accepted for backwards compatibility but dropped here. */
 function resolveGitPane(userConfig: AimuxUserConfig['gitPane']): ResolvedConfig['gitPane'] {
   if (!userConfig) return {}
-
-  const initialMode = userConfig.initialMode ?? userConfig.mode
-  const paneInitialPosition = resolvePaneInitialPosition(userConfig)
-  const embeddedInitialPosition = resolveEmbeddedInitialPosition(userConfig)
-  const shared = {
+  return {
     diffCount: userConfig.diffCount,
     initialDiffModeRatio: userConfig.initialDiffModeRatio ?? userConfig.diffModeRatio,
     initialFileListMode: userConfig.initialFileListMode ?? userConfig.fileListMode,
-    initialRatio: userConfig.initialRatio ?? userConfig.ratio,
     initialTreeCompaction: userConfig.initialTreeCompaction ?? userConfig.treeCompaction,
-    initialVisible: userConfig.initialVisible ?? userConfig.visible,
     path: userConfig.path,
     prefetchRadius: userConfig.prefetchRadius,
   }
-
-  if (initialMode === 'pane') {
-    return {
-      ...shared,
-      initialMode: 'pane',
-      initialPosition: paneInitialPosition,
-    }
-  }
-
-  return {
-    ...shared,
-    ...(initialMode === 'embedded' ? { initialMode: 'embedded' as const } : {}),
-    initialPosition: embeddedInitialPosition,
-  }
 }
 
 function resolveKeymaps(userConfig: AimuxUserConfig): ResolvedKeymapConfig {

package/src/types.ts

@@ -207,21 +207,26 @@ export interface DirectoryResult {
   type: DirectoryResultType
 }
 
-// ─── Sidebar / git panel / modal state (for ModeContext) ──────────────────────
+// ─── Bars / git panel / modal state (for ModeContext) ─────────────────────────
 
-export interface SidebarState {
+export type BarSide = 'left' | 'right'
+
+export interface BarWidget {
+  id: string
+  grow: number
+  visible: boolean
+}
+
+export interface BarState {
   visible: boolean
   width: number
-  minWidth: number
-  maxWidth: number
+  /** Ordered top → bottom. */
+  widgets: BarWidget[]
 }
 
+export type BarsState = Record<BarSide, BarState>
+
 export interface GitPaneState {
-  visible: boolean
-  mode: 'embedded' | 'pane'
-  position: 'top' | 'bottom' | 'left' | 'right'
-  paneRatio: number
-  embeddedRatio: number
   diffModeRatio: number
   fileListMode: GitFileListMode
   treeCompaction: boolean
@@ -536,7 +541,7 @@ export interface AppState {
   sessionBar: SessionBarState
   snippets: SnippetRecord[]
   focusMode: FocusMode
-  sidebar: SidebarState
+  bars: BarsState
   gitPane: GitPaneState
   modal: ModalState
   layout: LayoutState
@@ -695,17 +700,16 @@ export type LayoutAction =
     }
 
 export type UIAction =
-  | { type: 'toggle-sidebar' }
-  | { type: 'resize-sidebar'; delta: number }
-  | { type: 'set-sidebar-width'; width: number }
+  | { type: 'toggle-bar'; side: BarSide }
+  | { type: 'resize-bar'; side: BarSide; delta: number }
+  | { type: 'set-bar-width'; side: BarSide; width: number }
+  | { type: 'toggle-widget'; widgetId: string }
+  | { type: 'move-widget'; widgetId: string; side: BarSide; index: number }
+  | { type: 'set-bar-boundary'; side: BarSide; index: number; ratio: number }
+  | { type: 'resize-widget'; widgetId: string; delta: number }
   | { type: 'set-focus-mode'; focusMode: FocusMode }
   | { type: 'set-terminal-size'; cols: number; rows: number }
-  | { type: 'toggle-git-pane' }
-  | { type: 'resize-git-pane'; delta: number }
-  | { type: 'set-git-pane-ratio'; target: 'pane' | 'embedded'; ratio: number }
   | { type: 'resize-git-diff-pane'; delta: number }
-  | { type: 'set-git-pane-mode'; mode: 'embedded' | 'pane' }
-  | { type: 'set-git-pane-position'; position: 'top' | 'bottom' | 'left' | 'right' }
   | { type: 'set-pending-chords'; chords: string[] | null }
   | { type: 'toggle-session-bar' }
 
@@ -1096,6 +1100,19 @@ export interface AutoRenameConfig {
   enabled: boolean
   timeoutMs: number
   models: Partial<Record<string, string>>
+  /**
+   * Quiet period after a title-worthy prompt before a title is generated.
+   * Prompts submitted inside the window are appended to the same request, so a
+   * "read X" / "now do Y" opening yields one title instead of two.
+   */
+  settleMs: number
+  /** Generation attempts before falling back to a title derived locally from the prompt. */
+  maxAttempts: number
+  /**
+   * Prompts with fewer words than this are treated as menu answers or
+   * confirmations and ignored (they do not consume an attempt).
+   */
+  minPromptWords: number
 }
 
 export interface MultiRepoConfig {
@@ -1260,31 +1277,19 @@ export interface ResolvedConfig {
   sessionBar: {
     initialVisible?: boolean
   }
-  gitPane:
-    | {
-        initialMode?: 'embedded'
-        initialPosition?: 'top' | 'bottom'
-        initialVisible?: boolean
-        initialRatio?: number
-        initialDiffModeRatio?: number
-        initialFileListMode?: GitFileListMode
-        initialTreeCompaction?: boolean
-        path?: GitPanePathConfig
-        diffCount?: GitPaneDiffCountConfig
-        prefetchRadius?: number
-      }
-    | {
-        initialMode: 'pane'
-        initialPosition?: 'left' | 'right'
-        initialVisible?: boolean
-        initialRatio?: number
-        initialDiffModeRatio?: number
-        initialFileListMode?: GitFileListMode
-        initialTreeCompaction?: boolean
-        path?: GitPanePathConfig
-        diffCount?: GitPaneDiffCountConfig
-        prefetchRadius?: number
-      }
+  /**
+   * Placement (`initialMode`/`initialPosition`/`initialRatio`/`initialVisible`)
+   * moved to the bars layout in `aimux.json`; those fields are still accepted
+   * in user config but ignored.
+   */
+  gitPane: {
+    initialDiffModeRatio?: number
+    initialFileListMode?: GitFileListMode
+    initialTreeCompaction?: boolean
+    path?: GitPanePathConfig
+    diffCount?: GitPaneDiffCountConfig
+    prefetchRadius?: number
+  }
   hooks: HooksConfig
   snippets: SnippetDef[]
   snippetTriggerChar: string