Fix CORS + CSP

package.json

@@ -85,6 +85,7 @@
     "@vscode/sudo-prompt": "9.3.1",
     "@vscode/tree-sitter-wasm": "^0.0.4",
     "@vscode/vscode-languagedetection": "1.0.21",
+    "@vscode/webview-ui-toolkit": "^1.4.0",
     "@vscode/windows-mutex": "^0.5.0",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
@@ -100,6 +101,7 @@
     "https-proxy-agent": "^7.0.2",
     "jschardet": "3.1.3",
     "kerberos": "2.1.1",
+    "lucide-react": "^0.460.0",
     "minimist": "^1.2.6",
     "native-is-elevated": "0.7.0",
     "native-keymap": "^3.3.5",

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

@@ -121,6 +121,8 @@ 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';
+
 /**
  * The main VS Code application. There will only ever be one instance,
  * even if the user starts many instances (e.g. from the command line).
@@ -148,7 +150,7 @@ export class CodeApplication extends Disposable {
 		@IStateService private readonly stateService: IStateService,
 		@IFileService private readonly fileService: IFileService,
 		@IProductService private readonly productService: IProductService,
-		@IUserDataProfilesMainService private readonly userDataProfilesMainService: IUserDataProfilesMainService
+		@IUserDataProfilesMainService private readonly userDataProfilesMainService: IUserDataProfilesMainService,
 	) {
 		super();
 
@@ -508,6 +510,16 @@ export class CodeApplication extends Disposable {
 		});
 
 		//#endregion
+
+		// //#region Void IPC
+		// validatedIpcMain.handle('vscode:sendLLMMessage', async (event, data) => {
+		// 	try {
+		// 		await this.sendLLMMessage(data);
+		// 	} catch (error) {
+		// 		console.error('Error sending LLM message:', error);
+		// 	}
+		// });
+		// //#endregion
 	}
 
 	private onUnexpectedError(error: Error): void {
@@ -1225,6 +1237,11 @@ export class CodeApplication extends Disposable {
 		mainProcessElectronServer.registerChannel('logger', loggerChannel);
 		sharedProcessClient.then(client => client.registerChannel('logger', loggerChannel));
 
+		// Void
+		// const sendLLMMessageChannel = ProxyChannel.fromService(accessor.get(ISendLLMMessageService), disposables);
+		const sendLLMMessageChannel = new LLMMessageChannel();
+		mainProcessElectronServer.registerChannel('void-channel-sendLLMMessage', sendLLMMessageChannel);
+
 		// Extension Host Debug Broadcasting
 		const electronExtensionHostDebugBroadcastChannel = new ElectronExtensionHostDebugBroadcastChannel(accessor.get(IWindowsMainService));
 		mainProcessElectronServer.registerChannel('extensionhostdebugservice', electronExtensionHostDebugBroadcastChannel);

src/vs/editor/browser/services/inlineDiffService/inlineDiffService.ts

@@ -12,7 +12,7 @@ export interface IInlineDiffService {
 	removeDiffs(editor: ICodeEditor): void;
 }
 
-export const IInlineDiffService = createDecorator<IInlineDiffService>('inlineDiffService');
+export const IInlineDiffService = createDecorator<IInlineDiffService>('inlineDiffServiceOld');
 
 class InlineDiffService extends Disposable implements IInlineDiffService {
 	private readonly _diffDecorations = new Map<ICodeEditor, string[]>();

src/vs/platform/void/browser/llmMessageService.ts

@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Glass Devtools, Inc. All rights reserved.
+ *  Void Editor additions licensed under the AGPLv3 License.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ProxyOnTextPayload, ProxyOnErrorPayload, ProxyOnFinalMessagePayload, LLMMessageServiceParams, ProxyLLMMessageParams, ProxyLLMMessageAbortParams } from '../common/llmMessageTypes.js';
+import { IChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { IMainProcessService } from '../../ipc/common/mainProcessService.js';
+import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { Event } from '../../../base/common/event.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
+
+
+// BROWSER IMPLEMENTATION OF SENDLLMMESSAGE
+export const ISendLLMMessageService = createDecorator<ISendLLMMessageService>('sendLLMMessageService');
+
+// defines an interface that node/ creates and browser/ uses
+export interface ISendLLMMessageService {
+	readonly _serviceBrand: undefined;
+	sendLLMMessage: (params: LLMMessageServiceParams) => string;
+	abort: (requestId: string) => void;
+}
+
+
+export class SendLLMMessageService implements ISendLLMMessageService {
+
+	readonly _serviceBrand: undefined;
+	private readonly channel: IChannel;
+
+	private readonly _disposablesOfRequestId: Record<string, IDisposable[]> = {}
+
+	constructor(
+		@IMainProcessService mainProcessService: IMainProcessService // used as a renderer (only usable on client side)
+	) {
+
+		this.channel = mainProcessService.getChannel('void-channel-sendLLMMessage')
+		// const service = ProxyChannel.toService<LLMMessageChannel>(mainProcessService.getChannel('void-channel-sendLLMMessage')); // lets you call it like a service, not needed here
+	}
+
+	_addDisposable(requestId: string, disposable: IDisposable) {
+		if (!this._disposablesOfRequestId[requestId]) {
+			this._disposablesOfRequestId[requestId] = []
+		}
+		this._disposablesOfRequestId[requestId].push(disposable)
+	}
+
+
+
+	sendLLMMessage(params: LLMMessageServiceParams) {
+		const requestId_ = generateUuid();
+		const { onText, onFinalMessage, onError, ...proxyParams } = params;
+
+		// listen for listenerName='onText' | 'onFinalMessage' | 'onError', and call the original function on it
+
+		const onTextEvent: Event<ProxyOnTextPayload> = this.channel.listen('onText')
+		this._addDisposable(requestId_,
+			onTextEvent(e => {
+				if (requestId_ !== e.requestId) return;
+				onText(e)
+			})
+		)
+
+		const onFinalMessageEvent: Event<ProxyOnFinalMessagePayload> = this.channel.listen('onFinalMessage')
+		this._addDisposable(requestId_,
+			onFinalMessageEvent(e => {
+				if (requestId_ !== e.requestId) return;
+				onFinalMessage(e)
+				this._dispose(requestId_)
+			})
+		)
+
+		const onErrorEvent: Event<ProxyOnErrorPayload> = this.channel.listen('onError')
+		this._addDisposable(requestId_,
+			onErrorEvent(e => {
+				if (requestId_ !== e.requestId) return;
+				console.log('event onError', JSON.stringify(e))
+				onError(e)
+				this._dispose(requestId_)
+			})
+		)
+
+		// params will be stripped of all its functions
+		this.channel.call('sendLLMMessage', { ...proxyParams, requestId: requestId_ } satisfies ProxyLLMMessageParams);
+
+		return requestId_
+	}
+
+	private _dispose(requestId: string) {
+		if (!(requestId in this._disposablesOfRequestId)) return
+		for (const disposable of this._disposablesOfRequestId[requestId]) {
+			disposable.dispose()
+		}
+		delete this._disposablesOfRequestId[requestId]
+	}
+
+	abort(requestId: string) {
+		this.channel.call('abort', { requestId } satisfies ProxyLLMMessageAbortParams);
+		this._dispose(requestId)
+	}
+}
+
+registerSingleton(ISendLLMMessageService, SendLLMMessageService, InstantiationType.Delayed);
+

src/vs/platform/void/common/llmMessageTypes.ts

@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Glass Devtools, Inc. All rights reserved.
+ *  Void Editor additions licensed under the AGPLv3 License.
+ *--------------------------------------------------------------------------------------------*/
+
+import { VoidConfig } from '../../../workbench/contrib/void/browser/registerConfig.js';
+
+// ---------- type definitions ----------
+
+export type OnText = (p: { newText: string, fullText: string }) => void
+
+export type OnFinalMessage = (p: { fullText: string }) => void
+
+export type OnError = (p: { error: Error | string }) => void
+
+export type AbortRef = { current: (() => void) | null }
+
+export type LLMMessage = {
+	role: 'system' | 'user' | 'assistant';
+	content: string;
+}
+
+export type LLMMessageServiceParams = {
+	onText: OnText;
+	onFinalMessage: OnFinalMessage;
+	onError: OnError;
+
+	messages: LLMMessage[];
+	voidConfig: VoidConfig | null;
+
+	logging: {
+		loggingName: string,
+	};
+}
+
+export type SendLLMMMessageParams = {
+	onText: OnText;
+	onFinalMessage: OnFinalMessage;
+	onError: OnError;
+
+	messages: LLMMessage[];
+	voidConfig: VoidConfig | null;
+
+	logging: {
+		loggingName: string,
+	};
+	abortRef: AbortRef;
+}
+
+// can't send functions across a proxy, use listeners instead
+export const listenerNames = ['onText', 'onFinalMessage', 'onError'] as const
+export type ProxyLLMMessageParams = Omit<LLMMessageServiceParams, typeof listenerNames[number]> & { requestId: string }
+
+export type ProxyOnTextPayload = Parameters<OnText>[0] & { requestId: string }
+export type ProxyOnFinalMessagePayload = Parameters<OnFinalMessage>[0] & { requestId: string }
+export type ProxyOnErrorPayload = Parameters<OnError>[0] & { requestId: string }
+
+export type ProxyLLMMessageAbortParams = { requestId: string }