@brimveyn/aimux 1.12.6 → 1.13.2

package/src/session-backend/local-session-backend.ts

@@ -114,7 +114,7 @@ export class LocalSessionBackend
     rows: number
     cwd?: string
   }): void {
-    if (!this.currentSessionId) {
+    if (!(this.currentSessionId != null && this.currentSessionId !== '')) {
       logDebug('backend.local.skipCreateWithoutSession', { tabId: options.tabId })
       return
     }
@@ -127,7 +127,7 @@ export class LocalSessionBackend
   }
 
   write(tabId: string, input: string): void {
-    if (!this.currentSessionId) {
+    if (!(this.currentSessionId != null && this.currentSessionId !== '')) {
       logDebug('backend.local.skipWriteWithoutSession', { inputLength: input.length, tabId })
       return
     }
@@ -140,22 +140,22 @@ export class LocalSessionBackend
   }
 
   scrollViewport(tabId: string, deltaLines: number): void {
-    if (!this.currentSessionId) return
+    if (!(this.currentSessionId != null && this.currentSessionId !== '')) return
     this.sessionManager.scroll(this.currentSessionId, tabId, deltaLines)
   }
 
   scrollViewportToBottom(tabId: string): void {
-    if (!this.currentSessionId) return
+    if (!(this.currentSessionId != null && this.currentSessionId !== '')) return
     this.sessionManager.scrollToBottom(this.currentSessionId, tabId)
   }
 
   reapplyScrollIntent(tabId: string, intent: ScrollIntent): void {
-    if (!this.currentSessionId) return
+    if (!(this.currentSessionId != null && this.currentSessionId !== '')) return
     this.sessionManager.reapplyScrollIntent(this.currentSessionId, tabId, intent)
   }
 
   setActiveTab(tabId: string | null): void {
-    if (!this.currentSessionId) return
+    if (!(this.currentSessionId != null && this.currentSessionId !== '')) return
     logDebug('backend.local.setActiveTab', { sessionId: this.currentSessionId, tabId })
     this.sessionManager.setActiveTab(this.currentSessionId, tabId)
   }
@@ -166,7 +166,7 @@ export class LocalSessionBackend
     intents?: Map<string, ScrollIntent>,
     options?: { sync?: boolean }
   ): void {
-    if (!this.currentSessionId) return
+    if (!(this.currentSessionId != null && this.currentSessionId !== '')) return
     this.sessionManager.resize(this.currentSessionId, cols, rows, intents, options)
   }
 
@@ -177,25 +177,25 @@ export class LocalSessionBackend
     intent?: ScrollIntent,
     options?: { sync?: boolean }
   ): void {
-    if (!this.currentSessionId) return
+    if (!(this.currentSessionId != null && this.currentSessionId !== '')) return
     this.sessionManager.resizeTab(this.currentSessionId, tabId, cols, rows, intent, options)
   }
 
   disposeSession(tabId: string): void {
-    if (!this.currentSessionId) return
+    if (!(this.currentSessionId != null && this.currentSessionId !== '')) return
     logDebug('backend.local.disposeSession', { sessionId: this.currentSessionId, tabId })
     this.sessionManager.closeTab(this.currentSessionId, tabId)
   }
 
   disposeAll(): void {
-    if (!this.currentSessionId) return
+    if (!(this.currentSessionId != null && this.currentSessionId !== '')) return
     logDebug('backend.local.disposeAll', { sessionId: this.currentSessionId })
     this.sessionManager.disposeSession(this.currentSessionId)
   }
 
   destroy(keepSessions = true): void {
     logDebug('backend.local.destroy', { keepSessions, sessionId: this.currentSessionId })
-    if (!keepSessions && this.currentSessionId) {
+    if (!keepSessions && this.currentSessionId != null && this.currentSessionId !== '') {
       this.sessionManager.disposeSession(this.currentSessionId)
     }
     this.statusLoop.stop()

package/src/session-backend/remote-session-backend.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'node:events'
-import { connect, Socket } from 'node:net'
+import { connect, type Socket } from 'node:net'
 
 import type { AssistantId, ScrollIntent, WorkspaceSnapshotV1 } from '../state/types'
 import type { SessionBackend, SessionBackendEvents } from './types'
@@ -96,7 +96,7 @@ export class RemoteSessionBackend
     return this.socket
   }
 
-  private send(request: ClientRequest): Promise<ServerResponse> {
+  private async send(request: ClientRequest): Promise<ServerResponse> {
     const socket = this.getConnectedSocket()
     logDebug('backend.remote.send', { id: request.id, type: request.type })
     return new Promise((resolve, reject) => {
@@ -139,11 +139,22 @@ export class RemoteSessionBackend
   private reportCommandError(context: string, error: unknown, tabId?: string): void {
     const message = error instanceof Error ? error.message : String(error)
     logDebug('backend.remote.commandError', { context, error: message, tabId })
-    if (tabId) {
+    if (tabId != null && tabId !== '') {
       this.emit('error', tabId, message)
     }
   }
 
+  /** Fire-and-forget a command, reporting any failure via reportCommandError. */
+  private dispatchCommand(request: ClientRequest, context: string, tabId?: string): void {
+    void (async () => {
+      try {
+        await this.sendExpectOk(request)
+      } catch (error) {
+        this.reportCommandError(context, error, tabId)
+      }
+    })()
+  }
+
   private handleServerEvent(message: ServerEvent): void {
     logDebug('backend.remote.event', { type: message.type })
     switch (message.type) {
@@ -352,8 +363,10 @@ export class RemoteSessionBackend
       return
     }
 
-    void this.sendExpectOk({ id: crypto.randomUUID(), payload: options, type: 'createTab' }).catch(
-      (error) => this.reportCommandError('createTab', error, options.tabId)
+    this.dispatchCommand(
+      { id: crypto.randomUUID(), payload: options, type: 'createTab' },
+      'createTab',
+      options.tabId
     )
   }
 
@@ -362,55 +375,54 @@ export class RemoteSessionBackend
       logDebug('backend.remote.skipWriteBeforeAttach', { inputLength: input.length, tabId })
       return
     }
-    void this.sendExpectOk({
-      id: crypto.randomUUID(),
-      payload: { data: input, tabId },
-      type: 'write',
-    }).catch((error) => this.reportCommandError('write', error, tabId))
+    this.dispatchCommand(
+      { id: crypto.randomUUID(), payload: { data: input, tabId }, type: 'write' },
+      'write',
+      tabId
+    )
   }
 
   scrollViewport(tabId: string, deltaLines: number): void {
     if (!this.attached) {
       return
     }
-    void this.sendExpectOk({
-      id: crypto.randomUUID(),
-      payload: { deltaLines, tabId },
-      type: 'scroll',
-    }).catch((error) => this.reportCommandError('scroll', error, tabId))
+    this.dispatchCommand(
+      { id: crypto.randomUUID(), payload: { deltaLines, tabId }, type: 'scroll' },
+      'scroll',
+      tabId
+    )
   }
 
   scrollViewportToBottom(tabId: string): void {
     if (!this.attached) {
       return
     }
-    void this.sendExpectOk({
-      id: crypto.randomUUID(),
-      payload: { tabId },
-      type: 'scrollToBottom',
-    }).catch((error) => this.reportCommandError('scrollToBottom', error, tabId))
+    this.dispatchCommand(
+      { id: crypto.randomUUID(), payload: { tabId }, type: 'scrollToBottom' },
+      'scrollToBottom',
+      tabId
+    )
   }
 
   reapplyScrollIntent(tabId: string, intent: ScrollIntent): void {
     if (!this.attached) {
       return
     }
-    void this.sendExpectOk({
-      id: crypto.randomUUID(),
-      payload: { intent, tabId },
-      type: 'reapplyScrollIntent',
-    }).catch((error) => this.reportCommandError('reapplyScrollIntent', error, tabId))
+    this.dispatchCommand(
+      { id: crypto.randomUUID(), payload: { intent, tabId }, type: 'reapplyScrollIntent' },
+      'reapplyScrollIntent',
+      tabId
+    )
   }
 
   setActiveTab(tabId: string | null): void {
     if (!this.attached) {
       return
     }
-    void this.sendExpectOk({
-      id: crypto.randomUUID(),
-      payload: { tabId },
-      type: 'setActiveTab',
-    }).catch((error) => this.reportCommandError('setActiveTab', error))
+    this.dispatchCommand(
+      { id: crypto.randomUUID(), payload: { tabId }, type: 'setActiveTab' },
+      'setActiveTab'
+    )
   }
 
   resizeAll(
@@ -425,11 +437,14 @@ export class RemoteSessionBackend
     }
     logDebug('backend.remote.resize', { cols, rows, sessionId: this.currentSessionId })
     const intentsRecord = intents ? Object.fromEntries(intents.entries()) : undefined
-    void this.sendExpectOk({
-      id: crypto.randomUUID(),
-      payload: { cols, intents: intentsRecord, rows },
-      type: 'resizeClient',
-    }).catch((error) => this.reportCommandError('resizeClient', error))
+    this.dispatchCommand(
+      {
+        id: crypto.randomUUID(),
+        payload: { cols, intents: intentsRecord, rows },
+        type: 'resizeClient',
+      },
+      'resizeClient'
+    )
   }
 
   resizeTab(
@@ -442,19 +457,21 @@ export class RemoteSessionBackend
     if (!this.attached) {
       return
     }
-    void this.sendExpectOk({
-      id: crypto.randomUUID(),
-      payload: { cols, intent, rows, tabId },
-      type: 'resizeTab',
-    }).catch((error) => this.reportCommandError('resizeTab', error, tabId))
+    this.dispatchCommand(
+      { id: crypto.randomUUID(), payload: { cols, intent, rows, tabId }, type: 'resizeTab' },
+      'resizeTab',
+      tabId
+    )
   }
 
   disposeSession(tabId: string): void {
     if (!this.attached) {
       return
     }
-    void this.sendExpectOk({ id: crypto.randomUUID(), payload: { tabId }, type: 'closeTab' }).catch(
-      (error) => this.reportCommandError('closeTab', error, tabId)
+    this.dispatchCommand(
+      { id: crypto.randomUUID(), payload: { tabId }, type: 'closeTab' },
+      'closeTab',
+      tabId
     )
   }
 
@@ -462,9 +479,7 @@ export class RemoteSessionBackend
     if (!this.attached) {
       return
     }
-    void this.sendExpectOk({ id: crypto.randomUUID(), payload: {}, type: 'disposeAll' }).catch(
-      (error) => this.reportCommandError('disposeAll', error)
-    )
+    this.dispatchCommand({ id: crypto.randomUUID(), payload: {}, type: 'disposeAll' }, 'disposeAll')
   }
 
   async destroy(keepSessions = true): Promise<void> {

package/src/session-backend/types.ts

@@ -10,7 +10,7 @@ import type {
   WorkspaceSnapshotV1,
 } from '../state/types'
 
-export type SessionBackendEvents = {
+export interface SessionBackendEvents {
   render: [tabId: string, viewport: TerminalSnapshot, terminalModes: TerminalModeState]
   exit: [tabId: string, exitCode: number]
   error: [tabId: string, message: string]
@@ -26,7 +26,7 @@ export interface BackendAttachResult {
    * atomically with tab hydration to prevent an unknown-tab race on
    * separate `sessionActivity` events.
    */
-  initialSessionStatuses: Array<{ sessionId: string; status: SessionStatus }>
+  initialSessionStatuses: { sessionId: string; status: SessionStatus }[]
 }
 
 export interface SessionBackend extends EventEmitter<SessionBackendEvents> {

package/src/snippets/expand-variables.ts

@@ -34,16 +34,16 @@ const VAR_RE = /\{\{([^{}]+)\}\}/g
 const TWO = (n: number): string => String(n).padStart(2, '0')
 
 function formatDate(date: Date, format?: string): string {
-  if (!format) {
+  if (!(format != null && format !== '')) {
     return `${date.getFullYear()}-${TWO(date.getMonth() + 1)}-${TWO(date.getDate())}`
   }
   return format
-    .replace(/YYYY/g, String(date.getFullYear()))
-    .replace(/MM/g, TWO(date.getMonth() + 1))
-    .replace(/DD/g, TWO(date.getDate()))
-    .replace(/HH/g, TWO(date.getHours()))
-    .replace(/mm/g, TWO(date.getMinutes()))
-    .replace(/ss/g, TWO(date.getSeconds()))
+    .replaceAll('YYYY', String(date.getFullYear()))
+    .replaceAll('MM', TWO(date.getMonth() + 1))
+    .replaceAll('DD', TWO(date.getDate()))
+    .replaceAll('HH', TWO(date.getHours()))
+    .replaceAll('mm', TWO(date.getMinutes()))
+    .replaceAll('ss', TWO(date.getSeconds()))
 }
 
 function resolveSyncVariable(name: string, ctx: SyncExpansionContext): string | null {

package/src/snippets/run-shell-var.ts

@@ -14,7 +14,7 @@ const MAX_TIMEOUT_MS = 30_000
  */
 function buildShellArgv(cmd: string): string[] {
   const userShell = process.env.SHELL
-  if (userShell && userShell.length > 0) {
+  if (userShell != null && userShell !== '' && userShell.length > 0) {
     return [userShell, '-l', '-c', cmd]
   }
   return ['/bin/sh', '-c', cmd]

package/src/snippets/trigger-detector.ts

@@ -50,7 +50,7 @@ export function createTriggerDetector(opts: TriggerDetectorOptions): TriggerDete
   function tryMatch(separator: string): TriggerMatch | null {
     const triggerChar = opts.getTriggerChar()
     for (const snippet of opts.getSnippets()) {
-      if (snippet.trigger && snippet.trigger === buffer) {
+      if (snippet.trigger != null && snippet.trigger !== '' && snippet.trigger === buffer) {
         const triggerText = `${triggerChar}${buffer}${separator}`
         reset()
         return { snippet, triggerText }

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(),
       }
     }