Skip to content

Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.

usage: Requests opened again on the same rows aren't drawn or fit again, and new rows wait for the sidebar to settle (#4064, xisdumpling)

yetone792f0f28606d
diff --git a/internal/gui/assets/plugins/usage/page.js b/internal/gui/assets/plugins/usage/page.js
index ffe931214..2beb038c8 100644
--- a/internal/gui/assets/plugins/usage/page.js
+++ b/internal/gui/assets/plugins/usage/page.js
@@ -130,7 +130,7 @@ async function loadUsage(asked) {
// the page's way in (#4064)
if (asked && usageTab === "usage") quotasOpened();
if (usageTab === "sessions") return loadSessions();
- if (usageTab === "requests") return loadLedger();
+ if (usageTab === "requests") return loadLedger(asked && ledger && ledgerWant === ledParams({ offset: ledOffset, limit: LED_PAGE }) ? "open" : false);
if (usageTab === "context") return window.loadContext?.();
renderUsageLoading();
if (!asked) loadQuotas();
@@ -822,6 +822,7 @@ async function hideUsageAgent(id, hide) {
// server pages it (/api/usage/requests) and saves it whole as CSV.
let ledger = null; // the page shown: { rows, offset, total, agents, …totals }
+let ledgerWant = ""; // the ledParams it was read with
let ledOffset = 0, ledPurpose = "", ledAgent = "", ledProvider = "", ledAccount = "", ledCallerKey = "", ledFailed = false, ledRetried = false, ledQuery = "", ledModel = "", ledRoute = 0, ledComputer = "", ledDay = "", ledVia = "";
const LED_PAGE = 100;
@@ -936,7 +937,11 @@ function ledRead(kind, path, want) {
}
const ledAborted = (e) => e?.name === "AbortError";
-// quiet: a refresh while it's looked at, redrawn only on a change
+// quiet: a refresh while it's looked at, redrawn only on a change.
+// "open": the page opened again on the rows it showed (#4064, xisdumpling):
+// they stay as they are while read, are drawn again only on a change, and
+// that redraw (a hundred rows, their chart and heatmap) waits for the
+// sidebar to settle on the page, not stopping it halfway
async function loadLedger(quiet) {
if (!ledger && !quiet) renderLedgerLoading();
// a pick over rows shown: they stay, dimmed, till its answer comes, so
@@ -955,9 +960,24 @@ async function loadLedger(quiet) {
if (want !== ledParams({ offset: ledOffset, limit: LED_PAGE })) return; // another page or filter was picked meanwhile
ledPending(false);
if (quiet && JSON.stringify(l) === JSON.stringify(ledger)) return;
+ if (quiet === "open") {
+ const was = ledger;
+ await navSettled();
+ if (ledger !== was || want !== ledParams({ offset: ledOffset, limit: LED_PAGE })) return; // read again or drawn meanwhile
+ }
ledger = l;
+ ledgerWant = want;
if (view === "usage" && usageTab === "requests") renderLedger();
}
+// navSettled: the sidebar's move to a page opened (navTopStep's spring,
+// navSubEnter's tabs coming in) has run its course, or 700ms have passed
+function navSettled() {
+ const until = performance.now() + 700;
+ return new Promise((done) => {
+ const look = () => performance.now() < until && (window.navTop?.raf || document.querySelector("#nav .nav-sub.moving")) ? requestAnimationFrame(look) : done();
+ look();
+ });
+}
function ledPending(on) {
const wrap = $("#ledWrap");
@@ -1686,6 +1706,10 @@ new ResizeObserver(() => {
ledFitFrame = requestAnimationFrame(() => {
ledFitFrame = 0;
const wrap = $("#ledWrap");
+ // out of sight it has no width: what was fit stays, so the page shown
+ // again at the width it had fits nothing again (#4064: each fit of a
+ // hundred rows restyles them twice and lays them out)
+ if (!wrap.clientWidth) return;
wrap.style.setProperty("--ledw", wrap.clientWidth + "px");
if (wrap.clientWidth !== ledFitW) { ledFitW = wrap.clientWidth; ledFit(); }
ledHScroll();
diff --git a/internal/gui/tests/usage-ledger-open-settled.test.cjs b/internal/gui/tests/usage-ledger-open-settled.test.cjs
new file mode 100644
index 000000000..31480ba15
--- /dev/null
+++ b/internal/gui/tests/usage-ledger-open-settled.test.cjs
@@ -0,0 +1,119 @@
+// Run with Node's test runner and Playwright on the module path; see README.md.
+// Coming back to Usage › Requests from another page (#4064, xisdumpling:
+// 7 days, ~1,670 requests, frames dropped while the sidebar moved). The
+// rows shown are a hundred, and each redraw or fit of them restyles and
+// lays out thousands of nodes. So:
+// - the same rows read again are not drawn again, and the table isn't fit
+// again at the width it had (the ResizeObserver saw it go out of sight
+// at width 0, and fit it to 0 and back);
+// - rows that changed are drawn once the sidebar has settled on the page
+// (navSubEnter's tabs, navTopStep's spring), not halfway through it;
+// and either way the table ends as it was fit, the page where it was.
+// Chromium and WebKit; the API is faked.
+const assert = require("node:assert/strict");
+const fs = require("node:fs/promises");
+const path = require("node:path");
+const { test } = require("node:test");
+const { chromium, webkit } = require("playwright");
+
+const assets = path.resolve(__dirname, "../assets");
+const now = Date.now();
+const MODELS = ["gpt-6.1-sol", "claude-sonnet-5", "glm-5.1"];
+const row = (i) => ({ route_id: 1000 + i, t: new Date(now - i * 360e3).toISOString(), agent: "codex", agentName: "Codex", icon: "codex-color",
+ provider: "openai", providerName: "openai", host: "chatgpt.com", ep: "/v1/responses", req: MODELS[i % 3], model: MODELS[i % 3], served: MODELS[i % 3], effort: "medium",
+ in: 3000 + i, out: 200 + i, cache_read: 110000, cache_write: i % 5 ? 0 : 2400, ms: 9000, ttft_ms: 1200, status: 200, rid: "r" + i, cost: 0.02, priced: true });
+const ledger = (period, first) => ({
+ period, rows: Array.from({ length: 100 }, (_, i) => row(first + i)), offset: 0, total: 1670, calls: 1670, errors: 0,
+ input: 5e6, output: 6e5, cache_read: 1.8e8, cache_write: 6e5, cost: 33.4, unpriced: 0, bucket: "hour", series: [],
+ by: { model: MODELS.map((id) => ({ id, calls: 500, input: 1e6, output: 1e5, cache_read: 0, cache_write: 0, cost: 1 })) },
+ agents: [{ id: "codex", name: "Codex", icon: "codex-color" }],
+});
+
+function server(answer) {
+ return async (route) => {
+ const url = new URL(route.request().url());
+ const json = (data) => route.fulfill({ json: data });
+ if (url.pathname === "/boot.js") return route.fulfill({ contentType: "text/javascript", body: `window.bootPrefs = {lang:"en",theme:"light",web:false};` });
+ if (url.pathname === "/wails/runtime.js") return route.fulfill({ contentType: "text/javascript", body: "export const Window = {};" });
+ if (url.pathname === "/api/state") return json({ agents: [], profiles: [], settings: { lang: "en", theme: "light" } });
+ if (url.pathname === "/api/usage/requests") return json(ledger(url.searchParams.get("period"), answer.first));
+ if (url.pathname === "/api/usage/quotas") return json([]);
+ if (url.pathname === "/api/usage") return json({ calls: 0, errors: 0, input: 0, output: 0, reasoning: 0, unpriced: 0, cost: 0, bucket: "day", series: [], agents: [], models: [], path: "" });
+ if (url.pathname === "/api/providers") return json({ providers: [], presets: [], excluded: [], models: [], gateway: { running: false } });
+ if (url.pathname === "/api/sessions") return json({ sessions: [], dirs: [] });
+ if (url.pathname === "/api/groups") return json({ groups: [], models: [] });
+ if (url.pathname.startsWith("/api/")) return json({});
+ const file = path.join(assets, url.pathname === "/" ? "index.html" : url.pathname);
+ const contentType = { ".html": "text/html", ".js": "text/javascript", ".css": "text/css", ".svg": "image/svg+xml", ".png": "image/png" }[path.extname(file)];
+ try { await route.fulfill({ body: await fs.readFile(file), contentType }); } catch { await route.fulfill({ status: 404, body: "" }); }
+ };
+}
+
+for (const engine of (process.env.BROWSER ? [process.env.BROWSER] : ["chromium", "webkit"])) {
+ test(`${engine}: back on Usage › Requests, the rows are drawn again only on a change, after the sidebar settles`, async (t) => {
+ const browser = await (engine === "webkit" ? webkit.launch() : chromium.launch({ channel: "chromium" }));
+ t.after(() => browser.close());
+ // motion on: the sidebar moves as the reporter's does
+ const p = await (await browser.newContext({ viewport: { width: 1280, height: 800 } })).newPage();
+ p.setDefaultTimeout(5000);
+ const errors = [];
+ p.on("pageerror", (e) => errors.push(e.message));
+ const answer = { first: 0 };
+ await p.route("**/*", server(answer));
+ await p.goto("http://magpie.test/");
+ await p.locator('[data-view="usage"]').first().click();
+ await p.locator(":is(#usageTab .opt, .nav-s):visible").nth(1).click();
+ await p.locator("#ledWrap .led tbody tr").first().waitFor();
+ await p.locator("#period .opt").nth(1).click();
+ await p.waitForFunction(() => document.querySelectorAll("#ledWrap .led tbody tr.led-row").length === 100);
+ await p.waitForTimeout(600);
+ const fitted = await p.locator("#ledWrap table.led").getAttribute("class");
+ assert.match(fitted, /\btight\b/, "a window narrow enough that the table is fit");
+
+ // watch the table while the reader goes away and comes back
+ const back = async () => {
+ await p.locator('[data-view="gateway"]').first().click();
+ await p.waitForTimeout(700);
+ await p.evaluate(() => {
+ const wrap = document.querySelector("#ledWrap");
+ window.__seen = { table: wrap.querySelector("table.led"), refit: 0, drawn: [], top: document.querySelector("#view-usage").scrollTop };
+ window.__seen.table.__was = true;
+ window.__watch?.disconnect(); // the last time round's
+ window.__watch = new MutationObserver((ms) => {
+ for (const m of ms) {
+ if (m.type === "attributes" && m.target.matches?.("table.led")) window.__seen.refit++;
+ // a new table: was the sidebar still moving?
+ if (m.type === "childList" && [...m.addedNodes].some((n) => n.matches?.("table.led"))) {
+ window.__seen.drawn.push(!!(window.navTop?.raf || document.querySelector("#nav .nav-sub.moving")));
+ }
+ }
+ });
+ window.__watch.observe(wrap, { subtree: true, childList: true, attributes: true, attributeFilter: ["class"] });
+ });
+ await p.locator('[data-view="usage"]').first().click();
+ await p.waitForTimeout(1200);
+ return p.evaluate(() => {
+ const table = document.querySelector("#ledWrap table.led");
+ return { same: table === window.__seen.table, refit: window.__seen.refit, drawn: window.__seen.drawn, cls: table.className, first: table.querySelector("tbody tr.led-row td.model")?.textContent, moved: document.querySelector("#view-usage").scrollTop - window.__seen.top };
+ });
+ };
+
+ // the same rows: nothing drawn, nothing fit again
+ const same = await back();
+ assert.equal(same.same, true, "the table shown is kept");
+ assert.deepEqual(same.drawn, [], "and not drawn again");
+ assert.equal(same.refit, 0, "nor fit again at the width it had");
+ assert.equal(same.cls, fitted);
+ assert.equal(same.moved, 0, "the page stays where it was");
+
+ // a request came meanwhile: drawn, but not while the sidebar moves
+ answer.first = 1;
+ const changed = await back();
+ assert.equal(changed.same, false, "the new rows are drawn");
+ assert.deepEqual(changed.drawn, [false], "once, with the sidebar at rest");
+ assert.equal(changed.first, MODELS[1], "the newest row first");
+ assert.equal(changed.cls, fitted, "fit as before");
+ assert.equal(changed.moved, 0, "the page stays where it was");
+ assert.deepEqual(errors, []);
+ });
+}