improve error handling

dannykopping · dannykopping · commit 528358a3b547 · 2025-07-24T17:02:28.000+02:00
Signed-off-by: Danny Kopping &lt;dannykopping@gmail.com&gt;
diff --git a/aibridged/aibridged.go b/aibridged/aibridged.go
@@ -254,10 +254,6 @@ func (s *Server) BridgeAddr() string {
 	return s.bridge.Addr()
 }
 
-func (s *Server) BridgeErr() error {
-	return s.bridge.lastErr
-}
-
 // TODO: direct copy/paste from provisionerd, abstract into common util.
 func retryable(err error) bool {
 	return xerrors.Is(err, yamux.ErrSessionShutdown) || xerrors.Is(err, io.EOF) || xerrors.Is(err, fasthttputil.ErrInmemoryListenerClosed) ||
diff --git a/aibridged/bridge.go b/aibridged/bridge.go
@@ -132,9 +132,6 @@ func (b *Bridge) proxyOpenAIRequest(w http.ResponseWriter, r *http.Request) {
 	b.logger.Info(r.Context(), "openai request started", slog.F("session_id", sessionID), slog.F("method", r.Method), slog.F("path", r.URL.Path))
 	_, _ = fmt.Fprintf(os.Stderr, "[%s] new chat session started\n\n", sessionID)
 
-	// Clear any previous error state
-	b.clearError()
-
 	defer func() {
 		b.logger.Info(r.Context(), "openai request ended", slog.F("session_id", sessionID))
 		_, _ = fmt.Fprintf(os.Stderr, "[%s] chat session ended\n\n", sessionID)
@@ -321,15 +318,17 @@ func (b *Bridge) proxyOpenAIRequest(w http.ResponseWriter, r *http.Request) {
 			}
 
 			if err := stream.Err(); err != nil {
+				b.logger.Error(ctx, "server stream error", slog.Error(err))
 				var apierr *openai.Error
 				if errors.As(err, &apierr) {
-					http.Error(w, apierr.Message, apierr.StatusCode)
-					return
+					events.TrySend(ctx, map[string]interface{}{
+						"error":   true,
+						"message": err.Error(),
+					})
+					// http.Error(w, apierr.Message, apierr.StatusCode)
+					break
 				} else if isConnectionError(err) {
-					b.logger.Debug(ctx, "upstream connection closed", slog.Error(err))
-				} else {
-					b.logger.Error(ctx, "server stream error", slog.Error(err))
-					b.setError(err)
+					b.logger.Warn(ctx, "upstream connection error", slog.Error(err))
 				}
 
 				http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -433,7 +432,6 @@ func (b *Bridge) proxyOpenAIRequest(w http.ResponseWriter, r *http.Request) {
 				}
 
 				b.logger.Error(ctx, "chat completion failed", slog.Error(err))
-				b.setError(err)
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return
 			}
@@ -582,9 +580,6 @@ func (b *Bridge) proxyAnthropicRequest(w http.ResponseWriter, r *http.Request) {
 	b.logger.Info(r.Context(), "anthropic request started", slog.F("session_id", sessionID), slog.F("method", r.Method), slog.F("path", r.URL.Path))
 	_, _ = fmt.Fprintf(os.Stderr, "[%s] new chat session started\n\n", sessionID)
 
-	// Clear any previous error state
-	b.clearError()
-
 	defer func() {
 		b.logger.Info(r.Context(), "anthropic request ended", slog.F("session_id", sessionID))
 		_, _ = fmt.Fprintf(os.Stderr, "[%s] chat session ended\n\n", sessionID)
@@ -633,7 +628,6 @@ func (b *Bridge) proxyAnthropicRequest(w http.ResponseWriter, r *http.Request) {
 	// Policy examples.
 	if strings.Contains(string(in.Model), "opus") {
 		err := xerrors.Errorf("%q model is not allowed", in.Model)
-		b.setError(err)
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}
@@ -1163,10 +1157,6 @@ func (b *Bridge) proxyAnthropicRequest(w http.ResponseWriter, r *http.Request) {
 				if err != nil {
 					b.logger.Error(ctx, "failed to send error", slog.Error(err))
 				}
-
-				b.setError(antErr)
-			} else {
-				b.setError(streamErr)
 			}
 		}
 
@@ -1258,45 +1248,6 @@ func (b *Bridge) Addr() string {
 	return b.addr
 }
 
-// setError sets a structured error with appropriate context
-func (b *Bridge) setError(val any) {
-	switch err := val.(type) {
-	case error:
-		switch {
-		case errors.Is(err, context.Canceled):
-			b.lastErr = &BridgeError{
-				Code:       ErrorTypeRequestCanceled,
-				Message:    "Request was canceled",
-				StatusCode: http.StatusRequestTimeout,
-			}
-		case isConnectionError(err):
-			b.lastErr = &BridgeError{
-				Code:       ErrorTypeConnectionError,
-				Message:    "Connection to upstream service failed",
-				StatusCode: http.StatusBadGateway,
-			}
-		default:
-			b.lastErr = &BridgeError{
-				Code:       ErrorTypeUnexpectedError,
-				Message:    err.Error(),
-				StatusCode: http.StatusInternalServerError,
-			}
-		}
-	case AnthropicErrorResponse:
-		b.lastErr = &BridgeError{
-			Code:       ErrorTypeAnthropicAPIError,
-			Message:    err.Error.Message,
-			Details:    map[string]string{"type": err.Error.Type},
-			StatusCode: err.StatusCode,
-		}
-	}
-}
-
-// clearError clears the error state when a new request starts
-func (b *Bridge) clearError() {
-	b.lastErr = nil
-}
-
 // logConnectionError logs connection errors with appropriate severity
 func (b *Bridge) logConnectionError(ctx context.Context, err error, operation string) {
 	if isConnectionError(err) {
diff --git a/aibridged/constants.go b/aibridged/constants.go
diff --git a/coderd/aibridge.go b/coderd/aibridge.go
@@ -27,13 +27,6 @@ func (r *rt) RoundTrip(req *http.Request) (*http.Response, error) {
 
 	resp, err := r.RoundTripper.RoundTrip(req)
 
-	if err != nil || resp.StatusCode == aibridged.ProxyErrCode {
-		lastErr := r.server.BridgeErr()
-		if lastErr != nil {
-			return resp, lastErr
-		}
-	}
-
 	return resp, err
 }
 
