feat: add bug feedback feature, fix canvas context menu on zoom, remove billing note from chat

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

scripts/smoke-generation-mocked.mjs

@@ -42,9 +42,9 @@ assertNoMatch(
   /dashscope\.aliyuncs\.com|\/dashscope-api\b|Bearer\s+sk-/i,
 );
 assertMatch("image generation must go through the app API", generationClient, /buildApiUrl\("ai\/image"\)/);
-assertMatch("video generation must go through the app API", generationClient, /serverRequest<\{ taskId: string \}>\("ai\/video"/);
+assertMatch("video generation must go through the app API", generationClient, /buildApiUrl\("ai\/video"\)/);
 assertMatch("binary uploads must go through the app OSS API", generationClient, /buildApiUrl\("oss\/upload-binary"\)/);
-assertMatch("URL uploads must go through the app OSS API", generationClient, /serverRequest<\{ url: string; signedUrl\?: string; ossKey\?: string \}>\("oss\/upload-by-url"/);
+assertMatch("URL uploads must go through the app OSS API", generationClient, /buildApiUrl\("oss\/upload-by-url"\)/);
 assertMatch(
   "ecommerce video history must durable-copy media before saving",
   ecommerceVideoService,

src/App.tsx

@@ -15,7 +15,6 @@ import {
   WalletOutlined,
 } from "@ant-design/icons";
 import { lazy, Suspense, useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { useShallow } from "zustand/react/shallow";
 import ErrorBoundary from "./components/ErrorBoundary";
 import { reportError } from "./utils/errorReporting";
 import { initNotificationPermission } from "./utils/generationNotifier";
@@ -127,27 +126,6 @@ const VIEW_KEYS = new Set<WebViewKey>([
 ]);
 
 const PUBLIC_VIEW_SET = new Set<WebViewKey>(["home", "login", "community", "more", "dialogGenerator", "userAgreement", "privacyPolicy", "not-found"]);
-const LEGACY_PAGE_STYLE_VIEWS = new Set<WebViewKey>([
-  "login",
-  "workbench",
-  "canvas",
-  "community",
-  "communityReview",
-  "communityCaseAdd",
-  "assets",
-  "ecommerce",
-  "ecommerceHub",
-  "digitalHuman",
-  "characterMix",
-  "more",
-]);
-
-let legacyPageStylesPromise: Promise<unknown> | null = null;
-
-function loadLegacyPageStyles(): Promise<unknown> {
-  legacyPageStylesPromise ??= import("./styles/pages/legacy-pages.css");
-  return legacyPageStylesPromise;
-}
 
 function normalizeViewKey(rawView: string): WebViewKey {
   const normalized =
@@ -255,122 +233,61 @@ function App() {
   const canvasAutoOpenedRecentRef = useRef(false);
 
   // Session store
-  const {
+  const session = useSessionStore((s) => s.session);
-    session,
+  const loginPromptOpen = useSessionStore((s) => s.loginPromptOpen);
-    loginPromptOpen,
+  const pendingAction = useSessionStore((s) => s.pendingAction);
-    pendingAction,
+  const sessionReplacedOpen = useSessionStore((s) => s.sessionReplacedOpen);
-    sessionReplacedOpen,
+  const sessionReplacedMessage = useSessionStore((s) => s.sessionReplacedMessage);
-    sessionReplacedMessage,
+  const setSession = useSessionStore((s) => s.setSession);
-    setSession,
+  const openLoginPrompt = useSessionStore((s) => s.openLoginPrompt);
-    openLoginPrompt,
+  const closeLoginPrompt = useSessionStore((s) => s.closeLoginPrompt);
-    closeLoginPrompt,
+  const showSessionReplaced = useSessionStore((s) => s.showSessionReplaced);
-    showSessionReplaced,
+  const hideSessionReplaced = useSessionStore((s) => s.hideSessionReplaced);
-    hideSessionReplaced,
+  const clearSessionState = useSessionStore((s) => s.clearSession);
-    clearSession: clearSessionState,
-  } = useSessionStore(useShallow((s) => ({
-    session: s.session,
-    loginPromptOpen: s.loginPromptOpen,
-    pendingAction: s.pendingAction,
-    sessionReplacedOpen: s.sessionReplacedOpen,
-    sessionReplacedMessage: s.sessionReplacedMessage,
-    setSession: s.setSession,
-    openLoginPrompt: s.openLoginPrompt,
-    closeLoginPrompt: s.closeLoginPrompt,
-    showSessionReplaced: s.showSessionReplaced,
-    hideSessionReplaced: s.hideSessionReplaced,
-    clearSession: s.clearSession,
-  })));
 
   // Project store
-  const {
+  const projects = useProjectStore((s) => s.projects);
-    projects,
+  const projectsLoaded = useProjectStore((s) => s.projectsLoaded);
-    projectsLoaded,
+  const canvasWorkflow = useProjectStore((s) => s.canvasWorkflow);
-    canvasWorkflow,
+  const currentCanvasProjectId = useProjectStore((s) => s.currentCanvasProjectId);
-    currentCanvasProjectId,
+  const pendingDeleteProject = useProjectStore((s) => s.pendingDeleteProject);
-    pendingDeleteProject,
+  const deleteProjectSubmitting = useProjectStore((s) => s.deleteProjectSubmitting);
-    deleteProjectSubmitting,
+  const setProjects = useProjectStore((s) => s.setProjects);
-    setProjects,
+  const setProjectsLoaded = useProjectStore((s) => s.setProjectsLoaded);
-    setProjectsLoaded,
+  const setCanvasWorkflow = useProjectStore((s) => s.setCanvasWorkflow);
-    setCanvasWorkflow,
+  const setCurrentCanvasProjectId = useProjectStore((s) => s.setCurrentCanvasProjectId);
-    setCurrentCanvasProjectId,
+  const openDeleteProjectModal = useProjectStore((s) => s.openDeleteProject);
-    openDeleteProject: openDeleteProjectModal,
+  const closeDeleteProjectModal = useProjectStore((s) => s.closeDeleteProject);
-    closeDeleteProject: closeDeleteProjectModal,
+  const setDeleteProjectSubmitting = useProjectStore((s) => s.setDeleteProjectSubmitting);
-    setDeleteProjectSubmitting,
+  const clearProjectState = useProjectStore((s) => s.clearProjectState);
-    clearProjectState,
-  } = useProjectStore(useShallow((s) => ({
-    projects: s.projects,
-    projectsLoaded: s.projectsLoaded,
-    canvasWorkflow: s.canvasWorkflow,
-    currentCanvasProjectId: s.currentCanvasProjectId,
-    pendingDeleteProject: s.pendingDeleteProject,
-    deleteProjectSubmitting: s.deleteProjectSubmitting,
-    setProjects: s.setProjects,
-    setProjectsLoaded: s.setProjectsLoaded,
-    setCanvasWorkflow: s.setCanvasWorkflow,
-    setCurrentCanvasProjectId: s.setCurrentCanvasProjectId,
-    openDeleteProject: s.openDeleteProject,
-    closeDeleteProject: s.closeDeleteProject,
-    setDeleteProjectSubmitting: s.setDeleteProjectSubmitting,
-    clearProjectState: s.clearProjectState,
-  })));
 
   // Task store
-  const {
+  const tasks = useTaskStore((s) => s.tasks);
-    tasks,
+  const appendTask = useTaskStore((s) => s.appendTask);
-    appendTask,
+  const mergeServerTasks = useTaskStore((s) => s.mergeServerTasks);
-    mergeServerTasks,
+  const clearTasks = useTaskStore((s) => s.clearTasks);
-    clearTasks,
-  } = useTaskStore(useShallow((s) => ({
-    tasks: s.tasks,
-    appendTask: s.appendTask,
-    mergeServerTasks: s.mergeServerTasks,
-    clearTasks: s.clearTasks,
-  })));
 
   // App store
-  const {
+  const usage = useAppStore((s) => s.usage);
-    usage,
+  const runtimeNotifications = useAppStore((s) => s.runtimeNotifications);
-    runtimeNotifications,
+  const serverNotifications = useAppStore((s) => s.serverNotifications);
-    serverNotifications,
+  const activeView = useAppStore((s) => s.activeView);
-    activeView,
+  const workspaceExpanded = useAppStore((s) => s.workspaceExpanded);
-    workspaceExpanded,
+  const imageWorkbenchTool = useAppStore((s) => s.imageWorkbenchTool);
-    imageWorkbenchTool,
+  const pendingEcommerceTemplate = useAppStore((s) => s.pendingEcommerceTemplate);
-    pendingEcommerceTemplate,
+  const backendHealth = useAppStore((s) => s.backendHealth);
-    backendHealth,
+  const setUsage = useAppStore((s) => s.setUsage);
-    setUsage,
+  const pushNotification = useAppStore((s) => s.pushNotification);
-    pushNotification,
+  const setRuntimeNotifications = useAppStore((s) => s.setRuntimeNotifications);
-    setRuntimeNotifications,
+  const setServerNotifications = useAppStore((s) => s.setServerNotifications);
-    setServerNotifications,
+  const setView = useAppStore((s) => s.setView);
-    setView,
+  const setWorkspaceExpanded = useAppStore((s) => s.setWorkspaceExpanded);
-    setWorkspaceExpanded,
+  const setImageWorkbenchTool = useAppStore((s) => s.setImageWorkbenchTool);
-    setImageWorkbenchTool,
+  const setPendingEcommerceTemplate = useAppStore((s) => s.setPendingEcommerceTemplate);
-    setPendingEcommerceTemplate,
+  const setBackendHealth = useAppStore((s) => s.setBackendHealth);
-    setBackendHealth,
+  const markNotificationRead = useAppStore((s) => s.markNotificationRead);
-    markNotificationRead,
+  const markAllNotificationsRead = useAppStore((s) => s.markAllNotificationsRead);
-    markAllNotificationsRead,
+  const clearAppState = useAppStore((s) => s.clearAppState);
-    clearAppState,
-  } = useAppStore(useShallow((s) => ({
-    usage: s.usage,
-    runtimeNotifications: s.runtimeNotifications,
-    serverNotifications: s.serverNotifications,
-    activeView: s.activeView,
-    workspaceExpanded: s.workspaceExpanded,
-    imageWorkbenchTool: s.imageWorkbenchTool,
-    pendingEcommerceTemplate: s.pendingEcommerceTemplate,
-    backendHealth: s.backendHealth,
-    setUsage: s.setUsage,
-    pushNotification: s.pushNotification,
-    setRuntimeNotifications: s.setRuntimeNotifications,
-    setServerNotifications: s.setServerNotifications,
-    setView: s.setView,
-    setWorkspaceExpanded: s.setWorkspaceExpanded,
-    setImageWorkbenchTool: s.setImageWorkbenchTool,
-    setPendingEcommerceTemplate: s.setPendingEcommerceTemplate,
-    setBackendHealth: s.setBackendHealth,
-    markNotificationRead: s.markNotificationRead,
-    markAllNotificationsRead: s.markAllNotificationsRead,
-    clearAppState: s.clearAppState,
-  })));
 
   const [ecommerceEverMounted, setEcommerceEverMounted] = useState(false);
   const isEcommerceActive = activeView === "ecommerce" || activeView === "ecommerceHub";
@@ -378,12 +295,6 @@ function App() {
     if (isEcommerceActive && !ecommerceEverMounted) setEcommerceEverMounted(true);
   }, [isEcommerceActive]); // eslint-disable-line react-hooks/exhaustive-deps
 
-  useEffect(() => {
-    if (LEGACY_PAGE_STYLE_VIEWS.has(activeView) || ecommerceEverMounted) {
-      void loadLegacyPageStyles();
-    }
-  }, [activeView, ecommerceEverMounted]);
-
   // Dismiss boot splash after first render
   useEffect(() => {
     const splash = document.getElementById("app-boot-splash");

src/api/aiGenerationClient.ts

@@ -3,7 +3,6 @@ import {
   buildAuthHeaders,
   isRecord,
   readJsonResponse,
-  serverRequest,
   throwResponseError,
 } from "./serverConnection";
 import { isOptionalApiRouteMissing } from "./apiErrorUtils";
@@ -244,10 +243,6 @@ function emitImageRouteDebug(label: string, payload: Record<string, unknown>): v
 
 let taskHistoryRouteMissing = false;
 
-const TASK_SUBMIT_TIMEOUT_MS = 90_000;
-const TASK_STATUS_TIMEOUT_MS = 20_000;
-const NON_RETRYING_REQUEST = { maxRetries: 0 };
-
 export const aiGenerationClient = {
   async createImageTask(input: ImageGenInput): Promise<ImageTaskCreateResponse> {
     const requestUrl = buildApiUrl("ai/image");
@@ -261,13 +256,15 @@ export const aiGenerationClient = {
       projectId: input.projectId,
       conversationId: input.conversationId,
     });
-    const payload = await serverRequest<ImageTaskCreateResponse>("ai/image", {
+    const res = await fetch(requestUrl, {
       method: "POST",
-      body: input,
+      headers: buildAuthHeaders(),
-      timeoutMs: TASK_SUBMIT_TIMEOUT_MS,
+      body: JSON.stringify(input),
-      maxRetries: NON_RETRYING_REQUEST.maxRetries,
-      fallbackMessage: "Image generation request failed",
     });
+    if (!res.ok) {
+      await throwResponseError(res, "Image generation request failed");
+    }
+    const payload = await readJsonResponse<ImageTaskCreateResponse>(res, "Image generation response failed");
     if (payload.providerDebug) {
       emitImageRouteDebug("[ai/image-provider-debug]", payload.providerDebug as Record<string, unknown>);
     }
@@ -275,83 +272,96 @@ export const aiGenerationClient = {
   },
 
   async createVideoTask(input: VideoGenInput): Promise<{ taskId: string }> {
-    return serverRequest<{ taskId: string }>("ai/video", {
+    const res = await fetch(buildApiUrl("ai/video"), {
       method: "POST",
-      body: input,
+      headers: buildAuthHeaders(),
-      timeoutMs: TASK_SUBMIT_TIMEOUT_MS,
+      body: JSON.stringify(input),
-      maxRetries: NON_RETRYING_REQUEST.maxRetries,
-      fallbackMessage: "Video generation request failed",
     });
+    if (!res.ok) {
+      await throwResponseError(res, "Video generation request failed");
+    }
+    return readJsonResponse<{ taskId: string }>(res, "Video generation response failed");
   },
 
   async createVideoSuperResolveTask(input: VideoSuperResolveInput): Promise<{ taskId: string }> {
-    return serverRequest<{ taskId: string }>("ai/video/super-resolve", {
+    const res = await fetch(buildApiUrl("ai/video/super-resolve"), {
       method: "POST",
-      body: input,
+      headers: buildAuthHeaders(),
-      timeoutMs: TASK_SUBMIT_TIMEOUT_MS,
+      body: JSON.stringify(input),
-      maxRetries: NON_RETRYING_REQUEST.maxRetries,
-      fallbackMessage: "Video super-resolution request failed",
     });
+    if (!res.ok) {
+      await throwResponseError(res, "Video super-resolution request failed");
+    }
+    return readJsonResponse<{ taskId: string }>(res, "Video super-resolution response failed");
   },
 
   async createEraseSubtitlesTask(input: EraseSubtitlesInput): Promise<{ taskId: string }> {
-    return serverRequest<{ taskId: string }>("ai/video/erase-subtitles", {
+    const res = await fetch(buildApiUrl("ai/video/erase-subtitles"), {
       method: "POST",
-      body: input,
+      headers: buildAuthHeaders(),
-      timeoutMs: TASK_SUBMIT_TIMEOUT_MS,
+      body: JSON.stringify(input),
-      maxRetries: NON_RETRYING_REQUEST.maxRetries,
-      fallbackMessage: "Subtitle removal request failed",
     });
+    if (!res.ok) {
+      await throwResponseError(res, "Subtitle removal request failed");
+    }
+    return readJsonResponse<{ taskId: string }>(res, "Subtitle removal response failed");
   },
 
   async createVideoEditTask(input: VideoEditInput): Promise<{ taskId: string }> {
-    return serverRequest<{ taskId: string }>("ai/video/edit", {
+    const res = await fetch(buildApiUrl("ai/video/edit"), {
       method: "POST",
-      body: { ...input, model: input.model || "happyhorse-1.0-video-edit" },
+      headers: buildAuthHeaders(),
-      timeoutMs: TASK_SUBMIT_TIMEOUT_MS,
+      body: JSON.stringify({ ...input, model: input.model || "happyhorse-1.0-video-edit" }),
-      maxRetries: NON_RETRYING_REQUEST.maxRetries,
-      fallbackMessage: "Video edit request failed",
     });
+    if (!res.ok) {
+      await throwResponseError(res, "Video edit request failed");
+    }
+    return readJsonResponse<{ taskId: string }>(res, "Video edit response failed");
   },
 
   async createImageSuperResolveTask(input: ImageSuperResolveInput): Promise<{ taskId: string }> {
-    return serverRequest<{ taskId: string }>("ai/image/super-resolve", {
+    const res = await fetch(buildApiUrl("ai/image/super-resolve"), {
       method: "POST",
-      body: input,
+      headers: buildAuthHeaders(),
-      timeoutMs: TASK_SUBMIT_TIMEOUT_MS,
+      body: JSON.stringify(input),
-      maxRetries: NON_RETRYING_REQUEST.maxRetries,
-      fallbackMessage: "Image super-resolution request failed",
     });
+    if (!res.ok) {
+      await throwResponseError(res, "Image super-resolution request failed");
+    }
+    return readJsonResponse<{ taskId: string }>(res, "Image super-resolution response failed");
   },
 
   async createImageEditTask(input: ImageEditInput): Promise<{ taskId: string }> {
-    return serverRequest<{ taskId: string }>("ai/image/edit", {
+    const res = await fetch(buildApiUrl("ai/image/edit"), {
       method: "POST",
-      body: input,
+      headers: buildAuthHeaders(),
-      timeoutMs: TASK_SUBMIT_TIMEOUT_MS,
+      body: JSON.stringify(input),
-      maxRetries: NON_RETRYING_REQUEST.maxRetries,
-      fallbackMessage: "Image edit request failed",
     });
+    if (!res.ok) {
+      await throwResponseError(res, "Image edit request failed");
+    }
+    return readJsonResponse<{ taskId: string }>(res, "Image edit response failed");
   },
 
   async cancelTask(taskId: string): Promise<void> {
-    try {
+    const res = await fetch(buildApiUrl(`ai/tasks/${taskId}/cancel`), {
-      await serverRequest<void>(`ai/tasks/${taskId}/cancel`, {
+      method: "PATCH",
-        method: "PATCH",
+      headers: buildAuthHeaders(),
-        maxRetries: NON_RETRYING_REQUEST.maxRetries,
+    });
-        fallbackMessage: "Task cancel failed",
+    if (!res.ok && res.status !== 404) {
-      });
+      await throwResponseError(res, "Task cancel failed");
-    } catch (error) {
-      if (isOptionalApiRouteMissing(error)) return;
-      throw error;
     }
   },
 
   async getTaskStatus(taskId: string): Promise<AiTaskStatus> {
-    return serverRequest<AiTaskStatus>(`ai/tasks/${taskId}`, {
+    const res = await fetch(buildApiUrl(`ai/tasks/${taskId}`), {
-      timeoutMs: TASK_STATUS_TIMEOUT_MS,
+      method: "GET",
-      fallbackMessage: "Task status request failed",
+      headers: buildAuthHeaders(),
     });
+    if (!res.ok) {
+      await throwResponseError(res, "Task status request failed");
+    }
+    return readJsonResponse<AiTaskStatus>(res, "Task status response failed");
   },
 
   async downloadTaskResult(taskId: string): Promise<{ blob: Blob; filename?: string; contentType?: string }> {
@@ -377,41 +387,49 @@ export const aiGenerationClient = {
     if (params?.status) search.set("status", params.status);
     if (params?.type) search.set("type", params.type);
     if (params?.projectId) search.set("projectId", params.projectId);
-    try {
+    const res = await fetch(buildApiUrl(`ai/tasks${search.toString() ? `?${search}` : ""}`), {
-      const payload = await serverRequest<unknown>(`ai/tasks${search.toString() ? `?${search}` : ""}`, {
+      method: "GET",
-        fallbackMessage: "Task history request failed",
+      headers: buildAuthHeaders(),
-      });
+    });
-      return extractTaskList(payload).map(toPreviewTask);
+    if (!res.ok) {
-    } catch (error) {
+      try {
-      if (isOptionalApiRouteMissing(error)) {
+        await throwResponseError(res, "Task history request failed");
-        taskHistoryRouteMissing = true;
+      } catch (error) {
-        return [];
+        if (isOptionalApiRouteMissing(error)) {
+          taskHistoryRouteMissing = true;
+          return [];
+        }
+        throw error;
       }
-      throw error;
     }
+    const payload = await readJsonResponse<unknown>(res, "Task history response failed");
+    return extractTaskList(payload).map(toPreviewTask);
   },
 
   async bindTaskToConversation(taskId: string, conversationId: number): Promise<void> {
-    try {
+    const res = await fetch(buildApiUrl(`ai/tasks/${taskId}/conversation`), {
-      await serverRequest<void>(`ai/tasks/${taskId}/conversation`, {
+      method: "PATCH",
-        method: "PATCH",
+      headers: buildAuthHeaders(),
-        body: { conversationId },
+      body: JSON.stringify({ conversationId }),
-        maxRetries: NON_RETRYING_REQUEST.maxRetries,
+    });
-        fallbackMessage: "Task conversation binding failed",
+    if (res.status === 404) {
-      });
+      return;
-    } catch (error) {
+    }
-      if (isOptionalApiRouteMissing(error)) return;
+    if (!res.ok) {
-      throw error;
+      await throwResponseError(res, "Task conversation binding failed");
     }
   },
 
   async uploadAsset(input: UploadAssetInput): Promise<{ url: string; signedUrl?: string; ossKey?: string }> {
-    return serverRequest<{ url: string; signedUrl?: string; ossKey?: string }>("oss/upload", {
+    const res = await fetch(buildApiUrl("oss/upload"), {
       method: "POST",
-      body: input,
+      headers: buildAuthHeaders(),
-      maxRetries: NON_RETRYING_REQUEST.maxRetries,
+      body: JSON.stringify(input),
-      fallbackMessage: "Asset upload failed",
     });
+    if (!res.ok) {
+      await throwResponseError(res, "Asset upload failed");
+    }
+    return readJsonResponse<{ url: string; ossKey?: string }>(res, "Asset upload response failed");
   },
 
   async uploadAssetBinary(blob: Blob, options?: { name?: string; mimeType?: string; scope?: string }): Promise<{ url: string; signedUrl?: string; ossKey?: string }> {
@@ -433,12 +451,15 @@ export const aiGenerationClient = {
   },
 
   async uploadAssetByUrl(input: UploadAssetByUrlInput): Promise<{ url: string; signedUrl?: string; ossKey?: string }> {
-    return serverRequest<{ url: string; signedUrl?: string; ossKey?: string }>("oss/upload-by-url", {
+    const res = await fetch(buildApiUrl("oss/upload-by-url"), {
       method: "POST",
-      body: input,
+      headers: buildAuthHeaders(),
-      maxRetries: NON_RETRYING_REQUEST.maxRetries,
+      body: JSON.stringify(input),
-      fallbackMessage: "Asset upload by URL failed",
     });
+    if (!res.ok) {
+      await throwResponseError(res, "Asset upload by URL failed");
+    }
+    return readJsonResponse<{ url: string; ossKey?: string }>(res, "Asset upload by URL response failed");
   },
 
   subscribeTaskStatus(

src/api/bugFeedbackClient.ts

@@ -0,0 +1,32 @@
+import { serverRequest } from "./serverConnection";
+
+export interface BugFeedbackInput {
+  title: string;
+  description: string;
+  screenshotUrl?: string;
+}
+
+export interface BugFeedbackItem {
+  id: number;
+  title: string;
+  description: string;
+  screenshotUrl?: string | null;
+  status: "pending" | "approved" | "rejected";
+  adminNote?: string | null;
+  createdAt: string;
+}
+
+export const bugFeedbackClient = {
+  async submit(input: BugFeedbackInput): Promise<{ id: number; status: string; createdAt: string }> {
+    const payload = await serverRequest<{ feedback: { id: number; status: string; createdAt: string } }>(
+      "bug-feedback",
+      { method: "POST", body: input },
+    );
+    return payload.feedback;
+  },
+
+  async listMine(): Promise<BugFeedbackItem[]> {
+    const payload = await serverRequest<{ feedbacks?: BugFeedbackItem[] }>("bug-feedback/mine");
+    return Array.isArray(payload.feedbacks) ? payload.feedbacks : [];
+  },
+};

src/api/providerHealthClient.ts

@@ -1,4 +1,4 @@
-import { serverRequest } from "./serverConnection";
+import { buildApiUrl, buildAuthHeaders } from "./serverConnection";
 
 export interface ProviderHealthEntry {
   status: string;
@@ -32,8 +32,13 @@ export interface ProviderHealthResponse {
 
 export const providerHealthClient = {
   async getStatus(): Promise<ProviderHealthResponse> {
-    return serverRequest<ProviderHealthResponse>("admin/providers/status", {
+    const res = await fetch(buildApiUrl("admin/providers/status"), {
-      fallbackMessage: "Provider health request failed",
+      method: "GET",
+      headers: buildAuthHeaders(),
     });
+    if (!res.ok) {
+      throw new Error(`Provider health request failed (${res.status})`);
+    }
+    return res.json() as Promise<ProviderHealthResponse>;
   },
-};
+};

src/api/scriptEvalClient.ts

@@ -1,4 +1,4 @@
-import { serverRequest } from "./serverConnection";
+import { buildApiUrl, buildAuthHeaders } from "./serverConnection";
 
 export interface ScriptEvalResult {
   totalScore: number;
@@ -107,17 +107,6 @@ function isRecord(value: unknown): value is Record<string, unknown> {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
 
-function normalizeEvidenceItems(source: unknown[], limit: number): string[] {
-  const items: string[] = [];
-  for (const item of source) {
-    const value = String(item).trim();
-    if (!value) continue;
-    items.push(value);
-    if (items.length >= limit) break;
-  }
-  return items;
-}
-
 function normalizeNestedScores(value: unknown): Record<string, Record<string, number>> {
   if (!isRecord(value)) return {};
 
@@ -143,7 +132,7 @@ function normalizeEvidence(value: unknown): Record<string, string[]> {
     const source = value[dimensionKey] ?? (dimensionKey === "logic" ? value.dialogue : undefined);
     if (!Array.isArray(source)) continue;
 
-    const items = normalizeEvidenceItems(source, 3);
+    const items = source.map(String).map((item) => item.trim()).filter(Boolean).slice(0, 3);
     if (items.length > 0) normalized[dimensionKey] = items;
   }
 
@@ -151,13 +140,10 @@ function normalizeEvidence(value: unknown): Record<string, string[]> {
 }
 
 export async function evaluateScript(script: string, signal?: AbortSignal): Promise<ScriptEvalResult> {
-  const payload = await serverRequest<{
+  const res = await fetch(buildApiUrl("ai/chat"), {
-    content?: string;
-    choices?: Array<{ message?: { content?: string } }>;
-    text?: string;
-  }>("ai/chat", {
     method: "POST",
-    body: {
+    headers: buildAuthHeaders(),
+    body: JSON.stringify({
       model: MODEL,
       messages: [
         { role: "system", content: EVAL_SYSTEM_PROMPT },
@@ -167,13 +153,16 @@ export async function evaluateScript(script: string, signal?: AbortSignal): Prom
       stream: false,
       temperature: 0.3,
       max_tokens: 4096,
-    },
+    }),
     signal,
-    timeoutMs: 180_000,
-    maxRetries: 0,
-    fallbackMessage: "评测请求失败",
   });
 
+  if (!res.ok) {
+    const errText = await res.text().catch(() => "");
+    throw new Error(`评测请求失败 (${res.status}): ${errText.slice(0, 200)}`);
+  }
+
+  const payload = await res.json();
   const content: string = payload?.content ?? payload?.choices?.[0]?.message?.content ?? payload?.text ?? "";
 
   if (!content) throw new Error("模型未返回有效内容");

src/api/serverConnection.ts

@@ -22,9 +22,6 @@ export interface ServerRequestOptions {
   signal?: AbortSignal;
   /** Per-request timeout in ms. Defaults to DEFAULT_REQUEST_TIMEOUT_MS. Pass 0 to disable. */
   timeoutMs?: number;
-  /** Defaults to 2. Use 0 for non-idempotent task submission endpoints. */
-  maxRetries?: number;
-  fallbackMessage?: string;
 }
 
 export const DEFAULT_REQUEST_TIMEOUT_MS = 30_000;
@@ -346,10 +343,8 @@ const MAX_RETRIES = 2;
 export async function serverRequest<T>(path: string, options?: ServerRequestOptions): Promise<T> {
   let lastError: unknown;
   const timeoutMs = options?.timeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
-  const maxRetries = options?.maxRetries ?? MAX_RETRIES;
-  const fallbackMessage = options?.fallbackMessage || "Request failed";
 
-  for (let attempt = 0; attempt <= maxRetries; attempt++) {
+  for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
     const controller = timeoutMs > 0 ? new AbortController() : null;
     const timeoutId =
       controller && typeof window !== "undefined"
@@ -371,11 +366,11 @@ export async function serverRequest<T>(path: string, options?: ServerRequestOpti
         credentials: "include",
       });
 
-      const payload = await readJsonResponse<unknown>(response, fallbackMessage);
+      const payload = await readJsonResponse<unknown>(response, "Request failed");
       return (options?.raw ? payload : unwrapApiPayload(payload)) as T;
     } catch (error) {
       lastError = error;
-      if (attempt < maxRetries && isRetryable(error) && !options?.signal?.aborted) {
+      if (attempt < MAX_RETRIES && isRetryable(error) && !options?.signal?.aborted) {
         await new Promise((r) => setTimeout(r, getRetryDelay(attempt, error)));
         continue;
       }

src/components/AppShell.tsx

@@ -1,6 +1,7 @@
 import {
   ArrowDownOutlined,
   ArrowUpOutlined,
+  BugOutlined,
   CheckCircleOutlined,
   FlagOutlined,
   InfoCircleOutlined,
@@ -14,6 +15,7 @@ import { useEffect, useMemo, useRef, useState } from "react";
 import type { ReactNode } from "react";
 import { publicConfigClient, type WebPublicConfig } from "../api/publicConfigClient";
 import { toast } from "./toast/toastStore";
+import { BugFeedbackModal } from "./BugFeedbackModal";
 import type { ServerConnectionHealth } from "../api/serverConnection";
 import { ossAssets } from "../data/ossAssets";
 import { canManageCommunityCases, canReviewCommunity } from "../features/community-review/communityPermissions";
@@ -41,32 +43,6 @@ interface AppShellProps {
 }
 
 const BRAND_LOGO_URL = ossAssets.brand.logo;
-const TOOL_SURFACE_VIEW_SET = new Set<WebViewKey>([
-  "workbench",
-  "canvas",
-  "more",
-  "scriptTokens",
-  "tokenUsage",
-  "ecommerceTemplates",
-  "sizeTemplate",
-  "imageWorkbench",
-  "resolutionUpscale",
-  "digitalHuman",
-  "dialogGenerator",
-  "avatarConsole",
-  "characterMix",
-] as WebViewKey[]);
-const PRIMARY_NAV_ORDER: WebViewKey[] = [
-  "workbench",
-  "ecommerce",
-  "sizeTemplate",
-  "canvas",
-  "scriptTokens",
-  "tokenUsage",
-  "community",
-  "assets",
-  "more",
-];
 
 function formatBalance(cents: number): string {
   const value = Math.max(0, cents) / 100;
@@ -94,6 +70,7 @@ function AppShell({
   const [profileOpen, setProfileOpen] = useState(false);
   const [rechargeOpen, setRechargeOpen] = useState(false);
   const [infoOpen, setInfoOpen] = useState(false);
+  const [bugFeedbackOpen, setBugFeedbackOpen] = useState(false);
   const infoRef = useRef<HTMLDivElement>(null);
   const [openSubmenuKey, setOpenSubmenuKey] = useState<WebViewKey | null>(null);
   const [publicConfig, setPublicConfig] = useState<WebPublicConfig>({});
@@ -102,11 +79,37 @@ function AppShell({
   const isAuthView = activeView === "login";
   const isImmersiveView = activeView === "agent" || activeView === "avatarConsole";
   const showFloatingNav = (!isAuthView || !!session) && !isImmersiveView && activeView !== "home";
-  const showPageScrollActions = showFloatingNav && !TOOL_SURFACE_VIEW_SET.has(activeView);
+  const toolSurfaceViews = [
+    "workbench",
+    "canvas",
+    "more",
+    "scriptTokens",
+    "tokenUsage",
+    "ecommerceTemplates",
+    "sizeTemplate",
+    "imageWorkbench",
+    "resolutionUpscale",
+    "digitalHuman",
+    "dialogGenerator",
+    "avatarConsole",
+    "characterMix",
+  ] as WebViewKey[];
+  const showPageScrollActions = showFloatingNav && !toolSurfaceViews.includes(activeView);
 
   const visibleNavItems = useMemo(
     () => {
-      return PRIMARY_NAV_ORDER
+      const orderedKeys: WebViewKey[] = [
+        "workbench",
+        "ecommerce",
+        "sizeTemplate",
+        "canvas",
+        "scriptTokens",
+        "tokenUsage",
+        "community",
+        "assets",
+        "more",
+      ];
+      return orderedKeys
         .map((key) => navItems.find((item) => item.key === key))
         .filter((item): item is WebNavItem => Boolean(item));
     },
@@ -343,6 +346,11 @@ function AppShell({
                   onMarkAllRead={onMarkAllNotificationsRead}
                 />
               )}
+              {session && (
+                <button className="info-button" type="button" aria-label="Bug反馈" title="Bug反馈" onClick={() => setBugFeedbackOpen(true)}>
+                  <BugOutlined />
+                </button>
+              )}
               <div className="info-popover-anchor" ref={infoRef}>
                 <button
                   className="info-button"
@@ -491,6 +499,7 @@ function AppShell({
       </div>
       {session?.user.role === "admin" ? <AdminMonitor /> : null}
       <RechargeModal open={rechargeOpen} onClose={() => setRechargeOpen(false)} currentBalance={displayedBalanceCents} />
+      <BugFeedbackModal open={bugFeedbackOpen} onClose={() => setBugFeedbackOpen(false)} />
       <CookieConsentBanner />
     </div>
   );

src/components/BugFeedbackModal.tsx

@@ -0,0 +1,131 @@
+import { useCallback, useEffect, useRef, useState } from "react";
+import { BugOutlined, CameraOutlined, CloseOutlined } from "@ant-design/icons";
+import { bugFeedbackClient, type BugFeedbackItem } from "../api/bugFeedbackClient";
+import { uploadAssetWithProgress } from "../api/uploadWithProgress";
+import { toast } from "./toast/toastStore";
+
+interface BugFeedbackModalProps {
+  open: boolean;
+  onClose: () => void;
+}
+
+export function BugFeedbackModal({ open, onClose }: BugFeedbackModalProps) {
+  const [tab, setTab] = useState<"submit" | "history">("submit");
+  const [title, setTitle] = useState("");
+  const [description, setDescription] = useState("");
+  const [screenshotUrl, setScreenshotUrl] = useState<string | null>(null);
+  const [uploading, setUploading] = useState(false);
+  const [submitting, setSubmitting] = useState(false);
+  const [history, setHistory] = useState<BugFeedbackItem[]>([]);
+  const [historyLoading, setHistoryLoading] = useState(false);
+  const fileInputRef = useRef<HTMLInputElement>(null);
+  const backdropRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    if (open && tab === "history") loadHistory();
+  }, [open, tab]);
+
+  const loadHistory = useCallback(async () => {
+    setHistoryLoading(true);
+    try {
+      const items = await bugFeedbackClient.listMine();
+      setHistory(items);
+    } catch { /* silent */ }
+    finally { setHistoryLoading(false); }
+  }, []);
+
+  const handleScreenshot = useCallback(async (e: React.ChangeEvent<HTMLInputElement>) => {
+    const file = e.target.files?.[0];
+    if (!file) return;
+    setUploading(true);
+    try {
+      const reader = new FileReader();
+      const dataUrl = await new Promise<string>((resolve) => {
+        reader.onload = () => resolve(reader.result as string);
+        reader.readAsDataURL(file);
+      });
+      const result = await uploadAssetWithProgress({ dataUrl, name: file.name, scope: "bug-feedback" });
+      setScreenshotUrl(result.url);
+    } catch { toast.error("截图上传失败"); }
+    finally { setUploading(false); }
+  }, []);
+
+  const handleSubmit = useCallback(async () => {
+    if (!title.trim()) { toast.error("请输入标题"); return; }
+    if (!description.trim()) { toast.error("请输入问题描述"); return; }
+    setSubmitting(true);
+    try {
+      await bugFeedbackClient.submit({ title: title.trim(), description: description.trim(), screenshotUrl: screenshotUrl || undefined });
+      toast.success("反馈提交成功，审核通过后将奖励 1 积分");
+      setTitle("");
+      setDescription("");
+      setScreenshotUrl(null);
+      onClose();
+    } catch (err: unknown) {
+      toast.error(err instanceof Error ? err.message : "提交失败");
+    } finally { setSubmitting(false); }
+  }, [title, description, screenshotUrl, onClose]);
+
+  if (!open) return null;
+
+  return (
+    <div className="bug-feedback-overlay" ref={backdropRef} onClick={(e) => { if (e.target === backdropRef.current) onClose(); }}>
+      <div className="bug-feedback-modal" role="dialog" aria-modal="true" aria-label="Bug反馈">
+        <div className="bug-feedback-modal__header">
+          <div className="bug-feedback-modal__tabs">
+            <button type="button" className={tab === "submit" ? "is-active" : ""} onClick={() => setTab("submit")}>提交反馈</button>
+            <button type="button" className={tab === "history" ? "is-active" : ""} onClick={() => setTab("history")}>我的反馈</button>
+          </div>
+          <button type="button" className="bug-feedback-modal__close" onClick={onClose} aria-label="关闭"><CloseOutlined /></button>
+        </div>
+        {tab === "submit" && (
+          <div className="bug-feedback-modal__form">
+            <p className="bug-feedback-modal__tip"><BugOutlined /> 提交有效 Bug 反馈，审核通过奖励 1 积分</p>
+            <label className="bug-feedback-modal__label">标题</label>
+            <input className="bug-feedback-modal__input" value={title} onChange={(e) => setTitle(e.target.value)} placeholder="简述遇到的问题" maxLength={200} />
+            <label className="bug-feedback-modal__label">问题描述</label>
+            <textarea className="bug-feedback-modal__textarea" value={description} onChange={(e) => setDescription(e.target.value)} placeholder="详细描述操作步骤、预期结果和实际结果" maxLength={5000} rows={5} />
+            <label className="bug-feedback-modal__label">截图（可选）</label>
+            <div className="bug-feedback-modal__screenshot">
+              {screenshotUrl ? (
+                <div className="bug-feedback-modal__preview">
+                  <img src={screenshotUrl} alt="截图预览" />
+                  <button type="button" onClick={() => setScreenshotUrl(null)}>移除</button>
+                </div>
+              ) : (
+                <button type="button" className="bug-feedback-modal__upload-btn" onClick={() => fileInputRef.current?.click()} disabled={uploading}>
+                  <CameraOutlined /> {uploading ? "上传中..." : "添加截图"}
+                </button>
+              )}
+              <input ref={fileInputRef} type="file" accept="image/*" hidden onChange={handleScreenshot} />
+            </div>
+            <button type="button" className="bug-feedback-modal__submit" disabled={submitting} onClick={handleSubmit}>
+              {submitting ? "提交中..." : "提交反馈"}
+            </button>
+          </div>
+        )}
+        {tab === "history" && (
+          <div className="bug-feedback-modal__history">
+            {historyLoading ? <p className="bug-feedback-modal__empty">加载中...</p> : history.length === 0 ? <p className="bug-feedback-modal__empty">暂无反馈记录</p> : (
+              <ul className="bug-feedback-modal__list">
+                {history.map((item) => (
+                  <li key={item.id} className="bug-feedback-modal__item">
+                    <div className="bug-feedback-modal__item-head">
+                      <span className="bug-feedback-modal__item-title">{item.title}</span>
+                      <span className={`bug-feedback-modal__status bug-feedback-modal__status--${item.status}`}>
+                        {item.status === "pending" ? "审核中" : item.status === "approved" ? "已通过 +1积分" : "未通过"}
+                      </span>
+                    </div>
+                    <p className="bug-feedback-modal__item-desc">{item.description}</p>
+                    {item.adminNote && <p className="bug-feedback-modal__item-note">回复：{item.adminNote}</p>}
+                    <span className="bug-feedback-modal__item-date">{new Date(item.createdAt).toLocaleDateString()}</span>
+                  </li>
+                ))}
+              </ul>
+            )}
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}

src/components/NotFoundPage.tsx

@@ -1,6 +1,5 @@
 import { HomeOutlined } from "@ant-design/icons";
 import { useCallback } from "react";
-import "../styles/pages/not-found.css";
 
 interface NotFoundPageProps {
   onGoHome: () => void;

src/features/agent/AgentPage.tsx

@@ -14,7 +14,6 @@ import {
   ThunderboltOutlined,
 } from "@ant-design/icons";
 import { useRef, useState } from "react";
-import "../../styles/pages/agent.css";
 import WorkspacePageShell from "../../components/WorkspacePageShell";
 import type { WebGenerationPreviewTask } from "../../types";
 

src/features/assets/AssetsPage.tsx

@@ -11,7 +11,6 @@ import {
   UserOutlined,
 } from "@ant-design/icons";
 import { useCallback, useEffect, useMemo, useRef, useState, type JSX } from "react";
-import "../../styles/pages/assets.css";
 import { assetClient, type ServerAssetItem } from "../../api/assetClient";
 import { aiGenerationClient } from "../../api/aiGenerationClient";
 import { useDebounce } from "../../hooks/useDebounce";

src/features/canvas/CanvasMarkingPopover.tsx

@@ -1,40 +0,0 @@
-interface CanvasMarkingPopoverProps {
-  value?: string;
-  placeholder: string;
-  onChange: (value: string) => void;
-  onClear: () => void;
-  onDone: () => void;
-}
-
-export function CanvasMarkingPopover({
-  value,
-  placeholder,
-  onChange,
-  onClear,
-  onDone,
-}: CanvasMarkingPopoverProps) {
-  return (
-    <div
-      className="studio-canvas-marking-popover"
-      onMouseDown={(event) => event.stopPropagation()}
-      onClick={(event) => event.stopPropagation()}
-    >
-      <textarea
-        className="studio-canvas-marking-input"
-        placeholder={placeholder}
-        value={value || ""}
-        onChange={(event) => onChange(event.target.value)}
-      />
-      <div className="studio-canvas-marking-actions">
-        {value ? (
-          <button type="button" className="studio-canvas-marking-clear" onClick={onClear}>
-            清除
-          </button>
-        ) : null}
-        <button type="button" className="studio-canvas-marking-done" onClick={onDone}>
-          完成
-        </button>
-      </div>
-    </div>
-  );
-}

src/features/canvas/CanvasPage.tsx

@@ -28,13 +28,10 @@
 import {
   ReactFlow,
 } from "@xyflow/react";
-import "@xyflow/react/dist/style.css";
-import "../../styles/pages/canvas.css";
 import { useCallback, useEffect, useMemo, useRef, useState, type ChangeEvent, type CSSProperties, type MouseEvent, type WheelEvent } from "react";
 import { aiGenerationClient } from "../../api/aiGenerationClient";
 import { assetClient, type ServerAssetItem } from "../../api/assetClient";
 import { communityClient } from "../../api/communityClient";
-import { modelCapabilitiesClient } from "../../api/modelCapabilitiesClient";
 import type { CreatePreviewTaskInput } from "../../api/webGenerationGateway";
 import WorkspacePageShell from "../../components/WorkspacePageShell";
 import type {
@@ -55,7 +52,6 @@ import { useCanvasHistory, type CanvasHistorySnapshot } from "./useCanvasHistory
 import { useCanvasKeyboard } from "./useCanvasKeyboard";
 import { useCanvasNodeDrag } from "./useCanvasNodeDrag";
 import { useCanvasGeneration, addCanvasGenKeepalive, removeCanvasGenKeepalive } from "./useCanvasGeneration";
-import { useCanvasAssetSummary, useCanvasVisibleNodes } from "./useCanvasDerivedState";
 import {
   toHappyHorseDisplayModel,
 } from "../../utils/happyHorseRouting";
@@ -122,7 +118,7 @@ import {
   defaultVideoModel,
   image4kCapableModels,
   imageFocusRatioOptions,
-  imageModelOptions as fallbackCanvasImageModelOptions,
+  imageModelOptions,
   imageRatioOptions,
   textModelOptions,
   videoDurationOptions,
@@ -186,8 +182,6 @@ import {
 } from "./canvasWorkflowDeserialize";
 import { CanvasNodeToolbar, CanvasNodeVideoPlayer, CanvasSelectChip } from "./canvasComponents";
 import type { CanvasNodeToolbarAction } from "./canvasComponents";
-import { CanvasMarkingPopover } from "./CanvasMarkingPopover";
-import { CanvasPromptMentionTextarea, CanvasTextPromptComposer } from "./CanvasTextPromptComposer";
 import { CanvasMultiGridPanel, CanvasUpscalePanel, CanvasInpaintPanel } from "./canvasToolPanels";
 import { CanvasSmoothedProgressRing } from "./CanvasSmoothedProgressRing";
 
@@ -199,6 +193,7 @@ const canvasEnterpriseVideoModelOptions: CanvasOption[] = ENTERPRISE_VIDEO_MODEL
 // --- Canvas generation keep-alive (survives page refresh / view switch) ---
 
 const MENTION_TOKEN_RE = /@(?:图片|视频|文本)\d+/g;
+const MENTION_BOUNDARY_RE = /\s|[，。、；：！？?(){}[\]<>]/;
 
 function buildNodeMentionOptions(
   kind: CanvasNodeKind,
@@ -359,8 +354,6 @@ function CanvasPage({
   const [projectNameEditing, setProjectNameEditing] = useState(false);
   const [videoNodeMenu, setVideoNodeMenu] = useState<{ left: number; top: number; nodeId: string } | null>(null);
   const [videoNodes, setVideoNodes] = useState<CanvasVideoNode[]>([]);
-  const [canvasImageModelOptions, setCanvasImageModelOptions] = useState<CanvasOption[]>(fallbackCanvasImageModelOptions);
-  const [canvasVideoModelOptions, setCanvasVideoModelOptions] = useState<CanvasOption[]>(canvasEnterpriseVideoModelOptions);
   const [selectedNode, setSelectedNode] = useState<CanvasSelectedNode | null>(null);
   const [selectedNodes, setSelectedNodes] = useState<CanvasSelectedNode[]>([]);
   const [selectionContextMenu, setSelectionContextMenu] = useState<CanvasFloatingMenuPosition | null>(null);
@@ -401,12 +394,10 @@ function CanvasPage({
   const suppressNextPaneClickRef = useRef(false);
   const canvasAutoSaveTimerRef = useRef<number | null>(null);
   const canvasAutoSaveIdleHandleRef = useRef<number | null>(null);
-  const canvasAutoSaveRetryTimerRef = useRef<number | null>(null);
   const canvasAutoSaveInFlightRef = useRef(false);
   const canvasAutoSavePendingRef = useRef(false);
   const lastAutoSavedWorkflowFingerprintRef = useRef("");
   const canvasAutoSaveHydrationRef = useRef(true);
-  const textNodeMentionFocusTimerRef = useRef<number | null>(null);
   const textNodeIdRef = useRef(9);
   const imageNodeIdRef = useRef(1);
   const videoNodeIdRef = useRef(1);
@@ -467,39 +458,9 @@ function CanvasPage({
     callbacksRef: dragCallbacksRef,
     suppressNextPaneClickRef,
   });
-
-  useEffect(() => {
-    let cancelled = false;
-
-    if (!isAuthenticated) {
-      setCanvasImageModelOptions(fallbackCanvasImageModelOptions);
-      setCanvasVideoModelOptions(canvasEnterpriseVideoModelOptions);
-      return () => {
-        cancelled = true;
-      };
-    }
-
-    modelCapabilitiesClient
-      .get()
-      .then((capabilities) => {
-        if (cancelled) return;
-        setCanvasImageModelOptions(capabilities.imageModels.length ? capabilities.imageModels : fallbackCanvasImageModelOptions);
-        setCanvasVideoModelOptions(capabilities.videoModels.length ? capabilities.videoModels : canvasEnterpriseVideoModelOptions);
-      })
-      .catch(() => {
-        if (cancelled) return;
-        setCanvasImageModelOptions(fallbackCanvasImageModelOptions);
-        setCanvasVideoModelOptions(canvasEnterpriseVideoModelOptions);
-      });
-
-    return () => {
-      cancelled = true;
-    };
-  }, [isAuthenticated]);
-
   const visibleImageModelOptions = useMemo(
-    () => filterImageModelOptionsForSession(canvasImageModelOptions, session),
+    () => filterImageModelOptionsForSession(imageModelOptions, session),
-    [canvasImageModelOptions, session],
+    [session],
   );
   const fallbackVisibleImageModel = visibleImageModelOptions[0]?.value || defaultImageModel;
   const resolveVisibleImageModel = useCallback(
@@ -525,11 +486,7 @@ function CanvasPage({
     else if (kind === "video") updateVideoNodePrompt(nodeId, nextValue);
     else updateTextNodePrompt(nodeId, nextValue);
     closeTextNodeMention(nodeId);
-    if (textNodeMentionFocusTimerRef.current !== null) {
+    setTimeout(() => {
-      window.clearTimeout(textNodeMentionFocusTimerRef.current);
-    }
-    textNodeMentionFocusTimerRef.current = window.setTimeout(() => {
-      textNodeMentionFocusTimerRef.current = null;
       if (textarea) {
         textarea.focus();
         textarea.setSelectionRange(nextCaret, nextCaret);
@@ -565,22 +522,10 @@ function CanvasPage({
   const [autoSaveStatus, setAutoSaveStatus] = useState<"saved" | "saving" | "error" | "idle">("idle");
   const autoSaveStatusTimerRef = useRef<number | null>(null);
 
-  useEffect(() => {
-    return () => {
-      if (canvasAutoSaveTimerRef.current !== null) window.clearTimeout(canvasAutoSaveTimerRef.current);
-      if (canvasAutoSaveRetryTimerRef.current !== null) window.clearTimeout(canvasAutoSaveRetryTimerRef.current);
-      if (autoSaveStatusTimerRef.current !== null) window.clearTimeout(autoSaveStatusTimerRef.current);
-      if (textNodeMentionFocusTimerRef.current !== null) window.clearTimeout(textNodeMentionFocusTimerRef.current);
-      if (canvasAutoSaveIdleHandleRef.current !== null && "cancelIdleCallback" in window) {
-        window.cancelIdleCallback(canvasAutoSaveIdleHandleRef.current);
-      }
-    };
-  }, []);
-
   // Save immediately when user leaves page or switches tab (placed after runCanvasAutoSave definition)
   // — see useEffect below near runCanvasAutoSave
 
-  const { canvasAssets, assetCountsByCategory } = useCanvasAssetSummary(serverAssets);
+  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;
@@ -2642,17 +2587,13 @@ function CanvasPage({
     setConnectorDrag(null);
   };
 
-  const {
+  const collapsedPackageNodeKeys = new Set(
-    isNodeCollapsedInPackage,
+    nodePackages.flatMap((nodePackage) =>
-    visibleTextNodes,
+      nodePackage.collapsed ? nodePackage.nodeIds.map((node) => getCanvasSelectionKey(node)) : []
-    visibleImageNodes,
+    )
-    visibleVideoNodes,
+  );
-  } = useCanvasVisibleNodes({
+  const isNodeCollapsedInPackage = (kind: CanvasNodeKind, id: string) =>
-    textNodes,
+    collapsedPackageNodeKeys.has(getCanvasSelectionKey({ kind, id }));
-    imageNodes,
-    videoNodes,
-    nodePackages,
-  });
   const isLinkCollapsedInPackage = (link: { sourceKind: CanvasNodeKind; sourceNodeId: string; targetKind: CanvasNodeKind; targetNodeId: string }) =>
     isNodeCollapsedInPackage(link.sourceKind, link.sourceNodeId) ||
     isNodeCollapsedInPackage(link.targetKind, link.targetNodeId);
@@ -2933,6 +2874,10 @@ function CanvasPage({
       return;
     }
 
+    closeNodeContextMenus();
+    setContextMenu(null);
+    setSelectionContextMenu(null);
+
     const point = getCanvasPointFromClient(event.clientX, event.clientY);
     const zoomDelta = event.deltaY < 0 ? 1.08 : 0.92;
     setCanvasViewport((viewport) => {
@@ -3185,13 +3130,7 @@ function CanvasPage({
       canvasAutoSaveInFlightRef.current = false;
       if (canvasAutoSavePendingRef.current) {
         canvasAutoSavePendingRef.current = false;
-        if (canvasAutoSaveRetryTimerRef.current !== null) {
+        window.setTimeout(() => void runCanvasAutoSave(), canvasAutoSaveIdleTimeoutMs);
-          window.clearTimeout(canvasAutoSaveRetryTimerRef.current);
-        }
-        canvasAutoSaveRetryTimerRef.current = window.setTimeout(() => {
-          canvasAutoSaveRetryTimerRef.current = null;
-          void runCanvasAutoSave();
-        }, canvasAutoSaveIdleTimeoutMs);
       }
     }
   }, [
@@ -3260,13 +3199,7 @@ function CanvasPage({
         );
         return;
       }
-      if (canvasAutoSaveRetryTimerRef.current !== null) {
+      window.setTimeout(() => void runCanvasAutoSave(), canvasAutoSaveIdleTimeoutMs);
-        window.clearTimeout(canvasAutoSaveRetryTimerRef.current);
-      }
-      canvasAutoSaveRetryTimerRef.current = window.setTimeout(() => {
-        canvasAutoSaveRetryTimerRef.current = null;
-        void runCanvasAutoSave();
-      }, canvasAutoSaveIdleTimeoutMs);
     }, canvasAutoSaveDebounceMs);
 
     return () => {
@@ -3278,10 +3211,6 @@ function CanvasPage({
         window.cancelIdleCallback(canvasAutoSaveIdleHandleRef.current);
         canvasAutoSaveIdleHandleRef.current = null;
       }
-      if (canvasAutoSaveRetryTimerRef.current !== null) {
-        window.clearTimeout(canvasAutoSaveRetryTimerRef.current);
-        canvasAutoSaveRetryTimerRef.current = null;
-      }
     };
   }, [
     isAuthenticated,
@@ -4008,7 +3937,7 @@ function CanvasPage({
               ) : null}
             </svg>
           ) : null}
-          {visibleTextNodes.map((textNode) => {
+          {textNodes.filter((textNode) => !isNodeCollapsedInPackage("text", textNode.id)).map((textNode) => {
             const textNodeSelected = isSelectedNode("text", textNode.id);
             const textNodeActive = isActiveSelectedNode("text", textNode.id);
             const textNodeResizing = nodeResizeDrag?.kind === "text" && nodeResizeDrag.nodeId === textNode.id;
@@ -4157,26 +4086,126 @@ function CanvasPage({
                     onMouseDown={(event) => handleNodeResizeStart(event, "text", textNode.id, textNode.size)}
                   />
                 </div>
-                {textNodeActive && !isCanvasNodeMoving ? (
+                {textNodeActive && !isCanvasNodeMoving ? (() => {
-                  <CanvasTextPromptComposer
+                  const mentionOptions = buildNodeMentionOptions("text", textNode.id, imageNodes, videoNodes, textNodes, getIncomingCanvasPorts, manualLinks);
-                    nodeId={textNode.id}
+                  const mentionState = textNodeMentionStates[textNode.id] || { open: false, query: "", start: 0, caret: 0, activeIndex: 0 };
-                    prompt={textNode.prompt}
+                  const filteredMentions = mentionState.open
-                    canGenerate={textNodeCanGenerate}
+                    ? mentionOptions.filter((o) => !mentionState.query || o.searchText.includes(mentionState.query.toLowerCase()))
-                    isGenerating={textNodeGenerating}
+                    : [];
-                    mentionOptions={buildNodeMentionOptions("text", textNode.id, imageNodes, videoNodes, textNodes, getIncomingCanvasPorts, manualLinks)}
+
-                    mentionState={textNodeMentionStates[textNode.id]}
+                  const handlePromptChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
-                    onPromptChange={updateTextNodePrompt}
+                    const value = e.target.value;
-                    onMentionStateChange={setTextNodeMentionStates}
+                    const caret = e.target.selectionStart || 0;
-                    onCloseMention={closeTextNodeMention}
+                    updateTextNodePrompt(textNode.id, value);
-                    onInsertMention={insertTextNodeMention}
+
-                    onGenerate={handleGenerateTextNode}
+                    // Detect @-mention trigger
-                  />
+                    const beforeCaret = value.slice(0, caret);
-                ) : null}
+                    const atIdx = beforeCaret.lastIndexOf("@");
+                    if (atIdx >= 0) {
+                      const query = beforeCaret.slice(atIdx + 1);
+                      if (!MENTION_BOUNDARY_RE.test(query) && !query.includes(" ")) {
+                        setTextNodeMentionStates((prev) => ({ ...prev, [textNode.id]: { open: true, query, start: atIdx, caret, activeIndex: 0 } }));
+                        return;
+                      }
+                    }
+                    closeTextNodeMention(textNode.id);
+                  };
+
+                  const handlePromptKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
+                    if (!mentionState.open || filteredMentions.length === 0) return;
+                    if (e.key === "ArrowDown") {
+                      e.preventDefault();
+                      setTextNodeMentionStates((prev) => ({ ...prev, [textNode.id]: { ...mentionState, activeIndex: (mentionState.activeIndex + 1) % filteredMentions.length } }));
+                    } else if (e.key === "ArrowUp") {
+                      e.preventDefault();
+                      setTextNodeMentionStates((prev) => ({ ...prev, [textNode.id]: { ...mentionState, activeIndex: (mentionState.activeIndex - 1 + filteredMentions.length) % filteredMentions.length } }));
+                    } else if (e.key === "Enter" || e.key === "Tab") {
+                      e.preventDefault();
+                      const opt = filteredMentions[mentionState.activeIndex];
+                      if (opt) {
+                        const ta = e.currentTarget;
+                        insertTextNodeMention(textNode.id, opt, ta);
+                      }
+                    } else if (e.key === "Escape") {
+                      e.preventDefault();
+                      closeTextNodeMention(textNode.id);
+                    }
+                  };
+
+                  const handlePromptSelect = (e: React.SyntheticEvent<HTMLTextAreaElement>) => {
+                    const ta = e.currentTarget;
+                    const caret = ta.selectionStart || 0;
+                    setTextNodeMentionStates((prev) => {
+                      const cur = prev[textNode.id];
+                      if (!cur?.open) return prev;
+                      return { ...prev, [textNode.id]: { ...cur, caret } };
+                    });
+                  };
+
+                  return (
+                  <div className="studio-canvas-text-composer">
+                    <div className="studio-canvas-text-composer__input-wrap">
+                    <textarea
+                      value={textNode.prompt}
+                      onMouseDown={(event) => event.stopPropagation()}
+                      onChange={handlePromptChange}
+                      onKeyDown={handlePromptKeyDown}
+                      onSelect={handlePromptSelect}
+                      placeholder="写下你想讲的故事、场景或角色设定。@引用连接的节点"
+                    />
+                    {mentionState.open ? (
+                      <div className="studio-canvas-mention-panel">
+                        {filteredMentions.length > 0 ? filteredMentions.map((opt, idx) => (
+                          <button
+                            key={opt.token}
+                            type="button"
+                            className={`studio-canvas-mention-item${idx === mentionState.activeIndex ? " is-active" : ""}`}
+                            onMouseDown={(e) => { e.preventDefault(); const ta = e.currentTarget.closest(".studio-canvas-text-composer")?.querySelector("textarea") || null; insertTextNodeMention(textNode.id, opt, ta as HTMLTextAreaElement | null); }}
+                          >
+                            <span className="studio-canvas-mention-thumb">
+                              {opt.kind === "image" && opt.previewUrl ? <img src={opt.previewUrl} alt="" /> : opt.kind === "image" ? "🖼" : opt.kind === "video" ? "🎬" : "📝"}
+                            </span>
+                            <span className="studio-canvas-mention-label">{opt.nodeTitle}</span>
+                            <span className="studio-canvas-mention-token">{opt.token}</span>
+                          </button>
+                        )) : (
+                          <div className="studio-canvas-mention-item" style={{ opacity: 0.5, pointerEvents: "none" }}>
+                            <span className="studio-canvas-mention-label">没有可引用的连接节点</span>
+                          </div>
+                        )}
+                      </div>
+                    ) : null}
+                    </div>
+                  <div className="studio-canvas-text-composer__footer">
+                    <button
+                      type="button"
+                      className={`studio-canvas-text-composer__send studio-canvas-generate-button${textNodeCanGenerate && !textNodeGenerating ? " is-ready" : ""}`}
+                      title={textNodeGenerating ? "生成中" : "生成"}
+                      disabled={textNodeGenerating || !textNodeCanGenerate}
+                      aria-busy={textNodeGenerating}
+                      onMouseDown={(event) => {
+                        event.preventDefault();
+                        event.stopPropagation();
+                        if (!textNodeGenerating && textNodeCanGenerate) {
+                          void handleGenerateTextNode(textNode.id);
+                        }
+                      }}
+                      onClick={(event) => {
+                        event.preventDefault();
+                        event.stopPropagation();
+                      }}
+                    >
+                      <SendOutlined />
+                    </button>
+                  </div>
+                </div>
+                );
+              })() : null}
               </div>
             </div>
             );
           })}
-          {visibleImageNodes.map((imageNode) => {
+          {imageNodes.filter((imageNode) => !isNodeCollapsedInPackage("image", imageNode.id)).map((imageNode) => {
             const imageNodeSelected = isSelectedNode("image", imageNode.id);
             const imageNodeActive = isActiveSelectedNode("image", imageNode.id);
             const imageNodeResizing = nodeResizeDrag?.kind === "image" && nodeResizeDrag.nodeId === imageNode.id;
@@ -4434,7 +4463,38 @@ function CanvasPage({
                     </button>
                   </div>
                 ) : null}
-                {imageNodeActive && !isCanvasNodeMoving && !imageNodeFocusActive ? (
+                {imageNodeActive && !isCanvasNodeMoving && !imageNodeFocusActive ? (() => {
+                  const imgMentionOptions = buildNodeMentionOptions("image", imageNode.id, imageNodes, videoNodes, textNodes, getIncomingCanvasPorts, manualLinks);
+                  const imgMentionState = textNodeMentionStates[imageNode.id] || { open: false, query: "", start: 0, caret: 0, activeIndex: 0 };
+                  const imgFilteredMentions = imgMentionState.open
+                    ? imgMentionOptions.filter((o) => !imgMentionState.query || o.searchText.includes(imgMentionState.query.toLowerCase()))
+                    : [];
+
+                  const handleImagePromptChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+                    const value = e.target.value;
+                    const caret = e.target.selectionStart || 0;
+                    updateImageNodePrompt(imageNode.id, value);
+                    const beforeCaret = value.slice(0, caret);
+                    const atIdx = beforeCaret.lastIndexOf("@");
+                    if (atIdx >= 0) {
+                      const query = beforeCaret.slice(atIdx + 1);
+                      if (!MENTION_BOUNDARY_RE.test(query) && !query.includes(" ")) {
+                        setTextNodeMentionStates((prev) => ({ ...prev, [imageNode.id]: { open: true, query, start: atIdx, caret, activeIndex: 0 } }));
+                        return;
+                      }
+                    }
+                    closeTextNodeMention(imageNode.id);
+                  };
+
+                  const handleImagePromptKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
+                    if (!imgMentionState.open || imgFilteredMentions.length === 0) return;
+                    if (e.key === "ArrowDown") { e.preventDefault(); setTextNodeMentionStates((prev) => ({ ...prev, [imageNode.id]: { ...imgMentionState, activeIndex: (imgMentionState.activeIndex + 1) % imgFilteredMentions.length } })); }
+                    else if (e.key === "ArrowUp") { e.preventDefault(); setTextNodeMentionStates((prev) => ({ ...prev, [imageNode.id]: { ...imgMentionState, activeIndex: (imgMentionState.activeIndex - 1 + imgFilteredMentions.length) % imgFilteredMentions.length } })); }
+                    else if (e.key === "Enter" || e.key === "Tab") { e.preventDefault(); const opt = imgFilteredMentions[imgMentionState.activeIndex]; if (opt) insertTextNodeMention(imageNode.id, opt, e.currentTarget, "image"); }
+                    else if (e.key === "Escape") { e.preventDefault(); closeTextNodeMention(imageNode.id); }
+                  };
+
+                  return (
                 <div className="studio-canvas-image-composer">
                   <div className="studio-canvas-image-composer__tools">
                     <button
@@ -4473,23 +4533,47 @@ function CanvasPage({
                     >
                       <FileImageOutlined /><span>标记</span>
                     </button>
-                    {markingPopoverNodeId === imageNode.id ? (
+                    {markingPopoverNodeId === imageNode.id && (
-                      <CanvasMarkingPopover
+                      <div
-                        value={imageNode.marking}
+                        className="studio-canvas-marking-popover"
-                        placeholder="描述标记内容，如：主角站在桥上，远处是城市天际线"
+                        onMouseDown={(e) => e.stopPropagation()}
-                        onChange={(value) => {
+                        onClick={(e) => e.stopPropagation()}
-                          setImageNodes((nodes) =>
+                      >
-                            nodes.map((node) => (node.id === imageNode.id ? { ...node, marking: value } : node)),
+                        <textarea
-                          );
+                          className="studio-canvas-marking-input"
-                        }}
+                          placeholder="描述标记内容，如：主角站在桥上，远处是城市天际线"
-                        onClear={() => {
+                          value={imageNode.marking || ""}
-                          setImageNodes((nodes) =>
+                          onChange={(e) => {
-                            nodes.map((node) => (node.id === imageNode.id ? { ...node, marking: "" } : node)),
+                            const val = e.target.value;
-                          );
+                            setImageNodes((nodes) =>
-                        }}
+                              nodes.map((n) => (n.id === imageNode.id ? { ...n, marking: val } : n)),
-                        onDone={() => setMarkingPopoverNodeId(null)}
+                            );
-                      />
+                          }}
-                    ) : null}
+                        />
+                        <div className="studio-canvas-marking-actions">
+                          {imageNode.marking && (
+                            <button
+                              type="button"
+                              className="studio-canvas-marking-clear"
+                              onClick={() => {
+                                setImageNodes((nodes) =>
+                                  nodes.map((n) => (n.id === imageNode.id ? { ...n, marking: "" } : n)),
+                                );
+                              }}
+                            >
+                              清除
+                            </button>
+                          )}
+                          <button
+                            type="button"
+                            className="studio-canvas-marking-done"
+                            onClick={() => setMarkingPopoverNodeId(null)}
+                          >
+                            完成
+                          </button>
+                        </div>
+                      </div>
+                    )}
                     <button
                       type="button"
                       title="多宫格生成"
@@ -4531,18 +4615,28 @@ function CanvasPage({
                     </button>
                     <button type="button" className="studio-canvas-image-composer__expand" aria-label="展开">↗</button>
                   </div>
-                  <CanvasPromptMentionTextarea
+                  <div className="studio-canvas-text-composer__input-wrap">
-                    nodeId={imageNode.id}
+                  <textarea
                     value={imageNode.prompt}
+                    onMouseDown={(event) => event.stopPropagation()}
+                    onChange={handleImagePromptChange}
+                    onKeyDown={handleImagePromptKeyDown}
                     placeholder="描述你想要生成的画面内容，按/呼出指令，@引用素材"
-                    mentionOptions={buildNodeMentionOptions("image", imageNode.id, imageNodes, videoNodes, textNodes, getIncomingCanvasPorts, manualLinks)}
-                    mentionState={textNodeMentionStates[imageNode.id]}
-                    mentionKind="image"
-                    onPromptChange={updateImageNodePrompt}
-                    onMentionStateChange={setTextNodeMentionStates}
-                    onCloseMention={closeTextNodeMention}
-                    onInsertMention={insertTextNodeMention}
                   />
+                  {imgMentionState.open && (
+                    <div className="studio-canvas-mention-panel">
+                      {imgFilteredMentions.length > 0 ? imgFilteredMentions.map((opt, idx) => (
+                        <button key={opt.token} type="button" className={`studio-canvas-mention-item${idx === imgMentionState.activeIndex ? " is-active" : ""}`} onMouseDown={(e) => { e.preventDefault(); insertTextNodeMention(imageNode.id, opt, e.currentTarget.closest(".studio-canvas-image-composer")?.querySelector("textarea") || null, "image"); }}>
+                          <span className="studio-canvas-mention-thumb">{opt.kind === "image" && opt.previewUrl ? <img src={opt.previewUrl} alt="" /> : opt.kind === "image" ? "🖼" : opt.kind === "video" ? "🎬" : "📝"}</span>
+                          <span className="studio-canvas-mention-label">{opt.nodeTitle}</span>
+                          <span className="studio-canvas-mention-token">{opt.token}</span>
+                        </button>
+                      )) : (
+                        <div className="studio-canvas-mention-item" style={{ opacity: 0.5, pointerEvents: "none" }}><span className="studio-canvas-mention-label">没有可引用的连接节点</span></div>
+                      )}
+                    </div>
+                  )}
+                  </div>
                   <div className="studio-canvas-image-composer__footer">
                     <CanvasSelectChip
                       ariaLabel="选择生图模型"
@@ -4610,12 +4704,12 @@ function CanvasPage({
                     </button>
                   </div>
                 </div>
-                ) : null}
+                ); })() : null}
               </div>
             </div>
             );
           })}
-          {visibleVideoNodes.map((videoNode) => {
+          {videoNodes.filter((videoNode) => !isNodeCollapsedInPackage("video", videoNode.id)).map((videoNode) => {
             const videoNodeSelected = isSelectedNode("video", videoNode.id);
             const videoNodeActive = isActiveSelectedNode("video", videoNode.id);
             const videoNodeResizing = nodeResizeDrag?.kind === "video" && nodeResizeDrag.nodeId === videoNode.id;
@@ -4765,7 +4859,38 @@ function CanvasPage({
                     onMouseDown={(event) => handleNodeResizeStart(event, "video", videoNode.id, videoNode.size)}
                   />
                 </div>
-                {videoNodeActive && !isCanvasNodeMoving ? (
+                {videoNodeActive && !isCanvasNodeMoving ? (() => {
+                  const vidMentionOptions = buildNodeMentionOptions("video", videoNode.id, imageNodes, videoNodes, textNodes, getIncomingCanvasPorts, manualLinks);
+                  const vidMentionState = textNodeMentionStates[videoNode.id] || { open: false, query: "", start: 0, caret: 0, activeIndex: 0 };
+                  const vidFilteredMentions = vidMentionState.open
+                    ? vidMentionOptions.filter((o) => !vidMentionState.query || o.searchText.includes(vidMentionState.query.toLowerCase()))
+                    : [];
+
+                  const handleVideoPromptChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+                    const value = e.target.value;
+                    const caret = e.target.selectionStart || 0;
+                    updateVideoNodePrompt(videoNode.id, value);
+                    const beforeCaret = value.slice(0, caret);
+                    const atIdx = beforeCaret.lastIndexOf("@");
+                    if (atIdx >= 0) {
+                      const query = beforeCaret.slice(atIdx + 1);
+                      if (!MENTION_BOUNDARY_RE.test(query) && !query.includes(" ")) {
+                        setTextNodeMentionStates((prev) => ({ ...prev, [videoNode.id]: { open: true, query, start: atIdx, caret, activeIndex: 0 } }));
+                        return;
+                      }
+                    }
+                    closeTextNodeMention(videoNode.id);
+                  };
+
+                  const handleVideoPromptKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
+                    if (!vidMentionState.open || vidFilteredMentions.length === 0) return;
+                    if (e.key === "ArrowDown") { e.preventDefault(); setTextNodeMentionStates((prev) => ({ ...prev, [videoNode.id]: { ...vidMentionState, activeIndex: (vidMentionState.activeIndex + 1) % vidFilteredMentions.length } })); }
+                    else if (e.key === "ArrowUp") { e.preventDefault(); setTextNodeMentionStates((prev) => ({ ...prev, [videoNode.id]: { ...vidMentionState, activeIndex: (vidMentionState.activeIndex - 1 + vidFilteredMentions.length) % vidFilteredMentions.length } })); }
+                    else if (e.key === "Enter" || e.key === "Tab") { e.preventDefault(); const opt = vidFilteredMentions[vidMentionState.activeIndex]; if (opt) insertTextNodeMention(videoNode.id, opt, e.currentTarget, "video"); }
+                    else if (e.key === "Escape") { e.preventDefault(); closeTextNodeMention(videoNode.id); }
+                  };
+
+                  return (
                 <div className="studio-canvas-video-composer">
                   <div className="studio-canvas-video-composer__tabs studio-canvas-video-composer__mode-tabs">
                     <button
@@ -4820,23 +4945,47 @@ function CanvasPage({
                     >
                       运镜{videoNode.cameraMotion ? ` ${CAMERA_MOTION_PRESETS.find((p) => p.value === videoNode.cameraMotion)?.label || ""}` : ""}
                     </button>
-                    {markingPopoverNodeId === videoNode.id ? (
+                    {markingPopoverNodeId === videoNode.id && (
-                      <CanvasMarkingPopover
+                      <div
-                        value={videoNode.marking}
+                        className="studio-canvas-marking-popover"
-                        placeholder="描述标记内容，如：主角在城市街头行走"
+                        onMouseDown={(e) => e.stopPropagation()}
-                        onChange={(value) => {
+                        onClick={(e) => e.stopPropagation()}
-                          setVideoNodes((nodes) =>
+                      >
-                            nodes.map((node) => (node.id === videoNode.id ? { ...node, marking: value } : node)),
+                        <textarea
-                          );
+                          className="studio-canvas-marking-input"
-                        }}
+                          placeholder="描述标记内容，如：主角在城市街头行走"
-                        onClear={() => {
+                          value={videoNode.marking || ""}
-                          setVideoNodes((nodes) =>
+                          onChange={(e) => {
-                            nodes.map((node) => (node.id === videoNode.id ? { ...node, marking: "" } : node)),
+                            const val = e.target.value;
-                          );
+                            setVideoNodes((nodes) =>
-                        }}
+                              nodes.map((n) => (n.id === videoNode.id ? { ...n, marking: val } : n)),
-                        onDone={() => setMarkingPopoverNodeId(null)}
+                            );
-                      />
+                          }}
-                    ) : null}
+                        />
+                        <div className="studio-canvas-marking-actions">
+                          {videoNode.marking && (
+                            <button
+                              type="button"
+                              className="studio-canvas-marking-clear"
+                              onClick={() => {
+                                setVideoNodes((nodes) =>
+                                  nodes.map((n) => (n.id === videoNode.id ? { ...n, marking: "" } : n)),
+                                );
+                              }}
+                            >
+                              清除
+                            </button>
+                          )}
+                          <button
+                            type="button"
+                            className="studio-canvas-marking-done"
+                            onClick={() => setMarkingPopoverNodeId(null)}
+                          >
+                            完成
+                          </button>
+                        </div>
+                      </div>
+                    )}
                     {cameraMotionDropdownNodeId === videoNode.id && (
                       <div
                         className="studio-canvas-camera-dropdown"
@@ -4863,24 +5012,43 @@ function CanvasPage({
                     <button type="button">角色库</button>
                     <button type="button" className="is-active">文本</button>
                   </div>
-                  <CanvasPromptMentionTextarea
+                  <div className="studio-canvas-text-composer__input-wrap">
-                    nodeId={videoNode.id}
+                  <textarea
                     value={videoNode.prompt}
+                    onMouseDown={(event) => event.stopPropagation()}
+                    onChange={handleVideoPromptChange}
+                    onKeyDown={handleVideoPromptKeyDown}
                     placeholder="根据文字描述生成视频。"
-                    mentionOptions={buildNodeMentionOptions("video", videoNode.id, imageNodes, videoNodes, textNodes, getIncomingCanvasPorts, manualLinks)}
-                    mentionState={textNodeMentionStates[videoNode.id]}
-                    mentionKind="video"
-                    onPromptChange={updateVideoNodePrompt}
-                    onMentionStateChange={setTextNodeMentionStates}
-                    onCloseMention={closeTextNodeMention}
-                    onInsertMention={insertTextNodeMention}
                   />
+                  {vidMentionState.open ? (
+                    <div className="studio-canvas-mention-panel">
+                      {vidFilteredMentions.length > 0 ? vidFilteredMentions.map((opt, idx) => (
+                        <button
+                          key={opt.token}
+                          type="button"
+                          className={`studio-canvas-mention-item${idx === vidMentionState.activeIndex ? " is-active" : ""}`}
+                          onMouseDown={(ev) => { ev.preventDefault(); insertTextNodeMention(videoNode.id, opt, ev.currentTarget.closest(".studio-canvas-text-composer__input-wrap")?.querySelector("textarea")!, "video"); }}
+                        >
+                          <span className={`studio-canvas-mention-icon studio-canvas-mention-icon--${opt.kind}`}>
+                            {opt.kind === "image" ? "🖼" : opt.kind === "video" ? "🎬" : "📝"}
+                          </span>
+                          <span className="studio-canvas-mention-label">{opt.nodeTitle}</span>
+                          <span className="studio-canvas-mention-token">{opt.token}</span>
+                        </button>
+                      )) : (
+                        <div className="studio-canvas-mention-item" style={{ opacity: 0.5, pointerEvents: "none" }}>
+                          <span className="studio-canvas-mention-label">没有可引用的连接节点</span>
+                        </div>
+                      )}
+                    </div>
+                  ) : null}
+                  </div>
                   <div className="studio-canvas-video-composer__footer studio-canvas-video-composer__settings">
                     <CanvasSelectChip
                       ariaLabel="选择视频模型"
                       className="canvas-select-chip--model studio-canvas-composer-chip"
                       value={toHappyHorseDisplayModel(videoNode.model || defaultVideoModel)}
-                      options={canvasVideoModelOptions}
+                      options={canvasEnterpriseVideoModelOptions}
                       open={canvasSelectMenu === `${videoNode.id}:video-model`}
                       onToggle={() =>
                         setCanvasSelectMenu((current) =>
@@ -4958,7 +5126,7 @@ function CanvasPage({
                     </button>
                   </div>
                 </div>
-                ) : null}
+                ); })() : null}
               </div>
             </div>
             );
@@ -5252,7 +5420,7 @@ function CanvasPage({
                             onClick={() => setSelectedExistingCategory(category.key)}
                           >
                             {category.label}
-                            <span>{assetCountsByCategory.get(category.key) ?? 0} 个素材</span>
+                            <span>{serverAssets.filter((asset) => asset.type === category.key).length} 个素材</span>
                           </button>
                         ))}
                       </div>

src/features/canvas/CanvasTextPromptComposer.tsx

@@ -1,219 +0,0 @@
-import { SendOutlined } from "@ant-design/icons";
-import { useRef, type CSSProperties, type Dispatch, type SetStateAction } from "react";
-import type { CanvasNodeKind, CanvasPromptMentionOption, CanvasPromptMentionState } from "./canvasTypes";
-
-const MENTION_BOUNDARY_RE = /\s|[，。、；：！？?(){}[\]<>]/;
-const EMPTY_MENTION_STYLE: CSSProperties = { opacity: 0.5, pointerEvents: "none" };
-const DEFAULT_MENTION_STATE: CanvasPromptMentionState = {
-  open: false,
-  query: "",
-  start: 0,
-  caret: 0,
-  activeIndex: 0,
-};
-
-interface CanvasPromptMentionTextareaProps {
-  nodeId: string;
-  value: string;
-  placeholder: string;
-  mentionOptions: CanvasPromptMentionOption[];
-  mentionState?: CanvasPromptMentionState;
-  onPromptChange: (nodeId: string, prompt: string) => void;
-  onMentionStateChange: Dispatch<SetStateAction<Record<string, CanvasPromptMentionState>>>;
-  onCloseMention: (nodeId: string) => void;
-  onInsertMention: (
-    nodeId: string,
-    option: CanvasPromptMentionOption,
-    textarea: HTMLTextAreaElement | null,
-    kind?: CanvasNodeKind,
-  ) => void;
-  mentionKind?: CanvasNodeKind;
-}
-
-export function CanvasPromptMentionTextarea({
-  nodeId,
-  value,
-  placeholder,
-  mentionOptions,
-  mentionState = DEFAULT_MENTION_STATE,
-  onPromptChange,
-  onMentionStateChange,
-  onCloseMention,
-  onInsertMention,
-  mentionKind,
-}: CanvasPromptMentionTextareaProps) {
-  const textareaRef = useRef<HTMLTextAreaElement | null>(null);
-  const filteredMentions = mentionState.open
-    ? mentionOptions.filter((option) => !mentionState.query || option.searchText.includes(mentionState.query.toLowerCase()))
-    : [];
-
-  const handlePromptChange = (event: React.ChangeEvent<HTMLTextAreaElement>) => {
-    const value = event.target.value;
-    const caret = event.target.selectionStart || 0;
-    onPromptChange(nodeId, value);
-
-    const beforeCaret = value.slice(0, caret);
-    const atIndex = beforeCaret.lastIndexOf("@");
-    if (atIndex >= 0) {
-      const query = beforeCaret.slice(atIndex + 1);
-      if (!MENTION_BOUNDARY_RE.test(query) && !query.includes(" ")) {
-        onMentionStateChange((prev) => ({
-          ...prev,
-          [nodeId]: { open: true, query, start: atIndex, caret, activeIndex: 0 },
-        }));
-        return;
-      }
-    }
-    onCloseMention(nodeId);
-  };
-
-  const handlePromptKeyDown = (event: React.KeyboardEvent<HTMLTextAreaElement>) => {
-    if (!mentionState.open || filteredMentions.length === 0) return;
-    if (event.key === "ArrowDown") {
-      event.preventDefault();
-      onMentionStateChange((prev) => ({
-        ...prev,
-        [nodeId]: { ...mentionState, activeIndex: (mentionState.activeIndex + 1) % filteredMentions.length },
-      }));
-    } else if (event.key === "ArrowUp") {
-      event.preventDefault();
-      onMentionStateChange((prev) => ({
-        ...prev,
-        [nodeId]: {
-          ...mentionState,
-          activeIndex: (mentionState.activeIndex - 1 + filteredMentions.length) % filteredMentions.length,
-        },
-      }));
-    } else if (event.key === "Enter" || event.key === "Tab") {
-      event.preventDefault();
-      const option = filteredMentions[mentionState.activeIndex];
-      if (option) {
-        onInsertMention(nodeId, option, event.currentTarget, mentionKind);
-      }
-    } else if (event.key === "Escape") {
-      event.preventDefault();
-      onCloseMention(nodeId);
-    }
-  };
-
-  const handlePromptSelect = (event: React.SyntheticEvent<HTMLTextAreaElement>) => {
-    const caret = event.currentTarget.selectionStart || 0;
-    onMentionStateChange((prev) => {
-      const current = prev[nodeId];
-      if (!current?.open) return prev;
-      return { ...prev, [nodeId]: { ...current, caret } };
-    });
-  };
-
-  return (
-    <div className="studio-canvas-text-composer__input-wrap">
-      <textarea
-        ref={textareaRef}
-        value={value}
-        onMouseDown={(event) => event.stopPropagation()}
-        onChange={handlePromptChange}
-        onKeyDown={handlePromptKeyDown}
-        onSelect={handlePromptSelect}
-        placeholder={placeholder}
-      />
-      {mentionState.open ? (
-        <div className="studio-canvas-mention-panel">
-          {filteredMentions.length > 0 ? filteredMentions.map((option, index) => (
-            <button
-              key={option.token}
-              type="button"
-              className={`studio-canvas-mention-item${index === mentionState.activeIndex ? " is-active" : ""}`}
-              onMouseDown={(event) => {
-                event.preventDefault();
-                onInsertMention(nodeId, option, textareaRef.current, mentionKind);
-              }}
-            >
-              <span className="studio-canvas-mention-thumb">
-                {option.kind === "image" && option.previewUrl ? (
-                  <img src={option.previewUrl} alt="" />
-                ) : option.kind === "image" ? "🖼" : option.kind === "video" ? "🎬" : "📝"}
-              </span>
-              <span className="studio-canvas-mention-label">{option.nodeTitle}</span>
-              <span className="studio-canvas-mention-token">{option.token}</span>
-            </button>
-          )) : (
-            <div className="studio-canvas-mention-item" style={EMPTY_MENTION_STYLE}>
-              <span className="studio-canvas-mention-label">没有可引用的连接节点</span>
-            </div>
-          )}
-        </div>
-      ) : null}
-    </div>
-  );
-}
-
-interface CanvasTextPromptComposerProps {
-  nodeId: string;
-  prompt: string;
-  canGenerate: boolean;
-  isGenerating: boolean;
-  mentionOptions: CanvasPromptMentionOption[];
-  mentionState?: CanvasPromptMentionState;
-  onPromptChange: (nodeId: string, prompt: string) => void;
-  onMentionStateChange: Dispatch<SetStateAction<Record<string, CanvasPromptMentionState>>>;
-  onCloseMention: (nodeId: string) => void;
-  onInsertMention: (
-    nodeId: string,
-    option: CanvasPromptMentionOption,
-    textarea: HTMLTextAreaElement | null,
-    kind?: CanvasNodeKind,
-  ) => void;
-  onGenerate: (nodeId: string) => void | Promise<void>;
-}
-
-export function CanvasTextPromptComposer({
-  nodeId,
-  prompt,
-  canGenerate,
-  isGenerating,
-  mentionOptions,
-  mentionState,
-  onPromptChange,
-  onMentionStateChange,
-  onCloseMention,
-  onInsertMention,
-  onGenerate,
-}: CanvasTextPromptComposerProps) {
-  return (
-    <div className="studio-canvas-text-composer">
-      <CanvasPromptMentionTextarea
-        nodeId={nodeId}
-        value={prompt}
-        placeholder="写下你想讲的故事、场景或角色设定。@引用连接的节点"
-        mentionOptions={mentionOptions}
-        mentionState={mentionState}
-        onPromptChange={onPromptChange}
-        onMentionStateChange={onMentionStateChange}
-        onCloseMention={onCloseMention}
-        onInsertMention={onInsertMention}
-      />
-      <div className="studio-canvas-text-composer__footer">
-        <button
-          type="button"
-          className={`studio-canvas-text-composer__send studio-canvas-generate-button${canGenerate && !isGenerating ? " is-ready" : ""}`}
-          title={isGenerating ? "生成中" : "生成"}
-          disabled={isGenerating || !canGenerate}
-          aria-busy={isGenerating}
-          onMouseDown={(event) => {
-            event.preventDefault();
-            event.stopPropagation();
-            if (!isGenerating && canGenerate) {
-              void onGenerate(nodeId);
-            }
-          }}
-          onClick={(event) => {
-            event.preventDefault();
-            event.stopPropagation();
-          }}
-        >
-          <SendOutlined />
-        </button>
-      </div>
-    </div>
-  );
-}

src/features/canvas/useCanvasDerivedState.ts

@@ -1,74 +0,0 @@
-import { useCallback, useMemo } from "react";
-import type { ServerAssetItem } from "../../api/assetClient";
-import type {
-  CanvasImageNode,
-  CanvasNodeKind,
-  CanvasNodePackage,
-  CanvasTextNode,
-  CanvasVideoNode,
-} from "./canvasTypes";
-import { getCanvasSelectionKey } from "./canvasUtils";
-
-export function useCanvasAssetSummary(serverAssets: ServerAssetItem[]) {
-  return useMemo(() => {
-    const canvasAssets: ServerAssetItem[] = [];
-    const assetCountsByCategory = new Map<string, number>();
-
-    for (const asset of serverAssets) {
-      if (asset.imageUrl) {
-        canvasAssets.push(asset);
-      }
-      assetCountsByCategory.set(asset.type, (assetCountsByCategory.get(asset.type) ?? 0) + 1);
-    }
-
-    return { canvasAssets, assetCountsByCategory };
-  }, [serverAssets]);
-}
-
-export function useCanvasVisibleNodes({
-  textNodes,
-  imageNodes,
-  videoNodes,
-  nodePackages,
-}: {
-  textNodes: CanvasTextNode[];
-  imageNodes: CanvasImageNode[];
-  videoNodes: CanvasVideoNode[];
-  nodePackages: CanvasNodePackage[];
-}) {
-  const collapsedPackageNodeKeys = useMemo(
-    () => new Set(
-      nodePackages.flatMap((nodePackage) =>
-        nodePackage.collapsed ? nodePackage.nodeIds.map((node) => getCanvasSelectionKey(node)) : []
-      )
-    ),
-    [nodePackages],
-  );
-
-  const isNodeCollapsedInPackage = useCallback(
-    (kind: CanvasNodeKind, id: string) =>
-      collapsedPackageNodeKeys.has(getCanvasSelectionKey({ kind, id })),
-    [collapsedPackageNodeKeys],
-  );
-
-  const visibleTextNodes = useMemo(
-    () => textNodes.filter((textNode) => !collapsedPackageNodeKeys.has(getCanvasSelectionKey({ kind: "text", id: textNode.id }))),
-    [collapsedPackageNodeKeys, textNodes],
-  );
-  const visibleImageNodes = useMemo(
-    () => imageNodes.filter((imageNode) => !collapsedPackageNodeKeys.has(getCanvasSelectionKey({ kind: "image", id: imageNode.id }))),
-    [collapsedPackageNodeKeys, imageNodes],
-  );
-  const visibleVideoNodes = useMemo(
-    () => videoNodes.filter((videoNode) => !collapsedPackageNodeKeys.has(getCanvasSelectionKey({ kind: "video", id: videoNode.id }))),
-    [collapsedPackageNodeKeys, videoNodes],
-  );
-
-  return {
-    collapsedPackageNodeKeys,
-    isNodeCollapsedInPackage,
-    visibleTextNodes,
-    visibleImageNodes,
-    visibleVideoNodes,
-  };
-}

src/features/canvas/useCanvasNodeDrag.ts

@@ -82,16 +82,11 @@ export function useCanvasNodeDrag(params: UseCanvasNodeDragParams) {
     const cy = pos.y + size.height / 2;
     const right = pos.x + size.width;
     const bottom = pos.y + size.height;
-    const others: Array<{ pos: CanvasPoint; size: CanvasNodeSize }> = [];
+    const others = [
-    for (const node of textNodesRef.current) {
+      ...textNodesRef.current.filter((n) => n.id !== draggedId).map((n) => ({ pos: n.position, size: n.size })),
-      if (node.id !== draggedId) others.push({ pos: node.position, size: node.size });
+      ...imageNodesRef.current.filter((n) => n.id !== draggedId).map((n) => ({ pos: n.position, size: n.size })),
-    }
+      ...videoNodesRef.current.filter((n) => n.id !== draggedId).map((n) => ({ pos: n.position, size: n.size })),
-    for (const node of imageNodesRef.current) {
+    ];
-      if (node.id !== draggedId) others.push({ pos: node.position, size: node.size });
-    }
-    for (const node of videoNodesRef.current) {
-      if (node.id !== draggedId) others.push({ pos: node.position, size: node.size });
-    }
     for (const other of others) {
       const ocx = other.pos.x + other.size.width / 2;
       const ocy = other.pos.y + other.size.height / 2;

src/features/character-mix/CharacterMixPage.tsx

@@ -17,7 +17,6 @@ import {
   VideoCameraOutlined,
 } from "@ant-design/icons";
 import { useCallback, useEffect, useRef, useState } from "react";
-import "../../styles/pages/image-workbench.css";
 import StudioToolLayout from "../../components/StudioToolLayout";
 import type { WebImageWorkbenchTool, WebViewKey } from "../../types";
 import { aiGenerationClient } from "../../api/aiGenerationClient";

src/features/community/CommunityPage.tsx

@@ -10,7 +10,6 @@ import {
   SearchOutlined,
 } from "@ant-design/icons";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import "../../styles/pages/community.css";
 import { useDebounce } from "../../hooks/useDebounce";
 import { communityClient, type ServerCommunityCase } from "../../api/communityClient";
 import WorkspacePageShell from "../../components/WorkspacePageShell";

src/features/compliance/CompliancePage.tsx

@@ -1,5 +1,4 @@
 import { FileTextOutlined, SafetyOutlined } from "@ant-design/icons";
-import "../../styles/pages/compliance.css";
 
 type ComplianceKind = "agreement" | "privacy";
 

src/features/dialog-generator/DialogGeneratorPage.tsx

@@ -1,5 +1,4 @@
 import { useCallback, useRef, useState, type CSSProperties, type MouseEvent as ReactMouseEvent, type TouchEvent as ReactTouchEvent } from "react";
-import "../../styles/pages/dialog-generator.css";
 
 type DialogStyle = "style1" | "style2" | "style3" | "style4";
 

src/features/digital-human/AvatarConsolePage.tsx

@@ -24,7 +24,6 @@ import {
   VideoCameraOutlined,
 } from "@ant-design/icons";
 import { useMemo, useRef, useState, type CSSProperties, type PointerEvent, type ReactNode } from "react";
-import "../../styles/pages/avatar-console.css";
 import type { WebViewKey } from "../../types";
 import {
   bringAvatarEditorLayerForward,

src/features/digital-human/DigitalHumanPage.tsx

@@ -18,7 +18,6 @@ import {
   UserOutlined,
 } from "@ant-design/icons";
 import { useCallback, useEffect, useRef, useState } from "react";
-import "../../styles/pages/image-workbench.css";
 import { aiGenerationClient } from "../../api/aiGenerationClient";
 import { uploadAssetWithProgress } from "../../api/uploadWithProgress";
 import { waitForTask } from "../../api/taskSubscription";

src/features/ecommerce/EcommercePage.tsx

@@ -12,8 +12,7 @@ import {
   SettingOutlined,
   SkinOutlined,
 } from "@ant-design/icons";
-import { useEffect, useMemo, useRef, useState, type CSSProperties, type ChangeEvent, type DragEvent, type ReactNode } from "react";
+import { useEffect, useRef, useState, type CSSProperties, type ChangeEvent, type DragEvent, type ReactNode } from "react";
-import "../../styles/pages/ecommerce.css";
 import { ossAssets } from "../../data/ossAssets";
 import { EcommerceProgressBar } from "./EcommerceProgressBar";
 import ImageMentionMenu, { getImageMentionQuery, insertImageMentionValue, type MentionImageOption } from "./ImageMentionMenu";
@@ -901,58 +900,25 @@ function ProductClonePage(_props: ProductClonePageProps = {}) {
   const [selectedDetailModules, setSelectedDetailModules] = useState<string[]>(defaultDetailModuleIds);
   const [detailStatus, setDetailStatus] = useState<DetailStatus>("idle");
   const [detailResultUrl, setDetailResultUrl] = useState<string | null>(null);
-  const productSetRatioOptions = useMemo(
+  const productSetRatioOptions = getPlatformRatioOptions(productSetPlatform, productSetOutput);
-    () => getPlatformRatioOptions(productSetPlatform, productSetOutput),
+  const hotUploadedRatioOption = cloneOutput === "hot" ? formatUploadedImageRatio(cloneReferenceImages[0]) : null;
-    [productSetOutput, productSetPlatform],
+  const baseCloneRatioOptions = getPlatformRatioOptions(platform, cloneOutput);
-  );
+  const cloneRatioOptions = hotUploadedRatioOption
-  const hotUploadedRatioOption = useMemo(
+    ? getUniqueRatioOptions([...baseCloneRatioOptions, hotUploadedRatioOption])
-    () => cloneOutput === "hot" ? formatUploadedImageRatio(cloneReferenceImages[0]) : null,
+    : baseCloneRatioOptions;
-    [cloneOutput, cloneReferenceImages],
+  const productSetLanguageOptions = getPlatformLanguageOptions(productSetPlatform, productSetMarket);
-  );
+  const cloneLanguageOptions = getPlatformLanguageOptions(platform, market);
-  const baseCloneRatioOptions = useMemo(
+  const detailLanguageOptions = getPlatformLanguageOptions(detailPlatform, detailMarket);
-    () => getPlatformRatioOptions(platform, cloneOutput),
-    [cloneOutput, platform],
-  );
-  const cloneRatioOptions = useMemo(
-    () => hotUploadedRatioOption
-      ? getUniqueRatioOptions([...baseCloneRatioOptions, hotUploadedRatioOption])
-      : baseCloneRatioOptions,
-    [baseCloneRatioOptions, hotUploadedRatioOption],
-  );
-  const productSetLanguageOptions = useMemo(
-    () => getPlatformLanguageOptions(productSetPlatform, productSetMarket),
-    [productSetMarket, productSetPlatform],
-  );
-  const cloneLanguageOptions = useMemo(
-    () => getPlatformLanguageOptions(platform, market),
-    [market, platform],
-  );
-  const detailLanguageOptions = useMemo(
-    () => getPlatformLanguageOptions(detailPlatform, detailMarket),
-    [detailMarket, detailPlatform],
-  );
   const ecommerceMentionImages: MentionImageOption[] = [
     ...productImages.map((image, index) => ({ ...image, label: `商品图 ${index + 1}` })),
     ...cloneReferenceImages.map((image, index) => ({ ...image, label: `参考图 ${index + 1}` })),
   ];
 
-  const ecommerceVideoImageDataUrls = useMemo(
-    () => productImages.map((img) => img.src),
-    [productImages],
-  );
-  const ecommerceVideoImageFiles = useMemo(
-    () => productImages.map((img) => img.file),
-    [productImages],
-  );
-
   const selectedProductSetOutput =
     productSetOutputOptions.find((option) => option.key === productSetOutput) ?? productSetOutputOptions[0]!;
   const selectedCloneOutput = cloneOutputOptions.find((option) => option.key === cloneOutput) ?? cloneOutputOptions[1]!;
   const productSetPreviewReady = productSetStatus === "done";
-  const cloneSetTotal = useMemo(
+  const cloneSetTotal = Object.values(cloneSetCounts).reduce((sum, value) => sum + value, 0);
-    () => Object.values(cloneSetCounts).reduce((sum, value) => sum + value, 0),
-    [cloneSetCounts],
-  );
   const canGenerateSet = setImages.length > 0 && productSetStatus !== "generating";
   const canGenerate = (cloneOutput === "video-outfit"
     ? Boolean(videoOutfitVideoFile && videoOutfitRefFile)
@@ -961,12 +927,9 @@ function ProductClonePage(_props: ProductClonePageProps = {}) {
   const canGenerateDetail = detailProductImages.length > 0 && detailStatus !== "generating";
   const cloneVideoDurationProgress =
     ((cloneVideoDuration - cloneVideoDurationMin) / (cloneVideoDurationMax - cloneVideoDurationMin)) * 100;
-  const cloneVideoDurationStyle: CSSProperties = useMemo(
+  const cloneVideoDurationStyle: CSSProperties = {
-    () => ({
+    "--clone-video-duration-progress": `${cloneVideoDurationProgress}%`,
-      "--clone-video-duration-progress": `${cloneVideoDurationProgress}%`,
+  } as CSSProperties;
-    }) as CSSProperties,
-    [cloneVideoDurationProgress],
-  );
 
   const trackEcommerceTask = (taskId: string) => {
     activeEcommerceTaskIdsRef.current.add(taskId);
@@ -1135,8 +1098,6 @@ function ProductClonePage(_props: ProductClonePageProps = {}) {
   };
 
   const clearCloneSetCountHold = () => {
-    window.removeEventListener("pointerup", clearCloneSetCountHold);
-    window.removeEventListener("pointercancel", clearCloneSetCountHold);
     if (countHoldTimeoutRef.current !== null) {
       window.clearTimeout(countHoldTimeoutRef.current);
       countHoldTimeoutRef.current = null;
@@ -1251,34 +1212,6 @@ function ProductClonePage(_props: ProductClonePageProps = {}) {
     requirement,
   });
 
-  const latestCloneSettingSnapshot = useMemo(
-    () => createCloneSettingSnapshot(cloneSettingName, "clone-setting-latest"),
-    [
-      cloneOutput,
-      platform,
-      market,
-      language,
-      ratio,
-      cloneSetCounts,
-      selectedCloneDetailModules,
-      cloneModelPanelTab,
-      selectedCloneModelScenes,
-      cloneModelCustomScene,
-      cloneModelGender,
-      cloneModelAge,
-      cloneModelEthnicity,
-      cloneModelBody,
-      cloneModelAppearance,
-      cloneVideoQuality,
-      cloneVideoDuration,
-      cloneVideoSmart,
-      cloneReferenceMode,
-      cloneReplicateLevel,
-      requirement,
-      cloneSettingName,
-    ],
-  );
-
   const persistLatestCloneSetting = () => {
     const snapshot = createCloneSettingSnapshot(cloneSettingName, "clone-setting-latest");
     latestCloneSettingRef.current = snapshot;
@@ -1326,8 +1259,8 @@ function ProductClonePage(_props: ProductClonePageProps = {}) {
   };
 
   useEffect(() => {
-    latestCloneSettingRef.current = latestCloneSettingSnapshot;
+    latestCloneSettingRef.current = createCloneSettingSnapshot(cloneSettingName, "clone-setting-latest");
-  }, [latestCloneSettingSnapshot]);
+  });
 
   useEffect(() => {
     const latestSetting = readCloneLatestSetting();
@@ -2683,8 +2616,8 @@ function ProductClonePage(_props: ProductClonePageProps = {}) {
           <main className="product-clone-preview product-clone-preview--video" style={{ padding: 0, overflow: "hidden" }}>
             <EcommerceVideoWorkspace
               isAuthenticated={Boolean((_props as Record<string, unknown>).isAuthenticated)}
-              productImageDataUrls={ecommerceVideoImageDataUrls}
+              productImageDataUrls={productImages.map((img) => img.src)}
-              productImageFiles={ecommerceVideoImageFiles}
+              productImageFiles={productImages.map((img) => img.file)}
               requirement={requirement}
               platform={platform}
               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"}

src/features/ecommerce/EcommerceTemplatesPage.tsx

@@ -8,8 +8,6 @@ import {
   TagsOutlined,
 } from "@ant-design/icons";
 import { useCallback, useEffect, useMemo, useRef, useState, type CSSProperties } from "react";
-import "../../styles/pages/image-workbench.css";
-import "../../styles/pages/ecommerce.css";
 import type { WebProjectSummary } from "../../types";
 import { useDebounce } from "../../hooks/useDebounce";
 import { templateCarouselCases, templateCases, templateCategories, type TemplateCase } from "./ecommerceTemplates";

src/features/ecommerce/EcommerceVideoWorkspace.tsx

@@ -1,5 +1,4 @@
 import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from "react";
-import "../../styles/pages/ecommerce-video.css";
 import {
   CloseOutlined,
   CopyOutlined,
@@ -122,7 +121,6 @@ export default function EcommerceVideoWorkspace({
   const [previewMedia, setPreviewMedia] = useState<{ url: string; type: "image" | "video" } | null>(null);
   const abortControllerRef = useRef<AbortController | null>(null);
   const renderAbortRef = useRef({ current: false });
-  const actionNoticeTimerRef = useRef<number | null>(null);
   const setView = useAppStore((s) => s.setView);
   const keepaliveRestoredFingerprintRef = useRef<string | null>(null);
   const keepalivePollingStartedRef = useRef(false);
@@ -278,23 +276,9 @@ export default function EcommerceVideoWorkspace({
   // Note: keep-alive is NOT cleared on completion — results persist across page switches.
   // Only cleared when user explicitly starts a new plan via handlePlan.
 
-  useEffect(() => {
-    return () => {
-      if (actionNoticeTimerRef.current !== null) {
-        window.clearTimeout(actionNoticeTimerRef.current);
-      }
-    };
-  }, []);
-
   const showNotice = (msg: string) => {
     setActionNotice(msg);
-    if (actionNoticeTimerRef.current !== null) {
+    setTimeout(() => setActionNotice(null), 3000);
-      window.clearTimeout(actionNoticeTimerRef.current);
-    }
-    actionNoticeTimerRef.current = window.setTimeout(() => {
-      actionNoticeTimerRef.current = null;
-      setActionNotice(null);
-    }, 3000);
   };
 
   const handleDownload = async (url: string) => {

src/features/ecommerce/ecommerceVideoService.ts

@@ -9,7 +9,6 @@ import {
   type AdVideoUserConfig,
 } from "../../api/adVideoPlanClient";
 import { aiGenerationClient } from "../../api/aiGenerationClient";
-import { serverRequest } from "../../api/serverConnection";
 import { waitForTask } from "../../api/taskSubscription";
 import { resolveVideoRequestModel } from "../../utils/resolveVideoModel";
 import { normalizeEcommerceImageMime } from "./ecommerceImageValidation";
@@ -431,6 +430,15 @@ export interface VideoHistoryListResponse {
   offset: number;
 }
 
+import { getStoredToken } from "../../api/serverConnection";
+
+const API_BASE = "/api/ai/ecommerce/video-history";
+
+function getAuthHeaders(): Record<string, string> {
+  const token = getStoredToken();
+  return token ? { Authorization: `Bearer ${token}` } : {};
+}
+
 export async function buildDurableVideoHistoryPayload(payload: SaveVideoHistoryPayload): Promise<SaveVideoHistoryPayload> {
   const uploadAssetByUrl = payload.uploadAssetByUrl;
   const scenes = await Promise.all(
@@ -478,12 +486,13 @@ export async function buildDurableVideoHistoryPayload(payload: SaveVideoHistoryP
 
 export async function saveVideoHistory(payload: SaveVideoHistoryPayload): Promise<{ id: number; createdAt: string }> {
   const { uploadAssetByUrl: _uploadAssetByUrl, ...historyPayload } = await buildDurableVideoHistoryPayload(payload);
-  return serverRequest<{ id: number; createdAt: string }>("ai/ecommerce/video-history", {
+  const res = await fetch(API_BASE, {
     method: "POST",
-    body: historyPayload,
+    headers: { "Content-Type": "application/json", ...getAuthHeaders() },
-    maxRetries: 0,
+    body: JSON.stringify(historyPayload),
-    fallbackMessage: "Failed to save video history",
   });
+  if (!res.ok) throw new Error("Failed to save video history");
+  return res.json();
 }
 
 function removeTemporaryHistoryUrls(item: VideoHistoryItem): VideoHistoryItem {
@@ -502,10 +511,12 @@ export async function fetchVideoHistory(
   limit = 20,
   offset = 0,
 ): Promise<VideoHistoryListResponse> {
-  const search = new URLSearchParams({ limit: String(limit), offset: String(offset) });
+  const res = await fetch(
-  const history = await serverRequest<VideoHistoryListResponse>(`ai/ecommerce/video-history?${search}`, {
+    `${API_BASE}?limit=${limit}&offset=${offset}`,
-    fallbackMessage: "Failed to fetch video history",
+    { headers: getAuthHeaders() },
-  });
+  );
+  if (!res.ok) throw new Error("Failed to fetch video history");
+  const history = (await res.json()) as VideoHistoryListResponse;
   return {
     ...history,
     items: history.items.map(removeTemporaryHistoryUrls),
@@ -513,9 +524,9 @@ export async function fetchVideoHistory(
 }
 
 export async function deleteVideoHistory(id: number): Promise<void> {
-  await serverRequest<void>(`ai/ecommerce/video-history/${id}`, {
+  const res = await fetch(`${API_BASE}/${id}`, {
     method: "DELETE",
-    maxRetries: 0,
+    headers: getAuthHeaders(),
-    fallbackMessage: "Failed to delete video history",
   });
+  if (!res.ok) throw new Error("Failed to delete video history");
 }

src/features/home/ScriptReviewShowcase.tsx

@@ -50,12 +50,6 @@ function ScriptReviewShowcase() {
   const scoreRef = useRef<HTMLSpanElement>(null);
   const barRefs = useRef<(HTMLDivElement | null)[]>([]);
   const scoreValRefs = useRef<(HTMLSpanElement | null)[]>([]);
-  const animationTimersRef = useRef<ReturnType<typeof setTimeout>[]>([]);
-
-  const clearAnimationTimers = () => {
-    animationTimersRef.current.forEach((timer) => clearTimeout(timer));
-    animationTimersRef.current = [];
-  };
 
   useEffect(() => {
     const el = document.getElementById("script-review-showcase");
@@ -75,23 +69,18 @@ function ScriptReviewShowcase() {
 
   useEffect(() => {
     if (!animated) return;
-    clearAnimationTimers();
+    const timer = setTimeout(() => {
-    const scheduleAnimation = (callback: () => void, delay: number) => {
-      const timer = setTimeout(callback, delay);
-      animationTimersRef.current.push(timer);
-    };
-    scheduleAnimation(() => {
       animateNumber(scoreRef.current, 77, 1400);
       barRefs.current.forEach((bar, i) => {
         if (!bar) return;
         const pct = parseFloat(bar.dataset.pct ?? "0");
-        scheduleAnimation(() => { bar.style.height = `${pct}%`; }, i * 100 + 400);
+        setTimeout(() => { bar.style.height = `${pct}%`; }, i * 100 + 400);
       });
       scoreValRefs.current.forEach((el, i) => {
-        scheduleAnimation(() => animateNumber(el, parseInt(el?.dataset.target ?? "0"), 800), i * 100 + 400);
+        setTimeout(() => animateNumber(el, parseInt(el?.dataset.target ?? "0"), 800), i * 100 + 400);
       });
     }, 500);
-    return clearAnimationTimers;
+    return () => clearTimeout(timer);
   }, [animated]);
 
   return (

src/features/image-workbench/ImageWorkbenchPage.tsx

@@ -24,7 +24,6 @@ import {
   ThunderboltOutlined,
 } from "@ant-design/icons";
 import { useCallback, useEffect, useRef, useState } from "react";
-import "../../styles/pages/image-workbench.css";
 import type { WebImageWorkbenchTool, WebViewKey } from "../../types";
 import { aiGenerationClient } from "../../api/aiGenerationClient";
 import { waitForTask } from "../../api/taskSubscription";
@@ -81,20 +80,6 @@ const CAMERA_EFFECT_PRESETS = [
   { key: "hdr", label: "HDR", prompt: "HDR高动态范围，明暗细节丰富，色彩饱和" },
 ] as const;
 
-const CAMERA_EFFECT_PROMPT_BY_KEY = new Map<string, string>(
-  CAMERA_EFFECT_PRESETS.map((effect) => [effect.key, effect.prompt]),
-);
-
-function getCameraEffectsPrompt(effectKeys: Set<string>): string {
-  if (effectKeys.size === 0) return "";
-  const prompts: string[] = [];
-  for (const key of effectKeys) {
-    const prompt = CAMERA_EFFECT_PROMPT_BY_KEY.get(key);
-    if (prompt) prompts.push(prompt);
-  }
-  return prompts.join("，");
-}
-
 function shotScaleToZoom(shotScale: number): number {
   const map: Record<number, number> = { 1: 24, 2: 28, 3: 32, 4: 35, 5: 40, 6: 50, 7: 60, 8: 75, 9: 85, 10: 100 };
   return map[Math.round(Math.max(1, Math.min(10, shotScale)))] || 40;
@@ -167,7 +152,6 @@ function ImageWorkbenchPage({ initialTool = "workbench", onOpenMore, onSelectVie
     abortRef.current = false;
     taskIdRef.current = saved.taskId;
     void waitForTask(saved.taskId, {
-      kind: "image",
       onProgress: (e) => {
         setStatus(`${e.status} / ${e.progress}%`);
         if (e.status === "completed" && e.resultUrl) {
@@ -414,7 +398,9 @@ function ImageWorkbenchPage({ initialTool = "workbench", onOpenMore, onSelectVie
       const refUrls = await uploadReferenceImages([cameraImage]);
       const model = "wan2.7-image-pro";
       const cameraDesc = `镜头预设: ${cameraPreset}, 方向: ${cameraDirection}, 水平: ${cameraHorizontal}°, 垂直: ${cameraVertical}°, 倾斜: ${cameraRoll}°, 焦距: ${cameraZoom}mm`;
-      const effectsDesc = getCameraEffectsPrompt(cameraEffects);
+      const effectsDesc = cameraEffects.size > 0
+        ? Array.from(cameraEffects).map((key) => CAMERA_EFFECT_PRESETS.find((e) => e.key === key)?.prompt).filter(Boolean).join("，")
+        : "";
       const fullPrompt = cameraPromptEnabled && cameraPrompt.trim()
         ? `${cameraDesc}${effectsDesc ? `。视觉效果: ${effectsDesc}` : ""}。${cameraPrompt}`
         : `${cameraDesc}${effectsDesc ? `。视觉效果: ${effectsDesc}` : ""}。保持人物和场景一致，按照镜头参数重新构图。`;
@@ -460,7 +446,6 @@ function ImageWorkbenchPage({ initialTool = "workbench", onOpenMore, onSelectVie
 
   const pollTaskUntilDone = useCallback(async (taskId: string): Promise<string | null> => {
     return waitForTask(taskId, {
-      kind: "image",
       abortRef,
       onProgress: (e) => setGenerationProgress(e.progress || 0),
     });
@@ -574,7 +559,7 @@ function ImageWorkbenchPage({ initialTool = "workbench", onOpenMore, onSelectVie
           referenceUrls: refUrls,
         });
         taskIdRef.current = taskId;
-        saveToolTaskState("imagewb", { taskId, status: "running", progress: 0 });
+      saveToolTaskState("imagewb", { taskId, status: "running", progress: 0 });
 
         const tempUrl = await pollTaskUntilDone(taskId);
         if (tempUrl) {

src/features/more/MorePage.tsx

@@ -14,7 +14,6 @@ import {
 } from "@ant-design/icons";
 import type { ReactNode } from "react";
 import { useCallback, useEffect, useState } from "react";
-import "../../styles/pages/more.css";
 import type { WebImageWorkbenchTool, WebViewKey } from "../../types";
 
 interface MorePageProps {

src/features/profile/ProfilePage.tsx

@@ -18,7 +18,6 @@ import {
   UserOutlined,
 } from "@ant-design/icons";
 import { useEffect, useRef, useState, type ChangeEvent, type FormEvent } from "react";
-import "../../styles/pages/profile.css";
 import { aiGenerationClient } from "../../api/aiGenerationClient";
 import { assetClient } from "../../api/assetClient";
 import { communityClient, type ServerCommunityCase } from "../../api/communityClient";

src/features/provider-health/ProviderHealthPage.tsx

@@ -1,5 +1,4 @@
 import { useCallback, useEffect, useState } from "react";
-import "../../styles/pages/provider-health.css";
 import {
   CheckCircleOutlined,
   CloseCircleOutlined,
@@ -165,4 +164,4 @@ export default function ProviderHealthPage({ session, onOpenLogin }: ProviderHea
       </div>
     </WorkspacePageShell>
   );
-}
+}

src/features/resolution-upscale/ResolutionUpscalePage.tsx

@@ -16,7 +16,6 @@ import {
   VideoCameraOutlined,
 } from "@ant-design/icons";
 import { useCallback, useEffect, useRef, useState } from "react";
-import "../../styles/pages/image-workbench.css";
 import { aiGenerationClient } from "../../api/aiGenerationClient";
 import { waitForTask } from "../../api/taskSubscription";
 import { saveToolTaskState, loadToolTaskState, clearToolTaskState } from "../workbench/toolKeepalive";

src/features/script-tokens/ScriptTokensPage.tsx

@@ -9,8 +9,6 @@ import {
   UploadOutlined,
 } from "@ant-design/icons";
 import { useEffect, useRef, useState, type ChangeEvent, type KeyboardEvent } from "react";
-import "../../styles/pages/script-tokens-v5.css";
-import "../../styles/pages/script-tokens.css";
 import { evaluateScript } from "../../api/scriptEvalClient";
 import { buildApiUrl, getStoredToken } from "../../api/serverConnection";
 import { useSessionStore } from "../../stores";
@@ -245,21 +243,9 @@ function getDimensionSubScores(result: EvalResult, dim: ScoreDimension): Array<[
     .slice(0, 5);
 }
 
-function normalizeEvidenceItems(evidence: unknown[] | undefined, limit: number): string[] {
-  if (!Array.isArray(evidence)) return [];
-  const items: string[] = [];
-  for (const item of evidence) {
-    const value = String(item).trim();
-    if (!value) continue;
-    items.push(value);
-    if (items.length >= limit) break;
-  }
-  return items;
-}
-
 function getDimensionEvidence(result: EvalResult, dim: ScoreDimension): string[] {
   const evidence = result.evidence?.[dim.key] ?? (dim.key === "logic" ? result.evidence?.dialogue : undefined);
-  return normalizeEvidenceItems(evidence, 3);
+  return Array.isArray(evidence) ? evidence.map(String).map((item) => item.trim()).filter(Boolean).slice(0, 3) : [];
 }
 
 function formatReportMarkdown(result: EvalResult, script: string): string {

src/features/script-tokens/TokenUsagePage.tsx

@@ -11,8 +11,6 @@ import {
   WarningOutlined,
 } from "@ant-design/icons";
 import { useCallback, useEffect, useMemo, useState } from "react";
-import "../../styles/pages/script-tokens-v5.css";
-import "../../styles/pages/script-tokens.css";
 import type {
   WebEnterpriseUsageMember,
   WebEnterpriseUsageRecord,

src/features/subtitle-removal/SubtitleRemovalPage.tsx

@@ -13,8 +13,6 @@ import {
   VideoCameraOutlined,
 } from "@ant-design/icons";
 import { useCallback, useEffect, useRef, useState, type CSSProperties } from "react";
-import "../../styles/pages/image-workbench.css";
-import "../../styles/pages/subtitle-removal.css";
 import { aiGenerationClient } from "../../api/aiGenerationClient";
 import { waitForTask } from "../../api/taskSubscription";
 import { saveToolTaskState, loadToolTaskState, clearToolTaskState } from "../workbench/toolKeepalive";

src/features/watermark-removal/WatermarkRemovalPage.tsx

@@ -13,7 +13,6 @@ import {
   SwapOutlined,
 } from "@ant-design/icons";
 import { useCallback, useEffect, useRef, useState } from "react";
-import "../../styles/pages/image-workbench.css";
 import { aiGenerationClient } from "../../api/aiGenerationClient";
 import { waitForTask } from "../../api/taskSubscription";
 import { saveToolTaskState, loadToolTaskState, clearToolTaskState } from "../workbench/toolKeepalive";

src/features/workbench/WorkbenchPage.tsx

@@ -34,7 +34,6 @@ import {
   type ReactNode,
   type SyntheticEvent,
 } from "react";
-import "../../styles/pages/workbench.css";
 import type { WebGenerationPreviewTask, WebUserSession } from "../../types";
 import { aiGenerationClient } from "../../api/aiGenerationClient";
 import { claimGenerationSlot, getActiveGenerationTaskCount, getGenerationUserKey, releaseGenerationSlot } from "../../api/generationConcurrency";
@@ -370,7 +369,7 @@ function WorkbenchPage({
       .get()
       .then((capabilities) => {
         if (cancelled) return;
-        const nextVideoModels = capabilities.videoModels.length ? capabilities.videoModels : VIDEO_MODEL_OPTIONS;
+        const nextVideoModels = VIDEO_MODEL_OPTIONS;
 
         applyImageModels(capabilities.imageModels);
         setVideoModelOptions(nextVideoModels);
@@ -3103,11 +3102,6 @@ function WorkbenchPage({
                                   <span>{message.taskStatusLabel || generationStatus}</span>
                                 </div>
                               )}
-                              {message.role === "assistant" && message.mode === "chat" && message.status === "completed" && (
-                                <div className="ai-chat-task-billing-note">
-                                  {formatTextTokenUsage(message.taskUsage)}
-                                </div>
-                              )}
                               {(message.resultUrl || (message.result && message.status !== "thinking")) && (
                                 <ResultCard
                                   message={message}

src/features/workbench/toolKeepalive.ts

@@ -3,8 +3,6 @@
  * Persists task state to localStorage so in-progress tasks survive page switches.
  */
 
-import { waitForTask } from "../../api/taskSubscription";
-
 const KEEPALIVE_PREFIX = "omniai:tool-task:";
 
 interface ToolTaskKeepalive {
@@ -61,19 +59,38 @@ 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 },
-  kind: "image" | "video" = "video",
 ): Promise<string | null> {
-  try {
+  const startTime = Date.now();
-    return await waitForTask(taskId, {
+  const { aiGenerationClient } = await import("../../api/aiGenerationClient");
-      kind,
+
-      abortRef,
+  while (true) {
-      onProgress: (event) => onProgress?.(Math.min(99, Number(event.progress || 0))),
+    if (abortRef?.current) return null;
-    });
+    if (Date.now() - startTime > TASK_POLL_TIMEOUT) return null;
-  } catch {
+
-    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));
   }
 }

src/hooks/useGenerationTasks.ts

@@ -1,5 +1,4 @@
 import { useEffect, useMemo, useRef, useCallback } from "react";
-import { useShallow } from "zustand/react/shallow";
 import type { GenerationQueueItem } from "../stores/useGenerationStore";
 import { useGenerationStore } from "../stores/useGenerationStore";
 import {
@@ -14,17 +13,7 @@ interface UseGenerationTasksOptions {
 
 export function useGenerationTasks(options: UseGenerationTasksOptions) {
   const { sourceView, autoResume = true } = options;
-  const {
+  const store = useGenerationStore();
-    queue,
-    addTask,
-    updateTask: updateStoredTask,
-    getRunningTasks,
-  } = useGenerationStore(useShallow((s) => ({
-    queue: s.queue,
-    addTask: s.addTask,
-    updateTask: s.updateTask,
-    getRunningTasks: s.getRunningTasks,
-  })));
   const pollingStartedRef = useRef(false);
 
   // ── Auto-resume: re-subscribe to running tasks on mount ────
@@ -32,7 +21,7 @@ export function useGenerationTasks(options: UseGenerationTasksOptions) {
     if (!autoResume || pollingStartedRef.current) return;
     pollingStartedRef.current = true;
 
-    const active = getRunningTasks().filter((t) => t.sourceView === sourceView);
+    const active = store.getRunningTasks().filter((t) => t.sourceView === sourceView);
     if (active.length > 0) {
       startBackgroundPolling();
     }
@@ -40,19 +29,19 @@ export function useGenerationTasks(options: UseGenerationTasksOptions) {
     return () => {
       pollingStartedRef.current = false;
     };
-  }, [autoResume, sourceView, getRunningTasks]);
+  }, [autoResume, sourceView, store]);
 
   // ── Subscribe to live updates ───────────────────────────
   useEffect(() => {
     return subscribeToTaskUpdates((updated) => {
-      updateStoredTask(updated.id, updated);
+      store.updateTask(updated.id, updated);
     });
-  }, [updateStoredTask]);
+  }, [store]);
 
   // ── View-scoped computed lists ──────────────────────────
   const myTasks = useMemo(
-    () => queue.filter((t) => t.sourceView === sourceView),
+    () => store.queue.filter((t) => t.sourceView === sourceView),
-    [queue, sourceView],
+    [store.queue, sourceView],
   );
 
   const activeTasks = useMemo(
@@ -74,41 +63,41 @@ export function useGenerationTasks(options: UseGenerationTasksOptions) {
   const submitTask = useCallback(
     (task: Omit<GenerationQueueItem, "id" | "createdAt">) => {
       const id = `gen-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-      addTask({ ...task, id, createdAt: Date.now() });
+      store.addTask({ ...task, id, createdAt: Date.now() });
       return id;
     },
-    [addTask],
+    [store],
   );
 
   const updateTask = useCallback(
     (id: string, patch: Partial<GenerationQueueItem>) => {
-      updateStoredTask(id, patch);
+      store.updateTask(id, patch);
     },
-    [updateStoredTask],
+    [store],
   );
 
   const markCompleted = useCallback(
     (id: string, resultUrl: string) => {
-      updateStoredTask(id, { status: "completed", progress: 100, resultUrl });
+      store.updateTask(id, { status: "completed", progress: 100, resultUrl });
     },
-    [updateStoredTask],
+    [store],
   );
 
   const markFailed = useCallback(
     (id: string, error: string) => {
-      updateStoredTask(id, { status: "failed", error });
+      store.updateTask(id, { status: "failed", error });
     },
-    [updateStoredTask],
+    [store],
   );
 
   const retryTask = useCallback(
     (id: string) => {
-      const task = queue.find((t) => t.id === id);
+      const task = store.queue.find((t) => t.id === id);
       if (task) {
-        updateStoredTask(id, { status: "pending", progress: 0, error: null });
+        store.updateTask(id, { status: "pending", progress: 0, error: null });
       }
     },
-    [queue, updateStoredTask],
+    [store],
   );
 
   return {

src/main.tsx

@@ -1,5 +1,6 @@
 import React from "react";
 import ReactDOM from "react-dom/client";
+import "@xyflow/react/dist/style.css";
 import "./styles/index.css";
 import App from "./App";
 import { reportError } from "./utils/errorReporting";

src/services/backgroundTaskRunner.ts

@@ -1,12 +1,20 @@
 import { useGenerationStore, type GenerationQueueItem } from "../stores/useGenerationStore";
-import { waitForTask, type TaskProgressEvent } from "../api/taskSubscription";
+import { aiGenerationClient } from "../api/aiGenerationClient";
-import { buildTaskFailureInfo } from "../utils/taskLifecycle";
+import {
+  buildLocalTimeoutMessage,
+  buildTaskFailureInfo,
+  getTaskTimeoutPolicy,
+  isTaskLocallyTimedOut,
+} from "../utils/taskLifecycle";
 
 type PollCallback = (item: GenerationQueueItem) => void;
 
-const activePollers = new Map<string, { current: boolean }>();
+const activePollers = new Map<string, ReturnType<typeof setInterval>>();
 const pollCallbacks = new Set<PollCallback>();
 
+const POLL_INTERVAL = 3000;
+const MAX_POLL_ATTEMPTS = 200; // Keep the previous 10-minute guard as a fallback.
+
 export function subscribeToTaskUpdates(callback: PollCallback): () => void {
   pollCallbacks.add(callback);
   return () => { pollCallbacks.delete(callback); };
@@ -26,109 +34,109 @@ function getQueueItemModel(item: GenerationQueueItem): string | undefined {
   return typeof item.params?.model === "string" ? item.params.model : undefined;
 }
 
-function updateTaskAndNotify(id: string, patch: Partial<GenerationQueueItem>): GenerationQueueItem | null {
+function pollTask(item: GenerationQueueItem, attemptsRef: { current: number }): void {
-  const current = useGenerationStore.getState().queue.find((i) => i.id === id);
-  if (!current) return null;
-  const next = { ...current, ...patch };
-  useGenerationStore.getState().updateTask(id, patch);
-  notifyCallbacks(next);
-  return next;
-}
-
-function isTerminalStatus(status: GenerationQueueItem["status"]): boolean {
-  return status === "completed" || status === "failed" || status === "cancelled";
-}
-
-function pollTask(item: GenerationQueueItem): void {
   const key = `poll-${item.id}`;
-  if (activePollers.has(key) || !item.taskId) return;
+  if (activePollers.has(key)) return;
 
   const kind = getQueueItemKind(item);
-  const abortRef = { current: false };
+  const timeoutPolicy = getTaskTimeoutPolicy({ kind, model: getQueueItemModel(item) });
-  activePollers.set(key, abortRef);
+  let lastProgress = Math.max(0, Number(item.progress || 0));
+  let lastProgressAt = Date.now();
 
-  const applyProgress = (event: TaskProgressEvent) => {
+  const interval = setInterval(async () => {
     const current = useGenerationStore.getState().queue.find((i) => i.id === item.id);
-    if (!current || isTerminalStatus(current.status)) {
+    if (!current || current.status === "completed" || current.status === "failed" || current.status === "cancelled") {
-      abortRef.current = true;
+      cleanupPoll(key);
       return;
     }
 
-    const patch: Partial<GenerationQueueItem> = {
+    attemptsRef.current++;
-      progress: Number(event.progress || 0),
+    const timeoutReason = isTaskLocallyTimedOut({
-      resultUrl: event.resultUrl || current.resultUrl,
+      startedAt: current.createdAt || item.createdAt || Date.now(),
-      error: event.error || current.error,
+      lastProgressAt,
-    };
+      progress: lastProgress,
-
+      policy: timeoutPolicy,
-    if (event.status === "completed") {
+    });
-      patch.status = "completed";
+    if (timeoutReason || attemptsRef.current > MAX_POLL_ATTEMPTS) {
-      patch.progress = 100;
+      const error = buildLocalTimeoutMessage(kind);
-    } else if (event.status === "failed" || event.status === "cancelled") {
+      useGenerationStore.getState().updateTask(item.id, {
-      patch.status = "failed";
+        status: "failed",
-      patch.error = buildTaskFailureInfo(event.error).message;
+        error,
-    } else {
+      });
-      patch.status = "running";
+      notifyCallbacks({ ...item, status: "failed", error });
+      cleanupPoll(key);
+      return;
     }
 
-    updateTaskAndNotify(item.id, patch);
+    try {
-  };
+      const status = await aiGenerationClient.getTaskStatus(current.taskId || item.taskId || "");
+      const nextProgress = Number(status.progress || 0);
+      if (nextProgress > lastProgress || status.status === "completed") {
+        lastProgress = Math.max(lastProgress, nextProgress);
+        lastProgressAt = Date.now();
+      }
 
-  void waitForTask(item.taskId, {
+      const patch: Partial<GenerationQueueItem> = {
-    kind,
+        progress: status.progress,
-    model: getQueueItemModel(item),
+        resultUrl: status.resultUrl || current.resultUrl,
-    startedAt: item.createdAt || Date.now(),
+        error: status.error || current.error,
-    abortRef,
+      };
-    onProgress: applyProgress,
+
-  })
+      if (status.status === "completed") {
-    .then((resultUrl) => {
+        patch.status = "completed";
-      if (abortRef.current) return;
+        useGenerationStore.getState().updateTask(item.id, patch);
-      const current = useGenerationStore.getState().queue.find((i) => i.id === item.id);
+        notifyCallbacks({ ...item, ...patch, status: "completed" });
-      if (!current || isTerminalStatus(current.status)) return;
+        cleanupPoll(key);
-      updateTaskAndNotify(item.id, {
+      } else if (status.status === "failed" || status.status === "cancelled") {
-        status: "completed",
+        patch.status = "failed";
-        progress: 100,
+        patch.error = buildTaskFailureInfo(status.error).message;
-        resultUrl: resultUrl || current.resultUrl,
+        useGenerationStore.getState().updateTask(item.id, patch);
-      });
+        notifyCallbacks({ ...item, ...patch, status: "failed" });
-    })
+        cleanupPoll(key);
-    .catch((error) => {
+      } else {
-      if (abortRef.current) return;
+        patch.status = "running";
-      const failure = buildTaskFailureInfo(error instanceof Error ? error.message : String(error));
+        useGenerationStore.getState().updateTask(item.id, patch);
-      updateTaskAndNotify(item.id, {
+        notifyCallbacks({ ...item, ...patch, status: "running" });
-        status: "failed",
+      }
-        error: failure.message,
+    } catch {
-      });
+      // Network errors during polling are retried until the lifecycle guard trips.
-    })
+    }
-    .finally(() => {
+  }, POLL_INTERVAL);
-      cleanupPoll(key, abortRef);
+
-    });
+  activePollers.set(key, interval);
 }
 
-function cleanupPoll(key: string, abortRef: { current: boolean }): void {
+function cleanupPoll(key: string): void {
-  if (activePollers.get(key) !== abortRef) return;
+  const interval = activePollers.get(key);
-  activePollers.delete(key);
+  if (interval) {
+    clearInterval(interval);
+    activePollers.delete(key);
+  }
 }
 
 export function startBackgroundPolling(): void {
   const tasks = useGenerationStore.getState().getRunningTasks();
+  const attemptsMap = new Map<string, { current: number }>();
 
   tasks.forEach((task) => {
     if (task.taskId) {
-      pollTask(task);
+      if (!attemptsMap.has(task.id)) {
+        attemptsMap.set(task.id, { current: 0 });
+      }
+      pollTask(task, attemptsMap.get(task.id)!);
     }
   });
 }
 
 export function resumeTaskPolling(taskId: string, storeId: string): void {
   const task = useGenerationStore.getState().queue.find((i) => i.id === storeId);
-  if (task && !isTerminalStatus(task.status)) {
+  if (task && task.status !== "completed" && task.status !== "failed") {
-    pollTask({ ...task, taskId });
+    pollTask(task, { current: 0 });
   }
 }
 
 export function stopAllPolling(): void {
-  activePollers.forEach((abortRef) => {
+  activePollers.forEach((interval) => clearInterval(interval));
-    abortRef.current = true;
-  });
   activePollers.clear();
 }
 

src/styles/components/bug-feedback-modal.css

@@ -0,0 +1,252 @@
+.bug-feedback-overlay {
+  position: fixed;
+  inset: 0;
+  z-index: 1200;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: rgba(0, 0, 0, 0.55);
+  backdrop-filter: blur(4px);
+}
+
+.bug-feedback-modal {
+  width: min(560px, 92vw);
+  max-height: 80vh;
+  overflow-y: auto;
+  border-radius: 16px;
+  background: var(--bg-panel);
+  border: 1px solid var(--border-subtle);
+  box-shadow: var(--shadow-heavy, 0 12px 40px rgba(0,0,0,0.4));
+  padding: 24px;
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+
+.bug-feedback-modal__header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.bug-feedback-modal__tabs {
+  display: flex;
+  gap: 4px;
+}
+
+.bug-feedback-modal__tabs button {
+  padding: 6px 14px;
+  border-radius: 8px;
+  border: 1px solid transparent;
+  background: transparent;
+  color: var(--fg-muted);
+  font-size: 13px;
+  cursor: pointer;
+  transition: all 0.15s;
+}
+
+.bug-feedback-modal__tabs button.is-active {
+  background: var(--accent);
+  color: #000;
+  border-color: var(--accent);
+}
+
+.bug-feedback-modal__close {
+  width: 30px;
+  height: 30px;
+  border-radius: 8px;
+  border: none;
+  background: var(--bg-subtle);
+  color: var(--fg-muted);
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: background 0.15s;
+}
+
+.bug-feedback-modal__close:hover {
+  background: var(--bg-hover);
+}
+
+.bug-feedback-modal__form {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.bug-feedback-modal__tip {
+  font-size: 13px;
+  color: var(--accent);
+  margin: 0;
+  padding: 8px 12px;
+  border-radius: 8px;
+  background: rgba(var(--accent-rgb, 0 255 136), 0.08);
+}
+
+.bug-feedback-modal__label {
+  font-size: 13px;
+  font-weight: 500;
+  color: var(--fg-muted);
+}
+
+.bug-feedback-modal__input,
+.bug-feedback-modal__textarea {
+  width: 100%;
+  padding: 10px 12px;
+  border-radius: 8px;
+  border: 1px solid var(--border-subtle);
+  background: var(--bg-subtle);
+  color: var(--fg-default);
+  font-size: 14px;
+  resize: vertical;
+}
+
+.bug-feedback-modal__textarea {
+  min-height: 100px;
+}
+
+.bug-feedback-modal__screenshot {
+  display: flex;
+  align-items: center;
+}
+
+.bug-feedback-modal__upload-btn {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  padding: 8px 14px;
+  border-radius: 8px;
+  border: 1px dashed var(--border-subtle);
+  background: transparent;
+  color: var(--fg-muted);
+  font-size: 13px;
+  cursor: pointer;
+  transition: border-color 0.15s;
+}
+
+.bug-feedback-modal__upload-btn:hover {
+  border-color: var(--accent);
+  color: var(--accent);
+}
+
+.bug-feedback-modal__preview {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.bug-feedback-modal__preview img {
+  width: 80px;
+  height: 60px;
+  object-fit: cover;
+  border-radius: 6px;
+  border: 1px solid var(--border-subtle);
+}
+
+.bug-feedback-modal__preview button {
+  padding: 4px 10px;
+  border-radius: 6px;
+  border: 1px solid var(--border-subtle);
+  background: transparent;
+  color: var(--fg-muted);
+  font-size: 12px;
+  cursor: pointer;
+}
+
+.bug-feedback-modal__submit {
+  padding: 10px 20px;
+  border-radius: 8px;
+  border: none;
+  background: var(--accent);
+  color: #000;
+  font-size: 14px;
+  font-weight: 500;
+  cursor: pointer;
+  transition: opacity 0.15s;
+}
+
+.bug-feedback-modal__submit:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+.bug-feedback-modal__history {
+  min-height: 120px;
+}
+
+.bug-feedback-modal__empty {
+  text-align: center;
+  color: var(--fg-muted);
+  font-size: 13px;
+  padding: 32px 0;
+}
+
+.bug-feedback-modal__list {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.bug-feedback-modal__item {
+  padding: 12px;
+  border-radius: 10px;
+  background: var(--bg-subtle);
+  border: 1px solid var(--border-subtle);
+}
+
+.bug-feedback-modal__item-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 6px;
+}
+
+.bug-feedback-modal__item-title {
+  font-size: 14px;
+  font-weight: 500;
+  color: var(--fg-default);
+}
+
+.bug-feedback-modal__status {
+  font-size: 12px;
+  padding: 2px 8px;
+  border-radius: 4px;
+}
+
+.bug-feedback-modal__status--pending {
+  background: rgba(255, 180, 0, 0.15);
+  color: #e6a700;
+}
+
+.bug-feedback-modal__status--approved {
+  background: rgba(0, 200, 80, 0.15);
+  color: #00c850;
+}
+
+.bug-feedback-modal__status--rejected {
+  background: rgba(255, 60, 60, 0.15);
+  color: #ff4040;
+}
+
+.bug-feedback-modal__item-desc {
+  font-size: 13px;
+  color: var(--fg-muted);
+  margin: 0 0 4px;
+  white-space: pre-wrap;
+}
+
+.bug-feedback-modal__item-note {
+  font-size: 12px;
+  color: var(--accent);
+  margin: 4px 0;
+}
+
+.bug-feedback-modal__item-date {
+  font-size: 11px;
+  color: var(--fg-muted);
+  opacity: 0.7;
+}

src/styles/index.css

@@ -9,9 +9,28 @@
 @import "./pages/script-review-visual.css";
 @import "./pages/script-review-showcase.css";
 @import "./pages/model-generation-showcase.css";
+@import "./pages/workbench.css";
+@import "./pages/ecommerce.css";
+@import "./pages/ecommerce-video.css";
+@import "./pages/community.css";
+@import "./pages/assets.css";
+@import "./pages/more.css";
+@import "./pages/avatar-console.css";
 @import "./pages/more-tools.css";
 @import "./pages/studio-layout.css";
+@import "./pages/image-workbench.css";
+@import "./pages/subtitle-removal.css";
+@import "./pages/dialog-generator.css";
 @import "./pages/size-template.css";
+@import "./pages/script-tokens-v5.css";
+@import "./pages/script-tokens.css";
+@import "./pages/profile.css";
+@import "./pages/canvas.css";
+@import "./pages/agent.css";
+@import "./pages/compliance.css";
+@import "./pages/provider-health.css";
+@import "./pages/legacy-pages.css";
+@import "./pages/not-found.css";
 @import "./components/recharge-modal.css";
 @import "./components/dropzone.css";
 @import "./components/skeleton.css";
@@ -19,5 +38,6 @@
 @import "./components/empty-state.css";
 @import "./components/page-transition.css";
 @import "./components/motion.css";
+@import "./components/bug-feedback-modal.css";
 @import "./themes/dark-green.css";
 @import "./pages/local-theme-parity.css";

src/utils/generationNotifier.ts

@@ -3,8 +3,6 @@
  * Falls back gracefully when Notification API is unavailable.
  */
 
-import { toast } from "../components/toast/toastStore";
-
 let permissionGranted = false;
 
 async function requestPermission(): Promise<boolean> {
@@ -37,7 +35,9 @@ export function notifyTaskCompleted(label: string, mode: "image" | "video" = "im
 
 // Use the existing toast system for in-app notifications
 function dispatchGenToast(msg: string) {
-  toast(msg, "success");
+  try {
+    import("../components/toast/toastStore").then((m) => m.toast(msg, "success"));
+  } catch { /* toast system not loaded */ }
 }
 
 /** Call once on app init to pre-warm permission. */