Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.
gui: a routing group's strategy is switched from its row (MoChou, #3450)
yetoneb995095637af
diff --git a/internal/gui/assets/plugins/routing/client.js b/internal/gui/assets/plugins/routing/client.jsindex d3a9f6364..cc2382b49 100644--- a/internal/gui/assets/plugins/routing/client.js+++ b/internal/gui/assets/plugins/routing/client.js@@ -4746,7 +4746,7 @@ function routingPage(part) {}const m = withJS(GROUP_ROUTE_OPTS, g.routing).find(([id]) => id === (g.routing || "")) || ROUTE_OPTS[0];const tags = el("span", "tags");- tags.append(el("span", "tag", t(m[1])));+ tags.append(routeTag(g, m));if (g.affinity) tags.append(el("span", "tag", t(AFF_OPTS.find(([id]) => id === g.affinity)?.[1] || "")));if (g.sink && sinkable(g.routing || "")) {const k = el("span", "tag sink", t("Rate limited to the back"));@@ -4793,6 +4793,36 @@ function routingPage(part) {}return row;}+ // routeTag: a group's routing on its row, a button that opens the+ // routings the editor offers, the current one checked (MoChou, #3450).+ // Picking one saves the group as the editor's Save would with only its+ // routing changed: Manual keeps the pick it had, the gateway's first+ // member when it had none (provider.cleanGroup), as the editor does.+ function routeTag(g, m) {+ const cur = g.routing || "";+ const b = el("button", "tag rt-groute");+ b.type = "button";+ b.setAttribute("aria-haspopup", "menu");+ b.setAttribute("aria-expanded", "false");+ b.setAttribute("aria-label", t("Routing") + " · " + g.name + " · " + t(m[1]));+ b.title = t("How {name} routes: click to change it", { name: g.name });+ b.append(el("span", "", t(m[1])), svg(CHEV, 10, 1.8));+ b.onclick = (e) => {+ e.stopPropagation(); // the card opens the editor; this its routing+ if (b.classList.contains("open")) return closeProtoMenu();+ const opts = withJS(GROUP_ROUTE_OPTS, cur);+ openProtoMenu(b, opts.map(([id, n]) => ({ v: id, name: n, note: "", title: GROUP_HINT[id] ? t(GROUP_HINT[id]) : modeOf(id)[1] })), cur, async (v) => {+ closeProtoMenu();+ if (v === cur || (groupDirty() && !(await confirmDiscard()))) return b.focus({ preventScroll: true });+ const n = opts.find(([id]) => id === v)?.[1] || v;+ await groupAction("save", { id: g.id, name: g.name, members: namedOf(g), match: g.match || [], routing: v, pick: g.pick || "", affinity: g.affinity || "", sink: !!g.sink && sinkable(v), firstToken: g.firstToken || 0, patience: g.patience || 0, rules: g.rules || [], effort: g.effort || "", classifier: g.classifier || "", context: g.context || 0, levels: g.levels || [], family: g.family || "", fast: g.fast || [], off: g.off || [], weights: g.weights || {}, unlists: !!g.unlists },+ t("{name}: {routing}", { name: g.name, routing: t(n) }));+ // the rows were drawn anew: the keyboard stays on this one's routing+ gList.querySelector(`.rt-group[data-id="${CSS.escape(g.id)}"] .rt-groute`)?.focus({ preventScroll: true });+ }, "Routing", "", "right");+ };+ return b;+ }// groupHandle is a group row's logos, which are also its handle, as an// agent row's logo is (#779): drag it to move the row, click it (or// right-click the row) for Move up and Move down, and Alt+↑/↓ moves itdiff --git a/internal/gui/assets/plugins/routing/i18n.js b/internal/gui/assets/plugins/routing/i18n.jsindex 97549e9ca..e1c7eb188 100644--- a/internal/gui/assets/plugins/routing/i18n.js+++ b/internal/gui/assets/plugins/routing/i18n.js@@ -41,6 +41,7 @@ magpie.strings({"Weight of {name}": "{name} 的权重","A weight is 1 to 1000": "权重为 1 到 1000","{name}: {routing}": "{name}:{routing}",+ "How {name} routes: click to change it": "{name} 的路由方式:点击更改","{n} available": "{n} 个可用","{n} resting": "{n} 个休息中","{n} held": "{n} 个暂不使用",@@ -602,6 +603,7 @@ magpie.strings({"Weight of {name}": "{name} 的權重","A weight is 1 to 1000": "權重為 1 到 1000","{name}: {routing}": "{name}:{routing}",+ "How {name} routes: click to change it": "{name} 的路由方式:點擊更改","{n} available": "{n} 個可用","{n} resting": "{n} 個休息中","{n} held": "{n} 個暫不使用",@@ -1143,6 +1145,7 @@ magpie.strings({"Weight of {name}": "{name} の重み","A weight is 1 to 1000": "重みは 1〜1000 です","{name}: {routing}": "{name}:{routing}",+ "How {name} routes: click to change it": "{name} のルーティング方法:クリックで変更","{n} available": "{n} 個が利用可能","{n} resting": "{n} 個が休止中","{n} held": "{n} 個が停止中",@@ -1695,6 +1698,7 @@ magpie.strings({"Weight of {name}": "Gewicht von {name}","A weight is 1 to 1000": "Ein Gewicht ist 1 bis 1000","{name}: {routing}": "{name}: {routing}",+ "How {name} routes: click to change it": "Wie {name} weiterleitet: zum Ändern klicken","{n} available": "{n} verfügbar","{n} resting": "{n} pausiert","{n} held": "{n} angehalten",diff --git a/internal/gui/assets/plugins/routing/routing.css b/internal/gui/assets/plugins/routing/routing.cssindex 35161c735..55923ad90 100644--- a/internal/gui/assets/plugins/routing/routing.css+++ b/internal/gui/assets/plugins/routing/routing.css@@ -465,6 +465,11 @@ button.rt-session { cursor: pointer; }.rt-group .tag { font-size: 11px; line-height: 18px; padding: 0 8px; border-radius: 999px; box-shadow: inset 0 0 0 1px var(--line); color: var(--muted); white-space: nowrap; }.rt-group .tag.bad { color: var(--red); }.rt-group .tag.idle { opacity: .55; }+/* the routing tag is a pop-up button for the group's routings (#3450) */+.rt-group button.tag.rt-groute { display: inline-flex; align-items: center; gap: 3px; height: auto; margin: 0; padding: 0 6px 0 8px; border: 0; background: transparent; font: inherit; font-size: 11px; line-height: 18px; color: var(--muted); cursor: pointer; transition: color .12s, background .12s; }+.rt-group button.tag.rt-groute svg { flex: none; opacity: .7; }+.rt-group button.tag.rt-groute:hover, .rt-group button.tag.rt-groute.open { color: var(--fg); background: var(--card-2); }+.rt-group button.tag.rt-groute:focus-visible { outline: none; box-shadow: inset 0 0 0 1px var(--accent), 0 0 0 3px color-mix(in srgb, var(--accent) 30%, transparent); }/* a manual group's members on its card: the one picked, marked by a dot */.rt-picks { display: flex; flex-wrap: wrap; gap: 4px; margin-top: 5px; }.rt-pick { display: inline-flex; align-items: center; gap: 5px; max-width: 100%; min-width: 0; height: 22px; padding: 0 8px 0 6px; border: 1px solid var(--line); border-radius: 999px; background: transparent; color: var(--muted); font: inherit; font-size: 11.5px; cursor: pointer; transition: background .12s, color .12s, border-color .12s; }@@ -520,7 +525,8 @@ button.rt-session { cursor: pointer; }.rt-pool .ctl { display: grid; grid-template-columns: auto auto; align-items: center; justify-items: start; gap: 6px 8px; }.rt-pool .lab { display: contents; }.rt-pool .lab small { font-size: 11px; color: var(--muted); }-@media (max-width: 560px) { body:not(.web) .rt-group .tags { display: none; } }+/* narrow, a row keeps only its routing, which switches from here */+@media (max-width: 560px) { body:not(.web) .rt-group .tags > :not(.rt-groute) { display: none; } }@media (max-width: 760px), (pointer: coarse) and (max-width: 1024px) {body.web .rt-group {display: grid; grid-template-columns: auto minmax(0, 1fr) auto; /* the logos as wide as they are */diff --git a/internal/gui/tests/routing-group-strategy.test.cjs b/internal/gui/tests/routing-group-strategy.test.cjsnew file mode 100644index 000000000..a56485c2d--- /dev/null+++ b/internal/gui/tests/routing-group-strategy.test.cjs@@ -0,0 +1,235 @@+// Run with Node's test runner and Playwright on the module path; see README.md.+// A routing group's routing is switched from its row (MoChou, #3450): the+// routing shown on the row is a button that opens the app's own menu of the+// routings the editor offers, the current one checked. Picking one saves the+// group as the editor's Save does with only its routing changed (Manual+// keeps the pick it had; a routing that can't send a rate limited one to the+// back saves sink off), the editor stays shut and nothing on the page moves.+// From the keyboard: Enter opens it on the current one, arrows move, Enter+// picks, Escape shuts it; the focus stays on the row's routing. At a narrow+// window the routing stays on the row. In English, Chinese, Traditional+// Chinese, Japanese and German, light and dark.+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_ROUTING_ASSETS || path.join(__dirname, "../assets"));+const models = [+ { id: "a/sol", name: "sol", providerName: "A", icon: "generic" },+ { id: "b/flash", name: "flash", providerName: "B", icon: "generic" },+ { id: "c/luna", name: "luna", providerName: "C", icon: "generic" },+];+const info = [{ id: "a/sol", ready: true }, { id: "b/flash", ready: true }, { id: "c/luna", ready: true }];+const base = { members: ["a/sol", "b/flash", "c/luna"], ready: true, memberInfo: info, offers: [], shared: [] };++const words = {+ en: { order: "In order", manual: "Manual", weight: "By weight", smart: "Smart", head: "Routing", edit: "Edit",+ names: ["Smart", "In order", "In turn", "Least used", "Weekly pace", "Free first", "By weight", "Manual"],+ tip: "How Auto routes: click to change it", saved: "Auto: Manual" },+ zh: { order: "按顺序", manual: "手动", weight: "按权重", smart: "智能", head: "路由", edit: "编辑",+ tip: "Auto 的路由方式:点击更改", saved: "Auto:手动" },+ "zh-TW": { tip: "Auto 的路由方式:點擊更改" },+ ja: { tip: "Auto のルーティング方法:クリックで変更" },+ de: { tip: "Wie Auto weiterleitet: zum Ändern klicken" },+};++function serve(lang, theme, web, posts) {+ const state = { agents: [{ id: "codex", name: "Codex", path: "/test/codex", fields: [] }], profiles: [], settings: { lang, theme } };+ const g = {+ hand: { ...base, id: "hand", name: "Hand", routing: "manual", pick: "b/flash", picked: "b/flash", affinity: "session" },+ auto: { ...base, id: "auto", name: "Auto", routing: "order", sink: true, affinity: "turn", rules: [{ use: "c/luna", tokens: 100000 }] },+ };+ const groups = () => ({ models, pools: [], groups: [+ // filler above, so that the reader scrolls down to the groups+ ...Array.from({ length: 14 }, (_, i) => ({ ...base, id: "f" + i, name: "Filler " + i, routing: "" })),+ g.hand, g.auto,+ ] });+ return async (r) => {+ const url = new URL(r.request().url());+ const json = (data) => r.fulfill({ json: data });+ if (url.pathname === "/boot.js") return r.fulfill({ contentType: "text/javascript", body: `window.bootPrefs = {lang:"${lang}",theme:"${theme}",web:${web}};` });+ if (url.pathname === "/wails/runtime.js") return r.fulfill({ contentType: "text/javascript", body: "export const Window = {};" });+ if (url.pathname === "/api/state") return json(state);+ if (url.pathname === "/api/plugins") return json({ plugins: [] });+ if (url.pathname === "/api/gateway/trace") {+ if (url.searchParams.get("wait")) return new Promise(() => {}); // nothing more comes+ return json({ mine: true, now: new Date().toISOString(), seq: 1, totals: { requests: 0, rerouted: 0, errors: 0 }, routes: [] });+ }+ if (url.pathname === "/api/gateway/history") return json({ cut: false, days: [], routes: [] });+ if (url.pathname === "/api/groups") return json(groups());+ if (url.pathname.startsWith("/api/groups/")) {+ const body = JSON.parse(r.request().postData() || "{}");+ posts.push({ path: url.pathname, body });+ if (url.pathname === "/api/groups/save" && g[body.id]) {+ // as provider.cleanGroup: Manual with no pick takes the first member+ const pick = body.routing === "manual" && !body.pick ? body.members[0] : body.pick;+ g[body.id] = { ...g[body.id], ...body, pick, picked: body.routing === "manual" ? pick : undefined };+ }+ return json(groups());+ }+ if (url.pathname === "/api/providers") return json({ providers: [], presets: [], excluded: [], gateway: { running: true, window: true, url: "http://127.0.0.1:3999" } });+ 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 r.fulfill({ body: await fs.readFile(file), contentType });+ };+}++async function open(t, engine, { lang, theme = "light", web = true, width = 1100 }) {+ const browser = await (engine === "webkit" ? webkit.launch() : chromium.launch({ channel: "chromium" }));+ t.after(() => browser.close());+ const page = await (await browser.newContext({ viewport: { width, height: 700 } })).newPage();+ page.setDefaultTimeout(5000);+ const errors = [], posts = [];+ page.on("pageerror", (e) => errors.push(e.message));+ await page.route("**/*", serve(lang, theme, web, posts));+ await page.goto("http://magpie.test/?view=routing");+ await page.locator(".rt-group", { hasText: "Auto" }).waitFor();+ return { page, errors, posts };+}++// the reader wheels the row into the middle of the view (code that scrolls+// is put back: only the reader moves the view)+async function wheelTo(page, row, width) {+ const dy = await row.evaluate((g) => { const v = document.querySelector("#view-routing");+ return Math.round(g.getBoundingClientRect().top - v.getBoundingClientRect().top - v.clientHeight / 2); });+ await page.mouse.move(width / 2, 400);+ await page.mouse.wheel(0, dy);+ await page.waitForTimeout(400);+}++const shot = async (page, name) => {+ if (!process.env.ARTIFACT_DIR) return;+ await fs.mkdir(process.env.ARTIFACT_DIR, { recursive: true });+ await page.waitForTimeout(500); // the menu's opening, done+ await page.screenshot({ path: path.join(process.env.ARTIFACT_DIR, name + ".png") });+};++for (const engine of (process.env.BROWSER ? [process.env.BROWSER] : ["chromium", "webkit"])) {+ for (const lang of ["en", "zh"]) {+ const w = words[lang];+ for (const theme of ["light", "dark"]) {+ test(`${engine} ${lang} ${theme}: a group's routing is switched from its row`, async (t) => {+ const { page, errors, posts } = await open(t, engine, { lang, theme });+ const card = () => page.locator(".rt-group", { hasText: "Auto" });+ const btn = () => card().locator("button.rt-groute");+ assert.equal(await btn().count(), 1, "the row's routing is a button");+ assert.equal(await btn().textContent(), w.order);+ assert.equal(await btn().getAttribute("aria-haspopup"), "menu");+ assert.equal(await btn().getAttribute("aria-expanded"), "false");+ assert.equal(await btn().getAttribute("title"), w.tip);+ assert.equal(await page.locator(".rt-group select, select").count(), 0, "no native select");++ // the reader scrolls the card to the middle, then opens its routing+ const view = page.locator("#view-routing");+ const dy = await card().evaluate((g) => { const v = document.querySelector("#view-routing");+ return Math.round(g.getBoundingClientRect().top - v.getBoundingClientRect().top - v.clientHeight / 2); });+ await page.mouse.move(550, 400);+ await page.mouse.wheel(0, dy);+ await page.waitForTimeout(400);+ const at = () => view.evaluate((v) => v.scrollTop + "|" + Math.round([...document.querySelectorAll(".rt-group")].find((r) => r.dataset.id === "auto").getBoundingClientRect().top));+ const before = await at();+ assert.ok(parseInt(before) > 200, `the view must be scrolled down to the group (${before})`);+ await btn().click();+ const menu = page.locator(".proto-menu");+ await menu.waitFor();+ assert.equal(await btn().getAttribute("aria-expanded"), "true");+ assert.equal(await menu.locator(".pm-head").textContent(), w.head);+ const items = menu.locator(".pm-item");+ if (w.names) assert.deepEqual(await items.locator(".pm-name").allTextContents(), w.names);+ assert.equal(await items.count(), 8);+ assert.deepEqual(await menu.locator('.pm-item[aria-checked="true"] .pm-name').allTextContents(), [w.order]);+ assert.equal(await page.locator(".rt-gedit").count(), 0, "opening the menu opens no editor");+ // the menu sits inside the window+ const box = await menu.boundingBox();+ assert.ok(box.x >= 0 && box.x + box.width <= 1100 && box.y >= 0 && box.y + box.height <= 700, JSON.stringify(box));+ await shot(page, `${engine}-${lang}-${theme}-menu`);++ // Manual: saved with only the routing changed, sink off, the+ // group's other fields as they were; nothing moves+ await items.filter({ hasText: w.manual }).click();+ await page.waitForFunction(() => document.querySelector('.rt-group[data-id="auto"] .rt-picks'));+ assert.equal(await at(), before, "the pick moved nothing");+ assert.equal(await page.locator(".proto-menu").count(), 0);+ assert.equal(await page.locator(".rt-gedit").count(), 0, "the editor stays shut");+ assert.equal(posts.length, 1);+ assert.equal(posts[0].path, "/api/groups/save");+ const b = posts[0].body;+ assert.deepEqual({ id: b.id, name: b.name, routing: b.routing, pick: b.pick, members: b.members, affinity: b.affinity, sink: b.sink, rules: b.rules },+ { id: "auto", name: "Auto", routing: "manual", pick: "", members: ["a/sol", "b/flash", "c/luna"], affinity: "turn", sink: false, rules: [{ use: "c/luna", tokens: 100000 }] });+ assert.equal(await btn().textContent(), w.manual);+ await page.waitForFunction((s) => document.documentElement.innerText.includes(s), w.saved || words.en.saved);+ await shot(page, `${engine}-${lang}-${theme}-row`);++ // the one checked already saves nothing+ await btn().click();+ await page.locator('.proto-menu .pm-item[aria-checked="true"]', { hasText: w.manual }).click();+ await page.waitForTimeout(200);+ assert.equal(posts.length, 1);++ // the keyboard: Hand's routing, Enter opens on Manual, ↑ is By+ // weight, Enter saves it with Hand's pick kept+ const hand = page.locator('.rt-group[data-id="hand"] button.rt-groute');+ await hand.focus();+ await page.keyboard.press("Enter");+ await menu.waitFor();+ assert.equal(await page.evaluate(() => document.activeElement.querySelector(".pm-name")?.textContent), w.manual);+ await page.keyboard.press("Escape");+ assert.equal(await page.locator(".proto-menu").count(), 0);+ assert.equal(await page.evaluate(() => document.activeElement.classList.contains("rt-groute")), true);+ await page.keyboard.press("Enter");+ await menu.waitFor();+ await page.keyboard.press("ArrowUp");+ assert.equal(await page.evaluate(() => document.activeElement.querySelector(".pm-name")?.textContent), w.weight);+ await page.keyboard.press("Enter");+ await page.waitForFunction(() => !document.querySelector('.rt-group[data-id="hand"] .rt-picks'));+ assert.equal(posts.length, 2);+ assert.deepEqual({ id: posts[1].body.id, routing: posts[1].body.routing, pick: posts[1].body.pick }, { id: "hand", routing: "weight", pick: "b/flash" });+ await page.waitForFunction(() => document.activeElement?.closest('.rt-group[data-id="hand"]') && document.activeElement.classList.contains("rt-groute"));+ assert.equal(await page.locator(".rt-gedit").count(), 0);+ assert.deepEqual(errors, []);+ });+ }+ }++ // narrow windows: the app's window at 520, where the row's other tags+ // give way, and the web page at a phone's width+ for (const [web, width] of [[false, 520], [true, 390]]) {+ test(`${engine}: at ${width}px (${web ? "web" : "window"}) a group's routing stays on its row`, async (t) => {+ const { page, errors, posts } = await open(t, engine, { lang: "en", web, width });+ const card = page.locator('.rt-group[data-id="auto"]');+ await wheelTo(page, card, width);+ const btn = card.locator("button.rt-groute");+ assert.ok(await btn.isVisible(), "the routing is on the row");+ const r = await btn.boundingBox();+ assert.ok(r.x >= 0 && r.x + r.width <= width, JSON.stringify(r));+ assert.equal(await page.evaluate(() => document.documentElement.scrollWidth <= innerWidth), true, "no sideways scroll");+ if (!web) assert.equal(await card.locator(".tags > .tag:not(.rt-groute)").evaluateAll((ts) => ts.filter((x) => x.offsetParent).length), 0, "the other tags give way");+ await btn.click();+ const menu = page.locator(".proto-menu");+ await menu.waitFor();+ const box = await menu.boundingBox();+ assert.ok(box.x >= 0 && box.x + box.width <= width, JSON.stringify(box));+ await menu.locator(".pm-item", { hasText: "Smart" }).click();+ await page.waitForFunction(() => document.querySelector('.rt-group[data-id="auto"] .rt-groute')?.textContent === "Smart");+ assert.equal(posts.at(-1).body.routing, "");+ assert.deepEqual(errors, []);+ });+ }++ // every language has the button's words+ for (const lang of ["zh-TW", "ja", "de"]) {+ test(`${engine} ${lang}: the row's routing says what it does`, async (t) => {+ const { page, errors } = await open(t, engine, { lang });+ const btn = page.locator('.rt-group[data-id="auto"] button.rt-groute');+ await wheelTo(page, page.locator('.rt-group[data-id="auto"]'), 1100);+ assert.equal(await btn.getAttribute("title"), words[lang].tip);+ await btn.click();+ await page.locator(".proto-menu").waitFor();+ assert.equal(await page.locator(".proto-menu .pm-item").count(), 8);+ assert.deepEqual(errors, []);+ });+ }+}