From d23b19c4669e7108c37ef56c913e16ee9f8a0ea7 Mon Sep 17 00:00:00 2001
From: diegosouzapw <diegosouzapw@users.noreply.github.com>
Date: Sun, 29 Mar 2026 01:46:05 -0300
Subject: [PATCH] fix(core): prevent emergency fallback from masking original
 errors

---
 src/sse/handlers/chat.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/sse/handlers/chat.ts b/src/sse/handlers/chat.ts
index eec303ffa5..0fbf689550 100644
--- a/src/sse/handlers/chat.ts
+++ b/src/sse/handlers/chat.ts
@@ -504,7 +504,7 @@ async function handleSingleModelChat(
             `${currentModelStr} -> ${fallbackModelStr} | reason=${fallbackDecision.reason}`
           );
 
-          return handleSingleModelChat(
+          const fallbackResponse = await handleSingleModelChat(
             fallbackBody,
             fallbackModelStr,
             clientRawRequest,
@@ -514,6 +514,15 @@ async function handleSingleModelChat(
             telemetry,
             { ...runtimeOptions, emergencyFallbackTried: true }
           );
+
+          if (fallbackResponse.ok) {
+            return fallbackResponse;
+          }
+
+          log.warn(
+            "EMERGENCY_FALLBACK",
+            `Emergency fallback to ${fallbackModelStr} failed with status ${fallbackResponse.status}. Resuming original provider account fallback.`
+          );
         }
       }
     }