v3: src/ gets one layout rule and keeps to it — each layer holds one kind of module, and every layer is split into the same domains — the previous pass sorted components into folders but left hooks, helpers and a barrel inside them, kept hooks/, utils/ and contexts/ flat, and still grouped most tests by theme. The rule: components/ holds only components (.tsx), contexts/ holds FooContext.ts + FooProvider.tsx pairs, hooks/ every hook, utils/ every non-React module, pages/ one component per route and nothing else. Each of components/, contexts/, hooks/ and utils/ is split into the same domains — auth, category, chat, comment, dump, editor, feed, form, layout, player, playlist, profile, social, theme, ws — plus shared/ for what belongs to no one domain, so the chat is components/chat, contexts/chat, hooks/chat and utils/chat. components/ui becomes components/shared to match. Out of components/: useApiForm goes to hooks/form, chat's message.ts and time.ts to utils/chat (with chatDraft and chatText, now draft.ts and text.ts), the emoji skin tone to utils/editor, the remembered volume to utils/player; player/icons.tsx is PlayerIcons.tsx. components/form/index.ts is gone: everything is imported from its own file, FormProvider straight from react-hook-form, and expectOk sits beside friendlyFetchError in utils/shared/api.ts (apiError.ts), since pages that have no form used it too. Out of pages/: the index's feed views, tab bar and presence row move to components/feed; HotFeed and NewFeed, identical but for the sort, are one DumpFeed with an order prop, which also takes over MainFeedProps from pages/index/types.ts. App is a named export like everything else. Tests mirror the tree one file per module — test/<layer>/<domain>/<Module>.test.tsx — so the themed files (hooks/misc, data, editor, sync; utils/misc, text, storage, remote, journal; contexts/providers; pages/auth and UserSubpages; layout/Fabs) are split by subject, the setup each piece needs kept and the rest dropped; the floating-button test becomes one test per button, 627 tests now. The README states the rule. No behaviour changes; the catalogues only move their source references.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

src/test/contexts/theme/ThemeProvider.test.tsx

@@ -0,0 +1,46 @@
+import { describe, expect, test } from "vitest";
+import { act, renderHook } from "@testing-library/react";
+import type { ReactNode } from "react";
+import { ThemeProvider } from "../../../contexts/theme/ThemeProvider.tsx";
+import { useTheme } from "../../../hooks/theme/useTheme.ts";
+
+describe("ThemeProvider", () => {
+  const wrapper = ({ children }: { children: ReactNode }) => (
+    <ThemeProvider>{children}</ThemeProvider>
+  );
+  const root = document.documentElement;
+
+  test("smooth and auto by default, with no attributes", () => {
+    const { result } = renderHook(useTheme, { wrapper });
+    expect(result.current.style).toBe("smooth");
+    expect(result.current.colorScheme).toBe("auto");
+    expect(root.hasAttribute("data-style")).toBe(false);
+    expect(root.hasAttribute("data-color-scheme")).toBe(false);
+  });
+
+  test("applies and persists a choice", () => {
+    const { result } = renderHook(useTheme, { wrapper });
+    act(() => result.current.setStyle("brutalist"));
+    act(() => result.current.setColorScheme("dark"));
+    expect(root.getAttribute("data-style")).toBe("brutalist");
+    expect(root.getAttribute("data-color-scheme")).toBe("dark");
+    expect(localStorage.getItem("style")).toBe("brutalist");
+    expect(localStorage.getItem("color-scheme")).toBe("dark");
+    act(() => result.current.setStyle("smooth"));
+    act(() => result.current.setColorScheme("auto"));
+    expect(root.hasAttribute("data-style")).toBe(false);
+    expect(root.hasAttribute("data-color-scheme")).toBe(false);
+  });
+
+  test("restores the stored theme, migrating the legacy name", () => {
+    localStorage.setItem("style", "nyt");
+    localStorage.setItem("color-scheme", "light");
+    const { result } = renderHook(useTheme, { wrapper });
+    expect(result.current.style).toBe("nyt");
+    expect(result.current.colorScheme).toBe("light");
+    localStorage.setItem("style", "default");
+    expect(renderHook(useTheme, { wrapper }).result.current.style).toBe(
+      "smooth",
+    );
+  });
+});