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
fix: improve creator diagnostics, desktop networking, and component management
Leggett29365a20234e
diff --git a/apps/daemon/src/api/routes.creator-runtime.ts b/apps/daemon/src/api/routes.creator-runtime.tsindex e22a3917..afc074af 100644--- a/apps/daemon/src/api/routes.creator-runtime.ts+++ b/apps/daemon/src/api/routes.creator-runtime.ts@@ -1,10 +1,15 @@import type { FastifyInstance, FastifyReply } from 'fastify';+import { z } from 'zod';import type { YtDlpUpdateManager } from '../creator/yt-dlp/update-manager.js';import { YtDlpUpdateError } from '../creator/yt-dlp/update-manager.js';import { apiError } from './errors.js';import type { CreatorServicesConfig } from '@opencreator/protocol';import type { createKrillinDependencyLoader } from '../creator/krillin/dependency-loader.js';+const componentDownloadSchema = z.object({+ componentId: z.enum(['whisperkit', 'whisper.cpp', 'faster-whisper']).optional()+}).optional();+export async function registerCreatorRuntimeRoutes(server: FastifyInstance,ytDlp: YtDlpUpdateManager | undefined,@@ -43,10 +48,11 @@ export async function registerCreatorRuntimeRoutes(if (local === undefined) return reply.code(503).send(apiError('creator_components_unavailable', 'Local components are unavailable'));return local.loader.status(await local.readConfig());});- server.post('/creator/components/download', async (_request, reply) => {+ server.post('/creator/components/download', async (request, reply) => {if (local === undefined) return reply.code(503).send(apiError('creator_components_unavailable', 'Local components are unavailable'));try {- return await local.loader.download(await local.readConfig());+ const body = componentDownloadSchema.parse(request.body);+ return await local.loader.download(await local.readConfig(), body?.componentId);} catch (error) {return reply.code(400).send(apiError('creator_component_download_unavailable', error instanceof Error ? error.message : 'Component download unavailable'));}diff --git a/apps/daemon/src/creator-services/upstream-fetch.ts b/apps/daemon/src/creator-services/upstream-fetch.tsindex bfbf1047..ccf92884 100644--- a/apps/daemon/src/creator-services/upstream-fetch.ts+++ b/apps/daemon/src/creator-services/upstream-fetch.ts@@ -1,6 +1,6 @@import { request as httpsRequest } from 'node:https';import { HttpsProxyAgent } from 'https-proxy-agent';-import { safePublicErrorCode, type PublicErrorFacts } from '@opencreator/protocol';+import { safePublicRequestId, sanitizePublicErrorFacts, type PublicErrorFacts } from '@opencreator/protocol';import { publicFactsFromHttpResponse } from '../creator/public-error-facts.js';export async function fetchCreatorService(input: {@@ -93,28 +93,47 @@ export async function creatorServiceErrorInfo(label: string,provider?: string): Promise<{ message: string; publicFacts: PublicErrorFacts }> {- let upstreamCode: string | undefined;+ let payload: unknown;try {- const payload = await response.json() as unknown;- if (isRecord(payload)) {- const detail = isRecord(payload.error) ? payload.error : payload;- const candidate = detail.code ?? detail.error_code ?? detail.type;- const code = typeof candidate === 'number' && Number.isSafeInteger(candidate)- ? String(candidate)- : candidate;- if (typeof code === 'string' && code.length <= 80 && safePublicErrorCode(code) !== undefined) {- upstreamCode = code;- }- }- } catch {- // Some providers return an HTML or empty error response.- }+ payload = await response.json() as unknown;+ } catch {}+ const publicFacts = creatorServiceFailureFacts(payload, provider, {+ httpStatus: response.status,+ requestId: response.headers.get('x-request-id') ?? response.headers.get('x-tt-logid') ?? undefined+ });return {- message: `${label} provider rejected the request with status ${response.status}`,- publicFacts: publicFactsFromHttpResponse(response.status, provider, upstreamCode)+ message: `${label} provider rejected the request with status ${response.status}`+ + (publicFacts.upstreamCode === undefined ? '' : ` (${publicFacts.upstreamCode})`)+ + (publicFacts.upstreamMessage === undefined ? '' : `: ${publicFacts.upstreamMessage}`),+ publicFacts};}+export function creatorServiceFailureFacts(+ payload: unknown,+ provider?: string,+ options: { httpStatus?: number; requestId?: string } = {}+): PublicErrorFacts {+ const root = isRecord(payload) ? payload : {};+ const data = isRecord(root.data) ? root.data : {};+ const detail = isRecord(root.error) ? root.error : isRecord(data.error) ? data.error : isRecord(root.data) ? data : root;+ const code = detail.code ?? detail.error_code ?? detail.type+ ?? (options.httpStatus === undefined ? undefined : root.code ?? root.error_code);+ const message = detail.task_status_msg ?? detail.message ?? detail.error_msg ?? detail.msg+ ?? root.message ?? root.error_msg ?? (typeof root.error === 'string' ? root.error : undefined);+ const requestId = [detail.request_id, detail.requestId, root.request_id, root.requestId, options.requestId]+ .map(safePublicRequestId).find(candidate => candidate !== undefined);+ return sanitizePublicErrorFacts({+ ...(options.httpStatus === undefined+ ? { kind: 'provider-failed' as const, ...(provider === undefined ? {} : { provider }) }+ : publicFactsFromHttpResponse(options.httpStatus, provider)),+ upstreamCode: typeof code === 'number' && Number.isSafeInteger(code) ? String(code)+ : typeof code === 'string' ? code : undefined,+ upstreamMessage: typeof message === 'string' ? message : undefined,+ requestId+ });+}+export function isRecord(value: unknown): value is Record<string, unknown> {return typeof value === 'object' && value !== null && !Array.isArray(value);}diff --git a/apps/daemon/src/creator/executor.ts b/apps/daemon/src/creator/executor.tsindex 299f5df5..c7205bcf 100644--- a/apps/daemon/src/creator/executor.ts+++ b/apps/daemon/src/creator/executor.ts@@ -6,6 +6,8 @@ import type {CreatorJob,PublicErrorFacts} from '@opencreator/protocol';+import { publicFactsFromFailure } from './public-error-facts.js';+import { safePublicErrorMessage } from '@opencreator/protocol';export type CreatorExecutorOutput = {kind: string;@@ -41,9 +43,20 @@ export class CreatorExecutorError extends Error {readonly code: string,message: string,readonly details: Record<string, CreatorJson> = {},- readonly publicFacts?: PublicErrorFacts+ readonly publicFacts?: PublicErrorFacts,+ options?: ErrorOptions) {- super(message);+ super(message, options);this.name = 'CreatorExecutorError';}++ static from(code: string, error: unknown, fallbackMessage = 'Creator stage failed'): CreatorExecutorError {+ return new CreatorExecutorError(+ code,+ error instanceof Error ? safePublicErrorMessage(error.message) ?? fallbackMessage : fallbackMessage,+ {},+ publicFactsFromFailure(error),+ { cause: error }+ );+ }}diff --git a/apps/daemon/src/creator/image/executor.ts b/apps/daemon/src/creator/image/executor.tsindex e8dc1f69..eb26d197 100644--- a/apps/daemon/src/creator/image/executor.ts+++ b/apps/daemon/src/creator/image/executor.ts@@ -489,17 +489,18 @@ function extensionForMime(mime: 'image/png' | 'image/jpeg' | 'image/webp') {function creatorImageError(error: unknown): CreatorExecutorError {if (error instanceof ImageGenerationProviderError) {return error.code === 'config_missing'- ? new CreatorExecutorError('creator_image_config_missing', error.message)+ ? CreatorExecutorError.from('creator_image_config_missing', error): error.code === 'unsupported_capability'- ? new CreatorExecutorError('unsupported_capability', error.message)- : new CreatorExecutorError('image_generation_failed', error.message);+ ? CreatorExecutorError.from('unsupported_capability', error)+ : CreatorExecutorError.from('image_generation_failed', error);}if (error instanceof DOMException && error.name === 'AbortError') {return new CreatorExecutorError('creator_stage_canceled', 'Creator stage was canceled');}- return new CreatorExecutorError(+ return CreatorExecutorError.from('image_generation_failed',- error instanceof Error ? error.message : 'Image generation failed'+ error,+ 'Image generation failed');}diff --git a/apps/daemon/src/creator/issues.ts b/apps/daemon/src/creator/issues.tsindex dd8dcc72..9b9c7bf0 100644--- a/apps/daemon/src/creator/issues.ts+++ b/apps/daemon/src/creator/issues.ts@@ -7,7 +7,7 @@ import type {OpenCreatorIssue,PublicErrorFacts} from '@opencreator/protocol';-import { safePublicErrorCode } from '@opencreator/protocol';+import { sanitizePublicErrorFacts } from '@opencreator/protocol';import { createHash } from 'node:crypto';import type { CreatorRepository } from './repository.js';@@ -170,14 +170,7 @@ export function sanitizeIssueDetail(value: string, max = 1_000): string {}function sanitizePublicFacts(input: PublicErrorFacts): PublicErrorFacts {- const provider = input.provider === undefined ? undefined : sanitizeIdentifier(input.provider, 'unknown', 80);- const upstreamCode = input.upstreamCode === undefined ? undefined : sanitizeIdentifier(input.upstreamCode, 'unknown');- return {- kind: input.kind,- ...(provider !== undefined && safePublicErrorCode(provider) !== undefined ? { provider } : {}),- ...(upstreamCode !== undefined && safePublicErrorCode(upstreamCode) !== undefined ? { upstreamCode } : {}),- ...(input.httpStatus === undefined ? {} : { httpStatus: input.httpStatus })- };+ return sanitizePublicErrorFacts(input);}function sanitizeDisplayText(value: string, max: number): string {diff --git a/apps/daemon/src/creator/krillin/local-components.ts b/apps/daemon/src/creator/krillin/local-components.tsindex e5612c5b..57710d08 100644--- a/apps/daemon/src/creator/krillin/local-components.ts+++ b/apps/daemon/src/creator/krillin/local-components.ts@@ -26,7 +26,7 @@ export function manageLocalComponents(input: {selectedProvider: config.transcription.provider,selectedModel,components: inspection.components.map(component => {- const model = component.id === config.transcription.provider ? selectedModel : component.models[0]?.id ?? null;+ const model = localModel(config, component.id);const state = states.get(`${component.id}:${model}`);const active = [...operations.keys()].find(key => key.startsWith(`${component.id}:`));const activeState = active === undefined ? undefined : states.get(active);@@ -100,23 +100,25 @@ export function manageLocalComponents(input: {...input.loader,ensure,status,- async download(config: CreatorServicesConfig): Promise<CreatorRuntimeComponentsResponse> {- if (localModel(config) === null) throw new Error('A local transcription provider must be selected');+ async download(config: CreatorServicesConfig, componentId?: CreatorLocalComponent['id']): Promise<CreatorRuntimeComponentsResponse> {+ const downloadConfig = structuredClone(config);+ if (componentId !== undefined) downloadConfig.transcription.provider = componentId;+ if (localModel(downloadConfig) === null) throw new Error('A local transcription provider must be selected');const current = await status(config);- if (!current.components.find(component => component.id === config.transcription.provider)?.available) {+ if (!current.components.find(component => component.id === downloadConfig.transcription.provider)?.available) {throw new Error('The selected local transcription component is unavailable on this platform');}- void ensure({ config, signal: new AbortController().signal, reportProgress() {} }).catch(() => {});+ void ensure({ config: downloadConfig, signal: new AbortController().signal, reportProgress() {} }).catch(() => {});return status(config);},close() { for (const operation of operations.values()) operation.controller.abort(); }};}-function localModel(config: CreatorServicesConfig): string | null {- if (config.transcription.provider === 'whisperkit') return config.transcription.whisperKit.model;- if (config.transcription.provider === 'whisper.cpp') return config.transcription.whisperCpp.model;- if (config.transcription.provider === 'faster-whisper') return config.transcription.fasterWhisper.model;+function localModel(config: CreatorServicesConfig, provider = config.transcription.provider): string | null {+ if (provider === 'whisperkit') return config.transcription.whisperKit.model;+ if (provider === 'whisper.cpp') return config.transcription.whisperCpp.model;+ if (provider === 'faster-whisper') return config.transcription.fasterWhisper.model;return null;}diff --git a/apps/daemon/src/creator/public-error-facts.ts b/apps/daemon/src/creator/public-error-facts.tsindex 3fdfb958..a417062b 100644--- a/apps/daemon/src/creator/public-error-facts.ts+++ b/apps/daemon/src/creator/public-error-facts.ts@@ -1,4 +1,4 @@-import { isPublicErrorFacts, publicErrorKindForCode, type PublicErrorFacts } from '@opencreator/protocol';+import { isPublicErrorFacts, publicErrorKindForCode, sanitizePublicErrorFacts, type PublicErrorFacts } from '@opencreator/protocol';const NETWORK_CODES: Record<string, PublicErrorFacts['kind']> = {ENOTFOUND: 'dns',@@ -51,7 +51,10 @@ function findPublicFacts(error: unknown): PublicErrorFacts | undefined {if (seen.has(current)) break;seen.add(current);const facts = (current as { publicFacts?: unknown }).publicFacts;- if (isPublicErrorFacts(facts)) return facts;+ if (facts !== null && typeof facts === 'object') {+ const sanitized = sanitizePublicErrorFacts(facts as PublicErrorFacts);+ if (isPublicErrorFacts(sanitized)) return sanitized;+ }current = (current as { cause?: unknown }).cause;}return undefined;diff --git a/apps/daemon/src/creator/video/executor.ts b/apps/daemon/src/creator/video/executor.tsindex 30701604..77ad3f38 100644--- a/apps/daemon/src/creator/video/executor.ts+++ b/apps/daemon/src/creator/video/executor.ts@@ -119,7 +119,9 @@ export function createVideoExecutor(input: {if (result.status === 'failed') {throw new CreatorExecutorError('creator_video_generation_failed',- result.error || 'The video provider failed to generate a video'+ result.error || 'The video provider failed to generate a video',+ {},+ result.publicFacts);}@@ -310,28 +312,29 @@ function creatorVideoError(error: unknown): CreatorExecutorError {if (error instanceof CreatorExecutorError) return error;if (error instanceof VideoGenerationError) {if (error.code === 'VIDEO_GENERATION_CONFIG_REQUIRED') {- return new CreatorExecutorError('creator_video_config_missing', error.message);+ return CreatorExecutorError.from('creator_video_config_missing', error);}if (error.code === 'VALIDATION_FAILED') {- return new CreatorExecutorError('creator_video_input_invalid', error.message);+ return CreatorExecutorError.from('creator_video_input_invalid', error);}if (error.code === 'VIDEO_GENERATION_NOT_READY') {- return new CreatorExecutorError('creator_video_not_ready', error.message);+ return CreatorExecutorError.from('creator_video_not_ready', error);}if (error.code === 'VIDEO_GENERATION_UPSTREAM_ERROR'&& isUnavailableModelError(error.message)) {- return new CreatorExecutorError('creator_video_model_unavailable', error.message);+ return CreatorExecutorError.from('creator_video_model_unavailable', error);}- return new CreatorExecutorError('creator_video_upstream_error', error.message);+ return CreatorExecutorError.from('creator_video_upstream_error', error);}if (isAbortError(error)) {return new CreatorExecutorError('creator_stage_canceled', 'Creator stage was canceled');}- return new CreatorExecutorError(+ return CreatorExecutorError.from('creator_video_generation_failed',- error instanceof Error ? error.message : 'Video generation failed'+ error,+ 'Video generation failed');}diff --git a/apps/daemon/src/video-generation/service.ts b/apps/daemon/src/video-generation/service.tsindex d6def616..34c05007 100644--- a/apps/daemon/src/video-generation/service.ts+++ b/apps/daemon/src/video-generation/service.ts@@ -1,6 +1,5 @@import {defaultVideoGenerationModels,- safePublicErrorCode,videoGenerationDurations,videoGenerationSizes,type CreateVideoGenerationRequest,@@ -20,6 +19,7 @@ import {appendEndpointPath,creatorProviderEndpoint,creatorServiceErrorInfo,+ creatorServiceFailureFacts,fetchCreatorService,isRecord} from '../creator-services/upstream-fetch.js';@@ -157,6 +157,7 @@ export function createVideoGenerationService(input: {size: content.length,progressKnown: true,error: undefined,+ publicFacts: undefined,updatedAt: now().toISOString()};try {@@ -203,6 +204,7 @@ export function createVideoGenerationService(input: {progress: remote.progress,progressKnown: remote.progressKnown,error: remote.error,+ publicFacts: remote.publicFacts,createdAt: timestamp,updatedAt: timestamp}@@ -247,6 +249,7 @@ export function createVideoGenerationService(input: {progress: remote.progress,progressKnown: remote.progressKnown,error: remote.error,+ publicFacts: remote.publicFacts,updatedAt: now().toISOString()}};@@ -309,6 +312,7 @@ type RemoteVideoJob = {progress: number;progressKnown: boolean;error?: string;+ publicFacts?: PublicErrorFacts;};async function createRemoteVideoJob(@@ -545,6 +549,7 @@ function normalizeRemoteVideoJob(}const status = normalizeStatus(rawStatus);const normalizedProgress = readProgress(progress, status);+ const publicFacts = status === 'failed' ? creatorServiceFailureFacts(payload, provider) : undefined;return {upstreamId,model,@@ -552,7 +557,8 @@ function normalizeRemoteVideoJob(status,progress: normalizedProgress.value,progressKnown: normalizedProgress.known,- error: status === 'failed' ? readJobError(payload) : undefined+ error: publicFacts === undefined ? undefined : readJobError(publicFacts),+ publicFacts};}@@ -689,12 +695,10 @@ function readProgress(};}-function readJobError(payload: Record<string, unknown>): string {- const code = isRecord(payload.error) ? payload.error.code : undefined;- const safeCode = safePublicErrorCode(code);- return safeCode !== undefined- ? `Video generation failed (upstream code: ${safeCode})`- : 'Video generation failed; the provider did not return a safe error code';+function readJobError(facts: PublicErrorFacts): string {+ return 'Video generation failed'+ + (facts.upstreamCode === undefined ? '' : ` (upstream code: ${facts.upstreamCode})`)+ + (facts.upstreamMessage === undefined ? '' : `: ${facts.upstreamMessage}`);}function validateRequest(request: CreateVideoGenerationRequest) {diff --git a/apps/daemon/test/integration/creator-video-generation.test.ts b/apps/daemon/test/integration/creator-video-generation.test.tsindex b4a0c9ea..b2b7389a 100644--- a/apps/daemon/test/integration/creator-video-generation.test.ts+++ b/apps/daemon/test/integration/creator-video-generation.test.ts@@ -8,6 +8,8 @@ import { buildServer } from '../../src/api/server.js';import type { CreatorServicesConfigStore } from '../../src/creator-services/config-store.js';import { createVideoExecutor } from '../../src/creator/video/executor.js';import { createVideoGenerationService } from '../../src/video-generation/service.js';+import { createAgentContextBuilder } from '../../src/creator/agent/context-builder.js';+import { createDefaultCreatorTemplateRegistry } from '../../src/creator/templates/registry.js';let server: FastifyInstance | undefined;let tempDir = '';@@ -20,6 +22,71 @@ afterEach(async () => {});describe('creator video generation', () => {+ it.each(['submission', 'polling'] as const)('propagates %s failures through the service, executor, persisted job and Agent context', async phase => {+ tempDir = await mkdtemp(join(tmpdir(), 'creator-video-error-propagation-'));+ const config = createDefaultCreatorServicesConfig();+ config.video.seedance.apiKey = 'seedance-test-key';+ const configStore = createConfigStore(config);+ const upstreamCode = 'InputImageSensitiveContentDetected.SensitiveContent';+ const fetchImpl = vi.fn(async (_url: RequestInfo | URL, init?: RequestInit) => {+ if (phase === 'polling' && init?.method === 'POST') {+ return new Response(JSON.stringify({ id: 'remote_error_task', status: 'queued' }));+ }+ return new Response(JSON.stringify({+ ...(phase === 'polling' ? { id: 'remote_error_task', status: 'failed' } : {}),+ error: { code: upstreamCode, message: 'Reference image rejected. api_key=private-key' },+ request_id: 'provider-request-123'+ }), { status: phase === 'submission' ? 400 : 200 });+ });+ const executor = createVideoExecutor({+ service: createVideoGenerationService({ dataDir: tempDir, configStore, fetchImpl: fetchImpl as typeof fetch }),+ sleep: vi.fn(async () => undefined), probeVideo: vi.fn()+ });+ server = await buildServer({+ token: 'secret', dataDir: tempDir, codexHome: join(tempDir, 'codex-home'),+ creatorServicesConfigStore: configStore,+ codexProviderCredentialStore: { async readApiKey() { return undefined; }, async writeApiKey() {} },+ creatorExecutors: [executor]+ });+ const created = await request('POST', '/creator/jobs', {+ projectId: 'project_video', templateId: 'video-generation', creationKey: `error-${phase}`,+ state: { prompt: 'A cinematic reveal', provider: 'seedance', size: '1280x720', duration: 5 }+ });+ expect(created.statusCode).toBe(201);+ const initial = created.json().job;+ const uploaded = await server.inject({+ method: 'POST', url: `/creator/jobs/${initial.id}/reference-image?expectedRevision=${initial.revision}&fileName=reference.png&mime=image%2Fpng`,+ headers: { authorization: 'Bearer secret', 'content-type': 'application/vnd.opencreator.creator-reference-image' },+ payload: png('reference')+ });+ expect(uploaded.statusCode).toBe(201);+ const started = await request('POST', `/creator/jobs/${initial.id}/actions`, {+ action: 'run-stage', expectedRevision: uploaded.json().job.revision, input: { stageId: 'generate' }+ });+ expect(started.statusCode).toBe(200);+ const deadline = Date.now() + 10_000;+ let failed = (await request('GET', `/creator/jobs/${initial.id}`)).json().job;+ while ((failed.status !== 'failed' || failed.issues.length === 0) && Date.now() < deadline) {+ await new Promise(resolve => setTimeout(resolve, 20));+ failed = (await request('GET', `/creator/jobs/${initial.id}`)).json().job;+ }+ expect(failed.status).toBe('failed');+ const expectedFacts = {+ kind: phase === 'submission' ? 'http-rejected' : 'provider-failed', provider: 'seedance',+ ...(phase === 'submission' ? { httpStatus: 400 } : {}),+ upstreamCode, upstreamMessage: 'Reference image rejected. [redacted]', requestId: 'provider-request-123'+ };+ const issue = failed.issues.find((candidate: { stageRunId?: string }) => candidate.stageRunId === failed.stages.at(-1).id);+ expect(issue.publicFacts).toEqual(expectedFacts);+ expect(failed.stages.at(-1).errorMessage).toContain('Reference image rejected.');+ const context = createAgentContextBuilder({ templates: createDefaultCreatorTemplateRegistry() }).build(failed, null, issue.id);+ expect(context.focusedIssue?.publicFacts).toEqual(expectedFacts);+ expect(context.focusedIssue?.technicalDetail).toBeUndefined();+ expect(JSON.stringify(failed)).not.toContain('private-key');+ expect(JSON.stringify(context)).not.toContain('private-key');+ expect(fetchImpl.mock.calls.filter(([, init]) => init?.method === 'POST')).toHaveLength(1);+ });+it('runs video generation through Creator Job, Stage, Artifact and ResultSnapshot', async () => {tempDir = await mkdtemp(join(tmpdir(), 'creator-video-generation-api-'));const config = createDefaultCreatorServicesConfig();diff --git a/apps/daemon/test/unit/creator-image-executor.test.ts b/apps/daemon/test/unit/creator-image-executor.test.tsindex 7b42ffd3..a8f8f207 100644--- a/apps/daemon/test/unit/creator-image-executor.test.ts+++ b/apps/daemon/test/unit/creator-image-executor.test.ts@@ -10,6 +10,7 @@ import { join } from 'node:path';import { afterEach, describe, expect, it, vi } from 'vitest';import type { CreatorExecutorInput } from '../../src/creator/executor.js';import { createImageExecutor } from '../../src/creator/image/executor.js';+import { ImageGenerationProviderError } from '../../src/image-generation/provider.js';let tempDir = '';@@ -19,6 +20,19 @@ afterEach(async () => {});describe('creator image executor', () => {+ it('preserves provider diagnostics when all image candidates fail', async () => {+ const publicFacts = { kind: 'http-rejected' as const, provider: 'openai', httpStatus: 400,+ upstreamCode: 'invalid_image', upstreamMessage: 'Reference image is invalid', requestId: 'request-123' };+ const cause = new ImageGenerationProviderError('upstream_error', 'Reference image is invalid', publicFacts);+ const executor = createImageExecutor({+ configStore: { read: async () => createDefaultCreatorServicesConfig() },+ generate: vi.fn(async () => { throw cause; })+ });+ await expect(executor.run(stageInput({ candidateCount: 1 }))).rejects.toMatchObject({+ code: 'image_generation_failed', publicFacts, cause+ });+ });+it.each(['openai', 'jimeng', 'kling', 'gemini'] as const)('creates generated_image artifacts with %s metadata',async provider => {diff --git a/apps/daemon/test/unit/creator-issues.test.ts b/apps/daemon/test/unit/creator-issues.test.tsindex 36b76355..2a270b5b 100644--- a/apps/daemon/test/unit/creator-issues.test.ts+++ b/apps/daemon/test/unit/creator-issues.test.ts@@ -19,6 +19,24 @@ afterEach(() => {});describe('creator issues', () => {+ it('round-trips the original provider code, sanitized explanation and request ID', () => {+ const { db, repository } = createFixture();+ const service = createCreatorIssueService(repository);+ const issue = service.capture({+ jobId: 'job-1', code: 'creator_video_upstream_error', source: 'stage',+ publicFacts: { kind: 'http-rejected', provider: 'seedance', httpStatus: 400,+ upstreamCode: 'InputImageSensitiveContentDetected.SensitiveContent',+ upstreamMessage: 'Input image was rejected. Bearer private-token', requestId: 'request-123' }+ });+ expect(service.get('job-1', issue.id)?.publicFacts).toEqual({+ kind: 'http-rejected', provider: 'seedance', httpStatus: 400,+ upstreamCode: 'InputImageSensitiveContentDetected.SensitiveContent',+ upstreamMessage: 'Input image was rejected. [redacted]', requestId: 'request-123'+ });+ expect(JSON.stringify(repository.getJob('job-1'))).not.toContain('private-token');+ db.close();+ });+it('persists safe facts without carrying an old cause into a new occurrence', () => {const { db, repository } = createFixture();const service = createCreatorIssueService(repository);diff --git a/apps/daemon/test/unit/creator-local-components.test.ts b/apps/daemon/test/unit/creator-local-components.test.tsindex 98288dec..faef3c14 100644--- a/apps/daemon/test/unit/creator-local-components.test.ts+++ b/apps/daemon/test/unit/creator-local-components.test.ts@@ -18,6 +18,62 @@ function fixture() {}describe('shared local transcription components', () => {+ it.each(['openai', 'aliyun', 'funasr'] as const)('prepares WhisperKit independently of the selected %s provider and shares it with tasks', async provider => {+ const test = fixture();+ test.config.transcription.provider = provider;+ const saved = structuredClone(test.config);+ const status = await test.loader.download(test.config, 'whisperkit');+ expect(status).toMatchObject({ selectedProvider: provider, selectedModel: null });+ await vi.waitFor(() => expect(test.install).toHaveBeenCalledOnce());++ const taskConfig = structuredClone(test.config);+ taskConfig.transcription.provider = 'whisperkit';+ const task = test.loader.ensure({ config: taskConfig, signal: new AbortController().signal, reportProgress() {} });+ test.finish();+ await task;++ expect(test.config).toEqual(saved);+ expect(test.install).toHaveBeenCalledOnce();+ expect((await test.loader.status(test.config)).components.find(component => component.id === 'whisperkit')).toMatchObject({ state: 'ready', model: 'large-v2' });+ test.loader.close();+ });++ it('uses the requested component model and proxy without changing transcription settings', async () => {+ let installed = false;+ const install = vi.fn(async () => { installed = true; });+ const loader = createKrillinDependencyLoader({ root: '/tmp/opencreator-independent-whispercpp', platform: 'win32', arch: 'x64', whisperCppInstaller: { isInstalled: async () => installed, install } });+ const config = createDefaultCreatorServicesConfig();+ config.transcription.provider = 'openai';+ config.transcription.whisperCpp.model = 'large-v3-turbo';+ config.proxy = 'http://127.0.0.1:7890';+ const saved = structuredClone(config);++ expect((await loader.status(config)).components.find(component => component.id === 'whisper.cpp')?.model).toBe('large-v3-turbo');+ await loader.download(config, 'whisper.cpp');+ await vi.waitFor(() => expect(install).toHaveBeenCalledWith(expect.objectContaining({ model: 'large-v3-turbo', proxy: config.proxy })));+ await vi.waitFor(async () => expect((await loader.status(config)).components.find(component => component.id === 'whisper.cpp')?.state).toBe('ready'));++ expect(config).toEqual(saved);+ loader.close();+ });++ it('checks a ready component without downloading valid resources again', async () => {+ const install = vi.fn();+ const isInstalled = vi.fn(async () => true);+ const loader = createKrillinDependencyLoader({ root: '/tmp/opencreator-ready-whisperkit', platform: 'darwin', arch: 'arm64', whisperKitInstaller: { isInstalled, install } });+ const config = createDefaultCreatorServicesConfig();+ expect((await loader.status(config)).components.find(component => component.id === 'whisperkit')?.state).toBe('ready');+ const checksBefore = isInstalled.mock.calls.length;++ await loader.download(config, 'whisperkit');+ await vi.waitFor(() => expect(isInstalled.mock.calls.length).toBeGreaterThan(checksBefore));+ await vi.waitFor(async () => expect((await loader.status(config)).components.find(component => component.id === 'whisperkit')?.state).toBe('ready'));++ expect(install).not.toHaveBeenCalled();+ expect(config.transcription.provider).toBe('openai');+ loader.close();+ });+it('exposes a failed installation and lets users retry the same component', async () => {let installed = false;const install = vi.fn().mockRejectedValueOnce(new Error('download connection failed')).mockImplementationOnce(async () => { installed = true; });@@ -69,6 +125,8 @@ describe('shared local transcription components', () => {config.transcription.provider = 'whisperkit';expect((await loader.status(config)).components.find(component => component.id === 'whisperkit')?.state).toBe('unsupported');await expect(loader.download(config)).rejects.toThrow('unavailable');+ config.transcription.provider = 'openai';+ await expect(loader.download(config, 'whisperkit')).rejects.toThrow('unavailable');loader.close();});});diff --git a/apps/daemon/test/unit/creator-public-error-facts.test.ts b/apps/daemon/test/unit/creator-public-error-facts.test.tsindex 59dcab00..27094b37 100644--- a/apps/daemon/test/unit/creator-public-error-facts.test.ts+++ b/apps/daemon/test/unit/creator-public-error-facts.test.ts@@ -1,6 +1,7 @@import { describe, expect, it } from 'vitest';import { publicFactsFromFailure, publicFactsFromHttpResponse } from '../../src/creator/public-error-facts.js';-import { creatorServiceErrorInfo } from '../../src/creator-services/upstream-fetch.js';+import { creatorServiceErrorInfo, creatorServiceFailureFacts } from '../../src/creator-services/upstream-fetch.js';+import { CreatorExecutorError } from '../../src/creator/executor.js';describe('public error facts', () => {it('classifies only known network codes through nested causes', () => {@@ -30,6 +31,65 @@ describe('public error facts', () => {});});+ it('sanitizes explanations without discarding otherwise valid provider facts', () => {+ const cause = Object.assign(new Error('Rejected. Bearer private-token'), {+ publicFacts: { kind: 'http-rejected', provider: 'seedance', httpStatus: 400,+ upstreamCode: 'INVALID_IMAGE', upstreamMessage: 'Invalid reference. token=private' }+ });+ const wrapped = CreatorExecutorError.from('creator_video_upstream_error', cause);+ expect(wrapped.message).toBe('Rejected. [redacted]');+ expect(wrapped.publicFacts).toEqual({ kind: 'http-rejected', provider: 'seedance', httpStatus: 400,+ upstreamCode: 'INVALID_IMAGE', upstreamMessage: 'Invalid reference. [redacted]' });+ expect(JSON.stringify(wrapped)).not.toContain('private');+ });++ it('preserves the provider reason, long code and request ID across executor wrapping', async () => {+ const code = 'InputImageSensitiveContentDetected.SensitiveContent';+ const info = await creatorServiceErrorInfo(new Response(JSON.stringify({+ error: { code, message: 'Reference image was rejected. api_key=private', request_id: 'request-body-123' }+ }), { status: 400, headers: { 'x-request-id': 'request-header-123' } }), 'Video generation', 'seedance');+ expect(info.publicFacts).toEqual({+ kind: 'http-rejected', provider: 'seedance', httpStatus: 400, upstreamCode: code,+ upstreamMessage: 'Reference image was rejected. [redacted]', requestId: 'request-body-123'+ });+ const cause = Object.assign(new Error(info.message), { publicFacts: info.publicFacts });+ const wrapped = CreatorExecutorError.from('creator_video_upstream_error', cause);+ expect(wrapped.cause).toBe(cause);+ expect(publicFactsFromFailure(wrapped)).toEqual(info.publicFacts);+ expect(JSON.stringify(info)).not.toContain('private');+ });++ it('keeps HTTP and request ID facts when the response body is not JSON', async () => {+ const info = await creatorServiceErrorInfo(new Response('<html>private gateway</html>', {+ status: 502, headers: { 'x-tt-logid': 'request-log-123' }+ }), 'Video generation', 'seedance');+ expect(info.publicFacts).toEqual({ kind: 'unavailable', provider: 'seedance', httpStatus: 502, requestId: 'request-log-123' });+ expect(JSON.stringify(info)).not.toContain('private');+ });++ it('supports numeric and nested provider errors without inventing an HTTP failure for asynchronous jobs', () => {+ expect(creatorServiceFailureFacts({ error: { code: 3, message: 'Invalid duration' } }, 'veo')).toEqual({+ kind: 'provider-failed', provider: 'veo', upstreamCode: '3', upstreamMessage: 'Invalid duration'+ });+ expect(creatorServiceFailureFacts({ data: { error: { code: 'INVALID_IMAGE', message: 'Invalid reference' } } }, 'kling')).toEqual({+ kind: 'provider-failed', provider: 'kling', upstreamCode: 'INVALID_IMAGE', upstreamMessage: 'Invalid reference'+ });+ expect(creatorServiceFailureFacts({ code: 0, message: 'SUCCEED', data: { task_status: 'failed', task_status_msg: 'Reference rejected' } }, 'kling')).toEqual({+ kind: 'provider-failed', provider: 'kling', upstreamMessage: 'Reference rejected'+ });+ expect(creatorServiceFailureFacts({ error: 'Reference rejected' }, 'seedance', { httpStatus: 400 })).toEqual({+ kind: 'http-rejected', provider: 'seedance', httpStatus: 400, upstreamMessage: 'Reference rejected'+ });+ });++ it('falls back to a safe header request ID when the body request ID is invalid', async () => {+ const info = await creatorServiceErrorInfo(new Response(JSON.stringify({ error: { code: 'INVALID_IMAGE', request_id: 'sk-private-key' } }), {+ status: 400, headers: { 'x-request-id': 'header-request-123' }+ }), 'Video generation', 'seedance');+ expect(info.publicFacts.requestId).toBe('header-request-123');+ expect(JSON.stringify(info)).not.toContain('private');+ });+it('rejects token-like upstream codes and arbitrary provider messages', async () => {const response = new Response(JSON.stringify({error: { code: 'sk-private-long-secret-value-that-must-not-leak', message: 'Bearer private' }diff --git a/apps/daemon/test/unit/creator-runtime-routes.test.ts b/apps/daemon/test/unit/creator-runtime-routes.test.tsindex 7fc15d5b..7a5fc298 100644--- a/apps/daemon/test/unit/creator-runtime-routes.test.ts+++ b/apps/daemon/test/unit/creator-runtime-routes.test.ts@@ -16,6 +16,50 @@ afterEach(async () => {});describe('creator yt-dlp runtime routes', () => {+ it('downloads the requested component without changing the saved cloud provider', async () => {+ const config = createDefaultCreatorServicesConfig();+ config.transcription.provider = 'openai';+ const saved = structuredClone(config);+ let installed = false;+ const install = vi.fn(async () => { installed = true; });+ const loader = createKrillinDependencyLoader({ root: '/tmp/opencreator-independent-components-route', platform: 'darwin', arch: 'arm64', whisperKitInstaller: { isInstalled: async () => installed, install } });+ server = Fastify();+ await registerCreatorRuntimeRoutes(server, undefined, { loader, readConfig: async () => config });++ const download = await server.inject({ method: 'POST', url: '/creator/components/download', payload: { componentId: 'whisperkit' } });++ expect(download.statusCode).toBe(200);+ expect(download.json()).toMatchObject({ selectedProvider: 'openai', selectedModel: null });+ await vi.waitFor(() => expect(install).toHaveBeenCalledOnce());+ const after = await server.inject({ method: 'GET', url: '/creator/components/status' });+ expect(after.json()).toMatchObject({ selectedProvider: 'openai', components: expect.arrayContaining([expect.objectContaining({ id: 'whisperkit', state: 'ready' })]) });+ expect(config).toEqual(saved);+ });++ it.each([{ componentId: 'openai' }, { componentId: 123 }, { componentId: null }, ['whisperkit']])('rejects an invalid component request %j without downloading', async payload => {+ const install = vi.fn();+ const loader = createKrillinDependencyLoader({ root: '/tmp/opencreator-invalid-components-route', platform: 'darwin', arch: 'arm64', whisperKitInstaller: { isInstalled: async () => false, install } });+ server = Fastify();+ await registerCreatorRuntimeRoutes(server, undefined, { loader, readConfig: async () => createDefaultCreatorServicesConfig() });++ const response = await server.inject({ method: 'POST', url: '/creator/components/download', payload });++ expect(response.statusCode).toBe(400);+ expect(response.json()).toMatchObject({ error: { code: 'creator_component_download_unavailable' } });+ expect(install).not.toHaveBeenCalled();+ });++ it('rejects components unsupported by the Runtime platform even with a cloud provider', async () => {+ const loader = createKrillinDependencyLoader({ root: '/tmp/opencreator-unsupported-components-route', platform: 'linux', arch: 'x64' });+ server = Fastify();+ await registerCreatorRuntimeRoutes(server, undefined, { loader, readConfig: async () => createDefaultCreatorServicesConfig() });++ const response = await server.inject({ method: 'POST', url: '/creator/components/download', payload: { componentId: 'whisperkit' } });++ expect(response.statusCode).toBe(400);+ expect(response.json()).toMatchObject({ error: { code: 'creator_component_download_unavailable', message: expect.stringContaining('unavailable on this platform') } });+ });+it('reports local engine inventory and starts downloads independently of yt-dlp', async () => {const config = createDefaultCreatorServicesConfig();config.transcription.provider = 'whisperkit';diff --git a/apps/daemon/test/unit/creator-video-executor.test.ts b/apps/daemon/test/unit/creator-video-executor.test.tsindex 4a6f8650..6fb497bc 100644--- a/apps/daemon/test/unit/creator-video-executor.test.ts+++ b/apps/daemon/test/unit/creator-video-executor.test.ts@@ -23,6 +23,30 @@ afterEach(async () => {});describe('creator video executor', () => {+ it('preserves upstream facts and the cause when a generation request is rejected', async () => {+ const publicFacts = {+ kind: 'http-rejected' as const, provider: 'seedance', httpStatus: 400,+ upstreamCode: 'InputImageSensitiveContentDetected.SensitiveContent',+ upstreamMessage: 'Reference image was rejected', requestId: 'request-123'+ };+ const cause = new VideoGenerationError('VIDEO_GENERATION_UPSTREAM_ERROR', 'Provider rejected reference', 502, publicFacts);+ const executor = createVideoExecutor({+ service: videoService({ create: vi.fn(async () => { throw cause; }) }), probeVideo: vi.fn()+ });+ await expect(executor.run(stageInput({}, []))).rejects.toMatchObject({+ code: 'creator_video_upstream_error', publicFacts, cause+ });+ });++ it('preserves diagnostics from an asynchronous failed generation', async () => {+ const publicFacts = { kind: 'provider-failed' as const, provider: 'seedance', upstreamCode: 'CONTENT_REJECTED', upstreamMessage: 'Prompt rejected' };+ const executor = createVideoExecutor({+ service: videoService({ create: vi.fn(async () => videoResult({ status: 'failed', error: 'Prompt rejected', publicFacts })) }),+ probeVideo: vi.fn()+ });+ await expect(executor.run(stageInput({}, []))).rejects.toMatchObject({ code: 'creator_video_generation_failed', publicFacts });+ });+it('creates a generated_video artifact and keeps unknown provider progress indeterminate', async () => {tempDir = await mkdtemp(join(tmpdir(), 'creator-video-executor-'));const referencePath = join(tempDir, 'reference.png');diff --git a/apps/desktop/e2e/desktop-network.spec.ts b/apps/desktop/e2e/desktop-network.spec.tsnew file mode 100644index 00000000..133e1396--- /dev/null+++ b/apps/desktop/e2e/desktop-network.spec.ts@@ -0,0 +1,57 @@+import { execFile } from 'node:child_process';+import { mkdtempSync, rmSync } from 'node:fs';+import { createServer } from 'node:http';+import { createRequire } from 'node:module';+import type { AddressInfo } from 'node:net';+import { tmpdir } from 'node:os';+import { dirname, join, resolve } from 'node:path';+import { fileURLToPath, pathToFileURL } from 'node:url';+import { promisify } from 'node:util';+import { expect, test } from '@playwright/test';++const run = promisify(execFile);+const e2eDir = dirname(fileURLToPath(import.meta.url));+const electronExecutable = createRequire(import.meta.url)('electron') as string;++test('@package-smoke Desktop 网络在 Socket QoS 抛出 EINVAL 时仍可请求、上传和取消', async () => {+ const userData = mkdtempSync(join(tmpdir(), 'opencreator-desktop-network-'));+ const server = createServer((request, response) => {+ if (request.url === '/wait') return;+ if (request.url === '/binary') {+ response.end(Buffer.from([0, 255, 17, 23]));+ return;+ }+ if (request.url === '/events') {+ response.setHeader('Content-Type', 'text/event-stream');+ response.write('data: first\n\n');+ response.end('data: second\n\n');+ return;+ }+ if (request.url === '/upload') {+ let bytes = 0;+ request.on('data', chunk => { bytes += chunk.length; });+ request.on('end', () => response.end(JSON.stringify({ bytes })));+ return;+ }+ response.setHeader('Content-Type', 'application/json');+ response.end('{"ok":true}');+ });+ await new Promise<void>(resolve => server.listen(0, '127.0.0.1', resolve));+ try {+ const env = { ...process.env };+ delete env.ELECTRON_RUN_AS_NODE;+ const result = await run(electronExecutable, [+ resolve(e2eDir, 'fixtures/desktop-network.mjs'),+ pathToFileURL(resolve(e2eDir, '../dist/main/desktop-network.js')).href,+ `http://127.0.0.1:${(server.address() as AddressInfo).port}`,+ userData+ ], { env, timeout: 30_000, windowsHide: true });++ expect(result.stdout).toContain('DESKTOP_NETWORK_QOS_REGRESSION_PASSED');+ expect(result.stderr).not.toContain('setTypeOfService EINVAL');+ } finally {+ server.closeAllConnections();+ await new Promise<void>(resolve => server.close(() => resolve()));+ rmSync(userData, { recursive: true, force: true });+ }+});diff --git a/apps/desktop/e2e/fixtures/desktop-network.mjs b/apps/desktop/e2e/fixtures/desktop-network.mjsnew file mode 100644index 00000000..b5c01ba8--- /dev/null+++ b/apps/desktop/e2e/fixtures/desktop-network.mjs@@ -0,0 +1,46 @@+import assert from 'node:assert/strict';+import { Socket } from 'node:net';+import { app } from 'electron';++app.setPath('userData', process.argv[4]);++Socket.prototype.setTypeOfService = () => {+ throw Object.assign(new Error('setTypeOfService EINVAL'), { code: 'EINVAL' });+};+globalThis.fetch = () => {+ throw new Error('Built-in Undici fetch must not handle Desktop requests');+};++void (async () => {+ await app.whenReady();+ const { fetchDesktopRequest } = await import(process.argv[2]);+ const origin = process.argv[3];+ const json = await fetchDesktopRequest(`${origin}/json`);+ assert.deepEqual(await json.json(), { ok: true });+ const binary = await fetchDesktopRequest(`${origin}/binary`);+ assert.deepEqual([...new Uint8Array(await binary.arrayBuffer())], [0, 255, 17, 23]);+ const events = await fetchDesktopRequest(`${origin}/events`);+ assert.equal(await events.text(), 'data: first\n\ndata: second\n\n');+ const upload = await fetchDesktopRequest(`${origin}/upload`, {+ method: 'POST',+ headers: { 'Content-Type': 'application/octet-stream' },+ body: new ReadableStream({+ start(controller) {+ controller.enqueue(new Uint8Array(4096));+ controller.enqueue(new Uint8Array(8192));+ controller.close();+ }+ }),+ duplex: 'half'+ });+ assert.deepEqual(await upload.json(), { bytes: 12288 });+ const cancellation = new AbortController();+ const pending = fetchDesktopRequest(`${origin}/wait`, { signal: cancellation.signal });+ setTimeout(() => cancellation.abort(), 50);+ await assert.rejects(pending, { name: 'AbortError' });+ console.log('DESKTOP_NETWORK_QOS_REGRESSION_PASSED');+ app.exit(0);+})().catch(error => {+ console.error(error);+ app.exit(1);+});diff --git a/apps/desktop/src/main/desktop-network.ts b/apps/desktop/src/main/desktop-network.tsnew file mode 100644index 00000000..f89f83ee--- /dev/null+++ b/apps/desktop/src/main/desktop-network.ts@@ -0,0 +1,6 @@+import { net } from 'electron';++export const fetchDesktopRequest: typeof fetch = (input, init) => net.fetch(+ input instanceof URL ? input.toString() : input,+ { ...init, credentials: 'omit' }+);diff --git a/apps/desktop/src/main/main.ts b/apps/desktop/src/main/main.tsindex 5da639a3..58375512 100644--- a/apps/desktop/src/main/main.ts+++ b/apps/desktop/src/main/main.ts@@ -10,6 +10,7 @@ import {} from 'electron';import { BootstrapController } from './bootstrap-controller.js';import { DaemonManager } from './daemon-manager.js';+import { fetchDesktopRequest } from './desktop-network.js';import {startLoginShellEnvironmentRead,type LoginShellEnvironmentTask@@ -178,6 +179,7 @@ async function launchDesktop(): Promise<void> {appVersion: app.getVersion(),isOfficialBuild: app.isPackaged && readOfficialBuildMarker(process.resourcesPath),isWindowActive: () => windowManager?.isActive() === true,+ fetchImpl: fetchDesktopRequest,endpointOverride: process.env.OPENCREATOR_TELEMETRY_URL});const navigate = (route: string) => {@@ -192,6 +194,7 @@ async function launchDesktop(): Promise<void> {getConnection: () => daemon.currentConnection,settings,logger,+ fetch: fetchDesktopRequest,navigate});const loadWorkspace = (): Promise<void> => {@@ -224,7 +227,7 @@ async function launchDesktop(): Promise<void> {return workspaceLoadWork;};- await installProtocolHandler({+ const protocolController = await installProtocolHandler({webRoot,bootstrapRoot,getConnection: () => daemon.currentConnection,@@ -286,15 +289,18 @@ async function launchDesktop(): Promise<void> {const updater = startUpdater({logger,async prepareInstall() {- notifications.stop();windowManager?.flushState();settings.flush();- await telemetry.reportNow();- await logger.flush();+ protocolController.suspendRuntime();+ notifications.stop();+ await telemetry.stop();await bootstrap?.stop();+ await logger.flush();},async recoverAfterInstallFailure() {await bootstrap?.restartRuntime();+ protocolController.resumeRuntime();+ telemetry.resume();notifications.start();},setAllowQuit(value) {@@ -312,6 +318,7 @@ async function launchDesktop(): Promise<void> {if (shutdownStarted) return;shutdownStarted = true;windowManager?.beginQuit();+ protocolController.suspendRuntime();notifications.stop();updater.dispose();tray.destroy();diff --git a/apps/desktop/src/main/protocol-handler.ts b/apps/desktop/src/main/protocol-handler.tsindex d8c1783c..6c3a1ae1 100644--- a/apps/desktop/src/main/protocol-handler.ts+++ b/apps/desktop/src/main/protocol-handler.ts@@ -1,6 +1,7 @@import { open, stat } from 'node:fs/promises';import { extname, resolve, sep } from 'node:path';import { protocol } from 'electron';+import { fetchDesktopRequest } from './desktop-network.js';import type { DaemonConnection } from '../shared/types.js';import type { DesktopLogger } from './logger.js';import {@@ -28,16 +29,35 @@ export function registerPrivilegedSchemes(): void {]);}+export type ProtocolHandlerController = {+ suspendRuntime(): void;+ resumeRuntime(): void;+};+export async function installProtocolHandler(input: {webRoot: string;bootstrapRoot: string;getConnection(): DaemonConnection | undefined;logger: DesktopLogger;-}): Promise<void> {+}): Promise<ProtocolHandlerController> {+ let runtimeSuspended = false;+ const activeRequests = new Set<AbortController>();await protocol.handle('opencreator-app', async request => {const url = new URL(request.url);if (isRuntimeRequestUrl(url)) {- return await proxyRuntimeRequest(request, url, input.getConnection(), input.logger);+ if (runtimeSuspended) {+ return jsonError(503, 'RUNTIME_SHUTTING_DOWN', 'OpenCreator Runtime is stopping');+ }+ const controller = new AbortController();+ activeRequests.add(controller);+ return await proxyRuntimeRequest(+ request,+ url,+ input.getConnection(),+ input.logger,+ AbortSignal.any([request.signal, controller.signal]),+ () => activeRequests.delete(controller)+ );}if (url.hostname === 'app') {return await staticResponse(input.webRoot, request, true);@@ -47,15 +67,28 @@ export async function installProtocolHandler(input: {}return new Response('Not found', { status: 404 });});+ return {+ suspendRuntime() {+ runtimeSuspended = true;+ for (const controller of activeRequests) controller.abort();+ activeRequests.clear();+ },+ resumeRuntime() {+ runtimeSuspended = false;+ }+ };}async function proxyRuntimeRequest(request: Request,url: URL,connection: DaemonConnection | undefined,- logger: DesktopLogger+ logger: DesktopLogger,+ signal: AbortSignal,+ onComplete: () => void): Promise<Response> {if (connection === undefined) {+ onComplete();return jsonError(503, 'RUNTIME_UNAVAILABLE', 'OpenCreator Runtime is not ready');}try {@@ -72,12 +105,17 @@ async function proxyRuntimeRequest(headers,body,redirect: 'manual',- signal: request.signal+ signal};if (streamsUpload && body !== undefined) upstreamRequest.duplex = 'half';- const upstream = await fetch(target.toString(), upstreamRequest);- return relayRuntimeResponse(upstream, logger);+ signal.throwIfAborted();+ const upstream = await fetchDesktopRequest(target.toString(), upstreamRequest);+ return relayRuntimeResponse(upstream, logger, signal, onComplete);} catch (error) {+ onComplete();+ if (signal.aborted) {+ return jsonError(503, 'RUNTIME_REQUEST_ABORTED', 'Runtime request was cancelled');+ }if (error instanceof RuntimeProxyError) {return jsonError(error.status, error.code, error.message);}@@ -91,7 +129,9 @@ async function proxyRuntimeRequest(function relayRuntimeResponse(upstream: Response,- logger: DesktopLogger+ logger: DesktopLogger,+ signal: AbortSignal,+ onComplete: () => void): Response {const headers = new Headers(upstream.headers);for (const name of [@@ -108,6 +148,7 @@ function relayRuntimeResponse(}const source = upstream.body;if (source === null) {+ onComplete();return new Response(null, {status: upstream.status,statusText: upstream.statusText,@@ -120,11 +161,13 @@ function relayRuntimeResponse(if (released) return;released = true;reader.releaseLock();+ onComplete();};const body = new ReadableStream<Uint8Array>({async pull(controller) {try {const result = await reader.read();+ if (released) return;if (result.done) {release();controller.close();@@ -132,16 +175,20 @@ function relayRuntimeResponse(}controller.enqueue(result.value);} catch (error) {+ if (released) return;release();- logger.warn('Runtime proxy response stream failed', {- message: error instanceof Error ? error.message : String(error)- });+ if (!signal.aborted) {+ logger.warn('Runtime proxy response stream failed', {+ message: error instanceof Error ? error.message : String(error)+ });+ }controller.error(error);}},async cancel(reason) {- await reader.cancel(reason).catch(() => undefined);+ const cancellation = reader.cancel(reason);release();+ await cancellation.catch(() => undefined);}});return new Response(body, {diff --git a/apps/desktop/src/main/telemetry.ts b/apps/desktop/src/main/telemetry.tsindex 252a64f2..71df6a59 100644--- a/apps/desktop/src/main/telemetry.ts+++ b/apps/desktop/src/main/telemetry.ts@@ -28,6 +28,7 @@ export type DesktopTelemetryController = {enable(): Promise<void>;reportNow(): Promise<void>;stop(): Promise<void>;+ resume(): void;dispose(): void;};@@ -55,6 +56,8 @@ export function startDesktopTelemetry(input: {let stopped = false;let reportQueue = Promise.resolve();let activeReport: AbortController | undefined;+ let activeTimer: NodeJS.Timeout | undefined;+ let reportTimer: NodeJS.Timeout | undefined;const installId = () => {const existing = input.settings.read().telemetryInstallId;@@ -129,17 +132,22 @@ export function startDesktopTelemetry(input: {const clearTimers = () => {clearInterval(activeTimer);clearInterval(reportTimer);+ activeTimer = undefined;+ reportTimer = undefined;+ };+ const startTimers = () => {+ activeTimer = setInterval(() => {+ if (!input.settings.read().telemetryEnabled || !input.isWindowActive()) return;+ store.incrementActiveMinute(usageDate(now()));+ }, input.activeIntervalMs ?? ACTIVE_INTERVAL_MS);+ activeTimer.unref();+ reportTimer = setInterval(() => void reportNow(), input.reportIntervalMs ?? REPORT_INTERVAL_MS);+ reportTimer.unref();};recordLaunch();void reportNow();- const activeTimer = setInterval(() => {- if (!input.settings.read().telemetryEnabled || !input.isWindowActive()) return;- store.incrementActiveMinute(usageDate(now()));- }, input.activeIntervalMs ?? ACTIVE_INTERVAL_MS);- activeTimer.unref();- const reportTimer = setInterval(() => void reportNow(), input.reportIntervalMs ?? REPORT_INTERVAL_MS);- reportTimer.unref();+ startTimers();return {async enable() {@@ -154,6 +162,11 @@ export function startDesktopTelemetry(input: {activeReport?.abort();}},+ resume() {+ if (!stopped) return;+ stopped = false;+ startTimers();+ },dispose() {if (stopped) return;stopped = true;diff --git a/apps/desktop/test/protocol-handler.test.ts b/apps/desktop/test/protocol-handler.test.tsnew file mode 100644index 00000000..efb16c8f--- /dev/null+++ b/apps/desktop/test/protocol-handler.test.ts@@ -0,0 +1,206 @@+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';+import { fetchDesktopRequest } from '../src/main/desktop-network.js';+import { installProtocolHandler } from '../src/main/protocol-handler.js';+import type { DesktopLogger } from '../src/main/logger.js';++const network = vi.hoisted(() => ({+ fetch: vi.fn<typeof fetch>(),+ handle: vi.fn()+}));++vi.mock('electron', () => ({+ net: { fetch: network.fetch },+ protocol: { handle: network.handle }+}));++describe('Desktop protocol network lifecycle', () => {+ beforeEach(() => {+ network.fetch.mockReset();+ network.handle.mockReset();+ vi.spyOn(globalThis, 'fetch').mockImplementation(async () => {+ throw new Error('Desktop requests must not use the built-in Undici transport');+ });+ });++ afterEach(() => vi.restoreAllMocks());++ it('uses Chromium fetch for both URL and Request inputs without ambient cookies', async () => {+ network.fetch.mockImplementation(async () => new Response('ok'));+ const request = new Request('https://example.com/status');++ await fetchDesktopRequest(new URL('https://example.com/status'));+ await fetchDesktopRequest(request, { credentials: 'include' });++ expect(network.fetch).toHaveBeenNthCalledWith(1, 'https://example.com/status', {+ credentials: 'omit'+ });+ expect(network.fetch).toHaveBeenNthCalledWith(2, request, {+ credentials: 'omit'+ });+ expect(globalThis.fetch).not.toHaveBeenCalled();+ });++ it('preserves Runtime authorization, JSON bodies and response headers', async () => {+ network.fetch.mockResolvedValue(new Response('{"ok":true}', {+ status: 201,+ headers: { 'Content-Type': 'application/json', Connection: 'keep-alive' }+ }));+ const fixture = await setup();+ const response = await fixture.handle(new Request(runtimeUrl('/runs'), {+ method: 'POST',+ headers: { Authorization: 'Bearer untrusted', 'Content-Type': 'application/json' },+ body: '{"input":"hello"}'+ }));+ const [target, init] = network.fetch.mock.calls[0]!;++ expect(target).toBe('http://127.0.0.1:60764/runs');+ expect(new Headers(init?.headers).get('authorization')).toBe('Bearer runtime-token');+ expect(new TextDecoder().decode(init?.body as Uint8Array)).toBe('{"input":"hello"}');+ expect(init?.redirect).toBe('manual');+ expect(response.status).toBe(201);+ expect(response.headers.get('connection')).toBeNull();+ expect(await response.json()).toEqual({ ok: true });+ fixture.controller.suspendRuntime();+ expect(init?.signal?.aborted).toBe(false);+ });++ it('keeps Creator source uploads streaming', async () => {+ network.fetch.mockResolvedValue(new Response('{}'));+ const fixture = await setup();+ const request = new Request(runtimeUrl('/creator/jobs/creator_job_test/source-video'), {+ method: 'POST',+ headers: { 'Content-Type': 'application/vnd.opencreator.creator-source' },+ body: new ReadableStream({ start: controller => controller.close() }),+ duplex: 'half'+ } as RequestInit);++ const response = await fixture.handle(request);+ const init = network.fetch.mock.calls[0]![1] as RequestInit & { duplex?: string };++ expect(init.body).toBe(request.body);+ expect(init.duplex).toBe('half');+ await response.text();+ });++ it('aborts pending requests and rejects new requests until Runtime resumes', async () => {+ network.fetch.mockImplementation(async (_url, init) => await new Promise<Response>(+ (_resolve, reject) => init?.signal?.addEventListener('abort', () => {+ reject(init.signal?.reason);+ }, { once: true })+ ));+ const fixture = await setup();+ const pending = fixture.handle(new Request(runtimeUrl('/healthz')));+ await vi.waitFor(() => expect(network.fetch).toHaveBeenCalledTimes(1));+ fixture.controller.suspendRuntime();++ expect((await pending).status).toBe(503);+ const blocked = await fixture.handle(new Request(runtimeUrl('/healthz')));+ expect(blocked.status).toBe(503);+ expect(await blocked.json()).toMatchObject({ error: { code: 'RUNTIME_SHUTTING_DOWN' } });+ expect(network.fetch).toHaveBeenCalledTimes(1);+ expect(fixture.logger.warn).not.toHaveBeenCalled();++ network.fetch.mockImplementation(async () => new Response('ready'));+ fixture.controller.resumeRuntime();+ expect(await (await fixture.handle(new Request(runtimeUrl('/healthz')))).text()).toBe('ready');+ });++ it('also cancels active SSE streams after response headers arrive', async () => {+ network.fetch.mockImplementation(async (_url, init) => new Response(+ new ReadableStream({+ start(controller) {+ controller.enqueue(new TextEncoder().encode('data: ready\n\n'));+ init?.signal?.addEventListener('abort', () => controller.error(init.signal?.reason), {+ once: true+ });+ }+ }),+ { headers: { 'Content-Type': 'text/event-stream' } }+ ));+ const fixture = await setup();+ const response = await fixture.handle(new Request(runtimeUrl('/events')));+ const reader = response.body!.getReader();+ expect(new TextDecoder().decode((await reader.read()).value)).toBe('data: ready\n\n');++ fixture.controller.suspendRuntime();++ await expect(reader.read()).rejects.toMatchObject({ name: 'AbortError' });+ expect(network.fetch.mock.calls[0]![1]?.signal?.aborted).toBe(true);+ expect(fixture.logger.warn).not.toHaveBeenCalled();+ });++ it('forwards renderer cancellation without logging a transport failure', async () => {+ network.fetch.mockImplementation(async (_url, init) => await new Promise<Response>(+ (_resolve, reject) => init?.signal?.addEventListener('abort', () => reject(init.signal?.reason), {+ once: true+ })+ ));+ const fixture = await setup();+ const cancellation = new AbortController();+ const pending = fixture.handle(new Request(runtimeUrl('/healthz'), {+ signal: cancellation.signal+ }));+ await vi.waitFor(() => expect(network.fetch).toHaveBeenCalledTimes(1));+ cancellation.abort();++ expect((await pending).status).toBe(503);+ expect(fixture.logger.warn).not.toHaveBeenCalled();+ });++ it('releases requests when the renderer cancels a response stream', async () => {+ const cancel = vi.fn();+ network.fetch.mockResolvedValue(new Response(new ReadableStream({ cancel })));+ const fixture = await setup();+ const response = await fixture.handle(new Request(runtimeUrl('/events')));++ await response.body!.cancel('window closed');+ fixture.controller.suspendRuntime();++ expect(cancel).toHaveBeenCalledWith('window closed');+ expect(network.fetch.mock.calls[0]![1]?.signal?.aborted).toBe(false);+ expect(fixture.logger.warn).not.toHaveBeenCalled();+ });++ it('still reports genuine transport errors', async () => {+ network.fetch.mockRejectedValue(new Error('connection refused'));+ const fixture = await setup();+ const response = await fixture.handle(new Request(runtimeUrl('/healthz')));++ expect(response.status).toBe(502);+ expect(await response.json()).toMatchObject({ error: { code: 'RUNTIME_PROXY_FAILED' } });+ expect(fixture.logger.warn).toHaveBeenCalledWith('Runtime proxy request failed', {+ path: '/.opencreator/runtime/healthz',+ message: 'connection refused'+ });+ });++ it('rejects unsafe Runtime paths before opening a network connection', async () => {+ const fixture = await setup();+ const response = await fixture.handle(new Request(runtimeUrl('/%2f%2fattacker.example')));++ expect(response.status).toBe(400);+ expect(network.fetch).not.toHaveBeenCalled();+ });+});++function runtimeUrl(path: string): string {+ return `opencreator-app://app/.opencreator/runtime${path}`;+}++async function setup() {+ const logger: DesktopLogger = {+ info: vi.fn(),+ warn: vi.fn(),+ error: vi.fn(),+ warnRateLimited: vi.fn(),+ flush: vi.fn(async () => undefined)+ };+ const controller = await installProtocolHandler({+ webRoot: '/unused/web',+ bootstrapRoot: '/unused/bootstrap',+ getConnection: () => ({ address: 'http://127.0.0.1:60764', token: 'runtime-token' }),+ logger+ });+ const handle = network.handle.mock.calls[0]![1] as (request: Request) => Promise<Response>;+ return { controller, handle, logger };+}diff --git a/apps/desktop/test/telemetry.test.ts b/apps/desktop/test/telemetry.test.tsindex a2ebd496..8920942a 100644--- a/apps/desktop/test/telemetry.test.ts+++ b/apps/desktop/test/telemetry.test.ts@@ -277,6 +277,46 @@ describe('desktop telemetry', () => {}});+ it('resumes timers after a failed update without counting another launch or reporting on exit', async () => {+ vi.useFakeTimers();+ const telemetryMemory = memoryPersistence();+ const fetchImpl = vi.fn(async () => new Response('{}'));+ const controller = startDesktopTelemetry({+ path: '/virtual/telemetry.json',+ settings: memorySettings(),+ logger: logger(),+ appVersion: '3.0.1',+ isOfficialBuild: true,+ isWindowActive: () => true,+ now: () => new Date('2026-09-07T02:00:00Z'),+ fetchImpl,+ persistence: telemetryMemory.persistence as TelemetryPersistence,+ activeIntervalMs: 10,+ reportIntervalMs: 100_000+ });+ try {+ await controller.reportNow();+ await vi.advanceTimersByTimeAsync(10);+ fetchImpl.mockClear();++ await controller.stop();+ await controller.reportNow();+ await vi.advanceTimersByTimeAsync(100);+ expect(fetchImpl).not.toHaveBeenCalled();++ controller.resume();+ controller.resume();+ await vi.advanceTimersByTimeAsync(20);+ expect(fetchImpl).not.toHaveBeenCalled();+ expect(JSON.parse(telemetryMemory.read())).toEqual({+ days: [{ date: '2026-09-07', launchCount: 1, activeMinutes: 3 }]+ });+ } finally {+ controller.dispose();+ vi.useRealTimers();+ }+ });+it('aborts an in-flight report without waiting for the network while stopping', async () => {let requestSignal: AbortSignal | undefined;let markRequestStarted: () => void = () => undefined;diff --git a/apps/web/src/app/use-runtime-dependencies.test.tsx b/apps/web/src/app/use-runtime-dependencies.test.tsxindex 51eae938..9891a199 100644--- a/apps/web/src/app/use-runtime-dependencies.test.tsx+++ b/apps/web/src/app/use-runtime-dependencies.test.tsx@@ -1,4 +1,4 @@-import type { CreatorYtDlpStatus } from '@opencreator/protocol';+import type { CreatorRuntimeComponentsResponse, CreatorYtDlpStatus } from '@opencreator/protocol';import { act, renderHook, waitFor } from '@testing-library/react';import { describe, expect, it, vi } from 'vitest';import { ApiClientError } from '../runtime/client.js';@@ -6,6 +6,25 @@ import type { RuntimeDependencyService } from '../services/runtime-dependency-seimport { useRuntimeDependencies } from './use-runtime-dependencies.js';describe('useRuntimeDependencies', () => {+ it('forwards a component download independently of the selected transcription provider', async () => {+ const componentsStatus: CreatorRuntimeComponentsResponse = {+ platform: 'darwin', arch: 'arm64', selectedProvider: 'openai', selectedModel: null, components: []+ };+ const service: RuntimeDependencyService = {+ getComponentsStatus: vi.fn(async () => componentsStatus),+ downloadComponents: vi.fn(async () => componentsStatus),+ getYtDlpStatus: vi.fn(async () => ({ ytDlp: status() })),+ checkYtDlpUpdate: vi.fn(), updateYtDlp: vi.fn()+ };+ const { result } = renderHook(() => useRuntimeDependencies({ connected: true, service }));+ await waitFor(() => expect(result.current.componentsStatus).toEqual(componentsStatus));++ await act(async () => { await result.current.downloadComponents?.('whisperkit'); });++ expect(service.downloadComponents).toHaveBeenCalledWith('whisperkit');+ expect(result.current.componentsStatus?.selectedProvider).toBe('openai');+ });+it('checks yt-dlp once the Runtime connects and the saved interval is due', async () => {const getYtDlpStatus = vi.fn(async () => ({ytDlp: status({ checkDue: true })diff --git a/apps/web/src/app/use-runtime-dependencies.ts b/apps/web/src/app/use-runtime-dependencies.tsindex 4a15f94b..03c7158e 100644--- a/apps/web/src/app/use-runtime-dependencies.ts+++ b/apps/web/src/app/use-runtime-dependencies.ts@@ -1,4 +1,4 @@-import type { CreatorRuntimeComponentsResponse, CreatorYtDlpStatus, OpenCreatorIssue } from '@opencreator/protocol';+import type { CreatorLocalComponent, CreatorRuntimeComponentsResponse, CreatorYtDlpStatus, OpenCreatorIssue } from '@opencreator/protocol';import { useCallback, useEffect, useRef, useState } from 'react';import { usePageIssueState } from '../features/issues/page-issue-state.js';import type { RuntimeDependencyService } from '../services/runtime-dependency-service.js';@@ -13,7 +13,7 @@ export type RuntimeDependenciesController = {componentsStatus?: CreatorRuntimeComponentsResponse;componentError?: string;refreshComponents?(): Promise<void>;- downloadComponents?(): Promise<void>;+ downloadComponents?(componentId?: CreatorLocalComponent['id']): Promise<void>;ytDlpStatus?: CreatorYtDlpStatus;phase: RuntimeDependencyPhase;/** @deprecated Runtime failures are exposed through issues. */@@ -60,10 +60,12 @@ export function useRuntimeDependencies(input: {return () => { stopped = true; clearTimeout(timer); };}, [input.connected, refreshComponents, componentDownloadActive]);- const downloadComponents = useCallback(async () => {+ const downloadComponents = useCallback(async (componentId?: CreatorLocalComponent['id']) => {if (!input.connected || !input.service?.downloadComponents) return;try {- setComponentsStatus(await input.service.downloadComponents());+ const status = await input.service.downloadComponents(componentId);+ componentsRef.current = status;+ setComponentsStatus(status);setComponentError(undefined);} catch (error) {setComponentError(error instanceof Error ? error.message : 'Unable to download local components');diff --git a/apps/web/src/features/dashboard/CreatorCollaborationPanel.test.tsx b/apps/web/src/features/dashboard/CreatorCollaborationPanel.test.tsxindex 159d088f..1ecee78a 100644--- a/apps/web/src/features/dashboard/CreatorCollaborationPanel.test.tsx+++ b/apps/web/src/features/dashboard/CreatorCollaborationPanel.test.tsx@@ -1,9 +1,9 @@import type { CreatorJob } from '@opencreator/protocol';import { useEffect } from 'react';-import { fireEvent, render, screen, waitFor } from '@testing-library/react';+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';import { describe, expect, it, vi } from 'vitest';import { LanguageProvider } from '../../i18n/LanguageProvider.js';-import CreatorCollaborationPanel from './CreatorCollaborationPanel.js';+import CreatorCollaborationPanel, { CreatorTaskProgressNotice } from './CreatorCollaborationPanel.js';import {shortVideoScriptPanelAdapter,coverPanelAdapter,@@ -50,6 +50,91 @@ function TimelineUpdateHarness() {);}+function ProgressHeartbeatControl() {+ const session = useCreatorSession();+ return <button type="button" onClick={() => session.applyRemoteSnapshot({+ ...session.job,+ revision: session.job.revision + 1,+ stages: session.job.stages.map(stage => ({ ...stage, progress: { ...stage.progress } }))+ })}>Receive status</button>;+}++describe('shared video progress timing', () => {+ it('updates elapsed time without inventing progress and tracks received status independently of language', () => {+ vi.useFakeTimers();+ vi.setSystemTime(new Date('2026-09-07T08:00:08.000Z'));+ try {+ const view = render(+ <LanguageProvider initialPreference="en-US">+ <LanguageSwitchControls />+ <CreatorSessionProvider initialJob={videoGenerationJob()} service={{ applyAction: vi.fn(), runAgentTurn: vi.fn() } as never}>+ <CreatorTaskProgressNotice stageId="generate" />+ <ProgressHeartbeatControl />+ </CreatorSessionProvider>+ </LanguageProvider>+ );+ const notice = screen.getByRole('status', { name: 'Task progress' });+ expect(notice).toHaveTextContent('Elapsed 0:05');+ act(() => { vi.advanceTimersByTime(6_000); });+ expect(notice).toHaveTextContent('Elapsed 0:11');+ expect(notice).toHaveTextContent('Last status received 6s ago');+ expect(notice).not.toHaveTextContent('%');++ fireEvent.click(screen.getByRole('button', { name: 'sv-SE' }));+ expect(notice).toHaveTextContent('Förfluten tid 0:11');+ expect(notice).toHaveTextContent('Senaste status mottogs för 6s sedan');+ fireEvent.click(screen.getByRole('button', { name: 'Receive status' }));+ expect(notice).toHaveTextContent('Senaste status mottogs för 0s sedan');+ fireEvent.click(screen.getByRole('button', { name: 'en-US' }));+ act(() => { vi.advanceTimersByTime(30_000); });+ expect(notice).toHaveTextContent('No new generation status has arrived yet');+ expect(notice).not.toHaveTextContent('%');+ view.unmount();+ expect(vi.getTimerCount()).toBe(0);+ } finally {+ vi.useRealTimers();+ }+ });++ it('explains a long wait even when provider status continues to arrive', () => {+ vi.useFakeTimers();+ vi.setSystemTime(new Date('2026-09-07T08:00:08.000Z'));+ try {+ const view = render(<LanguageProvider initialPreference="en-US">+ <CreatorSessionProvider initialJob={videoGenerationJob()} service={{ applyAction: vi.fn(), runAgentTurn: vi.fn() } as never}>+ <CreatorTaskProgressNotice stageId="generate" />+ <ProgressHeartbeatControl />+ </CreatorSessionProvider>+ </LanguageProvider>);+ act(() => { vi.advanceTimersByTime(120_000); });+ fireEvent.click(screen.getByRole('button', { name: 'Receive status' }));+ const notice = screen.getByRole('status', { name: 'Task progress' });+ expect(notice).toHaveTextContent('Elapsed 2:05');+ expect(notice).toHaveTextContent('Generation time depends on the provider');+ expect(notice).toHaveTextContent('the task continues in the background');+ expect(notice).not.toHaveTextContent('No new generation status');+ view.unmount();+ expect(vi.getTimerCount()).toBe(0);+ } finally {+ vi.useRealTimers();+ }+ });++ it('shows connection recovery rather than silently waiting for a missing snapshot', () => {+ const view = render(<LanguageProvider initialPreference="en-US">+ <CreatorSessionProvider initialJob={videoGenerationJob()} service={{+ applyAction: vi.fn(), runAgentTurn: vi.fn(),+ getJob: vi.fn(() => new Promise<never>(() => undefined)),+ subscribeJobEvents: vi.fn(() => ({ close: vi.fn() }))+ } as never}>+ <CreatorTaskProgressNotice stageId="generate" />+ </CreatorSessionProvider>+ </LanguageProvider>);+ expect(screen.getByRole('status', { name: 'Task progress' })).toHaveTextContent('Reconnecting to receive the latest status');+ view.unmount();+ });+});+describe('Short video script panel', () => {it('语义化并合并短视频脚本设置动态,同时显示标准 Stage 状态和真实进度', () => {render(diff --git a/apps/web/src/features/dashboard/CreatorCollaborationPanel.tsx b/apps/web/src/features/dashboard/CreatorCollaborationPanel.tsxindex bbd73fd9..6384f90a 100644--- a/apps/web/src/features/dashboard/CreatorCollaborationPanel.tsx+++ b/apps/web/src/features/dashboard/CreatorCollaborationPanel.tsx@@ -30,6 +30,7 @@ import { creatorPreflightMessage } from './creator-preflight-copy.js';import ToolAgentComposer, { type ToolAgentPermission } from './ToolAgentComposer.js';import {creatorSystemIssueText,+ creatorPanelAdapterFor,type CreatorPanelLocalize,type CreatorPanelAdapter,type CreatorStageProgressView@@ -487,6 +488,73 @@ function CollaborationActivityView(props: { event: SyncEvent }) {);}+export function CreatorTaskProgressNotice(props: { stageId: string }) {+ const localize = useLocalizedCopy();+ const session = useOptionalCreatorSession();+ const stage = activeStageRun((session?.job.stages ?? []).filter(run => run.stageId === props.stageId));+ if (stage === undefined) return null;+ const adapter = creatorPanelAdapterFor(session?.job.templateId ?? '');+ const progress = adapter.readStageProgress(stage, localize);+ const percent = progress.percent === null ? null : Math.max(0, Math.min(100, Math.round(progress.percent)));+ return (+ <section className="creator-task-progress-notice" role="status" aria-label={localize('任务进度', 'Task progress', 'Uppgiftsförlopp')}>+ <div className="creator-task-progress-notice-heading">+ {stageStatusIcon(stage)}+ <strong>{stageProgressText(stage, progress, adapter, localize)}{percent === null ? '' : ` · ${percent}%`}</strong>+ </div>+ <CreatorStageProgressDetails stage={stage} progress={progress} />+ </section>+ );+}++function CreatorStageProgressDetails(props: { stage: CreatorStageRun; progress: CreatorStageProgressView }) {+ const localize = useLocalizedCopy();+ const session = useOptionalCreatorSession();+ const { stage, progress } = props;+ const active = stage.status === 'queued' || stage.status === 'running';+ const showTiming = active && progress.showTiming === true;+ const observedRef = useRef({ stageId: stage.id, progress: stage.progress, firstSeenAt: Date.now(), receivedAt: Date.now() });+ if (observedRef.current.stageId !== stage.id) {+ observedRef.current = { stageId: stage.id, progress: stage.progress, firstSeenAt: Date.now(), receivedAt: Date.now() };+ } else if (observedRef.current.progress !== stage.progress) {+ observedRef.current.progress = stage.progress;+ observedRef.current.receivedAt = Date.now();+ }+ const [now, setNow] = useState(Date.now);+ useEffect(() => {+ if (!showTiming) return undefined;+ setNow(Date.now());+ const timer = window.setInterval(() => setNow(Date.now()), 1_000);+ return () => window.clearInterval(timer);+ }, [showTiming, stage.id]);+ if (!showTiming && !(active && progress.showMessage && progress.message)) return null;+ const startedAt = Date.parse(stage.startedAt ?? '');+ const elapsedSeconds = Math.max(0, Math.floor((now - (Number.isFinite(startedAt) ? startedAt : observedRef.current.firstSeenAt)) / 1_000));+ const receivedSeconds = Math.max(0, Math.floor((now - observedRef.current.receivedAt) / 1_000));+ const duration = `${Math.floor(elapsedSeconds / 60)}:${String(elapsedSeconds % 60).padStart(2, '0')}`;+ const waitingForProvider = progress.phase === 'queued' || progress.phase === 'generating';+ const disconnected = session?.connection !== undefined && session.connection.status !== 'connected';+ const warning = !showTiming ? null : disconnected+ ? localize('任务连接已中断,正在尝试恢复;恢复后会同步最新状态。', 'The task connection is interrupted. Reconnecting to receive the latest status.', 'Anslutningen till uppgiften har brutits. Återansluter för att hämta den senaste statusen.')+ : waitingForProvider && receivedSeconds >= 30+ ? localize('暂未收到新的生成状态,仍在等待服务商响应。', 'No new generation status has arrived yet. Waiting for the provider to respond.', 'Ingen ny genereringsstatus har kommit ännu. Väntar på svar från leverantören.')+ : waitingForProvider && elapsedSeconds >= 120+ ? localize('仍在等待服务商返回结果,生成时间由服务商决定。可以离开当前页面,任务会在后台继续。', 'Still waiting for the provider result. Generation time depends on the provider. You can leave this page; the task continues in the background.', 'Väntar fortfarande på leverantörens resultat. Genereringstiden beror på leverantören. Du kan lämna sidan; uppgiften fortsätter i bakgrunden.')+ : null;+ return (+ <div className="creator-collaboration-stage-details">+ {active && progress.showMessage && progress.message ? <p className="creator-collaboration-stage-message" role="status">{progress.message}</p> : null}+ {showTiming ? <small className="creator-collaboration-stage-timing" aria-live="off">+ <span>{stage.startedAt === null+ ? localize(`已等待 ${duration}`, `Waiting ${duration}`, `Väntat ${duration}`)+ : localize(`已运行 ${duration}`, `Elapsed ${duration}`, `Förfluten tid ${duration}`)}</span>+ <span>{localize(`最近收到状态:${receivedSeconds} 秒前`, `Last status received ${receivedSeconds}s ago`, `Senaste status mottogs för ${receivedSeconds}s sedan`)}</span>+ </small> : null}+ {warning ? <p className="creator-collaboration-stage-message">{warning}</p> : null}+ </div>+ );+}+function CollaborationStageView(props: {stage: CreatorStageRun;actor: CreatorActivity['actor'];@@ -505,7 +573,7 @@ function CollaborationStageView(props: {const compact = !['queued', 'running'].includes(stage.status);const showPercent = (stage.status === 'running' || stage.status === 'failed')&& percent !== null;- const indeterminate = stage.status === 'running'+ const indeterminate = (stage.status === 'running' || stage.status === 'queued')&& progress.indeterminate === true;const hasProgress = showPercent || indeterminate;return (@@ -564,7 +632,7 @@ function CollaborationStageView(props: {<span style={percent === null ? undefined : { width: `${percent}%` }} /></div>) : null}- {stage.status === 'running' && progress.showMessage && progress.message ? <p className="creator-collaboration-stage-message" role="status">{progress.message}</p> : null}+ <CreatorStageProgressDetails stage={stage} progress={progress} />{(stage.status === 'running' || stage.status === 'failed') && progress.detailsHref ? <a href={progress.detailsHref}>{l('查看组件下载详情', 'View component download details')}</a> : null}</article>);diff --git a/apps/web/src/features/dashboard/VideoGenerationWorkspace.test.tsx b/apps/web/src/features/dashboard/VideoGenerationWorkspace.test.tsxindex 23a32e5d..065d8319 100644--- a/apps/web/src/features/dashboard/VideoGenerationWorkspace.test.tsx+++ b/apps/web/src/features/dashboard/VideoGenerationWorkspace.test.tsx@@ -1,20 +1,90 @@import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';+import { normalizePageIssue } from '../issues/page-issue-state.js';import type {CreatorArtifact,CreatorJob,CreatorJson,- CreatorServicesConfigResponse+ CreatorServicesConfigResponse,+ CreatorStageRun} from '@opencreator/protocol';import { beforeEach, describe, expect, it, vi } from 'vitest';+import type { ReactNode } from 'react';import { LanguageProvider } from '../../i18n/LanguageProvider.js';+import { LanguageSwitchControls } from '../../test/LanguageSwitchControls.js';import VideoGenerationWorkspace from './VideoGenerationWorkspace.js';-import { CreatorSessionProvider } from './creator-session-store.js';+import { CreatorSessionProvider, useCreatorSession } from './creator-session-store.js';describe('VideoGenerationWorkspace', () => {+ it('leaves the running screen and shows the true failure through read-only reconciliation without an SSE event', async () => {+ vi.useFakeTimers();+ const running = runningVideoJob({ phase: 'submitting', percent: 8 });+ const failed: CreatorJob = { ...running, revision: running.revision + 1, status: 'failed',+ stages: running.stages.map(stage => ({ ...stage, status: 'failed', errorCode: 'creator_video_upstream_error', errorMessage: 'Reference rejected' }))+ };+ failed.issues = [{ ...normalizePageIssue('runtime', 'creator.retry-stage', new Error('Failed'), 'Video generation failed'),+ scope: { kind: 'creator-job', jobId: failed.id }, stageRunId: failed.stages[0]!.id, code: 'creator_video_upstream_error',+ publicFacts: { kind: 'http-rejected', provider: 'seedance', httpStatus: 400,+ upstreamCode: 'InputImageSensitiveContentDetected.PrivacyInformation', upstreamMessage: 'Input image may contain real person', requestId: 'request-123' }+ }];+ const getJob = vi.fn().mockResolvedValueOnce({ job: running }).mockResolvedValue({ job: failed });+ const applyAction = vi.fn();+ const subscribeJobEvents = vi.fn(() => ({ close: vi.fn() }));+ const service = { getJob, applyAction, subscribeJobEvents, runAgentTurn: vi.fn() };+ const view = render(<LanguageProvider initialPreference="zh-CN"><CreatorSessionProvider initialJob={running} service={service as never}>+ <VideoGenerationWorkspace onBack={vi.fn()} />+ </CreatorSessionProvider></LanguageProvider>);+ try {+ await act(async () => { await Promise.resolve(); });+ expect(document.querySelector('.creator-collaboration-stage[data-status="running"]')).not.toBeNull();+ await act(async () => { await vi.advanceTimersByTimeAsync(5_000); });+ expect(document.querySelector('.creator-collaboration-stage[data-status="running"]')).toBeNull();+ expect(document.querySelector('.creator-collaboration-stage[data-status="failed"]')).not.toBeNull();+ const panel = screen.getByRole('complementary', { name: 'OpenCreator' });+ expect(panel).toHaveTextContent('InputImageSensitiveContentDetected.PrivacyInformation');+ expect(panel).toHaveTextContent('Input image may contain real person');+ expect(screen.queryByText('视频生成任务已提交,可以离开当前页面,完成后会保留在项目中')).not.toBeInTheDocument();+ expect(getJob).toHaveBeenCalledTimes(2);+ expect(applyAction).not.toHaveBeenCalled();+ await act(async () => { await vi.advanceTimersByTimeAsync(10_000); });+ expect(getJob).toHaveBeenCalledTimes(2);+ } finally {+ view.unmount();+ vi.useRealTimers();+ }+ });++ it.each(['zh-CN', 'en-US', 'sv-SE'] as const)('shows the persisted provider failure instead of generic network advice in %s', language => {+ const failed = creatorJob({ status: 'failed', state: {+ prompt: 'A cinematic reveal', provider: 'seedance', size: '1280x720', duration: 5,+ currentStep: 1, furthestStep: 1, currentStage: 'generate'+ }, stages: [{+ id: 'failed_stage', jobId: 'creator_video_workspace', stageId: 'generate', executor: 'video',+ status: 'failed', dispatchStatus: 'finished', claimOwner: null, claimExpiresAt: null,+ attempt: 1, idempotencyKey: null, scopeKey: null, inputFingerprint: null,+ progress: { phase: 'submitting', percent: 8 }, errorCode: 'creator_video_upstream_error',+ errorMessage: 'Provider rejected the request with status 400', startedAt: null, finishedAt: null+ }] });+ failed.issues = [{ ...normalizePageIssue('runtime', 'creator.retry-stage', new Error('private diagnostic'), 'Video generation failed'),+ scope: { kind: 'creator-job', jobId: failed.id }, stageRunId: 'failed_stage', code: 'creator_video_upstream_error',+ publicFacts: { kind: 'http-rejected', provider: 'seedance', httpStatus: 400,+ upstreamCode: 'InputImageSensitiveContentDetected.SensitiveContent',+ upstreamMessage: 'Reference image was rejected', requestId: 'provider-request-123' }+ }];+ renderWorkspace(failed, { language });+ const panel = screen.getByRole('complementary', { name: 'OpenCreator' });+ expect(panel).toHaveTextContent('HTTP 400');+ expect(panel).toHaveTextContent('InputImageSensitiveContentDetected.SensitiveContent');+ expect(panel).toHaveTextContent('Reference image was rejected');+ expect(panel).toHaveTextContent('provider-request-123');+ expect(panel).not.toHaveTextContent('检查模型服务配置和网络');+ expect(panel).not.toHaveTextContent('尚未确认更细的原因');+ });+beforeEach(() => {+ let objectUrlCount = 0;Object.defineProperty(URL, 'createObjectURL', {configurable: true,- value: vi.fn((blob: Blob) => `blob:video-${blob.size}`)+ value: vi.fn(() => `blob:video-${++objectUrlCount}`)});Object.defineProperty(URL, 'revokeObjectURL', {configurable: true,@@ -22,6 +92,307 @@ describe('VideoGenerationWorkspace', () => {});});+ it('keeps the same video and playback position when session callbacks change', async () => {+ const openArtifact = vi.fn(async () => new Response(new Blob(['video'])));+ const view = renderWorkspace(completedVideoJob(), { openArtifact, children: <TaskRefreshControl /> });+ const video = await screen.findByLabelText<HTMLVideoElement>('生成视频预览');+ const source = video.src;+ video.currentTime = 2;++ for (let update = 0; update < 3; update += 1) {+ fireEvent.click(screen.getByRole('button', { name: '刷新任务' }));+ view.rerenderWorkspace();+ await act(async () => undefined);+ expect(screen.getByLabelText('生成视频预览')).toBe(video);+ expect(video.src).toBe(source);+ expect(video.currentTime).toBe(2);+ }++ expect(openArtifact).toHaveBeenCalledTimes(1);+ expect(URL.createObjectURL).toHaveBeenCalledTimes(1);+ expect(URL.revokeObjectURL).not.toHaveBeenCalled();+ view.unmount();+ expect(URL.revokeObjectURL).toHaveBeenCalledExactlyOnceWith(source);+ });++ it('updates preview labels without reloading the video when the language changes', async () => {+ const openArtifact = vi.fn(async () => new Response(new Blob(['video'])));+ renderWorkspace(completedVideoJob(), { openArtifact, children: <LanguageSwitchControls /> });+ const video = await screen.findByLabelText<HTMLVideoElement>('生成视频预览');+ const source = video.src;+ video.currentTime = 2;++ fireEvent.click(screen.getByRole('button', { name: 'en-US' }));+ await act(async () => undefined);++ expect(screen.getByLabelText('Generated video preview')).toBe(video);+ expect(video.src).toBe(source);+ expect(video.currentTime).toBe(2);+ expect(openArtifact).toHaveBeenCalledTimes(1);+ expect(URL.revokeObjectURL).not.toHaveBeenCalled();+ });++ it('uses the latest transport only when the selected result changes', async () => {+ const initialTransport = vi.fn(async () => new Response(new Blob(['initial'])));+ const latestTransport = vi.fn(async () => new Response(new Blob(['latest'])));+ const view = renderWorkspace(completedVideoJob([videoArtifact(1), videoArtifact(2)]), {+ openArtifact: initialTransport+ });+ const video = await screen.findByLabelText<HTMLVideoElement>('生成视频预览');+ const source = video.src;++ view.rerenderWorkspace({ openArtifact: latestTransport });+ await act(async () => undefined);+ expect(latestTransport).not.toHaveBeenCalled();+ expect(screen.getByLabelText('生成视频预览')).toBe(video);+ expect(URL.revokeObjectURL).not.toHaveBeenCalled();++ fireEvent.click(screen.getByRole('button', { name: '项目 V2' }));+ fireEvent.click(screen.getByRole('menuitem', { name: /项目 V1/ }));+ await waitFor(() => expect(latestTransport).toHaveBeenCalledWith(+ 'creator_video_workspace', 'generated_video_v1'+ ));+ await waitFor(() => expect(screen.getByLabelText('生成视频预览')).not.toHaveAttribute('src', source));+ expect(URL.revokeObjectURL).toHaveBeenCalledExactlyOnceWith(source);+ });++ it('discards and releases an outdated preview that completes after a version change', async () => {+ let resolveInitial!: (response: Response) => void;+ const initialRequest = new Promise<Response>(resolve => { resolveInitial = resolve; });+ const openArtifact = vi.fn(async (_jobId: string, artifactId: string) => (+ artifactId === 'generated_video_v2' ? initialRequest : new Response(new Blob(['current']))+ ));+ const view = renderWorkspace(completedVideoJob([videoArtifact(1), videoArtifact(2)]), { openArtifact });+ fireEvent.click(screen.getByRole('button', { name: '项目 V2' }));+ fireEvent.click(screen.getByRole('menuitem', { name: /项目 V1/ }));+ const video = await screen.findByLabelText<HTMLVideoElement>('生成视频预览');+ const source = video.src;++ await act(async () => { resolveInitial(new Response(new Blob(['outdated']))); });++ expect(screen.getByLabelText('生成视频预览')).toBe(video);+ expect(video.src).toBe(source);+ const outdatedSource = vi.mocked(URL.createObjectURL).mock.results.at(-1)!.value;+ expect(URL.revokeObjectURL).toHaveBeenCalledExactlyOnceWith(outdatedSource);+ view.unmount();+ expect(URL.revokeObjectURL).toHaveBeenCalledWith(source);+ expect(URL.revokeObjectURL).toHaveBeenCalledTimes(2);+ });++ it('releases a pending result preview after the workspace is unmounted', async () => {+ let resolvePreview!: (response: Response) => void;+ const pendingPreview = new Promise<Response>(resolve => { resolvePreview = resolve; });+ const view = renderWorkspace(completedVideoJob(), { openArtifact: () => pendingPreview });+ view.unmount();++ await act(async () => { resolvePreview(new Response(new Blob(['video']))); });++ expect(URL.createObjectURL).toHaveBeenCalledTimes(1);+ expect(URL.revokeObjectURL).toHaveBeenCalledExactlyOnceWith(+ vi.mocked(URL.createObjectURL).mock.results[0]!.value+ );+ });++ it('does not reload the reference image when session callbacks change', async () => {+ const reference = { ...videoArtifact(1), id: 'reference_image', kind: 'reference_image' };+ const job = creatorJob({ artifacts: [reference], state: { referenceImageArtifactId: reference.id } });+ const openArtifact = vi.fn(async () => new Response(new Blob(['reference'], { type: 'image/png' })));+ const view = renderWorkspace(job, { openArtifact });+ await waitFor(() => expect(URL.createObjectURL).toHaveBeenCalledTimes(1));++ view.rerenderWorkspace();+ await act(async () => undefined);++ expect(openArtifact).toHaveBeenCalledTimes(1);+ expect(URL.revokeObjectURL).not.toHaveBeenCalled();+ });++ it('releases a pending reference preview after the workspace is unmounted', async () => {+ const reference = { ...videoArtifact(1), id: 'reference_image', kind: 'reference_image' };+ let resolvePreview!: (response: Response) => void;+ const pendingPreview = new Promise<Response>(resolve => { resolvePreview = resolve; });+ const job = creatorJob({ artifacts: [reference], state: { referenceImageArtifactId: reference.id } });+ const view = renderWorkspace(job, { openArtifact: () => pendingPreview });+ view.unmount();++ await act(async () => { resolvePreview(new Response(new Blob(['reference']))); });++ expect(URL.revokeObjectURL).toHaveBeenCalledExactlyOnceWith(+ vi.mocked(URL.createObjectURL).mock.results[0]!.value+ );+ });++ it('shows a localized preview failure without retrying on unrelated updates', async () => {+ const openArtifact = vi.fn(async () => new Response('', { status: 404 }));+ const view = renderWorkspace(completedVideoJob(), { openArtifact, children: <LanguageSwitchControls /> });+ const status = view.container.querySelector('.video-result-player-status');+ await waitFor(() => expect(status).toHaveTextContent('视频预览加载失败,可以稍后重试或直接下载'));+ expect(status?.querySelector('.smart-dubbing-spinner')).toBeNull();++ view.rerenderWorkspace();+ fireEvent.click(screen.getByRole('button', { name: 'en-US' }));+ await act(async () => undefined);++ expect(status).toHaveTextContent('The video preview failed to load. Retry later or download the file.');+ expect(openArtifact).toHaveBeenCalledTimes(1);+ expect(URL.createObjectURL).not.toHaveBeenCalled();+ });++ it('shows first-generation waiting feedback without a fake percentage', () => {+ renderWorkspace(runningVideoJob());+ const notice = screen.getByRole('status', { name: '任务进度' });+ expect(notice).toHaveTextContent('视频生成中');+ expect(notice).toHaveTextContent('服务商未提供精确进度');+ expect(notice).toHaveTextContent('已运行');+ expect(notice).toHaveTextContent('最近收到状态');+ expect(notice).not.toHaveTextContent('%');+ expect(screen.getByRole('progressbar', { name: '生成视频进度' })).not.toHaveAttribute('aria-valuenow');+ });++ it.each(['queued', 'running'] as const)('shows waiting feedback while the task is %s', status => {+ renderWorkspace(runningVideoJob({ status, phase: 'queued' }));+ const notice = screen.getByRole('status', { name: '任务进度' });+ expect(notice).toHaveTextContent('任务正在服务商队列中');+ expect(notice).not.toHaveTextContent('%');+ expect(screen.getByRole('progressbar', { name: '生成视频进度' })).toHaveAttribute('data-indeterminate', 'true');+ });++ it('shows the same real progress in the result area and the shared task panel', () => {+ renderWorkspace(runningVideoJob({ percent: 54 }));+ expect(screen.getByRole('status', { name: '任务进度' })).toHaveTextContent('视频生成中 · 54%');+ expect(screen.getByRole('progressbar', { name: '生成视频进度' })).toHaveAttribute('aria-valuenow', '54');+ expect(screen.queryByText(/服务商未提供精确进度/)).not.toBeInTheDocument();+ });++ it('keeps the current video playable during regeneration and switches only when the new version arrives', async () => {+ const openArtifact = vi.fn(async () => new Response(new Blob(['video'])));+ renderWorkspace(runningVideoJob({ hasResult: true }), { openArtifact, children: <GenerationUpdateControls /> });+ const video = await screen.findByLabelText<HTMLVideoElement>('生成视频预览');+ const source = video.src;+ video.currentTime = 2;+ expect(screen.getByRole('status', { name: '任务进度' })).toHaveTextContent('服务商未提供精确进度');+ expect(screen.getByText('新版本正在后台生成,可以继续预览和下载当前版本')).toBeVisible();+ expect(screen.getByRole('button', { name: '下载视频' })).toBeEnabled();++ fireEvent.click(screen.getByRole('button', { name: '更新生成进度' }));+ expect(screen.getByRole('status', { name: '任务进度' })).toHaveTextContent('下载生成的视频 · 90%');+ expect(screen.getByLabelText('生成视频预览')).toBe(video);+ expect(video.src).toBe(source);+ expect(video.currentTime).toBe(2);+ expect(openArtifact).toHaveBeenCalledTimes(1);+ expect(URL.revokeObjectURL).not.toHaveBeenCalled();++ fireEvent.click(screen.getByRole('button', { name: '生成完成' }));+ expect(screen.queryByRole('status', { name: '任务进度' })).not.toBeInTheDocument();+ expect(await screen.findByRole('button', { name: '项目 V2' })).toBeVisible();+ await waitFor(() => expect(openArtifact).toHaveBeenCalledWith('creator_video_workspace', 'generated_video_v2'));+ await waitFor(() => expect(screen.getByLabelText('生成视频预览')).not.toHaveAttribute('src', source));+ expect(URL.revokeObjectURL).toHaveBeenCalledExactlyOnceWith(source);+ });++ it('localizes retry feedback and preserves the existing preview across language switches', async () => {+ const openArtifact = vi.fn(async () => new Response(new Blob(['video'])));+ renderWorkspace(runningVideoJob({ hasResult: true, retrying: true }), { openArtifact, children: <LanguageSwitchControls /> });+ const video = await screen.findByLabelText('生成视频预览');+ expect(screen.getByRole('status', { name: '任务进度' })).toHaveTextContent('正在自动重试(第 2 次)');++ fireEvent.click(screen.getByRole('button', { name: 'en-US' }));+ const notice = screen.getByRole('status', { name: 'Task progress' });+ expect(notice).toHaveTextContent('Retrying automatically (attempt 2)');+ expect(notice).toHaveTextContent('without submitting another generation task');+ expect(notice).not.toHaveTextContent('%');+ expect(screen.getByLabelText('Generated video preview')).toBe(video);++ fireEvent.click(screen.getByRole('button', { name: 'sv-SE' }));+ expect(screen.getByRole('status', { name: 'Uppgiftsförlopp' })).not.toHaveTextContent(/\p{Script=Han}/u);+ expect(openArtifact).toHaveBeenCalledTimes(1);+ expect(URL.revokeObjectURL).not.toHaveBeenCalled();+ });++ it('shows the actual video duration before browser metadata loads instead of the requested duration', async () => {+ const artifact = videoArtifact(1);+ artifact.metadata = { ...artifact.metadata, duration: 13.427, requestedDuration: 5 };+ renderWorkspace(completedVideoJob([artifact]), { openArtifact: async () => new Response(new Blob(['video'])) });++ const video = await screen.findByLabelText('生成视频预览');+ expect(video).toHaveAttribute('preload', 'metadata');+ expect(screen.getByLabelText('播放时间')).toHaveTextContent('00:00 / 00:13');+ expect(screen.getByRole('complementary', { name: '任务摘要' })).toHaveTextContent('13.43 秒');+ });++ it('updates the playback clock from browser metadata, time updates, and seeks without reloading the video', async () => {+ const openArtifact = vi.fn(async () => new Response(new Blob(['video'])));+ renderWorkspace(completedVideoJob(), { openArtifact });+ const video = await screen.findByLabelText<HTMLVideoElement>('生成视频预览');+ const source = video.src;+ Object.defineProperty(video, 'duration', { configurable: true, value: 8.33 });+ fireEvent.loadedMetadata(video);+ expect(screen.getByLabelText('播放时间')).toHaveTextContent('00:00 / 00:08');++ video.currentTime = 3.7;+ fireEvent.timeUpdate(video);+ expect(screen.getByLabelText('播放时间')).toHaveTextContent('00:03 / 00:08');+ video.currentTime = 6;+ fireEvent.seeked(video);+ expect(screen.getByLabelText('播放时间')).toHaveTextContent('00:06 / 00:08');+ Object.defineProperty(video, 'duration', { configurable: true, value: 9.8 });+ fireEvent.durationChange(video);+ expect(screen.getByLabelText('播放时间')).toHaveTextContent('00:06 / 00:09');+ expect(screen.getByLabelText('生成视频预览')).toBe(video);+ expect(video.src).toBe(source);+ expect(openArtifact).toHaveBeenCalledTimes(1);+ expect(URL.revokeObjectURL).not.toHaveBeenCalled();+ });++ it.each([0, -1, Number.NaN, Number.POSITIVE_INFINITY])('does not invent a zero duration for invalid metadata (%s)', async invalidDuration => {+ const artifact = videoArtifact(1);+ artifact.metadata = { ...artifact.metadata, duration: invalidDuration, requestedDuration: 10 };+ renderWorkspace(completedVideoJob([artifact]), { openArtifact: async () => new Response(new Blob(['video'])) });+ const video = await screen.findByLabelText('生成视频预览');+ Object.defineProperty(video, 'duration', { configurable: true, value: invalidDuration });+ fireEvent.loadedMetadata(video);+ expect(screen.getByLabelText('播放时间')).toHaveTextContent('00:00 / --:--');++ Object.defineProperty(video, 'duration', { configurable: true, value: 7.5 });+ fireEvent.durationChange(video);+ expect(screen.getByLabelText('播放时间')).toHaveTextContent('00:00 / 00:07');+ Object.defineProperty(video, 'duration', { configurable: true, value: invalidDuration });+ fireEvent.durationChange(video);+ expect(screen.getByLabelText('播放时间')).toHaveTextContent('00:00 / 00:07');+ });++ it('resets playback timing when a different result version is selected', async () => {+ renderWorkspace(completedVideoJob([videoArtifact(1), videoArtifact(2)]), {+ openArtifact: async () => new Response(new Blob(['video']))+ });+ const video = await screen.findByLabelText<HTMLVideoElement>('生成视频预览');+ Object.defineProperty(video, 'duration', { configurable: true, value: 8 });+ video.currentTime = 6;+ fireEvent.timeUpdate(video);+ expect(screen.getByLabelText('播放时间')).toHaveTextContent('00:06 / 00:08');++ fireEvent.click(screen.getByRole('button', { name: '项目 V2' }));+ fireEvent.click(screen.getByRole('menuitem', { name: /项目 V1/ }));+ await waitFor(() => expect(screen.getByLabelText('播放时间')).toHaveTextContent('00:00 / 00:05'));+ });++ it('keeps timing and the video node stable across language switches', async () => {+ const openArtifact = vi.fn(async () => new Response(new Blob(['video'])));+ renderWorkspace(completedVideoJob(), { openArtifact, children: <LanguageSwitchControls /> });+ const video = await screen.findByLabelText<HTMLVideoElement>('生成视频预览');+ video.currentTime = 2;+ fireEvent.timeUpdate(video);++ fireEvent.click(screen.getByRole('button', { name: 'en-US' }));+ expect(screen.getByText('Position / duration')).toBeVisible();+ expect(screen.getByLabelText('Playback time')).toHaveTextContent('00:02 / 00:05');+ fireEvent.click(screen.getByRole('button', { name: 'sv-SE' }));+ expect(screen.getByText('Position / längd')).toBeVisible();+ expect(screen.getByLabelText('Uppspelningstid')).toHaveTextContent('00:02 / 00:05');+ expect(openArtifact).toHaveBeenCalledTimes(1);+ expect(URL.revokeObjectURL).not.toHaveBeenCalled();+ });+it('opens an existing project on the latest generated video version', async () => {const versionOne = videoArtifact(1);const versionTwo = videoArtifact(2);@@ -319,29 +690,110 @@ function renderWorkspace(overrides: {openArtifact?: (jobId: string, artifactId: string) => Promise<Response>;creatorServicesService?: { getConfig(): Promise<CreatorServicesConfigResponse> };- language?: 'zh-CN' | 'en-US';+ language?: 'zh-CN' | 'en-US' | 'sv-SE';+ children?: ReactNode;} = {}) {- return render(- <LanguageProvider initialPreference={overrides.language ?? 'zh-CN'}>+ const workspace = (options: typeof overrides) => (+ <LanguageProvider initialPreference={options.language ?? 'zh-CN'}><CreatorSessionProviderinitialJob={initialJob}+ onPreJobFailure={() => undefined}service={{applyAction: vi.fn(async (_id, request) => ({job: { ...initialJob, revision: initialJob.revision + 1, state: { ...initialJob.state, ...(request.action === 'select-result-version' ? { resultVersion: request.input.version } : request.input.patch) } },receipt: {}})),- openArtifact: overrides.openArtifact ?? vi.fn(),+ openArtifact: options.openArtifact ?? vi.fn(),runAgentTurn: vi.fn()} as never}><VideoGenerationWorkspace- creatorServicesService={overrides.creatorServicesService as never}+ creatorServicesService={options.creatorServicesService as never}onBack={vi.fn()}/>+ {options.children}</CreatorSessionProvider></LanguageProvider>);+ const view = render(workspace(overrides));+ return {+ ...view,+ rerenderWorkspace(patch: typeof overrides = {}) {+ view.rerender(workspace({ ...overrides, ...patch }));+ }+ };+}++function completedVideoJob(artifacts = [videoArtifact(1)]): CreatorJob {+ return creatorJob({+ status: 'completed',+ artifacts,+ state: {+ currentStep: 2,+ furthestStep: 2,+ resultVersion: artifacts.at(-1)!.version,+ resultSnapshots: artifacts.map(artifact => resultSnapshot(artifact.version, artifact))+ }+ });+}++function TaskRefreshControl() {+ const session = useCreatorSession();+ return <button type="button" onClick={() => session.applyRemoteSnapshot({+ ...session.job,+ revision: session.job.revision + 1,+ artifacts: session.job.artifacts.map(artifact => ({ ...artifact })),+ state: { ...session.state }+ })}>刷新任务</button>;+}++function runningVideoJob(options: {+ hasResult?: boolean;+ phase?: string;+ percent?: number;+ status?: CreatorStageRun['status'];+ retrying?: boolean;+} = {}): CreatorJob {+ const job = options.hasResult ? completedVideoJob() : creatorJob({ state: { currentStep: 2, furthestStep: 2 } });+ return {+ ...job,+ status: 'running',+ stages: [{+ id: 'running_video_stage', jobId: job.id, stageId: 'generate', executor: 'video',+ status: options.status ?? 'running', dispatchStatus: 'claimed', claimOwner: null,+ claimExpiresAt: null, attempt: 1, idempotencyKey: null, scopeKey: null, inputFingerprint: null,+ progress: {+ phase: options.phase ?? 'generating', percent: options.percent ?? null,+ ...(options.retrying ? { refreshRetry: 2, message: 'The provider status connection was interrupted and will be retried' } : {})+ },+ errorCode: null, errorMessage: null,+ startedAt: options.status === 'queued' ? null : new Date().toISOString(), finishedAt: null+ }]+ };+}++function GenerationUpdateControls() {+ const session = useCreatorSession();+ function update(completed: boolean) {+ const artifact = videoArtifact(2);+ session.applyRemoteSnapshot({+ ...session.job,+ revision: session.job.revision + 1,+ status: completed ? 'completed' : 'running',+ artifacts: completed ? [...session.job.artifacts, artifact] : session.job.artifacts,+ state: completed ? { ...session.state, resultVersion: 2, resultSnapshots: [+ ...(session.state.resultSnapshots as CreatorJson[]), resultSnapshot(2, artifact)+ ] } : session.state,+ stages: session.job.stages.map(stage => ({ ...stage, status: completed ? 'succeeded' : 'running', progress: {+ phase: completed ? 'completed' : 'downloading', percent: completed ? 100 : 90+ } }))+ });+ }+ return <>+ <button type="button" onClick={() => update(false)}>更新生成进度</button>+ <button type="button" onClick={() => update(true)}>生成完成</button>+ </>;}function createVideoConfig() {diff --git a/apps/web/src/features/dashboard/VideoGenerationWorkspace.tsx b/apps/web/src/features/dashboard/VideoGenerationWorkspace.tsxindex ac227560..372ad628 100644--- a/apps/web/src/features/dashboard/VideoGenerationWorkspace.tsx+++ b/apps/web/src/features/dashboard/VideoGenerationWorkspace.tsx@@ -1,6 +1,7 @@import {creatorPromptMaxLength,defaultVideoGenerationModels,+ isPublicErrorFacts,readCreatorResultSnapshots,videoGenerationModelIds,type CreatorArtifact,@@ -24,10 +25,12 @@ import {X} from 'lucide-react';import { useEffect, useMemo, useRef, useState } from 'react';-import { useLocalizedCopy } from '../../i18n/useLocalizedCopy.js';+import { useLocalizedCopy, type LocalizeCopy } from '../../i18n/useLocalizedCopy.js';+import { publicErrorReason } from '../issues/issue-catalog.js';import NativeSelect from '../../components/forms/NativeSelect.js';import type { CreatorServicesSettingsService } from '../../services/creator-services-service.js';import CreatorResultVersionMenu from './CreatorResultVersionMenu.js';+import { CreatorTaskProgressNotice } from './CreatorCollaborationPanel.js';import CreatorTaskSummary from './CreatorTaskSummary.js';import CreatorToolShell from './CreatorToolShell.js';import {@@ -89,6 +92,10 @@ export default function VideoGenerationWorkspace(props: {}) {const l = useLocalizedCopy();const session = useOptionalCreatorSession();+ const mediaPreviewContextRef = useRef({ session, localize: l });+ mediaPreviewContextRef.current = { session, localize: l };+ const mediaPreviewJobId = session?.job.id;+ const canOpenMediaPreview = session?.openArtifact !== undefined;const restoredResults = session?.job.artifacts.some(artifact => (artifact.kind === 'generated_video' && artifact.status === 'completed')) === true;@@ -119,7 +126,7 @@ export default function VideoGenerationWorkspace(props: {));const resultVersion = session?.job.state.resultVersion;const [videoUrl, setVideoUrl] = useState('');- const [previewError, setPreviewError] = useState('');+ const [previewFailed, setPreviewFailed] = useState(false);const [error, setError] = useState('');const [notice, setNotice] = useState('');const [taskControlPending, setTaskControlPending] = useState<'canceling' | 'resuming'>();@@ -139,14 +146,18 @@ export default function VideoGenerationWorkspace(props: {const latestVersion = resultVersions.at(-1)?.value;const selectedResult = resultVersions.find(version => version.value === resultVersion)?? resultVersions.at(-1);+ const selectedResultArtifactId = selectedResult?.artifact.id;const latestStage = session?.job.stages.filter(stage => stage.stageId === 'generate').at(-1);+ const latestStageIssue = session?.job.issues?.find(issue => (+ issue.stageRunId === latestStage?.id && issue.status !== 'resolved'+ ));const generating = latestStage?.status === 'queued' || latestStage?.status === 'running';const resumable = latestStage?.status === 'canceled'|| latestStage?.status === 'interrupted'|| isRecoverableVideoStage(latestStage);const runtimeError = latestStage?.status === 'failed'? formatVideoError(- { code: latestStage.errorCode, message: latestStage.errorMessage },+ { code: latestStage.errorCode, message: latestStage.errorMessage, publicFacts: latestStageIssue?.publicFacts },l,selectedModelLabel,provider@@ -154,7 +165,14 @@ export default function VideoGenerationWorkspace(props: {: session?.error === null || session?.error === undefined? '': formatVideoError(session.error, l, selectedModelLabel, provider);+ const previewError = previewFailed ? l(+ '视频预览加载失败,可以稍后重试或直接下载',+ 'The video preview failed to load. Retry later or download the file.'+ ) : '';const visibleError = error || runtimeError || previewError;+ useEffect(() => {+ if (latestStage?.status === 'failed' || latestStage?.status === 'interrupted') setNotice('');+ }, [latestStage?.id, latestStage?.status]);const settingsDeepLink = readNeedsInputDeepLink(session?.state.needsInput);const activeReferenceArtifact = findArtifact(session?.job.artifacts ?? [],@@ -163,6 +181,9 @@ export default function VideoGenerationWorkspace(props: {);const currentReferenceName = referenceImageFile?.name?? readArtifactString(activeReferenceArtifact, 'fileName');+ const referencePreviewArtifactId = referenceImageFile === undefined+ ? activeReferenceArtifact?.id+ : undefined;const followsReferenceRatio = provider === 'seedance' && Boolean(currentReferenceName);const resultSettings = selectedResult?.state;const resultProvider = providers.find(item => (@@ -181,15 +202,14 @@ export default function VideoGenerationWorkspace(props: {const resultFormatLabel = resultWidth !== undefined && resultHeight !== undefined? videoFormatLabel(resultWidth, resultHeight, l): l(resultSizeOption.zh, resultSizeOption.en);- const resultDuration = readDuration(resultSettings?.duration, resultProvider.value);+ const resultArtifactDuration = readVideoDuration(selectedResult?.artifact.metadata.duration);+ const resultDuration = resultArtifactDuration === undefined+ ? readDuration(resultSettings?.duration, resultProvider.value)+ : Math.round(resultArtifactDuration * 100) / 100;const resultModel = readArtifactString(selectedResult?.artifact, 'model')?? readOptionalModel(resultSettings?.model)?? modelDefaults[resultProvider.value];const resultModelLabel = videoModelLabel(resultModel);- const progressPercent = readProgressPercent(latestStage?.progress.percent);- const progressLabel = latestStage === undefined- ? l('正在准备任务', 'Preparing the task')- : videoPhaseLabel(readString(latestStage.progress.phase), l);useEffect(() => {if (props.creatorServicesService === null || props.creatorServicesService === undefined) {@@ -231,34 +251,37 @@ export default function VideoGenerationWorkspace(props: {}, [props.creatorServicesService, session?.job.id]);useEffect(() => {- if (referenceImageFile !== undefined) {- let objectUrl = '';- void captureCreatorClientFailure(- session,- 'video-generation.load-local-reference-preview',- l('参考图预览加载失败,请重新选择图片。', 'The reference preview failed to load. Select the image again.'),- () => URL.createObjectURL(referenceImageFile)- ).then(url => {- objectUrl = url;- setReferenceImageUrl(url);- }).catch(() => setReferenceImageUrl(''));- return () => { if (objectUrl) URL.revokeObjectURL(objectUrl); };- }- if (activeReferenceArtifact === undefined || session === null) {+ const { session, localize } = mediaPreviewContextRef.current;+ if (referenceImageFile === undefined && (+ referencePreviewArtifactId === undefined || session === null || !canOpenMediaPreview+ )) {setReferenceImageUrl('');return undefined;}let active = true;let objectUrl = '';- void createCreatorArtifactObjectUrl(- session,- activeReferenceArtifact.id,- 'video-generation.load-reference-preview',- l('参考图预览加载失败,请稍后重试。', 'The reference preview failed to load. Try again later.')- )+ setReferenceImageUrl('');+ const preview = referenceImageFile !== undefined+ ? captureCreatorClientFailure(+ session,+ 'video-generation.load-local-reference-preview',+ localize('参考图预览加载失败,请重新选择图片。', 'The reference preview failed to load. Select the image again.'),+ () => URL.createObjectURL(referenceImageFile)+ )+ : createCreatorArtifactObjectUrl(+ session!,+ referencePreviewArtifactId!,+ 'video-generation.load-reference-preview',+ localize('参考图预览加载失败,请稍后重试。', 'The reference preview failed to load. Try again later.')+ );+ void preview.then(url => {+ if (!active) {+ URL.revokeObjectURL(url);+ return;+ }objectUrl = url;- if (active) setReferenceImageUrl(objectUrl);+ setReferenceImageUrl(objectUrl);}).catch(() => {if (active) setReferenceImageUrl('');@@ -267,41 +290,41 @@ export default function VideoGenerationWorkspace(props: {active = false;if (objectUrl) URL.revokeObjectURL(objectUrl);};- }, [activeReferenceArtifact?.id, l, referenceImageFile, session?.captureCreatorFailure, session?.openArtifact]);+ }, [canOpenMediaPreview, mediaPreviewJobId, referenceImageFile, referencePreviewArtifactId]);useEffect(() => {- if (selectedResult === undefined || session === null) {+ const { session, localize } = mediaPreviewContextRef.current;+ if (selectedResultArtifactId === undefined || session === null || !canOpenMediaPreview) {setVideoUrl('');- setPreviewError('');+ setPreviewFailed(false);return undefined;}let active = true;let objectUrl = '';setVideoUrl('');- setPreviewError('');+ setPreviewFailed(false);void createCreatorArtifactObjectUrl(session,- selectedResult.artifact.id,+ selectedResultArtifactId,'video-generation.load-result-preview',- l('视频预览加载失败,可以稍后重试或直接下载。', 'The video preview failed to load. Retry later or download the file.')+ localize('视频预览加载失败,可以稍后重试或直接下载。', 'The video preview failed to load. Retry later or download the file.')).then(url => {+ if (!active) {+ URL.revokeObjectURL(url);+ return;+ }objectUrl = url;- if (active) setVideoUrl(objectUrl);+ setVideoUrl(objectUrl);})- .catch(cause => {- if (active) {- setPreviewError(l(- '视频预览加载失败,可以稍后重试或直接下载',- 'The video preview failed to load. Retry later or download the file.'- ));- }+ .catch(() => {+ if (active) setPreviewFailed(true);});return () => {active = false;if (objectUrl) URL.revokeObjectURL(objectUrl);};- }, [l, selectedResult?.artifact.id, session?.captureCreatorFailure, session?.openArtifact]);+ }, [canOpenMediaPreview, mediaPreviewJobId, selectedResultArtifactId]);useEffect(() => {if (latestVersion !== undefined && !generating) {@@ -428,12 +451,13 @@ export default function VideoGenerationWorkspace(props: {await session.uploadReferenceImage(referenceImageFile);setReferenceImageFile(undefined);}- await session.applyAction({+ const next = await session.applyAction({actor: 'user',action: 'run-stage',input: { stageId: 'generate' }});- setNotice(l(+ const submittedStage = next.stages.filter(stage => stage.stageId === 'generate').at(-1);+ setNotice(submittedStage?.status === 'failed' || submittedStage?.status === 'interrupted' ? '' : l('视频生成任务已提交,可以离开当前页面,完成后会保留在项目中','Video generation started. You can leave this page and return to the saved result later.'));@@ -549,15 +573,15 @@ export default function VideoGenerationWorkspace(props: {<CreatorToolShelltitle={l('视频生成', 'Video Generation')}subtitle={l('根据文字或参考图生成 AI 视频片段', 'Generate an AI video clip from text or a reference image')}- context={selectedResult+ context={generating+ ? selectedResult+ ? l(`V${selectedResult.value} · 正在生成新版本`, `V${selectedResult.value} · Generating a new version`, `V${selectedResult.value} · Genererar en ny version`)+ : l('视频生成任务进行中', 'Video generation in progress', 'Videogenerering pågår')+ : selectedResult? l(`V${selectedResult.value} · ${resultModelLabel} · ${resultRatio} · ${resultDuration} 秒`,`V${selectedResult.value} · ${resultModelLabel} · ${resultRatio} · ${resultDuration} seconds`)- : generating- ? progressPercent === null- ? progressLabel- : `${progressLabel} · ${progressPercent}%`: currentStep === 0? l('正在编辑视频描述', 'Editing video description'): currentStep === 1@@ -739,10 +763,12 @@ export default function VideoGenerationWorkspace(props: {<div className="creator-tool-panel-heading"><div><h2 id="video-output-title">{selectedResult ? l('生成结果', 'Generated video') : l('生成视频', 'Generate video')}</h2>- <p>{selectedResult- ? l('预览历史版本并下载需要的成片', 'Preview previous versions and download the video you need')- : generating- ? l('任务正在后台生成,完成后会自动显示', 'The task is running in the background and will appear automatically')+ <p>{generating+ ? selectedResult+ ? l('新版本正在后台生成,可以继续预览和下载当前版本', 'A new version is generating in the background. You can still preview and download the current version.', 'En ny version genereras i bakgrunden. Du kan fortfarande förhandsgranska och ladda ner den nuvarande versionen.')+ : l('任务正在后台生成,完成后会自动显示', 'The task is running in the background and will appear automatically')+ : selectedResult+ ? l('预览历史版本并下载需要的成片', 'Preview previous versions and download the video you need'): l('确认设置后提交视频生成任务', 'Review the settings, then submit the generation job')}</p></div>{selectedResult ? (@@ -758,14 +784,19 @@ export default function VideoGenerationWorkspace(props: {/>) : null}</div>+ {generating ? <CreatorTaskProgressNotice stageId="generate" /> : null}{selectedResult ? (<div className="video-generation-result" data-ratio={resultRatio}>{videoUrl ? (- <video controls src={videoUrl} aria-label={l('生成视频预览', 'Generated video preview')} />+ <GeneratedVideoPreview src={videoUrl} duration={resultArtifactDuration} />) : (<div className="video-result-player-status" role="status">- <LoaderCircle className="smart-dubbing-spinner" size={18} />- {l('正在加载视频预览', 'Loading video preview')}+ {previewFailed ? previewError : (+ <>+ <LoaderCircle className="smart-dubbing-spinner" size={18} />+ {l('正在加载视频预览', 'Loading video preview')}+ </>+ )}</div>)}<div>@@ -791,20 +822,10 @@ export default function VideoGenerationWorkspace(props: {</div></div>) : generating ? (- <div className="video-generation-progress" role="status">- <span><LoaderCircle className="smart-dubbing-spinner" size={25} /></span>- <strong>{progressLabel}</strong>- <p>{l(+ <p className="video-generation-background-note">{l('任务已保存在项目中,可以离开当前页面','The task is saved in the project, so you can leave this page')}</p>- {progressPercent === null ? null : (- <>- <div><span style={{ width: `${Math.max(4, progressPercent)}%` }} /></div>- <small>{progressPercent}%</small>- </>- )}- </div>) : (<div className="smart-dubbing-ready"><span><Clapperboard size={24} strokeWidth={1.6} /></span>@@ -896,6 +917,63 @@ export default function VideoGenerationWorkspace(props: {);}+function GeneratedVideoPreview(props: { src: string; duration?: number }) {+ const localize = useLocalizedCopy();+ const [playback, setPlayback] = useState<{ src: string; currentTime: number; duration?: number }>({+ src: props.src,+ currentTime: 0+ });+ const currentTime = playback.src === props.src ? playback.currentTime : 0;+ const duration = (playback.src === props.src ? playback.duration : undefined) ?? props.duration;++ function updatePlayback(video: HTMLVideoElement) {+ if (video.currentSrc && video.currentSrc !== props.src) return;+ const currentTime = Number.isFinite(video.currentTime) && video.currentTime >= 0 ? video.currentTime : 0;+ const measuredDuration = readVideoDuration(video.duration);+ setPlayback(previous => {+ const duration = measuredDuration ?? (previous.src === props.src ? previous.duration : undefined);+ if (previous.src === props.src && previous.currentTime === currentTime && previous.duration === duration) return previous;+ return { src: props.src, currentTime, duration };+ });+ }++ return (+ <figure className="video-generation-preview">+ <video+ controls+ playsInline+ preload="metadata"+ src={props.src}+ aria-label={localize('生成视频预览', 'Generated video preview')}+ onLoadedMetadata={event => updatePlayback(event.currentTarget)}+ onDurationChange={event => updatePlayback(event.currentTarget)}+ onTimeUpdate={event => updatePlayback(event.currentTarget)}+ onSeeked={event => updatePlayback(event.currentTarget)}+ />+ <figcaption>+ <span>{localize('当前时间 / 总时长', 'Position / duration', 'Position / längd')}</span>+ <output aria-label={localize('播放时间', 'Playback time', 'Uppspelningstid')} aria-live="off">+ {formatPlaybackTime(currentTime)} / {formatPlaybackTime(duration)}+ </output>+ </figcaption>+ </figure>+ );+}++function readVideoDuration(value: unknown): number | undefined {+ return typeof value === 'number' && Number.isFinite(value) && value > 0 ? value : undefined;+}++function formatPlaybackTime(seconds: number | undefined): string {+ if (seconds === undefined || !Number.isFinite(seconds) || seconds < 0) return '--:--';+ const totalSeconds = Math.floor(seconds);+ const hours = Math.floor(totalSeconds / 3_600);+ const minutes = Math.floor(totalSeconds / 60) % 60;+ const remainder = totalSeconds % 60;+ const clock = `${String(minutes).padStart(2, '0')}:${String(remainder).padStart(2, '0')}`;+ return hours > 0 ? `${String(hours).padStart(2, '0')}:${clock}` : clock;+}+function createVideoResultVersions(artifacts: CreatorArtifact[],resultSnapshots: CreatorJson | undefined@@ -1078,12 +1156,6 @@ function readPositiveInteger(value: CreatorJson | undefined): number | undefinedreturn typeof value === 'number' && Number.isInteger(value) && value > 0 ? value : undefined;}-function readProgressPercent(value: CreatorJson | undefined): number | null {- return typeof value === 'number' && Number.isFinite(value)- ? Math.max(0, Math.min(100, Math.round(value)))- : null;-}-function isRecoverableVideoStage(stage: CreatorStageRun | undefined): boolean {@@ -1103,24 +1175,6 @@ function artifactFileName(artifact: CreatorArtifact, version: number): string {?? `OpenCreator-video-V${version}.mp4`;}-function videoPhaseLabel(- phase: string,- l: (zh: string, en: string) => string-): string {- const labels: Record<string, string> = {- validating: l('检查视频生成设置', 'Checking video generation settings'),- preparing_reference: l('准备视频参考图', 'Preparing the reference image'),- submitting: l('提交视频生成任务', 'Submitting the video generation task'),- queued: l('视频生成任务排队中', 'Video generation task queued'),- generating: l('视频生成中', 'Generating video'),- downloading: l('下载生成的视频', 'Downloading the generated video'),- collecting_output: l('整理视频文件', 'Collecting the video file'),- validating_output: l('检查视频文件', 'Checking the video file'),- completed: l('视频已生成', 'Video generated')- };- return labels[phase] ?? l('正在处理视频生成任务', 'Processing the video generation task');-}-function formatBytes(size: number) {if (size <= 0) return 'MP4';if (size < 1024 * 1024) return `${Math.max(1, Math.round(size / 1024))} KB`;@@ -1129,7 +1183,7 @@ function formatBytes(size: number) {function formatVideoError(error: unknown,- l: (zh: string, en: string) => string,+ l: LocalizeCopy,modelLabel = '',provider: VideoGenerationProvider = 'seedance') {@@ -1166,6 +1220,10 @@ function formatVideoError(`${selected} is not enabled for this account. Switch models or enable it in ${consoleName}.`);}+ if (typeof error === 'object' && error !== null && 'publicFacts' in error && isPublicErrorFacts(error.publicFacts)+ && error.publicFacts.kind !== 'unknown') {+ return publicErrorReason(error.publicFacts, l);+ }if (code === 'creator_video_upstream_error' || code === 'VIDEO_GENERATION_UPSTREAM_ERROR') {return l('视频生成请求失败,请检查模型服务配置和网络后重试',diff --git a/apps/web/src/features/dashboard/creator-panel-adapters.test.ts b/apps/web/src/features/dashboard/creator-panel-adapters.test.tsindex a8d67efa..b106843f 100644--- a/apps/web/src/features/dashboard/creator-panel-adapters.test.ts+++ b/apps/web/src/features/dashboard/creator-panel-adapters.test.ts@@ -3,6 +3,7 @@ import { describe, expect, it } from 'vitest';import { createLocalizedCopy } from '../../i18n/localized-copy.js';import {videoTranslationPanelAdapter,+ videoGenerationPanelAdapter,creatorPanelAdapterFor,stickmanVideoPanelAdapter,type CreatorPanelLocalize@@ -11,6 +12,55 @@ import {const zh: CreatorPanelLocalize = value => value;const en: CreatorPanelLocalize = (_zh, value) => value;+describe('video generation progress', () => {+ it.each(['zh-CN', 'en-US', 'sv-SE'] as const)('explains unknown progress and retries in %s', language => {+ const localize = createLocalizedCopy(language);+ const running = { ...stage('generate', '', 'running', null, 'generate'), progress: {+ phase: 'generating', percent: null, message: 'The video provider is generating the video'+ } };+ const progress = videoGenerationPanelAdapter.readStageProgress(running, localize);+ expect(progress).toMatchObject({ percent: null, indeterminate: true, showMessage: true, showTiming: true });+ expect(progress.message).not.toContain('The video provider is generating the video');+ expect(progress.message).not.toContain('%');+ const retrying = videoGenerationPanelAdapter.readStageProgress({ ...running, progress: {+ ...running.progress, refreshRetry: 2, message: 'The provider status connection was interrupted and will be retried'+ } }, localize);+ expect(retrying.message).toContain('2');+ expect(retrying.message).not.toContain('interrupted and will be retried');+ if (language !== 'zh-CN') {+ expect(progress.message).not.toMatch(/\p{Script=Han}/u);+ expect(retrying.message).not.toMatch(/\p{Script=Han}/u);+ }+ const recovered = videoGenerationPanelAdapter.readStageProgress({ ...running, progress: {+ ...running.progress, refreshRetry: 2+ } }, localize);+ expect(recovered.message).toBe(progress.message);+ const downloading = videoGenerationPanelAdapter.readStageProgress({ ...running, progress: {+ phase: 'downloading', percent: 90, refreshRetry: 2,+ message: 'The provider status connection was interrupted and will be retried'+ } }, localize);+ expect(downloading).toMatchObject({ showMessage: false, percent: 90, indeterminate: false });+ });++ it('preserves a real percentage and leaves finished tasks compact', () => {+ const running = { ...stage('generate', '', 'running', null, 'generate'), progress: { phase: 'generating', percent: 54 } };+ expect(videoGenerationPanelAdapter.readStageProgress(running, en)).toMatchObject({+ percent: 54, indeterminate: false, showMessage: false, showTiming: true+ });+ expect(videoGenerationPanelAdapter.readStageProgress({ ...running, status: 'succeeded' }, en)).toMatchObject({+ showTiming: false, indeterminate: false, showMessage: false+ });+ });++ it('keeps queued tasks indeterminate without inventing a queue position', () => {+ const queued = { ...stage('generate', '', 'queued', null, 'generate'), progress: { phase: 'queued', percent: null } };+ expect(videoGenerationPanelAdapter.readStageProgress(queued, en)).toMatchObject({+ percent: null, indeterminate: true, showMessage: true, showTiming: true,+ message: expect.stringContaining('Queue position and exact progress are not available')+ });+ });+});+describe('shared native image progress', () => {it.each(['image-generation', 'cover', 'stickman-video', 'wechat-article'])('shows native preparation and generation phases without fake percentages (%s)', template => {const adapter = creatorPanelAdapterFor(template);diff --git a/apps/web/src/features/dashboard/creator-panel-adapters.ts b/apps/web/src/features/dashboard/creator-panel-adapters.tsindex e24881cb..4ed96e95 100644--- a/apps/web/src/features/dashboard/creator-panel-adapters.ts+++ b/apps/web/src/features/dashboard/creator-panel-adapters.ts@@ -16,6 +16,7 @@ export type NormalizedCreatorActivity = {export type CreatorStageProgressView = {detailsHref?: string;showMessage?: boolean;+ showTiming?: boolean;percent: number | null;indeterminate?: boolean;phase: string | null;@@ -854,18 +855,38 @@ export const videoGenerationPanelAdapter: CreatorPanelAdapter = {videoGenerationFieldLabel);},- readStageProgress(stage) {+ readStageProgress(stage, localize) {const progress = readStandardProgress(stage);- if (- progress.percent === null- && (progress.phase === 'queued' || progress.phase === 'generating')- ) {- return {- ...progress,- indeterminate: stage.status === 'running'- };+ const active = stage.status === 'queued' || stage.status === 'running';+ const retry = readFiniteNumber(stage.progress.refreshRetry);+ let message: string | null = null;+ if (active && progress.phase === 'generating' && retry !== null && retry > 0+ && progress.message === 'The provider status connection was interrupted and will be retried') {+ message = localize(+ `视频服务状态查询暂时失败,正在自动重试(第 ${retry} 次)。不会重复提交生成任务。`,+ `The provider status check failed temporarily. Retrying automatically (attempt ${retry}) without submitting another generation task.`,+ `Kontrollen av leverantörens status misslyckades tillfälligt. Försöker automatiskt igen (försök ${retry}) utan att skicka en ny genereringsuppgift.`+ );+ } else if (active && progress.phase === 'queued') {+ message = localize(+ '任务正在服务商队列中,服务商未提供排队位置或精确进度。',+ 'The task is queued with the provider. Queue position and exact progress are not available.',+ 'Uppgiften ligger i kö hos leverantören. Köposition och exakt förlopp är inte tillgängliga.'+ );+ } else if (active && progress.phase === 'generating' && progress.percent === null) {+ message = localize(+ '服务商未提供精确进度;后台正在持续查询生成状态,完成后会自动下载视频。',+ 'The provider does not report exact progress. Status checks continue in the background, and the video will download automatically when ready.',+ 'Leverantören rapporterar inte exakt förlopp. Statuskontroller fortsätter i bakgrunden och videon laddas ner automatiskt när den är klar.'+ );}- return progress;+ return {+ ...progress,+ indeterminate: active && progress.percent === null,+ showTiming: active,+ showMessage: message !== null,+ message: message ?? progress.message+ };},runningProgressText(_stage, progress, l) {return progress.phase === nulldiff --git a/apps/web/src/features/dashboard/creator-session-store.test.tsx b/apps/web/src/features/dashboard/creator-session-store.test.tsxindex 426e95bb..d188c6f1 100644--- a/apps/web/src/features/dashboard/creator-session-store.test.tsx+++ b/apps/web/src/features/dashboard/creator-session-store.test.tsx@@ -1,7 +1,7 @@import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';import { useEffect } from 'react';import { describe, expect, it, vi } from 'vitest';-import type { CreatorEventEnvelope, CreatorJob, OpenCreatorIssue } from '@opencreator/protocol';+import type { CreatorEventEnvelope, CreatorJob, CreatorStageRun, OpenCreatorIssue } from '@opencreator/protocol';import { LanguageProvider } from '../../i18n/LanguageProvider.js';import { LanguageSwitchControls } from '../../test/LanguageSwitchControls.js';import {@@ -88,6 +88,53 @@ function PendingHarness() {}describe('CreatorSessionStore', () => {+ it('does not overwrite a failed job with a delayed successful action response', async () => {+ let resolveAction!: (value: { job: CreatorJob }) => void;+ const applyAction = vi.fn(() => new Promise<{ job: CreatorJob }>(resolve => { resolveAction = resolve; }));+ let session!: ReturnType<typeof useCreatorSession>;+ function SnapshotHarness() {+ session = useCreatorSession();+ return <Harness />;+ }+ render(<CreatorSessionProvider initialJob={job(0, {})} service={{ applyAction, runAgentTurn: vi.fn() } as never}>+ <SnapshotHarness />+ </CreatorSessionProvider>);+ let actionWork!: Promise<CreatorJob>;+ await act(async () => { actionWork = session.applyAction({ action: 'run-stage', input: { stageId: 'subtitle' } }); });+ expect(applyAction).toHaveBeenCalledTimes(1);+ const failed = { ...job(2, {}), status: 'failed' as const };+ act(() => session.applyRemoteSnapshot(failed));+ await act(async () => { resolveAction({ job: { ...job(1, {}), status: 'running' } }); await actionWork; });+ expect(session.job).toBe(failed);+ expect((await actionWork).status).toBe('failed');+ expect(screen.getByLabelText('error')).toBeEmptyDOMElement();+ });++ it('ignores snapshots and replayed events that regress the same stage from failed to running', async () => {+ const failedStage: CreatorStageRun = {+ id: 'stage_failure', jobId: 'job_1', stageId: 'subtitle', executor: 'krillinai', status: 'failed',+ dispatchStatus: 'finished', claimOwner: null, claimExpiresAt: null, attempt: 1, idempotencyKey: null,+ scopeKey: null, inputFingerprint: null, progress: { percent: 8, status: 'running' },+ errorCode: 'creator_stage_failed', errorMessage: 'Failed', startedAt: null, finishedAt: '2026-08-21T00:00:01.000Z'+ };+ const failed = { ...job(2, {}), status: 'failed' as const, stages: [failedStage] };+ let session!: ReturnType<typeof useCreatorSession>;+ let emit!: (event: CreatorEventEnvelope) => void;+ const getJob = vi.fn(async () => ({ job: failed }));+ const subscribeJobEvents = vi.fn((_id, onEvent) => { emit = onEvent; return { close: vi.fn() }; });+ function SnapshotHarness() { session = useCreatorSession(); return <Harness />; }+ render(<CreatorSessionProvider initialJob={failed} service={{ applyAction: vi.fn(), runAgentTurn: vi.fn(), getJob, subscribeJobEvents } as never}>+ <SnapshotHarness />+ </CreatorSessionProvider>);+ await waitFor(() => expect(subscribeJobEvents).toHaveBeenCalledTimes(1));+ const runningStage = { ...failedStage, status: 'running' as const, finishedAt: null };+ act(() => session.applyRemoteSnapshot({ ...failed, status: 'running', stages: [runningStage] }));+ act(() => emit({ id: 'stale-stage', jobId: failed.id, revision: 2, kind: 'stage_progress', payload: { stage: runningStage as never }, createdAt: '2026-08-21T00:00:00.000Z' }));+ expect(screen.getByLabelText('stages')).toHaveTextContent('subtitle:failed');+ act(() => session.applyRemoteSnapshot({ ...failed, revision: 3, status: 'running', stages: [{ ...runningStage, id: 'new_stage' }] }));+ expect(screen.getByLabelText('stages')).toHaveTextContent('subtitle:running');+ });+it('recovers an initial snapshot failure while retaining local state without submitting tasks', async () => {const getJob = vi.fn().mockRejectedValueOnce(new TypeError('offline')).mockResolvedValue({ job: job(2, { targetLanguage: 'en' }) });diff --git a/apps/web/src/features/dashboard/creator-session-store.tsx b/apps/web/src/features/dashboard/creator-session-store.tsxindex 0ddd618a..cc0f97af 100644--- a/apps/web/src/features/dashboard/creator-session-store.tsx+++ b/apps/web/src/features/dashboard/creator-session-store.tsx@@ -470,6 +470,13 @@ export function CreatorSessionProvider(props: {}, [captureCreatorFailure, ensurePersistedJob, flush, props.service]);const applyRemoteSnapshot = useCallback((next: CreatorJob) => {+ const current = confirmedRef.current;+ if (next.id === current.id && (next.revision < current.revision+ || next.revision === current.revision && next.stages.some(stage => {+ const previous = current.stages.find(candidate => candidate.id === stage.id);+ return previous !== undefined && terminalCreatorStage(previous.status)+ && (stage.status === 'queued' || stage.status === 'running');+ }))) return;const conflicts = [...dirtyRef.current].filter(field => (JSON.stringify(next.state[field]) !== JSON.stringify(draftRef.current[field])));@@ -566,7 +573,13 @@ export function CreatorSessionProvider(props: {},onState: setConnection,shouldReloadSnapshot(event) {- return event.kind === 'snapshot_changed';+ return event.kind === 'snapshot_changed'+ || event.kind === 'stage_progress' && isRecord(event.payload.stage)+ && typeof event.payload.stage.status === 'string' && terminalCreatorStage(event.payload.stage.status);+ },+ shouldReconcileSnapshot() {+ const job = confirmedRef.current;+ return job.status === 'running' || job.stages.some(stage => stage.status === 'running' || stage.status === 'queued');}});subscriptionRef.current = subscription;@@ -603,10 +616,9 @@ export function CreatorSessionProvider(props: {...request,expectedRevision: requestRevision});- confirmedRef.current = response.job;- setConfirmedJob(response.job);+ applyRemoteSnapshot(response.job);setError(null);- return response.job;+ return confirmedRef.current;} catch (cause) {const nextError = toSessionError(cause);if (!isSupersededRevisionConflict(cause, requestRevision, confirmedRef.current.revision)) {@@ -1004,6 +1016,9 @@ function mergeCreatorEvent(job: CreatorJob, event: CreatorEventEnvelope): Creatoconst stage = readCreatorStage(event.payload.stage, job.id);if (stage === null) return job;const index = job.stages.findIndex(candidate => candidate.id === stage.id);+ const previous = job.stages[index];+ if (previous !== undefined && terminalCreatorStage(previous.status)+ && (stage.status === 'queued' || stage.status === 'running') && event.revision <= job.revision) return job;const stages = index < 0? [...job.stages, stage]: job.stages.map(candidate => candidate.id === stage.id ? stage : candidate);@@ -1034,6 +1049,10 @@ function mergeCreatorEvent(job: CreatorJob, event: CreatorEventEnvelope): Creatoreturn job;}+function terminalCreatorStage(status: string): boolean {+ return ['succeeded', 'failed', 'canceled', 'interrupted'].includes(status);+}+function mergeIssueIntoJob(job: CreatorJob, issue: OpenCreatorIssue): CreatorJob {const current = job.issues ?? [];return {diff --git a/apps/web/src/features/dashboard/dashboard-css.test.ts b/apps/web/src/features/dashboard/dashboard-css.test.tsindex 10746085..4d466a79 100644--- a/apps/web/src/features/dashboard/dashboard-css.test.ts+++ b/apps/web/src/features/dashboard/dashboard-css.test.ts@@ -18,6 +18,13 @@ function cssBlocks(selector: string): string[] {}describe('dashboard CSS contracts', () => {+ it('keeps playback duration above tall generated videos and readable on narrow screens', () => {+ const caption = cssBlocks('.video-generation-preview figcaption')[0];+ expect(caption).toContain('order: -1;');+ expect(caption).toContain('flex-wrap: wrap;');+ expect(cssBlocks('.video-generation-preview output')[0]).toContain('font-variant-numeric: tabular-nums;');+ });+it('keeps article-template icons unframed inside selectable list items', () => {for (const selector of ['.wechat-template-inline-list > button > span',diff --git a/apps/web/src/features/dashboard/dashboard.css b/apps/web/src/features/dashboard/dashboard.cssindex b881e821..6a549a01 100644--- a/apps/web/src/features/dashboard/dashboard.css+++ b/apps/web/src/features/dashboard/dashboard.css@@ -6123,6 +6123,29 @@object-fit: contain;}+.video-generation-preview {+ min-width: 0;+ display: grid;+ gap: 6px;+ margin: 0;+}++.video-generation-preview figcaption {+ order: -1;+ display: flex;+ flex-wrap: wrap;+ align-items: center;+ justify-content: space-between;+ gap: 4px 12px;+ color: var(--muted);+ font-size: 11px;+}++.video-generation-preview output {+ font-variant-numeric: tabular-nums;+ white-space: nowrap;+}+.video-generation-result[data-ratio="16:9"] video {aspect-ratio: 16 / 9;}@@ -6182,54 +6205,54 @@color: var(--on-accent);}-.video-generation-progress {- min-height: 240px;- display: grid;- justify-items: center;- align-content: center;- gap: 9px;- text-align: center;+.video-generation-background-note {+ margin: 12px 0 0;+ color: var(--muted);+ font-size: 11px;+ line-height: 1.5;}-.video-generation-progress > span:first-child {- width: 48px;- height: 48px;+.creator-task-progress-notice {+ min-width: 0;display: grid;- place-items: center;+ gap: 8px;+ margin-bottom: 14px;+ padding: 12px;+ border: 1px solid color-mix(in srgb, var(--accent) 24%, var(--border));border-radius: 8px;- background: color-mix(in srgb, var(--accent) 8%, var(--surface-2));- color: var(--accent);+ background: color-mix(in srgb, var(--accent) 5%, var(--surface));}-.video-generation-progress strong {- font-size: 14px;- font-weight: 650;+.creator-task-progress-notice-heading {+ display: flex;+ align-items: center;+ gap: 8px;+ color: var(--accent);+ font-size: 12px;}-.video-generation-progress p {- max-width: 340px;- color: var(--muted);- font-size: 11px;- line-height: 1.5;+.creator-task-progress-notice-heading > svg {+ flex: 0 0 auto;}-.video-generation-progress > div {- width: min(360px, 86%);- height: 6px;- overflow: hidden;- border-radius: 3px;- background: var(--surface-2);+.creator-collaboration-stage-details {+ min-width: 0;+ display: grid;+ gap: 6px;}-.video-generation-progress > div > span {- height: 100%;- display: block;- border-radius: inherit;- background: var(--accent);- transition: width 180ms ease;+.creator-collaboration-stage-message {+ margin: 0;+ color: var(--muted);+ font-size: 11px;+ line-height: 1.55;+ overflow-wrap: anywhere;}-.video-generation-progress > small {+.creator-collaboration-stage-timing {+ display: flex;+ flex-wrap: wrap;+ gap: 4px 12px;color: var(--subtle);font-size: 10px;font-variant-numeric: tabular-nums;diff --git a/apps/web/src/features/issues/issue-catalog.test.ts b/apps/web/src/features/issues/issue-catalog.test.tsindex d62e8f7d..b39d2e0b 100644--- a/apps/web/src/features/issues/issue-catalog.test.ts+++ b/apps/web/src/features/issues/issue-catalog.test.ts@@ -6,6 +6,25 @@ const raw = '后台原文:操作无法完成';const issue = normalizePageIssue('runtime', 'creator.prepare', new Error(raw), raw);describe('localized issue copy', () => {+ it.each(['zh-CN', 'en-US', 'sv-SE'] as const)('shows the actual upstream reason and request ID in %s', language => {+ const next = { ...issue, code: 'creator_video_upstream_error', publicFacts: {+ kind: 'http-rejected' as const, provider: 'seedance', httpStatus: 400,+ upstreamCode: 'InputImageSensitiveContentDetected.SensitiveContent',+ upstreamMessage: 'Reference image was rejected. token=private', requestId: 'request-123'+ } };+ const text = presentIssue(next, language).description;+ expect(text).toContain('HTTP 400');+ expect(text).toContain(next.publicFacts.upstreamCode);+ expect(text).toContain('Reference image was rejected.');+ expect(text).toContain('request-123');+ expect(text).not.toContain('private');+ expect(text).not.toContain('尚未确认更细的原因');+ const conversation = issueConversationText(next, language);+ expect(conversation.nextStep).not.toContain('当前任务状态');+ expect(buildIssueAgentPrompt(next, 'Why?', language)).toContain(next.publicFacts.upstreamCode);+ expect(buildIssueAgentPrompt(next, 'Why?', language)).not.toContain('private');+ });+it.each([['creator_dependency_prepare_failed', 'Förberedelsen av lokal transkription misslyckades'],['creator_source_part_required', 'Kontrollera Bilibili-länken'],diff --git a/apps/web/src/features/issues/issue-catalog.ts b/apps/web/src/features/issues/issue-catalog.tsindex c6159c0c..bc28dc30 100644--- a/apps/web/src/features/issues/issue-catalog.ts+++ b/apps/web/src/features/issues/issue-catalog.ts@@ -1,4 +1,4 @@-import { safePublicErrorCode, type OpenCreatorIssue, type PublicErrorFacts } from '@opencreator/protocol';+import { safePublicErrorCode, sanitizePublicErrorFacts, type OpenCreatorIssue, type PublicErrorFacts } from '@opencreator/protocol';import type { AppLanguage } from '../../i18n/language.js';import { createLocalizedCopy, type LocalizeCopy } from '../../i18n/localized-copy.js';@@ -59,15 +59,17 @@ function localizedIssueSummary(issue: OpenCreatorIssue, localize: LocalizeCopy):return localize(entry.zh, entry.en);}-function publicErrorReason(facts: PublicErrorFacts, language: AppLanguage): string {- const localize = createLocalizedCopy(language);- const reasons: Record<PublicErrorFacts['kind'], { zh: string; en: string }> = {+export function publicErrorReason(input: PublicErrorFacts, language: AppLanguage | LocalizeCopy): string {+ const facts = sanitizePublicErrorFacts(input);+ const localize = typeof language === 'function' ? language : createLocalizedCopy(language);+ const reasons: Record<PublicErrorFacts['kind'], { zh: string; en: string; sv?: string }> = {timeout: { zh: '请求超时', en: 'The request timed out' },dns: { zh: '域名解析失败', en: 'DNS resolution failed' },'connection-refused': { zh: '连接被拒绝', en: 'The connection was refused' },'connection-reset': { zh: '连接被中断', en: 'The connection was reset' },tls: { zh: '安全连接建立失败', en: 'The secure connection failed' },'http-rejected': { zh: '服务拒绝了请求', en: 'The service rejected the request' },+ 'provider-failed': { zh: '外部服务报告任务失败', en: 'The provider reported that the task failed', sv: 'Leverantören rapporterade att uppgiften misslyckades' },'rate-limited': { zh: '请求频率受限', en: 'The request was rate-limited' },unauthorized: { zh: '服务未授权或权限不足', en: 'Service authorization failed or access was denied' },'invalid-response': { zh: '服务返回了无法处理的结果', en: 'The service returned an invalid response' },@@ -82,7 +84,7 @@ function publicErrorReason(facts: PublicErrorFacts, language: AppLanguage): stri};const parts = facts.kind === 'unknown'? []- : [localize(reasons[facts.kind].zh, reasons[facts.kind].en)];+ : [localize(reasons[facts.kind].zh, reasons[facts.kind].en, reasons[facts.kind].sv)];if (facts.provider !== undefined && safePublicErrorCode(facts.provider) !== undefined) {parts.push(`provider: ${safeIdentifier(facts.provider)}`);}@@ -90,6 +92,12 @@ function publicErrorReason(facts: PublicErrorFacts, language: AppLanguage): striif (facts.upstreamCode !== undefined && safePublicErrorCode(facts.upstreamCode) !== undefined) {parts.push(`upstream: ${safeIdentifier(facts.upstreamCode)}`);}+ if (facts.upstreamMessage !== undefined) {+ parts.push(localize(`服务说明:${facts.upstreamMessage}`, `Provider message: ${facts.upstreamMessage}`, `Leverantörens meddelande: ${facts.upstreamMessage}`));+ }+ if (facts.requestId !== undefined) {+ parts.push(localize(`请求编号:${facts.requestId}`, `Request ID: ${facts.requestId}`, `Begärans-ID: ${facts.requestId}`));+ }if (facts.kind === 'unknown') {return localize(`${parts.length > 0 ? `已记录信息:${parts.join(',')}。` : ''}尚未确认更细的原因。`,@@ -112,6 +120,12 @@ export function issueConversationText(const localize = createLocalizedCopy(language);const nextStep = issue.code === 'creator_template_version_mismatch'? localize('请刷新页面以加载当前模板版本;如果仍然失败,请重新启动本地服务。', 'Refresh the page to load the current template version. If the problem persists, restart the local service.', 'Uppdatera sidan för att läsa in den aktuella mallversionen. Om problemet kvarstår, starta om den lokala tjänsten.')+ : issue.publicFacts?.kind === 'http-rejected' || issue.publicFacts?.kind === 'provider-failed'+ ? localize('请根据服务返回的原因调整输入或请求参数后重试;仍有疑问时,可提供请求编号向服务方查询。', 'Review the provider reason and adjust the input or request parameters before retrying. Use the request ID to ask the provider for details if needed.', 'Läs leverantörens felorsak och justera indata eller parametrarna innan du försöker igen. Använd begärans-ID för att fråga leverantören vid behov.')+ : issue.publicFacts?.kind === 'unauthorized'+ ? localize('请检查服务凭据和模型访问权限后重试。', 'Check the provider credentials and model access permissions before retrying.', 'Kontrollera leverantörens autentiseringsuppgifter och modellbehörigheter innan du försöker igen.')+ : issue.publicFacts?.kind === 'rate-limited'+ ? localize('请检查服务配额或稍后重试。', 'Check the provider quota or retry later.', 'Kontrollera leverantörens kvot eller försök igen senare.'): issue.category === 'network'? localize('请检查本地服务连接,然后重试。', 'Check the local service connection, then retry.', 'Kontrollera anslutningen till den lokala tjänsten och försök igen.'): issue.category === 'configuration'diff --git a/apps/web/src/features/settings/LocalTranscriptionComponents.test.tsx b/apps/web/src/features/settings/LocalTranscriptionComponents.test.tsxindex ae6146c1..75b4b7d3 100644--- a/apps/web/src/features/settings/LocalTranscriptionComponents.test.tsx+++ b/apps/web/src/features/settings/LocalTranscriptionComponents.test.tsx@@ -63,17 +63,30 @@ describe('local transcription component management', () => {expect(screen.getByText('/runtime/dependencies')).not.toBeVisible();fireEvent.click(screen.getByRole('button', { name: '下载组件' }));expect(controller.downloadComponents).toHaveBeenCalledOnce();+ expect(controller.downloadComponents).toHaveBeenCalledWith('whisperkit');await waitFor(() => expect(screen.getByRole('button', { name: '下载组件' })).not.toBeDisabled());});- it('checks a ready component without downloading or showing a primary maintenance action', async () => {+ it.each(['openai', 'aliyun', 'funasr'])('downloads an unselected component while using %s transcription', async provider => {+ const controller = controllerFixture({}, provider);+ render(<LanguageProvider><LocalTranscriptionComponents controller={controller} /></LanguageProvider>);++ expect(screen.queryByText('当前使用')).not.toBeInTheDocument();+ fireEvent.click(screen.getByRole('button', { name: '下载组件' }));++ expect(controller.downloadComponents).toHaveBeenCalledWith('whisperkit');+ expect(controller.componentsStatus?.selectedProvider).toBe(provider);+ await waitFor(() => expect(screen.getByRole('button', { name: '下载组件' })).not.toBeDisabled());+ });++ it('keeps status checks read-only and offers an independent update for a ready component', async () => {const controller = controllerFixture({ state: 'ready', version: '1.1.0' });render(<LanguageProvider><LocalTranscriptionComponents controller={controller} /></LanguageProvider>);expect(controller.refreshComponents).toHaveBeenCalledOnce();const button = screen.getByRole('button', { name: '检查状态' });expect(button).toHaveClass('settings-secondary-button');expect(button.closest('.runtime-component-actions')).not.toBeNull();- expect(screen.queryByRole('button', { name: /下载|修复|更新/ })).not.toBeInTheDocument();+ expect(screen.getByRole('button', { name: '检查并更新' })).toBeEnabled();fireEvent.click(button);@@ -82,6 +95,18 @@ describe('local transcription component management', () => {expect(controller.downloadComponents).not.toHaveBeenCalled();});+ it('checks and updates a ready component without selecting it for transcription', async () => {+ const controller = controllerFixture({ state: 'ready', version: '1.1.0' }, 'openai');+ render(<LanguageProvider><LocalTranscriptionComponents controller={controller} /></LanguageProvider>);++ expect(screen.getByText(/已通过校验的引擎和模型不会重复下载/)).toBeVisible();+ fireEvent.click(screen.getByRole('button', { name: '检查并更新' }));++ expect(controller.downloadComponents).toHaveBeenCalledWith('whisperkit');+ expect(controller.componentsStatus?.selectedProvider).toBe('openai');+ await waitFor(() => expect(screen.getByRole('button', { name: '检查并更新' })).not.toBeDisabled());+ });+it('keeps checks read-only even when components are missing', async () => {const controller = controllerFixture();render(<LanguageProvider><LocalTranscriptionComponents controller={controller} /></LanguageProvider>);diff --git a/apps/web/src/features/settings/LocalTranscriptionComponents.tsx b/apps/web/src/features/settings/LocalTranscriptionComponents.tsxindex 62ad630b..1f3af0e2 100644--- a/apps/web/src/features/settings/LocalTranscriptionComponents.tsx+++ b/apps/web/src/features/settings/LocalTranscriptionComponents.tsx@@ -60,7 +60,7 @@ export function LocalTranscriptionComponents({ controller, componentId, onReturnconst busy = ['downloading', 'verifying', 'extracting'].includes(component.state);const checking = action?.componentId === component.id && action.kind === 'check';const startingDownload = action?.componentId === component.id && action.kind === 'download';- const canDownload = selected && downloadComponents && component.state !== 'ready';+ const canDownload = downloadComponents !== undefined;const requiredResources = [component.version === null ? localize('转录引擎', 'transcription engine') : undefined,component.models.find(model => model.id === component.model)?.installed !== true@@ -108,16 +108,18 @@ export function LocalTranscriptionComponents({ controller, componentId, onReturn</div> : null}{component.error ? <div role="alert"><p>{localize('本地转录组件准备失败。已有字幕不受影响,可检查诊断信息后重试下载。', 'Local transcription preparation failed. Existing subtitles are unchanged; check the diagnostics and retry the download.', 'Förberedelsen av lokal transkription misslyckades. Befintliga undertexter är oförändrade; kontrollera diagnostiken och försök ladda ned igen.')}</p><OriginalErrorDetails detail={component.error} /></div> : null}{checkedComponentId === component.id && !controller.componentError && !actionError && !busy ? <p className="local-component-check-notice" role="status">{component.state === 'ready' ? localize('检查完成,本地组件已就绪。', 'Check complete. Local components are ready.') : localize('组件状态已刷新,尚未开始下载。', 'Component status refreshed. No downloads have started.')}</p> : null}- {!busy && canDownload ? <p>{localize('将准备所需资源:', 'Resources to prepare: ')}{requiredResources || localize('当前转录引擎和模型', 'the current transcription engine and model')}{localize('。', '.')}</p> : null}+ {!busy && canDownload ? <p>{component.state === 'ready'+ ? localize('将检查并按需更新至受支持版本,已通过校验的引擎和模型不会重复下载。', 'Checks and updates to the supported version as needed. Verified engines and models will not be downloaded again.')+ : <>{localize('将准备所需资源:', 'Resources to prepare: ')}{requiredResources || localize('当前转录引擎和模型', 'the current transcription engine and model')}{localize('。', '.')}</>}</p> : null}{!busy ? <footer className="runtime-component-footer"><div className="runtime-component-actions">{refreshComponents ? <button type="button" className="settings-secondary-button" disabled={action !== undefined} onClick={() => void performAction(component.id, 'check', refreshComponents)}>{checking ? <LoaderCircle className="settings-spin" size={15} aria-hidden="true" /> : <RefreshCw size={15} aria-hidden="true" />}{checking ? localize('正在检查', 'Checking') : localize('检查状态', 'Check status')}</button> : null}- {canDownload ? <button type="button" className="settings-primary-button" disabled={action !== undefined} onClick={() => void performAction(component.id, 'download', downloadComponents)}>+ {downloadComponents ? <button type="button" className="settings-primary-button" disabled={action !== undefined} onClick={() => void performAction(component.id, 'download', () => downloadComponents(component.id))}>{startingDownload ? <LoaderCircle className="settings-spin" size={15} aria-hidden="true" /> : <Download size={15} aria-hidden="true" />}- {startingDownload ? localize('正在准备', 'Preparing') : component.state === 'failed' ? localize('重试下载', 'Retry download') : component.state === 'partial' ? localize('补齐组件', 'Complete installation') : localize('下载组件', 'Download components')}+ {startingDownload ? localize('正在准备', 'Preparing') : component.state === 'ready' ? localize('检查并更新', 'Check and update') : component.state === 'failed' ? localize('重试下载', 'Retry download') : component.state === 'partial' ? localize('补齐组件', 'Complete installation') : localize('下载组件', 'Download components')}</button> : null}</div>{!selected ? <a href="#/settings?tab=ai-services§ion=transcription">{localize('调整转录设置', 'Change transcription settings')}</a> : null}diff --git a/apps/web/src/runtime/creator-sse.test.ts b/apps/web/src/runtime/creator-sse.test.tsindex 65dc7dd7..13210146 100644--- a/apps/web/src/runtime/creator-sse.test.ts+++ b/apps/web/src/runtime/creator-sse.test.ts@@ -3,6 +3,63 @@ import { createCreatorSnapshotSubscription } from './creator-sse.js';import { ApiClientError } from './client.js';describe('creator snapshot subscription', () => {+ it('reconciles an active task even when its terminal event is lost, then stops loading', async () => {+ vi.useFakeTimers();+ let active = true;+ const loadSnapshot = vi.fn().mockResolvedValueOnce({ status: 'running' }).mockResolvedValue({ status: 'failed' });+ const close = vi.fn();+ const subscribe = vi.fn(() => ({ close }));+ const subscription = createCreatorSnapshotSubscription<{ status: string }>({+ loadSnapshot, subscribe,+ onSnapshot(snapshot) { active = snapshot.status === 'running'; },+ shouldReconcileSnapshot: () => active+ });+ try {+ await subscription.start();+ await vi.advanceTimersByTimeAsync(5_000);+ await subscription.whenIdle();+ expect(loadSnapshot).toHaveBeenCalledTimes(2);+ expect(active).toBe(false);+ await vi.advanceTimersByTimeAsync(20_000);+ expect(loadSnapshot).toHaveBeenCalledTimes(2);+ expect(subscribe).toHaveBeenCalledTimes(1);+ subscription.close();+ await vi.advanceTimersByTimeAsync(10_000);+ expect(loadSnapshot).toHaveBeenCalledTimes(2);+ expect(close).toHaveBeenCalledTimes(1);+ } finally {+ subscription.close();+ vi.useRealTimers();+ }+ });++ it('does not overlap periodic snapshot requests or poll a terminal HTTP failure', async () => {+ vi.useFakeTimers();+ const pending = deferred<{ status: string }>();+ const loadSnapshot = vi.fn().mockResolvedValueOnce({ status: 'running' }).mockImplementationOnce(() => pending.promise)+ .mockRejectedValue(new ApiClientError({ status: 403, code: 'FORBIDDEN', message: 'Denied' }));+ const onState = vi.fn();+ const subscription = createCreatorSnapshotSubscription({+ loadSnapshot, subscribe: () => ({ close: vi.fn() }), onSnapshot: vi.fn(), onState,+ shouldReconcileSnapshot: () => true+ });+ try {+ await subscription.start();+ await vi.advanceTimersByTimeAsync(10_000);+ expect(loadSnapshot).toHaveBeenCalledTimes(2);+ pending.resolve({ status: 'running' });+ await subscription.whenIdle();+ await vi.advanceTimersByTimeAsync(5_000);+ await subscription.whenIdle();+ expect(onState).toHaveBeenLastCalledWith(expect.objectContaining({ status: 'failed' }));+ await vi.advanceTimersByTimeAsync(20_000);+ expect(loadSnapshot).toHaveBeenCalledTimes(3);+ } finally {+ subscription.close();+ vi.useRealTimers();+ }+ });+it('recovers automatically after the first snapshot fails', async () => {vi.useFakeTimers();const loadSnapshot = vi.fn().mockRejectedValueOnce(new TypeError('offline'))diff --git a/apps/web/src/runtime/creator-sse.ts b/apps/web/src/runtime/creator-sse.tsindex cb18fe8a..f7e930c9 100644--- a/apps/web/src/runtime/creator-sse.ts+++ b/apps/web/src/runtime/creator-sse.ts@@ -13,6 +13,8 @@ export function createCreatorSnapshotSubscription<T, Event = unknown>(input: {onSnapshot(snapshot: T): void;onEvent?(event: Event): void;shouldReloadSnapshot?(event: Event): boolean;+ shouldReconcileSnapshot?(): boolean;+ reconcileIntervalMs?: number;onError?(error: unknown): void;onState?(state: CreatorConnectionState): void;reconnectDelays?: readonly number[];@@ -25,6 +27,7 @@ export function createCreatorSnapshotSubscription<T, Event = unknown>(input: {let reloadScheduled = false;let reconnectAttempt = 0;let reconnectTimer: ReturnType<typeof setTimeout> | undefined;+ let reconcileTimer: ReturnType<typeof setInterval> | undefined;const controller = new AbortController();let lastError: unknown;@@ -56,6 +59,13 @@ export function createCreatorSnapshotSubscription<T, Event = unknown>(input: {error => error === undefined ? scheduleReconnect() : handleFailure(error));input.onState?.({ status: 'connected', attempt: 0 });+ if (input.shouldReconcileSnapshot !== undefined && reconcileTimer === undefined) {+ reconcileTimer = setInterval(() => {+ if (!closed && connection !== undefined && !reloadScheduled && input.shouldReconcileSnapshot?.()) {+ scheduleReload();+ }+ }, Math.max(1_000, input.reconcileIntervalMs ?? 5_000));+ }};const scheduleReload = () => {@@ -138,6 +148,10 @@ export function createCreatorSnapshotSubscription<T, Event = unknown>(input: {clearTimeout(reconnectTimer);reconnectTimer = undefined;}+ if (reconcileTimer !== undefined) {+ clearInterval(reconcileTimer);+ reconcileTimer = undefined;+ }connection?.close();connection = undefined;}diff --git a/apps/web/src/services/runtime-dependency-service.test.ts b/apps/web/src/services/runtime-dependency-service.test.tsindex 6e299a28..33322816 100644--- a/apps/web/src/services/runtime-dependency-service.test.ts+++ b/apps/web/src/services/runtime-dependency-service.test.ts@@ -2,6 +2,19 @@ import { describe, expect, it, vi } from 'vitest';import { createRuntimeDependencyService } from './runtime-dependency-service.js';describe('runtime dependency service', () => {+ it('passes the requested component to the shared Runtime endpoint', async () => {+ const client = { get: vi.fn(), post: vi.fn(async () => ({})) };+ const service = createRuntimeDependencyService(client);++ await service.downloadComponents('whisperkit');+ await service.downloadComponents('whisper.cpp');+ await service.downloadComponents();++ expect(client.post).toHaveBeenNthCalledWith(1, '/creator/components/download', { componentId: 'whisperkit' });+ expect(client.post).toHaveBeenNthCalledWith(2, '/creator/components/download', { componentId: 'whisper.cpp' });+ expect(client.post).toHaveBeenNthCalledWith(3, '/creator/components/download', undefined);+ });+it('uses the shared Runtime dependency endpoints', async () => {const client = {get: vi.fn(async () => ({ ytDlp: {} })),diff --git a/apps/web/src/services/runtime-dependency-service.ts b/apps/web/src/services/runtime-dependency-service.tsindex 462f8c29..eb5745b4 100644--- a/apps/web/src/services/runtime-dependency-service.ts+++ b/apps/web/src/services/runtime-dependency-service.ts@@ -1,4 +1,4 @@-import type { CreatorRuntimeComponentsResponse, CreatorYtDlpStatusResponse } from '@opencreator/protocol';+import type { CreatorLocalComponent, CreatorRuntimeComponentsResponse, CreatorYtDlpStatusResponse } from '@opencreator/protocol';type ClientLike = {get(path: string): Promise<unknown>;@@ -10,8 +10,8 @@ export function createRuntimeDependencyService(client: ClientLike) {getComponentsStatus(): Promise<CreatorRuntimeComponentsResponse> {return client.get('/creator/components/status') as Promise<CreatorRuntimeComponentsResponse>;},- downloadComponents(): Promise<CreatorRuntimeComponentsResponse> {- return client.post('/creator/components/download') as Promise<CreatorRuntimeComponentsResponse>;+ downloadComponents(componentId?: CreatorLocalComponent['id']): Promise<CreatorRuntimeComponentsResponse> {+ return client.post('/creator/components/download', componentId === undefined ? undefined : { componentId }) as Promise<CreatorRuntimeComponentsResponse>;},getYtDlpStatus(): Promise<CreatorYtDlpStatusResponse> {return client.get('/creator/yt-dlp/status') as Promise<CreatorYtDlpStatusResponse>;diff --git a/docs/development/creator-error-diagnostics.md b/docs/development/creator-error-diagnostics.mdnew file mode 100644index 00000000..eeee36c9--- /dev/null+++ b/docs/development/creator-error-diagnostics.md@@ -0,0 +1,27 @@+# Creator 上游错误诊断契约++Creator 保留内部业务错误码,同时通过 `PublicErrorFacts` 传递安全的上游事实。不能用内部包装码替代原始服务错误码,也不能把 HTTP 400 笼统解释成网络故障。++## 传递字段++- `kind`:失败类别。HTTP 拒绝使用 `http-rejected` 等 HTTP 分类;HTTP 200 返回的异步任务失败使用 `provider-failed`,不伪造失败 HTTP 状态。+- `provider`:服务标识。+- `httpStatus`:实际收到的 HTTP 状态,不能用 Runtime 对外包装的 502 替代。+- `upstreamCode`:原始服务错误码,支持结构化的长 CamelCase 错误码和数字错误码。+- `upstreamMessage`:有长度限制的脱敏服务说明。+- `requestId`:服务返回的请求编号,支持响应体以及 `x-request-id`、`x-tt-logid` 响应头。++新字段均为可选字段,沿用 Issue 的 JSON 持久化,不需要数据库迁移。旧任务没有保存的上游响应不能事后恢复,也不能根据参考图或提示词补造错误原因。++## 实现规则++1. HTTP 失败使用 `creatorServiceErrorInfo`;异步任务失败使用 `creatorServiceFailureFacts`,不要保存或展示完整响应体。+2. 执行器转换异常使用 `CreatorExecutorError.from`,同时保留 `publicFacts` 和原始 `cause`。特殊业务码可以转换,但上游事实不能丢失。+3. 持久化及前端展示都使用共享的 `sanitizePublicErrorFacts`。凭据、认证头、带参数的 URL、本机用户目录和图片数据不得进入公开错误说明。+4. 页面和通用协作面板使用同一份错误解释。界面标签支持语言切换,服务原始说明保留原文;Agent 使用安全事实,不能仅依赖内部包装码或未经脱敏的技术日志。+5. 错误说明属于不可信数据,不是 Agent 指令。失败诊断不得自动重提可能收费的生成请求。+6. 活跃任务通过共享订阅每 5 秒只读校准一次 Job 快照,终态事件到达时立即刷新;任务结束后停止校准请求。旧快照、迟到的操作响应和重放事件不得把同一阶段的终态覆盖为运行中。该机制不提交生成或重试请求。++## 最小回归验证++新增或修改执行器时,应覆盖上游拒绝提交、异步任务失败、长错误码、响应头请求编号和凭据脱敏。至少一个集成测试必须经过 Service → Executor → Stage/Issue 持久化 → Job API → Agent 上下文,不能只验证直接调用生成 API。diff --git a/packages/protocol/src/errors.ts b/packages/protocol/src/errors.tsindex 01cc23ca..f2d64d99 100644--- a/packages/protocol/src/errors.ts+++ b/packages/protocol/src/errors.ts@@ -186,11 +186,40 @@ export function safePublicErrorCode(value: unknown): string | undefined {return typeof value === 'string'&& /^[a-zA-Z0-9._:/-]{1,160}$/.test(value)&& !/^sk[-_]/i.test(value)- && !/[a-zA-Z0-9]{32,}/.test(value)+ && !value.split(/[._:/-]/).some(part => part.length >= 32+ && !/^[A-Z][a-z]+(?:[A-Z][a-z]+){2,}$/.test(part))? value: undefined;}+export function safePublicRequestId(value: unknown): string | undefined {+ return typeof value === 'string'+ && /^[a-zA-Z0-9][a-zA-Z0-9._:-]{0,159}$/.test(value)+ && !/^(?:sk[-_]|AIza|AKIA|ASIA|gh[pousr]_|github_pat_|eyJ)/i.test(value)+ ? value+ : undefined;+}++export function safePublicErrorMessage(value: unknown): string | undefined {+ if (typeof value !== 'string' || value.length > 4_000) return undefined;+ const sanitized = value+ .replace(/\b(?:authorization|api[-_ ]?key|(?:access[-_ ]?|refresh[-_ ]?)?token|secret|password)["']?\s*[:=]\s*(?:"[^"]*"|'[^']*'|(?:Bearer|Basic)\s+[^\s,;]+|[^\s,;]+)/gi, '[redacted]')+ .replace(/\b(?:Bearer|Basic)\s+[^\s,;]+/gi, '[redacted]')+ .replace(/\b(?:sk[-_]|AIza|AKIA|ASIA|gh[pousr]_|github_pat_|eyJ)[a-zA-Z0-9._-]+/gi, '[redacted]')+ .replace(/data:[^\s,]+,[a-zA-Z0-9+/=]+/gi, '[redacted]')+ .replace(/\b(?:https?|file):\/\/[^\s<>"']+/gi, '[redacted]')+ .replace(/[a-zA-Z]:\\Users\\[^\s"']+|\/(?:Users|home)\/[^\s"']+/g, '[redacted]')+ .replace(/^\s*at\s+[^\n]+$/gm, '')+ .replace(/\b[a-zA-Z0-9+/=_-]{32,}\b/g, part => safePublicErrorCode(part) === undefined ? '[redacted]' : part)+ .replace(/[\u0000-\u001f\u007f-\u009f\u202a-\u202e\u2066-\u2069]/g, ' ')+ .replace(/\s+/g, ' ')+ .trim()+ .slice(0, 500);+ return sanitized.replace(/\[redacted\]/g, '').replace(/[^\p{L}\p{N}]/gu, '').length > 0+ ? sanitized+ : undefined;+}+export type ApiError = {error: {code: RuntimeErrorCode;diff --git a/packages/protocol/src/issues.ts b/packages/protocol/src/issues.tsindex ac0937b3..2dc9d847 100644--- a/packages/protocol/src/issues.ts+++ b/packages/protocol/src/issues.ts@@ -1,4 +1,4 @@-import { safePublicErrorCode } from './errors.js';+import { safePublicErrorCode, safePublicErrorMessage, safePublicRequestId } from './errors.js';export const issueSources = ['api',@@ -46,6 +46,7 @@ export const publicErrorKinds = ['connection-reset','tls','http-rejected',+ 'provider-failed','rate-limited','unauthorized','invalid-response',@@ -63,6 +64,8 @@ export type PublicErrorFacts = {kind: typeof publicErrorKinds[number];provider?: string;upstreamCode?: string;+ upstreamMessage?: string;+ requestId?: string;httpStatus?: number;};@@ -71,10 +74,29 @@ export function isPublicErrorFacts(value: unknown): value is PublicErrorFacts {return (value.provider === undefined || (typeof value.provider === 'string'&& value.provider.length <= 80 && safePublicErrorCode(value.provider) !== undefined))&& (value.upstreamCode === undefined || safePublicErrorCode(value.upstreamCode) !== undefined)+ && (value.upstreamMessage === undefined || (typeof value.upstreamMessage === 'string'+ && safePublicErrorMessage(value.upstreamMessage) === value.upstreamMessage))+ && (value.requestId === undefined || safePublicRequestId(value.requestId) !== undefined)&& (value.httpStatus === undefined|| (Number.isInteger(value.httpStatus) && Number(value.httpStatus) >= 100 && Number(value.httpStatus) <= 599));}+export function sanitizePublicErrorFacts(input: PublicErrorFacts): PublicErrorFacts {+ const provider = safePublicErrorCode(input.provider);+ const upstreamCode = safePublicErrorCode(input.upstreamCode);+ const upstreamMessage = safePublicErrorMessage(input.upstreamMessage);+ const requestId = safePublicRequestId(input.requestId);+ return {+ kind: input.kind,+ ...(provider === undefined || provider.length > 80 ? {} : { provider }),+ ...(upstreamCode === undefined ? {} : { upstreamCode }),+ ...(upstreamMessage === undefined ? {} : { upstreamMessage }),+ ...(requestId === undefined ? {} : { requestId }),+ ...(Number.isInteger(input.httpStatus) && input.httpStatus! >= 100 && input.httpStatus! <= 599+ ? { httpStatus: input.httpStatus } : {})+ };+}+export type IssueScope =| { kind: 'creator-job'; jobId: string }| { kind: 'page'; surface: string };diff --git a/packages/protocol/src/media-generation.ts b/packages/protocol/src/media-generation.tsindex 2e586a6f..f5750247 100644--- a/packages/protocol/src/media-generation.ts+++ b/packages/protocol/src/media-generation.ts@@ -1,3 +1,5 @@+import type { PublicErrorFacts } from './issues.js';+export const imageGenerationSizes = ['1024x1024', '1536x1024', '1024x1536'] as const;export type ImageGenerationSize = typeof imageGenerationSizes[number];export type ImageGenerationQuality = 'low' | 'medium' | 'high';@@ -108,6 +110,7 @@ export type VideoGenerationResult = {mime?: 'video/mp4';size?: number;error?: string;+ publicFacts?: PublicErrorFacts;createdAt: string;updatedAt: string;};diff --git a/packages/protocol/test/error-facts.test.ts b/packages/protocol/test/error-facts.test.tsindex d42993fc..1945d0df 100644--- a/packages/protocol/test/error-facts.test.ts+++ b/packages/protocol/test/error-facts.test.ts@@ -1,6 +1,6 @@import { describe, expect, it } from 'vitest';-import { publicErrorKindForCode, safePublicErrorCode } from '../src/errors.js';-import { isPublicErrorFacts } from '../src/issues.js';+import { publicErrorKindForCode, safePublicErrorCode, safePublicErrorMessage, safePublicRequestId } from '../src/errors.js';+import { isPublicErrorFacts, sanitizePublicErrorFacts } from '../src/issues.js';describe('public error kind for business code', () => {it.each([@@ -25,3 +25,36 @@ it('rejects token-like business codes before Agent output', () => {expect(safePublicErrorCode('a'.repeat(40))).toBeUndefined();expect(isPublicErrorFacts({ kind: 'unknown', upstreamCode: 'sk-private-secret' })).toBe(false);});++it('preserves long structured provider codes without accepting opaque credentials', () => {+ const code = 'InputImageSensitiveContentDetected.SensitiveContent';+ expect(safePublicErrorCode(code)).toBe(code);+ expect(isPublicErrorFacts({ kind: 'http-rejected', provider: 'seedance', upstreamCode: code, httpStatus: 400 })).toBe(true);+ expect(safePublicErrorCode('0123456789abcdef'.repeat(3))).toBeUndefined();+ expect(safePublicErrorCode('opaqueCredentialValue1234567890ABCDE')).toBeUndefined();+});++it('retains useful provider explanations while redacting credentials and media data', () => {+ const message = safePublicErrorMessage('Input image was rejected. "api_key": "private-key" Bearer private-token https://example.test/?token=private-url /Users/private-user/file.jpg data:image/png;base64,cHJpdmF0ZQ==');+ expect(message).toContain('Input image was rejected.');+ expect(message).not.toContain('private');+ expect(message).not.toContain('cHJpdmF0ZQ');+ expect(safePublicErrorMessage(message)).toBe(message);+ expect(safePublicErrorMessage('token=private')).toBeUndefined();+ expect(safePublicErrorMessage('Bearer private')).toBeUndefined();+ expect(safePublicErrorMessage('Too long '.repeat(600))).toBeUndefined();+ expect(safePublicErrorMessage('Reason '.repeat(100))!.length).toBeLessThanOrEqual(500);+});++it('sanitizes public diagnostic fields and validates the sanitized result', () => {+ const facts = sanitizePublicErrorFacts({+ kind: 'provider-failed', provider: 'seedance', upstreamCode: 'InputImageSensitiveContentDetected.SensitiveContent',+ upstreamMessage: 'Reference rejected. token=private', requestId: '0123456789abcdef'.repeat(2), httpStatus: 900+ });+ expect(facts).toMatchObject({ upstreamMessage: 'Reference rejected. [redacted]', requestId: '0123456789abcdef'.repeat(2) });+ expect(facts.httpStatus).toBeUndefined();+ expect(isPublicErrorFacts(facts)).toBe(true);+ expect(isPublicErrorFacts({ ...facts, upstreamMessage: 'token=private' })).toBe(false);+ expect(safePublicRequestId('sk-private-key')).toBeUndefined();+ expect(safePublicRequestId('https://private.test')).toBeUndefined();+});