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.
TypeScript agent-skillscodex-clideskop-appdubbingimage-generationlocalizationskillsttsvideo-editingvideo-generationvideo-transcriptionvideo-translation
feat: add creator preset template system
wulien15b3cc7e5e87
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.ymlindex db203b19..7626f508 100644--- a/.github/workflows/ci.yml+++ b/.github/workflows/ci.yml@@ -27,6 +27,7 @@ jobs:go-version-file: runtime/krillinai/go.modcache-dependency-path: runtime/krillinai/go.sum- run: pnpm install --frozen-lockfile+ - run: pnpm templates:ci- name: Audit high severity dependenciesrun: pnpm audit --audit-level high --ignore-registry-errorstimeout-minutes: 5diff --git a/apps/daemon/package.json b/apps/daemon/package.jsonindex 7787ab41..01e4cce5 100644--- a/apps/daemon/package.json+++ b/apps/daemon/package.json@@ -11,21 +11,24 @@"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","test": "vitest run --passWithNoTests",+ "templates:validate": "tsx --tsconfig tsconfig.scripts.json scripts/creator-presets.ts validate",+ "templates:compile": "tsx --tsconfig tsconfig.scripts.json scripts/creator-presets.ts compile","generate:codex-protocol": "node scripts/generate-codex-app-server-protocol.mjs","verify:schedule-upgrade": "node --import tsx scripts/verify-scheduled-task-upgrade.ts"},"dependencies": {- "@opencreator/config": "workspace:*",- "@opencreator/protocol": "workspace:*",- "@opencreator/skill-market": "workspace:*","@fastify/cors": "^11.0.1","@iarna/toml": "2.2.5","@modelcontextprotocol/sdk": "1.29.0",+ "@opencreator/config": "workspace:*",+ "@opencreator/protocol": "workspace:*",+ "@opencreator/skill-market": "workspace:*","better-sqlite3": "^12.11.1","cron-parser": "^5.6.1","cross-spawn": "^7.0.6","fastify": "^5.2.1","https-proxy-agent": "^7.0.6",+ "image-size": "2.0.2","nanoid": "^5.0.9","yaml": "^2.8.1","zod": "^3.25.76"diff --git a/apps/daemon/scripts/creator-presets.ts b/apps/daemon/scripts/creator-presets.tsnew file mode 100644index 00000000..f51dd3f8--- /dev/null+++ b/apps/daemon/scripts/creator-presets.ts@@ -0,0 +1,34 @@+import path from 'node:path';+import process from 'node:process';+import {+ compileCreatorPresets,+ validateCreatorPresets+} from '../src/creator/presets/compiler.js';++const command = process.argv[2];+const repositoryRoot = path.resolve(import.meta.dirname, '../../..');+const sourceRoot = path.resolve(+ process.env.OPENCREATOR_PRESET_SOURCE_ROOT ?? path.join(repositoryRoot, 'template')+);+const outputRoot = path.resolve(+ process.env.OPENCREATOR_PRESET_CATALOG_ROOT+ ?? path.join(repositoryRoot, '.runtime/generated/creator-presets')+);++try {+ if (command === 'validate') {+ const catalog = await validateCreatorPresets({ sourceRoot });+ process.stdout.write(`Validated ${catalog.presets.length} creator presets.\n`);+ } else if (command === 'compile') {+ const manifest = await compileCreatorPresets({ sourceRoot, outputRoot });+ process.stdout.write(+ `Compiled creator presets: catalog=${manifest.catalogHash} assets=${manifest.assetSetHash}\n`+ );+ } else {+ process.stderr.write('Usage: creator-presets.ts <validate|compile>\n');+ process.exitCode = 2;+ }+} catch (error) {+ process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);+ process.exitCode = 1;+}diff --git a/apps/daemon/src/api/routes.creator.ts b/apps/daemon/src/api/routes.creator.tsindex 39986be2..bf98051d 100644--- a/apps/daemon/src/api/routes.creator.ts+++ b/apps/daemon/src/api/routes.creator.ts@@ -13,6 +13,7 @@ import type {CreatorStageRun,RuntimeErrorCode} from '@opencreator/protocol';+import { isCreateCreatorJobRequest } from '@opencreator/protocol';import { createHash } from 'node:crypto';import { createReadStream } from 'node:fs';import { rm, stat } from 'node:fs/promises';@@ -29,6 +30,7 @@ import {CreatorServiceError,type CreatorService} from '../creator/service.js';+import { CreatorRepositoryDataError } from '../creator/repository.js';import { formatSseEvent } from './sse.js';import { apiError } from './errors.js';import type { CreatorAgentService } from '../creator/agent/agent-service.js';@@ -60,6 +62,11 @@ import {CreatorSourceUploadError,type CreatorSourceUploadService} from '../creator/source-upload.js';+import {+ normalizeCreatorPresetLocale,+ resolveCreatorPresetAsset+} from '../creator/presets/catalog.js';+import type { CreatorPresetRegistry } from '../creator/presets/types.js';export async function registerCreatorRoutes(server: FastifyInstance,@@ -77,8 +84,33 @@ export async function registerCreatorRoutes(jobsRoot: string;dispatcher: CreatorCommandDispatcher;stageRunner?: Pick<CreatorStageRunner, 'cancel'>;+ presets: CreatorPresetRegistry;+ presetCatalogRoot: string;}): Promise<void> {+ server.get('/creator/presets', async request => {+ const locale = normalizeCreatorPresetLocale(readObject(request.query).locale);+ return {+ locale,+ catalogHash: options.presets.catalogHash,+ presets: options.presets.listPublished(locale)+ };+ });++ server.get('/creator-presets/:fileName', async (request, reply) => {+ try {+ const { fileName } = request.params as { fileName: string };+ const file = resolveCreatorPresetAsset(options.presetCatalogRoot, fileName);+ const info = await stat(file);+ if (!info.isFile()) throw new Error('Preset asset is not a file');+ reply.type(contentTypeForPresetAsset(fileName));+ reply.header('Cache-Control', 'public, max-age=31536000, immutable');+ return reply.send(createReadStream(file));+ } catch {+ return reply.code(404).send(apiError('creator_preset_not_found', 'Creator preset asset not found'));+ }+ });+if (options.sourceUploadService !== undefined) {server.addContentTypeParser(CREATOR_SOURCE_UPLOAD_CONTENT_TYPE,@@ -197,18 +229,10 @@ export async function registerCreatorRoutes(server.post<{ Body: unknown }>('/creator/jobs', async (request, reply) => {try {- const body = readObject(request.body);- const job = service.createJob({- projectId: readString(body.projectId, 'projectId'),- templateId: readString(body.templateId, 'templateId'),- ...(body.templateVersion === undefined- ? {}- : { templateVersion: readInteger(body.templateVersion, 'templateVersion') }),- ...(body.state === undefined ? {} : { state: readObject(body.state) as CreateCreatorJobRequest['state'] }),- ...(body.creationKey === undefined- ? {}- : { creationKey: readString(body.creationKey, 'creationKey') })- });+ if (!isCreateCreatorJobRequest(request.body)) {+ throw new TypeError('Creator job request is invalid or mixes blank and preset fields');+ }+ const job = await service.createJob(request.body);events.publish({id: `snapshot:${job.revision}`,jobId: job.id,@@ -236,12 +260,16 @@ export async function registerCreatorRoutes(});server.get('/creator/jobs/:id', async (request, reply) => {- const { id } = request.params as { id: string };- const job = service.getJob(id);- if (job === undefined) {- return reply.code(404).send(apiError('creator_job_not_found', 'Creator job not found'));+ try {+ const { id } = request.params as { id: string };+ const job = service.getJob(id);+ if (job === undefined) {+ return reply.code(404).send(apiError('creator_job_not_found', 'Creator job not found'));+ }+ return { job };+ } catch (error) {+ return sendCreatorError(reply, error);}- return { job };});server.delete('/creator/jobs/:id', async (request, reply) => {@@ -688,6 +716,13 @@ export async function registerCreatorRoutes(});}+function contentTypeForPresetAsset(fileName: string): string {+ const extension = extname(fileName).toLowerCase();+ if (extension === '.png') return 'image/png';+ if (extension === '.webp') return 'image/webp';+ return 'image/jpeg';+}+function emptyAgentTimeline(): CreatorAgentHistoryResponse {return {session: null,@@ -824,6 +859,9 @@ function readCreatorAgentSandbox(}function sendCreatorError(reply: FastifyReply, error: unknown) {+ if (error instanceof CreatorRepositoryDataError) {+ return reply.code(500).send(apiError('creator_data_corrupt', error.message));+ }if (error instanceof CreatorArtifactImportError) {return reply.code(error.statusCode).send(apiError(error.code, error.message));diff --git a/apps/daemon/src/api/server.ts b/apps/daemon/src/api/server.tsindex bae31f6b..cfe488df 100644--- a/apps/daemon/src/api/server.ts+++ b/apps/daemon/src/api/server.ts@@ -151,6 +151,12 @@ import {} from '../creator/events.js';import { createCreatorRepository } from '../creator/repository.js';import { createCreatorService, type CreatorService } from '../creator/service.js';+import {+ loadCreatorPresetCatalog,+ resolveCreatorPresetCatalogRoot+} from '../creator/presets/catalog.js';+import { assertCreatorPresetStageRequirement } from '../creator/presets/requirements.js';+import type { CreatorPresetRegistry } from '../creator/presets/types.js';import { createDefaultCreatorTemplateRegistry } from '../creator/templates/registry.js';import { createRunManager, type RunManager } from '../runs/manager.js';import { createPersistentAppServerExecutor } from '../runs/persistent-app-server-executor-2026-07-28.js';@@ -237,6 +243,8 @@ export type BuildServerInput = {creatorServicesConfigStore?: CreatorServicesConfigStore;codexProviderCredentialStore?: CodexProviderCredentialStore;creatorService?: CreatorService;+ creatorPresetRegistry?: CreatorPresetRegistry;+ creatorPresetCatalogRoot?: string;creatorReferenceImageUploadService?: CreatorReferenceImageUploadService;creatorReferenceImageMaxSizeBytes?: number;creatorSourceUploadService?: CreatorSourceUploadService;@@ -405,10 +413,15 @@ export async function buildServer(input: BuildServerInput) {repository: creatorAgentRepository});creatorAgentReconciler.reconcileAfterDaemonRestart();- const creatorService = input.creatorService ?? createCreatorService({- repository: creatorRepository,- templates: createDefaultCreatorTemplateRegistry()- });+ const creatorTemplates = createDefaultCreatorTemplateRegistry();+ const creatorPresetCatalogRoot = resolve(+ input.creatorPresetCatalogRoot ?? resolveCreatorPresetCatalogRoot()+ );+ const creatorPresetRegistry = input.creatorPresetRegistry+ ?? await loadCreatorPresetCatalog({+ root: creatorPresetCatalogRoot,+ templates: creatorTemplates+ });const agentCapabilityTokens =input.agentCapabilityTokens ?? createAgentCapabilityTokenStore();const runtimeTransport = input.runtimeTransport ?? 'app-server';@@ -487,6 +500,12 @@ export async function buildServer(input: BuildServerInput) {}});+ const creatorService = input.creatorService ?? createCreatorService({+ repository: creatorRepository,+ templates: creatorTemplates,+ presets: creatorPresetRegistry,+ creatorServicesConfig: creatorServicesConfigStore+ });const creatorRuntimeRoot = process.env.OPENCREATOR_CREATOR_RUNTIME_ROOT?? join(runtimeDir, 'krillinai');const creatorJobsRoot = join(creatorDir, 'jobs');@@ -646,6 +665,13 @@ export async function buildServer(input: BuildServerInput) {templates: creatorService.templates,workRoot: creatorJobsRoot,executors: creatorExecutors,+ async beforeRun(job, stageId) {+ assertCreatorPresetStageRequirement({+ job,+ stageId,+ services: await creatorServicesConfigStore.read()+ });+ },onJobChanged(job) {creatorEvents.publish({id: `snapshot:${job.revision}`,@@ -1023,7 +1049,9 @@ export async function buildServer(input: BuildServerInput) {sourceUploadService: creatorSourceUploadService,artifactImportService: creatorArtifactImportService,dispatcher: creatorCommandDispatcher,- stageRunner: creatorStageRunner+ stageRunner: creatorStageRunner,+ presets: creatorPresetRegistry,+ presetCatalogRoot: creatorPresetCatalogRoot});await registerAttachmentRoutes(server, attachmentService, {maxSizeBytes: input.attachmentMaxSizeBytesdiff --git a/apps/daemon/src/creator/creation-fingerprint.ts b/apps/daemon/src/creator/creation-fingerprint.tsnew file mode 100644index 00000000..2868b2a4--- /dev/null+++ b/apps/daemon/src/creator/creation-fingerprint.ts@@ -0,0 +1,84 @@+import { createHash } from 'node:crypto';+import type {+ CreatorJson,+ CreatorPresetRef+} from '@opencreator/protocol';++export type BlankCreationFingerprint = {+ mode: 'blank';+ projectId: string;+ templateId: string;+ templateVersion: number;+ resolvedStateHash: string;+};++export type PresetCreationFingerprint = {+ mode: 'preset';+ projectId: string;+ preset: CreatorPresetRef & { contentHash: string };+ locale: 'zh-CN' | 'en-US';+ templateId: string;+ templateVersion: number;+ resolvedStateHash: string;+};++export function createBlankCreationFingerprint(input: {+ projectId: string;+ templateId: string;+ templateVersion: number;+ state: Record<string, CreatorJson>;+}): string {+ return hashFingerprint({+ mode: 'blank',+ projectId: input.projectId,+ templateId: input.templateId,+ templateVersion: input.templateVersion,+ resolvedStateHash: hashCreatorState(input.state)+ });+}++export function createPresetCreationFingerprint(input: {+ projectId: string;+ preset: CreatorPresetRef & { contentHash: string };+ locale: 'zh-CN' | 'en-US';+ templateId: string;+ templateVersion: number;+ state: Record<string, CreatorJson>;+}): string {+ return hashFingerprint({+ mode: 'preset',+ projectId: input.projectId,+ preset: input.preset,+ locale: input.locale,+ templateId: input.templateId,+ templateVersion: input.templateVersion,+ resolvedStateHash: hashCreatorState(input.state)+ });+}++export function hashCreatorState(state: Record<string, CreatorJson>): string {+ return sha256(canonicalCreatorJson(state));+}++export function canonicalCreatorJson(value: CreatorJson | Record<string, CreatorJson>): string {+ if (Array.isArray(value)) {+ return `[${value.map(item => canonicalCreatorJson(item)).join(',')}]`;+ }+ if (value !== null && typeof value === 'object') {+ return `{${Object.entries(value)+ .sort(([left], [right]) => left.localeCompare(right))+ .map(([key, child]) => `${JSON.stringify(key)}:${canonicalCreatorJson(child)}`)+ .join(',')}}`;+ }+ return JSON.stringify(value);+}++function hashFingerprint(+ value: BlankCreationFingerprint | PresetCreationFingerprint+): string {+ return sha256(canonicalCreatorJson(value as unknown as Record<string, CreatorJson>));+}++function sha256(value: string): string {+ return createHash('sha256').update(value).digest('hex');+}diff --git a/apps/daemon/src/creator/executor.ts b/apps/daemon/src/creator/executor.tsindex 712bb46b..430e3e67 100644--- a/apps/daemon/src/creator/executor.ts+++ b/apps/daemon/src/creator/executor.ts@@ -34,7 +34,11 @@ export interface CreatorExecutor {}export class CreatorExecutorError extends Error {- constructor(readonly code: string, message: string) {+ constructor(+ readonly code: string,+ message: string,+ readonly details: Record<string, CreatorJson> = {}+ ) {super(message);this.name = 'CreatorExecutorError';}diff --git a/apps/daemon/src/creator/krillin/adapter.ts b/apps/daemon/src/creator/krillin/adapter.tsindex 2f5d77aa..eb5703bc 100644--- a/apps/daemon/src/creator/krillin/adapter.ts+++ b/apps/daemon/src/creator/krillin/adapter.ts@@ -13,6 +13,7 @@ import type {CreatorExecutorResult} from '../executor.js';import { CreatorExecutorError } from '../executor.js';+import { creatorSubtitleStyleSchema } from '../presets/module-schemas.js';import { validateMediaFile } from '../validators/media.js';import { validateSrtFile } from '../validators/srt.js';import {@@ -133,6 +134,13 @@ export function normalizeKrillinFailure(error: { code?: string; message?: stringmessage: string;} {const message = error?.message ?? 'KrillinAI stage failed';+ if (+ error?.code === 'subtitle_style_load_failed'+ || error?.code === 'default_subtitle_style_load_failed'+ || /(?:fontconfig|fontconfig error|could not load font|failed to find.*font|subtitle style)/i.test(message)+ ) {+ return { code: 'creator_subtitle_style_unsupported', message };+ }if (/OpenAI.*(?:杞綍|转录|transcri)|(?:杞綍|转录|transcri).*OpenAI/i.test(message)) {return { code: 'creator_transcription_config_missing', message };}@@ -168,29 +176,106 @@ function stageOptions(input: CreatorExecutorInput): Record<string, unknown> {export function buildKrillinSubtitleStyle(value: CreatorJson | undefined): Record<string, unknown> | undefined {if (value === null || typeof value !== 'object' || Array.isArray(value)) return undefined;- const style = value as Record<string, CreatorJson>;- const primaryColor = nonEmptyString(style.primaryColor);- const secondaryColor = nonEmptyString(style.secondaryColor);- const outlineColor = nonEmptyString(style.outlineColor);- const outlineWidth = finiteNumber(style.outlineWidth);- const major = compactObject({+ if (Object.keys(value).length === 0) return undefined;+ const parsed = creatorSubtitleStyleSchema.safeParse(value);+ if (!parsed.success) {+ throw new CreatorExecutorError(+ 'creator_subtitle_style_unsupported',+ `Unsupported subtitle style: ${parsed.error.issues.map(issue => issue.message).join('; ')}`+ );+ }+ const style = parsed.data;+ const fontName = `${subtitleFontFamily(style.fontPreset)} ${subtitleWeightName(style.fontWeight)}`;+ const bold = style.fontWeight === 'bold';+ const backColor = assBackColor(style.shadow.color, style.shadow.opacity);+ const shadow = style.shadow.enabled+ ? Math.max(Math.abs(style.shadow.offsetX), Math.abs(style.shadow.offsetY))+ : 0;+ const overrideTags = style.shadow.enabled+ ? `\\xshad${formatAssNumber(style.shadow.offsetX)}\\yshad${formatAssNumber(style.shadow.offsetY)}\\blur${formatAssNumber(style.shadow.blur)}`+ : '';+ const sizes = subtitleFontSizes(style.fontSize);+ const createStyle = (+ name: 'Major' | 'Minor',+ fontSize: number,+ primaryColor: string,+ marginV: number+ ) => ({+ name,+ font_name: fontName,+ font_size: fontSize,primary_color: primaryColor,- outline_color: outlineColor,- outline: outlineWidth- });- const minor = compactObject({- primary_color: secondaryColor,- outline_color: outlineColor,- outline: outlineWidth+ secondary_color: primaryColor,+ outline_color: style.outlineColor,+ back_color: backColor,+ bold,+ italic: false,+ underline: false,+ strike_out: false,+ scale_x: 100,+ scale_y: 100,+ spacing: 0,+ angle: 0,+ border_style: 1,+ outline: style.outlineWidth,+ shadow,+ alignment: 2,+ margin_l: 10,+ margin_r: 10,+ margin_v: marginV,+ encoding: 1,+ override_tags: overrideTags});- if (Object.keys(major).length === 0 && Object.keys(minor).length === 0) return undefined;return {version: 1,- horizontal: { major: { ...major }, minor: { ...minor } },- vertical: { major: { ...major }, minor: { ...minor } }+ horizontal: {+ major: createStyle('Major', sizes.horizontalMajor, style.primaryColor, 20),+ minor: createStyle('Minor', sizes.horizontalMinor, style.secondaryColor, 30)+ },+ vertical: {+ major: createStyle('Major', sizes.verticalMajor, style.primaryColor, 101),+ minor: createStyle('Minor', sizes.verticalMinor, style.secondaryColor, 92)+ }};}+function subtitleFontFamily(preset: 'system' | 'sans' | 'serif' | 'rounded'): string {+ if (preset === 'serif') return 'OpenCreator Serif';+ if (preset === 'rounded') return 'OpenCreator Rounded';+ return 'OpenCreator Sans';+}++function subtitleWeightName(weight: 'regular' | 'medium' | 'bold'): string {+ if (weight === 'medium') return 'Medium';+ if (weight === 'bold') return 'Bold';+ return 'Regular';+}++function subtitleFontSizes(size: 'small' | 'medium' | 'large'): {+ horizontalMajor: number;+ horizontalMinor: number;+ verticalMajor: number;+ verticalMinor: number;+} {+ if (size === 'small') {+ return { horizontalMajor: 12, horizontalMinor: 9, verticalMajor: 10, verticalMinor: 6 };+ }+ if (size === 'large') {+ return { horizontalMajor: 18, horizontalMinor: 12, verticalMajor: 15, verticalMinor: 9 };+ }+ return { horizontalMajor: 14, horizontalMinor: 10, verticalMajor: 12, verticalMinor: 7 };+}++function assBackColor(color: string, opacity: number): string {+ const hex = color.slice(1).toUpperCase();+ const alpha = Math.round(255 * (1 - opacity)).toString(16).padStart(2, '0').toUpperCase();+ return `&H${alpha}${hex.slice(4, 6)}${hex.slice(2, 4)}${hex.slice(0, 2)}`;+}++function formatAssNumber(value: number): string {+ return Number.isInteger(value) ? String(value) : String(Number(value.toFixed(3)));+}+async function writeArtifactIndex(jobsRoot: string,input: CreatorExecutorInputdiff --git a/apps/daemon/src/creator/krillin/cli-runner.ts b/apps/daemon/src/creator/krillin/cli-runner.tsindex b1bdb8dc..f7663852 100644--- a/apps/daemon/src/creator/krillin/cli-runner.ts+++ b/apps/daemon/src/creator/krillin/cli-runner.ts@@ -491,6 +491,16 @@ export async function prepareCliResourceRoot(input: {const overlayBin = join(input.launcherRoot, 'bin');await mkdir(overlayBin, { recursive: true });await linkDirectoryEntries(join(input.resourceRoot, 'bin'), overlayBin);+ const sourceFonts = join(input.resourceRoot, 'fonts');+ try {+ if ((await stat(sourceFonts)).isDirectory()) {+ const overlayFonts = join(input.launcherRoot, 'fonts');+ await mkdir(overlayFonts, { recursive: true });+ await linkDirectoryEntries(sourceFonts, overlayFonts);+ }+ } catch (error) {+ if ((error as NodeJS.ErrnoException).code !== 'ENOENT') throw error;+ }if (input.useWhisperCpp) {await linkDirectoryEntries(join(dependencyBin, 'whispercpp'), overlayBin);}diff --git a/apps/daemon/src/creator/presets/catalog.ts b/apps/daemon/src/creator/presets/catalog.tsnew file mode 100644index 00000000..61ad5e5c--- /dev/null+++ b/apps/daemon/src/creator/presets/catalog.ts@@ -0,0 +1,278 @@+import type {+ CreatorPresetRef,+ CreatorPresetSummary+} from '@opencreator/protocol';+import { existsSync } from 'node:fs';+import { readFile, stat } from 'node:fs/promises';+import path from 'node:path';+import { fileURLToPath } from 'node:url';+import type { CreatorTemplateRegistry } from '../templates/types.js';+import { canonicalJson, sha256 } from './compiler.js';+import { creatorPresetSourceManifestSchema } from './schema.js';+import type {+ CompiledCreatorPreset,+ CreatorPresetBuildManifest,+ CreatorPresetCatalog,+ CreatorPresetLocale,+ CreatorPresetRegistry+} from './types.js';+import { createCreatorPresetHighlights } from './presentation.js';++export async function loadCreatorPresetCatalog(input: {+ root?: string;+ templates: CreatorTemplateRegistry;+}): Promise<CreatorPresetRegistry> {+ const root = path.resolve(input.root ?? resolveCreatorPresetCatalogRoot());+ const catalogPath = path.join(root, 'catalog.json');+ const manifestPath = path.join(root, 'manifest.json');+ const [catalogBytes, manifestBytes] = await Promise.all([+ readFile(catalogPath),+ readFile(manifestPath)+ ]);+ const manifest = parseBuildManifest(manifestBytes, manifestPath);+ const catalogHash = sha256(catalogBytes);+ if (catalogHash !== manifest.catalogHash) {+ throw new Error(`${catalogPath}: catalog hash does not match manifest`);+ }+ const catalog = parseCatalog(catalogBytes, catalogPath);+ const knownFiles = new Set<string>();+ for (const file of manifest.files) {+ if (knownFiles.has(file.path)) {+ throw new Error(`${manifestPath}: duplicate file ${file.path}`);+ }+ knownFiles.add(file.path);+ const absolute = resolveCatalogFile(root, file.path);+ const bytes = await readFile(absolute);+ if (bytes.length !== file.size || sha256(bytes) !== file.sha256) {+ throw new Error(`${absolute}: packaged creator preset resource hash mismatch`);+ }+ }+ if (!knownFiles.has('catalog.json')) {+ throw new Error(`${manifestPath}: catalog.json is missing from the file manifest`);+ }+ const assetEntries = manifest.files+ .filter(file => file.path.startsWith('assets/'))+ .sort((left, right) => left.path.localeCompare(right.path));+ if (sha256(canonicalJson(assetEntries)) !== manifest.assetSetHash) {+ throw new Error(`${manifestPath}: asset set hash does not match`);+ }+ for (const preset of catalog.presets) {+ const asset = preset.cover.asset;+ if (!knownFiles.has(asset)) {+ throw new Error(`${catalogPath}: missing cover asset ${asset}`);+ }+ try {+ input.templates.get(preset.runtimeTemplate.id, preset.runtimeTemplate.version);+ } catch {+ throw new Error(+ `${catalogPath}: incompatible runtime binding `+ + `${preset.runtimeTemplate.id}@${preset.runtimeTemplate.version}`+ );+ }+ }+ return createCreatorPresetRegistry({+ catalog,+ catalogHash+ });+}++export function createCreatorPresetRegistry(input: {+ catalog: CreatorPresetCatalog;+ catalogHash: string;+}): CreatorPresetRegistry {+ const presets = [...input.catalog.presets].sort(comparePresets);+ const byIdentity = new Map(+ presets.map(preset => [identityKey(preset), preset] as const)+ );+ return {+ catalogHash: input.catalogHash,+ listPublished(locale) {+ const latest = new Map<string, CompiledCreatorPreset>();+ for (const preset of presets) {+ if (preset.status !== 'published') continue;+ const key = `${preset.module}/${preset.id}`;+ const current = latest.get(key);+ if (current === undefined || current.version < preset.version) {+ latest.set(key, preset);+ }+ }+ return [...latest.values()]+ .map(preset => localizePreset(preset, locale))+ .sort((left, right) => (+ left.sortOrder - right.sortOrder+ || left.title.localeCompare(right.title)+ || left.module.localeCompare(right.module)+ || left.id.localeCompare(right.id)+ || left.version - right.version+ ));+ },+ get(ref) {+ const preset = byIdentity.get(identityKey(ref));+ if (preset === undefined || preset.status === 'draft') {+ throw new Error(`Unknown creator preset: ${identityKey(ref)}`);+ }+ return preset;+ }+ };+}++export function normalizeCreatorPresetLocale(value: unknown): CreatorPresetLocale {+ return value === 'en-US' ? 'en-US' : 'zh-CN';+}++export function resolveCreatorPresetCatalogRoot(): string {+ const configured = process.env.OPENCREATOR_PRESET_CATALOG_ROOT?.trim();+ if (configured) return path.resolve(configured);++ const moduleDirectory = path.dirname(fileURLToPath(import.meta.url));+ const repositoryCandidate = path.resolve(+ moduleDirectory,+ '../../../../..',+ '.runtime/generated/creator-presets'+ );+ if (existsSync(repositoryCandidate)) return repositoryCandidate;++ return path.resolve(moduleDirectory, '../../../runtime/creator-presets');+}++export function resolveCreatorPresetAsset(+ root: string,+ fileName: string+): string {+ if (!/^[a-f0-9]{64}\.(?:png|jpe?g|webp)$/.test(fileName)) {+ throw new Error('Invalid creator preset asset name');+ }+ return resolveCatalogFile(root, `assets/${fileName}`);+}++function parseCatalog(bytes: Buffer, file: string): CreatorPresetCatalog {+ const value = parseJson(bytes, file);+ if (!isRecord(value) || value.schemaVersion !== 1 || !Array.isArray(value.presets)) {+ throw new Error(`${file}: invalid creator preset catalog`);+ }+ const presets = value.presets.map((candidate, index) => {+ if (!isRecord(candidate) || !isRecord(candidate.cover)) {+ throw new Error(`${file}.presets.${index}: invalid compiled preset`);+ }+ const {+ cover: compiledCover,+ contentHash,+ ...sourceCandidate+ } = candidate;+ const source = creatorPresetSourceManifestSchema.parse({+ ...sourceCandidate,+ cover: compiledCover.source+ });+ if (+ typeof contentHash !== 'string'+ || !/^[a-f0-9]{64}$/.test(contentHash)+ || typeof compiledCover.asset !== 'string'+ || typeof compiledCover.sha256 !== 'string'+ || typeof compiledCover.mime !== 'string'+ || typeof compiledCover.width !== 'number'+ || typeof compiledCover.height !== 'number'+ || typeof compiledCover.size !== 'number'+ ) {+ throw new Error(`${file}.presets.${index}: invalid compiled cover metadata`);+ }+ return {+ ...source,+ cover: compiledCover,+ contentHash+ } as CompiledCreatorPreset;+ });+ const identities = new Set<string>();+ for (const preset of presets) {+ const key = identityKey(preset);+ if (identities.has(key)) throw new Error(`${file}: duplicate preset ${key}`);+ identities.add(key);+ }+ return { schemaVersion: 1, presets };+}++function parseBuildManifest(bytes: Buffer, file: string): CreatorPresetBuildManifest {+ const value = parseJson(bytes, file);+ if (+ !isRecord(value)+ || value.schemaVersion !== 1+ || typeof value.catalogHash !== 'string'+ || typeof value.assetSetHash !== 'string'+ || !Array.isArray(value.files)+ ) {+ throw new Error(`${file}: invalid creator preset build manifest`);+ }+ const files = value.files.map((candidate, index) => {+ if (+ !isRecord(candidate)+ || typeof candidate.path !== 'string'+ || typeof candidate.sha256 !== 'string'+ || typeof candidate.size !== 'number'+ ) {+ throw new Error(`${file}.files.${index}: invalid file entry`);+ }+ return {+ path: candidate.path,+ sha256: candidate.sha256,+ size: candidate.size+ };+ });+ return {+ schemaVersion: 1,+ catalogHash: value.catalogHash,+ assetSetHash: value.assetSetHash,+ files+ };+}++function localizePreset(+ preset: CompiledCreatorPreset,+ locale: CreatorPresetLocale+): CreatorPresetSummary {+ return {+ module: preset.module,+ id: preset.id,+ version: preset.version,+ title: preset.title[locale],+ description: preset.description[locale],+ coverUrl: `/creator-presets/${path.basename(preset.cover.asset)}`,+ tags: preset.tags,+ featured: preset.featured,+ sortOrder: preset.sortOrder,+ requirements: preset.requirements ?? null,+ highlights: createCreatorPresetHighlights(preset, locale)+ };+}++function resolveCatalogFile(root: string, relative: string): string {+ if (relative.includes('\\') || path.isAbsolute(relative)) {+ throw new Error(`${relative}: invalid creator preset resource path`);+ }+ const absolute = path.resolve(root, relative);+ const relation = path.relative(root, absolute);+ if (relation.startsWith('..') || path.isAbsolute(relation)) {+ throw new Error(`${relative}: creator preset resource escapes catalog root`);+ }+ return absolute;+}++function identityKey(ref: CreatorPresetRef): string {+ return `${ref.module}/${ref.id}/${ref.version}`;+}++function comparePresets(left: CreatorPresetRef, right: CreatorPresetRef): number {+ return left.module.localeCompare(right.module)+ || left.id.localeCompare(right.id)+ || left.version - right.version;+}++function parseJson(bytes: Buffer, file: string): unknown {+ try {+ return JSON.parse(bytes.toString('utf8'));+ } catch {+ throw new Error(`${file}: invalid JSON`);+ }+}++function isRecord(value: unknown): value is Record<string, unknown> {+ return value !== null && typeof value === 'object' && !Array.isArray(value);+}diff --git a/apps/daemon/src/creator/presets/compiler.ts b/apps/daemon/src/creator/presets/compiler.tsnew file mode 100644index 00000000..bd1c8c09--- /dev/null+++ b/apps/daemon/src/creator/presets/compiler.ts@@ -0,0 +1,484 @@+import { createHash } from 'node:crypto';+import {+ copyFile,+ mkdir,+ open,+ readFile,+ readdir,+ realpath,+ rename,+ rm,+ stat,+ lstat,+ writeFile+} from 'node:fs/promises';+import path from 'node:path';+import { imageSize } from 'image-size';+import { ZodError } from 'zod';+import { creatorPresetModuleDefinitions, getCreatorPresetModuleDefinition } from './module-schemas.js';+import { creatorPresetSourceManifestSchema, validatePresetPublicFields } from './schema.js';+import type {+ CompiledCreatorPreset,+ CreatorPresetBuildManifest,+ CreatorPresetCatalog,+ CreatorPresetCompilerOptions,+ CreatorPresetModuleDefinition,+ CreatorPresetSourceManifest+} from './types.js';++const COVER_EXTENSIONS = new Set(['.png', '.jpg', '.jpeg', '.webp']);+const MIME_BY_EXTENSION = new Map([+ ['.png', 'image/png'],+ ['.jpg', 'image/jpeg'],+ ['.jpeg', 'image/jpeg'],+ ['.webp', 'image/webp']+] as const);+const MAX_COVER_SIZE = 2 * 1024 * 1024;++export async function validateCreatorPresets(+ options: CreatorPresetCompilerOptions+): Promise<CreatorPresetCatalog> {+ const sourceRoot = path.resolve(options.sourceRoot);+ const modules = options.modules ?? creatorPresetModuleDefinitions;+ await assertDirectory(sourceRoot);+ const entries = await findTemplateManifests(sourceRoot);+ const presets: CompiledCreatorPreset[] = [];+ const identities = new Set<string>();++ for (const entry of entries) {+ const manifest = await readSourceManifest(entry.file, entry.relativeFile);+ const definition = getCreatorPresetModuleDefinition(manifest.module, modules);+ validateDirectoryIdentity(entry.parts, manifest, entry.relativeFile);+ validateRuntimeBinding(definition, manifest, entry.relativeFile);+ validatePresetPublicFields(manifest.defaults, `${entry.relativeFile}.defaults`);+ for (const [locale, defaults] of Object.entries(manifest.defaultsByLocale ?? {})) {+ if (defaults !== undefined) {+ validatePresetPublicFields(defaults, `${entry.relativeFile}.defaultsByLocale.${locale}`);+ }+ }+ parseModuleDefaults(definition, manifest, entry.relativeFile);+ definition.validateRequirement(manifest.requirements);+ const identity = `${manifest.module}/${manifest.id}/${manifest.version}`;+ if (identities.has(identity)) {+ throw new Error(`${entry.relativeFile}: duplicate preset identity ${identity}`);+ }+ identities.add(identity);+ const cover = await validateCover(sourceRoot, entry.directory, manifest.cover, entry.relativeFile);+ const normalizedManifest = normalizeSourceManifest(manifest);+ const contentHash = sha256(canonicalJson({+ ...normalizedManifest,+ cover: {+ path: toPosix(manifest.cover),+ sha256: cover.sha256+ }+ }));+ presets.push({+ ...normalizedManifest,+ cover: {+ source: toPosix(path.relative(sourceRoot, cover.file)),+ asset: `assets/${cover.sha256}${cover.extension}`,+ sha256: cover.sha256,+ mime: cover.mime,+ width: cover.width,+ height: cover.height,+ size: cover.size+ },+ contentHash+ });+ }++ presets.sort(comparePresets);+ return {+ schemaVersion: 1,+ presets+ };+}++export async function compileCreatorPresets(+ options: CreatorPresetCompilerOptions+): Promise<CreatorPresetBuildManifest> {+ if (options.outputRoot === undefined) {+ throw new Error('outputRoot is required when compiling creator presets');+ }+ const outputRoot = path.resolve(options.outputRoot);+ const catalog = await validateCreatorPresets(options);+ const parent = path.dirname(outputRoot);+ const temporary = path.join(+ parent,+ `.${path.basename(outputRoot)}.tmp-${process.pid}-${Date.now()}`+ );+ const backup = path.join(+ parent,+ `.${path.basename(outputRoot)}.backup-${process.pid}-${Date.now()}`+ );+ await rm(temporary, { recursive: true, force: true });+ await mkdir(path.join(temporary, 'assets'), { recursive: true });++ try {+ for (const preset of catalog.presets) {+ const source = path.join(path.resolve(options.sourceRoot), preset.cover.source);+ const destination = path.join(temporary, preset.cover.asset);+ try {+ await stat(destination);+ } catch {+ await copyFile(source, destination);+ }+ }+ const catalogBytes = Buffer.from(`${canonicalJson(catalog)}\n`);+ await writeFile(path.join(temporary, 'catalog.json'), catalogBytes);+ const assetFiles = await listOutputFiles(temporary, ['catalog.json']);+ const catalogHash = sha256(catalogBytes);+ const assetEntries = assetFiles.filter(file => file.path.startsWith('assets/'));+ const assetSetHash = sha256(canonicalJson(assetEntries));+ const manifestWithoutSelf: CreatorPresetBuildManifest = {+ schemaVersion: 1,+ catalogHash,+ assetSetHash,+ files: assetFiles+ };+ await writeFile(+ path.join(temporary, 'manifest.json'),+ `${canonicalJson(manifestWithoutSelf)}\n`+ );+ await syncTree(temporary);+ await mkdir(parent, { recursive: true });++ let hadPrevious = false;+ try {+ await rename(outputRoot, backup);+ hadPrevious = true;+ } catch (error) {+ if (!isMissing(error)) throw error;+ }+ try {+ await rename(temporary, outputRoot);+ await rm(backup, { recursive: true, force: true });+ } catch (error) {+ if (hadPrevious) await rename(backup, outputRoot);+ throw error;+ }+ return manifestWithoutSelf;+ } catch (error) {+ await rm(temporary, { recursive: true, force: true });+ throw error;+ }+}++export function canonicalJson(value: unknown): string {+ return JSON.stringify(sortJson(value));+}++export function sha256(value: string | Buffer): string {+ return createHash('sha256').update(value).digest('hex');+}++async function findTemplateManifests(sourceRoot: string): Promise<Array<{+ file: string;+ directory: string;+ relativeFile: string;+ parts: [string, string, string];+}>> {+ const results: Array<{+ file: string;+ directory: string;+ relativeFile: string;+ parts: [string, string, string];+ }> = [];+ const modules = await sortedDirectoryEntries(sourceRoot);+ for (const moduleEntry of modules) {+ await rejectSymlink(moduleEntry, path.join(sourceRoot, moduleEntry.name));+ if (!moduleEntry.isDirectory()) {+ throw new Error(`${moduleEntry.name}: template root entries must be directories`);+ }+ const moduleDirectory = path.join(sourceRoot, moduleEntry.name);+ for (const idEntry of await sortedDirectoryEntries(moduleDirectory)) {+ const idPath = path.join(moduleDirectory, idEntry.name);+ await rejectSymlink(idEntry, idPath);+ if (!idEntry.isDirectory()) throw new Error(`${toPosix(path.relative(sourceRoot, idPath))}: expected directory`);+ for (const versionEntry of await sortedDirectoryEntries(idPath)) {+ const versionPath = path.join(idPath, versionEntry.name);+ await rejectSymlink(versionEntry, versionPath);+ if (!versionEntry.isDirectory()) throw new Error(`${toPosix(path.relative(sourceRoot, versionPath))}: expected directory`);+ const files = await sortedDirectoryEntries(versionPath);+ const manifestEntry = files.find(file => file.name === 'template.json');+ if (manifestEntry === undefined || !manifestEntry.isFile()) {+ throw new Error(`${toPosix(path.relative(sourceRoot, versionPath))}/template.json: missing manifest`);+ }+ for (const file of files) {+ await rejectSymlink(file, path.join(versionPath, file.name));+ if (file.isDirectory()) {+ throw new Error(`${toPosix(path.relative(sourceRoot, path.join(versionPath, file.name)))}: nested directories are not allowed`);+ }+ if (!file.isFile()) {+ throw new Error(`${toPosix(path.relative(sourceRoot, path.join(versionPath, file.name)))}: only regular files are allowed`);+ }+ const extension = path.extname(file.name).toLowerCase();+ if (file.name !== 'template.json' && !COVER_EXTENSIONS.has(extension)) {+ throw new Error(`${toPosix(path.relative(sourceRoot, path.join(versionPath, file.name)))}: unsupported template resource`);+ }+ }+ results.push({+ file: path.join(versionPath, 'template.json'),+ directory: versionPath,+ relativeFile: toPosix(path.relative(sourceRoot, path.join(versionPath, 'template.json'))),+ parts: [moduleEntry.name, idEntry.name, versionEntry.name]+ });+ }+ }+ }+ return results;+}++async function readSourceManifest(file: string, relativeFile: string): Promise<CreatorPresetSourceManifest> {+ let value: unknown;+ try {+ value = JSON.parse(await readFile(file, 'utf8'));+ } catch (error) {+ throw new Error(`${relativeFile}: invalid JSON: ${errorMessage(error)}`);+ }+ try {+ return creatorPresetSourceManifestSchema.parse(value) as CreatorPresetSourceManifest;+ } catch (error) {+ if (error instanceof ZodError) {+ const detail = error.issues+ .map(issue => `${relativeFile}.${issue.path.join('.') || '<root>'}: ${issue.message}`)+ .join('\n');+ throw new Error(detail);+ }+ throw error;+ }+}++function validateDirectoryIdentity(+ parts: [string, string, string],+ manifest: CreatorPresetSourceManifest,+ relativeFile: string+): void {+ if (+ parts[0] !== manifest.module+ || parts[1] !== manifest.id+ || !/^[1-9]\d*$/.test(parts[2])+ || Number(parts[2]) !== manifest.version+ ) {+ throw new Error(`${relativeFile}: directory identity does not match module/id/version`);+ }+}++function validateRuntimeBinding(+ definition: CreatorPresetModuleDefinition,+ manifest: CreatorPresetSourceManifest,+ relativeFile: string+): void {+ if (+ manifest.runtimeTemplate.id !== definition.runtimeTemplate.id+ || manifest.runtimeTemplate.version !== definition.runtimeTemplate.version+ ) {+ throw new Error(+ `${relativeFile}.runtimeTemplate: expected ${definition.runtimeTemplate.id}@${definition.runtimeTemplate.version}`+ );+ }+}++function parseModuleDefaults(+ definition: CreatorPresetModuleDefinition,+ manifest: CreatorPresetSourceManifest,+ relativeFile: string+): void {+ const defaults = definition.defaultsSchema.safeParse(manifest.defaults);+ if (!defaults.success) {+ throw new Error(formatZodIssues(relativeFile, 'defaults', defaults.error));+ }+ for (const [locale, value] of Object.entries(manifest.defaultsByLocale ?? {})) {+ const localized = definition.localeDefaultsSchema.safeParse(value);+ if (!localized.success) {+ throw new Error(formatZodIssues(relativeFile, `defaultsByLocale.${locale}`, localized.error));+ }+ }+}++async function validateCover(+ sourceRoot: string,+ directory: string,+ coverPath: string,+ relativeFile: string+): Promise<{+ file: string;+ extension: '.png' | '.jpg' | '.jpeg' | '.webp';+ mime: 'image/png' | 'image/jpeg' | 'image/webp';+ sha256: string;+ width: number;+ height: number;+ size: number;+}> {+ if (path.isAbsolute(coverPath) || coverPath.includes('\\')) {+ throw new Error(`${relativeFile}.cover: cover must be a POSIX relative path`);+ }+ const segments = coverPath.split('/');+ if (segments.some(segment => segment === '' || segment === '.' || segment === '..')) {+ throw new Error(`${relativeFile}.cover: traversal is not allowed`);+ }+ const extension = path.extname(coverPath).toLowerCase() as '.png' | '.jpg' | '.jpeg' | '.webp';+ if (!COVER_EXTENSIONS.has(extension)) {+ throw new Error(`${relativeFile}.cover: unsupported image extension`);+ }+ const file = path.resolve(directory, coverPath);+ const relative = path.relative(sourceRoot, file);+ if (relative.startsWith('..') || path.isAbsolute(relative)) {+ throw new Error(`${relativeFile}.cover: cover escapes the template root`);+ }+ const fileInfo = await lstat(file).catch(() => undefined);+ if (fileInfo === undefined || !fileInfo.isFile() || fileInfo.isSymbolicLink()) {+ throw new Error(`${relativeFile}.cover: cover must be a regular file`);+ }+ const sourceReal = await realpath(sourceRoot);+ const fileReal = await realpath(file);+ if (!isInside(sourceReal, fileReal)) {+ throw new Error(`${relativeFile}.cover: resolved cover escapes the template root`);+ }+ if (fileInfo.size > MAX_COVER_SIZE) {+ throw new Error(`${relativeFile}.cover: cover exceeds 2 MiB`);+ }+ const bytes = await readFile(file);+ const dimensions = imageSize(bytes);+ if (dimensions.width === undefined || dimensions.height === undefined) {+ throw new Error(`${relativeFile}.cover: image dimensions are unavailable`);+ }+ if (dimensions.width < 640 || dimensions.height < 360) {+ throw new Error(`${relativeFile}.cover: cover must be at least 640x360`);+ }+ if (dimensions.width * 9 !== dimensions.height * 16) {+ throw new Error(`${relativeFile}.cover: cover must have a 16:9 aspect ratio`);+ }+ const detectedExtension = detectedImageExtension(bytes);+ if (detectedExtension === undefined || !extensionsMatch(extension, detectedExtension)) {+ throw new Error(`${relativeFile}.cover: image contents do not match extension`);+ }+ return {+ file,+ extension,+ mime: MIME_BY_EXTENSION.get(extension)!,+ sha256: sha256(bytes),+ width: dimensions.width,+ height: dimensions.height,+ size: fileInfo.size+ };+}++function normalizeSourceManifest(manifest: CreatorPresetSourceManifest): CreatorPresetSourceManifest {+ return {+ ...manifest,+ cover: toPosix(manifest.cover),+ tags: [...new Set(manifest.tags)].sort((left, right) => left.localeCompare(right))+ };+}++function comparePresets(left: CompiledCreatorPreset, right: CompiledCreatorPreset): number {+ return left.module.localeCompare(right.module)+ || left.id.localeCompare(right.id)+ || left.version - right.version;+}++async function sortedDirectoryEntries(directory: string) {+ return (await readdir(directory, { withFileTypes: true }))+ .sort((left, right) => left.name.localeCompare(right.name));+}++async function rejectSymlink(entry: { isSymbolicLink(): boolean }, file: string): Promise<void> {+ if (entry.isSymbolicLink()) {+ throw new Error(`${toPosix(file)}: symbolic links are not allowed`);+ }+}++async function assertDirectory(directory: string): Promise<void> {+ const info = await lstat(directory).catch(() => undefined);+ if (info === undefined || !info.isDirectory() || info.isSymbolicLink()) {+ throw new Error(`${directory}: preset source root must be a real directory`);+ }+}++async function listOutputFiles(+ root: string,+ initial: string[] = []+): Promise<CreatorPresetBuildManifest['files']> {+ const paths = [...initial];+ const walk = async (directory: string): Promise<void> => {+ for (const entry of await sortedDirectoryEntries(directory)) {+ const absolute = path.join(directory, entry.name);+ const relative = toPosix(path.relative(root, absolute));+ if (entry.isDirectory()) await walk(absolute);+ else if (entry.isFile() && !paths.includes(relative)) paths.push(relative);+ }+ };+ await walk(root);+ paths.sort();+ return Promise.all(paths.map(async relative => {+ const bytes = await readFile(path.join(root, relative));+ return {+ path: relative,+ sha256: sha256(bytes),+ size: bytes.length+ };+ }));+}++async function syncTree(root: string): Promise<void> {+ const files = await listOutputFiles(root);+ for (const file of files) {+ const handle = await open(path.join(root, file.path), 'r');+ try {+ await handle.sync();+ } finally {+ await handle.close();+ }+ }+ const directory = await open(root, 'r');+ try {+ await directory.sync();+ } finally {+ await directory.close();+ }+}++function sortJson(value: unknown): unknown {+ if (Array.isArray(value)) return value.map(sortJson);+ if (value === null || typeof value !== 'object') return value;+ return Object.fromEntries(+ Object.entries(value as Record<string, unknown>)+ .sort(([left], [right]) => left.localeCompare(right))+ .map(([key, child]) => [key, sortJson(child)])+ );+}++function detectedImageExtension(bytes: Buffer): '.png' | '.jpg' | '.webp' | undefined {+ if (bytes.subarray(0, 8).equals(Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]))) return '.png';+ if (bytes[0] === 0xff && bytes[1] === 0xd8 && bytes[2] === 0xff) return '.jpg';+ if (bytes.subarray(0, 4).toString('ascii') === 'RIFF' && bytes.subarray(8, 12).toString('ascii') === 'WEBP') return '.webp';+ return undefined;+}++function extensionsMatch(expected: string, actual: string): boolean {+ return expected === actual || ((expected === '.jpg' || expected === '.jpeg') && actual === '.jpg');+}++function formatZodIssues(relativeFile: string, prefix: string, error: ZodError): string {+ return error.issues+ .map(issue => `${relativeFile}.${prefix}.${issue.path.join('.') || '<root>'}: ${issue.message}`)+ .join('\n');+}++function isInside(root: string, candidate: string): boolean {+ const relative = path.relative(root, candidate);+ return relative === '' || (!relative.startsWith('..') && !path.isAbsolute(relative));+}++function isMissing(error: unknown): boolean {+ return error instanceof Error && 'code' in error && error.code === 'ENOENT';+}++function errorMessage(error: unknown): string {+ return error instanceof Error ? error.message : String(error);+}++function toPosix(value: string): string {+ return value.split(path.sep).join('/');+}diff --git a/apps/daemon/src/creator/presets/module-schemas.ts b/apps/daemon/src/creator/presets/module-schemas.tsnew file mode 100644index 00000000..913ea276--- /dev/null+++ b/apps/daemon/src/creator/presets/module-schemas.ts@@ -0,0 +1,219 @@+import {+ coverStyleIds,+ coverTextLanguages,+ creatorRuntimeWorkspaces,+ imageGenerationSizes,+ videoGenerationDurations,+ videoGenerationModelIds,+ videoGenerationSizes,+ type CreatorJson,+ type CreatorPresetRequirements,+ type CreatorRuntimeWorkspace+} from '@opencreator/protocol';+import { z } from 'zod';+import type { CreatorPresetModuleDefinition } from './types.js';++const colorSchema = z.string().regex(/^#[0-9A-Fa-f]{6}$/);+const promptSchema = z.string().max(4000);+const shortTextSchema = z.string().max(256);++export const creatorSubtitleStyleSchema = z.object({+ fontPreset: z.enum(['system', 'sans', 'serif', 'rounded']).default('sans'),+ fontWeight: z.enum(['regular', 'medium', 'bold']).default('bold'),+ fontSize: z.enum(['small', 'medium', 'large']).default('medium'),+ primaryColor: colorSchema.default('#FFFFFF'),+ secondaryColor: colorSchema.default('#D1D5DB'),+ outlineColor: colorSchema.default('#000000'),+ outlineWidth: z.number().min(0).max(8).default(2.5),+ shadow: z.object({+ enabled: z.boolean().default(true),+ color: colorSchema.default('#000000'),+ opacity: z.number().min(0).max(1).default(0.6),+ offsetX: z.number().min(-20).max(20).default(1.5),+ offsetY: z.number().min(-20).max(20).default(1.5),+ blur: z.number().min(0).max(10).default(0.5)+ }).strict().default({})+}).strict().default({});++const videoTranslationDefaultsSchema = z.object({+ sourceLanguage: z.string().min(2).max(32).default('en'),+ targetLanguage: z.string().min(2).max(32).default('zh_cn'),+ preferPlatformCaptions: z.boolean().default(true),+ bilingual: z.boolean().default(true),+ subtitlePosition: z.enum(['top', 'bottom']).default('top'),+ subtitleStyle: creatorSubtitleStyleSchema,+ dubbing: z.boolean().default(false),+ voiceCode: shortTextSchema.default(''),+ voiceName: shortTextSchema.default(''),+ composeVideo: z.boolean().default(false),+ videoFormat: z.enum(['horizontal', 'vertical', 'all']).default('horizontal'),+ verticalTitle: z.string().max(80).default(''),+ verticalSubtitle: z.string().max(140).default('')+}).strict().refine(+ value => value.sourceLanguage !== value.targetLanguage,+ { message: 'sourceLanguage and targetLanguage must differ', path: ['targetLanguage'] }+);++const videoTranslationLocaleSchema = z.object({+ sourceLanguage: z.string().min(2).max(32).optional(),+ targetLanguage: z.string().min(2).max(32).optional(),+ verticalTitle: z.string().max(80).optional(),+ verticalSubtitle: z.string().max(140).optional()+}).strict();++const videoDownloadDefaultsSchema = z.object({+ mediaType: z.enum(['video', 'audio']).default('video')+}).strict();++const imageGenerationDefaultsSchema = z.object({+ prompt: promptSchema.default(''),+ size: z.enum(imageGenerationSizes).default('1024x1024'),+ quality: z.enum(['low', 'medium', 'high']).default('medium'),+ candidateCount: z.number().int().min(1).max(4).default(2)+}).strict();++const imageGenerationLocaleSchema = z.object({+ prompt: promptSchema.optional()+}).strict();++const videoGenerationDefaultsSchema = z.object({+ prompt: promptSchema.default(''),+ size: z.enum(videoGenerationSizes).default('1280x720'),+ duration: z.union(videoGenerationDurations.map(value => z.literal(value)) as [+ z.ZodLiteral<4>,+ z.ZodLiteral<5>,+ ...z.ZodLiteral<6 | 8 | 10>[]+ ]).default(5)+}).strict();++const videoGenerationLocaleSchema = z.object({+ prompt: promptSchema.optional()+}).strict();++const coverGeneratorDefaultsSchema = z.object({+ prompt: promptSchema.default(''),+ coverStyle: z.enum(coverStyleIds).default('bilibili-red-blue-white'),+ coverTextLanguage: z.enum(['auto', ...coverTextLanguages]).default('auto'),+ customStylePrompt: z.string().max(1000).default(''),+ coverHeadline: z.string().max(80).default(''),+ coverSubheadline: z.string().max(140).default(''),+ ratio: z.enum(['16:9', '1:1', '9:16']).default('16:9'),+ candidateCount: z.number().int().min(1).max(4).default(2),+ quality: z.enum(['low', 'medium', 'high']).default('medium')+}).strict();++const coverGeneratorLocaleSchema = z.object({+ prompt: promptSchema.optional(),+ coverTextLanguage: z.enum(['auto', ...coverTextLanguages]).optional(),+ customStylePrompt: z.string().max(1000).optional(),+ coverHeadline: z.string().max(80).optional(),+ coverSubheadline: z.string().max(140).optional()+}).strict();++const smartDubbingDefaultsSchema = z.object({+ text: z.string().max(5000).default(''),+ voiceCode: shortTextSchema.default(''),+ voiceName: shortTextSchema.default(''),+ style: z.enum(['natural', 'professional', 'warm', 'energetic', 'calm', 'storytelling']).default('natural'),+ speed: z.number().min(0.75).max(1.25).default(1),+ format: z.enum(['mp3', 'wav']).default('mp3')+}).strict();++const smartDubbingLocaleSchema = z.object({+ text: z.string().max(5000).optional()+}).strict();++const emptyLocaleSchema = z.object({}).strict();++const bindingByModule: Record<CreatorRuntimeWorkspace, { id: string; version: number }> = {+ 'video-translation': { id: 'video-translation', version: 2 },+ 'video-download': { id: 'video-download', version: 2 },+ 'image-generation': { id: 'image-generation', version: 2 },+ 'video-generation': { id: 'video-generation', version: 1 },+ 'cover-generator': { id: 'cover', version: 2 },+ 'smart-dubbing': { id: 'smart-dubbing', version: 1 }+};++export const creatorPresetModuleDefinitions: readonly CreatorPresetModuleDefinition[] = [+ createDefinition('video-translation', videoTranslationDefaultsSchema, videoTranslationLocaleSchema),+ createDefinition('video-download', videoDownloadDefaultsSchema, emptyLocaleSchema),+ createDefinition('image-generation', imageGenerationDefaultsSchema, imageGenerationLocaleSchema),+ createDefinition('video-generation', videoGenerationDefaultsSchema, videoGenerationLocaleSchema),+ createDefinition('cover-generator', coverGeneratorDefaultsSchema, coverGeneratorLocaleSchema, state => ({+ ...state,+ sourceType: 'prompt'+ })),+ createDefinition('smart-dubbing', smartDubbingDefaultsSchema, smartDubbingLocaleSchema)+];++export function getCreatorPresetModuleDefinition(+ module: CreatorRuntimeWorkspace,+ definitions: readonly CreatorPresetModuleDefinition[] = creatorPresetModuleDefinitions+): CreatorPresetModuleDefinition {+ const definition = definitions.find(candidate => candidate.module === module);+ if (definition === undefined) {+ throw new Error(`Unknown creator preset module: ${module}`);+ }+ return definition;+}++function createDefinition(+ module: CreatorRuntimeWorkspace,+ defaultsSchema: z.ZodType<Record<string, CreatorJson>>,+ localeDefaultsSchema: z.ZodType<Record<string, CreatorJson>>,+ applyFixedFields: (state: Record<string, CreatorJson>) => Record<string, CreatorJson> = state => state+): CreatorPresetModuleDefinition {+ return {+ module,+ runtimeTemplate: bindingByModule[module],+ defaultsSchema,+ localeDefaultsSchema,+ validateRequirement: requirement => validateModuleRequirement(module, requirement),+ applyFixedFields+ };+}++function validateModuleRequirement(+ module: CreatorRuntimeWorkspace,+ requirement: CreatorPresetRequirements | undefined+): void {+ if (requirement === undefined) return;+ if (module === 'image-generation' || module === 'cover-generator') {+ if (requirement.service !== 'image') {+ throw new Error(`${module}: requirement service must be image`);+ }+ if (!['openai', 'jimeng', 'kling', 'gemini'].includes(requirement.provider)) {+ throw new Error(`${module}: unsupported image provider ${requirement.provider}`);+ }+ if (requirement.model !== undefined) {+ throw new Error(`${module}: image requirements cannot select a model`);+ }+ return;+ }+ if (module === 'video-generation') {+ if (requirement.service !== 'video') {+ throw new Error(`${module}: requirement service must be video`);+ }+ const models = videoGenerationModelIds[+ requirement.provider as keyof typeof videoGenerationModelIds+ ] as readonly string[] | undefined;+ if (models === undefined || requirement.model === undefined || !models.includes(requirement.model)) {+ throw new Error(`${module}: unsupported video provider or model`);+ }+ return;+ }+ if (module === 'smart-dubbing' || module === 'video-translation') {+ if (requirement.service !== 'tts') {+ throw new Error(`${module}: requirement service must be tts`);+ }+ if (!['openai', 'aliyun', 'minimax'].includes(requirement.provider)) {+ throw new Error(`${module}: unsupported tts provider ${requirement.provider}`);+ }+ return;+ }+ throw new Error(`${module}: requirements are not supported`);+}++export function isCreatorPresetModule(value: string): value is CreatorRuntimeWorkspace {+ return (creatorRuntimeWorkspaces as readonly string[]).includes(value);+}diff --git a/apps/daemon/src/creator/presets/presentation.ts b/apps/daemon/src/creator/presets/presentation.tsnew file mode 100644index 00000000..a2ede9df--- /dev/null+++ b/apps/daemon/src/creator/presets/presentation.ts@@ -0,0 +1,261 @@+import type {+ CreatorJson,+ CreatorPresetHighlight,+ CreatorRuntimeWorkspace+} from '@opencreator/protocol';+import { deepMergeCreatorJson } from './requirements.js';+import type {+ CompiledCreatorPreset,+ CreatorPresetLocale+} from './types.js';++export function createCreatorPresetHighlights(+ preset: CompiledCreatorPreset,+ locale: CreatorPresetLocale+): CreatorPresetHighlight[] {+ const defaults = deepMergeCreatorJson(+ preset.defaults,+ preset.defaultsByLocale?.[locale] ?? {}+ );+ return highlightBuilders[preset.module](defaults, locale);+}++const highlightBuilders: Record<+ CreatorRuntimeWorkspace,+ (+ defaults: Record<string, CreatorJson>,+ locale: CreatorPresetLocale+ ) => CreatorPresetHighlight[]+> = {+ 'video-translation': (defaults, locale) => {+ const style = readRecord(defaults.subtitleStyle);+ const colors = [+ readColor(style?.primaryColor),+ readColor(style?.secondaryColor)+ ].filter((color): color is string => color !== undefined);+ return [+ textHighlight(+ `${languageLabel(readString(defaults.sourceLanguage), locale)}`+ + ` → ${languageLabel(readString(defaults.targetLanguage), locale)}`+ ),+ textHighlight([+ defaults.bilingual === true+ ? localize(locale, '双语字幕', 'Bilingual subtitles')+ : localize(locale, '单语字幕', 'Single-language subtitles'),+ defaults.dubbing === true+ ? localize(locale, '含配音', 'Dubbing')+ : undefined,+ defaults.subtitlePosition === 'bottom'+ ? localize(locale, '底部', 'Bottom')+ : localize(locale, '顶部', 'Top')+ ].filter((value): value is string => value !== undefined).join(' · ')),+ {+ text: [+ fontPresetLabel(readString(style?.fontPreset), locale),+ fontWeightLabel(readString(style?.fontWeight), locale),+ fontSizeLabel(readString(style?.fontSize), locale)+ ].join(' · '),+ colors+ },+ textHighlight(videoOutputLabel(defaults, locale))+ ];+ },+ 'video-download': (defaults, locale) => [+ textHighlight(defaults.mediaType === 'audio'+ ? localize(locale, '提取 MP3 音频', 'Extract MP3 audio')+ : localize(locale, '下载最高画质视频', 'Download highest-quality video'))+ ],+ 'image-generation': (defaults, locale) => [+ textHighlight(formatSize(readString(defaults.size))),+ textHighlight(qualityLabel(readString(defaults.quality), locale)),+ textHighlight(countLabel(readNumber(defaults.candidateCount), locale, 'image'))+ ],+ 'video-generation': (defaults, locale) => [+ textHighlight(formatSize(readString(defaults.size))),+ textHighlight(localize(+ locale,+ `${readNumber(defaults.duration) ?? 5} 秒`,+ `${readNumber(defaults.duration) ?? 5} sec`+ ))+ ],+ 'cover-generator': (defaults, locale) => [+ textHighlight(coverStyleLabel(readString(defaults.coverStyle), locale)),+ textHighlight(readString(defaults.ratio) ?? '16:9'),+ textHighlight(coverLanguageLabel(readString(defaults.coverTextLanguage), locale)),+ textHighlight(countLabel(readNumber(defaults.candidateCount), locale, 'image'))+ ],+ 'smart-dubbing': (defaults, locale) => [+ textHighlight(dubbingStyleLabel(readString(defaults.style), locale)),+ textHighlight(`${formatSpeed(readNumber(defaults.speed))}x`),+ textHighlight((readString(defaults.format) ?? 'mp3').toUpperCase())+ ]+};++function textHighlight(text: string): CreatorPresetHighlight {+ return { text, colors: [] };+}++function languageLabel(value: string | undefined, locale: CreatorPresetLocale): string {+ const labels: Record<string, [string, string]> = {+ en: ['英语', 'English'],+ en_us: ['英语', 'English'],+ zh: ['中文', 'Chinese'],+ zh_cn: ['简体中文', 'Simplified Chinese'],+ zh_tw: ['繁体中文', 'Traditional Chinese'],+ ja: ['日语', 'Japanese'],+ ja_jp: ['日语', 'Japanese'],+ ko: ['韩语', 'Korean'],+ ko_kr: ['韩语', 'Korean'],+ es: ['西班牙语', 'Spanish'],+ fr: ['法语', 'French'],+ de: ['德语', 'German']+ };+ const normalized = value?.trim().toLowerCase().replaceAll('-', '_') ?? '';+ const label = labels[normalized];+ if (label === undefined) return value?.trim() || localize(locale, '自动', 'Auto');+ return locale === 'en-US' ? label[1] : label[0];+}++function fontPresetLabel(value: string | undefined, locale: CreatorPresetLocale): string {+ const labels: Record<string, [string, string]> = {+ system: ['系统字体', 'System'],+ sans: ['无衬线', 'Sans serif'],+ serif: ['衬线体', 'Serif'],+ rounded: ['圆体', 'Rounded']+ };+ return localizedValue(labels, value, locale, ['无衬线', 'Sans serif']);+}++function fontWeightLabel(value: string | undefined, locale: CreatorPresetLocale): string {+ const labels: Record<string, [string, string]> = {+ regular: ['常规', 'Regular'],+ medium: ['中等', 'Medium'],+ bold: ['粗体', 'Bold']+ };+ return localizedValue(labels, value, locale, ['粗体', 'Bold']);+}++function fontSizeLabel(value: string | undefined, locale: CreatorPresetLocale): string {+ const labels: Record<string, [string, string]> = {+ small: ['小字', 'Small'],+ medium: ['中字', 'Medium'],+ large: ['大字', 'Large']+ };+ return localizedValue(labels, value, locale, ['中字', 'Medium']);+}++function videoOutputLabel(+ defaults: Record<string, CreatorJson>,+ locale: CreatorPresetLocale+): string {+ if (defaults.composeVideo !== true) {+ return localize(locale, '字幕与翻译稿', 'Subtitles and transcript');+ }+ if (defaults.videoFormat === 'vertical') {+ return localize(locale, '竖屏成片', 'Vertical video');+ }+ if (defaults.videoFormat === 'all') {+ return localize(locale, '横竖屏成片', 'Horizontal and vertical video');+ }+ return localize(locale, '横屏成片', 'Horizontal video');+}++function qualityLabel(value: string | undefined, locale: CreatorPresetLocale): string {+ const labels: Record<string, [string, string]> = {+ low: ['快速质量', 'Fast quality'],+ medium: ['标准质量', 'Standard quality'],+ high: ['高清质量', 'High quality']+ };+ return localizedValue(labels, value, locale, ['标准质量', 'Standard quality']);+}++function coverStyleLabel(value: string | undefined, locale: CreatorPresetLocale): string {+ const labels: Record<string, [string, string]> = {+ 'personal-growth': ['个人成长风格', 'Personal growth'],+ psychology: ['心理学风格', 'Psychology'],+ 'wealth-platinum-red': ['财富白金红', 'Wealth platinum red'],+ 'bilibili-red-blue-white': ['B站红蓝白', 'Bilibili red blue white'],+ custom: ['自定义风格', 'Custom style']+ };+ return localizedValue(labels, value, locale, ['自定义风格', 'Custom style']);+}++function coverLanguageLabel(value: string | undefined, locale: CreatorPresetLocale): string {+ const labels: Record<string, [string, string]> = {+ auto: ['自动文字语言', 'Automatic text language'],+ 'zh-CN': ['简体中文文字', 'Simplified Chinese text'],+ 'zh-TW': ['繁体中文文字', 'Traditional Chinese text'],+ 'en-US': ['英文文字', 'English text'],+ 'ja-JP': ['日文文字', 'Japanese text'],+ 'ko-KR': ['韩文文字', 'Korean text']+ };+ return localizedValue(labels, value, locale, ['自动文字语言', 'Automatic text language']);+}++function dubbingStyleLabel(value: string | undefined, locale: CreatorPresetLocale): string {+ const labels: Record<string, [string, string]> = {+ natural: ['自然表达', 'Natural'],+ professional: ['专业播报', 'Professional'],+ warm: ['温暖表达', 'Warm'],+ energetic: ['活力表达', 'Energetic'],+ calm: ['沉静旁白', 'Calm'],+ storytelling: ['故事讲述', 'Storytelling']+ };+ return localizedValue(labels, value, locale, ['自然表达', 'Natural']);+}++function localizedValue(+ labels: Record<string, [string, string]>,+ value: string | undefined,+ locale: CreatorPresetLocale,+ fallback: [string, string]+): string {+ const label = value === undefined ? fallback : labels[value] ?? fallback;+ return locale === 'en-US' ? label[1] : label[0];+}++function countLabel(+ value: number | undefined,+ locale: CreatorPresetLocale,+ item: 'image'+): string {+ const count = value ?? 1;+ if (locale === 'en-US') return `${count} ${item}${count === 1 ? '' : 's'}`;+ return `${count} 张`;+}++function formatSize(value: string | undefined): string {+ return (value ?? '1024x1024').replace('x', ' × ');+}++function formatSpeed(value: number | undefined): string {+ return (value ?? 1).toFixed(2).replace(/\.?0+$/, '');+}++function readRecord(value: CreatorJson | undefined): Record<string, CreatorJson> | undefined {+ return value !== null && typeof value === 'object' && !Array.isArray(value)+ ? value+ : undefined;+}++function readString(value: CreatorJson | undefined): string | undefined {+ return typeof value === 'string' ? value : undefined;+}++function readNumber(value: CreatorJson | undefined): number | undefined {+ return typeof value === 'number' && Number.isFinite(value) ? value : undefined;+}++function readColor(value: CreatorJson | undefined): string | undefined {+ return typeof value === 'string' && /^#[0-9A-Fa-f]{6}$/.test(value)+ ? value.toUpperCase()+ : undefined;+}++function localize(+ locale: CreatorPresetLocale,+ zh: string,+ en: string+): string {+ return locale === 'en-US' ? en : zh;+}diff --git a/apps/daemon/src/creator/presets/requirements.ts b/apps/daemon/src/creator/presets/requirements.tsnew file mode 100644index 00000000..33418bd9--- /dev/null+++ b/apps/daemon/src/creator/presets/requirements.ts@@ -0,0 +1,268 @@+import type {+ CreatorJob,+ CreatorJson,+ CreatorPresetRequirements,+ CreatorRuntimeWorkspace,+ CreatorServicesConfig+} from '@opencreator/protocol';+import { videoGenerationModelIds } from '@opencreator/protocol';+import { CreatorExecutorError } from '../executor.js';+import type { CreatorPresetModuleDefinition, CreatorPresetLocale } from './types.js';++export function mergeCreatorPresetState(input: {+ definition: CreatorPresetModuleDefinition;+ defaults: Record<string, CreatorJson>;+ defaultsByLocale?: Partial<Record<CreatorPresetLocale, Record<string, CreatorJson>>>;+ locale: CreatorPresetLocale;+ requirement?: CreatorPresetRequirements;+ services: CreatorServicesConfig;+}): Record<string, CreatorJson> {+ const base = input.definition.defaultsSchema.parse(input.defaults);+ const localized = input.definition.localeDefaultsSchema.parse(+ input.defaultsByLocale?.[input.locale] ?? {}+ );+ const merged = deepMerge(base, localized);+ const requirementPatch = resolveCreatorPresetRequirement({+ module: input.definition.module,+ requirement: input.requirement,+ services: input.services+ });+ return input.definition.applyFixedFields(deepMerge(merged, requirementPatch));+}++export function resolveCreatorPresetRequirement(input: {+ module: CreatorRuntimeWorkspace;+ requirement?: CreatorPresetRequirements;+ services: CreatorServicesConfig;+}): Record<string, CreatorJson> {+ const requirement = input.requirement;+ if (input.module === 'image-generation' || input.module === 'cover-generator') {+ const provider = requirement?.provider ?? input.services.image.provider;+ return { provider };+ }+ if (input.module === 'video-generation') {+ const provider = requirement?.provider ?? input.services.video.provider;+ const providerConfig = input.services.video[+ provider as keyof CreatorServicesConfig['video']+ ];+ const configuredModel = (+ providerConfig !== null+ && typeof providerConfig === 'object'+ && 'model' in providerConfig+ && typeof providerConfig.model === 'string'+ ) ? providerConfig.model : '';+ return {+ provider,+ model: requirement?.model ?? configuredModel+ };+ }+ if (input.module === 'smart-dubbing' || input.module === 'video-translation') {+ const provider = requirement?.provider ?? input.services.tts.provider;+ const providerConfig = input.services.tts[+ provider as keyof CreatorServicesConfig['tts']+ ];+ if (providerConfig === undefined || typeof providerConfig === 'string') {+ return { ttsProvider: provider };+ }+ return {+ ttsProvider: provider,+ ttsModel: requirement?.model ?? providerConfig.model,+ voiceCode: providerConfig.defaultVoiceId,+ voiceName: providerConfig.defaultVoiceId+ };+ }+ return {};+}++export function deepMergeCreatorJson(+ base: Record<string, CreatorJson>,+ patch: Record<string, CreatorJson>+): Record<string, CreatorJson> {+ return deepMerge(base, patch);+}++export function assertCreatorPresetStageRequirement(input: {+ job: CreatorJob;+ stageId: string;+ services: CreatorServicesConfig;+}): void {+ if (input.job.presetOrigin === null) return;+ const service = requiredServiceForStage(input.job, input.stageId);+ if (service === undefined) return;+ const snapshot = readRequirementSnapshot(input.job, service);+ if (service === 'image') {+ const provider = requiredProvider(+ service,+ input.job.state.provider,+ snapshot?.provider+ );+ if (!hasImageCredentials(input.services, provider)) {+ missingRequirement(service, provider);+ }+ return;+ }+ if (service === 'video') {+ const provider = requiredProvider(+ service,+ input.job.state.provider,+ snapshot?.provider+ );+ const model = readString(input.job.state.model) ?? snapshot?.model;+ const allowedModels = videoGenerationModelIds[+ provider as keyof typeof videoGenerationModelIds+ ] as readonly string[] | undefined;+ if (+ !hasVideoCredentials(input.services, provider)+ || model === undefined+ || allowedModels === undefined+ || !allowedModels.includes(model)+ || (snapshot?.model !== undefined && snapshot.model !== model)+ ) {+ missingRequirement(service, provider, model);+ }+ return;+ }+ const provider = requiredProvider(+ service,+ input.job.state.ttsProvider,+ snapshot?.provider+ );+ const model = readString(input.job.state.ttsModel) ?? snapshot?.model;+ if (+ !hasTtsCredentials(input.services, provider)+ || model === undefined+ || (snapshot?.model !== undefined && snapshot.model !== model)+ ) {+ missingRequirement(service, provider, model);+ }+}++function deepMerge(+ base: Record<string, CreatorJson>,+ patch: Record<string, CreatorJson>+): Record<string, CreatorJson> {+ const result: Record<string, CreatorJson> = structuredClone(base);+ for (const [key, value] of Object.entries(patch)) {+ const current = result[key];+ if (isRecord(current) && isRecord(value)) {+ result[key] = deepMerge(current, value);+ } else {+ result[key] = structuredClone(value);+ }+ }+ return result;+}++function isRecord(value: CreatorJson | undefined): value is Record<string, CreatorJson> {+ return value !== null && value !== undefined && typeof value === 'object' && !Array.isArray(value);+}++function requiredServiceForStage(+ job: CreatorJob,+ stageId: string+): CreatorPresetRequirements['service'] | undefined {+ if (+ stageId === 'generate'+ && (job.templateId === 'image-generation' || job.templateId === 'cover')+ ) {+ return 'image';+ }+ if (stageId === 'generate' && job.templateId === 'video-generation') {+ return 'video';+ }+ if (+ stageId === 'tts'+ && (+ job.templateId === 'smart-dubbing'+ || (job.templateId === 'video-translation' && job.state.dubbing === true)+ )+ ) {+ return 'tts';+ }+ return undefined;+}++function readRequirementSnapshot(+ job: CreatorJob,+ service: CreatorPresetRequirements['service']+): CreatorPresetRequirements | undefined {+ const details = job.activities.find(activity => activity.action === 'create-job')?.details;+ if (+ details?.requirementService !== service+ || typeof details.requirementProvider !== 'string'+ ) {+ return undefined;+ }+ return {+ service,+ provider: details.requirementProvider,+ ...(typeof details.requirementModel === 'string'+ ? { model: details.requirementModel }+ : {})+ };+}++function requiredProvider(+ service: CreatorPresetRequirements['service'],+ value: CreatorJson | undefined,+ required?: string+): string {+ const provider = readString(value) ?? required;+ if (provider === undefined || (required !== undefined && provider !== required)) {+ missingRequirement(service, required ?? 'unknown');+ }+ return provider;+}++function readString(value: CreatorJson | undefined): string | undefined {+ return typeof value === 'string' && value.trim() ? value.trim() : undefined;+}++function hasImageCredentials(+ services: CreatorServicesConfig,+ provider: string+): boolean {+ if (provider === 'kling') {+ return services.image.kling.accessKey.trim() !== ''+ && services.image.kling.secretKey.trim() !== '';+ }+ if (provider === 'openai' || provider === 'jimeng' || provider === 'gemini') {+ return services.image[provider].apiKey.trim() !== '';+ }+ return false;+}++function hasVideoCredentials(+ services: CreatorServicesConfig,+ provider: string+): boolean {+ if (provider === 'kling') {+ return services.video.kling.accessKey.trim() !== ''+ && services.video.kling.secretKey.trim() !== '';+ }+ if (provider === 'seedance' || provider === 'veo') {+ return services.video[provider].apiKey.trim() !== '';+ }+ return false;+}++function hasTtsCredentials(+ services: CreatorServicesConfig,+ provider: string+): boolean {+ return (provider === 'openai' || provider === 'aliyun' || provider === 'minimax')+ && services.tts[provider].apiKey.trim() !== '';+}++function missingRequirement(+ service: CreatorPresetRequirements['service'],+ provider: string,+ model?: string+): never {+ throw new CreatorExecutorError(+ 'creator_preset_requirement_missing',+ `Configure the required ${service} provider before running this preset: `+ + `${provider}${model === undefined ? '' : ` / ${model}`}`,+ { service, provider, ...(model === undefined ? {} : { model }) }+ );+}diff --git a/apps/daemon/src/creator/presets/schema.ts b/apps/daemon/src/creator/presets/schema.tsnew file mode 100644index 00000000..4c9e0377--- /dev/null+++ b/apps/daemon/src/creator/presets/schema.ts@@ -0,0 +1,144 @@+import {+ creatorRuntimeWorkspaces,+ type CreatorJson,+ type CreatorPresetRequirements+} from '@opencreator/protocol';+import { z } from 'zod';++const localeTextSchema = z.object({+ 'zh-CN': z.string().trim().min(1).max(160),+ 'en-US': z.string().trim().min(1).max(160)+}).strict();++const requirementSchema = z.object({+ service: z.enum(['tts', 'image', 'video']),+ provider: z.string().trim().min(1).max(64),+ model: z.string().trim().min(1).max(128).optional()+}).strict();++const creatorJsonSchema: z.ZodType<CreatorJson> = z.lazy(() => z.union([+ z.null(),+ z.boolean(),+ z.number().finite(),+ z.string(),+ z.array(creatorJsonSchema),+ z.record(creatorJsonSchema)+]));++const creatorJsonRecordSchema = z.record(creatorJsonSchema);++export const creatorPresetSourceManifestSchema = z.object({+ schemaVersion: z.literal(1),+ id: z.string().trim().regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/).max(80),+ version: z.number().int().positive(),+ module: z.enum(creatorRuntimeWorkspaces),+ runtimeTemplate: z.object({+ id: z.string().trim().min(1).max(80),+ version: z.number().int().positive()+ }).strict(),+ status: z.enum(['draft', 'published', 'hidden']),+ featured: z.boolean().default(false),+ sortOrder: z.number().int().min(-10_000).max(10_000).default(0),+ title: localeTextSchema,+ description: localeTextSchema,+ cover: z.string().trim().min(1).max(240),+ tags: z.array(z.string().trim().min(1).max(40)).max(20).default([]),+ requirements: requirementSchema.optional(),+ defaults: creatorJsonRecordSchema,+ defaultsByLocale: z.object({+ 'zh-CN': creatorJsonRecordSchema.optional(),+ 'en-US': creatorJsonRecordSchema.optional()+ }).strict().optional()+}).strict();++export const creatorPresetForbiddenFieldNames = new Set([+ 'apikey',+ 'api_key',+ 'accesskey',+ 'access_key',+ 'accesskeyid',+ 'access_key_id',+ 'accesskeysecret',+ 'access_key_secret',+ 'secretkey',+ 'secret_key',+ 'password',+ 'credential',+ 'credentials',+ 'token',+ 'sourceurl',+ 'source_url',+ 'sourceartifactid',+ 'source_artifact_id',+ 'referenceimageartifactid',+ 'reference_image_artifact_id',+ 'subtitle',+ 'subtitles',+ 'subtitletext',+ 'subtitle_text',+ 'selectedoptionid',+ 'selected_option_id',+ 'formatid',+ 'format_id',+ 'remotetaskid',+ 'remote_task_id',+ 'progress',+ 'error',+ 'result',+ 'artifact',+ 'artifacts',+ 'currentstep',+ 'current_step',+ 'furtheststep',+ 'furthest_step',+ 'currentstage',+ 'current_stage',+ 'workspacephase',+ 'workspace_phase',+ 'resulttab',+ 'result_tab',+ 'resultversion',+ 'result_version',+ 'draftbaseversion',+ 'draft_base_version',+ 'font_name',+ 'raw_ass_style',+ 'override_tags'+]);++export function validatePresetPublicFields(+ value: Record<string, CreatorJson>,+ location: string+): void {+ visitPresetValue(value, location);+}++export function normalizePresetRequirement(+ value: CreatorPresetRequirements | undefined+): CreatorPresetRequirements | undefined {+ return value === undefined ? undefined : requirementSchema.parse(value);+}++function visitPresetValue(value: CreatorJson, location: string): void {+ if (typeof value === 'string' && isAbsolutePath(value)) {+ throw new Error(`${location}: absolute paths are not allowed`);+ }+ if (value === null || typeof value !== 'object') return;+ if (Array.isArray(value)) {+ value.forEach((item, index) => visitPresetValue(item, `${location}[${index}]`));+ return;+ }+ for (const [key, child] of Object.entries(value)) {+ const normalized = key.replaceAll('-', '_').toLowerCase();+ if (creatorPresetForbiddenFieldNames.has(normalized)) {+ throw new Error(`${location}.${key}: field is not allowed in creator presets`);+ }+ visitPresetValue(child, `${location}.${key}`);+ }+}++function isAbsolutePath(value: string): boolean {+ return value.startsWith('/')+ || value.startsWith('\\\\')+ || /^[A-Za-z]:[\\/]/.test(value);+}diff --git a/apps/daemon/src/creator/presets/types.ts b/apps/daemon/src/creator/presets/types.tsnew file mode 100644index 00000000..d67c1f5d--- /dev/null+++ b/apps/daemon/src/creator/presets/types.ts@@ -0,0 +1,91 @@+import type {+ CreatorJson,+ CreatorPresetRef,+ CreatorPresetRequirements,+ CreatorPresetSummary,+ CreatorRuntimeWorkspace+} from '@opencreator/protocol';+import type { ZodType } from 'zod';++export type CreatorPresetLocale = 'zh-CN' | 'en-US';+export type CreatorPresetStatus = 'draft' | 'published' | 'hidden';++export type CreatorPresetLocalizedText = Record<CreatorPresetLocale, string>;++export type CreatorPresetSourceManifest = CreatorPresetRef & {+ schemaVersion: 1;+ runtimeTemplate: {+ id: string;+ version: number;+ };+ status: CreatorPresetStatus;+ featured: boolean;+ sortOrder: number;+ title: CreatorPresetLocalizedText;+ description: CreatorPresetLocalizedText;+ cover: string;+ tags: string[];+ requirements?: CreatorPresetRequirements;+ defaults: Record<string, CreatorJson>;+ defaultsByLocale?: Partial<Record<CreatorPresetLocale, Record<string, CreatorJson>>>;+};++export type CompiledCreatorPreset = Omit<CreatorPresetSourceManifest, 'cover'> & {+ cover: {+ source: string;+ asset: string;+ sha256: string;+ mime: 'image/png' | 'image/jpeg' | 'image/webp';+ width: number;+ height: number;+ size: number;+ };+ contentHash: string;+};++export type CreatorPresetCatalog = {+ schemaVersion: 1;+ presets: CompiledCreatorPreset[];+};++export type CreatorPresetBuildManifest = {+ schemaVersion: 1;+ catalogHash: string;+ assetSetHash: string;+ files: Array<{+ path: string;+ sha256: string;+ size: number;+ }>;+};++export type CreatorPresetModuleDefinition = {+ module: CreatorRuntimeWorkspace;+ runtimeTemplate: {+ id: string;+ version: number;+ };+ defaultsSchema: ZodType<Record<string, CreatorJson>>;+ localeDefaultsSchema: ZodType<Record<string, CreatorJson>>;+ validateRequirement(requirement: CreatorPresetRequirements | undefined): void;+ applyFixedFields(state: Record<string, CreatorJson>): Record<string, CreatorJson>;+};++export type CreatorPresetCompilerOptions = {+ sourceRoot: string;+ outputRoot?: string;+ modules?: readonly CreatorPresetModuleDefinition[];+};++export type ResolvedCreatorPreset = {+ preset: CompiledCreatorPreset;+ locale: CreatorPresetLocale;+ title: string;+ state: Record<string, CreatorJson>;+};++export type CreatorPresetRegistry = {+ readonly catalogHash: string;+ listPublished(locale: CreatorPresetLocale): CreatorPresetSummary[];+ get(ref: CreatorPresetRef): CompiledCreatorPreset;+};diff --git a/apps/daemon/src/creator/repository.ts b/apps/daemon/src/creator/repository.tsindex 0559f767..64ab14a3 100644--- a/apps/daemon/src/creator/repository.ts+++ b/apps/daemon/src/creator/repository.ts@@ -10,6 +10,7 @@ import type {CreatorJob,CreatorJobStatus,CreatorJson,+ CreatorPresetOrigin,CreatorStageRun,CreatorStageDispatchStatus,CreatorStageRunStatus@@ -23,6 +24,8 @@ type RepositoryOptions = {type CreateJobInput = {creationKey?: string;+ creationFingerprint?: string | null;+ presetOrigin?: CreatorPresetOrigin | null;projectId: string;templateId: string;templateVersion: number;@@ -64,6 +67,7 @@ export type CreatorRepository = {createJob(input: CreateJobInput): CreatorJob;getJob(id: string): CreatorJob | undefined;getJobByCreationKey(creationKey: string): CreatorJob | undefined;+ getCreationFingerprint(id: string): string | null;listJobs(projectId?: string): CreatorJob[];deleteJob(id: string): boolean;updateJob(input: {@@ -118,28 +122,33 @@ export function createCreatorRepository(const getJob = (id: string): CreatorJob | undefined => {const row = db.prepare(`SELECT id, project_id, template_id, template_version, status, revision,- state_json, agent_thread_id, created_at, updated_at+ state_json, preset_origin_json, creation_fingerprint,+ agent_thread_id, created_at, updated_atFROM creator_jobsWHERE id = ?`).get(id) as JobRow | undefined;return row === undefined ? undefined : hydrateJob(row);};- const hydrateJob = (row: JobRow): CreatorJob => ({- id: row.id,- projectId: row.project_id,- templateId: row.template_id,- templateVersion: row.template_version,- status: row.status,- revision: row.revision,- state: parseJsonRecord(row.state_json),- agentThreadId: row.agent_thread_id,- stages: listStageRuns(row.id),- artifacts: listArtifacts(row.id),- activities: listActivities(row.id),- createdAt: toIso(row.created_at),- updatedAt: toIso(row.updated_at)- });+ const hydrateJob = (row: JobRow): CreatorJob => {+ validateCreationFingerprint(row.id, row.creation_fingerprint);+ return {+ id: row.id,+ projectId: row.project_id,+ templateId: row.template_id,+ templateVersion: row.template_version,+ status: row.status,+ revision: row.revision,+ state: parseJsonRecord(row.state_json),+ presetOrigin: parsePresetOrigin(row.preset_origin_json),+ agentThreadId: row.agent_thread_id,+ stages: listStageRuns(row.id),+ artifacts: listArtifacts(row.id),+ activities: listActivities(row.id),+ createdAt: toIso(row.created_at),+ updatedAt: toIso(row.updated_at)+ };+ };const listStageRuns = (jobId: string): CreatorStageRun[] => (db.prepare(`@@ -262,17 +271,22 @@ export function createCreatorRepository(const timestamp = now();db.prepare(`INSERT INTO creator_jobs (- id, creation_key, project_id, template_id, template_version, status, revision,- state_json, agent_thread_id, created_at, updated_at- ) VALUES (?, ?, ?, ?, ?, ?, 0, ?, ?, ?, ?)+ id, creation_key, creation_fingerprint, project_id, template_id,+ template_version, status, revision, state_json, preset_origin_json,+ agent_thread_id, created_at, updated_at+ ) VALUES (?, ?, ?, ?, ?, ?, ?, 0, ?, ?, ?, ?, ?)`).run(id,input.creationKey ?? null,+ input.creationFingerprint ?? null,input.projectId,input.templateId,input.templateVersion,input.status,JSON.stringify(input.state),+ input.presetOrigin === undefined || input.presetOrigin === null+ ? null+ : JSON.stringify(input.presetOrigin),input.agentThreadId ?? null,timestamp,timestamp@@ -288,17 +302,29 @@ export function createCreatorRepository(`).get(creationKey) as { id: string } | undefined;return row === undefined ? undefined : getJob(row.id);},+ getCreationFingerprint(id: string): string | null {+ const row = db.prepare(`+ SELECT creation_fingerprint AS fingerprint+ FROM creator_jobs+ WHERE id = ?+ `).get(id) as { fingerprint: string | null } | undefined;+ if (row === undefined) return null;+ validateCreationFingerprint(id, row.fingerprint);+ return row.fingerprint;+ },listJobs(projectId?: string): CreatorJob[] {const rows = projectId === undefined? db.prepare(`SELECT id, project_id, template_id, template_version, status, revision,- state_json, agent_thread_id, created_at, updated_at+ state_json, preset_origin_json, creation_fingerprint,+ agent_thread_id, created_at, updated_atFROM creator_jobsORDER BY updated_at DESC, id DESC`).all(): db.prepare(`SELECT id, project_id, template_id, template_version, status, revision,- state_json, agent_thread_id, created_at, updated_at+ state_json, preset_origin_json, creation_fingerprint,+ agent_thread_id, created_at, updated_atFROM creator_jobsWHERE project_id = ?ORDER BY updated_at DESC, id DESC@@ -701,11 +727,22 @@ type JobRow = {status: CreatorJobStatus;revision: number;state_json: string;+ preset_origin_json: string | null;+ creation_fingerprint: string | null;agent_thread_id: string | null;created_at: string;updated_at: string;};+export class CreatorRepositoryDataError extends Error {+ readonly code = 'creator_data_corrupt';++ constructor(message: string) {+ super(message);+ this.name = 'CreatorRepositoryDataError';+ }+}+type StageRow = {id: string;job_id: string;@@ -789,6 +826,69 @@ function parseJsonRecord(value: string): Record<string, CreatorJson> {return parsed as Record<string, CreatorJson>;}+function parsePresetOrigin(value: string | null): CreatorPresetOrigin | null {+ if (value === null) return null;+ let parsed: unknown;+ try {+ parsed = JSON.parse(value);+ } catch {+ throw new CreatorRepositoryDataError('Creator preset origin contains invalid JSON');+ }+ if (+ !isRecord(parsed)+ || !hasExactKeys(parsed, [+ 'module',+ 'id',+ 'version',+ 'locale',+ 'title',+ 'contentHash'+ ])+ || ![+ 'video-translation',+ 'video-download',+ 'image-generation',+ 'video-generation',+ 'cover-generator',+ 'smart-dubbing'+ ].includes(String(parsed.module))+ || typeof parsed.id !== 'string'+ || parsed.id.trim() === ''+ || typeof parsed.version !== 'number'+ || !Number.isInteger(parsed.version)+ || parsed.version < 1+ || (parsed.locale !== 'zh-CN' && parsed.locale !== 'en-US')+ || typeof parsed.title !== 'string'+ || typeof parsed.contentHash !== 'string'+ || !/^[a-f0-9]{64}$/.test(parsed.contentHash)+ ) {+ throw new CreatorRepositoryDataError('Creator preset origin is invalid');+ }+ return parsed as unknown as CreatorPresetOrigin;+}++function validateCreationFingerprint(id: string, value: string | null): void {+ if (value !== null && !/^[a-f0-9]{64}$/.test(value)) {+ throw new CreatorRepositoryDataError(+ `Creator job ${id} has an invalid creation fingerprint`+ );+ }+}++function isRecord(value: unknown): value is Record<string, unknown> {+ return value !== null && typeof value === 'object' && !Array.isArray(value);+}++function hasExactKeys(+ value: Record<string, unknown>,+ keys: readonly string[]+): boolean {+ const actual = Object.keys(value).sort();+ const expected = [...keys].sort();+ return actual.length === expected.length+ && actual.every((key, index) => key === expected[index]);+}+function parseStringArray(value: string): string[] {const parsed = JSON.parse(value) as unknown;if (!Array.isArray(parsed) || parsed.some(item => typeof item !== 'string')) {diff --git a/apps/daemon/src/creator/service.ts b/apps/daemon/src/creator/service.tsindex 6c152b35..606e98dd 100644--- a/apps/daemon/src/creator/service.ts+++ b/apps/daemon/src/creator/service.ts@@ -7,8 +7,10 @@ import type {CreatorArtifact,CreatorJob,CreatorJobStatus,- CreatorJson+ CreatorJson,+ CreatorPresetOrigin} from '@opencreator/protocol';+import { createDefaultCreatorServicesConfig } from '@opencreator/protocol';import { writeFileSync } from 'node:fs';import { basename, extname, join, dirname } from 'node:path';import type { CreatorRepository } from './repository.js';@@ -19,6 +21,14 @@ import {} from './result-snapshots.js';import type { CreatorTemplateRegistry } from './templates/types.js';import { videoTranslationArtifactRefsPatch } from './templates/video-translation-results.js';+import {+ createBlankCreationFingerprint,+ createPresetCreationFingerprint+} from './creation-fingerprint.js';+import { getCreatorPresetModuleDefinition } from './presets/module-schemas.js';+import { mergeCreatorPresetState } from './presets/requirements.js';+import type { CreatorPresetRegistry } from './presets/types.js';+import type { CreatorServicesConfigStore } from '../creator-services/config-store.js';export type CreatorService = ReturnType<typeof createCreatorService>;@@ -36,52 +46,204 @@ export class CreatorServiceError extends Error {export function createCreatorService(input: {repository: CreatorRepository;templates: CreatorTemplateRegistry;+ presets?: CreatorPresetRegistry;+ creatorServicesConfig?: Pick<CreatorServicesConfigStore, 'read'>;}) {const { repository, templates } = input;const getJob = (id: string): CreatorJob | undefined => repository.getJob(id);- return {- templates,- createJob(request: CreateCreatorJobRequest): CreatorJob {- const template = templates.get(request.templateId, request.templateVersion);- const state = template.inputSchema.parse(request.state ?? {}) as Record<string, CreatorJson>;- return repository.transaction(() => {- if (request.creationKey !== undefined) {- const existing = repository.getJobByCreationKey(request.creationKey);- if (existing !== undefined) {- if (- existing.projectId !== request.projectId- || existing.templateId !== template.id- || existing.templateVersion !== template.version- ) {- throw new CreatorServiceError(- 'creator_idempotency_key_reused',- 'Creator creation key was already used with a different request'- );- }- return existing;- }- }- const job = repository.createJob({- ...(request.creationKey === undefined ? {} : { creationKey: request.creationKey }),+ type PresetCreateRequest = Extract<CreateCreatorJobRequest, { preset: unknown }>;+ type BlankCreateRequest = Omit<+ Extract<CreateCreatorJobRequest, { templateId: string }>,+ 'creationKey'+ > & { creationKey?: string };++ function createJob(request: PresetCreateRequest): Promise<CreatorJob>;+ function createJob(request: BlankCreateRequest): CreatorJob;+ function createJob(request: CreateCreatorJobRequest): CreatorJob | Promise<CreatorJob>;+ function createJob(+ request: PresetCreateRequest | BlankCreateRequest+ ): CreatorJob | Promise<CreatorJob> {+ if ('preset' in request) return createPresetJob(request);+ const template = templates.get(request.templateId, request.templateVersion);+ const state = template.inputSchema.parse(request.state ?? {}) as Record<string, CreatorJson>;+ const fingerprint = request.creationKey === undefined+ ? null+ : createBlankCreationFingerprint({projectId: request.projectId,templateId: template.id,templateVersion: template.version,- status: 'draft',state});- repository.insertActivity({- jobId: job.id,- revision: 0,- actor: 'user',- action: 'create-job',- summary: '创建创作任务',- details: { templateId: template.id, templateVersion: template.version }- });- return repository.getJob(job.id)!;+ return persistCreatedJob({+ creationKey: request.creationKey,+ creationFingerprint: fingerprint,+ projectId: request.projectId,+ templateId: template.id,+ templateVersion: template.version,+ state,+ presetOrigin: null,+ activityDetails: {+ templateId: template.id,+ templateVersion: template.version+ }+ });+ }++ async function createPresetJob(request: PresetCreateRequest): Promise<CreatorJob> {+ if (input.presets === undefined) {+ throw new CreatorServiceError(+ 'creator_preset_not_found',+ 'Creator preset catalog is unavailable'+ );+ }+ let preset;+ try {+ preset = input.presets.get(request.preset);+ } catch {+ throw new CreatorServiceError(+ 'creator_preset_not_found',+ 'Creator preset was not found'+ );+ }+ const definition = getCreatorPresetModuleDefinition(preset.module);+ if (+ preset.runtimeTemplate.id !== definition.runtimeTemplate.id+ || preset.runtimeTemplate.version !== definition.runtimeTemplate.version+ ) {+ throw new CreatorServiceError(+ 'creator_preset_incompatible',+ 'Creator preset runtime binding is incompatible'+ );+ }+ const services = input.creatorServicesConfig === undefined+ ? createDefaultCreatorServicesConfig()+ : await input.creatorServicesConfig.read();+ let state: Record<string, CreatorJson>;+ let template;+ try {+ const merged = mergeCreatorPresetState({+ definition,+ defaults: preset.defaults,+ defaultsByLocale: preset.defaultsByLocale,+ locale: request.locale,+ requirement: preset.requirements,+ services});- },+ template = templates.get(+ preset.runtimeTemplate.id,+ preset.runtimeTemplate.version+ );+ state = template.inputSchema.parse(merged) as Record<string, CreatorJson>;+ } catch (error) {+ throw new CreatorServiceError(+ 'creator_preset_invalid',+ error instanceof Error ? error.message : 'Creator preset state is invalid'+ );+ }+ const origin: CreatorPresetOrigin = {+ module: preset.module,+ id: preset.id,+ version: preset.version,+ locale: request.locale,+ title: preset.title[request.locale],+ contentHash: preset.contentHash+ };+ const fingerprint = createPresetCreationFingerprint({+ projectId: request.projectId,+ preset: {+ module: preset.module,+ id: preset.id,+ version: preset.version,+ contentHash: preset.contentHash+ },+ locale: request.locale,+ templateId: template.id,+ templateVersion: template.version,+ state+ });+ return persistCreatedJob({+ creationKey: request.creationKey,+ creationFingerprint: fingerprint,+ projectId: request.projectId,+ templateId: template.id,+ templateVersion: template.version,+ state,+ presetOrigin: origin,+ activityDetails: {+ templateId: template.id,+ templateVersion: template.version,+ presetModule: preset.module,+ presetId: preset.id,+ presetVersion: preset.version,+ presetLocale: request.locale,+ presetContentHash: preset.contentHash,+ ...(preset.requirements === undefined+ ? {}+ : {+ requirementService: preset.requirements.service,+ requirementProvider: preset.requirements.provider,+ ...(preset.requirements.model === undefined+ ? {}+ : { requirementModel: preset.requirements.model })+ })+ }+ });+ }++ function persistCreatedJob(input: {+ creationKey?: string;+ creationFingerprint: string | null;+ projectId: string;+ templateId: string;+ templateVersion: number;+ state: Record<string, CreatorJson>;+ presetOrigin: CreatorPresetOrigin | null;+ activityDetails: Record<string, CreatorJson>;+ }): CreatorJob {+ return repository.transaction(() => {+ if (input.creationKey !== undefined) {+ const existing = repository.getJobByCreationKey(input.creationKey);+ if (existing !== undefined) {+ const existingFingerprint = repository.getCreationFingerprint(existing.id);+ if (+ input.creationFingerprint === null+ || existingFingerprint !== input.creationFingerprint+ ) {+ throw new CreatorServiceError(+ 'creator_idempotency_key_reused',+ 'Creator creation key was already used with a different request'+ );+ }+ return existing;+ }+ }+ const job = repository.createJob({+ ...(input.creationKey === undefined ? {} : { creationKey: input.creationKey }),+ creationFingerprint: input.creationFingerprint,+ presetOrigin: input.presetOrigin,+ projectId: input.projectId,+ templateId: input.templateId,+ templateVersion: input.templateVersion,+ status: 'draft',+ state: input.state+ });+ repository.insertActivity({+ jobId: job.id,+ revision: 0,+ actor: 'user',+ action: 'create-job',+ summary: '创建创作任务',+ details: input.activityDetails+ });+ return repository.getJob(job.id)!;+ });+ }++ return {+ templates,+ createJob,getJob,listJobs(projectId?: string): CreatorJob[] {return repository.listJobs(projectId);diff --git a/apps/daemon/src/creator/stage-runner.ts b/apps/daemon/src/creator/stage-runner.tsindex 65a246f6..7612b033 100644--- a/apps/daemon/src/creator/stage-runner.ts+++ b/apps/daemon/src/creator/stage-runner.ts@@ -20,6 +20,7 @@ export function createCreatorStageRunner(input: {executors: CreatorExecutor[];workRoot: string;maxConcurrency?: number;+ beforeRun?(job: CreatorJob, stageId: string): void | Promise<void>;onJobChanged?(job: CreatorJob): void;onStageChanged?(stage: CreatorStageRun): void;onStageSucceeded?(stage: CreatorStageRun): void;@@ -117,6 +118,7 @@ export function createCreatorStageRunner(input: {updateJob(input.repository, job, 'needs_input', { currentStage: stageId }, input.onJobChanged);return input.repository.listStageRuns(jobId).find(candidate => candidate.id === stageRun!.id)!;}+ await input.beforeRun?.(input.repository.getJob(jobId)!, stageId);const controller = new AbortController();active.set(stageRun.id, controller);const workdir = join(input.workRoot, jobId, stageRun.id);@@ -230,7 +232,11 @@ export function createCreatorStageRunner(input: {: error instanceof Error? error.message: 'Creator stage failed';- const configurationInput = creatorConfigurationInput(failureCode, failureMessage);+ const configurationInput = creatorConfigurationInput(+ error,+ failureCode,+ failureMessage+ );updateStageRun({id: stageRun.id,status: canceled ? 'canceled' : 'failed',@@ -492,7 +498,20 @@ function resultSnapshotDescription(stageId: string, templateId: string): stringreturn `完成 ${stageId}`;}-function creatorConfigurationInput(code: string, message: string): Record<string, CreatorJson> | null {+function creatorConfigurationInput(+ error: unknown,+ code: string,+ message: string+): Record<string, CreatorJson> | null {+ const presetService = error instanceof CreatorExecutorError+ && error.code === 'creator_preset_requirement_missing'+ && (+ error.details.service === 'tts'+ || error.details.service === 'image'+ || error.details.service === 'video'+ )+ ? error.details.service+ : undefined;const section = code === 'creator_llm_config_missing'? 'llm': code === 'creator_transcription_config_missing'@@ -503,7 +522,7 @@ function creatorConfigurationInput(code: string, message: string): Record<string? 'image': code === 'creator_video_config_missing'? 'video'- : null;+ : presetService ?? null;return section === null ? null : {code,message,diff --git a/apps/daemon/src/creator/templates/registry.ts b/apps/daemon/src/creator/templates/registry.tsindex 5ef8e1e0..5fa58305 100644--- a/apps/daemon/src/creator/templates/registry.ts+++ b/apps/daemon/src/creator/templates/registry.ts@@ -1,4 +1,7 @@-import { createVideoTranslationTemplate } from './video-translation.js';+import {+ createLegacyVideoTranslationTemplate,+ createVideoTranslationTemplate+} from './video-translation.js';import {createLegacyVideoDownloadTemplate,createVideoDownloadTemplate@@ -28,11 +31,13 @@ export {createSmartDubbingTemplate,createLegacyVideoDownloadTemplate,createVideoDownloadTemplate,+ createLegacyVideoTranslationTemplate,createVideoTranslationTemplate};export function createDefaultCreatorTemplateRegistry(): CreatorTemplateRegistry {return createCreatorTemplateRegistry([+ createLegacyVideoTranslationTemplate(),createVideoTranslationTemplate(),createLegacyVideoDownloadTemplate(),createVideoDownloadTemplate(),diff --git a/apps/daemon/src/creator/templates/video-translation.ts b/apps/daemon/src/creator/templates/video-translation.tsindex 1a64ea35..1a07edbf 100644--- a/apps/daemon/src/creator/templates/video-translation.ts+++ b/apps/daemon/src/creator/templates/video-translation.ts@@ -1,12 +1,21 @@import { z } from 'zod';import type { CreatorTemplateDefinition } from './types.js';+import { creatorSubtitleStyleSchema } from '../presets/module-schemas.js';const jsonRecord = z.record(z.string(), z.unknown()) as never;+export function createLegacyVideoTranslationTemplate(): CreatorTemplateDefinition {+ return createVideoTranslationTemplateDefinition(1);+}+export function createVideoTranslationTemplate(): CreatorTemplateDefinition {+ return createVideoTranslationTemplateDefinition(2);+}++function createVideoTranslationTemplateDefinition(version: 1 | 2): CreatorTemplateDefinition {return {id: 'video-translation',- version: 1,+ version,renderer: 'video-translation',inputSchema: z.object({sourceType: z.enum(['url', 'file']).default('url'),@@ -17,6 +26,9 @@ export function createVideoTranslationTemplate(): CreatorTemplateDefinition {preferPlatformCaptions: z.boolean().default(true),bilingual: z.boolean().default(true),subtitlePosition: z.enum(['top', 'bottom']).default('top'),+ ...(version === 2+ ? { subtitleStyle: creatorSubtitleStyleSchema }+ : {}),dubbing: z.boolean().default(false),ttsProvider: z.enum(['openai', 'aliyun', 'edge-tts', 'minimax']).optional(),ttsModel: z.string().optional(),@@ -24,6 +36,8 @@ export function createVideoTranslationTemplate(): CreatorTemplateDefinition {voiceName: z.string().optional(),composeVideo: z.boolean().default(false),videoFormat: z.enum(['horizontal', 'vertical', 'all']).default('horizontal'),+ verticalTitle: z.string().max(80).default(''),+ verticalSubtitle: z.string().max(140).default(''),subtitleCues: z.array(z.object({id: z.union([z.string(), z.number()]),start: z.string(),@@ -144,7 +158,9 @@ export function createVideoTranslationTemplate(): CreatorTemplateDefinition {agentGuidance: ['帮助用户调整视频翻译内容与参数,修改前读取最新 revision。','更新设置必须写入 input.patch。',- '字幕样式字段为 subtitleStyle,可包含 primaryColor、secondaryColor、outlineColor、outlineWidth;不要使用 subtitleColor 等未定义别名。',+ version === 2+ ? '字幕样式只使用完整的 subtitleStyle 结构,不要使用 subtitleFont、subtitleSize、subtitleColor 或任意 ASS 标签。'+ : '历史任务可读取旧字幕样式字段,不要改变其模板版本。','启动执行时使用 availableStageIds 中的 subtitle、tts、render-horizontal 或 render-vertical。'].join(' ')};diff --git a/apps/daemon/src/storage/migrations.ts b/apps/daemon/src/storage/migrations.tsindex 4f9e7803..216876d2 100644--- a/apps/daemon/src/storage/migrations.ts+++ b/apps/daemon/src/storage/migrations.ts@@ -1,4 +1,5 @@import type Database from 'better-sqlite3';+import { createHash } from 'node:crypto';export function migrate(db: Database.Database): void {db.exec(`@@ -321,12 +322,16 @@ export function migrate(db: Database.Database): void {CREATE TABLE IF NOT EXISTS creator_jobs (id TEXT PRIMARY KEY,creation_key TEXT,+ creation_fingerprint TEXT,project_id TEXT NOT NULL,template_id TEXT NOT NULL,template_version INTEGER NOT NULL,status TEXT NOT NULL,revision INTEGER NOT NULL DEFAULT 0,state_json TEXT NOT NULL,+ preset_origin_json TEXT CHECK (+ preset_origin_json IS NULL OR json_valid(preset_origin_json)+ ),agent_thread_id TEXT,created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,updated_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP@@ -625,6 +630,14 @@ export function migrate(db: Database.Database): void {ensureColumn(db, 'creator_stage_runs', 'attempt', 'attempt INTEGER NOT NULL DEFAULT 0');ensureColumn(db, 'creator_stage_runs', 'idempotency_key', 'idempotency_key TEXT');ensureColumn(db, 'creator_jobs', 'creation_key', 'creation_key TEXT');+ ensureColumn(+ db,+ 'creator_jobs',+ 'preset_origin_json',+ 'preset_origin_json TEXT CHECK (preset_origin_json IS NULL OR json_valid(preset_origin_json))'+ );+ ensureColumn(db, 'creator_jobs', 'creation_fingerprint', 'creation_fingerprint TEXT');+ backfillCreatorCreationFingerprints(db);db.prepare(`UPDATE schedulesSET concurrency_policy = 'queue'@@ -679,6 +692,56 @@ export function migrate(db: Database.Database): void {`);}+function backfillCreatorCreationFingerprints(db: Database.Database): void {+ const rows = db.prepare(`+ SELECT id, project_id, template_id, template_version, state_json+ FROM creator_jobs+ WHERE creation_key IS NOT NULL+ AND creation_fingerprint IS NULL+ `).all() as Array<{+ id: string;+ project_id: string;+ template_id: string;+ template_version: number;+ state_json: string;+ }>;+ if (rows.length === 0) return;+ const update = db.prepare(`+ UPDATE creator_jobs+ SET creation_fingerprint = ?+ WHERE id = ? AND creation_fingerprint IS NULL+ `);+ db.transaction(() => {+ for (const row of rows) {+ const parsed = JSON.parse(row.state_json) as unknown;+ const stateHash = createHash('sha256')+ .update(canonicalJson(parsed))+ .digest('hex');+ const fingerprint = createHash('sha256')+ .update(canonicalJson({+ mode: 'blank',+ projectId: row.project_id,+ templateId: row.template_id,+ templateVersion: row.template_version,+ resolvedStateHash: stateHash+ }))+ .digest('hex');+ update.run(fingerprint, row.id);+ }+ })();+}++function canonicalJson(value: unknown): string {+ if (Array.isArray(value)) return `[${value.map(canonicalJson).join(',')}]`;+ if (value !== null && typeof value === 'object') {+ return `{${Object.entries(value as Record<string, unknown>)+ .sort(([left], [right]) => left.localeCompare(right))+ .map(([key, child]) => `${JSON.stringify(key)}:${canonicalJson(child)}`)+ .join(',')}}`;+ }+ return JSON.stringify(value);+}+function assertUniqueCodexThreadIds(db: Database.Database): void {const duplicates = db.prepare(`SELECT codex_thread_id AS codexThreadIddiff --git a/apps/daemon/test/acceptance/creator-presets-cli.test.ts b/apps/daemon/test/acceptance/creator-presets-cli.test.tsnew file mode 100644index 00000000..5102abee--- /dev/null+++ b/apps/daemon/test/acceptance/creator-presets-cli.test.ts@@ -0,0 +1,79 @@+import {+ mkdirSync,+ mkdtempSync,+ readFileSync,+ rmSync+} from 'node:fs';+import { tmpdir } from 'node:os';+import { join } from 'node:path';+import { spawnSync } from 'node:child_process';+import { afterEach, describe, expect, it } from 'vitest';+import {+ copyOfficialPreset,+ hashDirectory,+ repositoryRoot,+ updatePresetManifest+} from '../helpers/creator-preset-fixtures.js';++let tempDir = '';++afterEach(() => {+ if (tempDir) rmSync(tempDir, { recursive: true, force: true });+ tempDir = '';+});++describe('creator presets CLI', () => {+ it('validates compiles and preserves the previous catalog after invalid input', () => {+ tempDir = mkdtempSync(join(tmpdir(), 'creator-presets-cli-'));+ const sourceRoot = join(tempDir, 'template');+ const outputRoot = join(tempDir, 'output');+ mkdirSync(sourceRoot, { recursive: true });+ const preset = copyOfficialPreset({+ sourceRoot,+ module: 'cover-generator',+ sourceId: 'personal-growth'+ });++ const validated = runCli('validate', sourceRoot, outputRoot);+ expect(validated.status).toBe(0);+ expect(validated.stdout).toContain('Validated 1 creator presets');+ expect(() => readFileSync(join(outputRoot, 'catalog.json'))).toThrow();++ const compiled = runCli('compile', sourceRoot, outputRoot);+ expect(compiled.status).toBe(0);+ expect(compiled.stdout).toMatch(/catalog=[a-f0-9]{64} assets=[a-f0-9]{64}/);+ const before = hashDirectory(outputRoot);++ updatePresetManifest(preset, manifest => ({+ ...manifest,+ runtimeTemplate: { id: 'cover-generator', version: 2 }+ }));+ const failed = runCli('compile', sourceRoot, outputRoot);+ expect(failed.status).toBe(1);+ expect(failed.stderr).toContain(+ 'cover-generator/personal-growth/1/template.json.runtimeTemplate'+ );+ expect(hashDirectory(outputRoot)).toBe(before);+ });+});++function runCli(command: 'validate' | 'compile', sourceRoot: string, outputRoot: string) {+ return spawnSync(+ process.execPath,+ [+ '--import',+ 'tsx',+ 'apps/daemon/scripts/creator-presets.ts',+ command+ ],+ {+ cwd: repositoryRoot,+ env: {+ ...process.env,+ OPENCREATOR_PRESET_SOURCE_ROOT: sourceRoot,+ OPENCREATOR_PRESET_CATALOG_ROOT: outputRoot+ },+ encoding: 'utf8'+ }+ );+}diff --git a/apps/daemon/test/helpers/creator-preset-fixtures.ts b/apps/daemon/test/helpers/creator-preset-fixtures.tsnew file mode 100644index 00000000..ff389446--- /dev/null+++ b/apps/daemon/test/helpers/creator-preset-fixtures.ts@@ -0,0 +1,100 @@+import {+ cpSync,+ mkdirSync,+ readFileSync,+ readdirSync,+ statSync,+ writeFileSync+} from 'node:fs';+import { createHash } from 'node:crypto';+import { dirname, join, relative } from 'node:path';+import { fileURLToPath } from 'node:url';+import type { CreatorPresetSourceManifest } from '../../src/creator/presets/types.js';++export const repositoryRoot = fileURLToPath(new URL('../../../../', import.meta.url));+export const officialPresetRoot = join(repositoryRoot, 'template');++export function copyOfficialPreset(input: {+ sourceRoot: string;+ module: CreatorPresetSourceManifest['module'];+ sourceId: string;+ id?: string;+ version?: number;+ status?: CreatorPresetSourceManifest['status'];+ update?: (manifest: CreatorPresetSourceManifest) => CreatorPresetSourceManifest;+}): string {+ const id = input.id ?? input.sourceId;+ const version = input.version ?? 1;+ const source = join(officialPresetRoot, input.module, input.sourceId, '1');+ const target = join(input.sourceRoot, input.module, id, String(version));+ mkdirSync(dirname(target), { recursive: true });+ cpSync(source, target, { recursive: true });+ updatePresetManifest(target, manifest => {+ const normalized: CreatorPresetSourceManifest = {+ ...manifest,+ id,+ version,+ ...(input.status === undefined ? {} : { status: input.status })+ };+ return input.update?.(normalized) ?? normalized;+ });+ return target;+}++export function readPresetManifest(directory: string): CreatorPresetSourceManifest {+ return JSON.parse(readFileSync(join(directory, 'template.json'), 'utf8')) as CreatorPresetSourceManifest;+}++export function updatePresetManifest(+ directory: string,+ update: (manifest: CreatorPresetSourceManifest) => CreatorPresetSourceManifest+): void {+ const manifest = update(readPresetManifest(directory));+ writeFileSync(+ join(directory, 'template.json'),+ `${JSON.stringify(manifest, null, 2)}\n`+ );+}++export function hashDirectory(root: string): string {+ const files: string[] = [];+ walk(root, files);+ files.sort();+ const aggregate = createHash('sha256');+ for (const file of files) {+ const contents = readFileSync(join(root, file));+ aggregate.update(file).update('\0');+ aggregate.update(createHash('sha256').update(contents).digest('hex')).update('\0');+ }+ return aggregate.digest('hex');++ function walk(directory: string, result: string[]) {+ for (const entry of readdirSync(directory, { withFileTypes: true })) {+ const absolute = join(directory, entry.name);+ if (entry.isDirectory()) {+ walk(absolute, result);+ } else if (entry.isFile()) {+ result.push(relative(root, absolute).replaceAll('\\', '/'));+ }+ }+ }+}++export function directoryFiles(root: string): Record<string, string> {+ const result: Record<string, string> = {};+ walk(root);+ return result;++ function walk(directory: string) {+ for (const entry of readdirSync(directory, { withFileTypes: true })) {+ const absolute = join(directory, entry.name);+ if (entry.isDirectory()) {+ walk(absolute);+ } else if (entry.isFile()) {+ const key = relative(root, absolute).replaceAll('\\', '/');+ result[key] = createHash('sha256').update(readFileSync(absolute)).digest('hex');+ result[`${key}:size`] = String(statSync(absolute).size);+ }+ }+ }+}diff --git a/apps/daemon/test/integration/creator-api.test.ts b/apps/daemon/test/integration/creator-api.test.tsindex eede5904..d49161e7 100644--- a/apps/daemon/test/integration/creator-api.test.ts+++ b/apps/daemon/test/integration/creator-api.test.ts@@ -32,6 +32,7 @@ describe('creator api', () => {const created = await request('POST', '/creator/jobs', {projectId: 'project_delete',templateId: 'cover',+ creationKey: 'delete-kept-files',state: { prompt: '待删除封面' }});const job = created.json().job;@@ -48,6 +49,7 @@ describe('creator api', () => {const createdWithFiles = await request('POST', '/creator/jobs', {projectId: 'project_delete_files',templateId: 'cover',+ creationKey: 'delete-with-files',state: { prompt: '连同文件删除的封面' }});const jobWithFiles = createdWithFiles.json().job;@@ -98,6 +100,7 @@ describe('creator api', () => {const created = await request('POST', '/creator/jobs', {projectId: 'project_job_control',templateId: 'video-translation',+ creationKey: 'job-control',state: {sourceType: 'url',sourceUrl: 'https://www.youtube.com/watch?v=job-control',@@ -204,6 +207,101 @@ describe('creator api', () => {});});+ it('lists localized presets and creates a real preset job', async () => {+ await setupServer();+ const catalog = await request('GET', '/creator/presets?locale=en-US');+ expect(catalog.statusCode).toBe(200);+ expect(catalog.json()).toMatchObject({+ locale: 'en-US',+ catalogHash: expect.stringMatching(/^[a-f0-9]{64}$/)+ });+ expect(catalog.json().presets).toContainEqual(expect.objectContaining({+ module: 'image-generation',+ id: 'ecommerce-product',+ version: 1,+ title: 'E-commerce Product Hero',+ coverUrl: expect.stringMatching(/^\/creator-presets\/[a-f0-9]{64}\.webp$/),+ highlights: [+ { text: '1536 × 1024', colors: [] },+ { text: 'Standard quality', colors: [] },+ { text: '2 images', colors: [] }+ ]+ }));++ const created = await request('POST', '/creator/jobs', {+ projectId: 'project_preset_api',+ preset: {+ module: 'image-generation',+ id: 'ecommerce-product',+ version: 1+ },+ locale: 'en-US',+ creationKey: 'api-preset-creation'+ });+ expect(created.statusCode).toBe(201);+ expect(created.json().job).toMatchObject({+ templateId: 'image-generation',+ templateVersion: 2,+ status: 'draft',+ presetOrigin: {+ module: 'image-generation',+ id: 'ecommerce-product',+ version: 1,+ locale: 'en-US',+ title: 'E-commerce Product Hero'+ },+ state: {+ prompt: expect.stringContaining('Professional e-commerce'),+ provider: 'openai'+ },+ stages: []+ });+ });++ it('rejects mixed blank and preset creator job requests without creating jobs', async () => {+ await setupServer();+ const invalidRequests = [{+ projectId: 'project_invalid_preset',+ preset: {+ module: 'image-generation',+ id: 'ecommerce-product',+ version: 1+ },+ locale: 'zh-CN',+ creationKey: 'mixed-state',+ state: {}+ }, {+ projectId: 'project_invalid_preset',+ preset: {+ module: 'image-generation',+ id: 'ecommerce-product',+ version: 1+ },+ locale: 'zh-CN',+ creationKey: 'mixed-template',+ templateId: 'image-generation'+ }, {+ projectId: 'project_invalid_preset',+ templateId: 'image-generation',+ locale: 'en-US',+ creationKey: 'blank-locale'+ }];++ for (const body of invalidRequests) {+ const response = await request('POST', '/creator/jobs', body);+ expect(response.statusCode).toBe(400);+ expect(response.json()).toMatchObject({+ error: { code: 'VALIDATION_FAILED' }+ });+ }++ const listed = await request(+ 'GET',+ '/creator/jobs?projectId=project_invalid_preset'+ );+ expect(listed.json().jobs).toEqual([]);+ });+it('creates, lists, reads and mutates creator jobs', async () => {tempDir = mkdtempSync(join(tmpdir(), 'creator-api-'));server = await buildServer({@@ -222,6 +320,7 @@ describe('creator api', () => {const created = await request('POST', '/creator/jobs', {projectId: 'project_1',templateId: 'video-translation',+ creationKey: 'creator-api-mutation',state: { targetLanguage: 'en' }});expect(created.statusCode).toBe(201);@@ -267,6 +366,7 @@ describe('creator api', () => {const created = await request('POST', '/creator/jobs', {projectId: 'project_vt5',templateId: 'video-translation',+ creationKey: 'unsupported-video-source',state: {sourceType: 'url',sourceUrl: 'https://example.com/video/unsupported',@@ -304,6 +404,7 @@ describe('creator api', () => {const created = await request('POST', '/creator/jobs', {projectId: 'project_local_source',templateId: 'video-translation',+ creationKey: 'local-video-source',state: {sourceType: 'file',targetLanguage: 'en'@@ -377,6 +478,7 @@ describe('creator api', () => {const created = await request('POST', '/creator/jobs', {projectId: 'project_vt6',templateId: 'video-translation',+ creationKey: 'subtitle-before-tts',state: {sourceType: 'url',sourceUrl: 'https://www.youtube.com/watch?v=vt6',@@ -408,6 +510,7 @@ describe('creator api', () => {const created = await request('POST', '/creator/jobs', {projectId: 'project_llm',templateId: 'video-translation',+ creationKey: 'translation-llm-missing',state: {sourceType: 'url',sourceUrl: 'https://www.youtube.com/watch?v=llm',@@ -476,7 +579,8 @@ describe('creator api', () => {await setupServer({ agentRuntime });const created = await request('POST', '/creator/jobs', {projectId: 'project_agent_api',- templateId: 'video-translation'+ templateId: 'video-translation',+ creationKey: 'creator-agent-api'});const job = created.json().job;@@ -533,7 +637,8 @@ describe('creator api', () => {await setupServer();const created = await request('POST', '/creator/jobs', {projectId: 'project_sse',- templateId: 'video-translation'+ templateId: 'video-translation',+ creationKey: 'creator-sse'});const job = created.json().job;await server!.listen({ host: '127.0.0.1', port: 0 });diff --git a/apps/daemon/test/integration/creator-cover-generation.test.ts b/apps/daemon/test/integration/creator-cover-generation.test.tsindex 053b1f40..ad6d943d 100644--- a/apps/daemon/test/integration/creator-cover-generation.test.ts+++ b/apps/daemon/test/integration/creator-cover-generation.test.ts@@ -57,6 +57,7 @@ describe('creator cover generation', () => {const created = await jsonRequest('POST', '/creator/jobs', {projectId: 'project_cover',templateId: 'cover',+ creationKey: 'cover-generation-flow',state: {prompt: 'A cinematic creator portrait',ratio: '16:9',diff --git a/apps/daemon/test/integration/creator-image-generation.test.ts b/apps/daemon/test/integration/creator-image-generation.test.tsindex b8a965c1..39aae320 100644--- a/apps/daemon/test/integration/creator-image-generation.test.ts+++ b/apps/daemon/test/integration/creator-image-generation.test.ts@@ -53,7 +53,8 @@ describe('creator image generation', () => {}));const created = await request('POST', '/creator/jobs', {projectId: 'project_image',- templateId: 'image-generation'+ templateId: 'image-generation',+ creationKey: 'image-generation-flow'});const initial = created.json().job;expect(initial.templateVersion).toBe(2);diff --git a/apps/daemon/test/integration/creator-smart-dubbing.test.ts b/apps/daemon/test/integration/creator-smart-dubbing.test.tsindex b3ddb876..7fa3fe1b 100644--- a/apps/daemon/test/integration/creator-smart-dubbing.test.ts+++ b/apps/daemon/test/integration/creator-smart-dubbing.test.ts@@ -54,7 +54,8 @@ describe('creator smart dubbing', () => {const created = await request('POST', '/creator/jobs', {projectId: 'project_dubbing',- templateId: 'smart-dubbing'+ templateId: 'smart-dubbing',+ creationKey: 'smart-dubbing-flow'});const initial = created.json().job;const updated = await request('POST', `/creator/jobs/${initial.id}/actions`, {diff --git a/apps/daemon/test/integration/creator-subtitle-render.test.ts b/apps/daemon/test/integration/creator-subtitle-render.test.tsnew file mode 100644index 00000000..b52ef64f--- /dev/null+++ b/apps/daemon/test/integration/creator-subtitle-render.test.ts@@ -0,0 +1,228 @@+import { createHash } from 'node:crypto';+import { spawnSync } from 'node:child_process';+import {+ cpSync,+ existsSync,+ mkdirSync,+ mkdtempSync,+ readFileSync,+ rmSync,+ symlinkSync,+ writeFileSync+} from 'node:fs';+import { tmpdir } from 'node:os';+import { delimiter, dirname, join, resolve } from 'node:path';+import { afterAll, describe, expect, it } from 'vitest';+import { buildKrillinSubtitleStyle } from '../../src/creator/krillin/adapter.js';++const repoRoot = resolve(process.cwd(), '../..');+const runtimeRoot = resolve(+ process.env.OPENCREATOR_CREATOR_RUNTIME_ROOT+ ?? join(repoRoot, 'apps/desktop/.pack/creator-runtime/krillinai')+);+const suffix = process.platform === 'win32' ? '.exe' : '';+const cliPath = join(runtimeRoot, 'bin', `krillinai-cli${suffix}`);+const ffmpegPath = join(runtimeRoot, 'bin', `ffmpeg${suffix}`);+const fontManifestPath = join(runtimeRoot, 'fonts', 'manifest.json');+const hasPackagedRuntime = [cliPath, ffmpegPath, fontManifestPath].every(existsSync);+const roots: string[] = [];++afterAll(() => {+ for (const root of roots) rmSync(root, { recursive: true, force: true });+});++describe.runIf(hasPackagedRuntime)('Creator packaged subtitle rendering', () => {+ it('renders visibly different fixed frames and fails when a packaged font is missing', () => {+ const first = renderStyle({+ fontPreset: 'sans',+ fontWeight: 'regular',+ fontSize: 'small',+ primaryColor: '#FFFFFF',+ secondaryColor: '#FFD45C',+ outlineColor: '#000000',+ outlineWidth: 1,+ shadow: {+ enabled: false,+ color: '#000000',+ opacity: 0.65,+ offsetX: 2,+ offsetY: 2,+ blur: 1+ }+ });+ const second = renderStyle({+ fontPreset: 'serif',+ fontWeight: 'bold',+ fontSize: 'large',+ primaryColor: '#7EE7FF',+ secondaryColor: '#FF6B6B',+ outlineColor: '#16202A',+ outlineWidth: 5,+ shadow: {+ enabled: true,+ color: '#000000',+ opacity: 0.4,+ offsetX: -4,+ offsetY: 6,+ blur: 2.5+ }+ });++ expect(first.ass).toContain('Style: Major,OpenCreator Sans Regular,12,&H00FFFFFF');+ expect(first.ass).toContain('Style: Minor,OpenCreator Sans Regular,9,&H005CD4FF');+ expect(second.ass).toContain('Style: Major,OpenCreator Serif Bold,18,&H00FFE77E');+ expect(second.ass).toContain('Style: Minor,OpenCreator Serif Bold,12,&H006B6BFF');+ expect(second.ass).toContain('&H99000000');+ expect(second.ass).toContain(',5,6,2,10,10,20,1');+ expect(second.ass).toContain('\\xshad-4\\yshad6\\blur2.5');+ expect(first.frame.changedPixels).toBeGreaterThan(100);+ expect(second.frame.changedPixels).toBeGreaterThan(first.frame.changedPixels);+ expect(second.frame.sha256).not.toBe(first.frame.sha256);++ const missingRuntime = createMissingFontRuntime('OpenCreatorSerif-Bold.ttf');+ const failed = runCli(second.paths, second.stylePath, missingRuntime);+ expect(failed.status).not.toBe(0);+ expect(`${failed.stdout}\n${failed.stderr}`).toContain(+ 'creator subtitle font unavailable: fonts/OpenCreatorSerif-Bold.ttf'+ );+ });+});++function renderStyle(style: Parameters<typeof buildKrillinSubtitleStyle>[0]) {+ const root = mkdtempSync(join(tmpdir(), 'opencreator-subtitle-render-'));+ roots.push(root);+ const launcher = join(root, 'launcher');+ const workdir = join(root, 'workdir');+ mkdirSync(join(launcher, 'config'), { recursive: true });+ mkdirSync(workdir, { recursive: true });+ writeFileSync(join(launcher, 'config', 'config.toml'), '[app]\nproxy = ""\n');+ const inputVideo = join(workdir, 'background.mp4');+ const subtitle = join(workdir, 'bilingual.srt');+ const stylePath = join(workdir, 'subtitle-style.json');+ writeFileSync(+ subtitle,+ '1\n00:00:00,200 --> 00:00:01,800\nCreator subtitle test\n创作字幕测试\n\n'+ );+ writeFileSync(stylePath, `${JSON.stringify(buildKrillinSubtitleStyle(style), null, 2)}\n`);+ run(ffmpegPath, [+ '-v', 'error',+ '-y',+ '-f', 'lavfi',+ '-i', 'color=c=#202020:s=640x360:d=2:r=25',+ '-c:v', 'libx264',+ '-pix_fmt', 'yuv420p',+ inputVideo+ ]);+ const result = runCli({ launcher, workdir, inputVideo, subtitle }, stylePath, runtimeRoot);+ expect(result.status, `${result.stdout}\n${result.stderr}`).toBe(0);+ const outputVideo = join(workdir, 'horizontal_bilingual.mp4');+ const assPath = join(workdir, 'formatted_horizontal_bilingual.ass');+ expect(existsSync(outputVideo)).toBe(true);+ expect(existsSync(assPath)).toBe(true);+ return {+ ass: readFileSync(assPath, 'utf8'),+ frame: compareFramePixels(inputVideo, outputVideo),+ paths: { launcher, workdir, inputVideo, subtitle },+ stylePath+ };+}++function runCli(+ paths: { launcher: string; workdir: string; inputVideo: string; subtitle: string },+ stylePath: string,+ resourceRoot: string+) {+ const manifest = JSON.parse(readFileSync(join(runtimeRoot, 'manifest.json'), 'utf8'));+ const env = {+ ...process.env,+ PATH: [join(resourceRoot, 'bin'), process.env.PATH ?? ''].join(delimiter),+ Path: [join(resourceRoot, 'bin'), process.env.Path ?? process.env.PATH ?? ''].join(delimiter),+ KRILLINAI_RESOURCE_ROOT: resourceRoot,+ KRILLINAI_OFFLINE_DEPENDENCIES: '1',+ OPENCREATOR_KRILLINAI_CLI: '1',+ ...(manifest.ytDlp?.mode === 'python'+ ? {+ OPENCREATOR_YT_DLP_COMMAND: JSON.stringify([+ join(runtimeRoot, manifest.ytDlp.executable),+ join(runtimeRoot, manifest.ytDlp.script)+ ])+ }+ : {})+ };+ return spawnSync(cliPath, [+ 'render-horizontal',+ '--workdir', paths.workdir,+ '--task-id', 'subtitle-render-test',+ '--video', paths.inputVideo,+ '--subtitle', paths.subtitle,+ '--subtitle-style-file', stylePath+ ], {+ cwd: paths.launcher,+ env,+ encoding: 'utf8',+ timeout: 60_000,+ maxBuffer: 4 * 1024 * 1024+ });+}++function compareFramePixels(sourceVideo: string, renderedVideo: string) {+ const source = rawFrame(sourceVideo);+ const rendered = rawFrame(renderedVideo);+ expect(rendered.length).toBe(source.length);+ let changedPixels = 0;+ for (let offset = 0; offset < rendered.length; offset += 3) {+ const distance = Math.abs(rendered[offset]! - source[offset]!)+ + Math.abs(rendered[offset + 1]! - source[offset + 1]!)+ + Math.abs(rendered[offset + 2]! - source[offset + 2]!);+ if (distance > 24) changedPixels += 1;+ }+ return {+ changedPixels,+ sha256: createHash('sha256').update(rendered).digest('hex')+ };+}++function rawFrame(video: string): Buffer {+ return run(ffmpegPath, [+ '-v', 'error',+ '-ss', '1',+ '-i', video,+ '-frames:v', '1',+ '-f', 'rawvideo',+ '-pix_fmt', 'rgb24',+ 'pipe:1'+ ], null);+}++function createMissingFontRuntime(fileName: string): string {+ const root = mkdtempSync(join(tmpdir(), 'opencreator-missing-font-runtime-'));+ roots.push(root);+ if (process.platform === 'win32') {+ cpSync(join(runtimeRoot, 'bin'), join(root, 'bin'), { recursive: true });+ } else {+ symlinkSync(join(runtimeRoot, 'bin'), join(root, 'bin'), 'dir');+ }+ cpSync(join(runtimeRoot, 'fonts'), join(root, 'fonts'), { recursive: true });+ rmSync(join(root, 'fonts', fileName));+ return root;+}++function run(executable: string, args: string[], encoding: null): Buffer;+function run(executable: string, args: string[], encoding?: BufferEncoding): string;+function run(+ executable: string,+ args: string[],+ encoding: BufferEncoding | null = 'utf8'+): string | Buffer {+ const result = spawnSync(executable, args, {+ encoding,+ timeout: 60_000,+ maxBuffer: 8 * 1024 * 1024+ });+ if (result.status !== 0) {+ throw new Error(+ `${executable} failed (${result.status ?? result.signal}): ${String(result.stderr)}`+ );+ }+ return result.stdout;+}diff --git a/apps/daemon/test/integration/creator-tool-process-lease.test.ts b/apps/daemon/test/integration/creator-tool-process-lease.test.tsindex 31853c22..71dff224 100644--- a/apps/daemon/test/integration/creator-tool-process-lease.test.ts+++ b/apps/daemon/test/integration/creator-tool-process-lease.test.ts@@ -86,6 +86,7 @@ async function createJob(projectId: string) {payload: {projectId,templateId: 'video-translation',+ creationKey: `creator-tool-lease:${projectId}`,state: { targetLanguage: 'en' }}});diff --git a/apps/daemon/test/integration/creator-video-download.test.ts b/apps/daemon/test/integration/creator-video-download.test.tsindex 010e7351..5d957584 100644--- a/apps/daemon/test/integration/creator-video-download.test.ts+++ b/apps/daemon/test/integration/creator-video-download.test.ts@@ -28,7 +28,8 @@ describe('creator video download', () => {const created = await request('POST', '/creator/jobs', {projectId: 'project_download',- templateId: 'video-download'+ templateId: 'video-download',+ creationKey: 'video-download-flow'});const initial = created.json().job;expect(initial.templateVersion).toBe(2);@@ -114,7 +115,8 @@ describe('creator video download', () => {const translation = await request('POST', '/creator/jobs', {projectId: 'project_download',- templateId: 'video-translation'+ templateId: 'video-translation',+ creationKey: 'video-download-import-translation'});const imported = await request('POST',diff --git a/apps/daemon/test/integration/creator-video-generation.test.ts b/apps/daemon/test/integration/creator-video-generation.test.tsindex 6367fed1..b4a0c9ea 100644--- a/apps/daemon/test/integration/creator-video-generation.test.ts+++ b/apps/daemon/test/integration/creator-video-generation.test.ts@@ -99,6 +99,7 @@ describe('creator video generation', () => {const created = await request('POST', '/creator/jobs', {projectId: 'project_video',templateId: 'video-generation',+ creationKey: 'video-generation-flow',state: {prompt: 'A cinematic coastal road',provider: 'seedance',diff --git a/apps/daemon/test/unit/creator-agent-context.test.ts b/apps/daemon/test/unit/creator-agent-context.test.tsindex 0910da00..ddbe0755 100644--- a/apps/daemon/test/unit/creator-agent-context.test.ts+++ b/apps/daemon/test/unit/creator-agent-context.test.ts@@ -63,6 +63,7 @@ function job(): CreatorJob {templateVersion: 1,status: 'completed',revision: 4,+ presetOrigin: null,state: {sourceLanguage: 'en',targetLanguage: 'zh_cn',diff --git a/apps/daemon/test/unit/creator-cover-executor.test.ts b/apps/daemon/test/unit/creator-cover-executor.test.tsindex 6ead73ae..b1c3f679 100644--- a/apps/daemon/test/unit/creator-cover-executor.test.ts+++ b/apps/daemon/test/unit/creator-cover-executor.test.ts@@ -78,6 +78,7 @@ function stageInput(templateVersion: 2,status: 'running',revision: 1,+ presetOrigin: null,state: {sourceType: 'youtube',sourceUrl: 'https://www.youtube.com/watch?v=cover-test',diff --git a/apps/daemon/test/unit/creator-download-executor.test.ts b/apps/daemon/test/unit/creator-download-executor.test.tsindex bb69224a..00f6711f 100644--- a/apps/daemon/test/unit/creator-download-executor.test.ts+++ b/apps/daemon/test/unit/creator-download-executor.test.ts@@ -870,6 +870,7 @@ function stageInput(input: {templateVersion: 2,status: 'running',revision: 1,+ presetOrigin: null,state: input.state,agentThreadId: null,stages: [],diff --git a/apps/daemon/test/unit/creator-image-executor.test.ts b/apps/daemon/test/unit/creator-image-executor.test.tsindex f1d51013..016886ce 100644--- a/apps/daemon/test/unit/creator-image-executor.test.ts+++ b/apps/daemon/test/unit/creator-image-executor.test.ts@@ -331,6 +331,7 @@ function stageInput(templateVersion: jobPatch.templateVersion ?? 1,status: 'running',revision: 1,+ presetOrigin: null,state: {prompt: 'A bright creative studio',provider: 'openai',diff --git a/apps/daemon/test/unit/creator-krillin-subtitle-style.test.ts b/apps/daemon/test/unit/creator-krillin-subtitle-style.test.tsindex 581ceafd..81dae5d6 100644--- a/apps/daemon/test/unit/creator-krillin-subtitle-style.test.ts+++ b/apps/daemon/test/unit/creator-krillin-subtitle-style.test.ts@@ -2,39 +2,75 @@ import { describe, expect, it } from 'vitest';import { buildKrillinSubtitleStyle } from '../../src/creator/krillin/adapter.js';describe('Creator KrillinAI subtitle style mapping', () => {- it('maps translated text to Major and original English text to Minor on both layouts', () => {- expect(buildKrillinSubtitleStyle({- primaryColor: '#FFE0A3',- secondaryColor: '#FFFFFF',- outlineColor: '#2B1B12',- outlineWidth: 4- })).toEqual({- version: 1,- horizontal: {- major: {- primary_color: '#FFE0A3',- outline_color: '#2B1B12',- outline: 4- },- minor: {- primary_color: '#FFFFFF',- outline_color: '#2B1B12',- outline: 4+ it.each([+ ['system', 'regular', 'small', 'OpenCreator Sans Regular', false, [12, 9, 10, 6]],+ ['sans', 'medium', 'medium', 'OpenCreator Sans Medium', false, [14, 10, 12, 7]],+ ['serif', 'bold', 'large', 'OpenCreator Serif Bold', true, [18, 12, 15, 9]],+ ['rounded', 'bold', 'medium', 'OpenCreator Rounded Bold', true, [14, 10, 12, 7]]+ ] as const)(+ 'maps %s/%s/%s to validated horizontal and vertical ASS styles',+ (fontPreset, fontWeight, fontSize, fontName, bold, sizes) => {+ const result = buildKrillinSubtitleStyle({+ fontPreset,+ fontWeight,+ fontSize,+ primaryColor: '#FFE0A3',+ secondaryColor: '#FFFFFF',+ outlineColor: '#2B1B12',+ outlineWidth: 4,+ shadow: {+ enabled: true,+ color: '#123456',+ opacity: 0.4,+ offsetX: -3,+ offsetY: 5,+ blur: 1.5}- },- vertical: {- major: {- primary_color: '#FFE0A3',- outline_color: '#2B1B12',- outline: 4- },- minor: {- primary_color: '#FFFFFF',- outline_color: '#2B1B12',- outline: 4- }- }- });+ }) as {+ horizontal: { major: Record<string, unknown>; minor: Record<string, unknown> };+ vertical: { major: Record<string, unknown>; minor: Record<string, unknown> };+ };+ const styles = [+ result.horizontal.major,+ result.horizontal.minor,+ result.vertical.major,+ result.vertical.minor+ ];++ expect(styles.map(style => style.font_name)).toEqual(Array(4).fill(fontName));+ expect(styles.map(style => style.bold)).toEqual(Array(4).fill(bold));+ expect(styles.map(style => style.font_size)).toEqual(sizes);+ expect(styles.map(style => style.outline_color)).toEqual(Array(4).fill('#2B1B12'));+ expect(styles.map(style => style.outline)).toEqual(Array(4).fill(4));+ expect(styles.map(style => style.back_color)).toEqual(Array(4).fill('&H99563412'));+ expect(styles.map(style => style.shadow)).toEqual(Array(4).fill(5));+ expect(styles.map(style => style.override_tags)).toEqual(+ Array(4).fill('\\xshad-3\\yshad5\\blur1.5')+ );+ expect(result.horizontal.major.primary_color).toBe('#FFE0A3');+ expect(result.vertical.major.primary_color).toBe('#FFE0A3');+ expect(result.horizontal.minor.primary_color).toBe('#FFFFFF');+ expect(result.vertical.minor.primary_color).toBe('#FFFFFF');+ }+ );++ it('disables shadow without retaining controlled override tags', () => {+ const result = buildKrillinSubtitleStyle({+ shadow: { enabled: false }+ }) as {+ horizontal: { major: Record<string, unknown> };+ };++ expect(result.horizontal.major.shadow).toBe(0);+ expect(result.horizontal.major.override_tags).toBe('');+ });++ it('rejects unsupported style fields instead of dropping them', () => {+ expect(() => buildKrillinSubtitleStyle({+ rawAssStyle: 'Style: unsafe'+ })).toThrowError(expect.objectContaining({+ code: 'creator_subtitle_style_unsupported'+ }));});it('omits empty style state instead of overriding KrillinAI defaults', () => {diff --git a/apps/daemon/test/unit/creator-preset-compiler.test.ts b/apps/daemon/test/unit/creator-preset-compiler.test.tsnew file mode 100644index 00000000..515ad287--- /dev/null+++ b/apps/daemon/test/unit/creator-preset-compiler.test.ts@@ -0,0 +1,199 @@+import {+ mkdirSync,+ mkdtempSync,+ readFileSync,+ rmSync,+ symlinkSync,+ writeFileSync+} from 'node:fs';+import { tmpdir } from 'node:os';+import { join } from 'node:path';+import { afterEach, describe, expect, it } from 'vitest';+import {+ compileCreatorPresets,+ validateCreatorPresets+} from '../../src/creator/presets/compiler.js';+import {+ copyOfficialPreset,+ directoryFiles,+ hashDirectory,+ updatePresetManifest+} from '../helpers/creator-preset-fixtures.js';++let tempDir = '';++afterEach(() => {+ if (tempDir) rmSync(tempDir, { recursive: true, force: true });+ tempDir = '';+});++function setup() {+ tempDir = mkdtempSync(join(tmpdir(), 'creator-preset-compiler-'));+ const sourceRoot = join(tempDir, 'template');+ mkdirSync(sourceRoot, { recursive: true });+ return {+ sourceRoot,+ outputRoot: join(tempDir, 'output')+ };+}++describe('creator preset compiler', () => {+ it('rejects traversal symlinks sensitive fields and mismatched directory identity', async () => {+ const fixture = setup();+ const sensitive = copyOfficialPreset({+ sourceRoot: fixture.sourceRoot,+ module: 'image-generation',+ sourceId: 'ecommerce-product'+ });+ updatePresetManifest(sensitive, manifest => ({+ ...manifest,+ defaults: { ...manifest.defaults, apiKey: 'must-not-compile' }+ }));+ await expect(validateCreatorPresets(fixture)).rejects.toThrow(+ 'defaults.apiKey: field is not allowed'+ );++ rmSync(fixture.sourceRoot, { recursive: true, force: true });+ mkdirSync(fixture.sourceRoot, { recursive: true });+ const mismatch = copyOfficialPreset({+ sourceRoot: fixture.sourceRoot,+ module: 'video-download',+ sourceId: 'audio-download'+ });+ updatePresetManifest(mismatch, manifest => ({ ...manifest, id: 'wrong-id' }));+ await expect(validateCreatorPresets(fixture)).rejects.toThrow(+ 'directory identity does not match module/id/version'+ );++ rmSync(fixture.sourceRoot, { recursive: true, force: true });+ mkdirSync(fixture.sourceRoot, { recursive: true });+ const linked = copyOfficialPreset({+ sourceRoot: fixture.sourceRoot,+ module: 'video-download',+ sourceId: 'audio-download'+ });+ const cover = join(linked, 'cover.webp');+ const outside = join(tempDir, 'outside.webp');+ writeFileSync(outside, readFileSync(cover));+ rmSync(cover);+ symlinkSync(outside, cover);+ await expect(validateCreatorPresets(fixture)).rejects.toThrow(+ 'symbolic links are not allowed'+ );++ rmSync(fixture.sourceRoot, { recursive: true, force: true });+ mkdirSync(fixture.sourceRoot, { recursive: true });+ const traversal = copyOfficialPreset({+ sourceRoot: fixture.sourceRoot,+ module: 'video-download',+ sourceId: 'audio-download'+ });+ updatePresetManifest(traversal, manifest => ({ ...manifest, cover: '../cover.webp' }));+ await expect(validateCreatorPresets(fixture)).rejects.toThrow(+ 'cover: traversal is not allowed'+ );+ });++ it('produces byte-stable catalog and content-addressed assets', async () => {+ const fixture = setup();+ copyOfficialPreset({+ sourceRoot: fixture.sourceRoot,+ module: 'video-download',+ sourceId: 'audio-download'+ });+ copyOfficialPreset({+ sourceRoot: fixture.sourceRoot,+ module: 'image-generation',+ sourceId: 'ecommerce-product'+ });++ const firstOutput = join(tempDir, 'first');+ const secondOutput = join(tempDir, 'second');+ const first = await compileCreatorPresets({+ sourceRoot: fixture.sourceRoot,+ outputRoot: firstOutput+ });+ const second = await compileCreatorPresets({+ sourceRoot: fixture.sourceRoot,+ outputRoot: secondOutput+ });++ expect(second).toEqual(first);+ expect(directoryFiles(secondOutput)).toEqual(directoryFiles(firstOutput));+ const catalog = JSON.parse(readFileSync(join(firstOutput, 'catalog.json'), 'utf8'));+ expect(catalog.presets.every((preset: { cover: { asset: string; sha256: string } }) => (+ preset.cover.asset === `assets/${preset.cover.sha256}.webp`+ ))).toBe(true);+ });++ it('compiles the English video translation locale with Runtime language ids', async () => {+ const fixture = setup();+ copyOfficialPreset({+ sourceRoot: fixture.sourceRoot,+ module: 'video-translation',+ sourceId: 'bilibili-bilingual'+ });++ await compileCreatorPresets(fixture);+ const catalog = JSON.parse(readFileSync(+ join(fixture.outputRoot, 'catalog.json'),+ 'utf8'+ ));+ expect(catalog.presets[0].defaultsByLocale['en-US']).toMatchObject({+ sourceLanguage: 'zh_cn',+ targetLanguage: 'en'+ });+ });++ it('keeps cross-module duplicate ids and multiple versions distinct', async () => {+ const fixture = setup();+ for (const version of [1, 2]) {+ copyOfficialPreset({+ sourceRoot: fixture.sourceRoot,+ module: 'video-download',+ sourceId: 'audio-download',+ id: 'shared-preset',+ version+ });+ copyOfficialPreset({+ sourceRoot: fixture.sourceRoot,+ module: 'image-generation',+ sourceId: 'ecommerce-product',+ id: 'shared-preset',+ version+ });+ }++ const catalog = await validateCreatorPresets(fixture);+ expect(catalog.presets.map(preset => (+ `${preset.module}/${preset.id}/${preset.version}`+ ))).toEqual([+ 'image-generation/shared-preset/1',+ 'image-generation/shared-preset/2',+ 'video-download/shared-preset/1',+ 'video-download/shared-preset/2'+ ]);+ expect(new Set(catalog.presets.map(preset => preset.contentHash))).toHaveLength(4);+ });++ it('does not replace the last complete catalog after a failed compile', async () => {+ const fixture = setup();+ const preset = copyOfficialPreset({+ sourceRoot: fixture.sourceRoot,+ module: 'video-download',+ sourceId: 'audio-download'+ });+ await compileCreatorPresets(fixture);+ const before = hashDirectory(fixture.outputRoot);++ updatePresetManifest(preset, manifest => ({+ ...manifest,+ defaults: { ...manifest.defaults, currentStage: 'generate' }+ }));+ await expect(compileCreatorPresets(fixture)).rejects.toThrow(+ 'defaults.currentStage: field is not allowed'+ );++ expect(hashDirectory(fixture.outputRoot)).toBe(before);+ });+});diff --git a/apps/daemon/test/unit/creator-preset-registry.test.ts b/apps/daemon/test/unit/creator-preset-registry.test.tsnew file mode 100644index 00000000..4ff05459--- /dev/null+++ b/apps/daemon/test/unit/creator-preset-registry.test.ts@@ -0,0 +1,156 @@+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 {+ canonicalJson,+ compileCreatorPresets,+ sha256+} from '../../src/creator/presets/compiler.js';+import {+ loadCreatorPresetCatalog+} from '../../src/creator/presets/catalog.js';+import { createDefaultCreatorTemplateRegistry } from '../../src/creator/templates/registry.js';+import {+ copyOfficialPreset+} from '../helpers/creator-preset-fixtures.js';++let tempDir = '';++afterEach(() => {+ if (tempDir) rmSync(tempDir, { recursive: true, force: true });+ tempDir = '';+});++function setup() {+ tempDir = mkdtempSync(join(tmpdir(), 'creator-preset-registry-'));+ const sourceRoot = join(tempDir, 'template');+ const outputRoot = join(tempDir, 'output');+ mkdirSync(sourceRoot, { recursive: true });+ return { sourceRoot, outputRoot };+}++describe('creator preset registry', () => {+ it('returns localized latest published presets and keeps hidden presets addressable', async () => {+ const fixture = setup();+ copyOfficialPreset({+ sourceRoot: fixture.sourceRoot,+ module: 'image-generation',+ sourceId: 'ecommerce-product',+ id: 'localized',+ version: 1,+ update: manifest => ({+ ...manifest,+ title: { 'zh-CN': '旧版', 'en-US': 'Old version' }+ })+ });+ copyOfficialPreset({+ sourceRoot: fixture.sourceRoot,+ module: 'image-generation',+ sourceId: 'ecommerce-product',+ id: 'localized',+ version: 2,+ update: manifest => ({+ ...manifest,+ title: { 'zh-CN': '新版', 'en-US': 'New version' }+ })+ });+ copyOfficialPreset({+ sourceRoot: fixture.sourceRoot,+ module: 'image-generation',+ sourceId: 'ecommerce-product',+ id: 'hidden-one',+ status: 'hidden'+ });+ copyOfficialPreset({+ sourceRoot: fixture.sourceRoot,+ module: 'image-generation',+ sourceId: 'ecommerce-product',+ id: 'draft-one',+ status: 'draft'+ });+ await compileCreatorPresets(fixture);+ const registry = await loadCreatorPresetCatalog({+ root: fixture.outputRoot,+ templates: createDefaultCreatorTemplateRegistry()+ });++ const zhPresets = registry.listPublished('zh-CN');+ const enPresets = registry.listPublished('en-US');+ expect(zhPresets.map(preset => preset.title)).toEqual(['新版']);+ expect(enPresets.map(preset => preset.title)).toEqual(['New version']);+ expect(zhPresets[0]?.highlights).toEqual([+ { text: '1536 × 1024', colors: [] },+ { text: '标准质量', colors: [] },+ { text: '2 张', colors: [] }+ ]);+ expect(enPresets[0]?.highlights).toEqual([+ { text: '1536 × 1024', colors: [] },+ { text: 'Standard quality', colors: [] },+ { text: '2 images', colors: [] }+ ]);+ expect(registry.get({+ module: 'image-generation',+ id: 'hidden-one',+ version: 1+ }).status).toBe('hidden');+ expect(() => registry.get({+ module: 'image-generation',+ id: 'draft-one',+ version: 1+ })).toThrow('Unknown creator preset');+ });++ it('fails catalog health when runtime binding asset or catalog hash is invalid', async () => {+ const fixture = setup();+ copyOfficialPreset({+ sourceRoot: fixture.sourceRoot,+ module: 'image-generation',+ sourceId: 'ecommerce-product'+ });+ await compileCreatorPresets(fixture);++ const manifestPath = join(fixture.outputRoot, 'manifest.json');+ const manifest = JSON.parse(readFileSync(manifestPath, 'utf8'));+ const asset = manifest.files.find((file: { path: string }) => file.path.startsWith('assets/'));+ writeFileSync(join(fixture.outputRoot, asset.path), 'broken');+ await expect(loadCreatorPresetCatalog({+ root: fixture.outputRoot,+ templates: createDefaultCreatorTemplateRegistry()+ })).rejects.toThrow('resource hash mismatch');++ rmSync(fixture.outputRoot, { recursive: true, force: true });+ await compileCreatorPresets(fixture);+ writeFileSync(join(fixture.outputRoot, 'catalog.json'), '{}\n');+ await expect(loadCreatorPresetCatalog({+ root: fixture.outputRoot,+ templates: createDefaultCreatorTemplateRegistry()+ })).rejects.toThrow('catalog hash does not match manifest');++ rmSync(fixture.outputRoot, { recursive: true, force: true });+ await compileCreatorPresets(fixture);+ const catalogPath = join(fixture.outputRoot, 'catalog.json');+ const catalog = JSON.parse(readFileSync(catalogPath, 'utf8'));+ catalog.presets[0].runtimeTemplate = { id: 'missing-runtime', version: 99 };+ const catalogBytes = Buffer.from(`${canonicalJson(catalog)}\n`);+ writeFileSync(catalogPath, catalogBytes);+ const updatedManifest = JSON.parse(readFileSync(manifestPath, 'utf8'));+ updatedManifest.catalogHash = sha256(catalogBytes);+ const catalogEntry = updatedManifest.files.find(+ (file: { path: string }) => file.path === 'catalog.json'+ );+ catalogEntry.sha256 = updatedManifest.catalogHash;+ catalogEntry.size = catalogBytes.length;+ writeFileSync(manifestPath, `${canonicalJson(updatedManifest)}\n`);+ await expect(loadCreatorPresetCatalog({+ root: fixture.outputRoot,+ templates: createDefaultCreatorTemplateRegistry()+ })).rejects.toThrow('incompatible runtime binding missing-runtime@99');+ });+});diff --git a/apps/daemon/test/unit/creator-preset-schemas.test.ts b/apps/daemon/test/unit/creator-preset-schemas.test.tsnew file mode 100644index 00000000..fee7f33b--- /dev/null+++ b/apps/daemon/test/unit/creator-preset-schemas.test.ts@@ -0,0 +1,263 @@+import {+ createDefaultCreatorServicesConfig,+ creatorRuntimeWorkspaces,+ videoGenerationModelIds+} from '@opencreator/protocol';+import { describe, expect, it } from 'vitest';+import {+ creatorPresetModuleDefinitions,+ getCreatorPresetModuleDefinition+} from '../../src/creator/presets/module-schemas.js';+import {+ mergeCreatorPresetState+} from '../../src/creator/presets/requirements.js';+import {+ creatorPresetSourceManifestSchema+} from '../../src/creator/presets/schema.js';++const validDefaults = {+ 'video-translation': {+ sourceLanguage: 'en',+ targetLanguage: 'zh_cn',+ subtitleStyle: {+ fontPreset: 'serif',+ fontWeight: 'medium',+ fontSize: 'large',+ primaryColor: '#FFFFFF',+ secondaryColor: '#FFD45C',+ outlineColor: '#000000',+ outlineWidth: 3,+ shadow: {+ enabled: true,+ color: '#000000',+ opacity: 0.5,+ offsetX: 2,+ offsetY: 3,+ blur: 2+ }+ }+ },+ 'video-download': { mediaType: 'audio' },+ 'image-generation': {+ prompt: 'Product image',+ size: '1536x1024',+ quality: 'high',+ candidateCount: 4+ },+ 'video-generation': {+ prompt: 'Product ad',+ size: '1280x720',+ duration: 5+ },+ 'cover-generator': {+ prompt: 'Growth cover',+ ratio: '9:16',+ candidateCount: 2,+ quality: 'medium'+ },+ 'smart-dubbing': {+ text: 'A calm narration',+ style: 'calm',+ speed: 1,+ format: 'mp3'+ }+} as const;++describe('creator preset module schemas', () => {+ it('accepts only published fields for each creator module', () => {+ for (const module of creatorRuntimeWorkspaces) {+ const definition = getCreatorPresetModuleDefinition(module);+ expect(definition.defaultsSchema.safeParse(validDefaults[module]).success).toBe(true);+ expect(definition.defaultsSchema.safeParse({+ ...validDefaults[module],+ fieldFromAnotherModule: true+ }).success).toBe(false);+ }++ expect(getCreatorPresetModuleDefinition('video-translation')+ .defaultsSchema.safeParse({+ sourceLanguage: 'en',+ targetLanguage: 'en'+ }).success).toBe(false);+ expect(getCreatorPresetModuleDefinition('cover-generator')+ .defaultsSchema.safeParse({ ratio: '3:4' }).success).toBe(false);+ });++ it('merges locale defaults without leaking credentials or UI state', () => {+ const services = createDefaultCreatorServicesConfig();+ services.video.seedance.apiKey = 'secret-video-key';+ services.video.seedance.model = videoGenerationModelIds.seedance[1];+ const definition = getCreatorPresetModuleDefinition('video-generation');+ const state = mergeCreatorPresetState({+ definition,+ defaults: {+ prompt: '中文广告',+ size: '1280x720',+ duration: 5+ },+ defaultsByLocale: {+ 'en-US': { prompt: 'English advertisement' }+ },+ locale: 'en-US',+ services+ });++ expect(state).toMatchObject({+ prompt: 'English advertisement',+ provider: 'seedance',+ model: videoGenerationModelIds.seedance[1]+ });+ expect(JSON.stringify(state)).not.toContain('secret-video-key');+ expect(state).not.toHaveProperty('currentStage');++ const translation = mergeCreatorPresetState({+ definition: getCreatorPresetModuleDefinition('video-translation'),+ defaults: {+ sourceLanguage: 'en',+ targetLanguage: 'zh_cn',+ subtitleStyle: {+ shadow: { offsetX: 7 }+ }+ },+ locale: 'zh-CN',+ services+ });+ expect(translation.subtitleStyle).toMatchObject({+ shadow: {+ offsetX: 7,+ offsetY: 1.5,+ blur: 0.5+ }+ });+ });++ it('resolves the configured or required TTS model without exposing credentials', () => {+ const services = createDefaultCreatorServicesConfig();+ services.tts.provider = 'aliyun';+ services.tts.aliyun.apiKey = 'secret-tts-key';+ services.tts.aliyun.model = 'configured-tts-model';+ services.tts.aliyun.defaultVoiceId = 'ConfiguredVoice';++ const configured = mergeCreatorPresetState({+ definition: getCreatorPresetModuleDefinition('smart-dubbing'),+ defaults: { text: 'Configured model' },+ locale: 'en-US',+ services+ });+ expect(configured).toMatchObject({+ ttsProvider: 'aliyun',+ ttsModel: 'configured-tts-model',+ voiceCode: 'ConfiguredVoice',+ voiceName: 'ConfiguredVoice'+ });+ expect(JSON.stringify(configured)).not.toContain('secret-tts-key');++ const required = mergeCreatorPresetState({+ definition: getCreatorPresetModuleDefinition('video-translation'),+ defaults: {+ sourceLanguage: 'en',+ targetLanguage: 'zh_cn'+ },+ locale: 'zh-CN',+ requirement: {+ service: 'tts',+ provider: 'minimax',+ model: 'required-tts-model'+ },+ services+ });+ expect(required).toMatchObject({+ ttsProvider: 'minimax',+ ttsModel: 'required-tts-model'+ });+ });++ it('applies documented manifest and module defaults when optional fields are omitted', () => {+ const manifest = creatorPresetSourceManifestSchema.parse({+ schemaVersion: 1,+ id: 'minimal-preset',+ version: 1,+ module: 'image-generation',+ runtimeTemplate: { id: 'image-generation', version: 2 },+ status: 'published',+ title: {+ 'zh-CN': '最小模板',+ 'en-US': 'Minimal preset'+ },+ description: {+ 'zh-CN': '验证清单默认值。',+ 'en-US': 'Validate manifest defaults.'+ },+ cover: 'cover.webp',+ defaults: {}+ });+ expect(manifest).toMatchObject({+ featured: false,+ sortOrder: 0,+ tags: []+ });++ expect(getCreatorPresetModuleDefinition('image-generation')+ .defaultsSchema.parse({})).toMatchObject({+ size: '1024x1024',+ quality: 'medium',+ candidateCount: 2+ });+ expect(getCreatorPresetModuleDefinition('cover-generator')+ .defaultsSchema.parse({})).toMatchObject({+ coverStyle: 'bilibili-red-blue-white',+ ratio: '16:9'+ });+ expect(getCreatorPresetModuleDefinition('smart-dubbing')+ .defaultsSchema.parse({})).toMatchObject({+ style: 'natural',+ speed: 1+ });+ expect(getCreatorPresetModuleDefinition('video-translation')+ .defaultsSchema.parse({})).toMatchObject({+ subtitleStyle: {+ secondaryColor: '#D1D5DB',+ outlineWidth: 2.5,+ shadow: {+ opacity: 0.6,+ offsetX: 1.5,+ offsetY: 1.5,+ blur: 0.5+ }+ }+ });+ });++ it('binds every public module and validates provider requirements', () => {+ expect(creatorPresetModuleDefinitions.map(definition => ({+ module: definition.module,+ runtime: `${definition.runtimeTemplate.id}@${definition.runtimeTemplate.version}`+ }))).toEqual([+ { module: 'video-translation', runtime: 'video-translation@2' },+ { module: 'video-download', runtime: 'video-download@2' },+ { module: 'image-generation', runtime: 'image-generation@2' },+ { module: 'video-generation', runtime: 'video-generation@1' },+ { module: 'cover-generator', runtime: 'cover@2' },+ { module: 'smart-dubbing', runtime: 'smart-dubbing@1' }+ ]);++ expect(() => getCreatorPresetModuleDefinition('video-generation')+ .validateRequirement({+ service: 'video',+ provider: 'seedance',+ model: videoGenerationModelIds.seedance[0]+ })).not.toThrow();+ expect(() => getCreatorPresetModuleDefinition('video-generation')+ .validateRequirement({+ service: 'video',+ provider: 'seedance',+ model: 'unavailable-model'+ })).toThrow('unsupported video provider or model');+ expect(() => getCreatorPresetModuleDefinition('image-generation')+ .validateRequirement({+ service: 'image',+ provider: 'openai',+ model: 'gpt-image-1'+ })).toThrow('cannot select a model');+ });+});diff --git a/apps/daemon/test/unit/creator-project-cover.test.ts b/apps/daemon/test/unit/creator-project-cover.test.tsindex 3ed208e7..21fe688b 100644--- a/apps/daemon/test/unit/creator-project-cover.test.ts+++ b/apps/daemon/test/unit/creator-project-cover.test.ts@@ -144,6 +144,7 @@ function creatorJob(artifacts: CreatorArtifact[]): CreatorJob {templateVersion: 1,status: 'completed',revision: 1,+ presetOrigin: null,state: {},agentThreadId: null,stages: [],diff --git a/apps/daemon/test/unit/creator-service.test.ts b/apps/daemon/test/unit/creator-service.test.tsindex 9425395d..ef3c6879 100644--- a/apps/daemon/test/unit/creator-service.test.ts+++ b/apps/daemon/test/unit/creator-service.test.ts@@ -1,12 +1,25 @@import { mkdtempSync, readFileSync, rmSync } from 'node:fs';import { tmpdir } from 'node:os';import { join } from 'node:path';-import { afterEach, describe, expect, it } from 'vitest';+import {+ createDefaultCreatorServicesConfig,+ videoGenerationModelIds,+ type CreatorJson+} from '@opencreator/protocol';+import { afterEach, describe, expect, it, vi } from 'vitest';+import { createCreatorStageRunner } from '../../src/creator/stage-runner.js';import { createCreatorRepository } from '../../src/creator/repository.js';import {CreatorServiceError,createCreatorService} from '../../src/creator/service.js';+import { createCreatorPresetRegistry } from '../../src/creator/presets/catalog.js';+import {+ assertCreatorPresetStageRequirement+} from '../../src/creator/presets/requirements.js';+import type {+ CompiledCreatorPreset+} from '../../src/creator/presets/types.js';import { createDefaultCreatorTemplateRegistry } from '../../src/creator/templates/registry.js';import { openRuntimeDatabase } from '../../src/storage/database.js';@@ -29,6 +42,256 @@ function setup() {}describe('creator service', () => {+ it('creates a draft preset job with resolved editable state and no stage run', async () => {+ const config = createDefaultCreatorServicesConfig();+ const { db, service } = setupPresetService([+ preset({+ module: 'image-generation',+ id: 'ecommerce-product',+ runtimeTemplate: { id: 'image-generation', version: 2 },+ defaults: {+ prompt: '中文商品主图',+ size: '1536x1024',+ quality: 'medium',+ candidateCount: 2+ },+ defaultsByLocale: {+ 'en-US': { prompt: 'English product image' }+ },+ requirements: { service: 'image', provider: 'openai' }+ })+ ], config);++ const job = await service.createJob({+ projectId: 'project_preset',+ preset: {+ module: 'image-generation',+ id: 'ecommerce-product',+ version: 1+ },+ locale: 'en-US',+ creationKey: 'preset-create-1'+ });++ expect(job).toMatchObject({+ templateId: 'image-generation',+ templateVersion: 2,+ status: 'draft',+ state: {+ prompt: 'English product image',+ provider: 'openai',+ size: '1536x1024',+ quality: 'medium',+ candidateCount: 2+ },+ presetOrigin: {+ module: 'image-generation',+ id: 'ecommerce-product',+ version: 1,+ locale: 'en-US',+ title: 'Preset title',+ contentHash: 'a'.repeat(64)+ },+ stages: []+ });+ expect(job.activities[0]?.details).toMatchObject({+ requirementService: 'image',+ requirementProvider: 'openai'+ });+ expect(JSON.stringify(job)).not.toContain('apiKey');+ db.close();+ });++ it('replays only an identical resolved preset creation fingerprint', async () => {+ const config = createDefaultCreatorServicesConfig();+ config.video.seedance.model = videoGenerationModelIds.seedance[0];+ const { db, service } = setupPresetService([+ preset({+ module: 'video-generation',+ id: 'product-ad',+ runtimeTemplate: { id: 'video-generation', version: 1 },+ defaults: {+ prompt: '中文广告',+ size: '1280x720',+ duration: 5+ },+ defaultsByLocale: {+ 'en-US': { prompt: 'English advertisement' }+ }+ })+ ], config);+ const request = {+ projectId: 'project_preset',+ preset: {+ module: 'video-generation' as const,+ id: 'product-ad',+ version: 1+ },+ locale: 'zh-CN' as const,+ creationKey: 'preset-idempotency'+ };++ const created = await service.createJob(request);+ const replayed = await service.createJob(request);+ expect(replayed.id).toBe(created.id);++ await expect(service.createJob({+ ...request,+ locale: 'en-US'+ })).rejects.toMatchObject({ code: 'creator_idempotency_key_reused' });++ config.video.seedance.model = videoGenerationModelIds.seedance[1];+ await expect(service.createJob(request)).rejects.toMatchObject({+ code: 'creator_idempotency_key_reused'+ });+ expect(service.listJobs('project_preset')).toHaveLength(1);+ db.close();+ });++ it('keeps edited preset state and avoids the executor when requirements are missing', async () => {+ const config = createDefaultCreatorServicesConfig();+ const { db, repository, service, templates } = setupPresetService([+ preset({+ module: 'image-generation',+ id: 'paid-image',+ runtimeTemplate: { id: 'image-generation', version: 2 },+ defaults: {+ prompt: 'Initial prompt',+ size: '1536x1024',+ quality: 'medium',+ candidateCount: 2+ },+ requirements: { service: 'image', provider: 'openai' }+ })+ ], config);+ const created = await service.createJob({+ projectId: 'project_preset',+ preset: {+ module: 'image-generation',+ id: 'paid-image',+ version: 1+ },+ locale: 'zh-CN',+ creationKey: 'preset-requirement'+ });+ const edited = service.applyAction(created.id, {+ action: 'update-settings',+ expectedRevision: created.revision,+ input: {+ patch: { prompt: 'Edited before execution' },+ objectId: 'prompt'+ }+ }).job;+ const run = vi.fn(async () => ({ outputs: [] }));+ const runner = createCreatorStageRunner({+ repository,+ templates,+ executors: [{ id: 'image', run }],+ workRoot: join(tempDir, 'jobs'),+ beforeRun(job, stageId) {+ assertCreatorPresetStageRequirement({ job, stageId, services: config });+ }+ });++ const stage = await runner.run(edited.id, 'generate');+ const waiting = service.getJob(edited.id)!;++ expect(stage).toMatchObject({+ status: 'failed',+ errorCode: 'creator_preset_requirement_missing'+ });+ expect(waiting).toMatchObject({+ status: 'needs_input',+ state: {+ prompt: 'Edited before execution',+ needsInput: {+ code: 'creator_preset_requirement_missing',+ deepLink: '#/settings?tab=ai-services§ion=image'+ }+ }+ });+ expect(run).not.toHaveBeenCalled();+ await runner.close();+ db.close();+ });++ it('blocks execution when a preset-required TTS model is changed', async () => {+ const config = createDefaultCreatorServicesConfig();+ config.tts.aliyun.apiKey = 'configured-aliyun-key';+ config.tts.aliyun.model = 'configured-default-model';+ const { db, repository, service, templates } = setupPresetService([+ preset({+ module: 'smart-dubbing',+ id: 'required-voice-model',+ runtimeTemplate: { id: 'smart-dubbing', version: 1 },+ defaults: {+ text: 'A required voice model',+ style: 'natural',+ speed: 1,+ format: 'mp3'+ },+ requirements: {+ service: 'tts',+ provider: 'aliyun',+ model: 'required-tts-model'+ }+ })+ ], config);+ const created = await service.createJob({+ projectId: 'project_preset',+ preset: {+ module: 'smart-dubbing',+ id: 'required-voice-model',+ version: 1+ },+ locale: 'en-US',+ creationKey: 'preset-required-tts-model'+ });+ expect(created.state).toMatchObject({+ ttsProvider: 'aliyun',+ ttsModel: 'required-tts-model'+ });++ const edited = service.applyAction(created.id, {+ action: 'update-settings',+ expectedRevision: created.revision,+ input: {+ patch: { ttsModel: 'tampered-tts-model' },+ objectId: 'ttsModel'+ }+ }).job;+ const run = vi.fn(async () => ({ outputs: [] }));+ const runner = createCreatorStageRunner({+ repository,+ templates,+ executors: [{ id: 'smart-dubbing', run }],+ workRoot: join(tempDir, 'jobs'),+ beforeRun(job, stageId) {+ assertCreatorPresetStageRequirement({ job, stageId, services: config });+ }+ });++ const stage = await runner.run(edited.id, 'tts');+ const waiting = service.getJob(edited.id)!;+ expect(stage).toMatchObject({+ status: 'failed',+ errorCode: 'creator_preset_requirement_missing'+ });+ expect(waiting).toMatchObject({+ status: 'needs_input',+ state: {+ ttsModel: 'tampered-tts-model',+ needsInput: {+ code: 'creator_preset_requirement_missing',+ deepLink: '#/settings?tab=ai-services§ion=tts'+ }+ }+ });+ expect(run).not.toHaveBeenCalled();+ await runner.close();+ db.close();+ });+it('deletes inactive jobs and rejects jobs with an active stage', () => {const { db, service } = setup();const inactive = service.createJob({@@ -254,7 +517,22 @@ describe('creator service', () => {});expect(response.job.revision).toBe(1);- expect(response.job.state.subtitleStyle).toEqual({ primaryColor: '#F6C453' });+ expect(response.job.state.subtitleStyle).toMatchObject({+ fontPreset: 'sans',+ fontWeight: 'bold',+ fontSize: 'medium',+ primaryColor: '#F6C453',+ secondaryColor: '#D1D5DB',+ outlineColor: '#000000',+ outlineWidth: 2.5,+ shadow: {+ enabled: true,+ opacity: 0.6,+ offsetX: 1.5,+ offsetY: 1.5,+ blur: 0.5+ }+ });expect(response.job.activities.at(-1)?.details.objectId).toBe('subtitleStyle');db.close();});@@ -654,3 +932,73 @@ describe('creator service', () => {db.close();});});++function setupPresetService(+ presets: CompiledCreatorPreset[],+ config = createDefaultCreatorServicesConfig()+) {+ tempDir = mkdtempSync(join(tmpdir(), 'creator-service-preset-'));+ const db = openRuntimeDatabase(join(tempDir, 'app.sqlite'));+ const repository = createCreatorRepository(db);+ const templates = createDefaultCreatorTemplateRegistry();+ const service = createCreatorService({+ repository,+ templates,+ presets: createCreatorPresetRegistry({+ catalog: { schemaVersion: 1, presets },+ catalogHash: 'f'.repeat(64)+ }),+ creatorServicesConfig: {+ async read() {+ return structuredClone(config);+ }+ }+ });+ return { db, repository, service, templates };+}++function preset(input: {+ module: CompiledCreatorPreset['module'];+ id: string;+ runtimeTemplate: CompiledCreatorPreset['runtimeTemplate'];+ defaults: Record<string, CreatorJson>;+ defaultsByLocale?: CompiledCreatorPreset['defaultsByLocale'];+ requirements?: CompiledCreatorPreset['requirements'];+}): CompiledCreatorPreset {+ return {+ schemaVersion: 1,+ module: input.module,+ id: input.id,+ version: 1,+ runtimeTemplate: input.runtimeTemplate,+ status: 'published',+ featured: true,+ sortOrder: 10,+ title: {+ 'zh-CN': 'Preset title',+ 'en-US': 'Preset title'+ },+ description: {+ 'zh-CN': 'Preset description',+ 'en-US': 'Preset description'+ },+ tags: ['test'],+ defaults: input.defaults,+ ...(input.defaultsByLocale === undefined+ ? {}+ : { defaultsByLocale: input.defaultsByLocale }),+ ...(input.requirements === undefined+ ? {}+ : { requirements: input.requirements }),+ cover: {+ source: `${input.module}/${input.id}/1/cover.webp`,+ asset: `assets/${'b'.repeat(64)}.webp`,+ sha256: 'b'.repeat(64),+ mime: 'image/webp',+ width: 1280,+ height: 720,+ size: 1024+ },+ contentHash: 'a'.repeat(64)+ };+}diff --git a/apps/daemon/test/unit/creator-storage.test.ts b/apps/daemon/test/unit/creator-storage.test.tsindex 9079781c..62f73757 100644--- a/apps/daemon/test/unit/creator-storage.test.ts+++ b/apps/daemon/test/unit/creator-storage.test.ts@@ -1,7 +1,9 @@import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';import { tmpdir } from 'node:os';import { join } from 'node:path';+import Database from 'better-sqlite3';import { afterEach, describe, expect, it } from 'vitest';+import { createBlankCreationFingerprint } from '../../src/creator/creation-fingerprint.js';import { createCreatorRepository } from '../../src/creator/repository.js';import { openRuntimeDatabase } from '../../src/storage/database.js';@@ -13,6 +15,149 @@ afterEach(() => {});describe('creator storage', () => {+ it('migrates legacy creation keys to blank fingerprints without changing job state', () => {+ tempDir = mkdtempSync(join(tmpdir(), 'creator-storage-'));+ const path = join(tempDir, 'app.sqlite');+ const legacy = new Database(path);+ legacy.exec(`+ CREATE TABLE creator_jobs (+ id TEXT PRIMARY KEY,+ creation_key TEXT,+ project_id TEXT NOT NULL,+ template_id TEXT NOT NULL,+ template_version INTEGER NOT NULL,+ status TEXT NOT NULL,+ revision INTEGER NOT NULL DEFAULT 0,+ state_json TEXT NOT NULL,+ agent_thread_id TEXT,+ created_at TEXT NOT NULL,+ updated_at TEXT NOT NULL+ );+ `);+ const serializedState = '{"targetLanguage":"ja","nested":{"b":2,"a":1}}';+ legacy.prepare(`+ INSERT INTO creator_jobs (+ id, creation_key, project_id, template_id, template_version,+ status, revision, state_json, agent_thread_id, created_at, updated_at+ ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)+ `).run(+ 'creator_job_legacy',+ 'legacy-key',+ 'project_legacy',+ 'video-translation',+ 1,+ 'draft',+ 3,+ serializedState,+ null,+ '2026-09-01T00:00:00.000Z',+ '2026-09-01T00:00:00.000Z'+ );+ legacy.close();++ const migrated = openRuntimeDatabase(path);+ const row = migrated.prepare(`+ SELECT state_json, preset_origin_json, creation_fingerprint+ FROM creator_jobs+ WHERE id = ?+ `).get('creator_job_legacy') as {+ state_json: string;+ preset_origin_json: string | null;+ creation_fingerprint: string;+ };+ migrated.close();++ expect(row.state_json).toBe(serializedState);+ expect(row.preset_origin_json).toBeNull();+ expect(row.creation_fingerprint).toBe(createBlankCreationFingerprint({+ projectId: 'project_legacy',+ templateId: 'video-translation',+ templateVersion: 1,+ state: JSON.parse(serializedState)+ }));+ });++ it('hydrates preset origin and rejects corrupt origin or fingerprint', () => {+ tempDir = mkdtempSync(join(tmpdir(), 'creator-storage-'));+ const path = join(tempDir, 'app.sqlite');+ const db = openRuntimeDatabase(path);+ const repository = createCreatorRepository(db, {+ idFactory: prefix => `${prefix}_${Math.random().toString(36).slice(2)}`+ });+ const origin = {+ module: 'image-generation' as const,+ id: 'ecommerce-product',+ version: 1,+ locale: 'zh-CN' as const,+ title: '电商商品主图',+ contentHash: 'a'.repeat(64)+ };+ const valid = repository.createJob({+ creationKey: 'valid-key',+ creationFingerprint: 'b'.repeat(64),+ presetOrigin: origin,+ projectId: 'project_1',+ templateId: 'image-generation',+ templateVersion: 2,+ status: 'draft',+ state: { prompt: '商品主图' }+ });+ expect(repository.getJob(valid.id)?.presetOrigin).toEqual(origin);++ const extraField = repository.createJob({+ projectId: 'project_1',+ templateId: 'image-generation',+ templateVersion: 2,+ status: 'draft',+ state: {}+ });+ db.prepare(`+ UPDATE creator_jobs+ SET preset_origin_json = ?+ WHERE id = ?+ `).run(JSON.stringify({ ...origin, unexpected: true }), extraField.id);+ expect(() => repository.getJob(extraField.id)).toThrow(+ expect.objectContaining({ code: 'creator_data_corrupt' })+ );++ const invalidJson = repository.createJob({+ projectId: 'project_1',+ templateId: 'image-generation',+ templateVersion: 2,+ status: 'draft',+ state: {}+ });+ db.pragma('ignore_check_constraints = ON');+ db.prepare(`+ UPDATE creator_jobs+ SET preset_origin_json = ?+ WHERE id = ?+ `).run('{invalid', invalidJson.id);+ db.pragma('ignore_check_constraints = OFF');+ expect(() => repository.getJob(invalidJson.id)).toThrow(+ expect.objectContaining({ code: 'creator_data_corrupt' })+ );++ const invalidFingerprint = repository.createJob({+ creationKey: 'bad-fingerprint-key',+ creationFingerprint: 'c'.repeat(64),+ projectId: 'project_1',+ templateId: 'image-generation',+ templateVersion: 2,+ status: 'draft',+ state: {}+ });+ db.prepare(`+ UPDATE creator_jobs+ SET creation_fingerprint = 'not-a-sha256'+ WHERE id = ?+ `).run(invalidFingerprint.id);+ expect(() => repository.getJob(invalidFingerprint.id)).toThrow(+ expect.objectContaining({ code: 'creator_data_corrupt' })+ );+ db.close();+ });+it('reopens creator jobs with artifacts and activities', () => {tempDir = mkdtempSync(join(tmpdir(), 'creator-storage-'));const path = join(tempDir, 'app.sqlite');diff --git a/apps/daemon/test/unit/creator-template-registry.test.ts b/apps/daemon/test/unit/creator-template-registry.test.tsindex 550d4aa1..650ebebe 100644--- a/apps/daemon/test/unit/creator-template-registry.test.ts+++ b/apps/daemon/test/unit/creator-template-registry.test.ts@@ -164,7 +164,7 @@ describe('creator template registry', () => {expect(registry.resolveInvalidatedArtifactKinds('video-translation',- 1,+ 2,'edit-subtitle')).toEqual(['dubbed_audio',@@ -194,6 +194,35 @@ describe('creator template registry', () => {expect(state).not.toHaveProperty('voiceName');});+ it('creates video translation v2 with only structured subtitleStyle', () => {+ const template = createVideoTranslationTemplate();+ const state = template.inputSchema.parse({});++ expect(template.version).toBe(2);+ expect(state).toMatchObject({+ subtitleStyle: {+ fontPreset: 'sans',+ fontWeight: 'bold',+ fontSize: 'medium',+ primaryColor: '#FFFFFF',+ secondaryColor: '#D1D5DB',+ outlineColor: '#000000',+ outlineWidth: 2.5,+ shadow: {+ enabled: true,+ color: '#000000',+ opacity: 0.6,+ offsetX: 1.5,+ offsetY: 1.5,+ blur: 0.5+ }+ }+ });+ expect(state).not.toHaveProperty('subtitleFont');+ expect(state).not.toHaveProperty('subtitleSize');+ expect(state).not.toHaveProperty('subtitleColor');+ });+it('passes the dedicated short subtitle into vertical rendering when available', () => {const template = createVideoTranslationTemplate();expect(template.stages.find(stage => stage.id === 'subtitle')?.outputArtifacts).toContainEqual({diff --git a/apps/daemon/test/unit/creator-tools.test.ts b/apps/daemon/test/unit/creator-tools.test.tsindex c0950d7a..3151283b 100644--- a/apps/daemon/test/unit/creator-tools.test.ts+++ b/apps/daemon/test/unit/creator-tools.test.ts@@ -59,6 +59,7 @@ function job(status: CreatorJob['stages'][number]['status'], revision = 1): CreatemplateVersion: 1,status: status === 'running' ? 'running' : 'completed',revision,+ presetOrigin: null,state: {},agentThreadId: null,stages: [{diff --git a/apps/daemon/test/unit/creator-video-executor.test.ts b/apps/daemon/test/unit/creator-video-executor.test.tsindex 27aefa3b..0d4a2e4f 100644--- a/apps/daemon/test/unit/creator-video-executor.test.ts+++ b/apps/daemon/test/unit/creator-video-executor.test.ts@@ -361,6 +361,7 @@ function stageInput(templateVersion: 1,status: 'running',revision: 1,+ presetOrigin: null,state: {prompt: 'A cinematic city reveal',provider: 'seedance',diff --git a/apps/daemon/tsconfig.scripts.json b/apps/daemon/tsconfig.scripts.jsonnew file mode 100644index 00000000..5a27facb--- /dev/null+++ b/apps/daemon/tsconfig.scripts.json@@ -0,0 +1,10 @@+{+ "extends": "./tsconfig.test.json",+ "compilerOptions": {+ "baseUrl": "../..",+ "paths": {+ "@opencreator/protocol": ["packages/protocol/src/index.ts"]+ }+ },+ "include": ["src/**/*.ts", "scripts/**/*.ts"]+}diff --git a/apps/daemon/vitest.config.ts b/apps/daemon/vitest.config.tsindex 04b3c878..408e5b13 100644--- a/apps/daemon/vitest.config.ts+++ b/apps/daemon/vitest.config.ts@@ -4,6 +4,7 @@ export default defineConfig({test: {environment: 'node',include: ['test/**/*.test.ts'],+ maxWorkers: 2,testTimeout: 10000}});diff --git a/apps/desktop/e2e/creator-packaged-app.spec.ts b/apps/desktop/e2e/creator-packaged-app.spec.tsindex b5cf8f81..3732ee2f 100644--- a/apps/desktop/e2e/creator-packaged-app.spec.ts+++ b/apps/desktop/e2e/creator-packaged-app.spec.ts@@ -1,6 +1,7 @@import { execFileSync, spawnSync } from 'node:child_process';import {chmodSync,+ cpSync,copyFileSync,existsSync,mkdirSync,@@ -12,7 +13,7 @@ import {writeFileSync} from 'node:fs';import { tmpdir } from 'node:os';-import { delimiter, dirname, join, resolve } from 'node:path';+import { basename, delimiter, dirname, join, resolve } from 'node:path';import { fileURLToPath } from 'node:url';import { expect, test, type Page } from '@playwright/test';import { packagedExecutable } from './package-artifact.js';@@ -210,6 +211,7 @@ test('实际 Desktop 包创建并重启恢复 Creator Job,且使用内嵌 Runt}>(currentApp.page, 'POST', '/creator/jobs', {projectId: createdProject.body.project.id,templateId: 'video-translation',+ creationKey: 'packaged-video-translation',state: {sourceType: 'url',sourceUrl: 'https://www.youtube.com/watch?v=creator-package-smoke',@@ -243,6 +245,7 @@ test('实际 Desktop 包创建并重启恢复 Creator Job,且使用内嵌 Runt}>(currentApp.page, 'POST', '/creator/jobs', {projectId: createdProject.body.project.id,templateId: 'video-translation',+ creationKey: 'packaged-local-video-translation',state: {sourceType: 'file',sourceUrl: '',@@ -288,6 +291,7 @@ test('实际 Desktop 包创建并重启恢复 Creator Job,且使用内嵌 Runt}>(currentApp.page, 'POST', '/creator/jobs', {projectId: createdProject.body.project.id,templateId: 'image-generation',+ creationKey: 'packaged-image-generation',state: {prompt: 'Packaged image generation smoke',provider: 'gemini',@@ -317,6 +321,7 @@ test('实际 Desktop 包创建并重启恢复 Creator Job,且使用内嵌 Runt}>(currentApp.page, 'POST', '/creator/jobs', {projectId: createdProject.body.project.id,templateId: 'cover',+ creationKey: 'packaged-cover-generation',state: {prompt: 'Packaged cover generation smoke',ratio: '9:16',@@ -390,6 +395,7 @@ test('实际 Desktop 包创建并重启恢复 Creator Job,且使用内嵌 Runt}>(currentApp.page, 'POST', '/creator/jobs', {projectId: createdProject.body.project.id,templateId: 'video-download',+ creationKey: 'packaged-video-download',state: {sourceUrl: 'https://www.youtube.com/watch?v=C4gJinSiuG4'}@@ -476,6 +482,214 @@ test('实际 Desktop 包创建并重启恢复 Creator Job,且使用内嵌 Runt}});+test('Creator Preset 在实际 Desktop 包中创建并重启恢复', async () => {+ test.setTimeout(180_000);+ const fixture = await launchCreatorDesktop();+ let currentApp: PackagedApp = fixture.app;++ try {+ await waitForWorkspace(currentApp.page);+ expect(currentApp.page.url()).toContain('opencreator-app://app/');+ const catalog = await runtimeRequest<{+ catalogHash: string;+ presets: Array<{+ module: string;+ id: string;+ version: number;+ title: string;+ coverUrl: string;+ }>;+ }>(currentApp.page, 'GET', '/creator/presets?locale=zh-CN');+ expect(catalog.status).toBe(200);+ expect(catalog.body.catalogHash).toMatch(/^[a-f0-9]{64}$/);+ const preset = catalog.body.presets.find(item => (+ item.module === 'video-translation'+ && item.id === 'bilibili-bilingual'+ && item.version === 1+ ));+ expect(preset).toMatchObject({+ title: 'B站双语精翻',+ coverUrl: expect.stringMatching(/^\/creator-presets\/[a-f0-9]{64}\.webp$/)+ });++ const staticResources = await currentApp.page.evaluate(async coverUrl => {+ const [cover, font] = await Promise.all([+ fetch(coverUrl),+ fetch('/fonts/opencreator/OpenCreatorRounded-Bold.woff2')+ ]);+ return {+ cover: {+ status: cover.status,+ contentType: cover.headers.get('content-type'),+ bytes: (await cover.arrayBuffer()).byteLength+ },+ font: {+ status: font.status,+ contentType: font.headers.get('content-type'),+ bytes: (await font.arrayBuffer()).byteLength+ }+ };+ }, preset!.coverUrl);+ expect(staticResources.cover).toMatchObject({+ status: 200,+ contentType: 'image/webp'+ });+ expect(staticResources.cover.bytes).toBeGreaterThan(20_000);+ expect(staticResources.font.status).toBe(200);+ expect(staticResources.font.contentType).toContain('font/woff2');+ expect(staticResources.font.bytes).toBeGreaterThan(10_000);++ const projectDir = join(fixture.root, 'creator-preset-workspace');+ mkdirSync(projectDir, { recursive: true });+ const project = await runtimeRequest<{+ project: { id: string };+ }>(currentApp.page, 'POST', '/projects', {+ cwd: projectDir,+ name: 'Creator Preset 打包态验证',+ sandbox: 'workspace-write'+ });+ expect(project.status).toBe(201);+ const created = await runtimeRequest<{+ job: {+ id: string;+ templateId: string;+ templateVersion: number;+ state: Record<string, unknown>;+ presetOrigin: Record<string, unknown> | null;+ stages: unknown[];+ };+ }>(currentApp.page, 'POST', '/creator/jobs', {+ projectId: project.body.project.id,+ preset: {+ module: 'video-translation',+ id: 'bilibili-bilingual',+ version: 1+ },+ locale: 'zh-CN',+ creationKey: 'packaged-creator-preset'+ });+ expect(created.status).toBe(201);+ expect(created.body.job).toMatchObject({+ templateId: 'video-translation',+ templateVersion: 2,+ state: {+ bilingual: true,+ targetLanguage: 'zh_cn'+ },+ presetOrigin: {+ module: 'video-translation',+ id: 'bilibili-bilingual',+ version: 1,+ locale: 'zh-CN',+ title: 'B站双语精翻'+ },+ stages: []+ });++ const relaunchInput = {+ executablePath: currentApp.executablePath,+ launchArgs: currentApp.launchArgs,+ env: currentApp.env+ };+ await closePackagedApp(currentApp);+ currentApp = await relaunchPackagedApp(relaunchInput, 45_000);+ await waitForWorkspace(currentApp.page);+ const restored = await runtimeRequest<{+ job: {+ id: string;+ state: Record<string, unknown>;+ presetOrigin: Record<string, unknown> | null;+ };+ }>(+ currentApp.page,+ 'GET',+ `/creator/jobs/${encodeURIComponent(created.body.job.id)}`+ );+ expect(restored.status).toBe(200);+ expect(restored.body.job).toMatchObject({+ id: created.body.job.id,+ state: {+ bilingual: true,+ targetLanguage: 'zh_cn'+ },+ presetOrigin: created.body.job.presetOrigin+ });+ } finally {+ await closePackagedApp(currentApp).catch(() => undefined);+ if (process.env.OPENCREATOR_E2E_KEEP_TEMP !== '1') {+ rmSync(fixture.root, {+ recursive: true,+ force: true,+ maxRetries: 10,+ retryDelay: 100+ });+ }+ }+});++test('Creator Preset verifier 拒绝损坏和陈旧的打包资源', () => {+ test.setTimeout(300_000);+ const sourceRoot = packagedPackageRoot();+ const fixtureRoot = mkdtempSync(join(tmpdir(), 'opencreator-preset-verifier-'));+ const packageRoot = join(fixtureRoot, basename(sourceRoot));+ clonePackageRoot(sourceRoot, packageRoot);+ const resources = packagedResourcesRoot(packageRoot);+ const presetRoot = join(resources, 'daemon', 'runtime', 'creator-presets');+ const manifestPath = join(presetRoot, 'manifest.json');+ const catalogPath = join(presetRoot, 'catalog.json');+ const manifestBytes = readFileSync(manifestPath);+ const catalogBytes = readFileSync(catalogPath);+ const presetManifest = JSON.parse(manifestBytes.toString('utf8')) as {+ files: Array<{ path: string }>;+ };+ const coverName = basename(+ presetManifest.files.find(file => file.path.startsWith('assets/'))!.path+ );+ const coverPath = join(resources, 'web', 'creator-presets', coverName);+ const coverBytes = readFileSync(coverPath);+ const stalePath = join(resources, 'web', 'creator-presets', 'stale.webp');++ try {+ expect(runPackagedVerifier(packageRoot).status).toBe(0);++ rmSync(catalogPath);+ expectVerifierFailure(+ runPackagedVerifier(packageRoot),+ 'catalog.json'+ );+ writeFileSync(catalogPath, catalogBytes);++ const substitutedManifest = JSON.parse(manifestBytes.toString('utf8'));+ substitutedManifest.assetSetHash = '0'.repeat(64);+ writeFileSync(manifestPath, `${JSON.stringify(substitutedManifest)}\n`);+ expectVerifierFailure(+ runPackagedVerifier(packageRoot),+ 'Creator preset asset set hash mismatch'+ );+ writeFileSync(manifestPath, manifestBytes);++ rmSync(coverPath);+ expectVerifierFailure(+ runPackagedVerifier(packageRoot),+ 'Creator preset Web asset is missing'+ );+ writeFileSync(coverPath, coverBytes);++ writeFileSync(stalePath, coverBytes);+ expectVerifierFailure(+ runPackagedVerifier(packageRoot),+ 'Creator preset Web assets contain a stale file'+ );+ } finally {+ rmSync(fixtureRoot, {+ recursive: true,+ force: true,+ maxRetries: 10,+ retryDelay: 100+ });+ }+});+function hasWhisperKitDependency(root: string): boolean {const dependencyRoot = join(root,@@ -640,6 +854,59 @@ function packagedRuntimeRoot(): string {: join(packageRoot, 'resources', 'creator-runtime', 'krillinai');}+function packagedPackageRoot(): string {+ const executable = packagedExecutable(desktopDir);+ return process.platform === 'darwin'+ ? resolve(dirname(executable), '../..')+ : dirname(executable);+}++function packagedResourcesRoot(packageRoot: string): string {+ return process.platform === 'darwin'+ ? join(packageRoot, 'Contents', 'Resources')+ : join(packageRoot, 'resources');+}++function clonePackageRoot(source: string, destination: string): void {+ if (process.platform === 'darwin') {+ const result = spawnSync('cp', ['-cR', source, destination], {+ encoding: 'utf8',+ timeout: 5 * 60_000+ });+ if (result.status === 0) return;+ } else if (process.platform === 'linux') {+ const result = spawnSync('cp', ['-a', '--reflink=auto', source, destination], {+ encoding: 'utf8',+ timeout: 5 * 60_000+ });+ if (result.status === 0) return;+ }+ cpSync(source, destination, { recursive: true });+}++function runPackagedVerifier(packageRoot: string): ReturnType<typeof spawnSync> {+ return spawnSync(process.execPath, [+ join(desktopDir, 'scripts', 'verify-package.mjs')+ ], {+ cwd: resolve(desktopDir, '../..'),+ env: {+ ...process.env,+ OPENCREATOR_DESKTOP_PACKAGE_ROOT: packageRoot+ },+ encoding: 'utf8',+ timeout: 5 * 60_000,+ maxBuffer: 20 * 1024 * 1024+ });+}++function expectVerifierFailure(+ result: ReturnType<typeof spawnSync>,+ message: string+): void {+ expect(result.status).not.toBe(0);+ expect(`${result.stdout}\n${result.stderr}`).toContain(message);+}+function executableResource(path: string): string {return process.platform === 'win32' ? `${path}.exe` : path;}diff --git a/apps/desktop/e2e/desktop.spec.ts b/apps/desktop/e2e/desktop.spec.tsindex 1bf93c4e..8707d136 100644--- a/apps/desktop/e2e/desktop.spec.ts+++ b/apps/desktop/e2e/desktop.spec.ts@@ -631,6 +631,7 @@ test('打包 App 使用 Codex app-server 并持久化项目与会话', async ({}}>(fixture.page, 'POST', '/creator/jobs', {projectId: defaultProject.id,templateId: 'cover',+ creationKey: 'desktop-default-cover',state: { prompt: '默认项目封面' }});expect(initialCreatorJob.status).toBe(201);@@ -681,6 +682,7 @@ test('打包 App 使用 Codex app-server 并持久化项目与会话', async ({}}>(fixture.page, 'POST', '/creator/jobs', {projectId: createdProject.body.project.id,templateId: 'cover',+ creationKey: 'desktop-persisted-cover',state: { prompt: '持久化项目封面' }});expect(createdCreatorJob.status).toBe(201);diff --git a/apps/desktop/package.json b/apps/desktop/package.jsonindex f9c7fe1d..2eb8a394 100644--- a/apps/desktop/package.json+++ b/apps/desktop/package.json@@ -43,6 +43,7 @@"electron": "^43.1.1","electron-builder": "^26.15.3","esbuild": "^0.25.0",+ "fontkit": "2.0.4","node-gyp": "13.0.2","typescript": "^5.7.3","vite": "^6.0.7",diff --git a/apps/desktop/packaging/daemon-runtime/package.json b/apps/desktop/packaging/daemon-runtime/package.jsonindex f9face38..f5f03639 100644--- a/apps/desktop/packaging/daemon-runtime/package.json+++ b/apps/desktop/packaging/daemon-runtime/package.json@@ -12,6 +12,7 @@"cross-spawn": "7.0.6","fastify": "5.9.0","https-proxy-agent": "7.0.6",+ "image-size": "2.0.2","nanoid": "5.1.16","yaml": "2.9.0","zod": "3.25.76"diff --git a/apps/desktop/packaging/daemon-runtime/pnpm-lock.yaml b/apps/desktop/packaging/daemon-runtime/pnpm-lock.yamlindex 91483b3b..781abe22 100644--- a/apps/desktop/packaging/daemon-runtime/pnpm-lock.yaml+++ b/apps/desktop/packaging/daemon-runtime/pnpm-lock.yaml@@ -32,6 +32,9 @@ importers:https-proxy-agent:specifier: 7.0.6version: 7.0.6+ image-size:+ specifier: 2.0.2+ version: 2.0.2nanoid:specifier: 5.1.16version: 5.1.16@@ -368,6 +371,11 @@ packages:resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}+ resolution: {integrity: sha512-IRqXKlaXwgSMAMtpNzZa1ZAe8m+Sa1770Dhk8VkSsP9LS+iHD62Zd8FQKs8fbPiagBE7BzoFX23cxFnwshpV6w==}+ engines: {node: '>=16.x'}+ hasBin: true+resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}@@ -1101,6 +1109,8 @@ snapshots:+ [email protected]: {}+diff --git a/apps/desktop/scripts/package-release.mjs b/apps/desktop/scripts/package-release.mjsindex c74dc90e..12fefbc7 100644--- a/apps/desktop/scripts/package-release.mjs+++ b/apps/desktop/scripts/package-release.mjs@@ -151,6 +151,48 @@ const creatorRuntimeManifest = JSON.parse(readFileSync(resolve(desktopDir, '.pack', 'creator-runtime', 'krillinai', 'manifest.json'),'utf8'));+const creatorSubtitleFontSourceManifest = JSON.parse(readFileSync(+ resolve(rootDir, 'assets', 'creator-subtitle-fonts', 'manifest.json'),+ 'utf8'+));+const creatorPresetManifest = JSON.parse(readFileSync(+ resolve(+ desktopDir,+ '.pack',+ 'daemon',+ 'runtime',+ 'creator-presets',+ 'manifest.json'+ ),+ 'utf8'+));+const creatorSubtitleFontResources = creatorRuntimeManifest.resources+ .filter(resource => (+ resource.path.startsWith('fonts/')+ || resource.path.startsWith('licenses/fonts/')+ ));+const creatorSubtitleWebFontResources = creatorSubtitleFontSourceManifest.fonts+ .map(font => {+ if (+ typeof font?.webFile !== 'string'+ || typeof font?.webSha256 !== 'string'+ || !/^[a-f0-9]{64}$/i.test(font.webSha256)+ ) {+ throw new Error('Creator subtitle Web font manifest is invalid');+ }+ const source = resolve(rootDir, 'assets', 'creator-subtitle-fonts', font.webFile);+ const built = resolve(rootDir, 'apps', 'web', 'dist', 'fonts', 'opencreator', basename(font.webFile));+ if (!existsSync(source) || hashFile(source) !== font.webSha256.toLowerCase()) {+ throw new Error(`Creator subtitle Web source font hash mismatch: ${font.webFile}`);+ }+ if (!existsSync(built) || hashFile(built) !== font.webSha256.toLowerCase()) {+ throw new Error(`Creator subtitle Web build font hash mismatch: ${built}`);+ }+ return {+ path: `fonts/opencreator/${basename(font.webFile)}`,+ sha256: font.webSha256.toLowerCase()+ };+ });const manifest = {version: 1,commit: gitOutput(['rev-parse', 'HEAD']) || 'unknown',@@ -165,6 +207,17 @@ const manifest = {webFileCount: webBuild.fileCount,creatorAgentRuntimeHash: creatorAgentRuntime.hash,creatorAgentRuntimeFileCount: creatorAgentRuntime.fileCount,+ creatorPresetCatalogHash: creatorPresetManifest.catalogHash,+ creatorPresetAssetSetHash: creatorPresetManifest.assetSetHash,+ creatorPresetResourceCount: creatorPresetManifest.files.length,+ creatorSubtitleFontSetHash: hashResourceDescriptors(+ creatorSubtitleFontResources+ ),+ creatorSubtitleFontResourceCount: creatorSubtitleFontResources.length,+ creatorSubtitleWebFontSetHash: hashResourceDescriptors(+ creatorSubtitleWebFontResources+ ),+ creatorSubtitleWebFontResourceCount: creatorSubtitleWebFontResources.length,codexRuntimeVersion: codexRuntimeManifest.version,codexRuntimeCommit: codexRuntimeManifest.commit,codexRuntimeBinarySha256: codexRuntimeManifest.binary.sha256,@@ -467,6 +520,20 @@ function hashFile(path) {return createHash('sha256').update(readFileSync(path)).digest('hex');}+function hashResourceDescriptors(resources) {+ const aggregate = createHash('sha256');+ for (const resource of [...resources].sort((left, right) => (+ left.path.localeCompare(right.path)+ ))) {+ aggregate+ .update(resource.path)+ .update('\0')+ .update(resource.sha256)+ .update('\0');+ }+ return aggregate.digest('hex');+}+function listRelativeFiles(root, current = root) {const files = [];for (const entry of readdirSync(current, { withFileTypes: true })) {diff --git a/apps/desktop/scripts/prepare-creator-runtime.mjs b/apps/desktop/scripts/prepare-creator-runtime.mjsindex 2ff5ced6..f6c39efc 100644--- a/apps/desktop/scripts/prepare-creator-runtime.mjs+++ b/apps/desktop/scripts/prepare-creator-runtime.mjs@@ -17,6 +17,7 @@ import { execFileSync } from 'node:child_process';import { tmpdir } from 'node:os';import { dirname, join, relative, resolve } from 'node:path';import { fileURLToPath } from 'node:url';+import * as fontkit from 'fontkit';const scriptDir = dirname(fileURLToPath(import.meta.url));const desktopDir = resolve(scriptDir, '..');@@ -42,6 +43,7 @@ const binDir = join(outputRoot, 'bin');const executableSuffix = targetPlatform === 'win32' ? '.exe' : '';const configuredYtDlpPath = process.env.OPENCREATOR_YT_DLP_PATH?.trim();const runtimeMode = 'cli';+const subtitleFontSourceRoot = join(rootDir, 'assets', 'creator-subtitle-fonts');ensureKrillinBuild();ensureExternalDependencies();@@ -52,6 +54,7 @@ const sourceCommit = krillinBuild.sourceCommit;const sourceSha256 = krillinBuild.sourceSha256;rmSync(outputRoot, { recursive: true, force: true });mkdirSync(binDir, { recursive: true });+const subtitleFonts = prepareSubtitleFonts();const primaryExecutablePath = join(binDir, `krillinai-cli${executableSuffix}`);copyExecutable(@@ -87,6 +90,10 @@ const buildRecord = {sourceCommit,sourceSha256,ytDlp: ytDlpRuntime.descriptor,+ subtitleFonts: {+ manifestSha256: subtitleFonts.manifestSha256,+ resourceCount: subtitleFonts.resourcePaths.length+ },integrationPatchSha256: hashFiles([join(rootDir, 'scripts', 'build-krillinai.mjs'),join(scriptDir, 'install-creator-runtime-dependencies.mjs'),@@ -108,6 +115,7 @@ const resourcePaths = [primaryExecutablePath,...externalInputs.map(([name]) => join(binDir, `${name}${executableSuffix}`)),...ytDlpRuntime.resourcePaths,+ ...subtitleFonts.resourcePaths,subtitleStylePath,buildRecordPath];@@ -132,6 +140,146 @@ const manifest = {writeFileSync(join(outputRoot, 'manifest.json'), `${JSON.stringify(manifest, null, 2)}\n`);console.log(JSON.stringify({ ok: true, outputRoot, resources: manifest.resources.length }));+function prepareSubtitleFonts() {+ const sourceManifestPath = join(subtitleFontSourceRoot, 'manifest.json');+ if (!existsSync(sourceManifestPath)) {+ throw new Error(`Creator subtitle font manifest is missing: ${sourceManifestPath}`);+ }+ const sourceManifest = JSON.parse(readFileSync(sourceManifestPath, 'utf8'));+ if (+ sourceManifest?.version !== 1+ || !Array.isArray(sourceManifest.fonts)+ || sourceManifest.fonts.length !== 9+ || !Array.isArray(sourceManifest.licenses)+ || sourceManifest.licenses.length < 1+ ) {+ throw new Error('Creator subtitle font manifest is invalid');+ }++ const runtimeFontsDir = join(outputRoot, 'fonts');+ const runtimeLicensesDir = join(outputRoot, 'licenses', 'fonts');+ mkdirSync(runtimeFontsDir, { recursive: true });+ mkdirSync(runtimeLicensesDir, { recursive: true });+ const resourcePaths = [];+ const runtimeFonts = [];+ const seenAliases = new Set();+ for (const entry of sourceManifest.fonts) {+ if (+ !['sans', 'serif', 'rounded'].includes(entry?.preset)+ || !['regular', 'medium', 'bold'].includes(entry?.weight)+ || ![400, 500, 700].includes(entry?.weightValue)+ || typeof entry?.family !== 'string'+ || typeof entry?.fullName !== 'string'+ || typeof entry?.desktopFile !== 'string'+ || !/\.(?:otf|ttf)$/i.test(entry.desktopFile)+ || !/^[a-f0-9]{64}$/i.test(entry?.desktopSha256 ?? '')+ || typeof entry?.webFile !== 'string'+ || !/\.woff2$/i.test(entry.webFile)+ || !/^[a-f0-9]{64}$/i.test(entry?.webSha256 ?? '')+ || typeof entry?.license !== 'string'+ ) {+ throw new Error('Creator subtitle font manifest contains an invalid font entry');+ }+ const desktopSource = resolveAssetPath(subtitleFontSourceRoot, entry.desktopFile);+ if (+ !existsSync(desktopSource)+ || hashFile(desktopSource) !== entry.desktopSha256.toLowerCase()+ ) {+ throw new Error(`Creator subtitle desktop font hash mismatch: ${entry.desktopFile}`);+ }+ const webSource = resolveAssetPath(subtitleFontSourceRoot, entry.webFile);+ if (+ !existsSync(webSource)+ || hashFile(webSource) !== entry.webSha256.toLowerCase()+ ) {+ throw new Error(`Creator subtitle Web font hash mismatch: ${entry.webFile}`);+ }+ assertSubtitleFontMetadata(desktopSource, entry);+ assertSubtitleFontMetadata(webSource, entry);+ if (seenAliases.has(entry.family)) {+ throw new Error(`Creator subtitle font alias is duplicated: ${entry.family}`);+ }+ seenAliases.add(entry.family);+ const targetName = entry.desktopFile.split('/').at(-1);+ const target = join(runtimeFontsDir, targetName);+ copyFileSync(desktopSource, target);+ resourcePaths.push(target);+ runtimeFonts.push({+ preset: entry.preset,+ weight: entry.weight,+ weightValue: entry.weightValue,+ family: entry.family,+ fullName: entry.fullName,+ file: `fonts/${targetName}`,+ sha256: entry.desktopSha256.toLowerCase(),+ license: `licenses/fonts/${entry.license.split('/').at(-1)}`+ });+ }++ const copiedLicenses = new Set();+ const runtimeLicenses = [];+ for (const entry of sourceManifest.licenses) {+ if (+ typeof entry?.file !== 'string'+ || !/^[a-f0-9]{64}$/i.test(entry?.sha256 ?? '')+ ) {+ throw new Error('Creator subtitle font manifest contains an invalid license entry');+ }+ const source = resolveAssetPath(subtitleFontSourceRoot, entry.file);+ if (!existsSync(source) || hashFile(source) !== entry.sha256.toLowerCase()) {+ throw new Error(`Creator subtitle font license hash mismatch: ${entry.file}`);+ }+ const target = join(runtimeLicensesDir, entry.file.split('/').at(-1));+ if (!copiedLicenses.has(target)) {+ copyFileSync(source, target);+ resourcePaths.push(target);+ copiedLicenses.add(target);+ }+ runtimeLicenses.push({+ file: `licenses/fonts/${entry.file.split('/').at(-1)}`,+ sha256: entry.sha256.toLowerCase()+ });+ }++ const runtimeManifestPath = join(runtimeFontsDir, 'manifest.json');+ writeFileSync(runtimeManifestPath, `${JSON.stringify({+ version: sourceManifest.version,+ sources: sourceManifest.sources,+ fonts: runtimeFonts,+ licenses: runtimeLicenses+ }, null, 2)}\n`);+ resourcePaths.push(runtimeManifestPath);+ return {+ manifestSha256: hashFile(sourceManifestPath),+ resourcePaths+ };+}++function assertSubtitleFontMetadata(path, entry) {+ const font = fontkit.openSync(path);+ if (+ Array.isArray(font.fonts)+ || font.familyName !== entry.family+ || font.fullName !== entry.fullName+ || font['OS/2']?.usWeightClass !== entry.weightValue+ ) {+ throw new Error(`Creator subtitle font metadata mismatch: ${path}`);+ }+}++function resolveAssetPath(root, path) {+ const absoluteRoot = resolve(root);+ const result = resolve(absoluteRoot, path);+ if (+ result !== absoluteRoot+ && !result.startsWith(`${absoluteRoot}/`)+ && !result.startsWith(`${absoluteRoot}\\`)+ ) {+ throw new Error(`Creator subtitle font path escapes its root: ${path}`);+ }+ return result;+}+function ensureKrillinBuild() {execFileSync(process.execPath, [join(rootDir, 'scripts', 'build-krillinai.mjs')], {cwd: rootDir,diff --git a/apps/desktop/scripts/prepare-daemon.mjs b/apps/desktop/scripts/prepare-daemon.mjsindex 74f2777c..8ec5d0bd 100644--- a/apps/desktop/scripts/prepare-daemon.mjs+++ b/apps/desktop/scripts/prepare-daemon.mjs@@ -20,6 +20,15 @@ const scriptDir = dirname(fileURLToPath(import.meta.url));const desktopDir = resolve(scriptDir, '..');const rootDir = resolve(desktopDir, '../..');const targetDir = resolve(desktopDir, '.pack/daemon');+const creatorPresetBuildRoot = resolve(+ rootDir,+ '.runtime/generated/creator-presets'+);+const targetCreatorPresetRoot = resolve(+ targetDir,+ 'runtime',+ 'creator-presets'+);const runtimeDependencyDir = resolve(desktopDir,'packaging',@@ -50,6 +59,10 @@ await runStage('校验冻结锁文件', 'pnpm', [cwd: rootDir,timeoutMs: 60_000});+await runStage('编译 Creator Preset', 'pnpm', ['templates:compile'], {+ cwd: rootDir,+ timeoutMs: 5 * 60_000+});await runStage('构建 Protocol', 'pnpm', ['--filter', '@opencreator/protocol', 'build'], {cwd: rootDir,timeoutMs: 5 * 60_000@@ -115,6 +128,8 @@ cpSync(resolve(targetDir, 'runtime'),{ recursive: true });+rmSync(targetCreatorPresetRoot, { recursive: true, force: true });+cpSync(creatorPresetBuildRoot, targetCreatorPresetRoot, { recursive: true });pruneDependencyInstallMetadata();pruneDevelopmentArtifacts(targetDir);@@ -122,6 +137,8 @@ assertExists(resolve(targetDir, 'dist/main.js'));assertExists(resolve(targetDir, 'node_modules/better-sqlite3/build/Release/better_sqlite3.node'));assertExists(resolve(targetDir, 'runtime/opencreator-runtime/SKILL.md'));assertExists(resolve(targetDir, 'runtime/opencreator-runtime/manifest.json'));+assertExists(resolve(targetDir, 'runtime/creator-presets/catalog.json'));+assertExists(resolve(targetDir, 'runtime/creator-presets/manifest.json'));assertWorkspaceRuntimePackage('protocol', 'Protocol');assertWorkspaceRuntimePackage('config', 'Config');assertWorkspaceRuntimePackage('skill-market', 'Skill Market');@@ -148,7 +165,8 @@ function cleanBuildOutputs() {resolve(rootDir, 'packages/config/dist'),resolve(rootDir, 'packages/skill-market/dist'),resolve(rootDir, 'apps/daemon/dist'),- resolve(rootDir, 'apps/web/dist')+ resolve(rootDir, 'apps/web/dist'),+ resolve(rootDir, '.runtime/generated/creator-presets')]) {rmSync(path, { recursive: true, force: true });}diff --git a/apps/desktop/scripts/verify-package.mjs b/apps/desktop/scripts/verify-package.mjsindex b3ed3f54..225671ef 100644--- a/apps/desktop/scripts/verify-package.mjs+++ b/apps/desktop/scripts/verify-package.mjs@@ -51,6 +51,9 @@ const resourcesDir = platformResourcesDir(packageRoot);const appAsar = join(resourcesDir, 'app.asar');const daemonDir = join(resourcesDir, 'daemon');const webDir = join(resourcesDir, 'web');+const daemonCreatorPresetDir = join(daemonDir, 'runtime', 'creator-presets');+const webCreatorPresetDir = join(webDir, 'creator-presets');+const webCreatorSubtitleFontDir = join(webDir, 'fonts', 'opencreator');const creatorRuntimeDir = join(resourcesDir, 'creator-runtime', 'krillinai');const codexRuntimeDir = join(resourcesDir, 'codex-runtime');const sourceWebDir = resolve(desktopDir, '../web/dist');@@ -58,6 +61,10 @@ const sourceCreatorAgentRuntimeDir = resolve(desktopDir,'../daemon/runtime/opencreator-runtime');+const sourceCreatorSubtitleFontManifestPath = resolve(+ desktopDir,+ '../../assets/creator-subtitle-fonts/manifest.json'+);const executable = packagedExecutable(packageRoot);const machOMagicValues = new Set(['feedface',@@ -89,8 +96,10 @@ assertExists(join(daemonDir, 'runtime', 'opencreator-runtime', 'manifest.json'))assertAsarContents();assertBrandingContents();assertDaemonContents();+assertCreatorPresetContents();assertWebContents();assertCreatorRuntime();+assertCreatorSubtitleFontContents();assertCodexRuntime();assertNoLocalData();assertSize('app.asar', appAsar, 80 * 1024 * 1024);@@ -293,6 +302,7 @@ function assertPortableDaemonDependencies() {'@opencreator/config','@opencreator/protocol','@opencreator/skill-market',+ 'image-size','nanoid','yaml','zod'@@ -364,6 +374,174 @@ function assertWebContents() {}}+function assertCreatorPresetContents() {+ const manifestPath = join(daemonCreatorPresetDir, 'manifest.json');+ const catalogPath = join(daemonCreatorPresetDir, 'catalog.json');+ assertExists(manifestPath);+ assertExists(catalogPath);+ const presetManifest = JSON.parse(readFileSync(manifestPath, 'utf8'));+ if (+ presetManifest?.schemaVersion !== 1+ || !isSha256(presetManifest.catalogHash)+ || !isSha256(presetManifest.assetSetHash)+ || !Array.isArray(presetManifest.files)+ ) {+ throw new Error(`Creator preset manifest is invalid: ${manifestPath}`);+ }++ const expectedDaemonFiles = new Set(['manifest.json']);+ for (const file of presetManifest.files) {+ if (+ typeof file?.path !== 'string'+ || !isSha256(file?.sha256)+ || !Number.isSafeInteger(file?.size)+ || file.size < 0+ || expectedDaemonFiles.has(file.path)+ ) {+ throw new Error(`Creator preset manifest contains an invalid resource: ${manifestPath}`);+ }+ expectedDaemonFiles.add(file.path);+ const absolute = join(daemonCreatorPresetDir, ...file.path.split('/'));+ assertExists(absolute);+ const contents = readFileSync(absolute);+ if (contents.byteLength !== file.size || hashBuffer(contents) !== file.sha256) {+ throw new Error(`Creator preset packaged resource hash mismatch: ${absolute}`);+ }+ }++ const daemonFiles = listRelativeFiles(daemonCreatorPresetDir);+ const staleDaemonFile = daemonFiles.find(file => !expectedDaemonFiles.has(file));+ if (staleDaemonFile !== undefined) {+ throw new Error(+ `Creator preset Daemon resources contain a stale file: ${staleDaemonFile}`+ );+ }+ const missingDaemonFile = [...expectedDaemonFiles]+ .find(file => !daemonFiles.includes(file));+ if (missingDaemonFile !== undefined) {+ throw new Error(`Creator preset Daemon resource is missing: ${missingDaemonFile}`);+ }++ const catalogHash = hashFile(catalogPath);+ if (catalogHash !== presetManifest.catalogHash) {+ throw new Error(+ `Creator preset catalog hash mismatch: ${catalogHash} !== ${presetManifest.catalogHash}`+ );+ }+ const assetEntries = presetManifest.files+ .filter(file => file.path.startsWith('assets/'))+ .sort((left, right) => left.path.localeCompare(right.path));+ const assetSetHash = hashBuffer(Buffer.from(canonicalJson(assetEntries)));+ if (assetSetHash !== presetManifest.assetSetHash) {+ throw new Error(+ `Creator preset asset set hash mismatch: ${assetSetHash} !== ${presetManifest.assetSetHash}`+ );+ }++ const expectedWebFiles = assetEntries.map(file => basename(file.path)).sort();+ assertExists(webCreatorPresetDir);+ for (const file of assetEntries) {+ const name = basename(file.path);+ const webAsset = join(webCreatorPresetDir, name);+ if (!existsSync(webAsset)) {+ throw new Error(`Creator preset Web asset is missing: ${webAsset}`);+ }+ const contents = readFileSync(webAsset);+ if (contents.byteLength !== file.size || hashBuffer(contents) !== file.sha256) {+ throw new Error(`Creator preset Web asset hash mismatch: ${webAsset}`);+ }+ }+ const actualWebFiles = listRelativeFiles(webCreatorPresetDir);+ const staleWebFile = actualWebFiles.find(file => !expectedWebFiles.includes(file));+ if (staleWebFile !== undefined) {+ throw new Error(+ `Creator preset Web assets contain a stale file: ${staleWebFile}`+ );+ }++ if (+ typeof manifest.packageRoot === 'string'+ && (+ manifest.creatorPresetCatalogHash !== presetManifest.catalogHash+ || manifest.creatorPresetAssetSetHash !== presetManifest.assetSetHash+ || manifest.creatorPresetResourceCount !== presetManifest.files.length+ )+ ) {+ throw new Error('Packaged Creator presets do not match the Desktop build manifest');+ }+}++function assertCreatorSubtitleFontContents() {+ const creatorRuntimeManifest = JSON.parse(readFileSync(+ join(creatorRuntimeDir, 'manifest.json'),+ 'utf8'+ ));+ const fontResources = creatorRuntimeManifest.resources.filter(resource => (+ resource.path.startsWith('fonts/')+ || resource.path.startsWith('licenses/fonts/')+ ));+ const sourceFontManifest = JSON.parse(readFileSync(+ sourceCreatorSubtitleFontManifestPath,+ 'utf8'+ ));+ if (+ sourceFontManifest?.version !== 1+ || !Array.isArray(sourceFontManifest.fonts)+ || sourceFontManifest.fonts.length === 0+ ) {+ throw new Error('Creator subtitle source font manifest is invalid');+ }+ const webFontResources = sourceFontManifest.fonts.map(font => {+ if (+ typeof font?.webFile !== 'string'+ || !font.webFile.endsWith('.woff2')+ || !isSha256(font?.webSha256)+ ) {+ throw new Error('Creator subtitle source Web font entry is invalid');+ }+ const source = resolve(+ dirname(sourceCreatorSubtitleFontManifestPath),+ font.webFile+ );+ if (!existsSync(source) || hashFile(source) !== font.webSha256.toLowerCase()) {+ throw new Error(`Creator subtitle source Web font hash mismatch: ${source}`);+ }+ return {+ path: `fonts/opencreator/${basename(font.webFile)}`,+ sha256: font.webSha256.toLowerCase()+ };+ });+ const expectedWebFiles = webFontResources+ .map(resource => basename(resource.path))+ .sort();+ assertExists(webCreatorSubtitleFontDir);+ for (const resource of webFontResources) {+ const webFont = join(webCreatorSubtitleFontDir, basename(resource.path));+ assertExists(webFont);+ if (hashFile(webFont) !== resource.sha256) {+ throw new Error(`Creator subtitle Web font hash mismatch: ${webFont}`);+ }+ }+ const actualWebFiles = listRelativeFiles(webCreatorSubtitleFontDir);+ const staleWebFont = actualWebFiles.find(file => !expectedWebFiles.includes(file));+ if (staleWebFont !== undefined) {+ throw new Error(`Creator subtitle Web fonts contain a stale file: ${staleWebFont}`);+ }+ if (+ typeof manifest.packageRoot === 'string'+ && (+ manifest.creatorSubtitleFontSetHash !== hashResourceDescriptors(fontResources)+ || manifest.creatorSubtitleFontResourceCount !== fontResources.length+ || manifest.creatorSubtitleWebFontSetHash !== hashResourceDescriptors(webFontResources)+ || manifest.creatorSubtitleWebFontResourceCount !== webFontResources.length+ )+ ) {+ throw new Error(+ 'Packaged Creator subtitle fonts do not match the Desktop build manifest'+ );+ }+}+function normalizedAsarEntries() {return listPackage(appAsar).map(entry => {const normalized = entry.replaceAll('\\', '/');@@ -421,6 +599,52 @@ function hashDirectory(root) {};}+function hashFile(path) {+ return hashBuffer(readFileSync(path));+}++function hashResourceDescriptors(resources) {+ const aggregate = createHash('sha256');+ for (const resource of [...resources].sort((left, right) => (+ left.path.localeCompare(right.path)+ ))) {+ aggregate+ .update(resource.path)+ .update('\0')+ .update(resource.sha256)+ .update('\0');+ }+ return aggregate.digest('hex');+}++function listRelativeFiles(root) {+ const files = [];+ walk(root, path => {+ if (statSync(path).isFile()) {+ files.push(relative(root, path).replaceAll('\\', '/'));+ }+ });+ return files.sort();+}++function canonicalJson(value) {+ return JSON.stringify(sortJson(value));+}++function sortJson(value) {+ if (Array.isArray(value)) return value.map(sortJson);+ if (value === null || typeof value !== 'object') return value;+ return Object.fromEntries(+ Object.entries(value)+ .sort(([left], [right]) => left.localeCompare(right))+ .map(([key, child]) => [key, sortJson(child)])+ );+}++function isSha256(value) {+ return typeof value === 'string' && /^[a-f0-9]{64}$/.test(value);+}+function findFirstDifferentPath(left, right) {const length = Math.max(left.length, right.length);for (let index = 0; index < length; index += 1) {diff --git a/apps/desktop/test/creator-preset-build-gate.test.ts b/apps/desktop/test/creator-preset-build-gate.test.tsnew file mode 100644index 00000000..aeaf11cc--- /dev/null+++ b/apps/desktop/test/creator-preset-build-gate.test.ts@@ -0,0 +1,102 @@+import { readFileSync } from 'node:fs';+import { resolve } from 'node:path';+import { describe, expect, it } from 'vitest';++const rootDir = resolve(process.cwd(), '../..');++function read(relativePath: string): string {+ return readFileSync(resolve(rootDir, relativePath), 'utf8');+}++describe('Creator Preset build gate', () => {+ it('runs the preset CI gate before every catalog consumer build', () => {+ const rootPackage = JSON.parse(read('package.json')) as {+ scripts?: Record<string, string>;+ };+ const workflow = read('.github/workflows/ci.yml');+ const gate = 'pnpm templates:ci';++ expect(rootPackage.scripts?.['templates:ci'])+ .toBe('pnpm templates:validate && pnpm templates:compile');+ expect(workflow).toContain(gate);+ const gateIndex = workflow.indexOf(gate);+ for (const consumer of [+ 'pnpm krillinai:test',+ 'pnpm test',+ 'pnpm typecheck',+ 'pnpm build'+ ]) {+ expect(gateIndex, `${gate} must run before ${consumer}`)+ .toBeLessThan(workflow.indexOf(consumer));+ }+ });++ it('compiles once after clean and packages one catalog for daemon and web', () => {+ const prepareDaemon = read('apps/desktop/scripts/prepare-daemon.mjs');+ const viteConfig = read('apps/web/vite.config.ts');+ const builderConfig = read('apps/desktop/electron-builder.yml');+ const compileCalls = prepareDaemon.match(/templates:compile/g) ?? [];++ expect(prepareDaemon).toContain(+ "resolve(rootDir, '.runtime/generated/creator-presets')"+ );+ expect(compileCalls).toHaveLength(1);+ expect(prepareDaemon.indexOf('cleanBuildOutputs();'))+ .toBeLessThan(prepareDaemon.indexOf('templates:compile'));+ expect(prepareDaemon).toMatch(+ /resolve\(\s*targetDir,\s*'runtime',\s*'creator-presets'\s*\)/+ );+ expect(viteConfig).toContain("join(webDir, '../../.runtime/generated/creator-presets')");+ expect(viteConfig).toContain("join(webDir, 'dist', 'creator-presets')");+ expect(viteConfig).toContain("join(webDir, 'dist', 'fonts', 'opencreator')");+ expect(builderConfig).toContain('from: .pack/daemon/runtime');+ expect(builderConfig).toContain('from: ../web/dist');+ expect(builderConfig.match(/creator-presets/g) ?? []).toHaveLength(0);+ });++ it('records and verifies packaged preset and subtitle font resources', () => {+ const packageRelease = read('apps/desktop/scripts/package-release.mjs');+ const prepareCreatorRuntime = read(+ 'apps/desktop/scripts/prepare-creator-runtime.mjs'+ );+ const verifier = read('apps/desktop/scripts/verify-package.mjs');+ const fontManifest = JSON.parse(read(+ 'assets/creator-subtitle-fonts/manifest.json'+ )) as {+ fonts: Array<{+ desktopFile: string;+ desktopSha256: string;+ webFile: string;+ webSha256: string;+ }>;+ };++ for (const field of [+ 'creatorPresetCatalogHash',+ 'creatorPresetAssetSetHash',+ 'creatorPresetResourceCount',+ 'creatorSubtitleFontSetHash',+ 'creatorSubtitleFontResourceCount',+ 'creatorSubtitleWebFontSetHash',+ 'creatorSubtitleWebFontResourceCount'+ ]) {+ expect(packageRelease).toContain(field);+ expect(verifier).toContain(field);+ }+ expect(verifier).toContain('assertCreatorPresetContents();');+ expect(verifier).toContain('Creator preset Web asset is missing');+ expect(verifier).toContain('Creator preset Web assets contain a stale file');+ expect(verifier).toContain('Creator preset catalog hash mismatch');+ expect(verifier).toContain('Creator preset asset set hash mismatch');+ expect(prepareCreatorRuntime).toContain('entry.desktopFile');+ expect(prepareCreatorRuntime).toContain('entry.webFile');+ expect(prepareCreatorRuntime).toContain('assertSubtitleFontMetadata');+ expect(fontManifest.fonts).toHaveLength(9);+ for (const font of fontManifest.fonts) {+ expect(font.desktopFile).toMatch(/^desktop\/.+\.ttf$/);+ expect(font.desktopSha256).toMatch(/^[a-f0-9]{64}$/);+ expect(font.webFile).toMatch(/^web\/.+\.woff2$/);+ expect(font.webSha256).toMatch(/^[a-f0-9]{64}$/);+ }+ });+});diff --git a/apps/web/e2e/creator-presets.spec.ts b/apps/web/e2e/creator-presets.spec.tsnew file mode 100644index 00000000..38ec10a6--- /dev/null+++ b/apps/web/e2e/creator-presets.spec.ts@@ -0,0 +1,799 @@+import type {+ CreatorJob,+ CreatorPresetListResponse,+ CreatorRuntimeWorkspace,+ CreatorServicesConfig+} from '@opencreator/protocol';+import type { Locator, Page } from '@playwright/test';+import { createServer, type Server } from 'node:http';+import {+ prepareCreatorPresetE2E,+ type CreatorPresetE2EEnvironment+} from './fixtures/creator-presets.js';+import {+ expect,+ test,+ type RuntimeFixture+} from './fixtures/runtime.js';++let presetEnvironment: CreatorPresetE2EEnvironment;++test.beforeAll(() => {+ presetEnvironment = prepareCreatorPresetE2E();+});++test.afterAll(() => {+ presetEnvironment.dispose();+});++test('@AC-1 catalog 动态驱动首页、本地化和封面资源,升级后移除模板', async ({+ page,+ runtime+}) => {+ const zhCatalog = await listPresets(runtime, 'zh-CN');+ const enCatalog = await listPresets(runtime, 'en-US');+ const zhPreset = requirePreset(+ zhCatalog,+ 'image-generation',+ 'ecommerce-product-alt',+ 1+ );+ const enPreset = requirePreset(+ enCatalog,+ 'image-generation',+ 'ecommerce-product-alt',+ 1+ );++ expect(zhPreset).toMatchObject({+ title: '电商商品主图 Plus',+ description: '由临时 catalog 动态加入的电商视觉模板。'+ });+ expect(enPreset).toMatchObject({+ title: 'E-commerce Product Hero Plus',+ description: 'An e-commerce visual preset added by the temporary catalog.'+ });+ expect(zhPreset.coverUrl).toMatch(/^\/creator-presets\/[a-f0-9]{64}\.webp$/);+ expect(enPreset.coverUrl).toBe(zhPreset.coverUrl);++ await runtime.openApp(page);+ await page.goto(`${runtime.origin}/#/new`);+ await expect(page.getByRole('heading', { name: '创作模板' })).toBeVisible();+ await expect(page.getByRole('textbox', { name: '输入任务' })).toHaveCount(0);+ await selectCreatorModule(page, '图像生成');+ const zhCard = page.getByRole('button', {+ name: '使用电商商品主图 Plus模板'+ });+ await expect(zhCard).toBeVisible();+ await expect(zhCard).toContainText('由临时 catalog 动态加入的电商视觉模板。');+ await expectLoadedPresetCover(zhCard);++ await page.goto(`${runtime.origin}/#/workbench`);+ await expect(page.getByRole('heading', { name: '工作台' })).toBeVisible();+ await expect(page.getByRole('heading', { name: '精选应用' })).toBeVisible();+ await expect(page.getByRole('button', { name: /^图像生成/ })).toBeVisible();+ await expect(page.getByRole('button', {+ name: '使用电商商品主图 Plus模板'+ })).toHaveCount(0);++ await runtime.api('PATCH', '/settings/ui', { language: 'en-US' });+ await page.goto(`${runtime.origin}/#/new`);+ await page.reload();+ await selectCreatorModule(page, 'Image Generation');+ const enCard = page.getByRole('button', {+ name: 'Use E-commerce Product Hero Plus preset'+ });+ await expect(enCard).toBeVisible();+ await expect(enCard).toContainText(+ 'An e-commerce visual preset added by the temporary catalog.'+ );+ await expectLoadedPresetCover(enCard);++ await page.goto(`${runtime.origin}${enPreset.coverUrl}`);+ await runtime.restart({+ presetCatalogRoot: presetEnvironment.upgradedCatalogRoot+ });+ await page.goto(`${runtime.origin}/#/new`);+ await selectCreatorModule(page, 'Image Generation');+ const upgraded = await listPresets(runtime, 'en-US');+ expect(upgraded.catalogHash).not.toBe(enCatalog.catalogHash);+ expect(upgraded.presets).not.toContainEqual(expect.objectContaining({+ module: 'image-generation',+ id: 'ecommerce-product-alt'+ }));+ await expect(page.getByRole('button', {+ name: 'Use E-commerce Product Hero Plus preset'+ })).toHaveCount(0);+});++test('@AC-3 创建接口使用完整 fingerprint 幂等,页面真实双击只创建一个 Job', async ({+ page,+ runtime+}) => {+ const creationKey = 'e2e-full-fingerprint';+ const request = {+ projectId: runtime.projectId,+ preset: {+ module: 'image-generation',+ id: 'ecommerce-product',+ version: 1+ },+ locale: 'zh-CN',+ creationKey+ } as const;+ const first = await runtime.api<{ job: CreatorJob }>(+ 'POST',+ '/creator/jobs',+ request+ );+ const replay = await runtime.api<{ job: CreatorJob }>(+ 'POST',+ '/creator/jobs',+ request+ );+ expect(replay.job.id).toBe(first.job.id);++ const conflictingRequests = [+ {+ ...request,+ preset: {+ module: 'image-generation',+ id: 'ecommerce-product-alt',+ version: 1+ }+ },+ { ...request, locale: 'en-US' as const },+ {+ projectId: runtime.projectId,+ templateId: 'image-generation',+ templateVersion: 2,+ state: first.job.state,+ creationKey+ }+ ];+ for (const conflict of conflictingRequests) {+ const result = await runtime.apiResult('POST', '/creator/jobs', conflict);+ expect(result).toMatchObject({+ status: 409,+ body: {+ error: {+ code: 'creator_idempotency_key_reused'+ }+ }+ });+ }+ const jobsAfterApiChecks = await listJobs(runtime);+ expect(jobsAfterApiChecks.filter(job => job.id === first.job.id)).toHaveLength(1);++ await runtime.openApp(page);+ await page.goto(`${runtime.origin}/#/new`);+ await expect(page.getByRole('heading', { name: '创作模块' })).toBeVisible();+ await selectCreatorModule(page, '图像生成');+ const card = page.getByRole('button', {+ name: '使用电商商品主图 Plus模板'+ });+ const createBodies: unknown[] = [];+ page.on('request', requestEvent => {+ const url = new URL(requestEvent.url());+ if (+ requestEvent.method() === 'POST'+ && url.pathname.endsWith('/creator/jobs')+ ) {+ createBodies.push(requestEvent.postDataJSON());+ }+ });+ const jobCountBeforeDoubleClick = (await listJobs(runtime)).length;+ await card.evaluate((button: HTMLButtonElement) => {+ button.click();+ button.click();+ });+ await expect(page).toHaveURL(+ /#\/workbench\?tool=image-generation&jobId=creator_job_.*&returnTo=home/+ );+ expect(createBodies).toHaveLength(1);+ const route = new URL(page.url()).hash.slice(1);+ const jobId = new URL(route, runtime.origin).searchParams.get('jobId');+ expect(jobId).not.toBeNull();+ const created = await getJob(runtime, jobId!);+ expect(created).toMatchObject({+ templateId: 'image-generation',+ templateVersion: 2,+ status: 'draft',+ presetOrigin: {+ module: 'image-generation',+ id: 'ecommerce-product-alt',+ version: 1,+ locale: 'zh-CN'+ },+ stages: []+ });+ expect((await listJobs(runtime))).toHaveLength(jobCountBeforeDoubleClick + 1);+});++test('@AC-4 六模块解析严格默认值,工作台首帧预填并持久化用户编辑', async ({+ page,+ runtime+}) => {+ const jobs = new Map<CreatorRuntimeWorkspace, CreatorJob>();+ for (const preset of officialPresets) {+ jobs.set(+ preset.module,+ await createPresetJob(runtime, {+ ...preset,+ locale: 'zh-CN',+ creationKey: `ac4-${preset.module}`+ })+ );+ }++ expect(jobs.get('video-translation')!.state).toMatchObject({+ sourceLanguage: 'en',+ targetLanguage: 'zh_cn',+ bilingual: true,+ subtitleStyle: {+ fontPreset: 'sans',+ fontWeight: 'bold',+ fontSize: 'medium',+ primaryColor: '#FFFFFF',+ secondaryColor: '#FFD45C',+ outlineWidth: 2,+ shadow: {+ enabled: true,+ opacity: 0.65,+ offsetX: 2,+ offsetY: 2,+ blur: 1+ }+ }+ });+ expect(jobs.get('video-download')!.state).toMatchObject({+ mediaType: 'audio'+ });+ expect(jobs.get('image-generation')!.state).toMatchObject({+ prompt: '专业电商商品主图,主体清晰,干净背景,突出核心卖点,真实材质与自然光影,适合商品详情页首屏',+ provider: 'openai',+ size: '1536x1024',+ quality: 'medium',+ candidateCount: 2+ });+ expect(jobs.get('video-generation')!.state).toMatchObject({+ prompt: '高质感商品广告短片,产品居中,缓慢推进镜头,真实材质细节,专业棚拍光线,动作自然流畅',+ provider: 'seedance',+ size: '1280x720',+ duration: 5+ });+ expect(jobs.get('cover-generator')!.state).toMatchObject({+ sourceType: 'prompt',+ coverStyle: 'personal-growth',+ coverTextLanguage: 'zh-CN',+ coverHeadline: '改变,从今天开始',+ coverSubheadline: '建立真正有效的成长系统',+ ratio: '16:9',+ candidateCount: 2,+ quality: 'medium'+ });+ expect(jobs.get('smart-dubbing')!.state).toMatchObject({+ text: '在这里输入需要配音的文案。',+ ttsProvider: 'openai',+ voiceCode: 'marin',+ style: 'calm',+ speed: 1,+ format: 'mp3'+ });++ let translation = jobs.get('video-translation')!;+ translation = await updateJobState(runtime, translation, {+ currentStep: 2,+ furthestStep: 2+ });+ jobs.set('video-translation', translation);++ await runtime.openApp(page);+ await verifyWorkspaceEdit({+ page,+ runtime,+ module: 'video-translation',+ job: translation,+ heading: '视频翻译配音',+ field: page.getByLabel('自定义译文颜色'),+ initialValue: '#ffffff',+ editedValue: '#112233',+ statePath: ['subtitleStyle', 'primaryColor'],+ expectedPersistedValue: '#112233'+ });+ await verifyWorkspaceEdit({+ page,+ runtime,+ module: 'video-download',+ job: jobs.get('video-download')!,+ heading: '视频下载',+ field: page.getByRole('textbox', { name: '待下载视频链接' }),+ initialValue: '',+ editedValue: 'https://www.youtube.com/watch?v=OpenCreatorPreset',+ statePath: ['sourceUrl'],+ expectedPersistedValue: 'https://www.youtube.com/watch?v=OpenCreatorPreset',+ preservedState: { mediaType: 'audio' }+ });+ await verifyWorkspaceEdit({+ page,+ runtime,+ module: 'image-generation',+ job: jobs.get('image-generation')!,+ heading: '图像生成',+ field: page.getByRole('textbox', { name: '提示词' }),+ initialValue: '专业电商商品主图,主体清晰,干净背景,突出核心卖点,真实材质与自然光影,适合商品详情页首屏',+ editedValue: '已编辑的电商商品主图',+ statePath: ['prompt'],+ expectedPersistedValue: '已编辑的电商商品主图'+ });+ await verifyWorkspaceEdit({+ page,+ runtime,+ module: 'video-generation',+ job: jobs.get('video-generation')!,+ heading: '视频生成',+ field: page.getByRole('textbox', { name: '提示词' }),+ initialValue: '高质感商品广告短片,产品居中,缓慢推进镜头,真实材质细节,专业棚拍光线,动作自然流畅',+ editedValue: '已编辑的商品广告镜头',+ statePath: ['prompt'],+ expectedPersistedValue: '已编辑的商品广告镜头'+ });+ await verifyWorkspaceEdit({+ page,+ runtime,+ module: 'cover-generator',+ job: jobs.get('cover-generator')!,+ heading: '封面生成',+ field: page.getByRole('textbox', { name: '内容与补充要求' }),+ initialValue: '个人成长主题,真实人物半身近景,情绪明确,主体与标题留白平衡,强对比、可信、适合知识视频封面',+ editedValue: '已编辑的个人成长封面要求',+ statePath: ['prompt'],+ expectedPersistedValue: '已编辑的个人成长封面要求',+ preservedState: {+ coverStyle: 'personal-growth',+ coverTextLanguage: 'zh-CN'+ }+ });+ await verifyWorkspaceEdit({+ page,+ runtime,+ module: 'smart-dubbing',+ job: jobs.get('smart-dubbing')!,+ heading: '智能配音',+ field: page.getByRole('textbox', { name: '配音文案内容' }),+ initialValue: '在这里输入需要配音的文案。',+ editedValue: '已编辑的沉静旁白文案。',+ statePath: ['text'],+ expectedPersistedValue: '已编辑的沉静旁白文案。',+ preservedState: { style: 'calm' }+ });+});++test('@AC-6 legacy v1 与 Preset v1/v2 在 catalog 升级和 Daemon 重启后稳定恢复', async ({+ page,+ runtime+}) => {+ const legacy = await runtime.api<{ job: CreatorJob }>(+ 'POST',+ '/creator/jobs',+ {+ projectId: runtime.projectId,+ templateId: 'video-translation',+ templateVersion: 1,+ state: {+ sourceType: 'url',+ sourceUrl: 'https://www.youtube.com/watch?v=LegacyCreator',+ sourceLanguage: 'en',+ targetLanguage: 'zh_cn',+ bilingual: true,+ subtitleFont: 'serif',+ subtitleSize: 'large',+ subtitleColor: '#ABCDEF',+ currentStep: 2,+ furthestStep: 2+ },+ creationKey: 'ac6-legacy-v1'+ }+ ).then(response => response.job);+ let presetV1 = await createPresetJob(runtime, {+ module: 'video-translation',+ id: 'bilibili-bilingual',+ version: 1,+ locale: 'zh-CN',+ creationKey: 'ac6-preset-v1'+ });+ let presetV2 = await createPresetJob(runtime, {+ module: 'video-translation',+ id: 'bilibili-bilingual',+ version: 2,+ locale: 'zh-CN',+ creationKey: 'ac6-preset-v2'+ });+ presetV1 = await updateJobState(runtime, presetV1, {+ currentStep: 2,+ furthestStep: 2+ });+ presetV2 = await updateJobState(runtime, presetV2, {+ currentStep: 2,+ furthestStep: 2+ });+ const snapshots = new Map([+ [legacy.id, legacy],+ [presetV1.id, presetV1],+ [presetV2.id, presetV2]+ ]);++ await runtime.restart({+ presetCatalogRoot: presetEnvironment.upgradedCatalogRoot+ });+ for (const [jobId, before] of snapshots) {+ const after = await getJob(runtime, jobId);+ expect(after.templateVersion).toBe(before.templateVersion);+ expect(after.presetOrigin).toEqual(before.presetOrigin);+ expect(after.state).toEqual(before.state);+ }++ const upgradedCatalog = await listPresets(runtime, 'zh-CN');+ const listedTranslation = upgradedCatalog.presets.filter(preset => (+ preset.module === 'video-translation'+ && preset.id === 'bilibili-bilingual'+ ));+ expect(listedTranslation).toHaveLength(1);+ expect(listedTranslation[0]!.version).toBe(2);++ const newV2 = await createPresetJob(runtime, {+ module: 'video-translation',+ id: 'bilibili-bilingual',+ version: 2,+ locale: 'zh-CN',+ creationKey: 'ac6-upgraded-v2'+ });+ expect(presetV2.state.subtitleStyle).toMatchObject({+ fontPreset: 'rounded',+ fontSize: 'large',+ primaryColor: '#00FF66'+ });+ expect(newV2.state.subtitleStyle).toMatchObject({+ fontPreset: 'rounded',+ fontSize: 'small',+ primaryColor: '#FF00AA'+ });++ await runtime.openApp(page);+ await openWorkspace(page, runtime, 'video-translation', legacy.id);+ await expect(page.getByRole('heading', {+ name: '视频翻译配音'+ })).toBeVisible();+ await expect(page.getByRole('radio', { name: '大', exact: true }))+ .toHaveAttribute('aria-checked', 'true');+ await expect(page.getByLabel('自定义译文颜色')).toHaveValue('#abcdef');++ await openWorkspace(page, runtime, 'video-translation', presetV2.id);+ await expect(page.getByRole('radio', { name: '大', exact: true }))+ .toHaveAttribute('aria-checked', 'true');+ await expect(page.getByLabel('自定义译文颜色')).toHaveValue('#00ff66');+});++test('@AC-7 缺 Provider 时保留可编辑草稿、进入 needs_input 且不调用付费执行器', async ({+ page,+ runtime+}) => {+ const fakeProvider = await startFakeProvider();+ try {+ const response = await runtime.api<{+ config: CreatorServicesConfig;+ }>('GET', '/creator-services/config');+ const config = structuredClone(response.config);+ config.video.veo.baseUrl = fakeProvider.origin;+ config.video.veo.apiKey = '';+ await runtime.api('PATCH', '/creator-services/config', config);++ const job = await createPresetJob(runtime, {+ module: 'video-generation',+ id: 'configuration-required',+ version: 1,+ locale: 'zh-CN',+ creationKey: 'ac7-missing-provider'+ });+ expect(job).toMatchObject({+ status: 'draft',+ state: {+ provider: 'veo',+ model: 'veo-3.1-generate-preview',+ prompt: '需要配置服务的视频广告镜头'+ },+ stages: []+ });++ await runtime.openApp(page);+ await openWorkspace(page, runtime, 'video-generation', job.id);+ const prompt = page.getByRole('textbox', { name: '提示词' });+ await expect(prompt).toHaveValue('需要配置服务的视频广告镜头');+ await prompt.fill('缺少服务时仍应保留的编辑内容');+ await expectJobState(runtime, job.id, ['prompt'], '缺少服务时仍应保留的编辑内容');++ await page.getByRole('button', { name: '继续' }).click();+ await expect(page.getByRole('combobox', { name: '视频服务' }))+ .toHaveValue('veo');+ await expect(page.getByRole('combobox', { name: '模型版本' }))+ .toHaveValue('veo-3.1-generate-preview');+ await page.getByRole('button', { name: '继续' }).click();+ await page.getByRole('button', { name: '开始生成' }).click();++ await expect.poll(async () => (await getJob(runtime, job.id)).status)+ .toBe('needs_input');+ const waiting = await getJob(runtime, job.id);+ expect(waiting.state).toMatchObject({+ prompt: '缺少服务时仍应保留的编辑内容',+ provider: 'veo',+ model: 'veo-3.1-generate-preview',+ needsInput: {+ code: 'creator_preset_requirement_missing',+ deepLink: '#/settings?tab=ai-services§ion=video'+ }+ });+ expect(waiting.stages.at(-1)).toMatchObject({+ stageId: 'generate',+ status: 'failed',+ errorCode: 'creator_preset_requirement_missing'+ });+ expect(fakeProvider.calls()).toBe(0);+ const settingsLink = page.getByRole('link', { name: '打开 AI 服务设置' });+ await expect(settingsLink).toBeVisible();+ await expect(settingsLink).toHaveAttribute(+ 'href',+ '#/settings?tab=ai-services§ion=video'+ );+ } finally {+ await fakeProvider.close();+ }+});++const officialPresets: Array<{+ module: CreatorRuntimeWorkspace;+ id: string;+ version: number;+}> = [+ {+ module: 'video-translation',+ id: 'bilibili-bilingual',+ version: 1+ },+ {+ module: 'video-download',+ id: 'audio-download',+ version: 1+ },+ {+ module: 'image-generation',+ id: 'ecommerce-product',+ version: 1+ },+ {+ module: 'video-generation',+ id: 'product-ad',+ version: 1+ },+ {+ module: 'cover-generator',+ id: 'personal-growth',+ version: 1+ },+ {+ module: 'smart-dubbing',+ id: 'calm-narration',+ version: 1+ }+];++async function listPresets(+ runtime: RuntimeFixture,+ locale: 'zh-CN' | 'en-US'+): Promise<CreatorPresetListResponse> {+ return await runtime.api(+ 'GET',+ `/creator/presets?locale=${encodeURIComponent(locale)}`+ );+}++function requirePreset(+ catalog: CreatorPresetListResponse,+ module: CreatorRuntimeWorkspace,+ id: string,+ version: number+): CreatorPresetListResponse['presets'][number] {+ const preset = catalog.presets.find(candidate => (+ candidate.module === module+ && candidate.id === id+ && candidate.version === version+ ));+ expect(preset, `catalog 缺少 ${module}/${id}/${version}`).toBeDefined();+ return preset!;+}++async function expectLoadedPresetCover(card: Locator): Promise<void> {+ const image = card.locator('img');+ await expect.poll(async () => image.evaluate(element => ({+ complete: element.complete,+ width: element.naturalWidth,+ height: element.naturalHeight+ }))).toEqual({+ complete: true,+ width: 1280,+ height: 720+ });+}++async function selectCreatorModule(page: Page, name: string): Promise<void> {+ await page.getByRole('tab', {+ name: new RegExp(`^${name},`)+ }).click();+}++async function createPresetJob(+ runtime: RuntimeFixture,+ input: {+ module: CreatorRuntimeWorkspace;+ id: string;+ version: number;+ locale: 'zh-CN' | 'en-US';+ creationKey: string;+ }+): Promise<CreatorJob> {+ return await runtime.api<{ job: CreatorJob }>('POST', '/creator/jobs', {+ projectId: runtime.projectId,+ preset: {+ module: input.module,+ id: input.id,+ version: input.version+ },+ locale: input.locale,+ creationKey: input.creationKey+ }).then(response => response.job);+}++async function listJobs(runtime: RuntimeFixture): Promise<CreatorJob[]> {+ return await runtime.api<{ jobs: CreatorJob[] }>(+ 'GET',+ `/creator/jobs?projectId=${encodeURIComponent(runtime.projectId)}`+ ).then(response => response.jobs);+}++async function getJob(+ runtime: RuntimeFixture,+ jobId: string+): Promise<CreatorJob> {+ return await runtime.api<{ job: CreatorJob }>(+ 'GET',+ `/creator/jobs/${encodeURIComponent(jobId)}`+ ).then(response => response.job);+}++async function updateJobState(+ runtime: RuntimeFixture,+ job: CreatorJob,+ patch: Record<string, unknown>+): Promise<CreatorJob> {+ return await runtime.api<{ job: CreatorJob }>(+ 'POST',+ `/creator/jobs/${encodeURIComponent(job.id)}/actions`,+ {+ action: 'update-settings',+ expectedRevision: job.revision,+ input: {+ patch,+ objectId: Object.keys(patch).sort().join(',')+ }+ }+ ).then(response => response.job);+}++async function openWorkspace(+ page: Page,+ runtime: RuntimeFixture,+ module: CreatorRuntimeWorkspace,+ jobId: string+): Promise<void> {+ await page.goto(+ `${runtime.origin}/#/workbench?tool=${encodeURIComponent(module)}`+ + `&jobId=${encodeURIComponent(jobId)}`+ );+}++async function verifyWorkspaceEdit(input: {+ page: Page;+ runtime: RuntimeFixture;+ module: CreatorRuntimeWorkspace;+ job: CreatorJob;+ heading: string;+ field: Locator;+ initialValue: string;+ editedValue: string;+ statePath: string[];+ expectedPersistedValue: unknown;+ preservedState?: Record<string, unknown>;+}): Promise<void> {+ await openWorkspace(input.page, input.runtime, input.module, input.job.id);+ await expect(input.page.getByRole('heading', {+ name: input.heading,+ exact: true+ })).toBeVisible();+ await expect(input.field).toHaveValue(input.initialValue);+ await input.field.fill(input.editedValue);+ await expectJobState(+ input.runtime,+ input.job.id,+ input.statePath,+ input.expectedPersistedValue+ );+ if (input.preservedState !== undefined) {+ expect((await getJob(input.runtime, input.job.id)).state)+ .toMatchObject(input.preservedState);+ }+ await input.page.reload();+ await expect(input.field).toHaveValue(input.editedValue);+}++async function expectJobState(+ runtime: RuntimeFixture,+ jobId: string,+ path: string[],+ expected: unknown+): Promise<void> {+ await expect.poll(async () => {+ let current: unknown = (await getJob(runtime, jobId)).state;+ for (const segment of path) {+ if (+ current === null+ || typeof current !== 'object'+ || Array.isArray(current)+ ) {+ return undefined;+ }+ current = (current as Record<string, unknown>)[segment];+ }+ return current;+ }).toEqual(expected);+}++async function startFakeProvider(): Promise<{+ origin: string;+ calls(): number;+ close(): Promise<void>;+}> {+ let callCount = 0;+ const server = createServer((_request, response) => {+ callCount += 1;+ response.writeHead(500, { 'content-type': 'application/json' });+ response.end(JSON.stringify({ error: 'provider must not be called' }));+ });+ const origin = await listen(server);+ return {+ origin,+ calls: () => callCount,+ close: () => closeServer(server)+ };+}++async function listen(server: Server): Promise<string> {+ return await new Promise((resolve, reject) => {+ server.once('error', reject);+ server.listen(0, '127.0.0.1', () => {+ const address = server.address();+ if (address === null || typeof address === 'string') {+ reject(new Error('Fake provider did not bind a TCP port'));+ return;+ }+ resolve(`http://127.0.0.1:${address.port}`);+ });+ });+}++async function closeServer(server: Server): Promise<void> {+ await new Promise<void>((resolve, reject) => {+ server.close(error => {+ if (error) reject(error);+ else resolve();+ });+ });+}diff --git a/apps/web/e2e/fixtures/creator-presets.ts b/apps/web/e2e/fixtures/creator-presets.tsnew file mode 100644index 00000000..19cb89f0--- /dev/null+++ b/apps/web/e2e/fixtures/creator-presets.ts@@ -0,0 +1,272 @@+import { execFileSync } from 'node:child_process';+import {+ copyFileSync,+ cpSync,+ mkdirSync,+ mkdtempSync,+ readFileSync,+ rmSync,+ writeFileSync+} from 'node:fs';+import { tmpdir } from 'node:os';+import { dirname, join, resolve } from 'node:path';+import { fileURLToPath } from 'node:url';++export type CreatorPresetE2EEnvironment = {+ root: string;+ initialCatalogRoot: string;+ upgradedCatalogRoot: string;+ dispose(): void;+};++const repositoryRoot = resolve(+ fileURLToPath(new URL('../../../../', import.meta.url))+);++export function prepareCreatorPresetE2E(): CreatorPresetE2EEnvironment {+ const root = mkdtempSync(join(tmpdir(), 'opencreator-presets-e2e-'));+ const initialSourceRoot = join(root, 'template-initial');+ const upgradedSourceRoot = join(root, 'template-upgraded');+ const initialCatalogRoot = join(root, 'catalog-initial');+ const upgradedCatalogRoot = join(root, 'catalog-upgraded');+ cpSync(join(repositoryRoot, 'template'), initialSourceRoot, { recursive: true });+ addAlternativeImagePreset(initialSourceRoot);+ addVideoTranslationV2(initialSourceRoot);+ addMissingVideoRequirementPreset(initialSourceRoot);+ cpSync(initialSourceRoot, upgradedSourceRoot, { recursive: true });+ removeAlternativeImagePreset(upgradedSourceRoot);+ hideVideoTranslationV1(upgradedSourceRoot);+ updateVideoTranslationV2(upgradedSourceRoot);+ compile(initialSourceRoot, initialCatalogRoot);+ compile(upgradedSourceRoot, upgradedCatalogRoot);++ const previous = process.env.OPENCREATOR_E2E_PRESET_CATALOG_ROOT;+ process.env.OPENCREATOR_E2E_PRESET_CATALOG_ROOT = initialCatalogRoot;+ return {+ root,+ initialCatalogRoot,+ upgradedCatalogRoot,+ dispose() {+ if (previous === undefined) {+ delete process.env.OPENCREATOR_E2E_PRESET_CATALOG_ROOT;+ } else {+ process.env.OPENCREATOR_E2E_PRESET_CATALOG_ROOT = previous;+ }+ rmSync(root, {+ recursive: true,+ force: true,+ maxRetries: 20,+ retryDelay: 100+ });+ }+ };+}++function addAlternativeImagePreset(sourceRoot: string): void {+ const source = readManifest(+ sourceRoot,+ 'image-generation',+ 'ecommerce-product',+ 1+ );+ writePreset(sourceRoot, 'image-generation', 'ecommerce-product-alt', 1, {+ ...source,+ id: 'ecommerce-product-alt',+ title: {+ 'zh-CN': '电商商品主图 Plus',+ 'en-US': 'E-commerce Product Hero Plus'+ },+ description: {+ 'zh-CN': '由临时 catalog 动态加入的电商视觉模板。',+ 'en-US': 'An e-commerce visual preset added by the temporary catalog.'+ },+ sortOrder: 31,+ defaults: {+ prompt: '',+ size: '1536x1024',+ quality: 'high',+ candidateCount: 4+ },+ defaultsByLocale: {+ 'zh-CN': {+ prompt: '动态目录商品主图,白色背景,真实材质,突出核心卖点'+ },+ 'en-US': {+ prompt: 'Dynamic catalog product hero, white background, realistic materials'+ }+ }+ }, join(+ sourceRoot,+ 'image-generation',+ 'ecommerce-product',+ '1',+ 'cover.webp'+ ));+}++function addVideoTranslationV2(sourceRoot: string): void {+ const source = readManifest(+ sourceRoot,+ 'video-translation',+ 'bilibili-bilingual',+ 1+ );+ writePreset(sourceRoot, 'video-translation', 'bilibili-bilingual', 2, {+ ...source,+ version: 2,+ title: {+ 'zh-CN': 'B站双语精翻 Pro',+ 'en-US': 'Bilibili Bilingual Translation Pro'+ },+ sortOrder: 9,+ defaults: {+ ...source.defaults,+ subtitleStyle: {+ ...(source.defaults as { subtitleStyle: Record<string, unknown> }).subtitleStyle,+ fontPreset: 'rounded',+ fontSize: 'large',+ primaryColor: '#00FF66'+ }+ }+ }, join(+ sourceRoot,+ 'video-translation',+ 'bilibili-bilingual',+ '1',+ 'cover.webp'+ ));+}++function addMissingVideoRequirementPreset(sourceRoot: string): void {+ const source = readManifest(+ sourceRoot,+ 'video-generation',+ 'product-ad',+ 1+ );+ writePreset(sourceRoot, 'video-generation', 'configuration-required', 1, {+ ...source,+ id: 'configuration-required',+ featured: false,+ sortOrder: 41,+ title: {+ 'zh-CN': '需配置的视频广告',+ 'en-US': 'Video Ad Requiring Configuration'+ },+ description: {+ 'zh-CN': '验证未配置视频服务时保留可编辑草稿。',+ 'en-US': 'Verifies editable drafts when the video service is not configured.'+ },+ requirements: {+ service: 'video',+ provider: 'veo',+ model: 'veo-3.1-generate-preview'+ },+ defaults: {+ prompt: '需要配置服务的视频广告镜头',+ size: '1280x720',+ duration: 8+ },+ defaultsByLocale: {+ 'zh-CN': {+ prompt: '需要配置服务的视频广告镜头'+ },+ 'en-US': {+ prompt: 'Video advertisement shot that requires provider configuration'+ }+ }+ }, join(+ sourceRoot,+ 'video-generation',+ 'product-ad',+ '1',+ 'cover.webp'+ ));+}++function removeAlternativeImagePreset(sourceRoot: string): void {+ rmSync(join(sourceRoot, 'image-generation', 'ecommerce-product-alt'), {+ recursive: true,+ force: true+ });+}++function hideVideoTranslationV1(sourceRoot: string): void {+ const path = manifestPath(+ sourceRoot,+ 'video-translation',+ 'bilibili-bilingual',+ 1+ );+ const manifest = JSON.parse(readFileSync(path, 'utf8'));+ manifest.status = 'hidden';+ writeFileSync(path, `${JSON.stringify(manifest, null, 2)}\n`);+}++function updateVideoTranslationV2(sourceRoot: string): void {+ const path = manifestPath(+ sourceRoot,+ 'video-translation',+ 'bilibili-bilingual',+ 2+ );+ const manifest = JSON.parse(readFileSync(path, 'utf8'));+ manifest.defaults.subtitleStyle.primaryColor = '#FF00AA';+ manifest.defaults.subtitleStyle.fontSize = 'small';+ writeFileSync(path, `${JSON.stringify(manifest, null, 2)}\n`);+}++function readManifest(+ sourceRoot: string,+ module: string,+ id: string,+ version: number+): Record<string, unknown> {+ return JSON.parse(readFileSync(+ manifestPath(sourceRoot, module, id, version),+ 'utf8'+ )) as Record<string, unknown>;+}++function writePreset(+ sourceRoot: string,+ module: string,+ id: string,+ version: number,+ manifest: Record<string, unknown>,+ coverSource: string+): void {+ const directory = dirname(manifestPath(sourceRoot, module, id, version));+ mkdirSync(directory, { recursive: true });+ copyFileSync(coverSource, join(directory, 'cover.webp'));+ writeFileSync(+ join(directory, 'template.json'),+ `${JSON.stringify(manifest, null, 2)}\n`+ );+}++function manifestPath(+ sourceRoot: string,+ module: string,+ id: string,+ version: number+): string {+ return join(sourceRoot, module, id, String(version), 'template.json');+}++function compile(sourceRoot: string, outputRoot: string): void {+ execFileSync(process.execPath, [+ '--import',+ 'tsx',+ 'apps/daemon/scripts/creator-presets.ts',+ 'compile'+ ], {+ cwd: repositoryRoot,+ env: {+ ...process.env,+ OPENCREATOR_PRESET_SOURCE_ROOT: sourceRoot,+ OPENCREATOR_PRESET_CATALOG_ROOT: outputRoot+ },+ stdio: 'pipe'+ });+}diff --git a/apps/web/e2e/fixtures/runtime.ts b/apps/web/e2e/fixtures/runtime.tsindex 2daa1047..fe188eb0 100644--- a/apps/web/e2e/fixtures/runtime.ts+++ b/apps/web/e2e/fixtures/runtime.ts@@ -56,9 +56,11 @@ export type OpenAppOptions = {export type RuntimeFixture = {origin: string;+ dataDir: string;projectDir: string;projectId: string;ordinaryThreadId: string;+ restart(options?: { presetCatalogRoot?: string }): Promise<void>;configureInvocations(invocations: FakeCodexInvocation[]): void;configureCodex(config: FakeCodexConfig): void;openApp(page: Page, options?: OpenAppOptions): Promise<void>;@@ -156,39 +158,49 @@ export const test = base.extend<TestFixtures>({: undefined].find(candidate => candidate !== undefined && existsSync(candidate));prepareDaemonDevelopment(packageManagerScript);- const child = spawn(- packageManagerScript === undefined ? 'pnpm' : process.execPath,- packageManagerScript === undefined- ? packageManagerArgs- : [packageManagerScript, ...packageManagerArgs],- {- cwd: repoRoot,- detached: process.platform !== 'win32',- env: {- ...process.env,- OPENCREATOR_DATA_DIR: dataDir,- OPENCREATOR_CODEX_BIN: wrapperPath,- CODEX_HOME: codexHome,- OPENCREATOR_CODEX_THREAD_ROTATION_RUN_THRESHOLD: '0',- OPENCREATOR_RUNTIME_DEV_PREPARED: '1',- OPENCREATOR_E2E_FAKE_CODEX_CONFIG: configPath,- OPENCREATOR_E2E_FAKE_CODEX_STATE_DIR: stateDir,- OPENCREATOR_E2E_NODE_BINARY: process.execPath,- OPENCREATOR_E2E_FAKE_CODEX_SCRIPT: fakeCodexScript- },- stdio: ['ignore', 'pipe', 'pipe']- }- );- child.stdout?.on('data', chunk => {- serverLog += chunk.toString();- });- child.stderr?.on('data', chunk => {- serverLog += chunk.toString();- });+ let presetCatalogRoot = process.env.OPENCREATOR_E2E_PRESET_CATALOG_ROOT;+ const startRuntime = () => {+ const next = spawn(+ packageManagerScript === undefined ? 'pnpm' : process.execPath,+ packageManagerScript === undefined+ ? packageManagerArgs+ : [packageManagerScript, ...packageManagerArgs],+ {+ cwd: repoRoot,+ detached: process.platform !== 'win32',+ env: {+ ...process.env,+ OPENCREATOR_DATA_DIR: dataDir,+ OPENCREATOR_CODEX_BIN: wrapperPath,+ CODEX_HOME: codexHome,+ OPENCREATOR_CODEX_THREAD_ROTATION_RUN_THRESHOLD: '0',+ OPENCREATOR_RUNTIME_DEV_PREPARED: '1',+ OPENCREATOR_E2E_FAKE_CODEX_CONFIG: configPath,+ OPENCREATOR_E2E_FAKE_CODEX_STATE_DIR: stateDir,+ OPENCREATOR_E2E_NODE_BINARY: process.execPath,+ OPENCREATOR_E2E_FAKE_CODEX_SCRIPT: fakeCodexScript,+ ...(presetCatalogRoot === undefined+ ? {}+ : { OPENCREATOR_PRESET_CATALOG_ROOT: presetCatalogRoot })+ },+ stdio: ['ignore', 'pipe', 'pipe']+ }+ );+ next.stdout?.on('data', chunk => {+ serverLog += chunk.toString();+ });+ next.stderr?.on('data', chunk => {+ serverLog += chunk.toString();+ });+ return next;+ };+ let child = startRuntime();try {- const runtimeConfig = await waitForRuntime(origin, child, () => serverLog);- const runtimeBaseUrl = new URL(runtimeConfig.baseUrl, origin).toString().replace(/\/+$/, '');+ let runtimeConfig = await waitForRuntime(origin, child, () => serverLog);+ let runtimeBaseUrl = new URL(runtimeConfig.baseUrl, origin)+ .toString()+ .replace(/\/+$/, '');const api = async <T>(method: string, path: string, body?: unknown): Promise<T> => {const response = await fetch(`${runtimeBaseUrl}${path}`, {method,@@ -241,9 +253,21 @@ export const test = base.extend<TestFixtures>({const fixture: RuntimeFixture = {origin,+ dataDir,projectDir,projectId: project.project.id,ordinaryThreadId: ordinary.thread.id,+ async restart(options = {}) {+ await stopProcessTree(child);+ terminateRecordedFakeCodexProcesses(stateDir);+ presetCatalogRoot = options.presetCatalogRoot ?? presetCatalogRoot;+ serverLog += '\n[opencreator-e2e] restarting Vite and Daemon\n';+ child = startRuntime();+ runtimeConfig = await waitForRuntime(origin, child, () => serverLog);+ runtimeBaseUrl = new URL(runtimeConfig.baseUrl, origin)+ .toString()+ .replace(/\/+$/, '');+ },configureInvocations(invocations) {writeCodexConfig({ invocations });},diff --git a/apps/web/e2e/tts-services.spec.ts b/apps/web/e2e/tts-services.spec.tsindex 2275a1ea..fa7fa21b 100644--- a/apps/web/e2e/tts-services.spec.ts+++ b/apps/web/e2e/tts-services.spec.ts@@ -101,6 +101,7 @@ test('统一配音配置在设置、智能配音和视频翻译中保持一致',}>('POST', '/creator/jobs', {projectId: runtime.projectId,templateId: 'video-translation',+ creationKey: 'tts-services-video-translation',state: {sourceType: 'url',sourceUrl: 'https://www.youtube.com/watch?v=OpenCreatorTtsE2E',diff --git a/apps/web/e2e/web-desktop-parity.spec.ts b/apps/web/e2e/web-desktop-parity.spec.tsindex dba4f4fe..0ce177ca 100644--- a/apps/web/e2e/web-desktop-parity.spec.ts+++ b/apps/web/e2e/web-desktop-parity.spec.ts@@ -119,6 +119,7 @@ test('视频下载在 Browser/Desktop Bridge 下保持相同界面、请求和}>('POST', '/creator/jobs', {projectId: runtime.projectId,templateId: 'video-download',+ creationKey: 'parity-video-download',state: {sourceUrl: 'https://www.youtube.com/watch?v=OpenCreatorParity'}@@ -223,6 +224,7 @@ test('视频生成在 Browser/Desktop Bridge 下保持相同界面、请求和}>('POST', '/creator/jobs', {projectId: runtime.projectId,templateId: 'video-generation',+ creationKey: `parity-video-generation-${platform}`,state: {prompt: '雨夜中的未来城市,镜头平稳向前推进',provider: 'seedance',@@ -427,7 +429,7 @@ test('第三方组件设置在 Browser/Desktop Bridge 下保持相同状态、expect(results[0]!.requests).toContain('GET /creator/yt-dlp/status');});-test('工作台模板新建 Creator Job,刷新和最近项目精确恢复历史且不启动普通 Codex Run', async ({ page, runtime }) => {+test('工作台模块新建 Creator Job,刷新和最近项目精确恢复历史且不启动普通 Codex Run', async ({ page, runtime }) => {await page.route(/^https:\/\/i\.ytimg\.com\/vi\/OpenCreator(?:Demo|Second)\/maxresdefault\.jpg$/,route => route.fulfill({@@ -442,7 +444,7 @@ test('工作台模板新建 Creator Job,刷新和最近项目精确恢复历await page.goto(`${runtime.origin}/#/workbench`);await expect(page.getByRole('heading', { name: '工作台' })).toBeVisible();- await page.getByRole('button', { name: /视频下载/ }).last().click();+ await page.getByRole('button', { name: /^视频下载/ }).click();const input = page.getByRole('textbox', { name: '待下载视频链接' });await expect(input).toBeVisible();await input.fill('https://www.youtube.com/watch?v=OpenCreatorDemo');@@ -471,8 +473,10 @@ test('工作台模板新建 Creator Job,刷新和最近项目精确恢复历await expect(page.getByRole('textbox', { name: '待下载视频链接' })).toHaveValue('https://www.youtube.com/watch?v=OpenCreatorDemo');- await page.getByRole('button', { name: '返回', exact: true }).click();- await page.getByRole('button', { name: /视频下载/ }).last().click();+ await page.getByRole('region', { name: '视频下载 操作区' })+ .getByRole('button', { name: '返回', exact: true })+ .click();+ await page.getByRole('button', { name: /^视频下载/ }).click();await expect(page.getByRole('textbox', { name: '待下载视频链接' })).toHaveValue('');await page.getByRole('textbox', { name: '待下载视频链接' }).fill('https://www.youtube.com/watch?v=OpenCreatorSecond');@@ -599,6 +603,132 @@ test('封面生成在桌面和移动视口保持可操作并从项目中心恢await expect(page.getByRole('radio', { name: '9:16', exact: true })).toBeChecked();});+test('Creator Preset 在 Browser/Desktop Bridge 下创建相同工作台状态', async ({+ browser,+ runtime+}, testInfo) => {+ test.skip(+ testInfo.project.name !== 'chromium-desktop',+ '一致性规格内部固定创建 Browser/Desktop Chromium 上下文'+ );++ const results: Array<{+ request: Record<string, unknown>;+ route: string;+ text: string;+ job: {+ templateId: string;+ templateVersion: number;+ status: string;+ state: Record<string, unknown>;+ presetOrigin: Record<string, unknown> | null;+ stages: unknown[];+ };+ }> = [];++ for (const platform of ['browser', 'desktop'] as const) {+ 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);+ let createRequest: Record<string, unknown> | undefined;+ page.on('request', request => {+ const url = new URL(request.url());+ if (+ request.method() === 'POST'+ && url.pathname.endsWith('/creator/jobs')+ ) {+ createRequest = request.postDataJSON() as Record<string, unknown>;+ }+ });++ try {+ await runtime.openApp(page);+ await page.goto(`${runtime.origin}/#/new`);+ await expect(page.getByRole('heading', { name: '创作模板' })).toBeVisible();+ await expect(page.getByRole('heading', { name: '创作模块' })).toBeVisible();+ await expect(page.getByRole('heading', { name: '视频翻译模板' })).toBeVisible();+ await expect(page.getByRole('textbox', { name: '输入任务' })).toHaveCount(0);+ const presetButton = page.getByRole('button', {+ name: '使用B站双语精翻模板'+ });+ const cover = presetButton.locator('img');+ await expect.poll(async () => cover.evaluate(image => ({+ complete: image.complete,+ width: image.naturalWidth+ }))).toEqual({ complete: true, width: 1280 });++ await presetButton.click();+ await expect(page).toHaveURL(/#\/workbench\?tool=video-translation&jobId=/);+ const route = new URL(page.url()).hash.slice(1);+ const jobId = new URL(route, runtime.origin).searchParams.get('jobId');+ expect(jobId).not.toBeNull();+ await expect.poll(() => createRequest).toBeDefined();+ const response = await runtime.api<{+ job: {+ templateId: string;+ templateVersion: number;+ status: string;+ state: Record<string, unknown>;+ presetOrigin: Record<string, unknown> | null;+ stages: unknown[];+ };+ }>('GET', `/creator/jobs/${encodeURIComponent(jobId!)}`);+ const workspace = page.getByRole('region', { name: '视频翻译操作区' });+ const panel = page.getByRole('complementary', { name: 'OpenCreator' });+ await expect(workspace).toBeVisible();+ await expect(panel).toBeVisible();++ results.push({+ request: {+ ...createRequest!,+ creationKey: '{creationKey}'+ },+ route: route.replace(jobId!, '{jobId}'),+ text: normalizeParityText(+ `${await workspace.innerText()}\n${await panel.innerText()}`+ ),+ job: {+ templateId: response.job.templateId,+ templateVersion: response.job.templateVersion,+ status: response.job.status,+ state: response.job.state,+ presetOrigin: response.job.presetOrigin,+ stages: response.job.stages+ }+ });+ } finally {+ await context.close();+ }+ }++ expect(results[1]!.request).toEqual(results[0]!.request);+ expect(results[1]!.route).toBe(results[0]!.route);+ expect(results[1]!.text).toBe(results[0]!.text);+ expect(results[1]!.job).toEqual(results[0]!.job);+ expect(results[0]!.job).toMatchObject({+ templateId: 'video-translation',+ templateVersion: 2,+ status: 'draft',+ presetOrigin: {+ module: 'video-translation',+ id: 'bilibili-bilingual',+ version: 1,+ locale: 'zh-CN',+ title: 'B站双语精翻'+ },+ state: {+ bilingual: true,+ targetLanguage: 'zh_cn'+ },+ stages: []+ });+});+async function installDesktopBridge(page: import('@playwright/test').Page): Promise<void> {diff --git a/apps/web/src/app/App.test.tsx b/apps/web/src/app/App.test.tsxindex 5ca3aaca..d81bacf7 100644--- a/apps/web/src/app/App.test.tsx+++ b/apps/web/src/app/App.test.tsx@@ -13,6 +13,7 @@ import type {CodexStatusResponse,CreatorJson,CreatorJob,+ CreatorPresetSummary,CreateScheduleRequest,ProjectResponse,RunDiagnosticsResponse,@@ -53,6 +54,22 @@ vi.mock('@opencreator/skill-market', async importOriginal => {let testRuntimeProjects: ProjectResponse[] | undefined;let testCreatorJobs: CreatorJob[] = [];let testCreatorJobsByCreationKey = new Map<string, string>();+const testCreatorPresets: CreatorPresetSummary[] = [{+ module: 'image-generation',+ id: 'ecommerce-product-alt',+ version: 1,+ title: '电商商品主图增强版',+ description: '从测试 catalog 动态加载。',+ coverUrl: `/creator-presets/${'a'.repeat(64)}.webp`,+ tags: ['ecommerce', 'product'],+ featured: true,+ sortOrder: 10,+ requirements: null,+ highlights: [+ { text: '1536 × 1024', colors: [] },+ { text: '2 张', colors: [] }+ ]+}];function App(props: AppProps = {}) {return <ProductionApp projectNavigationMode="tree" {...props} />;@@ -65,7 +82,7 @@ function navigateToTestRoute(hash: string) {describe('App', () => {beforeEach(() => {- window.history.replaceState(null, '', '#/new');+ window.history.replaceState(null, '', '#/chat');});it('maps valid skills and configured MCP servers into Composer commands', () => {@@ -295,6 +312,7 @@ describe('App', () => {templateVersion: 2,status: 'draft',revision: 0,+ presetOrigin: null,state: {prompt: '返回项目列表测试封面',sourceType: 'prompt',@@ -660,17 +678,28 @@ describe('App', () => {window.history.replaceState(null, '', `${window.location.pathname}${window.location.search}`);});- it('hides Home and opens the dashboard from the root route', async () => {+ it.each(['browser', 'desktop'] as const)(+ 'opens the template Home without restoring the previous conversation in the %s host',+ async hostKind => {window.history.replaceState(null, '', '#/');- render(<App fileService={createFileService()} />);+ window.localStorage.setItem('opencreator.navigation.v3', JSON.stringify({+ selectedThreadId: 'thread-from-previous-session'+ }));+ const hostBridge = createHostBridge();+ hostBridge.kind = hostKind;+ render(<App fileService={createFileService()} hostBridge={hostBridge} />);- expect(await screen.findByRole('heading', { name: '工作台' })).toBeInTheDocument();- expect(screen.queryByRole('button', { name: '首页' })).not.toBeInTheDocument();- expect(screen.getByRole('button', { name: '工作台' })).toHaveAttribute('aria-current', 'page');+ expect(await screen.findByRole('heading', { name: '创作模板' })).toBeInTheDocument();+ expect(await screen.findByRole('heading', { name: '创作模块' })).toBeInTheDocument();+ expect(screen.getByRole('heading', { name: '视频翻译模板' })).toBeInTheDocument();+ expect(screen.getByRole('button', { name: '首页' })).toHaveAttribute('aria-current', 'page');+ expect(screen.getByRole('button', { name: '工作台' })).not.toHaveAttribute('aria-current');expect(screen.queryByText('需要帮你做点什么')).not.toBeInTheDocument();+ expect(screen.queryByRole('textbox', { name: '输入任务' })).not.toBeInTheDocument();+ expect(screen.queryByRole('button', { name: '空白视频翻译' })).not.toBeInTheDocument();});- it('opens a Home Skill interaction without submitting its prompt hint', async () => {+ it('opens a blank creator workspace from Workbench without submitting a prompt hint', async () => {const user = userEvent.setup();const hostBridge = createHostBridge();hostBridge.readConnectionConfig = async () => ({@@ -695,20 +724,305 @@ describe('App', () => {/>);- await user.click(await screen.findByRole('button', {- name: '使用多语言视频翻译模板'- }));+ await user.click(await screen.findByRole('button', { name: '工作台' }));+ await user.click(screen.getByRole('button', { name: /^视频翻译/ }));expect(await screen.findByRole('heading', { name: '视频翻译配音' })).toBeInTheDocument();expect(screen.queryByLabelText('OpenCreator 导航')).not.toBeInTheDocument();const agentInput = screen.getByRole('textbox', { name: '告诉 Agent 你的要求' });- expect(agentInput).toHaveAttribute('placeholder', '上传视频,或者输入有效的视频链接');+ expect(agentInput).toHaveAttribute(+ 'placeholder',+ '询问状态,或描述要调整的语言、字幕、配音和成片要求'+ );expect(agentInput).toHaveValue('');- await user.click(screen.getByRole('button', { name: '返回' }));+ await user.click(within(+ screen.getByRole('region', { name: '视频翻译操作区' })+ ).getByRole('button', { name: '返回' }));expect(await screen.findByLabelText('OpenCreator 导航')).toBeInTheDocument();await waitFor(() => expect(window.location.hash).toBe('#/workbench'));});+ it('creates a preset job from the catalog and opens the real job workspace', async () => {+ const user = userEvent.setup();+ const [project] = persistProjects('/Users/test/develop/preset-project');+ window.localStorage.setItem('opencreator.navigation.v3', JSON.stringify({+ currentProjectId: project.id+ }));+ const hostBridge = createHostBridge();+ hostBridge.readConnectionConfig = async () => ({+ baseUrl: 'http://127.0.0.1:60764',+ token: 'runtime-token'+ });+ const createBodies: Array<Record<string, unknown>> = [];+ const runtimeFetch = async (input: RequestInfo | URL, init?: RequestInit) => {+ const url = String(input);+ const parsedUrl = new URL(url);+ if (parsedUrl.pathname === '/creator/jobs' && init?.method === 'POST') {+ createBodies.push(readRequestBody(init));+ }+ const projectApiResponse = handleDefaultProjectApiRequest(url, init);+ if (projectApiResponse !== undefined) return projectApiResponse;+ if (url.endsWith('/healthz')) return jsonResponse({ ok: true });+ if (url.endsWith('/codex/status')) return jsonResponse(createCodexStatusResponse());+ if (url.includes('/threads?')) return jsonResponse({ threads: [] });+ throw new Error(`Unexpected request ${url}`);+ };++ render(+ <App+ fileService={createFileService()}+ hostBridge={hostBridge}+ runtimeFetch={runtimeFetch}+ subscribeRunEvents={async () => undefined}+ />+ );++ await user.click(await screen.findByRole('tab', { name: /^图像生成,/ }));+ await user.click(screen.getByRole('button', {+ name: '使用电商商品主图增强版模板'+ }));++ await waitFor(() => expect(window.location.hash).toBe(+ '#/workbench?tool=image-generation&jobId=creator-job-1&returnTo=home'+ ));+ expect(await screen.findByRole('heading', { name: '图像生成' })).toBeInTheDocument();+ expect(createBodies).toHaveLength(1);+ expect(createBodies[0]).toMatchObject({+ projectId: project.id,+ preset: {+ module: 'image-generation',+ id: 'ecommerce-product-alt',+ version: 1+ },+ locale: 'zh-CN',+ creationKey: expect.stringMatching(/^creator_preset_/)+ });+ expect(createBodies[0]).not.toHaveProperty('templateId');+ expect(createBodies[0]).not.toHaveProperty('state');+ expect(testCreatorJobs[0]).toMatchObject({+ state: {+ prompt: '专业电商商品主图',+ provider: 'openai'+ },+ presetOrigin: {+ module: 'image-generation',+ id: 'ecommerce-product-alt',+ version: 1,+ title: '电商商品主图增强版'+ },+ stages: []+ });+ expect(creatorPresetCreationStorageKeys()).toHaveLength(0);++ await user.click(within(+ screen.getByRole('region', { name: '图像生成 操作区' })+ ).getAllByRole('button', { name: '返回' })[0]!);++ await waitFor(() => expect(window.location.hash).toBe('#/new'));+ expect(await screen.findByRole('heading', { name: '图像生成模板' })).toBeInTheDocument();+ expect(screen.getByRole('tab', { name: /^图像生成,1 个模板/ }))+ .toHaveAttribute('aria-selected', 'true');+ });++ it('reuses the preset creation key after remounting and clears it after recovery', async () => {+ const user = userEvent.setup();+ const [project] = persistProjects('/Users/test/develop/preset-remount');+ window.localStorage.setItem('opencreator.navigation.v3', JSON.stringify({+ currentProjectId: project.id+ }));+ const hostBridge = createHostBridge();+ hostBridge.readConnectionConfig = async () => ({+ baseUrl: 'http://127.0.0.1:60764',+ token: 'runtime-token'+ });+ const creationKeys: string[] = [];+ let rejectFirstResponse: ((reason: Error) => void) | undefined;+ const firstResponse = new Promise<Response>((_resolve, reject) => {+ rejectFirstResponse = reject;+ });+ const runtimeFetch = async (input: RequestInfo | URL, init?: RequestInit) => {+ const url = String(input);+ const parsedUrl = new URL(url);+ if (parsedUrl.pathname === '/creator/jobs' && init?.method === 'POST') {+ creationKeys.push(String(readRequestBody(init).creationKey));+ const committed = handleDefaultProjectApiRequest(url, init)!;+ if (creationKeys.length === 1) return firstResponse;+ return committed;+ }+ const projectApiResponse = handleDefaultProjectApiRequest(url, init);+ if (projectApiResponse !== undefined) return projectApiResponse;+ if (url.endsWith('/healthz')) return jsonResponse({ ok: true });+ if (url.endsWith('/codex/status')) return jsonResponse(createCodexStatusResponse());+ if (url.includes('/threads?')) return jsonResponse({ threads: [] });+ throw new Error(`Unexpected request ${url}`);+ };++ const firstRender = render(+ <App+ fileService={createFileService()}+ hostBridge={hostBridge}+ runtimeFetch={runtimeFetch}+ subscribeRunEvents={async () => undefined}+ />+ );+ await user.click(await screen.findByRole('tab', { name: /^图像生成,/ }));+ await user.click(screen.getByRole('button', {+ name: '使用电商商品主图增强版模板'+ }));+ await waitFor(() => expect(testCreatorJobs).toHaveLength(1));+ expect(creatorPresetCreationStorageKeys()).toHaveLength(1);+ firstRender.unmount();+ rejectFirstResponse?.(new TypeError('connection closed after commit'));+ await act(async () => Promise.resolve());++ render(+ <App+ fileService={createFileService()}+ hostBridge={hostBridge}+ runtimeFetch={runtimeFetch}+ subscribeRunEvents={async () => undefined}+ />+ );+ await user.click(await screen.findByRole('tab', { name: /^图像生成,/ }));+ await user.click(screen.getByRole('button', {+ name: '使用电商商品主图增强版模板'+ }));++ await waitFor(() => expect(window.location.hash).toBe(+ '#/workbench?tool=image-generation&jobId=creator-job-1&returnTo=home'+ ));+ expect(creationKeys).toHaveLength(2);+ expect(new Set(creationKeys).size).toBe(1);+ expect(testCreatorJobs).toHaveLength(1);+ expect(creatorPresetCreationStorageKeys()).toHaveLength(0);+ });++ it('retries a timed-out preset creation with the same creation key', async () => {+ const user = userEvent.setup();+ const [project] = persistProjects('/Users/test/develop/preset-timeout');+ window.localStorage.setItem('opencreator.navigation.v3', JSON.stringify({+ currentProjectId: project.id+ }));+ const hostBridge = createHostBridge();+ hostBridge.readConnectionConfig = async () => ({+ baseUrl: 'http://127.0.0.1:60764',+ token: 'runtime-token'+ });+ const nativeSetTimeout = window.setTimeout.bind(window);+ vi.spyOn(window, 'setTimeout').mockImplementation(((+ handler: TimerHandler,+ timeout?: number,+ ...args: unknown[]+ ) => nativeSetTimeout(+ handler,+ timeout === 15_000 ? 0 : timeout,+ ...args+ )) as typeof window.setTimeout);+ const creationKeys: string[] = [];+ const runtimeFetch = async (input: RequestInfo | URL, init?: RequestInit) => {+ const url = String(input);+ const parsedUrl = new URL(url);+ if (parsedUrl.pathname === '/creator/jobs' && init?.method === 'POST') {+ creationKeys.push(String(readRequestBody(init).creationKey));+ if (creationKeys.length === 1) {+ return new Promise<Response>(() => undefined);+ }+ }+ const projectApiResponse = handleDefaultProjectApiRequest(url, init);+ if (projectApiResponse !== undefined) return projectApiResponse;+ if (url.endsWith('/healthz')) return jsonResponse({ ok: true });+ if (url.endsWith('/codex/status')) return jsonResponse(createCodexStatusResponse());+ if (url.includes('/threads?')) return jsonResponse({ threads: [] });+ throw new Error(`Unexpected request ${url}`);+ };++ render(+ <App+ fileService={createFileService()}+ hostBridge={hostBridge}+ runtimeFetch={runtimeFetch}+ subscribeRunEvents={async () => undefined}+ />+ );+ await user.click(await screen.findByRole('tab', { name: /^图像生成,/ }));+ await user.click(screen.getByRole('button', {+ name: '使用电商商品主图增强版模板'+ }));+ expect(await screen.findByRole('alert')).toHaveTextContent(+ '模板任务创建超时,请重试。'+ );+ expect(creatorPresetCreationStorageKeys()).toHaveLength(1);++ await user.click(screen.getByRole('button', {+ name: '使用电商商品主图增强版模板'+ }));+ await waitFor(() => expect(window.location.hash).toBe(+ '#/workbench?tool=image-generation&jobId=creator-job-1&returnTo=home'+ ));+ expect(creationKeys).toHaveLength(2);+ expect(new Set(creationKeys).size).toBe(1);+ expect(creatorPresetCreationStorageKeys()).toHaveLength(0);+ });++ it('refreshes the catalog and clears the creation key when a preset disappears', async () => {+ const user = userEvent.setup();+ const [project] = persistProjects('/Users/test/develop/preset-missing');+ window.localStorage.setItem('opencreator.navigation.v3', JSON.stringify({+ currentProjectId: project.id+ }));+ const hostBridge = createHostBridge();+ hostBridge.readConnectionConfig = async () => ({+ baseUrl: 'http://127.0.0.1:60764',+ token: 'runtime-token'+ });+ let catalogRequests = 0;+ const runtimeFetch = async (input: RequestInfo | URL, init?: RequestInit) => {+ const url = String(input);+ const parsedUrl = new URL(url);+ if (parsedUrl.pathname === '/creator/presets' && init?.method === 'GET') {+ catalogRequests += 1;+ return jsonResponse({+ locale: 'zh-CN',+ catalogHash: `${catalogRequests}`.padStart(64, '0'),+ presets: testCreatorPresets+ });+ }+ if (parsedUrl.pathname === '/creator/jobs' && init?.method === 'POST') {+ return jsonResponse({+ error: {+ code: 'creator_preset_not_found',+ message: 'Creator preset asset not found'+ }+ }, { status: 404 });+ }+ const projectApiResponse = handleDefaultProjectApiRequest(url, init);+ if (projectApiResponse !== undefined) return projectApiResponse;+ if (url.endsWith('/healthz')) return jsonResponse({ ok: true });+ if (url.endsWith('/codex/status')) return jsonResponse(createCodexStatusResponse());+ if (url.includes('/threads?')) return jsonResponse({ threads: [] });+ throw new Error(`Unexpected request ${url}`);+ };++ render(+ <App+ fileService={createFileService()}+ hostBridge={hostBridge}+ runtimeFetch={runtimeFetch}+ subscribeRunEvents={async () => undefined}+ />+ );+ await user.click(await screen.findByRole('tab', { name: /^图像生成,/ }));+ await user.click(screen.getByRole('button', {+ name: '使用电商商品主图增强版模板'+ }));++ expect(await screen.findByRole('alert')).toHaveTextContent(+ '该模板已不可用,模板目录已刷新。'+ );+ await waitFor(() => expect(catalogRequests).toBeGreaterThanOrEqual(2));+ expect(creatorPresetCreationStorageKeys()).toHaveLength(0);+ });+it('adds a title bar safe area only when the host exposes the capability', async () => {const hostBridge = createHostBridge();hostBridge.windowChrome = {@@ -791,6 +1105,7 @@ describe('App', () => {it('waits for restored conversation history before showing the empty conversation layout', async () => {const user = userEvent.setup();const [project] = persistProjects('/Users/test/develop/clean');+ window.location.hash = '#/thread/thread-restored-loading';window.localStorage.setItem('opencreator.navigation.v3', JSON.stringify({currentProjectId: project.id,selectedThreadId: 'thread-restored-loading'@@ -845,7 +1160,7 @@ describe('App', () => {.toBeInTheDocument();expect(document.querySelector('.conversation-page')).not.toHaveClass('is-empty');expect(screen.queryByText('需要帮你做点什么')).not.toBeInTheDocument();- expect(screen.queryByRole('heading', { name: '创作模板' })).not.toBeInTheDocument();+ expect(screen.queryByRole('heading', { name: '创作模块' })).not.toBeInTheDocument();expect(screen.queryByRole('button', { name: /选择项目/ })).not.toBeInTheDocument();history.resolve(jsonResponse({@@ -860,10 +1175,11 @@ describe('App', () => {});expect(document.querySelector('.conversation-page')).toHaveClass('is-empty');expect(screen.getByText('需要帮你做点什么')).toBeInTheDocument();- expect(screen.getByRole('heading', { name: '创作模板' })).toBeInTheDocument();+ expect(screen.getByRole('heading', { name: '创作模块' })).toBeInTheDocument();+ expect(screen.getByRole('heading', { name: '视频翻译模板' })).toBeInTheDocument();expect(screen.queryByRole('button', { name: /选择项目/ })).not.toBeInTheDocument();- expect(screen.queryByRole('button', { name: /^视频翻译/ })).not.toBeInTheDocument();+ expect(screen.queryByRole('button', { name: '空白视频翻译' })).not.toBeInTheDocument();await user.click(screen.getByRole('button', { name: '工作台' }));expect(await screen.findByRole('heading', { name: '工作台' })).toBeInTheDocument();await user.click(screen.getByRole('button', { name: /^视频翻译/ }));@@ -4078,7 +4394,7 @@ describe('App', () => {name: new RegExp(`^${hostKind} 归档会话 `)})).not.toBeInTheDocument();});- expect(window.location.hash).toBe('#/new');+ expect(window.location.hash).toBe('#/chat');expect(findPostCall(fetchCalls, `/threads/${thread.id}/archive`)).toBeDefined();expect(screen.getByRole('textbox', { name: '输入任务' })).toBeEnabled();}@@ -4717,6 +5033,7 @@ describe('App', () => {it('restores a selected historical conversation that is outside the initial thread page', async () => {const [biliProject] = persistProjects('/Users/test/develop/opencreator/bili');+ window.location.hash = '#/thread/thread_older_history';window.localStorage.setItem('opencreator.navigation.v3', JSON.stringify({currentProjectId: biliProject.id,selectedThreadId: 'thread_older_history'@@ -7755,6 +8072,16 @@ function handleDefaultCreatorApiRequest(): Response | undefined {const method = init?.method ?? 'GET';const parsedUrl = new URL(url);+ if (parsedUrl.pathname === '/creator/presets' && method === 'GET') {+ const locale = parsedUrl.searchParams.get('locale') === 'en-US'+ ? 'en-US'+ : 'zh-CN';+ return jsonResponse({+ locale,+ catalogHash: 'f'.repeat(64),+ presets: testCreatorPresets+ });+ }if (parsedUrl.pathname === '/creator/jobs' && method === 'GET') {const projectId = parsedUrl.searchParams.get('projectId');return jsonResponse({@@ -7772,15 +8099,52 @@ function handleDefaultCreatorApiRequest(: testCreatorJobs.find(job => job.id === existingJobId);if (existingJob !== undefined) return jsonResponse({ job: existingJob }, { status: 201 });const now = new Date(0).toISOString();+ const presetRef = body.preset !== null+ && typeof body.preset === 'object'+ && !Array.isArray(body.preset)+ ? body.preset as Record<string, unknown>+ : undefined;+ const presetModule = typeof presetRef?.module === 'string'+ ? presetRef.module+ : undefined;+ const isImagePreset = presetModule === 'image-generation';const job: CreatorJob = {id: `creator-job-${testCreatorJobs.length + 1}`,projectId: typeof body.projectId === 'string' ? body.projectId : 'project-test',- templateId: typeof body.templateId === 'string' ? body.templateId : 'video-translation',- templateVersion: typeof body.templateVersion === 'number' ? body.templateVersion : 1,+ templateId: typeof body.templateId === 'string'+ ? body.templateId+ : isImagePreset+ ? 'image-generation'+ : 'video-translation',+ templateVersion: typeof body.templateVersion === 'number'+ ? body.templateVersion+ : isImagePreset+ ? 2+ : 1,status: 'draft',revision: 0,+ presetOrigin: isImagePreset ? {+ module: 'image-generation',+ id: String(presetRef?.id ?? ''),+ version: Number(presetRef?.version ?? 1),+ locale: body.locale === 'en-US' ? 'en-US' : 'zh-CN',+ title: body.locale === 'en-US'+ ? 'Enhanced Product Hero'+ : '电商商品主图增强版',+ contentHash: 'e'.repeat(64)+ } : null,state: body.state !== null && typeof body.state === 'object' && !Array.isArray(body.state)? body.state as Record<string, CreatorJson>+ : isImagePreset+ ? {+ prompt: '专业电商商品主图',+ provider: 'openai',+ size: '1536x1024',+ quality: 'medium',+ candidateCount: 2,+ referenceImageArtifactId: null,+ currentStage: null+ }: {sourceType: 'url',sourceUrl: '',@@ -8211,6 +8575,15 @@ function persistProjects(cwd: string, ...additionalCwds: string[]): [OpenCreatorreturn projects;}+function creatorPresetCreationStorageKeys(): string[] {+ return Array.from(+ { length: window.sessionStorage.length },+ (_, index) => window.sessionStorage.key(index)+ ).filter((key): key is string => (+ key?.startsWith('opencreator.creator-preset-creation.v1:') === true+ ));+}+function createLegacyPersistedProject(cwd: string): OpenCreatorProject {const normalizedCwd = cwd.replace(/\\/g, '/').replace(/\/+$/, '');const name = normalizedCwd.split('/').filter(Boolean).at(-1) ?? 'project';diff --git a/apps/web/src/app/AppController.tsx b/apps/web/src/app/AppController.tsxindex e75a38c0..b1eb44d0 100644--- a/apps/web/src/app/AppController.tsx+++ b/apps/web/src/app/AppController.tsx@@ -8,6 +8,7 @@ import type {CodexSkillMarketInstallRecordResponse,ConversationSearchResult,CreatorJob,+ CreatorPresetSummary,CreateMemoryRequest,CreateThreadRequest,RunDiagnosticsResponse,@@ -43,6 +44,7 @@ import {} from '../features/conversation/CreatorDashboard.js';import {creatorWorkspaceForTemplate,+ type CreatorPresetWorkspace,type CreatorSkillLaunch} from '../features/dashboard/creator-workspace.js';import { ConversationHeader } from '../features/conversation/ConversationHeader.js';@@ -205,6 +207,9 @@ const WORKSPACE_AUTO_COLLAPSE_MAX_WIDTH =const WORKSPACE_AUTO_COLLAPSE_MEDIA_QUERY =`(min-width: ${MOBILE_NAVIGATION_MAX_WIDTH + 1}px) and (max-width: ${WORKSPACE_AUTO_COLLAPSE_MAX_WIDTH}px)`;const RESIZE_KEY_STEP = 32;+const CREATOR_PRESET_CREATION_TIMEOUT_MS = 15_000;+const CREATOR_PRESET_CREATION_STORAGE_PREFIX =+ 'opencreator.creator-preset-creation.v1:';function canScrollVertically(target: EventTarget | null,boundary: HTMLElement,@@ -289,6 +294,10 @@ export function AppController(props: AppControllerProps) {const [creatorJobs, setCreatorJobs] = useState<CreatorJob[]>([]);const [creatorJobsLoading, setCreatorJobsLoading] = useState(false);const [creatorJobsError, setCreatorJobsError] = useState<string>();+ const [creatorPresets, setCreatorPresets] = useState<CreatorPresetSummary[]>([]);+ const [creatorPresetsLoading, setCreatorPresetsLoading] = useState(false);+ const [creatorPresetsError, setCreatorPresetsError] = useState<string>();+ const [creatorPresetsReloadKey, setCreatorPresetsReloadKey] = useState(0);const defaultFileService = useMemo(() => createUnavailableFileService(), []);const fileService = props.fileService ?? defaultFileService;const hostBridge = props.hostBridge ?? browserBridge;@@ -355,6 +364,8 @@ export function AppController(props: AppControllerProps) {>();const [pendingComposerFocusRequestId, setPendingComposerFocusRequestId] = useState<number>();const [homeSkillPromptHint, setHomeSkillPromptHint] = useState<string>();+ const [homeCreatorModule, setHomeCreatorModule] =+ useState<CreatorPresetWorkspace>('video-translation');const [creatorSkillLaunch, setCreatorSkillLaunch] = useState<CreatorSkillLaunch>();useEffect(() => {if (threadConfigUpdateError === undefined) return;@@ -469,6 +480,10 @@ export function AppController(props: AppControllerProps) {const nextComposerFocusRequestIdRef = useRef(0);const composerAttachmentDraftIdsRef = useRef(new Map<string, string>());const retainedAttachmentPreviewUrlsRef = useRef(new Map<string, string>());+ const creatorPresetCreationIntentsRef = useRef(new Map<string, {+ creationKey: string;+ request?: Promise<CreatorJob>;+ }>());const codexModelsRef = useRef(codexModels);runRegistryRef.current = runRegistry;runtimeThreadsRef.current = runtimeThreads;@@ -760,6 +775,94 @@ export function AppController(props: AppControllerProps) {nextComposerFocusRequestIdRef.current += 1;setPendingComposerFocusRequestId(nextComposerFocusRequestIdRef.current);}+ async function applyDashboardPreset(preset: CreatorPresetSummary): Promise<void> {+ if (creatorService === null) {+ throw new Error(language === 'en-US'+ ? 'The local creator service is unavailable.'+ : '本地创作服务不可用。');+ }+ const projectId = state.currentProjectId;+ if (projectId === undefined) {+ throw new Error(language === 'en-US'+ ? 'Select a project before using a preset.'+ : '请先选择项目,再使用模板。');+ }+ const scope = [+ projectId,+ preset.module,+ preset.id,+ preset.version,+ language+ ].join(':');+ let intent = creatorPresetCreationIntentsRef.current.get(scope);+ if (intent === undefined) {+ intent = {+ creationKey: readOrCreateCreatorPresetCreationKey(scope)+ };+ creatorPresetCreationIntentsRef.current.set(scope, intent);+ }+ let request = intent.request;+ if (request === undefined) {+ request = withCreatorPresetCreationTimeout(+ creatorService.createJob({+ projectId,+ preset: {+ module: preset.module,+ id: preset.id,+ version: preset.version+ },+ locale: language,+ creationKey: intent.creationKey+ }).then(response => response.job),+ language === 'en-US'+ ? 'Preset creation timed out. Try again.'+ : '模板任务创建超时,请重试。'+ );+ intent.request = request;+ }+ let job: CreatorJob;+ try {+ job = await request;+ } catch (error) {+ if (+ creatorPresetCreationIntentsRef.current.get(scope) === intent+ && intent.request === request+ ) {+ intent.request = undefined;+ if (isTerminalCreatorPresetCreationError(error)) {+ creatorPresetCreationIntentsRef.current.delete(scope);+ clearCreatorPresetCreationKey(scope, intent.creationKey);+ }+ }+ if (+ error instanceof ApiClientError+ && error.code === 'creator_preset_not_found'+ ) {+ setCreatorPresetsReloadKey(value => value + 1);+ throw new Error(language === 'en-US'+ ? 'This preset is no longer available. The catalog has been refreshed.'+ : '该模板已不可用,模板目录已刷新。');+ }+ throw error;+ }+ if (+ creatorPresetCreationIntentsRef.current.get(scope) === intent+ && intent.request === request+ ) {+ creatorPresetCreationIntentsRef.current.delete(scope);+ clearCreatorPresetCreationKey(scope, intent.creationKey);+ }+ rememberCreatorJob(job);+ setCreatorSkillLaunch(undefined);+ closeMobileSidebar();+ dispatch({ type: 'set_active_view', activeView: 'dashboard' });+ navigateToRoute({+ view: 'workbench',+ tool: preset.module,+ jobId: job.id,+ returnTo: 'home'+ });+ }const handleCreatorWorkspaceModeChange = useCallback((active: boolean) => {setImmersiveWorkspace(active);if (active) setCreatorSkillLaunch(undefined);@@ -1263,6 +1366,47 @@ export function AppController(props: AppControllerProps) {};}, [connectionState.status, hostBridge, projectService, threadService]);+ useEffect(() => {+ let canceled = false;+ if (connectionState.status !== 'connected' || creatorService === null) {+ setCreatorPresets([]);+ setCreatorPresetsError(undefined);+ setCreatorPresetsLoading(false);+ return () => {+ canceled = true;+ };+ }++ setCreatorPresetsLoading(true);+ setCreatorPresetsError(undefined);+ void creatorService.listPresets(language)+ .then(response => {+ if (!canceled) setCreatorPresets(response.presets);+ })+ .catch(error => {+ if (!canceled) {+ setCreatorPresetsError(getRuntimeErrorMessage(+ error,+ language === 'en-US'+ ? 'Unable to load creator presets'+ : '无法加载创作模板'+ ));+ }+ })+ .finally(() => {+ if (!canceled) setCreatorPresetsLoading(false);+ });++ return () => {+ canceled = true;+ };+ }, [+ connectionState.status,+ creatorPresetsReloadKey,+ creatorService,+ language+ ]);+useEffect(() => {let canceled = false;if (connectionState.status !== 'connected' || creatorService === null) {@@ -2219,6 +2363,7 @@ export function AppController(props: AppControllerProps) {function startNewConversation(options: {updateRoute?: boolean;projectId?: string;+ destination?: 'home' | 'chat';} = {}) {closeMobileSidebar();allowInitialRuntimeProjectFocusRef.current = false;@@ -2240,7 +2385,9 @@ export function AppController(props: AppControllerProps) {dispatch({ type: 'select_project', projectId: options.projectId });}dispatch({ type: 'new_conversation' });- if (options.updateRoute !== false) navigateToRoute({ view: 'home' });+ if (options.updateRoute !== false) {+ navigateToRoute({ view: options.destination ?? 'chat' });+ }}function startCreatorTool(text: string) {@@ -2701,7 +2848,10 @@ export function AppController(props: AppControllerProps) {function applyRouteFromLocation(route: AppRoute) {switch (route.view) {case 'home':- startNewConversation({ updateRoute: false });+ startNewConversation({ updateRoute: false, destination: 'home' });+ return;+ case 'chat':+ startNewConversation({ updateRoute: false, destination: 'chat' });return;case 'thread':void openScheduleTask(route.threadId, route.runId, {@@ -4010,6 +4160,8 @@ export function AppController(props: AppControllerProps) {const conversationConfirmedEmpty = conversationEmpty && !conversationHistoryPending;const showConversationEmptyState = conversationConfirmedEmpty&& (selectedThread === undefined || selectedThread.purpose === 'conversation');+ const showCreatorHome = props.route.view === 'home'+ && state.selectedThreadId === undefined;const showConversationHeader = selectedThread !== undefined|| selectedScheduleTask !== undefined|| selectedConversation !== undefined;@@ -4058,11 +4210,24 @@ export function AppController(props: AppControllerProps) {const pendingComposerApproval = [...timelineItems].reverse().find(item => (item.kind === 'approval' && item.approval.status === 'pending'));+ const creatorDashboard = (+ <CreatorDashboard+ presets={creatorPresets}+ loading={creatorPresetsLoading}+ error={creatorPresetsError}+ selectedModule={homeCreatorModule}+ onRetry={() => setCreatorPresetsReloadKey(value => value + 1)}+ onSelectModule={setHomeCreatorModule}+ onSelectPreset={applyDashboardPreset}+ onSelectSkill={applyDashboardSkill}+ />+ );const conversationPage = (<sectionclassName={['conversation-page',- showConversationEmptyState ? 'is-empty' : undefined,+ showConversationEmptyState || showCreatorHome ? 'is-empty' : undefined,+ showCreatorHome ? 'is-creator-home' : undefined,!useIntegratedConversationTitleBar && showConversationHeader? 'has-header': undefined,@@ -4078,173 +4243,179 @@ export function AppController(props: AppControllerProps) {{conversationTaskToolbar}</div>) : null}- <div className="conversation-body">- {treeLoadError ? <p className="inline-error">{treeLoadError}</p> : null}- {projectLoadError ? <p className="inline-error">{projectLoadError}</p> : null}- {threadLoadError ? <p className="inline-error">{threadLoadError}</p> : null}- {threadHistoryLoadError ? <p className="inline-error">{threadHistoryLoadError}</p> : null}- {threadConfigUpdateError ? (- <div className="conversation-toast" role="alert">- {threadConfigUpdateError}- </div>- ) : null}- {showConversationEmptyState ? null : (- <Timeline- ref={timelineRef}- key={state.selectedThreadId ?? 'draft'}- items={timelineItems}- hasMore={threadHistory.hasMore}- loadingOlder={threadHistory.loadingOlder}- targetItemId={- searchHistoryTarget !== undefined- && searchHistoryTarget.threadId === state.selectedThreadId- ? searchHistoryTarget.itemId- : undefined+ {showCreatorHome ? null : (+ <div className="conversation-body">+ {treeLoadError ? <p className="inline-error">{treeLoadError}</p> : null}+ {projectLoadError ? <p className="inline-error">{projectLoadError}</p> : null}+ {threadLoadError ? <p className="inline-error">{threadLoadError}</p> : null}+ {threadHistoryLoadError ? <p className="inline-error">{threadHistoryLoadError}</p> : null}+ {threadConfigUpdateError ? (+ <div className="conversation-toast" role="alert">+ {threadConfigUpdateError}+ </div>+ ) : null}+ {showConversationEmptyState ? null : (+ <Timeline+ ref={timelineRef}+ key={state.selectedThreadId ?? 'draft'}+ items={timelineItems}+ hasMore={threadHistory.hasMore}+ loadingOlder={threadHistory.loadingOlder}+ targetItemId={+ searchHistoryTarget !== undefined+ && searchHistoryTarget.threadId === state.selectedThreadId+ ? searchHistoryTarget.itemId+ : undefined+ }+ targetRunId={+ timelineRunTarget !== undefined+ && timelineRunTarget.threadId === state.selectedThreadId+ ? timelineRunTarget.runId+ : undefined+ }+ targetApprovalId={+ timelineApprovalTarget !== undefined+ && timelineApprovalTarget.threadId === state.selectedThreadId+ ? timelineApprovalTarget.approvalId+ : undefined+ }+ onLoadOlder={threadHistory.loadOlder}+ onOpenFile={openTimelineFile}+ onEditUserMessage={editUserMessage}+ resolvingApprovalIds={resolvingApprovalIds}+ approvalErrors={approvalErrors}+ onApproveApproval={(id) => void resolveApproval(id, 'approve')}+ onRejectApproval={(id) => void resolveApproval(id, 'reject')}+ />+ )}+ {showHistoryLoadingOverlay ? (+ <div+ className="conversation-history-loading"+ role="status"+ aria-label={t('conversation.loadingHistory')}+ >+ <span>{t('conversation.loadingHistoryProgress')}</span>+ </div>+ ) : null}+ </div>+ )}+ {showCreatorHome ? (+ <div className="creator-home-wrap">+ {creatorDashboard}+ </div>+ ) : (+ <div className="composer-wrap" onWheel={handleComposerWheel}>+ {showConversationEmptyState ? (+ <ConversationEmptyState />+ ) : null}+ {pendingComposerApproval?.kind === 'approval' ? (+ <div+ className="composer-approval-overlay"+ data-search-target={+ timelineApprovalTarget?.approvalId === pendingComposerApproval.approval.id+ ? 'true'+ : undefined+ }+ >+ <ApprovalPanel+ approval={pendingComposerApproval.approval}+ resolving={resolvingApprovalIds.has(pendingComposerApproval.approval.id)}+ error={approvalErrors[pendingComposerApproval.approval.id]}+ onApprove={id => void resolveApproval(id, 'approve')}+ onReject={id => void resolveApproval(id, 'reject')}+ />+ </div>+ ) : null}+ {pendingMemorySuggestion !== undefined && memoryService !== null ? (+ <MemorySuggestion+ key={pendingMemorySuggestion.id}+ content={pendingMemorySuggestion.content}+ projectKey={currentMemoryProjectKey}+ threadKey={state.selectedThreadId}+ onSave={saveMemorySuggestion}+ onDismiss={() => setPendingMemorySuggestion(undefined)}+ />+ ) : null}+ <Composer+ key={composerAttachmentScope}+ projectId={currentProject?.id ?? ''}+ projectName={currentProjectName}+ projects={projects}+ showProjectSelector={false}+ permission={effectiveComposerConfig.permission}+ profile={effectiveComposerConfig.profile}+ model={effectiveComposerConfig.model}+ reasoning={effectiveComposerConfig.reasoning}+ models={codexModels?.models}+ modelsLoading={codexModelsLoading}+ modelsError={codexModelsLoadError}+ modelsNotice={codexModelsNotice}+ disabled={composerDisabled}+ disabledReason={composerDisabledReason}+ promptHint={showConversationEmptyState ? homeSkillPromptHint : undefined}+ running={currentRunBusy}+ canceling={currentRunCanceling}+ permissionChangeDisabled={selectedThread !== undefined && currentRunBusy}+ slashCommands={slashCommands}+ slashCommandsLoading={capabilitiesLoading}+ slashCommandsError={capabilitiesLoadError}+ showConnectors={false}+ queuedItems={composerQueuedItems}+ imageInputSupported={imageInputSupported}+ imageInputUnsupportedReason={+ imageInputSupported+ ? undefined+ : '当前 Codex 版本不支持图片输入,请更新 Codex'}- targetRunId={- timelineRunTarget !== undefined- && timelineRunTarget.threadId === state.selectedThreadId- ? timelineRunTarget.runId+ draftRequest={+ pendingComposerDraft !== undefined && pendingComposerDraft.threadId === state.selectedThreadId+ ? pendingComposerDraft.request: undefined}- targetApprovalId={- timelineApprovalTarget !== undefined- && timelineApprovalTarget.threadId === state.selectedThreadId- ? timelineApprovalTarget.approvalId- : undefined+ focusRequestId={pendingComposerFocusRequestId}+ onSelectProject={selectProject}+ onCreateBlankProject={+ projectService === null+ ? undefined+ : createBlankProject}- onLoadOlder={threadHistory.loadOlder}- onOpenFile={openTimelineFile}- onEditUserMessage={editUserMessage}- resolvingApprovalIds={resolvingApprovalIds}- approvalErrors={approvalErrors}- onApproveApproval={(id) => void resolveApproval(id, 'approve')}- onRejectApproval={(id) => void resolveApproval(id, 'reject')}- />- )}- {showHistoryLoadingOverlay ? (- <div- className="conversation-history-loading"- role="status"- aria-label={t('conversation.loadingHistory')}- >- <span>{t('conversation.loadingHistoryProgress')}</span>- </div>- ) : null}- </div>- <div className="composer-wrap" onWheel={handleComposerWheel}>- {showConversationEmptyState ? (- <ConversationEmptyState />- ) : null}- {pendingComposerApproval?.kind === 'approval' ? (- <div- className="composer-approval-overlay"- data-search-target={- timelineApprovalTarget?.approvalId === pendingComposerApproval.approval.id- ? 'true'- : undefined+ onAddProjectDirectory={+ projectService === null || hostBridge.selectProjectDirectory === undefined+ ? undefined+ : addProjectDirectory}- >- <ApprovalPanel- approval={pendingComposerApproval.approval}- resolving={resolvingApprovalIds.has(pendingComposerApproval.approval.id)}- error={approvalErrors[pendingComposerApproval.approval.id]}- onApprove={id => void resolveApproval(id, 'approve')}- onReject={id => void resolveApproval(id, 'reject')}- />- </div>- ) : null}- {pendingMemorySuggestion !== undefined && memoryService !== null ? (- <MemorySuggestion- key={pendingMemorySuggestion.id}- content={pendingMemorySuggestion.content}- projectKey={currentMemoryProjectKey}- threadKey={state.selectedThreadId}- onSave={saveMemorySuggestion}- onDismiss={() => setPendingMemorySuggestion(undefined)}+ onPermissionChange={handleComposerPermissionChange}+ onModelConfigChange={handleComposerModelConfigChange}+ onDraftApplied={handleComposerDraftApplied}+ onFocusRequestApplied={handleComposerFocusRequestApplied}+ onManageSkills={() => navigateToRoute({ view: 'plugins' })}+ onManageConnectors={() => navigateToRoute({+ view: 'plugins',+ tab: 'connections'+ })}+ onCancel={() => void cancelActiveRun()}+ onCancelQueuedRun={(runId) => void cancelQueuedRun(runId)}+ onSteerQueuedRun={(runId) => void steerQueuedRun(runId)}+ onUploadAttachment={async file => {+ if (attachmentService === null) throw new Error('附件服务暂不可用');+ const response = await attachmentService.upload({+ file,+ draftId: composerAttachmentDraftId+ });+ return response.attachment;+ }}+ onDeleteAttachment={async attachment => {+ if (attachmentService === null || attachment.draftId === undefined) return;+ await attachmentService.delete({+ id: attachment.id,+ draftId: attachment.draftId+ });+ }}+ onSubmit={submitPrompt}/>- ) : null}- <Composer- key={composerAttachmentScope}- projectId={currentProject?.id ?? ''}- projectName={currentProjectName}- projects={projects}- showProjectSelector={false}- permission={effectiveComposerConfig.permission}- profile={effectiveComposerConfig.profile}- model={effectiveComposerConfig.model}- reasoning={effectiveComposerConfig.reasoning}- models={codexModels?.models}- modelsLoading={codexModelsLoading}- modelsError={codexModelsLoadError}- modelsNotice={codexModelsNotice}- disabled={composerDisabled}- disabledReason={composerDisabledReason}- promptHint={showConversationEmptyState ? homeSkillPromptHint : undefined}- running={currentRunBusy}- canceling={currentRunCanceling}- permissionChangeDisabled={selectedThread !== undefined && currentRunBusy}- slashCommands={slashCommands}- slashCommandsLoading={capabilitiesLoading}- slashCommandsError={capabilitiesLoadError}- showConnectors={false}- queuedItems={composerQueuedItems}- imageInputSupported={imageInputSupported}- imageInputUnsupportedReason={- imageInputSupported- ? undefined- : '当前 Codex 版本不支持图片输入,请更新 Codex'- }- draftRequest={- pendingComposerDraft !== undefined && pendingComposerDraft.threadId === state.selectedThreadId- ? pendingComposerDraft.request- : undefined- }- focusRequestId={pendingComposerFocusRequestId}- onSelectProject={selectProject}- onCreateBlankProject={- projectService === null- ? undefined- : createBlankProject- }- onAddProjectDirectory={- projectService === null || hostBridge.selectProjectDirectory === undefined- ? undefined- : addProjectDirectory- }- onPermissionChange={handleComposerPermissionChange}- onModelConfigChange={handleComposerModelConfigChange}- onDraftApplied={handleComposerDraftApplied}- onFocusRequestApplied={handleComposerFocusRequestApplied}- onManageSkills={() => navigateToRoute({ view: 'plugins' })}- onManageConnectors={() => navigateToRoute({- view: 'plugins',- tab: 'connections'- })}- onCancel={() => void cancelActiveRun()}- onCancelQueuedRun={(runId) => void cancelQueuedRun(runId)}- onSteerQueuedRun={(runId) => void steerQueuedRun(runId)}- onUploadAttachment={async file => {- if (attachmentService === null) throw new Error('附件服务暂不可用');- const response = await attachmentService.upload({- file,- draftId: composerAttachmentDraftId- });- return response.attachment;- }}- onDeleteAttachment={async attachment => {- if (attachmentService === null || attachment.draftId === undefined) return;- await attachmentService.delete({- id: attachment.id,- draftId: attachment.draftId- });- }}- onSubmit={submitPrompt}- />- {showConversationEmptyState ? (- <CreatorDashboard onSelectSkill={applyDashboardSkill} />- ) : null}- </div>+ {showConversationEmptyState ? creatorDashboard : null}+ </div>+ )}</section>);const conversationWorkspace = fileWorkspaceOpen ? (@@ -4297,7 +4468,7 @@ export function AppController(props: AppControllerProps) {) : state.activeView === 'dashboard' ? (<DashboardPageonSelectPrompt={startCreatorTool}- onBackToHome={() => startNewConversation()}+ onBackToHome={() => startNewConversation({ destination: 'home' })}skillLaunch={creatorSkillLaunch}onWorkspaceModeChange={handleCreatorWorkspaceModeChange}projectId={state.currentProjectId}@@ -4312,6 +4483,15 @@ export function AppController(props: AppControllerProps) {navigateToRoute({ view: 'settings', tab: 'local-components' });}}onWorkspaceNavigate={(workspace, jobId, options) => {+ if (+ workspace === null+ && props.route.view === 'workbench'+ && props.route.returnTo === 'home'+ ) {+ startNewConversation({ updateRoute: false });+ navigateToRoute({ view: 'home' }, options);+ return;+ }if (workspace === null&& props.route.view === 'workbench'@@ -4492,11 +4672,13 @@ export function AppController(props: AppControllerProps) {currentProjectId={state.currentProjectId}selectedConversationId={state.selectedThreadId}activeView={state.activeView}+ homeActive={props.route.view === 'home'}projectNavigationMode={props.projectNavigationMode}collapsed={effectiveSidebarCollapsed}autoCollapsed={sidebarAutoCollapsed}colorMode={colorMode}onNewConversation={projectId => startNewConversation({ projectId })}+ onOpenHome={() => startNewConversation({ destination: 'home' })}onSelectProject={selectProject}onSelectConversation={selectConversation}onSelectTask={selectSidebarTask}@@ -4657,6 +4839,74 @@ export function AppController(props: AppControllerProps) {}}+function readOrCreateCreatorPresetCreationKey(scope: string): string {+ const storageKey = creatorPresetCreationStorageKey(scope);+ try {+ const existing = window.sessionStorage.getItem(storageKey);+ if (existing) return existing;+ } catch {+ // Session storage is a recovery aid; in-memory retry still works without it.+ }+ const creationKey = `creator_preset_${createCreatorPresetCreationKeySuffix()}`;+ try {+ window.sessionStorage.setItem(storageKey, creationKey);+ } catch {+ // The caller retains the key in memory when storage is unavailable.+ }+ return creationKey;+}++function clearCreatorPresetCreationKey(scope: string, expectedKey: string): void {+ try {+ const storageKey = creatorPresetCreationStorageKey(scope);+ if (window.sessionStorage.getItem(storageKey) === expectedKey) {+ window.sessionStorage.removeItem(storageKey);+ }+ } catch {+ // Session storage cleanup must not block a completed creation.+ }+}++function creatorPresetCreationStorageKey(scope: string): string {+ return `${CREATOR_PRESET_CREATION_STORAGE_PREFIX}${encodeURIComponent(scope)}`;+}++function createCreatorPresetCreationKeySuffix(): string {+ return globalThis.crypto?.randomUUID?.()+ ?? `${Date.now().toString(36)}_${Math.random().toString(36).slice(2)}`;+}++function withCreatorPresetCreationTimeout<T>(+ promise: Promise<T>,+ message: string+): Promise<T> {+ return new Promise((resolve, reject) => {+ const timeout = window.setTimeout(+ () => reject(new Error(message)),+ CREATOR_PRESET_CREATION_TIMEOUT_MS+ );+ promise.then(+ value => {+ window.clearTimeout(timeout);+ resolve(value);+ },+ error => {+ window.clearTimeout(timeout);+ reject(error);+ }+ );+ });+}++function isTerminalCreatorPresetCreationError(error: unknown): boolean {+ return error instanceof ApiClientError && [+ 'creator_idempotency_key_reused',+ 'creator_preset_not_found',+ 'creator_preset_incompatible',+ 'creator_preset_invalid'+ ].includes(error.code);+}+function mergeTimelineItems(previousItems: TimelineItem[],incomingItems: TimelineItem[]@@ -4693,7 +4943,17 @@ function createInitialState(switch (route.view) {case 'home':- return persistedState;+ return {+ ...persistedState,+ activeView: 'conversation',+ selectedThreadId: undefined+ };+ case 'chat':+ return {+ ...persistedState,+ activeView: 'conversation',+ selectedThreadId: undefined+ };case 'thread':return {...persistedState,@@ -4760,7 +5020,7 @@ function routeForActiveView(activeView: ActiveView, selectedThreadId?: string):function routeForConversation(selectedThreadId?: string): AppRoute {return selectedThreadId === undefined- ? { view: 'home' }+ ? { view: 'chat' }: { view: 'thread', threadId: selectedThreadId };}diff --git a/apps/web/src/app/routes.test.ts b/apps/web/src/app/routes.test.tsindex 15e80f85..e3887e4f 100644--- a/apps/web/src/app/routes.test.ts+++ b/apps/web/src/app/routes.test.ts@@ -21,11 +21,14 @@ describe('app routes', () => {});it('parses every primary page route', () => {- expect(parseRoute('#/')).toEqual({ view: 'dashboard' });+ expect(parseRoute('#/')).toEqual({ view: 'home' });expect(parseRoute('#/new')).toEqual({ view: 'home' });+ expect(parseRoute('#/chat')).toEqual({ view: 'chat' });expect(parseRoute('#/search')).toEqual({ view: 'search' });expect(parseRoute('#/projects')).toEqual({ view: 'projects' });expect(parseRoute('#/workbench')).toEqual({ view: 'workbench' });+ expect(parseRoute('#/workbench?module=image-generation')).toEqual({ view: 'workbench' });+ expect(parseRoute('#/workbench?module=unknown')).toEqual({ view: 'workbench' });expect(parseRoute('#/workbench?tool=video-translation')).toEqual({view: 'workbench',tool: 'video-translation'@@ -41,6 +44,12 @@ describe('app routes', () => {jobId: 'cover_1',returnTo: 'projects'});+ expect(parseRoute('#/workbench?tool=image-generation&jobId=image_1&returnTo=home')).toEqual({+ view: 'workbench',+ tool: 'image-generation',+ jobId: 'image_1',+ returnTo: 'home'+ });expect(parseRoute('#/workbench?tool=cover-generator&returnTo=unknown')).toEqual({view: 'workbench',tool: 'cover-generator'@@ -116,6 +125,7 @@ describe('app routes', () => {it('formats stable copyable hashes for every route', () => {expect(formatRoute({ view: 'home' })).toBe('#/new');+ expect(formatRoute({ view: 'chat' })).toBe('#/chat');expect(formatRoute({ view: 'workbench' })).toBe('#/workbench');expect(formatRoute({view: 'workbench',@@ -128,6 +138,12 @@ describe('app routes', () => {jobId: 'cover/job 1',returnTo: 'projects'})).toBe('#/workbench?tool=cover-generator&jobId=cover%2Fjob+1&returnTo=projects');+ expect(formatRoute({+ view: 'workbench',+ tool: 'image-generation',+ jobId: 'image/job 1',+ returnTo: 'home'+ })).toBe('#/workbench?tool=image-generation&jobId=image%2Fjob+1&returnTo=home');expect(formatRoute({ view: 'projects' })).toBe('#/projects');expect(formatRoute({ view: 'thread', threadId: 'thread 1' })).toBe('#/thread/thread%201');expect(formatRoute({ view: 'search' })).toBe('#/search');diff --git a/apps/web/src/app/routes.ts b/apps/web/src/app/routes.tsindex 33c293d8..919ff277 100644--- a/apps/web/src/app/routes.ts+++ b/apps/web/src/app/routes.ts@@ -5,12 +5,13 @@ import {export type AppRoute =| { view: 'home' }+ | { view: 'chat' }| { view: 'projects' }| {view: 'workbench';tool?: CreatorWorkspace;jobId?: string;- returnTo?: 'projects';+ returnTo?: 'home' | 'projects';}| { view: 'thread'; threadId: string; runId?: string; approvalId?: string }| { view: 'search' }@@ -34,7 +35,9 @@ export type SettingsRouteTab = 'ai-services' | 'local-components';export function parseRoute(hash: string): AppRoute {const [path = '', query = ''] = hash.split('?', 2);+ if (path === '#/' || path === '#') return { view: 'home' };if (path === '#/new') return { view: 'home' };+ if (path === '#/chat') return { view: 'chat' };if (path.startsWith('#/thread/')) {const threadId = safeDecodeURIComponent(path.slice('#/thread/'.length));const fields = parseQuery(query);@@ -59,7 +62,7 @@ export function parseRoute(hash: string): AppRoute {view: 'workbench',tool,...(jobId === null || jobId.length === 0 ? {} : { jobId }),- ...(returnTo === 'projects' ? { returnTo } : {})+ ...(returnTo === 'home' || returnTo === 'projects' ? { returnTo } : {})};}if (path === '#/schedules') {@@ -112,6 +115,8 @@ export function formatRoute(route: AppRoute): string {switch (route.view) {case 'home':return '#/new';+ case 'chat':+ return '#/chat';case 'projects':return '#/projects';case 'workbench': {diff --git a/apps/web/src/features/conversation/CreatorDashboard.test.tsx b/apps/web/src/features/conversation/CreatorDashboard.test.tsxindex f7411d78..a6873c87 100644--- a/apps/web/src/features/conversation/CreatorDashboard.test.tsx+++ b/apps/web/src/features/conversation/CreatorDashboard.test.tsx@@ -1,113 +1,263 @@-import { fireEvent, render, screen } from '@testing-library/react';+import { fireEvent, render, screen, waitFor } from '@testing-library/react';+import type { CreatorPresetSummary } from '@opencreator/protocol';import { describe, expect, it, vi } from 'vitest';+import { LanguageProvider } from '../../i18n/LanguageProvider.js';import {CreatorDashboard,- getCreatorSkillPromptHint,- type CreatorSkill+ getCreatorSkillPromptHint} from './CreatorDashboard.js';+const presets: CreatorPresetSummary[] = [{+ module: 'video-translation',+ id: 'bilibili-bilingual',+ version: 1,+ title: 'B站双语精翻',+ description: '英文视频翻译为简体中文。',+ coverUrl: `/creator-presets/${'d'.repeat(64)}.webp`,+ tags: ['translation'],+ featured: true,+ sortOrder: 5,+ requirements: null,+ highlights: [+ { text: '英语 → 简体中文', colors: [] },+ { text: '双语字幕 · 顶部', colors: [] },+ { text: '无衬线 · 粗体 · 中字', colors: ['#FFFFFF', '#FFD45C'] }+ ]+}, {+ module: 'image-generation',+ id: 'ecommerce-product-alt',+ version: 3,+ title: '电商商品主图增强版',+ description: '从 Daemon catalog 动态加载的商品视觉模板。',+ coverUrl: `/creator-presets/${'a'.repeat(64)}.webp`,+ tags: ['ecommerce', 'product'],+ featured: true,+ sortOrder: 10,+ requirements: null,+ highlights: [+ { text: '1536 × 1024', colors: [] },+ { text: '标准质量', colors: [] },+ { text: '2 张', colors: [] }+ ]+}, {+ module: 'image-generation',+ id: 'social-poster',+ version: 1,+ title: '社交媒体海报',+ description: '生成醒目的社交媒体海报。',+ coverUrl: `/creator-presets/${'e'.repeat(64)}.webp`,+ tags: ['poster'],+ featured: false,+ sortOrder: 15,+ requirements: null,+ highlights: [+ { text: '1024 × 1536', colors: [] },+ { text: '高清质量', colors: [] }+ ]+}, {+ module: 'video-download',+ id: 'audio-download',+ version: 1,+ title: '音频下载',+ description: '下载视频中的音频。',+ coverUrl: `/creator-presets/${'b'.repeat(64)}.webp`,+ tags: ['audio'],+ featured: true,+ sortOrder: 20,+ requirements: null,+ highlights: [{ text: '提取 MP3 音频', colors: [] }]+}, {+ module: 'cover-generator',+ id: 'personal-growth',+ version: 1,+ title: '个人成长封面',+ description: '生成个人成长主题封面。',+ coverUrl: `/creator-presets/${'c'.repeat(64)}.webp`,+ tags: ['growth'],+ featured: false,+ sortOrder: 30,+ requirements: null,+ highlights: [+ { text: '个人成长风格', colors: [] },+ { text: '16:9', colors: [] }+ ]+}];+describe('CreatorDashboard', () => {- it('renders visual Skills without creator capability blocks', () => {- const { container } = render(<CreatorDashboard onSelectSkill={vi.fn()} />);-- expect(screen.queryByRole('heading', { name: '点击进入对应 Dashboard' })).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('tablist', { name: '创作模板分类' })).toBeInTheDocument();- expect(screen.getAllByRole('tab')[0]).toHaveTextContent('推荐');- expect(screen.getByRole('tab', { name: '推荐' })).toHaveAttribute('aria-selected', 'true');- expect(screen.queryByRole('tab', { name: '最近' })).not.toBeInTheDocument();+ it('renders one module hierarchy and only the selected module presets', () => {+ render(<CreatorDashboard presets={presets} />);+expect(screen.getByRole('heading', { name: '创作模板' })).toBeInTheDocument();- expect(container.querySelector('.creator-dashboard')).toHaveAttribute('data-template-count', '4');- expect(screen.getAllByRole('button', { name: /使用.+模板/ })).toHaveLength(4);- const recommendedSkills = screen.getAllByRole('button', { name: /使用.+模板/ });- expect(recommendedSkills[1]).toHaveAccessibleName('使用视频下载模板');- expect(recommendedSkills[1]?.querySelector('img'))- .toHaveAttribute('src', '/dashboard/templates/video-download-cover.png');- expect(recommendedSkills[2]).toHaveAccessibleName('使用封面生成模板');- expect(recommendedSkills[2]?.querySelector('img'))- .toHaveAttribute('src', '/dashboard/templates/peter-openclaw-cover.png');- expect(recommendedSkills[3]).toHaveAccessibleName('使用图像生成模板');- expect(recommendedSkills[3]?.querySelector('img'))- .toHaveAttribute('src', '/dashboard/templates/image-generation-cover.png');- 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: '使用多语言视频翻译模板' }))- .toHaveAttribute('data-skill-id', 'video-translation-multilingual');+ expect(screen.getByRole('heading', { name: '创作模块' })).toBeInTheDocument();+ expect(screen.getByRole('heading', { name: '视频翻译模板' })).toBeInTheDocument();+ expect(screen.getAllByRole('tab')).toHaveLength(6);+ expect(screen.queryByRole('tab', { name: '推荐' })).not.toBeInTheDocument();+ expect(screen.getByRole('tab', { name: /视频翻译,1 个模板/ }))+ .toHaveAttribute('aria-selected', 'true');+ const dynamicCard = screen.getByRole('button', {+ name: '使用B站双语精翻模板'+ });+ expect(dynamicCard).toHaveAttribute(+ 'data-preset-id',+ 'video-translation/bilibili-bilingual/1'+ );+ expect(dynamicCard.querySelector('img')).toHaveAttribute(+ 'src',+ `/creator-presets/${'d'.repeat(64)}.webp`+ );+ expect(screen.getByText('英语 → 简体中文')).toBeInTheDocument();+ expect(screen.queryByText('字幕、配音与成片生成')).not.toBeInTheDocument();+ expect(screen.getByRole('tab', { name: /视频翻译,1 个模板/ }))+ .toHaveTextContent('视频翻译1');+ expect(screen.queryByRole('button', { name: '空白视频翻译' })).not.toBeInTheDocument();+ expect(screen.queryByText('电商商品主图增强版')).not.toBeInTheDocument();});- it('selects a Skill and exposes its prompt hint', () => {- const onSelectSkill = vi.fn();- render(<CreatorDashboard onSelectSkill={onSelectSkill} />);+ it('shows the service, provider and model required by a preset', () => {+ render(<CreatorDashboard selectedModule="video-generation" presets={[{+ ...presets[1]!,+ module: 'video-generation',+ title: '商品广告短片',+ requirements: {+ service: 'video',+ provider: 'seedance',+ model: 'doubao-seedance-2-0-260128'+ },+ highlights: [{ text: '1280 × 720', colors: [] }]+ }]} />);- fireEvent.click(screen.getByRole('button', { name: '使用图像生成模板' }));- expect(onSelectSkill).toHaveBeenLastCalledWith(expect.objectContaining({- id: 'image-generation',- title: '图像生成'- }));- const selectedSkill = onSelectSkill.mock.lastCall?.[0] as CreatorSkill;- expect(getCreatorSkillPromptHint(selectedSkill, 'zh-CN'))- .toBe('描述画面主体、风格、构图和使用场景');- expect(screen.queryByRole('tab', { name: '最近' })).not.toBeInTheDocument();+ expect(screen.getByText(+ '视频服务 · Seedance · doubao-seedance-2-0-260128'+ )).toBeInTheDocument();});- it('exposes a structured interaction and an inactive prompt hint', () => {- const onSelectSkill = vi.fn();- render(<CreatorDashboard onSelectSkill={onSelectSkill} />);+ it('renders repeated subtitle colors without duplicate React keys', () => {+ const consoleError = vi.spyOn(console, 'error').mockImplementation(() => undefined);+ render(<CreatorDashboard presets={[{+ ...presets[0]!,+ highlights: [{+ text: '无衬线 · 粗体 · 中字',+ colors: ['#FFFFFF', '#FFFFFF']+ }]+ }]} />);- fireEvent.click(screen.getByRole('button', { name: '使用多语言视频翻译模板' }));+ expect(document.querySelectorAll('.creator-template-swatches > span')).toHaveLength(2);+ expect(consoleError).not.toHaveBeenCalledWith(+ expect.stringContaining('Encountered two children with the same key'),+ expect.anything()+ );+ consoleError.mockRestore();+ });- expect(onSelectSkill).toHaveBeenCalledWith(expect.objectContaining({- interaction: { type: 'workspace', workspace: 'video-translation' },- promptHint: {- zhCN: '上传视频,或者输入有效的视频链接',- enUS: 'Upload a video or enter a valid video link'- }- }));+ it('keeps rendering while an older Runtime catalog has no highlights', () => {+ render(<CreatorDashboard presets={[{+ ...presets[0]!,+ highlights: undefined+ } as unknown as CreatorPresetSummary]} />);++ expect(screen.getByRole('button', { name: '使用B站双语精翻模板' }))+ .toBeInTheDocument();+ expect(document.querySelector('.creator-template-highlights')).not.toBeInTheDocument();});- it('opens the retained workspaces from the recommended Skills', () => {- const onSelectSkill = vi.fn();- render(<CreatorDashboard onSelectSkill={onSelectSkill} />);+ it('filters presets by module and localized search without exposing blank creation', () => {+ render(<CreatorDashboard presets={presets} />);- fireEvent.click(screen.getByRole('button', { name: '使用视频下载模板' }));- expect(onSelectSkill).toHaveBeenLastCalledWith(expect.objectContaining({- id: 'video-download',- interaction: { type: 'workspace', workspace: 'video-download' }- }));+ fireEvent.click(screen.getByRole('tab', { name: /封面生成,1 个模板/ }));+ expect(screen.getByRole('heading', { name: '封面生成模板' })).toBeInTheDocument();+ expect(screen.queryByRole('button', { name: '空白封面生成' })).not.toBeInTheDocument();+ expect(screen.getByRole('button', {+ name: '使用个人成长封面模板'+ })).toBeInTheDocument();- fireEvent.click(screen.getByRole('button', { name: '使用封面生成模板' }));- expect(onSelectSkill).toHaveBeenLastCalledWith(expect.objectContaining({- id: 'cover-generation',- interaction: { type: 'workspace', workspace: 'cover-generator' }- }));+ fireEvent.change(screen.getByRole('searchbox', { name: '搜索封面生成模板' }), {+ target: { value: '不存在' }+ });+ expect(screen.getByText('没有匹配的模板。')).toBeInTheDocument();+ });- fireEvent.click(screen.getByRole('button', { name: '使用图像生成模板' }));- expect(onSelectSkill).toHaveBeenLastCalledWith(expect.objectContaining({- id: 'image-generation',- interaction: { type: 'workspace', workspace: 'image-generation' }+ it('deduplicates a rapid double click for the same preset', async () => {+ let resolveSelection: (() => void) | undefined;+ const onSelectPreset = vi.fn(() => new Promise<void>(resolve => {+ resolveSelection = resolve;}));+ render(+ <CreatorDashboard+ presets={presets}+ selectedModule="image-generation"+ onSelectPreset={onSelectPreset}+ />+ );+ const card = screen.getByRole('button', {+ name: '使用电商商品主图增强版模板'+ });++ fireEvent.click(card);+ fireEvent.click(card);++ expect(onSelectPreset).toHaveBeenCalledTimes(1);+ expect(card).toBeDisabled();+ resolveSelection?.();+ await waitFor(() => expect(card).not.toBeDisabled());});- it('shows a different set of Skills for each category', () => {- const onSelectSkill = vi.fn();- render(<CreatorDashboard onSelectSkill={onSelectSkill} />);+ it('keeps other cards operable while one preset is busy and recovers from failure', async () => {+ let rejectSelection: ((error: Error) => void) | undefined;+ const onSelectPreset = vi.fn((preset: CreatorPresetSummary) => (+ preset.id === 'ecommerce-product-alt'+ ? new Promise<void>((_resolve, reject) => {+ rejectSelection = reject;+ })+ : Promise.resolve()+ ));+ render(+ <CreatorDashboard+ presets={presets}+ selectedModule="image-generation"+ onSelectPreset={onSelectPreset}+ />+ );+ const imageCard = screen.getByRole('button', {+ name: '使用电商商品主图增强版模板'+ });+ const posterCard = screen.getByRole('button', {+ name: '使用社交媒体海报模板'+ });- expect(screen.getByRole('button', { name: '使用多语言视频翻译模板' }))- .toBeInTheDocument();- expect(screen.queryByRole('tab', { name: '数字人' })).not.toBeInTheDocument();- expect(screen.queryByRole('tab', { name: '内容营销' })).not.toBeInTheDocument();- fireEvent.click(screen.getByRole('tab', { name: '视频创作' }));-- expect(screen.getByRole('tab', { name: '视频创作' })).toHaveAttribute('aria-selected', 'true');- expect(screen.getAllByRole('button', { name: /使用.+模板/ })).toHaveLength(2);- expect(screen.getByRole('button', { name: '使用视频翻译模板' })).toBeInTheDocument();- fireEvent.click(screen.getByRole('button', { name: '使用视频下载模板' }));- expect(onSelectSkill).toHaveBeenCalledWith(expect.objectContaining({- id: 'video-download-category',- title: '视频下载'- }));+ fireEvent.click(imageCard);+ expect(imageCard).toBeDisabled();+ expect(posterCard).toBeEnabled();+ fireEvent.click(posterCard);+ expect(onSelectPreset).toHaveBeenCalledTimes(2);++ rejectSelection?.(new Error('创建模板任务失败'));+ await waitFor(() => expect(screen.getByRole('alert')).toHaveTextContent('创建模板任务失败'));+ expect(imageCard).toBeEnabled();+ });++ it('uses the selected interface language for labels and prompt hints', () => {+ render(+ <LanguageProvider initialPreference="en-US">+ <CreatorDashboard selectedModule="image-generation" presets={[{+ ...presets[1]!,+ title: 'Enhanced Product Hero',+ description: 'Loaded from the localized catalog.'+ }]} />+ </LanguageProvider>+ );++ expect(screen.getByRole('heading', { name: 'Creation Presets' })).toBeInTheDocument();+ expect(screen.getByRole('heading', { name: 'Creation Modules' })).toBeInTheDocument();+ expect(screen.getByRole('heading', { name: 'Image Generation Presets' })).toBeInTheDocument();+ expect(screen.queryByRole('tab', { name: 'Recommended' })).not.toBeInTheDocument();+ expect(screen.getByRole('button', {+ name: 'Use Enhanced Product Hero preset'+ })).toBeInTheDocument();+ expect(getCreatorSkillPromptHint({+ id: 'image',+ title: 'Image',+ category: 'Image',+ image: ''+ }, 'en-US')).toContain('Describe what you want to create');});});diff --git a/apps/web/src/features/conversation/CreatorDashboard.tsx b/apps/web/src/features/conversation/CreatorDashboard.tsxindex 19a7859d..5ab8899e 100644--- a/apps/web/src/features/conversation/CreatorDashboard.tsx+++ b/apps/web/src/features/conversation/CreatorDashboard.tsx@@ -1,12 +1,23 @@-import { useState } from 'react';-import { Mic2 } from 'lucide-react';-import { useAppLanguage } from '../../i18n/LanguageProvider.js';+import type {+ CreatorPresetRequirements,+ CreatorPresetSummary,+ CreatorRuntimeWorkspace+} from '@opencreator/protocol';import {- isVisibleCreatorWorkspace,- type CreatorWorkspace-} from '../dashboard/creator-workspace.js';--type CreatorSkillCategory = '最近' | '推荐' | '视频创作' | '数字人' | '图像设计' | '内容营销';+ Cpu,+ Download,+ Image,+ ImagePlus,+ Languages,+ Mic2,+ RefreshCw,+ Search,+ WandSparkles,+ type LucideIcon+} from 'lucide-react';+import { useMemo, useRef, useState } from 'react';+import { useAppLanguage } from '../../i18n/LanguageProvider.js';+import type { CreatorWorkspace } from '../dashboard/creator-workspace.js';export type CreatorSkill = {id: string;@@ -23,346 +34,337 @@ export type CreatorSkill = {};};-const creatorSkillCategories: CreatorSkillCategory[] = [- '最近',- '推荐',- '视频创作',- '数字人',- '图像设计',- '内容营销'+const moduleOrder: CreatorRuntimeWorkspace[] = [+ 'video-translation',+ 'video-download',+ 'image-generation',+ 'video-generation',+ 'cover-generator',+ 'smart-dubbing'];-const creatorSkillsByCategory: Record<CreatorSkillCategory, CreatorSkill[]> = {- 最近: [],- 推荐: [- {- id: 'video-translation-multilingual',- title: '多语言视频翻译',- category: '视频翻译',- image: '/dashboard/templates/video-translation-example.png',- interaction: { type: 'workspace', workspace: 'video-translation' },- promptHint: {- zhCN: '上传视频,或者输入有效的视频链接',- enUS: 'Upload a video or enter a valid video link'- }- },- {- id: 'video-download',- title: '视频下载',- category: '视频处理',- image: '/dashboard/templates/video-download-cover.png',- interaction: { type: 'workspace', workspace: 'video-download' },- promptHint: {- zhCN: '输入 YouTube、Bilibili 等平台的公开视频链接',- enUS: 'Enter a public YouTube, Bilibili, or other supported video link'- }- },- {- id: 'avatar-presenter',- title: '数字人口播',- category: '数字人',- image: '/dashboard/templates/digital-presenter.jpg'- },- {- id: 'stickman-animation',- title: '火柴人动画',- category: '动画生成',- image: '/dashboard/templates/ai-video-insane.jpg',- interaction: { type: 'workspace', workspace: 'stickman-video' },- promptHint: {- zhCN: '选择、上传或生成角色,再描述故事和动画要求',- enUS: 'Choose, upload, or generate a character, then describe the story'- }- },- {- id: 'cover-generation',- title: '封面生成',- category: '封面设计',- image: '/dashboard/templates/peter-openclaw-cover.png',- interaction: { type: 'workspace', workspace: 'cover-generator' },- promptHint: {- zhCN: '描述封面,添加参考图,或者输入有效的 YouTube 链接',- enUS: 'Describe the thumbnail, add a reference, or enter a valid YouTube link'- }- },- {- id: 'image-generation',- title: '图像生成',- category: '图像设计',- image: '/dashboard/templates/image-generation-cover.png',- interaction: { type: 'workspace', workspace: 'image-generation' },- promptHint: {- zhCN: '描述画面主体、风格、构图和使用场景',- enUS: 'Describe the subject, style, composition, and intended use'- }- },- {- id: 'intelligent-clipping',- title: '智能剪辑',- category: '视频剪辑',- image: '/dashboard/templates/intelligent-clipping-cover.png',- interaction: { type: 'workspace', workspace: 'auto-clips' },- promptHint: {- zhCN: '上传长视频,设置内容重点、目标时长和片段数量',- enUS: 'Upload a long video, then set the content focus, target duration, and clip count'- }- }- ],- 视频创作: [- {- id: 'video-translation',- title: '视频翻译',- category: '视频处理',- image: '/dashboard/templates/video-translation-example.png',- interaction: { type: 'workspace', workspace: 'video-translation' },- promptHint: {- zhCN: '上传视频,或者输入有效的视频链接',- enUS: 'Upload a video or enter a valid video link'- }- },- {- id: 'video-download-category',- title: '视频下载',- category: '视频处理',- image: '/dashboard/templates/video-download-cover.png',- interaction: { type: 'workspace', workspace: 'video-download' },- promptHint: {- zhCN: '输入 YouTube、Bilibili 等平台的公开视频链接',- enUS: 'Enter a public YouTube, Bilibili, or other supported video link'- }- },- {- id: 'narrative-short-video',- title: '剧情短片',- category: '故事视频',- image: '/dashboard/templates/animated-story.jpg'- },- {- id: 'product-ad-video',- title: '商品广告短片',- category: '商业视频',- image: '/skill-market/examples/seedance-2-video-ad.png'- },- {- id: 'stickman-explainer',- title: '火柴人知识动画',- category: '动画视频',- image: '/dashboard/templates/ai-video-insane.jpg',- interaction: { type: 'workspace', workspace: 'stickman-video' },- promptHint: {- zhCN: '选择角色并输入知识主题,我会先生成分镜',- enUS: 'Choose a character and enter a topic to create the storyboard'- }- },- {- id: 'tutorial-demo-video',- title: '教程演示视频',- category: '教程视频',- image: '/dashboard/templates/video-localization.jpg'- },- {- id: 'short-video-script',- title: '短视频脚本',- category: '内容策划',- image: '/skill-market/examples/gpt-image-2-info-poster.png'- }- ],- 数字人: [- {- id: 'avatar-knowledge-presenter',- title: '知识分享口播',- category: '知识博主',- image: '/dashboard/templates/digital-presenter.jpg'- },- {- id: 'avatar-course-lesson',- title: '课程讲解',- category: '在线课程',- image: '/dashboard/templates/animated-story.jpg'- },- {- id: 'avatar-product-introduction',- title: '产品介绍',- category: '产品讲解',- image: '/skill-market/examples/nano-banana-pro-product-visual.png'- },- {- id: 'avatar-news-presenter',- title: '新闻播报',- category: '资讯播报',- image: '/dashboard/templates/video-translation-example.png'- },- {- id: 'avatar-social-presenter',- title: '社媒口播',- category: '短视频口播',- image: '/skill-market/examples/seedance-2-video-ad.png'- }- ],- 图像设计: [- {- id: 'video-thumbnail',- title: '视频封面',- category: '封面设计',- image: '/dashboard/templates/ai-video-insane.jpg',- interaction: { type: 'workspace', workspace: 'cover-generator' },- promptHint: {- zhCN: '描述封面,添加参考图,或者输入有效的 YouTube 链接',- enUS: 'Describe the thumbnail, add a reference, or enter a valid YouTube link'- }- },- {- id: 'product-poster',- title: '产品海报',- category: '商业海报',- image: '/skill-market/examples/nano-banana-pro-product-visual.png'- },- {- id: 'image-generation-category',- title: '图像生成',- category: '图像设计',- image: '/dashboard/templates/image-generation-cover.png',- interaction: { type: 'workspace', workspace: 'image-generation' },- promptHint: {- zhCN: '描述画面主体、风格、构图和使用场景',- enUS: 'Describe the subject, style, composition, and intended use'- }- },- {- id: 'infographic',- title: '信息长图',- category: '信息设计',- image: '/skill-market/examples/gpt-image-2-info-poster.png'- },- {- id: 'social-visuals',- title: '社媒配图',- category: '社交媒体',- image: '/dashboard/templates/animated-story.jpg'- },- {- id: 'portrait-series',- title: '人物写真',- category: '人物图像',- image: '/dashboard/templates/digital-presenter.jpg'- }- ],- 内容营销: [- {- id: 'brand-story',- title: '品牌故事',- category: '品牌内容',- image: '/dashboard/templates/animated-story.jpg'- },- {- id: 'product-recommendation-video',- title: '种草短视频',- category: '社媒营销',- image: '/skill-market/examples/seedance-2-video-ad.png'- },- {- id: 'campaign-promotion',- title: '活动推广',- category: '活动营销',- image: '/skill-market/examples/gpt-image-2-info-poster.png'- },- {- id: 'product-launch',- title: '新品发布',- category: '产品营销',- image: '/skill-market/examples/nano-banana-pro-product-visual.png'- },- {- id: 'creator-weekly',- title: '创作者周报',- category: '粉丝运营',- image: '/dashboard/templates/video-localization.jpg'- }- ]+const moduleCopy: Record<CreatorRuntimeWorkspace, {+ zh: string;+ en: string;+ descriptionZh: string;+ descriptionEn: string;+ blankZh: string;+ blankEn: string;+ icon: LucideIcon;+}> = {+ 'video-translation': {+ zh: '视频翻译',+ en: 'Video Translation',+ descriptionZh: '字幕、配音与成片生成',+ descriptionEn: 'Subtitles, dubbing, and rendered video',+ blankZh: '空白视频翻译',+ blankEn: 'Blank Video Translation',+ icon: Languages+ },+ 'video-download': {+ zh: '视频下载',+ en: 'Video Download',+ descriptionZh: '下载视频或提取音频',+ descriptionEn: 'Download video or extract audio',+ blankZh: '空白视频下载',+ blankEn: 'Blank Video Download',+ icon: Download+ },+ 'image-generation': {+ zh: '图像生成',+ en: 'Image Generation',+ descriptionZh: '生成图片与视觉素材',+ descriptionEn: 'Generate images and visual assets',+ blankZh: '空白图像生成',+ blankEn: 'Blank Image Generation',+ icon: Image+ },+ 'video-generation': {+ zh: '视频生成',+ en: 'Video Generation',+ descriptionZh: '文字或参考图生成视频',+ descriptionEn: 'Generate video from text or images',+ blankZh: '空白视频生成',+ blankEn: 'Blank Video Generation',+ icon: WandSparkles+ },+ 'cover-generator': {+ zh: '封面生成',+ en: 'Cover Generation',+ descriptionZh: '生成视频与内容封面',+ descriptionEn: 'Generate thumbnails for video and content',+ blankZh: '空白封面生成',+ blankEn: 'Blank Cover Generation',+ icon: ImagePlus+ },+ 'smart-dubbing': {+ zh: '智能配音',+ en: 'Smart Dubbing',+ descriptionZh: '自然音色与情绪表达',+ descriptionEn: 'Natural voices and expressive delivery',+ blankZh: '空白智能配音',+ blankEn: 'Blank Smart Dubbing',+ icon: Mic2+ }};-export function CreatorDashboard(props: { onSelectSkill(skill: CreatorSkill): void }) {- const { language, t } = useAppLanguage();- const [selectedCategory, setSelectedCategory] = useState<CreatorSkillCategory>('推荐');- const [recentSkills, setRecentSkills] = useState<CreatorSkill[]>([]);- const skills = selectedCategory === '最近'- ? recentSkills- : creatorSkillsByCategory[selectedCategory].filter(isVisibleCreatorSkill);- const visibleCategories = creatorSkillCategories.filter(category => (- category !== '最近'- && creatorSkillsByCategory[category].some(isVisibleCreatorSkill)- ));+export function CreatorDashboard(props: {+ presets?: CreatorPresetSummary[];+ loading?: boolean;+ error?: string;+ selectedModule?: CreatorRuntimeWorkspace;+ onRetry?(): void;+ onSelectModule?(module: CreatorRuntimeWorkspace): void;+ onSelectPreset?(preset: CreatorPresetSummary): Promise<void> | void;+ onSelectSkill?(skill: CreatorSkill): void;+}) {+ const { language } = useAppLanguage();+ const [internalSelectedModule, setInternalSelectedModule] =+ useState<CreatorRuntimeWorkspace>('video-translation');+ const [query, setQuery] = useState('');+ const [busyIdentities, setBusyIdentities] = useState<Set<string>>(+ () => new Set()+ );+ const busyIdentitiesRef = useRef(new Set<string>());+ const [actionError, setActionError] = useState<string>();+ const presets = props.presets ?? [];+ const selectedModule = props.selectedModule ?? internalSelectedModule;+ const normalizedQuery = query.trim().toLocaleLowerCase();+ const visiblePresets = useMemo(() => presets.filter(preset => {+ if (preset.module !== selectedModule) return false;+ if (normalizedQuery === '') return true;+ return `${preset.title} ${preset.description} ${preset.tags.join(' ')}`+ .toLocaleLowerCase()+ .includes(normalizedQuery);+ }), [normalizedQuery, presets, selectedModule]);+ const presetCounts = useMemo(() => {+ const counts = new Map<CreatorRuntimeWorkspace, number>();+ for (const module of moduleOrder) counts.set(module, 0);+ for (const preset of presets) {+ counts.set(preset.module, (counts.get(preset.module) ?? 0) + 1);+ }+ return counts;+ }, [presets]);++ function selectModule(module: CreatorRuntimeWorkspace) {+ setInternalSelectedModule(module);+ setQuery('');+ setActionError(undefined);+ props.onSelectModule?.(module);+ }- function selectSkill(skill: CreatorSkill) {- setRecentSkills(current => [- skill,- ...current.filter(item => item.id !== skill.id)- ].slice(0, 5));- props.onSelectSkill(skill);+ async function selectPreset(preset: CreatorPresetSummary) {+ const identity = presetIdentity(preset);+ if (busyIdentitiesRef.current.has(identity)) return;+ busyIdentitiesRef.current.add(identity);+ setBusyIdentities(new Set(busyIdentitiesRef.current));+ setActionError(undefined);+ try {+ await props.onSelectPreset?.(preset);+ } catch (error) {+ setActionError(error instanceof Error ? error.message : String(error));+ } finally {+ busyIdentitiesRef.current.delete(identity);+ setBusyIdentities(new Set(busyIdentitiesRef.current));+ }}return (- <div className="creator-dashboard" data-template-count={skills.length}>- <div className="creator-template-tabs" role="tablist" aria-label={t('home.skillCategories')}>- {visibleCategories.map(category => (- <button- type="button"- role="tab"- aria-selected={selectedCategory === category}- key={category}- onClick={() => setSelectedCategory(category)}- >- {language === 'en-US' ? englishCreatorLabels[category] ?? category : category}- </button>- ))}- </div>+ <div className="creator-dashboard">+ <header className="creator-dashboard-title">+ <h1>{language === 'en-US' ? 'Creation Presets' : '创作模板'}</h1>+ <p>+ {language === 'en-US'+ ? 'Choose a module and start with a ready-to-use preset.'+ : '选择创作模块,使用预置模板快速开始。'}+ </p>+ </header>- <section className="creator-dashboard-section" aria-labelledby="creator-templates-title">+ <section className="creator-module-section" aria-labelledby="creator-modules-title"><div className="creator-dashboard-heading"><div>- <h2 id="creator-templates-title">{t('home.skills')}</h2>+ <h2 id="creator-modules-title">+ {language === 'en-US' ? 'Creation Modules' : '创作模块'}+ </h2>+ <span>+ {language === 'en-US'+ ? 'Choose a module, then start from one of its presets.'+ : '先选择创作模块,再使用模块内的预置模板。'}+ </span></div>- <Mic2 size={18} strokeWidth={1.7} aria-hidden="true" /></div>- <div className="creator-template-grid">- {skills.length === 0 ? (- <p className="creator-template-empty">{t('home.noRecentSkills')}</p>- ) : null}- {skills.map(skill => (- <button- className="creator-template-card"- type="button"- key={skill.id}- data-skill-id={skill.id}- onClick={() => selectSkill(skill)}- aria-label={t('home.useSkill', {- title: language === 'en-US'- ? englishCreatorLabels[skill.title] ?? skill.title- : skill.title- })}- >- <span className="creator-template-media">- <img src={skill.image} alt="" loading="lazy" />- </span>- <span className="creator-template-copy">- <small>{language === 'en-US'- ? englishCreatorLabels[skill.category] ?? skill.category- : skill.category}</small>- <strong>{language === 'en-US'- ? englishCreatorLabels[skill.title] ?? skill.title- : skill.title}</strong>- </span>- </button>+ <div+ className="creator-module-grid"+ role="tablist"+ aria-label={language === 'en-US' ? 'Creation modules' : '创作模块'}+ >+ {moduleOrder.map(module => (+ <CreatorModuleButton+ key={module}+ module={module}+ count={presetCounts.get(module) ?? 0}+ selected={selectedModule === module}+ language={language}+ onSelect={selectModule}+ />))}</div></section>++ <section className="creator-dashboard-section" aria-labelledby="creator-templates-title">+ <div className="creator-dashboard-heading">+ <div>+ <h2 id="creator-templates-title">+ {language === 'en-US'+ ? `${moduleLabel(selectedModule, language)} Presets`+ : `${moduleLabel(selectedModule, language)}模板`}+ </h2>+ <span>+ {language === 'en-US'+ ? 'Preset settings remain editable before you start the task.'+ : '模板会预填工作台设置,开始任务前仍可修改。'}+ </span>+ </div>+ <label className="creator-template-search">+ <Search size={16} aria-hidden="true" />+ <input+ type="search"+ value={query}+ onChange={event => setQuery(event.target.value)}+ aria-label={language === 'en-US'+ ? `Search ${moduleLabel(selectedModule, language)} presets`+ : `搜索${moduleLabel(selectedModule, language)}模板`}+ placeholder={language === 'en-US'+ ? 'Search presets'+ : `搜索${moduleLabel(selectedModule, language)}模板`}+ />+ </label>+ </div>++ {props.loading ? (+ <p className="creator-template-empty" aria-busy="true">+ {language === 'en-US' ? 'Loading presets...' : '正在加载模板...'}+ </p>+ ) : null}+ {props.error ? (+ <div className="creator-template-error" role="alert">+ <span>{props.error}</span>+ <button type="button" onClick={props.onRetry}>+ <RefreshCw size={15} aria-hidden="true" />+ {language === 'en-US' ? 'Retry' : '重试'}+ </button>+ </div>+ ) : null}+ {actionError ? (+ <p className="creator-template-action-error" role="alert">{actionError}</p>+ ) : null}++ {!props.loading && !props.error ? (+ <div className="creator-template-grid">+ {visiblePresets.map(preset => {+ const identity = presetIdentity(preset);+ const busy = busyIdentities.has(identity);+ const highlights = preset.highlights ?? [];+ return (+ <button+ className="creator-template-card"+ type="button"+ key={identity}+ data-preset-id={identity}+ disabled={busy}+ aria-busy={busy}+ onClick={() => void selectPreset(preset)}+ aria-label={language === 'en-US'+ ? `Use ${preset.title} preset`+ : `使用${preset.title}模板`}+ >+ <span className="creator-template-media">+ <img src={preset.coverUrl} alt="" loading="lazy" />+ {busy ? (+ <span className="creator-template-busy">+ {language === 'en-US' ? 'Creating...' : '正在创建...'}+ </span>+ ) : null}+ </span>+ <span className="creator-template-copy">+ <strong>{preset.title}</strong>+ <span>{preset.description}</span>+ {highlights.length > 0 ? (+ <span className="creator-template-highlights">+ {highlights.map((highlight, index) => (+ <span+ className="creator-template-highlight"+ key={`${highlight.text}-${index}`}+ >+ {highlight.colors.length > 0 ? (+ <span className="creator-template-swatches" aria-hidden="true">+ {highlight.colors.map((color, colorIndex) => (+ <span+ key={`${color}-${colorIndex}`}+ style={{ backgroundColor: color }}+ />+ ))}+ </span>+ ) : null}+ <span>{highlight.text}</span>+ </span>+ ))}+ </span>+ ) : null}+ {preset.requirements ? (+ <span className="creator-template-requirement">+ <Cpu size={13} strokeWidth={1.8} aria-hidden="true" />+ <span>{formatPresetRequirement(preset.requirements, language)}</span>+ </span>+ ) : null}+ </span>+ </button>+ );+ })}+ {visiblePresets.length === 0 ? (+ <p className="creator-template-empty">+ {normalizedQuery+ ? (language === 'en-US' ? 'No matching presets.' : '没有匹配的模板。')+ : (language === 'en-US'+ ? 'No presets are available for this module yet.'+ : '该模块暂时没有预置模板。')}+ </p>+ ) : null}+ </div>+ ) : null}+ </section></div>);}-function isVisibleCreatorSkill(skill: CreatorSkill): boolean {- return skill.interaction?.type === 'workspace'- && isVisibleCreatorWorkspace(skill.interaction.workspace);+function CreatorModuleButton(props: {+ module: CreatorRuntimeWorkspace;+ count: number;+ selected: boolean;+ language: 'zh-CN' | 'en-US';+ onSelect(module: CreatorRuntimeWorkspace): void;+}) {+ const copy = moduleCopy[props.module];+ const Icon = copy.icon;+ const countLabel = props.language === 'en-US'+ ? `${props.count} preset${props.count === 1 ? '' : 's'}`+ : `${props.count} 个模板`;+ return (+ <button+ className="creator-module-card"+ type="button"+ role="tab"+ aria-selected={props.selected}+ aria-label={`${moduleLabel(props.module, props.language)},${countLabel}`}+ onClick={() => props.onSelect(props.module)}+ >+ <span className="creator-module-label">+ <Icon size={15} strokeWidth={1.8} aria-hidden="true" />+ <strong>{moduleLabel(props.module, props.language)}</strong>+ </span>+ <small aria-hidden="true">{props.count}</small>+ </button>+ );}export function getCreatorSkillPromptHint(@@ -372,72 +374,45 @@ export function getCreatorSkillPromptHint(if (skill.promptHint !== undefined) {return language === 'en-US' ? skill.promptHint.enUS : skill.promptHint.zhCN;}- const title = language === 'en-US'- ? englishCreatorLabels[skill.title] ?? skill.title- : skill.title;return language === 'en-US'- ? `Describe what you want to create with ${title} and any requirements`- : `描述你希望用「${title}」完成的内容和要求`;+ ? `Describe what you want to create with ${skill.title} and any requirements`+ : `描述你希望用「${skill.title}」完成的内容和要求`;}-const englishCreatorLabels: Record<string, string> = {- 最近: 'Recent',- 推荐: 'Recommended',- 视频创作: 'Video',- 数字人: 'Avatars',- 图像设计: 'Images',- 内容营销: 'Marketing',- 多语言视频翻译: 'Multilingual Video Translation',- 视频翻译: 'Video Translation',- 视频下载: 'Video Download',- 视频处理: 'Video Tools',- 数字人口播: 'Digital Avatar',- 火柴人动画: 'Stick Figure Animation',- 动画生成: 'Animation',- 智能剪辑: 'Intelligent Curation',- 视频剪辑: 'Video Editing',- 封面生成: 'Cover Generation',- 创意短片策划: 'Creative Short Planning',- 产品视觉海报: 'Product Visual Poster',- 图像生成: 'Image Generation',- 剧情短片: 'Narrative Short',- 故事视频: 'Story Video',- 商品广告短片: 'Product Ad',- 商业视频: 'Commercial Video',- 火柴人知识动画: 'Explainer Animation',- 动画视频: 'Animated Video',- 教程演示视频: 'Tutorial Video',- 教程视频: 'Tutorial',- 短视频脚本: 'Short Video Script',- 内容策划: 'Content Planning',- 知识分享口播: 'Knowledge Presenter',- 知识博主: 'Knowledge Creator',- 课程讲解: 'Course Lesson',- 在线课程: 'Online Course',- 产品介绍: 'Product Introduction',- 产品讲解: 'Product Demo',- 新闻播报: 'News Presenter',- 资讯播报: 'News',- 社媒口播: 'Social Presenter',- 短视频口播: 'Short Video Presenter',- 视频封面: 'Video Thumbnail',- 封面设计: 'Thumbnail Design',- 产品海报: 'Product Poster',- 商业海报: 'Commercial Poster',- 信息长图: 'Infographic',- 信息设计: 'Information Design',- 社媒配图: 'Social Visuals',- 社交媒体: 'Social Media',- 人物写真: 'Portrait Series',- 人物图像: 'Portraits',- 品牌故事: 'Brand Story',- 品牌内容: 'Brand Content',- 种草短视频: 'Product Recommendation Video',- 社媒营销: 'Social Marketing',- 活动推广: 'Campaign Promotion',- 活动营销: 'Campaign Marketing',- 新品发布: 'Product Launch',- 产品营销: 'Product Marketing',- 创作者周报: 'Creator Weekly',- 粉丝运营: 'Audience Growth'-};+function moduleLabel(+ module: CreatorRuntimeWorkspace,+ language: 'zh-CN' | 'en-US'+): string {+ return language === 'en-US' ? moduleCopy[module].en : moduleCopy[module].zh;+}++function presetIdentity(preset: CreatorPresetSummary): string {+ return `${preset.module}/${preset.id}/${preset.version}`;+}++function formatPresetRequirement(+ requirement: CreatorPresetRequirements,+ language: 'zh-CN' | 'en-US'+): string {+ const service = requirement.service === 'image'+ ? (language === 'en-US' ? 'Image' : '图像服务')+ : requirement.service === 'video'+ ? (language === 'en-US' ? 'Video' : '视频服务')+ : (language === 'en-US' ? 'TTS' : '配音服务');+ const provider = providerLabel(requirement.provider);+ return `${service} · ${provider}${requirement.model ? ` · ${requirement.model}` : ''}`;+}++function providerLabel(provider: string): string {+ const labels: Record<string, string> = {+ openai: 'OpenAI',+ jimeng: 'Jimeng',+ kling: 'Kling',+ gemini: 'Gemini',+ seedance: 'Seedance',+ veo: 'Veo',+ aliyun: 'Aliyun',+ minimax: 'MiniMax'+ };+ return labels[provider] ?? provider;+}diff --git a/apps/web/src/features/dashboard/CoverGeneratorWorkspace.test.tsx b/apps/web/src/features/dashboard/CoverGeneratorWorkspace.test.tsxindex d5d93ad0..4a5ff7be 100644--- a/apps/web/src/features/dashboard/CoverGeneratorWorkspace.test.tsx+++ b/apps/web/src/features/dashboard/CoverGeneratorWorkspace.test.tsx@@ -510,6 +510,7 @@ function createFixture() {templateVersion: 2,status: 'draft',revision: 0,+ presetOrigin: null,state: {sourceType: 'prompt',sourceUrl: '',diff --git a/apps/web/src/features/dashboard/CreatorCollaborationPanel.test.tsx b/apps/web/src/features/dashboard/CreatorCollaborationPanel.test.tsxindex 580661ec..f78e75e4 100644--- a/apps/web/src/features/dashboard/CreatorCollaborationPanel.test.tsx+++ b/apps/web/src/features/dashboard/CreatorCollaborationPanel.test.tsx@@ -464,6 +464,7 @@ function smartDubbingJob(): CreatorJob {templateVersion: 1,status: 'running',revision: 4,+ presetOrigin: null,state: {text: '这是一段智能配音文案。',ttsProvider: 'openai',@@ -556,6 +557,7 @@ function coverJob(): CreatorJob {templateVersion: 2,status: 'running',revision: 5,+ presetOrigin: null,state: {sourceType: 'prompt',prompt: '电影感人物封面',@@ -655,6 +657,7 @@ function downloadJob(): CreatorJob {templateVersion: 2,status: 'running',revision: 4,+ presetOrigin: null,state: {sourceUrl: 'https://www.youtube.com/watch?v=demo',mediaType: 'video',@@ -740,6 +743,7 @@ function videoGenerationJob(): CreatorJob {templateVersion: 1,status: 'running',revision: 3,+ presetOrigin: null,state: {prompt: '雨夜中的赛博朋克街道',provider: 'veo',diff --git a/apps/web/src/features/dashboard/CreatorTaskSummary.test.tsx b/apps/web/src/features/dashboard/CreatorTaskSummary.test.tsxnew file mode 100644index 00000000..fdae1a7a--- /dev/null+++ b/apps/web/src/features/dashboard/CreatorTaskSummary.test.tsx@@ -0,0 +1,58 @@+import { render, screen } from '@testing-library/react';+import type { CreatorJob } from '@opencreator/protocol';+import { FileVideo } from 'lucide-react';+import { describe, expect, it, vi } from 'vitest';+import { LanguageProvider } from '../../i18n/LanguageProvider.js';+import CreatorTaskSummary from './CreatorTaskSummary.js';+import { CreatorSessionProvider } from './creator-session-store.js';++describe('CreatorTaskSummary', () => {+ it('shows the preset origin shared by every Creator workspace', () => {+ const createdAt = '2026-09-08T00:00:00.000Z';+ const job: CreatorJob = {+ id: 'creator_job_preset_summary',+ projectId: 'project_1',+ templateId: 'video-translation',+ templateVersion: 2,+ status: 'draft',+ revision: 0,+ presetOrigin: {+ module: 'video-translation',+ id: 'bilibili-bilingual',+ version: 1,+ locale: 'zh-CN',+ title: 'B站双语精翻',+ contentHash: 'a'.repeat(64)+ },+ state: {},+ agentThreadId: null,+ stages: [],+ artifacts: [],+ activities: [],+ createdAt,+ updatedAt: createdAt+ };++ render(+ <LanguageProvider initialPreference="zh-CN">+ <CreatorSessionProvider+ initialJob={job}+ service={{+ applyAction: vi.fn(),+ runAgentTurn: vi.fn()+ } as never}+ >+ <CreatorTaskSummary+ sourceIcon={FileVideo}+ sourceLabel="源视频"+ sourceValue="demo.mp4"+ items={[]}+ />+ </CreatorSessionProvider>+ </LanguageProvider>+ );++ expect(screen.getByText('模板来源')).toBeInTheDocument();+ expect(screen.getByText('B站双语精翻')).toBeInTheDocument();+ });+});diff --git a/apps/web/src/features/dashboard/CreatorTaskSummary.tsx b/apps/web/src/features/dashboard/CreatorTaskSummary.tsxindex d54e5ab0..1fdebc31 100644--- a/apps/web/src/features/dashboard/CreatorTaskSummary.tsx+++ b/apps/web/src/features/dashboard/CreatorTaskSummary.tsx@@ -1,5 +1,6 @@import { Sparkles, type LucideIcon } from 'lucide-react';import { useLocalizedCopy } from '../../i18n/useLocalizedCopy.js';+import { useOptionalCreatorSession } from './creator-session-store.js';type SummaryItem = {label: string;@@ -15,8 +16,10 @@ export default function CreatorTaskSummary(props: {noteIcon?: LucideIcon;}) {const l = useLocalizedCopy();+ const session = useOptionalCreatorSession();const SourceIcon = props.sourceIcon;const NoteIcon = props.noteIcon;+ const presetTitle = session?.job.presetOrigin?.title.trim();return (<aside@@ -35,6 +38,12 @@ export default function CreatorTaskSummary(props: {</span></div><dl>+ {presetTitle ? (+ <div>+ <dt>{l('模板来源', 'Preset')}</dt>+ <dd title={presetTitle}>{presetTitle}</dd>+ </div>+ ) : null}{props.items.map(item => (<div key={item.label}><dt>{item.label}</dt>diff --git a/apps/web/src/features/dashboard/DashboardPage.test.tsx b/apps/web/src/features/dashboard/DashboardPage.test.tsxindex 869fd0af..c1238d2b 100644--- a/apps/web/src/features/dashboard/DashboardPage.test.tsx+++ b/apps/web/src/features/dashboard/DashboardPage.test.tsx@@ -27,11 +27,18 @@ function DashboardPage(props: ComponentProps<typeof DashboardPageView>) {);}+function openBlankWorkspace(moduleName: string, _blankName: string) {+ fireEvent.click(screen.getByRole('button', {+ name: new RegExp(`^${moduleName}`)+ }));+}+function createInMemoryCreatorService(): CreatorWebService {const jobs = new Map<string, CreatorJob>();let sequence = 0;const createJob = async (request: Parameters<CreatorWebService['createJob']>[0]) => {const now = new Date().toISOString();+ if (!('templateId' in request)) throw new Error('Preset creation is not used by this fixture');const job: CreatorJob = {id: `creator_test_job_${++sequence}`,projectId: request.projectId,@@ -39,6 +46,7 @@ function createInMemoryCreatorService(): CreatorWebService {templateVersion: 1,status: 'draft',revision: 0,+ presetOrigin: null,state: request.state ?? {},agentThreadId: null,stages: [],@@ -600,6 +608,7 @@ describe('DashboardPage', () => {templateVersion: 2,status: 'draft',revision: 0,+ presetOrigin: null,state: { prompt: '迟到但已成功创建的任务' },agentThreadId: null,stages: [],@@ -680,7 +689,7 @@ describe('DashboardPage', () => {</LanguageProvider>);- fireEvent.click(screen.getByRole('button', { name: 'Open Translate & Dub Video' }));+ openBlankWorkspace('Video Translation', 'Blank Video Translation');expect(screen.getByRole('heading', { name: 'Translate & Dub Video' })).toBeInTheDocument();expect(screen.getByRole('heading', { name: 'Drop a video here' })).toBeInTheDocument();expect(screen.getByRole('textbox', { name: 'Video link' })).toHaveAttribute(@@ -695,7 +704,7 @@ describe('DashboardPage', () => {it('uses the Home-style Agent composer across creator workspaces', () => {render(<DashboardPage onSelectPrompt={vi.fn()} />);- fireEvent.click(screen.getByRole('button', { name: /^视频翻译/ }));+ openBlankWorkspace('视频翻译', '空白视频翻译');const translationInput = screen.getByRole('textbox', { name: '告诉 Agent 你的要求' });expect(translationInput.closest('form')).toHaveClass('tool-agent-composer');expect(screen.queryByRole('button', { name: '添加上下文' })).not.toBeInTheDocument();@@ -703,7 +712,7 @@ describe('DashboardPage', () => {expect(screen.queryByRole('button', { name: '选择模型 默认模型' })).not.toBeInTheDocument();fireEvent.click(screen.getByRole('button', { name: '返回' }));- fireEvent.click(screen.getByRole('button', { name: /^视频下载/ }));+ openBlankWorkspace('视频下载', '空白视频下载');const downloadInput = screen.getByRole('textbox', { name: '告诉 Agent 你的要求' });expect(downloadInput.closest('form')).toHaveClass('tool-agent-composer');expect(screen.queryByRole('button', { name: '添加上下文' })).not.toBeInTheDocument();@@ -726,7 +735,6 @@ describe('DashboardPage', () => {expect(screen.getByRole('searchbox', { name: '搜索应用' })).toBeInTheDocument();const videoTranslationCard = screen.getByRole('button', { name: /^视频翻译/ });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(6);expect(appCards.map(card => card.querySelector('strong')?.textContent)).toEqual([@@ -739,21 +747,7 @@ describe('DashboardPage', () => {]);expect(screen.queryByRole('button', { name: /^火柴人动画/ })).not.toBeInTheDocument();expect(screen.queryByRole('button', { name: /^自动剪辑/ })).not.toBeInTheDocument();- expect(screen.getByRole('button', { name: /^智能配音/ })).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();- 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.queryByRole('button', { name: /^音频增强/ })).not.toBeInTheDocument();- expect(screen.queryByRole('button', { name: /^互动视频/ })).not.toBeInTheDocument();- expect(screen.getByRole('button', { name: /^视频下载 支持YouTube,Bilibili等/ }))- .toBeInTheDocument();- expect(screen.getByRole('button', { name: /^封面生成 生成视频与内容封面/ }))- .toBeInTheDocument();});it('opens the video translation workspace and keeps its result in place', async () => {@@ -772,7 +766,7 @@ describe('DashboardPage', () => {/>);- fireEvent.click(screen.getByRole('button', { name: /^视频翻译/ }));+ openBlankWorkspace('视频翻译', '空白视频翻译');expect(screen.getByRole('heading', { name: '视频翻译配音' })).toBeInTheDocument();expect(screen.getByRole('complementary', { name: 'OpenCreator' })).toBeInTheDocument();@@ -807,7 +801,7 @@ describe('DashboardPage', () => {expect(subtitlePreview.querySelector(':scope > div')).toHaveStyle({ '--subtitle-preview-font-size': '18px' });fireEvent.click(screen.getByRole('button', { name: '继续' }));expect(screen.getByLabelText('任务摘要')).toHaveTextContent('English → 简体中文');- expect(screen.getByLabelText('任务摘要')).toHaveTextContent('圆体 · 大 · #FFE45C');+ expect(screen.getByLabelText('任务摘要')).toHaveTextContent('圆体 · 粗体 · 大 · #FFE45C');expect(screen.getByLabelText('任务摘要')).toHaveClass('video-translation-summary', 'creator-task-summary');expect(screen.getByLabelText('任务摘要').parentElement).toHaveClass('video-translation-final-grid');await startVideoTranslation();@@ -819,7 +813,7 @@ describe('DashboardPage', () => {fireEvent.click(screen.getByRole('tab', { name: '字幕' }));expect(screen.getByRole('button', { name: '保存横屏字幕' })).toBeDisabled();fireEvent.click(screen.getByRole('tab', { name: '任务设置' }));- expect(screen.getByText('圆体 · 大 · #FFE45C')).toBeInTheDocument();+ expect(screen.getByText('圆体 · 粗体 · 大 · #FFE45C')).toBeInTheDocument();expect(screen.queryByText(/之前的版本仍可查看/)).not.toBeInTheDocument();expect(screen.queryByRole('region', { name: '生成新版本' })).not.toBeInTheDocument();expect(screen.queryByRole('button', { name: '生成新版本' })).not.toBeInTheDocument();@@ -827,7 +821,7 @@ describe('DashboardPage', () => {it('shows the translation steps and reopens completed steps', () => {render(<DashboardPage onSelectPrompt={vi.fn()} />);- fireEvent.click(screen.getByRole('button', { name: /^视频翻译/ }));+ openBlankWorkspace('视频翻译', '空白视频翻译');const steps = screen.getByRole('navigation', { name: '翻译流程' });expect(within(steps).getByRole('button', { name: '1 添加视频' })).toHaveAttribute('aria-current', 'step');@@ -868,7 +862,7 @@ describe('DashboardPage', () => {it('uses the selected vertical output ratio for the subtitle preview', () => {render(<DashboardPage onSelectPrompt={vi.fn()} />);- fireEvent.click(screen.getByRole('button', { name: /^视频翻译/ }));+ openBlankWorkspace('视频翻译', '空白视频翻译');fireEvent.change(screen.getByRole('textbox', { name: '视频链接' }), {target: { value: 'https://www.youtube.com/watch?v=vertical-preview' }});@@ -887,7 +881,7 @@ describe('DashboardPage', () => {it('submits public video link analysis from the dashboard', async () => {render(<DashboardPage onSelectPrompt={vi.fn()} />);- fireEvent.click(screen.getByRole('button', { name: /^视频下载/ }));+ openBlankWorkspace('视频下载', '空白视频下载');expect(screen.getByRole('heading', { name: '视频下载' })).toBeInTheDocument();fireEvent.change(screen.getByRole('textbox', { name: '待下载视频链接' }), {@@ -1204,7 +1198,7 @@ describe('DashboardPage', () => {it('opens the three-step cover workflow and configures the output count', () => {render(<DashboardPage onSelectPrompt={vi.fn()} />);- fireEvent.click(screen.getByRole('button', { name: /^封面生成/ }));+ openBlankWorkspace('封面生成', '空白封面生成');expect(screen.getByRole('heading', { name: '封面生成' })).toBeInTheDocument();const coverSteps = screen.getByRole('navigation', { name: '封面生成流程' });@@ -1224,9 +1218,32 @@ describe('DashboardPage', () => {expect(screen.queryByLabelText('任务摘要')).not.toBeInTheDocument();});+ it('creates blank workspaces with the current runtime template version', async () => {+ const creatorService = createInMemoryCreatorService();+ const createJob = vi.spyOn(creatorService, 'createJob');+ render(+ <DashboardPage+ onSelectPrompt={vi.fn()}+ creatorService={creatorService}+ />+ );++ openBlankWorkspace('封面生成', '空白封面生成');+ fireEvent.change(screen.getByRole('textbox', { name: '内容与补充要求' }), {+ target: { value: '验证空白封面使用当前模板版本' }+ });++ await waitFor(() => expect(createJob).toHaveBeenCalledWith(+ expect.objectContaining({+ templateId: 'cover',+ templateVersion: 2+ })+ ));+ });+it('edits and saves generated subtitles without leaving the result workspace', async () => {render(<DashboardPage onSelectPrompt={vi.fn()} />);- fireEvent.click(screen.getByRole('button', { name: /^视频翻译/ }));+ openBlankWorkspace('视频翻译', '空白视频翻译');fireEvent.change(screen.getByRole('textbox', { name: '视频链接' }), {target: { value: 'https://www.youtube.com/watch?v=test' }});@@ -1255,7 +1272,7 @@ describe('DashboardPage', () => {it('requires confirmation before subtitle changes create a new output version', async () => {render(<DashboardPage onSelectPrompt={vi.fn()} />);- fireEvent.click(screen.getByRole('button', { name: /^视频翻译/ }));+ openBlankWorkspace('视频翻译', '空白视频翻译');fireEvent.change(screen.getByRole('textbox', { name: '视频链接' }), {target: { value: 'https://www.youtube.com/watch?v=test' }});@@ -1286,7 +1303,7 @@ describe('DashboardPage', () => {it('saves manual subtitle edits while generating a new version', async () => {render(<DashboardPage onSelectPrompt={vi.fn()} />);- fireEvent.click(screen.getByRole('button', { name: /^视频翻译/ }));+ openBlankWorkspace('视频翻译', '空白视频翻译');fireEvent.change(screen.getByRole('textbox', { name: '视频链接' }), {target: { value: 'https://www.youtube.com/watch?v=test' }});@@ -1323,7 +1340,7 @@ describe('DashboardPage', () => {value: revokeObjectURL});const rendered = render(<DashboardPage onSelectPrompt={vi.fn()} />);- fireEvent.click(screen.getByRole('button', { name: /^视频翻译/ }));+ openBlankWorkspace('视频翻译', '空白视频翻译');fireEvent.change(screen.getByRole('textbox', { name: '视频链接' }), {target: { value: 'https://www.youtube.com/watch?v=test' }});@@ -1360,7 +1377,7 @@ describe('DashboardPage', () => {it('returns to settings and creates a new version without replacing the old one', async () => {render(<DashboardPage onSelectPrompt={vi.fn()} />);- fireEvent.click(screen.getByRole('button', { name: /^视频翻译/ }));+ openBlankWorkspace('视频翻译', '空白视频翻译');fireEvent.change(screen.getByRole('textbox', { name: '视频链接' }), {target: { value: 'https://www.youtube.com/watch?v=test' }});@@ -1435,7 +1452,7 @@ describe('DashboardPage', () => {creatorService={creatorService}/>);- fireEvent.click(screen.getByRole('button', { name: /^视频翻译/ }));+ openBlankWorkspace('视频翻译', '空白视频翻译');fireEvent.change(screen.getByRole('textbox', { name: '视频链接' }), {target: { value: 'https://www.youtube.com/watch?v=reuse-subtitles' }});@@ -1482,7 +1499,7 @@ describe('DashboardPage', () => {creatorService={{ ...baseService, applyAction } as CreatorWebService}/>);- fireEvent.click(screen.getByRole('button', { name: /^视频翻译/ }));+ openBlankWorkspace('视频翻译', '空白视频翻译');fireEvent.change(screen.getByRole('textbox', { name: '视频链接' }), {target: { value: 'https://www.youtube.com/watch?v=source-v1' }});@@ -1526,7 +1543,7 @@ describe('DashboardPage', () => {creatorService={{ ...baseService, applyAction } as CreatorWebService}/>);- fireEvent.click(screen.getByRole('button', { name: /^视频翻译/ }));+ openBlankWorkspace('视频翻译', '空白视频翻译');fireEvent.change(screen.getByRole('textbox', { name: '视频链接' }), {target: { value: 'https://www.youtube.com/watch?v=settings-only' }});@@ -1565,7 +1582,7 @@ describe('DashboardPage', () => {creatorService={{ ...baseService, applyAction } as CreatorWebService}/>);- fireEvent.click(screen.getByRole('button', { name: /^视频翻译/ }));+ openBlankWorkspace('视频翻译', '空白视频翻译');fireEvent.change(screen.getByRole('textbox', { name: '视频链接' }), {target: { value: 'https://www.youtube.com/watch?v=single-version' }});@@ -1615,7 +1632,7 @@ describe('DashboardPage', () => {it('resizes the immersive operation and Agent panes', () => {render(<DashboardPage onSelectPrompt={vi.fn()} />);- fireEvent.click(screen.getByRole('button', { name: /^视频翻译/ }));+ openBlankWorkspace('视频翻译', '空白视频翻译');const separator = screen.getByRole('separator', { name: '调整操作区和对话区宽度' });expect(separator).toHaveAttribute('aria-valuemin', '780');@@ -1655,7 +1672,7 @@ describe('DashboardPage', () => {creatorServicesService={tts.service}/>);- fireEvent.click(screen.getByRole('button', { name: '打开视频翻译配音' }));+ openBlankWorkspace('视频翻译', '空白视频翻译');const video = new File(['video'], 'demo.mp4', { type: 'video/mp4' });fireEvent.change(screen.getByLabelText('上传本地视频'), { target: { files: [video] } });@@ -1694,7 +1711,7 @@ describe('DashboardPage', () => {value: vi.fn()});render(<DashboardPage onSelectPrompt={vi.fn()} />);- fireEvent.click(screen.getByRole('button', { name: '打开视频翻译配音' }));+ openBlankWorkspace('视频翻译', '空白视频翻译');const video = new File(['video'], 'portrait.mp4', { type: 'video/mp4' });fireEvent.change(screen.getByLabelText('上传本地视频'), { target: { files: [video] } });@@ -1718,7 +1735,7 @@ describe('DashboardPage', () => {it('requires a video before advancing to translation settings', () => {render(<DashboardPage onSelectPrompt={vi.fn()} />);- fireEvent.click(screen.getByRole('button', { name: /^视频翻译/ }));+ openBlankWorkspace('视频翻译', '空白视频翻译');fireEvent.click(screen.getByRole('button', { name: '继续' }));expect(screen.getByRole('alert')).toHaveTextContent('请先添加需要翻译的视频');@@ -1738,7 +1755,7 @@ describe('DashboardPage', () => {creatorService={creatorService}/>);- fireEvent.click(screen.getByRole('button', { name: /^视频翻译/ }));+ openBlankWorkspace('视频翻译', '空白视频翻译');fireEvent.change(screen.getByRole('textbox', { name: '视频链接' }), {target: { value: 'https://www.youtube.com/watch?v=test' }});@@ -1772,7 +1789,7 @@ describe('DashboardPage', () => {creatorService={creatorService}/>);- fireEvent.click(screen.getByRole('button', { name: /^视频翻译/ }));+ openBlankWorkspace('视频翻译', '空白视频翻译');fireEvent.click(screen.getByRole('button', { name: '让 Agent 检查设置' }));await waitFor(() => {@@ -1796,7 +1813,7 @@ describe('DashboardPage', () => {creatorService={creatorService}/>);- fireEvent.click(screen.getByRole('button', { name: /^视频翻译/ }));+ openBlankWorkspace('视频翻译', '空白视频翻译');const composer = screen.getByRole('textbox', { name: '告诉 Agent 你的要求' });fireEvent.change(composer, { target: { value: '检查当前翻译设置' } });@@ -1816,7 +1833,7 @@ describe('DashboardPage', () => {onWorkspaceModeChange={onWorkspaceModeChange}/>);- fireEvent.click(screen.getByRole('button', { name: /^视频翻译/ }));+ openBlankWorkspace('视频翻译', '空白视频翻译');expect(onWorkspaceModeChange).toHaveBeenLastCalledWith(true);fireEvent.click(screen.getByRole('button', { name: '返回' }));@@ -1967,6 +1984,7 @@ describe('DashboardPage', () => {templateVersion: 1,status: 'draft',revision: 0,+ presetOrigin: null,state: {prompt: '',provider: 'gemini',@@ -2097,16 +2115,16 @@ describe('DashboardPage', () => {/>);- fireEvent.click(screen.getByRole('button', { name: /^图像生成/ }));+ openBlankWorkspace('图像生成', '空白图像生成');expect(await screen.findByRole('heading', { name: '图像生成' })).toBeInTheDocument();fireEvent.change(screen.getByRole('textbox', { name: '提示词' }), {target: { value: prompt }});fireEvent.click(screen.getByRole('button', { name: '继续' }));expect(screen.getByRole('radio', { name: 'GPT Image' })).toHaveAttribute('aria-checked', 'true');- expect(screen.queryByRole('radio', { name: '即梦' })).not.toBeInTheDocument();- expect(screen.queryByRole('radio', { name: '可灵' })).not.toBeInTheDocument();- expect(screen.queryByRole('radio', { name: 'Gemini' })).not.toBeInTheDocument();+ expect(screen.getByRole('radio', { name: '即梦' })).toHaveAttribute('aria-checked', 'false');+ expect(screen.getByRole('radio', { name: '可灵' })).toHaveAttribute('aria-checked', 'false');+ expect(screen.getByRole('radio', { name: 'Gemini' })).toHaveAttribute('aria-checked', 'false');fireEvent.click(screen.getByRole('radio', { name: /横向/ }));fireEvent.click(screen.getByRole('radio', { name: '高清' }));fireEvent.click(screen.getByRole('button', { name: '继续' }));@@ -2124,15 +2142,6 @@ describe('DashboardPage', () => {input: { stageId: 'generate' }}));- expect(applyAction).toHaveBeenCalledWith(- job.id,- expect.objectContaining({- action: 'update-settings',- input: expect.objectContaining({- patch: expect.objectContaining({ provider: 'openai' })- })- })- );expect(openArtifact).toHaveBeenCalledTimes(2);fireEvent.click(screen.getByRole('button', { name: '重新生成' }));expect(await screen.findByRole('button', { name: /项目 V2/ })).toBeInTheDocument();@@ -2160,6 +2169,7 @@ describe('DashboardPage', () => {templateVersion: 1,status: 'draft',revision: 0,+ presetOrigin: null,state: {prompt: '',provider: 'seedance',diff --git a/apps/web/src/features/dashboard/DashboardPage.tsx b/apps/web/src/features/dashboard/DashboardPage.tsxindex e47871b8..1fd6f2d1 100644--- a/apps/web/src/features/dashboard/DashboardPage.tsx+++ b/apps/web/src/features/dashboard/DashboardPage.tsx@@ -37,6 +37,7 @@ import type {} from './creator-workspace.js';import {creatorTemplateForWorkspace,+ creatorTemplateVersionForWorkspace,isVisibleCreatorWorkspace} from './creator-workspace.js';import type { VideoMetadataService } from '../../services/video-metadata-service.js';@@ -157,7 +158,7 @@ const creatorTools: DashboardEntry[] = [category: '图像创作',icon: Image,workspace: 'image-generation'- },+ }];const categories = ['全部', '视频创作', '视频编辑', '图像创作', '音频处理'] as const;@@ -275,6 +276,7 @@ export default function DashboardPage(props: {projectId={props.projectId}service={props.creatorService}templateId={creatorTemplateForWorkspace(workspace)}+ templateVersion={creatorTemplateVersionForWorkspace(workspace)}jobId={activeJobId}onJobCreated={job => handleJobCreated(workspace, job)}onBack={closeWorkspace}@@ -397,7 +399,10 @@ export default function DashboardPage(props: {<span className="dashboard-featured-scrim" aria-hidden="true" /><span className="dashboard-featured-copy"><strong>{localize(tool.title)}</strong>- <span>{t('dashboard.start')} <ArrowUpRight size={14} strokeWidth={1.8} aria-hidden="true" /></span>+ <span>+ {t('dashboard.start')}+ <ArrowUpRight size={14} strokeWidth={1.8} aria-hidden="true" />+ </span></span></button>))}@@ -406,7 +411,11 @@ export default function DashboardPage(props: {<section className="dashboard-directory" aria-label={t('dashboard.apps')}><div className="dashboard-directory-controls">- <div className="dashboard-category-tabs" role="tablist" aria-label={t('dashboard.categories')}>+ <div+ className="dashboard-category-tabs"+ role="tablist"+ aria-label={t('dashboard.categories')}+ >{categories.map(item => (<buttontype="button"@@ -457,7 +466,13 @@ export default function DashboardPage(props: {<div className="dashboard-empty" role="status"><Search size={20} strokeWidth={1.6} aria-hidden="true" /><p>{t('dashboard.empty')}</p>- <button type="button" onClick={() => { setQuery(''); setCategory('全部'); }}>+ <button+ type="button"+ onClick={() => {+ setQuery('');+ setCategory('全部');+ }}+ >{t('dashboard.showAll')}</button></div>@@ -496,6 +511,7 @@ function CreatorWorkspaceSession(props: {projectId: string;service: CreatorWebService;templateId: string;+ templateVersion: number;jobId?: string;children: ReactNode;onJobCreated(job: CreatorJob): void;@@ -503,7 +519,7 @@ function CreatorWorkspaceSession(props: {}) {const l = useLocalizedCopy();const [job, setJob] = useState<CreatorJob | undefined>(() => props.jobId === undefined- ? createPendingCreatorJob(props.projectId, props.templateId)+ ? createPendingCreatorJob(props.projectId, props.templateId, props.templateVersion): undefined);const [error, setError] = useState<string>();const [loadAttempt, setLoadAttempt] = useState(0);@@ -518,7 +534,7 @@ function CreatorWorkspaceSession(props: {jobRef.current = job;onJobCreatedRef.current = props.onJobCreated;- const creationScope = `${props.projectId}:${props.templateId}`;+ const creationScope = `${props.projectId}:${props.templateId}:${props.templateVersion}`;const startedAnotherNewSession = props.jobId === undefined&& previousRouteJobIdRef.current !== undefined;if (@@ -527,7 +543,11 @@ function CreatorWorkspaceSession(props: {) {creationIdentityRef.current = {scope: creationScope,- key: readOrCreateCreatorJobCreationKey(props.projectId, props.templateId)+ key: readOrCreateCreatorJobCreationKey(+ props.projectId,+ props.templateId,+ props.templateVersion+ )};createdJobIdRef.current = undefined;}@@ -543,13 +563,18 @@ function CreatorWorkspaceSession(props: {if (currentJob !== undefined && !isPendingCreatorJob(currentJob)) return currentJob;const creationKey = creationIdentityRef.current?.key- ?? readOrCreateCreatorJobCreationKey(props.projectId, props.templateId);+ ?? readOrCreateCreatorJobCreationKey(+ props.projectId,+ props.templateId,+ props.templateVersion+ );const requestKey = `create:${creationKey}`;let request = creationRequestsRef.current.get(requestKey);if (request === undefined) {request = createCreatorJobWithRecovery(props.service, {projectId: props.projectId,templateId: props.templateId,+ templateVersion: currentJob?.templateVersion,creationKey,state});@@ -574,11 +599,16 @@ function CreatorWorkspaceSession(props: {setJob(next);if (!announcedCreatedJobIdsRef.current.has(next.id)) {announcedCreatedJobIdsRef.current.add(next.id);- clearCreatorJobCreationKey(props.projectId, props.templateId, creationKey);+ clearCreatorJobCreationKey(+ props.projectId,+ props.templateId,+ props.templateVersion,+ creationKey+ );onJobCreatedRef.current(next);}return next;- }, [props.projectId, props.service, props.templateId]);+ }, [props.projectId, props.service, props.templateId, props.templateVersion]);useEffect(() => {let canceled = false;@@ -589,8 +619,13 @@ function CreatorWorkspaceSession(props: {&& isPendingCreatorJob(current)&& current.projectId === props.projectId&& current.templateId === props.templateId+ && current.templateVersion === props.templateVersion? current- : createPendingCreatorJob(props.projectId, props.templateId)+ : createPendingCreatorJob(+ props.projectId,+ props.templateId,+ props.templateVersion+ )));return () => { canceled = true; };}@@ -623,7 +658,15 @@ function CreatorWorkspaceSession(props: {canceled = true;window.clearTimeout(timeout);};- }, [l, loadAttempt, props.jobId, props.projectId, props.service, props.templateId]);+ }, [+ l,+ loadAttempt,+ props.jobId,+ props.projectId,+ props.service,+ props.templateId,+ props.templateVersion+ ]);if (error) {return (@@ -661,16 +704,21 @@ function CreatorWorkspaceSession(props: {);}-function createPendingCreatorJob(projectId: string, templateId: string): CreatorJob {+function createPendingCreatorJob(+ projectId: string,+ templateId: string,+ templateVersion: number+): CreatorJob {const now = new Date().toISOString();return {id: `pending:${projectId}:${templateId}`,projectId,templateId,- templateVersion: 1,+ templateVersion,status: 'draft',revision: 0,state: {},+ presetOrigin: null,agentThreadId: null,stages: [],artifacts: [],@@ -753,8 +801,12 @@ function waitForRetry(delayMs: number): Promise<void> {return new Promise(resolve => window.setTimeout(resolve, delayMs));}-function readOrCreateCreatorJobCreationKey(projectId: string, templateId: string): string {- const storageKey = creatorJobCreationStorageKey(projectId, templateId);+function readOrCreateCreatorJobCreationKey(+ projectId: string,+ templateId: string,+ templateVersion: number+): string {+ const storageKey = creatorJobCreationStorageKey(projectId, templateId, templateVersion);try {const existing = window.sessionStorage.getItem(storageKey);if (existing) return existing;@@ -773,9 +825,10 @@ function readOrCreateCreatorJobCreationKey(projectId: string, templateId: stringfunction clearCreatorJobCreationKey(projectId: string,templateId: string,+ templateVersion: number,expectedKey?: string): void {- const storageKey = creatorJobCreationStorageKey(projectId, templateId);+ const storageKey = creatorJobCreationStorageKey(projectId, templateId, templateVersion);try {if (expectedKey === undefined@@ -788,8 +841,19 @@ function clearCreatorJobCreationKey(}}-function creatorJobCreationStorageKey(projectId: string, templateId: string): string {- return `${CREATOR_JOB_CREATION_STORAGE_PREFIX}${encodeURIComponent(projectId)}:${encodeURIComponent(templateId)}`;+function creatorJobCreationStorageKey(+ projectId: string,+ templateId: string,+ templateVersion: number+): string {+ return [+ CREATOR_JOB_CREATION_STORAGE_PREFIX,+ encodeURIComponent(projectId),+ ':',+ encodeURIComponent(templateId),+ ':',+ templateVersion+ ].join('');}function createCreationKeySuffix(): string {@@ -823,5 +887,5 @@ const englishDashboardLabels: Record<string, string> = {封面生成: 'Thumbnail Generator',生成视频与内容封面: 'Create thumbnails for videos and content',视频下载: 'Video Downloader',- '支持YouTube,Bilibili等': 'Supports YouTube, Bilibili, and more',+ '支持YouTube,Bilibili等': 'Supports YouTube, Bilibili, and more'};diff --git a/apps/web/src/features/dashboard/ImageGenerationWorkspace.test.tsx b/apps/web/src/features/dashboard/ImageGenerationWorkspace.test.tsxindex 645e4c74..682487ac 100644--- a/apps/web/src/features/dashboard/ImageGenerationWorkspace.test.tsx+++ b/apps/web/src/features/dashboard/ImageGenerationWorkspace.test.tsx@@ -50,6 +50,44 @@ describe('ImageGenerationWorkspace', () => {}});+ it.each([+ ['gemini', 'Gemini'],+ ['jimeng', '即梦'],+ ['kling', '可灵']+ ] as const)('keeps the preset-selected %s provider', async (provider, label) => {+ vi.useFakeTimers();+ try {+ const fixture = createFixture();+ const initialJob: CreatorJob = {+ ...fixture.currentJob(),+ presetOrigin: {+ module: 'image-generation',+ id: `${provider}-preset`,+ version: 1,+ locale: 'zh-CN',+ title: `${label} 模板`,+ contentHash: 'a'.repeat(64)+ },+ state: {+ ...fixture.currentJob().state,+ provider,+ currentStep: 1,+ furthestStep: 1+ }+ };++ renderWorkspace(fixture, initialJob);+ expect(screen.getByRole('radio', { name: label })).toHaveAttribute(+ 'aria-checked',+ 'true'+ );+ await act(() => vi.advanceTimersByTimeAsync(500));+ expect(fixture.applyAction).not.toHaveBeenCalled();+ } finally {+ vi.useRealTimers();+ }+ });+it('restores a saved project at its second step', () => {const fixture = createFixture();const initialJob: CreatorJob = {@@ -210,6 +248,7 @@ function createFixture(options: { pending?: boolean } = {}) {templateVersion: options.pending ? 1 : 2,status: 'draft',revision: 0,+ presetOrigin: null,state: options.pending ? {} : {prompt: '',provider: 'openai',diff --git a/apps/web/src/features/dashboard/ImageGenerationWorkspace.tsx b/apps/web/src/features/dashboard/ImageGenerationWorkspace.tsxindex 7aa0132a..099b8cd6 100644--- a/apps/web/src/features/dashboard/ImageGenerationWorkspace.tsx+++ b/apps/web/src/features/dashboard/ImageGenerationWorkspace.tsx@@ -47,7 +47,10 @@ const qualities: Array<{ value: ImageGenerationQuality; zh: string; en: string }];const providers: Array<{ value: ImageGenerationProvider; zh: string; en: string }> = [- { value: 'openai', zh: 'GPT Image', en: 'GPT Image' }+ { value: 'openai', zh: 'GPT Image', en: 'GPT Image' },+ { value: 'jimeng', zh: '即梦', en: 'Jimeng' },+ { value: 'kling', zh: '可灵', en: 'Kling' },+ { value: 'gemini', zh: 'Gemini', en: 'Gemini' }];const samplePromptZh = '一间通透的现代创意工作室,清晨自然光从落地窗照入,桌面有相机、手稿和绿植,真实摄影质感,构图干净,细节丰富';@@ -124,15 +127,6 @@ export default function ImageGenerationWorkspace(props: {if (latestVersion !== undefined) setResultVersion(latestVersion);}, [latestVersion]);- useEffect(() => {- if (session !== null && session.state.provider !== 'openai') {- session.updateDraft(- { provider: 'openai' },- { persist: !session.job.id.startsWith('pending:') }- );- }- }, [session?.job.id, session?.state.provider, session?.updateDraft]);-useEffect(() => {if (referenceFile === null) {if (activeReferenceArtifact === undefined || session === null) {@@ -716,8 +710,10 @@ function readArtifactString(return typeof value === 'string' && value.trim() ? value : undefined;}-function readProvider(_value: CreatorJson | undefined): ImageGenerationProvider {- return 'openai';+function readProvider(value: CreatorJson | undefined): ImageGenerationProvider {+ return value === 'jimeng' || value === 'kling' || value === 'gemini'+ ? value+ : 'openai';}function readSize(value: CreatorJson | undefined): ImageGenerationSize {diff --git a/apps/web/src/features/dashboard/VideoDownloadWorkspace.test.tsx b/apps/web/src/features/dashboard/VideoDownloadWorkspace.test.tsxindex 11715698..b51a3b10 100644--- a/apps/web/src/features/dashboard/VideoDownloadWorkspace.test.tsx+++ b/apps/web/src/features/dashboard/VideoDownloadWorkspace.test.tsx@@ -621,6 +621,7 @@ function job(patch: Partial<CreatorJob> = {}): CreatorJob {templateVersion: 2,status: 'draft',revision: 0,+ presetOrigin: null,state: {},agentThreadId: null,stages: [],diff --git a/apps/web/src/features/dashboard/VideoGenerationWorkspace.test.tsx b/apps/web/src/features/dashboard/VideoGenerationWorkspace.test.tsxindex 37ab11ed..b749b299 100644--- a/apps/web/src/features/dashboard/VideoGenerationWorkspace.test.tsx+++ b/apps/web/src/features/dashboard/VideoGenerationWorkspace.test.tsx@@ -367,6 +367,7 @@ function creatorJob(patch: Partial<CreatorJob>): CreatorJob {templateVersion: 1,status: 'draft',revision: 1,+ presetOrigin: null,state: {prompt: '',provider: 'seedance',diff --git a/apps/web/src/features/dashboard/VideoTranslationAgentPanel.test.tsx b/apps/web/src/features/dashboard/VideoTranslationAgentPanel.test.tsxindex d031ecae..36bba88c 100644--- a/apps/web/src/features/dashboard/VideoTranslationAgentPanel.test.tsx+++ b/apps/web/src/features/dashboard/VideoTranslationAgentPanel.test.tsx@@ -878,6 +878,7 @@ function job(): CreatorJob {templateVersion: 1,status: 'draft',revision: 4,+ presetOrigin: null,state: {},agentThreadId: null,stages: [],diff --git a/apps/web/src/features/dashboard/VideoTranslationWorkspace.artifacts.test.ts b/apps/web/src/features/dashboard/VideoTranslationWorkspace.artifacts.test.tsindex fd609d48..139206da 100644--- a/apps/web/src/features/dashboard/VideoTranslationWorkspace.artifacts.test.ts+++ b/apps/web/src/features/dashboard/VideoTranslationWorkspace.artifacts.test.ts@@ -601,11 +601,36 @@ function fallbackState() {}function resultVersion(input: {- settings?: {- composeVideo?: boolean;- videoFormat?: 'horizontal' | 'vertical' | 'all';- dubbing?: boolean;- };+ settings?: Partial<{+ sourceUrl: string;+ sourceLanguage: string;+ targetLanguage: string;+ bilingual: boolean;+ subtitlePosition: 'top' | 'bottom';+ preferPlatformCaptions: boolean;+ composeVideo: boolean;+ videoFormat: 'horizontal' | 'vertical' | 'all';+ dubbing: boolean;+ voiceCode: string;+ verticalTitle: string;+ verticalSubtitle: string;+ subtitleFont?: 'system' | 'sans' | 'serif' | 'rounded';+ subtitleWeight?: 'regular' | 'medium' | 'bold';+ subtitleSize?: 'small' | 'medium' | 'large';+ subtitleColor?: string;+ subtitleSecondaryColor?: string;+ subtitleOutlineColor?: string;+ subtitleOutlineWidth?: number;+ subtitleShadowEnabled?: boolean;+ subtitleShadowColor?: string;+ subtitleShadowOpacity?: number;+ subtitleShadowOffsetX?: number;+ subtitleShadowOffsetY?: number;+ subtitleShadowBlur?: number;+ ttsProvider?: 'openai' | 'aliyun' | 'edge-tts' | 'minimax';+ ttsModel?: string;+ voiceName?: string;+ }>;} = {}) {const settings = { ...fallbackState(), ...input.settings };return {@@ -625,14 +650,24 @@ function resultVersion(input: {bilingual: settings.bilingual,subtitlePosition: settings.subtitlePosition,preferPlatformCaptions: settings.preferPlatformCaptions,- subtitleFont: 'system' as const,- subtitleSize: 'medium' as const,- subtitleColor: '#FFFFFF',+ subtitleFont: settings.subtitleFont ?? 'system',+ subtitleWeight: settings.subtitleWeight ?? 'bold',+ subtitleSize: settings.subtitleSize ?? 'medium',+ subtitleColor: settings.subtitleColor ?? '#FFFFFF',+ subtitleSecondaryColor: settings.subtitleSecondaryColor ?? '#FFD45C',+ subtitleOutlineColor: settings.subtitleOutlineColor ?? '#000000',+ subtitleOutlineWidth: settings.subtitleOutlineWidth ?? 2,+ subtitleShadowEnabled: settings.subtitleShadowEnabled ?? true,+ subtitleShadowColor: settings.subtitleShadowColor ?? '#000000',+ subtitleShadowOpacity: settings.subtitleShadowOpacity ?? 0.65,+ subtitleShadowOffsetX: settings.subtitleShadowOffsetX ?? 2,+ subtitleShadowOffsetY: settings.subtitleShadowOffsetY ?? 2,+ subtitleShadowBlur: settings.subtitleShadowBlur ?? 1,dubbing: settings.dubbing,- ttsProvider: 'openai' as const,- ttsModel: 'gpt-4o-mini-tts',+ ttsProvider: settings.ttsProvider ?? 'openai',+ ttsModel: settings.ttsModel ?? 'gpt-4o-mini-tts',voiceCode: settings.voiceCode,- voiceName: '',+ voiceName: settings.voiceName ?? '',composeVideo: settings.composeVideo,videoFormat: settings.videoFormat,verticalTitle: settings.verticalTitle,diff --git a/apps/web/src/features/dashboard/VideoTranslationWorkspace.control.test.tsx b/apps/web/src/features/dashboard/VideoTranslationWorkspace.control.test.tsxindex fa938484..00be844f 100644--- a/apps/web/src/features/dashboard/VideoTranslationWorkspace.control.test.tsx+++ b/apps/web/src/features/dashboard/VideoTranslationWorkspace.control.test.tsx@@ -12,6 +12,166 @@ import { CreatorSessionProvider, useCreatorSession } from './creator-session-stoimport VideoTranslationWorkspace from './VideoTranslationWorkspace.js';describe('VideoTranslationWorkspace task controls', () => {+ it('restores a video translation v1 job from legacy subtitle fields', () => {+ render(+ <LanguageProvider initialPreference="zh-CN">+ <CreatorSessionProvider+ initialJob={job({+ status: 'draft',+ revision: 0,+ stages: [],+ state: {+ currentStep: 2,+ furthestStep: 2,+ subtitleFont: 'serif',+ subtitleSize: 'large',+ subtitleColor: '#7EE7FF'+ }+ })}+ service={{ applyAction: vi.fn(), runAgentTurn: vi.fn() } as never}+ >+ <VideoTranslationWorkspace onBack={vi.fn()} />+ </CreatorSessionProvider>+ </LanguageProvider>+ );++ expect(screen.getByRole('combobox', { name: '字幕字体' })).toHaveValue('serif');+ expect(screen.getByRole('radio', { name: '大' })).toHaveAttribute('aria-checked', 'true');+ expect(screen.getByRole('button', { name: '#7EE7FF' })).toHaveAttribute('aria-pressed', 'true');+ });++ it('edits every subtitle style field and persists one structured patch', async () => {+ let currentJob = job({+ status: 'draft',+ revision: 0,+ stages: [],+ templateVersion: 2,+ state: {+ currentStep: 2,+ furthestStep: 2,+ subtitleStyle: {+ fontPreset: 'sans',+ fontWeight: 'bold',+ fontSize: 'medium',+ primaryColor: '#FFFFFF',+ secondaryColor: '#FFD45C',+ outlineColor: '#000000',+ outlineWidth: 2,+ shadow: {+ enabled: false,+ color: '#000000',+ opacity: 0.65,+ offsetX: 2,+ offsetY: 2,+ blur: 1+ }+ }+ }+ });+ const applyAction = vi.fn(async (_jobId: string, request: {+ action: string;+ input: { patch?: Record<string, CreatorJson> };+ }) => {+ currentJob = {+ ...currentJob,+ revision: currentJob.revision + 1,+ state: {+ ...currentJob.state,+ ...(request.input.patch ?? {})+ }+ };+ return {+ job: currentJob,+ receipt: {+ actor: 'user' as const,+ action: request.action,+ summary: request.action,+ affectedArtifacts: [],+ newRevision: currentJob.revision,+ createdAt: currentJob.updatedAt+ }+ };+ });++ render(+ <LanguageProvider initialPreference="zh-CN">+ <CreatorSessionProvider+ initialJob={currentJob}+ service={{ applyAction, runAgentTurn: vi.fn() } as never}+ >+ <VideoTranslationWorkspace onBack={vi.fn()} />+ </CreatorSessionProvider>+ </LanguageProvider>+ );++ fireEvent.change(screen.getByRole('combobox', { name: '字幕字体' }), {+ target: { value: 'rounded' }+ });+ fireEvent.click(screen.getByRole('radio', { name: '常规' }));+ fireEvent.click(screen.getByRole('radio', { name: '小' }));+ fireEvent.change(screen.getByLabelText('自定义译文颜色'), {+ target: { value: '#123456' }+ });+ fireEvent.change(screen.getByLabelText('原文颜色'), {+ target: { value: '#654321' }+ });+ fireEvent.change(screen.getByLabelText('描边颜色'), {+ target: { value: '#111111' }+ });+ fireEvent.change(screen.getByRole('spinbutton', { name: '描边宽度' }), {+ target: { value: '3.5' }+ });+ fireEvent.click(screen.getByRole('switch', { name: '字幕阴影' }));+ fireEvent.change(screen.getByLabelText('阴影颜色'), {+ target: { value: '#222222' }+ });+ fireEvent.change(screen.getByRole('spinbutton', { name: '不透明度' }), {+ target: { value: '0.4' }+ });+ fireEvent.change(screen.getByRole('spinbutton', { name: '水平偏移' }), {+ target: { value: '-4' }+ });+ fireEvent.change(screen.getByRole('spinbutton', { name: '垂直偏移' }), {+ target: { value: '6' }+ });+ fireEvent.change(screen.getByRole('spinbutton', { name: '模糊' }), {+ target: { value: '2.5' }+ });++ await waitFor(() => expect(applyAction).toHaveBeenCalledTimes(1));+ expect(applyAction).toHaveBeenCalledWith(+ 'job_control',+ expect.objectContaining({+ action: 'update-settings',+ input: expect.objectContaining({+ patch: expect.objectContaining({+ subtitleStyle: {+ fontPreset: 'rounded',+ fontWeight: 'regular',+ fontSize: 'small',+ primaryColor: '#123456',+ secondaryColor: '#654321',+ outlineColor: '#111111',+ outlineWidth: 3.5,+ shadow: {+ enabled: true,+ color: '#222222',+ opacity: 0.4,+ offsetX: -4,+ offsetY: 6,+ blur: 2.5+ }+ }+ })+ })+ })+ );+ const persistedPatch = applyAction.mock.calls[0]?.[1].input.patch ?? {};+ expect(persistedPatch).not.toHaveProperty('subtitleFont');+ expect(persistedPatch).not.toHaveProperty('subtitleSize');+ expect(persistedPatch).not.toHaveProperty('subtitleColor');+ });+it('offers the complete target language catalog without expanding unsupported source languages', () => {render(<LanguageProvider initialPreference="zh-CN">@@ -661,6 +821,7 @@ function job(input: {status: CreatorJob['status'];revision: number;stages: CreatorStageRun[];+ templateVersion?: number;state?: Record<string, CreatorJson>;artifacts?: CreatorArtifact[];}): CreatorJob {@@ -668,9 +829,10 @@ function job(input: {id: 'job_control',projectId: 'project_1',templateId: 'video-translation',- templateVersion: 1,+ templateVersion: input.templateVersion ?? 1,status: input.status,revision: input.revision,+ presetOrigin: null,state: {sourceType: 'url',sourceUrl: 'https://www.youtube.com/watch?v=job-control',diff --git a/apps/web/src/features/dashboard/VideoTranslationWorkspace.tsx b/apps/web/src/features/dashboard/VideoTranslationWorkspace.tsxindex eeffbb97..839c917a 100644--- a/apps/web/src/features/dashboard/VideoTranslationWorkspace.tsx+++ b/apps/web/src/features/dashboard/VideoTranslationWorkspace.tsx@@ -53,6 +53,7 @@ import {type SourceType = 'url' | 'file';type SubtitlePosition = 'top' | 'bottom';type SubtitleFont = 'system' | 'sans' | 'serif' | 'rounded';+type SubtitleWeight = 'regular' | 'medium' | 'bold';type SubtitleSize = 'small' | 'medium' | 'large';type VideoFormat = 'horizontal' | 'vertical' | 'all';type VideoOrientation = 'landscape' | 'portrait';@@ -69,8 +70,18 @@ type TranslationSettingsSnapshot = {subtitlePosition: SubtitlePosition;preferPlatformCaptions: boolean;subtitleFont: SubtitleFont;+ subtitleWeight: SubtitleWeight;subtitleSize: SubtitleSize;subtitleColor: string;+ subtitleSecondaryColor: string;+ subtitleOutlineColor: string;+ subtitleOutlineWidth: number;+ subtitleShadowEnabled: boolean;+ subtitleShadowColor: string;+ subtitleShadowOpacity: number;+ subtitleShadowOffsetX: number;+ subtitleShadowOffsetY: number;+ subtitleShadowBlur: number;dubbing: boolean;ttsProvider: CreatorTtsProvider;ttsModel: string;@@ -82,6 +93,23 @@ type TranslationSettingsSnapshot = {verticalSubtitle: string;};+type SubtitleStyleSettings = Pick<+ TranslationSettingsSnapshot,+ | 'subtitleFont'+ | 'subtitleWeight'+ | 'subtitleSize'+ | 'subtitleColor'+ | 'subtitleSecondaryColor'+ | 'subtitleOutlineColor'+ | 'subtitleOutlineWidth'+ | 'subtitleShadowEnabled'+ | 'subtitleShadowColor'+ | 'subtitleShadowOpacity'+ | 'subtitleShadowOffsetX'+ | 'subtitleShadowOffsetY'+ | 'subtitleShadowBlur'+>;+type TranslationSourceSnapshot = {sourceType: SourceType;videoUrl: string;@@ -116,6 +144,21 @@ type LanguageOption = {const steps = ['添加视频', '翻译设置', '字幕样式', '配音与输出'] as const;const subtitleColors = ['#FFFFFF', '#FFE45C', '#7EE7FF', '#A7F3D0'] as const;+const defaultSubtitleStyle: SubtitleStyleSettings = {+ subtitleFont: 'sans',+ subtitleWeight: 'bold',+ subtitleSize: 'medium',+ subtitleColor: '#FFFFFF',+ subtitleSecondaryColor: '#D1D5DB',+ subtitleOutlineColor: '#000000',+ subtitleOutlineWidth: 2.5,+ subtitleShadowEnabled: true,+ subtitleShadowColor: '#000000',+ subtitleShadowOpacity: 0.6,+ subtitleShadowOffsetX: 1.5,+ subtitleShadowOffsetY: 1.5,+ subtitleShadowBlur: 0.5+};const WORKSPACE_MIN_WIDTH = 780;const AGENT_MIN_WIDTH = 320;const WORKSPACE_RESIZE_HANDLE_WIDTH = 7;@@ -274,15 +317,23 @@ function subtitleSizeLabel(value: SubtitleSize, l: LocalizeCopy) {} as const)[value];}-function subtitleFontFamily(value: SubtitleFont) {+function subtitleWeightLabel(value: SubtitleWeight, l: LocalizeCopy) {return ({- system: 'inherit',- sans: 'Arial, Helvetica, sans-serif',- serif: 'Georgia, Times New Roman, serif',- rounded: 'Arial Rounded MT Bold, Nunito, sans-serif'+ regular: l('常规', 'Regular'),+ medium: l('中等', 'Medium'),+ bold: l('粗体', 'Bold')} as const)[value];}+function subtitleFontFamily(value: SubtitleFont, weight: SubtitleWeight) {+ const suffix = ({ regular: 'Regular', medium: 'Medium', bold: 'Bold' } as const)[weight];+ if (value === 'serif') return `"OpenCreator Serif ${suffix}", Georgia, serif`;+ if (value === 'rounded') {+ return `"OpenCreator Rounded ${suffix}", "OpenCreator Sans ${suffix}", system-ui, sans-serif`;+ }+ return `"OpenCreator Sans ${suffix}", system-ui, sans-serif`;+}+function localSourceFingerprint(source: TranslationSourceSnapshot) {return {name: source.videoFile?.name ?? source.videoFileName,@@ -307,9 +358,7 @@ function sameSettings(left: TranslationSettingsSnapshot, right: TranslationSetti&& left.bilingual === right.bilingual&& left.subtitlePosition === right.subtitlePosition&& left.preferPlatformCaptions === right.preferPlatformCaptions- && left.subtitleFont === right.subtitleFont- && left.subtitleSize === right.subtitleSize- && left.subtitleColor === right.subtitleColor+ && sameSubtitleStyle(left, right)&& left.dubbing === right.dubbing&& left.ttsProvider === right.ttsProvider&& left.ttsModel === right.ttsModel@@ -321,6 +370,25 @@ function sameSettings(left: TranslationSettingsSnapshot, right: TranslationSetti&& left.verticalSubtitle === right.verticalSubtitle;}+function sameSubtitleStyle(+ left: TranslationSettingsSnapshot,+ right: TranslationSettingsSnapshot+): boolean {+ return left.subtitleFont === right.subtitleFont+ && left.subtitleWeight === right.subtitleWeight+ && left.subtitleSize === right.subtitleSize+ && left.subtitleColor === right.subtitleColor+ && left.subtitleSecondaryColor === right.subtitleSecondaryColor+ && left.subtitleOutlineColor === right.subtitleOutlineColor+ && left.subtitleOutlineWidth === right.subtitleOutlineWidth+ && left.subtitleShadowEnabled === right.subtitleShadowEnabled+ && left.subtitleShadowColor === right.subtitleShadowColor+ && left.subtitleShadowOpacity === right.subtitleShadowOpacity+ && left.subtitleShadowOffsetX === right.subtitleShadowOffsetX+ && left.subtitleShadowOffsetY === right.subtitleShadowOffsetY+ && left.subtitleShadowBlur === right.subtitleShadowBlur;+}+function canReuseSubtitleCues(version: TranslationResultVersion,settings: TranslationSettingsSnapshot,@@ -341,9 +409,7 @@ function translationChanges(const subtitleInputsChanged = !canReuseSubtitleCues(version, settings, source)|| version.settings.bilingual !== settings.bilingual|| version.settings.subtitlePosition !== settings.subtitlePosition;- const subtitleStyleChanged = version.settings.subtitleFont !== settings.subtitleFont- || version.settings.subtitleSize !== settings.subtitleSize- || version.settings.subtitleColor !== settings.subtitleColor;+ const subtitleStyleChanged = !sameSubtitleStyle(version.settings, settings);const voiceChanged = version.settings.dubbing !== settings.dubbing|| version.settings.ttsProvider !== settings.ttsProvider|| version.settings.ttsModel !== settings.ttsModel@@ -494,18 +560,7 @@ function deserializeResultVersions(value: CreatorJson | undefined): TranslationRbilingual: settingsRecord.bilingual,subtitlePosition: settingsRecord.subtitlePosition,preferPlatformCaptions: settingsRecord.preferPlatformCaptions,- subtitleFont: settingsRecord.subtitleFont === 'sans'- || settingsRecord.subtitleFont === 'serif'- || settingsRecord.subtitleFont === 'rounded'- ? settingsRecord.subtitleFont- : 'system',- subtitleSize: settingsRecord.subtitleSize === 'small'- || settingsRecord.subtitleSize === 'large'- ? settingsRecord.subtitleSize- : 'medium',- subtitleColor: typeof settingsRecord.subtitleColor === 'string'- ? settingsRecord.subtitleColor- : '#FFFFFF',+ ...readSubtitleStyleSettings(settingsRecord, {}, undefined),dubbing: settingsRecord.dubbing,ttsProvider: isTtsProvider(settingsRecord.ttsProvider)? settingsRecord.ttsProvider@@ -783,15 +838,7 @@ function legacyResultVersionsFromArtifacts(preferPlatformCaptions: typeof sourceState.preferPlatformCaptions === 'boolean'? sourceState.preferPlatformCaptions: persisted?.settings.preferPlatformCaptions ?? true,- subtitleFont: readSubtitleFontSetting(sourceState, fallbackState, persisted),- subtitleSize: readSubtitleSizeSetting(sourceState, fallbackState, persisted),- subtitleColor: readStringSetting(- sourceState,- fallbackState,- persisted,- 'subtitleColor',- '#FFFFFF'- ),+ ...readSubtitleStyleSettings(sourceState, fallbackState, persisted),dubbing: typeof sourceState.dubbing === 'boolean'? sourceState.dubbing: persisted?.settings.dubbing ?? false,@@ -909,15 +956,7 @@ function resultVersionFromSnapshot('preferPlatformCaptions',true),- subtitleFont: readSubtitleFontSetting(sourceState, fallbackState, persisted),- subtitleSize: readSubtitleSizeSetting(sourceState, fallbackState, persisted),- subtitleColor: readStringSetting(- sourceState,- fallbackState,- persisted,- 'subtitleColor',- '#FFFFFF'- ),+ ...readSubtitleStyleSettings(sourceState, fallbackState, persisted),dubbing: readBooleanSetting(sourceState, fallbackState, persisted, 'dubbing', false),ttsProvider: readTtsProviderSetting(sourceState, fallbackState, persisted),ttsModel: readStringSetting(sourceState, fallbackState, persisted, 'ttsModel', ''),@@ -988,26 +1027,133 @@ function isTtsProvider(value: unknown): value is CreatorTtsProvider {|| value === 'edge-tts';}-function readSubtitleFontSetting(+function readSubtitleStyleSettings(state: Record<string, CreatorJson>,fallback: Record<string, CreatorJson>,persisted: TranslationResultVersion | undefined-): SubtitleFont {- const value = state.subtitleFont ?? fallback.subtitleFont;- return value === 'sans' || value === 'serif' || value === 'rounded'+): SubtitleStyleSettings {+ const style = readJsonRecord(state.subtitleStyle);+ const fallbackStyle = readJsonRecord(fallback.subtitleStyle);+ const shadow = readJsonRecord(style.shadow);+ const fallbackShadow = readJsonRecord(fallbackStyle.shadow);+ const settings = persisted?.settings;+ const fontValue = style.fontPreset ?? state.subtitleFont+ ?? fallbackStyle.fontPreset ?? fallback.subtitleFont;+ const weightValue = style.fontWeight ?? state.subtitleWeight+ ?? fallbackStyle.fontWeight ?? fallback.subtitleWeight;+ const sizeValue = style.fontSize ?? state.subtitleSize+ ?? fallbackStyle.fontSize ?? fallback.subtitleSize;+ return {+ subtitleFont: isSubtitleFont(fontValue)+ ? fontValue+ : settings?.subtitleFont ?? defaultSubtitleStyle.subtitleFont,+ subtitleWeight: isSubtitleWeight(weightValue)+ ? weightValue+ : settings?.subtitleWeight ?? defaultSubtitleStyle.subtitleWeight,+ subtitleSize: isSubtitleSize(sizeValue)+ ? sizeValue+ : settings?.subtitleSize ?? defaultSubtitleStyle.subtitleSize,+ subtitleColor: readSubtitleColor(+ style.primaryColor ?? state.subtitleColor+ ?? fallbackStyle.primaryColor ?? fallback.subtitleColor,+ settings?.subtitleColor ?? defaultSubtitleStyle.subtitleColor+ ),+ subtitleSecondaryColor: readSubtitleColor(+ style.secondaryColor ?? state.subtitleSecondaryColor+ ?? fallbackStyle.secondaryColor ?? fallback.subtitleSecondaryColor,+ settings?.subtitleSecondaryColor ?? defaultSubtitleStyle.subtitleSecondaryColor+ ),+ subtitleOutlineColor: readSubtitleColor(+ style.outlineColor ?? state.subtitleOutlineColor+ ?? fallbackStyle.outlineColor ?? fallback.subtitleOutlineColor,+ settings?.subtitleOutlineColor ?? defaultSubtitleStyle.subtitleOutlineColor+ ),+ subtitleOutlineWidth: readBoundedNumber(+ style.outlineWidth ?? state.subtitleOutlineWidth+ ?? fallbackStyle.outlineWidth ?? fallback.subtitleOutlineWidth,+ 0,+ 8,+ settings?.subtitleOutlineWidth ?? defaultSubtitleStyle.subtitleOutlineWidth+ ),+ subtitleShadowEnabled: readBooleanValue(+ shadow.enabled ?? state.subtitleShadowEnabled+ ?? fallbackShadow.enabled ?? fallback.subtitleShadowEnabled,+ settings?.subtitleShadowEnabled ?? defaultSubtitleStyle.subtitleShadowEnabled+ ),+ subtitleShadowColor: readSubtitleColor(+ shadow.color ?? state.subtitleShadowColor+ ?? fallbackShadow.color ?? fallback.subtitleShadowColor,+ settings?.subtitleShadowColor ?? defaultSubtitleStyle.subtitleShadowColor+ ),+ subtitleShadowOpacity: readBoundedNumber(+ shadow.opacity ?? state.subtitleShadowOpacity+ ?? fallbackShadow.opacity ?? fallback.subtitleShadowOpacity,+ 0,+ 1,+ settings?.subtitleShadowOpacity ?? defaultSubtitleStyle.subtitleShadowOpacity+ ),+ subtitleShadowOffsetX: readBoundedNumber(+ shadow.offsetX ?? state.subtitleShadowOffsetX+ ?? fallbackShadow.offsetX ?? fallback.subtitleShadowOffsetX,+ -20,+ 20,+ settings?.subtitleShadowOffsetX ?? defaultSubtitleStyle.subtitleShadowOffsetX+ ),+ subtitleShadowOffsetY: readBoundedNumber(+ shadow.offsetY ?? state.subtitleShadowOffsetY+ ?? fallbackShadow.offsetY ?? fallback.subtitleShadowOffsetY,+ -20,+ 20,+ settings?.subtitleShadowOffsetY ?? defaultSubtitleStyle.subtitleShadowOffsetY+ ),+ subtitleShadowBlur: readBoundedNumber(+ shadow.blur ?? state.subtitleShadowBlur+ ?? fallbackShadow.blur ?? fallback.subtitleShadowBlur,+ 0,+ 10,+ settings?.subtitleShadowBlur ?? defaultSubtitleStyle.subtitleShadowBlur+ )+ };+}++function readJsonRecord(value: CreatorJson | undefined): Record<string, CreatorJson> {+ return value !== null && value !== undefined && typeof value === 'object' && !Array.isArray(value)? value- : persisted?.settings.subtitleFont ?? 'system';+ : {};}-function readSubtitleSizeSetting(- state: Record<string, CreatorJson>,- fallback: Record<string, CreatorJson>,- persisted: TranslationResultVersion | undefined-): SubtitleSize {- const value = state.subtitleSize ?? fallback.subtitleSize;- return value === 'small' || value === 'large'+function isSubtitleFont(value: unknown): value is SubtitleFont {+ return value === 'system' || value === 'sans' || value === 'serif' || value === 'rounded';+}++function isSubtitleWeight(value: unknown): value is SubtitleWeight {+ return value === 'regular' || value === 'medium' || value === 'bold';+}++function isSubtitleSize(value: unknown): value is SubtitleSize {+ return value === 'small' || value === 'medium' || value === 'large';+}++function readSubtitleColor(value: unknown, fallback: string): string {+ return typeof value === 'string' && /^#[0-9A-Fa-f]{6}$/.test(value)+ ? value.toUpperCase()+ : fallback;+}++function readBoundedNumber(+ value: unknown,+ minimum: number,+ maximum: number,+ fallback: number+): number {+ return typeof value === 'number' && Number.isFinite(value)+ && value >= minimum && value <= maximum? value- : persisted?.settings.subtitleSize ?? 'medium';+ : fallback;+}++function readBooleanValue(value: unknown, fallback: boolean): boolean {+ return typeof value === 'boolean' ? value : fallback;}function readBooleanSetting(@@ -1263,9 +1409,19 @@ export default function VideoTranslationWorkspace(props: {const [bilingual, setBilingual] = useState(true);const [subtitlePosition, setSubtitlePosition] = useState<SubtitlePosition>('top');const [preferPlatformCaptions, setPreferPlatformCaptions] = useState(true);- const [subtitleFont, setSubtitleFont] = useState<SubtitleFont>('system');- const [subtitleSize, setSubtitleSize] = useState<SubtitleSize>('medium');- const [subtitleColor, setSubtitleColor] = useState('#FFFFFF');+ const [subtitleFont, setSubtitleFont] = useState<SubtitleFont>(defaultSubtitleStyle.subtitleFont);+ const [subtitleWeight, setSubtitleWeight] = useState<SubtitleWeight>(defaultSubtitleStyle.subtitleWeight);+ const [subtitleSize, setSubtitleSize] = useState<SubtitleSize>(defaultSubtitleStyle.subtitleSize);+ const [subtitleColor, setSubtitleColor] = useState(defaultSubtitleStyle.subtitleColor);+ const [subtitleSecondaryColor, setSubtitleSecondaryColor] = useState(defaultSubtitleStyle.subtitleSecondaryColor);+ const [subtitleOutlineColor, setSubtitleOutlineColor] = useState(defaultSubtitleStyle.subtitleOutlineColor);+ const [subtitleOutlineWidth, setSubtitleOutlineWidth] = useState(defaultSubtitleStyle.subtitleOutlineWidth);+ const [subtitleShadowEnabled, setSubtitleShadowEnabled] = useState(defaultSubtitleStyle.subtitleShadowEnabled);+ const [subtitleShadowColor, setSubtitleShadowColor] = useState(defaultSubtitleStyle.subtitleShadowColor);+ const [subtitleShadowOpacity, setSubtitleShadowOpacity] = useState(defaultSubtitleStyle.subtitleShadowOpacity);+ const [subtitleShadowOffsetX, setSubtitleShadowOffsetX] = useState(defaultSubtitleStyle.subtitleShadowOffsetX);+ const [subtitleShadowOffsetY, setSubtitleShadowOffsetY] = useState(defaultSubtitleStyle.subtitleShadowOffsetY);+ const [subtitleShadowBlur, setSubtitleShadowBlur] = useState(defaultSubtitleStyle.subtitleShadowBlur);const [dubbing, setDubbing] = useState(false);const [ttsProvider, setTtsProvider] = useState<CreatorTtsProvider>('openai');const [ttsModel, setTtsModel] = useState('gpt-4o-mini-tts');@@ -1314,22 +1470,20 @@ export default function VideoTranslationWorkspace(props: {if (typeof persisted.bilingual === 'boolean') setBilingual(persisted.bilingual);if (persisted.subtitlePosition === 'top' || persisted.subtitlePosition === 'bottom') setSubtitlePosition(persisted.subtitlePosition);if (typeof persisted.preferPlatformCaptions === 'boolean') setPreferPlatformCaptions(persisted.preferPlatformCaptions);- if (- persisted.subtitleFont === 'system'- || persisted.subtitleFont === 'sans'- || persisted.subtitleFont === 'serif'- || persisted.subtitleFont === 'rounded'- ) {- setSubtitleFont(persisted.subtitleFont);- }- if (- persisted.subtitleSize === 'small'- || persisted.subtitleSize === 'medium'- || persisted.subtitleSize === 'large'- ) {- setSubtitleSize(persisted.subtitleSize);- }- if (typeof persisted.subtitleColor === 'string') setSubtitleColor(persisted.subtitleColor);+ const persistedSubtitleStyle = readSubtitleStyleSettings(persisted, {}, undefined);+ setSubtitleFont(persistedSubtitleStyle.subtitleFont);+ setSubtitleWeight(persistedSubtitleStyle.subtitleWeight);+ setSubtitleSize(persistedSubtitleStyle.subtitleSize);+ setSubtitleColor(persistedSubtitleStyle.subtitleColor);+ setSubtitleSecondaryColor(persistedSubtitleStyle.subtitleSecondaryColor);+ setSubtitleOutlineColor(persistedSubtitleStyle.subtitleOutlineColor);+ setSubtitleOutlineWidth(persistedSubtitleStyle.subtitleOutlineWidth);+ setSubtitleShadowEnabled(persistedSubtitleStyle.subtitleShadowEnabled);+ setSubtitleShadowColor(persistedSubtitleStyle.subtitleShadowColor);+ setSubtitleShadowOpacity(persistedSubtitleStyle.subtitleShadowOpacity);+ setSubtitleShadowOffsetX(persistedSubtitleStyle.subtitleShadowOffsetX);+ setSubtitleShadowOffsetY(persistedSubtitleStyle.subtitleShadowOffsetY);+ setSubtitleShadowBlur(persistedSubtitleStyle.subtitleShadowBlur);if (typeof persisted.dubbing === 'boolean') setDubbing(persisted.dubbing);if (isTtsProvider(persisted.ttsProvider)) setTtsProvider(persisted.ttsProvider);if (typeof persisted.ttsModel === 'string') setTtsModel(persisted.ttsModel);@@ -1426,6 +1580,23 @@ export default function VideoTranslationWorkspace(props: {|| creatorSession.state.sourceFileName !== undefined|| creatorSession.state.sourceFileSize !== undefined|| creatorSession.state.sourceFileLastModified !== undefined;+ const subtitleStyle = {+ fontPreset: subtitleFont,+ fontWeight: subtitleWeight,+ fontSize: subtitleSize,+ primaryColor: subtitleColor,+ secondaryColor: subtitleSecondaryColor,+ outlineColor: subtitleOutlineColor,+ outlineWidth: subtitleOutlineWidth,+ shadow: {+ enabled: subtitleShadowEnabled,+ color: subtitleShadowColor,+ opacity: subtitleShadowOpacity,+ offsetX: subtitleShadowOffsetX,+ offsetY: subtitleShadowOffsetY,+ blur: subtitleShadowBlur+ }+ } as const;const next = {sourceType,sourceUrl: videoUrl,@@ -1441,9 +1612,9 @@ export default function VideoTranslationWorkspace(props: {bilingual,subtitlePosition,preferPlatformCaptions,- subtitleFont,- subtitleSize,- subtitleColor,+ ...(creatorSession.job.templateVersion >= 2+ ? { subtitleStyle }+ : { subtitleFont, subtitleSize, subtitleColor }),dubbing,ttsProvider,ttsModel,@@ -1490,7 +1661,17 @@ export default function VideoTranslationWorkspace(props: {sourceType,subtitleColor,subtitleFont,+ subtitleOutlineColor,+ subtitleOutlineWidth,+ subtitleSecondaryColor,+ subtitleShadowBlur,+ subtitleShadowColor,+ subtitleShadowEnabled,+ subtitleShadowOffsetX,+ subtitleShadowOffsetY,+ subtitleShadowOpacity,subtitleSize,+ subtitleWeight,subtitlePosition,targetLanguage,ttsModel,@@ -1620,7 +1801,7 @@ export default function VideoTranslationWorkspace(props: {?? registeredSourceFile?.name?? l('等待上传视频', 'Waiting for an upload'));const outputLabel = outputLabelFor({ composeVideo, videoFormat }, l);- const subtitleStyleLabel = `${subtitleFontLabel(subtitleFont, l)} · ${subtitleSizeLabel(subtitleSize, l)} · ${subtitleColor.toUpperCase()}`;+ const subtitleStyleLabel = `${subtitleFontLabel(subtitleFont, l)} · ${subtitleWeightLabel(subtitleWeight, l)} · ${subtitleSizeLabel(subtitleSize, l)} · ${subtitleColor.toUpperCase()}`;const summaryItems = useMemo(() => [{ label: l('翻译语言', 'Languages'), value: `${languageLabel(sourceLanguages, sourceLanguage)} → ${languageLabel(targetLanguages, targetLanguage)}` },{ label: l('字幕', 'Subtitles'), value: bilingual ? l(`双语 · 译文在${subtitlePosition === 'top' ? '上' : '下'}`, `Bilingual · translation ${subtitlePosition === 'top' ? 'above' : 'below'}`) : l('仅译文', 'Translation only') },@@ -1861,7 +2042,7 @@ export default function VideoTranslationWorkspace(props: {? outputLabelFor(selectedResultSettings, l): outputLabel;const selectedSubtitleStyleLabel = selectedResultSettings- ? `${subtitleFontLabel(selectedResultSettings.subtitleFont, l)} · ${subtitleSizeLabel(selectedResultSettings.subtitleSize, l)} · ${selectedResultSettings.subtitleColor.toUpperCase()}`+ ? `${subtitleFontLabel(selectedResultSettings.subtitleFont, l)} · ${subtitleWeightLabel(selectedResultSettings.subtitleWeight, l)} · ${subtitleSizeLabel(selectedResultSettings.subtitleSize, l)} · ${selectedResultSettings.subtitleColor.toUpperCase()}`: subtitleStyleLabel;const selectedSourceName = selectedResultSource?.sourceType === 'url'? (selectedResultSource.videoUrl.trim() || l('等待填写链接', 'Waiting for a link'))@@ -1922,8 +2103,18 @@ export default function VideoTranslationWorkspace(props: {subtitlePosition,preferPlatformCaptions,subtitleFont,+ subtitleWeight,subtitleSize,subtitleColor,+ subtitleSecondaryColor,+ subtitleOutlineColor,+ subtitleOutlineWidth,+ subtitleShadowEnabled,+ subtitleShadowColor,+ subtitleShadowOpacity,+ subtitleShadowOffsetX,+ subtitleShadowOffsetY,+ subtitleShadowBlur,dubbing,ttsProvider,ttsModel,@@ -1954,8 +2145,18 @@ export default function VideoTranslationWorkspace(props: {setSubtitlePosition(settings.subtitlePosition);setPreferPlatformCaptions(settings.preferPlatformCaptions);setSubtitleFont(settings.subtitleFont);+ setSubtitleWeight(settings.subtitleWeight);setSubtitleSize(settings.subtitleSize);setSubtitleColor(settings.subtitleColor);+ setSubtitleSecondaryColor(settings.subtitleSecondaryColor);+ setSubtitleOutlineColor(settings.subtitleOutlineColor);+ setSubtitleOutlineWidth(settings.subtitleOutlineWidth);+ setSubtitleShadowEnabled(settings.subtitleShadowEnabled);+ setSubtitleShadowColor(settings.subtitleShadowColor);+ setSubtitleShadowOpacity(settings.subtitleShadowOpacity);+ setSubtitleShadowOffsetX(settings.subtitleShadowOffsetX);+ setSubtitleShadowOffsetY(settings.subtitleShadowOffsetY);+ setSubtitleShadowBlur(settings.subtitleShadowBlur);setDubbing(settings.dubbing);setTtsProvider(settings.ttsProvider);setTtsModel(settings.ttsModel);@@ -2740,6 +2941,23 @@ export default function VideoTranslationWorkspace(props: {</div></label>+ <div className="video-translation-style-control">+ <span>{l('字重', 'Font weight')}</span>+ <div className="video-translation-size-options" role="radiogroup" aria-label={l('字幕字重', 'Subtitle font weight')}>+ {(['regular', 'medium', 'bold'] as const).map(weight => (+ <button+ type="button"+ role="radio"+ aria-checked={subtitleWeight === weight}+ key={weight}+ onClick={() => setSubtitleWeight(weight)}+ >+ {subtitleWeightLabel(weight, l)}+ </button>+ ))}+ </div>+ </div>+<div className="video-translation-style-control"><span>{l('字幕大小', 'Subtitle size')}</span><div className="video-translation-size-options" role="radiogroup" aria-label={l('字幕大小', 'Subtitle size')}>@@ -2758,7 +2976,7 @@ export default function VideoTranslationWorkspace(props: {</div><div className="video-translation-style-control">- <span>{l('字幕颜色', 'Subtitle color')}</span>+ <span>{l('译文颜色', 'Translation color')}</span><div className="video-translation-color-options">{subtitleColors.map(color => (<button@@ -2775,7 +2993,7 @@ export default function VideoTranslationWorkspace(props: {<label className="video-translation-custom-color" title={l('自定义颜色', 'Custom color')}><inputtype="color"- aria-label={l('自定义字幕颜色', 'Custom subtitle color')}+ aria-label={l('自定义译文颜色', 'Custom translation color')}value={subtitleColor}onChange={event => setSubtitleColor(event.target.value.toUpperCase())}/>@@ -2783,6 +3001,104 @@ export default function VideoTranslationWorkspace(props: {</label></div></div>++ <div className="video-translation-style-fields">+ <label className="video-translation-field video-translation-color-field">+ <span>{l('原文颜色', 'Original color')}</span>+ <input+ type="color"+ aria-label={l('原文颜色', 'Original color')}+ value={subtitleSecondaryColor}+ onChange={event => setSubtitleSecondaryColor(event.target.value.toUpperCase())}+ />+ </label>+ <label className="video-translation-field video-translation-color-field">+ <span>{l('描边颜色', 'Outline color')}</span>+ <input+ type="color"+ aria-label={l('描边颜色', 'Outline color')}+ value={subtitleOutlineColor}+ onChange={event => setSubtitleOutlineColor(event.target.value.toUpperCase())}+ />+ </label>+ <label className="video-translation-field">+ <span>{l('描边宽度', 'Outline width')}</span>+ <input+ type="number"+ min="0"+ max="8"+ step="0.5"+ value={subtitleOutlineWidth}+ onChange={event => setSubtitleOutlineWidth(Number(event.target.value))}+ />+ </label>+ </div>++ <div className="video-translation-shadow-settings">+ <Switch+ checked={subtitleShadowEnabled}+ label={l('字幕阴影', 'Subtitle shadow')}+ description={l('为字幕增加可控阴影,提高复杂画面上的可读性', 'Add a controlled shadow for readability on detailed footage')}+ onChange={setSubtitleShadowEnabled}+ />+ {subtitleShadowEnabled ? (+ <div className="video-translation-style-fields">+ <label className="video-translation-field video-translation-color-field">+ <span>{l('阴影颜色', 'Shadow color')}</span>+ <input+ type="color"+ aria-label={l('阴影颜色', 'Shadow color')}+ value={subtitleShadowColor}+ onChange={event => setSubtitleShadowColor(event.target.value.toUpperCase())}+ />+ </label>+ <label className="video-translation-field">+ <span>{l('不透明度', 'Opacity')}</span>+ <input+ type="number"+ min="0"+ max="1"+ step="0.05"+ value={subtitleShadowOpacity}+ onChange={event => setSubtitleShadowOpacity(Number(event.target.value))}+ />+ </label>+ <label className="video-translation-field">+ <span>{l('水平偏移', 'Horizontal offset')}</span>+ <input+ type="number"+ min="-20"+ max="20"+ step="1"+ value={subtitleShadowOffsetX}+ onChange={event => setSubtitleShadowOffsetX(Number(event.target.value))}+ />+ </label>+ <label className="video-translation-field">+ <span>{l('垂直偏移', 'Vertical offset')}</span>+ <input+ type="number"+ min="-20"+ max="20"+ step="1"+ value={subtitleShadowOffsetY}+ onChange={event => setSubtitleShadowOffsetY(Number(event.target.value))}+ />+ </label>+ <label className="video-translation-field">+ <span>{l('模糊', 'Blur')}</span>+ <input+ type="number"+ min="0"+ max="10"+ step="0.5"+ value={subtitleShadowBlur}+ onChange={event => setSubtitleShadowBlur(Number(event.target.value))}+ />+ </label>+ </div>+ ) : null}+ </div></div><div@@ -2795,8 +3111,15 @@ export default function VideoTranslationWorkspace(props: {<divstyle={{'--subtitle-preview-color': subtitleColor,+ '--subtitle-preview-secondary-color': subtitleSecondaryColor,+ '--subtitle-preview-outline-color': subtitleOutlineColor,+ '--subtitle-preview-outline-width': `${subtitleOutlineWidth}px`,+ '--subtitle-preview-shadow': subtitleShadowEnabled+ ? `${subtitleShadowOffsetX}px ${subtitleShadowOffsetY}px ${subtitleShadowBlur}px color-mix(in srgb, ${subtitleShadowColor} ${Math.round(subtitleShadowOpacity * 100)}%, transparent)`+ : 'none','--subtitle-preview-font-size': ({ small: '14px', medium: '16px', large: '18px' } as const)[subtitleSize],- '--subtitle-preview-font-family': subtitleFontFamily(subtitleFont)+ '--subtitle-preview-font-family': subtitleFontFamily(subtitleFont, subtitleWeight),+ '--subtitle-preview-font-weight': ({ regular: 400, medium: 500, bold: 700 } as const)[subtitleWeight]} as CSSProperties}>{bilingual && subtitlePosition === 'bottom' ? (diff --git a/apps/web/src/features/dashboard/creator-session-store.test.tsx b/apps/web/src/features/dashboard/creator-session-store.test.tsxindex 17b8e87b..52d41fc3 100644--- a/apps/web/src/features/dashboard/creator-session-store.test.tsx+++ b/apps/web/src/features/dashboard/creator-session-store.test.tsx@@ -15,6 +15,7 @@ function job(revision: number, state: Record<string, any>): CreatorJob {templateVersion: 1,status: 'draft',revision,+ presetOrigin: null,state,agentThreadId: null,stages: [],diff --git a/apps/web/src/features/dashboard/creator-workspace.test.ts b/apps/web/src/features/dashboard/creator-workspace.test.tsnew file mode 100644index 00000000..01546383--- /dev/null+++ b/apps/web/src/features/dashboard/creator-workspace.test.ts@@ -0,0 +1,28 @@+import { describe, expect, it } from 'vitest';+import {+ creatorPresetWorkspaces,+ creatorTemplateForWorkspace,+ creatorTemplateVersionForWorkspace,+ creatorWorkspaceForTemplate+} from './creator-workspace.js';++describe('creator workspace contract', () => {+ it('uses the shared public preset workspace identity', () => {+ expect(creatorPresetWorkspaces).toEqual([+ 'video-translation',+ 'video-download',+ 'image-generation',+ 'video-generation',+ 'cover-generator',+ 'smart-dubbing'+ ]);+ expect(creatorTemplateForWorkspace('cover-generator')).toBe('cover');+ expect(creatorTemplateVersionForWorkspace('video-translation')).toBe(2);+ expect(creatorTemplateVersionForWorkspace('video-download')).toBe(2);+ expect(creatorTemplateVersionForWorkspace('image-generation')).toBe(2);+ expect(creatorTemplateVersionForWorkspace('cover-generator')).toBe(2);+ expect(creatorTemplateVersionForWorkspace('video-generation')).toBe(1);+ expect(creatorTemplateVersionForWorkspace('smart-dubbing')).toBe(1);+ expect(creatorWorkspaceForTemplate('cover')).toBe('cover-generator');+ });+});diff --git a/apps/web/src/features/dashboard/creator-workspace.ts b/apps/web/src/features/dashboard/creator-workspace.tsindex 356f51c7..03042d1a 100644--- a/apps/web/src/features/dashboard/creator-workspace.ts+++ b/apps/web/src/features/dashboard/creator-workspace.ts@@ -1,3 +1,11 @@+import {+ creatorRuntimeWorkspaces as creatorPresetWorkspaces,+ type CreatorRuntimeWorkspace as CreatorPresetWorkspace+} from '@opencreator/protocol';++export { creatorPresetWorkspaces };+export type { CreatorPresetWorkspace };+export type CreatorWorkspace =| 'video-translation'| 'video-download'@@ -30,19 +38,6 @@ export const visibleCreatorWorkspaces = ['video-generation'] as const satisfies readonly CreatorWorkspace[];-export const creatorRuntimeWorkspaces = [- 'video-translation',- 'video-download',- 'stickman-video',- 'auto-clips',- 'smart-dubbing',- 'cover-generator',- 'image-generation',- 'video-generation'-] as const satisfies readonly CreatorWorkspace[];--export type CreatorRuntimeWorkspace = typeof creatorRuntimeWorkspaces[number];-const templateByWorkspace: Record<CreatorRuntimeWorkspace, string> = {'video-translation': 'video-translation','video-download': 'video-download',@@ -54,10 +49,35 @@ const templateByWorkspace: Record<CreatorRuntimeWorkspace, string> = {'video-generation': 'video-generation'};+const templateVersionByWorkspace: Record<CreatorRuntimeWorkspace, number> = {+ 'video-translation': 2,+ 'video-download': 2,+ 'stickman-video': 1,+ 'auto-clips': 1,+ 'smart-dubbing': 1,+ 'cover-generator': 2,+ 'image-generation': 2,+ 'video-generation': 1+};++export const creatorRuntimeWorkspaces = [+ ...creatorPresetWorkspaces,+ 'stickman-video',+ 'auto-clips'+] as const satisfies readonly CreatorWorkspace[];++export type CreatorRuntimeWorkspace = typeof creatorRuntimeWorkspaces[number];+export function isCreatorWorkspace(value: string): value is CreatorWorkspace {return creatorWorkspaces.includes(value as CreatorWorkspace);}+export function isCreatorPresetWorkspace(+ value: string+): value is CreatorPresetWorkspace {+ return creatorPresetWorkspaces.includes(value as CreatorPresetWorkspace);+}+export function isVisibleCreatorWorkspace(workspace: CreatorWorkspace): boolean {return visibleCreatorWorkspaces.includes(workspace as typeof visibleCreatorWorkspaces[number]@@ -68,6 +88,12 @@ export function creatorTemplateForWorkspace(workspace: CreatorRuntimeWorkspace):return templateByWorkspace[workspace];}+export function creatorTemplateVersionForWorkspace(+ workspace: CreatorRuntimeWorkspace+): number {+ return templateVersionByWorkspace[workspace];+}+export function creatorWorkspaceForTemplate(templateId: string): CreatorRuntimeWorkspace | undefined {return creatorRuntimeWorkspaces.find(workspace => templateByWorkspace[workspace] === templateId);}diff --git a/apps/web/src/features/dashboard/dashboard.css b/apps/web/src/features/dashboard/dashboard.cssindex e8ada0b0..3c17e618 100644--- a/apps/web/src/features/dashboard/dashboard.css+++ b/apps/web/src/features/dashboard/dashboard.css@@ -1,3 +1,75 @@+@font-face {+ font-family: "OpenCreator Sans Regular";+ src: url("/fonts/opencreator/OpenCreatorSans-Regular.woff2") format("woff2");+ font-display: swap;+ font-style: normal;+ font-weight: 400;+}++@font-face {+ font-family: "OpenCreator Sans Medium";+ src: url("/fonts/opencreator/OpenCreatorSans-Medium.woff2") format("woff2");+ font-display: swap;+ font-style: normal;+ font-weight: 500;+}++@font-face {+ font-family: "OpenCreator Sans Bold";+ src: url("/fonts/opencreator/OpenCreatorSans-Bold.woff2") format("woff2");+ font-display: swap;+ font-style: normal;+ font-weight: 700;+}++@font-face {+ font-family: "OpenCreator Serif Regular";+ src: url("/fonts/opencreator/OpenCreatorSerif-Regular.woff2") format("woff2");+ font-display: swap;+ font-style: normal;+ font-weight: 400;+}++@font-face {+ font-family: "OpenCreator Serif Medium";+ src: url("/fonts/opencreator/OpenCreatorSerif-Medium.woff2") format("woff2");+ font-display: swap;+ font-style: normal;+ font-weight: 500;+}++@font-face {+ font-family: "OpenCreator Serif Bold";+ src: url("/fonts/opencreator/OpenCreatorSerif-Bold.woff2") format("woff2");+ font-display: swap;+ font-style: normal;+ font-weight: 700;+}++@font-face {+ font-family: "OpenCreator Rounded Regular";+ src: url("/fonts/opencreator/OpenCreatorRounded-Regular.woff2") format("woff2");+ font-display: swap;+ font-style: normal;+ font-weight: 400;+}++@font-face {+ font-family: "OpenCreator Rounded Medium";+ src: url("/fonts/opencreator/OpenCreatorRounded-Medium.woff2") format("woff2");+ font-display: swap;+ font-style: normal;+ font-weight: 500;+}++@font-face {+ font-family: "OpenCreator Rounded Bold";+ src: url("/fonts/opencreator/OpenCreatorRounded-Bold.woff2") format("woff2");+ font-display: swap;+ font-style: normal;+ font-weight: 700;+}+.creator-tools-page {height: 100%;overflow: auto;@@ -966,7 +1038,7 @@.video-translation-subtitle-controls {display: grid;align-content: start;- gap: 18px;+ gap: 16px;}.video-translation-style-control {@@ -1062,6 +1134,25 @@border-radius: 50%;}+.video-translation-style-fields {+ display: grid;+ grid-template-columns: repeat(2, minmax(0, 1fr));+ gap: 10px;+}++.video-translation-color-field input[type="color"] {+ width: 100%;+ min-height: 36px;+ padding: 3px;+}++.video-translation-shadow-settings {+ display: grid;+ gap: 10px;+ padding-top: 4px;+ border-top: 1px solid var(--border-hairline);+}+.video-translation-subtitle-preview {min-width: 0;display: grid;@@ -1102,19 +1193,21 @@max-width: 100%;line-height: 1.35;overflow-wrap: anywhere;- text-shadow: 0 1px 3px #000000, 0 0 2px #000000;+ -webkit-text-stroke: var(--subtitle-preview-outline-width) var(--subtitle-preview-outline-color);+ paint-order: stroke fill;+ text-shadow: var(--subtitle-preview-shadow);}.video-translation-subtitle-preview small {- color: #ffffff;+ color: var(--subtitle-preview-secondary-color);font-size: 13px;- font-weight: 550;+ font-weight: var(--subtitle-preview-font-weight);}.video-translation-subtitle-preview strong {color: var(--subtitle-preview-color);font-size: var(--subtitle-preview-font-size);- font-weight: 700;+ font-weight: var(--subtitle-preview-font-weight);}.video-translation-summary {diff --git a/apps/web/src/features/projects/ProjectsPage.test.tsx b/apps/web/src/features/projects/ProjectsPage.test.tsxindex 78515058..689733e3 100644--- a/apps/web/src/features/projects/ProjectsPage.test.tsx+++ b/apps/web/src/features/projects/ProjectsPage.test.tsx@@ -136,6 +136,29 @@ describe('ProjectsPage', () => {}});+ it('uses the localized preset origin title for a preset-created project', () => {+ const job = creatorJob({+ id: 'job_preset_title',+ templateId: 'image-generation',+ state: { prompt: '内部默认提示词不应成为标题' },+ updatedAt: '2026-09-08T08:00:00.000Z',+ presetOrigin: {+ module: 'image-generation',+ id: 'ecommerce-product',+ version: 1,+ locale: 'zh-CN',+ title: '电商商品主图',+ contentHash: 'a'.repeat(64)+ }+ });++ render(<ProjectsPage jobs={[job]} workspaces={workspaces} onOpenJob={vi.fn()} />);++ expect(screen.getByRole('button', { name: '打开项目 电商商品主图' }))+ .toBeInTheDocument();+ expect(screen.queryByText('内部默认提示词不应成为标题')).not.toBeInTheDocument();+ });+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');@@ -465,6 +488,7 @@ function creatorJob(input: {state: CreatorJob['state'];updatedAt: string;artifacts?: CreatorJob['artifacts'];+ presetOrigin?: CreatorJob['presetOrigin'];}): CreatorJob {return {id: input.id,@@ -473,6 +497,7 @@ function creatorJob(input: {templateVersion: 1,status: input.artifacts === undefined ? 'draft' : 'completed',revision: 0,+ presetOrigin: input.presetOrigin ?? null,state: input.state,agentThreadId: null,stages: [],diff --git a/apps/web/src/features/projects/ProjectsPage.tsx b/apps/web/src/features/projects/ProjectsPage.tsxindex a452b43d..366cd899 100644--- a/apps/web/src/features/projects/ProjectsPage.tsx+++ b/apps/web/src/features/projects/ProjectsPage.tsx@@ -443,6 +443,7 @@ function hasJsonContent(value: unknown): boolean {}function creatorProjectTitle(job: CreatorJob, type: string): string {+ if (job.presetOrigin?.title.trim()) return shorten(job.presetOrigin.title, 54);const probeTitle = job.artifacts.find(artifact => artifact.kind === 'download_probe' && artifact.status !== 'stale')?.metadata.title;diff --git a/apps/web/src/features/shell/OpenCreatorSidebar.test.tsx b/apps/web/src/features/shell/OpenCreatorSidebar.test.tsxindex 14d831e7..8aae060e 100644--- a/apps/web/src/features/shell/OpenCreatorSidebar.test.tsx+++ b/apps/web/src/features/shell/OpenCreatorSidebar.test.tsx@@ -51,6 +51,7 @@ function renderSidebar(overrides: Partial<ComponentProps<typeof OpenCreatorSidebactiveView="conversation"projectNavigationMode="tree"onNewConversation={vi.fn()}+ onOpenHome={vi.fn()}onSelectProject={vi.fn()}onSelectConversation={vi.fn()}onSelectTask={vi.fn()}@@ -73,14 +74,15 @@ describe('OpenCreatorSidebar', () => {expect(screen.queryByText('Coca-Cola')).not.toBeInTheDocument();expect(screen.queryByRole('img', { name: 'OpenCreator' })).not.toBeInTheDocument();expect(screen.getByRole('button', { name: '收起侧栏' })).toBeInTheDocument();- expect(screen.queryByRole('button', { name: '首页' })).not.toBeInTheDocument();+ expect(screen.getByRole('button', { name: '首页' })).toBeInTheDocument();expect(screen.getByRole('button', { name: '我的项目' })).toBeInTheDocument();expect(screen.getByRole('button', { name: '工作台' })).toBeInTheDocument();expect(screen.queryByRole('button', { name: '数据看板' })).not.toBeInTheDocument();expect(screen.queryByRole('button', { name: 'Agent动态' })).not.toBeInTheDocument();- const primaryActions = screen.getByRole('button', { name: '工作台' }).parentElement;- expect(primaryActions?.children[0]).toBe(screen.getByRole('button', { name: '工作台' }));- expect(primaryActions?.children[1]).toBe(screen.getByRole('button', { name: '我的项目' }));+ const primaryActions = screen.getByRole('button', { name: '首页' }).parentElement;+ expect(primaryActions?.children[0]).toBe(screen.getByRole('button', { name: '首页' }));+ expect(primaryActions?.children[1]).toBe(screen.getByRole('button', { name: '工作台' }));+ expect(primaryActions?.children[2]).toBe(screen.getByRole('button', { name: '我的项目' }));expect(screen.queryByRole('separator')).not.toBeInTheDocument();expect(screen.queryByRole('button', { name: '搜索' })).not.toBeInTheDocument();expect(screen.getByRole('button', { name: '定时任务' })).toBeInTheDocument();@@ -118,13 +120,15 @@ describe('OpenCreatorSidebar', () => {expect(screen.getByRole('button', { name: '工作台' }).querySelector('.lucide-panels-top-left')).toBeInTheDocument();+ expect(screen.getByRole('button', { name: '首页' })+ .querySelector('.lucide-house')).toBeInTheDocument();expect(screen.queryByRole('button', { name: '插件中心' })).not.toBeInTheDocument();expect(screen.queryByRole('button', { name: '我的资产' })).not.toBeInTheDocument();expect(screen.getByRole('button', { name: '我的项目' }).querySelector('.lucide-folder-kanban')).toBeInTheDocument();expect(screen.getByRole('button', { name: '设置' }).querySelector('.lucide-sliders-horizontal')).toBeInTheDocument();- expect(view.container.querySelectorAll('.sidebar-nav-icon')).toHaveLength(4);+ expect(view.container.querySelectorAll('.sidebar-nav-icon')).toHaveLength(5);});it('renders global navigation in the selected display language', () => {@@ -137,6 +141,7 @@ describe('OpenCreatorSidebar', () => {activeView="dashboard"projectNavigationMode="library"onNewConversation={vi.fn()}+ onOpenHome={vi.fn()}onSelectProject={vi.fn()}onSelectConversation={vi.fn()}onSelectTask={vi.fn()}@@ -148,6 +153,7 @@ describe('OpenCreatorSidebar', () => {);expect(screen.getByRole('button', { name: 'Dashboard' })).toHaveAttribute('aria-current', 'page');+ expect(screen.getByRole('button', { name: 'Home' })).not.toHaveAttribute('aria-current');expect(screen.queryByRole('button', { name: 'Plugins' })).not.toBeInTheDocument();expect(screen.queryByRole('button', { name: 'My Assets' })).not.toBeInTheDocument();expect(screen.getByRole('button', { name: 'My Projects' })).toBeInTheDocument();@@ -556,10 +562,16 @@ describe('OpenCreatorSidebar', () => {expect(onNewConversation).toHaveBeenCalledWith('content-design');});- it('hides Home from primary navigation', () => {- renderSidebar();+ it('opens Home from primary navigation without starting a chat', async () => {+ const user = userEvent.setup();+ const onOpenHome = vi.fn();+ const onNewConversation = vi.fn();+ renderSidebar({ onOpenHome, onNewConversation });++ await user.click(screen.getByRole('button', { name: '首页' }));- expect(screen.queryByRole('button', { name: '首页' })).not.toBeInTheDocument();+ expect(onOpenHome).toHaveBeenCalledTimes(1);+ expect(onNewConversation).not.toHaveBeenCalled();});it('opens the creator dashboard', async () => {diff --git a/apps/web/src/features/shell/OpenCreatorSidebar.tsx b/apps/web/src/features/shell/OpenCreatorSidebar.tsxindex d1de14bf..fd556038 100644--- a/apps/web/src/features/shell/OpenCreatorSidebar.tsx+++ b/apps/web/src/features/shell/OpenCreatorSidebar.tsx@@ -10,6 +10,7 @@ import {FolderMinus,FolderPlus,FolderOpen,+ House,LoaderCircle,MoreHorizontal,Pencil,@@ -54,11 +55,13 @@ export function OpenCreatorSidebar(props: {currentProjectId?: string;selectedConversationId?: string;activeView: ActiveView;+ homeActive?: boolean;projectNavigationMode?: 'library' | 'tree';collapsed?: boolean;autoCollapsed?: boolean;colorMode?: ColorMode;onNewConversation(projectId?: string): void;+ onOpenHome(): void;onSelectProject(projectId: string): void;onSelectConversation(conversationId: string): void;onSelectTask(threadId: string): void;@@ -121,18 +124,39 @@ export function OpenCreatorSidebar(props: {const globalActions: Array<{label: string;icon: LucideIcon;- view?: ActiveView;+ current: boolean;onClick(): void;}> = [- { label: t('nav.dashboard'), icon: PanelsTopLeft, view: 'dashboard', onClick: () => props.onOpenView('dashboard') },- { label: t('nav.projects'), icon: FolderKanban, view: 'projects', onClick: () => props.onOpenView('projects') },- { label: t('nav.settings'), icon: SlidersHorizontal, view: 'settings', onClick: props.onOpenSettings }+ {+ label: t('nav.home'),+ icon: House,+ current: props.homeActive === true,+ onClick: props.onOpenHome+ },+ {+ label: t('nav.dashboard'),+ icon: PanelsTopLeft,+ current: props.activeView === 'dashboard',+ onClick: () => props.onOpenView('dashboard')+ },+ {+ label: t('nav.projects'),+ icon: FolderKanban,+ current: props.activeView === 'projects',+ onClick: () => props.onOpenView('projects')+ },+ {+ label: t('nav.settings'),+ icon: SlidersHorizontal,+ current: props.activeView === 'settings',+ onClick: props.onOpenSettings+ }];if (props.projectNavigationMode === 'tree') {globalActions.push({label: t('nav.schedules'),icon: Clock3,- view: 'schedules',+ current: props.activeView === 'schedules',onClick: () => props.onOpenView('schedules')});}@@ -269,7 +293,7 @@ export function OpenCreatorSidebar(props: {className="sidebar-row"key={action.label}title={collapsed ? action.label : undefined}- aria-current={action.view && props.activeView === action.view ? 'page' : undefined}+ aria-current={action.current ? 'page' : undefined}onClick={action.onClick}><span className="sidebar-nav-icon" aria-hidden="true">diff --git a/apps/web/src/services/creator-service.test.ts b/apps/web/src/services/creator-service.test.tsindex 03f9a5de..fcbefb2d 100644--- a/apps/web/src/services/creator-service.test.ts+++ b/apps/web/src/services/creator-service.test.ts@@ -16,6 +16,7 @@ describe('creator web service', () => {};const service = createCreatorService(client);+ await service.listPresets('en-US');await service.listJobs('project 1');await service.listJobs();await service.createJob({@@ -63,6 +64,7 @@ describe('creator web service', () => {await service.deleteJob('job 1');await service.deleteJob('job 2', { deleteFiles: true });+ expect(client.get).toHaveBeenCalledWith('/creator/presets?locale=en-US');expect(client.get).toHaveBeenCalledWith('/creator/jobs?projectId=project%201');expect(client.get).toHaveBeenCalledWith('/creator/jobs');expect(client.post).toHaveBeenNthCalledWith(1, '/creator/jobs', {diff --git a/apps/web/src/services/creator-service.ts b/apps/web/src/services/creator-service.tsindex 04ca2ca7..e54f4514 100644--- a/apps/web/src/services/creator-service.ts+++ b/apps/web/src/services/creator-service.ts@@ -14,6 +14,7 @@ import type {CreatorEventEnvelope,CreatorJob,CreatorJobListResponse,+ CreatorPresetListResponse,CreatorStageRun,CreatorSourceUploadResponse,CreatorTemplateListResponse@@ -45,6 +46,11 @@ export function createCreatorService(client: ClientLike) {listTemplates(): Promise<CreatorTemplateListResponse> {return client.get('/creator/templates') as Promise<CreatorTemplateListResponse>;},+ listPresets(locale: 'zh-CN' | 'en-US'): Promise<CreatorPresetListResponse> {+ return client.get(+ `/creator/presets?locale=${encodeURIComponent(locale)}`+ ) as Promise<CreatorPresetListResponse>;+ },createJob(request: CreateCreatorJobRequest): Promise<{ job: CreatorJob }> {return client.post('/creator/jobs', request) as Promise<{ job: CreatorJob }>;},diff --git a/apps/web/src/styles/app-css.test.ts b/apps/web/src/styles/app-css.test.tsindex 68e5cec9..bd6c49ff 100644--- a/apps/web/src/styles/app-css.test.ts+++ b/apps/web/src/styles/app-css.test.ts@@ -695,15 +695,15 @@ describe('app CSS visual contracts', () => {expect(emptyComposer).toContain('overflow-y: auto;');expect(emptyComposer).toContain('padding: clamp(72px, 13vh, 128px) var(--conversation-gutter) 56px;');expect(cssBlock('.conversation-page.is-empty .composer-stack')).toContain('width: min(760px, 100%);');- expect(cssBlock('.creator-template-tabs')).toContain('width: min(760px, 100%);');- expect(cssBlock('.creator-template-tabs')).toContain('grid-template-columns: repeat(3, minmax(max-content, 1fr));');- expect(cssBlock('.creator-tool-grid')).toContain('grid-template-columns: repeat(3, minmax(0, 1fr));');- expect(cssBlock('.creator-template-grid')).toContain('grid-template-columns: repeat(5, minmax(0, 1fr));');- expect(cssBlock('.creator-template-grid')).toContain('gap: 12px;');- expect(cssBlock('.creator-template-copy')).toContain('padding: 9px 10px 11px;');- expect(appCss).toMatch(- /@media \(max-width: 1100px\) and \(min-width: 921px\)\s*\{[\s\S]*?\.creator-template-grid\s*\{[^}]*grid-template-columns:\s*repeat\(3, minmax\(0, 1fr\)\);/- );+ expect(cssBlock('.creator-home-wrap')).toContain('overflow-y: auto;');+ expect(cssBlock('.creator-module-grid')).toContain('display: flex;');+ expect(cssBlock('.creator-module-grid')).toContain('overflow-x: auto;');+ expect(cssBlock('.creator-module-card')).toContain('display: inline-flex;');+ expect(cssBlock('.creator-module-card')).toContain('min-height: 36px;');+ expect(cssBlock('.creator-template-grid')).toContain('grid-template-columns: repeat(3, minmax(0, 1fr));');+ expect(cssBlock('.creator-template-grid')).toContain('gap: 14px;');+ expect(cssBlock('.creator-template-copy')).toContain('padding: 12px 13px 14px;');+ expect(cssBlock('.creator-template-highlights')).toContain('flex-wrap: wrap;');expect(appCss).toMatch(/\.conversation-page\.is-empty \.opencreator-composer textarea\s*\{[^}]*min-height:\s*72px;/);expect(appCss).not.toContain('translateY(clamp(-150px, -14vh, -108px))');expect(tokensCss).toContain('--border-hairline: rgba(245, 245, 246, 0.08);');diff --git a/apps/web/src/styles/app.css b/apps/web/src/styles/app.cssindex 85a7ce7d..86e4e19a 100644--- a/apps/web/src/styles/app.css+++ b/apps/web/src/styles/app.css@@ -2524,6 +2524,10 @@ select:focus-visible {grid-template-rows: auto minmax(0, 1fr);}+.conversation-page.is-creator-home {+ grid-template-rows: minmax(0, 1fr);+}+.conversation-file-layout {position: relative;isolation: isolate;@@ -3182,65 +3186,47 @@ html.is-pane-resizing * {margin-top: 22px;}-.creator-dashboard {- width: min(1040px, 100%);- display: grid;- gap: 18px;- margin: 24px auto 0;-}--.creator-dashboard[data-template-count="4"] {- width: min(840px, 100%);+.creator-home-wrap {+ min-width: 0;+ min-height: 0;+ overflow-x: hidden;+ overflow-y: auto;+ padding: clamp(30px, 6vh, 54px) var(--conversation-gutter) 48px;+ overscroll-behavior: contain;}-.creator-template-tabs {- width: min(760px, 100%);- min-height: 42px;- display: grid;- grid-template-columns: repeat(3, minmax(max-content, 1fr));- gap: 3px;+.creator-home-wrap .creator-dashboard {margin: 0 auto;- padding: 3px;- overflow-x: auto;- border: 1px solid var(--border-hairline);- border-radius: 8px;- background: color-mix(in srgb, var(--surface) 82%, transparent);- scrollbar-width: none;}-.creator-template-tabs::-webkit-scrollbar {- display: none;-}--.creator-template-tabs button {- min-width: 0;- height: 34px;- padding: 0 14px;- border: 0;- border-radius: 6px;- background: transparent;- color: var(--muted);- font-size: 12px;- font-weight: 500;- white-space: nowrap;+.creator-dashboard {+ width: min(1040px, 100%);+ display: grid;+ gap: 24px;+ margin: 24px auto 0;}-.creator-template-tabs button:hover {- color: var(--text);- background: color-mix(in srgb, var(--surface-3) 66%, transparent);+.creator-dashboard-title {+ display: grid;+ gap: 5px;}-.creator-template-tabs button[aria-selected="true"] {- background: var(--surface-2);+.creator-dashboard-title h1 {+ margin: 0;color: var(--text);- box-shadow: 0 1px 2px color-mix(in srgb, var(--shadow-base) 14%, transparent);+ font-size: 26px;+ font-weight: 600;+ line-height: 1.2;}-.creator-template-tabs button:focus-visible {- outline: 2px solid var(--accent);- outline-offset: -2px;+.creator-dashboard-title p {+ margin: 0;+ color: var(--muted);+ font-size: 13px;+ line-height: 1.45;}+.creator-module-section,.creator-dashboard-section {min-width: 0;}@@ -3258,12 +3244,6 @@ html.is-pane-resizing * {gap: 4px;}-.creator-dashboard-heading span {- color: var(--muted);- font-size: 12px;- line-height: 1.2;-}-.creator-dashboard-heading h2 {margin: 0;color: var(--text);@@ -3272,57 +3252,54 @@ html.is-pane-resizing * {line-height: 1.3;}-.creator-dashboard-heading > svg {- margin-bottom: 2px;- color: var(--subtle);-}--.creator-dashboard-heading-compact {- align-items: center;- margin-bottom: 10px;-}--.creator-dashboard-heading-compact h2 {+.creator-dashboard-heading span {color: var(--muted);- font-size: 13px;- font-weight: 500;- line-height: 20px;+ font-size: 12px;+ line-height: 1.3;}-.creator-dashboard-heading-compact > svg {- margin-bottom: 0;+.creator-module-grid {+ display: flex;+ gap: 8px;+ max-width: 100%;+ overflow-x: auto;+ padding: 1px 1px 3px;+ scrollbar-width: none;}-.creator-tool-grid {- display: grid;- grid-template-columns: repeat(3, minmax(0, 1fr));- border-top: 1px solid var(--border-hairline);- border-left: 1px solid var(--border-hairline);+.creator-module-grid::-webkit-scrollbar {+ display: none;}-.creator-tool-button {- min-width: 0;- min-height: 78px;- display: grid;- grid-template-columns: 38px minmax(0, 1fr);+.creator-module-card {+ min-width: max-content;+ min-height: 36px;+ flex: 0 0 auto;+ display: inline-flex;align-items: center;- gap: 12px;- padding: 14px 16px;- border: 0;- border-right: 1px solid var(--border-hairline);- border-bottom: 1px solid var(--border-hairline);- border-radius: 0;- background: transparent;+ gap: 8px;+ padding: 7px 10px;+ border: 1px solid var(--border);+ border-radius: 6px;+ background: var(--surface);color: var(--text);- text-align: left;- transition: background-color 140ms ease;+ white-space: nowrap;+ transition:+ border-color 140ms ease,+ background-color 140ms ease;}-.creator-tool-button:hover {- background: color-mix(in srgb, var(--surface-3) 70%, transparent);+.creator-module-card:hover {+ border-color: color-mix(in srgb, var(--text) 18%, var(--border));+ background: color-mix(in srgb, var(--surface-2) 72%, var(--surface));}-.creator-tool-button:focus-visible,+.creator-module-card[aria-selected="true"] {+ border-color: color-mix(in srgb, var(--accent) 68%, var(--border));+ background: color-mix(in srgb, var(--accent) 8%, var(--surface));+}++.creator-module-card:focus-visible,.creator-template-card:focus-visible {position: relative;z-index: 1;@@ -3330,60 +3307,94 @@ html.is-pane-resizing * {outline-offset: -2px;}-.creator-tool-icon {- width: 38px;- height: 38px;- display: grid;+.creator-module-label {+ display: inline-flex;+ align-items: center;+ gap: 6px;+}++.creator-module-label svg {+ color: var(--muted);+}++.creator-module-label strong {+ font-size: 13px;+ font-weight: 600;+}++.creator-module-card > small {+ min-width: 20px;+ height: 20px;+ display: inline-grid;place-items: center;- border-radius: 8px;- background: color-mix(in srgb, var(--accent) 14%, var(--surface));+ padding: 0 5px;+ border-radius: 4px;+ background: var(--surface-2);+ color: var(--muted);+ font-size: 12px;+ line-height: 1;+}++.creator-module-card[aria-selected="true"] .creator-module-label svg {color: var(--accent);}-.creator-tool-button:nth-child(2) .creator-tool-icon,-.creator-tool-button:nth-child(5) .creator-tool-icon {- background: color-mix(in srgb, var(--text) 9%, var(--surface));- color: var(--muted);+.creator-module-card[aria-selected="true"] > small {+ background: color-mix(in srgb, var(--accent) 18%, var(--surface));+ color: var(--accent);}-.creator-tool-button:nth-child(3) .creator-tool-icon,-.creator-tool-button:nth-child(6) .creator-tool-icon {- background: color-mix(in srgb, var(--accent) 20%, var(--surface));- color: var(--text);+.creator-template-search {+ width: min(240px, 30vw);+ height: 36px;+ flex: 0 0 auto;+ display: flex;+ align-items: center;+ gap: 8px;+ padding: 0 10px;+ border: 1px solid var(--border);+ border-radius: 6px;+ background: var(--surface);+ color: var(--subtle);}-.creator-tool-copy {+.creator-template-search input {+ width: 100%;min-width: 0;- display: grid;- gap: 4px;+ border: 0;+ outline: 0;+ background: transparent;+ color: var(--text);+ font: inherit;}-.creator-tool-copy strong,-.creator-tool-copy small {- min-width: 0;- overflow: hidden;- text-overflow: ellipsis;- white-space: nowrap;+.creator-template-error {+ display: flex;+ align-items: center;+ justify-content: space-between;+ gap: 12px;+ padding: 10px 12px;+ color: var(--text);+ background: color-mix(in srgb, var(--danger) 8%, transparent);+ border: 1px solid color-mix(in srgb, var(--danger) 28%, transparent);+ border-radius: 6px;}-.creator-tool-copy strong {- font-size: 13px;- font-weight: 600;+.creator-template-error button {+ display: inline-flex;+ align-items: center;+ gap: 6px;}-.creator-tool-copy small {- color: var(--muted);- font-size: 12px;+.creator-template-action-error {+ margin: 10px 0 0;+ color: var(--danger);}.creator-template-grid {display: grid;- grid-template-columns: repeat(5, minmax(0, 1fr));- gap: 12px;-}--.creator-dashboard[data-template-count="4"] .creator-template-grid {- grid-template-columns: repeat(4, minmax(0, 1fr));+ grid-template-columns: repeat(3, minmax(0, 1fr));+ gap: 14px;}.creator-template-empty {@@ -3415,13 +3426,28 @@ html.is-pane-resizing * {transform: translateY(-2px);}-.creator-template-media {+.creator-template-card-blank {+ border-style: dashed;+}++.creator-template-card-blank:hover {+ border-color: color-mix(in srgb, var(--accent) 50%, var(--border));+}++.creator-template-media,+.creator-template-blank-icon {aspect-ratio: 16 / 9;display: block;overflow: hidden;background: var(--surface-2);}+.creator-template-blank-icon {+ display: grid;+ place-items: center;+ color: var(--subtle);+}+.creator-template-media img {width: 100%;height: 100%;@@ -3436,13 +3462,18 @@ html.is-pane-resizing * {.creator-template-copy {display: grid;- gap: 3px;- padding: 9px 10px 11px;+ gap: 6px;+ padding: 12px 13px 14px;}-.creator-template-copy small {+.creator-template-copy > span {+ display: -webkit-box;+ overflow: hidden;color: var(--muted);font-size: 12px;+ line-height: 1.4;+ -webkit-box-orient: vertical;+ -webkit-line-clamp: 2;}.creator-template-copy strong {@@ -3453,8 +3484,84 @@ html.is-pane-resizing * {white-space: nowrap;}+.creator-template-highlights {+ display: flex;+ flex-wrap: wrap;+ gap: 5px;+ margin-top: 2px;+}++.creator-template-highlight {+ min-width: 0;+ max-width: 100%;+ display: inline-flex;+ align-items: center;+ gap: 5px;+ padding: 3px 6px;+ border-radius: 4px;+ background: var(--surface-2);+ color: var(--muted);+ font-size: 12px;+ line-height: 1.25;+}++.creator-template-highlight > span:last-child {+ overflow: hidden;+ text-overflow: ellipsis;+ white-space: nowrap;+}++.creator-template-swatches {+ display: inline-flex;+ flex: 0 0 auto;+}++.creator-template-swatches > span {+ width: 10px;+ height: 10px;+ display: block;+ border: 1px solid color-mix(in srgb, var(--text) 22%, transparent);+ border-radius: 50%;+}++.creator-template-swatches > span + span {+ margin-left: -3px;+}++.creator-template-busy {+ position: absolute;+ inset: 0;+ display: grid;+ place-items: center;+ color: #fff;+ background: rgb(0 0 0 / 58%);+ font-size: 13px;+}++.creator-template-requirement {+ min-width: 0;+ display: flex;+ align-items: center;+ gap: 5px;+ margin-top: 4px;+ color: var(--muted);+ font-size: 12px;+ line-height: 1.35;+}++.creator-template-requirement svg {+ flex: 0 0 auto;+}++.creator-template-requirement span {+ min-width: 0;+ overflow: hidden;+ text-overflow: ellipsis;+ white-space: nowrap;+}+@media (prefers-reduced-motion: reduce) {- .creator-tool-button,+ .creator-module-card,.creator-template-card,.creator-template-media img {transition: none;@@ -3466,6 +3573,38 @@ html.is-pane-resizing * {}}+@media (max-width: 920px) {+ .creator-template-grid {+ grid-template-columns: repeat(2, minmax(0, 1fr));+ }++ .creator-home-wrap {+ padding: 72px 16px 40px;+ }+}++@media (max-width: 700px) {+ .creator-dashboard {+ gap: 20px;+ }++ .creator-dashboard-heading {+ align-items: stretch;+ flex-direction: column;+ gap: 10px;+ }++ .creator-template-search {+ width: 100%;+ }+}++@media (max-width: 520px) {+ .creator-template-grid {+ grid-template-columns: 1fr;+ }+}+.opencreator-composer {--composer-input-background: #1a1b1e;--composer-project-background: #232427;diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.tsindex d310c8ff..a657b3ac 100644--- a/apps/web/vite.config.ts+++ b/apps/web/vite.config.ts@@ -1,5 +1,13 @@import react from '@vitejs/plugin-react';-import { existsSync } from 'node:fs';+import {+ cpSync,+ existsSync,+ mkdirSync,+ readFileSync,+ readdirSync,+ rmSync,+ statSync+} from 'node:fs';import { request as httpRequest } from 'node:http';import { spawn, spawnSync, type ChildProcessByStdio } from 'node:child_process';import { dirname, join, resolve } from 'node:path';@@ -25,9 +33,21 @@ type RuntimeProcess = {let runtimeProcess: RuntimeProcess | undefined;const MAX_RUNTIME_OUTPUT_BUFFER = 1024 * 1024;const webDir = dirname(fileURLToPath(import.meta.url));+const creatorPresetCatalogRoot = resolve(+ process.env.OPENCREATOR_PRESET_CATALOG_ROOT+ ?? join(webDir, '../../.runtime/generated/creator-presets')+);+const creatorSubtitleFontRoot = join(+ webDir,+ '../../assets/creator-subtitle-fonts/web'+);export default defineConfig({- plugins: [react(), opencreatorRuntimeDevPlugin()],+ plugins: [+ react(),+ opencreatorStaticResourcesPlugin(),+ opencreatorRuntimeDevPlugin()+ ],server: {host: '127.0.0.1',port: 19861,@@ -39,6 +59,114 @@ export default defineConfig({}});+function opencreatorStaticResourcesPlugin(): Plugin {+ const presetAssetsRoot = join(creatorPresetCatalogRoot, 'assets');+ const presetBuildRoot = join(webDir, 'dist', 'creator-presets');+ const fontBuildRoot = join(webDir, 'dist', 'fonts', 'opencreator');++ return {+ name: 'opencreator-static-resources',+ configureServer(server) {+ server.middlewares.use((request, response, next) => {+ const pathname = new URL(+ request.url ?? '/',+ 'http://opencreator.local'+ ).pathname;+ const presetMatch = pathname.match(+ /^\/creator-presets\/([a-f0-9]{64}\.(?:png|jpe?g|webp))$/+ );+ if (presetMatch !== null) {+ sendStaticFile(+ request.method,+ response,+ join(presetAssetsRoot, presetMatch[1]!),+ contentTypeForStaticResource(presetMatch[1]!)+ );+ return;+ }+ const fontMatch = pathname.match(+ /^\/fonts\/opencreator\/([A-Za-z0-9-]+\.woff2)$/+ );+ if (fontMatch !== null) {+ sendStaticFile(+ request.method,+ response,+ join(creatorSubtitleFontRoot, fontMatch[1]!),+ 'font/woff2'+ );+ return;+ }+ next();+ });+ },+ buildStart() {+ assertStaticBuildInput(join(creatorPresetCatalogRoot, 'catalog.json'));+ assertStaticBuildInput(join(creatorPresetCatalogRoot, 'manifest.json'));+ assertStaticBuildInput(join(+ webDir,+ '../../assets/creator-subtitle-fonts/manifest.json'+ ));+ },+ closeBundle() {+ replaceDirectory(presetAssetsRoot, presetBuildRoot);+ replaceDirectory(creatorSubtitleFontRoot, fontBuildRoot);+ }+ };+}++function sendStaticFile(+ method: string | undefined,+ response: import('node:http').ServerResponse,+ file: string,+ contentType: string+): void {+ if (method !== 'GET' && method !== 'HEAD') {+ response.statusCode = 405;+ response.setHeader('Allow', 'GET, HEAD');+ response.end();+ return;+ }+ if (!existsSync(file) || !statSync(file).isFile()) {+ response.statusCode = 404;+ response.end();+ return;+ }+ const contents = readFileSync(file);+ response.statusCode = 200;+ response.setHeader('Content-Type', contentType);+ response.setHeader('Content-Length', String(contents.byteLength));+ response.setHeader('Cache-Control', 'public, max-age=31536000, immutable');+ response.end(method === 'HEAD' ? undefined : contents);+}++function assertStaticBuildInput(path: string): void {+ if (!existsSync(path) || !statSync(path).isFile()) {+ throw new Error(+ `OpenCreator static build input is missing: ${path}. `+ + 'Run pnpm templates:compile before building Web.'+ );+ }+}++function replaceDirectory(source: string, destination: string): void {+ if (!existsSync(source) || !statSync(source).isDirectory()) {+ throw new Error(`OpenCreator static resource directory is missing: ${source}`);+ }+ const entries = readdirSync(source, { withFileTypes: true });+ if (entries.some(entry => !entry.isFile())) {+ throw new Error(`OpenCreator static resource directory must contain files only: ${source}`);+ }+ rmSync(destination, { recursive: true, force: true });+ mkdirSync(destination, { recursive: true });+ cpSync(source, destination, { recursive: true });+}++function contentTypeForStaticResource(file: string): string {+ if (file.endsWith('.webp')) return 'image/webp';+ if (file.endsWith('.png')) return 'image/png';+ return 'image/jpeg';+}+function opencreatorRuntimeDevPlugin(): Plugin {return {name: 'opencreator-runtime-dev',diff --git a/assets/creator-subtitle-fonts/desktop/OpenCreatorRounded-Bold.ttf b/assets/creator-subtitle-fonts/desktop/OpenCreatorRounded-Bold.ttfnew file mode 100644index 00000000..db986de9Binary files /dev/null and b/assets/creator-subtitle-fonts/desktop/OpenCreatorRounded-Bold.ttf differdiff --git a/assets/creator-subtitle-fonts/desktop/OpenCreatorRounded-Medium.ttf b/assets/creator-subtitle-fonts/desktop/OpenCreatorRounded-Medium.ttfnew file mode 100644index 00000000..fdfbf7dfBinary files /dev/null and b/assets/creator-subtitle-fonts/desktop/OpenCreatorRounded-Medium.ttf differdiff --git a/assets/creator-subtitle-fonts/desktop/OpenCreatorRounded-Regular.ttf b/assets/creator-subtitle-fonts/desktop/OpenCreatorRounded-Regular.ttfnew file mode 100644index 00000000..0c4e35b0Binary files /dev/null and b/assets/creator-subtitle-fonts/desktop/OpenCreatorRounded-Regular.ttf differdiff --git a/assets/creator-subtitle-fonts/desktop/OpenCreatorSans-Bold.ttf b/assets/creator-subtitle-fonts/desktop/OpenCreatorSans-Bold.ttfnew file mode 100644index 00000000..02643d34Binary files /dev/null and b/assets/creator-subtitle-fonts/desktop/OpenCreatorSans-Bold.ttf differdiff --git a/assets/creator-subtitle-fonts/desktop/OpenCreatorSans-Medium.ttf b/assets/creator-subtitle-fonts/desktop/OpenCreatorSans-Medium.ttfnew file mode 100644index 00000000..1fff2a55Binary files /dev/null and b/assets/creator-subtitle-fonts/desktop/OpenCreatorSans-Medium.ttf differdiff --git a/assets/creator-subtitle-fonts/desktop/OpenCreatorSans-Regular.ttf b/assets/creator-subtitle-fonts/desktop/OpenCreatorSans-Regular.ttfnew file mode 100644index 00000000..e1e26646Binary files /dev/null and b/assets/creator-subtitle-fonts/desktop/OpenCreatorSans-Regular.ttf differdiff --git a/assets/creator-subtitle-fonts/desktop/OpenCreatorSerif-Bold.ttf b/assets/creator-subtitle-fonts/desktop/OpenCreatorSerif-Bold.ttfnew file mode 100644index 00000000..68371987Binary files /dev/null and b/assets/creator-subtitle-fonts/desktop/OpenCreatorSerif-Bold.ttf differdiff --git a/assets/creator-subtitle-fonts/desktop/OpenCreatorSerif-Medium.ttf b/assets/creator-subtitle-fonts/desktop/OpenCreatorSerif-Medium.ttfnew file mode 100644index 00000000..97313e33Binary files /dev/null and b/assets/creator-subtitle-fonts/desktop/OpenCreatorSerif-Medium.ttf differdiff --git a/assets/creator-subtitle-fonts/desktop/OpenCreatorSerif-Regular.ttf b/assets/creator-subtitle-fonts/desktop/OpenCreatorSerif-Regular.ttfnew file mode 100644index 00000000..3c4dc043Binary files /dev/null and b/assets/creator-subtitle-fonts/desktop/OpenCreatorSerif-Regular.ttf differdiff --git a/assets/creator-subtitle-fonts/licenses/OFL-M-PLUS-Rounded-1c.txt b/assets/creator-subtitle-fonts/licenses/OFL-M-PLUS-Rounded-1c.txtnew file mode 100644index 00000000..bb756e40--- /dev/null+++ b/assets/creator-subtitle-fonts/licenses/OFL-M-PLUS-Rounded-1c.txt@@ -0,0 +1,93 @@+Copyright 2016 The Rounded M+ Project Authors. MPLUSRounded1c-Light.ttf: Copyright 2016 The Rounded M+ Project Authors. MPLUSRounded1c-Regular.ttf: Copyright 2016 The Rounded M+ Project Authors. MPLUSRounded1c-Medium.ttf: Copyright 2016 The Rounded M+ Project Authors. MPLUSRounded1c-Bold.ttf: Copyright 2016 The Rounded M+ Project Authors. MPLUSRounded1c-ExtraBold.ttf: Copyright 2016 The Rounded M+ Project Authors. MPLUSRounded1c-Black.ttf: Copyright 2016 The Rounded M+ Project Authors.++This Font Software is licensed under the SIL Open Font License, Version 1.1.+This license is copied below, and is also available with a FAQ at:+http://scripts.sil.org/OFL+++-----------------------------------------------------------+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007+-----------------------------------------------------------++PREAMBLE+The goals of the Open Font License (OFL) are to stimulate worldwide+development of collaborative font projects, to support the font creation+efforts of academic and linguistic communities, and to provide a free and+open framework in which fonts may be shared and improved in partnership+with others.++The OFL allows the licensed fonts to be used, studied, modified and+redistributed freely as long as they are not sold by themselves. The+fonts, including any derivative works, can be bundled, embedded,+redistributed and/or sold with any software provided that any reserved+names are not used by derivative works. The fonts and derivatives,+however, cannot be released under any other type of license. The+requirement for fonts to remain under this license does not apply+to any document created using the fonts or their derivatives.++DEFINITIONS+"Font Software" refers to the set of files released by the Copyright+Holder(s) under this license and clearly marked as such. This may+include source files, build scripts and documentation.++"Reserved Font Name" refers to any names specified as such after the+copyright statement(s).++"Original Version" refers to the collection of Font Software components as+distributed by the Copyright Holder(s).++"Modified Version" refers to any derivative made by adding to, deleting,+or substituting -- in part or in whole -- any of the components of the+Original Version, by changing formats or by porting the Font Software to a+new environment.++"Author" refers to any designer, engineer, programmer, technical+writer or other person who contributed to the Font Software.++PERMISSION & CONDITIONS+Permission is hereby granted, free of charge, to any person obtaining+a copy of the Font Software, to use, study, copy, merge, embed, modify,+redistribute, and sell modified and unmodified copies of the Font+Software, subject to the following conditions:++1) Neither the Font Software nor any of its individual components,+in Original or Modified Versions, may be sold by itself.++2) Original or Modified Versions of the Font Software may be bundled,+redistributed and/or sold with any software, provided that each copy+contains the above copyright notice and this license. These can be+included either as stand-alone text files, human-readable headers or+in the appropriate machine-readable metadata fields within text or+binary files as long as those fields can be easily viewed by the user.++3) No Modified Version of the Font Software may use the Reserved Font+Name(s) unless explicit written permission is granted by the corresponding+Copyright Holder. This restriction only applies to the primary font name as+presented to the users.++4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font+Software shall not be used to promote, endorse or advertise any+Modified Version, except to acknowledge the contribution(s) of the+Copyright Holder(s) and the Author(s) or with their explicit written+permission.++5) The Font Software, modified or unmodified, in part or in whole,+must be distributed entirely under this license, and must not be+distributed under any other license. The requirement for fonts to+remain under this license does not apply to any document created+using the Font Software.++TERMINATION+This license becomes null and void if any of the above conditions are+not met.++DISCLAIMER+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM+OTHER DEALINGS IN THE FONT SOFTWARE.diff --git a/assets/creator-subtitle-fonts/licenses/OFL-Noto-Sans-SC.txt b/assets/creator-subtitle-fonts/licenses/OFL-Noto-Sans-SC.txtnew file mode 100644index 00000000..046fc664--- /dev/null+++ b/assets/creator-subtitle-fonts/licenses/OFL-Noto-Sans-SC.txt@@ -0,0 +1,93 @@+Google Inc.++This Font Software is licensed under the SIL Open Font License, Version 1.1.+This license is copied below, and is also available with a FAQ at:+http://scripts.sil.org/OFL+++-----------------------------------------------------------+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007+-----------------------------------------------------------++PREAMBLE+The goals of the Open Font License (OFL) are to stimulate worldwide+development of collaborative font projects, to support the font creation+efforts of academic and linguistic communities, and to provide a free and+open framework in which fonts may be shared and improved in partnership+with others.++The OFL allows the licensed fonts to be used, studied, modified and+redistributed freely as long as they are not sold by themselves. The+fonts, including any derivative works, can be bundled, embedded,+redistributed and/or sold with any software provided that any reserved+names are not used by derivative works. The fonts and derivatives,+however, cannot be released under any other type of license. The+requirement for fonts to remain under this license does not apply+to any document created using the fonts or their derivatives.++DEFINITIONS+"Font Software" refers to the set of files released by the Copyright+Holder(s) under this license and clearly marked as such. This may+include source files, build scripts and documentation.++"Reserved Font Name" refers to any names specified as such after the+copyright statement(s).++"Original Version" refers to the collection of Font Software components as+distributed by the Copyright Holder(s).++"Modified Version" refers to any derivative made by adding to, deleting,+or substituting -- in part or in whole -- any of the components of the+Original Version, by changing formats or by porting the Font Software to a+new environment.++"Author" refers to any designer, engineer, programmer, technical+writer or other person who contributed to the Font Software.++PERMISSION & CONDITIONS+Permission is hereby granted, free of charge, to any person obtaining+a copy of the Font Software, to use, study, copy, merge, embed, modify,+redistribute, and sell modified and unmodified copies of the Font+Software, subject to the following conditions:++1) Neither the Font Software nor any of its individual components,+in Original or Modified Versions, may be sold by itself.++2) Original or Modified Versions of the Font Software may be bundled,+redistributed and/or sold with any software, provided that each copy+contains the above copyright notice and this license. These can be+included either as stand-alone text files, human-readable headers or+in the appropriate machine-readable metadata fields within text or+binary files as long as those fields can be easily viewed by the user.++3) No Modified Version of the Font Software may use the Reserved Font+Name(s) unless explicit written permission is granted by the corresponding+Copyright Holder. This restriction only applies to the primary font name as+presented to the users.++4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font+Software shall not be used to promote, endorse or advertise any+Modified Version, except to acknowledge the contribution(s) of the+Copyright Holder(s) and the Author(s) or with their explicit written+permission.++5) The Font Software, modified or unmodified, in part or in whole,+must be distributed entirely under this license, and must not be+distributed under any other license. The requirement for fonts to+remain under this license does not apply to any document created+using the Font Software.++TERMINATION+This license becomes null and void if any of the above conditions are+not met.++DISCLAIMER+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM+OTHER DEALINGS IN THE FONT SOFTWARE.diff --git a/assets/creator-subtitle-fonts/licenses/OFL-Noto-Serif-SC.txt b/assets/creator-subtitle-fonts/licenses/OFL-Noto-Serif-SC.txtnew file mode 100644index 00000000..046fc664--- /dev/null+++ b/assets/creator-subtitle-fonts/licenses/OFL-Noto-Serif-SC.txt@@ -0,0 +1,93 @@+Google Inc.++This Font Software is licensed under the SIL Open Font License, Version 1.1.+This license is copied below, and is also available with a FAQ at:+http://scripts.sil.org/OFL+++-----------------------------------------------------------+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007+-----------------------------------------------------------++PREAMBLE+The goals of the Open Font License (OFL) are to stimulate worldwide+development of collaborative font projects, to support the font creation+efforts of academic and linguistic communities, and to provide a free and+open framework in which fonts may be shared and improved in partnership+with others.++The OFL allows the licensed fonts to be used, studied, modified and+redistributed freely as long as they are not sold by themselves. The+fonts, including any derivative works, can be bundled, embedded,+redistributed and/or sold with any software provided that any reserved+names are not used by derivative works. The fonts and derivatives,+however, cannot be released under any other type of license. The+requirement for fonts to remain under this license does not apply+to any document created using the fonts or their derivatives.++DEFINITIONS+"Font Software" refers to the set of files released by the Copyright+Holder(s) under this license and clearly marked as such. This may+include source files, build scripts and documentation.++"Reserved Font Name" refers to any names specified as such after the+copyright statement(s).++"Original Version" refers to the collection of Font Software components as+distributed by the Copyright Holder(s).++"Modified Version" refers to any derivative made by adding to, deleting,+or substituting -- in part or in whole -- any of the components of the+Original Version, by changing formats or by porting the Font Software to a+new environment.++"Author" refers to any designer, engineer, programmer, technical+writer or other person who contributed to the Font Software.++PERMISSION & CONDITIONS+Permission is hereby granted, free of charge, to any person obtaining+a copy of the Font Software, to use, study, copy, merge, embed, modify,+redistribute, and sell modified and unmodified copies of the Font+Software, subject to the following conditions:++1) Neither the Font Software nor any of its individual components,+in Original or Modified Versions, may be sold by itself.++2) Original or Modified Versions of the Font Software may be bundled,+redistributed and/or sold with any software, provided that each copy+contains the above copyright notice and this license. These can be+included either as stand-alone text files, human-readable headers or+in the appropriate machine-readable metadata fields within text or+binary files as long as those fields can be easily viewed by the user.++3) No Modified Version of the Font Software may use the Reserved Font+Name(s) unless explicit written permission is granted by the corresponding+Copyright Holder. This restriction only applies to the primary font name as+presented to the users.++4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font+Software shall not be used to promote, endorse or advertise any+Modified Version, except to acknowledge the contribution(s) of the+Copyright Holder(s) and the Author(s) or with their explicit written+permission.++5) The Font Software, modified or unmodified, in part or in whole,+must be distributed entirely under this license, and must not be+distributed under any other license. The requirement for fonts to+remain under this license does not apply to any document created+using the Font Software.++TERMINATION+This license becomes null and void if any of the above conditions are+not met.++DISCLAIMER+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM+OTHER DEALINGS IN THE FONT SOFTWARE.diff --git a/assets/creator-subtitle-fonts/manifest.json b/assets/creator-subtitle-fonts/manifest.jsonnew file mode 100644index 00000000..03de4206--- /dev/null+++ b/assets/creator-subtitle-fonts/manifest.json@@ -0,0 +1,147 @@+{+ "version": 1,+ "sources": [+ {+ "package": "@fontsource/noto-sans-sc",+ "packageVersion": "5.3.0",+ "fontVersion": "v40",+ "license": "OFL-1.1"+ },+ {+ "package": "@fontsource/noto-serif-sc",+ "packageVersion": "5.3.0",+ "fontVersion": "v35",+ "license": "OFL-1.1"+ },+ {+ "package": "@fontsource/m-plus-rounded-1c",+ "packageVersion": "5.3.0",+ "fontVersion": "v22",+ "license": "OFL-1.1"+ }+ ],+ "fonts": [+ {+ "preset": "sans",+ "weight": "regular",+ "weightValue": 400,+ "family": "OpenCreator Sans Regular",+ "fullName": "OpenCreator Sans Regular",+ "desktopFile": "desktop/OpenCreatorSans-Regular.ttf",+ "desktopSha256": "6f96a1f9ec103a83f6887cfb0c2531e99f2912d66606079c356e4bffea024edc",+ "webFile": "web/OpenCreatorSans-Regular.woff2",+ "webSha256": "80d80e670e9a61ce369a82be485e53995d736c8e72112f09899adeb579f61192",+ "license": "licenses/OFL-Noto-Sans-SC.txt"+ },+ {+ "preset": "sans",+ "weight": "medium",+ "weightValue": 500,+ "family": "OpenCreator Sans Medium",+ "fullName": "OpenCreator Sans Medium",+ "desktopFile": "desktop/OpenCreatorSans-Medium.ttf",+ "desktopSha256": "afe882c0e90ad48554ee286b7f20430b1338b698e170182c878418eebc33af7d",+ "webFile": "web/OpenCreatorSans-Medium.woff2",+ "webSha256": "96c8bd8b33f0aa2143f71245a3b8342da0767ef6e8e339c256d4d86b13eae5da",+ "license": "licenses/OFL-Noto-Sans-SC.txt"+ },+ {+ "preset": "sans",+ "weight": "bold",+ "weightValue": 700,+ "family": "OpenCreator Sans Bold",+ "fullName": "OpenCreator Sans Bold",+ "desktopFile": "desktop/OpenCreatorSans-Bold.ttf",+ "desktopSha256": "7bb50c8441e01d27bdd6f6fb9bce9085b1e2605ccf3ee1686ff12e8e19aa31fe",+ "webFile": "web/OpenCreatorSans-Bold.woff2",+ "webSha256": "3a10089e4c86318927d30c613f4307505cf5be5833e034cd4123117c0f842359",+ "license": "licenses/OFL-Noto-Sans-SC.txt"+ },+ {+ "preset": "serif",+ "weight": "regular",+ "weightValue": 400,+ "family": "OpenCreator Serif Regular",+ "fullName": "OpenCreator Serif Regular",+ "desktopFile": "desktop/OpenCreatorSerif-Regular.ttf",+ "desktopSha256": "88e90a8e9154a7235e6cc60aa92ca7a4cd4b163da0c29b10c56dbeda8c728293",+ "webFile": "web/OpenCreatorSerif-Regular.woff2",+ "webSha256": "1f8613ad8b50c42cf834b7dcaa24213c0abe27c761af33b64adc6859bca2d67a",+ "license": "licenses/OFL-Noto-Serif-SC.txt"+ },+ {+ "preset": "serif",+ "weight": "medium",+ "weightValue": 500,+ "family": "OpenCreator Serif Medium",+ "fullName": "OpenCreator Serif Medium",+ "desktopFile": "desktop/OpenCreatorSerif-Medium.ttf",+ "desktopSha256": "de7ee0bd5364fc0a683fb72ba469a6bbf3d27c10d967938af17bd6486f0761d5",+ "webFile": "web/OpenCreatorSerif-Medium.woff2",+ "webSha256": "0d2a91fd6f207e0d770f516e143c853a13cda7e08b660a665cd44683016d729c",+ "license": "licenses/OFL-Noto-Serif-SC.txt"+ },+ {+ "preset": "serif",+ "weight": "bold",+ "weightValue": 700,+ "family": "OpenCreator Serif Bold",+ "fullName": "OpenCreator Serif Bold",+ "desktopFile": "desktop/OpenCreatorSerif-Bold.ttf",+ "desktopSha256": "f870a1a50555b9d3a3e140b2bc9dce8ea813c4e1637d20d8cce360faaadd1417",+ "webFile": "web/OpenCreatorSerif-Bold.woff2",+ "webSha256": "efd24f5496348db066630798d07de89f4a363cae1d7bc3c1c41bd8b1adadad0f",+ "license": "licenses/OFL-Noto-Serif-SC.txt"+ },+ {+ "preset": "rounded",+ "weight": "regular",+ "weightValue": 400,+ "family": "OpenCreator Rounded Regular",+ "fullName": "OpenCreator Rounded Regular",+ "desktopFile": "desktop/OpenCreatorRounded-Regular.ttf",+ "desktopSha256": "4e7d7fe39e8d750e3b20cb3dbd3a9dc7ab0f5b01d49f72ffd8eb54913ad823d3",+ "webFile": "web/OpenCreatorRounded-Regular.woff2",+ "webSha256": "bb585e277e93cacd08608e028bdeb826e97f391158d9abdfbec222d09c9512db",+ "license": "licenses/OFL-M-PLUS-Rounded-1c.txt"+ },+ {+ "preset": "rounded",+ "weight": "medium",+ "weightValue": 500,+ "family": "OpenCreator Rounded Medium",+ "fullName": "OpenCreator Rounded Medium",+ "desktopFile": "desktop/OpenCreatorRounded-Medium.ttf",+ "desktopSha256": "45b87148483ca276cb4c7154dd19e67eef165222f3dbfba13384cc88eec3d0d3",+ "webFile": "web/OpenCreatorRounded-Medium.woff2",+ "webSha256": "40cb1f56165a0f1b14ef30e620c0bf7704d85a82662f80bbc4733b467cb22c5e",+ "license": "licenses/OFL-M-PLUS-Rounded-1c.txt"+ },+ {+ "preset": "rounded",+ "weight": "bold",+ "weightValue": 700,+ "family": "OpenCreator Rounded Bold",+ "fullName": "OpenCreator Rounded Bold",+ "desktopFile": "desktop/OpenCreatorRounded-Bold.ttf",+ "desktopSha256": "2b1f33466a4ffee8377572898e7e165028eb5997bc414af8bd8b2f108372d12a",+ "webFile": "web/OpenCreatorRounded-Bold.woff2",+ "webSha256": "a2315b8aef41747280896eee46373c9e38f1391b54f8f47c76f51cf36b578694",+ "license": "licenses/OFL-M-PLUS-Rounded-1c.txt"+ }+ ],+ "licenses": [+ {+ "file": "licenses/OFL-Noto-Sans-SC.txt",+ "sha256": "18aabf190848725e2576eefb5c29ba06aac1029d02132252a7f312eac2e50cf3"+ },+ {+ "file": "licenses/OFL-Noto-Serif-SC.txt",+ "sha256": "18aabf190848725e2576eefb5c29ba06aac1029d02132252a7f312eac2e50cf3"+ },+ {+ "file": "licenses/OFL-M-PLUS-Rounded-1c.txt",+ "sha256": "64a7bd79d7e69545e66d003153e7e4999910cbb15249a19ae2a49c472637c7e0"+ }+ ]+}diff --git a/assets/creator-subtitle-fonts/web/OpenCreatorRounded-Bold.woff2 b/assets/creator-subtitle-fonts/web/OpenCreatorRounded-Bold.woff2new file mode 100644index 00000000..21cb5331Binary files /dev/null and b/assets/creator-subtitle-fonts/web/OpenCreatorRounded-Bold.woff2 differdiff --git a/assets/creator-subtitle-fonts/web/OpenCreatorRounded-Medium.woff2 b/assets/creator-subtitle-fonts/web/OpenCreatorRounded-Medium.woff2new file mode 100644index 00000000..5d160870Binary files /dev/null and b/assets/creator-subtitle-fonts/web/OpenCreatorRounded-Medium.woff2 differdiff --git a/assets/creator-subtitle-fonts/web/OpenCreatorRounded-Regular.woff2 b/assets/creator-subtitle-fonts/web/OpenCreatorRounded-Regular.woff2new file mode 100644index 00000000..a76fefeeBinary files /dev/null and b/assets/creator-subtitle-fonts/web/OpenCreatorRounded-Regular.woff2 differdiff --git a/assets/creator-subtitle-fonts/web/OpenCreatorSans-Bold.woff2 b/assets/creator-subtitle-fonts/web/OpenCreatorSans-Bold.woff2new file mode 100644index 00000000..2823b6fcBinary files /dev/null and b/assets/creator-subtitle-fonts/web/OpenCreatorSans-Bold.woff2 differdiff --git a/assets/creator-subtitle-fonts/web/OpenCreatorSans-Medium.woff2 b/assets/creator-subtitle-fonts/web/OpenCreatorSans-Medium.woff2new file mode 100644index 00000000..74040090Binary files /dev/null and b/assets/creator-subtitle-fonts/web/OpenCreatorSans-Medium.woff2 differdiff --git a/assets/creator-subtitle-fonts/web/OpenCreatorSans-Regular.woff2 b/assets/creator-subtitle-fonts/web/OpenCreatorSans-Regular.woff2new file mode 100644index 00000000..ce944c37Binary files /dev/null and b/assets/creator-subtitle-fonts/web/OpenCreatorSans-Regular.woff2 differdiff --git a/assets/creator-subtitle-fonts/web/OpenCreatorSerif-Bold.woff2 b/assets/creator-subtitle-fonts/web/OpenCreatorSerif-Bold.woff2new file mode 100644index 00000000..b9703c40Binary files /dev/null and b/assets/creator-subtitle-fonts/web/OpenCreatorSerif-Bold.woff2 differdiff --git a/assets/creator-subtitle-fonts/web/OpenCreatorSerif-Medium.woff2 b/assets/creator-subtitle-fonts/web/OpenCreatorSerif-Medium.woff2new file mode 100644index 00000000..3295be72Binary files /dev/null and b/assets/creator-subtitle-fonts/web/OpenCreatorSerif-Medium.woff2 differdiff --git a/assets/creator-subtitle-fonts/web/OpenCreatorSerif-Regular.woff2 b/assets/creator-subtitle-fonts/web/OpenCreatorSerif-Regular.woff2new file mode 100644index 00000000..f8c0bd1bBinary files /dev/null and b/assets/creator-subtitle-fonts/web/OpenCreatorSerif-Regular.woff2 differdiff --git a/package.json b/package.jsonindex 68c46243..3c7443ad 100644--- a/package.json+++ b/package.json@@ -22,6 +22,9 @@"desktop:dist": "pnpm --filter @opencreator/desktop dist","desktop:release": "pnpm --filter @opencreator/desktop release","desktop:test": "pnpm --filter @opencreator/desktop test",+ "templates:validate": "pnpm --filter @opencreator/daemon templates:validate",+ "templates:compile": "pnpm --filter @opencreator/daemon templates:compile",+ "templates:ci": "pnpm templates:validate && pnpm templates:compile","krillinai:build": "node scripts/build-krillinai.mjs","krillinai:package": "node scripts/package-krillinai-release.mjs","krillinai:test": "node scripts/build-krillinai.mjs --test-only"diff --git a/packages/protocol/src/creator.ts b/packages/protocol/src/creator.tsindex 8f07cbf1..fbee51d2 100644--- a/packages/protocol/src/creator.ts+++ b/packages/protocol/src/creator.ts@@ -107,6 +107,57 @@ export type CreatorJson = null | boolean | number | string | CreatorJson[] | {[key: string]: CreatorJson;};+export const creatorRuntimeWorkspaces = [+ 'video-translation',+ 'video-download',+ 'image-generation',+ 'video-generation',+ 'cover-generator',+ 'smart-dubbing'+] as const;++export type CreatorRuntimeWorkspace = typeof creatorRuntimeWorkspaces[number];++export type CreatorPresetRef = {+ module: CreatorRuntimeWorkspace;+ id: string;+ version: number;+};++export type CreatorPresetRequirements = {+ service: 'tts' | 'image' | 'video';+ provider: string;+ model?: string;+};++export type CreatorPresetHighlight = {+ text: string;+ colors: string[];+};++export type CreatorPresetSummary = CreatorPresetRef & {+ title: string;+ description: string;+ coverUrl: string;+ tags: string[];+ featured: boolean;+ sortOrder: number;+ requirements: CreatorPresetRequirements | null;+ highlights: CreatorPresetHighlight[];+};++export type CreatorPresetListResponse = {+ locale: 'zh-CN' | 'en-US';+ catalogHash: string;+ presets: CreatorPresetSummary[];+};++export type CreatorPresetOrigin = CreatorPresetRef & {+ locale: 'zh-CN' | 'en-US';+ title: string;+ contentHash: string;+};+export type CreatorArtifact = {id: string;jobId: string;@@ -168,6 +219,7 @@ export type CreatorJob = {status: CreatorJobStatus;revision: number;state: Record<string, CreatorJson>;+ presetOrigin: CreatorPresetOrigin | null;agentThreadId: string | null;stages: CreatorStageRun[];artifacts: CreatorArtifact[];@@ -227,13 +279,20 @@ export type CreatorArtifactImportResponse = {deduplicated: boolean;};-export type CreateCreatorJobRequest = {- projectId: string;- templateId: string;- templateVersion?: number;- state?: Record<string, CreatorJson>;- creationKey?: string;-};+export type CreateCreatorJobRequest =+ | {+ projectId: string;+ preset: CreatorPresetRef;+ locale: 'zh-CN' | 'en-US';+ creationKey: string;+ }+ | {+ projectId: string;+ templateId: string;+ templateVersion?: number;+ state?: Record<string, CreatorJson>;+ creationKey: string;+ };export type CreatorJobListResponse = { jobs: CreatorJob[] };export type CreatorTemplateListResponse = { templates: CreatorTemplateSummary[] };@@ -479,6 +538,41 @@ export function isCreatorAgentApprovalStatus(value: unknown): value is CreatorAg&& (creatorAgentApprovalStatuses as readonly string[]).includes(value);}+export function isCreateCreatorJobRequest(value: unknown): value is CreateCreatorJobRequest {+ if (!isUnknownRecord(value)) return false;+ if (+ !isNonEmptyString(value.projectId)+ || !isNonEmptyString(value.creationKey)+ ) {+ return false;+ }+ if ('preset' in value) {+ return hasOnlyKeys(value, ['projectId', 'preset', 'locale', 'creationKey'])+ && isCreatorPresetRef(value.preset)+ && (value.locale === 'zh-CN' || value.locale === 'en-US');+ }+ return hasOnlyKeys(value, [+ 'projectId',+ 'templateId',+ 'templateVersion',+ 'state',+ 'creationKey'+ ])+ && isNonEmptyString(value.templateId)+ && (+ value.templateVersion === undefined+ || (+ typeof value.templateVersion === 'number'+ && Number.isInteger(value.templateVersion)+ && value.templateVersion > 0+ )+ )+ && (+ value.state === undefined+ || (isUnknownRecord(value.state) && isCreatorJsonValue(value.state))+ );+}+export function readCreatorResultSnapshots(value: CreatorJson | undefined): CreatorResultSnapshot[] {if (!Array.isArray(value)) return [];return value.flatMap(item => {@@ -523,3 +617,44 @@ export function readCreatorResultSnapshots(value: CreatorJson | undefined): Creafunction isCreatorJsonRecord(value: CreatorJson | undefined): value is Record<string, CreatorJson> {return value !== null && value !== undefined && typeof value === 'object' && !Array.isArray(value);}++function isCreatorPresetRef(value: unknown): value is CreatorPresetRef {+ return isUnknownRecord(value)+ && hasOnlyKeys(value, ['module', 'id', 'version'])+ && typeof value.module === 'string'+ && (creatorRuntimeWorkspaces as readonly string[]).includes(value.module)+ && isNonEmptyString(value.id)+ && typeof value.version === 'number'+ && Number.isInteger(value.version)+ && value.version > 0;+}++function hasOnlyKeys(+ value: Record<string, unknown>,+ allowed: readonly string[]+): boolean {+ const allowedKeys = new Set(allowed);+ return Object.keys(value).every(key => allowedKeys.has(key));+}++function isNonEmptyString(value: unknown): value is string {+ return typeof value === 'string' && value.trim().length > 0;+}++function isUnknownRecord(value: unknown): value is Record<string, unknown> {+ return value !== null && typeof value === 'object' && !Array.isArray(value);+}++function isCreatorJsonValue(value: unknown): value is CreatorJson {+ if (+ value === null+ || typeof value === 'boolean'+ || typeof value === 'string'+ ) {+ return true;+ }+ if (typeof value === 'number') return Number.isFinite(value);+ if (Array.isArray(value)) return value.every(isCreatorJsonValue);+ return isUnknownRecord(value)+ && Object.values(value).every(isCreatorJsonValue);+}diff --git a/packages/protocol/src/errors.ts b/packages/protocol/src/errors.tsindex a31b7e67..d1842030 100644--- a/packages/protocol/src/errors.ts+++ b/packages/protocol/src/errors.ts@@ -147,6 +147,12 @@ export type RuntimeErrorCode =| 'creator_approval_expired'| 'creator_approval_not_found'| 'creator_idempotency_key_reused'+ | 'creator_preset_not_found'+ | 'creator_preset_incompatible'+ | 'creator_preset_invalid'+ | 'creator_preset_requirement_missing'+ | 'creator_subtitle_style_unsupported'+ | 'creator_data_corrupt'| 'krillin_auth_failed'| 'krillin_path_invalid'| 'krillin_config_missing'diff --git a/packages/protocol/test/creator-contract.test.ts b/packages/protocol/test/creator-contract.test.tsindex 7f1a6df4..cc973f51 100644--- a/packages/protocol/test/creator-contract.test.ts+++ b/packages/protocol/test/creator-contract.test.ts@@ -1,6 +1,75 @@import { describe, expect, it } from 'vitest';describe('creator protocol contract', () => {+ it('exports the six public creator preset workspaces', async () => {+ const protocol = await import('../src/index.js');++ expect(protocol.creatorRuntimeWorkspaces).toEqual([+ 'video-translation',+ 'video-download',+ 'image-generation',+ 'video-generation',+ 'cover-generator',+ 'smart-dubbing'+ ]);+ });++ it('accepts blank or preset creation requests and rejects mixed fields', async () => {+ const protocol = await import('../src/index.js');++ expect(protocol.isCreateCreatorJobRequest({+ projectId: 'project-1',+ templateId: 'image-generation',+ templateVersion: 2,+ state: { prompt: 'demo' },+ creationKey: 'blank-1'+ })).toBe(true);+ expect(protocol.isCreateCreatorJobRequest({+ projectId: 'project-1',+ preset: {+ module: 'image-generation',+ id: 'ecommerce-product',+ version: 1+ },+ locale: 'zh-CN',+ creationKey: 'preset-1'+ })).toBe(true);+ expect(protocol.isCreateCreatorJobRequest({+ projectId: 'project-1',+ preset: {+ module: 'image-generation',+ id: 'ecommerce-product',+ version: 1+ },+ locale: 'zh-CN',+ state: {},+ creationKey: 'mixed-1'+ })).toBe(false);+ expect(protocol.isCreateCreatorJobRequest({+ projectId: 'project-1',+ preset: {+ module: 'image-generation',+ id: 'ecommerce-product',+ version: 1+ },+ locale: 'zh-CN',+ templateId: 'image-generation',+ creationKey: 'mixed-2'+ })).toBe(false);+ expect(protocol.isCreateCreatorJobRequest({+ projectId: 'project-1',+ templateId: 'image-generation',+ locale: 'en-US',+ creationKey: 'mixed-3'+ })).toBe(false);+ expect(protocol.isCreateCreatorJobRequest({+ projectId: 'project-1',+ templateId: 'image-generation',+ state: { prompt: undefined },+ creationKey: 'invalid-json'+ })).toBe(false);+ });+it('exports runtime-neutral creator statuses and event kinds', async () => {const protocol = await import('../src/index.js');diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex d967b100..074f29f5 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -73,6 +73,9 @@ importers:https-proxy-agent:specifier: ^7.0.6version: 7.0.6+ image-size:+ specifier: 2.0.2+ version: 2.0.2nanoid:specifier: ^5.0.9version: 5.1.16@@ -120,6 +123,9 @@ importers:esbuild:specifier: ^0.25.0version: 0.25.12+ fontkit:+ specifier: 2.0.4+ version: 2.0.4node-gyp:specifier: 13.0.2version: 13.0.2@@ -1035,6 +1041,9 @@ packages:resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==}engines: {node: '>=10'}+ '@swc/[email protected]':+ resolution: {integrity: sha512-5lSsMOTXURePglDfvuAQUqkGek9Hg2kksOYay2m0+XR++b2NWYL/4sWyuvVBIs8oKnJaxkdi9whaL/sqN13afw==}+'@szmarczak/[email protected]':resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==}engines: {node: '>=10'}@@ -1309,6 +1318,9 @@ packages:resolution: {integrity: sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==}engines: {node: 20 || >=22}+ resolution: {integrity: sha512-oTKjJdShmDuGW94SyyaoQvAjf30dZaHnjJ8uAF+u2/vGJkJbJPJAT1gDiOJP5v1Zb6f9KEyW/1HpuaWIXtGHPg==}+resolution: {integrity: sha512-JxV13hNrFxqjOc8alRbq9dK1MM79NEXYpma2B2J4wAtpWS5zIEIKqWPGCl7N4o7Uc7B7itylh7SuDujATRyyTw==}engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}@@ -1396,6 +1408,10 @@ packages:resolution: {integrity: sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==}+ resolution: {integrity: sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==}+ engines: {node: '>=0.8'}+resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}engines: {node: '>=7.0.0'}@@ -1539,6 +1555,9 @@ packages:resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==}+ resolution: {integrity: sha512-ED3jP8saaweFTjeGX8HQPjeC1YYyZs98jGNZx6IiBvxW7JG5v492kamAQB3m2wop07CvU/RQmzcKr6bgcC5D/Q==}+resolution: {integrity: sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==}@@ -1755,6 +1774,9 @@ packages:resolution: {integrity: sha512-f2JHn75x2JlwUwLenZypgczR7YWMb/uO9BvUXtus+JMgkbIkLADd38cI4EiV+OQqrGo1Zlq6V8wnqMJ8e62wUQ==}engines: {node: '>=20'}+ resolution: {integrity: sha512-syetQadaUEDNdxdugga9CpEYVaQIxOwk7GlwZWWZ19//qW4zE5bknOKeMBDYAASwnpaSHKJITRLMF9m1fp3s6g==}+resolution: {integrity: sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==}engines: {node: '>= 6'}@@ -1917,6 +1939,11 @@ packages:resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}+ resolution: {integrity: sha512-IRqXKlaXwgSMAMtpNzZa1ZAe8m+Sa1770Dhk8VkSsP9LS+iHD62Zd8FQKs8fbPiagBE7BzoFX23cxFnwshpV6w==}+ engines: {node: '>=16.x'}+ hasBin: true+resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}engines: {node: '>=8'}@@ -2271,6 +2298,9 @@ packages:resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}engines: {node: '>=10'}+ resolution: {integrity: sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==}+resolution: {integrity: sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==}@@ -2502,6 +2532,9 @@ packages:resolution: {integrity: sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==}+ resolution: {integrity: sha512-gSfoiOEA0VPE6Tukkrr7I0RBdE0s7H1eFCDBk05l1KIQT1UIKNc5JZy6jdyW6eYH3aR3g5b3PuL77rq0hvwtAw==}+resolution: {integrity: sha512-I1XxrZSQ+oErkRR4jYbAyEEu2I0avBvvMM5JN+6EBprOGRCs63ENqZ3vjavq8fBw2+62G5LF5XelKwuJpcvcxw==}engines: {node: '>=10'}@@ -2753,6 +2786,9 @@ packages:resolution: {integrity: sha512-01EAw5EDrcVrdgyCLgoSPvqznC0sVxDSVeiOz09FUpjh71G79VCqneOr+xvt7T1r76CF6ZZfPjHorN2+d+3mqA==}+ resolution: {integrity: sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==}+resolution: {integrity: sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==}@@ -2853,6 +2889,12 @@ packages:resolution: {integrity: sha512-YQ3WlbqjYMmNpdvDH64jAgLjxuAR9+649calDWhbshYaeQGO2bR4nI94ORJmwI3J9YhoKQnpyGOK+0zlWS5N5Q==}engines: {node: '>=22.19.0'}+ resolution: {integrity: sha512-CLjCCLQ6UuMxWnbIylkisbRj31qxHPAurvena/0iwSVbQ2G1VY5/HjV0IRabOEbDHlzZlRdCrD4NhB0JtU40Pg==}++ resolution: {integrity: sha512-x7bc76x0bm4prf1VLg79uhAzKw8DVboClSN5VxJuQ+LKDOVEW9CdH+VY7SP+vX7xCYQqzzgQpFqz15zeLvAtZQ==}+resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}engines: {node: '>= 4.0.0'}@@ -3840,6 +3882,10 @@ snapshots:'@sindresorhus/[email protected]': {}+ '@swc/[email protected]':+ dependencies:+ tslib: 2.8.1+'@szmarczak/[email protected]':dependencies:defer-to-connect: 2.0.1@@ -4196,6 +4242,10 @@ snapshots:dependencies:balanced-match: 4.0.4+ dependencies:+ base64-js: 1.5.1+dependencies:baseline-browser-mapping: 2.11.21@@ -4302,6 +4352,8 @@ snapshots:dependencies:mimic-response: 1.0.1+ [email protected]: {}+dependencies:color-name: 1.1.4@@ -4412,6 +4464,8 @@ snapshots:optional: true+ [email protected]: {}+dependencies:minimatch: 3.1.5@@ -4756,6 +4810,18 @@ snapshots:fast-querystring: 1.1.2safe-regex2: 5.1.1+ dependencies:+ '@swc/helpers': 0.5.23+ brotli: 1.3.3+ clone: 2.1.2+ dfa: 1.2.0+ fast-deep-equal: 3.1.3+ restructure: 3.0.2+ tiny-inflate: 1.0.3+ unicode-properties: 1.4.1+ unicode-trie: 2.0.0+dependencies:asynckit: 0.4.0@@ -4954,6 +5020,8 @@ snapshots:+ [email protected]: {}+@@ -5258,6 +5326,8 @@ snapshots:dependencies:yocto-queue: 0.1.0+ [email protected]: {}+dependencies:entities: 6.0.1@@ -5499,6 +5569,8 @@ snapshots:dependencies:lowercase-keys: 2.0.0+ [email protected]: {}+@@ -5798,6 +5870,8 @@ snapshots:dependencies:semver: 5.7.2+ [email protected]: {}+@@ -5877,6 +5951,16 @@ snapshots:+ dependencies:+ base64-js: 1.5.1+ unicode-trie: 2.0.0++ dependencies:+ pako: 0.2.9+ tiny-inflate: 1.0.3+diff --git a/runtime/krillinai/internal/service/render_stage.go b/runtime/krillinai/internal/service/render_stage.goindex e22d741d..914c6f8d 100644--- a/runtime/krillinai/internal/service/render_stage.go+++ b/runtime/krillinai/internal/service/render_stage.go@@ -2,8 +2,11 @@ package serviceimport ("context"+ "crypto/sha256"+ "encoding/json""fmt""krillin-ai/internal/storage"+ subtitlestyle "krillin-ai/internal/subtitle_style""krillin-ai/internal/types""os""os/exec"@@ -50,11 +53,11 @@ func escapeAssFilterPath(path string) string {func buildEmbedSubtitleArgs(req RenderVideoRequest) ([]string, string) {assPath := renderAssPath(req)- ass := escapeAssFilterPath(assPath)+ filter := buildAssFilterExpression(assPath, packagedSubtitleFontsDir())return []string{"-y","-i", req.InputVideo,- "-vf", fmt.Sprintf("ass=filename='%s'", ass),+ "-vf", filter,"-c:v", "libx264","-preset", "fast","-c:a", "aac",@@ -63,6 +66,27 @@ func buildEmbedSubtitleArgs(req RenderVideoRequest) ([]string, string) {}, assPath}+func buildAssFilterExpression(assPath, fontsDir string) string {+ filter := fmt.Sprintf("ass=filename='%s'", escapeAssFilterPath(assPath))+ if strings.TrimSpace(fontsDir) != "" {+ filter += fmt.Sprintf(":fontsdir='%s'", escapeAssFilterPath(fontsDir))+ }+ return filter+}++func packagedSubtitleFontsDir() string {+ resourceRoot := strings.TrimSpace(os.Getenv("KRILLINAI_RESOURCE_ROOT"))+ if resourceRoot == "" {+ return ""+ }+ fontsDir := filepath.Join(resourceRoot, "fonts")+ info, err := os.Stat(fontsDir)+ if err != nil || !info.IsDir() {+ return ""+ }+ return fontsDir+}+func renderSubtitleFile(ctx context.Context, req RenderVideoRequest) (string, error) {if err := os.MkdirAll(filepath.Dir(req.OutputFile), 0755); err != nil {return "", fmt.Errorf("renderSubtitleFile mkdir output dir error: %w", err)@@ -79,6 +103,9 @@ func renderSubtitleFile(ctx context.Context, req RenderVideoRequest) (string, erreturn "", fmt.Errorf("renderSubtitleFile prepare subtitle layout error: %w", err)}req = preparedReq+ if err := validatePackagedSubtitleFonts(req.StepParam.SubtitleStyle); err != nil {+ return "", fmt.Errorf("renderSubtitleFile subtitle fonts error: %w", err)+ }if err := srtToAss(req.SubtitleFile, assPath, req.Horizontal, req.StepParam); err != nil {return "", fmt.Errorf("renderSubtitleFile srtToAss error: %w", err)}@@ -91,6 +118,62 @@ func renderSubtitleFile(ctx context.Context, req RenderVideoRequest) (string, erreturn req.OutputFile, nil}+type subtitleFontManifest struct {+ Version int `json:"version"`+ Fonts []struct {+ Family string `json:"family"`+ File string `json:"file"`+ SHA256 string `json:"sha256"`+ } `json:"fonts"`+}++func validatePackagedSubtitleFonts(styleSet *subtitlestyle.StyleSet) error {+ resourceRoot := strings.TrimSpace(os.Getenv("KRILLINAI_RESOURCE_ROOT"))+ if resourceRoot == "" || styleSet == nil {+ return nil+ }+ fontsDir := filepath.Join(resourceRoot, "fonts")+ manifestPath := filepath.Join(fontsDir, "manifest.json")+ data, err := os.ReadFile(manifestPath)+ if err != nil {+ return fmt.Errorf("creator subtitle font manifest unavailable: %w", err)+ }+ var manifest subtitleFontManifest+ if err := json.Unmarshal(data, &manifest); err != nil {+ return fmt.Errorf("creator subtitle font manifest invalid: %w", err)+ }+ if manifest.Version != 1 || len(manifest.Fonts) == 0 {+ return fmt.Errorf("creator subtitle font manifest invalid")+ }+ available := make(map[string]bool, len(manifest.Fonts))+ for _, font := range manifest.Fonts {+ if strings.TrimSpace(font.Family) == "" || strings.TrimSpace(font.File) == "" || len(font.SHA256) != 64 {+ return fmt.Errorf("creator subtitle font manifest contains an invalid entry")+ }+ path := filepath.Join(fontsDir, filepath.Base(font.File))+ content, err := os.ReadFile(path)+ if err != nil {+ return fmt.Errorf("creator subtitle font unavailable: %s: %w", font.File, err)+ }+ actual := fmt.Sprintf("%x", sha256.Sum256(content))+ if !strings.EqualFold(actual, font.SHA256) {+ return fmt.Errorf("creator subtitle font hash mismatch: %s", font.File)+ }+ available[font.Family] = true+ }+ for _, fontName := range []string{+ styleSet.Horizontal.Major.FontName,+ styleSet.Horizontal.Minor.FontName,+ styleSet.Vertical.Major.FontName,+ styleSet.Vertical.Minor.FontName,+ } {+ if !available[fontName] {+ return fmt.Errorf("creator subtitle font alias unavailable: %s", fontName)+ }+ }+ return nil+}+type verticalConverter func(inputVideo, outputVideo, majorTitle, minorTitle string) errorfunc prepareSubtitleRenderLayout(req RenderVideoRequest, probe resolutionProbe, convert verticalConverter) (RenderVideoRequest, error) {diff --git a/runtime/krillinai/internal/service/render_stage_test.go b/runtime/krillinai/internal/service/render_stage_test.goindex 18dc22d5..32897206 100644--- a/runtime/krillinai/internal/service/render_stage_test.go+++ b/runtime/krillinai/internal/service/render_stage_test.go@@ -1,7 +1,12 @@package serviceimport (+ "crypto/sha256"+ "encoding/json"+ "fmt"+ subtitlestyle "krillin-ai/internal/subtitle_style""krillin-ai/internal/types"+ "os""path/filepath""strings""testing"@@ -66,6 +71,111 @@ func TestBuildEmbedSubtitleArgsQuotesEscapedAssFilename(t *testing.T) {}}+func TestBuildEmbedSubtitleArgsEscapesAndPassesPackagedFontsDir(t *testing.T) {+ resourceRoot := t.TempDir()+ fontsDir := filepath.Join(resourceRoot, "fonts")+ if err := os.MkdirAll(fontsDir, 0755); err != nil {+ t.Fatal(err)+ }+ t.Setenv("KRILLINAI_RESOURCE_ROOT", resourceRoot)+ req := RenderVideoRequest{+ Workdir: filepath.Join(t.TempDir(), "task,one"),+ InputVideo: "origin.mp4",+ OutputFile: "output.mp4",+ Horizontal: true,+ }++ args, _ := buildEmbedSubtitleArgs(req)+ filter := args[4]+ if !strings.Contains(filter, ":fontsdir='") {+ t.Fatalf("filter does not contain fontsdir: %q", filter)+ }+ if !strings.Contains(filter, escapeAssFilterPath(fontsDir)) {+ t.Fatalf("filter does not contain escaped fontsdir: %q", filter)+ }+}++func TestBuildAssFilterExpressionEscapesWindowsFilenameAndFontsDir(t *testing.T) {+ got := buildAssFilterExpression(+ `C:\tasks\demo\formatted.ass`,+ `C:\Program Files\OpenCreator\fonts`,+ )+ want := `ass=filename='C\:/tasks/demo/formatted.ass':fontsdir='C\:/Program Files/OpenCreator/fonts'`+ if got != want {+ t.Fatalf("buildAssFilterExpression() = %q, want %q", got, want)+ }+}++func TestValidatePackagedSubtitleFontsRejectsMissingSelectedFont(t *testing.T) {+ resourceRoot := t.TempDir()+ fontsDir := filepath.Join(resourceRoot, "fonts")+ if err := os.MkdirAll(fontsDir, 0755); err != nil {+ t.Fatal(err)+ }+ content := []byte("font")+ hash := fmt.Sprintf("%x", sha256.Sum256(content))+ manifest := map[string]any{+ "version": 1,+ "fonts": []map[string]any{{+ "family": "OpenCreator Sans Regular",+ "file": "fonts/OpenCreatorSans-Regular.ttf",+ "sha256": hash,+ }},+ }+ data, err := json.Marshal(manifest)+ if err != nil {+ t.Fatal(err)+ }+ if err := os.WriteFile(filepath.Join(fontsDir, "manifest.json"), data, 0644); err != nil {+ t.Fatal(err)+ }+ if err := os.WriteFile(filepath.Join(fontsDir, "OpenCreatorSans-Regular.ttf"), content, 0644); err != nil {+ t.Fatal(err)+ }+ t.Setenv("KRILLINAI_RESOURCE_ROOT", resourceRoot)+ style := subtitlestyle.DefaultStyleSet()+ style.Horizontal.Major.FontName = "OpenCreator Serif Bold"++ err = validatePackagedSubtitleFonts(style)+ if err == nil || !strings.Contains(err.Error(), "alias unavailable") {+ t.Fatalf("validatePackagedSubtitleFonts() error = %v, want missing alias error", err)+ }+}++func TestValidatePackagedSubtitleFontsRejectsHashMismatch(t *testing.T) {+ resourceRoot := t.TempDir()+ fontsDir := filepath.Join(resourceRoot, "fonts")+ if err := os.MkdirAll(fontsDir, 0755); err != nil {+ t.Fatal(err)+ }+ manifest := map[string]any{+ "version": 1,+ "fonts": []map[string]any{{+ "family": "OpenCreator Sans Regular",+ "file": "fonts/OpenCreatorSans-Regular.ttf",+ "sha256": strings.Repeat("0", 64),+ }},+ }+ data, err := json.Marshal(manifest)+ if err != nil {+ t.Fatal(err)+ }+ if err := os.WriteFile(filepath.Join(fontsDir, "manifest.json"), data, 0644); err != nil {+ t.Fatal(err)+ }+ if err := os.WriteFile(filepath.Join(fontsDir, "OpenCreatorSans-Regular.ttf"), []byte("tampered"), 0644); err != nil {+ t.Fatal(err)+ }+ t.Setenv("KRILLINAI_RESOURCE_ROOT", resourceRoot)+ style := subtitlestyle.DefaultStyleSet()+ style.Horizontal.Major.FontName = "OpenCreator Sans Regular"++ err = validatePackagedSubtitleFonts(style)+ if err == nil || !strings.Contains(err.Error(), "hash mismatch") {+ t.Fatalf("validatePackagedSubtitleFonts() error = %v, want hash mismatch", err)+ }+}+func TestPrepareRenderVideoInputConvertsHorizontalVerticalRequest(t *testing.T) {workdir := filepath.Join("tasks", "demo")req := RenderVideoRequest{diff --git a/runtime/krillinai/internal/subtitle_style/style.go b/runtime/krillinai/internal/subtitle_style/style.goindex 62c1e61b..2d50c83d 100644--- a/runtime/krillinai/internal/subtitle_style/style.go+++ b/runtime/krillinai/internal/subtitle_style/style.go@@ -6,10 +6,13 @@ import ("fmt""io""os"+ "regexp""strconv""strings")+var controlledOverrideTagPattern = regexp.MustCompile(`\\(xshad|yshad|blur)(-?(?:[0-9]+(?:\.[0-9]+)?|\.[0-9]+))`)+type StyleSet struct {Version int `json:"version,omitempty"`Horizontal ScreenStyle `json:"horizontal"`@@ -480,6 +483,24 @@ func validateOverrideTags(path, tags string) error {if !strings.HasPrefix(normalized, `\`) {return fmt.Errorf("%s must start with an ASS override tag backslash", path)}+ matches := controlledOverrideTagPattern.FindAllStringSubmatch(normalized, -1)+ consumed := strings.Builder{}+ for _, match := range matches {+ consumed.WriteString(match[0])+ value, err := strconv.ParseFloat(match[2], 64)+ if err != nil {+ return fmt.Errorf("%s contains an invalid %s value", path, match[1])+ }+ if match[1] == "blur" && (value < 0 || value > 10) {+ return fmt.Errorf("%s blur must be between 0 and 10", path)+ }+ if match[1] != "blur" && (value < -20 || value > 20) {+ return fmt.Errorf("%s %s must be between -20 and 20", path, match[1])+ }+ }+ if consumed.String() != normalized {+ return fmt.Errorf("%s only supports controlled xshad, yshad, and blur tags", path)+ }return nil}diff --git a/runtime/krillinai/internal/subtitle_style/style_test.go b/runtime/krillinai/internal/subtitle_style/style_test.goindex 8296b6b6..538a9dbf 100644--- a/runtime/krillinai/internal/subtitle_style/style_test.go+++ b/runtime/krillinai/internal/subtitle_style/style_test.go@@ -215,6 +215,16 @@ Dialogue: 0,0:00:00.00,0:00:01.00,Major,,0,0,0,,Injected`}}+func TestValidateRejectsUncontrolledOrOutOfRangeOverrideTags(t *testing.T) {+ for _, tags := range []string{`\bord5`, `\xshad21`, `\yshad-21`, `\blur10.1`} {+ style := DefaultStyleSet()+ style.Horizontal.Major.OverrideTags = tags+ if err := Validate(style); err == nil {+ t.Fatalf("Validate() error = nil for %q, want controlled tag validation error", tags)+ }+ }+}+func TestDialogueTagsNormalizesBraces(t *testing.T) {style := DefaultStyleSet()style.Horizontal.Major.OverrideTags = `{\blur1}`diff --git a/template/cover-generator/bilibili-red-blue-white/1/cover.webp b/template/cover-generator/bilibili-red-blue-white/1/cover.webpnew file mode 100644index 00000000..8612170cBinary files /dev/null and b/template/cover-generator/bilibili-red-blue-white/1/cover.webp differdiff --git a/template/cover-generator/bilibili-red-blue-white/1/template.json b/template/cover-generator/bilibili-red-blue-white/1/template.jsonnew file mode 100644index 00000000..4c69e083--- /dev/null+++ b/template/cover-generator/bilibili-red-blue-white/1/template.json@@ -0,0 +1,52 @@+{+ "schemaVersion": 1,+ "id": "bilibili-red-blue-white",+ "version": 1,+ "module": "cover-generator",+ "runtimeTemplate": {+ "id": "cover",+ "version": 2+ },+ "status": "published",+ "featured": false,+ "sortOrder": 53,+ "title": {+ "zh-CN": "B站红蓝白封面",+ "en-US": "Bilibili Red Blue White Cover"+ },+ "description": {+ "zh-CN": "使用红蓝白高对比配色、大标题和人物主体生成 B站风格封面。",+ "en-US": "Create a Bilibili-style cover with red, blue, and white contrast, bold text, and a clear portrait."+ },+ "cover": "cover.webp",+ "tags": [+ "bilibili",+ "red-blue-white",+ "knowledge"+ ],+ "defaults": {+ "prompt": "",+ "coverStyle": "bilibili-red-blue-white",+ "coverTextLanguage": "auto",+ "customStylePrompt": "",+ "coverHeadline": "",+ "coverSubheadline": "",+ "ratio": "16:9",+ "candidateCount": 2,+ "quality": "medium"+ },+ "defaultsByLocale": {+ "zh-CN": {+ "prompt": "B站知识视频封面,红蓝白高对比配色,人物主体清晰,标题字号大且层级明确,画面活泼但不杂乱",+ "coverTextLanguage": "zh-CN",+ "coverHeadline": "这件事没你想得那么简单",+ "coverSubheadline": "五分钟讲清底层逻辑"+ },+ "en-US": {+ "prompt": "Bilibili-style knowledge-video cover, red blue and white high contrast, clear portrait, bold hierarchical headline, energetic but organized composition",+ "coverTextLanguage": "en-US",+ "coverHeadline": "It's More Complex Than You Think",+ "coverSubheadline": "The core logic in five minutes"+ }+ }+}diff --git a/template/cover-generator/personal-growth/1/cover.webp b/template/cover-generator/personal-growth/1/cover.webpnew file mode 100644index 00000000..6b3abbd9Binary files /dev/null and b/template/cover-generator/personal-growth/1/cover.webp differdiff --git a/template/cover-generator/personal-growth/1/template.json b/template/cover-generator/personal-growth/1/template.jsonnew file mode 100644index 00000000..17fbef23--- /dev/null+++ b/template/cover-generator/personal-growth/1/template.json@@ -0,0 +1,52 @@+{+ "schemaVersion": 1,+ "id": "personal-growth",+ "version": 1,+ "module": "cover-generator",+ "runtimeTemplate": {+ "id": "cover",+ "version": 2+ },+ "status": "published",+ "featured": true,+ "sortOrder": 50,+ "title": {+ "zh-CN": "个人成长封面",+ "en-US": "Personal Growth Cover"+ },+ "description": {+ "zh-CN": "以人物、强情绪和清晰标题生成个人成长类视频封面。",+ "en-US": "Create a personal-growth video cover with a human focus and clear headline."+ },+ "cover": "cover.webp",+ "tags": [+ "cover",+ "growth",+ "youtube"+ ],+ "defaults": {+ "prompt": "",+ "coverStyle": "personal-growth",+ "coverTextLanguage": "auto",+ "customStylePrompt": "",+ "coverHeadline": "",+ "coverSubheadline": "",+ "ratio": "16:9",+ "candidateCount": 2,+ "quality": "medium"+ },+ "defaultsByLocale": {+ "zh-CN": {+ "prompt": "个人成长主题,真实人物半身近景,情绪明确,主体与标题留白平衡,强对比、可信、适合知识视频封面",+ "coverTextLanguage": "zh-CN",+ "coverHeadline": "改变,从今天开始",+ "coverSubheadline": "建立真正有效的成长系统"+ },+ "en-US": {+ "prompt": "Personal growth theme, authentic half-body portrait, clear emotion, balanced headline space, strong contrast and credible knowledge-video composition",+ "coverTextLanguage": "en-US",+ "coverHeadline": "Change Starts Today",+ "coverSubheadline": "Build a growth system that works"+ }+ }+}diff --git a/template/cover-generator/psychology/1/cover.webp b/template/cover-generator/psychology/1/cover.webpnew file mode 100644index 00000000..df0a06bcBinary files /dev/null and b/template/cover-generator/psychology/1/cover.webp differdiff --git a/template/cover-generator/psychology/1/template.json b/template/cover-generator/psychology/1/template.jsonnew file mode 100644index 00000000..613ed140--- /dev/null+++ b/template/cover-generator/psychology/1/template.json@@ -0,0 +1,52 @@+{+ "schemaVersion": 1,+ "id": "psychology",+ "version": 1,+ "module": "cover-generator",+ "runtimeTemplate": {+ "id": "cover",+ "version": 2+ },+ "status": "published",+ "featured": true,+ "sortOrder": 51,+ "title": {+ "zh-CN": "心理学洞察封面",+ "en-US": "Psychology Insight Cover"+ },+ "description": {+ "zh-CN": "以情绪人物、心理张力和强问题感生成知识视频封面。",+ "en-US": "Create a knowledge-video cover with emotional portraits and psychological tension."+ },+ "cover": "cover.webp",+ "tags": [+ "psychology",+ "insight",+ "knowledge"+ ],+ "defaults": {+ "prompt": "",+ "coverStyle": "psychology",+ "coverTextLanguage": "auto",+ "customStylePrompt": "",+ "coverHeadline": "",+ "coverSubheadline": "",+ "ratio": "16:9",+ "candidateCount": 2,+ "quality": "high"+ },+ "defaultsByLocale": {+ "zh-CN": {+ "prompt": "心理学知识视频封面,真实人物强情绪近景,视觉焦点集中,营造疑问和认知冲突,标题清晰有张力",+ "coverTextLanguage": "zh-CN",+ "coverHeadline": "你为什么总是想太多?",+ "coverSubheadline": "看懂大脑的防御机制"+ },+ "en-US": {+ "prompt": "Psychology knowledge-video cover, emotional close portrait, focused visual hierarchy, cognitive tension, clear compelling headline",+ "coverTextLanguage": "en-US",+ "coverHeadline": "Why Do You Overthink?",+ "coverSubheadline": "Understand your brain's defense system"+ }+ }+}diff --git a/template/cover-generator/wealth-platinum-red/1/cover.webp b/template/cover-generator/wealth-platinum-red/1/cover.webpnew file mode 100644index 00000000..10974ff0Binary files /dev/null and b/template/cover-generator/wealth-platinum-red/1/cover.webp differdiff --git a/template/cover-generator/wealth-platinum-red/1/template.json b/template/cover-generator/wealth-platinum-red/1/template.jsonnew file mode 100644index 00000000..f81a2db4--- /dev/null+++ b/template/cover-generator/wealth-platinum-red/1/template.json@@ -0,0 +1,52 @@+{+ "schemaVersion": 1,+ "id": "wealth-platinum-red",+ "version": 1,+ "module": "cover-generator",+ "runtimeTemplate": {+ "id": "cover",+ "version": 2+ },+ "status": "published",+ "featured": true,+ "sortOrder": 52,+ "title": {+ "zh-CN": "财富白金红封面",+ "en-US": "Wealth Platinum Red Cover"+ },+ "description": {+ "zh-CN": "使用白金红配色、强数字信息和商业人物生成财富主题封面。",+ "en-US": "Create a wealth-themed cover with platinum red colors, bold numbers, and a business portrait."+ },+ "cover": "cover.webp",+ "tags": [+ "wealth",+ "business",+ "platinum-red"+ ],+ "defaults": {+ "prompt": "",+ "coverStyle": "wealth-platinum-red",+ "coverTextLanguage": "auto",+ "customStylePrompt": "",+ "coverHeadline": "",+ "coverSubheadline": "",+ "ratio": "16:9",+ "candidateCount": 2,+ "quality": "high"+ },+ "defaultsByLocale": {+ "zh-CN": {+ "prompt": "财富与商业主题封面,白色、铂金和高饱和红色,可信商业人物,突出数字和收益结果,画面专业有冲击力",+ "coverTextLanguage": "zh-CN",+ "coverHeadline": "普通人如何积累第一桶金",+ "coverSubheadline": "三个真正可执行的方法"+ },+ "en-US": {+ "prompt": "Wealth and business cover, white platinum and saturated red palette, credible business portrait, prominent numbers and results, professional high-impact composition",+ "coverTextLanguage": "en-US",+ "coverHeadline": "Build Your First $100K",+ "coverSubheadline": "Three methods you can actually use"+ }+ }+}diff --git a/template/image-generation/ecommerce-product/1/cover.webp b/template/image-generation/ecommerce-product/1/cover.webpnew file mode 100644index 00000000..9f1afeabBinary files /dev/null and b/template/image-generation/ecommerce-product/1/cover.webp differdiff --git a/template/image-generation/ecommerce-product/1/template.json b/template/image-generation/ecommerce-product/1/template.jsonnew file mode 100644index 00000000..8fe52003--- /dev/null+++ b/template/image-generation/ecommerce-product/1/template.json@@ -0,0 +1,41 @@+{+ "schemaVersion": 1,+ "id": "ecommerce-product",+ "version": 1,+ "module": "image-generation",+ "runtimeTemplate": {+ "id": "image-generation",+ "version": 2+ },+ "status": "published",+ "featured": true,+ "sortOrder": 30,+ "title": {+ "zh-CN": "电商商品主图",+ "en-US": "E-commerce Product Hero"+ },+ "description": {+ "zh-CN": "生成干净、聚焦商品卖点的横向电商视觉。",+ "en-US": "Generate clean landscape product visuals focused on the key selling point."+ },+ "cover": "cover.webp",+ "tags": [+ "ecommerce",+ "image",+ "product"+ ],+ "defaults": {+ "prompt": "",+ "size": "1536x1024",+ "quality": "medium",+ "candidateCount": 2+ },+ "defaultsByLocale": {+ "zh-CN": {+ "prompt": "专业电商商品主图,主体清晰,干净背景,突出核心卖点,真实材质与自然光影,适合商品详情页首屏"+ },+ "en-US": {+ "prompt": "Professional e-commerce product hero image, clean background, clear product focus, realistic materials and natural lighting, suitable for a product detail page"+ }+ }+}diff --git a/template/image-generation/portrait-editorial/1/cover.webp b/template/image-generation/portrait-editorial/1/cover.webpnew file mode 100644index 00000000..02228a5aBinary files /dev/null and b/template/image-generation/portrait-editorial/1/cover.webp differdiff --git a/template/image-generation/portrait-editorial/1/template.json b/template/image-generation/portrait-editorial/1/template.jsonnew file mode 100644index 00000000..01707f5c--- /dev/null+++ b/template/image-generation/portrait-editorial/1/template.json@@ -0,0 +1,41 @@+{+ "schemaVersion": 1,+ "id": "portrait-editorial",+ "version": 1,+ "module": "image-generation",+ "runtimeTemplate": {+ "id": "image-generation",+ "version": 2+ },+ "status": "published",+ "featured": true,+ "sortOrder": 31,+ "title": {+ "zh-CN": "人物杂志肖像",+ "en-US": "Editorial Portrait"+ },+ "description": {+ "zh-CN": "生成自然光、高质感、适合人物专题与个人品牌的竖版肖像。",+ "en-US": "Create a high-quality vertical portrait for editorial stories and personal branding."+ },+ "cover": "cover.webp",+ "tags": [+ "portrait",+ "editorial",+ "personal-brand"+ ],+ "defaults": {+ "prompt": "",+ "size": "1024x1536",+ "quality": "high",+ "candidateCount": 2+ },+ "defaultsByLocale": {+ "zh-CN": {+ "prompt": "真实人物杂志肖像,自然窗光,克制高级的背景,清晰面部细节与真实肤质,人物姿态放松,适合个人品牌和人物专题"+ },+ "en-US": {+ "prompt": "Authentic editorial portrait, natural window light, restrained premium background, detailed face and realistic skin texture, relaxed pose, suitable for personal branding"+ }+ }+}diff --git a/template/image-generation/social-poster/1/cover.webp b/template/image-generation/social-poster/1/cover.webpnew file mode 100644index 00000000..aab62fdeBinary files /dev/null and b/template/image-generation/social-poster/1/cover.webp differdiff --git a/template/image-generation/social-poster/1/template.json b/template/image-generation/social-poster/1/template.jsonnew file mode 100644index 00000000..1a2672b1--- /dev/null+++ b/template/image-generation/social-poster/1/template.json@@ -0,0 +1,41 @@+{+ "schemaVersion": 1,+ "id": "social-poster",+ "version": 1,+ "module": "image-generation",+ "runtimeTemplate": {+ "id": "image-generation",+ "version": 2+ },+ "status": "published",+ "featured": false,+ "sortOrder": 32,+ "title": {+ "zh-CN": "社交媒体方形海报",+ "en-US": "Social Media Poster"+ },+ "description": {+ "zh-CN": "生成适合社交媒体发布的高对比方形视觉,一次输出四张候选。",+ "en-US": "Generate high-contrast square visuals for social media with four candidates."+ },+ "cover": "cover.webp",+ "tags": [+ "poster",+ "social",+ "square"+ ],+ "defaults": {+ "prompt": "",+ "size": "1024x1024",+ "quality": "high",+ "candidateCount": 4+ },+ "defaultsByLocale": {+ "zh-CN": {+ "prompt": "社交媒体方形海报视觉,主体明确,高对比配色,构图简洁有冲击力,保留文字排版空间,适合移动端快速浏览"+ },+ "en-US": {+ "prompt": "Square social media poster visual, clear subject, high-contrast colors, concise impactful composition, reserved typography space, optimized for mobile viewing"+ }+ }+}diff --git a/template/smart-dubbing/calm-narration/1/cover.webp b/template/smart-dubbing/calm-narration/1/cover.webpnew file mode 100644index 00000000..b674f1faBinary files /dev/null and b/template/smart-dubbing/calm-narration/1/cover.webp differdiff --git a/template/smart-dubbing/calm-narration/1/template.json b/template/smart-dubbing/calm-narration/1/template.jsonnew file mode 100644index 00000000..6f5dcb26--- /dev/null+++ b/template/smart-dubbing/calm-narration/1/template.json@@ -0,0 +1,43 @@+{+ "schemaVersion": 1,+ "id": "calm-narration",+ "version": 1,+ "module": "smart-dubbing",+ "runtimeTemplate": {+ "id": "smart-dubbing",+ "version": 1+ },+ "status": "published",+ "featured": false,+ "sortOrder": 60,+ "title": {+ "zh-CN": "沉静旁白",+ "en-US": "Calm Narration"+ },+ "description": {+ "zh-CN": "适合知识、纪录和故事内容的舒缓自然旁白。",+ "en-US": "A calm, natural narration setup for knowledge, documentary and story content."+ },+ "cover": "cover.webp",+ "tags": [+ "audio",+ "narration",+ "voice"+ ],+ "defaults": {+ "text": "",+ "voiceCode": "",+ "voiceName": "",+ "style": "calm",+ "speed": 1,+ "format": "mp3"+ },+ "defaultsByLocale": {+ "zh-CN": {+ "text": "在这里输入需要配音的文案。"+ },+ "en-US": {+ "text": "Enter the script you want to narrate."+ }+ }+}diff --git a/template/smart-dubbing/professional-news/1/cover.webp b/template/smart-dubbing/professional-news/1/cover.webpnew file mode 100644index 00000000..5312374bBinary files /dev/null and b/template/smart-dubbing/professional-news/1/cover.webp differdiff --git a/template/smart-dubbing/professional-news/1/template.json b/template/smart-dubbing/professional-news/1/template.jsonnew file mode 100644index 00000000..21d98365--- /dev/null+++ b/template/smart-dubbing/professional-news/1/template.json@@ -0,0 +1,43 @@+{+ "schemaVersion": 1,+ "id": "professional-news",+ "version": 1,+ "module": "smart-dubbing",+ "runtimeTemplate": {+ "id": "smart-dubbing",+ "version": 1+ },+ "status": "published",+ "featured": true,+ "sortOrder": 61,+ "title": {+ "zh-CN": "专业资讯播报",+ "en-US": "Professional News Read"+ },+ "description": {+ "zh-CN": "使用稳定、清晰的专业表达生成资讯、课程和企业内容配音。",+ "en-US": "Create clear, stable narration for news, courses, and corporate content."+ },+ "cover": "cover.webp",+ "tags": [+ "professional",+ "news",+ "corporate"+ ],+ "defaults": {+ "text": "",+ "voiceCode": "",+ "voiceName": "",+ "style": "professional",+ "speed": 1,+ "format": "mp3"+ },+ "defaultsByLocale": {+ "zh-CN": {+ "text": "欢迎收听本期资讯。接下来,我们将用清晰、准确的方式介绍今天最值得关注的内容。"+ },+ "en-US": {+ "text": "Welcome to today's briefing. We will clearly and accurately explain the most important developments."+ }+ }+}diff --git a/template/smart-dubbing/warm-storytelling/1/cover.webp b/template/smart-dubbing/warm-storytelling/1/cover.webpnew file mode 100644index 00000000..66ecf7e1Binary files /dev/null and b/template/smart-dubbing/warm-storytelling/1/cover.webp differdiff --git a/template/smart-dubbing/warm-storytelling/1/template.json b/template/smart-dubbing/warm-storytelling/1/template.jsonnew file mode 100644index 00000000..e354c7c2--- /dev/null+++ b/template/smart-dubbing/warm-storytelling/1/template.json@@ -0,0 +1,43 @@+{+ "schemaVersion": 1,+ "id": "warm-storytelling",+ "version": 1,+ "module": "smart-dubbing",+ "runtimeTemplate": {+ "id": "smart-dubbing",+ "version": 1+ },+ "status": "published",+ "featured": false,+ "sortOrder": 62,+ "title": {+ "zh-CN": "温暖故事讲述",+ "en-US": "Warm Storytelling"+ },+ "description": {+ "zh-CN": "使用较慢语速和温暖叙述感生成人物故事、纪录片与情感内容配音。",+ "en-US": "Create warm, slower narration for human stories, documentaries, and emotional content."+ },+ "cover": "cover.webp",+ "tags": [+ "warm",+ "storytelling",+ "documentary"+ ],+ "defaults": {+ "text": "",+ "voiceCode": "",+ "voiceName": "",+ "style": "storytelling",+ "speed": 0.9,+ "format": "wav"+ },+ "defaultsByLocale": {+ "zh-CN": {+ "text": "很多年以后,他依然记得那个安静的下午。阳光穿过窗帘,也照亮了人生新的方向。"+ },+ "en-US": {+ "text": "Years later, he still remembered that quiet afternoon, when sunlight crossed the room and revealed a new direction."+ }+ }+}diff --git a/template/video-download/audio-download/1/cover.webp b/template/video-download/audio-download/1/cover.webpnew file mode 100644index 00000000..b610198dBinary files /dev/null and b/template/video-download/audio-download/1/cover.webp differdiff --git a/template/video-download/audio-download/1/template.json b/template/video-download/audio-download/1/template.jsonnew file mode 100644index 00000000..568e98da--- /dev/null+++ b/template/video-download/audio-download/1/template.json@@ -0,0 +1,30 @@+{+ "schemaVersion": 1,+ "id": "audio-download",+ "version": 1,+ "module": "video-download",+ "runtimeTemplate": {+ "id": "video-download",+ "version": 2+ },+ "status": "published",+ "featured": false,+ "sortOrder": 20,+ "title": {+ "zh-CN": "高清音频下载",+ "en-US": "High Quality Audio Download"+ },+ "description": {+ "zh-CN": "解析公开视频链接并优先选择可用的高质量音频。",+ "en-US": "Extract high-quality audio options from a public video URL."+ },+ "cover": "cover.webp",+ "tags": [+ "audio",+ "download",+ "youtube"+ ],+ "defaults": {+ "mediaType": "audio"+ }+}diff --git a/template/video-download/highest-quality-video/1/cover.webp b/template/video-download/highest-quality-video/1/cover.webpnew file mode 100644index 00000000..7e5929d4Binary files /dev/null and b/template/video-download/highest-quality-video/1/cover.webp differdiff --git a/template/video-download/highest-quality-video/1/template.json b/template/video-download/highest-quality-video/1/template.jsonnew file mode 100644index 00000000..cdec4622--- /dev/null+++ b/template/video-download/highest-quality-video/1/template.json@@ -0,0 +1,31 @@+{+ "schemaVersion": 1,+ "id": "highest-quality-video",+ "version": 1,+ "module": "video-download",+ "runtimeTemplate": {+ "id": "video-download",+ "version": 2+ },+ "status": "published",+ "featured": true,+ "sortOrder": 21,+ "title": {+ "zh-CN": "最高画质视频",+ "en-US": "Highest Quality Video"+ },+ "description": {+ "zh-CN": "解析公开视频链接并优先进入视频清晰度选择。",+ "en-US": "Analyze a public video URL and start with video quality selection."+ },+ "cover": "cover.webp",+ "tags": [+ "video",+ "download",+ "youtube",+ "bilibili"+ ],+ "defaults": {+ "mediaType": "video"+ }+}diff --git a/template/video-generation/cinematic-story/1/cover.webp b/template/video-generation/cinematic-story/1/cover.webpnew file mode 100644index 00000000..66ecf7e1Binary files /dev/null and b/template/video-generation/cinematic-story/1/cover.webp differdiff --git a/template/video-generation/cinematic-story/1/template.json b/template/video-generation/cinematic-story/1/template.jsonnew file mode 100644index 00000000..401d3c74--- /dev/null+++ b/template/video-generation/cinematic-story/1/template.json@@ -0,0 +1,40 @@+{+ "schemaVersion": 1,+ "id": "cinematic-story",+ "version": 1,+ "module": "video-generation",+ "runtimeTemplate": {+ "id": "video-generation",+ "version": 1+ },+ "status": "published",+ "featured": true,+ "sortOrder": 41,+ "title": {+ "zh-CN": "电影感故事镜头",+ "en-US": "Cinematic Story Shot"+ },+ "description": {+ "zh-CN": "生成八秒横屏叙事镜头,强调环境、人物动作与电影光影。",+ "en-US": "Generate an eight-second horizontal narrative shot with cinematic lighting and character motion."+ },+ "cover": "cover.webp",+ "tags": [+ "cinematic",+ "story",+ "horizontal"+ ],+ "defaults": {+ "prompt": "",+ "size": "1280x720",+ "duration": 8+ },+ "defaultsByLocale": {+ "zh-CN": {+ "prompt": "电影感叙事镜头,真实环境与人物,镜头缓慢移动,动作自然连续,层次丰富的光影,明确的前中后景,画面稳定"+ },+ "en-US": {+ "prompt": "Cinematic narrative shot with a realistic environment and character, slow camera movement, natural continuous action, layered lighting, clear foreground midground and background"+ }+ }+}diff --git a/template/video-generation/product-ad/1/cover.webp b/template/video-generation/product-ad/1/cover.webpnew file mode 100644index 00000000..a752ebb1Binary files /dev/null and b/template/video-generation/product-ad/1/cover.webp differdiff --git a/template/video-generation/product-ad/1/template.json b/template/video-generation/product-ad/1/template.jsonnew file mode 100644index 00000000..232fda4f--- /dev/null+++ b/template/video-generation/product-ad/1/template.json@@ -0,0 +1,40 @@+{+ "schemaVersion": 1,+ "id": "product-ad",+ "version": 1,+ "module": "video-generation",+ "runtimeTemplate": {+ "id": "video-generation",+ "version": 1+ },+ "status": "published",+ "featured": true,+ "sortOrder": 40,+ "title": {+ "zh-CN": "商品广告短片",+ "en-US": "Product Ad Video"+ },+ "description": {+ "zh-CN": "生成五秒横屏商品广告镜头,适合展示产品质感与卖点。",+ "en-US": "Generate a five-second landscape product ad shot with premium motion."+ },+ "cover": "cover.webp",+ "tags": [+ "advertising",+ "product",+ "video"+ ],+ "defaults": {+ "prompt": "",+ "size": "1280x720",+ "duration": 5+ },+ "defaultsByLocale": {+ "zh-CN": {+ "prompt": "高质感商品广告短片,产品居中,缓慢推进镜头,真实材质细节,专业棚拍光线,动作自然流畅"+ },+ "en-US": {+ "prompt": "Premium product advertisement, centered product, slow cinematic push-in, realistic material detail, professional studio lighting, smooth natural motion"+ }+ }+}diff --git a/template/video-generation/vertical-social/1/cover.webp b/template/video-generation/vertical-social/1/cover.webpnew file mode 100644index 00000000..b79a90feBinary files /dev/null and b/template/video-generation/vertical-social/1/cover.webp differdiff --git a/template/video-generation/vertical-social/1/template.json b/template/video-generation/vertical-social/1/template.jsonnew file mode 100644index 00000000..591e02ad--- /dev/null+++ b/template/video-generation/vertical-social/1/template.json@@ -0,0 +1,40 @@+{+ "schemaVersion": 1,+ "id": "vertical-social",+ "version": 1,+ "module": "video-generation",+ "runtimeTemplate": {+ "id": "video-generation",+ "version": 1+ },+ "status": "published",+ "featured": false,+ "sortOrder": 42,+ "title": {+ "zh-CN": "竖屏社交短片",+ "en-US": "Vertical Social Clip"+ },+ "description": {+ "zh-CN": "生成六秒竖屏短片,使用明确主体、快速节奏和移动端构图。",+ "en-US": "Generate a six-second vertical clip with a clear subject and mobile-first composition."+ },+ "cover": "cover.webp",+ "tags": [+ "vertical",+ "social",+ "short-video"+ ],+ "defaults": {+ "prompt": "",+ "size": "720x1280",+ "duration": 6+ },+ "defaultsByLocale": {+ "zh-CN": {+ "prompt": "竖屏社交媒体短片,主体居中且占据主要画面,节奏明快,镜头运动简洁,光线鲜明,适合手机全屏观看"+ },+ "en-US": {+ "prompt": "Vertical social media clip, centered dominant subject, energetic pace, simple camera motion, vivid lighting, designed for full-screen mobile viewing"+ }+ }+}diff --git a/template/video-translation/bilibili-bilingual/1/cover.webp b/template/video-translation/bilibili-bilingual/1/cover.webpnew file mode 100644index 00000000..3c83b96dBinary files /dev/null and b/template/video-translation/bilibili-bilingual/1/cover.webp differdiff --git a/template/video-translation/bilibili-bilingual/1/template.json b/template/video-translation/bilibili-bilingual/1/template.jsonnew file mode 100644index 00000000..3024f3d3--- /dev/null+++ b/template/video-translation/bilibili-bilingual/1/template.json@@ -0,0 +1,69 @@+{+ "schemaVersion": 1,+ "id": "bilibili-bilingual",+ "version": 1,+ "module": "video-translation",+ "runtimeTemplate": {+ "id": "video-translation",+ "version": 2+ },+ "status": "published",+ "featured": true,+ "sortOrder": 10,+ "title": {+ "zh-CN": "B站双语精翻",+ "en-US": "Bilibili Bilingual Translation"+ },+ "description": {+ "zh-CN": "英文视频翻译为简体中文,生成醒目的双语字幕和横屏成片。",+ "en-US": "Translate English videos into Simplified Chinese with polished bilingual subtitles."+ },+ "cover": "cover.webp",+ "tags": [+ "bilibili",+ "bilingual",+ "subtitles",+ "translation"+ ],+ "defaults": {+ "sourceLanguage": "en",+ "targetLanguage": "zh_cn",+ "preferPlatformCaptions": true,+ "bilingual": true,+ "subtitlePosition": "top",+ "subtitleStyle": {+ "fontPreset": "sans",+ "fontWeight": "bold",+ "fontSize": "medium",+ "primaryColor": "#FFFFFF",+ "secondaryColor": "#FFD45C",+ "outlineColor": "#000000",+ "outlineWidth": 2,+ "shadow": {+ "enabled": true,+ "color": "#000000",+ "opacity": 0.65,+ "offsetX": 2,+ "offsetY": 2,+ "blur": 1+ }+ },+ "dubbing": false,+ "voiceCode": "",+ "voiceName": "",+ "composeVideo": true,+ "videoFormat": "horizontal",+ "verticalTitle": "",+ "verticalSubtitle": ""+ },+ "defaultsByLocale": {+ "zh-CN": {+ "sourceLanguage": "en",+ "targetLanguage": "zh_cn"+ },+ "en-US": {+ "sourceLanguage": "zh_cn",+ "targetLanguage": "en"+ }+ }+}diff --git a/template/video-translation/vertical-knowledge/1/cover.webp b/template/video-translation/vertical-knowledge/1/cover.webpnew file mode 100644index 00000000..d7025e92Binary files /dev/null and b/template/video-translation/vertical-knowledge/1/cover.webp differdiff --git a/template/video-translation/vertical-knowledge/1/template.json b/template/video-translation/vertical-knowledge/1/template.jsonnew file mode 100644index 00000000..489b04bf--- /dev/null+++ b/template/video-translation/vertical-knowledge/1/template.json@@ -0,0 +1,73 @@+{+ "schemaVersion": 1,+ "id": "vertical-knowledge",+ "version": 1,+ "module": "video-translation",+ "runtimeTemplate": {+ "id": "video-translation",+ "version": 2+ },+ "status": "published",+ "featured": false,+ "sortOrder": 12,+ "title": {+ "zh-CN": "竖屏知识切片",+ "en-US": "Vertical Knowledge Clip"+ },+ "description": {+ "zh-CN": "面向短视频平台的双语翻译,使用醒目大字字幕并生成竖屏成片。",+ "en-US": "Bilingual translation for short-video platforms with large subtitles and a vertical render."+ },+ "cover": "cover.webp",+ "tags": [+ "vertical",+ "knowledge",+ "bilingual",+ "short-video"+ ],+ "defaults": {+ "sourceLanguage": "en",+ "targetLanguage": "zh_cn",+ "preferPlatformCaptions": true,+ "bilingual": true,+ "subtitlePosition": "bottom",+ "subtitleStyle": {+ "fontPreset": "rounded",+ "fontWeight": "bold",+ "fontSize": "large",+ "primaryColor": "#FFE45C",+ "secondaryColor": "#FFFFFF",+ "outlineColor": "#000000",+ "outlineWidth": 3,+ "shadow": {+ "enabled": true,+ "color": "#000000",+ "opacity": 0.75,+ "offsetX": 3,+ "offsetY": 3,+ "blur": 1+ }+ },+ "dubbing": false,+ "voiceCode": "",+ "voiceName": "",+ "composeVideo": true,+ "videoFormat": "vertical",+ "verticalTitle": "",+ "verticalSubtitle": ""+ },+ "defaultsByLocale": {+ "zh-CN": {+ "sourceLanguage": "en",+ "targetLanguage": "zh_cn",+ "verticalTitle": "一个值得记住的观点",+ "verticalSubtitle": "60 秒快速理解"+ },+ "en-US": {+ "sourceLanguage": "zh_cn",+ "targetLanguage": "en",+ "verticalTitle": "One Idea Worth Remembering",+ "verticalSubtitle": "Understand it in 60 seconds"+ }+ }+}diff --git a/template/video-translation/youtube-dubbed/1/cover.webp b/template/video-translation/youtube-dubbed/1/cover.webpnew file mode 100644index 00000000..9a9774e2Binary files /dev/null and b/template/video-translation/youtube-dubbed/1/cover.webp differdiff --git a/template/video-translation/youtube-dubbed/1/template.json b/template/video-translation/youtube-dubbed/1/template.jsonnew file mode 100644index 00000000..011eaa49--- /dev/null+++ b/template/video-translation/youtube-dubbed/1/template.json@@ -0,0 +1,68 @@+{+ "schemaVersion": 1,+ "id": "youtube-dubbed",+ "version": 1,+ "module": "video-translation",+ "runtimeTemplate": {+ "id": "video-translation",+ "version": 2+ },+ "status": "published",+ "featured": true,+ "sortOrder": 11,+ "title": {+ "zh-CN": "YouTube 中文配音",+ "en-US": "YouTube English Dubbing"+ },+ "description": {+ "zh-CN": "将英文视频翻译为中文,生成中文配音、单语字幕和横屏成片。",+ "en-US": "Translate Chinese videos into English with dubbing, single-language subtitles, and a horizontal render."+ },+ "cover": "cover.webp",+ "tags": [+ "youtube",+ "translation",+ "dubbing"+ ],+ "defaults": {+ "sourceLanguage": "en",+ "targetLanguage": "zh_cn",+ "preferPlatformCaptions": true,+ "bilingual": false,+ "subtitlePosition": "bottom",+ "subtitleStyle": {+ "fontPreset": "sans",+ "fontWeight": "bold",+ "fontSize": "medium",+ "primaryColor": "#FFFFFF",+ "secondaryColor": "#FFFFFF",+ "outlineColor": "#000000",+ "outlineWidth": 2,+ "shadow": {+ "enabled": true,+ "color": "#000000",+ "opacity": 0.7,+ "offsetX": 2,+ "offsetY": 2,+ "blur": 1+ }+ },+ "dubbing": true,+ "voiceCode": "",+ "voiceName": "",+ "composeVideo": true,+ "videoFormat": "horizontal",+ "verticalTitle": "",+ "verticalSubtitle": ""+ },+ "defaultsByLocale": {+ "zh-CN": {+ "sourceLanguage": "en",+ "targetLanguage": "zh_cn"+ },+ "en-US": {+ "sourceLanguage": "zh_cn",+ "targetLanguage": "en"+ }+ }+}