Fix duplicate diagnostics in LSP server

Correct ClientCapabilities struct to match LSP spec, detecting
pull diagnostics support via textDocument.diagnostic presence.

Fixes authzed/spicedb-vscode#41

Author: ivanauth

internal/lsp/handlers.go

@@ -335,7 +335,7 @@ func (s *Server) initialize(_ context.Context, r *jsonrpc2.Request) (any, error)
 		return nil, err
 	}
 
-	s.requestsDiagnostics = ip.Capabilities.Diagnostics.RefreshSupport
+	s.requestsDiagnostics = ip.Capabilities.SupportsPullDiagnostics()
 	log.Debug().
 		Bool("requestsDiagnostics", s.requestsDiagnostics).
 		Msg("initialize")

internal/lsp/lsp_test.go

@@ -287,32 +287,42 @@ func TestRequestAfterShutdown(t *testing.T) {
 }
 
 func TestDiagnosticsRefreshSupport(t *testing.T) {
+	// Initialize with textDocument diagnostic support enabled
 	tester := newLSPTester(t)
-
-	// Initialize with diagnostic refresh support enabled
 	resp, serverState := sendAndReceive[lsp.InitializeResult](tester, "initialize", InitializeParams{
 		Capabilities: ClientCapabilities{
-			Diagnostics: DiagnosticWorkspaceClientCapabilities{
-				RefreshSupport: true,
+			TextDocument: &TextDocumentClientCapabilities{
+				Diagnostic: &DiagnosticClientCapabilities{},
 			},
 		},
 	})
 	require.Equal(t, serverStateInitialized, serverState)
 	require.True(t, resp.Capabilities.DocumentFormattingProvider)
 	require.True(t, tester.server.requestsDiagnostics)
 
-	// Initialize without diagnostic refresh support
+	// Initialize with only workspace diagnostic refresh support (not pull diagnostics)
 	tester2 := newLSPTester(t)
 	resp2, serverState2 := sendAndReceive[lsp.InitializeResult](tester2, "initialize", InitializeParams{
 		Capabilities: ClientCapabilities{
-			Diagnostics: DiagnosticWorkspaceClientCapabilities{
-				RefreshSupport: false,
+			Workspace: &WorkspaceClientCapabilities{
+				Diagnostics: &DiagnosticWorkspaceClientCapabilities{
+					RefreshSupport: true,
+				},
 			},
 		},
 	})
 	require.Equal(t, serverStateInitialized, serverState2)
 	require.True(t, resp2.Capabilities.DocumentFormattingProvider)
 	require.False(t, tester2.server.requestsDiagnostics)
+
+	// Initialize without any diagnostic support
+	tester3 := newLSPTester(t)
+	resp3, serverState3 := sendAndReceive[lsp.InitializeResult](tester3, "initialize", InitializeParams{
+		Capabilities: ClientCapabilities{},
+	})
+	require.Equal(t, serverStateInitialized, serverState3)
+	require.True(t, resp3.Capabilities.DocumentFormattingProvider)
+	require.False(t, tester3.server.requestsDiagnostics)
 }
 
 func TestLogJSONPtr(t *testing.T) {

internal/lsp/lspdefs.go

@@ -53,15 +53,32 @@ type InitializeParams struct {
 }
 
 type ClientCapabilities struct {
-	Diagnostics DiagnosticWorkspaceClientCapabilities `json:"diagnostics"`
+	TextDocument *TextDocumentClientCapabilities `json:"textDocument,omitempty"`
+	Workspace    *WorkspaceClientCapabilities    `json:"workspace,omitempty"`
+}
+
+type TextDocumentClientCapabilities struct {
+	Diagnostic *DiagnosticClientCapabilities `json:"diagnostic,omitempty"`
+}
+
+type DiagnosticClientCapabilities struct {
+	DynamicRegistration bool `json:"dynamicRegistration,omitempty"`
+}
+
+type WorkspaceClientCapabilities struct {
+	Diagnostics *DiagnosticWorkspaceClientCapabilities `json:"diagnostics,omitempty"`
 }
 
 type DiagnosticWorkspaceClientCapabilities struct {
-	// RefreshSupport indicates whether the client supports the new
-	// `textDocument/diagnostic` request.
 	RefreshSupport bool `json:"refreshSupport,omitempty"`
 }
 
+// SupportsPullDiagnostics returns true if the client indicated support for
+// pull-based diagnostics by including the textDocument.diagnostic capability.
+func (c ClientCapabilities) SupportsPullDiagnostics() bool {
+	return c.TextDocument != nil && c.TextDocument.Diagnostic != nil
+}
+
 type Hover struct {
 	Contents MarkupContent  `json:"contents"`
 	Range    *baselsp.Range `json:"range,omitempty"`

internal/lsp/testutil.go

@@ -48,8 +48,15 @@ type lspTester struct {
 func (lt *lspTester) initialize() {
 	resp, serverState := sendAndReceive[lsp.InitializeResult](lt, "initialize", InitializeParams{
 		Capabilities: ClientCapabilities{
-			Diagnostics: DiagnosticWorkspaceClientCapabilities{
-				RefreshSupport: true,
+			TextDocument: &TextDocumentClientCapabilities{
+				Diagnostic: &DiagnosticClientCapabilities{
+					DynamicRegistration: true,
+				},
+			},
+			Workspace: &WorkspaceClientCapabilities{
+				Diagnostics: &DiagnosticWorkspaceClientCapabilities{
+					RefreshSupport: true,
+				},
 			},
 		},
 	})