@brimveyn/aimux 1.13.0 → 1.14.0

package/src/app.tsx

@@ -258,8 +258,6 @@ export function App({
   activeTabIdRef.current = state.activeTabId
   const activeTabRef = useRef(activeTab)
   activeTabRef.current = activeTab
-  const activeTabScrollIntentRef = useRef(activeTab?.scrollIntent ?? null)
-  activeTabScrollIntentRef.current = activeTab?.scrollIntent ?? null
 
   const stateRef = useRef(state)
   stateRef.current = state
@@ -307,7 +305,6 @@ export function App({
 
   const { clearIdleTimer, clearStartupGrace, startStartupGrace } = useBackendRuntime({
     activeTabId: state.activeTabId,
-    activeTabScrollIntentRef,
     backend,
     currentSessionId: state.currentSessionId,
     currentSessionWorkspaceSnapshot,

package/src/daemon/daemon.ts

@@ -293,12 +293,16 @@ export async function runDaemon(): Promise<void> {
    * previous broadcast state, matching pre-fix behaviour).
    */
   const updateTmBroadcastForClientCount = (count: number): void => {
-    void manager.setBroadcastEnabled(count > 0).catch((error) => {
-      logDebug('daemon.setBroadcastEnabled.error', {
-        count,
-        error: error instanceof Error ? error.message : String(error),
-      })
-    })
+    void (async () => {
+      try {
+        await manager.setBroadcastEnabled(count > 0)
+      } catch (error) {
+        logDebug('daemon.setBroadcastEnabled.error', {
+          count,
+          error: error instanceof Error ? error.message : String(error),
+        })
+      }
+    })()
   }
 
   // Initial state: no clients yet, ask the TM to suspend broadcast.
@@ -317,7 +321,13 @@ export async function runDaemon(): Promise<void> {
     let processing: Promise<void> = Promise.resolve()
 
     socket.on('data', (chunk) => {
-      processing = processing.then(async () => {
+      const previous = processing
+      processing = (async () => {
+        try {
+          await previous
+        } catch {
+          // A prior chunk's failure shouldn't block later chunks on this socket.
+        }
         try {
           for (const message of decoder.push(chunk)) {
             try {
@@ -462,12 +472,7 @@ export async function runDaemon(): Promise<void> {
                 case 'resizeClient': {
                   const sessionId = requireSession(socket, attachedSessions)
                   requireNegotiatedVersion(socket, negotiatedVersions)
-                  await manager.resize(
-                    sessionId,
-                    message.payload.cols,
-                    message.payload.rows,
-                    message.payload.intents
-                  )
+                  await manager.resize(sessionId, message.payload.cols, message.payload.rows)
                   sendOk(socket, message.id)
                   break
                 }
@@ -478,8 +483,7 @@ export async function runDaemon(): Promise<void> {
                     sessionId,
                     message.payload.tabId,
                     message.payload.cols,
-                    message.payload.rows,
-                    message.payload.intent
+                    message.payload.rows
                   )
                   sendOk(socket, message.id)
                   break
@@ -498,17 +502,6 @@ export async function runDaemon(): Promise<void> {
                   sendOk(socket, message.id)
                   break
                 }
-                case 'reapplyScrollIntent': {
-                  const sessionId = requireSession(socket, attachedSessions)
-                  requireNegotiatedVersion(socket, negotiatedVersions)
-                  await manager.reapplyScrollIntent(
-                    sessionId,
-                    message.payload.tabId,
-                    message.payload.intent
-                  )
-                  sendOk(socket, message.id)
-                  break
-                }
                 case 'setActiveTab': {
                   const sessionId = requireSession(socket, attachedSessions)
                   requireNegotiatedVersion(socket, negotiatedVersions)
@@ -556,7 +549,7 @@ export async function runDaemon(): Promise<void> {
           decoder.reset()
           send(socket, { id: crypto.randomUUID(), payload: { message }, type: 'error' })
         }
-      })
+      })()
     })
 
     socket.on('close', () => {

package/src/daemon/session-manager.ts

@@ -1,7 +1,6 @@
 import { EventEmitter } from 'node:events'
 
 import type {
-  ScrollIntent,
   TabSession,
   TerminalModeState,
   TerminalSnapshot,
@@ -68,14 +67,8 @@ export class SessionManager extends EventEmitter<SessionManagerEvents> {
     this.getOrCreateRegistry(sessionId).write(tabId, data)
   }
 
-  resize(
-    sessionId: string,
-    cols: number,
-    rows: number,
-    intents?: Map<string, ScrollIntent>,
-    options?: { sync?: boolean }
-  ): void {
-    this.getOrCreateRegistry(sessionId).resizeAll(cols, rows, intents, options)
+  resize(sessionId: string, cols: number, rows: number, options?: { sync?: boolean }): void {
+    this.getOrCreateRegistry(sessionId).resizeAll(cols, rows, options)
   }
 
   resizeTab(
@@ -83,10 +76,9 @@ export class SessionManager extends EventEmitter<SessionManagerEvents> {
     tabId: string,
     cols: number,
     rows: number,
-    intent?: ScrollIntent,
     options?: { sync?: boolean }
   ): void {
-    this.getOrCreateRegistry(sessionId).resizeTab(tabId, cols, rows, intent, options)
+    this.getOrCreateRegistry(sessionId).resizeTab(tabId, cols, rows, options)
   }
 
   scroll(sessionId: string, tabId: string, deltaLines: number): void {
@@ -97,10 +89,6 @@ export class SessionManager extends EventEmitter<SessionManagerEvents> {
     this.getOrCreateRegistry(sessionId).scrollViewportToBottom(tabId)
   }
 
-  reapplyScrollIntent(sessionId: string, tabId: string, intent: ScrollIntent): void {
-    this.getOrCreateRegistry(sessionId).reapplyScrollIntent(tabId, intent)
-  }
-
   setActiveTab(sessionId: string, tabId: string | null): void {
     this.getOrCreateRegistry(sessionId).setActiveTab(tabId)
   }

package/src/daemon/session-registry.ts

@@ -1,5 +1,12 @@
 import { EventEmitter } from 'node:events'
 
+import type {
+  TabSession,
+  TerminalModeState,
+  TerminalSnapshot,
+  WorkspaceSnapshotV1,
+} from '../state/types'
+
 import { logDebug } from '../debug/input-log'
 import { PtyManager } from '../pty/pty-manager'
 import {
@@ -8,14 +15,6 @@ import {
   restoreTabsFromWorkspace,
 } from '../state/session-persistence'
 import { createDefaultTerminalModes } from '../state/terminal-modes'
-import {
-  DEFAULT_SCROLL_INTENT,
-  type ScrollIntent,
-  type TabSession,
-  type TerminalModeState,
-  type TerminalSnapshot,
-  type WorkspaceSnapshotV1,
-} from '../state/types'
 
 interface SessionRegistryEvents {
   render: [tabId: string, viewport: TerminalSnapshot, terminalModes: TerminalModeState]
@@ -91,7 +90,6 @@ export class SessionRegistry extends EventEmitter<SessionRegistryEvents> {
         const existing = this.tabs.get(persisted.id)
         if (existing) {
           existing.title = persisted.title
-          existing.scrollIntent = persisted.scrollIntent ?? DEFAULT_SCROLL_INTENT
           existing.worktreeId = persisted.worktreeId
         }
       }
@@ -147,7 +145,6 @@ export class SessionRegistry extends EventEmitter<SessionRegistryEvents> {
         buffer: '',
         command: [options.command, ...(options.args ?? [])].join(' '),
         id: options.tabId,
-        scrollIntent: DEFAULT_SCROLL_INTENT,
         status: 'starting',
         terminalModes: createDefaultTerminalModes(),
         title: options.title,
@@ -159,7 +156,6 @@ export class SessionRegistry extends EventEmitter<SessionRegistryEvents> {
       existing.exitCode = undefined
       existing.viewport = undefined
       existing.terminalModes = createDefaultTerminalModes()
-      existing.scrollIntent = DEFAULT_SCROLL_INTENT
       existing.assistant = options.assistant
       existing.title = options.title
       existing.command = [options.command, ...(options.args ?? [])].join(' ')
@@ -173,23 +169,12 @@ export class SessionRegistry extends EventEmitter<SessionRegistryEvents> {
     this.ptyManager.write(tabId, data)
   }
 
-  resizeAll(
-    cols: number,
-    rows: number,
-    intents?: Map<string, ScrollIntent>,
-    options?: { sync?: boolean }
-  ): void {
-    this.ptyManager.resizeAll(cols, rows, intents, options)
+  resizeAll(cols: number, rows: number, options?: { sync?: boolean }): void {
+    this.ptyManager.resizeAll(cols, rows, options)
   }
 
-  resizeTab(
-    tabId: string,
-    cols: number,
-    rows: number,
-    intent?: ScrollIntent,
-    options?: { sync?: boolean }
-  ): void {
-    this.ptyManager.resizeSession(tabId, cols, rows, intent, options)
+  resizeTab(tabId: string, cols: number, rows: number, options?: { sync?: boolean }): void {
+    this.ptyManager.resizeSession(tabId, cols, rows, options)
   }
 
   scrollViewport(tabId: string, deltaLines: number): void {
@@ -200,10 +185,6 @@ export class SessionRegistry extends EventEmitter<SessionRegistryEvents> {
     this.ptyManager.scrollViewportToBottom(tabId)
   }
 
-  reapplyScrollIntent(tabId: string, intent: ScrollIntent): void {
-    this.ptyManager.reapplyScrollIntent(tabId, intent)
-  }
-
   setActiveTab(tabId: string | null): void {
     if (tabId === null) {
       this.activeTabId = null

package/src/git/command-queue.ts

@@ -1,7 +1,23 @@
 let tail: Promise<unknown> = Promise.resolve()
 
 export async function enqueueGitOp<T>(op: () => Promise<T>): Promise<T> {
-  const next = tail.then(op, op)
-  tail = next.catch(() => {})
+  const previous = tail
+  const run = async (): Promise<T> => {
+    try {
+      await previous
+    } catch {
+      // Previous op already surfaced its own failure; keep the queue moving.
+    }
+    return op()
+  }
+  const next = run()
+  // Advance the queue tail without letting this op's rejection break the chain.
+  tail = (async () => {
+    try {
+      await next
+    } catch {
+      // Swallow so the next enqueued op still runs.
+    }
+  })()
   return next
 }

package/src/input/terminal-text-extraction.ts

@@ -7,13 +7,12 @@ export function getLineText(line: TerminalLine): string {
 /**
  * Extract text from a range of terminal lines as a single string.
  *
- * Multi-row selections are lossy: trailing `[ \t]+` is stripped from each
- * joined segment to drop the viewport padding the snapshot layer fills blank
- * cells with. Without this, shell line continuations (`\` followed by padding
- * spaces then `\n`) paste as escaped-space sequences instead of continuations.
- *
- * Single-row selections are returned verbatim — trailing spaces the user
- * explicitly dragged over are preserved.
+ * Trailing `[ \t]+` is stripped from each joined segment to drop the viewport
+ * padding the snapshot layer fills blank cells with (every rendered row is now
+ * padded to the full terminal width to prevent ghosting). Without this, shell
+ * line continuations (`\` + padding spaces + `\n`) paste as escaped-space
+ * sequences, and a single-line copy dragged to/past end-of-line would pick up
+ * the synthetic padding spaces.
  */
 export function extractStreamText(
   lines: TerminalLine[],
@@ -38,7 +37,7 @@ export function extractStreamText(
   for (let row = clampedStart; row <= clampedEnd; row++) {
     const text = getLineText(lines[row] as TerminalLine)
     if (row === startRow && row === endRow) {
-      parts.push(text.slice(Math.max(0, startCol), Math.max(0, endCol)))
+      parts.push(rtrim(text.slice(Math.max(0, startCol), Math.max(0, endCol))))
     } else if (row === startRow) {
       parts.push(rtrim(text.slice(Math.max(0, startCol))))
     } else if (row === endRow) {

package/src/ipc/manager-protocol.ts

@@ -1,5 +1,4 @@
 import type {
-  ScrollIntent,
   TabSession,
   TerminalModeState,
   TerminalSnapshot,
@@ -14,8 +13,12 @@ import {
   negotiateProtocolVersion,
 } from './protocol'
 
-export const MANAGER_PROTOCOL_MIN_VERSION = 3
-export const MANAGER_PROTOCOL_VERSION = 4
+// v5: backend owns scroll position end to end. Removed the per-tab scroll
+// `intent`/`intents` from resize messages and the `reapplyScrollIntent`
+// message. Min is raised in lockstep so a pre-v5 peer (which could still send
+// the dropped message) can't negotiate a now-incompatible version.
+export const MANAGER_PROTOCOL_MIN_VERSION = 5
+export const MANAGER_PROTOCOL_VERSION = 5
 /**
  * Minimum version required to send `setBroadcastEnabled`. Older TMs (v3) will
  * not understand the message; the daemon must check the negotiated version
@@ -75,7 +78,6 @@ export type ManagerRequest =
         sessionId: string
         cols: number
         rows: number
-        intents?: Record<string, ScrollIntent>
       }
     }
   | {
@@ -86,7 +88,6 @@ export type ManagerRequest =
         tabId: string
         cols: number
         rows: number
-        intent?: ScrollIntent
       }
     }
   | {
@@ -99,11 +100,6 @@ export type ManagerRequest =
       type: 'scroll'
       payload: { sessionId: string; tabId: string; deltaLines: number }
     }
-  | {
-      id: string
-      type: 'reapplyScrollIntent'
-      payload: { sessionId: string; tabId: string; intent: ScrollIntent }
-    }
   | { id: string; type: 'setActiveTab'; payload: { sessionId: string; tabId: string | null } }
   | { id: string; type: 'closeTab'; payload: { sessionId: string; tabId: string } }
   | { id: string; type: 'disposeSession'; payload: { sessionId: string } }
@@ -178,18 +174,6 @@ function isTerminalSnapshot(value: unknown): value is TerminalSnapshot {
   )
 }
 
-function isScrollIntent(value: unknown): value is ScrollIntent {
-  if (!isObjectRecord(value)) return false
-  if (value.kind === 'bottom') return true
-  if (value.kind === 'anchor') return isFiniteNumber(value.absoluteLine)
-  return false
-}
-
-function isScrollIntentRecord(value: unknown): value is Record<string, ScrollIntent> {
-  if (!isObjectRecord(value)) return false
-  return Object.values(value).every(isScrollIntent)
-}
-
 function isTerminalModeState(value: unknown): value is TerminalModeState {
   return (
     isObjectRecord(value) &&
@@ -303,20 +287,12 @@ export function parseManagerRequest(value: unknown): ManagerRequest {
       assert(isString(value.payload.sessionId), 'resizeClient.sessionId must be a string')
       assert(isFiniteNumber(value.payload.cols), 'resizeClient.cols must be a number')
       assert(isFiniteNumber(value.payload.rows), 'resizeClient.rows must be a number')
-      assert(
-        value.payload.intents === undefined || isScrollIntentRecord(value.payload.intents),
-        'resizeClient.intents must be a scroll-intent record'
-      )
       return value as ManagerRequest
     case 'resizeTab':
       assert(isString(value.payload.sessionId), 'resizeTab.sessionId must be a string')
       assert(isString(value.payload.tabId), 'resizeTab.tabId must be a string')
       assert(isFiniteNumber(value.payload.cols), 'resizeTab.cols must be a number')
       assert(isFiniteNumber(value.payload.rows), 'resizeTab.rows must be a number')
-      assert(
-        value.payload.intent === undefined || isScrollIntent(value.payload.intent),
-        'resizeTab.intent must be a scroll intent'
-      )
       return value as ManagerRequest
     case 'scroll':
       assert(isString(value.payload.sessionId), 'scroll.sessionId must be a string')
@@ -327,14 +303,6 @@ export function parseManagerRequest(value: unknown): ManagerRequest {
       assert(isString(value.payload.sessionId), 'scrollToBottom.sessionId must be a string')
       assert(isString(value.payload.tabId), 'scrollToBottom.tabId must be a string')
       return value as ManagerRequest
-    case 'reapplyScrollIntent':
-      assert(isString(value.payload.sessionId), 'reapplyScrollIntent.sessionId must be a string')
-      assert(isString(value.payload.tabId), 'reapplyScrollIntent.tabId must be a string')
-      assert(
-        isScrollIntent(value.payload.intent),
-        'reapplyScrollIntent.intent must be a scroll intent'
-      )
-      return value as ManagerRequest
     case 'setActiveTab':
       assert(isString(value.payload.sessionId), 'setActiveTab.sessionId must be a string')
       assert(isNullableString(value.payload.tabId), 'setActiveTab.tabId must be a string or null')

package/src/ipc/protocol.ts

@@ -1,5 +1,4 @@
 import type {
-  ScrollIntent,
   SessionStatus,
   TabActivity,
   TabSession,
@@ -10,8 +9,13 @@ import type {
 
 import { isWorkspaceSnapshotV1 } from '../state/validation'
 
-export const IPC_PROTOCOL_MIN_VERSION = 8
-export const IPC_PROTOCOL_VERSION = 8
+// v9: scroll position is owned entirely by the backend emulator. Dropped the
+// per-tab scroll `intent`/`intents` from resize messages and removed the
+// `reapplyScrollIntent` message — the frontend no longer derives or sends it.
+// (v8 was the unfilled-viewport status-detector change; this is a further
+// breaking wire change, so the version steps again.)
+export const IPC_PROTOCOL_MIN_VERSION = 9
+export const IPC_PROTOCOL_VERSION = 9
 
 export interface ProtocolHelloRequest {
   minVersion: number
@@ -67,20 +71,15 @@ export type ClientRequest =
   | {
       id: string
       type: 'resizeClient'
-      payload: { cols: number; rows: number; intents?: Record<string, ScrollIntent> }
+      payload: { cols: number; rows: number }
     }
   | {
       id: string
       type: 'resizeTab'
-      payload: { tabId: string; cols: number; rows: number; intent?: ScrollIntent }
+      payload: { tabId: string; cols: number; rows: number }
     }
   | { id: string; type: 'scrollToBottom'; payload: { tabId: string } }
   | { id: string; type: 'scroll'; payload: { tabId: string; deltaLines: number } }
-  | {
-      id: string
-      type: 'reapplyScrollIntent'
-      payload: { tabId: string; intent: ScrollIntent }
-    }
   | { id: string; type: 'setActiveTab'; payload: { tabId: string | null } }
   | { id: string; type: 'closeTab'; payload: { tabId: string } }
   | { id: string; type: 'disposeAll'; payload: Record<string, never> }
@@ -180,18 +179,6 @@ function isTerminalSnapshot(value: unknown): value is TerminalSnapshot {
   )
 }
 
-function isScrollIntent(value: unknown): value is ScrollIntent {
-  if (!isObjectRecord(value)) return false
-  if (value.kind === 'bottom') return true
-  if (value.kind === 'anchor') return isFiniteNumber(value.absoluteLine)
-  return false
-}
-
-function isScrollIntentRecord(value: unknown): value is Record<string, ScrollIntent> {
-  if (!isObjectRecord(value)) return false
-  return Object.values(value).every(isScrollIntent)
-}
-
 function isTerminalModeState(value: unknown): value is TerminalModeState {
   return (
     isObjectRecord(value) &&
@@ -328,19 +315,11 @@ export function parseClientRequest(value: unknown): ClientRequest {
     case 'resizeClient':
       assert(isFiniteNumber(value.payload.cols), 'resizeClient.cols must be a number')
       assert(isFiniteNumber(value.payload.rows), 'resizeClient.rows must be a number')
-      assert(
-        value.payload.intents === undefined || isScrollIntentRecord(value.payload.intents),
-        'resizeClient.intents must be a scroll-intent record'
-      )
       return value as ClientRequest
     case 'resizeTab':
       assert(isString(value.payload.tabId), 'resizeTab.tabId must be a string')
       assert(isFiniteNumber(value.payload.cols), 'resizeTab.cols must be a number')
       assert(isFiniteNumber(value.payload.rows), 'resizeTab.rows must be a number')
-      assert(
-        value.payload.intent === undefined || isScrollIntent(value.payload.intent),
-        'resizeTab.intent must be a scroll intent'
-      )
       return value as ClientRequest
     case 'scroll':
       assert(isString(value.payload.tabId), 'scroll.tabId must be a string')
@@ -349,13 +328,6 @@ export function parseClientRequest(value: unknown): ClientRequest {
     case 'scrollToBottom':
       assert(isString(value.payload.tabId), 'scrollToBottom.tabId must be a string')
       return value as ClientRequest
-    case 'reapplyScrollIntent':
-      assert(isString(value.payload.tabId), 'reapplyScrollIntent.tabId must be a string')
-      assert(
-        isScrollIntent(value.payload.intent),
-        'reapplyScrollIntent.intent must be a scroll intent'
-      )
-      return value as ClientRequest
     case 'setActiveTab':
       assert(isNullableString(value.payload.tabId), 'setActiveTab.tabId must be a string or null')
       return value as ClientRequest

package/src/pty/pty-manager.ts

@@ -85,6 +85,17 @@ function getTerminalModes(emulator: XTerm, alternateScrollMode: boolean): Termin
   }
 }
 
+// Read the scroll position straight from the emulator that owns it. This is the
+// single source of truth for re-anchoring across a resize: deriving it here
+// (zero latency) instead of accepting a frontend-supplied intent avoids the
+// stale-mirror drift that desynced selection/copy from the rendered viewport.
+function deriveEmulatorScrollIntent(emulator: XTerm): ScrollIntent {
+  const buffer = emulator.buffer.active
+  return buffer.viewportY >= buffer.baseY
+    ? { kind: 'bottom' }
+    : { absoluteLine: buffer.viewportY, kind: 'anchor' }
+}
+
 function envInt(name: string, fallback: number): number {
   const raw = process.env[name]
   if (raw === undefined) return fallback
@@ -374,13 +385,11 @@ export class PtyManager extends EventEmitter<PtyManagerEvents> {
     session.emulator.scrollToLine(Math.max(0, intent.absoluteLine))
   }
 
-  private applyResize(
-    session: SessionHandle,
-    cols: number,
-    rows: number,
-    intent: ScrollIntent | undefined,
-    sync: boolean
-  ): void {
+  private applyResize(session: SessionHandle, cols: number, rows: number, sync: boolean): void {
+    // Capture the scroll position from the emulator *before* reflow, so the
+    // re-anchor restores where the user actually was. The frontend no longer
+    // supplies an intent — the backend owns scroll position end to end.
+    const intent = deriveEmulatorScrollIntent(session.emulator)
     const safeCols = Math.max(20, cols)
     const safeRows = Math.max(8, rows)
     session.pty.resize(safeCols, safeRows)
@@ -406,38 +415,18 @@ export class PtyManager extends EventEmitter<PtyManagerEvents> {
     }
   }
 
-  resizeAll(
-    cols: number,
-    rows: number,
-    intents?: Map<string, ScrollIntent>,
-    options?: { sync?: boolean }
-  ): void {
+  resizeAll(cols: number, rows: number, options?: { sync?: boolean }): void {
     for (const session of this.sessions.values()) {
-      this.applyResize(session, cols, rows, intents?.get(session.tabId), options?.sync ?? false)
-    }
-  }
-
-  resizeSession(
-    tabId: string,
-    cols: number,
-    rows: number,
-    intent?: ScrollIntent,
-    options?: { sync?: boolean }
-  ): void {
-    const session = this.sessions.get(tabId)
-    if (!session) {
-      return
+      this.applyResize(session, cols, rows, options?.sync ?? false)
     }
-    this.applyResize(session, cols, rows, intent, options?.sync ?? false)
   }
 
-  reapplyScrollIntent(tabId: string, intent: ScrollIntent): void {
+  resizeSession(tabId: string, cols: number, rows: number, options?: { sync?: boolean }): void {
     const session = this.sessions.get(tabId)
     if (!session) {
       return
     }
-    this.applyScrollIntent(session, intent)
-    this.scheduleRender(session)
+    this.applyResize(session, cols, rows, options?.sync ?? false)
   }
 
   disposeSession(tabId: string): void {

package/src/pty/terminal-snapshot.ts

@@ -100,6 +100,7 @@ function buildLine(
 
   const cell = terminal.buffer.active.getNullCell()
   const spans: TerminalSpan[] = []
+  let visualColumns = 0
 
   for (let column = 0; column < terminal.cols; column += 1) {
     const current = line.getCell(column, cell)
@@ -138,6 +139,48 @@ function buildLine(
       text,
       underline: current.isUnderline() ? true : undefined,
     })
+
+    visualColumns += current.getWidth()
+  }
+
+  // Pad the row to the full terminal width so opentui overwrites every cell.
+  // Without padding, cells past the last written character retain content
+  // from the previous frame (opentui's `blendCells` preserves the existing
+  // char when an overlay space lands on it — see modal-shell.tsx for the
+  // same class of bug solved differently for transparent modals).
+  if (visualColumns < terminal.cols) {
+    const padCount = terminal.cols - visualColumns
+    const cursorInPad =
+      cursorVisible &&
+      cursorColumn !== null &&
+      cursorColumn >= visualColumns &&
+      cursorColumn < terminal.cols
+
+    if (cursorInPad && cursorColumn !== null) {
+      // cursorColumn is a buffer column while visualColumns is a sum of cell
+      // widths; they diverge when wide glyphs precede the gap. Clamp the offset
+      // into the pad so leading + cursor + trailing always equals padCount and
+      // the row never over/undershoots terminal.cols (cursor may be a column
+      // off in pathological wide-char rows, but the row width stays correct).
+      const cursorOffset = Math.min(cursorColumn - visualColumns, padCount - 1)
+      const leading = cursorOffset
+      const trailing = padCount - cursorOffset - 1
+      if (leading > 0) {
+        pushSpan(spans, { text: ' '.repeat(leading) })
+      }
+      const tokens = getCurrentTheme()
+      pushSpan(spans, {
+        bg: tokens.text,
+        cursor: true,
+        fg: tokens.background,
+        text: ' ',
+      })
+      if (trailing > 0) {
+        pushSpan(spans, { text: ' '.repeat(trailing) })
+      }
+    } else {
+      pushSpan(spans, { text: ' '.repeat(padCount) })
+    }
   }
 
   return { spans }