@brimveyn/aimux-config 0.6.2 → 0.6.4

package/package.json

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

package/src/actions.ts

@@ -68,6 +68,13 @@ export function switchSessionByIndex(index: number): KeyResult {
   return r([], [{ index, type: 'switch-session-by-index' }])
 }
 
+export function switchTabByIndex(index: number): KeyResult {
+  return r([], [{ index, type: 'switch-tab-by-index' }])
+}
+
+export const nextSidebarItem: KeyResult = r([], [{ direction: 1, type: 'cycle-sidebar-item' }])
+export const prevSidebarItem: KeyResult = r([], [{ direction: -1, type: 'cycle-sidebar-item' }])
+
 export const splitVertical: KeyResult = r(
   [{ direction: 'vertical', type: 'open-split-picker' }],
   [],
@@ -122,6 +129,10 @@ export function reorderTab(delta: number): KeyResult {
   return r([{ delta, type: 'reorder-active-tab' }])
 }
 
+export function reorderSession(delta: number): KeyResult {
+  return r([{ delta, type: 'reorder-active-session' }])
+}
+
 export function resizeSidebar(delta: number): KeyResult {
   return r([{ delta, type: 'resize-sidebar' }])
 }

package/src/defaults.ts

@@ -45,10 +45,14 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .map('<C-d>', actions.enterGitMode, 'Enter git mode')
         .map('<C-j>', actions.resizeGitPane(-0.05), 'Git pane smaller')
         .map('<C-k>', actions.resizeGitPane(0.05), 'Git pane larger')
-        .map('J', actions.reorderTab(1), 'Move tab right')
-        .map('j', actions.nextTab, 'Next tab')
-        .map('K', actions.reorderTab(-1), 'Move tab left')
-        .map('k', actions.prevTab, 'Prev tab')
+        .map('j', actions.nextSidebarItem, 'Next workspace/worktree')
+        .map('k', actions.prevSidebarItem, 'Prev workspace/worktree')
+        .map('l', actions.nextTab, 'Next tab')
+        .map('h', actions.prevTab, 'Prev tab')
+        .map('L', actions.reorderTab(1), 'Move tab right')
+        .map('H', actions.reorderTab(-1), 'Move tab left')
+        .map('J', actions.reorderSession(1), 'Move workspace down')
+        .map('K', actions.reorderSession(-1), 'Move workspace up')
         .map('r', actions.renameTab, 'Rename tab')
         .map('i', actions.enterInsert, 'Focus terminal')
         .map('?', actions.helpModal(), 'Help')
@@ -81,15 +85,15 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
       m
         .map('<Leader>b', actions.toggleSessionBar, 'Toggle session bar')
         .map('<Leader>u', actions.toggleAIUsage, 'Toggle AI usage')
-        .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')
+        .map('<Leader>1', actions.switchTabByIndex(1), 'Tab 1')
+        .map('<Leader>2', actions.switchTabByIndex(2), 'Tab 2')
+        .map('<Leader>3', actions.switchTabByIndex(3), 'Tab 3')
+        .map('<Leader>4', actions.switchTabByIndex(4), 'Tab 4')
+        .map('<Leader>5', actions.switchTabByIndex(5), 'Tab 5')
+        .map('<Leader>6', actions.switchTabByIndex(6), 'Tab 6')
+        .map('<Leader>7', actions.switchTabByIndex(7), 'Tab 7')
+        .map('<Leader>8', actions.switchTabByIndex(8), 'Tab 8')
+        .map('<Leader>9', actions.switchTabByIndex(9), 'Tab 9')
     )
 
     // -----------------------------------------------------------------------

package/src/resolver.ts

@@ -73,7 +73,6 @@ function resolveSessionBar(
 ): ResolvedConfig['sessionBar'] {
   if (!userConfig) return {}
   return {
-    initialPosition: userConfig.initialPosition ?? userConfig.position,
     initialVisible: userConfig.initialVisible ?? userConfig.visible,
   }
 }

package/src/types.ts

@@ -388,11 +388,8 @@ export interface LayoutState {
   terminalRows: number
 }
 
-export type SessionBarPosition = 'top' | 'bottom'
-
 export interface SessionBarState {
   visible: boolean
-  position: SessionBarPosition
 }
 
 export type AutoCommitSuggestion =
@@ -502,6 +499,7 @@ export type SessionAction =
   | { type: 'rename-session-record'; sessionId: string; name: string }
   | { type: 'delete-session-record'; sessionId: string; openSessionPicker?: boolean }
   | { type: 'reorder-sessions'; orderedIds: string[] }
+  | { type: 'reorder-active-session'; delta: number }
   | { type: 'set-session-status'; sessionId: string; status: SessionStatus }
   | { type: 'add-worktree-record'; sessionId: string; worktree: WorktreeRecord; activate?: boolean }
   | { type: 'remove-worktree-record'; sessionId: string; worktreeId: string }
@@ -578,7 +576,6 @@ export type UIAction =
   | { type: 'set-git-pane-position'; position: 'top' | 'bottom' | 'left' | 'right' }
   | { type: 'set-pending-chords'; chords: string[] | null }
   | { type: 'toggle-session-bar' }
-  | { type: 'set-session-bar-position'; position: SessionBarPosition }
 
 export interface GitRefreshPayload {
   branch: string | null
@@ -717,6 +714,8 @@ export type SideEffect =
   | { type: 'git-push' }
   | { type: 'confirm-update-selection' }
   | { type: 'switch-session-by-index'; index: number }
+  | { type: 'cycle-sidebar-item'; direction: 1 | -1 }
+  | { type: 'switch-tab-by-index'; index: number }
   | { type: 'delete-session'; sessionId: string }
   | { type: 'delete-worktree'; sessionId: string; worktreeId: string; force?: boolean }
   | {
@@ -857,12 +856,8 @@ export interface KeymapBuilderApi {
 export interface SessionBarConfig {
   /** Startup override for the session bar visibility. Reapplied on each launch. */
   initialVisible?: boolean
-  /** Startup override for the session bar position. Reapplied on each launch. */
-  initialPosition?: SessionBarPosition
   /** @deprecated Use `initialVisible` instead. */
   visible?: boolean
-  /** @deprecated Use `initialPosition` instead. */
-  position?: SessionBarPosition
 }
 
 // ─── Git pane config (discriminated union) ────────────────────────────────────
@@ -1055,7 +1050,6 @@ export interface ResolvedConfig {
   sidebar: SidebarConfig
   sessionBar: {
     initialVisible?: boolean
-    initialPosition?: SessionBarPosition
   }
   gitPane:
     | {