Merge branch 'main' into pr/w1gs/87

Author: andrewpareles

extensions/void/package-lock.json

@@ -363,7 +363,7 @@
     "@types/node": "^22.5.1",
     "@types/react": "^18.3.4",
     "@types/react-dom": "^18.3.0",
-    "@types/vscode": "1.89.0",
+    "@types/vscode": "1.92.0",
     "@typescript-eslint/eslint-plugin": "^8.3.0",
     "@typescript-eslint/parser": "^8.3.0",
     "@vscode/test-cli": "^0.0.10",
@@ -382,13 +382,11 @@
     "rimraf": "^6.0.1",
     "tailwindcss": "^3.4.10",
     "typescript": "5.5.4",
-    "typescript-eslint": "^8.3.0"
+    "typescript-eslint": "^8.3.0",
+    "uuid": "^10.0.0"
   },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.27.1",
-    "diff-match-patch": "^1.0.5",
-    "ollama": "^0.5.9",
-    "openai": "^4.57.0",
-    "diff": "^7.0.0"
+    "openai": "^4.57.0"
   }
-}
+}

extensions/void/package.json

@@ -55,7 +55,7 @@ export class SidebarWebviewProvider implements vscode.WebviewViewProvider {
 		const openAICompatibleEndpoint: string | undefined = vscode.workspace.getConfiguration('void.openAICompatible').get('endpoint');
 		this._webviewDeps.push('void.openAICompatible.endpoint');
 		if (openAICompatibleEndpoint)
-			allowed_urls.push(openAICompatibleEndpoint);
+			allowed_urls.push(openAICompatibleEndpoint+'/chat/completions');
 
 		const scriptUri = webview.asWebviewUri(vscode.Uri.joinPath(this._extensionUri, 'dist/sidebar/index.js'));
 		const stylesUri = webview.asWebviewUri(vscode.Uri.joinPath(this._extensionUri, 'dist/sidebar/styles.css'));

extensions/void/src/SidebarWebviewProvider.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 import { DisplayChangesProvider } from './DisplayChangesProvider';
-import { BaseDiffArea, ChatThreads, WebviewMessage } from './shared_types';
+import { BaseDiffArea, ChatThreads, MessageFromSidebar, MessageToSidebar } from './shared_types';
 import { SidebarWebviewProvider } from './SidebarWebviewProvider';
 import { ApiConfig } from './common/sendLLMMessage';
 
@@ -79,7 +79,7 @@ export function activate(context: vscode.ExtensionContext) {
 			const filePath = editor.document.uri;
 
 			// send message to the webview (Sidebar.tsx)
-			webviewProvider.webview.then(webview => webview.postMessage({ type: 'ctrl+l', selection: { selectionStr, selectionRange, filePath } } satisfies WebviewMessage));
+			webviewProvider.webview.then(webview => webview.postMessage({ type: 'ctrl+l', selection: { selectionStr, selectionRange, filePath } } satisfies MessageToSidebar));
 		})
 	);
 
@@ -105,23 +105,23 @@ export function activate(context: vscode.ExtensionContext) {
 
 			// top navigation bar commands
 			context.subscriptions.push(vscode.commands.registerCommand('void.startNewThread', async () => {
-				webview.postMessage({ type: 'startNewThread' } satisfies WebviewMessage)
+				webview.postMessage({ type: 'startNewThread' } satisfies MessageToSidebar)
 			}))
 			context.subscriptions.push(vscode.commands.registerCommand('void.toggleThreadSelector', async () => {
-				webview.postMessage({ type: 'toggleThreadSelector' } satisfies WebviewMessage)
+				webview.postMessage({ type: 'toggleThreadSelector' } satisfies MessageToSidebar)
 			}))
 
 			// when config changes, send it to the sidebar
 			vscode.workspace.onDidChangeConfiguration(e => {
 				if (e.affectsConfiguration('void')) {
 					const apiConfig = getApiConfig()
-					webview.postMessage({ type: 'apiConfig', apiConfig } satisfies WebviewMessage)
+					webview.postMessage({ type: 'apiConfig', apiConfig } satisfies MessageToSidebar)
 				}
 			})
 
 
 			// Receive messages in the extension from the sidebar webview (messages are sent using `postMessage`)
-			webview.onDidReceiveMessage(async (m: WebviewMessage) => {
+			webview.onDidReceiveMessage(async (m: MessageFromSidebar) => {
 
 				if (m.type === 'requestFiles') {
 
@@ -131,7 +131,7 @@ export function activate(context: vscode.ExtensionContext) {
 					)
 
 					// send contents to webview
-					webview.postMessage({ type: 'files', files, } satisfies WebviewMessage)
+					webview.postMessage({ type: 'files', files, } satisfies MessageToSidebar)
 
 				} else if (m.type === 'applyChanges') {
 
@@ -168,19 +168,19 @@ export function activate(context: vscode.ExtensionContext) {
 				}
 				else if (m.type === 'getApiConfig') {
 					const apiConfig = getApiConfig()
-					webview.postMessage({ type: 'apiConfig', apiConfig } satisfies WebviewMessage)
+					webview.postMessage({ type: 'apiConfig', apiConfig } satisfies MessageToSidebar)
 				}
 				else if (m.type === 'getAllThreads') {
 					const threads: ChatThreads = context.workspaceState.get('allThreads') ?? {}
-					webview.postMessage({ type: 'allThreads', threads } satisfies WebviewMessage)
+					webview.postMessage({ type: 'allThreads', threads } satisfies MessageToSidebar)
 				}
 				else if (m.type === 'persistThread') {
 					const threads: ChatThreads = context.workspaceState.get('allThreads') ?? {}
 					const updatedThreads: ChatThreads = { ...threads, [m.thread.id]: m.thread }
 					context.workspaceState.update('allThreads', updatedThreads)
 				}
 				else {
-					console.error('unrecognized command', m.type, m)
+					console.error('unrecognized command', m)
 				}
 			})
 		}

extensions/void/src/extension.ts

@@ -38,45 +38,25 @@ type Diff = {
 	lenses: vscode.CodeLens[],
 } & BaseDiff
 
-type WebviewMessage = (
-
-	// editor -> sidebar
+// editor -> sidebar
+type MessageToSidebar = (
 	| { type: 'ctrl+l', selection: CodeSelection } // user presses ctrl+l in the editor
-
-	// sidebar -> editor
-	| { type: 'applyChanges', code: string } // user clicks "apply" in the sidebar
-
-	// sidebar -> editor
-	| { type: 'requestFiles', filepaths: vscode.Uri[] }
-
-	// editor -> sidebar
 	| { type: 'files', files: { filepath: vscode.Uri, content: string }[] }
-
-	// sidebar -> editor
-	| { type: 'getApiConfig' }
-
-	// editor -> sidebar
 	| { type: 'apiConfig', apiConfig: ApiConfig }
-
-	// sidebar -> editor
-	| { type: 'getAllThreads' }
-
-	// editor -> sidebar
 	| { type: 'allThreads', threads: ChatThreads }
-
-	// sidebar -> editor
-	| { type: 'persistThread', thread: ChatThreads[string] }
-
-	// editor -> sidebar
 	| { type: 'startNewThread' }
-
-	// editor -> sidebar
 	| { type: 'toggleThreadSelector' }
-
 )
 
+// sidebar -> editor
+type MessageFromSidebar = (
+	| { type: 'applyChanges', code: string } // user clicks "apply" in the sidebar
+	| { type: 'requestFiles', filepaths: vscode.Uri[] }
+	| { type: 'getApiConfig' }
+	| { type: 'getAllThreads' }
+	| { type: 'persistThread', thread: ChatThreads[string] }
+)
 
-type Command = WebviewMessage['type']
 
 type ChatThreads = {
 	[id: string]: {
@@ -105,8 +85,8 @@ export {
 	Diff, DiffArea,
 	CodeSelection,
 	File,
-	WebviewMessage,
-	Command,
+	MessageFromSidebar,
+	MessageToSidebar,
 	ChatThreads,
 	ChatMessage,
 }