@ashx-j/lunr 0.2.26 → 0.2.28

package/dist/node-runtime/{chunk-GS42T6MX.js → chunk-QW3AAHWN.js}

@@ -1,7 +1,7 @@
 import { createRequire as __lunrRequire } from "node:module"; const require = __lunrRequire(import.meta.url);
 import {
   theme
-} from "./chunk-RDDAZOMU.js";
+} from "./chunk-JL4HYQXK.js";
 
 // packages/coding-agent/dist/modes/interactive/components/keybinding-hints.js
 import { getKeybindings } from "@ashx-j/lunr-tui";

package/dist/node-runtime/{chunk-DVQSHCVP.js → chunk-R4WSB2MQ.js}

@@ -2,18 +2,18 @@ import { createRequire as __lunrRequire } from "node:module"; const require = __
 import {
   showStartupInput,
   showStartupSelector
-} from "./chunk-X3PGBLQ7.js";
+} from "./chunk-IHHTWSXN.js";
 import {
   getProjectTrustOptions,
   hasTrustRequiringProjectResources
-} from "./chunk-HTFRRDSF.js";
+} from "./chunk-F2SMQ6ES.js";
 import {
   emitProjectTrustEvent
-} from "./chunk-GJ2RDBRL.js";
+} from "./chunk-BYC6RKCN.js";
 import {
   APP_NAME,
   CONFIG_DIR_NAME
-} from "./chunk-FQMM2EZ2.js";
+} from "./chunk-64XTQNLA.js";
 
 // packages/coding-agent/dist/cli/project-trust.js
 import chalk from "chalk";
@@ -51,7 +51,7 @@ function formatProjectTrustPrompt(cwd) {
   return `Trust project folder?
 ${cwd}
 
-This allows ${APP_NAME} to load ${CONFIG_DIR_NAME} settings and resources, install missing project packages, and execute project extensions.`;
+This allows ${APP_NAME} to load ${CONFIG_DIR_NAME} settings and resources, install missing project packages, execute project extensions, and start project MCP or language servers.`;
 }
 async function selectProjectTrustOption(cwd, ctx) {
   let options = getProjectTrustOptions(cwd, { includeSessionOnly: !0 }), selected = await ctx.ui.select(formatProjectTrustPrompt(cwd), options.map((option) => option.label));

package/dist/node-runtime/{chunk-B4HP6ZWM.js → chunk-RHCGYWO7.js}

@@ -1,7 +1,7 @@
 import { createRequire as __lunrRequire } from "node:module"; const require = __lunrRequire(import.meta.url);
 import {
   getAgentDir
-} from "./chunk-FQMM2EZ2.js";
+} from "./chunk-64XTQNLA.js";
 
 // packages/coding-agent/dist/gateway/config.js
 import { chmodSync, existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";

package/dist/node-runtime/{chunk-2CFDTH5B.js → chunk-RLGY2QIL.js}

@@ -6,14 +6,12 @@ import {
 } from "./chunk-OAR4TYZE.js";
 import {
   READ_ONLY_WRITE_SPAWN_ERROR,
+  createReadOnlyTools,
   resolveChildPermissions
-} from "./chunk-PTFBPO3C.js";
-import {
-  createReadOnlyTools
-} from "./chunk-YWOJIGFY.js";
+} from "./chunk-ZEVFBFNF.js";
 import {
   subagentCommunicationEnabled
-} from "./chunk-I74LN5JG.js";
+} from "./chunk-HUD2RFJW.js";
 import {
   COMPUTER_TOOLS
 } from "./chunk-FY4A63RK.js";
@@ -193,15 +191,21 @@ function isParallelGroup(step) {
 function isDynamicRunnerGroup(step) {
   return "expand" in step && "collect" in step && "parallel" in step && !Array.isArray(step.parallel);
 }
-var DEFAULT_GLOBAL_CONCURRENCY_LIMIT = Number.MAX_SAFE_INTEGER, PARALLEL_COLD_START_STAGGER_MS = 1e3, Semaphore = class {
+var DEFAULT_GLOBAL_CONCURRENCY_LIMIT = Number.MAX_SAFE_INTEGER, PARALLEL_COLD_START_ALLOWANCE_MS = 1e3, Semaphore = class {
   available;
   queue = [];
   constructor(limit) {
     this.available = Math.max(1, Math.floor(limit) || 1);
   }
-  acquire() {
-    return this.available > 0 ? (this.available--, Promise.resolve()) : new Promise((resolve11) => {
-      this.queue.push(resolve11);
+  acquire(signal) {
+    return signal?.throwIfAborted(), this.available > 0 ? (this.available--, Promise.resolve()) : new Promise((resolve11, reject) => {
+      let grant = () => {
+        signal?.removeEventListener("abort", abort), resolve11();
+      }, abort = () => {
+        let index = this.queue.indexOf(grant);
+        index !== -1 && this.queue.splice(index, 1), reject(signal?.reason);
+      };
+      this.queue.push(grant), signal?.addEventListener("abort", abort, { once: !0 });
     });
   }
   release() {
@@ -209,25 +213,37 @@ var DEFAULT_GLOBAL_CONCURRENCY_LIMIT = Number.MAX_SAFE_INTEGER, PARALLEL_COLD_ST
     next ? next() : this.available++;
   }
 };
-async function mapConcurrent(items, limit, fn, globalSemaphore) {
-  let safeLimit = Math.max(1, Math.floor(limit) || 1), results = new Array(items.length), next = 0;
-  async function worker(_workerIndex) {
+function waitForLaunch(delayMs, signal) {
+  return signal?.throwIfAborted(), delayMs <= 0 ? Promise.resolve() : new Promise((resolve11, reject) => {
+    let timer = setTimeout(() => {
+      signal?.removeEventListener("abort", abort), resolve11();
+    }, delayMs), abort = () => {
+      clearTimeout(timer), reject(signal?.reason);
+    };
+    signal?.addEventListener("abort", abort, { once: !0 });
+  });
+}
+async function mapConcurrent(items, limit, fn, globalSemaphore, cancellation) {
+  let safeLimit = Math.max(1, Math.floor(limit) || 1), results = new Array(items.length), launchDeadline = Date.now() + (safeLimit > 1 ? PARALLEL_COLD_START_ALLOWANCE_MS : 0), signal = cancellation?.signal, launchReady, next = 0;
+  async function worker() {
     for (; next < items.length; ) {
-      let i = next++;
-      if (safeLimit > 1 && i > 0 && PARALLEL_COLD_START_STAGGER_MS > 0 && await new Promise((resolve11) => {
-        setTimeout(resolve11, PARALLEL_COLD_START_STAGGER_MS * i);
-      }), globalSemaphore) {
-        await globalSemaphore.acquire();
+      let i = next++, acquired = !1;
+      try {
         try {
-          results[i] = await fn(items[i], i);
-        } finally {
-          globalSemaphore.release();
+          await (i === 0 ? waitForLaunch(0, signal) : launchReady ??= waitForLaunch(launchDeadline - Date.now(), signal)), globalSemaphore && (await globalSemaphore.acquire(signal), acquired = !0), signal?.throwIfAborted();
+        } catch (error) {
+          if (!signal?.aborted || !cancellation)
+            throw error;
+          results[i] = cancellation.onAbort(items[i], i);
+          continue;
         }
-      } else
         results[i] = await fn(items[i], i);
+      } finally {
+        acquired && globalSemaphore.release();
+      }
     }
   }
-  return await Promise.all(Array.from({ length: Math.min(safeLimit, items.length) }, (_, wi) => worker(wi))), results;
+  return await Promise.all(Array.from({ length: Math.min(safeLimit, items.length) }, () => worker())), results;
 }
 function aggregateParallelOutputs(results, headerFormat = (i, agent) => `=== Parallel Task ${i + 1} (${agent}) ===`) {
   return results.map((r, i) => {
@@ -566,20 +582,20 @@ function readStatus(asyncDir) {
     stat = fs3.statSync(statusPath);
   } catch (error) {
     if (isNotFoundError(error))
-      return null;
+      return statusCache.delete(statusPath), null;
     throw new Error(`Failed to inspect async status file '${statusPath}': ${getErrorMessage(error)}`, {
       cause: error instanceof Error ? error : void 0
     });
   }
   let cached = statusCache.get(statusPath);
-  if (cached && cached.mtime === stat.mtimeMs)
+  if (cached && cached.stat.dev === stat.dev && cached.stat.ino === stat.ino && cached.stat.mtimeMs === stat.mtimeMs && cached.stat.ctimeMs === stat.ctimeMs && cached.stat.size === stat.size)
     return cached.status;
   let content;
   try {
     content = fs3.readFileSync(statusPath, "utf-8");
   } catch (error) {
     if (isNotFoundError(error))
-      return null;
+      return statusCache.delete(statusPath), null;
     throw new Error(`Failed to read async status file '${statusPath}': ${getErrorMessage(error)}`, {
       cause: error instanceof Error ? error : void 0
     });
@@ -592,7 +608,7 @@ function readStatus(asyncDir) {
       cause: error instanceof Error ? error : void 0
     });
   }
-  if (statusCache.set(statusPath, { mtime: stat.mtimeMs, status }), statusCache.size > 50) {
+  if (statusCache.set(statusPath, { stat, status }), statusCache.size > 50) {
     let firstKey = statusCache.keys().next().value;
     firstKey && statusCache.delete(firstKey);
   }
@@ -2540,34 +2556,6 @@ function formatNestedRunStatusLines(children, options = {}) {
   });
 }
 
-// packages/coding-agent/dist/builtin-extensions/pi-subagents/src/runs/foreground/request-params.js
-var LAUNCH_COMPATIBLE_ACTIONS = /* @__PURE__ */ new Set(["schedule", "append-step", "resume", "steer"]);
-function omitExecutionModeActionAlias(params) {
-  let action = params.action?.toLowerCase();
-  if (action === "single" && params.task !== void 0) {
-    let rest = { ...params };
-    return delete rest.action, rest;
-  }
-  if ((action === "parallel" || action === "tasks") && (params.tasks?.length ?? 0) > 0) {
-    let rest = { ...params };
-    return delete rest.action, rest;
-  }
-  return params;
-}
-function hasLaunchFields(params) {
-  return params.task !== void 0 || Array.isArray(params.tasks) && params.tasks.length > 0 || Array.isArray(params.chain) && params.chain.length > 0;
-}
-function omitConflictingControlAction(params) {
-  let action = params.action?.toLowerCase();
-  if (!action || LAUNCH_COMPATIBLE_ACTIONS.has(action) || !hasLaunchFields(params))
-    return params;
-  let rest = { ...params };
-  return delete rest.action, typeof rest.task == "string" && rest.task.length > 0 && (delete rest.tasks, delete rest.chain), rest;
-}
-function resolveSubagentRequestParams(params) {
-  return omitConflictingControlAction(omitExecutionModeActionAlias(params));
-}
-
 // packages/coding-agent/dist/builtin-extensions/pi-subagents/src/runs/shared/nested-events.js
 import { randomUUID } from "node:crypto";
 import * as fs11 from "node:fs";
@@ -6707,7 +6695,7 @@ async function resolveWatchdogReviewModel(ctx, config, options = {}) {
   }
   let currentModel = ctx.model;
   if (!currentModel)
-    throw new Error("Main watchdog review cannot run because the current Pi session model is unavailable and subagents.watchdog.main.model is not configured.");
+    throw new Error("Main watchdog review cannot run because the current lunR session model is unavailable and subagents.watchdog.main.model is not configured.");
   return {
     model: currentModel,
     thinkingLevel: resolveReviewThinking({
@@ -6763,7 +6751,7 @@ function createWatchdogWarnTool(request) {
 }
 function buildWatchdogSystemPrompt(ctx) {
   return [
-    "You are the main-session subagent watchdog for Pi.",
+    "You are the main-session subagent watchdog for lunR.",
     `Working directory: ${ctx.cwd}`,
     "Review only the supplied parent turn delta. Inspect repository files only when needed to verify a concrete concern.",
     "You are read-only. You may use read, grep, find, and ls. Do not edit files, run shell commands, spawn agents, or mutate state.",
@@ -6804,7 +6792,7 @@ function createMainWatchdogReview(provider, options = {}) {
   return async (request) => {
     let ctx = resolveContext(provider);
     if (!ctx)
-      throw new Error("Main watchdog review cannot run without an active Pi extension context.");
+      throw new Error("Main watchdog review cannot run without an active lunR extension context.");
     if (ctx.signal?.aborted || request.signal?.aborted)
       return { stopReason: "aborted" };
     let selection = await resolveWatchdogReviewModel(ctx, request.config, {
@@ -8453,7 +8441,6 @@ export {
   legacySupervisorBody,
   SUBAGENT_CHILD_ENV,
   SUBAGENT_FANOUT_CHILD_ENV,
-  SUBAGENT_PARENT_SESSION_ENV,
   applyThinkingSuffix,
   buildPiArgs,
   cleanupTempDir,
@@ -8474,7 +8461,6 @@ export {
   formatAgentRunningLabel,
   formatNestedAggregate,
   formatNestedRunStatusLines,
-  resolveSubagentRequestParams,
   writeAtomicJson,
   writePrivateAtomicJson,
   createNestedRoute,

package/dist/node-runtime/{chunk-CDVHZOOK.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-GYIXXQAO.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-KKUTQQV7.js → chunk-RYRGL7P4.js}

@@ -2,7 +2,7 @@ import { createRequire as __lunrRequire } from "node:module"; const require = __
 import {
   getShellConfig,
   killProcessTree
-} from "./chunk-CSFI6YXL.js";
+} from "./chunk-ES6PBSIE.js";
 
 // packages/coding-agent/dist/core/process-registry.js
 import { spawn } from "node:child_process";

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

@@ -1,17 +1,17 @@
 import { createRequire as __lunrRequire } from "node:module"; const require = __lunrRequire(import.meta.url);
 import {
   SessionManager
-} from "./chunk-2KIPT4HJ.js";
+} from "./chunk-PWHTSQC4.js";
 import {
   SessionOwnership,
   canonicalSessionPath,
   isSessionOwnerDead,
   readSessionOwner,
   writeSessionJson
-} from "./chunk-UAEOTO52.js";
+} from "./chunk-MNQXDFPV.js";
 import {
   getAgentDir
-} from "./chunk-FQMM2EZ2.js";
+} from "./chunk-64XTQNLA.js";
 
 // packages/coding-agent/dist/core/session-handoff.js
 import { createHash, randomUUID } from "node:crypto";

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-5Q4A37RB.js → chunk-TCT6PCUR.js}

@@ -13,7 +13,13 @@ import { createHash } from "node:crypto";
 function readOrientationFromTiff(bytes, tiffStart) {
   if (tiffStart + 8 > bytes.length)
     return 1;
-  let le = (bytes[tiffStart] << 8 | bytes[tiffStart + 1]) === 18761, read16 = (pos) => le ? bytes[pos] | bytes[pos + 1] << 8 : bytes[pos] << 8 | bytes[pos + 1], ifdOffset = ((pos) => le ? bytes[pos] | bytes[pos + 1] << 8 | bytes[pos + 2] << 16 | bytes[pos + 3] << 24 : (bytes[pos] << 24 | bytes[pos + 1] << 16 | bytes[pos + 2] << 8 | bytes[pos + 3]) >>> 0)(tiffStart + 4), ifdStart = tiffStart + ifdOffset;
+  let byteOrder = bytes[tiffStart] << 8 | bytes[tiffStart + 1];
+  if (byteOrder !== 18761 && byteOrder !== 19789)
+    return 1;
+  let le = byteOrder === 18761, read16 = (pos) => le ? bytes[pos] | bytes[pos + 1] << 8 : bytes[pos] << 8 | bytes[pos + 1], ifdOffset = ((pos) => le ? (bytes[pos] | bytes[pos + 1] << 8 | bytes[pos + 2] << 16 | bytes[pos + 3] << 24) >>> 0 : (bytes[pos] << 24 | bytes[pos + 1] << 16 | bytes[pos + 2] << 8 | bytes[pos + 3]) >>> 0)(tiffStart + 4);
+  if (ifdOffset < 8)
+    return 1;
+  let ifdStart = tiffStart + ifdOffset;
   if (ifdStart + 2 > bytes.length)
     return 1;
   let entryCount = read16(ifdStart);
@@ -51,22 +57,37 @@ function findJpegTiffOffset(bytes) {
   }
   return -1;
 }
-function findWebpTiffOffset(bytes) {
-  let offset = 12;
-  for (; offset + 8 <= bytes.length; ) {
-    let chunkId = String.fromCharCode(bytes[offset], bytes[offset + 1], bytes[offset + 2], bytes[offset + 3]), chunkSize = bytes[offset + 4] | bytes[offset + 5] << 8 | bytes[offset + 6] << 16 | bytes[offset + 7] << 24, dataStart = offset + 8;
-    if (chunkId === "EXIF")
-      return dataStart + chunkSize > bytes.length ? -1 : chunkSize >= 6 && hasExifHeader(bytes, dataStart) ? dataStart + 6 : dataStart;
-    offset = dataStart + chunkSize + chunkSize % 2;
+function findWebpTiff(bytes) {
+  let view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength), riffSize = view.getUint32(4, !0);
+  if (riffSize < 4 || riffSize > bytes.length - 8)
+    return;
+  let end = 8 + riffSize, offset = 12;
+  for (; end - offset >= 8; ) {
+    let chunkId = String.fromCharCode(bytes[offset], bytes[offset + 1], bytes[offset + 2], bytes[offset + 3]), chunkSize = view.getUint32(offset + 4, !0), dataStart = offset + 8, paddedSize = chunkSize + chunkSize % 2;
+    if (paddedSize > end - dataStart)
+      return;
+    let nextOffset = dataStart + paddedSize;
+    if (nextOffset <= offset || nextOffset > end)
+      return;
+    if (chunkId === "EXIF") {
+      let tiffStart = chunkSize >= 6 && hasExifHeader(bytes, dataStart) ? dataStart + 6 : dataStart;
+      return bytes.subarray(tiffStart, dataStart + chunkSize);
+    }
+    offset = nextOffset;
   }
-  return -1;
 }
 function hasExifHeader(bytes, offset) {
   return bytes[offset] === 69 && bytes[offset + 1] === 120 && bytes[offset + 2] === 105 && bytes[offset + 3] === 102 && bytes[offset + 4] === 0 && bytes[offset + 5] === 0;
 }
 function getExifOrientation(bytes) {
   let tiffOffset = -1;
-  return bytes.length >= 2 && bytes[0] === 255 && bytes[1] === 216 ? tiffOffset = findJpegTiffOffset(bytes) : bytes.length >= 12 && bytes[0] === 82 && bytes[1] === 73 && bytes[2] === 70 && bytes[3] === 70 && bytes[8] === 87 && bytes[9] === 69 && bytes[10] === 66 && bytes[11] === 80 && (tiffOffset = findWebpTiffOffset(bytes)), tiffOffset === -1 ? 1 : readOrientationFromTiff(bytes, tiffOffset);
+  if (bytes.length >= 2 && bytes[0] === 255 && bytes[1] === 216)
+    tiffOffset = findJpegTiffOffset(bytes);
+  else if (bytes.length >= 12 && bytes[0] === 82 && bytes[1] === 73 && bytes[2] === 70 && bytes[3] === 70 && bytes[8] === 87 && bytes[9] === 69 && bytes[10] === 66 && bytes[11] === 80) {
+    let tiff = findWebpTiff(bytes);
+    return tiff ? readOrientationFromTiff(tiff, 0) : 1;
+  }
+  return tiffOffset === -1 ? 1 : readOrientationFromTiff(bytes, tiffOffset);
 }
 function rotate90(photon, image, dstIndex) {
   let w = image.get_width(), h = image.get_height(), src = image.get_raw_pixels(), dst = new Uint8Array(src.length);
@@ -152,7 +173,7 @@ async function resizeImageInProcess(inputBytes, mimeType, options) {
         ...fingerprint ? { fingerprint } : {}
       };
     let targetWidth = originalWidth, targetHeight = originalHeight;
-    targetWidth > opts.maxWidth && (targetHeight = Math.round(targetHeight * opts.maxWidth / targetWidth), targetWidth = opts.maxWidth), targetHeight > opts.maxHeight && (targetWidth = Math.round(targetWidth * opts.maxHeight / targetHeight), targetHeight = opts.maxHeight);
+    targetWidth > opts.maxWidth && (targetHeight = Math.round(targetHeight * opts.maxWidth / targetWidth), targetWidth = opts.maxWidth), targetHeight > opts.maxHeight && (targetWidth = Math.round(targetWidth * opts.maxHeight / targetHeight), targetHeight = opts.maxHeight), targetWidth = Math.max(1, targetWidth), targetHeight = Math.max(1, targetHeight);
     let qualitySteps = Array.from(/* @__PURE__ */ new Set([opts.jpegQuality, 85, 70, 55, 40])), currentWidth = targetWidth, currentHeight = targetHeight;
     for (; ; ) {
       let candidates = tryEncodings(currentWidth, currentHeight, qualitySteps);