@brimveyn/aimux 1.12.1 → 1.12.6

package/src/state/snippet-catalog.ts

@@ -1,3 +1,5 @@
+import type { SnippetDef, SnippetVar } from '@brimveyn/aimux-config'
+
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
 import { join } from 'node:path'
 
@@ -9,9 +11,15 @@ export interface SnippetRecord {
   id: string
   name: string
   content: string
+  trigger?: string
+  vars?: Record<string, SnippetVar>
+}
+
+export function getSnippetsCatalogPath(): string {
+  return join(getProfileConfigDir(), 'aimux-snippets.json')
 }
 
-const SNIPPETS_PATH = join(getProfileConfigDir(), 'aimux-snippets.json')
+const SNIPPETS_PATH = getSnippetsCatalogPath()
 
 const DEFAULT_SNIPPETS: SnippetRecord[] = [
   {
@@ -52,7 +60,7 @@ export function loadSnippetCatalog(): SnippetRecord[] {
       version?: unknown
       snippets?: unknown
     }
-    if (parsed.version !== 1 || !Array.isArray(parsed.snippets)) {
+    if ((parsed.version !== 1 && parsed.version !== 2) || !Array.isArray(parsed.snippets)) {
       logDebug('snippets.catalog.loadIssue', {
         issue: 'invalid snippet catalog header',
         path: SNIPPETS_PATH,
@@ -66,7 +74,7 @@ export function loadSnippetCatalog(): SnippetRecord[] {
       })
       return []
     }
-    return parsed.snippets
+    return parsed.snippets.map(stripUserVars)
   } catch (error) {
     logDebug('snippets.catalog.loadIssue', {
       issue: error instanceof Error ? error.message : String(error),
@@ -79,7 +87,16 @@ export function loadSnippetCatalog(): SnippetRecord[] {
 export function saveSnippetCatalog(snippets: SnippetRecord[]): void {
   try {
     mkdirSync(getProfileConfigDir(), { recursive: true })
-    writeFileSync(SNIPPETS_PATH, `${JSON.stringify({ snippets, version: 1 }, null, 2)}\n`)
+    // Persist only user-owned snippets. Config-pinned entries are reapplied
+    // at boot from `aimux.config.ts`.
+    const userSnippets = snippets.filter((s) => !isConfigSnippetId(s.id)).map(stripUserVars)
+    // Schema v2 adds the optional `trigger` and `vars` fields. v1 files are
+    // still accepted on read (they validate as v2 — both fields are optional)
+    // and get rewritten as v2 on the next save.
+    writeFileSync(
+      SNIPPETS_PATH,
+      `${JSON.stringify({ snippets: userSnippets, version: 2 }, null, 2)}\n`
+    )
   } catch (error) {
     logDebug('snippets.catalog.saveError', {
       error: error instanceof Error ? error.message : String(error),
@@ -88,3 +105,47 @@ export function saveSnippetCatalog(snippets: SnippetRecord[]): void {
     })
   }
 }
+
+export const CONFIG_SNIPPET_ID_PREFIX = 'config:'
+
+export function isConfigSnippetId(id: string): boolean {
+  return id.startsWith(CONFIG_SNIPPET_ID_PREFIX)
+}
+
+/**
+ * Shell `vars` are only authorized on config-pinned snippets (those defined in
+ * `aimux.config.ts`). If they ever appear on a user-edited JSON snippet — by
+ * hand edit, restore, or import — strip them. This keeps shell execution
+ * gated by the user's TypeScript config file.
+ *
+ * Exported for testing; called at both load and save time.
+ */
+export function stripUserVars(snippet: SnippetRecord): SnippetRecord {
+  if (snippet.vars === undefined) return snippet
+  if (isConfigSnippetId(snippet.id)) return snippet
+  logDebug('snippets.catalog.strippedVars', { id: snippet.id, name: snippet.name })
+  const { vars, ...clean } = snippet
+  void vars
+  return clean
+}
+
+/**
+ * Merge config-defined snippets with user-edited snippets.
+ * Config-pinned snippets ("sticky") get a stable id `config:${name}` and win
+ * over a user-edited snippet with the same id (they're read-only in the UI).
+ */
+export function mergeConfigSnippets(
+  userSnippets: readonly SnippetRecord[],
+  configSnippets: readonly SnippetDef[]
+): SnippetRecord[] {
+  const fromConfig: SnippetRecord[] = configSnippets.map((s) => ({
+    content: s.text,
+    id: `${CONFIG_SNIPPET_ID_PREFIX}${s.name}`,
+    name: s.name,
+    trigger: s.trigger,
+    vars: s.vars,
+  }))
+  const configIds = new Set(fromConfig.map((s) => s.id))
+  const userKept = userSnippets.filter((s) => !configIds.has(s.id))
+  return [...fromConfig, ...userKept]
+}

package/src/state/types.ts

@@ -1,7 +1,7 @@
-import type { ModeId } from '@brimveyn/aimux-config'
+import type { ModeId, SnippetVar } from '@brimveyn/aimux-config'
 import type { ThemedToken } from 'shiki'
 
-export type BuiltinAssistantId = 'claude' | 'codex' | 'opencode' | 'terminal'
+export type BuiltinAssistantId = 'claude' | 'codex' | 'opencode' | 'terminal' | 'antigravity'
 
 export type AssistantId = BuiltinAssistantId | (string & {})
 
@@ -306,6 +306,11 @@ export interface ModalRenameTab extends ModalBase {
 
 export interface ModalSnippetPicker extends ModalBase {
   type: 'snippet-picker'
+  /**
+   * Transient status line shown at the bottom of the picker (e.g. error from
+   * an open-in-editor attempt). Cleared automatically when the modal closes.
+   */
+  actionMessage?: string | null
 }
 
 export interface ModalThemePicker extends ModalBase {
@@ -342,7 +347,12 @@ export interface ModalCreateSession extends ModalBase {
 
 export interface ModalSnippetEditor extends ModalBase {
   type: 'snippet-editor'
-  activeField: 'name' | 'content'
+  activeField: 'name' | 'trigger' | 'content'
+  /** Persisted value of the name field when it is not the active editor. */
+  nameBuffer: string
+  /** Persisted value of the trigger field when it is not the active editor. */
+  triggerBuffer: string
+  /** Persisted value of the content field when it is not the active editor. */
   contentBuffer: string
 }
 
@@ -388,6 +398,8 @@ export interface SnippetRecord {
   id: string
   name: string
   content: string
+  trigger?: string
+  vars?: Record<string, SnippetVar>
 }
 
 export interface DiscoveredRepo {
@@ -643,6 +655,7 @@ 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-shift-head-offset'; delta: number }
   | { type: 'git-mode-set-head-offset'; offset: number }

package/src/state/validation.ts

@@ -155,8 +155,29 @@ export function isSessionRecord(value: unknown): value is SessionRecord {
   )
 }
 
+function isSnippetVar(value: unknown): boolean {
+  if (!isObjectRecord(value)) return false
+  if (!isString(value.sh)) return false
+  if (value.timeout !== undefined && !isFiniteNumber(value.timeout)) return false
+  if (value.trim !== undefined && !isBoolean(value.trim)) return false
+  return true
+}
+
+function isSnippetVarRecord(value: unknown): boolean {
+  if (!isObjectRecord(value)) return false
+  for (const entry of Object.values(value)) {
+    if (!isSnippetVar(entry)) return false
+  }
+  return true
+}
+
 export function isSnippetRecord(value: unknown): value is SnippetRecord {
   return (
-    isObjectRecord(value) && isString(value.id) && isString(value.name) && isString(value.content)
+    isObjectRecord(value) &&
+    isString(value.id) &&
+    isString(value.name) &&
+    isString(value.content) &&
+    (value.trigger === undefined || isString(value.trigger)) &&
+    (value.vars === undefined || isSnippetVarRecord(value.vars))
   )
 }

package/src/ui/components/layout/split-layout.tsx

@@ -1,5 +1,6 @@
 import type { MouseEvent as OtuiMouseEvent } from '@opentui/core'
 
+import type { MeasuredPaneRect } from '../../../app-runtime/use-pane-size-report'
 import type { TerminalContentOrigin } from '../../../input/raw-input-handler'
 import type { FocusMode, TabSession } from '../../../state/types'
 
@@ -39,6 +40,7 @@ interface SplitLayoutProps {
   onSeparatorDrag?: (event: OtuiMouseEvent) => boolean
   onSeparatorDragEnd?: () => void
   onLeftEdgeMouseDown?: (event: OtuiMouseEvent) => boolean
+  onMeasure?: (tabId: string, rect: MeasuredPaneRect) => void
   contentOrigin: TerminalContentOrigin
   bounds: PaneRect
 }
@@ -52,6 +54,7 @@ export function SplitLayout({
   mouseForwardingEnabled,
   node,
   onLeftEdgeMouseDown,
+  onMeasure,
   onPaneActivate,
   onSeparatorDrag,
   onSeparatorDragEnd,
@@ -104,6 +107,7 @@ export function SplitLayout({
         onSeparatorDrag={onSeparatorDrag}
         onSeparatorDragEnd={onSeparatorDragEnd}
         onLeftEdgeMouseDown={onLeftEdgeMouseDown}
+        onMeasure={onMeasure}
       />
     )
   }
@@ -144,6 +148,7 @@ export function SplitLayout({
           onSeparatorDrag={onSeparatorDrag}
           onSeparatorDragEnd={onSeparatorDragEnd}
           onLeftEdgeMouseDown={onLeftEdgeMouseDown}
+          onMeasure={onMeasure}
           contentOrigin={contentOrigin}
           bounds={firstBounds}
         />
@@ -187,6 +192,7 @@ export function SplitLayout({
           onSeparatorDrag={onSeparatorDrag}
           onSeparatorDragEnd={onSeparatorDragEnd}
           onLeftEdgeMouseDown={secondLeftEdgeMouseDown}
+          onMeasure={onMeasure}
           contentOrigin={contentOrigin}
           bounds={secondBounds}
         />

package/src/ui/components/layout/status-bar.tsx

@@ -49,7 +49,9 @@ export function StatusBar() {
 
   return (
     <box
-      minHeight={2}
+      height={2}
+      flexShrink={0}
+      overflow="hidden"
       paddingLeft={1}
       paddingRight={1}
       paddingTop={0}

package/src/ui/components/layout/terminal-pane.tsx

@@ -5,6 +5,7 @@ import { memo, type ReactNode } from 'react'
 import type { TerminalContentOrigin } from '../../../input/raw-input-handler'
 import type { TabSession, TerminalSnapshot, TerminalSpan } from '../../../state/types'
 
+import { type MeasuredPaneRect, usePaneSizeReport } from '../../../app-runtime/use-pane-size-report'
 import { logInputDebug } from '../../../debug/input-log'
 import { dispatchGlobal, runSideEffectGlobal } from '../../../state/dispatch-ref'
 import { type ContextMenuItem, openContextMenu } from '../../context-menu/controller'
@@ -28,6 +29,7 @@ interface TerminalPaneProps {
   onSeparatorDrag?: (event: OtuiMouseEvent) => boolean
   onSeparatorDragEnd?: () => void
   onLeftEdgeMouseDown?: (event: OtuiMouseEvent) => boolean
+  onMeasure?: (tabId: string, rect: MeasuredPaneRect) => void
 }
 
 function getTitle(
@@ -112,6 +114,7 @@ export function TerminalPane({
   localScrollbackEnabled,
   mouseForwardingEnabled,
   onLeftEdgeMouseDown,
+  onMeasure,
   onPaneActivate,
   onSeparatorDrag,
   onSeparatorDragEnd,
@@ -124,6 +127,7 @@ export function TerminalPane({
   tabId,
 }: TerminalPaneProps) {
   const t = useTheme()
+  const setContentBox = usePaneSizeReport(tabId, !!tab, onMeasure)
   const editorBg = t.background
   const paneIsActive = isActive ?? true
   const canForwardMouse = focusMode === 'terminal-input' && !!tab && mouseForwardingEnabled
@@ -287,9 +291,11 @@ export function TerminalPane({
           </box>
         ) : (
           <box
+            ref={setContentBox}
             flexDirection="column"
             flexGrow={1}
             width="100%"
+            overflow="hidden"
             onMouseDown={(e) => {
               e.stopPropagation()
               forwardMouseEvent(e)
@@ -302,10 +308,18 @@ export function TerminalPane({
           </box>
         )}
       </ContextMenuBox>
-      {tab?.status === 'disconnected' ? (
-        <text fg={t.warning}>Restored snapshot. Press Ctrl+r to restart this workspace.</text>
+      {tab?.status === 'disconnected' || tab?.errorMessage ? (
+        // Absolutely positioned so it overlays the bordered box instead of
+        // consuming a flex row. If it took a row, the rendered terminal area
+        // would be one line shorter than the size sent to the PTY/xterm,
+        // re-introducing the shifted-content / dead-row bug.
+        <box position="absolute" bottom={0} left={0} backgroundColor={editorBg}>
+          {tab?.status === 'disconnected' ? (
+            <text fg={t.warning}>Restored snapshot. Press Ctrl+r to restart this workspace.</text>
+          ) : null}
+          {tab?.errorMessage ? <text fg={t.error}>{tab.errorMessage}</text> : null}
+        </box>
       ) : null}
-      {tab?.errorMessage ? <text fg={t.error}>{tab.errorMessage}</text> : null}
     </box>
   )
 }

package/src/ui/components/modals/snippets/snippet-editor-modal.tsx

@@ -2,8 +2,9 @@ import { uiTokens } from '../../../ui-tokens'
 import { Form, TextField } from '../shared/form'
 
 interface SnippetEditorModalProps {
-  activeField: 'name' | 'content'
+  activeField: 'name' | 'trigger' | 'content'
   snippetName: string
+  snippetTrigger: string
   snippetContent: string
   isEditing: boolean
 }
@@ -13,18 +14,21 @@ export function SnippetEditorModal({
   isEditing,
   snippetContent,
   snippetName,
+  snippetTrigger,
 }: SnippetEditorModalProps) {
-  const nameActive = activeField === 'name'
-  const contentActive = activeField === 'content'
-
   return (
     <Form
       title={isEditing ? 'Edit snippet' : 'Create snippet'}
       keybindsModeId="modal.snippet-editor"
       width={uiTokens.modalWidth.xl}
     >
-      <TextField active={nameActive} label="Name" value={snippetName} />
-      <TextField active={contentActive} label="Content" value={snippetContent} />
+      <TextField active={activeField === 'name'} label="Name" value={snippetName} />
+      <TextField
+        active={activeField === 'trigger'}
+        label="Trigger (optional)"
+        value={snippetTrigger}
+      />
+      <TextField active={activeField === 'content'} label="Content" value={snippetContent} />
     </Form>
   )
 }

package/src/ui/components/modals/snippets/snippet-picker-modal.tsx

@@ -2,6 +2,7 @@ import type { SnippetRecord } from '../../../../state/types'
 
 import { dispatchGlobal, runSideEffectGlobal } from '../../../../state/dispatch-ref'
 import { filterSnippets } from '../../../../state/selectors'
+import { isConfigSnippetId } from '../../../../state/snippet-catalog'
 import { useTheme } from '../../../theme'
 import { uiTokens } from '../../../ui-tokens'
 import { Picker, type PickerItem } from '../shared/picker'
@@ -11,6 +12,7 @@ interface SnippetPickerModalProps {
   selectedIndex: number
   filter: string | null
   cursorPos?: number
+  actionMessage?: string | null
 }
 
 const MAX_PREVIEW_LENGTH = 60
@@ -22,6 +24,7 @@ function truncateContent(content: string): string {
 }
 
 export function SnippetPickerModal({
+  actionMessage,
   cursorPos,
   filter,
   selectedIndex,
@@ -32,19 +35,26 @@ export function SnippetPickerModal({
 
   const items: PickerItem[] = filtered.map((snippet, index) => {
     const active = index === selectedIndex
+    const fromConfig = isConfigSnippetId(snippet.id)
     return {
       key: snippet.id,
       onClick: () => {
         dispatchGlobal({ type: 'close-modal' })
         runSideEffectGlobal({ type: 'paste-selected-snippet' })
       },
-      onDelete: () => runSideEffectGlobal({ type: 'delete-selected-snippet' }),
-      onEdit: () => runSideEffectGlobal({ type: 'edit-selected-snippet' }),
+      onDelete: fromConfig
+        ? undefined
+        : () => runSideEffectGlobal({ type: 'delete-selected-snippet' }),
+      onEdit: fromConfig ? undefined : () => runSideEffectGlobal({ type: 'edit-selected-snippet' }),
       subtitle: <text fg={t.textMuted}>{truncateContent(snippet.content)}</text>,
       title: (
-        <text fg={active ? t.text : t.textMuted}>
-          <strong>{snippet.name}</strong>
-        </text>
+        <box flexDirection="row">
+          <text fg={active ? t.text : t.textMuted}>
+            <strong>{snippet.name}</strong>
+          </text>
+          {snippet.trigger ? <text fg={t.textMuted}>{` :${snippet.trigger}`}</text> : null}
+          {fromConfig ? <text fg={t.textMuted}>{' [config]'}</text> : null}
+        </box>
       ),
     }
   })
@@ -64,6 +74,7 @@ export function SnippetPickerModal({
           {filter ? 'No matching snippets.' : 'No snippets yet. Press n to create one.'}
         </text>
       }
+      footer={actionMessage ? <text fg={t.error}>{actionMessage}</text> : undefined}
       onHover={(index) => dispatchGlobal({ index, type: 'set-modal-selection-index' })}
     />
   )

package/src/ui/root.tsx

@@ -1,5 +1,6 @@
 import type { MouseEvent } from '@opentui/core'
 
+import type { MeasuredPaneRect } from '../app-runtime/use-pane-size-report'
 import type { TerminalContentOrigin } from '../input/raw-input-handler'
 import type { FocusMode, ModalState, SessionRecord, SnippetRecord } from '../state/types'
 import type { ThemeId } from './themes'
@@ -52,19 +53,14 @@ function getCreateSessionFields(modal: ModalState) {
 
 function getSnippetEditorFields(modal: ModalState) {
   if (modal.type !== 'snippet-editor') {
-    return { snippetContent: '', snippetName: '' }
-  }
-
-  if (modal.activeField === 'name') {
-    return {
-      snippetContent: modal.contentBuffer,
-      snippetName: modal.editBuffer ?? '',
-    }
+    return { snippetContent: '', snippetName: '', snippetTrigger: '' }
   }
 
+  const editValue = modal.editBuffer ?? ''
   return {
-    snippetContent: modal.editBuffer ?? '',
-    snippetName: modal.contentBuffer,
+    snippetContent: modal.activeField === 'content' ? editValue : modal.contentBuffer,
+    snippetName: modal.activeField === 'name' ? editValue : modal.nameBuffer,
+    snippetTrigger: modal.activeField === 'trigger' ? editValue : modal.triggerBuffer,
   }
 }
 
@@ -78,7 +74,7 @@ function renderModal(
     snippets: SnippetRecord[]
     themeId: ThemeId
     createSessionFields: { directoryQuery: string; sessionName: string }
-    snippetEditorFields: { snippetName: string; snippetContent: string }
+    snippetEditorFields: { snippetName: string; snippetTrigger: string; snippetContent: string }
     focusMode: FocusMode
     activeAssistant?: string
     autoCommitModel?: string
@@ -135,6 +131,7 @@ function renderModal(
           selectedIndex={modal.selectedIndex}
           filter={modal.editBuffer}
           cursorPos={modal.cursorPos}
+          actionMessage={modal.actionMessage}
         />
       )
     case 'snippet-editor':
@@ -142,6 +139,7 @@ function renderModal(
         <SnippetEditorModal
           activeField={modal.activeField}
           snippetName={options.snippetEditorFields.snippetName}
+          snippetTrigger={options.snippetEditorFields.snippetTrigger}
           snippetContent={options.snippetEditorFields.snippetContent}
           isEditing={modal.sessionTargetId !== null}
         />
@@ -229,6 +227,7 @@ interface RootViewProps {
   }) => void
   onSeparatorDrag?: (event: MouseEvent) => boolean
   onSeparatorDragEnd?: () => void
+  onMeasure?: (tabId: string, rect: MeasuredPaneRect) => void
   terminalCols: number
   terminalRows: number
 }
@@ -239,6 +238,7 @@ export function RootView({
   mouseForwardingEnabled,
   onEmbeddedGitResizeStart,
   onGitPaneResizeStart,
+  onMeasure,
   onPaneActivate,
   onSeparatorDrag,
   onSeparatorDragEnd,
@@ -375,6 +375,7 @@ export function RootView({
             onSeparatorDrag={onSeparatorDrag}
             onSeparatorDragEnd={onSeparatorDragEnd}
             onLeftEdgeMouseDown={handleTerminalLeftEdgeMouseDown}
+            onMeasure={onMeasure}
             bounds={{
               cols: terminalCols + splitChrome,
               rows: terminalRows + splitChrome,
@@ -398,6 +399,7 @@ export function RootView({
             onTerminalMouseUp={onTerminalMouseUp}
             onPaneActivate={onPaneActivate}
             onLeftEdgeMouseDown={handleTerminalLeftEdgeMouseDown}
+            onMeasure={onMeasure}
           />
         )}
         {gitPaneMode === 'pane' && gitPaneVisible && gitPanePosition === 'right' ? (