From 6ab77f5eb5afceb99eb32bba011261866bf6cf14 Mon Sep 17 00:00:00 2001
From: erio <asakifeng@gmail.com>
Date: Sun, 8 Feb 2026 08:49:43 +0800
Subject: [PATCH] fix(upstream): passthrough response body directly instead of
 parsing SSE

ForwardUpstream/ForwardUpstreamGemini should pipe the upstream response
directly to the client (headers + body), not parse it as SSE stream.
---
 .../service/antigravity_gateway_service.go    | 99 +++++++------------
 1 file changed, 38 insertions(+), 61 deletions(-)

diff --git a/backend/internal/service/antigravity_gateway_service.go b/backend/internal/service/antigravity_gateway_service.go
index c2983c47..2d96b1ab 100644
--- a/backend/internal/service/antigravity_gateway_service.go
+++ b/backend/internal/service/antigravity_gateway_service.go
@@ -3530,39 +3530,30 @@ func (s *AntigravityGatewayService) ForwardUpstream(ctx context.Context, c *gin.
 		return nil, s.writeMappedClaudeError(c, account, resp.StatusCode, resp.Header.Get("x-request-id"), respBody)
 	}
 
-	// 成功响应
+	// 成功响应：透传 response header + body
 	requestID := resp.Header.Get("x-request-id")
-	if requestID != "" {
-		c.Header("x-request-id", requestID)
+
+	// 透传上游响应头（排除 hop-by-hop）
+	for key, values := range resp.Header {
+		if upstreamHopByHopHeaders[strings.ToLower(key)] {
+			continue
+		}
+		for _, v := range values {
+			c.Header(key, v)
+		}
 	}
 
-	var usage *ClaudeUsage
-	var firstTokenMs *int
-	if claudeReq.Stream {
-		streamRes, err := s.handleClaudeStreamingResponse(c, resp, startTime, originalModel)
-		if err != nil {
-			log.Printf("%s status=stream_error error=%v", prefix, err)
-			return nil, err
-		}
-		usage = streamRes.usage
-		firstTokenMs = streamRes.firstTokenMs
-	} else {
-		streamRes, err := s.handleClaudeStreamToNonStreaming(c, resp, startTime, originalModel)
-		if err != nil {
-			log.Printf("%s status=stream_collect_error error=%v", prefix, err)
-			return nil, err
-		}
-		usage = streamRes.usage
-		firstTokenMs = streamRes.firstTokenMs
+	c.Status(resp.StatusCode)
+	_, copyErr := io.Copy(c.Writer, resp.Body)
+	if copyErr != nil {
+		log.Printf("%s status=copy_error error=%v", prefix, copyErr)
 	}
 
 	return &ForwardResult{
-		RequestID:    requestID,
-		Usage:        *usage,
-		Model:        originalModel,
-		Stream:       claudeReq.Stream,
-		Duration:     time.Since(startTime),
-		FirstTokenMs: firstTokenMs,
+		RequestID: requestID,
+		Model:     originalModel,
+		Stream:    claudeReq.Stream,
+		Duration:  time.Since(startTime),
 	}, nil
 }
 
@@ -3712,35 +3703,23 @@ func (s *AntigravityGatewayService) ForwardUpstreamGemini(ctx context.Context, c
 		return nil, fmt.Errorf("antigravity upstream error: %d", resp.StatusCode)
 	}
 
-	// 成功响应
+	// 成功响应：透传 response header + body
 	requestID := resp.Header.Get("x-request-id")
-	if requestID != "" {
-		c.Header("x-request-id", requestID)
+
+	// 透传上游响应头（排除 hop-by-hop）
+	for key, values := range resp.Header {
+		if upstreamHopByHopHeaders[strings.ToLower(key)] {
+			continue
+		}
+		for _, v := range values {
+			c.Header(key, v)
+		}
 	}
 
-	var usage *ClaudeUsage
-	var firstTokenMs *int
-
-	if stream {
-		streamRes, err := s.handleGeminiStreamingResponse(c, resp, startTime)
-		if err != nil {
-			log.Printf("%s status=stream_error error=%v", prefix, err)
-			return nil, err
-		}
-		usage = streamRes.usage
-		firstTokenMs = streamRes.firstTokenMs
-	} else {
-		streamRes, err := s.handleGeminiStreamToNonStreaming(c, resp, startTime)
-		if err != nil {
-			log.Printf("%s status=stream_collect_error error=%v", prefix, err)
-			return nil, err
-		}
-		usage = streamRes.usage
-		firstTokenMs = streamRes.firstTokenMs
-	}
-
-	if usage == nil {
-		usage = &ClaudeUsage{}
+	c.Status(resp.StatusCode)
+	_, copyErr := io.Copy(c.Writer, resp.Body)
+	if copyErr != nil {
+		log.Printf("%s status=copy_error error=%v", prefix, copyErr)
 	}
 
 	imageCount := 0
@@ -3749,13 +3728,11 @@ func (s *AntigravityGatewayService) ForwardUpstreamGemini(ctx context.Context, c
 	}
 
 	return &ForwardResult{
-		RequestID:    requestID,
-		Usage:        *usage,
-		Model:        originalModel,
-		Stream:       stream,
-		Duration:     time.Since(startTime),
-		FirstTokenMs: firstTokenMs,
-		ImageCount:   imageCount,
-		ImageSize:    imageSize,
+		RequestID:  requestID,
+		Model:      originalModel,
+		Stream:     stream,
+		Duration:   time.Since(startTime),
+		ImageCount: imageCount,
+		ImageSize:  imageSize,
 	}, nil
 }