coder · ssncferreira · Jun 3, 2026
diff --git a/aibridge/intercept/chatcompletions/blocking_internal_test.go b/aibridge/intercept/chatcompletions/blocking_internal_test.go
diff --git a/aibridge/intercept/chatcompletions/streaming_internal_test.go b/aibridge/intercept/chatcompletions/streaming_internal_test.go
diff --git a/aibridge/intercept/keyfailover_test.go b/aibridge/intercept/keyfailover_test.go
diff --git a/aibridge/intercept/messages/blocking_internal_test.go b/aibridge/intercept/messages/blocking_internal_test.go
diff --git a/aibridge/intercept/messages/streaming_internal_test.go b/aibridge/intercept/messages/streaming_internal_test.go
diff --git a/aibridge/intercept/responses/base.go b/aibridge/intercept/responses/base.go
@@ -437,6 +437,11 @@ func (r *responseCopier) forwardResp(w http.ResponseWriter) error {
 	}
 
 	w.Header().Set("Content-Type", r.responseHeaders.Get("Content-Type"))
+	// Preserve the upstream retry-after header so clients can honor it on
+	// rate-limited or unavailable responses.
+	if retryAfter := r.responseHeaders.Get("Retry-After"); retryAfter != "" {
+		w.Header().Set("Retry-After", retryAfter)
+	}
 	w.WriteHeader(r.responseStatus)
 
 	b, err := r.readAll()