@brimveyn/aimux 1.9.9 → 1.10.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux",
-  "version": "1.9.9",
+  "version": "1.10.1",
   "description": "A terminal multiplexer for AI CLIs. Run Claude, Codex, OpenCode side-by-side with tabbed navigation, split panes, and persistent sessions.",
   "keywords": [
     "ai",
@@ -60,7 +60,7 @@
     "bump": "bun run scripts/bump.ts"
   },
   "dependencies": {
-    "@brimveyn/aimux-config": "0.5.8",
+    "@brimveyn/aimux-config": "0.5.9",
     "@opentui/core": "^0.1.90",
     "@opentui/react": "^0.1.90",
     "@xterm/headless": "^6.0.0",

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

@@ -10,6 +10,7 @@ import type {
 } from '../state/types'
 
 import { logInputDebug } from '../debug/input-log'
+import { clearTabSyntaxState, highlightSnapshot } from '../integrations/claude-syntax-overlay'
 import { type TabRuntimeTimeouts } from './tab-runtime-timeouts'
 
 interface BindBackendRuntimeEventsOptions {
@@ -17,6 +18,7 @@ interface BindBackendRuntimeEventsOptions {
   dispatch: (action: AppAction) => void
   resizingRef: MutableRefObject<boolean>
   timeouts: Pick<TabRuntimeTimeouts, 'clearIdleTimer' | 'clearStartupGrace' | 'clearAllTimers'>
+  syntaxOverlayEnabled: () => boolean
 }
 
 function clearTabRuntimeState(
@@ -31,6 +33,7 @@ export function bindBackendRuntimeEvents({
   backend,
   dispatch,
   resizingRef,
+  syntaxOverlayEnabled,
   timeouts,
 }: BindBackendRuntimeEventsOptions): () => void {
   const handleRender = (
@@ -48,12 +51,14 @@ export function bindBackendRuntimeEvents({
       viewportY: viewport.viewportY,
     })
 
+    const transformed = syntaxOverlayEnabled() ? highlightSnapshot(viewport, tabId) : viewport
+
     dispatch({
       source: resizingRef.current ? 'resize' : 'data',
       tabId,
       terminalModes,
       type: 'replace-tab-viewport',
-      viewport,
+      viewport: transformed,
     })
     // Per-tab activity is driven by the backend's status-detection loop via
     // the `tabActivity` event — no client-side idle timer needed.
@@ -62,12 +67,14 @@ export function bindBackendRuntimeEvents({
   const handleExit = (tabId: string, exitCode: number) => {
     logInputDebug('app.backend.event.exit', { exitCode, tabId })
     clearTabRuntimeState(timeouts, tabId)
+    clearTabSyntaxState(tabId)
     dispatch({ tabId, type: 'close-tab' })
   }
 
   const handleError = (tabId: string, message: string) => {
     logInputDebug('app.backend.event.error', { message, tabId })
     clearTabRuntimeState(timeouts, tabId)
+    clearTabSyntaxState(tabId)
     dispatch({ message, tabId, type: 'set-tab-error' })
   }
 

package/src/app-runtime/click-selection-resolver.ts

@@ -13,6 +13,8 @@ interface PositionedNode {
   y: number
 }
 
+export type MultiClickMode = 'word' | 'line'
+
 export interface ClickSelectionResult {
   selectedText: string
   startCol: number
@@ -20,6 +22,22 @@ export interface ClickSelectionResult {
   baseX: number
   eventY: number
   target: unknown
+  row: number
+  mode: MultiClickMode
+}
+
+export interface ViewportAnchor {
+  target: PositionedNode
+  baseX: number
+  baseY: number
+  col: number
+  row: number
+}
+
+export interface MultiClickRange {
+  startCol: number
+  endCol: number
+  lineLength: number
 }
 
 export function isPositionedNode(value: unknown): value is PositionedNode {
@@ -31,100 +49,116 @@ export function isPositionedNode(value: unknown): value is PositionedNode {
   )
 }
 
+export function getViewportAnchor(event: OtuiMouseEvent): ViewportAnchor | null {
+  if (!event.target || !isPositionedNode(event.target)) return null
+  const baseX = event.target.x
+  const baseY = event.target.y
+  return {
+    baseX,
+    baseY,
+    col: event.x - baseX,
+    row: event.y - baseY,
+    target: event.target,
+  }
+}
+
+export function computeRangeFromLineText(
+  lineText: string,
+  col: number,
+  mode: MultiClickMode
+): MultiClickRange | null {
+  if (mode === 'line') {
+    return { endCol: lineText.length, lineLength: lineText.length, startCol: 0 }
+  }
+  const word = getWordAtColumn(lineText, col)
+  if (word.text.length === 0) return null
+  return { endCol: word.endCol, lineLength: lineText.length, startCol: word.startCol }
+}
+
+export function computeMultiClickRange(
+  tab: TabSession | undefined,
+  row: number,
+  col: number,
+  mode: MultiClickMode
+): MultiClickRange | null {
+  const line = tab?.viewport?.lines[row]
+  if (!line) return null
+  return computeRangeFromLineText(getLineText(line), col, mode)
+}
+
 export function resolveClickSelection(
   event: OtuiMouseEvent,
   targetTabId: string,
   tab: TabSession | undefined,
   clickCount: number
 ): ClickSelectionResult | null {
-  if (!event.target) {
-    return null
-  }
-
-  const viewportText = event.target
-  if (!isPositionedNode(viewportText)) {
-    return null
-  }
+  const anchor = getViewportAnchor(event)
+  if (!anchor) return null
 
-  const col = event.x - viewportText.x
-  const row = event.y - viewportText.y
-  const baseX = viewportText.x
+  const mode: MultiClickMode = clickCount === 2 ? 'word' : 'line'
 
   logInputDebug('click.detect', {
     clickCount,
-    col,
+    col: anchor.col,
     eventX: event.x,
     eventY: event.y,
-    row,
-    targetId: event.target.id,
-    viewportX: viewportText.x,
-    viewportY: viewportText.y,
+    row: anchor.row,
+    targetId: anchor.target.id,
+    viewportX: anchor.baseX,
+    viewportY: anchor.baseY,
   })
 
-  if (!tab?.viewport?.lines[row]) {
+  if (!tab?.viewport?.lines[anchor.row]) {
     logInputDebug('click.noViewportLine', {
       hasViewport: !!tab?.viewport,
       lineCount: tab?.viewport?.lines.length ?? 0,
-      row,
+      row: anchor.row,
       tabFound: !!tab,
       targetTabId,
     })
     return null
   }
 
-  const line = tab.viewport.lines[row]
-  const lineText = getLineText(line)
-
-  let selectedText: string
-  let startCol: number
-  let endCol: number
-
-  if (clickCount === 2) {
-    const word = getWordAtColumn(lineText, col)
-    if (word.text.length === 0) {
+  const range = computeMultiClickRange(tab, anchor.row, anchor.col, mode)
+  if (!range) {
+    if (mode === 'word') {
+      const line = tab.viewport.lines[anchor.row]
+      const lineText = line ? getLineText(line) : ''
       logInputDebug('click.emptyWord', {
-        charAtCol: lineText[col] ?? 'OOB',
-        col,
+        charAtCol: lineText[anchor.col] ?? 'OOB',
+        col: anchor.col,
         lineText,
-        row,
+        row: anchor.row,
       })
-      return null
     }
-
-    selectedText = word.text
-    startCol = word.startCol
-    endCol = word.endCol
-  } else {
-    selectedText = lineText
-    startCol = 0
-    endCol = lineText.length
+    return null
   }
 
+  const line = tab.viewport.lines[anchor.row]
+  const lineText = line ? getLineText(line) : ''
+  const selectedText = lineText.slice(range.startCol, range.endCol)
+
   logInputDebug('click.selection', {
-    baseX,
+    baseX: anchor.baseX,
     clickCount,
-    endCol,
-    endX: baseX + endCol,
+    endCol: range.endCol,
+    endX: anchor.baseX + range.endCol,
     lineText,
+    mode,
     selectedText,
-    spanCount: line.spans.length,
-    spanStyles: line.spans.map((span) => ({
-      bold: span.bold,
-      italic: span.italic,
-      underline: span.underline,
-    })),
-    spanTexts: line.spans.map((span) => span.text),
-    startCol,
-    startX: baseX + startCol,
+    startCol: range.startCol,
+    startX: anchor.baseX + range.startCol,
     y: event.y,
   })
 
   return {
-    baseX,
-    endCol,
+    baseX: anchor.baseX,
+    endCol: range.endCol,
     eventY: event.y,
+    mode,
+    row: anchor.row,
     selectedText,
-    startCol,
-    target: event.target,
+    startCol: range.startCol,
+    target: anchor.target,
   }
 }

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

@@ -37,7 +37,7 @@ import {
 import { saveCurrentWorkspace } from '../state/workspace-save'
 import { filterThemeIds } from '../ui/filter-themes'
 import { scrollGitDiff } from '../ui/git-view-controls'
-import { applyTheme, getTransparent, setTransparent } from '../ui/theme'
+import { applyTheme, getCurrentMode, getTransparent, setMode, setTransparent } from '../ui/theme'
 import { type ThemeId } from '../ui/themes'
 import { triggerAutoCommitNow } from './auto-commit-ref'
 import {
@@ -600,6 +600,12 @@ export function executeSideEffect(effect: SideEffect, ctx: SideEffectContext): v
       saveConfig({ ...loadConfig(), themeTransparent: next })
       return
     }
+    case 'toggle-mode': {
+      const next = getCurrentMode() === 'dark' ? 'light' : 'dark'
+      setMode(next)
+      saveConfig({ ...loadConfig(), themeMode: next })
+      return
+    }
     default:
       effect satisfies never
   }

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

@@ -16,6 +16,7 @@ interface BackendRuntimeOptions {
   layoutRef: MutableRefObject<LayoutState>
   resizingRef: MutableRefObject<boolean>
   currentSessionWorkspaceSnapshot: Parameters<SessionBackend['attach']>[0]['workspaceSnapshot']
+  syntaxOverlayEnabled: () => boolean
 }
 
 export interface TabRuntimeControls {
@@ -33,6 +34,7 @@ export function useBackendRuntime({
   dispatch,
   layoutRef,
   resizingRef,
+  syntaxOverlayEnabled,
 }: BackendRuntimeOptions): TabRuntimeControls {
   const attachRequestIdRef = useRef(0)
   const timeouts = useTabRuntimeTimeouts(dispatch)
@@ -70,13 +72,22 @@ export function useBackendRuntime({
       backend,
       dispatch,
       resizingRef,
+      syntaxOverlayEnabled,
       timeouts: {
         clearAllTimers,
         clearIdleTimer,
         clearStartupGrace,
       },
     })
-  }, [backend, clearAllTimers, clearIdleTimer, clearStartupGrace, dispatch, resizingRef])
+  }, [
+    backend,
+    clearAllTimers,
+    clearIdleTimer,
+    clearStartupGrace,
+    dispatch,
+    resizingRef,
+    syntaxOverlayEnabled,
+  ])
 
   return {
     clearIdleTimer,