@brimveyn/aimux-config 0.5.13 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux-config",
-  "version": "0.5.13",
+  "version": "0.6.0",
   "description": "TypeScript configuration API for aimux — keymaps, themes, and backends with a fluent builder.",
   "keywords": [
     "aimux",

package/src/actions.ts

@@ -80,7 +80,7 @@ export const splitHorizontal: KeyResult = r(
 )
 
 export const enterInsert: ActionFn = (ctx: ModeContext) => {
-  if (!ctx.state.activeTabId) return null
+  if (!(ctx.state.activeTabId != null && ctx.state.activeTabId !== '')) return null
   return r([{ focusMode: 'terminal-input', type: 'set-focus-mode' }], [], 'terminal-input')
 }
 
@@ -88,13 +88,15 @@ export const closeModal: KeyResult = r([{ type: 'close-modal' }], [], 'navigatio
 
 export const closeOverlayModal: KeyResult = r([{ type: 'close-modal' }])
 
+export const cancelNewTabModal: KeyResult = r([{ type: 'cancel-command-edit' }])
+
 // ---------------------------------------------------------------------------
 // Dynamic actions (need ctx at runtime — ActionFn)
 // ---------------------------------------------------------------------------
 
 export const closeTab: ActionFn = (ctx: ModeContext) => {
   const tabId = ctx.state.activeTabId
-  if (!tabId) return null
+  if (!(tabId != null && tabId !== '')) return null
   return r([{ type: 'close-active-tab' }], [{ tabId, type: 'close-tab' }])
 }
 
@@ -153,7 +155,7 @@ export function focusPane(direction: 'left' | 'right' | 'up' | 'down'): KeyResul
 export function resizePane(delta: number, axis: 'horizontal' | 'vertical'): ActionFn {
   return (ctx: ModeContext) => {
     const tabId = ctx.state.activeTabId
-    if (!tabId) return null
+    if (!(tabId != null && tabId !== '')) return null
     return r([{ axis, delta, tabId, type: 'resize-pane' }])
   }
 }
@@ -173,7 +175,45 @@ export function moveModalSelectionWithPreview(
 // Modal-specific actions
 // ---------------------------------------------------------------------------
 
-export const launchSelectedAssistant: KeyResult = r([], [{ type: 'launch-selected-assistant' }])
+export const launchSelectedAssistant: ActionFn = (ctx: ModeContext) => {
+  if (ctx.state.modal.type === 'new-tab' && ctx.state.modal.step === 'assistant') {
+    return r([{ type: 'select-new-tab-assistant' }])
+  }
+  if (
+    ctx.state.modal.type === 'new-tab' &&
+    ctx.state.modal.step === 'worktree' &&
+    ctx.state.modal.createWorktree
+  ) {
+    return r([{ type: 'enter-new-tab-worktree-create' }])
+  }
+  return r([], [{ type: 'launch-selected-assistant' }])
+}
+
+export const toggleNewTabWorktree: KeyResult = r([{ type: 'toggle-new-tab-worktree' }])
+
+export const deleteSelectedWorktree: ActionFn = (ctx: ModeContext) => {
+  const modal = ctx.state.modal
+  const sessionId = ctx.state.currentSessionId
+  if (modal.type !== 'new-tab' || modal.step !== 'worktree' || modal.createWorktree) return null
+  if (!(sessionId != null && sessionId !== '')) return null
+  const session = ctx.state.sessions.find((entry) => entry.id === sessionId)
+  const worktree = session?.worktrees?.[modal.selectedIndex]
+  if (!worktree) return null
+  return r(
+    [
+      { index: modal.selectedIndex, type: 'set-modal-selection-index' },
+      { message: null, type: 'set-new-tab-worktree-delete-state' },
+    ],
+    [
+      {
+        force: modal.worktreeDeleteConfirmId === worktree.id,
+        sessionId,
+        type: 'delete-worktree',
+        worktreeId: worktree.id,
+      },
+    ]
+  )
+}
 
 export const cancelCommandEdit = (returnTo: KeyResult['transition']): KeyResult =>
   r([{ type: 'cancel-command-edit' }], [], returnTo)
@@ -201,6 +241,10 @@ export const openSnippetEditor: KeyResult = r(
 
 export const editSelectedSnippet: KeyResult = r([], [{ type: 'edit-selected-snippet' }])
 export const deleteSelectedSnippet: KeyResult = r([], [{ type: 'delete-selected-snippet' }])
+export const openSelectedSnippetSourceInEditor: KeyResult = r(
+  [],
+  [{ type: 'open-selected-snippet-source-in-editor' }]
+)
 
 export const pasteSelectedSnippet: KeyResult = r(
   [{ type: 'close-modal' }],
@@ -278,6 +322,12 @@ export const cancelEditCustomCommand: KeyResult = r(
   'modal.new-tab.command-edit'
 )
 
+export const editSelectedAssistant: KeyResult = r(
+  [],
+  [{ type: 'edit-selected-assistant' }],
+  'modal.new-tab.editing-command'
+)
+
 // ---------------------------------------------------------------------------
 // Update-available modal
 // ---------------------------------------------------------------------------
@@ -288,9 +338,66 @@ export const confirmUpdateSelection: KeyResult = r(
   'navigation'
 )
 
+// ---------------------------------------------------------------------------
+// Worktree-move modal
+// ---------------------------------------------------------------------------
+
+export const openWorktreeMove: ActionFn = (ctx: ModeContext) => {
+  if (ctx.state.gitMode.headOffset > 0) {
+    return r([
+      {
+        message: 'disabled while viewing HEAD~N (press 0 or [ to return)',
+        type: 'git-mode-set-message',
+      },
+    ])
+  }
+  const session = ctx.state.sessions.find((entry) => entry.id === ctx.state.currentSessionId)
+  const worktrees = session?.worktrees ?? []
+  // From git mode, the source is the active worktree (the one being reviewed).
+  const source = worktrees.find((w) => w.id === session?.activeWorktreeId) ?? worktrees[0]
+  const hasBranch = source != null && source.branch != null && source.branch !== ''
+  const others = worktrees.filter((w) => w.id !== source?.id)
+  if (!hasBranch || source == null || others.length < 1) {
+    return r([{ message: 'no other worktree to move into', type: 'git-mode-set-message' }])
+  }
+  // Overlay: no mode transition — deriveModeId routes input to the picker and
+  // focusMode stays 'git' so the git view remains mounted underneath.
+  return r([{ sourceWorktreeId: source.id, type: 'open-worktree-move-modal' }])
+}
+
+export const toggleWorktreeMoveDelete: KeyResult = r([{ type: 'toggle-worktree-move-delete' }])
+
+export const confirmWorktreeMove: ActionFn = (ctx: ModeContext) => {
+  const modal = ctx.state.modal
+  const session = ctx.state.sessions.find((entry) => entry.id === ctx.state.currentSessionId)
+  const worktrees = session?.worktrees ?? []
+  const sourceId = modal.type === 'worktree-move' ? modal.sourceWorktreeId : undefined
+  const source = worktrees.find((w) => w.id === sourceId)
+  const targets = worktrees.filter((w) => w.id !== sourceId)
+  const selectedIndex = modal.type === 'worktree-move' ? modal.selectedIndex : 0
+  const target = targets[selectedIndex]
+  if (!target || !session || !source || modal.type !== 'worktree-move') {
+    return r([{ type: 'close-modal' }])
+  }
+  // Overlay close keeps focusMode 'git' (see close-modal reducer), so the move
+  // result lands back in the git view that was underneath the picker.
+  return r(
+    [{ type: 'close-modal' }],
+    [
+      {
+        deleteSource: modal.deleteSource,
+        sessionId: session.id,
+        sourceWorktreeId: source.id,
+        targetWorktreeId: target.id,
+        type: 'move-worktree',
+      },
+    ]
+  )
+}
+
 export const closePane: ActionFn = (ctx: ModeContext) => {
   const tabId = ctx.state.activeTabId
-  if (!tabId) return null
+  if (!(tabId != null && tabId !== '')) return null
   return r(
     [
       { tabId, type: 'close-pane' },
@@ -335,7 +442,9 @@ export const confirmSessionRename: ActionFn = (ctx: ModeContext) => {
     ? 'modal.session-picker.filtering'
     : 'navigation'
   const effects: KeyResult['effects'] =
-    trimmed && sessionId ? [{ name: trimmed, sessionId, type: 'rename-session' }] : []
+    trimmed && sessionId != null && sessionId !== ''
+      ? [{ name: trimmed, sessionId, type: 'rename-session' }]
+      : []
   return r([closeAction], effects, transition)
 }
 
@@ -344,7 +453,7 @@ export const confirmRenameTab: ActionFn = (ctx: ModeContext) => {
   const trimmed = (ctx.state.modal.editBuffer ?? '').trim()
   const tabId = ctx.state.modal.sessionTargetId
   const actions: KeyResult['actions'] = []
-  if (trimmed && tabId) {
+  if (trimmed && tabId != null && tabId !== '') {
     actions.push({ tabId, title: trimmed, type: 'rename-tab' })
   }
   actions.push({ type: 'close-modal' })
@@ -377,14 +486,14 @@ export const confirmCreateSession: ActionFn = (ctx: ModeContext) => {
 }
 
 function getDefaultSessionName(projectPath?: string): string {
-  if (!projectPath) return ''
+  if (!(projectPath != null && projectPath !== '')) return ''
   const segments = projectPath.split('/').filter(Boolean)
   return segments.at(-1) ?? ''
 }
 
 // Session picker escape (conditional)
 export const sessionPickerEscape: ActionFn = (ctx: ModeContext) => {
-  if (!ctx.state.currentSessionId) return null
+  if (!(ctx.state.currentSessionId != null && ctx.state.currentSessionId !== '')) return null
   return r([{ type: 'close-modal' }], [], 'navigation')
 }
 
@@ -410,15 +519,19 @@ function clearPendingDelete(ctx: ModeContext): AppAction[] {
   return [{ path: null, type: 'git-mode-set-pending-delete' }]
 }
 
-function gitFileKey(section: string, path: string): string {
-  return `${section}:${path}`
+function gitFileKey(section: string, path: string, repoPath?: string): string {
+  return repoPath != null && repoPath !== ''
+    ? `${section}:${repoPath}:${path}`
+    : `${section}:${path}`
 }
 
 function selectedGitFile(ctx: ModeContext) {
   const key = ctx.state.gitMode.selectedEntryKey
-  if (!key) return null
+  if (!(key != null && key !== '')) return null
   return (
-    ctx.state.gitPanel.files.find((file) => gitFileKey(file.section, file.path) === key) ?? null
+    ctx.state.gitPanel.files.find(
+      (file) => gitFileKey(file.section, file.path, file.repoPath) === key
+    ) ?? null
   )
 }
 
@@ -439,17 +552,20 @@ export function selectGitFileOnly(delta: -1 | 1): ActionFn {
 }
 
 export const toggleSelectedGitFolder: ActionFn = (ctx: ModeContext) => {
-  if (!ctx.state.gitMode.selectedEntryKey) return r([])
+  if (!(ctx.state.gitMode.selectedEntryKey != null && ctx.state.gitMode.selectedEntryKey !== ''))
+    return r([])
   return r([{ type: 'git-mode-toggle-selected-folder' }])
 }
 
 export const collapseGitSelection: ActionFn = (ctx: ModeContext) => {
-  if (!ctx.state.gitMode.selectedEntryKey) return r([])
+  if (!(ctx.state.gitMode.selectedEntryKey != null && ctx.state.gitMode.selectedEntryKey !== ''))
+    return r([])
   return r([{ type: 'git-mode-collapse-selection' }])
 }
 
 export const expandGitSelection: ActionFn = (ctx: ModeContext) => {
-  if (!ctx.state.gitMode.selectedEntryKey) return r([])
+  if (!(ctx.state.gitMode.selectedEntryKey != null && ctx.state.gitMode.selectedEntryKey !== ''))
+    return r([])
   return r([{ type: 'git-mode-expand-selection' }])
 }
 
@@ -475,6 +591,8 @@ export function scrollGitDiff(delta: number): KeyResult {
 
 export const toggleGitDiffView: KeyResult = r([{ type: 'git-mode-toggle-diff-view' }])
 
+export const toggleGitReviewBase: KeyResult = r([{ type: 'git-mode-toggle-review-base' }])
+
 export function shiftGitHeadOffset(delta: number): KeyResult {
   return r([
     { delta, type: 'git-mode-shift-head-offset' },
@@ -551,7 +669,7 @@ export const gitDestructiveSelected: ActionFn = (ctx: ModeContext) => {
 export const gitToggleFoldAll: ActionFn = (ctx: ModeContext) => {
   const file = selectedGitFile(ctx)
   if (!file) return r([])
-  const key = gitFileKey(file.section, file.path)
+  const key = gitFileKey(file.section, file.path, file.repoPath)
   return r([{ key, type: 'git-mode-fold-toggle-all' }])
 }
 
@@ -677,7 +795,7 @@ export const gitCommitEnterConfirm: ActionFn = (ctx: ModeContext) => {
     return r([{ type: 'git-commit-enter-confirm' }], [], 'modal.git-commit.confirm')
   }
   const sessionId = ctx.state.currentSessionId
-  if (!sessionId) {
+  if (!(sessionId != null && sessionId !== '')) {
     return r([{ type: 'git-commit-enter-confirm' }], [], 'modal.git-commit.confirm')
   }
   return r(
@@ -696,7 +814,7 @@ export const gitCommitLeaveConfirm: KeyResult = r(
 export const gitCommitLeaveGenerating: ActionFn = (ctx: ModeContext) => {
   const sessionId = ctx.state.currentSessionId
   const actionsList: AppAction[] = [{ type: 'git-commit-leave-generating' }]
-  if (sessionId) {
+  if (sessionId != null && sessionId !== '') {
     actionsList.push({ sessionId, type: 'auto-commit-clear' })
   }
   return r(actionsList, [], 'modal.git-commit')

package/src/backends.ts

@@ -6,7 +6,7 @@ import type { BackendConfig } from './types'
  */
 export function claudeBackend(opts?: { model?: string }): BackendConfig {
   return {
-    args: opts?.model ? ['--model', opts.model] : [],
+    args: opts?.model != null && opts.model !== '' ? ['--model', opts.model] : [],
     command: 'claude',
   }
 }

package/src/defaults.ts

@@ -104,8 +104,10 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .map('e', actions.gitToggleFoldAll, 'Expand/collapse all folds')
         .map('o', actions.openSelectedGitFileInEditor, 'Open in editor')
         .map('c', actions.gitCommitOpen, 'Commit')
+        .map('m', actions.openWorktreeMove, 'Move worktree')
         .map('p', actions.gitPush, 'Push')
         .map('v', actions.toggleGitDiffView, 'Toggle split/stacked')
+        .map('b', actions.toggleGitReviewBase, 'Review vs base')
         .map('t', actions.toggleGitFileListMode, 'Toggle flat/tree')
         .map('T', actions.toggleTreeCompaction, 'Toggle tree compaction')
         .map(']', actions.shiftGitHeadOffset(-1), 'Newer commit')
@@ -182,6 +184,22 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .map('<CR>', actions.confirmUpdateSelection, 'Confirm')
     )
 
+    // -----------------------------------------------------------------------
+    // Modal: worktree-move
+    // -----------------------------------------------------------------------
+    .mode('modal.worktree-move', (m) =>
+      m
+        .map('<Esc>', actions.closeModal, 'Cancel')
+        .map('j', actions.moveModalSelection(1), 'Next')
+        .map('k', actions.moveModalSelection(-1), 'Prev')
+        .map('<Down>', actions.moveModalSelection(1))
+        .map('<Up>', actions.moveModalSelection(-1))
+        .map('<C-n>', actions.moveModalSelection(1))
+        .map('<C-p>', actions.moveModalSelection(-1))
+        .map('d', actions.toggleWorktreeMoveDelete, 'Toggle delete source')
+        .map('<CR>', actions.confirmWorktreeMove, 'Move')
+    )
+
     // -----------------------------------------------------------------------
     // Modal: rename-tab
     // -----------------------------------------------------------------------
@@ -197,12 +215,16 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
     // -----------------------------------------------------------------------
     .mode('modal.new-tab.command-edit', (m) =>
       m
-        .map('<Esc>', actions.closeModal, 'Cancel')
+        .map('<Esc>', actions.cancelNewTabModal, 'Cancel')
         .map('<CR>', actions.launchSelectedAssistant, 'Launch')
+        .map('<C-w>', actions.toggleNewTabWorktree, 'WT')
+        .map('<C-d>', actions.deleteSelectedWorktree, 'Delete WT')
+        .map('<Tab>', actions.switchField, 'Next field')
         .map('<C-n>', actions.moveModalSelection(1), 'Next')
         .map('<C-p>', actions.moveModalSelection(-1), 'Prev')
         .map('<Down>', actions.moveModalSelection(1))
         .map('<Up>', actions.moveModalSelection(-1))
+        .map('<C-e>', actions.editSelectedAssistant, 'Edit')
         .passthrough()
     )
 
@@ -262,6 +284,7 @@ export function getDefaultKeymapConfig(): ResolvedKeymapConfig {
         .map('<C-a>', actions.snippetFilterPasteToGroup, 'Send to group')
         .map('<C-n>', actions.moveModalSelection(1), 'Next')
         .map('<C-p>', actions.moveModalSelection(-1), 'Prev')
+        .map('<C-o>', actions.openSelectedSnippetSourceInEditor, 'Open source file')
         .map('<Down>', actions.moveModalSelection(1))
         .map('<Up>', actions.moveModalSelection(-1))
         .passthrough()

package/src/index.ts

@@ -80,6 +80,8 @@ export type {
   SideEffect,
   SnippetDef,
   SnippetRecord,
+  SnippetShellVar,
+  SnippetVar,
   SplitDirection,
   StatusBarConfig,
   TabSession,

package/src/resolver.ts

@@ -44,11 +44,16 @@ export function resolveConfig(userConfig: AimuxUserConfig): ResolvedConfig {
     sessionBar: resolveSessionBar(userConfig.sessionBar),
     sidebar: userConfig.sidebar ?? {},
     snippets: userConfig.snippets ?? [],
+    snippetTriggerChar: resolveSnippetTriggerChar(userConfig.snippetTriggerChar),
     statusBar: userConfig.statusBar ?? {},
     theme: resolveTheme(userConfig.theme),
   }
 }
 
+function resolveSnippetTriggerChar(value: string | undefined): string {
+  return typeof value === 'string' && value.length === 1 ? value : ':'
+}
+
 function resolveTheme(userConfig: AimuxUserConfig['theme']): ResolvedConfig['theme'] {
   if (!userConfig) return undefined
   return {

package/src/tui/registry.ts

@@ -76,7 +76,7 @@ export const TUI_THEMES: Record<string, TuiThemeJson> = {
   'zenburn': zenburn as TuiThemeJson,
 }
 
-export type ThemeId = keyof typeof TUI_THEMES & string
+export type ThemeId = keyof typeof TUI_THEMES
 
 export const THEME_IDS: ThemeId[] = Object.keys(TUI_THEMES).sort() as ThemeId[]
 

package/src/tui/resolve.ts

@@ -12,13 +12,7 @@ const TRANSPARENT: RGBA = { a: 0, b: 0, g: 0, r: 0 }
 function rgbaFromHex(hex: string): RGBA {
   const h = hex.replace('#', '')
   // expand short forms (#rgb, #rgba)
-  const expanded =
-    h.length === 3 || h.length === 4
-      ? h
-          .split('')
-          .map((c) => c + c)
-          .join('')
-      : h
+  const expanded = h.length === 3 || h.length === 4 ? h.replaceAll(/(.)/g, '$1$1') : h
   if (expanded.length === 6) {
     const num = parseInt(expanded, 16)
     return {

package/src/types.ts

@@ -27,11 +27,12 @@ export type ModeId =
   | 'modal.git-commit.confirm'
   | 'modal.git-commit.generating'
   | 'modal.update-available'
+  | 'modal.worktree-move'
   | 'modal.ai-usage'
 
 // ─── Primitive app types ──────────────────────────────────────────────────────
 
-export type BuiltinAssistantId = 'claude' | 'codex' | 'opencode' | 'terminal'
+export type BuiltinAssistantId = 'claude' | 'codex' | 'opencode' | 'terminal' | 'antigravity'
 export type AssistantId = BuiltinAssistantId | (string & {})
 export type TabStatus = 'starting' | 'running' | 'disconnected' | 'error'
 
@@ -82,8 +83,11 @@ export interface TerminalModeState {
 
 // ─── Layout ───────────────────────────────────────────────────────────────────
 
-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
@@ -105,6 +109,7 @@ export interface PersistedTabSnapshot {
   terminalModes: TerminalModeState
   errorMessage?: string
   exitCode?: number
+  worktreeId?: string
 }
 
 export interface WorkspaceSnapshotV1 {
@@ -121,6 +126,23 @@ export interface WorkspaceSnapshotV1 {
   tabGroupMap?: Record<string, string>
 }
 
+export type WorktreeSource = 'primary' | 'aimux-temp' | 'external'
+
+export interface WorktreeRecord {
+  id: string
+  name: string
+  path: string
+  repoRoot: string
+  branch?: string
+  baseRef?: string
+  commitSha?: string
+  source: WorktreeSource
+  createdByAimux: boolean
+  color?: string
+  createdAt: string
+  updatedAt: string
+}
+
 export interface SessionRecord {
   id: string
   name: string
@@ -130,6 +152,8 @@ export interface SessionRecord {
   lastOpenedAt: string
   order?: number
   workspaceSnapshot?: WorkspaceSnapshotV1
+  worktrees?: WorktreeRecord[]
+  activeWorktreeId?: string
 }
 
 export interface TabSession {
@@ -144,12 +168,15 @@ export interface TabSession {
   command: string
   errorMessage?: string
   exitCode?: number
+  worktreeId?: string
 }
 
 export interface SnippetRecord {
   id: string
   name: string
   content: string
+  trigger?: string
+  vars?: Record<string, SnippetVar>
 }
 
 export type DirectoryResultType = 'git-repo' | 'worktree' | 'workspace'
@@ -192,6 +219,7 @@ export interface GitFileEntry {
   status: GitFileStatus
   added: number | null
   removed: number | null
+  repoPath?: string
 }
 
 export type GitPanelError = 'not-a-repo' | 'unknown'
@@ -242,6 +270,7 @@ export interface GitModeState {
   diffView: GitDiffView
   folds: Record<string, Record<string, FoldState>>
   headOffset: number
+  reviewBase: boolean
 }
 
 interface ModalBase {
@@ -260,6 +289,16 @@ export interface ModalClosed extends ModalBase {
 export interface ModalNewTab extends ModalBase {
   type: 'new-tab'
   editingCommand: AssistantId | null
+  activeField: 'assistant' | 'branch-name' | 'target-worktree' | 'worktree-name'
+  branchError: string | null
+  branchName: string
+  createWorktree: boolean
+  selectedAssistantId: AssistantId | null
+  step: 'assistant' | 'worktree' | 'worktree-create'
+  targetWorktreeIndex: number
+  worktreeDeleteConfirmId: string | null
+  worktreeDeleteMessage: string | null
+  worktreeName: string
 }
 export interface ModalSessionPicker extends ModalBase {
   type: 'session-picker'
@@ -273,6 +312,7 @@ export interface ModalRenameTab extends ModalBase {
 }
 export interface ModalSnippetPicker extends ModalBase {
   type: 'snippet-picker'
+  actionMessage?: string | null
 }
 export interface ModalThemePicker extends ModalBase {
   type: 'theme-picker'
@@ -303,7 +343,9 @@ export interface ModalGitCommit extends ModalBase {
 }
 export interface ModalSnippetEditor extends ModalBase {
   type: 'snippet-editor'
-  activeField: 'name' | 'content'
+  activeField: 'name' | 'trigger' | 'content'
+  nameBuffer: string
+  triggerBuffer: string
   contentBuffer: string
 }
 
@@ -317,6 +359,13 @@ export interface ModalAIUsage extends ModalBase {
   type: 'ai-usage'
 }
 
+export interface ModalWorktreeMove extends ModalBase {
+  type: 'worktree-move'
+  /** The worktree being moved (may differ from the active one, e.g. a tab menu). */
+  sourceWorktreeId: string
+  deleteSource: boolean
+}
+
 export type ModalState =
   | ModalClosed
   | ModalNewTab
@@ -332,6 +381,7 @@ export type ModalState =
   | ModalGitCommit
   | ModalUpdateAvailable
   | ModalAIUsage
+  | ModalWorktreeMove
 
 export interface LayoutState {
   terminalCols: number
@@ -398,6 +448,7 @@ export interface AppState {
   gitMode: GitModeState
   autoCommit: AutoCommitState
   multiRepo: MultiRepoState
+  worktreeDivergence: Record<string, BranchDivergence>
   pendingChords: string[] | null
 }
 
@@ -405,6 +456,15 @@ export interface AppState {
 
 export type ModalAction =
   | { type: 'open-new-tab-modal' }
+  | { type: 'set-new-tab-branch-error'; message: string | null }
+  | {
+      type: 'set-new-tab-worktree-delete-state'
+      confirmWorktreeId?: string | null
+      message: string | null
+    }
+  | { type: 'enter-new-tab-worktree-create' }
+  | { type: 'select-new-tab-assistant'; assistantId?: AssistantId }
+  | { type: 'toggle-new-tab-worktree'; assistantId?: AssistantId }
   | { type: 'open-help-modal'; scope?: ModeId }
   | { type: 'open-split-picker'; direction: SplitDirection }
   | { type: 'open-session-picker' }
@@ -429,7 +489,11 @@ export type ModalAction =
   | { type: 'set-theme-entry-count'; count: number }
   | { type: 'open-theme-picker' }
   | { type: 'open-update-available-modal'; currentVersion: string; latestVersion: string }
+  | { type: 'set-modal-selection-index'; index: number }
   | { type: 'open-ai-usage-modal' }
+  | { type: 'open-edit-custom-command'; assistantId: AssistantId }
+  | { type: 'open-worktree-move-modal'; sourceWorktreeId: string }
+  | { type: 'toggle-worktree-move-delete' }
 
 export type SessionAction =
   | { type: 'load-session'; sessionId: string; workspaceSnapshot?: WorkspaceSnapshotV1 }
@@ -439,6 +503,15 @@ export type SessionAction =
   | { type: 'delete-session-record'; sessionId: string; openSessionPicker?: boolean }
   | { type: 'reorder-sessions'; orderedIds: string[] }
   | { type: 'set-session-status'; sessionId: string; status: SessionStatus }
+  | { type: 'add-worktree-record'; sessionId: string; worktree: WorktreeRecord; activate?: boolean }
+  | { type: 'remove-worktree-record'; sessionId: string; worktreeId: string }
+  | { type: 'set-active-worktree'; sessionId: string; worktreeId: string }
+  | {
+      type: 'update-worktree-record'
+      sessionId: string
+      worktreeId: string
+      patch: Partial<WorktreeRecord>
+    }
 
 export type TabAction =
   | { type: 'add-tab'; tab: TabSession }
@@ -514,10 +587,17 @@ export interface GitRefreshPayload {
   files: GitFileEntry[]
 }
 
+/** Commits a worktree branch is ahead/behind the ref it forked from. */
+export interface BranchDivergence {
+  ahead: number
+  behind: number
+}
+
 export type GitPanelAction =
   | { type: 'git-refresh-success'; payload: GitRefreshPayload }
   | { type: 'git-refresh-error'; kind: GitPanelError }
   | { type: 'git-panel-reset' }
+  | { type: 'set-worktree-divergence'; divergence: Record<string, BranchDivergence> }
 
 export type GitModeAction =
   | { type: 'enter-git-mode' }
@@ -536,7 +616,9 @@ export type GitModeAction =
   | { type: 'git-mode-set-pending-delete'; path: string | null }
   | { type: 'git-mode-clear-diff-cache'; path: string }
   | { type: 'git-mode-set-message'; message: string | null }
+  | { type: 'snippet-picker-set-message'; message: string | null }
   | { type: 'git-mode-toggle-diff-view' }
+  | { type: 'git-mode-toggle-review-base' }
   | { type: 'git-mode-shift-head-offset'; delta: number }
   | { type: 'git-mode-set-head-offset'; offset: number }
   | {
@@ -599,6 +681,7 @@ export type AppAction =
 export type SideEffect =
   | { type: 'quit'; state: AppState }
   | { type: 'launch-selected-assistant' }
+  | { type: 'edit-selected-assistant' }
   | { type: 'confirm-selected-session' }
   | { type: 'delete-selected-session' }
   | { type: 'open-rename-selected-session' }
@@ -635,9 +718,18 @@ export type SideEffect =
   | { type: 'confirm-update-selection' }
   | { type: 'switch-session-by-index'; index: number }
   | { type: 'delete-session'; sessionId: string }
+  | { type: 'delete-worktree'; sessionId: string; worktreeId: string; force?: boolean }
+  | {
+      type: 'move-worktree'
+      sessionId: string
+      sourceWorktreeId: string
+      targetWorktreeId: string
+      deleteSource?: boolean
+    }
   | { type: 'toggle-transparent' }
   | { type: 'toggle-mode' }
   | { type: 'open-file-in-editor'; path: string }
+  | { type: 'open-selected-snippet-source-in-editor' }
 
 // ─── Key input / KeyResult / ModeContext ──────────────────────────────────────
 
@@ -689,10 +781,30 @@ export interface HooksConfig {
 
 // ─── Snippet config (stub) ────────────────────────────────────────────────────
 
+/**
+ * A snippet variable resolved at expansion time. The shape is a tagged union
+ * discriminated by which key is present (`sh` for now; future: `env`, `date`, …).
+ */
+export interface SnippetShellVar {
+  /** Shell command run via `sh -c`. The trimmed stdout is interpolated. */
+  sh: string
+  /** Kill the process after this many ms. Default 5000. */
+  timeout?: number
+  /** Trim trailing whitespace from stdout. Default true. */
+  trim?: boolean
+}
+
+export type SnippetVar = SnippetShellVar
+
 export interface SnippetDef {
   name: string
   trigger?: string
   text: string
+  /**
+   * Optional named variables. Reference them in `text` as `{{name}}`.
+   * The key is the variable name; the value declares how to resolve it.
+   */
+  vars?: Record<string, SnippetVar>
 }
 
 // ─── Action value types ───────────────────────────────────────────────────────
@@ -759,7 +871,9 @@ export type GitPanePathConfig =
   | { enabled: false }
   | { enabled: true; pathFn?: (path: string) => string }
 
-export type GitPaneDiffCountConfig = { enabled: boolean }
+export interface GitPaneDiffCountConfig {
+  enabled: boolean
+}
 
 interface GitPaneBaseConfig {
   /** Startup override for git pane visibility. Reapplied on each launch. */
@@ -891,6 +1005,12 @@ export interface AimuxUserConfig {
   gitPane?: GitPaneConfig
   hooks?: HooksConfig
   snippets?: SnippetDef[]
+  /**
+   * Single-character prefix that opens an inline snippet trigger.
+   * Defaults to `:` (Espanso-style). Typing `<char><trigger><separator>` in
+   * any non-alternate-screen terminal expands the matching snippet.
+   */
+  snippetTriggerChar?: string
   autoCommit?: Partial<AutoCommitConfig>
   multiRepo?: Partial<MultiRepoConfig>
   statusBar?: StatusBarConfig
@@ -964,6 +1084,7 @@ export interface ResolvedConfig {
       }
   hooks: HooksConfig
   snippets: SnippetDef[]
+  snippetTriggerChar: string
   autoCommit: AutoCommitConfig
   multiRepo: MultiRepoConfig
   statusBar: StatusBarConfig