Merge remote-tracking branch 'origin/main' into model-selection

build/filters.js

@@ -139,6 +139,7 @@ module.exports.indentationFilter = [
 	'!extensions/simple-browser/media/*.js',
 
 	'!extensions/open-remote-ssh/out/*.js', // Void added this
+	'!extensions/open-remote-wsl/out/*.js', // Void added this
 ];
 
 module.exports.copyrightFilter = [

build/gulpfile.extensions.js

@@ -73,6 +73,7 @@ const compilations = [
 	'.vscode/extensions/vscode-selfhost-import-aid/tsconfig.json',
 
 	'extensions/open-remote-ssh/tsconfig.json', // Void added this
+	'extensions/open-remote-wsl/tsconfig.json', // Void added this
 
 ];
 

build/npm/dirs.js

@@ -55,6 +55,7 @@ const dirs = [
 	'.vscode/extensions/vscode-selfhost-import-aid',
 	'.vscode/extensions/vscode-selfhost-test-provider',
 	'extensions/open-remote-ssh', // Void added this
+	'extensions/open-remote-wsl', // Void added this
 
 ];
 

extensions/open-remote-wsl/README.md

@@ -0,0 +1,3 @@
+# Remote - WSL Support
+
+Inherited for Void from [Open Remote - WSL](https://github.com/jeanp413/open-remote-wsl).

extensions/open-remote-wsl/extension-browser.webpack.config.js

@@ -0,0 +1,17 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withBrowserDefaults = require('../shared.webpack.config').browser;
+
+module.exports = withBrowserDefaults({
+	context: __dirname,
+	entry: {
+		extension: './src/extension.ts'
+	}
+});

extensions/open-remote-wsl/extension.webpack.config.js

@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../shared.webpack.config');
+
+module.exports = withDefaults({
+	context: __dirname,
+	resolve: {
+		mainFields: ['module', 'main']
+	},
+	entry: {
+		extension: './src/extension.ts',
+	}
+});

extensions/open-remote-wsl/package-lock.json

@@ -0,0 +1,15 @@
+{
+	"name": "open-remote-wsl",
+	"version": "0.0.4",
+	"lockfileVersion": 3,
+	"requires": true,
+	"packages": {
+		"": {
+			"name": "open-remote-wsl",
+			"version": "0.0.4",
+			"engines": {
+				"vscode": "^1.70.2"
+			}
+		}
+	}
+}

extensions/open-remote-wsl/package.json

@@ -0,0 +1,281 @@
+{
+	"name": "open-remote-wsl",
+	"displayName": "Remote - WSL",
+	"description": "Open any folder in the Windows Subsystem for Linux (WSL).",
+	"version": "0.0.4",
+	"icon": "resources/icon.png",
+	"engines": {
+		"vscode": "^1.70.2"
+	},
+	"extensionKind": [
+		"ui"
+	],
+	"enabledApiProposals": [
+		"resolvers",
+		"contribViewsRemote"
+	],
+	"keywords": [
+		"remote development",
+		"remote",
+		"wsl"
+	],
+	"api": "none",
+	"activationEvents": [
+		"onCommand:openremotewsl.connect",
+		"onCommand:openremotewsl.connectInNewWindow",
+		"onCommand:openremotewsl.connectUsingDistro",
+		"onCommand:openremotewsl.connectUsingDistroInNewWindow",
+		"onCommand:openremotewsl.showLog",
+		"onResolveRemoteAuthority:wsl",
+		"onView:wslTargets"
+	],
+	"main": "./out/extension.js",
+	"contributes": {
+		"configuration": {
+			"title": "WSL",
+			"properties": {
+				"remote.WSL.serverDownloadUrlTemplate": {
+					"type": "string",
+					"description": "The URL from where the vscode server will be downloaded. You can use the following variables and they will be replaced dynamically:\n- ${quality}: vscode server quality, e.g. stable or insiders\n- ${version}: vscode server version, e.g. 1.69.0\n- ${commit}: vscode server release commit\n- ${arch}: vscode server arch, e.g. x64, armhf, arm64\n- ${release}: release number",
+					"scope": "application",
+					"default": "https://github.com/voideditor/binaries/releases/download/${version}.${release}/void-reh-${os}-${arch}-${version}.${release}.tar.gz"
+				}
+			}
+		},
+		"views": {
+			"remote": [
+				{
+					"id": "wslTargets",
+					"name": "WSL Targets",
+					"group": "targets@1",
+					"when": "(isWindows && !isWeb)",
+					"remoteName": "wsl"
+				}
+			]
+		},
+		"commands": [
+			{
+				"command": "openremotewsl.connect",
+				"title": "Connect to WSL",
+				"category": "Remote-WSL"
+			},
+			{
+				"command": "openremotewsl.connectInNewWindow",
+				"title": "Connect to WSL in New Window",
+				"category": "Remote-WSL"
+			},
+			{
+				"command": "openremotewsl.connectUsingDistro",
+				"title": "Connect to WSL using Distro...",
+				"category": "Remote-WSL"
+			},
+			{
+				"command": "openremotewsl.connectUsingDistroInNewWindow",
+				"title": "Connect to WSL using Distro in New Window...",
+				"category": "Remote-WSL"
+			},
+			{
+				"command": "openremotewsl.showLog",
+				"title": "Show Log",
+				"category": "Remote-WSL"
+			},
+			{
+				"command": "openremotewsl.explorer.emptyWindowInNewWindow",
+				"title": "Connect in New Window",
+				"icon": "$(empty-window)"
+			},
+			{
+				"command": "openremotewsl.explorer.emptyWindowInCurrentWindow",
+				"title": "Connect in Current Window"
+			},
+			{
+				"command": "openremotewsl.explorer.reopenFolderInCurrentWindow",
+				"title": "Open in Current Window"
+			},
+			{
+				"command": "openremotewsl.explorer.reopenFolderInNewWindow",
+				"title": "Open in New Window",
+				"icon": "$(folder-opened)"
+			},
+			{
+				"command": "openremotewsl.explorer.deleteFolderHistoryItem",
+				"title": "Remove From Recent List",
+				"icon": "$(x)"
+			},
+			{
+				"command": "openremotewsl.explorer.refresh",
+				"title": "Refresh",
+				"icon": "$(refresh)"
+			},
+			{
+				"command": "openremotewsl.explorer.addDistro",
+				"title": "Add a Distro",
+				"icon": "$(plus)"
+			},
+			{
+				"command": "openremotewsl.explorer.setDefaultDistro",
+				"title": "Set as Default Distro"
+			},
+			{
+				"command": "openremotewsl.explorer.deleteDistro",
+				"title": "Delete Distro"
+			}
+		],
+		"resourceLabelFormatters": [
+			{
+				"scheme": "vscode-remote",
+				"authority": "wsl+*",
+				"formatting": {
+					"label": "${path}",
+					"separator": "/",
+					"tildify": true,
+					"workspaceSuffix": "WSL"
+				}
+			}
+		],
+		"menus": {
+			"statusBar/remoteIndicator": [
+				{
+					"command": "openremotewsl.connect",
+					"when": "(isWindows && !isWeb)",
+					"group": "remote_20_wsl_1general@1"
+				},
+				{
+					"command": "openremotewsl.connectUsingDistro",
+					"when": "(isWindows && !isWeb)",
+					"group": "remote_20_wsl_1general@2"
+				},
+				{
+					"command": "openremotewsl.showLog",
+					"when": "remoteName =~ /^wsl$/",
+					"group": "remote_20_wsl_1general@4"
+				}
+			],
+			"commandPalette": [
+				{
+					"command": "openremotewsl.connect",
+					"when": "(isWindows && !isWeb)"
+				},
+				{
+					"command": "openremotewsl.connectInNewWindow",
+					"when": "(isWindows && !isWeb)"
+				},
+				{
+					"command": "openremotewsl.connectUsingDistro",
+					"when": "(isWindows && !isWeb)"
+				},
+				{
+					"command": "openremotewsl.connectUsingDistroInNewWindow",
+					"when": "(isWindows && !isWeb)"
+				},
+				{
+					"command": "openremotewsl.explorer.refresh",
+					"when": "false"
+				},
+				{
+					"command": "openremotewsl.explorer.addDistro",
+					"when": "false"
+				},
+				{
+					"command": "openremotewsl.explorer.emptyWindowInNewWindow",
+					"when": "false"
+				},
+				{
+					"command": "openremotewsl.explorer.emptyWindowInCurrentWindow",
+					"when": "false"
+				},
+				{
+					"command": "openremotewsl.explorer.reopenFolderInCurrentWindow",
+					"when": "false"
+				},
+				{
+					"command": "openremotewsl.explorer.reopenFolderInNewWindow",
+					"when": "false"
+				},
+				{
+					"command": "openremotewsl.explorer.deleteFolderHistoryItem",
+					"when": "false"
+				},
+				{
+					"command": "openremotewsl.explorer.setDefaultDistro",
+					"when": "false"
+				},
+				{
+					"command": "openremotewsl.explorer.deleteDistro",
+					"when": "false"
+				}
+			],
+			"view/title": [
+				{
+					"command": "openremotewsl.explorer.addDistro",
+					"when": "view == wslTargets",
+					"group": "navigation"
+				},
+				{
+					"command": "openremotewsl.explorer.refresh",
+					"when": "view == wslTargets",
+					"group": "navigation"
+				}
+			],
+			"view/item/context": [
+				{
+					"command": "openremotewsl.explorer.emptyWindowInNewWindow",
+					"when": "viewItem =~ /^openremotewsl.explorer.distro$/",
+					"group": "inline@1"
+				},
+				{
+					"command": "openremotewsl.explorer.emptyWindowInNewWindow",
+					"when": "viewItem =~ /^openremotewsl.explorer.distro$/",
+					"group": "navigation@2"
+				},
+				{
+					"command": "openremotewsl.explorer.emptyWindowInCurrentWindow",
+					"when": "viewItem =~ /^openremotewsl.explorer.distro$/",
+					"group": "navigation@1"
+				},
+				{
+					"command": "openremotewsl.explorer.setDefaultDistro",
+					"when": "viewItem =~ /^openremotewsl.explorer.distro$/",
+					"group": "management@1"
+				},
+				{
+					"command": "openremotewsl.explorer.deleteDistro",
+					"when": "viewItem =~ /^openremotewsl.explorer.distro$/",
+					"group": "management@2"
+				},
+				{
+					"command": "openremotewsl.explorer.reopenFolderInNewWindow",
+					"when": "viewItem == openremotewsl.explorer.folder",
+					"group": "inline@1"
+				},
+				{
+					"command": "openremotewsl.explorer.reopenFolderInNewWindow",
+					"when": "viewItem == openremotewsl.explorer.folder",
+					"group": "navigation@2"
+				},
+				{
+					"command": "openremotewsl.explorer.reopenFolderInCurrentWindow",
+					"when": "viewItem == openremotewsl.explorer.folder",
+					"group": "navigation@1"
+				},
+				{
+					"command": "openremotewsl.explorer.deleteFolderHistoryItem",
+					"when": "viewItem =~ /^openremotewsl.explorer.folder/",
+					"group": "navigation@3"
+				},
+				{
+					"command": "openremotewsl.explorer.deleteFolderHistoryItem",
+					"when": "viewItem =~ /^openremotewsl.explorer.folder/",
+					"group": "inline@2"
+				}
+			]
+		}
+	},
+	"scripts": {
+    "vscode:prepublish": "npm run compile",
+    "compile": "gulp compile-extension:open-remote-wsl",
+    "compile-web": "npx webpack-cli --config extension-browser.webpack.config --mode none",
+    "watch": "gulp watch-extension:open-remote-wsl",
+    "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
+	}
+}

extensions/open-remote-wsl/src/authResolver.ts

@@ -0,0 +1,121 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import Log from './common/logger';
+import { installCodeServer, ServerInstallError } from './serverSetup';
+import { WSLManager } from './wsl/wslManager';
+
+export const REMOTE_WSL_AUTHORITY = 'wsl';
+
+export function getRemoteAuthority(distro: string) {
+	return `${REMOTE_WSL_AUTHORITY}+${distro}`;
+}
+
+class Tunnel implements vscode.Tunnel {
+	private _onDidDisposeEmitter = new vscode.EventEmitter<void>();
+
+	readonly onDidDispose = this._onDidDisposeEmitter.event;
+
+	constructor(
+		readonly remoteAddress: { port: number; host: string },
+		readonly localAddress: { port: number; host: string }
+	) {
+		// If ipv6 localhost 0:0:0:0:0:0:0:1 or [::1] replace with localhost
+		if (localAddress.host !== 'localhost' && localAddress.host !== '127.0.0.1') {
+			localAddress.host = 'localhost';
+		}
+	}
+
+	dispose() {
+		this._onDidDisposeEmitter.fire();
+	}
+}
+
+export class RemoteWSLResolver implements vscode.RemoteAuthorityResolver, vscode.Disposable {
+
+	private labelFormatterDisposable: vscode.Disposable | undefined;
+
+	constructor(
+		private readonly wslManager: WSLManager,
+		private readonly logger: Log
+	) {
+	}
+
+	resolve(authority: string, context: vscode.RemoteAuthorityResolverContext): Thenable<vscode.ResolverResult> {
+		const [type, distroName] = authority.split('+');
+		if (type !== REMOTE_WSL_AUTHORITY) {
+			throw new Error(`Invalid authority type for WSL resolver: ${type}`);
+		}
+
+		this.logger.info(`Resolving wsl remote authority '${authority}' (attemp #${context.resolveAttempt})`);
+
+		// It looks like default values are not loaded yet when resolving a remote,
+		// so let's hardcode the default values here
+		const remoteSSHconfig = vscode.workspace.getConfiguration('remote.WSL');
+		const serverDownloadUrlTemplate = remoteSSHconfig.get<string>('serverDownloadUrlTemplate');
+
+		return vscode.window.withProgress({
+			title: `Setting up WSL Distro: ${distroName}`,
+			location: vscode.ProgressLocation.Notification,
+			cancellable: false
+		}, async () => {
+			try {
+				const installResult = await installCodeServer(this.wslManager, distroName, serverDownloadUrlTemplate, [], [], this.logger);
+
+				this.labelFormatterDisposable?.dispose();
+				this.labelFormatterDisposable = vscode.workspace.registerResourceLabelFormatter({
+					scheme: 'vscode-remote',
+					authority: `${REMOTE_WSL_AUTHORITY}+*`,
+					formatting: {
+						label: '${path}',
+						separator: '/',
+						tildify: true,
+						workspaceSuffix: `WSL: ${distroName}`,
+						workspaceTooltip: `Running in ${distroName}`
+					}
+				});
+
+				return new vscode.ResolvedAuthority('127.0.0.1', installResult.listeningOn, installResult.connectionToken);
+			} catch (e: unknown) {
+				this.logger.error(`Error resolving authority`, e);
+
+				// Initial connection
+				if (context.resolveAttempt === 1) {
+					this.logger.show();
+
+					const closeRemote = 'Close Remote';
+					const retry = 'Retry';
+					const result = await vscode.window.showErrorMessage(`Could not establish connection to WSL distro "${distroName}"`, { modal: true }, closeRemote, retry);
+					if (result === closeRemote) {
+						await vscode.commands.executeCommand('workbench.action.remote.close');
+					} else if (result === retry) {
+						await vscode.commands.executeCommand('workbench.action.reloadWindow');
+					}
+				}
+
+				if (e instanceof ServerInstallError || !(e instanceof Error)) {
+					throw vscode.RemoteAuthorityResolverError.NotAvailable(e instanceof Error ? e.message : String(e));
+				} else {
+					throw vscode.RemoteAuthorityResolverError.TemporarilyNotAvailable(e.message);
+				}
+			}
+		});
+	}
+
+	async tunnelFactory(tunnelOptions: vscode.TunnelOptions) {
+		return new Tunnel(
+			tunnelOptions.remoteAddress,
+			{
+				host: tunnelOptions.remoteAddress.host,
+				port: tunnelOptions.localAddressPort ?? tunnelOptions.remoteAddress.port
+			}
+		);
+	}
+
+	dispose() {
+		this.labelFormatterDisposable?.dispose();
+	}
+}

extensions/open-remote-wsl/src/commands.ts

@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { getRemoteAuthority } from './authResolver';
+import { WSLDistro, WSLManager, WSLOnlineDistro } from './wsl/wslManager';
+import wslTerminal from './wsl/wslTerminal';
+
+async function showDistrosPicker(wslManager: WSLManager, placeHolder: string): Promise<WSLDistro | undefined> {
+	const pickItemsPromise = wslManager.listDistros()
+		.then(distros => distros.map(distroData => {
+			return {
+				...distroData,
+				label: `${distroData.name}`,
+				detail: distroData.isDefault ? 'default distro' : undefined,
+			};
+		}));
+
+	const picked = await vscode.window.showQuickPick(pickItemsPromise, { canPickMany: false, placeHolder });
+	return picked;
+}
+
+async function showOnlineDistrosPicker(wslManager: WSLManager, placeHolder: string): Promise<WSLOnlineDistro | undefined> {
+	const pickItemsPromise = Promise.all([wslManager.listOnlineDistros(), wslManager.listDistros()])
+		.then(([onlineDistros, localDistros]) => {
+			const distroToInstall = onlineDistros.filter(d => !localDistros.some(l => l.name === d.name));
+			return distroToInstall.map(distroData => {
+				return {
+					...distroData,
+					label: `${distroData.friendlyName}`,
+				};
+			});
+		});
+
+	const picked = await vscode.window.showQuickPick(pickItemsPromise, { canPickMany: false, placeHolder });
+	return picked;
+}
+
+export async function promptOpenRemoteWSLWindow(wslManager: WSLManager, useDefault: boolean, reuseWindow: boolean) {
+	let distroName: string | undefined;
+	if (useDefault) {
+		const distros = await wslManager.listDistros();
+		distroName = distros.find(distro => distro.isDefault)?.name;
+	} else {
+		distroName = (await showDistrosPicker(wslManager, 'Select WSL distro'))?.name;
+	}
+
+	if (!distroName) {
+		return;
+	}
+
+	openRemoteWSLWindow(distroName, reuseWindow);
+}
+
+export async function promptInstallNewWSLDistro(wslManager: WSLManager) {
+	const distroName = (await showOnlineDistrosPicker(wslManager, 'Select the WSL distro to install'))?.name;
+	if (!distroName) {
+		return;
+	}
+
+	wslTerminal.runCommand(`wsl.exe --install -d ${distroName}`);
+}
+
+export function openRemoteWSLWindow(distro: string, reuseWindow: boolean) {
+	vscode.commands.executeCommand('vscode.newWindow', { remoteAuthority: getRemoteAuthority(distro), reuseWindow });
+}
+
+export function openRemoteWSLLocationWindow(distro: string, path: string, reuseWindow: boolean) {
+	vscode.commands.executeCommand('vscode.openFolder', vscode.Uri.from({ scheme: 'vscode-remote', authority: getRemoteAuthority(distro), path }), { forceNewWindow: !reuseWindow });
+}
+
+export async function setDefaultWSLDistro(wslManager: WSLManager, distroName: string) {
+	await wslManager.setDefaultDistro(distroName);
+}
+
+export async function deleteWSLDistro(wslManager: WSLManager, distroName: string) {
+	const deleteAction = 'Delete';
+	const resp = await vscode.window.showInformationMessage(`Are you sure you want to permanently delete the distro "${distroName}" including all its data?`, { modal: true }, deleteAction);
+	if (resp === deleteAction) {
+		await wslManager.deleteDistro(distroName);
+		return true;
+	}
+	return false;
+}

extensions/open-remote-wsl/src/common/async.ts

@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export function timeout(millis: number): Promise<void> {
+	return new Promise((resolve) => setTimeout(resolve, millis));
+}
+
+export interface ITask<T> {
+	(): T;
+}
+
+export async function retry<T>(task: ITask<Promise<T>>, delay: number, retries: number): Promise<T> {
+	let lastError: Error | undefined;
+
+	for (let i = 0; i < retries; i++) {
+		try {
+			return await task();
+		} catch (error) {
+			lastError = error;
+
+			await timeout(delay);
+		}
+	}
+
+	throw lastError;
+}

extensions/open-remote-wsl/src/common/disposable.ts

@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+
+export function disposeAll(disposables: vscode.Disposable[]): void {
+	while (disposables.length) {
+		const item = disposables.pop();
+		if (item) {
+			item.dispose();
+		}
+	}
+}
+
+export abstract class Disposable {
+	private _isDisposed = false;
+
+	protected _disposables: vscode.Disposable[] = [];
+
+	public dispose(): any {
+		if (this._isDisposed) {
+			return;
+		}
+		this._isDisposed = true;
+		disposeAll(this._disposables);
+	}
+
+	protected _register<T extends vscode.Disposable>(value: T): T {
+		if (this._isDisposed) {
+			value.dispose();
+		} else {
+			this._disposables.push(value);
+		}
+		return value;
+	}
+
+	protected get isDisposed(): boolean {
+		return this._isDisposed;
+	}
+}

extensions/open-remote-wsl/src/common/event.ts

@@ -0,0 +1,142 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export interface IDisposable {
+	dispose(): void;
+}
+
+export interface Event<T> {
+	(listener: (e: T) => any, thisArgs?: any, disposables?: IDisposable[]): IDisposable;
+}
+
+/**
+ * Returns a promise that resolves when the event fires, or when cancellation
+ * is requested, whichever happens first.
+ */
+export function toPromise<T>(event: Event<T>): Promise<T>;
+export function toPromise<T>(event: Event<T>, signal: AbortSignal): Promise<T | undefined>;
+export function toPromise<T>(event: Event<T>, signal?: AbortSignal): Promise<T | undefined> {
+	if (!signal) {
+		return new Promise<T>((resolve) => once(event, resolve));
+	}
+
+	if (signal.aborted) {
+		return Promise.resolve(undefined);
+	}
+
+	return new Promise((resolve) => {
+		const d2 = once(event, (data) => {
+			(signal as any).removeEventListener('abort', d1);
+			resolve(data);
+		});
+
+		const d1 = () => {
+			d2.dispose();
+			(signal as any).removeEventListener('abort', d1);
+			resolve(undefined);
+		};
+
+		(signal as any).addEventListener('abort', d1);
+	});
+}
+
+/**
+ * Adds a handler that handles one event on the emitter, then disposes itself.
+ */
+export const once = <T>(event: Event<T>, listener: (data: T) => void): IDisposable => {
+	const disposable = event((value) => {
+		listener(value);
+		disposable.dispose();
+	});
+
+	return disposable;
+};
+
+/**
+ * Base event emitter. Calls listeners when data is emitted.
+ */
+export class EventEmitter<T> {
+	private listeners?: Array<(data: T) => void> | ((data: T) => void);
+
+	/**
+	 * Event<T> function.
+	 */
+	public readonly event: Event<T> = (listener, thisArgs, disposables) => {
+		const d = this.add(thisArgs ? listener.bind(thisArgs) : listener);
+		disposables?.push(d);
+		return d;
+	};
+
+	/**
+	 * Gets the number of event listeners.
+	 */
+	public get size() {
+		if (!this.listeners) {
+			return 0;
+		} else if (typeof this.listeners === 'function') {
+			return 1;
+		} else {
+			return this.listeners.length;
+		}
+	}
+
+	/**
+	 * Emits event data.
+	 */
+	public fire(value: T) {
+		if (!this.listeners) {
+			// no-op
+		} else if (typeof this.listeners === 'function') {
+			this.listeners(value);
+		} else {
+			for (const listener of this.listeners) {
+				listener(value);
+			}
+		}
+	}
+
+	/**
+	 * Disposes of the emitter.
+	 */
+	public dispose() {
+		this.listeners = undefined;
+	}
+
+	private add(listener: (data: T) => void): IDisposable {
+		if (!this.listeners) {
+			this.listeners = listener;
+		} else if (typeof this.listeners === 'function') {
+			this.listeners = [this.listeners, listener];
+		} else {
+			this.listeners.push(listener);
+		}
+
+		return { dispose: () => this.rm(listener) };
+	}
+
+	private rm(listener: (data: T) => void) {
+		if (!this.listeners) {
+			return;
+		}
+
+		if (typeof this.listeners === 'function') {
+			if (this.listeners === listener) {
+				this.listeners = undefined;
+			}
+			return;
+		}
+
+		const index = this.listeners.indexOf(listener);
+		if (index === -1) {
+			return;
+		}
+
+		if (this.listeners.length === 2) {
+			this.listeners = index === 0 ? this.listeners[1] : this.listeners[0];
+		} else {
+			this.listeners = this.listeners.slice(0, index).concat(this.listeners.slice(index + 1));
+		}
+	}
+}

extensions/open-remote-wsl/src/common/files.ts

@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as fs from 'fs';
+import * as os from 'os';
+
+const homeDir = os.homedir();
+
+export async function exists(path: string) {
+	try {
+		await fs.promises.access(path);
+		return true;
+	} catch {
+		return false;
+	}
+}
+
+export function untildify(path: string) {
+	return path.replace(/^~(?=$|\/|\\)/, homeDir);
+}
+
+export function normalizeToSlash(path: string) {
+	return path.replace(/\\/g, '/');
+}

extensions/open-remote-wsl/src/common/logger.ts

@@ -0,0 +1,64 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+
+type LogLevel = 'Trace' | 'Info' | 'Error';
+
+export default class Log {
+	private output: vscode.OutputChannel;
+
+	constructor(name: string) {
+		this.output = vscode.window.createOutputChannel(name);
+	}
+
+	private data2String(data: any): string {
+		if (data instanceof Error) {
+			return data.stack || data.message;
+		}
+		if (data.success === false && data.message) {
+			return data.message;
+		}
+		return data.toString();
+	}
+
+	public trace(message: string, data?: any): void {
+		this.logLevel('Trace', message, data);
+	}
+
+	public info(message: string, data?: any): void {
+		this.logLevel('Info', message, data);
+	}
+
+	public error(message: string, data?: any): void {
+		this.logLevel('Error', message, data);
+	}
+
+	public logLevel(level: LogLevel, message: string, data?: any): void {
+		this.output.appendLine(`[${level}  - ${this.now()}] ${message}`);
+		if (data) {
+			this.output.appendLine(this.data2String(data));
+		}
+	}
+
+	private now(): string {
+		const now = new Date();
+		return padLeft(now.getUTCHours() + '', 2, '0')
+			+ ':' + padLeft(now.getMinutes() + '', 2, '0')
+			+ ':' + padLeft(now.getUTCSeconds() + '', 2, '0') + '.' + now.getMilliseconds();
+	}
+
+	public show() {
+		this.output.show();
+	}
+
+	public dispose() {
+		this.output.dispose();
+	}
+}
+
+function padLeft(s: string, n: number, pad = ' ') {
+	return pad.repeat(Math.max(0, n - s.length)) + s;
+}

extensions/open-remote-wsl/src/common/platform.ts

@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export const isWindows = process.platform === 'win32';
+export const isMacintosh = process.platform === 'darwin';
+export const isLinux = process.platform === 'linux';

extensions/open-remote-wsl/src/common/ports.ts

@@ -0,0 +1,134 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as net from 'net';
+
+/**
+ * Finds a random unused port assigned by the operating system. Will reject in case no free port can be found.
+ */
+export function findRandomPort(): Promise<number> {
+	return new Promise((resolve, reject) => {
+		const server = net.createServer({ pauseOnConnect: true });
+		server.on('error', reject);
+		server.on('listening', () => {
+			const port = (server.address() as net.AddressInfo).port;
+			server.close(() => resolve(port));
+		});
+		server.listen(0, '127.0.0.1');
+	});
+}
+
+/**
+ * Given a start point and a max number of retries, will find a port that
+ * is openable. Will return 0 in case no free port can be found.
+ */
+export function findFreePort(startPort: number, giveUpAfter: number, timeout: number, stride = 1): Promise<number> {
+	let done = false;
+
+	return new Promise(resolve => {
+		const timeoutHandle = setTimeout(() => {
+			if (!done) {
+				done = true;
+				return resolve(0);
+			}
+		}, timeout);
+
+		doFindFreePort(startPort, giveUpAfter, stride, (port) => {
+			if (!done) {
+				done = true;
+				clearTimeout(timeoutHandle);
+				return resolve(port);
+			}
+		});
+	});
+}
+
+function doFindFreePort(startPort: number, giveUpAfter: number, stride: number, clb: (port: number) => void): void {
+	if (giveUpAfter === 0) {
+		return clb(0);
+	}
+
+	const client = new net.Socket();
+
+	// If we can connect to the port it means the port is already taken so we continue searching
+	client.once('connect', () => {
+		dispose(client);
+
+		return doFindFreePort(startPort + stride, giveUpAfter - 1, stride, clb);
+	});
+
+	client.once('data', () => {
+		// this listener is required since node.js 8.x
+	});
+
+	client.once('error', (err: Error & { code?: string }) => {
+		dispose(client);
+
+		// If we receive any non ECONNREFUSED error, it means the port is used but we cannot connect
+		if (err.code !== 'ECONNREFUSED') {
+			return doFindFreePort(startPort + stride, giveUpAfter - 1, stride, clb);
+		}
+
+		// Otherwise it means the port is free to use!
+		return clb(startPort);
+	});
+
+	client.connect(startPort, '127.0.0.1');
+}
+
+/**
+ * Uses listen instead of connect. Is faster, but if there is another listener on 0.0.0.0 then this will take 127.0.0.1 from that listener.
+ */
+export function findFreePortFaster(startPort: number, giveUpAfter: number, timeout: number): Promise<number> {
+	let resolved = false;
+	let timeoutHandle: NodeJS.Timeout | undefined = undefined;
+	let countTried = 1;
+	const server = net.createServer({ pauseOnConnect: true });
+	function doResolve(port: number, resolve: (port: number) => void) {
+		if (!resolved) {
+			resolved = true;
+			server.removeAllListeners();
+			server.close();
+			if (timeoutHandle) {
+				clearTimeout(timeoutHandle);
+			}
+			resolve(port);
+		}
+	}
+	return new Promise<number>(resolve => {
+		timeoutHandle = setTimeout(() => {
+			doResolve(0, resolve);
+		}, timeout);
+
+		server.on('listening', () => {
+			doResolve(startPort, resolve);
+		});
+		server.on('error', err => {
+			if (err && ((<any>err).code === 'EADDRINUSE' || (<any>err).code === 'EACCES') && (countTried < giveUpAfter)) {
+				startPort++;
+				countTried++;
+				server.listen(startPort, '127.0.0.1');
+			} else {
+				doResolve(0, resolve);
+			}
+		});
+		server.on('close', () => {
+			doResolve(0, resolve);
+		});
+		server.listen(startPort, '127.0.0.1');
+	});
+}
+
+function dispose(socket: net.Socket): void {
+	try {
+		socket.removeAllListeners('connect');
+		socket.removeAllListeners('error');
+		socket.end();
+		socket.destroy();
+		socket.unref();
+	} catch (error) {
+		console.error(error); // otherwise this error would get lost in the callback chain
+	}
+}

extensions/open-remote-wsl/src/distroTreeView.ts

@@ -0,0 +1,109 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import * as path from 'path';
+import { RemoteLocationHistory } from './remoteLocationHistory';
+import { Disposable } from './common/disposable';
+import { openRemoteWSLWindow, openRemoteWSLLocationWindow, promptInstallNewWSLDistro, deleteWSLDistro, setDefaultWSLDistro } from './commands';
+import { WSLManager } from './wsl/wslManager';
+
+class DistroItem {
+	constructor(
+		public name: string,
+		public isDefault: boolean,
+		public locations: string[]
+	) {
+	}
+}
+
+class DistroLocationItem {
+	constructor(
+		public path: string,
+		public name: string
+	) {
+	}
+}
+
+type DataTreeItem = DistroItem | DistroLocationItem;
+
+export class DistroTreeDataProvider extends Disposable implements vscode.TreeDataProvider<DataTreeItem> {
+
+	private readonly _onDidChangeTreeData = this._register(new vscode.EventEmitter<DataTreeItem | DataTreeItem[] | void>());
+	public readonly onDidChangeTreeData = this._onDidChangeTreeData.event;
+
+	constructor(
+		private readonly locationHistory: RemoteLocationHistory,
+		private readonly wslManager: WSLManager
+	) {
+		super();
+
+		this._register(vscode.commands.registerCommand('openremotewsl.explorer.addDistro', () => promptInstallNewWSLDistro(wslManager)));
+		this._register(vscode.commands.registerCommand('openremotewsl.explorer.refresh', () => this.refresh()));
+		this._register(vscode.commands.registerCommand('openremotewsl.explorer.emptyWindowInNewWindow', e => this.openRemoteWSLWindow(e, false)));
+		this._register(vscode.commands.registerCommand('openremotewsl.explorer.emptyWindowInCurrentWindow', e => this.openRemoteWSLWindow(e, true)));
+		this._register(vscode.commands.registerCommand('openremotewsl.explorer.reopenFolderInNewWindow', e => this.openRemoteWSLocationWindow(e, false)));
+		this._register(vscode.commands.registerCommand('openremotewsl.explorer.reopenFolderInCurrentWindow', e => this.openRemoteWSLocationWindow(e, true)));
+		this._register(vscode.commands.registerCommand('openremotewsl.explorer.deleteFolderHistoryItem', e => this.deleteDistroLocation(e)));
+		this._register(vscode.commands.registerCommand('openremotewsl.explorer.setDefaultDistro', e => this.setDefaultDistro(e)));
+		this._register(vscode.commands.registerCommand('openremotewsl.explorer.deleteDistro', e => this.deleteDistro(e)));
+	}
+
+	getTreeItem(element: DataTreeItem): vscode.TreeItem {
+		if (element instanceof DistroLocationItem) {
+			const label = path.posix.basename(element.path).replace(/\.code-workspace$/, ' (Workspace)');
+			const treeItem = new vscode.TreeItem(label);
+			treeItem.description = path.posix.dirname(element.path);
+			treeItem.iconPath = new vscode.ThemeIcon('folder');
+			treeItem.contextValue = 'openremotewsl.explorer.folder';
+			return treeItem;
+		}
+
+		const treeItem = new vscode.TreeItem(element.name);
+		treeItem.description = element.isDefault ? 'default distro' : undefined;
+		treeItem.collapsibleState = element.locations.length ? vscode.TreeItemCollapsibleState.Collapsed : vscode.TreeItemCollapsibleState.None;
+		treeItem.iconPath = new vscode.ThemeIcon('vm');
+		treeItem.contextValue = 'openremotewsl.explorer.distro';
+		return treeItem;
+	}
+
+	async getChildren(element?: DistroItem): Promise<DataTreeItem[]> {
+		if (!element) {
+			const distros = await this.wslManager.listDistros();
+			return distros.map(distro => new DistroItem(distro.name, distro.isDefault, this.locationHistory.getHistory(distro.name)));
+		}
+		if (element instanceof DistroItem) {
+			return element.locations.map(location => new DistroLocationItem(location, element.name));
+		}
+		return [];
+	}
+
+	private refresh() {
+		this._onDidChangeTreeData.fire();
+	}
+
+	private async deleteDistroLocation(element: DistroLocationItem) {
+		await this.locationHistory.removeLocation(element.name, element.path);
+		this.refresh();
+	}
+
+	private async openRemoteWSLWindow(element: DistroItem, reuseWindow: boolean) {
+		openRemoteWSLWindow(element.name, reuseWindow);
+	}
+
+	private async openRemoteWSLocationWindow(element: DistroLocationItem, reuseWindow: boolean) {
+		openRemoteWSLLocationWindow(element.name, element.path, reuseWindow);
+	}
+
+	private async setDefaultDistro(element: DistroItem) {
+		await setDefaultWSLDistro(this.wslManager, element.name);
+		this.refresh();
+	}
+
+	private async deleteDistro(element: DistroItem) {
+		await deleteWSLDistro(this.wslManager, element.name);
+		this.refresh();
+	}
+}

extensions/open-remote-wsl/src/extension.ts

@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import Log from './common/logger';
+import { RemoteWSLResolver, REMOTE_WSL_AUTHORITY } from './authResolver';
+import { promptOpenRemoteWSLWindow } from './commands';
+import { DistroTreeDataProvider } from './distroTreeView';
+import { getRemoteWorkspaceLocationData, RemoteLocationHistory } from './remoteLocationHistory';
+import { WSLManager } from './wsl/wslManager';
+import { isWindows } from './common/platform';
+
+export async function activate(context: vscode.ExtensionContext) {
+	if (!isWindows) {
+		return;
+	}
+
+	const logger = new Log('Remote - WSL');
+	context.subscriptions.push(logger);
+
+	const wslManager = new WSLManager(logger);
+	const remoteWSLResolver = new RemoteWSLResolver(wslManager, logger);
+	context.subscriptions.push(vscode.workspace.registerRemoteAuthorityResolver(REMOTE_WSL_AUTHORITY, remoteWSLResolver));
+	context.subscriptions.push(remoteWSLResolver);
+
+	const locationHistory = new RemoteLocationHistory(context);
+	const locationData = getRemoteWorkspaceLocationData();
+	if (locationData) {
+		await locationHistory.addLocation(locationData[0], locationData[1]);
+	}
+
+	const distroTreeDataProvider = new DistroTreeDataProvider(locationHistory, wslManager);
+	context.subscriptions.push(vscode.window.createTreeView('wslTargets', { treeDataProvider: distroTreeDataProvider }));
+	context.subscriptions.push(distroTreeDataProvider);
+
+	context.subscriptions.push(vscode.commands.registerCommand('openremotewsl.connect', () => promptOpenRemoteWSLWindow(wslManager, true, true)));
+	context.subscriptions.push(vscode.commands.registerCommand('openremotewsl.connectInNewWindow', () => promptOpenRemoteWSLWindow(wslManager, true, false)));
+	context.subscriptions.push(vscode.commands.registerCommand('openremotewsl.connectUsingDistro', () => promptOpenRemoteWSLWindow(wslManager, false, true)));
+	context.subscriptions.push(vscode.commands.registerCommand('openremotewsl.connectUsingDistroInNewWindow', () => promptOpenRemoteWSLWindow(wslManager, false, false)));
+	context.subscriptions.push(vscode.commands.registerCommand('openremotewsl.showLog', () => logger.show()));
+}
+
+export function deactivate() {
+}

extensions/open-remote-wsl/src/remoteLocationHistory.ts

@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { REMOTE_WSL_AUTHORITY } from './authResolver';
+
+export class RemoteLocationHistory {
+	private static STORAGE_KEY = 'remoteLocationHistory_v0';
+
+	private remoteLocationHistory: Record<string, string[]> = {};
+
+	constructor(private context: vscode.ExtensionContext) {
+		// context.globalState.update(RemoteLocationHistory.STORAGE_KEY, undefined);
+		this.remoteLocationHistory = context.globalState.get(RemoteLocationHistory.STORAGE_KEY) || {};
+	}
+
+	getHistory(host: string): string[] {
+		return this.remoteLocationHistory[host] || [];
+	}
+
+	async addLocation(host: string, path: string) {
+		const hostLocations = this.remoteLocationHistory[host] || [];
+		if (!hostLocations.includes(path)) {
+			hostLocations.unshift(path);
+			this.remoteLocationHistory[host] = hostLocations;
+
+			await this.context.globalState.update(RemoteLocationHistory.STORAGE_KEY, this.remoteLocationHistory);
+		}
+	}
+
+	async removeLocation(host: string, path: string) {
+		let hostLocations = this.remoteLocationHistory[host] || [];
+		hostLocations = hostLocations.filter(l => l !== path);
+		this.remoteLocationHistory[host] = hostLocations;
+
+		await this.context.globalState.update(RemoteLocationHistory.STORAGE_KEY, this.remoteLocationHistory);
+	}
+}
+
+export function getRemoteWorkspaceLocationData(): [string, string] | undefined {
+	let location = vscode.workspace.workspaceFile;
+	if (location && location.scheme === 'vscode-remote' && location.authority.startsWith(REMOTE_WSL_AUTHORITY) && location.path.endsWith('.code-workspace')) {
+		const [, distroName] = location.authority.split('+');
+		return [distroName, location.path];
+	}
+
+	location = vscode.workspace.workspaceFolders?.[0].uri;
+	if (location && location.scheme === 'vscode-remote' && location.authority.startsWith(REMOTE_WSL_AUTHORITY)) {
+		const [, distroName] = location.authority.split('+');
+		return [distroName, location.path];
+	}
+
+	return undefined;
+}

extensions/open-remote-wsl/src/serverConfig.ts

@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import * as fs from 'fs';
+import * as path from 'path';
+
+let vscodeProductJson: any;
+async function getVSCodeProductJson() {
+	if (!vscodeProductJson) {
+		const productJsonStr = await fs.promises.readFile(path.join(vscode.env.appRoot, 'product.json'), 'utf8');
+		vscodeProductJson = JSON.parse(productJsonStr);
+	}
+
+	return vscodeProductJson;
+}
+
+export interface IServerConfig {
+	version: string;
+	commit: string;
+	quality: string;
+	release?: string; // void-like specific
+	serverApplicationName: string;
+	serverDataFolderName: string;
+	serverDownloadUrlTemplate?: string; // void-like specific
+}
+
+export async function getVSCodeServerConfig(): Promise<IServerConfig> {
+	const productJson = await getVSCodeProductJson();
+
+	return {
+		// version: vscode.version.replace('-insider', ''),
+		commit: productJson.commit,
+		quality: productJson.quality,
+		release: productJson.release,
+		serverApplicationName: productJson.serverApplicationName,
+		serverDataFolderName: productJson.serverDataFolderName,
+		serverDownloadUrlTemplate: productJson.serverDownloadUrlTemplate,
+		// Void changed this
+		version: productJson.voidVersion
+	};
+}

extensions/open-remote-wsl/src/serverSetup.ts

@@ -0,0 +1,353 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as crypto from 'crypto';
+import Log from './common/logger';
+import { getVSCodeServerConfig } from './serverConfig';
+import { WSLManager } from './wsl/wslManager';
+
+export interface ServerInstallOptions {
+	id: string;
+	quality: string;
+	commit: string;
+	version: string;
+	release?: string; // void specific
+	extensionIds: string[];
+	envVariables: string[];
+	serverApplicationName: string;
+	serverDataFolderName: string;
+	serverDownloadUrlTemplate: string;
+}
+
+export interface ServerInstallResult {
+	exitCode: number;
+	listeningOn: number;
+	connectionToken: string;
+	logFile: string;
+	osReleaseId: string;
+	arch: string;
+	platform: string;
+	tmpDir: string;
+	[key: string]: any;
+}
+
+export class ServerInstallError extends Error {
+	constructor(message: string) {
+		super(message);
+	}
+}
+
+const DEFAULT_DOWNLOAD_URL_TEMPLATE = 'https://github.com/voideditor/binaries/releases/download/${version}.${release}/void-reh-${os}-${arch}-${version}.${release}.tar.gz';
+
+export async function installCodeServer(wslManager: WSLManager, distroName: string, serverDownloadUrlTemplate: string | undefined, extensionIds: string[], envVariables: string[], logger: Log): Promise<ServerInstallResult> {
+	const scriptId = crypto.randomBytes(12).toString('hex');
+
+	const vscodeServerConfig = await getVSCodeServerConfig();
+	const installOptions: ServerInstallOptions = {
+		id: scriptId,
+		version: vscodeServerConfig.version,
+		commit: vscodeServerConfig.commit,
+		quality: vscodeServerConfig.quality,
+		release: vscodeServerConfig.release,
+		extensionIds,
+		envVariables,
+		serverApplicationName: vscodeServerConfig.serverApplicationName,
+		serverDataFolderName: vscodeServerConfig.serverDataFolderName,
+		serverDownloadUrlTemplate: serverDownloadUrlTemplate ?? vscodeServerConfig.serverDownloadUrlTemplate ?? DEFAULT_DOWNLOAD_URL_TEMPLATE,
+	};
+
+	const installServerScript = generateBashInstallScript(installOptions);
+
+	// Fish shell does not support heredoc so let's workaround it using -c option,
+	// also replace single quotes (') within the script with ('\'') as there's no quoting within single quotes, see https://unix.stackexchange.com/a/24676
+	const resp = await wslManager.exec('bash', ['-c', `'${installServerScript.replace(/'/g, `'\\''`)}'`], distroName);
+
+	const endScriptRegex = new RegExp(`${scriptId}: Server installation script done`, 'm');
+	const commandOutput = await Promise.race([
+		resp.exitPromise.then(result => ({ stdout: resp.stdout, stderr: resp.stderr, exitCode: result.exitCode })),
+		new Promise<{ stdout: string; stderr: string; exitCode: number }>((resolve) => {
+			resp.onStdoutData(buffer => {
+				if (endScriptRegex.test(buffer.toString('utf8'))) {
+					resolve({ stdout: resp.stdout, stderr: resp.stderr, exitCode: 0 });
+				}
+			});
+		})
+	]);
+
+	if (commandOutput.exitCode) {
+		logger.trace('Server install command stderr:', commandOutput.stderr);
+	}
+	logger.trace('Server install command stdout:', commandOutput.stdout);
+
+	const resultMap = parseServerInstallOutput(commandOutput.stdout, scriptId);
+	if (!resultMap) {
+		throw new ServerInstallError(`Failed parsing install script output`);
+	}
+
+	const exitCode = parseInt(resultMap.exitCode, 10);
+	if (exitCode !== 0) {
+		throw new ServerInstallError(`Couldn't install void server on remote server, install script returned non-zero exit status`);
+	}
+
+	const listeningOn = parseInt(resultMap.listeningOn, 10);
+
+	const remoteEnvVars = Object.fromEntries(Object.entries(resultMap).filter(([key,]) => envVariables.includes(key)));
+
+	return {
+		exitCode,
+		listeningOn,
+		connectionToken: resultMap.connectionToken,
+		logFile: resultMap.logFile,
+		osReleaseId: resultMap.osReleaseId,
+		arch: resultMap.arch,
+		platform: resultMap.platform,
+		tmpDir: resultMap.tmpDir,
+		...remoteEnvVars
+	};
+}
+
+function parseServerInstallOutput(str: string, scriptId: string): { [k: string]: string } | undefined {
+	const startResultStr = `${scriptId}: start`;
+	const endResultStr = `${scriptId}: end`;
+
+	const startResultIdx = str.indexOf(startResultStr);
+	if (startResultIdx < 0) {
+		return undefined;
+	}
+
+	const endResultIdx = str.indexOf(endResultStr, startResultIdx + startResultStr.length);
+	if (endResultIdx < 0) {
+		return undefined;
+	}
+
+	const installResult = str.substring(startResultIdx + startResultStr.length, endResultIdx);
+
+	const resultMap: { [k: string]: string } = {};
+	const resultArr = installResult.split(/\r?\n/);
+	for (const line of resultArr) {
+		const [key, value] = line.split('==');
+		resultMap[key] = value;
+	}
+
+	return resultMap;
+}
+
+function generateBashInstallScript({ id, quality, version, commit, release, extensionIds, envVariables, serverApplicationName, serverDataFolderName, serverDownloadUrlTemplate }: ServerInstallOptions) {
+	const extensions = extensionIds.map(id => '--install-extension ' + id).join(' ');
+	return `
+# Server installation script
+
+TMP_DIR="\${XDG_RUNTIME_DIR:-"/tmp"}"
+
+DISTRO_VERSION="${version}"
+DISTRO_COMMIT="${commit}"
+DISTRO_QUALITY="${quality}"
+DISTRO_VSCODIUM_RELEASE="${release ?? ''}"
+
+SERVER_APP_NAME="${serverApplicationName}"
+SERVER_INITIAL_EXTENSIONS="${extensions}"
+SERVER_LISTEN_FLAG="--port=0"
+SERVER_DATA_DIR="$HOME/${serverDataFolderName}"
+SERVER_DIR="$SERVER_DATA_DIR/bin/$DISTRO_COMMIT"
+SERVER_SCRIPT="$SERVER_DIR/bin/$SERVER_APP_NAME"
+SERVER_LOGFILE="$SERVER_DATA_DIR/.$DISTRO_COMMIT.log"
+SERVER_PIDFILE="$SERVER_DATA_DIR/.$DISTRO_COMMIT.pid"
+SERVER_TOKENFILE="$SERVER_DATA_DIR/.$DISTRO_COMMIT.token"
+SERVER_OS=
+SERVER_ARCH=
+SERVER_CONNECTION_TOKEN=
+SERVER_DOWNLOAD_URL=
+
+LISTENING_ON=
+OS_RELEASE_ID=
+ARCH=
+PLATFORM=
+
+# Mimic output from logs of remote-ssh extension
+print_install_results_and_exit() {
+	echo "${id}: start"
+	echo "exitCode==$1=="
+	echo "listeningOn==$LISTENING_ON=="
+	echo "connectionToken==$SERVER_CONNECTION_TOKEN=="
+	echo "logFile==$SERVER_LOGFILE=="
+	echo "osReleaseId==$OS_RELEASE_ID=="
+	echo "arch==$ARCH=="
+	echo "platform==$PLATFORM=="
+	echo "tmpDir==$TMP_DIR=="
+	${envVariables.map(envVar => `echo "${envVar}==$${envVar}=="`).join('\n')}
+	echo "${id}: end"
+	exit 0
+}
+
+# Check if platform is supported
+PLATFORM="$(uname -s)"
+case $PLATFORM in
+	Linux)
+		SERVER_OS="linux"
+		;;
+	*)
+		echo "Error platform not supported: $PLATFORM"
+		print_install_results_and_exit 1
+		;;
+esac
+
+# Check machine architecture
+ARCH="$(uname -m)"
+case $ARCH in
+	x86_64 | amd64)
+		SERVER_ARCH="x64"
+		;;
+	armv7l | armv8l)
+		SERVER_ARCH="armhf"
+		;;
+	arm64 | aarch64)
+		SERVER_ARCH="arm64"
+		;;
+	*)
+		echo "Error architecture not supported: $ARCH"
+		print_install_results_and_exit 1
+		;;
+esac
+
+# https://www.freedesktop.org/software/systemd/man/os-release.html
+OS_RELEASE_ID="$(grep -i '^ID=' /etc/os-release 2>/dev/null | sed 's/^ID=//gi' | sed 's/"//g')"
+if [[ -z $OS_RELEASE_ID ]]; then
+	OS_RELEASE_ID="$(grep -i '^ID=' /usr/lib/os-release 2>/dev/null | sed 's/^ID=//gi' | sed 's/"//g')"
+	if [[ -z $OS_RELEASE_ID ]]; then
+		OS_RELEASE_ID="unknown"
+	fi
+fi
+
+# Create installation folder
+if [[ ! -d $SERVER_DIR ]]; then
+	mkdir -p $SERVER_DIR
+	if (( $? > 0 )); then
+		echo "Error creating server install directory"
+		print_install_results_and_exit 1
+	fi
+fi
+
+SERVER_DOWNLOAD_URL="$(echo "${serverDownloadUrlTemplate.replace(/\$\{/g, '\\${')}" | sed "s/\\\${quality}/$DISTRO_QUALITY/g" | sed "s/\\\${version}/$DISTRO_VERSION/g" | sed "s/\\\${commit}/$DISTRO_COMMIT/g" | sed "s/\\\${os}/$SERVER_OS/g" | sed "s/\\\${arch}/$SERVER_ARCH/g" | sed "s/\\\${release}/$DISTRO_VSCODIUM_RELEASE/g")"
+
+# Check if server script is already installed
+if [[ ! -f $SERVER_SCRIPT ]]; then
+	if [[ "$SERVER_OS" = "dragonfly" ]] || [[ "$SERVER_OS" = "freebsd" ]]; then
+		echo "Error "$SERVER_OS" needs manual installation of remote extension host"
+		print_install_results_and_exit 1
+	fi
+
+	pushd $SERVER_DIR > /dev/null
+
+	if [[ ! -z $(which wget) ]]; then
+		wget --tries=3 --timeout=10 --continue --no-verbose -O vscode-server.tar.gz $SERVER_DOWNLOAD_URL
+	elif [[ ! -z $(which curl) ]]; then
+		curl --retry 3 --connect-timeout 10 --location --show-error --silent --output vscode-server.tar.gz $SERVER_DOWNLOAD_URL
+	else
+		echo "Error no tool to download server binary"
+		print_install_results_and_exit 1
+	fi
+
+	if (( $? > 0 )); then
+		echo "Error downloading server from $SERVER_DOWNLOAD_URL"
+		print_install_results_and_exit 1
+	fi
+
+	tar -xf vscode-server.tar.gz --strip-components 1
+	if (( $? > 0 )); then
+		echo "Error while extracting server contents"
+		print_install_results_and_exit 1
+	fi
+
+	if [[ ! -f $SERVER_SCRIPT ]]; then
+		echo "Error server contents are corrupted"
+		print_install_results_and_exit 1
+	fi
+
+	rm -f vscode-server.tar.gz
+
+	popd > /dev/null
+else
+	echo "Server script already installed in $SERVER_SCRIPT"
+fi
+
+# Try to find if server is already running
+if [[ -f $SERVER_PIDFILE ]]; then
+	SERVER_PID="$(cat $SERVER_PIDFILE)"
+	SERVER_RUNNING_PROCESS="$(ps -o pid,args -p $SERVER_PID | grep $SERVER_SCRIPT)"
+else
+	SERVER_RUNNING_PROCESS="$(ps -o pid,args -A | grep $SERVER_SCRIPT | grep -v grep)"
+fi
+
+if [[ -z $SERVER_RUNNING_PROCESS ]]; then
+	if [[ -f $SERVER_LOGFILE ]]; then
+		rm $SERVER_LOGFILE
+	fi
+	if [[ -f $SERVER_TOKENFILE ]]; then
+		rm $SERVER_TOKENFILE
+	fi
+
+	touch $SERVER_TOKENFILE
+	chmod 600 $SERVER_TOKENFILE
+	SERVER_CONNECTION_TOKEN="${crypto.randomUUID()}"
+	echo $SERVER_CONNECTION_TOKEN > $SERVER_TOKENFILE
+
+	$SERVER_SCRIPT --start-server --host=127.0.0.1 $SERVER_LISTEN_FLAG $SERVER_INITIAL_EXTENSIONS --connection-token-file $SERVER_TOKENFILE --telemetry-level off --use-host-proxy --disable-websocket-compression --without-browser-env-var --enable-remote-auto-shutdown --accept-server-license-terms &> $SERVER_LOGFILE &
+	echo $! > $SERVER_PIDFILE
+else
+	echo "Server script is already running $SERVER_SCRIPT"
+fi
+
+if [[ -f $SERVER_TOKENFILE ]]; then
+	SERVER_CONNECTION_TOKEN="$(cat $SERVER_TOKENFILE)"
+else
+	echo "Error server token file not found $SERVER_TOKENFILE"
+	print_install_results_and_exit 1
+fi
+
+if [[ -f $SERVER_LOGFILE ]]; then
+	for i in {1..5}; do
+		LISTENING_ON="$(cat $SERVER_LOGFILE | grep -E 'Extension host agent listening on .+' | sed 's/Extension host agent listening on //')"
+		if [[ -n $LISTENING_ON ]]; then
+			break
+		fi
+		sleep 0.5
+	done
+
+	if [[ -z $LISTENING_ON ]]; then
+		echo "Error server did not start sucessfully"
+		print_install_results_and_exit 1
+	fi
+else
+	echo "Error server log file not found $SERVER_LOGFILE"
+	print_install_results_and_exit 1
+fi
+
+# Finish server setup and keep script running
+if [[ -z $SERVER_RUNNING_PROCESS ]]; then
+	echo "${id}: start"
+	echo "exitCode==0=="
+	echo "listeningOn==$LISTENING_ON=="
+	echo "connectionToken==$SERVER_CONNECTION_TOKEN=="
+	echo "logFile==$SERVER_LOGFILE=="
+	echo "osReleaseId==$OS_RELEASE_ID=="
+	echo "arch==$ARCH=="
+	echo "platform==$PLATFORM=="
+	echo "tmpDir==$TMP_DIR=="
+	${envVariables.map(envVar => `echo "${envVar}==$${envVar}=="`).join('\n')}
+	echo "${id}: end"
+
+	echo "${id}: Server installation script done"
+
+	SERVER_PID="$(cat $SERVER_PIDFILE)"
+	SERVER_RUNNING_PROCESS="$(ps -o pid,args -p $SERVER_PID | grep $SERVER_SCRIPT)"
+	while [[ -n $SERVER_RUNNING_PROCESS ]]; do
+		sleep 300;
+		SERVER_RUNNING_PROCESS="$(ps -o pid,args -p $SERVER_PID | grep $SERVER_SCRIPT)"
+	done
+else
+	print_install_results_and_exit 0
+fi
+`;
+}

extensions/open-remote-wsl/src/wsl/wslManager.ts

@@ -0,0 +1,150 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as cp from 'child_process';
+import Log from '../common/logger';
+import { EventEmitter } from '../common/event';
+
+const wslBinary = 'wsl.exe';
+
+export interface WSLDistro {
+	isDefault: boolean;
+	name: string;
+	state: string;
+	version: string;
+}
+
+export interface WSLOnlineDistro {
+	name: string;
+	friendlyName: string;
+}
+
+export class WSLManager {
+	constructor(private readonly logger: Log) {
+	}
+
+	async listDistros() {
+		const resp = this._runWSLCommand(['--list', '--verbose'], 'utf16le');
+		const { exitCode } = await resp.exitPromise;
+		const { stdout, stderr } = resp;
+		if (exitCode) {
+			this.logger.trace(`Command wsl listDistros exited with code ${exitCode}`, stdout + '\n\n' + stderr);
+			throw new Error(`Command wsl listDistros exited with code ${exitCode}`);
+		}
+
+		const regex = /(?<default>\*|\s)\s+(?<name>[\w\.-]+)\s+(?<state>[\w]+)\s+(?<version>\d)/;
+		const distros: WSLDistro[] = [];
+		for (const line of stdout.split(/\r?\n/)) {
+			const matches = line.match(regex);
+			if (matches && matches.groups) {
+				distros.push({
+					isDefault: matches.groups.default === '*',
+					name: matches.groups.name,
+					state: matches.groups.state,
+					version: matches.groups.version,
+				});
+			}
+		}
+
+		return distros;
+	}
+
+	async listOnlineDistros() {
+		const resp = this._runWSLCommand(['--list', '--online'], 'utf16le');
+		const { exitCode } = await resp.exitPromise;
+		const { stdout, stderr } = resp;
+		if (exitCode) {
+			this.logger.trace(`Command wsl listOnlineDistros exited with code ${exitCode}`, stdout + '\n\n' + stderr);
+			throw new Error(`Command wsl listOnlineDistros exited with code ${exitCode}`);
+		}
+
+		let lines = stdout.split(/\r?\n/);
+		const idx = lines.findIndex(l => /\s*NAME\s+FRIENDLY NAME\s*/.test(l));
+		lines = lines.slice(idx + 1);
+
+		const regex = /(?<name>[\w\.-]+)\s+(?<friendlyName>\w.+\w)/;
+		const distros: WSLOnlineDistro[] = [];
+		for (const line of lines) {
+			const matches = line.match(regex);
+			if (matches && matches.groups) {
+				distros.push({
+					name: matches.groups.name,
+					friendlyName: matches.groups.friendlyName,
+				});
+			}
+		}
+
+		return distros;
+	}
+
+	async setDefaultDistro(distroName: string) {
+		const resp = this._runWSLCommand(['--set-default', distroName], 'utf16le');
+		const { exitCode } = await resp.exitPromise;
+		const { stdout, stderr } = resp;
+		if (exitCode) {
+			this.logger.trace(`Command wsl setDefaultDistro exited with code ${exitCode}`, stdout + '\n\n' + stderr);
+			throw new Error(`Command wsl setDefaultDistro exited with code ${exitCode}`);
+		}
+	}
+
+	async deleteDistro(distroName: string) {
+		const resp = this._runWSLCommand(['--unregister', distroName], 'utf16le');
+		const { exitCode } = await resp.exitPromise;
+		const { stdout, stderr } = resp;
+		if (exitCode) {
+			this.logger.trace(`Command wsl deleteDistro exited with code ${exitCode}`, stdout + '\n\n' + stderr);
+			throw new Error(`Command wsl deleteDistro exited with code ${exitCode}`);
+		}
+	}
+
+	async exec(cmd: string, args: string[], distro: string) {
+		return this._runWSLCommand(['--distribution', distro, '--', cmd, ...args], 'utf8');
+	}
+
+	private _runWSLCommand(args: string[], encoding: 'utf8' | 'utf16le') {
+		this.logger.trace(`Running WSL command: ${wslBinary} ${args.join(' ')}`);
+
+		const cmd = cp.spawn(wslBinary, args, { windowsHide: true, windowsVerbatimArguments: true });
+
+		const stdoutDataEmitter = new EventEmitter<Buffer>();
+		const stdoutData: Buffer[] = [];
+		const stderrDataEmitter = new EventEmitter<Buffer>();
+		const stderrData: Buffer[] = [];
+		cmd.stdout.on('data', (data: Buffer) => {
+			stdoutData.push(data);
+			stdoutDataEmitter.fire(data);
+		});
+		cmd.stderr.on('data', (data: Buffer) => {
+			stderrData.push(data);
+			stderrDataEmitter.fire(data);
+		});
+
+		const exitPromise = new Promise<{ exitCode: number }>((resolve, reject) => {
+			cmd.on('error', (err) => {
+				this.logger.error(`Error running WSL command: ${wslBinary} ${args.join(' ')}`, err);
+				reject(err);
+			});
+			cmd.on('exit', (code, _signal) => {
+				resolve({ exitCode: code ?? 0 });
+			});
+		});
+
+		return {
+			get stdout() {
+				return Buffer.concat(stdoutData).toString(encoding);
+			},
+			get stderr() {
+				return Buffer.concat(stderrData).toString(encoding);
+			},
+			get onStdoutData() {
+				return stdoutDataEmitter.event;
+			},
+			get onStderrData() {
+				return stderrDataEmitter.event;
+			},
+			exitPromise
+		};
+	}
+}

extensions/open-remote-wsl/src/wsl/wslTerminal.ts

@@ -0,0 +1,26 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+
+class WSLTerminal {
+	static NAME = 'WSL';
+
+	private getTerminal() {
+		const wslTerminal = vscode.window.terminals.find(t => t.name === WSLTerminal.NAME);
+		if (wslTerminal) {
+			return wslTerminal;
+		}
+		return vscode.window.createTerminal(WSLTerminal.NAME);
+	}
+
+	runCommand(command: string) {
+		const wslTerminal = this.getTerminal();
+		wslTerminal.show(false);
+		wslTerminal.sendText(command, true);
+	}
+}
+
+export default new WSLTerminal();

extensions/open-remote-wsl/tsconfig.json

@@ -0,0 +1,12 @@
+{
+	"extends": "../tsconfig.base.json",
+	"compilerOptions": {
+		"outDir": "./out",
+	},
+	"include": [
+		"src/**/*",
+		"../../src/vscode-dts/vscode.d.ts",
+		"../../src/vscode-dts/vscode.proposed.resolvers.d.ts",
+		"../../src/vscode-dts/vscode.proposed.contribViewsRemote.d.ts",
+	]
+}

package-lock.json

@@ -62,7 +62,7 @@
         "posthog-node": "^4.8.1",
         "react": "^19.0.0",
         "react-dom": "^19.0.0",
-        "react-tooltip": "^5.28.0",
+        "react-tooltip": "^5.28.1",
         "tas-client-umd": "0.2.0",
         "v8-inspect-profiler": "^0.1.1",
         "vscode-html-languageservice": "^5.3.1",
@@ -15101,10 +15101,11 @@
       }
     },
     "node_modules/nan": {
-      "version": "2.14.2",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
+      "version": "2.22.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz",
+      "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==",
       "dev": true,
+      "license": "MIT",
       "optional": true
     },
     "node_modules/nanoid": {
@@ -18007,9 +18008,9 @@
       "license": "MIT"
     },
     "node_modules/react-tooltip": {
-      "version": "5.28.0",
-      "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-5.28.0.tgz",
-      "integrity": "sha512-R5cO3JPPXk6FRbBHMO0rI9nkUG/JKfalBSQfZedZYzmqaZQgq7GLzF8vcCWx6IhUCKg0yPqJhXIzmIO5ff15xg==",
+      "version": "5.28.1",
+      "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-5.28.1.tgz",
+      "integrity": "sha512-ZA4oHwoIIK09TS7PvSLFcRlje1wGZaxw6xHvfrzn6T82UcMEfEmHVCad16Gnr4NDNDh93HyN037VK4HDi5odfQ==",
       "license": "MIT",
       "dependencies": {
         "@floating-ui/dom": "^1.6.1",
@@ -18828,10 +18829,11 @@
       }
     },
     "node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
+      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/scheduler": {
       "version": "0.25.0",

package.json

@@ -123,7 +123,7 @@
     "posthog-node": "^4.8.1",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "react-tooltip": "^5.28.0",
+    "react-tooltip": "^5.28.1",
     "tas-client-umd": "0.2.0",
     "v8-inspect-profiler": "^0.1.1",
     "vscode-html-languageservice": "^5.3.1",

src/vs/workbench/contrib/chat/browser/actions/chatActions.ts

@@ -648,8 +648,9 @@ const defaultChat = {
 	providerSetting: product.defaultChatAgent?.providerSetting ?? '',
 };
 
+// Void commented this out - copilot head
 // Add next to the command center if command center is disabled
-MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
+/* MenuRegistry.appendMenuItem(MenuId.CommandCenter, {
 	submenu: MenuId.ChatTitleBarMenu,
 	title: localize('title4', "Copilot"),
 	icon: Codicon.copilot,
@@ -676,7 +677,7 @@ MenuRegistry.appendMenuItem(MenuId.TitleBar, {
 	// 	ContextKeyExpr.has('config.window.commandCenter').negate(),
 	// ),
 	order: 1
-});
+}); */
 
 registerAction2(class ToggleCopilotControl extends ToggleTitleBarConfigAction {
 	constructor() {

src/vs/workbench/contrib/void/browser/autocompleteService.ts

@@ -8,8 +8,7 @@ import { ILanguageFeaturesService } from '../../../../editor/common/services/lan
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { ITextModel } from '../../../../editor/common/model.js';
 import { Position } from '../../../../editor/common/core/position.js';
-import { InlineCompletion, InlineCompletionContext, } from '../../../../editor/common/languages.js';
-import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { InlineCompletion, } from '../../../../editor/common/languages.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
@@ -633,8 +632,6 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 	async _provideInlineCompletionItems(
 		model: ITextModel,
 		position: Position,
-		context: InlineCompletionContext,
-		token: CancellationToken,
 	): Promise<InlineCompletion[]> {
 
 		const isEnabled = this._settingsService.state.globalSettings.enableAutocomplete
@@ -852,7 +849,7 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 					newAutocompletion.status = 'error'
 					reject(message)
 				},
-				onAbort: () => { },
+				onAbort: () => { reject('Aborted autocomplete') },
 			})
 			newAutocompletion.requestId = requestId
 
@@ -897,9 +894,9 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 	) {
 		super()
 
-		this._langFeatureService.inlineCompletionsProvider.register('*', {
+		this._register(this._langFeatureService.inlineCompletionsProvider.register('*', {
 			provideInlineCompletions: async (model, position, context, token) => {
-				const items = await this._provideInlineCompletionItems(model, position, context, token)
+				const items = await this._provideInlineCompletionItems(model, position)
 
 				// console.log('item: ', items?.[0]?.insertText)
 				return { items: items, }
@@ -936,7 +933,7 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 				});
 
 			},
-		})
+		}))
 	}
 
 

src/vs/workbench/contrib/void/browser/chatThreadService.ts

@@ -11,13 +11,13 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../platfo
 import { URI } from '../../../../base/common/uri.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { ILLMMessageService } from '../common/sendLLMMessageService.js';
-import { chat_userMessageContent, chat_systemMessage, voidTools } from '../common/prompt/prompts.js';
-import { getErrorMessage, LLMChatMessage, ToolCallType } from '../common/sendLLMMessageTypes.js';
+import { chat_userMessageContent, chat_systemMessage, ToolName, toolCallXMLStr, } from '../common/prompt/prompts.js';
+import { getErrorMessage, LLMChatMessage, RawToolCallObj, RawToolParamsObj } from '../common/sendLLMMessageTypes.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { ChatMode, FeatureName, ModelSelection, ModelSelectionOptions } from '../common/voidSettingsTypes.js';
 import { IVoidSettingsService } from '../common/voidSettingsService.js';
-import { ToolName, ToolCallParams, ToolResultType, toolNamesThatRequireApproval, InternalToolInfo } from '../common/toolsServiceTypes.js';
+import { ToolCallParams, ToolResultType, toolNamesThatRequireApproval } from '../common/toolsServiceTypes.js';
 import { IToolsService } from './toolsService.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
@@ -37,6 +37,7 @@ import { IModelService } from '../../../../editor/common/services/model.js';
 import { IDirectoryStrService } from './directoryStrService.js';
 import { truncate } from '../../../../base/common/strings.js';
 import { THREAD_STORAGE_KEY } from '../common/storageKeys.js';
+import { deepClone } from '../../../../base/common/objects.js';
 
 
 /*
@@ -61,28 +62,6 @@ A checkpoint appears before every LLM message, and before every user message (be
 */
 
 
-const toLLMChatMessages = (chatMessages: ChatMessage[]): LLMChatMessage[] => {
-	const llmChatMessages: LLMChatMessage[] = []
-	for (const c of chatMessages) {
-		if (c.role === 'user') {
-			llmChatMessages.push({ role: c.role, content: c.content })
-		}
-		else if (c.role === 'assistant')
-			llmChatMessages.push({ role: c.role, content: c.content, anthropicReasoning: c.anthropicReasoning })
-		else if (c.role === 'tool')
-			llmChatMessages.push({ role: c.role, id: c.id, name: c.name, params: c.paramsStr, content: c.content })
-		else if (c.role === 'decorative_canceled_tool') { // pass
-		}
-		else if (c.role === 'checkpoint') { // pass
-		}
-		else {
-			throw new Error(`Role ${(c as any).role} not recognized.`)
-		}
-	}
-	return llmChatMessages
-}
-
-
 type UserMessageType = ChatMessage & { role: 'user' }
 type UserMessageState = UserMessageType['state']
 const defaultMessageState: UserMessageState = {
@@ -139,10 +118,9 @@ export type ThreadStreamState = {
 
 		// streaming related - when streaming message
 		streamingToken?: string;
-		messageSoFar?: string;
+		displayContentSoFar?: string;
 		reasoningSoFar?: string;
-		toolNameSoFar?: string;
-		toolParamsSoFar?: string;
+		toolCallSoFar?: RawToolCallObj;
 	}
 }
 
@@ -380,9 +358,9 @@ class ChatThreadService extends Disposable implements IChatThreadService {
 			else if (behavior === 'set') {
 				this.streamState[threadId] = state
 			}
+			else throw new Error(`setStreamState`)
 		}
 
-
 		this._onDidChangeStreamState.fire({ threadId })
 	}
 
@@ -442,7 +420,7 @@ class ChatThreadService extends Disposable implements IChatThreadService {
 		}
 		return false
 	}
-	private _updateLatestToolTo = (threadId: string, tool: ChatMessage & { role: 'tool' }) => {
+	private _updateLatestTool = (threadId: string, tool: ChatMessage & { role: 'tool' }) => {
 		const swapped = this._swapOutLatestStreamingToolWithResult(threadId, tool)
 		if (swapped) return
 		this._addMessageToThread(threadId, tool)
@@ -452,33 +430,15 @@ class ChatThreadService extends Disposable implements IChatThreadService {
 		const thread = this.state.allThreads[threadId]
 		if (!thread) return // should never happen
 
-
 		const lastMsg = thread.messages[thread.messages.length - 1]
 		if (!(
 			lastMsg.role === 'tool' && (lastMsg.type === 'tool_request')
 		)) return // should never happen
 
-		const lastUserMsgIdx = findLastIdx(thread.messages, m => m.role === 'user')
-		const lastUserMessage = thread.messages[lastUserMsgIdx] as ChatMessage & { role: 'user' }
-		if (lastUserMsgIdx === -1 || !lastUserMessage) return // should never happen
-
-		const instructions = lastUserMessage.displayContent || ''
-
 		const callThisToolFirst: ToolMessage<ToolName> = lastMsg
 
-		this._updateLatestToolTo(threadId, {
-			role: 'tool',
-			type: 'running_now',
-			name: lastMsg.name,
-			paramsStr: lastMsg.paramsStr,
-			id: lastMsg.id,
-			params: lastMsg.params,
-			content: '(value not received yet...)', // this typically shouldn't ever get read
-			result: null
-		})
-
 		this._wrapRunAgentToNotify(
-			this._runChatAgent({ callThisToolFirst, threadId, userMessageContent: instructions, ...this._currentModelSelectionProps() })
+			this._runChatAgent({ callThisToolFirst, threadId, ...this._currentModelSelectionProps() })
 			, threadId
 		)
 	}
@@ -494,29 +454,13 @@ class ChatThreadService extends Disposable implements IChatThreadService {
 		}
 		else return
 
-		const { name, paramsStr, id } = lastMsg
+		const { name } = lastMsg
 
 		const errorMessage = this.errMsgs.rejected
-		this._updateLatestToolTo(threadId, { role: 'tool', type: 'rejected', params: params, name: name, paramsStr: paramsStr, id, content: errorMessage, result: null })
+		this._updateLatestTool(threadId, { role: 'tool', type: 'rejected', params: params, name: name, content: errorMessage, result: null })
 		this._setStreamState(threadId, {}, 'set')
 	}
 
-	// private _rejectLatestStreamingTool(threadId: string) {
-	// 	const thread = this.state.allThreads[threadId]
-	// 	if (!thread) return // should never happen
-
-	// 	const lastMessage = thread.messages[thread.messages.length - 1]
-	// 	if (lastMessage.role !== 'tool') return
-	// 	const { name, paramsStr, id, result } = lastMessage
-	// 	if (result.type !== 'running_now') return
-	// 	const { params } = result
-
-	// 	const errorMessage = this.errMsgs.rejected
-	// 	this._swapOutLatestStreamingToolWithResult(threadId, { role: 'tool', name: name, paramsStr: paramsStr, id, content: errorMessage, result: { type: 'rejected', params: params }, })
-	// 	this._setStreamState(threadId, {}, 'set')
-
-	// }
-
 	stopRunning(threadId: string) {
 		const thread = this.state.allThreads[threadId]
 		if (!thread) return // should never happen
@@ -531,19 +475,20 @@ class ChatThreadService extends Disposable implements IChatThreadService {
 		const isRunning = this.streamState[threadId]?.isRunning
 		if (isRunning === 'LLM') {
 			// abort the stream first so it doesn't change any state
-			const messageSoFar = this.streamState[threadId]?.messageSoFar ?? ''
+			const displayContentSoFar = this.streamState[threadId]?.displayContentSoFar ?? ''
 			const reasoningSoFar = this.streamState[threadId]?.reasoningSoFar ?? ''
-			const toolInProgress = this.streamState[threadId]?.toolNameSoFar
-			console.log('toolInProgress', toolInProgress)
+			const toolCallSoFar = this.streamState[threadId]?.toolCallSoFar
 
 			const llmCancelToken = this.streamState[threadId]?.streamingToken
 			if (llmCancelToken !== undefined) { this._llmMessageService.abort(llmCancelToken) }
 
-			this._addMessageToThread(threadId, { role: 'assistant', content: messageSoFar, reasoning: reasoningSoFar, anthropicReasoning: null })
+			this._addMessageToThread(threadId, { role: 'assistant', displayContent: displayContentSoFar, reasoning: reasoningSoFar, toolCall: toolCallSoFar, anthropicReasoning: null })
 
-			if (toolInProgress) {
-				this._addMessageToThread(threadId, { role: 'decorative_canceled_tool', name: toolInProgress })
+			if (toolCallSoFar) {
+				this._addMessageToThread(threadId, { role: 'interrupted_streaming_tool', name: toolCallSoFar.name })
 			}
+
+			this._addUserCheckpoint({ threadId })
 		}
 
 		this._setStreamState(threadId, {}, 'set')
@@ -551,18 +496,6 @@ class ChatThreadService extends Disposable implements IChatThreadService {
 
 
 
-	private _tools = (chatMode: ChatMode) => {
-		const toolNames: ToolName[] | undefined = chatMode === 'normal' ? undefined
-			: chatMode === 'gather' ? (Object.keys(voidTools) as ToolName[]).filter(toolName => !toolNamesThatRequireApproval.has(toolName))
-				: chatMode === 'agent' ? Object.keys(voidTools) as ToolName[]
-					: undefined
-
-		const tools: InternalToolInfo[] | undefined = toolNames?.map(toolName => voidTools[toolName])
-		return tools
-	}
-
-
-
 	private readonly errMsgs = {
 		rejected: 'Tool call was rejected by the user.',
 		errWhenStringifying: (error: any) => `Tool call succeeded, but there was an error stringifying the output.\n${getErrorMessage(error)}`
@@ -571,140 +504,162 @@ class ChatThreadService extends Disposable implements IChatThreadService {
 
 	private readonly _currentlyRunningToolInterruptor: { [threadId: string]: (() => void) | undefined } = {}
 
+
+
+	// system message
+	private _generateSystemMessage = async (chatMode: ChatMode) => {
+		const workspaceFolders = this._workspaceContextService.getWorkspace().folders.map(f => f.uri.fsPath)
+
+		const openedURIs = this._modelService.getModels().filter(m => m.isAttachedToEditor()).map(m => m.uri.fsPath) || [];
+		const activeURI = this._editorService.activeEditor?.resource?.fsPath;
+
+		const directoryStr = await this._directoryStrService.getAllDirectoriesStr({
+			cutOffMessage: chatMode === 'agent' || chatMode === 'gather' ? `...Directories string cut off, use tools to read more...`
+				: `...Directories string cut off, ask user for more if necessary...`
+		})
+
+		const runningTerminalIds = this._terminalToolService.listTerminalIds()
+		const systemMessage = chat_systemMessage({ workspaceFolders, openedURIs, directoryStr, activeURI, runningTerminalIds, chatMode })
+		return systemMessage
+	}
+
+	private _generateLLMMessages = async (threadId: string) => {
+		const thread = this.state.allThreads[threadId]
+		if (!thread) return []
+
+		const chatMessages = deepClone(thread.messages)
+		const llmChatMessages: LLMChatMessage[] = []
+
+		// merge tools into user message
+		for (const c of chatMessages) {
+			if (c.role === 'assistant') {
+				// if called a tool, re-add its XML to the message
+				// alternatively, could just hold onto the original output, but this way requires less piping raw strings everywhere
+				let content = c.displayContent
+				if (c.toolCall) {
+					content = `${content}\n\n${toolCallXMLStr(c.toolCall)}`
+				}
+				llmChatMessages.push({ role: c.role, content: content, anthropicReasoning: c.anthropicReasoning })
+			}
+			else if (c.role === 'user' || c.role === 'tool') {
+				if (c.role === 'tool')
+					c.content = `<${c.name}_result>\n${c.content}\n</${c.name}_result>`
+
+				if (llmChatMessages.length === 0 || llmChatMessages[llmChatMessages.length - 1].role !== 'user')
+					llmChatMessages.push({ role: 'user', content: c.content })
+				else
+					llmChatMessages[llmChatMessages.length - 1].content += '\n\n' + c.content
+
+			}
+			else if (c.role === 'interrupted_streaming_tool') { // pass
+			}
+			else if (c.role === 'checkpoint') { // pass
+			}
+			else {
+				throw new Error(`Role ${(c as any).role} not recognized.`)
+			}
+		}
+		return llmChatMessages
+	}
+
+
+	// returns true when the tool call is waiting for user approval
+	private _runToolCall = async (
+		threadId: string,
+		toolName: ToolName,
+		opts: { preapproved: true, validatedParams: ToolCallParams[ToolName] } | { preapproved: false, unvalidatedToolParams: RawToolParamsObj },
+	): Promise<{ awaitingUserApproval?: boolean, interrupted?: boolean }> => {
+
+		// compute these below
+		let toolParams: ToolCallParams[ToolName]
+		let toolResult: Awaited<ToolResultType[typeof toolName]>
+		let toolResultStr: string
+
+		if (!opts.preapproved) { // skip this if pre-approved
+			// 1. validate tool params
+			try {
+				const params = await this._toolsService.validateParams[toolName](opts.unvalidatedToolParams)
+				toolParams = params
+			} catch (error) {
+				const errorMessage = getErrorMessage(error)
+				this._addMessageToThread(threadId, { role: 'tool', type: 'invalid_params', params: null, result: null, name: toolName, content: errorMessage, })
+				return {}
+			}
+			// once validated, add checkpoint for edit
+			if (toolName === 'edit_file') { this._addToolEditCheckpoint({ threadId, uri: (toolParams as ToolCallParams['edit_file']).uri }) }
+
+			// 2. if tool requires approval, break from the loop, awaiting approval
+			const toolRequiresApproval = toolNamesThatRequireApproval.has(toolName)
+			if (toolRequiresApproval) {
+				const autoApprove = this._settingsService.state.globalSettings.autoApprove
+				// add a tool_request because we use it for UI if a tool is loading (this should be improved in the future)
+				this._addMessageToThread(threadId, { role: 'tool', type: 'tool_request', content: '(never)', result: null, name: toolName, params: toolParams })
+				if (!autoApprove) {
+					return { awaitingUserApproval: true }
+				}
+			}
+		}
+		else {
+			toolParams = opts.validatedParams
+		}
+
+		// 3. call the tool
+		this._setStreamState(threadId, { isRunning: 'tool' }, 'merge')
+		this._updateLatestTool(threadId, { role: 'tool', type: 'running_now', name: toolName, params: toolParams, content: '(value not received yet...)', result: null })
+
+		let interrupted = false
+		try {
+			const { result, interruptTool } = await this._toolsService.callTool[toolName](toolParams as any)
+			this._currentlyRunningToolInterruptor[threadId] = () => {
+				interrupted = true;
+				interruptTool?.();
+				delete this._currentlyRunningToolInterruptor[threadId];
+			}
+			toolResult = await result // ts is bad... await is needed
+		}
+		catch (error) {
+			if (interrupted) {
+				// the tool result is added when we stop running
+				return { interrupted: true }
+			}
+			const errorMessage = getErrorMessage(error)
+			this._updateLatestTool(threadId, { role: 'tool', type: 'tool_error', params: toolParams, result: errorMessage, name: toolName, content: errorMessage, })
+			return {}
+		}
+
+		// 4. stringify the result to give to the LLM
+		try {
+			toolResultStr = this._toolsService.stringOfResult[toolName](toolParams as any, toolResult as any)
+		} catch (error) {
+			const errorMessage = this.errMsgs.errWhenStringifying(error)
+			this._updateLatestTool(threadId, { role: 'tool', type: 'tool_error', params: toolParams, result: errorMessage, name: toolName, content: errorMessage, })
+			return {}
+		}
+
+		// 5. add to history and keep going
+		this._updateLatestTool(threadId, { role: 'tool', type: 'success', params: toolParams, result: toolResult, name: toolName, content: toolResultStr, })
+
+		return {}
+	};
+
+
+
+
 	private async _runChatAgent({
 		threadId,
 		modelSelection,
 		modelSelectionOptions,
-		userMessageContent,
 		callThisToolFirst,
 	}: {
 		threadId: string,
 		modelSelection: ModelSelection | null,
 		modelSelectionOptions: ModelSelectionOptions | undefined,
-		userMessageContent: string, // content of LATEST user message
 
 		callThisToolFirst?: ToolMessage<ToolName> & { type: 'tool_request' }
 	}) {
-		const userMessageFullContent = userMessageContent
-		const getLatestMessages = async () => {
-			// replace last userMessage with userMessageFullContent (which contains all the files too)
-			const thread = this.state.allThreads[threadId]
-			const latestMessages = thread?.messages ?? []
-			const messages_ = toLLMChatMessages(latestMessages)
-			const lastUserMsgIdx = findLastIdx(messages_, m => m.role === 'user')
-			if (lastUserMsgIdx === -1) return [] // should never happen (or how did they send the message?!)
-
-			// system message
-			const workspaceFolders = this._workspaceContextService.getWorkspace().folders.map(f => f.uri.fsPath)
-
-			const openedURIs = this._modelService.getModels().filter(m => m.isAttachedToEditor()).map(m => m.uri.fsPath) || [];
-			const activeURI = this._editorService.activeEditor?.resource?.fsPath;
-
-			const { wasCutOff, str: directoryStr_ } = await this._directoryStrService.getAllDirectoriesStr()
-
-			const directoryStr = wasCutOff ? (
-				chatMode === 'agent' || chatMode === 'gather' ? `${directoryStr_}\nString cut off, use tools to read more.`
-					: `${directoryStr_}\nString cut off, ask user for more if necessary.`
-			) : directoryStr_
-
-			const runningTerminalIds = this._terminalToolService.listTerminalIds()
-			const systemMessage = chat_systemMessage({ workspaceFolders, openedURIs, directoryStr, activeURI, runningTerminalIds, chatMode })
-
-			// all messages so far in the chat history (including tools)
-			const messages: LLMChatMessage[] = [
-				{ role: 'system', content: systemMessage, },
-				...messages_.slice(0, lastUserMsgIdx),
-				{ role: 'user', content: userMessageFullContent },
-				...messages_.slice(lastUserMsgIdx + 1, Infinity),
-			]
-			// console.log('MESSAGES!!!', messages)
-			return messages
-		}
-
-
-
-		// returns true when the tool call is waiting for user approval
-		const handleToolCall = async (
-			tool: ToolCallType,
-			opts?: { preapproved: true, toolParams: ToolCallParams[ToolName] },
-		): Promise<{ awaitingUserApproval?: boolean, interrupted?: boolean }> => {
-			const toolName: ToolName = tool.name
-			const toolParamsStr = tool.paramsStr
-			const toolId = tool.id
-
-			// compute these below
-			let toolParams: ToolCallParams[ToolName]
-			let toolResult: Awaited<ToolResultType[typeof toolName]>
-			let toolResultStr: string
-
-			if (!opts?.preapproved) { // skip this if pre-approved
-				// 1. validate tool params
-				try {
-					const params = await this._toolsService.validateParams[toolName](toolParamsStr)
-					toolParams = params
-				} catch (error) {
-					const errorMessage = getErrorMessage(error)
-					this._addMessageToThread(threadId, { role: 'tool', type: 'invalid_params', params: null, result: null, name: toolName, paramsStr: toolParamsStr, id: toolId, content: errorMessage, })
-					return {}
-				}
-				// once validated, add checkpoint for edit
-				if (toolName === 'edit_file') { this._addToolEditCheckpoint({ threadId, uri: (toolParams as ToolCallParams['edit_file']).uri }) }
-
-				// 2. if tool requires approval, break from the loop, awaiting approval
-				const requiresApproval = toolNamesThatRequireApproval.has(toolName)
-				if (requiresApproval) {
-					const autoApprove = this._settingsService.state.globalSettings.autoApprove
-					// add a tool_request because we use it for UI if a tool is loading (this should be improved in the future)
-					this._addMessageToThread(threadId, { role: 'tool', type: 'tool_request', content: '(never)', result: null, name: toolName, paramsStr: toolParamsStr, params: toolParams, id: toolId })
-					if (!autoApprove) {
-						return { awaitingUserApproval: true }
-					}
-				}
-			}
-			else {
-				toolParams = opts.toolParams
-			}
-
-			// 3. call the tool
-			this._setStreamState(threadId, { isRunning: 'tool' }, 'merge')
-			let interrupted = false
-			try {
-				const { result, interruptTool } = await this._toolsService.callTool[toolName](toolParams as any)
-				this._currentlyRunningToolInterruptor[threadId] = () => {
-					interrupted = true;
-					interruptTool?.();
-					delete this._currentlyRunningToolInterruptor[threadId];
-				}
-				toolResult = await result // ts is bad... await is needed
-			}
-			catch (error) {
-				if (interrupted) {
-					// the tool result is added when we stop running
-					return { interrupted: true }
-				}
-				const errorMessage = getErrorMessage(error)
-				this._updateLatestToolTo(threadId, { role: 'tool', type: 'tool_error', params: toolParams, result: errorMessage, name: toolName, paramsStr: toolParamsStr, id: toolId, content: errorMessage, })
-				return {}
-			}
-
-			// 4. stringify the result to give to the LLM
-			try {
-				toolResultStr = this._toolsService.stringOfResult[toolName](toolParams as any, toolResult as any)
-			} catch (error) {
-				const errorMessage = this.errMsgs.errWhenStringifying(error)
-				this._updateLatestToolTo(threadId, { role: 'tool', type: 'tool_error', params: toolParams, result: errorMessage, name: toolName, paramsStr: toolParamsStr, id: toolId, content: errorMessage, })
-				return {}
-			}
-
-			// 5. add to history and keep going
-			this._updateLatestToolTo(threadId, { role: 'tool', type: 'success', params: toolParams, result: toolResult, name: toolName, paramsStr: toolParamsStr, id: toolId, content: toolResultStr, })
-
-			return {}
-		};
 
 		// above just defines helpers, below starts the actual function
 		const { chatMode } = this._settingsService.state.globalSettings // should not change as we loop even if user changes it, so it goes here
-		const tools = this._tools(chatMode)
 
 		// clear any previous error
 		this._setStreamState(threadId, { error: undefined }, 'set')
@@ -716,7 +671,7 @@ class ChatThreadService extends Disposable implements IChatThreadService {
 
 		// before enter loop, call tool
 		if (callThisToolFirst) {
-			const { interrupted } = await handleToolCall(callThisToolFirst, { preapproved: true, toolParams: callThisToolFirst.params })
+			const { interrupted } = await this._runToolCall(threadId, callThisToolFirst.name, { preapproved: true, validatedParams: callThisToolFirst.params })
 			if (interrupted) return
 		}
 
@@ -727,34 +682,39 @@ class ChatThreadService extends Disposable implements IChatThreadService {
 			isRunningWhenEnd = undefined
 			nMessagesSent += 1
 
-			let resMessageIsDonePromise: (toolCalls?: ToolCallType[] | undefined) => void // resolves when user approves this tool use (or if tool doesn't require approval)
-			const messageIsDonePromise = new Promise<ToolCallType[] | undefined>((res, rej) => { resMessageIsDonePromise = res })
+			let resMessageIsDonePromise: (toolCall?: RawToolCallObj | undefined) => void // resolves when user approves this tool use (or if tool doesn't require approval)
+			const messageIsDonePromise = new Promise<RawToolCallObj | undefined>((res, rej) => { resMessageIsDonePromise = res })
 
 			// send llm message
 			this._setStreamState(threadId, { isRunning: 'LLM' }, 'merge')
-			const messages = await getLatestMessages()
+			const systemMessage = await this._generateSystemMessage(chatMode)
+			const llmMessages = await this._generateLLMMessages(threadId)
+			const messages: LLMChatMessage[] = [
+				{ role: 'system', content: systemMessage },
+				...llmMessages
+			]
+
 			const llmCancelToken = this._llmMessageService.sendLLMMessage({
 				messagesType: 'chatMessages',
+				chatMode,
 				messages,
-				tools: tools,
 				modelSelection,
 				modelSelectionOptions,
 				logging: { loggingName: `Chat - ${chatMode}`, loggingExtras: { threadId, nMessagesSent, chatMode } },
-				onText: ({ fullText, fullReasoning, fullToolName, fullToolParams }) => {
-					this._setStreamState(threadId, { messageSoFar: fullText, reasoningSoFar: fullReasoning, toolNameSoFar: fullToolName, toolParamsSoFar: fullToolParams }, 'merge')
+				onText: ({ fullText, fullReasoning, toolCall }) => {
+					this._setStreamState(threadId, { displayContentSoFar: fullText, reasoningSoFar: fullReasoning, toolCallSoFar: toolCall }, 'merge')
 				},
-				onFinalMessage: async ({ fullText, toolCalls, fullReasoning, anthropicReasoning }) => {
-					this._addMessageToThread(threadId, { role: 'assistant', content: fullText, reasoning: fullReasoning, anthropicReasoning })
-					// added to history and no longer streaming this, so clear messages so far and streamingToken (but do not stop isRunning)
-					this._setStreamState(threadId, { messageSoFar: undefined, reasoningSoFar: undefined, streamingToken: undefined, toolNameSoFar: undefined, toolParamsSoFar: undefined }, 'merge')
-					// resolve with tool calls
-					resMessageIsDonePromise(toolCalls)
+				onFinalMessage: async ({ fullText, fullReasoning, toolCall, anthropicReasoning, }) => {
+					this._addMessageToThread(threadId, { role: 'assistant', displayContent: fullText, reasoning: fullReasoning, toolCall, anthropicReasoning })
+					this._setStreamState(threadId, { displayContentSoFar: undefined, reasoningSoFar: undefined, streamingToken: undefined, toolCallSoFar: undefined }, 'merge')
+					resMessageIsDonePromise(toolCall) // resolve with tool calls
 				},
 				onError: (error) => {
-					const messageSoFar = this.streamState[threadId]?.messageSoFar ?? ''
+					const messageSoFar = this.streamState[threadId]?.displayContentSoFar ?? ''
 					const reasoningSoFar = this.streamState[threadId]?.reasoningSoFar ?? ''
+					const toolCallSoFar = this.streamState[threadId]?.toolCallSoFar
 					// add assistant's message to chat history, and clear selection
-					this._addMessageToThread(threadId, { role: 'assistant', content: messageSoFar, reasoning: reasoningSoFar, anthropicReasoning: null })
+					this._addMessageToThread(threadId, { role: 'assistant', displayContent: messageSoFar, reasoning: reasoningSoFar, toolCall: toolCallSoFar, anthropicReasoning: null })
 					this._setStreamState(threadId, { error }, 'set')
 					resMessageIsDonePromise()
 				},
@@ -774,14 +734,14 @@ class ChatThreadService extends Disposable implements IChatThreadService {
 				break
 			}
 			this._setStreamState(threadId, { streamingToken: llmCancelToken }, 'merge') // new stream token for the new message
-			const toolCalls = await messageIsDonePromise // wait for message to complete
+			const toolCall = await messageIsDonePromise // wait for message to complete
 			if (aborted) { return }
 			this._setStreamState(threadId, { streamingToken: undefined }, 'merge') // streaming message is done
 
 			// call tool if there is one
-			const tool: ToolCallType | undefined = toolCalls?.[0]
+			const tool: RawToolCallObj | undefined = toolCall
 			if (tool) {
-				const { awaitingUserApproval, interrupted } = await handleToolCall(tool)
+				const { awaitingUserApproval, interrupted } = await this._runToolCall(threadId, tool.name, { preapproved: false, unvalidatedToolParams: tool.rawParams })
 
 				// stop if interrupted. we don't have to do this for llmMessage because we have a stream token for it and onAbort gets called, but we don't have the equivalent for tools.
 				// just detect tool interruption which is the same as chat interruption right now
@@ -1118,14 +1078,21 @@ We only need to do it for files that were edited since `from`, ie files between
 		if (!thread) return // should never happen
 
 
+		const llmCancelToken = this.streamState[threadId]?.streamingToken // currently streaming LLM on this thread
+		if (llmCancelToken === undefined && this.streamState[threadId]?.isRunning === 'LLM') {
+			// if about to call the other LLM, just wait for it by stopping right now
+			return
+		}
+		// stop it (this simply resolves the promise to free up space)
+		if (llmCancelToken !== undefined) this._llmMessageService.abort(llmCancelToken)
+
+
+
 		// add dummy before this message to keep checkpoint before user message idea consistent
 		if (thread.messages.length === 0) {
 			this._addUserCheckpoint({ threadId })
 		}
 
-		// if the current thread is already streaming, stop it (this simply resolves the promise to free up space)
-		const llmCancelToken = this.streamState[threadId]?.streamingToken
-		if (llmCancelToken !== undefined) this._llmMessageService.abort(llmCancelToken)
 
 		const { chatMode } = this._settingsService.state.globalSettings
 
@@ -1141,7 +1108,7 @@ We only need to do it for files that were edited since `from`, ie files between
 		this._setThreadState(threadId, { currCheckpointIdx: null }) // no longer at a checkpoint because started streaming
 
 		this._wrapRunAgentToNotify(
-			this._runChatAgent({ threadId, userMessageContent, ...this._currentModelSelectionProps(), }),
+			this._runChatAgent({ threadId, ...this._currentModelSelectionProps(), }),
 			threadId,
 		)
 	}
@@ -1245,7 +1212,7 @@ We only need to do it for files that were edited since `from`, ie files between
 			// else search codebase for `target`
 			let uris: URI[] = []
 			try {
-				const { result } = await this._toolsService.callTool['search_pathnames_only']({ queryStr: target, include: null, pageNumber: 0 })
+				const { result } = await this._toolsService.callTool['search_pathnames_only']({ queryStr: target, searchInFolder: null, pageNumber: 0 })
 				uris = result.uris
 			} catch (e) {
 				return null
@@ -1517,6 +1484,10 @@ We only need to do it for files that were edited since `from`, ie files between
 				}
 			}
 		}, true)
+
+		// when change focused message idx, jump
+		if (messageIdx !== undefined)
+			this.jumpToCheckpointBeforeMessageIdx({ threadId, messageIdx, jumpToUserModified: true })
 	}
 
 	// set message.state

src/vs/workbench/contrib/void/browser/directoryStrService.ts

@@ -15,18 +15,17 @@ import { IExplorerService } from '../../files/browser/files.js';
 import { SortOrder } from '../../files/common/files.js';
 import { ExplorerItem } from '../../files/common/explorerModel.js';
 import { VoidDirectoryItem } from '../common/directoryStrTypes.js';
+import { MAX_DIRSTR_CHARS_TOTAL_BEGINNING, MAX_DIRSTR_CHARS_TOTAL_TOOL } from '../common/prompt/prompts.js';
 
 
-const MAX_CHARS_TOTAL_BEGINNING = 20_000
-const MAX_CHARS_TOTAL_TOOL = 20_000
 // const MAX_FILES_TOTAL = 200
 
 
 export interface IDirectoryStrService {
 	readonly _serviceBrand: undefined;
 
-	getDirectoryStrTool(uri: URI): Promise<{ wasCutOff: boolean, str: string }>
-	getAllDirectoriesStr(): Promise<{ wasCutOff: boolean, str: string }>
+	getDirectoryStrTool(uri: URI): Promise<string>
+	getAllDirectoriesStr(opts: { cutOffMessage: string }): Promise<string>
 
 }
 export const IDirectoryStrService = createDecorator<IDirectoryStrService>('voidDirectoryStrService');
@@ -275,18 +274,21 @@ class DirectoryStrService extends Disposable implements IDirectoryStrService {
 		if (!eRoot) throw new Error(`There was a problem reading the URI: ${uri.fsPath}.`)
 
 		const dirTree = await computeDirectoryTree(eRoot, this.explorerService);
-		const { content, wasCutOff } = stringifyDirectoryTree(dirTree, MAX_CHARS_TOTAL_TOOL);
+		const { content, wasCutOff } = stringifyDirectoryTree(dirTree, MAX_DIRSTR_CHARS_TOTAL_TOOL);
 
-		return {
-			str: `Directory of ${uri.fsPath}:\n${content}`,
-			wasCutOff,
-		}
+		let c = content.substring(0, MAX_DIRSTR_CHARS_TOTAL_TOOL)
+		c = `Directory of ${uri.fsPath}:\n${content}`
+		if (wasCutOff) c = `${c}\n...Result was truncated...`
+
+		return c
 	}
 
-	async getAllDirectoriesStr() {
+	async getAllDirectoriesStr({ cutOffMessage }: { cutOffMessage: string }) {
 		let str: string = '';
 		let cutOff = false;
 		const folders = this.workspaceContextService.getWorkspace().folders;
+		if (folders.length === 0)
+			return '(NO WORKSPACE OPEN)';
 
 		for (let i = 0; i < folders.length; i += 1) {
 			if (i > 0) str += '\n';
@@ -301,8 +303,7 @@ class DirectoryStrService extends Disposable implements IDirectoryStrService {
 
 			// Use our new approach with direct explorer service
 			const dirTree = await computeDirectoryTree(eRoot, this.explorerService);
-			console.log('dirtree', dirTree)
-			const { content, wasCutOff } = stringifyDirectoryTree(dirTree, MAX_CHARS_TOTAL_BEGINNING - str.length);
+			const { content, wasCutOff } = stringifyDirectoryTree(dirTree, MAX_DIRSTR_CHARS_TOTAL_BEGINNING - str.length);
 			str += content;
 			if (wasCutOff) {
 				cutOff = true;
@@ -310,7 +311,10 @@ class DirectoryStrService extends Disposable implements IDirectoryStrService {
 			}
 		}
 
-		return { wasCutOff: cutOff, str };
+		if (cutOff) {
+			return `${str}\n${cutOffMessage}`
+		}
+		return str
 	}
 }
 

src/vs/workbench/contrib/void/browser/editCodeService.ts

@@ -44,7 +44,6 @@ import { IEditCodeService, AddCtrlKOpts, StartApplyingOpts, CallBeforeStartApply
 import { IVoidSettingsService } from '../common/voidSettingsService.js';
 import { FeatureName } from '../common/voidSettingsTypes.js';
 import { IVoidModelService } from '../common/voidModelService.js';
-import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
 import { deepClone } from '../../../../base/common/objects.js';
 import { acceptBg, acceptBorder, buttonFontSize, buttonTextColor, rejectBg, rejectBorder } from '../common/helpers/colors.js';
 import { DiffArea, Diff, CtrlKZone, VoidFileSnapshot, DiffAreaSnapshotEntry, diffAreaSnapshotKeys, DiffZone, TrackingZone, ComputedDiff } from '../common/editCodeServiceTypes.js';
@@ -203,7 +202,6 @@ class EditCodeService extends Disposable implements IEditCodeService {
 		@IVoidSettingsService private readonly _settingsService: IVoidSettingsService,
 		// @IFileService private readonly _fileService: IFileService,
 		@IVoidModelService private readonly _voidModelService: IVoidModelService,
-		@ITextFileService private readonly _textFileService: ITextFileService,
 	) {
 		super();
 
@@ -733,16 +731,14 @@ class EditCodeService extends Disposable implements IEditCodeService {
 			resource: uri,
 			label: 'Void Agent',
 			code: 'undoredo.editCode',
-			undo: () => { opts?.onWillUndo?.(); this._restoreVoidFileSnapshot(uri, beforeSnapshot); },
-			redo: () => { if (afterSnapshot) this._restoreVoidFileSnapshot(uri, afterSnapshot) }
+			undo: async () => { opts?.onWillUndo?.(); await this._restoreVoidFileSnapshot(uri, beforeSnapshot) },
+			redo: async () => { if (afterSnapshot) await this._restoreVoidFileSnapshot(uri, afterSnapshot) }
 		}
 		this._undoRedoService.pushElement(elt)
 
 		const onFinishEdit = async () => {
 			afterSnapshot = this._getCurrentVoidFileSnapshot(uri)
-			await this._textFileService.save(uri, { // we want [our change] -> [save] so it's all treated as one change.
-				skipSaveParticipants: true // avoid triggering extensions etc (if they reformat the page, it will add another item to the undo stack)
-			})
+			await this._voidModelService.saveModel(uri)
 		}
 		return { onFinishEdit }
 	}
@@ -1118,6 +1114,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 		const uri = this._getURIBeforeStartApplying(opts)
 		if (!uri) return
 		await this._voidModelService.initializeModel(uri)
+		await this._voidModelService.saveModel(uri) // save the URI
 	}
 
 
@@ -1413,6 +1410,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 					messages,
 					modelSelection,
 					modelSelectionOptions,
+					chatMode: null, // not chat
 					onText: (params) => {
 						const { fullText: fullText_ } = params
 						const newText_ = fullText_.substring(fullTextSoFar.length, Infinity)
@@ -1630,6 +1628,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 					messages,
 					modelSelection,
 					modelSelectionOptions,
+					chatMode: null, // not chat
 					onText: (params) => {
 						const { fullText } = params
 						// blocks are [done done done ... {writingFinal|writingOriginal}]
@@ -1889,6 +1888,8 @@ class EditCodeService extends Disposable implements IEditCodeService {
 
 
 	interruptURIStreaming({ uri }: { uri: URI }) {
+		if (!this._uriIsStreaming(uri)) return
+		this._undoHistory(uri)
 		// brute force for now is OK
 		for (const diffareaid of this.diffAreasOfURI[uri.fsPath] || []) {
 			const diffArea = this.diffAreaOfId[diffareaid]
@@ -1896,7 +1897,6 @@ class EditCodeService extends Disposable implements IEditCodeService {
 			if (!diffArea._streamState.isStreaming) continue
 			this._stopIfStreaming(diffArea)
 		}
-		this._undoHistory(uri)
 	}
 
 

src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx

@@ -257,7 +257,10 @@ export const ApplyButtonsHTML = ({ codeStr, applyBoxId, reapplyIcon, uri }: { co
 		const [newApplyingUri, applyDonePromise] = editCodeService.startApplying(opts) ?? []
 
 		// catch any errors by interrupting the stream
-		applyDonePromise?.catch(e => { if (newApplyingUri) editCodeService.interruptURIStreaming({ uri: newApplyingUri }) })
+		applyDonePromise?.catch(e => {
+			const uri = getUriBeingApplied(applyBoxId)
+			if (uri) editCodeService.interruptURIStreaming({ uri: uri })
+		})
 
 		applyingURIOfApplyBoxIdRef.current[applyBoxId] = newApplyingUri ?? undefined
 

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

@@ -22,11 +22,12 @@ import { WarningBox } from '../void-settings-tsx/WarningBox.js';
 import { getModelCapabilities, getIsReasoningEnabledState } from '../../../../common/modelCapabilities.js';
 import { AlertTriangle, Ban, Check, ChevronRight, Dot, FileIcon, Pencil, Undo, Undo2, X } from 'lucide-react';
 import { ChatMessage, CheckpointEntry, StagingSelectionItem, ToolMessage } from '../../../../common/chatThreadServiceTypes.js';
-import { LintErrorItem, ToolCallParams, ToolName, toolNames, ToolNameWithApproval } from '../../../../common/toolsServiceTypes.js';
+import { ToolCallParams,  ToolNameWithApproval } from '../../../../common/toolsServiceTypes.js';
 import { ApplyButtonsHTML, CopyButton, IconShell1, JumpToFileButton, JumpToTerminalButton, StatusIndicator, StatusIndicatorForApplyButton, useApplyButtonState } from '../markdown/ApplyBlockHoverButtons.js';
 import { IsRunningType } from '../../../chatThreadService.js';
 import { acceptAllBg, acceptBorder, buttonFontSize, buttonTextColor, rejectAllBg, rejectBg, rejectBorder } from '../../../../common/helpers/colors.js';
 import { PlacesType } from 'react-tooltip';
+import { ToolName, toolNames } from '../../../../common/prompt/prompts.js';
 
 
 
@@ -780,7 +781,7 @@ const SimplifiedToolHeader = ({
 
 
 
-const UserMessageComponent = ({ chatMessage, messageIdx, isCheckpointGhost, _scrollToBottom }: { chatMessage: ChatMessage & { role: 'user' }, messageIdx: number, isCheckpointGhost: boolean, _scrollToBottom: (() => void) | null }) => {
+const UserMessageComponent = ({ chatMessage, messageIdx, isCheckpointGhost, currCheckpointIdx, _scrollToBottom }: { chatMessage: ChatMessage & { role: 'user' }, messageIdx: number, currCheckpointIdx: number | undefined, isCheckpointGhost: boolean, _scrollToBottom: (() => void) | null }) => {
 
 	const accessor = useAccessor()
 	const chatThreadsService = accessor.get('IChatThreadService')
@@ -931,7 +932,7 @@ const UserMessageComponent = ({ chatMessage, messageIdx, isCheckpointGhost, _scr
 		</VoidChatArea>
 	}
 
-
+	const isMsgAfterCheckpoint = currCheckpointIdx !== undefined && currCheckpointIdx === messageIdx - 1
 
 	return <div
 		// align chatbubble accoridng to role
@@ -941,7 +942,7 @@ const UserMessageComponent = ({ chatMessage, messageIdx, isCheckpointGhost, _scr
 				: mode === 'display' ? `self-end w-fit max-w-full whitespace-pre-wrap` : '' // user words should be pre
 			}
 
-			${isCheckpointGhost ? 'opacity-50 pointer-events-none' : ''}
+			${isCheckpointGhost && !isMsgAfterCheckpoint ? 'opacity-50 pointer-events-none' : ''}
 		`}
 		onMouseEnter={() => setIsHovered(true)}
 		onMouseLeave={() => setIsHovered(false)}
@@ -1090,7 +1091,7 @@ const AssistantMessageComponent = ({ chatMessage, isCheckpointGhost, isCommitted
 
 	const reasoningStr = chatMessage.reasoning?.trim() || null
 	const hasReasoning = !!reasoningStr
-	const isDoneReasoning = !!chatMessage.content
+	const isDoneReasoning = !!chatMessage.displayContent
 	const thread = chatThreadsService.getCurrentThread()
 
 
@@ -1099,7 +1100,7 @@ const AssistantMessageComponent = ({ chatMessage, isCheckpointGhost, isCommitted
 		messageIdx: messageIdx,
 	}
 
-	const isEmpty = !chatMessage.content && !chatMessage.reasoning
+	const isEmpty = !chatMessage.displayContent && !chatMessage.reasoning
 	if (isEmpty) return null
 
 	return <>
@@ -1123,7 +1124,7 @@ const AssistantMessageComponent = ({ chatMessage, isCheckpointGhost, isCommitted
 		<div className={`${isCheckpointGhost ? 'opacity-50' : ''}`}>
 			<ProseWrapper>
 				<ChatMarkdownRender
-					string={chatMessage.content || ''}
+					string={chatMessage.displayContent || ''}
 					chatMessageLocation={chatMessageLocation}
 					isApplyEnabled={true}
 					isLinkDetectionEnabled={true}
@@ -1351,17 +1352,23 @@ const EditToolHeaderButtons = ({ applyBoxId, uri, codeStr }: { applyBoxId: strin
 
 
 
-const InvalidTool = ({ toolName }: { toolName: string }) => {
+const InvalidTool = ({ toolName, message }: { toolName: ToolName, message: string }) => {
 	const accessor = useAccessor()
 	const title = getTitle({ name: toolName, type: 'invalid_params' })
 	const desc1 = 'Invalid parameters'
 	const icon = null
 	const isError = true
 	const componentParams: ToolHeaderParams = { title, desc1, isError, icon }
+
+	componentParams.children = <ToolChildrenWrapper>
+		<CodeChildren>
+			{message}
+		</CodeChildren>
+	</ToolChildrenWrapper>
 	return <ToolHeaderWrapper {...componentParams} />
 }
 
-const CanceledTool = ({ toolName }: { toolName: string }) => {
+const CanceledTool = ({ toolName }: { toolName: ToolName }) => {
 	const accessor = useAccessor()
 	const title = getTitle({ name: toolName, type: 'rejected' })
 	const desc1 = ''
@@ -1864,19 +1871,20 @@ type ChatBubbleProps = {
 	isCommitted: boolean,
 	chatIsRunning: IsRunningType,
 	threadId: string,
-	currCheckpointIdx: number,
+	currCheckpointIdx: number | undefined,
 	_scrollToBottom: (() => void) | null,
 }
 
 const ChatBubble = ({ threadId, chatMessage, currCheckpointIdx, isCommitted, messageIdx, chatIsRunning, _scrollToBottom }: ChatBubbleProps) => {
 	const role = chatMessage.role
 
-	const isCheckpointGhost = messageIdx > currCheckpointIdx && !chatIsRunning // whether to show as gray (if chat is running, for good measure just dont show any ghosts)
+	const isCheckpointGhost = messageIdx > (currCheckpointIdx ?? Infinity) && !chatIsRunning // whether to show as gray (if chat is running, for good measure just dont show any ghosts)
 
 	if (role === 'user') {
 		return <UserMessageComponent
 			chatMessage={chatMessage}
 			isCheckpointGhost={isCheckpointGhost}
+			currCheckpointIdx={currCheckpointIdx}
 			messageIdx={messageIdx}
 			_scrollToBottom={_scrollToBottom}
 		/>
@@ -1920,7 +1928,7 @@ const ChatBubble = ({ threadId, chatMessage, currCheckpointIdx, isCommitted, mes
 
 		if (chatMessage.type === 'invalid_params') {
 			return <div className={`${isCheckpointGhost ? 'opacity-50' : ''}`}>
-				<InvalidTool toolName={chatMessage.name} />
+				<InvalidTool toolName={chatMessage.name} message={chatMessage.content} />
 			</div>
 		}
 
@@ -1942,7 +1950,7 @@ const ChatBubble = ({ threadId, chatMessage, currCheckpointIdx, isCommitted, mes
 		return null
 	}
 
-	else if (role === 'decorative_canceled_tool') {
+	else if (role === 'interrupted_streaming_tool') {
 		return <div className={`${isCheckpointGhost ? 'opacity-50' : ''}`}>
 			<CanceledTool toolName={chatMessage.name} />
 		</div>
@@ -2288,12 +2296,12 @@ export const SidebarChat = () => {
 	const currThreadStreamState = useChatThreadsStreamState(chatThreadsState.currentThreadId)
 	const isRunning = currThreadStreamState?.isRunning
 	const latestError = currThreadStreamState?.error
-	const messageSoFar = currThreadStreamState?.messageSoFar
+	const displayContentSoFar = currThreadStreamState?.displayContentSoFar
+	const toolCallSoFar = currThreadStreamState?.toolCallSoFar
 	const reasoningSoFar = currThreadStreamState?.reasoningSoFar
 
-	const toolNameSoFar = currThreadStreamState?.toolNameSoFar
-	const toolParamsSoFar = currThreadStreamState?.toolParamsSoFar
-	const toolIsGenerating = !!toolNameSoFar && toolNameSoFar === 'edit_file' // show loading for slow tools (right now just edit)
+	// this is just if it's currently being generated, NOT if it's currently running
+	const toolIsGenerating = toolCallSoFar && !toolCallSoFar.isDone && toolCallSoFar.name === 'edit_file' // show loading for slow tools (right now just edit)
 
 	// ----- SIDEBAR CHAT state (local) -----
 
@@ -2343,11 +2351,10 @@ export const SidebarChat = () => {
 
 
 	const threadId = currentThread.id
-	const currCheckpointIdx = chatThreadsState.allThreads[threadId]?.state?.currCheckpointIdx ?? Infinity // if not exist, treat like checkpoint is last message (infinity)
+	const currCheckpointIdx = chatThreadsState.allThreads[threadId]?.state?.currCheckpointIdx ?? undefined  // if not exist, treat like checkpoint is last message (infinity)
 
 	const previousMessagesHTML = useMemo(() => {
 		const lastMessageIdx = previousMessages.findLastIndex(v => v.role !== 'checkpoint')
-
 		// tool request shows up as Editing... if in progress
 		return previousMessages.map((message, i) => {
 			return <ChatBubble
@@ -2361,17 +2368,18 @@ export const SidebarChat = () => {
 				_scrollToBottom={() => scrollToBottom(scrollContainerRef)}
 			/>
 		})
-	}, [previousMessages, isRunning, threadId])
+	}, [previousMessages, threadId, currCheckpointIdx, isRunning])
 
 	const streamingChatIdx = previousMessagesHTML.length
-	const currStreamingMessageHTML = reasoningSoFar || messageSoFar || isRunning ?
+	const currStreamingMessageHTML = reasoningSoFar || displayContentSoFar || isRunning ?
 		<ChatBubble
 			key={getChatBubbleId(threadId, streamingChatIdx)}
-			currCheckpointIdx={currCheckpointIdx} // if streaming, can't be the case
+			currCheckpointIdx={currCheckpointIdx}
 			chatMessage={{
 				role: 'assistant',
-				content: messageSoFar ?? '',
+				displayContent: displayContentSoFar ?? '',
 				reasoning: reasoningSoFar ?? '',
+				toolCall: toolCallSoFar,
 				anthropicReasoning: null,
 			}}
 			messageIdx={streamingChatIdx}
@@ -2383,8 +2391,6 @@ export const SidebarChat = () => {
 		/> : null
 
 
-	const generatingToolTitle = toolNameSoFar && toolNames.includes(toolNameSoFar as ToolName) ? titleOfToolName[toolNameSoFar as ToolName]?.proposed : toolNameSoFar
-
 	const messagesHTML = <ScrollToBottomContainer
 		key={'messages' + chatThreadsState.currentThreadId} // force rerender on all children if id changes
 		scrollContainerRef={scrollContainerRef}
@@ -2394,18 +2400,20 @@ export const SidebarChat = () => {
 			w-full h-full
 			overflow-x-hidden
 			overflow-y-auto
-			${previousMessagesHTML.length === 0 && !messageSoFar ? 'hidden' : ''}
+			${previousMessagesHTML.length === 0 && !displayContentSoFar ? 'hidden' : ''}
 		`}
 	>
 		{/* previous messages */}
 		{previousMessagesHTML}
-
-
 		{currStreamingMessageHTML}
 
-
 		{toolIsGenerating ?
-			<ToolHeaderWrapper key={getChatBubbleId(currentThread.id, streamingChatIdx + 1)} title={generatingToolTitle} desc1={<span className='flex items-center'>Generating<IconLoading /></span>} />
+			<ToolHeaderWrapper key={getChatBubbleId(currentThread.id, streamingChatIdx + 1)}
+				title={toolCallSoFar && toolNames.includes(toolCallSoFar.name as ToolName) ?
+					titleOfToolName[toolCallSoFar.name as ToolName]?.proposed
+					: toolCallSoFar?.name}
+				desc1={<span className='flex items-center'>Generating<IconLoading /></span>}
+			/>
 			: null}
 
 		{isRunning === 'LLM' && !toolIsGenerating ? <ProseWrapper>

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

@@ -90,7 +90,7 @@ export const SidebarThreadSelector = () => {
 							// 	secondMsg = truncate(pastThread.messages[secondMsgIdx].displayContent ?? '');
 							// }
 
-							const numMessages = pastThread.messages.filter((msg) => msg.role !== 'tool_request').length;
+							const numMessages = pastThread.messages.filter((msg) => msg.role === 'assistant' || msg.role === 'user').length;
 
 							return (
 								<li key={pastThread.id}>

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

@@ -106,6 +106,7 @@ export const VoidInputBox2 = forwardRef<HTMLTextAreaElement, InputBox2Props>(fun
 
 	return (
 		<textarea
+			autoFocus={false}
 			ref={useCallback((r: HTMLTextAreaElement | null) => {
 				if (fnsRef)
 					fnsRef.current = fns

src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx

@@ -19,7 +19,6 @@ import { WarningBox } from './WarningBox.js'
 import { os } from '../../../../common/helpers/systemInfo.js'
 import { IconLoading, IconX } from '../sidebar-tsx/SidebarChat.js'
 import { getModelCapabilities, getProviderCapabilities, ollamaRecommendedModels, VoidStaticModelInfo } from '../../../../common/modelCapabilities.js'
-import VoidImage from './VoidImage.js'
 
 
 const ButtonLeftTextRightOption = ({ text, leftButton }: { text: string, leftButton?: React.ReactNode }) => {
@@ -1428,9 +1427,9 @@ const VoidOnboarding = () => {
 				<div className="text-5xl font-light mb-6 mt-12 text-center">Welcome to Void</div>
 
 
-				<div className="w-8 h-8 mb-2">
+				{/* <div className="w-8 h-8 mb-2">
 					<VoidImage className='h-full w-full' />
-				</div>
+				</div> */}
 			</FadeIn>
 
 			<FadeIn delayMs={1000} className="text-center pb-8" onClick={() => { setPageIndex(pageIndex + 1) }}>

src/vs/workbench/contrib/void/browser/toolsService.ts

@@ -8,7 +8,7 @@ import { QueryBuilder } from '../../../services/search/common/queryBuilder.js'
 import { ISearchService } from '../../../services/search/common/search.js'
 import { IEditCodeService } from './editCodeServiceInterface.js'
 import { ITerminalToolService } from './terminalToolService.js'
-import { LintErrorItem, ToolCallParams, ToolName, ToolResultType } from '../common/toolsServiceTypes.js'
+import { LintErrorItem, ToolCallParams, ToolResultType } from '../common/toolsServiceTypes.js'
 import { IVoidModelService } from '../common/voidModelService.js'
 import { EndOfLinePreference } from '../../../../editor/common/model.js'
 import { basename } from '../../../../base/common/path.js'
@@ -16,6 +16,8 @@ import { IVoidCommandBarService } from './voidCommandBarService.js'
 import { computeDirectoryTree1Deep, IDirectoryStrService, stringifyDirectoryTree1Deep } from './directoryStrService.js'
 import { IMarkerService } from '../../../../platform/markers/common/markers.js'
 import { timeout } from '../../../../base/common/async.js'
+import { RawToolParamsObj } from '../common/sendLLMMessageTypes.js'
+import { ToolName } from '../common/prompt/prompts.js'
 
 
 // tool use for AI
@@ -23,7 +25,7 @@ import { timeout } from '../../../../base/common/async.js'
 
 
 
-type ValidateParams = { [T in ToolName]: (p: string) => Promise<ToolCallParams[T]> }
+type ValidateParams = { [T in ToolName]: (p: RawToolParamsObj) => Promise<ToolCallParams[T]> }
 type CallTool = { [T in ToolName]: (p: ToolCallParams[T]) => Promise<{ result: ToolResultType[T], interruptTool?: () => void }> }
 type ToolResultToString = { [T in ToolName]: (p: ToolCallParams[T], result: Awaited<ToolResultType[T]>) => string }
 
@@ -34,35 +36,16 @@ type ToolResultToString = { [T in ToolName]: (p: ToolCallParams[T], result: Awai
 export const MAX_FILE_CHARS_PAGE = 50_000
 export const MAX_CHILDREN_URIs_PAGE = 500
 export const MAX_TERMINAL_CHARS_PAGE = 20_000
-export const TERMINAL_TIMEOUT_TIME = 15
+export const TERMINAL_TIMEOUT_TIME = 5 // seconds
 export const TERMINAL_BG_WAIT_TIME = 1
 
 
-
-
-
-const validateJSON = (s: string): { [s: string]: unknown } => {
-	try {
-		const o = JSON.parse(s)
-		if (typeof o !== 'object') throw new Error()
-
-		if ('result' in o) { // openrouter sometimes wraps the result with { 'result': ... }
-			return o.result
-		}
-
-		return o
-	}
-	catch (e) {
-		throw new Error(`Invalid LLM output format: Tool parameter was not a string of a valid JSON: "${s}".`)
-	}
-}
-
 const isFalsy = (u: unknown) => {
 	return !u || u === 'null' || u === 'undefined'
 }
 
 const validateStr = (argName: string, value: unknown) => {
-	if (typeof value !== 'string') throw new Error(`Invalid LLM output format: ${argName} must be a string.`)
+	if (typeof value !== 'string') throw new Error(`Invalid LLM output format: ${argName} must be a string, but it's a ${typeof value}. Value: ${value}.`)
 	return value
 }
 
@@ -70,7 +53,7 @@ const validateStr = (argName: string, value: unknown) => {
 // We are NOT checking to make sure in workspace
 // TODO!!!! check to make sure folder/file exists
 const validateURI = (uriStr: unknown) => {
-	if (typeof uriStr !== 'string') throw new Error('Invalid LLM output format: Provided uri must be a string.')
+	if (typeof uriStr !== 'string') throw new Error(`Invalid LLM output format: Provided uri must be a string, but it's a ${typeof uriStr}. Value: ${uriStr}.`)
 	const uri = URI.file(uriStr)
 	return uri
 }
@@ -109,6 +92,7 @@ const validateNumber = (numStr: unknown, opts: { default: number | null }) => {
 }
 
 const validateRecursiveParamStr = (paramsUnknown: unknown) => {
+	if (!paramsUnknown) return false
 	if (typeof paramsUnknown !== 'string') throw new Error('Invalid LLM output format: Error calling tool: provided params must be a string.')
 	const params = paramsUnknown
 	const isRecursive = params.includes('r')
@@ -172,10 +156,8 @@ export class ToolsService implements IToolsService {
 		const queryBuilder = instantiationService.createInstance(QueryBuilder);
 
 		this.validateParams = {
-			read_file: async (params: string) => {
-				const o = validateJSON(params)
-				const { uri: uriStr, startLine: startLineUnknown, endLine: endLineUnknown, pageNumber: pageNumberUnknown } = o
-
+			read_file: async (params: RawToolParamsObj) => {
+				const { uri: uriStr, start_line: startLineUnknown, end_line: endLineUnknown, page_number: pageNumberUnknown } = params
 				const uri = validateURI(uriStr)
 				const pageNumber = validatePageNum(pageNumberUnknown)
 
@@ -184,43 +166,39 @@ export class ToolsService implements IToolsService {
 
 				return { uri, startLine, endLine, pageNumber }
 			},
-			ls_dir: async (params: string) => {
-				const o = validateJSON(params)
-				const { uri: uriStr, pageNumber: pageNumberUnknown } = o
+			ls_dir: async (params: RawToolParamsObj) => {
+				const { uri: uriStr, page_number: pageNumberUnknown } = params
 
 				const uri = validateURI(uriStr)
 				const pageNumber = validatePageNum(pageNumberUnknown)
 				return { rootURI: uri, pageNumber }
 			},
-			get_dir_structure: async (params: string) => {
-				const o = validateJSON(params)
-				const { uri: uriStr, } = o
+			get_dir_structure: async (params: RawToolParamsObj) => {
+				const { uri: uriStr, } = params
 				const uri = validateURI(uriStr)
 				return { rootURI: uri }
 			},
-			search_pathnames_only: async (params: string) => {
-				const o = validateJSON(params)
+			search_pathnames_only: async (params: RawToolParamsObj) => {
 				const {
 					query: queryUnknown,
-					include: includeUnknown,
-					pageNumber: pageNumberUnknown
-				} = o
+					search_in_folder: includeUnknown,
+					page_number: pageNumberUnknown
+				} = params
 
 				const queryStr = validateStr('query', queryUnknown)
 				const pageNumber = validatePageNum(pageNumberUnknown)
-				const include = validateOptionalStr('include', includeUnknown)
+				const searchInFolder = validateOptionalStr('search_in_folder', includeUnknown)
 
-				return { queryStr, include, pageNumber }
+				return { queryStr, searchInFolder, pageNumber }
 
 			},
-			search_files: async (params: string) => {
-				const o = validateJSON(params)
+			search_files: async (params: RawToolParamsObj) => {
 				const {
 					query: queryUnknown,
-					searchInFolder: searchInFolderUnknown,
-					isRegex: isRegexUnknown,
-					pageNumber: pageNumberUnknown
-				} = o
+					search_in_folder: searchInFolderUnknown,
+					is_regex: isRegexUnknown,
+					page_number: pageNumberUnknown
+				} = params
 
 				const queryStr = validateStr('query', queryUnknown)
 				const pageNumber = validatePageNum(pageNumberUnknown)
@@ -233,18 +211,16 @@ export class ToolsService implements IToolsService {
 
 			// ---
 
-			create_file_or_folder: async (params: string) => {
-				const o = validateJSON(params)
-				const { uri: uriUnknown } = o
+			create_file_or_folder: async (params: RawToolParamsObj) => {
+				const { uri: uriUnknown } = params
 				const uri = validateURI(uriUnknown)
 				const uriStr = validateStr('uri', uriUnknown)
 				const isFolder = checkIfIsFolder(uriStr)
 				return { uri, isFolder }
 			},
 
-			delete_file_or_folder: async (params: string) => {
-				const o = validateJSON(params)
-				const { uri: uriUnknown, params: paramsStr } = o
+			delete_file_or_folder: async (params: RawToolParamsObj) => {
+				const { uri: uriUnknown, params: paramsStr } = params
 				const uri = validateURI(uriUnknown)
 				const isRecursive = validateRecursiveParamStr(paramsStr)
 				const uriStr = validateStr('uri', uriUnknown)
@@ -252,17 +228,15 @@ export class ToolsService implements IToolsService {
 				return { uri, isRecursive, isFolder }
 			},
 
-			edit_file: async (params: string) => {
-				const o = validateJSON(params)
-				const { uri: uriStr, changeDescription: changeDescriptionUnknown } = o
+			edit_file: async (params: RawToolParamsObj) => {
+				const { uri: uriStr, change_description: changeDescriptionUnknown } = params
 				const uri = validateURI(uriStr)
 				const changeDescription = validateStr('changeDescription', changeDescriptionUnknown)
 				return { uri, changeDescription }
 			},
 
-			run_terminal_command: async (s: string) => {
-				const o = validateJSON(s)
-				const { command: commandUnknown, terminalId: terminalIdUnknown, waitForCompletion: waitForCompletionUnknown } = o
+			run_terminal_command: async (params: RawToolParamsObj) => {
+				const { command: commandUnknown, terminal_id: terminalIdUnknown, wait_for_completion: waitForCompletionUnknown } = params
 				const command = validateStr('command', commandUnknown)
 				const proposedTerminalId = validateProposedTerminalId(terminalIdUnknown)
 				const waitForCompletion = validateBoolean(waitForCompletionUnknown, { default: true })
@@ -302,17 +276,15 @@ export class ToolsService implements IToolsService {
 			},
 
 			get_dir_structure: async ({ rootURI }) => {
-				const result = await this.directoryStrService.getDirectoryStrTool(rootURI)
-				let str = result.str
-				if (result.wasCutOff) str += '\n(Result was truncated)'
+				const str = await this.directoryStrService.getDirectoryStrTool(rootURI)
 				return { result: { str } }
 			},
 
-			search_pathnames_only: async ({ queryStr, include, pageNumber }) => {
+			search_pathnames_only: async ({ queryStr, searchInFolder, pageNumber }) => {
 
 				const query = queryBuilder.file(workspaceContextService.getWorkspace().folders.map(f => f.uri), {
 					filePattern: queryStr,
-					includePattern: include ?? undefined,
+					includePattern: searchInFolder ?? undefined,
 				})
 				const data = await searchService.fileSearch(query, CancellationToken.None)
 
@@ -456,7 +428,7 @@ export class ToolsService implements IToolsService {
 				const terminalDesc = `terminal ${terminalId}${didCreateTerminal ? ` (a newly-created terminal)` : ''}`
 
 				if (resolveReason.type === 'timeout') {
-					return `Terminal command ran in ${terminalDesc}, but timed out after ${TERMINAL_TIMEOUT_TIME} seconds. Result:\n${result_}`
+					return `Terminal command ran in ${terminalDesc}, but did not complete after ${TERMINAL_TIMEOUT_TIME} seconds. Result:\n${result_}`
 				}
 				else if (resolveReason.type === 'bgtask') {
 					return `Terminal command is running in the background in ${terminalDesc}. Here were the outputs after ${TERMINAL_BG_WAIT_TIME} seconds:\n${result_}`

src/vs/workbench/contrib/void/browser/voidUpdateActions.ts

@@ -46,13 +46,23 @@ const notifyYesUpdate = (notifService: INotificationService, res: { message?: st
 					const { window } = dom.getActiveWindow()
 					window.open('https://voideditor.com/')
 				}
+			}],
+			secondary: [{
+				id: 'void.updater.close',
+				enabled: true,
+				label: `Keep Void outdated`,
+				tooltip: '',
+				class: undefined,
+				run: () => {
+					notifController.close()
+				}
 			}]
 		},
 	})
-	const d = notifController.onDidClose(() => {
-		notifyYesUpdate(notifService, res)
-		d.dispose()
-	})
+	// const d = notifController.onDidClose(() => {
+	// 	notifyYesUpdate(notifService, res)
+	// 	d.dispose()
+	// })
 }
 const notifyNoUpdate = (notifService: INotificationService) => {
 	notifService.notify({
@@ -86,7 +96,7 @@ registerAction2(class extends Action2 {
 		const metricsService = accessor.get(IMetricsService)
 
 		metricsService.capture('Void Update Manual: Checking...', {})
-		const res = await voidUpdateService.check()
+		const res = await voidUpdateService.check(true)
 		if (!res) { notifyErrChecking(notifService); metricsService.capture('Void Update Manual: Error', { res }) }
 		else if (res.hasUpdate) { notifyYesUpdate(notifService, res); metricsService.capture('Void Update Manual: Yes', { res }) }
 		else if (!res.hasUpdate) { notifyNoUpdate(notifService); metricsService.capture('Void Update Manual: No', { res }) }
@@ -104,7 +114,7 @@ class VoidUpdateWorkbenchContribution extends Disposable implements IWorkbenchCo
 		super()
 		const autoCheck = async () => {
 			this.metricsService.capture('Void Update Startup: Checking...', {})
-			const res = await this.voidUpdateService.check()
+			const res = await this.voidUpdateService.check(false)
 			if (!res) { notifyErrChecking(this.notifService); this.metricsService.capture('Void Update Startup: Error', { res }) }
 			else if (res.hasUpdate) { notifyYesUpdate(this.notifService, res); this.metricsService.capture('Void Update Startup: Yes', { res }) }
 			else if (!res.hasUpdate) { this.metricsService.capture('Void Update Startup: No', { res }) } // display nothing if up to date

src/vs/workbench/contrib/void/common/chatThreadServiceTypes.ts

@@ -5,17 +5,16 @@
 
 import { URI } from '../../../../base/common/uri.js';
 import { VoidFileSnapshot } from './editCodeServiceTypes.js';
-import { AnthropicReasoning } from './sendLLMMessageTypes.js';
-import { ToolName, ToolCallParams, ToolResultType } from './toolsServiceTypes.js';
+import { ToolName } from './prompt/prompts.js';
+import { AnthropicReasoning, RawToolCallObj } from './sendLLMMessageTypes.js';
+import { ToolCallParams, ToolResultType } from './toolsServiceTypes.js';
 
 export type ToolMessage<T extends ToolName> = {
 	role: 'tool';
-	paramsStr: string; // internal use
-	id: string; // apis require this tool use id
 	content: string; // give this result to LLM (string of value)
 } & (
 		// in order of events:
-		| { type: 'invalid_params', result: null, params: null, name: string }
+		| { type: 'invalid_params', result: null, name: T, params: RawToolCallObj | null, }
 
 		| { type: 'tool_request', result: null, name: T, params: ToolCallParams[T], }  // params were validated, awaiting user
 
@@ -27,18 +26,10 @@ export type ToolMessage<T extends ToolName> = {
 	) // user rejected
 
 export type DecorativeCanceledTool = {
-	role: 'decorative_canceled_tool';
-	name: string;
+	role: 'interrupted_streaming_tool';
+	name: ToolName;
 }
 
-// export type ToolRequestApproval<T extends ToolName> = {
-// 	role: 'tool_request';
-// 	name: T; // internal use
-// 	params: ToolCallParams[T]; // internal use
-// 	paramsStr: string; // internal use - this is what the LLM outputted, not necessarily JSON.stringify(params)
-// 	id: string; // proposed tool's id
-// }
-
 
 // checkpoints
 export type CheckpointEntry = {
@@ -65,8 +56,9 @@ export type ChatMessage =
 		}
 	} | {
 		role: 'assistant';
-		content: string; // content received from LLM  - allowed to be '', will be replaced with (empty)
+		displayContent: string; // content received from LLM  - allowed to be '', will be replaced with (empty)
 		reasoning: string; // reasoning from the LLM, used for step-by-step thinking
+		toolCall: RawToolCallObj | undefined;
 
 		anthropicReasoning: AnthropicReasoning[] | null; // anthropic reasoning
 	}

src/vs/workbench/contrib/void/common/helpers/extractCodeFromResult.ts

@@ -3,9 +3,7 @@
  *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
  *--------------------------------------------------------------------------------------*/
 
-import { OnText } from '../sendLLMMessageTypes.js'
 import { DIVIDER, FINAL, ORIGINAL } from '../prompt/prompts.js'
-
 class SurroundingsRemover {
 	readonly originalS: string
 	i: number
@@ -174,7 +172,7 @@ export type ExtractedSearchReplaceBlock = {
 // JS substring swaps indices, so "ab".substr(1,0) will NOT be '', it will be 'a'!
 const voidSubstr = (str: string, start: number, end: number) => end < start ? '' : str.substring(start, end)
 
-const endsWithAnyPrefixOf = (str: string, anyPrefix: string) => {
+export const endsWithAnyPrefixOf = (str: string, anyPrefix: string) => {
 	// for each prefix
 	for (let i = anyPrefix.length; i >= 1; i--) { // i >= 1 because must not be empty string
 		const prefix = anyPrefix.slice(0, i)
@@ -250,122 +248,6 @@ export const extractSearchReplaceBlocks = (str: string) => {
 
 
 
-// could simplify this - this assumes we can never add a tag without committing it to the user's screen, but that's not true
-export const extractReasoningOnTextWrapper = (onText: OnText, thinkTags: [string, string]): OnText => {
-	let latestAddIdx = 0 // exclusive index in fullText_
-	let foundTag1 = false
-	let foundTag2 = false
-
-	let fullTextSoFar = ''
-	let fullReasoningSoFar = ''
-
-	let onText_ = onText
-	onText = (params) => {
-		onText_(params)
-	}
-
-	const newOnText: OnText = ({ fullText: fullText_, ...p }) => {
-		// until found the first think tag, keep adding to fullText
-		if (!foundTag1) {
-			const endsWithTag1 = endsWithAnyPrefixOf(fullText_, thinkTags[0])
-			if (endsWithTag1) {
-				// console.log('endswith1', { fullTextSoFar, fullReasoningSoFar, fullText_ })
-				// wait until we get the full tag or know more
-				return
-			}
-			// if found the first tag
-			const tag1Index = fullText_.indexOf(thinkTags[0])
-			if (tag1Index !== -1) {
-				// console.log('tag1Index !==1', { tag1Index, fullTextSoFar, fullReasoningSoFar, thinkTags, fullText_ })
-				foundTag1 = true
-				// Add text before the tag to fullTextSoFar
-				fullTextSoFar += fullText_.substring(0, tag1Index)
-				// Update latestAddIdx to after the first tag
-				latestAddIdx = tag1Index + thinkTags[0].length
-				onText({ ...p, fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
-				return
-			}
-
-			// console.log('adding to text A', { fullTextSoFar, fullReasoningSoFar })
-			// add the text to fullText
-			fullTextSoFar = fullText_
-			latestAddIdx = fullText_.length
-			onText({ ...p, fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
-			return
-		}
-
-		// at this point, we found <tag1>
-
-		// until found the second think tag, keep adding to fullReasoning
-		if (!foundTag2) {
-			const endsWithTag2 = endsWithAnyPrefixOf(fullText_, thinkTags[1])
-			if (endsWithTag2) {
-				// console.log('endsWith2', { fullTextSoFar, fullReasoningSoFar })
-				// wait until we get the full tag or know more
-				return
-			}
-
-			// if found the second tag
-			const tag2Index = fullText_.indexOf(thinkTags[1], latestAddIdx)
-			if (tag2Index !== -1) {
-				// console.log('tag2Index !== -1', { fullTextSoFar, fullReasoningSoFar })
-				foundTag2 = true
-				// Add everything between first and second tag to reasoning
-				fullReasoningSoFar += fullText_.substring(latestAddIdx, tag2Index)
-				// Update latestAddIdx to after the second tag
-				latestAddIdx = tag2Index + thinkTags[1].length
-				onText({ ...p, fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
-				return
-			}
-
-			// add the text to fullReasoning (content after first tag but before second tag)
-			// console.log('adding to text B', { fullTextSoFar, fullReasoningSoFar })
-
-			// If we have more text than we've processed, add it to reasoning
-			if (fullText_.length > latestAddIdx) {
-				fullReasoningSoFar += fullText_.substring(latestAddIdx)
-				latestAddIdx = fullText_.length
-			}
-
-			onText({ ...p, fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
-			return
-		}
-
-		// at this point, we found <tag2> - content after the second tag is normal text
-		// console.log('adding to text C', { fullTextSoFar, fullReasoningSoFar })
-
-		// Add any new text after the closing tag to fullTextSoFar
-		if (fullText_.length > latestAddIdx) {
-			fullTextSoFar += fullText_.substring(latestAddIdx)
-			latestAddIdx = fullText_.length
-		}
-
-		onText({ ...p, fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
-	}
-
-	return newOnText
-}
-
-
-export const extractReasoningOnFinalMessage = (fullText_: string, thinkTags: [string, string]): { fullText: string, fullReasoning: string } => {
-	const tag1Idx = fullText_.indexOf(thinkTags[0])
-	const tag2Idx = fullText_.indexOf(thinkTags[1])
-	if (tag1Idx === -1) return { fullText: fullText_, fullReasoning: '' } // never started reasoning
-	if (tag2Idx === -1) return { fullText: '', fullReasoning: fullText_ } // never stopped reasoning
-
-	const fullReasoning = fullText_.substring(tag1Idx + thinkTags[0].length, tag2Idx)
-	const fullText = fullText_.substring(0, tag1Idx) + fullText_.substring(tag2Idx + thinkTags[1].length, Infinity)
-	return { fullText, fullReasoning }
-}
-
-
-
-
-
-
-
-
-
 
 
 

src/vs/workbench/contrib/void/common/modelCapabilities.ts

@@ -123,7 +123,7 @@ export type VoidStaticModelInfo = { // not stateful
 	}
 
 	supportsSystemMessage: false | 'system-role' | 'developer-role' | 'separated'; // separated = anthropic where "system" is a special parameter
-	supportsTools: false | 'TODO-yes-but-we-handle-it-manually' | 'anthropic-style' | 'openai-style';
+	supportsTools?: false | 'TODO-yes-but-we-handle-it-manually' | 'anthropic-style' | 'openai-style';
 	supportsFIM: boolean;
 
 	reasoningCapabilities: false | {
@@ -165,7 +165,6 @@ const modelOptionsDefaults: VoidStaticModelInfo = {
 	cost: { input: 0, output: 0 },
 	downloadable: false,
 	supportsSystemMessage: false,
-	supportsTools: false,
 	supportsFIM: false,
 	reasoningCapabilities: false,
 }
@@ -180,42 +179,36 @@ const openSourceModelOptions_assumingOAICompat = {
 	'deepseekR1': {
 		supportsFIM: false,
 		supportsSystemMessage: false,
-		supportsTools: false,
 		reasoningCapabilities: { supportsReasoning: true, canTurnOffReasoning: false, canIOReasoning: true, openSourceThinkTags: ['<think>', '</think>'] },
 		contextWindow: 32_000, maxOutputTokens: 4_096,
 	},
 	'deepseekCoderV3': {
 		supportsFIM: false,
 		supportsSystemMessage: false, // unstable
-		supportsTools: false,
 		reasoningCapabilities: false,
 		contextWindow: 32_000, maxOutputTokens: 4_096,
 	},
 	'deepseekCoderV2': {
 		supportsFIM: false,
 		supportsSystemMessage: false, // unstable
-		supportsTools: false,
 		reasoningCapabilities: false,
 		contextWindow: 32_000, maxOutputTokens: 4_096,
 	},
 	'codestral': {
 		supportsFIM: true,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: false,
 		contextWindow: 32_000, maxOutputTokens: 4_096,
 	},
 	'openhands-lm-32b': { // https://www.all-hands.dev/blog/introducing-openhands-lm-32b----a-strong-open-coding-agent-model
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: false, // built on qwen 2.5 32B instruct
 		contextWindow: 128_000, maxOutputTokens: 4_096
 	},
 	'phi4': {
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: false,
 		reasoningCapabilities: false,
 		contextWindow: 16_000, maxOutputTokens: 4_096,
 	},
@@ -223,7 +216,6 @@ const openSourceModelOptions_assumingOAICompat = {
 	'gemma': { // https://news.ycombinator.com/item?id=43451406
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: false,
 		reasoningCapabilities: false,
 		contextWindow: 32_000, maxOutputTokens: 4_096,
 	},
@@ -231,14 +223,12 @@ const openSourceModelOptions_assumingOAICompat = {
 	'llama4-scout': {
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: false,
 		contextWindow: 10_000_000, maxOutputTokens: 4_096,
 	},
 	'llama4-maverick': {
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: false,
 		contextWindow: 10_000_000, maxOutputTokens: 4_096,
 	},
@@ -247,28 +237,24 @@ const openSourceModelOptions_assumingOAICompat = {
 	'llama3': {
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: false,
 		contextWindow: 32_000, maxOutputTokens: 4_096,
 	},
 	'llama3.1': {
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: false,
 		contextWindow: 32_000, maxOutputTokens: 4_096,
 	},
 	'llama3.2': {
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: false,
 		contextWindow: 32_000, maxOutputTokens: 4_096,
 	},
 	'llama3.3': {
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: false,
 		contextWindow: 32_000, maxOutputTokens: 4_096,
 	},
@@ -276,14 +262,12 @@ const openSourceModelOptions_assumingOAICompat = {
 	'qwen2.5coder': {
 		supportsFIM: true,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: false,
 		contextWindow: 32_000, maxOutputTokens: 4_096,
 	},
 	'qwq': {
 		supportsFIM: false, // no FIM, yes reasoning
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: { supportsReasoning: true, canTurnOffReasoning: false, canIOReasoning: true, openSourceThinkTags: ['<think>', '</think>'] },
 		contextWindow: 128_000, maxOutputTokens: 8_192,
 	},
@@ -291,7 +275,6 @@ const openSourceModelOptions_assumingOAICompat = {
 	'starcoder2': {
 		supportsFIM: true,
 		supportsSystemMessage: false,
-		supportsTools: false,
 		reasoningCapabilities: false,
 		contextWindow: 128_000, maxOutputTokens: 8_192,
 
@@ -299,7 +282,6 @@ const openSourceModelOptions_assumingOAICompat = {
 	'codegemma:2b': {
 		supportsFIM: true,
 		supportsSystemMessage: false,
-		supportsTools: false,
 		reasoningCapabilities: false,
 		contextWindow: 128_000, maxOutputTokens: 8_192,
 
@@ -381,7 +363,6 @@ const anthropicModelOptions = {
 		downloadable: false,
 		supportsFIM: false,
 		supportsSystemMessage: 'separated',
-		supportsTools: 'anthropic-style',
 		reasoningCapabilities: {
 			supportsReasoning: true,
 			canTurnOffReasoning: true,
@@ -397,7 +378,6 @@ const anthropicModelOptions = {
 		downloadable: false,
 		supportsFIM: false,
 		supportsSystemMessage: 'separated',
-		supportsTools: 'anthropic-style',
 		reasoningCapabilities: false,
 	},
 	'claude-3-5-haiku-20241022': {
@@ -407,7 +387,6 @@ const anthropicModelOptions = {
 		downloadable: false,
 		supportsFIM: false,
 		supportsSystemMessage: 'separated',
-		supportsTools: 'anthropic-style',
 		reasoningCapabilities: false,
 	},
 	'claude-3-opus-20240229': {
@@ -417,7 +396,6 @@ const anthropicModelOptions = {
 		downloadable: false,
 		supportsFIM: false,
 		supportsSystemMessage: 'separated',
-		supportsTools: 'anthropic-style',
 		reasoningCapabilities: false,
 	},
 	'claude-3-sonnet-20240229': { // no point of using this, but including this for people who put it in
@@ -426,7 +404,6 @@ const anthropicModelOptions = {
 		maxOutputTokens: 4_096,
 		supportsFIM: false,
 		supportsSystemMessage: 'separated',
-		supportsTools: 'anthropic-style',
 		reasoningCapabilities: false,
 	}
 } as const satisfies { [s: string]: VoidStaticModelInfo }
@@ -465,7 +442,6 @@ const openAIModelOptions = { // https://platform.openai.com/docs/pricing
 		cost: { input: 15.00, cache_read: 7.50, output: 60.00, },
 		downloadable: false,
 		supportsFIM: false,
-		supportsTools: false,
 		supportsSystemMessage: 'developer-role',
 		reasoningCapabilities: { supportsReasoning: true, canIOReasoning: false, canTurnOffReasoning: false }, // it doesn't actually output reasoning, but our logic is fine with it
 	},
@@ -475,7 +451,6 @@ const openAIModelOptions = { // https://platform.openai.com/docs/pricing
 		cost: { input: 1.10, cache_read: 0.55, output: 4.40, },
 		downloadable: false,
 		supportsFIM: false,
-		supportsTools: false,
 		supportsSystemMessage: 'developer-role',
 		reasoningCapabilities: { supportsReasoning: true, canIOReasoning: false, canTurnOffReasoning: false },
 	},
@@ -485,7 +460,6 @@ const openAIModelOptions = { // https://platform.openai.com/docs/pricing
 		cost: { input: 2.50, cache_read: 1.25, output: 10.00, },
 		downloadable: false,
 		supportsFIM: false,
-		supportsTools: 'openai-style',
 		supportsSystemMessage: 'system-role',
 		reasoningCapabilities: false,
 	},
@@ -495,7 +469,6 @@ const openAIModelOptions = { // https://platform.openai.com/docs/pricing
 		cost: { input: 1.10, cache_read: 0.55, output: 4.40, },
 		downloadable: false,
 		supportsFIM: false,
-		supportsTools: false,
 		supportsSystemMessage: false, // does not support any system
 		reasoningCapabilities: { supportsReasoning: true, canIOReasoning: false, canTurnOffReasoning: false },
 	},
@@ -505,7 +478,6 @@ const openAIModelOptions = { // https://platform.openai.com/docs/pricing
 		cost: { input: 0.15, cache_read: 0.075, output: 0.60, },
 		downloadable: false,
 		supportsFIM: false,
-		supportsTools: 'openai-style',
 		supportsSystemMessage: 'system-role', // ??
 		reasoningCapabilities: false,
 	},
@@ -534,7 +506,6 @@ const xAIModelOptions = {
 		downloadable: false,
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: false,
 	},
 } as const satisfies { [s: string]: VoidStaticModelInfo }
@@ -560,7 +531,6 @@ const geminiModelOptions = { // https://ai.google.dev/gemini-api/docs/pricing
 		downloadable: false,
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style', // we are assuming OpenAI SDK when calling gemini
 		reasoningCapabilities: false,
 	},
 	'gemini-2.0-flash': {
@@ -570,7 +540,6 @@ const geminiModelOptions = { // https://ai.google.dev/gemini-api/docs/pricing
 		downloadable: false,
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style', // we are assuming OpenAI SDK when calling gemini
 		reasoningCapabilities: false,
 	},
 	'gemini-2.0-flash-lite-preview-02-05': {
@@ -580,7 +549,6 @@ const geminiModelOptions = { // https://ai.google.dev/gemini-api/docs/pricing
 		downloadable: false,
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: false,
 	},
 	'gemini-1.5-flash': {
@@ -590,7 +558,6 @@ const geminiModelOptions = { // https://ai.google.dev/gemini-api/docs/pricing
 		downloadable: false,
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: false,
 	},
 	'gemini-1.5-pro': {
@@ -600,7 +567,6 @@ const geminiModelOptions = { // https://ai.google.dev/gemini-api/docs/pricing
 		downloadable: false,
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: false,
 	},
 	'gemini-1.5-flash-8b': {
@@ -610,7 +576,6 @@ const geminiModelOptions = { // https://ai.google.dev/gemini-api/docs/pricing
 		downloadable: false,
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: false,
 	},
 } as const satisfies { [s: string]: VoidStaticModelInfo }
@@ -659,7 +624,6 @@ const groqModelOptions = { // https://console.groq.com/docs/models, https://groq
 		downloadable: false,
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: false,
 	},
 	'llama-3.1-8b-instant': {
@@ -669,7 +633,6 @@ const groqModelOptions = { // https://console.groq.com/docs/models, https://groq
 		downloadable: false,
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: false,
 	},
 	'qwen-2.5-coder-32b': {
@@ -679,7 +642,6 @@ const groqModelOptions = { // https://console.groq.com/docs/models, https://groq
 		downloadable: false,
 		supportsFIM: false, // unfortunately looks like no FIM support on groq
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: false,
 	},
 	'qwen-qwq-32b': { // https://huggingface.co/Qwen/QwQ-32B
@@ -689,7 +651,6 @@ const groqModelOptions = { // https://console.groq.com/docs/models, https://groq
 		downloadable: false,
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: { supportsReasoning: true, canIOReasoning: true, canTurnOffReasoning: false, openSourceThinkTags: ['<think>', '</think>'] }, // we're using reasoning_format:parsed so really don't need to know openSourceThinkTags
 	},
 } as const satisfies { [s: string]: VoidStaticModelInfo }
@@ -788,7 +749,6 @@ const openRouterModelOptions_assumingOpenAICompat = {
 		cost: { input: 0, output: 0 },
 		downloadable: false,
 		supportsFIM: false,
-		supportsTools: 'openai-style',
 		supportsSystemMessage: 'system-role',
 		reasoningCapabilities: false,
 	},
@@ -798,7 +758,6 @@ const openRouterModelOptions_assumingOpenAICompat = {
 		cost: { input: 0, output: 0 },
 		downloadable: false,
 		supportsFIM: false,
-		supportsTools: 'openai-style',
 		supportsSystemMessage: 'system-role',
 		reasoningCapabilities: false,
 	},
@@ -808,7 +767,6 @@ const openRouterModelOptions_assumingOpenAICompat = {
 		cost: { input: 0, output: 0 },
 		downloadable: false,
 		supportsFIM: false,
-		supportsTools: 'openai-style',
 		supportsSystemMessage: 'system-role',
 		reasoningCapabilities: false,
 	},
@@ -818,7 +776,6 @@ const openRouterModelOptions_assumingOpenAICompat = {
 		cost: { input: 0, output: 0 },
 		downloadable: false,
 		supportsFIM: false,
-		supportsTools: 'openai-style',
 		supportsSystemMessage: 'system-role',
 		reasoningCapabilities: false,
 	},
@@ -836,7 +793,6 @@ const openRouterModelOptions_assumingOpenAICompat = {
 		downloadable: false,
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: { // same as anthropic, see above
 			supportsReasoning: true,
 			canTurnOffReasoning: false,
@@ -852,7 +808,6 @@ const openRouterModelOptions_assumingOpenAICompat = {
 		downloadable: false,
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: false, // stupidly, openrouter separates thinking from non-thinking
 	},
 	'anthropic/claude-3.5-sonnet': {
@@ -862,7 +817,6 @@ const openRouterModelOptions_assumingOpenAICompat = {
 		downloadable: false,
 		supportsFIM: false,
 		supportsSystemMessage: 'system-role',
-		supportsTools: 'openai-style',
 		reasoningCapabilities: false,
 	},
 	'mistralai/codestral-2501': {
@@ -878,7 +832,6 @@ const openRouterModelOptions_assumingOpenAICompat = {
 		...openSourceModelOptions_assumingOAICompat['qwen2.5coder'],
 		contextWindow: 33_000,
 		maxOutputTokens: null,
-		supportsTools: false, // openrouter qwen doesn't seem to support tools...?
 		cost: { input: 0.07, output: 0.16 },
 		downloadable: false,
 	},
@@ -886,7 +839,6 @@ const openRouterModelOptions_assumingOpenAICompat = {
 		...openSourceModelOptions_assumingOAICompat['qwq'],
 		contextWindow: 33_000,
 		maxOutputTokens: null,
-		supportsTools: false, // openrouter qwen doesn't seem to support tools...?
 		cost: { input: 0.07, output: 0.16 },
 		downloadable: false,
 	}

src/vs/workbench/contrib/void/common/prompt/prompts.ts

@@ -3,16 +3,24 @@
  *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
  *--------------------------------------------------------------------------------------*/
 
-import { os } from '../helpers/systemInfo.js';
-import { StagingSelectionItem } from '../chatThreadServiceTypes.js';
-import { ChatMode } from '../voidSettingsTypes.js';
-import { InternalToolInfo } from '../toolsServiceTypes.js';
-import { IVoidModelService } from '../voidModelService.js';
 import { EndOfLinePreference } from '../../../../../editor/common/model.js';
+import { StagingSelectionItem } from '../chatThreadServiceTypes.js';
+import { os } from '../helpers/systemInfo.js';
+import { RawToolCallObj } from '../sendLLMMessageTypes.js';
+import { toolNamesThatRequireApproval } from '../toolsServiceTypes.js';
+import { IVoidModelService } from '../voidModelService.js';
+import { ChatMode } from '../voidSettingsTypes.js';
 
 // this is just for ease of readability
 export const tripleTick = ['```', '```']
 
+export const MAX_DIRSTR_CHARS_TOTAL_BEGINNING = 20_000
+export const MAX_DIRSTR_CHARS_TOTAL_TOOL = 20_000
+
+export const MAX_PREFIX_SUFFIX_CHARS = 20_000
+
+
+// ======================================================== tools ========================================================
 const changesExampleContent = `\
 // ... existing code ...
 // {{change 1}}
@@ -22,35 +30,34 @@ const changesExampleContent = `\
 // {{change 3}}
 // ... existing code ...`
 
-const editToolDescription = `\
+const editToolDescriptionExample = `\
 ${tripleTick[0]}
 ${changesExampleContent}
 ${tripleTick[1]}`
 
-const fileNameEdit = `${tripleTick[0]}typescript
+const fileNameEditExample = `${tripleTick[0]}typescript
 /Users/username/Dekstop/my_project/app.ts
 ${changesExampleContent}
 ${tripleTick[1]}`
 
 
 
+export type InternalToolInfo = {
+	name: string,
+	description: string,
+	params: {
+		[paramName: string]: { description: string }
+	},
+}
 
 
-// ======================================================== tools ========================================================
-
-const paginationHelper = {
-	desc: `Very large results may be paginated (a note will always be included if pagination took place). Pagination fails gracefully if out of bounds or invalid page number.`,
-	param: { pageNumber: { type: 'number', description: 'The page number (default is the first page = 1).' }, }
-} as const
 
 const uriParam = (object: string) => ({
-	uri: { type: 'string', description: `The FULL path to the ${object}.` }
+	uri: { description: `The FULL path to the ${object}.` }
 })
 
-
-const searchParams = {
-	searchInFolder: { type: 'string', description: 'Only search files in this given folder. Leave as empty to search all available files.' },
-	isRegex: { type: 'string', description: 'Whether to treat the query as a regular expression. Default is "false".' },
+const paginationParam = {
+	page_number: { description: 'Optional. The page number of the result. Default is 1.' }
 } as const
 
 
@@ -59,27 +66,27 @@ export const voidTools = {
 
 	read_file: {
 		name: 'read_file',
-		description: `Returns file contents of a given URI. ${paginationHelper.desc}`,
+		description: `Returns file contents of a given URI.`,
 		params: {
 			...uriParam('file'),
-			startLine: { type: 'string', description: 'Line to start reading from. Default is "null", treated as 1.' },
-			endLine: { type: 'string', description: 'Line to stop reading from (inclusive). Default is "null", treated as Infinity.' },
-			...paginationHelper.param,
+			start_line: { description: 'Optional. Default is 1. Start reading on this line.' },
+			end_line: { description: 'Optional. Default is Infinity. Stop reading after this line.' },
+			...paginationParam,
 		},
 	},
 
 	ls_dir: {
 		name: 'ls_dir',
-		description: `Returns all file names and folder names in a given folder. ${paginationHelper.desc}`,
+		description: `Lists all files and folders in the given URI.`,
 		params: {
 			...uriParam('folder'),
-			...paginationHelper.param,
+			...paginationParam,
 		},
 	},
 
 	get_dir_structure: {
 		name: 'get_dir_structure',
-		description: `This is a very effective way to learn about the user's codebase. You might want to use this instead of ls_dir. Returns a tree diagram of all the files and folders in the given folder URI. If results are large, the given string will be truncated (this will be indicated), in which case you might want to call this tool on a lower folder to get better results, or just use ls_dir which supports pagination.`,
+		description: `This is a very effective way to learn about the user's codebase. Returns a tree diagram of all the files and folders in the given folder. `,
 		params: {
 			...uriParam('folder')
 		}
@@ -91,11 +98,11 @@ export const voidTools = {
 
 	search_pathnames_only: {
 		name: 'search_pathnames_only',
-		description: `Returns all pathnames that match a given query (searches ONLY file names). You should use this when looking for a file with a specific name or path. ${paginationHelper.desc}`,
+		description: `Returns all pathnames that match a given query (searches ONLY file names). You should use this when looking for a file with a specific name or path.`,
 		params: {
-			query: { type: 'string', description: undefined },
-			...searchParams,
-			...paginationHelper.param,
+			query: { description: `Your query for the search.` },
+			search_in_folder: { description: 'Optional. Only search files in this given folder glob.' },
+			...paginationParam,
 		},
 	},
 
@@ -103,11 +110,12 @@ export const voidTools = {
 
 	search_files: {
 		name: 'search_files',
-		description: `Returns all pathnames that match a given \`grep\`-style query (searches ONLY file contents). The query can be any regex. This is often followed by the \`read_file\` tool to view the full file contents of results. ${paginationHelper.desc}`,
+		description: `Returns all pathnames that match a given query (searches ONLY file contents). The query can be any substring or glob. You can follow this with read_file to view result contents.`,
 		params: {
-			query: { type: 'string', description: undefined },
-			...searchParams,
-			...paginationHelper.param,
+			query: { description: `Your query for the search.` },
+			search_in_folder: { description: 'Optional. Only search files in this given folder glob.' },
+			is_regex: { description: 'Optional. Default is false. Whether query is a regex.' },
+			...paginationParam,
 		},
 	},
 
@@ -115,7 +123,7 @@ export const voidTools = {
 
 	create_file_or_folder: {
 		name: 'create_file_or_folder',
-		description: `Create a file or folder at the given path. To create a folder, ensure the path ends with a trailing slash. Fails gracefully if the file already exists. Missing ancestors in the path will be recursively created automatically.`,
+		description: `Create a file or folder at the given path. To create a folder, ensure the path ends with a trailing slash.`,
 		params: {
 			...uriParam('file or folder'),
 		},
@@ -123,25 +131,25 @@ export const voidTools = {
 
 	delete_file_or_folder: {
 		name: 'delete_file_or_folder',
-		description: `Delete a file or folder at the given path. Fails gracefully if the file or folder does not exist.`,
+		description: `Delete a file or folder at the given path.`,
 		params: {
 			...uriParam('file or folder'),
-			params: { type: 'string', description: 'Return -r here to delete recursively (if applicable). Default is the empty string.' }
+			params: { description: 'Optional. Return -r here to delete recursively.' }
 		},
 	},
 
 	edit_file: { // APPLY TOOL
 		name: 'edit_file',
-		description: `Edits the contents of a file, given the file's URI and a description. Fails gracefully if the file does not exist.`,
+		description: `Edits the contents of a file given the file's URI and a description.`,
 		params: {
 			...uriParam('file'),
-			changeDescription: {
-				type: 'string', description: `\
-- Your changeDescription should be a brief code description of the change you want to make, with comments like "// ... existing code ..." to condense your writing.
-- NEVER re-write the whole file, and ALWAYS use comments like "// ... existing code ...". Bias towards writing as little as possible.
-- Your description will be handed to a dumber, faster model that will quickly apply the change, so it should be clear and concise.
-- You must output your description in triple backticks.
-Here's an example of a good description:\n${editToolDescription}.`
+			change_description: {
+				description: `\
+A brief code description of the change you want to make, with comments like "// ... existing code ..." to condense your writing. \
+NEVER re-write the whole file. Instead, use comments like  "// ... existing code ...". Bias towards writing as little as possible. \
+Your description will be handed to a smaller model to make the change, so it must be clear and concise. \
+Your description MUST be wrapped in triple backticks. \
+Here's an example of a good description:\n${editToolDescriptionExample}`
 			}
 		},
 	},
@@ -150,161 +158,199 @@ Here's an example of a good description:\n${editToolDescription}.`
 		name: 'run_terminal_command',
 		description: `Executes a terminal command.`,
 		params: {
-			command: { type: 'string', description: 'The terminal command to execute. Typically you should pipe to cat to avoid pagination.' },
-			waitForCompletion: { type: 'string', description: `Whether or not to await the command to complete and get the final result. Default is true. Make this value false when you want a command to run indefinitely without waiting for it.` },
-			terminalId: { type: 'string', description: 'Optional (value must be an integer >= 1, or empty which will go with the default). This is the ID of the terminal instance to execute the command in. The primary purpose of this is to start a new terminal for background processes or tasks that run indefinitely (e.g. if you want to run a server locally). Fails gracefully if a terminal ID does not exist, by creating a new terminal instance. Defaults to the preferred terminal ID.' },
+			command: { description: 'The terminal command to execute.' },
+			wait_for_completion: { description: `Optional. Default is true. Make this value false when you want a command to run without waiting for it to complete.` },
+			terminal_id: { description: 'Optional. The ID of the terminal instance that should execute the command (if not provided, defaults to the preferred terminal ID). The primary purpose of this is to let you open a new terminal for testing or background processes (e.g. running a dev server for the user in a separate terminal). Must be an integer >= 1.' },
 		},
 	},
 
-
 	// go_to_definition
 	// go_to_usages
 
 } satisfies { [name: string]: InternalToolInfo }
 
 
+export type ToolName = keyof typeof voidTools
+export const toolNames = Object.keys(voidTools) as ToolName[]
 
+type ToolParamNameOfTool<T extends ToolName> = keyof (typeof voidTools)[T]['params']
+export type ToolParamName = { [T in ToolName]: ToolParamNameOfTool<T> }[ToolName]
 
+const toolNamesSet = new Set<string>(toolNames)
+
+export const isAToolName = (toolName: string): toolName is ToolName => {
+	const isAToolName = toolNamesSet.has(toolName)
+	return isAToolName
+}
+
+export const availableTools = (chatMode: ChatMode) => {
+	const toolNames: ToolName[] | undefined = chatMode === 'normal' ? undefined
+		: chatMode === 'gather' ? (Object.keys(voidTools) as ToolName[]).filter(toolName => !toolNamesThatRequireApproval.has(toolName))
+			: chatMode === 'agent' ? Object.keys(voidTools) as ToolName[]
+				: undefined
+
+	const tools: InternalToolInfo[] | undefined = toolNames?.map(toolName => voidTools[toolName])
+	return tools
+}
+
+const availableXMLToolsStr = (tools: InternalToolInfo[]) => {
+	return `${tools.map((t, i) => {
+		const params = Object.keys(t.params).map(paramName => `<${paramName}>${t.params[paramName].description}</${paramName}>`).join('\n')
+		return `\
+${i + 1}. ${t.name}
+Description: ${t.description}
+Format:
+<${t.name}>${!params ? '' : `\n${params}`}
+</${t.name}>`
+	}).join('\n\n')}`
+}
+
+export const toolCallXMLStr = (toolCall: RawToolCallObj) => {
+	const t = toolCall
+	const params = Object.keys(t.rawParams).map(paramName => `<${paramName}>${t.rawParams[paramName as ToolParamName]}</${paramName}>`).join('\n')
+	return `\
+<${toolCall.name}>${!params ? '' : `\n${params}`}
+</${toolCall.name}>`
+		.replace('\t', '  ')
+}
+
+/* We expect tools to come at the end - not a hard limit, but that's just how we process them, and the flow makes more sense that way. */
+// - You are allowed to call multiple tools by specifying them consecutively. However, there should be NO text or writing between tool calls or after them.
+const systemToolsXMLPrompt = (chatMode: ChatMode) => {
+	const tools = availableTools(chatMode)
+	if (!tools || tools.length === 0) return ''
+
+	const toolXMLDefinitions = (`\
+Available tools:
+
+${availableXMLToolsStr(tools)}`)
+
+	const toolCallXMLGuidelines = (`\
+Tool calling details:
+- Once you write a tool call, you must STOP and WAIT for the result.
+- All parameters are REQUIRED unless noted otherwise.
+- To call a tool, write its name and parameters in one of the XML formats specified above.
+- You are only allowed to output ONE tool call, and it must be at the END of your response.
+- Your tool call will be executed immediately, and the results will appear in the following user message.`)
+
+	return `\
+${toolXMLDefinitions}
+
+${toolCallXMLGuidelines}`
+}
 
 // ======================================================== chat (normal, gather, agent) ========================================================
 
 
+export const chat_systemMessage = ({ workspaceFolders, openedURIs, activeURI, runningTerminalIds, directoryStr, chatMode: mode }: { workspaceFolders: string[], directoryStr: string, openedURIs: string[], activeURI: string | undefined, runningTerminalIds: string[], chatMode: ChatMode }) => {
+	const header = (`You are an expert coding ${mode === 'agent' ? 'agent' : 'assistant'} whose job is \
+${mode === 'agent' ? `to help the user develop, run, and make changes to their codebase.`
+			: mode === 'gather' ? `to search, understand, and reference files in the user's codebase.`
+				: mode === 'normal' ? `to assist the user with their coding tasks.`
+					: ''}
+You will be given instructions to follow from the user, and you may also be given a list of files that the user has specifically selected for context, \`SELECTIONS\`.
+Please assist the user with their query.`)
 
-export const chat_systemMessage = ({ workspaceFolders, openedURIs, activeURI, runningTerminalIds, directoryStr, chatMode: mode }: { workspaceFolders: string[], directoryStr: string, openedURIs: string[], activeURI: string | undefined, runningTerminalIds: string[], chatMode: ChatMode }) => `\
-You are an expert coding ${mode === 'agent' ? 'agent' : 'assistant'} that runs in the user's IDE called Void. Your job is \
-${mode === 'agent' ? `to help the user develop, run, deploy, and make changes to their codebase. You should ALWAYS bring user's task to completion to the fullest extent possible, calling tools to make all necessary changes.`
-		: mode === 'gather' ? `to search and understand the user's codebase. You MUST use tools to read files and help the user understand the codebase, even if you were initially given files.`
-			: mode === 'normal' ? `to assist the user with their coding tasks.`
-				: ''}
-You will be given instructions to follow from the user, \`INSTRUCTIONS\`. You may also be given a list of files that the user has specifically selected, \`SELECTIONS\`.
-Please assist the user with their query. The user's query is never invalid.
-${/* system info */''}
-The user's system information is as follows:
+
+
+	const sysInfo = (`Here is the user's system information:
+<system_info>
 - ${os}
-- Open workspace(s): ${workspaceFolders.join(', ') || 'NO WORKSPACE OPEN'}
-- Open tab(s): ${openedURIs.join(', ') || 'NO OPENED EDITORS'}
-- Active tab: ${activeURI}
-${(mode === 'agent') && runningTerminalIds.length !== 0 ? `
+
+- Open workspaces:
+${workspaceFolders.join('\n') || 'NO WORKSPACE OPEN'}
+
+- Active file:
+${activeURI}
+
+- Open files:
+${openedURIs.join('\n') || 'NO OPENED EDITORS'}${''/* separator */}${mode === 'agent' && runningTerminalIds.length !== 0 ? `
+
 - Existing terminal IDs: ${runningTerminalIds.join(', ')}` : ''}
-
-${/* tool use */ mode === 'agent' || mode === 'gather' ? `\
-You will be given tools you can call.
-${mode === 'agent' ? `\
-- Only use tools if they help you accomplish the user's goal. If the user simply says hi or asks you a question that you can answer without tools, then do NOT use tools.
-- ALWAYS use tools to take actions. For example, if you would like to edit a file, you MUST use a tool.
-- You will OFTEN need to gather context before making a change. Do not immediately make a change unless you have ALL relevant context.
-- ALWAYS have maximal certainty in a change BEFORE you make it. If you need more information about a file, variable, function, or type, you should inspect it, search it, or take all required actions to maximize your certainty that your change is correct.`
-			: mode === 'gather' ? `\
-- Your primary use of tools should be to gather information to help the user understand the codebase and answer their query.
-- You should extensively read files, types, etc and gather relevant context.`
-				: ''}
-- If you think you should use tools, you do not need to ask for permission. Feel free to call tools whenever you'd like. You can use them to understand the codebase, ${mode === 'agent' ? 'run terminal commands, edit files, ' : 'gather relevant files and information, '}etc.
-- NEVER refer to a tool by name when speaking with the user (NEVER say something like "I'm going to use \`tool_name\`"). Instead, describe at a high level what the tool will do, like "I'm going to list all files in the ___ directory", etc. Also do not refer to "pages" of results, just say you're getting more results.
-- Some tools only work if the user has a workspace open.${mode === 'agent' ? `
-- NEVER modify a file outside the user's workspace(s) without permission from the user.` : ''}
-\
-`: `\
-You're allowed to ask for more context. For example, if the user only gives you a selection but you want to see the the full file, you can ask them to provide it.
-\
-`}
-${/* code blocks */ mode === 'agent' ? `\
-Behavior:
-- Always use tools (edit, terminal, etc) to take actions and implement changes. Don't just describe them.
-- Prioritize taking as many steps as you need to complete your request over stopping early.\
-`: `\
-If you think it's appropriate to suggest an edit to a file, then you must describe your suggestion in CODE BLOCK(S) (wrapped in triple backticks).
-- The first line of the code block must be the FULL PATH of the file you want to change.
-- The remaining contents should be a brief code description of the change you want to make, with comments like "// ... existing code ..." to condense your writing.
-- NEVER re-write the whole file, and ALWAYS use comments like "// ... existing code ...". Bias towards writing as little as possible.
-- Your description will be handed to a dumber, faster model that will quickly apply the change, so it should be clear and concise.
-Here's an example of a good code block:\n${fileNameEdit}.
-
-If you write a code block that's related to a specific file, please use the same format as above:
-- The first line of the code block must be the FULL PATH of the related file if known.
-- The remaining contents of the file should proceed as usual.
-\
-`}
-${/* misc */''}
-Misc:
-- Do not make things up.
-- Do not be lazy.
-- NEVER re-write the entire file.
-- Always wrap any code you produce in triple backticks, and specify a language if possible. For example, ${tripleTick[0]}typescript\n...\n${tripleTick[1]}.
-- Today's date is ${new Date().toDateString()}
-The user's codebase is structured as follows:\n${directoryStr}
-\
-`
-// agent mode doesn't know about 1st line paths yet
-// - If you wrote triple ticks and ___, then include the file's full path in the first line of the triple ticks. This is only for display purposes to the user, and it's preferred but optional. Never do this in a tool parameter, or if there's ambiguity about the full path.
+</system_info>`)
 
 
-// type FileSelnLocal = { fileURI: URI, language: string, content: string }
-// const stringifyFileSelection = ({ fileURI, language, content }: FileSelnLocal) => {
-// 	return `\
-// ${fileURI.fsPath}
-// ${tripleTick[0]}${language}
-// ${content}
-// ${tripleTick[1]}
-// `
-// }
-// const stringifyCodeSelection = ({ uri, language, range }: StagingSelectionItem & { type: 'CodeSelection' }) => {
-// 	return `\
+	const fsInfo = (`Here is an overview of the user's file system:
+<files_overview>
+${directoryStr}
+</files_overview>`)
 
-// ${tripleTick[0]}${language}
-// ${selectionStr}
-// ${tripleTick[1]}
-// `
+
+	const toolDefinitions = systemToolsXMLPrompt(mode)
+
+	const details: string[] = []
+
+	if (mode === 'agent' || mode === 'gather') {
+		details.push(`Only call tools if they help you accomplish the user's goal. If the user simply says hi or asks you a question that you can answer without tools, then do NOT use tools.`)
+		details.push('Only use ONE tool call at a time, and always wait for the result before proceeding.') // XML
+		details.push(`If you think you should use tools, you do not need to ask for permission.`)
+		details.push(`NEVER say something like "I'm going to use \`tool_name\`". Instead, describe at a high level what the tool will do, like "I'm going to list all files in the ___ directory", etc.`)
+		details.push(`Many tools only work if the user has a workspace open.`)
+	}
+	else {
+		details.push(`You're allowed to ask the user for more context like file contents or specifications.`)
+	}
+
+	if (mode === 'agent') {
+		details.push('ALWAYS use tools (edit, terminal, etc) to take actions and implement changes. For example, if you would like to edit a file, you MUST use a tool.')
+		details.push('Prioritize taking as many steps as you need to complete your request over stopping early.')
+		details.push(`You will OFTEN need to gather context before making a change. Do not immediately make a change unless you have ALL relevant context.`)
+		details.push(`ALWAYS have maximal certainty in a change BEFORE you make it. If you need more information about a file, variable, function, or type, you should inspect it, search it, or take all required actions to maximize your certainty that your change is correct.`)
+		details.push(`NEVER modify a file outside the user's workspace(s) without permission from the user.`)
+	}
+
+	if (mode === 'gather') {
+		details.push(`Your primary use of tools should be to gather information to help the user understand the codebase and answer their query.`)
+		details.push(`You should extensively read files, types, content, etc and gather relevant context.`)
+	}
+
+
+	if (mode === 'gather' || mode === 'normal') {
+		details.push(`If you write any code blocks, please use this format:
+- The first line of the code block must be the FULL PATH of the related file if known (otherwise omit).
+- The remaining contents of the file should proceed as usual.`)
+
+		details.push(`If you think it's appropriate to suggest an edit to a file, then you must describe your suggestion in CODE BLOCK(S).
+- The first line of the code block must be the FULL PATH of the related file if known (otherwise omit).
+- The remaining contents should be \
+a brief code description of the change you want to make, with comments like "// ... existing code ..." to condense your writing. \
+NEVER re-write the whole file. Instead, use comments like  "// ... existing code ...". Bias towards writing as little as possible. \
+Here's an example of a good edit suggestion:
+${fileNameEditExample}.`)
+	}
+
+	details.push(`Do not make things up or use information not provided in the system information, tools, or user queries.`)
+	details.push(`Today's date is ${new Date().toDateString()}.`)
+
+	const importantDetails = (`Important notes:
+${details.map((d, i) => `${i + 1}. ${d}`).join('\n\n')}`)
+
+
+	// return answer
+	const ansStrs: string[] = []
+	ansStrs.push(header)
+	ansStrs.push(sysInfo)
+	ansStrs.push(fsInfo)
+	if (toolDefinitions) ansStrs.push(toolDefinitions)
+	ansStrs.push(importantDetails)
+	ansStrs.push('Now, please assist the user with their query.')
+
+	const fullSystemMsgStr = ansStrs
+		.join('\n\n\n')
+		.trim()
+		.replace('\t', '  ')
+
+	return fullSystemMsgStr
+
+}
+
+
+// // log all prompts
+// for (const chatMode of ['agent', 'gather', 'normal'] satisfies ChatMode[]) {
+// 	console.log(`========================================= SYSTEM MESSAGE FOR ${chatMode} ===================================\n`,
+// 		chat_systemMessage({ chatMode, workspaceFolders: [], openedURIs: [], activeURI: 'pee', runningTerminalIds: [], directoryStr: 'lol', }))
 // }
 
-// const failToReadStr = 'Could not read content. This file may have been deleted. If you expected content here, you can tell the user about this as they might not know.'
-// const stringifyFileSelections = async (fileSelections: FileSelection[], voidModelService: IVoidModelService) => {
-// 	if (fileSelections.length === 0) return null
-// 	const fileSlns: FileSelnLocal[] = await Promise.all(fileSelections.map(async (sel) => {
-// 		const { model } = await voidModelService.getModelSafe(sel.fileURI)
-// 		const content = model?.getValue(EndOfLinePreference.LF) ?? failToReadStr
-// 		return { ...sel, content }
-// 	}))
-// 	return fileSlns.map(sel => stringifyFileSelection(sel)).join('\n')
-// }
-
-
-
-
-// export const chat_selectionsString = async (
-// 	prevSelns: StagingSelectionItem[] | null, currSelns: StagingSelectionItem[] | null,
-// 	voidModelService: IVoidModelService,
-// ) => {
-
-// 	// ADD IN FILES AT TOP
-// 	const allSelections = [...currSelns || [], ...prevSelns || []]
-
-// 	if (allSelections.length === 0) return null
-
-// 	for (const selection of allSelections) {
-// 		if (selection.type === 'Selection') {
-// 			codeSelections.push(selection)
-// 		}
-// 		else if (selection.type === 'File') {
-// 			const fileSelection = selection
-// 			const path = fileSelection.fileURI.fsPath
-// 			if (!filesURIs.has(path)) {
-// 				filesURIs.add(path)
-// 				fileSelections.push(fileSelection)
-// 			}
-// 		}
-// 	}
-
-// 	const filesStr = await stringifyFileSelections(fileSelections, voidModelService)
-// 	const selnsStr = stringifyCodeSelections(codeSelections)
-
-// 	const fileContents = [filesStr, selnsStr].filter(Boolean).join('\n')
-// 	return fileContents || null
-// }
-
-// export const chat_lastUserMessageWithFilesAdded = (userMessage: string, selectionsString: string | null) => {
-// 	if (userMessage) return `${userMessage}${selectionsString ? `\n${selectionsString}` : ''}`
-// 	else return userMessage
-// }
 
 export const chat_userMessageContent = async (instructions: string, currSelns: StagingSelectionItem[] | null,
 	opts: { type: 'references' } | { type: 'fullCode', voidModelService: IVoidModelService }
@@ -459,8 +505,6 @@ export const voidPrefixAndSuffix = ({ fullFileStr, startLine, endLine }: { fullF
 
 	const fullFileLines = fullFileStr.split('\n')
 
-	// we can optimize this later
-	const MAX_PREFIX_SUFFIX_CHARS = 20_000
 	/*
 
 	a
@@ -566,6 +610,40 @@ ${tripleTick[1]}).`
 
 
 
+
+// const toAnthropicTool = (toolInfo: InternalToolInfo) => {
+// 	const { name, description, params } = toolInfo
+// 	return {
+// 		name: name,
+// 		description: description,
+// 		input_schema: {
+// 			type: 'object',
+// 			properties: params,
+// 			// required: Object.keys(params),
+// 		},
+// 	} satisfies Anthropic.Messages.Tool
+// }
+
+
+// const toOpenAICompatibleTool = (toolInfo: InternalToolInfo) => {
+// 	const { name, description, params } = toolInfo
+// 	return {
+// 		type: 'function',
+// 		function: {
+// 			name: name,
+// 			// strict: true, // strict mode - https://platform.openai.com/docs/guides/function-calling?api-mode=chat
+// 			description: description,
+// 			parameters: {
+// 				type: 'object',
+// 				properties: params,
+// 				// required: Object.keys(params), // in strict mode, all params are required and additionalProperties is false
+// 				// additionalProperties: false,
+// 			},
+// 		}
+// 	} satisfies OpenAI.Chat.Completions.ChatCompletionTool
+// }
+
+
 /*
 // ======================================================== ai search/replace ========================================================
 

src/vs/workbench/contrib/void/common/sendLLMMessageTypes.ts

@@ -3,8 +3,8 @@
  *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
  *--------------------------------------------------------------------------------------*/
 
-import { ToolName, InternalToolInfo } from './toolsServiceTypes.js'
-import { ModelSelection, ModelSelectionOptions, ProviderName, SettingsOfProvider } from './voidSettingsTypes.js'
+import { ToolName, ToolParamName } from './prompt/prompts.js'
+import { ChatMode, ModelSelection, ModelSelectionOptions, ProviderName, SettingsOfProvider } from './voidSettingsTypes.js'
 
 
 export const errorDetails = (fullError: Error | null): string | null => {
@@ -37,25 +37,24 @@ export type LLMChatMessage = {
 	role: 'assistant',
 	content: string; // text content
 	anthropicReasoning: AnthropicReasoning[] | null;
-} | {
-	role: 'tool';
-	content: string; // result
-	name: string;
-	params: string;
-	id: string;
 }
 
 
-export type ToolCallType = {
+export type RawToolParamsObj = {
+	[paramName in ToolParamName]?: string;
+}
+export type RawToolCallObj = {
 	name: ToolName;
-	paramsStr: string;
-	id: string;
-}
+	rawParams: RawToolParamsObj;
+	doneParams: ToolParamName[];
+	isDone: boolean;
+};
+
 
 export type AnthropicReasoning = ({ type: 'thinking'; thinking: any; signature: string; } | { type: 'redacted_thinking', data: any })
 
-export type OnText = (p: { fullText: string; fullReasoning: string; fullToolName: string; fullToolParams: string; }) => void
-export type OnFinalMessage = (p: { fullText: string; fullReasoning: string; toolCalls?: ToolCallType[]; anthropicReasoning: AnthropicReasoning[] | null }) => void // id is tool_use_id
+export type OnText = (p: { fullText: string; fullReasoning: string; toolCall?: RawToolCallObj }) => void
+export type OnFinalMessage = (p: { fullText: string; fullReasoning: string; toolCall?: RawToolCallObj; anthropicReasoning: AnthropicReasoning[] | null }) => void // id is tool_use_id
 export type OnError = (p: { message: string; fullError: Error | null }) => void
 export type OnAbort = () => void
 export type AbortRef = { current: (() => void) | null }
@@ -70,11 +69,11 @@ export type LLMFIMMessage = {
 type SendLLMType = {
 	messagesType: 'chatMessages';
 	messages: LLMChatMessage[];
-	tools?: InternalToolInfo[];
+	chatMode: ChatMode | null;
 } | {
 	messagesType: 'FIMMessage';
 	messages: LLMFIMMessage;
-	tools?: undefined;
+	chatMode?: undefined;
 }
 
 // service types

src/vs/workbench/contrib/void/common/toolsServiceTypes.ts

@@ -1,6 +1,5 @@
 import { URI } from '../../../../base/common/uri.js'
-import { voidTools } from './prompt/prompts.js';
-
+import { ToolName } from './prompt/prompts.js';
 
 
 
@@ -16,26 +15,6 @@ export type ShallowDirectoryItem = {
 	isSymbolicLink: boolean;
 }
 
-// we do this using Anthropic's style and convert to OpenAI style later
-export type InternalToolInfo = {
-	name: string,
-	description: string,
-	params: {
-		[paramName: string]: { type: string, description: string | undefined } // name -> type
-	},
-}
-
-
-
-
-export type ToolName = keyof typeof voidTools
-export const toolNames = Object.keys(voidTools) as ToolName[]
-
-const toolNamesSet = new Set<string>(toolNames)
-export const isAToolName = (toolName: string): toolName is ToolName => {
-	const isAToolName = toolNamesSet.has(toolName)
-	return isAToolName
-}
 
 
 const toolNamesWithApproval = ['create_file_or_folder', 'delete_file_or_folder', 'edit_file', 'run_terminal_command'] as const satisfies readonly ToolName[]
@@ -47,7 +26,7 @@ export type ToolCallParams = {
 	'read_file': { uri: URI, startLine: number | null, endLine: number | null, pageNumber: number },
 	'ls_dir': { rootURI: URI, pageNumber: number },
 	'get_dir_structure': { rootURI: URI },
-	'search_pathnames_only': { queryStr: string, include: string | null, pageNumber: number },
+	'search_pathnames_only': { queryStr: string, searchInFolder: string | null, pageNumber: number },
 	'search_files': { queryStr: string, isRegex: boolean, searchInFolder: URI | null, pageNumber: number },
 	// ---
 	'edit_file': { uri: URI, changeDescription: string },

src/vs/workbench/contrib/void/common/voidModelService.ts

@@ -4,6 +4,7 @@ import { ITextModel } from '../../../../editor/common/model.js';
 import { IResolvedTextEditorModel, ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
 
 type VoidModelType = {
 	model: ITextModel | null;
@@ -16,6 +17,8 @@ export interface IVoidModelService {
 	getModel(uri: URI): VoidModelType;
 	getModelFromFsPath(fsPath: string): VoidModelType;
 	getModelSafe(uri: URI): Promise<VoidModelType>;
+	saveModel(uri: URI): Promise<void>;
+
 }
 
 export const IVoidModelService = createDecorator<IVoidModelService>('voidVoidModelService');
@@ -27,10 +30,17 @@ class VoidModelService extends Disposable implements IVoidModelService {
 
 	constructor(
 		@ITextModelService private readonly _textModelService: ITextModelService,
+		@ITextFileService private readonly _textFileService: ITextFileService,
 	) {
 		super();
 	}
 
+	saveModel = async (uri: URI) => {
+		await this._textFileService.save(uri, { // we want [our change] -> [save] so it's all treated as one change.
+			skipSaveParticipants: true // avoid triggering extensions etc (if they reformat the page, it will add another item to the undo stack)
+		})
+	}
+
 	initializeModel = async (uri: URI) => {
 		if (uri.fsPath in this._modelRefOfURI) return;
 		const editorModelRef = await this._textModelService.createModelReference(uri);

src/vs/workbench/contrib/void/common/voidUpdateService.ts

@@ -12,7 +12,7 @@ import { IMainProcessService } from '../../../../platform/ipc/common/mainProcess
 
 export interface IVoidUpdateService {
 	readonly _serviceBrand: undefined;
-	check: () => Promise<{ hasUpdate: true, message: string } | { hasUpdate: false } | null>;
+	check: (explicit: boolean) => Promise<{ hasUpdate: true, message: string } | { hasUpdate: false } | null>;
 }
 
 
@@ -34,8 +34,8 @@ export class VoidUpdateService implements IVoidUpdateService {
 
 
 	// anything transmitted over a channel must be async even if it looks like it doesn't have to be
-	check: IVoidUpdateService['check'] = async () => {
-		const res = await this.voidUpdateService.check()
+	check: IVoidUpdateService['check'] = async (explicit) => {
+		const res = await this.voidUpdateService.check(explicit)
 		return res
 	}
 }

src/vs/workbench/contrib/void/electron-main/llmMessage/extractGrammar.ts

@@ -0,0 +1,340 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+import { endsWithAnyPrefixOf } from '../../common/helpers/extractCodeFromResult.js'
+import { availableTools, InternalToolInfo, ToolName, ToolParamName } from '../../common/prompt/prompts.js'
+import { OnFinalMessage, OnText, RawToolCallObj } from '../../common/sendLLMMessageTypes.js'
+import { ChatMode } from '../../common/voidSettingsTypes.js'
+import { createSaxParser } from './sax.js'
+
+
+// =============== reasoning ===============
+
+// could simplify this - this assumes we can never add a tag without committing it to the user's screen, but that's not true
+export const extractReasoningWrapper = (
+	onText: OnText, onFinalMessage: OnFinalMessage, thinkTags: [string, string]
+): { newOnText: OnText, newOnFinalMessage: OnFinalMessage } => {
+	let latestAddIdx = 0 // exclusive index in fullText_
+	let foundTag1 = false
+	let foundTag2 = false
+
+	let fullTextSoFar = ''
+	let fullReasoningSoFar = ''
+
+	let onText_ = onText
+	onText = (params) => {
+		onText_(params)
+	}
+
+	const newOnText: OnText = ({ fullText: fullText_, ...p }) => {
+
+		// until found the first think tag, keep adding to fullText
+		if (!foundTag1) {
+			const endsWithTag1 = endsWithAnyPrefixOf(fullText_, thinkTags[0])
+			if (endsWithTag1) {
+				// console.log('endswith1', { fullTextSoFar, fullReasoningSoFar, fullText_ })
+				// wait until we get the full tag or know more
+				return
+			}
+			// if found the first tag
+			const tag1Index = fullText_.indexOf(thinkTags[0])
+			if (tag1Index !== -1) {
+				// console.log('tag1Index !==1', { tag1Index, fullTextSoFar, fullReasoningSoFar, thinkTags, fullText_ })
+				foundTag1 = true
+				// Add text before the tag to fullTextSoFar
+				fullTextSoFar += fullText_.substring(0, tag1Index)
+				// Update latestAddIdx to after the first tag
+				latestAddIdx = tag1Index + thinkTags[0].length
+				onText({ ...p, fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
+				return
+			}
+
+			// console.log('adding to text A', { fullTextSoFar, fullReasoningSoFar })
+			// add the text to fullText
+			fullTextSoFar = fullText_
+			latestAddIdx = fullText_.length
+			onText({ ...p, fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
+			return
+		}
+
+		// at this point, we found <tag1>
+
+		// until found the second think tag, keep adding to fullReasoning
+		if (!foundTag2) {
+			const endsWithTag2 = endsWithAnyPrefixOf(fullText_, thinkTags[1])
+			if (endsWithTag2) {
+				// console.log('endsWith2', { fullTextSoFar, fullReasoningSoFar })
+				// wait until we get the full tag or know more
+				return
+			}
+
+			// if found the second tag
+			const tag2Index = fullText_.indexOf(thinkTags[1], latestAddIdx)
+			if (tag2Index !== -1) {
+				// console.log('tag2Index !== -1', { fullTextSoFar, fullReasoningSoFar })
+				foundTag2 = true
+				// Add everything between first and second tag to reasoning
+				fullReasoningSoFar += fullText_.substring(latestAddIdx, tag2Index)
+				// Update latestAddIdx to after the second tag
+				latestAddIdx = tag2Index + thinkTags[1].length
+				onText({ ...p, fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
+				return
+			}
+
+			// add the text to fullReasoning (content after first tag but before second tag)
+			// console.log('adding to text B', { fullTextSoFar, fullReasoningSoFar })
+
+			// If we have more text than we've processed, add it to reasoning
+			if (fullText_.length > latestAddIdx) {
+				fullReasoningSoFar += fullText_.substring(latestAddIdx)
+				latestAddIdx = fullText_.length
+			}
+
+			onText({ ...p, fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
+			return
+		}
+
+		// at this point, we found <tag2> - content after the second tag is normal text
+		// console.log('adding to text C', { fullTextSoFar, fullReasoningSoFar })
+
+		// Add any new text after the closing tag to fullTextSoFar
+		if (fullText_.length > latestAddIdx) {
+			fullTextSoFar += fullText_.substring(latestAddIdx)
+			latestAddIdx = fullText_.length
+		}
+
+		onText({ ...p, fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
+	}
+
+
+	const getOnFinalMessageParams = () => {
+		const fullText_ = fullTextSoFar
+		const tag1Idx = fullText_.indexOf(thinkTags[0])
+		const tag2Idx = fullText_.indexOf(thinkTags[1])
+		if (tag1Idx === -1) return { fullText: fullText_, fullReasoning: '' } // never started reasoning
+		if (tag2Idx === -1) return { fullText: '', fullReasoning: fullText_ } // never stopped reasoning
+
+		const fullReasoning = fullText_.substring(tag1Idx + thinkTags[0].length, tag2Idx)
+		const fullText = fullText_.substring(0, tag1Idx) + fullText_.substring(tag2Idx + thinkTags[1].length, Infinity)
+
+		return { fullText, fullReasoning }
+	}
+
+	const newOnFinalMessage: OnFinalMessage = (params) => {
+
+		// treat like just got text before calling onFinalMessage (or else we sometimes miss the final chunk that's new to finalMessage)
+		newOnText({ ...params })
+
+		const { fullText, fullReasoning } = getOnFinalMessageParams()
+		onFinalMessage({ ...params, fullText, fullReasoning })
+	}
+
+	return { newOnText, newOnFinalMessage }
+}
+
+
+// =============== tools ===============
+
+type ToolsState = {
+	level: 'normal',
+} | {
+	level: 'tool',
+	toolName: ToolName,
+	currentToolCall: RawToolCallObj,
+} | {
+	level: 'param',
+	toolName: ToolName,
+	paramName: ToolParamName,
+	currentToolCall: RawToolCallObj,
+}
+
+export const extractToolsWrapper = (
+	onText: OnText, onFinalMessage: OnFinalMessage, chatMode: ChatMode
+): { newOnText: OnText, newOnFinalMessage: OnFinalMessage } => {
+	const tools = availableTools(chatMode)
+	if (!tools) return { newOnText: onText, newOnFinalMessage: onFinalMessage }
+
+	const toolOfToolName: { [toolName: string]: InternalToolInfo | undefined } = {}
+	for (const t of tools) { toolOfToolName[t.name] = t }
+
+	// detect <availableTools[0]></availableTools[0]>, etc
+	let fullText = '';
+	let trueFullText = ''
+	const firstToolCallRef: { current: RawToolCallObj | undefined } = { current: undefined }
+
+	let state: ToolsState = { level: 'normal' }
+
+
+	const getRawNewText = () => {
+		return trueFullText.substring(parser.startTagPosition, parser.position + 1)
+	}
+	const parser = createSaxParser()
+
+	// when see open tag <tagName>
+	parser.onopentag = (node) => {
+		const rawNewText = getRawNewText()
+		const tagName = node.name;
+		console.log('OPENING', tagName)
+		console.log('state0:', state.level, { toolName: (state as any).toolName, paramName: (state as any).paramName })
+
+		if (state.level === 'normal') {
+			if (tagName in toolOfToolName) { // valid toolName
+				state = {
+					level: 'tool',
+					toolName: tagName as ToolName,
+					currentToolCall: { name: tagName as ToolName, rawParams: {}, doneParams: [], isDone: false }
+				}
+				firstToolCallRef.current = state.currentToolCall
+			}
+			else {
+				fullText += rawNewText // count as plaintext
+				console.log('adding raw a', rawNewText)
+
+			}
+		}
+		else if (state.level === 'tool') {
+			if (tagName in (toolOfToolName[state.toolName]?.params ?? {})) { // valid param
+				state = {
+					level: 'param',
+					toolName: state.toolName,
+					paramName: tagName as ToolParamName,
+					currentToolCall: state.currentToolCall,
+				}
+			}
+			else {
+				// would normally be rawNewText, but we ignore all text inside tools
+			}
+		}
+		else if (state.level === 'param') { // cannot double nest
+			fullText += rawNewText // count as plaintext
+			console.log('adding raw b', rawNewText)
+
+		}
+
+		console.log('state1:', state.level, { toolName: (state as any).toolName, paramName: (state as any).paramName })
+
+	};
+
+	parser.onclosetag = (tagName) => {
+		const rawNewText = getRawNewText()
+		console.log('CLOSING', tagName)
+		console.log('state0:', state.level, { toolName: (state as any).toolName, paramName: (state as any).paramName })
+
+
+		if (state.level === 'normal') {
+			fullText += rawNewText
+			console.log('adding raw A', rawNewText)
+		}
+		else if (state.level === 'tool') {
+			if (tagName === state.toolName) { // closed the tool
+				state.currentToolCall.isDone = true
+				state = {
+					level: 'normal',
+				}
+			}
+			else { // add as text
+				fullText += rawNewText
+				console.log('adding raw B', rawNewText)
+			}
+		}
+		else if (state.level === 'param') {
+			if (tagName === state.paramName) { // closed the param
+				state.currentToolCall.doneParams.push(state.paramName)
+				state = {
+					level: 'tool',
+					toolName: state.toolName,
+					currentToolCall: state.currentToolCall,
+				}
+			}
+			else {
+				fullText += rawNewText
+				console.log('adding raw C', rawNewText)
+
+			}
+		}
+		console.log('state1:', state.level, { toolName: (state as any).toolName, paramName: (state as any).paramName })
+
+
+	};
+
+
+	parser.ontext = (text) => {
+		if (state.level === 'normal') {
+			fullText += text
+		}
+		// start param
+		else if (state.level === 'tool') {
+			// ignore all text in a tool, all text should go in the param tags inside it
+		}
+		else if (state.level === 'param') {
+			if (!(state.paramName in state.currentToolCall.rawParams)) state.currentToolCall.rawParams[state.paramName] = ''
+			state.currentToolCall.rawParams[state.paramName] += text
+		}
+	}
+
+
+
+	let prevFullTextLen = 0
+	const newOnText: OnText = (params) => {
+		const newText = params.fullText.substring(prevFullTextLen)
+		prevFullTextLen = params.fullText.length
+		trueFullText = params.fullText
+
+		parser.write(newText)
+
+		// firstToolCallRef.current === state.currentToolCall is always true
+		onText({
+			...params,
+			fullText,
+			toolCall: firstToolCallRef.current,
+		});
+	};
+
+
+	const newOnFinalMessage: OnFinalMessage = (params) => {
+		// treat like just got text before calling onFinalMessage (or else we sometimes miss the final chunk that's new to finalMessage)
+		newOnText({ ...params })
+
+		fullText = fullText.trimEnd()
+		const toolCall = firstToolCallRef.current
+		if (toolCall) {
+			// trim off all whitespace at and before first \n and after last \n for each param
+			for (const p in toolCall.rawParams) {
+				const paramName = p as ToolParamName
+				const orig = toolCall.rawParams[paramName]
+				if (orig === undefined) continue
+				toolCall.rawParams[paramName] = trimBeforeAndAfterNewLines(orig)
+			}
+		}
+
+		// console.log('final message!!!', trueFullText)
+		// console.log('----- returning ----\n', fullText)
+		// console.log('----- tools ----\n', JSON.stringify(firstToolCallRef.current, null, 2))
+		// console.log('----- toolCall ----\n', JSON.stringify(toolCall, null, 2))
+
+		onFinalMessage({ ...params, fullText, toolCall: toolCall })
+	}
+	return { newOnText, newOnFinalMessage };
+}
+
+
+
+// trim all whitespace up until the first newline, and all whitespace after the last newline
+const trimBeforeAndAfterNewLines = (s: string) => {
+	if (!s) return s;
+
+	const firstNewLineIndex = s.indexOf('\n');
+
+	if (firstNewLineIndex !== -1 && s.substring(0, firstNewLineIndex).trim() === '') {
+		s = s.substring(firstNewLineIndex + 1, Infinity)
+	}
+
+	const lastNewLineIndex = s.lastIndexOf('\n');
+	if (lastNewLineIndex !== -1 && s.substring(lastNewLineIndex + 1, Infinity).trim() === '') {
+		s = s.substring(0, lastNewLineIndex)
+	}
+
+	return s
+}

src/vs/workbench/contrib/void/electron-main/llmMessage/preprocessLLMMessages.ts

@@ -23,17 +23,10 @@ type InternalLLMChatMessage = {
 } | {
 	role: 'assistant',
 	content: string | (AnthropicReasoning | { type: 'text'; text: string })[];
-} | {
-	role: 'tool';
-	content: string; // result
-	name: string;
-	params: string;
-	id: string;
 }
 
 
 const EMPTY_MESSAGE = '(empty message)'
-const EMPTY_TOOL_CONTENT = '(empty content)'
 
 const prepareMessages_normalize = ({ messages: messages_ }: { messages: LLMChatMessage[] }): { messages: LLMChatMessage[] } => {
 	const messages = deepClone(messages_)
@@ -145,7 +138,7 @@ const prepareMessages_fitIntoContext = ({ messages, contextWindow, maxOutputToke
 
 
 // no matter whether the model supports a system message or not (or what format it supports), add it in some way
-const prepareMessages_systemMessage = ({
+const prepareMessages_addSystemInstructions = ({
 	messages,
 	aiInstructions,
 	supportsSystemMessage,
@@ -206,190 +199,190 @@ const prepareMessages_systemMessage = ({
 
 
 
-// convert messages as if about to send to openai
-/*
-reference - https://platform.openai.com/docs/guides/function-calling#function-calling-steps
-openai MESSAGE (role=assistant):
-"tool_calls":[{
-	"type": "function",
-	"id": "call_12345xyz",
-	"function": {
-	"name": "get_weather",
-	"arguments": "{\"latitude\":48.8566,\"longitude\":2.3522}"
-}]
+// // convert messages as if about to send to openai
+// /*
+// reference - https://platform.openai.com/docs/guides/function-calling#function-calling-steps
+// openai MESSAGE (role=assistant):
+// "tool_calls":[{
+// 	"type": "function",
+// 	"id": "call_12345xyz",
+// 	"function": {
+// 	"name": "get_weather",
+// 	"arguments": "{\"latitude\":48.8566,\"longitude\":2.3522}"
+// }]
 
-openai RESPONSE (role=user):
-{   "role": "tool",
-	"tool_call_id": tool_call.id,
-	"content": str(result)    }
+// openai RESPONSE (role=user):
+// {   "role": "tool",
+// 	"tool_call_id": tool_call.id,
+// 	"content": str(result)    }
 
-also see
-openai on prompting - https://platform.openai.com/docs/guides/reasoning#advice-on-prompting
-openai on developer system message - https://cdn.openai.com/spec/model-spec-2024-05-08.html#follow-the-chain-of-command
-*/
+// also see
+// openai on prompting - https://platform.openai.com/docs/guides/reasoning#advice-on-prompting
+// openai on developer system message - https://cdn.openai.com/spec/model-spec-2024-05-08.html#follow-the-chain-of-command
+// */
 
-type PrepareMessagesToolsOpenAI = (
-	Exclude<InternalLLMChatMessage, { role: 'assistant' | 'tool' }> | {
-		role: 'assistant',
-		content: string | (AnthropicReasoning | { type: 'text'; text: string })[];
-		tool_calls?: {
-			type: 'function';
-			id: string;
-			function: {
-				name: string;
-				arguments: string;
-			}
-		}[]
-	} | {
-		role: 'tool',
-		tool_call_id: string;
-		content: string;
-	}
-)[]
-const prepareMessages_tools_openai = ({ messages }: { messages: InternalLLMChatMessage[], }) => {
+// type PrepareMessagesToolsOpenAI = (
+// 	Exclude<InternalLLMChatMessage, { role: 'assistant' | 'tool' }> | {
+// 		role: 'assistant',
+// 		content: string | (AnthropicReasoning | { type: 'text'; text: string })[];
+// 		tool_calls?: {
+// 			type: 'function';
+// 			id: string;
+// 			function: {
+// 				name: string;
+// 				arguments: string;
+// 			}
+// 		}[]
+// 	} | {
+// 		role: 'tool',
+// 		tool_call_id: string;
+// 		content: string;
+// 	}
+// )[]
+// const prepareMessages_tools_openai = ({ messages }: { messages: InternalLLMChatMessage[], }) => {
 
-	const newMessages: PrepareMessagesToolsOpenAI = [];
+// 	const newMessages: PrepareMessagesToolsOpenAI = [];
 
-	for (let i = 0; i < messages.length; i += 1) {
-		const currMsg = messages[i]
+// 	for (let i = 0; i < messages.length; i += 1) {
+// 		const currMsg = messages[i]
 
-		if (currMsg.role !== 'tool') {
-			newMessages.push(currMsg)
-			continue
-		}
+// 		if (currMsg.role !== 'tool') {
+// 			newMessages.push(currMsg)
+// 			continue
+// 		}
 
-		// edit previous assistant message to have called the tool
-		const prevMsg = 0 <= i - 1 && i - 1 <= newMessages.length ? newMessages[i - 1] : undefined
-		if (prevMsg?.role === 'assistant') {
-			prevMsg.tool_calls = [{
-				type: 'function',
-				id: currMsg.id,
-				function: {
-					name: currMsg.name,
-					arguments: JSON.stringify(currMsg.params)
-				}
-			}]
-		}
+// 		// edit previous assistant message to have called the tool
+// 		const prevMsg = 0 <= i - 1 && i - 1 <= newMessages.length ? newMessages[i - 1] : undefined
+// 		if (prevMsg?.role === 'assistant') {
+// 			prevMsg.tool_calls = [{
+// 				type: 'function',
+// 				id: currMsg.id,
+// 				function: {
+// 					name: currMsg.name,
+// 					arguments: JSON.stringify(currMsg.params)
+// 				}
+// 			}]
+// 		}
 
-		// add the tool
-		newMessages.push({
-			role: 'tool',
-			tool_call_id: currMsg.id,
-			content: currMsg.content || EMPTY_TOOL_CONTENT,
-		})
-	}
-	return { messages: newMessages }
+// 		// add the tool
+// 		newMessages.push({
+// 			role: 'tool',
+// 			tool_call_id: currMsg.id,
+// 			content: currMsg.content || EMPTY_TOOL_CONTENT,
+// 		})
+// 	}
+// 	return { messages: newMessages }
 
-}
+// }
 
 
-// convert messages as if about to send to anthropic
-/*
-https://docs.anthropic.com/en/docs/build-with-claude/tool-use#tool-use-examples
-anthropic MESSAGE (role=assistant):
-"content": [{
-	"type": "text",
-	"text": "<thinking>I need to call the get_weather function, and the user wants SF, which is likely San Francisco, CA.</thinking>"
-}, {
-	"type": "tool_use",
-	"id": "toolu_01A09q90qw90lq917835lq9",
-	"name": "get_weather",
-	"input": { "location": "San Francisco, CA", "unit": "celsius" }
-}]
-anthropic RESPONSE (role=user):
-"content": [{
-	"type": "tool_result",
-	"tool_use_id": "toolu_01A09q90qw90lq917835lq9",
-	"content": "15 degrees"
-}]
-*/
+// // convert messages as if about to send to anthropic
+// /*
+// https://docs.anthropic.com/en/docs/build-with-claude/tool-use#tool-use-examples
+// anthropic MESSAGE (role=assistant):
+// "content": [{
+// 	"type": "text",
+// 	"text": "<thinking>I need to call the get_weather function, and the user wants SF, which is likely San Francisco, CA.</thinking>"
+// }, {
+// 	"type": "tool_use",
+// 	"id": "toolu_01A09q90qw90lq917835lq9",
+// 	"name": "get_weather",
+// 	"input": { "location": "San Francisco, CA", "unit": "celsius" }
+// }]
+// anthropic RESPONSE (role=user):
+// "content": [{
+// 	"type": "tool_result",
+// 	"tool_use_id": "toolu_01A09q90qw90lq917835lq9",
+// 	"content": "15 degrees"
+// }]
+// */
 
-type PrepareMessagesToolsAnthropic = (
-	Exclude<InternalLLMChatMessage, { role: 'assistant' | 'user' }> | {
-		role: 'assistant',
-		content: string | (
-			| AnthropicReasoning
-			| {
-				type: 'text';
-				text: string;
-			}
-			| {
-				type: 'tool_use';
-				name: string;
-				input: Record<string, any>;
-				id: string;
-			})[]
-	} | {
-		role: 'user',
-		content: string | ({
-			type: 'text';
-			text: string;
-		} | {
-			type: 'tool_result';
-			tool_use_id: string;
-			content: string;
-		})[]
-	}
-)[]
-/*
-Converts:
+// type PrepareMessagesToolsAnthropic = (
+// 	Exclude<InternalLLMChatMessage, { role: 'assistant' | 'user' }> | {
+// 		role: 'assistant',
+// 		content: string | (
+// 			| AnthropicReasoning
+// 			| {
+// 				type: 'text';
+// 				text: string;
+// 			}
+// 			| {
+// 				type: 'tool_use';
+// 				name: string;
+// 				input: Record<string, any>;
+// 				id: string;
+// 			})[]
+// 	} | {
+// 		role: 'user',
+// 		content: string | ({
+// 			type: 'text';
+// 			text: string;
+// 		} | {
+// 			type: 'tool_result';
+// 			tool_use_id: string;
+// 			content: string;
+// 		})[]
+// 	}
+// )[]
+// /*
+// Converts:
 
-assistant: ...content
-tool: (id, name, params)
-->
-assistant: ...content, call(name, id, params)
-user: ...content, result(id, content)
-*/
-const prepareMessages_tools_anthropic = ({ messages }: { messages: InternalLLMChatMessage[], }) => {
-	const newMessages: PrepareMessagesToolsAnthropic = messages;
+// assistant: ...content
+// tool: (id, name, params)
+// ->
+// assistant: ...content, call(name, id, params)
+// user: ...content, result(id, content)
+// */
+// const prepareMessages_tools_anthropic = ({ messages }: { messages: InternalLLMChatMessage[], }) => {
+// 	const newMessages: PrepareMessagesToolsAnthropic = messages;
 
 
-	for (let i = 0; i < newMessages.length; i += 1) {
-		const currMsg = newMessages[i]
+// 	for (let i = 0; i < newMessages.length; i += 1) {
+// 		const currMsg = newMessages[i]
 
-		if (currMsg.role !== 'tool') continue
+// 		if (currMsg.role !== 'tool') continue
 
-		const prevMsg = 0 <= i - 1 && i - 1 <= newMessages.length ? newMessages[i - 1] : undefined
+// 		const prevMsg = 0 <= i - 1 && i - 1 <= newMessages.length ? newMessages[i - 1] : undefined
 
-		if (prevMsg?.role === 'assistant') {
-			if (typeof prevMsg.content === 'string') prevMsg.content = [{ type: 'text', text: prevMsg.content }]
-			prevMsg.content.push({ type: 'tool_use', id: currMsg.id, name: currMsg.name, input: parseObject(currMsg.params) })
-		}
+// 		if (prevMsg?.role === 'assistant') {
+// 			if (typeof prevMsg.content === 'string') prevMsg.content = [{ type: 'text', text: prevMsg.content }]
+// 			prevMsg.content.push({ type: 'tool_use', id: currMsg.id, name: currMsg.name, input: parseObject(currMsg.params) })
+// 		}
 
-		// turn each tool into a user message with tool results at the end
-		newMessages[i] = {
-			role: 'user',
-			content: [
-				...[{ type: 'tool_result', tool_use_id: currMsg.id, content: currMsg.content || EMPTY_TOOL_CONTENT }] as const,
-			]
-		}
-	}
-	return { messages: newMessages }
-}
+// 		// turn each tool into a user message with tool results at the end
+// 		newMessages[i] = {
+// 			role: 'user',
+// 			content: [
+// 				...[{ type: 'tool_result', tool_use_id: currMsg.id, content: currMsg.content || EMPTY_TOOL_CONTENT }] as const,
+// 			]
+// 		}
+// 	}
+// 	return { messages: newMessages }
+// }
 
 
 
 
-type PrepareMessagesTools = PrepareMessagesToolsAnthropic | PrepareMessagesToolsOpenAI
+// type PrepareMessagesTools = PrepareMessagesToolsAnthropic | PrepareMessagesToolsOpenAI
 
-const prepareMessages_tools = ({ messages, supportsTools }: { messages: InternalLLMChatMessage[], supportsTools: false | 'TODO-yes-but-we-handle-it-manually' | 'anthropic-style' | 'openai-style' }): { messages: PrepareMessagesTools } => {
-	if (!supportsTools) {
-		return { messages: messages }
-	}
-	else if (supportsTools === 'anthropic-style') {
-		return prepareMessages_tools_anthropic({ messages })
-	}
-	else if (supportsTools === 'openai-style') {
-		return prepareMessages_tools_openai({ messages })
-	}
-	else {
-		throw new Error(`supportsTools type not recognized`)
-	}
-}
+// const prepareMessages_tools = ({ messages, supportsTools }: { messages: InternalLLMChatMessage[], supportsTools: false | 'TODO-yes-but-we-handle-it-manually' | 'anthropic-style' | 'openai-style' }): { messages: PrepareMessagesTools } => {
+// 	if (!supportsTools) {
+// 		return { messages: messages }
+// 	}
+// 	else if (supportsTools === 'anthropic-style') {
+// 		return prepareMessages_tools_anthropic({ messages })
+// 	}
+// 	else if (supportsTools === 'openai-style') {
+// 		return prepareMessages_tools_openai({ messages })
+// 	}
+// 	else {
+// 		throw new Error(`supportsTools type not recognized`)
+// 	}
+// }
 
 
 // remove rawAnthropicAssistantContent, and make content equal to it if supportsAnthropicContent
-const prepareMessages_anthropicContent = ({ messages, supportsAnthropicReasoningSignature }: { messages: LLMChatMessage[], supportsAnthropicReasoningSignature: boolean }) => {
+const prepareMessages_anthropicReasoning = ({ messages, supportsAnthropicReasoningSignature }: { messages: LLMChatMessage[], supportsAnthropicReasoningSignature: boolean }) => {
 	const newMessages: InternalLLMChatMessage[] = []
 	for (const m of messages) {
 		if (m.role !== 'assistant') {
@@ -414,38 +407,18 @@ const prepareMessages_anthropicContent = ({ messages, supportsAnthropicReasoning
 
 
 // do this at end
-const prepareMessages_noEmptyMessage = ({ messages }: { messages: PrepareMessagesTools }): { messages: PrepareMessagesTools } => {
+const prepareMessages_noEmptyMessage = ({ messages }: { messages: InternalLLMChatMessage[] }): { messages: InternalLLMChatMessage[] } => {
 	for (const currMsg of messages) {
-
-		// don't do this for tools
-		if (currMsg.role === 'tool') continue
-
-		// don't do this for assistant or user messages that have tool_calls or tool_results
-		const oai = currMsg as PrepareMessagesToolsOpenAI[0]
-		if (oai.role === 'assistant') {
-			if (oai.tool_calls) continue
-		}
-		const anth = currMsg as PrepareMessagesToolsAnthropic[0]
-		if (anth.role === 'assistant' || anth.role === 'user') {
-			if (typeof anth.content !== 'string') {
-				const hasContent = anth.content.find(c => c.type === 'tool_use' || c.type === 'tool_result')
-				if (hasContent) continue
-			}
-		}
-
-
-		if (typeof currMsg.content === 'string') {
+		// if content is a string, replace string with empty msg
+		if (typeof currMsg.content === 'string')
 			currMsg.content = currMsg.content || EMPTY_MESSAGE
-		}
 		else {
+			// if content is an array, replace any empty text entries with empty msg, and make sure there's at least 1 entry
 			for (const c of currMsg.content) {
 				if (c.type === 'text') c.text = c.text || EMPTY_MESSAGE
-				else if (c.type === 'tool_use') { }
-				else if (c.type === 'tool_result') { }
 			}
 			if (currMsg.content.length === 0) currMsg.content = [{ type: 'text', text: EMPTY_MESSAGE }]
 		}
-
 	}
 	return { messages }
 }
@@ -458,7 +431,6 @@ export const prepareMessages = ({
 	messages,
 	aiInstructions,
 	supportsSystemMessage,
-	supportsTools,
 	supportsAnthropicReasoningSignature,
 	contextWindow,
 	maxOutputTokens,
@@ -466,7 +438,6 @@ export const prepareMessages = ({
 	messages: LLMChatMessage[],
 	aiInstructions: string,
 	supportsSystemMessage: false | 'system-role' | 'developer-role' | 'separated',
-	supportsTools: false | 'TODO-yes-but-we-handle-it-manually' | 'anthropic-style' | 'openai-style',
 	supportsAnthropicReasoningSignature: boolean,
 	contextWindow: number,
 	maxOutputTokens: number | null | undefined,
@@ -475,13 +446,12 @@ export const prepareMessages = ({
 
 	const { messages: messages0 } = prepareMessages_normalize({ messages })
 	const { messages: messages1 } = prepareMessages_fitIntoContext({ messages: messages0, contextWindow, maxOutputTokens })
-	const { messages: messages2 } = prepareMessages_anthropicContent({ messages: messages1, supportsAnthropicReasoningSignature })
-	const { messages: messages3, separateSystemMessageStr } = prepareMessages_systemMessage({ messages: messages2, aiInstructions, supportsSystemMessage })
-	const { messages: messages4 } = prepareMessages_tools({ messages: messages3, supportsTools })
-	const { messages: messages5 } = prepareMessages_noEmptyMessage({ messages: messages4 })
+	const { messages: messages2 } = prepareMessages_anthropicReasoning({ messages: messages1, supportsAnthropicReasoningSignature })
+	const { messages: messages3, separateSystemMessageStr } = prepareMessages_addSystemInstructions({ messages: messages2, aiInstructions, supportsSystemMessage })
+	const { messages: messages4 } = prepareMessages_noEmptyMessage({ messages: messages3 })
 
 	return {
-		messages: messages5 as any,
+		messages: messages4 as any,
 		separateSystemMessageStr
 	} as const
 }

src/vs/workbench/contrib/void/electron-main/llmMessage/sax.ts

@@ -0,0 +1,150 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+// Define options for the parser.
+export interface SaxParserOptions {
+	lowercase?: boolean;
+}
+
+// Define the structure for a parsed node.
+export interface SaxNode {
+	name: string;
+	attributes: { [key: string]: string };
+}
+
+// Define the interface for the SAX-like parser.
+export interface SaxParser {
+	// Event handlers that can be set by the consumer.
+	onopentag: ((node: SaxNode) => void) | null;
+	ontext: ((text: string) => void) | null;
+	onclosetag: ((tagName: string) => void) | null;
+	// Properties to track current positions (used for raw text extraction).
+	startTagPosition: number;
+	position: number;
+	// Processes a new chunk of text.
+	write(chunk: string): void;
+}
+
+/**
+ * Creates a minimal, event-driven SAX-like parser.
+ *
+ * @param options An object of type `SaxParserOptions`. Passing `{ lowercase: true }` will force all tag names to be lower-cased.
+ * @returns A parser object implementing the `SaxParser` interface.
+ */
+export function createSaxParser(options: SaxParserOptions = {}): SaxParser {
+	// Buffer to hold any leftover text (part of an incomplete tag).
+	let buffer: string = '';
+	// Global counter to track the total processed characters.
+	let globalPos: number = 0;
+
+	const parser: SaxParser = {
+		onopentag: null,
+		ontext: null,
+		onclosetag: null,
+		startTagPosition: 0,
+		position: 0,
+
+		write(chunk: string): void {
+			// Set the starting position before processing the new chunk.
+			this.startTagPosition = globalPos;
+			buffer += chunk;
+			globalPos += chunk.length;
+			// Set the current position to the end of the processed chunk.
+			this.position = globalPos - 1;
+
+			let cursor = 0;
+			// Flag to indicate if an incomplete tag was found.
+			let incompleteTagFound = false;
+			// This will mark the position in the buffer where the incomplete tag starts.
+			let incompleteStart = 0;
+
+			while (cursor < buffer.length) {
+				// Look for the next opening '<' character.
+				const ltIndex = buffer.indexOf('<', cursor);
+				if (ltIndex === -1) {
+					// No more tags found in the current buffer.
+					if (cursor < buffer.length && this.ontext) {
+						this.ontext(buffer.substring(cursor));
+					}
+					// All content is processed.
+					buffer = '';
+					cursor = buffer.length;
+					break;
+				}
+
+				// Emit any text between the current cursor and the opening tag.
+				if (ltIndex > cursor && this.ontext) {
+					this.ontext(buffer.substring(cursor, ltIndex));
+				}
+
+				// Look for the closing '>' character starting from the found '<'.
+				const gtIndex = buffer.indexOf('>', ltIndex);
+				if (gtIndex === -1) {
+					// Incomplete tag detected.
+					incompleteTagFound = true;
+					// Save the starting point of the incomplete tag.
+					incompleteStart = ltIndex;
+					break;
+				}
+
+				// Extract the tag content (excluding the '<' and '>').
+				let tagContent = buffer.substring(ltIndex + 1, gtIndex).trim();
+				if (!tagContent) {
+					cursor = gtIndex + 1;
+					continue;
+				}
+
+				// Check if this is a closing tag (starts with '/').
+				if (tagContent[0] === '/') {
+					let tagName = tagContent.substring(1).trim();
+					if (options.lowercase && tagName) {
+						tagName = tagName.toLowerCase();
+					}
+					if (this.onclosetag) {
+						this.onclosetag(tagName);
+					}
+				} else {
+					// Handle self-closing tags (ending with '/').
+					let selfClosing = false;
+					if (tagContent[tagContent.length - 1] === '/') {
+						selfClosing = true;
+						tagContent = tagContent.slice(0, -1).trim();
+					}
+					// Determine the tag name (first word before any whitespace).
+					const spaceIndex = tagContent.indexOf(' ');
+					let tagName =
+						spaceIndex !== -1
+							? tagContent.substring(0, spaceIndex).trim()
+							: tagContent;
+					if (options.lowercase && tagName) {
+						tagName = tagName.toLowerCase();
+					}
+					// Emit an open tag event.
+					if (this.onopentag) {
+						const node: SaxNode = { name: tagName, attributes: {} };
+						this.onopentag(node);
+					}
+					// If it’s a self-closing tag, immediately emit a close tag event.
+					if (selfClosing && this.onclosetag) {
+						this.onclosetag(tagName);
+					}
+				}
+				// Move the cursor past the current tag.
+				cursor = gtIndex + 1;
+			}
+
+			// If an incomplete tag was detected, preserve it.
+			if (incompleteTagFound) {
+				// Keep the incomplete portion starting from the '<'
+				buffer = buffer.substring(incompleteStart);
+			} else {
+				// Otherwise, remove all processed content.
+				buffer = buffer.substring(cursor);
+			}
+		},
+	};
+
+	return parser;
+}

src/vs/workbench/contrib/void/electron-main/llmMessage/sendLLMMessage.impl.ts

@@ -7,12 +7,11 @@ import Anthropic from '@anthropic-ai/sdk';
 import { Ollama } from 'ollama';
 import OpenAI, { ClientOptions } from 'openai';
 
-import { extractReasoningOnFinalMessage, extractReasoningOnTextWrapper } from '../../common/helpers/extractCodeFromResult.js';
 import { LLMChatMessage, LLMFIMMessage, ModelListParams, OllamaModelResponse, OnError, OnFinalMessage, OnText } from '../../common/sendLLMMessageTypes.js';
-import { displayInfoOfProviderName, ModelSelectionOptions, ProviderName, SettingsOfProvider } from '../../common/voidSettingsTypes.js';
+import { ChatMode, displayInfoOfProviderName, ModelSelectionOptions, ProviderName, SettingsOfProvider } from '../../common/voidSettingsTypes.js';
 import { prepareFIMMessage, prepareMessages } from './preprocessLLMMessages.js';
 import { getSendableReasoningInfo, getModelCapabilities, getProviderCapabilities, defaultProviderSettings } from '../../common/modelCapabilities.js';
-import { InternalToolInfo, ToolName, isAToolName } from '../../common/toolsServiceTypes.js';
+import { extractReasoningWrapper, extractToolsWrapper } from './extractGrammar.js';
 
 
 type InternalCommonMessageParams = {
@@ -27,7 +26,7 @@ type InternalCommonMessageParams = {
 	_setAborter: (aborter: () => void) => void;
 }
 
-type SendChatParams_Internal = InternalCommonMessageParams & { messages: LLMChatMessage[]; tools?: InternalToolInfo[] }
+type SendChatParams_Internal = InternalCommonMessageParams & { messages: LLMChatMessage[]; chatMode: ChatMode | null; }
 type SendFIMParams_Internal = InternalCommonMessageParams & { messages: LLMFIMMessage; }
 export type ListParams_Internal<ModelResponse> = ModelListParams<ModelResponse>
 
@@ -35,34 +34,6 @@ export type ListParams_Internal<ModelResponse> = ModelListParams<ModelResponse>
 const invalidApiKeyMessage = (providerName: ProviderName) => `Invalid ${displayInfoOfProviderName(providerName).title} API key.`
 
 // ------------ OPENAI-COMPATIBLE (HELPERS) ------------
-const toOpenAICompatibleTool = (toolInfo: InternalToolInfo) => {
-	const { name, description, params } = toolInfo
-	return {
-		type: 'function',
-		function: {
-			name: name,
-			strict: true, // strict mode - https://platform.openai.com/docs/guides/function-calling?api-mode=chat
-			description: description,
-			parameters: {
-				type: 'object',
-				properties: params,
-				required: Object.keys(params), // in strict mode, all params are required and additionalProperties is false
-				additionalProperties: false,
-			},
-		}
-	} satisfies OpenAI.Chat.Completions.ChatCompletionTool
-}
-
-type ToolCallOfIndex = { [index: string]: { name: string, paramsStr: string, id: string } } // type used to stream tool calls as they come in
-type ToolCallsFrom_ReturnType = { name: ToolName, id: string, paramsStr: string }[] // return type of toolCallsFrom_<PROVIDER>
-
-const toolCallsFrom_OpenAICompat = (toolCallOfIndex: ToolCallOfIndex): ToolCallsFrom_ReturnType => {
-	return Object.keys(toolCallOfIndex).map(index => {
-		const tool = toolCallOfIndex[index]
-		return isAToolName(tool.name) ? { name: tool.name, id: tool.id, paramsStr: tool.paramsStr } : null
-	}).filter(t => !!t)
-}
-
 
 const newOpenAICompatibleSDK = ({ settingsOfProvider, providerName, includeInPayload }: { settingsOfProvider: SettingsOfProvider, providerName: ProviderName, includeInPayload?: { [s: string]: any } }) => {
 	const commonPayloadOpts: ClientOptions = {
@@ -152,11 +123,10 @@ const _sendOpenAICompatibleFIM = ({ messages: messages_, onFinalMessage, onError
 
 
 
-const _sendOpenAICompatibleChat = ({ messages: messages_, onText, onFinalMessage, onError, settingsOfProvider, modelSelectionOptions, modelName: modelName_, _setAborter, providerName, aiInstructions, tools: tools_ }: SendChatParams_Internal) => {
+const _sendOpenAICompatibleChat = ({ messages: messages_, onText, onFinalMessage, onError, settingsOfProvider, modelSelectionOptions, modelName: modelName_, _setAborter, providerName, aiInstructions, chatMode }: SendChatParams_Internal) => {
 	const {
 		modelName,
 		supportsSystemMessage,
-		supportsTools,
 		contextWindow,
 		maxOutputTokens,
 		reasoningCapabilities,
@@ -169,55 +139,44 @@ const _sendOpenAICompatibleChat = ({ messages: messages_, onText, onFinalMessage
 	const reasoningInfo = getSendableReasoningInfo('Chat', providerName, modelName_, modelSelectionOptions) // user's modelName_ here
 	const includeInPayload = providerReasoningIOSettings?.input?.includeInPayload?.(reasoningInfo) || {}
 
-	// tools
-	const tools = (supportsTools && ((tools_?.length ?? 0) !== 0)) ? tools_?.map(tool => toOpenAICompatibleTool(tool)) : undefined
-	const toolsObj = tools ? { tools: tools, tool_choice: 'auto', parallel_tool_calls: false, } as const : {}
-
 	// max tokens
 	const maxTokens = reasoningInfo?.isReasoningEnabled && reasoningCapabilities ? reasoningCapabilities.reasoningMaxOutputTokens : maxOutputTokens
 
 	// instance
-	const { messages } = prepareMessages({ messages: messages_, aiInstructions, supportsSystemMessage, supportsTools, supportsAnthropicReasoningSignature: false, contextWindow, maxOutputTokens: maxTokens })
+	const { messages } = prepareMessages({ messages: messages_, aiInstructions, supportsSystemMessage, supportsAnthropicReasoningSignature: false, contextWindow, maxOutputTokens: maxTokens })
 	const openai: OpenAI = newOpenAICompatibleSDK({ providerName, settingsOfProvider, includeInPayload })
 	const options: OpenAI.Chat.Completions.ChatCompletionCreateParamsStreaming = {
 		model: modelName,
 		messages: messages,
 		stream: true,
 		// max_completion_tokens: maxTokens,
-		...toolsObj,
 	}
 
 	// open source models - manually parse think tokens
 	const { needsManualParse: needsManualReasoningParse, nameOfFieldInDelta: nameOfReasoningFieldInDelta } = providerReasoningIOSettings?.output ?? {}
 	const manuallyParseReasoning = needsManualReasoningParse && canIOReasoning && openSourceThinkTags
 	if (manuallyParseReasoning) {
-		onText = extractReasoningOnTextWrapper(onText, openSourceThinkTags)
+		const { newOnText, newOnFinalMessage } = extractReasoningWrapper(onText, onFinalMessage, openSourceThinkTags)
+		onText = newOnText
+		onFinalMessage = newOnFinalMessage
+	}
+
+	// manually parse out tool results
+	if (chatMode) {
+		const { newOnText, newOnFinalMessage } = extractToolsWrapper(onText, onFinalMessage, chatMode)
+		onText = newOnText
+		onFinalMessage = newOnFinalMessage
 	}
 
 	let fullReasoningSoFar = ''
 	let fullTextSoFar = ''
 
-	let fullToolName = ''
-	let fullToolParams = ''
-
-	const toolCallOfIndex: ToolCallOfIndex = {}
 	openai.chat.completions
 		.create(options)
 		.then(async response => {
 			_setAborter(() => response.controller.abort())
 			// when receive text
 			for await (const chunk of response) {
-				// tool call
-				for (const tool of chunk.choices[0]?.delta?.tool_calls ?? []) {
-					const index = tool.index
-					if (!toolCallOfIndex[index]) toolCallOfIndex[index] = { name: '', paramsStr: '', id: '' }
-					toolCallOfIndex[index].name += tool.function?.name ?? ''
-					toolCallOfIndex[index].paramsStr += tool.function?.arguments ?? '';
-					toolCallOfIndex[index].id += tool.id ?? ''
-
-					fullToolName += tool.function?.name ?? ''
-					fullToolParams += tool.function?.arguments ?? ''
-				}
 				// message
 				const newText = chunk.choices[0]?.delta?.content ?? ''
 				fullTextSoFar += newText
@@ -230,20 +189,14 @@ const _sendOpenAICompatibleChat = ({ messages: messages_, onText, onFinalMessage
 					fullReasoningSoFar += newReasoning
 				}
 
-				onText({ fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar, fullToolName, fullToolParams })
+				onText({ fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
 			}
 			// on final
-			const toolCalls = toolCallsFrom_OpenAICompat(toolCallOfIndex)
-			if (!fullTextSoFar && !fullReasoningSoFar && toolCalls.length === 0) {
+			if (!fullTextSoFar && !fullReasoningSoFar) {
 				onError({ message: 'Void: Response from model was empty.', fullError: null })
 			}
 			else {
-				if (manuallyParseReasoning) {
-					const { fullText, fullReasoning } = extractReasoningOnFinalMessage(fullTextSoFar, openSourceThinkTags)
-					onFinalMessage({ fullText, fullReasoning, toolCalls, anthropicReasoning: null });
-				} else {
-					onFinalMessage({ fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar, toolCalls, anthropicReasoning: null });
-				}
+				onFinalMessage({ fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar, anthropicReasoning: null });
 			}
 		})
 		// when error/fail - this catches errors of both .create() and .then(for await)
@@ -292,33 +245,11 @@ const _openaiCompatibleList = async ({ onSuccess: onSuccess_, onError: onError_,
 
 
 // ------------ ANTHROPIC ------------
-const toAnthropicTool = (toolInfo: InternalToolInfo) => {
-	const { name, description, params } = toolInfo
-	return {
-		name: name,
-		description: description,
-		input_schema: {
-			type: 'object',
-			properties: params,
-			required: Object.keys(params),
-		},
-	} satisfies Anthropic.Messages.Tool
-}
-
-const toolCallsFrom_Anthropic = (content: Anthropic.Messages.ContentBlock[]): ToolCallsFrom_ReturnType => {
-	return content.map(c => {
-		if (c.type !== 'tool_use') return null
-		if (!isAToolName(c.name)) return null
-		return c.type === 'tool_use' ? { name: c.name, paramsStr: JSON.stringify(c.input), id: c.id } : null
-	}).filter(t => !!t)
-}
-
-const sendAnthropicChat = ({ messages: messages_, providerName, onText, onFinalMessage, onError, settingsOfProvider, modelSelectionOptions, modelName: modelName_, _setAborter, aiInstructions, tools: tools_ }: SendChatParams_Internal) => {
+const sendAnthropicChat = ({ messages: messages_, providerName, onText, onFinalMessage, onError, settingsOfProvider, modelSelectionOptions, modelName: modelName_, _setAborter, aiInstructions, chatMode }: SendChatParams_Internal) => {
 	const {
 		modelName,
 		supportsSystemMessage,
 		contextWindow,
-		supportsTools,
 		maxOutputTokens,
 		reasoningCapabilities,
 	} = getModelCapabilities(providerName, modelName_)
@@ -330,18 +261,11 @@ const sendAnthropicChat = ({ messages: messages_, providerName, onText, onFinalM
 	const reasoningInfo = getSendableReasoningInfo('Chat', providerName, modelName_, modelSelectionOptions) // user's modelName_ here
 	const includeInPayload = providerReasoningIOSettings?.input?.includeInPayload?.(reasoningInfo) || {}
 
-	// tools
-	const tools = ((tools_?.length ?? 0) !== 0) ? tools_?.map(tool => toAnthropicTool(tool)) : undefined
-	const toolsObj: Partial<Anthropic.Messages.MessageStreamParams> = tools ? {
-		tools: tools,
-		tool_choice: { type: 'auto', disable_parallel_tool_use: true } // one tool at a time
-	} : {}
-
 	// anthropic-specific - max tokens
 	const maxTokens = reasoningInfo?.isReasoningEnabled && reasoningCapabilities ? reasoningCapabilities.reasoningMaxOutputTokens : maxOutputTokens
 
 	// instance
-	const { messages, separateSystemMessageStr } = prepareMessages({ messages: messages_, aiInstructions, supportsSystemMessage, supportsTools, supportsAnthropicReasoningSignature: true, contextWindow, maxOutputTokens: maxTokens })
+	const { messages, separateSystemMessageStr } = prepareMessages({ messages: messages_, aiInstructions, supportsSystemMessage, supportsAnthropicReasoningSignature: true, contextWindow, maxOutputTokens: maxTokens })
 	const anthropic = new Anthropic({
 		apiKey: thisConfig.apiKey,
 		dangerouslyAllowBrowser: true
@@ -352,16 +276,22 @@ const sendAnthropicChat = ({ messages: messages_, providerName, onText, onFinalM
 		messages: messages,
 		model: modelName,
 		max_tokens: maxTokens ?? 4_096, // anthropic requires this
-		...toolsObj,
 		...includeInPayload,
 	})
 
+	// manually parse out tool results
+	if (chatMode) {
+		const { newOnText, newOnFinalMessage } = extractToolsWrapper(onText, onFinalMessage, chatMode)
+		onText = newOnText
+		onFinalMessage = newOnFinalMessage
+	}
+
 	// when receive text
 	let fullText = ''
 	let fullReasoning = ''
 
-	let fullToolName = ''
-	let fullToolParams = ''
+	// let fullToolName = ''
+	// let fullToolParams = ''
 
 	// there are no events for tool_use, it comes in at the end
 	stream.on('streamEvent', e => {
@@ -370,47 +300,46 @@ const sendAnthropicChat = ({ messages: messages_, providerName, onText, onFinalM
 			if (e.content_block.type === 'text') {
 				if (fullText) fullText += '\n\n' // starting a 2nd text block
 				fullText += e.content_block.text
-				onText({ fullText, fullReasoning, fullToolName, fullToolParams })
+				onText({ fullText, fullReasoning, })
 			}
 			else if (e.content_block.type === 'thinking') {
 				if (fullReasoning) fullReasoning += '\n\n' // starting a 2nd reasoning block
 				fullReasoning += e.content_block.thinking
-				onText({ fullText, fullReasoning, fullToolName, fullToolParams })
+				onText({ fullText, fullReasoning, })
 			}
 			else if (e.content_block.type === 'redacted_thinking') {
 				console.log('delta', e.content_block.type)
 				if (fullReasoning) fullReasoning += '\n\n' // starting a 2nd reasoning block
 				fullReasoning += '[redacted_thinking]'
-				onText({ fullText, fullReasoning, fullToolName, fullToolParams })
-			}
-			else if (e.content_block.type === 'tool_use') {
-				fullToolName += e.content_block.name ?? '' // anthropic gives us the tool name in the start block
-				onText({ fullText, fullReasoning, fullToolName, fullToolParams })
+				onText({ fullText, fullReasoning, })
 			}
+			// else if (e.content_block.type === 'tool_use') {
+			// 	fullToolName += e.content_block.name ?? '' // anthropic gives us the tool name in the start block
+			// 	onText({ fullText, fullReasoning, })
+			// }
 		}
 
 		// delta
 		else if (e.type === 'content_block_delta') {
 			if (e.delta.type === 'text_delta') {
 				fullText += e.delta.text
-				onText({ fullText, fullReasoning, fullToolName, fullToolParams })
+				onText({ fullText, fullReasoning, })
 			}
 			else if (e.delta.type === 'thinking_delta') {
 				fullReasoning += e.delta.thinking
-				onText({ fullText, fullReasoning, fullToolName, fullToolParams })
-			}
-			else if (e.delta.type === 'input_json_delta') { // tool use
-				fullToolParams += e.delta.partial_json ?? '' // anthropic gives us the partial delta (string) here - https://docs.anthropic.com/en/api/messages-streaming
-				onText({ fullText, fullReasoning, fullToolName, fullToolParams })
+				onText({ fullText, fullReasoning, })
 			}
+			// else if (e.delta.type === 'input_json_delta') { // tool use
+			// 	fullToolParams += e.delta.partial_json ?? '' // anthropic gives us the partial delta (string) here - https://docs.anthropic.com/en/api/messages-streaming
+			// 	onText({ fullText, fullReasoning, })
+			// }
 		}
 	})
 
 	// on done - (or when error/fail) - this is called AFTER last streamEvent
 	stream.on('finalMessage', (response) => {
-		const toolCalls = toolCallsFrom_Anthropic(response.content)
 		const anthropicReasoning = response.content.filter(c => c.type === 'thinking' || c.type === 'redacted_thinking')
-		onFinalMessage({ fullText, fullReasoning, toolCalls, anthropicReasoning })
+		onFinalMessage({ fullText, fullReasoning, anthropicReasoning })
 	})
 	// on error
 	stream.on('error', (error) => {
@@ -420,23 +349,6 @@ const sendAnthropicChat = ({ messages: messages_, providerName, onText, onFinalM
 	_setAborter(() => stream.controller.abort())
 }
 
-// //  in future, can do tool_use streaming in anthropic, but it's pretty fast even without streaming...
-// const toolCallOfIndex: { [index: string]: { name: string, args: string } } = {}
-// stream.on('streamEvent', e => {
-// 	if (e.type === 'content_block_start') {
-// 		if (e.content_block.type !== 'tool_use') return
-// 		const index = e.index
-// 		if (!toolCallOfIndex[index]) toolCallOfIndex[index] = { name: '', args: '' }
-// 		toolCallOfIndex[index].name += e.content_block.name ?? ''
-// 		toolCallOfIndex[index].args += e.content_block.input ?? ''
-// 	}
-// 	else if (e.type === 'content_block_delta') {
-// 		if (e.delta.type !== 'input_json_delta') return
-// 		toolCallOfIndex[e.index].args += e.delta.partial_json
-// 	}
-// })
-
-
 // ------------ OLLAMA ------------
 const newOllamaSDK = ({ endpoint }: { endpoint: string }) => {
 	// if endpoint is empty, normally ollama will send to 11434, but we want it to fail - the user should type it in

src/vs/workbench/contrib/void/electron-main/llmMessage/sendLLMMessage.ts

@@ -21,7 +21,7 @@ export const sendLLMMessage = ({
 	settingsOfProvider,
 	modelSelection,
 	modelSelectionOptions,
-	tools,
+	chatMode,
 }: SendLLMMessageParams,
 
 	metricsService: IMetricsService
@@ -108,7 +108,7 @@ export const sendLLMMessage = ({
 		}
 		const { sendFIM, sendChat } = implementation
 		if (messagesType === 'chatMessages') {
-			sendChat({ messages: messages_, onText, onFinalMessage, onError, settingsOfProvider, modelSelectionOptions, modelName, _setAborter, providerName, aiInstructions, tools })
+			sendChat({ messages: messages_, onText, onFinalMessage, onError, settingsOfProvider, modelSelectionOptions, modelName, _setAborter, providerName, aiInstructions, chatMode })
 			return
 		}
 		if (messagesType === 'FIMMessage') {

src/vs/workbench/contrib/void/electron-main/voidUpdateMainService.ts

@@ -6,7 +6,7 @@
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { IEnvironmentMainService } from '../../../../platform/environment/electron-main/environmentMainService.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
-
+import { IUpdateService, StateType } from '../../../../platform/update/common/update.js';
 import { IVoidUpdateService } from '../common/voidUpdateService.js';
 
 
@@ -17,22 +17,37 @@ export class VoidMainUpdateService extends Disposable implements IVoidUpdateServ
 	constructor(
 		@IProductService private readonly _productService: IProductService,
 		@IEnvironmentMainService private readonly _envMainService: IEnvironmentMainService,
+		@IUpdateService private readonly _updateService: IUpdateService
 	) {
 		super()
 	}
 
-	async check() {
+	nIgnores = 0
+	async check(explicit: boolean) {
+
 		const isDevMode = !this._envMainService.isBuilt // found in abstractUpdateService.ts
 
 		if (isDevMode) {
 			return { hasUpdate: false } as const
 		}
 
+		this._updateService.checkForUpdates(false) // implicity check, then handle result ourselves
+
+		if (this._updateService.state.type === StateType.Ready) {
+			return { hasUpdate: true, message: 'Restart Void to update!' }
+		}
+
+		const wasAutomaticCheck = !explicit // ignore the first auto check, just use it to call updateService.check()
+		if (wasAutomaticCheck && this.nIgnores < 1) {
+			this.nIgnores += 1
+			return { hasUpdate: false } as const
+		}
+
 		try {
 			const res = await fetch(`https://updates.voideditor.dev/api/v0/${this._productService.commit}`)
 			const resJSON = await res.json()
 
-			if (!resJSON) return null
+			if (!resJSON) return null // null means error
 
 			const { hasUpdate, downloadMessage } = resJSON ?? {}
 			if (hasUpdate === undefined)