From d49d889cd7eb520ac05bc59a1e08dc7315dfb7a8 Mon Sep 17 00:00:00 2001 From: yetone Date: Sat, 3 Oct 2026 01:40:30 +0800 Subject: [PATCH] =?UTF-8?q?gui:=20a=20provider's=20Fallback=20picker=20say?= =?UTF-8?q?s=20how=20many=20more=20models=20match=20past=20the=20dozen=20i?= =?UTF-8?q?t=20draws,=20and=20that=20typing=20narrows=20them=20(01huadalan?= =?UTF-8?q?g=20on=20Discord:=20=E8=BF=99=E4=B8=AA=E5=A4=87=E7=94=A8?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=9A=84=E6=9D=A5=E6=BA=90=E6=98=AF=E5=93=AA?= =?UTF-8?q?=E9=87=8C=EF=BC=8C=E6=80=8E=E4=B9=88=E5=8F=AA=E6=9C=89=E8=BF=99?= =?UTF-8?q?=E4=B9=88=E5=87=A0=E4=B8=AA=EF=BC=8C=E6=98=AF=E5=90=A6=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E9=80=89=E6=8B=A9=E4=BE=9B=E5=BA=94=E5=95=86=E9=87=8C?= =?UTF-8?q?=E7=9A=84=E5=88=AB=E7=9A=84=E6=A8=A1=E5=9E=8B=EF=BC=8C=E4=BE=8B?= =?UTF-8?q?=E5=A6=82=20workbuddy=20=E7=9A=84=E6=A8=A1=E5=9E=8B)=20?= =?UTF-8?q?=E2=80=94=20focusing=20the=20picker=20drew=20the=20first=2012?= =?UTF-8?q?=20of=20every=20on=20model=20of=20every=20ready=20provider=20an?= =?UTF-8?q?d=20nothing=20else,=20so=20the=20rest=20(a=20WorkBuddy=20model?= =?UTF-8?q?=20among=20them)=20looked=20missing.=20Past=2012=20it=20now=20e?= =?UTF-8?q?nds=20with=20"{n}=20more=20=E2=80=94=20type=20to=20narrow"=20(?= =?UTF-8?q?=E8=BF=98=E6=9C=89=20{n}=20=E9=A1=B9=20=E2=80=94=20=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E4=BB=A5=E7=AD=9B=E9=80=89),=20the=20string=20the=20o?= =?UTF-8?q?ther=20pickers=20use.=20fallback-more.test.cjs=20is=20new=20(a?= =?UTF-8?q?=20provider=20beside=20one=20with=2020=20models:=2012=20chips?= =?UTF-8?q?=20and=20"8=20more",=20a=20typed=20filter=20finds=20the=2017th,?= =?UTF-8?q?=20the=20note=20gone;=20en=20and=20zh):=20it=20fails=20without?= =?UTF-8?q?=20the=20change=20and=20passes=20with=20it=20in=20WebKit;=20cli?= =?UTF-8?q?ck-scroll=20passes.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/gui/assets/app.js | 2 + internal/gui/tests/fallback-more.test.cjs | 62 +++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 internal/gui/tests/fallback-more.test.cjs diff --git a/internal/gui/assets/app.js b/internal/gui/assets/app.js index 713e284b..def11815 100644 --- a/internal/gui/assets/app.js +++ b/internal/gui/assets/app.js @@ -6680,6 +6680,8 @@ function renderFallback(p) { c.onclick = () => add(x.id); sugg.append(c); } + // only the first dozen are drawn: the rest are said to be there + if (hits.length > 12) sugg.append(el("span", "hint", t("{n} more — type to narrow", { n: hits.length - 12 }))); if (!hits.length && f) sugg.append(el("span", "hint", f.includes("/") ? t("Enter adds {id}", { id: q.value.trim() }) : t("No model matches"))); }; q.onfocus = () => { open = true; draw(); }; diff --git a/internal/gui/tests/fallback-more.test.cjs b/internal/gui/tests/fallback-more.test.cjs new file mode 100644 index 00000000..d257eb67 --- /dev/null +++ b/internal/gui/tests/fallback-more.test.cjs @@ -0,0 +1,62 @@ +// Run with Node's test runner and Playwright on the module path; see README.md. +// A provider's Fallback picker draws the first dozen models that match; when +// more match, it says how many more there are and that typing narrows them +// (01huadalang on Discord: "怎么只有这么几个" — the rest looked missing), and a +// typed filter finds one past the dozen. In English and Chinese. +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 base = { chat: "", responses: "", anthropic: "", catalog: "", agents: [], fallback: [], headers: {}, keyList: [], key: { set: true }, ready: true }; +const acme = { ...base, id: "acme", name: "Acme", icon: "generic", models: [{ id: "a1", name: "A1", on: true }] }; +const wb = { ...base, id: "wb", name: "WorkBuddy", icon: "generic", models: Array.from({ length: 20 }, (_, i) => ({ id: "m" + (i + 1), name: "WB Model " + (i + 1), on: true })) }; + +function serve(lang) { + const state = { agents: [], profiles: [], settings: { lang, theme: "light" } }; + 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") return json(state); + if (url.pathname === "/api/providers") return json({ providers: [acme, wb], presets: [], excluded: [], gateway: { running: true, window: true } }); + if (url.pathname === "/api/groups") return json({ groups: [] }); + if (url.pathname === "/api/plugins") return json({ plugins: [] }); + 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 }); + }; +} + +const words = { en: { more: "8 more — type to narrow" }, zh: { more: "还有 8 项 — 输入以筛选" } }; + +for (const engine of (process.env.BROWSER ? [process.env.BROWSER] : ["chromium", "webkit"])) { + for (const lang of ["en", "zh"]) { + test(`${engine} ${lang}: the Fallback picker says how many more models match`, async (t) => { + const browser = await (engine === "webkit" ? webkit.launch() : chromium.launch({ channel: "chromium" })); + t.after(() => browser.close()); + const page = await (await browser.newContext({ viewport: { width: 900, height: 760 }, reducedMotion: "reduce" })).newPage(); + page.setDefaultTimeout(5000); + const errors = []; + page.on("pageerror", (e) => errors.push(e.message)); + await page.route("**/*", serve(lang)); + await page.goto("http://magpie.test/?view=providers"); + await page.locator(".row.provider", { hasText: "Acme" }).first().click(); + const box = page.locator(".editor .fallback"); + await box.locator("input").focus(); + const chips = box.locator(".mchips .mchip"); + await assert.doesNotReject(chips.nth(11).waitFor()); + assert.equal(await chips.count(), 12); + assert.equal((await box.locator(".mchips .hint").textContent()).trim(), words[lang].more); + await box.locator("input").fill("model 17"); + assert.equal(await chips.count(), 1); + assert.equal(await chips.first().getAttribute("title"), "wb/m17"); + assert.equal(await box.locator(".mchips .hint").count(), 0); + assert.deepEqual(errors, []); + }); + } +}