@quandev104/pi-style 0.2.0 → 0.2.2

package/dist/extensions/pi-style.js

@@ -1,4 +1,5 @@
 // extension-src/pi-style/shared/ansi.ts
+import { visibleWidth as tuiVisibleWidth } from "@earendil-works/pi-tui";
 function isFinal(byte) {
   return byte >= "@" && byte <= "~";
 }
@@ -82,7 +83,7 @@ function stripAnsi(value) {
   return output;
 }
 function visibleWidth(value) {
-  return [...stripAnsi(value)].length;
+  return tuiVisibleWidth(value);
 }
 function resetAnsi(value) {
   return `${value}\x1B[0m`;
@@ -93,9 +94,10 @@ function fitAnsiWidth(value, width, ellipsis = "\u2026") {
 function truncateAnsi(value, width, ellipsis = "\u2026") {
   if (width <= 0) return "";
   if (visibleWidth(value) <= width) return resetAnsi(value);
+  const ellipsisWidth = visibleWidth(ellipsis);
   let output = "";
   let visible = 0;
-  for (let i = 0; i < value.length && visible < width - visibleWidth(ellipsis); i++) {
+  for (let i = 0; i < value.length && visible < width - ellipsisWidth; i++) {
     if (value.charCodeAt(i) === 27) {
       const start = i;
       i++;
@@ -183,9 +185,9 @@ function rgbTo256(r, g, b) {
 function colorEscapes(mode, hex, kind) {
   if (!isHexColor(hex)) return void 0;
   const { r, g, b } = hexToRgb(hex);
-  const cacheKey = `${mode}:${kind}:${hex}`;
+  const cacheKey2 = `${mode}:${kind}:${hex}`;
   const cache = kind === "fg" ? fgEscapeCache : bgEscapeCache;
-  let cached = cache.get(cacheKey);
+  let cached = cache.get(cacheKey2);
   if (!cached) {
     if (mode === "256color") {
       const idx = rgbTo256(r, g, b);
@@ -199,7 +201,7 @@ function colorEscapes(mode, hex, kind) {
         suffix: kind === "fg" ? "\x1B[39m" : RESET_BACKGROUND
       };
     }
-    cache.set(cacheKey, cached);
+    cache.set(cacheKey2, cached);
   }
   return cached;
 }
@@ -233,7 +235,7 @@ function getElapsedMs(result) {
 // extension-src/pi-style/shared/render-budget.ts
 import {
   truncateToWidth as tuiTruncateToWidth,
-  visibleWidth as tuiVisibleWidth,
+  visibleWidth as tuiVisibleWidth2,
   wrapTextWithAnsi
 } from "@earendil-works/pi-tui";
 var MAX_RENDER_LINE_CHARS = 2e3;
@@ -411,8 +413,8 @@ function truncatePrintableAscii(text, width, ellipsis = TRUNCATE_ELLIPSIS) {
   const targetWidth = Math.max(0, width - ellipsisWidth);
   return { text: `${text.slice(0, targetWidth)}${ellipsis}`, visibleWidth: targetWidth + ellipsisWidth };
 }
-function truncateSgrAscii(text, width, ellipsis, visibleWidth5) {
-  if (visibleWidth5 <= width) return { text, visibleWidth: visibleWidth5 };
+function truncateSgrAscii(text, width, ellipsis, visibleWidth4) {
+  if (visibleWidth4 <= width) return { text, visibleWidth: visibleWidth4 };
   const ellipsisWidth = knownEllipsisWidth(ellipsis);
   if (ellipsisWidth === null) return null;
   if (ellipsisWidth >= width) return truncatePrintableAscii(ellipsis, width, "");
@@ -455,7 +457,7 @@ function safeVisibleWidth(text) {
   const fastWidth = knownVisibleWidth(text);
   if (fastWidth) return fastWidth.visibleWidth;
   if (text === TRUNCATE_ELLIPSIS) return 1;
-  return tuiVisibleWidth(text);
+  return tuiVisibleWidth2(text);
 }
 function safeTruncateToWidth(text, maxWidth, ellipsis = "...", pad = false) {
   const width = Math.floor(maxWidth);
@@ -684,10 +686,10 @@ function setFullTheme(theme, force = false) {
   const themeName = resolveThemeName(theme);
   const sourcePath = resolveThemeSourcePath(theme);
   if (!themeName && !sourcePath) return;
-  const cacheKey = sourcePath || themeName;
-  if (!force && cacheKey === cachedThemeName && (cachedExtras !== null || cachedVars !== null || cachedColors !== null || cachedThemeExport !== null))
+  const cacheKey2 = sourcePath || themeName;
+  if (!force && cacheKey2 === cachedThemeName && (cachedExtras !== null || cachedVars !== null || cachedColors !== null || cachedThemeExport !== null))
     return;
-  cachedThemeName = cacheKey;
+  cachedThemeName = cacheKey2;
   const result = readThemeDiscoveryFromPath(sourcePath) ?? (themeName ? discoverThemeExtras(themeName) : null);
   cachedExtras = result?.extras ?? null;
   cachedVars = result?.vars ?? null;
@@ -703,6 +705,15 @@ function getThemeExtra(_theme, key) {
 }
 
 // extension-src/pi-style/shared/box.ts
+var THEME_CACHE_KEYS = /* @__PURE__ */ new WeakMap();
+var nextThemeCacheKey = 1;
+function themeCacheKey(theme) {
+  const cached = THEME_CACHE_KEYS.get(theme);
+  if (cached !== void 0) return cached;
+  const created = nextThemeCacheKey++;
+  THEME_CACHE_KEYS.set(theme, created);
+  return created;
+}
 function shortenPath(path) {
   const home = homedir2();
   if (path.startsWith(home)) return `~${path.slice(home.length)}`;
@@ -734,12 +745,48 @@ function getTextOutput(result) {
   });
   return textBlocks.map((contentBlock) => String(contentBlock.text ?? "")).join("\n").replace(/\r/g, "");
 }
+var WORD_CP_UNKNOWN = 255;
+var WORD_CP_SURROGATE = 254;
+var WORD_CP_CLASS = new Uint8Array(65536).fill(WORD_CP_UNKNOWN);
+for (let code = 48; code <= 57; code++) WORD_CP_CLASS[code] = 1;
+for (let code = 65; code <= 90; code++) WORD_CP_CLASS[code] = 1;
+for (let code = 97; code <= 122; code++) WORD_CP_CLASS[code] = 1;
+WORD_CP_CLASS[39] = 1;
+WORD_CP_CLASS[45] = 1;
+WORD_CP_CLASS[95] = 1;
+WORD_CP_CLASS.fill(WORD_CP_SURROGATE, 55296, 57344);
+var NON_ASCII_WORD_RE = /[\p{L}\p{N}]/u;
+var ASTRAL_WORD_CP = /* @__PURE__ */ new Map();
+function astralWordMembership(codePoint) {
+  const cached = ASTRAL_WORD_CP.get(codePoint);
+  if (cached !== void 0) return cached;
+  const membership = NON_ASCII_WORD_RE.test(String.fromCodePoint(codePoint)) ? 1 : 0;
+  ASTRAL_WORD_CP.set(codePoint, membership);
+  return membership;
+}
 function countWords(text) {
+  const len = text.length;
   let count = 0;
-  let inWord = false;
-  for (const char of text) {
-    const isWord = /[\p{L}\p{N}_'-]/u.test(char);
-    if (isWord && !inWord) count++;
+  let inWord = 0;
+  for (let i = 0; i < len; i++) {
+    const code = text.charCodeAt(i);
+    const membership = WORD_CP_CLASS[code] ?? 0;
+    let isWord;
+    if (membership <= 1) {
+      isWord = membership;
+    } else if (membership === WORD_CP_SURROGATE) {
+      const next = i + 1 < len ? text.charCodeAt(i + 1) : 0;
+      if (code <= 56319 && next >= 56320 && next <= 57343) {
+        isWord = astralWordMembership(65536 + (code - 55296 << 10) + (next - 56320));
+        i++;
+      } else {
+        isWord = 0;
+      }
+    } else {
+      isWord = NON_ASCII_WORD_RE.test(String.fromCharCode(code)) ? 1 : 0;
+      WORD_CP_CLASS[code] = isWord;
+    }
+    count += isWord & (inWord ^ 1);
     inWord = isWord;
   }
   return count;
@@ -868,7 +915,7 @@ function formatBoxedRunningStatus(theme, elapsedMs) {
 function dimLine(text) {
   return `\x1B[2m${text}\x1B[22m`;
 }
-function boxFrameText(theme, text) {
+function boxFrameText(_theme, text) {
   return dimLine(text);
 }
 function boxBorder(theme, left, right, width) {
@@ -1445,6 +1492,18 @@ function setToolsRenderConfig(config) {
 function getToolsRenderConfig() {
   return sessionToolsConfig;
 }
+function getToolsRenderCacheSignature() {
+  return [
+    sessionToolsConfig.maxCollapsedLines,
+    sessionToolsConfig.maxExpandedLines,
+    sessionToolsConfig.dimOutput ? 1 : 0,
+    sessionToolsConfig.showElapsed ? 1 : 0,
+    sessionToolsConfig.batchOpenGlyph,
+    sessionToolsConfig.nerdFonts ? 1 : 0,
+    sessionToolsConfig.collapseAfterTurn ? 1 : 0,
+    sessionToolsConfig.collapseMutatingTools ? 1 : 0
+  ].join("|");
+}
 var STARTED_AT_KEY = "__piStyleStartedAt";
 var ENDED_AT_KEY = "__piStyleEndedAt";
 var RESULT_SEEN_KEY = "__piStyleResultSeen";
@@ -1472,27 +1531,35 @@ function markResultSeen(state) {
   if (!state || typeof state !== "object") return;
   state[RESULT_SEEN_KEY] = true;
 }
-var tickerStates = /* @__PURE__ */ new Set();
+var tickerEntries = /* @__PURE__ */ new Map();
+var sharedTickerHandle;
+function ensureSharedTicker() {
+  if (sharedTickerHandle !== void 0 || tickerEntries.size === 0) return;
+  sharedTickerHandle = setInterval(() => {
+    for (const { invalidate } of tickerEntries.values()) invalidate();
+  }, 1e3);
+}
+function stopSharedTickerIfIdle() {
+  if (sharedTickerHandle === void 0 || tickerEntries.size > 0) return;
+  clearInterval(sharedTickerHandle);
+  sharedTickerHandle = void 0;
+}
 function startElapsedTicker(state, invalidate) {
   if (!state || typeof state !== "object") return;
-  if (state[TICKER_KEY] !== void 0) return;
-  state[TICKER_KEY] = setInterval(() => invalidate(), 1e3);
-  tickerStates.add(state);
+  state[TICKER_KEY] = true;
+  tickerEntries.set(state, { invalidate });
+  ensureSharedTicker();
 }
 function stopElapsedTicker(state) {
   if (!state || typeof state !== "object") return;
-  const handle = state[TICKER_KEY];
-  if (handle !== void 0) clearInterval(handle);
   delete state[TICKER_KEY];
-  tickerStates.delete(state);
+  tickerEntries.delete(state);
+  stopSharedTickerIfIdle();
 }
 function stopAllElapsedTickers() {
-  for (const state of tickerStates) {
-    const handle = state[TICKER_KEY];
-    if (handle !== void 0) clearInterval(handle);
-    delete state[TICKER_KEY];
-  }
-  tickerStates.clear();
+  for (const state of tickerEntries.keys()) delete state[TICKER_KEY];
+  tickerEntries.clear();
+  stopSharedTickerIfIdle();
 }
 
 // extension-src/pi-style/features/tools/boxed/batch.ts
@@ -1528,6 +1595,7 @@ function createBatch(meta, leaderId, detail, opts = {}) {
     leaderId,
     startedAt: performance.now(),
     closed: false,
+    revision: 0,
     members: [
       {
         toolCallId: leaderId,
@@ -1543,14 +1611,20 @@ function createBatch(meta, leaderId, detail, opts = {}) {
   batchByCallId.set(leaderId, batch);
   return batch;
 }
+function bumpBatchRevision(batch) {
+  batch.revision++;
+  delete batch.renderCache;
+}
 function registerBatchCall(meta, detail, context, opts = {}) {
   const existing = batchByCallId.get(context.toolCallId);
   if (existing) {
     const member2 = existing.members.find((entry) => entry.toolCallId === context.toolCallId);
     if (member2) {
+      const changed = member2.detail !== detail || member2.pattern !== opts.pattern || member2.pathLabel !== opts.pathLabel;
       member2.detail = detail;
       if (opts.pattern !== void 0) member2.pattern = opts.pattern;
       if (opts.pathLabel !== void 0) member2.pathLabel = opts.pathLabel;
+      if (changed) bumpBatchRevision(existing);
     }
     return { batch: existing, isLeader: existing.leaderId === context.toolCallId };
   }
@@ -1569,6 +1643,7 @@ function registerBatchCall(meta, detail, context, opts = {}) {
   };
   current.members.push(member);
   batchByCallId.set(context.toolCallId, current);
+  bumpBatchRevision(current);
   return { batch: current, isLeader: false };
 }
 function registerBatchResult(meta, data, context) {
@@ -1576,17 +1651,28 @@ function registerBatchResult(meta, data, context) {
   if (!batch || batch.meta.toolName !== meta.toolName) return { batch: void 0, isLeader: false };
   const member = batch.members.find((entry) => entry.toolCallId === context.toolCallId);
   if (member) {
-    member.status = data.isPartial ? "running" : "done";
-    member.isError = !data.isPartial && data.isError;
+    const nextStatus = data.isPartial ? "running" : "done";
+    const nextIsError = !data.isPartial && data.isError;
+    const changed = member.status !== nextStatus || member.isError !== nextIsError || member.errorText !== (nextIsError ? data.errorText : void 0) || data.entries !== void 0 && member.outputEntries !== data.entries;
+    member.status = nextStatus;
+    member.isError = nextIsError;
     if (member.isError && data.errorText !== void 0) member.errorText = data.errorText;
     else delete member.errorText;
     if (data.entries !== void 0) member.outputEntries = data.entries;
+    if (changed) bumpBatchRevision(batch);
   }
   if (batch.completedAt === void 0 && batch.members.every((entry) => entry.status === "done")) {
     batch.completedAt = performance.now();
+    bumpBatchRevision(batch);
   }
   return { batch, isLeader: batch.leaderId === context.toolCallId };
 }
+function hasFinalBatchOutput(toolCallId) {
+  const batch = batchByCallId.get(toolCallId);
+  if (!batch) return false;
+  const member = batch.members.find((entry) => entry.toolCallId === toolCallId);
+  return member !== void 0 && member.outputEntries !== void 0 && member.status === "done" && !member.isError;
+}
 function batchStatus(batch) {
   let done = 0;
   let failed = 0;
@@ -1776,9 +1862,16 @@ function renderBatchPanelLines(theme, batch, status, width) {
 function renderBatchAwareCall(theme, batch) {
   return {
     invalidate() {
+      delete batch.renderCache;
     },
     render(width) {
-      return renderBatchPanelLines(theme, batch, batchStatus(batch), width);
+      const status = batchStatus(batch);
+      if (!status.allDone) return renderBatchPanelLines(theme, batch, status, width);
+      const cacheKey2 = [themeCacheKey(theme), getToolsRenderCacheSignature(), width, batch.revision].join("|");
+      if (batch.renderCache?.key === cacheKey2) return batch.renderCache.lines;
+      const lines = renderBatchPanelLines(theme, batch, status, width);
+      batch.renderCache = { key: cacheKey2, lines };
+      return lines;
     }
   };
 }
@@ -1939,6 +2032,9 @@ function invalidateTurnMembers(turn) {
     }
   }
 }
+function releaseTurnInvalidators(turn) {
+  for (const member of turn.members) invalidateByCallId.delete(member.toolCallId);
+}
 function noteTurnMemberElapsed(toolCallId, elapsedMs) {
   if (elapsedMs === void 0) return;
   const entry = memberByCallId.get(toolCallId);
@@ -2830,7 +2926,9 @@ import { getLanguageFromPath } from "@earendil-works/pi-coding-agent";
 import { highlightCode } from "@earendil-works/pi-coding-agent";
 var ESC2 = "\x1B";
 var BG_ANSI_PATTERN = new RegExp(`${ESC2}\\[(?:4\\d|10\\d|48;5;\\d{1,3}|48;2;\\d{1,3};\\d{1,3};\\d{1,3}|49)m`, "g");
+var ANSI_SGR_PATTERN = new RegExp(`${ESC2}\\[([0-9;]*)m`, "g");
 var CONTROL_CHARS = "\0-\b\v\f-\x7F";
+var CONTROL_CHARS_PATTERN = new RegExp(`[${CONTROL_CHARS}]`, "g");
 var ADD_ROW_BACKGROUND_MIX_RATIO = 0.24;
 var REMOVE_ROW_BACKGROUND_MIX_RATIO = 0.12;
 var ADD_INLINE_EMPHASIS_MIX_RATIO = 0.44;
@@ -2922,7 +3020,7 @@ function resolveDiffPalette(theme) {
 }
 function keepBackgroundAcrossResets(text, rowBgAnsi) {
   if (!text) return text;
-  return text.replace(new RegExp(`${ESC2}\\[([0-9;]*)m`, "g"), (sequence, rawCodes) => {
+  return text.replace(ANSI_SGR_PATTERN, (sequence, rawCodes) => {
     const split = String(rawCodes ?? "").split(";").filter(Boolean);
     const codes = split.length > 0 ? split : ["0"];
     const hasGlobalReset = codes.includes("0");
@@ -2964,7 +3062,7 @@ function applyBackgroundToVisibleRange(ansiText, start, end, backgroundAnsi, res
   return output;
 }
 function sanitizeSingleLineText(value) {
-  return value.replace(/\r/g, "").replace(/\n/g, "").replace(new RegExp(`[${CONTROL_CHARS}]`, "g"), "");
+  return value.replace(/\r/g, "").replace(/\n/g, "").replace(CONTROL_CHARS_PATTERN, "");
 }
 function stripInlineBreaksPreserveAnsi(value) {
   return value.replace(/\r/g, "").replace(/\n/g, "");
@@ -3561,6 +3659,101 @@ var AdaptiveDiffComponent = class {
   }
 };
 
+// extension-src/pi-style/features/tools/boxed/shared.ts
+function pendingFlag(context) {
+  return Boolean(context.isPartial);
+}
+function displayPath(rawPath, context) {
+  const path = String(rawPath ?? "");
+  if (!path) return "(unknown)";
+  return shortenPath(resolveRelativePath(path, context.cwd));
+}
+function pathRangeDetail(rawPath, offset, limit, context) {
+  const path = displayPath(rawPath, context);
+  let range = "";
+  if (offset !== void 0 || limit !== void 0) {
+    const start = offset ?? 1;
+    const end = limit !== void 0 ? Number(start) + Number(limit) - 1 : "";
+    range = `:${start}${end ? `-${end}` : ""}`;
+  }
+  return path ? `${path}${range}` : "(unknown)";
+}
+function compactCall(theme, toolName, detailLine, options) {
+  return renderCompactBoxedToolCall(theme, toolName, detailLine, {
+    widthKey: boxedToolWidthKey(toolName, options.detailKey),
+    state: options.context.state,
+    isError: Boolean(options.context.isError),
+    isPartial: Boolean(options.context.isPartial),
+    isPending: pendingFlag(options.context),
+    running: Boolean(options.context.executionStarted)
+  });
+}
+function noteExecutionStart(context) {
+  recordExecutionStarted(context.state, context.executionStarted);
+}
+function noteBoxedCallState(context) {
+  if (!context.executionStarted) return;
+  if (context.isPartial) startElapsedTicker(context.state, context.invalidate);
+  else {
+    recordExecutionEnded(context.state);
+    stopElapsedTicker(context.state);
+  }
+}
+function noteBoxedResultPhase(context, isPartial) {
+  const firstResultPass = !isResultSeen(context.state);
+  markResultSeen(context.state);
+  if (isPartial) startElapsedTicker(context.state, context.invalidate);
+  else {
+    recordExecutionEnded(context.state);
+    stopElapsedTicker(context.state);
+  }
+  return firstResultPass;
+}
+function stateElapsedMs(context) {
+  return getStateElapsedMs(context.state);
+}
+function compactFooterWithState(theme, result, context, options = {}) {
+  const elapsedMs = stateElapsedMs(context);
+  return renderCompactBoxedFooter(theme, result, {
+    state: context.state,
+    isError: Boolean(options.isError ?? context.isError),
+    isPartial: Boolean(options.isPartial ?? context.isPartial),
+    ...elapsedMs === void 0 ? {} : { elapsedMs }
+  });
+}
+function resultFooterLines(theme, result, context, extraParts = []) {
+  return [formatBoxedFooter(theme, result, extraParts, stateElapsedMs(context))];
+}
+var CACHE_KEY_LONG_PART_THRESHOLD = 64;
+function fnv1aHex(text) {
+  let hash = 2166136261;
+  for (let i = 0; i < text.length; i++) {
+    hash ^= text.charCodeAt(i);
+    hash = Math.imul(hash, 16777619) >>> 0;
+  }
+  return hash.toString(16).padStart(8, "0");
+}
+function boundedCacheKeyPart(part) {
+  if (typeof part !== "string" || part.length <= CACHE_KEY_LONG_PART_THRESHOLD) return part;
+  return `${part.length}:${fnv1aHex(part)}`;
+}
+function getRenderCacheKey(prefix, theme, ...parts) {
+  const pieces = [prefix, themeCacheKey(theme), getToolsRenderCacheSignature()];
+  for (const part of parts) pieces.push(boundedCacheKeyPart(part));
+  return pieces.join("|");
+}
+function memoizedStateComponent(state, slot, key, build) {
+  if (!state || typeof state !== "object") return build();
+  const cached = state[slot];
+  if (cached && cached.key === key) return cached.component;
+  const component = build();
+  state[slot] = { key, component };
+  return component;
+}
+function clearFooterState(context) {
+  clearCompactBoxedFooter(context.state);
+}
+
 // extension-src/pi-style/features/tools/boxed/git.ts
 var GIT_SHORT_STATUS_FLAGS = /* @__PURE__ */ new Set(["-s", "--short", "--porcelain"]);
 var GIT_DIFF_FORMAT_REJECT = /* @__PURE__ */ new Set([
@@ -4867,6 +5060,34 @@ function binaryBodyLine(theme, status) {
 }
 function renderGitDiffResult(theme, parsed, options, context) {
   const expanded = Boolean(options.expanded);
+  let totalAdditions = 0;
+  let totalRemovals = 0;
+  const sigParts = [];
+  for (const file of parsed.files) {
+    totalAdditions += file.additions;
+    totalRemovals += file.removals;
+    sigParts.push(
+      `${file.path}:${file.body.length}:${file.additions}:${file.removals}:${file.binary ? 1 : 0}:${file.status ?? ""}`
+    );
+  }
+  const sig = sigParts.join(";").slice(0, 2048);
+  return memoizedStateComponent(
+    context.state,
+    "__piStyleGitDiffResult",
+    getRenderCacheKey(
+      "git-diff-result",
+      theme,
+      String(parsed.show),
+      String(expanded),
+      parsed.files.length,
+      totalAdditions,
+      totalRemovals,
+      sig
+    ),
+    () => buildGitDiffResultComponent(theme, parsed, expanded, context)
+  );
+}
+function buildGitDiffResultComponent(theme, parsed, expanded, context) {
   const elapsedMs = getStateElapsedMs(context.state);
   const fileCount = parsed.files.length;
   const footerParts = [];
@@ -4938,75 +5159,6 @@ function renderGitDiffResult(theme, parsed, options, context) {
   };
 }
 
-// extension-src/pi-style/features/tools/boxed/shared.ts
-function pendingFlag(context) {
-  return Boolean(context.isPartial);
-}
-function displayPath(rawPath, context) {
-  const path = String(rawPath ?? "");
-  if (!path) return "(unknown)";
-  return shortenPath(resolveRelativePath(path, context.cwd));
-}
-function pathRangeDetail(rawPath, offset, limit, context) {
-  const path = displayPath(rawPath, context);
-  let range = "";
-  if (offset !== void 0 || limit !== void 0) {
-    const start = offset ?? 1;
-    const end = limit !== void 0 ? Number(start) + Number(limit) - 1 : "";
-    range = `:${start}${end ? `-${end}` : ""}`;
-  }
-  return path ? `${path}${range}` : "(unknown)";
-}
-function compactCall(theme, toolName, detailLine, options) {
-  return renderCompactBoxedToolCall(theme, toolName, detailLine, {
-    widthKey: boxedToolWidthKey(toolName, options.detailKey),
-    state: options.context.state,
-    isError: Boolean(options.context.isError),
-    isPartial: Boolean(options.context.isPartial),
-    isPending: pendingFlag(options.context),
-    running: Boolean(options.context.executionStarted)
-  });
-}
-function noteExecutionStart(context) {
-  recordExecutionStarted(context.state, context.executionStarted);
-}
-function noteBoxedCallState(context) {
-  if (!context.executionStarted) return;
-  if (context.isPartial) startElapsedTicker(context.state, context.invalidate);
-  else {
-    recordExecutionEnded(context.state);
-    stopElapsedTicker(context.state);
-  }
-}
-function noteBoxedResultPhase(context, isPartial) {
-  const firstResultPass = !isResultSeen(context.state);
-  markResultSeen(context.state);
-  if (isPartial) startElapsedTicker(context.state, context.invalidate);
-  else {
-    recordExecutionEnded(context.state);
-    stopElapsedTicker(context.state);
-  }
-  return firstResultPass;
-}
-function stateElapsedMs(context) {
-  return getStateElapsedMs(context.state);
-}
-function compactFooterWithState(theme, result, context, options = {}) {
-  const elapsedMs = stateElapsedMs(context);
-  return renderCompactBoxedFooter(theme, result, {
-    state: context.state,
-    isError: Boolean(options.isError ?? context.isError),
-    isPartial: Boolean(options.isPartial ?? context.isPartial),
-    ...elapsedMs === void 0 ? {} : { elapsedMs }
-  });
-}
-function resultFooterLines(theme, result, context, extraParts = []) {
-  return [formatBoxedFooter(theme, result, extraParts, stateElapsedMs(context))];
-}
-function clearFooterState(context) {
-  clearCompactBoxedFooter(context.state);
-}
-
 // extension-src/pi-style/features/tools/boxed/bash.ts
 var MAX_LINE_CHARS = 2e3;
 var ESC3 = "\x1B";
@@ -5107,6 +5259,25 @@ function countNewlines(text, from, to) {
   }
   return count;
 }
+function findBackwardLineStart(text, need, end = text.length) {
+  let found = 0;
+  for (let i = end - 1; i >= 0; i--) {
+    if (text.charCodeAt(i) === 10 && ++found >= need) return i + 1;
+  }
+  return 0;
+}
+function isOutputWhitespaceCode(code) {
+  if (code === 32 || code >= 9 && code <= 13) return true;
+  if (code === 133 || code === 160 || code === 5760) return true;
+  if (code >= 8192 && code <= 8202) return true;
+  return code === 8232 || code === 8233 || code === 8239 || code === 8287 || code === 12288 || code === 65279;
+}
+function lastVisibleEnd(text) {
+  for (let i = text.length - 1; i >= 0; i--) {
+    if (!isOutputWhitespaceCode(text.charCodeAt(i))) return i + 1;
+  }
+  return 0;
+}
 function stripBashToolNoticeLines(text) {
   const filteredLines = text.replace(/\r/g, "").split("\n").filter((line) => !BASH_TOOL_NOTICE_PATTERN.test(line.trim()));
   return filteredLines.join("\n").replace(/\n{3,}/g, "\n\n").trimEnd();
@@ -5237,8 +5408,10 @@ function bashBodyComponent(preview, emptyLines) {
   };
 }
 function renderBashStreamingResult(theme, raw, options, context) {
-  const body = stripBashToolNoticeLines(stripAnsi(raw));
-  const hasOutput = body.trim().length > 0;
+  const contentEnd = lastVisibleEnd(raw);
+  const hasOutput = contentEnd > 0;
+  const tailStart = hasOutput ? findBackwardLineStart(raw, getToolsRenderConfig().maxCollapsedLines + 10, contentEnd) : 0;
+  const body = stripBashToolNoticeLines(stripAnsi(raw.slice(tailStart, contentEnd)));
   const elapsed = getStateElapsedMs(context.state);
   const emptyLines = [theme.fg("dim", "No output received yet")];
   if (!hasOutput && isInteractiveCommand(context?.args?.command) && (elapsed ?? 0) >= 1e3) {
@@ -5269,17 +5442,7 @@ function renderBashFinalResult(theme, raw, options, context) {
   const referenceLines = rawCommand.split("\n").map((line, index) => `${index === 0 ? "$ " : "> "}${line}`);
   if (!options.expanded) {
     const scanLines = getToolsRenderConfig().maxCollapsedLines + 10;
-    let nlCount = 0;
-    let tailStart = 0;
-    for (let i = statusStripped.length - 1; i >= 0; i--) {
-      if (statusStripped.charCodeAt(i) === 10) {
-        nlCount++;
-        if (nlCount >= scanLines) {
-          tailStart = i + 1;
-          break;
-        }
-      }
-    }
+    const tailStart = findBackwardLineStart(statusStripped, scanLines);
     const tail = stripBashToolNoticeLines(stripAnsi(statusStripped.slice(tailStart)));
     const totalLinesBefore = tailStart > 0 ? countNewlines(statusStripped, 0, tailStart) : 0;
     const preview2 = createBashResultPreview(theme, tail, options, outputColor);
@@ -5322,11 +5485,11 @@ var EMPTY_BASH_RESULT = Object.freeze({
   }
 });
 function createBashResultPreview(theme, text, options, color) {
-  let cacheKey = "";
+  let cacheKey2 = "";
   let cacheLines = null;
   return {
     invalidate() {
-      cacheKey = "";
+      cacheKey2 = "";
       cacheLines = null;
     },
     render(width) {
@@ -5334,29 +5497,19 @@ function createBashResultPreview(theme, text, options, color) {
       const cfg = getToolsRenderConfig();
       const expanded = Boolean(options.expanded);
       const cacheId = `${bodyWidth}|${expanded ? 1 : 0}|${cfg.maxExpandedLines}|${cfg.dimOutput ? 1 : 0}`;
-      if (cacheLines && cacheKey === cacheId) return cacheLines;
+      if (cacheLines && cacheKey2 === cacheId) return cacheLines;
       if (!expanded) {
         const needed = cfg.maxCollapsedLines;
-        let totalNewlines = 0;
-        let scanFrom = 0;
-        for (let i = text.length - 1; i >= 0; i--) {
-          if (text.charCodeAt(i) === 10) {
-            totalNewlines++;
-            if (totalNewlines === needed) {
-              scanFrom = i + 1;
-              break;
-            }
-          }
-        }
+        const scanFrom = findBackwardLineStart(text, needed);
         if (text.length === 0) {
-          cacheKey = cacheId;
+          cacheKey2 = cacheId;
           cacheLines = [];
           return cacheLines;
         }
         const tail = replaceTabs(text.slice(scanFrom)).replace(/\r/g, "");
         const shownLines = tail ? tail.split("\n").map((l) => clampLineLength(l)) : [];
         if (shownLines.length === 0) {
-          cacheKey = cacheId;
+          cacheKey2 = cacheId;
           cacheLines = [];
           return cacheLines;
         }
@@ -5365,31 +5518,31 @@ function createBashResultPreview(theme, text, options, color) {
           if (color === "error") return formatToolOutputLine(theme, truncated, "error");
           return cfg.dimOutput ? formatToolOutputLine(theme, truncated) : formatToolOutputLine(theme, truncated, "text");
         });
-        cacheKey = cacheId;
+        cacheKey2 = cacheId;
         cacheLines = truncatedShown;
         return cacheLines;
       }
       const normalized = replaceTabs(text);
-      const logicalLines = normalized.split("\n").map((l) => clampLineLength(l));
-      const hasOutput = !(logicalLines.length === 1 && logicalLines[0] === "");
+      const rawLines = normalized.split("\n");
+      const totalLines = rawLines.length;
+      const hasOutput = !(totalLines === 1 && rawLines[0] === "");
       if (!hasOutput) {
-        cacheKey = cacheId;
+        cacheKey2 = cacheId;
         cacheLines = [];
         return cacheLines;
       }
-      const truncatedLines = logicalLines.map((line) => safeTruncateToWidth(line, bodyWidth, "\u2026"));
-      const expandedLines = truncatedLines.length === 1 && truncatedLines[0] === "" ? [] : truncatedLines;
       const applyColor = (l) => color === "error" ? formatToolOutputLine(theme, l, "error") : cfg.dimOutput ? formatToolOutputLine(theme, l) : formatToolOutputLine(theme, l, "text");
-      if (cfg.maxExpandedLines > 0 && expandedLines.length > cfg.maxExpandedLines) {
-        const truncated = expandedLines.slice(-cfg.maxExpandedLines).map(applyColor);
-        const remaining = expandedLines.length - cfg.maxExpandedLines;
+      const renderRawLine = (line) => safeTruncateToWidth(clampLineLength(line), bodyWidth, "\u2026");
+      if (cfg.maxExpandedLines > 0 && totalLines > cfg.maxExpandedLines) {
+        const truncated = rawLines.slice(-cfg.maxExpandedLines).map((line) => applyColor(renderRawLine(line)));
+        const remaining = totalLines - cfg.maxExpandedLines;
         truncated.unshift(theme.fg("dim", `\u2026 ${remaining} earlier lines`));
-        cacheKey = cacheId;
+        cacheKey2 = cacheId;
         cacheLines = truncated;
         return cacheLines;
       }
-      cacheKey = cacheId;
-      cacheLines = expandedLines.map(applyColor);
+      cacheKey2 = cacheId;
+      cacheLines = rawLines.map((line) => applyColor(renderRawLine(line)));
       return cacheLines;
     }
   };
@@ -5556,6 +5709,7 @@ function isGitDiffClass(cls) {
 function isGitActionClass(cls) {
   return !isBashTreeClass(cls) && cls.kind === "action";
 }
+var PARTIAL_REPARSE_THRESHOLD = 4096;
 function parseSemanticOutput(cls, output) {
   if (isBashTreeClass(cls)) return parseBashTreeOutput(cls, output);
   if (isGhClass(cls)) return parseGhOutput(cls, output);
@@ -5602,27 +5756,35 @@ function renderSemanticPanel(theme, toolCallId, context) {
     },
     render(width) {
       if (!state) return [];
-      if (state.fallback) {
-        return renderBoxedBashCall(
-          theme,
-          state.command.split("\n"),
-          context,
-          bashWidthKey(state.command, context?.args?.timeout)
-        ).render(width);
-      }
-      if (isBashTreeClass(state.cls)) {
-        const treeState = { cls: state.cls };
-        if (state.parsed !== void 0) treeState.parsed = state.parsed;
-        return renderBashTreeLines(theme, treeState, width);
-      }
-      if (isGhClass(state.cls)) {
-        const ghState = { cls: state.cls };
-        if (state.parsed !== void 0) ghState.parsed = state.parsed;
-        return renderGhCardLines(theme, ghState, width);
-      }
-      const gitState = { cls: state.cls };
-      if (state.parsed !== void 0) gitState.parsed = state.parsed;
-      return renderGitCardLines(theme, gitState, width);
+      const renderFresh = () => {
+        if (state.fallback) {
+          return renderBoxedBashCall(
+            theme,
+            state.command.split("\n"),
+            context,
+            bashWidthKey(state.command, context?.args?.timeout)
+          ).render(width);
+        }
+        if (isBashTreeClass(state.cls)) {
+          const treeState = { cls: state.cls };
+          if (state.parsed !== void 0) treeState.parsed = state.parsed;
+          return renderBashTreeLines(theme, treeState, width);
+        }
+        if (isGhClass(state.cls)) {
+          const ghState = { cls: state.cls };
+          if (state.parsed !== void 0) ghState.parsed = state.parsed;
+          return renderGhCardLines(theme, ghState, width);
+        }
+        const gitState = { cls: state.cls };
+        if (state.parsed !== void 0) gitState.parsed = state.parsed;
+        return renderGitCardLines(theme, gitState, width);
+      };
+      if (!state.finished) return renderFresh();
+      const cacheKey2 = [themeCacheKey(theme), getToolsRenderCacheSignature(), width, state.revision].join("|");
+      if (state.renderCache?.key === cacheKey2) return state.renderCache.lines;
+      const lines = renderFresh();
+      state.renderCache = { key: cacheKey2, lines };
+      return lines;
     }
   };
 }
@@ -5631,7 +5793,27 @@ var bashTool = {
     noteExecutionStart(context);
     const cls = classifyBashSemantic(String(args?.command ?? ""));
     if (cls) {
-      semanticStates.set(context.toolCallId, { cls, command: String(args?.command ?? "") });
+      const command = String(args?.command ?? "");
+      const existing = semanticStates.get(context.toolCallId);
+      if (existing) {
+        if (existing.command !== command || existing.cls.kind !== cls.kind) {
+          delete existing.parsed;
+          delete existing.fallback;
+          existing.finished = false;
+          existing.revision++;
+          delete existing.renderCache;
+          delete existing.lastParsedLength;
+        }
+        existing.command = command;
+        existing.cls = cls;
+      } else {
+        semanticStates.set(context.toolCallId, {
+          cls,
+          command,
+          finished: false,
+          revision: 0
+        });
+      }
       return renderSemanticPanel(theme, context.toolCallId, context);
     }
     noteBoxedCallState(context);
@@ -5649,15 +5831,24 @@ var bashTool = {
       }
       if (!options.isPartial || isBashTreeClass(cls)) {
         const output = stripBashToolNoticeLines(stripAnsi(getTextOutput(result)));
-        const parsed = parseSemanticOutput(cls, output);
         const state = semanticStates.get(context.toolCallId);
+        const shouldParse = !options.isPartial || state === void 0 || state.lastParsedLength === void 0 || output.length - state.lastParsedLength >= PARTIAL_REPARSE_THRESHOLD;
+        const parsed = shouldParse ? parseSemanticOutput(cls, output) : void 0;
         if (parsed) {
-          if (state) state.parsed = parsed;
-          else
+          if (state) {
+            state.parsed = parsed;
+            state.finished = !options.isPartial;
+            state.revision++;
+            delete state.renderCache;
+            if (options.isPartial) state.lastParsedLength = output.length;
+          } else
             semanticStates.set(context.toolCallId, {
               cls,
               command: String(context?.args?.command ?? ""),
-              parsed
+              parsed,
+              finished: !options.isPartial,
+              revision: 0,
+              ...options.isPartial ? { lastParsedLength: output.length } : {}
             });
           if (isGitDiffClass(cls)) {
             return renderGitDiffResult(theme, parsed, options, context);
@@ -5667,7 +5858,18 @@ var bashTool = {
           }
           return EMPTY_BASH_TREE_RESULT;
         }
-        if (state) state.fallback = true;
+        if (!shouldParse) {
+          if (state?.parsed !== void 0) return EMPTY_BASH_TREE_RESULT;
+        }
+        if (shouldParse) {
+          if (state) {
+            state.fallback = true;
+            state.finished = !options.isPartial;
+            state.revision++;
+            delete state.renderCache;
+            if (options.isPartial) state.lastParsedLength = output.length;
+          }
+        }
       }
     } else if (options.isPartial) {
       startElapsedTicker(context.state, context.invalidate);
@@ -5680,7 +5882,20 @@ var bashTool = {
       if (firstResultPass) return EMPTY_BASH_RESULT;
       return renderBashStreamingResult(theme, raw, options, context);
     }
-    return renderBashFinalResult(theme, raw, options, context);
+    return memoizedStateComponent(
+      context.state,
+      "__piStyleBashFinalResult",
+      getRenderCacheKey(
+        "bash-final-result",
+        theme,
+        Boolean(options.expanded),
+        Boolean(context.isError),
+        String(context?.args?.command ?? ""),
+        raw,
+        getStateElapsedMs(context.state) ?? ""
+      ),
+      () => renderBashFinalResult(theme, raw, options, context)
+    );
   }
 };
 
@@ -5752,28 +5967,42 @@ var editTool = {
     const message = firstText(result.content);
     const argPath = String(context?.args?.path ?? context?.args?.file_path ?? "");
     const sourcePath = details?.path ?? (argPath || extractEditedPath(message));
-    const language = sourcePath ? getLanguageFromPath2(sourcePath) : void 0;
-    const rows = buildSplitRows(diff);
     const expanded = options.expanded;
-    const shouldHighlight = Boolean(language) && diff.length <= MAX_HIGHLIGHT_DIFF_CHARS && rows.length <= MAX_HIGHLIGHT_DIFF_ROWS;
     const stats = countDiffStats(diff);
-    const maxRows = expanded ? 160 : 36;
-    const diffView = new AdaptiveDiffComponent(theme, rows, maxRows, shouldHighlight ? language : void 0);
-    const expandHint2 = !expanded && diffView.hasCollapsed() ? "Ctrl+O more" : void 0;
-    return renderBoxedToolResult(
-      theme,
-      {
-        render(width) {
-          return diffView.render(width);
-        },
-        invalidate() {
-          diffView.invalidate();
-        }
-      },
-      {
-        dividerLabel: diffDividerLabel2(theme, stats),
-        ...expandHint2 ? { dividerRightLabel: expandHint2 } : {},
-        footerLines: [editDiffFooter(theme, result, context, stats)]
+    return memoizedStateComponent(
+      context.state,
+      "__piStyleEditDiffResult",
+      getRenderCacheKey(
+        "edit-diff-result",
+        theme,
+        Boolean(expanded),
+        diff,
+        sourcePath ?? "",
+        editDiffFooter(theme, result, context, stats)
+      ),
+      () => {
+        const language = sourcePath ? getLanguageFromPath2(sourcePath) : void 0;
+        const rows = buildSplitRows(diff);
+        const shouldHighlight = Boolean(language) && diff.length <= MAX_HIGHLIGHT_DIFF_CHARS && rows.length <= MAX_HIGHLIGHT_DIFF_ROWS;
+        const maxRows = expanded ? 160 : 36;
+        const diffView = new AdaptiveDiffComponent(theme, rows, maxRows, shouldHighlight ? language : void 0);
+        const expandHint2 = !expanded && diffView.hasCollapsed() ? "Ctrl+O more" : void 0;
+        return renderBoxedToolResult(
+          theme,
+          {
+            render(width) {
+              return diffView.render(width);
+            },
+            invalidate() {
+              diffView.invalidate();
+            }
+          },
+          {
+            dividerLabel: diffDividerLabel2(theme, stats),
+            ...expandHint2 ? { dividerRightLabel: expandHint2 } : {},
+            footerLines: [editDiffFooter(theme, result, context, stats)]
+          }
+        );
       }
     );
   }
@@ -5879,14 +6108,16 @@ var findTool = {
     return renderBatchAwareCall(theme, batch);
   },
   result(result, options, _theme, context) {
-    const output = stripAnsi(getTextOutput(result)).trimEnd();
-    const entries = context.isError ? void 0 : parseFindOutput(output);
+    const isError = Boolean(context.isError);
+    const settled = !options.isPartial && !isError && hasFinalBatchOutput(context.toolCallId);
+    const output = settled ? "" : stripAnsi(getTextOutput(result)).trimEnd();
+    const entries = settled || isError ? void 0 : parseFindOutput(output);
     registerBatchResult(
       FIND_META,
       {
         isPartial: Boolean(options.isPartial),
-        isError: Boolean(context.isError),
-        errorText: context.isError ? output || void 0 : void 0,
+        isError,
+        errorText: isError ? output || void 0 : void 0,
         ...entries !== void 0 ? { entries } : {}
       },
       context
@@ -5997,14 +6228,19 @@ var grepTool = {
     return renderGrepPanel(theme, context.toolCallId);
   },
   result(result, options, _theme, context) {
-    const output = stripAnsi(getTextOutput(result)).trimEnd();
     const isError = Boolean(context.isError);
+    const isPartial = Boolean(options.isPartial);
+    const state = grepPanels.get(context.toolCallId);
+    if (!isPartial && !isError && state !== void 0 && state.matches !== void 0 && !state.isPartial) {
+      return EMPTY_GREP_RESULT;
+    }
+    const output = stripAnsi(getTextOutput(result)).trimEnd();
     const matches = isError ? [] : parseGrepOutput(output);
     registerGrepResult(context.toolCallId, {
       matches,
       isError,
       errorText: isError ? output || void 0 : void 0,
-      isPartial: Boolean(options.isPartial)
+      isPartial
     });
     return EMPTY_GREP_RESULT;
   }
@@ -6031,14 +6267,16 @@ var lsTool = {
     return renderBatchAwareCall(theme, batch);
   },
   result(result, options, _theme, context) {
-    const output = stripAnsi(getTextOutput(result)).trimEnd();
-    const entries = context.isError ? void 0 : parseLsOutput(output);
+    const isError = Boolean(context.isError);
+    const settled = !options.isPartial && !isError && hasFinalBatchOutput(context.toolCallId);
+    const output = settled ? "" : stripAnsi(getTextOutput(result)).trimEnd();
+    const entries = settled || isError ? void 0 : parseLsOutput(output);
     registerBatchResult(
       LIST_META,
       {
         isPartial: Boolean(options.isPartial),
-        isError: Boolean(context.isError),
-        errorText: context.isError ? output || void 0 : void 0,
+        isError,
+        errorText: isError ? output || void 0 : void 0,
         ...entries !== void 0 ? { entries } : {}
       },
       context
@@ -6162,29 +6400,44 @@ function renderQuickEditResult(_toolName, result, options, theme, context, confi
       footerLines: [quickEditFooter(theme, context)]
     });
   }
-  const rows = buildSplitRows(diff);
   const expanded = options.expanded;
   const argPath = String(context?.args?.path ?? "");
-  const language = argPath ? getLanguageFromPath3(argPath) : void 0;
-  const shouldHighlight = Boolean(language) && diff.length <= MAX_HIGHLIGHT_DIFF_CHARS2 && rows.length <= MAX_HIGHLIGHT_DIFF_ROWS2;
   const stats = countDiffStats(diff);
-  const maxRows = expanded ? 160 : 36;
-  const diffView = new AdaptiveDiffComponent(theme, rows, maxRows, shouldHighlight ? language : void 0);
-  const expandHint2 = !expanded && diffView.hasCollapsed() ? "Ctrl+O more" : void 0;
-  return renderBoxedToolResult(
-    theme,
-    {
-      render(width) {
-        return diffView.render(width);
-      },
-      invalidate() {
-        diffView.invalidate();
-      }
-    },
-    {
-      dividerLabel: quickEditDividerLabel(theme, stats),
-      ...expandHint2 ? { dividerRightLabel: expandHint2 } : {},
-      footerLines: [quickEditDiffFooter(theme, result, context, stats)]
+  return memoizedStateComponent(
+    context.state,
+    "__piStyleQuickEditDiffResult",
+    getRenderCacheKey(
+      "quick-edit-diff-result",
+      theme,
+      config.toolLabel,
+      Boolean(expanded),
+      diff,
+      argPath,
+      quickEditDiffFooter(theme, result, context, stats)
+    ),
+    () => {
+      const rows = buildSplitRows(diff);
+      const language = argPath ? getLanguageFromPath3(argPath) : void 0;
+      const shouldHighlight = Boolean(language) && diff.length <= MAX_HIGHLIGHT_DIFF_CHARS2 && rows.length <= MAX_HIGHLIGHT_DIFF_ROWS2;
+      const maxRows = expanded ? 160 : 36;
+      const diffView = new AdaptiveDiffComponent(theme, rows, maxRows, shouldHighlight ? language : void 0);
+      const expandHint2 = !expanded && diffView.hasCollapsed() ? "Ctrl+O more" : void 0;
+      return renderBoxedToolResult(
+        theme,
+        {
+          render(width) {
+            return diffView.render(width);
+          },
+          invalidate() {
+            diffView.invalidate();
+          }
+        },
+        {
+          dividerLabel: quickEditDividerLabel(theme, stats),
+          ...expandHint2 ? { dividerRightLabel: expandHint2 } : {},
+          footerLines: [quickEditDiffFooter(theme, result, context, stats)]
+        }
+      );
     }
   );
 }
@@ -6231,13 +6484,13 @@ var readTool = {
     return renderBatchAwareCall(theme, batch);
   },
   result(result, options, _theme, context) {
-    const output = stripAnsi(getTextOutput(result)).trimEnd();
+    const errorText = context.isError ? stripAnsi(getTextOutput(result)).trimEnd() || void 0 : void 0;
     registerBatchResult(
       READ_META,
       {
         isPartial: Boolean(options.isPartial),
         isError: Boolean(context.isError),
-        errorText: context.isError ? output || void 0 : void 0
+        errorText
       },
       context
     );
@@ -7941,11 +8194,10 @@ function createBuiltinSegments() {
       content: snapshot.sessionStartedAt === void 0 ? "" : theme.apply("time", formatElapsed2(Date.now() - snapshot.sessionStartedAt)),
       compactContent: snapshot.sessionStartedAt === void 0 ? "" : theme.apply("time", formatElapsed2(Date.now() - snapshot.sessionStartedAt))
     })),
-    segment("time", 20, ({ theme }) => ({
-      visible: true,
-      content: theme.apply("time", (/* @__PURE__ */ new Date()).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" })),
-      compactContent: theme.apply("time", (/* @__PURE__ */ new Date()).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }))
-    })),
+    segment("time", 20, ({ theme }) => {
+      const text = theme.apply("time", clockTime());
+      return { visible: true, content: text, compactContent: text };
+    }),
     segment("hostname", 20, ({ snapshot, theme }) => ({
       visible: Boolean(snapshot.hostname),
       content: theme.apply("muted", snapshot.hostname ?? "")
@@ -7963,6 +8215,15 @@ function createBuiltinSegments() {
   ];
   return new Map(segments.map((item) => [item.id, item]));
 }
+var clockCache;
+function clockTime() {
+  const now = /* @__PURE__ */ new Date();
+  const minuteKey = now.getHours() * 60 + now.getMinutes();
+  if (clockCache?.minuteKey !== minuteKey) {
+    clockCache = { minuteKey, value: now.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }) };
+  }
+  return clockCache.value;
+}
 var CONTEXT_BAR_WIDTH = 10;
 function contextBar(percent, width = CONTEXT_BAR_WIDTH) {
   const filled = Math.max(0, Math.min(width, Math.round(percent / 100 * width)));
@@ -8148,7 +8409,24 @@ function colorPrefixFor(active, config, noColor, token) {
   }
   return "";
 }
+function envKeyFor(env) {
+  return `${env.PI_STYLE_NERD_FONTS ?? ""}\0${env.GHOSTTY_RESOURCES_DIR ? "1" : "0"}\0${env.TERM_PROGRAM ?? ""}`;
+}
+var glyphModeCache = /* @__PURE__ */ new WeakMap();
 function detectGlyphMode(config, env = {}) {
+  let byEnv = glyphModeCache.get(config);
+  if (!byEnv) {
+    byEnv = /* @__PURE__ */ new Map();
+    glyphModeCache.set(config, byEnv);
+  }
+  const envKey = envKeyFor(env);
+  const cached = byEnv.get(envKey);
+  if (cached !== void 0) return cached;
+  const mode = computeGlyphMode(config, env);
+  byEnv.set(envKey, mode);
+  return mode;
+}
+function computeGlyphMode(config, env) {
   if (env.PI_STYLE_NERD_FONTS === "1") return "nerd";
   if (env.PI_STYLE_NERD_FONTS === "0") return "unicode";
   if (config.theme.nerdFonts === "on") return "nerd";
@@ -8163,7 +8441,14 @@ function detectGlyphMode(config, env = {}) {
 function resolveTheme(active, config, env = {}) {
   const noColor = Object.hasOwn(env, "NO_COLOR") && env.NO_COLOR !== "" && config.theme.colors.colorOverride !== "on";
   const mode = config.preset === "ascii" ? "ascii" : detectGlyphMode(config, env);
-  const color = (token) => colorPrefixFor(active, config, noColor, token);
+  const prefixes = /* @__PURE__ */ new Map();
+  const color = (token) => {
+    const cached = prefixes.get(token);
+    if (cached !== void 0) return cached;
+    const prefix = colorPrefixFor(active, config, noColor, token);
+    prefixes.set(token, prefix);
+    return prefix;
+  };
   return {
     mode,
     noColor,
@@ -8181,9 +8466,13 @@ function resolveTheme(active, config, env = {}) {
 var widthOf = visibleWidth3;
 function widthSafe(value, width) {
   if (width <= 0) return "";
-  const fitted = widthOf(value) > width ? truncateAnsi(value, width, "") : value;
-  const current = widthOf(fitted);
-  return current < width ? fitted + " ".repeat(width - current) : fitted;
+  const measured = widthOf(value);
+  if (measured > width) {
+    const fitted = truncateAnsi(value, width, "");
+    const current = widthOf(fitted);
+    return current < width ? fitted + " ".repeat(width - current) : fitted;
+  }
+  return measured < width ? value + " ".repeat(width - measured) : value;
 }
 function isNativeBorderLine(line) {
   const stripped = stripAnsi(line);
@@ -8253,7 +8542,10 @@ var StyledEditor = class extends CustomEditor {
   fullTheme;
   onSnapshot;
   semantic;
+  /** Set when config changes; invalidate() then rebuilds the (otherwise stable) semantic theme. */
+  semanticDirty = false;
   disposed = false;
+  renderPlanCache;
   constructor(tui, theme, keybindings, options) {
     super(tui, theme, keybindings);
     this.config = options.config;
@@ -8272,7 +8564,7 @@ var StyledEditor = class extends CustomEditor {
   configure(config) {
     if (this.disposed) return;
     this.config = config;
-    this.semantic = semanticTheme(this.piTheme, config);
+    this.semanticDirty = true;
     this.invalidate();
   }
   handleInput(data) {
@@ -8282,62 +8574,27 @@ var StyledEditor = class extends CustomEditor {
   }
   invalidate() {
     super.invalidate();
-    this.semantic = semanticTheme(this.piTheme, this.config);
+    if (this.semanticDirty) {
+      this.semantic = semanticTheme(this.piTheme, this.config);
+      this.semanticDirty = false;
+    }
+    this.renderPlanCache = void 0;
     this.tui.requestRender();
   }
   render(width) {
     if (width <= 0) return [];
-    const nativeLines = super.render(width);
-    const style = this.styleFor(width);
-    if (this.autocompleteState) {
-      const prompt2 = this.prompt();
-      const padding2 = this.paddingFor(width, style);
-      const promptWidth2 = widthOf(prompt2) + 1;
-      const prefix2 = `${" ".repeat(padding2)}${prompt2} `;
-      const continuation2 = " ".repeat(padding2 + promptWidth2);
-      const borderIndex = nativeLines.slice(1).findIndex((line) => isNativeBorderLine(line));
-      const split = borderIndex >= 0 ? borderIndex + 1 : nativeLines.length;
-      const body2 = nativeLines.slice(1, split);
-      const dropdown = nativeLines.slice(split);
-      const border = this.borderFor();
-      const kind2 = this.frameKind(style);
-      const renderWidth2 = width - (kind2 === "rounded" ? 2 : 0);
-      const sideColor = kind2 === "rounded" ? this.borderColorFor() : void 0;
-      const wrap = (line) => kind2 === "rounded" && sideColor ? `${sideColor("\u2502")}${line}${sideColor("\u2502")}` : line;
-      const bashHidden2 = this.bashHiddenCount();
-      const renderedBody2 = body2.map((line, index) => {
-        const source = index === 0 && bashHidden2 > 0 ? stripLeadingVisibleChars(line, bashHidden2) : line;
-        return wrap(widthSafe(`${index === 0 ? prefix2 : continuation2}${source}`, renderWidth2));
-      });
-      const dropdownLines = dropdown.map((line) => wrap(widthSafe(line, renderWidth2)));
-      if (kind2 === "rounded") {
-        return [
-          border(`\u256D${"\u2500".repeat(Math.max(0, width - 2))}\u256E`),
-          ...renderedBody2,
-          ...dropdownLines,
-          border(`\u2570${"\u2500".repeat(Math.max(0, width - 2))}\u256F`)
-        ];
-      }
-      return [border("\u2500".repeat(width)), ...renderedBody2, ...dropdownLines, border("\u2500".repeat(width))];
-    }
-    if (style === "native") return nativeLines.map((line) => widthSafe(line, width));
-    const prompt = this.prompt();
-    const promptWidth = widthOf(prompt) + 1;
-    const padding = this.paddingFor(width, style);
-    const kind = this.frameKind(style);
-    const sideReserve = kind === "rounded" ? 2 : 0;
-    const renderWidth = Math.max(1, width - sideReserve);
-    const innerWidth = Math.max(1, renderWidth - promptWidth - padding * 2);
-    const innerLines = super.render(innerWidth);
+    const plan = this.renderPlan(width);
+    const autocompleteState = this.autocompleteState;
+    if (plan.style === "native") return super.render(width).map((line) => widthSafe(line, width));
+    if (autocompleteState) return this.renderAutocompleteFrame(width, plan);
+    const innerLines = super.render(plan.innerWidth);
     if (innerLines.length === 0) return [];
     const body = innerLines.slice(1, -1);
-    const prefix = `${" ".repeat(padding)}${prompt} `;
-    const continuation = " ".repeat(padding + promptWidth);
     const hint = this.config.editor.hint;
     const showHint = hint !== "" && this.getText() === "";
     const bashHidden = this.bashHiddenCount();
     const renderedBody = body.map((line, index) => {
-      const lead = index === 0 ? prefix : continuation;
+      const lead = index === 0 ? plan.prefix : plan.continuation;
       const source = index === 0 && bashHidden > 0 ? stripLeadingVisibleChars(line, bashHidden) : line;
       let content = `${lead}${source}`;
       if (showHint && index === 0 && line) {
@@ -8346,10 +8603,10 @@ var StyledEditor = class extends CustomEditor {
         if (end < content.length) content = content.slice(0, end);
         content += this.semantic.apply("hint", hint);
       }
-      return widthSafe(content, renderWidth);
+      return widthSafe(content, plan.renderWidth);
     });
-    const metadata = this.metadata(width, style);
-    const framed = this.frame(width, style, renderedBody, metadata);
+    const metadata = this.metadata(width, plan.style);
+    const framed = this.frame(width, plan.style, renderedBody, metadata);
     return framed.map((line) => widthSafe(line, width));
   }
   dispose() {
@@ -8357,6 +8614,59 @@ var StyledEditor = class extends CustomEditor {
     this.disposed = true;
     this.invalidate();
   }
+  renderPlan(width) {
+    const style = this.styleFor(width);
+    const prompt = this.prompt();
+    const kind = this.frameKind(style);
+    const key = `${width}:${style}:${kind}:${prompt}`;
+    if (this.renderPlanCache?.key === key) return this.renderPlanCache.plan;
+    const promptWidth = widthOf(prompt) + 1;
+    const padding = this.paddingFor(width, style);
+    const sideReserve = kind === "rounded" ? 2 : 0;
+    const renderWidth = Math.max(1, width - sideReserve);
+    const innerWidth = Math.max(1, renderWidth - promptWidth - padding * 2);
+    const prefix = `${" ".repeat(padding)}${prompt} `;
+    const continuation = " ".repeat(padding + promptWidth);
+    const plan = {
+      style,
+      kind,
+      prompt,
+      promptWidth,
+      padding,
+      sideReserve,
+      renderWidth,
+      innerWidth,
+      prefix,
+      continuation
+    };
+    this.renderPlanCache = { key, plan };
+    return plan;
+  }
+  renderAutocompleteFrame(width, plan) {
+    const nativeLines = super.render(width);
+    const borderIndex = nativeLines.slice(1).findIndex((line) => isNativeBorderLine(line));
+    const split = borderIndex >= 0 ? borderIndex + 1 : nativeLines.length;
+    const body = nativeLines.slice(1, split);
+    const dropdown = nativeLines.slice(split);
+    const border = this.borderFor();
+    const sideColor = plan.kind === "rounded" ? this.borderColorFor() : void 0;
+    const wrap = (line) => plan.kind === "rounded" && sideColor ? `${sideColor("\u2502")}${line}${sideColor("\u2502")}` : line;
+    const bashHidden = this.bashHiddenCount();
+    const renderedBody = body.map((line, index) => {
+      const source = index === 0 && bashHidden > 0 ? stripLeadingVisibleChars(line, bashHidden) : line;
+      return wrap(widthSafe(`${index === 0 ? plan.prefix : plan.continuation}${source}`, plan.renderWidth));
+    });
+    const dropdownLines = dropdown.map((line) => wrap(widthSafe(line, plan.renderWidth)));
+    if (plan.kind === "rounded") {
+      return [
+        border(`\u256D${"\u2500".repeat(Math.max(0, width - 2))}\u256E`),
+        ...renderedBody,
+        ...dropdownLines,
+        border(`\u2570${"\u2500".repeat(Math.max(0, width - 2))}\u256F`)
+      ];
+    }
+    return [border("\u2500".repeat(width)), ...renderedBody, ...dropdownLines, border("\u2500".repeat(width))];
+  }
   prompt() {
     if (this.isBashMode()) {
       const glyph = this.semantic.glyph("bashPrompt");
@@ -8598,13 +8908,13 @@ function resolveAccentRgb(resolved) {
 function styledLogoLines(resolved) {
   const accent = resolveAccentRgb(resolved);
   if (!accent) return [...PI_LOGO_LINES];
-  const cacheKey = `${resolved.color("accent")}|${resolved.mode}`;
-  if (cacheKey === logoGradientCacheKey && logoGradientCacheLines) return logoGradientCacheLines;
+  const cacheKey2 = `${resolved.color("accent")}|${resolved.mode}`;
+  if (cacheKey2 === logoGradientCacheKey && logoGradientCacheLines) return logoGradientCacheLines;
   const palette = buildLogoPalette(accent);
   logoGradientCacheLines = PI_LOGO_LINES.map(
     (line, rowIndex) => renderLogoGradientLine(line, palette, rowIndex * LOGO_ROW_PHASE_STEP)
   );
-  logoGradientCacheKey = cacheKey;
+  logoGradientCacheKey = cacheKey2;
   return logoGradientCacheLines;
 }
 function compactLogoHeader(resolved, details, width) {
@@ -9051,9 +9361,6 @@ function uniqueLayout(layout) {
 function renderGroup(items, separator, padding) {
   return items.map((item) => item.content).filter(Boolean).join(`${padding}${separator}${padding}`);
 }
-function widthOf2(items, separator, padding) {
-  return visibleWidth(renderGroup(items, separator, padding));
-}
 function renderStatus(layout, snapshot, width, options) {
   if (width <= 0) return { primary: "", lines: [], visibleSegments: [] };
   const separator = options.separator ?? "\u2502";
@@ -9068,7 +9375,15 @@ function renderStatus(layout, snapshot, width, options) {
     try {
       const result = segment2.render(context);
       if (!result.visible || !result.content) continue;
-      candidates.set(id, { id, segment: segment2, result, content: result.content, compact: false, moved: false });
+      candidates.set(id, {
+        id,
+        segment: segment2,
+        result,
+        content: result.content,
+        contentWidth: visibleWidth(result.content),
+        compact: false,
+        moved: false
+      });
     } catch {
     }
   }
@@ -9078,13 +9393,28 @@ function renderStatus(layout, snapshot, width, options) {
   const secondary = normalized.secondary.map((id) => candidates.get(id)).filter((candidate) => candidate !== void 0);
   const visible = [];
   const overflow = [];
+  const gapWidth = visibleWidth(`${padding}${separator}${padding}`);
+  let groupWidth = 0;
+  let groupCount = 0;
+  const widthAfter = (baseWidth, count, candidate) => count === 0 ? candidate.contentWidth : baseWidth + gapWidth + candidate.contentWidth;
   for (const candidate of primary) {
     visible.push(candidate);
-    if (widthOf2(visible, separator, padding) <= width) continue;
+    const pushedWidth = widthAfter(groupWidth, groupCount, candidate);
+    if (pushedWidth <= width) {
+      groupWidth = pushedWidth;
+      groupCount++;
+      continue;
+    }
     if (candidate.result.compactContent && !candidate.compact) {
       candidate.content = candidate.result.compactContent;
       candidate.compact = true;
-      if (widthOf2(visible, separator, padding) <= width) continue;
+      candidate.contentWidth = visibleWidth(candidate.content);
+      const compactedWidth = widthAfter(groupWidth, groupCount, candidate);
+      if (compactedWidth <= width) {
+        groupWidth = compactedWidth;
+        groupCount++;
+        continue;
+      }
     }
     visible.pop();
     if (candidate.segment.overflow !== "drop" && candidate.segment.overflow !== "primary") {
@@ -9110,9 +9440,14 @@ function renderStatus(layout, snapshot, width, options) {
   }
   if (visibleWidth(primaryText) > width) primaryText = truncateAnsi(primaryText, width);
   const secondaryVisible = [];
+  let secondaryWidth = 0;
+  let secondaryCount = 0;
   for (const candidate of [...secondary].sort((a, b) => b.segment.defaultPriority - a.segment.defaultPriority)) {
+    const pushedWidth = widthAfter(secondaryWidth, secondaryCount, candidate);
+    if (pushedWidth > width) continue;
     secondaryVisible.push(candidate);
-    if (widthOf2(secondaryVisible, separator, padding) > width) secondaryVisible.pop();
+    secondaryWidth = pushedWidth;
+    secondaryCount++;
   }
   const secondaryText = renderGroup(secondaryVisible, separator, padding);
   const lines = secondaryText ? [primaryText, secondaryText] : primaryText ? [primaryText] : [];
@@ -9165,6 +9500,28 @@ function separatorsFor(config, theme) {
   if (style === "none") return " ";
   return theme.apply("separator", style);
 }
+var themeAssetsCache = /* @__PURE__ */ new WeakMap();
+function themeAssetsFor(activeTheme, config) {
+  let byConfig = themeAssetsCache.get(activeTheme);
+  if (!byConfig) {
+    byConfig = /* @__PURE__ */ new WeakMap();
+    themeAssetsCache.set(activeTheme, byConfig);
+  }
+  let assets = byConfig.get(config);
+  if (!assets) {
+    const resolved = resolveTheme(
+      activeTheme.colors || activeTheme.fg ? {
+        ...activeTheme.colors ? { colors: activeTheme.colors } : {},
+        // Call through the theme instance so `this` binds correctly inside Pi's fg().
+        ...activeTheme.fg ? { fg: (color, text) => activeTheme.fg?.(color, text) ?? text } : {}
+      } : void 0,
+      config
+    );
+    assets = { resolved, separator: separatorsFor(config, resolved) };
+    byConfig.set(config, assets);
+  }
+  return assets;
+}
 function installStatusLine(options) {
   const existing = installationMap(options.host).get(options.generation);
   if (existing) return existing;
@@ -9197,16 +9554,9 @@ function installStatusLine(options) {
   }
   const render = (activeTheme, width, secondary) => {
     if (width <= 0 || !config.enabled || !config.statusLine.enabled) return [];
-    const resolved = resolveTheme(
-      activeTheme.colors || activeTheme.fg ? {
-        ...activeTheme.colors ? { colors: activeTheme.colors } : {},
-        // Call through the theme instance so `this` binds correctly inside Pi's fg().
-        ...activeTheme.fg ? { fg: (color, text) => activeTheme.fg?.(color, text) ?? text } : {}
-      } : void 0,
-      config
-    );
+    const { resolved, separator } = themeAssetsFor(activeTheme, config);
     const result = renderStatus(config.statusLine.layout, effectiveSnapshot(snapshot), width, {
-      separator: separatorsFor(config, resolved),
+      separator,
       segments,
       theme: resolved,
       options: {
@@ -9287,12 +9637,16 @@ function installStatusLine(options) {
   };
   const factory = (secondary) => (tui, theme) => {
     const currentTheme = theme;
+    let renderCache;
     const component = {
       render(width) {
+        if (renderCache?.width === width) return renderCache.lines;
         const lines = render(currentTheme, width, secondary);
+        renderCache = { width, lines };
         return lines;
       },
       invalidate() {
+        renderCache = void 0;
         primaryComponent = secondary ? primaryComponent : component;
         secondaryComponent = secondary ? component : secondaryComponent;
         if (tui.requestRender) tui.requestRender();
@@ -9667,16 +10021,52 @@ var RenderScheduler = class {
 
 // extension-src/pi-style/app/snapshot.ts
 function createSnapshot(generation2, revision = 0, values = {}) {
-  return Object.freeze({ generation: generation2, revision, ...values });
+  return Object.freeze({ ...values, generation: generation2, revision });
 }
 function replaceSnapshot(current, generation2, values) {
   if (current.generation !== generation2) return current;
-  return createSnapshot(generation2, current.revision + 1, values);
+  return equalStatusSnapshot(current, values) ? current : createSnapshot(generation2, current.revision + 1, values);
+}
+function equalStatusSnapshot(current, next) {
+  const currentEntries = Object.entries(current).filter(([key]) => key !== "generation" && key !== "revision");
+  const nextEntries = Object.entries(next).filter(([key]) => key !== "generation" && key !== "revision");
+  if (currentEntries.length !== nextEntries.length) return false;
+  for (const [key, value] of nextEntries) {
+    if (!hasOwn(current, key)) return false;
+    if (!equalValue(current[key], value)) return false;
+  }
+  return true;
+}
+function equalValue(left, right) {
+  if (Object.is(left, right)) return true;
+  if (Array.isArray(left) && Array.isArray(right)) {
+    if (left.length !== right.length) return false;
+    for (let index = 0; index < left.length; index++) {
+      if (!equalValue(left[index], right[index])) return false;
+    }
+    return true;
+  }
+  if (!isPlainRecord(left) || !isPlainRecord(right)) return false;
+  const leftKeys = Object.keys(left);
+  const rightKeys = Object.keys(right);
+  if (leftKeys.length !== rightKeys.length) return false;
+  for (const key of rightKeys) {
+    if (!hasOwn(left, key)) return false;
+    if (!equalValue(left[key], right[key])) return false;
+  }
+  return true;
+}
+function hasOwn(value, key) {
+  return Object.hasOwn(value, key);
+}
+function isPlainRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
 // extension-src/pi-style/app/runtime.ts
-function createPiStyleRuntime(host, generation2, requestRender = () => {
-}) {
+var GIT_INVALIDATE_DEBOUNCE_MS = 250;
+function createPiStyleRuntime(host, generation2, requestRender = host.requestRender ?? (() => {
+})) {
   let disposed = false;
   const extensionStatuses = () => {
     if (!host.extensionStatusProvider) return void 0;
@@ -9687,13 +10077,23 @@ function createPiStyleRuntime(host, generation2, requestRender = () => {
       return [];
     }
   };
+  const contextSnapshot = () => {
+    const usage = host.getContextUsage?.();
+    if (!usage) return void 0;
+    return {
+      ...usage.tokens !== null ? { currentTokens: usage.tokens } : {},
+      windowTokens: usage.contextWindow,
+      ...usage.percent !== null ? { percent: usage.percent } : {}
+    };
+  };
   let currentConfig = host.config;
   const disposables = new DisposableStore();
   const scheduler = new RenderScheduler({ requestRender }, generation2, () => !disposed);
   const git = new CachedGitProvider(host.gitRunner);
+  let pendingGitRefresh;
   const contextProvider = new InMemoryContextProvider();
   const usageProvider = new InMemoryUsageProvider();
-  const usage = host.getContextUsage?.();
+  const initialContext = contextSnapshot();
   const initialStatuses = extensionStatuses();
   const initialValues = {
     ...initialStatuses ? { extensionStatuses: initialStatuses } : {},
@@ -9702,13 +10102,7 @@ function createPiStyleRuntime(host, generation2, requestRender = () => {
     ...host.model?.reasoning !== void 0 ? { reasoning: host.model.reasoning } : {},
     ...host.thinkingLevel ? { thinkingLevel: normalizeThinkingLevel(host.thinkingLevel) } : {},
     ...host.cwd ? { cwd: host.cwd } : {},
-    ...usage ? {
-      context: {
-        ...usage.tokens !== null ? { currentTokens: usage.tokens } : {},
-        windowTokens: usage.contextWindow,
-        ...usage.percent !== null ? { percent: usage.percent } : {}
-      }
-    } : {}
+    ...initialContext ? { context: initialContext } : {}
   };
   let currentSnapshot = createSnapshot(generation2, 0, initialValues);
   let statusLine;
@@ -9719,14 +10113,35 @@ function createPiStyleRuntime(host, generation2, requestRender = () => {
     editor: "disabled",
     startup: "disabled"
   };
-  const startupSnapshot = (config) => ({
+  const snapshotValues = (snapshot) => {
+    const { generation: _generation, revision: _revision, ...values } = snapshot;
+    return values;
+  };
+  const withSnapshotPatch = (patch) => {
+    const next = { ...snapshotValues(currentSnapshot) };
+    for (const [key, value] of Object.entries(patch)) {
+      if (value === void 0) delete next[key];
+      else next[key] = value;
+    }
+    return next;
+  };
+  const createStartupSnapshot = (config, resources = host.resources) => ({
     ...currentSnapshot,
     reason: host.startupReason ?? "startup",
     ...host.provider ? { startupProvider: host.provider } : {},
     ...host.cwd ? { project: host.cwd.split(/[\\/]/).filter(Boolean).at(-1) } : {},
     preset: config.preset,
-    ...host.resources ? { resources: host.resources } : {}
+    ...resources ? { resources } : {}
   });
+  const applySnapshot = (nextSnapshot) => {
+    if (nextSnapshot === currentSnapshot) return false;
+    currentSnapshot = nextSnapshot;
+    statusLine?.update(currentSnapshot);
+    editor?.update(currentSnapshot);
+    startup?.update(createStartupSnapshot(currentConfig));
+    return true;
+  };
+  const updateSnapshot = (values) => applySnapshot(replaceSnapshot(currentSnapshot, generation2, values));
   const installStatus = () => {
     if (!host.hasUI || host.mode !== "tui" || !host.ui || !currentConfig.enabled || !currentConfig.statusLine.enabled) {
       installationState = { ...installationState, status: "disabled" };
@@ -9789,7 +10204,7 @@ function createPiStyleRuntime(host, generation2, requestRender = () => {
       startup = installStartup({
         host: { ...host.ui, mode: host.mode, hasUI: host.hasUI },
         config: currentConfig,
-        snapshot: startupSnapshot(currentConfig),
+        snapshot: createStartupSnapshot(currentConfig),
         generation: generation2,
         requestRender,
         timeoutMs: 3e3,
@@ -9838,27 +10253,10 @@ function createPiStyleRuntime(host, generation2, requestRender = () => {
   if (host.cwd && currentConfig.enabled && currentConfig.statusLine.enabled) {
     void git.get(host.cwd).then((value) => {
       if (disposed) return;
-      currentSnapshot = replaceSnapshot(currentSnapshot, generation2, { ...currentSnapshot, git: value });
-      statusLine?.update(currentSnapshot);
-      editor?.update(currentSnapshot);
-      startup?.update({
-        ...currentSnapshot,
-        reason: host.startupReason ?? "startup",
-        ...host.provider ? { startupProvider: host.provider } : {},
-        ...host.cwd ? { project: host.cwd.split(/[\\/]/).filter(Boolean).at(-1) } : {},
-        preset: currentConfig.preset,
-        ...host.resources ? { resources: host.resources } : {}
-      });
-      requestRender();
-    });
-  }
-  if (usage) {
-    contextProvider.set("active", {
-      ...usage.tokens !== null ? { currentTokens: usage.tokens } : {},
-      windowTokens: usage.contextWindow,
-      ...usage.percent !== null ? { percent: usage.percent } : {}
+      if (updateSnapshot(withSnapshotPatch({ git: value }))) requestRender();
     });
   }
+  if (initialContext) contextProvider.set("active", initialContext);
   return {
     generation: generation2,
     providerIdentity: { git, context: contextProvider, usage: usageProvider },
@@ -9867,49 +10265,33 @@ function createPiStyleRuntime(host, generation2, requestRender = () => {
     },
     mode: host.mode,
     hasUI: host.hasUI,
-    snapshot: currentSnapshot,
+    get snapshot() {
+      return currentSnapshot;
+    },
     disposables,
     scheduler,
     updateStartupResources(resources) {
-      if (disposed) return;
-      startup?.update({
-        ...currentSnapshot,
-        reason: host.startupReason ?? "startup",
-        ...host.provider ? { startupProvider: host.provider } : {},
-        ...host.cwd ? { project: host.cwd.split(/[\\/]/).filter(Boolean).at(-1) } : {},
-        preset: currentConfig.preset,
-        resources
-      });
+      if (disposed || !startup) return false;
+      startup.update(createStartupSnapshot(currentConfig, resources));
       requestRender();
+      return true;
     },
     dismissStartup() {
       startup?.dismiss();
     },
-    update(values) {
-      if (disposed) return;
-      const liveUsage = host.getContextUsage?.();
-      const context = liveUsage ? {
-        ...liveUsage.tokens !== null ? { currentTokens: liveUsage.tokens } : {},
-        windowTokens: liveUsage.contextWindow,
-        ...liveUsage.percent !== null ? { percent: liveUsage.percent } : {}
-      } : void 0;
-      const statuses = extensionStatuses();
-      currentSnapshot = replaceSnapshot(currentSnapshot, generation2, {
-        ...currentSnapshot,
-        ...values,
-        ...context ? { context } : {},
-        ...statuses ? { extensionStatuses: statuses } : {}
-      });
-      statusLine?.update(currentSnapshot);
-      editor?.update(currentSnapshot);
-      startup?.update({
-        ...currentSnapshot,
-        reason: host.startupReason ?? "startup",
-        ...host.provider ? { startupProvider: host.provider } : {},
-        ...host.cwd ? { project: host.cwd.split(/[\\/]/).filter(Boolean).at(-1) } : {},
-        preset: currentConfig.preset,
-        ...host.resources ? { resources: host.resources } : {}
-      });
+    update(values, options = {}) {
+      if (disposed) return false;
+      const patch = {
+        ...values
+      };
+      if (options.refreshContextUsage) {
+        const context = contextSnapshot();
+        patch.context = context;
+        if (context) contextProvider.set("active", context);
+        else contextProvider.clear();
+      }
+      if (options.refreshExtensionStatuses) patch.extensionStatuses = extensionStatuses();
+      return updateSnapshot(withSnapshotPatch(patch));
     },
     configure(nextConfig) {
       if (disposed) return;
@@ -9941,21 +10323,18 @@ function createPiStyleRuntime(host, generation2, requestRender = () => {
     },
     invalidateGit() {
       if (disposed || !host.cwd || !currentConfig.enabled || !currentConfig.statusLine.enabled) return;
-      git.invalidate(host.cwd);
-      void git.get(host.cwd).then((value) => {
+      const cwd = host.cwd;
+      git.invalidate(cwd);
+      if (pendingGitRefresh !== void 0) return;
+      pendingGitRefresh = setTimeout(() => {
+        pendingGitRefresh = void 0;
         if (disposed) return;
-        currentSnapshot = replaceSnapshot(currentSnapshot, generation2, { ...currentSnapshot, git: value });
-        statusLine?.update(currentSnapshot);
-        editor?.update(currentSnapshot);
-        startup?.update({
-          ...currentSnapshot,
-          reason: host.startupReason ?? "startup",
-          ...host.provider ? { startupProvider: host.provider } : {},
-          ...host.cwd ? { project: host.cwd.split(/[\\/]/).filter(Boolean).at(-1) } : {},
-          preset: currentConfig.preset
+        void git.get(cwd).then((value) => {
+          if (disposed) return;
+          if (updateSnapshot(withSnapshotPatch({ git: value }))) requestRender();
         });
-        requestRender();
-      });
+      }, GIT_INVALIDATE_DEBOUNCE_MS);
+      pendingGitRefresh.unref?.();
     },
     get disposed() {
       return disposed;
@@ -9963,6 +10342,10 @@ function createPiStyleRuntime(host, generation2, requestRender = () => {
     dispose() {
       if (disposed) return;
       disposed = true;
+      if (pendingGitRefresh !== void 0) {
+        clearTimeout(pendingGitRefresh);
+        pendingGitRefresh = void 0;
+      }
       scheduler.cancel();
       disposeStatus();
       disposeEditor();
@@ -10158,10 +10541,10 @@ function createPiStyleApp(initialConfig, reloadPort, onConfigChange) {
     sessionShutdown() {
       runtime.stop();
     },
-    update(values, kind = "coalesced") {
+    update(values, kind = "coalesced", options) {
       const active = runtime.current;
       if (!active) return;
-      active.update(values);
+      if (!active.update(values, options)) return;
       active.scheduler.schedule(kind);
     },
     reload() {
@@ -10464,9 +10847,11 @@ function renderBashExecutionBox(instance, args) {
   try {
     if (host.piStyleStart === void 0) host.piStyleStart = Date.now();
     const renderedWidth = boxWidth(width);
+    const cacheKey2 = `${themeCacheKey(theme)}|${width}|${host.status}|${host.exitCode ?? ""}|${host.command}`;
+    if (host.status !== "running" && host.piStyleRenderCache?.key === cacheKey2) return host.piStyleRenderCache.lines;
     const inner = boxInnerWidth(renderedWidth);
     const wrapped = content.render(inner).map((line) => boxLine(theme, line.startsWith(" ") ? line.slice(1) : line, renderedWidth));
-    return [
+    const lines = [
       "",
       boxLabeledBorder(theme, TOP_LEFT, TOP_RIGHT, bashBoxTitle(theme, host), void 0, renderedWidth),
       boxBlankLine(theme, renderedWidth),
@@ -10474,6 +10859,8 @@ function renderBashExecutionBox(instance, args) {
       boxBlankLine(theme, renderedWidth),
       boxLabeledBorder(theme, BOTTOM_LEFT, BOTTOM_RIGHT, bashBoxFooter(theme, host), void 0, renderedWidth)
     ];
+    if (host.status !== "running") host.piStyleRenderCache = { key: cacheKey2, lines };
+    return lines;
   } catch {
     return void 0;
   }
@@ -10504,17 +10891,29 @@ import {
 } from "@earendil-works/pi-coding-agent";
 
 // extension-src/pi-style/features/messages/index.ts
-import { visibleWidth as visibleWidth4 } from "@earendil-works/pi-tui";
 var OSC133_ZONE_START = "\x1B]133;A\x07";
 var OSC133_ZONE_END = "\x1B]133;B\x07";
 var OSC133_ZONE_FINAL = "\x1B]133;C\x07";
+var BG_RESET = "\x1B[49m";
+var MAX_RENDER_CACHE_KEYS_PER_INSTANCE = 8;
+var MAX_LINE_ANALYSIS_ENTRIES = 4096;
+var renderCacheByInstance = /* @__PURE__ */ new WeakMap();
+var lineAnalysisCache = /* @__PURE__ */ new Map();
+var lineCacheEvictionCursor;
+var childrenScanByInstance = /* @__PURE__ */ new WeakMap();
+var messageDecorationTestState = {
+  decoratePasses: 0,
+  cacheHits: 0,
+  cacheMisses: 0,
+  lineCacheHits: 0,
+  lineCacheMisses: 0
+};
 function extractOscEnvelope(line) {
   if (!line.startsWith(OSC133_ZONE_START)) return void 0;
   const bodyEnd = line.indexOf(OSC133_ZONE_END, OSC133_ZONE_START.length);
   if (bodyEnd < 0 || !line.endsWith(OSC133_ZONE_FINAL)) return void 0;
   return { start: OSC133_ZONE_START, body: line.slice(OSC133_ZONE_START.length, bodyEnd), end: line.slice(bodyEnd) };
 }
-var BG_RESET = "\x1B[49m";
 function splitLeadingMarkers(line) {
   let index = 0;
   while (line.startsWith("\x1B]", index)) {
@@ -10524,7 +10923,7 @@ function splitLeadingMarkers(line) {
     if (end === -1) break;
     index = end + 1;
   }
-  return { head: line.slice(0, index), rest: line.slice(index) };
+  return index === 0 ? { head: "", rest: line } : { head: line.slice(0, index), rest: line.slice(index) };
 }
 function leadingSgr(line) {
   if (!line.startsWith("\x1B[")) return "";
@@ -10538,96 +10937,304 @@ function leadingSgr(line) {
 }
 function isBackgroundSgr(sequence) {
   if (!sequence.startsWith("\x1B[") || !sequence.endsWith("m")) return false;
-  for (const code of sequence.slice(2, -1).split(";")) {
-    const value = Number(code);
-    if (value === 48 || value === 49) return true;
-    if (value >= 40 && value <= 47) return true;
-    if (value >= 100 && value <= 107) return true;
+  let value = 0;
+  let empty = true;
+  let valid = true;
+  for (let index = 2; index < sequence.length - 1; index++) {
+    const code = sequence.charCodeAt(index);
+    if (code === 59) {
+      if (valid && matchesBackgroundCode(empty ? 0 : value)) return true;
+      value = 0;
+      empty = true;
+      valid = true;
+      continue;
+    }
+    if (code < 48 || code > 57) {
+      valid = false;
+      continue;
+    }
+    value = value * 10 + (code - 48);
+    empty = false;
+  }
+  return valid && matchesBackgroundCode(empty ? 0 : value);
+}
+function matchesBackgroundCode(value) {
+  return value === 48 || value === 49 || value >= 40 && value <= 47 || value >= 100 && value <= 107;
+}
+function certifiedAsciiWidth(value) {
+  let width = 0;
+  let index = 0;
+  const length = value.length;
+  while (index < length) {
+    const code = value.charCodeAt(index);
+    if (code === 27) {
+      const next = index + 1 < length ? value.charCodeAt(index + 1) : -1;
+      if (next === 91) {
+        let scan = index + 2;
+        while (scan < length) {
+          const terminator = value.charCodeAt(scan);
+          if (terminator === 109 || // m
+          terminator === 71 || // G
+          terminator === 75 || // K
+          terminator === 72 || // H
+          terminator === 74) {
+            index = scan + 1;
+            break;
+          }
+          scan++;
+        }
+        if (scan >= length) return void 0;
+        continue;
+      }
+      if (next === 93 || next === 95) {
+        let scan = index + 2;
+        let end = -1;
+        while (scan < length) {
+          const terminator = value.charCodeAt(scan);
+          if (terminator === 7) {
+            end = scan + 1;
+            break;
+          }
+          if (terminator === 27 && scan + 1 < length && value.charCodeAt(scan + 1) === 92) {
+            end = scan + 2;
+            break;
+          }
+          scan++;
+        }
+        if (end < 0) return void 0;
+        index = end;
+        continue;
+      }
+      return void 0;
+    }
+    if (code < 32 || code > 126) return void 0;
+    width++;
+    index++;
+  }
+  return width;
+}
+function certifiedVisibleWidth(value) {
+  return certifiedAsciiWidth(value) ?? visibleWidth(value);
+}
+var prefixWidthMemo;
+function prefixWidthOf(prefix) {
+  if (prefixWidthMemo?.prefix === prefix) return prefixWidthMemo.width;
+  const width = certifiedVisibleWidth(prefix);
+  prefixWidthMemo = { prefix, width };
+  return width;
+}
+function contentText(line) {
+  if (!line.includes("\x1B")) return line;
+  let output = "";
+  let sliceStart = 0;
+  for (let index = 0; index < line.length; index++) {
+    if (line.charCodeAt(index) !== 27) continue;
+    output += line.slice(sliceStart, index);
+    const next = line[index + 1];
+    if (next === "]") {
+      index += 2;
+      while (index < line.length && line.charCodeAt(index) !== 7) index++;
+    } else if (next === "[") {
+      index += 2;
+      while (index < line.length && (line.charCodeAt(index) < 64 || line.charCodeAt(index) > 126)) index++;
+    }
+    sliceStart = index + 1;
+  }
+  output += line.slice(sliceStart);
+  if (output.includes("\x1B]133;")) {
+    return output.replaceAll(OSC133_ZONE_START, "").replaceAll(OSC133_ZONE_END, "").replaceAll(OSC133_ZONE_FINAL, "");
+  }
+  return output;
+}
+function isWhitespaceCode(code) {
+  if (code === 32 || code >= 9 && code <= 13) return true;
+  if (code < 128) return false;
+  return code === 160 || code === 5760 || code >= 8192 && code <= 8202 || code === 8232 || code === 8233 || code === 8239 || code === 8287 || code === 12288 || code === 65279;
+}
+function hasContent(line) {
+  const length = line.length;
+  let index = 0;
+  while (index < length) {
+    const code = line.charCodeAt(index);
+    if (code === 27) {
+      const next = index + 1 < length ? line.charCodeAt(index + 1) : -1;
+      if (next === 93) {
+        index += 2;
+        while (index < length && line.charCodeAt(index) !== 7) index++;
+      } else if (next === 91) {
+        index += 2;
+        while (index < length) {
+          const inner = line.charCodeAt(index);
+          if (inner >= 64 && inner <= 126) break;
+          index++;
+        }
+      }
+      index++;
+      continue;
+    }
+    if (code >= 55296 && code <= 57343) return true;
+    if (!isWhitespaceCode(code)) return true;
+    index++;
   }
   return false;
 }
-function rebuildAtWidth(line, width, lead) {
-  const { head, rest } = splitLeadingMarkers(line);
-  const bgAnsi = leadingSgr(rest);
-  if (bgAnsi && isBackgroundSgr(bgAnsi) && rest.endsWith(BG_RESET)) {
-    const body = rest.slice(bgAnsi.length, rest.length - BG_RESET.length);
-    const pad = " ".repeat(Math.max(0, width - visibleWidth4(lead) - visibleWidth4(body)));
-    return `${head}${bgAnsi}${lead}${body}${pad}${BG_RESET}`;
-  }
-  const padded = `${lead}${line}`;
-  return `${padded}${" ".repeat(Math.max(0, width - visibleWidth4(padded)))}`;
-}
-function decorateMessageLine(line, index, lastIndex, contentIndex, width, options) {
-  const { firstEnvelope, firstHasStart, multilineEnvelope, prefix } = options;
-  const prefixWidth = visibleWidth4(prefix);
-  const lead = index === contentIndex ? prefix : index > contentIndex ? " ".repeat(prefixWidth) : "";
+function getLineAnalysis(line) {
+  const cached = lineAnalysisCache.get(line);
+  if (cached) {
+    messageDecorationTestState.lineCacheHits++;
+    lineAnalysisCache.delete(line);
+    lineAnalysisCache.set(line, cached);
+    return cached;
+  }
+  messageDecorationTestState.lineCacheMisses++;
+  const leadingMarkers = splitLeadingMarkers(line);
+  const backgroundAnsi = leadingSgr(leadingMarkers.rest);
+  const isBackgroundWrapped = backgroundAnsi !== "" && isBackgroundSgr(backgroundAnsi) && leadingMarkers.rest.endsWith(BG_RESET);
+  const backgroundBody = isBackgroundWrapped ? leadingMarkers.rest.slice(backgroundAnsi.length, leadingMarkers.rest.length - BG_RESET.length) : void 0;
+  const hasOscStart = line.startsWith(OSC133_ZONE_START);
+  const analysis = {
+    visibleWidth: certifiedVisibleWidth(line),
+    hasContent: hasContent(line),
+    oscEnvelope: hasOscStart ? extractOscEnvelope(line) : void 0,
+    hasOscStart,
+    leadingMarkers,
+    isBackgroundWrapped,
+    backgroundAnsi,
+    backgroundBody,
+    backgroundBodyWidth: backgroundBody === void 0 ? void 0 : certifiedVisibleWidth(backgroundBody)
+  };
+  lineAnalysisCache.set(line, analysis);
+  if (lineAnalysisCache.size > MAX_LINE_ANALYSIS_ENTRIES) {
+    let cursor = lineCacheEvictionCursor;
+    if (cursor === void 0) cursor = lineAnalysisCache.keys();
+    let oldest = cursor.next();
+    if (oldest.done) {
+      cursor = lineAnalysisCache.keys();
+      oldest = cursor.next();
+    }
+    lineCacheEvictionCursor = cursor;
+    if (!oldest.done && oldest.value !== void 0) lineAnalysisCache.delete(oldest.value);
+  }
+  return analysis;
+}
+function rebuildAtWidth(line, width, lead, leadWidth, analysis = getLineAnalysis(line)) {
+  if (analysis.isBackgroundWrapped && analysis.backgroundBody !== void 0 && analysis.backgroundBodyWidth !== void 0) {
+    const pad2 = " ".repeat(Math.max(0, width - leadWidth - analysis.backgroundBodyWidth));
+    return `${analysis.leadingMarkers.head}${analysis.backgroundAnsi}${lead}${analysis.backgroundBody}${pad2}${BG_RESET}`;
+  }
+  const pad = " ".repeat(Math.max(0, width - leadWidth - analysis.visibleWidth));
+  return `${lead}${line}${pad}`;
+}
+function decorateMessageLine(line, index, lastIndex, contentIndex, width, options, analysis = getLineAnalysis(line)) {
+  const { firstEnvelope, firstHasStart, multilineEnvelope, prefix, prefixWidth, continuationLead } = options;
+  const lead = index === contentIndex ? prefix : index > contentIndex ? continuationLead : "";
+  const leadWidth = index < contentIndex ? 0 : prefixWidth;
   if (index === contentIndex && firstEnvelope)
-    return `${firstEnvelope.start}${rebuildAtWidth(firstEnvelope.body, width, prefix)}${firstEnvelope.end}`;
+    return `${firstEnvelope.start}${rebuildAtWidth(firstEnvelope.body, width, prefix, prefixWidth)}${firstEnvelope.end}`;
   if (index === contentIndex && firstHasStart)
-    return `${OSC133_ZONE_START}${rebuildAtWidth(line.slice(OSC133_ZONE_START.length), width, prefix)}`;
+    return `${OSC133_ZONE_START}${rebuildAtWidth(line.slice(OSC133_ZONE_START.length), width, prefix, prefixWidth)}`;
   if (index === lastIndex && multilineEnvelope && index !== contentIndex)
     return `${OSC133_ZONE_END}${OSC133_ZONE_FINAL}${rebuildAtWidth(
       line.slice((OSC133_ZONE_END + OSC133_ZONE_FINAL).length),
       width,
-      lead
+      lead,
+      leadWidth
     )}`;
   if (index === contentIndex && index === lastIndex && multilineEnvelope && line.startsWith(OSC133_ZONE_END + OSC133_ZONE_FINAL))
     return `${OSC133_ZONE_END}${OSC133_ZONE_FINAL}${rebuildAtWidth(
       line.slice((OSC133_ZONE_END + OSC133_ZONE_FINAL).length),
       width,
-      prefix
+      prefix,
+      prefixWidth
     )}`;
-  return rebuildAtWidth(line, width, lead);
+  return rebuildAtWidth(line, width, lead, leadWidth, analysis);
 }
-function contentText(line) {
-  let output = "";
-  for (let index = 0; index < line.length; index++) {
-    if (line.charCodeAt(index) !== 27) {
-      output += line[index];
-      continue;
-    }
-    const next = line[index + 1];
-    if (next === "]") {
-      index += 2;
-      while (index < line.length && line.charCodeAt(index) !== 7) index++;
-      continue;
-    }
-    if (next === "[") {
-      index += 2;
-      while (index < line.length && (line.charCodeAt(index) < 64 || line.charCodeAt(index) > 126)) index++;
-    }
+function sameLines(left, right) {
+  if (left === right) return true;
+  if (left.length !== right.length) return false;
+  for (let index = 0; index < left.length; index++) {
+    if (left[index] !== right[index]) return false;
   }
-  return output.replaceAll(OSC133_ZONE_START, "").replaceAll(OSC133_ZONE_END, "").replaceAll(OSC133_ZONE_FINAL, "");
+  return true;
 }
-function hasContent(line) {
-  return [...contentText(line)].some((character) => !/\s/u.test(character));
+function cacheKey(width, prefix) {
+  return `${width}\0${prefix}`;
+}
+function getRenderCache(instance) {
+  let cache = renderCacheByInstance.get(instance);
+  if (!cache) {
+    cache = /* @__PURE__ */ new Map();
+    renderCacheByInstance.set(instance, cache);
+  }
+  return cache;
+}
+function storeRenderCache(instance, width, prefix, native, result) {
+  const cache = getRenderCache(instance);
+  const key = cacheKey(width, prefix);
+  if (cache.has(key)) cache.delete(key);
+  cache.set(key, { nativeRef: native, nativeLines: [...native], result: [...result] });
+  while (cache.size > MAX_RENDER_CACHE_KEYS_PER_INSTANCE) {
+    const oldestKey = cache.keys().next().value;
+    if (oldestKey === void 0) break;
+    cache.delete(oldestKey);
+  }
 }
 function prefixNative(lines, width, prefix) {
   if (!Array.isArray(lines) || lines.length === 0 || !lines.every((line) => typeof line === "string")) return void 0;
+  messageDecorationTestState.decoratePasses++;
   const nativeLines = lines;
-  const prefixWidth = visibleWidth4(prefix);
+  const prefixWidth = prefixWidthOf(prefix);
   if (width <= prefixWidth) return void 0;
   const bodyWidth = width - prefixWidth;
-  const first = nativeLines[0] ?? "";
+  const analyses = nativeLines.map((line) => getLineAnalysis(line));
   const last = nativeLines.at(-1) ?? "";
+  const lastAnalysis = analyses[analyses.length - 1] ?? getLineAnalysis(last);
   const multilineEnvelope = nativeLines.length > 1 && last.startsWith(OSC133_ZONE_END + OSC133_ZONE_FINAL);
-  const firstContentIndex = nativeLines.findIndex((line, index) => {
-    if (index !== nativeLines.length - 1 || !multilineEnvelope) return hasContent(line);
-    return !nativeLines.slice(0, index).some((earlier) => hasContent(earlier)) && hasContent(line);
-  });
+  let firstContentIndex = -1;
+  for (let index = 0; index < nativeLines.length; index++) {
+    const analysis = analyses[index] ?? getLineAnalysis(nativeLines[index] ?? "");
+    if (index !== nativeLines.length - 1 || !multilineEnvelope) {
+      if (analysis.hasContent) {
+        firstContentIndex = index;
+        break;
+      }
+      continue;
+    }
+    let earlierHasContent = false;
+    for (let earlier = 0; earlier < index; earlier++) {
+      if ((analyses[earlier] ?? getLineAnalysis(nativeLines[earlier] ?? "")).hasContent) {
+        earlierHasContent = true;
+        break;
+      }
+    }
+    if (!earlierHasContent && lastAnalysis.hasContent) firstContentIndex = index;
+    break;
+  }
   if (firstContentIndex < 0) return nativeLines;
-  const firstEnvelope = firstContentIndex === 0 ? extractOscEnvelope(first) : void 0;
-  const firstHasStart = firstContentIndex === 0 && first.startsWith(OSC133_ZONE_START);
+  const firstAnalysis = analyses[0] ?? getLineAnalysis(nativeLines[0] ?? "");
+  const firstEnvelope = firstContentIndex === 0 ? firstAnalysis.oscEnvelope : void 0;
+  const firstHasStart = firstContentIndex === 0 && firstAnalysis.hasOscStart;
+  const continuationLead = " ".repeat(prefixWidth);
   const decorated = nativeLines.map(
-    (line, index) => decorateMessageLine(line, index, nativeLines.length - 1, firstContentIndex, width, {
-      firstEnvelope,
-      firstHasStart,
-      multilineEnvelope,
-      prefix
-    })
+    (line, index) => decorateMessageLine(
+      line,
+      index,
+      nativeLines.length - 1,
+      firstContentIndex,
+      width,
+      {
+        firstEnvelope,
+        firstHasStart,
+        multilineEnvelope,
+        prefix,
+        prefixWidth,
+        continuationLead
+      },
+      analyses[index]
+    )
   );
-  if (!decorated.every((line) => visibleWidth4(line) <= width)) return void 0;
-  if (!nativeLines.every((line) => visibleWidth4(line) <= bodyWidth)) return void 0;
+  if (!decorated.every((line) => certifiedVisibleWidth(line) <= width)) return void 0;
+  if (!analyses.every((analysis) => analysis.visibleWidth <= bodyWidth)) return void 0;
   return decorated;
 }
 function decorateMessageRender(original, instance, args, snapshot = {
@@ -10640,10 +11247,20 @@ function decorateMessageRender(original, instance, args, snapshot = {
   const width = typeof args[0] === "number" ? args[0] : 0;
   const prefix = snapshot.assistantPrefix;
   if (!snapshot.assistantEnabled) return Reflect.apply(original, instance, args);
-  if (width <= visibleWidth4(prefix)) return Reflect.apply(original, instance, args);
-  const reducedWidth = width - visibleWidth4(prefix);
+  const prefixWidth = prefixWidthOf(prefix);
+  if (width <= prefixWidth) return Reflect.apply(original, instance, args);
+  const reducedWidth = width - prefixWidth;
   const native = Reflect.apply(original, instance, [reducedWidth, ...args.slice(1)]);
-  return prefixNative(native, width, prefix) ?? native;
+  if (!Array.isArray(native) || !native.every((line) => typeof line === "string")) return native;
+  const cached = getRenderCache(instance).get(cacheKey(width, prefix));
+  if (cached && (cached.nativeRef === native || sameLines(cached.nativeLines, native))) {
+    messageDecorationTestState.cacheHits++;
+    return [...cached.result];
+  }
+  messageDecorationTestState.cacheMisses++;
+  const decorated = prefixNative(native, width, prefix) ?? native;
+  storeRenderCache(instance, width, prefix, native, decorated);
+  return decorated;
 }
 function isSpacerChild(child) {
   return typeof child?.setLines === "function";
@@ -10662,8 +11279,16 @@ function hasToolCallItems(message) {
 function isBlankTextChild(child) {
   const candidate = child;
   if (typeof candidate?.setCustomBgFn !== "function" || typeof candidate.render !== "function") return false;
+  if (typeof candidate.text === "string") return contentText(candidate.text).trim() === "";
   return contentText(candidate.render(0).join("\n")).trim() === "";
 }
+function childrenUnchangedSinceScan(instance, children) {
+  const state = childrenScanByInstance.get(instance);
+  return state !== void 0 && state.childrenRef === children && state.length === children.length;
+}
+function markChildrenScanned(instance, children) {
+  childrenScanByInstance.set(instance, { childrenRef: children, length: children.length });
+}
 function decorateMessageUpdate(original, instance, args, snapshot = {
   assistantPrefix: "\u2502 ",
   assistantEnabled: true,
@@ -10673,24 +11298,22 @@ function decorateMessageUpdate(original, instance, args, snapshot = {
   if (typeof original !== "function") return void 0;
   const result = Reflect.apply(original, instance, args);
   const target = instance;
-  if (snapshot.collapseHiddenThinking && target.hideThinkingBlock === true && target.hiddenThinkingLabel === "") {
-    const children = target.contentContainer?.children;
-    if (children) {
+  const children = target.contentContainer?.children;
+  if (children && !childrenUnchangedSinceScan(instance, children)) {
+    if (snapshot.collapseHiddenThinking && target.hideThinkingBlock === true && target.hiddenThinkingLabel === "") {
       for (let index = children.length - 1; index >= 0; index--) {
         if (!isBlankTextChild(children[index])) continue;
         children.splice(index, 1);
         if (isSpacerChild(children[index])) children.splice(index, 1);
       }
     }
-  }
-  if (snapshot.hideInterimText && hasToolCallItems(args[0])) {
-    const children = target.contentContainer?.children;
-    if (children) {
+    if (snapshot.hideInterimText && hasToolCallItems(args[0])) {
       for (let index = children.length - 1; index >= 0; index--) {
         if (isInterimTextChild(children[index])) children.splice(index, 1);
       }
       if (children.every((child) => isSpacerChild(child))) children.length = 0;
     }
+    markChildrenScanned(instance, children);
   }
   return result;
 }
@@ -11003,7 +11626,7 @@ var KNOWN_NATIVE_IDENTITIES = Object.freeze({
 });
 var TRUSTED_NATIVE_FINGERPRINTS = Object.freeze(
   Object.fromEntries(
-    Object.entries(KNOWN_NATIVE_IDENTITIES).map(([key, identities]) => [key, identities[0].fingerprint])
+    Object.entries(KNOWN_NATIVE_IDENTITIES).map(([key, identities]) => [key, identities[0]?.fingerprint ?? ""])
   )
 );
 function fingerprint(value) {
@@ -11859,22 +12482,134 @@ function createPiStyleSessionCoordinator(pi, hooks = {}) {
 }
 
 // extension-src/pi-style/pi/session-usage.ts
+var usageCache = /* @__PURE__ */ new WeakMap();
 function usageFromSession(session) {
-  const totals = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0 };
-  let sawUsage = false;
-  for (const entry of session.getEntries()) {
-    if (entry.type === "message") {
-      if (entry.message.role !== "assistant" && entry.message.role !== "toolResult") continue;
-      const usage = "usage" in entry.message ? entry.message.usage : void 0;
-      if (!usage) continue;
-      addUsage(totals, usage);
-      sawUsage = true;
-    } else if ((entry.type === "branch_summary" || entry.type === "compaction") && entry.usage) {
-      addUsage(totals, entry.usage);
-      sawUsage = true;
-    }
-  }
-  if (!sawUsage) return void 0;
+  const entries = session.getEntries();
+  const state = usageCache.get(session) ?? createState();
+  usageCache.set(session, state);
+  if (entries.length === 0) {
+    state.cacheHits++;
+    state.processedLength = 0;
+    state.lastEntryId = void 0;
+    state.lastEntryRef = void 0;
+    state.lastContribution = emptyContribution();
+    state.totals = emptyTotals();
+    state.cached = void 0;
+    return void 0;
+  }
+  if (state.processedLength === 0) {
+    rebuildFrom(entries, state);
+    return state.cached;
+  }
+  if (entries.length < state.processedLength) {
+    rebuildFrom(entries, state);
+    return state.cached;
+  }
+  const currentLast = entries.at(-1);
+  if (!currentLast) {
+    state.cacheHits++;
+    state.cached = void 0;
+    return void 0;
+  }
+  if (entries.length === state.processedLength) {
+    if (currentLast.id !== state.lastEntryId) {
+      rebuildFrom(entries, state);
+      return state.cached;
+    }
+    if (currentLast !== state.lastEntryRef) refreshTailEntry(currentLast, state);
+    else state.cacheHits++;
+    return state.cached;
+  }
+  const previousLast = entries[state.processedLength - 1];
+  if (!previousLast || previousLast.id !== state.lastEntryId) {
+    rebuildFrom(entries, state);
+    return state.cached;
+  }
+  if (previousLast !== state.lastEntryRef) refreshTailEntry(previousLast, state);
+  for (const entry of entries.slice(state.processedLength)) appendEntry(entry, state);
+  return state.cached;
+}
+function resetUsageFromSessionCache(session) {
+  if (session) {
+    usageCache.delete(session);
+    return;
+  }
+  usageCache = /* @__PURE__ */ new WeakMap();
+}
+function createState() {
+  return {
+    processedLength: 0,
+    lastEntryId: void 0,
+    lastEntryRef: void 0,
+    lastContribution: emptyContribution(),
+    totals: emptyTotals(),
+    cached: void 0,
+    scannedEntries: 0,
+    cacheHits: 0,
+    rebuilds: 0,
+    tailRefreshes: 0
+  };
+}
+function rebuildFrom(entries, state) {
+  state.rebuilds++;
+  state.processedLength = 0;
+  state.lastEntryId = void 0;
+  state.lastEntryRef = void 0;
+  state.lastContribution = emptyContribution();
+  state.totals = emptyTotals();
+  state.cached = void 0;
+  for (const entry of entries) appendEntry(entry, state);
+}
+function refreshTailEntry(entry, state) {
+  state.tailRefreshes++;
+  subtractContribution(state.totals, state.lastContribution);
+  const contribution = usageContribution(entry);
+  addContribution(state.totals, contribution);
+  state.lastEntryId = entry.id;
+  state.lastEntryRef = entry;
+  state.lastContribution = contribution;
+  state.cached = snapshotFromTotals(state.totals);
+  state.scannedEntries++;
+}
+function appendEntry(entry, state) {
+  const contribution = usageContribution(entry);
+  addContribution(state.totals, contribution);
+  state.processedLength++;
+  state.lastEntryId = entry.id;
+  state.lastEntryRef = entry;
+  state.lastContribution = contribution;
+  state.cached = snapshotFromTotals(state.totals);
+  state.scannedEntries++;
+}
+function usageContribution(entry) {
+  if (entry.type === "message") {
+    if (entry.message.role !== "assistant" && entry.message.role !== "toolResult") return emptyContribution();
+    const usage = "usage" in entry.message ? entry.message.usage : void 0;
+    if (!usage) return emptyContribution();
+    return {
+      input: usage.input,
+      output: usage.output,
+      cacheRead: usage.cacheRead,
+      cacheWrite: usage.cacheWrite,
+      cost: usage.cost.total,
+      sawUsage: true
+    };
+  }
+  if ((entry.type === "branch_summary" || entry.type === "compaction") && entry.usage) {
+    return {
+      input: entry.usage.input,
+      output: entry.usage.output,
+      cacheRead: entry.usage.cacheRead,
+      cacheWrite: entry.usage.cacheWrite,
+      cost: entry.usage.cost.total,
+      sawUsage: true
+    };
+  }
+  return emptyContribution();
+}
+function snapshotFromTotals(totals) {
+  if (totals.input === 0 && totals.output === 0 && totals.cacheRead === 0 && totals.cacheWrite === 0 && totals.cost === 0)
+    return void 0;
   return {
     inputTokens: totals.input,
     outputTokens: totals.output,
@@ -11885,18 +12620,30 @@ function usageFromSession(session) {
     streaming: false
   };
 }
-function addUsage(totals, usage) {
+function addContribution(totals, usage) {
   totals.input += usage.input;
   totals.output += usage.output;
   totals.cacheRead += usage.cacheRead;
   totals.cacheWrite += usage.cacheWrite;
-  totals.cost += usage.cost.total;
+  totals.cost += usage.cost;
+}
+function subtractContribution(totals, usage) {
+  totals.input -= usage.input;
+  totals.output -= usage.output;
+  totals.cacheRead -= usage.cacheRead;
+  totals.cacheWrite -= usage.cacheWrite;
+  totals.cost -= usage.cost;
+}
+function emptyTotals() {
+  return { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0 };
+}
+function emptyContribution() {
+  return { ...emptyTotals(), sawUsage: false };
 }
 
 // extension-src/pi-style/pi/index.ts
 function usagePatch(ctx) {
-  const usage = usageFromSession(ctx.sessionManager);
-  return usage ? { usage } : {};
+  return { usage: usageFromSession(ctx.sessionManager) };
 }
 function activateReadOnlyTools(pi) {
   const available = new Set(pi.getAllTools().map((tool) => tool.name));
@@ -11931,6 +12678,7 @@ function piStyleExtension(pi) {
   const coordinator = createPiStyleSessionCoordinator(pi, compatibilityTestHooks);
   registerPiStyleCommand(pi, coordinator.app);
   pi.on("session_start", async (event, ctx) => {
+    resetUsageFromSessionCache(ctx.sessionManager);
     if (pi.getFlag("pi-style-readonly-tools") === true) {
       activateReadOnlyTools(pi);
     }
@@ -11964,40 +12712,57 @@ function piStyleExtension(pi) {
     )
   );
   pi.on("thinking_level_select", (event) => coordinator.app.update({ thinkingLevel: event.level }, "immediate"));
-  pi.on("session_info_changed", (event) => coordinator.app.update({ sessionName: event.name }, "coalesced"));
+  pi.on(
+    "session_info_changed",
+    (event) => coordinator.app.update({ sessionName: event.name }, "coalesced", { refreshExtensionStatuses: true })
+  );
   pi.on("message_start", () => {
     closeActiveBatch();
   });
   pi.on("message_update", () => coordinator.app.update({}, "coalesced"));
-  pi.on("message_end", (_event, ctx) => coordinator.app.update({ ...usagePatch(ctx) }, "coalesced"));
+  pi.on(
+    "message_end",
+    (_event, ctx) => coordinator.app.update({ ...usagePatch(ctx) }, "coalesced", { refreshContextUsage: true })
+  );
   pi.on("turn_end", (event, ctx) => {
     registerTurnFromMessage(event.message, event.toolResults);
-    coordinator.app.update({ ...usagePatch(ctx) }, "deferred");
+    coordinator.app.update({ ...usagePatch(ctx) }, "deferred", { refreshContextUsage: true });
   });
   pi.on("agent_end", () => {
     const run = finishAgentRun();
     if (run) {
       invalidateTurnMembers(run);
+      releaseTurnInvalidators(run);
       requestToolPresentationRender();
     }
   });
-  pi.on("agent_settled", (_event, ctx) => coordinator.app.update({ ...usagePatch(ctx) }, "coalesced"));
+  pi.on(
+    "agent_settled",
+    (_event, ctx) => coordinator.app.update({ ...usagePatch(ctx) }, "coalesced", { refreshContextUsage: true })
+  );
   pi.on("session_tree", (_event, ctx) => {
+    resetUsageFromSessionCache(ctx.sessionManager);
     rebuildTurnRegistryFromEntries(ctx.sessionManager.getEntries());
-    coordinator.app.update({ ...usagePatch(ctx) }, "deferred");
+    coordinator.app.update({ ...usagePatch(ctx) }, "deferred", { refreshContextUsage: true });
+  });
+  pi.on("session_compact", (_event, ctx) => {
+    resetUsageFromSessionCache(ctx.sessionManager);
+    coordinator.app.update({ ...usagePatch(ctx) }, "deferred", { refreshContextUsage: true });
   });
-  pi.on("session_compact", (_event, ctx) => coordinator.app.update({ ...usagePatch(ctx) }, "deferred"));
   pi.on("tool_result", (event, ctx) => {
     if (["write", "edit", "bash"].includes(event.toolName)) {
       coordinator.app.runtime.current?.invalidateGit();
-      coordinator.app.update({ ...usagePatch(ctx) }, "delayed-retry");
+      coordinator.app.update({ ...usagePatch(ctx) }, "delayed-retry", { refreshContextUsage: true });
     }
   });
   pi.on("user_bash", (_event, ctx) => {
     coordinator.app.runtime.current?.invalidateGit();
-    coordinator.app.update({ ...usagePatch(ctx) }, "delayed-retry");
+    coordinator.app.update({ ...usagePatch(ctx) }, "delayed-retry", { refreshContextUsage: true });
+  });
+  pi.on("session_shutdown", (_event, ctx) => {
+    resetUsageFromSessionCache(ctx.sessionManager);
+    coordinator.shutdown();
   });
-  pi.on("session_shutdown", () => coordinator.shutdown());
 }
 export {
   __setCompatibilityTestHooks,