@brimveyn/aimux-config 0.11.5 → 0.11.7

package/package.json

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

package/src/actions.ts

@@ -664,6 +664,27 @@ function selectedGitFile(ctx: ModeContext) {
 
 export const exitGitMode: KeyResult = r([{ type: 'exit-git-mode' }], [], 'navigation')
 
+/**
+ * Esc in git mode peels one layer at a time: an applied file filter goes
+ * first, so the full list is one key away, and the next Esc leaves.
+ */
+export const escapeGitMode: ActionFn = (ctx: ModeContext) =>
+  ctx.state.gitMode.fileFilter === '' ? exitGitMode : r([{ type: 'clear-git-file-filter' }])
+
+export const openGitFileFilter: KeyResult = r(
+  [{ type: 'open-git-file-filter' }],
+  [],
+  'modal.git-file-filter'
+)
+
+export const commitGitFileFilter: KeyResult = r(
+  [{ type: 'commit-git-file-filter' }],
+  [],
+  'git-mode'
+)
+
+export const cancelGitFileFilter: KeyResult = r([{ type: 'close-modal' }], [], 'git-mode')
+
 export function selectGitFile(delta: -1 | 1): ActionFn {
   return (ctx: ModeContext) => {
     if (ctx.state.gitPanel.files.length === 0) return r([])

package/src/app-types.ts

@@ -102,6 +102,7 @@ export type ModalType =
   | 'setting-text'
   | 'setting-keybind'
   | 'settings-search'
+  | 'git-file-filter'
   /**
    * Every plugin modal, the way `plugin-view` covers every plugin view. Which
    * one is on `ModalPlugin.modalId`, so adding a modal is a registration
@@ -462,6 +463,12 @@ export interface GitModeState {
   headOffset: number
   /** When true, diff the active workspace's working tree against its fork point. */
   reviewBase: boolean
+  /**
+   * The applied file filter: a case-insensitive substring of the path. Empty
+   * shows every file. While the filter bar is open, the draft in its modal's
+   * `editBuffer` is what the sidebar shows instead.
+   */
+  fileFilter: string
 }
 
 interface ModalBase {
@@ -534,6 +541,13 @@ export interface ModalRenameTab extends ModalBase {
 export interface ModalSettingsSearch extends ModalBase {
   type: 'settings-search'
 }
+/**
+ * The diff sidebar's file filter being typed. An overlay: focus stays on git
+ * mode, and the bar is drawn in the sidebar rather than floating over it.
+ */
+export interface ModalGitFileFilter extends ModalBase {
+  type: 'git-file-filter'
+}
 export interface ModalSettingText extends ModalBase {
   type: 'setting-text'
   settingId: string
@@ -761,6 +775,7 @@ export type ModalState =
   | ModalSettingText
   | ModalSettingKeybind
   | ModalSettingsSearch
+  | ModalGitFileFilter
   | ModalPlugin
 
 export interface LayoutState {
@@ -969,6 +984,7 @@ export type BuiltinModeId =
   | 'modal.update-available'
   | 'modal.workspace-move'
   | 'modal.workspace-move-confirm'
+  | 'modal.git-file-filter'
   | 'modal.flash-jump'
   | 'modal.quotas'
   | 'settings'
@@ -1385,6 +1401,9 @@ export type AutoCommitAction =
 export type GitModeAction =
   | { type: 'enter-git-mode' }
   | { type: 'exit-git-mode' }
+  | { type: 'open-git-file-filter' }
+  | { type: 'commit-git-file-filter' }
+  | { type: 'clear-git-file-filter' }
   | { type: 'git-mode-move-selection'; delta: -1 | 1 }
   | { type: 'git-mode-move-file-selection'; delta: -1 | 1 }
   | { type: 'git-mode-select-entry-by-key'; key: string }

package/src/defaults.ts

@@ -139,7 +139,8 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .map(']', actions.shiftGitHeadOffset(-1), 'Newer commit')
         .map('[', actions.shiftGitHeadOffset(1), 'Older commit')
         .map('?', actions.helpModal('git-mode'), 'Help')
-        .map('<Esc>', actions.exitGitMode, 'Exit git')
+        .map('/', actions.openGitFileFilter, 'Search files')
+        .map('<Esc>', actions.escapeGitMode, 'Clear filter, then exit git')
         .map('j', actions.selectGitFile(1), 'Next entry')
         .map('k', actions.selectGitFile(-1), 'Prev entry')
         .map('<C-n>', actions.selectGitFileOnly(1), 'Next file')
@@ -157,6 +158,21 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .map('<Up>', actions.scrollGitDiff(-1), 'Scroll up')
     )
 
+    // -----------------------------------------------------------------------
+    // Git mode: the sidebar's file filter, typed in place. The list narrows as
+    // you type; <CR> keeps the filter, <Esc> puts back the one you had.
+    // -----------------------------------------------------------------------
+    .mode('modal.git-file-filter', (m) =>
+      m
+        .map('<Esc>', actions.cancelGitFileFilter, 'Cancel')
+        .map('<CR>', actions.commitGitFileFilter, 'Apply filter')
+        .map('<C-n>', actions.selectGitFileOnly(1), 'Next file')
+        .map('<C-p>', actions.selectGitFileOnly(-1), 'Prev file')
+        .map('<Down>', actions.selectGitFileOnly(1))
+        .map('<Up>', actions.selectGitFileOnly(-1))
+        .passthrough()
+    )
+
     // -----------------------------------------------------------------------
     // Settings screen
     //

package/src/types.ts

@@ -293,6 +293,13 @@ export interface AutoRenameConfig {
    * confirmations and ignored (they do not consume an attempt).
    */
   minPromptWords: number
+  /**
+   * Extra rules for the branch name generated when a workspace is created from
+   * a prompt, appended to the naming prompt (e.g. `"Prefix with the Jira ticket:
+   * ABC-123/short-subject"`). They override the built-in `<type>/<subject>`
+   * convention; the result is then only checked for being a valid git ref.
+   */
+  branchInstructions?: string
 }
 
 export interface MultiRepoConfig {