@songsid/agend 2.3.5-alpha.5 → 2.3.5-beta.1

package/dist/ui/settings-appearance.js

@@ -5,8 +5,6 @@ import { html, useEffect, useRef, useState } from "/assets/app-html.js";
 import { register, t } from "/assets/app-i18n.js";
 import { recordEdit } from "/assets/text-undo.js";
 import { appStore, useStore } from "/assets/app-store.js";
-// #2978 merge: from their own module, never from the long-lived shell (a stale tab's shell lacks them).
-import { DEFAULT_SETTINGS_CONTENT_WIDTH, SETTINGS_CONTENT_WIDTHS, settingsContentWidthStore, setSettingsContentWidth } from "/assets/settings-width.js";
 import { ModsCard } from "./settings-mods.js";
 import { Icon } from "/assets/ui-icons.js";
 import { toast } from "/assets/ui-toast.js";
@@ -24,22 +22,6 @@ import { CardTitle } from "./settings-learn.js";
 import "./settings-strings.js";
 
 const tn = (k, ...v) => t(`settings.${k}`, ...v);
-register("settingsContentWidth", {
-  en: {
-    label: "Settings content width",
-    device: "This device · saves immediately",
-    hint: "Applies to every Settings page; adapts to narrow windows.",
-    option: "{0} px",
-    defaultOption: "{0} px (default)",
-  },
-  "zh-TW": {
-    label: "設定頁內容寬度",
-    device: "此裝置・立即儲存",
-    hint: "套用到所有設定頁；窄視窗會自動配合可用空間。",
-    option: "{0} px",
-    defaultOption: "{0} px（預設）",
-  },
-});
 /** #2390: a refusal's detail in the page's language when the host named it (detail_key), else its English as sent. */
 export function appIconDetail(body) {
   const key = body && typeof body.detail_key === "string" ? `appIconDetail_${body.detail_key}` : null;
@@ -79,85 +61,16 @@ export function AppearanceSection(props = {}) {
   const part = props.part || "look";
   const publicLink = typeof document !== "undefined" && document.body && document.body.dataset.publicLink === "1";
   // #2347 regrouping: Look (the person's own), this device's switches (in Preferences) and the host-wide cards (in Web
-  // dashboard) are drawn where each belongs. Public Look keeps the existing browser-only theme choice; customization stays unavailable there.
-  if (publicLink) return part === "look" ? html`<div class="s-look-workspace s-look-public"><div class="s-look-main">
-    <${ThemeModeCard} publicLink=${true} />
-    <section class="card s-appearance"><h3>${tn("cssTitle")}</h3><p class="sub">${tn("cssPublicLink")}</p></section>
-  </div></div>` : null;
+  // dashboard) are drawn where each belongs. None of it is offered over the public link (Look says so).
+  if (publicLink) return part === "look" ? html`<section class="card s-appearance"><h3>${tn("cssTitle")}</h3><p class="sub">${tn("cssPublicLink")}</p></section>` : null;
   if (part === "device") return html`<${MotionCard} ...${props} /><${DeviceCard} ...${props} />`;
-  if (part === "dashboard") return html`<${AppIconCard} /><details class="s-look-disclosure s-dashboard-limits"><summary><${Icon} name="sliders" size=${17} /><span>${tn("cardLimitsTitle")}</span><${Icon} name="chevron" size=${16} /></summary><div class="s-look-disclosure-body"><${CardLimitsCard} /></div></details>`;
-  return html`<div class="s-look-workspace">
-    <div class="s-look-basics">
-    <div class="s-look-main">
-      <${ThemeModeCard} />
-      <section class="card s-appearance s-look-identity"><h3>${tn("lookIdentityGroup")}</h3>
-        <div class="s-look-identity-controls"><${CardSizeCard} /><${IdentityColorCard} /></div>
-      </section>
-      <section class="card s-appearance s-look-motion"><${CardTitle} title=${tn("lookMotionGroup")} topic="themes" />
-        <${ThemesCard} compact=${true} ...${props} /><${MotionCard} compact=${true} ...${props} />
-      </section>
-    </div>
-    <${AppearancePreview} />
-    </div>
-    <div class="s-look-advanced">
-      <${AppearanceDisclosure} title=${tn("widgetTitle")} icon="sliders"><${SidebarWidgetCard} /></${AppearanceDisclosure}>
-      <${AppearanceDisclosure} title=${tn("cssTitle")} icon="code"><${OwnerCssCard} /><${DeviceCard} ...${props} /></${AppearanceDisclosure}>
-      <${AppearanceDisclosure} title=${tn("modsTitle")} icon="plug"><${ModsCard} /></${AppearanceDisclosure}>
-      <${AppearanceDisclosure} title=${tn("restoreTitle")} icon="restart" danger=${true}><${RestoreDefaultsCard} ...${props} /></${AppearanceDisclosure}>
-    </div>
-  </div>`;
-}
-
-/** Theme remains a normal personal preference, including the public dashboard's existing browser-only choice. */
-function ThemeModeCard({ publicLink = false }) {
-  const [theme, setTheme] = useState(typeof AgendTheme !== "undefined" ? AgendTheme.get() : "system");
-  useEffect(() => (typeof AgendTheme !== "undefined" && typeof AgendTheme.onChange === "function" ? AgendTheme.onChange(setTheme) : undefined), []);
-  const choose = (value) => { setTheme(value); if (typeof AgendTheme !== "undefined") AgendTheme.set(value); savePref("theme", value); };
-  return html`<section class="card s-appearance s-look-display"><h3>${tn("lookDisplayGroup")}</h3>
-    <fieldset id="pref-theme" class="s-theme-picker"><legend>${t("app.theme")}</legend><div class="s-theme-options">
-      ${[["light", "themeLight"], ["dark", "themeDark"], ["system", "themeSystem"]].map(([value, key]) => html`<label key=${value} class=${`s-theme-choice${theme === value ? " selected" : ""}`}>
-        <input type="radio" name="pref-theme-choice" value=${value} checked=${theme === value} onChange=${(event) => { if (event.currentTarget.checked) choose(value); }} />
-        <span class=${`s-theme-miniature is-${value}`} aria-hidden="true"><span class="s-theme-mini-side"><i></i><i></i><i></i></span><span class="s-theme-mini-main"><i></i><i></i><i></i></span></span>
-        <span class="s-theme-choice-label">${t(`app.${key}`)}</span>
-      </label>`)}
-    </div></fieldset>
-    <${SettingsContentWidth} />
-    ${publicLink ? html`<p class="sub">${tn("syncedPublicLink")}</p>` : null}
-  </section>`;
-}
-
-/** This device's layout choice is independent of the Settings Save/Discard bar. */
-function SettingsContentWidth() {
-  const { width } = useStore(settingsContentWidthStore);
-  return html`<div class="s-settings-content-width">
-    <label for="settings-content-width">${t("settingsContentWidth.label")}<span class="s-scope">${t("settingsContentWidth.device")}</span></label>
-    <select id="settings-content-width" value=${width} aria-describedby="settings-content-width-hint" onChange=${(event) => setSettingsContentWidth(Number(event.currentTarget.value))}>
-      ${SETTINGS_CONTENT_WIDTHS.map((value) => html`<option key=${value} value=${value}>${t(`settingsContentWidth.${value === DEFAULT_SETTINGS_CONTENT_WIDTH ? "defaultOption" : "option"}`, value)}</option>`)}
-    </select>
-    <p id="settings-content-width-hint" class="sub">${t("settingsContentWidth.hint")}</p>
-  </div>`;
-}
-
-/** The panels stay mounted inside native details, so drafts, CSS trials and deep links survive disclosure changes. */
-function AppearanceDisclosure({ title, icon, danger = false, children }) {
-  return html`<details class=${`s-look-disclosure${danger ? " is-restore" : ""}`}>
-    <summary><${Icon} name=${icon} size=${17} /><span>${title}</span><${Icon} name="chevron" size=${16} /></summary>
-    <div class="s-look-disclosure-body">${children}</div>
-  </details>`;
-}
-
-/** This preview uses the same live colour and default-size preferences as the existing controls. */
-function AppearancePreview() {
-  useIdentityColors();
-  useStore(cardSizeStore);
-  const size = cardSizeDefault();
-  return html`<aside class="card s-look-preview" aria-labelledby="look-preview-title">
-    <h3 id="look-preview-title">${tn("lookPreview")}</h3>
-    <p class="sub">${tn("lookPreviewHint")}</p>
-    <div class="s-look-sidebar-sample"><${ColorSample} places=${defaultPlaces()} off=${colorsOff()} /></div>
-    <div class=${`s-look-card-sample is-${size}`} aria-hidden="true"><span class="s-look-preview-avatar">A</span>
-      <strong>${tn("colorSample")}</strong><span>${tn("cardSizeTitle")} · ${t(`card.size${size.toUpperCase()}Name`)}</span></div>
-  </aside>`;
+  if (part === "dashboard") return html`<${AppIconCard} /><${CardLimitsCard} />`;
+  const group = (key) => html`<h2 class="s-ap-group">${tn(key)}</h2>`;
+  return html`${group("groupLook")}<${ThemesCard} ...${props} /><${IdentityColorCard} /><${CardSizeCard} />
+    ${group("groupLayout")}<${SidebarWidgetCard} />
+    ${group("groupCss")}<${OwnerCssCard} />
+    ${group("groupMods")}<${ModsCard} />
+    <${RestoreDefaultsCard} ...${props} />`;
 }
 
 /** #2347: the staged keys of this device's own switches (Restore defaults sets them, so their staged change goes). */
@@ -193,23 +106,17 @@ function IdentityColorCard() {
   useIdentityColors();
   const places = defaultPlaces(), off = colorsOff();
   const toggle = (p) => setDefaultPlaces(places.includes(p) ? places.filter((x) => x !== p) : [...places, p]);
-  return html`<details class="card s-appearance s-synced s-colors"><summary class="s-color-summary">
-    <${CardTitle} title=${tn("colorTitle")} topic="colors" />
-    <span class="s-color-summary-places">${off ? html`<span>${tn("colorOff")}</span>` : places.map((p) => html`<span key=${p}>${t(`color.place_${p}`)}</span>`)}</span>
-    <${Icon} name="chevron" size=${16} />
-    </summary>
-    <div class="s-color-settings">
-      <p class="sub">${tn("colorLead")}</p>
-      <div class="s-colors-row">
-        <fieldset class="idc-places" disabled=${off}><legend>${tn("colorPlaces")}</legend>
-          ${PLACEMENTS.map((p) => html`<label key=${p} class="check"><input type="checkbox" checked=${places.includes(p)} onChange=${() => toggle(p)} /> ${t(`color.place_${p}`)}</label>`)}
-        </fieldset>
-        <${ColorSample} places=${places} off=${off} />
-      </div>
-      <label class="check"><input type="checkbox" class="s-colors-off" checked=${off} onChange=${(e) => setColorsOff(e.target.checked)} /> <span>${tn("colorOff")}</span></label>
-      <p class="sub">${tn("colorOffLead")}</p>
+  return html`<section class="card s-appearance s-synced s-colors"><${CardTitle} title=${tn("colorTitle")} topic="colors" />
+    <p class="sub">${tn("colorLead")}</p>
+    <div class="s-colors-row">
+      <fieldset class="idc-places" disabled=${off}><legend>${tn("colorPlaces")}</legend>
+        ${PLACEMENTS.map((p) => html`<label key=${p} class="check"><input type="checkbox" checked=${places.includes(p)} onChange=${() => toggle(p)} /> ${t(`color.place_${p}`)}</label>`)}
+      </fieldset>
+      <${ColorSample} places=${places} off=${off} />
     </div>
-  </details>`;
+    <label class="check"><input type="checkbox" class="s-colors-off" checked=${off} onChange=${(e) => setColorsOff(e.target.checked)} /> <span>${tn("colorOff")}</span></label>
+    <p class="sub">${tn("colorOffLead")}</p>
+  </section>`;
 }
 
 /**
@@ -326,7 +233,7 @@ function AppIconCard() {
     if (auth && auth.canWrite) Promise.resolve(auth.canWrite()).then((v) => setCanWrite(v === true), () => {});
   }, []);
   useEffect(() => () => { if (picked) URL.revokeObjectURL(picked.url); }, [picked]);
-  const title = html`<div class="s-app-icon-heading"><h3 class="s-brand-title">${tn("lookBrandGroup")}</h3><${CardTitle} title=${tn("appIconTitle")} topic="app-icon" /></div>`;
+  const title = html`<${CardTitle} title=${tn("appIconTitle")} topic="app-icon" />`;
   if (!state) return html`<section class="card s-appearance s-app-icon">${title}<p class="sub">…</p></section>`;
   if (state.failed) return html`<section class="card s-appearance s-app-icon">${title}<p class="err">${tn("appIconLoadFailed")}</p></section>`;
 
@@ -383,7 +290,7 @@ function AppIconCard() {
       ${state.custom && !picked ? html`<button type="button" class="btn" disabled=${busy} onClick=${reset}>${tn("appIconReset")}</button>` : null}
     </div>` : html`<p class="sub">${tn("appIconReadOnly")}</p>`}
     <p class="sub">${tn("appIconWho")}</p>
-    <details class="s-app-icon-help"><summary>${tn("lookIconMore")}</summary><p class="sub">${tn("appIconIos")}</p></details>
+    <p class="sub">${tn("appIconIos")}</p>
   </section>`;
 }
 
@@ -428,7 +335,7 @@ function CardLimitsCard() {
     if (r.ok) { setMsg(tn("cardLimitsSaved")); load(); } else setMsg(tn("cardLimitsFailed", (r.body && r.body.error) || r.status));
   };
   const warnings = Array.isArray(view.warnings) ? view.warnings : [];
-  return html`<section class="card s-appearance s-card-limits"><${CardTitle} title=${tn("cardLimitsTitle")} topic="limits" />
+  return html`<section class="card s-appearance"><${CardTitle} title=${tn("cardLimitsTitle")} topic="limits" />
     <p class="sub">${tn("cardLimitsLead")}</p>
     <fieldset class="form" disabled=${busy}>
       ${["portrait", "banner", "instance_quota"].map((g) => html`<div key=${g} class="grid3">
@@ -448,11 +355,8 @@ function CardLimitsCard() {
 }
 
 /** #1629 r2 (d): whether this person's screens show agents' themes (and, as they come, effects) — synced. */
-function ThemesCard({ compact = false } = {}) {
+function ThemesCard() {
   const s = useStore(themesStore);
-  if (compact) return html`<div class="s-look-toggle-line s-themes"><label for="fx-show-themes">${tn("themesShow")}</label>
-    <input id="fx-show-themes" class="s-ui-toggle" type="checkbox" checked=${s.shown} disabled=${safeMode()} onChange=${(e) => setThemesShown(e.target.checked)} />
-    <p class="sub">${safeMode() ? tn("themesSafeMode") : tn("themesShowLead")}</p></div>`;
   return html`<section class="card s-appearance s-synced s-themes"><${CardTitle} title=${tn("themesTitle")} topic="themes" />
     <label class="check"><input id="fx-show-themes" type="checkbox" checked=${s.shown} disabled=${safeMode()} onChange=${(e) => setThemesShown(e.target.checked)} />
       <span>${tn("themesShow")}</span></label>
@@ -606,9 +510,6 @@ function MotionCard(props = {}) {
   const [follow, setFollow] = useState(followsReducedMotion);
   useEffect(() => onMotionChange(() => setFollow(followsReducedMotion())), []);
   const setFollowHere = deviceChoice(props, DEVICE_CHOICES[0], tn("themesFollowMotion"), followsReducedMotion, setFollowsReducedMotion);
-  if (props.compact) return html`<div class="s-look-toggle-line s-motion"><label for="fx-follow-reduced-motion">${tn("themesFollowMotion")}<span class="s-scope">${tn("cssDeviceTitle")}</span></label>
-    <input type="checkbox" class="s-ui-toggle" id="fx-follow-reduced-motion" checked=${follow} onChange=${(e) => setFollowHere(e.target.checked)} />
-    <p class="sub">${tn("themesFollowMotionLead")}</p></div>`;
   return html`<section class="card s-appearance s-local s-motion"><h3>${tn("motionTitle")}</h3>
     <label class="check"><input type="checkbox" id="fx-follow-reduced-motion" checked=${follow} onChange=${(e) => setFollowHere(e.target.checked)} />
       <span>${tn("themesFollowMotion")}</span></label>

package/dist/ui/settings-catalog.js

@@ -2,7 +2,7 @@
 // signed in, new enough: /ui/backends) and the model catalog of that backend for that instance's account (/ui/models).
 // Both answers are the server's cached ones; nothing here makes the server probe. A page asks once and reuses the answer
 // for a short while, so opening several dialogs costs one request each.
-import { useEffect, useRef, useState } from "/assets/app-html.js";
+import { useEffect, useState } from "/assets/app-html.js";
 
 const TTL_MS = 30_000;
 const cache = new Map();   // url → { at, value, pending }
@@ -13,10 +13,10 @@ async function getJson(url) {
   return res.json();
 }
 /** The answer for `url`, shared by every field on the page while it is fresh; null when it cannot be read. */
-function cached(url, force = false) {
+function cached(url) {
   const hit = cache.get(url), now = performance.now();
-  if (hit && (hit.pending || !force && now - hit.at < TTL_MS)) return hit.pending ?? Promise.resolve(hit.value);
-  const pending = getJson(force ? `${url}&refresh=1` : url).then((value) => { cache.set(url, { at: performance.now(), value, pending: null }); return value; })
+  if (hit && (hit.pending || now - hit.at < TTL_MS)) return hit.pending ?? Promise.resolve(hit.value);
+  const pending = getJson(url).then((value) => { cache.set(url, { at: performance.now(), value, pending: null }); return value; })
     .catch(() => { cache.delete(url); return null; });
   cache.set(url, { at: now, value: null, pending });
   return pending;
@@ -45,39 +45,12 @@ export function useBackendRows() {
   return answer && Array.isArray(answer.backends) ? answer.backends : answer === undefined ? undefined : null;
 }
 
-/** Runtime and account are part of the key: Windows never borrows a WSL catalog. */
-export function useModelCatalogState(backend, instance, runtime, machineId) {
-  const url = backend ? `/ui/models?backend=${encodeURIComponent(backend)}${instance ? `&instance=${encodeURIComponent(instance)}` : ""}${runtime === "windows" ? "&runtime=windows" : ""}${machineId ? `&machineId=${encodeURIComponent(machineId)}` : ""}` : null;
-  const [state, setState] = useState({ url:null, answer:null, loading:false });
-  const generation = useRef(0), active = useRef(url);
-  active.current = url;
-  const load = (force = false) => {
-    if (!url) return;
-    const mine = ++generation.current;
-    setState(old => ({ url, answer:old.url === url ? old.answer : null, loading:true }));
-    cached(url, force).then(answer => {
-      if (active.current === url && generation.current === mine) setState({ url, answer, loading:false });
-    });
-  };
-  useEffect(() => {
-    if (url) load();
-    return () => { generation.current++; };
-  }, [url]);
-  const current = state.url === url ? state : { answer:null, loading:!!url };
-  const valid = current.answer && Array.isArray(current.answer.models);
-  return {
-    models: valid ? current.answer.models : [],
-    loading: !!url && current.loading,
-    error: !!url && !current.loading && !valid,
-    source: valid ? current.answer.source : null,
-    refresh: () => load(true),
-  };
-}
-
-/** Compatibility for callers that only need the model list. */
-export function useModelCatalog(backend, instance, runtime) {
-  const state = useModelCatalogState(backend, instance, runtime);
-  return state.loading && !state.models.length ? undefined : state.models;
+/** The model catalog of `backend` for `instance` (its account) — [] when none is cached; undefined while loading. */
+export function useModelCatalog(backend, instance) {
+  const url = backend ? `/ui/models?backend=${encodeURIComponent(backend)}${instance ? `&instance=${encodeURIComponent(instance)}` : ""}` : null;
+  const answer = useAnswer(url);
+  if (answer === undefined) return undefined;
+  return answer && Array.isArray(answer.models) ? answer.models : [];
 }
 
 /** A state that keeps a backend from being chosen (shown, disabled, with why); "unknown" never does. */

package/dist/ui/settings-confirm.js

@@ -196,9 +196,7 @@ export async function confirmedWrite(path, { method = "POST", body, key = newKey
 /** A decided request as the write's own answer. */
 export function outcomeResponse(view) {
   if (view.state === "applied") return { ok: true, status: 200, body: (view.outcome && view.outcome.result) || {}, confirmed: view };
-  const base = (view.outcome && (view.outcome.message || view.outcome.reason_code)) || view.state;
-  // S-35: a failed apply says why (the store bounds and sanitizes the reason).
-  const reason = view.outcome && view.outcome.detail ? `${base} (${view.outcome.detail})` : base;
+  const reason = (view.outcome && (view.outcome.message || view.outcome.reason_code)) || view.state;
   return { ok: false, status: 409, body: { error: reason, pending_state: view.state }, confirmed: view };
 }
 

package/dist/ui/settings-dialogs.js

@@ -17,10 +17,8 @@ import { startOperation } from "./settings-apply.js";
 import { goToTarget } from "./settings-registry.js";
 import { sectionPath } from "/assets/app-route.js";
 import { backendLabel } from "/assets/instance-nav.js";
-import {AgentRuntimeSettings} from "./agent-runtime-settings.js";
 import "./settings-strings.js";   // its words, wherever a picker of this file is used (#2072: Fleet's create dialog too)
-import "./settings-shared-strings.js";   // the words Shared agent settings added and this file draws (backendNotInstalledHost, changeInDefaults, …)
-import { backendChoices, modelChoices, OTHER_MODEL, useBackendRows, useModelCatalogState } from "./settings-catalog.js";
+import { backendChoices, modelChoices, OTHER_MODEL, useBackendRows, useModelCatalog } from "./settings-catalog.js";
 import {
   ACCESS_MODES, AGENT_MODES, CH_TYPES, DASHBOARD_CHOICES, DASHBOARD_FEATURES, HANG_TIMEOUT_DEFAULT_MINUTES, LOG_LEVELS, TOOL_PROGRESS, TOOL_SETS,
   VISIBILITY_MODES, accessConfirmations, agentForm, agentPatch, backendOptions, changedFields, channelId, channelsOf,
@@ -28,7 +26,6 @@ import {
   classicWebEchoEffective, toolSetDefault, worstImpact,
 } from "./settings-model.js";
 import "./settings-codex-copy.js";   // M-2446: the Speed field's words (a retained old settings-strings lacks them)
-import { AccountSelect } from "./accounts-view.js";   // #3212: the Account field (a new module: never a stale named import)
 /** M-2446: Codex speed choices (backend_options.codex.speed); "" = unset. Local, not imported: a stale tab may keep an
  *  older settings-model.js, and a new named import would fail this module's load. */
 const CODEX_SPEED_CHOICES = ["", "standard", "fast"];
@@ -51,11 +48,11 @@ export function Select({ value, options, onChange, disabled, id, label }) {
  * #2072: a backend field shows every backend with what this host says about it — one it cannot run is disabled with
  * why (not installed, not signed in, too old); one not checked yet stays selectable; the current value always can be.
  */
-export function BackendSelect({ value, onChange, disabled, id, hostOnly }) {
+export function BackendSelect({ value, onChange, disabled, id }) {
   const rows = useBackendRows();
   const known = backendOptions(value).filter((o) => !o.unavailable).map((o) => o.value);
   const opts = backendChoices(known, rows || [], value, {
-    notInstalled: tn(hostOnly ? "backendNotInstalledHost" : "backendNotInstalled"), notSignedIn: tn("backendNotSignedIn"), tooOld: (v) => tn("backendTooOld", v),
+    notInstalled: tn("backendNotInstalled"), notSignedIn: tn("backendNotSignedIn"), tooOld: (v) => tn("backendTooOld", v),
     unchecked: tn("backendUnchecked"), removed: (v) => tn("backendUnavailable", v),
   });
   return html`<select id=${id} value=${value} disabled=${disabled} onChange=${(e) => onChange(e.target.value)}>
@@ -67,37 +64,28 @@ export function BackendSelect({ value, onChange, disabled, id, hostOnly }) {
  * the current value in it: choosing "Other…" alone changes nothing — emptying the box is what inherits, #2098 review).
  * `inherit`: the label of the empty choice (inherit / none), or omit it when the field has none.
  */
-export function ModelSelect({ value, onChange, disabled, id, backend, instance, runtime, machineId, inherit, catalogOverride }) {
-  const state = useModelCatalogState(catalogOverride === undefined ? backend : null, instance, runtime, machineId);
-  const catalog = catalogOverride === undefined ? state.models : catalogOverride;
+export function ModelSelect({ value, onChange, disabled, id, backend, instance, inherit }) {
+  const catalog = useModelCatalog(backend, instance);
   const [typing, setTyping] = useState(false);
-  useEffect(() => { setTyping(false); }, [backend, instance, runtime]);
   const opts = modelChoices(catalog || [], value, { notListed: tn("modelNotListed"), other: tn("modelOther") }, inherit);
-  const managed = catalogOverride === undefined && !!backend;
-  const sourceNote = state.source === "cli-list" ? "modelCatalogCliList" : state.source === "cli-cache" ? "modelCatalogCliCache"
-    : ["documented", "official-catalog", "cli-alias"].includes(state.source) ? "modelCatalogOfficial" : "modelCatalogCached";
-  const note = state.loading ? "modelCatalogLoading" : state.error ? "modelCatalogFailed" : !catalog?.length ? "modelCatalogEmpty"
-    : sourceNote;
   return html`<div class="model-pick">
-    <select id=${id} value=${typing ? OTHER_MODEL : value} disabled=${disabled} aria-busy=${managed && state.loading ? "true" : undefined}
+    <select id=${id} value=${typing ? OTHER_MODEL : value} disabled=${disabled}
       onChange=${(e) => { const v = e.target.value; if (v === OTHER_MODEL) setTyping(true); else { setTyping(false); onChange(v); } }}>
       ${opts.map((o) => html`<option key=${o.value} value=${o.value}>${o.label}</option>`)}</select>
     ${typing ? html`<input type="text" aria-label=${tn("modelOtherLabel")} placeholder=${tn("modelOtherPlaceholder")} disabled=${disabled}
-      value=${value} onInput=${(e) => onChange(e.target.value)} />` : null}
-    ${managed ? html`<div class="model-catalog-status"><span class="note" role=${state.error ? "alert" : "status"} aria-live="polite">${state.loading ? html`<span class="out-spin" aria-hidden="true"></span> ` : null}${tn(note)}</span><button type="button" class="btn btn-ghost btn-sm" disabled=${disabled || state.loading} onClick=${state.refresh}>${tn(state.error || !catalog?.length ? "modelCatalogRetry" : "modelCatalogRefresh")}</button></div>` : null}
-  </div>`;
+      value=${value} onInput=${(e) => onChange(e.target.value)} />` : null}</div>`;
 }
 export function Impact({ schema, field }) { return html`<span class="impact">${impactText(impactOf(schema, field))}</span>`; }
 export function Label({ text, schema, field, htmlFor, mark }) {
   return html`<label for=${htmlFor}>${text}${mark ? html` ${mark}` : null}${field ? html` <${Impact} schema=${schema} field=${field} />` : null}</label>`;
 }
 /** #2347 §10: the mark of a value nobody set — what is in effect is the built-in default. */
-export function DefaultMark({ tip }) {
-  return html`<span class="tag s-default" title=${tip || undefined}>${tn("defaultMark")}</span>`;
+export function DefaultMark() {
+  return html`<span class="tag s-default">${tn("defaultMark")}</span>`;
 }
 /** #2347 §10: what an empty field means — the value in effect, in plain text, and where it comes from (the mark, or why). */
-export function InEffect({ text, why, tip }) {
-  return html`<p class="s-effect">${tn("inEffect", text)} ${why ? html`<span class="tag">${why}</span>` : html`<${DefaultMark} tip=${tip} />`}</p>`;
+export function InEffect({ text, why }) {
+  return html`<p class="s-effect">${tn("inEffect", text)} ${why ? html`<span class="tag">${why}</span>` : html`<${DefaultMark} />`}</p>`;
 }
 /**
  * #2347 §10: what an inherited field inherits — its value, marked "default" when nobody set it there either — and a
@@ -153,9 +141,9 @@ export function ChipList({ items, onChange, placeholder, label }) {
 const replyHint = (backend, mode, kiroUi) => (replyGuardSupported(backend, mode, kiroUi) ? tn("replyGuardSupported") : tn("replyGuardUnsupported", backend, mode));
 
 /** The dialog every editor uses: Cancel / Stage change; the footer says what the changes made so far will cost (#2346: only the fields that changed). */
-function EditDialog({ title, subtitle, onClose, onStage, impacts, schema, children, ready = true, wide = true, drawer = false }) {
+function EditDialog({ title, subtitle, onClose, onStage, impacts, schema, children, ready = true, wide = true }) {
   const kinds = [...new Set((impacts || []).map((f) => impactOf(schema, f)))];
-  return html`<${Dialog} title=${title} label=${subtitle ? `${title} — ${subtitle}` : title} onClose=${onClose} wide=${wide} drawer=${drawer}
+  return html`<${Dialog} title=${title} label=${subtitle ? `${title} — ${subtitle}` : title} onClose=${onClose} wide=${wide}
     actions=${html`${kinds.length ? html`<span class="note dlg-impact">${kinds.map(impactText).join(" · ")}</span>` : null}
       <button type="button" class="btn" onClick=${onClose}>${tn("cancel")}</button>
       <button type="button" class="btn btn-primary" disabled=${!ready} onClick=${onStage}>${tn("modalDone")}</button>`}>
@@ -288,24 +276,9 @@ export function AgentDialog({ name, inst, ctx, onClose }) {
     auto: f.inherit.auto_pause_after ? "" : nonNegative(f.auto_pause_after),
     hang: f.inherit.hang ? "" : positive(f.hang),
   };
-  // #3008 G1: a fleet with no chat connection has one General at most — ticking a second says which one it is, right
-  // by the checkbox (kept ticked, Save waits), by the name the chat list shows (the leader's string 18).
-  const otherGeneral = !channelsOf(fleet).length && f.general_topic && !inst.general_topic
-    ? Object.entries(fleet.instances || {}).find(([other, c]) => other !== name && c && (c.general_topic === true || (other === "general" && c.general_topic !== false))) : null;
-  const generalError = otherGeneral ? tn("oneGeneral", ctx.shortName(otherGeneral[0], otherGeneral[1])) : "";
   const failoverWarn = !f.inherit.model_failover && !f.model_failover.trim() ? "failoverEmpty" : "";
-  const ready = !errors.auto && !errors.hang && !generalError;
-  // #3212: the agent's own credential profile for its CLI ("" = none: it follows the fleet default). Host agents only.
-  const acctBackend = f.backend || defaults.backend || "claude-code";
-  const ownAccount = (inst.backend_options && inst.backend_options[acctBackend] && inst.backend_options[acctBackend].credential_profile) || "";
-  const [acct, setAcct] = useState(ownAccount);
-  const pending = () => {
-    const patch = agentPatch({ ...f, status_emojis: emojis.value }, inst, defaults, visibilityBaseline, emojis.baseline);
-    if (inst.runtime === "windows" || acct === ownAccount) return patch;
-    const opts = { ...(patch.backend_options || {}) };
-    opts[acctBackend] = { ...(opts[acctBackend] || {}), credential_profile: acct || null };
-    return { ...patch, backend_options: opts };
-  };
+  const ready = !errors.auto && !errors.hang;
+  const pending = () => agentPatch({ ...f, status_emojis: emojis.value }, inst, defaults, visibilityBaseline, emojis.baseline);
   const stage = () => {
     if (!ready) return;
     const patch = pending();
@@ -319,20 +292,20 @@ export function AgentDialog({ name, inst, ctx, onClose }) {
   const inh = (k, value, target, kind, set = hasOwn(defaults, k)) => ({ text: valueText(value, kind), builtin: !set, from: target ? inAgentDefaults(target) : null });
   const inheritedBackend = !inst.backend && f.backend === (defaults.backend || "claude-code");
   const L = (text, field, id) => html`<${Label} text=${text} schema=${schema} field=${field} htmlFor=${id} />`;
-  return html`<${EditDialog} title=${ctx.shortName(name, inst)} subtitle=${tn("idLine", name)} onClose=${onClose} onStage=${stage} ready=${ready} drawer=${true} impacts=${Object.keys(pending()).map((k) => `instance.${k}`)} schema=${schema}>
-    <${AgentRuntimeSettings} name=${name} inst=${{...inst,backend:f.backend}} inherited=${inheritedBackend ? html`<${Inherited} ...${inh("backend", f.backend, "#g-be", "backend")} />` : null} disabled=${Object.keys(pending()).length>0||ctx.staged?.size>0} onChanged=${()=>{ctx.reload();onClose();}}/>
+  return html`<${EditDialog} title=${ctx.shortName(name, inst)} subtitle=${tn("idLine", name)} onClose=${onClose} onStage=${stage} ready=${ready} impacts=${Object.keys(pending()).map((k) => `instance.${k}`)} schema=${schema}>
     <div class="grid2">
       <div class="field">${L(tn("displayName"), "instance.display_name", "ag-dn")}
         <${Override} inherit=${f.inherit.display_name} onInherit=${setInherit("display_name")} inherited=${inh("display_name", defaults.display_name || name, null, "", !!defaults.display_name)}>
           <input id="ag-dn" type="text" placeholder=${name} disabled=${f.inherit.display_name} value=${shown("display_name", f.display_name, defaults.display_name || "")} onInput=${(e) => set("display_name")(e.target.value)} /></${Override}></div>
       <div class="field">${L(tn("description"), "instance.description", "ag-desc")}<input id="ag-desc" type="text" value=${f.description} onInput=${(e) => set("description")(e.target.value)} /></div>
+      <div class="field">${L(tn("backend"), "instance.backend", "ag-be")}<${BackendSelect} id="ag-be" value=${f.backend} onChange=${set("backend")} />
+        ${inheritedBackend ? html`<${Inherited} ...${inh("backend", f.backend, "#g-be", "backend")} />` : null}</div>
       <div class="field">${L(tn("model"), "instance.model", "ag-model")}<${ModelSelect} id="ag-model" value=${f.model} onChange=${set("model")}
         backend=${f.backend || defaults.backend || "claude-code"} instance=${name} inherit=${tn("inheritValue", defaults.model || tn("modelCliDefault"))} /></div>
-      ${(f.backend || defaults.backend || "claude-code") === "codex" && inst.runtime !== "windows" ? html`<div class="field codex-speed">${L(tn("codexSpeed"), "instance.backend_options", "ag-speed")}
+      ${(f.backend || defaults.backend || "claude-code") === "codex" ? html`<div class="field codex-speed">${L(tn("codexSpeed"), "instance.backend_options", "ag-speed")}
         <${Select} id="ag-speed" value=${f.codex_speed} onChange=${set("codex_speed")}
           options=${CODEX_SPEED_CHOICES.map((v) => ({ value: v, label: tn(v === "fast" ? "codexSpeedFast" : v === "standard" ? "codexSpeedStandard" : "codexSpeedDefault") }))} />
         <p class="note">${tn("codexSpeedHint")}</p></div>` : null}
-      ${inst.runtime !== "windows" && ["claude-code", "codex", "kiro-cli"].includes(acctBackend) ? html`<${AccountSelect} id="ag-account" backend=${acctBackend} value=${acct} onChange=${setAcct} />` : null}
     </div>
     <div class="field">${L(tn("workingDir"), "instance.working_directory", "ag-wd")}<input id="ag-wd" type="text" value=${f.working_directory} onInput=${(e) => set("working_directory")(e.target.value)} /></div>
     <div class="field">${L(`${tn("autoPause")} (${tn("minutes")})`, "instance.auto_pause_after", "ag-auto")}
@@ -386,9 +359,8 @@ export function AgentDialog({ name, inst, ctx, onClose }) {
       </div>
       <div class="field">${L(tn("systemPrompt"), "instance.systemPrompt", "ag-sys")}<input id="ag-sys" type="text" placeholder="e.g. file:prompts/dev.md" value=${f.systemPrompt} onInput=${(e) => set("systemPrompt")(e.target.value)} /></div>
       <div class="field">${L(tn("tags"), "instance.tags")}<${ChipList} items=${f.tags} onChange=${set("tags")} placeholder=${tn("tagPlaceholder")} label=${tn("tags")} /></div>
-      <label class="check"><input id="ag-general" type="checkbox" checked=${f.general_topic} onChange=${(e) => set("general_topic")(e.target.checked)} /><span>${tn("generalTopicField")}</span>
+      <label class="check"><input type="checkbox" checked=${f.general_topic} onChange=${(e) => set("general_topic")(e.target.checked)} /><span>${tn("generalTopicField")}</span>
         <${Impact} schema=${schema} field="instance.general_topic" /></label>
-      ${generalError ? html`<p class="feedback error" role="alert" id="ag-general-one">${generalError}</p>` : null}
     </${Drawer}>
     <${Drawer} title=${tn("statusEmojis")}>
       <p class="note">${tn("statusEmojisInstance")} <${Impact} schema=${schema} field="instance.status_emojis" /></p>

package/dist/ui/settings-guests.js

@@ -11,12 +11,12 @@
 // reset from ctx.fleet), ctx.readOnly (the public link: controls disabled, actions hidden), `s-dirty` on edited rows.
 import { html, useEffect, useMemo, useState } from "/assets/app-html.js";
 import { t } from "/assets/app-i18n.js";
+import { Skeleton } from "/assets/ui-states.js";
 import { toast } from "/assets/ui-toast.js";
 import { confirmDialog } from "/assets/ui-confirm.js";
 import { api } from "./settings-confirm.js";
 import { DEFAULT_SCHEMA, impactOf } from "./settings-model.js";
 import "./settings-strings.js";
-import { layoutText } from "./settings-layout.js";
 
 const tn = (k, ...v) => t(`settings.${k}`, ...v);
 const PLATFORMS = { discord: "Discord", telegram: "Telegram" };
@@ -94,7 +94,6 @@ export function GuestsSection({ ctx, staged }) {
   const [overview, setOverview] = useState(null), [failed, setFailed] = useState(false);
   const [people, setPeople] = useState(null), [query, setQuery] = useState(""), [editing, setEditing] = useState(null);
   const [sendState, setSendState] = useState({}), [now, setNow] = useState(() => Date.now());
-  const [viewedGuest, setViewedGuest] = useState(null);
   const [status, setStatus] = useState(null);                 // { kind: "waiting" } | { kind: "failed", error }
   const load = async () => {
     let r = null;
@@ -213,7 +212,6 @@ export function GuestsSection({ ctx, staged }) {
   };
 
   const rows = f.grants ? [...new Set([...Object.keys(f.grants), ...Object.keys(original.grants || {})])] : [];
-  const activeGuest = rows.includes(editing) ? editing : rows.includes(viewedGuest) ? viewedGuest : rows[0];
   const q = query.trim().toLowerCase();
   const candidates = (people || []).filter((p) => !(f.grants && own(f.grants, accountKey(p))))
     .filter((p) => !q || [p.name, p.username, p.userId].some((x) => typeof x === "string" && x.toLowerCase().includes(q))).slice(0, 8);
@@ -221,32 +219,21 @@ export function GuestsSection({ ctx, staged }) {
   return html`<section class="card s-guests" id="guests"><h3>${tn("guestsTitle")}</h3>
     <p class="note">${tn("grantsHint")}</p>
     <fieldset class="s-guest-fields" disabled=${readOnly}>
-<div class="s-guest-policy"><div>      <label class=${`check${f.enabled !== original.enabled ? " s-dirty" : ""}`}><input class="s-ui-toggle" id="guestsEnabled" type="checkbox" checked=${f.enabled} onChange=${(e) => set({ enabled: e.target.checked })} /><span>${tn("guestsEnabled")}</span></label>
+      <label class=${`check${f.enabled !== original.enabled ? " s-dirty" : ""}`}><input id="guestsEnabled" type="checkbox" checked=${f.enabled} onChange=${(e) => set({ enabled: e.target.checked })} /><span>${tn("guestsEnabled")}</span></label>
       <p class="note">${tn("guestsEnabledHint")}</p>
-</div><div>      <label class=${`check${f.chat !== original.chat ? " s-dirty" : ""}`}><input class="s-ui-toggle" id="guestsChat" type="checkbox" checked=${f.chat} onChange=${(e) => set({ chat: e.target.checked })} /><span>${tn("guestsChat")}</span></label>
+      <label class=${`check${f.chat !== original.chat ? " s-dirty" : ""}`}><input id="guestsChat" type="checkbox" checked=${f.chat} onChange=${(e) => set({ chat: e.target.checked })} /><span>${tn("guestsChat")}</span></label>
       <p class="note">${tn("guestsChatHint")}</p>
-</div></div>
       ${failed ? html`<p class="note" role="status">${tn("guestsLoadFailed")} <button type="button" class="btn btn-sm" onClick=${load}>${t("app.retry")}</button></p>`
-        : !overview ? html`<p class="note">${t("app.loading")}</p>` : null}
+        : !overview ? html`<${Skeleton} variant="rows" lines=${3} />` : null}
       ${!f.grants && overview ? html`<div class="g-legacy"><p class="note">${tn("grantsLegacy")}</p>
         ${readOnly ? null : html`<button type="button" class="btn btn-sm" id="grantsConvert" onClick=${convert}>${tn("grantsConvert")}</button>`}</div>` : null}
-<div class="s-guest-workbench"><section class="s-guest-list-card"><h4>${layoutText("revGuestManagement")}</h4>
-      <div class="s-guest-columns" aria-hidden="true"><span>${tn("guestsTitle")}</span><span>${layoutText("revVisibleAgents")}</span><span>${layoutText("revGuestLevel")}</span><span>${tn("settingsButton")}</span></div>
-      ${!rows.length ? html`<p class="note" id="grantsNone">${tn("grantsNoneYet")}</p>` : html`<ul class="guest-list">${rows.map(k => {
-        const person=who(k), grant=f.grants?.[k] || original.grants?.[k];
-        return html`<li key=${k} class=${`guest-summary${activeGuest === k ? " is-selected" : ""}`}>
-          <span class="g-summary-name"><strong>${person.name}</strong><small>${PLATFORMS[person.platform] || person.platform}</small></span>
-          <span class="g-summary-agents">${(grant?.instances || []).map(n => html`<span key=${n}>${shownName(rooms,n)}</span>`)}</span>
-          <span>${tn(levelOf(grant) === "trusted" ? "grantsLevelTrusted" : "grantsLevelChat")}</span>
-          <button type="button" class="btn btn-sm" aria-pressed=${activeGuest === k ? "true" : "false"} aria-controls=${`guest-detail-${encodeURIComponent(k)}`} onClick=${() => {setViewedGuest(k);setEditing(k);}}>${tn("settingsButton")}</button>
-        </li>`;
-      })}</ul>`}</section>
-      <aside class="s-guest-detail-card" aria-label=${layoutText("revGuestDetail")}>${rows.map((k) => {
+      <h4>${tn("grantsWithAccess")}</h4>
+      ${!rows.length ? html`<p class="note" id="grantsNone">${tn("grantsNoneYet")}</p>` : html`<ul class="guest-list">${rows.map((k) => {
         const person = who(k), draft = f.grants && f.grants[k], saved = original.grants && original.grants[k];
         const removed = !draft, added = !saved, dirty = removed || added || !sameGrant(draft, saved);
         const applied = !!saved && saved.instances.length > 0 && !dirty;
         const ss = sendState[k] || {}, cooling = ss.until && ss.until > now;
-        return html`<section key=${k} hidden=${!readOnly && activeGuest !== k} id=${`guest-detail-${encodeURIComponent(k)}`} class=${`guest-row${dirty ? " s-dirty" : ""}${removed ? " g-removed" : ""}`} data-account=${k}>
+        return html`<li key=${k} class=${`guest-row${dirty ? " s-dirty" : ""}${removed ? " g-removed" : ""}`} data-account=${k}>
           <div class="g-head"><span class="g-av" aria-hidden="true">${(person.name || "?").slice(0, 1).toUpperCase()}</span>
             <div class="g-id"><strong>${person.name}</strong> <span class="note">${PLATFORMS[person.platform] || person.platform}${person.username ? ` · @${person.username}` : ""}</span></div>
             ${removed ? html`<span class="g-state">${tn("grantsWillBeRemoved")}</span>` : added ? html`<span class="g-state">${tn("grantsNew")}</span>` : pill(person)}</div>
@@ -269,23 +256,23 @@ export function GuestsSection({ ctx, staged }) {
               : html`<button type="button" class="btn btn-sm" onClick=${() => setGrant(k, { ...saved })}>${tn("grantsUndoRemove")}</button>`}
             ${person.guest && (person.guest.sessions || person.guest.devices) ? html`<button type="button" class="btn btn-sm" onClick=${() => signOut(person)}>${tn("guestSignOut")}</button>` : null}
           </div>`}
-        </section>`;
-      })}${!rows.length ? html`<p class="note">${layoutText("revSelectGuest")}</p>` : null}</aside></div>
-      ${readOnly ? null : html`<details class="s-guest-add"><summary>${tn("grantsAdd")}</summary><div>
+        </li>`;
+      })}</ul>`}
+      ${readOnly ? null : html`<h4>${tn("grantsAdd")}</h4>
         <input type="search" class="input g-search" id="grantsSearch" value=${query} aria-label=${tn("grantsSearch")} placeholder=${tn("grantsSearch")} onInput=${(e) => setQuery(e.target.value)} />
-        ${people === null ? html`<p class="note">${t("app.loading")}</p>` : !candidates.length ? html`<p class="note" id="grantsNoPeople">${tn("grantsNoPeople")}</p>`
+        ${people === null ? html`<${Skeleton} variant="rows" lines=${3} />` : !candidates.length ? html`<p class="note" id="grantsNoPeople">${tn("grantsNoPeople")}</p>`
           : html`<ul class="g-pick">${candidates.map((p) => html`<li key=${accountKey(p)} class="g-cand" data-account=${accountKey(p)}>
             <span class="g-av" aria-hidden="true">${(p.name || "?").slice(0, 1).toUpperCase()}</span>
             <div class="g-id"><strong>${p.name}</strong> <span class="note">${PLATFORMS[p.platform] || p.platform}${p.username ? ` · @${p.username}` : ""} · <span class="g-when">${tn("grantsLastSeen", new Date(p.lastSeen).toLocaleString())}</span></span>
               ${p.instances && p.instances.length ? html`<div class="note">${wroteTo(p.instances)}</div>` : null}</div>
-            <button type="button" class="btn btn-sm" onClick=${() => { const k = accountKey(p); setGrant(k, { ...(p.name ? { name: p.name } : {}), instances: choosable.filter((n) => (p.instances || []).includes(n)) }); setEditing(k); }}>${tn("grantsChoose")}</button></li>`)}</ul>`}</div></details>`}
+            <button type="button" class="btn btn-sm" onClick=${() => { const k = accountKey(p); setGrant(k, { ...(p.name ? { name: p.name } : {}), instances: choosable.filter((n) => (p.instances || []).includes(n)) }); setEditing(k); }}>${tn("grantsChoose")}</button></li>`)}</ul>`}`}
     </fieldset>
-    ${overview && overview.audit ? html`<details class="s-guest-audit"><summary>${tn("grantsRecent")}</summary>${!overview.audit.length ? html`<p class="note" id="grantsRecentNone">${tn("grantsRecentNone")}</p>`
+    ${overview && overview.audit ? html`<h4>${tn("grantsRecent")}</h4>${!overview.audit.length ? html`<p class="note" id="grantsRecentNone">${tn("grantsRecentNone")}</p>`
       : html`<ul class="g-audit" id="grantsRecentList">${overview.audit.map((e, i) => html`<li key=${`${e.at}-${i}`} class="g-audit-row" data-kind=${e.kind}>
         <span class="g-when">${new Date(e.at).toLocaleString()}</span> <strong>${e.name}</strong>
         ${e.kind === "grant" ? html`${e.added.map((n) => html` <span key=${`+${n}`} class="g-wrote g-add">+${n}</span>`)}${e.removed.map((n) => html` <span key=${`-${n}`} class="g-wrote g-del">−${n}</span>`)}${e.level ? html` <span class="g-wrote g-level-to">${tn("grantsAuditLevel", tn(e.level === "trusted" ? "grantsLevelTrusted" : "grantsLevelChat"))}</span>` : null}
           <span class="note"> · <span class="g-wrote">${tn(e.via === "confirmed" ? "grantsAuditConfirmed" : "grantsAuditDirect")}</span>${e.endedSessions ? html` · <span class="g-wrote">${tn("grantsAuditEnded", e.endedSessions)}</span>` : null}</span>`
-        : html` <span class="note">${e.outcome === "sent" ? tn("grantsAuditCodeSent") : tn("grantsAuditCodeNot", auditOutcome(e.outcome))}</span>`}</li>`)}</ul>`}</details>` : null}
+        : html` <span class="note">${e.outcome === "sent" ? tn("grantsAuditCodeSent") : tn("grantsAuditCodeNot", auditOutcome(e.outcome))}</span>`}</li>`)}</ul>`}` : null}
     ${status && status.kind === "waiting" ? html`<p class="note" role="status">${tn("grantsWaiting")}</p>` : null}
     ${status && status.kind === "failed" ? html`<p class="note g-error" role="alert">${tn("grantsSaveFailed", status.error)}</p>` : null}
   </section>`;

package/dist/ui/settings-model.js

@@ -23,8 +23,7 @@ export const TOOL_SETS = ["worker", "coordinator", "standard", "minimal", "full"
 export function toolSetDefault(defaults, inst, name = "") {
   if (TOOL_SETS.includes(defaults && defaults.tool_set)) return defaults.tool_set;
   const general = hasOwn(inst, "general_topic") ? inst.general_topic === true : !!defaults && defaults.general_topic === true;
-  // The literal-name fallback, unless unticked (general-instance.ts generalByName: an explicit general_topic: false).
-  return general || (name === "general" && !(hasOwn(inst, "general_topic") && inst.general_topic === false)) ? "general" : "worker";
+  return general || name === "general" ? "general" : "worker";
 }
 export const TOOL_PROGRESS = ["off", "standard", "verbose"];
 export const AGENT_MODES = ["mcp", "cli"];
@@ -75,14 +74,6 @@ export const visibilityDefault = (defaults) => (VISIBILITY_MODES.includes(defaul
 export const replyGuardSupported = (backend, mode, kiroUi = "legacy") =>
   mode === "mcp" && (["claude-code", "codex", "muse"].includes(backend) || (backend === "kiro-cli" && ["legacy", "tui"].includes(kiroUi || "legacy")));
 
-/**
- * Backends AgEnD no longer runs, with the one to use instead (#1280). The browser cannot import src/backend/removed.ts;
- * tests/settings-removed-backend-1280.test.ts keeps this list equal to it.
- */
-export const REMOVED_BACKEND_REPLACEMENTS = Object.freeze({ "gemini-cli": "antigravity" });
-export const removedBackendReplacement = (backend) =>
-  typeof backend === "string" && Object.prototype.hasOwnProperty.call(REMOVED_BACKEND_REPLACEMENTS, backend) ? REMOVED_BACKEND_REPLACEMENTS[backend] : null;
-
 /**
  * The backend picker's options. A current value it does not offer (the removed gemini-cli, #1280 review) stays first
  * and selected: otherwise the select falls to its first option and an unrelated edit switches the CLI and account.