mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-10-28 20:21:50 +01:00
<!-- entire-trail-link-start --> https://entire.com/gh/paperclipai/-/trails/108/changes/paperclip/108 <!-- entire-trail-link-end --> ## Thinking Path > - Paperclip Product E2E evaluations run real agent requests. > - Model accounting includes setup, canceled requests and earlier attempts. > - Heartbeat token totals can omit setup requests. > - The shared gateway journal retains final normalized usage for those requests. > - Reports should expose that usage once, with coverage and conflicts visible. ## Linked Issues or Issue Description Refs #17928. **What happened?** The two-case qualification reports showed complete model dollars from the shared ledger, while their headline heartbeat tokens omitted setup. For example, the verified Codex campaign has nine final requests, including setup requests, whose aggregate is only available in private receipts. **Expected behavior** The existing ledger report shows all-request token totals, a setup subtotal and missing/conflicting usage counts. Heartbeat and request totals remain separate. **Steps to reproduce** Run a budgeted native marker case with an asynchronous setup probe, then compare the heartbeat totals with final request observations in its retained ledger. ## What Changed - Aggregate final provider/gateway usage once per model request, including setup and canceled requests. Ignore provisional observations and infrastructure reservations. - Expose uncached input, cache-read input, cache-write input and output separately. Label reasoning as included in output. Preserve agreeing optional reasoning from partial final receipts only when it fits the complete output count. - Check every final provider/gateway observation for conflicting supplied fields, including partial receipts. Exclude ambiguous requests and report their conflicting coverage. Missing token usage remains visible. - Preserve retained reports without the optional token field; validate new counts and totals before dashboard regeneration. - Keep the journal-bound experiment identity stable when adding derived token presentation, so old accepted experiments can still be linked without a reimport. Journal changes still invalidate the receipt. ## Verification - Focused report and scheduled-operations tests: 54 passed. - Eval TypeScript check passed after refreshing ignored Runner declaration outputs. - Regression covers duplicate sources, provisional usage, setup, canceled requests, missing usage, conflicting final usage, infrastructure exclusion and invalid retained totals, including nonzero totals with zero contributing requests. All 32 partial-field subsets are checked in both observation orders. - Regenerated both real retained Claude and Codex reports successfully with all final request tokens and existing experiment receipts, using zero model calls. - Broader checks run in CI. No model calls are needed for report generation. ## Risks The subtotal requires final normalized gateway/provider token observations. Older journals and other telemetry sources can have incomplete coverage, which remains explicit. Token totals do not establish invoice reconciliation. The change does not alter paid selection, routing or budgets. ## Model Used OpenAI Codex, GPT-6 family, with reasoning, repository inspection and code execution. The exact serving model ID and context window are not exposed to this session. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have searched GitHub for duplicate or related PRs and linked them above - [x] I have either (a) linked existing issues with `Fixes: #` / `Closes #` / `Refs #` OR (b) described the issue in-PR following the relevant issue template - [x] I have not referenced internal/instance-local Paperclip issues or links (only public GitHub `#NNN` / `github.com/paperclipai/paperclip` URLs) - [x] My branch name describes the change (e.g. `docs/...`, `fix/...`) and contains no internal Paperclip ticket id or instance-derived details - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [ ] All Paperclip CI gates are green - [ ] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
162 lines
13 KiB
TypeScript
162 lines
13 KiB
TypeScript
import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
|
|
import { tmpdir } from "node:os";
|
|
import path from "node:path";
|
|
import { expect, it } from "vitest";
|
|
import { openEvalCostLedger, type EvalCostObservation } from "./cost-ledger.js";
|
|
import { readEvalOperationsReport, renderEvalOperationsReport, validateEvalOperationsReport } from "./operations-report.js";
|
|
import { buildRunnerCampaign } from "./history.js";
|
|
import { regenerateRunnerDashboard } from "./dashboard-regenerate.js";
|
|
|
|
it("reports shared setup/retry spending once, preserves unknown holds and omits private provider receipts", async () => {
|
|
const root = await mkdtemp(path.join(tmpdir(), "eval-operations-report-"));
|
|
const file = path.join(root, "ledger.jsonl");
|
|
const ledger = await openEvalCostLedger(file, { campaignId: "pilot", maxUsd: "1", deadlineAt: "2099-01-01T00:00:00Z", maxRequests: 10, maxConcurrent: 2 });
|
|
try {
|
|
await ledger.reserve("setup", { executionId: "cell", attemptId: "first", phase: "setup" }, "0.2");
|
|
await ledger.observe({ observationId: "gateway", requestId: "setup", provider: "fixture", providerRequestId: "private-provider-id", source: "gateway",
|
|
currency: "USD", route: "direct", classification: "estimated", pricingVersion: "fixture", costUsd: "0.05", final: true });
|
|
await ledger.observe({ observationId: "native", requestId: "setup", provider: "fixture", providerRequestId: "private-provider-id", source: "native_otlp",
|
|
currency: "USD", route: "direct", classification: "reported", costUsd: "0.05", final: true });
|
|
await ledger.finish("setup", "failed");
|
|
await ledger.reserve("retry", { executionId: "cell", attemptId: "retry", phase: "agent" }, "0.2");
|
|
await ledger.finish("retry", "cancelled");
|
|
const report = await readEvalOperationsReport(file);
|
|
validateEvalOperationsReport(report);
|
|
if (report.status === "unavailable") throw new Error("Expected readable fixture ledger");
|
|
expect(report).toMatchObject({ knownUsd: "0.050000000", heldUsd: "0.200000000", committedUsd: "0.250000000", requests: 2,
|
|
unresolvedRequests: 1, inflight: 0, breakdown: { reported: "0.050000000", estimated: "0.000000000" },
|
|
attempts: [{ attemptId: "first", requests: 1, knownUsd: "0.050000000" }, { attemptId: "retry", unresolvedRequests: 1, heldUsd: "0.200000000" }] });
|
|
expect(JSON.stringify(report)).not.toContain("private-provider-id");
|
|
const campaign = buildRunnerCampaign({ campaignId: "retry-campaign", generatedAt: new Date().toISOString(), expected: [], results: [], operations: report });
|
|
expect(campaign.operations).toEqual(report);
|
|
expect(campaign.billing.reportedLlmCostUsd).toBe(0);
|
|
await writeFile(path.join(root, "normalized-results.json"), JSON.stringify(campaign));
|
|
await regenerateRunnerDashboard({ bundle: root, historyFile: null });
|
|
const rebuilt = JSON.parse(await readFile(path.join(root, "normalized-results.json"), "utf8"));
|
|
expect(rebuilt.operations).toEqual(report);
|
|
expect(await readFile(path.join(root, "dashboard.html"), "utf8")).toContain("$0.200000000 additional held reservations");
|
|
expect(renderEvalOperationsReport(report)).toContain("Do not add its model subtotal to heartbeat totals");
|
|
expect(renderEvalOperationsReport(report)).toContain("Unrecorded infrastructure, storage, subscriptions");
|
|
expect(() => validateEvalOperationsReport({ ...report, secret: "forbidden" } as never)).toThrow("Invalid retained");
|
|
expect(() => validateEvalOperationsReport({ ...report, knownUsd: "0.060000000" })).toThrow("Invalid retained");
|
|
expect(() => validateEvalOperationsReport({ ...report, attempts: [] })).toThrow("Invalid retained");
|
|
expect(() => validateEvalOperationsReport({ ...report, deadlineAt: "Tue, 20 Oct 2026 01:00:00 GMT (private note)" })).toThrow("Invalid retained");
|
|
} finally { await ledger.close(); await rm(root, { recursive: true, force: true }); }
|
|
});
|
|
|
|
it("publishes the parsed deadline without private text accepted by the journal's date parser", async () => {
|
|
const root = await mkdtemp(path.join(tmpdir(), "eval-operations-report-")), file = path.join(root, "ledger.jsonl");
|
|
const deadlineAt = "Thu, 01 Jan 2099 00:00:00 GMT (private budget rationale)";
|
|
const ledger = await openEvalCostLedger(file, { campaignId: "pilot", maxUsd: "1", deadlineAt, maxRequests: 10, maxConcurrent: 2 });
|
|
try {
|
|
const report = await readEvalOperationsReport(file);
|
|
expect(report).toMatchObject({ deadlineAt: "2099-01-01T00:00:00.000Z" });
|
|
expect(JSON.stringify(report)).not.toContain("private budget rationale");
|
|
expect(await readFile(file, "utf8")).toContain(deadlineAt);
|
|
} finally { await ledger.close(); await rm(root, { recursive: true, force: true }); }
|
|
});
|
|
|
|
it("preserves reports with explicit unknown accounting after a partial journal write", async () => {
|
|
const root = await mkdtemp(path.join(tmpdir(), "eval-operations-report-")), file = path.join(root, "ledger.jsonl");
|
|
const ledger = await openEvalCostLedger(file, { campaignId: "pilot", maxUsd: "1", deadlineAt: "2099-01-01T00:00:00Z", maxRequests: 10, maxConcurrent: 2 });
|
|
await ledger.reserve("request", { executionId: "cell", attemptId: "attempt", phase: "setup" }, "0.2");
|
|
await ledger.close();
|
|
try {
|
|
await writeFile(file, '{"partial-record":', { flag: "a" });
|
|
const damaged = await readFile(file, "utf8");
|
|
const report = await readEvalOperationsReport(file);
|
|
expect(report).toEqual({ version: 1, scope: "shared_gateway_ledger", status: "unavailable" });
|
|
validateEvalOperationsReport(report);
|
|
expect(renderEvalOperationsReport(report)).toContain("Request amounts, counts, and held reservations are unknown");
|
|
expect(renderEvalOperationsReport(report)).not.toContain("$0");
|
|
expect(() => validateEvalOperationsReport({ ...report, knownUsd: "0.000000000" } as never)).toThrow("Invalid retained");
|
|
const campaign = buildRunnerCampaign({ campaignId: "damaged-ledger", generatedAt: new Date().toISOString(), expected: [], results: [], operations: report });
|
|
await writeFile(path.join(root, "normalized-results.json"), JSON.stringify(campaign));
|
|
await regenerateRunnerDashboard({ bundle: root, historyFile: null });
|
|
const rebuilt = JSON.parse(await readFile(path.join(root, "normalized-results.json"), "utf8"));
|
|
expect(rebuilt.operations).toEqual(report);
|
|
expect(await readFile(path.join(root, "dashboard.html"), "utf8")).toContain("Request ledger accounting unavailable");
|
|
expect(await readFile(file, "utf8")).toBe(damaged);
|
|
} finally { await rm(root, { recursive: true, force: true }); }
|
|
});
|
|
|
|
it("keeps an in-flight final receipt reserved until the forwarding request finishes", async () => {
|
|
const root = await mkdtemp(path.join(tmpdir(), "eval-operations-report-")), file = path.join(root, "ledger.jsonl");
|
|
const ledger = await openEvalCostLedger(file, { campaignId: "pilot", maxUsd: "1", deadlineAt: "2099-01-01T00:00:00Z", maxRequests: 10, maxConcurrent: 2 });
|
|
try {
|
|
await ledger.reserve("request", { executionId: "cell", attemptId: "attempt", phase: "agent" }, "0.2");
|
|
await ledger.observe({ observationId: "usage", requestId: "request", provider: "fixture", source: "provider", currency: "USD", route: "direct", classification: "reported", costUsd: "0.05", final: true });
|
|
const report = await readEvalOperationsReport(file);
|
|
validateEvalOperationsReport(report);
|
|
expect(report).toMatchObject({ inflight: 1, knownUsd: "0.050000000", heldUsd: "0.150000000", committedUsd: "0.200000000", unresolvedRequests: 0 });
|
|
} finally { await ledger.close(); await rm(root, { recursive: true, force: true }); }
|
|
});
|
|
|
|
it("reports final setup and canceled-request tokens once while exposing missing and conflicting usage", async () => {
|
|
const root = await mkdtemp(path.join(tmpdir(), "eval-token-report-")), file = path.join(root, "ledger.jsonl");
|
|
const ledger = await openEvalCostLedger(file, { campaignId: "tokens", maxUsd: "10", deadlineAt: "2099-01-01T00:00:00Z", maxRequests: 10, maxConcurrent: 1 });
|
|
const observation = { provider: "fixture", currency: "USD" as const, route: "direct" as const, classification: "reported" as const, costUsd: "0.05", final: true };
|
|
try {
|
|
for (const [requestId, phase] of [["setup", "setup"], ["canceled", "agent"], ["missing", "agent"], ["conflict", "agent"], ["full-conflict", "agent"], ["reasoning-conflict", "agent"], ["overhead", "infrastructure"]] as const) {
|
|
await ledger.reserve(requestId, { executionId: "cell", attemptId: "first", phase }, "1");
|
|
if (requestId !== "missing") {
|
|
const tokens = { input: 10, cachedRead: 20, cachedWrite: 30, output: 5, ...(requestId === "reasoning-conflict" ? {} : { reasoning: 2 }) };
|
|
await ledger.observe({ ...observation, observationId: requestId + "-partial", requestId, source: "gateway", tokens: { ...tokens, input: 1 }, final: false });
|
|
await ledger.observe({ ...observation, observationId: requestId + "-gateway", requestId, source: "gateway", tokens });
|
|
await ledger.observe({ ...observation, observationId: requestId + "-provider", requestId, source: "provider", tokens });
|
|
if (requestId === "setup") await ledger.observe({ ...observation, observationId: "native-telemetry", requestId, source: "native_otlp", tokens: { ...tokens, input: 999 } });
|
|
if (requestId === "conflict") await ledger.observe({ ...observation, observationId: "conflicting-usage", requestId, source: "provider", tokens: { input: 11 } });
|
|
if (requestId === "reasoning-conflict") await ledger.observe({ ...observation, observationId: "partial-reasoning", requestId, source: "provider", tokens: { reasoning: 9 } });
|
|
if (requestId === "full-conflict") await ledger.observe({ ...observation, observationId: "full-conflicting-usage", requestId, source: "provider", tokens: { ...tokens, input: 11 } });
|
|
}
|
|
await ledger.finish(requestId, requestId === "canceled" ? "cancelled" : "succeeded");
|
|
}
|
|
const report = await readEvalOperationsReport(file);
|
|
if (report.status === "unavailable") throw new Error("Expected readable token report");
|
|
expect(report.modelAccounting?.tokenUsage).toEqual({ requests: 2, conflictingRequests: 3,
|
|
totals: { input: 20, cachedRead: 40, cachedWrite: 60, output: 10, reasoning: 4 },
|
|
setup: { requests: 1, totals: { input: 10, cachedRead: 20, cachedWrite: 30, output: 5, reasoning: 2 } } });
|
|
const rendered = renderEvalOperationsReport(report);
|
|
expect(rendered).toContain("2/6 model requests have unambiguous final usage; 3 conflicting; 1 missing");
|
|
expect(rendered).toContain("Reported reasoning: 4, included in output");
|
|
expect(rendered).toContain("Setup token usage (1 requests, included above)");
|
|
const emptySetup = structuredClone(report);
|
|
emptySetup.modelAccounting!.tokenUsage!.setup.requests = 0;
|
|
expect(() => validateEvalOperationsReport(emptySetup)).toThrow("Invalid retained");
|
|
const emptyOverall = structuredClone(report);
|
|
emptyOverall.modelAccounting!.tokenUsage!.requests = 0;
|
|
emptyOverall.modelAccounting!.tokenUsage!.setup = { requests: 0, totals: { input: 0, cachedRead: 0, cachedWrite: 0, output: 0, reasoning: 0 } };
|
|
expect(() => validateEvalOperationsReport(emptyOverall)).toThrow("Invalid retained");
|
|
const changed = structuredClone(report);
|
|
changed.modelAccounting!.tokenUsage!.setup.totals.input = 21;
|
|
expect(() => validateEvalOperationsReport(changed)).toThrow("Invalid retained");
|
|
changed.modelAccounting!.tokenUsage!.setup.totals.input = Number.MAX_SAFE_INTEGER + 1;
|
|
expect(() => validateEvalOperationsReport(changed)).toThrow("Invalid retained");
|
|
} finally { await ledger.close(); await rm(root, { recursive: true, force: true }); }
|
|
});
|
|
|
|
|
|
it("preserves agreed final usage across every partial-field subset and observation order", async () => {
|
|
const root = await mkdtemp(path.join(tmpdir(), "eval-token-subsets-")), file = path.join(root, "ledger.jsonl");
|
|
const ledger = await openEvalCostLedger(file, { campaignId: "subsets", maxUsd: "10", deadlineAt: "2099-01-01T00:00:00Z", maxRequests: 64, maxConcurrent: 1 });
|
|
const values = { input: 10, cachedRead: 20, cachedWrite: 30, output: 5, reasoning: 2 };
|
|
const keys = ["input", "cachedRead", "cachedWrite", "output", "reasoning"] as const;
|
|
try {
|
|
for (let mask = 0; mask < 32; mask++) for (const reverse of [false, true]) {
|
|
const requestId = `request-${mask}-${reverse}`, partial: EvalCostObservation["tokens"] = {};
|
|
keys.forEach((key, index) => { if (mask & 1 << index) partial[key] = values[key]; });
|
|
await ledger.reserve(requestId, { executionId: "cell", attemptId: "attempt", phase: "agent" }, "0.2");
|
|
const sources = [{ source: "gateway" as const, tokens: { input: 10, cachedRead: 20, cachedWrite: 30, output: 5 } }, { source: "provider" as const, tokens: partial }];
|
|
if (reverse) sources.reverse();
|
|
for (const observation of sources) await ledger.observe({ ...observation, observationId: requestId + observation.source, requestId,
|
|
provider: "fixture", currency: "USD", route: "direct", classification: "reported", costUsd: "0.05", final: true });
|
|
await ledger.finish(requestId, "cancelled");
|
|
}
|
|
const report = await readEvalOperationsReport(file);
|
|
if (report.status === "unavailable") throw new Error("Expected usable accounting for agreeing partial receipts");
|
|
expect(report.modelAccounting?.tokenUsage).toMatchObject({ requests: 64, conflictingRequests: 0,
|
|
totals: { input: 640, cachedRead: 1280, cachedWrite: 1920, output: 320, reasoning: 64 } });
|
|
expect(report.knownUsd).toBe("3.200000000");
|
|
} finally { await ledger.close(); await rm(root, { recursive: true, force: true }); }
|
|
});
|