@brimveyn/aimux-config 0.2.6 → 0.3.1

package/README.md

@@ -77,7 +77,13 @@ defineConfig({
 ```ts
 k.leader(keys) // default: '<Space>'
   .timeout(ms) // default: 300
-  .mode(id, configure) // define bindings for a mode
+  .mode(id | ids[], configure) // define bindings for a mode (or several at once)
+```
+
+Pass an array of `ModeId`s to register the same bindings in every listed mode — handy for actions that should fire in both `navigation` and `terminal-input`, for example:
+
+```ts
+k.mode(['navigation', 'terminal-input'], (m) => m.map('<C-s>', actions.snippetPicker))
 ```
 
 ### Mode builder

package/package.json

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

package/src/actions.ts

@@ -36,8 +36,13 @@ export const helpModal: KeyResult = r([{ type: 'open-help-modal' }], [], 'modal.
 
 export const toggleSidebar: KeyResult = r([{ type: 'toggle-sidebar' }])
 export const toggleGitPanel: KeyResult = r([{ type: 'toggle-git-panel' }])
+export const toggleSessionBar: KeyResult = r([{ type: 'toggle-session-bar' }])
 export const enterGitMode: KeyResult = r([{ type: 'enter-git-mode' }], [], 'git-mode')
 
+export function switchSessionByIndex(index: number): KeyResult {
+  return r([], [{ index, type: 'switch-session-by-index' }])
+}
+
 export const splitVertical: KeyResult = r(
   [{ direction: 'vertical', type: 'open-split-picker' }],
   [],

package/src/defaults.ts

@@ -50,6 +50,23 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .map('<C-b>', actions.toggleSidebarFromInput, 'Toggle sidebar')
     )
 
+    // -----------------------------------------------------------------------
+    // Session bar: same chords from nav and while typing in the terminal
+    // -----------------------------------------------------------------------
+    .mode(['navigation', 'terminal-input'], (m) =>
+      m
+        .map('<Leader>b', actions.toggleSessionBar, 'Toggle session bar')
+        .map('<Leader>1', actions.switchSessionByIndex(1), 'Session 1')
+        .map('<Leader>2', actions.switchSessionByIndex(2), 'Session 2')
+        .map('<Leader>3', actions.switchSessionByIndex(3), 'Session 3')
+        .map('<Leader>4', actions.switchSessionByIndex(4), 'Session 4')
+        .map('<Leader>5', actions.switchSessionByIndex(5), 'Session 5')
+        .map('<Leader>6', actions.switchSessionByIndex(6), 'Session 6')
+        .map('<Leader>7', actions.switchSessionByIndex(7), 'Session 7')
+        .map('<Leader>8', actions.switchSessionByIndex(8), 'Session 8')
+        .map('<Leader>9', actions.switchSessionByIndex(9), 'Session 9')
+    )
+
     // -----------------------------------------------------------------------
     // Layout mode
     // -----------------------------------------------------------------------

package/src/keymap-builder.ts

@@ -99,10 +99,36 @@ export class KeymapBuilder implements KeymapBuilderApi {
     return this
   }
 
-  mode(id: ModeId, configure: (m: ModeBindingBuilderApi) => ModeBindingBuilderApi): this {
+  mode(
+    id: ModeId | readonly ModeId[],
+    configure: (m: ModeBindingBuilderApi) => ModeBindingBuilderApi
+  ): this {
     const builder = new ModeBindingBuilder()
     configure(builder)
-    this.modes.set(id, builder._build())
+    const incoming = builder._build()
+    const ids = Array.isArray(id) ? id : [id]
+    for (const modeId of ids) {
+      const existing = this.modes.get(modeId)
+      if (!existing) {
+        // Fresh mode: clone so later merges don't mutate a shared array.
+        this.modes.set(modeId, {
+          bindings: [...incoming.bindings],
+          isPassthrough: incoming.isPassthrough,
+          removals: [...incoming.removals],
+        })
+        continue
+      }
+      // Merge: later bindings win over earlier ones sharing the same keys.
+      const incomingKeys = new Set(incoming.bindings.map((b) => b.keys))
+      this.modes.set(modeId, {
+        bindings: [
+          ...existing.bindings.filter((b) => !incomingKeys.has(b.keys)),
+          ...incoming.bindings,
+        ],
+        isPassthrough: existing.isPassthrough || incoming.isPassthrough,
+        removals: [...existing.removals, ...incoming.removals],
+      })
+    }
     return this
   }
 

package/src/resolver.ts

@@ -20,6 +20,7 @@ export function resolveConfig(userConfig: AimuxUserConfig): ResolvedConfig {
     backends: userConfig.backends ?? {},
     hooks: userConfig.hooks ?? {},
     keymaps,
+    sessionBar: userConfig.sessionBar ?? {},
     sidebar: userConfig.sidebar ?? {},
     snippets: userConfig.snippets ?? [],
     theme: userConfig.theme,

package/src/types.ts

@@ -125,6 +125,7 @@ export interface SessionRecord {
   createdAt: string
   updatedAt: string
   lastOpenedAt: string
+  order?: number
   workspaceSnapshot?: WorkspaceSnapshotV1
 }
 
@@ -290,6 +291,13 @@ export interface LayoutState {
   terminalRows: number
 }
 
+export type SessionBarPosition = 'top' | 'bottom'
+
+export interface SessionBarState {
+  visible: boolean
+  position: SessionBarPosition
+}
+
 export interface AppState {
   tabs: TabSession[]
   activeTabId: string | null
@@ -297,6 +305,8 @@ export interface AppState {
   tabGroupMap: Record<string, string>
   sessions: SessionRecord[]
   currentSessionId: string | null
+  sessionsBusy: Record<string, boolean>
+  sessionBar: SessionBarState
   snippets: SnippetRecord[]
   focusMode: FocusMode
   sidebar: SidebarState
@@ -340,6 +350,8 @@ export type SessionAction =
   | { type: 'create-session-record'; session: SessionRecord }
   | { type: 'rename-session-record'; sessionId: string; name: string }
   | { type: 'delete-session-record'; sessionId: string }
+  | { type: 'reorder-sessions'; orderedIds: string[] }
+  | { type: 'set-session-busy'; sessionId: string; busy: boolean }
 
 export type TabAction =
   | { type: 'add-tab'; tab: TabSession }
@@ -401,6 +413,8 @@ export type UIAction =
   | { type: 'toggle-git-panel' }
   | { type: 'resize-git-panel'; delta: number }
   | { type: 'set-pending-chords'; chords: string[] | null }
+  | { type: 'toggle-session-bar' }
+  | { type: 'set-session-bar-position'; position: SessionBarPosition }
 
 export interface GitRefreshPayload {
   branch: string | null
@@ -477,6 +491,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 }
 
 // ─── Key input / KeyResult / ModeContext ──────────────────────────────────────
 
@@ -595,16 +610,25 @@ export interface ModeBindingBuilderApi {
 export interface KeymapBuilderApi {
   leader(key: string): KeymapBuilderApi
   timeout(ms: number): KeymapBuilderApi
-  mode(id: ModeId, configure: (m: ModeBindingBuilderApi) => ModeBindingBuilderApi): KeymapBuilderApi
+  mode(
+    id: ModeId | readonly ModeId[],
+    configure: (m: ModeBindingBuilderApi) => ModeBindingBuilderApi
+  ): KeymapBuilderApi
 }
 
 // ─── Top-level user config ────────────────────────────────────────────────────
 
+export interface SessionBarConfig {
+  visible?: boolean
+  position?: SessionBarPosition
+}
+
 export interface AimuxUserConfig {
   theme?: ThemeId | ThemeDefinition
   keymaps?: (k: KeymapBuilderApi) => KeymapBuilderApi
   backends?: Record<string, BackendConfig>
   sidebar?: SidebarConfig
+  sessionBar?: SessionBarConfig
   hooks?: HooksConfig
   snippets?: SnippetDef[]
 }
@@ -635,6 +659,7 @@ export interface ResolvedConfig {
   keymaps: ResolvedKeymapConfig
   backends: Record<string, BackendConfig>
   sidebar: SidebarConfig
+  sessionBar: SessionBarConfig
   hooks: HooksConfig
   snippets: SnippetDef[]
 }