Merge branch 'master' into feat/workbench-saas-polish-and-reset

src/App.tsx

@@ -8,6 +8,7 @@ import ToastContainer from "./components/toast/ToastContainer";
 import { toast } from "./components/toast/toastStore";
 import { aiGenerationClient } from "./api/aiGenerationClient";
 import { keyServerClient } from "./api/keyServerClient";
+import { setUserMaxConcurrency } from "./api/generationConcurrency";
 import { notificationClient } from "./api/notificationClient";
 import {
   SERVER_SESSION_REPLACED_EVENT,
@@ -32,6 +33,7 @@ const CharacterMixPage = lazy(() => import("./features/character-mix/CharacterMi
 const CommunityPage = lazy(() => import("./features/community/CommunityPage"));
 const CommunityCaseAddPage = lazy(() => import("./features/community-review/CommunityCaseAddPage"));
 const CommunityReviewPage = lazy(() => import("./features/community-review/CommunityReviewPage"));
+const BetaApplicationsPage = lazy(() => import("./features/beta-applications/BetaApplicationsPage"));
 const AvatarConsolePage = lazy(() => import("./features/digital-human/AvatarConsolePage"));
 const DigitalHumanPage = lazy(() => import("./features/digital-human/DigitalHumanPage"));
 const DialogGeneratorPage = lazy(() => import("./features/dialog-generator/DialogGeneratorPage"));
@@ -108,6 +110,7 @@ const VIEW_KEYS = new Set<WebViewKey>([
   "more",
   "communityReview",
   "communityCaseAdd",
+  "betaApplications",
   "report",
   "providerHealth",
   "userAgreement",
@@ -123,6 +126,7 @@ const LEGACY_PAGE_STYLE_VIEWS = new Set<WebViewKey>([
   "community",
   "communityReview",
   "communityCaseAdd",
+  "betaApplications",
   "assets",
   "ecommerce",
   "ecommerceHub",
@@ -156,6 +160,8 @@ function normalizeViewKey(rawView: string): WebViewKey {
           ? "communityReview"
           : rawView === "community-case-add"
             ? "communityCaseAdd"
+            : rawView === "beta-applications" || rawView === "beta-application-review"
+              ? "betaApplications"
         : rawView;
   return VIEW_KEYS.has(normalized as WebViewKey) ? (normalized as WebViewKey) : "not-found";
 }
@@ -198,7 +204,7 @@ function createWorkflowFromResult(payload: WorkbenchResultActionPayload): WebCan
     description: payload.prompt || "从生成结果进入画布继续创作。",
     source: "blank",
     settings: {
-      model: payload.resultType === "video" ? "Seedance 2.0" : "Nano Banana Pro",
+      model: payload.resultType === "video" ? "Seedance 2.0" : "omni-水果 Pro",
       ratio: payload.resultType === "video" ? "16:9" : "1:1",
       duration: payload.resultType === "video" ? "6s" : "0s",
       resolution: payload.resultType === "video" ? "720p" : "2K",
@@ -470,6 +476,7 @@ function App() {
   const clearAuthenticatedState = useCallback((options?: { resetView?: boolean }) => {
     clearAllUserStorage();
     clearSessionState();
+    setUserMaxConcurrency(null);
     setProjects([]);
     setProjectsLoaded(true);
     setUsage(emptyUsageSummary);
@@ -578,6 +585,7 @@ function App() {
       const nextSession = await keyServerClient.getCurrentSession();
       if (cancelled) return;
       setSession(nextSession);
+      setUserMaxConcurrency(nextSession?.user?.maxConcurrency);
       await hydrateAccountData(nextSession);
     };
 
@@ -610,6 +618,7 @@ function App() {
         if (cancelled) return;
         if (nextSession) {
           setSession(nextSession);
+          setUserMaxConcurrency(nextSession?.user?.maxConcurrency);
         } else {
           clearAuthenticatedState({ resetView: true });
         }
@@ -947,6 +956,7 @@ function App() {
     async (nextSession: WebUserSession) => {
       hideSessionReplaced();
       setSession(nextSession);
+      setUserMaxConcurrency(nextSession?.user?.maxConcurrency);
       await hydrateAccountData(nextSession);
 
       if (nextSession.user.email && !nextSession.user.emailVerified) {
@@ -1010,7 +1020,7 @@ function App() {
               previewUrl: payload.resultUrl,
               params: payload.resultType === "video"
                 ? { model: "Kling V3 Omni", aspectRatio: "16:9", resolution: "720p", duration: "6s", videoMode: "text-to-video" }
-                : { model: "Nano Banana Pro", aspectRatio: "1:1", imageSize: "2K" },
+                : { model: "omni-水果 Pro", aspectRatio: "1:1", imageSize: "2K" },
               assetRef: payload.resultOssKey ? { url: payload.resultUrl, ossKey: payload.resultOssKey, mediaType: payload.resultType === "video" ? "video/mp4" : "image/png", sourceTaskId: payload.taskId } : undefined,
             },
           ];
@@ -1302,6 +1312,8 @@ function App() {
             onOpenReview={() => handleSetView("communityReview")}
           />
         );
+      case "betaApplications":
+        return <BetaApplicationsPage session={session} onOpenLogin={handleOpenLogin} />;
       case "workbench":
         return (
           <WorkbenchPage