Merge remote-tracking branch 'origin/master' into feat/profile-ui-polish

src/features/canvas/CanvasPage.tsx

@@ -48,6 +48,7 @@ import {
 } from "./canvasCommunityPublish";
 import { createCanvasAssetRefFromGeneratedResult, persistCanvasGeneratedResultAsset } from "./canvasAssetPersistence";
 import { normalizeCanvasWorkflowSchema } from "./canvasWorkflowSchema";
+import { createBlankWorkflow } from "../../data/workflows";
 import { useCanvasHistory, type CanvasHistorySnapshot } from "./useCanvasHistory";
 import { useCanvasKeyboard } from "./useCanvasKeyboard";
 import { useCanvasNodeDrag } from "./useCanvasNodeDrag";
@@ -310,7 +311,7 @@ function getCameraMotionPrompt(value: string): string {
 }
 
 function CanvasPage({
-  workflow,
+  workflow: rawWorkflow,
   projectId,
   projects = [],
   projectsLoaded = true,
@@ -323,6 +324,7 @@ function CanvasPage({
   onSaveWorkflow,
   onCreateTask,
 }: CanvasPageProps) {
+  const workflow = rawWorkflow || createBlankWorkflow();
   const [contextMenu, setContextMenu] = useState<CanvasFloatingMenuPosition | null>(null);
   const [nodeMenu, setNodeMenu] = useState<CanvasFloatingMenuPosition | null>(null);
   const [textNodeMenu, setTextNodeMenu] = useState<{ left: number; top: number; nodeId: string } | null>(null);
@@ -404,6 +406,7 @@ function CanvasPage({
     textGenerationState, imageGenerationState, videoGenerationState,
     generationToast, setGenerationToast,
     imageGenerationInFlightRef, textGenerationInFlightRef, textGenerationAbortControllersRef,
+    canvasGenKeepaliveRestoredRef,
     setTextGenerationStatus, setImageGenerationStatus, setVideoGenerationStatus,
     restoreKeepaliveTasks, resetGenerationState,
   } = useCanvasGeneration({ setImageNodes, setVideoNodes });
@@ -524,6 +527,7 @@ function CanvasPage({
   const canvasAssets = serverAssets.filter((asset) => asset.imageUrl);
   const shouldShowEmptyProjectState =
     projectsLoaded && projects.length === 0 && !projectId && workflow.source === "blank" && workflow.nodes.length === 0;
+  const isWaitingForProjects = isAuthenticated && !projectsLoaded;
   const [projectSaveState, setProjectSaveState] = useState<CanvasProjectSaveState>({
     status: "idle",
     message: "",
@@ -571,10 +575,13 @@ function CanvasPage({
     imageNodeIdRef.current = nextImageNodes.length + 1;
     videoNodeIdRef.current = nextVideoNodes.length + 1;
 
+    // Reset keepalive flag so tasks can be restored for this project
+    canvasGenKeepaliveRestoredRef.current = false;
     if (projectId && isAuthenticated) {
       restoreKeepaliveTasks(projectId, nextImageNodes, nextVideoNodes);
     }
-  }, [workflow.id, workflow.nodes, projectId, isAuthenticated]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [workflow.id, workflow.nodes, projectId]);
 
   useEffect(() => {
     if (!isAuthenticated) {
@@ -3524,16 +3531,16 @@ function CanvasPage({
 
   return (
     <WorkspacePageShell title="画布" fullWidth className="canvas-page page-motion">
-      <div className={`studio-tool-layout studio-tool-layout--no-top studio-tool-layout--no-left studio-tool-layout--no-right studio-tool-layout--canvas${shouldShowEmptyProjectState ? " studio-tool-layout--canvas-empty" : ""}`}>
+      <div className={`studio-tool-layout studio-tool-layout--no-top studio-tool-layout--no-left studio-tool-layout--no-right studio-tool-layout--canvas${(shouldShowEmptyProjectState || isWaitingForProjects) ? " studio-tool-layout--canvas-empty" : ""}`}>
         <section
-          className={`studio-canvas${pendingLinkPort ? " is-linking" : ""}${shouldShowEmptyProjectState ? " is-empty-projects" : ""}`}
+          className={`studio-canvas${pendingLinkPort ? " is-linking" : ""}${(shouldShowEmptyProjectState || isWaitingForProjects) ? " is-empty-projects" : ""}`}
           ref={canvasRef}
-          onAuxClick={shouldShowEmptyProjectState ? undefined : handleCanvasAuxClick}
-          onContextMenu={shouldShowEmptyProjectState ? (event) => event.preventDefault() : handleCanvasContextMenu}
-          onMouseDownCapture={shouldShowEmptyProjectState ? undefined : handleCanvasMouseDown}
-          onDoubleClick={shouldShowEmptyProjectState ? undefined : handleCanvasDoubleClick}
-          onMouseMove={shouldShowEmptyProjectState ? undefined : handleCanvasMouseMove}
-          onWheel={shouldShowEmptyProjectState ? undefined : handleCanvasWheel}
+          onAuxClick={(shouldShowEmptyProjectState || isWaitingForProjects) ? undefined : handleCanvasAuxClick}
+          onContextMenu={(shouldShowEmptyProjectState || isWaitingForProjects) ? (event) => event.preventDefault() : handleCanvasContextMenu}
+          onMouseDownCapture={(shouldShowEmptyProjectState || isWaitingForProjects) ? undefined : handleCanvasMouseDown}
+          onDoubleClick={(shouldShowEmptyProjectState || isWaitingForProjects) ? undefined : handleCanvasDoubleClick}
+          onMouseMove={(shouldShowEmptyProjectState || isWaitingForProjects) ? undefined : handleCanvasMouseMove}
+          onWheel={(shouldShowEmptyProjectState || isWaitingForProjects) ? undefined : handleCanvasWheel}
           style={{
             "--canvas-bg-size": `${24 * canvasViewport.zoom}px`,
             "--canvas-bg-x": `${canvasViewport.x}px`,
@@ -3555,7 +3562,7 @@ function CanvasPage({
             className="studio-canvas-hidden-input"
             onChange={(event) => handleImageFileSelected(event, pendingImagePosition)}
           />
-          {!shouldShowEmptyProjectState ? (
+          {(!shouldShowEmptyProjectState || isWaitingForProjects) ? (
           <div className="studio-canvas-project-bar" onMouseDown={(event) => event.stopPropagation()}>
             <div className="studio-canvas-project-bar__identity">
               {projectNameEditing ? (
@@ -3650,7 +3657,7 @@ function CanvasPage({
             </button>
           </div>
           ) : null}
-          {!shouldShowEmptyProjectState && recentProjectsOpen ? (
+          {(!shouldShowEmptyProjectState || isWaitingForProjects) && recentProjectsOpen ? (
             <aside
               id="studio-canvas-recent-drawer"
               className="studio-canvas-recent-drawer"
@@ -3718,8 +3725,8 @@ function CanvasPage({
             zoomOnPinch={false}
             zoomOnScroll={false}
             proOptions={{ hideAttribution: true }}
-            onPaneClick={shouldShowEmptyProjectState ? undefined : handlePaneClick}
-            onPaneContextMenu={shouldShowEmptyProjectState ? undefined : handlePaneContextMenu}
+            onPaneClick={(shouldShowEmptyProjectState || isWaitingForProjects) ? undefined : handlePaneClick}
+            onPaneContextMenu={(shouldShowEmptyProjectState || isWaitingForProjects) ? undefined : handlePaneContextMenu}
           >
             <Background gap={24} color="transparent" className="studio-canvas__background" />
           </ReactFlow>
@@ -3731,7 +3738,7 @@ function CanvasPage({
             <button type="button" title="放大" onClick={zoomCanvasIn}>+</button>
             <button type="button" title="适应视图" onClick={fitCanvasView}>⊡</button>
           </div>
-          {shouldShowEmptyProjectState ? (
+          {(shouldShowEmptyProjectState || isWaitingForProjects) ? (
             <div
               className="studio-canvas-empty-projects"
               role="status"
@@ -3742,21 +3749,30 @@ function CanvasPage({
                 event.stopPropagation();
               }}
             >
-              <strong>没有画布项目，是否需要新建画布？</strong>
-              <button
-                type="button"
-                className="studio-canvas-empty-projects__button"
-                onClick={(event) => {
-                  event.stopPropagation();
-                  if (onStartCreate) {
-                    onStartCreate();
-                    return;
-                  }
-                  onOpenLogin();
-                }}
-              >
-                新建画布
-              </button>
+              {isWaitingForProjects ? (
+                <>
+                  <div className="studio-canvas-loading-spinner" />
+                  <strong>正在加载项目数据…</strong>
+                </>
+              ) : (
+                <>
+                  <strong>没有画布项目，是否需要新建画布？</strong>
+                  <button
+                    type="button"
+                    className="studio-canvas-empty-projects__button"
+                    onClick={(event) => {
+                      event.stopPropagation();
+                      if (onStartCreate) {
+                        onStartCreate();
+                        return;
+                      }
+                      onOpenLogin();
+                    }}
+                  >
+                    新建画布
+                  </button>
+                </>
+              )}
             </div>
           ) : null}
           {selectionRect ? (

src/features/character-mix/CharacterMixPage.tsx

@@ -22,6 +22,7 @@ import type { WebImageWorkbenchTool, WebViewKey } from "../../types";
 import { aiGenerationClient } from "../../api/aiGenerationClient";
 import { uploadAssetWithProgress } from "../../api/uploadWithProgress";
 import { waitForTask } from "../../api/taskSubscription";
+import { saveToolTaskState, loadToolTaskState, clearToolTaskState } from "../workbench/toolKeepalive";
 import { addToolResultToAssetLibrary, saveToolResultToLocal } from "../workbench/toolResultActions";
 import { CheckCircleOutlined, InfoCircleOutlined } from "@ant-design/icons";
 
@@ -85,12 +86,32 @@ function CharacterMixPage({
     };
   }, [checkImage, characterPreview]);
 
+  const keepaliveRestoredRef = useRef(false);
+
+  // Keep-alive: restore saved task on mount
+  useEffect(() => {
+    if (keepaliveRestoredRef.current) return;
+    keepaliveRestoredRef.current = true;
+    const saved = loadToolTaskState("charactermix");
+    if (!saved || saved.resultUrl) return;
+    setIsCreating(true);
+    abortRef.current = false;
+    void pollTaskUntilDone(saved.taskId).then((result) => {
+      setResultUrl(result);
+      setNotice(result ? "角色迁移完成" : "已取消");
+      setIsCreating(false);
+      setProgress(0);
+      if (result) {
+        saveToolTaskState("charactermix", { taskId: saved.taskId, resultUrl: result, status: "完成", progress: 100 });
+      } else {
+        clearToolTaskState("charactermix");
+      }
+    });
+  }, []);
+
   useEffect(() => {
     return () => {
       abortRef.current = true;
-      if (taskIdRef.current) {
-        aiGenerationClient.cancelTask(taskIdRef.current).catch(() => {});
-      }
     };
   }, []);
 
@@ -100,6 +121,7 @@ function CharacterMixPage({
       aiGenerationClient.cancelTask(taskIdRef.current).catch(() => {});
       taskIdRef.current = null;
     }
+    clearToolTaskState("charactermix");
   }, []);
 
   const pollTaskUntilDone = useCallback(async (taskId: string): Promise<string | null> => {
@@ -153,10 +175,16 @@ function CharacterMixPage({
         muted: !watermark,
       });
       taskIdRef.current = taskId;
+      saveToolTaskState("charactermix", { taskId, status: "running", progress: 0 });
 
       const result = await pollTaskUntilDone(taskId);
       setResultUrl(result);
       setNotice(result ? "角色迁移完成" : "已取消");
+      if (result) {
+        saveToolTaskState("charactermix", { taskId, resultUrl: result, status: "完成", progress: 100 });
+      } else {
+        clearToolTaskState("charactermix");
+      }
     } catch (error) {
       setNotice(error instanceof Error ? error.message : "任务创建失败，请稍后重试。");
     } finally {

src/features/community/CommunityPage.tsx

@@ -7,8 +7,10 @@ import {
   PictureOutlined,
   PlusOutlined,
   RightOutlined,
+  SearchOutlined,
 } from "@ant-design/icons";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useDebounce } from "../../hooks/useDebounce";
 import { communityClient, type ServerCommunityCase } from "../../api/communityClient";
 import WorkspacePageShell from "../../components/WorkspacePageShell";
 import OptimizedImage from "../../components/OptimizedImage";
@@ -70,6 +72,8 @@ function buildWorkflowFromServerCase(item: ServerCommunityCase, fallback: WebCan
 function CommunityPage({ projects, isAuthenticated, onStartCreate, onOpenProject, onDeleteProject, onImportWorkflow, onRequireLogin }: CommunityPageProps) {
   const [serverCases, setServerCases] = useState<ServerCommunityCase[]>([]);
   const [serverNotice, setServerNotice] = useState<string | null>(null);
+  const [query, setQuery] = useState("");
+  const debouncedQuery = useDebounce(query, 300);
   const [favoriteIds, setFavoriteIds] = useState<string[]>([]);
   const canUseProtectedAction = (action: string) => onRequireLogin?.(action) !== false;
 
@@ -232,40 +236,6 @@ function CommunityPage({ projects, isAuthenticated, onStartCreate, onOpenProject
     };
   }, []);
 
-  useEffect(() => {
-    let cancelled = false;
-    const timeoutId = window.setTimeout(() => {
-      communityClient
-        .listApprovedCases({
-          limit: 30,
-          sort: "latest",
-        })
-        .then((items) => {
-          if (!cancelled) {
-            const canvasItems = items.filter(shouldShowInCanvasCommunity);
-            setServerCases(canvasItems);
-            setServerNotice(
-              canvasItems.length
-                ? "已连接服务器画布社区"
-                : items.length
-                  ? "服务器暂无匹配画布案例"
-                  : "社区暂无模板",
-            );
-          }
-        })
-        .catch((error) => {
-          if (!cancelled) {
-            setServerNotice(error instanceof Error ? error.message : "社区服务暂时不可用");
-          }
-        });
-    }, 280);
-
-    return () => {
-      cancelled = true;
-      window.clearTimeout(timeoutId);
-    };
-  }, []);
-
   const handleToggleFavorite = async (item: ServerCommunityCase, cardId: string) => {
     const nextActive = !(item.isFavorited || favoriteIds.includes(cardId));
     setFavoriteIds((current) =>
@@ -294,7 +264,17 @@ function CommunityPage({ projects, isAuthenticated, onStartCreate, onOpenProject
     }
   };
 
-  const liveCases: ServerCommunityCase[] = serverCases.slice(0, 12);
+  const filteredCases = useMemo(() => {
+    const q = debouncedQuery.trim().toLowerCase();
+    if (!q) return serverCases;
+    return serverCases.filter((c) =>
+      (c.title || "").toLowerCase().includes(q) ||
+      (c.description || "").toLowerCase().includes(q) ||
+      (c.tags || []).some((t: string) => t.toLowerCase().includes(q))
+    );
+  }, [serverCases, debouncedQuery]);
+
+  const liveCases: ServerCommunityCase[] = filteredCases.slice(0, 12);
 
   return (
     <WorkspacePageShell title="社区" fullWidth className="community-page page-motion">
@@ -421,6 +401,15 @@ function CommunityPage({ projects, isAuthenticated, onStartCreate, onOpenProject
           <div>
             <h2>社区精选</h2>
           </div>
+          <label className="asset-search">
+            <SearchOutlined />
+            <input
+              value={query}
+              onChange={(e) => setQuery(e.target.value)}
+              placeholder="搜索案例..."
+            />
+            {query ? <button type="button" className="asset-search__clear" onClick={() => setQuery("")} aria-label="清除搜索">×</button> : null}
+          </label>
           {serverNotice ? <span className="studio-pill">{serverNotice}</span> : null}
         </div>
         {liveCases.length ? (
@@ -507,8 +496,8 @@ function CommunityPage({ projects, isAuthenticated, onStartCreate, onOpenProject
         ) : (
           <EmptyState
             icon={<ImportOutlined style={{ fontSize: 48 }} />}
-            title="社区暂无模板"
-            description="管理员审核通过后，画布社区案例会显示在这里。"
+            title={debouncedQuery ? "无匹配结果" : "社区暂无模板"}
+            description={debouncedQuery ? "尝试其他关键词，或清除搜索查看全部案例" : "管理员审核通过后，画布社区案例会显示在这里。"}
           />
         )}
       </section>

src/features/digital-human/DigitalHumanPage.tsx

@@ -21,6 +21,7 @@ import { useCallback, useEffect, useRef, useState } from "react";
 import { aiGenerationClient } from "../../api/aiGenerationClient";
 import { uploadAssetWithProgress } from "../../api/uploadWithProgress";
 import { waitForTask } from "../../api/taskSubscription";
+import { saveToolTaskState, loadToolTaskState, clearToolTaskState } from "../workbench/toolKeepalive";
 import { getServerBaseUrl } from "../../api/serverConnection";
 import type { CreatePreviewTaskInput } from "../../api/webGenerationGateway";
 import StudioToolLayout from "../../components/StudioToolLayout";
@@ -93,6 +94,7 @@ function DigitalHumanPage({
   const cancelRef = useRef(false);
   const activeTaskIdRef = useRef(activeTaskId);
   activeTaskIdRef.current = activeTaskId;
+  const keepaliveRestoredRef = useRef(false);
 
   useEffect(() => {
     return () => {
@@ -106,13 +108,24 @@ function DigitalHumanPage({
     };
   }, [audioPreview]);
 
+  // Keep-alive: restore saved task on mount
+  useEffect(() => {
+    if (keepaliveRestoredRef.current) return;
+    keepaliveRestoredRef.current = true;
+    const saved = loadToolTaskState("digital-human");
+    if (!saved || saved.resultUrl) return;
+    setIsProcessing(true);
+    cancelRef.current = false;
+    pollRunRef.current += 1;
+    setActiveTaskId(saved.taskId);
+    void waitForTaskResult(saved.taskId).catch(() => {});
+    setStatus("正在恢复数字人任务...");
+  }, []);
+
   useEffect(() => {
     return () => {
       pollRunRef.current += 1;
       cancelRef.current = true;
-      if (activeTaskIdRef.current) {
-        aiGenerationClient.cancelTask(activeTaskIdRef.current).catch(() => {});
-      }
     };
   }, []);
 
@@ -186,6 +199,7 @@ function DigitalHumanPage({
     const runId = ++pollRunRef.current;
     setActiveTaskId(taskId);
     setTaskProgress(0);
+    saveToolTaskState("digital-human", { taskId, status: "running", progress: 0 });
     pushDebugEntry("开始订阅", `开始接收任务 ${taskId} 的生成结果。`);
 
     const resultUrl = await waitForTask(taskId, {
@@ -204,6 +218,7 @@ function DigitalHumanPage({
         if (e.status === "completed" && e.resultUrl) {
           setResultVideoUrl(e.resultUrl);
           setNotice(`任务完成，结果已接收：${taskId}`);
+          clearToolTaskState("digital-human");
           pushDebugEntry("结果已接收", summarizeUrl(e.resultUrl), "success", { taskId, resultUrl: e.resultUrl });
         }
       },

src/features/ecommerce/EcommercePage.tsx

@@ -20,6 +20,8 @@ const ecommerceSlide5 = `${OSS_MUBAN}/slide-5.png`;
 import ImageMentionMenu, { getImageMentionQuery, insertImageMentionValue, type MentionImageOption } from "./ImageMentionMenu";
 import EcommerceVideoWorkspace from "./EcommerceVideoWorkspace";
 import { aiGenerationClient } from "../../api/aiGenerationClient";
+import { ServerRequestError } from "../../api/serverConnection";
+import { waitForTask } from "../../api/taskSubscription";
 import {
   analyzeProductImages,
   buildProductSummary,
@@ -771,6 +773,7 @@ function ProductClonePage(_props: ProductClonePageProps = {}) {
   const [productSetRequirement, setProductSetRequirement] = useState("");
   const [productSetOutput, setProductSetOutput] = useState<ProductSetOutputKey>("video");
   const [productSetStatus, setProductSetStatus] = useState<ProductSetStatus>("idle");
+  const [productSetResultImages, setProductSetResultImages] = useState<string[]>([]);
   const [isSetUploadDragging, setIsSetUploadDragging] = useState(false);
   const [selectedProductSetPreview, setSelectedProductSetPreview] = useState<{ src: string; label: string } | null>(null);
   const [showHostingModal, setShowHostingModal] = useState(false);
@@ -819,6 +822,7 @@ function ProductClonePage(_props: ProductClonePageProps = {}) {
   const [ratio, setRatio] = useState(getPlatformDefaultRatio(platformOptions[0]));
   const [status, setStatus] = useState<ProductCloneStatus>("idle");
   const [results, setResults] = useState<CloneResult[]>([]);
+  const imageAbortRef = useRef({ current: false });
   const [garmentImages, setGarmentImages] = useState<CloneImageItem[]>([]);
   const [modelSource, setModelSource] = useState<TryOnModelSource>("ai");
   const [modelGender, setModelGender] = useState(tryOnModelOptions.gender[0]);
@@ -840,6 +844,7 @@ function ProductClonePage(_props: ProductClonePageProps = {}) {
   const [detailRequirement, setDetailRequirement] = useState("");
   const [selectedDetailModules, setSelectedDetailModules] = useState<string[]>(defaultDetailModuleIds);
   const [detailStatus, setDetailStatus] = useState<DetailStatus>("idle");
+  const [detailResultUrl, setDetailResultUrl] = useState<string | null>(null);
   const productSetRatioOptions = getPlatformRatioOptions(productSetPlatform, productSetOutput);
   const hotUploadedRatioOption = cloneOutput === "hot" ? formatUploadedImageRatio(cloneReferenceImages[0]) : null;
   const baseCloneRatioOptions = getPlatformRatioOptions(platform, cloneOutput);
@@ -1339,6 +1344,180 @@ function ProductClonePage(_props: ProductClonePageProps = {}) {
     return urls;
   };
 
+  const uploadCloneImages = async (images: CloneImageItem[]): Promise<string[]> => {
+    const SUPPORTED_IMAGE_TYPES = new Set(["image/jpeg", "image/png", "image/webp", "image/gif"]);
+    const urls: string[] = [];
+    for (const item of images) {
+      try {
+        const resp = await fetch(item.src);
+        const rawBlob = await resp.blob();
+        const mimeType = SUPPORTED_IMAGE_TYPES.has(rawBlob.type) ? rawBlob.type : "image/png";
+        const blob = rawBlob.type === mimeType ? rawBlob : new Blob([rawBlob], { type: mimeType });
+        const { url } = await aiGenerationClient.uploadAssetBinary(blob, { name: item.name, mimeType, scope: "ecommerce-product" });
+        urls.push(url);
+      } catch {
+        // skip images that fail to upload
+      }
+    }
+    return urls;
+  };
+
+  const IMAGE_MODEL = "gpt-image-2";
+
+  const setCountLabels: Record<CloneSetCountKey, { label: string; promptDesc: string }> = {
+    selling: { label: "卖点图", promptDesc: "selling-point infographic image highlighting core product advantages and detail close-ups" },
+    white:   { label: "白底图", promptDesc: "clean white-background product photo showing the item from its best angle, studio lighting, no props" },
+    scene:   { label: "场景图", promptDesc: "lifestyle scene image showing the product in a realistic usage environment with natural surroundings" },
+  };
+
+  const buildSetSubPrompt = (countKey: CloneSetCountKey, index: number, totalCount: number, pPlatform: string, pRatio: string, pLanguage: string, pMarket: string): string => {
+    const info = setCountLabels[countKey];
+    const parts: string[] = [];
+    parts.push(`Generate an e-commerce ${info.label.toLowerCase()} for a product listing.`);
+    parts.push(info.promptDesc);
+    if (totalCount > 1) {
+      parts.push(`This is variant ${index + 1} of ${totalCount} — vary the angle, composition, or emphasis to make each distinct.`);
+    }
+    parts.push(`Platform: ${pPlatform}. Aspect ratio: ${pRatio}. Language/copy: ${pLanguage}. Market: ${pMarket}.`);
+    parts.push("Must comply with platform image guidelines — proper margins, no watermark, professional quality.");
+    return parts.join(" ");
+  };
+
+  const buildEcommerceImagePrompt = (outputKey: CloneOutputKey, userText: string, pPlatform: string, pRatio: string, pLanguage: string, pMarket: string): string => {
+    const parts: string[] = [];
+    if (outputKey === "detail") {
+      parts.push("Generate a professional A+ detail page hero image for an e-commerce product listing.");
+      parts.push("Create a high-impact first-screen visual that combines the product photo with key selling points, usage scenes, and detailed specifications in a cohesive layout.");
+      parts.push(`Platform: ${pPlatform}. Aspect ratio: ${pRatio}. Language/copy: ${pLanguage}. Market: ${pMarket}.`);
+      parts.push("Follow platform A+ page best practices — clear hierarchy, professional typography, high visual impact.");
+    } else if (outputKey === "model") {
+      parts.push("Generate model/try-on lifestyle images for an e-commerce product listing.");
+      parts.push("Show the product being used or worn by a model in attractive lifestyle settings.");
+      parts.push(`Platform: ${pPlatform}. Aspect ratio: ${pRatio}. Language/copy: ${pLanguage}. Market: ${pMarket}.`);
+      parts.push("Model should appear natural and appealing. Background should complement the product. Image must meet platform standards.");
+    } else if (outputKey === "hot") {
+      parts.push("Generate a high-conversion e-commerce product image that closely replicates the style and composition of the reference image while adapting it to the target platform.");
+      parts.push(`Replicate the visual style, color palette, and layout feel of the source product image, then adapt it for ${pPlatform} marketplace standards.`);
+      parts.push(`Platform: ${pPlatform}. Aspect ratio: ${pRatio}. Language/copy: ${pLanguage}. Market: ${pMarket}.`);
+      parts.push("The result must look professional and optimized for high click-through rate and conversion on the specified platform.");
+    }
+    if (userText.trim()) {
+      parts.push(`Additional user requirements: ${userText.trim()}`);
+    }
+    return parts.join(" ");
+  };
+
+  const generateSetImages = async (
+    images: CloneImageItem[],
+    counts: Record<CloneSetCountKey, number>,
+    userText: string,
+    pPlatform: string,
+    pRatio: string,
+    pLanguage: string,
+    pMarket: string,
+    setStatusFn: (status: "generating" | "done" | "idle") => void,
+    setResultFn: (urls: string[]) => void,
+  ): Promise<void> => {
+    setStatusFn("generating");
+    try {
+      const referenceUrls = await uploadCloneImages(images);
+      if (!referenceUrls.length) {
+        setStatusFn("idle");
+        return;
+      }
+
+      const generatedUrls: string[] = [];
+      const stamp = Date.now();
+
+      for (const countKey of cloneSetCountOptions.map((o) => o.key)) {
+        const count = counts[countKey];
+        for (let i = 0; i < count; i++) {
+          if (imageAbortRef.current.current) break;
+          const subPrompt = buildSetSubPrompt(countKey, i, count, pPlatform, pRatio, pLanguage, pMarket);
+          const fullPrompt = userText.trim() ? `${subPrompt} Additional user requirements: ${userText.trim()}` : subPrompt;
+
+          const { taskId } = await aiGenerationClient.createImageTask({
+            model: IMAGE_MODEL,
+            prompt: fullPrompt,
+            ratio: pRatio,
+            quality: pRatio.includes("720") ? "720P" : "1080P",
+            gridMode: "single",
+            referenceUrls,
+          });
+
+          const resultUrl = await waitForTask(taskId, {
+            abortRef: imageAbortRef.current,
+            onProgress: () => {},
+          });
+
+          if (resultUrl) {
+            generatedUrls.push(resultUrl);
+          } else {
+            generatedUrls.push("");
+          }
+        }
+      }
+
+      setResultFn(generatedUrls);
+      setStatusFn(generatedUrls.some(Boolean) ? "done" : "idle");
+    } catch (err) {
+      if (err instanceof ServerRequestError && err.status === 402) {
+        setResultFn([]);
+      }
+      setStatusFn("idle");
+    }
+  };
+
+  const generateEcommerceImage = async (
+    outputKey: CloneOutputKey,
+    images: CloneImageItem[],
+    userText: string,
+    pPlatform: string,
+    pRatio: string,
+    pLanguage: string,
+    pMarket: string,
+    setStatusFn: (status: "generating" | "done" | "idle") => void,
+    setResultFn: (results: CloneResult[]) => void,
+  ): Promise<void> => {
+    setStatusFn("generating");
+    try {
+      const referenceUrls = await uploadCloneImages(images);
+      if (!referenceUrls.length) {
+        setStatusFn("idle");
+        return;
+      }
+
+      const prompt = buildEcommerceImagePrompt(outputKey, userText, pPlatform, pRatio, pLanguage, pMarket);
+      const stamp = Date.now();
+
+      const { taskId } = await aiGenerationClient.createImageTask({
+        model: IMAGE_MODEL,
+        prompt,
+        ratio: pRatio,
+        quality: pRatio.includes("720") ? "720P" : "1080P",
+        gridMode: "single",
+        referenceUrls,
+      });
+
+      const resultUrl = await waitForTask(taskId, {
+        abortRef: imageAbortRef.current,
+        onProgress: () => {},
+      });
+
+      if (resultUrl) {
+        setResultFn([{ id: `ecommerce-${stamp}`, src: resultUrl, label: selectedCloneOutput.label }]);
+        setStatusFn("done");
+      } else {
+        setStatusFn("idle");
+      }
+    } catch (err) {
+      if (err instanceof ServerRequestError && err.status === 402) {
+        setResultFn([{ id: `ecommerce-error-402`, src: "", label: "余额不足，请充值后继续" }]);
+      }
+      setStatusFn("idle");
+    }
+  };
+
   const adVideoUploadedUrlsRef = useRef<string[]>([]);
 
   const handleAdVideoPlan = async () => {
@@ -1540,32 +1719,46 @@ function ProductClonePage(_props: ProductClonePageProps = {}) {
 
   const handleGenerate = () => {
     if (!canGenerate) return;
-    setStatus("generating");
-    window.setTimeout(() => {
-      const stamp = Date.now();
-      setResults(
-        sampleResults.map((src, index) => ({
-          id: `clone-result-${stamp}-${index}`,
-          src,
-          label: index === 0 ? "高度复刻" : index === 1 ? "参考风格" : "平台适配",
-        })),
+    imageAbortRef.current = { current: false };
+    if (cloneOutput === "set") {
+      void generateSetImages(
+        productImages, cloneSetCounts, requirement,
+        platform, ratio, language, market,
+        (s) => setStatus(s as ProductCloneStatus),
+        (urls) => setProductSetResultImages(urls),
       );
-      setStatus("done");
-    }, 900);
+    } else {
+      void generateEcommerceImage(
+        cloneOutput, productImages, requirement,
+        platform, ratio, language, market,
+        (s) => setStatus(s as ProductCloneStatus), setResults,
+      );
+    }
   };
 
   const handleGenerateModel = () => {
+    imageAbortRef.current = { current: false };
     setTryOnStatus("modeling");
-    window.setTimeout(() => setTryOnStatus("ready"), 700);
+    void generateEcommerceImage(
+      "model", garmentImages, requirement,
+      platform, ratio, language, market,
+      (s) => {
+        if (s === "done") setTryOnStatus("ready");
+        else setTryOnStatus(s as TryOnStatus);
+      },
+      () => { setTryOnStatus("ready"); },
+    );
   };
 
   const handleTryOnGenerate = () => {
     if (!canGenerateTryOn) return;
-    setTryOnStatus("generating");
-    window.setTimeout(() => {
-      setTryOnResultImages([tryOnAssets.tryA, tryOnAssets.tryB, tryOnAssets.hatResultA]);
-      setTryOnStatus("done");
-    }, 900);
+    imageAbortRef.current = { current: false };
+    void generateEcommerceImage(
+      "model", garmentImages, requirement,
+      platform, ratio, language, market,
+      (s) => setTryOnStatus(s as TryOnStatus),
+      (res) => setTryOnResultImages(res.map((r) => r.src).filter(Boolean)),
+    );
   };
 
   const toggleScene = (scene: string) => {
@@ -1582,8 +1775,13 @@ function ProductClonePage(_props: ProductClonePageProps = {}) {
 
   const handleSetGenerate = () => {
     if (!canGenerateSet) return;
-    setProductSetStatus("generating");
-    window.setTimeout(() => setProductSetStatus("done"), 900);
+    imageAbortRef.current = { current: false };
+    void generateSetImages(
+      setImages, cloneSetCounts, productSetRequirement,
+      productSetPlatform, productSetRatio, productSetLanguage, productSetMarket,
+      (s) => setProductSetStatus(s as ProductSetStatus),
+      (urls) => setProductSetResultImages(urls),
+    );
   };
 
   const openProductSetPreview = (card: { src: string; label: string }) => {
@@ -1598,8 +1796,13 @@ function ProductClonePage(_props: ProductClonePageProps = {}) {
 
   const handleDetailGenerate = () => {
     if (!canGenerateDetail) return;
-    setDetailStatus("generating");
-    window.setTimeout(() => setDetailStatus("done"), 900);
+    imageAbortRef.current = { current: false };
+    void generateEcommerceImage(
+      "detail", detailProductImages, detailRequirement,
+      detailPlatform, getPlatformDefaultRatio(detailPlatform), detailLanguage, detailMarket,
+      (s) => setDetailStatus(s as DetailStatus),
+      (res) => setDetailResultUrl(res[0]?.src ?? null),
+    );
   };
 
   const resetTask = () => {
@@ -1667,10 +1870,35 @@ function ProductClonePage(_props: ProductClonePageProps = {}) {
     detailProductImages.length === 0 ? "请上传产品图" : detailStatus === "generating" ? "生成中..." : "生成A+详情页";
   const clonePrimaryLabel =
     productImages.length === 0 ? "请先上传商品原图" : status === "generating" ? "生成中..." : `生成${selectedCloneOutput.label}`;
-  const clonePreviewCards = productSetPreviewCards.map((card, index) => ({
-    ...card,
-    src: results[index]?.src ?? card.src,
-  }));
+  const setPreviewCards: CloneResult[] = [];
+  let setIndex = 0;
+  for (const countKey of cloneSetCountOptions.map((o) => o.key)) {
+    const count = cloneSetCounts[countKey];
+    const info = setCountLabels[countKey];
+    for (let i = 0; i < count; i++) {
+      setPreviewCards.push({
+        id: `${countKey}-${i}`,
+        src: productSetResultImages[setIndex] ?? productSetPreviewCards[setIndex % productSetPreviewCards.length]?.src ?? "",
+        label: `${info.label}${count > 1 ? ` ${i + 1}` : ""}`,
+      });
+      setIndex++;
+    }
+  }
+
+  const clonePreviewCards: CloneResult[] = [];
+  let cloneIndex = 0;
+  for (const countKey of cloneSetCountOptions.map((o) => o.key)) {
+    const count = cloneSetCounts[countKey];
+    const info = setCountLabels[countKey];
+    for (let i = 0; i < count; i++) {
+      clonePreviewCards.push({
+        id: `${countKey}-${i}`,
+        src: results[cloneIndex]?.src ?? productSetPreviewCards[cloneIndex % productSetPreviewCards.length]?.src ?? "",
+        label: `${info.label}${count > 1 ? ` ${i + 1}` : ""}`,
+      });
+      cloneIndex++;
+    }
+  }
   const cloneBasicSelects: Array<{
     key: CloneBasicSelectKey;
     label: string;
@@ -2589,14 +2817,14 @@ function ProductClonePage(_props: ProductClonePageProps = {}) {
           <button
             type="button"
             className="product-set-main-card"
-            onClick={() => openProductSetPreview(productSetPreviewCards[0])}
+            onClick={() => openProductSetPreview(setPreviewCards[0] ?? productSetPreviewCards[0])}
           >
-            <img src={productSetPreviewCards[0].src} alt="01 主图" />
-            <span>{productSetPreviewCards[0].label}</span>
+            <img src={setImages[0]?.src ?? (setPreviewCards[0]?.src ?? productSetPreviewCards[0].src)} alt="商品原图" />
+            <span>原图素材</span>
           </button>
           <div className="product-set-flow-arrow" aria-hidden="true" />
           <div className="product-set-card-grid result-reveal">
-            {productSetPreviewCards.slice(1).map((card) => (
+            {setPreviewCards.map((card) => (
               <button key={card.id} type="button" onClick={() => openProductSetPreview(card)}>
                 <img src={card.src} alt={card.label} />
                 <span>{card.label}</span>
@@ -2649,18 +2877,25 @@ function ProductClonePage(_props: ProductClonePageProps = {}) {
 
       {status === "done" ? (
         <section className="clone-ai-preview-showcase" aria-label="生成结果">
-          <button type="button" className="clone-ai-main-result" onClick={() => openProductSetPreview(clonePreviewCards[0])}>
-            <img src={productImages[0]?.src ?? clonePreviewCards[0].src} alt="上传商品原图" />
+          <button type="button" className="clone-ai-main-result" onClick={() => openProductSetPreview(cloneOutput === "set" ? clonePreviewCards[0] : results[0])}>
+            <img src={productImages[0]?.src ?? (cloneOutput === "set" ? clonePreviewCards[0].src : results[0]?.src ?? "")} alt="上传商品原图" />
             <span>原图素材</span>
           </button>
           <div className="clone-ai-flow-arrow" aria-hidden="true" />
           <div className="clone-ai-result-grid result-reveal">
-            {clonePreviewCards.map((card) => (
-              <button key={card.id} type="button" onClick={() => openProductSetPreview(card)}>
-                <img src={card.src} alt={card.label} />
-                <span>{card.label}</span>
+            {cloneOutput === "set" ? (
+              clonePreviewCards.map((card) => (
+                <button key={card.id} type="button" onClick={() => openProductSetPreview(card)}>
+                  <img src={card.src} alt={card.label} />
+                  <span>{card.label}</span>
+                </button>
+              ))
+            ) : results[0]?.src ? (
+              <button type="button" onClick={() => openProductSetPreview(results[0])}>
+                <img src={results[0].src} alt={selectedCloneOutput.label} />
+                <span>{selectedCloneOutput.label}</span>
               </button>
-            ))}
+            ) : null}
           </div>
         </section>
       ) : (
@@ -2726,7 +2961,7 @@ function ProductClonePage(_props: ProductClonePageProps = {}) {
         </div>
         <div className="product-detail-flow-arrow" aria-hidden="true" />
         <div className="product-detail-long-result">
-          <img src={detailAssets.longPage} alt="生成电商长图" />
+          <img src={detailResultUrl ?? detailAssets.longPage} alt="生成电商长图" />
           <span>{detailStatus === "done" ? "已生成电商长图" : "生成电商长图"}</span>
         </div>
         <div className="product-detail-grid-result">
@@ -2851,7 +3086,7 @@ function ProductClonePage(_props: ProductClonePageProps = {}) {
               aspectRatio={ratio.includes("9：16") || ratio.includes("9:16") ? "9:16" : ratio.includes("16：9") || ratio.includes("16:9") ? "16:9" : ratio.includes("3：4") || ratio.includes("3:4") ? "3:4" : "9:16"}
               durationSeconds={cloneVideoDuration}
               resolution={cloneVideoQuality === "standard" ? "720P" : "1080P"}
-              onRequestLogin={() => ((_props as Record<string, (() => void) | undefined>).onRequireLogin?.())}
+              onRequestLogin={() => ((_props as Record<string, unknown>).isAuthenticated ? undefined : (window.location.hash = "#/login"))}
             />
           </main>
         ) : clonePreview) : placeholderPreview}

src/features/ecommerce/EcommerceVideoWorkspace.tsx

@@ -1,4 +1,4 @@
-import { Fragment, useCallback, useRef, useState } from "react";
+import { Fragment, useCallback, useEffect, useRef, useState } from "react";
 import {
   CopyOutlined,
   DownloadOutlined,
@@ -9,17 +9,24 @@ import {
   SendOutlined,
   StopOutlined,
 } from "@ant-design/icons";
-import { runVideoPlan, renderScene, buildSceneTasks } from "./ecommerceVideoService";
+import { runVideoPlan, renderSceneImage, renderScene, buildSceneTasks } from "./ecommerceVideoService";
 import {
   PLAN_STEP_LABELS,
+  PLAN_STEPS_DISPLAY,
   type EcommerceVideoStage,
   type EcommerceVideoSceneTask,
   type EcommerceVideoPlanResult,
   type PlanStep,
 } from "./ecommerceVideoTypes";
 import type { AdVideoUserConfig } from "../../api/adVideoPlanClient";
+import { ServerRequestError } from "../../api/serverConnection";
 import { saveToolResultToLocal, addToolResultToAssetLibrary } from "../workbench/toolResultActions";
 import { useAppStore } from "../../stores";
+import {
+  saveEcommerceVideoState,
+  loadEcommerceVideoState,
+  clearEcommerceVideoState,
+} from "./ecommerceVideoKeepalive";
 
 interface EcommerceVideoWorkspaceProps {
   isAuthenticated: boolean;
@@ -55,12 +62,120 @@ export default function EcommerceVideoWorkspace({
   const [planResult, setPlanResult] = useState<EcommerceVideoPlanResult | null>(null);
   const [scenes, setScenes] = useState<EcommerceVideoSceneTask[]>([]);
   const [completedSteps, setCompletedSteps] = useState<PlanStep[]>([]);
+  const [sourceImageUrls, setSourceImageUrls] = useState<string[]>([]);
   const [currentStep, setCurrentStep] = useState<PlanStep | null>(null);
   const [error, setError] = useState<string | null>(null);
   const [actionNotice, setActionNotice] = useState<string | null>(null);
   const abortControllerRef = useRef<AbortController | null>(null);
   const renderAbortRef = useRef({ current: false });
   const setView = useAppStore((s) => s.setView);
+  const keepaliveRestoredRef = useRef(false);
+  const keepalivePollingStartedRef = useRef(false);
+
+  // ── Keep-alive: restore saved state on mount ─────────────
+  useEffect(() => {
+    if (keepaliveRestoredRef.current) return;
+    keepaliveRestoredRef.current = true;
+    const saved = loadEcommerceVideoState();
+    if (!saved) return;
+    if (saved.stage === "idle" || saved.stage === "cancelled") return;
+    // Restore completed / in-progress states — results persist across page switches
+    setStage(saved.stage);
+    setCompletedSteps(saved.completedSteps || []);
+    setPlanResult(saved.planResult);
+    setScenes(saved.scenes || []);
+    setSourceImageUrls(saved.sourceImageUrls || saved.planResult?.imageUrls || []);
+  }, []);
+
+  // ── Keep-alive: save state on changes ───────────────────
+  useEffect(() => {
+    if (stage === "idle" || stage === "cancelled") return;
+    saveEcommerceVideoState({ stage, completedSteps, planResult, scenes, sourceImageUrls });
+  }, [stage, completedSteps, planResult, scenes, sourceImageUrls]);
+
+  // ── Keep-alive: resume polling for running tasks ──────────
+  useEffect(() => {
+    if (keepalivePollingStartedRef.current) return;
+    if (!scenes.length || stage === "idle" || stage === "cancelled" || stage === "completed") return;
+
+    const hasRunningScenes = scenes.some((s) => s.status === "running" || s.status === "pending");
+    if (!hasRunningScenes) return;
+    keepalivePollingStartedRef.current = true;
+
+    // Resume polling for image generation tasks
+    if (stage === "imaging") {
+      renderAbortRef.current = { current: false };
+      void (async () => {
+        for (const scene of scenes) {
+          if (renderAbortRef.current.current) break;
+          if (scene.status !== "running" && scene.status !== "pending") continue;
+          if (!scene.imageTaskId) continue;
+          try {
+            const { waitForTask } = await import("../../api/taskSubscription");
+            const resultUrl = await waitForTask(scene.imageTaskId, {
+              abortRef: renderAbortRef.current,
+              onProgress: (e) =>
+                setScenes((prev) => prev.map((s) => (s.sceneId === scene.sceneId ? { ...s, progress: e.progress } : s))),
+            });
+            if (resultUrl) {
+              setScenes((prev) =>
+                prev.map((s) => (s.sceneId === scene.sceneId ? { ...s, status: "idle", progress: 100, imageUrl: resultUrl } : s)),
+              );
+            }
+          } catch {
+            setScenes((prev) =>
+              prev.map((s) => (s.sceneId === scene.sceneId ? { ...s, status: "idle", error: "恢复任务失败" } : s)),
+            );
+          }
+        }
+        setScenes((current) => {
+          const allImaged = current.every((s) => s.imageUrl);
+          if (allImaged) setStage("imaged");
+          return current;
+        });
+      })();
+    }
+
+    // Resume polling for video rendering tasks
+    if (stage === "rendering") {
+      renderAbortRef.current = { current: false };
+      void (async () => {
+        for (const scene of scenes) {
+          if (renderAbortRef.current.current) break;
+          if (scene.status !== "running" && scene.status !== "pending") continue;
+          if (!scene.taskId) continue;
+          try {
+            const { waitForTask } = await import("../../api/taskSubscription");
+            const resultUrl = await waitForTask(scene.taskId, {
+              abortRef: renderAbortRef.current,
+              onProgress: (e) =>
+                setScenes((prev) => prev.map((s) => (s.sceneId === scene.sceneId ? { ...s, progress: e.progress } : s))),
+            });
+            if (resultUrl) {
+              setScenes((prev) =>
+                prev.map((s) =>
+                  s.sceneId === scene.sceneId ? { ...s, status: "completed", progress: 100, resultUrl: resultUrl } : s,
+                ),
+              );
+            }
+          } catch {
+            setScenes((prev) =>
+              prev.map((s) => (s.sceneId === scene.sceneId ? { ...s, status: "failed", error: "恢复任务失败" } : s)),
+            );
+          }
+        }
+        setScenes((current) => {
+          const hasFailed = current.some((s) => s.status === "failed");
+          const allDone = current.every((s) => s.status === "completed" || s.status === "failed");
+          if (allDone) setStage(hasFailed ? "partial_failed" : "completed");
+          return current;
+        });
+      })();
+    }
+  }, [scenes, stage]);
+
+  // Note: keep-alive is NOT cleared on completion — results persist across page switches.
+  // Only cleared when user explicitly starts a new plan via handlePlan.
 
   const showNotice = (msg: string) => {
     setActionNotice(msg);
@@ -70,159 +185,229 @@ export default function EcommerceVideoWorkspace({
   const handleDownload = async (url: string) => {
     try {
       await saveToolResultToLocal({
-        url,
-        name: `ecommerce-video-${Date.now()}`,
-        type: "video",
-        isVideo: true,
-        tags: ["电商", "短视频", "生成视频"],
+        url, name: `ecommerce-video-${Date.now()}`, type: "video",
+        isVideo: true, tags: ["电商", "短视频", "生成视频"],
       });
       showNotice("下载完成");
     } catch {
-      const a = document.createElement("a");
-      a.href = url;
-      a.download = "ecommerce-video.mp4";
-      a.click();
+      const a = document.createElement("a"); a.href = url; a.download = "ecommerce-video.mp4"; a.click();
     }
   };
 
   const handleSaveAsset = async (url: string) => {
     try {
       const result = await addToolResultToAssetLibrary({
-        url,
-        name: `电商短视频-${Date.now()}.mp4`,
-        description: "电商广告视频生成结果",
-        type: "video",
-        isVideo: true,
-        tags: ["电商", "短视频", "广告视频"],
+        url, name: `电商短视频-${Date.now()}.mp4`, description: "电商广告视频生成结果",
+        type: "video", isVideo: true, tags: ["电商", "短视频", "广告视频"],
         metadata: { source: "ecommerce-video", platform },
       });
       showNotice(result === "server" ? "已保存到资产库" : "已保存到本地资产库");
-    } catch {
-      showNotice("保存失败");
+    } catch { showNotice("保存失败"); }
+  };
+
+  const handleSaveAllAssets = async () => {
+    if (!completedScenes.length) return;
+    let saved = 0;
+    for (const scene of completedScenes) {
+      try {
+        await addToolResultToAssetLibrary({
+          url: scene.resultUrl!, name: `电商短视频-镜头${scene.sceneId}-${Date.now()}.mp4`,
+          description: `电商广告视频 - 镜头${scene.sceneId}`,
+          type: "video", isVideo: true, tags: ["电商", "短视频", "广告视频"],
+          metadata: { source: "ecommerce-video", platform, sceneId: scene.sceneId },
+        });
+        saved++;
+      } catch { /* continue */ }
     }
+    showNotice(saved > 0 ? `已保存 ${saved}/${completedScenes.length} 个视频到资产库` : "保存失败");
+  };
+
+  const handleDownloadAll = async () => {
+    for (const scene of completedScenes) {
+      await new Promise((r) => setTimeout(r, 300));
+      const a = document.createElement("a");
+      a.href = scene.resultUrl!;
+      a.download = `ecommerce-video-scene-${scene.sceneId}.mp4`;
+      a.click();
+    }
+    showNotice(`正在下载 ${completedScenes.length} 个视频`);
   };
 
   const handleImportToCanvas = async (url: string) => {
     try {
       await addToolResultToAssetLibrary({
-        url,
-        name: `电商短视频-${Date.now()}.mp4`,
-        description: "电商广告视频 - 导入画布",
-        type: "video",
-        isVideo: true,
-        tags: ["电商", "短视频", "画布导入"],
+        url, name: `电商短视频-${Date.now()}.mp4`, description: "电商广告视频 - 导入画布",
+        type: "video", isVideo: true, tags: ["电商", "短视频", "画布导入"],
         metadata: { source: "ecommerce-video", platform },
       });
       setView("canvas");
       showNotice("已保存资产并跳转画布");
-    } catch {
-      showNotice("导入失败");
-    }
+    } catch { showNotice("导入失败"); }
   };
 
   const buildConfig = useCallback((): AdVideoUserConfig => ({
-    platform,
-    aspectRatio,
-    durationSeconds,
-    style: "痛点解决",
-    language: "中文",
-    market: "中国",
-    needVoiceover: true,
-    needSubtitle: true,
-    conversionFocus: "conversion",
+    platform, aspectRatio, durationSeconds,
+    style: "痛点解决", language: "中文", market: "中国",
+    needVoiceover: true, needSubtitle: true, conversionFocus: "conversion",
   }), [platform, aspectRatio, durationSeconds]);
 
+  // ── Phase 1: Planning ──────────────────────────────────────
+
   const handlePlan = async () => {
     if (!isAuthenticated) { onRequestLogin?.(); return; }
     if (!productImageDataUrls.length && !requirement.trim()) {
-      setError("请先上传产品图片或填写商品说明");
-      return;
+      setError("请先上传产品图片或填写商品说明"); return;
     }
     abortControllerRef.current?.abort();
     const controller = new AbortController();
     abortControllerRef.current = controller;
-    setStage("planning");
-    setError(null);
-    setCompletedSteps([]);
-    setCurrentStep(null);
-    setPlanResult(null);
-    setScenes([]);
+    setStage("planning"); setError(null);
+    setCompletedSteps([]); setCurrentStep(null);
+    setPlanResult(null); setScenes([]); setSourceImageUrls([]);
     try {
       const result = await runVideoPlan(
         productImageDataUrls, requirement, buildConfig(),
         {
           onStepStart: (step) => setCurrentStep(step),
           onStepDone: (step) => setCompletedSteps((prev) => [...prev, step]),
+          onImagesUploaded: (urls) => { setSourceImageUrls(urls); saveEcommerceVideoState({ stage: "planning", completedSteps: ["upload"], planResult: null, scenes: [], sourceImageUrls: urls }); },
           signal: controller.signal,
         },
       );
+      const builtScenes = buildSceneTasks(result);
       setPlanResult(result);
-      setScenes(buildSceneTasks(result));
+      setScenes(builtScenes);
       setStage("planned");
+      // Persist immediately — component may be unmounted by the time React re-renders
+      saveEcommerceVideoState({ stage: "planned", completedSteps: [...ALL_STEPS], planResult: result, scenes: builtScenes, sourceImageUrls: result.imageUrls });
     } catch (err) {
       if ((err as Error).name === "AbortError") return;
       setError(err instanceof Error ? err.message : "策划失败");
       setStage("idle");
-    } finally {
-      setCurrentStep(null);
-    }
+    } finally { setCurrentStep(null); }
   };
 
-  const handleRender = async () => {
-    if (!planResult || !scenes.length) return;
-    const imageUrl = productImageDataUrls[0] || "";
-    setStage("rendering");
-    setError(null);
-    renderAbortRef.current = { current: false };
-    const quality = mapResolutionToQuality(resolution);
+  // ── Phase 2: Image generation per scene ──────────────────────
 
-    for (const scene of scenes) {
+  const handleGenerateImages = async () => {
+    if (!planResult || !scenes.length) return;
+    setStage("imaging"); setError(null);
+    renderAbortRef.current = { current: false };
+    const ratio = aspectRatio.includes("9:16") || aspectRatio.includes("9：16") ? "9:16"
+      : aspectRatio.includes("16:9") || aspectRatio.includes("16：9") ? "16:9"
+      : "1:1";
+    let currentScenes = [...scenes];
+    const persistScenes = (next: EcommerceVideoSceneTask[]) => {
+      currentScenes = next;
+      setScenes(next);
+      saveEcommerceVideoState({ stage: "imaging", completedSteps, planResult, scenes: next, sourceImageUrls });
+    };
+    for (const scene of currentScenes) {
       if (renderAbortRef.current.current) break;
-      setScenes((prev) => prev.map((s) =>
-        s.sceneId === scene.sceneId ? { ...s, status: "pending" } : s));
+      persistScenes(currentScenes.map((s) => s.sceneId === scene.sceneId ? { ...s, status: "pending" } : s));
       try {
-        await renderScene(
-          { sceneId: scene.sceneId, prompt: scene.prompt, durationSeconds: scene.durationSeconds, imageUrl, aspectRatio, resolution: quality },
+        await renderSceneImage(
+          { sceneId: scene.sceneId, prompt: scene.prompt, aspectRatio: ratio },
           {
-            onSceneSubmitted: (id, taskId) => setScenes((prev) => prev.map((s) => s.sceneId === id ? { ...s, taskId, status: "running" } : s)),
-            onSceneProgress: (id, progress) => setScenes((prev) => prev.map((s) => s.sceneId === id ? { ...s, progress } : s)),
-            onSceneCompleted: (id, url) => setScenes((prev) => prev.map((s) => s.sceneId === id ? { ...s, status: "completed", progress: 100, resultUrl: url } : s)),
-            onSceneFailed: (id, err2) => setScenes((prev) => prev.map((s) => s.sceneId === id ? { ...s, status: "failed", error: err2 } : s)),
+            onSceneImageSubmitted: (id, taskId) => persistScenes(currentScenes.map((s) => s.sceneId === id ? { ...s, imageTaskId: taskId, status: "running" } : s)),
+            onSceneImageProgress: (id, progress) => persistScenes(currentScenes.map((s) => s.sceneId === id ? { ...s, progress } : s)),
+            onSceneImageCompleted: (id, url) => persistScenes(currentScenes.map((s) => s.sceneId === id ? { ...s, status: "idle", progress: 100, imageUrl: url } : s)),
+            onSceneImageFailed: (id, err2) => persistScenes(currentScenes.map((s) => s.sceneId === id ? { ...s, status: "idle", error: err2 } : s)),
           },
           renderAbortRef.current,
         );
       } catch (err) {
-        setScenes((prev) => prev.map((s) =>
-          s.sceneId === scene.sceneId ? { ...s, status: "failed", error: err instanceof Error ? err.message : "生成失败" } : s));
+        const message = err instanceof Error ? err.message : "图片生成失败";
+        persistScenes(currentScenes.map((s) => s.sceneId === scene.sceneId ? { ...s, status: "idle", error: message } : s));
       }
     }
-    setScenes((current) => {
-      const hasFailed = current.some((s) => s.status === "failed");
-      const allDone = current.every((s) => s.status === "completed" || s.status === "failed");
-      if (allDone) setStage(hasFailed ? "partial_failed" : "completed");
-      return current;
-    });
+    const allHaveImages = currentScenes.every((s) => s.imageUrl);
+    const finalStage = allHaveImages ? "imaged" as const : "partial_failed" as const;
+    setStage(finalStage);
+    saveEcommerceVideoState({ stage: finalStage, completedSteps, planResult, scenes: currentScenes, sourceImageUrls });
   };
 
-  const handleCancel = () => {
-    abortControllerRef.current?.abort();
-    renderAbortRef.current.current = true;
-    setStage("cancelled");
+  // ── Phase 3: Video rendering from generated images ──────────
+
+  const handleRenderVideos = async () => {
+    if (!scenes.length) return;
+    const firstImage = scenes[0]?.imageUrl;
+    if (!firstImage) { setError("请先生成分镜图片"); return; }
+    setStage("rendering"); setError(null);
+    renderAbortRef.current = { current: false };
+    const quality = mapResolutionToQuality(resolution);
+    let currentScenes = [...scenes];
+    const persistScenes = (next: EcommerceVideoSceneTask[]) => {
+      currentScenes = next;
+      setScenes(next);
+      saveEcommerceVideoState({ stage: "rendering", completedSteps, planResult, scenes: next, sourceImageUrls });
+    };
+    for (const scene of currentScenes) {
+      if (renderAbortRef.current.current) break;
+      if (!scene.imageUrl) continue;
+      persistScenes(currentScenes.map((s) => s.sceneId === scene.sceneId ? { ...s, status: "pending" } : s));
+      try {
+        await renderScene(
+          { sceneId: scene.sceneId, prompt: scene.prompt, durationSeconds: scene.durationSeconds, imageUrl: scene.imageUrl, aspectRatio, resolution: quality },
+          {
+            onSceneSubmitted: (id, taskId) => persistScenes(currentScenes.map((s) => s.sceneId === id ? { ...s, taskId, status: "running" } : s)),
+            onSceneProgress: (id, progress) => persistScenes(currentScenes.map((s) => s.sceneId === id ? { ...s, progress } : s)),
+            onSceneCompleted: (id, url) => persistScenes(currentScenes.map((s) => s.sceneId === id ? { ...s, status: "completed", progress: 100, resultUrl: url } : s)),
+            onSceneFailed: (id, err2) => persistScenes(currentScenes.map((s) => s.sceneId === id ? { ...s, status: "failed", error: err2 } : s)),
+          },
+          renderAbortRef.current,
+        );
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : "生成失败";
+        const isPayment = err instanceof ServerRequestError && err.status === 402;
+        persistScenes(currentScenes.map((s) => s.sceneId === scene.sceneId ? { ...s, status: "failed", error: isPayment ? "余额不足，请充值后继续" : msg } : s));
+        if (isPayment) { setError("余额不足，请充值后再生成视频"); renderAbortRef.current.current = true; break; }
+      }
+    }
+    const hasFailed = currentScenes.some((s) => s.status === "failed");
+    const allDone = currentScenes.every((s) => s.status === "completed" || s.status === "failed");
+    const finalStage = allDone ? (hasFailed ? "partial_failed" as const : "completed" as const) : "rendering" as const;
+    setScenes(currentScenes);
+    setStage(finalStage);
+    saveEcommerceVideoState({ stage: finalStage, completedSteps, planResult, scenes: currentScenes, sourceImageUrls });
   };
 
+  const handleCancel = () => { abortControllerRef.current?.abort(); renderAbortRef.current.current = true; setStage("cancelled"); };
+
+  const handleRetryScene = async (scene: EcommerceVideoSceneTask) => {
+    if (!scene.imageUrl) return;
+    setScenes((prev) => prev.map((s) => s.sceneId === scene.sceneId ? { ...s, status: "pending", error: undefined } : s));
+    try {
+      await renderScene(
+        { sceneId: scene.sceneId, prompt: scene.prompt, durationSeconds: scene.durationSeconds, imageUrl: scene.imageUrl!, aspectRatio, resolution: mapResolutionToQuality(resolution) },
+        {
+          onSceneSubmitted: (id, taskId) => setScenes((prev) => prev.map((s) => s.sceneId === id ? { ...s, taskId, status: "running" } : s)),
+          onSceneProgress: (id, progress) => setScenes((prev) => prev.map((s) => s.sceneId === id ? { ...s, progress } : s)),
+          onSceneCompleted: (id, url) => setScenes((prev) => prev.map((s) => s.sceneId === id ? { ...s, status: "completed", progress: 100, resultUrl: url } : s)),
+          onSceneFailed: (id, err2) => setScenes((prev) => prev.map((s) => s.sceneId === id ? { ...s, status: "failed", error: err2 } : s)),
+        },
+        renderAbortRef.current,
+      );
+    } catch (err) {
+      setScenes((prev) => prev.map((s) => s.sceneId === scene.sceneId ? { ...s, status: "failed", error: (err as Error).message } : s));
+    }
+  };
+
+  // ── Derived state ───────────────────────────────────────────
+
   const completedScenes = scenes.filter((s) => s.status === "completed" && s.resultUrl);
+  const imagedScenes = scenes.filter((s) => s.imageUrl);
   const primaryVideo = completedScenes[0]?.resultUrl;
-  const canRender = planResult?.compliance.allow_video_generation && stage === "planned";
-  const sourceImage = productImageDataUrls[0] || "";
-  const flowHasStarted = stage !== "idle" || completedSteps.length > 0 || scenes.length > 0;
+  const sourceImage = sourceImageUrls[0] || planResult?.imageUrls[0] || productImageDataUrls[0] || "";
+  const flowHasStarted = stage !== "idle" || completedSteps.length > 0;
   const flowMeta = `${platform} / ${aspectRatio} / ${durationSeconds}s / ${resolution}`;
-  const planActionLabel = stage === "planning"
-    ? "策划中"
-    : (stage === "planned" || stage === "completed" || stage === "partial_failed") ? "重新策划" : "一键策划";
-  const renderActionLabel = stage === "rendering" ? "生成中" : "确认生成";
+  const hasImaging = stage === "imaging" || stage === "imaged" || stage === "rendering" || stage === "completed" || stage === "partial_failed";
+  const hasRendering = stage === "rendering" || stage === "completed" || stage === "partial_failed";
+  const visiblePlanSteps = PLAN_STEPS_DISPLAY.filter((s) => completedSteps.includes(s));
 
   return (
     <div className="ecom-video-workspace" data-stage={stage}>
+      {/* ── Flow bar ──────────────────────────────────── */}
       <header className="ecom-video-flowbar">
         <div className="ecom-video-flowbar__title" aria-label={`短视频分镜流，${flowMeta}`} title={flowMeta}>
           <span className={`ecom-video-flowbar__pulse${flowHasStarted ? " is-active" : ""}`} aria-hidden="true" />
@@ -233,111 +418,178 @@ export default function EcommerceVideoWorkspace({
           {ALL_STEPS.map((step) => {
             const isDone = completedSteps.includes(step);
             const isActive = currentStep === step;
-            const cls = isDone ? "is-done" : isActive ? "is-active" : "";
-            return (
-              <span
-                key={step}
-                className={`ecom-video-step-dot ${cls}`}
-                title={PLAN_STEP_LABELS[step]}
-                aria-label={PLAN_STEP_LABELS[step]}
-              />
-            );
+            return <span key={step} className={`ecom-video-step-dot ${isDone ? "is-done" : isActive ? "is-active" : ""}`} title={PLAN_STEP_LABELS[step]} />;
           })}
         </div>
 
         <div className="ecom-video-flowbar__actions">
           {error ? <span className="ecom-video-flowbar__error" role="alert">{error}</span> : null}
-          <button
-            type="button"
-            className="ecom-video-flow-action"
-            disabled={stage === "planning" || stage === "rendering"}
-            onClick={() => void handlePlan()}
-            aria-label={planActionLabel}
-            title={planActionLabel}
-          >
-            {stage === "planning" ? <LoadingOutlined /> : (stage === "planned" || stage === "completed" || stage === "partial_failed") ? <ReloadOutlined /> : <PlayCircleOutlined />}
-          </button>
-          {(stage === "rendering" || stage === "planned") ? (
-            <button
-              type="button"
-              className="ecom-video-flow-action ecom-video-flow-action--ghost"
-              disabled={!canRender}
-              onClick={() => void handleRender()}
-              aria-label={renderActionLabel}
-              title={renderActionLabel}
-            >
-              {stage === "rendering" ? <LoadingOutlined /> : <SendOutlined />}
+          {stage !== "planning" && stage !== "imaging" && stage !== "rendering" ? (
+            <button type="button" className="ecom-video-flow-action"
+              onClick={() => void handlePlan()} title="一键策划">
+              <PlayCircleOutlined />
             </button>
           ) : null}
+          {stage === "planned" ? (
+            <button type="button" className="ecom-video-flow-action ecom-video-flow-action--ghost"
+              onClick={() => void handleGenerateImages()} title="生成图片">
+              <SendOutlined />
+            </button>
+          ) : null}
+          {stage === "imaged" ? (
+            <button type="button" className="ecom-video-flow-action ecom-video-flow-action--ghost"
+              onClick={() => void handleRenderVideos()} title="生成视频">
+              <SendOutlined />
+            </button>
+          ) : null}
+          {stage === "planning" ? (
+            <span className="ecom-video-flowbar__stage-label"><LoadingOutlined /> 策划中</span>
+          ) : null}
+          {stage === "imaging" ? (
+            <span className="ecom-video-flowbar__stage-label"><LoadingOutlined /> 生成图片中</span>
+          ) : null}
           {stage === "rendering" ? (
-            <button type="button" className="ecom-video-flow-action ecom-video-flow-action--danger" onClick={handleCancel} aria-label="取消生成" title="取消生成">
+            <span className="ecom-video-flowbar__stage-label"><LoadingOutlined /> 生成视频中</span>
+          ) : null}
+          {stage === "planning" || stage === "imaging" || stage === "rendering" ? (
+            <button type="button" className="ecom-video-flow-action ecom-video-flow-action--danger" onClick={handleCancel} title="终止">
               <StopOutlined />
             </button>
           ) : null}
         </div>
       </header>
 
+      {/* ── Flow canvas ──────────────────────────────────── */}
       <section className="ecom-video-flow-canvas" aria-label="视频分镜流程图">
-        {completedScenes.length === 0 && !sourceImage ? (
-          <div style={{ display: "flex", alignItems: "center", justifyContent: "center", height: "100%", color: "#697486", fontSize: 13 }}>
+        {!sourceImage ? (
+          <div className="ecom-video-empty">
             <span>上传商品图并点击"一键策划"开始</span>
           </div>
         ) : (
           <div className="ecom-video-flow-map">
-            {sourceImage ? (
-              <article className="ecom-video-flow-node ecom-video-flow-node--source is-ready" aria-label="商品图节点">
-                <div className="ecom-video-flow-node__media">
-                  <img src={sourceImage} alt="商品图" />
-                </div>
-                <span className="ecom-video-flow-node__status-orb" aria-hidden="true" />
-              </article>
-            ) : null}
+            {/* Source image node */}
+            <article className="ecom-video-flow-node ecom-video-flow-node--source is-ready" aria-label="商品图节点">
+              <div className="ecom-video-flow-node__media">
+                <img src={sourceImage} alt="商品图" />
+              </div>
+              <span className="ecom-video-flow-node__label">商品原图</span>
+              <span className="ecom-video-flow-node__status-orb" aria-hidden="true" />
+            </article>
 
-            {sourceImage && completedScenes.length > 0 ? (
+            {/* Connector: source → plan text nodes */}
+            {visiblePlanSteps.length > 0 ? (
               <div className="ecom-video-flow-connector is-active" aria-hidden="true"><i /></div>
             ) : null}
 
-            <div className="ecom-video-scene-strip" aria-label="已完成分镜节点">
-              {completedScenes.map((scene, index) => (
-                <Fragment key={scene.sceneId}>
-                  <article
-                    className="ecom-video-flow-node ecom-video-flow-node--scene is-completed"
-                    aria-label={`镜头 ${scene.sceneId}，完成`}
-                    title={`镜头 ${scene.sceneId}`}
-                  >
-                    <div className="ecom-video-flow-node__media">
-                      <video src={scene.resultUrl!} muted playsInline loop autoPlay />
-                    </div>
-                    <span className="ecom-video-flow-node__status-orb" aria-hidden="true" />
-                  </article>
-                  {index < completedScenes.length - 1 ? (
-                    <div className="ecom-video-scene-link is-active" aria-hidden="true"><i /></div>
-                  ) : null}
-                </Fragment>
-              ))}
-            </div>
+            {/* Plan text nodes — side by side */}
+            {visiblePlanSteps.length > 0 ? (
+              <div className="ecom-video-scene-strip ecom-video-scene-strip--text" aria-label="策划节点">
+                {visiblePlanSteps.map((step, idx) => (
+                  <Fragment key={step}>
+                    <article className={`ecom-video-flow-node ecom-video-flow-node--text is-completed${currentStep === step ? " is-pulsing" : ""}`}
+                      aria-label={PLAN_STEP_LABELS[step]} title={PLAN_STEP_LABELS[step]}>
+                      <span className="ecom-video-flow-node__text-icon">
+                        {currentStep === step ? <LoadingOutlined /> : "✓"}
+                      </span>
+                      <span className="ecom-video-flow-node__label">{PLAN_STEP_LABELS[step]}</span>
+                    </article>
+                    {idx < visiblePlanSteps.length - 1 ? (
+                      <div className="ecom-video-scene-link is-active" aria-hidden="true"><i /></div>
+                    ) : null}
+                  </Fragment>
+                ))}
+              </div>
+            ) : null}
 
-            {completedScenes.length > 0 && primaryVideo ? (
+            {/* Connector: plan → images */}
+            {hasImaging ? (
               <div className="ecom-video-flow-connector is-active" aria-hidden="true"><i /></div>
             ) : null}
 
-            {primaryVideo ? (
-              <article className="ecom-video-flow-node ecom-video-flow-node--final is-completed" aria-label="成片节点，已完成">
-                <div className="ecom-video-flow-node__media">
-                  <video src={primaryVideo} muted playsInline loop autoPlay />
-                </div>
-                <span className="ecom-video-flow-node__status-orb" aria-hidden="true" />
-              </article>
+            {/* Storyboard image nodes — side by side per scene */}
+            {hasImaging ? (
+              <div className="ecom-video-scene-strip" aria-label="分镜图片节点">
+                {scenes.map((scene, idx) => {
+                  const imgReady = !!scene.imageUrl;
+                  const imgRunning = stage === "imaging" && (scene.status === "running" || scene.status === "pending") && !scene.imageUrl;
+                  const cls = imgReady ? "is-completed" : imgRunning ? "is-active" : "";
+                  return (
+                    <Fragment key={`img-${scene.sceneId}`}>
+                      <article className={`ecom-video-flow-node ecom-video-flow-node--image ${cls}`}
+                        aria-label={`分镜 ${scene.sceneId}`} title={`分镜 ${scene.sceneId}`}>
+                        <div className="ecom-video-flow-node__media">
+                          {imgReady ? <img src={scene.imageUrl!} alt={`分镜${scene.sceneId}`} />
+                            : imgRunning ? <div className="ecom-video-flow-node__placeholder"><LoadingOutlined /></div>
+                            : <div className="ecom-video-flow-node__placeholder">待生成</div>}
+                        </div>
+                        {imgRunning ? <span className="ecom-video-flow-node__progress">{scene.progress || 0}%</span> : null}
+                        <span className="ecom-video-flow-node__label">分镜{scene.sceneId}</span>
+                        <span className="ecom-video-flow-node__status-orb" aria-hidden="true" />
+                      </article>
+                      {idx < scenes.length - 1 ? (
+                        <div className="ecom-video-scene-link is-active" aria-hidden="true"><i /></div>
+                      ) : null}
+                    </Fragment>
+                  );
+                })}
+              </div>
+            ) : null}
+
+            {/* Connector: images → videos */}
+            {hasRendering ? (
+              <div className="ecom-video-flow-connector is-active" aria-hidden="true"><i /></div>
+            ) : null}
+
+            {/* Video nodes — side by side per scene */}
+            {hasRendering ? (
+              <div className="ecom-video-scene-strip" aria-label="视频分镜节点">
+                {scenes.map((scene, idx) => {
+                  const vidReady = scene.status === "completed" && scene.resultUrl;
+                  const vidRunning = stage === "rendering" && (scene.status === "running" || scene.status === "pending");
+                  const vidFailed = scene.status === "failed";
+                  const cls = vidReady ? "is-completed" : vidRunning ? "is-active" : vidFailed ? "is-failed" : "";
+                  return (
+                    <Fragment key={`vid-${scene.sceneId}`}>
+                      <article className={`ecom-video-flow-node ecom-video-flow-node--video ${cls}`}
+                        aria-label={`镜头 ${scene.sceneId}`} title={`镜头 ${scene.sceneId}`}>
+                        <div className="ecom-video-flow-node__media">
+                          {vidReady ? <video src={scene.resultUrl!} muted playsInline loop autoPlay />
+                            : vidRunning ? <div className="ecom-video-flow-node__placeholder"><LoadingOutlined /></div>
+                            : vidFailed ? <div className="ecom-video-flow-node__placeholder">失败</div>
+                            : <div className="ecom-video-flow-node__placeholder">待生成</div>}
+                        </div>
+                        {vidRunning ? <span className="ecom-video-flow-node__progress">{scene.progress || 0}%</span> : null}
+                        <span className="ecom-video-flow-node__label">镜头{scene.sceneId}</span>
+                        {vidFailed ? (
+                          <button type="button" className="ecom-video-flow-node__retry"
+                            onClick={(e) => { e.stopPropagation(); void handleRetryScene(scene); }}
+                            title="重试此镜头">
+                            <ReloadOutlined />
+                          </button>
+                        ) : null}
+                        {vidFailed && scene.error ? (
+                          <span className="ecom-video-flow-node__error" title={scene.error}>{scene.error.slice(0, 20)}</span>
+                        ) : null}
+                        <span className="ecom-video-flow-node__status-orb" aria-hidden="true" />
+                      </article>
+                      {idx < scenes.length - 1 ? (
+                        <div className="ecom-video-scene-link is-active" aria-hidden="true"><i /></div>
+                      ) : null}
+                    </Fragment>
+                  );
+                })}
+              </div>
             ) : null}
           </div>
         )}
 
+        {/* ── Delivery dock ────────────────────────────── */}
         {primaryVideo ? (
           <div className="ecom-video-flow-dock" aria-label="视频交付操作">
-            <button type="button" aria-label="下载当前视频" title="下载当前视频" onClick={() => void handleDownload(primaryVideo)}><DownloadOutlined /></button>
-            <button type="button" aria-label="保存到资产库" title="保存到资产库" onClick={() => void handleSaveAsset(primaryVideo)}><FolderAddOutlined /></button>
-            <button type="button" aria-label="导入画布" title="导入画布" onClick={() => void handleImportToCanvas(primaryVideo)}><SendOutlined /></button>
-            <button type="button" aria-label="复制视频链接" title="复制视频链接" onClick={() => void navigator.clipboard.writeText(primaryVideo)}><CopyOutlined /></button>
+            <button type="button" onClick={() => void handleDownloadAll()} title={`下载全部 ${completedScenes.length} 个视频`}><DownloadOutlined /></button>
+            <button type="button" onClick={() => void handleSaveAllAssets()} title={`保存全部 ${completedScenes.length} 个视频到资产库`}><FolderAddOutlined /></button>
+            {primaryVideo ? <button type="button" onClick={() => void handleImportToCanvas(primaryVideo)} title="导入画布"><SendOutlined /></button> : null}
+            {primaryVideo ? <button type="button" onClick={() => void navigator.clipboard.writeText(primaryVideo)} title="复制链接"><CopyOutlined /></button> : null}
           </div>
         ) : null}
         {actionNotice ? <div className="ecom-video-flow-notice">{actionNotice}</div> : null}

src/features/ecommerce/ecommerceVideoKeepalive.ts

@@ -0,0 +1,60 @@
+import type {
+  EcommerceVideoStage,
+  EcommerceVideoSceneTask,
+  EcommerceVideoPlanResult,
+  PlanStep,
+} from "./ecommerceVideoTypes";
+
+const KEEPALIVE_KEY = "omniai:ecommerce-video-workspace";
+
+interface EcommerceVideoKeepalive {
+  stage: EcommerceVideoStage;
+  completedSteps: PlanStep[];
+  planResult: EcommerceVideoPlanResult | null;
+  scenes: EcommerceVideoSceneTask[];
+  sourceImageUrls: string[];
+  savedAt: number;
+}
+
+export function saveEcommerceVideoState(state: {
+  stage: EcommerceVideoStage;
+  completedSteps: PlanStep[];
+  planResult: EcommerceVideoPlanResult | null;
+  scenes: EcommerceVideoSceneTask[];
+  sourceImageUrls?: string[];
+}): void {
+  try {
+    const entry: EcommerceVideoKeepalive = {
+      ...state,
+      sourceImageUrls: state.sourceImageUrls || [],
+      savedAt: Date.now(),
+    };
+    window.localStorage.setItem(KEEPALIVE_KEY, JSON.stringify(entry));
+  } catch {
+    // quota exceeded — silently drop
+  }
+}
+
+export function loadEcommerceVideoState(): EcommerceVideoKeepalive | null {
+  try {
+    const raw = window.localStorage.getItem(KEEPALIVE_KEY);
+    if (!raw) return null;
+    const parsed = JSON.parse(raw) as EcommerceVideoKeepalive;
+    // Discard entries older than 2 hours
+    if (Date.now() - (parsed.savedAt || 0) > 2 * 60 * 60 * 1000) {
+      clearEcommerceVideoState();
+      return null;
+    }
+    return parsed;
+  } catch {
+    return null;
+  }
+}
+
+export function clearEcommerceVideoState(): void {
+  try {
+    window.localStorage.removeItem(KEEPALIVE_KEY);
+  } catch {
+    // ignore
+  }
+}

src/features/ecommerce/ecommerceVideoService.ts

@@ -20,6 +20,7 @@ import type {
 export interface PlanCallbacks {
   onStepStart: (step: PlanStep) => void;
   onStepDone: (step: PlanStep) => void;
+  onImagesUploaded?: (urls: string[]) => void;
   signal?: AbortSignal;
 }
 
@@ -46,7 +47,9 @@ export async function runVideoPlan(
       // skip images that fail to upload
     }
   }
+  if (!imageUrls.length) throw new Error("图片上传失败，请检查图片格式或网络后重试");
   onStepDone("upload");
+  callbacks.onImagesUploaded?.(imageUrls);
 
   onStepStart("analyze");
   const imageDesc = await analyzeProductImages(imageUrls, signal);
@@ -77,7 +80,46 @@ export async function runVideoPlan(
   const compliance = await checkCompliance(summary, selling, storyboard, signal);
   onStepDone("compliance");
 
-  return { summary, selling, creatives, storyboard, videoPrompts, compliance };
+  return { imageUrls, summary, selling, creatives, storyboard, videoPrompts, compliance };
+}
+
+export interface RenderSceneImageInput {
+  sceneId: number;
+  prompt: string;
+  aspectRatio: string;
+}
+
+export interface RenderImageCallbacks {
+  onSceneImageSubmitted: (sceneId: number, taskId: string) => void;
+  onSceneImageProgress: (sceneId: number, progress: number) => void;
+  onSceneImageCompleted: (sceneId: number, resultUrl: string) => void;
+  onSceneImageFailed: (sceneId: number, error: string) => void;
+}
+
+export async function renderSceneImage(
+  input: RenderSceneImageInput,
+  callbacks: RenderImageCallbacks,
+  abortRef: { current: boolean },
+): Promise<void> {
+  const { taskId } = await aiGenerationClient.createImageTask({
+    model: "gpt-image-2",
+    prompt: input.prompt,
+    ratio: input.aspectRatio,
+    quality: "2K",
+  });
+
+  callbacks.onSceneImageSubmitted(input.sceneId, taskId);
+
+  const resultUrl = await waitForTask(taskId, {
+    abortRef,
+    onProgress: (e) => callbacks.onSceneImageProgress(input.sceneId, e.progress),
+  });
+
+  if (resultUrl) {
+    callbacks.onSceneImageCompleted(input.sceneId, resultUrl);
+  } else {
+    callbacks.onSceneImageFailed(input.sceneId, "图片生成未返回结果");
+  }
 }
 
 export interface RenderSceneInput {
@@ -114,7 +156,7 @@ export async function renderScene(
     duration: input.durationSeconds,
     quality: input.resolution,
     resolution: input.resolution,
-    imageUrl: input.imageUrl,
+    frameMode: "start-end",
     referenceUrls: [input.imageUrl],
     hasReferenceVideo: false,
   });
@@ -137,12 +179,12 @@ export function buildSceneTasks(
   plan: EcommerceVideoPlanResult,
 ): EcommerceVideoSceneTask[] {
   return plan.storyboard.scenes.map((scene) => {
-    const prompt = plan.videoPrompts.find((p) => p.scene_id === scene.scene_id);
+    const matchedPrompt = plan.videoPrompts.find((p) => p.scene_id === scene.scene_id);
     return {
       sceneId: scene.scene_id,
-      prompt: prompt?.positive_prompt || scene.visual_description,
+      prompt: matchedPrompt?.positive_prompt || scene.visual_description,
       durationSeconds: Number.parseInt(scene.duration, 10) || 5,
-      status: "idle",
+      status: "idle" as const,
       progress: 0,
     };
   });

src/features/ecommerce/ecommerceVideoTypes.ts

@@ -12,6 +12,8 @@ export type EcommerceVideoStage =
   | "uploading"
   | "planning"
   | "planned"
+  | "imaging"
+  | "imaged"
   | "rendering"
   | "partial_failed"
   | "completed"
@@ -22,15 +24,18 @@ export type SceneTaskStatus = "idle" | "pending" | "running" | "completed" | "fa
 export interface EcommerceVideoSceneTask {
   sceneId: number;
   taskId?: string;
+  imageTaskId?: string;
   prompt: string;
   durationSeconds: number;
   status: SceneTaskStatus;
   progress: number;
   resultUrl?: string | null;
+  imageUrl?: string | null;
   error?: string | null;
 }
 
 export interface EcommerceVideoPlanResult {
+  imageUrls: string[];
   summary: ProductSummary;
   selling: SellingPointResult;
   creatives: CreativeOption[];
@@ -67,3 +72,8 @@ export const PLAN_STEP_LABELS: Record<PlanStep, string> = {
   prompts: "生成镜头提示词",
   compliance: "合规检查",
 };
+
+/** Completed plan steps that should show as text nodes in the flow map (skip upload). */
+export const PLAN_STEPS_DISPLAY: PlanStep[] = [
+  "analyze", "summary", "selling", "creative", "storyboard", "prompts", "compliance",
+];

src/features/home/HomePage.tsx

@@ -14,9 +14,9 @@ import WelcomeSplash from "./WelcomeSplash";
 import ToolboxSection from "./ToolboxSection";
 import ScriptReviewShowcase from "./ScriptReviewShowcase";
 import ModelGenerationShowcase from "./ModelGenerationShowcase";
-import ecommerceTemplate1 from "../../assets/home-features/home-ecommerce-template-1.png";
-import ecommerceTemplate2 from "../../assets/home-features/home-ecommerce-template-2.png";
-import ecommerceTemplate3 from "../../assets/home-features/home-ecommerce-template-3.png";
+const ecommerceTemplate1 = "https://www.omniai.net.cn/static/home-ecommerce-template-1.png";
+const ecommerceTemplate2 = "https://www.omniai.net.cn/static/home-ecommerce-template-2.png";
+const ecommerceTemplate3 = "https://www.omniai.net.cn/static/home-ecommerce-template-3.png";
 
 function ScrollEntrance({ children, className, ...rest }: { children: React.ReactNode; className?: string } & React.HTMLAttributes<HTMLElement>) {
   const { ref, isVisible } = useScrollEntrance<HTMLElement>();
@@ -45,7 +45,7 @@ interface HomePageProps {
   onOpenImageTool?: (tool: WebImageWorkbenchTool) => void;
 }
 
-const HOME_BACKGROUND_VIDEO = "https://stringtest.oss-cn-hangzhou.aliyuncs.com/%E6%A0%B7%E7%89%87.mp4";
+const HOME_BACKGROUND_VIDEO = "https://stringtest.oss-cn-hangzhou.aliyuncs.com/muban/hero-bg.mp4";
 
 const HOME_CAROUSEL_IMAGES = [
   { imageUrl: heroImage1, title: "灵感生成" },
@@ -196,7 +196,7 @@ function EcommerceFeatureShowcase() {
   );
 }
 
-function HomePage({ onOpenGenerate, onOpenEcommerce, onOpenScriptReview, onOpenTokenMonitor, onSelectView, onOpenImageTool }: HomePageProps) {
+function HomePage({ onOpenGenerate, onOpenCanvas, onOpenEcommerce, onOpenScriptReview, onOpenTokenMonitor, onSelectView, onOpenImageTool }: HomePageProps) {
   const [splashDismissed, setSplashDismissed] = useState(() => sessionStorage.getItem("omniai:splash-seen") === "1");
   const [activeSlideIndex, setActiveSlideIndex] = useState(0);
   const [carouselMotion, setCarouselMotion] = useState<HomeCarouselMotion | null>(null);
@@ -313,7 +313,7 @@ function HomePage({ onOpenGenerate, onOpenEcommerce, onOpenScriptReview, onOpenT
         <section className="omni-home__hero" aria-label="OmniAI 首页">
           <div className="omni-home__copy">
             <h1>OmniAI 创作中心</h1>
-            <p>从灵感、生成、画布到商业素材，所有创作入口保持在一个安静的暗绿工作台里。</p>
+            <p>从灵感到成片，一站式整合生成、AIGC与电商，让创作安静专注。</p>
           </div>
 
           <div className={`omni-home__carousel${carouselIsResetting ? " is-resetting" : ""}`} aria-label="创作案例轮播">
@@ -352,7 +352,7 @@ function HomePage({ onOpenGenerate, onOpenEcommerce, onOpenScriptReview, onOpenT
               <PlusOutlined />
               <span>新手</span>
             </button>
-            <button type="button" className="omni-home__entry omni-home__entry--primary" onClick={onOpenGenerate}>
+            <button type="button" className="omni-home__entry omni-home__entry--primary" onClick={onOpenCanvas || onOpenGenerate}>
               <PlayCircleOutlined />
               <span>老手</span>
             </button>

src/features/home/WelcomeSplash.tsx

@@ -15,7 +15,7 @@ const prefersReducedMotion = typeof window !== "undefined"
 export default function WelcomeSplash({ onEnter }: WelcomeSplashProps) {
   const canvasRef = useRef<HTMLCanvasElement>(null);
   const rafRef = useRef(0);
-  const [showWelcome, setShowWelcome] = useState(false);
+  const [showWelcome, setShowWelcome] = useState(true);
   const [exiting, setExiting] = useState(false);
 
   const handleEnter = useCallback(() => {

src/features/image-workbench/ImageWorkbenchPage.tsx

@@ -27,6 +27,7 @@ import { useCallback, useEffect, useRef, useState } from "react";
 import type { WebImageWorkbenchTool, WebViewKey } from "../../types";
 import { aiGenerationClient } from "../../api/aiGenerationClient";
 import { waitForTask } from "../../api/taskSubscription";
+import { saveToolTaskState, loadToolTaskState, clearToolTaskState } from "../workbench/toolKeepalive";
 import { translateTaskError } from "../../utils/translateTaskError";
 import { addToolResultToAssetLibrary, saveToolResultToLocal } from "../workbench/toolResultActions";
 import { useCanvasDrawing } from "./useCanvasDrawing";
@@ -139,13 +140,39 @@ function ImageWorkbenchPage({ initialTool = "workbench", onOpenMore, onSelectVie
   const [generationError, setGenerationError] = useState<string | null>(null);
   const abortRef = useRef(false);
   const taskIdRef = useRef<string | null>(null);
+  const keepaliveRestoredRef = useRef(false);
+
+  // Keep-alive: restore saved task on mount
+  useEffect(() => {
+    if (keepaliveRestoredRef.current) return;
+    keepaliveRestoredRef.current = true;
+    const saved = loadToolTaskState("imagewb");
+    if (!saved || saved.resultUrl) return;
+    setIsGenerating(true);
+    abortRef.current = false;
+    taskIdRef.current = saved.taskId;
+    void waitForTask(saved.taskId, {
+      onProgress: (e) => {
+        setTaskProgress(Math.max(0, Math.min(100, Math.trunc(e.progress || 0))));
+        setStatus(`${e.status} / ${e.progress}%`);
+        if (e.status === "completed" && e.resultUrl) {
+          setResultImages([e.resultUrl]);
+          clearToolTaskState("imagewb");
+          setIsGenerating(false);
+          setStatus("恢复任务完成");
+        }
+        if (e.status === "failed") {
+          clearToolTaskState("imagewb");
+          setIsGenerating(false);
+          setStatus("恢复任务失败");
+        }
+      },
+    });
+  }, []);
 
   useEffect(() => {
     return () => {
       abortRef.current = true;
-      if (taskIdRef.current) {
-        aiGenerationClient.cancelTask(taskIdRef.current).catch(() => {});
-      }
     };
   }, []);
 
@@ -155,6 +182,7 @@ function ImageWorkbenchPage({ initialTool = "workbench", onOpenMore, onSelectVie
       aiGenerationClient.cancelTask(taskIdRef.current).catch(() => {});
       taskIdRef.current = null;
     }
+    clearToolTaskState("imagewb");
     setGenerating(false);
     setGenerationProgress(0);
     setStatus("已取消");
@@ -305,6 +333,7 @@ function ImageWorkbenchPage({ initialTool = "workbench", onOpenMore, onSelectVie
         referenceUrls: refUrls,
       });
       taskIdRef.current = taskId;
+      saveToolTaskState("imagewb", { taskId, status: "running", progress: 0 });
 
       const tempUrl = await pollTaskUntilDone(taskId);
       if (tempUrl) {
@@ -385,6 +414,7 @@ function ImageWorkbenchPage({ initialTool = "workbench", onOpenMore, onSelectVie
         referenceUrls: refUrls,
       });
       taskIdRef.current = taskId;
+      saveToolTaskState("imagewb", { taskId, status: "running", progress: 0 });
 
       const tempUrl = await pollTaskUntilDone(taskId);
       if (tempUrl) {
@@ -530,6 +560,7 @@ function ImageWorkbenchPage({ initialTool = "workbench", onOpenMore, onSelectVie
           referenceUrls: refUrls,
         });
         taskIdRef.current = taskId;
+      saveToolTaskState("imagewb", { taskId, status: "running", progress: 0 });
 
         const tempUrl = await pollTaskUntilDone(taskId);
         if (tempUrl) {
@@ -544,6 +575,10 @@ function ImageWorkbenchPage({ initialTool = "workbench", onOpenMore, onSelectVie
       }
 
       setResultImages(results);
+      clearToolTaskState("imagewb");
+      if (results.length) {
+        saveToolTaskState("imagewb", { taskId: taskIdRef.current || "", resultUrl: results[0], status: "完成", progress: 100 });
+      }
       setStatus(results.length ? `生成完成，共 ${results.length} 张` : "生成已取消");
     } catch (err) {
       const msg = err instanceof Error ? err.message : "生成失败";

src/features/more/MorePage.tsx

@@ -7,10 +7,7 @@ import {
   DeleteOutlined,
   EditOutlined,
   HighlightOutlined,
-  PictureOutlined,
-  ShoppingOutlined,
   SwapOutlined,
-  TableOutlined,
   ThunderboltOutlined,
   VideoCameraOutlined,
 } from "@ant-design/icons";
@@ -23,7 +20,7 @@ interface MorePageProps {
   onOpenImageTool?: (tool: WebImageWorkbenchTool) => void;
 }
 
-type ToolCategory = "image" | "video" | "template";
+type ToolCategory = "image" | "video";
 type FilterKey = "all" | ToolCategory | "upcoming";
 
 interface MoreTool {
@@ -49,9 +46,6 @@ const tools: MoreTool[] = [
   { id: "digitalHuman", title: "数字人", text: "参考人像与音频生成口播视频", icon: <CustomerServiceOutlined />, category: "video", target: "digitalHuman", ready: true, featured: true },
   { id: "characterMix", title: "角色迁移", text: "人物图迁移到参考视频动作", icon: <SwapOutlined />, category: "video", target: "characterMix", ready: true },
   { id: "avatarConsole", title: "数字人控制台", text: "形象、播报、互动与接入配置", icon: <DashboardOutlined />, category: "video", target: "avatarConsole", ready: true },
-  { id: "ecommerce", title: "示例模板", text: "电商场景与最近项目", icon: <ShoppingOutlined />, category: "template", target: "ecommerceTemplates", ready: true },
-  { id: "grid", title: "多宫格", text: "9/25 宫格快速试拍", icon: <TableOutlined />, category: "template", ready: false, badge: "即将上线" },
-  { id: "refOrganize", title: "参考图整理", text: "素材进入资产库前的轻处理", icon: <PictureOutlined />, category: "template", ready: false, badge: "即将上线" },
 ];
 
 interface FeaturedTool {
@@ -89,20 +83,17 @@ const featuredTools: FeaturedTool[] = [
 const categoryLabels: Record<ToolCategory, string> = {
   image: "图像创作",
   video: "视频生成",
-  template: "模板与素材",
 };
 
 const categoryIcons: Record<ToolCategory, ReactNode> = {
   image: <EditOutlined />,
   video: <VideoCameraOutlined />,
-  template: <ShoppingOutlined />,
 };
 
 const filters: { key: FilterKey; label: string }[] = [
   { key: "all", label: "全部" },
   { key: "image", label: "图像" },
   { key: "video", label: "视频" },
-  { key: "template", label: "模板" },
   { key: "upcoming", label: "即将上线" },
 ];
 

src/features/profile/ProfilePage.tsx

@@ -13,7 +13,6 @@ import {
   SafetyOutlined,
   ShareAltOutlined,
   UserOutlined,
-  WechatOutlined,
 } from "@ant-design/icons";
 import { useEffect, useRef, useState, type ChangeEvent, type FormEvent } from "react";
 import { aiGenerationClient } from "../../api/aiGenerationClient";
@@ -40,7 +39,7 @@ interface ProfilePageProps {
   onDeleteProject?: (project: WebProjectSummary) => void;
 }
 
-type AuthTab = "password" | "email" | "phone" | "wechat";
+type AuthTab = "password" | "email" | "phone";
 type ProfilePanel = "works" | "projects" | "assets" | "community";
 type AccountPanel = "credits" | "tasks";
 
@@ -215,8 +214,6 @@ function ProfilePage({
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [smsCooldown, setSmsCooldown] = useState(0);
   const [isSendingSms, setIsSendingSms] = useState(false);
-  const [wechatTicket, setWechatTicket] = useState<{ url?: string; state?: string; message?: string; configured?: boolean } | null>(null);
-  const [wechatStatus, setWechatStatus] = useState<string | null>(null);
 
   const [activePanel, setActivePanel] = useState<ProfilePanel>("works");
   const [accountPanel, setAccountPanel] = useState<AccountPanel>("credits");
@@ -296,55 +293,6 @@ function ProfilePage({
     return () => window.clearInterval(timer);
   }, [smsCooldown]);
 
-  useEffect(() => {
-    if (authTab !== "wechat" || isLoggedIn) return;
-
-    let cancelled = false;
-    let pollTimer: number | undefined;
-
-    const startWechatLogin = async () => {
-      setWechatStatus("正在创建微信登录二维码...");
-      setWechatTicket(null);
-      try {
-        const ticket = await keyServerClient.getWechatLoginTicket();
-        if (cancelled) return;
-        setWechatTicket(ticket);
-        if (!ticket.configured || !ticket.url || !ticket.state) {
-          setWechatStatus(ticket.message || "微信登录暂未配置");
-          return;
-        }
-        setWechatStatus("请使用微信扫码登录");
-        pollTimer = window.setInterval(() => {
-          void keyServerClient
-            .getWechatLoginSession(ticket.state!)
-            .then(async (result) => {
-              if (cancelled) return;
-              if (result.status === "completed" && result.session) {
-                if (pollTimer) window.clearInterval(pollTimer);
-                setWechatStatus("微信登录成功，正在进入工作台...");
-                await onAuthComplete?.(result.session);
-              } else if (result.status !== "pending") {
-                if (pollTimer) window.clearInterval(pollTimer);
-                setWechatStatus(result.error || "微信登录已失效，请刷新二维码");
-              }
-            })
-            .catch((error) => {
-              if (!cancelled) setWechatStatus(error instanceof Error ? error.message : "微信登录状态查询失败");
-            });
-        }, 2000);
-      } catch (error) {
-        if (!cancelled) setWechatStatus(error instanceof Error ? error.message : "微信登录二维码创建失败");
-      }
-    };
-
-    void startWechatLogin();
-
-    return () => {
-      cancelled = true;
-      if (pollTimer) window.clearInterval(pollTimer);
-    };
-  }, [authTab, isLoggedIn, onAuthComplete]);
-
   const handleSendSms = async () => {
     if (smsCooldown > 0 || !phone.trim() || isSendingSms) return;
     if (mode === "register" && !betaCode.trim()) {
@@ -407,7 +355,7 @@ function ProfilePage({
 
   const handleSubmit = async (event: FormEvent<HTMLFormElement>) => {
     event.preventDefault();
-    if (isSubmitting || authTab === "wechat") return;
+    if (isSubmitting) return;
 
     const errors: Record<string, string> = {};
     if (mode === "register") {
@@ -922,9 +870,6 @@ function ProfilePage({
             <button type="button" className={authTab === "phone" ? "is-active" : ""} onClick={() => { setAuthTab("phone"); setFieldErrors({}); }}>
               <MobileOutlined /> 手机验证码
             </button>
-            <button type="button" className={authTab === "wechat" ? "is-active" : ""} onClick={() => { setAuthTab("wechat"); setFieldErrors({}); }}>
-              <WechatOutlined /> 微信
-            </button>
           </div>
 
           {pendingActionLabel ? (
@@ -935,7 +880,7 @@ function ProfilePage({
           ) : null}
 
           <form className="auth-page__form" onSubmit={(event) => void handleSubmit(event)}>
-            {mode === "register" && authTab !== "wechat" ? (
+            {mode === "register" ? (
               <label className={`auth-page__field${fieldErrors.betaCode ? " auth-page__field--error" : ""}`}>
                 <span>
                   <SafetyOutlined /> 企业邀请码 / 内测码
@@ -1075,35 +1020,11 @@ function ProfilePage({
               </>
             ) : null}
 
-            {authTab === "wechat" ? (
-              <div className="auth-page__wechat-qr">
-                <div className="auth-page__qr-placeholder">
-                  {wechatTicket?.url ? (
-                    <>
-                      <iframe className="auth-page__wechat-frame" title="微信扫码登录" src={wechatTicket.url} />
-                      <a className="auth-page__wechat-link" href={wechatTicket.url} target="_blank" rel="noreferrer">
-                        新窗口打开二维码
-                      </a>
-                    </>
-                  ) : (
-                    <>
-                      <WechatOutlined />
-                      <span>微信扫码登录</span>
-                      <p>{wechatStatus || "正在准备微信登录"}</p>
-                    </>
-                  )}
-                </div>
-                {wechatStatus ? <p className="auth-page__wechat-status">{wechatStatus}</p> : null}
-              </div>
-            ) : null}
-
             {notice ? <p className="auth-page__notice">{notice}</p> : null}
 
-            {authTab !== "wechat" ? (
-              <button type="submit" className="auth-page__submit" disabled={isSubmitting}>
-                {isSubmitting ? "处理中..." : mode === "login" ? "登录" : "注册"}
-              </button>
-            ) : null}
+            <button type="submit" className="auth-page__submit" disabled={isSubmitting}>
+              {isSubmitting ? "处理中..." : mode === "login" ? "登录" : "注册"}
+            </button>
 
             <div className="auth-page__agreement">
               <span>
@@ -1117,9 +1038,6 @@ function ProfilePage({
             </div>
 
             <div className="auth-page__social">
-              <button type="button" className="auth-page__social-btn" title="微信登录" onClick={() => setAuthTab("wechat")}>
-                <WechatOutlined />
-              </button>
               <button type="button" className="auth-page__social-btn" title="手机号登录" onClick={() => setAuthTab("phone")}>
                 <MobileOutlined />
               </button>

src/features/resolution-upscale/ResolutionUpscalePage.tsx

@@ -18,6 +18,7 @@ import {
 import { useCallback, useEffect, useRef, useState } from "react";
 import { aiGenerationClient } from "../../api/aiGenerationClient";
 import { waitForTask } from "../../api/taskSubscription";
+import { saveToolTaskState, loadToolTaskState, clearToolTaskState } from "../workbench/toolKeepalive";
 import { translateTaskError } from "../../utils/translateTaskError";
 import { getServerBaseUrl, isServerRequestError } from "../../api/serverConnection";
 import { summarizeUrl, formatFileSize, fileToDataUrl, wait } from "../../utils/toolPageUtils";
@@ -88,6 +89,7 @@ function ResolutionUpscalePage({
   const [isSavingAsset, setIsSavingAsset] = useState(false);
   const activeTaskIdRef = useRef(activeTaskId);
   activeTaskIdRef.current = activeTaskId;
+  const keepaliveRestoredRef = useRef(false);
 
   useEffect(() => {
     return () => {
@@ -101,13 +103,25 @@ function ResolutionUpscalePage({
     };
   }, [resultPreview]);
 
+  // Keep-alive: restore saved task on mount
+  useEffect(() => {
+    if (keepaliveRestoredRef.current) return;
+    keepaliveRestoredRef.current = true;
+    const saved = loadToolTaskState("upscale");
+    if (!saved || saved.resultUrl) return;
+    setSourceName(saved.sourceName || "");
+    setSourceUrl(saved.sourceUrl || "");
+    setIsProcessing(true);
+    cancelRef.current = false;
+    pollRunRef.current += 1;
+    void waitForTaskResult(saved.taskId, mode).catch(() => {});
+  }, []);
+
   useEffect(() => {
     return () => {
+      // Stop polling but keep server task alive — keep-alive will resume on remount
       pollRunRef.current += 1;
       cancelRef.current = true;
-      if (activeTaskIdRef.current) {
-        aiGenerationClient.cancelTask(activeTaskIdRef.current).catch(() => {});
-      }
     };
   }, []);
 
@@ -182,6 +196,7 @@ function ResolutionUpscalePage({
     const runId = ++pollRunRef.current;
     setActiveTaskId(taskId);
     setTaskProgress(5);
+    saveToolTaskState("upscale", { taskId, sourceName, sourceUrl, status: `任务 ${taskId}`, progress: 5 });
 
     await waitForTask(taskId, {
       abortRef: cancelRef,
@@ -195,6 +210,8 @@ function ResolutionUpscalePage({
           setVideoViewMode("result");
           setStatus(`${taskMode === "image" ? "图片" : "视频"}超分完成：${summarizeUrl(e.resultUrl)}`);
           setTaskProgress(100);
+          clearToolTaskState("upscale");
+          saveToolTaskState("upscale", { taskId, resultUrl: e.resultUrl, resultPreview: e.resultUrl, sourceName, sourceUrl, status: "完成", progress: 100 });
         }
       },
     });
@@ -210,6 +227,7 @@ function ResolutionUpscalePage({
     }
     setIsProcessing(false);
     setStatus("已取消");
+    clearToolTaskState("upscale");
   }, [activeTaskId]);
 
   const handleDownload = async () => {

src/features/script-tokens/ScriptTokensPage.tsx

@@ -475,7 +475,17 @@ function ScriptTokensPage() {
           </div>
 
           <div className={`script-eval-v5-right-content${result ? " is-report" : ""}`}>
-            {!result && (
+            {loading ? (
+              <div className="script-eval-v5-input-section">
+                <div className="script-eval-v5-illustration" aria-label="评测中">
+                  <div className="script-eval-v5-loading">
+                    <div className="page-loading-spinner" />
+                    <strong>AI 正在分析剧本...</strong>
+                    <p>正在调用模型进行六维评分，预计需要 15-30 秒</p>
+                  </div>
+                </div>
+              </div>
+            ) : !result && (
               <div className="script-eval-v5-input-section">
                 <div className="script-eval-v5-illustration" aria-label="上传剧本并开始评测">
                   <div
@@ -501,7 +511,10 @@ function ScriptTokensPage() {
 
                 {evalError && (
                   <div className="script-eval-v5-error" role="alert">
-                    <span>⚠</span><span>{evalError}</span>
+                    <span>评测失败</span><span>{evalError}</span>
+                    <button type="button" className="script-eval-v5-retry-btn" onClick={() => void handleEvaluate()} disabled={!hasContent}>
+                      重试
+                    </button>
                   </div>
                 )}
               </div>
@@ -523,7 +536,7 @@ function ScriptTokensPage() {
                       <div className="script-eval-report__score-line">
                         <span style={{ width: `${animatedScore}%` }} />
                       </div>
-                      <div className="script-eval-report__beat">击败全国 <b>{beatPct}%</b> 剧本</div>
+                      <div className="script-eval-report__beat">{result.totalScore >= 90 ? "优秀" : result.totalScore >= 80 ? "良好" : result.totalScore >= 70 ? "中等" : "待提升"}，{result.totalScore >= 85 ? "具备商业开发潜力" : "建议针对性优化后再提交"}</div>
                     </div>
 
                     <div className="script-eval-report__summary">

src/features/script-tokens/TokenUsagePage.tsx

@@ -84,10 +84,10 @@ function formatDayLabel(value: string): string {
 type TrendPoint = { date: string; usedCents: number; taskCount: number };
 
 function UsageTrendChart({ data }: { data: TrendPoint[] }) {
-  const W = 480;
-  const H = 120;
-  const padX = 28;
-  const padY = 18;
+  const W = 680;
+  const H = 200;
+  const padX = 32;
+  const padY = 24;
   const maxCents = Math.max(1, ...data.map((d) => d.usedCents));
   const stepX = data.length > 1 ? (W - padX * 2) / (data.length - 1) : 0;
   const yOf = (cents: number) => H - padY - (cents / maxCents) * (H - padY * 2);

src/features/subtitle-removal/SubtitleRemovalPage.tsx

@@ -15,6 +15,7 @@ import {
 import { useCallback, useEffect, useRef, useState, type CSSProperties } from "react";
 import { aiGenerationClient } from "../../api/aiGenerationClient";
 import { waitForTask } from "../../api/taskSubscription";
+import { saveToolTaskState, loadToolTaskState, clearToolTaskState } from "../workbench/toolKeepalive";
 import { getServerBaseUrl, isServerRequestError } from "../../api/serverConnection";
 import { summarizeUrl, formatFileSize, fileToDataUrl } from "../../utils/toolPageUtils";
 import TaskStatusBar from "../../components/TaskStatusBar";
@@ -74,14 +75,26 @@ function SubtitleRemovalPage({
   const [isSavingAsset, setIsSavingAsset] = useState(false);
   const activeTaskIdRef = useRef(activeTaskId);
   activeTaskIdRef.current = activeTaskId;
+  const keepaliveRestoredRef = useRef(false);
+
+  // Keep-alive: restore saved task on mount
+  useEffect(() => {
+    if (keepaliveRestoredRef.current) return;
+    keepaliveRestoredRef.current = true;
+    const saved = loadToolTaskState("subtitle");
+    if (!saved || saved.resultUrl) return;
+    setSourceName(saved.sourceName || "");
+    setSourceUrl(saved.sourceUrl || "");
+    setIsProcessing(true);
+    cancelRef.current = false;
+    pollRunRef.current += 1;
+    void waitForTaskResult(saved.taskId).catch(() => {});
+  }, []);
 
   useEffect(() => {
     return () => {
       pollRunRef.current += 1;
       cancelRef.current = true;
-      if (activeTaskIdRef.current) {
-        aiGenerationClient.cancelTask(activeTaskIdRef.current).catch(() => {});
-      }
     };
   }, []);
 
@@ -158,6 +171,7 @@ function SubtitleRemovalPage({
     const runId = ++pollRunRef.current;
     setActiveTaskId(taskId);
     setTaskProgress(5);
+    saveToolTaskState("subtitle", { taskId, sourceName, sourceUrl, status: `任务 ${taskId}`, progress: 5 });
 
     await waitForTask(taskId, {
       abortRef: cancelRef,
@@ -170,6 +184,8 @@ function SubtitleRemovalPage({
           setResultUrl(e.resultUrl);
           setStatus("字幕去除完成");
           setTaskProgress(100);
+          clearToolTaskState("subtitle");
+          saveToolTaskState("subtitle", { taskId, resultUrl: e.resultUrl, resultPreview: e.resultUrl, sourceName, sourceUrl, status: "完成", progress: 100 });
         }
       },
     });
@@ -185,6 +201,7 @@ function SubtitleRemovalPage({
     }
     setIsProcessing(false);
     setStatus("已取消");
+    clearToolTaskState("subtitle");
   }, [activeTaskId]);
 
   const handleDownload = async () => {

src/features/watermark-removal/WatermarkRemovalPage.tsx

@@ -15,6 +15,7 @@ import {
 import { useCallback, useEffect, useRef, useState } from "react";
 import { aiGenerationClient } from "../../api/aiGenerationClient";
 import { waitForTask } from "../../api/taskSubscription";
+import { saveToolTaskState, loadToolTaskState, clearToolTaskState } from "../workbench/toolKeepalive";
 import { getServerBaseUrl, isServerRequestError } from "../../api/serverConnection";
 import { summarizeUrl, formatFileSize, fileToDataUrl } from "../../utils/toolPageUtils";
 import TaskStatusBar from "../../components/TaskStatusBar";
@@ -50,6 +51,7 @@ function WatermarkRemovalPage({
   const [isDownloading, setIsDownloading] = useState(false);
   const activeTaskIdRef = useRef(activeTaskId);
   activeTaskIdRef.current = activeTaskId;
+  const keepaliveRestoredRef = useRef(false);
 
   useEffect(() => {
     return () => {
@@ -57,13 +59,24 @@ function WatermarkRemovalPage({
     };
   }, [sourcePreview]);
 
+  // Keep-alive: restore saved task on mount
+  useEffect(() => {
+    if (keepaliveRestoredRef.current) return;
+    keepaliveRestoredRef.current = true;
+    const saved = loadToolTaskState("watermark");
+    if (!saved || saved.resultUrl) return;
+    setSourceName(saved.sourceName || "");
+    setSourceUrl(saved.sourceUrl || "");
+    setIsProcessing(true);
+    cancelRef.current = false;
+    pollRunRef.current += 1;
+    void waitForTaskResult(saved.taskId).catch(() => {});
+  }, []);
+
   useEffect(() => {
     return () => {
       pollRunRef.current += 1;
       cancelRef.current = true;
-      if (activeTaskIdRef.current) {
-        aiGenerationClient.cancelTask(activeTaskIdRef.current).catch(() => {});
-      }
     };
   }, []);
 
@@ -140,6 +153,7 @@ function WatermarkRemovalPage({
     const runId = ++pollRunRef.current;
     setActiveTaskId(taskId);
     setTaskProgress(5);
+    saveToolTaskState("watermark", { taskId, sourceName, sourceUrl, status: `任务 ${taskId}`, progress: 5 });
 
     await waitForTask(taskId, {
       abortRef: cancelRef,
@@ -152,6 +166,8 @@ function WatermarkRemovalPage({
           setResultPreview(e.resultUrl);
           setStatus("去水印完成");
           setTaskProgress(100);
+          clearToolTaskState("watermark");
+          saveToolTaskState("watermark", { taskId, resultUrl: e.resultUrl, resultPreview: e.resultUrl, sourceName, sourceUrl, status: "完成", progress: 100 });
         }
       },
     });
@@ -167,6 +183,7 @@ function WatermarkRemovalPage({
     }
     setIsProcessing(false);
     setStatus("已取消");
+    clearToolTaskState("watermark");
   }, [activeTaskId]);
 
   const handleDownload = async () => {

src/features/workbench/WorkbenchPage.tsx

@@ -280,6 +280,7 @@ function WorkbenchPage({
   }, []);
 
   useEffect(() => {
+    if (!isAuthenticated) return;
     let cancelled = false;
     assetClient
       .list()
@@ -948,6 +949,11 @@ function WorkbenchPage({
               await patchConversationMessage(task.conversationId, task.assistantMessageId, completedPatch);
               removeKeepaliveTask(task.taskId);
               onRefreshUsage?.();
+              if (status.status === "completed") {
+                import("../../utils/generationNotifier").then((m) =>
+                  m.notifyTaskCompleted(task.mode === "video" ? "视频" : "图片", task.mode as "image" | "video"),
+                );
+              }
               try {
                 if (status.resultUrl) {
                   const persistedResult = await persistWorkbenchResultAsset({
@@ -991,6 +997,11 @@ function WorkbenchPage({
               });
               removeKeepaliveTask(task.taskId);
               onRefreshUsage?.();
+              if (status.status === "completed") {
+                import("../../utils/generationNotifier").then((m) =>
+                  m.notifyTaskCompleted(task.mode === "video" ? "视频" : "图片", task.mode as "image" | "video"),
+                );
+              }
               return;
             }
 
@@ -2104,7 +2115,7 @@ function WorkbenchPage({
       return;
     }
     if (getActiveGenerationTaskCount(getGenerationUserKey(session?.user.id)) >= 3) {
-      setProjectError("当前任务数已达上限（3个），请等待任务完成后再试");
+      setProjectError(`当前已有 ${getActiveGenerationTaskCount(getGenerationUserKey(session?.user.id))} 个任务进行中（上限3个），请等待任一任务完成后再提交新任务`);
       return;
     }
     if (!isAuthenticated) {
@@ -2226,7 +2237,7 @@ function WorkbenchPage({
       return;
     }
     if (getActiveGenerationTaskCount(getGenerationUserKey(session?.user.id)) >= 3) {
-      setProjectError("当前任务数已达上限（3个），请等待任务完成后再试");
+      setProjectError(`当前已有 ${getActiveGenerationTaskCount(getGenerationUserKey(session?.user.id))} 个任务进行中（上限3个），请等待任一任务完成后再提交新任务`);
       return;
     }
     if (!isAuthenticated) {
@@ -2429,7 +2440,6 @@ function WorkbenchPage({
       projects={conversationRecords}
       activeId={activeConversationId ? String(activeConversationId) : null}
       collapsed={sidebarCollapsed}
-      filterMode={activeMode}
       loading={false}
       error={projectError}
       onToggle={() => setSidebarCollapsed((v) => (hasSidebarRecords ? !v : true))}

src/features/workbench/toolKeepalive.ts

@@ -0,0 +1,96 @@
+/**
+ * Generic single-task keep-alive for tool pages.
+ * Persists task state to localStorage so in-progress tasks survive page switches.
+ */
+
+const KEEPALIVE_PREFIX = "omniai:tool-task:";
+
+interface ToolTaskKeepalive {
+  taskId: string;
+  resultUrl: string;
+  resultPreview: string;
+  status: string;
+  progress: number;
+  sourceName: string;
+  sourceUrl: string;
+  savedAt: number;
+}
+
+export function saveToolTaskState(key: string, state: {
+  taskId: string;
+  resultUrl?: string;
+  resultPreview?: string;
+  status?: string;
+  progress?: number;
+  sourceName?: string;
+  sourceUrl?: string;
+}): void {
+  if (!state.taskId) return;
+  try {
+    const entry: ToolTaskKeepalive = {
+      taskId: state.taskId,
+      resultUrl: state.resultUrl || "",
+      resultPreview: state.resultPreview || "",
+      status: state.status || "",
+      progress: state.progress || 0,
+      sourceName: state.sourceName || "",
+      sourceUrl: state.sourceUrl || "",
+      savedAt: Date.now(),
+    };
+    window.localStorage.setItem(KEEPALIVE_PREFIX + key, JSON.stringify(entry));
+  } catch { /* quota */ }
+}
+
+export function loadToolTaskState(key: string): ToolTaskKeepalive | null {
+  try {
+    const raw = window.localStorage.getItem(KEEPALIVE_PREFIX + key);
+    if (!raw) return null;
+    const parsed = JSON.parse(raw) as ToolTaskKeepalive;
+    if (Date.now() - (parsed.savedAt || 0) > 2 * 60 * 60 * 1000) {
+      clearToolTaskState(key);
+      return null;
+    }
+    if (!parsed.taskId) return null;
+    return parsed;
+  } catch { return null; }
+}
+
+export function clearToolTaskState(key: string): void {
+  try { window.localStorage.removeItem(KEEPALIVE_PREFIX + key); } catch { /* ignore */ }
+}
+
+const TASK_POLL_INTERVAL = 3000;
+const TASK_POLL_TIMEOUT = 30 * 60 * 1000;
+
+export async function pollTaskUntilDone(
+  taskId: string,
+  onProgress?: (progress: number) => void,
+  abortRef?: { current: boolean },
+): Promise<string | null> {
+  const startTime = Date.now();
+  const { aiGenerationClient } = await import("../../api/aiGenerationClient");
+
+  while (true) {
+    if (abortRef?.current) return null;
+    if (Date.now() - startTime > TASK_POLL_TIMEOUT) return null;
+
+    try {
+      const task = await aiGenerationClient.getTaskStatus(taskId);
+      if (!task) return null;
+
+      const progress = Math.min(99, task.progress || 0);
+      onProgress?.(progress);
+
+      if (task.status === "completed") {
+        return task.resultUrl || null;
+      }
+      if (task.status === "failed" || task.status === "cancelled") {
+        return null;
+      }
+    } catch {
+      // retry on next poll
+    }
+
+    await new Promise((r) => setTimeout(r, TASK_POLL_INTERVAL));
+  }
+}