@brimveyn/aimux-config 0.4.2 → 0.4.3

package/package.json

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

package/src/actions.ts

@@ -15,22 +15,26 @@ function r(
 export const nextTab: KeyResult = r([{ delta: 1, type: 'move-active-tab' }])
 export const prevTab: KeyResult = r([{ delta: -1, type: 'move-active-tab' }])
 
-export const newTab: KeyResult = r([{ type: 'open-new-tab-modal' }], [], 'modal.new-tab')
+export const newTab: KeyResult = r(
+  [{ type: 'open-new-tab-modal' }],
+  [],
+  'modal.new-tab.command-edit'
+)
 export const renameTab: KeyResult = r([{ type: 'open-rename-tab-modal' }], [], 'modal.rename-tab')
 export const sessionPicker: KeyResult = r(
   [{ type: 'open-session-picker' }],
   [],
-  'modal.session-picker'
+  'modal.session-picker.filtering'
 )
 export const snippetPicker: KeyResult = r(
   [{ type: 'open-snippet-picker' }],
   [],
-  'modal.snippet-picker'
+  'modal.snippet-picker.filtering'
 )
 export const themePicker: KeyResult = r(
   [{ type: 'open-theme-picker' }],
   [{ action: 'open', type: 'apply-theme' }],
-  'modal.theme-picker'
+  'modal.theme-picker.filtering'
 )
 export function helpModal(scope?: ModeId): KeyResult {
   return r([{ scope, type: 'open-help-modal' }])
@@ -160,25 +164,13 @@ export function moveModalSelectionWithPreview(
 
 export const launchSelectedAssistant: KeyResult = r([], [{ type: 'launch-selected-assistant' }])
 
-export const beginCommandEdit: KeyResult = r(
-  [{ type: 'begin-command-edit' }],
-  [],
-  'modal.new-tab.command-edit'
-)
-
 export const cancelCommandEdit = (returnTo: KeyResult['transition']): KeyResult =>
   r([{ type: 'cancel-command-edit' }], [], returnTo)
 
-export const commitCommandEdit: KeyResult = r(
-  [{ type: 'commit-command-edit' }],
-  [{ type: 'save-custom-command' }],
-  'modal.new-tab'
-)
-
 export const confirmSelectedSession: KeyResult = r([], [{ type: 'confirm-selected-session' }])
 
 export const openCreateSessionModal: KeyResult = r(
-  [{ type: 'open-create-session-modal' }],
+  [{ returnToSessionPicker: true, type: 'open-create-session-modal' }],
   [],
   'modal.create-session'
 )
@@ -190,12 +182,6 @@ export const openRenameSelectedSession: KeyResult = r(
 
 export const deleteSelectedSession: KeyResult = r([], [{ type: 'delete-selected-session' }])
 
-export const beginSessionFilter: KeyResult = r(
-  [{ type: 'begin-session-filter' }],
-  [],
-  'modal.session-picker.filtering'
-)
-
 export const openSnippetEditor: KeyResult = r(
   [{ type: 'open-snippet-editor' }],
   [],
@@ -217,24 +203,6 @@ export const pasteSnippetToGroup: KeyResult = r(
   'navigation'
 )
 
-export const beginSnippetFilter: KeyResult = r(
-  [{ type: 'begin-snippet-filter' }],
-  [],
-  'modal.snippet-picker.filtering'
-)
-
-export const beginHelpFilter: KeyResult = r(
-  [{ type: 'begin-help-filter' }],
-  [],
-  'modal.help.filtering'
-)
-
-export const beginThemeFilter: KeyResult = r(
-  [{ type: 'begin-theme-filter' }],
-  [],
-  'modal.theme-picker.filtering'
-)
-
 export const confirmSplit: KeyResult = r([], [{ type: 'confirm-split' }])
 
 export const restoreTheme: KeyResult = r(
@@ -256,19 +224,28 @@ export function previewTheme(delta: 1 | -1): KeyResult {
   )
 }
 
+export const toggleTransparent: KeyResult = r([], [{ type: 'toggle-transparent' }])
+
 export const switchField: KeyResult = r([{ type: 'switch-create-session-field' }])
 export const selectDirectory: KeyResult = r([{ type: 'select-directory' }])
 
 export const backToSessionPicker: KeyResult = r(
   [{ type: 'open-session-picker' }],
   [],
-  'modal.session-picker'
+  'modal.session-picker.filtering'
 )
 
+export const createSessionEscape: ActionFn = (ctx: ModeContext) => {
+  if (ctx.state.modal.type === 'create-session' && !ctx.state.modal.returnToSessionPicker) {
+    return r([{ type: 'close-modal' }], [], 'navigation')
+  }
+  return r([{ type: 'open-session-picker' }], [], 'modal.session-picker.filtering')
+}
+
 export const backToSnippetPicker: KeyResult = r(
   [{ type: 'open-snippet-picker' }],
   [],
-  'modal.snippet-picker'
+  'modal.snippet-picker.filtering'
 )
 
 export const saveSnippetEditor: KeyResult = r(
@@ -277,6 +254,18 @@ export const saveSnippetEditor: KeyResult = r(
   'navigation'
 )
 
+export const saveCustomCommand: KeyResult = r(
+  [],
+  [{ type: 'save-custom-command' }],
+  'modal.new-tab.command-edit'
+)
+
+export const cancelEditCustomCommand: KeyResult = r(
+  [{ type: 'cancel-command-edit' }],
+  [],
+  'modal.new-tab.command-edit'
+)
+
 // ---------------------------------------------------------------------------
 // Update-available modal
 // ---------------------------------------------------------------------------
@@ -329,10 +318,10 @@ export const confirmSessionRename: ActionFn = (ctx: ModeContext) => {
     return r(
       [{ type: 'open-session-picker' }],
       [{ name: trimmed, sessionId, type: 'rename-session' }],
-      'modal.session-picker'
+      'modal.session-picker.filtering'
     )
   }
-  return r([{ type: 'open-session-picker' }], [], 'modal.session-picker')
+  return r([{ type: 'open-session-picker' }], [], 'modal.session-picker.filtering')
 }
 
 // Rename tab modal

package/src/defaults.ts

@@ -111,26 +111,11 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
     )
 
     // -----------------------------------------------------------------------
-    // Modal: help
-    // -----------------------------------------------------------------------
-    .mode('modal.help', (m) =>
-      m
-        .map('<Esc>', actions.closeOverlayModal, 'Close')
-        .map('j', actions.moveModalSelection(1), 'Next')
-        .map('k', actions.moveModalSelection(-1), 'Prev')
-        .map('<Down>', actions.moveModalSelection(1))
-        .map('<Up>', actions.moveModalSelection(-1))
-        .map('<C-n>', actions.moveModalSelection(1))
-        .map('<C-p>', actions.moveModalSelection(-1))
-        .map('/', actions.beginHelpFilter, 'Filter')
-    )
-
-    // -----------------------------------------------------------------------
-    // Modal: help filtering
+    // Modal: help (always in filter mode via Picker)
     // -----------------------------------------------------------------------
     .mode('modal.help.filtering', (m) =>
       m
-        .map('<Esc>', actions.cancelCommandEdit('modal.help'), 'Cancel')
+        .map('<Esc>', actions.closeOverlayModal, 'Close')
         .map('<C-n>', actions.moveModalSelection(1), 'Next')
         .map('<C-p>', actions.moveModalSelection(-1), 'Prev')
         .map('<Down>', actions.moveModalSelection(1))
@@ -139,32 +124,17 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
     )
 
     // -----------------------------------------------------------------------
-    // Modal: theme-picker
-    // -----------------------------------------------------------------------
-    .mode('modal.theme-picker', (m) =>
-      m
-        .map('<Esc>', actions.restoreTheme, 'Cancel')
-        .map('j', actions.previewTheme(1), 'Next')
-        .map('k', actions.previewTheme(-1), 'Prev')
-        .map('<Down>', actions.previewTheme(1))
-        .map('<Up>', actions.previewTheme(-1))
-        .map('<C-n>', actions.previewTheme(1))
-        .map('<C-p>', actions.previewTheme(-1))
-        .map('<CR>', actions.confirmTheme, 'Confirm')
-        .map('/', actions.beginThemeFilter, 'Filter')
-    )
-
-    // -----------------------------------------------------------------------
-    // Modal: theme-picker filtering
+    // Modal: theme-picker (always in filter mode via Picker)
     // -----------------------------------------------------------------------
     .mode('modal.theme-picker.filtering', (m) =>
       m
-        .map('<Esc>', actions.cancelCommandEdit('modal.theme-picker'), 'Cancel')
+        .map('<Esc>', actions.restoreTheme, 'Cancel')
         .map('<C-n>', actions.previewTheme(1), 'Next')
         .map('<C-p>', actions.previewTheme(-1), 'Prev')
         .map('<Down>', actions.previewTheme(1))
         .map('<Up>', actions.previewTheme(-1))
         .map('<CR>', actions.confirmTheme, 'Confirm')
+        .map('<C-t>', actions.toggleTransparent, 'Toggle transparent')
         .passthrough()
     )
 
@@ -176,8 +146,6 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .map('<Esc>', actions.closeModal, 'Cancel')
         .map('l', actions.moveModalSelection(1), 'Next')
         .map('h', actions.moveModalSelection(-1), 'Prev')
-        .map('j', actions.moveModalSelection(1))
-        .map('k', actions.moveModalSelection(-1))
         .map('<Right>', actions.moveModalSelection(1))
         .map('<Left>', actions.moveModalSelection(-1))
         .map('<Down>', actions.moveModalSelection(1))
@@ -198,28 +166,12 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
     )
 
     // -----------------------------------------------------------------------
-    // Modal: new-tab
+    // Modal: new-tab (always in filter mode via Picker)
     // -----------------------------------------------------------------------
-    .mode('modal.new-tab', (m) =>
+    .mode('modal.new-tab.command-edit', (m) =>
       m
         .map('<Esc>', actions.closeModal, 'Cancel')
-        .map('j', actions.moveModalSelection(1), 'Next')
-        .map('k', actions.moveModalSelection(-1), 'Prev')
-        .map('<Down>', actions.moveModalSelection(1))
-        .map('<Up>', actions.moveModalSelection(-1))
-        .map('<C-n>', actions.moveModalSelection(1))
-        .map('<C-p>', actions.moveModalSelection(-1))
         .map('<CR>', actions.launchSelectedAssistant, 'Launch')
-        .map('e', actions.beginCommandEdit, 'Edit command')
-    )
-
-    // -----------------------------------------------------------------------
-    // Modal: new-tab command-edit
-    // -----------------------------------------------------------------------
-    .mode('modal.new-tab.command-edit', (m) =>
-      m
-        .map('<Esc>', actions.cancelCommandEdit('modal.new-tab'), 'Cancel')
-        .map('<CR>', actions.commitCommandEdit, 'Save')
         .map('<C-n>', actions.moveModalSelection(1), 'Next')
         .map('<C-p>', actions.moveModalSelection(-1), 'Prev')
         .map('<Down>', actions.moveModalSelection(1))
@@ -227,31 +179,19 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .passthrough()
     )
 
-    // -----------------------------------------------------------------------
-    // Modal: session-picker
-    // -----------------------------------------------------------------------
-    .mode('modal.session-picker', (m) =>
+    .mode('modal.new-tab.editing-command', (m) =>
       m
-        .map('<Esc>', actions.sessionPickerEscape, 'Cancel')
-        .map('j', actions.moveModalSelection(1), 'Next')
-        .map('k', actions.moveModalSelection(-1), 'Prev')
-        .map('<Down>', actions.moveModalSelection(1))
-        .map('<Up>', actions.moveModalSelection(-1))
-        .map('<C-n>', actions.moveModalSelection(1))
-        .map('<C-p>', actions.moveModalSelection(-1))
-        .map('<CR>', actions.confirmSelectedSession, 'Open')
-        .map('n', actions.openCreateSessionModal, 'New')
-        .map('r', actions.openRenameSelectedSession, 'Rename')
-        .map('d', actions.deleteSelectedSession, 'Delete')
-        .map('/', actions.beginSessionFilter, 'Filter')
+        .map('<Esc>', actions.cancelEditCustomCommand, 'Cancel')
+        .map('<CR>', actions.saveCustomCommand, 'Save')
+        .passthrough()
     )
 
     // -----------------------------------------------------------------------
-    // Modal: session-picker filtering
+    // Modal: session-picker (always in filter mode via Picker)
     // -----------------------------------------------------------------------
     .mode('modal.session-picker.filtering', (m) =>
       m
-        .map('<Esc>', actions.cancelCommandEdit('modal.session-picker'), 'Cancel')
+        .map('<Esc>', actions.sessionPickerEscape, 'Cancel')
         .map('<CR>', actions.confirmSelectedSession, 'Open')
         .map('<C-n>', actions.moveModalSelection(1), 'Next')
         .map('<C-p>', actions.moveModalSelection(-1), 'Prev')
@@ -275,7 +215,7 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
     // -----------------------------------------------------------------------
     .mode('modal.create-session', (m) =>
       m
-        .map('<Esc>', actions.backToSessionPicker, 'Cancel')
+        .map('<Esc>', actions.createSessionEscape, 'Cancel')
         .map('<Tab>', actions.switchField, 'Next field')
         .map('<CR>', actions.confirmCreateSession, 'Confirm')
         .map('<C-n>', actions.moveModalSelection(1), 'Next')
@@ -286,32 +226,11 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
     )
 
     // -----------------------------------------------------------------------
-    // Modal: snippet-picker
-    // -----------------------------------------------------------------------
-    .mode('modal.snippet-picker', (m) =>
-      m
-        .map('<Esc>', actions.closeModal, 'Cancel')
-        .map('j', actions.moveModalSelection(1), 'Next')
-        .map('k', actions.moveModalSelection(-1), 'Prev')
-        .map('<Down>', actions.moveModalSelection(1))
-        .map('<Up>', actions.moveModalSelection(-1))
-        .map('<C-n>', actions.moveModalSelection(1))
-        .map('<C-p>', actions.moveModalSelection(-1))
-        .map('<CR>', actions.pasteSelectedSnippet, 'Send')
-        .map('a', actions.pasteSnippetToGroup, 'Send to group')
-        .map('n', actions.openSnippetEditor, 'New')
-        .map('r', actions.editSelectedSnippet, 'Edit')
-        .map('e', actions.editSelectedSnippet)
-        .map('d', actions.deleteSelectedSnippet, 'Delete')
-        .map('/', actions.beginSnippetFilter, 'Filter')
-    )
-
-    // -----------------------------------------------------------------------
-    // Modal: snippet-picker filtering
+    // Modal: snippet-picker (always in filter mode via Picker)
     // -----------------------------------------------------------------------
     .mode('modal.snippet-picker.filtering', (m) =>
       m
-        .map('<Esc>', actions.cancelCommandEdit('modal.snippet-picker'), 'Cancel')
+        .map('<Esc>', actions.closeModal, 'Cancel')
         .map('<CR>', actions.snippetFilterPaste, 'Send')
         .map('<C-a>', actions.snippetFilterPasteToGroup, 'Send to group')
         .map('<C-n>', actions.moveModalSelection(1), 'Next')
@@ -342,10 +261,8 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
     .mode('modal.split-picker', (m) =>
       m
         .map('<Esc>', actions.closeModal, 'Cancel')
-        .map('j', actions.moveModalSelection(1), 'Next')
-        .map('k', actions.moveModalSelection(-1), 'Prev')
-        .map('<Down>', actions.moveModalSelection(1))
-        .map('<Up>', actions.moveModalSelection(-1))
+        .map('<Down>', actions.moveModalSelection(1), 'Next')
+        .map('<Up>', actions.moveModalSelection(-1), 'Prev')
         .map('<C-n>', actions.moveModalSelection(1))
         .map('<C-p>', actions.moveModalSelection(-1))
         .map('<CR>', actions.confirmSplit, 'Confirm')

package/src/types.ts

@@ -12,19 +12,15 @@ export type ModeId =
   | 'navigation'
   | 'terminal-input'
   | 'git-mode'
-  | 'modal.new-tab'
   | 'modal.new-tab.command-edit'
-  | 'modal.session-picker'
+  | 'modal.new-tab.editing-command'
   | 'modal.session-picker.filtering'
   | 'modal.session-name'
   | 'modal.create-session'
   | 'modal.rename-tab'
-  | 'modal.snippet-picker'
   | 'modal.snippet-picker.filtering'
   | 'modal.snippet-editor'
-  | 'modal.theme-picker'
   | 'modal.theme-picker.filtering'
-  | 'modal.help'
   | 'modal.help.filtering'
   | 'modal.split-picker'
   | 'modal.git-commit'
@@ -34,8 +30,18 @@ export type ModeId =
 
 export type BuiltinAssistantId = 'claude' | 'codex' | 'opencode' | 'terminal'
 export type AssistantId = BuiltinAssistantId | (string & {})
-export type TabStatus = 'starting' | 'running' | 'disconnected' | 'exited' | 'error'
-export type TabActivity = 'busy' | 'idle'
+export type TabStatus = 'starting' | 'running' | 'disconnected' | 'error'
+
+/**
+ * Status values that may appear in legacy on-disk workspace snapshots but are
+ * not produced by the running app anymore.
+ */
+export type LegacyPersistedTabStatus = TabStatus | 'exited'
+export type TabActivity = 'working' | 'waiting-input' | 'idle'
+export interface SessionStatus {
+  working: boolean
+  waiting: boolean
+}
 export type FocusMode = 'navigation' | 'terminal-input' | 'modal' | 'command-edit' | 'git'
 export type SplitDirection = 'horizontal' | 'vertical'
 
@@ -89,7 +95,7 @@ export interface PersistedTabSnapshot {
   assistant: AssistantId
   title: string
   command: string
-  status: Exclude<TabStatus, 'disconnected'>
+  status: Exclude<LegacyPersistedTabStatus, 'disconnected'>
   buffer: string
   viewport?: TerminalSnapshot
   terminalModes: TerminalModeState
@@ -244,6 +250,7 @@ export interface ModalClosed extends ModalBase {
 
 export interface ModalNewTab extends ModalBase {
   type: 'new-tab'
+  editingCommand: AssistantId | null
 }
 export interface ModalSessionPicker extends ModalBase {
   type: 'session-picker'
@@ -276,6 +283,7 @@ export interface ModalCreateSession extends ModalBase {
   pendingProjectPath: string | null
   activeField: 'directory' | 'name'
   nameBuffer: string
+  returnToSessionPicker: boolean
 }
 export interface ModalGitCommit extends ModalBase {
   type: 'git-commit'
@@ -328,7 +336,7 @@ export interface AppState {
   tabGroupMap: Record<string, string>
   sessions: SessionRecord[]
   currentSessionId: string | null
-  sessionsBusy: Record<string, boolean>
+  sessionStatuses: Record<string, SessionStatus>
   sessionBar: SessionBarState
   snippets: SnippetRecord[]
   focusMode: FocusMode
@@ -352,21 +360,15 @@ export type ModalAction =
   | { type: 'open-session-name-modal'; sessionTargetId?: string; initialName?: string }
   | { type: 'close-modal' }
   | { type: 'move-modal-selection'; delta: number }
-  | { type: 'begin-command-edit' }
   | { type: 'update-command-edit'; char: string }
-  | { type: 'commit-command-edit' }
   | { type: 'cancel-command-edit' }
-  | { type: 'open-create-session-modal' }
+  | { type: 'open-create-session-modal'; returnToSessionPicker: boolean }
   | { type: 'set-directory-results'; results: DirectoryResult[] }
   | { type: 'switch-create-session-field' }
   | { type: 'select-directory' }
-  | { type: 'begin-session-filter' }
   | { type: 'open-rename-tab-modal' }
   | { type: 'open-snippet-picker' }
   | { type: 'open-snippet-editor'; snippetId?: string }
-  | { type: 'begin-snippet-filter' }
-  | { type: 'begin-help-filter' }
-  | { type: 'begin-theme-filter' }
   | { type: 'set-help-entry-count'; count: number }
   | { type: 'set-theme-entry-count'; count: number }
   | { type: 'open-theme-picker' }
@@ -379,7 +381,7 @@ export type SessionAction =
   | { 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 }
+  | { type: 'set-session-status'; sessionId: string; status: SessionStatus }
 
 export type TabAction =
   | { type: 'add-tab'; tab: TabSession }
@@ -406,7 +408,6 @@ export type TabAction =
       terminalModes: TerminalModeState
     }
   | { type: 'set-tab-activity'; tabId: string; activity?: TabActivity }
-  | { type: 'set-tab-status'; tabId: string; status: TabStatus; exitCode?: number }
   | { type: 'set-tab-error'; tabId: string; message: string }
 
 export type LayoutAction =
@@ -545,6 +546,7 @@ export type SideEffect =
   | { type: 'git-push' }
   | { type: 'confirm-update-selection' }
   | { type: 'switch-session-by-index'; index: number }
+  | { type: 'toggle-transparent' }
 
 // ─── Key input / KeyResult / ModeContext ──────────────────────────────────────