Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.
gui: Routing's countdowns, Usage's refresh look and the lanes' read tick only while in sight (#3185)
yetone2620dc319f18
diff --git a/internal/gui/assets/app.js b/internal/gui/assets/app.jsindex 19ffda8fb..3c165294a 100644--- a/internal/gui/assets/app.js+++ b/internal/gui/assets/app.js@@ -13938,12 +13938,11 @@ function accountCapPill(p, user, cap, direct) {}// An account's or key's limit on requests at once (#892): its own, else-// the provider's Concurrency. The pill says it, and while requests are out-// under it how many run and wait — the gateway's lanes, read again every-// two seconds while a pill is shown (refreshLanes) — and opens the app's-// menu: the provider's, none, a number, or one of the user's own.+// the provider's Concurrency. The pill says it, and how many run and wait+// (the lanes, read every 2s while one is in sight: refreshLanes), and opens+// the app's menu: the provider's, none, a number, or the user's own.const LANE_LIMITS = [1, 2, 3, 5, 10];-let lanesNow = {}, lanesRead = false;+let lanesNow = {}, lanesRead = false, lanesTick;function laneOwnOf(p, ref) {const m = p?.accountConcurrency || {};const k = String(ref).toLowerCase();@@ -13964,6 +13963,7 @@ function laneText(pill) {else if (limit) text = t("{n} at once", { n: limit });else text = t("No limit at once");if (pill.textContent !== text) pill.textContent = text;+ lanesTick ||= setInterval(refreshLanes, 2e3);pill.classList.toggle("set", own != null || limit > 0);pill.classList.toggle("busy-lane", !!(limit && busy >= limit));pill.classList.toggle("queued", !!waiting);@@ -14020,17 +14020,16 @@ function laneLimitPill(p, ref, who, name) {};return pill;}-// refreshLanes reads the gateway's lanes again and rewrites the pills in-// place: nothing is redrawn, so nothing moves under the reader.+// refreshLanes rewrites the pills in place, so nothing moves; with none+// in sight its tick stops (#3185) until one is drawnasync function refreshLanes() {- if (document.hidden || view !== "providers" || !document.querySelector(".alane")) return;+ if (document.hidden || view !== "providers" || !document.querySelector(".alane")) return lanesTick = clearInterval(lanesTick);let lanes;try { lanes = await api("lanes"); } catch { return; }lanesNow = lanes || {};lanesRead = true;for (const pill of document.querySelectorAll(".alane")) laneText(pill);}-setInterval(refreshLanes, 2000);// A window reads as how much of it is used, or — as the vendors' own apps// show it — how much is left, the bar filling with that; one choice for@@ -24590,7 +24589,7 @@ function loadBack() {loadBack.flight = flight;return flight.done;}-document.addEventListener("visibilitychange", () => { if (!document.hidden) { loadBack(); wag(); } });+document.addEventListener("visibilitychange", () => { if (!document.hidden) { loadBack(); wag(); refreshLanes(); } });// an agent's config can be rewritten, or the agent run round magpie, while the// window is up: ask what drifted now and then, and redraw only on a change —// never under an open menudiff --git a/internal/gui/assets/plugins/routing/client.js b/internal/gui/assets/plugins/routing/client.jsindex 29c4a0f1e..0dab25a01 100644--- a/internal/gui/assets/plugins/routing/client.js+++ b/internal/gui/assets/plugins/routing/client.js@@ -4124,6 +4124,7 @@ function routingPage(part) {// finish hidden work here too. The first visible frame alone owns resume.function start() {inSightAgain();+ countdown();if (!shown()) { pause(); return; }kick();}@@ -4132,8 +4133,15 @@ function routingPage(part) {new MutationObserver(start).observe($("#view-routing"), { attributes: true, attributeFilter: ["hidden"] });document.addEventListener("visibilitychange", start);window.addEventListener("focus", start);- // countdowns tick once a second- setInterval(() => { if (shown()) { if (!pinned && loaded && cur) sync(); render(); renderActs(listed()); } }, 1000);+ // countdowns tick once a second, only while the page is in sight: a+ // tick with nothing to draw wakes the web content process all the same+ // (#3185), so out of sight there is none until start() sees it again+ let second = 0;+ function countdown() {+ if (!shown()) { clearInterval(second); second = 0; return; }+ second ||= setInterval(() => { if (!shown()) return countdown(); if (!pinned && loaded && cur) sync(); render(); renderActs(listed()); }, 1000);+ }+ countdown();function offline(msg) {off.textContent = msg;diff --git a/internal/gui/assets/plugins/usage/page.js b/internal/gui/assets/plugins/usage/page.jsindex a4705bf16..680048fdc 100644--- a/internal/gui/assets/plugins/usage/page.js+++ b/internal/gui/assets/plugins/usage/page.js@@ -3623,10 +3623,22 @@ function refreshUsage(now = false) {return flight;}renderUsageEvery();-setInterval(() => {- if (!usageEvery || view !== "usage" || document.hidden || document.querySelector(".pop:not([hidden])")) return;- if (performance.now() - usageLast >= usageEvery * 1000) refreshUsage();-}, 1000);+// the refresh is looked at each second only while the page is in sight: a+// look with nothing to do wakes the web content process all the same+// (#3185), so out of sight there is none until it is shown again+let usageSecond = 0;+function usageTicks() {+ if ($("#view-usage").hidden || document.hidden) { clearInterval(usageSecond); usageSecond = 0; return; }+ usageSecond ||= setInterval(() => {+ if ($("#view-usage").hidden || document.hidden) return usageTicks();+ if (!usageEvery || view !== "usage" || document.querySelector(".pop:not([hidden])")) return;+ if (performance.now() - usageLast >= usageEvery * 1000) refreshUsage();+ }, 1000);+}+new MutationObserver(usageTicks).observe($("#view-usage"), { attributes: true, attributeFilter: ["hidden"] });+document.addEventListener("visibilitychange", usageTicks);+window.addEventListener("focus", usageTicks);+usageTicks();// opened from the tray panel's Usage tab: on the Requests of one provider or agentif (mode === "window" && params.get("view") === "usage") {// An explicit destination takes precedence over the remembered tab.diff --git a/internal/gui/tests/idle-ticks.test.cjs b/internal/gui/tests/idle-ticks.test.cjsnew file mode 100644index 000000000..cbd4e927b--- /dev/null+++ b/internal/gui/tests/idle-ticks.test.cjs@@ -0,0 +1,92 @@+// Run with Node's test runner and Playwright on the module path; see README.md.+// A page out of sight ticks nothing (#3185): Routing's countdowns, Usage's+// look at its refresh and the lanes' read each woke the web content process+// every second or two from wherever the window was, drawing nothing. Each runs+// only while its page, or a lane pill, is in sight, and starts again when it+// is. A clock stands in for time here, so nothing waits; no backend, 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();++async function server(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" }, fx: { rate: 7.2, at: new Date().toISOString() } });+ if (url.pathname === "/api/usage/requests") return json({ period: "30d", rows: [], offset: 0, total: 0, calls: 0, errors: 0, input: 0, output: 0, cache_read: 0, cache_write: 0, reasoning: 0, cost: 0, unpriced: 0, bucket: "day", series: [], by: { provider: [], agent: [], model: [] }, agents: [], providers: [] });+ if (url.pathname === "/api/usage") return json({ calls: 0, errors: 0, input: 0, output: 0, cache_read: 0, cache_write: 0, reasoning: 0, unpriced: 0, cost: 0, bucket: "day", series: [], agents: [], models: [], path: "~/.config/magpie/usage.jsonl" });+ if (url.pathname === "/api/usage/quotas") return json([]);+ if (url.pathname === "/api/sessions") return json({ sessions: [], dirs: [] });+ if (url.pathname === "/api/sessions/stats") return json({ from: "", to: "", days: [], agents: {} });+ 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)];+ await route.fulfill({ body: await fs.readFile(file), contentType });+}++// every interval's ticks, by the script that set it and its period+const census = () => {+ window.ticks = {};+ const set = window.setInterval;+ window.setInterval = function (fn, ms, ...rest) {+ const at = (new Error().stack || "").split("\n").map((l) => /magpie\.test\/((?:plugins\/\w+\/)?[\w-]+\.js):\d+/.exec(l)).find(Boolean);+ const key = `${at ? at[1] : "?"} ${ms}`;+ return set.call(window, function () { window.ticks[key] = (window.ticks[key] || 0) + 1; return typeof fn === "function" ? fn.apply(this, arguments) : undefined; }, ms, ...rest);+ };+};++const WATCHED = [["plugins/routing/client.js", 1000], ["plugins/usage/page.js", 1000], ["app.js", 2000]];++for (const engine of (process.env.BROWSER ? [process.env.BROWSER] : ["chromium", "webkit"])) {+ test(`${engine}: pages out of sight tick nothing, and tick again once shown`, async (t) => {+ const browser = await (engine === "webkit" ? webkit.launch() : chromium.launch({ channel: "chromium" }));+ t.after(() => browser.close());+ const errors = [];+ const context = await browser.newContext({ viewport: { width: 1180, height: 700 }, reducedMotion: "reduce" });+ const p = await context.newPage();+ p.setDefaultTimeout(5000);+ p.on("pageerror", (e) => errors.push(e.message));+ await p.clock.install({ time: now });+ await p.addInitScript(census);+ await p.route("**/*", server);+ await p.goto("http://magpie.test/");+ await p.locator('[data-view="usage"]').first().waitFor();+ const ticks = async () => p.evaluate(() => ({ ...window.ticks }));+ const of = (all, [file, ms]) => all[`${file} ${ms}`] || 0;+ const pass = async (ms) => { await p.clock.runFor(ms); await p.waitForTimeout(150); };++ // on Providers, with no lane pill: none of the three ticks+ await pass(1000);+ let before = await ticks();+ await pass(10_000);+ let after = await ticks();+ for (const w of WATCHED) assert.equal(of(after, w) - of(before, w), 0, `${w[0]} ticked out of sight`);++ // Usage shown: its look ticks each second; Routing's still doesn't+ await p.locator('[data-view="usage"]').first().click();+ await pass(1000);+ before = await ticks();+ await pass(5000);+ after = await ticks();+ assert.ok(of(after, WATCHED[1]) - of(before, WATCHED[1]) >= 4, `Usage's look ticks while it is shown: ${JSON.stringify(after)}`);+ assert.equal(of(after, WATCHED[0]) - of(before, WATCHED[0]), 0, "Routing's countdown ticked on Usage");++ // Routing shown: its countdown ticks; Usage's has stopped+ await p.locator('[data-view="routing"]').first().click();+ await pass(1000);+ before = await ticks();+ await pass(5000);+ after = await ticks();+ assert.ok(of(after, WATCHED[0]) - of(before, WATCHED[0]) >= 4, `Routing's countdown ticks while it is shown: ${JSON.stringify(after)}`);+ assert.equal(of(after, WATCHED[1]) - of(before, WATCHED[1]), 0, "Usage's look ticked on Routing");+ assert.deepEqual(errors, []);+ });+}