@brimveyn/aimux 1.13.2 → 1.14.1

package/src/state/session-worktrees.ts

@@ -3,13 +3,21 @@ import { createHash } from 'node:crypto'
 import { existsSync } from 'node:fs'
 import { basename } from 'node:path'
 
-import type { SessionRecord, TabSession, WorktreeRecord } from './types'
+import type { BranchDivergence, SessionRecord, TabSession, WorktreeRecord } from './types'
 
 import { createPrefixedId } from '../platform/id'
 import { isInsideAimuxWorktreeRoot } from '../platform/worktree-paths'
 
 const WORKTREE_COLORS = ['#7dd3fc', '#86efac', '#facc15', '#f0abfc', '#fb7185', '#c4b5fd']
 
+export function formatDivergence(divergence: BranchDivergence | 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 getWorktreeColor(worktreeId: string): string {
   let hash = 0
   for (let i = 0; i < worktreeId.length; i++) {
@@ -98,7 +106,24 @@ function mergeExistingGitWorktrees(worktrees: WorktreeRecord[], now: string): Wo
       ? primaryRepoRoot
       : (live[0]?.path ?? anchor.repoRoot)
   for (const entry of live) {
-    if (byPath.has(entry.path)) continue
+    const existing = byPath.get(entry.path)
+    if (existing) {
+      // Patch branch / commitSha from git for entries we already track —
+      // notably the primary worktree, whose `branch` is never set at creation
+      // time (createPrimaryWorktree doesn't run `git`). Without this, the UI
+      // and the divergence poller have no branch for primary worktrees.
+      const patchedBranch = entry.branch ?? existing.branch
+      const patchedSha = entry.head ?? existing.commitSha
+      if (patchedBranch !== existing.branch || patchedSha !== existing.commitSha) {
+        byPath.set(entry.path, {
+          ...existing,
+          branch: patchedBranch,
+          commitSha: patchedSha,
+          updatedAt: now,
+        })
+      }
+      continue
+    }
     if (isInsideAimuxWorktreeRoot(entry.path)) continue
     const worktree: WorktreeRecord = {
       branch: entry.branch,
@@ -204,6 +229,24 @@ export function getRenderedTabWorktreeId(
   return tab.worktreeId ?? worktrees[0]?.id ?? '__main__'
 }
 
+export function filterTabsForActiveWorktree(
+  tabs: TabSession[],
+  session: SessionRecord | undefined
+): TabSession[] {
+  if (!session) return tabs
+  const activeWorktreeId = session.activeWorktreeId
+  if (activeWorktreeId == null || activeWorktreeId === '') return tabs
+  const worktrees = session.worktrees ?? []
+  const primaryId = worktrees[0]?.id
+  const activeIsPrimary = primaryId != null && primaryId === activeWorktreeId
+  return tabs.filter((tab) => {
+    const owned = tab.worktreeId != null && tab.worktreeId !== ''
+    if (owned) return tab.worktreeId === activeWorktreeId
+    // Unbound (legacy) tabs surface only under the primary worktree.
+    return activeIsPrimary
+  })
+}
+
 export function orderTabsByWorktree(
   tabs: TabSession[],
   session: SessionRecord | undefined

package/src/state/store.ts

@@ -16,7 +16,6 @@ import {
   type GitPaneMode,
   type GitPanePosition,
   type GitPaneState,
-  type SessionBarPosition,
   type SessionRecord,
   type SnippetRecord,
 } from './types'
@@ -32,7 +31,6 @@ export interface InitialStateOverrides {
   gitPane?: Partial<GitPaneState>
   sidebar?: Pick<AppState['sidebar'], 'visible' | 'width'>
   sessionBarVisible?: boolean
-  sessionBarPosition?: SessionBarPosition
 }
 
 const DEFAULT_GIT_PANE: GitPaneState = {
@@ -103,7 +101,6 @@ export function createInitialState(
     multiRepo: EMPTY_MULTI_REPO_STATE,
     pendingChords: null,
     sessionBar: {
-      position: overrides.sessionBarPosition ?? 'top',
       visible: overrides.sessionBarVisible ?? true,
     },
     sessions,

package/src/state/tab-entries.ts

@@ -0,0 +1,74 @@
+import type { TabSession } from './types'
+
+import { allLeafIds, type LayoutNode } from './layout-tree'
+
+export interface SingleEntry {
+  kind: 'single'
+  id: string
+  tab: TabSession
+}
+
+export interface GroupEntry {
+  kind: 'group'
+  id: string
+  groupId: string
+  tabs: TabSession[]
+  activeLeafId: string
+}
+
+export type TabEntry = SingleEntry | GroupEntry
+
+/**
+ * Collapse a list of visible tabs into "tab strip entries": one entry per
+ * standalone tab, one entry per multi-leaf layout group (split). Tabs that
+ * belong to a layout tree with only one leaf are treated as standalone.
+ *
+ * Within a group entry, `activeLeafId` is `activeTabId` when it falls inside
+ * the group, otherwise the first leaf in the underlying tabs order.
+ */
+export function buildTabEntries(
+  visibleTabs: TabSession[],
+  layoutTrees: Record<string, LayoutNode>,
+  tabGroupMap: Record<string, string>,
+  activeTabId: string | null
+): TabEntry[] {
+  // Set of groupIds that are real splits (>= 2 leaves).
+  const splitGroupIds = new Set<string>()
+  for (const [groupId, tree] of Object.entries(layoutTrees)) {
+    if (allLeafIds(tree).length >= 2) {
+      splitGroupIds.add(groupId)
+    }
+  }
+
+  const entries: TabEntry[] = []
+  const emittedGroupIds = new Set<string>()
+
+  for (const tab of visibleTabs) {
+    const groupId = tabGroupMap[tab.id]
+    const inSplit = groupId != null && groupId !== '' && splitGroupIds.has(groupId)
+
+    if (!inSplit) {
+      entries.push({ id: tab.id, kind: 'single', tab })
+      continue
+    }
+
+    if (emittedGroupIds.has(groupId)) continue
+    emittedGroupIds.add(groupId)
+
+    const members = visibleTabs.filter((t) => tabGroupMap[t.id] === groupId)
+    const activeLeafId =
+      activeTabId != null && members.some((t) => t.id === activeTabId)
+        ? activeTabId
+        : (members[0]?.id ?? tab.id)
+
+    entries.push({
+      activeLeafId,
+      groupId,
+      id: groupId,
+      kind: 'group',
+      tabs: members,
+    })
+  }
+
+  return entries
+}

package/src/state/types.ts

@@ -70,16 +70,11 @@ export interface TerminalSnapshot {
   cursorVisible: boolean
 }
 
+// The scroll position is owned end-to-end by the backend emulator; this type
+// only describes the re-anchor target the backend computes for itself across a
+// reflow. The frontend no longer derives, stores, or sends a scroll intent.
 export type ScrollIntent = { kind: 'bottom' } | { absoluteLine: number; kind: 'anchor' }
 
-export const DEFAULT_SCROLL_INTENT: ScrollIntent = { kind: 'bottom' }
-
-export function deriveScrollIntent(viewport: TerminalSnapshot): ScrollIntent {
-  return viewport.viewportY >= viewport.baseY
-    ? { kind: 'bottom' }
-    : { absoluteLine: viewport.viewportY, kind: 'anchor' }
-}
-
 export interface TerminalModeState {
   mouseTrackingMode: 'none' | 'x10' | 'vt200' | 'drag' | 'any'
   sendFocusMode: boolean
@@ -97,7 +92,6 @@ export interface PersistedTabSnapshot {
   buffer: string
   viewport?: TerminalSnapshot
   terminalModes: TerminalModeState
-  scrollIntent?: ScrollIntent
   errorMessage?: string
   exitCode?: number
   worktreeId?: string
@@ -147,11 +141,8 @@ export interface SessionRecord {
   activeWorktreeId?: string
 }
 
-export type SessionBarPosition = 'top' | 'bottom'
-
 export interface SessionBarState {
   visible: boolean
-  position: SessionBarPosition
 }
 
 export interface TabSession {
@@ -163,7 +154,6 @@ export interface TabSession {
   buffer: string
   viewport?: TerminalSnapshot
   terminalModes: TerminalModeState
-  scrollIntent?: ScrollIntent
   command: string
   errorMessage?: string
   exitCode?: number
@@ -546,6 +536,7 @@ export type SessionAction =
   | { type: 'rename-session-record'; sessionId: string; name: string }
   | { type: 'delete-session-record'; sessionId: string; openSessionPicker?: boolean }
   | { type: 'reorder-sessions'; orderedIds: string[] }
+  | { type: 'reorder-active-session'; delta: number }
   | { type: 'set-session-status'; sessionId: string; status: SessionStatus }
   | { type: 'add-worktree-record'; sessionId: string; worktree: WorktreeRecord; activate?: boolean }
   | { type: 'remove-worktree-record'; sessionId: string; worktreeId: string }
@@ -583,7 +574,6 @@ export type TabAction =
       terminalModes: TerminalModeState
       source?: 'resize' | 'scroll' | 'data' | 'switch'
     }
-  | { type: 'set-scroll-intent'; tabId: string; intent: ScrollIntent }
   | { type: 'set-tab-activity'; tabId: string; activity?: TabActivity }
   | { type: 'set-tab-error'; tabId: string; message: string }
 
@@ -627,7 +617,6 @@ export type UIAction =
   | { type: 'set-git-pane-position'; position: GitPanePosition }
   | { type: 'set-pending-chords'; chords: string[] | null }
   | { type: 'toggle-session-bar' }
-  | { type: 'set-session-bar-position'; position: SessionBarPosition }
 
 // -- Git panel actions --
 export interface GitRefreshPayload {

package/src/state/validation.ts

@@ -56,13 +56,6 @@ function isTerminalSnapshot(value: unknown): value is TerminalSnapshot {
   )
 }
 
-function isScrollIntent(value: unknown): boolean {
-  if (!isObjectRecord(value)) return false
-  if (value.kind === 'bottom') return true
-  if (value.kind === 'anchor') return isFiniteNumber(value.absoluteLine)
-  return false
-}
-
 function isTerminalModeState(value: unknown): value is TerminalModeState {
   return (
     isObjectRecord(value) &&
@@ -149,7 +142,6 @@ export function isWorkspaceSnapshotV1(value: unknown): value is WorkspaceSnapsho
         isString(tab.buffer) &&
         isTerminalModeState(tab.terminalModes) &&
         (tab.viewport === undefined || isTerminalSnapshot(tab.viewport)) &&
-        (tab.scrollIntent === undefined || isScrollIntent(tab.scrollIntent)) &&
         (tab.errorMessage === undefined || isString(tab.errorMessage)) &&
         (tab.exitCode === undefined || isFiniteNumber(tab.exitCode)) &&
         (tab.worktreeId === undefined || isString(tab.worktreeId))

package/src/state/workspace-save.ts

@@ -33,7 +33,6 @@ export function saveCurrentWorkspace(state: AppState): void {
       position: state.gitPane.position,
       visible: state.gitPane.visible,
     },
-    sessionBarPosition: state.sessionBar.position,
     sessionBarVisible: state.sessionBar.visible,
     sidebar: {
       visible: state.sidebar.visible,

package/src/terminal-manager/manager-client.ts

@@ -1,12 +1,7 @@
 import { EventEmitter } from 'node:events'
 import { connect, type Socket } from 'node:net'
 
-import type {
-  ScrollIntent,
-  TerminalModeState,
-  TerminalSnapshot,
-  WorkspaceSnapshotV1,
-} from '../state/types'
+import type { TerminalModeState, TerminalSnapshot, WorkspaceSnapshotV1 } from '../state/types'
 
 import { getTerminalManagerSocketPath } from '../daemon/runtime-paths'
 import { logDebug } from '../debug/input-log'
@@ -306,29 +301,18 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
     })
   }
 
-  async resize(
-    sessionId: string,
-    cols: number,
-    rows: number,
-    intents?: Record<string, ScrollIntent>
-  ): Promise<void> {
+  async resize(sessionId: string, cols: number, rows: number): Promise<void> {
     return this.sendExpectOk({
       id: crypto.randomUUID(),
-      payload: { cols, intents, rows, sessionId },
+      payload: { cols, rows, sessionId },
       type: 'resizeClient',
     })
   }
 
-  async resizeTab(
-    sessionId: string,
-    tabId: string,
-    cols: number,
-    rows: number,
-    intent?: ScrollIntent
-  ): Promise<void> {
+  async resizeTab(sessionId: string, tabId: string, cols: number, rows: number): Promise<void> {
     return this.sendExpectOk({
       id: crypto.randomUUID(),
-      payload: { cols, intent, rows, sessionId, tabId },
+      payload: { cols, rows, sessionId, tabId },
       type: 'resizeTab',
     })
   }
@@ -349,14 +333,6 @@ export class TerminalManagerClient extends EventEmitter<ManagerClientEvents> {
     })
   }
 
-  async reapplyScrollIntent(sessionId: string, tabId: string, intent: ScrollIntent): Promise<void> {
-    return this.sendExpectOk({
-      id: crypto.randomUUID(),
-      payload: { intent, sessionId, tabId },
-      type: 'reapplyScrollIntent',
-    })
-  }
-
   async setActiveTab(sessionId: string, tabId: string | null): Promise<void> {
     return this.sendExpectOk({
       id: crypto.randomUUID(),

package/src/terminal-manager/terminal-manager.ts

@@ -211,15 +211,10 @@ export async function runTerminalManager(): Promise<void> {
                 break
               case 'resizeClient': {
                 requireNegotiatedVersion(socket, negotiatedVersions)
-                const intentsRecord = message.payload.intents
-                const intentsMap = intentsRecord
-                  ? new Map(Object.entries(intentsRecord))
-                  : undefined
                 sessionManager.resize(
                   message.payload.sessionId,
                   message.payload.cols,
-                  message.payload.rows,
-                  intentsMap
+                  message.payload.rows
                 )
                 sendOk(socket, message.id)
                 break
@@ -230,8 +225,7 @@ export async function runTerminalManager(): Promise<void> {
                   message.payload.sessionId,
                   message.payload.tabId,
                   message.payload.cols,
-                  message.payload.rows,
-                  message.payload.intent
+                  message.payload.rows
                 )
                 sendOk(socket, message.id)
                 break
@@ -249,15 +243,6 @@ export async function runTerminalManager(): Promise<void> {
                 sessionManager.scrollToBottom(message.payload.sessionId, message.payload.tabId)
                 sendOk(socket, message.id)
                 break
-              case 'reapplyScrollIntent':
-                requireNegotiatedVersion(socket, negotiatedVersions)
-                sessionManager.reapplyScrollIntent(
-                  message.payload.sessionId,
-                  message.payload.tabId,
-                  message.payload.intent
-                )
-                sendOk(socket, message.id)
-                break
               case 'setActiveTab':
                 requireNegotiatedVersion(socket, negotiatedVersions)
                 sessionManager.setActiveTab(message.payload.sessionId, message.payload.tabId)