Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.
routing: a request held before routing says so, not "0 on" and one account
yetonec5cdb043e60a
diff --git a/internal/gateway/codex_backend.go b/internal/gateway/codex_backend.goindex 47f2094de..da56f5a9b 100644--- a/internal/gateway/codex_backend.go+++ b/internal/gateway/codex_backend.go@@ -102,6 +102,10 @@ func (s *Server) codexBackend(w http.ResponseWriter, r *http.Request) {writeError(w, provider.Responses, 400, err.Error())return}+ // the route that shows it while it is held before routing names+ // it, as handle's and gemini's do (Jason on Discord: a held Codex+ // turn showed as no model, "magpie · 0 on")+ noteAsked(r.Context(), model)// a turn of the conversation's own: the model its side calls may// follow (codexFollowTo)kind := requestCallKind(r.Header, requestSessionMetadata(r.Header, body))diff --git a/internal/gateway/unrouted_test.go b/internal/gateway/unrouted_test.goindex 88bc1f385..88e504268 100644--- a/internal/gateway/unrouted_test.go+++ b/internal/gateway/unrouted_test.go@@ -519,3 +519,60 @@ func TestUnroutedShownAsItsCaller(t *testing.T) {t.Fatalf("answered %d %q %v", r.code, r.body, r.err)}}++// Jason on Discord: a Codex turn on ChatGPT Pro accounts, held while it+// was masked, showed on the Routing page as "magpie · 0 on" over "Nothing+// could take ." — the route that shows a held request had no model,+// because Codex's own path never told the watch what it asked for, as+// the Chat, Responses, Messages and Gemini paths do. It names it.+func TestUnroutedCodexPathShowsItsModel(t *testing.T) {+ unroutedLimits(t, 20*time.Millisecond, time.Hour)+ s, _ := slowEyed(t, 0)+ if err := settings.Save(settings.Settings{Redact: true}); err != nil {+ t.Fatal(err)+ }+ withoutMasker(t)+ m := gatedMasker{gate: make(chan struct{})}+ var once sync.Once+ open := func() { once.Do(func() { close(m.gate) }) }+ t.Cleanup(open)+ t.Cleanup(gwmw.Mask(m))+ srv := httptest.NewServer(s.Handler())+ t.Cleanup(srv.Close)+ t.Cleanup(open) // before srv.Close, which waits on the held request+ got := make(chan int, 1)+ go func() {+ c := &http.Client{Timeout: 30 * time.Second}+ resp, err := c.Post(srv.URL+CodexPath+"/responses", "application/json", strings.NewReader(`{"model":"probe/text","input":"hi"}`))+ if err != nil {+ got <- 0+ return+ }+ io.Copy(io.Discard, resp.Body)+ resp.Body.Close()+ got <- resp.StatusCode+ }()+ u := watchedHold(t, s)+ deadline := time.Now().Add(10 * time.Second)+ for {+ u.f.mu.Lock()+ shown := u.shown+ u.f.mu.Unlock()+ if shown != nil {+ break+ }+ if time.Now().After(deadline) {+ t.Fatal("the held Codex request never showed on the Routing page")+ }+ time.Sleep(5 * time.Millisecond)+ }+ if rs := routesOf(s, "probe/text"); len(rs) != 1 || rs[0].Done || rs[0].Provider != "magpie" {+ t.Fatalf("the held Codex request is shown without the model it asked for: %+v", s.Trace(context.Background(), 0, 0).Routes)+ }+ open()+ select {+ case <-got:+ case <-time.After(15 * time.Second):+ t.Fatal("never answered once masked")+ }+}diff --git a/internal/gui/assets/plugins/routing/client.js b/internal/gui/assets/plugins/routing/client.jsindex ee184cb40..cb18b1701 100644--- a/internal/gui/assets/plugins/routing/client.js+++ b/internal/gui/assets/plugins/routing/client.js@@ -680,10 +680,20 @@ function routingPage(part) {? t("{who} goes first: of those alike, its wallet has the most left — {n}, where {other} has {m}.", { who: who(f), n: balText(f), other: who(o), m: balText(o) }) : null;}+ // why a request has no one weighed for it: magpie holds it before+ // routing (masking it, or still reading it), or nothing took it+ function noneWhy(r) {+ if (!r.done) return r.phase === "redact"+ ? t("magpie is masking this request before routing it (Settings › Privacy), so who takes it isn't picked yet.")+ : t("magpie hasn't routed this request yet, so who takes it isn't picked yet.");+ if (r.error) return t("Nothing took this request: {error}", { error: r.error });+ return t("Nothing could take {model}.", { model: r.model });+ }+// why routing put the first where it didfunction firstWhy(r) {const f = r.order[0];- if (!f) return t("Nothing could take {model}.", { model: r.model });+ if (!f) return noneWhy(r);const w = who(f);if (r.sealedTask && r.leadAccount === f.id) return t("{who} goes first: it answered the parent agent and may be needed to read this encrypted task.", { who: w });if (r.compaction && r.order.length === 1) return t("{who} compacted this conversation natively, and only it can read that compaction, so the conversation stays on it: other accounts aren't asked. Start a new conversation to use them.", { who: w });@@ -2326,19 +2336,25 @@ function routingPage(part) {const m = modeOf(routing);const on = r.order.filter((x) => !x.fallback).length;const pool = !g && f ? poolOf(f.provider) : null;- const lone = !g && on <= 1 && !pool;+ // none weighed: a request magpie holds before routing it (masked+ // first, or still read), or one nothing took. It says so, not "0 on"+ // over the one-account hint (Jason on Discord: a held Codex turn read+ // "magpie · 0 on" and "only one account is on")+ const none = !r.order.length;+ const lone = !g && on === 1 && !pool;// the head is told again every second: a chip whose text node is// swapped while it is pressed gets no click in WebKit (#2151), so// only what changed is writtensetText(chip, t(m[0]));- chip.hidden = lone;+ chip.hidden = lone || (none && !g);goTo(chip, g ? "group:" + g.id : pool ? "pool:" + f.provider : "", g ? g.name : f?.name || r.provider);hubText();- const name = g ? g.name : f?.name || r.provider, tail = (g ? " · " + t("routing group") : "") + " · " + t(on === 1 ? "one on" : "{n} on", { n: on })+ const name = g ? g.name : f?.name || r.provider, tail = (g ? " · " + t("routing group") : "")+ + (none ? (r.done ? "" : " · " + waitWord(r)) : " · " + t(on === 1 ? "one on" : "{n} on", { n: on }))+ (many > 1 ? " · " + t("{n} agents at once", { n: many }) : "");if (what.childElementCount !== 2 || what.firstChild.textContent !== name || what.lastChild.textContent !== tail) what.replaceChildren(el("b", "", name), el("span", "", tail));// keys that read their own windows are weighed as accounts are- setText(mode, lone ? t(LONE) : g && routing === "order" ? t(GROUP_ORDER) : g && routing === "weight" ? t(GROUP_WEIGHT) : t(!routing && f?.kind === "key" && !r.order.some((x) => x.known) && !g ? KEYS_SMART : m[1]));+ setText(mode, none ? noneWhy(r) : lone ? t(LONE) : g && routing === "order" ? t(GROUP_ORDER) : g && routing === "weight" ? t(GROUP_WEIGHT) : t(!routing && f?.kind === "key" && !r.order.some((x) => x.known) && !g ? KEYS_SMART : m[1]));}// goTo makes what names a routing a way to where it is set: a provider's// own under Several accounts or keys, a group's its carddiff --git a/internal/gui/assets/plugins/routing/i18n.js b/internal/gui/assets/plugins/routing/i18n.jsindex 75011d0b8..5d3c207d0 100644--- a/internal/gui/assets/plugins/routing/i18n.js+++ b/internal/gui/assets/plugins/routing/i18n.js@@ -2,6 +2,9 @@// kernel adds them to i18n.js's (magpie.strings).magpie.strings({zh: {+ "magpie is masking this request before routing it (Settings › Privacy), so who takes it isn't picked yet.": "magpie 正在给这个请求脱敏(设置 › 隐私),脱敏完才路由,所以还没选出由谁处理。",+ "magpie hasn't routed this request yet, so who takes it isn't picked yet.": "magpie 还没开始路由这个请求,所以还没选出由谁处理。",+ "Nothing took this request: {error}": "没有谁处理这个请求:{error}","Go to the routing groups, below the requests": "跳到请求下方的路由组","Filter, or type an agent's name…": "筛选,或输入 Agent 名称…","the name its User-Agent begins with": "User-Agent 开头的名称",@@ -579,6 +582,9 @@ magpie.strings({"{h} h {m} min": "{h} 小时 {m} 分钟",},"zh-TW": {+ "magpie is masking this request before routing it (Settings › Privacy), so who takes it isn't picked yet.": "magpie 正在為這個請求脫敏(設定 › 隱私),脫敏完才路由,所以還沒選出由誰處理。",+ "magpie hasn't routed this request yet, so who takes it isn't picked yet.": "magpie 還沒開始路由這個請求,所以還沒選出由誰處理。",+ "Nothing took this request: {error}": "沒有誰處理這個請求:{error}","Go to the routing groups, below the requests": "跳到請求下方的路由組","Filter, or type an agent's name…": "篩選,或輸入 Agent 名稱…","the name its User-Agent begins with": "User-Agent 開頭的名稱",@@ -1156,6 +1162,9 @@ magpie.strings({"{h} h {m} min": "{h} 小時 {m} 分鐘",},ja: {+ "magpie is masking this request before routing it (Settings › Privacy), so who takes it isn't picked yet.": "magpie はルーティングの前にこのリクエストをマスクしています(設定 › プライバシー)。誰が処理するかはまだ決まっていません。",+ "magpie hasn't routed this request yet, so who takes it isn't picked yet.": "magpie はまだこのリクエストをルーティングしていないため、誰が処理するかはまだ決まっていません。",+ "Nothing took this request: {error}": "このリクエストを処理したものはありません: {error}","Go to the routing groups, below the requests": "リクエストの下にあるルーティンググループへ移動","Filter, or type an agent's name…": "絞り込み、またはエージェント名を入力…","the name its User-Agent begins with": "User-Agent の先頭の名前",@@ -1733,6 +1742,9 @@ magpie.strings({"These routing groups will no longer be available to agents.": "これらのルーティンググループはエージェントから利用できなくなります。",},de: {+ "magpie is masking this request before routing it (Settings › Privacy), so who takes it isn't picked yet.": "magpie maskiert diese Anfrage vor der Weiterleitung (Einstellungen › Datenschutz), daher steht noch nicht fest, wer sie übernimmt.",+ "magpie hasn't routed this request yet, so who takes it isn't picked yet.": "magpie hat diese Anfrage noch nicht weitergeleitet, daher steht noch nicht fest, wer sie übernimmt.",+ "Nothing took this request: {error}": "Niemand hat diese Anfrage übernommen: {error}","Go to the routing groups, below the requests": "Zu den Weiterleitungsgruppen unter den Anfragen springen","Filter, or type an agent's name…": "Filtern oder Namen eines Agenten eingeben…","the name its User-Agent begins with": "der Name, mit dem sein User-Agent beginnt",diff --git a/internal/gui/tests/routing-held-request.test.cjs b/internal/gui/tests/routing-held-request.test.cjsnew file mode 100644index 000000000..980de8e8a--- /dev/null+++ b/internal/gui/tests/routing-held-request.test.cjs@@ -0,0 +1,121 @@+// Run with Node's test runner and Playwright on the module path; see README.md.+// Jason on Discord: "多个账号提示路由失败,保留一个账号也会出现这种情况". A+// Codex turn magpie held while it was masked, before routing it, showed+// on the Routing page as "magpie · 0 on" over the one-account hint ("only+// one account or key is on") and "Nothing could take ." — a held request+// has no one weighed for it yet, and the card read it as a provider with+// nothing on. Held, it says it is being masked (or routed) and that who+// takes it isn't picked yet; one nothing took says why. Neither shows a+// count of 0 or the one-account hint. In every language, both engines.+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 now = new Date();+const ago = (minutes) => new Date(now.getTime() - minutes * 60e3).toISOString();++const routes = {+ // held before routing while masked: what the gateway's watch shows+ masking: { id: 1, seq: 1, time: ago(0.3), agent: "AirbuildEnvironment", model: "gpt-6-astra", provider: "magpie", phase: "redact", done: false, order: [], tries: [] },+ // held, not masking: still read+ routing: { id: 1, seq: 1, time: ago(0.3), agent: "AirbuildEnvironment", model: "", provider: "magpie", done: false, order: [], tries: [] },+ // given up on with nobody weighed: its error says why+ ended: { id: 1, seq: 1, time: ago(1), agent: "AirbuildEnvironment", model: "gpt-6-astra", provider: "magpie", done: true, status: 504, ms: 120000,+ error: "magpie held this request for 2m0s without routing it to any provider", order: [], tries: [] },+};++function serve(lang, scene) {+ return async (request) => {+ const url = new URL(request.request().url());+ const json = (data) => request.fulfill({ json: data });+ if (url.pathname === "/boot.js") return request.fulfill({ contentType: "text/javascript", body: `window.bootPrefs = {lang:"${lang}",theme:"light",web:true};` });+ if (url.pathname === "/wails/runtime.js") return request.fulfill({ contentType: "text/javascript", body: "export const Window = {};" });+ if (url.pathname === "/api/state") return json({ agents: [{ id: "codex", name: "Codex", path: "/test/config.toml", fields: [] }], profiles: [], settings: { lang, theme: "light" } });+ if (url.pathname === "/api/gateway/trace") {+ if (url.searchParams.get("wait")) return new Promise(() => {}); // nothing more comes+ return json({ mine: true, now: now.toISOString(), seq: 1, totals: { requests: 0 }, routes: [routes[scene]], ids: [1] });+ }+ if (url.pathname === "/api/gateway/history") return json({ cut: false, days: [], routes: [] });+ if (url.pathname === "/api/groups") return json({ models: [], groups: [], pools: [] });+ if (url.pathname === "/api/providers") return json({ providers: [], presets: [], excluded: [], gateway: { running: true, window: true } });+ 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 request.fulfill({ body: await fs.readFile(file), contentType });+ };+}++// the words, as each language says them+const said = {+ masking: {+ en: "magpie is masking this request before routing it (Settings › Privacy), so who takes it isn't picked yet.",+ zh: "magpie 正在给这个请求脱敏(设置 › 隐私),脱敏完才路由,所以还没选出由谁处理。",+ "zh-TW": "magpie 正在為這個請求脫敏(設定 › 隱私),脫敏完才路由,所以還沒選出由誰處理。",+ ja: "magpie はルーティングの前にこのリクエストをマスクしています(設定 › プライバシー)。誰が処理するかはまだ決まっていません。",+ de: "magpie maskiert diese Anfrage vor der Weiterleitung (Einstellungen › Datenschutz), daher steht noch nicht fest, wer sie übernimmt.",+ },+ routing: {+ en: "magpie hasn't routed this request yet, so who takes it isn't picked yet.",+ zh: "magpie 还没开始路由这个请求,所以还没选出由谁处理。",+ "zh-TW": "magpie 還沒開始路由這個請求,所以還沒選出由誰處理。",+ ja: "magpie はまだこのリクエストをルーティングしていないため、誰が処理するかはまだ決まっていません。",+ de: "magpie hat diese Anfrage noch nicht weitergeleitet, daher steht noch nicht fest, wer sie übernimmt.",+ },+ ended: {+ en: "Nothing took this request: " + routes.ended.error,+ zh: "没有谁处理这个请求:" + routes.ended.error,+ "zh-TW": "沒有誰處理這個請求:" + routes.ended.error,+ ja: "このリクエストを処理したものはありません: " + routes.ended.error,+ de: "Niemand hat diese Anfrage übernommen: " + routes.ended.error,+ },+};+// what the head says after the name while it is held+const wait = {+ masking: { en: "masking…", zh: "脱敏中…", "zh-TW": "脫敏中…", ja: "マスク中…", de: "maskiert…" },+ routing: { en: "routing…", zh: "路由中…", "zh-TW": "路由中…", ja: "ルーティング中…", de: "leitet weiter…" },+};+// the words the card must not say of a request nobody is weighed for+const zeroOn = { en: "0 on", zh: "启用 0 个", "zh-TW": "啟用 0 個", ja: "0 個有効", de: "0 aktiv" };+const lone = {+ en: "Only one account or key is on for this",+ zh: "这里只开了一个账号或 Key",+ "zh-TW": "這裡只開了一個帳號或 Key",+ ja: "有効なアカウントやキーが 1 つだけ",+ de: "Hier ist nur ein Konto oder Schlüssel aktiv",+};++for (const engine of (process.env.BROWSER ? [process.env.BROWSER] : ["chromium", "webkit"])) {+ for (const lang of ["en", "zh", "zh-TW", "ja", "de"]) {+ for (const scene of ["masking", "routing", "ended"]) {+ for (const width of [1100, 420]) {+ test(`${engine} ${lang} ${width}px ${scene}: a request nobody is weighed for says why, not "0 on" and one account`, async (t) => {+ const browser = await (engine === "webkit" ? webkit.launch() : chromium.launch({ channel: "chromium" }));+ t.after(() => browser.close());+ const page = await browser.newPage({ viewport: { width, height: 700 }, reducedMotion: "reduce" });+ page.setDefaultTimeout(5000);+ const errors = [];+ page.on("pageerror", (error) => errors.push(error.message));+ await page.route("**/*", serve(lang, scene));+ await page.goto("http://magpie.test/?view=routing");+ await page.locator(".rt-req").first().waitFor();+ const want = said[scene][lang];+ await page.waitForFunction((s) => document.querySelector(".rt-mode")?.textContent.trim() === s, want);+ const head = (await page.locator(".rt-what").textContent()).trim();+ assert.ok(!head.includes(zeroOn[lang]), `the head counts none on: ${head}`);+ if (wait[scene]) assert.ok(head.endsWith(wait[scene][lang]), `the head says it is held: ${head}`);+ assert.equal(await page.locator(".rt-hub i").isHidden(), true, "the chip names no routing");+ // the story says the same, where it said "Nothing could take ."+ const why = page.locator(".rt-steps li.why").first();+ await why.waitFor();+ assert.equal((await why.textContent()).trim(), want);+ const body = await page.locator("#view-routing").innerText();+ assert.ok(!body.includes(lone[lang]), "the one-account hint is not shown");+ assert.deepEqual(errors, []);+ });+ }+ }+ }+}