Merge branch 'ji' into master

frontend-web/src/App.tsx

@@ -10,6 +10,12 @@ import { detectLocale } from "@/core/i18n/locale";
 import { resolveForcedThemeForPath } from "@/core/page-layout/chats-iframe-route";
 import { ChatProvider } from "@/contexts/ChatContext";
 import { ThemeProvider } from "@/contexts/ThemeContext";
+import {
+  resolveEmbedRoundtableTheme,
+  resolveEmbedTheme,
+} from "@/core/embed/params";
+import { usePublicEmbedTheme } from "@/core/embed/background";
+import { readWujieProps } from "@/core/embed/wujie";
 
 import { HashRouter, useLocation } from "react-router-dom";
 
@@ -27,10 +33,32 @@ import EmbedRoundtablePage from "./pages/EmbedRoundtablePage";
 import { ChatRuntime } from "./pages/WorkspaceRoutes";
 import { NotFoundPage } from "./pages/NotFoundPage";
 
+const PUBLIC_EMBED_PREFIXES = ["/share/", "/public/", "/roundtable-share/"];
+
 function AppProviders({ children }: { children: React.ReactNode }) {
   const locale = useMemo(() => detectLocale(), []);
   const location = useLocation();
-  const forcedTheme = resolveForcedThemeForPath(location.pathname);
+  const publicEmbedTheme = usePublicEmbedTheme();
+  const forcedTheme = useMemo(() => {
+    const routeTheme = resolveForcedThemeForPath(location.pathname);
+    if (routeTheme) return routeTheme;
+    if (location.pathname === "/embed/roundtable") {
+      const wp = readWujieProps();
+      const raw =
+        (typeof wp.theme === "string" && wp.theme.trim()) ||
+        new URLSearchParams(location.search).get("theme")?.trim() ||
+        "dark";
+      return resolveEmbedRoundtableTheme(raw);
+    }
+    if (location.pathname.startsWith("/embed/chats")) {
+      const raw = new URLSearchParams(location.search).get("theme")?.trim();
+      return raw ? resolveEmbedTheme(raw) : undefined;
+    }
+    if (PUBLIC_EMBED_PREFIXES.some((p) => location.pathname.startsWith(p))) {
+      return publicEmbedTheme;
+    }
+    return undefined;
+  }, [location.pathname, location.search, publicEmbedTheme]);
 
   return (
     <NextThemesProvider
@@ -41,8 +69,6 @@ function AppProviders({ children }: { children: React.ReactNode }) {
       disableTransitionOnChange
       forcedTheme={forcedTheme}
     >
-      {/* QueryClientProvider must wrap ThemeProvider because the custom
-          ThemeProvider reads the admin-configured default via useQuery. */}
       <QueryClientProvider>
         <I18nProvider initialLocale={locale}>
           <ThemeProvider>
@@ -67,11 +93,8 @@ export function App() {
           <Route path="/login" element={<LoginPage />} />
           <Route path="/login/:username" element={<LoginPage />} />
           <Route path="/landing" element={<LandingPage />} />
-          {/* Public read-only conversation viewer — no authentication. */}
           <Route path="/share/:shareCode" element={<PublicSharePage />} />
-          {/* Public read-only user leaderboard publish page — no authentication. */}
           <Route path="/public/leaderboard" element={<PublicLeaderboardPage />} />
-          {/* Public read-only roundtable share — landing + full result report. */}
           <Route
             path="/roundtable-share/:shareCode"
             element={<PublicRoundtableSharePage />}
@@ -80,7 +103,6 @@ export function App() {
             path="/roundtable-share/:shareCode/report"
             element={<PublicRoundtableSharePage report />}
           />
-          {/* Public read-only scheduled-task runs viewer — no authentication. */}
           <Route
             path="/public/scheduled-tasks/:taskId"
             element={<PublicScheduledTaskPage />}
@@ -89,7 +111,6 @@ export function App() {
             path="/public/scheduled-tasks/:taskId/runs/:runId/fullscreen"
             element={<PublicScheduledTaskFullscreenPage />}
           />
-          {/* Embedded workspace Q&A — no page/workspace sidebars; parent passes message/username/theme */}
           <Route
             path="/embed/chats/:thread_id"
             element={
@@ -98,7 +119,6 @@ export function App() {
               </ChatRuntime>
             }
           />
-          {/* Embedded roundtable planning — body only, no sidebars; username login (not wujie ticket) */}
           <Route path="/embed/roundtable" element={<EmbedRoundtablePage />} />
           <Route path="/page/*" element={<PageRoutes />} />
           <Route path="*" element={<NotFoundPage />} />
@@ -106,4 +126,4 @@ export function App() {
       </AppProviders>
     </HashRouter>
   );
-}
+}