拆分编辑器生成提交模型

抽出图片生成请求与结果快照构建逻辑

补充生成提交模型单测

更新 TRACKING.md 记录第三十五阶段验证

src/components/image-editor/useImageCanvasGenerationWorkflow.ts

@@ -36,22 +36,17 @@ import {
   ICON_FRAME_ORIGINAL_SIZE,
   SPEC_FRAME_DISPLAY_SIZE,
   SPEC_FRAME_ORIGINAL_SIZE,
-  SPEC_GENERATION_SIZE,
-  SPEC_TYPE_LABEL,
-  buildCharacterGenerationInputs,
   buildEditGenerationInputs,
   buildIconGenerationInputs,
-  buildImageGenerationInputs,
   buildQuickEditModelOptions,
   buildQuickEditSizeOptions,
-  buildSpecGenerationInputs,
-  buildSpecPrompt,
   calculateCharacterAnimationPrice,
   createCanvasLayerReference,
   isCanvasGenerationDialog,
   resolveCharacterAnimationSourceImageSrc,
   resolveImageGenerationErrorMessage,
 } from './ImageCanvasGenerationModel';
+import { buildImageGenerationSubmissionPlan } from './ImageCanvasGenerationSubmissionModel';
 import { formatImageSizeValue } from './ImageCanvasEditorModel';
 import type {
   CanvasGenerationDialogState,
@@ -801,92 +796,34 @@ export function useImageCanvasGenerationWorkflow({
       }
 
       try {
-        if (dialog.mode === 'edit') {
-          const sourceLayer = layers.find(
-            (layer) => layer.id === dialog.sourceLayerId,
-          );
-          if (!sourceLayer) {
-            throw new Error('未找到要修改的图片');
-          }
+        const submissionPlan = buildImageGenerationSubmissionPlan({
+          dialog,
+          layers,
+          nextGeneratedIndex: layerCounterRef.current + 1,
+        });
+        if (submissionPlan.kind === 'edit') {
           const referenceImageSrc = await resolveEditorImageReferenceDataUrl(
-            sourceLayer.src,
+            submissionPlan.sourceLayer.src,
           );
           const generated = await editEditorImage({
-            prompt: normalizedPrompt,
+            prompt: submissionPlan.normalizedPrompt,
             sourceImageSrc: referenceImageSrc,
           });
           addGeneratedResultLayer(generated, {
-            sourceLayer,
-            generationInputs: buildEditGenerationInputs(
-              '修改要求',
-              normalizedPrompt,
-              sourceLayer,
-            ),
-          });
-        } else if (dialog.mode === 'spec') {
-          const specType = dialog.specType ?? 'custom';
-          const specValues =
-            dialog.specValues ?? DEFAULT_SPEC_FORM_VALUES[specType];
-          const specPrompt = buildSpecPrompt(
-            specType,
-            specValues,
-            Boolean(dialog.specReference?.src),
-          );
-          const generated = await generateEditorImage({
-            prompt: specPrompt,
-            size: SPEC_GENERATION_SIZE,
-            model: DEFAULT_IMAGE_MODEL,
-            kind: 'spec',
-            ...(dialog.specReference?.src
-              ? { referenceImageSrcs: [dialog.specReference.src] }
-              : {}),
-          });
-          addGeneratedResultLayer(generated, {
-            frame: getGeneratingDialogPlaceholder(dialog),
-            assetKind: specType === 'icon' ? 'icon-spec' : 'spec',
-            title: `${SPEC_TYPE_LABEL[specType]} ${layerCounterRef.current + 1}`,
-            dialogId: canvasDialog?.id,
-            generationInputs: buildSpecGenerationInputs(
-              specType,
-              specValues,
-              dialog.specReference,
-            ),
-          });
-        } else if (dialog.mode === 'character') {
-          const referenceImageSrcs = [
-            dialog.characterSpecReference?.src,
-            ...(dialog.characterReferences ?? []).map(
-              (reference) => reference.src,
-            ),
-          ].filter((src): src is string => Boolean(src));
-          const generated = await generateEditorImage({
-            prompt: normalizedPrompt,
-            kind: 'character',
-            model: dialog.imageModel ?? DEFAULT_IMAGE_MODEL,
-            aspectRatio: dialog.aspectRatio ?? '1:1',
-            imageSize: dialog.imageSize ?? '1K',
-            ...(referenceImageSrcs.length ? { referenceImageSrcs } : {}),
-          });
-          setLastImageModel(dialog.imageModel ?? DEFAULT_IMAGE_MODEL);
-          addGeneratedResultLayer(generated, {
-            frame: getGeneratingDialogPlaceholder(dialog),
-            assetKind: 'character',
-            title: `角色形象 ${layerCounterRef.current + 1}`,
-            dialogId: canvasDialog?.id,
-            generationInputs: buildCharacterGenerationInputs(
-              normalizedPrompt,
-              dialog.characterSpecReference,
-              dialog.characterReferences,
-            ),
+            sourceLayer: submissionPlan.sourceLayer,
+            generationInputs: submissionPlan.generationInputs,
           });
         } else {
-          const generated = await generateEditorImage({
-            prompt: normalizedPrompt,
-          });
+          const generated = await generateEditorImage(submissionPlan.input);
+          if (submissionPlan.rememberImageModel) {
+            setLastImageModel(submissionPlan.rememberImageModel);
+          }
           addGeneratedResultLayer(generated, {
             frame: getGeneratingDialogPlaceholder(dialog),
+            assetKind: submissionPlan.result.assetKind,
+            title: submissionPlan.result.title,
             dialogId: canvasDialog?.id,
-            generationInputs: buildImageGenerationInputs(normalizedPrompt),
+            generationInputs: submissionPlan.result.generationInputs,
           });
         }
       } catch (error) {