@brimveyn/aimux-config 0.1.0 → 0.2.1

package/package.json

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

package/src/actions.ts

@@ -1,4 +1,4 @@
-import type { ActionFn, KeyResult, ModeContext } from './types'
+import type { ActionFn, AppAction, KeyResult, ModeContext } from './types'
 
 function r(
   actions: KeyResult['actions'] = [],
@@ -36,6 +36,7 @@ export const helpModal: KeyResult = r([{ type: 'open-help-modal' }], [], 'modal.
 
 export const toggleSidebar: KeyResult = r([{ type: 'toggle-sidebar' }])
 export const toggleGitPanel: KeyResult = r([{ type: 'toggle-git-panel' }])
+export const enterGitMode: KeyResult = r([{ type: 'enter-git-mode' }], [], 'git-mode')
 
 export const splitVertical: KeyResult = r(
   [{ direction: 'vertical', type: 'open-split-picker' }],
@@ -366,3 +367,113 @@ export const snippetFilterPasteToGroup: KeyResult = r(
   [{ type: 'paste-snippet-to-group' }],
   'navigation'
 )
+
+// ---------------------------------------------------------------------------
+// Git mode (src/input/modes/handlers/git-mode.ts replacement)
+// ---------------------------------------------------------------------------
+
+function clearPendingDelete(ctx: ModeContext): AppAction[] {
+  if (ctx.state.gitMode.pendingDeletePath === null) return []
+  return [{ path: null, type: 'git-mode-set-pending-delete' }]
+}
+
+export const exitGitMode: KeyResult = r([{ type: 'exit-git-mode' }], [], 'navigation')
+
+export function selectGitFile(delta: -1 | 1): ActionFn {
+  return (ctx: ModeContext) => {
+    const total = ctx.state.gitPanel.files.length
+    if (total === 0) return r([])
+    const current = ctx.state.gitMode.selectedFileIndex
+    const next = (current + delta + total) % total
+    if (next === current) return r([])
+    return r([{ delta, type: 'git-mode-select-file' }])
+  }
+}
+
+export function scrollGitDiff(delta: number): KeyResult {
+  return r([], [{ delta, type: 'scroll-git-diff' }])
+}
+
+export const gitStageSelected: ActionFn = (ctx: ModeContext) => {
+  const file = ctx.state.gitPanel.files[ctx.state.gitMode.selectedFileIndex]
+  if (!file) return r(clearPendingDelete(ctx))
+  const actions = clearPendingDelete(ctx)
+  if (file.section === 'staged') return r(actions)
+  actions.push({
+    fromSection: file.section,
+    path: file.path,
+    toSection: 'staged',
+    type: 'git-mode-optimistic-move',
+  })
+  return r(actions, [{ path: file.path, type: 'git-stage' }])
+}
+
+export const gitDestructiveSelected: ActionFn = (ctx: ModeContext) => {
+  const file = ctx.state.gitPanel.files[ctx.state.gitMode.selectedFileIndex]
+  if (!file) return r(clearPendingDelete(ctx))
+
+  if (file.section === 'staged') {
+    const actions = clearPendingDelete(ctx)
+    const toSection = file.status === 'A' ? 'untracked' : 'unstaged'
+    actions.push({
+      fromSection: 'staged',
+      path: file.path,
+      toSection,
+      type: 'git-mode-optimistic-move',
+    })
+    return r(actions, [{ path: file.path, type: 'git-unstage' }])
+  }
+
+  const isUntracked = file.section === 'untracked'
+  const pending = ctx.state.gitMode.pendingDeletePath
+
+  if (pending === file.path) {
+    const actions: AppAction[] = [
+      { path: null, type: 'git-mode-set-pending-delete' },
+      {
+        fromSection: file.section,
+        path: file.path,
+        toSection: null,
+        type: 'git-mode-optimistic-move',
+      },
+    ]
+    const effectType = isUntracked ? 'git-rm' : 'git-restore'
+    return r(actions, [{ path: file.path, type: effectType }])
+  }
+
+  return r([{ path: file.path, type: 'git-mode-set-pending-delete' }])
+}
+
+export const gitCommitOpen: ActionFn = (ctx: ModeContext) => {
+  return r([...clearPendingDelete(ctx), { type: 'open-git-commit-modal' }], [], 'modal.git-commit')
+}
+
+export const gitPush: ActionFn = (ctx: ModeContext) => {
+  return r(clearPendingDelete(ctx), [{ type: 'git-push' }])
+}
+
+// ---------------------------------------------------------------------------
+// Modal: git-commit
+// ---------------------------------------------------------------------------
+
+export const gitCommitCancel: KeyResult = r([{ type: 'close-modal' }], [], 'git-mode')
+
+export const gitCommitSubmit: ActionFn = (ctx: ModeContext) => {
+  const modal = ctx.state.modal
+  if (modal.type !== 'git-commit') {
+    return r([{ type: 'close-modal' }], [], 'git-mode')
+  }
+  const editBuffer = modal.editBuffer ?? ''
+  const activeIsTitle = modal.activeField === 'title'
+  const title = (activeIsTitle ? editBuffer : modal.contentBuffer).trim()
+  const body = (activeIsTitle ? modal.contentBuffer : editBuffer).trim()
+  return r([{ type: 'close-modal' }], [{ body, title, type: 'git-commit' }], 'git-mode')
+}
+
+export const gitCommitReturnKey: ActionFn = (ctx: ModeContext) => {
+  const modal = ctx.state.modal
+  if (modal.type === 'git-commit' && modal.activeField === 'body') {
+    return r([{ char: '\n', type: 'update-command-edit' }])
+  }
+  return r([{ type: 'switch-create-session-field' }])
+}

package/src/defaults.ts

@@ -28,6 +28,7 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .map('<C-h>', actions.resizeSidebar(-2))
         .map('<C-l>', actions.resizeSidebar(2))
         .map('G', actions.toggleGitPanel)
+        .map('<C-d>', actions.enterGitMode)
         .map('<C-j>', actions.resizeGitPanel(-0.05))
         .map('<C-k>', actions.resizeGitPanel(0.05))
         .map('J', actions.reorderTab(1))
@@ -72,6 +73,24 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .map('q', actions.closePane)
     )
 
+    // -----------------------------------------------------------------------
+    // Git mode (src/input/modes/handlers/git-mode.ts)
+    // -----------------------------------------------------------------------
+    .mode('git-mode', (m) =>
+      m
+        .map('<Esc>', actions.exitGitMode)
+        .map('j', actions.selectGitFile(1))
+        .map('k', actions.selectGitFile(-1))
+        .map('<C-d>', actions.scrollGitDiff(20))
+        .map('<C-u>', actions.scrollGitDiff(-20))
+        .map('<Down>', actions.scrollGitDiff(1))
+        .map('<Up>', actions.scrollGitDiff(-1))
+        .map('a', actions.gitStageSelected)
+        .map('d', actions.gitDestructiveSelected)
+        .map('c', actions.gitCommitOpen)
+        .map('p', actions.gitPush)
+    )
+
     // -----------------------------------------------------------------------
     // Modal: help (src/input/modes/handlers/modal-help.ts)
     // -----------------------------------------------------------------------
@@ -240,5 +259,17 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .map('<CR>', actions.confirmSplit)
     )
 
+    // -----------------------------------------------------------------------
+    // Modal: git-commit (src/input/modes/handlers/modal-git-commit.ts)
+    // -----------------------------------------------------------------------
+    .mode('modal.git-commit', (m) =>
+      m
+        .map('<Esc>', actions.gitCommitCancel)
+        .map('<C-CR>', actions.gitCommitSubmit)
+        .map('<Tab>', actions.switchField)
+        .map('<CR>', actions.gitCommitReturnKey)
+        .passthrough()
+    )
+
   return kb._build()
 }

package/src/types.ts

@@ -12,6 +12,7 @@ export type ModeId =
   | 'navigation'
   | 'terminal-input'
   | 'layout'
+  | 'git-mode'
   | 'modal.new-tab'
   | 'modal.new-tab.command-edit'
   | 'modal.session-picker'
@@ -25,6 +26,7 @@ export type ModeId =
   | 'modal.theme-picker'
   | 'modal.help'
   | 'modal.split-picker'
+  | 'modal.git-commit'
 
 // ─── Primitive app types ──────────────────────────────────────────────────────
 
@@ -32,7 +34,13 @@ 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 FocusMode = 'navigation' | 'terminal-input' | 'modal' | 'command-edit' | 'layout'
+export type FocusMode =
+  | 'navigation'
+  | 'terminal-input'
+  | 'modal'
+  | 'command-edit'
+  | 'layout'
+  | 'git'
 export type SplitDirection = 'horizontal' | 'vertical'
 
 // ─── Terminal data shapes ─────────────────────────────────────────────────────
@@ -179,10 +187,31 @@ export interface GitPanelState {
   error: GitPanelError | null
 }
 
+export type DiffFileStatus = 'modified' | 'new' | 'deleted' | 'binary' | 'renamed'
+
+export interface DiffData {
+  path: string
+  status: DiffFileStatus
+  oldPath?: string
+  rawDiff: string
+  binarySizeBefore?: number
+  binarySizeAfter?: number
+  errorMessage?: string
+}
+
+export interface GitModeState {
+  selectedFileIndex: number
+  diffs: Record<string, DiffData>
+  loading: Record<string, boolean>
+  pendingDeletePath: string | null
+  actionMessage: string | null
+}
+
 interface ModalBase {
   selectedIndex: number
   editBuffer: string | null
   sessionTargetId: string | null
+  cursorPos?: number
 }
 
 export interface ModalClosed extends ModalBase {
@@ -223,6 +252,11 @@ export interface ModalCreateSession extends ModalBase {
   activeField: 'directory' | 'name'
   nameBuffer: string
 }
+export interface ModalGitCommit extends ModalBase {
+  type: 'git-commit'
+  activeField: 'title' | 'body'
+  contentBuffer: string
+}
 export interface ModalSnippetEditor extends ModalBase {
   type: 'snippet-editor'
   activeField: 'name' | 'content'
@@ -241,6 +275,7 @@ export type ModalState =
   | ModalSplitPicker
   | ModalCreateSession
   | ModalSnippetEditor
+  | ModalGitCommit
 
 export interface LayoutState {
   terminalCols: number
@@ -261,6 +296,7 @@ export interface AppState {
   layout: LayoutState
   customCommands: Record<AssistantId, string>
   gitPanel: GitPanelState
+  gitMode: GitModeState
   pendingChords: string[] | null
 }
 
@@ -369,6 +405,23 @@ export type GitPanelAction =
   | { type: 'git-refresh-error'; kind: GitPanelError }
   | { type: 'git-panel-reset' }
 
+export type GitModeAction =
+  | { type: 'enter-git-mode' }
+  | { type: 'exit-git-mode' }
+  | { type: 'git-mode-select-file'; delta: -1 | 1 }
+  | { type: 'git-mode-set-diff'; path: string; diff: DiffData }
+  | { type: 'git-mode-set-loading'; path: string; loading: boolean }
+  | { type: 'git-mode-set-pending-delete'; path: string | null }
+  | { type: 'git-mode-clear-diff-cache'; path: string }
+  | { type: 'git-mode-set-message'; message: string | null }
+  | {
+      type: 'git-mode-optimistic-move'
+      path: string
+      fromSection: GitFileSection
+      toSection: GitFileSection | null
+    }
+  | { type: 'open-git-commit-modal' }
+
 export type DataAction =
   | { type: 'set-snippets'; snippets: SnippetRecord[] }
   | { type: 'delete-snippet'; snippetId: string }
@@ -381,6 +434,7 @@ export type AppAction =
   | UIAction
   | DataAction
   | GitPanelAction
+  | GitModeAction
 
 // ─── Side effects ─────────────────────────────────────────────────────────────
 
@@ -406,6 +460,13 @@ export type SideEffect =
   | { type: 'rename-session'; sessionId: string; name: string }
   | { type: 'split-pane'; direction: SplitDirection }
   | { type: 'confirm-split' }
+  | { type: 'scroll-git-diff'; delta: number }
+  | { type: 'git-stage'; path: string }
+  | { type: 'git-unstage'; path: string }
+  | { type: 'git-restore'; path: string }
+  | { type: 'git-rm'; path: string }
+  | { type: 'git-commit'; title: string; body: string }
+  | { type: 'git-push' }
 
 // ─── Key input / KeyResult / ModeContext ──────────────────────────────────────