@ashx-j/lunr 0.2.26 → 0.2.28

package/dist/builtin-extensions/pi-subagents/src/shared/session-tokens.d.ts

@@ -1,3 +1,9 @@
-import type { TokenUsage } from "./types.ts";
+import { type AccountedRequest } from "../../../../core/usage-accounting.ts";
+import type { TokenUsage, Usage } from "./types.ts";
+/** Scan all attempts, including older files; stable request IDs prevent fork duplication. */
+export declare function parseSessionRequests(sessionPath: string | undefined): AccountedRequest[];
+export declare function parseSessionUsage(sessionPath: string | undefined): Usage | null;
+export declare function sessionUsageDelta(current: Usage, previous: Usage | null): Usage;
+export declare function tokenUsageFromUsage(usage: Usage): TokenUsage;
 export declare function parseSessionTokens(sessionDir: string): TokenUsage | null;
 //# sourceMappingURL=session-tokens.d.ts.map

package/dist/builtin-extensions/pi-subagents/src/shared/session-tokens.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-tokens.d.ts","sourceRoot":"","sources":["../../../../../src/builtin-extensions/pi-subagents/src/shared/session-tokens.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAgB7C,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAyBxE","sourcesContent":["// @ts-nocheck\nimport * as fs from \"node:fs\";\nimport * as path from \"node:path\";\nimport type { TokenUsage } from \"./types.ts\";\n\nfunction findLatestSessionFile(sessionDir: string): string | null {\n\ttry {\n\t\tconst files = fs.readdirSync(sessionDir)\n\t\t\t.filter((f) => f.endsWith(\".jsonl\"))\n\t\t\t.map((f) => path.join(sessionDir, f));\n\t\tif (files.length === 0) return null;\n\t\tfiles.sort((a, b) => fs.statSync(b).mtimeMs - fs.statSync(a).mtimeMs);\n\t\treturn files[0] ?? null;\n\t} catch {\n\t\t// Session token lookup is optional metadata.\n\t\treturn null;\n\t}\n}\n\nexport function parseSessionTokens(sessionDir: string): TokenUsage | null {\n\tconst sessionFile = findLatestSessionFile(sessionDir);\n\tif (!sessionFile) return null;\n\ttry {\n\t\tconst content = fs.readFileSync(sessionFile, \"utf-8\");\n\t\tlet input = 0;\n\t\tlet output = 0;\n\t\tfor (const line of content.split(\"\\n\")) {\n\t\t\tif (!line.trim()) continue;\n\t\t\ttry {\n\t\t\t\tconst entry = JSON.parse(line);\n\t\t\t\tconst usage = entry.usage ?? entry.message?.usage;\n\t\t\t\tif (usage) {\n\t\t\t\t\tinput += usage.inputTokens ?? usage.input ?? 0;\n\t\t\t\t\toutput += usage.outputTokens ?? usage.output ?? 0;\n\t\t\t\t}\n\t\t\t} catch {\n\t\t\t\t// Ignore malformed lines while scanning usage entries.\n\t\t\t}\n\t\t}\n\t\treturn { input, output, total: input + output };\n\t} catch {\n\t\t// Usage extraction should not fail the run.\n\t\treturn null;\n\t}\n}\n"]}
+{"version":3,"file":"session-tokens.d.ts","sourceRoot":"","sources":["../../../../../src/builtin-extensions/pi-subagents/src/shared/session-tokens.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,gBAAgB,EAA2C,MAAM,sCAAsC,CAAC;AACtH,OAAO,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEpD,6FAA6F;AAC7F,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,GAAG,gBAAgB,EAAE,CA0BxF;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,GAAG,KAAK,GAAG,IAAI,CAe/E;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,GAAG,IAAI,GAAG,KAAK,CAY/E;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,UAAU,CAS5D;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAGxE","sourcesContent":["import * as fs from \"node:fs\";\nimport * as path from \"node:path\";\nimport type { SessionEntry } from \"../../../../core/session-manager.ts\";\nimport { type AccountedRequest, collectUsageRequests, totalRequestUsage } from \"../../../../core/usage-accounting.ts\";\nimport type { TokenUsage, Usage } from \"./types.ts\";\n\n/** Scan all attempts, including older files; stable request IDs prevent fork duplication. */\nexport function parseSessionRequests(sessionPath: string | undefined): AccountedRequest[] {\n\tif (!sessionPath) return [];\n\ttry {\n\t\tconst files = fs.statSync(sessionPath).isDirectory()\n\t\t\t? fs\n\t\t\t\t\t.readdirSync(sessionPath)\n\t\t\t\t\t.filter((name) => name.endsWith(\".jsonl\"))\n\t\t\t\t\t.map((name) => path.join(sessionPath, name))\n\t\t\t: [sessionPath];\n\t\tconst requests = new Map<string, AccountedRequest>();\n\t\tfor (const file of files) {\n\t\t\tconst entries: SessionEntry[] = [];\n\t\t\tfor (const line of fs.readFileSync(file, \"utf-8\").split(\"\\n\")) {\n\t\t\t\ttry {\n\t\t\t\t\tconst entry = JSON.parse(line) as SessionEntry;\n\t\t\t\t\tif (entry?.type) entries.push(entry);\n\t\t\t\t} catch {\n\t\t\t\t\t/* A child may still be flushing its final line. */\n\t\t\t\t}\n\t\t\t}\n\t\t\tfor (const request of collectUsageRequests(entries)) requests.set(request.id, request);\n\t\t}\n\t\treturn [...requests.values()];\n\t} catch {\n\t\treturn [];\n\t}\n}\n\nexport function parseSessionUsage(sessionPath: string | undefined): Usage | null {\n\tconst requests = parseSessionRequests(sessionPath);\n\tif (requests.length === 0) return null;\n\tconst total = totalRequestUsage(requests);\n\treturn {\n\t\tinput: total.input,\n\t\toutput: total.output,\n\t\tcacheRead: total.cacheRead,\n\t\tcacheWrite: total.cacheWrite,\n\t\tcost: total.cost,\n\t\tturns: requests.length,\n\t\tunknownRequests: total.unknownRequests,\n\t\tpartialRequests: total.partialRequests,\n\t\tunknownCosts: total.unknownCosts,\n\t};\n}\n\nexport function sessionUsageDelta(current: Usage, previous: Usage | null): Usage {\n\treturn {\n\t\tunknownRequests: Math.max(0, (current.unknownRequests ?? 0) - (previous?.unknownRequests ?? 0)),\n\t\tpartialRequests: Math.max(0, (current.partialRequests ?? 0) - (previous?.partialRequests ?? 0)),\n\t\tunknownCosts: Math.max(0, (current.unknownCosts ?? 0) - (previous?.unknownCosts ?? 0)),\n\t\tinput: Math.max(0, current.input - (previous?.input ?? 0)),\n\t\toutput: Math.max(0, current.output - (previous?.output ?? 0)),\n\t\tcacheRead: Math.max(0, current.cacheRead - (previous?.cacheRead ?? 0)),\n\t\tcacheWrite: Math.max(0, current.cacheWrite - (previous?.cacheWrite ?? 0)),\n\t\tcost: Math.max(0, current.cost - (previous?.cost ?? 0)),\n\t\tturns: Math.max(0, current.turns - (previous?.turns ?? 0)),\n\t};\n}\n\nexport function tokenUsageFromUsage(usage: Usage): TokenUsage {\n\tconst input = usage.input + usage.cacheRead + usage.cacheWrite;\n\treturn {\n\t\tinput,\n\t\toutput: usage.output,\n\t\ttotal: input + usage.output,\n\t\tcacheRead: usage.cacheRead,\n\t\tcacheWrite: usage.cacheWrite,\n\t};\n}\n\nexport function parseSessionTokens(sessionDir: string): TokenUsage | null {\n\tconst usage = parseSessionUsage(sessionDir);\n\treturn usage ? tokenUsageFromUsage(usage) : null;\n}\n"]}

package/dist/builtin-extensions/pi-subagents/src/shared/session-tokens.js

@@ -1,49 +1,81 @@
-// @ts-nocheck
 import * as fs from "node:fs";
 import * as path from "node:path";
-function findLatestSessionFile(sessionDir) {
+import { collectUsageRequests, totalRequestUsage } from "../../../../core/usage-accounting.js";
+/** Scan all attempts, including older files; stable request IDs prevent fork duplication. */
+export function parseSessionRequests(sessionPath) {
+    if (!sessionPath)
+        return [];
     try {
-        const files = fs.readdirSync(sessionDir)
-            .filter((f) => f.endsWith(".jsonl"))
-            .map((f) => path.join(sessionDir, f));
-        if (files.length === 0)
-            return null;
-        files.sort((a, b) => fs.statSync(b).mtimeMs - fs.statSync(a).mtimeMs);
-        return files[0] ?? null;
-    }
-    catch {
-        // Session token lookup is optional metadata.
-        return null;
-    }
-}
-export function parseSessionTokens(sessionDir) {
-    const sessionFile = findLatestSessionFile(sessionDir);
-    if (!sessionFile)
-        return null;
-    try {
-        const content = fs.readFileSync(sessionFile, "utf-8");
-        let input = 0;
-        let output = 0;
-        for (const line of content.split("\n")) {
-            if (!line.trim())
-                continue;
-            try {
-                const entry = JSON.parse(line);
-                const usage = entry.usage ?? entry.message?.usage;
-                if (usage) {
-                    input += usage.inputTokens ?? usage.input ?? 0;
-                    output += usage.outputTokens ?? usage.output ?? 0;
+        const files = fs.statSync(sessionPath).isDirectory()
+            ? fs
+                .readdirSync(sessionPath)
+                .filter((name) => name.endsWith(".jsonl"))
+                .map((name) => path.join(sessionPath, name))
+            : [sessionPath];
+        const requests = new Map();
+        for (const file of files) {
+            const entries = [];
+            for (const line of fs.readFileSync(file, "utf-8").split("\n")) {
+                try {
+                    const entry = JSON.parse(line);
+                    if (entry?.type)
+                        entries.push(entry);
+                }
+                catch {
+                    /* A child may still be flushing its final line. */
                 }
             }
-            catch {
-                // Ignore malformed lines while scanning usage entries.
-            }
+            for (const request of collectUsageRequests(entries))
+                requests.set(request.id, request);
         }
-        return { input, output, total: input + output };
+        return [...requests.values()];
     }
     catch {
-        // Usage extraction should not fail the run.
-        return null;
+        return [];
     }
 }
+export function parseSessionUsage(sessionPath) {
+    const requests = parseSessionRequests(sessionPath);
+    if (requests.length === 0)
+        return null;
+    const total = totalRequestUsage(requests);
+    return {
+        input: total.input,
+        output: total.output,
+        cacheRead: total.cacheRead,
+        cacheWrite: total.cacheWrite,
+        cost: total.cost,
+        turns: requests.length,
+        unknownRequests: total.unknownRequests,
+        partialRequests: total.partialRequests,
+        unknownCosts: total.unknownCosts,
+    };
+}
+export function sessionUsageDelta(current, previous) {
+    return {
+        unknownRequests: Math.max(0, (current.unknownRequests ?? 0) - (previous?.unknownRequests ?? 0)),
+        partialRequests: Math.max(0, (current.partialRequests ?? 0) - (previous?.partialRequests ?? 0)),
+        unknownCosts: Math.max(0, (current.unknownCosts ?? 0) - (previous?.unknownCosts ?? 0)),
+        input: Math.max(0, current.input - (previous?.input ?? 0)),
+        output: Math.max(0, current.output - (previous?.output ?? 0)),
+        cacheRead: Math.max(0, current.cacheRead - (previous?.cacheRead ?? 0)),
+        cacheWrite: Math.max(0, current.cacheWrite - (previous?.cacheWrite ?? 0)),
+        cost: Math.max(0, current.cost - (previous?.cost ?? 0)),
+        turns: Math.max(0, current.turns - (previous?.turns ?? 0)),
+    };
+}
+export function tokenUsageFromUsage(usage) {
+    const input = usage.input + usage.cacheRead + usage.cacheWrite;
+    return {
+        input,
+        output: usage.output,
+        total: input + usage.output,
+        cacheRead: usage.cacheRead,
+        cacheWrite: usage.cacheWrite,
+    };
+}
+export function parseSessionTokens(sessionDir) {
+    const usage = parseSessionUsage(sessionDir);
+    return usage ? tokenUsageFromUsage(usage) : null;
+}
 //# sourceMappingURL=session-tokens.js.map

package/dist/builtin-extensions/pi-subagents/src/shared/session-tokens.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-tokens.js","sourceRoot":"","sources":["../../../../../src/builtin-extensions/pi-subagents/src/shared/session-tokens.ts"],"names":[],"mappings":"AAAA,cAAc;AACd,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAGlC,SAAS,qBAAqB,CAAC,UAAkB,EAAiB;IACjE,IAAI,CAAC;QACJ,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC;aACtC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;aACnC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;QACvC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACpC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACtE,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACR,6CAA6C;QAC7C,OAAO,IAAI,CAAC;IACb,CAAC;AAAA,CACD;AAED,MAAM,UAAU,kBAAkB,CAAC,UAAkB,EAAqB;IACzE,MAAM,WAAW,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;IACtD,IAAI,CAAC,WAAW;QAAE,OAAO,IAAI,CAAC;IAC9B,IAAI,CAAC;QACJ,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACtD,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;gBAAE,SAAS;YAC3B,IAAI,CAAC;gBACJ,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC/B,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC;gBAClD,IAAI,KAAK,EAAE,CAAC;oBACX,KAAK,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC;oBAC/C,MAAM,IAAI,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC;gBACnD,CAAC;YACF,CAAC;YAAC,MAAM,CAAC;gBACR,uDAAuD;YACxD,CAAC;QACF,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,EAAE,CAAC;IACjD,CAAC;IAAC,MAAM,CAAC;QACR,4CAA4C;QAC5C,OAAO,IAAI,CAAC;IACb,CAAC;AAAA,CACD","sourcesContent":["// @ts-nocheck\nimport * as fs from \"node:fs\";\nimport * as path from \"node:path\";\nimport type { TokenUsage } from \"./types.ts\";\n\nfunction findLatestSessionFile(sessionDir: string): string | null {\n\ttry {\n\t\tconst files = fs.readdirSync(sessionDir)\n\t\t\t.filter((f) => f.endsWith(\".jsonl\"))\n\t\t\t.map((f) => path.join(sessionDir, f));\n\t\tif (files.length === 0) return null;\n\t\tfiles.sort((a, b) => fs.statSync(b).mtimeMs - fs.statSync(a).mtimeMs);\n\t\treturn files[0] ?? null;\n\t} catch {\n\t\t// Session token lookup is optional metadata.\n\t\treturn null;\n\t}\n}\n\nexport function parseSessionTokens(sessionDir: string): TokenUsage | null {\n\tconst sessionFile = findLatestSessionFile(sessionDir);\n\tif (!sessionFile) return null;\n\ttry {\n\t\tconst content = fs.readFileSync(sessionFile, \"utf-8\");\n\t\tlet input = 0;\n\t\tlet output = 0;\n\t\tfor (const line of content.split(\"\\n\")) {\n\t\t\tif (!line.trim()) continue;\n\t\t\ttry {\n\t\t\t\tconst entry = JSON.parse(line);\n\t\t\t\tconst usage = entry.usage ?? entry.message?.usage;\n\t\t\t\tif (usage) {\n\t\t\t\t\tinput += usage.inputTokens ?? usage.input ?? 0;\n\t\t\t\t\toutput += usage.outputTokens ?? usage.output ?? 0;\n\t\t\t\t}\n\t\t\t} catch {\n\t\t\t\t// Ignore malformed lines while scanning usage entries.\n\t\t\t}\n\t\t}\n\t\treturn { input, output, total: input + output };\n\t} catch {\n\t\t// Usage extraction should not fail the run.\n\t\treturn null;\n\t}\n}\n"]}
+{"version":3,"file":"session-tokens.js","sourceRoot":"","sources":["../../../../../src/builtin-extensions/pi-subagents/src/shared/session-tokens.ts"],"names":[],"mappings":"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","sourcesContent":["import * as fs from \"node:fs\";\nimport * as path from \"node:path\";\nimport type { SessionEntry } from \"../../../../core/session-manager.ts\";\nimport { type AccountedRequest, collectUsageRequests, totalRequestUsage } from \"../../../../core/usage-accounting.ts\";\nimport type { TokenUsage, Usage } from \"./types.ts\";\n\n/** Scan all attempts, including older files; stable request IDs prevent fork duplication. */\nexport function parseSessionRequests(sessionPath: string | undefined): AccountedRequest[] {\n\tif (!sessionPath) return [];\n\ttry {\n\t\tconst files = fs.statSync(sessionPath).isDirectory()\n\t\t\t? fs\n\t\t\t\t\t.readdirSync(sessionPath)\n\t\t\t\t\t.filter((name) => name.endsWith(\".jsonl\"))\n\t\t\t\t\t.map((name) => path.join(sessionPath, name))\n\t\t\t: [sessionPath];\n\t\tconst requests = new Map<string, AccountedRequest>();\n\t\tfor (const file of files) {\n\t\t\tconst entries: SessionEntry[] = [];\n\t\t\tfor (const line of fs.readFileSync(file, \"utf-8\").split(\"\\n\")) {\n\t\t\t\ttry {\n\t\t\t\t\tconst entry = JSON.parse(line) as SessionEntry;\n\t\t\t\t\tif (entry?.type) entries.push(entry);\n\t\t\t\t} catch {\n\t\t\t\t\t/* A child may still be flushing its final line. */\n\t\t\t\t}\n\t\t\t}\n\t\t\tfor (const request of collectUsageRequests(entries)) requests.set(request.id, request);\n\t\t}\n\t\treturn [...requests.values()];\n\t} catch {\n\t\treturn [];\n\t}\n}\n\nexport function parseSessionUsage(sessionPath: string | undefined): Usage | null {\n\tconst requests = parseSessionRequests(sessionPath);\n\tif (requests.length === 0) return null;\n\tconst total = totalRequestUsage(requests);\n\treturn {\n\t\tinput: total.input,\n\t\toutput: total.output,\n\t\tcacheRead: total.cacheRead,\n\t\tcacheWrite: total.cacheWrite,\n\t\tcost: total.cost,\n\t\tturns: requests.length,\n\t\tunknownRequests: total.unknownRequests,\n\t\tpartialRequests: total.partialRequests,\n\t\tunknownCosts: total.unknownCosts,\n\t};\n}\n\nexport function sessionUsageDelta(current: Usage, previous: Usage | null): Usage {\n\treturn {\n\t\tunknownRequests: Math.max(0, (current.unknownRequests ?? 0) - (previous?.unknownRequests ?? 0)),\n\t\tpartialRequests: Math.max(0, (current.partialRequests ?? 0) - (previous?.partialRequests ?? 0)),\n\t\tunknownCosts: Math.max(0, (current.unknownCosts ?? 0) - (previous?.unknownCosts ?? 0)),\n\t\tinput: Math.max(0, current.input - (previous?.input ?? 0)),\n\t\toutput: Math.max(0, current.output - (previous?.output ?? 0)),\n\t\tcacheRead: Math.max(0, current.cacheRead - (previous?.cacheRead ?? 0)),\n\t\tcacheWrite: Math.max(0, current.cacheWrite - (previous?.cacheWrite ?? 0)),\n\t\tcost: Math.max(0, current.cost - (previous?.cost ?? 0)),\n\t\tturns: Math.max(0, current.turns - (previous?.turns ?? 0)),\n\t};\n}\n\nexport function tokenUsageFromUsage(usage: Usage): TokenUsage {\n\tconst input = usage.input + usage.cacheRead + usage.cacheWrite;\n\treturn {\n\t\tinput,\n\t\toutput: usage.output,\n\t\ttotal: input + usage.output,\n\t\tcacheRead: usage.cacheRead,\n\t\tcacheWrite: usage.cacheWrite,\n\t};\n}\n\nexport function parseSessionTokens(sessionDir: string): TokenUsage | null {\n\tconst usage = parseSessionUsage(sessionDir);\n\treturn usage ? tokenUsageFromUsage(usage) : null;\n}\n"]}

package/dist/builtin-extensions/pi-subagents/src/shared/types.d.ts

@@ -1,6 +1,7 @@
 /**
  * Type definitions for the subagent extension
  */
+import type { AccountedRequest } from "../../../../core/usage-accounting.ts";
 import type { Message } from "@ashx-j/lunr-ai";
 import type { FSWatcher } from "node:fs";
 import type { ExtensionContext } from "@ashx-j/lunr";
@@ -133,6 +134,9 @@ interface TruncationResult {
     artifactPath?: string;
 }
 export interface Usage {
+    unknownRequests?: number;
+    partialRequests?: number;
+    unknownCosts?: number;
     input: number;
     output: number;
     cacheRead: number;
@@ -174,6 +178,9 @@ export interface TurnBudgetState extends ResolvedTurnBudget {
     exceededAtTurn?: number;
 }
 export interface TokenUsage {
+    /** Input includes cache reads and writes. */
+    cacheRead?: number;
+    cacheWrite?: number;
     input: number;
     output: number;
     total: number;
@@ -572,6 +579,8 @@ export interface SingleResult {
     toolBudgetBlocked?: boolean;
     messages?: Message[];
     usage: Usage;
+    /** Durable request receipts deduplicate fallback, completion, wait, and resume. */
+    usageRequests?: AccountedRequest[];
     model?: string;
     thinking?: string;
     modelSelection?: ModelSelection;