Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.
gui: Settings › About's Version row keeps its height while the update read is out (#3469)
yetone3d758d0345d3
diff --git a/internal/gui/assets/app.js b/internal/gui/assets/app.jsindex c824c9b0f..4efff79e5 100644--- a/internal/gui/assets/app.js+++ b/internal/gui/assets/app.js@@ -4102,6 +4102,7 @@ function updatePath(p) {async function renderUpdateBadge() {const b = $("#update"), label = b.querySelector("span");const u = await api(updatePath("update")).catch(() => null);+ if (u) updateLast = u;// pulling: a click is downloading it again, and restarts once it's inconst pulling = !!u && !!b.dataset.pulling && ["checking", "downloading", "ready"].includes(u.state);if (b.dataset.pulling && !pulling) {@@ -22808,17 +22809,22 @@ function renderLAN(s) {// The app checks and downloads on its own, so usually the row just offers// the restart; a check can also be asked for. That check leaves the button// where it is, dimmed, and a second click does nothing. A read still out-// from before the answer is not drawn over it. A row drawn again reads the-// current state, and keeps asking while a check or a download is under way.-let updateBusy = false;-const updateSeq = new WeakMap();+// from before the answer is not drawn over it. A row drawn again draws the+// last state at once, but in a check (#3469), and reads while a check or a+// download is under way.+let updateBusy = false, updateLast = null;+const updateSeq = new WeakMap(), seqOf = (r) => updateSeq.get(r) || 0;async function renderUpdate(r, u) {- const seq = updateSeq.get(r) || 0;+ const seq = seqOf(r);if (u == null) {+ const early = !updateBusy && updateLast && !r.querySelector(".sub");+ if (early) renderUpdate(r, updateLast);u = await api(updatePath("update")).catch(() => null);- if (!u || !r.isConnected || (updateSeq.get(r) || 0) !== seq) return;+ if (!u || !r.isConnected || seqOf(r) !== seq) return;+ if (early) updateSeq.set(r, seq + 1); // stops its timers} else if (!r.isConnected) return;+ updateLast = u;const who = r.querySelector(".who"), val = r.querySelector(".val");const sub = who.querySelector(".sub") || who.appendChild(el("div", "sub"));sub.title = "";@@ -22828,6 +22834,8 @@ async function renderUpdate(r, u) {const kept = val.querySelector("button.update-page");for (const b of val.querySelectorAll("button")) if (b !== kept) b.remove();let pageShown = false;+ const open = () => (web ? window.open(u.url, "_blank", "noopener") : api("open", { url: u.url }).catch(() => {}));+ const dim = () => { for (const b of val.querySelectorAll("button")) { b.disabled = true; b.classList.add("busy"); } };// where GitHub is slow to magpie, the update can be fetched in the// browser instead, through its own proxy or accelerator (PapainTea on X)const page = () => {@@ -22836,7 +22844,7 @@ async function renderUpdate(r, u) {b.textContent = t("Open the release page");b.disabled = false; // a Check dims every button until its answerb.classList.remove("busy");- b.onclick = () => (web ? window.open(u.url, "_blank", "noopener") : api("open", { url: u.url }).catch(() => {}));+ b.onclick = open;if (val.lastElementChild !== b) val.append(b);pageShown = true;};@@ -22852,24 +22860,21 @@ async function renderUpdate(r, u) {const check = async () => {if (updateBusy) return;updateBusy = true;- const mine = (updateSeq.get(r) || 0) + 1;+ const mine = seqOf(r) + 1;updateSeq.set(r, mine);sub.textContent = t("Checking for updates…");- for (const b of val.querySelectorAll("button")) {- b.disabled = true;- b.classList.add("busy");- }+ dim();let next;try { next = await api(updatePath("update/check"), {}); }catch (e) { next = { state: "error", error: e.message }; }updateBusy = false;- if (!r.isConnected || (updateSeq.get(r) || 0) !== mine) return;+ if (!r.isConnected || seqOf(r) !== mine) return;updateSeq.set(r, mine + 1); // the answer stands; a read still out is olderrenderUpdate(r, next);};const again = (ms) => {- const seen = updateSeq.get(r) || 0;- setTimeout(() => { if (r.isConnected && (updateSeq.get(r) || 0) === seen) renderUpdate(r); }, ms);+ const seen = seqOf(r);+ setTimeout(() => { if (r.isConnected && seqOf(r) === seen) renderUpdate(r); }, ms);};switch (u.state) {case "ready": {@@ -22892,11 +22897,11 @@ async function renderUpdate(r, u) {btn(t("Restart now"), () => install("now"));btn(t("Cancel"), () => install("cancel"));// the wait ends in a restart: a read that finds no one is that- const seen = updateSeq.get(r) || 0;+ const seen = seqOf(r);setTimeout(async () => {- if (!r.isConnected || (updateSeq.get(r) || 0) !== seen) return;+ if (!r.isConnected || seqOf(r) !== seen) return;const n = await api(updatePath("update")).catch(() => null);- if (!r.isConnected || (updateSeq.get(r) || 0) !== seen) return;+ if (!r.isConnected || seqOf(r) !== seen) return;if (!n) {sub.textContent = t("Restarting…");for (const b of val.querySelectorAll("button")) b.remove();@@ -22910,7 +22915,7 @@ async function renderUpdate(r, u) {else if (busyNow) sub.textContent += " · " + busyNow;if (u.gaveUp) sub.classList.add("wraps");btn(t("Restart to update"), () => (u.error ? install() : confirmUpdate(u, () => install())));- if (u.error && u.url) btn(t("Download"), () => (web ? window.open(u.url, "_blank", "noopener") : api("open", { url: u.url })));+ if (u.error && u.url) btn(t("Download"), open);break;}case "found": {@@ -22963,10 +22968,11 @@ async function renderUpdate(r, u) {+ (u.error ? " · " + u.error.replace("through the mirror " + u.mirror + ": ", "").replace(/^Get "[^"]*": /, "") : "");btn(t("Download from GitHub"), async () => {if (updateBusy) return;- for (const b of val.querySelectorAll("button")) { b.disabled = true; b.classList.add("busy"); }+ dim();try {prefs = await writingPrefs(api("settings/update-mirror", { mirror: "" }));await api(updatePath("update/install"), installFrom());+ updateLast = null;renderSettings(); // the source row says GitHub, this one the download} catch (e) {status(t(e.message), "err");@@ -22987,7 +22993,7 @@ async function renderUpdate(r, u) {: t("{v} didn't start on this computer, so magpie stays on {cur}", { v: u.latest || b.version, cur: u.current }) + (b.error ? " · " + b.error : "");sub.title = b.error || u.error || "";sub.classList.add("wraps");- if (u.url) btn(t("Download"), () => (web ? window.open(u.url, "_blank", "noopener") : api("open", { url: u.url })));+ if (u.url) btn(t("Download"), open);btn(t("Check"), check);break;}diff --git a/internal/gui/tests/update-row-held.test.cjs b/internal/gui/tests/update-row-held.test.cjsnew file mode 100644index 000000000..af85f4e4e--- /dev/null+++ b/internal/gui/tests/update-row-held.test.cjs@@ -0,0 +1,92 @@+// Run with Node's test runner and Playwright on the module path; see README.md.+// Settings › About, gone back to from another page: the Version row keeps+// its line under the name ("Up to date") and its Check button while the+// update read is still out, so the rows under it don't jump up 12px and+// back down (#3469, xisdumpling). English and Chinese; no backend, the API+// is faked here.+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 { watchSettingsReads, settingsDrawn } = require("./reader.cjs");++const assets = path.resolve(__dirname, "../assets");+const words = { en: { version: "Version", latest: "Up to date", check: "Check" }, zh: { version: "版本", latest: "已是最新", check: "检查" } };++function server(lang, ctl) {+ const settings = {+ theme: "light", lang, tray: "panel", quotaLeft: false, currency: "usd", proxy: "", redact: false, redactWords: [],+ version: "0.1.400", dir: "~/.config/magpie", gateway: "http://127.0.0.1:3425", proxyNow: "none", proxySource: "none",+ visionModels: [], imageGenModels: [], workbuddyCheckins: [], lanURLs: [], fx: { rate: 7.2, at: new Date().toISOString(), stale: false },+ };+ 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: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, theme: "light" }, fx: settings.fx });+ if (url.pathname === "/api/settings") return json(settings);+ if (url.pathname === "/api/update") {+ if (ctl.hold) await ctl.hold;+ return json({ state: "latest", current: "0.1.400" });+ }+ if (url.pathname === "/api/usage/quotas") return json([]);+ 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 });+ };+}++for (const engine of (process.env.BROWSER ? [process.env.BROWSER] : ["chromium", "webkit"])) {+ test(engine + ": the version row holds its height while its read is out", async (t) => {+ assert(["chromium", "webkit"].includes(engine), "BROWSER must be chromium or webkit");+ const browser = await (engine === "webkit" ? webkit.launch() : chromium.launch({ channel: "chromium" }));+ t.after(() => browser.close());+ for (const lang of ["en", "zh"]) {+ const w = words[lang], ctl = {}, errors = [];+ const page = await (await browser.newContext({ viewport: { width: 900, height: 600 }, reducedMotion: "reduce" })).newPage();+ page.setDefaultTimeout(5000);+ page.on("pageerror", (e) => errors.push(e.message));+ await page.route("**/*", server(lang, ctl));+ await watchSettingsReads(page);+ await page.goto("http://magpie.test/?view=settings&tab=about");+ await settingsDrawn(page);+ const row = page.locator("#about .row.pref", { has: page.locator(".name", { hasText: w.version }) }).first();+ await row.locator(".sub", { hasText: w.latest }).waitFor();+ const tall = (await row.boundingBox()).height;++ await page.evaluate(() => show("agents"));+ let release;+ ctl.hold = new Promise((go) => (release = go));+ // every frame from the return to Settings until the read is let go:+ // the row's height, its line under the name, and its button+ await page.evaluate((w) => {+ window.__rows = [];+ const look = () => {+ const r = [...document.querySelectorAll("#about .row.pref")].find((r) => r.querySelector(".name")?.textContent === w.version);+ if (r && r.offsetParent) window.__rows.push({ h: r.getBoundingClientRect().height, sub: r.querySelector(".who .sub")?.textContent || "", btn: !!r.querySelector(".val button") });+ if (!window.__stop) requestAnimationFrame(look);+ };+ look();+ show("settings");+ }, w);+ // the settings read and its redraw are done, the update read still held+ await page.waitForFunction(() => window.__rows.length > 20);+ await page.waitForTimeout(300);+ const held = await page.evaluate(() => window.__rows.slice());+ release();+ await row.locator(".sub", { hasText: w.latest }).waitFor();+ await page.evaluate(() => (window.__stop = true));++ const off = held.filter((s) => Math.abs(s.h - tall) > 0.5 || s.sub !== w.latest || !s.btn);+ assert.deepEqual(off.slice(0, 3), [], `${lang}: the row was ${tall}px with "${w.latest}" and ${w.check}; ${off.length} of ${held.length} frames drew it otherwise`);+ assert.equal((await row.boundingBox()).height, tall, `${lang}: the answer draws the same row`);+ assert.equal(await row.locator(".val button", { hasText: w.check }).count(), 1, `${lang}: one Check button`);+ assert.deepEqual(errors, [], `${lang}: page errors`);+ await page.context().close();+ }+ });+}