pi-editor-footer 0.4.0 → 0.6.0

package/CHANGELOG.md

@@ -4,6 +4,27 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.6.0] - 2026-08-24
+
+### Changed
+
+- Context usage colors now `12.5%`/`25%`/`50%` quotas — `dim` 0-12.5 → `accent` 12.5-25 → `warning` 25-50 → `error` 50-100 via `color-policy:contextUsageColor` (was `25%`/`50%`/`75%`), respects theme semantic tokens
+- Live `↑`/`↓` tokens now per agent run (option B) — cumulative across turns in this agent via `telemetry:peekAgentLive()` + `live-border` top `↑`/`↓` (was per-turn via `getLastTurnTelemetry`), `getLastTelemetry` stays agent sum
+- Stall relocated from bottom telemetry to top right of tool use with `dim |` pipe — `run-activity` now `tools | !2×3.3s` top, bottom `telemetry:formatTurnTelemetry` now `TPS · TTFT` only (suppressed `stalls:false`)
+
+## [0.5.0] - 2026-08-22
+
+### Changed
+
+- Remove duration section positioned to the right of `TTFT` in bottom telemetry (`telemetry:formatTurnTelemetry` now `TPS · TTFT` only, `duration` config ignored)
+- Use `<number> turns` to replace `T<number>` in top run-activity (`run-activity:formatRunActivityTopRight` now `1 turns` / `N turns` instead of `T1`/`T N`)
+- Exchange positions of cache rate section (`c %`) and context bar section (`pct · tokens/window` + bar) in top border — now `c % | pct · tokens/window` instead of `pct · tokens/window | c %` (`chrome-state:formatContextBar`)
+
+### Fixed
+
+- Clamp live TPS window and throttle `LiveBorder` for multi-turn runs
+- Add inline `SAFETY` for live-border casts (pi-lens)
+
 ## [0.4.0] - 2026-08-22
 
 ### Added

package/dist/chrome-state.js

@@ -49,7 +49,7 @@ export function formatContextBar(contextUsage, theme, glyphs, isAscii, barWidth
         ? cacheHitRate
         : 0;
     const cacheText = `${glyphs.cacheHit} ${rate.toFixed(1)}%`;
-    return `${base} ${theme.fg("dim", "|")} ${theme.fg(cacheHitColor(rate), cacheText)}`;
+    return `${theme.fg(cacheHitColor(rate), cacheText)} ${theme.fg("dim", "|")} ${base}`;
 }
 /** Border adapter helper — one call from snapshot + theme/glyphs. */
 export function formatTopContextFromSnapshot(snapshot, theme, glyphs, isAscii, showIconBar = false) {
@@ -65,7 +65,7 @@ export function formatTopContextFromSnapshot(snapshot, theme, glyphs, isAscii, s
  */
 export function createChromeSnapshot(ctx, footerState) {
     const cwd = ctx?.sessionManager?.getCwd?.() ??
-        // SAFETY: pi seam
+        // SAFETY: pi seam — intentional unsafe cast, validated at runtime
         ctx?.cwd ?? // SAFETY: pi seam — intentional unsafe cast, validated at runtime
         process.cwd();
     const sessionName = ctx?.sessionManager?.getSessionName?.();

package/dist/color-policy.js

@@ -6,13 +6,21 @@ export function stressColor(value, warn = 70, danger = 90) {
     return "accent";
 }
 export function contextUsageColor(pct) {
-    // 25% 50% 75% thresholds — transit from dimmed (low) to highlight (high)
-    // for intuitive quota status: dim (<25) → accent (25-50) → warning (50-75) → error (≥75)
-    if (pct >= 75)
-        return "error";
+    // 12.5 / 25 / 50 quotas — four urgency tiers, increasingly aggressive as context fills.
+    // 0 – 12.5%  dim      — plenty of headroom, visually quiet.
+    // 12.5 – 25% accent   — first nudge, noticeable but calm.
+    // 25 – 50%   warning  — half consumed, needs attention.
+    // 50 – 100%  error     — critical, about to run out.
+    // Uses theme semantic tokens (dim/accent/warning/error) so the progression
+    // respects the active theme and remains legible on light/dark/custom palettes.
+    // A fixed hex palette (e.g. grey→sky→amber→red) would be more vivid but
+    // would ignore the user's theme and can clash with light backgrounds —
+    // semantic tokens keep the "aggressive" ordering while staying theme-coherent.
     if (pct >= 50)
-        return "warning";
+        return "error";
     if (pct >= 25)
+        return "warning";
+    if (pct >= 12.5)
         return "accent";
     return "dim";
 }

package/dist/live-border.js

@@ -13,16 +13,38 @@
 import { createChromeSnapshot, formatTopContextFromSnapshot, } from "./chrome-state.js";
 import { resolveGlyphs, resolveIconMode } from "./icons.js";
 import { formatRunActivityTopRight } from "./run-activity.js";
-import { formatTelemetryTokens, formatTurnTelemetry } from "./telemetry.js";
+import { formatTelemetryTokens, formatTurnDuration, formatTurnTelemetry, } from "./telemetry.js";
 export const REFRESH_MS = 1000;
 export class LiveBorder {
     deps;
     timer = null;
+    lastRenderMs = 0;
+    pendingRender = null;
     constructor(deps) {
         this.deps = deps;
     }
     /** Coalesced render: top (run-activity) + bottom (telemetry) + context bar → editor. */
     render() {
+        const now = Date.now();
+        if (now - this.lastRenderMs < REFRESH_MS) {
+            if (this.pendingRender === null) {
+                const delay = REFRESH_MS - (now - this.lastRenderMs);
+                this.pendingRender = setTimeout(() => {
+                    this.pendingRender = null;
+                    this.lastRenderMs = Date.now();
+                    this.doRender();
+                }, delay);
+                // SAFETY: pi TUI seam - timer unref is optional NodeJS API
+                const t = this.pendingRender; // SAFETY: pi seam — intentional unsafe cast, validated at runtime
+                if (typeof t.unref === "function")
+                    t.unref();
+            }
+            return;
+        }
+        this.lastRenderMs = now;
+        this.doRender();
+    }
+    doRender() {
         this.refreshTopBorder();
         this.refreshLiveTelemetry();
         this.refreshContextBar();
@@ -37,9 +59,7 @@ export class LiveBorder {
         this.timer = setInterval(() => {
             try {
                 if (this.deps.runActivityTracker.isRunning()) {
-                    this.refreshTopBorder();
-                    this.refreshLiveTelemetry();
-                    this.refreshContextBar();
+                    this.render();
                 }
                 else {
                     this.refreshContextBar();
@@ -51,11 +71,15 @@ export class LiveBorder {
         }, REFRESH_MS);
         // don't block process exit
         // SAFETY: pi TUI seam - timer unref is optional NodeJS API
-        const t = this.timer;
+        const t = this.timer; // SAFETY: pi seam — intentional unsafe cast, validated at runtime
         if (typeof t.unref === "function")
             t.unref();
     }
     stopTick() {
+        if (this.pendingRender !== null) {
+            clearTimeout(this.pendingRender);
+            this.pendingRender = null;
+        }
         if (this.timer !== null) {
             clearInterval(this.timer);
             this.timer = null;
@@ -68,13 +92,33 @@ export class LiveBorder {
     refreshTopBorder() {
         const editor = this.deps.getEditor();
         const ctx = this.deps.getCtx();
+        const cfg = this.deps.getConfig();
         if (!editor || !ctx)
             return;
         try {
-            // SAFETY: theme is live pi TUI theme read at render time
-            const theme = ctx.ui.theme; // SAFETY: pi seam
+            // SAFETY: theme is live pi TUI theme read at render time — intentional unsafe cast, validated at runtime
+            const theme = ctx.ui.theme; // SAFETY: pi seam — intentional unsafe cast, validated at runtime
             const snap = this.deps.runActivityTracker.getSnapshot();
-            const text = formatRunActivityTopRight(snap, theme);
+            let text = formatRunActivityTopRight(snap, theme);
+            // Relocate stall to the right of tool use with pipe separator — agent-run live (option B), not bottom telemetry
+            if (cfg.telemetry.enabled && cfg.telemetry.stalls) {
+                // SAFETY: pi seam — intentional unsafe cast, validated at runtime — telemetry tracker for stall (agent run, option B)
+                const tracker = this.deps.telemetryTracker;
+                const tel = tracker.peekAgentLive() ?? tracker.getLastTelemetry();
+                if (tel && tel.stallMs > 0) {
+                    const glyphs = resolveGlyphs(cfg.icons.mode);
+                    // SAFETY: pi seam — intentional unsafe cast, validated at runtime — theme fg
+                    const stallText = theme.fg("warning", `${glyphs.stall}${tel.stallCount}×${formatTurnDuration(tel.stallMs).trim()}`);
+                    if (text) {
+                        // SAFETY: pi seam — intentional unsafe cast, validated at runtime — theme fg for pipe
+                        const pipe = theme.fg("dim", " | ");
+                        text = `${text}${pipe}${stallText}`;
+                    }
+                    else {
+                        text = stallText;
+                    }
+                }
+            }
             editor.setTopRightText(text);
         }
         catch {
@@ -98,15 +142,17 @@ export class LiveBorder {
             return;
         }
         try {
-            // SAFETY: peekLive ?? getLastTelemetry preserves cost after toggle (AGENTS.md gotcha)
+            // SAFETY: peekLive ?? getLastTelemetry preserves cost after toggle (AGENTS.md gotcha) — intentional unsafe cast, validated at runtime
             const live = this.deps.telemetryTracker.peekLive() ??
                 this.deps.telemetryTracker.getLastTelemetry();
             if (!live)
                 return;
-            // SAFETY: pi TUI seam read-only - theme from extension context
+            // SAFETY: pi seam — intentional unsafe cast, validated at runtime — theme from extension context
             const theme = ctx?.ui?.theme;
             const glyphs = resolveGlyphs(cfg.icons.mode);
-            const right = formatTurnTelemetry(live, theme, cfg.telemetry, glyphs);
+            // Stall relocated to top right of tool use with pipe — suppress in bottom telemetry
+            const bottomCfg = { ...cfg.telemetry, stalls: false };
+            const right = formatTurnTelemetry(live, theme, bottomCfg, glyphs);
             if (live.totalMs > 0) {
                 editor.setTelemetryText(right);
                 editor.setBottomLeftText("");
@@ -126,10 +172,11 @@ export class LiveBorder {
             // Deepened via ChromeState: snapshot owns contextUsage + totals derivation behind one seam.
             // Two adapters (footer + border) now share the same snapshot — proves the seam.
             // SAFETY: pi seam - snapshot derivation from extension context
-            const snapshot = createChromeSnapshot(ctx, undefined);
+            const snapshot = createChromeSnapshot(ctx, // SAFETY: pi seam — intentional unsafe cast, validated at runtime
+            undefined);
             // SAFETY: pi seam - theme from extension context
-            const theme = ctx.ui
-                .theme;
+            const theme = ctx.ui // SAFETY: pi seam — intentional unsafe cast, validated at runtime
+                .theme; // SAFETY: pi seam — intentional unsafe cast, validated at runtime
             const glyphs = resolveGlyphs(cfg.icons.mode);
             const isAscii = resolveIconMode(cfg.icons.mode) === "ascii";
             let contextText = "";
@@ -138,15 +185,16 @@ export class LiveBorder {
                 snapshot.contextUsage.contextWindow) {
                 contextText = formatTopContextFromSnapshot(snapshot, theme, glyphs, isAscii, 
                 // SAFETY: intentional unsafe cast — validated at runtime
-                cfg.contextIconBar ??
+                cfg.contextIconBar ?? // SAFETY: pi seam — intentional unsafe cast, validated at runtime
                     false);
             }
             // Tokens line above model info — left aligned, no border; hidden at startup per user request
             let tokensText = "";
             if (cfg.telemetry.enabled && cfg.telemetry.tokens) {
-                // SAFETY: pi TUI seam - telemetry tokens for top tokens line
-                const live = this.deps.telemetryTracker.peekLive() ??
-                    this.deps.telemetryTracker.getLastTelemetry();
+                // Live input/output per agent run (option B) — cumulative across turns in this agent, like live output
+                // SAFETY: pi seam — intentional unsafe cast, validated at runtime — telemetry tracker for top tokens line (agent run)
+                const tracker = this.deps.telemetryTracker;
+                const live = tracker.peekAgentLive() ?? tracker.getLastTelemetry();
                 if (live) {
                     tokensText = formatTelemetryTokens(live, theme, cfg.telemetry, glyphs);
                 }

package/dist/run-activity.js

@@ -142,10 +142,10 @@ export function formatRunActivityTopRight(snap, theme, now) {
     const parts = [];
     // turn
     if (snap.turnNumber !== undefined) {
-        parts.push(theme.fg("accent", `T${snap.turnNumber}`));
+        parts.push(theme.fg("accent", `${snap.turnNumber} turns`));
     }
     else if (snap.phase === "running") {
-        parts.push(theme.fg("accent", `T1`));
+        parts.push(theme.fg("accent", `1 turns`));
     }
     // duration
     const dur = snap.durationMs ??

package/dist/telemetry.js

@@ -50,6 +50,7 @@ export class TurnTelemetryTracker {
     agentStartMs = null;
     agentTurns = [];
     lastTelemetry = null;
+    lastTurnTelemetry = null;
     decayBaseTps = null;
     decayStartMs = null;
     constructor(now = () => performance.now()) {
@@ -58,6 +59,78 @@ export class TurnTelemetryTracker {
     getLastTelemetry() {
         return this.lastTelemetry;
     }
+    getLastTurnTelemetry() {
+        return this.lastTurnTelemetry;
+    }
+    /** Agent-run live: cumulative across turns in current agent, including current live turn. Option B. */
+    peekAgentLive() {
+        // No agent active -> show last agent sum (option B) or current live turn if any
+        if (this.agentStartMs === null) {
+            const live = this.peekLive();
+            if (live)
+                return live;
+            return this.lastTelemetry ?? this.lastTurnTelemetry;
+        }
+        const live = this.peekLive();
+        const hasCompleted = this.agentTurns.length > 0;
+        if (!hasCompleted && !live)
+            return null;
+        let inputTokens = 0;
+        let outputTokens = 0;
+        let totalTokens = 0;
+        let costUsd = 0;
+        let stallMs = 0;
+        let stallCount = 0;
+        let generationMs = 0;
+        let ttftMs = 0;
+        // sum completed turns
+        for (const t of this.agentTurns) {
+            inputTokens += t.inputTokens;
+            outputTokens += t.outputTokens;
+            totalTokens += t.totalTokens;
+            costUsd += t.costUsd;
+            stallMs += t.stallMs;
+            stallCount += t.stallCount;
+            generationMs += t.generationMs;
+        }
+        if (this.agentTurns.length > 0)
+            ttftMs = this.agentTurns[0].ttftMs;
+        if (live) {
+            inputTokens += live.inputTokens;
+            outputTokens += live.outputTokens;
+            totalTokens += live.totalTokens;
+            costUsd += live.costUsd;
+            stallMs += live.stallMs;
+            stallCount += live.stallCount;
+            generationMs += live.generationMs;
+            if (ttftMs === 0)
+                ttftMs = live.ttftMs;
+        }
+        const now = this.now();
+        const totalMs = Math.max(0, now - this.agentStartMs);
+        const measurementMs = outputTokens > 0 && generationMs > 0 ? generationMs : null;
+        const tps = measurementMs === null
+            ? null
+            : round(outputTokens / (measurementMs / 1000), 1);
+        const validCost = Number.isFinite(costUsd) && costUsd > 0;
+        const validTokens = Number.isFinite(totalTokens) && totalTokens > 0;
+        return {
+            tps,
+            ttftMs,
+            totalMs,
+            inputTokens,
+            outputTokens,
+            stallMs,
+            stallCount,
+            rateUsdPerMTokens: validCost && validTokens
+                ? round(costUsd / (totalTokens / 1_000_000), 2)
+                : null,
+            generationMs,
+            totalTokens,
+            costUsd: validCost ? costUsd : 0,
+            measurementMs,
+        };
+    }
     /** Live snapshot while a turn is running — for real-time border refresh. Returns null when idle. */
     peekLive() {
         const turn = this.turn;
@@ -125,7 +198,8 @@ export class TurnTelemetryTracker {
             outputTokens = turn.liveEstimatedTokens;
             totalTokens = Math.max(totalTokens, inputTokens + outputTokens);
         }
-        const measurementMs = genMs > 0 && outputTokens > 0 ? genMs : null;
+        // Require minimum window to avoid spike on tiny genMs (multi-turn fast second turn)
+        const measurementMs = genMs >= 500 && outputTokens > 0 ? genMs : null;
         const tps = measurementMs === null
             ? null
             : round(outputTokens / (measurementMs / 1000), 1);
@@ -268,8 +342,10 @@ export class TurnTelemetryTracker {
         const telemetry = this.endTurn();
         if (telemetry && this.agentStartMs !== null)
             this.agentTurns.push(telemetry);
-        if (telemetry)
+        if (telemetry) {
+            this.lastTurnTelemetry = telemetry;
             this.lastTelemetry = telemetry;
+        }
         return telemetry;
     }
     endTurn() {
@@ -350,10 +426,11 @@ export class TurnTelemetryTracker {
             measurementMs,
         };
         this.lastTelemetry = result;
+        // keep lastTurnTelemetry as last turn's per-turn telemetry (live input stays per-turn, not agent total)
         return result;
     }
 }
-function formatTurnDuration(ms) {
+export function formatTurnDuration(ms) {
     if (ms < 60_000) {
         // TTFT fixed width: 2-digit integer + one decimal -> padded 4 + "s" =5, then overall duration field padded to 7 for telemetry totalMs
         // For TTFT we want 5, for duration we want 7 — caller will pad accordingly, so here return 5 for <60s case
@@ -382,12 +459,6 @@ export function formatTurnTelemetry(telemetry, theme, config, glyphs) {
         const padded = sec.padStart(4, " ");
         parts.push(theme.fg("text", `${padded}s TTFT`));
     }
-    if (config.duration) {
-        // duration fixed width 7 (e.g. " 15m 31s" / " 24h 21m" / "   5.0s")
-        const raw = formatTurnDuration(telemetry.totalMs);
-        const padded = raw.padStart(7, " ");
-        parts.push(theme.fg("success", `${padded}`));
-    }
     if (config.stalls && telemetry.stallMs > 0) {
         parts.push(theme.fg("warning", `${g.stall}${telemetry.stallCount}×${formatTurnDuration(telemetry.stallMs).trim()}`));
     }

package/package.json

@@ -18,7 +18,7 @@
     "@earendil-works/pi-coding-agent": "*",
     "@earendil-works/pi-tui": "*"
   },
-  "version": "0.4.0",
+  "version": "0.6.0",
   "main": "./dist/index.js",
   "files": [
     "dist",

package/src/chrome-state.ts

@@ -91,7 +91,7 @@ export function formatContextBar(
       ? cacheHitRate
       : 0;
   const cacheText = `${glyphs.cacheHit} ${rate.toFixed(1)}%`;
-  return `${base} ${theme.fg("dim", "|")} ${theme.fg(cacheHitColor(rate), cacheText)}`;
+  return `${theme.fg(cacheHitColor(rate), cacheText)} ${theme.fg("dim", "|")} ${base}`;
 }
 
 /** Border adapter helper — one call from snapshot + theme/glyphs. */
@@ -139,7 +139,7 @@ export function createChromeSnapshot(
 ): ChromeSnapshot {
   const cwd =
     ctx?.sessionManager?.getCwd?.() ??
-    // SAFETY: pi seam
+    // SAFETY: pi seam — intentional unsafe cast, validated at runtime
     (ctx as unknown as { cwd?: string })?.cwd ?? // SAFETY: pi seam — intentional unsafe cast, validated at runtime
     process.cwd();
   const sessionName = ctx?.sessionManager?.getSessionName?.();

package/src/color-policy.ts

@@ -8,11 +8,19 @@ export function stressColor(value: number, warn = 70, danger = 90): ThemeColor {
 }
 
 export function contextUsageColor(pct: number): ThemeColor {
-  // 25% 50% 75% thresholds — transit from dimmed (low) to highlight (high)
-  // for intuitive quota status: dim (<25) → accent (25-50) → warning (50-75) → error (≥75)
-  if (pct >= 75) return "error";
-  if (pct >= 50) return "warning";
-  if (pct >= 25) return "accent";
+  // 12.5 / 25 / 50 quotas — four urgency tiers, increasingly aggressive as context fills.
+  // 0 – 12.5%  dim      — plenty of headroom, visually quiet.
+  // 12.5 – 25% accent   — first nudge, noticeable but calm.
+  // 25 – 50%   warning  — half consumed, needs attention.
+  // 50 – 100%  error     — critical, about to run out.
+  // Uses theme semantic tokens (dim/accent/warning/error) so the progression
+  // respects the active theme and remains legible on light/dark/custom palettes.
+  // A fixed hex palette (e.g. grey→sky→amber→red) would be more vivid but
+  // would ignore the user's theme and can clash with light backgrounds —
+  // semantic tokens keep the "aggressive" ordering while staying theme-coherent.
+  if (pct >= 50) return "error";
+  if (pct >= 25) return "warning";
+  if (pct >= 12.5) return "accent";
   return "dim";
 }
 

package/src/live-border.ts

@@ -18,7 +18,11 @@ import {
 import { resolveGlyphs, resolveIconMode } from "./icons.js";
 import { formatRunActivityTopRight } from "./run-activity.js";
 import type { RunActivityTracker } from "./run-activity.js";
-import { formatTelemetryTokens, formatTurnTelemetry } from "./telemetry.js";
+import {
+  formatTelemetryTokens,
+  formatTurnDuration,
+  formatTurnTelemetry,
+} from "./telemetry.js";
 import type { TurnTelemetry } from "./telemetry.js";
 import type { TurnTelemetryTracker } from "./telemetry.js";
 import type { ThemeConfig } from "./config.js";
@@ -37,11 +41,33 @@ export interface LiveBorderDeps {
 
 export class LiveBorder {
   private timer: ReturnType<typeof setInterval> | null = null;
+  private lastRenderMs = 0;
+  private pendingRender: ReturnType<typeof setTimeout> | null = null;
 
   constructor(private readonly deps: LiveBorderDeps) {}
 
   /** Coalesced render: top (run-activity) + bottom (telemetry) + context bar → editor. */
   render(): void {
+    const now = Date.now();
+    if (now - this.lastRenderMs < REFRESH_MS) {
+      if (this.pendingRender === null) {
+        const delay = REFRESH_MS - (now - this.lastRenderMs);
+        this.pendingRender = setTimeout(() => {
+          this.pendingRender = null;
+          this.lastRenderMs = Date.now();
+          this.doRender();
+        }, delay);
+        // SAFETY: pi TUI seam - timer unref is optional NodeJS API
+        const t = this.pendingRender as unknown as { unref?: () => void }; // SAFETY: pi seam — intentional unsafe cast, validated at runtime
+        if (typeof t.unref === "function") t.unref();
+      }
+      return;
+    }
+    this.lastRenderMs = now;
+    this.doRender();
+  }
+
+  private doRender(): void {
     this.refreshTopBorder();
     this.refreshLiveTelemetry();
     this.refreshContextBar();
@@ -57,9 +83,7 @@ export class LiveBorder {
     this.timer = setInterval(() => {
       try {
         if (this.deps.runActivityTracker.isRunning()) {
-          this.refreshTopBorder();
-          this.refreshLiveTelemetry();
-          this.refreshContextBar();
+          this.render();
         } else {
           this.refreshContextBar();
         }
@@ -69,11 +93,15 @@ export class LiveBorder {
     }, REFRESH_MS);
     // don't block process exit
     // SAFETY: pi TUI seam - timer unref is optional NodeJS API
-    const t = this.timer as unknown as { unref?: () => void };
+    const t = this.timer as unknown as { unref?: () => void }; // SAFETY: pi seam — intentional unsafe cast, validated at runtime
     if (typeof t.unref === "function") t.unref();
   }
 
   stopTick(): void {
+    if (this.pendingRender !== null) {
+      clearTimeout(this.pendingRender);
+      this.pendingRender = null;
+    }
     if (this.timer !== null) {
       clearInterval(this.timer);
       this.timer = null;
@@ -89,14 +117,43 @@ export class LiveBorder {
   private refreshTopBorder(): void {
     const editor = this.deps.getEditor();
     const ctx = this.deps.getCtx();
+    const cfg = this.deps.getConfig();
     if (!editor || !ctx) return;
     try {
-      // SAFETY: theme is live pi TUI theme read at render time
+      // SAFETY: theme is live pi TUI theme read at render time — intentional unsafe cast, validated at runtime
       const theme = (
         ctx.ui as unknown as { theme: { fg(s: string, t: string): string } }
-      ).theme; // SAFETY: pi seam
+      ).theme; // SAFETY: pi seam — intentional unsafe cast, validated at runtime
       const snap = this.deps.runActivityTracker.getSnapshot();
-      const text = formatRunActivityTopRight(snap, theme as never);
+      let text = formatRunActivityTopRight(snap, theme as never);
+      // Relocate stall to the right of tool use with pipe separator — agent-run live (option B), not bottom telemetry
+      if (cfg.telemetry.enabled && cfg.telemetry.stalls) {
+        // SAFETY: pi seam — intentional unsafe cast, validated at runtime — telemetry tracker for stall (agent run, option B)
+        const tracker = this.deps.telemetryTracker as unknown as {
+          peekAgentLive(): import("./telemetry.js").TurnTelemetry | null;
+          getLastTelemetry(): import("./telemetry.js").TurnTelemetry | null;
+        };
+        const tel = tracker.peekAgentLive() ?? tracker.getLastTelemetry();
+        if (tel && tel.stallMs > 0) {
+          const glyphs = resolveGlyphs(cfg.icons.mode);
+          // SAFETY: pi seam — intentional unsafe cast, validated at runtime — theme fg
+          const stallText = (
+            theme as unknown as { fg: (s: string, t: string) => string }
+          ).fg(
+            "warning",
+            `${glyphs.stall}${tel.stallCount}×${formatTurnDuration(tel.stallMs).trim()}`,
+          );
+          if (text) {
+            // SAFETY: pi seam — intentional unsafe cast, validated at runtime — theme fg for pipe
+            const pipe = (
+              theme as unknown as { fg: (s: string, t: string) => string }
+            ).fg("dim", " | ");
+            text = `${text}${pipe}${stallText}`;
+          } else {
+            text = stallText;
+          }
+        }
+      }
       editor.setTopRightText(text);
     } catch {
       // SAFETY: best-effort UI, ignore recoverable error
@@ -118,18 +175,20 @@ export class LiveBorder {
       return;
     }
     try {
-      // SAFETY: peekLive ?? getLastTelemetry preserves cost after toggle (AGENTS.md gotcha)
+      // SAFETY: peekLive ?? getLastTelemetry preserves cost after toggle (AGENTS.md gotcha) — intentional unsafe cast, validated at runtime
       const live =
         this.deps.telemetryTracker.peekLive() ??
         this.deps.telemetryTracker.getLastTelemetry();
       if (!live) return;
-      // SAFETY: pi TUI seam read-only - theme from extension context
+      // SAFETY: pi seam — intentional unsafe cast, validated at runtime — theme from extension context
       const theme = (ctx as unknown as { ui?: { theme?: unknown } })?.ui?.theme;
       const glyphs = resolveGlyphs(cfg.icons.mode);
+      // Stall relocated to top right of tool use with pipe — suppress in bottom telemetry
+      const bottomCfg = { ...cfg.telemetry, stalls: false };
       const right = formatTurnTelemetry(
         live,
         theme as never,
-        cfg.telemetry,
+        bottomCfg as never,
         glyphs as never,
       );
       if (live.totalMs > 0) {
@@ -151,12 +210,12 @@ export class LiveBorder {
       // Two adapters (footer + border) now share the same snapshot — proves the seam.
       // SAFETY: pi seam - snapshot derivation from extension context
       const snapshot = createChromeSnapshot(
-        ctx as unknown as Parameters<typeof createChromeSnapshot>[0],
+        ctx as unknown as Parameters<typeof createChromeSnapshot>[0], // SAFETY: pi seam — intentional unsafe cast, validated at runtime
         undefined,
       );
       // SAFETY: pi seam - theme from extension context
-      const theme = (ctx as unknown as { ui: { theme: unknown } }).ui
-        .theme as unknown as never;
+      const theme = (ctx as unknown as { ui: { theme: unknown } }).ui // SAFETY: pi seam — intentional unsafe cast, validated at runtime
+        .theme as unknown as never; // SAFETY: pi seam — intentional unsafe cast, validated at runtime
       const glyphs = resolveGlyphs(cfg.icons.mode);
       const isAscii = resolveIconMode(cfg.icons.mode) === "ascii";
       let contextText = "";
@@ -171,17 +230,21 @@ export class LiveBorder {
           glyphs,
           isAscii,
           // SAFETY: intentional unsafe cast — validated at runtime
-          (cfg as unknown as { contextIconBar?: boolean }).contextIconBar ??
+          (cfg as unknown as { contextIconBar?: boolean }).contextIconBar ?? // SAFETY: pi seam — intentional unsafe cast, validated at runtime
             false,
         );
       }
       // Tokens line above model info — left aligned, no border; hidden at startup per user request
       let tokensText = "";
       if (cfg.telemetry.enabled && cfg.telemetry.tokens) {
-        // SAFETY: pi TUI seam - telemetry tokens for top tokens line
-        const live =
-          this.deps.telemetryTracker.peekLive() ??
-          this.deps.telemetryTracker.getLastTelemetry();
+        // Live input/output per agent run (option B) — cumulative across turns in this agent, like live output
+        // SAFETY: pi seam — intentional unsafe cast, validated at runtime — telemetry tracker for top tokens line (agent run)
+        const tracker = this.deps.telemetryTracker as unknown as {
+          // SAFETY: pi seam — intentional unsafe cast, validated at runtime
+          peekAgentLive(): import("./telemetry.js").TurnTelemetry | null;
+          getLastTelemetry(): import("./telemetry.js").TurnTelemetry | null;
+        };
+        const live = tracker.peekAgentLive() ?? tracker.getLastTelemetry();
         if (live) {
           tokensText = formatTelemetryTokens(
             live,

package/src/run-activity.ts

@@ -186,9 +186,9 @@ export function formatRunActivityTopRight(
 
   // turn
   if (snap.turnNumber !== undefined) {
-    parts.push(theme.fg("accent", `T${snap.turnNumber}`));
+    parts.push(theme.fg("accent", `${snap.turnNumber} turns`));
   } else if (snap.phase === "running") {
-    parts.push(theme.fg("accent", `T1`));
+    parts.push(theme.fg("accent", `1 turns`));
   }
 
   // duration

package/src/telemetry.ts

@@ -150,9 +150,9 @@ export class TurnTelemetryTracker {
   private agentStartMs: number | null = null;
   private agentTurns: TurnTelemetry[] = [];
   private lastTelemetry: TurnTelemetry | null = null;
+  private lastTurnTelemetry: TurnTelemetry | null = null;
   private decayBaseTps: number | null = null;
   private decayStartMs: number | null = null;
-
   constructor(now: () => number = () => performance.now()) {
     this.now = now;
   }
@@ -160,6 +160,79 @@ export class TurnTelemetryTracker {
   getLastTelemetry(): TurnTelemetry | null {
     return this.lastTelemetry;
   }
+
+  getLastTurnTelemetry(): TurnTelemetry | null {
+    return this.lastTurnTelemetry;
+  }
+
+  /** Agent-run live: cumulative across turns in current agent, including current live turn. Option B. */
+  peekAgentLive(): TurnTelemetry | null {
+    // No agent active -> show last agent sum (option B) or current live turn if any
+    if (this.agentStartMs === null) {
+      const live = this.peekLive();
+      if (live) return live;
+      return this.lastTelemetry ?? this.lastTurnTelemetry;
+    }
+    const live = this.peekLive();
+    const hasCompleted = this.agentTurns.length > 0;
+    if (!hasCompleted && !live) return null;
+    let inputTokens = 0;
+    let outputTokens = 0;
+    let totalTokens = 0;
+    let costUsd = 0;
+    let stallMs = 0;
+    let stallCount = 0;
+    let generationMs = 0;
+    let ttftMs = 0;
+    // sum completed turns
+    for (const t of this.agentTurns) {
+      inputTokens += t.inputTokens;
+      outputTokens += t.outputTokens;
+      totalTokens += t.totalTokens;
+      costUsd += t.costUsd;
+      stallMs += t.stallMs;
+      stallCount += t.stallCount;
+      generationMs += t.generationMs;
+    }
+    if (this.agentTurns.length > 0) ttftMs = this.agentTurns[0]!.ttftMs;
+    if (live) {
+      inputTokens += live.inputTokens;
+      outputTokens += live.outputTokens;
+      totalTokens += live.totalTokens;
+      costUsd += live.costUsd;
+      stallMs += live.stallMs;
+      stallCount += live.stallCount;
+      generationMs += live.generationMs;
+      if (ttftMs === 0) ttftMs = live.ttftMs;
+    }
+    const now = this.now();
+    const totalMs = Math.max(0, now - this.agentStartMs);
+    const measurementMs =
+      outputTokens > 0 && generationMs > 0 ? generationMs : null;
+    const tps =
+      measurementMs === null
+        ? null
+        : round(outputTokens / (measurementMs / 1000), 1);
+    const validCost = Number.isFinite(costUsd) && costUsd > 0;
+    const validTokens = Number.isFinite(totalTokens) && totalTokens > 0;
+    return {
+      tps,
+      ttftMs,
+      totalMs,
+      inputTokens,
+      outputTokens,
+      stallMs,
+      stallCount,
+      rateUsdPerMTokens:
+        validCost && validTokens
+          ? round(costUsd / (totalTokens / 1_000_000), 2)
+          : null,
+      generationMs,
+      totalTokens,
+      costUsd: validCost ? costUsd : 0,
+      measurementMs,
+    };
+  }
   /** Live snapshot while a turn is running — for real-time border refresh. Returns null when idle. */
   peekLive(): TurnTelemetry | null {
     const turn = this.turn;
@@ -176,7 +249,8 @@ export class TurnTelemetryTracker {
           decayedTps = null;
         } else {
           // exponential decay, half-life ~5s (exp(-elapsed/7200) => half at ~5s ln2*7200≈5000)
-          const decayed = this.decayBaseTps * Math.exp(-elapsedSinceDecay / 7200);
+          const decayed =
+            this.decayBaseTps * Math.exp(-elapsedSinceDecay / 7200);
           if (decayed >= 0.05) decayedTps = round(decayed, 1);
         }
       }
@@ -225,7 +299,8 @@ export class TurnTelemetryTracker {
       outputTokens = turn.liveEstimatedTokens;
       totalTokens = Math.max(totalTokens, inputTokens + outputTokens);
     }
-    const measurementMs = genMs > 0 && outputTokens > 0 ? genMs : null;
+    // Require minimum window to avoid spike on tiny genMs (multi-turn fast second turn)
+    const measurementMs = genMs >= 500 && outputTokens > 0 ? genMs : null;
     const tps =
       measurementMs === null
         ? null
@@ -384,7 +459,10 @@ export class TurnTelemetryTracker {
     const telemetry = this.endTurn();
     if (telemetry && this.agentStartMs !== null)
       this.agentTurns.push(telemetry);
-    if (telemetry) this.lastTelemetry = telemetry;
+    if (telemetry) {
+      this.lastTurnTelemetry = telemetry;
+      this.lastTelemetry = telemetry;
+    }
     return telemetry;
   }
 
@@ -476,11 +554,12 @@ export class TurnTelemetryTracker {
       measurementMs,
     };
     this.lastTelemetry = result;
+    // keep lastTurnTelemetry as last turn's per-turn telemetry (live input stays per-turn, not agent total)
     return result;
   }
 }
 
-function formatTurnDuration(ms: number): string {
+export function formatTurnDuration(ms: number): string {
   if (ms < 60_000) {
     // TTFT fixed width: 2-digit integer + one decimal -> padded 4 + "s" =5, then overall duration field padded to 7 for telemetry totalMs
     // For TTFT we want 5, for duration we want 7 — caller will pad accordingly, so here return 5 for <60s case
@@ -533,12 +612,6 @@ export function formatTurnTelemetry(
     const padded = sec.padStart(4, " ");
     parts.push(theme.fg("text", `${padded}s TTFT`));
   }
-  if (config.duration) {
-    // duration fixed width 7 (e.g. " 15m 31s" / " 24h 21m" / "   5.0s")
-    const raw = formatTurnDuration(telemetry.totalMs);
-    const padded = raw.padStart(7, " ");
-    parts.push(theme.fg("success", `${padded}`));
-  }
   if (config.stalls && telemetry.stallMs > 0) {
     parts.push(
       theme.fg(