@brimveyn/aimux 1.12.2 → 1.12.6

package/src/snippets/expand-variables.ts

@@ -0,0 +1,112 @@
+import type { SnippetRecord } from '../state/types'
+
+/**
+ * Snippet/macro content expander.
+ *
+ * Supports:
+ *  - Custom (per-snippet) variables resolved upstream and passed via `customVars`.
+ *    These shadow built-ins on name collision.
+ *  - `{{date}}`, `{{date:FORMAT}}` with tokens YYYY MM DD HH mm ss
+ *  - `{{cwd}}` (resolved from context)
+ *  - `{{branch}}` (resolved from context; empty string when null)
+ *  - `{{clipboard}}` (async; only available via `expandSnippet`)
+ *  - `$|` cursor placeholder (first occurrence wins; subsequent are stripped)
+ *  - Unknown `{{...}}` tokens are left literal.
+ */
+
+export interface ExpansionContext {
+  cwd: string
+  branch: string | null
+  now: Date
+  customVars: ReadonlyMap<string, string>
+  clipboard: () => Promise<string>
+}
+
+export type SyncExpansionContext = Omit<ExpansionContext, 'clipboard'>
+
+export interface ExpansionResult {
+  text: string
+  cursorOffset: number
+}
+
+const VAR_RE = /\{\{([^{}]+)\}\}/g
+
+const TWO = (n: number): string => String(n).padStart(2, '0')
+
+function formatDate(date: Date, format?: string): string {
+  if (!format) {
+    return `${date.getFullYear()}-${TWO(date.getMonth() + 1)}-${TWO(date.getDate())}`
+  }
+  return format
+    .replace(/YYYY/g, String(date.getFullYear()))
+    .replace(/MM/g, TWO(date.getMonth() + 1))
+    .replace(/DD/g, TWO(date.getDate()))
+    .replace(/HH/g, TWO(date.getHours()))
+    .replace(/mm/g, TWO(date.getMinutes()))
+    .replace(/ss/g, TWO(date.getSeconds()))
+}
+
+function resolveSyncVariable(name: string, ctx: SyncExpansionContext): string | null {
+  const custom = ctx.customVars.get(name)
+  if (custom !== undefined) return custom
+  if (name === 'date') return formatDate(ctx.now)
+  if (name.startsWith('date:')) return formatDate(ctx.now, name.slice('date:'.length))
+  if (name === 'cwd') return ctx.cwd
+  if (name === 'branch') return ctx.branch ?? ''
+  return null
+}
+
+/**
+ * Replace `$|` with a cursor offset.
+ * First occurrence becomes the offset; additional ones are stripped.
+ * If none present, cursor is placed at the end of the text.
+ */
+function extractCursor(text: string): ExpansionResult {
+  const firstIndex = text.indexOf('$|')
+  if (firstIndex === -1) {
+    return { cursorOffset: text.length, text }
+  }
+  const before = text.slice(0, firstIndex)
+  const after = text
+    .slice(firstIndex + 2)
+    .split('$|')
+    .join('')
+  return { cursorOffset: before.length, text: before + after }
+}
+
+export function contentNeedsClipboard(content: string): boolean {
+  return /\{\{\s*clipboard\s*\}\}/.test(content)
+}
+
+export function requiresAsyncExpansion(snippet: SnippetRecord): boolean {
+  const hasVars = snippet.vars !== undefined && Object.keys(snippet.vars).length > 0
+  return hasVars || contentNeedsClipboard(snippet.content)
+}
+
+export function expandSnippetSync(content: string, ctx: SyncExpansionContext): ExpansionResult {
+  const replaced = content.replace(VAR_RE, (match, rawName: string) => {
+    const name = rawName.trim()
+    if (name === 'clipboard') return match
+    const resolved = resolveSyncVariable(name, ctx)
+    return resolved ?? match
+  })
+  return extractCursor(replaced)
+}
+
+export async function expandSnippet(
+  content: string,
+  ctx: ExpansionContext
+): Promise<ExpansionResult> {
+  let clipboardValue: string | null = null
+  const needsClipboard = contentNeedsClipboard(content) && !ctx.customVars.has('clipboard')
+  if (needsClipboard) {
+    clipboardValue = await ctx.clipboard()
+  }
+  const replaced = content.replace(VAR_RE, (match, rawName: string) => {
+    const name = rawName.trim()
+    if (name === 'clipboard' && clipboardValue !== null) return clipboardValue
+    const resolved = resolveSyncVariable(name, ctx)
+    return resolved ?? match
+  })
+  return extractCursor(replaced)
+}

package/src/snippets/run-shell-var.ts

@@ -0,0 +1,93 @@
+import type { SnippetShellVar } from '@brimveyn/aimux-config'
+
+import { logDebug } from '../debug/input-log'
+
+const DEFAULT_TIMEOUT_MS = 5000
+/** Hard ceiling on any user-supplied timeout to prevent runaway expansions. */
+const MAX_TIMEOUT_MS = 30_000
+
+/**
+ * Build the shell argv. We default to `$SHELL -l -c <cmd>` so the user's
+ * login shell rc files (e.g. /etc/zprofile → path_helper on macOS) populate
+ * PATH and make tools like `gh`, `jira`, `brew` resolvable — matching
+ * Espanso's behavior. Falls back to `/bin/sh -c` if SHELL is unset.
+ */
+function buildShellArgv(cmd: string): string[] {
+  const userShell = process.env.SHELL
+  if (userShell && userShell.length > 0) {
+    return [userShell, '-l', '-c', cmd]
+  }
+  return ['/bin/sh', '-c', cmd]
+}
+
+/**
+ * Run a snippet shell var via the user's login shell, capture stdout.
+ *
+ * Returns the trimmed stdout on success, or '' on error / timeout / non-zero
+ * exit. Stderr is captured for logging but never propagated into the result —
+ * snippet content is for the terminal, not for surfacing failures.
+ */
+export async function runShellVar(name: string, v: SnippetShellVar): Promise<string> {
+  const requested = v.timeout ?? DEFAULT_TIMEOUT_MS
+  const timeoutMs = Math.min(Math.max(requested, 0), MAX_TIMEOUT_MS)
+
+  let proc: Bun.Subprocess<'ignore', 'pipe', 'pipe'>
+  try {
+    proc = Bun.spawn(buildShellArgv(v.sh), {
+      stderr: 'pipe',
+      stdin: 'ignore',
+      stdout: 'pipe',
+    })
+  } catch (error) {
+    logDebug('snippets.shellVar.spawnError', {
+      cmd: v.sh,
+      error: error instanceof Error ? error.message : String(error),
+      name,
+    })
+    return ''
+  }
+
+  let timeoutFired = false
+  const timeoutHandle = setTimeout(() => {
+    timeoutFired = true
+    try {
+      proc.kill()
+    } catch {
+      // process already gone
+    }
+  }, timeoutMs)
+
+  try {
+    const [stdout, stderr, exitCode] = await Promise.all([
+      new Response(proc.stdout).text(),
+      new Response(proc.stderr).text(),
+      proc.exited,
+    ])
+
+    if (timeoutFired) {
+      logDebug('snippets.shellVar.timeout', { cmd: v.sh, name, timeoutMs })
+      return ''
+    }
+
+    if (exitCode !== 0) {
+      logDebug('snippets.shellVar.nonZeroExit', {
+        cmd: v.sh,
+        exitCode,
+        name,
+        stderr: stderr.slice(0, 200),
+      })
+      return ''
+    }
+
+    return v.trim === false ? stdout : stdout.replace(/\s+$/, '')
+  } catch (error) {
+    logDebug('snippets.shellVar.error', {
+      cmd: v.sh,
+      error: error instanceof Error ? error.message : String(error),
+      name,
+    })
+    return ''
+  } finally {
+    clearTimeout(timeoutHandle)
+  }
+}

package/src/snippets/trigger-detector.ts

@@ -0,0 +1,105 @@
+import type { SnippetRecord } from '../state/types'
+
+/**
+ * Inline trigger detector for snippet/macro expansion.
+ *
+ * State machine (per-tab):
+ *   Idle ──(trigger char)──▶ Capturing
+ *   Capturing ──(separator)──▶ try match → return or reset → Idle
+ *   Capturing ──(printable char)──▶ append (max 32 chars)
+ *   Capturing ──(non-printable / control / escape)──▶ reset → Idle
+ *   Capturing ──(trigger char again)──▶ restart Capturing
+ *
+ * Paste heuristic: if two `feed` calls land within 5ms, treat as paste
+ * (sometimes terminals don't enable bracketed paste) and reset.
+ */
+
+const MAX_TRIGGER_BUFFER = 32
+const SEPARATOR_RE = /[\s.,;:!?)\]}]/u
+const PRINTABLE_RE = /^[\x20-\x7e]$/
+const PASTE_WINDOW_MS = 5
+
+export interface TriggerMatch {
+  snippet: SnippetRecord
+  /** Characters typed since trigger char (inclusive), including the closing separator. */
+  triggerText: string
+}
+
+export interface TriggerDetector {
+  feed(char: string): TriggerMatch | null
+  reset(): void
+}
+
+export interface TriggerDetectorOptions {
+  getSnippets: () => readonly SnippetRecord[]
+  getTriggerChar: () => string
+  now?: () => number
+}
+
+export function createTriggerDetector(opts: TriggerDetectorOptions): TriggerDetector {
+  const now = opts.now ?? (() => Date.now())
+  let capturing = false
+  let buffer = ''
+  let lastFeedAt = 0
+
+  function reset(): void {
+    capturing = false
+    buffer = ''
+  }
+
+  function tryMatch(separator: string): TriggerMatch | null {
+    const triggerChar = opts.getTriggerChar()
+    for (const snippet of opts.getSnippets()) {
+      if (snippet.trigger && snippet.trigger === buffer) {
+        const triggerText = `${triggerChar}${buffer}${separator}`
+        reset()
+        return { snippet, triggerText }
+      }
+    }
+    reset()
+    return null
+  }
+
+  return {
+    feed(char: string): TriggerMatch | null {
+      const t = now()
+      const isPaste = capturing && t - lastFeedAt < PASTE_WINDOW_MS && buffer.length > 0
+      lastFeedAt = t
+
+      if (isPaste) {
+        reset()
+        return null
+      }
+
+      const triggerChar = opts.getTriggerChar()
+
+      if (char === triggerChar) {
+        capturing = true
+        buffer = ''
+        return null
+      }
+
+      if (!capturing) return null
+
+      if (SEPARATOR_RE.test(char)) {
+        if (buffer.length === 0) {
+          reset()
+          return null
+        }
+        return tryMatch(char)
+      }
+
+      if (!PRINTABLE_RE.test(char)) {
+        reset()
+        return null
+      }
+
+      buffer += char
+      if (buffer.length > MAX_TRIGGER_BUFFER) {
+        reset()
+      }
+      return null
+    },
+    reset,
+  }
+}

package/src/state/reducers/modal-state.ts

@@ -160,6 +160,7 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         ...state,
         focusMode: 'command-edit',
         modal: {
+          actionMessage: null,
           cursorPos: 0,
           editBuffer: '',
           selectedIndex: 0,
@@ -167,6 +168,11 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
           type: 'snippet-picker',
         },
       }
+    case 'snippet-picker-set-message': {
+      if (state.modal.type !== 'snippet-picker') return state
+      if (state.modal.actionMessage === action.message) return state
+      return { ...state, modal: { ...state.modal, actionMessage: action.message } }
+    }
     case 'open-snippet-editor': {
       const snippet = action.snippetId
         ? state.snippets.find((s) => s.id === action.snippetId)
@@ -180,8 +186,10 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
           contentBuffer: snippet?.content ?? '',
           cursorPos: initialName.length,
           editBuffer: initialName,
+          nameBuffer: initialName,
           selectedIndex: 0,
           sessionTargetId: snippet?.id ?? null,
+          triggerBuffer: snippet?.trigger ?? '',
           type: 'snippet-editor',
         },
       }
@@ -553,14 +561,33 @@ export function reduceModalState(state: AppState, action: AppAction): AppState |
         }
       }
       if (state.modal.type === 'snippet-editor') {
-        const nextField = state.modal.activeField === 'name' ? 'content' : 'name'
-        const nextEdit = state.modal.contentBuffer
+        const current = state.modal.editBuffer ?? ''
+        // Save current edit buffer back to the field it belongs to.
+        const updatedBuffers = {
+          contentBuffer:
+            state.modal.activeField === 'content' ? current : state.modal.contentBuffer,
+          nameBuffer: state.modal.activeField === 'name' ? current : state.modal.nameBuffer,
+          triggerBuffer:
+            state.modal.activeField === 'trigger' ? current : state.modal.triggerBuffer,
+        }
+        const cycle: Record<'name' | 'trigger' | 'content', 'name' | 'trigger' | 'content'> = {
+          content: 'name',
+          name: 'trigger',
+          trigger: 'content',
+        }
+        const nextField = cycle[state.modal.activeField]
+        const nextEditByField = {
+          content: updatedBuffers.contentBuffer,
+          name: updatedBuffers.nameBuffer,
+          trigger: updatedBuffers.triggerBuffer,
+        }
+        const nextEdit = nextEditByField[nextField]
         return {
           ...state,
           modal: {
             ...state.modal,
+            ...updatedBuffers,
             activeField: nextField,
-            contentBuffer: state.modal.editBuffer ?? '',
             cursorPos: nextEdit.length,
             editBuffer: nextEdit,
           },

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/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' })}
     />
   )