@brimveyn/aimux-config 0.8.6 → 0.10.0

package/src/defaults.ts

@@ -49,7 +49,8 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
       m
         .map('<C-c>', actions.quit, 'Quit')
         .map('<C-n>', actions.newTab, 'New tab')
-        .map('<C-g>', actions.sessionPicker, 'Session picker')
+        .map('<C-p>', actions.createWorkspaceModal, 'Create workspace')
+        .map('<C-g>', actions.projectPicker, 'Project picker')
         .map('<C-z>', actions.ctrlZSidebar, 'Focus sidebar')
         .map('dd', actions.closeTab, 'Close tab')
         .map('<C-b>', actions.toggleSidebar, 'Toggle sidebar')
@@ -62,14 +63,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.nextSidebarItem, 'Next workspace/worktree')
-        .map('k', actions.prevSidebarItem, 'Prev workspace/worktree')
+        .map('j', actions.nextSidebarItem, 'Next project/workspace')
+        .map('k', actions.prevSidebarItem, 'Prev project/workspace')
         .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('J', actions.reorderProject(1), 'Move project down')
+        .map('K', actions.reorderProject(-1), 'Move project up')
         .map('r', actions.renameTab, 'Rename tab')
         .map('i', actions.enterInsert, 'Focus terminal')
         .map('S', actions.openFlashJump, 'Flash jump')
@@ -97,13 +98,14 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
     )
 
     // -----------------------------------------------------------------------
-    // Session bar: same chords from nav and while typing in the terminal
+    // Project 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>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>,', actions.enterSettings, 'Settings')
         .map('<Leader>1', actions.switchTabByIndex(1), 'Tab 1')
         .map('<Leader>2', actions.switchTabByIndex(2), 'Tab 2')
         .map('<Leader>3', actions.switchTabByIndex(3), 'Tab 3')
@@ -127,7 +129,7 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .map('e', actions.gitToggleFoldAll, 'Expand/collapse all folds')
         .map('o', actions.openSelectedGitFileInEditor, 'Open in editor')
         .map('c', actions.gitCommitOpen, 'Commit')
-        .map('m', actions.openWorktreeMove, 'Move worktree')
+        .map('m', actions.openWorkspaceMove, 'Move workspace')
         .map('p', actions.gitPush, 'Push')
         .map('v', actions.toggleGitDiffView, 'Toggle split/stacked')
         .map('b', actions.toggleGitReviewBase, 'Review vs base')
@@ -154,6 +156,36 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .map('<Up>', actions.scrollGitDiff(-1), 'Scroll up')
     )
 
+    // -----------------------------------------------------------------------
+    // 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).
+    // -----------------------------------------------------------------------
+    .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('<Space>', actions.activateSettingsRow, 'Change')
+        .map('j', actions.moveSettingsSelection(1), 'Next', { repeatable: true })
+        .map('k', actions.moveSettingsSelection(-1), 'Prev', { repeatable: true })
+        .map('<Down>', actions.moveSettingsSelection(1), undefined, { repeatable: true })
+        .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('r', actions.resetSettingsRow, 'Reset to default')
+        .map('/', actions.openSettingsSearch, 'Search settings')
+        .map('?', actions.helpModal('settings'), 'Help')
+    )
+
     // -----------------------------------------------------------------------
     // Modal: help (always in filter mode via Picker)
     // -----------------------------------------------------------------------
@@ -208,9 +240,9 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
     )
 
     // -----------------------------------------------------------------------
-    // Modal: worktree-move
+    // Modal: workspace-move
     // -----------------------------------------------------------------------
-    .mode('modal.worktree-move', (m) =>
+    .mode('modal.workspace-move', (m) =>
       m
         .map('<Esc>', actions.closeModal, 'Cancel')
         .map('j', actions.moveModalSelection(1), 'Next')
@@ -219,30 +251,30 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .map('<Up>', actions.moveModalSelection(-1))
         .map('<C-n>', actions.moveModalSelection(1))
         .map('<C-p>', actions.moveModalSelection(-1))
-        .map('d', actions.toggleWorktreeMoveDelete, 'Toggle delete source')
-        .map('<CR>', actions.confirmWorktreeMove, 'Move')
+        .map('d', actions.toggleWorkspaceMoveDelete, 'Toggle delete source')
+        .map('<CR>', actions.confirmWorkspaceMove, 'Move')
     )
 
     // -----------------------------------------------------------------------
-    // Modal: worktree-move recoverable-failure confirmation (stash / conflicts)
+    // Modal: workspace-move recoverable-failure confirmation (stash / conflicts)
     // -----------------------------------------------------------------------
-    .mode('modal.worktree-move-confirm', (m) =>
+    .mode('modal.workspace-move-confirm', (m) =>
       m
         .map('<Esc>', actions.closeModal, 'Cancel')
         .map('n', actions.closeModal, 'Cancel')
-        .map('<CR>', actions.confirmWorktreeMoveRetry, 'Confirm')
-        .map('y', actions.confirmWorktreeMoveRetry, 'Confirm')
+        .map('<CR>', actions.confirmWorkspaceMoveRetry, 'Confirm')
+        .map('y', actions.confirmWorkspaceMoveRetry, 'Confirm')
     )
 
     // -----------------------------------------------------------------------
-    // Modal: standalone worktree delete confirmation (sidebar "Remove worktree")
+    // Modal: standalone workspace delete confirmation (sidebar "Remove workspace")
     // -----------------------------------------------------------------------
-    .mode('modal.worktree-delete-confirm', (m) =>
+    .mode('modal.workspace-delete-confirm', (m) =>
       m
         .map('<Esc>', actions.closeModal, 'Cancel')
         .map('n', actions.closeModal, 'Cancel')
-        .map('<CR>', actions.confirmWorktreeDeleteModal, 'Delete worktree')
-        .map('y', actions.confirmWorktreeDeleteModal, 'Delete worktree')
+        .map('<CR>', actions.confirmWorkspaceDeleteModal, 'Delete workspace')
+        .map('y', actions.confirmWorkspaceDeleteModal, 'Delete workspace')
     )
 
     // -----------------------------------------------------------------------
@@ -266,12 +298,36 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
     )
 
     // -----------------------------------------------------------------------
-    // Modal: rename-worktree
+    // Modal: search every setting (always filtering, like the other pickers)
     // -----------------------------------------------------------------------
-    .mode('modal.rename-worktree', (m) =>
+    .mode('modal.settings-search.filtering', (m) =>
+      m
+        .map('<Esc>', actions.closeSettingsModal, 'Close')
+        .map('<CR>', actions.confirmSettingsSearch, 'Go to setting')
+        .map('<C-n>', actions.moveModalSelection(1), 'Next')
+        .map('<C-p>', actions.moveModalSelection(-1), 'Prev')
+        .map('<Down>', actions.moveModalSelection(1))
+        .map('<Up>', actions.moveModalSelection(-1))
+        .passthrough()
+    )
+
+    // -----------------------------------------------------------------------
+    // Modal: one text field over a settings row
+    // -----------------------------------------------------------------------
+    .mode('modal.setting-text', (m) =>
+      m
+        .map('<Esc>', actions.closeSettingsModal, 'Cancel')
+        .map('<CR>', actions.confirmSettingText, 'Confirm')
+        .passthrough()
+    )
+
+    // -----------------------------------------------------------------------
+    // Modal: rename-workspace
+    // -----------------------------------------------------------------------
+    .mode('modal.rename-workspace', (m) =>
       m
         .map('<Esc>', actions.closeModal, 'Cancel')
-        .map('<CR>', actions.confirmRenameWorktree, 'Confirm')
+        .map('<CR>', actions.confirmRenameWorkspace, 'Confirm')
         .passthrough()
     )
 
@@ -282,9 +338,6 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
       m
         .map('<Esc>', actions.cancelNewTabModal, 'Cancel')
         .map('<CR>', actions.launchSelectedAssistant, 'Launch')
-        .map('<C-w>', actions.toggleNewTabWorktree, 'WT')
-        .map('<C-d>', actions.deleteSelectedWorktree, 'Delete WT')
-        .map('<Tab>', actions.switchField, 'Next field')
         .map('<C-n>', actions.moveModalSelection(1), 'Next')
         .map('<C-p>', actions.moveModalSelection(-1), 'Prev')
         .map('<Down>', actions.moveModalSelection(1))
@@ -301,23 +354,12 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
     )
 
     // -----------------------------------------------------------------------
-    // Modal: new-tab worktree delete confirmation dialog
+    // Modal: project-picker (always in filter mode via Picker)
     // -----------------------------------------------------------------------
-    .mode('modal.new-tab.worktree-delete-confirm', (m) =>
+    .mode('modal.project-picker.filtering', (m) =>
       m
-        .map('<Esc>', actions.cancelDeleteWorktree, 'Cancel')
-        .map('n', actions.cancelDeleteWorktree, 'Cancel')
-        .map('<CR>', actions.confirmDeleteWorktree, 'Delete worktree')
-        .map('y', actions.confirmDeleteWorktree, 'Delete worktree')
-    )
-
-    // -----------------------------------------------------------------------
-    // Modal: session-picker (always in filter mode via Picker)
-    // -----------------------------------------------------------------------
-    .mode('modal.session-picker.filtering', (m) =>
-      m
-        .map('<Esc>', actions.sessionPickerEscape, 'Cancel')
-        .map('<CR>', actions.confirmSelectedSession, 'Open')
+        .map('<Esc>', actions.projectPickerEscape, 'Cancel')
+        .map('<CR>', actions.confirmSelectedProject, 'Open')
         .map('<C-n>', actions.moveModalSelection(1), 'Next')
         .map('<C-p>', actions.moveModalSelection(-1), 'Prev')
         .map('<Down>', actions.moveModalSelection(1))
@@ -326,23 +368,39 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
     )
 
     // -----------------------------------------------------------------------
-    // Modal: session-name
+    // Modal: project-name
     // -----------------------------------------------------------------------
-    .mode('modal.session-name', (m) =>
+    .mode('modal.project-name', (m) =>
       m
-        .map('<Esc>', actions.backToSessionPicker, 'Cancel')
-        .map('<CR>', actions.confirmSessionRename, 'Confirm')
+        .map('<Esc>', actions.backToProjectPicker, 'Cancel')
+        .map('<CR>', actions.confirmProjectRename, 'Confirm')
         .passthrough()
     )
 
     // -----------------------------------------------------------------------
-    // Modal: create-session
+    // Modal: create-project
     // -----------------------------------------------------------------------
-    .mode('modal.create-session', (m) =>
+    .mode('modal.create-project', (m) =>
       m
-        .map('<Esc>', actions.createSessionEscape, 'Cancel')
+        .map('<Esc>', actions.createProjectEscape, 'Cancel')
         .map('<Tab>', actions.switchField, 'Next field')
-        .map('<CR>', actions.confirmCreateSession, 'Confirm')
+        .map('<CR>', actions.confirmCreateProject, 'Confirm')
+        .map('<C-n>', actions.moveModalSelection(1), 'Next')
+        .map('<C-p>', actions.moveModalSelection(-1), 'Prev')
+        .map('<Down>', actions.moveModalSelection(1))
+        .map('<Up>', actions.moveModalSelection(-1))
+        .passthrough()
+    )
+
+    // -----------------------------------------------------------------------
+    // Modal: create-workspace (a project inside the current project)
+    // -----------------------------------------------------------------------
+    .mode('modal.create-workspace', (m) =>
+      m
+        .map('<Esc>', actions.createWorkspaceEscape, 'Back/Cancel')
+        .map('<Tab>', actions.switchCreateWorkspaceField, 'Next field')
+        .map('<CR>', actions.confirmCreateWorkspace, 'Create')
+        .map('<C-CR>', actions.createWorkspaceNewline, 'Newline')
         .map('<C-n>', actions.moveModalSelection(1), 'Next')
         .map('<C-p>', actions.moveModalSelection(-1), 'Prev')
         .map('<Down>', actions.moveModalSelection(1))

package/src/index.ts

@@ -38,7 +38,7 @@ export {
 } from './external-editor-runtime'
 export { DEFAULT_MULTI_REPO_CONFIG } from './defaults'
 
-// User-facing config types (keymap/backends/sessions/etc.).
+// User-facing config types (keymap/backends/projects/etc.).
 export type {
   Action,
   ActionFn,
@@ -75,9 +75,9 @@ export type {
   ModeKeymapDef,
   MultiRepoConfig,
   MultiRepoState,
+  ProjectRecord,
   ResolvedConfig,
   ResolvedKeymapConfig,
-  SessionRecord,
   SidebarConfig,
   SideEffect,
   SnippetDef,
@@ -88,7 +88,4 @@ export type {
   StatusBarConfig,
   StatusBarSeparator,
   TabSession,
-  WorktreeTemplate,
-  WorktreeTemplatePane,
-  WorktreeTemplateTab,
 } from './types'

package/src/resolver.ts

@@ -60,13 +60,14 @@ export function resolveConfig(userConfig: AimuxUserConfig): ResolvedConfig {
     integrations: resolveIntegrations(userConfig.integrations),
     keymaps,
     multiRepo,
-    sessionBar: resolveSessionBar(userConfig.sessionBar),
+    // ponytail: `sessionBar` is the pre-rename key. Unknown keys parse
+    // silently, so without the fallback the setting just vanishes.
+    projectBar: resolveProjectBar(userConfig.projectBar ?? userConfig.sessionBar),
     sidebar: userConfig.sidebar ?? {},
     snippets: userConfig.snippets ?? [],
     snippetTriggerChar: resolveSnippetTriggerChar(userConfig.snippetTriggerChar),
     statusBar: userConfig.statusBar ?? {},
     theme: resolveTheme(userConfig.theme),
-    worktreeTemplates: userConfig.worktreeTemplates ?? [],
   }
 }
 
@@ -96,9 +97,9 @@ function resolveTheme(userConfig: AimuxUserConfig['theme']): ResolvedConfig['the
   }
 }
 
-function resolveSessionBar(
-  userConfig: AimuxUserConfig['sessionBar']
-): ResolvedConfig['sessionBar'] {
+function resolveProjectBar(
+  userConfig: AimuxUserConfig['projectBar']
+): ResolvedConfig['projectBar'] {
   if (!userConfig) return {}
   return {
     initialVisible: userConfig.initialVisible ?? userConfig.visible,

package/src/status-bar-runtime.ts

@@ -1,7 +1,7 @@
 /**
  * Module-level singleton mirroring `statusBar.separator` from the resolved
  * config. The status bar component reads this each render; the app sets it
- * once at startup so the value is stable for the session.
+ * once at startup so the value is stable for the project.
  *
  * Same pattern as `auto-commit-runtime` / `external-editor-runtime` — avoids
  * threading config through React props or contexts.