修复自动模式提示词覆盖原始需求

app/(chat)/api/chat/route.ts

@@ -150,13 +150,26 @@ function applyOptimizedPromptToLatestUserMessage(
     const normalizedOriginal = hiddenPromptPrefix && originalText.startsWith(hiddenPromptPrefix)
       ? originalText.slice(hiddenPromptPrefix.length).trim()
       : originalText;
-    const shouldAppendOriginal =
+    const hasOriginalDemand = normalizedOriginal.length > 0;
-      normalizedOriginal &&
+    const hasOriginalInOptimized =
-      normalizedOriginal !== prompt &&
+      hasOriginalDemand &&
-      !prompt.includes(normalizedOriginal);
+      (prompt.includes(normalizedOriginal) || normalizedOriginal.includes(prompt));
-    const finalPrompt = shouldAppendOriginal
+    const finalPrompt = hasOriginalDemand && !hasOriginalInOptimized
-      ? `${hiddenPromptPrefix}${prompt}\n\n用户原始需求：${normalizedOriginal}`.trim()
+      ? [
+          hiddenPromptPrefix.trim(),
+          `【核心目标（必须优先满足）】${normalizedOriginal}`,
+          `【执行优化细节】${prompt}`,
+        ]
+          .filter(Boolean)
+          .join("\n\n")
+          .trim()
       : `${hiddenPromptPrefix}${prompt}`.trim();
+    console.log("[Prompt Merge] Final image prompt prepared:", {
+      original: normalizedOriginal.substring(0, 120),
+      optimized: prompt.substring(0, 120),
+      merged: finalPrompt.substring(0, 180),
+      forcePreserveOriginal: hasOriginalDemand && !hasOriginalInOptimized,
+    });
 
     if (textPart) {
       textPart.text = finalPrompt;