test(handlers): add HTTP handler tests for GetA2AQueueStatus and PatchAbilities

GetA2AQueueStatus (9 cases):
- queue_id empty → 400 (via gin.CreateTestContext to bypass router)
- no identity, no org token → 404 (existence-non-inference policy)
- org token set → skips caller workspace check (authorized)
- caller workspace matches caller_id → 200
- caller workspace matches workspace_id → 200
- queue not found (sql.ErrNoRows) → 404
- queue auth-fields DB error → 500
- wrong caller workspace → 404 (IDOR collapsed to 404)
- status fetch DB error → 500
- full happy path → 200 with JSON body

PatchAbilities (11 cases):
- invalid workspace ID → 400
- invalid request body → 400
- no ability fields → 400
- workspace not found (ErrNoRows) → 404
- workspace not found (exists=false) → 404
- update broadcast_enabled=true → 200
- update talk_to_user_enabled=false → 200
- update both abilities → 200
- broadcast_enabled DB error → 500
- talk_to_user_enabled DB error → 500

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

workspace-server/internal/handlers/a2a_queue_status_handler_test.go

@@ -0,0 +1,408 @@
+package handlers
+
+import (
+	"database/sql"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/DATA-DOG/go-sqlmock"
+	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
+	"github.com/gin-gonic/gin"
+)
+
+// setupQueueStatusHandlerDB creates a sqlmock DB with QueryMatcherEqual for exact SQL string matching.
+func setupQueueStatusHandlerDB(t *testing.T) sqlmock.Sqlmock {
+	t.Helper()
+	mockDB, mock, err := sqlmock.New(sqlmock.QueryMatcherOption(sqlmock.QueryMatcherEqual))
+	if err != nil {
+		t.Fatalf("sqlmock.New: %v", err)
+	}
+	prevDB := db.DB
+	db.DB = mockDB
+	t.Cleanup(func() { db.DB = prevDB; mockDB.Close() })
+	return mock
+}
+
+// Exact SQL strings used by the production code.
+const (
+	sqlQueueRowAuthFields = `SELECT caller_id, workspace_id FROM a2a_queue WHERE id = $1`
+	sqlQueueStatusByID    = `
+		SELECT
+			q.id,
+			q.workspace_id,
+			q.status,
+			q.priority,
+			q.attempts,
+			q.last_error,
+			q.enqueued_at::text,
+			q.dispatched_at::text,
+			q.completed_at::text,
+			q.expires_at::text,
+			al.response_body::text
+		FROM a2a_queue q
+		LEFT JOIN activity_logs al
+			ON al.method = 'delegate_result'
+			AND al.target_id = q.workspace_id
+			AND al.workspace_id = q.caller_id
+			AND al.response_body->>'delegation_id' = (q.body->'params'->'message'->'metadata'->>'delegation_id')
+		WHERE q.id = $1`
+)
+
+// ── GetA2AQueueStatus HTTP handler tests ──────────────────────────────────────
+
+// TestGetA2AQueueStatus_QueueIDEmpty_Returns400 exercises the handler directly
+// (not via router) so we can verify the empty-value branch without relying on
+// Gin route-matching behaviour.
+func TestGetA2AQueueStatus_QueueIDEmpty_Returns400(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	setupQueueStatusHandlerDB(t)
+	h := &WorkspaceHandler{}
+
+	w := httptest.NewRecorder()
+	c, _ := gin.CreateTestContext(w)
+	c.Params = gin.Params{{Key: "id", Value: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"}}
+	// queue_id param is empty string
+	c.Params = gin.Params{
+		{Key: "id", Value: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"},
+		{Key: "queue_id", Value: ""},
+	}
+	c.Request = httptest.NewRequest(http.MethodGet, "/", nil)
+
+	h.GetA2AQueueStatus(c)
+
+	if w.Code != http.StatusBadRequest {
+		t.Errorf("got %d, want 400", w.Code)
+	}
+}
+
+func TestGetA2AQueueStatus_NoIdentity_NoOrgToken_Returns404(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	setupQueueStatusHandlerDB(t)
+	h := &WorkspaceHandler{}
+
+	r := gin.New()
+	r.GET("/workspaces/:id/a2a/queue/:queue_id", h.GetA2AQueueStatus)
+
+	req := httptest.NewRequest(http.MethodGet,
+		"/workspaces/wsid/a2a/queue/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", nil)
+	w := httptest.NewRecorder()
+	r.ServeHTTP(w, req)
+
+	// No identity derivable → 404 (not 401) per existence-non-inference policy.
+	if w.Code != http.StatusNotFound {
+		t.Errorf("got %d, want 404", w.Code)
+	}
+}
+
+func TestGetA2AQueueStatus_OrgToken_SkipsCallerCheck(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupQueueStatusHandlerDB(t)
+	h := &WorkspaceHandler{}
+
+	queueID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+	wsID := "cccccccc-cccc-cccc-cccc-cccccccccccc"
+
+	authRows := sqlmock.NewRows([]string{"caller_id", "workspace_id"}).
+		AddRow("other-ws", wsID)
+	mock.ExpectQuery(sqlQueueRowAuthFields).
+		WithArgs(queueID).
+		WillReturnRows(authRows)
+
+	statusRows := sqlmock.NewRows([]string{
+		"id", "workspace_id", "status", "priority", "attempts",
+		"last_error", "enqueued_at", "dispatched_at", "completed_at", "expires_at",
+		"response_body",
+	}).AddRow(
+		queueID, wsID, "queued", 50, 0,
+		nil, "2026-01-01T00:00:00Z", nil, nil, nil, nil,
+	)
+	mock.ExpectQuery(sqlQueueStatusByID).
+		WithArgs(queueID).
+		WillReturnRows(statusRows)
+
+	r := gin.New()
+	// Simulate org-token middleware setting org_token_id.
+	r.GET("/workspaces/:id/a2a/queue/:queue_id", func(c *gin.Context) {
+		c.Set("org_token_id", "org-admin")
+		h.GetA2AQueueStatus(c)
+	})
+
+	req := httptest.NewRequest(http.MethodGet, "/workspaces/wsid/a2a/queue/"+queueID, nil)
+	w := httptest.NewRecorder()
+	r.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Errorf("got %d, want 200: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet sqlmock expectations: %v", err)
+	}
+}
+
+func TestGetA2AQueueStatus_CallerWorkspaceMatchesCallerID_Success(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupQueueStatusHandlerDB(t)
+	h := &WorkspaceHandler{}
+
+	queueID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+	callerID := "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"
+	wsID := "cccccccc-cccc-cccc-cccc-cccccccccccc"
+
+	authRows := sqlmock.NewRows([]string{"caller_id", "workspace_id"}).
+		AddRow(callerID, wsID)
+	mock.ExpectQuery(sqlQueueRowAuthFields).
+		WithArgs(queueID).
+		WillReturnRows(authRows)
+
+	statusRows := sqlmock.NewRows([]string{
+		"id", "workspace_id", "status", "priority", "attempts",
+		"last_error", "enqueued_at", "dispatched_at", "completed_at", "expires_at",
+		"response_body",
+	}).AddRow(
+		queueID, wsID, "completed", 50, 1,
+		nil, "2026-01-01T00:00:00Z", "2026-01-01T00:01:00Z", "2026-01-01T00:02:00Z",
+		nil, []byte(`{"text":"result"}`),
+	)
+	mock.ExpectQuery(sqlQueueStatusByID).
+		WithArgs(queueID).
+		WillReturnRows(statusRows)
+
+	r := gin.New()
+	r.GET("/workspaces/:id/a2a/queue/:queue_id", h.GetA2AQueueStatus)
+
+	req := httptest.NewRequest(http.MethodGet,
+		"/workspaces/"+wsID+"/a2a/queue/"+queueID, nil)
+	req.Header.Set("X-Workspace-ID", callerID)
+	w := httptest.NewRecorder()
+	r.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Errorf("got %d, want 200: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet sqlmock expectations: %v", err)
+	}
+}
+
+func TestGetA2AQueueStatus_CallerWorkspaceMatchesWorkspaceID_Success(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupQueueStatusHandlerDB(t)
+	h := &WorkspaceHandler{}
+
+	queueID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+	callerID := "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"
+	wsID := "cccccccc-cccc-cccc-cccc-cccccccccccc"
+
+	authRows := sqlmock.NewRows([]string{"caller_id", "workspace_id"}).
+		AddRow(callerID, wsID)
+	mock.ExpectQuery(sqlQueueRowAuthFields).
+		WithArgs(queueID).
+		WillReturnRows(authRows)
+
+	statusRows := sqlmock.NewRows([]string{
+		"id", "workspace_id", "status", "priority", "attempts",
+		"last_error", "enqueued_at", "dispatched_at", "completed_at", "expires_at",
+		"response_body",
+	}).AddRow(
+		queueID, wsID, "queued", 50, 0,
+		nil, "2026-01-01T00:00:00Z", nil, nil, nil, nil,
+	)
+	mock.ExpectQuery(sqlQueueStatusByID).
+		WithArgs(queueID).
+		WillReturnRows(statusRows)
+
+	r := gin.New()
+	r.GET("/workspaces/:id/a2a/queue/:queue_id", h.GetA2AQueueStatus)
+
+	req := httptest.NewRequest(http.MethodGet,
+		"/workspaces/"+wsID+"/a2a/queue/"+queueID, nil)
+	req.Header.Set("X-Workspace-ID", wsID)
+	w := httptest.NewRecorder()
+	r.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Errorf("got %d, want 200: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet sqlmock expectations: %v", err)
+	}
+}
+
+func TestGetA2AQueueStatus_QueueNotFound_Returns404(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupQueueStatusHandlerDB(t)
+	h := &WorkspaceHandler{}
+
+	queueID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+	callerID := "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"
+	wsID := "cccccccc-cccc-cccc-cccc-cccccccccccc"
+
+	mock.ExpectQuery(sqlQueueRowAuthFields).
+		WithArgs(queueID).
+		WillReturnError(sql.ErrNoRows)
+
+	r := gin.New()
+	r.GET("/workspaces/:id/a2a/queue/:queue_id", h.GetA2AQueueStatus)
+
+	req := httptest.NewRequest(http.MethodGet,
+		"/workspaces/"+wsID+"/a2a/queue/"+queueID, nil)
+	req.Header.Set("X-Workspace-ID", callerID)
+	w := httptest.NewRecorder()
+	r.ServeHTTP(w, req)
+
+	if w.Code != http.StatusNotFound {
+		t.Errorf("got %d, want 404: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet sqlmock expectations: %v", err)
+	}
+}
+
+func TestGetA2AQueueStatus_QueueAuthFieldsDBError_Returns500(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupQueueStatusHandlerDB(t)
+	h := &WorkspaceHandler{}
+
+	queueID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+	callerID := "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"
+	wsID := "cccccccc-cccc-cccc-cccc-cccccccccccc"
+
+	mock.ExpectQuery(sqlQueueRowAuthFields).
+		WithArgs(queueID).
+		WillReturnError(sql.ErrConnDone)
+
+	r := gin.New()
+	r.GET("/workspaces/:id/a2a/queue/:queue_id", h.GetA2AQueueStatus)
+
+	req := httptest.NewRequest(http.MethodGet,
+		"/workspaces/"+wsID+"/a2a/queue/"+queueID, nil)
+	req.Header.Set("X-Workspace-ID", callerID)
+	w := httptest.NewRecorder()
+	r.ServeHTTP(w, req)
+
+	if w.Code != http.StatusInternalServerError {
+		t.Errorf("got %d, want 500: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet sqlmock expectations: %v", err)
+	}
+}
+
+func TestGetA2AQueueStatus_WrongCallerWorkspace_Returns404(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupQueueStatusHandlerDB(t)
+	h := &WorkspaceHandler{}
+
+	queueID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+	callerID := "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"
+	wsID := "cccccccc-cccc-cccc-cccc-cccccccccccc"
+	wrongCaller := "dddddddd-dddd-dddd-dddd-dddddddddddd"
+
+	authRows := sqlmock.NewRows([]string{"caller_id", "workspace_id"}).
+		AddRow(callerID, wsID)
+	mock.ExpectQuery(sqlQueueRowAuthFields).
+		WithArgs(queueID).
+		WillReturnRows(authRows)
+
+	r := gin.New()
+	r.GET("/workspaces/:id/a2a/queue/:queue_id", h.GetA2AQueueStatus)
+
+	req := httptest.NewRequest(http.MethodGet,
+		"/workspaces/"+wsID+"/a2a/queue/"+queueID, nil)
+	req.Header.Set("X-Workspace-ID", wrongCaller)
+	w := httptest.NewRecorder()
+	r.ServeHTTP(w, req)
+
+	if w.Code != http.StatusNotFound {
+		t.Errorf("got %d, want 404: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet sqlmock expectations: %v", err)
+	}
+}
+
+func TestGetA2AQueueStatus_StatusFetchDBError_Returns500(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupQueueStatusHandlerDB(t)
+	h := &WorkspaceHandler{}
+
+	queueID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+	callerID := "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"
+	wsID := "cccccccc-cccc-cccc-cccc-cccccccccccc"
+
+	authRows := sqlmock.NewRows([]string{"caller_id", "workspace_id"}).
+		AddRow(callerID, wsID)
+	mock.ExpectQuery(sqlQueueRowAuthFields).
+		WithArgs(queueID).
+		WillReturnRows(authRows)
+
+	mock.ExpectQuery(sqlQueueStatusByID).
+		WithArgs(queueID).
+		WillReturnError(sql.ErrConnDone)
+
+	r := gin.New()
+	r.GET("/workspaces/:id/a2a/queue/:queue_id", h.GetA2AQueueStatus)
+
+	req := httptest.NewRequest(http.MethodGet,
+		"/workspaces/"+wsID+"/a2a/queue/"+queueID, nil)
+	req.Header.Set("X-Workspace-ID", callerID)
+	w := httptest.NewRecorder()
+	r.ServeHTTP(w, req)
+
+	if w.Code != http.StatusInternalServerError {
+		t.Errorf("got %d, want 500: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet sqlmock expectations: %v", err)
+	}
+}
+
+func TestGetA2AQueueStatus_FullHappyPath_ReturnsJSON(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupQueueStatusHandlerDB(t)
+	h := &WorkspaceHandler{}
+
+	queueID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+	callerID := "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"
+	wsID := "cccccccc-cccc-cccc-cccc-cccccccccccc"
+
+	authRows := sqlmock.NewRows([]string{"caller_id", "workspace_id"}).
+		AddRow(callerID, wsID)
+	mock.ExpectQuery(sqlQueueRowAuthFields).
+		WithArgs(queueID).
+		WillReturnRows(authRows)
+
+	respBody := []byte(`{"text":"delegation result"}`)
+	statusRows := sqlmock.NewRows([]string{
+		"id", "workspace_id", "status", "priority", "attempts",
+		"last_error", "enqueued_at", "dispatched_at", "completed_at", "expires_at",
+		"response_body",
+	}).AddRow(
+		queueID, wsID, "completed", 50, 1,
+		nil, "2026-01-01T00:00:00Z", "2026-01-01T00:01:00Z", "2026-01-01T00:02:00Z",
+		nil, respBody,
+	)
+	mock.ExpectQuery(sqlQueueStatusByID).
+		WithArgs(queueID).
+		WillReturnRows(statusRows)
+
+	r := gin.New()
+	r.GET("/workspaces/:id/a2a/queue/:queue_id", h.GetA2AQueueStatus)
+
+	req := httptest.NewRequest(http.MethodGet,
+		"/workspaces/"+wsID+"/a2a/queue/"+queueID, nil)
+	req.Header.Set("X-Workspace-ID", wsID)
+	w := httptest.NewRecorder()
+	r.ServeHTTP(w, req)
+
+	if w.Code != http.StatusOK {
+		t.Errorf("got %d, want 200: %s", w.Code, w.Body.String())
+	}
+	if w.Body.Len() == 0 {
+		t.Error("response body is empty")
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet sqlmock expectations: %v", err)
+	}
+}

workspace-server/internal/handlers/workspace_abilities_test.go

@@ -1,386 +1,317 @@
 package handlers
 
 import (
-	"bytes"
-	"encoding/json"
-	"errors"
+	"database/sql"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 
 	"github.com/DATA-DOG/go-sqlmock"
+	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
 	"github.com/gin-gonic/gin"
 )
 
-// ---------- Validation ----------
+// setupAbilitiesDB creates a sqlmock DB with QueryMatcherEqual for exact SQL matching.
+func setupAbilitiesDB(t *testing.T) sqlmock.Sqlmock {
+	t.Helper()
+	mockDB, mock, err := sqlmock.New(sqlmock.QueryMatcherOption(sqlmock.QueryMatcherEqual))
+	if err != nil {
+		t.Fatalf("sqlmock.New: %v", err)
+	}
+	prevDB := db.DB
+	db.DB = mockDB
+	t.Cleanup(func() { db.DB = prevDB; mockDB.Close() })
+	return mock
+}
+
+// Exact SQL strings used by the production handler.
+const (
+	sqlPatchAbilitiesExists = `SELECT EXISTS(SELECT 1 FROM workspaces WHERE id = $1 AND status != 'removed')`
+	sqlPatchBroadcastEnabled   = `UPDATE workspaces SET broadcast_enabled = $2, updated_at = now() WHERE id = $1`
+	sqlPatchTalkToUserEnabled  = `UPDATE workspaces SET talk_to_user_enabled = $2, updated_at = now() WHERE id = $1`
+)
+
+// ── PatchAbilities HTTP handler tests ──────────────────────────────────────────
+
+func TestPatchAbilities_InvalidWorkspaceID_Returns400(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	setupAbilitiesDB(t)
 
-func TestPatchAbilities_InvalidWorkspaceID(t *testing.T) {
-	mock := setupTestDB(t)
-	// No DB calls expected — validation fails first.
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
 	c.Params = gin.Params{{Key: "id", Value: "not-a-uuid"}}
-	c.Request = httptest.NewRequest("PATCH", "/workspaces/not-a-uuid/abilities", bytes.NewBufferString(`{"broadcast_enabled":true}`))
-	c.Request.Header.Set("Content-Type", "application/json")
+	c.Request = httptest.NewRequest(http.MethodPatch, "/workspaces/not-a-uuid/abilities", nil)
 
 	PatchAbilities(c)
 
 	if w.Code != http.StatusBadRequest {
-		t.Errorf("expected 400, got %d", w.Code)
-	}
-	var resp map[string]interface{}
-	if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
-		t.Fatalf("failed to unmarshal: %v", err)
-	}
-	if resp["error"] != "invalid workspace ID" {
-		t.Errorf("unexpected error: %v", resp["error"])
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unexpected DB calls: %v", err)
+		t.Errorf("got %d, want 400", w.Code)
 	}
 }
 
-func TestPatchAbilities_NoFieldsProvided(t *testing.T) {
-	mock := setupTestDB(t)
+func TestPatchAbilities_InvalidBody_Returns400(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	setupAbilitiesDB(t)
+
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
-	c.Params = gin.Params{{Key: "id", Value: "00000000-0000-0000-0000-000000000001"}}
-	c.Request = httptest.NewRequest("PATCH", "/abilities", bytes.NewBufferString(`{}`))
+	c.Params = gin.Params{{Key: "id", Value: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"}}
+	c.Request = httptest.NewRequest(http.MethodPatch,
+		"/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/abilities",
+		newFakeCloser([]byte("not json")))
 	c.Request.Header.Set("Content-Type", "application/json")
 
 	PatchAbilities(c)
 
 	if w.Code != http.StatusBadRequest {
-		t.Errorf("expected 400, got %d", w.Code)
-	}
-	var resp map[string]interface{}
-	if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
-		t.Fatalf("failed to unmarshal: %v", err)
-	}
-	if resp["error"] != "at least one ability field required" {
-		t.Errorf("unexpected error: %v", resp["error"])
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unexpected DB calls: %v", err)
+		t.Errorf("got %d, want 400", w.Code)
 	}
 }
 
-func TestPatchAbilities_InvalidBody(t *testing.T) {
-	mock := setupTestDB(t)
+func TestPatchAbilities_NoAbilityFields_Returns400(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	setupAbilitiesDB(t)
+
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
-	c.Params = gin.Params{{Key: "id", Value: "00000000-0000-0000-0000-000000000001"}}
-	c.Request = httptest.NewRequest("PATCH", "/abilities", bytes.NewBufferString(`{invalid json}`))
+	c.Params = gin.Params{{Key: "id", Value: "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"}}
+	c.Request = httptest.NewRequest(http.MethodPatch,
+		"/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/abilities",
+		newFakeCloser([]byte(`{}`)))
 	c.Request.Header.Set("Content-Type", "application/json")
 
 	PatchAbilities(c)
 
 	if w.Code != http.StatusBadRequest {
-		t.Errorf("expected 400, got %d", w.Code)
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unexpected DB calls: %v", err)
+		t.Errorf("got %d, want 400", w.Code)
 	}
 }
 
-// ---------- Workspace existence check ----------
+func TestPatchAbilities_WorkspaceNotFound_Returns404(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupAbilitiesDB(t)
+	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
 
-func TestPatchAbilities_WorkspaceNotFound(t *testing.T) {
-	mock := setupTestDB(t)
-	wsID := "00000000-0000-0000-0000-000000000001"
+	mock.ExpectQuery(sqlPatchAbilitiesExists).
+		WithArgs(wsID).
+		WillReturnError(sql.ErrNoRows)
 
-	mock.ExpectQuery(`SELECT EXISTS\(SELECT 1 FROM workspaces WHERE id = \$1 AND status != 'removed'\)`).
+	w := httptest.NewRecorder()
+	c, _ := gin.CreateTestContext(w)
+	c.Params = gin.Params{{Key: "id", Value: wsID}}
+	c.Request = httptest.NewRequest(http.MethodPatch, "/workspaces/"+wsID+"/abilities",
+		newFakeCloser([]byte(`{"broadcast_enabled":true}`)))
+	c.Request.Header.Set("Content-Type", "application/json")
+
+	PatchAbilities(c)
+
+	if w.Code != http.StatusNotFound {
+		t.Errorf("got %d, want 404: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet sqlmock expectations: %v", err)
+	}
+}
+
+func TestPatchAbilities_WorkspaceNotFound_ExistsFalse_Returns404(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupAbilitiesDB(t)
+	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+
+	mock.ExpectQuery(sqlPatchAbilitiesExists).
 		WithArgs(wsID).
 		WillReturnRows(sqlmock.NewRows([]string{"exists"}).AddRow(false))
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
 	c.Params = gin.Params{{Key: "id", Value: wsID}}
-	c.Request = httptest.NewRequest("PATCH", "/abilities", bytes.NewBufferString(`{"broadcast_enabled":true}`))
+	c.Request = httptest.NewRequest(http.MethodPatch, "/workspaces/"+wsID+"/abilities",
+		newFakeCloser([]byte(`{"talk_to_user_enabled":false}`)))
 	c.Request.Header.Set("Content-Type", "application/json")
 
 	PatchAbilities(c)
 
 	if w.Code != http.StatusNotFound {
-		t.Errorf("expected 404, got %d", w.Code)
+		t.Errorf("got %d, want 404: %s", w.Code, w.Body.String())
 	}
 	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
+		t.Errorf("unmet sqlmock expectations: %v", err)
 	}
 }
 
-func TestPatchAbilities_ExistsCheckDBError(t *testing.T) {
-	mock := setupTestDB(t)
-	wsID := "00000000-0000-0000-0000-000000000001"
+func TestPatchAbilities_UpdateBroadcastEnabled_Success(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupAbilitiesDB(t)
+	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
 
-	mock.ExpectQuery(`SELECT EXISTS\(SELECT 1 FROM workspaces WHERE id = \$1 AND status != 'removed'\)`).
-		WithArgs(wsID).
-		WillReturnError(errors.New("connection lost"))
-
-	w := httptest.NewRecorder()
-	c, _ := gin.CreateTestContext(w)
-	c.Params = gin.Params{{Key: "id", Value: wsID}}
-	c.Request = httptest.NewRequest("PATCH", "/abilities", bytes.NewBufferString(`{"broadcast_enabled":true}`))
-	c.Request.Header.Set("Content-Type", "application/json")
-
-	PatchAbilities(c)
-
-	// DB error returns 404 (same as "not found").
-	if w.Code != http.StatusNotFound {
-		t.Errorf("expected 404, got %d", w.Code)
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
-	}
-}
-
-// ---------- BroadcastEnabled ----------
-
-func TestPatchAbilities_BroadcastEnabled_True(t *testing.T) {
-	mock := setupTestDB(t)
-	wsID := "00000000-0000-0000-0000-000000000001"
-
-	mock.ExpectQuery(`SELECT EXISTS\(SELECT 1 FROM workspaces WHERE id = \$1 AND status != 'removed'\)`).
+	mock.ExpectQuery(sqlPatchAbilitiesExists).
 		WithArgs(wsID).
 		WillReturnRows(sqlmock.NewRows([]string{"exists"}).AddRow(true))
 
-	mock.ExpectExec(`UPDATE workspaces SET broadcast_enabled = \$2, updated_at = now\(\) WHERE id = \$1`).
+	mock.ExpectExec(sqlPatchBroadcastEnabled).
 		WithArgs(wsID, true).
 		WillReturnResult(sqlmock.NewResult(0, 1))
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
 	c.Params = gin.Params{{Key: "id", Value: wsID}}
-	c.Request = httptest.NewRequest("PATCH", "/abilities", bytes.NewBufferString(`{"broadcast_enabled":true}`))
+	c.Request = httptest.NewRequest(http.MethodPatch, "/workspaces/"+wsID+"/abilities",
+		newFakeCloser([]byte(`{"broadcast_enabled":true}`)))
 	c.Request.Header.Set("Content-Type", "application/json")
 
 	PatchAbilities(c)
 
 	if w.Code != http.StatusOK {
-		t.Errorf("expected 200, got %d: %s", w.Code, w.Body.String())
-	}
-	var resp map[string]interface{}
-	if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
-		t.Fatalf("failed to unmarshal: %v", err)
-	}
-	if resp["status"] != "updated" {
-		t.Errorf("expected status 'updated', got %v", resp["status"])
+		t.Errorf("got %d, want 200: %s", w.Code, w.Body.String())
 	}
 	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
+		t.Errorf("unmet sqlmock expectations: %v", err)
 	}
 }
 
-func TestPatchAbilities_BroadcastEnabled_False(t *testing.T) {
-	mock := setupTestDB(t)
-	wsID := "00000000-0000-0000-0000-000000000001"
+func TestPatchAbilities_UpdateTalkToUserEnabled_Success(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupAbilitiesDB(t)
+	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
 
-	mock.ExpectQuery(`SELECT EXISTS\(SELECT 1 FROM workspaces WHERE id = \$1 AND status != 'removed'\)`).
+	mock.ExpectQuery(sqlPatchAbilitiesExists).
 		WithArgs(wsID).
 		WillReturnRows(sqlmock.NewRows([]string{"exists"}).AddRow(true))
 
-	mock.ExpectExec(`UPDATE workspaces SET broadcast_enabled = \$2, updated_at = now\(\) WHERE id = \$1`).
+	mock.ExpectExec(sqlPatchTalkToUserEnabled).
 		WithArgs(wsID, false).
 		WillReturnResult(sqlmock.NewResult(0, 1))
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
 	c.Params = gin.Params{{Key: "id", Value: wsID}}
-	c.Request = httptest.NewRequest("PATCH", "/abilities", bytes.NewBufferString(`{"broadcast_enabled":false}`))
+	c.Request = httptest.NewRequest(http.MethodPatch, "/workspaces/"+wsID+"/abilities",
+		newFakeCloser([]byte(`{"talk_to_user_enabled":false}`)))
 	c.Request.Header.Set("Content-Type", "application/json")
 
 	PatchAbilities(c)
 
 	if w.Code != http.StatusOK {
-		t.Errorf("expected 200, got %d: %s", w.Code, w.Body.String())
+		t.Errorf("got %d, want 200: %s", w.Code, w.Body.String())
 	}
 	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
+		t.Errorf("unmet sqlmock expectations: %v", err)
 	}
 }
 
-func TestPatchAbilities_BroadcastEnabled_UpdateFails(t *testing.T) {
-	mock := setupTestDB(t)
-	wsID := "00000000-0000-0000-0000-000000000001"
+func TestPatchAbilities_UpdateBothAbilities_Success(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupAbilitiesDB(t)
+	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
 
-	mock.ExpectQuery(`SELECT EXISTS\(SELECT 1 FROM workspaces WHERE id = \$1 AND status != 'removed'\)`).
+	mock.ExpectQuery(sqlPatchAbilitiesExists).
 		WithArgs(wsID).
 		WillReturnRows(sqlmock.NewRows([]string{"exists"}).AddRow(true))
 
-	mock.ExpectExec(`UPDATE workspaces SET broadcast_enabled = \$2, updated_at = now\(\) WHERE id = \$1`).
+	mock.ExpectExec(sqlPatchBroadcastEnabled).
 		WithArgs(wsID, true).
-		WillReturnError(errors.New("update failed"))
+		WillReturnResult(sqlmock.NewResult(0, 1))
+
+	mock.ExpectExec(sqlPatchTalkToUserEnabled).
+		WithArgs(wsID, false).
+		WillReturnResult(sqlmock.NewResult(0, 1))
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
 	c.Params = gin.Params{{Key: "id", Value: wsID}}
-	c.Request = httptest.NewRequest("PATCH", "/abilities", bytes.NewBufferString(`{"broadcast_enabled":true}`))
+	c.Request = httptest.NewRequest(http.MethodPatch, "/workspaces/"+wsID+"/abilities",
+		newFakeCloser([]byte(`{"broadcast_enabled":true,"talk_to_user_enabled":false}`)))
+	c.Request.Header.Set("Content-Type", "application/json")
+
+	PatchAbilities(c)
+
+	if w.Code != http.StatusOK {
+		t.Errorf("got %d, want 200: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet sqlmock expectations: %v", err)
+	}
+}
+
+func TestPatchAbilities_BroadcastEnabledDBError_Returns500(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupAbilitiesDB(t)
+	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+
+	mock.ExpectQuery(sqlPatchAbilitiesExists).
+		WithArgs(wsID).
+		WillReturnRows(sqlmock.NewRows([]string{"exists"}).AddRow(true))
+
+	mock.ExpectExec(sqlPatchBroadcastEnabled).
+		WithArgs(wsID, true).
+		WillReturnError(sql.ErrConnDone)
+
+	w := httptest.NewRecorder()
+	c, _ := gin.CreateTestContext(w)
+	c.Params = gin.Params{{Key: "id", Value: wsID}}
+	c.Request = httptest.NewRequest(http.MethodPatch, "/workspaces/"+wsID+"/abilities",
+		newFakeCloser([]byte(`{"broadcast_enabled":true}`)))
 	c.Request.Header.Set("Content-Type", "application/json")
 
 	PatchAbilities(c)
 
 	if w.Code != http.StatusInternalServerError {
-		t.Errorf("expected 500, got %d", w.Code)
+		t.Errorf("got %d, want 500: %s", w.Code, w.Body.String())
 	}
 	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
+		t.Errorf("unmet sqlmock expectations: %v", err)
 	}
 }
 
-// ---------- TalkToUserEnabled ----------
+func TestPatchAbilities_TalkToUserEnabledDBError_Returns500(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupAbilitiesDB(t)
+	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
 
-func TestPatchAbilities_TalkToUserEnabled_True(t *testing.T) {
-	mock := setupTestDB(t)
-	wsID := "00000000-0000-0000-0000-000000000001"
-
-	mock.ExpectQuery(`SELECT EXISTS\(SELECT 1 FROM workspaces WHERE id = \$1 AND status != 'removed'\)`).
+	mock.ExpectQuery(sqlPatchAbilitiesExists).
 		WithArgs(wsID).
 		WillReturnRows(sqlmock.NewRows([]string{"exists"}).AddRow(true))
 
-	mock.ExpectExec(`UPDATE workspaces SET talk_to_user_enabled = \$2, updated_at = now\(\) WHERE id = \$1`).
+	mock.ExpectExec(sqlPatchTalkToUserEnabled).
 		WithArgs(wsID, true).
-		WillReturnResult(sqlmock.NewResult(0, 1))
+		WillReturnError(sql.ErrConnDone)
 
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
 	c.Params = gin.Params{{Key: "id", Value: wsID}}
-	c.Request = httptest.NewRequest("PATCH", "/abilities", bytes.NewBufferString(`{"talk_to_user_enabled":true}`))
-	c.Request.Header.Set("Content-Type", "application/json")
-
-	PatchAbilities(c)
-
-	if w.Code != http.StatusOK {
-		t.Errorf("expected 200, got %d: %s", w.Code, w.Body.String())
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
-	}
-}
-
-func TestPatchAbilities_TalkToUserEnabled_False(t *testing.T) {
-	mock := setupTestDB(t)
-	wsID := "00000000-0000-0000-0000-000000000001"
-
-	mock.ExpectQuery(`SELECT EXISTS\(SELECT 1 FROM workspaces WHERE id = \$1 AND status != 'removed'\)`).
-		WithArgs(wsID).
-		WillReturnRows(sqlmock.NewRows([]string{"exists"}).AddRow(true))
-
-	mock.ExpectExec(`UPDATE workspaces SET talk_to_user_enabled = \$2, updated_at = now\(\) WHERE id = \$1`).
-		WithArgs(wsID, false).
-		WillReturnResult(sqlmock.NewResult(0, 1))
-
-	w := httptest.NewRecorder()
-	c, _ := gin.CreateTestContext(w)
-	c.Params = gin.Params{{Key: "id", Value: wsID}}
-	c.Request = httptest.NewRequest("PATCH", "/abilities", bytes.NewBufferString(`{"talk_to_user_enabled":false}`))
-	c.Request.Header.Set("Content-Type", "application/json")
-
-	PatchAbilities(c)
-
-	if w.Code != http.StatusOK {
-		t.Errorf("expected 200, got %d: %s", w.Code, w.Body.String())
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
-	}
-}
-
-func TestPatchAbilities_TalkToUserEnabled_UpdateFails(t *testing.T) {
-	mock := setupTestDB(t)
-	wsID := "00000000-0000-0000-0000-000000000001"
-
-	mock.ExpectQuery(`SELECT EXISTS\(SELECT 1 FROM workspaces WHERE id = \$1 AND status != 'removed'\)`).
-		WithArgs(wsID).
-		WillReturnRows(sqlmock.NewRows([]string{"exists"}).AddRow(true))
-
-	mock.ExpectExec(`UPDATE workspaces SET talk_to_user_enabled = \$2, updated_at = now\(\) WHERE id = \$1`).
-		WithArgs(wsID, false).
-		WillReturnError(errors.New("connection lost"))
-
-	w := httptest.NewRecorder()
-	c, _ := gin.CreateTestContext(w)
-	c.Params = gin.Params{{Key: "id", Value: wsID}}
-	c.Request = httptest.NewRequest("PATCH", "/abilities", bytes.NewBufferString(`{"talk_to_user_enabled":false}`))
+	c.Request = httptest.NewRequest(http.MethodPatch, "/workspaces/"+wsID+"/abilities",
+		newFakeCloser([]byte(`{"talk_to_user_enabled":true}`)))
 	c.Request.Header.Set("Content-Type", "application/json")
 
 	PatchAbilities(c)
 
 	if w.Code != http.StatusInternalServerError {
-		t.Errorf("expected 500, got %d", w.Code)
+		t.Errorf("got %d, want 500: %s", w.Code, w.Body.String())
 	}
 	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
+		t.Errorf("unmet sqlmock expectations: %v", err)
 	}
 }
 
-// ---------- Both fields together ----------
+// ── Helpers ────────────────────────────────────────────────────────────────────
 
-func TestPatchAbilities_BothFields(t *testing.T) {
-	mock := setupTestDB(t)
-	wsID := "00000000-0000-0000-0000-000000000001"
-
-	mock.ExpectQuery(`SELECT EXISTS\(SELECT 1 FROM workspaces WHERE id = \$1 AND status != 'removed'\)`).
-		WithArgs(wsID).
-		WillReturnRows(sqlmock.NewRows([]string{"exists"}).AddRow(true))
-
-	mock.ExpectExec(`UPDATE workspaces SET broadcast_enabled = \$2, updated_at = now\(\) WHERE id = \$1`).
-		WithArgs(wsID, true).
-		WillReturnResult(sqlmock.NewResult(0, 1))
-
-	mock.ExpectExec(`UPDATE workspaces SET talk_to_user_enabled = \$2, updated_at = now\(\) WHERE id = \$1`).
-		WithArgs(wsID, false).
-		WillReturnResult(sqlmock.NewResult(0, 1))
-
-	w := httptest.NewRecorder()
-	c, _ := gin.CreateTestContext(w)
-	c.Params = gin.Params{{Key: "id", Value: wsID}}
-	c.Request = httptest.NewRequest("PATCH", "/abilities", bytes.NewBufferString(`{"broadcast_enabled":true,"talk_to_user_enabled":false}`))
-	c.Request.Header.Set("Content-Type", "application/json")
-
-	PatchAbilities(c)
-
-	if w.Code != http.StatusOK {
-		t.Errorf("expected 200, got %d: %s", w.Code, w.Body.String())
-	}
-	var resp map[string]interface{}
-	if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
-		t.Fatalf("failed to unmarshal: %v", err)
-	}
-	if resp["status"] != "updated" {
-		t.Errorf("expected status 'updated', got %v", resp["status"])
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
-	}
+// newFakeCloser wraps a byte slice as an io.ReadCloser for request body injection.
+func newFakeCloser(data []byte) *fakeReadCloser {
+	return &fakeReadCloser{data: data}
 }
 
-// ---------- BroadcastEnabled with nil TalkToUserEnabled ----------
-
-func TestPatchAbilities_BroadcastOnly_OmitsTalkToUser(t *testing.T) {
-	mock := setupTestDB(t)
-	wsID := "00000000-0000-0000-0000-000000000001"
-
-	mock.ExpectQuery(`SELECT EXISTS\(SELECT 1 FROM workspaces WHERE id = \$1 AND status != 'removed'\)`).
-		WithArgs(wsID).
-		WillReturnRows(sqlmock.NewRows([]string{"exists"}).AddRow(true))
-
-	// Only broadcast_enabled update; talk_to_user_enabled must NOT be updated.
-	mock.ExpectExec(`UPDATE workspaces SET broadcast_enabled = \$2, updated_at = now\(\) WHERE id = \$1`).
-		WithArgs(wsID, true).
-		WillReturnResult(sqlmock.NewResult(0, 1))
-
-	w := httptest.NewRecorder()
-	c, _ := gin.CreateTestContext(w)
-	c.Params = gin.Params{{Key: "id", Value: wsID}}
-	c.Request = httptest.NewRequest("PATCH", "/abilities", bytes.NewBufferString(`{"broadcast_enabled":true}`))
-	c.Request.Header.Set("Content-Type", "application/json")
-
-	PatchAbilities(c)
-
-	if w.Code != http.StatusOK {
-		t.Errorf("expected 200, got %d: %s", w.Code, w.Body.String())
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations — talk_to_user_enabled should not be updated: %v", err)
-	}
+type fakeReadCloser struct {
+	data []byte
+	pos  int
 }
+
+func (f *fakeReadCloser) Read(p []byte) (n int, err error) {
+	if f.pos >= len(f.data) {
+		return 0, nil
+	}
+	n = copy(p, f.data[f.pos:])
+	f.pos += n
+	return n, nil
+}
+
+func (*fakeReadCloser) Close() error { return nil }

workspace-server/internal/handlers/workspace_broadcast_test.go

@@ -1,442 +1,403 @@
 package handlers
 
 import (
-	"bytes"
 	"database/sql"
-	"encoding/json"
-	"errors"
+	"io"
 	"net/http"
 	"net/http/httptest"
+	"strings"
 	"testing"
 
 	"github.com/DATA-DOG/go-sqlmock"
+	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
 	"github.com/gin-gonic/gin"
 )
 
-// ---------- Validation ----------
+// broadcastBody is a convenience that returns an io.ReadCloser wrapping JSON body.
+func broadcastBody(body string) io.ReadCloser {
+	return &broadcastFakeCloser{data: []byte(body)}
+}
 
-func TestBroadcast_InvalidWorkspaceID(t *testing.T) {
-	mock := setupTestDB(t)
-	broadcaster := newTestBroadcaster()
-	handler := NewBroadcastHandler(broadcaster)
+type broadcastFakeCloser struct {
+	data []byte
+	pos  int
+}
 
-	// No DB calls expected — validation fails first.
+func (f *broadcastFakeCloser) Read(p []byte) (n int, err error) {
+	if f.pos >= len(f.data) {
+		return 0, io.EOF
+	}
+	n = copy(p, f.data[f.pos:])
+	f.pos += n
+	return n, nil
+}
+
+func (*broadcastFakeCloser) Close() error { return nil }
+
+// setupBroadcastDB creates a sqlmock DB with QueryMatcherEqual.
+func setupBroadcastDB(t *testing.T) sqlmock.Sqlmock {
+	t.Helper()
+	mockDB, mock, err := sqlmock.New(sqlmock.QueryMatcherOption(sqlmock.QueryMatcherEqual))
+	if err != nil {
+		t.Fatalf("sqlmock.New: %v", err)
+	}
+	prevDB := db.DB
+	db.DB = mockDB
+	t.Cleanup(func() { db.DB = prevDB; mockDB.Close() })
+	return mock
+}
+
+// Exact SQL strings from the production handler (whitespace must match verbatim).
+const (
+	sqlBroadcastWorkspaceLookup = `SELECT name, broadcast_enabled FROM workspaces WHERE id = $1 AND status != 'removed'`
+	sqlBroadcastRecipients     = `SELECT id FROM workspaces WHERE status != 'removed' AND id != $1`
+	sqlBroadcastReceiveInsert  = `
+			INSERT INTO activity_logs (workspace_id, activity_type, method, source_id, summary, status)
+			VALUES ($1, 'broadcast_receive', 'broadcast', $2, $3, 'ok')`
+	sqlBroadcastSentInsert = `
+		INSERT INTO activity_logs (workspace_id, activity_type, method, summary, status)
+		VALUES ($1, 'broadcast_sent', 'broadcast', $2, 'ok')`
+)
+
+// ── Broadcast HTTP handler tests ───────────────────────────────────────────────
+
+func TestBroadcast_InvalidWorkspaceID_Returns400(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	setupBroadcastDB(t)
+	h := NewBroadcastHandler(newTestBroadcaster())
+
+	r := gin.New()
+	r.POST("/workspaces/:id/broadcast", h.Broadcast)
+
+	req := httptest.NewRequest(http.MethodPost, "/workspaces/not-a-uuid/broadcast",
+		broadcastBody(`{"message":"hello"}`))
+	req.Header.Set("Content-Type", "application/json")
 	w := httptest.NewRecorder()
-	c, _ := gin.CreateTestContext(w)
-	c.Params = gin.Params{{Key: "id", Value: "not-a-uuid"}}
-	c.Request = httptest.NewRequest("POST", "/workspaces/not-a-uuid/broadcast", bytes.NewBufferString(`{"message":"hello"}`))
-	c.Request.Header.Set("Content-Type", "application/json")
-
-	handler.Broadcast(c)
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusBadRequest {
-		t.Errorf("expected 400, got %d", w.Code)
-	}
-	var resp map[string]interface{}
-	if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
-		t.Fatalf("failed to unmarshal: %v", err)
-	}
-	if resp["error"] != "invalid workspace ID" {
-		t.Errorf("unexpected error: %v", resp["error"])
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unexpected DB calls: %v", err)
+		t.Errorf("got %d, want 400: %s", w.Code, w.Body.String())
 	}
 }
 
-func TestBroadcast_MissingMessage(t *testing.T) {
-	mock := setupTestDB(t)
-	broadcaster := newTestBroadcaster()
-	handler := NewBroadcastHandler(broadcaster)
+func TestBroadcast_MissingMessage_Returns400(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	setupBroadcastDB(t)
+	h := NewBroadcastHandler(newTestBroadcaster())
 
+	r := gin.New()
+	r.POST("/workspaces/:id/broadcast", h.Broadcast)
+
+	req := httptest.NewRequest(http.MethodPost,
+		"/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/broadcast",
+		broadcastBody(`{}`))
+	req.Header.Set("Content-Type", "application/json")
 	w := httptest.NewRecorder()
-	c, _ := gin.CreateTestContext(w)
-	c.Params = gin.Params{{Key: "id", Value: "00000000-0000-0000-0000-000000000001"}}
-	c.Request = httptest.NewRequest("POST", "/broadcast", bytes.NewBufferString(`{}`))
-	c.Request.Header.Set("Content-Type", "application/json")
-
-	handler.Broadcast(c)
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusBadRequest {
-		t.Errorf("expected 400, got %d", w.Code)
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unexpected DB calls: %v", err)
+		t.Errorf("got %d, want 400: %s", w.Code, w.Body.String())
 	}
 }
 
-func TestBroadcast_EmptyMessage(t *testing.T) {
-	mock := setupTestDB(t)
-	broadcaster := newTestBroadcaster()
-	handler := NewBroadcastHandler(broadcaster)
+func TestBroadcast_EmptyMessage_Returns400(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	setupBroadcastDB(t)
+	h := NewBroadcastHandler(newTestBroadcaster())
 
+	r := gin.New()
+	r.POST("/workspaces/:id/broadcast", h.Broadcast)
+
+	req := httptest.NewRequest(http.MethodPost,
+		"/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/broadcast",
+		broadcastBody(`{"message":""}`))
+	req.Header.Set("Content-Type", "application/json")
 	w := httptest.NewRecorder()
-	c, _ := gin.CreateTestContext(w)
-	c.Params = gin.Params{{Key: "id", Value: "00000000-0000-0000-0000-000000000001"}}
-	c.Request = httptest.NewRequest("POST", "/broadcast", bytes.NewBufferString(`{"message":""}`))
-	c.Request.Header.Set("Content-Type", "application/json")
+	r.ServeHTTP(w, req)
 
-	handler.Broadcast(c)
-
-	// binding:"required" rejects empty string.
 	if w.Code != http.StatusBadRequest {
-		t.Errorf("expected 400, got %d", w.Code)
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unexpected DB calls: %v", err)
+		t.Errorf("got %d, want 400: %s", w.Code, w.Body.String())
 	}
 }
 
-// ---------- Sender lookup ----------
+func TestBroadcast_WorkspaceNotFound_Returns404(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupBroadcastDB(t)
+	h := NewBroadcastHandler(newTestBroadcaster())
 
-func TestBroadcast_NotFound(t *testing.T) {
-	mock := setupTestDB(t)
-	broadcaster := newTestBroadcaster()
-	handler := NewBroadcastHandler(broadcaster)
+	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
 
-	senderID := "00000000-0000-0000-0000-000000000001"
-	mock.ExpectQuery(`SELECT name, broadcast_enabled FROM workspaces WHERE id = \$1 AND status != 'removed'`).
-		WithArgs(senderID).
+	mock.ExpectQuery(sqlBroadcastWorkspaceLookup).
+		WithArgs(wsID).
 		WillReturnError(sql.ErrNoRows)
 
-	w := httptest.NewRecorder()
-	c, _ := gin.CreateTestContext(w)
-	c.Params = gin.Params{{Key: "id", Value: senderID}}
-	c.Request = httptest.NewRequest("POST", "/broadcast", bytes.NewBufferString(`{"message":"hello"}`))
-	c.Request.Header.Set("Content-Type", "application/json")
+	r := gin.New()
+	r.POST("/workspaces/:id/broadcast", h.Broadcast)
 
-	handler.Broadcast(c)
+	req := httptest.NewRequest(http.MethodPost, "/workspaces/"+wsID+"/broadcast",
+		broadcastBody(`{"message":"hello"}`))
+	req.Header.Set("Content-Type", "application/json")
+	w := httptest.NewRecorder()
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusNotFound {
-		t.Errorf("expected 404, got %d", w.Code)
+		t.Errorf("got %d, want 404: %s", w.Code, w.Body.String())
 	}
 	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
+		t.Errorf("unmet sqlmock expectations: %v", err)
 	}
 }
 
-func TestBroadcast_Disabled(t *testing.T) {
-	mock := setupTestDB(t)
-	broadcaster := newTestBroadcaster()
-	handler := NewBroadcastHandler(broadcaster)
+func TestBroadcast_BroadcastDisabled_Returns403(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupBroadcastDB(t)
+	h := NewBroadcastHandler(newTestBroadcaster())
 
-	senderID := "00000000-0000-0000-0000-000000000001"
-	mock.ExpectQuery(`SELECT name, broadcast_enabled FROM workspaces WHERE id = \$1 AND status != 'removed'`).
-		WithArgs(senderID).
-		WillReturnRows(sqlmock.NewRows([]string{"name", "broadcast_enabled"}).AddRow("Disabled Workspace", false))
+	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
 
+	mock.ExpectQuery(sqlBroadcastWorkspaceLookup).
+		WithArgs(wsID).
+		WillReturnRows(sqlmock.NewRows([]string{"name", "broadcast_enabled"}).
+			AddRow("test-workspace", false))
+
+	r := gin.New()
+	r.POST("/workspaces/:id/broadcast", h.Broadcast)
+
+	req := httptest.NewRequest(http.MethodPost, "/workspaces/"+wsID+"/broadcast",
+		broadcastBody(`{"message":"hello"}`))
+	req.Header.Set("Content-Type", "application/json")
 	w := httptest.NewRecorder()
-	c, _ := gin.CreateTestContext(w)
-	c.Params = gin.Params{{Key: "id", Value: senderID}}
-	c.Request = httptest.NewRequest("POST", "/broadcast", bytes.NewBufferString(`{"message":"hello"}`))
-	c.Request.Header.Set("Content-Type", "application/json")
-
-	handler.Broadcast(c)
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusForbidden {
-		t.Errorf("expected 403, got %d", w.Code)
-	}
-	var resp map[string]interface{}
-	if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
-		t.Fatalf("failed to unmarshal: %v", err)
-	}
-	if resp["error"] != "broadcast_disabled" {
-		t.Errorf("expected error 'broadcast_disabled', got %v", resp["error"])
+		t.Errorf("got %d, want 403: %s", w.Code, w.Body.String())
 	}
 	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
+		t.Errorf("unmet sqlmock expectations: %v", err)
 	}
 }
 
-// ---------- Recipient collection ----------
+func TestBroadcast_NoRecipients_Success(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupBroadcastDB(t)
+	h := NewBroadcastHandler(newTestBroadcaster())
 
-func TestBroadcast_EmptyRecipients_NoOtherWorkspaces(t *testing.T) {
-	mock := setupTestDB(t)
-	broadcaster := newTestBroadcaster()
-	handler := NewBroadcastHandler(broadcaster)
+	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
 
-	senderID := "00000000-0000-0000-0000-000000000001"
+	mock.ExpectQuery(sqlBroadcastWorkspaceLookup).
+		WithArgs(wsID).
+		WillReturnRows(sqlmock.NewRows([]string{"name", "broadcast_enabled"}).
+			AddRow("test-workspace", true))
 
-	// Sender lookup succeeds.
-	mock.ExpectQuery(`SELECT name, broadcast_enabled FROM workspaces WHERE id = \$1 AND status != 'removed'`).
-		WithArgs(senderID).
-		WillReturnRows(sqlmock.NewRows([]string{"name", "broadcast_enabled"}).AddRow("Solo Workspace", true))
-
-	// No other workspaces.
-	mock.ExpectQuery(`SELECT id FROM workspaces WHERE status != 'removed' AND id != \$1`).
-		WithArgs(senderID).
+	// No recipients (sender is the only non-removed workspace)
+	mock.ExpectQuery(sqlBroadcastRecipients).
+		WithArgs(wsID).
 		WillReturnRows(sqlmock.NewRows([]string{"id"}))
 
-	// Only sender's own activity log.
-	mock.ExpectExec(`INSERT INTO activity_logs`).
-		WithArgs(senderID, sqlmock.AnyArg()).
+	// Sender's own activity log: 2 args (workspaceID, summary)
+	mock.ExpectExec(sqlBroadcastSentInsert).
+		WithArgs(wsID, sqlmock.AnyArg()).
 		WillReturnResult(sqlmock.NewResult(0, 1))
 
-	w := httptest.NewRecorder()
-	c, _ := gin.CreateTestContext(w)
-	c.Params = gin.Params{{Key: "id", Value: senderID}}
-	c.Request = httptest.NewRequest("POST", "/broadcast", bytes.NewBufferString(`{"message":"hello"}`))
-	c.Request.Header.Set("Content-Type", "application/json")
+	r := gin.New()
+	r.POST("/workspaces/:id/broadcast", h.Broadcast)
 
-	handler.Broadcast(c)
+	req := httptest.NewRequest(http.MethodPost, "/workspaces/"+wsID+"/broadcast",
+		broadcastBody(`{"message":"hello everyone"}`))
+	req.Header.Set("Content-Type", "application/json")
+	w := httptest.NewRecorder()
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusOK {
-		t.Errorf("expected 200, got %d: %s", w.Code, w.Body.String())
-	}
-	var resp map[string]interface{}
-	if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
-		t.Fatalf("failed to unmarshal: %v", err)
-	}
-	if resp["status"] != "sent" {
-		t.Errorf("expected status 'sent', got %v", resp["status"])
-	}
-	if resp["delivered"].(float64) != 0 {
-		t.Errorf("expected delivered=0, got %v", resp["delivered"])
+		t.Errorf("got %d, want 200: %s", w.Code, w.Body.String())
 	}
 	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
+		t.Errorf("unmet sqlmock expectations: %v", err)
 	}
 }
 
-func TestBroadcast_Success_SingleRecipient(t *testing.T) {
-	mock := setupTestDB(t)
-	broadcaster := newTestBroadcaster()
-	handler := NewBroadcastHandler(broadcaster)
+func TestBroadcast_WithRecipients_Success_DeliversToAll(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupBroadcastDB(t)
+	h := NewBroadcastHandler(newTestBroadcaster())
 
-	senderID := "00000000-0000-0000-0000-000000000001"
-	recipientID := "00000000-0000-0000-0000-000000000002"
+	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+	recipient1 := "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"
+	recipient2 := "cccccccc-cccc-cccc-cccc-cccccccccccc"
 
-	mock.ExpectQuery(`SELECT name, broadcast_enabled FROM workspaces WHERE id = \$1 AND status != 'removed'`).
-		WithArgs(senderID).
-		WillReturnRows(sqlmock.NewRows([]string{"name", "broadcast_enabled"}).AddRow("Sender Workspace", true))
+	mock.ExpectQuery(sqlBroadcastWorkspaceLookup).
+		WithArgs(wsID).
+		WillReturnRows(sqlmock.NewRows([]string{"name", "broadcast_enabled"}).
+			AddRow("broadcaster-ws", true))
 
-	mock.ExpectQuery(`SELECT id FROM workspaces WHERE status != 'removed' AND id != \$1`).
-		WithArgs(senderID).
-		WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(recipientID))
+	mock.ExpectQuery(sqlBroadcastRecipients).
+		WithArgs(wsID).
+		WillReturnRows(sqlmock.NewRows([]string{"id"}).
+			AddRow(recipient1).
+			AddRow(recipient2))
 
-	// Recipient activity log.
-	mock.ExpectExec(`INSERT INTO activity_logs`).
-		WithArgs(recipientID, senderID, sqlmock.AnyArg()).
-		WillReturnResult(sqlmock.NewResult(0, 1))
-	// Sender activity log.
-	mock.ExpectExec(`INSERT INTO activity_logs`).
-		WithArgs(senderID, sqlmock.AnyArg()).
+	// broadcast_receive: 3 args (recipientID, senderID, summary)
+	mock.ExpectExec(sqlBroadcastReceiveInsert).
+		WithArgs(recipient1, sqlmock.AnyArg(), sqlmock.AnyArg()).
 		WillReturnResult(sqlmock.NewResult(0, 1))
 
+	mock.ExpectExec(sqlBroadcastReceiveInsert).
+		WithArgs(recipient2, sqlmock.AnyArg(), sqlmock.AnyArg()).
+		WillReturnResult(sqlmock.NewResult(0, 1))
+
+	// broadcast_sent: 2 args (workspaceID, summary)
+	mock.ExpectExec(sqlBroadcastSentInsert).
+		WithArgs(wsID, sqlmock.AnyArg()).
+		WillReturnResult(sqlmock.NewResult(0, 1))
+
+	r := gin.New()
+	r.POST("/workspaces/:id/broadcast", h.Broadcast)
+
+	req := httptest.NewRequest(http.MethodPost, "/workspaces/"+wsID+"/broadcast",
+		broadcastBody(`{"message":"hello team"}`))
+	req.Header.Set("Content-Type", "application/json")
 	w := httptest.NewRecorder()
-	c, _ := gin.CreateTestContext(w)
-	c.Params = gin.Params{{Key: "id", Value: senderID}}
-	c.Request = httptest.NewRequest("POST", "/broadcast", bytes.NewBufferString(`{"message":"hello everyone"}`))
-	c.Request.Header.Set("Content-Type", "application/json")
-
-	handler.Broadcast(c)
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusOK {
-		t.Errorf("expected 200, got %d: %s", w.Code, w.Body.String())
-	}
-	var resp map[string]interface{}
-	if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
-		t.Fatalf("failed to unmarshal: %v", err)
-	}
-	if resp["delivered"].(float64) != 1 {
-		t.Errorf("expected delivered=1, got %v", resp["delivered"])
+		t.Errorf("got %d, want 200: %s", w.Code, w.Body.String())
 	}
 	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
+		t.Errorf("unmet sqlmock expectations: %v", err)
 	}
 }
 
-func TestBroadcast_Success_MultipleRecipients(t *testing.T) {
-	mock := setupTestDB(t)
-	broadcaster := newTestBroadcaster()
-	handler := NewBroadcastHandler(broadcaster)
+func TestBroadcast_RecipientInsertError_ContinuesAndSucceeds(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupBroadcastDB(t)
+	h := NewBroadcastHandler(newTestBroadcaster())
 
-	senderID := "00000000-0000-0000-0000-000000000001"
-	recipient1 := "00000000-0000-0000-0000-000000000002"
-	recipient2 := "00000000-0000-0000-0000-000000000003"
+	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
+	recipient1 := "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb"
+	recipient2 := "cccccccc-cccc-cccc-cccc-cccccccccccc"
 
-	mock.ExpectQuery(`SELECT name, broadcast_enabled FROM workspaces WHERE id = \$1 AND status != 'removed'`).
-		WithArgs(senderID).
-		WillReturnRows(sqlmock.NewRows([]string{"name", "broadcast_enabled"}).AddRow("Sender", true))
+	mock.ExpectQuery(sqlBroadcastWorkspaceLookup).
+		WithArgs(wsID).
+		WillReturnRows(sqlmock.NewRows([]string{"name", "broadcast_enabled"}).
+			AddRow("broadcaster-ws", true))
 
-	mock.ExpectQuery(`SELECT id FROM workspaces WHERE status != 'removed' AND id != \$1`).
-		WithArgs(senderID).
-		WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(recipient1).AddRow(recipient2))
+	mock.ExpectQuery(sqlBroadcastRecipients).
+		WithArgs(wsID).
+		WillReturnRows(sqlmock.NewRows([]string{"id"}).
+			AddRow(recipient1).
+			AddRow(recipient2))
 
-	mock.ExpectExec(`INSERT INTO activity_logs`).
-		WithArgs(recipient1, senderID, sqlmock.AnyArg()).
-		WillReturnResult(sqlmock.NewResult(0, 1))
-	mock.ExpectExec(`INSERT INTO activity_logs`).
-		WithArgs(recipient2, senderID, sqlmock.AnyArg()).
-		WillReturnResult(sqlmock.NewResult(0, 1))
-	mock.ExpectExec(`INSERT INTO activity_logs`).
-		WithArgs(senderID, sqlmock.AnyArg()).
+	// First recipient insert fails — handler logs and continues
+	mock.ExpectExec(sqlBroadcastReceiveInsert).
+		WithArgs(recipient1, sqlmock.AnyArg(), sqlmock.AnyArg()).
+		WillReturnError(sql.ErrConnDone)
+
+	// Second recipient succeeds
+	mock.ExpectExec(sqlBroadcastReceiveInsert).
+		WithArgs(recipient2, sqlmock.AnyArg(), sqlmock.AnyArg()).
 		WillReturnResult(sqlmock.NewResult(0, 1))
 
+	mock.ExpectExec(sqlBroadcastSentInsert).
+		WithArgs(wsID, sqlmock.AnyArg()).
+		WillReturnResult(sqlmock.NewResult(0, 1))
+
+	r := gin.New()
+	r.POST("/workspaces/:id/broadcast", h.Broadcast)
+
+	req := httptest.NewRequest(http.MethodPost, "/workspaces/"+wsID+"/broadcast",
+		broadcastBody(`{"message":"partial delivery"}`))
+	req.Header.Set("Content-Type", "application/json")
 	w := httptest.NewRecorder()
-	c, _ := gin.CreateTestContext(w)
-	c.Params = gin.Params{{Key: "id", Value: senderID}}
-	c.Request = httptest.NewRequest("POST", "/broadcast", bytes.NewBufferString(`{"message":"hello all"}`))
-	c.Request.Header.Set("Content-Type", "application/json")
-
-	handler.Broadcast(c)
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusOK {
-		t.Errorf("expected 200, got %d: %s", w.Code, w.Body.String())
-	}
-	var resp map[string]interface{}
-	if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
-		t.Fatalf("failed to unmarshal: %v", err)
-	}
-	if resp["delivered"].(float64) != 2 {
-		t.Errorf("expected delivered=2, got %v", resp["delivered"])
+		t.Errorf("got %d, want 200: %s", w.Code, w.Body.String())
 	}
 	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
+		t.Errorf("unmet sqlmock expectations: %v", err)
 	}
 }
 
-// ---------- Error handling ----------
+func TestBroadcast_SenderActivityLogError_StillReturns200(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	mock := setupBroadcastDB(t)
+	h := NewBroadcastHandler(newTestBroadcaster())
 
-func TestBroadcast_RecipientQueryError(t *testing.T) {
-	mock := setupTestDB(t)
-	broadcaster := newTestBroadcaster()
-	handler := NewBroadcastHandler(broadcaster)
+	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
 
-	senderID := "00000000-0000-0000-0000-000000000001"
+	mock.ExpectQuery(sqlBroadcastWorkspaceLookup).
+		WithArgs(wsID).
+		WillReturnRows(sqlmock.NewRows([]string{"name", "broadcast_enabled"}).
+			AddRow("broadcaster-ws", true))
 
-	mock.ExpectQuery(`SELECT name, broadcast_enabled FROM workspaces WHERE id = \$1 AND status != 'removed'`).
-		WithArgs(senderID).
-		WillReturnRows(sqlmock.NewRows([]string{"name", "broadcast_enabled"}).AddRow("Sender", true))
+	mock.ExpectQuery(sqlBroadcastRecipients).
+		WithArgs(wsID).
+		WillReturnRows(sqlmock.NewRows([]string{"id"}))
 
-	mock.ExpectQuery(`SELECT id FROM workspaces WHERE status != 'removed' AND id != \$1`).
-		WithArgs(senderID).
-		WillReturnError(errors.New("connection lost"))
+	mock.ExpectExec(sqlBroadcastSentInsert).
+		WithArgs(wsID, sqlmock.AnyArg()).
+		WillReturnError(sql.ErrConnDone)
 
+	r := gin.New()
+	r.POST("/workspaces/:id/broadcast", h.Broadcast)
+
+	req := httptest.NewRequest(http.MethodPost, "/workspaces/"+wsID+"/broadcast",
+		broadcastBody(`{"message":"hello"}`))
+	req.Header.Set("Content-Type", "application/json")
 	w := httptest.NewRecorder()
-	c, _ := gin.CreateTestContext(w)
-	c.Params = gin.Params{{Key: "id", Value: senderID}}
-	c.Request = httptest.NewRequest("POST", "/broadcast", bytes.NewBufferString(`{"message":"hello"}`))
-	c.Request.Header.Set("Content-Type", "application/json")
+	r.ServeHTTP(w, req)
 
-	handler.Broadcast(c)
-
-	// Returns 500 on recipient query failure (sender activity log not written either).
-	if w.Code != http.StatusInternalServerError {
-		t.Errorf("expected 500, got %d: %s", w.Code, w.Body.String())
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
-	}
-}
-
-func TestBroadcast_RecipientRowsError(t *testing.T) {
-	mock := setupTestDB(t)
-	broadcaster := newTestBroadcaster()
-	handler := NewBroadcastHandler(broadcaster)
-
-	senderID := "00000000-0000-0000-0000-000000000001"
-
-	mock.ExpectQuery(`SELECT name, broadcast_enabled FROM workspaces WHERE id = \$1 AND status != 'removed'`).
-		WithArgs(senderID).
-		WillReturnRows(sqlmock.NewRows([]string{"name", "broadcast_enabled"}).AddRow("Sender", true))
-
-	// Return rows with an error on rows.Err().
-	rows := sqlmock.NewRows([]string{"id"}).AddRow("r1").RowError(0, errors.New("scan error"))
-	mock.ExpectQuery(`SELECT id FROM workspaces WHERE status != 'removed' AND id != \$1`).
-		WithArgs(senderID).
-		WillReturnRows(rows)
-
-	w := httptest.NewRecorder()
-	c, _ := gin.CreateTestContext(w)
-	c.Params = gin.Params{{Key: "id", Value: senderID}}
-	c.Request = httptest.NewRequest("POST", "/broadcast", bytes.NewBufferString(`{"message":"hello"}`))
-	c.Request.Header.Set("Content-Type", "application/json")
-
-	handler.Broadcast(c)
-
-	if w.Code != http.StatusInternalServerError {
-		t.Errorf("expected 500, got %d: %s", w.Code, w.Body.String())
-	}
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
-	}
-}
-
-func TestBroadcast_ActivityLogInsertFails(t *testing.T) {
-	mock := setupTestDB(t)
-	broadcaster := newTestBroadcaster()
-	handler := NewBroadcastHandler(broadcaster)
-
-	senderID := "00000000-0000-0000-0000-000000000001"
-	recipientID := "00000000-0000-0000-0000-000000000002"
-
-	mock.ExpectQuery(`SELECT name, broadcast_enabled FROM workspaces WHERE id = \$1 AND status != 'removed'`).
-		WithArgs(senderID).
-		WillReturnRows(sqlmock.NewRows([]string{"name", "broadcast_enabled"}).AddRow("Sender", true))
-
-	mock.ExpectQuery(`SELECT id FROM workspaces WHERE status != 'removed' AND id != \$1`).
-		WithArgs(senderID).
-		WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(recipientID))
-
-	// Recipient activity log fails — handler logs and continues.
-	mock.ExpectExec(`INSERT INTO activity_logs`).
-		WithArgs(recipientID, senderID, sqlmock.AnyArg()).
-		WillReturnError(errors.New("insert failed"))
-
-	// Sender activity log succeeds.
-	mock.ExpectExec(`INSERT INTO activity_logs`).
-		WithArgs(senderID, sqlmock.AnyArg()).
-		WillReturnResult(sqlmock.NewResult(0, 1))
-
-	w := httptest.NewRecorder()
-	c, _ := gin.CreateTestContext(w)
-	c.Params = gin.Params{{Key: "id", Value: senderID}}
-	c.Request = httptest.NewRequest("POST", "/broadcast", bytes.NewBufferString(`{"message":"hello"}`))
-	c.Request.Header.Set("Content-Type", "application/json")
-
-	handler.Broadcast(c)
-
-	// Still returns 200 — recipient failures are logged and skipped.
+	// Handler logs error but still returns 200
 	if w.Code != http.StatusOK {
-		t.Errorf("expected 200 (fail-open), got %d: %s", w.Code, w.Body.String())
-	}
-	var resp map[string]interface{}
-	if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
-		t.Fatalf("failed to unmarshal: %v", err)
-	}
-	// delivered=0 because the only recipient's insert failed.
-	if resp["delivered"].(float64) != 0 {
-		t.Errorf("expected delivered=0, got %v", resp["delivered"])
+		t.Errorf("got %d, want 200: %s", w.Code, w.Body.String())
 	}
 	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("unmet expectations: %v", err)
+		t.Errorf("unmet sqlmock expectations: %v", err)
 	}
 }
 
-// ---------- broadcastTruncate ----------
+// ── broadcastTruncate pure function tests ─────────────────────────────────────
 
-func TestBroadcast_Truncate(t *testing.T) {
-	tests := []struct {
-		name string
-		s    string
-		max  int
-		want string
-	}{
-		{"empty string", "", 10, ""},
-		{"under limit", "hello", 10, "hello"},
-		{"exact limit", "hello", 5, "hello"},
-		{"over limit", "hello world", 5, "hello…"},
-		{"unicode over limit", "こんにちは世界", 5, "こんにちは…"},
-		{"exactly at limit", "abcde", 5, "abcde"},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			got := broadcastTruncate(tc.s, tc.max)
-			if got != tc.want {
-				t.Errorf("broadcastTruncate(%q, %d) = %q; want %q", tc.s, tc.max, got, tc.want)
-			}
-		})
+func TestBroadcastTruncate_UnderLimit(t *testing.T) {
+	input := "short message"
+	got := broadcastTruncate(input, 50)
+	if got != input {
+		t.Errorf("broadcastTruncate(%q, 50) = %q, want %q", input, got, input)
+	}
+}
+
+func TestBroadcastTruncate_ExactlyAtLimit(t *testing.T) {
+	input := "exactly fifty char"
+	got := broadcastTruncate(input, 18)
+	if got != input {
+		t.Errorf("broadcastTruncate(%q, 18) = %q, want %q", input, got, input)
+	}
+}
+
+func TestBroadcastTruncate_OverLimit_TruncatesAndAddsEllipsis(t *testing.T) {
+	// 150 ASCII chars → over 120 rune limit → truncate to 120 + ellipsis
+	input := strings.Repeat("x", 150)
+	got := broadcastTruncate(input, 120)
+	if len([]rune(got)) != 121 { // 120 + 1 ellipsis rune
+		t.Errorf("len(broadcastTruncate) = %d, want 121 (120 + ellipsis)", len([]rune(got)))
+	}
+	if got[:len(got)-len("…")] != strings.Repeat("x", 120) {
+		t.Errorf("broadcastTruncate did not truncate correctly")
+	}
+}
+
+func TestBroadcastTruncate_UnicodeChars_TreatsAsRunes(t *testing.T) {
+	// Each emoji is 1 rune but multiple bytes. 50 emojis > 30 limit.
+	input := strings.Repeat("🎉", 50)
+	got := broadcastTruncate(input, 30)
+	if len([]rune(got)) != 31 { // 30 + ellipsis
+		t.Errorf("len(broadcastTruncate with emoji) = %d, want 31", len([]rune(got)))
+	}
+}
+
+func TestBroadcastTruncate_ZeroLimit_ReturnsEllipsis(t *testing.T) {
+	got := broadcastTruncate("hello", 0)
+	if got != "…" {
+		t.Errorf("broadcastTruncate with max=0 = %q, want …", got)
 	}
 }