@esso0428/pi-subagents 0.15.14 → 0.15.16

package/src/ui/conversation-viewer.ts

@@ -13,7 +13,7 @@ import { getLifetimeTotal, getSessionContextPercent } from "../usage.js";
 import type { Theme } from "./agent-widget.js";
 import { type AgentActivity, buildInvocationTags, describeActivity, fgPreservingNestedStyles, formatDuration, formatSessionTokens, getDisplayName, getPromptModeLabel } from "./agent-widget.js";
 import { formatConversationMessages, type ConversationBlock } from "./conversation-blocks.js";
-import { ConversationTimeline, type TimelineRenderLine } from "./conversation-timeline.js";
+import { ConversationTimeline, type ConversationTimelineChange, type TimelineRenderLine } from "./conversation-timeline.js";
 import { renderConversationRoleHeader } from "./conversation-role.js";
 import { editLiveAssistantBlockInNvim, viewConversationBlockInNvim } from "./conversation-nvim.js";
 import { findConversationMatches, highlightConversationLine, nearestConversationMatchAfter, nearestConversationMatchBefore, stripAnsi, type ConversationMatch } from "./conversation-search.js";
@@ -22,40 +22,61 @@ import { createViewerCcstyleResult } from "./ccstyle/tool-result.js";
 
 /** Base lines consumed by the overlay: borders, header, separator and footer. */
 const CHROME_LINES_BASE = 6;
+const MIN_VIEWPORT = 3;
+export const VIEWPORT_HEIGHT_PCT = 70;
+const MAX_COPY_CHARS = 500_000;
+const MATCH_BG = "\x1b[48;5;238m";
+const MATCH_BG_CURRENT = "\x1b[48;5;220m\x1b[30m";
+const BG_RESET = "\x1b[49m\x1b[39m";
+
+/** The live fields needed by the viewer; historical viewers use a static source. */
+export type ConversationSource = Pick<AgentSession, "messages" | "subscribe">;
+
+export function createStaticConversationSource(
+  messages: AgentSession["messages"],
+): ConversationSource {
+  return { messages, subscribe: () => () => {} };
+}
+
+type RenderLine = TimelineRenderLine;
+
 const FULL_TOOL_PREVIEW_MAX_CHARS = 500_000;
 
 class FullToolPreview implements Component {
-  private readonly body: Component;
   private scrollOffset = 0;
   private pageSize = 1;
   private totalLines = 1;
+  private pendingTop = false;
   private hoveredClose = false;
 
   constructor(
     private readonly tui: TUI,
     private readonly theme: Theme,
     private readonly title: string,
-    body: Component,
+    private readonly body: Component,
     private readonly done: (result: undefined) => void,
-  ) {
-    this.body = body;
-  }
+  ) {}
 
   handleInput(data: string): void {
     if (matchesKey(data, Key.escape) || matchesKey(data, "q")) {
       this.done(undefined);
       return;
     }
-    const delta = matchesKey(data, Key.up) ? -1 : matchesKey(data, Key.down) ? 1 :
-      matchesKey(data, "pageUp") ? -this.pageSize : matchesKey(data, "pageDown") ? this.pageSize :
-        matchesKey(data, Key.home) ? -this.totalLines : matchesKey(data, Key.end) ? this.totalLines : 0;
-    if (delta !== 0) {
-      this.scrollTo(this.scrollOffset + delta);
+    if (data === "g") {
+      if (this.pendingTop) this.scrollTo(0);
+      this.pendingTop = true;
+      return;
     }
+    const delta = data === "j" || matchesKey(data, Key.down) ? 1 :
+      data === "k" || matchesKey(data, Key.up) ? -1 :
+      matchesKey(data, "pageUp") ? -this.pageSize : matchesKey(data, "pageDown") ? this.pageSize :
+      matchesKey(data, Key.home) ? -this.totalLines : data === "G" || matchesKey(data, Key.end) ? this.totalLines : 0;
+    this.pendingTop = false;
+    if (delta !== 0) this.scrollTo(this.scrollOffset + delta);
   }
 
   handleMouse(event: TuiMouseEvent): { handled?: boolean; capture?: boolean; render?: boolean } | undefined {
-    const closeHit = event.y === 1 && event.x >= Math.max(0, event.width - 7) && event.x < event.width;
+    const closeHit = event.y === 1 && event.x >= Math.max(0, event.width - 7) && event.x < Math.max(0, event.width - 1);
     if (event.type === "move") {
       if (closeHit === this.hoveredClose) return undefined;
       this.hoveredClose = closeHit;
@@ -92,8 +113,8 @@ class FullToolPreview implements Component {
       return clipped + " ".repeat(Math.max(0, rowWidth - visibleWidth(clipped)));
     };
     const close = this.theme.fg(this.hoveredClose ? "text" : "dim", "[esc]");
-    const header = `${this.theme.bold(this.theme.fg("accent", this.title))}`;
-    const status = `${this.scrollOffset + 1}-${Math.min(this.totalLines, this.scrollOffset + this.pageSize)} / ${this.totalLines} lines · ↑↓ PgUp/PgDn Home/End · [esc] close`;
+    const header = this.theme.bold(this.theme.fg("accent", this.title));
+    const status = `${this.scrollOffset + 1}-${Math.min(this.totalLines, this.scrollOffset + this.pageSize)} / ${this.totalLines} lines · j/k gg/G ↑↓ PgUp/PgDn · [esc] close`;
     return [
       border(`╭${"─".repeat(inner)}╮`),
       `${border("│")}${pad(` ${header}`, inner - visibleWidth(close))}${close}${border("│")}`,
@@ -116,23 +137,6 @@ class FullToolPreview implements Component {
     this.tui.requestRender();
   }
 }
-const MIN_VIEWPORT = 3;
-export const VIEWPORT_HEIGHT_PCT = 70;
-const MAX_COPY_CHARS = 500_000;
-const MATCH_BG = "\x1b[48;5;238m";
-const MATCH_BG_CURRENT = "\x1b[48;5;220m\x1b[30m";
-const BG_RESET = "\x1b[49m\x1b[39m";
-
-/** The live fields needed by the viewer; historical viewers use a static source. */
-export type ConversationSource = Pick<AgentSession, "messages" | "subscribe">;
-
-export function createStaticConversationSource(
-  messages: AgentSession["messages"],
-): ConversationSource {
-  return { messages, subscribe: () => () => {} };
-}
-
-type RenderLine = TimelineRenderLine;
 
 /** Optional operations are appended so all existing constructor call sites stay valid. */
 export interface ConversationViewerOperations {
@@ -145,12 +149,15 @@ export class ConversationViewer implements Component {
   private blocks: ConversationBlock[] = [];
   private showTools = true;
   private selectedMessageIdx = 0;
+  private hasFocusedBlock = false;
   private cachedWidth = 0;
   private cachedLines: RenderLine[] = [];
   private cachedMessageStarts: number[] = [];
   private cachedMessageBlocks: ConversationBlock[] = [];
   private cacheVersion = 0;
   private cachedVersion = -1;
+  private sessionRefreshQueued = false;
+  private selectedBlockId: string | undefined;
   private scrollOffset = 0;
   private autoScroll = true;
   private unsubscribe: (() => void) | undefined;
@@ -187,21 +194,10 @@ export class ConversationViewer implements Component {
     this.timeline = new ConversationTimeline(tui, theme, {
       cwd: operations?.ctx.cwd,
       record,
-      onChange: () => {
-        this.cacheVersion++;
-        this.invalidate();
-        this.tui.requestRender();
-      },
+      onChange: (change) => this.handleTimelineChange(change),
     });
     this.timeline.setBlocks(this.blocks);
-    this.unsubscribe = session.subscribe(() => {
-      if (this.closed) return;
-      this.blocks = formatConversationMessages(this.session.messages);
-      this.timeline.setBlocks(this.blocks);
-      this.cacheVersion++;
-      this.invalidate();
-      this.tui.requestRender();
-    });
+    this.unsubscribe = session.subscribe(() => this.scheduleSessionRefresh());
   }
 
   handleInput(data: string): void {
@@ -221,12 +217,6 @@ export class ConversationViewer implements Component {
     }
     if (matchesKey(data, "enter")) {
       this.buildContentLines(this.lastInnerW || 80);
-      const current = this.currentBlock();
-      if (current?.kind === "tool" && current.toolCallId) {
-        this.timeline.setFocusedToolCallId(current.toolCallId);
-        this.timeline.toggleFocusedTool();
-        return;
-      }
       if (this.timeline.isToolFocused()) {
         this.timeline.toggleFocusedTool();
         return;
@@ -301,8 +291,9 @@ export class ConversationViewer implements Component {
       this.scrollBy(viewportHeight);
     } else if (matchesKey(data, "home")) {
       this.scrollOffset = 0;
-      this.selectedMessageIdx = 0;
+      this.setFocusFromMessageIndex(0);
       this.autoScroll = false;
+      this.invalidate();
       this.tui.requestRender();
     } else if (matchesKey(data, "end")) {
       this.scrollToBottom();
@@ -318,17 +309,14 @@ export class ConversationViewer implements Component {
     if (event.type === "move") {
       const closeChanged = closeHit !== this.hoveredClose;
       this.hoveredClose = closeHit;
-      if (this.composer || this.searchMode) {
-        return closeChanged ? { handled: true, render: true } : undefined;
-      }
+      if (this.composer || this.searchMode) return closeChanged ? { handled: true, render: true } : undefined;
       const contentLines = this.buildContentLines(innerW);
       const viewportHeight = this.viewportHeight();
       const maxScroll = Math.max(0, contentLines.length - viewportHeight);
+      if (this.autoScroll) this.scrollOffset = maxScroll;
       const visibleStart = Math.min(this.scrollOffset, maxScroll);
       const contentOrigin = 3 + (this.invocationLine() ? 1 : 0);
       const contentY = event.y - contentOrigin + visibleStart;
-      // Forward moves outside the content too so a previously hovered tool
-      // hint is cleared when the pointer returns to the header/footer.
       const timelineResult = this.timeline.handleMouse({ ...event, y: contentY });
       return timelineResult ?? (closeChanged ? { handled: true, render: true } : undefined);
     }
@@ -346,33 +334,41 @@ export class ConversationViewer implements Component {
     const maxScroll = Math.max(0, contentLines.length - viewportHeight);
     const visibleStart = Math.min(this.scrollOffset, maxScroll);
     const contentOrigin = 3 + (this.invocationLine() ? 1 : 0);
-
     if (event.type === "wheel") {
       if (event.y < contentOrigin || event.y >= contentOrigin + viewportHeight) return undefined;
-      const delta = Math.trunc(event.wheelDelta ?? 0);
-      if (delta === 0) return { handled: true, render: false };
-      this.scrollBy(delta);
+      this.scrollBy(Math.trunc(event.wheelDelta ?? 0));
       return { handled: true, render: true };
     }
-
     const contentY = event.y - contentOrigin + visibleStart;
     if (contentY < 0 || contentY >= contentLines.length) return undefined;
+    // Rows have one leading space and one trailing space inside the frame.
+    // Neither padding nor the frame itself is a focus target.
+    if ((event.type === "click" || event.type === "press") && (event.x < 2 || event.x >= 2 + innerW)) return undefined;
     const result = this.timeline.handleMouse({ ...event, y: contentY });
-    if (result?.handled) {
-      if (event.type === "click") {
+    if (result?.handled && event.type === "click") {
+      let selected = result.focusedBlockIndex;
+      if (selected === undefined) {
         const focusedTool = this.timeline.getFocusedToolCallId();
-        const refreshed = this.timeline.getSnapshot();
-        const selected = refreshed.messageBlocks.findIndex((block) => block.toolCallId === focusedTool);
-        if (selected >= 0) this.selectedMessageIdx = selected;
-        this.cacheVersion++;
-        this.invalidate();
+        selected = this.timeline.getSnapshot().messageBlocks.findIndex((block) => block.toolCallId === focusedTool);
+      }
+      if (selected !== undefined && selected >= 0) {
+        this.buildContentLines(innerW);
+        this.setFocusFromMessageIndex(selected);
+        this.autoScroll = false;
+        this.scrollTargetIntoView(selected);
         this.tui.requestRender();
       }
-      return result;
     }
     return result;
   }
 
+  private isCloseButtonHit(x: number, y: number, innerW: number): boolean {
+    if (y !== 1) return false;
+    const labelWidth = visibleWidth("[esc]");
+    const labelStart = 2 + Math.max(0, innerW - labelWidth);
+    return x >= labelStart && x < 2 + innerW;
+  }
+
   render(width: number): string[] {
     if (width < 6) return [];
     const th = this.theme;
@@ -490,13 +486,6 @@ export class ConversationViewer implements Component {
     return lines;
   }
 
-  private isCloseButtonHit(x: number, y: number, innerW: number): boolean {
-    if (y !== 1) return false;
-    const labelWidth = visibleWidth("[esc]");
-    const labelStart = 2 + Math.max(0, innerW - labelWidth);
-    return x >= labelStart && x < 2 + innerW;
-  }
-
   invalidate(): void {
     this.cachedWidth = 0;
     this.cachedLines = [];
@@ -505,6 +494,39 @@ export class ConversationViewer implements Component {
     this.cachedVersion = -1;
   }
 
+  private scheduleSessionRefresh(): void {
+    if (this.closed || this.sessionRefreshQueued) return;
+    this.sessionRefreshQueued = true;
+    queueMicrotask(() => {
+      this.sessionRefreshQueued = false;
+      if (this.closed) return;
+      if (this.hasFocusedBlock) this.selectedBlockId = this.currentBlock()?.id;
+      this.blocks = formatConversationMessages(this.session.messages);
+      this.timeline.setBlocks(this.blocks);
+      this.cacheVersion++;
+      this.invalidate();
+      this.tui.requestRender();
+    });
+  }
+
+  private handleTimelineChange(change: ConversationTimelineChange): void {
+    if (change.kind === "content") {
+      this.cacheVersion++;
+      this.invalidate();
+    } else if (change.changedRanges && this.cachedWidth > 0 && this.cachedVersion === this.cacheVersion) {
+      const snapshotLines = this.timeline.getSnapshot().lines;
+      for (const range of change.changedRanges) {
+        const start = Math.max(0, range.startLine);
+        const end = Math.min(this.cachedLines.length, start + Math.max(0, range.height));
+        for (let index = start; index < end; index++) {
+          const line = snapshotLines[index];
+          if (line) this.cachedLines[index] = { ...line };
+        }
+      }
+    }
+    this.tui.requestRender();
+  }
+
   dispose(): void {
     this.closed = true;
     this.unsubscribe?.();
@@ -550,6 +572,19 @@ export class ConversationViewer implements Component {
     const lines: RenderLine[] = timelineSnapshot.lines.map((line) => ({ ...line }));
     this.cachedMessageStarts = [...timelineSnapshot.messageStarts];
     this.cachedMessageBlocks = [...timelineSnapshot.messageBlocks];
+    if (this.hasFocusedBlock) {
+      const selectedIndex = this.selectedBlockId
+        ? this.cachedMessageBlocks.findIndex((block) => block.id === this.selectedBlockId)
+        : -1;
+      const focusedToolIndex = this.timeline.getFocusedToolCallId()
+        ? this.cachedMessageBlocks.findIndex((block) => block.toolCallId === this.timeline.getFocusedToolCallId())
+        : -1;
+      const restoredIndex = selectedIndex >= 0 ? selectedIndex : focusedToolIndex;
+      if (restoredIndex >= 0) {
+        this.selectedMessageIdx = restoredIndex;
+        this.selectedBlockId = this.cachedMessageBlocks[restoredIndex]?.id;
+      }
+    }
     if (this.record.status === "running" && this.activity) {
       const act = describeActivity(this.activity.activeTools, this.activity.responseText);
       const text = `▍ ${act}`;
@@ -566,6 +601,17 @@ export class ConversationViewer implements Component {
     return this.cachedMessageStarts.length === 0 ? 0 : Math.max(0, Math.min(this.selectedMessageIdx, this.cachedMessageStarts.length - 1));
   }
 
+  /** Keep the selected transcript block and the tool focus as one target. */
+  private setFocusFromMessageIndex(index: number): boolean {
+    if (index < 0 || index >= this.cachedMessageBlocks.length) return false;
+    this.selectedMessageIdx = index;
+    this.hasFocusedBlock = true;
+    const block = this.cachedMessageBlocks[index];
+    this.selectedBlockId = block.id;
+    this.timeline.setFocusedToolCallId(block.kind === "tool" ? block.toolCallId : undefined);
+    return true;
+  }
+
   private currentBlockGlobalIndex(): number {
     const block = this.cachedMessageBlocks[this.currentMessageIndex()];
     return block ? this.blocks.indexOf(block) : -1;
@@ -598,20 +644,14 @@ export class ConversationViewer implements Component {
     if (messageIndices.length === 0) return;
     const current = this.currentMessageIndex();
     const currentPosition = messageIndices.indexOf(current);
-    let precedingPosition = -1;
-    for (let index = 0; index < messageIndices.length; index++) {
-      if (messageIndices[index] < current) precedingPosition = index;
-    }
-    const basePosition = currentPosition >= 0
-      ? currentPosition
-      : dir > 0
-        ? messageIndices.findIndex((index) => index > current)
-        : precedingPosition;
-    const position = basePosition < 0 ? (dir > 0 ? 0 : messageIndices.length - 1) : basePosition + dir;
+    const precedingPosition = messageIndices.reduce((last, index, position) => index < current ? position : last, -1);
+    const nextPosition = messageIndices.findIndex((index) => index > current);
+    const position = currentPosition >= 0
+      ? currentPosition + dir
+      : dir > 0 ? nextPosition : precedingPosition;
     if (position < 0 || position >= messageIndices.length) return;
     const target = messageIndices[position];
-    this.selectedMessageIdx = target;
-    this.timeline.setFocusedToolCallId(undefined);
+    this.setFocusFromMessageIndex(target);
     this.scrollOffset = Math.min(this.cachedMessageStarts[target], Math.max(0, this.cachedLines.length - this.viewportHeight()));
     this.autoScroll = false;
     this.tui.requestRender();
@@ -620,15 +660,13 @@ export class ConversationViewer implements Component {
   private moveToolFocus(direction: 1 | -1): void {
     if (!this.timeline.moveFocus(direction)) return;
     const focused = this.timeline.getFocusedToolCallId();
-    const refreshed = this.timeline.getSnapshot();
-    const index = refreshed.messageBlocks.findIndex((block) => block.toolCallId === focused);
+    this.buildContentLines(this.lastInnerW || 80);
+    const index = this.cachedMessageBlocks.findIndex((block) => block.toolCallId === focused);
     if (index >= 0) {
-      this.selectedMessageIdx = index;
-      this.buildContentLines(this.lastInnerW || 80);
+      this.setFocusFromMessageIndex(index);
       this.autoScroll = false;
       this.scrollTargetIntoView(index);
     }
-    this.invalidate();
     this.tui.requestRender();
   }
 
@@ -639,24 +677,17 @@ export class ConversationViewer implements Component {
       .filter((index): index is number => index >= 0);
     if (toolIndices.length === 0) return;
 
-    const focusedId = this.timeline.getFocusedToolCallId();
-    const focusedIndex = focusedId
-      ? this.cachedMessageBlocks.findIndex((block) => block.toolCallId === focusedId)
-      : -1;
-    const current = focusedIndex >= 0 ? focusedIndex : this.currentMessageIndex();
-    const target = focusedIndex < 0
+    const current = this.currentMessageIndex();
+    const resolvedTarget = !this.hasFocusedBlock
       ? direction > 0 ? toolIndices[0] : toolIndices[toolIndices.length - 1]
       : direction > 0
         ? toolIndices.find((index) => index > current)
         : [...toolIndices].reverse().find((index) => index < current);
-    if (target === undefined) return;
+    if (resolvedTarget === undefined) return;
 
-    const block = this.cachedMessageBlocks[target];
-    this.selectedMessageIdx = target;
+    this.setFocusFromMessageIndex(resolvedTarget);
     this.autoScroll = false;
-    this.scrollTargetIntoView(target);
-    this.timeline.setFocusedToolCallId(block.toolCallId);
-    this.invalidate();
+    this.scrollTargetIntoView(resolvedTarget);
     this.tui.requestRender();
   }
 
@@ -672,7 +703,10 @@ export class ConversationViewer implements Component {
 
   private openFocusedToolPreview(): void {
     this.buildContentLines(this.lastInnerW || 80);
-    const block = this.currentBlock();
+    const focusedToolCallId = this.timeline.getFocusedToolCallId();
+    const block = focusedToolCallId
+      ? this.cachedMessageBlocks.find((candidate) => candidate.toolCallId === focusedToolCallId)
+      : this.currentBlock();
     const custom = this.operations?.ctx?.ui?.custom;
     if (block?.kind !== "tool" || typeof custom !== "function") return;
 
@@ -680,50 +714,40 @@ export class ConversationViewer implements Component {
     const args = block.args ?? block.toolArguments;
     const result = block.toolResult ?? block.result ?? { content: [] };
     const title = `${toolName} · full preview`;
-
     void custom.call(this.operations!.ctx.ui, (tui, overlayTheme, _keybindings, done) => {
       const body = createViewerCcstyleResult(
         toolName,
         result,
         { expanded: true, isError: result.isError === true },
         overlayTheme,
-        {
-          args,
-          maxChars: FULL_TOOL_PREVIEW_MAX_CHARS,
-          diffConfig: { expandedPreviewMaxLines: Number.MAX_SAFE_INTEGER },
-        },
+        { args, maxChars: FULL_TOOL_PREVIEW_MAX_CHARS, diffConfig: { expandedPreviewMaxLines: Number.MAX_SAFE_INTEGER } },
       );
       return new FullToolPreview(tui, overlayTheme as Theme, title, body, done);
     }, {
-        overlay: true,
-        overlayOptions: {
-          anchor: "center",
-          width: "85%",
-          minWidth: 50,
-          maxHeight: "80%",
-          margin: 2,
-        },
-      }).catch(() => undefined);
+      overlay: true,
+      overlayOptions: { anchor: "center", width: "85%", minWidth: 50, maxHeight: "80%", margin: 2 },
+    }).catch(() => undefined);
   }
 
   private scrollBy(delta: number): void {
     const max = Math.max(0, this.cachedLines.length - this.viewportHeight());
     this.scrollOffset = Math.max(0, Math.min(max, this.scrollOffset + delta));
-    this.selectedMessageIdx = this.messageIndexForOffset(this.scrollOffset);
+    const selected = this.messageIndexForOffset(this.scrollOffset);
+    this.setFocusFromMessageIndex(selected);
     this.autoScroll = this.scrollOffset >= max;
     this.tui.requestRender();
   }
 
   private scrollToTop(): void {
     this.scrollOffset = 0;
-    this.selectedMessageIdx = 0;
+    this.setFocusFromMessageIndex(0);
     this.autoScroll = false;
     this.tui.requestRender();
   }
 
   private scrollToBottom(): void {
     this.scrollOffset = Math.max(0, this.cachedLines.length - this.viewportHeight());
-    this.selectedMessageIdx = Math.max(0, this.cachedMessageStarts.length - 1);
+    this.setFocusFromMessageIndex(Math.max(0, this.cachedMessageStarts.length - 1));
     this.autoScroll = true;
     this.tui.requestRender();
   }
@@ -774,7 +798,7 @@ export class ConversationViewer implements Component {
     if (!match) return;
     const max = Math.max(0, this.cachedLines.length - this.viewportHeight());
     this.scrollOffset = Math.max(0, Math.min(max, match.lineIdx - Math.floor(this.viewportHeight() / 2)));
-    this.selectedMessageIdx = this.messageIndexForOffset(this.scrollOffset);
+    this.setFocusFromMessageIndex(this.messageIndexForOffset(this.scrollOffset));
     this.autoScroll = false;
   }
 

package/src/ui/fleet-list.ts

@@ -107,6 +107,7 @@ export class FleetList {
   private inputUnsub: (() => void) | undefined;
   private widgetRegistered = false;
   private lastRosterKey: string | undefined;
+  private lastRenderKey: string | undefined;
   private timer: ReturnType<typeof setInterval> | undefined;
 
   private enabled = true;
@@ -142,6 +143,7 @@ export class FleetList {
     this.ui = ui;
     this.widgetRegistered = false;
     this.lastRosterKey = undefined;
+    this.lastRenderKey = undefined;
     this.tui = undefined;
     this.inputUnsub = ui.onTerminalInput(data => this.handleKey(data));
   }
@@ -168,6 +170,7 @@ export class FleetList {
     if (this.ui && this.widgetRegistered) this.ui.setWidget(FLEET_KEY, undefined);
     this.widgetRegistered = false;
     this.lastRosterKey = undefined;
+    this.lastRenderKey = undefined;
     this.tui = undefined;
     this.active = false;
     // Null last so a `viewerClose()` microtask above can't re-register the widget.
@@ -193,11 +196,13 @@ export class FleetList {
       this.active = false;
       this.selectedIndex = 0;
       this.lastRosterKey = undefined;
+      this.lastRenderKey = undefined;
       return;
     }
 
     this.clampSelection();
     this.ensureTimer(); // keep stats ticking whenever the list is shown (e.g. after a re-enable)
+    const renderKey = this.renderKey(records);
 
     if (!this.widgetRegistered) {
       this.ui.setWidget(FLEET_KEY, (tui, theme) => {
@@ -208,9 +213,37 @@ export class FleetList {
         };
       }, { placement: "belowEditor" });
       this.widgetRegistered = true;
-    } else {
+    } else if (renderKey !== this.lastRenderKey) {
+      // The timer runs more frequently than elapsed time is displayed. Avoid
+      // waking the TUI when the visible FleetView snapshot is unchanged, but
+      // preserve a forced redraw when rows were added/removed.
       this.tui?.requestRender(rosterChanged);
     }
+    this.lastRenderKey = renderKey;
+  }
+
+  /**
+   * Return only values that affect `renderBar()`. Elapsed time is rendered in
+   * whole seconds, so the 200ms timer can skip four out of five updates while
+   * still refreshing the row at the visible cadence.
+   */
+  private renderKey(records: AgentRecord[]): string {
+    const now = Date.now();
+    const agentState = records.map(record => {
+      const activity = this.agentActivity.get(record.id);
+      const usage = activity?.lifetimeUsage ?? record.lifetimeUsage;
+      return [
+        record.id,
+        record.type,
+        record.description,
+        record.status,
+        record.startedAt,
+        record.completedAt ?? "",
+        getLifetimeTotal(usage),
+        Math.round(((record.completedAt ?? now) - record.startedAt) / 1000),
+      ].join("\u001f");
+    });
+    return [this.enabled ? "1" : "0", this.active ? "1" : "0", String(this.selectedIndex), ...agentState].join("\u001e");
   }
 
   // ---- Roster ----

package/src/write-execution.ts

@@ -9,8 +9,6 @@ export const MAX_COMPARABLE_WRITE_BYTES = 512_000;
 export const MAX_WRITE_METADATA_ENTRIES = 100;
 
 export interface DurableWriteDetails {
-  /** Persisted so history can distinguish create vs overwrite without file access. */
-  fileExistedBeforeWrite?: boolean;
   diff?: string;
   patch?: string;
   firstChangedLine?: number;
@@ -108,10 +106,7 @@ function durableDetails(
   content: string,
 ): DurableWriteDetails {
   if (metadata.diffUnavailableReason) {
-    return {
-      fileExistedBeforeWrite: metadata.fileExistedBeforeWrite,
-      diffUnavailableReason: metadata.diffUnavailableReason,
-    };
+    return { diffUnavailableReason: metadata.diffUnavailableReason };
   }
   const previousContent = metadata.previousContent ?? "";
   const diffResult = generateDiffString(previousContent, content);
@@ -121,7 +116,6 @@ function durableDetails(
     return { diffUnavailableReason: `durable diff exceeds ${MAX_DURABLE_DIFF_BYTES} bytes` };
   }
   return {
-    fileExistedBeforeWrite: metadata.fileExistedBeforeWrite,
     diff: diffResult.diff,
     patch,
     firstChangedLine: diffResult.firstChangedLine,