@brimveyn/aimux-config 0.10.2 → 0.10.5

package/package.json

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

package/src/actions.ts

@@ -105,7 +105,13 @@ export const closeModal: KeyResult = r([{ type: 'close-modal' }], [], 'navigatio
 
 export const closeOverlayModal: KeyResult = r([{ type: 'close-modal' }])
 
-export const cancelNewTabModal: KeyResult = r([{ type: 'cancel-command-edit' }])
+/**
+ * The picker has no separate filter mode to fall back to, so `cancel-command-edit`
+ * would only drop focus to `modal` — a focusMode the new-tab modal has no handler
+ * for, leaving it on screen and deaf to every key. Esc closes it, like every other
+ * picker. (Esc while editing a custom command is `cancelEditCustomCommand`.)
+ */
+export const cancelNewTabModal: KeyResult = closeModal
 
 // ---------------------------------------------------------------------------
 // Dynamic actions (need ctx at runtime — ActionFn)
@@ -244,14 +250,11 @@ export const createWorkspaceModal: KeyResult = r(
 export const switchCreateWorkspaceField: KeyResult = r([{ type: 'switch-create-workspace-field' }])
 
 /**
- * An empty prompt is not a workspace: it names nothing, branches nothing and
- * gives the assistant nothing to do, so Enter is simply inert until it is typed.
+ * The prompt is optional: left empty, the workspace still gets cut and the
+ * assistant still launches — it is simply handed nothing, and the workspace
+ * keeps its `wt-<project>` placeholder name.
  */
-export const confirmCreateWorkspace: ActionFn = (ctx: ModeContext) => {
-  const { modal } = ctx.state
-  if (modal.type === 'create-workspace' && modal.prompt.trim() === '') return r([])
-  return r([], [{ type: 'create-workspace' }])
-}
+export const confirmCreateWorkspace: KeyResult = r([], [{ type: 'create-workspace' }])
 
 /**
  * `Enter` creates, so the prompt needs another way to break a line. Inverted
@@ -970,23 +973,21 @@ export function scrollStats(delta: number): KeyResult {
   return r([{ delta, type: 'stats-scroll' }])
 }
 
-export function focusSettingsPane(pane: 'nav' | 'rows'): KeyResult {
-  return r([{ pane, type: 'settings-focus-pane' }])
-}
-
 export function moveSettingsSelection(delta: -1 | 1): KeyResult {
   return r([{ delta, type: 'settings-move-selection' }])
 }
 
+/** To the first row of the next section, the way `}` moves by paragraph. */
+export function jumpSettingsSection(delta: -1 | 1): KeyResult {
+  return r([{ delta, type: 'settings-jump-section' }])
+}
+
 /**
  * One key for every kind of row: it toggles a checkbox, advances an enum, or runs
  * whatever the row does. Which one is the row's business, not the keymap's — so
  * there is no per-kind binding to keep in sync with the schema.
  */
-export const activateSettingsRow: ActionFn = (ctx: ModeContext) => {
-  if (ctx.state.settings.pane !== 'rows') return r([{ pane: 'rows', type: 'settings-focus-pane' }])
-  return r([], [{ type: 'activate-settings-row' }])
-}
+export const activateSettingsRow: KeyResult = r([], [{ type: 'activate-settings-row' }])
 
 export function adjustSettingsRow(delta: 1 | -1): KeyResult {
   return r([], [{ delta, type: 'adjust-settings-row' }])

package/src/defaults.ts

@@ -159,19 +159,21 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
     // -----------------------------------------------------------------------
     // Settings screen
     //
-    // `h`/`l` always mean "change column", never "change value": a number row
-    // would otherwise make them ambiguous. Values move on <Space>/<CR> (toggle,
-    // next option) and on -/+ (step a number).
+    // One list, sections included, so every key here moves a single cursor:
+    // `j`/`k` a row, `}`/`{` a section, `/` searches the same list from a
+    // picker.
+    //
+    // The two axes are the whole grammar: across a row changes its value —
+    // `h`/`l`, the arrows and -/+ all drag the gauge, step the enum, set the
+    // checkbox — and <CR> hands over to a field for the value you would rather
+    // type than aim at. Nothing here is a column any more, which is what freed
+    // `h`/`l` to mean what they read like.
     // -----------------------------------------------------------------------
     .mode('settings', (m) =>
       m
         .map('<Esc>', actions.exitSettings, 'Close settings')
         .map('<Leader>,', actions.exitSettings, 'Close settings')
-        .map('h', actions.focusSettingsPane('nav'), 'Sections')
-        .map('<Left>', actions.focusSettingsPane('nav'))
-        .map('l', actions.activateSettingsRow, 'Settings of the section')
-        .map('<Right>', actions.activateSettingsRow)
-        .map('<CR>', actions.activateSettingsRow, 'Change')
+        .map('<CR>', actions.activateSettingsRow, 'Change, or type a value')
         .map('<Space>', actions.activateSettingsRow, 'Change')
         .map('j', actions.moveSettingsSelection(1), 'Next', { repeatable: true })
         .map('k', actions.moveSettingsSelection(-1), 'Prev', { repeatable: true })
@@ -179,8 +181,14 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .map('<Up>', actions.moveSettingsSelection(-1), undefined, { repeatable: true })
         .map('<C-n>', actions.moveSettingsSelection(1))
         .map('<C-p>', actions.moveSettingsSelection(-1))
-        .map('+', actions.adjustSettingsRow(1), 'Increase', { repeatable: true })
-        .map('-', actions.adjustSettingsRow(-1), 'Decrease', { repeatable: true })
+        .map('}', actions.jumpSettingsSection(1), 'Next section', { repeatable: true })
+        .map('{', actions.jumpSettingsSection(-1), 'Prev section', { repeatable: true })
+        .map('l', actions.adjustSettingsRow(1), 'Increase', { repeatable: true })
+        .map('<Right>', actions.adjustSettingsRow(1), undefined, { repeatable: true })
+        .map('+', actions.adjustSettingsRow(1), undefined, { repeatable: true })
+        .map('h', actions.adjustSettingsRow(-1), 'Decrease', { repeatable: true })
+        .map('<Left>', actions.adjustSettingsRow(-1), undefined, { repeatable: true })
+        .map('-', actions.adjustSettingsRow(-1), undefined, { repeatable: true })
         .map('r', actions.resetSettingsRow, 'Reset to default')
         .map('/', actions.openSettingsSearch, 'Search settings')
         .map('?', actions.helpModal('settings'), 'Help')

package/src/types.ts

@@ -582,8 +582,6 @@ export interface MultiRepoState {
 
 /** Where the cursor is in the settings screen — the cursor only, not the values. */
 export interface SettingsUIState {
-  sectionId: string
-  pane: 'nav' | 'rows'
   rowIndex: number
 }
 
@@ -785,9 +783,8 @@ export type UIAction =
 export type SettingsAction =
   | { type: 'enter-settings' }
   | { type: 'exit-settings' }
-  | { type: 'settings-focus-pane'; pane: 'nav' | 'rows' }
   | { type: 'settings-move-selection'; delta: -1 | 1 }
-  | { type: 'settings-select-section'; sectionId: string }
+  | { type: 'settings-jump-section'; delta: -1 | 1 }
   | { type: 'settings-select-row'; rowIndex: number }
   | { type: 'open-settings-search' }
   | { type: 'open-setting-text-modal'; settingId: string; label: string; value: string }