Skip to content

Formerly KrillinAI, VideoTranslation and Dubbing Tool for 120+ Languages. Open-source AI workspace for creators, powered by Codex. Video downloader, video translation, create videos, images, audios, and edits with Agents in one place. For your Social Media like YouTube, TikTok, Instagram, etc.

feat: add creator video generation workflow

wulien9a17c58efbed
diff --git a/apps/daemon/package.json b/apps/daemon/package.json
index 788de887..7787ab41 100644
--- a/apps/daemon/package.json
+++ b/apps/daemon/package.json
@@ -6,7 +6,7 @@
"predev": "pnpm --filter @opencreator/protocol build && pnpm --filter @opencreator/config build && pnpm --filter @opencreator/skill-market build",
"dev": "node scripts/dev.mjs",
"prebuild": "pnpm --filter @opencreator/protocol build && pnpm --filter @opencreator/config build && pnpm --filter @opencreator/skill-market build",
- "build": "tsc -p tsconfig.json",
+ "build": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\" && tsc -p tsconfig.json",
"pretypecheck": "pnpm --filter @opencreator/protocol build && pnpm --filter @opencreator/config build && pnpm --filter @opencreator/skill-market build",
"typecheck": "tsc -p tsconfig.json --noEmit && tsc -p tsconfig.test.json",
"pretest": "pnpm --filter @opencreator/protocol build && pnpm --filter @opencreator/config build && pnpm --filter @opencreator/skill-market build",
diff --git a/apps/daemon/src/api/server.ts b/apps/daemon/src/api/server.ts
index 3b17856f..f641e600 100644
--- a/apps/daemon/src/api/server.ts
+++ b/apps/daemon/src/api/server.ts
@@ -54,9 +54,11 @@ import {
createFfmpegCoverImageNormalizer,
createImageExecutor
} from '../creator/image/executor.js';
+import { createVideoExecutor } from '../creator/video/executor.js';
import { createClipExecutor } from '../creator/clip/executor.js';
import { createStickmanExecutor } from '../creator/stickman/executor.js';
import { createCreatorProjectCoverService } from '../creator/project-cover.js';
+import { createVideoGenerationService } from '../video-generation/service.js';
import {
createCreatorReferenceImageUploadService,
type CreatorReferenceImageUploadService
@@ -134,7 +136,6 @@ import {
} from '../codex/skills/source-installer.js';
import { buildCodexStatusResponse } from '../codex/status.js';
import { createCleanupService } from '../cleanup/service.js';
-import { removeEmptyLegacyDataDirectories } from '../config/product-data-migration.js';
import {
createCreatorServicesConfigStoreWithTextModelFallback,
createFileCreatorServicesConfigStore,
@@ -192,7 +193,6 @@ import { registerScheduleRoutes } from './routes.schedules.js';
import { registerSkillMarketRoutes } from './routes.skill-market.js';
import { registerSkillRoutes } from './routes.skills.js';
import { registerSmartDubbingRoutes } from './routes.smart-dubbing.js';
-import { registerVideoGenerationRoutes } from './routes.video-generation.js';
import { registerTaskRoutes } from './routes.tasks.js';
import { registerThreadRoutes } from './routes.threads.js';
import { registerWorkspaceFileRoutes } from './routes.workspace-files.js';
@@ -376,8 +376,7 @@ export async function buildServer(input: BuildServerInput) {
)
: createOpenCreatorCreatorServicesConfigStore({
configFile,
- credentialsFile: input.credentialsFile,
- legacyFile: join(dataDir, 'config', 'creator-services.json')
+ credentialsFile: input.credentialsFile
})
);
const codexProviderCredentialStore =
@@ -386,18 +385,8 @@ export async function buildServer(input: BuildServerInput) {
? createFileCodexProviderCredentialStore(
join(dataDir, 'config', 'codex-provider.json')
)
- : createOpenCreatorCodexProviderCredentialStore(
- input.credentialsFile,
- join(dataDir, 'config', 'codex-provider.json')
- )
+ : createOpenCreatorCodexProviderCredentialStore(input.credentialsFile)
);
- if (input.credentialsFile !== undefined) {
- await Promise.all([
- storedCreatorServicesConfigStore.read(),
- codexProviderCredentialStore.readApiKey()
- ]);
- removeEmptyLegacyDataDirectories(dataDir);
- }
const resolveCodexProviderApiKey = async (provider: {
baseUrl: string;
model: string;
@@ -512,6 +501,10 @@ export async function buildServer(input: BuildServerInput) {
dataDir,
ttsService: krillinTtsService
});
+ const videoGenerationService = createVideoGenerationService({
+ dataDir,
+ configStore: creatorServicesConfigStore
+ });
const creatorExecutors: CreatorExecutor[] = input.creatorExecutors ?? [];
let creatorFfmpegPath: string | undefined;
let creatorFfprobePath: string | undefined;
@@ -607,6 +600,12 @@ export async function buildServer(input: BuildServerInput) {
)
})
}));
+ if (creatorFfprobePath !== undefined) {
+ creatorExecutors.push(createVideoExecutor({
+ service: videoGenerationService,
+ probeVideo: path => validateMediaFile(path, creatorFfprobePath!)
+ }));
+ }
}
const creatorProjectCoverService = createCreatorProjectCoverService({
jobsRoot: creatorJobsRoot,
diff --git a/apps/daemon/src/codex/provider-credential-store.ts b/apps/daemon/src/codex/provider-credential-store.ts
index b3dbc44d..b5d57c0a 100644
--- a/apps/daemon/src/codex/provider-credential-store.ts
+++ b/apps/daemon/src/codex/provider-credential-store.ts
@@ -1,5 +1,4 @@
import {
- deletePrivateJsonFile,
readPrivateJsonFile,
writePrivateJsonFile
} from '../config/private-json-file.js';
@@ -64,26 +63,13 @@ export function createFileCodexProviderCredentialStore(
}
export function createOpenCreatorCodexProviderCredentialStore(
- path: string,
- legacyPath?: string
+ path: string
): CodexProviderCredentialStore {
- const legacy = legacyPath === undefined
- ? undefined
- : createFileCodexProviderCredentialStore(legacyPath);
return {
async readApiKey() {
const document = await readOpenCreatorCredentials(path);
const current = document.codexProvider?.apiKey.trim();
- if (current !== undefined && current.length > 0) return current;
- const legacyApiKey = await legacy?.readApiKey().catch(() => undefined);
- if (legacyApiKey !== undefined) {
- await updateOpenCreatorCredentials(path, value => ({
- ...value,
- codexProvider: { apiKey: legacyApiKey }
- }));
- await deletePrivateJsonFile(legacyPath!);
- }
- return legacyApiKey;
+ return current === undefined || current.length === 0 ? undefined : current;
},
async writeApiKey(apiKey) {
await updateOpenCreatorCredentials(path, value => ({
diff --git a/apps/daemon/src/config/product-data-migration.ts b/apps/daemon/src/config/product-data-migration.ts
deleted file mode 100644
index 0e271e5a..00000000
--- a/apps/daemon/src/config/product-data-migration.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import {
- existsSync,
- mkdirSync,
- readFileSync,
- readdirSync,
- renameSync,
- rmSync,
- rmdirSync
-} from 'node:fs';
-import { join } from 'node:path';
-import {
- migrateDirectoryIfEmpty,
- type DirectoryMigrationResult
-} from '@opencreator/config';
-
-export type LegacyProductDataMigration = {
- name: 'creator-codex' | 'yt-dlp' | 'krillinai-dependencies' | 'creator-jobs';
- result: DirectoryMigrationResult;
- legacyRemoved: boolean;
-};
-
-export function migrateLegacyDaemonProductData(input: {
- dataDir: string;
- runtimeDir: string;
- creatorDir: string;
-}): LegacyProductDataMigration[] {
- const migrations = [
- {
- name: 'creator-codex' as const,
- source: join(input.dataDir, 'creator-runtime', 'codex-home'),
- target: join(input.runtimeDir, 'creator-codex')
- },
- {
- name: 'yt-dlp' as const,
- source: join(input.dataDir, 'creator-runtime', 'yt-dlp'),
- target: join(input.runtimeDir, 'yt-dlp')
- },
- {
- name: 'krillinai-dependencies' as const,
- source: join(
- input.dataDir,
- 'creator-runtime',
- 'dependencies',
- 'krillinai'
- ),
- target: join(input.runtimeDir, 'krillinai', 'dependencies')
- },
- {
- name: 'creator-jobs' as const,
- source: join(input.dataDir, 'creator', 'jobs'),
- target: join(input.creatorDir, 'jobs')
- }
- ].map(migration => {
- const result = migrateDirectoryIfEmpty(migration.source, migration.target);
- const legacyRemoved = result.migrated;
- if (legacyRemoved) {
- rmSync(migration.source, { recursive: true, force: true });
- }
- return {
- name: migration.name,
- result,
- legacyRemoved
- };
- });
-
- removeEmptyDirectory(join(input.dataDir, 'creator-runtime', 'dependencies'));
- removeEmptyDirectory(join(input.dataDir, 'creator-runtime'));
- removeEmptyDirectory(join(input.dataDir, 'creator'));
- return migrations;
-}
-
-export function consolidateLegacyConfigData(input: {
- dataDir: string;
- appHome: string;
-}): void {
- const sourceDir = join(input.dataDir, 'legacy');
- if (existsSync(sourceDir)) {
- const targetDir = join(input.appHome, 'legacy');
- mkdirSync(targetDir, { recursive: true, mode: 0o700 });
- for (const name of readdirSync(sourceDir).sort()) {
- if (!/^clawee-config(?:-\d+)?\.toml$/.test(name)) continue;
- const source = join(sourceDir, name);
- const sourceContents = readFileSync(source);
- const duplicate = readdirSync(targetDir)
- .filter(candidate => /^clawee-config(?:-\d+)?\.toml$/.test(candidate))
- .map(candidate => join(targetDir, candidate))
- .find(candidate => readFileSync(candidate).equals(sourceContents));
- if (duplicate !== undefined) {
- rmSync(source);
- continue;
- }
- renameSync(source, nextLegacyConfigPath(targetDir));
- }
- }
- removeEmptyLegacyDataDirectories(input.dataDir);
-}
-
-export function removeEmptyLegacyDataDirectories(dataDir: string): void {
- removeEmptyDirectory(join(dataDir, 'config'));
- removeEmptyDirectory(join(dataDir, 'legacy'));
-}
-
-function nextLegacyConfigPath(targetDir: string): string {
- let destination = join(targetDir, 'clawee-config.toml');
- let suffix = 2;
- while (existsSync(destination)) {
- destination = join(targetDir, `clawee-config-${suffix}.toml`);
- suffix += 1;
- }
- return destination;
-}
-
-function removeEmptyDirectory(path: string): void {
- if (!existsSync(path) || readdirSync(path).length > 0) return;
- rmdirSync(path);
-}
diff --git a/apps/daemon/src/creator-services/config-store.ts b/apps/daemon/src/creator-services/config-store.ts
index d2ae6cac..bf8097e8 100644
--- a/apps/daemon/src/creator-services/config-store.ts
+++ b/apps/daemon/src/creator-services/config-store.ts
@@ -9,10 +9,7 @@ import {
readOpenCreatorConfig,
updateOpenCreatorConfig
} from '@opencreator/config';
-import {
- createPrivateJsonDocumentEntry,
- deletePrivateJsonFile
-} from '../config/private-json-file.js';
+import { createPrivateJsonDocumentEntry } from '../config/private-json-file.js';
import {
readOpenCreatorCredentials,
updateOpenCreatorCredentials
@@ -196,24 +193,12 @@ export function createFileCreatorServicesConfigStore(
export function createOpenCreatorCreatorServicesConfigStore(input: {
configFile: string;
credentialsFile: string;
- legacyFile?: string;
}): CreatorServicesConfigStore {
- const legacyStore = input.legacyFile === undefined
- ? undefined
- : createFileCreatorServicesConfigStore(input.legacyFile);
const store: CreatorServicesConfigStore = {
async read() {
const snapshot = readOpenCreatorConfig(input.configFile);
if (!snapshot.configured.creatorServices) {
- if (legacyStore === undefined) return createDefaultCreatorServicesConfig();
- try {
- const legacy = await legacyStore.read();
- await store.write(legacy);
- await deletePrivateJsonFile(input.legacyFile!);
- return legacy;
- } catch {
- return createDefaultCreatorServicesConfig();
- }
+ return createDefaultCreatorServicesConfig();
}
const publicConfig = parseCreatorServicesConfig(
snapshot.document.creatorServices
diff --git a/apps/daemon/src/creator/project-cover.ts b/apps/daemon/src/creator/project-cover.ts
index f6967fc6..aec7630e 100644
--- a/apps/daemon/src/creator/project-cover.ts
+++ b/apps/daemon/src/creator/project-cover.ts
@@ -26,7 +26,8 @@ const videoArtifactKinds = [
'dubbed_video',
'auto_clip_video',
'stickman_video',
- 'clip_video'
+ 'clip_video',
+ 'generated_video'
] as const;
export function createCreatorProjectCoverService(input: {
diff --git a/apps/daemon/src/creator/service.ts b/apps/daemon/src/creator/service.ts
index b3873e25..6c152b35 100644
--- a/apps/daemon/src/creator/service.ts
+++ b/apps/daemon/src/creator/service.ts
@@ -332,12 +332,14 @@ export function createCreatorService(input: {
current.revision
);
}
- const supportsReferenceImage = current.templateVersion >= 2
- && (current.templateId === 'cover' || current.templateId === 'image-generation');
+ const supportsReferenceImage = (
+ current.templateVersion >= 2
+ && (current.templateId === 'cover' || current.templateId === 'image-generation')
+ ) || current.templateId === 'video-generation';
if (!supportsReferenceImage) {
throw new CreatorServiceError(
'creator_reference_upload_unsupported',
- 'Reference image upload is only supported for current cover and image generation jobs'
+ 'Reference image upload is only supported for current cover, image generation, and video generation jobs'
);
}
const duplicate = [...current.artifacts].reverse().find(artifact => (
@@ -383,7 +385,9 @@ export function createCreatorService(input: {
});
const referenceImageLabel = current.templateId === 'cover'
? '封面参考图'
- : '图像生成参考图';
+ : current.templateId === 'video-generation'
+ ? '视频生成参考图'
+ : '图像生成参考图';
repository.insertActivity({
jobId,
revision,
diff --git a/apps/daemon/src/creator/stage-runner.ts b/apps/daemon/src/creator/stage-runner.ts
index 268a9d8d..65a246f6 100644
--- a/apps/daemon/src/creator/stage-runner.ts
+++ b/apps/daemon/src/creator/stage-runner.ts
@@ -484,7 +484,11 @@ function resultSnapshotDescription(stageId: string, templateId: string): string
if (stageId === 'tts') return '生成配音';
if (stageId === 'render-horizontal') return '合成横屏视频';
if (stageId === 'render-vertical') return '合成竖屏视频';
- if (stageId === 'generate') return templateId === 'cover' ? '生成封面' : '生成图片';
+ if (stageId === 'generate') {
+ if (templateId === 'cover') return '生成封面';
+ if (templateId === 'video-generation') return '生成视频';
+ return '生成图片';
+ }
return `完成 ${stageId}`;
}
@@ -495,8 +499,10 @@ function creatorConfigurationInput(code: string, message: string): Record<string
? 'transcription'
: code === 'creator_tts_config_missing'
? 'tts'
- : code === 'creator_image_config_missing'
+ : code === 'creator_image_config_missing'
? 'image'
+ : code === 'creator_video_config_missing'
+ ? 'video'
: null;
return section === null ? null : {
code,
diff --git a/apps/daemon/src/creator/templates/registry.ts b/apps/daemon/src/creator/templates/registry.ts
index 400f13db..dade7b51 100644
--- a/apps/daemon/src/creator/templates/registry.ts
+++ b/apps/daemon/src/creator/templates/registry.ts
@@ -8,6 +8,7 @@ import {
createImageGenerationTemplate,
createLegacyImageGenerationTemplate
} from './image-generation.js';
+import { createVideoGenerationTemplate } from './video-generation.js';
import { createAutoClipTemplate } from './auto-clip.js';
import { createStickmanVideoTemplate } from './stickman-video.js';
import type {
@@ -21,6 +22,7 @@ export {
createLegacyCoverTemplate,
createImageGenerationTemplate,
createLegacyImageGenerationTemplate,
+ createVideoGenerationTemplate,
createStickmanVideoTemplate,
createLegacyVideoDownloadTemplate,
createVideoDownloadTemplate,
@@ -36,6 +38,7 @@ export function createDefaultCreatorTemplateRegistry(): CreatorTemplateRegistry
createCoverTemplate(),
createLegacyImageGenerationTemplate(),
createImageGenerationTemplate(),
+ createVideoGenerationTemplate(),
createAutoClipTemplate(),
createStickmanVideoTemplate()
]);
diff --git a/apps/daemon/src/creator/templates/video-generation.ts b/apps/daemon/src/creator/templates/video-generation.ts
new file mode 100644
index 00000000..42ef2495
--- /dev/null
+++ b/apps/daemon/src/creator/templates/video-generation.ts
@@ -0,0 +1,51 @@
+import { z } from 'zod';
+import type { CreatorTemplateDefinition } from './types.js';
+
+const record = z.record(z.string(), z.unknown()) as never;
+
+export function createVideoGenerationTemplate(): CreatorTemplateDefinition {
+ return {
+ id: 'video-generation',
+ version: 1,
+ renderer: 'video-generation',
+ inputSchema: z.object({
+ prompt: z.string().max(4_000).default(''),
+ provider: z.enum(['seedance', 'kling', 'veo']).default('seedance'),
+ model: z.string().trim().min(1).max(200).optional(),
+ size: z.enum(['1280x720', '720x1280', '1024x1024']).default('1280x720'),
+ duration: z.union([
+ z.literal(4),
+ z.literal(5),
+ z.literal(6),
+ z.literal(8),
+ z.literal(10)
+ ]).default(5),
+ referenceImageArtifactId: z.string().nullable().default(null),
+ currentStage: z.string().nullable().default(null)
+ }).passthrough() as never,
+ stages: [{
+ id: 'generate',
+ executor: 'video',
+ allowedJobStatuses: ['draft', 'running', 'failed', 'needs_input', 'completed'],
+ inputArtifacts: [{
+ kind: 'reference_image',
+ selector: 'state-artifact-id',
+ stateKey: 'referenceImageArtifactId',
+ optional: true
+ }],
+ outputArtifacts: [{ kind: 'generated_video', status: 'completed' }]
+ }],
+ actions: [
+ { id: 'update-settings', inputSchema: record, allowedStages: ['generate'] },
+ { id: 'run-stage', inputSchema: record, allowedStages: ['generate'] },
+ { id: 'undo-action', inputSchema: record, allowedStages: ['generate'] }
+ ],
+ outputs: [{ kind: 'generated_video', required: true }],
+ agentGuidance: [
+ '先明确主体动作、场景、镜头运动、光线和视觉风格。',
+ '可通过 referenceImageArtifactId 显式绑定参考图。',
+ '再设置视频服务、具体模型版本、画幅和时长,启动执行时使用 generate 阶段。',
+ '重新生成会创建新的结果版本并保留历史视频。'
+ ].join('')
+ };
+}
diff --git a/apps/daemon/src/creator/video/executor.ts b/apps/daemon/src/creator/video/executor.ts
new file mode 100644
index 00000000..30701604
--- /dev/null
+++ b/apps/daemon/src/creator/video/executor.ts
@@ -0,0 +1,390 @@
+import type {
+ CreateVideoGenerationRequest,
+ CreatorArtifact,
+ CreatorJson,
+ VideoGenerationDuration,
+ VideoGenerationProvider,
+ VideoGenerationResult,
+ VideoGenerationSize
+} from '@opencreator/protocol';
+import { readFile, stat } from 'node:fs/promises';
+import { extname, join } from 'node:path';
+import type { MediaProbe } from '../validators/media.js';
+import type { CreatorExecutor, CreatorExecutorInput } from '../executor.js';
+import { CreatorExecutorError } from '../executor.js';
+import {
+ VideoGenerationError,
+ type VideoGenerationService
+} from '../../video-generation/service.js';
+
+type ProbeVideo = (path: string) => Promise<MediaProbe>;
+const MAX_CONSECUTIVE_REFRESH_FAILURES = 3;
+
+export function createVideoExecutor(input: {
+ service: VideoGenerationService;
+ probeVideo: ProbeVideo;
+ pollIntervalMs?: number;
+ sleep?: (ms: number, signal: AbortSignal) => Promise<void>;
+}): CreatorExecutor {
+ const pollIntervalMs = Math.max(250, input.pollIntervalMs ?? 2_500);
+ const sleep = input.sleep ?? abortableSleep;
+
+ return {
+ id: 'video',
+ async run(stage) {
+ try {
+ stage.reportProgress({
+ status: 'running',
+ phase: 'validating',
+ percent: 3
+ });
+ const request = await videoRequest(stage);
+ const resumedResultId = readResumedResultId(stage);
+ const outputPath = join(stage.workdir, 'OpenCreator-generated-video.mp4');
+
+ let result: VideoGenerationResult;
+ if (resumedResultId === undefined) {
+ stage.reportProgress({
+ status: 'running',
+ phase: request.referenceImage === undefined
+ ? 'submitting'
+ : 'preparing_reference',
+ percent: request.referenceImage === undefined ? 8 : 5
+ });
+ if (request.referenceImage !== undefined) {
+ stage.reportProgress({
+ status: 'running',
+ phase: 'submitting',
+ percent: 8
+ });
+ }
+ result = await input.service.create(request, {
+ signal: stage.signal,
+ onDownloadStart: () => reportDownloading(stage)
+ });
+ stage.reportProgress({
+ ...remoteProgress(result),
+ videoGenerationResultId: result.id,
+ upstreamProvider: result.provider,
+ upstreamModel: result.model
+ });
+ } else {
+ result = await input.service.get(resumedResultId);
+ stage.reportProgress({
+ ...remoteProgress(result),
+ videoGenerationResultId: result.id,
+ upstreamProvider: result.provider,
+ upstreamModel: result.model,
+ resumedUpstreamTask: true
+ });
+ }
+
+ let consecutiveRefreshFailures = 0;
+ while (result.status === 'queued' || result.status === 'in_progress') {
+ await sleep(pollIntervalMs, stage.signal);
+ try {
+ result = await input.service.refresh(result.id, {
+ signal: stage.signal,
+ onDownloadStart: () => reportDownloading(stage)
+ });
+ consecutiveRefreshFailures = 0;
+ } catch (error) {
+ if (
+ isRetryableRefreshError(error)
+ && consecutiveRefreshFailures < MAX_CONSECUTIVE_REFRESH_FAILURES
+ ) {
+ consecutiveRefreshFailures += 1;
+ stage.reportProgress({
+ status: 'running',
+ phase: 'generating',
+ percent: null,
+ message: 'The provider status connection was interrupted and will be retried',
+ videoGenerationResultId: result.id,
+ upstreamProvider: result.provider,
+ upstreamModel: result.model,
+ refreshRetry: consecutiveRefreshFailures
+ });
+ continue;
+ }
+ throw error;
+ }
+ stage.reportProgress({
+ ...remoteProgress(result),
+ videoGenerationResultId: result.id,
+ upstreamProvider: result.provider,
+ upstreamModel: result.model
+ });
+ }
+
+ if (result.status === 'failed') {
+ throw new CreatorExecutorError(
+ 'creator_video_generation_failed',
+ result.error || 'The video provider failed to generate a video'
+ );
+ }
+
+ stage.reportProgress({
+ status: 'running',
+ phase: 'collecting_output',
+ percent: 94,
+ videoGenerationResultId: result.id
+ });
+ await input.service.copyTo(result.id, outputPath);
+ stage.reportProgress({
+ status: 'running',
+ phase: 'validating_output',
+ percent: 97,
+ videoGenerationResultId: result.id
+ });
+ const media = await input.probeVideo(outputPath);
+ if (!media.hasVideo) {
+ throw new CreatorExecutorError(
+ 'creator_video_output_invalid',
+ 'The generated file does not contain a video stream'
+ );
+ }
+ const info = await stat(outputPath);
+ const reference = stage.inputArtifacts.find(artifact => artifact.kind === 'reference_image');
+ const fileName = result.fileName || 'OpenCreator-generated-video.mp4';
+ const metadata: Record<string, CreatorJson> = {
+ provider: result.provider,
+ model: result.model,
+ videoSize: result.videoSize,
+ requestedDuration: result.duration,
+ duration: media.duration,
+ width: media.width ?? null,
+ height: media.height ?? null,
+ hasAudio: media.hasAudio,
+ mimeType: 'video/mp4',
+ bytes: info.size,
+ size: info.size,
+ fileName,
+ generationMode: reference === undefined ? 'text-to-video' : 'image-to-video',
+ videoGenerationResultId: result.id,
+ ...(reference === undefined ? {} : { referenceArtifactId: reference.id })
+ };
+ stage.reportProgress({
+ status: 'succeeded',
+ phase: 'completed',
+ percent: 100,
+ completed: 1,
+ failed: 0,
+ total: 1,
+ videoGenerationResultId: result.id
+ });
+ return {
+ outputs: [{
+ kind: 'generated_video',
+ status: 'completed',
+ path: outputPath,
+ metadata
+ }],
+ progress: {
+ status: 'succeeded',
+ phase: 'completed',
+ percent: 100,
+ completed: 1,
+ failed: 0,
+ total: 1,
+ videoGenerationResultId: result.id
+ }
+ };
+ } catch (error) {
+ throw creatorVideoError(error);
+ }
+ }
+ };
+}
+
+async function videoRequest(
+ stage: CreatorExecutorInput
+): Promise<CreateVideoGenerationRequest> {
+ const prompt = readString(stage.job.state.prompt);
+ if (!prompt) {
+ throw new CreatorExecutorError(
+ 'creator_stage_input_missing',
+ 'Video prompt is required'
+ );
+ }
+ const reference = stage.inputArtifacts.find(artifact => artifact.kind === 'reference_image');
+ return {
+ prompt,
+ provider: readProvider(stage.job.state.provider),
+ ...(readString(stage.job.state.model)
+ ? { model: readString(stage.job.state.model) }
+ : {}),
+ size: readSize(stage.job.state.size),
+ duration: readDuration(stage.job.state.duration),
+ ...(reference === undefined
+ ? {}
+ : { referenceImage: await readReferenceImage(reference) })
+ };
+}
+
+async function readReferenceImage(
+ artifact: CreatorArtifact
+): Promise<NonNullable<CreateVideoGenerationRequest['referenceImage']>> {
+ if (artifact.path === null) {
+ throw new CreatorExecutorError(
+ 'creator_stage_input_missing',
+ 'Reference image file is unavailable'
+ );
+ }
+ const content = await readFile(artifact.path);
+ return {
+ mime: referenceMime(artifact),
+ data: content.toString('base64')
+ };
+}
+
+function referenceMime(
+ artifact: CreatorArtifact
+): NonNullable<CreateVideoGenerationRequest['referenceImage']>['mime'] {
+ const mime = artifact.metadata.mimeType;
+ if (mime === 'image/jpeg' || mime === 'image/webp') return mime;
+ const extension = artifact.path === null ? '' : extname(artifact.path).toLowerCase();
+ if (extension === '.jpg' || extension === '.jpeg') return 'image/jpeg';
+ if (extension === '.webp') return 'image/webp';
+ return 'image/png';
+}
+
+function readResumedResultId(stage: CreatorExecutorInput): string | undefined {
+ const resumedFrom = stage.stageRun.progress.resumedFromStageRunId;
+ const previous = typeof resumedFrom === 'string'
+ ? stage.job.stages.find(candidate => candidate.id === resumedFrom)
+ : [...stage.job.stages].reverse().find(candidate => (
+ candidate.id !== stage.stageRun.id
+ && candidate.stageId === stage.stageRun.stageId
+ && candidate.status === 'failed'
+ && candidate.errorCode === 'creator_video_upstream_error'
+ && typeof candidate.progress.videoGenerationResultId === 'string'
+ ));
+ const resultId = previous?.progress.videoGenerationResultId;
+ return typeof resultId === 'string' && resultId.length > 0 ? resultId : undefined;
+}
+
+function remoteProgress(result: VideoGenerationResult): Record<string, CreatorJson> {
+ if (result.status === 'completed') {
+ return {
+ status: 'running',
+ phase: 'collecting_output',
+ percent: 94
+ };
+ }
+ if (result.status === 'failed') {
+ return {
+ status: 'failed',
+ phase: 'provider_failed',
+ percent: null,
+ message: result.error ?? 'Video generation failed'
+ };
+ }
+ if (result.status === 'queued') {
+ return {
+ status: 'running',
+ phase: 'queued',
+ percent: null,
+ message: 'The video generation task is queued'
+ };
+ }
+ return {
+ status: 'running',
+ phase: 'generating',
+ ...(result.progressKnown === true
+ ? { percent: Math.max(10, Math.min(90, 10 + Math.round(result.progress * 0.8))) }
+ : { percent: null }),
+ message: 'The video provider is generating the video'
+ };
+}
+
+function reportDownloading(stage: CreatorExecutorInput): void {
+ if (stage.signal.aborted) return;
+ stage.reportProgress({
+ status: 'running',
+ phase: 'downloading',
+ percent: 90
+ });
+}
+
+function creatorVideoError(error: unknown): CreatorExecutorError {
+ if (error instanceof CreatorExecutorError) return error;
+ if (error instanceof VideoGenerationError) {
+ if (error.code === 'VIDEO_GENERATION_CONFIG_REQUIRED') {
+ return new CreatorExecutorError('creator_video_config_missing', error.message);
+ }
+ if (error.code === 'VALIDATION_FAILED') {
+ return new CreatorExecutorError('creator_video_input_invalid', error.message);
+ }
+ if (error.code === 'VIDEO_GENERATION_NOT_READY') {
+ return new CreatorExecutorError('creator_video_not_ready', error.message);
+ }
+ if (
+ error.code === 'VIDEO_GENERATION_UPSTREAM_ERROR'
+ && isUnavailableModelError(error.message)
+ ) {
+ return new CreatorExecutorError('creator_video_model_unavailable', error.message);
+ }
+ return new CreatorExecutorError('creator_video_upstream_error', error.message);
+ }
+ if (isAbortError(error)) {
+ return new CreatorExecutorError('creator_stage_canceled', 'Creator stage was canceled');
+ }
+ return new CreatorExecutorError(
+ 'creator_video_generation_failed',
+ error instanceof Error ? error.message : 'Video generation failed'
+ );
+}
+
+function readString(value: CreatorJson | undefined): string {
+ return typeof value === 'string' ? value.trim() : '';
+}
+
+function isUnavailableModelError(message: string): boolean {
+ return /(?:not activated|not enabled|not subscribed|no permission|permission denied|access denied).{0,80}(?:model|service)|(?:model|service).{0,80}(?:not activated|not enabled|not subscribed|no permission|permission denied|access denied)/i
+ .test(message);
+}
+
+function isRetryableRefreshError(error: unknown): boolean {
+ return error instanceof VideoGenerationError
+ && error.code === 'VIDEO_GENERATION_UPSTREAM_ERROR';
+}
+
+function readProvider(value: CreatorJson | undefined): VideoGenerationProvider {
+ return value === 'kling' || value === 'veo' ? value : 'seedance';
+}
+
+function readSize(value: CreatorJson | undefined): VideoGenerationSize {
+ return value === '720x1280' || value === '1024x1024' ? value : '1280x720';
+}
+
+function readDuration(value: CreatorJson | undefined): VideoGenerationDuration {
+ return value === 4 || value === 6 || value === 8 || value === 10 ? value : 5;
+}
+
+function abortableSleep(ms: number, signal: AbortSignal): Promise<void> {
+ if (signal.aborted) return Promise.reject(abortError());
+ return new Promise((resolve, reject) => {
+ const cleanup = () => signal.removeEventListener('abort', abort);
+ const timer = setTimeout(() => {
+ cleanup();
+ resolve();
+ }, ms);
+ const abort = () => {
+ clearTimeout(timer);
+ cleanup();
+ reject(abortError());
+ };
+ signal.addEventListener('abort', abort, { once: true });
+ if (signal.aborted) abort();
+ });
+}
+
+function abortError(): Error {
+ const error = new Error('The operation was aborted');
+ error.name = 'AbortError';
+ return error;
+}
+
+function isAbortError(error: unknown): boolean {
+ return error instanceof Error && error.name === 'AbortError';
+}
diff --git a/apps/daemon/src/main.ts b/apps/daemon/src/main.ts
index 3fc1ca91..f4c90291 100644
--- a/apps/daemon/src/main.ts
+++ b/apps/daemon/src/main.ts
@@ -1,17 +1,13 @@
-import { existsSync, mkdirSync, readFileSync, readdirSync, statSync } from 'node:fs';
+import { mkdirSync, readFileSync, readdirSync, statSync } from 'node:fs';
import {
rename,
rm,
writeFile
} from 'node:fs/promises';
-import { dirname, join, resolve } from 'node:path';
-import {
- migrateDirectoryIfEmpty,
- readOpenCreatorConfig
-} from '@opencreator/config';
+import { join, resolve } from 'node:path';
+import { readOpenCreatorConfig } from '@opencreator/config';
import type { CodexAvailabilityProbe } from '@opencreator/protocol';
import type { FastifyInstance } from 'fastify';
-import { fileURLToPath } from 'node:url';
import {
applyCapabilityMatrix,
collectCodexCapabilityMatrixAsync,
@@ -22,10 +18,6 @@ import {
} from './codex/capabilities.js';
import { resolveCodexHome } from './codex/home.js';
import { createCodexIsolatedHome } from './codex/probe-home.js';
-import {
- consolidateLegacyConfigData,
- migrateLegacyDaemonProductData
-} from './config/product-data-migration.js';
import {
CODEX_PROBE_TIMEOUT_MS,
probeCodex
@@ -87,20 +79,10 @@ async function main(): Promise<void> {
} = paths;
const codexBin = environment.codexBin ?? 'codex';
const codexHome = resolveCodexHome({ isolatedHome: paths.codexHome }).path;
- if (environment.dataDir === undefined) {
- const legacyDataDir = legacyDevelopmentDataDir();
- if (!directoryHasEntries(dataDir)) {
- migrateDirectoryIfEmpty(legacyDataDir, dataDir);
- }
- }
- migrateLegacyDaemonProductData({ dataDir, runtimeDir, creatorDir });
if (environment.codexHome === undefined && !directoryHasEntries(codexHome)) {
createCodexIsolatedHome(resolveCodexHome().path, codexHome);
}
readOpenCreatorConfig(configFile);
- const migratedDataConfig = join(dataDir, 'config.toml');
- if (existsSync(migratedDataConfig)) readOpenCreatorConfig(migratedDataConfig);
- consolidateLegacyConfigData({ dataDir, appHome });
mkdirSync(dataDir, { recursive: true });
mkdirSync(codexHome, { recursive: true });
releaseRuntimeLock = acquireRuntimeLock(dataDir);
@@ -203,11 +185,11 @@ async function main(): Promise<void> {
}
function directoryHasEntries(path: string): boolean {
- return existsSync(path) && readdirSync(path).length > 0;
-}
-
-function legacyDevelopmentDataDir(): string {
- return resolve(dirname(fileURLToPath(import.meta.url)), '..', '.runtime');
+ try {
+ return statSync(path).isDirectory() && readdirSync(path).length > 0;
+ } catch {
+ return false;
+ }
}
function requiresProbe(): boolean {
diff --git a/apps/daemon/src/video-generation/service.ts b/apps/daemon/src/video-generation/service.ts
index 95157212..9cb35f24 100644
--- a/apps/daemon/src/video-generation/service.ts
+++ b/apps/daemon/src/video-generation/service.ts
@@ -1,4 +1,5 @@
import {
+ defaultVideoGenerationModels,
videoGenerationDurations,
videoGenerationSizes,
type CreateVideoGenerationRequest,
@@ -8,7 +9,7 @@ import {
type VideoGenerationStatus
} from '@opencreator/protocol';
import { randomBytes } from 'node:crypto';
-import { mkdir, readFile, rm, writeFile } from 'node:fs/promises';
+import { copyFile, mkdir, readFile, rm, writeFile } from 'node:fs/promises';
import { resolve } from 'node:path';
import type { CreatorServicesConfig } from '@opencreator/protocol';
import type { CreatorServicesConfigStore } from '../creator-services/config-store.js';
@@ -36,11 +37,20 @@ type StoredVideoGeneration = {
generationMode?: 'text-to-video' | 'image-to-video';
};
+export type VideoGenerationOperationOptions = {
+ signal?: AbortSignal;
+ onDownloadStart?(): void;
+};
+
export type VideoGenerationService = {
- create(request: CreateVideoGenerationRequest): Promise<VideoGenerationResult>;
+ create(
+ request: CreateVideoGenerationRequest,
+ options?: VideoGenerationOperationOptions
+ ): Promise<VideoGenerationResult>;
get(id: string): Promise<VideoGenerationResult>;
- refresh(id: string): Promise<VideoGenerationResult>;
+ refresh(id: string, options?: VideoGenerationOperationOptions): Promise<VideoGenerationResult>;
read(id: string): Promise<{ result: VideoGenerationResult; content: Buffer }>;
+ copyTo(id: string, destination: string): Promise<VideoGenerationResult>;
};
export class VideoGenerationError extends Error {
@@ -98,12 +108,12 @@ export function createVideoGenerationService(input: {
async function completeFromPayload(
stored: StoredVideoGeneration,
payload: Record<string, unknown>,
- config: CreatorServicesConfig
+ config: CreatorServicesConfig,
+ options: VideoGenerationOperationOptions = {}
): Promise<StoredVideoGeneration> {
const download = resolveVideoDownload(stored, payload, config);
- const controller = new AbortController();
- const timeout = setTimeout(() => controller.abort(), DOWNLOAD_TIMEOUT_MS);
- timeout.unref();
+ options.onDownloadStart?.();
+ const operation = operationSignal(options.signal, DOWNLOAD_TIMEOUT_MS);
let response: Response;
try {
response = await fetchCreatorService({
@@ -111,14 +121,14 @@ export function createVideoGenerationService(input: {
method: 'GET',
headers: download.headers,
proxy: config.proxy.trim(),
- signal: controller.signal,
+ signal: operation.signal,
maxResponseBytes: MAX_VIDEO_BYTES,
fetchImpl: input.fetchImpl
});
} catch {
throw new VideoGenerationError('VIDEO_GENERATION_UPSTREAM_ERROR', 'The generated video could not be downloaded', 502);
} finally {
- clearTimeout(timeout);
+ operation.cleanup();
}
if (!response.ok) {
throw new VideoGenerationError(
@@ -138,6 +148,7 @@ export function createVideoGenerationService(input: {
fileName: `OpenCreator-video-${stored.result.id}.mp4`,
mime: 'video/mp4',
size: content.length,
+ progressKnown: true,
error: undefined,
updatedAt: now().toISOString()
};
@@ -153,20 +164,18 @@ export function createVideoGenerationService(input: {
}
return {
- async create(request) {
+ async create(request, options = {}) {
validateRequest(request);
const config = await input.configStore.read();
- const controller = new AbortController();
- const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
- timeout.unref();
+ const operation = operationSignal(options.signal, REQUEST_TIMEOUT_MS);
let remote: RemoteVideoJob;
try {
- remote = await createRemoteVideoJob(request, config, controller.signal, input.fetchImpl);
+ remote = await createRemoteVideoJob(request, config, operation.signal, input.fetchImpl);
} catch (error) {
if (error instanceof VideoGenerationError) throw error;
throw new VideoGenerationError('VIDEO_GENERATION_UPSTREAM_ERROR', 'The video generation provider could not be reached', 502);
} finally {
- clearTimeout(timeout);
+ operation.cleanup();
}
const id = createId();
@@ -184,6 +193,7 @@ export function createVideoGenerationService(input: {
duration: request.duration,
status: remote.status,
progress: remote.progress,
+ progressKnown: remote.progressKnown,
error: remote.error,
createdAt: timestamp,
updatedAt: timestamp
@@ -192,7 +202,7 @@ export function createVideoGenerationService(input: {
try {
await mkdir(resultDir(id), { recursive: true, mode: 0o700 });
if (remote.status === 'completed') {
- stored = await completeFromPayload(stored, remote.payload, config);
+ stored = await completeFromPayload(stored, remote.payload, config, options);
} else {
await writeStored(stored);
}
@@ -205,21 +215,19 @@ export function createVideoGenerationService(input: {
async get(id) {
return (await readStored(id)).result;
},
- async refresh(id) {
+ async refresh(id, options = {}) {
let stored = await readStored(id);
if (stored.result.status === 'completed' || stored.result.status === 'failed') return stored.result;
const config = await input.configStore.read();
- const controller = new AbortController();
- const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
- timeout.unref();
+ const operation = operationSignal(options.signal, REQUEST_TIMEOUT_MS);
let remote: RemoteVideoJob;
try {
- remote = await refreshRemoteVideoJob(stored, config, controller.signal, input.fetchImpl);
+ remote = await refreshRemoteVideoJob(stored, config, operation.signal, input.fetchImpl);
} catch (error) {
if (error instanceof VideoGenerationError) throw error;
throw new VideoGenerationError('VIDEO_GENERATION_UPSTREAM_ERROR', 'The video generation status could not be refreshed', 502);
} finally {
- clearTimeout(timeout);
+ operation.cleanup();
}
stored = {
@@ -228,12 +236,13 @@ export function createVideoGenerationService(input: {
...stored.result,
status: remote.status,
progress: remote.progress,
+ progressKnown: remote.progressKnown,
error: remote.error,
updatedAt: now().toISOString()
}
};
if (remote.status === 'completed') {
- stored = await completeFromPayload(stored, remote.payload, config);
+ stored = await completeFromPayload(stored, remote.payload, config, options);
} else {
await writeStored(stored);
}
@@ -252,6 +261,21 @@ export function createVideoGenerationService(input: {
}
throw new VideoGenerationError('VIDEO_GENERATION_STORAGE_FAILED', 'Generated video is unavailable', 500);
}
+ },
+ async copyTo(id, destination) {
+ const stored = await readStored(id);
+ if (stored.result.status !== 'completed' || !stored.result.fileName || !stored.result.mime) {
+ throw new VideoGenerationError('VIDEO_GENERATION_NOT_READY', 'Generated video is not ready', 409);
+ }
+ try {
+ await copyFile(videoPath(id), destination);
+ return stored.result;
+ } catch (error) {
+ if (isNotFoundError(error)) {
+ throw new VideoGenerationError('VIDEO_GENERATION_RESULT_NOT_FOUND', 'Generated video file was not found', 404);
+ }
+ throw new VideoGenerationError('VIDEO_GENERATION_STORAGE_FAILED', 'Generated video could not be copied', 500);
+ }
}
};
@@ -274,6 +298,7 @@ type RemoteVideoJob = {
payload: Record<string, unknown>;
status: VideoGenerationStatus;
progress: number;
+ progressKnown: boolean;
error?: string;
};
@@ -332,7 +357,11 @@ async function createSeedanceVideoJob(
) {
const settings = config.video.seedance;
requireApiKey(settings.apiKey, 'seedance');
- const model = settings.model.trim() || 'doubao-seedance-1-0-pro-250528';
+ const model = requestedModel(
+ request.model,
+ settings.model,
+ defaultVideoGenerationModels.seedance
+ );
const content: Array<Record<string, unknown>> = [
{ type: 'text', text: request.prompt.trim() }
];
@@ -351,7 +380,9 @@ async function createSeedanceVideoJob(
body: JSON.stringify({
model,
content,
- ratio: videoAspectRatio(request.size),
+ ...(request.referenceImage
+ ? {}
+ : { ratio: videoAspectRatio(request.size) }),
duration: request.duration,
watermark: false
}),
@@ -372,7 +403,11 @@ async function createKlingVideoJob(
) {
const settings = config.video.kling;
requireKlingConfig(settings.accessKey, settings.secretKey, 'kling');
- const model = settings.model.trim() || 'kling-v2-1-master';
+ const model = requestedModel(
+ request.model,
+ settings.model,
+ defaultVideoGenerationModels.kling
+ );
const payload = await requestVideoJson({
endpoint: klingVideoEndpoint(settings.baseUrl, request.referenceImage !== undefined),
method: 'POST',
@@ -405,7 +440,11 @@ async function createVeoVideoJob(
) {
const settings = config.video.veo;
requireApiKey(settings.apiKey, 'veo');
- const model = settings.model.trim() || 'veo-3.1-generate-preview';
+ const model = requestedModel(
+ request.model,
+ settings.model,
+ defaultVideoGenerationModels.veo
+ );
const instance = {
prompt: request.prompt.trim(),
...(request.referenceImage ? {
@@ -484,18 +523,20 @@ function normalizeRemoteVideoJob(
progress = readValue(payload, ['data', 'task_progress']);
} else if (provider === 'veo') {
rawStatus = isRecord(payload.error) ? 'failed' : payload.done === true ? 'completed' : 'in_progress';
- progress = payload.done === true ? 100 : 10;
+ progress = payload.done === true ? 100 : undefined;
} else {
rawStatus = payload.status;
progress = payload.progress;
}
const status = normalizeStatus(rawStatus);
+ const normalizedProgress = readProgress(progress, status);
return {
upstreamId,
model,
payload,
status,
- progress: readProgress(progress, status),
+ progress: normalizedProgress.value,
+ progressKnown: normalizedProgress.known,
error: status === 'failed' ? readJobError(payload) : undefined
};
}
@@ -568,6 +609,14 @@ function requireKlingConfig(accessKey: string, secretKey: string, provider: stri
if (!accessKey.trim() || !secretKey.trim()) missingVideoConfig(provider);
}
+function requestedModel(
+ requested: string | undefined,
+ configured: string,
+ fallback: string
+): string {
+ return requested?.trim() || configured.trim() || fallback;
+}
+
function missingVideoConfig(provider: string): never {
throw new VideoGenerationError(
'VIDEO_GENERATION_CONFIG_REQUIRED',
@@ -608,10 +657,21 @@ function normalizeStatus(value: unknown): VideoGenerationStatus {
return 'queued';
}
-function readProgress(value: unknown, status: VideoGenerationStatus): number {
- if (status === 'completed') return 100;
- if (typeof value !== 'number' || !Number.isFinite(value)) return status === 'in_progress' ? 10 : 0;
- return Math.max(0, Math.min(99, Math.round(value)));
+function readProgress(
+ value: unknown,
+ status: VideoGenerationStatus
+): { value: number; known: boolean } {
+ if (status === 'completed') return { value: 100, known: true };
+ const numeric = typeof value === 'string' && value.trim()
+ ? Number(value)
+ : value;
+ if (typeof numeric !== 'number' || !Number.isFinite(numeric)) {
+ return { value: 0, known: false };
+ }
+ return {
+ value: Math.max(0, Math.min(99, Math.round(numeric))),
+ known: true
+ };
}
function readJobError(payload: Record<string, unknown>): string {
@@ -633,6 +693,20 @@ function validateRequest(request: CreateVideoGenerationRequest) {
if (!(videoProviders as readonly unknown[]).includes(request.provider)) {
throw new VideoGenerationError('VALIDATION_FAILED', 'video provider is invalid', 400);
}
+ if (
+ request.model !== undefined
+ && (
+ typeof request.model !== 'string'
+ || !request.model.trim()
+ || [...request.model.trim()].length > 200
+ )
+ ) {
+ throw new VideoGenerationError(
+ 'VALIDATION_FAILED',
+ 'video model must contain between 1 and 200 characters',
+ 400
+ );
+ }
if (!(videoGenerationSizes as readonly unknown[]).includes(request.size)) {
throw new VideoGenerationError('VALIDATION_FAILED', 'video size is invalid', 400);
}
@@ -699,6 +773,7 @@ function isVideoGenerationResult(value: unknown): value is VideoGenerationResult
&& (videoGenerationDurations as readonly unknown[]).includes(value.duration)
&& (value.status === 'queued' || value.status === 'in_progress' || value.status === 'completed' || value.status === 'failed')
&& typeof value.progress === 'number'
+ && (value.progressKnown === undefined || typeof value.progressKnown === 'boolean')
&& typeof value.createdAt === 'string'
&& typeof value.updatedAt === 'string';
}
@@ -706,3 +781,22 @@ function isVideoGenerationResult(value: unknown): value is VideoGenerationResult
function isNotFoundError(error: unknown): boolean {
return isRecord(error) && error.code === 'ENOENT';
}
+
+function operationSignal(
+ parent: AbortSignal | undefined,
+ timeoutMs: number
+): { signal: AbortSignal; cleanup(): void } {
+ const controller = new AbortController();
+ const abort = () => controller.abort();
+ if (parent?.aborted === true) controller.abort();
+ else parent?.addEventListener('abort', abort, { once: true });
+ const timeout = setTimeout(abort, timeoutMs);
+ timeout.unref();
+ return {
+ signal: controller.signal,
+ cleanup() {
+ clearTimeout(timeout);
+ parent?.removeEventListener('abort', abort);
+ }
+ };
+}
diff --git a/apps/daemon/test/integration/creator-video-generation.test.ts b/apps/daemon/test/integration/creator-video-generation.test.ts
new file mode 100644
index 00000000..6367fed1
--- /dev/null
+++ b/apps/daemon/test/integration/creator-video-generation.test.ts
@@ -0,0 +1,253 @@
+import { createDefaultCreatorServicesConfig } from '@opencreator/protocol';
+import type { FastifyInstance } from 'fastify';
+import { mkdtemp, readFile, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import { buildServer } from '../../src/api/server.js';
+import type { CreatorServicesConfigStore } from '../../src/creator-services/config-store.js';
+import { createVideoExecutor } from '../../src/creator/video/executor.js';
+import { createVideoGenerationService } from '../../src/video-generation/service.js';
+
+let server: FastifyInstance | undefined;
+let tempDir = '';
+
+afterEach(async () => {
+ await server?.close();
+ server = undefined;
+ if (tempDir) await rm(tempDir, { recursive: true, force: true });
+ tempDir = '';
+});
+
+describe('creator video generation', () => {
+ it('runs video generation through Creator Job, Stage, Artifact and ResultSnapshot', async () => {
+ tempDir = await mkdtemp(join(tmpdir(), 'creator-video-generation-api-'));
+ const config = createDefaultCreatorServicesConfig();
+ config.video.seedance.apiKey = 'seedance-test-key';
+ config.video.seedance.baseUrl = 'https://video.example.test/api/v3';
+ const video = Buffer.from('creator-generated-video');
+ const fetchImpl = vi.fn(async (url: RequestInfo | URL, init?: RequestInit) => {
+ const value = String(url);
+ if (
+ value === 'https://video.example.test/api/v3/contents/generations/tasks'
+ && init?.method === 'POST'
+ ) {
+ return new Response(JSON.stringify({
+ id: 'upstream_video_1',
+ status: 'queued'
+ }), {
+ status: 200,
+ headers: { 'Content-Type': 'application/json' }
+ });
+ }
+ if (
+ value
+ === 'https://video.example.test/api/v3/contents/generations/tasks/upstream_video_1'
+ ) {
+ return new Response(JSON.stringify({
+ id: 'upstream_video_1',
+ status: 'completed',
+ progress: 100,
+ content: { video_url: 'https://cdn.example.test/generated.mp4' }
+ }), {
+ status: 200,
+ headers: { 'Content-Type': 'application/json' }
+ });
+ }
+ if (value === 'https://cdn.example.test/generated.mp4') {
+ return new Response(video, {
+ status: 200,
+ headers: { 'Content-Type': 'video/mp4' }
+ });
+ }
+ return new Response('not found', { status: 404 });
+ });
+ const configStore = createConfigStore(config);
+ const generationService = createVideoGenerationService({
+ dataDir: tempDir,
+ configStore,
+ fetchImpl: fetchImpl as typeof fetch,
+ createId: () => 'video_result_creator_1'
+ });
+ const executor = createVideoExecutor({
+ service: generationService,
+ pollIntervalMs: 250,
+ sleep: vi.fn(async () => undefined),
+ probeVideo: vi.fn(async path => {
+ expect(await readFile(path)).toEqual(video);
+ return {
+ duration: 5,
+ width: 1280,
+ height: 720,
+ hasVideo: true,
+ hasAudio: true
+ };
+ })
+ });
+ server = await buildServer({
+ token: 'secret',
+ dataDir: tempDir,
+ codexHome: join(tempDir, 'codex-home'),
+ creatorServicesConfigStore: configStore,
+ codexProviderCredentialStore: {
+ async readApiKey() { return undefined; },
+ async writeApiKey() {}
+ },
+ creatorExecutors: [executor]
+ });
+
+ const created = await request('POST', '/creator/jobs', {
+ projectId: 'project_video',
+ templateId: 'video-generation',
+ state: {
+ prompt: 'A cinematic coastal road',
+ provider: 'seedance',
+ model: 'doubao-seedance-2-0-260128',
+ size: '1280x720',
+ duration: 5
+ }
+ });
+ const initial = created.json().job;
+ expect(initial.templateVersion).toBe(1);
+
+ const reference = png('video-reference');
+ const uploaded = await server.inject({
+ method: 'POST',
+ url: `/creator/jobs/${initial.id}/reference-image`
+ + `?expectedRevision=${initial.revision}`
+ + '&fileName=reference.png&mime=image%2Fpng&lastModified=123',
+ headers: {
+ authorization: 'Bearer secret',
+ 'content-type': 'application/vnd.opencreator.creator-reference-image'
+ },
+ payload: reference
+ });
+ expect(uploaded.statusCode).toBe(201);
+
+ const started = await request(
+ 'POST',
+ `/creator/jobs/${initial.id}/actions`,
+ {
+ action: 'run-stage',
+ expectedRevision: uploaded.json().job.revision,
+ input: { stageId: 'generate' }
+ }
+ );
+ expect(started.statusCode).toBe(200);
+
+ const completed = await waitForCompletedJob(initial.id);
+ expect(completed).toMatchObject({
+ status: 'completed',
+ state: {
+ latestResultVersion: 1,
+ resultSnapshots: [{
+ version: 1,
+ description: '生成视频',
+ state: {
+ model: 'doubao-seedance-2-0-260128'
+ },
+ artifactRefs: {
+ generated_video: [expect.any(String)]
+ }
+ }]
+ },
+ stages: [{
+ stageId: 'generate',
+ status: 'succeeded',
+ progress: {
+ phase: 'completed',
+ percent: 100,
+ videoGenerationResultId: 'video_result_creator_1'
+ }
+ }]
+ });
+ const generatedVideo = completed.artifacts.find(
+ (artifact: { kind: string }) => artifact.kind === 'generated_video'
+ );
+ expect(generatedVideo).toMatchObject({
+ kind: 'generated_video',
+ status: 'completed',
+ sourceArtifactIds: [uploaded.json().artifact.id],
+ metadata: {
+ provider: 'seedance',
+ model: 'doubao-seedance-2-0-260128',
+ videoSize: '1280x720',
+ requestedDuration: 5,
+ duration: 5,
+ width: 1280,
+ height: 720,
+ hasAudio: true,
+ generationMode: 'image-to-video',
+ referenceArtifactId: uploaded.json().artifact.id,
+ videoGenerationResultId: 'video_result_creator_1',
+ resultVersion: 1
+ }
+ });
+
+ const createBody = JSON.parse(String(fetchImpl.mock.calls[0]?.[1]?.body));
+ expect(createBody.model).toBe('doubao-seedance-2-0-260128');
+ expect(createBody.content).toEqual([
+ { type: 'text', text: 'A cinematic coastal road' },
+ {
+ type: 'image_url',
+ image_url: {
+ url: `data:image/png;base64,${reference.toString('base64')}`
+ }
+ }
+ ]);
+
+ const content = await request(
+ 'GET',
+ `/creator/jobs/${initial.id}/artifacts/${generatedVideo.id}/content`
+ );
+ expect(content.statusCode).toBe(200);
+ expect(content.headers['content-type']).toContain('video/mp4');
+ expect(content.rawPayload).toEqual(video);
+ });
+});
+
+async function waitForCompletedJob(jobId: string) {
+ const deadline = Date.now() + 10_000;
+ let lastJob: unknown;
+ while (Date.now() < deadline) {
+ const response = await request('GET', `/creator/jobs/${jobId}`);
+ const job = response.json().job;
+ lastJob = job;
+ if (job.status === 'completed') return job;
+ if (job.status === 'failed' || job.status === 'needs_input') {
+ throw new Error(`Video generation failed: ${JSON.stringify(job)}`);
+ }
+ await new Promise(resolve => setTimeout(resolve, 20));
+ }
+ throw new Error(`Timed out waiting for video generation: ${JSON.stringify(lastJob)}`);
+}
+
+function createConfigStore(
+ config: ReturnType<typeof createDefaultCreatorServicesConfig>
+): CreatorServicesConfigStore {
+ return {
+ async read() { return structuredClone(config); },
+ async write(next) { return structuredClone(next); },
+ async reset() { return structuredClone(config); }
+ };
+}
+
+function png(label: string): Buffer {
+ return Buffer.concat([
+ Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]),
+ Buffer.from(label.padEnd(24, '.'))
+ ]);
+}
+
+async function request(
+ method: 'GET' | 'POST',
+ url: string,
+ payload?: object
+): Promise<{ statusCode: number; json(): any; rawPayload: Buffer; headers: Record<string, string | string[] | undefined> }> {
+ return await server!.inject({
+ method,
+ url,
+ headers: { authorization: 'Bearer secret' },
+ ...(payload === undefined ? {} : { payload })
+ }) as never;
+}
diff --git a/apps/daemon/test/integration/video-generation-api.test.ts b/apps/daemon/test/integration/video-generation-api.test.ts
index 6346e4fa..2bd6d095 100644
--- a/apps/daemon/test/integration/video-generation-api.test.ts
+++ b/apps/daemon/test/integration/video-generation-api.test.ts
@@ -59,19 +59,26 @@ describe('video generation API', () => {
const created = await server.inject({
method: 'POST',
url: '/video-generation/results',
- payload: { prompt: 'A cinematic city reveal', provider: 'seedance', size: '1280x720', duration: 5 }
+ payload: {
+ prompt: 'A cinematic city reveal',
+ provider: 'seedance',
+ model: 'doubao-seedance-2-0-260128',
+ size: '1280x720',
+ duration: 5
+ }
});
expect(created.statusCode).toBe(202);
expect(created.json().result).toMatchObject({
id: 'video_result_1234',
provider: 'seedance',
+ model: 'doubao-seedance-2-0-260128',
status: 'queued',
videoSize: '1280x720',
duration: 5
});
const createRequest = fetchImpl.mock.calls[0]?.[1];
expect(JSON.parse(String(createRequest?.body))).toMatchObject({
- model: 'doubao-seedance-1-0-pro-250528',
+ model: 'doubao-seedance-2-0-260128',
content: [{ type: 'text', text: 'A cinematic city reveal' }],
ratio: '16:9',
duration: 5
@@ -185,6 +192,10 @@ describe('video generation API', () => {
});
expect(created.statusCode).toBe(202);
expect(created.json().result).toMatchObject({ provider: 'veo', status: 'in_progress', duration: 8 });
+ expect(created.json().result).toMatchObject({
+ progress: 0,
+ progressKnown: false
+ });
expect(JSON.parse(String(fetchImpl.mock.calls[0]?.[1]?.body))).toMatchObject({
parameters: { aspectRatio: '16:9', durationSeconds: 8, sampleCount: 1 }
});
@@ -252,6 +263,7 @@ describe('video generation API', () => {
expect(String(fetchImpl.mock.calls[1]?.[0])).toContain('/v1/videos/image2video');
const seedanceBody = JSON.parse(String(fetchImpl.mock.calls[0]?.[1]?.body));
+ expect(seedanceBody).not.toHaveProperty('ratio');
expect(seedanceBody.content[1]).toEqual({
type: 'image_url',
image_url: { url: `data:image/png;base64,${referenceImage.data}` }
diff --git a/apps/daemon/test/unit/codex-provider-credential-store.test.ts b/apps/daemon/test/unit/codex-provider-credential-store.test.ts
index 10dea53d..00fbd642 100644
--- a/apps/daemon/test/unit/codex-provider-credential-store.test.ts
+++ b/apps/daemon/test/unit/codex-provider-credential-store.test.ts
@@ -1,4 +1,4 @@
-import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs';
+import { mkdtempSync, readFileSync, rmSync } from 'node:fs';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { afterEach, describe, expect, it, vi } from 'vitest';
@@ -66,21 +66,15 @@ describe('CodexProviderCredentialStore', () => {
});
});
- it('migrates the Codex API key into the shared OpenCreator credentials file', async () => {
+ it('stores the Codex API key in the shared OpenCreator credentials file', async () => {
root = mkdtempSync(join(tmpdir(), 'opencreator-codex-provider-'));
const credentialsFile = join(root, 'credentials.json');
- const legacyFile = join(root, 'data', 'config', 'codex-provider.json');
- await createFileCodexProviderCredentialStore(legacyFile).writeApiKey('sk-legacy-file');
+ const store = createOpenCreatorCodexProviderCredentialStore(credentialsFile);
- const store = createOpenCreatorCodexProviderCredentialStore(
- credentialsFile,
- legacyFile
- );
-
- await expect(store.readApiKey()).resolves.toBe('sk-legacy-file');
- expect(existsSync(legacyFile)).toBe(false);
+ await store.writeApiKey('sk-opencreator');
+ await expect(store.readApiKey()).resolves.toBe('sk-opencreator');
expect(JSON.parse(readFileSync(credentialsFile, 'utf8'))).toMatchObject({
- codexProvider: { apiKey: 'sk-legacy-file' }
+ codexProvider: { apiKey: 'sk-opencreator' }
});
});
});
diff --git a/apps/daemon/test/unit/creator-project-cover.test.ts b/apps/daemon/test/unit/creator-project-cover.test.ts
index 5e0b2759..3ed208e7 100644
--- a/apps/daemon/test/unit/creator-project-cover.test.ts
+++ b/apps/daemon/test/unit/creator-project-cover.test.ts
@@ -100,6 +100,23 @@ describe('creator project cover', () => {
}));
});
+ it('extracts a project cover from generated video artifacts', async () => {
+ tempDir = mkdtempSync(join(tmpdir(), 'creator-project-generated-video-'));
+ const sourcePath = join(tempDir, 'generated.mp4');
+ writeFileSync(sourcePath, 'video');
+ const extractFrame = vi.fn(async (input: { outputPath: string }) => {
+ await writeFile(input.outputPath, 'generated-video-frame');
+ });
+ const service = createCreatorProjectCoverService({ jobsRoot: tempDir, extractFrame });
+
+ const cover = await service.resolve(creatorJob([
+ artifact('generated_video', sourcePath)
+ ]));
+
+ expect(await readFile(cover!.path, 'utf8')).toBe('generated-video-frame');
+ expect(extractFrame).toHaveBeenCalledWith(expect.objectContaining({ sourcePath }));
+ });
+
it('falls back to the first frame when a video is shorter than five seconds', async () => {
tempDir = mkdtempSync(join(tmpdir(), 'creator-project-cover-'));
const sourcePath = join(tempDir, 'short.mp4');
diff --git a/apps/daemon/test/unit/creator-services-config-store.test.ts b/apps/daemon/test/unit/creator-services-config-store.test.ts
index f5a338c6..1d82434d 100644
--- a/apps/daemon/test/unit/creator-services-config-store.test.ts
+++ b/apps/daemon/test/unit/creator-services-config-store.test.ts
@@ -1,4 +1,4 @@
-import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs';
+import { mkdtempSync, readFileSync, rmSync } from 'node:fs';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { afterEach, describe, expect, it, vi } from 'vitest';
@@ -77,22 +77,18 @@ describe('CreatorServicesConfigStore', () => {
root = mkdtempSync(join(tmpdir(), 'opencreator-creator-services-'));
const configFile = join(root, 'config.toml');
const credentialsFile = join(root, 'credentials.json');
- const legacyFile = join(root, 'data', 'config', 'creator-services.json');
- const legacyStore = createFileCreatorServicesConfigStore(legacyFile);
const config = createDefaultCreatorServicesConfig();
config.proxy = 'http://127.0.0.1:7897';
config.image.provider = 'gemini';
config.image.gemini.apiKey = 'gemini-private-key';
- await legacyStore.write(config);
const store = createOpenCreatorCreatorServicesConfigStore({
configFile,
- credentialsFile,
- legacyFile
+ credentialsFile
});
+ await expect(store.write(config)).resolves.toEqual(config);
await expect(store.read()).resolves.toEqual(config);
- expect(existsSync(legacyFile)).toBe(false);
expect(readFileSync(configFile, 'utf8')).toContain('[creator_services.image]');
expect(readFileSync(configFile, 'utf8')).not.toContain('gemini-private-key');
expect(JSON.parse(readFileSync(credentialsFile, 'utf8'))).toMatchObject({
@@ -282,7 +278,7 @@ describe('CreatorServicesConfigStore', () => {
},
video: {
provider: 'seedance',
- seedance: { apiKey: '', model: 'doubao-seedance-1-0-pro-250528' }
+ seedance: { apiKey: '', model: 'doubao-seedance-2-5-260628' }
}
});
});
diff --git a/apps/daemon/test/unit/creator-template-registry.test.ts b/apps/daemon/test/unit/creator-template-registry.test.ts
index b2c5e873..4f2cafcf 100644
--- a/apps/daemon/test/unit/creator-template-registry.test.ts
+++ b/apps/daemon/test/unit/creator-template-registry.test.ts
@@ -4,6 +4,7 @@ import {
createImageGenerationTemplate,
createCreatorTemplateRegistry,
createVideoDownloadTemplate,
+ createVideoGenerationTemplate,
createVideoTranslationTemplate
} from '../../src/creator/templates/registry.js';
@@ -96,6 +97,40 @@ describe('creator template registry', () => {
expect(template.inputSchema.parse({})).not.toHaveProperty('formatId');
});
+ it('registers video generation as a persisted Creator Runtime template', () => {
+ const template = createVideoGenerationTemplate();
+
+ expect(template).toMatchObject({
+ id: 'video-generation',
+ version: 1,
+ renderer: 'video-generation',
+ stages: [{
+ id: 'generate',
+ executor: 'video',
+ inputArtifacts: [{
+ kind: 'reference_image',
+ selector: 'state-artifact-id',
+ stateKey: 'referenceImageArtifactId',
+ optional: true
+ }],
+ outputArtifacts: [{ kind: 'generated_video', status: 'completed' }]
+ }],
+ outputs: [{ kind: 'generated_video', required: true }]
+ });
+ expect(template.inputSchema.parse({})).toMatchObject({
+ prompt: '',
+ provider: 'seedance',
+ size: '1280x720',
+ duration: 5,
+ referenceImageArtifactId: null
+ });
+ expect(template.inputSchema.parse({
+ model: 'doubao-seedance-2-5-260628'
+ })).toMatchObject({
+ model: 'doubao-seedance-2-5-260628'
+ });
+ });
+
it('resolves the video translation stale graph from target subtitles only', () => {
const registry = createCreatorTemplateRegistry([
createVideoTranslationTemplate()
diff --git a/apps/daemon/test/unit/creator-video-executor.test.ts b/apps/daemon/test/unit/creator-video-executor.test.ts
new file mode 100644
index 00000000..27aefa3b
--- /dev/null
+++ b/apps/daemon/test/unit/creator-video-executor.test.ts
@@ -0,0 +1,431 @@
+import type {
+ CreatorArtifact,
+ CreatorJob,
+ CreatorStageRun,
+ VideoGenerationResult
+} from '@opencreator/protocol';
+import { mkdtemp, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import type { CreatorExecutorInput } from '../../src/creator/executor.js';
+import { createVideoExecutor } from '../../src/creator/video/executor.js';
+import {
+ VideoGenerationError,
+ type VideoGenerationService
+} from '../../src/video-generation/service.js';
+
+let tempDir = '';
+
+afterEach(async () => {
+ if (tempDir) await rm(tempDir, { recursive: true, force: true });
+ tempDir = '';
+});
+
+describe('creator video executor', () => {
+ it('creates a generated_video artifact and keeps unknown provider progress indeterminate', async () => {
+ tempDir = await mkdtemp(join(tmpdir(), 'creator-video-executor-'));
+ const referencePath = join(tempDir, 'reference.png');
+ await writeFile(referencePath, 'reference-image');
+ const queued = videoResult({ status: 'queued', progress: 0, progressKnown: false });
+ const completed = videoResult({
+ status: 'completed',
+ progress: 100,
+ progressKnown: true,
+ fileName: 'OpenCreator-video-result.mp4',
+ size: 12
+ });
+ const service = videoService({
+ create: vi.fn(async () => queued),
+ refresh: vi.fn(async (_id, options) => {
+ options?.onDownloadStart?.();
+ return completed;
+ })
+ });
+ const executor = createVideoExecutor({
+ service,
+ pollIntervalMs: 250,
+ sleep: vi.fn(async () => undefined),
+ probeVideo: vi.fn(async () => ({
+ duration: 8,
+ width: 720,
+ height: 1280,
+ hasVideo: true,
+ hasAudio: false
+ }))
+ });
+ const reference = artifact('reference_image', referencePath, {
+ mimeType: 'image/png',
+ fileName: 'reference.png'
+ });
+ const stage = stageInput({
+ provider: 'veo',
+ model: 'veo-3.1-generate-preview',
+ size: '720x1280',
+ duration: 8
+ }, [reference]);
+
+ const result = await executor.run(stage);
+
+ expect(service.create).toHaveBeenCalledWith(
+ {
+ prompt: 'A cinematic city reveal',
+ provider: 'veo',
+ model: 'veo-3.1-generate-preview',
+ size: '720x1280',
+ duration: 8,
+ referenceImage: {
+ mime: 'image/png',
+ data: Buffer.from('reference-image').toString('base64')
+ }
+ },
+ expect.objectContaining({ signal: expect.any(AbortSignal) })
+ );
+ expect(service.refresh).toHaveBeenCalledWith(
+ queued.id,
+ expect.objectContaining({ signal: expect.any(AbortSignal) })
+ );
+ expect(result.outputs[0]).toMatchObject({
+ kind: 'generated_video',
+ status: 'completed',
+ metadata: {
+ provider: 'veo',
+ model: 'video-model',
+ videoSize: '720x1280',
+ requestedDuration: 8,
+ duration: 8,
+ width: 720,
+ height: 1280,
+ hasAudio: false,
+ generationMode: 'image-to-video',
+ referenceArtifactId: reference.id,
+ videoGenerationResultId: queued.id
+ }
+ });
+ const queuedProgress = vi.mocked(stage.reportProgress).mock.calls
+ .map(call => call[0])
+ .find(progress => progress.phase === 'queued');
+ expect(queuedProgress).toMatchObject({
+ phase: 'queued',
+ videoGenerationResultId: queued.id,
+ percent: null
+ });
+ expect(stage.reportProgress).toHaveBeenCalledWith(expect.objectContaining({
+ phase: 'downloading',
+ percent: 90
+ }));
+ });
+
+ it('resumes the original upstream job instead of submitting another generation', async () => {
+ tempDir = await mkdtemp(join(tmpdir(), 'creator-video-resume-'));
+ const inProgress = videoResult({
+ status: 'in_progress',
+ progress: 0,
+ progressKnown: false
+ });
+ const completed = videoResult({
+ status: 'completed',
+ progress: 100,
+ progressKnown: true,
+ fileName: 'OpenCreator-video-result.mp4',
+ size: 12
+ });
+ const service = videoService({
+ create: vi.fn(async () => {
+ throw new Error('must not submit another task');
+ }),
+ get: vi.fn(async () => inProgress),
+ refresh: vi.fn(async () => completed)
+ });
+ const executor = createVideoExecutor({
+ service,
+ sleep: vi.fn(async () => undefined),
+ probeVideo: vi.fn(async () => ({
+ duration: 5,
+ width: 1280,
+ height: 720,
+ hasVideo: true,
+ hasAudio: true
+ }))
+ });
+ const stage = stageInput({}, []);
+ const interrupted = stageRun('video_stage_original', {
+ videoGenerationResultId: inProgress.id
+ });
+ stage.stageRun = stageRun('video_stage_resumed', {
+ resumedFromStageRunId: interrupted.id
+ });
+ stage.job.stages = [interrupted, stage.stageRun];
+
+ await executor.run(stage);
+
+ expect(service.create).not.toHaveBeenCalled();
+ expect(service.get).toHaveBeenCalledWith(inProgress.id);
+ expect(service.refresh).toHaveBeenCalledWith(
+ inProgress.id,
+ expect.objectContaining({ signal: expect.any(AbortSignal) })
+ );
+ expect(stage.reportProgress).toHaveBeenCalledWith(expect.objectContaining({
+ resumedUpstreamTask: true,
+ videoGenerationResultId: inProgress.id
+ }));
+ });
+
+ it('reuses a failed stage upstream job after a status refresh error', async () => {
+ tempDir = await mkdtemp(join(tmpdir(), 'creator-video-recover-failed-'));
+ const inProgress = videoResult({
+ status: 'in_progress',
+ progress: 0,
+ progressKnown: false
+ });
+ const completed = videoResult({
+ status: 'completed',
+ progress: 100,
+ progressKnown: true,
+ fileName: 'OpenCreator-video-result.mp4',
+ size: 12
+ });
+ const service = videoService({
+ create: vi.fn(async () => {
+ throw new Error('must not submit another task');
+ }),
+ get: vi.fn(async () => inProgress),
+ refresh: vi.fn(async () => completed)
+ });
+ const executor = createVideoExecutor({
+ service,
+ sleep: vi.fn(async () => undefined),
+ probeVideo: vi.fn(async () => ({
+ duration: 5,
+ width: 1280,
+ height: 720,
+ hasVideo: true,
+ hasAudio: true
+ }))
+ });
+ const stage = stageInput({}, []);
+ const failed = stageRun('video_stage_failed_refresh', {
+ videoGenerationResultId: inProgress.id
+ });
+ failed.status = 'failed';
+ failed.dispatchStatus = 'finished';
+ failed.errorCode = 'creator_video_upstream_error';
+ failed.errorMessage = 'The video generation status could not be refreshed';
+ failed.finishedAt = '2026-09-07T00:01:00.000Z';
+ stage.job.stages = [failed, stage.stageRun];
+
+ await executor.run(stage);
+
+ expect(service.create).not.toHaveBeenCalled();
+ expect(service.get).toHaveBeenCalledWith(inProgress.id);
+ });
+
+ it('retries a transient provider status error without failing the stage', async () => {
+ tempDir = await mkdtemp(join(tmpdir(), 'creator-video-refresh-retry-'));
+ const queued = videoResult({ status: 'queued', progress: 0, progressKnown: false });
+ const completed = videoResult({
+ status: 'completed',
+ progress: 100,
+ progressKnown: true,
+ fileName: 'OpenCreator-video-result.mp4',
+ size: 12
+ });
+ const refresh = vi.fn()
+ .mockRejectedValueOnce(new VideoGenerationError(
+ 'VIDEO_GENERATION_UPSTREAM_ERROR',
+ 'The video generation status could not be refreshed',
+ 502
+ ))
+ .mockResolvedValueOnce(completed);
+ const service = videoService({
+ create: vi.fn(async () => queued),
+ refresh
+ });
+ const executor = createVideoExecutor({
+ service,
+ sleep: vi.fn(async () => undefined),
+ probeVideo: vi.fn(async () => ({
+ duration: 5,
+ width: 1280,
+ height: 720,
+ hasVideo: true,
+ hasAudio: true
+ }))
+ });
+ const stage = stageInput({}, []);
+
+ await executor.run(stage);
+
+ expect(refresh).toHaveBeenCalledTimes(2);
+ expect(stage.reportProgress).toHaveBeenCalledWith(expect.objectContaining({
+ phase: 'generating',
+ refreshRetry: 1,
+ videoGenerationResultId: queued.id
+ }));
+ });
+
+ it('maps missing provider configuration to Creator needs-input handling', async () => {
+ tempDir = await mkdtemp(join(tmpdir(), 'creator-video-config-'));
+ const service = videoService({
+ create: vi.fn(async () => {
+ throw new VideoGenerationError(
+ 'VIDEO_GENERATION_CONFIG_REQUIRED',
+ 'Configure veo video generation credentials',
+ 409
+ );
+ })
+ });
+ const executor = createVideoExecutor({
+ service,
+ probeVideo: vi.fn()
+ });
+
+ await expect(executor.run(stageInput({ provider: 'veo', duration: 8 }, [])))
+ .rejects.toMatchObject({
+ code: 'creator_video_config_missing'
+ });
+ });
+
+ it('maps an unavailable provider model to an actionable Creator error', async () => {
+ tempDir = await mkdtemp(join(tmpdir(), 'creator-video-model-'));
+ const service = videoService({
+ create: vi.fn(async () => {
+ throw new VideoGenerationError(
+ 'VIDEO_GENERATION_UPSTREAM_ERROR',
+ 'Your account has not activated the model doubao-seedance-2-5',
+ 502
+ );
+ })
+ });
+ const executor = createVideoExecutor({
+ service,
+ probeVideo: vi.fn()
+ });
+
+ await expect(executor.run(stageInput({
+ provider: 'seedance',
+ model: 'doubao-seedance-2-5-260628'
+ }, []))).rejects.toMatchObject({
+ code: 'creator_video_model_unavailable'
+ });
+ });
+});
+
+function videoService(
+ overrides: Partial<VideoGenerationService>
+): VideoGenerationService {
+ return {
+ create: vi.fn(async () => videoResult()),
+ get: vi.fn(async () => videoResult()),
+ refresh: vi.fn(async () => videoResult({ status: 'completed', progress: 100 })),
+ read: vi.fn(async () => ({
+ result: videoResult({ status: 'completed', progress: 100 }),
+ content: Buffer.from('video')
+ })),
+ copyTo: vi.fn(async (_id, destination) => {
+ await writeFile(destination, 'video-content');
+ return videoResult({ status: 'completed', progress: 100 });
+ }),
+ ...overrides
+ };
+}
+
+function videoResult(
+ patch: Partial<VideoGenerationResult> = {}
+): VideoGenerationResult {
+ return {
+ id: 'video_result_1234',
+ prompt: 'A cinematic city reveal',
+ provider: 'veo',
+ model: 'video-model',
+ videoSize: '720x1280',
+ duration: 8,
+ status: 'queued',
+ progress: 0,
+ progressKnown: false,
+ createdAt: '2026-09-07T00:00:00.000Z',
+ updatedAt: '2026-09-07T00:01:00.000Z',
+ ...patch
+ };
+}
+
+function stageInput(
+ state: Record<string, string | number>,
+ inputArtifacts: CreatorArtifact[]
+): CreatorExecutorInput {
+ const createdAt = '2026-09-07T00:00:00.000Z';
+ const job: CreatorJob = {
+ id: 'video_job',
+ projectId: 'project_1',
+ templateId: 'video-generation',
+ templateVersion: 1,
+ status: 'running',
+ revision: 1,
+ state: {
+ prompt: 'A cinematic city reveal',
+ provider: 'seedance',
+ size: '1280x720',
+ duration: 5,
+ referenceImageArtifactId: inputArtifacts[0]?.id ?? null,
+ currentStage: 'generate',
+ ...state
+ },
+ agentThreadId: null,
+ stages: [],
+ artifacts: inputArtifacts,
+ activities: [],
+ createdAt,
+ updatedAt: createdAt
+ };
+ const currentStage = stageRun('video_stage', {});
+ job.stages = [currentStage];
+ return {
+ stageRun: currentStage,
+ job,
+ inputArtifacts,
+ workdir: tempDir,
+ signal: new AbortController().signal,
+ reportProgress: vi.fn()
+ };
+}
+
+function stageRun(
+ id: string,
+ progress: CreatorStageRun['progress']
+): CreatorStageRun {
+ return {
+ id,
+ jobId: 'video_job',
+ stageId: 'generate',
+ executor: 'video',
+ status: 'running',
+ dispatchStatus: 'claimed',
+ claimOwner: 'test',
+ claimExpiresAt: null,
+ attempt: 1,
+ idempotencyKey: null,
+ progress,
+ errorCode: null,
+ errorMessage: null,
+ startedAt: '2026-09-07T00:00:00.000Z',
+ finishedAt: null
+ };
+}
+
+function artifact(
+ kind: string,
+ path: string,
+ metadata: CreatorArtifact['metadata']
+): CreatorArtifact {
+ return {
+ id: `artifact_${kind}`,
+ jobId: 'video_job',
+ kind,
+ version: 1,
+ status: 'completed',
+ path,
+ sourceArtifactIds: [],
+ metadata,
+ createdAt: '2026-09-07T00:00:00.000Z'
+ };
+}
diff --git a/apps/daemon/test/unit/product-data-migration.test.ts b/apps/daemon/test/unit/product-data-migration.test.ts
deleted file mode 100644
index cbe4d8b3..00000000
--- a/apps/daemon/test/unit/product-data-migration.test.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import {
- existsSync,
- mkdirSync,
- mkdtempSync,
- readFileSync,
- rmSync,
- writeFileSync
-} from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { afterEach, describe, expect, it } from 'vitest';
-import {
- consolidateLegacyConfigData,
- migrateLegacyDaemonProductData
-} from '../../src/config/product-data-migration.js';
-
-let root: string | undefined;
-
-afterEach(() => {
- if (root !== undefined) rmSync(root, { recursive: true, force: true });
- root = undefined;
-});
-
-describe('Daemon legacy product data migration', () => {
- it('moves legacy runtime data out of data after an atomic copy succeeds', () => {
- root = mkdtempSync(join(tmpdir(), 'opencreator-daemon-product-migration-'));
- const dataDir = join(root, 'data');
- const runtimeDir = join(root, 'runtime');
- const creatorDir = join(root, 'creator');
- const fixtures = [
- join(dataDir, 'creator-runtime', 'codex-home', 'auth.json'),
- join(dataDir, 'creator-runtime', 'yt-dlp', 'state.json'),
- join(
- dataDir,
- 'creator-runtime',
- 'dependencies',
- 'krillinai',
- 'manifest.json'
- ),
- join(dataDir, 'creator', 'jobs', 'job-1', 'job.json')
- ];
- for (const path of fixtures) {
- mkdirSync(join(path, '..'), { recursive: true });
- writeFileSync(path, `${path}\n`);
- }
-
- const result = migrateLegacyDaemonProductData({
- dataDir,
- runtimeDir,
- creatorDir
- });
-
- expect(result.every(item => item.result.migrated && item.legacyRemoved)).toBe(true);
- expect(readFileSync(join(runtimeDir, 'creator-codex', 'auth.json'), 'utf8'))
- .toContain('creator-runtime/codex-home/auth.json');
- expect(readFileSync(join(runtimeDir, 'yt-dlp', 'state.json'), 'utf8'))
- .toContain('creator-runtime/yt-dlp/state.json');
- expect(readFileSync(join(creatorDir, 'jobs', 'job-1', 'job.json'), 'utf8'))
- .toContain('creator/jobs/job-1/job.json');
- expect(existsSync(join(dataDir, 'creator-runtime'))).toBe(false);
- expect(existsSync(join(dataDir, 'creator'))).toBe(false);
- });
-
- it('keeps a legacy source when an existing target prevents migration', () => {
- root = mkdtempSync(join(tmpdir(), 'opencreator-daemon-product-migration-'));
- const dataDir = join(root, 'data');
- const runtimeDir = join(root, 'runtime');
- const source = join(dataDir, 'creator-runtime', 'yt-dlp', 'state.json');
- const target = join(runtimeDir, 'yt-dlp', 'state.json');
- mkdirSync(join(source, '..'), { recursive: true });
- mkdirSync(join(target, '..'), { recursive: true });
- writeFileSync(source, 'legacy\n');
- writeFileSync(target, 'current\n');
-
- const result = migrateLegacyDaemonProductData({
- dataDir,
- runtimeDir,
- creatorDir: join(root, 'creator')
- });
-
- expect(result.find(item => item.name === 'yt-dlp')).toMatchObject({
- result: { migrated: false, reason: 'TARGET_EXISTS' },
- legacyRemoved: false
- });
- expect(readFileSync(source, 'utf8')).toBe('legacy\n');
- expect(readFileSync(target, 'utf8')).toBe('current\n');
- });
-
- it('moves distinct Clawee archives to the product legacy directory', () => {
- root = mkdtempSync(join(tmpdir(), 'opencreator-daemon-product-migration-'));
- const appHome = join(root, '.opencreator');
- const dataDir = join(appHome, 'data');
- const rootLegacy = join(appHome, 'legacy', 'clawee-config.toml');
- const dataLegacy = join(dataDir, 'legacy', 'clawee-config.toml');
- mkdirSync(join(rootLegacy, '..'), { recursive: true });
- mkdirSync(join(dataLegacy, '..'), { recursive: true });
- mkdirSync(join(dataDir, 'config'), { recursive: true });
- writeFileSync(rootLegacy, 'gateway = "root"\n');
- writeFileSync(dataLegacy, 'gateway = "data"\n');
-
- consolidateLegacyConfigData({ dataDir, appHome });
-
- expect(readFileSync(rootLegacy, 'utf8')).toBe('gateway = "root"\n');
- expect(readFileSync(
- join(appHome, 'legacy', 'clawee-config-2.toml'),
- 'utf8'
- )).toBe('gateway = "data"\n');
- expect(existsSync(join(dataDir, 'legacy'))).toBe(false);
- expect(existsSync(join(dataDir, 'config'))).toBe(false);
- });
-});
diff --git a/apps/desktop/e2e/creator-packaged-app.spec.ts b/apps/desktop/e2e/creator-packaged-app.spec.ts
index b2a86323..b5cf8f81 100644
--- a/apps/desktop/e2e/creator-packaged-app.spec.ts
+++ b/apps/desktop/e2e/creator-packaged-app.spec.ts
@@ -506,7 +506,7 @@ async function launchCreatorDesktop(): Promise<{
const userData = join(root, 'user-data');
const codexBin = writeCodexShim(binDir);
const ytDlpBin = writeYtDlpShim(binDir);
- writeDesktopSettings(userData, codexBin);
+ writeOpenCreatorConfig(join(root, '.opencreator'), codexBin);
const app = await launchPackagedApp({
executablePath: packagedExecutable(desktopDir),
@@ -774,16 +774,22 @@ function writeYtDlpShim(binDir: string): string {
return scriptPath;
}
-function writeDesktopSettings(userData: string, codexBin: string): void {
- mkdirSync(userData, { recursive: true });
+function writeOpenCreatorConfig(productHome: string, codexBin: string): void {
+ mkdirSync(productHome, { recursive: true });
writeFileSync(
- join(userData, 'desktop-settings.json'),
- `${JSON.stringify({
- closeBehavior: 'quit',
- notificationsEnabled: false,
- codexRuntimeMode: 'external',
- externalCodexBin: codexBin
- }, null, 2)}\n`
+ join(productHome, 'config.toml'),
+ [
+ 'version = 1',
+ '',
+ '[desktop]',
+ 'close_behavior = "quit"',
+ 'notifications_enabled = false',
+ '',
+ '[runtime]',
+ 'codex_mode = "external"',
+ `external_codex_bin = ${JSON.stringify(codexBin)}`,
+ ''
+ ].join('\n')
);
}
diff --git a/apps/desktop/e2e/desktop.spec.ts b/apps/desktop/e2e/desktop.spec.ts
index 93b87a3d..1bf93c4e 100644
--- a/apps/desktop/e2e/desktop.spec.ts
+++ b/apps/desktop/e2e/desktop.spec.ts
@@ -17,6 +17,7 @@ import {
resolve
} from 'node:path';
import { execFileSync } from 'node:child_process';
+import { DatabaseSync } from 'node:sqlite';
import { fileURLToPath } from 'node:url';
import {
expect,
@@ -39,6 +40,38 @@ const fakeCodexLauncherSource = join(e2eDir, 'fixtures', 'fake-codex-launcher.go
test.describe.configure({ mode: 'serial' });
+test('打包 App 将旧 Electron 数据当作无关数据且不迁移', async () => {
+ const fixture = await launchPackagedDesktop('success', {
+ minimalPath: true,
+ runtimeMode: 'bundled',
+ seedLegacyData: true,
+ writeCurrentConfig: false
+ });
+ try {
+ await waitForRuntimeReady(fixture.page);
+ const state = await fixture.page.evaluate(
+ () => window.opencreatorDesktop?.readBootstrapState()
+ );
+ expect(state).toMatchObject({
+ phase: 'ready',
+ codexBin: packagedCodexExecutablePath(),
+ codexHome: join(fixture.root, '.opencreator', 'runtime', 'codex')
+ });
+ expect(existsSync(
+ join(fixture.root, '.opencreator', 'data', 'legacy-marker.txt')
+ )).toBe(false);
+ expect(existsSync(
+ join(fixture.root, '.opencreator', 'runtime', 'codex', 'legacy-codex-marker.txt')
+ )).toBe(false);
+ expect(readFileSync(
+ join(fixture.root, '.opencreator', 'config.toml'),
+ 'utf8'
+ )).toContain('codex_mode = "bundled"');
+ } finally {
+ await closeFixture(fixture);
+ }
+});
+
test('bundled 模式在最小 PATH 下忽略 nvm 安装的 Codex', async () => {
const fixture = await launchPackagedDesktop('success', {
codexLocation: 'nvm',
@@ -946,6 +979,8 @@ async function launchPackagedDesktop(
minimalPath?: boolean;
misleadingCodexWrapper?: boolean;
runtimeMode?: 'bundled' | 'external';
+ seedLegacyData?: boolean;
+ writeCurrentConfig?: boolean;
} = {}
): Promise<DesktopFixture> {
const root = mkdtempSync(join(tmpdir(), 'opencreator-desktop-e2e-'));
@@ -959,12 +994,19 @@ async function launchPackagedDesktop(
const userData = join(root, 'user-data');
writeCodexShim(binDir);
mkdirSync(userData, { recursive: true });
- writeFileSync(join(userData, 'desktop-settings.json'), `${JSON.stringify({
- closeBehavior: 'hide',
- notificationsEnabled: true,
- codexRuntimeMode: options.runtimeMode ?? 'external',
- externalCodexBin: join(binDir, process.platform === 'win32' ? 'codex.exe' : 'codex')
- }, null, 2)}\n`);
+ if (options.seedLegacyData === true) {
+ writeLegacyDesktopData(
+ userData,
+ join(binDir, process.platform === 'win32' ? 'codex.exe' : 'codex')
+ );
+ }
+ if (options.writeCurrentConfig !== false) {
+ writeOpenCreatorConfig(
+ join(root, '.opencreator'),
+ join(binDir, process.platform === 'win32' ? 'codex.exe' : 'codex'),
+ options.runtimeMode ?? 'external'
+ );
+ }
if (options.misleadingCodexWrapper === true) {
writeMisleadingCodexWrapper(join(root, '.local', 'bin'));
}
@@ -1007,6 +1049,47 @@ async function launchPackagedDesktop(
return { ...app, root, stateDir };
}
+function writeOpenCreatorConfig(
+ productHome: string,
+ codexBin: string,
+ runtimeMode: 'bundled' | 'external'
+): void {
+ mkdirSync(productHome, { recursive: true });
+ writeFileSync(join(productHome, 'config.toml'), [
+ 'version = 1',
+ '',
+ '[desktop]',
+ 'close_behavior = "hide"',
+ 'notifications_enabled = true',
+ '',
+ '[runtime]',
+ `codex_mode = ${JSON.stringify(runtimeMode)}`,
+ `external_codex_bin = ${JSON.stringify(codexBin)}`,
+ ''
+ ].join('\n'));
+}
+
+function writeLegacyDesktopData(userData: string, codexBin: string): void {
+ const daemonDir = join(userData, 'daemon');
+ const legacyCodexHome = join(userData, 'runtime', 'codex', 'home');
+ mkdirSync(daemonDir, { recursive: true });
+ mkdirSync(legacyCodexHome, { recursive: true });
+ const database = new DatabaseSync(join(daemonDir, 'app.sqlite'));
+ database.exec('create table legacy_marker (value text not null)');
+ database.close();
+ writeFileSync(join(daemonDir, 'legacy-marker.txt'), 'must-not-migrate\n');
+ writeFileSync(
+ join(legacyCodexHome, 'legacy-codex-marker.txt'),
+ 'must-not-migrate\n'
+ );
+ writeFileSync(join(userData, 'desktop-settings.json'), `${JSON.stringify({
+ closeBehavior: 'quit',
+ notificationsEnabled: false,
+ codexRuntimeMode: 'external',
+ externalCodexBin: codexBin
+ }, null, 2)}\n`);
+}
+
function minimalSystemPath(): string {
if (process.platform === 'win32') {
return process.env.SystemRoot === undefined
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 1b25403c..e83b1f38 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -11,7 +11,7 @@
"prebuild": "node ../../scripts/build-krillinai.mjs && pnpm --filter @opencreator/protocol build && pnpm --filter @opencreator/config build",
"pretypecheck": "pnpm --filter @opencreator/protocol build && pnpm --filter @opencreator/config build",
"pretest": "pnpm --filter @opencreator/protocol build && pnpm --filter @opencreator/config build",
- "build:main": "tsc -p tsconfig.main.json",
+ "build:main": "node -e \"const fs=require('node:fs'); for (const path of ['dist/main','dist/shared']) fs.rmSync(path,{recursive:true,force:true})\" && tsc -p tsconfig.main.json",
"build:preload": "esbuild src/preload/index.ts --bundle --platform=node --format=cjs --target=node22 --external:electron --outfile=dist/preload/index.cjs",
"build:bootstrap": "vite build --config vite.bootstrap.config.ts",
"build": "pnpm build:main && pnpm build:preload && pnpm build:bootstrap",
diff --git a/apps/desktop/src/bootstrap/main.ts b/apps/desktop/src/bootstrap/main.ts
index 470df43a..40e7aa43 100644
--- a/apps/desktop/src/bootstrap/main.ts
+++ b/apps/desktop/src/bootstrap/main.ts
@@ -57,7 +57,6 @@ let currentState: BootstrapState | undefined;
const labels: Record<BootstrapState['phase'], [string, string]> = {
idle: ['正在准备 OpenCreator', '正在初始化桌面环境'],
- migrating_data: ['正在迁移本地数据', '正在校验并复制现有 OpenCreator Runtime 数据'],
resolving_codex: ['正在查找本机 Codex', '正在读取终端环境和已保存路径'],
starting_daemon: ['正在启动本地运行服务', '正在创建独立的 OpenCreator Runtime'],
probing_codex: ['正在验证 Codex 是否可用', '正在检查本机 Codex 进程'],
diff --git a/apps/desktop/src/main/bootstrap-controller.ts b/apps/desktop/src/main/bootstrap-controller.ts
index 0ef71aa2..4904f926 100644
--- a/apps/desktop/src/main/bootstrap-controller.ts
+++ b/apps/desktop/src/main/bootstrap-controller.ts
@@ -135,10 +135,6 @@ export class BootstrapController extends EventEmitter<BootstrapControllerEvents>
this.emit('ready');
}
- markMigratingData(): void {
- this.updateState({ phase: 'migrating_data', error: undefined });
- }
-
markWorkspaceReady(): void {
this.updateState({ phase: 'ready', error: undefined });
}
diff --git a/apps/desktop/src/main/data-migration.ts b/apps/desktop/src/main/data-migration.ts
deleted file mode 100644
index b96420e2..00000000
--- a/apps/desktop/src/main/data-migration.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { Worker } from 'node:worker_threads';
-import type {
- RuntimeImportInput,
- RuntimeImportResult,
- RuntimeImportWorkerMessage
-} from './workers/data-migration-worker.js';
-
-export type { RuntimeImportInput, RuntimeImportResult };
-
-export type RuntimeDataImportTask = {
- result: Promise<RuntimeImportResult>;
- cancel(): Promise<void>;
-};
-
-export function startRuntimeDataImport(
- input: RuntimeImportInput
-): RuntimeDataImportTask {
- if (input.source === undefined || input.source.trim().length === 0) {
- return {
- result: Promise.resolve({ imported: false, reason: 'NO_SOURCE' }),
- cancel: async () => undefined
- };
- }
-
- const worker = new Worker(
- new URL('./workers/data-migration-worker.js', import.meta.url),
- { workerData: input }
- );
- let settled = false;
- let resolveResult: (result: RuntimeImportResult) => void;
- let rejectResult: (error: Error) => void;
- const result = new Promise<RuntimeImportResult>((resolve, reject) => {
- resolveResult = resolve;
- rejectResult = reject;
- });
-
- worker.once('message', (message: RuntimeImportWorkerMessage) => {
- if (settled) return;
- settled = true;
- if (message.ok) {
- resolveResult(message.result);
- } else {
- rejectResult(new RuntimeDataMigrationError(
- message.error.code,
- message.error.message
- ));
- }
- });
- worker.once('error', error => {
- if (settled) return;
- settled = true;
- rejectResult(error);
- });
- worker.once('exit', code => {
- if (settled) return;
- settled = true;
- rejectResult(new RuntimeDataMigrationError(
- 'WORKER_EXITED',
- `Runtime data migration worker exited with code ${code}`
- ));
- });
-
- return {
- result,
- async cancel() {
- if (settled) return;
- settled = true;
- await worker.terminate();
- rejectResult(new RuntimeDataMigrationError(
- 'MIGRATION_CANCELED',
- 'Runtime data migration was canceled'
- ));
- }
- };
-}
-
-export class RuntimeDataMigrationError extends Error {
- constructor(
- readonly code: string,
- message: string
- ) {
- super(message);
- this.name = 'RuntimeDataMigrationError';
- }
-}
diff --git a/apps/desktop/src/main/main.ts b/apps/desktop/src/main/main.ts
index ac5794dc..e082ec11 100644
--- a/apps/desktop/src/main/main.ts
+++ b/apps/desktop/src/main/main.ts
@@ -1,4 +1,3 @@
-import { existsSync } from 'node:fs';
import { join, resolve } from 'node:path';
import { resolveOpenCreatorPaths } from '@opencreator/config';
import {
@@ -10,10 +9,6 @@ import {
} from 'electron';
import { BootstrapController } from './bootstrap-controller.js';
import { DaemonManager } from './daemon-manager.js';
-import {
- startRuntimeDataImport,
- type RuntimeDataImportTask
-} from './data-migration.js';
import {
startLoginShellEnvironmentRead,
type LoginShellEnvironmentTask
@@ -29,7 +24,6 @@ import {
revealPath
} from './native-actions.js';
import { NotificationManager } from './notification-manager.js';
-import { migrateProductData } from './product-data-migration.js';
import { resolveDesktopUserDataPath } from './runtime-profile.js';
import {
installProtocolHandler,
@@ -78,7 +72,6 @@ async function launchDesktop(): Promise<void> {
let workspaceLoadWork: Promise<void> | undefined;
let shutdownStarted = false;
let allowQuit = false;
- let migrationTask: RuntimeDataImportTask | undefined;
let loginShellTask: LoginShellEnvironmentTask | undefined;
const queueDeepLink = (value: string | undefined) => {
@@ -106,7 +99,6 @@ async function launchDesktop(): Promise<void> {
const appReadyAt = Date.now();
const development = DEVELOPMENT;
const appRoot = app.getAppPath();
- const electronUserData = app.getPath('userData');
const paths = resolveOpenCreatorPaths({
homeDir: app.getPath('home'),
runtimeChannel: development ? 'development' : 'production'
@@ -116,11 +108,7 @@ async function launchDesktop(): Promise<void> {
?? app.getPath('documents');
const logDir = paths.logsDir;
const logger = createDesktopLogger(join(logDir, 'desktop-main.log'));
- const settings = createSettingsStore(
- paths.configFile,
- undefined,
- join(electronUserData, 'desktop-settings.json')
- );
+ const settings = createSettingsStore(paths.configFile);
const daemon = new DaemonManager(logger);
const tray = new TrayManager();
const daemonEntryPath = development
@@ -280,55 +268,6 @@ async function launchDesktop(): Promise<void> {
loginShellTask = startLoginShellEnvironmentRead({
timeoutMs: 5_000
});
- const importSource = runtimeImportSource(
- process.argv,
- process.env.OPENCREATOR_IMPORT_DATA_DIR
- ) ?? (
- existsSync(join(electronUserData, 'daemon'))
- ? join(electronUserData, 'daemon')
- : undefined
- );
- migrationTask = startRuntimeDataImport({
- source: importSource,
- target: dataDir
- });
- if (importSource !== undefined && importSource.trim().length > 0) {
- bootstrap.markMigratingData();
- }
- try {
- const imported = await migrationTask.result;
- if (imported.imported) {
- settings.update({ importedRuntimeSource: imported.source });
- logger.info('Imported existing Runtime data', {
- source: imported.source,
- target: imported.target
- });
- }
- } catch (error) {
- logger.error('Runtime data import failed', {
- source: importSource,
- message: error instanceof Error ? error.message : String(error)
- });
- }
- try {
- const migrations = migrateProductData({
- paths,
- legacyElectronUserData: electronUserData
- });
- for (const migration of migrations) {
- if (migration.result.migrated) {
- logger.info('Migrated OpenCreator product data', {
- name: migration.name,
- source: migration.result.source,
- target: migration.result.target
- });
- }
- }
- } catch (error) {
- logger.error('OpenCreator product data migration failed', {
- message: error instanceof Error ? error.message : String(error)
- });
- }
void bootstrap.start(undefined, loginShellTask);
app.on('activate', () => windowManager?.show());
@@ -346,7 +285,6 @@ async function launchDesktop(): Promise<void> {
tray.destroy();
void Promise.all([
bootstrap?.stop() ?? Promise.resolve(),
- migrationTask?.cancel() ?? Promise.resolve(),
loginShellTask?.cancel() ?? Promise.resolve()
])
.catch(error => {
@@ -580,12 +518,6 @@ function registerApplicationProtocol(
if (!result) logger.warn('Failed to register opencreator:// protocol');
}
-function runtimeImportSource(argv: string[], environmentValue?: string): string | undefined {
- const argument = argv.find(value => value.startsWith('--import-runtime='));
- if (argument !== undefined) return argument.slice('--import-runtime='.length);
- return environmentValue;
-}
-
function ok(): DesktopHostResult {
return { ok: true };
}
diff --git a/apps/desktop/src/main/product-data-migration.ts b/apps/desktop/src/main/product-data-migration.ts
deleted file mode 100644
index 5d4c2f9d..00000000
--- a/apps/desktop/src/main/product-data-migration.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { join } from 'node:path';
-import {
- migrateDirectoryIfEmpty,
- type DirectoryMigrationResult,
- type OpenCreatorPaths
-} from '@opencreator/config';
-
-export type ProductDataMigration = {
- name: 'codex';
- result: DirectoryMigrationResult;
-};
-
-export function migrateProductData(input: {
- paths: OpenCreatorPaths;
- legacyElectronUserData: string;
-}): ProductDataMigration[] {
- return [
- {
- name: 'codex',
- result: migrateDirectoryIfEmpty(
- join(input.legacyElectronUserData, 'runtime', 'codex', 'home'),
- input.paths.codexHome
- )
- }
- ];
-}
diff --git a/apps/desktop/src/main/settings-store.ts b/apps/desktop/src/main/settings-store.ts
index 7f86fa8b..6115109f 100644
--- a/apps/desktop/src/main/settings-store.ts
+++ b/apps/desktop/src/main/settings-store.ts
@@ -1,6 +1,3 @@
-import {
- readFileSync
-} from 'node:fs';
import {
readOpenCreatorConfig,
resolveDesktopConfig,
@@ -28,15 +25,13 @@ export type SettingsPersistence = {
path: string,
update: (document: OpenCreatorConfigDocument) => OpenCreatorConfigDocument
): OpenCreatorConfigSnapshot;
- readLegacy(path: string): string;
};
export function createSettingsStore(
path: string,
- persistence: SettingsPersistence = fileSettingsPersistence,
- legacyPath?: string
+ persistence: SettingsPersistence = fileSettingsPersistence
): SettingsStore {
- let current = readSettings(path, persistence, legacyPath);
+ let current = readSettings(path, persistence);
return {
read() {
return structuredClone(current);
@@ -52,9 +47,6 @@ export function createSettingsStore(
...(current.successfulCodexBin === undefined
? {}
: { successfulCodexBin: current.successfulCodexBin }),
- ...(current.importedRuntimeSource === undefined
- ? {}
- : { importedRuntimeSource: current.importedRuntimeSource }),
...(current.window === undefined ? {} : { window: current.window })
},
runtime: {
@@ -72,42 +64,22 @@ export function createSettingsStore(
function readSettings(
path: string,
- persistence: SettingsPersistence,
- legacyPath?: string
+ persistence: SettingsPersistence
): DesktopSettings {
try {
const snapshot = persistence.read(path);
if (!snapshot.configured.desktop && !snapshot.configured.runtime) {
- let legacy = structuredClone(defaultSettings);
- if (legacyPath !== undefined) {
- try {
- legacy = normalizeSettings(JSON.parse(persistence.readLegacy(legacyPath)) as unknown);
- } catch {
- // Persist current OpenCreator defaults when there is no legacy Desktop file.
- }
- }
persistence.update(path, document => ({
...document,
desktop: {
- closeBehavior: legacy.closeBehavior,
- notificationsEnabled: legacy.notificationsEnabled,
- ...(legacy.codexBin === undefined ? {} : { codexBin: legacy.codexBin }),
- ...(legacy.successfulCodexBin === undefined
- ? {}
- : { successfulCodexBin: legacy.successfulCodexBin }),
- ...(legacy.importedRuntimeSource === undefined
- ? {}
- : { importedRuntimeSource: legacy.importedRuntimeSource }),
- ...(legacy.window === undefined ? {} : { window: legacy.window })
+ closeBehavior: defaultSettings.closeBehavior,
+ notificationsEnabled: defaultSettings.notificationsEnabled
},
runtime: {
- codexMode: legacy.codexRuntimeMode ?? 'bundled',
- ...(legacy.externalCodexBin === undefined
- ? {}
- : { externalCodexBin: legacy.externalCodexBin })
+ codexMode: 'bundled'
}
}));
- return legacy;
+ return structuredClone(defaultSettings);
}
return normalizeSettings({
...resolveDesktopConfig(snapshot),
@@ -136,9 +108,6 @@ function normalizeSettings(value: unknown): DesktopSettings {
if (typeof value.externalCodexBin === 'string' && value.externalCodexBin.length > 0) {
settings.externalCodexBin = value.externalCodexBin;
}
- if (typeof value.importedRuntimeSource === 'string' && value.importedRuntimeSource.length > 0) {
- settings.importedRuntimeSource = value.importedRuntimeSource;
- }
if (isRecord(value.window)) {
const width = numberValue(value.window.width, 1280);
const height = numberValue(value.window.height, 820);
@@ -155,8 +124,7 @@ function normalizeSettings(value: unknown): DesktopSettings {
const fileSettingsPersistence: SettingsPersistence = {
read: readOpenCreatorConfig,
- update: updateOpenCreatorConfig,
- readLegacy: path => readFileSync(path, 'utf8')
+ update: updateOpenCreatorConfig
};
function numberValue(value: unknown, fallback: number): number {
diff --git a/apps/desktop/src/main/workers/data-migration-worker.ts b/apps/desktop/src/main/workers/data-migration-worker.ts
deleted file mode 100644
index fa7ea32c..00000000
--- a/apps/desktop/src/main/workers/data-migration-worker.ts
+++ /dev/null
@@ -1,244 +0,0 @@
-import {
- cpSync,
- existsSync,
- lstatSync,
- mkdirSync,
- readFileSync,
- readdirSync,
- realpathSync,
- renameSync,
- rmSync
-} from 'node:fs';
-import { DatabaseSync } from 'node:sqlite';
-import {
- basename,
- dirname,
- isAbsolute,
- join,
- relative,
- resolve,
- sep
-} from 'node:path';
-import {
- isMainThread,
- parentPort,
- workerData
-} from 'node:worker_threads';
-
-export type RuntimeImportInput = {
- source?: string;
- target: string;
-};
-
-export type RuntimeImportResult =
- | { imported: true; source: string; target: string }
- | { imported: false; reason: 'NO_SOURCE' | 'TARGET_EXISTS' };
-
-export type RuntimeImportWorkerMessage =
- | { ok: true; result: RuntimeImportResult }
- | {
- ok: false;
- error: {
- code: string;
- message: string;
- };
- };
-
-export class RuntimeImportValidationError extends Error {
- constructor(
- readonly code: string,
- message: string
- ) {
- super(message);
- this.name = 'RuntimeImportValidationError';
- }
-}
-
-export function runRuntimeDataImport(
- input: RuntimeImportInput
-): RuntimeImportResult {
- if (input.source === undefined || input.source.trim().length === 0) {
- return { imported: false, reason: 'NO_SOURCE' };
- }
-
- const source = resolve(input.source);
- const target = resolve(input.target);
- const sourceReal = validateSourceDirectory(source);
- const targetReal = resolveProspectiveRealPath(target);
- assertPathsAreIndependent(sourceReal, targetReal);
- if (existsSync(target) && readdirSync(target).length > 0) {
- return { imported: false, reason: 'TARGET_EXISTS' };
- }
- assertRuntimeNotLocked(sourceReal);
- validateSqlite(join(sourceReal, 'app.sqlite'));
-
- mkdirSync(dirname(target), { recursive: true });
- const temporary = join(
- dirname(target),
- `.${basename(target)}.import-${process.pid}-${Date.now()}`
- );
- assertPathsAreIndependent(sourceReal, resolveProspectiveRealPath(temporary));
- rmSync(temporary, { recursive: true, force: true });
-
- try {
- validatePortableTree(sourceReal);
- cpSync(sourceReal, temporary, {
- recursive: true,
- errorOnExist: true,
- force: false
- });
- validatePortableTree(temporary);
- validateSqlite(join(temporary, 'app.sqlite'));
- if (existsSync(target)) rmSync(target, { recursive: true });
- renameSync(temporary, target);
- return { imported: true, source: sourceReal, target };
- } catch (error) {
- rmSync(temporary, { recursive: true, force: true });
- if (!existsSync(target)) mkdirSync(target, { recursive: true });
- throw error;
- }
-}
-
-function validateSourceDirectory(path: string): string {
- if (!existsSync(path)) {
- throw new RuntimeImportValidationError(
- 'SOURCE_MISSING',
- `Runtime import source does not exist: ${path}`
- );
- }
- const stat = lstatSync(path);
- if (stat.isSymbolicLink() || !stat.isDirectory()) {
- throw new RuntimeImportValidationError(
- 'SOURCE_INVALID',
- `Runtime import source must be a real directory: ${path}`
- );
- }
- return realpathSync(path);
-}
-
-function validatePortableTree(root: string): void {
- for (const entry of readdirSync(root, { withFileTypes: true })) {
- const path = join(root, entry.name);
- const stat = lstatSync(path);
- if (stat.isSymbolicLink()) {
- throw new RuntimeImportValidationError(
- 'SYMLINK_REJECTED',
- `Runtime import contains a symbolic link: ${path}`
- );
- }
- if (stat.isDirectory()) {
- validatePortableTree(path);
- continue;
- }
- if (!stat.isFile()) {
- throw new RuntimeImportValidationError(
- 'SPECIAL_FILE_REJECTED',
- `Runtime import contains a special file: ${path}`
- );
- }
- }
-}
-
-function validateSqlite(path: string): void {
- if (!existsSync(path) || !lstatSync(path).isFile()) {
- throw new RuntimeImportValidationError(
- 'DATABASE_MISSING',
- `Runtime database does not exist: ${path}`
- );
- }
- let database: DatabaseSync | undefined;
- try {
- database = new DatabaseSync(path, {
- open: true,
- readOnly: true
- });
- const rows = database.prepare('PRAGMA quick_check').all();
- const values = rows.flatMap(row => Object.values(row));
- if (values.length !== 1 || values[0] !== 'ok') {
- throw new Error(values.map(String).join('; ') || 'unknown quick_check result');
- }
- } catch (error) {
- throw new RuntimeImportValidationError(
- 'DATABASE_CORRUPT',
- `Runtime database quick_check failed: ${
- error instanceof Error ? error.message : String(error)
- }`
- );
- } finally {
- database?.close();
- }
-}
-
-function assertRuntimeNotLocked(source: string): void {
- const lockPath = join(source, 'opencreator-runtime.lock');
- if (!existsSync(lockPath)) return;
- const pid = Number(readFileSync(lockPath, 'utf8').trim());
- if (!Number.isInteger(pid) || pid <= 0) return;
- try {
- process.kill(pid, 0);
- } catch (error) {
- if (isNodeError(error) && error.code === 'ESRCH') return;
- throw new RuntimeImportValidationError(
- 'SOURCE_LOCKED',
- `Runtime source may still be in use by process ${pid}`
- );
- }
- throw new RuntimeImportValidationError(
- 'SOURCE_LOCKED',
- `Runtime source is currently in use by process ${pid}`
- );
-}
-
-function assertPathsAreIndependent(source: string, target: string): void {
- if (isPathWithin(source, target) || isPathWithin(target, source)) {
- throw new RuntimeImportValidationError(
- 'PATH_RELATION_INVALID',
- 'Runtime import source, temporary directory, and target must not contain one another'
- );
- }
-}
-
-function isPathWithin(parent: string, child: string): boolean {
- const path = relative(parent, child);
- return path === ''
- || (!path.startsWith(`..${sep}`) && path !== '..' && !isAbsolute(path));
-}
-
-function resolveProspectiveRealPath(path: string): string {
- if (existsSync(path)) {
- const stat = lstatSync(path);
- if (stat.isSymbolicLink()) {
- throw new RuntimeImportValidationError(
- 'SYMLINK_REJECTED',
- `Runtime import path must not be a symbolic link: ${path}`
- );
- }
- return realpathSync(path);
- }
- const parent = dirname(path);
- mkdirSync(parent, { recursive: true });
- return join(realpathSync(parent), basename(path));
-}
-
-function isNodeError(error: unknown): error is NodeJS.ErrnoException {
- return error instanceof Error && 'code' in error;
-}
-
-if (!isMainThread) {
- try {
- parentPort?.postMessage({
- ok: true,
- result: runRuntimeDataImport(workerData as RuntimeImportInput)
- } satisfies RuntimeImportWorkerMessage);
- } catch (error) {
- parentPort?.postMessage({
- ok: false,
- error: {
- code: error instanceof RuntimeImportValidationError
- ? error.code
- : 'MIGRATION_FAILED',
- message: error instanceof Error ? error.message : String(error)
- }
- } satisfies RuntimeImportWorkerMessage);
- }
-}
diff --git a/apps/desktop/src/shared/types.ts b/apps/desktop/src/shared/types.ts
index 4b6dc6e5..1b3b3e46 100644
--- a/apps/desktop/src/shared/types.ts
+++ b/apps/desktop/src/shared/types.ts
@@ -1,6 +1,5 @@
export type DesktopBootstrapPhase =
| 'idle'
- | 'migrating_data'
| 'resolving_codex'
| 'starting_daemon'
| 'probing_codex'
@@ -63,7 +62,6 @@ export type DesktopSettings = {
height: number;
maximized?: boolean;
};
- importedRuntimeSource?: string;
};
export type DesktopPreferences = {
diff --git a/apps/desktop/test/data-migration.test.ts b/apps/desktop/test/data-migration.test.ts
deleted file mode 100644
index 8d5cd158..00000000
--- a/apps/desktop/test/data-migration.test.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import {
- mkdirSync,
- mkdtempSync,
- rmSync,
- realpathSync,
- symlinkSync,
- writeFileSync
-} from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { DatabaseSync } from 'node:sqlite';
-import { afterEach, describe, expect, it } from 'vitest';
-import {
- RuntimeImportValidationError,
- runRuntimeDataImport
-} from '../src/main/workers/data-migration-worker.js';
-
-let tempDir = '';
-
-afterEach(() => {
- if (tempDir.length > 0) rmSync(tempDir, { recursive: true, force: true });
- tempDir = '';
-});
-
-describe('Runtime data migration', () => {
- it('copies a validated Runtime database into an empty target', () => {
- const { source, target } = createFixture();
- writeFileSync(join(source, 'note.txt'), 'preserved');
-
- expect(runRuntimeDataImport({ source, target })).toEqual({
- imported: true,
- source: realpathSync(source),
- target
- });
- const copied = new DatabaseSync(join(target, 'app.sqlite'), {
- readOnly: true
- });
- expect(copied.prepare('select value from settings').get()).toEqual({
- value: 'ready'
- });
- copied.close();
- });
-
- it('keeps an existing non-empty target unchanged', () => {
- const { source, target } = createFixture();
- mkdirSync(target, { recursive: true });
- writeFileSync(join(target, 'keep.txt'), 'existing');
-
- expect(runRuntimeDataImport({ source, target })).toEqual({
- imported: false,
- reason: 'TARGET_EXISTS'
- });
- });
-
- it('rejects parent-child source and target paths', () => {
- const { source } = createFixture();
- expect(() => runRuntimeDataImport({
- source,
- target: join(source, 'nested-target')
- })).toThrowError(RuntimeImportValidationError);
- });
-
- it('rejects symbolic links inside the source tree', () => {
- const { source, target } = createFixture();
- const external = join(tempDir, process.platform === 'win32' ? 'external' : 'external.txt');
- if (process.platform === 'win32') {
- mkdirSync(external);
- writeFileSync(join(external, 'outside.txt'), 'outside');
- symlinkSync(external, join(source, 'external-link'), 'junction');
- } else {
- writeFileSync(external, 'outside');
- symlinkSync(external, join(source, 'external-link'));
- }
-
- expect(() => runRuntimeDataImport({ source, target }))
- .toThrow(/symbolic link/i);
- });
-
- it('rejects a corrupt SQLite database without changing the source', () => {
- const { source, target } = createFixture(false);
- const databasePath = join(source, 'app.sqlite');
- writeFileSync(databasePath, 'not sqlite');
-
- expect(() => runRuntimeDataImport({ source, target }))
- .toThrow(/quick_check/i);
- });
-});
-
-function createFixture(validDatabase = true): {
- source: string;
- target: string;
-} {
- tempDir = mkdtempSync(join(tmpdir(), 'opencreator-migration-'));
- const source = join(tempDir, 'source');
- const target = join(tempDir, 'target');
- mkdirSync(source);
- if (validDatabase) {
- const database = new DatabaseSync(join(source, 'app.sqlite'));
- database.exec('create table settings (value text not null)');
- database.prepare('insert into settings (value) values (?)').run('ready');
- database.close();
- }
- return { source, target };
-}
diff --git a/apps/desktop/test/product-data-migration.test.ts b/apps/desktop/test/product-data-migration.test.ts
deleted file mode 100644
index af44d357..00000000
--- a/apps/desktop/test/product-data-migration.test.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import {
- mkdirSync,
- mkdtempSync,
- readFileSync,
- rmSync,
- writeFileSync
-} from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { afterEach, describe, expect, it } from 'vitest';
-import { resolveOpenCreatorPaths } from '@opencreator/config';
-import { migrateProductData } from '../src/main/product-data-migration.js';
-
-let root: string | undefined;
-
-afterEach(() => {
- if (root !== undefined) rmSync(root, { recursive: true, force: true });
- root = undefined;
-});
-
-describe('OpenCreator product data migration', () => {
- it('moves the legacy Desktop Codex HOME under .opencreator', () => {
- root = mkdtempSync(join(tmpdir(), 'opencreator-product-migration-'));
- const electronUserData = join(root, 'Library', 'OpenCreator');
- const paths = resolveOpenCreatorPaths({
- homeDir: join(root, 'home'),
- env: {}
- });
- const config = join(
- electronUserData,
- 'runtime',
- 'codex',
- 'home',
- 'config.toml'
- );
- mkdirSync(join(config, '..'), { recursive: true });
- writeFileSync(config, `${config}\n`);
-
- const result = migrateProductData({
- paths,
- legacyElectronUserData: electronUserData
- });
-
- expect(result.every(item => item.result.migrated)).toBe(true);
- expect(readFileSync(join(paths.codexHome, 'config.toml'), 'utf8')).toContain(
- 'runtime/codex/home/config.toml'
- );
- });
-});
diff --git a/apps/desktop/test/settings-store.test.ts b/apps/desktop/test/settings-store.test.ts
index bc707210..87d367fe 100644
--- a/apps/desktop/test/settings-store.test.ts
+++ b/apps/desktop/test/settings-store.test.ts
@@ -21,10 +21,7 @@ describe('SettingsStore', () => {
read: () => {
throw new Error('broken');
},
- update: vi.fn(() => emptySnapshot()),
- readLegacy: () => {
- throw new Error('missing');
- }
+ update: vi.fn(() => emptySnapshot())
};
const store = createSettingsStore('/virtual/config.toml', persistence);
@@ -53,10 +50,7 @@ describe('SettingsStore', () => {
desktop: true
}
}),
- update,
- readLegacy: () => {
- throw new Error('missing');
- }
+ update
};
const store = createSettingsStore('/virtual/config.toml', persistence);
@@ -68,42 +62,29 @@ describe('SettingsStore', () => {
expect(store.read().closeBehavior).toBe('quit');
});
- it('imports legacy desktop JSON into config.toml sections once', () => {
+ it('persists fresh-install defaults into config.toml sections', () => {
const update = vi.fn((_path, apply) => ({
...emptySnapshot(),
document: apply({ version: 1 })
}));
const persistence: SettingsPersistence = {
read: emptySnapshot,
- update,
- readLegacy: () => JSON.stringify({
- closeBehavior: 'quit',
- notificationsEnabled: false,
- codexRuntimeMode: 'external',
- externalCodexBin: '/opt/codex'
- })
+ update
};
- const store = createSettingsStore(
- '/virtual/config.toml',
- persistence,
- '/legacy/desktop-settings.json'
- );
+ const store = createSettingsStore('/virtual/config.toml', persistence);
expect(store.read()).toMatchObject({
- closeBehavior: 'quit',
- notificationsEnabled: false,
- codexRuntimeMode: 'external',
- externalCodexBin: '/opt/codex'
+ closeBehavior: 'hide',
+ notificationsEnabled: true
});
- const migrated = update.mock.calls[0]![1]({ version: 1 });
- expect(migrated.desktop).toMatchObject({
- closeBehavior: 'quit',
- notificationsEnabled: false
+ const initialized = update.mock.calls[0]![1]({ version: 1 });
+ expect(initialized.desktop).toMatchObject({
+ closeBehavior: 'hide',
+ notificationsEnabled: true
});
- expect(migrated.runtime).toMatchObject({
- codexMode: 'external',
- externalCodexBin: '/opt/codex'
+ expect(initialized.runtime).toMatchObject({
+ codexMode: 'bundled'
});
});
});
diff --git a/apps/web/e2e/web-desktop-parity.spec.ts b/apps/web/e2e/web-desktop-parity.spec.ts
index e7812696..dba4f4fe 100644
--- a/apps/web/e2e/web-desktop-parity.spec.ts
+++ b/apps/web/e2e/web-desktop-parity.spec.ts
@@ -201,6 +201,137 @@ test('视频下载在 Browser/Desktop Bridge 下保持相同界面、请求和
expect(results[1]!.state).toEqual(results[0]!.state);
});
+test('视频生成在 Browser/Desktop Bridge 下保持相同界面、请求和持久状态', async ({
+ browser,
+ runtime
+}, testInfo) => {
+ test.skip(
+ testInfo.project.name !== 'chromium-desktop',
+ '一致性规格内部固定创建 Browser/Desktop Chromium 上下文'
+ );
+
+ const results: Array<{
+ text: string;
+ boxes: Record<string, { x: number; y: number; width: number; height: number }>;
+ requests: string[];
+ state: Record<string, unknown>;
+ }> = [];
+
+ for (const platform of ['browser', 'desktop'] as const) {
+ const created = await runtime.api<{
+ job: { id: string; state: Record<string, unknown> };
+ }>('POST', '/creator/jobs', {
+ projectId: runtime.projectId,
+ templateId: 'video-generation',
+ state: {
+ prompt: '雨夜中的未来城市,镜头平稳向前推进',
+ provider: 'seedance',
+ model: 'doubao-seedance-2-0-260128',
+ size: '1280x720',
+ duration: 5,
+ currentStep: 1,
+ furthestStep: 1
+ }
+ });
+ const context = await browser.newContext({
+ viewport: { width: 1280, height: 800 },
+ deviceScaleFactor: 1,
+ colorScheme: 'dark',
+ reducedMotion: 'reduce'
+ });
+ const page = await context.newPage();
+ if (platform === 'desktop') await installDesktopBridge(page);
+
+ try {
+ await runtime.openApp(page);
+ const requests: string[] = [];
+ page.on('request', request => {
+ const url = new URL(request.url());
+ if (!url.pathname.includes('/creator/')) return;
+ requests.push(
+ `${request.method()} ${url.pathname
+ .replace('/.opencreator/runtime', '')
+ .replace(created.job.id, '{jobId}')}`
+ );
+ });
+ await page.goto(
+ `${runtime.origin}/#/workbench?tool=video-generation`
+ + `&jobId=${encodeURIComponent(created.job.id)}`
+ );
+
+ const workspace = page.getByRole('region', { name: '视频生成 操作区' });
+ const panel = page.getByRole('complementary', { name: 'OpenCreator' });
+ const provider = workspace.getByRole('combobox', { name: '视频服务' });
+ const model = workspace.getByRole('combobox', { name: '模型版本' });
+ const format = workspace.getByRole('combobox', { name: '画幅' });
+ const duration = workspace.getByRole('combobox', { name: '视频时长' });
+ await expect(provider).toHaveValue('seedance');
+ await expect(model).toHaveValue('doubao-seedance-2-0-260128');
+ await expect(format).toHaveValue('1280x720');
+ await expect(duration).toHaveValue('5');
+ await provider.selectOption('veo');
+ await expect(model).toHaveValue('veo-3.1-generate-preview');
+ await format.selectOption('720x1280');
+ await duration.selectOption('8');
+
+ await expect.poll(async () => (
+ await runtime.api<{
+ job: { state: Record<string, unknown> };
+ }>('GET', `/creator/jobs/${encodeURIComponent(created.job.id)}`)
+ ).job.state).toMatchObject({
+ prompt: '雨夜中的未来城市,镜头平稳向前推进',
+ provider: 'veo',
+ model: 'veo-3.1-generate-preview',
+ size: '720x1280',
+ duration: 8,
+ currentStep: 1,
+ furthestStep: 1
+ });
+ await expect(panel).toContainText('竖屏 · 8s');
+
+ const boxes: Record<
+ string,
+ { x: number; y: number; width: number; height: number }
+ > = {};
+ for (const [name, locator] of [
+ ['workspace', workspace],
+ ['panel', panel],
+ ['provider', provider],
+ ['model', model],
+ ['format', format],
+ ['duration', duration]
+ ] as const) {
+ const box = await locator.boundingBox();
+ expect(box, `${platform} 缺少 ${name} 尺寸目标`).not.toBeNull();
+ boxes[name] = {
+ x: Math.round(box!.x),
+ y: Math.round(box!.y),
+ width: Math.round(box!.width),
+ height: Math.round(box!.height)
+ };
+ }
+ const persisted = await runtime.api<{
+ job: { state: Record<string, unknown> };
+ }>('GET', `/creator/jobs/${encodeURIComponent(created.job.id)}`);
+ results.push({
+ text: normalizeParityText(
+ `${await workspace.innerText()}\n${await panel.innerText()}`
+ ),
+ boxes,
+ requests,
+ state: persisted.job.state
+ });
+ } finally {
+ await context.close();
+ }
+ }
+
+ expect(results[1]!.text).toBe(results[0]!.text);
+ expect(results[1]!.boxes).toEqual(results[0]!.boxes);
+ expect(results[1]!.requests).toEqual(results[0]!.requests);
+ expect(results[1]!.state).toEqual(results[0]!.state);
+});
+
test('第三方组件设置在 Browser/Desktop Bridge 下保持相同状态、尺寸和 Runtime 请求', async ({
browser,
runtime
diff --git a/apps/web/src/app/AppController.tsx b/apps/web/src/app/AppController.tsx
index a0dd07d2..a3b05f36 100644
--- a/apps/web/src/app/AppController.tsx
+++ b/apps/web/src/app/AppController.tsx
@@ -145,7 +145,6 @@ import { createRuntimeDependencyService } from '../services/runtime-dependency-s
import { createScheduleService } from '../services/schedule-service.js';
import { createSearchService } from '../services/search-service.js';
import { createSmartDubbingService } from '../services/smart-dubbing-service.js';
-import { createVideoGenerationService } from '../services/video-generation-service.js';
import { createSkillMarketService } from '../services/skill-market-service.js';
import { createTaskService } from '../services/task-service.js';
import { createThreadService } from '../services/thread-service.js';
@@ -514,10 +513,6 @@ export function AppController(props: AppControllerProps) {
() => runtimeClient === null ? undefined : createSmartDubbingService(runtimeClient),
[runtimeClient]
);
- const videoGenerationService = useMemo(
- () => runtimeClient === null ? undefined : createVideoGenerationService(runtimeClient),
- [runtimeClient]
- );
const scheduleService = useMemo(
() => runtimeClient === null ? null : createScheduleService(runtimeClient),
[runtimeClient]
diff --git a/apps/web/src/features/dashboard/CreatorCollaborationPanel.test.tsx b/apps/web/src/features/dashboard/CreatorCollaborationPanel.test.tsx
index 6ce0bf4e..e1d3b07a 100644
--- a/apps/web/src/features/dashboard/CreatorCollaborationPanel.test.tsx
+++ b/apps/web/src/features/dashboard/CreatorCollaborationPanel.test.tsx
@@ -5,7 +5,8 @@ import { LanguageProvider } from '../../i18n/LanguageProvider.js';
import CreatorCollaborationPanel from './CreatorCollaborationPanel.js';
import {
coverPanelAdapter,
- videoDownloadPanelAdapter
+ videoDownloadPanelAdapter,
+ videoGenerationPanelAdapter
} from './creator-panel-adapters.js';
import { CreatorSessionProvider } from './creator-session-store.js';
@@ -275,6 +276,34 @@ describe('CreatorCollaborationPanel', () => {
.not.toBeInTheDocument();
});
+ it('视频生成没有可靠百分比时显示同一阶段的不确定进度', () => {
+ const current = videoGenerationJob();
+ render(
+ <LanguageProvider initialPreference="zh-CN">
+ <CreatorSessionProvider
+ initialJob={current}
+ service={{
+ applyAction: vi.fn(),
+ runAgentTurn: vi.fn()
+ } as never}
+ >
+ <CreatorCollaborationPanel
+ adapter={videoGenerationPanelAdapter}
+ stepLabel="生成视频"
+ contextSummary="Veo · 9:16 · 8 秒"
+ />
+ </CreatorSessionProvider>
+ </LanguageProvider>
+ );
+
+ expect(screen.getAllByText('更新了创作设置')).toHaveLength(1);
+ expect(screen.getByText('视频描述、视频时长')).toBeInTheDocument();
+ expect(screen.getByText('视频生成中')).toBeInTheDocument();
+ expect(screen.getByRole('progressbar', { name: '生成视频进度' }))
+ .not.toHaveAttribute('aria-valuenow');
+ expect(screen.queryByText(/upstreamId|videoGenerationResultId/)).not.toBeInTheDocument();
+ });
+
it('视频解析阶段显示不确定进度而不是固定 20%', () => {
const current = downloadJob();
current.state.currentStage = 'probe';
@@ -573,3 +602,80 @@ function downloadJob(): CreatorJob {
updatedAt: '2026-08-30T08:00:05.000Z'
};
}
+
+function videoGenerationJob(): CreatorJob {
+ const createdAt = '2026-09-07T08:00:00.000Z';
+ return {
+ id: 'video_generation_job',
+ projectId: 'project_1',
+ templateId: 'video-generation',
+ templateVersion: 1,
+ status: 'running',
+ revision: 3,
+ state: {
+ prompt: '雨夜中的赛博朋克街道',
+ provider: 'veo',
+ size: '720x1280',
+ duration: 8,
+ referenceImageArtifactId: null,
+ currentStage: 'generate'
+ },
+ agentThreadId: null,
+ stages: [{
+ id: 'video_generation_stage',
+ jobId: 'video_generation_job',
+ stageId: 'generate',
+ executor: 'video',
+ status: 'running',
+ dispatchStatus: 'claimed',
+ claimOwner: 'scheduler_1',
+ claimExpiresAt: null,
+ attempt: 1,
+ idempotencyKey: 'video-generation-1',
+ progress: {
+ phase: 'generating',
+ message: 'The video provider is generating the video',
+ videoGenerationResultId: 'video_result_1'
+ },
+ errorCode: null,
+ errorMessage: null,
+ startedAt: '2026-09-07T08:00:03.000Z',
+ finishedAt: null
+ }],
+ artifacts: [],
+ activities: [
+ {
+ id: 'video_generation_ui',
+ jobId: 'video_generation_job',
+ revision: 1,
+ actor: 'user',
+ action: 'update-settings:draft',
+ summary: '更新创作设置',
+ details: { objectId: 'currentStep,furthestStep' },
+ createdAt: '2026-09-07T08:00:01.000Z'
+ },
+ {
+ id: 'video_generation_settings',
+ jobId: 'video_generation_job',
+ revision: 2,
+ actor: 'user',
+ action: 'update-settings:draft',
+ summary: '更新创作设置',
+ details: { objectId: 'prompt,duration' },
+ createdAt: '2026-09-07T08:00:02.000Z'
+ },
+ {
+ id: 'video_generation_run',
+ jobId: 'video_generation_job',
+ revision: 3,
+ actor: 'user',
+ action: 'run-stage',
+ summary: '启动阶段 generate',
+ details: { stageId: 'generate' },
+ createdAt: '2026-09-07T08:00:03.000Z'
+ }
+ ],
+ createdAt,
+ updatedAt: '2026-09-07T08:00:04.000Z'
+ };
+}
diff --git a/apps/web/src/features/dashboard/DashboardPage.test.tsx b/apps/web/src/features/dashboard/DashboardPage.test.tsx
index 1c88ecc2..0792145c 100644
--- a/apps/web/src/features/dashboard/DashboardPage.test.tsx
+++ b/apps/web/src/features/dashboard/DashboardPage.test.tsx
@@ -2,6 +2,7 @@ import { fireEvent, render, screen, waitFor, within } from '@testing-library/rea
import {
createDefaultCreatorServicesConfig,
readCreatorResultSnapshots,
+ type CreatorActionRequest,
type CreatorArtifact,
type CreatorJob,
type CreatorJson,
@@ -648,17 +649,18 @@ describe('DashboardPage', () => {
expect(within(videoTranslationCard).getByText('HOT')).toBeInTheDocument();
expect(within(videoTranslationCard).queryByText('NEW')).not.toBeInTheDocument();
const appCards = Array.from(container.querySelectorAll('.dashboard-app-card'));
- expect(appCards).toHaveLength(4);
+ expect(appCards).toHaveLength(5);
expect(appCards.map(card => card.querySelector('strong')?.textContent)).toEqual([
'视频翻译',
'视频下载',
'封面生成',
+ '视频生成',
'图像生成'
]);
expect(screen.queryByRole('button', { name: /^火柴人动画/ })).not.toBeInTheDocument();
expect(screen.queryByRole('button', { name: /^自动剪辑/ })).not.toBeInTheDocument();
expect(screen.queryByRole('button', { name: /^智能配音/ })).not.toBeInTheDocument();
- expect(screen.queryByRole('button', { name: /^视频生成/ })).not.toBeInTheDocument();
+ expect(screen.getByRole('button', { name: /^视频生成/ })).toBeInTheDocument();
expect(screen.queryByRole('button', { name: /^数字人口播/ })).not.toBeInTheDocument();
expect(screen.queryByRole('button', { name: /^视频转格式/ })).not.toBeInTheDocument();
expect(screen.queryByRole('button', { name: /^画面扩展/ })).not.toBeInTheDocument();
@@ -2038,29 +2040,172 @@ describe('DashboardPage', () => {
configurable: true,
value: vi.fn()
});
- const result = {
- id: 'video_result_1234',
- prompt: '一辆红色跑车沿着海岸公路行驶',
- provider: 'veo' as const,
- model: 'veo-3.1-generate-preview',
- videoSize: '720x1280' as const,
- duration: 8 as const,
- status: 'completed' as const,
- progress: 100,
- fileName: 'OpenCreator-video.mp4',
- mime: 'video/mp4' as const,
- size: 4096,
- createdAt: '2026-08-20T00:00:00.000Z',
- updatedAt: '2026-08-20T00:02:00.000Z'
+ const prompt = '一辆红色跑车沿着海岸公路行驶';
+ const createdAt = '2026-09-07T00:00:00.000Z';
+ let job: CreatorJob = {
+ id: 'creator_video_job',
+ projectId: 'project_1',
+ templateId: 'video-generation',
+ templateVersion: 1,
+ status: 'draft',
+ revision: 0,
+ state: {
+ prompt: '',
+ provider: 'seedance',
+ size: '1280x720',
+ duration: 5,
+ referenceImageArtifactId: null,
+ currentStage: null
+ },
+ agentThreadId: null,
+ stages: [],
+ artifacts: [],
+ activities: [],
+ createdAt,
+ updatedAt: createdAt
};
- const generate = vi.fn(async () => ({ result }));
- const get = vi.fn(async () => ({ result }));
- const openContent = vi.fn(async () => new Response(new Blob(['video'], { type: 'video/mp4' })));
+ const applyAction = vi.fn(async (_jobId: string, request: CreatorActionRequest) => {
+ if (request.action === 'update-settings') {
+ job = {
+ ...job,
+ revision: job.revision + 1,
+ state: {
+ ...job.state,
+ ...(request.input.patch as Record<string, CreatorJson>)
+ }
+ };
+ } else if (request.action === 'run-stage') {
+ const version = 1;
+ const artifact: CreatorArtifact = {
+ id: 'generated_video_v1',
+ jobId: job.id,
+ kind: 'generated_video',
+ version,
+ status: 'completed',
+ path: '/tmp/generated-video-v1.mp4',
+ sourceArtifactIds: job.artifacts
+ .filter(candidate => candidate.kind === 'reference_image')
+ .map(candidate => candidate.id),
+ metadata: {
+ provider: 'veo',
+ model: 'veo-3.1-generate-preview',
+ videoSize: '720x1280',
+ requestedDuration: 8,
+ duration: 8,
+ fileName: 'OpenCreator-video.mp4',
+ mimeType: 'video/mp4',
+ bytes: 4096,
+ resultVersion: version
+ },
+ createdAt
+ };
+ job = {
+ ...job,
+ status: 'completed',
+ revision: job.revision + 2,
+ state: {
+ ...job.state,
+ currentStage: 'generate',
+ resultVersion: version,
+ latestResultVersion: version,
+ resultSnapshots: [{
+ version,
+ createdAt,
+ action: 'stage-succeeded',
+ stageId: 'generate',
+ description: '生成视频',
+ artifactRefs: { generated_video: [artifact.id] },
+ changedArtifactIds: [artifact.id],
+ staleArtifactIds: [],
+ state: {
+ prompt,
+ provider: 'veo',
+ size: '720x1280',
+ duration: 8,
+ referenceImageArtifactId: 'reference_video_1'
+ }
+ }]
+ },
+ stages: [{
+ id: 'stage_video_generate_1',
+ jobId: job.id,
+ stageId: 'generate',
+ executor: 'video',
+ status: 'succeeded',
+ dispatchStatus: 'finished',
+ claimOwner: null,
+ claimExpiresAt: null,
+ attempt: 1,
+ idempotencyKey: null,
+ progress: { status: 'succeeded', phase: 'completed', percent: 100 },
+ errorCode: null,
+ errorMessage: null,
+ startedAt: createdAt,
+ finishedAt: createdAt
+ }],
+ artifacts: [...job.artifacts, artifact]
+ };
+ }
+ return {
+ job,
+ receipt: {
+ actor: 'user' as const,
+ action: request.action,
+ summary: request.action,
+ affectedArtifacts: [],
+ newRevision: job.revision,
+ createdAt
+ }
+ };
+ });
+ const uploadReferenceImage = vi.fn(async (_jobId: string, input: {
+ file: File;
+ expectedRevision: number;
+ }) => {
+ const artifact: CreatorArtifact = {
+ id: 'reference_video_1',
+ jobId: job.id,
+ kind: 'reference_image',
+ version: 1,
+ status: 'completed',
+ path: '/tmp/coast-reference.png',
+ sourceArtifactIds: [],
+ metadata: {
+ fileName: input.file.name,
+ mimeType: input.file.type,
+ size: input.file.size,
+ lastModified: input.file.lastModified
+ },
+ createdAt
+ };
+ job = {
+ ...job,
+ revision: job.revision + 1,
+ state: {
+ ...job.state,
+ referenceImageArtifactId: artifact.id,
+ referenceImageFileName: input.file.name
+ },
+ artifacts: [...job.artifacts, artifact]
+ };
+ return { job, artifact, deduplicated: false };
+ });
+ const openArtifact = vi.fn(async () => new Response(
+ new Blob(['video'], { type: 'video/mp4' })
+ ));
+ const creatorService = {
+ createJob: vi.fn(async () => ({ job })),
+ getJob: vi.fn(async () => ({ job })),
+ applyAction,
+ uploadReferenceImage,
+ openArtifact,
+ runAgentTurn: vi.fn()
+ } as unknown as CreatorWebService;
render(
<DashboardPage
onSelectPrompt={vi.fn()}
workspace="video-generation"
- videoGenerationService={{ generate, get, openContent }}
+ creatorService={creatorService}
/>
);
@@ -2068,7 +2213,7 @@ describe('DashboardPage', () => {
const referenceImageInput = screen.getByLabelText('上传视频参考图');
expect(referenceImageInput.compareDocumentPosition(promptInput) & Node.DOCUMENT_POSITION_FOLLOWING).not.toBe(0);
fireEvent.change(promptInput, {
- target: { value: result.prompt }
+ target: { value: prompt }
});
const referenceImage = new File(['reference'], 'coast-reference.png', {
type: 'image/png'
@@ -2084,17 +2229,21 @@ describe('DashboardPage', () => {
});
fireEvent.click(screen.getByRole('button', { name: '继续' }));
const providerSelect = screen.getByRole('combobox', { name: '视频服务' });
+ const modelSelect = screen.getByRole('combobox', { name: '模型版本' });
const formatSelect = screen.getByRole('combobox', { name: '画幅' });
const durationSelect = screen.getByRole('combobox', { name: '视频时长' });
expect(providerSelect).toHaveValue('seedance');
+ expect(modelSelect).toHaveValue('doubao-seedance-2-5-260628');
fireEvent.change(providerSelect, { target: { value: 'veo' } });
expect(providerSelect).toHaveValue('veo');
+ expect(modelSelect).toHaveValue('veo-3.1-generate-preview');
expect(durationSelect).toHaveValue('4');
fireEvent.change(formatSelect, { target: { value: '720x1280' } });
fireEvent.change(durationSelect, { target: { value: '8' } });
fireEvent.click(screen.getByRole('button', { name: '继续' }));
expect(screen.getByLabelText('任务摘要')).toHaveTextContent('竖屏 · 9:16');
+ expect(screen.getByLabelText('任务摘要')).toHaveTextContent('Veo 3.1');
expect(screen.getByLabelText('任务摘要')).toHaveTextContent('8 秒');
expect(screen.getByLabelText('任务摘要')).toHaveTextContent('coast-reference.png');
const generationActions = screen.getByLabelText('视频生成操作');
@@ -2103,18 +2252,18 @@ describe('DashboardPage', () => {
fireEvent.click(generateButton);
expect(await screen.findByLabelText('生成视频预览')).toHaveAttribute('src', 'blob:generated-video');
- expect(generate).toHaveBeenCalledWith({
- prompt: result.prompt,
- provider: 'veo',
- size: '720x1280',
- duration: 8,
- referenceImage: {
- mime: 'image/png',
- data: 'cmVmZXJlbmNl'
- }
- });
- expect(openContent).toHaveBeenCalledWith(result.id);
- expect(get).not.toHaveBeenCalled();
+ expect(uploadReferenceImage).toHaveBeenCalledWith(
+ job.id,
+ expect.objectContaining({ file: referenceImage })
+ );
+ expect(applyAction).toHaveBeenCalledWith(
+ job.id,
+ expect.objectContaining({
+ action: 'run-stage',
+ input: { stageId: 'generate' }
+ })
+ );
+ expect(openArtifact).toHaveBeenCalledWith(job.id, 'generated_video_v1');
});
it('builds and confirms a digital avatar production plan from a direct workspace', () => {
diff --git a/apps/web/src/features/dashboard/DashboardPage.tsx b/apps/web/src/features/dashboard/DashboardPage.tsx
index ba7a4917..f43da11b 100644
--- a/apps/web/src/features/dashboard/DashboardPage.tsx
+++ b/apps/web/src/features/dashboard/DashboardPage.tsx
@@ -42,7 +42,6 @@ import {
import type { VideoMetadataService } from '../../services/video-metadata-service.js';
import type { SmartDubbingService } from '../../services/smart-dubbing-service.js';
import type { CreatorServicesSettingsService } from '../../services/creator-services-service.js';
-import type { VideoGenerationService } from '../../services/video-generation-service.js';
type DashboardCategory = '视频创作' | '图像创作' | '音频处理' | '视频编辑' | '数字人';
@@ -138,8 +137,8 @@ const creatorTools: DashboardEntry[] = [
},
{
title: '视频生成',
- description: '从创意生成完整视频',
- prompt: '根据我的创意和素材生成一支完整的 AI 视频,请先帮我梳理画面风格、镜头和节奏。',
+ description: '文字或参考图生成视频片段',
+ prompt: '根据我的创意和参考素材生成一段 AI 视频,请先帮我梳理主体动作、镜头和画面风格。',
category: '视频创作',
icon: WandSparkles,
workspace: 'video-generation'
@@ -162,7 +161,7 @@ const creatorTools: DashboardEntry[] = [
},
];
-const categories = ['全部', '视频编辑', '图像创作'] as const;
+const categories = ['全部', '视频创作', '视频编辑', '图像创作'] as const;
type CategoryFilter = typeof categories[number];
const CREATOR_JOB_LOAD_TIMEOUT_MS = 15_000;
@@ -178,7 +177,6 @@ export default function DashboardPage(props: {
skillLaunch?: CreatorSkillLaunch;
smartDubbingService?: SmartDubbingService;
creatorServicesService?: CreatorServicesSettingsService | null;
- videoGenerationService?: VideoGenerationService;
videoMetadataService?: VideoMetadataService;
workspace?: CreatorWorkspace;
jobId?: string;
@@ -331,13 +329,13 @@ export default function DashboardPage(props: {
}
if (activeWorkspace === 'video-generation') {
- return (
+ return renderCreatorWorkspace('video-generation', (
<VideoGenerationWorkspace
promptHint={activePromptHint}
- service={props.videoGenerationService}
+ creatorServicesService={props.creatorServicesService}
onBack={closeWorkspace}
/>
- );
+ ));
}
if (activeWorkspace === 'digital-avatar') {
@@ -816,7 +814,7 @@ const englishDashboardLabels: Record<string, string> = {
视频翻译: 'Video Translation',
'字幕、配音与口型同步': 'Subtitles, dubbing, and lip sync',
视频生成: 'Video Generation',
- 从创意生成完整视频: 'Generate complete videos from an idea',
+ 文字或参考图生成视频片段: 'Generate video clips from text or a reference image',
快速制作专业口播: 'Create professional presenter videos quickly',
'角色、分镜与完整动画': 'Characters, storyboards, and animation',
自动剪辑: 'Auto Clips',
diff --git a/apps/web/src/features/dashboard/VideoGenerationWorkspace.test.tsx b/apps/web/src/features/dashboard/VideoGenerationWorkspace.test.tsx
new file mode 100644
index 00000000..37ab11ed
--- /dev/null
+++ b/apps/web/src/features/dashboard/VideoGenerationWorkspace.test.tsx
@@ -0,0 +1,435 @@
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import type {
+ CreatorArtifact,
+ CreatorJob,
+ CreatorJson,
+ CreatorServicesConfigResponse
+} from '@opencreator/protocol';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { LanguageProvider } from '../../i18n/LanguageProvider.js';
+import VideoGenerationWorkspace from './VideoGenerationWorkspace.js';
+import { CreatorSessionProvider } from './creator-session-store.js';
+
+describe('VideoGenerationWorkspace', () => {
+ beforeEach(() => {
+ Object.defineProperty(URL, 'createObjectURL', {
+ configurable: true,
+ value: vi.fn((blob: Blob) => `blob:video-${blob.size}`)
+ });
+ Object.defineProperty(URL, 'revokeObjectURL', {
+ configurable: true,
+ value: vi.fn()
+ });
+ });
+
+ it('opens an existing project on the latest generated video version', async () => {
+ const versionOne = videoArtifact(1);
+ const versionTwo = videoArtifact(2);
+ const job = creatorJob({
+ status: 'completed',
+ artifacts: [versionOne, versionTwo],
+ state: {
+ prompt: '当前编辑中的视频描述',
+ provider: 'seedance',
+ size: '1280x720',
+ duration: 5,
+ referenceImageArtifactId: null,
+ currentStep: 1,
+ furthestStep: 2,
+ currentStage: 'generate',
+ resultVersion: 2,
+ latestResultVersion: 2,
+ resultSnapshots: [
+ resultSnapshot(1, versionOne),
+ resultSnapshot(2, versionTwo)
+ ]
+ }
+ });
+ const openArtifact = vi.fn(async () => new Response(
+ new Blob(['video'], { type: 'video/mp4' })
+ ));
+
+ renderWorkspace(job, { openArtifact });
+
+ expect(await screen.findByRole('heading', { name: '生成结果' })).toBeInTheDocument();
+ expect(screen.getByRole('button', { name: '项目 V2' })).toBeInTheDocument();
+ await waitFor(() => expect(openArtifact).toHaveBeenCalledWith(job.id, versionTwo.id));
+ fireEvent.click(screen.getByRole('button', { name: '项目 V2' }));
+ fireEvent.click(screen.getByRole('menuitem', { name: /项目 V1/ }));
+ await waitFor(() => expect(openArtifact).toHaveBeenCalledWith(job.id, versionOne.id));
+ });
+
+ it('does not expose a failed generation as a completed result version', () => {
+ const job = creatorJob({
+ status: 'failed',
+ state: {
+ prompt: '雨夜中的未来城市',
+ provider: 'veo',
+ size: '720x1280',
+ duration: 8,
+ referenceImageArtifactId: null,
+ currentStep: 2,
+ furthestStep: 2,
+ currentStage: 'generate'
+ },
+ stages: [{
+ id: 'failed_video_stage',
+ jobId: 'creator_video_workspace',
+ stageId: 'generate',
+ executor: 'video',
+ status: 'failed',
+ dispatchStatus: 'finished',
+ claimOwner: null,
+ claimExpiresAt: null,
+ attempt: 1,
+ idempotencyKey: null,
+ progress: {
+ phase: 'provider_failed',
+ percent: null
+ },
+ errorCode: 'creator_video_generation_failed',
+ errorMessage: 'The provider rejected the prompt',
+ startedAt: '2026-09-07T08:00:00.000Z',
+ finishedAt: '2026-09-07T08:01:00.000Z'
+ }]
+ });
+
+ renderWorkspace(job);
+
+ expect(screen.getByRole('heading', { name: '生成视频' })).toBeInTheDocument();
+ expect(screen.queryByRole('button', { name: /项目 V/ })).not.toBeInTheDocument();
+ expect(screen.getByRole('button', { name: '开始生成' })).toBeInTheDocument();
+ expect(screen.getByRole('alert')).toHaveTextContent('The provider rejected the prompt');
+ });
+
+ it('shows an actionable message when the selected model is not enabled', () => {
+ const job = creatorJob({
+ status: 'failed',
+ state: {
+ prompt: '雨夜中的未来城市',
+ provider: 'seedance',
+ model: 'doubao-seedance-2-5-260628',
+ size: '1280x720',
+ duration: 5,
+ referenceImageArtifactId: null,
+ currentStep: 2,
+ furthestStep: 2,
+ currentStage: 'generate'
+ },
+ stages: [{
+ id: 'failed_video_model_stage',
+ jobId: 'creator_video_workspace',
+ stageId: 'generate',
+ executor: 'video',
+ status: 'failed',
+ dispatchStatus: 'finished',
+ claimOwner: null,
+ claimExpiresAt: null,
+ attempt: 1,
+ idempotencyKey: null,
+ progress: {
+ phase: 'submitting',
+ percent: 8
+ },
+ errorCode: 'creator_video_model_unavailable',
+ errorMessage: 'Your account has not activated the model doubao-seedance-2-5',
+ startedAt: '2026-09-07T08:00:00.000Z',
+ finishedAt: '2026-09-07T08:01:00.000Z'
+ }]
+ });
+
+ renderWorkspace(job, {
+ openArtifact: vi.fn(async () => new Response(
+ new Blob(['reference'], { type: 'image/png' })
+ ))
+ });
+
+ expect(screen.getByRole('alert')).toHaveTextContent(
+ '当前账号未开通 Seedance 2.5,请切换模型版本或前往方舟控制台开通'
+ );
+ });
+
+ it('offers to continue an existing upstream task after a refresh failure', () => {
+ const job = creatorJob({
+ status: 'failed',
+ state: {
+ prompt: '让猫开始打字',
+ provider: 'seedance',
+ model: 'doubao-seedance-2-5-260628',
+ size: '1280x720',
+ duration: 5,
+ referenceImageArtifactId: null,
+ currentStep: 2,
+ furthestStep: 2,
+ currentStage: 'generate'
+ },
+ stages: [{
+ id: 'failed_video_refresh_stage',
+ jobId: 'creator_video_workspace',
+ stageId: 'generate',
+ executor: 'video',
+ status: 'failed',
+ dispatchStatus: 'finished',
+ claimOwner: null,
+ claimExpiresAt: null,
+ attempt: 1,
+ idempotencyKey: null,
+ progress: {
+ phase: 'generating',
+ percent: null,
+ videoGenerationResultId: 'video_result_1234'
+ },
+ errorCode: 'creator_video_upstream_error',
+ errorMessage: 'The video generation status could not be refreshed',
+ startedAt: '2026-09-07T08:00:00.000Z',
+ finishedAt: '2026-09-07T08:01:00.000Z'
+ }]
+ });
+
+ renderWorkspace(job);
+
+ expect(screen.getByRole('button', { name: '继续任务' })).toBeInTheDocument();
+ expect(screen.queryByRole('button', { name: '开始生成' })).not.toBeInTheDocument();
+ });
+
+ it('shows that Seedance reference-image generation follows the image ratio', async () => {
+ const reference = videoArtifact(1);
+ reference.id = 'reference_image_1';
+ reference.kind = 'reference_image';
+ reference.path = '/tmp/reference.png';
+ reference.metadata = {
+ fileName: 'reference.png',
+ mimeType: 'image/png',
+ size: 1024
+ };
+ const job = creatorJob({
+ artifacts: [reference],
+ state: {
+ prompt: '让猫开始打字',
+ provider: 'seedance',
+ model: 'doubao-seedance-2-5-260628',
+ size: '1280x720',
+ duration: 5,
+ referenceImageArtifactId: reference.id,
+ currentStep: 1,
+ furthestStep: 1,
+ currentStage: null
+ }
+ });
+
+ const openArtifact = vi.fn(async () => new Response(
+ new Blob(['reference'], { type: 'image/png' })
+ ));
+ renderWorkspace(job, { openArtifact });
+
+ const format = screen.getByRole('combobox', { name: '画幅' });
+ expect(format).toBeDisabled();
+ expect(format).toHaveTextContent('跟随参考图');
+ await waitFor(() => expect(openArtifact).toHaveBeenCalledWith(job.id, reference.id));
+ });
+
+ it('uses distinct English labels for video format and output format', () => {
+ const job = creatorJob({
+ state: {
+ prompt: 'A cinematic city reveal',
+ provider: 'seedance',
+ size: '1280x720',
+ duration: 5,
+ referenceImageArtifactId: null,
+ currentStep: 2,
+ furthestStep: 2,
+ currentStage: null
+ }
+ });
+
+ renderWorkspace(job, { language: 'en-US' });
+
+ expect(screen.getByText('Format')).toBeInTheDocument();
+ expect(screen.getByText('Output format')).toBeInTheDocument();
+ });
+
+ it('uses the configured default model for a task and allows a task-level override', async () => {
+ const job = creatorJob({
+ state: {
+ prompt: '雨夜中的未来城市',
+ provider: 'seedance',
+ size: '1280x720',
+ duration: 5,
+ referenceImageArtifactId: null,
+ currentStep: 1,
+ furthestStep: 1,
+ currentStage: null
+ }
+ });
+ const getConfig = vi.fn(async (): Promise<CreatorServicesConfigResponse> => ({
+ config: {
+ ...createVideoConfig(),
+ video: {
+ ...createVideoConfig().video,
+ provider: 'seedance',
+ seedance: {
+ ...createVideoConfig().video.seedance,
+ model: 'doubao-seedance-2-0-260128'
+ }
+ }
+ },
+ configuredCredentials: []
+ }));
+
+ renderWorkspace(job, {
+ creatorServicesService: { getConfig } as never
+ });
+
+ const model = await screen.findByRole('combobox', { name: '模型版本' });
+ await waitFor(() => expect(model).toHaveValue('doubao-seedance-2-0-260128'));
+ fireEvent.change(model, { target: { value: 'doubao-seedance-2-5-260628' } });
+ expect(model).toHaveValue('doubao-seedance-2-5-260628');
+ });
+});
+
+function renderWorkspace(
+ initialJob: CreatorJob,
+ overrides: {
+ openArtifact?: (jobId: string, artifactId: string) => Promise<Response>;
+ creatorServicesService?: { getConfig(): Promise<CreatorServicesConfigResponse> };
+ language?: 'zh-CN' | 'en-US';
+ } = {}
+) {
+ return render(
+ <LanguageProvider initialPreference={overrides.language ?? 'zh-CN'}>
+ <CreatorSessionProvider
+ initialJob={initialJob}
+ service={{
+ applyAction: vi.fn(),
+ openArtifact: overrides.openArtifact ?? vi.fn(),
+ runAgentTurn: vi.fn()
+ } as never}
+ >
+ <VideoGenerationWorkspace
+ creatorServicesService={overrides.creatorServicesService as never}
+ onBack={vi.fn()}
+ />
+ </CreatorSessionProvider>
+ </LanguageProvider>
+ );
+}
+
+function createVideoConfig() {
+ return {
+ proxy: '',
+ llm: {
+ baseUrl: '',
+ apiKey: '',
+ model: 'gpt-4o-mini',
+ jsonMode: false,
+ source: 'codex' as const
+ },
+ transcription: {
+ provider: 'openai' as const,
+ enableGpuAcceleration: false,
+ openai: { baseUrl: '', apiKey: '', model: 'whisper-1' },
+ fasterWhisper: { model: 'medium' as const },
+ whisperKit: { model: 'large-v2' as const },
+ whisperCpp: { model: 'tiny' as const },
+ aliyun: {
+ oss: { accessKeyId: '', accessKeySecret: '', bucket: '' },
+ speech: { accessKeyId: '', accessKeySecret: '', appKey: '' }
+ }
+ },
+ tts: {
+ provider: 'openai' as const,
+ openai: { baseUrl: '', apiKey: '', model: '', defaultVoiceId: '' },
+ minimax: { baseUrl: '', apiKey: '', model: '', defaultVoiceId: '' },
+ aliyun: { baseUrl: '', apiKey: '', model: '', defaultVoiceId: '' }
+ },
+ image: {
+ provider: 'openai' as const,
+ openai: { baseUrl: '', apiKey: '', model: '' },
+ jimeng: { baseUrl: '', apiKey: '', model: '' },
+ kling: { baseUrl: '', accessKey: '', secretKey: '', model: '' },
+ gemini: { baseUrl: '', apiKey: '', model: '' }
+ },
+ video: {
+ provider: 'seedance' as const,
+ seedance: { baseUrl: '', apiKey: '', model: 'doubao-seedance-2-5-260628' },
+ kling: { baseUrl: '', accessKey: '', secretKey: '', model: 'kling-v2-1-master' },
+ veo: { baseUrl: '', apiKey: '', model: 'veo-3.1-generate-preview' }
+ }
+ };
+}
+
+function creatorJob(patch: Partial<CreatorJob>): CreatorJob {
+ const createdAt = '2026-09-07T08:00:00.000Z';
+ return {
+ id: 'creator_video_workspace',
+ projectId: 'project_1',
+ templateId: 'video-generation',
+ templateVersion: 1,
+ status: 'draft',
+ revision: 1,
+ state: {
+ prompt: '',
+ provider: 'seedance',
+ size: '1280x720',
+ duration: 5,
+ referenceImageArtifactId: null,
+ currentStep: 0,
+ furthestStep: 0,
+ currentStage: null
+ },
+ agentThreadId: null,
+ stages: [],
+ artifacts: [],
+ activities: [],
+ createdAt,
+ updatedAt: createdAt,
+ ...patch
+ };
+}
+
+function videoArtifact(version: number): CreatorArtifact {
+ return {
+ id: `generated_video_v${version}`,
+ jobId: 'creator_video_workspace',
+ kind: 'generated_video',
+ version,
+ status: 'completed',
+ path: `/tmp/generated-video-v${version}.mp4`,
+ sourceArtifactIds: [],
+ metadata: {
+ provider: version === 1 ? 'seedance' : 'veo',
+ model: version === 1 ? 'seedance-model' : 'veo-model',
+ videoSize: version === 1 ? '1280x720' : '720x1280',
+ requestedDuration: version === 1 ? 5 : 8,
+ duration: version === 1 ? 5 : 8,
+ fileName: `OpenCreator-video-V${version}.mp4`,
+ mimeType: 'video/mp4',
+ bytes: version * 1024,
+ resultVersion: version
+ },
+ createdAt: `2026-09-07T08:0${version}:00.000Z`
+ };
+}
+
+function resultSnapshot(
+ version: number,
+ artifact: CreatorArtifact
+): CreatorJson {
+ return {
+ version,
+ createdAt: artifact.createdAt,
+ action: 'stage-succeeded',
+ stageId: 'generate',
+ description: version === 1 ? '初次生成' : `第 ${version} 次生成`,
+ artifactRefs: { generated_video: [artifact.id] },
+ changedArtifactIds: [artifact.id],
+ staleArtifactIds: [],
+ state: {
+ prompt: version === 1 ? '海岸公路' : '雨夜城市',
+ provider: version === 1 ? 'seedance' : 'veo',
+ size: version === 1 ? '1280x720' : '720x1280',
+ duration: version === 1 ? 5 : 8,
+ referenceImageArtifactId: null
+ }
+ };
+}
diff --git a/apps/web/src/features/dashboard/VideoGenerationWorkspace.tsx b/apps/web/src/features/dashboard/VideoGenerationWorkspace.tsx
index fef50ad8..e158f4a6 100644
--- a/apps/web/src/features/dashboard/VideoGenerationWorkspace.tsx
+++ b/apps/web/src/features/dashboard/VideoGenerationWorkspace.tsx
@@ -1,10 +1,14 @@
-import { useEffect, useMemo, useState } from 'react';
-import type {
- VideoGenerationDuration,
- VideoGenerationProvider,
- VideoGenerationReferenceImage,
- VideoGenerationResult,
- VideoGenerationSize
+import {
+ defaultVideoGenerationModels,
+ readCreatorResultSnapshots,
+ videoGenerationModelIds,
+ type CreatorArtifact,
+ type CreatorJson,
+ type CreatorServicesConfig,
+ type CreatorStageRun,
+ type VideoGenerationDuration,
+ type VideoGenerationProvider,
+ type VideoGenerationSize
} from '@opencreator/protocol';
import {
Check,
@@ -18,12 +22,25 @@ import {
WandSparkles,
X
} from 'lucide-react';
+import { useEffect, useMemo, useState } from 'react';
import { useLocalizedCopy } from '../../i18n/useLocalizedCopy.js';
-import type { VideoGenerationService } from '../../services/video-generation-service.js';
+import type { CreatorServicesSettingsService } from '../../services/creator-services-service.js';
+import CreatorResultVersionMenu from './CreatorResultVersionMenu.js';
import CreatorTaskSummary from './CreatorTaskSummary.js';
import CreatorToolShell from './CreatorToolShell.js';
+import { useOptionalCreatorSession } from './creator-session-store.js';
type VideoStep = 0 | 1 | 2;
+type VideoResultVersion = {
+ value: number;
+ description: string;
+ artifact: CreatorArtifact;
+ state: Record<string, CreatorJson>;
+};
+type VideoModelOption = {
+ value: string;
+ label: string;
+};
const sizes: Array<{ value: VideoGenerationSize; zh: string; en: string; ratio: string }> = [
{ value: '1280x720', zh: '横屏', en: 'Landscape', ratio: '16:9' },
@@ -42,6 +59,17 @@ const providerDurations: Record<VideoGenerationProvider, VideoGenerationDuration
kling: [5, 10],
veo: [4, 6, 8]
};
+const modelLabels: Record<string, string> = {
+ 'doubao-seedance-2-5-260628': 'Seedance 2.5',
+ 'doubao-seedance-2-0-260128': 'Seedance 2.0',
+ 'doubao-seedance-2-0-fast-260128': 'Seedance 2.0 Fast',
+ 'doubao-seedance-2-0-mini-260615': 'Seedance 2.0 Mini',
+ 'doubao-seedance-1-5-pro-251215': 'Seedance 1.5 Pro',
+ 'doubao-seedance-1-0-pro-fast-251015': 'Seedance 1.0 Pro Fast',
+ 'doubao-seedance-1-0-pro-250528': 'Seedance 1.0 Pro',
+ 'kling-v2-1-master': 'Kling 2.1 Master',
+ 'veo-3.1-generate-preview': 'Veo 3.1'
+};
const samplePromptZh = '一辆复古红色跑车沿着海岸公路行驶,黄昏金色阳光,低机位跟拍,海风吹动路边植物,电影级真实质感,镜头运动平稳';
const samplePromptEn = 'A vintage red sports car driving along a coastal road at golden hour, low-angle tracking shot, sea breeze moving roadside plants, cinematic realism, smooth camera motion';
@@ -51,93 +79,215 @@ const maxReferenceImageBytes = 5 * 1024 * 1024;
export default function VideoGenerationWorkspace(props: {
onBack(): void;
promptHint?: string;
- service?: VideoGenerationService;
+ creatorServicesService?: CreatorServicesSettingsService | null;
}) {
const l = useLocalizedCopy();
- const [currentStep, setCurrentStep] = useState<VideoStep>(0);
- const [furthestStep, setFurthestStep] = useState<VideoStep>(0);
- const [prompt, setPrompt] = useState('');
+ const session = useOptionalCreatorSession();
+ const restoredResults = session?.job.artifacts.some(artifact => (
+ artifact.kind === 'generated_video' && artifact.status === 'completed'
+ )) === true;
+ const restoredStep = restoredResults ? 2 : readVideoStep(session?.state.currentStep, 0);
+ const [currentStep, setCurrentStep] = useState<VideoStep>(restoredStep);
+ const [furthestStep, setFurthestStep] = useState<VideoStep>(() => (
+ Math.max(
+ restoredStep,
+ readVideoStep(session?.state.furthestStep, restoredStep),
+ restoredResults ? 2 : 0
+ ) as VideoStep
+ ));
+ const [prompt, setPrompt] = useState(() => readString(session?.state.prompt));
const [referenceImageFile, setReferenceImageFile] = useState<File>();
const [referenceImageUrl, setReferenceImageUrl] = useState('');
- const [provider, setProvider] = useState<VideoGenerationProvider>('seedance');
- const [size, setSize] = useState<VideoGenerationSize>('1280x720');
- const [duration, setDuration] = useState<VideoGenerationDuration>(5);
- const [result, setResult] = useState<VideoGenerationResult>();
+ const initialProvider = readProvider(session?.state.provider);
+ const [modelDefaults, setModelDefaults] = useState<Record<VideoGenerationProvider, string>>(
+ () => ({ ...defaultVideoGenerationModels })
+ );
+ const [provider, setProvider] = useState<VideoGenerationProvider>(() => (
+ initialProvider
+ ));
+ const [model, setModel] = useState(() => readModel(session?.state.model, initialProvider));
+ const [size, setSize] = useState<VideoGenerationSize>(() => readSize(session?.state.size));
+ const [duration, setDuration] = useState<VideoGenerationDuration>(() => (
+ readDuration(session?.state.duration, readProvider(session?.state.provider))
+ ));
+ const [resultVersion, setResultVersion] = useState<number>();
const [videoUrl, setVideoUrl] = useState('');
- const [generating, setGenerating] = useState(false);
+ const [previewError, setPreviewError] = useState('');
const [error, setError] = useState('');
const [notice, setNotice] = useState('');
+ const [taskControlPending, setTaskControlPending] = useState<'canceling' | 'resuming'>();
const characterCount = useMemo(() => [...prompt.trim()].length, [prompt]);
const selectedSize = sizes.find(item => item.value === size) ?? sizes[0]!;
const selectedProvider = providers.find(item => item.value === provider) ?? providers[0]!;
+ const modelOptions = useMemo(
+ () => createVideoModelOptions(provider, modelDefaults[provider], model),
+ [model, modelDefaults, provider]
+ );
+ const selectedModelLabel = videoModelLabel(model);
const durations = providerDurations[provider];
+ const resultVersions = useMemo(
+ () => createVideoResultVersions(session?.job.artifacts ?? [], session?.state.resultSnapshots),
+ [session?.job.artifacts, session?.state.resultSnapshots]
+ );
+ const latestVersion = resultVersions.at(-1)?.value;
+ const selectedResult = resultVersions.find(version => version.value === resultVersion)
+ ?? resultVersions.at(-1);
+ const latestStage = session?.job.stages.filter(stage => stage.stageId === 'generate').at(-1);
+ const generating = latestStage?.status === 'queued' || latestStage?.status === 'running';
+ const resumable = latestStage?.status === 'canceled'
+ || latestStage?.status === 'interrupted'
+ || isRecoverableVideoStage(latestStage);
+ const runtimeError = latestStage?.status === 'failed'
+ ? formatVideoError(
+ { code: latestStage.errorCode, message: latestStage.errorMessage },
+ l,
+ selectedModelLabel,
+ provider
+ )
+ : session?.error === null || session?.error === undefined
+ ? ''
+ : formatVideoError(session.error, l, selectedModelLabel, provider);
+ const visibleError = error || runtimeError || previewError;
+ const settingsDeepLink = readNeedsInputDeepLink(session?.state.needsInput);
+ const activeReferenceArtifact = findArtifact(
+ session?.job.artifacts ?? [],
+ session?.state.referenceImageArtifactId,
+ 'reference_image'
+ );
+ const currentReferenceName = referenceImageFile?.name
+ ?? readArtifactString(activeReferenceArtifact, 'fileName');
+ const followsReferenceRatio = provider === 'seedance' && Boolean(currentReferenceName);
+ const resultSettings = selectedResult?.state;
+ const resultProvider = providers.find(item => (
+ item.value === readProvider(resultSettings?.provider)
+ )) ?? providers[0]!;
+ const resultSize = readSize(resultSettings?.size);
+ const resultSizeOption = sizes.find(item => item.value === resultSize) ?? sizes[0]!;
+ const resultWidth = readArtifactNumber(selectedResult?.artifact, 'width');
+ const resultHeight = readArtifactNumber(selectedResult?.artifact, 'height');
+ const resultRatio = resultWidth !== undefined && resultHeight !== undefined
+ ? formatAspectRatio(resultWidth, resultHeight)
+ : resultSizeOption.ratio;
+ const resultResolution = resultWidth !== undefined && resultHeight !== undefined
+ ? `${resultWidth}x${resultHeight}`
+ : resultSize;
+ const resultFormatLabel = resultWidth !== undefined && resultHeight !== undefined
+ ? videoFormatLabel(resultWidth, resultHeight, l)
+ : l(resultSizeOption.zh, resultSizeOption.en);
+ const resultDuration = readDuration(resultSettings?.duration, resultProvider.value);
+ const resultModel = readArtifactString(selectedResult?.artifact, 'model')
+ ?? readOptionalModel(resultSettings?.model)
+ ?? modelDefaults[resultProvider.value];
+ const resultModelLabel = videoModelLabel(resultModel);
+ const progressPercent = readProgressPercent(latestStage?.progress.percent);
+ const progressLabel = latestStage === undefined
+ ? l('正在准备任务', 'Preparing the task')
+ : videoPhaseLabel(readString(latestStage.progress.phase), l);
- useEffect(() => () => {
- if (videoUrl) URL.revokeObjectURL(videoUrl);
- }, [videoUrl]);
+ useEffect(() => {
+ if (latestVersion !== undefined) setResultVersion(latestVersion);
+ }, [latestVersion]);
useEffect(() => {
- if (!referenceImageFile) {
- setReferenceImageUrl('');
- return;
+ if (props.creatorServicesService === null || props.creatorServicesService === undefined) {
+ return undefined;
}
- const url = URL.createObjectURL(referenceImageFile);
- setReferenceImageUrl(url);
- return () => URL.revokeObjectURL(url);
- }, [referenceImageFile]);
+ let active = true;
+ void props.creatorServicesService.getConfig()
+ .then(response => {
+ if (!active) return;
+ const defaults = videoModelDefaults(response.config);
+ const savedProvider = readOptionalProvider(session?.state.provider);
+ const nextProvider = savedProvider ?? response.config.video.provider;
+ const nextModel = readOptionalModel(session?.state.model) ?? defaults[nextProvider];
+ const nextDuration = readDuration(session?.state.duration, nextProvider);
+ setModelDefaults(defaults);
+ setProvider(nextProvider);
+ setModel(nextModel);
+ setDuration(nextDuration);
+ session?.updateDraft({
+ provider: nextProvider,
+ model: nextModel,
+ duration: nextDuration
+ }, { persist: false });
+ })
+ .catch(() => undefined);
+ return () => {
+ active = false;
+ };
+ }, [props.creatorServicesService, session?.job.id]);
useEffect(() => {
- if (!result || !props.service) return;
- if (result.status === 'failed') {
- setGenerating(false);
- setError(result.error || l('视频生成失败,请调整提示词后重试', 'Video generation failed. Adjust the prompt and retry.'));
- return;
+ if (referenceImageFile !== undefined) {
+ const url = URL.createObjectURL(referenceImageFile);
+ setReferenceImageUrl(url);
+ return () => URL.revokeObjectURL(url);
}
- if (result.status === 'completed') {
- if (videoUrl) {
- setGenerating(false);
- return;
- }
- let active = true;
- void props.service.openContent(result.id)
- .then(response => response.blob())
- .then(blob => {
- if (!active) return;
- setVideoUrl(URL.createObjectURL(blob));
- setGenerating(false);
- setNotice(l('视频已生成,可以预览或下载', 'The video is ready to preview or download'));
- })
- .catch(caught => {
- if (!active) return;
- setGenerating(false);
- setError(formatVideoError(caught, l));
- });
- return () => {
- active = false;
- };
+ if (activeReferenceArtifact === undefined || session === null) {
+ setReferenceImageUrl('');
+ return undefined;
}
+ let active = true;
+ let objectUrl = '';
+ void session.openArtifact(activeReferenceArtifact.id)
+ .then(async response => {
+ if (!response.ok) throw new Error(`HTTP ${response.status}`);
+ objectUrl = URL.createObjectURL(await response.blob());
+ if (active) setReferenceImageUrl(objectUrl);
+ })
+ .catch(() => {
+ if (active) setReferenceImageUrl('');
+ });
+ return () => {
+ active = false;
+ if (objectUrl) URL.revokeObjectURL(objectUrl);
+ };
+ }, [activeReferenceArtifact?.id, referenceImageFile, session?.openArtifact]);
+ useEffect(() => {
+ if (selectedResult === undefined || session === null) {
+ setVideoUrl('');
+ setPreviewError('');
+ return undefined;
+ }
let active = true;
- const timer = window.setTimeout(() => {
- void props.service!.get(result.id)
- .then(response => {
- if (active) setResult(response.result);
- })
- .catch(caught => {
- if (!active) return;
- setGenerating(false);
- setError(formatVideoError(caught, l));
- });
- }, 2500);
+ let objectUrl = '';
+ setVideoUrl('');
+ setPreviewError('');
+ void session.openArtifact(selectedResult.artifact.id)
+ .then(async response => {
+ if (!response.ok) throw new Error(`HTTP ${response.status}`);
+ objectUrl = URL.createObjectURL(await response.blob());
+ if (active) setVideoUrl(objectUrl);
+ })
+ .catch(cause => {
+ if (active) {
+ setPreviewError(l(
+ '视频预览加载失败,可以稍后重试或直接下载',
+ `The video preview failed to load: ${cause instanceof Error ? cause.message : String(cause)}`
+ ));
+ }
+ });
return () => {
active = false;
- window.clearTimeout(timer);
+ if (objectUrl) URL.revokeObjectURL(objectUrl);
};
- }, [l, props.service, result, videoUrl]);
+ }, [l, selectedResult?.artifact.id, session?.openArtifact]);
+
+ useEffect(() => {
+ if (latestVersion !== undefined && !generating) {
+ setNotice(l('视频已生成,可以预览或下载', 'The video is ready to preview or download'));
+ }
+ }, [generating, l, latestVersion]);
function openStep(step: VideoStep) {
+ const nextFurthestStep = Math.max(furthestStep, step) as VideoStep;
setCurrentStep(step);
- setFurthestStep(previous => Math.max(previous, step) as VideoStep);
+ setFurthestStep(nextFurthestStep);
+ session?.updateDraft({
+ currentStep: step,
+ furthestStep: nextFurthestStep
+ });
}
function nextStep() {
@@ -151,73 +301,177 @@ export default function VideoGenerationWorkspace(props: {
function updatePrompt(value: string) {
setPrompt(value);
- setResult(undefined);
+ session?.updateDraft({ prompt: value });
setError('');
}
function updateProvider(nextProvider: VideoGenerationProvider) {
const nextDurations = providerDurations[nextProvider];
+ const nextDuration = nextDurations.includes(duration) ? duration : nextDurations[0]!;
+ const nextModel = modelDefaults[nextProvider] || defaultVideoGenerationModels[nextProvider];
setProvider(nextProvider);
- if (!nextDurations.includes(duration)) setDuration(nextDurations[0]!);
- setResult(undefined);
+ setModel(nextModel);
+ setDuration(nextDuration);
+ session?.updateDraft({
+ provider: nextProvider,
+ model: nextModel,
+ duration: nextDuration
+ });
+ setError('');
+ }
+
+ function updateModel(nextModel: string) {
+ setModel(nextModel);
+ session?.updateDraft({ model: nextModel });
+ setError('');
+ }
+
+ function updateSize(nextSize: VideoGenerationSize) {
+ setSize(nextSize);
+ session?.updateDraft({ size: nextSize });
+ setError('');
+ }
+
+ function updateDuration(nextDuration: VideoGenerationDuration) {
+ setDuration(nextDuration);
+ session?.updateDraft({ duration: nextDuration });
+ setError('');
}
function updateReferenceImage(file: File | null) {
if (!file) return;
- if (!(referenceImageTypes as readonly string[]).includes(file.type) || file.size > maxReferenceImageBytes) {
- setError(l('请上传 5MB 以内的 JPG、PNG 或 WebP 图片', 'Upload a JPG, PNG, or WebP image up to 5 MB'));
+ if (
+ !(referenceImageTypes as readonly string[]).includes(file.type)
+ || file.size > maxReferenceImageBytes
+ ) {
+ setError(l(
+ '请上传 5MB 以内的 JPG、PNG 或 WebP 图片',
+ 'Upload a JPG, PNG, or WebP image up to 5 MB'
+ ));
return;
}
setReferenceImageFile(file);
- setResult(undefined);
setError('');
- setNotice(l('参考图已添加', 'Reference image added'));
+ setNotice(l('参考图已添加,将在生成时上传', 'Reference image added and will be uploaded when generation starts'));
}
function removeReferenceImage() {
setReferenceImageFile(undefined);
- setResult(undefined);
+ setReferenceImageUrl('');
+ session?.updateDraft({ referenceImageArtifactId: null }, { semantic: true });
setError('');
setNotice(l('参考图已移除', 'Reference image removed'));
}
async function generate() {
if (generating) return;
- if (!props.service) {
- setError(l('视频生成服务暂不可用,请检查 Runtime 连接', 'Video generation is unavailable. Check the Runtime connection.'));
+ if (session === null) {
+ setError(l(
+ '视频生成服务暂不可用,请检查 Runtime 连接',
+ 'Video generation is unavailable. Check the Runtime connection.'
+ ));
+ return;
+ }
+ if (!prompt.trim()) {
+ setError(l('请先描述需要生成的视频', 'Describe the video you want to create'));
+ openStep(0);
return;
}
- setGenerating(true);
- setResult(undefined);
- setVideoUrl('');
setError('');
setNotice('');
+ session.updateDraft({
+ prompt: prompt.trim(),
+ provider,
+ model,
+ size,
+ duration
+ }, { semantic: true });
try {
- const referenceImage = referenceImageFile
- ? await readReferenceImage(referenceImageFile)
- : undefined;
- const response = await props.service.generate({
- prompt,
- provider,
- size,
- duration,
- ...(referenceImage ? { referenceImage } : {})
+ await session.flush();
+ if (
+ referenceImageFile !== undefined
+ && !artifactMatchesFile(activeReferenceArtifact, referenceImageFile)
+ ) {
+ setNotice(l('正在上传参考图...', 'Uploading the reference image...'));
+ await session.uploadReferenceImage(referenceImageFile);
+ setReferenceImageFile(undefined);
+ }
+ await session.applyAction({
+ actor: 'user',
+ action: 'run-stage',
+ input: { stageId: 'generate' }
});
- setResult(response.result);
- if (response.result.status === 'failed') setGenerating(false);
+ setNotice(l(
+ '视频生成任务已提交,可以离开当前页面,完成后会保留在项目中',
+ 'Video generation started. You can leave this page and return to the saved result later.'
+ ));
} catch (caught) {
- setGenerating(false);
- setError(formatVideoError(caught, l));
+ setError(formatVideoError(caught, l, selectedModelLabel, provider));
}
}
- function download() {
- if (!result?.fileName || !videoUrl) return;
- const link = document.createElement('a');
- link.href = videoUrl;
- link.download = result.fileName;
- link.click();
- setNotice(l('视频已开始下载', 'Video download started'));
+ async function download() {
+ if (selectedResult === undefined || session === null) return;
+ try {
+ let temporaryUrl: string | undefined;
+ if (!videoUrl) {
+ const response = await session.openArtifact(selectedResult.artifact.id);
+ if (!response.ok) throw new Error(`HTTP ${response.status}`);
+ temporaryUrl = URL.createObjectURL(await response.blob());
+ }
+ const link = document.createElement('a');
+ link.href = videoUrl || temporaryUrl!;
+ link.download = artifactFileName(selectedResult.artifact, selectedResult.value);
+ link.click();
+ if (temporaryUrl !== undefined) {
+ window.setTimeout(() => URL.revokeObjectURL(temporaryUrl), 0);
+ }
+ setNotice(l('视频已开始下载', 'Video download started'));
+ } catch (caught) {
+ setError(formatVideoError(caught, l, selectedModelLabel, provider));
+ }
+ }
+
+ async function cancelTask() {
+ if (session === null || !generating || taskControlPending !== undefined) return;
+ setTaskControlPending('canceling');
+ setError('');
+ try {
+ await session.cancelJob();
+ setNotice(l('已停止跟踪当前视频生成任务', 'Stopped tracking the current video generation task'));
+ } catch (caught) {
+ setError(formatVideoError(caught, l, selectedModelLabel, provider));
+ } finally {
+ setTaskControlPending(undefined);
+ }
+ }
+
+ async function resumeTask() {
+ if (session === null || !resumable || taskControlPending !== undefined) return;
+ setTaskControlPending('resuming');
+ setError('');
+ try {
+ if (isRecoverableVideoStage(latestStage)) {
+ await session.applyAction({
+ actor: 'user',
+ action: 'run-stage',
+ input: { stageId: 'generate' }
+ });
+ } else {
+ await session.resumeJob();
+ }
+ setNotice(l('正在继续查询原视频生成任务', 'Resuming the existing video generation task'));
+ } catch (caught) {
+ setError(formatVideoError(caught, l, selectedModelLabel, provider));
+ } finally {
+ setTaskControlPending(undefined);
+ }
+ }
+
+ function selectVersion(version: number) {
+ setResultVersion(version);
+ openStep(2);
+ setNotice(l(`正在查看 V${version}`, `Viewing V${version}`));
}
function handleCommand(command: string) {
@@ -227,26 +481,28 @@ export default function VideoGenerationWorkspace(props: {
return l('示例提示词已填入,可以继续设置画幅和时长。', 'The sample prompt is ready. Continue with format and duration.');
}
if (/横屏|横版|landscape|16:9/i.test(command)) {
- setSize('1280x720');
+ updateSize('1280x720');
openStep(1);
return l('视频画幅已改为横屏 16:9。', 'Video format changed to landscape 16:9.');
}
if (/竖屏|竖版|portrait|9:16/i.test(command)) {
- setSize('720x1280');
+ updateSize('720x1280');
openStep(1);
return l('视频画幅已改为竖屏 9:16。', 'Video format changed to portrait 9:16.');
}
- const providerMatch = providers.find(item => command.toLowerCase().includes(item.value) || command.includes(item.zh) || command.toLowerCase().includes(item.en.toLowerCase()));
+ const normalized = command.toLowerCase();
+ const providerMatch = providers.find(item => (
+ normalized.includes(item.value)
+ || command.includes(item.zh)
+ || normalized.includes(item.en.toLowerCase())
+ ));
if (providerMatch) {
updateProvider(providerMatch.value);
openStep(1);
- return l(`视频服务已改为${providerMatch.zh}。`, `Video provider changed to ${providerMatch.en}.`);
- }
- const durationMatch = command.match(/(?:时长|duration)?\s*(4|5|6|8|10)\s*(?:秒|s|seconds?)/i);
- if (durationMatch && durations.includes(Number(durationMatch[1]) as VideoGenerationDuration)) {
- setDuration(Number(durationMatch[1]) as VideoGenerationDuration);
- openStep(1);
- return l(`视频时长已改为 ${durationMatch[1]} 秒。`, `Video duration changed to ${durationMatch[1]} seconds.`);
+ return l(
+ `视频服务已改为${providerMatch.zh}。`,
+ `Video provider changed to ${providerMatch.en}.`
+ );
}
if (command.trim().length > 8) {
updatePrompt(command.trim());
@@ -256,23 +512,40 @@ export default function VideoGenerationWorkspace(props: {
return l('请描述主体动作、场景、镜头运动、光线和视觉风格。', 'Describe the action, scene, camera movement, lighting, and visual style.');
}
- const statusLabel = result?.status === 'queued'
- ? l('正在排队', 'Queued')
- : result?.status === 'in_progress'
- ? l('正在生成', 'Generating')
- : l('正在提交任务', 'Submitting job');
-
return (
<CreatorToolShell
title={l('视频生成', 'Video Generation')}
- subtitle={l('从文字创意生成可预览和下载的视频', 'Turn a written idea into a previewable, downloadable video')}
- context={result?.status === 'completed' ? l('视频已完成', 'Video ready') : result && result.status !== 'failed' ? `${statusLabel} · ${result.progress}%` : currentStep === 0 ? l('正在编辑视频描述', 'Editing video description') : currentStep === 1 ? `${l(selectedSize.zh, selectedSize.en)} · ${duration}s` : l('等待生成', 'Ready to generate')}
- initialMessage={l('描述你想生成的视频,包括主体动作、镜头和画面风格。', 'Describe the video, including subject movement, camera direction, and visual style.')}
+ subtitle={l('根据文字或参考图生成 AI 视频片段', 'Generate an AI video clip from text or a reference image')}
+ context={selectedResult
+ ? l(
+ `V${selectedResult.value} · ${resultModelLabel} · ${resultRatio} · ${resultDuration} 秒`,
+ `V${selectedResult.value} · ${resultModelLabel} · ${resultRatio} · ${resultDuration} seconds`
+ )
+ : generating
+ ? progressPercent === null
+ ? progressLabel
+ : `${progressLabel} · ${progressPercent}%`
+ : currentStep === 0
+ ? l('正在编辑视频描述', 'Editing video description')
+ : currentStep === 1
+ ? `${selectedModelLabel} · ${followsReferenceRatio
+ ? l('跟随参考图', 'Match reference image')
+ : l(selectedSize.zh, selectedSize.en)} · ${duration}s`
+ : l('等待生成', 'Ready to generate')}
+ initialMessage={l(
+ '描述你想生成的视频,包括主体动作、镜头和画面风格。',
+ 'Describe the video, including subject movement, camera direction, and visual style.'
+ )}
suggestions={[l('填入示例提示词', 'Use a sample prompt'), l('生成竖屏视频', 'Create a portrait video')]}
placeholder={props.promptHint ?? l('描述需要生成的视频', 'Describe the video to generate')}
onBack={props.onBack}
onCommand={handleCommand}
+ pageClassName="video-generation-workspace-page"
contentClassName="media-generation-workspace-content"
+ currentIssue={visibleError || undefined}
+ onCancelTask={generating ? () => void cancelTask() : undefined}
+ onResumeTask={resumable ? () => void resumeTask() : undefined}
+ taskControlPending={taskControlPending}
>
<div className="creator-tool-stack media-generation-stack">
<nav className="video-translation-steps creator-tool-steps" aria-label={l('视频生成流程', 'Video generation workflow')}>
@@ -280,7 +553,19 @@ export default function VideoGenerationWorkspace(props: {
{[l('视频描述', 'Prompt'), l('生成设置', 'Settings'), l('生成视频', 'Generate')].map((label, index) => {
const active = currentStep === index;
const completed = index < currentStep;
- return <li key={label} data-active={active} data-completed={completed}><button type="button" disabled={index > furthestStep} aria-current={active ? 'step' : undefined} onClick={() => openStep(index as VideoStep)}><span>{completed ? <Check size={13} strokeWidth={2.2} /> : index + 1}</span><strong>{label}</strong></button></li>;
+ return (
+ <li key={label} data-active={active} data-completed={completed}>
+ <button
+ type="button"
+ disabled={index > furthestStep}
+ aria-current={active ? 'step' : undefined}
+ onClick={() => openStep(index as VideoStep)}
+ >
+ <span>{completed ? <Check size={13} strokeWidth={2.2} /> : index + 1}</span>
+ <strong>{label}</strong>
+ </button>
+ </li>
+ );
})}
</ol>
</nav>
@@ -288,95 +573,576 @@ export default function VideoGenerationWorkspace(props: {
<div className="media-generation-step-scroll">
{currentStep === 0 ? (
<section className="creator-tool-panel media-generation-prompt-panel" aria-labelledby="video-prompt-title">
- <div className="creator-tool-panel-heading"><div><h2 id="video-prompt-title">{l('视频描述', 'Video prompt')}</h2><p>{l('写清主体动作、环境、镜头运动、光线和风格,最多 4000 字', 'Describe action, setting, camera movement, lighting, and style, up to 4,000 characters')}</p></div><small>{characterCount} / 4000</small></div>
+ <div className="creator-tool-panel-heading">
+ <div>
+ <h2 id="video-prompt-title">{l('视频描述', 'Video prompt')}</h2>
+ <p>{l(
+ '写清主体动作、环境、镜头运动、光线和风格,最多 4000 字',
+ 'Describe action, setting, camera movement, lighting, and style, up to 4,000 characters'
+ )}</p>
+ </div>
+ <small>{characterCount} / 4000</small>
+ </div>
<div className="video-generation-prompt-inputs">
<div className="video-reference-field">
<span className="video-reference-label">{l('参考图', 'Reference')}</span>
<div className="video-reference-upload-wrap">
<label className="video-reference-upload" title={l('上传 JPG、PNG 或 WebP 图片,最大 5MB', 'Upload a JPG, PNG, or WebP image up to 5 MB')}>
- <input type="file" accept="image/jpeg,image/png,image/webp" aria-label={l('上传视频参考图', 'Upload video reference image')} onChange={event => updateReferenceImage(event.target.files?.[0] ?? null)} />
- <span className="video-reference-thumbnail" data-loaded={referenceImageFile ? 'true' : 'false'}>{referenceImageFile ? <img src={referenceImageUrl} alt={l('视频参考图预览', 'Video reference preview')} /> : <><Plus size={22} strokeWidth={1.6} /><small>{l('添加图片', 'Add image')}</small></>}</span>
+ <input
+ type="file"
+ accept="image/jpeg,image/png,image/webp"
+ aria-label={l('上传视频参考图', 'Upload video reference image')}
+ onChange={event => updateReferenceImage(event.target.files?.[0] ?? null)}
+ />
+ <span className="video-reference-thumbnail" data-loaded={currentReferenceName ? 'true' : 'false'}>
+ {referenceImageUrl
+ ? <img src={referenceImageUrl} alt={l('视频参考图预览', 'Video reference preview')} />
+ : (
+ <>
+ <Plus size={22} strokeWidth={1.6} />
+ <small>{l('添加图片', 'Add image')}</small>
+ </>
+ )}
+ </span>
</label>
- {referenceImageFile ? <button className="video-reference-remove" type="button" onClick={removeReferenceImage} aria-label={l('移除参考图', 'Remove reference image')} title={l('移除参考图', 'Remove reference image')}><X size={15} strokeWidth={1.8} /></button> : null}
+ {currentReferenceName ? (
+ <button
+ className="video-reference-remove"
+ type="button"
+ onClick={removeReferenceImage}
+ aria-label={l('移除参考图', 'Remove reference image')}
+ title={l('移除参考图', 'Remove reference image')}
+ >
+ <X size={15} strokeWidth={1.8} />
+ </button>
+ ) : null}
</div>
- <small className="video-reference-meta" title={referenceImageFile?.name ?? l('支持 JPG、PNG、WebP,最大 5MB', 'JPG, PNG, or WebP, up to 5 MB')}>{referenceImageFile?.name ?? l('选填', 'Optional')}</small>
+ <small className="video-reference-meta" title={currentReferenceName ?? l('支持 JPG、PNG、WebP,最大 5MB', 'JPG, PNG, or WebP, up to 5 MB')}>
+ {currentReferenceName ?? l('选填', 'Optional')}
+ </small>
</div>
- <label className="creator-tool-field"><span>{l('提示词', 'Prompt')}</span><textarea rows={12} maxLength={4000} value={prompt} onChange={event => updatePrompt(event.target.value)} placeholder={l('例如:低机位跟随一辆红色跑车驶过海岸公路,黄昏金色光线,镜头平稳', 'For example: A low-angle tracking shot following a red sports car along a coastal road at golden hour, smooth camera motion')} /></label>
+ <label className="creator-tool-field">
+ <span>{l('提示词', 'Prompt')}</span>
+ <textarea
+ rows={12}
+ maxLength={4000}
+ value={prompt}
+ onChange={event => updatePrompt(event.target.value)}
+ placeholder={l(
+ '例如:低机位跟随一辆红色跑车驶过海岸公路,黄昏金色光线,镜头平稳',
+ 'For example: A low-angle tracking shot following a red sports car along a coastal road at golden hour, smooth camera motion'
+ )}
+ />
+ </label>
</div>
- <button className="smart-dubbing-sample" type="button" onClick={() => updatePrompt(l(samplePromptZh, samplePromptEn))}><WandSparkles size={14} strokeWidth={1.8} />{l('填入示例提示词', 'Use sample prompt')}</button>
+ <button className="smart-dubbing-sample" type="button" onClick={() => updatePrompt(l(samplePromptZh, samplePromptEn))}>
+ <WandSparkles size={14} strokeWidth={1.8} />
+ {l('填入示例提示词', 'Use sample prompt')}
+ </button>
</section>
) : null}
{currentStep === 1 ? (
<section className="creator-tool-panel" aria-labelledby="video-settings-title">
- <div className="creator-tool-panel-heading"><div><h2 id="video-settings-title">{l('生成设置', 'Generation settings')}</h2><p>{l('分别设置视频服务、画幅、分辨率和时长', 'Set the video provider, format, resolution, and duration independently')}</p></div></div>
+ <div className="creator-tool-panel-heading">
+ <div>
+ <h2 id="video-settings-title">{l('生成设置', 'Generation settings')}</h2>
+ <p>{l('设置视频服务、模型版本、画幅、分辨率和时长', 'Set the video provider, model version, format, resolution, and duration')}</p>
+ </div>
+ </div>
<div className="video-generation-settings-grid">
- <label className="creator-tool-field"><span>{l('视频服务', 'Video provider')}</span><select value={provider} onChange={event => updateProvider(event.target.value as VideoGenerationProvider)}>{providers.map(item => <option key={item.value} value={item.value}>{l(item.zh, item.en)}</option>)}</select></label>
- <label className="creator-tool-field"><span>{l('画幅', 'Format')}</span><select value={size} onChange={event => { setSize(event.target.value as VideoGenerationSize); setResult(undefined); }}>{sizes.map(item => <option key={item.value} value={item.value}>{l(item.zh, item.en)} · {item.ratio} · {item.value}</option>)}</select></label>
- <label className="creator-tool-field"><span>{l('视频时长', 'Video duration')}</span><select value={duration} onChange={event => { setDuration(Number(event.target.value) as VideoGenerationDuration); setResult(undefined); }}>{durations.map(value => <option key={value} value={value}>{value} {l('秒', 'seconds')}</option>)}</select></label>
+ <label className="creator-tool-field">
+ <span>{l('视频服务', 'Video provider')}</span>
+ <select value={provider} onChange={event => updateProvider(event.target.value as VideoGenerationProvider)}>
+ {providers.map(item => <option key={item.value} value={item.value}>{l(item.zh, item.en)}</option>)}
+ </select>
+ </label>
+ <label className="creator-tool-field">
+ <span>{l('模型版本', 'Model version')}</span>
+ <select value={model} onChange={event => updateModel(event.target.value)}>
+ {modelOptions.map(item => (
+ <option key={item.value} value={item.value}>{item.label}</option>
+ ))}
+ </select>
+ </label>
+ <label className="creator-tool-field">
+ <span>{l('画幅', 'Format')}</span>
+ <select
+ value={size}
+ disabled={followsReferenceRatio}
+ title={followsReferenceRatio
+ ? l('Seedance 参考图模式会跟随参考图画幅', 'Seedance matches the reference image aspect ratio')
+ : undefined}
+ onChange={event => updateSize(event.target.value as VideoGenerationSize)}
+ >
+ {followsReferenceRatio ? (
+ <option value={size}>{l('跟随参考图', 'Match reference image')}</option>
+ ) : sizes.map(item => <option key={item.value} value={item.value}>{l(item.zh, item.en)} · {item.ratio} · {item.value}</option>)}
+ </select>
+ </label>
+ <label className="creator-tool-field">
+ <span>{l('视频时长', 'Video duration')}</span>
+ <select value={duration} onChange={event => updateDuration(Number(event.target.value) as VideoGenerationDuration)}>
+ {durations.map(value => <option key={value} value={value}>{value} {l('秒', 'seconds')}</option>)}
+ </select>
+ </label>
+ </div>
+ <div className="media-generation-setting-note">
+ <Film size={17} strokeWidth={1.7} />
+ <span>
+ <strong>{l('后台生成', 'Background generation')}</strong>
+ <small>{l(
+ '任务提交后可以离开当前页面,生成状态和结果会保留在项目中',
+ 'You can leave after submission. Progress and results remain available in the project.'
+ )}</small>
+ </span>
</div>
- <div className="media-generation-setting-note"><Film size={17} strokeWidth={1.7} /><span><strong>{l('生成时间', 'Generation time')}</strong><small>{l('视频生成通常需要几分钟,任务提交后页面会自动刷新进度', 'Video generation typically takes several minutes. Progress refreshes automatically after submission.')}</small></span></div>
</section>
) : null}
{currentStep === 2 ? (
<div className="creator-task-final-grid media-generation-final-grid">
<section className="creator-tool-panel media-generation-output-panel" aria-labelledby="video-output-title">
- <div className="creator-tool-panel-heading"><div><h2 id="video-output-title">{videoUrl ? l('生成结果', 'Generated video') : l('生成视频', 'Generate video')}</h2><p>{videoUrl ? l('预览成片并下载视频文件', 'Preview and download the finished video') : result && result.status !== 'failed' ? l('任务已提交,完成后会自动载入成片', 'The job is running. The finished video will load automatically.') : l('确认设置后提交视频生成任务', 'Review the settings, then submit the generation job')}</p></div></div>
- {videoUrl && result?.status === 'completed' ? (
- <div className="video-generation-result" data-ratio={selectedSize.ratio}><video controls src={videoUrl} aria-label={l('生成视频预览', 'Generated video preview')} /><div><span><strong>{result.fileName}</strong><small>{result.size ? formatBytes(result.size) : 'MP4'} · {result.model}</small></span><div><button type="button" onClick={generate} disabled={generating}><RotateCcw size={15} />{l('重新生成', 'Regenerate')}</button><button className="creator-tool-primary" type="button" onClick={download}><Download size={15} />{l('下载视频', 'Download video')}</button></div></div></div>
- ) : result && (result.status === 'queued' || result.status === 'in_progress') ? (
- <div className="video-generation-progress" role="status"><span><LoaderCircle className="smart-dubbing-spinner" size={25} /></span><strong>{statusLabel}</strong><p>{l('可以停留在当前页面,完成后将自动显示预览', 'Stay on this page. The preview will appear automatically when complete.')}</p><div><span style={{ width: `${Math.max(4, result.progress)}%` }} /></div><small>{result.progress}%</small></div>
+ <div className="creator-tool-panel-heading">
+ <div>
+ <h2 id="video-output-title">{selectedResult ? l('生成结果', 'Generated video') : l('生成视频', 'Generate video')}</h2>
+ <p>{selectedResult
+ ? l('预览历史版本并下载需要的成片', 'Preview previous versions and download the video you need')
+ : generating
+ ? l('任务正在后台生成,完成后会自动显示', 'The task is running in the background and will appear automatically')
+ : l('确认设置后提交视频生成任务', 'Review the settings, then submit the generation job')}</p>
+ </div>
+ {selectedResult ? (
+ <CreatorResultVersionMenu
+ version={selectedResult.value}
+ versions={resultVersions.map((version, index) => ({
+ value: version.value,
+ description: index === 0
+ ? l('初次生成', 'Initial generation')
+ : l(`第 ${index + 1} 次生成`, `Generation ${index + 1}`)
+ }))}
+ onVersionChange={selectVersion}
+ />
+ ) : null}
+ </div>
+ {selectedResult ? (
+ <div className="video-generation-result" data-ratio={resultRatio}>
+ {videoUrl ? (
+ <video controls src={videoUrl} aria-label={l('生成视频预览', 'Generated video preview')} />
+ ) : (
+ <div className="video-result-player-status" role="status">
+ <LoaderCircle className="smart-dubbing-spinner" size={18} />
+ {l('正在加载视频预览', 'Loading video preview')}
+ </div>
+ )}
+ <div>
+ <span>
+ <strong>{artifactFileName(selectedResult.artifact, selectedResult.value)}</strong>
+ <small>
+ {formatBytes(readArtifactBytes(selectedResult.artifact))}
+ {' · '}{resultModelLabel}
+ </small>
+ </span>
+ <div>
+ <button type="button" onClick={() => void generate()} disabled={generating}>
+ {generating
+ ? <LoaderCircle className="smart-dubbing-spinner" size={15} />
+ : <RotateCcw size={15} />}
+ {generating ? l('正在生成', 'Generating') : l('重新生成', 'Regenerate')}
+ </button>
+ <button className="creator-tool-primary" type="button" onClick={() => void download()}>
+ <Download size={15} />
+ {l('下载视频', 'Download video')}
+ </button>
+ </div>
+ </div>
+ </div>
+ ) : generating ? (
+ <div className="video-generation-progress" role="status">
+ <span><LoaderCircle className="smart-dubbing-spinner" size={25} /></span>
+ <strong>{progressLabel}</strong>
+ <p>{l(
+ '任务已保存在项目中,可以离开当前页面',
+ 'The task is saved in the project, so you can leave this page'
+ )}</p>
+ {progressPercent === null ? null : (
+ <>
+ <div><span style={{ width: `${Math.max(4, progressPercent)}%` }} /></div>
+ <small>{progressPercent}%</small>
+ </>
+ )}
+ </div>
) : (
- <div className="smart-dubbing-ready"><span><Clapperboard size={24} strokeWidth={1.6} /></span><strong>{l('准备生成视频', 'Ready to generate video')}</strong><p>{l(`${l(selectedProvider.zh, selectedProvider.en)} · ${selectedSize.ratio} · ${duration} 秒 · ${size}`, `${selectedProvider.en} · ${selectedSize.ratio} · ${duration} seconds · ${size}`)}</p></div>
+ <div className="smart-dubbing-ready">
+ <span><Clapperboard size={24} strokeWidth={1.6} /></span>
+ <strong>{resumable ? l('视频生成已暂停', 'Video generation paused') : l('准备生成视频', 'Ready to generate video')}</strong>
+ <p>{l(
+ `${l(selectedProvider.zh, selectedProvider.en)} · ${selectedModelLabel} · ${followsReferenceRatio
+ ? l('跟随参考图', 'Match reference image')
+ : selectedSize.ratio} · ${duration} 秒${followsReferenceRatio ? '' : ` · ${size}`}`,
+ `${selectedProvider.en} · ${selectedModelLabel} · ${followsReferenceRatio
+ ? 'Match reference image'
+ : selectedSize.ratio} · ${duration} seconds${followsReferenceRatio ? '' : ` · ${size}`}`
+ )}</p>
+ {resumable ? (
+ <button className="creator-tool-primary" type="button" onClick={() => void resumeTask()} disabled={taskControlPending !== undefined}>
+ {taskControlPending === 'resuming'
+ ? <LoaderCircle className="smart-dubbing-spinner" size={16} />
+ : <Sparkles size={16} />}
+ {l('继续任务', 'Resume task')}
+ </button>
+ ) : null}
+ </div>
)}
</section>
- <CreatorTaskSummary sourceIcon={Clapperboard} sourceLabel={l('视频描述', 'Prompt')} sourceValue={prompt.trim()} items={[...(referenceImageFile ? [{ label: l('参考图', 'Reference image'), value: referenceImageFile.name }] : []), { label: l('视频服务', 'Provider'), value: l(selectedProvider.zh, selectedProvider.en) }, { label: l('画幅', 'Format'), value: `${l(selectedSize.zh, selectedSize.en)} · ${selectedSize.ratio}` }, { label: l('分辨率', 'Resolution'), value: size }, { label: l('时长', 'Duration'), value: l(`${duration} 秒`, `${duration} seconds`) }, { label: l('输出格式', 'Format'), value: 'MP4' }]} />
+ <CreatorTaskSummary
+ sourceIcon={Clapperboard}
+ sourceLabel={l('视频描述', 'Prompt')}
+ sourceValue={selectedResult ? readString(resultSettings?.prompt) : prompt.trim()}
+ items={selectedResult ? [
+ { label: l('视频服务', 'Provider'), value: l(resultProvider.zh, resultProvider.en) },
+ { label: l('模型版本', 'Model version'), value: resultModelLabel },
+ { label: l('画幅', 'Format'), value: `${resultFormatLabel} · ${resultRatio}` },
+ { label: l('分辨率', 'Resolution'), value: resultResolution },
+ { label: l('时长', 'Duration'), value: l(`${resultDuration} 秒`, `${resultDuration} seconds`) },
+ { label: l('当前版本', 'Version'), value: `V${selectedResult.value}` }
+ ] : [
+ ...(currentReferenceName
+ ? [{ label: l('参考图', 'Reference image'), value: currentReferenceName }]
+ : []),
+ { label: l('视频服务', 'Provider'), value: l(selectedProvider.zh, selectedProvider.en) },
+ { label: l('模型版本', 'Model version'), value: selectedModelLabel },
+ { label: l('画幅', 'Format'), value: followsReferenceRatio
+ ? l('跟随参考图', 'Match reference image')
+ : `${l(selectedSize.zh, selectedSize.en)} · ${selectedSize.ratio}` },
+ { label: l('分辨率', 'Resolution'), value: followsReferenceRatio
+ ? l('由模型根据参考图决定', 'Determined from the reference image')
+ : size },
+ { label: l('时长', 'Duration'), value: l(`${duration} 秒`, `${duration} seconds`) },
+ { label: l('输出格式', 'Output format'), value: 'MP4' }
+ ]}
+ />
</div>
) : null}
- {error ? <p className="creator-tool-error" role="alert">{error}</p> : null}
+ {visibleError ? (
+ <p className="creator-tool-error" role="alert">
+ {visibleError}
+ {settingsDeepLink ? (
+ <>
+ {' '}
+ <a href={settingsDeepLink}>{l('打开 AI 服务设置', 'Open AI service settings')}</a>
+ </>
+ ) : null}
+ </p>
+ ) : null}
{notice ? <p className="creator-tool-notice" role="status">{notice}</p> : null}
</div>
<footer className="video-translation-wizard-actions media-generation-actions" aria-label={l('视频生成操作', 'Video generation actions')}>
- <button className="video-translation-secondary-action" type="button" onClick={() => currentStep === 0 ? props.onBack() : openStep((currentStep - 1) as VideoStep)}>{currentStep === 0 ? l('返回', 'Back') : l('上一步', 'Back')}</button>
- {currentStep < 2 ? <button className="video-translation-primary-action" type="button" onClick={nextStep}>{l('继续', 'Continue')}</button> : null}
- {currentStep === 2 && !videoUrl && !(result && (result.status === 'queued' || result.status === 'in_progress')) ? <button className="video-translation-primary-action" type="button" onClick={generate} disabled={generating}>{generating ? <LoaderCircle className="smart-dubbing-spinner" size={16} /> : <Sparkles size={16} />}{generating ? l('正在提交', 'Submitting') : l('开始生成', 'Generate')}</button> : null}
+ <button
+ className="video-translation-secondary-action"
+ type="button"
+ onClick={() => currentStep === 0 ? props.onBack() : openStep((currentStep - 1) as VideoStep)}
+ >
+ {currentStep === 0 ? l('返回', 'Back') : l('上一步', 'Back')}
+ </button>
+ {currentStep < 2 ? (
+ <button className="video-translation-primary-action" type="button" onClick={nextStep}>
+ {l('继续', 'Continue')}
+ </button>
+ ) : null}
+ {currentStep === 2 && selectedResult === undefined && !generating && !resumable ? (
+ <button className="video-translation-primary-action" type="button" onClick={() => void generate()}>
+ <Sparkles size={16} />
+ {l('开始生成', 'Generate')}
+ </button>
+ ) : null}
</footer>
</div>
</CreatorToolShell>
);
}
-function readReferenceImage(file: File): Promise<VideoGenerationReferenceImage> {
- return new Promise((resolve, reject) => {
- const reader = new FileReader();
- reader.onerror = () => reject(new Error('REFERENCE_IMAGE_READ_FAILED'));
- reader.onload = () => {
- const value = typeof reader.result === 'string' ? reader.result : '';
- const separator = value.indexOf(',');
- if (separator < 0) {
- reject(new Error('REFERENCE_IMAGE_READ_FAILED'));
- return;
- }
- resolve({
- mime: file.type as VideoGenerationReferenceImage['mime'],
- data: value.slice(separator + 1)
- });
- };
- reader.readAsDataURL(file);
+function createVideoResultVersions(
+ artifacts: CreatorArtifact[],
+ resultSnapshots: CreatorJson | undefined
+): VideoResultVersion[] {
+ const byId = new Map(artifacts.map(artifact => [artifact.id, artifact]));
+ const snapshots = readCreatorResultSnapshots(resultSnapshots);
+ const fromSnapshots = snapshots.flatMap(snapshot => {
+ const artifact = (snapshot.artifactRefs.generated_video ?? [])
+ .map(id => byId.get(id))
+ .find((candidate): candidate is CreatorArtifact => candidate !== undefined);
+ return artifact === undefined ? [] : [{
+ value: snapshot.version,
+ description: snapshot.description,
+ artifact,
+ state: snapshot.state
+ }];
});
+ if (fromSnapshots.length > 0) return fromSnapshots;
+
+ return artifacts
+ .filter(artifact => (
+ artifact.kind === 'generated_video'
+ && artifact.path !== null
+ && artifact.status !== 'stale'
+ ))
+ .map(artifact => ({
+ value: readPositiveInteger(artifact.metadata.resultVersion) ?? artifact.version,
+ description: '生成视频',
+ artifact,
+ state: {}
+ }))
+ .sort((left, right) => left.value - right.value);
+}
+
+function readVideoStep(value: CreatorJson | undefined, fallback: VideoStep): VideoStep {
+ return value === 0 || value === 1 || value === 2 ? value : fallback;
+}
+
+function readString(value: CreatorJson | undefined): string {
+ return typeof value === 'string' ? value : '';
+}
+
+function readProvider(value: CreatorJson | undefined): VideoGenerationProvider {
+ return value === 'kling' || value === 'veo' ? value : 'seedance';
+}
+
+function readOptionalProvider(
+ value: CreatorJson | undefined
+): VideoGenerationProvider | undefined {
+ return value === 'seedance' || value === 'kling' || value === 'veo'
+ ? value
+ : undefined;
+}
+
+function readModel(
+ value: CreatorJson | undefined,
+ provider: VideoGenerationProvider
+): string {
+ return readOptionalModel(value) ?? defaultVideoGenerationModels[provider];
+}
+
+function readOptionalModel(value: CreatorJson | undefined): string | undefined {
+ return typeof value === 'string' && value.trim() ? value.trim() : undefined;
+}
+
+function videoModelDefaults(
+ config: CreatorServicesConfig
+): Record<VideoGenerationProvider, string> {
+ return {
+ seedance: config.video.seedance.model.trim() || defaultVideoGenerationModels.seedance,
+ kling: config.video.kling.model.trim() || defaultVideoGenerationModels.kling,
+ veo: config.video.veo.model.trim() || defaultVideoGenerationModels.veo
+ };
+}
+
+function createVideoModelOptions(
+ provider: VideoGenerationProvider,
+ configuredDefault: string,
+ current: string
+): VideoModelOption[] {
+ const ids = [
+ configuredDefault,
+ ...videoGenerationModelIds[provider],
+ current
+ ].filter((value, index, values) => value && values.indexOf(value) === index);
+ return ids.map(value => ({
+ value,
+ label: videoModelLabel(value)
+ }));
+}
+
+function videoModelLabel(model: string): string {
+ return modelLabels[model] ?? model;
+}
+
+function readSize(value: CreatorJson | undefined): VideoGenerationSize {
+ return value === '720x1280' || value === '1024x1024' ? value : '1280x720';
+}
+
+function readDuration(
+ value: CreatorJson | undefined,
+ provider: VideoGenerationProvider
+): VideoGenerationDuration {
+ const allowed = providerDurations[provider];
+ return typeof value === 'number' && allowed.includes(value as VideoGenerationDuration)
+ ? value as VideoGenerationDuration
+ : allowed[0]!;
+}
+
+function findArtifact(
+ artifacts: CreatorArtifact[],
+ artifactId: CreatorJson | undefined,
+ kind: string
+): CreatorArtifact | undefined {
+ return typeof artifactId === 'string'
+ ? artifacts.find(artifact => (
+ artifact.id === artifactId
+ && artifact.kind === kind
+ && artifact.status === 'completed'
+ ))
+ : undefined;
+}
+
+function artifactMatchesFile(artifact: CreatorArtifact | undefined, file: File): boolean {
+ return artifact !== undefined
+ && artifact.metadata.fileName === file.name
+ && artifact.metadata.size === file.size
+ && artifact.metadata.lastModified === file.lastModified;
+}
+
+function readArtifactString(
+ artifact: CreatorArtifact | undefined,
+ key: string
+): string | undefined {
+ const value = artifact?.metadata[key];
+ return typeof value === 'string' && value.trim() ? value : undefined;
+}
+
+function readArtifactBytes(artifact: CreatorArtifact): number {
+ const bytes = artifact.metadata.bytes ?? artifact.metadata.size;
+ return typeof bytes === 'number' && Number.isFinite(bytes) && bytes > 0 ? bytes : 0;
+}
+
+function readArtifactNumber(
+ artifact: CreatorArtifact | undefined,
+ key: string
+): number | undefined {
+ const value = artifact?.metadata[key];
+ return typeof value === 'number' && Number.isFinite(value) && value > 0
+ ? Math.round(value)
+ : undefined;
+}
+
+function formatAspectRatio(width: number, height: number): string {
+ const divisor = greatestCommonDivisor(width, height);
+ return `${Math.round(width / divisor)}:${Math.round(height / divisor)}`;
+}
+
+function greatestCommonDivisor(left: number, right: number): number {
+ let a = Math.max(1, Math.round(left));
+ let b = Math.max(1, Math.round(right));
+ while (b > 0) {
+ const remainder = a % b;
+ a = b;
+ b = remainder;
+ }
+ return a;
+}
+
+function videoFormatLabel(
+ width: number,
+ height: number,
+ l: (zh: string, en: string) => string
+): string {
+ if (width === height) return l('方形', 'Square');
+ return width > height ? l('横屏', 'Landscape') : l('竖屏', 'Portrait');
+}
+
+function readPositiveInteger(value: CreatorJson | undefined): number | undefined {
+ return typeof value === 'number' && Number.isInteger(value) && value > 0 ? value : undefined;
+}
+
+function readProgressPercent(value: CreatorJson | undefined): number | null {
+ return typeof value === 'number' && Number.isFinite(value)
+ ? Math.max(0, Math.min(100, Math.round(value)))
+ : null;
+}
+
+function isRecoverableVideoStage(
+ stage: CreatorStageRun | undefined
+): boolean {
+ return stage?.status === 'failed'
+ && stage.errorCode === 'creator_video_upstream_error'
+ && typeof stage.progress.videoGenerationResultId === 'string'
+ && stage.progress.videoGenerationResultId.length > 0;
+}
+
+function readNeedsInputDeepLink(value: CreatorJson | undefined): string {
+ if (value === null || typeof value !== 'object' || Array.isArray(value)) return '';
+ return typeof value.deepLink === 'string' ? value.deepLink : '';
+}
+
+function artifactFileName(artifact: CreatorArtifact, version: number): string {
+ return readArtifactString(artifact, 'fileName')
+ ?? `OpenCreator-video-V${version}.mp4`;
+}
+
+function videoPhaseLabel(
+ phase: string,
+ l: (zh: string, en: string) => string
+): string {
+ const labels: Record<string, string> = {
+ validating: l('检查视频生成设置', 'Checking video generation settings'),
+ preparing_reference: l('准备视频参考图', 'Preparing the reference image'),
+ submitting: l('提交视频生成任务', 'Submitting the video generation task'),
+ queued: l('视频生成任务排队中', 'Video generation task queued'),
+ generating: l('视频生成中', 'Generating video'),
+ downloading: l('下载生成的视频', 'Downloading the generated video'),
+ collecting_output: l('整理视频文件', 'Collecting the video file'),
+ validating_output: l('检查视频文件', 'Checking the video file'),
+ completed: l('视频已生成', 'Video generated')
+ };
+ return labels[phase] ?? l('正在处理视频生成任务', 'Processing the video generation task');
}
function formatBytes(size: number) {
+ if (size <= 0) return 'MP4';
if (size < 1024 * 1024) return `${Math.max(1, Math.round(size / 1024))} KB`;
return `${(size / 1024 / 1024).toFixed(1)} MB`;
}
-function formatVideoError(error: unknown, l: (zh: string, en: string) => string) {
- const code = typeof error === 'object' && error !== null && 'code' in error ? String((error as { code?: unknown }).code) : '';
- if (error instanceof Error && error.message === 'REFERENCE_IMAGE_READ_FAILED') return l('参考图读取失败,请重新选择图片', 'The reference image could not be read. Choose it again.');
- if (code === 'VIDEO_GENERATION_CONFIG_REQUIRED') return l('请先在设置的 AI 服务中配置视频生成 API Key', 'Configure a video generation API key in AI Services first');
- if (code === 'VIDEO_GENERATION_UPSTREAM_ERROR') return l('视频生成请求失败,请检查模型服务配置和网络后重试', 'Video generation failed. Check the model service configuration and network, then retry.');
- return error instanceof Error ? error.message : l('视频生成失败,请稍后重试', 'Video generation failed. Try again later.');
+function formatVideoError(
+ error: unknown,
+ l: (zh: string, en: string) => string,
+ modelLabel = '',
+ provider: VideoGenerationProvider = 'seedance'
+) {
+ const code = typeof error === 'object' && error !== null && 'code' in error
+ ? String((error as { code?: unknown }).code)
+ : '';
+ const message = typeof error === 'object' && error !== null && 'message' in error
+ ? String((error as { message?: unknown }).message ?? '')
+ : error instanceof Error
+ ? error.message
+ : '';
+ if (code === 'creator_video_config_missing' || code === 'VIDEO_GENERATION_CONFIG_REQUIRED') {
+ return l(
+ '请先在设置的 AI 服务中配置视频生成服务',
+ 'Configure a video generation provider in AI Services first'
+ );
+ }
+ if (code === 'creator_stage_interrupted_on_restart') {
+ return l(
+ 'Runtime 重启中断了任务,可以继续查询原视频生成任务',
+ 'The Runtime restart interrupted this task. Resume it to continue checking the existing generation.'
+ );
+ }
+ if (
+ code === 'creator_video_model_unavailable'
+ || isUnavailableModelMessage(message)
+ ) {
+ const selected = modelLabel || l('所选模型', 'the selected model');
+ const consoleName = provider === 'seedance'
+ ? l('方舟控制台', 'Ark Console')
+ : l('服务商控制台', 'the provider console');
+ return l(
+ `当前账号未开通 ${selected},请切换模型版本或前往${consoleName}开通`,
+ `${selected} is not enabled for this account. Switch models or enable it in ${consoleName}.`
+ );
+ }
+ if (code === 'creator_video_upstream_error' || code === 'VIDEO_GENERATION_UPSTREAM_ERROR') {
+ return l(
+ '视频生成请求失败,请检查模型服务配置和网络后重试',
+ 'Video generation failed. Check the provider configuration and network, then retry.'
+ );
+ }
+ return message || l('视频生成失败,请稍后重试', 'Video generation failed. Try again later.');
+}
+
+function isUnavailableModelMessage(message: string): boolean {
+ return /(?:not activated|not enabled|not subscribed|no permission|permission denied|access denied).{0,80}(?:model|service)|(?:model|service).{0,80}(?:not activated|not enabled|not subscribed|no permission|permission denied|access denied)/i
+ .test(message);
}
diff --git a/apps/web/src/features/dashboard/creator-panel-adapters.ts b/apps/web/src/features/dashboard/creator-panel-adapters.ts
index 5925e0e0..7e6c1d5b 100644
--- a/apps/web/src/features/dashboard/creator-panel-adapters.ts
+++ b/apps/web/src/features/dashboard/creator-panel-adapters.ts
@@ -310,10 +310,86 @@ export const videoDownloadPanelAdapter: CreatorPanelAdapter = {
}
};
+export const videoGenerationPanelAdapter: CreatorPanelAdapter = {
+ id: 'video-generation',
+ composerPlaceholder: l => l(
+ '询问生成状态,或调整视频内容、服务、模型、画幅和时长',
+ 'Ask about progress or adjust the video content, provider, model, format, and duration'
+ ),
+ stageLabel(stageId, l) {
+ if (stageId === 'generate') return l('生成视频', 'Generate video');
+ return l('视频生成任务', 'Video generation task');
+ },
+ phaseLabel(phase, l) {
+ const labels: Record<string, string> = {
+ validating: l('检查视频生成设置', 'Checking video generation settings'),
+ preparing_reference: l('准备视频参考图', 'Preparing the reference image'),
+ submitting: l('提交视频生成任务', 'Submitting the video generation task'),
+ queued: l('等待视频服务开始生成', 'Waiting for the video provider'),
+ generating: l('视频生成中', 'Generating video'),
+ downloading: l('下载生成的视频', 'Downloading the generated video'),
+ collecting_output: l('整理视频文件', 'Collecting the video file'),
+ validating_output: l('检查视频文件', 'Checking the video file'),
+ completed: l('视频已生成', 'Video generated'),
+ provider_failed: l('视频服务生成失败', 'Video provider failed')
+ };
+ return labels[phase] ?? genericPhaseLabel(phase, l);
+ },
+ activityStageId: readActivityStageId,
+ normalizeActivity(activity, l) {
+ return normalizeCommonActivity(
+ activity,
+ l,
+ videoGenerationPanelAdapter,
+ {
+ 'register-reference-image': l('上传了视频参考图', 'Uploaded a video reference image')
+ },
+ videoGenerationFieldLabel
+ );
+ },
+ readStageProgress(stage) {
+ const progress = readStandardProgress(stage);
+ if (
+ progress.percent === null
+ && (progress.phase === 'queued' || progress.phase === 'generating')
+ ) {
+ return {
+ ...progress,
+ indeterminate: stage.status === 'running'
+ };
+ }
+ return progress;
+ },
+ runningProgressText(_stage, progress, l) {
+ return progress.phase === null
+ ? null
+ : videoGenerationPanelAdapter.phaseLabel(progress.phase, l);
+ },
+ failedProgressText(stage, l) {
+ if (stage.errorCode === 'creator_video_config_missing') {
+ return l(
+ '请先在设置的 AI 服务中配置视频生成服务',
+ 'Configure a video generation provider in AI Services first.'
+ );
+ }
+ if (stage.errorCode === 'creator_video_model_unavailable') {
+ return l(
+ '当前账号未开通所选视频模型,请切换模型版本或前往服务商控制台开通',
+ 'The selected video model is not enabled for this account. Switch models or enable it in the provider console.'
+ );
+ }
+ return null;
+ },
+ succeededProgressText(_stage, l) {
+ return l('视频已生成,可以预览或下载', 'The video is ready to preview or download');
+ }
+};
+
export function creatorPanelAdapterFor(templateId: string): CreatorPanelAdapter {
if (templateId === 'video-translation') return videoTranslationPanelAdapter;
if (templateId === 'video-download') return videoDownloadPanelAdapter;
if (templateId === 'cover') return coverPanelAdapter;
+ if (templateId === 'video-generation') return videoGenerationPanelAdapter;
return genericAdapter;
}
@@ -426,6 +502,21 @@ function videoDownloadFieldLabel(
return labels[field] ?? null;
}
+function videoGenerationFieldLabel(
+ field: string,
+ l: CreatorPanelLocalize
+): string | null {
+ const labels: Record<string, string> = {
+ prompt: l('视频描述', 'Video prompt'),
+ provider: l('视频服务', 'Video provider'),
+ model: l('模型版本', 'Model version'),
+ size: l('画幅与分辨率', 'Format and resolution'),
+ duration: l('视频时长', 'Video duration'),
+ referenceImageArtifactId: l('参考图', 'Reference image')
+ };
+ return labels[field] ?? null;
+}
+
function readActivityStageId(activity: CreatorActivity): string | null {
const structured = readString(activity.details.stageId);
if (structured !== null) return structured;
diff --git a/apps/web/src/features/dashboard/creator-workspace.ts b/apps/web/src/features/dashboard/creator-workspace.ts
index 2a623797..fc2f2897 100644
--- a/apps/web/src/features/dashboard/creator-workspace.ts
+++ b/apps/web/src/features/dashboard/creator-workspace.ts
@@ -25,7 +25,8 @@ export const visibleCreatorWorkspaces = [
'video-translation',
'video-download',
'cover-generator',
- 'image-generation'
+ 'image-generation',
+ 'video-generation'
] as const satisfies readonly CreatorWorkspace[];
export const creatorRuntimeWorkspaces = [
@@ -34,7 +35,8 @@ export const creatorRuntimeWorkspaces = [
'stickman-video',
'auto-clips',
'cover-generator',
- 'image-generation'
+ 'image-generation',
+ 'video-generation'
] as const satisfies readonly CreatorWorkspace[];
export type CreatorRuntimeWorkspace = typeof creatorRuntimeWorkspaces[number];
@@ -45,7 +47,8 @@ const templateByWorkspace: Record<CreatorRuntimeWorkspace, string> = {
'stickman-video': 'stickman-video',
'auto-clips': 'auto-clip',
'cover-generator': 'cover',
- 'image-generation': 'image-generation'
+ 'image-generation': 'image-generation',
+ 'video-generation': 'video-generation'
};
export function isCreatorWorkspace(value: string): value is CreatorWorkspace {
diff --git a/apps/web/src/features/dashboard/dashboard.css b/apps/web/src/features/dashboard/dashboard.css
index 7bb40789..5d130f44 100644
--- a/apps/web/src/features/dashboard/dashboard.css
+++ b/apps/web/src/features/dashboard/dashboard.css
@@ -2007,7 +2007,7 @@
.video-generation-settings-grid {
display: grid;
- grid-template-columns: repeat(3, minmax(0, 1fr));
+ grid-template-columns: repeat(4, minmax(0, 1fr));
align-items: end;
gap: 12px;
}
@@ -2294,6 +2294,43 @@
font-weight: 600;
}
+@media (max-width: 960px) {
+ .video-generation-workspace-page {
+ height: auto;
+ min-height: 100%;
+ overflow-y: auto;
+ }
+
+ .video-generation-workspace-page .creator-workspace-layout {
+ min-width: 0;
+ height: auto;
+ min-height: 100%;
+ grid-template-columns: minmax(0, 1fr);
+ }
+
+ .video-generation-workspace-page .creator-workspace-main {
+ overflow: visible;
+ border-right: 0;
+ }
+
+ .video-generation-workspace-page .creator-workspace-content {
+ overflow: visible;
+ scrollbar-gutter: auto;
+ }
+
+ .video-generation-workspace-page .creator-task-final-grid {
+ grid-template-columns: minmax(0, 1fr);
+ }
+
+ .video-generation-workspace-page .creator-collaboration-panel {
+ min-width: 0;
+ height: auto;
+ min-height: 640px;
+ border-top: 1px solid var(--border-hairline);
+ border-left: 0;
+ }
+}
+
@media (max-width: 760px) {
.image-generation-workspace-page,
.cover-generation-workspace-page {
diff --git a/apps/web/src/features/projects/ProjectsPage.test.tsx b/apps/web/src/features/projects/ProjectsPage.test.tsx
index 3fc627da..78515058 100644
--- a/apps/web/src/features/projects/ProjectsPage.test.tsx
+++ b/apps/web/src/features/projects/ProjectsPage.test.tsx
@@ -73,7 +73,8 @@ describe('ProjectsPage', () => {
it.each([
['video-translation', '/dashboard/templates/video-translation-project-cover.png'],
- ['video-download', '/dashboard/templates/video-download-project-cover.png']
+ ['video-download', '/dashboard/templates/video-download-project-cover.png'],
+ ['video-generation', '/dashboard/templates/animated-story.jpg']
])('uses the dedicated fallback cover for %s projects', (templateId, expectedCover) => {
const job = creatorJob({
id: `job_${templateId}_fallback`,
@@ -88,6 +89,53 @@ describe('ProjectsPage', () => {
.toHaveAttribute('src', expectedCover);
});
+ it('shows a video generation Creator job and requests its generated frame cover', async () => {
+ const createObjectUrlDescriptor = Object.getOwnPropertyDescriptor(URL, 'createObjectURL');
+ const revokeObjectUrlDescriptor = Object.getOwnPropertyDescriptor(URL, 'revokeObjectURL');
+ Object.defineProperty(URL, 'createObjectURL', {
+ configurable: true,
+ value: vi.fn(() => 'blob:generated-video-cover')
+ });
+ Object.defineProperty(URL, 'revokeObjectURL', {
+ configurable: true,
+ value: vi.fn()
+ });
+ const job = creatorJob({
+ id: 'job_video_generation',
+ templateId: 'video-generation',
+ state: { prompt: '雨夜中的未来城市' },
+ updatedAt: '2026-09-07T08:00:00.000Z',
+ artifacts: [artifact('job_video_generation', 'generated_video', 'generated.mp4')]
+ });
+ const service = {
+ openProjectCover: vi.fn(async () => new Response(
+ new Blob(['jpeg'], { type: 'image/jpeg' })
+ ))
+ };
+
+ const rendered = render(
+ <ProjectsPage
+ jobs={[job]}
+ workspaces={workspaces}
+ service={service}
+ onOpenJob={vi.fn()}
+ />
+ );
+ try {
+ expect(screen.getByText('视频生成')).toBeInTheDocument();
+ expect(screen.getByRole('button', { name: '打开项目 雨夜中的未来城市' }))
+ .toBeInTheDocument();
+ await waitFor(() => expect(service.openProjectCover).toHaveBeenCalledWith(job.id));
+ await waitFor(() => expect(
+ screen.getByRole('button', { name: '打开项目 雨夜中的未来城市' }).querySelector('img')
+ ).toHaveAttribute('src', 'blob:generated-video-cover'));
+ } finally {
+ rendered.unmount();
+ restoreUrlMethod('createObjectURL', createObjectUrlDescriptor);
+ restoreUrlMethod('revokeObjectURL', revokeObjectUrlDescriptor);
+ }
+ });
+
it('falls back from unavailable platform thumbnails to the authenticated runtime cover', async () => {
const createObjectUrlDescriptor = Object.getOwnPropertyDescriptor(URL, 'createObjectURL');
const revokeObjectUrlDescriptor = Object.getOwnPropertyDescriptor(URL, 'revokeObjectURL');
diff --git a/apps/web/src/features/projects/ProjectsPage.tsx b/apps/web/src/features/projects/ProjectsPage.tsx
index 5b8dff70..a452b43d 100644
--- a/apps/web/src/features/projects/ProjectsPage.tsx
+++ b/apps/web/src/features/projects/ProjectsPage.tsx
@@ -24,7 +24,8 @@ const projectCoverArtifactKinds = new Set([
'dubbed_video',
'auto_clip_video',
'stickman_video',
- 'clip_video'
+ 'clip_video',
+ 'generated_video'
]);
type CreatorProject = {
@@ -359,6 +360,19 @@ function creatorDraftDefaults(templateId: string): Record<string, unknown[]> {
currentStage: [null]
};
}
+ if (templateId === 'video-generation') {
+ return {
+ prompt: [''],
+ provider: ['seedance'],
+ size: ['1280x720'],
+ duration: [5],
+ referenceImageArtifactId: [null],
+ currentStep: [0],
+ furthestStep: [0],
+ resultVersion: [null],
+ currentStage: [null]
+ };
+ }
if (templateId === 'auto-clip') {
return {
sourceUrl: [''],
@@ -473,6 +487,7 @@ function templateLabel(templateId: string, l: LocalizeCopy): string | undefined
if (templateId === 'auto-clip') return l('自动剪辑', 'Auto clips');
if (templateId === 'cover') return l('封面生成', 'Thumbnail generation');
if (templateId === 'image-generation') return l('图像生成', 'Image generation');
+ if (templateId === 'video-generation') return l('视频生成', 'Video generation');
if (templateId === 'stickman-video') return l('火柴人视频', 'Stick figure video');
return undefined;
}
@@ -500,6 +515,7 @@ function projectCover(templateId: string): string {
}
if (templateId === 'cover') return '/dashboard/templates/image-generation-project-cover.png';
if (templateId === 'image-generation') return '/dashboard/templates/image-generation-project-cover.png';
+ if (templateId === 'video-generation') return '/dashboard/templates/animated-story.jpg';
if (templateId === 'stickman-video') return '/dashboard/templates/ai-video-insane.jpg';
if (templateId === 'auto-clip') return '/dashboard/templates/animated-story.jpg';
return '/dashboard/templates/digital-presenter.jpg';
diff --git a/apps/web/src/features/settings/CreatorServicesSettingsView.test.tsx b/apps/web/src/features/settings/CreatorServicesSettingsView.test.tsx
index 5ca82df6..cf58e064 100644
--- a/apps/web/src/features/settings/CreatorServicesSettingsView.test.tsx
+++ b/apps/web/src/features/settings/CreatorServicesSettingsView.test.tsx
@@ -231,11 +231,15 @@ describe('CreatorServicesSettingsView', () => {
await user.click(screen.getByRole('tab', { name: '视频生成' }));
expect(screen.getByRole('combobox', { name: '服务商' })).toHaveTextContent('Seedance');
- expect(screen.getByLabelText('模型')).toHaveValue('doubao-seedance-1-0-pro-250528');
+ expect(screen.getByLabelText('默认模型')).toHaveValue('doubao-seedance-2-5-260628');
+ expect(screen.getByLabelText('默认模型')).toHaveAttribute(
+ 'list',
+ 'video-seedance-model-suggestions'
+ );
expect(screen.getByLabelText('API Key')).toHaveAttribute('type', 'password');
await user.click(screen.getByRole('combobox', { name: '服务商' }));
await user.click(screen.getByRole('option', { name: 'Veo' }));
- expect(screen.getByLabelText('模型')).toHaveValue('veo-3.1-generate-preview');
+ expect(screen.getByLabelText('默认模型')).toHaveValue('veo-3.1-generate-preview');
});
it('keeps non-model services available when the model provider cannot be read', async () => {
diff --git a/apps/web/src/features/settings/CreatorServicesSettingsView.tsx b/apps/web/src/features/settings/CreatorServicesSettingsView.tsx
index 8e978630..c17b34b8 100644
--- a/apps/web/src/features/settings/CreatorServicesSettingsView.tsx
+++ b/apps/web/src/features/settings/CreatorServicesSettingsView.tsx
@@ -1,5 +1,7 @@
import {
createDefaultCreatorServicesConfig,
+ defaultVideoGenerationModels,
+ videoGenerationModelIds,
type CodexProviderConfig,
type AliyunOssConfig,
type AliyunSpeechConfig,
@@ -789,7 +791,10 @@ function VideoSettings(props: SettingsGroupProps) {
return (
<SettingsFieldset
title={l('视频生成', 'Video generation')}
- description={l('配置 Seedance、可灵或 Veo 视频生成服务。', 'Configure Seedance, Kling, or Veo video generation.')}
+ description={l(
+ '配置 Seedance、可灵或 Veo 视频生成服务,以及新任务使用的默认模型。',
+ 'Configure Seedance, Kling, or Veo video generation and the default model for new tasks.'
+ )}
>
<SelectField
id="video-provider"
@@ -804,9 +809,9 @@ function VideoSettings(props: SettingsGroupProps) {
config.video.provider = value as CreatorServicesConfig['video']['provider'];
})}
/>
- {provider === 'seedance' ? <OpenAiFields id="video-seedance" credential="video.seedance.apiKey" configuredCredentials={props.configuredCredentials} value={props.config.video.seedance} modelPlaceholder="doubao-seedance-1-0-pro-250528" baseUrlPlaceholder="https://ark.cn-beijing.volces.com/api/v3" onChange={value => props.update(config => { config.video.seedance = value; })} /> : null}
- {provider === 'kling' ? <KlingFields id="video-kling" accessKeyCredential="video.kling.accessKey" secretKeyCredential="video.kling.secretKey" configuredCredentials={props.configuredCredentials} value={props.config.video.kling} modelPlaceholder="kling-v2-1-master" onChange={value => props.update(config => { config.video.kling = value; })} /> : null}
- {provider === 'veo' ? <OpenAiFields id="video-veo" credential="video.veo.apiKey" configuredCredentials={props.configuredCredentials} value={props.config.video.veo} modelPlaceholder="veo-3.1-generate-preview" baseUrlPlaceholder="https://generativelanguage.googleapis.com/v1beta" onChange={value => props.update(config => { config.video.veo = value; })} /> : null}
+ {provider === 'seedance' ? <OpenAiFields id="video-seedance" credential="video.seedance.apiKey" configuredCredentials={props.configuredCredentials} value={props.config.video.seedance} modelLabel={l('默认模型', 'Default model')} modelPlaceholder={defaultVideoGenerationModels.seedance} modelSuggestions={videoGenerationModelIds.seedance} baseUrlPlaceholder="https://ark.cn-beijing.volces.com/api/v3" onChange={value => props.update(config => { config.video.seedance = value; })} /> : null}
+ {provider === 'kling' ? <KlingFields id="video-kling" accessKeyCredential="video.kling.accessKey" secretKeyCredential="video.kling.secretKey" configuredCredentials={props.configuredCredentials} value={props.config.video.kling} modelLabel={l('默认模型', 'Default model')} modelPlaceholder={defaultVideoGenerationModels.kling} modelSuggestions={videoGenerationModelIds.kling} onChange={value => props.update(config => { config.video.kling = value; })} /> : null}
+ {provider === 'veo' ? <OpenAiFields id="video-veo" credential="video.veo.apiKey" configuredCredentials={props.configuredCredentials} value={props.config.video.veo} modelLabel={l('默认模型', 'Default model')} modelPlaceholder={defaultVideoGenerationModels.veo} modelSuggestions={videoGenerationModelIds.veo} baseUrlPlaceholder="https://generativelanguage.googleapis.com/v1beta" onChange={value => props.update(config => { config.video.veo = value; })} /> : null}
</SettingsFieldset>
);
}
@@ -834,6 +839,8 @@ function OpenAiFields(props: {
configuredCredentials: ReadonlySet<CreatorServicesCredentialField>;
value: OpenAiCompatibleConfig;
modelPlaceholder: string;
+ modelLabel?: string;
+ modelSuggestions?: readonly string[];
modelReadonly?: boolean;
baseUrlPlaceholder?: string;
onChange(value: OpenAiCompatibleConfig): void;
@@ -857,13 +864,14 @@ function OpenAiFields(props: {
onChange={apiKey => props.onChange({ ...props.value, apiKey })}
/>
{props.modelReadonly ? (
- <ReadonlyModelField label={l('模型', 'Model')} value={props.modelPlaceholder} />
+ <ReadonlyModelField label={props.modelLabel ?? l('模型', 'Model')} value={props.modelPlaceholder} />
) : (
<TextField
id={`${props.id}-model`}
- label={l('模型', 'Model')}
+ label={props.modelLabel ?? l('模型', 'Model')}
value={props.value.model}
placeholder={props.modelPlaceholder}
+ suggestions={props.modelSuggestions}
onChange={model => props.onChange({ ...props.value, model })}
/>
)}
@@ -878,6 +886,8 @@ function KlingFields(props: {
configuredCredentials: ReadonlySet<CreatorServicesCredentialField>;
value: KlingAiConfig;
modelPlaceholder: string;
+ modelLabel?: string;
+ modelSuggestions?: readonly string[];
onChange(value: KlingAiConfig): void;
}) {
return (
@@ -885,7 +895,7 @@ function KlingFields(props: {
<TextField id={`${props.id}-base-url`} label="Base URL" value={props.value.baseUrl} placeholder="https://api-beijing.klingai.com" onChange={baseUrl => props.onChange({ ...props.value, baseUrl })} wide />
<PasswordField id={`${props.id}-access-key`} label="Access Key" value={props.value.accessKey} configured={props.configuredCredentials.has(props.accessKeyCredential)} onChange={accessKey => props.onChange({ ...props.value, accessKey })} />
<PasswordField id={`${props.id}-secret-key`} label="Secret Key" value={props.value.secretKey} configured={props.configuredCredentials.has(props.secretKeyCredential)} onChange={secretKey => props.onChange({ ...props.value, secretKey })} />
- <TextField id={`${props.id}-model`} label="Model" value={props.value.model} placeholder={props.modelPlaceholder} onChange={model => props.onChange({ ...props.value, model })} />
+ <TextField id={`${props.id}-model`} label={props.modelLabel ?? 'Model'} value={props.value.model} placeholder={props.modelPlaceholder} suggestions={props.modelSuggestions} onChange={model => props.onChange({ ...props.value, model })} />
</>
);
}
@@ -954,6 +964,7 @@ function TextField(props: {
label: string;
value: string;
placeholder?: string;
+ suggestions?: readonly string[];
wide?: boolean;
onChange(value: string): void;
}) {
@@ -965,10 +976,16 @@ function TextField(props: {
type="text"
value={props.value}
placeholder={props.placeholder}
+ list={props.suggestions?.length ? `${props.id}-suggestions` : undefined}
spellCheck={false}
autoComplete="off"
onChange={event => props.onChange(event.target.value)}
/>
+ {props.suggestions?.length ? (
+ <datalist id={`${props.id}-suggestions`}>
+ {props.suggestions.map(value => <option key={value} value={value} />)}
+ </datalist>
+ ) : null}
</label>
);
}
diff --git a/packages/config/src/index.test.ts b/packages/config/src/index.test.ts
index e1616910..19ce0fa2 100644
--- a/packages/config/src/index.test.ts
+++ b/packages/config/src/index.test.ts
@@ -1,17 +1,12 @@
import {
- existsSync,
- mkdirSync,
mkdtempSync,
- readFileSync,
- rmSync,
- writeFileSync
+ rmSync
} from 'node:fs';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { afterEach, describe, expect, it } from 'vitest';
import {
readOpenCreatorConfig,
- migrateDirectoryIfEmpty,
resolveOpenCreatorPaths,
resolveUiSettings,
updateOpenCreatorUiSettings
@@ -57,41 +52,15 @@ describe('OpenCreator config', () => {
}).root).toBe('/tmp/opencreator-explicit');
});
- it('archives a Clawee config before writing OpenCreator settings', () => {
+ it('creates OpenCreator settings from an empty product directory', () => {
const root = mkdtempSync(join(tmpdir(), 'opencreator-config-'));
tempDirs.push(root);
const path = join(root, 'config.toml');
- writeFileSync(path, 'gateway = "https://legacy.example"\nagent_id = "legacy"\n');
expect(resolveUiSettings(readOpenCreatorConfig(path)).accentColor).toBe('red');
- expect(existsSync(join(root, 'legacy', 'clawee-config.toml'))).toBe(true);
- expect(existsSync(path)).toBe(false);
updateOpenCreatorUiSettings(path, { colorMode: 'light' });
- const source = readFileSync(path, 'utf8');
- expect(source).toContain('[ui]');
- expect(source).toContain('color_mode = "light"');
- expect(source).not.toContain('agent_id');
- });
-
- it('copies a legacy directory only when the target is empty', () => {
- const root = mkdtempSync(join(tmpdir(), 'opencreator-config-'));
- tempDirs.push(root);
- const source = join(root, 'legacy');
- const target = join(root, 'next');
- mkdirSync(source);
- writeFileSync(join(source, 'state.json'), '{"ok":true}\n');
-
- expect(migrateDirectoryIfEmpty(source, target)).toMatchObject({
- migrated: true,
- source,
- target
- });
- expect(readFileSync(join(target, 'state.json'), 'utf8')).toContain('"ok":true');
- expect(migrateDirectoryIfEmpty(source, target)).toEqual({
- migrated: false,
- reason: 'TARGET_EXISTS'
- });
+ expect(resolveUiSettings(readOpenCreatorConfig(path)).colorMode).toBe('light');
});
});
diff --git a/packages/config/src/index.ts b/packages/config/src/index.ts
index e520705a..c95cadf4 100644
--- a/packages/config/src/index.ts
+++ b/packages/config/src/index.ts
@@ -1,13 +1,10 @@
import {
chmodSync,
closeSync,
- cpSync,
existsSync,
- lstatSync,
mkdirSync,
openSync,
readFileSync,
- readdirSync,
renameSync,
rmSync,
statSync,
@@ -40,7 +37,6 @@ export type OpenCreatorDesktopConfig = {
notificationsEnabled: boolean;
codexBin?: string;
successfulCodexBin?: string;
- importedRuntimeSource?: string;
window?: {
x?: number;
y?: number;
@@ -73,10 +69,6 @@ export type OpenCreatorConfigSnapshot = {
};
};
-export type DirectoryMigrationResult =
- | { migrated: true; source: string; target: string }
- | { migrated: false; reason: 'SOURCE_MISSING' | 'TARGET_EXISTS' };
-
const defaultUiSettings: OpenCreatorUiSettings = {
language: 'system',
colorMode: 'dark',
@@ -119,36 +111,6 @@ export function resolveOpenCreatorPaths(input: {
};
}
-export function migrateDirectoryIfEmpty(
- sourcePath: string,
- targetPath: string
-): DirectoryMigrationResult {
- const source = resolve(sourcePath);
- const target = resolve(targetPath);
- if (!existsSync(source)) return { migrated: false, reason: 'SOURCE_MISSING' };
- if (existsSync(target) && readDirectoryHasEntries(target)) {
- return { migrated: false, reason: 'TARGET_EXISTS' };
- }
- assertPortableDirectory(source);
- mkdirSync(dirname(target), { recursive: true, mode: 0o700 });
- const temporary = `${target}.migration-${process.pid}`;
- rmSync(temporary, { recursive: true, force: true });
- try {
- cpSync(source, temporary, {
- recursive: true,
- errorOnExist: true,
- force: false
- });
- assertPortableDirectory(temporary);
- rmSync(target, { recursive: true, force: true });
- renameSync(temporary, target);
- return { migrated: true, source, target };
- } catch (error) {
- rmSync(temporary, { recursive: true, force: true });
- throw error;
- }
-}
-
export function readOpenCreatorConfig(path: string): OpenCreatorConfigSnapshot {
return withConfigLock(path, () => readOpenCreatorConfigUnlocked(path));
}
@@ -180,10 +142,6 @@ function readOpenCreatorConfigUnlocked(path: string): OpenCreatorConfigSnapshot
const source = readFileSync(path, 'utf8');
const parsed = parse(source) as unknown;
if (!isRecord(parsed)) throw new Error('OPENCREATOR_CONFIG_INVALID');
- if (isLegacyClaweeConfig(parsed)) {
- archiveLegacyClaweeConfig(path);
- return snapshot({ version: 1 });
- }
return snapshot(normalizeDocument(parsed));
}
@@ -316,13 +274,6 @@ function normalizeDesktopConfig(value: unknown): OpenCreatorDesktopConfig {
source.successfulCodexBin ?? source.successful_codex_bin
)
}),
- ...(nonEmptyString(source.importedRuntimeSource ?? source.imported_runtime_source) === undefined
- ? {}
- : {
- importedRuntimeSource: nonEmptyString(
- source.importedRuntimeSource ?? source.imported_runtime_source
- )
- }),
...(window === undefined ? {} : { window })
};
}
@@ -381,9 +332,6 @@ function serializeDesktop(value: OpenCreatorDesktopConfig): Record<string, unkno
...(value.successfulCodexBin === undefined
? {}
: { successful_codex_bin: value.successfulCodexBin }),
- ...(value.importedRuntimeSource === undefined
- ? {}
- : { imported_runtime_source: value.importedRuntimeSource }),
...(value.window === undefined ? {} : { window: value.window })
};
}
@@ -397,50 +345,6 @@ function serializeRuntime(value: OpenCreatorRuntimeConfig): Record<string, unkno
};
}
-function readDirectoryHasEntries(path: string): boolean {
- const stat = lstatSync(path);
- if (stat.isSymbolicLink() || !stat.isDirectory()) return true;
- return readFileSystemEntries(path).length > 0;
-}
-
-function assertPortableDirectory(path: string): void {
- const stat = lstatSync(path);
- if (stat.isSymbolicLink() || !stat.isDirectory()) {
- throw new Error(`OPENCREATOR_MIGRATION_SOURCE_INVALID: ${path}`);
- }
- for (const entry of readFileSystemEntries(path)) {
- const child = join(path, entry);
- const childStat = lstatSync(child);
- if (childStat.isSymbolicLink()) {
- throw new Error(`OPENCREATOR_MIGRATION_SYMLINK_REJECTED: ${child}`);
- }
- if (childStat.isDirectory()) assertPortableDirectory(child);
- }
-}
-
-function readFileSystemEntries(path: string): string[] {
- return readdirSync(path);
-}
-
-function archiveLegacyClaweeConfig(path: string): void {
- const legacyDir = join(dirname(path), 'legacy');
- mkdirSync(legacyDir, { recursive: true, mode: 0o700 });
- let destination = join(legacyDir, 'clawee-config.toml');
- let suffix = 2;
- while (existsSync(destination)) {
- destination = join(legacyDir, `clawee-config-${suffix}.toml`);
- suffix += 1;
- }
- renameSync(path, destination);
-}
-
-function isLegacyClaweeConfig(value: Record<string, unknown>): boolean {
- const keys = Object.keys(value);
- return keys.length > 0
- && keys.every(key => key === 'gateway' || key === 'agent_id')
- && (typeof value.gateway === 'string' || typeof value.agent_id === 'string');
-}
-
function withConfigLock<Result>(path: string, action: () => Result): Result {
mkdirSync(dirname(path), { recursive: true, mode: 0o700 });
if (process.platform !== 'win32') chmodSync(dirname(path), 0o700);
diff --git a/packages/protocol/src/creator-services.ts b/packages/protocol/src/creator-services.ts
index c6ef5359..7a2d1ef9 100644
--- a/packages/protocol/src/creator-services.ts
+++ b/packages/protocol/src/creator-services.ts
@@ -219,19 +219,20 @@ export function createDefaultCreatorServicesConfig(): CreatorServicesConfig {
seedance: {
baseUrl: 'https://ark.cn-beijing.volces.com/api/v3',
apiKey: '',
- model: 'doubao-seedance-1-0-pro-250528'
+ model: defaultVideoGenerationModels.seedance
},
kling: {
baseUrl: 'https://api-beijing.klingai.com',
accessKey: '',
secretKey: '',
- model: 'kling-v2-1-master'
+ model: defaultVideoGenerationModels.kling
},
veo: {
baseUrl: 'https://generativelanguage.googleapis.com/v1beta',
apiKey: '',
- model: 'veo-3.1-generate-preview'
+ model: defaultVideoGenerationModels.veo
}
}
};
}
+import { defaultVideoGenerationModels } from './media-generation.js';
diff --git a/packages/protocol/src/media-generation.ts b/packages/protocol/src/media-generation.ts
index 51d2bf73..780cbf17 100644
--- a/packages/protocol/src/media-generation.ts
+++ b/packages/protocol/src/media-generation.ts
@@ -60,6 +60,26 @@ export type VideoGenerationDuration = typeof videoGenerationDurations[number];
export type VideoGenerationStatus = 'queued' | 'in_progress' | 'completed' | 'failed';
export type VideoGenerationProvider = 'seedance' | 'kling' | 'veo';
+export const videoGenerationModelIds = {
+ seedance: [
+ 'doubao-seedance-2-5-260628',
+ 'doubao-seedance-2-0-260128',
+ 'doubao-seedance-2-0-fast-260128',
+ 'doubao-seedance-2-0-mini-260615',
+ 'doubao-seedance-1-5-pro-251215',
+ 'doubao-seedance-1-0-pro-fast-251015',
+ 'doubao-seedance-1-0-pro-250528'
+ ],
+ kling: ['kling-v2-1-master'],
+ veo: ['veo-3.1-generate-preview']
+} as const;
+
+export const defaultVideoGenerationModels = {
+ seedance: videoGenerationModelIds.seedance[0],
+ kling: videoGenerationModelIds.kling[0],
+ veo: videoGenerationModelIds.veo[0]
+} satisfies Record<VideoGenerationProvider, string>;
+
export type VideoGenerationReferenceImage = {
mime: 'image/jpeg' | 'image/png' | 'image/webp';
data: string;
@@ -68,6 +88,7 @@ export type VideoGenerationReferenceImage = {
export type CreateVideoGenerationRequest = {
prompt: string;
provider: VideoGenerationProvider;
+ model?: string;
size: VideoGenerationSize;
duration: VideoGenerationDuration;
referenceImage?: VideoGenerationReferenceImage;
@@ -82,6 +103,7 @@ export type VideoGenerationResult = {
duration: VideoGenerationDuration;
status: VideoGenerationStatus;
progress: number;
+ progressKnown?: boolean;
fileName?: string;
mime?: 'video/mp4';
size?: number;