mixdog 0.9.2 → 0.9.4

package/src/tui/app/use-transcript-window.mjs

@@ -0,0 +1,589 @@
+/**
+ * use-transcript-window.mjs — transcript row-index/window memo chain + the
+ * measured-height harvest and reading-anchor lock effects.
+ *
+ * Extracted verbatim from App.jsx: structure-signature/row-index/render-window
+ * memos, the same-frame anchor lock + capture, the per-commit Yoga height
+ * harvest, bottom-follow/anchor post-commit sync, selection layout shift and
+ * the scroll clamp. Scroll/anchor/drag refs stay App-owned (injected); this
+ * hook owns the measurement maps, measuredRowsVersion and the totalRows/
+ * preserved-delta bookkeeping refs.
+ */
+import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import {
+  TRANSCRIPT_MEASURED_ROWS,
+  transcriptMeasuredRowsCache,
+  transcriptItemVariantKey,
+  buildTranscriptRowIndex,
+  transcriptStructureSignature,
+  transcriptRenderWindow,
+  resolveAnchorScrollOffset,
+  upperBound,
+  shiftSelectionRectY,
+} from './transcript-window.mjs';
+import { shouldSuppressFullyFailedToolItem } from '../transcript-tool-failures.mjs';
+
+export function useTranscriptWindow({
+  items,
+  themeEpoch,
+  frameColumns,
+  toolOutputExpanded,
+  transcriptContentHeight,
+  transcriptBottomSlackRows,
+  transcriptGuardRows,
+  floatingPanelRows,
+  overlayHintRequested,
+  scrollOffset,
+  setScrollOffset,
+  transcriptAnchorRef,
+  transcriptAnchorDirtyRef,
+  scrollTargetRef,
+  scrollPositionRef,
+  maxScrollRowsRef,
+  transcriptGeomRef,
+  followingRef,
+  dragRef,
+  transcriptViewportRef,
+  selectionLayoutRef,
+  withSelectionClip,
+  paintSelectionRect,
+  stopSmoothScroll,
+  measuredRowsVersion,
+  setMeasuredRowsVersion,
+}) {
+  const transcriptTotalRowsRef = useRef(0);
+  const preservedScrollDeltaRef = useRef(0);
+  // Previous frame's viewport-only geometry (content height + floating-panel
+  // reservation). A floating panel / view (picker/context/usage/text-entry)
+  // open-close changes transcriptContentHeight WITHOUT changing `items`, so the
+  // transcript window would re-slice against the new viewport height while the
+  // scroll offset still reflects the old one — the visible top row jumps, then
+  // the post-commit anchor effect snaps it back a frame later (the 2-frame
+  // re-settle). We detect that viewport-only change at render time and freeze
+  // the visible top anchor from the PREVIOUS geometry, resolving the scroll
+  // offset for THIS render so the anchored row stays put in a single frame.
+  const prevViewportGeomRef = useRef({ contentHeight: 0, floatingPanelRows: 0 });
+  // App-level measured row heights (real per-item height cache). The map of
+  // mounted item id → ink DOM element is read every commit to harvest each
+  // row's REAL Yoga height into transcriptMeasuredRowsCache. measuredRowsVersion
+  // is bumped whenever a height actually changes so the row-index/window memos
+  // recompute against the corrected heights (one-frame lag, absorbed by the
+  // overscan band).
+  const transcriptItemElsRef = useRef(new Map());
+  const transcriptMeasureRefCache = useRef(new Map());
+  // id → latest item object for this render. The callback ref reads from here so
+  // a reused (stable) callback never captures a stale item across patches.
+  const transcriptMeasureItemsRef = useRef(new Map());
+  // Stable per-item callback-ref factory: storing the element under the item id
+  // (and reading the live item object from transcriptMeasureItemsRef) avoids the
+  // ref-swap churn React would otherwise cause with an inline closure each
+  // render, while never serving a stale item: the callback resolves the current
+  // item by id at call time. The ref(null) path drops the element; the harvest
+  // reads getComputedHeight from whatever is mounted, so an unmount simply stops
+  // contributing (its last measurement stays cached on the item object).
+  const transcriptMeasureRef = useCallback((item) => {
+    if (!TRANSCRIPT_MEASURED_ROWS || !item || item.id == null) return undefined;
+    if (shouldSuppressFullyFailedToolItem(item)) {
+      transcriptMeasuredRowsCache.delete(item);
+      transcriptItemElsRef.current.delete(item.id);
+      transcriptMeasureItemsRef.current.delete(item.id);
+      return undefined;
+    }
+    const key = item.id;
+    transcriptMeasureItemsRef.current.set(key, item);
+    let fn = transcriptMeasureRefCache.current.get(key);
+    if (!fn) {
+      fn = (el) => {
+        if (el) {
+          transcriptItemElsRef.current.set(key, el);
+        } else {
+          transcriptItemElsRef.current.delete(key);
+        }
+      };
+      transcriptMeasureRefCache.current.set(key, fn);
+    }
+    return fn;
+  }, []);
+
+  // Key the heavy O(n) row-index + windowing memos on a STRUCTURE signature
+  // instead of the `items` array identity. The engine swaps `items`
+  // for a new array on every streaming flush (~8ms) while only the final
+  // assistant item's text grows; depending on array identity re-ran both memos
+  // each delta frame and visibly throttled the stream. The signature changes
+  // only when transcript structure or the streaming item's estimated height
+  // changes, so steady per-character growth keeps both memos warm.
+  //
+  // The signature itself is memoized on `items` identity (+columns/
+  // expanded) so re-renders that DO NOT touch items — drag motion, scroll,
+  // input typing — skip the O(n) signature walk entirely. During streaming the
+  // engine hands us a fresh `items` array each flush, so this memo
+  // recomputes and still tracks the streaming item's height correctly.
+  const transcriptStructureSig = useMemo(
+    () => transcriptStructureSignature(items, frameColumns, toolOutputExpanded),
+    [items, frameColumns, toolOutputExpanded],
+  );
+  const transcriptRowIndex = useMemo(() => buildTranscriptRowIndex(items, {
+    columns: frameColumns,
+    toolOutputExpanded,
+  // eslint-disable-next-line react-hooks/exhaustive-deps -- intentional: sig captures the relevant item changes; measuredRowsVersion folds in app-level measured height corrections
+  }), [transcriptStructureSig, measuredRowsVersion]);
+  // ── Same-frame anchor lock ───────────────────────────────────────────────
+  // While the user reads older transcript (anchor captured, not dirty), resolve
+  // the scroll offset that keeps the anchored viewport-top row fixed for THIS
+  // frame's prefix table — SYNCHRONOUSLY, before windowing/marginBottom use it.
+  // Previously this correction lived only in the post-commit layout effect, so
+  // the frame that grew the streaming tail rendered with the STALE offset first
+  // (a blank band opened at the top) and only the NEXT frame snapped it shut.
+  // Computing it here folds the new totalRows and the corrected offset into the
+  // SAME render, so the completed line fills its space with no one-frame gap.
+  // Falls back to the live scrollOffset state when there is no active anchor
+  // (bottom-follow / pinned) or it cannot be aligned (anchor item gone).
+  const hasReadingAnchor = !!transcriptAnchorRef.current && !transcriptAnchorDirtyRef.current;
+  const scrolledUpRows = Math.max(0, Number(scrollTargetRef.current) || 0);
+  // "Genuinely scrolled up" = the viewport is above the bottom slack band. The
+  // bottom-follow / pinned path owns everything at-or-below the slack; anything
+  // above it is the user reading older transcript.
+  const scrolledUp = scrolledUpRows > transcriptBottomSlackRows;
+  // A genuine reading anchor wins even if followingRef is stale-true while the
+  // user is scrolled up. The follow-arm SHOULD have been cleared when the anchor
+  // was captured, but if it lingers true we must not fall through to the stale-
+  // offset render path (that is one half of the newline-jump bug). Keep the
+  // plain !following gate for the anchor-less follow case.
+  const anchorLockActive = hasReadingAnchor && !followingRef.current && scrolledUp;
+  const targetNearBottom = followingRef.current || !scrolledUp;
+  const nearBottomWithoutAnchor = !transcriptAnchorRef.current
+    && !transcriptAnchorDirtyRef.current
+    && targetNearBottom;
+  let renderScrollOffset = targetNearBottom ? 0 : scrollOffset;
+  const lockViewRows = Math.max(1, Number(transcriptContentHeight) || 1);
+  const lockTotalRows = Math.max(0, Number(transcriptRowIndex?.totalRows) || 0);
+  const lockMaxRows = Math.max(0, lockTotalRows - lockViewRows);
+  const curPrefixForLock = transcriptRowIndex?.prefixRows || null;
+  if (anchorLockActive) {
+    const locked = resolveAnchorScrollOffset({
+      anchor: transcriptAnchorRef.current,
+      items: items,
+      curPrefix: curPrefixForLock,
+      totalRows: lockTotalRows,
+      viewRows: lockViewRows,
+      maxRows: lockMaxRows,
+    });
+    if (locked != null) renderScrollOffset = locked;
+  } else if (!followingRef.current && !nearBottomWithoutAnchor && scrolledUp) {
+    // ── Same-frame anchor CAPTURE for the missing/dirty-anchor case ─────────
+    // The viewport is genuinely scrolled up but there is NO usable same-frame
+    // anchor: it is missing, or dirtied by a manual scroll whose synchronous
+    // capture failed, or a stale-true follow-arm already dropped it. Without an
+    // anchor this frame would render with the STALE bottom-relative
+    // scrollOffset, so any row growth THIS frame (a streaming newline
+    // completing a line, a transcript row expanding) shifts the visible top by
+    // the delta BEFORE the post-commit rowDelta effect can capture/correct — and
+    // that effect would then capture from the ALREADY-shifted totalRows. That is
+    // the confirmed one-frame jump/jitter.
+    //
+    // Fix it at render time: capture an anchor from the PREVIOUS published
+    // geometry (transcriptGeomRef still holds the prior frame here — THIS
+    // frame's geom is published a few lines below), identifying the item id +
+    // row offset that sat at the previous visible-TOP edge, then resolve the
+    // offset against the CURRENT prefix table with the same pure helper so that
+    // exact top row stays put THIS frame. Persist the captured anchor so the
+    // post-commit effect keeps the identical anchor stable instead of
+    // re-deriving one from the already-shifted totalRows.
+    const geom = transcriptGeomRef.current || {};
+    const prevPrefix = geom.prefixRows;
+    if (Array.isArray(prevPrefix) && prevPrefix.length > 1) {
+      const prevTotal = Math.max(0, Number(geom.totalRows) || 0);
+      const prevView = Math.max(1, Number(geom.viewRows) || 1);
+      const prevOffset = Math.max(0, Number(geom.renderOffset) || 0);
+      const prevItems = geom.items || [];
+      // Bottom-relative window math (same as transcriptRenderWindow): the top
+      // edge sits `offset + viewRows` rows up from the previous total.
+      const prevTopRow = Math.max(0, Math.min(prevTotal, prevTotal - prevOffset - prevView));
+      let idx = upperBound(prevPrefix, prevTopRow) - 1;
+      if (idx < 0) idx = 0;
+      if (idx > prevPrefix.length - 2) idx = prevPrefix.length - 2;
+      const anchorItem = prevItems[idx];
+      if (anchorItem && anchorItem.id != null) {
+        const captured = { id: anchorItem.id, offset: Math.max(0, prevTopRow - (prevPrefix[idx] || 0)) };
+        const locked = resolveAnchorScrollOffset({
+          anchor: captured,
+          items: items,
+          curPrefix: curPrefixForLock,
+          totalRows: lockTotalRows,
+          viewRows: lockViewRows,
+          maxRows: lockMaxRows,
+        });
+        if (locked != null) {
+          renderScrollOffset = locked;
+          transcriptAnchorRef.current = captured;
+          transcriptAnchorDirtyRef.current = false;
+        }
+      }
+    }
+  }
+  // ── Viewport-only transition freeze (floating panel / view open-close) ─────
+  // When a picker/context/usage/text-entry panel opens or closes, only the
+  // transcript viewport height changes (transcriptContentHeight and/or the
+  // floating-panel reservation) — `items` and the row-index are unchanged. The
+  // bottom-follow / anchor-lock paths above only fire when the user is reading
+  // older transcript; a bottom-pinned transcript falls through with
+  // renderScrollOffset resolved against the NEW viewport while the on-screen
+  // top edge still reflects the OLD one, producing the visible jump that the
+  // post-commit effect then corrects one frame later. Freeze it here: when the
+  // ONLY thing that changed is the viewport (not the anchor state, not items),
+  // reconstruct the previous visible-top row from the prior published geometry
+  // and resolve the offset against the current prefix table so the same top row
+  // renders THIS frame. Bottom-pinned/following views are already stable
+  // (flex-end owns them), so restrict the freeze to the scrolled-up, no-active-
+  // lock case that the branches above did not already resolve.
+  const prevViewport = prevViewportGeomRef.current || {};
+  const viewportOnlyChanged = (Number(prevViewport.contentHeight) || 0) !== lockViewRows
+    || (Number(prevViewport.floatingPanelRows) || 0) !== (Number(floatingPanelRows) || 0);
+  if (viewportOnlyChanged
+    && !anchorLockActive
+    && !followingRef.current
+    && !nearBottomWithoutAnchor
+    && scrolledUp) {
+    const geom = transcriptGeomRef.current || {};
+    const prevPrefix = geom.prefixRows;
+    if (Array.isArray(prevPrefix) && prevPrefix.length > 1) {
+      const prevTotal = Math.max(0, Number(geom.totalRows) || 0);
+      // Use the PREVIOUS viewport rows to reconstruct where the top edge sat on
+      // screen before the panel changed the height.
+      const prevView = Math.max(1, Number(prevViewport.contentHeight) || Number(geom.viewRows) || 1);
+      const prevOffset = Math.max(0, Number(geom.renderOffset) || 0);
+      const prevItems = geom.items || [];
+      const prevTopRow = Math.max(0, Math.min(prevTotal, prevTotal - prevOffset - prevView));
+      let idx = upperBound(prevPrefix, prevTopRow) - 1;
+      if (idx < 0) idx = 0;
+      if (idx > prevPrefix.length - 2) idx = prevPrefix.length - 2;
+      const anchorItem = prevItems[idx];
+      if (anchorItem && anchorItem.id != null) {
+        const captured = { id: anchorItem.id, offset: Math.max(0, prevTopRow - (prevPrefix[idx] || 0)) };
+        const locked = resolveAnchorScrollOffset({
+          anchor: captured,
+          items: items,
+          curPrefix: curPrefixForLock,
+          totalRows: lockTotalRows,
+          viewRows: lockViewRows,
+          maxRows: lockMaxRows,
+        });
+        if (locked != null) {
+          renderScrollOffset = locked;
+          // Persist so the post-commit effect keeps this exact anchor stable
+          // rather than re-deriving one from the already-resized geometry.
+          transcriptAnchorRef.current = captured;
+          transcriptAnchorDirtyRef.current = false;
+        }
+      }
+    }
+  }
+  prevViewportGeomRef.current = {
+    contentHeight: lockViewRows,
+    floatingPanelRows: Number(floatingPanelRows) || 0,
+  };
+  const transcriptWindow = useMemo(() => transcriptRenderWindow(items, {
+    scrollOffset: renderScrollOffset,
+    viewportHeight: transcriptContentHeight,
+    columns: frameColumns,
+    toolOutputExpanded,
+    rowIndex: transcriptRowIndex,
+  // eslint-disable-next-line react-hooks/exhaustive-deps -- intentional: sig+scroll/viewport capture the relevant changes
+  }), [transcriptStructureSig, renderScrollOffset, transcriptContentHeight, transcriptRowIndex]);
+  maxScrollRowsRef.current = transcriptWindow.maxScrollRows;
+  // Publish this frame's geometry so a manual scroll can capture the reading
+  // anchor synchronously (see captureTranscriptAnchorAt).
+  transcriptGeomRef.current = {
+    prefixRows: transcriptRowIndex?.prefixRows || null,
+    totalRows: Math.max(0, Number(transcriptWindow.totalRows) || 0),
+    viewRows: Math.max(1, Number(transcriptContentHeight) || 1),
+    items: items || null,
+    // The offset THIS frame actually rendered with. The same-frame anchor
+    // CAPTURE for a missing/dirty anchor (above) reads this from the PREVIOUS
+    // frame to reconstruct the exact top-edge row that was on screen, so the
+    // capture matches what the user saw rather than the stale scrollOffset
+    // state. Bottom-relative, matching transcriptRenderWindow's window math.
+    renderOffset: Math.max(0, Number(renderScrollOffset) || 0),
+  };
+  // The window memo is keyed on a structure signature that intentionally
+  // ignores per-character growth of the streaming assistant text, so its
+  // `items` slice can hold a STALE reference to the streaming item between
+  // height changes. Re-slice the live `items` over the memo's stable
+  // [startIndex, endIndex) bounds so the on-screen text is always current
+  // while the expensive indexing/windowing stays warm.
+  const transcriptVisibleItems = (items || []).slice(
+    transcriptWindow.startIndex,
+    transcriptWindow.endIndex,
+  );
+  // The bottom meta band is spinner-only, so nothing is pulled out of the
+  // transcript for it. A finished turn's done row (turndone/statusdone) renders
+  // inline in scrollback like any other item — no filtering, no double-paint.
+  const renderedTranscriptItems = transcriptVisibleItems;
+  let overlayHintAttachItemIndex = -1;
+  for (let i = renderedTranscriptItems.length - 1; i >= 0; i--) {
+    const item = renderedTranscriptItems[i];
+    if (item?.kind === 'tool' && shouldSuppressFullyFailedToolItem(item)) continue;
+    overlayHintAttachItemIndex = i;
+    break;
+  }
+  const transcriptTailPinned = Math.max(0, Number(transcriptWindow.effectiveScrollOffset) || 0) <= transcriptBottomSlackRows;
+  const overlayHintOnLastItem = overlayHintRequested
+    && floatingPanelRows <= 0
+    && transcriptWindow.bottomSpacerRows === 0
+    && transcriptTailPinned
+    && overlayHintAttachItemIndex >= 0;
+  const overlayHintFallbackRow = overlayHintRequested
+    && floatingPanelRows <= 0
+    && transcriptGuardRows > 0
+    && !overlayHintOnLastItem;
+  // ── App-level measured height harvest ───────────────────────────────────
+  // Runs after EVERY commit (no deps): Yoga has just laid out the mounted rows,
+  // so each tracked item Box's getComputedHeight() is its REAL terminal height.
+  // Fold those into transcriptMeasuredRowsCache (validated on the same variant
+  // key the estimate caches use) and bump measuredRowsVersion only when a height
+  // actually changed — that re-runs the row-index/window memos against corrected
+  // heights, then the harvest finds nothing new and the loop settles (one frame,
+  // overscan-absorbed). Streaming
+  // assistant rows are skipped: their height churns every flush and the bottom-
+  // follow path already keeps them visually stable.
+  useLayoutEffect(() => {
+    if (!TRANSCRIPT_MEASURED_ROWS) return;
+    // Skip the per-row Yoga harvest while a drag is in progress. Edge auto-
+    // scroll commits setScrollOffset on every pointer motion, but the mounted
+    // rows' real heights do not change during a drag — only their scroll
+    // position does. Re-measuring every motion ran this O(mounted) loop (plus a
+    // variantKey check per row) for no height change, which is pure drag
+    // overhead on a tall transcript. The cached measurements stay authoritative
+    // for the row-index math; a single re-measure is forced on release below.
+    if (dragRef.current.active) return;
+    const els = transcriptItemElsRef.current;
+    if (!els || els.size === 0) return;
+    const liveItems = transcriptMeasureItemsRef.current;
+    const toolExpandedFlag = toolOutputExpanded ? 1 : 0;
+    let changed = false;
+    for (const [key, el] of els.entries()) {
+      const item = liveItems.get(key);
+      const yoga = el?.yogaNode;
+      if (!item || !yoga) continue;
+      if (shouldSuppressFullyFailedToolItem(item)) {
+        if (transcriptMeasuredRowsCache.delete(item)) changed = true;
+        continue;
+      }
+      if (item.kind === 'assistant' && item.streaming) continue;
+      // Width 0 = Yoga has not laid this node out yet this frame; skip so a
+      // transient 0 never poisons the cache (guard on a real positive width).
+      if (typeof yoga.getComputedWidth === 'function' && yoga.getComputedWidth() <= 0) continue;
+      const rawMeasured = Math.round(Number(yoga.getComputedHeight?.()) || 0);
+      if (rawMeasured <= 0) {
+        if (transcriptMeasuredRowsCache.delete(item)) changed = true;
+        continue;
+      }
+      const measured = Math.max(1, rawMeasured);
+      const variantKey = transcriptItemVariantKey(item);
+      const prev = transcriptMeasuredRowsCache.get(item);
+      if (prev
+        && prev.rows === measured
+        && prev.columns === frameColumns
+        && prev.toolExpanded === toolExpandedFlag
+        && prev.variantKey === variantKey) {
+        continue;
+      }
+      transcriptMeasuredRowsCache.set(item, {
+        rows: measured,
+        columns: frameColumns,
+        toolExpanded: toolExpandedFlag,
+        variantKey,
+      });
+      changed = true;
+    }
+    if (changed) setMeasuredRowsVersion((v) => (v + 1) % 1000000);
+    // Prune the id→item / id→callback maps to the currently-mounted set so they
+    // do not grow unbounded over a long session. `els` is the live mounted set
+    // (ref(null) deletes on unmount), so anything not in it is gone.
+    if (liveItems.size > els.size) {
+      for (const key of liveItems.keys()) {
+        if (!els.has(key)) liveItems.delete(key);
+      }
+    }
+    const refCache = transcriptMeasureRefCache.current;
+    if (refCache.size > els.size) {
+      for (const key of refCache.keys()) {
+        if (!els.has(key)) refCache.delete(key);
+      }
+    }
+  });
+  useLayoutEffect(() => {
+    const totalRows = Math.max(0, Number(transcriptWindow.totalRows) || 0);
+    const previousTotalRows = Math.max(0, Number(transcriptTotalRowsRef.current) || 0);
+    transcriptTotalRowsRef.current = totalRows;
+    const rowDelta = totalRows - previousTotalRows;
+    const curPrefix = transcriptRowIndex?.prefixRows || null;
+    if (previousTotalRows <= 0 || dragRef.current.active) return;
+
+    const currentTarget = Math.max(0, Number(scrollTargetRef.current) || 0);
+    const currentPosition = Math.max(0, Number(scrollPositionRef.current) || 0);
+    const currentOffset = Math.max(0, Number(scrollOffset) || 0);
+    const maxRows = Math.max(0, Number(transcriptWindow.maxScrollRows) || 0);
+    const nearBottom = followingRef.current || currentTarget <= transcriptBottomSlackRows;
+    const pinnedToBottom = nearBottom;
+    // A genuine reading anchor must win over ordinary stream growth, but an
+    // explicit follow arm (prompt submit / pinned bottom) must win over stale
+    // anchor state. Manual scroll cancels followingRef before anchor capture, so
+    // deliberate reading still stays anchored while automatic bottom-follow
+    // stays armed across spinner/tool/stream height corrections.
+    const activeReadingAnchor = !!transcriptAnchorRef.current
+      && !transcriptAnchorDirtyRef.current
+      && !followingRef.current
+      && !nearBottom;
+    const followOnGrowth = followingRef.current && rowDelta > 0 && !activeReadingAnchor;
+    const shouldFollowBottom = rowDelta > 0 && (followOnGrowth || pinnedToBottom);
+    if (shouldFollowBottom) {
+      // Bottom follow: while pinned to the newest output,
+      // do NOT animate row growth. The viewport is already bottom-aligned by
+      // justifyContent:flex-end; injecting a temporary positive scroll offset
+      // during streaming makes the transcript jump down/up and can clip the
+      // currently generated assistant text. Keep all scroll refs at zero so
+      // character generation stays visually stable.
+      stopSmoothScroll();
+      scrollTargetRef.current = 0;
+      scrollPositionRef.current = 0;
+      transcriptAnchorRef.current = null;
+      transcriptAnchorDirtyRef.current = false;
+      if (currentOffset !== 0) setScrollOffset(0);
+      return;
+    }
+
+    // Viewport-only changes, such as swapping TextEntryPanel for a picker, must
+    // not turn a bottom-pinned transcript into a reading-anchor lock.
+    if (rowDelta <= 0 && nearBottom) {
+      stopSmoothScroll();
+      scrollTargetRef.current = 0;
+      scrollPositionRef.current = 0;
+      transcriptAnchorRef.current = null;
+      transcriptAnchorDirtyRef.current = false;
+      if (currentOffset !== 0) setScrollOffset(0);
+      return;
+    }
+
+    // ── ABSOLUTE ANCHOR LOCK ──────────────────────────────────────────────
+    // User is reading older transcript. Instead of folding the per-frame row
+    // DELTA into scrollOffset (which accumulated streaming-tail estimate jitter
+    // and could fall back to the whole-total delta on a misalignment — the
+    // "newline makes the screen jump" bug), we pin an ABSOLUTE anchor: the item
+    // id + row offset sitting at the viewport TOP edge. Every commit we look that
+    // item up in the CURRENT prefix table and re-derive scrollOffset so the
+    // anchored row stays at the same screen position. Any height change BELOW the
+    // anchor (streaming tail growth, a result landing under the reading position)
+    // only moves the bottom — the top is rock-stable. Changes ABOVE the anchor
+    // move the item's prefix start and are absorbed the same way. No deltas, no
+    // fallback, no drift.
+    const viewRows = Math.max(1, Number(transcriptContentHeight) || 1);
+    const itemList = items || [];
+    let anchor = transcriptAnchorRef.current;
+    // (Re)capture the anchor from the current viewport-top edge when missing or
+    // invalidated by a manual scroll. anchorRow = absolute row at the top edge.
+    if (!followingRef.current && (!anchor || transcriptAnchorDirtyRef.current)) {
+      if (curPrefix && curPrefix.length > 1) {
+        const anchorRow = Math.max(0, Math.min(totalRows, totalRows - currentTarget - viewRows));
+        let idx = upperBound(curPrefix, anchorRow) - 1;
+        if (idx < 0) idx = 0;
+        if (idx > itemList.length - 1) idx = itemList.length - 1;
+        const anchorItem = itemList[idx];
+        if (anchorItem && anchorItem.id != null) {
+          anchor = { id: anchorItem.id, offset: Math.max(0, anchorRow - (curPrefix[idx] || 0)) };
+          transcriptAnchorRef.current = anchor;
+        }
+      }
+      transcriptAnchorDirtyRef.current = false;
+      // Just captured at the current offset; nothing to correct this frame.
+      return;
+    }
+    // Resolve the anchored item's CURRENT position with the SAME pure helper the
+    // render path uses, so the post-commit state sync can never disagree with the
+    // synchronous render correction (which already fixed the screen this frame).
+    const desired = resolveAnchorScrollOffset({
+      anchor,
+      items: itemList,
+      curPrefix,
+      totalRows,
+      viewRows,
+      maxRows,
+    });
+    if (desired == null) {
+      // Anchor item gone (rare: removal/compaction). Re-capture next frame.
+      transcriptAnchorDirtyRef.current = true;
+      return;
+    }
+    const appliedDelta = desired - currentTarget;
+    if (appliedDelta === 0) return;
+
+    stopSmoothScroll();
+    scrollTargetRef.current = desired;
+    scrollPositionRef.current = Math.max(0, Math.min(maxRows, currentPosition + appliedDelta));
+    preservedScrollDeltaRef.current += appliedDelta;
+    setScrollOffset(Math.max(0, Math.round(desired)));
+  }, [transcriptWindow.totalRows, transcriptWindow.maxScrollRows, transcriptRowIndex, transcriptContentHeight, transcriptBottomSlackRows, scrollOffset, stopSmoothScroll]);
+  useLayoutEffect(() => {
+    if (transcriptBottomSlackRows <= 0) return;
+    if (transcriptAnchorRef.current || transcriptAnchorDirtyRef.current || followingRef.current) return;
+    const currentTarget = Math.max(0, Number(scrollTargetRef.current) || 0);
+    const currentPosition = Math.max(0, Number(scrollPositionRef.current) || 0);
+    const currentOffset = Math.max(0, Number(scrollOffset) || 0);
+    if (Math.max(currentTarget, currentPosition, currentOffset) === 0) return;
+    if (Math.max(currentTarget, currentPosition, currentOffset) > transcriptBottomSlackRows) return;
+    stopSmoothScroll();
+    scrollTargetRef.current = 0;
+    scrollPositionRef.current = 0;
+    setScrollOffset(0);
+  }, [transcriptBottomSlackRows, scrollOffset, stopSmoothScroll]);
+  useLayoutEffect(() => {
+    const top = Math.max(0, Number(transcriptViewportRef.current?.top) || 0);
+    const next = {
+      top,
+      height: Math.max(1, Number(transcriptContentHeight) || 1),
+      totalRows: Math.max(0, Number(transcriptWindow.totalRows) || 0),
+      scrollOffset: Math.max(0, Number(transcriptWindow.effectiveScrollOffset) || 0),
+    };
+    const preservedDelta = Number(preservedScrollDeltaRef.current) || 0;
+    if (preservedDelta !== 0) {
+      next.scrollOffset = Math.max(0, next.scrollOffset + preservedDelta);
+      preservedScrollDeltaRef.current = 0;
+    }
+    const previous = selectionLayoutRef.current;
+    selectionLayoutRef.current = next;
+    if (!previous || !dragRef.current.rect || dragRef.current.active) return;
+    const deltaY = (next.top - previous.top)
+      + (next.height - previous.height)
+      - (next.totalRows - previous.totalRows)
+      + (next.scrollOffset - previous.scrollOffset);
+    if (deltaY === 0) return;
+    const clippedRect = withSelectionClip(shiftSelectionRectY(dragRef.current.rect, deltaY));
+    dragRef.current = { ...dragRef.current, rect: clippedRect };
+    paintSelectionRect(clippedRect, { rememberText: true, immediate: true });
+  }, [transcriptContentHeight, transcriptWindow.totalRows, transcriptWindow.effectiveScrollOffset, withSelectionClip, paintSelectionRect]);
+  useEffect(() => {
+    if (!dragRef.current.rect) return;
+    const clippedRect = withSelectionClip(dragRef.current.rect);
+    dragRef.current = { ...dragRef.current, rect: clippedRect };
+    paintSelectionRect(clippedRect, { rememberText: true, immediate: true });
+  }, [themeEpoch, withSelectionClip, paintSelectionRect]);
+  useEffect(() => {
+    const maxRows = Math.max(0, Number(transcriptWindow.maxScrollRows) || 0);
+    if (scrollTargetRef.current <= maxRows && scrollPositionRef.current <= maxRows && scrollOffset <= maxRows) return;
+    stopSmoothScroll();
+    const next = Math.max(0, Math.min(maxRows, scrollTargetRef.current));
+    scrollTargetRef.current = next;
+    scrollPositionRef.current = next;
+    setScrollOffset(Math.round(next));
+  }, [transcriptWindow.maxScrollRows, scrollOffset, stopSmoothScroll]);
+
+  return {
+    transcriptWindow,
+    renderedTranscriptItems,
+    transcriptTailPinned,
+    overlayHintAttachItemIndex,
+    overlayHintOnLastItem,
+    overlayHintFallbackRow,
+    transcriptMeasureRef,
+  };
+}

package/src/tui/components/ConfirmBar.jsx

@@ -26,7 +26,7 @@ export function ConfirmBar({ buttons = [], focusedIndex = -1 }) {
   const list = Array.isArray(buttons) ? buttons.filter(Boolean) : [];
   if (list.length === 0) return null;
   return (
-    <Box flexDirection="row" width="100%" justifyContent="flex-end">
+    <Box flexDirection="row" width="100%" justifyContent="flex-start">
       {list.map((button, index) => {
         const isFocused = index === focusedIndex;
         return (

package/src/tui/components/Picker.jsx

@@ -90,7 +90,7 @@ export function Picker({
   labelWidth: labelWidthOverride = null,
   metaWidth: metaWidthOverride = null,
   footerGapRows = 1,
-  initialIndex = 0,
+  initialIndex = null,
   indexMode = 'auto',
   fillHeight = false,
   visibleCount = MAX_VISIBLE,
@@ -114,13 +114,41 @@ export function Picker({
     setConfirmFocus(-1);
   }, [confirmButtons.length, confirmBar]);
 
+  // Selection stability across owner-driven reopens: command pickers
+  // (settings/hooks/skills/channels toggles) rebuild their item list and call
+  // setPicker() again on every ←/→ toggle. Follow the previously selected
+  // item's `value` into the new list instead of snapping back to row 0.
+  // (useState-backed ref: mutation must never trigger a re-render.)
+  const [selectionMemo] = useState(() => ({ value: null, initialIndex }));
   useEffect(() => {
-    setSelectedIndex((i) => Math.min(Math.max(0, i), Math.max(0, items.length - 1)));
-  }, [items.length]);
+    const item = items[selectedIndex];
+    if (item && item.value != null) selectionMemo.value = item.value;
+  }, [items, selectedIndex, selectionMemo]);
+
+  useEffect(() => {
+    setSelectedIndex((i) => {
+      if (selectionMemo.value != null) {
+        const found = items.findIndex((entry) => entry && entry.value === selectionMemo.value);
+        if (found >= 0) return found;
+        // Previous selection no longer exists — this is a different picker
+        // (or the row was removed). Start from the owner's initialIndex/top
+        // instead of carrying a stale row number across picker transitions.
+        selectionMemo.value = null;
+        return Math.max(0, Math.min(Number(initialIndex) || 0, Math.max(0, items.length - 1)));
+      }
+      return Math.min(Math.max(0, i), Math.max(0, items.length - 1));
+    });
+  }, [items, selectionMemo, initialIndex]);
 
   useEffect(() => {
+    // Explicit highlight target: honor initialIndex only when the owner
+    // actually provides a *new* one. A reopen that drops initialIndex
+    // (prop -> null default) must not reset the user's position to row 0.
+    if (initialIndex == null) { selectionMemo.initialIndex = null; return; }
+    if (selectionMemo.initialIndex === initialIndex) return;
+    selectionMemo.initialIndex = initialIndex;
     setSelectedIndex(Math.max(0, Math.min(Number(initialIndex) || 0, Math.max(0, items.length - 1))));
-  }, [initialIndex, items.length]);
+  }, [initialIndex, items.length, selectionMemo]);
 
   // Live-preview hook: notify the owner whenever the highlighted row changes
   // (arrow keys, paging, initial mount). The /theme picker uses this to apply a