@ashx-j/lunr 0.2.27 → 0.2.28

package/dist/node-runtime/{chunk-EPR2F3GU.js → chunk-PWHTSQC4.js}

@@ -550,6 +550,7 @@ var SessionManager = class _SessionManager {
    * These need to be appended via appendCompaction() and appendBranchSummary() methods.
    */
   appendMessage(message) {
+    message.role === "assistant" && (message.usage.requestId ??= randomUUID());
     let entry = {
       type: "message",
       id: generateId(this.byId),
@@ -559,6 +560,19 @@ var SessionManager = class _SessionManager {
     };
     return this._appendEntry(entry), entry.id;
   }
+  /** Persist an auxiliary request without adding it to model context. */
+  appendRequestUsage(purpose, message) {
+    let usage = { ...message.usage, requestId: message.usage.requestId ?? randomUUID() };
+    return this.appendCustomEntry("request-usage", {
+      id: usage.requestId,
+      purpose,
+      provider: message.provider,
+      model: message.responseModel ?? message.model,
+      timestamp: Date.now(),
+      usage,
+      stopReason: message.stopReason
+    });
+  }
   /** Append a thinking level change as child of current leaf, then advance leaf. Returns entry id. */
   appendThinkingLevelChange(thinkingLevel) {
     let entry = {
@@ -826,7 +840,7 @@ var SessionManager = class _SessionManager {
       throw new Error(`Entry ${leafId} not found`);
     let pathWithoutLabels = [], pathParentId = null;
     for (let entry of path)
-      entry.type !== "label" && (pathWithoutLabels.push({ ...entry, parentId: pathParentId }), pathParentId = entry.id);
+      entry.type !== "label" && (pathWithoutLabels.push({ ...entry, inherited: !0, parentId: pathParentId }), pathParentId = entry.id);
     let newSessionId = createSessionId(), timestamp = (/* @__PURE__ */ new Date()).toISOString(), fileTimestamp = timestamp.replace(/[:.]/g, "-"), newSessionFile = join(this.getSessionDir(), `${fileTimestamp}_${newSessionId}.jsonl`), header = {
       type: "session",
       version: CURRENT_SESSION_VERSION,

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

@@ -8,7 +8,7 @@ import {
 } from "./chunk-US544NN6.js";
 import {
   computeContextBreakdown
-} from "./chunk-JQYNHAKX.js";
+} from "./chunk-RY3FJ6WI.js";
 import {
   copyToClipboard,
   readClipboardText
@@ -48,7 +48,7 @@ import {
   peekRollbackTurnsConsumed,
   rollbackLastTurn,
   setRollbackWarningHandler
-} from "./chunk-ZDJUR45D.js";
+} from "./chunk-BMRXLQWQ.js";
 import {
   notifyTodosEnabledChanged
 } from "./chunk-CCCN2UCX.js";
@@ -101,7 +101,7 @@ import {
   defaultModelPerProvider,
   findExactModelReferenceMatch,
   resolveModelScope
-} from "./chunk-FIRA54AC.js";
+} from "./chunk-ICKGAKWX.js";
 import {
   SubagentEscapeSequence,
   getSubagentCancellation
@@ -134,11 +134,11 @@ import {
   recordTuiActivity,
   registerTransferHandler,
   requestSessionTransfer
-} from "./chunk-I2H5QMWW.js";
+} from "./chunk-STMX7W5I.js";
 import {
   SessionManager,
   sessionEntryToContextMessages
-} from "./chunk-EPR2F3GU.js";
+} from "./chunk-PWHTSQC4.js";
 import {
   createCompactionSummaryMessage
 } from "./chunk-FVDOXRUD.js";
@@ -169,6 +169,11 @@ import {
 import {
   time
 } from "./chunk-PVCDKGR6.js";
+import {
+  collectUsageRequests,
+  totalRequestUsage,
+  usageTokens
+} from "./chunk-SWWHZ2RI.js";
 import {
   markStartupMilestone
 } from "./chunk-CCZJ3PYY.js";
@@ -1783,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}`);
@@ -1881,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 })),
@@ -1890,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 },
@@ -1913,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));
@@ -1930,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 })),
@@ -1938,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 }
@@ -7545,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) {
@@ -7557,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));
   }
@@ -9528,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);
@@ -9540,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")}
 
@@ -9559,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()}
@@ -9573,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")}
@@ -9583,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();
@@ -9623,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();

package/dist/node-runtime/{chunk-JQYNHAKX.js → chunk-RY3FJ6WI.js}

@@ -1,12 +1,13 @@
 import { createRequire as __lunrRequire } from "node:module"; const require = __lunrRequire(import.meta.url);
 import {
   estimateTokens
-} from "./chunk-FIRA54AC.js";
+} from "./chunk-ICKGAKWX.js";
 
 // packages/coding-agent/dist/core/context-breakdown.js
-var CHARS_PER_TOKEN = 4, PROJECT_CONTEXT_RE = /<project_context>[\s\S]*?<\/project_context>/, PROJECT_INSTRUCTIONS_RE = /<project_instructions(?:\s+path="([^"]*)")?>([\s\S]*?)<\/project_instructions>/g, SKILLS_BLOCK_RE = /\n\nThe following skills provide specialized instructions for specific tasks\.[\s\S]*<\/available_skills>/;
+import { estimateTextTokens } from "@ashx-j/lunr-ai/compat";
+var PROJECT_CONTEXT_RE = /<project_context>[\s\S]*?<\/project_context>/, PROJECT_INSTRUCTIONS_RE = /<project_instructions(?:\s+path="([^"]*)")?>([\s\S]*?)<\/project_instructions>/g, SKILLS_BLOCK_RE = /\n\nThe following skills provide specialized instructions for specific tasks\.[\s\S]*<\/available_skills>/;
 function estimateChars(text) {
-  return text.length === 0 ? 0 : Math.ceil(text.length / CHARS_PER_TOKEN);
+  return estimateTextTokens(text);
 }
 function contextFileLabel(filePath, globalAgentsPath, modelAgentsPath) {
   if (!filePath)
@@ -35,16 +36,16 @@ function splitSystemPromptSections(systemPrompt) {
   return skillsMatch && (skills = skillsMatch[0], remaining = remaining.replace(skills, "")), { base: remaining, contextFiles, skills };
 }
 function estimateToolDefinitionTokens(tools) {
-  let chars = 0;
+  let text = "";
   for (let tool of tools) {
-    chars += tool.name.length + tool.description.length;
+    text += tool.name + tool.description;
     try {
       let schema = JSON.stringify(tool.parameters);
-      schema && (chars += schema.length);
+      schema && (text += schema);
     } catch {
     }
   }
-  return Math.ceil(chars / CHARS_PER_TOKEN);
+  return estimateTextTokens(text);
 }
 function computeContextBreakdown(input) {
   let sections = splitSystemPromptSections(input.systemPrompt), systemPrompt = estimateChars(sections.base), contextFiles = sections.contextFiles.map((file) => ({
@@ -60,27 +61,28 @@ function computeContextBreakdown(input) {
     summaries: 0
   };
   for (let message of input.messages)
-    switch (message.role) {
-      case "assistant": {
-        let textChars = 0, thinkingChars = 0, toolCallChars = 0;
-        for (let block of message.content)
-          block.type === "text" ? textChars += block.text.length : block.type === "thinking" ? thinkingChars += block.thinking.length : block.type === "toolCall" && (toolCallChars += block.name.length + JSON.stringify(block.arguments).length);
-        assistantText += Math.ceil(textChars / CHARS_PER_TOKEN), thinking += Math.ceil(thinkingChars / CHARS_PER_TOKEN), toolCalls += Math.ceil(toolCallChars / CHARS_PER_TOKEN), textChars > 0 && counts.assistantText++, thinkingChars > 0 && counts.thinking++, toolCallChars > 0 && counts.toolCalls++;
-        break;
+    if (!(message.role === "bashExecution" && message.excludeFromContext))
+      switch (message.role) {
+        case "assistant": {
+          let text = "", thinkingText = "", toolCallText = "";
+          for (let block of message.content)
+            block.type === "text" ? text += block.text : block.type === "thinking" ? thinkingText += block.thinking : block.type === "toolCall" && (toolCallText += block.name + JSON.stringify(block.arguments));
+          assistantText += estimateTextTokens(text), thinking += estimateTextTokens(thinkingText), toolCalls += estimateTextTokens(toolCallText), text.length > 0 && counts.assistantText++, thinkingText.length > 0 && counts.thinking++, toolCallText.length > 0 && counts.toolCalls++;
+          break;
+        }
+        case "user":
+        case "custom":
+          user += estimateTokens(message), counts.user++;
+          break;
+        case "toolResult":
+        case "bashExecution":
+          toolResults += estimateTokens(message), counts.toolResults++;
+          break;
+        case "branchSummary":
+        case "compactionSummary":
+          summaries += estimateTokens(message), counts.summaries++;
+          break;
       }
-      case "user":
-      case "custom":
-        user += estimateTokens(message), counts.user++;
-        break;
-      case "toolResult":
-      case "bashExecution":
-        toolResults += estimateTokens(message), counts.toolResults++;
-        break;
-      case "branchSummary":
-      case "compactionSummary":
-        summaries += estimateTokens(message), counts.summaries++;
-        break;
-    }
   let contextFileTokens = contextFiles.reduce((sum, file) => sum + file.tokens, 0), total = systemPrompt + contextFileTokens + skills + toolDefinitions + user + assistantText + thinking + toolCalls + toolResults + summaries;
   return {
     systemPrompt,

package/dist/node-runtime/{chunk-I2H5QMWW.js → chunk-STMX7W5I.js}

@@ -1,7 +1,7 @@
 import { createRequire as __lunrRequire } from "node:module"; const require = __lunrRequire(import.meta.url);
 import {
   SessionManager
-} from "./chunk-EPR2F3GU.js";
+} from "./chunk-PWHTSQC4.js";
 import {
   SessionOwnership,
   canonicalSessionPath,

package/dist/node-runtime/chunk-SWWHZ2RI.js

@@ -0,0 +1,158 @@
+import { createRequire as __lunrRequire } from "node:module"; const require = __lunrRequire(import.meta.url);
+
+// packages/coding-agent/dist/core/usage-accounting.js
+var REQUEST_USAGE_TYPE = "request-usage";
+function emptyUsageTotals() {
+  return {
+    requests: 0,
+    input: 0,
+    output: 0,
+    cacheRead: 0,
+    cacheWrite: 0,
+    total: 0,
+    cost: 0,
+    unknownRequests: 0,
+    partialRequests: 0,
+    unknownCosts: 0
+  };
+}
+function usageTokens(usage) {
+  return usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
+}
+function collectUsageRequests(entries) {
+  let requests = /* @__PURE__ */ new Map();
+  for (let entry of entries) {
+    if (entry.inherited)
+      continue;
+    let request;
+    if (entry.type === "message" && entry.message.role === "assistant") {
+      let message = entry.message;
+      if (!validUsage(message.usage))
+        continue;
+      request = {
+        id: message.usage.requestId ?? `${entry.id}:${entry.timestamp}:${message.provider}/${message.model}`,
+        purpose: "conversation",
+        provider: message.provider,
+        model: message.responseModel ?? message.model,
+        timestamp: Number.isFinite(Date.parse(entry.timestamp)) ? Date.parse(entry.timestamp) : message.timestamp,
+        usage: message.usage,
+        stopReason: message.stopReason
+      };
+    } else if (entry.type === "custom" && entry.customType === REQUEST_USAGE_TYPE) {
+      let data = entry.data;
+      validRequest(data) && (request = data);
+    }
+    request && validRequest(request) && requests.set(request.id, request);
+  }
+  return [...requests.values()];
+}
+function totalRequestUsage(requests) {
+  let total = emptyUsageTotals();
+  total.requests = requests.length;
+  for (let { usage } of requests)
+    total.input += usage.input, total.output += usage.output, total.cacheRead += usage.cacheRead, total.cacheWrite += usage.cacheWrite, total.total += usageTokens(usage), total.cost += usage.cost.total, total.unknownRequests += +(usage.measurement === "unknown"), total.partialRequests += +(usage.measurement === "partial"), total.unknownCosts += +(usage.costSource === "unknown");
+  return total;
+}
+function record(value) {
+  return value !== null && typeof value == "object" ? value : void 0;
+}
+function amount(value) {
+  return typeof value == "number" && Number.isFinite(value) && value >= 0 ? value : 0;
+}
+function validUsage(value) {
+  let usage = record(value), cost = record(usage?.cost);
+  return !!(usage && cost && [usage.input, usage.output, usage.cacheRead, usage.cacheWrite, cost.total].every((amount2) => typeof amount2 == "number" && Number.isFinite(amount2) && amount2 >= 0));
+}
+function validRequest(value) {
+  let request = record(value);
+  return !!(request && typeof request.id == "string" && request.id && validUsage(request.usage) && typeof request.timestamp == "number" && Number.isFinite(request.timestamp));
+}
+function collectChildUsage(entries) {
+  let children = /* @__PURE__ */ new Map(), inherited = /* @__PURE__ */ new Map(), requestGroups = /* @__PURE__ */ new Map(), inheritedRequestIds = /* @__PURE__ */ new Set(), requestOwners = /* @__PURE__ */ new Map();
+  for (let entry of entries) {
+    let details = entry.type === "custom_message" && ["subagent-notify", "subagent-slash-result"].includes(entry.customType) ? record(entry.details) : entry.type === "message" && entry.message.role === "toolResult" && entry.message.toolName?.startsWith("subagent") ? record(entry.message.details) : void 0;
+    if (!details)
+      continue;
+    let slash = record(record(details.result)?.details), candidates = details.children ?? slash?.results ?? details.results;
+    if (Array.isArray(candidates))
+      for (let candidate of candidates) {
+        let child = record(candidate), usage = record(child?.usage);
+        if (!child || !usage)
+          continue;
+        let identity = child.sessionFile ?? child.childId ?? child.id;
+        if (typeof identity != "string" || !identity)
+          continue;
+        let snapshot = {
+          id: identity,
+          label: String(child.description ?? child.agent ?? "child"),
+          sessionFile: typeof child.sessionFile == "string" ? child.sessionFile : void 0,
+          input: amount(usage.input),
+          output: amount(usage.output),
+          cacheRead: amount(usage.cacheRead),
+          cacheWrite: amount(usage.cacheWrite),
+          cost: amount(usage.cost),
+          turns: amount(usage.turns),
+          unknownRequests: amount(usage.unknownRequests),
+          partialRequests: amount(usage.partialRequests),
+          unknownCosts: amount(usage.unknownCosts)
+        };
+        if (Array.isArray(child.usageRequests)) {
+          let requests = requestGroups.get(identity) ?? /* @__PURE__ */ new Map();
+          requestGroups.set(identity, requests);
+          for (let request of child.usageRequests)
+            validRequest(request) && (entry.inherited ? inheritedRequestIds.add(request.id) : (!requestOwners.has(request.id) || requestOwners.get(request.id) === identity) && (requestOwners.set(request.id, identity), requests.set(request.id, request)));
+        }
+        let target = entry.inherited ? inherited : children, previous = target.get(identity);
+        (!previous || usageTokens(snapshot) >= usageTokens(previous)) && target.set(identity, snapshot);
+      }
+  }
+  return [...children.values()].map((child) => {
+    let requests = requestGroups.get(child.id);
+    if (requests) {
+      let ownRequests = [...requests.values()].filter((request) => !inheritedRequestIds.has(request.id)), total = totalRequestUsage(ownRequests);
+      return {
+        ...child,
+        input: total.input,
+        output: total.output,
+        cacheRead: total.cacheRead,
+        cacheWrite: total.cacheWrite,
+        cost: total.cost,
+        turns: ownRequests.length,
+        unknownRequests: total.unknownRequests,
+        partialRequests: total.partialRequests,
+        unknownCosts: total.unknownCosts
+      };
+    }
+    let baseline = inherited.get(child.id);
+    if (!baseline)
+      return child;
+    let own = { ...child };
+    for (let key of [
+      "input",
+      "output",
+      "cacheRead",
+      "cacheWrite",
+      "cost",
+      "turns",
+      "unknownRequests",
+      "partialRequests",
+      "unknownCosts"
+    ])
+      own[key] = Math.max(0, child[key] - baseline[key]);
+    return own;
+  });
+}
+function totalChildUsage(children) {
+  let totals = emptyUsageTotals();
+  for (let child of children)
+    totals.requests += child.turns, totals.input += child.input, totals.output += child.output, totals.cacheRead += child.cacheRead, totals.cacheWrite += child.cacheWrite, totals.total += usageTokens(child), totals.cost += child.cost, totals.unknownRequests += child.unknownRequests, totals.partialRequests += child.partialRequests, totals.unknownCosts += child.unknownCosts;
+  return totals;
+}
+
+export {
+  usageTokens,
+  collectUsageRequests,
+  totalRequestUsage,
+  collectChildUsage,
+  totalChildUsage
+};

package/dist/node-runtime/{chunk-QNVMKNNN.js → chunk-U3YVZ6UC.js}

@@ -6,16 +6,16 @@ import {
   createPicker,
   gatewayPickerGeneration,
   resolveWithinRoots
-} from "./chunk-A2WO6WIN.js";
+} from "./chunk-4QRUZ64T.js";
 import {
   computeContextBreakdown
-} from "./chunk-JQYNHAKX.js";
+} from "./chunk-RY3FJ6WI.js";
 import {
   findExactModelReferenceMatch
-} from "./chunk-FIRA54AC.js";
+} from "./chunk-ICKGAKWX.js";
 import {
   SessionManager
-} from "./chunk-EPR2F3GU.js";
+} from "./chunk-PWHTSQC4.js";
 import {
   runtimeScope
 } from "./chunk-IMLCWLPI.js";

package/dist/node-runtime/{command-3HMSY6W2.js → command-YRT7I2BW.js}

@@ -32,7 +32,7 @@ lunr gateway autostart off|login|boot
 lunr gateway pair approve <platform> <code> [--owner]
 lunr gateway pair list`);
     else {
-      let { runGateway } = await import("./gateway-6623C2U3.js");
+      let { runGateway } = await import("./gateway-V6K2CDWN.js");
       process.exitCode = await runGateway(sub === "run" ? args.slice(2) : args.slice(1));
     }
   } catch (error) {

package/dist/node-runtime/{commands-OCSSEEWJ.js → commands-2ETOWWRA.js}

@@ -5,12 +5,12 @@ import {
   formatHelpText,
   runChatCommand,
   sendCommandReply
-} from "./chunk-QNVMKNNN.js";
-import "./chunk-A2WO6WIN.js";
+} from "./chunk-U3YVZ6UC.js";
+import "./chunk-4QRUZ64T.js";
 import "./chunk-NNNR3QIY.js";
 import "./chunk-WXYNALHD.js";
-import "./chunk-JQYNHAKX.js";
-import "./chunk-FIRA54AC.js";
+import "./chunk-RY3FJ6WI.js";
+import "./chunk-ICKGAKWX.js";
 import "./chunk-BYC6RKCN.js";
 import "./chunk-CGBXPL3E.js";
 import "./chunk-BBUVIEZB.js";
@@ -18,7 +18,7 @@ import "./chunk-APVM5NEU.js";
 import "./chunk-F2V2F4ZG.js";
 import "./chunk-BDRGN3L2.js";
 import "./chunk-FY4A63RK.js";
-import "./chunk-EPR2F3GU.js";
+import "./chunk-PWHTSQC4.js";
 import "./chunk-FVDOXRUD.js";
 import "./chunk-IMLCWLPI.js";
 import "./chunk-MNQXDFPV.js";

package/dist/node-runtime/{export-html-BRWF5AHI.js → export-html-DBQRRMAY.js}

@@ -1,7 +1,7 @@
 import { createRequire as __lunrRequire } from "node:module"; const require = __lunrRequire(import.meta.url);
 import {
   SessionManager
-} from "./chunk-EPR2F3GU.js";
+} from "./chunk-PWHTSQC4.js";
 import "./chunk-FVDOXRUD.js";
 import "./chunk-MNQXDFPV.js";
 import {