@brimveyn/aimux 1.12.2 → 1.13.0

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

@@ -2,25 +2,31 @@ import type { SessionBackend } from '../session-backend/types'
 import type { AppAction, AppState, SnippetRecord, TabSession } from '../state/types'
 
 import { createPrefixedId } from '../platform/id'
-import { saveSnippetCatalog } from '../state/snippet-catalog'
+import { isConfigSnippetId, saveSnippetCatalog } from '../state/snippet-catalog'
 import { writePasteToTab } from './pty-write'
 
 function createSnippetId(): string {
   return createPrefixedId('snip')
 }
 
-export function getSnippetEditorValue(state: AppState): { name: string; content: string } | null {
+export interface SnippetEditorValue {
+  name: string
+  trigger: string
+  content: string
+}
+
+export function getSnippetEditorValue(state: AppState): SnippetEditorValue | null {
   if (state.modal.type !== 'snippet-editor') {
     return null
   }
 
   const { modal } = state
-  const name =
-    modal.activeField === 'name' ? (modal.editBuffer ?? '').trim() : modal.contentBuffer.trim()
-  const content =
-    modal.activeField === 'content' ? (modal.editBuffer ?? '').trim() : modal.contentBuffer.trim()
+  const editValue = (modal.editBuffer ?? '').trim()
+  const name = modal.activeField === 'name' ? editValue : modal.nameBuffer.trim()
+  const trigger = modal.activeField === 'trigger' ? editValue : modal.triggerBuffer.trim()
+  const content = modal.activeField === 'content' ? editValue : modal.contentBuffer.trim()
 
-  return { content, name }
+  return { content, name, trigger }
 }
 
 export function saveSnippetEditorState(state: AppState): SnippetRecord[] | null {
@@ -35,21 +41,29 @@ export function saveSnippetEditorState(state: AppState): SnippetRecord[] | null
   }
 
   const snippetId = state.modal.sessionTargetId
-  if (snippetId) {
+  // Config-pinned snippets are sticky and read-only in the UI.
+  if (snippetId != null && snippetId !== '' && isConfigSnippetId(snippetId)) {
+    return null
+  }
+
+  const trigger = editorValue.trigger.length > 0 ? editorValue.trigger : undefined
+
+  if (snippetId != null && snippetId !== '') {
     return state.snippets.map((snippet) =>
       snippet.id === snippetId
-        ? { ...snippet, content: editorValue.content, name: editorValue.name }
+        ? { ...snippet, content: editorValue.content, name: editorValue.name, trigger }
         : snippet
     )
   }
 
   return [
     ...state.snippets,
-    { content: editorValue.content, id: createSnippetId(), name: editorValue.name },
+    { content: editorValue.content, id: createSnippetId(), name: editorValue.name, trigger },
   ]
 }
 
 export function deleteSnippetState(snippets: SnippetRecord[], snippetId: string): SnippetRecord[] {
+  if (isConfigSnippetId(snippetId)) return snippets
   return snippets.filter((snippet) => snippet.id !== snippetId)
 }
 
@@ -60,7 +74,7 @@ export function pasteSnippetToTab(
   snippet: SnippetRecord | undefined,
   dispatch?: (action: AppAction) => void
 ): void {
-  if (!snippet || !activeTabId || !activeTab) {
+  if (!snippet || activeTabId == null || activeTabId === '' || !activeTab) {
     return
   }
 

package/src/app-runtime/use-auto-commit-driver.ts

@@ -52,7 +52,7 @@ export function useAutoCommitDriver({
   depsRef.current = deps
 
   useEffect(() => {
-    const handler: (args: Parameters<typeof onManualTrigger>[1]) => Promise<void> = (args) =>
+    const handler: (args: Parameters<typeof onManualTrigger>[1]) => Promise<void> = async (args) =>
       onManualTrigger(depsRef.current, args)
     setActiveAutoCommitDriver(handler)
     return () => clearActiveAutoCommitDriverIfMatches(handler)
@@ -74,7 +74,7 @@ export function useAutoCommitDriver({
         (before === 'working' || before === 'waiting-input') && tab.activity === 'idle'
       if (becameIdle) {
         const sessionId = state.currentSessionId
-        if (!sessionId) continue
+        if (!(sessionId != null && sessionId !== '')) continue
         const session = state.sessions.find((s) => s.id === sessionId)
         const git = gitPayloadFromState(state)
         void onActivityTransition(depsRef.current, {
@@ -95,7 +95,7 @@ export function useAutoCommitDriver({
   useEffect(() => {
     if (!configRef.current.enabled) return
     const sessionId = state.currentSessionId
-    if (!sessionId) return
+    if (!(sessionId != null && sessionId !== '')) return
     const payload = gitPayloadFromState(state)
     if (!payload) return
     const cacheKey = JSON.stringify(payload)
@@ -109,7 +109,10 @@ export function useAutoCommitDriver({
     // fast mode) and where the user edits via an external editor.
     if (gitStabilizeTimerRef.current) clearTimeout(gitStabilizeTimerRef.current)
     const activeTabId = state.activeTabId
-    const activeTab = activeTabId ? state.tabs.find((tab) => tab.id === activeTabId) : undefined
+    const activeTab =
+      activeTabId != null && activeTabId !== ''
+        ? state.tabs.find((tab) => tab.id === activeTabId)
+        : undefined
     if (!activeTab) return
     const session = state.sessions.find((s) => s.id === sessionId)
     gitStabilizeTimerRef.current = setTimeout(() => {

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

@@ -41,7 +41,7 @@ export function useBackendRuntime({
   const { clearAllTimers, clearIdleTimer, clearStartupGrace, startStartupGrace } = timeouts
 
   useEffect(() => {
-    if (!currentSessionId) {
+    if (!(currentSessionId != null && currentSessionId !== '')) {
       attachRequestIdRef.current += 1
       return
     }
@@ -57,12 +57,12 @@ export function useBackendRuntime({
   }, [backend, currentSessionId, currentSessionWorkspaceSnapshot, dispatch, layoutRef])
 
   useEffect(() => {
-    if (!currentSessionId) {
+    if (!(currentSessionId != null && currentSessionId !== '')) {
       return
     }
 
     backend.setActiveTab(activeTabId)
-    if (activeTabId && activeTabScrollIntentRef.current) {
+    if (activeTabId != null && activeTabId !== '' && activeTabScrollIntentRef.current) {
       backend.reapplyScrollIntent(activeTabId, activeTabScrollIntentRef.current)
     }
   }, [activeTabId, activeTabScrollIntentRef, backend, currentSessionId])

package/src/app-runtime/use-directory-search.ts

@@ -42,11 +42,13 @@ export function useDirectorySearch(
       return
     }
 
-    const timer = setTimeout(async () => {
-      const results = await searchProjectDirectories(directoryQuery)
-      if (isCurrent) {
-        dispatch({ results, type: 'set-directory-results' })
-      }
+    const timer = setTimeout(() => {
+      void (async () => {
+        const results = await searchProjectDirectories(directoryQuery)
+        if (isCurrent) {
+          dispatch({ results, type: 'set-directory-results' })
+        }
+      })()
     }, debounceMs)
 
     return () => {

package/src/app-runtime/use-mouse-handlers.ts

@@ -84,7 +84,7 @@ function getTargetTerminalTabId(
   activeTabId: string | null,
   isEnabled: boolean
 ): string | null {
-  if (focusMode !== 'terminal-input' || !activeTabId || !isEnabled) {
+  if (focusMode !== 'terminal-input' || activeTabId == null || activeTabId === '' || !isEnabled) {
     return null
   }
 
@@ -248,12 +248,12 @@ export function useMouseHandlers({
       state.activeTabId,
       activeMouseForwardingEnabled
     )
-    if (!targetTabId) {
+    if (!(targetTabId != null && targetTabId !== '')) {
       return
     }
 
     const sequence = getForwardedMouseSequence(event, origin)
-    if (!sequence) {
+    if (!(sequence != null && sequence !== '')) {
       return
     }
 
@@ -262,7 +262,12 @@ export function useMouseHandlers({
 
   const handleTerminalScrollEvent = (event: OtuiMouseEvent) => {
     const targetTabId = getTargetTerminalTabId(state.focusMode, state.activeTabId, true)
-    if (!targetTabId || activeMouseForwardingEnabled || !activeLocalScrollbackEnabled) {
+    if (
+      targetTabId == null ||
+      targetTabId === '' ||
+      activeMouseForwardingEnabled ||
+      !activeLocalScrollbackEnabled
+    ) {
       return
     }
 
@@ -389,7 +394,7 @@ export function useMouseHandlers({
     tabId?: string
   ) => {
     const targetTabId = tabId ?? state.activeTabId
-    if (!targetTabId || !event.target) {
+    if (targetTabId == null || targetTabId === '' || !event.target) {
       return
     }
 
@@ -437,7 +442,7 @@ export function useMouseHandlers({
     }
 
     logInputDebug('click.done', {
-      hasSelection: !!renderer.hasSelection,
+      hasSelection: !!(renderer.hasSelection === true),
       mode: selection.mode,
       targetSelectable: isPositionedNode(event.target) ? !!event.target.selectable : false,
     })

package/src/app-runtime/use-pane-size-report.ts

@@ -44,7 +44,7 @@ export function usePaneSizeReport(
 
   const measure = useCallback(() => {
     const box = boxRef.current
-    if (!box || !tabId || !enabled || !onMeasure) {
+    if (!box || tabId == null || tabId === '' || !enabled || !onMeasure) {
       return
     }
     const cols = Math.round(box.width)

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

@@ -1,15 +1,27 @@
-import { useRenderer } from '@opentui/react'
+import type { useRenderer } from '@opentui/react'
+
 import { type MutableRefObject, useEffect, useRef } from 'react'
 
 import type { KeyChord } from '../input/keymap/key-chord'
 import type { SessionBackend } from '../session-backend/types'
-import type { AppAction, FocusMode, TabSession } from '../state/types'
+import type { AppAction, FocusMode, SnippetRecord, TabSession } from '../state/types'
 
 import { INPUT_DEBUG_LOG_PATH, logInputDebug } from '../debug/input-log'
 import { createRawInputHandler } from '../input/raw-input-handler'
-import { copyToSystemClipboard } from '../platform/clipboard'
+import { copyToSystemClipboard, readFromSystemClipboard } from '../platform/clipboard'
+import {
+  expandSnippet,
+  expandSnippetSync,
+  requiresAsyncExpansion,
+} from '../snippets/expand-variables'
+import { runShellVar } from '../snippets/run-shell-var'
+import {
+  createTriggerDetector,
+  type TriggerDetector,
+  type TriggerMatch,
+} from '../snippets/trigger-detector'
 import { shouldSuppressSelectionCopy } from './multi-click-clipboard-guard'
-import { writePasteToTab, writeToTab } from './pty-write'
+import { writeMacroExpansionToTab, writePasteToTab, writeToTab } from './pty-write'
 import { type OtuiSelection, resolveSelectionClipboardText } from './selection-clipboard'
 import { applyViewportObservation, type ViewportObservation } from './selection-scroll'
 
@@ -28,6 +40,9 @@ interface UseRendererBindingsOptions {
   focusModeRef: MutableRefObject<FocusMode>
   activeTabIdRef: MutableRefObject<string | null>
   activeTabRef: MutableRefObject<TabSession | undefined>
+  snippetsRef: MutableRefObject<readonly SnippetRecord[]>
+  branchRef: MutableRefObject<string | null>
+  triggerCharRef: MutableRefObject<string>
   handleTerminalShortcut: (chord: KeyChord) => boolean
 }
 
@@ -41,13 +56,27 @@ export function useRendererBindings({
   activeTabRef,
   activeTabViewportY,
   backend,
+  branchRef,
   dispatch,
   focusMode,
   focusModeRef,
   handleTerminalShortcut,
   renderer,
+  snippetsRef,
+  triggerCharRef,
 }: UseRendererBindingsOptions): void {
   const lastViewportRef = useRef<ViewportObservation | null>(null)
+  const triggerDetectorsRef = useRef<Map<string, TriggerDetector>>(new Map())
+  const pendingMacroUndoRef = useRef<Map<string, { fullLength: number; suffixLength: number }>>(
+    new Map()
+  )
+  /**
+   * Tabs currently waiting on an async expansion (shell vars or {{clipboard}}).
+   * While a tab is in this set, new trigger detections on that tab are
+   * suppressed — without this, a second trigger typed during the await would
+   * race with the in-flight expansion and corrupt PTY state + undo bookkeeping.
+   */
+  const inFlightAsyncExpansionRef = useRef<Set<string>>(new Set())
 
   useEffect(() => {
     renderer.useMouse = true
@@ -55,12 +84,115 @@ export function useRendererBindings({
     renderer.console.hide()
     renderer.console.show = () => {}
 
+    const getOrCreateDetector = (tabId: string): TriggerDetector => {
+      let detector = triggerDetectorsRef.current.get(tabId)
+      if (!detector) {
+        detector = createTriggerDetector({
+          getSnippets: () => snippetsRef.current,
+          getTriggerChar: () => triggerCharRef.current,
+        })
+        triggerDetectorsRef.current.set(tabId, detector)
+      }
+      return detector
+    }
+
+    const expandMacroForTab = (tabId: string, match: TriggerMatch): void => {
+      const tab = activeTabRef.current
+      const snippet = match.snippet
+      const branch = branchRef.current
+      const cwd = process.cwd()
+      const now = new Date()
+
+      const registerUndo = (text: string, cursorOffset: number) => {
+        // Undo window: only meaningful for short inline expansions where
+        // cursor positions stay predictable in raw mode.
+        if (!text.includes('\n')) {
+          pendingMacroUndoRef.current.set(tabId, {
+            fullLength: text.length,
+            suffixLength: text.length - cursorOffset,
+          })
+        }
+      }
+
+      if (!requiresAsyncExpansion(snippet)) {
+        const { cursorOffset, text } = expandSnippetSync(snippet.content, {
+          branch,
+          customVars: new Map(),
+          cwd,
+          now,
+        })
+        writeMacroExpansionToTab(
+          backend,
+          tabId,
+          tab,
+          match.triggerText.length,
+          text,
+          cursorOffset,
+          dispatch
+        )
+        registerUndo(text, cursorOffset)
+        return
+      }
+
+      // Eager erase: drop the typed trigger from the PTY immediately so the
+      // user doesn't stare at `:prfull ` while shell vars resolve.
+      backend.write(tabId, '\x7f'.repeat(match.triggerText.length))
+      inFlightAsyncExpansionRef.current.add(tabId)
+
+      void (async () => {
+        try {
+          const varEntries = Object.entries(snippet.vars ?? {})
+          const resolved = await Promise.all(
+            varEntries.map(async ([name, v]) => [name, await runShellVar(name, v)] as const)
+          )
+          const customVars = new Map(resolved)
+          const { cursorOffset, text } = await expandSnippet(snippet.content, {
+            branch,
+            clipboard: readFromSystemClipboard,
+            customVars,
+            cwd,
+            now,
+          })
+          // Trigger already erased above; eraseCount = 0 here.
+          writeMacroExpansionToTab(backend, tabId, tab, 0, text, cursorOffset, dispatch)
+          registerUndo(text, cursorOffset)
+        } finally {
+          inFlightAsyncExpansionRef.current.delete(tabId)
+        }
+      })()
+    }
+
+    const tryConsumeMacroUndo = (tabId: string, sequence: string): boolean => {
+      const entry = pendingMacroUndoRef.current.get(tabId)
+      if (!entry) return false
+      pendingMacroUndoRef.current.delete(tabId)
+      const isBackspace = sequence === '\x7f' || sequence === '\b'
+      if (!isBackspace) return false
+      const rightArrows = '\x1b[C'.repeat(entry.suffixLength)
+      const dels = '\x7f'.repeat(entry.fullLength)
+      backend.write(tabId, `${rightArrows}${dels}`)
+      return true
+    }
+
     const handler = createRawInputHandler({
+      expandMacro: expandMacroForTab,
+      feedTrigger: (tabId, char) => {
+        // Drop new detections while an async expansion is in flight for this
+        // tab — otherwise the second match races with the awaited write.
+        if (inFlightAsyncExpansionRef.current.has(tabId)) {
+          triggerDetectorsRef.current.get(tabId)?.reset()
+          return null
+        }
+        return getOrCreateDetector(tabId).feed(char)
+      },
       getActiveTabId: () => activeTabIdRef.current,
       getBracketedPasteModeEnabled: () =>
         activeTabRef.current?.terminalModes.bracketedPasteMode ?? false,
       getFocusMode: () => focusModeRef.current,
+      getIsAlternateBuffer: () => activeTabRef.current?.terminalModes.isAlternateBuffer ?? false,
       handleTerminalShortcut,
+      resetTrigger: (tabId) => triggerDetectorsRef.current.get(tabId)?.reset(),
+      tryConsumeMacroUndo,
       writeToPty: (tabId, data, options) =>
         writeToTab(backend, tabId, activeTabRef.current, data, dispatch, options),
     })
@@ -71,7 +203,7 @@ export function useRendererBindings({
         defaultPrevented: event.defaultPrevented ?? false,
       })
 
-      if (event.defaultPrevented) {
+      if (event.defaultPrevented === true) {
         return
       }
 
@@ -89,12 +221,12 @@ export function useRendererBindings({
       })
 
       if (currentFocusMode === 'command-edit') {
-        const sanitized = payload.replace(/\r\n?/g, '\n')
+        const sanitized = payload.replaceAll(/\r\n?/g, '\n')
         dispatch({ char: sanitized, type: 'update-command-edit' })
         return
       }
 
-      if (currentFocusMode !== 'terminal-input' || !tabId || !tab) {
+      if (currentFocusMode !== 'terminal-input' || tabId == null || tabId === '' || !tab) {
         return
       }
 
@@ -115,7 +247,7 @@ export function useRendererBindings({
         textLength: selectedText.length,
       })
 
-      if (selection.isDragging || selectedText.length === 0) {
+      if (selection.isDragging === true || selectedText.length === 0) {
         return
       }
 
@@ -146,10 +278,13 @@ export function useRendererBindings({
     activeTabIdRef,
     activeTabRef,
     backend,
+    branchRef,
     dispatch,
     focusModeRef,
     handleTerminalShortcut,
     renderer,
+    snippetsRef,
+    triggerCharRef,
   ])
 
   useEffect(() => {

package/src/app.tsx

@@ -10,6 +10,7 @@ import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } fr
 import type { KeyChord } from './input/keymap/key-chord'
 import type { TrieBinding } from './input/keymap/trie'
 import type { KeyResult, ModeContext, ModeId } from './input/modes/types'
+import type { TerminalContentOrigin } from './input/raw-input-handler'
 import type { SessionBackend } from './session-backend/types'
 
 import { executeSideEffect, type SideEffectContext } from './app-runtime/side-effects'
@@ -25,7 +26,6 @@ import { setActiveKeymap } from './input/keymap/keymap-ref'
 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 { highlightSnapshot, warmClaudeSyntaxOverlay } from './integrations/claude-syntax-overlay'
 import { ensureClaudeSettingsThemePref, syncClaudeTheme } from './integrations/claude-theme-sync'
 import { getProfileConfigDir, getProfileName } from './profile-paths'
@@ -34,7 +34,8 @@ import { aiUsageStore } from './state/ai-usage-store'
 import { appStore, useAppStore } from './state/app-store'
 import { setActiveDispatch, setActiveSideEffectRunner } from './state/dispatch-ref'
 import { findMostRecentSession, loadSessionCatalog } from './state/session-catalog'
-import { loadSnippetCatalog } from './state/snippet-catalog'
+import { getSessionProjectPath } from './state/session-worktrees'
+import { loadSnippetCatalog, mergeConfigSnippets } from './state/snippet-catalog'
 import { createInitialState } from './state/store'
 import { KeymapContext } from './ui/keymap-context'
 import { RootView } from './ui/root'
@@ -81,7 +82,10 @@ export function App({
   const dimensions = useTerminalDimensions()
   const [themeId, setThemeId] = useState<ThemeId>(() => {
     const config = loadConfig()
-    const persisted = config.themeId && isKnownThemeId(config.themeId) ? config.themeId : undefined
+    const persisted =
+      config.themeId != null && config.themeId !== '' && isKnownThemeId(config.themeId)
+        ? config.themeId
+        : undefined
     const initial: ThemeId = persisted ?? resolvedConfig.theme?.initialId ?? 'aimux'
     applyTheme(initial)
     if (resolvedConfig.theme?.initialMode) setMode(resolvedConfig.theme.initialMode)
@@ -137,10 +141,11 @@ export function App({
     }
 
     const sessionCatalog = loadSessionCatalog()
+    const mergedSnippets = mergeConfigSnippets(loadSnippetCatalog(), resolvedConfig.snippets)
     const initial = createInitialState(
       json.customCommands,
       sessionCatalog,
-      loadSnippetCatalog(),
+      mergedSnippets,
       sessionCatalog.length === 0,
       {
         gitPane: gitPaneOverrides,
@@ -179,7 +184,7 @@ export function App({
   }, [dispatch])
 
   useEffect(() => {
-    if (!resolvedConfig.theme?.beta?.harmonizeClaudeTheme) return
+    if (!(resolvedConfig.theme?.beta?.harmonizeClaudeTheme === true)) return
     ensureClaudeSettingsThemePref()
     syncClaudeTheme(getCurrentTheme(), getCurrentMode())
     return subscribeThemeChanges((resolved, mode) => {
@@ -189,7 +194,7 @@ export function App({
 
   useEffect(() => {
     const aiUsage = resolvedConfig.statusBar?.aiUsage
-    if (!aiUsage?.enabled) {
+    if (!(aiUsage?.enabled === true)) {
       aiUsageStore.getState().setEnabled(false)
       return
     }
@@ -214,7 +219,7 @@ export function App({
         getCurrentPackageVersion(),
         fetchLatestNpmVersion('@brimveyn/aimux'),
       ])
-      if (cancelled || !latest) return
+      if (cancelled || !(latest != null && latest !== '')) return
       if (!isNewerVersion(latest, current)) return
       if (loadConfig().skippedUpdateVersion === latest) return
       dispatch({
@@ -259,6 +264,13 @@ export function App({
   const stateRef = useRef(state)
   stateRef.current = state
 
+  const snippetsRef = useRef(state.snippets)
+  snippetsRef.current = state.snippets
+  const branchRef = useRef(state.gitPanel.branch)
+  branchRef.current = state.gitPanel.branch
+  const triggerCharRef = useRef(resolvedConfig.snippetTriggerChar)
+  triggerCharRef.current = resolvedConfig.snippetTriggerChar
+
   const contentOriginRef = useRef<TerminalContentOrigin>({ cols: 0, rows: 0, x: 0, y: 0 })
   const currentSessionWorkspaceSnapshot = currentSession?.workspaceSnapshot
 
@@ -370,11 +382,14 @@ export function App({
     activeTabRef,
     activeTabViewportY: activeTab?.viewport?.viewportY ?? null,
     backend,
+    branchRef,
     dispatch,
     focusMode: state.focusMode,
     focusModeRef,
     handleTerminalShortcut,
     renderer,
+    snippetsRef,
+    triggerCharRef,
   })
 
   const sideEffectCtx: SideEffectContext = {
@@ -384,9 +399,10 @@ export function App({
     clearStartupGrace,
     dispatch,
     getCurrentSessionProjectPath: () => {
-      if (!state.currentSessionId) return undefined
-      return state.sessions.find((s) => s.id === state.currentSessionId)?.projectPath
+      if (!(state.currentSessionId != null && state.currentSessionId !== '')) return
+      return getSessionProjectPath(state.sessions.find((s) => s.id === state.currentSessionId))
     },
+    getState: () => stateRef.current,
     renderer,
     setThemeId,
     startStartupGrace,

package/src/auto-commit/headless-commands.ts

@@ -1,5 +1,3 @@
-import type { AssistantId } from '../state/types'
-
 export interface HeadlessInvocation {
   executable: string
   args: string[]
@@ -9,25 +7,25 @@ export type SupportedProvider = 'claude' | 'codex' | 'opencode'
 
 const SUPPORTED: ReadonlySet<string> = new Set<SupportedProvider>(['claude', 'codex', 'opencode'])
 
-export function isSupportedProvider(id: AssistantId | string): id is SupportedProvider {
+export function isSupportedProvider(id: string): id is SupportedProvider {
   return SUPPORTED.has(id)
 }
 
 export function buildHeadlessInvocation(
-  provider: AssistantId | string,
+  provider: string,
   prompt: string,
   model: string | undefined
 ): HeadlessInvocation | null {
   switch (provider) {
     case 'claude': {
       const args = ['-p', '--output-format', 'text']
-      if (model) args.push('--model', model)
+      if (model != null && model !== '') args.push('--model', model)
       args.push(prompt)
       return { args, executable: 'claude' }
     }
     case 'codex': {
       const args = ['exec']
-      if (model) args.push('--model', model)
+      if (model != null && model !== '') args.push('--model', model)
       args.push(prompt)
       return { args, executable: 'codex' }
     }

package/src/daemon/daemon.ts

@@ -84,7 +84,7 @@ function sendOk(socket: Socket, id: string): void {
 
 function requireSession(socket: Socket, attachedSessions: Map<Socket, string>): string {
   const sessionId = attachedSessions.get(socket)
-  if (!sessionId) {
+  if (!(sessionId != null && sessionId !== '')) {
     throw new Error('No session attached')
   }
   return sessionId
@@ -100,7 +100,7 @@ function requireNegotiatedVersion(socket: Socket, versions: Map<Socket, number>)
 
 async function canConnectToSocket(socketPath: string): Promise<boolean> {
   const securityIssue = getSocketSecurityIssue(socketPath)
-  if (securityIssue) {
+  if (securityIssue != null && securityIssue !== '') {
     logDebug('daemon.socketUnhealthy', { issue: securityIssue, socketPath })
     return false
   }
@@ -527,7 +527,7 @@ export async function runDaemon(): Promise<void> {
                 case 'disposeAll': {
                   const sessionId = attachedSessions.get(socket)
                   requireNegotiatedVersion(socket, negotiatedVersions)
-                  if (sessionId) {
+                  if (sessionId != null && sessionId !== '') {
                     for (const [tabId, entry] of tabRegistry) {
                       if (entry.sessionId === sessionId) tabRegistry.delete(tabId)
                     }

package/src/daemon/runtime-paths.ts

@@ -8,7 +8,7 @@ export function getRuntimeProfile(): string {
 }
 
 function getRuntimeBaseDir(): string {
-  if (process.env.XDG_RUNTIME_DIR) {
+  if (process.env.XDG_RUNTIME_DIR != null && process.env.XDG_RUNTIME_DIR !== '') {
     return join(process.env.XDG_RUNTIME_DIR, `aimux-${getRuntimeProfile()}`)
   }
 

package/src/daemon/session-manager.ts

@@ -11,7 +11,7 @@ import type {
 import { logDebug } from '../debug/input-log'
 import { SessionRegistry } from './session-registry'
 
-type SessionManagerEvents = {
+interface SessionManagerEvents {
   render: [
     sessionId: string,
     tabId: string,