From 0f98e06d9ece3ebc53555afe1d20fcf64b3bbc10 Mon Sep 17 00:00:00 2001
From: 0xYYBB | ZYY | Bobo <128128010+zhouyongyou@users.noreply.github.com>
Date: Wed, 5 Nov 2025 19:05:09 +0800
Subject: [PATCH] Revert "fix: hard system prompt (#401)" (#522)

This reverts commit 7dd669a907c7c2ff1023bd76821af7d13be1f35a.
---
 decision/engine.go | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/decision/engine.go b/decision/engine.go
index 652c7fe3..598658d1 100644
--- a/decision/engine.go
+++ b/decision/engine.go
@@ -253,31 +253,33 @@ func calculateMaxCandidates(ctx *Context) int {
 
 // buildSystemPromptWithCustom 构建包含自定义内容的 System Prompt
 func buildSystemPromptWithCustom(accountEquity float64, btcEthLeverage, altcoinLeverage int, customPrompt string, overrideBase bool, templateName string) string {
-	basePrompt := customPrompt
-	// 如果不覆盖就用系统prompt
-	if !overrideBase {
-		// 获取基础prompt（使用指定的模板）
-		basePrompt = buildSystemPrompt(templateName)
+	// 如果覆盖基础prompt且有自定义prompt，只使用自定义prompt
+	if overrideBase && customPrompt != "" {
+		return customPrompt
+	}
+
+	// 获取基础prompt（使用指定的模板）
+	basePrompt := buildSystemPrompt(accountEquity, btcEthLeverage, altcoinLeverage, templateName)
+
+	// 如果没有自定义prompt，直接返回基础prompt
+	if customPrompt == "" {
+		return basePrompt
 	}
 
 	// 添加自定义prompt部分到基础prompt
 	var sb strings.Builder
 	sb.WriteString(basePrompt)
-	sb.WriteString(buildHardSystemPrompt(accountEquity, btcEthLeverage, altcoinLeverage))
 	sb.WriteString("\n\n")
-
-	if !overrideBase && customPrompt != "" {
-		sb.WriteString("# 📌 个性化交易策略\n\n")
-		sb.WriteString(customPrompt)
-		sb.WriteString("\n\n")
-		sb.WriteString("注意: 以上个性化策略是对基础规则的补充，不能违背基础风险控制原则。\n")
-	}
+	sb.WriteString("# 📌 个性化交易策略\n\n")
+	sb.WriteString(customPrompt)
+	sb.WriteString("\n\n")
+	sb.WriteString("注意: 以上个性化策略是对基础规则的补充，不能违背基础风险控制原则。\n")
 
 	return sb.String()
 }
 
 // buildSystemPrompt 构建 System Prompt（使用模板+动态部分）
-func buildSystemPrompt(templateName string) string {
+func buildSystemPrompt(accountEquity float64, btcEthLeverage, altcoinLeverage int, templateName string) string {
 	var sb strings.Builder
 
 	// 1. 加载提示词模板（核心交易策略部分）
@@ -303,12 +305,6 @@ func buildSystemPrompt(templateName string) string {
 		sb.WriteString("\n\n")
 	}
 
-	return sb.String()
-}
-
-// buildHardSystemPrompt 硬性条件 保证输出格式以及爆仓风险
-func buildHardSystemPrompt(accountEquity float64, btcEthLeverage, altcoinLeverage int) string {
-	var sb strings.Builder
 	// 2. 硬约束（风险控制）- 动态生成
 	sb.WriteString("# 硬约束（风险控制）\n\n")
 	sb.WriteString("1. 风险回报比: 必须 ≥ 1:3（冒1%风险，赚3%+收益）\n")