Merge branch 're-add-autocomplete' into model-seln-2

src/main.js

@@ -123,7 +123,7 @@ protocol.registerSchemesAsPrivileged([
 	},
 	{
 		scheme: 'vscode-file',
-		privileges: { secure: true, standard: true, supportFetchAPI: true, corsEnabled: true, codeCache: true }
+		privileges: { secure: true, standard: true, supportFetchAPI: true, corsEnabled: true, codeCache: true, }
 	}
 ]);
 

src/vs/code/electron-main/app.ts

@@ -120,8 +120,6 @@ import { AuxiliaryWindowsMainService } from '../../platform/auxiliaryWindow/elec
 import { normalizeNFC } from '../../base/common/normalization.js';
 import { ICSSDevelopmentService, CSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js';
 import { ExtensionSignatureVerificationService, IExtensionSignatureVerificationService } from '../../platform/extensionManagement/node/extensionSignatureVerificationService.js';
-
-import { LLMMessageChannel } from '../../platform/void/electron-main/llmMessageChannel.js';
 import { IMetricsService } from '../../platform/void/common/metricsService.js';
 import { MetricsMainService } from '../../platform/void/electron-main/metricsMainService.js';
 
@@ -1242,13 +1240,6 @@ export class CodeApplication extends Disposable {
 		mainProcessElectronServer.registerChannel('logger', loggerChannel);
 		sharedProcessClient.then(client => client.registerChannel('logger', loggerChannel));
 
-		// Void
-		const metricsChannel = ProxyChannel.fromService(accessor.get(IMetricsService), disposables);
-		mainProcessElectronServer.registerChannel('void-channel-metrics', metricsChannel);
-
-		const sendLLMMessageChannel = new LLMMessageChannel(accessor.get(IMetricsService));
-		mainProcessElectronServer.registerChannel('void-channel-sendLLMMessage', sendLLMMessageChannel);
-
 		// Extension Host Debug Broadcasting
 		const electronExtensionHostDebugBroadcastChannel = new ElectronExtensionHostDebugBroadcastChannel(accessor.get(IWindowsMainService));
 		mainProcessElectronServer.registerChannel('extensionhostdebugservice', electronExtensionHostDebugBroadcastChannel);

src/vs/code/electron-sandbox/processExplorer/processExplorer-dev.esm.html

@@ -25,6 +25,7 @@
 				connect-src
 					'self'
 					https:
+					*
 				;
 				font-src
 					'self'

src/vs/code/electron-sandbox/processExplorer/processExplorer-dev.html

@@ -23,6 +23,7 @@
 				connect-src
 					'self'
 					https:
+					*
 				;
 				font-src
 					'self'

src/vs/code/electron-sandbox/processExplorer/processExplorer.esm.html

@@ -25,6 +25,7 @@
 				connect-src
 					'self'
 					https:
+					*
 				;
 				font-src
 					'self'

src/vs/code/electron-sandbox/processExplorer/processExplorer.html

@@ -23,6 +23,7 @@
 				connect-src
 					'self'
 					https:
+					*
 				;
 				font-src
 					'self'

src/vs/code/electron-sandbox/workbench/workbench-dev.esm.html

@@ -38,6 +38,7 @@
 					'self'
 					https:
 					ws:
+					*
 				;
 				font-src
 					'self'

src/vs/code/electron-sandbox/workbench/workbench-dev.html

@@ -37,6 +37,7 @@
 					'self'
 					https:
 					ws:
+					*
 				;
 				font-src
 					'self'

src/vs/code/electron-sandbox/workbench/workbench.esm.html

@@ -37,6 +37,7 @@
 					'self'
 					https:
 					ws:
+					*
 				;
 				font-src
 					'self'

src/vs/code/electron-sandbox/workbench/workbench.html

@@ -37,6 +37,7 @@
 					'self'
 					https:
 					ws:
+					*
 				;
 				font-src
 					'self'

src/vs/workbench/contrib/issue/electron-sandbox/issueReporter-dev.esm.html

@@ -25,6 +25,7 @@
 				connect-src
 					'self'
 					https:
+					*
 				;
 				font-src
 					'self'

src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx

@@ -159,7 +159,6 @@ export const SidebarChat = () => {
 
 	const sendLLMMessageService = useService('sendLLMMessageService')
 
-
 	// state of current message
 	const [instructions, setInstructions] = useState('') // the user's instructions
 	const onChangeText = useCallback((newStr: string) => { setInstructions(newStr) }, [setInstructions])

src/vs/workbench/contrib/void/browser/react/src/util/ErrorDisplay.tsx

@@ -0,0 +1,161 @@
+import React, { useState } from 'react';
+import { AlertCircle, ChevronDown, ChevronUp, X } from 'lucide-react';
+
+import { getCmdKey } from '../../../getCmdKey.js';
+
+// const opaqueMessage = `\
+// Unfortunately, Void can't see the full error. However, you should be able to find more details by pressing ${getCmdKey()}+Shift+P, typing "Toggle Developer Tools", and looking at the console.\n
+// This error often means you have an incorrect API key. If you're self-hosting your own server, it might mean your CORS headers are off, and you should make sure your server's response has the header "Access-Control-Allow-Origins" set to "*", or at least allows "vscode-file://vscode-app".`
+// if ((error instanceof Error) && (error.cause + '').includes('TypeError: Failed to fetch')) {
+// 	e = error as any
+// 	e['Void Team'] = opaqueMessage
+// }
+
+
+type Details = {
+	message: string,
+	name: string,
+	stack: string | null,
+	cause: string | null,
+	code: string | null,
+	additional: Record<string, any>
+}
+
+// Get detailed error information
+const getErrorDetails = (error: unknown) => {
+
+	let details: Details;
+
+	let e: Error & { [other: string]: undefined | any }
+
+	// If fetch() fails, it gives an opaque message. We add extra details to the error.
+	if (error instanceof Error) {
+		e = error
+	}
+	// sometimes error is an object but not an Error
+	else if (typeof error === 'object') {
+		e = new Error(`The server didn't give a very useful error message. More details below.`, { cause: JSON.stringify(error) })
+
+	}
+	else {
+		e = new Error(String(error))
+	}
+	// console.log('error display', JSON.stringify(e))
+
+	const message = e.message && e.error ?
+		(e.message + ':\n' + e.error)
+		: e.message || e.error || JSON.stringify(error)
+
+	details = {
+		name: e.name || 'Error',
+		message: message,
+		stack: null, //  e.stack is ignored because it's ugly and not very useful
+		cause: e.cause ? String(e.cause) : null,
+		code: e.code || null,
+		additional: {}
+	}
+
+
+	// Collect any additional properties from the e
+	for (let prop of Object.getOwnPropertyNames(e).filter((prop) => !Object.keys(details).includes(prop)))
+		details.additional[prop] = (e as any)[prop]
+
+	return details;
+};
+
+
+
+export const ErrorDisplay = ({
+	error,
+	onDismiss = null,
+	showDismiss = true,
+	className = ''
+}: {
+	error: Error | object | string,
+	onDismiss: (() => void) | null,
+	showDismiss?: boolean,
+	className?: string
+}) => {
+	const [isExpanded, setIsExpanded] = useState(false);
+
+	const details = getErrorDetails(error);
+	const hasDetails = details.cause || Object.keys(details.additional).length > 0;
+
+	return (
+		<div className={`rounded-lg border border-red-200 bg-red-50 p-4 ${className}`}>
+			{/* Header */}
+			<div className="flex items-start justify-between">
+				<div className="flex gap-3">
+					<AlertCircle className="h-5 w-5 text-red-500 mt-0.5" />
+					<div className="flex-1">
+						<h3 className="font-semibold text-red-800">
+							{details.name}
+						</h3>
+						<p className="text-red-700 mt-1">
+							{details.message}
+						</p>
+					</div>
+				</div>
+
+				<div className="flex gap-2">
+					{hasDetails && (
+						<button
+							onClick={() => setIsExpanded(!isExpanded)}
+							className="text-red-600 hover:text-red-800 p-1 rounded"
+						>
+							{isExpanded ? (
+								<ChevronUp className="h-5 w-5" />
+							) : (
+								<ChevronDown className="h-5 w-5" />
+							)}
+						</button>
+					)}
+					{showDismiss && onDismiss && (
+						<button
+							onClick={onDismiss}
+							className="text-red-600 hover:text-red-800 p-1 rounded"
+						>
+							<X className="h-5 w-5" />
+						</button>
+					)}
+				</div>
+			</div>
+
+			{/* Expandable Details */}
+			{isExpanded && hasDetails && (
+				<div className="mt-4 space-y-3 border-t border-red-200 pt-3">
+					{details.code && (
+						<div>
+							<span className="font-semibold text-red-800">Error Code: </span>
+							<span className="text-red-700">{details.code}</span>
+						</div>
+					)}
+
+					{details.cause && (
+						<div>
+							<span className="font-semibold text-red-800">Cause: </span>
+							<span className="text-red-700">{details.cause}</span>
+						</div>
+					)}
+
+					{Object.keys(details.additional).length > 0 && (
+						<div>
+							<span className="font-semibold text-red-800">Additional Information:</span>
+							<pre className="mt-1 text-sm text-red-700 overflow-x-auto whitespace-pre-wrap">
+								{Object.keys(details.additional).map(key => `${key}:\n${details.additional[key]}`).join('\n')}
+							</pre>
+						</div>
+					)}
+					{/* {details.stack && (
+						<div>
+							<span className="font-semibold text-red-800">Stack Trace:</span>
+							<pre className="mt-1 text-sm text-red-700 overflow-x-auto whitespace-pre-wrap">
+								{details.stack}
+							</pre>
+						</div>
+					)} */}
+				</div>
+			)}
+		</div>
+	);
+};