refactor: migrate diagnostics to workspace service and host separation

proto/host/workspace.proto

@@ -4,6 +4,8 @@ package host;
 option java_package = "bot.cline.host.proto";
 option java_multiple_files = true;
 
+import "cline/common.proto";
+
 // Provides methods for working with workspaces/projects.
 service WorkspaceService {
   // Returns a list of the top level directories of the workspace.
@@ -12,6 +14,8 @@ service WorkspaceService {
   // Returns true if the document was saved, returns false if the document was not found, or did not
   // need to be saved.
   rpc saveOpenDocumentIfDirty(SaveOpenDocumentIfDirtyRequest) returns (SaveOpenDocumentIfDirtyResponse);
+  // Get diagnostics from the workspace.
+  rpc getDiagnostics(GetDiagnosticsRequest) returns (GetDiagnosticsResponse);
 }
 
 message GetWorkspacePathsRequest {
@@ -34,3 +38,40 @@ message SaveOpenDocumentIfDirtyResponse {
   // Returns true if the document was saved. 
   optional bool was_saved = 1;
 }
+
+message GetDiagnosticsRequest {
+  optional cline.Metadata metadata = 1;
+}
+
+message GetDiagnosticsResponse {
+  repeated FileDiagnostics file_diagnostics = 1;
+}
+
+message FileDiagnostics {
+  string file_path = 1;
+  repeated Diagnostic diagnostics = 2;
+}
+
+message Diagnostic {
+  string message = 1;
+  DiagnosticRange range = 2;
+  DiagnosticSeverity severity = 3;
+  optional string source = 4;
+}
+
+message DiagnosticRange {
+  DiagnosticPosition start = 1;
+  DiagnosticPosition end = 2;
+}
+
+message DiagnosticPosition {
+  int32 line = 1;
+  int32 character = 2;
+}
+
+enum DiagnosticSeverity {
+  DIAGNOSTIC_ERROR = 0;
+  DIAGNOSTIC_WARNING = 1;
+  DIAGNOSTIC_INFORMATION = 2;
+  DIAGNOSTIC_HINT = 3;
+}

src/core/mentions/index.ts

@@ -6,7 +6,7 @@ import { mentionRegexGlobal } from "@shared/context-mentions"
 import fs from "fs/promises"
 import { extractTextFromFile } from "@integrations/misc/extract-text"
 import { isBinaryFile } from "isbinaryfile"
-import { diagnosticsToProblemsString } from "@integrations/diagnostics"
+import { getWorkspaceProblemsString } from "@/integrations/diagnostics"
 import { getLatestTerminalOutput } from "@integrations/terminal/get-latest-output"
 import { getCommitInfo } from "@utils/git"
 import { getWorkingState } from "@utils/git"
@@ -225,12 +225,7 @@ async function getFileOrFolderContent(mentionPath: string, cwd: string): Promise
 }
 
 async function getWorkspaceProblems(): Promise<string> {
-	const diagnostics = vscode.languages.getDiagnostics()
-	const result = diagnosticsToProblemsString(diagnostics, [vscode.DiagnosticSeverity.Error, vscode.DiagnosticSeverity.Warning])
-	if (!result) {
-		return "No errors or warnings detected."
-	}
-	return result
+	return await getWorkspaceProblemsString()
 }
 
 function isFileMention(mention: string): boolean {

src/hosts/external/ExternalDiffviewProvider.ts

@@ -1,5 +1,6 @@
 import { HostProvider } from "@/hosts/host-provider"
 import { DiffViewProvider } from "@/integrations/editor/DiffViewProvider"
+import { DiagnosticSeverity } from "@/shared/proto/host/workspace"
 import { status } from "@grpc/grpc-js"
 
 export class ExternalDiffViewProvider extends DiffViewProvider {
@@ -78,8 +79,27 @@ export class ExternalDiffViewProvider extends DiffViewProvider {
 	}
 
 	protected override async getNewDiagnosticProblems(): Promise<string> {
-		console.log(`Called ExternalDiffViewProvider.getNewDiagnosticProblems() stub`)
-		return ""
+		// Get diagnostics using the HostBridge workspace service
+		const response = await HostProvider.workspace.getDiagnostics({})
+
+		if (response.fileDiagnostics.length === 0) {
+			return ""
+		}
+
+		let result = ""
+		for (const fileDiagnostics of response.fileDiagnostics) {
+			const errors = fileDiagnostics.diagnostics.filter((d) => d.severity === DiagnosticSeverity.DIAGNOSTIC_ERROR)
+
+			if (errors.length > 0) {
+				result += `\n\n${fileDiagnostics.filePath}`
+				for (const diagnostic of errors) {
+					const line = (diagnostic.range?.start?.line || 0) + 1 // Proto lines are 0-indexed
+					const source = diagnostic.source ? `${diagnostic.source} ` : ""
+					result += `\n- [${source}Error] Line ${line}: ${diagnostic.message}`
+				}
+			}
+		}
+		return result.trim()
 	}
 
 	protected override async closeDiffView(): Promise<void> {

src/hosts/vscode/VscodeDiffViewProvider.ts

@@ -3,7 +3,7 @@ import * as path from "path"
 import * as vscode from "vscode"
 import { DecorationController } from "@/hosts/vscode/DecorationController"
 import { DiffViewProvider } from "@integrations/editor/DiffViewProvider"
-import { diagnosticsToProblemsString, getNewDiagnostics } from "@/integrations/diagnostics"
+import { diagnosticsToProblemsString, getNewDiagnostics } from "./diagnostics"
 
 export const DIFF_VIEW_URI_SCHEME = "cline-diff"
 

src/hosts/vscode/diagnostics.ts

@@ -0,0 +1,109 @@
+import * as vscode from "vscode"
+import * as path from "path"
+import deepEqual from "fast-deep-equal"
+import { getCwd } from "@/utils/path"
+
+export function getNewDiagnostics(
+	oldDiagnostics: [vscode.Uri, vscode.Diagnostic[]][],
+	newDiagnostics: [vscode.Uri, vscode.Diagnostic[]][],
+): [vscode.Uri, vscode.Diagnostic[]][] {
+	const newProblems: [vscode.Uri, vscode.Diagnostic[]][] = []
+	const oldMap = new Map(oldDiagnostics)
+
+	for (const [uri, newDiags] of newDiagnostics) {
+		const oldDiags = oldMap.get(uri) || []
+		const newProblemsForUri = newDiags.filter((newDiag) => !oldDiags.some((oldDiag) => deepEqual(oldDiag, newDiag)))
+
+		if (newProblemsForUri.length > 0) {
+			newProblems.push([uri, newProblemsForUri])
+		}
+	}
+
+	return newProblems
+}
+
+// Usage:
+// const oldDiagnostics = // ... your old diagnostics array
+// const newDiagnostics = // ... your new diagnostics array
+// const newProblems = getNewDiagnostics(oldDiagnostics, newDiagnostics);
+
+// Example usage with mocks:
+//
+// // Mock old diagnostics
+// const oldDiagnostics: [vscode.Uri, vscode.Diagnostic[]][] = [
+//     [vscode.Uri.file("/path/to/file1.ts"), [
+//         new vscode.Diagnostic(new vscode.Range(0, 0, 0, 10), "Old error in file1", vscode.DiagnosticSeverity.Error)
+//     ]],
+//     [vscode.Uri.file("/path/to/file2.ts"), [
+//         new vscode.Diagnostic(new vscode.Range(5, 5, 5, 15), "Old warning in file2", vscode.DiagnosticSeverity.Warning)
+//     ]]
+// ];
+//
+// // Mock new diagnostics
+// const newDiagnostics: [vscode.Uri, vscode.Diagnostic[]][] = [
+//     [vscode.Uri.file("/path/to/file1.ts"), [
+//         new vscode.Diagnostic(new vscode.Range(0, 0, 0, 10), "Old error in file1", vscode.DiagnosticSeverity.Error),
+//         new vscode.Diagnostic(new vscode.Range(2, 2, 2, 12), "New error in file1", vscode.DiagnosticSeverity.Error)
+//     ]],
+//     [vscode.Uri.file("/path/to/file2.ts"), [
+//         new vscode.Diagnostic(new vscode.Range(5, 5, 5, 15), "Old warning in file2", vscode.DiagnosticSeverity.Warning)
+//     ]],
+//     [vscode.Uri.file("/path/to/file3.ts"), [
+//         new vscode.Diagnostic(new vscode.Range(1, 1, 1, 11), "New error in file3", vscode.DiagnosticSeverity.Error)
+//     ]]
+// ];
+//
+// const newProblems = getNewDiagnostics(oldDiagnostics, newDiagnostics);
+//
+// console.log("New problems:");
+// for (const [uri, diagnostics] of newProblems) {
+//     console.log(`File: ${uri.fsPath}`);
+//     for (const diagnostic of diagnostics) {
+//         console.log(`- ${diagnostic.message} (${diagnostic.range.start.line}:${diagnostic.range.start.character})`);
+//     }
+// }
+//
+// // Expected output:
+// // New problems:
+// // File: /path/to/file1.ts
+// // - New error in file1 (2:2)
+// // File: /path/to/file3.ts
+// // - New error in file3 (1:1)
+
+// will return empty string if no problems with the given severity are found
+export async function diagnosticsToProblemsString(
+	diagnostics: [vscode.Uri, vscode.Diagnostic[]][],
+	severities: vscode.DiagnosticSeverity[],
+): Promise<string> {
+	const cwd = await getCwd()
+	let result = ""
+	for (const [uri, fileDiagnostics] of diagnostics) {
+		const problems = fileDiagnostics.filter((d) => severities.includes(d.severity))
+		if (problems.length > 0) {
+			result += `\n\n${path.relative(cwd, uri.fsPath).toPosix()}`
+			for (const diagnostic of problems) {
+				let label: string
+				switch (diagnostic.severity) {
+					case vscode.DiagnosticSeverity.Error:
+						label = "Error"
+						break
+					case vscode.DiagnosticSeverity.Warning:
+						label = "Warning"
+						break
+					case vscode.DiagnosticSeverity.Information:
+						label = "Information"
+						break
+					case vscode.DiagnosticSeverity.Hint:
+						label = "Hint"
+						break
+					default:
+						label = "Diagnostic"
+				}
+				const line = diagnostic.range.start.line + 1 // VSCode lines are 0-indexed
+				const source = diagnostic.source ? `${diagnostic.source} ` : ""
+				result += `\n- [${source}${label}] Line ${line}: ${diagnostic.message}`
+			}
+		}
+	}
+	return result.trim()
+}

src/hosts/vscode/hostbridge/workspace/getDiagnostics.ts

@@ -0,0 +1,69 @@
+import * as vscode from "vscode"
+import {
+	GetDiagnosticsRequest,
+	GetDiagnosticsResponse,
+	FileDiagnostics,
+	Diagnostic,
+	DiagnosticRange,
+	DiagnosticPosition,
+	DiagnosticSeverity,
+} from "@/shared/proto/host/workspace"
+
+export async function getDiagnostics(request: GetDiagnosticsRequest): Promise<GetDiagnosticsResponse> {
+	// Get all diagnostics from VS Code
+	const vscodeAllDiagnostics = vscode.languages.getDiagnostics()
+
+	const fileDiagnostics: FileDiagnostics[] = []
+
+	for (const [uri, diagnostics] of vscodeAllDiagnostics) {
+		if (diagnostics.length > 0) {
+			const convertedDiagnostics: Diagnostic[] = diagnostics.map((vsDiagnostic) => {
+				// Convert VS Code severity to proto severity
+				let severity: DiagnosticSeverity
+				switch (vsDiagnostic.severity) {
+					case vscode.DiagnosticSeverity.Error:
+						severity = DiagnosticSeverity.DIAGNOSTIC_ERROR
+						break
+					case vscode.DiagnosticSeverity.Warning:
+						severity = DiagnosticSeverity.DIAGNOSTIC_WARNING
+						break
+					case vscode.DiagnosticSeverity.Information:
+						severity = DiagnosticSeverity.DIAGNOSTIC_INFORMATION
+						break
+					case vscode.DiagnosticSeverity.Hint:
+						severity = DiagnosticSeverity.DIAGNOSTIC_HINT
+						break
+					default:
+						severity = DiagnosticSeverity.DIAGNOSTIC_ERROR
+				}
+
+				return Diagnostic.create({
+					message: vsDiagnostic.message,
+					range: DiagnosticRange.create({
+						start: DiagnosticPosition.create({
+							line: vsDiagnostic.range.start.line,
+							character: vsDiagnostic.range.start.character,
+						}),
+						end: DiagnosticPosition.create({
+							line: vsDiagnostic.range.end.line,
+							character: vsDiagnostic.range.end.character,
+						}),
+					}),
+					severity: severity,
+					source: vsDiagnostic.source || undefined,
+				})
+			})
+
+			fileDiagnostics.push(
+				FileDiagnostics.create({
+					filePath: uri.fsPath,
+					diagnostics: convertedDiagnostics,
+				}),
+			)
+		}
+	}
+
+	return GetDiagnosticsResponse.create({
+		fileDiagnostics: fileDiagnostics,
+	})
+}

src/integrations/diagnostics/index.ts

@@ -1,105 +1,49 @@
-import * as vscode from "vscode"
-import * as path from "path"
-import deepEqual from "fast-deep-equal"
-import { getCwd } from "@/utils/path"
+import { HostProvider } from "@/hosts/host-provider"
+import { GetDiagnosticsRequest, DiagnosticSeverity } from "@/shared/proto/host/workspace"
+import { Metadata } from "@/shared/proto/cline/common"
 
-export function getNewDiagnostics(
-	oldDiagnostics: [vscode.Uri, vscode.Diagnostic[]][],
-	newDiagnostics: [vscode.Uri, vscode.Diagnostic[]][],
-): [vscode.Uri, vscode.Diagnostic[]][] {
-	const newProblems: [vscode.Uri, vscode.Diagnostic[]][] = []
-	const oldMap = new Map(oldDiagnostics)
+/**
+ * Host-agnostic function to get workspace problems as a formatted string
+ * Used by @problems mention for cross-host compatibility
+ */
+export async function getWorkspaceProblemsString(): Promise<string> {
+	const response = await HostProvider.workspace.getDiagnostics(
+		GetDiagnosticsRequest.create({
+			metadata: Metadata.create({}),
+		}),
+	)
 
-	for (const [uri, newDiags] of newDiagnostics) {
-		const oldDiags = oldMap.get(uri) || []
-		const newProblemsForUri = newDiags.filter((newDiag) => !oldDiags.some((oldDiag) => deepEqual(oldDiag, newDiag)))
-
-		if (newProblemsForUri.length > 0) {
-			newProblems.push([uri, newProblemsForUri])
-		}
+	if (response.fileDiagnostics.length === 0) {
+		return "No errors or warnings detected."
 	}
 
-	return newProblems
-}
-
-// Usage:
-// const oldDiagnostics = // ... your old diagnostics array
-// const newDiagnostics = // ... your new diagnostics array
-// const newProblems = getNewDiagnostics(oldDiagnostics, newDiagnostics);
-
-// Example usage with mocks:
-//
-// // Mock old diagnostics
-// const oldDiagnostics: [vscode.Uri, vscode.Diagnostic[]][] = [
-//     [vscode.Uri.file("/path/to/file1.ts"), [
-//         new vscode.Diagnostic(new vscode.Range(0, 0, 0, 10), "Old error in file1", vscode.DiagnosticSeverity.Error)
-//     ]],
-//     [vscode.Uri.file("/path/to/file2.ts"), [
-//         new vscode.Diagnostic(new vscode.Range(5, 5, 5, 15), "Old warning in file2", vscode.DiagnosticSeverity.Warning)
-//     ]]
-// ];
-//
-// // Mock new diagnostics
-// const newDiagnostics: [vscode.Uri, vscode.Diagnostic[]][] = [
-//     [vscode.Uri.file("/path/to/file1.ts"), [
-//         new vscode.Diagnostic(new vscode.Range(0, 0, 0, 10), "Old error in file1", vscode.DiagnosticSeverity.Error),
-//         new vscode.Diagnostic(new vscode.Range(2, 2, 2, 12), "New error in file1", vscode.DiagnosticSeverity.Error)
-//     ]],
-//     [vscode.Uri.file("/path/to/file2.ts"), [
-//         new vscode.Diagnostic(new vscode.Range(5, 5, 5, 15), "Old warning in file2", vscode.DiagnosticSeverity.Warning)
-//     ]],
-//     [vscode.Uri.file("/path/to/file3.ts"), [
-//         new vscode.Diagnostic(new vscode.Range(1, 1, 1, 11), "New error in file3", vscode.DiagnosticSeverity.Error)
-//     ]]
-// ];
-//
-// const newProblems = getNewProblems(oldDiagnostics, newDiagnostics);
-//
-// console.log("New problems:");
-// for (const [uri, diagnostics] of newProblems) {
-//     console.log(`File: ${uri.fsPath}`);
-//     for (const diagnostic of diagnostics) {
-//         console.log(`- ${diagnostic.message} (${diagnostic.range.start.line}:${diagnostic.range.start.character})`);
-//     }
-// }
-//
-// // Expected output:
-// // New problems:
-// // File: /path/to/file1.ts
-// // - New error in file1 (2:2)
-// // File: /path/to/file3.ts
-// // - New error in file3 (1:1)
-
-// will return empty string if no problems with the given severity are found
-export async function diagnosticsToProblemsString(
-	diagnostics: [vscode.Uri, vscode.Diagnostic[]][],
-	severities: vscode.DiagnosticSeverity[],
-): Promise<string> {
-	const cwd = await getCwd()
 	let result = ""
-	for (const [uri, fileDiagnostics] of diagnostics) {
-		const problems = fileDiagnostics.filter((d) => severities.includes(d.severity))
+	for (const fileDiagnostics of response.fileDiagnostics) {
+		const problems = fileDiagnostics.diagnostics.filter(
+			(d) => d.severity === DiagnosticSeverity.DIAGNOSTIC_ERROR || d.severity === DiagnosticSeverity.DIAGNOSTIC_WARNING,
+		)
+
 		if (problems.length > 0) {
-			result += `\n\n${path.relative(cwd, uri.fsPath).toPosix()}`
+			result += `\n\n${fileDiagnostics.filePath}`
 			for (const diagnostic of problems) {
 				let label: string
 				switch (diagnostic.severity) {
-					case vscode.DiagnosticSeverity.Error:
+					case DiagnosticSeverity.DIAGNOSTIC_ERROR:
 						label = "Error"
 						break
-					case vscode.DiagnosticSeverity.Warning:
+					case DiagnosticSeverity.DIAGNOSTIC_WARNING:
 						label = "Warning"
 						break
-					case vscode.DiagnosticSeverity.Information:
+					case DiagnosticSeverity.DIAGNOSTIC_INFORMATION:
 						label = "Information"
 						break
-					case vscode.DiagnosticSeverity.Hint:
+					case DiagnosticSeverity.DIAGNOSTIC_HINT:
 						label = "Hint"
 						break
 					default:
 						label = "Diagnostic"
 				}
-				const line = diagnostic.range.start.line + 1 // VSCode lines are 0-indexed
+				const line = (diagnostic.range?.start?.line || 0) + 1 // Proto lines are 0-indexed
 				const source = diagnostic.source ? `${diagnostic.source} ` : ""
 				result += `\n- [${source}${label}] Line ${line}: ${diagnostic.message}`
 			}