Merge branch 'main' into feat-sdk-integration

# Conflicts:
#	lib/httpapi/server.go
#	lib/httpapi/server_test.go

Author: 35C4n0r

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.7.1
+
+### Fixes
+
+- Adds headers to prevent proxies buffering SSE connections
+
 ## v0.7.0
 
 ### Features

chat/package.json

@@ -44,5 +44,5 @@
     "start": "next start",
     "storybook": "storybook dev -p 6006"
   },
-  "version": "0.7.0"
+  "version": "0.7.1"
 }

internal/version/version.go

@@ -2,4 +2,4 @@
 
 package version
 
-var Version = "0.7.0"
+var Version = "0.7.1"

lib/httpapi/server.go

@@ -254,6 +254,19 @@ func hostAuthorizationMiddleware(allowedHosts []string, badHostHandler http.Hand
 	}
 }
 
+// sseMiddleware creates middleware that prevents proxy buffering for SSE endpoints
+func sseMiddleware(ctx huma.Context, next func(huma.Context)) {
+	// Disable proxy buffering for SSE endpoints
+	ctx.SetHeader("Cache-Control", "no-cache, no-store, must-revalidate")
+	ctx.SetHeader("Pragma", "no-cache")
+	ctx.SetHeader("Expires", "0")
+	ctx.SetHeader("X-Accel-Buffering", "no") // nginx
+	ctx.SetHeader("X-Proxy-Buffering", "no") // generic proxy
+	ctx.SetHeader("Connection", "keep-alive")
+
+	next(ctx)
+}
+
 // registerRoutes sets up all API endpoints
 func (s *Server) registerRoutes() {
 	// GET /status endpoint
@@ -278,6 +291,7 @@ func (s *Server) registerRoutes() {
 		Path:        "/events",
 		Summary:     "Subscribe to events",
 		Description: "The events are sent as Server-Sent Events (SSE). Initially, the endpoint returns a list of events needed to reconstruct the current state of the conversation and the agent's status. After that, it only returns events that have occurred since the last event was sent.\n\nNote: When an agent is running, the last message in the conversation history is updated frequently, and the endpoint sends a new message update event each time.",
+		Middlewares: []func(huma.Context, func(huma.Context)){sseMiddleware},
 	}, map[string]any{
 		// Mapping of event type name to Go struct for that event.
 		"message_update": types.MessageUpdateBody{},
@@ -290,6 +304,7 @@ func (s *Server) registerRoutes() {
 		Path:        "/internal/screen",
 		Summary:     "Subscribe to screen",
 		Hidden:      true,
+		Middlewares: []func(huma.Context, func(huma.Context)){sseMiddleware},
 	}, map[string]any{
 		"screen": types.ScreenUpdateBody{},
 	}, s.AgentHandler.SubscribeConversations)

lib/httpapi/server_test.go

@@ -631,3 +631,50 @@ func TestServer_CORSPreflightOrigins(t *testing.T) {
 		})
 	}
 }
+
+func TestServer_SSEMiddleware_Events(t *testing.T) {
+	t.Parallel()
+	ctx := logctx.WithLogger(context.Background(), slog.New(slog.NewTextHandler(os.Stdout, nil)))
+	srv, err := httpapi.NewServer(ctx, httpapi.ServerConfig{
+		AgentType:      msgfmt.AgentTypeClaude,
+		Process:        nil,
+		Port:           0,
+		ChatBasePath:   "/chat",
+		AllowedHosts:   []string{"*"},
+		AllowedOrigins: []string{"*"},
+	})
+	require.NoError(t, err)
+	tsServer := httptest.NewServer(srv.Handler())
+	t.Cleanup(tsServer.Close)
+
+	t.Run("events", func(t *testing.T) {
+		t.Parallel()
+		resp, err := tsServer.Client().Get(tsServer.URL + "/events")
+		require.NoError(t, err)
+		t.Cleanup(func() {
+			_ = resp.Body.Close()
+		})
+		assertSSEHeaders(t, resp)
+	})
+
+	t.Run("internal/screen", func(t *testing.T) {
+		t.Parallel()
+
+		resp, err := tsServer.Client().Get(tsServer.URL + "/internal/screen")
+		require.NoError(t, err)
+		t.Cleanup(func() {
+			_ = resp.Body.Close()
+		})
+		assertSSEHeaders(t, resp)
+	})
+}
+
+func assertSSEHeaders(t testing.TB, resp *http.Response) {
+	t.Helper()
+	assert.Equal(t, "no-cache, no-store, must-revalidate", resp.Header.Get("Cache-Control"))
+	assert.Equal(t, "no-cache", resp.Header.Get("Pragma"))
+	assert.Equal(t, "0", resp.Header.Get("Expires"))
+	assert.Equal(t, "no", resp.Header.Get("X-Accel-Buffering"))
+	assert.Equal(t, "no", resp.Header.Get("X-Proxy-Buffering"))
+	assert.Equal(t, "keep-alive", resp.Header.Get("Connection"))
+}

openapi.json

@@ -307,7 +307,7 @@
   "info": {
     "description": "HTTP API for Claude Code, Goose, and Aider.\n\nhttps://github.com/coder/agentapi",
     "title": "AgentAPI",
-    "version": "0.7.0"
+    "version": "0.7.1"
   },
   "openapi": "3.1.0",
   "paths": {