@brimveyn/aimux 1.12.2 → 1.13.0

package/README.md

@@ -22,6 +22,9 @@ snippets, themes, and fully configurable keymaps.
 - configurable git pane (embedded in the sidebar or as a standalone pane) and a
   dedicated [git mode](docs/guide/git-mode.md) for review / stage / commit /
   push with a split or stacked diff view and shiki-powered highlighting
+- [git worktrees](docs/guide/worktrees.md) for running agents on parallel
+  branches — create per-branch worktrees, review each against its base, and
+  squash-move a worktree's work into another
 - built-in help generated from the resolved keymap
 - theme picker with 67 built-in themes (shiki catalog + aimux house themes) and a `/` filter
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux",
-  "version": "1.12.2",
+  "version": "1.13.0",
   "description": "A terminal multiplexer for AI CLIs. Run Claude, Codex, OpenCode side-by-side with tabbed navigation, split panes, and persistent sessions.",
   "keywords": [
     "ai",
@@ -53,14 +53,14 @@
     "demo:themes": "vhs assets/themes.tape",
     "restart-daemon": "AIMUX_PROFILE=dev bun run src/index.tsx restart-daemon",
     "restart-terminal-manager": "AIMUX_PROFILE=dev bun run src/index.tsx restart-terminal-manager",
-    "lint": "oxlint .",
+    "lint": "oxlint --type-aware .",
     "format": "oxfmt --write .",
     "format:check": "oxfmt --check .",
     "knip": "knip-bun",
     "bump": "bun run scripts/bump.ts"
   },
   "dependencies": {
-    "@brimveyn/aimux-config": "0.5.13",
+    "@brimveyn/aimux-config": "0.6.0",
     "@opentui/core": "^0.1.90",
     "@opentui/react": "^0.1.90",
     "@resvg/resvg-wasm": "^2.6.2",
@@ -79,6 +79,7 @@
     "lefthook": "^2.1.4",
     "oxfmt": "^0.42.0",
     "oxlint": "^1.57.0",
+    "oxlint-tsgolint": "^0.23.0",
     "typescript": "^6.0.2"
   }
 }

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

@@ -15,6 +15,7 @@ import { stripAnsi } from '../auto-commit/strip-ansi'
 import { runSuggestion } from '../auto-commit/suggestion-runner'
 import { workingTreeHash } from '../auto-commit/working-tree-hash'
 import { isCommandAvailable } from '../pty/command-registry'
+import { toast } from '../state/toast-store'
 
 export interface TriggerInput {
   enabled: boolean
@@ -63,7 +64,7 @@ const UNTRACKED_FILE_BYTES_CAP = 8_000
 const SESSION_TAIL_BYTES_CAP = 8_000
 
 export function extractSessionTail(buffer: string | undefined): string {
-  if (!buffer) return '[no session tail available]'
+  if (!(buffer != null && buffer !== '')) return '[no session tail available]'
   const stripped = stripAnsi(buffer).trimEnd()
   if (stripped.length === 0) return '[no session tail available]'
   return stripped.length > SESSION_TAIL_BYTES_CAP
@@ -161,7 +162,7 @@ export async function onActivityTransition(
     currentHash,
     enabled: config.enabled,
     git: args.git,
-    hasProjectPath: !!args.projectPath,
+    hasProjectPath: !!(args.projectPath != null && args.projectPath !== ''),
     sessionId: args.sessionId,
     state: state.autoCommit,
   })
@@ -176,12 +177,15 @@ export async function onManualTrigger(
 ): Promise<void> {
   const config = deps.getConfig()
   const fail = (reason: string): void => {
-    deps.dispatch({ message: `auto-commit: ${reason}`, type: 'git-mode-set-message' })
+    // Manual auto-commit triggers can fire outside git mode, so surface the
+    // reason as a toast rather than an inline git-pane message that's unseen.
+    toast.warning(`Auto-commit: ${reason}`)
     deps.dispatch({ sessionId: args.sessionId, type: 'auto-commit-clear' })
   }
   if (!config.enabled) return fail('disabled in config')
   if (!args.git || args.git.files.length === 0) return fail('no changes to summarise')
-  if (!args.projectPath) return fail('no project path for current session')
+  if (!(args.projectPath != null && args.projectPath !== ''))
+    return fail('no project path for current session')
 
   const currentHash = workingTreeHash(args.git)
   const existing = deps.getState().autoCommit.bySession[args.sessionId]

package/src/app-runtime/auto-commit-ref.ts

@@ -14,7 +14,7 @@ export function clearActiveAutoCommitDriverIfMatches(trigger: TriggerFn): void {
   if (activeTrigger === trigger) activeTrigger = null
 }
 
-export function triggerAutoCommitNow(args: ActivityTransitionArgs): Promise<void> {
+export async function triggerAutoCommitNow(args: ActivityTransitionArgs): Promise<void> {
   if (!activeTrigger) return Promise.resolve()
   return activeTrigger(args)
 }

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

@@ -1,7 +1,7 @@
 import type { MutableRefObject } from 'react'
 
 import type { SessionBackend } from '../session-backend/types'
-import type { AppAction, LayoutState, WorkspaceSnapshotV1 } from '../state/types'
+import type { AppAction, LayoutState, TabSession, WorkspaceSnapshotV1 } from '../state/types'
 
 import { logInputDebug } from '../debug/input-log'
 import {
@@ -33,6 +33,22 @@ export function resizeSnapshotPanes(
   })
 }
 
+function mergeSnapshotTabMetadata(
+  tabs: TabSession[],
+  workspaceSnapshot: WorkspaceSnapshotV1 | undefined
+): TabSession[] {
+  if (!workspaceSnapshot) return tabs
+  const persistedById = new Map(workspaceSnapshot.tabs.map((tab) => [tab.id, tab]))
+  return tabs.map((tab) => {
+    const persisted = persistedById.get(tab.id)
+    return persisted?.worktreeId != null &&
+      persisted?.worktreeId !== '' &&
+      !(tab.worktreeId != null && tab.worktreeId !== '')
+      ? { ...tab, worktreeId: persisted.worktreeId }
+      : tab
+  })
+}
+
 function hydrateAttachedSession(
   dispatch: (action: AppAction) => void,
   sessionId: string,
@@ -47,7 +63,7 @@ function hydrateAttachedSession(
       layoutTree: workspaceSnapshot?.layoutTree,
       layoutTrees: workspaceSnapshot?.layoutTrees,
       tabGroupMap: workspaceSnapshot?.tabGroupMap,
-      tabs: result.tabs,
+      tabs: mergeSnapshotTabMetadata(result.tabs, workspaceSnapshot),
       type: 'hydrate-workspace',
     })
     // Dispatch the session-status snapshot *after* hydrate-workspace so

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

@@ -8,10 +8,10 @@ import type {
   TabSession,
   TerminalModeState,
 } from '../state/types'
+import type { TabRuntimeTimeouts } from './tab-runtime-timeouts'
 
 import { logInputDebug } from '../debug/input-log'
 import { clearTabSyntaxState, highlightSnapshot } from '../integrations/claude-syntax-overlay'
-import { type TabRuntimeTimeouts } from './tab-runtime-timeouts'
 
 interface BindBackendRuntimeEventsOptions {
   backend: SessionBackend

package/src/app-runtime/pty-write.ts

@@ -45,3 +45,55 @@ export function writePasteToTab(
   const payload = buildPtyPastePayload(text, tab?.terminalModes.bracketedPasteMode ?? false)
   writeToTab(backend, tabId, tab, payload, dispatch, { autoBottom: true })
 }
+
+const DEL = '\x7f'
+const CURSOR_LEFT = '\x1b[D'
+const RAW_INLINE_MAX_LEN = 200
+
+/**
+ * Write a macro expansion to a PTY:
+ *  1. Erase `eraseCount` previously echoed characters via DEL (readline-compatible).
+ *  2. Inject `expandedText` (raw if short single-line; bracketed-paste payload otherwise).
+ *  3. Move cursor left to `cursorOffset` via ANSI left-arrow sequences (outside any
+ *     bracketed-paste wrapper so the application interprets them as keys, not text).
+ */
+export function writeMacroExpansionToTab(
+  backend: SessionBackend,
+  tabId: string,
+  tab: TabSession | undefined,
+  eraseCount: number,
+  expandedText: string,
+  cursorOffset: number,
+  dispatch?: (action: AppAction) => void
+): void {
+  if (tab && shouldScrollViewportToBottom(tab)) {
+    backend.scrollViewportToBottom(tabId)
+    dispatch?.({ intent: { kind: 'bottom' }, tabId, type: 'set-scroll-intent' })
+  }
+
+  const erase = eraseCount > 0 ? DEL.repeat(eraseCount) : ''
+  const isShortInline = expandedText.length <= RAW_INLINE_MAX_LEN && !expandedText.includes('\n')
+  const bracketed = tab?.terminalModes.bracketedPasteMode ?? false
+
+  const body = isShortInline ? expandedText : buildPtyPastePayload(expandedText, bracketed)
+  const leftArrowCount = Math.max(0, expandedText.length - cursorOffset)
+  const leftArrows = leftArrowCount > 0 ? CURSOR_LEFT.repeat(leftArrowCount) : ''
+
+  logInputDebug('ptyWrite.macroExpansion', {
+    bodyLength: body.length,
+    cursorOffset,
+    eraseCount,
+    expandedTextLength: expandedText.length,
+    leftArrowCount,
+    tabId,
+  })
+
+  if (isShortInline) {
+    backend.write(tabId, `${erase}${body}${leftArrows}`)
+    return
+  }
+
+  if (erase) backend.write(tabId, erase)
+  backend.write(tabId, body)
+  if (leftArrows) backend.write(tabId, leftArrows)
+}

package/src/app-runtime/selection-scroll.ts

@@ -4,7 +4,7 @@ interface SelectableLike {
 }
 
 function isUsableTarget(target: SelectableLike | null | undefined): target is SelectableLike {
-  return Boolean(target?.selectable) && !target?.isDestroyed
+  return Boolean(target?.selectable) && !(target?.isDestroyed === true)
 }
 
 interface SelectionLike {
@@ -69,7 +69,7 @@ export function shiftSelectionByScroll(renderer: RendererSelectionApi, deltaLine
 
   const live = renderer.getSelection()
 
-  if (!live?.isActive) {
+  if (!(live?.isActive === true)) {
     resetSelectionShiftState(renderer)
     return
   }

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

@@ -5,6 +5,8 @@ import { logInputDebug } from '../debug/input-log'
 import { createPrefixedId } from '../platform/id'
 import { saveSessionCatalog } from '../state/session-catalog'
 import { createEmptyWorkspaceSnapshot, serializeWorkspace } from '../state/session-persistence'
+import { createPrimaryWorktree, ensureSessionWorktrees } from '../state/session-worktrees'
+import { toast } from '../state/toast-store'
 import { buildSessionsWithCurrentSnapshot } from '../state/workspace-save'
 
 export function createSessionFromCurrentState(
@@ -14,10 +16,11 @@ export function createSessionFromCurrentState(
 ): { session: SessionRecord; sessions: SessionRecord[] } {
   const now = new Date().toISOString()
   const workspaceSnapshot =
-    state.currentSessionId || state.tabs.length === 0
+    (state.currentSessionId != null && state.currentSessionId !== '') || state.tabs.length === 0
       ? createEmptyWorkspaceSnapshot()
       : serializeWorkspace(state)
   const session: SessionRecord = {
+    activeWorktreeId: undefined,
     createdAt: now,
     id: createPrefixedId('session'),
     lastOpenedAt: now,
@@ -25,10 +28,16 @@ export function createSessionFromCurrentState(
     projectPath,
     updatedAt: now,
     workspaceSnapshot,
+    worktrees: undefined,
+  }
+  if (projectPath != null && projectPath !== '') {
+    const worktree = createPrimaryWorktree(projectPath, now)
+    session.activeWorktreeId = worktree.id
+    session.worktrees = [worktree]
   }
 
   let updatedSessions = state.sessions
-  if (state.currentSessionId) {
+  if (state.currentSessionId != null && state.currentSessionId !== '') {
     const currentSnapshot = serializeWorkspace(state)
     updatedSessions = state.sessions.map((entry) =>
       entry.id === state.currentSessionId
@@ -39,7 +48,7 @@ export function createSessionFromCurrentState(
 
   return {
     session,
-    sessions: [...updatedSessions, session],
+    sessions: [...updatedSessions, ensureSessionWorktrees(session)],
   }
 }
 
@@ -79,7 +88,8 @@ export function handleCreateSessionEffect(
 ): void {
   const { session, sessions } = createSessionFromCurrentState(state, name, projectPath)
   logInputDebug('app.session.create', {
-    fromCurrentWorkspace: !state.currentSessionId && state.tabs.length > 0,
+    fromCurrentWorkspace:
+      (state.currentSessionId == null || state.currentSessionId === '') && state.tabs.length > 0,
     name,
     sessionId: session.id,
     tabCount: session.workspaceSnapshot?.tabs.length ?? 0,
@@ -137,6 +147,7 @@ export function handleDeleteSessionEffect(
   sessionId: string,
   options?: { openSessionPicker?: boolean }
 ): void {
+  const name = state.sessions.find((entry) => entry.id === sessionId)?.name
   const remaining = deleteSessionRecords(state.sessions, sessionId)
   logInputDebug('app.session.delete', {
     remainingCount: remaining.length,
@@ -152,6 +163,7 @@ export function handleDeleteSessionEffect(
     sessionId,
     type: 'delete-session-record',
   })
+  toast.success(name != null && name !== '' ? `Deleted workspace "${name}"` : 'Workspace deleted')
 }
 
 export function restartTabSession(