Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.
gui: the window back reads the state once, not once for visibility and again for focus
yetone2ceff7370f5d
diff --git a/internal/gui/assets/app.js b/internal/gui/assets/app.jsindex 71452d638..2c1386a12 100644--- a/internal/gui/assets/app.js+++ b/internal/gui/assets/app.js@@ -23383,7 +23383,18 @@ if (mode === "window") {setTimeout(() => { sideGwRead.due = true; sideGwRead(); }, 1500);}-document.addEventListener("visibilitychange", () => { if (!document.hidden) { load(true); wag(); } });+// loadBack: a window shown again hears visibilitychange and focus together;+// one read for both. A read asked over a second ago gets one more after it.+function loadBack() {+ const f = loadBack.flight;+ if (f && performance.now() - f.at < 1000) return f.done;+ if (f) return (f.next ||= f.done.then(() => loadBack()));+ const flight = { at: performance.now() };+ flight.done = load(true).finally(() => { if (loadBack.flight === flight) loadBack.flight = null; });+ loadBack.flight = flight;+ return flight.done;+}+document.addEventListener("visibilitychange", () => { if (!document.hidden) { loadBack(); wag(); } });// 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 menu@@ -23433,7 +23444,7 @@ setInterval(async () => {ro.observe($("#usageCost"));new MutationObserver(later).observe(head, { childList: true, subtree: true, characterData: true });}-window.addEventListener("focus", () => load(true));+window.addEventListener("focus", () => loadBack());setInterval(renderUpdateBadge, 15 * 60 * 1000); // a window left open still hears of a new version// renderPluginDot puts a dot on Plugins while a plugin's update waits for// the reader (someone else's plugin, or one pinned; the community's updatediff --git a/internal/gui/core_budget_test.go b/internal/gui/core_budget_test.goindex 53375637e..c5f936f92 100644--- a/internal/gui/core_budget_test.go+++ b/internal/gui/core_budget_test.go@@ -16,7 +16,7 @@ import (// raises them and says why in its commit.const (appScriptBudget = 1_269_000 // app.js: 1,198,239 after Usage left (P2); 1,218,098 with the 10-15 fixes to pages still in the core; 1,232,466 with the provider editor's Advanced fold and every dialog holding its place, the core's own (10-16); 1,250,533 with the quota refresh kept through redraws, the core's own since the tray panel draws it too, plus 1.5% (#2397)- coreScriptBudget = 1_447_000 // every core script: 1,358,034 after Usage left; 1,380,003 with them; 1,405,937 with the fold; 1,426,102 with 10-16's core work (the GitHub list loading, the move to plugins, Settings › Long conversations), plus 1.5% (#2612)+ coreScriptBudget = 1_469_000 // every core script: 1,358,034 after Usage left; 1,380,003 with them; 1,405,937 with the fold; 1,426,102 with 10-16's core work (the GitHub list loading, the move to plugins, Settings › Long conversations), plus 1.5% (#2612); 1,447,368 with loadBack, the window's one state read per return, which every page needs and so is the core's own (1,446,845 before it, 155 bytes under), plus 1.5%)func TestCoreScriptBudget(t *testing.T) {diff --git a/internal/gui/tests/window-back-once.test.cjs b/internal/gui/tests/window-back-once.test.cjsnew file mode 100644index 000000000..e5041eb74--- /dev/null+++ b/internal/gui/tests/window-back-once.test.cjs@@ -0,0 +1,102 @@+// Run with Node's test runner and Playwright on the module path; see README.md.+// The window shown again hears visibilitychange and focus together, and+// under focus-follows-mouse focus each time the pointer crosses in. Each+// of them read the whole state (/api/state, the agents' configs, their+// CLIs, the installs) again: two full reads for one return, and one per+// crossing. One read now serves the returns of the same second; a return+// while an older read is still on its way gets one more read after it,+// however many returns came meanwhile. Chromium and WebKit, English and+// Chinese, the window and the narrow panel.+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(process.env.MAGPIE_ASSETS || path.join(__dirname, "../assets"));++function serve(lang, seen) {+ 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:"${lang}",theme:"light",web:true};` });+ if (url.pathname === "/wails/runtime.js") return route.fulfill({ contentType: "text/javascript", body: "export const Window = {};" });+ if (url.pathname === "/api/state") {+ if (url.searchParams.get("last") === "1") return json({});+ seen.state++;+ if (seen.hold) await seen.hold;+ return json({ agents: [], profiles: [], settings: { lang, theme: "light" } });+ }+ if (url.pathname === "/api/plugins") return json({ plugins: [] });+ if (url.pathname === "/api/providers") return json({ providers: [], presets: [], excluded: [], gateway: { running: true } });+ 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"])) {+ for (const lang of ["en", "zh"]) {+ for (const surface of ["window", "panel"]) {+ test(`${engine} ${lang} ${surface}: the window back reads the state once`, async (t) => {+ const browser = await (engine === "webkit" ? webkit.launch() : chromium.launch({ channel: "chromium" }));+ t.after(() => browser.close());+ const context = await browser.newContext({ viewport: surface === "panel" ? { width: 360, height: 640 } : { width: 1000, height: 760 }, reducedMotion: "reduce" });+ const page = await context.newPage();+ page.setDefaultTimeout(5000);+ const errors = [];+ page.on("pageerror", (e) => errors.push(e.message));+ const seen = { state: 0, hold: null };+ await page.clock.install();+ await page.route("**/*", serve(lang, seen));+ await page.goto(surface === "panel" ? "http://magpie.test/?mode=panel" : "http://magpie.test/");+ await page.waitForFunction(() => load.done);+ // reads asked for after one of them must come within a moment of it:+ // what counts is that the second never comes, so the wait for it is+ // a generous one+ const quiet = () => new Promise((r) => setTimeout(r, 1500));+ const reach = async (n) => { for (let i = 0; i < 200 && seen.state < n; i++) await new Promise((r) => setTimeout(r, 25)); };+ const back = () => page.evaluate(() => {+ document.dispatchEvent(new Event("visibilitychange"));+ window.dispatchEvent(new Event("focus"));+ });+ const focus = () => page.evaluate(() => window.dispatchEvent(new Event("focus")));+ await quiet();+ const first = seen.state;++ await back();+ await reach(first + 1);+ await quiet();+ assert.equal(seen.state - first, 1, "shown again: visibilitychange and focus read the state once");+ await page.clock.runFor(1500);+ await focus();+ await reach(first + 2);+ await quiet();+ assert.equal(seen.state - first, 2, "a later return reads it again");++ // a read held on its way: returns a second later each get the one+ // read after it, not one each+ let release;+ seen.hold = new Promise((r) => { release = r; });+ await page.clock.runFor(1500);+ await focus();+ await reach(first + 3);+ assert.equal(seen.state - first, 3);+ await page.clock.runFor(1500);+ await focus();+ await focus();+ await back();+ await quiet();+ assert.equal(seen.state - first, 3, "nothing more is asked while the read is on its way");+ seen.hold = null;+ release();+ await reach(first + 4);+ await quiet();+ assert.equal(seen.state - first, 4, "one read follows the held one, for all the returns while it was out");+ assert.deepEqual(errors, []);+ });+ }+ }+}