@quandev104/pi-style 0.1.7 → 0.2.1

package/dist/extensions/pi-style.js

@@ -183,9 +183,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 +199,7 @@ function colorEscapes(mode, hex, kind) {
         suffix: kind === "fg" ? "\x1B[39m" : RESET_BACKGROUND
       };
     }
-    cache.set(cacheKey, cached);
+    cache.set(cacheKey2, cached);
   }
   return cached;
 }
@@ -411,8 +411,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, "");
@@ -684,10 +684,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 +703,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)}`;
@@ -868,7 +877,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) {
@@ -949,8 +958,16 @@ function renderBoxedOutputLines(theme, outputLines, width, rawLineBudget = DEFAU
   let nextInputIndex = 0;
   let truncated = false;
   for (; nextInputIndex < outputLines.length; nextInputIndex++) {
-    const line = boxedTruncatedLine(theme, outputLines[nextInputIndex] ?? "", width);
-    if (!pushBoundedLines(head, [line], headLimit)) {
+    const fragments = (outputLines[nextInputIndex] ?? "").split("\n");
+    let headExceeded = false;
+    for (const fragment of fragments) {
+      const line = boxedTruncatedLine(theme, fragment, width);
+      if (!pushBoundedLines(head, [line], headLimit)) {
+        headExceeded = true;
+        break;
+      }
+    }
+    if (headExceeded) {
       truncated = true;
       nextInputIndex++;
       break;
@@ -960,9 +977,12 @@ function renderBoxedOutputLines(theme, outputLines, width, rawLineBudget = DEFAU
   const tail = [];
   const tailStart = Math.max(nextInputIndex, outputLines.length - tailLimit);
   for (let i = tailStart; i < outputLines.length; i++) {
-    const line = boxedTruncatedLine(theme, outputLines[i] ?? "", width);
-    tail.push(line);
-    if (tail.length > tailLimit) tail.splice(0, tail.length - tailLimit);
+    const fragments = (outputLines[i] ?? "").split("\n");
+    for (const fragment of fragments) {
+      const line = boxedTruncatedLine(theme, fragment, width);
+      tail.push(line);
+      if (tail.length > tailLimit) tail.splice(0, tail.length - tailLimit);
+    }
   }
   const skippedInputLines = Math.max(0, tailStart - nextInputIndex);
   const skippedText = skippedInputLines > 0 ? `\u2026 rendered output truncated; ${skippedInputLines} input lines skipped before tail` : "\u2026 rendered output truncated";
@@ -1083,6 +1103,7 @@ function renderBoxedToolResult(theme, body, options = {}) {
       const bodyLines = typeof body === "function" ? body(maxContentWidth) : body.render(maxContentWidth);
       const errorPrefix = options.isError ? [theme.fg("error", options.errorLabel ?? "\u2717 Error")] : [];
       const outputLines = bodyLines.length > 0 ? [...errorPrefix, ...bodyLines] : [theme.fg("muted", `\u2205 ${options.emptyText ?? "(no output)"}`)];
+      const outputFragments = outputLines.flatMap((line) => line.split("\n"));
       const footerText = (options.footerLines ?? []).join(" \xB7 ");
       const dividerText = typeof options.dividerLabel === "function" ? options.dividerLabel(renderedWidth) : options.dividerLabel ?? "Response";
       const rendered = [
@@ -1097,7 +1118,12 @@ function renderBoxedToolResult(theme, body, options = {}) {
           )
         ],
         boxBlankLine(theme, renderedWidth),
-        ...renderBoxedOutputLines(theme, outputLines, renderedWidth, options.renderLineBudget ?? outputLines.length),
+        ...renderBoxedOutputLines(
+          theme,
+          outputFragments,
+          renderedWidth,
+          options.renderLineBudget ?? outputFragments.length
+        ),
         boxBlankLine(theme, renderedWidth),
         boxLabeledBorder(
           theme,
@@ -1419,7 +1445,8 @@ var sessionToolsConfig = {
   showElapsed: true,
   batchOpenGlyph: "\u25CF",
   nerdFonts: false,
-  collapseAfterTurn: true
+  collapseAfterTurn: true,
+  collapseMutatingTools: false
 };
 function setToolsRenderConfig(config) {
   sessionToolsConfig = { ...sessionToolsConfig, ...config };
@@ -1427,6 +1454,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";
@@ -1454,27 +1493,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
@@ -1510,6 +1557,7 @@ function createBatch(meta, leaderId, detail, opts = {}) {
     leaderId,
     startedAt: performance.now(),
     closed: false,
+    revision: 0,
     members: [
       {
         toolCallId: leaderId,
@@ -1525,14 +1573,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 };
   }
@@ -1551,6 +1605,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) {
@@ -1558,14 +1613,19 @@ 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) || 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 };
 }
@@ -1758,9 +1818,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;
     }
   };
 }
@@ -1775,6 +1842,13 @@ function emptyBatchResult() {
 }
 
 // extension-src/pi-style/features/tools/boxed/turn-summary.ts
+var MUTATING_TOOLS = /* @__PURE__ */ new Set(["edit", "write", "quick_edit", "substitute_edit", "target_edit"]);
+function isMutatingTool(toolName) {
+  return MUTATING_TOOLS.has(toolName);
+}
+function mutatingCollapses() {
+  return getToolsRenderConfig().collapseMutatingTools;
+}
 var memberByCallId = /* @__PURE__ */ new Map();
 var invalidateByCallId = /* @__PURE__ */ new Map();
 function resetTurnRegistry() {
@@ -1805,7 +1879,7 @@ function registerTurn(calls, isErrorById, ended) {
       isError: isErrorById.get(toolCallId) === true
     };
   });
-  const leader = members.find((member) => !member.isError);
+  const leader = members.find((member) => !member.isError && (!isMutatingTool(member.toolName) || mutatingCollapses()));
   const turn = {
     leaderId: leader?.toolCallId ?? "",
     ended: ended && complete,
@@ -1835,7 +1909,9 @@ function registerTurnFromMessage(message, toolResults) {
       isError: isErrorById.get(toolCallId) === true
     };
   });
-  const leader = newMembers.find((member) => !member.isError);
+  const leader = newMembers.find(
+    (member) => !member.isError && (!isMutatingTool(member.toolName) || mutatingCollapses())
+  );
   if (!currentRun) {
     currentRun = {
       leaderId: leader?.toolCallId ?? "",
@@ -1935,11 +2011,13 @@ function turnSummaryParts(turn) {
   const order = [];
   let failedCount = 0;
   let elapsedMs;
+  const collapseMutating = mutatingCollapses();
   for (const member of turn.members) {
     if (member.isError) {
       failedCount++;
       continue;
     }
+    if (!collapseMutating && isMutatingTool(member.toolName)) continue;
     if (member.elapsedMs !== void 0) elapsedMs = (elapsedMs ?? 0) + member.elapsedMs;
     const existing = counts.get(member.toolName);
     if (existing === void 0) {
@@ -1949,8 +2027,8 @@ function turnSummaryParts(turn) {
   }
   const parts = order.map((toolName) => {
     const count = counts.get(toolName) ?? 0;
-    const style = TURN_SUMMARY_STYLE[toolName] ?? { verb: "ran", unit: `${toolName} call` };
-    return `${style.verb} ${count} ${pluralForm(style.unit, count)}`;
+    const style = TURN_SUMMARY_STYLE[toolName];
+    return style ? `${style.verb} ${count} ${pluralForm(style.unit, count)}` : `used ${count} ${toolName}`;
   });
   return { parts, failedCount, elapsedMs };
 }
@@ -1959,7 +2037,7 @@ function formatTurnSummaryLine(theme, turn) {
   const parts = summary.parts.join(", ");
   let line = `${theme.fg("dim", `\u2794 ${parts}`)}`;
   if (summary.failedCount > 0)
-    line += theme.fg("error", ` \xB7 ${summary.failedCount} ${pluralForm("failed", summary.failedCount)}`);
+    line += theme.fg("error", ` \xB7 ${summary.failedCount} ${pluralForm("failure", summary.failedCount)}`);
   if (summary.elapsedMs !== void 0) line += theme.fg("dim", ` \xB7 ${(summary.elapsedMs / 1e3).toFixed(2)}s`);
   return line;
 }
@@ -4974,6 +5052,17 @@ function compactFooterWithState(theme, result, context, options = {}) {
 function resultFooterLines(theme, result, context, extraParts = []) {
   return [formatBoxedFooter(theme, result, extraParts, stateElapsedMs(context))];
 }
+function getRenderCacheKey(prefix, theme, ...parts) {
+  return [prefix, themeCacheKey(theme), getToolsRenderCacheSignature(), ...parts].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);
 }
@@ -5293,11 +5382,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) {
@@ -5305,7 +5394,7 @@ 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;
@@ -5320,14 +5409,14 @@ function createBashResultPreview(theme, text, options, color) {
           }
         }
         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;
         }
@@ -5336,7 +5425,7 @@ 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;
       }
@@ -5344,7 +5433,7 @@ function createBashResultPreview(theme, text, options, color) {
       const logicalLines = normalized.split("\n").map((l) => clampLineLength(l));
       const hasOutput = !(logicalLines.length === 1 && logicalLines[0] === "");
       if (!hasOutput) {
-        cacheKey = cacheId;
+        cacheKey2 = cacheId;
         cacheLines = [];
         return cacheLines;
       }
@@ -5355,11 +5444,11 @@ function createBashResultPreview(theme, text, options, color) {
         const truncated = expandedLines.slice(-cfg.maxExpandedLines).map(applyColor);
         const remaining = expandedLines.length - cfg.maxExpandedLines;
         truncated.unshift(theme.fg("dim", `\u2026 ${remaining} earlier lines`));
-        cacheKey = cacheId;
+        cacheKey2 = cacheId;
         cacheLines = truncated;
         return cacheLines;
       }
-      cacheKey = cacheId;
+      cacheKey2 = cacheId;
       cacheLines = expandedLines.map(applyColor);
       return cacheLines;
     }
@@ -5573,27 +5662,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;
     }
   };
 }
@@ -5602,7 +5699,26 @@ 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;
+        }
+        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);
@@ -5623,12 +5739,18 @@ var bashTool = {
         const parsed = parseSemanticOutput(cls, output);
         const state = semanticStates.get(context.toolCallId);
         if (parsed) {
-          if (state) state.parsed = parsed;
-          else
+          if (state) {
+            state.parsed = parsed;
+            state.finished = !options.isPartial;
+            state.revision++;
+            delete state.renderCache;
+          } else
             semanticStates.set(context.toolCallId, {
               cls,
               command: String(context?.args?.command ?? ""),
-              parsed
+              parsed,
+              finished: !options.isPartial,
+              revision: 0
             });
           if (isGitDiffClass(cls)) {
             return renderGitDiffResult(theme, parsed, options, context);
@@ -5638,7 +5760,12 @@ var bashTool = {
           }
           return EMPTY_BASH_TREE_RESULT;
         }
-        if (state) state.fallback = true;
+        if (state) {
+          state.fallback = true;
+          state.finished = !options.isPartial;
+          state.revision++;
+          delete state.renderCache;
+        }
       }
     } else if (options.isPartial) {
       startElapsedTicker(context.state, context.invalidate);
@@ -5651,7 +5778,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)
+    );
   }
 };
 
@@ -5731,21 +5871,33 @@ var editTool = {
     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);
+    return memoizedStateComponent(
+      context.state,
+      "__piStyleEditDiffResult",
+      getRenderCacheKey(
+        "edit-diff-result",
+        theme,
+        Boolean(expanded),
+        diff,
+        sourcePath ?? "",
+        editDiffFooter(theme, result, context, stats)
+      ),
+      () => renderBoxedToolResult(
+        theme,
+        {
+          render(width) {
+            return diffView.render(width);
+          },
+          invalidate() {
+            diffView.invalidate();
+          }
         },
-        invalidate() {
-          diffView.invalidate();
+        {
+          dividerLabel: diffDividerLabel2(theme, stats),
+          ...expandHint2 ? { dividerRightLabel: expandHint2 } : {},
+          footerLines: [editDiffFooter(theme, result, context, stats)]
         }
-      },
-      {
-        dividerLabel: diffDividerLabel2(theme, stats),
-        ...expandHint2 ? { dividerRightLabel: expandHint2 } : {},
-        footerLines: [editDiffFooter(theme, result, context, stats)]
-      }
+      )
     );
   }
 };
@@ -6142,21 +6294,34 @@ function renderQuickEditResult(_toolName, result, options, theme, context, confi
   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);
+  return memoizedStateComponent(
+    context.state,
+    "__piStyleQuickEditDiffResult",
+    getRenderCacheKey(
+      "quick-edit-diff-result",
+      theme,
+      config.toolLabel,
+      Boolean(expanded),
+      diff,
+      argPath,
+      quickEditDiffFooter(theme, result, context, stats)
+    ),
+    () => renderBoxedToolResult(
+      theme,
+      {
+        render(width) {
+          return diffView.render(width);
+        },
+        invalidate() {
+          diffView.invalidate();
+        }
       },
-      invalidate() {
-        diffView.invalidate();
+      {
+        dividerLabel: quickEditDividerLabel(theme, stats),
+        ...expandHint2 ? { dividerRightLabel: expandHint2 } : {},
+        footerLines: [quickEditDiffFooter(theme, result, context, stats)]
       }
-    },
-    {
-      dividerLabel: quickEditDividerLabel(theme, stats),
-      ...expandHint2 ? { dividerRightLabel: expandHint2 } : {},
-      footerLines: [quickEditDiffFooter(theme, result, context, stats)]
-    }
+    )
   );
 }
 function quickEditFooter(theme, context) {
@@ -6314,9 +6479,11 @@ var REGISTRY = {
   target_edit: quickEditToolFor("target_edit")
 };
 function collapsedTurnFor(toolCallId, expanded) {
-  if (expanded || !getToolsRenderConfig().collapseAfterTurn) return void 0;
+  const config = getToolsRenderConfig();
+  if (expanded || !config.collapseAfterTurn) return void 0;
   const entry = getTurnEntry(toolCallId);
   if (!entry?.turn.ended || entry.member.isError) return void 0;
+  if (isMutatingTool(entry.member.toolName) && !config.collapseMutatingTools) return void 0;
   return entry.turn;
 }
 function renderBoxedToolCall2(toolName, args, theme, context) {
@@ -6596,14 +6763,27 @@ function createToolDecorationOwner(snapshot = {}) {
         if (typeof renderer !== "function") {
           neutralizeToolContainerBackground(instance);
           if (subtype === "tool-call-renderer")
-            return (callArgs, theme, context) => renderBoxedToolCall2(toolName, callArgs, theme, context);
-          return (result, options, theme, context) => renderBoxedToolResult2(
-            toolName,
-            result,
-            options,
-            theme,
-            context
-          );
+            return (callArgs, theme, context) => {
+              const component = renderBoxedToolCall2(
+                toolName,
+                callArgs,
+                theme,
+                context
+              );
+              if (component === EMPTY_BATCH_COMPONENT) hideBatchMember(instance);
+              return component;
+            };
+          return (result, options, theme, context) => {
+            const component = renderBoxedToolResult2(
+              toolName,
+              result,
+              options,
+              theme,
+              context
+            );
+            if (component === EMPTY_BATCH_COMPONENT) hideBatchMember(instance);
+            return component;
+          };
         }
         return function(...rendererArgs) {
           const valid = subtype === "tool-call-renderer" ? validCallArgs(rendererArgs) : validResultArgs(rendererArgs);
@@ -6824,7 +7004,8 @@ var DEFAULT_CONFIG = Object.freeze({
     maxExpandedLines: 50,
     dimOutput: false,
     showElapsed: true,
-    collapseAfterTurn: true
+    collapseAfterTurn: true,
+    collapseMutatingTools: false
   }),
   theme: Object.freeze({
     nerdFonts: "auto",
@@ -6940,7 +7121,8 @@ function normalizeConfig(input, defaults = DEFAULT_CONFIG) {
       maxExpandedLines: maxExpanded,
       dimOutput: bool(tools.dimOutput, defaults.tools.dimOutput),
       showElapsed: bool(tools.showElapsed, defaults.tools.showElapsed),
-      collapseAfterTurn: bool(tools.collapseAfterTurn, defaults.tools.collapseAfterTurn)
+      collapseAfterTurn: bool(tools.collapseAfterTurn, defaults.tools.collapseAfterTurn),
+      collapseMutatingTools: bool(tools.collapseMutatingTools, defaults.tools.collapseMutatingTools)
     }),
     theme: Object.freeze({
       nerdFonts: stringEnum(theme.nerdFonts, ["auto", "on", "off"], defaults.theme.nerdFonts),
@@ -6988,6 +7170,7 @@ var BOOL_PATHS = /* @__PURE__ */ new Set([
   "tools.showElapsed",
   "tools.dimOutput",
   "tools.collapseAfterTurn",
+  "tools.collapseMutatingTools",
   "compatibility.allowSafePatches",
   "compatibility.allowCorePatches",
   "compatibility.preferExistingEditor",
@@ -7458,6 +7641,7 @@ var allowedPaths = /* @__PURE__ */ new Set([
   "tools.dimOutput",
   "tools.showElapsed",
   "tools.collapseAfterTurn",
+  "tools.collapseMutatingTools",
   "theme.nerdFonts",
   "theme.terminalBackgroundSync",
   "theme.autoApply",
@@ -7486,6 +7670,7 @@ function validatePathValue(path, value) {
     "tools.showElapsed",
     "tools.dimOutput",
     "tools.collapseAfterTurn",
+    "tools.collapseMutatingTools",
     "compatibility.allowSafePatches",
     "compatibility.allowCorePatches",
     "compatibility.preferExistingEditor",
@@ -8205,6 +8390,7 @@ var StyledEditor = class extends CustomEditor {
   onSnapshot;
   semantic;
   disposed = false;
+  renderPlanCache;
   constructor(tui, theme, keybindings, options) {
     super(tui, theme, keybindings);
     this.config = options.config;
@@ -8234,61 +8420,23 @@ var StyledEditor = class extends CustomEditor {
   invalidate() {
     super.invalidate();
     this.semantic = semanticTheme(this.piTheme, this.config);
+    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) {
@@ -8297,10 +8445,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() {
@@ -8308,6 +8456,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");
@@ -8549,13 +8750,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) {
@@ -9618,16 +9819,51 @@ 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 = () => {
-}) {
+function createPiStyleRuntime(host, generation2, requestRender = host.requestRender ?? (() => {
+})) {
   let disposed = false;
   const extensionStatuses = () => {
     if (!host.extensionStatusProvider) return void 0;
@@ -9638,13 +9874,22 @@ 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);
   const contextProvider = new InMemoryContextProvider();
   const usageProvider = new InMemoryUsageProvider();
-  const usage = host.getContextUsage?.();
+  const initialContext = contextSnapshot();
   const initialStatuses = extensionStatuses();
   const initialValues = {
     ...initialStatuses ? { extensionStatuses: initialStatuses } : {},
@@ -9653,13 +9898,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;
@@ -9670,14 +9909,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" };
@@ -9740,7 +10000,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,
@@ -9789,27 +10049,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 },
@@ -9818,49 +10061,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;
@@ -9895,17 +10122,7 @@ function createPiStyleRuntime(host, generation2, requestRender = () => {
       git.invalidate(host.cwd);
       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
-        });
-        requestRender();
+        if (updateSnapshot(withSnapshotPatch({ git: value }))) requestRender();
       });
     },
     get disposed() {
@@ -10109,10 +10326,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() {
@@ -10415,9 +10632,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),
@@ -10425,6 +10644,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;
   }
@@ -10455,17 +10676,27 @@ 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 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)) {
@@ -10497,39 +10728,6 @@ function isBackgroundSgr(sequence) {
   }
   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) : "";
-  if (index === contentIndex && firstEnvelope)
-    return `${firstEnvelope.start}${rebuildAtWidth(firstEnvelope.body, width, prefix)}${firstEnvelope.end}`;
-  if (index === contentIndex && firstHasStart)
-    return `${OSC133_ZONE_START}${rebuildAtWidth(line.slice(OSC133_ZONE_START.length), width, prefix)}`;
-  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
-    )}`;
-  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
-    )}`;
-  return rebuildAtWidth(line, width, lead);
-}
 function contentText(line) {
   let output = "";
   for (let index = 0; index < line.length; index++) {
@@ -10553,32 +10751,127 @@ function contentText(line) {
 function hasContent(line) {
   return [...contentText(line)].some((character) => !/\s/u.test(character));
 }
+function getLineAnalysis(line) {
+  const cached = lineAnalysisCache.get(line);
+  if (cached) {
+    messageDecorationTestState.lineCacheHits++;
+    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 analysis = {
+    visibleWidth: visibleWidth(line),
+    hasContent: hasContent(line),
+    oscEnvelope: extractOscEnvelope(line),
+    hasOscStart: line.startsWith(OSC133_ZONE_START),
+    leadingMarkers,
+    isBackgroundWrapped,
+    backgroundAnsi,
+    backgroundBody,
+    backgroundBodyWidth: backgroundBody === void 0 ? void 0 : visibleWidth(backgroundBody)
+  };
+  lineAnalysisCache.set(line, analysis);
+  if (lineAnalysisCache.size > MAX_LINE_ANALYSIS_ENTRIES) {
+    const oldestKey = lineAnalysisCache.keys().next().value;
+    if (oldestKey !== void 0) lineAnalysisCache.delete(oldestKey);
+  }
+  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 } = options;
+  const lead = index === contentIndex ? prefix : index > contentIndex ? " ".repeat(prefixWidth) : "";
+  const leadWidth = index < contentIndex ? 0 : prefixWidth;
+  if (index === contentIndex && firstEnvelope)
+    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, 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,
+      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,
+      prefixWidth
+    )}`;
+  return rebuildAtWidth(line, width, lead, leadWidth, analysis);
+}
+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 true;
+}
+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 = visibleWidth(prefix);
   if (width <= prefixWidth) return void 0;
   const bodyWidth = width - prefixWidth;
   const first = nativeLines[0] ?? "";
   const last = nativeLines.at(-1) ?? "";
+  const lastAnalysis = 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);
+    if (index !== nativeLines.length - 1 || !multilineEnvelope) return getLineAnalysis(line).hasContent;
+    return !nativeLines.slice(0, index).some((earlier) => getLineAnalysis(earlier).hasContent) && lastAnalysis.hasContent;
   });
   if (firstContentIndex < 0) return nativeLines;
-  const firstEnvelope = firstContentIndex === 0 ? extractOscEnvelope(first) : void 0;
-  const firstHasStart = firstContentIndex === 0 && first.startsWith(OSC133_ZONE_START);
+  const firstAnalysis = getLineAnalysis(first);
+  const firstEnvelope = firstContentIndex === 0 ? firstAnalysis.oscEnvelope : void 0;
+  const firstHasStart = firstContentIndex === 0 && firstAnalysis.hasOscStart;
   const decorated = nativeLines.map(
     (line, index) => decorateMessageLine(line, index, nativeLines.length - 1, firstContentIndex, width, {
       firstEnvelope,
       firstHasStart,
       multilineEnvelope,
-      prefix
+      prefix,
+      prefixWidth
     })
   );
-  if (!decorated.every((line) => visibleWidth4(line) <= width)) return void 0;
-  if (!nativeLines.every((line) => visibleWidth4(line) <= bodyWidth)) return void 0;
+  if (!decorated.every((line) => visibleWidth(line) <= width)) return void 0;
+  if (!nativeLines.every((line) => getLineAnalysis(line).visibleWidth <= bodyWidth)) return void 0;
   return decorated;
 }
 function decorateMessageRender(original, instance, args, snapshot = {
@@ -10591,10 +10884,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 = visibleWidth(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";
@@ -10954,7 +11257,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) {
@@ -11810,22 +12113,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,
@@ -11836,18 +12251,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));
@@ -11882,6 +12309,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);
     }
@@ -11915,15 +12343,21 @@ 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();
@@ -11932,23 +12366,33 @@ function piStyleExtension(pi) {
       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,