From 3ca5fb104669d3fcd90f53846b3458e1d3ac8c47 Mon Sep 17 00:00:00 2001
From: hkfires <10558748+hkfires@users.noreply.github.com>
Date: Sun, 28 Dec 2025 19:35:36 +0800
Subject: [PATCH] fix(handlers): match raw error text before JSON body for
 duplicate detection

---
 sdk/api/handlers/handlers.go | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/sdk/api/handlers/handlers.go b/sdk/api/handlers/handlers.go
index 840fd894..f70a9dca 100644
--- a/sdk/api/handlers/handlers.go
+++ b/sdk/api/handlers/handlers.go
@@ -618,15 +618,21 @@ func (h *BaseAPIHandler) WriteErrorResponse(c *gin.Context, msg *interfaces.Erro
 	}
 
 	body := BuildErrorResponseBody(status, errText)
-	// Check if this error body was already recorded by the executor (to avoid duplicate logging)
-	// This can happen when the last retry fails and both executor and handler try to log the same error
+	// Check if this error was already recorded by the executor (to avoid duplicate logging)
+	// The executor logs raw error text, so match errText before falling back to the JSON body.
 	shouldAppend := true
 	if existing, exists := c.Get("API_RESPONSE"); exists {
 		if existingBytes, ok := existing.([]byte); ok && len(existingBytes) > 0 {
-			trimmedBody := bytes.TrimSpace(body)
-			if len(trimmedBody) > 0 && bytes.Contains(existingBytes, trimmedBody) {
+			trimmedErrText := strings.TrimSpace(errText)
+			if trimmedErrText != "" && bytes.Contains(existingBytes, []byte(trimmedErrText)) {
 				// Error already logged by executor, skip appending
 				shouldAppend = false
+			} else {
+				trimmedBody := bytes.TrimSpace(body)
+				if len(trimmedBody) > 0 && bytes.Contains(existingBytes, trimmedBody) {
+					// Error already logged by executor, skip appending
+					shouldAppend = false
+				}
 			}
 		}
 	}