@brimveyn/aimux-config 0.10.1 → 0.10.3

package/package.json

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

package/src/actions.ts

@@ -61,11 +61,15 @@ export function toggleWidget(widgetId: string): KeyResult {
 }
 export const toggleGitPane: KeyResult = toggleWidget('git')
 export const toggleProjectBar: KeyResult = r([{ type: 'toggle-project-bar' }])
-export const toggleAIUsage: ActionFn = (ctx: ModeContext) => {
-  if (ctx.state.modal.type === 'ai-usage') {
-    return r([{ type: 'close-modal' }], [], 'navigation')
+/**
+ * The stats screen, which replaced the AI-usage popover: the quota windows it
+ * showed are now its first page.
+ */
+export const toggleStats: ActionFn = (ctx: ModeContext) => {
+  if (ctx.state.focusMode === 'stats') {
+    return r([{ type: 'exit-stats' }], [], 'navigation')
   }
-  return r([{ type: 'open-ai-usage-modal' }], [], 'modal.ai-usage')
+  return r([{ type: 'enter-stats' }], [], 'stats')
 }
 
 export const enterGitMode: KeyResult = r([{ type: 'enter-git-mode' }], [], 'git-mode')
@@ -951,23 +955,36 @@ export const gitCommitReturnKey: ActionFn = (ctx: ModeContext) => {
 export const enterSettings: KeyResult = r([{ type: 'enter-settings' }], [], 'settings')
 export const exitSettings: KeyResult = r([{ type: 'exit-settings' }], [], 'navigation')
 
-export function focusSettingsPane(pane: 'nav' | 'rows'): KeyResult {
-  return r([{ pane, type: 'settings-focus-pane' }])
+// ---------------------------------------------------------------------------
+// Stats screen
+// ---------------------------------------------------------------------------
+
+export const enterStats: KeyResult = r([{ type: 'enter-stats' }], [], 'stats')
+export const exitStats: KeyResult = r([{ type: 'exit-stats' }], [], 'navigation')
+
+export function moveStatsPage(delta: -1 | 1): KeyResult {
+  return r([{ delta, type: 'stats-move-page' }])
+}
+
+export function scrollStats(delta: number): KeyResult {
+  return r([{ delta, type: 'stats-scroll' }])
 }
 
 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

@@ -104,7 +104,7 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
       m
         .map('<Leader>b', actions.toggleProjectBar, 'Toggle project bar')
         .map('<Leader>B', actions.toggleBar('right'), 'Toggle right bar')
-        .map('<Leader>u', actions.toggleAIUsage, 'Toggle AI usage')
+        .map('<Leader>u', actions.toggleStats, 'Stats')
         .map('<Leader>,', actions.enterSettings, 'Settings')
         .map('<Leader>1', actions.switchTabByIndex(1), 'Tab 1')
         .map('<Leader>2', actions.switchTabByIndex(2), 'Tab 2')
@@ -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')
@@ -216,18 +224,33 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
     )
 
     // -----------------------------------------------------------------------
-    // Modal: ai-usage (info-only)
+    // Stats screen (read-only)
+    //
+    // `h`/`l` change page and `j`/`k` scroll it — the same split the settings
+    // screen uses, where the horizontal pair never touches content.
     // -----------------------------------------------------------------------
-    .mode('modal.ai-usage', (m) =>
+    .mode('stats', (m) =>
       m
-        .map('<Esc>', actions.closeModal, 'Close')
-        .map('<Leader>u', actions.toggleAIUsage, 'Close')
-        .map('l', actions.moveModalSelection(1), 'Next page')
-        .map('h', actions.moveModalSelection(-1), 'Prev page')
-        .map('<Right>', actions.moveModalSelection(1))
-        .map('<Left>', actions.moveModalSelection(-1))
+        .map('<Esc>', actions.exitStats, 'Close stats')
+        .map('<Leader>u', actions.exitStats, 'Close stats')
+        .map('l', actions.moveStatsPage(1), 'Next page')
+        .map('h', actions.moveStatsPage(-1), 'Prev page')
+        .map('<Right>', actions.moveStatsPage(1))
+        .map('<Left>', actions.moveStatsPage(-1))
+        .map('j', actions.scrollStats(1), 'Scroll down', { repeatable: true })
+        .map('k', actions.scrollStats(-1), 'Scroll up', { repeatable: true })
+        .map('<Down>', actions.scrollStats(1), undefined, { repeatable: true })
+        .map('<Up>', actions.scrollStats(-1), undefined, { repeatable: true })
+        .map('<C-d>', actions.scrollStats(10), 'Page down')
+        .map('<C-u>', actions.scrollStats(-10), 'Page up')
+        .map('?', actions.helpModal('stats'), 'Help')
     )
 
+    // -----------------------------------------------------------------------
+    // Modal: quotas (read-only — the status bar indicator, expanded)
+    // -----------------------------------------------------------------------
+    .mode('modal.quotas', (m) => m.map('<Esc>', actions.closeModal, 'Close'))
+
     // -----------------------------------------------------------------------
     // Modal: update-available
     // -----------------------------------------------------------------------

package/src/types.ts

@@ -34,9 +34,10 @@ export type ModeId =
   | 'modal.update-available'
   | 'modal.workspace-move'
   | 'modal.workspace-move-confirm'
-  | 'modal.ai-usage'
   | 'modal.flash-jump'
+  | 'modal.quotas'
   | 'settings'
+  | 'stats'
 
 // ─── Primitive app types ──────────────────────────────────────────────────────
 
@@ -73,6 +74,7 @@ export type FocusMode =
   | 'command-edit'
   | 'git'
   | 'settings'
+  | 'stats'
 export type SplitDirection = 'horizontal' | 'vertical'
 
 // ─── Terminal data shapes ─────────────────────────────────────────────────────
@@ -441,8 +443,9 @@ export interface ModalUpdateAvailable extends ModalBase {
   latestVersion: string
 }
 
-export interface ModalAIUsage extends ModalBase {
-  type: 'ai-usage'
+/** The status bar's usage indicator, expanded. Carries nothing: it is a readout. */
+export interface ModalQuotas extends ModalBase {
+  type: 'quotas'
 }
 
 export interface ModalWorkspaceMove extends ModalBase {
@@ -527,7 +530,7 @@ export type ModalState =
   | ModalSnippetEditor
   | ModalGitCommit
   | ModalUpdateAvailable
-  | ModalAIUsage
+  | ModalQuotas
   | ModalWorkspaceMove
   | ModalWorkspaceMoveConfirm
   | ModalWorkspaceDeleteConfirm
@@ -579,11 +582,15 @@ 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
 }
 
+/** Mirror of the CLI's `StatsUIState`. */
+export interface StatsUIState {
+  pageIndex: number
+  scrollTop: number
+}
+
 export interface AppState {
   tabs: TabSession[]
   activeTabId: string | null
@@ -605,6 +612,7 @@ export interface AppState {
   autoCommit: AutoCommitState
   multiRepo: MultiRepoState
   settings: SettingsUIState
+  stats: StatsUIState
   workspaceDivergence: Record<string, BranchDivergence>
   workspaceActivity: Record<string, WorkspaceActivity>
   lastActiveTabByWorkspace: Record<string, string>
@@ -653,8 +661,8 @@ export type ModalAction =
   | { type: 'set-theme-entry-count'; count: number }
   | { type: 'open-theme-picker'; returnTo?: FocusMode }
   | { type: 'open-update-available-modal'; currentVersion: string; latestVersion: string }
+  | { type: 'open-quotas-modal' }
   | { type: 'set-modal-selection-index'; index: number }
-  | { type: 'open-ai-usage-modal' }
   | { type: 'open-edit-custom-command'; assistantId: AssistantId }
   | { type: 'open-workspace-move-modal'; sourceWorkspaceId: string }
   | { type: 'toggle-workspace-move-delete' }
@@ -775,13 +783,22 @@ 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 }
 
+export type StatsAction =
+  | { type: 'enter-stats' }
+  | { type: 'exit-stats' }
+  | { type: 'stats-move-page'; delta: -1 | 1 }
+  | { type: 'stats-select-page'; pageIndex: number }
+  /** Rows, not pixels: the view holds a scroll offset the page applies to its box. */
+  | { type: 'stats-scroll'; delta: number }
+  /** The offset the scrollbox actually accepted, sent back so the state cannot run past the page. */
+  | { type: 'stats-scroll-settled'; scrollTop: number }
+
 export interface GitRefreshPayload {
   branch: string | null
   ahead: number
@@ -878,6 +895,7 @@ export type AppAction =
   | LayoutAction
   | UIAction
   | SettingsAction
+  | StatsAction
   | DataAction
   | GitPanelAction
   | GitModeAction