Python
fix(memhub): polish settings interactions
kristinhea70830970db9
diff --git a/memhub/apps/web/src/ConnectionFallback.test.tsx b/memhub/apps/web/src/ConnectionFallback.test.tsxindex 9f03557..3432744 100644--- a/memhub/apps/web/src/ConnectionFallback.test.tsx+++ b/memhub/apps/web/src/ConnectionFallback.test.tsx@@ -28,11 +28,15 @@ describe("ConnectionFallback", () => {} as unknown as Window["oneMemory"];render(<LanguageProvider>- <ConnectionFallback />+ <ConnectionFallback defaultExpanded /></LanguageProvider>,);const user = userEvent.setup();- await user.click(await screen.findByText("Conectar otras herramientas"));+ expect(+ (await screen.findByText("Conectar otras herramientas")).closest(+ "details",+ ),+ ).toHaveProperty("open", true);await user.type(screen.getByLabelText("Nombre del Harness"),"Harness 原名",@@ -59,8 +63,11 @@ describe("ConnectionFallback", () => {createCustomHarnessSkill,copyText,} as unknown as Window["oneMemory"];- render(<ConnectionFallback />);- await user.click(screen.getByText("连接其他工具"));+ render(<ConnectionFallback defaultExpanded />);+ expect(screen.getByText("连接其他工具").closest("details")).toHaveProperty(+ "open",+ true,+ );const generate = screen.getByRole("button", { name: "生成配对 Skill" });expect(generate).toHaveProperty("disabled", true);await user.type(screen.getByLabelText("Harness 名称"), "Kimi Code");@@ -90,8 +97,7 @@ describe("ConnectionFallback", () => {createCustomHarnessSkill,copyText: vi.fn().mockRejectedValue(new Error()),} as unknown as Window["oneMemory"];- render(<ConnectionFallback />);- await user.click(screen.getByText("连接其他工具"));+ render(<ConnectionFallback defaultExpanded />);await user.type(screen.getByLabelText("Harness 名称"), "Kimi Code");await user.click(screen.getByRole("button", { name: "生成配对 Skill" }));await user.click(await screen.findByRole("button", { name: "重试" }));@@ -103,6 +109,10 @@ describe("ConnectionFallback", () => {});it("does not invent runtime paths in the browser", () => {render(<ConnectionFallback />);+ expect(screen.getByText("连接其他工具").closest("details")).toHaveProperty(+ "open",+ false,+ );expect(screen.queryByLabelText("配对 Skill")).toBeNull();expect(screen.getByText("本机配对仅在桌面 App 中可用。")).toBeTruthy();});diff --git a/memhub/apps/web/src/ConnectionFallback.tsx b/memhub/apps/web/src/ConnectionFallback.tsxindex 1ab96bf..5ef035c 100644--- a/memhub/apps/web/src/ConnectionFallback.tsx+++ b/memhub/apps/web/src/ConnectionFallback.tsx@@ -13,8 +13,13 @@ type MaterialBridge = {getConnectionMaterial(): Promise<ConnectionMaterial>;};-export function ConnectionFallback() {+export function ConnectionFallback({+ defaultExpanded = false,+}: {+ defaultExpanded?: boolean;+} = {}) {const { locale, t } = useGuiLanguage();+ const [expanded, setExpanded] = useState(defaultExpanded);const [displayName, setDisplayName] = useState("");const [material, setMaterial] = useState<Material | null>(null);const [loading, setLoading] = useState(false);@@ -42,7 +47,11 @@ export function ConnectionFallback() {}return (- <details className="connection-fallback">+ <details+ className="connection-fallback"+ open={expanded}+ onToggle={(event) => setExpanded(event.currentTarget.open)}+ ><summary>{t("connectionFallback.title")}</summary>{materialBridge?.getConnectionMaterial ? (<ConnectionMaterialFallbackdiff --git a/memhub/apps/web/src/LanguageSelector.test.tsx b/memhub/apps/web/src/LanguageSelector.test.tsxindex 50496a3..4fdb033 100644--- a/memhub/apps/web/src/LanguageSelector.test.tsx+++ b/memhub/apps/web/src/LanguageSelector.test.tsx@@ -15,7 +15,7 @@ afterEach(() => {it.each(["zh-CN", "en", "es"] as const)("hides the compact label while preserving its accessible name in %s",- (locale) => {+ async (locale) => {localStorage.setItem(LANGUAGE_STORAGE_KEY, locale);render(<LanguageProvider>@@ -28,6 +28,7 @@ it.each(["zh-CN", "en", "es"] as const)(expect(label.hidden).toBe(true);expect(label.htmlFor).toBe(selector.id);expect(screen.getByRole("region", { name })).toBeTruthy();+ await userEvent.click(selector);expect(screen.getByRole("option", { name: "Español" })).toBeTruthy();expect(screen.getByRole("option", { name: "English" })).toBeTruthy();expect(screen.getByRole("option", { name: "简体中文" })).toBeTruthy();@@ -60,18 +61,19 @@ it.each(["zh-CN", "en", "es"] as const)(it.each(["system", "zh-CN", "en", "es"] as const)("keeps one stable settings row for the %s preference",- (preference) => {+ async (preference) => {localStorage.setItem(LANGUAGE_STORAGE_KEY, preference);render(<LanguageProvider><LanguageSelector /></LanguageProvider>,);- const selector = screen.getByRole("combobox") as HTMLSelectElement;+ const selector = screen.getByRole("combobox") as HTMLButtonElement;const row = selector.closest(".r6-language-setting-row");expect(selector.value).toBe(preference);expect(row).toBeTruthy();expect(row?.querySelector("label")?.hidden).toBe(false);+ await userEvent.click(selector);expect(screen.getByRole("option", {@@ -102,9 +104,10 @@ it("offers an accessible selector, persists and updates its label", async () =>const selector = screen.getByRole("combobox", {name: translate("zh-CN", "languageLabel"),});- expect(screen.getAllByRole("option")).toHaveLength(4);expect(selector.getAttribute("aria-describedby")).toBeTruthy();- await userEvent.selectOptions(selector, "es");+ await userEvent.click(selector);+ expect(screen.getAllByRole("option")).toHaveLength(4);+ await userEvent.click(screen.getByRole("option", { name: "西班牙语" }));expect(localStorage.getItem(LANGUAGE_STORAGE_KEY)).toBe("es");expect(screen.getByRole("combobox", { name: translate("es", "languageLabel") }),@@ -112,6 +115,31 @@ it("offers an accessible selector, persists and updates its label", async () =>expect(document.documentElement.lang).toBe("es");});+it("supports keyboard selection without using the system select menu", async () => {+ localStorage.setItem(LANGUAGE_STORAGE_KEY, "system");+ render(+ <LanguageProvider>+ <LanguageSelector />+ </LanguageProvider>,+ );+ const selector = screen.getByRole("combobox");+ selector.focus();+ await userEvent.keyboard("{Enter}");+ expect(selector.getAttribute("aria-expanded")).toBe("true");+ await userEvent.tab();+ expect(selector.getAttribute("aria-expanded")).toBe("false");+ selector.focus();+ await userEvent.keyboard("{Enter}");+ await userEvent.keyboard("{Escape}");+ expect(selector.getAttribute("aria-expanded")).toBe("false");+ await userEvent.keyboard(" ");+ expect(selector.getAttribute("aria-expanded")).toBe("true");+ await userEvent.keyboard("{Escape}");+ await userEvent.keyboard("{ArrowDown}{ArrowDown}{Enter}");+ expect(localStorage.getItem(LANGUAGE_STORAGE_KEY)).toBe("zh-CN");+ expect(selector.getAttribute("aria-expanded")).toBe("false");+});+it("announces storage errors without replacing the confirmed choice", async () => {localStorage.setItem(LANGUAGE_STORAGE_KEY, "zh-CN");render(@@ -122,11 +150,12 @@ it("announces storage errors without replacing the confirmed choice", async () =vi.spyOn(Storage.prototype, "setItem").mockImplementation(() => {throw new Error("denied");});- await userEvent.selectOptions(screen.getByRole("combobox"), "es");+ await userEvent.click(screen.getByRole("combobox"));+ await userEvent.click(screen.getByRole("option", { name: "西班牙语" }));expect(screen.getByRole("alert").textContent).toBe(translate("zh-CN", "languageSaveError"),);- expect((screen.getByRole("combobox") as HTMLSelectElement).value).toBe(+ expect((screen.getByRole("combobox") as HTMLButtonElement).value).toBe("zh-CN",);});diff --git a/memhub/apps/web/src/LanguageSelector.tsx b/memhub/apps/web/src/LanguageSelector.tsxindex 0618e8f..04b871a 100644--- a/memhub/apps/web/src/LanguageSelector.tsx+++ b/memhub/apps/web/src/LanguageSelector.tsx@@ -1,11 +1,30 @@import { isLanguagePreference } from "@one-memory/i18n";import { useId, useState } from "react";import { useGuiLanguage } from "./gui-language";+import { OptionMenu } from "./OptionMenu";export function LanguageSelector({ compact = false }: { compact?: boolean }) {const id = useId();const { preference, setPreference, t, error } = useGuiLanguage();const [pending, setPending] = useState(false);+ const options = [+ { value: "system", label: t("languageSystem") },+ {+ value: "zh-CN",+ label: compact ? "简体中文" : t("languageChinese"),+ lang: "zh-CN",+ },+ {+ value: "en",+ label: compact ? "English" : t("languageEnglish"),+ lang: "en",+ },+ {+ value: "es",+ label: compact ? "Español" : t("languageSpanish"),+ lang: "es",+ },+ ] as const;return (<sectionaria-labelledby={compact ? `${id}-label` : `${id}-title`}@@ -26,14 +45,16 @@ export function LanguageSelector({ compact = false }: { compact?: boolean }) {<label id={`${id}-label`} htmlFor={`${id}-select`} hidden={compact}>{t(compact ? "languageTitle" : "languageLabel")}</label>- <select+ <OptionMenuid={`${id}-select`}- aria-label={compact ? t("languageTitle") : undefined}- aria-describedby={compact ? undefined : `${id}-description`}+ ariaLabel={compact ? t("languageTitle") : undefined}+ labelledBy={compact ? undefined : `${id}-label`}+ describedBy={compact ? undefined : `${id}-description`}value={preference}disabled={pending}- onChange={async (event) => {- const value = event.currentTarget.value;+ options={options}+ className="r6-language-option-menu"+ onChange={async (value) => {if (!isLanguagePreference(value)) return;setPending(true);try {@@ -42,18 +63,7 @@ export function LanguageSelector({ compact = false }: { compact?: boolean }) {setPending(false);}}}- >- <option value="system">{t("languageSystem")}</option>- <option value="zh-CN" lang="zh-CN">- {compact ? "简体中文" : t("languageChinese")}- </option>- <option value="en" lang="en">- {compact ? "English" : t("languageEnglish")}- </option>- <option value="es" lang="es">- {compact ? "Español" : t("languageSpanish")}- </option>- </select>+ /></div>{!compact && (<p id={`${id}-description`} className="r6-language-setting-description">diff --git a/memhub/apps/web/src/MemoryMap.test.tsx b/memhub/apps/web/src/MemoryMap.test.tsxindex 3ec218b..beec1a5 100644--- a/memhub/apps/web/src/MemoryMap.test.tsx+++ b/memhub/apps/web/src/MemoryMap.test.tsx@@ -212,6 +212,7 @@ it("searches only when 搜索 is pressed, not on every keystroke", async () => {}}/>,);+ expect(screen.getByRole("combobox", { name: "来源" })).toBeTruthy();await userEvent.type(screen.getByRole("textbox", { name: "筛选地图记忆" }),"版本号",diff --git a/memhub/apps/web/src/MemoryMap.tsx b/memhub/apps/web/src/MemoryMap.tsxindex 1de69a4..27d9113 100644--- a/memhub/apps/web/src/MemoryMap.tsx+++ b/memhub/apps/web/src/MemoryMap.tsx@@ -607,6 +607,7 @@ export function MemoryMap(props: Props) {<label htmlFor="selected-source-filter">{text("来源")}</label><OptionMenuid="selected-source-filter"+ ariaLabel={text("来源")}className="om-option-menu--plain"value={controlledSource}options={[diff --git a/memhub/apps/web/src/OnboardingFlow.language.test.tsx b/memhub/apps/web/src/OnboardingFlow.language.test.tsxindex 50db9b8..743798a 100644--- a/memhub/apps/web/src/OnboardingFlow.language.test.tsx+++ b/memhub/apps/web/src/OnboardingFlow.language.test.tsx@@ -117,7 +117,8 @@ it("changes the first-screen language without losing source choices or starting),);await user.click(screen.getByLabelText("导入 Cursor 历史"));- await user.selectOptions(selector, "es");+ await user.click(selector);+ await user.click(screen.getByRole("option", { name: "Español" }));expect(screen.getByRole("combobox", { name: "Idioma de la interfaz" })).toBe(selector,);@@ -125,7 +126,8 @@ it("changes the first-screen language without losing source choices or startingscreen.getByLabelText("Importar el historial de Cursor"),).toHaveProperty("checked", false);await user.click(screen.getByLabelText("Importar el historial de Cursor"));- await user.selectOptions(selector, "zh-CN");+ await user.click(selector);+ await user.click(screen.getByRole("option", { name: "简体中文" }));expect(screen.getByLabelText("导入 Cursor 历史")).toHaveProperty("checked",true,diff --git a/memhub/apps/web/src/OptionMenu.tsx b/memhub/apps/web/src/OptionMenu.tsxindex 11409da..080174b 100644--- a/memhub/apps/web/src/OptionMenu.tsx+++ b/memhub/apps/web/src/OptionMenu.tsx@@ -1,10 +1,11 @@-import { useEffect, useRef, useState } from "react";+import { useEffect, useId, useRef, useState } from "react";import { useGuiLanguage } from "./gui-language";export interface OptionMenuItem {value: string;label: string;disabled?: boolean;+ lang?: string;}/** Replaces a native select so the open list follows the product field, not the OS menu. */@@ -20,11 +21,50 @@ export function OptionMenu(props: {onChange: (value: string) => void;}) {const { t } = useGuiLanguage();+ const generatedId = useId();const [open, setOpen] = useState(false);+ const selectedIndex = props.options.findIndex(+ (item) => item.value === props.value,+ );+ const firstEnabledIndex = props.options.findIndex((item) => !item.disabled);+ const preferredIndex =+ selectedIndex >= 0 && !props.options[selectedIndex]?.disabled+ ? selectedIndex+ : firstEnabledIndex;+ const [activeIndex, setActiveIndex] = useState(preferredIndex);const root = useRef<HTMLDivElement>(null);+ const button = useRef<HTMLButtonElement>(null);const selected = props.options.find((item) => item.value === props.value);+ const visibleLabel = selected?.label ?? t("wb.select");+ const controlId = props.id ?? `${generatedId}-control`;+ const panelId = `${controlId}-options`;++ function enabledIndex(from: number, direction: 1 | -1) {+ if (firstEnabledIndex < 0) return -1;+ let next = from;+ for (let checked = 0; checked < props.options.length; checked += 1) {+ next =+ next < 0+ ? direction === 1+ ? 0+ : props.options.length - 1+ : (next + direction + props.options.length) % props.options.length;+ if (!props.options[next]?.disabled) return next;+ }+ return -1;+ }++ function choose(index: number) {+ const item = props.options[index];+ if (!item || item.disabled) return;+ props.onChange(item.value);+ setOpen(false);+ button.current?.focus();+ }+useEffect(() => {if (!open) return;+ setActiveIndex(preferredIndex);const close = (event: MouseEvent) => {if (!root.current?.contains(event.target as Node)) setOpen(false);};@@ -37,47 +77,98 @@ export function OptionMenu(props: {document.removeEventListener("mousedown", close);document.removeEventListener("keydown", onKey);};- }, [open]);+ }, [open, preferredIndex]);return (<divclassName={["om-option-menu", props.className].filter(Boolean).join(" ")}ref={root}+ onBlur={(event) => {+ if (!event.currentTarget.contains(event.relatedTarget as Node | null))+ setOpen(false);+ }}><button+ ref={button}type="button"- id={props.id}+ id={controlId}value={props.value}className="om-option-menu-button"+ role="combobox"aria-labelledby={props.labelledBy}- aria-label={props.ariaLabel}+ aria-label={+ props.ariaLabel ?? (props.labelledBy ? undefined : t("wb.select"))+ }aria-describedby={props.describedBy}aria-haspopup="listbox"aria-expanded={open}+ aria-controls={panelId}+ aria-activedescendant={+ open && activeIndex >= 0+ ? `${panelId}-option-${activeIndex}`+ : undefined+ }disabled={props.disabled}- onClick={() => setOpen((current) => !current)}+ onClick={() => {+ if (preferredIndex < 0) return;+ setActiveIndex(preferredIndex);+ setOpen((current) => !current);+ }}onKeyDown={(event) => {- if (event.key === "ArrowDown" || event.key === "Enter") {+ if (event.key === "ArrowDown") {+ event.preventDefault();+ if (!open) {+ if (preferredIndex >= 0) {+ setActiveIndex(preferredIndex);+ setOpen(true);+ }+ } else {+ setActiveIndex((current) => enabledIndex(current, 1));+ }+ } else if (event.key === "ArrowUp") {+ event.preventDefault();+ if (!open) {+ if (preferredIndex >= 0) {+ setActiveIndex(preferredIndex);+ setOpen(true);+ }+ } else {+ setActiveIndex((current) => enabledIndex(current, -1));+ }+ } else if (event.key === "Home" && open) {+ event.preventDefault();+ setActiveIndex(enabledIndex(-1, 1));+ } else if (event.key === "End" && open) {+ event.preventDefault();+ setActiveIndex(enabledIndex(0, -1));+ } else if (event.key === "Enter" || event.key === " ") {event.preventDefault();- setOpen(true);+ if (open) choose(activeIndex);+ else if (preferredIndex >= 0) {+ setActiveIndex(preferredIndex);+ setOpen(true);+ }}}}>- {selected?.label ?? t("wb.select")}+ {visibleLabel}</button>{open && (- <div className="om-option-menu-panel" role="listbox">- {props.options.map((item) => (+ <div id={panelId} className="om-option-menu-panel" role="listbox">+ {props.options.map((item, index) => (<buttonkey={item.value || item.label}+ id={`${panelId}-option-${index}`}type="button"role="option"+ lang={item.lang}+ data-active={activeIndex === index || undefined}aria-selected={item.value === props.value}disabled={item.disabled}- onClick={() => {- if (item.disabled) return;- props.onChange(item.value);- setOpen(false);+ tabIndex={-1}+ onMouseEnter={() => {+ if (!item.disabled) setActiveIndex(index);}}+ onClick={() => choose(index)}>{item.label}</button>diff --git a/memhub/apps/web/src/R6ColdStartFrame.test.tsx b/memhub/apps/web/src/R6ColdStartFrame.test.tsxindex 7e41c2b..87f058f 100644--- a/memhub/apps/web/src/R6ColdStartFrame.test.tsx+++ b/memhub/apps/web/src/R6ColdStartFrame.test.tsx@@ -99,7 +99,7 @@ it("keeps selection status outside decorative fades and readable when disabled",).toMatch(/opacity:\s*1/);});-it("keeps the native selector keyboard-focusable and switches both languages", async () => {+it("keeps the product language menu keyboard-focusable and switches both languages", async () => {render(<LanguageProvider><R6ColdStartFrame@@ -116,17 +116,19 @@ it("keeps the native selector keyboard-focusable and switches both languages", aconst selector = screen.getByRole("combobox");await user.tab();expect(document.activeElement).toBe(selector);- await user.selectOptions(selector, "es");+ await user.click(selector);+ await user.click(screen.getByRole("option", { name: "Español" }));expect(document.documentElement.lang).toBe("es");expect(screen.getByRole("combobox").getAttribute("id")).toBe(selector.id);- await user.selectOptions(selector, "zh-CN");+ await user.click(selector);+ await user.click(screen.getByRole("option", { name: "简体中文" }));expect(document.documentElement.lang).toBe("zh-CN");expect(screen.getByRole("combobox", { name: "界面语言" })).toBe(selector);});it.each([1, 2, 3] as const)("offers a compact language selector on step %s",- (step) => {+ async (step) => {render(<LanguageProvider><R6ColdStartFrame@@ -141,6 +143,7 @@ it.each([1, 2, 3] as const)();const selector = screen.getByRole("combobox", { name: "界面语言" });expect(selector.closest(".r6-language-selector--compact")).toBeTruthy();+ await userEvent.click(selector);expect(screen.getByRole("option", { name: "简体中文" }).getAttribute("lang"),).toBe("zh-CN");diff --git a/memhub/apps/web/src/R6Settings.test.tsx b/memhub/apps/web/src/R6Settings.test.tsxindex 6f9dc6c..2e14c81 100644--- a/memhub/apps/web/src/R6Settings.test.tsx+++ b/memhub/apps/web/src/R6Settings.test.tsx@@ -27,7 +27,8 @@ it("changes settings copy live without rereading profiles or changing permission}),).toBeNull();const reads = vi.mocked(getModelProfiles).mock.calls.length;- await user.selectOptions(screen.getByRole("combobox"), "zh-CN");+ await user.click(screen.getByRole("combobox"));+ await user.click(screen.getByRole("option", { name: "Chino simplificado" }));expect(await screen.findByRole("heading", { name: "记忆模型" })).toBeTruthy();expect(vi.mocked(getModelProfiles).mock.calls).toHaveLength(reads);});@@ -66,7 +67,9 @@ vi.mock("./ModelSettings", async () => {};});vi.mock("./ConnectionFallback", () => ({- ConnectionFallback: () => null,+ ConnectionFallback: ({ defaultExpanded }: { defaultExpanded?: boolean }) => (+ <p data-testid="connection-default">{String(defaultExpanded)}</p>+ ),}));vi.mock("./runtime-state", () => ({refreshLoginPreference: vi.fn(),@@ -95,7 +98,11 @@ it("shows the help and diagnostics group by default and hides it when opted out"const user = userEvent.setup();const view = render(<R6Settings onDiagnostics={vi.fn()} />);expect(screen.getByRole("combobox")).toBeTruthy();+ await user.click(screen.getByRole("combobox"));expect(screen.getAllByRole("option")).toHaveLength(4);+ await user.keyboard("{Escape}");+ await user.click(screen.getByRole("button", { name: "连接其他应用" }));+ expect(screen.getByTestId("connection-default").textContent).toBe("true");await user.click(screen.getByRole("button", { name: "帮助与诊断" }));expect(screen.getByRole("heading", { name: "帮助与诊断" })).toBeTruthy();expect(screen.getByRole("heading", { name: "导出日志" })).toBeTruthy();diff --git a/memhub/apps/web/src/R6Settings.tsx b/memhub/apps/web/src/R6Settings.tsxindex b96f154..8e827a8 100644--- a/memhub/apps/web/src/R6Settings.tsx+++ b/memhub/apps/web/src/R6Settings.tsx@@ -401,7 +401,7 @@ export function R6Settings({className="r6-settings-connections"><h2>{text("连接其他应用")}</h2>- <ConnectionFallback />+ <ConnectionFallback defaultExpanded /></section>{showDiagnostics && (<sectiondiff --git a/memhub/apps/web/src/Workbench.test.tsx b/memhub/apps/web/src/Workbench.test.tsxindex dea953e..ef39404 100644--- a/memhub/apps/web/src/Workbench.test.tsx+++ b/memhub/apps/web/src/Workbench.test.tsx@@ -14,16 +14,20 @@ import { LANGUAGE_STORAGE_KEY, LanguageProvider } from "./gui-language";import { OptionMenu } from "./OptionMenu";import { Answer, NodeDetail } from "./Workbench";-it("localiza la selección vacía del menú auxiliar", () => {+it("localiza y mantiene cerrado el menú auxiliar sin opciones", async () => {window.localStorage.setItem(LANGUAGE_STORAGE_KEY, "es");render(<LanguageProvider><OptionMenu value="" options={[]} onChange={vi.fn()} /></LanguageProvider>,);- expect(- screen.getByRole("button", { name: "Selecciona una opción" }),- ).toBeTruthy();+ const menu = screen.getByRole("combobox", {+ name: "Selecciona una opción",+ });+ menu.focus();+ await userEvent.keyboard("{Enter}{ArrowDown}");+ expect(menu.getAttribute("aria-expanded")).toBe("false");+ expect(menu.getAttribute("aria-activedescendant")).toBeNull();window.localStorage.removeItem(LANGUAGE_STORAGE_KEY);});diff --git a/memhub/apps/web/src/onboarding-r6.css b/memhub/apps/web/src/onboarding-r6.cssindex 4770b5a..d04a59b 100644--- a/memhub/apps/web/src/onboarding-r6.css+++ b/memhub/apps/web/src/onboarding-r6.css@@ -55,18 +55,29 @@gap: 6px 10px;font-size: 12px;}-.onboarding-r6-titlebar select {+.onboarding-r6-titlebar .r6-language-option-menu {+ width: 144px;+ max-width: 100%;+}+.onboarding-r6-titlebar .r6-language-option-menu .om-option-menu-button {+ height: 32px;min-width: 0;max-width: 100%;min-height: 32px;- padding: 4px 8px;+ padding: 4px 32px 4px 10px;border: 1px solid #9badbd;border-radius: 8px;color: inherit;background: #f7fafc;font: inherit;}-.onboarding-r6-titlebar select:focus-visible {+.onboarding-r6-titlebar .r6-language-option-menu .om-option-menu-button::after {+ top: 10px;+ right: 11px;+}+.onboarding-r6-titlebar+ .r6-language-option-menu+ .om-option-menu-button:focus-visible {outline: 2px solid #356d99;outline-offset: 2px;}diff --git a/memhub/apps/web/src/r6-settings.css b/memhub/apps/web/src/r6-settings.cssindex 6c488c1..11a8863 100644--- a/memhub/apps/web/src/r6-settings.css+++ b/memhub/apps/web/src/r6-settings.css@@ -1,8 +1,8 @@/* R6 source 139:5728 / 6765 / 7176 / 7585. Overrides stay inside settings. */.r6-settings {box-sizing: border-box;- padding: 26px 40px 46px;- color: #262a2e;+ padding: 30px 40px 48px;+ color: #304757;min-width: 0;width: 100%;flex: 1;@@ -10,161 +10,230 @@letter-spacing: 0;}.r6-settings > h1 {- height: 44px;+ height: auto;font:- 500 28px / 44px "Noto Sans SC",+ 600 26px / 36px "Noto Sans SC","PingFang SC",sans-serif;- margin: 0 0 28px;+ margin: 0 0 22px;}.r6-settings .r6-language-setting {- margin-bottom: 24px;+ position: relative;+ z-index: 2;+ margin-bottom: 20px;padding: 20px 24px;- border: 1px solid #dce4eb;- border-radius: 16px;- background: #fff;+ border: 1px solid #d5dfe8;+ border-radius: 12px;+ background: rgb(255 255 255 / 78%);}.r6-language-setting-title {- margin: 0 0 18px;- font-size: 18px;- line-height: 28px;+ margin: 0 0 14px;+ font-size: 16px;+ font-weight: 600;+ line-height: 26px;}.r6-settings .r6-language-setting-row {display: grid;- grid-template-columns: 96px minmax(0, 1fr);+ grid-template-columns: 104px minmax(0, 1fr);align-items: center;gap: 16px;min-height: 44px;}.r6-settings .r6-language-setting-row label {min-width: 0;- font-size: 14px;- line-height: 24px;+ color: #4f6373;+ font-size: 13px;+ font-weight: 500;+ line-height: 22px;white-space: nowrap;}-.r6-settings .r6-language-setting select {- box-sizing: border-box;+.r6-settings .r6-language-option-menu {width: 100%;- max-width: 100%;min-width: 0;+}+.r6-settings .r6-language-option-menu .om-option-menu-button {+ height: 44px;min-height: 44px;- padding: 8px 12px;- border: 1px solid #dce4eb;+ padding: 0 42px 0 14px;+ border: 1px solid #c6d2da;border-radius: 8px;- color: inherit;+ color: #304757;background: #fff;- font: inherit;+ font-size: 13px;+ line-height: 22px;+}+.r6-settings .r6-language-option-menu .om-option-menu-button::after {+ top: 16px;+ right: 16px;+}+.r6-settings+ .r6-language-option-menu+ .om-option-menu-button[aria-expanded="true"] {+ border-color: #7892a6;+ box-shadow: 0 0 0 3px rgb(85 124 147 / 12%);+}+.r6-settings .r6-language-option-menu .om-option-menu-panel {+ top: calc(100% + 6px);+ padding: 6px;+ border-color: #c6d2da;+ box-shadow: 0 12px 32px rgb(48 71 87 / 13%);+}+.r6-settings .r6-language-option-menu .om-option-menu-panel [role="option"] {+ min-height: 38px;+ padding: 8px 10px;+ color: #304757;+ font-size: 13px;+ line-height: 22px;}-.r6-settings .r6-language-setting select:focus-visible {- outline: 2px solid #225f9d;+.r6-settings+ .r6-language-option-menu+ .om-option-menu-panel+ [role="option"][aria-selected="true"] {+ background: #dfe9ef;+ font-weight: 500;+}+.r6-settings+ .r6-language-option-menu+ .om-option-menu-panel+ [role="option"][data-active="true"] {+ color: #304757;+ background: #e9f0f4;+}+.r6-settings+ .r6-language-option-menu+ .om-option-menu-panel+ [role="option"]:active:not(:disabled) {+ color: #304757;+ background: #d4e2ea;+}+.r6-settings .r6-language-option-menu .om-option-menu-button:focus-visible {+ outline: 2px solid #557c93;outline-offset: 2px;}.r6-language-setting-description {- margin: 16px 0 0;+ margin: 12px 0 0 120px;color: #5e6e7a;font-size: 13px;- line-height: 22px;+ line-height: 21px;overflow-wrap: anywhere;}.r6-settings .r6-settings-layout {display: grid;- grid-template-columns: 220px minmax(0, 1fr);- gap: 24px;- align-items: start;+ grid-template-columns: 190px minmax(0, 1fr);+ gap: 0;+ align-items: stretch;+ border: 1px solid #d5dfe8;+ border-radius: 12px;+ background: #fff;}.r6-settings .r6-settings-layout > nav {box-sizing: border-box;- min-height: 710px;- padding: 13px 11px;- background: rgb(255 255 255 / 27.45%);- border: 1px solid white;- border-radius: 16px;- box-shadow: inset 0 1px white;- backdrop-filter: blur(72px);+ min-height: 560px;+ padding: 16px 12px;+ background: #f3f7f9;+ border: 0;+ border-right: 1px solid #d5dfe8;+ border-radius: 11px 0 0 11px;+ box-shadow: none;+ backdrop-filter: none;display: flex;flex-direction: column;align-items: stretch;- gap: 14px;+ gap: 4px;}.r6-settings .r6-settings-layout > nav > button {box-sizing: border-box;- padding: 8px 16px;+ padding: 8px 12px;height: auto;- min-height: 46px;+ min-height: 42px;text-align: left;border: 0;border-radius: 8px;background: transparent;- color: #262a2e;+ color: #405665;font:- 400 16px / 28px "Noto Sans SC",+ 400 14px / 22px "Noto Sans SC","PingFang SC",sans-serif;box-shadow: none;transform: none;+ cursor: pointer;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;+ transition:+ color 140ms ease-out,+ background-color 140ms ease-out;}.r6-settings .r6-settings-layout > nav > button[aria-current="page"] {- background: #e1eaf0;+ color: #304757;+ background: #dfe9ef;+ font-weight: 500;}.r6-settings .r6-settings-layout > nav > button:hover:not(:disabled) {- background: rgb(225 234 240 / 65%);+ color: #304757;+ background: #e9f0f4;transform: none;}+.r6-settings .r6-settings-layout > nav > button:active:not(:disabled) {+ color: #304757;+ background: #d4e2ea;+}.r6-settings .r6-settings-content {box-sizing: border-box;min-width: 0;- min-height: 710px;- padding: 25px 31px;+ min-height: 560px;+ padding: 28px 34px;background: #fff;- border: 1px solid #dce4eb;- border-radius: 16px;+ border: 0;+ border-radius: 0 11px 11px 0;overflow-wrap: anywhere;}.r6-settings .r6-settings-content > section[hidden] {display: none;}.r6-settings .r6-settings-content > section > h2 {- min-height: 36px;+ min-height: 32px;font:- 500 22px / 36px "Noto Sans SC",+ 600 20px / 32px "Noto Sans SC","PingFang SC",sans-serif;margin: 0;+ text-wrap: balance;}.r6-settings .r6-setting-row {box-sizing: border-box;display: flex;- align-items: flex-start;+ align-items: center;justify-content: space-between;- gap: 24px;- padding: 30px 0 25px;+ gap: 32px;+ padding: 24px 0;border-bottom: 1px solid #d8e2ea;- min-height: 132px;+ min-height: 108px;}.r6-settings .r6-setting-row > div {flex: 1;min-width: 0;+ max-width: 68ch;}.r6-settings .r6-setting-row > button {- margin-top: 12px;+ margin-top: 0;flex-shrink: 0;}.r6-settings .r6-setting-row h3 {font:- 400 18px / 28px "Noto Sans SC",+ 500 16px / 26px "Noto Sans SC","PingFang SC",sans-serif;- margin: 0 0 10px;+ margin: 0 0 6px;}.r6-settings .r6-setting-row p {- font-size: 14px;- line-height: 26px;- color: #63707b;+ font-size: 13px;+ line-height: 23px;+ color: #5e6e7a;margin: 0;overflow-wrap: anywhere;+ text-wrap: pretty;}.r6-settings .r6-setting-row > span {font-size: 13px;@@ -205,6 +274,97 @@font-size: 14px;color: #4f6373;}+.r6-settings .connection-fallback {+ margin: 22px 0 0;+ padding: 0;+ border: 0;+}+.r6-settings .connection-fallback summary {+ width: fit-content;+ min-height: 36px;+ padding: 6px 8px;+ margin-left: -8px;+ border-radius: 6px;+ color: #405665;+ font-size: 14px;+ font-weight: 500;+ line-height: 24px;+ transition:+ color 140ms ease-out,+ background-color 140ms ease-out;+}+.r6-settings .connection-fallback summary:hover {+ color: #304757;+ background: #e9f0f4;+}+.r6-settings .connection-fallback summary:active {+ color: #304757;+ background: #d4e2ea;+}+.r6-settings .connection-fallback .connection-boundary {+ max-width: 68ch;+ margin: 16px 0 20px;+ color: #5e6e7a;+ font-size: 13px;+ line-height: 23px;+ text-wrap: pretty;+}+.r6-settings .connection-fallback .custom-harness-name {+ max-width: 560px;+ gap: 8px;+ margin: 0 0 14px;+ color: #4f6373;+ font-size: 13px;+ font-weight: 500;+}+.r6-settings .connection-fallback .custom-harness-name input {+ box-sizing: border-box;+ width: 100%;+ min-height: 44px;+ padding: 10px 13px;+ border: 1px solid #c6d2da;+ border-radius: 8px;+ background: #fff;+ color: #304757;+ font-size: 14px;+}+.r6-settings .connection-fallback .custom-harness-name input:hover {+ border-color: #aabcc8;+}+.r6-settings .connection-fallback .custom-harness-name input:focus-visible {+ outline: 2px solid #557c93;+ outline-offset: 2px;+}+.r6-settings .connection-fallback > button:not(.quiet) {+ min-height: 42px;+ padding: 0 18px;+ border: 1px solid #5b6f7e;+ border-radius: 8px;+ background: #4f6373;+ color: #fff;+ font-size: 13px;+ font-weight: 500;+ cursor: pointer;+ transition:+ background-color 140ms ease-out,+ transform 90ms ease-out;+}+.r6-settings .connection-fallback > button:not(.quiet):hover:not(:disabled) {+ border-color: #5b6f7e;+ background: #435966;+ color: #fff;+}+.r6-settings .connection-fallback > button:not(.quiet):active:not(:disabled) {+ background: #3d4f5d;+ color: #fff;+ transform: scale(0.985);+}+.r6-settings .connection-fallback > button:not(.quiet):disabled {+ border-color: #c6d2da;+ background: #dbe4e9;+ color: #647783;+ cursor: default;+}.r6-settings .r6-settings-error {color: #953f3f;font-size: 14px;@@ -222,7 +382,7 @@line-height: 24px;}.r6-settings .r6-model-overview {- padding: 32px 0 24px;+ padding: 26px 0 20px;border-bottom: 0;}.r6-settings .r6-model-caption {@@ -233,7 +393,7 @@}.r6-settings .r6-current-model {font:- 400 24px / 40px "Noto Sans SC",+ 500 22px / 34px "Noto Sans SC","PingFang SC",sans-serif;margin: 0 0 7px;@@ -363,23 +523,26 @@}.r6-settings .r6-settings-help .r6-setting-row {display: flex;- min-height: 132px;- padding: 30px 0 25px;+ min-height: 108px;+ padding: 24px 0;align-items: center;gap: 32px;}.r6-settings .r6-settings-help .r6-setting-row h3 {- font-size: 18px;- margin-bottom: 10px;+ font-size: 16px;+ margin-bottom: 6px;}.r6-settings .r6-settings-help .r6-setting-row p {- font-size: 14px;+ font-size: 13px;}-.r6-settings .r6-settings-help .r6-setting-row > button {+.r6-settings .r6-settings-help .r6-setting-row > button:not(.r6-switch) {min-width: 132px;margin-top: 0;margin-left: auto;}+.r6-settings .r6-settings-help .r6-setting-row > .r6-switch {+ margin-left: auto;+}.r6-settings .r6-settings-help .r6-settings-about {min-height: 0;padding-bottom: 24px;@@ -534,10 +697,9 @@}.r6-settings .r6-settings-layout {grid-template-columns: 176px minmax(0, 1fr);- gap: 20px;}.r6-settings .r6-settings-content {- padding: 25px 23px;+ padding: 26px 28px;}.r6-settings .r6-setting-row {flex-wrap: wrap;@@ -559,6 +721,9 @@flex-direction: row;flex-wrap: wrap;gap: 8px;+ border-right: 0;+ border-bottom: 1px solid #d5dfe8;+ border-radius: 11px 11px 0 0;}.r6-settings .r6-settings-layout > nav > button {font-size: 14px;@@ -566,6 +731,18 @@.r6-settings .model-form {grid-template-columns: minmax(0, 1fr);}+ .r6-settings .r6-settings-content {+ min-height: 0;+ padding: 24px 20px;+ border-radius: 0 0 11px 11px;+ }+ .r6-settings .r6-language-setting-row {+ grid-template-columns: minmax(0, 1fr);+ gap: 8px;+ }+ .r6-language-setting-description {+ margin-left: 0;+ }}@media (prefers-reduced-transparency: reduce) {.r6-settings .r6-settings-layout > nav {