@brimveyn/aimux 1.15.2 → 1.16.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimveyn/aimux",
-  "version": "1.15.2",
+  "version": "1.16.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",

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

@@ -126,11 +126,15 @@ export function applyViewportObservation(
   next: ViewportObservation | null
 ): ViewportObservation | null {
   if (!next) {
-    if (prior !== null) resetSelectionShiftState(renderer)
+    if (prior !== null) {
+      renderer.clearSelection()
+      resetSelectionShiftState(renderer)
+    }
     return null
   }
 
   if (!prior || prior.tabId !== next.tabId) {
+    if (prior && prior.tabId !== next.tabId) renderer.clearSelection()
     resetSelectionShiftState(renderer)
     return next
   }

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

@@ -1610,7 +1610,6 @@ async function runDeleteWorktree(
   if (tabsInWorktree.length > 0 && !force && !closeTabs) {
     throw new ActiveWorktreeTabsError(tabsInWorktree.length)
   }
-  disposeWorktreeTabs(ctx, worktreeId)
 
   const repoPath = resolveWorktreeGitDir(session, worktree)
   const isAimuxTemp = worktree.source === 'aimux-temp' && worktree.createdByAimux
@@ -1624,15 +1623,14 @@ async function runDeleteWorktree(
     }
   }
 
+  // Run git ops FIRST. If any throws (dirty worktree, etc.) the catch in the
+  // delete-worktree side effect handler re-prompts force or toasts the error —
+  // tabs stay open and the row stays in the sidebar, so the UI matches reality
+  // instead of leaving tabs closed against a worktree that still exists.
   if (isAimuxTemp && isInsideAimuxWorktreeRoot(worktree.path) && !existsSync(worktree.path)) {
     // The dir vanished but git may still pin the branch to a stale worktree entry.
     await pruneGitWorktrees(repoPath)
-    await cleanupAimuxBranch()
-    removeWorktreeRecordFromSession(ctx, sessionId, session, worktreeId)
-    return
-  }
-
-  if (isAimuxTemp && isInsideAimuxWorktreeRoot(worktree.path)) {
+  } else if (isAimuxTemp && isInsideAimuxWorktreeRoot(worktree.path)) {
     await assertSafeAimuxWorktreePath(worktree.path)
     await removeGitWorktree({ force, repoPath, targetPath: worktree.path })
   } else if (worktree.source === 'aimux-temp' || worktree.createdByAimux) {
@@ -1640,7 +1638,15 @@ async function runDeleteWorktree(
   }
 
   await cleanupAimuxBranch()
-  removeWorktreeRecordFromSession(ctx, sessionId, session, worktreeId)
+
+  // Only after git success: close tabs + retire the record. Re-read state so
+  // we don't operate on the snapshot captured before the awaits above.
+  disposeWorktreeTabs({ ...ctx, state: ctx.getState() }, worktreeId)
+  const latest = ctx.getState()
+  const latestSession = latest.sessions.find((entry) => entry.id === sessionId)
+  if (latestSession) {
+    removeWorktreeRecordFromSession({ ...ctx, state: latest }, sessionId, latestSession, worktreeId)
+  }
 }
 
 // A worktree's stored repoRoot can point at a sibling worktree that was since

package/src/app-runtime/use-terminal-resize.ts

@@ -19,6 +19,7 @@ import {
   forEachSplitPaneRect,
   toTerminalContentSize,
 } from '../state/layout-resize'
+import { getTreeForTab } from '../state/layout-tree'
 
 const MAIN_AREA_HORIZONTAL_CHROME = 2
 const MAIN_AREA_VERTICAL_PADDING = 0
@@ -161,6 +162,19 @@ export function useTerminalResize({
 
   const activeTabIdRef = useRef(state.activeTabId)
   activeTabIdRef.current = state.activeTabId
+  // Whether the active tab is part of a split. contentOriginRef must hold the
+  // whole terminal-area origin (root.tsx derives splitContentOrigin from it and
+  // SplitLayout re-adds each pane's bounds offset). When split, the active
+  // pane's measured box is pane-relative, so adopting it as the area origin
+  // would double-count the pane offset and push the hardware cursor off along
+  // the split axis. Track it so handleMeasure can skip the x/y overwrite.
+  const activeIsSplitRef = useRef(false)
+  {
+    const id = state.activeTabId
+    const tree =
+      id != null && id !== '' ? getTreeForTab(state.layoutTrees, state.tabGroupMap, id) : null
+    activeIsSplitRef.current = tree?.type === 'split'
+  }
   // Last size we pushed to the backend per tab, used to dedupe the measurement
   // loop so an unchanged box never re-triggers a resize.
   const measuredRef = useRef(new Map<string, { cols: number; rows: number }>())
@@ -187,7 +201,11 @@ export function useTerminalResize({
       const cols = Math.max(PTY_MIN_COLS, rect.cols)
       const rows = Math.max(PTY_MIN_ROWS, rect.rows)
       const isActive = tabId === activeTabIdRef.current
-      if (isActive) {
+      // Only adopt the measured box as the terminal-area origin when the active
+      // pane spans the whole area (no split). In a split the box is pane-local;
+      // keep the model-derived area origin from the terminalSize memo below so
+      // the hardware cursor isn't offset by the pane's bounds (see ref comment).
+      if (isActive && !activeIsSplitRef.current) {
         contentOriginRef.current = { cols, rows, x: rect.x, y: rect.y }
       }
       const prev = measuredRef.current.get(tabId)

package/src/pty/pty-manager.ts

@@ -341,6 +341,25 @@ export class PtyManager extends EventEmitter<PtyManagerEvents> {
         return false
       })
 
+      // Wire the emulator's reply channel back to the pty. When a program
+      // writes a query sequence — CPR (ESC[6n), Device Attributes (ESC[c),
+      // Device Status (ESC[5n), DECRQM, OSC color queries — xterm generates
+      // the answer and emits it via onData. Without forwarding it the program
+      // waits forever for a response it never gets (e.g. AWS CLI / Python
+      // prompt_toolkit warns "terminal doesn't support cursor position
+      // requests (CPR)"). These replies are produced synchronously inside the
+      // emulator.write() below, so write straight to the pty rather than
+      // queueing through the render path. The listener is disposed together
+      // with the emulator in finalize/dispose, mirroring registerCsiHandler.
+      //
+      // onBinary (legacy non-UTF-8 mouse reports) is intentionally not wired:
+      // bun-pty.write() only accepts a UTF-8 string so byte values >127 can't
+      // be transmitted faithfully, and the headless emulator is never fed raw
+      // mouse input, so it never generates those reports in the first place.
+      emulator.onData((reply) => {
+        session.pty.write(reply)
+      })
+
       pty.onData((data) => {
         logDebug('ptyManager.data', {
           byteLength: Buffer.byteLength(data, 'utf8'),