Simplify the frontend: dead code, shared test helpers and godfile splits

apps/desktop-tauri/scripts/check-locale-drift.mjs

@@ -56,10 +56,39 @@ const tsBlockMatch = tsSrc.match(
 if (!tsBlockMatch) {
   die(2, "could not locate `export const ALL_LOCALE_KEYS` in keys.ts");
 }
+// The block holds `"Key"` literals and `...TOPIC_KEYS` spreads of arrays
+// imported from i18n/keyGroups/*.ts; resolve both in order.
 const tsKeys = [];
 const tsKeyRe = /"(\w+)"/g;
-while ((m = tsKeyRe.exec(tsBlockMatch[1])) !== null) {
-  tsKeys.push(m[1]);
+const entryRe = /"(\w+)"|\.\.\.([A-Z_]+)/g;
+while ((m = entryRe.exec(tsBlockMatch[1])) !== null) {
+  if (m[1]) {
+    tsKeys.push(m[1]);
+    continue;
+  }
+  const name = m[2];
+  const importMatch = tsSrc.match(
+    new RegExp(`import\\s*\\{\\s*${name}\\s*\\}\\s*from\\s*"(\\./[^"]+)"`),
+  );
+  if (!importMatch) {
+    die(2, `could not resolve the import of ${name} in keys.ts`);
+  }
+  let groupSrc;
+  try {
+    groupSrc = readFileSync(resolve(dirname(tsPath), `${importMatch[1]}.ts`), "utf8");
+  } catch (err) {
+    die(2, `failed to read ${importMatch[1]}.ts: ${err.message}`);
+  }
+  const groupMatch = groupSrc.match(
+    new RegExp(`export const ${name}\\s*=\\s*\\[([\\s\\S]*?)\\]\\s*as const;`),
+  );
+  if (!groupMatch) {
+    die(2, `could not locate \`export const ${name}\` in ${importMatch[1]}.ts`);
+  }
+  let k;
+  while ((k = tsKeyRe.exec(groupMatch[1])) !== null) {
+    tsKeys.push(k[1]);
+  }
 }
 if (tsKeys.length === 0) {
   die(2, "parsed zero entries from ALL_LOCALE_KEYS");

apps/desktop-tauri/src/App.test.tsx

@@ -59,89 +59,15 @@ vi.mock("./hooks/useSurfaceSnapshot", () => ({
 
 import App from "./App";
 import { buildBundle } from "./test/localeHarness";
-import type { BootstrapState, SettingsSnapshot } from "./types/bridge";
+import type { BootstrapState } from "./types/bridge";
+import { makeSettings } from "./test/fixtures";
 
-function settings(overrides: Partial<SettingsSnapshot> = {}): SettingsSnapshot {
-  return {
-    enabledProviders: ["codex", "claude"],
-    refreshIntervalSecs: 300,
-    adaptiveRefresh: false,
-    refreshAllProvidersOnMenuOpen: false,
-  lowPowerMode: false,
-    startAtLogin: false,
-    startMinimized: false,
-    showNotifications: true,
-    soundEnabled: true,
-    notificationSoundTheme: "windows",
-    notificationSoundPaths: {
-      predictiveWarning: null,
-      highUsage: null,
-      criticalUsage: null,
-      exhausted: null,
-      statusIssue: null,
-      sessionDepleted: null,
-      sessionRestored: null,
-    },
-    highUsageThreshold: 70,
-    criticalUsageThreshold: 90,
-    predictivePaceWarningEnabled: false,
-    credentialExpiryNotificationsEnabled: false,
-    trayIconMode: "single",
-    switcherShowsIcons: true,
-    menuBarShowsHighestUsage: false,
-    menuBarShowsPercent: false,
-    menuBarColorPace: false,
-    showAsUsed: true,
-    showAllTokenAccountsInMenu: false,
-    enableAnimations: true,
-    resetTimeRelative: true,
-    showResetWhenExhausted: false,
-    menuBarDisplayMode: "detailed",
-    overviewLayout: "detailed",
-    hidePersonalInfo: false,
-    updateChannel: "stable",
-    autoDownloadUpdates: false,
-    installUpdatesOnQuit: false,
-    globalShortcut: "Ctrl+Shift+U",
-    switcherShortcuts: {},
-    codexCustomSessionsDirs: [],
-    uiLanguage: "english",
-    // "dark" (not "auto") so useTheme's effect short-circuits before ever
-    // touching window.matchMedia, which jsdom doesn't implement here.
-    theme: "dark",
-    windowScalePercent: 125,
-    trayScalePercent: 100,
-    trayPanelAlwaysOnTop: false,
-    powertoysStatusPipeEnabled: false,
-    claudeAvoidKeychainPrompts: false,
-    codexSparkUsageVisible: true,
-    disableKeychainAccess: false,
-    providerMetrics: {},
-    floatBarEnabled: false,
-    floatBarOpacity: 80,
-    floatBarScale: 100,
-    floatBarOrientation: "horizontal",
-    floatBarStyle: "floating",
-    floatBarClickThrough: false,
-    floatBarProviderIds: [],
-    floatBarDarkText: false,
-    floatBarShowResetInline: false,
-    floatBarShowCost: false,
-    claudeDailyRoutinesUsageVisible: true,
-    claudeAllowReadingClaudeCodeCredentials: false,
-    alibabaTokenPlanRegion: "cn",
-    weeklyProgressWorkDays: null,
-    costSummaryDisplayStyle: "compact",
-    providerAccentColors: {},
-    ...overrides,
-  };
-}
 
 function bootstrap(): BootstrapState {
   return {
     contractVersion: "v1",
     providers: [],
-    settings: settings(),
+    settings: makeSettings(),
   };
 }
 
@@ -151,7 +77,7 @@ describe("App window-label routing", () => {
     webviewWindowMocks.label = "main";
     surfaceMocks.snapshot = { mode: "hidden", target: { kind: "summary" } };
     tauriMocks.getBootstrapState.mockResolvedValue(bootstrap());
-    tauriMocks.getSettingsSnapshot.mockResolvedValue(settings());
+    tauriMocks.getSettingsSnapshot.mockResolvedValue(makeSettings());
     tauriMocks.checkForUpdates.mockResolvedValue({
       status: "idle",
       version: null,

apps/desktop-tauri/src/components/AgentSessions.test.tsx

@@ -11,9 +11,7 @@ vi.mock("../lib/tauri", () => ({
   focusAgentSession: api.focusAgentSession,
 }));
 // t(key) returns the key, so provider labels assert against locale-key names.
-vi.mock("../hooks/useLocale", () => ({
-  useLocale: () => ({ t: (key: string) => key, language: "english" }),
-}));
+vi.mock("../hooks/useLocale", () => import("../test/mocks/locale"));
 
 import AgentSessions from "./AgentSessions";
 import type { AgentSession } from "../types/bridge";

apps/desktop-tauri/src/components/ClaudeAccountUsage.test.tsx

@@ -3,7 +3,7 @@ import { describe, expect, it, vi } from "vitest";
 import type { ClaudeAccount } from "../types/bridge";
 import ClaudeAccountUsage from "./ClaudeAccountUsage";
 
-vi.mock("../hooks/useLocale", () => ({ useLocale: () => ({ t: (key: string) => key }) }));
+vi.mock("../hooks/useLocale", () => import("../test/mocks/locale"));
 const t = (key: string) => key;
 const account: ClaudeAccount = {
   id: "one:org", email: "one@example.test", organization: null, plan: "max", isActive: false, isSaved: true,

apps/desktop-tauri/src/components/ClaudeAccountsMenu.test.tsx

@@ -21,7 +21,7 @@ const mocks = vi.hoisted(() => {
 });
 vi.mock("../lib/tauri", () => mocks);
 vi.mock("@tauri-apps/api/event", () => ({ listen: mocks.listen }));
-vi.mock("../hooks/useLocale", () => ({ useLocale: () => ({ t: (key: string) => key }) }));
+vi.mock("../hooks/useLocale", () => import("../test/mocks/locale"));
 import ClaudeAccountsMenu from "./ClaudeAccountsMenu";
 
 const first: ClaudeAccount = { id: "first:org", email: "first@example.com", organization: "Personal", plan: "max", isActive: true, isSaved: true };

apps/desktop-tauri/src/components/CodexAccountsMenu.tsx

@@ -1,10 +1,6 @@
-import { useCallback, useEffect, useState } from "react";
-import { listen } from "@tauri-apps/api/event";
-import type {
-  CodexAccount,
-  CodexAccountsStateBridge,
-  CodexAccountUsageSnapshot,
-} from "../types/bridge";
+import { useEffect, useState } from "react";
+import type { CodexAccount, CodexAccountUsageSnapshot } from "../types/bridge";
+import { useCodexAccountsState } from "../hooks/useCodexAccountsState";
 import { useLocale } from "../hooks/useLocale";
 import { useFormattedResetTime } from "../hooks/useFormattedResetTime";
 import ProviderAccountsMenu from "./ProviderAccountsMenu";
@@ -13,7 +9,6 @@ import {
   codexAccountAdd,
   codexAccountReauthenticate,
   codexAccountSwitch,
-  getCodexAccountsState,
   refreshProviders,
 } from "../lib/tauri";
 
@@ -32,56 +27,26 @@ export default function CodexAccountsMenu({
   onLayoutChange?: () => void;
 }) {
   const { t } = useLocale();
-  const [accounts, setAccounts] = useState<CodexAccount[]>([]);
-  const [snapshots, setSnapshots] = useState<
-    Record<string, CodexAccountUsageSnapshot>
-  >({});
-  const [displayNames, setDisplayNames] = useState<Record<string, string>>({});
-  const [accountOrdinals, setAccountOrdinals] = useState<Record<string, number>>({});
-  const [accountNeedsAuthentication, setAccountNeedsAuthentication] = useState<Record<string, boolean>>({});
-  const [loading, setLoading] = useState(true);
+  const {
+    accounts,
+    snapshots,
+    displayNames,
+    accountOrdinals,
+    needsAuthentication: accountNeedsAuthentication,
+    loading,
+    error,
+    setError,
+    load,
+  } = useCodexAccountsState();
   const [pending, setPending] = useState(false);
   const [signingIn, setSigningIn] = useState(false);
   const busy = loading || pending;
-  const [error, setError] = useState<string | null>(null);
   const [switched, setSwitched] = useState(false);
 
-  const load = useCallback(async () => {
-    setLoading(true);
-    setError(null);
-    try {
-      const next: CodexAccountsStateBridge = await getCodexAccountsState();
-      setAccounts(next.accounts);
-      setDisplayNames(next.displayNames ?? {});
-      setAccountOrdinals(next.accountOrdinals);
-      setSnapshots(next.snapshots);
-      setAccountNeedsAuthentication(next.needsAuthentication ?? {});
-    } catch (err: unknown) {
-      setError(err instanceof Error ? err.message : String(err));
-    } finally {
-      setLoading(false);
-    }
-  }, []);
-
-  useEffect(() => {
-    void load();
-  }, [load]);
-
   useEffect(() => {
     onLayoutChange?.();
   }, [accounts, snapshots, error, pending, switched, onLayoutChange]);
 
-  useEffect(() => {
-    let cancelled = false;
-    const unlistenPromise = listen("codex-accounts-updated", () => {
-      if (!cancelled) void load();
-    });
-    return () => {
-      cancelled = true;
-      void unlistenPromise.then((fn) => fn());
-    };
-  }, [load]);
-
   const run = async (action: () => Promise<unknown>, login = false) => {
     setSwitched(false);
     setSigningIn(login);

apps/desktop-tauri/src/components/FormControls.tsx

@@ -1,5 +1,6 @@
 import type React from "react";
 import { createContext, useContext, useId } from "react";
+import type { SettingsSnapshot, SettingsUpdate } from "../types/bridge";
 
 // A Field's label and description ids, so the control inside it gets an
 // accessible name without every call site passing `ariaLabel`.
@@ -154,3 +155,80 @@ export function Field({
     </div>
   );
 }
+
+// ── settings-bound rows ──────────────────────────────────────────────
+
+export interface SettingsControl {
+  settings: SettingsSnapshot;
+  set: (patch: SettingsUpdate) => void;
+  saving: boolean;
+}
+
+type SettingKey<T> = {
+  [K in keyof SettingsUpdate & keyof SettingsSnapshot]-?: NonNullable<SettingsUpdate[K]> extends T
+    ? K
+    : never;
+}[keyof SettingsUpdate & keyof SettingsSnapshot];
+
+/** A leading Field + Toggle that writes one boolean setting; an unset value reads as off. */
+export function SettingToggle({
+  ctl,
+  field,
+  label,
+  description,
+  checked,
+  disabled,
+  ariaLabel,
+}: {
+  ctl: SettingsControl;
+  field: SettingKey<boolean>;
+  label: string;
+  description?: string;
+  checked?: boolean;
+  disabled?: boolean;
+  ariaLabel?: string;
+}) {
+  return (
+    <Field label={label} description={description} leading>
+      <Toggle
+        checked={checked ?? ctl.settings[field] ?? false}
+        ariaLabel={ariaLabel}
+        disabled={disabled ?? ctl.saving}
+        onChange={(v) => ctl.set({ [field]: v })}
+      />
+    </Field>
+  );
+}
+
+/** A Field + Select that writes one string setting; an unset value selects "". */
+export function SettingSelect({
+  ctl,
+  field,
+  label,
+  description,
+  options,
+  value,
+  disabled,
+  ariaLabel,
+}: {
+  ctl: SettingsControl;
+  field: SettingKey<string>;
+  label: string;
+  description?: string;
+  options: { value: string; label: string }[];
+  value?: string;
+  disabled?: boolean;
+  ariaLabel?: string;
+}) {
+  return (
+    <Field label={label} description={description}>
+      <Select
+        value={value ?? ctl.settings[field] ?? ""}
+        disabled={disabled ?? ctl.saving}
+        ariaLabel={ariaLabel}
+        options={options}
+        onChange={(v) => ctl.set({ [field]: v })}
+      />
+    </Field>
+  );
+}

apps/desktop-tauri/src/components/GrokAccountsMenu.test.tsx

@@ -17,7 +17,7 @@ vi.mock("@tauri-apps/api/event", () => ({
     return Promise.resolve(() => mocks.listeners.delete(event));
   },
 }));
-vi.mock("../hooks/useLocale", () => ({ useLocale: () => ({ t: (key: string) => key }) }));
+vi.mock("../hooks/useLocale", () => import("../test/mocks/locale"));
 import GrokAccountsMenu from "./GrokAccountsMenu";
 
 const first: GrokAccount = {