|
|
@@ -1307,6 +1307,10 @@ class AgentRunner:
|
|
|
|
|
|
# 创建主路径 summary 消息并重建 history
|
|
|
if summary_text:
|
|
|
+ # 清理侧分支指令,防止泄露到主分支
|
|
|
+ summary_text = summary_text.replace(
|
|
|
+ "**生成摘要后立即停止,不要继续执行原有任务。**", ""
|
|
|
+ ).strip()
|
|
|
from agent.core.prompts import build_summary_header
|
|
|
summary_content = build_summary_header(summary_text)
|
|
|
|
|
|
@@ -1344,6 +1348,9 @@ class AgentRunner:
|
|
|
sequence += 1
|
|
|
else:
|
|
|
logger.error("所有压缩方案均未生成有效 summary,跳过压缩")
|
|
|
+ # 回退 history 到侧分支开始前,防止侧分支指令泄露到主分支
|
|
|
+ history = history[:side_branch_ctx.start_history_length]
|
|
|
+ head_seq = side_branch_ctx.start_head_seq
|
|
|
|
|
|
# 清理
|
|
|
trace.context.pop("active_side_branch", None)
|