Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.
gui: Codex's two subagent settings say which is the default and which holds every subagent
yetone06950fbbbb53
diff --git a/internal/gui/assets/app.js b/internal/gui/assets/app.jsindex 14151e4f3..df082524a 100644--- a/internal/gui/assets/app.js+++ b/internal/gui/assets/app.js@@ -3850,29 +3850,24 @@ const MEMORIES = "memories";// Desktop's subagent model is the same square: the gateway puts each of// its subagents' turns on itconst SUB_MODEL = "subagent model";-// Codex's subagents square is [agents] default_subagent_model, the model a-// subagent starts on only when its lead names none in spawn_agent-// (codex-rs core/src/agent/child_config.rs). Unset, a subagent isn't held to-// the model: the lead may name another, and GPT-6.1-Sol's spawned GPT-6-Astra-// (willz on Discord). So it says the lead picks, and points at the subagent-// model square, which holds every subagent to one.+// Codex's subagents square is [agents] default_subagent_model: a subagent's+// model when its lead names none (codex-rs child_config.rs); the lead may+// name another (willz on Discord), so it points at the subagent model.// Claude Code's auto mode square: the model its client-side auto mode// classifier runs on (CLAUDE_CODE_AUTO_MODE_MODEL); unset, Claude Code's own// pick, not the model'sconst AUTO_MODE = "auto mode";const AUTO_MODE_UNSET = "Claude Code's own pick";const leadPicks = (a, f) => f.label === "subagents" && ["codex", "claude"].includes(a.id.split("@wsl:")[0]);-const LEAD_PICKS = "Codex's lead may name another model for a subagent; set the subagent model to hold every subagent to one";+const LEAD_PICKS = "The model a subagent starts on when Codex's lead names none; the lead may still name another. To hold every subagent to one model, set the subagent model";// Claude Code's subagents unset: magpie writes no CLAUDE_CODE_SUBAGENT_MODEL// and Claude Code picks, taking the Agent call's model, then the subagent's// own model:, then that variable, then the session's (2.1.306), so it is// its pick, not "same as model" (KorenKrita on Discord)const CLAUDE_PICKS = "Claude Code's lead, or a subagent's own definition, may name a model or tier for it; a model set here is for the subagents that name none";const claudePicks = (a, f) => leadPicks(a, f) && a.id === "claude";-// Codex had two squares for its subagents' model, the subagents one above-// and the subagent model, and nobody could tell them apart (the owner): the-// card shows the subagent model alone, saying plainly what each choice-// does. A pick there takes away [agents] default_subagent_model too (the+// Codex's two subagent squares read alike (the owner, HoGee_xxl on X): the+// card shows the subagent model alone, saying what each choice does. A pick there takes away [agents] default_subagent_model too (the// backend), and one left in the config is said on it until then. With no// model of magpie's to pick there, Codex's own square stays.const codexSub = (a) => a.id.split("@wsl:")[0] === "codex" && a.fields.some((f) => f.label === SUB_MODEL && (f.options.length || f.value));@@ -3881,12 +3876,11 @@ const codexOwnSub = (a, f) => f.label === "subagents" && codexSub(a);const hermesBot = (f) => f.key.startsWith("profile:");const codexRowed = (a, f) => a.id === "codex" && !gatewayMode && (f.label === SUB_MODEL || f.label === MEMORIES);const SAME_AS_LEAD = "Same as the lead";-const SUB_MODEL_UNSET = "Each subagent runs on the lead's model ({model}), or on another the lead picks for it. Pick a model here to put every subagent on it.";-const SUB_MODEL_UNSET_PLAIN = "Each subagent runs on the lead's model, or on another the lead picks for it. Pick a model here to put every subagent on it.";-const SUB_MODEL_SET = "Every subagent runs on this model, whatever the lead asks for.";+const SUB_MODEL_UNSET = "The lead picks each subagent's model; one it names none for runs on the lead's model ({model}). A resumed subagent stays on the model it started on. A model picked here holds every subagent to it, even when the lead names another.";+const SUB_MODEL_UNSET_PLAIN = "The lead picks each subagent's model; one it names none for runs on the lead's model. A resumed subagent stays on the model it started on. A model picked here holds every subagent to it, even when the lead names another.";+const SUB_MODEL_SET = "Every subagent runs on this model, even when the lead names another. Same as the lead gives the pick back to the lead.";const SUB_MODEL_OLD = "Codex's config still starts subagents on {model} when the lead names none; picking here replaces it.";-// codexSubSaid: what Codex's subagent model is, in words: its value, and a-// line on what it does+// codexSubSaid: Codex's subagent model's name and what it doesfunction codexSubSaid(a, f) {const opt = optionFor(f, f.value);const main = a.fields.find((x) => x.key === "model");@@ -21145,7 +21139,7 @@ function renderCodexSubagentModel() {b.onclick = (ev) => openPicker(a, f, b, ev);$("#codexSubagentModelPick").replaceChildren(b);b.title = said.line;- row.querySelector(".who").title = said.line;+ row.querySelector(".who").title = row.querySelector(".sub").textContent = said.line;}// renderImages: the model that describes images to a model that can't seediff --git a/internal/gui/assets/i18n.js b/internal/gui/assets/i18n.jsindex d69f516e5..dce77b7d2 100644--- a/internal/gui/assets/i18n.js+++ b/internal/gui/assets/i18n.js@@ -1081,9 +1081,9 @@ const I18N = {"Same as the session": "跟随当前会话","Codex memories model": "Codex 记忆整理模型","Same as the lead": "跟主代理一样",- "Each subagent runs on the lead's model ({model}), or on another the lead picks for it. Pick a model here to put every subagent on it.": "每个子代理都用主代理正在用的模型({model}),主代理也可能给某个子代理另选一个。在这里选定一个模型,所有子代理就都用它。",- "Each subagent runs on the lead's model, or on another the lead picks for it. Pick a model here to put every subagent on it.": "每个子代理都用主代理正在用的模型,主代理也可能给某个子代理另选一个。在这里选定一个模型,所有子代理就都用它。",- "Every subagent runs on this model, whatever the lead asks for.": "所有子代理都用这个模型,不管主代理要的是哪个。",+ "The lead picks each subagent's model; one it names none for runs on the lead's model ({model}). A resumed subagent stays on the model it started on. A model picked here holds every subagent to it, even when the lead names another.": "主代理为每个子代理选模型;主代理没指定时,子代理用主代理的模型({model})。恢复的子代理仍用它最初的模型。在这里选定一个模型,所有子代理都固定用它,主代理指定了别的也一样。",+ "The lead picks each subagent's model; one it names none for runs on the lead's model. A resumed subagent stays on the model it started on. A model picked here holds every subagent to it, even when the lead names another.": "主代理为每个子代理选模型;主代理没指定时,子代理用主代理的模型。恢复的子代理仍用它最初的模型。在这里选定一个模型,所有子代理都固定用它,主代理指定了别的也一样。",+ "Every subagent runs on this model, even when the lead names another. Same as the lead gives the pick back to the lead.": "所有子代理都用这个模型,主代理指定了别的也一样。选“跟主代理一样”就把选择交还给主代理。","Codex's config still starts subagents on {model} when the lead names none; picking here replaces it.": "Codex 配置里还写着:主代理没指定时,子代理用 {model}。在这里选一次就会替换掉它。","{model}, or another the lead picks for a subagent": "{model},或主代理给子代理另选的模型","the lead's model, or another the lead picks for a subagent": "主代理正在用的模型,或主代理给子代理另选的模型",@@ -3382,7 +3382,7 @@ const I18N = {"the lead's pick, else same as model": "由主代理自选,未指定时同主模型","Lead's pick": "由主代理自选","{model} unless the lead names another": "{model},主代理指定其他模型时除外",- "Codex's lead may name another model for a subagent; set the subagent model to hold every subagent to one": "Codex 的主代理可以给子代理指定别的模型;要让每个子代理都用同一个模型,请设置子代理模型",+ "The model a subagent starts on when Codex's lead names none; the lead may still name another. To hold every subagent to one model, set the subagent model": "Codex 主代理没指定模型时子代理用的模型;主代理仍可指定别的。要让所有子代理固定用一个模型,请设置子代理模型","Claude Code's lead, or a subagent's own definition, may name a model or tier for it; a model set here is for the subagents that name none": "Claude Code 的主代理或子代理自己的定义可以给它指定模型或档位;这里设置的模型只用于没有指定的子代理","{model} unless the lead or the subagent names another": "{model},主代理或子代理指定其他模型时除外","the model the lead asks for": "主代理请求的模型",@@ -5133,9 +5133,9 @@ const I18N = {"Same as the session": "跟隨目前工作階段","Codex memories model": "Codex 記憶整理模型","Same as the lead": "跟主代理一樣",- "Each subagent runs on the lead's model ({model}), or on another the lead picks for it. Pick a model here to put every subagent on it.": "每個子代理都用主代理正在用的模型({model}),主代理也可能給某個子代理另選一個。在這裡選定一個模型,所有子代理就都用它。",- "Each subagent runs on the lead's model, or on another the lead picks for it. Pick a model here to put every subagent on it.": "每個子代理都用主代理正在用的模型,主代理也可能給某個子代理另選一個。在這裡選定一個模型,所有子代理就都用它。",- "Every subagent runs on this model, whatever the lead asks for.": "所有子代理都用這個模型,不管主代理要的是哪個。",+ "The lead picks each subagent's model; one it names none for runs on the lead's model ({model}). A resumed subagent stays on the model it started on. A model picked here holds every subagent to it, even when the lead names another.": "主代理為每個子代理選模型;主代理沒指定時,子代理用主代理的模型({model})。恢復的子代理仍用它最初的模型。在這裡選定一個模型,所有子代理都固定用它,主代理指定了別的也一樣。",+ "The lead picks each subagent's model; one it names none for runs on the lead's model. A resumed subagent stays on the model it started on. A model picked here holds every subagent to it, even when the lead names another.": "主代理為每個子代理選模型;主代理沒指定時,子代理用主代理的模型。恢復的子代理仍用它最初的模型。在這裡選定一個模型,所有子代理都固定用它,主代理指定了別的也一樣。",+ "Every subagent runs on this model, even when the lead names another. Same as the lead gives the pick back to the lead.": "所有子代理都用這個模型,主代理指定了別的也一樣。選「跟主代理一樣」就把選擇交還給主代理。","Codex's config still starts subagents on {model} when the lead names none; picking here replaces it.": "Codex 設定裡還寫著:主代理沒指定時,子代理用 {model}。在這裡選一次就會取代它。","{model}, or another the lead picks for a subagent": "{model},或主代理給子代理另選的模型","the lead's model, or another the lead picks for a subagent": "主代理正在用的模型,或主代理給子代理另選的模型",@@ -7408,7 +7408,7 @@ const I18N = {"the lead's pick, else same as model": "由主代理自選,未指定時同主模型","Lead's pick": "由主代理自選","{model} unless the lead names another": "{model},主代理指定其他模型時除外",- "Codex's lead may name another model for a subagent; set the subagent model to hold every subagent to one": "Codex 的主代理可以給子代理指定別的模型;要讓每個子代理都用同一個模型,請設定子代理模型",+ "The model a subagent starts on when Codex's lead names none; the lead may still name another. To hold every subagent to one model, set the subagent model": "Codex 主代理沒指定模型時子代理用的模型;主代理仍可指定別的。要讓所有子代理固定用一個模型,請設定子代理模型","Claude Code's lead, or a subagent's own definition, may name a model or tier for it; a model set here is for the subagents that name none": "Claude Code 的主代理或子代理自己的定義可以給它指定模型或檔位;這裡設定的模型只用於沒有指定的子代理","{model} unless the lead or the subagent names another": "{model},主代理或子代理指定其他模型時除外","the model the lead asks for": "主代理請求的模型",@@ -9155,9 +9155,9 @@ const I18N = {"Same as the session": "セッションと同じ","Codex memories model": "Codex メモリ整理のモデル","Same as the lead": "リードと同じ",- "Each subagent runs on the lead's model ({model}), or on another the lead picks for it. Pick a model here to put every subagent on it.": "各サブエージェントはリードと同じモデル({model})で動きます。リードが別のモデルを選ぶこともあります。ここでモデルを選ぶと、すべてのサブエージェントがそのモデルになります。",- "Each subagent runs on the lead's model, or on another the lead picks for it. Pick a model here to put every subagent on it.": "各サブエージェントはリードと同じモデルで動きます。リードが別のモデルを選ぶこともあります。ここでモデルを選ぶと、すべてのサブエージェントがそのモデルになります。",- "Every subagent runs on this model, whatever the lead asks for.": "リードが何を指定しても、すべてのサブエージェントがこのモデルで動きます。",+ "The lead picks each subagent's model; one it names none for runs on the lead's model ({model}). A resumed subagent stays on the model it started on. A model picked here holds every subagent to it, even when the lead names another.": "各サブエージェントのモデルはリードが選びます。指定がなければリードのモデル({model})で動きます。再開したサブエージェントは最初のモデルのままです。ここでモデルを選ぶと、リードが別のモデルを指定しても、すべてのサブエージェントがそのモデルに固定されます。",+ "The lead picks each subagent's model; one it names none for runs on the lead's model. A resumed subagent stays on the model it started on. A model picked here holds every subagent to it, even when the lead names another.": "各サブエージェントのモデルはリードが選びます。指定がなければリードのモデルで動きます。再開したサブエージェントは最初のモデルのままです。ここでモデルを選ぶと、リードが別のモデルを指定しても、すべてのサブエージェントがそのモデルに固定されます。",+ "Every subagent runs on this model, even when the lead names another. Same as the lead gives the pick back to the lead.": "リードが別のモデルを指定しても、すべてのサブエージェントがこのモデルで動きます。「リードと同じ」を選ぶと、選択をリードに戻します。","Codex's config still starts subagents on {model} when the lead names none; picking here replaces it.": "Codex の設定には、リードが指定しないときのサブエージェントのモデルとして {model} が残っています。ここで選ぶとそれを置き換えます。","{model}, or another the lead picks for a subagent": "{model}、またはリードがサブエージェントに選ぶ別のモデル","the lead's model, or another the lead picks for a subagent": "リードと同じモデル、またはリードがサブエージェントに選ぶ別のモデル",@@ -11452,7 +11452,7 @@ const I18N = {"the lead's pick, else same as model": "リードが選ぶモデル、指定がなければモデルと同じ","Lead's pick": "リードが選ぶ","{model} unless the lead names another": "{model}(リードが別のモデルを指定した場合を除く)",- "Codex's lead may name another model for a subagent; set the subagent model to hold every subagent to one": "Codex のリードはサブエージェントに別のモデルを指定できます。すべてのサブエージェントを同じモデルにするには、サブエージェントのモデルを設定してください",+ "The model a subagent starts on when Codex's lead names none; the lead may still name another. To hold every subagent to one model, set the subagent model": "Codex のリードがモデルを指定しないときにサブエージェントが使うモデルです。リードは別のモデルを指定することもできます。すべてのサブエージェントを 1 つのモデルに固定するには、サブエージェントのモデルを設定してください","Claude Code's lead, or a subagent's own definition, may name a model or tier for it; a model set here is for the subagents that name none": "Claude Code のリードやサブエージェント自身の定義が、モデルや階層を指定できます。ここで設定したモデルは、指定のないサブエージェントに使われます","{model} unless the lead or the subagent names another": "{model}(リードかサブエージェントが別のモデルを指定した場合を除く)","the model the lead asks for": "リードがリクエストしたモデル",@@ -13207,9 +13207,9 @@ const I18N = {"Same as the session": "Wie die Sitzung","Codex memories model": "Codex-Modell für Erinnerungen","Same as the lead": "Wie der Haupt-Agent",- "Each subagent runs on the lead's model ({model}), or on another the lead picks for it. Pick a model here to put every subagent on it.": "Jeder Subagent läuft auf dem Modell des Haupt-Agenten ({model}) oder auf einem anderen, das der Haupt-Agent für ihn wählt. Wähle hier ein Modell, damit alle Subagenten darauf laufen.",- "Each subagent runs on the lead's model, or on another the lead picks for it. Pick a model here to put every subagent on it.": "Jeder Subagent läuft auf dem Modell des Haupt-Agenten oder auf einem anderen, das der Haupt-Agent für ihn wählt. Wähle hier ein Modell, damit alle Subagenten darauf laufen.",- "Every subagent runs on this model, whatever the lead asks for.": "Alle Subagenten laufen auf diesem Modell, egal was der Haupt-Agent verlangt.",+ "The lead picks each subagent's model; one it names none for runs on the lead's model ({model}). A resumed subagent stays on the model it started on. A model picked here holds every subagent to it, even when the lead names another.": "Der Haupt-Agent wählt das Modell jedes Subagenten; nennt er keins, läuft der Subagent auf dem Modell des Haupt-Agenten ({model}). Ein fortgesetzter Subagent bleibt auf seinem ersten Modell. Ein hier gewähltes Modell legt alle Subagenten darauf fest, auch wenn der Haupt-Agent ein anderes nennt.",+ "The lead picks each subagent's model; one it names none for runs on the lead's model. A resumed subagent stays on the model it started on. A model picked here holds every subagent to it, even when the lead names another.": "Der Haupt-Agent wählt das Modell jedes Subagenten; nennt er keins, läuft der Subagent auf dem Modell des Haupt-Agenten. Ein fortgesetzter Subagent bleibt auf seinem ersten Modell. Ein hier gewähltes Modell legt alle Subagenten darauf fest, auch wenn der Haupt-Agent ein anderes nennt.",+ "Every subagent runs on this model, even when the lead names another. Same as the lead gives the pick back to the lead.": "Alle Subagenten laufen auf diesem Modell, auch wenn der Haupt-Agent ein anderes nennt. „Wie der Haupt-Agent“ gibt die Wahl an den Haupt-Agenten zurück.","Codex's config still starts subagents on {model} when the lead names none; picking here replaces it.": "Die Codex-Konfiguration startet Subagenten noch auf {model}, wenn der Haupt-Agent keins nennt; eine Wahl hier ersetzt das.","{model}, or another the lead picks for a subagent": "{model} oder ein anderes, das der Haupt-Agent für einen Subagenten wählt","the lead's model, or another the lead picks for a subagent": "das Modell des Haupt-Agenten oder ein anderes, das er für einen Subagenten wählt",@@ -15504,7 +15504,7 @@ const I18N = {"the lead's pick, else same as model": "vom Haupt-Agenten gewählt, sonst wie Modell","Lead's pick": "Wahl des Haupt-Agenten","{model} unless the lead names another": "{model}, außer der Haupt-Agent nennt ein anderes",- "Codex's lead may name another model for a subagent; set the subagent model to hold every subagent to one": "Der Haupt-Agent von Codex kann einem Subagenten ein anderes Modell geben; setze das Modell der Subagenten, um alle auf eines festzulegen",+ "The model a subagent starts on when Codex's lead names none; the lead may still name another. To hold every subagent to one model, set the subagent model": "Das Modell, auf dem ein Subagent startet, wenn der Haupt-Agent von Codex keins nennt; er kann trotzdem ein anderes nennen. Um alle Subagenten auf ein Modell festzulegen, setze das Modell der Subagenten","Claude Code's lead, or a subagent's own definition, may name a model or tier for it; a model set here is for the subagents that name none": "Der Haupt-Agent von Claude Code oder die eigene Definition eines Subagenten kann ihm ein Modell oder eine Stufe geben; ein hier gesetztes Modell gilt für Subagenten, die keines nennen","{model} unless the lead or the subagent names another": "{model}, außer der Haupt-Agent oder der Subagent nennt ein anderes","the model the lead asks for": "das Modell, das der Haupt-Agent anfordert",diff --git a/internal/gui/assets/index.html b/internal/gui/assets/index.htmlindex e9256c9cf..55a44f3a8 100644--- a/internal/gui/assets/index.html+++ b/internal/gui/assets/index.html@@ -463,7 +463,7 @@<div id="codexAgentsV1Segs"></div></div><div class="row pref" id="codexSubagentModelRow" hidden>- <div class="who"><div class="name" data-t>Codex subagent model</div></div>+ <div class="who"><div class="name" data-t>Codex subagent model</div><div class="sub"></div></div><div class="val" id="codexSubagentModelPick"></div></div><div class="row pref" id="fullContextRow">diff --git a/internal/gui/tests/codex-subagent-model.test.cjs b/internal/gui/tests/codex-subagent-model.test.cjsindex 17771d58e..a9c01e136 100644--- a/internal/gui/tests/codex-subagent-model.test.cjs+++ b/internal/gui/tests/codex-subagent-model.test.cjs@@ -109,33 +109,33 @@ function server(lang, sets) {// the words as i18n.js has themconst W = {- en: { unset: "subagent model: Same as the lead", line: "Each subagent runs on the lead's model (GPT-5.5), or on another the lead picks for it. Pick a model here to put every subagent on it.",+ en: { unset: "subagent model: Same as the lead", line: "The lead picks each subagent's model; one it names none for runs on the lead's model (GPT-5.5). A resumed subagent stays on the model it started on. A model picked here holds every subagent to it, even when the lead names another.",old: "Codex's config still starts subagents on gpt-5.4-mini when the lead names none; picking here replaces it.",- def: "Same as the lead", note: "GPT-5.5, or another the lead picks for a subagent", set: "subagent model: GPT-6 Astra", setLine: "Every subagent runs on this model, whatever the lead asks for.", row: "Codex subagent model",+ def: "Same as the lead", note: "GPT-5.5, or another the lead picks for a subagent", set: "subagent model: GPT-6 Astra", setLine: "Every subagent runs on this model, even when the lead names another. Same as the lead gives the pick back to the lead.", row: "Codex subagent model",moved: "Codex requested a subagent on gpt-5.5; magpie put it on codex/gpt-6-astra, the model set for its subagents.",kept: "Codex requested a subagent on gpt-5.5 and it stayed there: its subagents are set to codex/gpt-6-astra, but no ChatGPT account on in magpie serves it.",sealed: "Codex requested a subagent on gpt-5.5 and it stayed there: its subagents are set to token/gpt-6.1-sol, but its task was sealed by the ChatGPT backend that answered its lead, and only a ChatGPT account can open it." },- zh: { unset: "子代理模型:跟主代理一样", line: "每个子代理都用主代理正在用的模型(GPT-5.5),主代理也可能给某个子代理另选一个。在这里选定一个模型,所有子代理就都用它。",+ zh: { unset: "子代理模型:跟主代理一样", line: "主代理为每个子代理选模型;主代理没指定时,子代理用主代理的模型(GPT-5.5)。恢复的子代理仍用它最初的模型。在这里选定一个模型,所有子代理都固定用它,主代理指定了别的也一样。",old: "Codex 配置里还写着:主代理没指定时,子代理用 gpt-5.4-mini。在这里选一次就会替换掉它。",- def: "跟主代理一样", note: "GPT-5.5,或主代理给子代理另选的模型", set: "子代理模型:GPT-6 Astra", setLine: "所有子代理都用这个模型,不管主代理要的是哪个。", row: "Codex 子代理模型",+ def: "跟主代理一样", note: "GPT-5.5,或主代理给子代理另选的模型", set: "子代理模型:GPT-6 Astra", setLine: "所有子代理都用这个模型,主代理指定了别的也一样。选“跟主代理一样”就把选择交还给主代理。", row: "Codex 子代理模型",moved: "Codex 请求了使用 gpt-5.5 的子代理;magpie 将其改用 codex/gpt-6-astra,即为它的子代理设定的模型。",kept: "Codex 请求了使用 gpt-5.5 的子代理,并保留在该模型上:它的子代理设为 codex/gpt-6-astra,但magpie 中启用的 ChatGPT 账号都不提供该模型。",sealed: "Codex 请求了使用 gpt-5.5 的子代理,并保留在该模型上:它的子代理设为 token/gpt-6.1-sol,但它的任务由回答主代理的 ChatGPT 后端加密,只有 ChatGPT 账号能打开。" },- "zh-TW": { unset: "子代理模型:跟主代理一樣", line: "每個子代理都用主代理正在用的模型(GPT-5.5),主代理也可能給某個子代理另選一個。在這裡選定一個模型,所有子代理就都用它。",+ "zh-TW": { unset: "子代理模型:跟主代理一樣", line: "主代理為每個子代理選模型;主代理沒指定時,子代理用主代理的模型(GPT-5.5)。恢復的子代理仍用它最初的模型。在這裡選定一個模型,所有子代理都固定用它,主代理指定了別的也一樣。",old: "Codex 設定裡還寫著:主代理沒指定時,子代理用 gpt-5.4-mini。在這裡選一次就會取代它。",- def: "跟主代理一樣", note: "GPT-5.5,或主代理給子代理另選的模型", set: "子代理模型:GPT-6 Astra", setLine: "所有子代理都用這個模型,不管主代理要的是哪個。", row: "Codex 子代理模型",+ def: "跟主代理一樣", note: "GPT-5.5,或主代理給子代理另選的模型", set: "子代理模型:GPT-6 Astra", setLine: "所有子代理都用這個模型,主代理指定了別的也一樣。選「跟主代理一樣」就把選擇交還給主代理。", row: "Codex 子代理模型",moved: "Codex 請求了使用 gpt-5.5 的子代理;magpie 將其改用 codex/gpt-6-astra,即為它的子代理設定的模型。",kept: "Codex 請求了使用 gpt-5.5 的子代理,並保留在該模型上:它的子代理設為 codex/gpt-6-astra,但magpie 中啟用的 ChatGPT 帳號都不提供該模型。",sealed: "Codex 請求了使用 gpt-5.5 的子代理,並保留在該模型上:它的子代理設為 token/gpt-6.1-sol,但它的任務由回應主代理的 ChatGPT 後端加密,只有 ChatGPT 帳號能打開。" },- ja: { unset: "サブエージェントのモデル:リードと同じ", line: "各サブエージェントはリードと同じモデル(GPT-5.5)で動きます。リードが別のモデルを選ぶこともあります。ここでモデルを選ぶと、すべてのサブエージェントがそのモデルになります。",+ ja: { unset: "サブエージェントのモデル:リードと同じ", line: "各サブエージェントのモデルはリードが選びます。指定がなければリードのモデル(GPT-5.5)で動きます。再開したサブエージェントは最初のモデルのままです。ここでモデルを選ぶと、リードが別のモデルを指定しても、すべてのサブエージェントがそのモデルに固定されます。",old: "Codex の設定には、リードが指定しないときのサブエージェントのモデルとして gpt-5.4-mini が残っています。ここで選ぶとそれを置き換えます。",- def: "リードと同じ", note: "GPT-5.5、またはリードがサブエージェントに選ぶ別のモデル", set: "サブエージェントのモデル:GPT-6 Astra", setLine: "リードが何を指定しても、すべてのサブエージェントがこのモデルで動きます。", row: "Codex サブエージェントのモデル",+ def: "リードと同じ", note: "GPT-5.5、またはリードがサブエージェントに選ぶ別のモデル", set: "サブエージェントのモデル:GPT-6 Astra", setLine: "リードが別のモデルを指定しても、すべてのサブエージェントがこのモデルで動きます。「リードと同じ」を選ぶと、選択をリードに戻します。", row: "Codex サブエージェントのモデル",moved: "Codex が gpt-5.5 のサブエージェントをリクエストしました。magpie はサブエージェント用に設定された codex/gpt-6-astra に切り替えました。",kept: "Codex が gpt-5.5 のサブエージェントをリクエストし、そのモデルのままになりました。サブエージェントは codex/gpt-6-astra に設定されていますが、magpie で有効な ChatGPT アカウントはどれもこのモデルを提供していません。",sealed: "Codex が gpt-5.5 のサブエージェントをリクエストし、そのモデルのままになりました。サブエージェントは token/gpt-6.1-sol に設定されていますが、そのタスクはリードに応答した ChatGPT バックエンドが暗号化しており、開けるのは ChatGPT アカウントだけです。" },- de: { unset: "Modell der Subagenten: Wie der Haupt-Agent", line: "Jeder Subagent läuft auf dem Modell des Haupt-Agenten (GPT-5.5) oder auf einem anderen, das der Haupt-Agent für ihn wählt. Wähle hier ein Modell, damit alle Subagenten darauf laufen.",+ de: { unset: "Modell der Subagenten: Wie der Haupt-Agent", line: "Der Haupt-Agent wählt das Modell jedes Subagenten; nennt er keins, läuft der Subagent auf dem Modell des Haupt-Agenten (GPT-5.5). Ein fortgesetzter Subagent bleibt auf seinem ersten Modell. Ein hier gewähltes Modell legt alle Subagenten darauf fest, auch wenn der Haupt-Agent ein anderes nennt.",old: "Die Codex-Konfiguration startet Subagenten noch auf gpt-5.4-mini, wenn der Haupt-Agent keins nennt; eine Wahl hier ersetzt das.",- def: "Wie der Haupt-Agent", note: "GPT-5.5 oder ein anderes, das der Haupt-Agent für einen Subagenten wählt", set: "Modell der Subagenten: GPT-6 Astra", setLine: "Alle Subagenten laufen auf diesem Modell, egal was der Haupt-Agent verlangt.", row: "Codex-Subagenten-Modell",+ def: "Wie der Haupt-Agent", note: "GPT-5.5 oder ein anderes, das der Haupt-Agent für einen Subagenten wählt", set: "Modell der Subagenten: GPT-6 Astra", setLine: "Alle Subagenten laufen auf diesem Modell, auch wenn der Haupt-Agent ein anderes nennt. „Wie der Haupt-Agent“ gibt die Wahl an den Haupt-Agenten zurück.", row: "Codex-Subagenten-Modell",moved: "Codex hat einen Subagent mit gpt-5.5 angefordert; magpie hat ihn auf codex/gpt-6-astra gesetzt, das für seine Subagenten festgelegte Modell.",kept: "Codex hat einen Subagent mit gpt-5.5 angefordert, und er blieb dort: Seine Subagenten sind auf codex/gpt-6-astra gesetzt, aber kein eingeschaltetes ChatGPT-Konto in magpie bietet es an.",sealed: "Codex hat einen Subagent mit gpt-5.5 angefordert, und er blieb dort: Seine Subagenten sind auf token/gpt-6.1-sol gesetzt, aber seine Aufgabe wurde vom ChatGPT-Backend versiegelt, das seinen Lead beantwortet hat, und nur ein ChatGPT-Konto kann sie öffnen." },@@ -236,10 +236,14 @@ for (const engine of engines) {await page.locator("#codexSubagentModelRow button", { hasText: "GPT-6 Astra" }).waitFor();assert.deepEqual(sets.at(-1), { agent: "codex", field: "subagent_model", value: "codex/gpt-6-astra" });assert.equal(await page.locator("#codexSubagentModelRow .who").getAttribute("title"), w.setLine);+ // said under its name too, not only on hover (HoGee_xxl on X)+ assert.equal(await page.locator("#codexSubagentModelRow .who .sub").textContent(), w.setLine);await pick.click();await page.locator("#pop:not([hidden]) #list li").first().waitFor();await page.locator("#pop #list li").first().click();await page.locator("#codexSubagentModelRow button", { hasText: w.def }).waitFor();+ assert.equal(await page.locator("#codexSubagentModelRow .who .sub").count(), 1);+ assert((await page.locator("#codexSubagentModelRow .who .sub").textContent()).startsWith(w.line), "the row's note says what Same as the lead does");assert.deepEqual(sets.at(-1), { agent: "codex", field: "subagent_model", value: "" });// the Routing page's story: put on the model set, or why notdiff --git a/internal/gui/tests/codex-subagents-lead.test.cjs b/internal/gui/tests/codex-subagents-lead.test.cjsindex 4b1a8ca77..ce5f513ff 100644--- a/internal/gui/tests/codex-subagents-lead.test.cjs+++ b/internal/gui/tests/codex-subagents-lead.test.cjs@@ -67,19 +67,19 @@ function server(lang, sets) {// the words as i18n.js has themconst W = {en: { lead: "subagents: the lead's pick, else same as model", set: "subagents: GPT-6.1 Sol", same: "subagents: same as model",- hint: "Codex's lead may name another model for a subagent; set the subagent model to hold every subagent to one",+ hint: "The model a subagent starts on when Codex's lead names none; the lead may still name another. To hold every subagent to one model, set the subagent model",pick: "Lead's pick", note: "GPT-6.1 Sol unless the lead names another" },zh: { lead: "子代理:由主代理自选,未指定时同主模型", set: "子代理:GPT-6.1 Sol", same: "子代理:同主模型",- hint: "Codex 的主代理可以给子代理指定别的模型;要让每个子代理都用同一个模型,请设置子代理模型",+ hint: "Codex 主代理没指定模型时子代理用的模型;主代理仍可指定别的。要让所有子代理固定用一个模型,请设置子代理模型",pick: "由主代理自选", note: "GPT-6.1 Sol,主代理指定其他模型时除外" },"zh-TW": { lead: "子代理:由主代理自選,未指定時同主模型", set: "子代理:GPT-6.1 Sol", same: "子代理:同主模型",- hint: "Codex 的主代理可以給子代理指定別的模型;要讓每個子代理都用同一個模型,請設定子代理模型",+ hint: "Codex 主代理沒指定模型時子代理用的模型;主代理仍可指定別的。要讓所有子代理固定用一個模型,請設定子代理模型",pick: "由主代理自選", note: "GPT-6.1 Sol,主代理指定其他模型時除外" },ja: { lead: "サブエージェント:リードが選ぶモデル、指定がなければモデルと同じ", set: "サブエージェント:GPT-6.1 Sol", same: "サブエージェント:モデルと同じ",- hint: "Codex のリードはサブエージェントに別のモデルを指定できます。すべてのサブエージェントを同じモデルにするには、サブエージェントのモデルを設定してください",+ hint: "Codex のリードがモデルを指定しないときにサブエージェントが使うモデルです。リードは別のモデルを指定することもできます。すべてのサブエージェントを 1 つのモデルに固定するには、サブエージェントのモデルを設定してください",pick: "リードが選ぶ", note: "GPT-6.1 Sol(リードが別のモデルを指定した場合を除く)" },de: { lead: "Subagenten: vom Haupt-Agenten gewählt, sonst wie Modell", set: "Subagenten: GPT-6.1 Sol", same: "Subagenten: wie Modell",- hint: "Der Haupt-Agent von Codex kann einem Subagenten ein anderes Modell geben; setze das Modell der Subagenten, um alle auf eines festzulegen",+ hint: "Das Modell, auf dem ein Subagent startet, wenn der Haupt-Agent von Codex keins nennt; er kann trotzdem ein anderes nennen. Um alle Subagenten auf ein Modell festzulegen, setze das Modell der Subagenten",pick: "Wahl des Haupt-Agenten", note: "GPT-6.1 Sol, außer der Haupt-Agent nennt ein anderes" },};