From 1aa539b59318634e8351f60e74a504fc852729d8 Mon Sep 17 00:00:00 2001
From: Rou <76741805+Rou325@users.noreply.github.com>
Date: Wed, 9 Sep 2026 14:22:21 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix(canvas):=20=E5=B1=80=E9=83=A8=E9=87=8D?=
 =?UTF-8?q?=E7=BB=98=E3=80=81=E5=9B=BE=E7=89=87=E8=A7=84=E6=A0=BC=E4=B8=8E?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=82=E6=95=B0=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/internal/service/model_capability.go  | 12 ++++++++--
 backend/internal/service/model_router.go      |  7 ++++++
 backend/internal/service/model_router_test.go | 13 +++++++++++
 .../canvas-drawing-excalidraw-editor.tsx      | 20 ++++++++--------
 .../canvas/canvas-node-mask-edit-dialog.tsx   | 20 ++++------------
 web/src/components/image-settings-panel.tsx   |  8 ++++---
 .../components/image-size-presets-editor.tsx  | 12 ++++++----
 web/src/lib/image-size-presets.ts             |  4 +++-
 web/src/lib/model-capabilities.ts             |  9 +++++++-
 .../canvas/canvas-project-media-dialogs.tsx   |  2 +-
 .../pages/canvas/use-canvas-media-tools.ts    | 23 +++++++++++++++++--
 web/src/services/api/generation-task.ts       | 21 ++++++++++++++---
 web/test/image-size-presets.test.tsx          | 18 +++++++++++++--
 13 files changed, 124 insertions(+), 45 deletions(-)

diff --git a/backend/internal/service/model_capability.go b/backend/internal/service/model_capability.go
index 8c8457876..e32347697 100644
--- a/backend/internal/service/model_capability.go
+++ b/backend/internal/service/model_capability.go
@@ -822,10 +822,11 @@ func validateImageTask(profile *ImageCapabilityConfig, input canvasGenerationInp
 			return BadAuthRequest(err.Error())
 		}
 	}
-	if profile.Quality.Supported && strings.TrimSpace(input.Config.Quality) != "" && !containsCapabilityString(profile.Quality.Values, input.Config.Quality) {
+	quality := strings.TrimSpace(input.Config.Quality)
+	if profile.Quality.Supported && quality != "" && !strings.EqualFold(quality, "auto") && !strings.EqualFold(quality, "any") && !containsCapabilityString(profile.Quality.Values, quality) {
 		return BadAuthRequest("图片质量不在当前模型支持范围内")
 	}
-	if err := validateImagePresetSelection(profile, firstNonEmpty(input.Config.Quality, profile.Quality.Default), firstNonEmpty(input.Config.Size, profile.Size.Default)); err != nil {
+	if err := validateImagePresetSelection(profile, qualityForImageValidation(quality, profile.Quality.Default), firstNonEmpty(input.Config.Size, profile.Size.Default)); err != nil {
 		return err
 	}
 	count, err := strconv.Atoi(strings.TrimSpace(input.Config.Count))
@@ -835,6 +836,13 @@ func validateImageTask(profile *ImageCapabilityConfig, input canvasGenerationInp
 	return nil
 }
 
+func qualityForImageValidation(quality string, fallback string) string {
+	if strings.EqualFold(quality, "auto") || strings.EqualFold(quality, "any") {
+		return fallback
+	}
+	return firstNonEmpty(quality, fallback)
+}
+
 func validateImagePresetSelection(profile *ImageCapabilityConfig, quality, ratio string) error {
 	if profile.Size.Parameter != "aspect_ratio" || profile.Size.AllowCustom || len(profile.Size.Presets) == 0 || ratio == "auto" {
 		return nil
diff --git a/backend/internal/service/model_router.go b/backend/internal/service/model_router.go
index f37e82b2a..49fdc52f3 100644
--- a/backend/internal/service/model_router.go
+++ b/backend/internal/service/model_router.go
@@ -65,6 +65,13 @@ func ModelRequestIntentFromTaskInput(input map[string]any, taskType string, oper
 		explicitOptions = true
 		for key, value := range options {
 			name := canonicalCapabilityOptionName(key)
+			// auto/any 表示调用方不指定质量；不能把它当作模型必须声明的
+			// 枚举值，否则未列出 auto 的模型会被错误判定为参数不支持。
+			if name == "quality" {
+				if normalized, ok := value.(string); ok && (strings.EqualFold(strings.TrimSpace(normalized), "auto") || strings.EqualFold(strings.TrimSpace(normalized), "any")) {
+					continue
+				}
+			}
 			intent.Options[name] = normalizeModelRequestOption(name, value)
 		}
 	}
diff --git a/backend/internal/service/model_router_test.go b/backend/internal/service/model_router_test.go
index d2efcddde..4cea97089 100644
--- a/backend/internal/service/model_router_test.go
+++ b/backend/internal/service/model_router_test.go
@@ -38,6 +38,19 @@ func TestImagePriceTiersMatchResolutionAndActualReferences(t *testing.T) {
 	}
 }
 
+func TestAutoQualityIsOmittedFromCapabilityIntent(t *testing.T) {
+	intent := ModelRequestIntentFromTaskInput(map[string]any{
+		"mode":              "image",
+		"capabilityOptions": map[string]any{"quality": "auto", "size": "2048x878"},
+	}, "canvas_image", "image")
+	if _, exists := intent.Options["quality"]; exists {
+		t.Fatalf("quality option = %#v, want omitted for auto", intent.Options["quality"])
+	}
+	if intent.Options["size"] != "2048x878" {
+		t.Fatalf("size option = %#v, want preserved", intent.Options["size"])
+	}
+}
+
 func TestModelRequestIntentNormalizesVideoResolution(t *testing.T) {
 	input := map[string]any{
 		"mode":   "video",
diff --git a/web/src/components/canvas/canvas-drawing-excalidraw-editor.tsx b/web/src/components/canvas/canvas-drawing-excalidraw-editor.tsx
index 8c362468f..cb60da19f 100644
--- a/web/src/components/canvas/canvas-drawing-excalidraw-editor.tsx
+++ b/web/src/components/canvas/canvas-drawing-excalidraw-editor.tsx
@@ -49,16 +49,16 @@ export const CanvasDrawingExcalidrawEditor = forwardRef<CanvasDrawingEditorHandl
 
     return (
         <Excalidraw
-            initialData={initialData}
-            langCode="zh-CN"
-            theme={colorScheme}
-            autoFocus
-            excalidrawAPI={(api) => {
-                apiRef.current = api;
-                api.setActiveTool({ type: "freedraw" });
-                onReady();
-            }}
-            UIOptions={{ canvasActions: { loadScene: false, saveToActiveFile: false } }}
+                initialData={initialData}
+                langCode="zh-CN"
+                theme={colorScheme}
+                autoFocus
+                excalidrawAPI={(api) => {
+                    apiRef.current = api;
+                    api.setActiveTool({ type: "freedraw" });
+                    onReady();
+                }}
+                UIOptions={{ canvasActions: { loadScene: false, saveToActiveFile: false } }}
         />
     );
 });
diff --git a/web/src/components/canvas/canvas-node-mask-edit-dialog.tsx b/web/src/components/canvas/canvas-node-mask-edit-dialog.tsx
index 10cd82797..915f35c9b 100644
--- a/web/src/components/canvas/canvas-node-mask-edit-dialog.tsx
+++ b/web/src/components/canvas/canvas-node-mask-edit-dialog.tsx
@@ -41,10 +41,10 @@ export function CanvasNodeMaskEditDialog({ dataUrl, open, config, onClose, onCon
         setBrushSize(defaultBrushSize);
         setMode("paint");
         setError("");
-        setAdvancedOpen(false);
+        setAdvancedOpen(true);
         setGenerationConfig(config);
         void readImageMeta(dataUrl).then(setImage);
-    }, [config, dataUrl, open]);
+    }, [dataUrl, open]);
 
     useEffect(() => {
         clearCanvas(maskCanvasRef.current);
@@ -115,7 +115,7 @@ export function CanvasNodeMaskEditDialog({ dataUrl, open, config, onClose, onCon
             <div className="grid gap-5 lg:grid-cols-[minmax(360px,1fr)_340px]">
                 <div className="flex min-h-[360px] items-center justify-center rounded-lg bg-surface-active p-0">
                     <div className="relative inline-block max-w-full overflow-hidden rounded-lg bg-transparent select-none">
-                        <img src={dataUrl} alt="" className="block max-h-[68vh] max-w-full bg-transparent" draggable={false} />
+                        <img src={dataUrl} alt="" className="relative z-0 block max-h-[68vh] max-w-full bg-transparent" draggable={false} />
                         {image ? (
                             <>
                                 <canvas ref={maskCanvasRef} width={image.width} height={image.height} className="hidden" />
@@ -123,7 +123,7 @@ export function CanvasNodeMaskEditDialog({ dataUrl, open, config, onClose, onCon
                                     ref={previewCanvasRef}
                                     width={image.width}
                                     height={image.height}
-                                    className="absolute inset-0 h-full w-full cursor-crosshair touch-none"
+                                    className="absolute inset-0 z-10 h-full w-full cursor-crosshair touch-none"
                                     onPointerDown={startDraw}
                                     onPointerMove={moveDraw}
                                     onPointerUp={stopDraw}
@@ -173,17 +173,6 @@ export function CanvasNodeMaskEditDialog({ dataUrl, open, config, onClose, onCon
                             {error ? <div className="text-xs font-medium text-destructive">{error}</div> : null}
                         </div>
 
-                        <ImageSettingsPanel
-                            config={generationConfig}
-                            showTitle={false}
-                            showQuality={false}
-                            showTransparent={false}
-                            showSize={false}
-                            className="space-y-2"
-                            theme={theme}
-                            onConfigChange={(key, value) => setGenerationConfig((current) => ({ ...current, [key]: value }))}
-                        />
-
                         <div className="rounded-xl border border-border/60">
                             <button
                                 type="button"
@@ -211,6 +200,7 @@ export function CanvasNodeMaskEditDialog({ dataUrl, open, config, onClose, onCon
                                         config={generationConfig}
                                         showTitle={false}
                                         showCount={false}
+                                        bypassPriceGuard
                                         className="space-y-3"
                                         theme={theme}
                                         onConfigChange={(key, value) => setGenerationConfig((current) => ({ ...current, [key]: value }))}
diff --git a/web/src/components/image-settings-panel.tsx b/web/src/components/image-settings-panel.tsx
index 256725c2c..073478c61 100644
--- a/web/src/components/image-settings-panel.tsx
+++ b/web/src/components/image-settings-panel.tsx
@@ -53,9 +53,11 @@ type ImageSettingsPanelProps = {
     className?: string;
     maxCount?: number;
     quickCount?: number;
+    /** 局部编辑等场景需要先允许选择参数，由后端负责最终计费校验。 */
+    bypassPriceGuard?: boolean;
 };
 
-export function ImageSettingsPanel({ config, onConfigChange, theme, showTitle = true, showQuality = true, showTransparent = true, showSize = true, showCount = true, className = "w-[304px] space-y-3 rounded-2xl px-1 py-0.5", maxCount = 15, quickCount = 3 }: ImageSettingsPanelProps) {
+export function ImageSettingsPanel({ config, onConfigChange, theme, showTitle = true, showQuality = true, showTransparent = true, showSize = true, showCount = true, className = "w-[304px] space-y-3 rounded-2xl px-1 py-0.5", maxCount = 15, quickCount = 3, bypassPriceGuard = false }: ImageSettingsPanelProps) {
     const profile = mergedImageCapabilityConfig(config, config.model || config.imageModel);
     const normalized = normalizeImageValue(profile, config);
     const quality = normalized.quality;
@@ -82,7 +84,7 @@ export function ImageSettingsPanel({ config, onConfigChange, theme, showTitle =
                     <SettingTitle color={theme.node.muted}>{isGrokResolutionQuality(profile) ? "分辨率" : "质量"}</SettingTitle>
                     <div className={`grid gap-1.5 ${activeQualityOptions.length <= 2 ? "grid-cols-2" : "grid-cols-4"}`}>
 						{activeQualityOptions.map((item) => (
-							<OptionPill key={item.value} selected={quality === item.value} disabled={!hasPriceTierForImageSelection(priceTiers, item.value, activeSize)} theme={theme} onClick={() => onConfigChange("quality", item.value)}>
+                            <OptionPill key={item.value} selected={quality === item.value} disabled={!bypassPriceGuard && !hasPriceTierForImageSelection(priceTiers, item.value, activeSize)} theme={theme} onClick={() => onConfigChange("quality", item.value)}>
                                 {item.label}
                             </OptionPill>
                         ))}
@@ -103,7 +105,7 @@ export function ImageSettingsPanel({ config, onConfigChange, theme, showTitle =
                         />
                     </span>
                 </div> : null}
-                {showSize ? <ImageSizePicker profile={profile} size={activeSize} quality={quality} onChange={(size, nextQuality) => { onConfigChange("size", size); if (nextQuality) onConfigChange("quality", nextQuality); }} /> : null}
+                {showSize ? <ImageSizePicker profile={profile} size={activeSize} quality={quality} onChange={(size) => onConfigChange("size", size)} /> : null}
                 {showCount && effectiveMaxCount > 1 ? (
                     <div className="space-y-2">
                         <SettingTitle color={theme.node.muted}>生成张数</SettingTitle>
diff --git a/web/src/components/image-size-presets-editor.tsx b/web/src/components/image-size-presets-editor.tsx
index 01c684ab0..955b1241d 100644
--- a/web/src/components/image-size-presets-editor.tsx
+++ b/web/src/components/image-size-presets-editor.tsx
@@ -1,6 +1,7 @@
 import { useId, useState } from "react";
 import { Button, Input } from "antd";
 import { Check, Plus } from "lucide-react";
+import { Switch } from "@/components/ui/base/switch";
 import "./image-size-picker.css";
 import type { ImageCapabilityConfig } from "@/lib/model-capabilities";
 import { IMAGE_RATIOS, IMAGE_RESOLUTIONS, imagePresetForRatio, imageSizeConfigWithPresets, imageSizePresets, imageTierAvailable } from "@/lib/image-size-presets";
@@ -11,6 +12,10 @@ export function ImageSizePresetsEditor({ profile, disabled, onChange }: { profil
     const id = useId();
     const [drafts, setDrafts] = useState<Partial<Record<ImageResolutionTier, string>>>({});
     const [errors, setErrors] = useState<Partial<Record<ImageResolutionTier, string>>>({});
+    const toggleTier = (tier: ImageResolutionTier, ratios: string[], enabled: boolean) => {
+        if (disabled) return;
+        update(tier, enabled ? ratios : []);
+    };
     const update = (tier: ImageResolutionTier, ratios: string[]) => {
         if (disabled) return false;
         try {
@@ -50,13 +55,10 @@ export function ImageSizePresetsEditor({ profile, disabled, onChange }: { profil
                 return (
                     <section key={tier} className="image-size-preset-group" aria-labelledby={`${id}-${tier}-title`}>
                         <header className="image-size-preset-heading">
-                            <div>
+                            <div className="image-size-preset-heading-label">
                                 <strong id={`${id}-${tier}-title`}>{tier.toUpperCase()}</strong>
                                 <span>{items.length ? `${items.length} 个比例` : "未启用"}</span>
-                            </div>
-                            <div className="image-size-preset-bulk-actions">
-                                <Button type="link" size="small" disabled={disabled || !items.length} onClick={() => update(tier, [])}>全不选</Button>
-                                <Button type="link" size="small" disabled={disabled || items.length === ratios.length} onClick={() => update(tier, ratios)}>全选</Button>
+                                <Switch size="sm" checked={items.length === ratios.length} disabled={disabled} aria-label={`启用 ${tier.toUpperCase()} 规格`} onChange={(enabled) => toggleTier(tier, ratios, enabled)} />
                             </div>
                         </header>
                         <div className="image-size-preset-body">
diff --git a/web/src/lib/image-size-presets.ts b/web/src/lib/image-size-presets.ts
index cfc1bfcfb..f7c951e30 100644
--- a/web/src/lib/image-size-presets.ts
+++ b/web/src/lib/image-size-presets.ts
@@ -2,7 +2,7 @@ import { buildImageResolutionOptions, type ImageResolutionOption, type ImageReso
 import type { ImageCapabilityConfig } from "./model-capabilities";
 
 export const IMAGE_RESOLUTIONS: ImageResolutionTier[] = ["1k", "2k", "4k"];
-export const IMAGE_RATIOS = ["1:1", "16:9", "9:16", "4:3", "3:4", "3:2", "2:3", "21:9"];
+export const IMAGE_RATIOS = ["1:1", "16:9", "9:16", "4:3", "3:4", "3:2", "2:3", "4:5", "5:4", "21:9"];
 const standardSizes: Record<string, string[]> = {
     "1:1": ["1024x1024", "2048x2048", "2880x2880"],
     "16:9": ["1824x1024", "2752x1536", "3840x2160"],
@@ -11,6 +11,8 @@ const standardSizes: Record<string, string[]> = {
     "3:4": ["1024x1360", "1728x2304", "2448x3264"],
     "3:2": ["1536x1024", "2496x1664", "3504x2336"],
     "2:3": ["1024x1536", "1664x2496", "2336x3504"],
+    "4:5": ["1024x1280", "1792x2240", "2560x3200"],
+    "5:4": ["1280x1024", "2240x1792", "3200x2560"],
     "21:9": ["2048x878", "3136x1344", "3808x1632"],
 };
 
diff --git a/web/src/lib/model-capabilities.ts b/web/src/lib/model-capabilities.ts
index 0c4140db6..ca5854ec9 100644
--- a/web/src/lib/model-capabilities.ts
+++ b/web/src/lib/model-capabilities.ts
@@ -896,7 +896,14 @@ function matchWorkflowValue(value: string, options: string[]) {
 
 export function normalizeImageValue(profile: ImageCapabilityConfig, value: { size?: string; quality?: string; count?: string; transparentBackground?: string }) {
     const size = normalizeImageSizeSetting(profile, value.size);
-    const quality = profile.quality.supported ? (value.quality && profile.quality.values.includes(value.quality) ? value.quality : profile.quality.default || "auto") : profile.quality.default || "auto";
+    const requestedQuality = String(value.quality || "").trim().toLowerCase();
+    const quality = profile.quality.supported
+        ? requestedQuality === "auto" || requestedQuality === "any"
+            ? "auto"
+            : value.quality && profile.quality.values.includes(value.quality)
+                ? value.quality
+                : profile.quality.default || "auto"
+        : profile.quality.default || "auto";
     const count = String(Math.max(1, Math.min(profile.maxOutputs, Math.floor(Math.abs(Number(value.count)) || 1))));
     const transparentBackground = profile.transparentBackground.supported && value.transparentBackground === "true" ? "true" : "false";
     return { size, quality, count, transparentBackground };
diff --git a/web/src/pages/canvas/canvas-project-media-dialogs.tsx b/web/src/pages/canvas/canvas-project-media-dialogs.tsx
index 14f1b5877..2be17fde8 100644
--- a/web/src/pages/canvas/canvas-project-media-dialogs.tsx
+++ b/web/src/pages/canvas/canvas-project-media-dialogs.tsx
@@ -47,7 +47,7 @@ export function CanvasProjectMediaDialogs({
         <>
             {cropNode?.metadata?.content ? <CanvasNodeCropDialog dataUrl={cropNode.metadata.content} open onClose={onCloseCrop} onConfirm={(crop) => onCrop(cropNode, crop)} /> : null}
             {annotationNode?.metadata?.content ? <CanvasNodeAnnotationDialog image={{ url: annotationNode.metadata.content, storageKey: annotationNode.metadata.storageKey }} open onClose={onCloseAnnotation} onConfirm={(dataUrl) => onAnnotate(annotationNode, dataUrl)} /> : null}
-            {maskEditNode?.metadata?.content ? <CanvasNodeMaskEditDialog dataUrl={maskEditNode.metadata.content} config={config} open onClose={onCloseMaskEdit} onConfirm={(payload) => onMaskEdit(maskEditNode, payload)} /> : null}
+            {maskEditNode?.metadata?.content ? <CanvasNodeMaskEditDialog dataUrl={maskEditNode.metadata.content} config={{ ...config, model: maskEditNode.metadata.model || config.model, imageModel: maskEditNode.metadata.model || config.imageModel, size: maskEditNode.metadata.size || config.size, quality: maskEditNode.metadata.quality || config.quality, count: String(maskEditNode.metadata.count || config.count) }} open onClose={onCloseMaskEdit} onConfirm={(payload) => onMaskEdit(maskEditNode, payload)} /> : null}
             {splitNode?.metadata?.content ? <CanvasNodeSplitDialog dataUrl={splitNode.metadata.content} open onClose={onCloseSplit} onConfirm={(params) => onSplit(splitNode, params)} /> : null}
             {upscaleNode?.metadata?.content ? <CanvasNodeUpscaleDialog dataUrl={upscaleNode.metadata.content} open onClose={onCloseUpscale} onConfirm={(params) => onUpscale(upscaleNode, params)} /> : null}
         </>
diff --git a/web/src/pages/canvas/use-canvas-media-tools.ts b/web/src/pages/canvas/use-canvas-media-tools.ts
index 326041ea2..3e07aacf4 100644
--- a/web/src/pages/canvas/use-canvas-media-tools.ts
+++ b/web/src/pages/canvas/use-canvas-media-tools.ts
@@ -36,12 +36,22 @@ import { mergeVideos, type MergeVideoProgress } from "@/lib/canvas/canvas-video-
 import { extractVideoAudio, trimVideoSegment } from "@/lib/canvas/canvas-video-segment";
 import { generationErrorMessage } from "@/lib/generation-error";
 import { modelCapabilityConfigFor } from "@/lib/model-capabilities";
+import { defaultImageParamsForModel } from "@/lib/model-selection";
 import { navigateToSettings } from "@/lib/settings-navigation";
 import { storeGeneratedVideo } from "@/services/api/video";
 import { getMediaBlob, uploadMediaFile } from "@/services/file-storage";
 import { uploadImage } from "@/services/image-storage";
 import { ensureCanvasNodeAsset } from "@/services/project-asset-sync";
 import type { GenerationTask } from "@/services/api/task-center";
+
+function normalizeMaskEditQuality(quality: string | undefined, size: string | undefined) {
+    const value = String(quality || "").trim().toLowerCase();
+    if (value && value !== "auto" && value !== "any") return value;
+    const match = String(size || "").trim().toLowerCase().match(/^(\d+)x(\d+)$/);
+    if (!match) return quality || "auto";
+    const pixels = Number(match[1]) * Number(match[2]);
+    return pixels <= 2_000_000 ? "1k" : pixels <= 4_300_000 ? "2k" : pixels <= 8_294_400 ? "4k" : quality || "auto";
+}
 import { defaultConfig, resolveModelRequestConfig, useConfigStore, useEffectiveConfig, type AiConfig } from "@/stores/use-config-store";
 import { CanvasNodeType, type CanvasConnection, type CanvasNodeData, type ContextMenuState } from "@/types/canvas";
 import type { StartCanvasUploadStatus } from "./use-canvas-upload";
@@ -576,13 +586,22 @@ export function useCanvasMediaTools({
     const maskEditImageNode = useCallback(async (node: CanvasNodeData, payload: CanvasImageMaskEditPayload) => {
         if (!node.metadata?.content) return;
         const baseGenerationConfig = buildGenerationConfig(effectiveConfig, node, "image");
+        const selectedModel = payload.generationConfig?.model || payload.generationConfig?.imageModel || baseGenerationConfig.model;
+        const modelDefaults = defaultImageParamsForModel(baseGenerationConfig, selectedModel);
+        const selectedImageProfile = modelCapabilityConfigFor(baseGenerationConfig, selectedModel).image;
+        if (!selectedImageProfile?.references.maskSupported) {
+            message.error("当前图片模型不支持局部重绘蒙版，请选择支持蒙版编辑的模型");
+            return;
+        }
         const generationConfig = {
             ...baseGenerationConfig,
             ...payload.generationConfig,
-            model: payload.generationConfig?.model || payload.generationConfig?.imageModel || baseGenerationConfig.model,
+            model: selectedModel,
             imageModel: payload.generationConfig?.imageModel || payload.generationConfig?.model || effectiveConfig.imageModel,
+            quality: normalizeMaskEditQuality(payload.generationConfig?.quality || node.metadata?.quality || baseGenerationConfig.quality || modelDefaults.quality, payload.generationConfig?.size || node.metadata?.size || baseGenerationConfig.size || modelDefaults.size),
             count: String(payload.generationConfig?.count || 1),
-            size: payload.generationConfig?.size || node.metadata?.size || "auto",
+            // 原图像素尺寸不是模型的输出尺寸合同；非高级设置时使用模型默认尺寸，避免把节点尺寸误发给上游。
+            size: payload.generationConfig?.size || node.metadata?.size || modelDefaults.size,
         };
         if (!isAiConfigReady(generationConfig, generationConfig.model)) {
             navigateToSettings({ continueCreation: true });
diff --git a/web/src/services/api/generation-task.ts b/web/src/services/api/generation-task.ts
index 688ae6b51..5d81896c3 100644
--- a/web/src/services/api/generation-task.ts
+++ b/web/src/services/api/generation-task.ts
@@ -538,7 +538,7 @@ export function backendProviderConfig(config: AiConfig, mode: BackendGenerationM
     if (workflow) return workflowProviderConfig(config, requestConfig, workflow);
     const generationOptions = {
         size: config.size,
-        quality: config.quality,
+        quality: omittedImageQuality(config.quality),
         transparentBackground: config.transparentBackground,
         count: config.count,
         videoSeconds: config.videoSeconds,
@@ -623,13 +623,28 @@ function logicalCapabilityOptions(config: AiConfig, mode: BackendGenerationMode)
     const channel = resolveModelChannel(config, config.model);
     const spec = channel.modelCosts?.find((item) => item.model === modelOptionName(config.model))?.logicalCapabilitySpec;
     const candidates: Record<string, unknown> = mode === "image"
-        ? { size: config.size, quality: config.quality, transparentBackground: config.transparentBackground === "true", count: Number(config.count) }
+        ? { size: config.size, quality: omittedImageQuality(config.quality), transparentBackground: config.transparentBackground === "true", count: Number(config.count) }
         : mode === "video"
             ? { size: config.size, videoSeconds: Number(config.videoSeconds), vquality: config.vquality, videoGenerateAudio: config.videoGenerateAudio === "true", videoWatermark: config.videoWatermark === "true" }
             : mode === "audio"
                 ? { audioVoice: config.audioVoice, audioFormat: config.audioFormat, audioSpeed: Number(config.audioSpeed) }
                 : {};
-    return Object.fromEntries(Object.entries(candidates).filter(([key]) => Boolean(spec?.options?.[key])));
+    const filtered = Object.fromEntries(Object.entries(candidates).filter(([key]) => Boolean(spec?.options?.[key])));
+    // 图片质量和画幅同时参与按规格计费匹配。即使逻辑模型能力声明只把其中一项
+    // 暴露给供应线路，报价仍需要看到客户端最终选择，避免局部重绘等编辑请求落到
+    // “未配置所选规格”的错误分支。
+    if (mode === "image") {
+        for (const key of ["quality", "size"] as const) {
+            const value = candidates[key];
+            if (value !== undefined && value !== null && String(value).trim() !== "") filtered[key] = value;
+        }
+    }
+    return filtered;
+}
+
+function omittedImageQuality(value: string | undefined) {
+    const normalized = String(value || "").trim().toLowerCase();
+    return normalized === "auto" || normalized === "any" ? undefined : value;
 }
 
 export function parseBackendGenerationResult(task: GenerationTask): BackendGenerationResult {
diff --git a/web/test/image-size-presets.test.tsx b/web/test/image-size-presets.test.tsx
index 1c707980d..dd3a188d0 100644
--- a/web/test/image-size-presets.test.tsx
+++ b/web/test/image-size-presets.test.tsx
@@ -42,6 +42,17 @@ describe("统一图片分辨率与宽高比", () => {
         }
     });
 
+    test("固定比例编辑器包含 4:5 和 5:4 三档尺寸", () => {
+        expect(IMAGE_RATIOS).toContain("4:5");
+        expect(IMAGE_RATIOS).toContain("5:4");
+        expect(imagePresetForRatio("1k", "4:5").size).toBe("1024x1280");
+        expect(imagePresetForRatio("2k", "4:5").size).toBe("1792x2240");
+        expect(imagePresetForRatio("4k", "4:5").size).toBe("2560x3200");
+        expect(imagePresetForRatio("1k", "5:4").size).toBe("1280x1024");
+        expect(imagePresetForRatio("2k", "5:4").size).toBe("2240x1792");
+        expect(imagePresetForRatio("4k", "5:4").size).toBe("3200x2560");
+    });
+
     test("管理员设置同步支持值、默认值，并保持精确尺寸", () => {
         const profile = defaultImageCapabilityConfig();
         profile.size = { parameter: "size", values: ["1920x1080"], default: "1920x1080", allowCustom: false };
@@ -139,8 +150,11 @@ describe("统一图片分辨率与宽高比", () => {
             expect(editor).toContain(`aria-label="${tier} 16:9"`);
         }
         expect(editor).toContain('aria-label="默认输出"');
-        expect(editor).toContain("全不选");
-        expect(editor).toContain("全选");
+        expect(editor).not.toContain("全不选");
+        expect(editor).not.toContain("全选");
+        expect(editor).toContain('aria-label="启用 1K 规格"');
+        expect(editor).toContain('aria-label="启用 2K 规格"');
+        expect(editor).toContain('aria-label="启用 4K 规格"');
         const readOnly = renderToStaticMarkup(<ImageSizePresetsEditor profile={profile} disabled onChange={() => {}} />);
         const buttons = [...readOnly.matchAll(/<button\b[^>]*>/g)];
         expect(buttons.length).toBeGreaterThan(24);

From 86330bd56b05c76e15f4ceadc97ddefbe906ab2f Mon Sep 17 00:00:00 2001
From: Rou <76741805+Rou325@users.noreply.github.com>
Date: Wed, 9 Sep 2026 17:45:06 +0800
Subject: [PATCH 2/4] fix(plugin): add AutoDL ZM reference video workflows

---
 plugin-packages/autodl-comfyui.yingce-plugin | Bin 10365 -> 10474 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/plugin-packages/autodl-comfyui.yingce-plugin b/plugin-packages/autodl-comfyui.yingce-plugin
index 5adb0bce3b30870f80ddcb65e1d5e7020725b68f..28379b8396e2e5dcd0493570a62894dd81b126c1 100644
GIT binary patch
literal 10474
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

literal 10365
zcmZ{KV{j%w*JW%xv8^YzZJQI@nmn;>+nLz5C)PwWvCWC?owv5?+ud(>tE=nY?!M>G
zz12U?siPtf355v;1_lQfQcYqo{Mmx22@VEU`ftPkyH%4El~9yqaxk|@Fp?iM#vHx+
zzzlIb8x;y!Py}qcVeJl21DXb!VlK;0v)g#tIa@@UT*+P%*fRLuSo)6tZl)O(dSIcu
zJ~{7r`S&-EhRr1Zeq?H=qB1>x<0ov@sP|I*8@%jkK?eBoft^jo<~Qa`oLjhF+w}*g
z5$hy15+wd+Mp#yP7c7;slCs@uETdG1ZL&c=BN(q{T-L~@13V>x*_htkpfcxN01*}d
z!aON~@?+$)K|<h)4{MqYwPDG@1G&(^Q=M}!xx8tW!{F8ob|Q^^WxZr*)g#{a4UyW8
z!QbxDv|SHKV^gLKgvt`}!`H<9xtpv6CtG5TJ2RLp{P(-7e%S#2gtlJW;zPigG0>Di
zi18^(`<u~)Ui4%40mYah0@ROkvqNM=Mivsk)5YcN=tH4qE8yR_iZt+Asai}AQknTb
z)6cSMsb)zPxC(F)=U++$pN}{y|JD0eDKdka!uCEMR4}kOConLyf4w(%G6ON&IJ#Q6
zSelqw{F}iAkpt+D)T@tw*i0{~2Ro(G;JjMdau(r%Zrz~;X>V2ziWz-d@`<fp9cB4}
zwIgA)I0UP#7d&&J$eM_Y2s#filL!9m@GR{@`8~|XT{~T?Y0Ewtz2aja$)n(S)vDmh
zz$WdfBR`go=s9<tnF>~_k7wKl=d$RuVD47a;qbVv?P+UY#lNemN$s1D3Y}w1Yb$8&
zenjmC&*S=M^#g$_apHc|Bd*j;r0Pi>L%eptdp<v%{E(@BVqQ>Hdx0lp>s?j{&_soU
zH6q#$ckd)=-%meNIc9gat^q~+jo?KpxgTFfW;;}Qv5wr-7ZYR7al5wWGZNnSHvyOt
zcB+CHa)FxHVKsi#*@5~+#1#uXU@4I@=4($=RqkS6=y%vMjUQEsP&~SqCg|mMR8BE)
z+vPs`EuCJNsYvg57ozu9;R~#@>NmeCgYKVxh$<Hs7r8^+_Yy(-v!O{q4q7n<Y>ke&
zy4pc*{^#n4%G<*+>qCo56^Z?2)k`L;U93^>Izgd0?EKGUL1b6fat+PHy$dxmyW6Qx
z%T6Y&8Jn<R_X`wnSD3p#PZ&l0r+q=%kuWF|gS3$aQhnd=e?d&Pn&?=vZhdfnek1Uv
z_N&n`6d!xY6L7Z{jQ#u#oDyMTl%Hs^EgWl+Ofi*HxTT>G@20r+P>BT4M^~sp<z!(V
zA{CX25i155O~>Pv?Biv@Az+}ZSFr%cb4z)VvPlngWOlHo9n?Tl?CNW`2B65ejKe8;
zH<{5uV{0{Xbqe#Du{Fb0&q!iLv$z@khVKex6~46c@Vm2+MKu*k;91HDG%UJmkud^g
zqpmxTXT9GvbU3{9`@>x@))puuDxDYqmbiZk*DoEnRL86>^0y@6$8%+k87CuMP8N3R
zE!r<7B|%;Nida<|ezXQnt<KfeYczAu-Ji-m^3TaSTr(@H6r!9^&*L3_X7rA={iSm8
z_tK(gO0*QkR$~ov4^LD05)RA6XI&eL=1T@-ZnH$<tCqwPhExWnD|}9#H(S4Ul2Mz&
zA#hPnmJmaoKbOD^-OB29u@<<Wk(R2lO3S7lBLJU5-(1^mj%y|ojU8PTV(l`tWqsKQ
zk?W4Rrc$hsx0f%v9x)E{)1sSCUJ!JJFV3IK=pO@~O-h=ZW1LafIQpz+)0wx+SjQ95
zLec@S5eq4sLrJNavN4TP^QRROmNgimwc!<iy4s?a${U>k-S>Nz)hDWt?$TXdX%*8V
zq8C1jy4Jfe)?vD_<(c76iMUv&Yj@e0dE(`pQGZ7f;0JkkL@n8h92j*Y&W8$7A(M6;
zw@(|9L<#15g;v7|7Sa`!jUCp>E>@fKq|4f<sXy3?5NIZxTC&91G1i8WaBJM}OdR?S
zBT!8`&fXFA7%B?sP1*7QHN?vMMM2*v!j6{aCXp`&$+JDnru)FAhFn8SFr#E?v4X8A
zX+@|2G#e+jKrE)8iD?sGO+)+7tn648MI)sGy4|rceb%|!FDSj#!Q&kMsyI58Iugf6
zHt}3Lm}%PV2+%QQVH$*Ldbrfs7?{vTbXhtIfITq*fuAw(&lvk;$<#Y^lgWjpnMx7f
zU0kfyce*_#n_W@Vby`OmI=Pfc;8LRYRFz0gHCoI@^)+?2v(zn(n$coWiOEnU`g8(|
zbwc9YB!whR*1HN`mV^o!S{gruTratxo^C_#fL|pVJVvW4BFy<V>Sm=lyd0b{r>%bX
z{45axgaYpqpIhUF`9rW@Yd$^9O<&`?eP)7hZ{%Zd-tiAXBfhazK9R~%kikVR))sQz
zw;Ie{+K#D)3T>@v(H<sHmri2|gfRR)B8ZM0Y2y35EiTpGg0Sj;ZumbdclZjk^9s`u
z|J3CAA^2)v#$_B^($dv#228|@qUrStLE^MXjo_3tg&{UTUQALTfvozx0}$F12ML(G
zVZu_QePqZKjjcqZokb6&OM}*<I)B8d6N=7HN4x^yfcP1vS(L6Pix`I;zWYd%b;Z&N
zh0o#y8FS`_IPe`)@5(&ASW8uA%&JVvdUMmIldEqmREbg#-BfTkETy)O<ZB&pf0iuT
zka*EdRlU5>p`vd+<OsaZ{EZn8!#EvYXr5(VvE!r~;ntN}zw5)%UGyV1L2QIQelJ90
zS<IYEQZk1b(eUixZ$TW2{JvpjP&=28c>uOyrKh4gREh$NgXz9PSk_(KT%6K&TVgsE
zXTAU3%d4%YA*yW2+DKo;v?)`|jRENP!+bsij7YG_HrDFsF2C57H=`R7o<L5WfF@CB
zpib0U1ul?mzf05zO@KDotnd`HF`%K(v%2g-xVOzlidQ1)%BNi;$7)2PN~AV4)I~LU
zz~Jm!J4keX!RuVnPJuTj6;GDR!qjsJPF#XgyY}L?)0dn_uAl8LLNuh(+13NLg+N>8
z&6R+Cdvb%-lF!NU&U(nsI4-L?K&~A)#asxFKOh609nN>45Dg|qUpY$pczpxl$R#}i
z$iNPZ3R-~&sbji|V4{CdAuVrD>C5JvTg*|)y|19K`7N#uvR4ki!a<LPPf8;~Bt<l`
zlKA$Mx?&P9=(I5lwuaecT1AhnC`{79hB*Cu>7JOEOH~gW>Hu<mV`NN7y25@IE;G*T
zTu@{31Gv=0HpaD}ZVGIT_A7hUkIdgP=ha>~K^=VYQwO!5Lt>-P9NWy)5}KGRjWQ&(
z*kV#s@Gy!|vZvlqLMUm{5o|>jVoicv!{ur}N0_k5i{V_P8Hy{C5y8ysO$-}bgTT=&
zc$$9C(huUWWnCmzm8JRZvS2B|GFPJ@XvbT=VwnB~a4G&&KYK_Jk0?awt+likH=YW%
zKTOE1EB14NfmjUdj4+<DNX6rw-rv)1JtGRxF~p7d0Ud84vP3)1x3YC^`&7a`QT_*a
zBCTVZ_Z}!cSimI+318ThZB?_$CBB@s5UtbRd9n`o=ooImjS!C{{#~v2_IB}A!V7J0
z%NzqKM-MSBs$h2|FEsCXTK?oO{&33Vk=hHy%tm79cTu-1j;He8ywh7qVD_kxXF$FG
z;-U@5o}<HQ-<D#%40rGFX28kX@`E%{pgt(^JSP!uv&%UpypQDx5OF7$7{ZpujsuMF
zlPJCNV`(wAq~?4!Sx@_!Qrb=KiT8Dfi+#@1%nDKYTV`?L*EdHQrfEnB4H=cYUC(X2
z%e_f;F#o<LPc$uPMVaJFM-FCL(8UoAlO^JCZccpkc~H)`o|Bw>P6?570{vKpBl$4d
zF4v}Cv#c^H0H&1?Is<tVp=<vZPRBAY^ic87oQ3l7(UX%3MjH{`F!D-e9DF#~U?F&b
ziGGQ0&|B$qWE`*cho4#^EVLeFoi>3*28=v^96r_epQSM__&AIsi5Ow27!-yKjpIKw
zZE=jOuEiqY7!IOYyQW&{51Lzdr0zq_x~D|Q++?n?!ySaWuJgv6t!te?JHrY<#!|k0
zhk7;S8>dFyT0PtK3jN*lbeGMeW`ju!IXdnUIa$?<FlSYgYen2~`Vvc20TRoN<*cOI
zQpa$VsIg5I$V^(}a)H=|O$h>a7419Mr})IXPyY%p@dPA~edMb^%uGFSWaG}*_2<ku
zuTu5u;$OWVn0n&+JYJz2rFTuA;N$JYADO=cGgSl)fVgCG3Q6V<%oNfG9n6vlPR)vb
zCVNpw2S20=x?i1zRAY-a#Am^trvWwm5WklGP}z|Pld+i2aqk*O?K46YMC~PzXj4My
zrEBMt&#RtYBEpI_ZSkQ54{jKsKwQ!=S{WhzK6kWt6s*gJH}`MgLxUMkX)Ps-Q@fl4
z#Dm?7FMpZ{CEakD=Uk{lwO2wbXU3B$$^b*NwD=r=d0g44TMAO9kKYBRSig$m2S+G{
z$bhU@78ypaBdf?O2&vJ@zI<T%a~jt1B&6M3(zz&eI-?e>Ipe)YWAupZDxU*6*XSJV
z?7#sRj*y-9$>xCIn5If3M}G)}sMsOzZz2p=2UaX-V3Q=&KQ-_d++^-`YjsHp#?6t&
z{KJ+W7mEB%Vzk>Unvn1p@sS0mVe*#|_=93OBDpyUor7~sn!|C&dksA_=Q@$Y8VJ(m
zTThx8Ew-L*G*SOP*Paa&WN1AAoC!xKbVow4nluG?0Jd1D@%rylF%fm#Mgl!~dW!j#
zX6x<Q+1<4rn(Jb}g2EVS{|0NA4?t+oB`$h4*s>|Sm?Jtp*^>gH5vAi`$!C3!){eUp
zKA9u~+fABRS-IZvxz&3e!Mg#Tc8+y0s6=jEOC*f;8{gY*VK5h?w~;G0ueOkZQ%*|_
zzlf*ychtyDa;Wcq9nkbn3$cCU&rn7=B8g3i=M#=YF}9&CT@Y-OZHynZejHmUOcC4|
zm3t2j)AX*Ij)4kuE+-vtqU;7lii&{777|*$kn2Jg1Wl`vx>8ET9*U|82JR?s@SqTC
zMqhO*A@9o~LQ6>RR=BPy-pg+9>BXbU)(8_~=eWh8_;|!-7@!4t#3t|=YeOjb?|0yM
zb-HWIr3s}Q3LJkN@7BQjY|l$ieydzKt`|Y&T2EFPcNt$zs(7Ls_j%awJ-eaT3eKQI
z#-@wggt=x`?a^i)sE(p8xVzVI{x}8wiXN*3S#8^3Vb>0lm*Rjg)ohEH%#Y5YEG}Gn
z$t>OtP&98nyK-Cg?1vCbRtZ<@@?-kU9p6{0X2<fRsq)_@Qk^$;zkl<lD5vVI3-Gwu
zos7ZpSWuNkk3A=X^cGtA5E6p=hI1nu(dN3{8Il{=0^@NUhOZYh90s26`GfHXYq`SX
z%Ez=oxv}$_2$|8B5-E4PsnO-1TWXqg-7Ryl)}D!%hNzL^6Q4w+^1ZIEC}O?7!=Jwi
z?rJa7o$zY;N7{plrd+N$_w&qR|6JJcZpMSU+Gz_<nP;4@8DELxUQs>_@Mmy4_O%}+
z^Jb5H=RX3AJ?iW_4W=&KGuL@d=l-5V-btY!+woR^)n1FpHXpVrG4!&wU-*`9wmqU(
z)jFT75maw^m%BaaP>(e^iEM)t+xZwxy7R;5eK=9Ie;nn7`W=UPa8a~(>Q??rDb=E5
z4|MOz;L>j8`{VOQr@J0NX}#Iwd9MGtsr2jWz%U^vqxG^!&*F4IZE6$gM|!ua#+l>6
zslTRX*Lp;r)5!AH*Y?FVOKnELqHu}bLsQpf-YY}J7e!vpl6?YU>u$B`J2SQKC#THS
zF6048$UDjZNwaHNw45ri!NAToz`&6I(QF43M;l8EkSmid$jR|SaNPw{I{nI5veuHs
zl3av49dCWt4ayD|mEVjswg-(My{P+?DT?@M+F+ASw+0!Wf-ESMLx0#Uwh`L2G08Zt
zQ3U;cN=e)8DJ8%}*|3VPnvR{mnyL_S5mjYU!0Yy40yI^_mu2;6t*cj+`hnVOZypoY
z_SDi=Xm3JV+n(XF7-U~)*3j+196VvEVo;?^Yw7a#d&Kukg;U-Zp|U6b3`K0Su-}@b
zs7pD)Ixg(y$RnVd(a3h|1D+V}?~ipw4<9QZ8d~U@@@NYU>pH<&;r!~^eztPM<gQr9
zlBrd-ur}NH4ci`}`lP-!)O32KfFtH7J3Eh>0_oO}u>|X-(zl}(KhQ(X!*gFk^6O&v
z((vE<YW1Z>Dmz<^w?F=Jb|2+fpuH|$kSM>}_({2sw~}>S>Db)3=tn|Qb83}oSN1Yu
zTB_o*6UWQ74`OfF=x;x}BNvCmPPbhMqLazZwcE&-6BmaIIkQuo^V8MQwS=X6kJiJC
z-(=bBR<(A@f%v~;yxuhZZhLsSOcWJuCwlTH%GRbva`P7g<Bo<s?*?)^d#)3bRPQF}
zJz1EQzj5OPr399--g36USZ413Q8+i{EzU^6H%a^Bus;Ay)aiFql23p5l;A4BpTm$&
z>95;@vHdl+JiRLau!sgaQr+JgdVQZ-yM?y%TD5UttXW(tE396-<v4S=ZFT#OloTEX
zp|otMFqjA^|20B;zQ)cG!M;t=l=odZcBlmWV=k-p8DzGb%lo~#k)_HH2E)|V91*K`
zqX1%e+UnJx0QgEY(&w}-bZ=xlDH8z23G*ChsWi)hjYGg3P*Gd6TZW${dNE#Tr0qo2
zdzL8iU@q0Nf4FCi?FkGd7b6Q=%c!z!l0>po+ThYQBv0HQQ@Xb%`cX?1VnBpB_bGg1
z(fIBaQ1@&xhWAFBG>v42w6ysaS9%2qPe7q31)fWBYM=6`%i<OA^JJ&Y*7OI&ITH@A
zWq&X;yj|H`sWUxd3NIs)P}1&aoBercmCVR6vN`znCRZ(Nz}nvlhkA6*dbfpoJ*VSs
zx!F<T7xvTGg=40_f(}0P>l=xjSXN>Als7bS4T1bMvpfWx&c~TL=*G>#YlN^LUQ6Uo
zr3Ous{kR~Ahjcj8&=x#Wh)tuJis3?{t(IUrTY07s%~%$RM6@q+9^?s@#+Lcb^Z7od
z-&*!66>W**s`lqj%^@r3RoCIA(QYfAuqYI=PpvbPSyKQmtI1qQ4~$AMkEgYOjy}Cg
zqBK*)R9m478~XI%*LF5VG1H|&Yb;(k3mGT=+*EdX2c#v`z8P7NE(=hiZ+exMrQean
zuKrw`1O~rTFn9+Gq)Cv%PwvE<DRVc0l)bhp@1K1GjGIlod0YOpU#*~go!ZHNRpGZ^
z1@M(Yq+y(&sC9aW=&FTE+QlpA;(Wnob(|wEJvhmdp^@34=P20IbKX62PbZ-XQFUS#
z0NM#b@wmrvr9)OH7hA&T6uzx-o>ppa{YkL)6a1Nr^|N~PcO5#+=V2{Mbo{Yr6a8nW
za)Y#2EOg?$c`pQfm6Wljt+`T$){n{Z#(r)yxi2FYnCUQ(vKWQQ*`r{E61F;Gva;Od
z3kk%}8hUuepP!FSypI?zcd=jQ!{NBz^)ZFiQ}eu@)Iv*KP#Qlkgr^&iThn;&G9)8;
zFlz#<(`mN-xaU__!^Xgx&))exh<%w^<(R57-8=vOteiZ(9FQo?1X}z_T2Jw3z0&bJ
zxsIlkbl*?w<lFbOr4=LyPXu%b&o4Sq`ZXayT*t@!%I${+iJME$R1H9`SW<PN)ZkEU
zXTEYyGI#87K4T}2O6UL`-Zlps6UZ<rVY<a($JL-LbihuWkDbs8Ef<5aKy~8xZ=zW=
zPhJeKnH4AHH`_<mtRQ!YJw<@w`Aou0!@2M$oFLa#@AWEdcW=^khD+Bn0>JLH#nm~h
z-6%Vzy+$7KXc%O72`xh=R&pE@<=UtMo|8R(4xl$@5p)%jLE6rIH);zo*RU*4CdP2F
zSo8HtlZcv7s7kgi2gl5;xtU7+-kOGWHz>F_WFP{GjjkE;lS<y33^KkRGCX4m8B!2`
z(N%Yu-Mg$<IBj|$;1m;gl~906&{O6>3JvX|o%#qkLa$xpbomnkHW;K_EZ_>k7A#5Q
zgw(LWRljA=!1!&Jre>aME&RuT31UNc+xxGs&yAkD;rF*l-hetG{`hoso<}jn2t<$h
z<ei9^qkHAn!<e{M&btwij?1E9Y?eBR13%!aK!oe_ZhSsLNFew5d1sy?K)|<%=4Q9C
zSg?Tby@BR?(eVzAAgK_EF?K*Mo%x$vaZw{8RHlj!FR4ar+S^>*;}uOj5%fThgqR!1
z_7@=uJ5ImN7GVgu8q!4orwYeBVHQ;pQiwxt0L(BqaqP0wY*HEJWdt<bzaNy-d@VAl
zdmlJt(!y0J->7=N?lUc|UI8_Be(mfGrWIKM6S0l!j^YWA8X6T!RY53^!eGa-5h{nS
zO1Go-yLnCFw+w!|$<cV#%K@!K)X^Fi$R(Q%y5)H5X&juX-#)&NYphH*%Inx<|D6IC
z-MRSXLA=40rQ~Sb0(8NKlym!+)l;!S<zX!4ryA&0Pp1LRfs&r@{O0MJCa=SsEh=+G
zkLQoxT#KP4P9cugaBq-b=vG@V6iW^n*cMiTdfX!hoXB|cnj_2jV{|)KE?rZzi0w)*
zG;H9iA*qU9-@s1t=nNm(r61e81YZ)^4&JgrqWQ-^s{FiDn1DJ|g<}(pt%GQ{G@^+s
zW@e6%a)y97Pb|$;Gj{i5c_%OXxP1D>=I)de<Ti{Jf=XyA@6B7lImdw;xiG6jO9$(<
z6h&gktc{3Cs5xhVAP7AeIQa@BZy5Sm1wVTORI$6qeAeVoHLP%U$1ildh%ZGcS(S9L
zX%sD*-<(v>lq#L^Caml(mY`PE1gK7@yD|JsbJ2X#fH8;HYHv_z)Gj}I4}Q2NW+1Vn
zzk8UdeBBdd$*{JFxPV^M{7&g$+SBI}4+x|hytK#^xG($)HwYgPJ2h`DA|Q58JJ|{j
zHB*zsWFM_g5W04)O6AL%wxIvExz1iW8Whb>>a%rWOJTt9eZ7<o@ZLfoE+sj8C0`(i
zg%DZMYxtw8Fk}6XX0aOPP~b740^WdWq6FJ_^505jNFRUL4u>n{O3izg=S6vz^XcA3
zq7b6L_jt2qC<era65$i*cZy0yXYqBfV6CYCpz`JwVb_8y9JW&s=kvOxhU5Qbg34No
z8NEpF-zh4L>Sq{7QJ7gDP_VRnC;%%_qz*+|K$qsMZler-QOt!yU}k5Dy`gPpvsSG1
zIWHfP`Q1L*Jkhlv6mlOg6e`0Q7hu6z-}~w2R@4V(>DBaL(&0l}JDqMtsAfKp)YD~}
zFa0(jr;U1^p`sx67%~lO)f(Vc-mLKjZaO$G{QgPwy0CbPS!8>@OQEZn@672XvDkm%
zU4QO@2_|d@7-^ZIX$qh?MBDrUXNDfYStDv($J%{Dhg9+=iX?_xAA|mR?XW<KotQ`7
zQhRe((LJl2F1z!PHx~j#kVi*BoYNAN2nFnuXDqDFmoAory_=ftvN1&I9y6~#uEKqG
z(d$xCv*}4*M%wsbUT@%up6_PyKJ`M!@2RwK@*3#nQ%=clS4b*Bc4Ot4ZA`GGsD!pX
zK$dl<k}DOqGx`pFA#G_96Qg)@Mk13k{r#?k;0x&y>YxmZvh~5Jgv~Av?xH#(eEe`5
zNPG>S`>pI=ou5eLko4Chq8;r;Rt+=U!5-~(W%BQ1Q7{N&`QJF2EnLHY?`ImGxO=qq
zVL|lUWoQ(a``VG-kOsV^5lu8Kd_I;?c{kC#VFE=uW7xBA?l~SFj$CF(y?WVBrk@YY
zdoSBUceCNad!5Wj&1pl%ex5?%;E?rF>5NG*<H-#(WUn#7W=DL2S@zYkT!X5KldTd}
zdWklT67rZ+6lcF;vPGV$>?u9{g0}Q4C`=6hO4tEUdQ0;u>^R#qg^>%R<4dWE3xvXr
z#=?OL!q0xRaHGow)0$$g%6LSQHkeas0R((nGr*lvMF>-S=CK2Z&esbKIZGTLmXL4m
zG8W*X0bU5$y0-hMs@88flQ_&)8?!xw9q3%H_lTwOE1t7wY@yQb)j!7|sxEp8FoA8R
zLINuGXfr}V)byJ25^6eB`AlxKlJqRS!ai#T6d2Vs4iHDk1O4>icnXJACN3nH>T7a5
zJHSg_W4ec2(Ua&8-Y1;tg7zJx_7x1aZc~$_VmVAX(LW;^O5DFq<fm26;{@pe6=z^~
zmC5MVP|CjmMF)F&m%;8Bix)ol?YLka!ZyI4fwUcPVrr?^fez*Pzy^oG<+e{FsLM8D
zsSaVywxlhAs>(H%;ZwfUia=Vh%Ge4lGLfs$BA^w=*u)$OKBS}W38CYwS{ia};G&`#
zV!9oXyWNMDykdHqMm?twmaNV)Rh=zg=ck+E@lojIpnH*wR!7=#UtdgdIzVi%Vg&qO
zGM%8SGaVa(jpt0*G9K`K4jq;eN#vxWt4(&UiN0-HEcbWLn!nx4!}aK8GApep0j^UO
zbkw9JOE9?o#C`49Ntjm&;4t2HFEvgt#!~T8bR=!h1E+g6{cl69Z(o*|nbSlm^NS>p
z`;p!qkSme~;c>a47PwK?!$8?wcH89qbs6yOgz-9(T>W^e7<l9ol;qR@_HlCECG^&s
zaQgGum2l$6Y=Go2n02KNizf+r%IH|(y73@vl@-RfUeNDjiag53aAR^27YXl9eTJBu
zk^%ckw7J+NfEp0<>dwVXWDDHH56(Y3wmSH9);M9j=FYwa*{#D>Zua~TGo3z_c1WT9
z<7DOyPYdih%kUr(@4=Tjw;GpmJLYi*d-TPyn`Rra{Ib8Zgjv;NK!PG!<6KZ-r*>-P
znk8;Oco78oZn!X@7;gwLLDdrpXCf5GiAC7`R<cu*Hpg&FK+^hy!F3mh)zS9j&oRq4
zxcq$4$mHA{vV{?z@Mtq2c7Qyq21`{Gu6Pn`cg_}<o<649skl(dU8r`zT0O57X_CH#
zqf~F+cz^_z-ZuPLxWvuDjO@+hN@Q=exnl%}L+yEgH;VN`*wng^G(k5~{%7H&@ZT>%
zx&EULpqiDSFJ;XT-ip5wr7o`zMMLaX0l6FrON+htYS0gVc6b@2hk0$;fxFcbxnIO>
z*yoNl-Hn%yG@HnlWiJmIxdF!&4NHrPN5V@7MD-J!jnr2#idu>|hjwkCCaU5+SW~QR
zD!M+zTu#CF$okO(9!f_dK`hx7lx2s~+x3=u`4<bDt-?Bir8}M3Z4^PAmSVENABS9U
z0Ip%F3g7A?e8S-+QyiU`nf7Jfl`(3^3fe|gy^Yc~F-Kr#WN`0_xeq?Vm#Dsz7Akyz
zX+6=oNot4Ti1L2Mcw<U@o~u3KVBC;5HYE9Qw?*wvHy^Ek>l0U2ZaWXLSGPN2sVz}}
zyEvHXNBqP3;h)Dvr`$TtO5Dvi7^;H3l?*z!J9exCgz4$9>uOF^OISaV`e*nat3F60
z$)c|vFI*!qY<Iu)-QtMxLx+Pk`=fN=aJ3*@;Z-yc39j_=L&d=d5LD55><E+~1gF9g
z=Y`|cjX(c8H6c3)B^hrANKi%YM2@Z<AYVM%vW~wpF$K5ZTCef2^KDOanuAtxXbCZS
z57;IyVNNA^TvTS_&h;sHMnc=#XTt4yYNEkTo_;rZ9dujyYUQQ!Q(#ZN-FNyq^<=^a
z38&PQfD>r``aEf!jaq=2y%!=ypm4pb&>`GS!}A4f9m_({wM4|1ow@lPA(=s6ko_m{
zS6I%}e!NBI=_;qV&{9(i3xX&^aJje^ZNuu#GQuJ8vRVj*)TKJg{D*>rLiKL%E=8kX
zqBR4@*|j$NK{SgqJj&KEW}5LbtCX3rcq49D!4YF8h?Y)zd>4`2an2`@@~=v_DQ&3c
z`mK9uMK0y4TrDWM6Nxs|fB=+`Y~`y@p@@F_E|qowM#iVYl)vm)^iHBtoF9G+!goX=
zW}V(b5@2SL>%T*TEj?(XETBSBA|T7al@~@KP;WC*kpxnWX~BsC!XXj>c(V3pnVRG{
zzp}6#2C;{H!Zc0lcO+!qIu3*5ujf(KET2ckvu3YC)bSbiRrdH&J=I<=xIEN|9-XdR
zyp3ud_YTgChEwSAXDt<(Fw~-`mt?K6XPG;@fRmn?{>$v-MzY4Cgku!g8qlngRwpu{
z8Vp7AP#VB|(+faJU`s30$-O#A5~=S>b9ve6UZ~iHsy=lJ)S2(Cq>(HuJh_~)K%sE(
z!-zH!fjl^N;sZ78Xq?(0QzqvIbD<JLndFux93xf!2oLPWrU#)ot*Yb$(F|e;<|)&F
z7f}o*+TTRO1o7`TL)mX)IZ&6_YPJWxIx?m3pz1^fPu%wBt_n4JY%bL}XUo*#1Y#sh
zX5^?ebny^gTk$8@sI!}x1i;7BII#^Wes<T;K{kgg0`As+{H6`22mT_hL!9(K<-BB9
z$5Tam=P&z%ID>s=)TlXaXOVAJ30V0V!saJdkDcAPEbP1h(|Qy1_W7r|VP+5l_f{sh
z=Ik#H)w_9xkOs~CukxA6bb*dHb#wH~h()#$EtlhCKp_|wN-@hn&(CIhTCJ8~BANi6
z_;;Njt-OuanX7V|T)-xcR$Em?<?3)N150UH8O;{jrU6x)AuVWC+1{mYx|5Ai5uF7&
z03$+M=?0GQ_xqoZB+{t6EyMF6royqwBLg8gY$(J$k$XEq@*{fq0<I2z*A49L*(G&m
zf7-KkeQG;Y{|V;MJOt<~l@jK*;qr^-lH6L1*_8k%GVNJ7DcNa4Np1<X0O}fy%i=3)
z#0CtmoX)mg#U6#UUI=W`6;@{LMMY`jy3_Koc`PdmBax(U@IK(J0Z+Ywx9`&k>3aJw
zggu#4FX0ou>@V}XTEbaKgqbs6_?touo5~O%HSeEbUh%S4yj#a)X}shHfx#k?tQ}Ux
zuxLL*=0_M;#pj{()DwTww2cPhGJ-I>z~}{G1(BfnAc+*s=CocDgq<h~uDesD3vy*$
z%j0s`#D15iqDwn7rQ7boiJqqpM^UVEe222CbFh7cYljVRhrBAvFnE>aol5)hrS{se
zdK}u*-r<}ysV#cDnBcpJfn8G(L5BvJW?c_HD31AZCMlS0eZ#MO3I$tlDOw`KWVw5;
zM5r?yBpCz)Zdgx3*03_P<L;zklR{Z3CoJHyk38>%!qAZOMucS1Q8)o$j$KQaO|Kcf
zM5eKkZ=%Xe!E4j3qT~$=YDP0H&?RnoehfN)N5};~<-B|k!zYMYnRxUM88y!$ygtv#
zDc@1SCrd=#awJ!yf4nc&$?>EdSvvq5SsPa7y0OOms!Gyn_oQ^la&#N(I!txM*;JFC
z+B?a<zD>|M{a1=I4USGvB*+s|tam^dXACVUAF>Uh*<)f*;@Vagvj-*JSs$~=q}A<E
z=DvYF%<r;pAGNQa(G=c~pzV^~xOOYE#@2eVv1n^YBG!tA;838`x}T<1(HOi=+ZHtX
zIwQYoPqn)xh(;fUvwW$F{`d>All#t)s1X^H!rh{gUN0iO4ZHRB=AtKZ$s<7g{nm7>
z^8M2NSGP;Obcw}Hjt4U{73Ij;5!lF?R5rSsnG^TUS=N^+q~-^Lf64h`lgNYn2R6rh
zijw=1Zvo+jsPd4{=RZjs9D*3~|L@!Tr)z`#v+#kH1pO!bFBjkc4*P#u&i+&UKViQA
n!vAGJ`|t4oE~Wo3_&(sj3F|8I&@lgbhWxi0|HU?%|D65@|9;vm


From c7370b1d0fe2fd88dbe1e4f16347a225ea2bf465 Mon Sep 17 00:00:00 2001
From: Rou <76741805+Rou325@users.noreply.github.com>
Date: Wed, 9 Sep 2026 21:31:53 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix(announcement):=20=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=90=8E=E5=A7=8B=E7=BB=88=E6=8F=90=E7=A4=BA=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E5=85=AC=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layout/system-announcement-center.tsx     | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/web/src/components/layout/system-announcement-center.tsx b/web/src/components/layout/system-announcement-center.tsx
index d8ac370c9..0ff6c12cd 100644
--- a/web/src/components/layout/system-announcement-center.tsx
+++ b/web/src/components/layout/system-announcement-center.tsx
@@ -12,6 +12,7 @@ const AnnouncementTimelineModal = lazy(() => import("@/components/ui/aceternity/
 const ANNOUNCEMENT_REFRESH_INTERVAL_MS = 5 * 60_000;
 const ANNOUNCEMENT_CACHE_TTL_MS = 60_000;
 const ANNOUNCEMENT_DISMISS_TODAY_PREFIX = "yingce.announcements.dismiss-today";
+const ANNOUNCEMENT_DISMISS_SESSION_PREFIX = "yingce.announcements.dismiss-session";
 
 type AnnouncementFeed = Awaited<ReturnType<typeof getAnnouncementFeed>>;
 
@@ -46,9 +47,9 @@ export function SystemAnnouncementCenter({ userId, className, style, showLabel =
     const error = feedQuery.error instanceof Error ? feedQuery.error.message : feedQuery.error ? "读取公告失败" : "";
 
     useEffect(() => {
-        if (!autoOpen || open || !feedQuery.isSuccess || unreadCount <= 0 || announcements.length === 0) return;
+        if (!autoOpen || open || !feedQuery.isSuccess || announcements.length === 0) return;
         const fingerprint = announcementFeedFingerprint(announcements);
-        if (!fingerprint || fingerprint === dismissedFingerprint || announcementAutoPromptSuppressed(userId)) return;
+        if (!fingerprint || fingerprint === dismissedFingerprint || announcementAutoPromptSuppressed(userId, fingerprint)) return;
         setAutomaticPrompt(true);
         setOpen(true);
     }, [announcements, autoOpen, dismissedFingerprint, feedQuery.isSuccess, open, unreadCount, userId]);
@@ -71,7 +72,8 @@ export function SystemAnnouncementCenter({ userId, className, style, showLabel =
     const dismissAutomaticPrompt = (duration: "once" | "today") => {
         const fingerprint = announcementFeedFingerprint(announcements);
         if (fingerprint) setDismissedFingerprint(fingerprint);
-        if (duration === "today") rememberAnnouncementDismissalToday(userId);
+        if (fingerprint) rememberAnnouncementDismissalSession(userId, fingerprint);
+        if (duration === "today") rememberAnnouncementDismissalToday(userId, fingerprint);
         setAutomaticPrompt(false);
         setOpen(false);
     };
@@ -138,17 +140,36 @@ function announcementFeedFingerprint(announcements: AnnouncementFeed["announceme
         .join("|");
 }
 
-function announcementAutoPromptSuppressed(userId: string) {
+function announcementAutoPromptSuppressed(userId: string, fingerprint: string) {
+    if (hasAnnouncementDismissalSession(userId, fingerprint)) return true;
     try {
-        return localStorage.getItem(`${ANNOUNCEMENT_DISMISS_TODAY_PREFIX}.${userId}`) === localDateKey();
+        const value = localStorage.getItem(`${ANNOUNCEMENT_DISMISS_TODAY_PREFIX}.${userId}`);
+        const parsed = value ? JSON.parse(value) as { date?: string; fingerprint?: string } : null;
+        return parsed?.date === localDateKey() && parsed.fingerprint === fingerprint;
     } catch {
         return false;
     }
 }
 
-function rememberAnnouncementDismissalToday(userId: string) {
+function hasAnnouncementDismissalSession(userId: string, fingerprint: string) {
     try {
-        localStorage.setItem(`${ANNOUNCEMENT_DISMISS_TODAY_PREFIX}.${userId}`, localDateKey());
+        return sessionStorage.getItem(`${ANNOUNCEMENT_DISMISS_SESSION_PREFIX}.${userId}`) === fingerprint;
+    } catch {
+        return false;
+    }
+}
+
+function rememberAnnouncementDismissalSession(userId: string, fingerprint: string) {
+    try {
+        sessionStorage.setItem(`${ANNOUNCEMENT_DISMISS_SESSION_PREFIX}.${userId}`, fingerprint);
+    } catch {
+        // sessionStorage 不可用时保留页内 dismissedFingerprint 作为降级。
+    }
+}
+
+function rememberAnnouncementDismissalToday(userId: string, fingerprint: string) {
+    try {
+        localStorage.setItem(`${ANNOUNCEMENT_DISMISS_TODAY_PREFIX}.${userId}`, JSON.stringify({ date: localDateKey(), fingerprint }));
     } catch {
         // 浏览器禁用存储时仍允许关闭弹窗，本次组件生命周期内不会重复打开。
     }

From 81162f91387764bf6848f0d6e8ccc80694b25faa Mon Sep 17 00:00:00 2001
From: Rou <76741805+Rou325@users.noreply.github.com>
Date: Wed, 9 Sep 2026 21:56:43 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix(admin):=20=E6=A8=A1=E5=9E=8B=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=20-=20=E6=8C=89=E4=B8=8A=E6=B8=B8=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=20ID=20=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/internal/service/channel_models.go               | 5 +++--
 web/src/pages/admin/components/channel-model-manager.tsx | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/backend/internal/service/channel_models.go b/backend/internal/service/channel_models.go
index 02cdc4a1b..37c83d80f 100644
--- a/backend/internal/service/channel_models.go
+++ b/backend/internal/service/channel_models.go
@@ -178,7 +178,7 @@ func (s *Service) FetchAdminChannelModels(ctx context.Context, actor *model.User
 		if idErr != nil {
 			return nil, idErr
 		}
-		missing = append(missing, model.ChannelModel{ID: modelID, ChannelID: channelID, ModelKey: name, DisplayName: name, BillingMode: "fixed_request", Enabled: false, PriceVersion: 1})
+		missing = append(missing, model.ChannelModel{ID: modelID, ChannelID: channelID, ModelKey: name, ProviderModelKey: name, DisplayName: name, BillingMode: "fixed_request", Enabled: false, PriceVersion: 1})
 	}
 	added, err := s.repo.CreateMissingChannelModels(missing)
 	if err != nil {
@@ -249,7 +249,8 @@ func (s *Service) ImportAdminChannelModels(ctx context.Context, actor *model.Use
 	}
 	known := make(map[string]struct{}, len(existing))
 	for _, item := range existing {
-		known[channelModelCatalogKey(item.ModelKey)] = struct{}{}
+		providerKey := firstNonEmpty(item.ProviderModelKey, item.ModelKey)
+		known[channelModelCatalogKey(providerKey)] = struct{}{}
 	}
 	retired := retiredChannelModelKeys(channel.RetiredModelsJSON)
 	missing := make([]model.ChannelModel, 0, len(chosen))
diff --git a/web/src/pages/admin/components/channel-model-manager.tsx b/web/src/pages/admin/components/channel-model-manager.tsx
index e78d71e32..1b7b57e39 100644
--- a/web/src/pages/admin/components/channel-model-manager.tsx
+++ b/web/src/pages/admin/components/channel-model-manager.tsx
@@ -231,7 +231,7 @@ export function ChannelModelManager({ channel, onClose, onChanged }: { channel:
         return true;
     });
     const pagedItems = filteredItems.slice((page - 1) * pageSize, page * pageSize);
-    const existingFetchModelKeys = new Set(items.map((item) => normalizeFetchModelKey(item.modelKey)));
+    const existingFetchModelKeys = new Set(items.flatMap((item) => [item.modelKey, item.providerModelKey].filter(Boolean).map(normalizeFetchModelKey)));
     const selectedNewFetchModels = selectedFetchModels.filter((name) => !existingFetchModelKeys.has(normalizeFetchModelKey(name)));
     const selectedExistingFetchCount = selectedFetchModels.length - selectedNewFetchModels.length;
     const allFetchModelsSelected = fetchPreviewModels.length > 0 && fetchPreviewModels.every((name) => selectedFetchModels.includes(name));