@brimveyn/aimux 1.2.5 → 1.3.1

package/src/daemon/session-registry.ts

@@ -1,12 +1,5 @@
 import { EventEmitter } from 'node:events'
 
-import type {
-  TabSession,
-  TerminalModeState,
-  TerminalSnapshot,
-  WorkspaceSnapshotV1,
-} from '../state/types'
-
 import { logDebug } from '../debug/input-log'
 import { PtyManager } from '../pty/pty-manager'
 import {
@@ -15,6 +8,14 @@ import {
   restoreTabsFromWorkspace,
 } from '../state/session-persistence'
 import { createDefaultTerminalModes } from '../state/terminal-modes'
+import {
+  DEFAULT_SCROLL_INTENT,
+  type ScrollIntent,
+  type TabSession,
+  type TerminalModeState,
+  type TerminalSnapshot,
+  type WorkspaceSnapshotV1,
+} from '../state/types'
 
 type SessionRegistryEvents = {
   render: [tabId: string, viewport: TerminalSnapshot, terminalModes: TerminalModeState]
@@ -138,6 +139,7 @@ export class SessionRegistry extends EventEmitter<SessionRegistryEvents> {
         buffer: '',
         command: [options.command, ...(options.args ?? [])].join(' '),
         id: options.tabId,
+        scrollIntent: DEFAULT_SCROLL_INTENT,
         status: 'starting',
         terminalModes: createDefaultTerminalModes(),
         title: options.title,
@@ -149,6 +151,7 @@ export class SessionRegistry extends EventEmitter<SessionRegistryEvents> {
       existing.exitCode = undefined
       existing.viewport = undefined
       existing.terminalModes = createDefaultTerminalModes()
+      existing.scrollIntent = DEFAULT_SCROLL_INTENT
       existing.assistant = options.assistant
       existing.title = options.title
       existing.command = [options.command, ...(options.args ?? [])].join(' ')
@@ -162,12 +165,12 @@ export class SessionRegistry extends EventEmitter<SessionRegistryEvents> {
     this.ptyManager.write(tabId, data)
   }
 
-  resizeAll(cols: number, rows: number): void {
-    this.ptyManager.resizeAll(cols, rows)
+  resizeAll(cols: number, rows: number, intents?: Map<string, ScrollIntent>): void {
+    this.ptyManager.resizeAll(cols, rows, intents)
   }
 
-  resizeTab(tabId: string, cols: number, rows: number): void {
-    this.ptyManager.resizeSession(tabId, cols, rows)
+  resizeTab(tabId: string, cols: number, rows: number, intent?: ScrollIntent): void {
+    this.ptyManager.resizeSession(tabId, cols, rows, intent)
   }
 
   scrollViewport(tabId: string, deltaLines: number): void {
@@ -178,6 +181,10 @@ export class SessionRegistry extends EventEmitter<SessionRegistryEvents> {
     this.ptyManager.scrollViewportToBottom(tabId)
   }
 
+  reapplyScrollIntent(tabId: string, intent: ScrollIntent): void {
+    this.ptyManager.reapplyScrollIntent(tabId, intent)
+  }
+
   setActiveTab(tabId: string | null): void {
     if (tabId === null) {
       this.activeTabId = null

package/src/index.tsx

@@ -3,14 +3,18 @@ import { createCliRenderer } from '@opentui/core'
 import { createRoot } from '@opentui/react'
 
 import { App } from './app'
+import { loadUserConfig } from './config/loader'
 import { runDaemon } from './daemon/daemon'
+import { getRuntimeProfile } from './daemon/runtime-paths'
 import { logDebug } from './debug/input-log'
 import { runDoctor } from './doctor'
 import { runRestartDaemon } from './restart-daemon'
 import { createSessionBackend } from './session-backend/bootstrap'
+import { runTerminalManager } from './terminal-manager/terminal-manager'
 import { runUpdate } from './update'
 
 const command = process.argv[2]
+const runtimeProfile = getRuntimeProfile()
 
 if (command === '--version' || command === '-v' || command === 'version') {
   const { version } = await import('../package.json')
@@ -31,13 +35,18 @@ if (command === 'update') {
 }
 
 if (command === 'daemon') {
-  logDebug('index.daemonMode')
+  logDebug('index.daemonMode', { runtimeProfile })
   await runDaemon()
 }
 
+if (command === 'terminal-manager') {
+  logDebug('index.terminalManagerMode', { runtimeProfile })
+  await runTerminalManager()
+}
+
 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 background 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\n'
   )
   process.exit(0)
 }
@@ -51,6 +60,12 @@ const renderer = await createCliRenderer({
 })
 
 const backend = await createSessionBackend()
-logDebug('index.backendReady', { backend: backend.constructor.name })
+logDebug('index.backendReady', { backend: backend.constructor.name, runtimeProfile })
+
+const resolvedConfig = await loadUserConfig()
+logDebug('index.userConfigLoaded', {
+  leader: resolvedConfig.keymaps.leader,
+  modeCount: resolvedConfig.keymaps.modes.size,
+})
 
-createRoot(renderer).render(<App backend={backend} />)
+createRoot(renderer).render(<App backend={backend} resolvedConfig={resolvedConfig} />)

package/src/input/keymap/describe-bindings.ts

@@ -0,0 +1,68 @@
+import type { ModeId, ResolvedKeymapConfig } from '@brimveyn/aimux-config'
+
+import { parseKeyNotation } from './key-chord'
+import { formatNotationForDisplay } from './key-format'
+
+export interface DescribedBinding {
+  keys: string
+  keysDisplay: string
+  description?: string
+  group?: string
+}
+
+export interface DescribedBindingGroup {
+  group?: string
+  bindings: DescribedBinding[]
+}
+
+interface DescribeOptions {
+  withDescriptionOnly?: boolean
+  dedupeByDescription?: boolean
+}
+
+export function describeBindings(
+  config: ResolvedKeymapConfig,
+  modeId: ModeId,
+  options: DescribeOptions = {}
+): DescribedBinding[] {
+  const mode = config.modes.get(modeId)
+  if (!mode) return []
+
+  const leaderChord = parseKeyNotation(config.leader)[0]
+  const seenDescriptions = new Set<string>()
+  const result: DescribedBinding[] = []
+
+  for (const binding of mode.bindings) {
+    if (options.withDescriptionOnly && !binding.description) continue
+    if (options.dedupeByDescription && binding.description) {
+      if (seenDescriptions.has(binding.description)) continue
+      seenDescriptions.add(binding.description)
+    }
+    result.push({
+      description: binding.description,
+      group: binding.group,
+      keys: binding.keys,
+      keysDisplay: formatNotationForDisplay(binding.keys, leaderChord),
+    })
+  }
+
+  return result
+}
+
+export function groupDescribedBindings(bindings: DescribedBinding[]): DescribedBindingGroup[] {
+  const groups: DescribedBindingGroup[] = []
+  const indexByLabel = new Map<string | undefined, number>()
+
+  for (const binding of bindings) {
+    const label = binding.group
+    const existing = indexByLabel.get(label)
+    if (existing === undefined) {
+      indexByLabel.set(label, groups.length)
+      groups.push({ bindings: [binding], group: label })
+    } else {
+      groups[existing]?.bindings.push(binding)
+    }
+  }
+
+  return groups
+}

package/src/input/keymap/key-format.ts

@@ -0,0 +1,67 @@
+import { type KeyChord, parseKeyNotation } from './key-chord'
+
+const SPECIAL_DISPLAY: Record<string, string> = {
+  backspace: 'Backspace',
+  down: '↓',
+  escape: 'Esc',
+  left: '←',
+  return: 'Enter',
+  right: '→',
+  space: 'Space',
+  tab: 'Tab',
+  up: '↑',
+}
+
+function formatModifierKey(baseName: string): string {
+  const special = SPECIAL_DISPLAY[baseName]
+  if (special) return special
+  if (baseName.length === 1) return baseName.toUpperCase()
+  return baseName.charAt(0).toUpperCase() + baseName.slice(1)
+}
+
+/** Convert a single canonical KeyChord back to a human-readable label. */
+export function formatChord(chord: KeyChord, leader?: KeyChord): string {
+  if (leader && chord === leader) return '<leader>'
+
+  let ctrl = false
+  let meta = false
+  let rest = chord
+
+  while (true) {
+    if (rest.startsWith('C-')) {
+      ctrl = true
+      rest = rest.slice(2)
+      continue
+    }
+    if (rest.startsWith('M-')) {
+      meta = true
+      rest = rest.slice(2)
+      continue
+    }
+    break
+  }
+
+  if (!ctrl && !meta) {
+    if (rest.length === 1 && /^[A-Z]$/.test(rest)) {
+      return `Shift+${rest}`
+    }
+    return SPECIAL_DISPLAY[rest] ?? rest
+  }
+
+  const parts: string[] = []
+  if (ctrl) parts.push('Ctrl')
+  if (meta) parts.push('Alt')
+  parts.push(formatModifierKey(rest))
+  return parts.join('+')
+}
+
+/** Convert a raw key notation string (e.g. `<C-n>`, `dd`) to a human label. */
+export function formatNotationForDisplay(notation: string, leader?: KeyChord): string {
+  let chords: KeyChord[]
+  try {
+    chords = parseKeyNotation(notation, leader)
+  } catch {
+    return notation
+  }
+  return chords.map((c) => formatChord(c, leader)).join(' ')
+}

package/src/input/modes/bridge.ts

@@ -28,6 +28,7 @@ const MODAL_MODE_IDS: Partial<Record<SupportedModalType, ModeId>> = {
   'snippet-picker': 'modal.snippet-picker',
   'split-picker': 'modal.split-picker',
   'theme-picker': 'modal.theme-picker',
+  'update-available': 'modal.update-available',
 }
 
 export function deriveModeId(state: AppState): ModeId {

package/src/input/modes/transitions.ts

@@ -22,6 +22,7 @@ const TRANSITIONS: Record<ModeId, readonly ModeId[]> = {
   'modal.snippet-picker.filtering': ['modal.snippet-picker'],
   'modal.split-picker': ['navigation'],
   'modal.theme-picker': ['navigation'],
+  'modal.update-available': ['navigation'],
   'navigation': [
     'terminal-input',
     'modal.new-tab',
@@ -30,6 +31,7 @@ const TRANSITIONS: Record<ModeId, readonly ModeId[]> = {
     'modal.snippet-picker',
     'modal.theme-picker',
     'modal.rename-tab',
+    'modal.update-available',
     'git-mode',
   ],
   'terminal-input': ['navigation', 'layout'],

package/src/input/modes/types.ts

@@ -21,6 +21,7 @@ export type ModeId =
   | 'modal.help'
   | 'modal.split-picker'
   | 'modal.git-commit'
+  | 'modal.update-available'
 
 export type SideEffect =
   | { type: 'quit'; state: AppState }
@@ -51,6 +52,7 @@ export type SideEffect =
   | { type: 'git-rm'; path: string }
   | { type: 'git-commit'; title: string; body: string }
   | { type: 'git-push' }
+  | { type: 'confirm-update-selection' }
 
 export interface KeyResult {
   actions: AppAction[]