@brimveyn/aimux 1.12.2 → 1.13.0

package/src/snippets/trigger-detector.ts

@@ -0,0 +1,105 @@
+import type { SnippetRecord } from '../state/types'
+
+/**
+ * Inline trigger detector for snippet/macro expansion.
+ *
+ * State machine (per-tab):
+ *   Idle ──(trigger char)──▶ Capturing
+ *   Capturing ──(separator)──▶ try match → return or reset → Idle
+ *   Capturing ──(printable char)──▶ append (max 32 chars)
+ *   Capturing ──(non-printable / control / escape)──▶ reset → Idle
+ *   Capturing ──(trigger char again)──▶ restart Capturing
+ *
+ * Paste heuristic: if two `feed` calls land within 5ms, treat as paste
+ * (sometimes terminals don't enable bracketed paste) and reset.
+ */
+
+const MAX_TRIGGER_BUFFER = 32
+const SEPARATOR_RE = /[\s.,;:!?)\]}]/u
+const PRINTABLE_RE = /^[\x20-\x7e]$/
+const PASTE_WINDOW_MS = 5
+
+export interface TriggerMatch {
+  snippet: SnippetRecord
+  /** Characters typed since trigger char (inclusive), including the closing separator. */
+  triggerText: string
+}
+
+export interface TriggerDetector {
+  feed(char: string): TriggerMatch | null
+  reset(): void
+}
+
+export interface TriggerDetectorOptions {
+  getSnippets: () => readonly SnippetRecord[]
+  getTriggerChar: () => string
+  now?: () => number
+}
+
+export function createTriggerDetector(opts: TriggerDetectorOptions): TriggerDetector {
+  const now = opts.now ?? (() => Date.now())
+  let capturing = false
+  let buffer = ''
+  let lastFeedAt = 0
+
+  function reset(): void {
+    capturing = false
+    buffer = ''
+  }
+
+  function tryMatch(separator: string): TriggerMatch | null {
+    const triggerChar = opts.getTriggerChar()
+    for (const snippet of opts.getSnippets()) {
+      if (snippet.trigger != null && snippet.trigger !== '' && snippet.trigger === buffer) {
+        const triggerText = `${triggerChar}${buffer}${separator}`
+        reset()
+        return { snippet, triggerText }
+      }
+    }
+    reset()
+    return null
+  }
+
+  return {
+    feed(char: string): TriggerMatch | null {
+      const t = now()
+      const isPaste = capturing && t - lastFeedAt < PASTE_WINDOW_MS && buffer.length > 0
+      lastFeedAt = t
+
+      if (isPaste) {
+        reset()
+        return null
+      }
+
+      const triggerChar = opts.getTriggerChar()
+
+      if (char === triggerChar) {
+        capturing = true
+        buffer = ''
+        return null
+      }
+
+      if (!capturing) return null
+
+      if (SEPARATOR_RE.test(char)) {
+        if (buffer.length === 0) {
+          reset()
+          return null
+        }
+        return tryMatch(char)
+      }
+
+      if (!PRINTABLE_RE.test(char)) {
+        reset()
+        return null
+      }
+
+      buffer += char
+      if (buffer.length > MAX_TRIGGER_BUFFER) {
+        reset()
+      }
+      return null
+    },
+    reset,
+  }
+}

package/src/state/ai-usage-store.ts

@@ -23,7 +23,7 @@ export const aiUsageStore = createStore<AIUsageState>((set) => ({
       const isFailure = Boolean(snap.error)
       const hasPriorValue = prev && prev.percent !== null
       const merged: UsageSnapshot =
-        isFailure && hasPriorValue && prev
+        isFailure && hasPriorValue === true && prev != null
           ? { ...prev, error: snap.error, lastUpdated: snap.lastUpdated, stale: true }
           : snap
       return { snapshots: { ...state.snapshots, [snap.tool]: merged } }

package/src/state/git-tree.ts

@@ -42,8 +42,12 @@ export interface GitTreeRows {
   visibleRows: GitTreeRow[]
 }
 
-export function gitFileKey(file: Pick<GitFileEntry, 'path' | 'section'>): string {
-  return `${file.section}:${file.path}`
+export function gitFileKey(
+  file: Pick<GitFileEntry, 'path' | 'section'> & { repoPath?: string }
+): string {
+  return file.repoPath != null && file.repoPath !== ''
+    ? `${file.section}:${file.repoPath}:${file.path}`
+    : `${file.section}:${file.path}`
 }
 
 export function gitFolderKey(section: GitFileSection, folderPath: string): string {
@@ -85,7 +89,7 @@ export function getSelectedGitRow(
     compact?: boolean
   }
 ): GitTreeRow | null {
-  if (!options.selectedEntryKey) return null
+  if (!(options.selectedEntryKey != null && options.selectedEntryKey !== '')) return null
   const { visibleRows } = buildGitTreeRows(
     files,
     options.collapsedFolders,
@@ -181,7 +185,7 @@ function buildSectionTree(files: GitFileEntry[], section: GitFileSection): GitTr
     let cursor = root
     for (let i = 0; i < parts.length - 1; i++) {
       const name = parts[i]
-      if (!name) continue
+      if (!(name != null && name !== '')) continue
       const nextPath = cursor.path ? `${cursor.path}/${name}` : name
       let child = cursor.folders.get(name)
       if (!child) {

package/src/state/layout-tree.ts

@@ -1,7 +1,10 @@
 export type SplitDirection = 'horizontal' | 'vertical'
 
-export type LayoutLeaf = { type: 'leaf'; tabId: string }
-export type LayoutSplit = {
+export interface LayoutLeaf {
+  type: 'leaf'
+  tabId: string
+}
+export interface LayoutSplit {
   type: 'split'
   direction: SplitDirection
   ratio: number
@@ -42,7 +45,7 @@ export function getTreeForTab(
   tabId: string
 ): LayoutNode | null {
   const groupId = tabGroupMap[tabId]
-  if (!groupId) return null
+  if (!(groupId != null && groupId !== '')) return null
   return layoutTrees[groupId] ?? null
 }
 
@@ -303,14 +306,14 @@ export function getAdjacentLeaf(
     if (inFirst && goingToSecond) {
       // Try to recurse in first child first
       const deeper = getAdjacentLeaf(tree.first, fromTabId, direction)
-      if (deeper) return deeper
+      if (deeper != null && deeper !== '') return deeper
       // Cross boundary: go to first leaf of second child
       return firstLeafId(tree.second)
     }
 
     if (inSecond && !goingToSecond) {
       const deeper = getAdjacentLeaf(tree.second, fromTabId, direction)
-      if (deeper) return deeper
+      if (deeper != null && deeper !== '') return deeper
       return lastLeafId(tree.first)
     }
   }

package/src/state/reducers/git-mode-state.ts

@@ -50,6 +50,7 @@ export function emptyGitMode(): GitModeState {
     loading: {},
     parsedFiles: {},
     pendingDeletePath: null,
+    reviewBase: false,
     selectedEntryKey: null,
   }
 }
@@ -90,6 +91,7 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
           highlights: {},
           loading: {},
           parsedFiles: {},
+          reviewBase: false,
         },
       }
     }
@@ -102,7 +104,7 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
         action.delta,
         state.gitPane.treeCompaction
       )
-      if (!next || next === state.gitMode.selectedEntryKey) return state
+      if (next == null || next === '' || next === state.gitMode.selectedEntryKey) return state
       return {
         ...state,
         gitMode: {
@@ -121,7 +123,7 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
         action.delta,
         state.gitPane.treeCompaction
       )
-      if (!next || next === state.gitMode.selectedEntryKey) return state
+      if (next == null || next === '' || next === state.gitMode.selectedEntryKey) return state
       return {
         ...state,
         gitMode: {
@@ -140,7 +142,13 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
         [action.key],
         state.gitPane.treeCompaction
       )
-      if (!next || next !== action.key || next === state.gitMode.selectedEntryKey) return state
+      if (
+        next == null ||
+        next === '' ||
+        next !== action.key ||
+        next === state.gitMode.selectedEntryKey
+      )
+        return state
       return {
         ...state,
         gitMode: {
@@ -199,7 +207,12 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
           },
         }
       }
-      if (!row.parentKey || row.parentKey === state.gitMode.selectedEntryKey) return state
+      if (
+        row.parentKey == null ||
+        row.parentKey === '' ||
+        row.parentKey === state.gitMode.selectedEntryKey
+      )
+        return state
       return {
         ...state,
         gitMode: {
@@ -318,7 +331,7 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
       const k = `${action.key}|${action.themeId}`
       const existing = state.gitMode.highlights[k]
       const sameContent = existing && existing.hash === action.hash
-      if (sameContent) {
+      if (sameContent === true) {
         const existingAdd = existing.add as unknown[]
         const existingDel = existing.del as unknown[]
         let changesAnything = false
@@ -344,8 +357,8 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
         }
         if (!changesAnything) return state
       }
-      const nextAdd = sameContent ? ([...(existing.add as unknown[])] as unknown[]) : []
-      const nextDel = sameContent ? ([...(existing.del as unknown[])] as unknown[]) : []
+      const nextAdd = sameContent === true ? ([...(existing.add as unknown[])] as unknown[]) : []
+      const nextDel = sameContent === true ? ([...(existing.del as unknown[])] as unknown[]) : []
       for (const patch of action.add) {
         const tokens = patch.tokens as unknown[]
         for (let i = 0; i < tokens.length; i++) nextAdd[patch.start + i] = tokens[i]
@@ -398,6 +411,26 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
       const next = state.gitMode.diffView === 'split' ? 'stacked' : 'split'
       return { ...state, gitMode: { ...state.gitMode, diffView: next } }
     }
+    case 'git-mode-toggle-review-base': {
+      // Base review and history walking are mutually exclusive views; entering
+      // either resets headOffset and drops cached diffs (computed vs old ref).
+      const next = !state.gitMode.reviewBase
+      return {
+        ...state,
+        gitMode: {
+          ...state.gitMode,
+          actionMessage: null,
+          diffs: {},
+          folds: {},
+          headOffset: 0,
+          highlights: {},
+          loading: {},
+          parsedFiles: {},
+          pendingDeletePath: null,
+          reviewBase: next,
+        },
+      }
+    }
     case 'git-mode-shift-head-offset': {
       const next = Math.max(0, state.gitMode.headOffset + action.delta)
       if (next === state.gitMode.headOffset) return state
@@ -485,13 +518,10 @@ export function reduceGitModeState(state: AppState, action: AppAction): AppState
         const duplicateIdx = files.findIndex(
           (f, i) => i !== idx && f.path === action.path && f.section === toSection
         )
-        if (duplicateIdx >= 0) {
-          nextFiles = files.filter((_, i) => i !== idx)
-        } else {
-          nextFiles = files.map((f, i) =>
-            i === idx ? ({ ...f, section: toSection } as GitFileEntry) : f
-          )
-        }
+        nextFiles =
+          duplicateIdx >= 0
+            ? files.filter((_, i) => i !== idx)
+            : files.map((f, i) => (i === idx ? ({ ...f, section: toSection } as GitFileEntry) : f))
       }
       nextFiles = sortFilesBySection(nextFiles)
       const movedCurrentKey = gitFileKey({ path: action.path, section: action.fromSection })

package/src/state/reducers/git-panel-state.ts

@@ -1,4 +1,11 @@
-import type { AppAction, AppState, GitFileEntry, GitFileSection, GitPanelState } from '../types'
+import type {
+  AppAction,
+  AppState,
+  BranchDivergence,
+  GitFileEntry,
+  GitFileSection,
+  GitPanelState,
+} from '../types'
 
 import { clampGitPaneRatio } from '../git-pane-sizing'
 import { reconcileSelectedGitEntryKey } from '../git-tree'
@@ -27,6 +34,20 @@ function clampRatio(value: number): number {
   return clampGitPaneRatio(value)
 }
 
+function sameDivergence(
+  a: Record<string, BranchDivergence>,
+  b: Record<string, BranchDivergence>
+): boolean {
+  const aKeys = Object.keys(a)
+  if (aKeys.length !== Object.keys(b).length) return false
+  for (const key of aKeys) {
+    const x = a[key]
+    const y = b[key]
+    if (x == null || y == null || x.ahead !== y.ahead || x.behind !== y.behind) return false
+  }
+  return true
+}
+
 export function emptyGitPanel(): GitPanelState {
   return {
     ahead: 0,
@@ -188,6 +209,10 @@ export function reduceGitPanelState(state: AppState, action: AppAction): AppStat
         gitPanel: { ...prev, error: action.kind, files: [] },
       }
     }
+    case 'set-worktree-divergence': {
+      if (sameDivergence(state.worktreeDivergence, action.divergence)) return state
+      return { ...state, worktreeDivergence: action.divergence }
+    }
     case 'git-panel-reset': {
       const prev = state.gitPanel
       if (
@@ -201,7 +226,18 @@ export function reduceGitPanelState(state: AppState, action: AppAction): AppStat
       }
       return {
         ...state,
-        gitMode: { ...state.gitMode, pendingDeletePath: null, selectedEntryKey: null },
+        // A reset means the underlying worktree/ref changed, so cached diffs are
+        // stale — drop them (keyed by section:path, they'd otherwise serve a
+        // previous worktree's diff for a same-named file after a move/switch).
+        gitMode: {
+          ...state.gitMode,
+          diffs: {},
+          highlights: {},
+          loading: {},
+          parsedFiles: {},
+          pendingDeletePath: null,
+          selectedEntryKey: null,
+        },
         gitPanel: emptyGitPanel(),
       }
     }