@brimveyn/aimux 1.14.0 → 1.14.1

package/src/ui/components/layout/sidebar/worktree-row.tsx

@@ -0,0 +1,92 @@
+import type { MouseEvent as OtuiMouseEvent } from '@opentui/core'
+
+import { memo, useCallback, useMemo } from 'react'
+
+import type { SessionRecord, WorktreeRecord } from '../../../../state/types'
+
+import { useAppStore } from '../../../../state/app-store'
+import { dispatchGlobal, runSideEffectGlobal } from '../../../../state/dispatch-ref'
+import { useTheme } from '../../../theme'
+import { ContextMenuBox } from '../../overlays/context-menu/context-menu-box'
+
+interface WorktreeRowProps {
+  session: SessionRecord
+  worktree: WorktreeRecord
+  /** 1-based index of the workspace in the visible order (for switch-session-by-index). */
+  sessionIndex: number
+  /** True when this row is the active cursor item. */
+  isActiveItem: boolean
+  /** True when this row's workspace is the current session (selection scope). */
+  inCurrentGroup: boolean
+}
+
+export const WorktreeRow = memo(function WorktreeRow({
+  inCurrentGroup,
+  isActiveItem,
+  session,
+  sessionIndex,
+  worktree,
+}: WorktreeRowProps) {
+  const t = useTheme()
+  const currentSessionId = useAppStore((s) => s.currentSessionId)
+  const isCurrentSession = session.id === currentSessionId
+
+  const handleMouseDown = useCallback(
+    (event: OtuiMouseEvent) => {
+      if (event.button !== 0) return
+      event.preventDefault()
+      event.stopPropagation()
+      dispatchGlobal({
+        sessionId: session.id,
+        type: 'set-active-worktree',
+        worktreeId: worktree.id,
+      })
+      if (!isCurrentSession) {
+        runSideEffectGlobal({ index: sessionIndex, type: 'switch-session-by-index' })
+      }
+    },
+    [isCurrentSession, session.id, sessionIndex, worktree.id]
+  )
+
+  const rightClickMenu = useMemo<[string, () => void][] | undefined>(() => {
+    if (worktree.source === 'primary') return
+    return [
+      [
+        'Remove worktree',
+        () =>
+          dispatchGlobal({
+            sessionId: session.id,
+            type: 'remove-worktree-record',
+            worktreeId: worktree.id,
+          }),
+      ],
+    ]
+  }, [session.id, worktree.id, worktree.source])
+
+  let bgColor: string | undefined
+  if (isActiveItem) {
+    bgColor = t.backgroundElement
+  } else if (inCurrentGroup) {
+    bgColor = t.backgroundPanel
+  }
+
+  return (
+    <ContextMenuBox
+      id={`sidebar-wt-${worktree.id}`}
+      flexDirection="row"
+      paddingLeft={1}
+      paddingRight={1}
+      alignItems="center"
+      backgroundColor={bgColor}
+      rightClickMenu={rightClickMenu}
+      onMouseDown={handleMouseDown}
+    >
+      <text fg={t.textMuted} selectable={false} wrapMode="none">
+        {'  > '}
+      </text>
+      <text fg={isActiveItem ? t.text : t.textMuted} selectable={false} wrapMode="none">
+        {worktree.name}
+      </text>
+    </ContextMenuBox>
+  )
+})

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

@@ -1,6 +1,6 @@
 import type { MouseEvent as OtuiMouseEvent } from '@opentui/core'
 
-import { useCallback, useMemo } from 'react'
+import { useMemo } from 'react'
 
 import type { MeasuredPaneRect } from '../../../app-runtime/use-pane-size-report'
 import type { TerminalContentOrigin } from '../../../input/raw-input-handler'
@@ -8,13 +8,14 @@ import type { FocusMode, TabSession } from '../../../state/types'
 
 import { logInputDebug } from '../../../debug/input-log'
 import {
+  computeJunctionEdges,
   computePaneRects,
+  type JunctionEdges,
   type LayoutNode,
   PANE_BORDER,
   type PaneRect,
   type SplitDirection,
 } from '../../../state/layout-tree'
-import { useTheme } from '../../theme'
 import { TerminalPane } from './terminal-pane'
 
 const PANE_CHROME = PANE_BORDER
@@ -45,6 +46,7 @@ interface SplitLayoutProps {
   onMeasure?: (tabId: string, rect: MeasuredPaneRect) => void
   contentOrigin: TerminalContentOrigin
   bounds: PaneRect
+  junctionEdgesMap?: Map<string, JunctionEdges>
 }
 
 export function SplitLayout({
@@ -52,6 +54,7 @@ export function SplitLayout({
   bounds,
   contentOrigin,
   focusMode,
+  junctionEdgesMap: providedJunctionEdgesMap,
   localScrollbackEnabled,
   mouseForwardingEnabled,
   node,
@@ -69,7 +72,12 @@ export function SplitLayout({
   onTerminalScrollEvent,
   tabs,
 }: SplitLayoutProps) {
-  const t = useTheme()
+  const junctionEdgesMap = useMemo(
+    () =>
+      providedJunctionEdgesMap ??
+      computeJunctionEdges(node, bounds, { x: contentOrigin.x, y: contentOrigin.y }),
+    [providedJunctionEdgesMap, node, bounds, contentOrigin]
+  )
   const paneOrigin = useMemo<TerminalContentOrigin>(
     () => ({
       cols: Math.max(1, bounds.cols - PANE_CHROME * 2),
@@ -79,22 +87,6 @@ export function SplitLayout({
     }),
     [bounds, contentOrigin]
   )
-  const handleSeparatorMouseDown = useCallback(
-    (e: OtuiMouseEvent) => {
-      e.preventDefault()
-      if (node.type !== 'split' || !onSeparatorDragStart) return
-      const leafId = getFirstLeafId(node.first)
-      if (!(leafId != null && leafId !== '')) return
-      onSeparatorDragStart({
-        direction: node.direction,
-        screenStart:
-          node.direction === 'vertical' ? contentOrigin.x + bounds.x : contentOrigin.y + bounds.y,
-        tabId: leafId,
-        totalSize: node.direction === 'vertical' ? bounds.cols : bounds.rows,
-      })
-    },
-    [bounds, contentOrigin, node, onSeparatorDragStart]
-  )
   if (node.type === 'leaf') {
     const tab = tabs.find((t) => t.id === node.tabId)
     const isActive = node.tabId === activeTabId
@@ -117,6 +109,7 @@ export function SplitLayout({
         focusMode={focusMode}
         isActive={isActive}
         contentOrigin={paneOrigin}
+        junctionEdges={junctionEdgesMap.get(node.tabId)}
         mouseForwardingEnabled={isActive && mouseForwardingEnabled}
         localScrollbackEnabled={isActive && localScrollbackEnabled}
         onTerminalMouseEvent={onTerminalMouseEvent}
@@ -127,6 +120,7 @@ export function SplitLayout({
         onPaneActivate={onPaneActivate}
         onSeparatorDrag={onSeparatorDrag}
         onSeparatorDragEnd={onSeparatorDragEnd}
+        onSeparatorDragStart={onSeparatorDragStart}
         onLeftEdgeMouseDown={onLeftEdgeMouseDown}
         onMeasure={onMeasure}
       />
@@ -134,23 +128,19 @@ export function SplitLayout({
   }
 
   const flexDir = node.direction === 'vertical' ? 'row' : 'column'
-  const firstGrow = Math.round(node.ratio * 100)
-  const secondGrow = 100 - firstGrow
 
-  // Compute sub-bounds for each child
   const rects = computePaneRects(node, bounds)
-
-  // Compute the bounding rect for each subtree
   const firstBounds = subtreeBounds(node.first, rects, bounds)
   const secondBounds = subtreeBounds(node.second, rects, bounds)
 
-  // For vertical splits only the first subtree is leftmost; for horizontal
-  // splits both first and second start at the same x.
+  const firstSize = node.direction === 'vertical' ? firstBounds.cols : firstBounds.rows
+  const firstSizeProp = node.direction === 'vertical' ? { width: firstSize } : { height: firstSize }
+
   const secondLeftEdgeMouseDown = node.direction === 'horizontal' ? onLeftEdgeMouseDown : undefined
 
   return (
     <box flexDirection={flexDir} flexGrow={1} gap={0}>
-      <box flexGrow={firstGrow} flexDirection="column" overflow="hidden">
+      <box {...firstSizeProp} flexShrink={0} flexDirection="column" overflow="hidden">
         <SplitLayout
           node={node.first}
           tabs={tabs}
@@ -172,15 +162,10 @@ export function SplitLayout({
           onMeasure={onMeasure}
           contentOrigin={contentOrigin}
           bounds={firstBounds}
+          junctionEdgesMap={junctionEdgesMap}
         />
       </box>
-      <box
-        minWidth={node.direction === 'vertical' ? 1 : undefined}
-        minHeight={node.direction === 'horizontal' ? 1 : undefined}
-        backgroundColor={t.border}
-        onMouseDown={handleSeparatorMouseDown}
-      />
-      <box flexGrow={secondGrow} flexDirection="column" overflow="hidden">
+      <box flexGrow={1} flexDirection="column" overflow="hidden">
         <SplitLayout
           node={node.second}
           tabs={tabs}
@@ -202,17 +187,13 @@ export function SplitLayout({
           onMeasure={onMeasure}
           contentOrigin={contentOrigin}
           bounds={secondBounds}
+          junctionEdgesMap={junctionEdgesMap}
         />
       </box>
     </box>
   )
 }
 
-function getFirstLeafId(node: LayoutNode): string | null {
-  if (node.type === 'leaf') return node.tabId
-  return getFirstLeafId(node.first)
-}
-
 function subtreeBounds(
   node: LayoutNode,
   rects: Map<string, PaneRect>,

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

@@ -3,6 +3,7 @@ import type { MouseEvent as OtuiMouseEvent } from '@opentui/core'
 import { memo, type ReactNode, useCallback, useMemo } from 'react'
 
 import type { TerminalContentOrigin } from '../../../input/raw-input-handler'
+import type { JunctionEdgeInfo, JunctionEdges } from '../../../state/layout-tree'
 import type { FocusMode, TabSession, TerminalSnapshot, TerminalSpan } from '../../../state/types'
 
 import { type MeasuredPaneRect, usePaneSizeReport } from '../../../app-runtime/use-pane-size-report'
@@ -28,8 +29,10 @@ interface TerminalPaneProps {
   onPaneActivate?: (tabId: string) => void
   onSeparatorDrag?: (event: OtuiMouseEvent) => boolean
   onSeparatorDragEnd?: () => void
+  onSeparatorDragStart?: (info: JunctionEdgeInfo) => void
   onLeftEdgeMouseDown?: (event: OtuiMouseEvent) => boolean
   onMeasure?: (tabId: string, rect: MeasuredPaneRect) => void
+  junctionEdges?: JunctionEdges
 }
 
 function getTitle(
@@ -113,6 +116,7 @@ export function TerminalPane({
   contentOrigin,
   focusMode,
   isActive,
+  junctionEdges,
   localScrollbackEnabled,
   mouseForwardingEnabled,
   onLeftEdgeMouseDown,
@@ -120,6 +124,7 @@ export function TerminalPane({
   onPaneActivate,
   onSeparatorDrag,
   onSeparatorDragEnd,
+  onSeparatorDragStart,
   onTerminalClick,
   onTerminalDrag,
   onTerminalMouseEvent,
@@ -175,6 +180,16 @@ export function TerminalPane({
       event.y === contentOrigin.y + contentOrigin.rows,
     [contentOrigin]
   )
+  const getJunctionSideAt = useCallback(
+    (event: OtuiMouseEvent): keyof JunctionEdges | null => {
+      if (event.x === contentOrigin.x - 1) return 'left'
+      if (event.x === contentOrigin.x + contentOrigin.cols) return 'right'
+      if (event.y === contentOrigin.y - 1) return 'top'
+      if (event.y === contentOrigin.y + contentOrigin.rows) return 'bottom'
+      return null
+    },
+    [contentOrigin]
+  )
   const forwardMouseEvent = useCallback(
     (event: OtuiMouseEvent) => {
       if (event.type === 'down' && event.button === 2 && rightClickMenu) {
@@ -195,6 +210,18 @@ export function TerminalPane({
           return
         }
       }
+      if (event.type === 'down' && event.button === 0 && junctionEdges && onSeparatorDragStart) {
+        const side = getJunctionSideAt(event)
+        if (side !== null) {
+          const info = junctionEdges[side]
+          if (info) {
+            event.preventDefault()
+            event.stopPropagation()
+            onSeparatorDragStart(info)
+            return
+          }
+        }
+      }
       // Absorb left-button clicks on pane borders — they should not focus the
       // pane or be forwarded to the terminal. This keeps borders available for
       // resize actions (split separators, sidebar edge) without conflicting
@@ -248,11 +275,14 @@ export function TerminalPane({
     [
       canForwardMouse,
       contentOrigin,
+      getJunctionSideAt,
       isOnPaneBorder,
+      junctionEdges,
       onLeftEdgeMouseDown,
       onPaneActivate,
       onSeparatorDrag,
       onSeparatorDragEnd,
+      onSeparatorDragStart,
       onTerminalClick,
       onTerminalDrag,
       onTerminalMouseEvent,

package/src/ui/components/layout/top-tab-bar.tsx

@@ -0,0 +1,304 @@
+import type { MouseEvent as OtuiMouseEvent, ScrollBoxRenderable } from '@opentui/core'
+
+import { memo, type ReactNode, useCallback, useMemo, useRef } from 'react'
+
+import type { FocusMode, TabSession } from '../../../state/types'
+
+import { useWorktreeDivergencePolling } from '../../../git/worktree-divergence-poller'
+import { useAppStore } from '../../../state/app-store'
+import { dispatchGlobal, runSideEffectGlobal } from '../../../state/dispatch-ref'
+import { filterTabsForActiveWorktree } from '../../../state/session-worktrees'
+import { buildTabEntries, type GroupEntry } from '../../../state/tab-entries'
+import { useTheme } from '../../theme'
+import { ContextMenuBox } from '../overlays/context-menu/context-menu-box'
+import { TabItem } from './sidebar/tab-item'
+import { useTopTabBarAutoScroll } from './sidebar/use-top-tab-bar-auto-scroll'
+
+interface TopTabBarProps {
+  forceVisible?: boolean
+}
+
+const ROW_CONTENT_OPTIONS = {
+  flexDirection: 'row' as const,
+  gap: 0,
+  justifyContent: 'flex-start' as const,
+}
+
+function getGroupIndicator(active: boolean, focused: boolean): string {
+  if (!active) return '·'
+  return focused ? '›' : '•'
+}
+
+function getGroupIndicatorColor(
+  t: ReturnType<typeof useTheme>,
+  active: boolean,
+  focused: boolean
+): string {
+  if (!active) return t.textMuted
+  return focused ? t.primary : t.text
+}
+
+const TopTabCell = memo(function TopTabCell({
+  active,
+  backgroundColor,
+  children,
+  entryId,
+  onActivate,
+}: {
+  entryId: string
+  active: boolean
+  backgroundColor: string | undefined
+  onActivate?: (entryId: string) => void
+  children: ReactNode
+}) {
+  const handleMouseDown = useCallback(
+    (event: OtuiMouseEvent) => {
+      event.stopPropagation()
+      onActivate?.(entryId)
+    },
+    [onActivate, entryId]
+  )
+  return (
+    <box
+      backgroundColor={backgroundColor}
+      flexDirection="row"
+      flexShrink={0}
+      onMouseDown={handleMouseDown}
+      data-active={active ? 'true' : undefined}
+    >
+      {children}
+    </box>
+  )
+})
+
+function GroupTabItem({
+  active,
+  entry,
+  focused,
+  indexLabel,
+}: {
+  entry: GroupEntry
+  active: boolean
+  focused: boolean
+  indexLabel?: string
+}) {
+  const t = useTheme()
+  const indicator = getGroupIndicator(active, focused)
+  const indicatorColor = getGroupIndicatorColor(t, active, focused)
+
+  const closeGroup = useCallback(() => {
+    for (const tab of entry.tabs) {
+      dispatchGlobal({ tabId: tab.id, type: 'close-tab' })
+      runSideEffectGlobal({ tabId: tab.id, type: 'close-tab' })
+    }
+  }, [entry.tabs])
+
+  const handleCloseMouseDown = useCallback(
+    (event: OtuiMouseEvent) => {
+      event.stopPropagation()
+      closeGroup()
+    },
+    [closeGroup]
+  )
+
+  const rightClickMenu = useMemo<[string, () => void][]>(
+    () => [['Close group', closeGroup]],
+    [closeGroup]
+  )
+
+  return (
+    <ContextMenuBox
+      id={`top-tab-${entry.id}`}
+      paddingLeft={1}
+      paddingRight={1}
+      flexDirection="row"
+      alignItems="center"
+      rightClickMenu={rightClickMenu}
+    >
+      <text fg={indicatorColor} selectable={false}>
+        {indicator}{' '}
+      </text>
+      {indexLabel != null && indexLabel !== '' ? (
+        <text fg={t.textMuted} selectable={false} wrapMode="none">
+          {indexLabel}{' '}
+        </text>
+      ) : null}
+      {entry.tabs.map((tab, i) => {
+        const isLeafActive = tab.id === entry.activeLeafId
+        return (
+          <box key={tab.id} flexDirection="row" flexShrink={0}>
+            {i > 0 ? (
+              <text fg={t.textMuted} selectable={false} wrapMode="none">
+                {' | '}
+              </text>
+            ) : null}
+            <text fg={isLeafActive ? t.text : t.textMuted} selectable={false} wrapMode="none">
+              {tab.title}
+            </text>
+          </box>
+        )
+      })}
+      <box paddingLeft={1} onMouseDown={handleCloseMouseDown}>
+        <text fg={t.textMuted} selectable={false}>
+          ×
+        </text>
+      </box>
+    </ContextMenuBox>
+  )
+}
+
+export function TopTabBar({ forceVisible = false }: TopTabBarProps) {
+  const t = useTheme()
+  const headerBg = t.backgroundPanel
+  const tabs = useAppStore((s) => s.tabs)
+  const activeTabId = useAppStore((s) => s.activeTabId)
+  const bar = useAppStore((s) => s.sessionBar)
+  const sidebar = useAppStore((s) => s.sidebar)
+  const currentSessionId = useAppStore((s) => s.currentSessionId)
+  const sessions = useAppStore((s) => s.sessions)
+  const focusMode: FocusMode = useAppStore((s) => s.focusMode)
+  const layoutTrees = useAppStore((s) => s.layoutTrees)
+  const tabGroupMap = useAppStore((s) => s.tabGroupMap)
+
+  // Sidebar now also shows worktree chips with divergence — poll whenever
+  // either surface is visible.
+  useWorktreeDivergencePolling(bar.visible || sidebar.visible || forceVisible)
+
+  const currentSession = useMemo(
+    () =>
+      currentSessionId != null && currentSessionId !== ''
+        ? sessions.find((s) => s.id === currentSessionId)
+        : undefined,
+    [currentSessionId, sessions]
+  )
+
+  const visibleTabs = useMemo(
+    () => filterTabsForActiveWorktree(tabs, currentSession),
+    [tabs, currentSession]
+  )
+
+  const entries = useMemo(
+    () => buildTabEntries(visibleTabs, layoutTrees, tabGroupMap, activeTabId),
+    [visibleTabs, layoutTrees, tabGroupMap, activeTabId]
+  )
+
+  const activeEntryId = useMemo(() => {
+    for (const entry of entries) {
+      if (entry.kind === 'single') {
+        if (entry.tab.id === activeTabId) return entry.id
+      } else if (entry.tabs.some((tab) => tab.id === activeTabId)) {
+        return entry.id
+      }
+    }
+    return null
+  }, [entries, activeTabId])
+
+  const scrollRef = useRef<ScrollBoxRenderable | null>(null)
+  useTopTabBarAutoScroll({
+    activeTabId: activeEntryId,
+    idPrefix: 'top-tab-',
+    scrollRef,
+    visible: bar.visible || forceVisible,
+  })
+
+  const handleEntryActivate = useCallback(
+    (entryId: string) => {
+      const entry = entries.find((e) => e.id === entryId)
+      if (!entry) return
+      const targetTabId = entry.kind === 'single' ? entry.tab.id : entry.activeLeafId
+      if (targetTabId !== activeTabId) {
+        dispatchGlobal({ tabId: targetTabId, type: 'set-active-tab' })
+      }
+      dispatchGlobal({ focusMode: 'terminal-input', type: 'set-focus-mode' })
+    },
+    [entries, activeTabId]
+  )
+
+  const handleNewTab = useCallback((e: OtuiMouseEvent) => {
+    e.stopPropagation()
+    dispatchGlobal({ type: 'open-new-tab-modal' })
+  }, [])
+
+  if (!bar.visible && !forceVisible) return null
+  if (entries.length === 0) return null
+
+  const isFocused = focusMode === 'terminal-input' || focusMode === 'navigation'
+
+  return (
+    <box
+      width="100%"
+      height={1}
+      flexDirection="row"
+      flexShrink={0}
+      backgroundColor={headerBg}
+      overflow="hidden"
+    >
+      <scrollbox
+        ref={scrollRef}
+        height={1}
+        flexGrow={1}
+        flexShrink={1}
+        flexBasis={0}
+        scrollX
+        viewportCulling
+        contentOptions={ROW_CONTENT_OPTIONS}
+      >
+        {entries.map((entry, index) => {
+          // [N] is shown only for the first 9 entries — that's the range
+          // Leader+1..9 can address.
+          const indexLabel = index < 9 ? `[${index + 1}]` : undefined
+          if (entry.kind === 'single') {
+            const tab: TabSession = entry.tab
+            const isActive = tab.id === activeTabId
+            return (
+              <TopTabCell
+                key={entry.id}
+                entryId={entry.id}
+                active={isActive}
+                onActivate={handleEntryActivate}
+                backgroundColor={isActive ? t.backgroundElement : undefined}
+              >
+                <TabItem
+                  id={`top-tab-${tab.id}`}
+                  tab={tab}
+                  active={isActive}
+                  focused={isFocused}
+                  indexLabel={indexLabel}
+                  alwaysShowClose
+                />
+              </TopTabCell>
+            )
+          }
+          const isActive = entry.tabs.some((tab) => tab.id === activeTabId)
+          return (
+            <TopTabCell
+              key={entry.id}
+              entryId={entry.id}
+              active={isActive}
+              onActivate={handleEntryActivate}
+              backgroundColor={isActive ? t.backgroundElement : undefined}
+            >
+              <GroupTabItem
+                entry={entry}
+                active={isActive}
+                focused={isFocused}
+                indexLabel={indexLabel}
+              />
+            </TopTabCell>
+          )
+        })}
+        <box
+          flexDirection="row"
+          flexShrink={0}
+          paddingLeft={1}
+          paddingRight={1}
+          onMouseDown={handleNewTab}
+        >
+          <text fg={t.textMuted} selectable={false}>
+            +
+          </text>
+        </box>
+      </scrollbox>
+    </box>
+  )
+}

package/src/ui/components/modals/worktree/worktree-move-modal.tsx

@@ -3,6 +3,7 @@ import { useCallback, useMemo } from 'react'
 import type { WorktreeRecord } from '../../../../state/types'
 
 import { dispatchGlobal } from '../../../../state/dispatch-ref'
+import { formatDivergence } from '../../../../state/session-worktrees'
 import { useTheme } from '../../../theme'
 import { uiTokens } from '../../../ui-tokens'
 import { ListItem } from '../../primitives/list-item'
@@ -23,14 +24,6 @@ const MOVE_HINTS: [key: string, label: string][] = [
   ['esc', 'cancel'],
 ]
 
-function formatDivergence(divergence: { ahead: number; behind: number } | undefined): string {
-  if (divergence == null) return ''
-  const parts: string[] = []
-  if (divergence.ahead > 0) parts.push(`↑${divergence.ahead}`)
-  if (divergence.behind > 0) parts.push(`↓${divergence.behind}`)
-  return parts.join(' ')
-}
-
 export function WorktreeMoveModal({
   deleteSource,
   divergence,