apps/web/src/api/tasks/types.ts

@@ -82,6 +82,8 @@ export interface CreateGenerationTaskRequest {
     stroke?: boolean
     shadow?: boolean
   }
+  /** 来源剪辑计划 ID，后端据此从 edit_plan_clips 读取素材/音频/标题配置 */
+  source_edit_plan_id?: string
 }
 
 /** 创建生成任务响应（对齐后端 GenerationTaskResponse） */

apps/web/src/pages/generate/GeneratePage.tsx

@@ -72,6 +72,7 @@ const GeneratePage: React.FC = () => {
     autoSubtitles,
     bgm,
     editPlanId,
+    sourceEditPlanId,
     previewVideo,
     setPreviewVideo,
     previewModalOpen,
@@ -158,6 +159,7 @@ const GeneratePage: React.FC = () => {
   } = useGenerateVideo({
     titleSettings,
     selectedTemplate,
+    sourceEditPlanId,
     selectedMaterials,
     materialMode,
     smartSelectedIds,

apps/web/src/pages/generate/hooks/generate-video/types.ts

@@ -6,6 +6,8 @@ import type { TitleSettings } from "../../types"
 export interface UseGenerateVideoProps {
   titleSettings: TitleSettings
   selectedTemplate: string
+  /** 来源剪辑计划 ID，仅取 URL edit_plan_id，无则 null 让后端兜底 */
+  sourceEditPlanId?: string | null
   selectedMaterials: string[]
   materialMode: "manual" | "auto"
   smartSelectedIds: string[]

apps/web/src/pages/generate/hooks/useCanvasPlayer.ts

@@ -539,7 +539,9 @@ export function useCanvasPlayer(
       try {
         await Promise.race([
           decoder.flush(),
-          new Promise((_, reject) => setTimeout(() => reject(new Error("flush timeout 10s")), 10_000)),
+          new Promise((_, reject) =>
+            setTimeout(() => reject(new Error("flush timeout 10s")), 10_000),
+          ),
         ])
         console.log(`[useCanvasPlayer] Segment ${meta.assetId}: flush complete`)
       } catch (e) {

apps/web/src/pages/generate/hooks/useGenerateFormState/index.ts

@@ -82,6 +82,14 @@ export interface GenerateFormState {
   editPlanId: string | null
   planConfigStr: string | null
 
+  /**
+   * 传给后端的 source_edit_plan_id。
+   * 仅使用 URL 中的 edit_plan_id（从剪辑模板编辑器跳转时携带）。
+   * URL 没有时传 null，后端正式生成 API 会通过 template_id+user_id 兜底查找正确的 plan。
+   * 注意：selectedTemplate 是模板 ID，不是 edit_plan_id，不能作为此值传递。
+   */
+  sourceEditPlanId: string | null
+
   /* 预览弹窗 */
   previewVideo: GeneratedVideo | null
   setPreviewVideo: (v: GeneratedVideo | null) => void
@@ -93,6 +101,8 @@ export const useGenerateFormState = (): GenerateFormState => {
   const [searchParams] = useSearchParams()
   const editPlanId = searchParams.get("edit_plan_id")
   const planConfigStr = searchParams.get("plan_config")
+  /* ── source_edit_plan_id：仅取 URL 参数，无则 null 让后端兜底 ── */
+  const sourceEditPlanId = editPlanId || null
 
   /* ── 步骤状态 ── */
   const [currentStep, setCurrentStep] = useState(1)
@@ -190,6 +200,7 @@ export const useGenerateFormState = (): GenerateFormState => {
     bgm,
     editPlanId,
     planConfigStr,
+    sourceEditPlanId,
     previewVideo,
     setPreviewVideo,
     previewModalOpen,

apps/web/src/pages/generate/hooks/useGenerateVideo.ts

@@ -100,6 +100,7 @@ export function useGenerateVideo(props: UseGenerateVideoProps) {
         custom_title: props.titleSettings?.title || "",
         duration: props.duration || undefined,
         video_ratio: props.videoRatio,
+        ...(props.sourceEditPlanId ? { source_edit_plan_id: props.sourceEditPlanId } : {}),
         ...(props.titleSettings?.title
           ? {
               title_config: {