diff --git a/src/features/ecommerce/ecommerceTemplates.ts b/src/features/ecommerce/ecommerceTemplates.ts
index 6f96ea9..b186961 100644
--- a/src/features/ecommerce/ecommerceTemplates.ts
+++ b/src/features/ecommerce/ecommerceTemplates.ts
@@ -19,7 +19,7 @@ const [
ecommerceCarouselImage2,
ecommerceCarouselImage3,
ecommerceCarouselImage4,
- ecommerceCarouselImage5,
+ ,
ecommerceCarouselImage6,
] = ossAssets.ecommerce.templateCases;
const ecommerceCarouselGenerated = ossAssets.ecommerce.generated;
diff --git a/src/features/home/HomePage.tsx b/src/features/home/HomePage.tsx
index bffbe73..fa60aa9 100644
--- a/src/features/home/HomePage.tsx
+++ b/src/features/home/HomePage.tsx
@@ -1,6 +1,5 @@
import {
ArrowRightOutlined,
- DashboardOutlined,
FileSearchOutlined,
PlayCircleOutlined,
PlusOutlined,
@@ -9,7 +8,6 @@ import {
} from "@ant-design/icons";
import { Fragment, useCallback, useEffect, useMemo, useRef, useState, type CSSProperties } from "react";
import type { WebViewKey, WebImageWorkbenchTool } from "../../types";
-import { useScrollEntrance } from "../../hooks/useScrollEntrance";
import { ossAssets } from "../../data/ossAssets";
import "../../styles/pages/home.css";
import WelcomeSplash from "./WelcomeSplash";
@@ -17,15 +15,6 @@ import ToolboxSection from "./ToolboxSection";
import ScriptReviewShowcase from "./ScriptReviewShowcase";
import ModelGenerationShowcase from "./ModelGenerationShowcase";
-function ScrollEntrance({ children, className, ...rest }: { children: React.ReactNode; className?: string } & React.HTMLAttributes
) {
- const { ref, isVisible } = useScrollEntrance();
- return (
-
- );
-}
-
const [heroImage1, heroImage2, heroImage3] = ossAssets.home.heroSlides;
const {
ecommerce: featureEcommerceImage,
@@ -477,7 +466,7 @@ function EcommerceFeatureShowcase() {
);
}
-function HomePage({ onOpenGenerate, onStartOnboarding, onOpenCanvas, onOpenEcommerce, onOpenScriptReview, onOpenTokenMonitor, onSelectView, onOpenImageTool }: HomePageProps) {
+function HomePage({ onOpenGenerate, onStartOnboarding, onOpenCanvas, onOpenEcommerce, onOpenScriptReview, onSelectView, onOpenImageTool }: HomePageProps) {
const [splashDismissed, setSplashDismissed] = useState(() => sessionStorage.getItem("omniai:splash-seen") === "1");
const [activeSlideIndex, setActiveSlideIndex] = useState(0);
const [carouselMotion, setCarouselMotion] = useState(null);
diff --git a/src/features/home/ScriptReviewVisual.tsx b/src/features/home/ScriptReviewVisual.tsx
index ed03861..8929fd0 100644
--- a/src/features/home/ScriptReviewVisual.tsx
+++ b/src/features/home/ScriptReviewVisual.tsx
@@ -14,7 +14,6 @@ function ScriptReviewVisual() {
const [animated, setAnimated] = useState(false);
const [activeDim, setActiveDim] = useState(null);
const [score, setScore] = useState(0);
- const scoreRef = useRef(0);
const frameRef = useRef(null);
useEffect(() => {
diff --git a/src/features/home/ToolboxSection.tsx b/src/features/home/ToolboxSection.tsx
index ac23134..b70a696 100644
--- a/src/features/home/ToolboxSection.tsx
+++ b/src/features/home/ToolboxSection.tsx
@@ -145,7 +145,7 @@ const CARDS = [
},
];
-function ToolboxSection({ onSelectView, onOpenImageTool }: ToolboxSectionProps) {
+function ToolboxSection({ onSelectView }: ToolboxSectionProps) {
const handleCardClick = (targetView: WebViewKey) => {
onSelectView(targetView);
};
diff --git a/src/features/image-workbench/ImageWorkbenchPage.tsx b/src/features/image-workbench/ImageWorkbenchPage.tsx
index 488e600..ebd74e1 100644
--- a/src/features/image-workbench/ImageWorkbenchPage.tsx
+++ b/src/features/image-workbench/ImageWorkbenchPage.tsx
@@ -21,7 +21,6 @@ import {
ScissorOutlined,
SwapOutlined,
TableOutlined,
- ThunderboltOutlined,
} from "@ant-design/icons";
import { useCallback, useEffect, useRef, useState, type DragEvent } from "react";
import "../../styles/pages/more-tools.css";
@@ -30,7 +29,6 @@ import type { WebImageWorkbenchTool, WebViewKey } from "../../types";
import { aiGenerationClient } from "../../api/aiGenerationClient";
import { waitForTask } from "../../api/taskSubscription";
import { saveToolTaskState, loadToolTaskState, clearToolTaskState } from "../workbench/toolKeepalive";
-import { translateTaskError } from "../../utils/translateTaskError";
import { addToolResultToAssetLibrary, saveToolResultToLocal } from "../workbench/toolResultActions";
import { useCanvasDrawing } from "./useCanvasDrawing";
import CameraViewport3D from "./CameraViewport3D";
@@ -40,7 +38,6 @@ type OutputSize = "9:16" | "16:9" | "4:3" | "3:4" | "1:1";
type OutputCount = 1 | 2 | 3 | 4;
const OUTPUT_SIZE_OPTIONS: OutputSize[] = ["9:16", "16:9", "4:3", "3:4", "1:1"];
-const OUTPUT_COUNT_OPTIONS: OutputCount[] = [1, 2, 3, 4];
const SIZE_TO_RATIO: Record = {
"9:16": "9:16",
diff --git a/src/features/profile/ProfilePage.tsx b/src/features/profile/ProfilePage.tsx
index e6411e8..6eb58a9 100644
--- a/src/features/profile/ProfilePage.tsx
+++ b/src/features/profile/ProfilePage.tsx
@@ -1488,6 +1488,32 @@ function ProfilePage({
) : null}
+ {mode === "register" ? (
+
+ ) : null}
) : null}
diff --git a/src/features/resolution-upscale/ResolutionUpscalePage.tsx b/src/features/resolution-upscale/ResolutionUpscalePage.tsx
index 5559199..5044bc4 100644
--- a/src/features/resolution-upscale/ResolutionUpscalePage.tsx
+++ b/src/features/resolution-upscale/ResolutionUpscalePage.tsx
@@ -21,9 +21,8 @@ import "../../styles/pages/image-workbench.css";
import { aiGenerationClient } from "../../api/aiGenerationClient";
import { waitForTask } from "../../api/taskSubscription";
import { saveToolTaskState, loadToolTaskState, clearToolTaskState } from "../workbench/toolKeepalive";
-import { translateTaskError } from "../../utils/translateTaskError";
import { getServerBaseUrl, isServerRequestError } from "../../api/serverConnection";
-import { summarizeUrl, formatFileSize, fileToDataUrl, wait } from "../../utils/toolPageUtils";
+import { summarizeUrl, formatFileSize, fileToDataUrl } from "../../utils/toolPageUtils";
import TaskStatusBar from "../../components/TaskStatusBar";
import BeforeAfterCompare from "../../components/BeforeAfterCompare";
import { addToolResultToAssetLibrary, saveToolResultToLocal } from "../workbench/toolResultActions";
diff --git a/src/features/script-tokens/ScriptTokensPage.tsx b/src/features/script-tokens/ScriptTokensPage.tsx
index 52a8ec6..55591d8 100644
--- a/src/features/script-tokens/ScriptTokensPage.tsx
+++ b/src/features/script-tokens/ScriptTokensPage.tsx
@@ -1,12 +1,6 @@
import {
- BarChartOutlined,
CheckCircleFilled,
CloseOutlined,
- CopyOutlined,
- DownloadOutlined,
- FileTextOutlined,
- LoadingOutlined,
- ThunderboltOutlined,
UploadOutlined,
} from "@ant-design/icons";
import { useEffect, useRef, useState, type ChangeEvent, type DragEvent, type KeyboardEvent } from "react";
@@ -264,7 +258,7 @@ function getDimensionEvidence(result: EvalResult, dim: ScoreDimension): string[]
return normalizeEvidenceItems(evidence, 3);
}
-function formatReportMarkdown(result: EvalResult, script: string): string {
+function formatReportMarkdown(result: EvalResult): string {
const lines: string[] = [];
lines.push(`# 剧本评测报告`);
lines.push("");
@@ -438,7 +432,7 @@ function ScriptTokensPage() {
const handleCopyReport = async () => {
if (!result) return;
- const text = formatReportMarkdown(result, script);
+ const text = formatReportMarkdown(result);
try {
await navigator.clipboard.writeText(text);
setCopied(true);
@@ -459,7 +453,7 @@ function ScriptTokensPage() {
const handleExportMarkdown = () => {
if (!result) return;
- const md = formatReportMarkdown(result, script);
+ const md = formatReportMarkdown(result);
const blob = new Blob([md], { type: "text/markdown;charset=utf-8" });
const url = URL.createObjectURL(blob);
const a = document.createElement("a");
diff --git a/src/features/script-tokens/TokenUsagePage.tsx b/src/features/script-tokens/TokenUsagePage.tsx
index 33dec5d..e119757 100644
--- a/src/features/script-tokens/TokenUsagePage.tsx
+++ b/src/features/script-tokens/TokenUsagePage.tsx
@@ -130,8 +130,6 @@ function TokenUsagePage({
loadEnterpriseUsage,
loadPersonalUsage,
onOpenMore,
- onOpenImageTool,
- onSelectView,
}: TokenUsagePageProps) {
const [enterpriseUsage, setEnterpriseUsage] = useState(null);
const [enterpriseUsageLoading, setEnterpriseUsageLoading] = useState(false);
diff --git a/src/features/size-template/SizeTemplatePage.tsx b/src/features/size-template/SizeTemplatePage.tsx
index cc32122..6d156c8 100644
--- a/src/features/size-template/SizeTemplatePage.tsx
+++ b/src/features/size-template/SizeTemplatePage.tsx
@@ -947,7 +947,6 @@ function SizeTemplatePage({ onOpenEcommerce }: SizeTemplatePageProps) {
);
const selectedPreset =
filteredTemplates.find((item) => item.title === activePresetTitle) ?? filteredTemplates[0] ?? sizeTemplatePresets[0]!;
- const activeGroupLabel = sizeTemplateGroups.find((item) => item.key === selectedPreset.group)?.label ?? "尺寸模板";
const platformOptions =
activeGroup === "socialCn"
? socialContentPlatformOptions
diff --git a/src/features/workbench/ConversationSidebar.tsx b/src/features/workbench/ConversationSidebar.tsx
index 12d701d..64ec94e 100644
--- a/src/features/workbench/ConversationSidebar.tsx
+++ b/src/features/workbench/ConversationSidebar.tsx
@@ -1,5 +1,4 @@
import {
- CloseOutlined,
DeleteOutlined,
EditOutlined,
MenuFoldOutlined,
diff --git a/src/features/workbench/WorkbenchPage.tsx b/src/features/workbench/WorkbenchPage.tsx
index c070246..a7c5967 100644
--- a/src/features/workbench/WorkbenchPage.tsx
+++ b/src/features/workbench/WorkbenchPage.tsx
@@ -2,24 +2,18 @@ import {
AppstoreOutlined,
ArrowDownOutlined,
ArrowUpOutlined,
- CaretRightOutlined,
ClockCircleOutlined,
CloseOutlined,
CopyOutlined,
DeleteOutlined,
- DownloadOutlined,
- FullscreenOutlined,
LoadingOutlined,
MessageOutlined,
- MutedOutlined,
PictureOutlined,
- PauseOutlined,
PlusOutlined,
ReloadOutlined,
SendOutlined,
SettingOutlined,
StopOutlined,
- ThunderboltOutlined,
VideoCameraOutlined,
} from "@ant-design/icons";
import {
@@ -35,10 +29,10 @@ import {
type SyntheticEvent,
} from "react";
import "../../styles/pages/workbench.css";
-import type { WebGenerationPreviewTask, WebUserSession } from "../../types";
+import type { WebUserSession } from "../../types";
import { aiGenerationClient } from "../../api/aiGenerationClient";
-import { claimGenerationSlot, getActiveGenerationTaskCount, getGenerationUserKey, releaseGenerationSlot } from "../../api/generationConcurrency";
-import { preUploadReference, resolvePreUploadedUrl } from "../../api/referenceUploadService";
+import { claimGenerationSlot, getActiveGenerationTaskCount, getEffectiveGenerationLimit, getGenerationUserKey, releaseGenerationSlot } from "../../api/generationConcurrency";
+import { preUploadReference } from "../../api/referenceUploadService";
import { assetClient } from "../../api/assetClient";
import { communityClient } from "../../api/communityClient";
import { loadRechargeModal, type RechargeModalComponent } from "../../components/RechargeModal/loadRechargeModal";
@@ -46,7 +40,6 @@ import { useGenerationTasks } from "../../hooks/useGenerationTasks";
import { conversationClient, type ConversationSummary } from "../../api/conversationClient";
import { modelCapabilitiesClient } from "../../api/modelCapabilitiesClient";
-import { buildApiUrl, buildAuthHeaders } from "../../api/serverConnection";
import type { CreatePreviewTaskInput } from "../../api/webGenerationGateway";
import type { WebProjectSummary } from "../../types";
import {
@@ -62,8 +55,6 @@ import {
MarkdownMessage,
ResultCard,
} from "./components/WorkbenchChatCards";
-import { renderMarkdownBlocks } from "./markdownRenderer";
-import { downloadResultAsset } from "./workbenchDownload";
import { translateTaskError } from "../../utils/translateTaskError";
import {
buildLocalTimeoutMessage,
@@ -80,7 +71,6 @@ import { isPixverseModel } from "../../utils/pixverseRouting";
import { resolveVideoRequestModel } from "../../utils/resolveVideoModel";
import { calculateEnterpriseVideoCredits, ENTERPRISE_DEFAULT_VIDEO_MODEL } from "../../utils/enterpriseVideoPolicy";
import {
- getImageQualityOptions,
getImageQualityOptionsForContext,
getDefaultImageQuality,
getDefaultImageQualityForContext,
@@ -90,8 +80,6 @@ import {
} from "../../utils/modelOptions";
import { filterImageModelOptionsForSession } from "../../utils/imageModelVisibility";
import { persistWorkbenchResultAsset, type PersistedWorkbenchResultAsset } from "./workbenchResultPersistence";
-import { SmoothedProgressBar } from "./SmoothedProgressBar";
-import { useSmoothedProgress } from "../../hooks/useSmoothedProgress";
import {
type WorkbenchMode,
type ToolbarMenuId,
@@ -99,8 +87,6 @@ import {
type WorkbenchOption,
type WorkbenchFieldGroup,
type ReferenceItem,
- type PromptMentionItem,
- type PromptMentionTokenRange,
type ChatAttachment,
type ChatMessage,
type DeleteDialogState,
@@ -117,33 +103,18 @@ import {
GRID_SUPPORTED_MODELS,
VIDEO_FRAME_OPTIONS,
VIDEO_DURATION_OPTIONS,
- MESSAGE_STORAGE_KEY,
- ACTIVE_CONVERSATION_STORAGE_KEY,
- PROMPT_HISTORY_STORAGE_KEY,
- TASK_KEEPALIVE_STORAGE_KEY,
- WORKBENCH_TASK_STALE_MS,
WORKBENCH_TASK_MAX_POLL_FAILURES,
- REFERENCE_IMAGE_COMPRESS_THRESHOLD,
- REFERENCE_IMAGE_MAX_DIMENSION,
- REFERENCE_IMAGE_INITIAL_QUALITY,
- REFERENCE_IMAGE_MIN_QUALITY,
- CHAT_MODEL,
CHAT_NATURAL_SYSTEM_PROMPT,
CHAT_TURN_STYLE_REMINDER,
- NON_CONVERSATIONAL_ASSISTANT_TEXT,
getCachedRole,
- getSessionUserId,
- userKey,
createId,
formatWorkbenchTimestamp,
- parseWorkbenchTimestampValue,
buildChatAttachments,
buildNaturalChatHistoryMessages,
getErrorText,
isAuthFailure,
isInsufficientBalance,
isInsufficientBalanceMessage,
- isTransientMessage,
getPersistableMessages,
shouldPersistPatch,
buildAssistantResult,
@@ -156,25 +127,18 @@ import {
persistMessages,
clearWorkbenchLocalState,
persistPromptHistory,
- buildRecoverableTaskFromMessage,
readStoredKeepaliveTasks,
persistKeepaliveTasks,
} from "./workbenchStorage";
import {
- getRatioOptionClassName,
- getSettingsGridColumnsClassName,
getReferenceAccept,
getReferenceUploadLabel,
getReferenceLimit,
getReferenceKindLabel,
- getReferenceEmptyCopy,
hexToRgbTriplet,
inferReferenceKind,
disposeReferencePreview,
- fileToDataUrl,
- bytesToHex,
buildReferenceFingerprint,
- canCompressReferenceImage,
compressReferenceImageIfNeeded,
buildReferenceToken,
resolveReferenceUrls,
@@ -188,7 +152,6 @@ import {
import {
findPromptMentionRangeInside,
findPromptMentionRangeOverlap,
- ReferenceInlinePreview,
ReferencePreview,
PromptPreviewLayer,
} from "./WorkbenchPromptPreview";
@@ -495,7 +458,6 @@ function WorkbenchPage({
const workbenchAccent = "#00ff88";
const hasConversationRecords = activeConversationId !== null || messages.length > 0;
const hasActivatedWorkspace = !effectiveOnboarding && (workspaceStarted || isGenerating || hasConversationRecords);
- const referenceCount = referenceItems.length;
const activeVideoModelValue = toHappyHorseDisplayModel(videoModel);
const activeModelValue =
activeMode === "image" ? imageModel : activeMode === "video" ? activeVideoModelValue : chatModel;
@@ -522,7 +484,6 @@ function WorkbenchPage({
[conversations],
);
const hasSidebarRecords = conversationRecords.length > 0;
- const hasActivatedWorkspace = workspaceStarted || isGenerating || hasConversationRecords;
const activeConversationTitle = useMemo(() => {
if (!activeConversationId) return "";
@@ -1008,7 +969,7 @@ function WorkbenchPage({
const patchConversationMessage = useCallback(
async (conversationId: number, messageId: string, patch: Partial) => {
- let sourceMessages =
+ const sourceMessages =
activeConversationIdRef.current === conversationId
? messagesRef.current
: conversationMessagesCacheRef.current.get(conversationId);
@@ -1056,6 +1017,54 @@ function WorkbenchPage({
persistKeepaliveTasks(rest);
};
+ const releaseKeepaliveTaskLocally = useCallback((taskId: string, options?: { cancelServer?: boolean }) => {
+ const task = keepaliveTasksRef.current[taskId];
+ taskAbortControllersRef.current.get(taskId)?.abort();
+ taskAbortControllersRef.current.delete(taskId);
+ removeKeepaliveTask(taskId);
+ if (task && options?.cancelServer) {
+ aiGenerationClient.cancelTask(task.taskId).catch(() => {});
+ }
+ syncActiveGenerationUi();
+ }, [syncActiveGenerationUi]);
+
+ const releaseKeepaliveTaskAfterNetworkLoss = useCallback((task: WorkbenchKeepaliveTask, progress: number) => {
+ const latestTask = {
+ ...task,
+ progress,
+ statusLabel: "网络中断，已释放提交按钮",
+ };
+ void patchConversationMessage(task.conversationId, task.assistantMessageId, {
+ status: "failed",
+ taskProgress: Math.max(progress, 100),
+ taskStatusLabel: "网络中断",
+ body: "网络中断，当前任务已停止等待并释放提交按钮。请确认网络恢复后重新提交任务。",
+ });
+ upsertKeepaliveTask(latestTask);
+ releaseKeepaliveTaskLocally(task.taskId, { cancelServer: true });
+ if (activeConversationIdRef.current === task.conversationId) {
+ setIsGenerating(false);
+ setGenerationStatus("网络中断，已释放提交按钮");
+ setGenerationProgress(0);
+ }
+ }, [patchConversationMessage, releaseKeepaliveTaskLocally]);
+
+ const cancelActiveKeepaliveTasksOnPageExit = useCallback(() => {
+ const tasks = Object.values(keepaliveTasksRef.current);
+ if (!tasks.length) return;
+ tasks.forEach((task) => {
+ taskAbortControllersRef.current.get(task.taskId)?.abort();
+ taskAbortControllersRef.current.delete(task.taskId);
+ releaseGenerationSlot(task.concurrencySlotId);
+ aiGenerationClient.cancelTaskOnUnload(task.taskId);
+ });
+ keepaliveTasksRef.current = {};
+ persistKeepaliveTasks({});
+ setIsGenerating(false);
+ setGenerationStatus("已释放未完成任务");
+ setGenerationProgress(0);
+ }, []);
+
const runKeepalivePoll = useCallback(
(task: WorkbenchKeepaliveTask) => {
if (taskAbortControllersRef.current.has(task.taskId)) return;
@@ -1082,6 +1091,10 @@ function WorkbenchPage({
if (abortController.signal.aborted) return;
if (attempt > 0) await sleep(3000);
if (abortController.signal.aborted) return;
+ if (typeof navigator !== "undefined" && navigator.onLine === false) {
+ releaseKeepaliveTaskAfterNetworkLoss(task, lastKnownProgress);
+ return;
+ }
let status;
try {
@@ -1095,7 +1108,8 @@ function WorkbenchPage({
taskProgress: 100,
taskStatusLabel: "任务异常",
});
- removeKeepaliveTask(task.taskId);
+ releaseKeepaliveTaskLocally(task.taskId, { cancelServer: true });
+ onRefreshUsage?.();
return;
}
continue;
@@ -1323,6 +1337,24 @@ function WorkbenchPage({
};
}, [runKeepalivePoll]);
+ useEffect(() => {
+ const handlePageHide = () => {
+ cancelActiveKeepaliveTasksOnPageExit();
+ };
+ const handleOnline = () => {
+ Object.values(keepaliveTasksRef.current).forEach((task) => runKeepalivePoll(task));
+ syncActiveGenerationUi();
+ };
+
+ window.addEventListener("pagehide", handlePageHide);
+ window.addEventListener("online", handleOnline);
+ aiGenerationClient.flushPendingTaskCancellations();
+ return () => {
+ window.removeEventListener("pagehide", handlePageHide);
+ window.removeEventListener("online", handleOnline);
+ };
+ }, [cancelActiveKeepaliveTasksOnPageExit, runKeepalivePoll, syncActiveGenerationUi]);
+
useEffect(() => {
persistPromptHistory(promptHistory);
}, [promptHistory]);
@@ -1987,7 +2019,7 @@ function WorkbenchPage({
const trimmedPrompt = (promptOverride ?? inputValue).trim();
if (!trimmedPrompt) return;
const userKey = getGenerationUserKey(session?.user.id);
- if (activeMode !== "chat" && getActiveGenerationTaskCount(userKey) >= 3) return;
+ if (activeMode !== "chat" && getActiveGenerationTaskCount(userKey) >= getEffectiveGenerationLimit()) return;
setReferencePreviewOpen(false);
let conversationId = activeConversationIdRef.current ?? activeConversationId;
@@ -2166,7 +2198,7 @@ function WorkbenchPage({
taskId = result.taskId;
genTracker.submitTask({ title: trimmedPrompt.slice(0, 60), type: "image", status: "running", progress: 5, prompt: trimmedPrompt, sourceView: "workbench", taskId });
} else {
- let requestModel = resolveVideoRequestModel({
+ const requestModel = resolveVideoRequestModel({
model: taskInput.params?.model || ENTERPRISE_DEFAULT_VIDEO_MODEL,
referenceUrls: refUrls,
});
@@ -2466,8 +2498,11 @@ function WorkbenchPage({
setProjectError("仅支持对视频结果进行超分");
return;
}
- if (getActiveGenerationTaskCount(getGenerationUserKey(session?.user.id)) >= 3) {
- setProjectError(`当前已有 ${getActiveGenerationTaskCount(getGenerationUserKey(session?.user.id))} 个任务进行中（上限3个），请等待任一任务完成后再提交新任务`);
+ const userKey = getGenerationUserKey(session?.user.id);
+ const activeCount = getActiveGenerationTaskCount(userKey);
+ const limit = getEffectiveGenerationLimit();
+ if (activeCount >= limit) {
+ setProjectError(`当前已有 ${activeCount} 个任务进行中（上限${limit}个），请等待任一任务完成后再提交新任务`);
return;
}
if (!isAuthenticated) {
@@ -2588,8 +2623,11 @@ function WorkbenchPage({
setProjectError("仅支持对图片结果进行超分");
return;
}
- if (getActiveGenerationTaskCount(getGenerationUserKey(session?.user.id)) >= 3) {
- setProjectError(`当前已有 ${getActiveGenerationTaskCount(getGenerationUserKey(session?.user.id))} 个任务进行中（上限3个），请等待任一任务完成后再提交新任务`);
+ const userKey = getGenerationUserKey(session?.user.id);
+ const activeCount = getActiveGenerationTaskCount(userKey);
+ const limit = getEffectiveGenerationLimit();
+ if (activeCount >= limit) {
+ setProjectError(`当前已有 ${activeCount} 个任务进行中（上限${limit}个），请等待任一任务完成后再提交新任务`);
return;
}
if (!isAuthenticated) {
@@ -2762,13 +2800,14 @@ function WorkbenchPage({
};
const activeGenerationCount = getActiveGenerationTaskCount(getGenerationUserKey(session?.user.id));
- const generationLimitReached = activeMode !== "chat" && activeGenerationCount >= 3;
+ const activeGenerationLimit = getEffectiveGenerationLimit();
+ const generationLimitReached = activeMode !== "chat" && activeGenerationCount >= activeGenerationLimit;
const promptIsEmpty = !inputValue.trim();
const sendDisabled = promptIsEmpty || generationLimitReached;
const sendButtonTitle = promptIsEmpty
? "输入内容后可发送"
: generationLimitReached
- ? `当前已有 ${activeGenerationCount} 个任务进行中，请等待任一任务完成`
+ ? `当前已有 ${activeGenerationCount} 个任务进行中（上限 ${activeGenerationLimit} 个），请等待任一任务完成`
: billingEstimate.title;
const suggestedPrompts = [
@@ -2954,7 +2993,7 @@ function WorkbenchPage({
diff --git a/src/features/workbench/workbenchReferenceUtils.ts b/src/features/workbench/workbenchReferenceUtils.ts
index 016e240..42f6efb 100644
--- a/src/features/workbench/workbenchReferenceUtils.ts
+++ b/src/features/workbench/workbenchReferenceUtils.ts
@@ -6,7 +6,6 @@ import {
type WorkbenchMode,
type ReferenceKind,
type ReferenceItem,
- type WorkbenchOption,
} from "./workbenchConstants";
import { resolvePreUploadedUrl } from "../../api/referenceUploadService";
@@ -82,7 +81,11 @@ export function fileToDataUrl(file: File) {
return new Promise((resolve, reject) => {
const reader = new FileReader();
reader.onload = () => {
- typeof reader.result === "string" ? resolve(reader.result) : reject(new Error("Unable to read reference file"));
+ if (typeof reader.result === "string") {
+ resolve(reader.result);
+ } else {
+ reject(new Error("Unable to read reference file"));
+ }
};
reader.onerror = () => reject(reader.error || new Error("Unable to read reference file"));
reader.readAsDataURL(file);
@@ -208,4 +211,4 @@ export async function resolveReferenceUrls(items: ReferenceItem[]): Promise url !== null);
-}
\ No newline at end of file
+}
diff --git a/src/stores/useGenerationStore.ts b/src/stores/useGenerationStore.ts
index 711aa7c..ad20197 100644
--- a/src/stores/useGenerationStore.ts
+++ b/src/stores/useGenerationStore.ts
@@ -1,5 +1,4 @@
import { create } from "zustand";
-import type { WebGenerationPreviewTask } from "../types";
export type QueueItemStatus = "pending" | "running" | "completed" | "failed" | "cancelled";
@@ -63,17 +62,6 @@ interface GenerationStoreState {
clearTerminal: () => void;
}
-function hashUserId(): string {
- try {
- const raw = localStorage.getItem("omniai-web-session");
- if (!raw) return "anon";
- const parsed = JSON.parse(raw) as { user?: { id?: number | string } };
- return String(parsed?.user?.id || "anon");
- } catch {
- return "anon";
- }
-}
-
const initialQueue = loadPersistedQueue();
export const useGenerationStore = create((set, get) => ({
diff --git a/src/styles/pages/compliance.css b/src/styles/pages/compliance.css
index ab3e1f3..6774345 100644
--- a/src/styles/pages/compliance.css
+++ b/src/styles/pages/compliance.css
@@ -788,6 +788,65 @@
overflow: hidden;
}
+.compliance-document {
+ gap: 0;
+ padding: 30px 34px 34px;
+ overflow: visible;
+}
+
+.compliance-document__title,
+.compliance-document__heading,
+.compliance-document__subheading,
+.compliance-document__paragraph,
+.compliance-document__clause {
+ margin: 0;
+ max-width: 100%;
+ color: var(--fg-body);
+ letter-spacing: 0;
+ overflow-wrap: anywhere;
+ word-break: break-word;
+}
+
+.compliance-document__title {
+ margin-bottom: 18px;
+ padding-bottom: 16px;
+ border-bottom: 1px solid var(--border-subtle);
+ font-size: clamp(24px, 3vw, 32px);
+ line-height: 1.22;
+}
+
+.compliance-document__heading {
+ margin: 26px 0 12px;
+ padding-top: 4px;
+ color: var(--accent);
+ font-size: 20px;
+ line-height: 1.35;
+}
+
+.compliance-document__subheading {
+ margin: 18px 0 8px;
+ font-size: 16px;
+ line-height: 1.5;
+}
+
+.compliance-document__paragraph,
+.compliance-document__clause {
+ color: var(--fg-muted);
+ font-size: 14px;
+ line-height: 1.85;
+}
+
+.compliance-document__paragraph + .compliance-document__paragraph,
+.compliance-document__clause + .compliance-document__clause,
+.compliance-document__paragraph + .compliance-document__clause,
+.compliance-document__clause + .compliance-document__paragraph {
+ margin-top: 8px;
+}
+
+.compliance-document__clause {
+ padding-left: 12px;
+}
+
.compliance-section {
display: grid;
grid-template-columns: 52px minmax(0, 1fr);
@@ -892,4 +951,12 @@
.compliance-section {
grid-template-columns: 1fr;
}
+
+ .compliance-document {
+ padding: 22px 18px 26px;
+ }
+
+ .compliance-document__clause {
+ padding-left: 0;
+ }
}
diff --git a/src/test/testHarness.ts b/src/test/testHarness.ts
new file mode 100644
index 0000000..089d4ca
--- /dev/null
+++ b/src/test/testHarness.ts
@@ -0,0 +1,150 @@
+type TestFn = () => unknown | Promise;
+
+interface TestCase {
+ name: string;
+ run: TestFn;
+ afterEachFns: TestFn[];
+}
+
+const tests: TestCase[] = [];
+const suiteStack: string[] = [];
+const afterEachStack: TestFn[][] = [[]];
+
+function formatValue(value: unknown): string {
+ return typeof value === "string" ? `"${value}"` : JSON.stringify(value);
+}
+
+function fail(message: string): never {
+ throw new Error(message);
+}
+
+function assertThrows(
+ actual: unknown,
+ expectedMessage?: string,
+ inverted = false,
+): void {
+ if (typeof actual !== "function") {
+ fail("Expected value to be a function");
+ }
+
+ let thrown: unknown;
+ try {
+ actual();
+ } catch (error) {
+ thrown = error;
+ }
+
+ if (inverted) {
+ if (thrown)
+ fail(
+ `Expected function not to throw, but it threw ${thrown instanceof Error ? thrown.message : String(thrown)}`,
+ );
+ return;
+ }
+
+ if (!thrown) fail("Expected function to throw");
+ if (expectedMessage) {
+ const message = thrown instanceof Error ? thrown.message : String(thrown);
+ if (!message.includes(expectedMessage)) {
+ fail(
+ `Expected thrown message to include "${expectedMessage}", got "${message}"`,
+ );
+ }
+ }
+}
+
+export function describe(name: string, run: () => void): void {
+ suiteStack.push(name);
+ afterEachStack.push([]);
+ try {
+ run();
+ } finally {
+ afterEachStack.pop();
+ suiteStack.pop();
+ }
+}
+
+export function it(name: string, run: TestFn): void {
+ tests.push({
+ name: [...suiteStack, name].join(" > "),
+ run,
+ afterEachFns: afterEachStack.flat(),
+ });
+}
+
+export function afterEach(run: TestFn): void {
+ afterEachStack[afterEachStack.length - 1].push(run);
+}
+
+export function expect(actual: unknown) {
+ return {
+ toBe(expected: unknown): void {
+ if (!Object.is(actual, expected)) {
+ fail(`Expected ${formatValue(actual)} to be ${formatValue(expected)}`);
+ }
+ },
+ toEqual(expected: unknown): void {
+ const actualJson = JSON.stringify(actual);
+ const expectedJson = JSON.stringify(expected);
+ if (actualJson !== expectedJson) {
+ fail(`Expected ${actualJson} to equal ${expectedJson}`);
+ }
+ },
+ toThrow(expectedMessage?: string): void {
+ assertThrows(actual, expectedMessage);
+ },
+ not: {
+ toThrow(): void {
+ assertThrows(actual, undefined, true);
+ },
+ },
+ };
+}
+
+export async function runRegisteredTests(): Promise<{
+ passed: number;
+ failed: number;
+ total: number;
+}> {
+ let passed = 0;
+ let failed = 0;
+
+ for (const test of tests) {
+ let failure: unknown;
+ try {
+ await test.run();
+ } catch (error) {
+ failure = error;
+ }
+
+ for (const hook of [...test.afterEachFns].reverse()) {
+ try {
+ await hook();
+ } catch (error) {
+ failure = failure || error;
+ }
+ }
+
+ if (failure) {
+ failed += 1;
+ console.error(`FAIL ${test.name}`);
+ console.error(
+ failure instanceof Error
+ ? ` ${failure.message}`
+ : ` ${String(failure)}`,
+ );
+ } else {
+ passed += 1;
+ console.log(`PASS ${test.name}`);
+ }
+ }
+
+ const total = passed + failed;
+ if (total === 0) {
+ console.error("No unit tests were registered.");
+ return { passed, failed: 1, total };
+ }
+
+ console.log(`\n${passed} passed, ${failed} failed`);
+ return { passed, failed, total };
+}
diff --git a/src/test/testHarness/index.ts b/src/test/testHarness/index.ts
new file mode 100644
index 0000000..eddac1e
--- /dev/null
+++ b/src/test/testHarness/index.ts
@@ -0,0 +1 @@
+export * from "../testHarness";
diff --git a/src/utils/enterpriseVideoPolicy.test.ts b/src/utils/enterpriseVideoPolicy.test.ts
new file mode 100644
index 0000000..31e34e9
--- /dev/null
+++ b/src/utils/enterpriseVideoPolicy.test.ts
@@ -0,0 +1,48 @@
+import { describe, expect, it } from "../test/testHarness";
+
+import {
+ calculateEnterpriseVideoCredits,
+ getEnterpriseVideoCreditRate,
+ normalizeEnterpriseResolution,
+} from "./enterpriseVideoPolicy";
+
+describe("enterpriseVideoPolicy", () => {
+ it("keeps video billing at 1 CNY to 100 credits", () => {
+ expect(
+ calculateEnterpriseVideoCredits({
+ model: "happyhorse-1.0",
+ resolution: "1080P",
+ durationSeconds: 5,
+ }),
+ ).toBe(640);
+
+ expect(
+ calculateEnterpriseVideoCredits({
+ model: "wan2.7-i2v",
+ resolution: "720P",
+ durationSeconds: 5,
+ }),
+ ).toBe(300);
+ });
+
+ it("rounds duration up to the next second before billing", () => {
+ expect(
+ calculateEnterpriseVideoCredits({
+ model: "vidu-q3-turbo",
+ resolution: "1080P",
+ durationSeconds: 5.2,
+ }),
+ ).toBe(600);
+ });
+
+ it("normalizes unsupported resolutions to 1080P", () => {
+ expect(normalizeEnterpriseResolution("4K")).toBe("1080P");
+ expect(
+ getEnterpriseVideoCreditRate({
+ model: "pixverse-c1",
+ resolution: "4K",
+ durationSeconds: 5,
+ }),
+ ).toBe(1);
+ });
+});
diff --git a/src/utils/errorReporting.ts b/src/utils/errorReporting.ts
index c637853..a1499c3 100644
--- a/src/utils/errorReporting.ts
+++ b/src/utils/errorReporting.ts
@@ -10,7 +10,7 @@ interface ErrorReport {
sessionId?: string;
}
-let reportQueue: ErrorReport[] = [];
+const reportQueue: ErrorReport[] = [];
let flushTimer: ReturnType | null = null;
function getSessionId(): string | undefined {
diff --git a/src/utils/mentionTrigger.ts b/src/utils/mentionTrigger.ts
index ca74b42..3a4d3f1 100644
--- a/src/utils/mentionTrigger.ts
+++ b/src/utils/mentionTrigger.ts
@@ -38,7 +38,7 @@ export function detectMentionTrigger(textBeforeCursor: string): MentionTriggerMa
const query = textBeforeCursor.slice(atIdx + 1);
// Query must not contain spaces or punctuation that would break a mention token
- if (/[\s，。、；：！？?!.,;:(){}\[\]<>""''《》【】@]/.test(query)) {
+ if (/[\s，。、；：！？?!.,;:(){}[\]<>""''《》【】@]/.test(query)) {
return null;
}
diff --git a/src/utils/taskLifecycle.test.ts b/src/utils/taskLifecycle.test.ts
new file mode 100644
index 0000000..6189d79
--- /dev/null
+++ b/src/utils/taskLifecycle.test.ts
@@ -0,0 +1,59 @@
+import { describe, expect, it } from "../test/testHarness";
+
+import {
+ TEXT_INPUT_CREDITS_PER_MILLION,
+ TEXT_OUTPUT_CREDITS_PER_MILLION,
+ estimateTextTokenCredits,
+ getTaskTimeoutPolicy,
+ isTaskLocallyTimedOut,
+} from "./taskLifecycle";
+
+describe("taskLifecycle", () => {
+ it("keeps text token billing at 1 CNY to 100 credits", () => {
+ expect(TEXT_INPUT_CREDITS_PER_MILLION).toBe(200);
+ expect(TEXT_OUTPUT_CREDITS_PER_MILLION).toBe(500);
+ expect(
+ estimateTextTokenCredits({
+ promptTokens: 1_000_000,
+ completionTokens: 1_000_000,
+ }),
+ ).toBe(700);
+ });
+
+ it("ignores negative token counts when estimating text billing", () => {
+ expect(
+ estimateTextTokenCredits({
+ promptTokens: -100,
+ completionTokens: 500_000,
+ }),
+ ).toBe(250);
+ });
+
+ it("marks unstarted tasks locally timed out after submit timeout", () => {
+ const policy = getTaskTimeoutPolicy({ kind: "image" });
+
+ expect(
+ isTaskLocallyTimedOut({
+ startedAt: 1_000,
+ lastProgressAt: 1_000,
+ now: 1_000 + policy.submitTimeoutMs,
+ policy,
+ progress: 0,
+ }),
+ ).toBe("no_progress");
+ });
+
+ it("marks running tasks locally timed out when progress stops", () => {
+ const policy = getTaskTimeoutPolicy({ kind: "video", model: "wan2.7-i2v" });
+
+ expect(
+ isTaskLocallyTimedOut({
+ startedAt: 1_000,
+ lastProgressAt: 2_000,
+ now: 2_000 + policy.noProgressTimeoutMs,
+ policy,
+ progress: 40,
+ }),
+ ).toBe("no_progress");
+ });
+});