Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.
gui: a download the network broke off says so, not the signed address
yetone78a0dbdd298e
diff --git a/internal/gui/assets/app.js b/internal/gui/assets/app.jsindex 74d19e748..39f999fb0 100644--- a/internal/gui/assets/app.js+++ b/internal/gui/assets/app.js@@ -22770,6 +22770,10 @@ async function renderUpdate(r, u) {case "error":// the reason in sight: "timed out" says try a proxy, a 404 says waitsub.textContent = t(u.latest ? "Couldn't download {v}" : "Couldn't check for updates", { v: u.latest }) + (u.error ? " · " + u.error.replace(/^Get "[^"]*": /, "") : "");+ // the network broke it off, after the tries download makes by itself+ // (AIMetaPhD on X: an EOF from GitHub's asset host, with its whole+ // signed address): what happened and what to do, in the app's words+ if (u.network && u.latest) sub.textContent = t("{v}'s download broke off, a network problem. Click Check to try again, or download it from the release page", { v: u.latest });sub.title = u.error || "";if (u.error) sub.classList.add("wraps");// through a mirror (#893): it's the mirror's failing — it didn'tdiff --git a/internal/gui/assets/i18n.js b/internal/gui/assets/i18n.jsindex 93bd0d939..bd901db32 100644--- a/internal/gui/assets/i18n.js+++ b/internal/gui/assets/i18n.js@@ -3048,6 +3048,7 @@ const I18N = {"Check": "检查","Couldn't check for updates": "检查更新失败","Couldn't download {v}": "{v} 下载失败",+ "{v}'s download broke off, a network problem. Click Check to try again, or download it from the release page": "{v} 下载中断,是网络问题。点「检查」重试,或从发布页面手动下载","{v} didn't start on this computer: Windows' Smart App Control (or another app control policy) blocked the new version, which isn't signed. magpie stays on {cur}. Download it and run it yourself, or turn Smart App Control off and check again": "{v} 没能在这台电脑上启动:Windows 的「智能应用控制」(或其他应用控制策略)拦下了未签名的新版本,magpie 仍是 {cur}。可以下载新版本自己运行,或关掉智能应用控制后再检查更新","{v} didn't start on this computer, so magpie stays on {cur}": "{v} 没能在这台电脑上启动,magpie 仍是 {cur}","{done} of {total} MB": "{done} / {total} MB",@@ -7006,6 +7007,7 @@ const I18N = {"Check": "檢查","Couldn't check for updates": "檢查更新失敗","Couldn't download {v}": "{v} 下載失敗",+ "{v}'s download broke off, a network problem. Click Check to try again, or download it from the release page": "{v} 下載中斷,是網路問題。點「檢查」重試,或從發布頁面手動下載","{v} didn't start on this computer: Windows' Smart App Control (or another app control policy) blocked the new version, which isn't signed. magpie stays on {cur}. Download it and run it yourself, or turn Smart App Control off and check again": "{v} 沒能在這臺電腦上啟動:Windows 的「智慧應用控制」(或其他應用控制策略)攔下了未簽名的新版本,magpie 仍是 {cur}。可以下載新版本自己執行,或關掉智慧應用控制後再檢查更新","{v} didn't start on this computer, so magpie stays on {cur}": "{v} 沒能在這臺電腦上啟動,magpie 仍是 {cur}","{done} of {total} MB": "{done} / {total} MB",@@ -10976,6 +10978,7 @@ const I18N = {"Check": "確認","Couldn't check for updates": "アップデートを確認できませんでした","Couldn't download {v}": "{v} をダウンロードできませんでした",+ "{v}'s download broke off, a network problem. Click Check to try again, or download it from the release page": "{v} のダウンロードが途中で切れました(ネットワークの問題)。「確認」で再試行するか、リリースページからダウンロードしてください","{v} didn't start on this computer: Windows' Smart App Control (or another app control policy) blocked the new version, which isn't signed. magpie stays on {cur}. Download it and run it yourself, or turn Smart App Control off and check again": "{v} はこのコンピューターで起動できませんでした:Windows の「スマート アプリ コントロール」(または別のアプリ制御ポリシー)が署名のない新しいバージョンをブロックしました。magpie は {cur} のままです。ダウンロードして自分で実行するか、スマート アプリ コントロールをオフにしてから再度確認してください","{v} didn't start on this computer, so magpie stays on {cur}": "{v} はこのコンピューターで起動できなかったため、magpie は {cur} のままです","{done} of {total} MB": "{done} / {total} MB",@@ -14956,6 +14959,7 @@ const I18N = {"Check": "Prüfen","Couldn't check for updates": "Suche nach Updates fehlgeschlagen","Couldn't download {v}": "{v} konnte nicht heruntergeladen werden",+ "{v}'s download broke off, a network problem. Click Check to try again, or download it from the release page": "Der Download von {v} brach ab, ein Netzwerkproblem. Klicke auf „Prüfen“, um es erneut zu versuchen, oder lade es von der Release-Seite herunter","{v} didn't start on this computer: Windows' Smart App Control (or another app control policy) blocked the new version, which isn't signed. magpie stays on {cur}. Download it and run it yourself, or turn Smart App Control off and check again": "{v} ließ sich auf diesem Computer nicht starten: Die intelligente App-Steuerung von Windows (oder eine andere App-Steuerungsrichtlinie) hat die neue, nicht signierte Version blockiert. magpie bleibt bei {cur}. Lade sie herunter und starte sie selbst, oder schalte die intelligente App-Steuerung aus und prüfe erneut","{v} didn't start on this computer, so magpie stays on {cur}": "{v} ließ sich auf diesem Computer nicht starten, daher bleibt magpie bei {cur}","{done} of {total} MB": "{done} von {total} MB",diff --git a/internal/gui/tests/README.md b/internal/gui/tests/README.mdindex c789b8dde..faf809bf0 100644--- a/internal/gui/tests/README.md+++ b/internal/gui/tests/README.md@@ -2352,6 +2352,18 @@ is faked.node --test internal/gui/tests/update-mirror.test.cjs```+`update-network.test.cjs` checks the Version row after a download the+network broke off (`network` in `/api/update`, AIMetaPhD on X): it says+the download broke off, a network problem, and that Check tries again or+the release page has it, with no address and no raw error in the row.+Check asks `/api/update/check` again, and the release page is offered.+Every language, Chromium and WebKit, at 1100 and 390 wide, no sideways+scroll; the API is faked.++```sh+node --test internal/gui/tests/update-network.test.cjs+```+`lane-limit.test.cjs` checks each key's and account's own limit on requestsat once (#892): its row's pill says what runs and waits under it whilerequests are out ("1/1 running · 2 queued"), read again from `/api/lanes`diff --git a/internal/gui/tests/update-network.test.cjs b/internal/gui/tests/update-network.test.cjsnew file mode 100644index 000000000..55fb70c6b--- /dev/null+++ b/internal/gui/tests/update-network.test.cjs@@ -0,0 +1,95 @@+// Run with Node's test runner and Playwright on the module path; see README.md.+// Settings › About: a download the network broke off (AIMetaPhD on X: an+// EOF from GitHub's asset host on Windows, 0.1.1615 to 0.1.1618) says what+// happened and what to do in the app's language: Check tries again, or the+// release page has it. The raw error, and never a signed address, stays out+// of the row. Check asks again; the release page is offered. Every+// language, both engines, at 1100 and 390 wide; 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 { watchSettingsReads, settingsDrawn, openPart } = require("./reader.cjs");++const assets = path.resolve(__dirname, "../assets");++const words = {+ en: { said: "0.1.1618's download broke off, a network problem. Click Check to try again, or download it from the release page", check: "Check", page: "Open the release page" },+ zh: { said: "0.1.1618 下载中断,是网络问题。点「检查」重试,或从发布页面手动下载", check: "检查", page: "打开发布页面" },+ "zh-TW": { said: "0.1.1618 下載中斷,是網路問題。點「檢查」重試,或從發布頁面手動下載", check: "檢查", page: "打開發布頁面" },+ ja: { said: "0.1.1618 のダウンロードが途中で切れました(ネットワークの問題)。「確認」で再試行するか、リリースページからダウンロードしてください", check: "確認", page: "リリースページを開く" },+ de: { said: "Der Download von 0.1.1618 brach ab, ein Netzwerkproblem. Klicke auf „Prüfen“, um es erneut zu versuchen, oder lade es von der Release-Seite herunter", check: "Prüfen", page: "Release-Seite öffnen" },+};++// what the backend says after the tries: the cause, the file, no address+const failed = {+ state: "error", current: "0.1.1615", latest: "0.1.1618", retry: true, network: true,+ url: "https://github.com/yetone/magpie-releases/releases/tag/v0.1.1618",+ error: "the download of magpie.exe.new broke off (EOF)",+};++function server(lang, ctl) {+ return async (route) => {+ const req = route.request(), url = new URL(req.url());+ const json = (data) => route.fulfill({ json: data });+ const settings = { theme: "light", lang, version: "0.1.1615", dir: "~/.config/magpie", gateway: "http://127.0.0.1:3425", lanURLs: [], fx: { rate: 7.2 } };+ 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 });+ if (url.pathname === "/api/update/check") {+ ctl.checks++;+ return json(failed);+ }+ if (url.pathname === "/api/update") return json(failed);+ if (url.pathname === "/api/plugins") return json({ plugins: [] });+ 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)];+ 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 + ": a download the network broke off says so, and what to do", async (t) => {+ const browser = await (engine === "webkit" ? webkit.launch() : chromium.launch({ channel: "chromium" }));+ t.after(() => browser.close());+ for (const width of [1100, 390]) {+ for (const lang of Object.keys(words)) {+ const w = words[lang];+ await t.test(`${lang} at ${width}`, async () => {+ const ctl = { checks: 0 };+ const errors = [];+ const page = await (await browser.newContext({ viewport: { width, height: 800 }, 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");+ await settingsDrawn(page);+ await openPart(page, "about");+ const row = page.locator("#about .row.pref", { has: page.locator(".sub", { hasText: w.said }) });+ await row.waitFor();+ const sub = (await row.locator(".sub").innerText()).trim();+ assert.equal(sub, w.said);+ assert.ok(!/https?:|sig=|jwt=|EOF/.test(sub), "no address and no raw error in the row: " + sub);+ await row.locator("button", { hasText: w.page }).waitFor();+ const check = row.locator("button", { hasText: w.check });+ await check.waitFor();+ const over = await page.evaluate(() => document.scrollingElement.scrollWidth - document.scrollingElement.clientWidth);+ assert.ok(over <= 0, "no sideways scroll at " + width + ": " + over);+ const box = await row.boundingBox(), sbox = await row.locator(".sub").boundingBox();+ assert.ok(sbox.x + sbox.width <= box.x + box.width + 1, "the text stays in its row");+ await check.click();+ await row.locator(".sub", { hasText: w.said }).waitFor();+ assert.equal(ctl.checks, 1, "Check asks again");+ assert.deepEqual(errors, []);+ await page.context().close();+ });+ }+ }+ });+}diff --git a/internal/gui/update.go b/internal/gui/update.goindex 48d98e896..611f33931 100644--- a/internal/gui/update.go+++ b/internal/gui/update.go@@ -28,19 +28,20 @@ import (// restart asks for the administrator's password; only an app that can't be// replaced at all (run from its disk image, say) is sent to the release page.type updater struct {- mu sync.Mutex- state string // checking | latest | found | downloading | ready | available | source | error | blocked- latest *update.Release- err string- bundle string // the .app to replace, "" when not in one or stuck- stuck string // why the .app or binary can't be replaced where it is (update.Stuck, exeStuck)- exe string // not in a .app: the binary to replace, "" when not writable- exeDir string // not in a .app: the binary's folder, named when it is stuck there- self os.FileInfo // exe as this process started from it- retry bool // error: the download failed, and may be tried again- mirror string // error: the mirror the failed download came through (#893)- staged string- aside string // Windows: where install moved the running exe, to put back+ mu sync.Mutex+ state string // checking | latest | found | downloading | ready | available | source | error | blocked+ latest *update.Release+ err string+ bundle string // the .app to replace, "" when not in one or stuck+ stuck string // why the .app or binary can't be replaced where it is (update.Stuck, exeStuck)+ exe string // not in a .app: the binary to replace, "" when not writable+ exeDir string // not in a .app: the binary's folder, named when it is stuck there+ self os.FileInfo // exe as this process started from it+ retry bool // error: the download failed, and may be tried again+ mirror string // error: the mirror the failed download came through (#893)+ network bool // error: the network broke the download off (update.Network)+ staged string+ aside string // Windows: where install moved the running exe, to put back// a version this computer wouldn't start (Smart App Control, #894),// which the clock's checks don't download again; byClock, the check// under way is the clock's@@ -90,8 +91,11 @@ type updateJSON struct {// error: the download failed through this mirror (Settings' UpdateMirror),// and GitHub itself may do (#893)Mirror string `json:"mirror,omitempty"`- Error string `json:"error,omitempty"`- Done int64 `json:"done,omitempty"` // downloading: bytes so far+ // error: the network broke the download off, tried again already; the+ // row says so in the app's language instead of the raw error+ Network bool `json:"network,omitempty"`+ Error string `json:"error,omitempty"`+ Done int64 `json:"done,omitempty"` // downloading: bytes so far// blocked: the version this computer wouldn't start, and why (#894)Blocked *update.Blocked `json:"blocked,omitempty"`Total int64 `json:"total,omitempty"`@@ -306,7 +310,7 @@ func (u *updater) begin() bool {if u.state == "checking" || u.state == "downloading" {return false}- u.state, u.err, u.retry, u.mirror, u.asked, u.byClock, u.fetch = "checking", "", false, "", time.Now(), false, false+ u.state, u.err, u.retry, u.mirror, u.network, u.asked, u.byClock, u.fetch = "checking", "", false, "", false, time.Now(), false, falsereturn true}@@ -399,7 +403,7 @@ func (u *updater) run() {u.mu.Lock()if err != nil {log.Println("update:", err)- u.state, u.err, u.retry, u.mirror = "error", err.Error(), true, update.MirrorOf(err)+ u.state, u.err, u.retry, u.mirror, u.network = "error", err.Error(), true, update.MirrorOf(err), update.Network(err)return}u.state, u.staged = "ready", staged@@ -504,7 +508,7 @@ func (u *updater) jsonIn(lang string) updateJSON {j.State = "" // not asked lately: no claim to be up to date}if u.state == "error" {- j.Mirror = u.mirror+ j.Mirror, j.Network = u.mirror, u.network}if u.state == "checking" && u.staged != "" {j.State = "ready" // what was downloaded can still be restarted intodiff --git a/internal/gui/update_mirror_test.go b/internal/gui/update_mirror_test.goindex 94b73e4e8..3eca3eb3a 100644--- a/internal/gui/update_mirror_test.go+++ b/internal/gui/update_mirror_test.go@@ -75,7 +75,7 @@ func TestUpdateMirrorSetting(t *testing.T) {defer os.Remove(exe + ".new")u.check()j := u.json()- if j.State != "error" || !j.Retry || j.Mirror != mirror.URL+"/" || !strings.Contains(j.Error, mirror.URL) {+ if j.State != "error" || !j.Retry || j.Mirror != mirror.URL+"/" || j.Network || !strings.Contains(j.Error, mirror.URL) {t.Fatalf("through the mirror: %+v", j)}// the next check starts afresh: no mirror said while it runs