fix(*): 画布生成与邮件 - 合并 PR #423 并修复恢复关联和规格报价

保留 PR 原始提交，合并待测试文档双方内容。补齐摘要 nodeId 消费端，修复缺省质量的 <nil> 匹配，并移除报价面板按价格档篡改自动质量的行为。验证：前端完整测试脚本 1139 项通过，生产构建通过；后端相关专项通过。全量后端存在 4 项基线可复现失败；另一次资源清理测试出现 SQLite 表锁，合并分支与基线单独重跑通过。未执行真实 SMTP、浏览器端到端或收费生成。
2026-09-06 04:44:16 +08:00
parent 7d99303b04 10fb1c8cd8
commit 8f4e2fca33
16 changed files with 441 additions and 34 deletions
--- a/web/src/components/canvas/canvas-node-prompt-panel.tsx
+++ b/web/src/components/canvas/canvas-node-prompt-panel.tsx
@@ -107,6 +107,11 @@ export function CanvasNodePromptPanel({ node, isRunning, onPromptChange, onConfi
        }, mode),
    };
    const config = buildNodeConfig(globalConfig, node, mode, requirements);
+    const resolvedRequirements: ModelRequirements = {
+        ...requirements,
+        options: modelRequestOptions(config, mode),
+        videoSeconds: mode === "video" ? config.videoSeconds : undefined,
+    };
    const promptOptimizerProvider = useMemo(() => {
        if (!promptOptimizerEnabled || !promptOptimizerInstallation || !promptOptimizerPlugin.createPromptOptimizer) return null;
        return promptOptimizerPlugin.createPromptOptimizer(createPluginHostContext(promptOptimizerPlugin, promptOptimizerInstallation, globalConfig));
@@ -121,9 +126,9 @@ export function CanvasNodePromptPanel({ node, isRunning, onPromptChange, onConfi
        seconds: mode === "video" ? config.videoSeconds : 1,
        capability: mode,
        config,
-        requirements,
+        requirements: resolvedRequirements,
    });
-    const quoteRequest = modelQuoteRequest(config, config.model, mode, requirements);
+    const quoteRequest = modelQuoteRequest(config, config.model, mode, resolvedRequirements);
    const quoteRequestKey = JSON.stringify(quoteRequest || null);
    const [quotedCredits, setQuotedCredits] = useState<number | null>(null);
    const credits = quotedCredits ?? configuredCredits;
@@ -341,9 +346,10 @@ export function CanvasNodePromptPanel({ node, isRunning, onPromptChange, onConfi
                        value={config.model}
                        onChange={(model) => onConfigChange(node.id, mode === "image" ? { model, ...defaultImageParamsForModel(config, model) } : { model })}
                        capability={mode}
-                        requirements={requirements}
+                        requirements={resolvedRequirements}
                        onMissingConfig={() => navigateToSettings({ continueCreation: true })}
                        showSelectedPrice={false}
+                        showOptionPrices={creditsEnabled}
                        variant="creation"
                        showConfiguredModelName
                    />
@@ -690,7 +696,7 @@ function defaultMode(type: CanvasNodeData["type"]): CanvasNodeGenerationMode {
    return type === CanvasNodeType.Text || type === CanvasNodeType.Skill ? "text" : type === CanvasNodeType.Video ? "video" : type === CanvasNodeType.Audio ? "audio" : "image";
 }

-function buildNodeConfig(globalConfig: AiConfig, node: CanvasNodeData, mode: CanvasNodeGenerationMode, requirements: ModelRequirements): AiConfig {
+export function buildNodeConfig(globalConfig: AiConfig, node: CanvasNodeData, mode: CanvasNodeGenerationMode, requirements: ModelRequirements): AiConfig {
    const defaultModel = mode === "image" ? globalConfig.imageModel : mode === "video" ? globalConfig.videoModel : mode === "audio" ? globalConfig.audioModel : globalConfig.textModel;
    const fallbackModel = mode === "image" ? defaultConfig.imageModel : mode === "video" ? defaultConfig.videoModel : mode === "audio" ? defaultConfig.audioModel : defaultConfig.textModel;
    const preferredModel = resolveCanvasGenerationModel(globalConfig, node.metadata?.model, mode) || resolveCanvasGenerationModel(globalConfig, defaultModel, mode) || fallbackModel;
--- a/web/src/lib/canvas/canvas-generation-task-sync.ts
+++ b/web/src/lib/canvas/canvas-generation-task-sync.ts
@@ -22,7 +22,7 @@ export function generationTaskInput(task: GenerationTask) {
 }

 export function generationTaskNodeId(task: GenerationTask) {
-    return generationTaskInput(task)?.metadata?.nodeId || "";
+    return task.clientContext?.nodeId || generationTaskInput(task)?.metadata?.nodeId || "";
 }

 export function generationTaskMode(task: GenerationTask, fallback?: CanvasGenerationMode): CanvasGenerationMode {
--- a/web/src/lib/model-pricing.ts
+++ b/web/src/lib/model-pricing.ts
@@ -1,5 +1,6 @@
 import { modelRequestOptions, resolveVideoOperation, type ModelRequirements } from "@/lib/model-selection";
 import { videoResolutionComparisonKey } from "@/lib/video-generation-options";
+import { buildImageResolutionOptions, imageResolutionOption } from "@/lib/image-resolution-tiers";
 import type { ModelRequestIntent } from "@/services/api/logical-models";
 import { modelOptionName, resolveModelChannel, type AiConfig, type ModelCapability } from "@/stores/use-config-store";

@@ -79,7 +80,7 @@ export function modelQuoteRequest(config: AiConfig, value: string, capability?:
    const input = requirements?.input;
    const intent: ModelRequestIntent = {
        capability,
-        operation: capability === "video" && input ? resolveVideoOperation(input, requirements?.videoOperation) : requirements?.videoOperation,
+        operation: capability === "image" ? imagePriceOperation(requirements) : capability === "video" && input ? resolveVideoOperation(input, requirements?.videoOperation) : requirements?.videoOperation,
        inputs: {
            image: (input?.imageCount || 0) + (input?.characterCount || 0),
            video: input?.videoCount || 0,
@@ -115,12 +116,27 @@ function priceSelectorForRequest(capability: ModelCapability | undefined, config
        if (seconds > 0) requested.videoSeconds = String(seconds);
    }
    if (capability === "image") {
-        if (config.quality && config.quality !== "auto") requested.quality = config.quality.toLowerCase();
-        if (config.size && config.size !== "auto") requested.size = config.size.toLowerCase();
+        requested.operation = imagePriceOperation(requirements);
+        const options = { ...modelRequestOptions(config, "image"), ...requirements?.options, ...(requirements?.imageSize ? { size: requirements.imageSize } : {}) };
+        const imageQuality = String(options.quality ?? "").trim().toLowerCase();
+        const imageSize = String(options.size ?? "").trim();
+        if ((imageQuality === "" || imageQuality === "auto" || imageQuality === "any") && imageSize) {
+            const resolution = imageResolutionOption(buildImageResolutionOptions([imageSize]), imageSize)?.tier;
+            if (resolution) requested.quality = resolution;
+        }
+        for (const key of ["quality", "size"] as const) {
+            const value = String(options[key] ?? "").trim().toLowerCase();
+            if (value && value !== "auto" && value !== "any" && !requested[key]) requested[key] = value;
+        }
    }
    return requested;
 }

+function imagePriceOperation(requirements?: ModelRequirements) {
+    const input = requirements?.input;
+    return (input?.imageCount || 0) + (input?.characterCount || 0) > 0 ? "image_to_image" : "text_to_image";
+}
+
 function priceSelectorForTier(tier: ModelPriceTier) {
    const selector = { ...(tier.selector || {}) };
    if (!Object.keys(selector).length) {
--- a/web/src/pages/canvas/use-canvas-generation.ts
+++ b/web/src/pages/canvas/use-canvas-generation.ts
@@ -377,7 +377,7 @@ export function useCanvasGeneration({ projectId, domainProjectId, projectLoaded,
            const needsDiscovery = recoveryNodes.some((node) => !node.metadata?.taskId && !node.metadata?.agentGenerationContinuation?.taskId);
            const projectTasks = needsDiscovery
                ? (
-                      await listGenerationTasks(30, { projectId: startedProjectId }, undefined, signal).catch((error) => {
+                      await listGenerationTasks(100, { projectId: startedProjectId }, undefined, signal).catch((error) => {
                          if (!isCurrentProject()) throw error;
                          return [];
                      })