@brimveyn/aimux 1.2.5 → 1.3.1

package/README.md

@@ -21,7 +21,7 @@ A terminal multiplexer for AI CLIs. Manage multiple AI assistant sessions (Claud
 - **Directory picker** — Fuzzy-search git repos and worktrees from `$HOME` using `fzf`
 - **Session persistence** — Workspace state (tabs, titles, layout) saved and restored on restart
 - **Git status panel** — Branch + diff summary in the sidebar
-- **Daemon mode** — Background daemon keeps sessions alive across terminal restarts
+- **Seamless daemon updates** — A restartable IPC daemon now reconnects to a long-lived terminal manager, so updates and IPC changes do not kill live tabs
 - **Snippets** — Save and reuse prompt snippets across sessions
 - **Theme picker** — Switch between 11 built-in themes on the fly
 - **Pending-chord indicator** — Bottom-right overlay shows mid-sequence key state (like nvim's `which-key`)
@@ -58,20 +58,22 @@ aimux                  # start the TUI
 aimux version          # print version
 aimux doctor           # check setup
 aimux update           # self-update
-aimux restart-daemon   # restart background daemon
+aimux restart-daemon   # restart IPC daemon only
 ```
 
+`aimux update` and `aimux restart-daemon` restart only the IPC daemon. Live PTYs and headless terminal state stay in the long-lived terminal-manager process, so active tabs can be reattached instead of being restarted.
+
 ## Configuration
 
-aimux reads `~/.config/aimux/aimux.config.ts` at startup. Set it up with:
+aimux reads `~/.config/aimux/<profile>/aimux.config.ts` at startup. The default installed profile is `default`, while the repository dev scripts use `dev`. Set up the default profile with:
 
 ```bash
-mkdir -p ~/.config/aimux && cd ~/.config/aimux
+mkdir -p ~/.config/aimux/default && cd ~/.config/aimux/default
 bun init -y
 bun add -d @brimveyn/aimux-config
 ```
 
-Then create `~/.config/aimux/aimux.config.ts`:
+Then create `~/.config/aimux/default/aimux.config.ts`:
 
 ```ts
 import { defineConfig, actions, themes } from '@brimveyn/aimux-config'
@@ -158,6 +160,14 @@ Keystrokes pass through to the active tab's PTY. Configured shortcuts:
 
 ## Architecture
 
+Runtime split:
+
+- `aimux` UI connects to the IPC daemon over the app protocol.
+- The IPC daemon owns the app-facing socket, protocol negotiation, and reconnect behavior.
+- The terminal manager owns PTYs, xterm headless emulators, and live session state.
+
+This split lets the app or IPC daemon change protocols without dropping live shells.
+
 ```
 aimux/
 ├── packages/
@@ -171,9 +181,10 @@ aimux/
     ├── ui/                    # OpenTUI React components
     ├── state/                 # reducers + app store
     ├── pty/                   # PTY and terminal emulation
-    ├── session-backend/       # local and daemon backends
-    ├── daemon/                # background session daemon
-    ├── ipc/                   # daemon protocol
+    ├── session-backend/       # local and remote backends
+    ├── daemon/                # IPC daemon / broker
+    ├── terminal-manager/      # long-lived PTY/session owner
+    ├── ipc/                   # app and manager protocols
     └── input/
         ├── modes/             # mode registry + transitions
         ├── keymap/            # prefix trie + sequence resolver
@@ -201,6 +212,16 @@ bun run check            # typecheck
 bun run lint             # oxlint
 ```
 
+By default the app talks to the background IPC daemon. For explicit single-process debugging only, set `AIMUX_LOCAL_BACKEND=1` before starting aimux.
+
+Profiles live under `~/.config/aimux/<profile>/`. Each profile gets its own config, session catalog, snippet catalog, and matching runtime namespace.
+
+The repository `bun run dev`, `bun run start`, and `bun run restart-daemon` scripts set `AIMUX_PROFILE=dev`, so source builds use `~/.config/aimux/dev/` and their own IPC daemon / terminal-manager sockets instead of interfering with a globally installed `aimux` instance.
+
+You can override the active profile manually with `AIMUX_PROFILE=<name>` when you need multiple isolated environments on the same machine. `AIMUX_RUNTIME_PROFILE` is still accepted as a fallback alias for runtime compatibility.
+
+This profile move is intentionally breaking: aimux no longer reads legacy flat config or catalog files once profile directories are enabled.
+
 ## License
 
 MIT © BrimVeyn

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux",
-  "version": "1.2.5",
+  "version": "1.3.1",
   "description": "A terminal multiplexer for AI CLIs. Run Claude, Codex, OpenCode side-by-side with tabbed navigation, split panes, and persistent sessions.",
   "keywords": [
     "ai",
@@ -42,8 +42,8 @@
     "access": "public"
   },
   "scripts": {
-    "dev": "bun --watch src/index.tsx",
-    "start": "bun run src/index.tsx",
+    "dev": "AIMUX_PROFILE=dev bun --watch src/index.tsx",
+    "start": "AIMUX_PROFILE=dev bun run src/index.tsx",
     "test": "bun test",
     "check": "tsc --noEmit",
     "demo": "vhs assets/demo.tape",
@@ -51,13 +51,13 @@
     "demo:tabs": "vhs assets/tabs.tape",
     "demo:splits": "vhs assets/splits.tape",
     "demo:themes": "vhs assets/themes.tape",
-    "restart-daemon": "bun run src/index.tsx restart-daemon",
+    "restart-daemon": "AIMUX_PROFILE=dev bun run src/index.tsx restart-daemon",
     "lint": "oxlint .",
     "format": "oxfmt --write .",
     "format:check": "oxfmt --check ."
   },
   "dependencies": {
-    "@brimveyn/aimux-config": "0.1.0",
+    "@brimveyn/aimux-config": "0.2.6",
     "@opentui/core": "^0.1.90",
     "@opentui/react": "^0.1.90",
     "@xterm/headless": "^6.0.0",

package/src/app-runtime/backend-runtime-events.ts

@@ -3,6 +3,7 @@ import type { MutableRefObject } from 'react'
 import type { SessionBackend } from '../session-backend/types'
 import type { AppAction, TabSession, TerminalModeState } from '../state/types'
 
+import { logInputDebug } from '../debug/input-log'
 import { type TabRuntimeTimeouts } from './tab-runtime-timeouts'
 
 const IDLE_ACTIVITY_TIMEOUT_MS = 2_000
@@ -44,7 +45,19 @@ export function bindBackendRuntimeEvents({
       return
     }
 
-    dispatch({ tabId, terminalModes, type: 'replace-tab-viewport', viewport })
+    logInputDebug('app.backend.event.render', {
+      lines: viewport.lines.length,
+      tabId,
+      viewportY: viewport.viewportY,
+    })
+
+    dispatch({
+      source: resizingRef.current ? 'resize' : 'data',
+      tabId,
+      terminalModes,
+      type: 'replace-tab-viewport',
+      viewport,
+    })
     if (timeouts.isStartupGraceActive(tabId) || resizingRef.current) {
       return
     }
@@ -54,12 +67,14 @@ export function bindBackendRuntimeEvents({
   }
 
   const handleExit = (tabId: string, exitCode: number) => {
+    logInputDebug('app.backend.event.exit', { exitCode, tabId })
     clearTabRuntimeState(timeouts, tabId)
     dispatch({ exitCode, status: 'exited', tabId, type: 'set-tab-status' })
     dispatch({ activity: undefined, tabId, type: 'set-tab-activity' })
   }
 
   const handleError = (tabId: string, message: string) => {
+    logInputDebug('app.backend.event.error', { message, tabId })
     clearTabRuntimeState(timeouts, tabId)
     dispatch({ message, tabId, type: 'set-tab-error' })
   }

package/src/app-runtime/pty-write.ts

@@ -1,5 +1,5 @@
 import type { SessionBackend } from '../session-backend/types'
-import type { TabSession } from '../state/types'
+import type { AppAction, TabSession } from '../state/types'
 
 import { buildPtyPastePayload } from '../input/paste'
 
@@ -12,10 +12,12 @@ export function writeToTab(
   backend: SessionBackend,
   tabId: string,
   tab: TabSession | undefined,
-  input: string
+  input: string,
+  dispatch?: (action: AppAction) => void
 ): void {
   if (tab && shouldScrollViewportToBottom(tab)) {
     backend.scrollViewportToBottom(tabId)
+    dispatch?.({ intent: { kind: 'bottom' }, tabId, type: 'set-scroll-intent' })
   }
 
   backend.write(tabId, input)
@@ -25,8 +27,9 @@ export function writePasteToTab(
   backend: SessionBackend,
   tabId: string,
   tab: TabSession | undefined,
-  text: string
+  text: string,
+  dispatch?: (action: AppAction) => void
 ): void {
   const payload = buildPtyPastePayload(text, tab?.terminalModes.bracketedPasteMode ?? false)
-  writeToTab(backend, tabId, tab, payload)
+  writeToTab(backend, tabId, tab, payload, dispatch)
 }

package/src/app-runtime/side-effects.ts

@@ -2,7 +2,6 @@ import { $ } from 'bun'
 
 import type { SideEffect } from '../input/modes/types'
 import type { SessionBackend } from '../session-backend/types'
-import type { AppAction, AppState, AssistantId, TabSession } from '../state/types'
 
 import { loadConfig, saveConfig } from '../config'
 import { logInputDebug } from '../debug/input-log'
@@ -27,6 +26,13 @@ import {
 } from '../state/layout-tree'
 import { filterSessions, filterSnippets } from '../state/selectors'
 import { createDefaultTerminalModes } from '../state/terminal-modes'
+import {
+  type AppAction,
+  type AppState,
+  type AssistantId,
+  DEFAULT_SCROLL_INTENT,
+  type TabSession,
+} from '../state/types'
 import { saveCurrentWorkspace } from '../state/workspace-save'
 import { scrollGitDiff } from '../ui/git-view-controls'
 import { applyTheme } from '../ui/theme'
@@ -124,14 +130,14 @@ function pasteSnippetToActiveGroup(ctx: SideEffectContext): void {
   const groupId = getGroupIdForTab(state.tabGroupMap, state.activeTabId)
   const groupTree = groupId ? state.layoutTrees[groupId] : null
   if (!groupTree) {
-    pasteSnippetToTab(backend, state.activeTabId, activeTab, snippet)
+    pasteSnippetToTab(backend, state.activeTabId, activeTab, snippet, ctx.dispatch)
     return
   }
 
   for (const tabId of allLeafIds(groupTree)) {
     const tab = state.tabs.find((entry) => entry.id === tabId)
     if (tab) {
-      pasteSnippetToTab(backend, tabId, tab, snippet)
+      pasteSnippetToTab(backend, tabId, tab, snippet, ctx.dispatch)
     }
   }
 }
@@ -229,6 +235,7 @@ export function createTabSession(
     buffer: '',
     command: customCommand ?? option.command,
     id: createTabId(),
+    scrollIntent: DEFAULT_SCROLL_INTENT,
     status: 'starting',
     terminalModes: createDefaultTerminalModes(),
     title: option.label,
@@ -245,6 +252,14 @@ export function startTabSession(
   rows: number,
   cwd?: string
 ): void {
+  logInputDebug('app.tab.start.request', {
+    cols,
+    command: tab.command,
+    cwd: cwd ?? null,
+    rows,
+    tabId: tab.id,
+    title: tab.title,
+  })
   startStartupGrace(tab.id)
 
   const { args, executable } = parseCommand(tab.command)
@@ -385,7 +400,13 @@ export function executeSideEffect(effect: SideEffect, ctx: SideEffectContext): v
       )
       return
     case 'paste-selected-snippet': {
-      pasteSnippetToTab(backend, state.activeTabId, ctx.activeTab, getSelectedSnippet(state))
+      pasteSnippetToTab(
+        backend,
+        state.activeTabId,
+        ctx.activeTab,
+        getSelectedSnippet(state),
+        dispatch
+      )
       return
     }
     case 'paste-snippet-to-group': {
@@ -463,11 +484,48 @@ export function executeSideEffect(effect: SideEffect, ctx: SideEffectContext): v
       void enqueueGitOp(() => runGitPush(ctx))
       return
     }
+    case 'confirm-update-selection': {
+      handleConfirmUpdateSelection(ctx)
+      return
+    }
     default:
       effect satisfies never
   }
 }
 
+function handleConfirmUpdateSelection(ctx: SideEffectContext): void {
+  const { state } = ctx
+  if (state.modal.type !== 'update-available') {
+    return
+  }
+  const latest = state.modal.latestVersion
+  if (state.modal.selectedIndex === 0) {
+    runUpdateFromTui(ctx, latest)
+    return
+  }
+  saveConfig({ ...loadConfig(), skippedUpdateVersion: latest })
+}
+
+function runUpdateFromTui(ctx: SideEffectContext, latestVersion: string): void {
+  saveCurrentWorkspace(ctx.state)
+  void ctx.backend.destroy(true)
+  ctx.renderer.destroy()
+  process.stdout.write(`\nUpdating aimux to ${latestVersion}...\n`)
+  const proc = Bun.spawn(['bun', 'update', '-g', '@brimveyn/aimux', '@brimveyn/aimux-config'], {
+    stderr: 'inherit',
+    stdin: 'inherit',
+    stdout: 'inherit',
+  })
+  void proc.exited.then((code) => {
+    if (code === 0) {
+      process.stdout.write(`\nUpdated. Run \`aimux\` to start the new version.\n`)
+    } else {
+      process.stderr.write(`\nUpdate failed (exit code ${code}).\n`)
+    }
+    process.exit(code ?? 1)
+  })
+}
+
 async function runGitAction(
   ctx: SideEffectContext,
   args: string[],

package/src/app-runtime/snippet-actions.ts

@@ -57,13 +57,14 @@ export function pasteSnippetToTab(
   backend: SessionBackend,
   activeTabId: string | null,
   activeTab: TabSession | undefined,
-  snippet: SnippetRecord | undefined
+  snippet: SnippetRecord | undefined,
+  dispatch?: (action: AppAction) => void
 ): void {
   if (!snippet || !activeTabId || !activeTab) {
     return
   }
 
-  writePasteToTab(backend, activeTabId, activeTab, snippet.content)
+  writePasteToTab(backend, activeTabId, activeTab, snippet.content, dispatch)
 }
 
 export function handleDeleteSnippetEffect(

package/src/app-runtime/use-backend-runtime.ts

@@ -1,7 +1,7 @@
 import { type MutableRefObject, useEffect, useRef } from 'react'
 
 import type { SessionBackend } from '../session-backend/types'
-import type { AppAction, LayoutState } from '../state/types'
+import type { AppAction, LayoutState, ScrollIntent } from '../state/types'
 
 import { attachCurrentSession } from './backend-attach-runtime'
 import { bindBackendRuntimeEvents } from './backend-runtime-events'
@@ -11,6 +11,7 @@ interface BackendRuntimeOptions {
   backend: SessionBackend
   dispatch: (action: AppAction) => void
   activeTabId: string | null
+  activeTabScrollIntentRef: MutableRefObject<ScrollIntent | null>
   currentSessionId: string | null
   layoutRef: MutableRefObject<LayoutState>
   resizingRef: MutableRefObject<boolean>
@@ -25,6 +26,7 @@ export interface TabRuntimeControls {
 
 export function useBackendRuntime({
   activeTabId,
+  activeTabScrollIntentRef,
   backend,
   currentSessionId,
   currentSessionWorkspaceSnapshot,
@@ -65,7 +67,10 @@ export function useBackendRuntime({
     }
 
     backend.setActiveTab(activeTabId)
-  }, [activeTabId, backend, currentSessionId])
+    if (activeTabId && activeTabScrollIntentRef.current) {
+      backend.reapplyScrollIntent(activeTabId, activeTabScrollIntentRef.current)
+    }
+  }, [activeTabId, activeTabScrollIntentRef, backend, currentSessionId])
 
   useEffect(() => {
     return bindBackendRuntimeEvents({

package/src/app-runtime/use-renderer-bindings.ts

@@ -60,7 +60,7 @@ export function useRendererBindings({
         activeTabRef.current?.terminalModes.bracketedPasteMode ?? false,
       getFocusMode: () => focusModeRef.current,
       handleTerminalShortcut,
-      writeToPty: (tabId, data) => writeToTab(backend, tabId, activeTabRef.current, data),
+      writeToPty: (tabId, data) => writeToTab(backend, tabId, activeTabRef.current, data, dispatch),
     })
 
     const handlePasteEvent = (event: { bytes: Uint8Array; defaultPrevented?: boolean }) => {
@@ -96,7 +96,7 @@ export function useRendererBindings({
         return
       }
 
-      writePasteToTab(backend, tabId, tab, payload)
+      writePasteToTab(backend, tabId, tab, payload, dispatch)
     }
 
     const handleSelection = (selection: OtuiSelection) => {

package/src/app-runtime/use-terminal-resize.ts

@@ -2,7 +2,7 @@ import { type MutableRefObject, useEffect, useMemo, useRef } from 'react'
 
 import type { TerminalContentOrigin } from '../input/raw-input-handler'
 import type { SessionBackend } from '../session-backend/types'
-import type { AppAction, AppState } from '../state/types'
+import type { AppAction, AppState, ScrollIntent } from '../state/types'
 
 import {
   createTerminalBounds,
@@ -27,20 +27,21 @@ function resizeSplitTabs(
   layoutTrees: AppState['layoutTrees'],
   tabIds: string[],
   cols: number,
-  rows: number
+  rows: number,
+  intents: Map<string, ScrollIntent>
 ): void {
   const bounds = getTerminalBounds(cols, rows)
   const resizedTabIds = new Set<string>()
 
   forEachSplitPaneRect(Object.values(layoutTrees), bounds, (tabId, rect) => {
     const size = toTerminalContentSize(rect)
-    backend.resizeTab(tabId, size.cols, size.rows)
+    backend.resizeTab(tabId, size.cols, size.rows, intents.get(tabId))
     resizedTabIds.add(tabId)
   })
 
   for (const id of tabIds) {
     if (!resizedTabIds.has(id)) {
-      backend.resizeTab(id, cols, rows)
+      backend.resizeTab(id, cols, rows, intents.get(id))
     }
   }
 }
@@ -64,6 +65,7 @@ export function useTerminalResize({
 }: UseTerminalResizeOptions) {
   const resizingTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
   const tabIdsRef = useRef<string[]>([])
+  const intentsRef = useRef<Map<string, ScrollIntent>>(new Map())
 
   const currentTabIds = state.tabs.map((t) => t.id)
   const tabIdsChanged =
@@ -74,6 +76,12 @@ export function useTerminalResize({
   }
   const stableTabIds = tabIdsRef.current
 
+  intentsRef.current = new Map(
+    state.tabs
+      .filter((t): t is typeof t & { scrollIntent: ScrollIntent } => t.scrollIntent !== undefined)
+      .map((t) => [t.id, t.scrollIntent])
+  )
+
   const terminalSize = useMemo(() => {
     const sidebarWidth = state.sidebar.visible ? state.sidebar.width + 1 : 0
     const reservedRows =
@@ -118,10 +126,11 @@ export function useTerminalResize({
         state.layoutTrees,
         stableTabIds,
         terminalSize.cols,
-        terminalSize.rows
+        terminalSize.rows,
+        intentsRef.current
       )
     } else {
-      backend.resizeAll(terminalSize.cols, terminalSize.rows)
+      backend.resizeAll(terminalSize.cols, terminalSize.rows, intentsRef.current)
     }
     resizingTimerRef.current = setTimeout(() => {
       resizingRef.current = false

package/src/app.tsx

@@ -1,6 +1,15 @@
-import { getDefaultKeymapConfig } from '@brimveyn/aimux-config'
+import type { ResolvedConfig } from '@brimveyn/aimux-config'
+
 import { useKeyboard, useRenderer, useTerminalDimensions } from '@opentui/react'
-import { useCallback, useLayoutEffect, useMemo, useReducer, useRef, useState } from 'react'
+import {
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useMemo,
+  useReducer,
+  useRef,
+  useState,
+} from 'react'
 
 import type { KeyChord } from './input/keymap/key-chord'
 import type { TrieBinding } from './input/keymap/trie'
@@ -20,19 +29,36 @@ import { deriveModeId } from './input/modes/bridge'
 import { registerAllModes } from './input/modes/handlers'
 import { getHandler, transitionTo } from './input/modes/registry'
 import { type TerminalContentOrigin } from './input/raw-input-handler'
+import { getProfileName } from './profile-paths'
 import { appStore } from './state/app-store'
 import { setActiveDispatch } from './state/dispatch-ref'
 import { loadSessionCatalog } from './state/session-catalog'
 import { loadSnippetCatalog } from './state/snippet-catalog'
 import { appReducer, createInitialState } from './state/store'
+import { KeymapContext } from './ui/keymap-context'
 import { RootView } from './ui/root'
 import { applyTheme } from './ui/theme'
-
-const keymapHandlers = registerAllModes(getDefaultKeymapConfig())
+import {
+  fetchLatestNpmVersion,
+  getCurrentPackageVersion,
+  isNewerVersion,
+} from './update/version-check'
 
 const WORKSPACE_SAVE_DEBOUNCE_MS = 250
 
-export function App({ backend }: { backend: SessionBackend }) {
+export function App({
+  backend,
+  resolvedConfig,
+}: {
+  backend: SessionBackend
+  resolvedConfig: ResolvedConfig
+}) {
+  const keymapHandlers = useMemo(
+    () => registerAllModes(resolvedConfig.keymaps),
+    // Registration has side effects in a global mode registry — run once per app instance.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  )
   const renderer = useRenderer()
   const dimensions = useTerminalDimensions()
   const [themeId, setThemeId] = useState<ThemeId>(() => {
@@ -59,6 +85,31 @@ export function App({ backend }: { backend: SessionBackend }) {
     return () => setActiveDispatch(null)
   }, [dispatch])
 
+  useEffect(() => {
+    if (process.env.AIMUX_DISABLE_UPDATE_CHECK === '1') return
+    if (getProfileName() === 'dev') return
+
+    let cancelled = false
+    void (async () => {
+      const [current, latest] = await Promise.all([
+        getCurrentPackageVersion(),
+        fetchLatestNpmVersion('@brimveyn/aimux'),
+      ])
+      if (cancelled || !latest) return
+      if (!isNewerVersion(latest, current)) return
+      if (loadConfig().skippedUpdateVersion === latest) return
+      dispatch({
+        currentVersion: current,
+        latestVersion: latest,
+        type: 'open-update-available-modal',
+      })
+    })()
+
+    return () => {
+      cancelled = true
+    }
+  }, [])
+
   const resizingRef = useRef(false)
   const layoutRef = useRef(state.layout)
   layoutRef.current = state.layout
@@ -81,6 +132,8 @@ export function App({ backend }: { backend: SessionBackend }) {
   activeTabIdRef.current = state.activeTabId
   const activeTabRef = useRef(activeTab)
   activeTabRef.current = activeTab
+  const activeTabScrollIntentRef = useRef(activeTab?.scrollIntent ?? null)
+  activeTabScrollIntentRef.current = activeTab?.scrollIntent ?? null
 
   const stateRef = useRef(state)
   stateRef.current = state
@@ -90,6 +143,7 @@ export function App({ backend }: { backend: SessionBackend }) {
 
   const { clearIdleTimer, clearStartupGrace, startStartupGrace } = useBackendRuntime({
     activeTabId: state.activeTabId,
+    activeTabScrollIntentRef,
     backend,
     currentSessionId: state.currentSessionId,
     currentSessionWorkspaceSnapshot,
@@ -132,15 +186,18 @@ export function App({ backend }: { backend: SessionBackend }) {
   // Allows handleTerminalShortcut (a stable callback) to reach the latest closure.
   const processKeyResultRef = useRef<(result: KeyResult, modeId: ModeId) => void>(() => {})
 
-  const handleTerminalShortcut = useCallback((chord: KeyChord): boolean => {
-    const terminalHandler = keymapHandlers.find((h) => h.id === 'terminal-input')
-    if (!terminalHandler) return false
-    const ctx: ModeContext = { state: stateRef.current }
-    const result = terminalHandler.handleChord(chord, ctx)
-    if (!result) return false
-    processKeyResultRef.current(result, 'terminal-input')
-    return true
-  }, [])
+  const handleTerminalShortcut = useCallback(
+    (chord: KeyChord): boolean => {
+      const terminalHandler = keymapHandlers.find((h) => h.id === 'terminal-input')
+      if (!terminalHandler) return false
+      const ctx: ModeContext = { state: stateRef.current }
+      const result = terminalHandler.handleChord(chord, ctx)
+      if (!result) return false
+      processKeyResultRef.current(result, 'terminal-input')
+      return true
+    },
+    [keymapHandlers]
+  )
 
   useRendererBindings({
     activeTabId: state.activeTabId,
@@ -233,21 +290,23 @@ export function App({ backend }: { backend: SessionBackend }) {
   })
 
   return (
-    <RootView
-      themeId={themeId}
-      contentOrigin={contentOriginRef.current}
-      mouseForwardingEnabled={activeMouseForwardingEnabled}
-      localScrollbackEnabled={activeLocalScrollbackEnabled}
-      onTerminalMouseEvent={handleTerminalMouseEvent}
-      onTerminalScrollEvent={handleTerminalScrollEvent}
-      onTerminalClick={handleTerminalClick}
-      onPaneActivate={handlePaneActivate}
-      onSplitResize={handleSplitResize}
-      onSeparatorDragStart={handleSeparatorDragStart}
-      onSeparatorDrag={handleSeparatorDrag}
-      onSeparatorDragEnd={handleSeparatorDragEnd}
-      terminalCols={terminalSize.cols}
-      terminalRows={terminalSize.rows}
-    />
+    <KeymapContext.Provider value={resolvedConfig.keymaps}>
+      <RootView
+        themeId={themeId}
+        contentOrigin={contentOriginRef.current}
+        mouseForwardingEnabled={activeMouseForwardingEnabled}
+        localScrollbackEnabled={activeLocalScrollbackEnabled}
+        onTerminalMouseEvent={handleTerminalMouseEvent}
+        onTerminalScrollEvent={handleTerminalScrollEvent}
+        onTerminalClick={handleTerminalClick}
+        onPaneActivate={handlePaneActivate}
+        onSplitResize={handleSplitResize}
+        onSeparatorDragStart={handleSeparatorDragStart}
+        onSeparatorDrag={handleSeparatorDrag}
+        onSeparatorDragEnd={handleSeparatorDragEnd}
+        terminalCols={terminalSize.cols}
+        terminalRows={terminalSize.rows}
+      />
+    </KeymapContext.Provider>
   )
 }

package/src/config/loader.ts

@@ -1,8 +1,8 @@
 import { type AimuxUserConfig, resolveConfig, type ResolvedConfig } from '@brimveyn/aimux-config'
-import { homedir } from 'node:os'
 import { join } from 'node:path'
 
 import { logDebug } from '../debug/input-log'
+import { getProfileConfigDir } from '../profile-paths'
 
 const CONFIG_FILENAMES = ['aimux.config.ts', 'aimux.config.js']
 
@@ -11,7 +11,7 @@ const CONFIG_FILENAMES = ['aimux.config.ts', 'aimux.config.js']
  * a resolved config. Falls back to pure defaults if no config file exists.
  */
 export async function loadUserConfig(): Promise<ResolvedConfig> {
-  const configDir = join(homedir(), '.config', 'aimux')
+  const configDir = getProfileConfigDir()
 
   for (const filename of CONFIG_FILENAMES) {
     const configPath = join(configDir, filename)