@ashx-j/lunr 0.2.26 → 0.2.28

package/dist/node-runtime/{chunk-RCR3XAQY.js → chunk-QT3F6UEV.js}

@@ -2,13 +2,13 @@ import { createRequire as __lunrRequire } from "node:module"; const require = __
 import {
   checkForUpdate,
   markUpdateNotified
-} from "./chunk-KWA4OC2J.js";
+} from "./chunk-H6YBCWKG.js";
 import {
   getSubagentSpinnerDefinition
 } from "./chunk-US544NN6.js";
 import {
   computeContextBreakdown
-} from "./chunk-CDVHZOOK.js";
+} from "./chunk-RY3FJ6WI.js";
 import {
   copyToClipboard,
   readClipboardText
@@ -20,7 +20,7 @@ import {
 import {
   BootScreenComponent,
   registerPermissionModeBridge
-} from "./chunk-RWTKOC3B.js";
+} from "./chunk-QBTJG3UM.js";
 import {
   nextModeForGoal,
   registerPermissionModeControlBridge
@@ -34,9 +34,12 @@ import {
   beginTurn,
   captureTreeChanges,
   clearRollback,
+  commitRollbackTurn,
   disableRollbackForSession,
   enableRollbackForSession,
   formatMissingSessionCwdPrompt,
+  getRollbackRecoveryBlockReason,
+  getRollbackTargetUserId,
   initRollback,
   isRollbackEnabled,
   isRollbackSessionForceEnabled,
@@ -45,24 +48,19 @@ import {
   peekRollbackTurnsConsumed,
   rollbackLastTurn,
   setRollbackWarningHandler
-} from "./chunk-LJTIVM7I.js";
+} from "./chunk-BMRXLQWQ.js";
 import {
   notifyTodosEnabledChanged
 } from "./chunk-CCCN2UCX.js";
 import {
   parseGitUrl
-} from "./chunk-RAK2QA2B.js";
+} from "./chunk-UYRKUKFE.js";
 import {
   createAllToolDefinitions,
   ensureTool,
   getToolPath,
   truncateToVisualLines
-} from "./chunk-YWOJIGFY.js";
-import {
-  DEFAULT_MAX_BYTES,
-  DEFAULT_MAX_LINES,
-  truncateTail
-} from "./chunk-53YJI7JU.js";
+} from "./chunk-ZEVFBFNF.js";
 import {
   formatGroupedCall,
   getTextOutput,
@@ -70,17 +68,22 @@ import {
   toolGroupRole,
   toolGroupTree,
   toolStatusDot
-} from "./chunk-5ZQXRPMC.js";
+} from "./chunk-6ZZHGUSA.js";
+import {
+  DEFAULT_MAX_BYTES,
+  DEFAULT_MAX_LINES,
+  truncateTail
+} from "./chunk-53YJI7JU.js";
 import {
   convertToPng,
   processImage
-} from "./chunk-XHIRAZ26.js";
+} from "./chunk-IAZSK7KK.js";
 import {
   formatCatalogRefreshSummary,
   hasGrokCliXaiAuth,
   refreshModelCandidatesForInit,
   stripJsonComments
-} from "./chunk-KJ6DWS3K.js";
+} from "./chunk-XEOCUEUJ.js";
 import {
   HTTP_IDLE_TIMEOUT_CHOICES,
   SKILL_TAG_CHARACTERS,
@@ -88,38 +91,30 @@ import {
   SUBAGENT_SPINNER_NAMES,
   configureHttpDispatcher,
   formatHttpIdleTimeoutMs
-} from "./chunk-I74LN5JG.js";
+} from "./chunk-HUD2RFJW.js";
 import {
   ProjectTrustStore,
   getProjectTrustOptions,
   hasTrustRequiringProjectResources
-} from "./chunk-HTFRRDSF.js";
+} from "./chunk-F2SMQ6ES.js";
 import {
-  computeFileLists,
-  createFileOps,
   defaultModelPerProvider,
-  extractFileOpsFromMessage,
   findExactModelReferenceMatch,
   resolveModelScope
-} from "./chunk-GYIXXQAO.js";
+} from "./chunk-ICKGAKWX.js";
 import {
   SubagentEscapeSequence,
   getSubagentCancellation
 } from "./chunk-BBUVIEZB.js";
 import {
-  AUTO_MODE_ADDENDUM,
-  READ_ONLY_MODE_ADDENDUM,
-  getPermissionMode,
   nextPermissionMode,
   registerApprovalHandler,
-  resetPermissions,
-  restorePermissionModeAfterPlan,
-  setPermissionMode
-} from "./chunk-WIF24I7G.js";
+  restorePermissionModeAfterPlan
+} from "./chunk-APVM5NEU.js";
 import {
   getGlobalInstructionsPath,
   getModelInstructionsPath
-} from "./chunk-M3LZLQW2.js";
+} from "./chunk-BDRGN3L2.js";
 import {
   clearRegistry,
   isWindows,
@@ -129,21 +124,21 @@ import {
   pause,
   restart,
   resume
-} from "./chunk-KKUTQQV7.js";
+} from "./chunk-RYRGL7P4.js";
 import {
   killTrackedDetachedChildren
-} from "./chunk-CSFI6YXL.js";
+} from "./chunk-ES6PBSIE.js";
 import {
   cancelSessionHandoff,
   markSessionHandoff,
   recordTuiActivity,
   registerTransferHandler,
   requestSessionTransfer
-} from "./chunk-I54LGHWM.js";
+} from "./chunk-STMX7W5I.js";
 import {
   SessionManager,
   sessionEntryToContextMessages
-} from "./chunk-2KIPT4HJ.js";
+} from "./chunk-PWHTSQC4.js";
 import {
   createCompactionSummaryMessage
 } from "./chunk-FVDOXRUD.js";
@@ -161,41 +156,46 @@ import {
 import {
   getAllPlanUsageResults,
   getUsageServiceBridge
-} from "./chunk-2MI5OPMN.js";
+} from "./chunk-HNNHHJAB.js";
 import {
   SessionSelectorComponent
-} from "./chunk-PCEW76PM.js";
+} from "./chunk-2OIPYKLZ.js";
 import {
   CustomEditor
 } from "./chunk-H2EOZYMP.js";
 import {
   KeybindingsManager
-} from "./chunk-5EFIU3OM.js";
+} from "./chunk-FTKEZL27.js";
 import {
   time
 } from "./chunk-PVCDKGR6.js";
+import {
+  collectUsageRequests,
+  totalRequestUsage,
+  usageTokens
+} from "./chunk-SWWHZ2RI.js";
 import {
   markStartupMilestone
 } from "./chunk-CCZJ3PYY.js";
 import {
   ExtensionSelectorComponent
-} from "./chunk-QH6YL7VK.js";
+} from "./chunk-252ZVPPF.js";
 import {
   ExtensionInputComponent
-} from "./chunk-HMBGROQK.js";
+} from "./chunk-GLDXBBL6.js";
 import {
   CountdownTimer
 } from "./chunk-I6R76AG7.js";
 import {
   DynamicBorder
-} from "./chunk-6VYZ5UFP.js";
+} from "./chunk-FLGEEH27.js";
 import {
   formatKeyText,
   keyDisplayText,
   keyHint,
   keyText,
   rawKeyHint
-} from "./chunk-GS42T6MX.js";
+} from "./chunk-QW3AAHWN.js";
 import {
   FS_WATCH_RETRY_DELAY_MS,
   Theme,
@@ -221,7 +221,7 @@ import {
   stopThemeWatcher,
   theme,
   watchWithErrorHandler
-} from "./chunk-RDDAZOMU.js";
+} from "./chunk-JL4HYQXK.js";
 import {
   APP_NAME,
   APP_TITLE,
@@ -235,7 +235,7 @@ import {
   getDocsPath,
   getShareViewerUrl,
   normalizePath
-} from "./chunk-FQMM2EZ2.js";
+} from "./chunk-64XTQNLA.js";
 
 // packages/coding-agent/dist/modes/interactive/interactive-mode.js
 import * as crypto from "node:crypto";
@@ -244,7 +244,6 @@ import * as os2 from "node:os";
 import * as path2 from "node:path";
 import { getSupportedThinkingLevels } from "@ashx-j/lunr-ai/compat";
 import { CombinedAutocompleteProvider, Container as Container19, collectImageMarkerIds, formatImageMarker, fuzzyFilter as fuzzyFilter5, isFocusable, Markdown as Markdown10, matchesKey as matchesKey2, ProcessTerminal, Spacer as Spacer19, setKeybindings, Text as Text21, TruncatedText as TruncatedText2, TUI, visibleWidth as visibleWidth6 } from "@ashx-j/lunr-tui";
-import chalk from "chalk";
 import { spawn as spawn3, spawnSync } from "child_process";
 
 // packages/coding-agent/dist/core/cache-stats.js
@@ -421,6 +420,9 @@ function shouldPollGitHead(repoDir) {
 var FooterDataProvider = class _FooterDataProvider {
   cwd;
   static WATCH_DEBOUNCE_MS = 500;
+  static DIFFSTAT_REFRESH_MS = 2e3;
+  diffstatTimer = null;
+  diffstatStale = !0;
   extensionStatuses = /* @__PURE__ */ new Map();
   cachedBranch = void 0;
   cachedDiffstat = void 0;
@@ -447,7 +449,9 @@ var FooterDataProvider = class _FooterDataProvider {
   }
   /** Staged + unstaged added/removed vs HEAD. Null until the asynchronous lookup completes. */
   getGitDiffstat() {
-    return this.cachedDiffstat === void 0 && !this.refreshInFlight && this.refreshGitData(), this.cachedDiffstat ?? null;
+    return this.diffstatStale && !this.refreshInFlight && this.refreshGitData(), !this.disposed && !this.diffstatTimer && (this.diffstatTimer = setTimeout(() => {
+      this.diffstatTimer = null, this.diffstatStale = !0, this.notifyBranchChange();
+    }, _FooterDataProvider.DIFFSTAT_REFRESH_MS), this.diffstatTimer.unref()), this.cachedDiffstat ?? null;
   }
   /** Extension status texts set via ctx.ui.setStatus() */
   getExtensionStatuses() {
@@ -474,11 +478,14 @@ var FooterDataProvider = class _FooterDataProvider {
     this.availableProviderCount = count;
   }
   setCwd(cwd) {
-    this.cwd !== cwd && (this.cwd = cwd, this.refreshTimer && (clearTimeout(this.refreshTimer), this.refreshTimer = null), this.clearGitWatchers(), this.cachedBranch = void 0, this.cachedDiffstat = void 0, this.gitPaths = void 0, this.refreshInFlight && (this.refreshPending = !0), this.notifyBranchChange());
+    this.cwd !== cwd && (this.cwd = cwd, this.clearDiffstatTimer(), this.diffstatStale = !0, this.refreshTimer && (clearTimeout(this.refreshTimer), this.refreshTimer = null), this.clearGitWatchers(), this.cachedBranch = void 0, this.cachedDiffstat = void 0, this.gitPaths = void 0, this.refreshInFlight && (this.refreshPending = !0), this.notifyBranchChange());
   }
   /** Internal: cleanup */
   dispose() {
-    this.disposed = !0, this.refreshTimer && (clearTimeout(this.refreshTimer), this.refreshTimer = null), this.clearGitWatchers(), this.branchChangeCallbacks.clear();
+    this.disposed = !0, this.clearDiffstatTimer(), this.refreshTimer && (clearTimeout(this.refreshTimer), this.refreshTimer = null), this.clearGitWatchers(), this.branchChangeCallbacks.clear();
+  }
+  clearDiffstatTimer() {
+    this.diffstatTimer && clearTimeout(this.diffstatTimer), this.diffstatTimer = null;
   }
   notifyBranchChange() {
     for (let cb of this.branchChangeCallbacks)
@@ -516,7 +523,7 @@ var FooterDataProvider = class _FooterDataProvider {
       if (this.disposed || this.cwd !== cwd)
         return;
       let prevBranch = this.cachedBranch, prevDiff = this.cachedDiffstat, branchChanged = prevBranch !== nextBranch, diffChanged = prevDiff?.added !== nextDiff?.added || prevDiff?.removed !== nextDiff?.removed;
-      this.cachedBranch = nextBranch, this.cachedDiffstat = nextDiff, (branchChanged || diffChanged) && this.notifyBranchChange();
+      this.cachedBranch = nextBranch, this.cachedDiffstat = nextDiff, this.diffstatStale = !1, (branchChanged || diffChanged) && this.notifyBranchChange();
     } finally {
       this.refreshInFlight = !1, this.refreshPending && !this.disposed && (this.refreshPending = !1, this.scheduleRefresh());
     }
@@ -1115,6 +1122,52 @@ var ArminComponent = class {
 // packages/coding-agent/dist/modes/interactive/components/assistant-message.js
 import { Container, Markdown as Markdown2, Spacer, Text } from "@ashx-j/lunr-tui";
 
+// packages/coding-agent/dist/utils/sanitize-terminal-text.js
+function sanitizeTerminalText(source) {
+  if (!/[\x00-\x08\x0b-\x1f\x7f-\x9f]/.test(source))
+    return source;
+  let parts = [], index = 0, plainStart = 0;
+  for (; index < source.length; ) {
+    let code = source.charCodeAt(index);
+    if (code === 9 || code === 10 || code >= 32 && (code < 127 || code > 159)) {
+      index++;
+      continue;
+    }
+    if (parts.push(source.slice(plainStart, index)), index++, code === 13)
+      source.charCodeAt(index) === 10 && index++, parts.push(`
+`);
+    else {
+      let sequence = code;
+      if (code === 27 && index < source.length) {
+        let next = source.charCodeAt(index);
+        if (next >= 64 && next <= 95)
+          sequence = next + 64, index++;
+        else {
+          for (; source.charCodeAt(index) >= 32 && source.charCodeAt(index) <= 47; )
+            index++;
+          source.charCodeAt(index) >= 48 && source.charCodeAt(index) <= 126 && index++;
+        }
+      }
+      if (sequence === 155) {
+        for (; source.charCodeAt(index) >= 32 && source.charCodeAt(index) <= 63; )
+          index++;
+        source.charCodeAt(index) >= 64 && source.charCodeAt(index) <= 126 && index++;
+      } else if ([144, 152, 157, 158, 159].includes(sequence))
+        for (; index < source.length; ) {
+          let next = source.charCodeAt(index++);
+          if (next === 156 || sequence === 157 && next === 7)
+            break;
+          if (next === 27 && source.charCodeAt(index) === 92) {
+            index++;
+            break;
+          }
+        }
+    }
+    plainStart = index;
+  }
+  return parts.push(source.slice(plainStart)), parts.join("");
+}
+
 // packages/coding-agent/dist/modes/interactive/components/copyable-text.js
 import { truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@ashx-j/lunr-tui";
 function sourceLines(source) {
@@ -1208,13 +1261,13 @@ var CopyableTextBlockComponent = class {
     let horizontalPad = Math.min(this.outputPad, Math.max(0, width - 1)), pad = " ".repeat(horizontalPad), contentWidth = Math.max(1, width - horizontalPad * 2), paint = (content) => {
       let line = truncateToWidth(`${pad}${content}`, width, "");
       return theme.bg("userMessageBg", `${line}${" ".repeat(Math.max(0, width - visibleWidth(line)))}`);
-    }, lines = [paint("")], payloadLines = this.payload.replace(/\t/g, "   ").split(`
+    }, lines = [paint("")], payloadLines = sanitizeTerminalText(this.payload).replace(/\t/g, "   ").split(`
 `);
     for (let payloadLine of payloadLines)
       for (let wrappedLine of wrapTextWithAnsi(payloadLine, contentWidth))
         lines.push(paint(theme.fg("userMessageText", wrappedLine)));
     if (typeof this.status == "object")
-      for (let wrappedLine of wrapTextWithAnsi(`Copy failed: ${this.status.error}`, contentWidth))
+      for (let wrappedLine of wrapTextWithAnsi(`Copy failed: ${sanitizeTerminalText(this.status.error)}`, contentWidth))
         lines.push(paint(theme.fg("error", wrappedLine)));
     return lines.push(paint("")), this.renderedRows = lines.length, lines;
   }
@@ -1405,7 +1458,7 @@ var OSC133_ZONE_START = "\x1B]133;A\x07", OSC133_ZONE_END = "\x1B]133;B\x07", OS
       if (content.type === "text" && content.text.trim())
         for (let segment of parseCopyableTextSegments(content.text)) {
           if (segment.type === "markdown") {
-            let trimmed = segment.text.trim();
+            let trimmed = sanitizeTerminalText(segment.text).trim();
             if (!trimmed)
               continue;
             let text = isFirstTextBlock ? `\u25CF ${trimmed}` : trimmed;
@@ -1430,7 +1483,7 @@ var OSC133_ZONE_START = "\x1B]133;A\x07", OSC133_ZONE_END = "\x1B]133;B\x07", OS
         if (i--, displayBlocks.length === 0 || this.hideThinkingBlock)
           continue;
         let sourceBlocks = sourceThinkingRuns[thinkingRunIndex] ?? [], fullyRevealed = displayBlocks.length === sourceBlocks.length && displayBlocks.every((block, index) => block === sourceBlocks[index]);
-        this.renderThinkingRun(thinkingRunIndex, displayBlocks, message, i, fullyRevealed);
+        this.renderThinkingRun(thinkingRunIndex, displayBlocks.map(sanitizeTerminalText), message, i, fullyRevealed);
       }
     }
     let hasToolCalls = message.content.some((c) => c.type === "toolCall");
@@ -1439,10 +1492,10 @@ var OSC133_ZONE_START = "\x1B]133;A\x07", OSC133_ZONE_END = "\x1B]133;B\x07", OS
     else if (!hasToolCalls) {
       if (message.stopReason === "aborted") {
         let abortMessage = message.errorMessage && message.errorMessage !== "Request was aborted" ? message.errorMessage : "Operation aborted";
-        this.contentContainer.addChild(new Spacer(1)), this.contentContainer.addChild(new Text(theme.fg("error", abortMessage), this.outputPad, 0));
+        this.contentContainer.addChild(new Spacer(1)), this.contentContainer.addChild(new Text(theme.fg("error", sanitizeTerminalText(abortMessage)), this.outputPad, 0));
       } else if (message.stopReason === "error") {
         let errorMsg = message.errorMessage || "Unknown error";
-        this.contentContainer.addChild(new Spacer(1)), this.contentContainer.addChild(new Text(theme.fg("error", `Error: ${errorMsg}`), this.outputPad, 0));
+        this.contentContainer.addChild(new Spacer(1)), this.contentContainer.addChild(new Text(theme.fg("error", `Error: ${sanitizeTerminalText(errorMsg)}`), this.outputPad, 0));
       }
     }
     this.onThinkingAnimationChange?.(this.thinkingAnimationActive);
@@ -1735,14 +1788,13 @@ var FooterComponent = class {
   dispose() {
   }
   render(width) {
-    let state = this.session.state, totalInput = 0, totalOutput = 0, totalCacheRead = 0, totalCacheWrite = 0, totalCost = 0, latestCacheHitRate;
+    let state = this.session.state, totals = totalRequestUsage(collectUsageRequests(this.session.sessionManager.getEntries())), { input: totalInput, output: totalOutput, cacheRead: totalCacheRead, cacheWrite: totalCacheWrite } = totals, totalCost = totals.cost, latestCacheHitRate;
     for (let entry of this.session.sessionManager.getEntries())
       if (entry.type === "message" && entry.message.role === "assistant") {
-        totalInput += entry.message.usage.input, totalOutput += entry.message.usage.output, totalCacheRead += entry.message.usage.cacheRead, totalCacheWrite += entry.message.usage.cacheWrite, totalCost += entry.message.usage.cost.total;
         let latestPromptTokens = entry.message.usage.input + entry.message.usage.cacheRead + entry.message.usage.cacheWrite;
         latestCacheHitRate = latestPromptTokens > 0 ? entry.message.usage.cacheRead / latestPromptTokens * 100 : void 0;
       }
-    let contextUsage = this.session.getContextUsage(), contextWindow = contextUsage?.contextWindow ?? state.model?.contextWindow ?? 0, contextPercentValue = contextUsage?.percent ?? 0, contextPercent = contextUsage?.percent !== null ? contextPercentValue.toFixed(1) : "?", pwd = formatCwdForFooter(this.session.sessionManager.getCwd(), process.env.HOME || process.env.USERPROFILE), branch = this.footerData.getGitBranch();
+    let contextUsage = this.session.getContextUsage(), contextWindow = contextUsage?.contextWindow ?? state.model?.contextWindow ?? 0, contextPercentValue = contextUsage?.percent ?? 0, contextPercent = contextUsage?.percent !== null ? `${contextUsage?.estimated ? "~" : ""}${contextPercentValue.toFixed(1)}` : "?", pwd = formatCwdForFooter(this.session.sessionManager.getCwd(), process.env.HOME || process.env.USERPROFILE), branch = this.footerData.getGitBranch();
     branch && (pwd = `${pwd} (${branch})`);
     let sessionName = this.session.sessionManager.getSessionName();
     sessionName && (pwd = `${pwd} \u2022 ${sessionName}`);
@@ -1833,8 +1885,8 @@ function renderThemedBox(headerText, content, maxWidth) {
 }
 function renderUsageBox(data, maxWidth) {
   let content = [];
-  if (data.sessionTotals && data.sessionTotals.total > 0 && (content.push("Session usage"), content.push(`  input ${formatTokens(data.sessionTotals.input)}  output ${formatTokens(data.sessionTotals.output)}  total ${formatTokens(data.sessionTotals.total)}${formatCachedSuffix(data.sessionTotals.input, data.sessionTotals.cacheRead ?? 0, data.sessionTotals.cacheWrite ?? 0)}`)), data.breakdown) {
-    content.length > 0 && content.push(""), content.push("Context"), content.push(theme.fg("dim", "Estimated (chars/4), current session only \u2014 actual token counts may differ."));
+  if (data.sessionTotals && (data.sessionTotals.total > 0 || data.sessionTotals.requests || data.sessionTotals.unknownRequests || data.sessionTotals.partialRequests) && (content.push("Parent usage including auxiliary requests"), content.push(`  input ${formatTokens(data.sessionTotals.input + (data.sessionTotals.cacheRead ?? 0) + (data.sessionTotals.cacheWrite ?? 0))}  output ${formatTokens(data.sessionTotals.output)}  total ${formatTokens(data.sessionTotals.total)}${formatCachedSuffix(data.sessionTotals.input, data.sessionTotals.cacheRead ?? 0, data.sessionTotals.cacheWrite ?? 0)}`)), data.sessionTotals?.unknownRequests && content.push(`  Usage unavailable for ${data.sessionTotals.unknownRequests} request(s).`), data.sessionTotals?.partialRequests && content.push(`  Usage incomplete for ${data.sessionTotals.partialRequests} request(s).`), (data.childTotals?.total || data.childTotals?.unknownRequests || data.childTotals?.partialRequests) && content.push(`  children ${formatTokens(data.childTotals.total)}  combined ${formatTokens(data.combinedTotals?.total ?? 0)}`), data.childTotals?.unknownRequests && content.push(`  Child usage unavailable for ${data.childTotals.unknownRequests} request(s).`), data.childTotals?.partialRequests && content.push(`  Child usage incomplete for ${data.childTotals.partialRequests} request(s).`), data.breakdown) {
+    content.length > 0 && content.push(""), content.push("Context"), content.push(theme.fg("dim", "Estimated visible context. Tokenization, images and hidden reasoning may differ."));
     let rows = [
       { label: "System prompt", tokens: data.breakdown.systemPrompt },
       ...data.breakdown.contextFiles.map((file) => ({ label: file.label, tokens: file.tokens })),
@@ -1842,7 +1894,7 @@ function renderUsageBox(data, maxWidth) {
       { label: "Tool definitions", tokens: data.breakdown.toolDefinitions },
       { label: "User messages", tokens: data.breakdown.user },
       { label: "Assistant text", tokens: data.breakdown.assistantText },
-      { label: "Thinking", tokens: data.breakdown.thinking },
+      { label: "Visible thinking", tokens: data.breakdown.thinking },
       { label: "Tool calls", tokens: data.breakdown.toolCalls },
       { label: "Tool results", tokens: data.breakdown.toolResults },
       { label: "Summaries", tokens: data.breakdown.summaries },
@@ -1865,7 +1917,7 @@ function renderUsageBox(data, maxWidth) {
       continue;
     content.length > 0 && content.push("");
     let planName = plan.planLabel ? `${plan.provider} \xB7 ${plan.planLabel}` : plan.provider;
-    content.push(`Plan usage (${planName})`);
+    content.push(`Plan usage (${planName}, cached up to 60s)`);
     let labelWidth = Math.max(...plan.windows.map((window) => window.label.length));
     for (let window of plan.windows)
       content.push(planWindowLine(window, labelWidth));
@@ -1882,7 +1934,7 @@ function rowLine(row, labelWidth) {
 }
 function renderContextBox(data, maxWidth) {
   let { breakdown } = data, content = [];
-  data.model && content.push(data.model), content.push(theme.fg("dim", "Estimated (chars/4), current session only \u2014 actual token counts may differ.")), content.push("");
+  data.model && content.push(data.model), content.push(theme.fg("dim", "Estimated visible context, current session only. Actual tokens and hidden reasoning may differ.")), content.push("");
   let rows = [
     { label: "System prompt", tokens: breakdown.systemPrompt },
     ...breakdown.contextFiles.map((file) => ({ label: file.label, tokens: file.tokens })),
@@ -1890,7 +1942,7 @@ function renderContextBox(data, maxWidth) {
     { label: "Tool definitions", tokens: breakdown.toolDefinitions },
     { label: "User messages", tokens: breakdown.user, count: breakdown.counts.user },
     { label: "Assistant text", tokens: breakdown.assistantText, count: breakdown.counts.assistantText },
-    { label: "Thinking", tokens: breakdown.thinking, count: breakdown.counts.thinking },
+    { label: "Visible thinking", tokens: breakdown.thinking, count: breakdown.counts.thinking },
     { label: "Tool calls", tokens: breakdown.toolCalls, count: breakdown.counts.toolCalls },
     { label: "Tool results", tokens: breakdown.toolResults, count: breakdown.counts.toolResults },
     { label: "Summaries", tokens: breakdown.summaries, count: breakdown.counts.summaries }
@@ -2059,36 +2111,6 @@ var DaxnutsComponent = class {
   }
 };
 
-// packages/coding-agent/dist/modes/interactive/components/boot-ascii.js
-var MOON_ASCII_SMALL = ["\u263E"];
-
-// packages/coding-agent/dist/modes/interactive/components/exit-card.js
-function formatTokens2(count) {
-  return count < 1e3 ? count.toString() : count < 1e4 ? `${(count / 1e3).toFixed(1)}k` : count < 1e6 ? `${Math.round(count / 1e3)}k` : count < 1e7 ? `${(count / 1e6).toFixed(1)}M` : `${Math.round(count / 1e6)}M`;
-}
-function computeExitCardStats(entries) {
-  let turns = 0, tokens = 0, fileOps = createFileOps();
-  for (let entry of entries) {
-    if (entry.type !== "message")
-      continue;
-    let message = entry.message;
-    if (message.role === "user")
-      turns++;
-    else if (message.role === "assistant") {
-      let usage = message.usage;
-      usage && (tokens += (usage.input ?? 0) + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0) + (usage.output ?? 0)), extractFileOpsFromMessage(message, fileOps);
-    }
-  }
-  let { modifiedFiles } = computeFileLists(fileOps);
-  return { turns, tokens, filesChanged: modifiedFiles.length };
-}
-function buildExitCard(stats) {
-  if (stats.turns === 0)
-    return [];
-  let line1 = `${MOON_ASCII_SMALL[0] ?? "\u263E"}   ${stats.turns} turn${stats.turns === 1 ? "" : "s"} \xB7 ${formatTokens2(stats.tokens)} tok`, line2 = `${stats.filesChanged} file${stats.filesChanged === 1 ? "" : "s"} changed`, moonPad = "      ", innerLeft = `  ${line1}`, innerRight = `  ${moonPad}${line2}`, innerWidth = Math.max(innerLeft.length, innerRight.length), pad = (s) => `${s}${" ".repeat(Math.max(0, innerWidth - s.length))}`, top = `\u256D${"\u2500".repeat(innerWidth + 2)}\u256E`, bottom = `\u2570${"\u2500".repeat(innerWidth + 2)}\u256F`, body1 = `\u2502 ${pad(innerLeft)} \u2502`, body2 = `\u2502 ${pad(innerRight)} \u2502`;
-  return [top, body1, body2, bottom];
-}
-
 // packages/coding-agent/dist/modes/interactive/components/extension-editor.js
 import { spawn } from "node:child_process";
 import * as fs from "node:fs";
@@ -2140,7 +2162,7 @@ var ExtensionEditorComponent = class extends Container6 {
       fs.writeFileSync(tmpFile, currentText, "utf-8"), this.tui.stop();
       let [editor, ...editorArgs] = editorCmd.split(" ");
       if (process.stdout.write(`Launching external editor: ${editorCmd}
-Pi will resume when the editor exits.
+lunR will resume when the editor exits.
 `), await new Promise((resolve4) => {
         let child = spawn(editor, [...editorArgs, tmpFile], {
           stdio: "inherit",
@@ -5601,18 +5623,6 @@ function isAnthropicSubscriptionAuthKey(apiKey) {
 function isUnknownModel(model) {
   return !!model && model.provider === "unknown" && model.id === "unknown" && model.api === "unknown";
 }
-function quoteIfNeeded(value) {
-  return value.length > 0 && !/[^a-zA-Z0-9_\-./~:@]/.test(value) ? value : `'${value.replace(/'/g, "'\\''")}'`;
-}
-function formatResumeCommand(sessionManager) {
-  if (!process.stdout.isTTY || !sessionManager.isPersisted())
-    return;
-  let sessionFile = sessionManager.getSessionFile();
-  if (!sessionFile || !fs2.existsSync(sessionFile))
-    return;
-  let args = [APP_NAME];
-  return sessionManager.usesDefaultSessionDir() || args.push("--session-dir", quoteIfNeeded(sessionManager.getSessionDir())), args.push("--session", sessionManager.getSessionId()), args.join(" ");
-}
 function hasDefaultModelProvider(providerId) {
   return providerId in defaultModelPerProvider;
 }
@@ -5783,15 +5793,15 @@ var InteractiveMode = class _InteractiveMode {
   }
   constructor(runtimeHost, options = {}) {
     this.runtimeHost = runtimeHost, this.options = options, this.autoTrustOnReloadCwd = options.autoTrustOnReloadCwd, this.runtimeHost.setBeforeSessionInvalidate((reason) => {
-      this.resetExtensionUI(), this.previousPermissionMode = void 0, this.preGoalPermissionMode = void 0, resetPermissions(this.settingsManager.getDefaultPermissionMode()), clearRegistry(), reason !== "fork" && clearRollback(this.sessionManager.getSessionId());
+      this.stopPlanUsagePolling(), this.resetExtensionUI(), this.previousPermissionMode = void 0, this.preGoalPermissionMode = void 0, clearRegistry(), reason !== "fork" && clearRollback(this.sessionManager.getSessionId());
     }), this.runtimeHost.setRebindSession(async () => {
-      await this.rebindCurrentSession({ renderBeforeBind: !0 }), initRollback(this.settingsManager, this.sessionManager.getSessionId());
-      let mode = this.sessionManager.getPermissionMode() ?? this.settingsManager.getDefaultPermissionMode();
-      resetPermissions(mode), this.syncPermissionModeEffects(mode);
-    }), this.version = VERSION, this.ui = options.startupView?.ui ?? new TUI(new ProcessTerminal(), this.settingsManager.getShowHardwareCursor()), this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink()), registerPermissionModeBridge(() => getPermissionMode()), registerPermissionModeControlBridge({
+      await this.rebindCurrentSession({ renderBeforeBind: !0 }), this.startPlanUsagePolling(), initRollback(this.settingsManager, this.sessionManager.getSessionId());
+      let mode = this.session.permissionMode;
+      this.syncPermissionModeEffects(mode);
+    }), this.version = VERSION, this.ui = options.startupView?.ui ?? new TUI(new ProcessTerminal(), this.settingsManager.getShowHardwareCursor()), this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink()), registerPermissionModeBridge(() => this.session.permissionMode), registerPermissionModeControlBridge({
       enterGoalAuto: () => this.enterGoalAuto(),
       leaveGoalAuto: () => this.leaveGoalAuto()
-    }), resetPermissions(this.sessionManager.getPermissionMode() ?? this.settingsManager.getDefaultPermissionMode()), this.headerContainer = new Container19(), options.startupView && (this.headerContainer.addChild(new Spacer19(1)), this.headerContainer.addChild(options.startupView.header), this.customFooter = options.startupView.footer), this.loadedResourcesContainer = new Container19(), this.chatContainer = new Container19(), this.pendingMessagesContainer = new Container19(), this.statusContainer = options.startupView?.statusContainer ?? new Container19(), this.widgetContainerAbove = new Container19(), this.widgetContainerBelow = new Container19(), this.keybindings = options.startupView?.keybindings ?? KeybindingsManager.create(), setKeybindings(this.keybindings);
+    }), this.headerContainer = new Container19(), options.startupView && (this.headerContainer.addChild(new Spacer19(1)), this.headerContainer.addChild(options.startupView.header), this.customFooter = options.startupView.footer), this.loadedResourcesContainer = new Container19(), this.chatContainer = new Container19(), this.pendingMessagesContainer = new Container19(), this.statusContainer = options.startupView?.statusContainer ?? new Container19(), this.widgetContainerAbove = new Container19(), this.widgetContainerBelow = new Container19(), this.keybindings = options.startupView?.keybindings ?? KeybindingsManager.create(), setKeybindings(this.keybindings);
     let editorPaddingX = this.settingsManager.getEditorPaddingX(), autocompleteMaxVisible = this.settingsManager.getAutocompleteMaxVisible();
     this.defaultEditor = options.startupView?.editor ?? new CustomEditor(this.ui, getEditorTheme(), this.keybindings, {
       paddingX: editorPaddingX,
@@ -5914,7 +5924,7 @@ var InteractiveMode = class _InteractiveMode {
           return resp;
         }
         return "reject";
-      }), initRollback(this.settingsManager, this.sessionManager.getSessionId()), setRollbackWarningHandler((msg) => this.showStatus(msg)), this.syncPermissionModeEffects(this.sessionManager.getPermissionMode() ?? this.settingsManager.getDefaultPermissionMode()), await this.themeController.applyFromSettings(), this.headerContainer.clear(), this.options.verbose || !this.settingsManager.getQuietStartup()) {
+      }), initRollback(this.settingsManager, this.sessionManager.getSessionId()), setRollbackWarningHandler((msg) => this.showStatus(msg)), this.syncPermissionModeEffects(this.session.permissionMode), await this.themeController.applyFromSettings(), this.headerContainer.clear(), this.options.verbose || !this.settingsManager.getQuietStartup()) {
         let header = theme.bold(theme.fg("accent", APP_NAME)) + theme.fg("dim", ` v${this.version}`);
         this.builtInHeader = new BootScreenComponent(header, this.buildBootRows()), this.headerContainer.addChild(new Spacer19(1)), this.headerContainer.addChild(this.builtInHeader);
       } else
@@ -5957,17 +5967,22 @@ var InteractiveMode = class _InteractiveMode {
     this.deferredBuiltinAttachPromise && await this.deferredBuiltinAttachPromise;
   }
   planUsageTimer;
+  planUsageBridge;
   startPlanUsagePolling() {
-    let bridge = getUsageServiceBridge();
+    this.stopPlanUsagePolling();
+    let bridge = getUsageServiceBridge(this.session.modelRuntime);
     if (!bridge)
       return;
-    bridge.setOnUpdate(() => this.ui.requestRender());
+    this.planUsageBridge = bridge, bridge.setOnUpdate(() => this.ui.requestRender());
     let tick = () => {
       let provider = this.session.model?.provider;
       provider && bridge.prefetch(provider);
     };
     tick(), this.planUsageTimer = setInterval(tick, 6e4), this.planUsageTimer.unref?.();
   }
+  stopPlanUsagePolling() {
+    this.planUsageTimer && (clearInterval(this.planUsageTimer), this.planUsageTimer = void 0), this.planUsageBridge?.setOnUpdate(void 0), this.planUsageBridge = void 0;
+  }
   /** Background npm version check. Never blocks first paint. Workspace installs skip. */
   async maybeNotifyCliUpdate() {
     try {
@@ -6049,7 +6064,7 @@ var InteractiveMode = class _InteractiveMode {
       if (extendedKeys !== "on" && extendedKeys !== "always")
         return "tmux extended-keys is off. Modified Enter keys may not work. Add `set -g extended-keys on` to ~/.tmux.conf and restart tmux.";
       if (extendedKeysFormat === "xterm")
-        return "tmux extended-keys-format is xterm. Pi works best with csi-u. Add `set -g extended-keys-format csi-u` to ~/.tmux.conf and restart tmux.";
+        return "tmux extended-keys-format is xterm. lunR works best with csi-u. Add `set -g extended-keys-format csi-u` to ~/.tmux.conf and restart tmux.";
     }
   }
   getMarkdownThemeWithSettings() {
@@ -7344,7 +7359,7 @@ ${message}`, ["Yes", "No"], opts) === "Yes";
         break;
       }
       case "agent_end":
-        this.session.refreshModelFromRegistry(), this.settingsManager.getShowTerminalProgress() && this.ui.terminal.setProgress(!1), this.clearStatusIndicator("working"), this.stopSmoothStreaming(), this.streamingComponent && (this.chatContainer.removeChild(this.streamingComponent), this.streamingComponent = void 0, this.streamingMessage = void 0), this.pendingTools.clear(), this.browserActivityComponent = void 0, this.maybeAutoNameSession(), captureTreeChanges(this.sessionManager.getCwd(), this.sessionManager.getSessionId()), this.ui.requestRender();
+        this.session.refreshModelFromRegistry(), this.ui.terminal.setProgress(!1), this.clearStatusIndicator("working"), this.stopSmoothStreaming(), this.streamingComponent && (this.chatContainer.removeChild(this.streamingComponent), this.streamingComponent = void 0, this.streamingMessage = void 0), this.pendingTools.clear(), this.browserActivityComponent = void 0, this.maybeAutoNameSession(), captureTreeChanges(this.sessionManager.getCwd(), this.sessionManager.getSessionId()), this.ui.requestRender();
         break;
       case "agent_settled":
         if (this.pendingCompactionRender) {
@@ -7360,7 +7375,7 @@ ${message}`, ["Yes", "No"], opts) === "Yes";
         break;
       }
       case "compaction_end": {
-        this.settingsManager.getShowTerminalProgress() && this.ui.terminal.setProgress(!1), this.autoCompactionEscapeHandler && (this.defaultEditor.onEscape = this.autoCompactionEscapeHandler, this.autoCompactionEscapeHandler = void 0), this.clearStatusIndicator("compaction"), event.aborted ? event.reason === "manual" ? this.showError("Compaction cancelled") : this.showStatus("Auto-compaction cancelled") : event.result ? this.session.isIdle ? this.renderCompactionResult(event.result) : this.pendingCompactionRender = event.result : event.errorMessage && (event.reason === "manual" ? this.showError(event.errorMessage) : (this.chatContainer.addChild(new Spacer19(1)), this.chatContainer.addChild(new Text21(theme.fg("error", event.errorMessage), 1, 0)))), this.flushCompactionQueue({ willRetry: event.willRetry }), this.ui.requestRender();
+        this.ui.terminal.setProgress(!1), this.autoCompactionEscapeHandler && (this.defaultEditor.onEscape = this.autoCompactionEscapeHandler, this.autoCompactionEscapeHandler = void 0), this.clearStatusIndicator("compaction"), event.aborted ? event.reason === "manual" ? this.showError("Compaction cancelled") : this.showStatus("Auto-compaction cancelled") : event.result ? this.session.isIdle ? this.renderCompactionResult(event.result) : this.pendingCompactionRender = event.result : event.errorMessage && (event.reason === "manual" ? this.showError(event.errorMessage) : (this.chatContainer.addChild(new Spacer19(1)), this.chatContainer.addChild(new Text21(theme.fg("error", event.errorMessage), 1, 0)))), this.flushCompactionQueue({ willRetry: event.willRetry }), this.ui.requestRender();
         break;
       }
       case "auto_retry_start": {
@@ -7534,7 +7549,7 @@ ${message}`, ["Yes", "No"], opts) === "Yes";
   }
   /**
    * Show a transcript notice when a completed assistant message paid for a
-   * significant cache miss. Only states observable facts: the miss itself,
+   * significant cache miss. The overlap estimate cannot establish identical prompt content. It also shows
    * a model switch, or an idle gap past the cache TTL.
    */
   maybeShowCacheMissNotice(message) {
@@ -7546,8 +7561,8 @@ ${message}`, ["Yes", "No"], opts) === "Yes";
   addCacheMissNotice(miss) {
     if (miss.missedTokens < 2e4 && miss.missedCost < 0.1)
       return;
-    let cost = miss.missedCost >= 0.01 ? ` (~$${miss.missedCost.toFixed(2)})` : "", reBilled = `${formatTokens(miss.missedTokens)} tokens re-billed${cost}`, label = "Cache miss";
-    miss.modelChanged ? label = "Cache miss after model switch" : miss.idleMs >= 3e5 && (label = `Cache miss after ${Math.round(miss.idleMs / 6e4)}m idle`);
+    let cost = miss.missedCost >= 0.01 ? ` (~$${miss.missedCost.toFixed(2)})` : "", reBilled = `~${formatTokens(miss.missedTokens)} tokens may have missed cache${cost}`, label = "Estimated cache miss";
+    miss.modelChanged ? label = "Estimated cache miss after model switch" : miss.idleMs >= 3e5 && (label = `Cache miss after ${Math.round(miss.idleMs / 6e4)}m idle`);
     let text = theme.fg("warning", `${label}: ${reBilled}`);
     this.chatContainer.addChild(new Spacer19(1)), this.chatContainer.addChild(new Text21(text, 1, 0));
   }
@@ -7596,7 +7611,7 @@ ${message}`, ["Yes", "No"], opts) === "Yes";
   async shutdown(options) {
     if (this.isShuttingDown)
       return;
-    if (this.isShuttingDown = !0, this.unregisterSessionTransfer?.(), this.stopSmoothStreaming(), this.planUsageTimer && (clearInterval(this.planUsageTimer), this.planUsageTimer = void 0), getUsageServiceBridge()?.setOnUpdate(void 0), options?.fromSignal) {
+    if (this.isShuttingDown = !0, this.session.stopAdmission(), this.unregisterSessionTransfer?.(), this.stopSmoothStreaming(), this.stopPlanUsagePolling(), options?.fromSignal) {
       await this.runtimeHost.dispose(), this.themeController.disableAutoSync(), await this.ui.terminal.drainInput(1e3);
       try {
         killAll();
@@ -7607,14 +7622,7 @@ ${message}`, ["Yes", "No"], opts) === "Yes";
     this.themeController.disableAutoSync(), await this.ui.terminal.drainInput(1e3);
     let tracked = list().filter((p) => p.status !== "exited");
     tracked.length > 0 && await this.confirmDisclaimerWithLabels("Session processes still running", `${tracked.length} process(es) started during this session are still alive.
-Kill them before exit?`) && killAll(), this.stop(), await this.runtimeHost.dispose();
-    let entries = this.sessionManager?.getEntries?.(), exitStats = entries ? computeExitCardStats(entries) : { turns: 0, tokens: 0, filesChanged: 0 }, cardLines = buildExitCard(exitStats);
-    cardLines.length > 0 && process.stdout.write(`${chalk.dim(cardLines.join(`
-`))}
-`);
-    let resumeCommand = this.sessionManager && typeof this.sessionManager.isPersisted == "function" ? formatResumeCommand(this.sessionManager) : void 0;
-    resumeCommand && process.stdout.write(`${chalk.dim("To resume this session:")} ${resumeCommand}
-`), process.exit(0);
+Kill them before exit?`) && killAll(), this.stop(), await this.runtimeHost.dispose(), process.exit(0);
   }
   emergencyTerminalExit() {
     this.isShuttingDown = !0, this.unregisterSignalHandlers(), killTrackedDetachedChildren();
@@ -7740,7 +7748,7 @@ Kill them before exit?`) && killAll(), this.stop(), await this.runtimeHost.dispo
     recordTuiActivity(this.sessionManager, this.runtimeHost.services.agentDir), this.session.cycleThinkingLevel() === void 0 ? this.showStatus("Current model does not support thinking") : (this.footer.invalidate(), this.updateEditorBorderColor());
   }
   cyclePermissionMode() {
-    this.applyPermissionMode(nextPermissionMode(getPermissionMode()), { silent: !0 });
+    this.applyPermissionMode(nextPermissionMode(this.session.permissionMode), { silent: !0 });
   }
   async cycleModel(direction) {
     if (!(this.runtimeHost.isDetached || this.transferInProgress)) {
@@ -7816,7 +7824,7 @@ Kill them before exit?`) && killAll(), this.stop(), await this.runtimeHost.dispo
       fs2.writeFileSync(tmpFile, currentText, "utf-8"), this.ui.stop();
       let [editor, ...editorArgs] = editorCmd.split(" ");
       if (process.stdout.write(`Launching external editor: ${editorCmd}
-Pi will resume when the editor exits.
+lunR will resume when the editor exits.
 `), await new Promise((resolve4) => {
         let child = spawn3(editor, [...editorArgs, tmpFile], {
           stdio: "inherit",
@@ -8153,7 +8161,7 @@ Pi will resume when the editor exits.
           this.settingsManager.setClearOnShrink(enabled), this.ui.setClearOnShrink(enabled), !enabled && !this.activeStatusIndicator && this.statusContainer.clear();
         },
         onShowTerminalProgressChange: (enabled) => {
-          this.settingsManager.setShowTerminalProgress(enabled);
+          this.settingsManager.setShowTerminalProgress(enabled), enabled || this.ui.terminal.setProgress(!1);
         },
         onModelTiersEnabledChange: (enabled) => {
           this.settingsManager.setModelTiersEnabled(enabled), getModelTiersBridge()?.refreshToolDescription();
@@ -8245,7 +8253,7 @@ Pi will resume when the editor exits.
               return;
             }
             if (action === "status") {
-              this.showStatus((await import("./service-MDQIPQ26.js")).serviceStatusText());
+              this.showStatus((await import("./service-IHLGFLBT.js")).serviceStatusText());
               return;
             }
             this.ui.stop();
@@ -8260,7 +8268,7 @@ Pi will resume when the editor exits.
             } finally {
               this.ui.start(), this.ui.requestRender(!0);
             }
-            this.showStatus((await import("./service-MDQIPQ26.js")).serviceStatusText());
+            this.showStatus((await import("./service-IHLGFLBT.js")).serviceStatusText());
           })().catch((error) => this.showStatus(error instanceof Error ? error.message : String(error)));
         },
         onDefaultPermissionModeChange: (mode) => {
@@ -8336,7 +8344,14 @@ Pi will resume when the editor exits.
     let extraDefaults = result.incomplete.length, asked = [], ollama, runner = this.session.extensionRunner, cloudRefresh = globalThis[/* @__PURE__ */ Symbol.for("@lunr/ollama-cloud-refresh")];
     if (cloudRefresh && allowNetwork)
       try {
-        await cloudRefresh({ ui: runner.createCommandContext().ui });
+        let resolution = await runtime.getAuth("ollama-cloud");
+        await cloudRefresh({
+          ui: runner.createCommandContext().ui,
+          auth: resolution ? {
+            apiKey: resolution.auth.apiKey,
+            headers: Object.fromEntries(Object.entries(resolution.auth.headers ?? {}).filter((entry) => entry[1] !== null))
+          } : void 0
+        });
       } catch (error) {
         ollama = `ollama-cloud refresh failed: ${error instanceof Error ? error.message : String(error)}`;
       }
@@ -9517,9 +9532,22 @@ Gist: ${gistUrl}`);
       let prompt = `Generate a title of at most 6 words summarizing this request. Reply with the title only \u2014 no quotes, no trailing punctuation, no prefix.
 
 Request:
-${firstUserText.slice(0, 2e3)}`, title = (await this.session.modelRuntime.complete(model, {
+${firstUserText.slice(0, 2e3)}`, requestSessionId = this.sessionManager.getSessionId(), requestSessionFile = this.sessionManager.getSessionFile(), response = await this.session.modelRuntime.complete(model, {
         messages: [{ role: "user", content: [{ type: "text", text: prompt }], timestamp: Date.now() }]
-      })).content.filter((c) => c.type === "text").map((c) => c.text).join(" ").replace(/\s+/g, " ").trim();
+      });
+      if (this.sessionManager.getSessionId() !== requestSessionId) {
+        if (requestSessionFile) {
+          let target = SessionManager.open(requestSessionFile);
+          try {
+            target.appendRequestUsage("title", response);
+          } finally {
+            target.dispose();
+          }
+        }
+        return;
+      }
+      this.sessionManager.appendRequestUsage("title", response);
+      let title = response.content.filter((c) => c.type === "text").map((c) => c.text).join(" ").replace(/\s+/g, " ").trim();
       if (title = title.replace(/^["'`]+|["'`.!?]+$/g, "").trim(), !title || this.sessionManager.getSessionName())
         return;
       this.session.setSessionName(title);
@@ -9529,11 +9557,9 @@ ${firstUserText.slice(0, 2e3)}`, title = (await this.session.modelRuntime.comple
   }
   handleSessionCommand() {
     let stats = this.session.getSessionStats(), sessionName = this.sessionManager.getSessionName(), entries = this.sessionManager.getEntries(), cacheWaste = computeCacheWaste(entries, this.session.modelRuntime), perModelMap = /* @__PURE__ */ new Map();
-    for (let entry of entries) {
-      if (entry.type !== "message" || entry.message.role !== "assistant")
-        continue;
-      let message = entry.message, usage = message.usage, key = `${message.provider}/${message.responseModel ?? message.model}`, bucket = perModelMap.get(key);
-      bucket || (bucket = { key, cost: 0, tokens: 0 }, perModelMap.set(key, bucket)), bucket.cost += usage.cost.total, bucket.tokens += usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
+    for (let request of collectUsageRequests(entries)) {
+      let key = `${request.provider}/${request.model}`, bucket = perModelMap.get(key) ?? { key, cost: 0, tokens: 0 };
+      bucket.cost += request.usage.cost.total, bucket.tokens += usageTokens(request.usage), perModelMap.set(key, bucket);
     }
     let perModel = Array.from(perModelMap.values()).sort((a, b) => b.cost - a.cost), info = `${theme.bold("Session Info")}
 
@@ -9548,7 +9574,7 @@ ${firstUserText.slice(0, 2e3)}`, title = (await this.session.modelRuntime.comple
 `, info += `${theme.fg("dim", "Assistant:")} ${stats.assistantMessages}
 `, info += `${theme.fg("dim", "Tools:")} ${stats.toolCalls} calls, ${stats.toolResults} results
 
-`, info += `${theme.bold("Tokens")}
+`, info += `${theme.bold("Parent tokens including auxiliary requests")}
 `;
     let { input, cacheRead, cacheWrite } = stats.tokens, promptTokens = input + cacheRead + cacheWrite;
     if (info += `${theme.fg("dim", "Input:")} ${promptTokens.toLocaleString()}
@@ -9562,6 +9588,12 @@ ${firstUserText.slice(0, 2e3)}`, title = (await this.session.modelRuntime.comple
     }
     if (info += `${theme.fg("dim", "Output:")} ${stats.tokens.output.toLocaleString()}
 `, info += `${theme.fg("dim", "Total:")} ${stats.tokens.total.toLocaleString()}
+`, stats.childUsage?.total && (info += `Children: ${stats.childUsage.total.toLocaleString()} tokens, $${stats.childUsage.cost.toFixed(3)}
+`, info += `Combined: ${stats.combinedUsage?.total.toLocaleString()} tokens, $${stats.combinedUsage?.cost.toFixed(3)}
+`), stats.parentUsage?.unknownRequests && (info += `Usage unavailable for ${stats.parentUsage.unknownRequests} request(s).
+`), stats.parentUsage?.partialRequests && (info += `Usage incomplete for ${stats.parentUsage.partialRequests} request(s).
+`), stats.parentUsage?.unknownCosts && (info += `Pricing unavailable for ${stats.parentUsage.unknownCosts} request(s).
+`), info += `Costs use catalog estimates unless the provider reports its account charge.
 `, stats.cost > 0 || cacheWaste.missedTokens > 0) {
       if (info += `
 ${theme.bold("Cost")}
@@ -9572,8 +9604,8 @@ ${theme.bold("Cost")}
       if (cacheWaste.missedTokens > 0) {
         let missLabel = cacheWaste.missCount === 1 ? "1 miss" : `${cacheWaste.missCount} misses`, detail = `${cacheWaste.missedTokens.toLocaleString()} tokens, ${missLabel}`;
         info += cacheWaste.missedCost >= 1e-4 ? `
-${theme.fg("dim", "Cache Re-billed:")} $${cacheWaste.missedCost.toFixed(3)} ${theme.fg("dim", `(${detail})`)}` : `
-${theme.fg("dim", "Cache Re-billed:")} ${detail}`;
+${theme.fg("dim", "Estimated cache misses:")} $${cacheWaste.missedCost.toFixed(3)} ${theme.fg("dim", `(${detail})`)}` : `
+${theme.fg("dim", "Estimated cache misses:")} ${detail}`;
       }
     }
     this.chatContainer.addChild(new Spacer19(1)), this.chatContainer.addChild(new Text21(info, 1, 0)), this.ui.requestRender();
@@ -9612,13 +9644,23 @@ ${theme.fg("dim", "Cache Re-billed:")} ${detail}`;
   // lunr: /usage — current session only: token totals, live context split,
   // context-window bar, and subscription plan usage.
   async handleUsageCommand() {
-    let stats = this.session.getSessionStats(), sessionTotals = stats.tokens.total > 0 ? {
+    let stats = this.session.getSessionStats(), sessionTotals = stats.tokens.total > 0 || stats.parentUsage?.requests || stats.parentUsage?.unknownRequests || stats.parentUsage?.partialRequests ? {
       input: stats.tokens.input,
       output: stats.tokens.output,
       cacheRead: stats.tokens.cacheRead,
       cacheWrite: stats.tokens.cacheWrite,
-      total: stats.tokens.total
-    } : void 0, context = this.session.getContextUsage(), provider = this.session.model?.provider, planResult = await getAllPlanUsageResults(provider, this.session.modelRuntime), breakdown = this.collectUsageBreakdown(), lines = renderUsageBox({ sessionTotals, context, plan: planResult.usages, breakdown }, this.ui.terminal.columns);
+      total: stats.tokens.total,
+      requests: stats.parentUsage?.requests,
+      unknownRequests: stats.parentUsage?.unknownRequests,
+      partialRequests: stats.parentUsage?.partialRequests
+    } : void 0, context = this.session.getContextUsage(), provider = this.session.model?.provider, planResult = await getAllPlanUsageResults(provider, this.session.modelRuntime), breakdown = this.collectUsageBreakdown(), lines = renderUsageBox({
+      sessionTotals,
+      childTotals: stats.childUsage,
+      combinedTotals: stats.combinedUsage,
+      context,
+      plan: planResult.usages,
+      breakdown
+    }, this.ui.terminal.columns);
     this.chatContainer.addChild(new Spacer19(1)), this.chatContainer.addChild(new Text21(lines.join(`
 `), 1, 0)), planResult.errors.length > 0 && this.showStatus(planResult.errors.join(`
 `)), this.ui.requestRender();
@@ -9644,9 +9686,9 @@ ${theme.fg("dim", "Cache Re-billed:")} ${detail}`;
   }
   // /plan is a shortcut into read-only mode for planning.
   async handlePlanCommand(args) {
-    let sub = args.toLowerCase(), inReadOnly = getPermissionMode() === "read-only";
+    let sub = args.toLowerCase(), inReadOnly = this.session.permissionMode === "read-only";
     if (sub === "status") {
-      this.showStatus(inReadOnly ? "Read mode is active. /plan off to leave it." : `Permission mode: ${getPermissionMode()}.`);
+      this.showStatus(inReadOnly ? "Read mode is active. /plan off to leave it." : `Permission mode: ${this.session.permissionMode}.`);
       return;
     }
     if (sub !== "" && sub !== "on" && sub !== "off") {
@@ -9663,7 +9705,7 @@ ${theme.fg("dim", "Cache Re-billed:")} ${detail}`;
   handleModeCommand(args) {
     let sub = args.toLowerCase();
     if (sub === "status") {
-      this.showStatus(`Permission mode: ${getPermissionMode() === "read-only" ? "read" : getPermissionMode()}`);
+      this.showStatus(`Permission mode: ${this.session.permissionMode === "read-only" ? "read" : this.session.permissionMode}`);
       return;
     }
     if (sub === "yolo" || sub === "auto" || sub === "read-only" || sub === "read") {
@@ -9689,23 +9731,23 @@ ${theme.fg("dim", "Cache Re-billed:")} ${detail}`;
   }
   /** Apply addendum + auto-rollback for a mode without a status toast. */
   syncPermissionModeEffects(mode) {
-    this.runtimeHost.isDetached || this.transferInProgress || (this.sessionManager.setPermissionMode(mode), mode === "read-only" ? this.session.setSystemPromptAppend(READ_ONLY_MODE_ADDENDUM) : mode === "auto" ? (this.session.setSystemPromptAppend(AUTO_MODE_ADDENDUM), enableRollbackForSession(this.sessionManager.getSessionId())) : this.session.setSystemPromptAppend(void 0));
+    this.runtimeHost.isDetached || this.transferInProgress || (this.session.setPermissionMode(mode), mode === "auto" && enableRollbackForSession(this.sessionManager.getSessionId()));
   }
   // lunr: `/goal` forces session auto without writing settings.
   enterGoalAuto() {
-    let next = nextModeForGoal(getPermissionMode(), "enter", this.preGoalPermissionMode);
-    this.preGoalPermissionMode = next.saved, next.mode !== getPermissionMode() && this.applyPermissionMode(next.mode, { silent: !0 });
+    let next = nextModeForGoal(this.session.permissionMode, "enter", this.preGoalPermissionMode);
+    this.preGoalPermissionMode = next.saved, next.mode !== this.session.permissionMode && this.applyPermissionMode(next.mode, { silent: !0 });
   }
   leaveGoalAuto() {
-    let next = nextModeForGoal(getPermissionMode(), "leave", this.preGoalPermissionMode);
-    this.preGoalPermissionMode = next.saved, next.mode !== getPermissionMode() && this.applyPermissionMode(next.mode, { silent: !0 });
+    let next = nextModeForGoal(this.session.permissionMode, "leave", this.preGoalPermissionMode);
+    this.preGoalPermissionMode = next.saved, next.mode !== this.session.permissionMode && this.applyPermissionMode(next.mode, { silent: !0 });
   }
   applyPermissionMode(mode, opts) {
     if (this.runtimeHost.isDetached || this.transferInProgress)
       return;
-    this.sessionManager.setPermissionMode(mode), recordTuiActivity(this.sessionManager, this.runtimeHost.services.agentDir);
-    let prev = getPermissionMode();
-    mode === "read-only" && prev !== "read-only" && (this.previousPermissionMode = prev), setPermissionMode(mode), this.ui.requestRender(), mode === "read-only" ? this.session.setSystemPromptAppend(READ_ONLY_MODE_ADDENDUM) : mode === "auto" ? this.session.setSystemPromptAppend(AUTO_MODE_ADDENDUM) : this.session.setSystemPromptAppend(void 0), mode === "auto" && prev !== "auto" ? enableRollbackForSession(this.sessionManager.getSessionId()) : mode !== "auto" && prev === "auto" && disableRollbackForSession(this.sessionManager.getSessionId()), !opts?.silent && (mode === "auto" && prev !== "auto" ? this.showStatus("Auto mode active \u2014 fully autonomous. Rollback enabled for this session.") : mode === "read-only" ? this.showStatus("Read mode active. Changes are blocked.") : this.showStatus(`Permission mode: ${mode}`));
+    recordTuiActivity(this.sessionManager, this.runtimeHost.services.agentDir);
+    let prev = this.session.permissionMode;
+    mode === "read-only" && prev !== "read-only" && (this.previousPermissionMode = prev), this.session.setPermissionMode(mode), this.ui.requestRender(), mode === "auto" && prev !== "auto" ? enableRollbackForSession(this.sessionManager.getSessionId()) : mode !== "auto" && prev === "auto" && disableRollbackForSession(this.sessionManager.getSessionId()), !opts?.silent && (mode === "auto" && prev !== "auto" ? this.showStatus("Auto mode active \u2014 fully autonomous. Rollback enabled for this session.") : mode === "read-only" ? this.showStatus("Read mode active. Changes are blocked.") : this.showStatus(`Permission mode: ${mode}`));
   }
   // Approval dialog for one subagent call launching more than two children.
   // "Reject with feedback" collects a one-line
@@ -9764,37 +9806,60 @@ ${theme.fg("dim", "Cache Re-billed:")} ${detail}`;
       this.showWarning("Wait for the current response to finish before running /rollback.");
       return;
     }
-    if (!isRollbackEnabled()) {
+    if (!isRollbackEnabled(this.sessionManager.getSessionId())) {
       this.showStatus("Rollback is disabled \u2014 enable it in /settings \u2192 Rollback");
       return;
     }
-    let turnsToConsume = Math.max(1, peekRollbackTurnsConsumed(this.sessionManager.getSessionId())), branch = this.sessionManager.getBranch(), targetUserId, userMessagesSeen = 0;
-    for (let i = branch.length - 1; i >= 0; i--) {
+    let recoveryBlocked = getRollbackRecoveryBlockReason(this.sessionManager.getSessionId());
+    if (recoveryBlocked) {
+      this.showWarning(recoveryBlocked);
+      return;
+    }
+    let turnsToConsume = Math.max(1, peekRollbackTurnsConsumed(this.sessionManager.getSessionId())), branch = this.sessionManager.getBranch(), targetUserId = getRollbackTargetUserId(this.sessionManager.getSessionId());
+    if (targetUserId && !branch.some((entry) => entry.id === targetUserId)) {
+      this.showWarning("Rollback recovery belongs to another chat branch. Return to that branch to retry.");
+      return;
+    }
+    let userMessagesSeen = 0, fallbackUserId;
+    for (let i = branch.length - 1; !targetUserId && i >= 0; i--) {
       let entry = branch[i];
-      if (entry.type === "message" && entry.message.role === "user" && (userMessagesSeen++, targetUserId = entry.id, userMessagesSeen >= turnsToConsume))
+      if (entry.type === "message" && entry.message.role === "user" && (userMessagesSeen++, fallbackUserId = entry.id, userMessagesSeen >= turnsToConsume))
         break;
     }
-    if (!targetUserId) {
+    if (targetUserId ??= fallbackUserId, !targetUserId) {
       this.showStatus("Nothing to roll back");
       return;
     }
     let result;
+    try {
+      result = rollbackLastTurn(this.sessionManager.getSessionId(), { deferCommit: !0, targetUserId });
+    } catch (error) {
+      this.showError(`Rollback could not prepare recovery: ${error instanceof Error ? error.message : String(error)}`);
+      return;
+    }
+    if (!result.complete) {
+      let failures = result.failed.slice(0, 3).map(({ path: file, error }) => `${path2.basename(file)}: ${error}`).join("; ");
+      this.showWarning(`Rollback incomplete. ${result.restored.length} file(s) restored, ${result.deleted.length} deleted, ${result.failed.length} failed. ${failures}. Chat unchanged. /rollback retries this turn's unfinished recovery.`);
+      return;
+    }
+    let chatRewound = !1;
     try {
       let oldSid = this.sessionManager.getSessionId(), forkResult = await this.runtimeHost.fork(targetUserId, { position: "before" });
       if (forkResult.cancelled) {
-        this.showStatus("Rollback cancelled");
+        this.showWarning("File recovery complete. Chat rewind cancelled. /rollback retries the same turn without restoring completed files again.");
         return;
       }
-      migrateRollbackSession(oldSid, this.sessionManager.getSessionId()), result = rollbackLastTurn(this.sessionManager.getSessionId()), this.redoStack.length = 0, forkResult.selectedText && !this.editor.getText().trim() && this.editor.setText(forkResult.selectedText);
+      chatRewound = !0, migrateRollbackSession(oldSid, this.sessionManager.getSessionId()), result.turnIndex !== void 0 && commitRollbackTurn(this.sessionManager.getSessionId(), result.turnIndex), this.redoStack.length = 0, forkResult.selectedText && !this.editor.getText().trim() && this.editor.setText(forkResult.selectedText);
     } catch (error) {
-      this.showError(error instanceof Error ? error.message : String(error));
+      let message = error instanceof Error ? error.message : String(error);
+      this.showError(chatRewound ? `Chat rewound, but finishing rollback failed: ${message}` : `File recovery complete; chat rewind failed: ${message}. /rollback retries the same turn.`);
       return;
     }
     let names = (paths) => {
       let base = paths.slice(0, 3).map((p) => path2.basename(p)).join(", ");
       return paths.length > 3 ? `${base}, \u2026` : base;
     }, parts = [];
-    result.restored.length > 0 && parts.push(`${result.restored.length} file(s) restored (${names(result.restored)})`), result.deleted.length > 0 && parts.push(`${result.deleted.length} file(s) deleted (${names(result.deleted)})`), parts.length === 0 && parts.push("no file changes to restore"), this.showStatus(`Rollback complete \u2014 ${parts.join("; ")}.`);
+    result.restored.length > 0 && parts.push(`${result.restored.length} file(s) restored (${names(result.restored)})`), result.deleted.length > 0 && parts.push(`${result.deleted.length} file(s) deleted (${names(result.deleted)})`), parts.length === 0 && parts.push(result.turnIndex === void 0 ? "no file changes to restore" : "file recovery complete"), this.showStatus(`Rollback complete \u2014 ${parts.join("; ")}.`);
   }
   /**
    * Get capitalized display string for an app keybinding action.
@@ -9949,7 +10014,7 @@ ${theme.fg("muted", debugLogPath)}`, 1, 1)), this.ui.requestRender();
     }
   }
   stop() {
-    this.setThinkingAnimation(!1), this.stopCatalogRefresh?.(), this.stopCatalogRefresh = void 0, this.settingsManager.getShowTerminalProgress() && this.ui.terminal.setProgress(!1), this.clearStatusIndicator(), this.themeController.disableAutoSync(), this.clearExtensionTerminalInputListeners(), this.footer.dispose(), this.footerDataProvider.dispose(), this.disposeChatToolComponents(), this.unsubscribe && this.unsubscribe(), this.isInitialized && (this.ui.stop(), this.isInitialized = !1), this.unregisterSignalHandlers();
+    this.setThinkingAnimation(!1), this.stopCatalogRefresh?.(), this.stopCatalogRefresh = void 0, this.ui.terminal.setProgress(!1), this.clearStatusIndicator(), this.themeController.disableAutoSync(), this.clearExtensionTerminalInputListeners(), this.footer.dispose(), this.footerDataProvider.dispose(), this.disposeChatToolComponents(), this.unsubscribe && this.unsubscribe(), this.isInitialized && (this.ui.stop(), this.isInitialized = !1), this.unregisterSignalHandlers();
   }
 };
 
@@ -9972,7 +10037,6 @@ export {
   TreeSelectorComponent,
   UserMessageComponent,
   UserMessageSelectorComponent,
-  formatResumeCommand,
   startInteractiveToolInstalls,
   InteractiveMode
 };