From 535d9298a7fc780aca40df60e6f56a1c9816a4b8 Mon Sep 17 00:00:00 2001
From: "CJACK." <tetr20071102@gmail.com>
Date: Mon, 30 Mar 2026 12:22:04 +0800
Subject: [PATCH] Scope dangling result-tag cleanup to leaked wrapper fragments

---
 internal/adapter/openai/leaked_output_sanitize.go   | 13 ++++++++++---
 .../adapter/openai/leaked_output_sanitize_test.go   |  9 +++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/internal/adapter/openai/leaked_output_sanitize.go b/internal/adapter/openai/leaked_output_sanitize.go
index 481492d..cb6e7c4 100644
--- a/internal/adapter/openai/leaked_output_sanitize.go
+++ b/internal/adapter/openai/leaked_output_sanitize.go
@@ -24,6 +24,8 @@ var leakedAgentXMLBlockPatterns = []*regexp.Regexp{
 }
 
 var leakedAgentWrapperTagPattern = regexp.MustCompile(`(?is)</?(?:attempt_completion|ask_followup_question|new_task)\b[^>]*>`)
+var leakedAgentWrapperPlusResultOpenPattern = regexp.MustCompile(`(?is)<(?:attempt_completion|ask_followup_question|new_task)\b[^>]*>\s*<result>`)
+var leakedAgentResultPlusWrapperClosePattern = regexp.MustCompile(`(?is)</result>\s*</(?:attempt_completion|ask_followup_question|new_task)\b[^>]*>`)
 var leakedAgentResultTagPattern = regexp.MustCompile(`(?is)</?result>`)
 
 func sanitizeLeakedOutput(text string) string {
@@ -53,11 +55,16 @@ func sanitizeLeakedAgentXMLBlocks(text string) string {
 	}
 	// Fallback for truncated output streams: strip any dangling wrapper tags
 	// that were not part of a complete block replacement. If we detect leaked
-	// wrapper tags, also strip sibling <result> tags to avoid exposing agent
-	// markup in user-visible text.
+	// wrapper tags, strip only adjacent <result> tags to avoid exposing agent
+	// markup without altering unrelated user-visible <result> examples.
 	if leakedAgentWrapperTagPattern.MatchString(out) {
+		out = leakedAgentWrapperPlusResultOpenPattern.ReplaceAllStringFunc(out, func(match string) string {
+			return leakedAgentResultTagPattern.ReplaceAllString(match, "")
+		})
+		out = leakedAgentResultPlusWrapperClosePattern.ReplaceAllStringFunc(out, func(match string) string {
+			return leakedAgentResultTagPattern.ReplaceAllString(match, "")
+		})
 		out = leakedAgentWrapperTagPattern.ReplaceAllString(out, "")
-		out = leakedAgentResultTagPattern.ReplaceAllString(out, "")
 	}
 	return out
 }
diff --git a/internal/adapter/openai/leaked_output_sanitize_test.go b/internal/adapter/openai/leaked_output_sanitize_test.go
index 1898289..6548d39 100644
--- a/internal/adapter/openai/leaked_output_sanitize_test.go
+++ b/internal/adapter/openai/leaked_output_sanitize_test.go
@@ -57,3 +57,12 @@ func TestSanitizeLeakedOutputRemovesDanglingAgentXMLClosingTags(t *testing.T) {
 		t.Fatalf("unexpected sanitize result for dangling closing tags: %q", got)
 	}
 }
+
+func TestSanitizeLeakedOutputPreservesUnrelatedResultTagsWhenWrapperLeaks(t *testing.T) {
+	raw := "Done.<attempt_completion><result>Some final answer\nExample XML: <result>value</result>"
+	got := sanitizeLeakedOutput(raw)
+	want := "Done.Some final answer\nExample XML: <result>value</result>"
+	if got != want {
+		t.Fatalf("unexpected sanitize result for mixed leaked wrapper + xml example: %q", got)
+	}
+}