Skip to content

Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.

gui: a connected agent's changes read before → now, not as disconnecting undoes them

yetone39fed471cc55
diff --git a/internal/gui/assets/app.css b/internal/gui/assets/app.css
index 31f2fe9f2..facc964ef 100644
--- a/internal/gui/assets/app.css
+++ b/internal/gui/assets/app.css
@@ -4228,6 +4228,9 @@ body.window .row + .row.agent.conn > .who { min-height: 41px; } /* the line abov
.ag-diff-line .ind { text-decoration: none; }
.ag-diff-line.del code .t { text-decoration: line-through; text-decoration-color: color-mix(in srgb, var(--red) 45%, transparent); }
.ag-diff-line.back .op { color: var(--green); }
+/* the row's view, before → now: what connecting put in, and what it replaced */
+.ag-diff-line.add .op, .ag-diff-line.add code { color: var(--green); }
+.ag-diff-line.old .op, .ag-diff-line.old code { color: var(--red); }
.ag-tag { flex: none; padding: 0 6px; border-radius: 4px; background: var(--pill); font-family: inherit; font-size: 10.5px; line-height: 16px; color: var(--muted); }
.ag-tag.del { background: color-mix(in srgb, var(--red) 12%, transparent); color: var(--red); }
/* 短窗口只滚动正文,不压缩预览所在的行,以免与下方说明重叠。 */
diff --git a/internal/gui/assets/app.js b/internal/gui/assets/app.js
index 67a59a602..4ddbda09a 100644
--- a/internal/gui/assets/app.js
+++ b/internal/gui/assets/app.js
@@ -1207,9 +1207,7 @@ function fillMenuButton(b, a) {
b.replaceChildren(...(k ? [k] : []));
b.append(icon("magpie"));
b.append(el("span", "v" + (c.shown ? "" : " empty"), menuSaid(c)));
- const ch = el("span", "chev");
- ch.append(svg(CHEV, 11, 1.7));
- b.append(ch);
+ b.append(el("span", "chev", svg(CHEV, 11, 1.7)));
const pick = t("Pick which models {agent} lists", { agent: a.name });
b.title = pick + "\n" + t("{agent} reads its model list as it starts: quit and reopen it after a change", { agent: a.name });
b.setAttribute("aria-label", pick + ": " + menuSaid(c));
@@ -1383,9 +1381,7 @@ function expandLink(a) {
b.setAttribute("aria-expanded", String(open));
b.append(el("span", "", open ? t("Collapse") : a.id === "claude" ? t("Tiers") : a.models && !listsMenu(a) ? t("Models {n}", { n: a.models.shown }) : t("Details")));
if (!open) {
- const c = el("span", "chev");
- c.append(svg(CHEV_R, 10, 1.6));
- b.append(c);
+ b.append(el("span", "chev", svg(CHEV_R, 10, 1.6)));
}
b.onclick = (e) => {
e.stopPropagation();
@@ -1439,9 +1435,7 @@ function startButton(a, f, fieldBtn) {
const b = fieldBtn(f, "ag-start");
if (!a.wired && !a.native && f.key !== "model" && !f.options.some((o) => o.direct)) {
b.replaceChildren(el("span", "v empty", t("Pick a model")));
- const c = el("span", "chev");
- c.append(svg(CHEV, 11, 1.7));
- b.append(c);
+ b.append(el("span", "chev", svg(CHEV, 11, 1.7)));
b.title = t("Pick one of magpie's models: {agent} is connected and starts on it", { agent: a.name });
b.onclick = (ev) => openPicker(a, f, b, ev, (o) => !!o.ref);
} else if (!a.wired) {
@@ -2011,9 +2005,7 @@ function connectPanel(a, { fields, fieldBtn }) {
const pick = el("button", "ag-quiet");
pick.type = "button";
pick.append(el("span", "", t("Pick")));
- const c = el("span", "chev");
- c.append(svg(CHEV_R, 10, 1.6));
- pick.append(c);
+ pick.append(el("span", "chev", svg(CHEV_R, 10, 1.6)));
pick.onclick = (ev) => openAgentModels(a, pick, ev);
holdAgentModels(a, pick);
chips.append(pick);
@@ -2081,9 +2073,7 @@ function connectPanel(a, { fields, fieldBtn }) {
view.classList.toggle("open", !diff.hidden);
};
view.append(el("span", "", t("View")));
- const vc = el("span", "chev");
- vc.append(svg(CHEV_R, 10, 1.6));
- view.append(vc);
+ view.append(el("span", "chev", svg(CHEV_R, 10, 1.6)));
const off = el("button", "ag-quiet red", t("Disconnect and restore"));
off.type = "button";
off.onclick = () => askDisconnect(a);
@@ -2111,29 +2101,29 @@ async function loadPreview(a) {
return { changes: previews[a.id], revision: typeof r?.revision === "string" ? r.revision : "" };
}
-// changesList: what disconnecting does to each file, line by line
-function changesList(changes) {
+// changesList: what connecting changed (− old, + new), or with back
+// what disconnecting does
+function changesList(changes, back) {
const box = el("div", "ag-diff");
for (const c of changes) {
const f = el("div", "ag-diff-file");
- const h = el("div", "ag-diff-path");
+ const h = el("div", "ag-diff-path"), gone = !c.removed == !back;
h.append(el("span", "", c.path));
- if (c.removed) h.append(el("span", "ag-tag del", t("Deleted")));
- if (c.created) h.append(el("span", "ag-tag", t("Created")));
+ if (c.removed || c.created) h.append(el("span", gone ? "ag-tag del" : "ag-tag", t(gone ? "Deleted" : "Created")));
f.append(h);
const line = (l) => {
- const r = el("div", "ag-diff-line " + (l.op === "-" ? "del" : "back"));
+ const op = back ? (l.op == "-" ? "del" : "back") : l.op == "+" ? "add" : "old";
// the indent shows where it was, and isn't struck through
- const code = el("code"), ind = l.text.match(/^\s*/)[0];
+ const r = el("div", "ag-diff-line " + op), code = el("code"), ind = l.text.match(/^\s*/)[0];
code.append(el("span", "ind", ind), el("span", "t", l.text.slice(ind.length)));
- r.append(el("span", "op", l.op === "-" ? "−" : "↺"), code);
- if (l.op !== "-") r.append(el("span", "ag-tag", t("value before connecting")));
- if (l.op === "~" && l.was) r.title = t("Now: {line}", { line: l.was });
+ r.append(el("span", "op", op == "back" ? "↺" : op == "add" ? "+" : "−"), code);
+ if (op == "back") r.append(el("span", "ag-tag", t("value before connecting")));
+ if (back && l.was) r.title = t("Now: {line}", { line: l.was });
return r;
};
// a list magpie wrote whole (Claude Code's modelPicker, Codex's
// catalog) is a few lines and the rest on asking
- const lines = c.lines || [], FEW = 8;
+ const lines = (c.lines || []).flatMap((l) => back ? l : l.op == "~" ? [{ text: l.text }, { op: "+", text: l.was }] : { op: l.op == "-" ? "+" : "", text: l.text }), FEW = 8;
f.append(...lines.slice(0, FEW).map(line));
if (lines.length > FEW + 2) {
const rest = el("button", "ag-diff-more", t("{n} more lines", { n: lines.length - FEW }));
@@ -2161,7 +2151,7 @@ function askDisconnect(a) {
const said = el("p", "lib-confirm", t("magpie takes out everything it wrote into {agent}'s config — its endpoint, key, models and effort — and puts back the settings {agent} had before. magpie's providers and accounts stay as they are.", { agent: a.name }));
const body = el("div", "ag-diff-wrap");
const show = (changes) => {
- if (changes?.length) body.replaceChildren(changesList(changes));
+ if (changes?.length) body.replaceChildren(changesList(changes, 1));
else body.replaceChildren(said);
};
if (previews[a.id]) show(previews[a.id]);
@@ -2521,9 +2511,7 @@ function paintInstalls() {
head.type = "button";
head.setAttribute("aria-expanded", String(open));
head.dataset.unrolls = ""; // it stays put, and its commands open beneath it
- const chev = el("span", "chev");
- chev.append(svg(CHEV, 10, 1.8));
- head.append(el("span", "", t("Install another agent ({n})", { n: items.length })), chev);
+ head.append(el("span", "", t("Install another agent ({n})", { n: items.length })), el("span", "chev", svg(CHEV, 10, 1.8)));
head.onclick = (e) => {
e.stopPropagation();
installsOpen = !open;
@@ -2597,9 +2585,7 @@ function importButton(a) {
? t("{name} has magpie as a provider · click to add it again", { name: a.name })
: t("Opens {name} to add magpie as a provider — confirm it there", { name: a.name });
b.append(icon("magpie"), el("span", "v" + (a.added ? "" : " empty"), a.added ? "magpie" : t("Add magpie")));
- const c = el("span", "chev");
- c.append(svg(OUT, 11, 1.6));
- b.append(c);
+ b.append(el("span", "chev", svg(OUT, 11, 1.6)));
b.onclick = (ev) => {
ev.stopPropagation();
if (web) location.href = a.import;
@@ -3109,9 +3095,7 @@ function fillModelsEntry(b, a) {
words.append(pre, el("b", "", String(c.shown)), post || "");
}
b.append(words);
- const ch = el("span", "chev");
- ch.append(svg(CHEV_R, 10, 1.6));
- b.append(ch);
+ b.append(el("span", "chev", svg(CHEV_R, 10, 1.6)));
b.title = t("Pick which models {agent} lists", { agent: a.name });
}
diff --git a/internal/gui/tests/agent-changes-before-now.test.cjs b/internal/gui/tests/agent-changes-before-now.test.cjs
new file mode 100644
index 000000000..35c4b069d
--- /dev/null
+++ b/internal/gui/tests/agent-changes-before-now.test.cjs
@@ -0,0 +1,143 @@
+// Run with Node's test runner and Playwright on the module path; see README.md.
+// Zhenzhen (Pi on DeepSeek, omarchy): a connected agent's row says
+// "Changed ~/.pi/agent/settings.json · models.json", and its diff showed
+// every line magpie added red, "−" and struck through, with Pi's own
+// `"providers": {}` tagged "value before connecting" — the direction
+// disconnecting goes, so it read as magpie deleting Pi's settings. Under
+// "Changed" the diff reads before → now: what magpie put in is green "+",
+// a value it replaced is "−" old then "+" new, nothing struck through. The
+// way back (− taken out, ↺ put back) stays in Disconnect and restore's
+// dialog. The lines are diffLines' own output for Pi's two files; no
+// backend, the API is faked here, and every language is drawn.
+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");
+// /api/agents/preview/pi: what disconnecting does, from diffLines
+const changes = [
+ {
+ path: "~/.pi/agent/settings.json",
+ lines: [
+ { op: "~", text: ' "theme": "dark"', was: ' "theme": "dark",' },
+ { op: "-", text: ' "defaultModel": "deepseek/deepseek-v4-pro",' },
+ { op: "-", text: ' "defaultProvider": "magpie",' },
+ { op: "-", text: ' "defaultThinkingLevel": "high"' },
+ ],
+ },
+ {
+ path: "~/.pi/agent/models.json",
+ lines: [
+ { op: "~", text: ' "providers": {}', was: ' "providers": {' },
+ { op: "-", text: ' "magpie": {' },
+ { op: "-", text: ' "baseUrl": "http://127.0.0.1:3425/v1",' },
+ { op: "-", text: ' "api": "openai-completions",' },
+ ],
+ },
+ { path: "~/.pi/agent/magpie.json", removed: true },
+];
+
+function serve(lang) {
+ const state = {
+ agents: [{
+ id: "pi", name: "Pi", icon: "generic", wired: true, path: "~/.pi/agent/settings.json",
+ fields: [{ key: "model", label: "model", value: "magpie/deepseek/deepseek-v4-pro", options: [{ value: "magpie/deepseek/deepseek-v4-pro", label: "DeepSeek V4 Pro", ref: "deepseek/deepseek-v4-pro" }] }],
+ }],
+ 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 = ${JSON.stringify({ 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(state);
+ if (url.pathname === "/api/settings") return json(state.settings);
+ if (url.pathname === "/api/agents/preview/pi") return json({ changes });
+ if (url.pathname === "/api/usage/quotas") return json([]);
+ if (url.pathname === "/api/groups") return json({ groups: [] });
+ if (url.pathname === "/api/plugins") return json({ plugins: [] });
+ if (url.pathname === "/api/agents/cli") return json({ agents: {}, pending: false });
+ 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 route.fulfill({ body: await fs.readFile(file), contentType });
+ };
+}
+
+// each line as drawn: its sign, its text, whether it is struck through,
+// its colour and its tags
+const drawn = (box) => box.evaluate((b) => [...b.querySelectorAll(".ag-diff-file")].map((f) => ({
+ path: f.querySelector(".ag-diff-path span").textContent,
+ tags: [...f.querySelectorAll(".ag-diff-path .ag-tag")].map((x) => x.textContent),
+ lines: [...f.querySelectorAll(".ag-diff-line")].map((l) => ({
+ op: l.querySelector(".op").textContent,
+ text: l.querySelector("code").textContent,
+ struck: getComputedStyle(l.querySelector("code .t")).textDecorationLine.includes("line-through"),
+ color: getComputedStyle(l.querySelector("code")).color,
+ tags: [...l.querySelectorAll(".ag-tag")].map((x) => x.textContent),
+ })),
+})));
+
+const LANGS = { en: ["Created", "Deleted", "value before connecting"], zh: ["新建", "删除", "接入前的值"], "zh-TW": ["新增", "刪除"], ja: ["作成", "削除"], de: ["Erstellt", "Gelöscht"] };
+
+for (const engine of (process.env.BROWSER ? [process.env.BROWSER] : ["chromium", "webkit"])) {
+ test(`${engine}: a connected agent's changes read before → now, and the way back only in Disconnect`, async (t) => {
+ const browser = await (engine === "webkit" ? webkit.launch() : chromium.launch({ channel: "chromium" }));
+ t.after(() => browser.close());
+ for (const [lang, [created, deleted, before]] of Object.entries(LANGS)) {
+ for (const width of [890, 420]) {
+ const context = await browser.newContext({ viewport: { width, height: 900 }, reducedMotion: "reduce" });
+ const page = await context.newPage();
+ page.setDefaultTimeout(5000);
+ const errors = [];
+ page.on("pageerror", (e) => errors.push(e.message));
+ page.on("console", (m) => { if (m.type() === "error") errors.push(m.text()); });
+ await page.route("**/*", serve(lang));
+ await page.goto("http://magpie.test/?view=agents");
+ const where = `${engine} ${lang} ${width}`;
+ const row = page.locator('.row.agent[data-id="pi"]');
+ if (!(await row.locator(".ag-exp").count())) await row.locator(".ag-link").click();
+ const view = row.locator(".ag-foot .ag-quiet").first();
+ await view.waitFor();
+ await page.waitForFunction(() => !document.querySelector('.row.agent[data-id="pi"] .ag-foot .ag-quiet').hidden);
+ await view.click();
+ const box = row.locator(".ag-diff-box");
+ await box.locator(".ag-diff-file").last().waitFor();
+ const files = await drawn(box);
+ const green = await page.evaluate(() => { const s = document.createElement("span"); s.style.color = "var(--green)"; document.body.append(s); const c = getComputedStyle(s).color; s.remove(); return c; });
+ const red = await page.evaluate(() => { const s = document.createElement("span"); s.style.color = "var(--red)"; document.body.append(s); const c = getComputedStyle(s).color; s.remove(); return c; });
+ const signs = (f) => f.lines.map((l) => l.op + " " + l.text.trim());
+ assert.deepEqual(signs(files[0]), [
+ '− "theme": "dark"', '+ "theme": "dark",',
+ '+ "defaultModel": "deepseek/deepseek-v4-pro",', '+ "defaultProvider": "magpie",', '+ "defaultThinkingLevel": "high"',
+ ], `${where}: settings.json reads before → now`);
+ assert.deepEqual(signs(files[1]), [
+ '− "providers": {}', '+ "providers": {', '+ "magpie": {',
+ '+ "baseUrl": "http://127.0.0.1:3425/v1",', '+ "api": "openai-completions",',
+ ], `${where}: models.json's magpie block is put in, Pi's empty providers replaced`);
+ for (const f of files.slice(0, 2)) for (const l of f.lines) {
+ assert.equal(l.struck, false, `${where}: nothing is struck through: ${l.text}`);
+ assert.deepEqual(l.tags, [], `${where}: no line is tagged as the way back: ${l.text}`);
+ assert.equal(l.color, l.op === "+" ? green : red, `${where}: + is green, − is red: ${l.text}`);
+ }
+ assert.deepEqual(files[2].tags, [created], `${where}: a file magpie made is Created, not Deleted`);
+ assert.ok(!files.some((f) => f.lines.some((l) => l.op === "↺")), `${where}: no ↺ under Changed`);
+
+ // Disconnect and restore's dialog keeps the way back
+ await row.locator(".ag-foot .ag-quiet.red").click();
+ const ask = page.locator(".editor.disconnect-ask");
+ await ask.locator(".ag-diff-file").last().waitFor();
+ const back = await drawn(ask);
+ assert.deepEqual(back[0].lines.map((l) => l.op), ["↺", "−", "−", "−"], `${where}: the dialog shows what disconnecting does`);
+ assert.ok(back[0].lines.slice(1).every((l) => l.struck), `${where}: the lines disconnecting takes out are struck`);
+ if (before) assert.deepEqual(back[1].lines[0].tags, [before], `${where}: the value put back is tagged`);
+ assert.deepEqual(back[2].tags, [deleted], `${where}: disconnecting deletes the file magpie made`);
+ assert.deepEqual(errors, [], `${where}: no runtime or console errors`);
+ await context.close();
+ }
+ }
+ });
+}