@harness-mix/cli 0.2.0 → 0.2.1

package/src/native-ui/renderer-extension/src/settings/skin-runtime.ts

@@ -16,6 +16,7 @@ import gildedGrandeurHero from "../../../../assets/skins/codex-styler/themes/gil
 import merryBigTopHero from "../../../../assets/skins/codex-styler/themes/merry-big-top/hero.webp";
 import nocturneStudioHero from "../../../../assets/skins/codex-styler/themes/nocturne-studio/hero.webp";
 import quietGardenHero from "../../../../assets/skins/codex-styler/themes/quiet-garden/hero.webp";
+import gothicVoidCrusadeHero from "../../../../assets/skins/dream-skin/themes/gothic-void-crusade/hero.webp";
 
 export const RENDERER_SKIN_STORAGE_KEY = "harness-mix.renderer-skin.v1";
 export const RENDERER_SKIN_STYLE_ID = "harness-mix-renderer-skin";
@@ -26,7 +27,11 @@ export const RENDERER_SKIN_IDS = [
   "wuthering-tide", "naruto-hokage", "naruto-sasuke", "deepspace-dawn",
   "deepspace-star", "dragonball-nimbus", "dragonball-super-saiyan", "dalao-dianyan",
   "styler-gilded-grandeur", "styler-merry-big-top", "styler-nocturne-studio",
-  "styler-quiet-garden",
+  "styler-quiet-garden", "dream-gothic-void-crusade",
+  "palette-catppuccin-latte", "palette-catppuccin-mocha", "palette-claude-desktop-dark",
+  "palette-claude-desktop-light", "palette-gruvbox-dark", "palette-gruvbox-light",
+  "palette-nord-dark", "palette-nord-light", "palette-one-dark", "palette-one-light",
+  "palette-tokyo-night-dark", "palette-tokyo-night-light",
 ] as const;
 
 export type RendererSkinId = (typeof RENDERER_SKIN_IDS)[number];
@@ -47,6 +52,8 @@ export interface RendererSkinDefinition {
 
 const HEIGE_SOURCE_URL = "https://github.com/HeiGeAi/heige-codex-skin-studio";
 const CODEX_STYLER_SOURCE_URL = "https://github.com/xuhuanstudio/codex-styler";
+const DREAM_SKIN_SOURCE_URL = "https://github.com/Fei-Away/Codex-Dream-Skin";
+const ANTHROPIC_THEME_SOURCE_URL = "https://github.com/miniLV/Anthropic-codex-theme";
 
 function heigeSkin(
   id: Exclude<RendererSkinId, "native">,
@@ -83,6 +90,36 @@ function codexStylerSkin(
   });
 }
 
+function dreamSkin(
+  id: Exclude<RendererSkinId, "native">,
+  name: string,
+  heroUrl: string,
+  palette: RendererSkinDefinition["palette"],
+  focus: string,
+): RendererSkinDefinition {
+  return Object.freeze({
+    id, name, heroUrl, logoUrl: null, polaroidUrl: null, palette, focus, dark: true,
+    sourceName: "Codex Dream Skin · MIT",
+    sourceUrl: DREAM_SKIN_SOURCE_URL,
+    preview: "linear-gradient(rgb(3 7 12 / 16%), transparent)",
+  });
+}
+
+function paletteSkin(
+  id: Exclude<RendererSkinId, "native">,
+  name: string,
+  palette: RendererSkinDefinition["palette"],
+  panel: string,
+  dark: boolean,
+): RendererSkinDefinition {
+  return Object.freeze({
+    id, name, heroUrl: null, logoUrl: null, polaroidUrl: null, palette, focus: "50% 50%", dark,
+    sourceName: "Anthropic Codex Theme · MIT",
+    sourceUrl: ANTHROPIC_THEME_SOURCE_URL,
+    preview: `linear-gradient(155deg, ${palette[0]} 0 58%, ${panel} 58% 100%)`,
+  });
+}
+
 export const RENDERER_SKINS: readonly RendererSkinDefinition[] = Object.freeze([
   Object.freeze({
     id: "native", name: "Native Codex", sourceName: "OpenAI Codex", sourceUrl: null,
@@ -115,6 +152,19 @@ export const RENDERER_SKINS: readonly RendererSkinDefinition[] = Object.freeze([
   codexStylerSkin("styler-merry-big-top", "欢乐大帐篷", merryBigTopHero, ["#100b14", "#5a3d4b", "#ff755e", "#fff2dc"], "55% 48%"),
   codexStylerSkin("styler-nocturne-studio", "夜曲工作室", nocturneStudioHero, ["#090b0d", "#34383a", "#e9a066", "#f5efe6"], "58% 46%"),
   codexStylerSkin("styler-quiet-garden", "静谧花园", quietGardenHero, ["#101612", "#364339", "#9fc29a", "#edf2e8"], "52% 50%"),
+  dreamSkin("dream-gothic-void-crusade", "哥特虚空远征", gothicVoidCrusadeHero, ["#0d0d0e", "#b5a386", "#c8a55a", "#f3ead7"], "76% 45%"),
+  paletteSkin("palette-catppuccin-latte", "Catppuccin · 拿铁", ["#EFF1F5", "#5C5F77", "#FE640B", "#4C4F69"], "#E6E9EF", false),
+  paletteSkin("palette-catppuccin-mocha", "Catppuccin · 摩卡", ["#181825", "#A6ADC8", "#FAB387", "#CDD6F4"], "#1E1E2E", true),
+  paletteSkin("palette-claude-desktop-dark", "Claude · 墨夜", ["#1A1918", "#A8A49C", "#CA7554", "#E8E4DC"], "#222120", true),
+  paletteSkin("palette-claude-desktop-light", "Claude · 素纸", ["#F8F6F1", "#605B54", "#CA7554", "#38342E"], "#F3EFE7", false),
+  paletteSkin("palette-gruvbox-dark", "Gruvbox · 暖夜", ["#282828", "#D5C4A1", "#FE8019", "#EBDBB2"], "#32302F", true),
+  paletteSkin("palette-gruvbox-light", "Gruvbox · 暖昼", ["#FBF1C7", "#504945", "#D65D0E", "#3C3836"], "#F2E5BC", false),
+  paletteSkin("palette-nord-dark", "Nord · 极夜", ["#2E3440", "#C3CBD9", "#88C0D0", "#D8DEE9"], "#3B4252", true),
+  paletteSkin("palette-nord-light", "Nord · 雪原", ["#ECEFF4", "#3B4252", "#5E81AC", "#2E3440"], "#E5E9F0", false),
+  paletteSkin("palette-one-dark", "One Dark · 子夜", ["#282C34", "#9DA5B4", "#61AFEF", "#ABB2BF"], "#21252B", true),
+  paletteSkin("palette-one-light", "One Light · 皓昼", ["#FAFAFA", "#4F525E", "#4078F2", "#383A42"], "#F0F0F1", false),
+  paletteSkin("palette-tokyo-night-dark", "Tokyo Night · 夜", ["#1A1B26", "#A9B1D6", "#7AA2F7", "#C0CAF5"], "#16161E", true),
+  paletteSkin("palette-tokyo-night-light", "Tokyo Night · 晨", ["#E1E2E7", "#4C505E", "#2E7DE9", "#343B59"], "#D5D6DB", false),
 ]);
 
 interface RendererSkinStorage {

package/src/native-ui/renderer-extension/test/renderer-model-client.test.ts

@@ -292,6 +292,7 @@ describe("Renderer fixed Model request client", () => {
       "deleteCodexAccount",
       "executeThreadCommand",
       "forkThread",
+      "getCollaborationPreferences",
       "importHarnessSession",
       "inspectCodexAccountUsage",
       "inspectHarness",
@@ -321,6 +322,7 @@ describe("Renderer fixed Model request client", () => {
       "readUpdateStatus",
       "refreshCodexAccounts",
       "removeMcp",
+      "saveCollaborationPreferences",
       "saveMcp",
       "selectThreadModel",
       "selectThreadPermissionMode",

package/src/native-ui/renderer-extension/test/renderer-pet-switcher.test.ts

@@ -0,0 +1,400 @@
+import { describe, expect, it } from "vitest";
+import { switchOfficialCodexPet } from "../src/renderer-pet-switcher.js";
+
+const FAST_TIMING = {
+  pollMs: 10,
+  openTimeoutMs: 400,
+  gridTimeoutMs: 400,
+  confirmTimeoutMs: 250,
+  closeTimeoutMs: 300,
+  menuSettleMs: 40,
+} as const;
+
+/** Minimal DOM node covering exactly what the switcher touches. */
+class FakeElement {
+  readonly attributes = new Map<string, string>();
+  readonly children: FakeElement[] = [];
+  readonly listeners = new Map<string, Array<(event: Event) => void>>();
+  parent: FakeElement | null = null;
+  text = "";
+  rect = { x: 0, y: 0, width: 12, height: 12, top: 0, left: 0, right: 12, bottom: 12 };
+
+  constructor(readonly tagName: string) {}
+
+  get ownerDocument(): FakeDocument | null {
+    let node: FakeElement | null = this;
+    while (node) {
+      if (node instanceof FakeDocument) return node;
+      node = node.parent;
+    }
+    return null;
+  }
+
+  get textContent(): string {
+    return this.text + this.children.map((child) => child.textContent).join("");
+  }
+
+  getBoundingClientRect(): FakeElement["rect"] {
+    return this.rect;
+  }
+
+  append(...children: FakeElement[]): void {
+    for (const child of children) {
+      child.parent = this;
+      this.children.push(child);
+    }
+  }
+
+  remove(): void {
+    this.parent?.removeChild(this);
+  }
+
+  removeChild(child: FakeElement): void {
+    const index = this.children.indexOf(child);
+    if (index !== -1) this.children.splice(index, 1);
+    child.parent = null;
+  }
+
+  setAttribute(name: string, value: string): void {
+    this.attributes.set(name, value);
+  }
+
+  getAttribute(name: string): string | null {
+    return this.attributes.get(name) ?? null;
+  }
+
+  hasAttribute(name: string): boolean {
+    return this.attributes.has(name);
+  }
+
+  addEventListener(type: string, listener: (event: Event) => void): void {
+    const list = this.listeners.get(type) ?? [];
+    list.push(listener);
+    this.listeners.set(type, list);
+  }
+
+  dispatchEvent(event: Event): boolean {
+    for (const listener of this.listeners.get(event.type) ?? []) listener(event);
+    if (event.bubbles && this.parent) this.parent.dispatchEvent(event);
+    return true;
+  }
+
+  click(): void {
+    this.dispatchEvent(new Event("click", { bubbles: true }));
+  }
+
+  closest(selector: string): FakeElement | null {
+    let node: FakeElement | null = this;
+    while (node) {
+      if (matchesSelector(node, selector)) return node;
+      node = node.parent;
+    }
+    return null;
+  }
+
+  querySelector(selector: string): FakeElement | null {
+    return this.querySelectorAll(selector)[0] ?? null;
+  }
+
+  querySelectorAll(selector: string): FakeElement[] {
+    const out: FakeElement[] = [];
+    const walk = (node: FakeElement): void => {
+      for (const child of node.children) {
+        if (matchesSelector(child, selector)) out.push(child);
+        walk(child);
+      }
+    };
+    walk(this);
+    return out;
+  }
+}
+
+function matchesSelector(element: FakeElement, selector: string): boolean {
+  return selector.split(",").some((part) => {
+    const trimmed = part.trim();
+    const attrMatch = /^(?:([a-z]+))?\[([a-zA-Z-]+)(?:="([^"]*)")?\]$/.exec(trimmed);
+    if (attrMatch) {
+      const [, tag, attr, value] = attrMatch;
+      if (tag && element.tagName !== tag) return false;
+      if (!element.hasAttribute(attr!)) return false;
+      if (value !== undefined && element.getAttribute(attr!) !== value) return false;
+      return true;
+    }
+    return element.tagName === trimmed;
+  });
+}
+
+class FakeDocument extends FakeElement {
+  readonly defaultView = { navigator: { platform: "Win32" }, PointerEvent: undefined };
+
+  constructor() {
+    super("#document");
+  }
+}
+
+let fakeDocument: FakeDocument;
+
+interface FakeAppOptions {
+  /** Pet avatar ids in the official grid (already mapped form, e.g. custom:rush / bsod). */
+  readonly petIds: readonly string[];
+  /** Whether clicking a pet card confirms the selection (the app's account mutation). */
+  readonly confirmOnClick?: boolean;
+  /** Avatar id that starts out selected. */
+  readonly initiallySelected?: string;
+  /** Whether the profile menu exists at all. */
+  readonly withProfileMenu?: boolean;
+}
+
+/**
+ * Simulates the official Codex app's reactions to the switcher's genuine DOM
+ * events, mirroring the live-verified structure: profile menu (Radix) with a
+ * "…Ctrl+," settings item → settings surface with data-settings-panel-slug
+ * nav + main>header back button → pet grid of button[aria-pressed] cards.
+ */
+function installFakeOfficialApp(options: FakeAppOptions) {
+  const state = {
+    profileMenuOpen: false,
+    settingsOpen: false,
+    settingsSection: null as string | null,
+    selectedPetId: options.initiallySelected ?? null,
+    profileClicks: 0,
+    clickedPetIds: [] as string[],
+    backClicks: 0,
+  };
+
+  const menuRoot = new FakeElement("div");
+  const settingsRoot = new FakeElement("div");
+
+  const openProfileMenu = () => {
+    state.profileMenuOpen = true;
+    const menu = new FakeElement("div");
+    const settingsItem = new FakeElement("div");
+    settingsItem.setAttribute("role", "menuitem");
+    settingsItem.text = "设置Ctrl+,";
+    settingsItem.addEventListener("click", () => {
+      closeProfileMenu();
+      openSettings("general-settings");
+    });
+    const usageItem = new FakeElement("div");
+    usageItem.setAttribute("role", "menuitem");
+    usageItem.text = "剩余用量";
+    menu.append(settingsItem, usageItem);
+    menuRoot.append(menu);
+  };
+  const closeProfileMenu = () => {
+    state.profileMenuOpen = false;
+    menuRoot.children.splice(0);
+  };
+
+  const openSettings = (section: string) => {
+    state.settingsOpen = true;
+    state.settingsSection = section;
+    renderSettings();
+  };
+  const closeSettings = () => {
+    state.settingsOpen = false;
+    state.settingsSection = null;
+    settingsRoot.children.splice(0);
+  };
+
+  const renderSettings = () => {
+    settingsRoot.children.splice(0);
+    const main = new FakeElement("main");
+    const header = new FakeElement("header");
+    const back = new FakeElement("button");
+    back.setAttribute("aria-label", "返回 ChatGPT");
+    back.addEventListener("click", () => {
+      state.backClicks += 1;
+      closeSettings();
+    });
+    header.append(back);
+    main.append(header);
+    const nav = new FakeElement("nav");
+    for (const slug of ["general-settings", "pets"]) {
+      const item = new FakeElement("button");
+      item.setAttribute("data-settings-panel-slug", slug);
+      item.text = slug;
+      item.addEventListener("click", () => openSettings(slug));
+      nav.append(item);
+    }
+    main.append(nav);
+    if (state.settingsSection === "pets") {
+      const grid = new FakeElement("div");
+      for (const petId of options.petIds) {
+        const card = new FakeElement("button");
+        card.setAttribute("aria-pressed", String(state.selectedPetId === petId));
+        card.text = petId;
+        const artwork = new FakeElement("div");
+        artwork.setAttribute("data-avatar-id", petId);
+        card.append(artwork);
+        card.addEventListener("click", () => {
+          state.clickedPetIds.push(petId);
+          if (options.confirmOnClick !== false) {
+            state.selectedPetId = petId;
+            renderSettings(); // the app re-renders after the account mutation
+          }
+        });
+        grid.append(card);
+      }
+      main.append(grid);
+    }
+    settingsRoot.append(main);
+  };
+
+  if (options.withProfileMenu !== false) {
+    const profileButton = new FakeElement("button");
+    profileButton.setAttribute("aria-haspopup", "menu");
+    profileButton.rect = { x: 8, y: 680, width: 40, height: 40, top: 680, left: 8, right: 48, bottom: 720 };
+    const avatarImg = new FakeElement("img");
+    profileButton.append(avatarImg);
+    profileButton.addEventListener("click", () => {
+      state.profileClicks += 1;
+      if (state.profileMenuOpen) closeProfileMenu();
+      else openProfileMenu();
+    });
+    // 另一个带 img 的菜单按钮（模型选择器），停靠在右下：必须不被误选
+    const modelButton = new FakeElement("button");
+    modelButton.setAttribute("aria-haspopup", "menu");
+    modelButton.rect = { x: 748, y: 666, width: 90, height: 32, top: 666, left: 748, right: 838, bottom: 698 };
+    modelButton.append(new FakeElement("img"));
+    fakeDocument.append(profileButton, modelButton);
+  }
+
+  fakeDocument.append(menuRoot, settingsRoot);
+  return state;
+}
+
+const runSwitch = (target: { id: string; displayName: string }) =>
+  switchOfficialCodexPet(target, {
+    ownerDocument: fakeDocument as unknown as Document,
+    timing: FAST_TIMING,
+  });
+
+describe("switchOfficialCodexPet", () => {
+  it("drives the official UI: profile menu → Settings item → pets nav → pet card → confirmed → settings closed", async () => {
+    fakeDocument = new FakeDocument();
+    const app = installFakeOfficialApp({ petIds: ["custom:rush", "bsod"] });
+
+    const result = await runSwitch({ id: "rush", displayName: "Rush" });
+
+    expect(result).toEqual({ avatarId: "custom:rush", alreadySelected: false });
+    expect(app.profileClicks).toBe(1); // opened the profile menu once
+    expect(app.clickedPetIds).toEqual(["custom:rush"]); // genuine click on the official card
+    expect(app.selectedPetId).toBe("custom:rush"); // confirmed by aria-pressed
+    expect(app.settingsOpen).toBe(false); // settings left closed afterwards
+    expect(app.backClicks).toBe(1);
+  });
+
+  it("maps built-in pets to their bare avatar id", async () => {
+    fakeDocument = new FakeDocument();
+    const app = installFakeOfficialApp({ petIds: ["bsod", "codex"] });
+    const result = await runSwitch({ id: "bsod", displayName: "BSOD" });
+    expect(result).toEqual({ avatarId: "bsod", alreadySelected: false });
+    expect(app.selectedPetId).toBe("bsod");
+  });
+
+  it("picks the left-most avatar menu button (not the model picker)", async () => {
+    fakeDocument = new FakeDocument();
+    const app = installFakeOfficialApp({ petIds: ["custom:rush"] });
+    await runSwitch({ id: "rush", displayName: "Rush" });
+    expect(app.profileClicks).toBe(1); // only the profile button was triggered
+    expect(app.selectedPetId).toBe("custom:rush");
+  });
+
+  it("does not click when the pet is already selected", async () => {
+    fakeDocument = new FakeDocument();
+    const app = installFakeOfficialApp({
+      petIds: ["custom:rush"],
+      initiallySelected: "custom:rush",
+    });
+    const result = await runSwitch({ id: "rush", displayName: "Rush" });
+    expect(result).toEqual({ avatarId: "custom:rush", alreadySelected: true });
+    expect(app.clickedPetIds).toEqual([]);
+  });
+
+  it("fails cleanly when the pet is missing from the official grid", async () => {
+    fakeDocument = new FakeDocument();
+    const app = installFakeOfficialApp({ petIds: ["bsod"] });
+    await expect(runSwitch({ id: "ghost", displayName: "Ghost" })).rejects.toThrow(
+      /not found in the official Codex Pets settings/,
+    );
+    expect(app.settingsOpen).toBe(false); // settings closed on failure
+    expect(app.profileMenuOpen).toBe(false);
+  });
+
+  it("times out with a clear error when the click is never confirmed", async () => {
+    fakeDocument = new FakeDocument();
+    const app = installFakeOfficialApp({ petIds: ["custom:rush"], confirmOnClick: false });
+    await expect(runSwitch({ id: "rush", displayName: "Rush" })).rejects.toThrow(/not confirmed/);
+    expect(app.settingsOpen).toBe(false);
+  });
+
+  it("rejects when the profile menu button is absent", async () => {
+    fakeDocument = new FakeDocument();
+    installFakeOfficialApp({ petIds: ["custom:rush"], withProfileMenu: false });
+    await expect(runSwitch({ id: "rush", displayName: "Rush" })).rejects.toThrow(
+      /profile menu button not found/,
+    );
+  });
+
+  it("recovers when the profile menu was already open (toggle-and-retry)", async () => {
+    fakeDocument = new FakeDocument();
+    const app = installFakeOfficialApp({ petIds: ["custom:rush"] });
+    // 手动点开菜单模拟残留状态：第一次 pointer 序列会把它关掉，重试路径再打开
+    const profileButton = fakeDocument.querySelector('button[aria-haspopup="menu"]') as FakeElement;
+    profileButton.click();
+    expect(app.profileMenuOpen).toBe(true);
+    const result = await runSwitch({ id: "rush", displayName: "Rush" });
+    expect(result.alreadySelected).toBe(false);
+    expect(app.profileClicks).toBeGreaterThan(1);
+    expect(app.selectedPetId).toBe("custom:rush");
+  });
+
+  it("guards against concurrent switch runs", async () => {
+    fakeDocument = new FakeDocument();
+    installFakeOfficialApp({ petIds: ["custom:rush"], confirmOnClick: false });
+    const first = runSwitch({ id: "rush", displayName: "Rush" });
+    await expect(runSwitch({ id: "bsod", displayName: "BSOD" })).rejects.toThrow(/already in progress/);
+    await expect(first).rejects.toThrow(/not confirmed/);
+  });
+
+  it("uses the settings sidebar when the official settings are already open and leaves them open", async () => {
+    fakeDocument = new FakeDocument();
+    const app = installFakeOfficialApp({ petIds: ["custom:rush"] });
+    // 用户自己开着官方设置（停在别的分组）：直接走 data-settings-panel-slug 导航
+    const main = new FakeElement("main");
+    const header = new FakeElement("header");
+    const back = new FakeElement("button");
+    back.setAttribute("aria-label", "返回 ChatGPT");
+    header.append(back);
+    main.append(header);
+    const nav = new FakeElement("nav");
+    const generalItem = new FakeElement("button");
+    generalItem.setAttribute("data-settings-panel-slug", "general-settings");
+    const petsItem = new FakeElement("button");
+    petsItem.setAttribute("data-settings-panel-slug", "pets");
+    nav.append(generalItem, petsItem);
+    main.append(nav);
+    const gridHolder = new FakeElement("div");
+    main.append(gridHolder);
+    fakeDocument.append(main);
+    petsItem.addEventListener("click", () => {
+      const card = new FakeElement("button");
+      card.setAttribute("aria-pressed", "false");
+      const artwork = new FakeElement("div");
+      artwork.setAttribute("data-avatar-id", "custom:rush");
+      card.append(artwork);
+      card.addEventListener("click", () => {
+        app.clickedPetIds.push("custom:rush");
+        card.setAttribute("aria-pressed", "true");
+      });
+      gridHolder.append(card);
+    });
+
+    const result = await runSwitch({ id: "rush", displayName: "Rush" });
+    expect(result.alreadySelected).toBe(false);
+    expect(app.clickedPetIds).toEqual(["custom:rush"]);
+    expect(app.profileClicks).toBe(0); // 没有动用个人菜单
+    expect(app.backClicks).toBe(0); // 用户自己开着的设置保持原样
+  });
+});

package/src/native-ui/renderer-extension/test/settings/localization.test.ts

@@ -1,82 +1,83 @@
-import { describe, expect, it } from "vitest";
-
-import {
-  codexLocaleOverrideForSettingsSelection,
-  rendererSettingsLanguageSelection,
-  rendererSettingsMessages,
-  resolveRendererSettingsLocale,
-} from "../../src/settings/localization.js";
-import { createDefaultRendererSettingsPages } from "../../src/settings/pages.js";
-
-describe("Renderer settings localization", () => {
-  it("negotiates English and Chinese language tags with an English fallback", () => {
-    expect(resolveRendererSettingsLocale(["zh-CN"])).toBe("zh-CN");
-    expect(resolveRendererSettingsLocale(["zh-TW"])).toBe("zh-CN");
-    expect(resolveRendererSettingsLocale(["en-GB"])).toBe("en");
-    expect(resolveRendererSettingsLocale(["fr-FR", "zh-CN"])).toBe("zh-CN");
-    expect(resolveRendererSettingsLocale(["fr-FR"])).toBe("en");
-  });
-
-  it("maps the bounded selector to Codex locale override values", () => {
-    expect(rendererSettingsLanguageSelection(null)).toBe("automatic");
-    expect(rendererSettingsLanguageSelection("en-GB")).toBe("en");
-    expect(rendererSettingsLanguageSelection("zh-TW")).toBe("zh-CN");
-    expect(rendererSettingsLanguageSelection("ja-JP")).toBe("other");
-    expect(codexLocaleOverrideForSettingsSelection("automatic")).toBeNull();
-    expect(codexLocaleOverrideForSettingsSelection("en")).toBe("en-US");
-    expect(codexLocaleOverrideForSettingsSelection("zh-CN")).toBe("zh-CN");
-  });
-
-  it("provides complete immutable English and Chinese settings catalogs", () => {
-    const english = rendererSettingsMessages("en");
-    const chinese = rendererSettingsMessages("zh-CN");
-
-    expect(english.title).toBe("Settings");
-    expect(chinese.title).toBe("设置");
-    expect(chinese.openSettings).toBe("打开 Harness Mix 设置");
-    expect(chinese.updateInstallation).toBe("安装方式");
-    expect(chinese.updateInstallationWindowsInstaller).toBe("Windows 安装程序");
-    expect(english.updateInstallationMacOsDmg).toBe("macOS DMG");
-    expect(chinese.updateWaitingForExit).toBe("正在等待应用退出...");
-    expect(chinese.updateInstallingNpm).toBe("正在通过 npm 安装...");
-    expect(chinese.updateAndRestart).toBe("更新");
-    expect(chinese.updateWindowsManualRequired).toContain("Windows 暂不支持自动更新");
-    expect(chinese.updateWindowsInstallerDescription).toContain("适用于当前系统的安装包");
-    expect(chinese.updateManualNpmDescription).toBe(
-      "如需手动更新，请在终端运行以下命令。更新完成后，请退出 Codex 并通过 Harness Mix 重新启动。",
-    );
-    expect(english.updateInstalling).toBe("Installing update...");
-    expect(english.updateDownloadFromReleases).toBe("Download from GitHub Releases");
-    expect(chinese.updateDownloadFromReleases).toBe("前往 GitHub Releases 下载");
-    expect(chinese.updateDownloadWindowsInstaller).toBe("下载 Windows 安装包");
-    expect(chinese.pageLabels.about).toBe("关于");
-    expect(chinese.pageLabels["session-import"]).toBe("会话导入");
-    expect(chinese.sessionImportAvailabilityNote).toContain("可选 Harness 来自本地 Host");
-    expect(chinese.sessionImportAvailabilityNote).toContain("先在原生客户端关闭该会话再导入");
-    expect(chinese.sessionImportAvailabilityNote).toContain("避免同时写入");
-    expect(english.sessionImportAvailabilityNote).toContain(
-      "Available Harnesses come from the local Host",
-    );
-    expect(english.sessionImportAvailabilityNote).toContain(
-      "close the session in its native client before importing",
-    );
-    expect(english.sessionImportAvailabilityNote).toContain("avoid concurrent writes");
-    expect(chinese.aboutTagline).toBe("在 Codex Desktop 中运行各类原生 Harness");
-    expect(chinese.aboutParagraphs).toHaveLength(3);
-    expect(chinese.aboutStarCallout).toContain("请给我们一个 Star");
-    expect(chinese.aboutRepository).toBe("开源仓库");
-    expect(Object.keys(chinese.pageLabels)).toEqual(Object.keys(english.pageLabels));
-    expect(Object.isFrozen(english)).toBe(true);
-    expect(Object.isFrozen(chinese.pageLabels)).toBe(true);
-  });
-
-  it("localizes every default page descriptor", () => {
-    expect(
-      createDefaultRendererSettingsPages(rendererSettingsMessages("zh-CN")).map(
-        ({ label }) => label,
-      ),
+import { describe, expect, it } from "vitest";
+
+import {
+  codexLocaleOverrideForSettingsSelection,
+  rendererSettingsLanguageSelection,
+  rendererSettingsMessages,
+  resolveRendererSettingsLocale,
+} from "../../src/settings/localization.js";
+import { createDefaultRendererSettingsPages } from "../../src/settings/pages.js";
+
+describe("Renderer settings localization", () => {
+  it("negotiates English and Chinese language tags with an English fallback", () => {
+    expect(resolveRendererSettingsLocale(["zh-CN"])).toBe("zh-CN");
+    expect(resolveRendererSettingsLocale(["zh-TW"])).toBe("zh-CN");
+    expect(resolveRendererSettingsLocale(["en-GB"])).toBe("en");
+    expect(resolveRendererSettingsLocale(["fr-FR", "zh-CN"])).toBe("zh-CN");
+    expect(resolveRendererSettingsLocale(["fr-FR"])).toBe("en");
+  });
+
+  it("maps the bounded selector to Codex locale override values", () => {
+    expect(rendererSettingsLanguageSelection(null)).toBe("automatic");
+    expect(rendererSettingsLanguageSelection("en-GB")).toBe("en");
+    expect(rendererSettingsLanguageSelection("zh-TW")).toBe("zh-CN");
+    expect(rendererSettingsLanguageSelection("ja-JP")).toBe("other");
+    expect(codexLocaleOverrideForSettingsSelection("automatic")).toBeNull();
+    expect(codexLocaleOverrideForSettingsSelection("en")).toBe("en-US");
+    expect(codexLocaleOverrideForSettingsSelection("zh-CN")).toBe("zh-CN");
+  });
+
+  it("provides complete immutable English and Chinese settings catalogs", () => {
+    const english = rendererSettingsMessages("en");
+    const chinese = rendererSettingsMessages("zh-CN");
+
+    expect(english.title).toBe("Settings");
+    expect(chinese.title).toBe("设置");
+    expect(chinese.openSettings).toBe("打开 Harness Mix 设置");
+    expect(chinese.updateInstallation).toBe("安装方式");
+    expect(chinese.updateInstallationWindowsInstaller).toBe("Windows 安装程序");
+    expect(english.updateInstallationMacOsDmg).toBe("macOS DMG");
+    expect(chinese.updateWaitingForExit).toBe("正在等待应用退出...");
+    expect(chinese.updateInstallingNpm).toBe("正在通过 npm 安装...");
+    expect(chinese.updateAndRestart).toBe("更新");
+    expect(chinese.updateWindowsManualRequired).toContain("Windows 暂不支持自动更新");
+    expect(chinese.updateWindowsInstallerDescription).toContain("适用于当前系统的安装包");
+    expect(chinese.updateManualNpmDescription).toBe(
+      "如需手动更新，请在终端运行以下命令。更新完成后，请退出 Codex 并通过 Harness Mix 重新启动。",
+    );
+    expect(english.updateInstalling).toBe("Installing update...");
+    expect(english.updateDownloadFromReleases).toBe("Download from GitHub Releases");
+    expect(chinese.updateDownloadFromReleases).toBe("前往 GitHub Releases 下载");
+    expect(chinese.updateDownloadWindowsInstaller).toBe("下载 Windows 安装包");
+    expect(chinese.pageLabels.about).toBe("关于");
+    expect(chinese.pageLabels["session-import"]).toBe("会话导入");
+    expect(chinese.sessionImportAvailabilityNote).toContain("可选 Harness 来自本地 Host");
+    expect(chinese.sessionImportAvailabilityNote).toContain("先在原生客户端关闭该会话再导入");
+    expect(chinese.sessionImportAvailabilityNote).toContain("避免同时写入");
+    expect(english.sessionImportAvailabilityNote).toContain(
+      "Available Harnesses come from the local Host",
+    );
+    expect(english.sessionImportAvailabilityNote).toContain(
+      "close the session in its native client before importing",
+    );
+    expect(english.sessionImportAvailabilityNote).toContain("avoid concurrent writes");
+    expect(chinese.aboutTagline).toBe("在 Codex Desktop 中运行各类原生 Harness");
+    expect(chinese.aboutParagraphs).toHaveLength(3);
+    expect(chinese.aboutStarCallout).toContain("请给我们一个 Star");
+    expect(chinese.aboutRepository).toBe("开源仓库");
+    expect(Object.keys(chinese.pageLabels)).toEqual(Object.keys(english.pageLabels));
+    expect(Object.isFrozen(english)).toBe(true);
+    expect(Object.isFrozen(chinese.pageLabels)).toBe(true);
+  });
+
+  it("localizes every default page descriptor", () => {
+    expect(
+      createDefaultRendererSettingsPages(rendererSettingsMessages("zh-CN")).map(
+        ({ label }) => label,
+      ),
     ).toEqual([
       "连接",
+      "协作",
       "账号",
       "MCP",
       "Skills",
@@ -87,5 +88,5 @@ describe("Renderer settings localization", () => {
       "更新",
       "关于",
     ]);
-  });
-});
+  });
+});