@brimveyn/aimux 1.4.0 → 1.5.0

package/src/config.ts

@@ -9,18 +9,43 @@ import { THEME_IDS, type ThemeId } from './ui/themes'
 
 export const CONFIG_PATH = `${getProfileConfigDir()}/aimux.json`
 
+export interface PersistedGitPane {
+  visible: boolean
+  mode: 'embedded' | 'pane'
+  position: 'top' | 'bottom' | 'left' | 'right'
+  ratio: number
+}
+
 export interface AimuxConfig {
   version: 2
   customCommands: Record<string, string>
   themeId?: ThemeId
-  gitPanelVisible?: boolean
-  gitPanelRatio?: number
+  gitPane?: PersistedGitPane
   sessionBarVisible?: boolean
   sessionBarPosition?: SessionBarPosition
   workspaceSnapshot?: WorkspaceSnapshotV1
   skippedUpdateVersion?: string
 }
 
+function isPersistedGitPane(value: unknown): value is PersistedGitPane {
+  if (typeof value !== 'object' || value === null) return false
+  const v = value as Record<string, unknown>
+  const modeOk = v.mode === 'embedded' || v.mode === 'pane'
+  const positionOk =
+    v.position === 'top' ||
+    v.position === 'bottom' ||
+    v.position === 'left' ||
+    v.position === 'right'
+  const ratioOk =
+    typeof v.ratio === 'number' && Number.isFinite(v.ratio) && v.ratio > 0 && v.ratio < 1
+  const visibleOk = typeof v.visible === 'boolean'
+  if (!modeOk || !positionOk || !ratioOk || !visibleOk) return false
+  // cross-field coherence: embedded => top|bottom; pane => left|right
+  if (v.mode === 'embedded' && v.position !== 'top' && v.position !== 'bottom') return false
+  if (v.mode === 'pane' && v.position !== 'left' && v.position !== 'right') return false
+  return true
+}
+
 const DEFAULT_CONFIG: AimuxConfig = {
   customCommands: {},
   version: 2,
@@ -58,6 +83,7 @@ export function loadConfigResult(): ConfigLoadResult {
       version?: number
       customCommands?: unknown
       themeId?: unknown
+      gitPane?: unknown
       gitPanelVisible?: unknown
       gitPanelRatio?: unknown
       sessionBarVisible?: unknown
@@ -80,21 +106,32 @@ export function loadConfigResult(): ConfigLoadResult {
       issues.push('ignored invalid themeId')
     }
 
-    const validGitPanelVisible =
-      typeof parsed.gitPanelVisible === 'boolean' ? parsed.gitPanelVisible : undefined
-    if (parsed.gitPanelVisible !== undefined && validGitPanelVisible === undefined) {
-      issues.push('ignored invalid gitPanelVisible')
+    let validGitPane = isPersistedGitPane(parsed.gitPane) ? parsed.gitPane : undefined
+    if (parsed.gitPane !== undefined && validGitPane === undefined) {
+      issues.push('ignored invalid gitPane')
     }
 
-    const validGitPanelRatio =
-      typeof parsed.gitPanelRatio === 'number' &&
-      Number.isFinite(parsed.gitPanelRatio) &&
-      parsed.gitPanelRatio > 0 &&
-      parsed.gitPanelRatio < 1
-        ? parsed.gitPanelRatio
-        : undefined
-    if (parsed.gitPanelRatio !== undefined && validGitPanelRatio === undefined) {
-      issues.push('ignored invalid gitPanelRatio')
+    // Legacy migration: previous schema stored gitPanelVisible/gitPanelRatio at
+    // top level. If the new `gitPane` field is absent, synthesize it from legacy
+    // keys so users don't lose their toggle/ratio on upgrade.
+    if (validGitPane === undefined) {
+      const legacyVisible =
+        typeof parsed.gitPanelVisible === 'boolean' ? parsed.gitPanelVisible : undefined
+      const legacyRatio =
+        typeof parsed.gitPanelRatio === 'number' &&
+        Number.isFinite(parsed.gitPanelRatio) &&
+        parsed.gitPanelRatio > 0 &&
+        parsed.gitPanelRatio < 1
+          ? parsed.gitPanelRatio
+          : undefined
+      if (legacyVisible !== undefined || legacyRatio !== undefined) {
+        validGitPane = {
+          mode: 'embedded',
+          position: 'bottom',
+          ratio: legacyRatio ?? 0.5,
+          visible: legacyVisible ?? true,
+        }
+      }
     }
 
     const validSessionBarVisible =
@@ -133,8 +170,7 @@ export function loadConfigResult(): ConfigLoadResult {
     return {
       config: {
         customCommands: isCustomCommandsRecord(parsed.customCommands) ? parsed.customCommands : {},
-        gitPanelRatio: validGitPanelRatio,
-        gitPanelVisible: validGitPanelVisible,
+        gitPane: validGitPane,
         sessionBarPosition: validSessionBarPosition,
         sessionBarVisible: validSessionBarVisible,
         skippedUpdateVersion: validSkippedUpdateVersion,

package/src/daemon/session-manager.ts

@@ -67,8 +67,14 @@ export class SessionManager extends EventEmitter<SessionManagerEvents> {
     this.getOrCreateRegistry(sessionId).write(tabId, data)
   }
 
-  resize(sessionId: string, cols: number, rows: number, intents?: Map<string, ScrollIntent>): void {
-    this.getOrCreateRegistry(sessionId).resizeAll(cols, rows, intents)
+  resize(
+    sessionId: string,
+    cols: number,
+    rows: number,
+    intents?: Map<string, ScrollIntent>,
+    options?: { sync?: boolean }
+  ): void {
+    this.getOrCreateRegistry(sessionId).resizeAll(cols, rows, intents, options)
   }
 
   resizeTab(
@@ -76,9 +82,10 @@ export class SessionManager extends EventEmitter<SessionManagerEvents> {
     tabId: string,
     cols: number,
     rows: number,
-    intent?: ScrollIntent
+    intent?: ScrollIntent,
+    options?: { sync?: boolean }
   ): void {
-    this.getOrCreateRegistry(sessionId).resizeTab(tabId, cols, rows, intent)
+    this.getOrCreateRegistry(sessionId).resizeTab(tabId, cols, rows, intent, options)
   }
 
   scroll(sessionId: string, tabId: string, deltaLines: number): void {

package/src/daemon/session-registry.ts

@@ -165,12 +165,23 @@ export class SessionRegistry extends EventEmitter<SessionRegistryEvents> {
     this.ptyManager.write(tabId, data)
   }
 
-  resizeAll(cols: number, rows: number, intents?: Map<string, ScrollIntent>): void {
-    this.ptyManager.resizeAll(cols, rows, intents)
+  resizeAll(
+    cols: number,
+    rows: number,
+    intents?: Map<string, ScrollIntent>,
+    options?: { sync?: boolean }
+  ): void {
+    this.ptyManager.resizeAll(cols, rows, intents, options)
   }
 
-  resizeTab(tabId: string, cols: number, rows: number, intent?: ScrollIntent): void {
-    this.ptyManager.resizeSession(tabId, cols, rows, intent)
+  resizeTab(
+    tabId: string,
+    cols: number,
+    rows: number,
+    intent?: ScrollIntent,
+    options?: { sync?: boolean }
+  ): void {
+    this.ptyManager.resizeSession(tabId, cols, rows, intent, options)
   }
 
   scrollViewport(tabId: string, deltaLines: number): void {

package/src/index.tsx

@@ -9,6 +9,7 @@ import { getRuntimeProfile } from './daemon/runtime-paths'
 import { logDebug } from './debug/input-log'
 import { runDoctor } from './doctor'
 import { runRestartDaemon } from './restart-daemon'
+import { runRestartTerminalManager } from './restart-terminal-manager'
 import { createSessionBackend } from './session-backend/bootstrap'
 import { runTerminalManager } from './terminal-manager/terminal-manager'
 import { runUpdate } from './update'
@@ -30,6 +31,10 @@ if (command === 'restart-daemon') {
   process.exit(await runRestartDaemon())
 }
 
+if (command === 'restart-terminal-manager') {
+  process.exit(await runRestartTerminalManager())
+}
+
 if (command === 'update') {
   process.exit(await runUpdate())
 }
@@ -46,7 +51,7 @@ if (command === 'terminal-manager') {
 
 if (command === '--help' || command === '-h') {
   process.stdout.write(
-    'aimux -- terminal multiplexer for AI CLIs\n\nUsage:\n  aimux                  Start aimux\n  aimux update           Update to latest version\n  aimux doctor           Diagnose setup issues\n  aimux restart-daemon   Restart IPC daemon\n\n'
+    'aimux -- terminal multiplexer for AI CLIs\n\nUsage:\n  aimux                           Start aimux\n  aimux update                    Update to latest version\n  aimux doctor                    Diagnose setup issues\n  aimux restart-daemon            Restart IPC daemon\n  aimux restart-terminal-manager  Restart terminal-manager (kills live sessions)\n\n'
   )
   process.exit(0)
 }

package/src/input/keymap/build-handlers.ts

@@ -18,6 +18,7 @@ export function buildKeymapHandlers(config: ResolvedKeymapConfig): KeymapModeHan
       const sequence = parseKeyNotation(binding.keys, leaderChord)
       trie.insert(sequence, {
         group: binding.group,
+        repeatable: binding.repeatable,
         result: binding.result,
       })
     }

package/src/input/keymap/help-entries.ts

@@ -0,0 +1,44 @@
+import type { ModeId, ResolvedKeymapConfig } from '@brimveyn/aimux-config'
+
+import { describeBindings, type DescribedBinding } from './describe-bindings'
+
+export interface HelpEntry extends DescribedBinding {
+  mode: ModeId
+  modeLabel: string
+}
+
+export const HELP_MODE_LABELS: { modeId: ModeId; label: string }[] = [
+  { label: 'Navigation', modeId: 'navigation' },
+  { label: 'Terminal input', modeId: 'terminal-input' },
+  { label: 'Git mode', modeId: 'git-mode' },
+  { label: 'Git commit', modeId: 'modal.git-commit' },
+  { label: 'New tab', modeId: 'modal.new-tab' },
+  { label: 'New tab — command', modeId: 'modal.new-tab.command-edit' },
+  { label: 'Session picker', modeId: 'modal.session-picker' },
+  { label: 'Session picker — filter', modeId: 'modal.session-picker.filtering' },
+  { label: 'Session name', modeId: 'modal.session-name' },
+  { label: 'Create session', modeId: 'modal.create-session' },
+  { label: 'Rename tab', modeId: 'modal.rename-tab' },
+  { label: 'Snippet picker', modeId: 'modal.snippet-picker' },
+  { label: 'Snippet picker — filter', modeId: 'modal.snippet-picker.filtering' },
+  { label: 'Snippet editor', modeId: 'modal.snippet-editor' },
+  { label: 'Theme picker', modeId: 'modal.theme-picker' },
+  { label: 'Split picker', modeId: 'modal.split-picker' },
+  { label: 'Help', modeId: 'modal.help' },
+  { label: 'Help — filter', modeId: 'modal.help.filtering' },
+  { label: 'Update available', modeId: 'modal.update-available' },
+]
+
+export function collectHelpEntries(config: ResolvedKeymapConfig): HelpEntry[] {
+  const entries: HelpEntry[] = []
+  for (const { label, modeId } of HELP_MODE_LABELS) {
+    const bindings = describeBindings(config, modeId, {
+      dedupeByDescription: true,
+      withDescriptionOnly: true,
+    })
+    for (const binding of bindings) {
+      entries.push({ ...binding, mode: modeId, modeLabel: label })
+    }
+  }
+  return entries
+}

package/src/input/keymap/keymap-ref.ts

@@ -0,0 +1,11 @@
+import type { ResolvedKeymapConfig } from '@brimveyn/aimux-config'
+
+let activeKeymap: ResolvedKeymapConfig | null = null
+
+export function setActiveKeymap(config: ResolvedKeymapConfig | null): void {
+  activeKeymap = config
+}
+
+export function getActiveKeymap(): ResolvedKeymapConfig | null {
+  return activeKeymap
+}

package/src/input/keymap/sequence-resolver.ts

@@ -17,6 +17,8 @@ export class SequenceResolver {
   private timeoutHandle: ReturnType<typeof setTimeout> | null = null
   private onTimeout: ((binding: TrieBinding) => void) | null = null
   private onPendingChange: ((chords: KeyChord[] | null) => void) | null = null
+  private repeatTerminal: KeyChord | null = null
+  private repeatBinding: TrieBinding | null = null
 
   constructor(
     private readonly trie: KeyTrie,
@@ -37,16 +39,29 @@ export class SequenceResolver {
   feed(chord: KeyChord): ResolveResult {
     this.clearTimeout()
 
+    // Repeat: when not mid-sequence and the chord matches the last repeatable
+    // sequence's terminal key, re-fire it.
+    if (
+      this.currentNode === null &&
+      this.repeatTerminal !== null &&
+      this.repeatBinding !== null &&
+      chord === this.repeatTerminal
+    ) {
+      return { binding: this.repeatBinding, type: 'resolved' }
+    }
+
     const fromNode = this.currentNode ?? this.trie.root
     const match = this.trie.lookup(chord, fromNode)
 
     switch (match.type) {
       case 'exact': {
         this.resetState()
+        this.updateRepeatOnResolve(chord, match.binding)
         return { binding: match.binding, type: 'resolved' }
       }
 
       case 'prefix': {
+        this.clearRepeat()
         this.currentNode = match.node
         this.pendingBinding = null
         this.pendingChords.push(chord)
@@ -55,11 +70,12 @@ export class SequenceResolver {
       }
 
       case 'exact+prefix': {
+        this.clearRepeat()
         this.currentNode = match.node
         this.pendingBinding = match.binding
         this.pendingChords.push(chord)
         this.emitPendingChange()
-        this.startTimeout(match.binding)
+        this.startTimeout(chord, match.binding)
         return { type: 'pending' }
       }
 
@@ -69,6 +85,7 @@ export class SequenceResolver {
           this.resetState()
           return this.feed(chord)
         }
+        this.clearRepeat()
         return { type: 'passthrough' }
       }
     }
@@ -77,6 +94,7 @@ export class SequenceResolver {
   reset(): void {
     this.clearTimeout()
     this.resetState()
+    this.clearRepeat()
   }
 
   setTimeoutCallback(cb: (binding: TrieBinding) => void): void {
@@ -107,11 +125,26 @@ export class SequenceResolver {
     }
   }
 
-  private startTimeout(binding: TrieBinding): void {
+  private startTimeout(chord: KeyChord, binding: TrieBinding): void {
     this.timeoutHandle = setTimeout(() => {
       this.timeoutHandle = null
       this.resetState()
+      this.updateRepeatOnResolve(chord, binding)
       this.onTimeout?.(binding)
     }, this.config.timeoutMs)
   }
+
+  private updateRepeatOnResolve(chord: KeyChord, binding: TrieBinding): void {
+    if (binding.repeatable) {
+      this.repeatTerminal = chord
+      this.repeatBinding = binding
+    } else {
+      this.clearRepeat()
+    }
+  }
+
+  private clearRepeat(): void {
+    this.repeatTerminal = null
+    this.repeatBinding = null
+  }
 }

package/src/input/keymap/trie.ts

@@ -6,6 +6,7 @@ export type ActionFn = (ctx: ModeContext) => KeyResult | null
 export interface TrieBinding {
   result: KeyResult | ActionFn
   group?: string
+  repeatable?: boolean
 }
 
 export interface TrieNode {

package/src/input/modes/bridge.ts

@@ -5,7 +5,6 @@ type SupportedModalType = Exclude<ModalType, null>
 
 const DIRECT_FOCUS_MODE_IDS: Partial<Record<FocusMode, ModeId>> = {
   'git': 'git-mode',
-  'layout': 'layout',
   'navigation': 'navigation',
   'terminal-input': 'terminal-input',
 }
@@ -13,6 +12,7 @@ const DIRECT_FOCUS_MODE_IDS: Partial<Record<FocusMode, ModeId>> = {
 const COMMAND_EDIT_MODE_IDS: Partial<Record<SupportedModalType, ModeId>> = {
   'create-session': 'modal.create-session',
   'git-commit': 'modal.git-commit',
+  'help': 'modal.help.filtering',
   'new-tab': 'modal.new-tab.command-edit',
   'rename-tab': 'modal.rename-tab',
   'session-name': 'modal.session-name',

package/src/input/modes/handlers/shared.ts

@@ -68,19 +68,3 @@ export function handleCtrlNavigation(key: KeyInput): KeyResult | null {
 
   return null
 }
-
-export function handleCursorNavigation(key: KeyInput): KeyResult | null {
-  if (key.name === 'left' && !key.ctrl && !key.meta) {
-    return result([{ delta: -1, type: 'move-modal-cursor' }])
-  }
-  if (key.name === 'right' && !key.ctrl && !key.meta) {
-    return result([{ delta: 1, type: 'move-modal-cursor' }])
-  }
-  if (key.name === 'home' || (key.ctrl && key.name === 'a')) {
-    return result([{ to: 'home', type: 'move-modal-cursor' }])
-  }
-  if (key.name === 'end' || (key.ctrl && key.name === 'e')) {
-    return result([{ to: 'end', type: 'move-modal-cursor' }])
-  }
-  return null
-}

package/src/input/modes/transitions.ts

@@ -2,10 +2,10 @@ import type { ModeId } from './types'
 
 const TRANSITIONS: Record<ModeId, readonly ModeId[]> = {
   'git-mode': ['navigation', 'modal.git-commit'],
-  'layout': ['terminal-input', 'navigation', 'modal.split-picker'],
   'modal.create-session': ['navigation', 'modal.session-picker'],
   'modal.git-commit': ['git-mode'],
-  'modal.help': ['navigation'],
+  'modal.help': ['navigation', 'modal.help.filtering'],
+  'modal.help.filtering': ['modal.help'],
   'modal.new-tab': ['navigation', 'modal.new-tab.command-edit'],
   'modal.new-tab.command-edit': ['modal.new-tab'],
   'modal.rename-tab': ['navigation'],
@@ -20,7 +20,7 @@ const TRANSITIONS: Record<ModeId, readonly ModeId[]> = {
   'modal.snippet-editor': ['navigation', 'modal.snippet-picker'],
   'modal.snippet-picker': ['navigation', 'modal.snippet-picker.filtering', 'modal.snippet-editor'],
   'modal.snippet-picker.filtering': ['modal.snippet-picker'],
-  'modal.split-picker': ['navigation'],
+  'modal.split-picker': ['navigation', 'terminal-input'],
   'modal.theme-picker': ['navigation'],
   'modal.update-available': ['navigation'],
   'navigation': [
@@ -34,7 +34,7 @@ const TRANSITIONS: Record<ModeId, readonly ModeId[]> = {
     'modal.update-available',
     'git-mode',
   ],
-  'terminal-input': ['navigation', 'layout'],
+  'terminal-input': ['navigation', 'modal.split-picker'],
 }
 
 export function isValidTransition(from: ModeId, to: ModeId): boolean {

package/src/input/modes/types.ts

@@ -5,7 +5,6 @@ import type { AppAction, AppState, TabSession } from '../../state/types'
 export type ModeId =
   | 'navigation'
   | 'terminal-input'
-  | 'layout'
   | 'git-mode'
   | 'modal.new-tab'
   | 'modal.new-tab.command-edit'
@@ -19,6 +18,7 @@ export type ModeId =
   | 'modal.snippet-editor'
   | 'modal.theme-picker'
   | 'modal.help'
+  | 'modal.help.filtering'
   | 'modal.split-picker'
   | 'modal.git-commit'
   | 'modal.update-available'

package/src/platform/daemon-control.ts

@@ -21,10 +21,6 @@ export async function findSocketProcessPid(socketPath: string): Promise<number |
   }
 }
 
-export async function findDaemonPid(socketPath: string): Promise<number | null> {
-  return findSocketProcessPid(socketPath)
-}
-
 export async function findIpcDaemonPid(): Promise<number | null> {
   return findSocketProcessPid(getIpcDaemonSocketPath())
 }
@@ -53,10 +49,6 @@ export async function killProcess(pid: number): Promise<void> {
   }
 }
 
-export async function killDaemon(pid: number): Promise<void> {
-  await killProcess(pid)
-}
-
 async function waitForSocket(socketPath: string): Promise<boolean> {
   const deadline = Date.now() + 2_000
   while (Date.now() < deadline) {