merge

Small (or empty) file editing

CONTRIBUTING.md

@@ -12,7 +12,7 @@ There are a few ways to contribute:
 
 ### Codebase Guide
 
-We highly recommend reading [this](https://github.com/microsoft/vscode/wiki/Source-Code-Organization) article on VSCode's sourcecode organization.
+We [highly recommend reading this](https://github.com/microsoft/vscode/wiki/Source-Code-Organization) article on VSCode's sourcecode organization too. Void's codebase is pretty simple when you know what a service is and what `browser/` and `common/` mean, and the article covers all the jargon.
 
 <!-- ADD BLOG HERE
 We wrote a [guide to working in VSCode].
@@ -61,13 +61,14 @@ To build Void, open `void/` inside VSCode. Then open your terminal and run:
 3. Build Void.
 	 - Press <kbd>Cmd+Shift+B</kbd> (Mac).
    - Press <kbd>Ctrl+Shift+B</kbd> (Windows/Linux).
-   - This step can take ~5 min. The build is done when you see two check marks.
+   - This step can take ~5 min. The build is done when you see two check marks (one of the items will continue spinning indefinitely - it compiles our React code).
 4. Run Void.
    - Run `./scripts/code.sh` (Mac/Linux).
    - Run `./scripts/code.bat` (Windows).
 6. Nice-to-knows.
    - You can always press <kbd>Ctrl+R</kbd> (<kbd>Cmd+R</kbd>) inside the new window to reload and see your new changes. It's faster than <kbd>Ctrl+Shift+P</kbd> and `Reload Window`.
    - You might want to add the flags `--user-data-dir ./.tmp/user-data --extensions-dir ./.tmp/extensions` to the above run command, which lets you delete the `.tmp` folder to reset any IDE changes you made when testing.
+	- You can kill any of the build scripts by pressing `Ctrl+D` in VSCode terminal. If you press `Ctrl+C` the script will close but will keep running in the background (to open all background scripts, just re-build).
 
 #### Building Void from Terminal
 
@@ -85,7 +86,7 @@ Alternatively, if you want to build Void from the terminal, instead of pressing
 #### Common Fixes
 
 - Make sure you followed the prerequisite steps.
-- Make sure you have Node version `20.16.0` (the version in `.nvmrc`)!
+- Make sure you have Node version `20.18.2` (the version in `.nvmrc`)!
 - If you get `"TypeError: Failed to fetch dynamically imported module"`, make sure all imports end with `.js`.
 - If you see missing styles, wait a few seconds and then reload.
 - If you have any questions, feel free to [submit an issue](https://github.com/voideditor/void/issues/new). You can also refer to VSCode's complete [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute) page.

VOID_USEFUL_LINKS.md

@@ -2,6 +2,8 @@
 
 The Void team put together this list of links to get up and running with VSCode's sourcecode. We hope it's helpful!
 
+For a complete guide on building Void, see [Contributing](https://github.com/voideditor/void/blob/main/CONTRIBUTING.md).
+
 ## Contributing
 
 - [How VSCode's sourcecode is organized](https://github.com/microsoft/vscode/wiki/Source-Code-Organization) - this explains where the entry point files are, what `browser/` and `common/` mean, etc. This is the most important read on this whole list! We recommend reading the whole thing.

package-lock.json

@@ -75,6 +75,7 @@
       "devDependencies": {
         "@playwright/test": "^1.50.0",
         "@stylistic/eslint-plugin-ts": "^2.8.0",
+        "@tailwindcss/typography": "^0.5.16",
         "@types/cookie": "^0.3.3",
         "@types/debug": "^4.1.5",
         "@types/diff": "^7.0.1",
@@ -168,7 +169,7 @@
         "pump": "^1.0.1",
         "rcedit": "^1.1.0",
         "rimraf": "^2.7.1",
-        "scope-tailwind": "^1.0.6",
+        "scope-tailwind": "^1.0.9",
         "sinon": "^12.0.1",
         "sinon-test": "^3.1.3",
         "source-map": "0.6.1",
@@ -3598,6 +3599,36 @@
         "node": ">=10"
       }
     },
+    "node_modules/@tailwindcss/typography": {
+      "version": "0.5.16",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.16.tgz",
+      "integrity": "sha512-0wDLwCVF5V3x3b1SGXPCDcdsbDHMBe+lkFzBRaHeLvNi+nrrnZ1lA18u+OTWO8iSWU2GxUOCvlXtDuqftc1oiA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "lodash.castarray": "^4.4.0",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.merge": "^4.6.2",
+        "postcss-selector-parser": "6.0.10"
+      },
+      "peerDependencies": {
+        "tailwindcss": ">=3.0.0 || insiders || >=4.0.0-alpha.20 || >=4.0.0-beta.1"
+      }
+    },
+    "node_modules/@tailwindcss/typography/node_modules/postcss-selector-parser": {
+      "version": "6.0.10",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
+      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@thisismanta/pessimist": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@thisismanta/pessimist/-/pessimist-1.2.0.tgz",
@@ -14039,6 +14070,13 @@
       "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY= sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==",
       "dev": true
     },
+    "node_modules/lodash.castarray": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz",
+      "integrity": "sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/lodash.clone": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
@@ -14057,6 +14095,13 @@
       "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
       "dev": true
     },
+    "node_modules/lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -18820,9 +18865,9 @@
       "dev": true
     },
     "node_modules/scope-tailwind": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/scope-tailwind/-/scope-tailwind-1.0.6.tgz",
-      "integrity": "sha512-tkISLsaesYKKXL9YrLsRWFOD/FhrRVGKeinjgTuFtEidryLzwlBB3G17ArmHWHYcfdMp00XwnRMcGFkF8wwG6w==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/scope-tailwind/-/scope-tailwind-1.0.9.tgz",
+      "integrity": "sha512-sxtAKxJq143lYK/RCE36YGq13ficBZ9/9Z0TZa78k0AEiKNT5nH4kfhD8YAfEXR/qPR+G7tl9KL4UoHh+Cs93g==",
       "dev": true,
       "license": "AGPL-3.0-only",
       "dependencies": {

package.json

@@ -69,7 +69,7 @@
     "extensions-ci-pr": "node ./node_modules/gulp/bin/gulp.js extensions-ci-pr",
     "perf": "node scripts/code-perf.js",
     "update-build-ts-version": "npm install typescript@next && tsc -p ./build/tsconfig.build.json"
-  },
+	},
   "dependencies": {
     "@anthropic-ai/sdk": "^0.39.0",
     "@floating-ui/react": "^0.27.5",
@@ -136,6 +136,7 @@
   "devDependencies": {
     "@playwright/test": "^1.50.0",
     "@stylistic/eslint-plugin-ts": "^2.8.0",
+    "@tailwindcss/typography": "^0.5.16",
     "@types/cookie": "^0.3.3",
     "@types/debug": "^4.1.5",
     "@types/diff": "^7.0.1",
@@ -229,7 +230,7 @@
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",
     "rimraf": "^2.7.1",
-    "scope-tailwind": "^1.0.6",
+    "scope-tailwind": "^1.0.9",
     "sinon": "^12.0.1",
     "sinon-test": "^3.1.3",
     "source-map": "0.6.1",

product.json

@@ -1,6 +1,7 @@
 {
 	"nameShort": "Void",
 	"nameLong": "Void",
+	"voidVersion": "1.0.2",
 	"applicationName": "void",
 	"dataFolderName": ".void-editor",
 	"win32MutexName": "voideditor",

scripts/appimage/create_appimage.sh

@@ -107,13 +107,46 @@ find . -maxdepth 1 ! -name VoidApp.AppDir ! -name "." ! -name ".." -exec cp -r {
 cp void.png VoidApp.AppDir/ && \
 echo "[Desktop Entry]" > VoidApp.AppDir/void.desktop && \
 echo "Name=Void" >> VoidApp.AppDir/void.desktop && \
-echo "Exec=void" >> VoidApp.AppDir/void.desktop && \
+echo "Comment=Open source AI code editor." >> VoidApp.AppDir/void.desktop && \
+echo "GenericName=Text Editor" >> VoidApp.AppDir/void.desktop && \
+echo "Exec=void %F" >> VoidApp.AppDir/void.desktop && \
 echo "Icon=void" >> VoidApp.AppDir/void.desktop && \
 echo "Type=Application" >> VoidApp.AppDir/void.desktop && \
-echo "Categories=Utility;" >> VoidApp.AppDir/void.desktop && \
-echo "Comment=Void Linux Application" >> VoidApp.AppDir/void.desktop && \
+echo "StartupNotify=false" >> VoidApp.AppDir/void.desktop && \
+echo "StartupWMClass=Void" >> VoidApp.AppDir/void.desktop && \
+echo "Categories=TextEditor;Development;IDE;" >> VoidApp.AppDir/void.desktop && \
+echo "MimeType=application/x-void-workspace;" >> VoidApp.AppDir/void.desktop && \
+echo "Keywords=void;" >> VoidApp.AppDir/void.desktop && \
+echo "Actions=new-empty-window;" >> VoidApp.AppDir/void.desktop && \
+echo "[Desktop Action new-empty-window]" >> VoidApp.AppDir/void.desktop && \
+echo "Name=New Empty Window" >> VoidApp.AppDir/void.desktop && \
+echo "Name[de]=Neues leeres Fenster" >> VoidApp.AppDir/void.desktop && \
+echo "Name[es]=Nueva ventana vacía" >> VoidApp.AppDir/void.desktop && \
+echo "Name[fr]=Nouvelle fenêtre vide" >> VoidApp.AppDir/void.desktop && \
+echo "Name[it]=Nuova finestra vuota" >> VoidApp.AppDir/void.desktop && \
+echo "Name[ja]=新しい空のウィンドウ" >> VoidApp.AppDir/void.desktop && \
+echo "Name[ko]=새 빈 창" >> VoidApp.AppDir/void.desktop && \
+echo "Name[ru]=Новое пустое окно" >> VoidApp.AppDir/void.desktop && \
+echo "Name[zh_CN]=新建空窗口" >> VoidApp.AppDir/void.desktop && \
+echo "Name[zh_TW]=開新空視窗" >> VoidApp.AppDir/void.desktop && \
+echo "Exec=void --new-window %F" >> VoidApp.AppDir/void.desktop && \
+echo "Icon=void" >> VoidApp.AppDir/void.desktop && \
 chmod +x VoidApp.AppDir/void.desktop && \
 cp VoidApp.AppDir/void.desktop VoidApp.AppDir/usr/share/applications/ && \
+echo "[Desktop Entry]" > VoidApp.AppDir/void-url-handler.desktop && \
+echo "Name=Void - URL Handler" > VoidApp.AppDir/void-url-handler.desktop && \
+echo "Comment=Open source AI code editor." > VoidApp.AppDir/void-url-handler.desktop && \
+echo "GenericName=Text Editor" > VoidApp.AppDir/void-url-handler.desktop && \
+echo "Exec=void --open-url %U" > VoidApp.AppDir/void-url-handler.desktop && \
+echo "Icon=void" > VoidApp.AppDir/void-url-handler.desktop && \
+echo "Type=Application" > VoidApp.AppDir/void-url-handler.desktop && \
+echo "NoDisplay=true" > VoidApp.AppDir/void-url-handler.desktop && \
+echo "StartupNotify=true" > VoidApp.AppDir/void-url-handler.desktop && \
+echo "Categories=Utility;TextEditor;Development;IDE;" > VoidApp.AppDir/void-url-handler.desktop && \
+echo "MimeType=x-scheme-handler/void;" > VoidApp.AppDir/void-url-handler.desktop && \
+echo "Keywords=void;" > VoidApp.AppDir/void-url-handler.desktop && \
+chmod +x VoidApp.AppDir/void-url-handler.desktop && \
+cp VoidApp.AppDir/void-url-handler.desktop VoidApp.AppDir/usr/share/applications/ && \
 echo "#!/bin/bash" > VoidApp.AppDir/AppRun && \
 echo "HERE=\$(dirname \"\$(readlink -f \"\${0}\")\")" >> VoidApp.AppDir/AppRun && \
 echo "export PATH=\${HERE}/usr/bin:\${PATH}" >> VoidApp.AppDir/AppRun && \

scripts/appimage/void-url-handler.desktop

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Void - URL Handler
+Comment=Open source AI code editor.
+GenericName=Text Editor
+Exec=void --open-url %U
+Icon=void
+Type=Application
+NoDisplay=true
+StartupNotify=true
+Categories=Utility;TextEditor;Development;IDE;
+MimeType=x-scheme-handler/void;
+Keywords=void;

scripts/appimage/void.desktop

@@ -1,7 +1,27 @@
 [Desktop Entry]
-Name=void
-Exec=void
+Name=Void
+Comment=Open source AI code editor.
+GenericName=Text Editor
+Exec=void %F
 Icon=void
 Type=Application
-Categories=Utility;
-Comment=Void Linux Application
+StartupNotify=false
+StartupWMClass=Void
+Categories=TextEditor;Development;IDE;
+MimeType=application/x-void-workspace;
+Keywords=void;
+Actions=new-empty-window;
+
+[Desktop Action new-empty-window]
+Name=New Empty Window
+Name[de]=Neues leeres Fenster
+Name[es]=Nueva ventana vacía
+Name[fr]=Nouvelle fenêtre vide
+Name[it]=Nuova finestra vuota
+Name[ja]=新しい空のウィンドウ
+Name[ko]=새 빈 창
+Name[ru]=Новое пустое окно
+Name[zh_CN]=新建空窗口
+Name[zh_TW]=開新空視窗
+Exec=void --new-window %F
+Icon=void

src/vs/base/browser/ui/codicons/codicon/codicon-modifiers.css

@@ -26,7 +26,7 @@
 }
 
 /* custom speed & easing for loading icon */
-.codicon-loading,
+.codicon-loading:not(.codicon-no-default-spin), /* Void changed this as it is literally broken to the !important */
 .codicon-tree-item-loading::before {
 	animation-duration: 1s !important;
 	animation-timing-function: cubic-bezier(0.53, 0.21, 0.29, 0.67) !important;

src/vs/base/common/product.ts

@@ -56,6 +56,7 @@ export type ExtensionVirtualWorkspaceSupport = {
 
 export interface IProductConfiguration {
 	readonly version: string;
+	readonly voidVersion?: string; // Void added this
 	readonly date?: string;
 	readonly quality?: string;
 	readonly commit?: string;

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

@@ -125,7 +125,7 @@ import { IMetricsService } from '../../workbench/contrib/void/common/metricsServ
 import { IVoidUpdateService } from '../../workbench/contrib/void/common/voidUpdateService.js';
 import { MetricsMainService } from '../../workbench/contrib/void/electron-main/metricsMainService.js';
 import { VoidMainUpdateService } from '../../workbench/contrib/void/electron-main/voidUpdateMainService.js';
-import { LLMMessageChannel } from '../../workbench/contrib/void/electron-main/llmMessageChannel.js';
+import { LLMMessageChannel } from '../../workbench/contrib/void/electron-main/sendLLMMessageChannel.js';
 
 /**
  * The main VS Code application. There will only ever be one instance,
@@ -1256,8 +1256,8 @@ export class CodeApplication extends Disposable {
 		const voidUpdatesChannel = ProxyChannel.fromService(accessor.get(IVoidUpdateService), disposables);
 		mainProcessElectronServer.registerChannel('void-channel-update', voidUpdatesChannel);
 
-		const llmMessageChannel = new LLMMessageChannel(accessor.get(IMetricsService));
-		mainProcessElectronServer.registerChannel('void-channel-llmMessageService', llmMessageChannel);
+		const sendLLMMessageChannel = new LLMMessageChannel(accessor.get(IMetricsService));
+		mainProcessElectronServer.registerChannel('void-channel-llmMessage', sendLLMMessageChannel);
 
 		// Extension Host Debug Broadcasting
 		const electronExtensionHostDebugBroadcastChannel = new ElectronExtensionHostDebugBroadcastChannel(accessor.get(IWindowsMainService));

src/vs/editor/common/config/editorOptions.ts

@@ -3570,7 +3570,7 @@ class EditorQuickSuggestions extends BaseEditorOption<EditorOption.quickSuggesti
 		const defaults: InternalQuickSuggestionsOptions = {
 			other: 'on',
 			comments: 'off',
-			strings: 'off'
+			strings: 'on' // Void changed this setting
 		};
 		const types: IJSONSchema[] = [
 			{ type: 'boolean' },

src/vs/workbench/contrib/chat/browser/chatParticipant.contribution.ts

@@ -4,23 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { coalesce, isNonEmptyArray } from '../../../../base/common/arrays.js';
-import { Codicon } from '../../../../base/common/codicons.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
 import { Event } from '../../../../base/common/event.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableMap, DisposableStore } from '../../../../base/common/lifecycle.js';
 import * as strings from '../../../../base/common/strings.js';
-import { localize, localize2 } from '../../../../nls.js';
-import { ContextKeyExpr, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { localize } from '../../../../nls.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { ExtensionIdentifier, IExtensionManifest } from '../../../../platform/extensions/common/extensions.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
 import { IProductService } from '../../../../platform/product/common/productService.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
-import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
-import { IViewContainersRegistry, IViewDescriptor, IViewsRegistry, ViewContainer, ViewContainerLocation, Extensions as ViewExtensions } from '../../../common/views.js';
+import { IViewsRegistry, Extensions as ViewExtensions } from '../../../common/views.js';
 import { IExtensionFeatureTableRenderer, IRenderedData, ITableData, IRowData, IExtensionFeaturesRegistry, Extensions } from '../../../services/extensionManagement/common/extensionFeatures.js';
 import { isProposedApiEnabled } from '../../../services/extensions/common/extensions.js';
 import * as extensionsRegistry from '../../../services/extensions/common/extensionsRegistry.js';
@@ -30,90 +27,91 @@ import { ChatAgentLocation, IChatAgentData, IChatAgentService } from '../common/
 import { ChatContextKeys } from '../common/chatContextKeys.js';
 import { IRawChatParticipantContribution } from '../common/chatParticipantContribTypes.js';
 import { ChatViewId } from './chat.js';
-import { CHAT_EDITING_SIDEBAR_PANEL_ID, CHAT_SIDEBAR_PANEL_ID, ChatViewPane } from './chatViewPane.js';
 
 // --- Chat Container &  View Registration
 
-const chatViewContainer: ViewContainer = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).registerViewContainer({
-	id: CHAT_SIDEBAR_PANEL_ID,
-	title: localize2('chat.viewContainer.label', "Chat"),
-	icon: Codicon.commentDiscussion,
-	ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [CHAT_SIDEBAR_PANEL_ID, { mergeViewWithContainerWhenSingleView: true }]),
-	storageId: CHAT_SIDEBAR_PANEL_ID,
-	hideIfEmpty: true,
-	order: 100,
-}, ViewContainerLocation.AuxiliaryBar, { isDefault: true, doNotRegisterOpenCommand: true });
+// Void commented this out
+// const chatViewContainer: ViewContainer = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).registerViewContainer({
+// 	id: CHAT_SIDEBAR_PANEL_ID,
+// 	title: localize2('chat.viewContainer.label', "Chat"),
+// 	icon: Codicon.commentDiscussion,
+// 	ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [CHAT_SIDEBAR_PANEL_ID, { mergeViewWithContainerWhenSingleView: true }]),
+// 	storageId: CHAT_SIDEBAR_PANEL_ID,
+// 	hideIfEmpty: true,
+// 	order: 100,
+// }, ViewContainerLocation.AuxiliaryBar, { isDefault: true, doNotRegisterOpenCommand: true });
 
-const chatViewDescriptor: IViewDescriptor[] = [{
-	id: ChatViewId,
-	containerIcon: chatViewContainer.icon,
-	containerTitle: chatViewContainer.title.value,
-	singleViewPaneContainerTitle: chatViewContainer.title.value,
-	name: localize2('chat.viewContainer.label', "Chat"),
-	canToggleVisibility: false,
-	canMoveView: true,
-	openCommandActionDescriptor: {
-		id: CHAT_SIDEBAR_PANEL_ID,
-		title: chatViewContainer.title,
-		mnemonicTitle: localize({ key: 'miToggleChat', comment: ['&& denotes a mnemonic'] }, "&&Chat"),
-		keybindings: {
-			primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyI,
-			mac: {
-				primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KeyI
-			}
-		},
-		order: 1
-	},
-	ctorDescriptor: new SyncDescriptor(ChatViewPane, [{ location: ChatAgentLocation.Panel }]),
-	when: ContextKeyExpr.or(
-		ChatContextKeys.Setup.hidden.negate(),
-		ChatContextKeys.Setup.installed,
-		ChatContextKeys.panelParticipantRegistered,
-		ChatContextKeys.extensionInvalid
-	)
-}];
-Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry).registerViews(chatViewDescriptor, chatViewContainer);
+// const chatViewDescriptor: IViewDescriptor[] = [{
+// 	id: ChatViewId,
+// 	containerIcon: chatViewContainer.icon,
+// 	containerTitle: chatViewContainer.title.value,
+// 	singleViewPaneContainerTitle: chatViewContainer.title.value,
+// 	name: localize2('chat.viewContainer.label', "Chat"),
+// 	canToggleVisibility: false,
+// 	canMoveView: true,
+// 	openCommandActionDescriptor: {
+// 		id: CHAT_SIDEBAR_PANEL_ID,
+// 		title: chatViewContainer.title,
+// 		mnemonicTitle: localize({ key: 'miToggleChat', comment: ['&& denotes a mnemonic'] }, "&&Chat"),
+// 		keybindings: {
+// 			primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyI,
+// 			mac: {
+// 				primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KeyI
+// 			}
+// 		},
+// 		order: 1
+// 	},
+// 	ctorDescriptor: new SyncDescriptor(ChatViewPane, [{ location: ChatAgentLocation.Panel }]),
+// 	when: ContextKeyExpr.or(
+// 		ChatContextKeys.Setup.hidden.negate(),
+// 		ChatContextKeys.Setup.installed,
+// 		ChatContextKeys.panelParticipantRegistered,
+// 		ChatContextKeys.extensionInvalid
+// 	)
+// }];
+// Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry).registerViews(chatViewDescriptor, chatViewContainer);
 
 // --- Edits Container &  View Registration
 
-const editsViewContainer: ViewContainer = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).registerViewContainer({
-	id: CHAT_EDITING_SIDEBAR_PANEL_ID,
-	title: localize2('chatEditing.viewContainer.label', "Copilot Edits"),
-	icon: Codicon.editSession,
-	ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [CHAT_EDITING_SIDEBAR_PANEL_ID, { mergeViewWithContainerWhenSingleView: true }]),
-	storageId: CHAT_EDITING_SIDEBAR_PANEL_ID,
-	hideIfEmpty: true,
-	order: 101,
-}, ViewContainerLocation.AuxiliaryBar, { doNotRegisterOpenCommand: true });
+// Void commented this out
+// const editsViewContainer: ViewContainer = Registry.as<IViewContainersRegistry>(ViewExtensions.ViewContainersRegistry).registerViewContainer({
+// 	id: CHAT_EDITING_SIDEBAR_PANEL_ID,
+// 	title: localize2('chatEditing.viewContainer.label', "Copilot Edits"),
+// 	icon: Codicon.editSession,
+// 	ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [CHAT_EDITING_SIDEBAR_PANEL_ID, { mergeViewWithContainerWhenSingleView: true }]),
+// 	storageId: CHAT_EDITING_SIDEBAR_PANEL_ID,
+// 	hideIfEmpty: true,
+// 	order: 101,
+// }, ViewContainerLocation.AuxiliaryBar, { doNotRegisterOpenCommand: true });
 
-const editsViewDescriptor: IViewDescriptor[] = [{
-	id: 'workbench.panel.chat.view.edits',
-	containerIcon: editsViewContainer.icon,
-	containerTitle: editsViewContainer.title.value,
-	singleViewPaneContainerTitle: editsViewContainer.title.value,
-	name: editsViewContainer.title,
-	canToggleVisibility: false,
-	canMoveView: true,
-	openCommandActionDescriptor: {
-		id: CHAT_EDITING_SIDEBAR_PANEL_ID,
-		title: editsViewContainer.title,
-		mnemonicTitle: localize({ key: 'miToggleEdits', comment: ['&& denotes a mnemonic'] }, "Copilot Ed&&its"),
-		keybindings: {
-			primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyI,
-			linux: {
-				primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.KeyI
-			}
-		},
-		order: 2
-	},
-	ctorDescriptor: new SyncDescriptor(ChatViewPane, [{ location: ChatAgentLocation.EditingSession }]),
-	when: ContextKeyExpr.or(
-		ChatContextKeys.Setup.hidden.negate(),
-		ChatContextKeys.Setup.installed,
-		ChatContextKeys.editingParticipantRegistered
-	)
-}];
-Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry).registerViews(editsViewDescriptor, editsViewContainer);
+// const editsViewDescriptor: IViewDescriptor[] = [{
+// 	id: 'workbench.panel.chat.view.edits',
+// 	containerIcon: editsViewContainer.icon,
+// 	containerTitle: editsViewContainer.title.value,
+// 	singleViewPaneContainerTitle: editsViewContainer.title.value,
+// 	name: editsViewContainer.title,
+// 	canToggleVisibility: false,
+// 	canMoveView: true,
+// 	openCommandActionDescriptor: {
+// 		id: CHAT_EDITING_SIDEBAR_PANEL_ID,
+// 		title: editsViewContainer.title,
+// 		mnemonicTitle: localize({ key: 'miToggleEdits', comment: ['&& denotes a mnemonic'] }, "Copilot Ed&&its"),
+// 		keybindings: {
+// 			primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyI,
+// 			linux: {
+// 				primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.KeyI
+// 			}
+// 		},
+// 		order: 2
+// 	},
+// 	ctorDescriptor: new SyncDescriptor(ChatViewPane, [{ location: ChatAgentLocation.EditingSession }]),
+// 	when: ContextKeyExpr.or(
+// 		ChatContextKeys.Setup.hidden.negate(),
+// 		ChatContextKeys.Setup.installed,
+// 		ChatContextKeys.editingParticipantRegistered
+// 	)
+// }];
+// Registry.as<IViewsRegistry>(ViewExtensions.ViewsRegistry).registerViews(editsViewDescriptor, editsViewContainer);
 
 const chatParticipantExtensionPoint = extensionsRegistry.ExtensionsRegistry.registerExtensionPoint<IRawChatParticipantContribution[]>({
 	extensionPoint: 'chatParticipants',

src/vs/workbench/contrib/files/browser/fileActions.contribution.ts

@@ -27,6 +27,7 @@ import { ThemeIcon } from '../../../../base/common/themables.js';
 import { IExplorerService } from './files.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
+import { VOID_OPEN_SETTINGS_ACTION_ID } from '../../void/browser/voidSettingsPane.js';
 
 // Contribute Global Actions
 
@@ -675,6 +676,18 @@ for (const menuId of [MenuId.EmptyEditorGroupContext, MenuId.EditorTabsBarContex
 
 // File menu
 
+
+// Void added this:
+MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
+	group: '0_void',
+	command: {
+		id: VOID_OPEN_SETTINGS_ACTION_ID,
+		title: nls.localize({ key: 'openVoid', comment: ['&& denotes a mnemonic'] }, "&&Open Void Settings"),
+	},
+	order: 1
+});
+
+
 MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
 	group: '1_new',
 	command: {

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

@@ -39,7 +39,7 @@ class MarkerCheckService extends Disposable implements IMarkerCheckService {
 
 					console.log(`----------------------------------------------`);
 
-					console.log(`${error.resource.toString()}: ${error.startLineNumber} ${error.message} ${error.severity}`); // ! all errors in the file
+					console.log(`${error.resource.fsPath}: ${error.startLineNumber} ${error.message} ${error.severity}`); // ! all errors in the file
 
 					try {
 						// Get the text model for the file
@@ -122,11 +122,11 @@ class MarkerCheckService extends Disposable implements IMarkerCheckService {
 	// 		const markers = this._markerService.read({ resource });
 
 	// 		if (markers.length === 0) {
-	// 			console.log(`${resource.toString()}: No diagnostics`);
+	// 			console.log(`${resource.fsPath}: No diagnostics`);
 	// 			continue;
 	// 		}
 
-	// 		console.log(`Diagnostics for ${resource.toString()}:`);
+	// 		console.log(`Diagnostics for ${resource.fsPath}:`);
 	// 		markers.forEach(marker => this._logMarker(marker));
 	// 	}
 	// };

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

@@ -34,7 +34,7 @@
 // 	// 			const result = await new Promise((res, rej) => {
 // 	// 				sendLLMMessage({
 // 	// 					messages,
-// 	// 					tools: ['search'],
+// 	// 					tools: ['text_search'],
 // 	// 					onFinalMessage: ({ result: r, }) => {
 // 	// 						res(r)
 // 	// 					},
@@ -73,7 +73,7 @@
 // 	// 	const result = new Promise((res, rej) => {
 // 	// 		sendLLMMessage({
 // 	// 			messages,
-// 	// 			tools: ['search'],
+// 	// 			tools: ['text_search'],
 // 	// 			onResult: (r) => {
 // 	// 				res(r)
 // 	// 			}

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

@@ -15,12 +15,19 @@ import { IEditorService } from '../../../services/editor/common/editorService.js
 import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { EditorResourceAccessor } from '../../../common/editor.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
-import { extractCodeFromRegular } from './helpers/extractCodeFromResult.js';
+import { extractCodeFromRegular } from '../common/helpers/extractCodeFromResult.js';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
-import { ILLMMessageService } from '../common/llmMessageService.js';
-import { _ln, allLinebreakSymbols } from '../common/voidFileService.js';
+import { ILLMMessageService } from '../common/sendLLMMessageService.js';
+import { isWindows } from '../../../../base/common/platform.js';
+import { IVoidSettingsService } from '../common/voidSettingsService.js';
+import { FeatureName } from '../common/voidSettingsTypes.js';
 // import { IContextGatheringService } from './contextGatheringService.js';
 
+
+
+const allLinebreakSymbols = ['\r\n', '\n']
+const _ln = isWindows ? allLinebreakSymbols[0] : allLinebreakSymbols[1]
+
 // The extension this was called from is here - https://github.com/voideditor/void/blob/autocomplete/extensions/void/src/extension/extension.ts
 
 
@@ -630,9 +637,12 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 		token: CancellationToken,
 	): Promise<InlineCompletion[]> {
 
+		const isEnabled = this._settingsService.state.globalSettings.enableAutocomplete
+		if (!isEnabled) return []
+
 		const testMode = false
 
-		const docUriStr = model.uri.toString();
+		const docUriStr = model.uri.fsPath;
 
 		const prefixAndSuffix = getPrefixAndSuffixInfo(model, position)
 		const { prefix, suffix } = prefixAndSuffix
@@ -762,8 +772,6 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 
 
 
-		// console.log('B')
-
 		// create a new autocompletion and add it to cache
 		const newAutocompletion: Autocompletion = {
 			id: this._autocompletionId++,
@@ -783,6 +791,11 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 
 		console.log('starting autocomplete...', predictionType)
 
+		const featureName: FeatureName = 'Autocomplete'
+		const modelSelection = this._settingsService.state.modelSelectionOfFeature[featureName]
+		const modelSelectionOptions = modelSelection ? this._settingsService.state.optionsOfModelSelection[modelSelection.providerName]?.[modelSelection.modelName] : undefined
+
+
 		// set parameters of `newAutocompletion` appropriately
 		newAutocompletion.llmPromise = new Promise((resolve, reject) => {
 
@@ -793,7 +806,8 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 					suffix: llmSuffix,
 					stopTokens: stopTokens,
 				},
-				useProviderFor: 'Autocomplete',
+				modelSelection,
+				modelSelectionOptions,
 				logging: { loggingName: 'Autocomplete' },
 				onText: () => { }, // unused in FIMMessage
 				// onText: async ({ fullText, newText }) => {
@@ -838,6 +852,7 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 					newAutocompletion.status = 'error'
 					reject(message)
 				},
+				onAbort: () => { },
 			})
 			newAutocompletion.requestId = requestId
 
@@ -877,6 +892,7 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 		@ILLMMessageService private readonly _llmMessageService: ILLMMessageService,
 		@IEditorService private readonly _editorService: IEditorService,
 		@IModelService private readonly _modelService: IModelService,
+		@IVoidSettingsService private readonly _settingsService: IVoidSettingsService,
 		// @IContextGatheringService private readonly _contextGatheringService: IContextGatheringService,
 	) {
 		super()
@@ -900,7 +916,7 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 				if (!resource) return;
 				const model = this._modelService.getModel(resource)
 				if (!model) return;
-				const docUriStr = resource.toString();
+				const docUriStr = resource.fsPath;
 				if (!this._autocompletionsOfDocument[docUriStr]) return;
 
 				const { prefix, } = getPrefixAndSuffixInfo(model, position)
@@ -929,4 +945,3 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 registerWorkbenchContribution2(AutocompleteService.ID, AutocompleteService, WorkbenchPhase.BlockRestore);
 
 
-

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

@@ -0,0 +1,64 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+import { Event } from '../../../../base/common/event.js';
+import { URI } from '../../../../base/common/uri.js';
+import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { Diff, DiffArea } from './editCodeService.js';
+
+
+
+export type StartBehavior = 'accept-conflicts' | 'reject-conflicts' | 'keep-conflicts'
+
+export type StartApplyingOpts = ({
+	from: 'QuickEdit';
+	diffareaid: number; // id of the CtrlK area (contains text selection)
+	startBehavior: StartBehavior;
+} | {
+	from: 'ClickApply';
+	applyStr: string;
+	uri: 'current' | URI;
+	startBehavior: StartBehavior;
+})
+
+
+
+export type AddCtrlKOpts = {
+	startLine: number,
+	endLine: number,
+	editor: ICodeEditor,
+}
+
+export const IEditCodeService = createDecorator<IEditCodeService>('editCodeService');
+
+export interface IEditCodeService {
+	readonly _serviceBrand: undefined;
+
+	startApplying(opts: StartApplyingOpts): Promise<[URI, Promise<void>] | null>;
+	addCtrlKZone(opts: AddCtrlKOpts): number | undefined;
+	removeCtrlKZone(opts: { diffareaid: number }): void;
+
+	diffAreaOfId: Record<string, DiffArea>;
+	diffAreasOfURI: Record<string, Set<string> | undefined>;
+	diffOfId: Record<string, Diff>;
+
+	acceptOrRejectAllDiffAreas(opts: { uri: URI, removeCtrlKs: boolean, behavior: 'reject' | 'accept', _addToHistory?: boolean }): void;
+
+	// events
+	onDidAddOrDeleteDiffZones: Event<{ uri: URI }>;
+	onDidChangeDiffsInDiffZone: Event<{ uri: URI; diffareaid: number }>; // only fires when not streaming!!! streaming would be too much
+	onDidChangeStreamingInDiffZone: Event<{ uri: URI; diffareaid: number }>;
+	onDidChangeStreamingInCtrlKZone: Event<{ uri: URI; diffareaid: number }>;
+
+	// CtrlKZone streaming state
+	isCtrlKZoneStreaming(opts: { diffareaid: number }): boolean;
+	interruptCtrlKStreaming(opts: { diffareaid: number }): void;
+
+	// // DiffZone codeBoxId streaming state
+	interruptURIStreaming(opts: { uri: URI }): void;
+
+	// testDiffs(): void;
+}

src/vs/workbench/contrib/void/browser/helperServices/consistentItemService.ts

@@ -25,7 +25,7 @@ export interface IConsistentItemService {
 
 export const IConsistentItemService = createDecorator<IConsistentItemService>('ConsistentItemService');
 
-export class ConsistentItemService extends Disposable {
+export class ConsistentItemService extends Disposable implements IConsistentItemService {
 
 	readonly _serviceBrand: undefined
 

src/vs/workbench/contrib/void/browser/helpers/detectLanguage.ts

@@ -1,174 +0,0 @@
-/*--------------------------------------------------------------------------------------
- *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
- *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
- *--------------------------------------------------------------------------------------*/
-
-// eg "bash" -> "shell"
-export const nameToVscodeLanguage: { [key: string]: string } = {
-	// Web Technologies
-	'html': 'html',
-	'css': 'css',
-	'scss': 'scss',
-	'sass': 'scss',
-	'less': 'less',
-	'javascript': 'typescript',
-	'js': 'typescript', // use more general renderer
-	'jsx': 'typescript',
-	'typescript': 'typescript',
-	'ts': 'typescript',
-	'tsx': 'typescript',
-	'json': 'json',
-	'jsonc': 'json',
-
-	// Programming Languages
-	'python': 'python',
-	'py': 'python',
-	'java': 'java',
-	'cpp': 'cpp',
-	'c++': 'cpp',
-	'c': 'c',
-	'csharp': 'csharp',
-	'cs': 'csharp',
-	'c#': 'csharp',
-	'go': 'go',
-	'golang': 'go',
-	'rust': 'rust',
-	'rs': 'rust',
-	'ruby': 'ruby',
-	'rb': 'ruby',
-	'php': 'php',
-	'shell': 'shell',
-	'bash': 'shell',
-	'sh': 'shell',
-	'zsh': 'shell',
-
-	// Markup and Config
-	'markdown': 'markdown',
-	'md': 'markdown',
-	'xml': 'xml',
-	'svg': 'xml',
-	'yaml': 'yaml',
-	'yml': 'yaml',
-	'ini': 'ini',
-	'toml': 'ini',
-
-	// Database and Query Languages
-	'sql': 'sql',
-	'mysql': 'sql',
-	'postgresql': 'sql',
-	'graphql': 'graphql',
-	'gql': 'graphql',
-
-	// Others
-	'dockerfile': 'dockerfile',
-	'docker': 'dockerfile',
-	'makefile': 'makefile',
-	'plaintext': 'plaintext',
-	'text': 'plaintext'
-};
-
-
-
-// eg ".ts" -> "typescript"
-const fileExtensionToVscodeLanguage: { [key: string]: string } = {
-	// Web
-	'html': 'html',
-	'htm': 'html',
-	'css': 'css',
-	'scss': 'scss',
-	'less': 'less',
-	'js': 'javascript',
-	'jsx': 'javascript',
-	'ts': 'typescript',
-	'tsx': 'typescript',
-	'json': 'json',
-	'jsonc': 'json',
-
-	// Programming Languages
-	'py': 'python',
-	'java': 'java',
-	'cpp': 'cpp',
-	'cc': 'cpp',
-	'c': 'c',
-	'h': 'cpp',
-	'hpp': 'cpp',
-	'cs': 'csharp',
-	'go': 'go',
-	'rs': 'rust',
-	'rb': 'ruby',
-	'php': 'php',
-	'sh': 'shell',
-	'bash': 'shell',
-	'zsh': 'shell',
-
-	// Markup/Config
-	'md': 'markdown',
-	'markdown': 'markdown',
-	'xml': 'xml',
-	'svg': 'xml',
-	'yaml': 'yaml',
-	'yml': 'yaml',
-	'ini': 'ini',
-	'toml': 'ini',
-
-	// Other
-	'sql': 'sql',
-	'graphql': 'graphql',
-	'gql': 'graphql',
-	'dockerfile': 'dockerfile',
-	'docker': 'dockerfile',
-	'mk': 'makefile',
-
-	// Config Files and Dot Files
-	'npmrc': 'ini',
-	'env': 'ini',
-	'gitignore': 'ignore',
-	'dockerignore': 'ignore',
-	'eslintrc': 'json',
-	'babelrc': 'json',
-	'prettierrc': 'json',
-	'stylelintrc': 'json',
-	'editorconfig': 'ini',
-	'htaccess': 'apacheconf',
-	'conf': 'ini',
-	'config': 'ini',
-
-	// Package Files
-	'package': 'json',
-	'package-lock': 'json',
-	'gemfile': 'ruby',
-	'podfile': 'ruby',
-	'rakefile': 'ruby',
-
-	// Build Systems
-	'cmake': 'cmake',
-	'makefile': 'makefile',
-	'gradle': 'groovy',
-
-	// Shell Scripts
-	'bashrc': 'shell',
-	'zshrc': 'shell',
-	'fish': 'shell',
-
-	// Version Control
-	'gitconfig': 'ini',
-	'hgrc': 'ini',
-	'svnconfig': 'ini',
-
-	// Web Server
-	'nginx': 'nginx',
-
-	// Misc Config
-	'properties': 'properties',
-	'cfg': 'ini',
-	'reg': 'ini'
-};
-
-
-export function filenameToVscodeLanguage(filename: string): string | undefined {
-
-	const ext = filename.toLowerCase().split('.').pop();
-	if (!ext) return undefined;
-
-	return fileExtensionToVscodeLanguage[ext];
-}

src/vs/workbench/contrib/void/browser/helpers/readFile.ts

@@ -1,52 +0,0 @@
-/*--------------------------------------------------------------------------------------
- *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
- *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
- *--------------------------------------------------------------------------------------*/
-
-import { URI } from '../../../../../base/common/uri.js'
-import { EndOfLinePreference } from '../../../../../editor/common/model.js'
-import { IModelService } from '../../../../../editor/common/services/model.js'
-import { IFileService } from '../../../../../platform/files/common/files.js'
-
-
-// attempts to read URI of currently opened model, then of raw file
-export const VSReadFile = async (uri: URI, modelService: IModelService, fileService: IFileService) => {
-
-	const modelResult = await _VSReadModel(modelService, uri)
-	if (modelResult) return modelResult
-
-	const fileResult = await _VSReadFileRaw(fileService, uri)
-	if (fileResult) return fileResult
-
-	return ''
-
-}
-
-// read files from VSCode. preferred (but appears to only work if the model of this URI already exists. If it doesn't use the other function.)
-const _VSReadModel = async (modelService: IModelService, uri: URI): Promise<string | null> => {
-
-	// attempt to read saved model (doesn't work if application was reloaded...)
-	const model = modelService.getModel(uri)
-	if (model) {
-		return model.getValue(EndOfLinePreference.LF)
-	}
-
-	// backup logic - look at all opened models and check if they have the same `fsPath`
-	const models = modelService.getModels()
-	for (const model of models) {
-		if (model.uri.fsPath === uri.fsPath)
-			return model.getValue(EndOfLinePreference.LF);
-	}
-
-	return null
-}
-
-const _VSReadFileRaw = async (fileService: IFileService, uri: URI) => {
-	try {
-		const res = await fileService.readFile(uri)
-		const str = res.value.toString()
-		return str
-	} catch (e) {
-		return null
-	}
-}

src/vs/workbench/contrib/void/browser/media/void.css

@@ -83,7 +83,7 @@
 .void-scrollable-element::-webkit-scrollbar,
 .void-scrollable-element *::-webkit-scrollbar {
     width: 14px !important;
-    height: 14px !important;
+    height: 4px !important;
 }
 
 .void-scrollable-element::-webkit-scrollbar-track,

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

@@ -0,0 +1,55 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
+
+import * as dom from '../../../../base/browser/dom.js';
+import { IMetricsService } from '../common/metricsService.js';
+
+
+export interface IMetricsPollService {
+	readonly _serviceBrand: undefined;
+}
+
+
+const PING_EVERY_MS = 15 * 1000 * 60  // 15 minutes
+
+export const IMetricsPollService = createDecorator<IMetricsPollService>('voidMetricsPollService');
+class MetricsPollService extends Disposable implements IMetricsPollService {
+	_serviceBrand: undefined;
+
+	static readonly ID = 'voidMetricsPollService';
+
+
+	private readonly intervalID: number
+	constructor(
+		@IMetricsService private readonly metricsService: IMetricsService,
+	) {
+		super()
+
+		// initial state
+		const { window } = dom.getActiveWindow()
+		let i = 1
+
+		this.intervalID = window.setInterval(() => {
+			this.metricsService.capture('Alive', { iv1: i })
+			i += 1
+		}, PING_EVERY_MS)
+
+
+	}
+
+	override dispose() {
+		super.dispose()
+		const { window } = dom.getActiveWindow()
+		window.clearInterval(this.intervalID)
+	}
+
+
+}
+
+registerWorkbenchContribution2(MetricsPollService.ID, MetricsPollService, WorkbenchPhase.BlockRestore);

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

@@ -8,7 +8,7 @@ import { Action2, registerAction2 } from '../../../../platform/actions/common/ac
 import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
-import { IEditCodeService } from './editCodeService.js';
+import { IEditCodeService } from './editCodeServiceInterface.js';
 import { roundRangeToLines } from './sidebarActions.js';
 import { VOID_CTRL_K_ACTION_ID } from './actionIDs.js';
 import { localize2 } from '../../../../nls.js';

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

@@ -1,77 +0,0 @@
-/*--------------------------------------------------------------------------------------
- *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
- *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
- *--------------------------------------------------------------------------------------*/
-
-import { Emitter, Event } from '../../../../base/common/event.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { QuickEdit } from './quickEditActions.js';
-
-
-
-// service that manages state
-export type VoidQuickEditState = {
-	quickEditsOfDocument: { [uri: string]: QuickEdit }
-}
-
-export interface IQuickEditStateService {
-	readonly _serviceBrand: undefined;
-
-	readonly state: VoidQuickEditState; // readonly to the user
-	setState(newState: Partial<VoidQuickEditState>): void;
-	onDidChangeState: Event<void>;
-
-	onDidFocusChat: Event<void>;
-	onDidBlurChat: Event<void>;
-	fireFocusChat(): void;
-	fireBlurChat(): void;
-
-}
-
-export const IQuickEditStateService = createDecorator<IQuickEditStateService>('voidQuickEditStateService');
-class VoidQuickEditStateService extends Disposable implements IQuickEditStateService {
-	_serviceBrand: undefined;
-
-	static readonly ID = 'voidQuickEditStateService';
-
-	private readonly _onDidChangeState = new Emitter<void>();
-	readonly onDidChangeState: Event<void> = this._onDidChangeState.event;
-
-	private readonly _onFocusChat = new Emitter<void>();
-	readonly onDidFocusChat: Event<void> = this._onFocusChat.event;
-
-	private readonly _onBlurChat = new Emitter<void>();
-	readonly onDidBlurChat: Event<void> = this._onBlurChat.event;
-
-
-	// state
-	state: VoidQuickEditState
-
-	constructor(
-	) {
-		super()
-
-		// initial state
-		this.state = { quickEditsOfDocument: {} }
-	}
-
-
-	setState(newState: Partial<VoidQuickEditState>) {
-
-		this.state = { ...this.state, ...newState }
-		this._onDidChangeState.fire()
-	}
-
-	fireFocusChat() {
-		this._onFocusChat.fire()
-	}
-
-	fireBlurChat() {
-		this._onBlurChat.fire()
-	}
-
-}
-
-registerSingleton(IQuickEditStateService, VoidQuickEditStateService, InstantiationType.Eager);

src/vs/workbench/contrib/void/browser/react/build.js

@@ -74,7 +74,7 @@ function saveStylesFile() {
 		} catch (err) {
 			console.error('[scope-tailwind] Error saving styles.css:', err);
 		}
-	}, 3000);
+	}, 4000);
 }
 
 const args = process.argv.slice(2);

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

@@ -1,9 +1,12 @@
 import { useState, useEffect, useCallback } from 'react'
-import { useAccessor, useURIStreamState, useSettingsState } from '../util/services.js'
-import { useRefState } from '../util/helpers.js'
+import { useAccessor, useCommandBarState, useCommandBarURIListener, useSettingsState } from '../util/services.js'
+import { usePromise, useRefState } from '../util/helpers.js'
 import { isFeatureNameDisabled } from '../../../../common/voidSettingsTypes.js'
 import { URI } from '../../../../../../../base/common/uri.js'
-import { IEditCodeService, URIStreamState } from '../../../editCodeService.js'
+import { FileSymlink, LucideIcon, RotateCw } from 'lucide-react'
+import { Check, X, Square, Copy, Play, } from 'lucide-react'
+import { getBasename, ListableToolItem, ToolChildrenWrapper } from '../sidebar-tsx/SidebarChat.js'
+import { ChatMarkdownRender } from './ChatMarkdownRender.js'
 
 enum CopyButtonText {
 	Idle = 'Copy',
@@ -11,6 +14,56 @@ enum CopyButtonText {
 	Error = 'Could not copy',
 }
 
+
+type IconButtonProps = {
+	onClick: () => void;
+	Icon: LucideIcon
+	disabled?: boolean
+	className?: string
+}
+
+export const IconShell1 = ({ onClick, Icon, disabled, className }: IconButtonProps) => (
+	<button
+		disabled={disabled}
+		onClick={(e) => {
+			e.preventDefault();
+			e.stopPropagation();
+			onClick?.();
+		}}
+		className={`
+            size-[22px]
+			p-[4px]
+            flex items-center justify-center
+            text-sm bg-void-bg-3 text-void-fg-1
+            hover:brightness-110
+            border border-void-border-1 rounded
+            disabled:opacity-50 disabled:cursor-not-allowed
+			${className}
+        `}
+	>
+		<Icon />
+	</button>
+)
+
+
+// export const IconShell2 = ({ onClick, title, Icon, disabled, className }: IconButtonProps) => (
+// 	<button
+// 		title={title}
+// 		disabled={disabled}
+// 		onClick={onClick}
+// 		className={`
+//             size-[24px]
+//             flex items-center justify-center
+//             text-sm
+//             hover:opacity-80
+//             disabled:opacity-50 disabled:cursor-not-allowed
+//             ${className}
+//         `}
+// 	>
+// 		<Icon size={16} />
+// 	</button>
+// )
+
 const COPY_FEEDBACK_TIMEOUT = 1000 // amount of time to say 'Copied!'
 
 const CopyButton = ({ codeStr }: { codeStr: string }) => {
@@ -27,7 +80,6 @@ const CopyButton = ({ codeStr }: { codeStr: string }) => {
 		}, COPY_FEEDBACK_TIMEOUT)
 	}, [copyButtonText])
 
-
 	const onCopy = useCallback(() => {
 		clipboardService.writeText(codeStr)
 			.then(() => { setCopyButtonText(CopyButtonText.Copied) })
@@ -35,123 +87,257 @@ const CopyButton = ({ codeStr }: { codeStr: string }) => {
 		metricsService.capture('Copy Code', { length: codeStr.length }) // capture the length only
 	}, [metricsService, clipboardService, codeStr, setCopyButtonText])
 
-	const isSingleLine = !codeStr.includes('\n')
-
-	return <button
-		className={`${isSingleLine ? '' : 'px-1 py-0.5'} text-sm bg-void-bg-1 text-void-fg-1 hover:brightness-110 border border-vscode-input-border rounded`}
+	return <IconShell1
+		Icon={copyButtonText === CopyButtonText.Copied ? Check : copyButtonText === CopyButtonText.Error ? X : Copy}
 		onClick={onCopy}
-	>
-		{copyButtonText}
-	</button>
+	/>
 }
 
 
-
-
-
 // state persisted for duration of react only
+// TODO change this to use type `ChatThreads.applyBoxState[applyBoxId]`
 const applyingURIOfApplyBoxIdRef: { current: { [applyBoxId: string]: URI | undefined } } = { current: {} }
 
 
 
-export const ApplyBlockHoverButtons = ({ codeStr, applyBoxId }: { codeStr: string, applyBoxId: string }) => {
 
-	console.log('applyboxid', applyBoxId, applyingURIOfApplyBoxIdRef)
+export const JumpToFileButton = ({ uri }: { uri: URI | 'current' }) => {
+	const accessor = useAccessor()
+	const commandService = accessor.get('ICommandService')
+
+	const jumpToFileButton = uri !== 'current' && (
+		<IconShell1
+			Icon={FileSymlink}
+			onClick={() => {
+				commandService.executeCommand('vscode.open', uri, { preview: true })
+			}}
+		/>
+	)
+
+	return jumpToFileButton
+}
+
+export const useApplyButtonHTML = ({ codeStr, applyBoxId, uri }: { codeStr: string, applyBoxId: string, uri: URI | 'current' }) => {
 
 	const settingsState = useSettingsState()
 	const isDisabled = !!isFeatureNameDisabled('Apply', settingsState) || !applyBoxId
 
 	const accessor = useAccessor()
 	const editCodeService = accessor.get('IEditCodeService')
+	const voidCommandBarService = accessor.get('IVoidCommandBarService')
 	const metricsService = accessor.get('IMetricsService')
 
 	const [_, rerender] = useState(0)
 
-	const applyingUri = useCallback(() => applyingURIOfApplyBoxIdRef.current[applyBoxId] ?? null, [applyBoxId])
-	const streamState = useCallback(() => editCodeService.getURIStreamState({ uri: applyingUri() }), [editCodeService, applyingUri])
+	const getUriBeingApplied = useCallback(() => {
+		return applyingURIOfApplyBoxIdRef.current[applyBoxId] ?? null
+	}, [applyBoxId])
 
-	// listen for stream updates
-	useURIStreamState(
-		useCallback((uri, newStreamState) => {
-			const shouldUpdate = applyingUri()?.fsPath !== uri.fsPath
-			if (shouldUpdate) return
-			rerender(c => c + 1)
-		}, [applyBoxId, editCodeService, applyingUri])
+	const getStreamState = useCallback(() => {
+		const uri = getUriBeingApplied()
+		if (!uri) return 'idle-no-changes'
+		return voidCommandBarService.getStreamState(uri)
+	}, [voidCommandBarService, getUriBeingApplied])
+
+	// listen for stream updates on this box
+
+
+	useCommandBarURIListener(useCallback((uri_) => {
+		const shouldUpdate = (
+			getUriBeingApplied()?.fsPath === uri_.fsPath
+			|| (uri !== 'current' && uri.fsPath === uri_.fsPath)
+		)
+		if (!shouldUpdate) return
+		rerender(c => c + 1)
+	}, [applyBoxId, editCodeService, getUriBeingApplied, uri])
 	)
 
-	const onSubmit = useCallback(() => {
+	const onClickSubmit = useCallback(async () => {
 		if (isDisabled) return
-		if (streamState() === 'streaming') return
-		const newApplyingUri = editCodeService.startApplying({
+		if (getStreamState() === 'streaming') return
+		const [newApplyingUri, applyDonePromise] = await editCodeService.startApplying({
 			from: 'ClickApply',
-			type: 'searchReplace',
 			applyStr: codeStr,
-			uri: 'current',
-		})
+			uri: uri,
+			startBehavior: 'keep-conflicts',
+		}) ?? []
+		// catch any errors by interrupting the stream
+		applyDonePromise?.catch(e => { if (newApplyingUri) editCodeService.interruptURIStreaming({ uri: newApplyingUri }) })
+
 		applyingURIOfApplyBoxIdRef.current[applyBoxId] = newApplyingUri ?? undefined
+
 		rerender(c => c + 1)
 		metricsService.capture('Apply Code', { length: codeStr.length }) // capture the length only
-	}, [isDisabled, streamState, editCodeService, codeStr, applyBoxId, metricsService])
+	}, [isDisabled, getStreamState, editCodeService, codeStr, uri, applyBoxId, metricsService])
 
 
 	const onInterrupt = useCallback(() => {
-		if (streamState() !== 'streaming') return
-		const uri = applyingUri()
+		if (getStreamState() !== 'streaming') return
+		const uri = getUriBeingApplied()
 		if (!uri) return
 
 		editCodeService.interruptURIStreaming({ uri })
 		metricsService.capture('Stop Apply', {})
-	}, [streamState, applyingUri, editCodeService, metricsService])
+	}, [getStreamState, getUriBeingApplied, editCodeService, metricsService])
+
+	const onAccept = useCallback(() => {
+		const uri = getUriBeingApplied()
+		if (uri) editCodeService.acceptOrRejectAllDiffAreas({ uri, behavior: 'accept', removeCtrlKs: false })
+	}, [getUriBeingApplied, editCodeService])
+
+	const onReject = useCallback(() => {
+		const uri = getUriBeingApplied()
+		if (uri) editCodeService.acceptOrRejectAllDiffAreas({ uri, behavior: 'reject', removeCtrlKs: false })
+	}, [getUriBeingApplied, editCodeService])
+
+	const onReapply = useCallback(() => {
+		onReject()
+		onClickSubmit()
+	}, [onReject, onClickSubmit])
+
+	const currStreamState = getStreamState()
+
+	const copyButton = (
+		<CopyButton codeStr={codeStr} />
+	)
+
+	const playButton = (
+		<IconShell1
+			Icon={Play}
+			onClick={onClickSubmit}
+		/>
+	)
+
+	const stopButton = (
+		<IconShell1
+			Icon={Square}
+			onClick={onInterrupt}
+		/>
+	)
+
+	const reapplyButton = (
+		<IconShell1
+			Icon={RotateCw}
+			onClick={onReapply}
+		/>
+	)
+
+	const acceptButton = (
+		<IconShell1
+			Icon={Check}
+			onClick={onAccept}
+			className="text-green-600"
+		/>
+	)
+
+	const rejectButton = (
+		<IconShell1
+			Icon={X}
+			onClick={onReject}
+			className="text-red-600"
+		/>
+	)
 
 
-	const isSingleLine = !codeStr.includes('\n')
 
-	const applyButton = <button
-		// btn btn-secondary btn-sm border text-sm border-vscode-input-border rounded
-		className={`${isSingleLine ? '' : 'px-1 py-0.5'} text-sm bg-void-bg-1 text-void-fg-1 hover:brightness-110 border border-vscode-input-border rounded`}
-		onClick={onSubmit}
-	>
-		Apply
-	</button>
+	let buttonsHTML = <></>
 
-	const stopButton = <button
-		// btn btn-secondary btn-sm border text-sm border-vscode-input-border rounded
-		className={`${isSingleLine ? '' : 'px-1 py-0.5'} text-sm bg-void-bg-1 text-void-fg-1 hover:brightness-110 border border-vscode-input-border rounded`}
-		onClick={onInterrupt}
-	>
-		Stop
-	</button>
+	if (currStreamState === 'streaming') {
+		buttonsHTML = <>
+			<JumpToFileButton uri={uri} />
+			{copyButton}
+			{stopButton}
+		</>
+	}
 
-	const acceptRejectButtons = <>
-		<button
-			// btn btn-secondary btn-sm border text-sm border-vscode-input-border rounded
-			className={`${isSingleLine ? '' : 'px-1 py-0.5'} text-sm bg-void-bg-1 text-void-fg-1 hover:brightness-110 border border-vscode-input-border rounded`}
-			onClick={() => {
-				const uri = applyingUri()
-				if (uri) editCodeService.removeDiffAreas({ uri, behavior: 'accept', removeCtrlKs: false })
-			}}
-		>
-			Accept
-		</button>
-		<button
-			// btn btn-secondary btn-sm border text-sm border-vscode-input-border rounded
-			className={`${isSingleLine ? '' : 'px-1 py-0.5'} text-sm bg-void-bg-1 text-void-fg-1 hover:brightness-110 border border-vscode-input-border rounded`}
-			onClick={() => {
-				const uri = applyingUri()
-				if (uri) editCodeService.removeDiffAreas({ uri, behavior: 'reject', removeCtrlKs: false })
-			}}
-		>
-			Reject
-		</button>
-	</>
+	if (currStreamState === 'idle-no-changes') {
+		buttonsHTML = <>
+			<JumpToFileButton uri={uri} />
+			{copyButton}
+			{playButton}
+		</>
+	}
 
-	console.log('streamStateRef.current', streamState())
+	if (currStreamState === 'idle-has-changes') {
+		buttonsHTML = <>
+			<JumpToFileButton uri={uri} />
+			{reapplyButton}
+			{rejectButton}
+			{acceptButton}
+		</>
+	}
+
+	const statusIndicatorHTML = <div className='flex flex-row items-center size-4'>
+		<div
+			className={` size-1.5 rounded-full border
+				 ${currStreamState === 'idle-no-changes' ? 'bg-void-bg-3 border-void-border-1' :
+					currStreamState === 'streaming' ? 'bg-orange-500 border-orange-500 shadow-[0_0_4px_0px_rgba(234,88,12,0.6)]' :
+						currStreamState === 'idle-has-changes' ? 'bg-green-500 border-green-500 shadow-[0_0_4px_0px_rgba(22,163,74,0.6)]' :
+							'bg-void-border-1 border-void-border-1'
+				}`
+			}
+		/>
+	</div>
+
+	return {
+		statusIndicatorHTML,
+		buttonsHTML,
+	}
+
+}
+
+
+
+
+
+export const BlockCodeApplyWrapper = ({
+	children,
+	initValue,
+	applyBoxId,
+	language,
+	canApply,
+	uri,
+}: {
+	initValue: string;
+	children: React.ReactNode;
+	applyBoxId: string;
+	canApply: boolean;
+	language: string;
+	uri: URI | 'current',
+}) => {
+
+	const { statusIndicatorHTML, buttonsHTML } = useApplyButtonHTML({ codeStr: initValue, applyBoxId, uri })
+	const accessor = useAccessor()
+	const commandService = accessor.get('ICommandService')
+
+	const name = uri !== 'current' ?
+		<ListableToolItem
+			name={<span className='not-italic'>{getBasename(uri.fsPath)}</span>}
+			isSmall={true}
+			showDot={false}
+			onClick={() => { commandService.executeCommand('vscode.open', uri, { preview: true }) }}
+		/>
+		: <span>{language}</span>
+
+
+	return <div className='border border-void-border-3 rounded overflow-hidden bg-void-bg-3 my-1'>
+		{/* header */}
+		<div className=" select-none flex justify-between items-center py-1 px-2 border-b border-void-border-3 cursor-default">
+			<div className="flex items-center">
+				{statusIndicatorHTML}
+				<span className="text-[13px] font-light text-void-fg-3">
+					{name}
+				</span>
+			</div>
+			<div className={`${canApply ? '' : 'hidden'} flex items-center gap-1`}>
+				{buttonsHTML}
+			</div>
+		</div>
+
+		{/* contents */}
+		<ToolChildrenWrapper>
+			{children}
+		</ToolChildrenWrapper>
+	</div>
 
-	const currStreamState = streamState()
-	return <>
-		{currStreamState !== 'streaming' && <CopyButton codeStr={codeStr} />}
-		{currStreamState === 'idle' && !isDisabled && applyButton}
-		{currStreamState === 'streaming' && stopButton}
-		{currStreamState === 'acceptRejectAll' && acceptRejectButtons}
-	</>
 }

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

@@ -1,29 +0,0 @@
-/*--------------------------------------------------------------------------------------
- *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
- *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
- *--------------------------------------------------------------------------------------*/
-
-import React from 'react';
-
-import { VoidCodeEditor, VoidCodeEditorProps } from '../util/inputs.js';
-
-
-export const BlockCode = ({ buttonsOnHover, ...codeEditorProps }: { buttonsOnHover?: React.ReactNode } & VoidCodeEditorProps) => {
-	const isSingleLine = !codeEditorProps.initValue.includes('\n')
-
-	return (
-		<>
-			<div className="relative group w-full overflow-hidden">
-				{buttonsOnHover === null ? null : (
-					<div className={`z-[1] absolute top-0 right-0 opacity-0 group-hover:opacity-100 duration-200 ${isSingleLine ? 'h-full flex items-center' : ''}`}>
-						<div className={`flex space-x-1 ${isSingleLine ? 'pr-2' : 'p-2'}`}>
-							{buttonsOnHover}
-						</div>
-					</div>
-				)}
-
-				<VoidCodeEditor {...codeEditorProps} />
-			</div>
-		</>
-	)
-}

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

@@ -3,92 +3,199 @@
  *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
  *--------------------------------------------------------------------------------------*/
 
-import React, { JSX } from 'react'
+import React, { JSX, useMemo, useState } from 'react'
 import { marked, MarkedToken, Token } from 'marked'
-import { BlockCode } from './BlockCode.js'
-import { nameToVscodeLanguage } from '../../../helpers/detectLanguage.js'
-import { ApplyBlockHoverButtons } from './ApplyBlockHoverButtons.js'
+
+import { convertToVscodeLang, detectLanguage } from '../../../../common/helpers/languageHelpers.js'
+import { BlockCodeApplyWrapper } from './ApplyBlockHoverButtons.js'
+import { useAccessor } from '../util/services.js'
+import { ScrollType } from '../../../../../../../editor/common/editorCommon.js'
+import { URI } from '../../../../../../../base/common/uri.js'
+import { isAbsolute } from '../../../../../../../base/common/path.js'
+import { separateOutFirstLine } from '../../../../common/helpers/util.js'
+import { BlockCode } from '../util/inputs.js'
+
 
 export type ChatMessageLocation = {
 	threadId: string;
 	messageIdx: number;
 }
 
-
 type ApplyBoxLocation = ChatMessageLocation & { tokenIdx: string }
 
-const getApplyBoxId = ({ threadId, messageIdx, tokenIdx }: ApplyBoxLocation) => {
+export const getApplyBoxId = ({ threadId, messageIdx, tokenIdx }: ApplyBoxLocation) => {
 	return `${threadId}-${messageIdx}-${tokenIdx}`
 }
 
-
-
-export const CodeSpan = ({ children, className }: { children: React.ReactNode, className?: string }) => {
-	return <code className={`
-			bg-void-bg-1
-			px-1
-			rounded-sm
-			font-mono font-medium
-			break-all
-			${className}
-		`}
-	>
-		{children}
-	</code>
+function isValidUri(s: string): boolean {
+	return s.length > 5 && isAbsolute(s) && !s.includes('//') && !s.includes('/*') // common case that is a false positive is comments like //
 }
 
-const RenderToken = ({ token, nested, noSpace, chatMessageLocationForApply, tokenIdx }: { token: Token | string, nested?: boolean, noSpace?: boolean, chatMessageLocationForApply?: ChatMessageLocation, tokenIdx: string }): JSX.Element => {
+const Codespan = ({ text, className, onClick }: { text: string, className?: string, onClick?: () => void }) => {
 
+	// TODO compute this once for efficiency. we should use `labels.ts/shorten` to display duplicates properly
+
+	return <code
+		className={`font-mono font-medium rounded-sm bg-void-bg-1 px-1 ${className}`}
+		onClick={onClick}
+	>
+		{text}
+	</code>
+
+}
+
+const CodespanWithLink = ({ text, rawText, chatMessageLocation }: { text: string, rawText: string, chatMessageLocation: ChatMessageLocation }) => {
+
+	const accessor = useAccessor()
+
+	const chatThreadService = accessor.get('IChatThreadService')
+	const commandService = accessor.get('ICommandService')
+	const editorService = accessor.get('ICodeEditorService')
+
+	const { messageIdx, threadId } = chatMessageLocation
+
+	const [didComputeCodespanLink, setDidComputeCodespanLink] = useState<boolean>(false)
+
+	let link = undefined
+	if (rawText.endsWith("`")) { // if codespan was completed
+
+		// get link from cache
+		link = chatThreadService.getCodespanLink({ codespanStr: text, messageIdx, threadId })
+
+		if (link === undefined) {
+			// if no link, generate link and add to cache
+			(chatThreadService.generateCodespanLink({ codespanStr: text, threadId })
+				.then(link => {
+					chatThreadService.addCodespanLink({ newLinkText: text, newLinkLocation: link, messageIdx, threadId })
+					setDidComputeCodespanLink(true) // rerender
+				})
+			)
+		}
+
+	}
+
+
+	const onClick = () => {
+
+		if (!link) return;
+		const selection = link.selection
+
+		// open the file
+		commandService.executeCommand('vscode.open', link.uri).then(() => {
+
+			// select the text
+			setTimeout(() => {
+				if (!selection) return;
+
+				const editor = editorService.getActiveCodeEditor()
+				if (!editor) return;
+
+				editor.setSelection(selection)
+				editor.revealRange(selection, ScrollType.Immediate)
+
+			}, 50) // needed when document was just opened and needs to initialize
+
+		})
+
+	}
+
+	return <Codespan
+		// text={link?.displayText || text}
+		text={link?.displayText || text}
+		onClick={onClick}
+		className={link ? 'underline hover:brightness-90 transition-all duration-200 cursor-pointer' : ''}
+	/>
+}
+
+
+export type RenderTokenOptions = { isApplyEnabled?: boolean, isLinkDetectionEnabled?: boolean }
+const RenderToken = ({ token, inPTag, codeURI, chatMessageLocation, tokenIdx, ...options }: { token: Token | string, inPTag?: boolean, codeURI?: URI, chatMessageLocation?: ChatMessageLocation, tokenIdx: string, } & RenderTokenOptions): React.ReactNode => {
+	const accessor = useAccessor()
+	const languageService = accessor.get('ILanguageService')
 
 	// deal with built-in tokens first (assume marked token)
 	const t = token as MarkedToken
 
+	if (t.raw.trim() === '') {
+		return null;
+	}
+
 	if (t.type === "space") {
 		return <span>{t.raw}</span>
 	}
 
 	if (t.type === "code") {
+		const [firstLine, remainingContents] = separateOutFirstLine(t.text)
+		const firstLineIsURI = isValidUri(firstLine) && !codeURI
+		const contents = firstLineIsURI ? (remainingContents?.trimStart() || '') : t.text // exclude first-line URI from contents
 
-		const applyBoxId = chatMessageLocationForApply ? getApplyBoxId({
-			threadId: chatMessageLocationForApply.threadId,
-			messageIdx: chatMessageLocationForApply.messageIdx,
-			tokenIdx: tokenIdx,
-		}) : null
+		if (!contents) return null
 
-		return <div className='my-4'>
-			<BlockCode
-			initValue={t.text}
-			language={t.lang === undefined ? undefined : nameToVscodeLanguage[t.lang]}
-			buttonsOnHover={applyBoxId && <ApplyBlockHoverButtons applyBoxId={applyBoxId} codeStr={t.text} />}
+		// figure out langauge and URI
+		let uri: URI | null
+		let language: string
+		if (codeURI) {
+			uri = codeURI
+		}
+		else if (firstLineIsURI) { // get lang from the uri in the first line of the markdown
+			uri = URI.file(firstLine)
+		}
+		else {
+			uri = null
+		}
+
+		if (t.lang) { // a language was provided. empty string is common so check truthy, not just undefined
+			language = convertToVscodeLang(languageService, t.lang) // convert markdown language to language that vscode recognizes (eg markdown doesn't know bash but it does know shell)
+		}
+		else { // no language provided - fallback - get lang from the uri and contents
+			language = detectLanguage(languageService, { uri, fileContents: contents })
+		}
+
+		if (options.isApplyEnabled && chatMessageLocation) {
+			const isCodeblockClosed = t.raw.trimEnd().endsWith('```') // user should only be able to Apply when the code has been closed (t.raw ends with "```")
+
+			const applyBoxId = getApplyBoxId({
+				threadId: chatMessageLocation.threadId,
+				messageIdx: chatMessageLocation.messageIdx,
+				tokenIdx: tokenIdx,
+			})
+			return <BlockCodeApplyWrapper
+				canApply={isCodeblockClosed}
+				applyBoxId={applyBoxId}
+				initValue={contents}
+				language={language}
+				uri={uri || 'current'}
+			>
+				<BlockCode
+					initValue={contents}
+					language={language}
+				/>
+			</BlockCodeApplyWrapper>
+		}
+
+		return <BlockCode
+			initValue={contents}
+			language={language}
 		/>
-		</div>
 	}
 
 	if (t.type === "heading") {
+
 		const HeadingTag = `h${t.depth}` as keyof JSX.IntrinsicElements
-		const headingClasses: { [h: string]: string } = {
-			h1: "text-4xl font-semibold mt-6 mb-4 pb-2 border-b border-void-bg-2",
-			h2: "text-3xl font-semibold mt-6 mb-4 pb-2 border-b border-void-bg-2",
-			h3: "text-2xl font-semibold mt-6 mb-4",
-			h4: "text-xl font-semibold mt-6 mb-4",
-			h5: "text-lg font-semibold mt-6 mb-4",
-			h6: "text-base font-semibold mt-6 mb-4 text-gray-600"
-		}
-		return <HeadingTag className={headingClasses[HeadingTag]}>{t.text}</HeadingTag>
+
+		return <HeadingTag>
+			<ChatMarkdownRender chatMessageLocation={chatMessageLocation} string={t.text} inPTag={true} codeURI={codeURI} {...options} />
+		</HeadingTag>
 	}
 
 	if (t.type === "table") {
 		return (
-			<div className={`${noSpace ? '' : 'my-4'} overflow-x-auto`}>
-				<table className="min-w-full border border-void-bg-2">
+			<div>
+				<table>
 					<thead>
-						<tr className="bg-void-bg-1">
+						<tr>
 							{t.header.map((cell: any, index: number) => (
-								<th
-									key={index}
-									className="px-4 py-2 border border-void-bg-2 font-semibold"
-									style={{ textAlign: t.align[index] || "left" }}
-								>
+								<th key={index}>
 									{cell.raw}
 								</th>
 							))}
@@ -96,13 +203,9 @@ const RenderToken = ({ token, nested, noSpace, chatMessageLocationForApply, toke
 					</thead>
 					<tbody>
 						{t.rows.map((row: any[], rowIndex: number) => (
-							<tr key={rowIndex} className={rowIndex % 2 === 0 ? 'bg-white' : 'bg-void-bg-1'}>
+							<tr key={rowIndex}>
 								{row.map((cell: any, cellIndex: number) => (
-									<td
-										key={cellIndex}
-										className="px-4 py-2 border border-void-bg-2"
-										style={{ textAlign: t.align[cellIndex] || "left" }}
-									>
+									<td key={cellIndex} >
 										{cell.raw}
 									</td>
 								))}
@@ -112,74 +215,99 @@ const RenderToken = ({ token, nested, noSpace, chatMessageLocationForApply, toke
 				</table>
 			</div>
 		)
+		// return (
+		// 	<div>
+		// 		<table className={"min-w-full border border-void-bg-2"}>
+		// 			<thead>
+		// 				<tr className="bg-void-bg-1">
+		// 					{t.header.map((cell: any, index: number) => (
+		// 						<th
+		// 							key={index}
+		// 							className="px-4 py-2 border border-void-bg-2 font-semibold"
+		// 							style={{ textAlign: t.align[index] || "left" }}
+		// 						>
+		// 							{cell.raw}
+		// 						</th>
+		// 					))}
+		// 				</tr>
+		// 			</thead>
+		// 			<tbody>
+		// 				{t.rows.map((row: any[], rowIndex: number) => (
+		// 					<tr key={rowIndex} className={rowIndex % 2 === 0 ? 'bg-white' : 'bg-void-bg-1'}>
+		// 						{row.map((cell: any, cellIndex: number) => (
+		// 							<td
+		// 								key={cellIndex}
+		// 								className={"px-4 py-2 border border-void-bg-2"}
+		// 								style={{ textAlign: t.align[cellIndex] || "left" }}
+		// 							>
+		// 								{cell.raw}
+		// 							</td>
+		// 						))}
+		// 					</tr>
+		// 				))}
+		// 			</tbody>
+		// 		</table>
+		// 	</div>
+		// )
 	}
 
 	if (t.type === "hr") {
-		return <hr className="my-6 border-t border-void-bg-2" />
+		return <hr />
 	}
 
 	if (t.type === "blockquote") {
-		return <blockquote className={`pl-4 border-l-4 border-void-bg-2 italic ${noSpace ? '' : 'my-4'}`}>{t.text}</blockquote>
+		return <blockquote>{t.text}</blockquote>
+	}
+
+	if (t.type === 'list_item') {
+		return <li>
+			<input type="checkbox" checked={t.checked} readOnly />
+			<span>
+				<ChatMarkdownRender chatMessageLocation={chatMessageLocation} string={t.text} inPTag={true} codeURI={codeURI} {...options} />
+			</span>
+		</li>
 	}
 
 	if (t.type === "list") {
 		const ListTag = t.ordered ? "ol" : "ul"
+
 		return (
-			<ListTag
-				start={t.start ? t.start : undefined}
-				className={`list-inside pl-2 ${noSpace ? '' : 'my-4'} ${t.ordered ? "list-decimal" : "list-disc"}`}
-			>
+			<ListTag start={t.start ? t.start : undefined}>
 				{t.items.map((item, index) => (
-					<li key={index} className={`${noSpace ? '' : 'mb-4'}`}>
+					<li key={index}>
 						{item.task && (
-							<input type="checkbox" checked={item.checked} readOnly className="mr-2 form-checkbox" />
+							<input type="checkbox" checked={item.checked} readOnly />
 						)}
-						<span className="ml-1">
-							<ChatMarkdownRender chatMessageLocationForApply={chatMessageLocationForApply} string={item.text} nested={true} />
+						<span>
+							<ChatMarkdownRender chatMessageLocation={chatMessageLocation} string={item.text} inPTag={true} {...options} />
 						</span>
 					</li>
 				))}
 			</ListTag>
 		)
-		// attempt at indentation
-		// return (
-		// 	<ListTag
-		// 		start={t.start ? t.start : undefined}
-		// 			className={`pl-2 ${noSpace ? '' : 'my-4'} ${t.ordered ? "list-decimal" : "list-disc"}`}
-		// 		>
-		// 		{t.items.map((item, index) => (
-		// 			<li key={index} className={`${noSpace ? '' : 'mb-2'} ml-4`}>
-		// 				{item.task && (
-		// 					<input type="checkbox" className='mr-2 form-checkbox' checked={item.checked} readOnly />
-		// 				)}
-		// 				<span className-='inline-block pr-2'>
-		// 					<ChatMarkdownRender chatMessageLocation={chatMessageLocation} string={item.text} nested={true} />
-		// 				</span>
-		// 			</li>
-		// 		))}
-		// 	</ListTag>
-		// )
 	}
 
 	if (t.type === "paragraph") {
 		const contents = <>
 			{t.tokens.map((token, index) => (
-				<RenderToken key={index} token={token} tokenIdx={`${tokenIdx ? `${tokenIdx}-` : ''}${index}`} /> // assign a unique tokenId to nested components
+				<RenderToken key={index}
+					token={token}
+					tokenIdx={`${tokenIdx ? `${tokenIdx}-` : ''}${index}`} // assign a unique tokenId to inPTag components
+					chatMessageLocation={chatMessageLocation}
+					inPTag={true}
+					{...options}
+				/>
 			))}
 		</>
-		if (nested) return contents
 
-		return <p className={`${noSpace ? '' : 'my-4'}`}>
-			{contents}
-		</p>
+		if (inPTag) return <span className='block'>{contents}</span>
+		return <p>{contents}</p>
 	}
 
 	if (t.type === "html") {
-		return (
-			<p className={`${noSpace ? '' : 'my-4'}`}>
-				{t.raw}
-			</p>
-		)
+		const contents = t.raw
+		if (inPTag) return <span className='block'>{contents}</span>
+		return <p>{contents}</p>
 	}
 
 	if (t.type === "text" || t.type === "escape") {
@@ -193,10 +321,10 @@ const RenderToken = ({ token, nested, noSpace, chatMessageLocationForApply, toke
 	if (t.type === "link") {
 		return (
 			<a
-				className='underline'
 				onClick={() => { window.open(t.href) }}
 				href={t.href}
 				title={t.title ?? undefined}
+				className='underline cursor-pointer hover:brightness-90 transition-all duration-200'
 			>
 				{t.text}
 			</a>
@@ -208,25 +336,31 @@ const RenderToken = ({ token, nested, noSpace, chatMessageLocationForApply, toke
 			src={t.href}
 			alt={t.text}
 			title={t.title ?? undefined}
-			className={`max4w-full h-auto rounded ${noSpace ? '' : 'my-4'}`}
+
 		/>
 	}
 
 	if (t.type === "strong") {
-		return <strong className="font-semibold">{t.text}</strong>
+		return <strong>{t.text}</strong>
 	}
 
 	if (t.type === "em") {
-		return <em className="italic">{t.text}</em>
+		return <em>{t.text}</em>
 	}
 
 	// inline code
 	if (t.type === "codespan") {
-		return (
-			<CodeSpan>
-				{t.text}
-			</CodeSpan>
-		)
+
+		if (options.isLinkDetectionEnabled && chatMessageLocation) {
+			return <CodespanWithLink
+				text={t.text}
+				rawText={t.raw}
+				chatMessageLocation={chatMessageLocation}
+			/>
+
+		}
+
+		return <Codespan text={t.text} />
 	}
 
 	if (t.type === "br") {
@@ -235,24 +369,23 @@ const RenderToken = ({ token, nested, noSpace, chatMessageLocationForApply, toke
 
 	// strikethrough
 	if (t.type === "del") {
-		return <del className="line-through">{t.text}</del>
+		return <del>{t.text}</del>
 	}
-
 	// default
 	return (
 		<div className="bg-orange-50 rounded-sm overflow-hidden p-2">
-			<span className="text-sm text-orange-500">Unknown type:</span>
-			{t.raw}
+			<span className="text-sm text-orange-500">Unknown token rendered...</span>
 		</div>
 	)
 }
 
-export const ChatMarkdownRender = ({ string, nested = false, noSpace, chatMessageLocationForApply }: { string: string, nested?: boolean, noSpace?: boolean, chatMessageLocationForApply?: ChatMessageLocation }) => {
+
+export const ChatMarkdownRender = ({ string, inPTag = false, chatMessageLocation, ...options }: { string: string, inPTag?: boolean, codeURI?: URI, chatMessageLocation: ChatMessageLocation | undefined } & RenderTokenOptions) => {
 	const tokens = marked.lexer(string); // https://marked.js.org/using_pro#renderer
 	return (
 		<>
 			{tokens.map((token, index) => (
-				<RenderToken key={index} token={token} nested={nested} noSpace={noSpace} chatMessageLocationForApply={chatMessageLocationForApply} tokenIdx={index + ''} />
+				<RenderToken key={index} token={token} inPTag={inPTag} chatMessageLocation={chatMessageLocation} tokenIdx={index + ''} {...options} />
 			))}
 		</>
 	)

src/vs/workbench/contrib/void/browser/react/src/quick-edit-tsx/QuickEditChat.tsx

@@ -3,12 +3,11 @@
  *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
  *--------------------------------------------------------------------------------------*/
 
-import React, { FormEvent, useCallback, useEffect, useRef, useState } from 'react';
-import { useSettingsState, useSidebarState, useChatThreadsState, useQuickEditState, useAccessor, useCtrlKZoneStreamingState } from '../util/services.js';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { useSettingsState, useAccessor, useCtrlKZoneStreamingState } from '../util/services.js';
 import { TextAreaFns, VoidInputBox2 } from '../util/inputs.js';
 import { QuickEditPropsType } from '../../../quickEditActions.js';
 import { ButtonStop, ButtonSubmit, IconX, VoidChatArea } from '../sidebar-tsx/SidebarChat.js';
-import { ModelDropdown } from '../void-settings-tsx/ModelDropdown.js';
 import { VOID_CTRL_K_ACTION_ID } from '../../../actionIDs.js';
 import { useRefState } from '../util/helpers.js';
 import { useScrollbarStyles } from '../util/useScrollbarStyles.js';
@@ -55,17 +54,24 @@ export const QuickEditChat = ({
 		setIsStreamingRef(isStreaming)
 	}, [diffareaid, setIsStreamingRef]))
 
+	const loadingIcon = <div
+		className="@@codicon @@codicon-loading @@codicon-modifier-spin @@codicon-no-default-spin text-void-fg-3"
+	/>
 
-	const onSubmit = useCallback(() => {
+	const onSubmit = useCallback(async () => {
 		if (isDisabled) return
 		if (isStreamingRef.current) return
 		textAreaFnsRef.current?.disable()
 
-		editCodeService.startApplying({
+		const [newApplyingUri, applyDonePromise] = await editCodeService.startApplying({
 			from: 'QuickEdit',
-			type: 'rewrite',
 			diffareaid,
-		})
+			startBehavior: 'keep-conflicts',
+		}) ?? []
+		// catch any errors by interrupting the stream
+		applyDonePromise?.catch(e => { if (newApplyingUri) editCodeService.interruptCtrlKStreaming({ diffareaid }) })
+
+
 	}, [isStreamingRef, isDisabled, editCodeService, diffareaid])
 
 	const onInterrupt = useCallback(() => {
@@ -87,14 +93,14 @@ export const QuickEditChat = ({
 	const chatAreaRef = useRef<HTMLDivElement | null>(null)
 	return <div ref={sizerRef} style={{ maxWidth: 450 }} className={`py-2 w-full`}>
 		<VoidChatArea
+			featureName='Ctrl+K'
 			divRef={chatAreaRef}
 			onSubmit={onSubmit}
 			onAbort={onInterrupt}
 			onClose={onX}
 			isStreaming={isStreamingRef.current}
+			loadingIcon={loadingIcon}
 			isDisabled={isDisabled}
-			featureName="Ctrl+K"
-			className="py-2 w-full"
 			onClickAnywhere={() => { textAreaRef.current?.focus() }}
 		>
 			<VoidInputBox2

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

@@ -5,8 +5,8 @@
 
 import React, { useEffect, useState } from 'react';
 import { AlertCircle, ChevronDown, ChevronUp, X } from 'lucide-react';
-import { errorDetails } from '../../../../../../../workbench/contrib/void/common/llmMessageTypes.js';
 import { useSettingsState } from '../util/services.js';
+import { errorDetails } from '../../../../common/sendLLMMessageTypes.js';
 
 
 export const ErrorDisplay = ({

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

@@ -2,11 +2,6 @@
  *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
  *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
  *--------------------------------------------------------------------------------------*/
-import React, { useEffect, useState } from 'react'
-import { mountFnGenerator } from '../util/mountFnGenerator.js'
-
-// import { SidebarSettings } from './SidebarSettings.js';
-
 
 import { useIsDark, useSidebarState } from '../util/services.js';
 // import { SidebarThreadSelector } from './SidebarThreadSelector.js';
@@ -20,9 +15,9 @@ export const Sidebar = ({ className }: { className: string }) => {
 	const sidebarState = useSidebarState()
 	const { currentTab: tab } = sidebarState
 
-	// const isDark = useIsDark()
+	const isDark = useIsDark()
 	return <div
-		className={`@@void-scope`} 	// ${isDark ? 'dark' : ''}
+		className={`@@void-scope ${isDark ? 'dark' : ''}`}
 		style={{ width: '100%', height: '100%' }}
 	>
 		<div

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

@@ -29,11 +29,11 @@ export const SidebarThreadSelector = () => {
 
 	// sorted by most recent to least recent
 	const sortedThreadIds = Object.keys(allThreads ?? {})
-		.sort((threadId1, threadId2) => allThreads![threadId1].lastModified > allThreads![threadId2].lastModified ? -1 : 1)
-		.filter(threadId => allThreads![threadId].messages.length !== 0)
+		.sort((threadId1, threadId2) => (allThreads[threadId1]?.lastModified ?? 0) > (allThreads[threadId2]?.lastModified ?? 0) ? -1 : 1)
+		.filter(threadId => (allThreads![threadId]?.messages.length ?? 0) !== 0)
 
 	return (
-		<div className="flex p-2 flex-col gap-y-1 max-h-[400px] overflow-y-auto">
+		<div className="flex p-2 flex-col gap-y-1 max-h-[200px] overflow-y-auto">
 
 			<div className="w-full relative flex justify-center items-center">
 				{/* title */}
@@ -63,14 +63,16 @@ export const SidebarThreadSelector = () => {
 							if (!allThreads) {
 								return <li key="error" className="text-void-warning">{`Error accessing chat history.`}</li>;
 							}
-
 							const pastThread = allThreads[threadId];
+							if (!pastThread) {
+								return <li key="error" className="text-void-warning">{`Error accessing chat history.`}</li>;
+							}
+
+
 							let firstMsg = null;
 							// let secondMsg = null;
 
-							const firstUserMsgIdx = pastThread.messages.findIndex(
-								(msg) => msg.role !== 'system' && msg.role !== 'tool' && !!msg.displayContent
-							);
+							const firstUserMsgIdx = pastThread.messages.findIndex((msg) => msg.role !== 'tool' && msg.role !== 'tool_request');
 
 							if (firstUserMsgIdx !== -1) {
 								// firstMsg = truncate(pastThread.messages[firstMsgIdx].displayContent ?? '');
@@ -88,9 +90,7 @@ export const SidebarThreadSelector = () => {
 							// 	secondMsg = truncate(pastThread.messages[secondMsgIdx].displayContent ?? '');
 							// }
 
-							const numMessages = pastThread.messages.filter(
-								(msg) => msg.role !== 'system'
-							).length;
+							const numMessages = pastThread.messages.filter((msg) => msg.role !== 'tool_request').length;
 
 							return (
 								<li key={pastThread.id}>
@@ -106,7 +106,7 @@ export const SidebarThreadSelector = () => {
 									`}
 										onClick={() => chatThreadsService.switchToThread(pastThread.id)}
 										onDoubleClick={() => sidebarStateService.setState({ isHistoryOpen: false })}
-										title={new Date(pastThread.createdAt).toLocaleString()}
+										title={new Date(pastThread.lastModified).toLocaleString()}
 									>
 										<div className='truncate'>{`${firstMsg}`}</div>
 										<div>{`\u00A0(${numMessages})`}</div>

src/vs/workbench/contrib/void/browser/react/src/styles.css

@@ -7,6 +7,30 @@
 @tailwind components;
 @tailwind utilities;
 
+& {
+	--void-bg-1: var(--vscode-input-background);
+	--void-bg-1-alt: var(--vscode-badge-background);
+	--void-bg-2: var(--vscode-sideBar-background);
+	--void-bg-2-alt: color-mix(in srgb, var(--vscode-sideBar-background) 30%, var(--vscode-editor-background) 70%);
+	--void-bg-3: var(--vscode-editor-background);
+
+	--void-fg-0: color-mix(in srgb, var(--vscode-tab-activeForeground) 90%, black 10%);
+	--void-fg-1: var(--vscode-editor-foreground);
+	--void-fg-2: var(--vscode-input-foreground);
+	--void-fg-3: var(--vscode-input-placeholderForeground);
+	/* --void-fg-4: var(--vscode-tab-inactiveForeground); */
+	--void-fg-4: var(--vscode-list-deemphasizedForeground);
+
+	--void-warning: var(--vscode-charts-yellow);
+
+	--void-border-1: var(--vscode-commandCenter-activeBorder);
+	--void-border-2: var(--vscode-commandCenter-border);
+	--void-border-3: var(--vscode-commandCenter-inactiveBorder);
+	--void-border-4: var(--vscode-editorGroup-border);
+
+	--void-ring-color: #007FD4;
+	--void-link-color: #007FD4;
+}
 
 .select-child-restyle select {
 	text-overflow: ellipsis;
@@ -14,6 +38,10 @@
 	padding-right: 24px;
 }
 
+.void-force-child-placeholder-void-fg-1 ::placeholder {
+	color: var(--void-fg-3);
+}
+
 * {
 	outline: none !important;
 }

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

@@ -1,4 +1,4 @@
-import { useCallback, useRef, useState } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
 
 
 
@@ -17,3 +17,12 @@ export const useRefState = <T,>(initVal: T): ReturnType<T> => {
 	}, [])
 	return [ref, setState]
 }
+
+
+export const usePromise = <T,>(promise: Promise<T>): T | undefined => {
+	const [val, setVal] = useState<T | undefined>(undefined)
+	useEffect(() => {
+		promise.then((v) => setVal(v))
+	}, [promise])
+	return val
+}

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

@@ -169,7 +169,7 @@ export const VoidInputBox = ({ onChangeText, onCreateInstance, inputBoxRef, plac
 		ctor={InputBox}
 		className='
 			bg-void-bg-1
-			@@[&_::placeholder]:!void-text-void-fg-3
+			@@void-force-child-placeholder-void-fg-1
 		'
 		propsFn={useCallback((container) => [
 			container,
@@ -214,27 +214,188 @@ export const VoidInputBox = ({ onChangeText, onCreateInstance, inputBoxRef, plac
 
 
 
+
+export const VoidSlider = ({
+	value,
+	onChange,
+	size = 'md',
+	disabled = false,
+	min = 0,
+	max = 7,
+	step = 1,
+	className = '',
+	width = 200,
+}: {
+	value: number;
+	onChange: (value: number) => void;
+	disabled?: boolean;
+	size?: 'xxs' | 'xs' | 'sm' | 'sm+' | 'md';
+	min?: number;
+	max?: number;
+	step?: number;
+	className?: string;
+	width?: number;
+}) => {
+	// Calculate percentage for position
+	const percentage = ((value - min) / (max - min)) * 100;
+
+	// Handle track click
+	const handleTrackClick = (e: React.MouseEvent<HTMLDivElement>) => {
+		if (disabled) return;
+
+		const rect = e.currentTarget.getBoundingClientRect();
+		const clickPosition = e.clientX - rect.left;
+		const trackWidth = rect.width;
+
+		// Calculate new value
+		const newPercentage = Math.max(0, Math.min(1, clickPosition / trackWidth));
+		const rawValue = min + newPercentage * (max - min);
+
+		// Special handling to ensure max value is always reachable
+		if (rawValue >= max - step / 2) {
+			onChange(max);
+			return;
+		}
+
+		// Normal step calculation
+		const steppedValue = Math.round((rawValue - min) / step) * step + min;
+		const clampedValue = Math.max(min, Math.min(max, steppedValue));
+
+		onChange(clampedValue);
+	};
+
+	// Helper function to handle thumb dragging that respects steps and max
+	const handleThumbDrag = (moveEvent: MouseEvent, track: Element) => {
+		if (!track) return;
+
+		const rect = (track as HTMLElement).getBoundingClientRect();
+		const movePosition = moveEvent.clientX - rect.left;
+		const trackWidth = rect.width;
+
+		// Calculate new value
+		const newPercentage = Math.max(0, Math.min(1, movePosition / trackWidth));
+		const rawValue = min + newPercentage * (max - min);
+
+		// Special handling to ensure max value is always reachable
+		if (rawValue >= max - step / 2) {
+			onChange(max);
+			return;
+		}
+
+		// Normal step calculation
+		const steppedValue = Math.round((rawValue - min) / step) * step + min;
+		const clampedValue = Math.max(min, Math.min(max, steppedValue));
+
+		onChange(clampedValue);
+	};
+
+	return (
+		<div className={`inline-flex items-center flex-shrink-0 ${className}`}>
+			{/* Outer container with padding to account for thumb overhang */}
+			<div className={`relative flex-shrink-0 ${disabled ? 'opacity-25' : ''}`}
+				style={{
+					width,
+					// Add horizontal padding equal to half the thumb width
+					// paddingLeft: thumbSizePx / 2,
+					// paddingRight: thumbSizePx / 2
+				}}>
+				{/* Track container with adjusted width */}
+				<div className="relative w-full">
+					{/* Invisible wider clickable area that sits above the track */}
+					<div
+						className="absolute w-full cursor-pointer"
+						style={{
+							height: '16px',
+							top: '50%',
+							transform: 'translateY(-50%)',
+							zIndex: 1
+						}}
+						onClick={handleTrackClick}
+					/>
+
+					{/* Track */}
+					<div
+						className={`relative ${size === 'xxs' ? 'h-0.5' :
+							size === 'xs' ? 'h-1' :
+								size === 'sm' ? 'h-1.5' :
+									size === 'sm+' ? 'h-2' : 'h-2.5'
+							} bg-gray-200 dark:bg-gray-700 rounded-full cursor-pointer`}
+						onClick={handleTrackClick}
+					>
+						{/* Filled part of track */}
+						<div
+							className={`absolute left-0 ${size === 'xxs' ? 'h-0.5' :
+								size === 'xs' ? 'h-1' :
+									size === 'sm' ? 'h-1.5' :
+										size === 'sm+' ? 'h-2' : 'h-2.5'
+								} bg-gray-900 dark:bg-white rounded-full`}
+							style={{ width: `${percentage}%` }}
+						/>
+					</div>
+
+					{/* Thumb with sizes matching VoidSwitch */}
+					<div
+						className={`absolute top-1/2 transform -translate-x-1/2 -translate-y-1/2
+							${size === 'xxs' ? 'h-2 w-2' :
+								size === 'xs' ? 'h-2.5 w-2.5' :
+									size === 'sm' ? 'h-3 w-3' :
+										size === 'sm+' ? 'h-3.5 w-3.5' : 'h-4 w-4'
+							}
+							bg-white dark:bg-gray-900 rounded-full shadow-md ${disabled ? 'cursor-not-allowed' : 'cursor-grab active:cursor-grabbing'}`}
+						style={{ left: `${percentage}%`, zIndex: 2 }}  // Ensure thumb is above the invisible clickable area
+						onMouseDown={(e) => {
+							if (disabled) return;
+
+							const track = e.currentTarget.previousElementSibling;
+
+							const handleMouseMove = (moveEvent: MouseEvent) => {
+								handleThumbDrag(moveEvent, track as Element);
+							};
+
+							const handleMouseUp = () => {
+								document.removeEventListener('mousemove', handleMouseMove);
+								document.removeEventListener('mouseup', handleMouseUp);
+								document.body.style.cursor = '';
+								document.body.style.userSelect = '';
+							};
+
+							document.body.style.userSelect = 'none';
+							document.body.style.cursor = 'grabbing';
+							document.addEventListener('mousemove', handleMouseMove);
+							document.addEventListener('mouseup', handleMouseUp);
+
+							e.preventDefault();
+						}}
+					/>
+				</div>
+			</div>
+		</div>
+	);
+};
+
+
+
 export const VoidSwitch = ({
 	value,
 	onChange,
 	size = 'md',
-	label,
 	disabled = false,
 }: {
 	value: boolean;
 	onChange: (value: boolean) => void;
-	label?: string;
 	disabled?: boolean;
-	size?: 'xs' | 'sm' | 'sm+' | 'md';
+	size?: 'xxs' | 'xs' | 'sm' | 'sm+' | 'md';
 }) => {
 	return (
-		<label className="inline-flex items-center cursor-pointer">
+		<label className="inline-flex items-center">
 			<div
 				onClick={() => !disabled && onChange(!value)}
 				className={`
+			cursor-pointer
 			relative inline-flex items-center rounded-full transition-colors duration-200 ease-in-out
 			${value ? 'bg-gray-900 dark:bg-white' : 'bg-gray-200 dark:bg-gray-700'}
 			${disabled ? 'opacity-25' : ''}
+			${size === 'xxs' ? 'h-3 w-5' : ''}
 			${size === 'xs' ? 'h-4 w-7' : ''}
 			${size === 'sm' ? 'h-5 w-9' : ''}
 			${size === 'sm+' ? 'h-5 w-10' : ''}
@@ -244,10 +405,12 @@ export const VoidSwitch = ({
 				<span
 					className={`
 			  inline-block transform rounded-full bg-white dark:bg-gray-900 shadow transition-transform duration-200 ease-in-out
+			  ${size === 'xxs' ? 'h-2 w-2' : ''}
 			  ${size === 'xs' ? 'h-2.5 w-2.5' : ''}
 			  ${size === 'sm' ? 'h-3 w-3' : ''}
 			  ${size === 'sm+' ? 'h-3.5 w-3.5' : ''}
 			  ${size === 'md' ? 'h-4 w-4' : ''}
+			  ${size === 'xxs' ? (value ? 'translate-x-2.5' : 'translate-x-0.5') : ''}
 			  ${size === 'xs' ? (value ? 'translate-x-3.5' : 'translate-x-0.5') : ''}
 			  ${size === 'sm' ? (value ? 'translate-x-5' : 'translate-x-1') : ''}
 			  ${size === 'sm+' ? (value ? 'translate-x-6' : 'translate-x-1') : ''}
@@ -255,14 +418,6 @@ export const VoidSwitch = ({
 			`}
 				/>
 			</div>
-			{label && (
-				<span className={`
-			ml-3 font-medium text-gray-900 dark:text-gray-100
-			${size === 'xs' ? 'text-xs' : 'text-sm'}
-		  `}>
-					{label}
-				</span>
-			)}
 		</label>
 	);
 };
@@ -305,7 +460,7 @@ export const VoidCheckBox = ({ label, value, onClick, className }: { label: stri
 
 
 
-export const VoidCustomDropdownBox = <T extends any>({
+export const VoidCustomDropdownBox = <T extends NonNullable<any>>({
 	options,
 	selectedOption,
 	onChangeOption,
@@ -316,7 +471,8 @@ export const VoidCustomDropdownBox = <T extends any>({
 	className,
 	arrowTouchesText = true,
 	matchInputWidth = false,
-	gap = 0,
+	gapPx = 0,
+	offsetPx = -6,
 }: {
 	options: T[];
 	selectedOption: T | undefined;
@@ -328,7 +484,8 @@ export const VoidCustomDropdownBox = <T extends any>({
 	className?: string;
 	arrowTouchesText?: boolean;
 	matchInputWidth?: boolean;
-	gap?: number;
+	gapPx?: number;
+	offsetPx?: number;
 }) => {
 	const [isOpen, setIsOpen] = useState(false);
 	const measureRef = useRef<HTMLDivElement>(null);
@@ -347,7 +504,7 @@ export const VoidCustomDropdownBox = <T extends any>({
 		placement: 'bottom-start',
 
 		middleware: [
-			offset(gap),
+			offset({ mainAxis: gapPx, crossAxis: offsetPx }),
 			flip({
 				boundary: document.body,
 				padding: 8
@@ -382,7 +539,7 @@ export const VoidCustomDropdownBox = <T extends any>({
 	// if the selected option is null, set the selection to the 0th option
 	useEffect(() => {
 		if (options.length === 0) return
-		if (selectedOption) return
+		if (selectedOption !== undefined) return
 		onChangeOption(options[0])
 	}, [selectedOption, onChangeOption, options])
 
@@ -411,7 +568,7 @@ export const VoidCustomDropdownBox = <T extends any>({
 		return () => document.removeEventListener('mousedown', handleClickOutside);
 	}, [isOpen, refs.floating, refs.reference]);
 
-	if (!selectedOption)
+	if (selectedOption === undefined)
 		return null
 
 	return (
@@ -630,8 +787,8 @@ const normalizeIndentation = (code: string): string => {
 
 
 const modelOfEditorId: { [id: string]: ITextModel | undefined } = {}
-export type VoidCodeEditorProps = { initValue: string, language?: string, maxHeight?: number, showScrollbars?: boolean }
-export const VoidCodeEditor = ({ initValue, language, maxHeight, showScrollbars }: VoidCodeEditorProps) => {
+export type BlockCodeProps = { initValue: string, language?: string, maxHeight?: number, showScrollbars?: boolean }
+export const BlockCode = ({ initValue, language, maxHeight, showScrollbars }: BlockCodeProps) => {
 
 	initValue = normalizeIndentation(initValue)
 
@@ -646,7 +803,6 @@ export const VoidCodeEditor = ({ initValue, language, maxHeight, showScrollbars
 	// const languageDetectionService = accessor.get('ILanguageDetectionService')
 	const modelService = accessor.get('IModelService')
 
-
 	const id = useId()
 
 	// these are used to pass to the model creation of modelRef
@@ -727,9 +883,11 @@ export const VoidCodeEditor = ({ initValue, language, maxHeight, showScrollbars
 			}, [instantiationService])}
 
 			onCreateInstance={useCallback((editor: CodeEditorWidget) => {
+				const languageId = languageRef.current ? languageRef.current : 'plaintext'
+
 				const model = modelOfEditorId[id] ?? modelService.createModel(
-					initValueRef.current + '\n', {
-					languageId: languageRef.current ? languageRef.current : 'typescript',
+					initValueRef.current, {
+					languageId: languageId,
 					onDidChange: (e) => { return { dispose: () => { } } } // no idea why they'd require this
 				})
 				modelRef.current = model
@@ -766,7 +924,7 @@ export const VoidCodeEditor = ({ initValue, language, maxHeight, showScrollbars
 
 export const VoidButton = ({ children, disabled, onClick }: { children: React.ReactNode; disabled?: boolean; onClick: () => void }) => {
 	return <button disabled={disabled}
-		className='px-3 py-1 bg-black/10 dark:bg-gray-200/10 rounded-sm overflow-hidden'
+		className='px-3 py-1 bg-black/10 dark:bg-gray-200/10 rounded-sm overflow-hidden whitespace-nowrap'
 		onClick={onClick}
 	>{children}</button>
 }

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

@@ -18,9 +18,21 @@ export const mountFnGenerator = (Component: (params: any) => React.ReactNode) =>
 
 	const disposables = _registerServices(accessor)
 
-
 	const root = ReactDOM.createRoot(rootElement)
-	root.render(<Component {...props} />); // tailwind dark theme indicator
 
-	return disposables
+	const rerender = (props?: any) => {
+		root.render(<Component {...props} />); // tailwind dark theme indicator
+	}
+	const dispose = () => {
+		root.unmount();
+		disposables.forEach(d => d.dispose());
+	}
+
+	rerender(props)
+
+	const returnVal = {
+		rerender,
+		dispose,
+	}
+	return returnVal
 }

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

@@ -4,14 +4,11 @@
  *--------------------------------------------------------------------------------------*/
 
 import React, { useState, useEffect, useCallback } from 'react'
-import { ThreadStreamState,IChatThreadService, ThreadsState } from '../../../../common/chatThreadService.js'
 import { RefreshableProviderName, SettingsOfProvider } from '../../../../../../../workbench/contrib/void/common/voidSettingsTypes.js'
 import { IDisposable } from '../../../../../../../base/common/lifecycle.js'
 import { VoidSidebarState } from '../../../sidebarStateService.js'
 import { VoidSettingsState } from '../../../../../../../workbench/contrib/void/common/voidSettingsService.js'
 import { ColorScheme } from '../../../../../../../platform/theme/common/theme.js'
-import { VoidUriState } from '../../../voidUriStateService.js';
-import { VoidQuickEditState } from '../../../quickEditStateService.js'
 import { RefreshModelStateOfProvider } from '../../../../../../../workbench/contrib/void/common/refreshModelService.js'
 
 import { ServicesAccessor } from '../../../../../../../editor/browser/editorExtensions.js';
@@ -22,12 +19,11 @@ import { IContextViewService, IContextMenuService } from '../../../../../../../p
 import { IFileService } from '../../../../../../../platform/files/common/files.js';
 import { IHoverService } from '../../../../../../../platform/hover/browser/hover.js';
 import { IThemeService } from '../../../../../../../platform/theme/common/themeService.js';
-import { ILLMMessageService } from '../../../../../../../workbench/contrib/void/common/llmMessageService.js';
+import { ILLMMessageService } from '../../../../common/sendLLMMessageService.js';
 import { IRefreshModelService } from '../../../../../../../workbench/contrib/void/common/refreshModelService.js';
 import { IVoidSettingsService } from '../../../../../../../workbench/contrib/void/common/voidSettingsService.js';
-import { IEditCodeService, URIStreamState } from '../../../editCodeService.js';
-import { IVoidUriStateService } from '../../../voidUriStateService.js';
-import { IQuickEditStateService } from '../../../quickEditStateService.js';
+import { IEditCodeService } from '../../../editCodeServiceInterface.js'
+
 import { ISidebarStateService } from '../../../sidebarStateService.js';
 import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js'
 import { ICodeEditorService } from '../../../../../../../editor/browser/services/codeEditorService.js'
@@ -44,18 +40,18 @@ import { IConfigurationService } from '../../../../../../../platform/configurati
 import { IPathService } from '../../../../../../../workbench/services/path/common/pathService.js'
 import { IMetricsService } from '../../../../../../../workbench/contrib/void/common/metricsService.js'
 import { URI } from '../../../../../../../base/common/uri.js'
-
+import { IChatThreadService, ThreadsState, ThreadStreamState } from '../../../chatThreadService.js'
+import { ITerminalToolService } from '../../../terminalToolService.js'
+import { ILanguageService } from '../../../../../../../editor/common/languages/language.js'
+import { IVoidModelService } from '../../../../common/voidModelService.js'
+import { IWorkspaceContextService } from '../../../../../../../platform/workspace/common/workspace.js'
+import { IVoidCommandBarService } from '../../../voidCommandBarService.js'
 
 
 // normally to do this you'd use a useEffect that calls .onDidChangeState(), but useEffect mounts too late and misses initial state changes
 
 // even if React hasn't mounted yet, the variables are always updated to the latest state.
 // React listens by adding a setState function to these listeners.
-let uriState: VoidUriState
-const uriStateListeners: Set<(s: VoidUriState) => void> = new Set()
-
-let quickEditState: VoidQuickEditState
-const quickEditStateListeners: Set<(s: VoidQuickEditState) => void> = new Set()
 
 let sidebarState: VoidSidebarState
 const sidebarStateListeners: Set<(s: VoidSidebarState) => void> = new Set()
@@ -77,54 +73,30 @@ let colorThemeState: ColorScheme
 const colorThemeStateListeners: Set<(s: ColorScheme) => void> = new Set()
 
 const ctrlKZoneStreamingStateListeners: Set<(diffareaid: number, s: boolean) => void> = new Set()
-const uriStreamingStateListeners: Set<(uri: URI, s: URIStreamState) => void> = new Set()
-
+const commandBarURIStateListeners: Set<(uri: URI) => void> = new Set();
+const activeURIListeners: Set<(uri: URI | null) => void> = new Set();
 
 
 // must call this before you can use any of the hooks below
 // this should only be called ONCE! this is the only place you don't need to dispose onDidChange. If you use state.onDidChange anywhere else, make sure to dispose it!
-let wasCalled = false
 export const _registerServices = (accessor: ServicesAccessor) => {
 
 	const disposables: IDisposable[] = []
 
-	// don't register services twice
-	if (wasCalled) {
-		return
-		// console.error(`⚠️ Void _registerServices was called again! It should only be called once.`)
-	}
-	wasCalled = true
-
 	_registerAccessor(accessor)
 
 	const stateServices = {
-		uriStateService: accessor.get(IVoidUriStateService),
-		quickEditStateService: accessor.get(IQuickEditStateService),
 		sidebarStateService: accessor.get(ISidebarStateService),
 		chatThreadsStateService: accessor.get(IChatThreadService),
 		settingsStateService: accessor.get(IVoidSettingsService),
 		refreshModelService: accessor.get(IRefreshModelService),
 		themeService: accessor.get(IThemeService),
 		editCodeService: accessor.get(IEditCodeService),
+		voidCommandBarService: accessor.get(IVoidCommandBarService),
+		modelService: accessor.get(IModelService),
 	}
 
-	const { uriStateService, sidebarStateService, quickEditStateService, settingsStateService, chatThreadsStateService, refreshModelService, themeService, editCodeService } = stateServices
-
-	uriState = uriStateService.state
-	disposables.push(
-		uriStateService.onDidChangeState(() => {
-			uriState = uriStateService.state
-			uriStateListeners.forEach(l => l(uriState))
-		})
-	)
-
-	quickEditState = quickEditStateService.state
-	disposables.push(
-		quickEditStateService.onDidChangeState(() => {
-			quickEditState = quickEditStateService.state
-			quickEditStateListeners.forEach(l => l(quickEditState))
-		})
-	)
+	const { sidebarStateService, settingsStateService, chatThreadsStateService, refreshModelService, themeService, editCodeService, voidCommandBarService, modelService } = stateServices
 
 	sidebarState = sidebarStateService.state
 	disposables.push(
@@ -170,7 +142,7 @@ export const _registerServices = (accessor: ServicesAccessor) => {
 
 	colorThemeState = themeService.getColorTheme().type
 	disposables.push(
-		themeService.onDidColorThemeChange(theme => {
+		themeService.onDidColorThemeChange(({ theme }) => {
 			colorThemeState = theme.type
 			colorThemeStateListeners.forEach(l => l(colorThemeState))
 		})
@@ -178,15 +150,21 @@ export const _registerServices = (accessor: ServicesAccessor) => {
 
 	// no state
 	disposables.push(
-		editCodeService.onDidChangeCtrlKZoneStreaming(({ diffareaid }) => {
+		editCodeService.onDidChangeStreamingInCtrlKZone(({ diffareaid }) => {
 			const isStreaming = editCodeService.isCtrlKZoneStreaming({ diffareaid })
 			ctrlKZoneStreamingStateListeners.forEach(l => l(diffareaid, isStreaming))
 		})
 	)
+
 	disposables.push(
-		editCodeService.onDidChangeURIStreamState(({ uri }) => {
-			const isStreaming = editCodeService.getURIStreamState({ uri })
-			uriStreamingStateListeners.forEach(l => l(uri, isStreaming))
+		voidCommandBarService.onDidChangeState(({ uri }) => {
+			commandBarURIStateListeners.forEach(l => l(uri));
+		})
+	)
+
+	disposables.push(
+		voidCommandBarService.onDidChangeActiveURI(({ uri }) => {
+			activeURIListeners.forEach(l => l(uri));
 		})
 	)
 
@@ -210,8 +188,6 @@ const getReactAccessor = (accessor: ServicesAccessor) => {
 		IRefreshModelService: accessor.get(IRefreshModelService),
 		IVoidSettingsService: accessor.get(IVoidSettingsService),
 		IEditCodeService: accessor.get(IEditCodeService),
-		IVoidUriStateService: accessor.get(IVoidUriStateService),
-		IQuickEditStateService: accessor.get(IQuickEditStateService),
 		ISidebarStateService: accessor.get(ISidebarStateService),
 		IChatThreadService: accessor.get(IChatThreadService),
 
@@ -231,6 +207,12 @@ const getReactAccessor = (accessor: ServicesAccessor) => {
 		IConfigurationService: accessor.get(IConfigurationService),
 		IPathService: accessor.get(IPathService),
 		IMetricsService: accessor.get(IMetricsService),
+		ITerminalToolService: accessor.get(ITerminalToolService),
+		ILanguageService: accessor.get(ILanguageService),
+		IVoidModelService: accessor.get(IVoidModelService),
+		IWorkspaceContextService: accessor.get(IWorkspaceContextService),
+
+		IVoidCommandBarService: accessor.get(IVoidCommandBarService),
 
 	} as const
 	return reactAccessor
@@ -258,26 +240,6 @@ export const useAccessor = () => {
 
 // -- state of services --
 
-export const useUriState = () => {
-	const [s, ss] = useState(uriState)
-	useEffect(() => {
-		ss(uriState)
-		uriStateListeners.add(ss)
-		return () => { uriStateListeners.delete(ss) }
-	}, [ss])
-	return s
-}
-
-export const useQuickEditState = () => {
-	const [s, ss] = useState(quickEditState)
-	useEffect(() => {
-		ss(quickEditState)
-		quickEditStateListeners.add(ss)
-		return () => { quickEditStateListeners.delete(ss) }
-	}, [ss])
-	return s
-}
-
 export const useSidebarState = () => {
 	const [s, ss] = useState(sidebarState)
 	useEffect(() => {
@@ -364,14 +326,6 @@ export const useCtrlKZoneStreamingState = (listener: (diffareaid: number, s: boo
 	}, [listener, ctrlKZoneStreamingStateListeners])
 }
 
-export const useURIStreamState = (listener: (uri: URI, s: URIStreamState) => void) => {
-	useEffect(() => {
-		uriStreamingStateListeners.add(listener)
-		return () => { uriStreamingStateListeners.delete(listener) }
-	}, [listener, uriStreamingStateListeners])
-}
-
-
 export const useIsDark = () => {
 	const [s, ss] = useState(colorThemeState)
 	useEffect(() => {
@@ -383,6 +337,40 @@ export const useIsDark = () => {
 	// s is the theme, return isDark instead of s
 	const isDark = s === ColorScheme.DARK || s === ColorScheme.HIGH_CONTRAST_DARK
 	return isDark
-
 }
 
+export const useCommandBarURIListener = (listener: (uri: URI) => void) => {
+	useEffect(() => {
+		commandBarURIStateListeners.add(listener);
+		return () => { commandBarURIStateListeners.delete(listener) };
+	}, [listener]);
+};
+export const useCommandBarState = () => {
+	const accessor = useAccessor()
+	const commandBarService = accessor.get('IVoidCommandBarService')
+	const [s, ss] = useState({ state: commandBarService.stateOfURI, sortedURIs: commandBarService.sortedURIs });
+	const listener = useCallback(() => {
+		ss({ state: commandBarService.stateOfURI, sortedURIs: commandBarService.sortedURIs });
+	}, [commandBarService])
+	useCommandBarURIListener(listener)
+
+	return s;
+}
+
+
+
+// roughly gets the active URI - this is used to get the history of recent URIs
+export const useActiveURI = () => {
+	const accessor = useAccessor()
+	const commandBarService = accessor.get('IVoidCommandBarService')
+	const [s, ss] = useState(commandBarService.activeURI)
+	useEffect(() => {
+		const listener = () => { ss(commandBarService.activeURI) }
+		activeURIListeners.add(listener);
+		return () => { activeURIListeners.delete(listener) };
+	}, [])
+	return { uri: s }
+}
+
+
+

src/vs/workbench/contrib/void/browser/react/src/void-command-bar-tsx/VoidCommandBar.tsx

@@ -0,0 +1,307 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+
+import { useAccessor, useCommandBarState, useIsDark } from '../util/services.js';
+
+import '../styles.css'
+import { useCallback, useEffect, useState, useRef } from 'react';
+import { ScrollType } from '../../../../../../../editor/common/editorCommon.js';
+import { acceptAllBg, acceptBorder, buttonFontSize, buttonTextColor, rejectAllBg, rejectBorder } from '../../../../common/helpers/colors.js';
+import { VoidCommandBarProps } from '../../../voidCommandBarService.js';
+
+export const VoidCommandBarMain = ({ uri, editor }: VoidCommandBarProps) => {
+	const isDark = useIsDark()
+
+	return <div
+		className={`@@void-scope ${isDark ? 'dark' : ''}`}
+	>
+		<VoidCommandBar uri={uri} editor={editor} />
+	</div>
+}
+
+
+
+const stepIdx = (currIdx: number | null, len: number, step: -1 | 1) => {
+	if (len === 0) return null
+	return ((currIdx ?? 0) + step + len) % len // for some reason, small negatives are kept negative. just add len to offset
+}
+
+
+
+const VoidCommandBar = ({ uri, editor }: VoidCommandBarProps) => {
+	const accessor = useAccessor()
+	const editCodeService = accessor.get('IEditCodeService')
+	const editorService = accessor.get('ICodeEditorService')
+	const metricsService = accessor.get('IMetricsService')
+	const commandService = accessor.get('ICommandService')
+	const commandBarService = accessor.get('IVoidCommandBarService')
+	const voidModelService = accessor.get('IVoidModelService')
+	const { state: commandBarState, sortedURIs: sortedCommandBarURIs } = useCommandBarState()
+
+
+	// useEffect(() => {
+	// 	console.log('MOUNTING!!!')
+	// }, [])
+
+	// latestUriIdx is used to remember place in leftRight
+	const _latestValidUriIdxRef = useRef<number | null>(null)
+
+	// i is the current index of the URI in sortedCommandBarURIs
+	const i_ = sortedCommandBarURIs.findIndex(e => e.fsPath === uri?.fsPath)
+	const currFileIdx = i_ === -1 ? null : i_
+	useEffect(() => {
+		if (currFileIdx !== null) _latestValidUriIdxRef.current = currFileIdx
+	}, [currFileIdx])
+
+	const uriIdxInStepper = currFileIdx !== null ? currFileIdx // use currFileIdx if it exists, else use latestNotNullUriIdxRef
+		: _latestValidUriIdxRef.current === null ? null
+			: _latestValidUriIdxRef.current < sortedCommandBarURIs.length ? _latestValidUriIdxRef.current
+				: null
+
+	// when change URI, scroll to the proper spot
+	useEffect(() => {
+		setTimeout(() => {
+			// check undefined
+			if (!uri) return
+			const s = commandBarService.stateOfURI[uri.fsPath]
+			if (!s) return
+			const { diffIdx } = s
+			goToDiffIdx(diffIdx ?? 0)
+		}, 50)
+	}, [uri, commandBarService])
+
+	if (uri?.scheme !== 'file') return null // don't show in editors that we made, they must be files
+
+	const getNextDiffIdx = (step: 1 | -1) => {
+		// check undefined
+		if (!uri) return null
+		const s = commandBarState[uri.fsPath]
+		if (!s) return null
+		const { diffIdx, sortedDiffIds } = s
+		// get next idx
+		const nextDiffIdx = stepIdx(diffIdx, sortedDiffIds.length, step)
+		return nextDiffIdx
+	}
+	const goToDiffIdx = (idx: number | null) => {
+		if (idx === null) return
+		// check undefined
+		if (!uri) return
+		const s = commandBarState[uri.fsPath]
+		if (!s) return
+		const { sortedDiffIds } = s
+		// reveal
+		const diffid = sortedDiffIds[idx]
+		if (diffid === undefined) return
+		const diff = editCodeService.diffOfId[diffid]
+		if (!diff) return
+		editor.revealLineNearTop(diff.startLine, ScrollType.Immediate)
+		commandBarService.setDiffIdx(uri, idx)
+	}
+	const getNextUriIdx = (step: 1 | -1) => {
+		return stepIdx(uriIdxInStepper, sortedCommandBarURIs.length, step)
+	}
+	const goToURIIdx = async (idx: number | null) => {
+		if (idx === null) return
+		const nextURI = sortedCommandBarURIs[idx]
+		editCodeService.diffAreasOfURI
+		const { model } = await voidModelService.getModelSafe(nextURI)
+		if (model) {
+			// switch to the URI
+			editorService.openCodeEditor({ resource: nextURI, options: { revealIfVisible: true } }, editor)
+		}
+	}
+
+	const currDiffIdx = uri ? commandBarState[uri.fsPath]?.diffIdx ?? null : null
+	const sortedDiffIds = uri ? commandBarState[uri.fsPath]?.sortedDiffIds ?? [] : []
+	const sortedDiffZoneIds = uri ? commandBarState[uri.fsPath]?.sortedDiffZoneIds ?? [] : []
+
+
+	const isADiffInThisFile = sortedDiffIds.length !== 0
+	const isADiffZoneInThisFile = sortedDiffZoneIds.length !== 0
+	const isADiffZoneInAnyFile = sortedCommandBarURIs.length !== 0
+
+	const streamState = uri ? commandBarService.getStreamState(uri) : null
+	const showAcceptRejectAll = streamState === 'idle-has-changes'
+
+	const nextDiffIdx = getNextDiffIdx(1)
+	const prevDiffIdx = getNextDiffIdx(-1)
+	const nextURIIdx = getNextUriIdx(1)
+	const prevURIIdx = getNextUriIdx(-1)
+
+	const upDownDisabled = prevDiffIdx === null || nextDiffIdx === null
+	const leftRightDisabled = prevURIIdx === null || nextURIIdx === null // || (sortedCommandBarURIs.length === 1 && isADiffZoneInThisFile)
+
+	const upButton = <button
+		className={`
+			size-6 rounded cursor-default
+			hover:bg-void-bg-1-alt
+		`}// --border border-void-border-3 focus:border-void-border-1
+		disabled={upDownDisabled}
+		onClick={() => { goToDiffIdx(prevDiffIdx) }}
+		onKeyDown={(e) => {
+			if (e.key === 'Enter' || e.key === ' ') {
+				e.preventDefault();
+				goToDiffIdx(prevDiffIdx);
+			}
+		}}
+	>↑</button>
+
+	const downButton = <button
+		className={`
+			size-6 rounded cursor-default
+			hover:bg-void-bg-1-alt
+		`}
+		disabled={upDownDisabled}
+		onClick={() => { goToDiffIdx(nextDiffIdx) }}
+		onKeyDown={(e) => {
+			if (e.key === 'Enter' || e.key === ' ') {
+				e.preventDefault();
+				goToDiffIdx(nextDiffIdx);
+			}
+		}}
+	>↓</button>
+
+	const leftButton = <button
+		className={`
+			size-6 rounded cursor-default
+			hover:bg-void-bg-1-alt
+		`}
+		disabled={leftRightDisabled}
+		onClick={() => goToURIIdx(prevURIIdx)}
+		onKeyDown={(e) => {
+			if (e.key === 'Enter' || e.key === ' ') {
+				e.preventDefault();
+				goToURIIdx(prevURIIdx);
+			}
+		}}
+	>←</button>
+
+	const rightButton = <button
+		className={`
+			size-6 rounded cursor-default
+			hover:bg-void-bg-1-alt
+		`}
+		disabled={leftRightDisabled}
+		onClick={() => goToURIIdx(nextURIIdx)}
+		onKeyDown={(e) => {
+			if (e.key === 'Enter' || e.key === ' ') {
+				e.preventDefault();
+				goToURIIdx(nextURIIdx);
+			}
+		}}
+	>→</button>
+
+
+
+	// accept/reject if current URI has changes
+	const onAcceptAll = () => {
+		if (!uri) return
+		editCodeService.acceptOrRejectAllDiffAreas({ uri, behavior: 'accept', removeCtrlKs: false, _addToHistory: true })
+		metricsService.capture('Accept All', {})
+	}
+	const onRejectAll = () => {
+		if (!uri) return
+		editCodeService.acceptOrRejectAllDiffAreas({ uri, behavior: 'reject', removeCtrlKs: false, _addToHistory: true })
+		metricsService.capture('Reject All', {})
+	}
+
+
+	if (!isADiffZoneInAnyFile) return null
+
+	const acceptAllButton = <button
+		className='text-nowrap'
+		onClick={onAcceptAll}
+		style={{
+			backgroundColor: acceptAllBg,
+			border: acceptBorder,
+			color: buttonTextColor,
+			fontSize: buttonFontSize,
+			padding: '2px 4px',
+			borderRadius: '6px',
+			cursor: 'pointer'
+		}}
+	>
+		Accept File
+	</button>
+
+
+	const rejectAllButton = <button
+		className='text-nowrap'
+		onClick={onRejectAll}
+		style={{
+			backgroundColor: rejectAllBg,
+			border: rejectBorder,
+			color: 'white',
+			fontSize: buttonFontSize,
+			padding: '2px 4px',
+			borderRadius: '6px',
+			cursor: 'pointer'
+		}}
+	>
+		Reject File
+	</button>
+
+	const acceptRejectAllButtons = <div className="flex items-center gap-1 text-sm">
+		{acceptAllButton}
+		{rejectAllButton}
+	</div>
+
+	// const closeCommandBar = useCallback(() => {
+	// 	commandService.executeCommand('void.hideCommandBar');
+	// }, [commandService]);
+
+	// const hideButton = <button
+	// 	className='ml-auto pointer-events-auto'
+	// 	onClick={closeCommandBar}
+	// 	style={{
+	// 		color: buttonTextColor,
+	// 		fontSize: buttonFontSize,
+	// 		padding: '2px 4px',
+	// 		borderRadius: '6px',
+	// 		cursor: 'pointer'
+	// 	}}
+	// 	title="Close command bar"
+	// >x
+	// </button>
+
+	const leftRightUpDownButtons = <div className='p-1 gap-1 flex flex-col items-center bg-void-bg-2 rounded shadow-md border border-void-border-2 w-full'>
+		<div className="flex flex-col gap-1">
+			{/* Changes in file */}
+			<div className={`${!isADiffZoneInThisFile ? 'hidden' : ''} flex items-center ${upDownDisabled ? 'opacity-50' : ''}`}>
+				{upButton}
+				{downButton}
+				<span className="min-w-16 px-2 text-xs">
+					{isADiffInThisFile ?
+						`Diff ${(currDiffIdx ?? 0) + 1} of ${sortedDiffIds.length}`
+						: streamState === 'streaming' ?
+							'No changes yet'
+							: `No changes`
+					}
+				</span>
+			</div>
+
+			{/* Files */}
+			<div className={`${!isADiffZoneInAnyFile ? 'hidden' : ''} flex items-center ${leftRightDisabled ? 'opacity-50' : ''}`}>
+				{leftButton}
+				{/* <div className="w-px h-3 bg-void-border-3 mx-0.5 shadow-sm"></div> */}
+				{rightButton}
+				{/* <div className="w-px h-3 bg-void-border-3 mx-0.5 shadow-sm"></div> */}
+				<span className="min-w-16 px-2 text-xs">
+					{currFileIdx !== null ?
+						`File ${currFileIdx + 1} of ${sortedCommandBarURIs.length}`
+						: `${sortedCommandBarURIs.length} file${sortedCommandBarURIs.length === 1 ? '' : 's'} changed`
+					}
+				</span>
+			</div>
+		</div>
+	</div>
+
+	return <div className={`flex flex-col items-center gap-y-2 mx-2 pointer-events-auto`}>
+		{showAcceptRejectAll && acceptRejectAllButtons}
+		{leftRightUpDownButtons}
+
+	</div>
+}

src/vs/workbench/contrib/void/browser/react/src/void-command-bar-tsx/index.tsx

@@ -0,0 +1,9 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+import { mountFnGenerator } from '../util/mountFnGenerator.js'
+import { VoidCommandBarMain } from './VoidCommandBar.js'
+
+export const mountVoidCommandBar = mountFnGenerator(VoidCommandBarMain)

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

@@ -10,7 +10,7 @@ import { _VoidSelectBox, VoidCustomDropdownBox } from '../util/inputs.js'
 import { SelectBox } from '../../../../../../../base/browser/ui/selectBox/selectBox.js'
 import { IconWarning } from '../sidebar-tsx/SidebarChat.js'
 import { VOID_OPEN_SETTINGS_ACTION_ID, VOID_TOGGLE_SETTINGS_ACTION_ID } from '../../../voidSettingsPane.js'
-import { ModelOption } from '../../../../../../../workbench/contrib/void/common/voidSettingsService.js'
+import { modelFilterOfFeatureName, ModelOption } from '../../../../../../../workbench/contrib/void/common/voidSettingsService.js'
 import { WarningBox } from './WarningBox.js'
 
 const optionsEqual = (m1: ModelOption[], m2: ModelOption[]) => {
@@ -21,7 +21,7 @@ const optionsEqual = (m1: ModelOption[], m2: ModelOption[]) => {
 	return true
 }
 
-const ModelSelectBox = ({ options, featureName }: { options: ModelOption[], featureName: FeatureName }) => {
+const ModelSelectBox = ({ options, featureName, className }: { options: ModelOption[], featureName: FeatureName, className: string }) => {
 	const accessor = useAccessor()
 	const voidSettingsService = accessor.get('IVoidSettingsService')
 
@@ -38,9 +38,9 @@ const ModelSelectBox = ({ options, featureName }: { options: ModelOption[], feat
 		onChangeOption={onChangeOption}
 		getOptionDisplayName={(option) => option.selection.modelName}
 		getOptionDropdownName={(option) => option.selection.modelName}
-		getOptionDropdownDetail={(option) => option.selection.providerName }
+		getOptionDropdownDetail={(option) => option.selection.providerName}
 		getOptionsEqual={(a, b) => optionsEqual([a], [b])}
-		className='text-xs text-void-fg-3 px-1'
+		className={className}
 		matchInputWidth={false}
 	/>
 }
@@ -77,25 +77,32 @@ const ModelSelectBox = ({ options, featureName }: { options: ModelOption[], feat
 
 
 
-const MemoizedModelDropdown = ({ featureName }: { featureName: FeatureName }) => {
+const MemoizedModelDropdown = ({ featureName, className }: { featureName: FeatureName, className: string }) => {
 	const settingsState = useSettingsState()
 	const oldOptionsRef = useRef<ModelOption[]>([])
 	const [memoizedOptions, setMemoizedOptions] = useState(oldOptionsRef.current)
 
+	const { filter, emptyMessage } = modelFilterOfFeatureName[featureName]
+
 	useEffect(() => {
 		const oldOptions = oldOptionsRef.current
-		const newOptions = settingsState._modelOptions
+		const newOptions = settingsState._modelOptions.filter((o) => filter(o.selection, { chatMode: settingsState.globalSettings.chatMode }))
+
 		if (!optionsEqual(oldOptions, newOptions)) {
 			setMemoizedOptions(newOptions)
 		}
 		oldOptionsRef.current = newOptions
-	}, [settingsState._modelOptions])
+	}, [settingsState._modelOptions, filter])
 
-	return <ModelSelectBox featureName={featureName} options={memoizedOptions} />
+	if (memoizedOptions.length === 0) { // Pretty sure this will never be reached unless filter is enabled
+		return <WarningBox text={emptyMessage?.message || 'No models available'} />
+	}
+
+	return <ModelSelectBox featureName={featureName} options={memoizedOptions} className={className} />
 
 }
 
-export const ModelDropdown = ({ featureName }: { featureName: FeatureName }) => {
+export const ModelDropdown = ({ featureName, className }: { featureName: FeatureName, className: string }) => {
 	const settingsState = useSettingsState()
 
 	const accessor = useAccessor()
@@ -103,14 +110,18 @@ export const ModelDropdown = ({ featureName }: { featureName: FeatureName }) =>
 
 	const openSettings = () => { commandService.executeCommand(VOID_OPEN_SETTINGS_ACTION_ID); };
 
+
+	const { emptyMessage } = modelFilterOfFeatureName[featureName]
+
 	const isDisabled = isFeatureNameDisabled(featureName, settingsState)
 	if (isDisabled)
 		return <WarningBox onClick={openSettings} text={
-			isDisabled === 'needToEnableModel' ? 'Enable a model'
-				: isDisabled === 'addModel' ? 'Add a model'
-					: (isDisabled === 'addProvider' || isDisabled === 'notFilledIn' || isDisabled === 'providerNotAutoDetected') ? 'Provider required'
-						: 'Provider required'
+			emptyMessage && emptyMessage.priority === 'always' ? emptyMessage.message :
+				isDisabled === 'needToEnableModel' ? 'Enable a model'
+					: isDisabled === 'addModel' ? 'Add a model'
+						: (isDisabled === 'addProvider' || isDisabled === 'notFilledIn' || isDisabled === 'providerNotAutoDetected') ? 'Provider required'
+							: 'Provider required'
 		} />
 
-	return <MemoizedModelDropdown featureName={featureName} />
+	return <MemoizedModelDropdown featureName={featureName} className={className} />
 }

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

@@ -17,14 +17,13 @@ import { env } from '../../../../../../../base/common/process.js'
 import { ModelDropdown } from './ModelDropdown.js'
 import { ChatMarkdownRender } from '../markdown/ChatMarkdownRender.js'
 import { WarningBox } from './WarningBox.js'
-import { os } from '../../../helpers/systemInfo.js'
+import { os } from '../../../../common/helpers/systemInfo.js'
+import { IconX } from '../sidebar-tsx/SidebarChat.js'
 
-const SubtleButton = ({ onClick, text, icon, disabled }: { onClick: () => void, text: string, icon: React.ReactNode, disabled: boolean }) => {
+const ButtonLeftTextRightOption = ({ text, leftButton }: { text: string, leftButton?: React.ReactNode }) => {
 
 	return <div className='flex items-center text-void-fg-3 px-3 py-0.5 rounded-sm overflow-hidden gap-2 hover:bg-black/10 dark:hover:bg-gray-300/10'>
-		<button className='flex items-center' disabled={disabled} onClick={onClick}>
-			{icon}
-		</button>
+		{leftButton ? leftButton : null}
 		<span>
 			{text}
 		</span>
@@ -57,22 +56,28 @@ const RefreshModelButton = ({ providerName }: { providerName: RefreshableProvide
 	const { state } = refreshModelState[providerName]
 
 	const { title: providerTitle } = displayInfoOfProviderName(providerName)
-	return <SubtleButton
-		onClick={() => {
-			refreshModelService.startRefreshingModels(providerName, { enableProviderOnSuccess: false, doNotFire: false })
-			metricsService.capture('Click', { providerName, action: 'Refresh Models' })
-		}}
-		text={justFinished === 'finished' ? `${providerTitle} Models are up-to-date!`
-			: justFinished === 'error' ? `${providerTitle} not found!`
-				: `Manually refresh ${providerTitle} models.`
-		}
-		icon={justFinished === 'finished' ? <Check className='stroke-green-500 size-3' />
-			: justFinished === 'error' ? <X className='stroke-red-500 size-3' />
-				: state === 'refreshing' ? <Loader2 className='size-3 animate-spin' />
-					: <RefreshCw className='size-3' />
+
+	return <ButtonLeftTextRightOption
+
+		leftButton={
+			<button
+				className='flex items-center'
+				disabled={state === 'refreshing' || justFinished !== null}
+				onClick={() => {
+					refreshModelService.startRefreshingModels(providerName, { enableProviderOnSuccess: false, doNotFire: false })
+					metricsService.capture('Click', { providerName, action: 'Refresh Models' })
+				}}
+			>
+				{justFinished === 'finished' ? <Check className='stroke-green-500 size-3' />
+					: justFinished === 'error' ? <X className='stroke-red-500 size-3' />
+						: state === 'refreshing' ? <Loader2 className='size-3 animate-spin' />
+							: <RefreshCw className='size-3' />}
+			</button>
 		}
 
-		disabled={state === 'refreshing' || justFinished !== null}
+		text={justFinished === 'finished' ? `${providerTitle} Models are up-to-date!`
+			: justFinished === 'error' ? `${providerTitle} not found!`
+				: `Manually refresh ${providerTitle} models.`}
 	/>
 }
 
@@ -93,7 +98,7 @@ const RefreshableModels = () => {
 
 
 
-const AddModelMenu = ({ onSubmit }: { onSubmit: () => void }) => {
+const AddModelMenu = ({ onSubmit, onClose }: { onSubmit: () => void, onClose: () => void }) => {
 
 	const accessor = useAccessor()
 	const settingsStateService = accessor.get('IVoidSettingsService')
@@ -116,8 +121,8 @@ const AddModelMenu = ({ onSubmit }: { onSubmit: () => void }) => {
 				options={providerNames}
 				selectedOption={providerName}
 				onChangeOption={(pn) => setProviderName(pn)}
-				getOptionDisplayName={(pn) => pn ? displayInfoOfProviderName(pn).title : '(null)'}
-				getOptionDropdownName={(pn) => pn ? displayInfoOfProviderName(pn).title : '(null)'}
+				getOptionDisplayName={(pn) => pn ? displayInfoOfProviderName(pn).title : 'Provider Name'}
+				getOptionDropdownName={(pn) => pn ? displayInfoOfProviderName(pn).title : 'Provider Name'}
 				getOptionsEqual={(a, b) => a === b}
 				className={`max-w-44 w-full border border-void-border-2 bg-void-bg-1 text-void-fg-3 text-root
 					py-[4px] px-[6px]
@@ -141,8 +146,8 @@ const AddModelMenu = ({ onSubmit }: { onSubmit: () => void }) => {
 			</div>
 
 			{/* button */}
-			<div className='max-w-40'>
-				<VoidButton onClick={() => {
+			<VoidButton
+				onClick={() => {
 					const modelName = modelNameRef.current?.value
 
 					if (providerName === null) {
@@ -161,16 +166,16 @@ const AddModelMenu = ({ onSubmit }: { onSubmit: () => void }) => {
 
 					settingsStateService.addModel(providerName, modelName)
 					onSubmit()
-
 				}}
-				>Add model</VoidButton>
-			</div>
+			>Add model</VoidButton>
 
-			{!errorString ? null : <div className='text-red-500 truncate whitespace-nowrap'>
-				{errorString}
-			</div>}
+			<button onClick={onClose} className='ml-auto'><X className='size-4' /></button>
 		</div>
 
+		{!errorString ? null : <div className='text-red-500 truncate whitespace-nowrap mt-1'>
+			{errorString}
+		</div>}
+
 	</>
 
 }
@@ -178,9 +183,9 @@ const AddModelMenu = ({ onSubmit }: { onSubmit: () => void }) => {
 const AddModelMenuFull = () => {
 	const [open, setOpen] = useState(false)
 
-	return <div className='hover:bg-black/10 dark:hover:bg-gray-300/10 py-1 my-4 pb-1 px-3 rounded-sm overflow-hidden '>
+	return <div className='hover:bg-black/10 dark:hover:bg-gray-300/10 py-1 my-4 px-3 rounded-sm overflow-hidden'>
 		{open ?
-			<AddModelMenu onSubmit={() => { setOpen(false) }} />
+			<AddModelMenu onSubmit={() => setOpen(false)} onClose={() => setOpen(false)} />
 			: <VoidButton onClick={() => setOpen(true)}>Add Model</VoidButton>
 		}
 	</div>
@@ -230,9 +235,7 @@ export const ModelDump = () => {
 
 					<VoidSwitch
 						value={disabled ? false : !isHidden}
-						onChange={() => {
-							settingsStateService.toggleModelHidden(providerName, modelName)
-						}}
+						onChange={() => { settingsStateService.toggleModelHidden(providerName, modelName) }}
 						disabled={disabled}
 						size='sm'
 					/>
@@ -293,7 +296,7 @@ const ProviderSetting = ({ providerName, settingName }: { providerName: Provider
 				isPasswordField={isPasswordField}
 			/>
 			{subTextMd === undefined ? null : <div className='py-1 px-3 opacity-50 text-sm'>
-				<ChatMarkdownRender noSpace string={subTextMd} />
+				<ChatMarkdownRender string={subTextMd} chatMessageLocation={undefined} />
 			</div>}
 
 		</div>
@@ -356,7 +359,7 @@ export const VoidProviderSettings = ({ providerNames }: { providerNames: Provide
 
 
 type TabName = 'models' | 'general'
-export const AutoRefreshToggle = () => {
+export const AutoDetectLocalModelsToggle = () => {
 	const settingName: GlobalSettingName = 'autoRefreshModels'
 
 	const accessor = useAccessor()
@@ -368,16 +371,19 @@ export const AutoRefreshToggle = () => {
 	// right now this is just `enabled_autoRefreshModels`
 	const enabled = voidSettingsState.globalSettings[settingName]
 
-	return <SubtleButton
-		onClick={() => {
-			voidSettingsService.setGlobalSetting(settingName, !enabled)
-			metricsService.capture('Click', { action: 'Autorefresh Toggle', settingName, enabled: !enabled })
-		}}
+	return <ButtonLeftTextRightOption
+		leftButton={<VoidSwitch
+			size='xxs'
+			value={enabled}
+			onChange={(newVal) => {
+				voidSettingsService.setGlobalSetting(settingName, newVal)
+				metricsService.capture('Click', { action: 'Autorefresh Toggle', settingName, enabled: newVal })
+			}}
+		/>}
 		text={`Automatically detect local providers and models (${refreshableProviderNames.map(providerName => displayInfoOfProviderName(providerName).title).join(', ')}).`}
-		icon={enabled ? <Check className='stroke-green-500 size-3' /> : <X className='stroke-red-500 size-3' />}
-		disabled={false}
 	/>
 
+
 }
 
 export const AIInstructionsBox = () => {
@@ -395,15 +401,43 @@ export const AIInstructionsBox = () => {
 	/>
 }
 
+const FastApplyMethodDropdown = () => {
+	const accessor = useAccessor()
+	const voidSettingsService = accessor.get('IVoidSettingsService')
+
+	const options = useMemo(() => [true, false], [])
+
+	const onChangeOption = useCallback((newVal: boolean) => {
+		voidSettingsService.setGlobalSetting('enableFastApply', newVal)
+	}, [voidSettingsService])
+
+	return <VoidCustomDropdownBox
+		className='text-xs text-void-fg-3 bg-void-bg-1 border border-void-border-1 rounded p-0.5 px-1'
+		options={options}
+		selectedOption={voidSettingsService.state.globalSettings.enableFastApply}
+		onChangeOption={onChangeOption}
+		getOptionDisplayName={(val) => val ? 'Fast Apply' : 'Slow Apply'}
+		getOptionDropdownName={(val) => val ? 'Fast Apply' : 'Slow Apply'}
+		getOptionDropdownDetail={(val) => val ? 'Output Search/Replace blocks' : 'Rewrite whole files'}
+		getOptionsEqual={(a, b) => a === b}
+	/>
+
+}
+
+
 export const FeaturesTab = () => {
+	const voidSettingsState = useSettingsState()
+	const accessor = useAccessor()
+	const voidSettingsService = accessor.get('IVoidSettingsService')
+
+
 	return <>
 		<h2 className={`text-3xl mb-2`}>Models</h2>
 		<ErrorBoundary>
-			<AutoRefreshToggle />
-			<RefreshableModels />
-			<div className='py-2' />
 			<ModelDump />
 			<AddModelMenuFull />
+			<AutoDetectLocalModelsToggle />
+			<RefreshableModels />
 		</ErrorBoundary>
 
 
@@ -412,12 +446,12 @@ export const FeaturesTab = () => {
 		{/* <h3 className={`opacity-50 mb-2`}>{`Instructions:`}</h3> */}
 		{/* <h3 className={`mb-2`}>{`Void can access any model that you host locally. We automatically detect your local models by default.`}</h3> */}
 		<h3 className={`text-void-fg-3 mb-2`}>{`Void can access any model that you host locally. We automatically detect your local models by default.`}</h3>
-		<div className='pl-4 opacity-50'>
-			<span className={`text-sm mb-2`}><ChatMarkdownRender noSpace string={`1. Download [Ollama](https://ollama.com/download).`} /></span>
-			<span className={`text-sm mb-2`}><ChatMarkdownRender noSpace string={`2. Open your terminal.`} /></span>
-			<span className={`text-sm mb-2 select-text`}><ChatMarkdownRender noSpace string={`3. Run \`ollama run llama3.1:8b\`. This installs Meta's llama3.1 model which is best for chat and inline edits. Requires 5GB of memory.`} /></span>
-			<span className={`text-sm mb-2 select-text`}><ChatMarkdownRender noSpace string={`4. Run \`ollama run qwen2.5-coder:1.5b\`. This installs a faster autocomplete model. Requires 1GB of memory.`} /></span>
-			<span className={`text-sm mb-2`}><ChatMarkdownRender noSpace string={`Void automatically detects locally running models and enables them.`} /></span>
+		<div className='pl-4 prose-ol:list-decimal opacity-80'>
+			<span className={`text-sm mb-2`}><ChatMarkdownRender string={`1. Download [Ollama](https://ollama.com/download).`} chatMessageLocation={undefined} /></span>
+			<span className={`text-sm mb-2`}><ChatMarkdownRender string={`2. Open your terminal.`} chatMessageLocation={undefined} /></span>
+			<span className={`text-sm mb-2 select-text`}><ChatMarkdownRender string={`3. Run \`ollama run llama3.1:8b\`. This installs Meta's llama3.1 model which is best for chat and inline edits. Requires 5GB of memory.`} chatMessageLocation={undefined} /></span>
+			<span className={`text-sm mb-2 select-text`}><ChatMarkdownRender string={`4. Run \`ollama run qwen2.5-coder:1.5b\`. This installs a faster autocomplete model. Requires 1GB of memory.`} chatMessageLocation={undefined} /></span>
+			<span className={`text-sm mb-2`}><ChatMarkdownRender string={`Void automatically detects locally running models and enables them.`} chatMessageLocation={undefined} /></span>
 			{/* TODO we should create UI for downloading models without user going into terminal */}
 		</div>
 
@@ -434,17 +468,96 @@ export const FeaturesTab = () => {
 
 
 
-		<h2 className={`text-3xl mb-2 mt-12`}>Feature Options</h2>
+		<h2 className={`text-3xl mt-12`}>Feature Options</h2>
 		<ErrorBoundary>
-			{featureNames.map(featureName =>
-				(['Ctrl+L', 'Ctrl+K'] as FeatureName[]).includes(featureName) ? null :
-					<div key={featureName}
-						className='mb-2'
-					>
-						<h4 className={`text-void-fg-3`}>{displayInfoOfFeatureName(featureName)}</h4>
-						<ModelDropdown featureName={featureName} />
+			{/* L1 */}
+			<div className='flex items-start justify-around mt-4 my-4 gap-x-8'>
+				{/* FIM */}
+				<div className='w-full'>
+					<h4 className={`text-base`}>{displayInfoOfFeatureName('Autocomplete')}</h4>
+					<div className='text-sm italic text-void-fg-3 mt-1 mb-4'>Experimental. Only works with models that support FIM.</div>
+
+					<div className='my-2'>
+						{/* Enable Switch */}
+						<div className='flex items-center gap-x-2 my-2'>
+							<VoidSwitch
+								size='xs'
+								value={voidSettingsState.globalSettings.enableAutocomplete}
+								onChange={(newVal) => voidSettingsService.setGlobalSetting('enableAutocomplete', newVal)}
+							/>
+							<span className='text-void-fg-3 text-xs pointer-events-none'>{voidSettingsState.globalSettings.enableAutocomplete ? 'Enabled' : 'Disabled'}</span>
+						</div>
+						{/* Model Dropdown */}
+						<div className={`my-2 ${!voidSettingsState.globalSettings.enableAutocomplete ? 'hidden' : ''}`}>
+							<ModelDropdown featureName={'Autocomplete'} className='text-xs text-void-fg-3 bg-void-bg-1 border border-void-border-1 rounded p-0.5 px-1' />
+						</div>
 					</div>
-			)}
+
+				</div>
+
+				{/* Apply */}
+				<div className='w-full'>
+					<h4 className={`text-base`}>{displayInfoOfFeatureName('Apply')}</h4>
+					<div className='text-sm italic text-void-fg-3 mt-1 mb-4'>Settings that control the behavior of the Apply button and the Edit tool.</div>
+
+					<div className='my-2'>
+						{/* Sync to Chat Switch */}
+						<div className='flex items-center gap-x-2 my-2'>
+							<VoidSwitch
+								size='xs'
+								value={voidSettingsState.globalSettings.syncApplyToChat}
+								onChange={(newVal) => voidSettingsService.setGlobalSetting('syncApplyToChat', newVal)}
+							/>
+							<span className='text-void-fg-3 text-xs pointer-events-none'>{voidSettingsState.globalSettings.syncApplyToChat ? 'Same as Chat model' : 'Different model'}</span>
+						</div>
+
+						{/* Model Dropdown */}
+						<div className={`my-2 ${voidSettingsState.globalSettings.syncApplyToChat ? 'hidden' : ''}`}>
+							<ModelDropdown featureName={'Apply'} className='text-xs text-void-fg-3 bg-void-bg-1 border border-void-border-1 rounded p-0.5 px-1' />
+						</div>
+					</div>
+
+
+					<div className='my-2'>
+						{/* Fast Apply Method Dropdown */}
+						<div className='flex items-center gap-x-2 my-2'>
+							<FastApplyMethodDropdown />
+						</div>
+					</div>
+
+				</div>
+
+			</div>
+
+			{/* L2 */}
+			<div className='flex items-start justify-around my-4 gap-x-8'>
+
+				{/* Tools Section */}
+				<div className='w-full'>
+					<h4 className={`text-base`}>Tools</h4>
+					<div className='text-sm italic text-void-fg-3 mt-1 mb-4'>{`Tools are functions that LLMs can call. Some tools require user approval.`}</div>
+
+					<div className='my-2'>
+						{/* Auto Accept Switch */}
+						<div className='flex items-center gap-x-2 my-2'>
+							<VoidSwitch
+								size='xs'
+								value={voidSettingsState.globalSettings.autoApprove}
+								onChange={(newVal) => voidSettingsService.setGlobalSetting('autoApprove', newVal)}
+							/>
+							<span className='text-void-fg-3 text-xs pointer-events-none'>{voidSettingsState.globalSettings.autoApprove ? 'Auto-approve' : 'Auto-approve'}</span>
+						</div>
+					</div>
+				</div>
+
+				<div className='w-full'>
+				</div>
+
+			</div>
+
+
+			<div className='py-8' />
+
 		</ErrorBoundary>
 
 	</>
@@ -649,7 +762,7 @@ export const Settings = () => {
 
 
 					{/* content */}
-					<div className='w-full min-w-[600px] overflow-auto'>
+					<div className='w-full min-w-[550px]'>
 
 						<div className={`${tab !== 'models' ? 'hidden' : ''}`}>
 							<FeaturesTab />

src/vs/workbench/contrib/void/browser/react/tailwind.config.js

@@ -9,6 +9,28 @@ module.exports = {
 	content: ['./src2/**/*.{jsx,tsx}'], // uses these files to decide how to transform the css file
 	theme: {
 		extend: {
+			typography: theme => ({
+				DEFAULT: {
+					css: {
+						'--tw-prose-body': 'var(--void-fg-1)',
+						'--tw-prose-headings': 'var(--void-fg-1)',
+						'--tw-prose-lead': 'var(--void-fg-2)',
+						'--tw-prose-links': 'var(--void-link-color)',
+						'--tw-prose-bold': 'var(--void-fg-1)',
+						'--tw-prose-counters': 'var(--void-fg-3)',
+						'--tw-prose-bullets': 'var(--void-fg-3)',
+						'--tw-prose-hr': 'var(--void-border-4)',
+						'--tw-prose-quotes': 'var(--void-fg-1)',
+						'--tw-prose-quote-borders': 'var(--void-border-2)',
+						'--tw-prose-captions': 'var(--void-fg-3)',
+						'--tw-prose-code': 'var(--void-fg-0)',
+						'--tw-prose-pre-code': 'var(--void-fg-0)',
+						'--tw-prose-pre-bg': 'var(--void-bg-1)',
+						'--tw-prose-th-borders': 'var(--void-border-4)',
+						'--tw-prose-td-borders': 'var(--void-border-4)',
+					},
+				},
+			}),
 			fontSize: {
 				xs: '10px',
 				sm: '11px',
@@ -27,146 +49,150 @@ module.exports = {
 			// common colors to use, ordered light to dark
 
 			colors: {
-				"void-bg-1": "var(--vscode-input-background)",
-				"void-bg-1-alt": "var(--vscode-badge-background)",
-				"void-bg-2": "var(--vscode-sideBar-background)",
-				"void-bg-2-alt": "color-mix(in srgb, var(--vscode-sideBar-background) 30%, var(--vscode-editor-background) 70%)",
-				"void-bg-3": "var(--vscode-editor-background)",
+				'void-bg-1': 'var(--void-bg-1)',
+				'void-bg-1-alt': 'var(--void-bg-1-alt)',
+				'void-bg-2': 'var(--void-bg-2)',
+				'void-bg-2-alt': 'var(--void-bg-2-alt)',
+				'void-bg-3': 'var(--void-bg-3)',
 
 
-				"void-fg-1": "var(--vscode-editor-foreground)",
-				"void-fg-2": "var(--vscode-input-foreground)",
-				"void-fg-3": "var(--vscode-input-placeholderForeground)",
-				// "void-fg-4": "var(--vscode-tab-inactiveForeground)",
-				"void-fg-4": "var(--vscode-list-deemphasizedForeground)",
+				'void-fg-0': 'var(--void-fg-0)',
+				'void-fg-1': 'var(--void-fg-1)',
+				'void-fg-2': 'var(--void-fg-2)',
+				'void-fg-3': 'var(--void-fg-3)',
+				// 'void-fg-4': 'var(--vscode-tab-inactiveForeground)',
+				'void-fg-4': 'var(--void-fg-4)',
 
+				'void-warning': 'var(--void-warning)',
 
-				"void-warning": "var(--vscode-charts-yellow)",
-
-				"void-border-1": "var(--vscode-commandCenter-activeBorder)",
-				"void-border-2": "var(--vscode-commandCenter-border)",
-				"void-border-3": "var(--vscode-commandCenter-inactiveBorder)",
-				"void-border-4": "var(--vscode-editorGroup-border)",
+				'void-border-1': 'var(--void-border-1)',
+				'void-border-2': 'var(--void-border-2)',
+				'void-border-3': 'var(--void-border-3)',
+				'void-border-4': 'var(--void-border-4)',
 
+				'void-ring-color': 'var(--void-ring-color)',
+				'void-link-color': 'var(--void-link-color)',
 
 				vscode: {
 					// see: https://code.visualstudio.com/api/extension-guides/webview#theming-webview-content
 
 					// base colors
-					"fg": "var(--vscode-foreground)",
-					"focus-border": "var(--vscode-focusBorder)",
-					"disabled-fg": "var(--vscode-disabledForeground)",
-					"widget-border": "var(--vscode-widget-border)",
-					"widget-shadow": "var(--vscode-widget-shadow)",
-					"selection-bg": "var(--vscode-selection-background)",
-					"description-fg": "var(--vscode-descriptionForeground)",
-					"error-fg": "var(--vscode-errorForeground)",
-					"icon-fg": "var(--vscode-icon-foreground)",
-					"sash-hover-border": "var(--vscode-sash-hoverBorder)",
+					'fg': 'var(--vscode-foreground)',
+					'focus-border': 'var(--vscode-focusBorder)',
+					'disabled-fg': 'var(--vscode-disabledForeground)',
+					'widget-border': 'var(--vscode-widget-border)',
+					'widget-shadow': 'var(--vscode-widget-shadow)',
+					'selection-bg': 'var(--vscode-selection-background)',
+					'description-fg': 'var(--vscode-descriptionForeground)',
+					'error-fg': 'var(--vscode-errorForeground)',
+					'icon-fg': 'var(--vscode-icon-foreground)',
+					'sash-hover-border': 'var(--vscode-sash-hoverBorder)',
 
 					// text colors
-					"text-blockquote-bg": "var(--vscode-textBlockQuote-background)",
-					"text-blockquote-border": "var(--vscode-textBlockQuote-border)",
-					"text-codeblock-bg": "var(--vscode-textCodeBlock-background)",
-					"text-link-active-fg": "var(--vscode-textLink-activeForeground)",
-					"text-link-fg": "var(--vscode-textLink-foreground)",
-					"text-preformat-fg": "var(--vscode-textPreformat-foreground)",
-					"text-preformat-bg": "var(--vscode-textPreformat-background)",
-					"text-separator-fg": "var(--vscode-textSeparator-foreground)",
+					'text-blockquote-bg': 'var(--vscode-textBlockQuote-background)',
+					'text-blockquote-border': 'var(--vscode-textBlockQuote-border)',
+					'text-codeblock-bg': 'var(--vscode-textCodeBlock-background)',
+					'text-link-active-fg': 'var(--vscode-textLink-activeForeground)',
+					'text-link-fg': 'var(--vscode-textLink-foreground)',
+					'text-preformat-fg': 'var(--vscode-textPreformat-foreground)',
+					'text-preformat-bg': 'var(--vscode-textPreformat-background)',
+					'text-separator-fg': 'var(--vscode-textSeparator-foreground)',
 
 					// input colors
-					"input-bg": "var(--vscode-input-background)",
-					"input-border": "var(--vscode-input-border)",
-					"input-fg": "var(--vscode-input-foreground)",
-					"input-placeholder-fg": "var(--vscode-input-placeholderForeground)",
-					"input-active-bg": "var(--vscode-input-activeBackground)",
-					"input-option-active-border": "var(--vscode-inputOption-activeBorder)",
-					"input-option-active-fg": "var(--vscode-inputOption-activeForeground)",
-					"input-option-hover-bg": "var(--vscode-inputOption-hoverBackground)",
-					"input-validation-error-bg": "var(--vscode-inputValidation-errorBackground)",
-					"input-validation-error-fg": "var(--vscode-inputValidation-errorForeground)",
-					"input-validation-error-border": "var(--vscode-inputValidation-errorBorder)",
-					"input-validation-info-bg": "var(--vscode-inputValidation-infoBackground)",
-					"input-validation-info-fg": "var(--vscode-inputValidation-infoForeground)",
-					"input-validation-info-border": "var(--vscode-inputValidation-infoBorder)",
-					"input-validation-warning-bg": "var(--vscode-inputValidation-warningBackground)",
-					"input-validation-warning-fg": "var(--vscode-inputValidation-warningForeground)",
-					"input-validation-warning-border": "var(--vscode-inputValidation-warningBorder)",
+					'input-bg': 'var(--vscode-input-background)',
+					'input-border': 'var(--vscode-input-border)',
+					'input-fg': 'var(--vscode-input-foreground)',
+					'input-placeholder-fg': 'var(--vscode-input-placeholderForeground)',
+					'input-active-bg': 'var(--vscode-input-activeBackground)',
+					'input-option-active-border': 'var(--vscode-inputOption-activeBorder)',
+					'input-option-active-fg': 'var(--vscode-inputOption-activeForeground)',
+					'input-option-hover-bg': 'var(--vscode-inputOption-hoverBackground)',
+					'input-validation-error-bg': 'var(--vscode-inputValidation-errorBackground)',
+					'input-validation-error-fg': 'var(--vscode-inputValidation-errorForeground)',
+					'input-validation-error-border': 'var(--vscode-inputValidation-errorBorder)',
+					'input-validation-info-bg': 'var(--vscode-inputValidation-infoBackground)',
+					'input-validation-info-fg': 'var(--vscode-inputValidation-infoForeground)',
+					'input-validation-info-border': 'var(--vscode-inputValidation-infoBorder)',
+					'input-validation-warning-bg': 'var(--vscode-inputValidation-warningBackground)',
+					'input-validation-warning-fg': 'var(--vscode-inputValidation-warningForeground)',
+					'input-validation-warning-border': 'var(--vscode-inputValidation-warningBorder)',
 
 					// command center colors (the top bar)
-					"commandcenter-fg": "var(--vscode-commandCenter-foreground)",
-					"commandcenter-active-fg": "var(--vscode-commandCenter-activeForeground)",
-					"commandcenter-bg": "var(--vscode-commandCenter-background)",
-					"commandcenter-active-bg": "var(--vscode-commandCenter-activeBackground)",
-					"commandcenter-border": "var(--vscode-commandCenter-border)",
-					"commandcenter-inactive-fg": "var(--vscode-commandCenter-inactiveForeground)",
-					"commandcenter-inactive-border": "var(--vscode-commandCenter-inactiveBorder)",
-					"commandcenter-active-border": "var(--vscode-commandCenter-activeBorder)",
-					"commandcenter-debugging-bg": "var(--vscode-commandCenter-debuggingBackground)",
+					'commandcenter-fg': 'var(--vscode-commandCenter-foreground)',
+					'commandcenter-active-fg': 'var(--vscode-commandCenter-activeForeground)',
+					'commandcenter-bg': 'var(--vscode-commandCenter-background)',
+					'commandcenter-active-bg': 'var(--vscode-commandCenter-activeBackground)',
+					'commandcenter-border': 'var(--vscode-commandCenter-border)',
+					'commandcenter-inactive-fg': 'var(--vscode-commandCenter-inactiveForeground)',
+					'commandcenter-inactive-border': 'var(--vscode-commandCenter-inactiveBorder)',
+					'commandcenter-active-border': 'var(--vscode-commandCenter-activeBorder)',
+					'commandcenter-debugging-bg': 'var(--vscode-commandCenter-debuggingBackground)',
 
 					// badge colors
-					"badge-fg": "var(--vscode-badge-foreground)",
-					"badge-bg": "var(--vscode-badge-background)",
+					'badge-fg': 'var(--vscode-badge-foreground)',
+					'badge-bg': 'var(--vscode-badge-background)',
 
 					// button colors
-					"button-bg": "var(--vscode-button-background)",
-					"button-fg": "var(--vscode-button-foreground)",
-					"button-border": "var(--vscode-button-border)",
-					"button-separator": "var(--vscode-button-separator)",
-					"button-hover-bg": "var(--vscode-button-hoverBackground)",
-					"button-secondary-fg": "var(--vscode-button-secondaryForeground)",
-					"button-secondary-bg": "var(--vscode-button-secondaryBackground)",
-					"button-secondary-hover-bg": "var(--vscode-button-secondaryHoverBackground)",
+					'button-bg': 'var(--vscode-button-background)',
+					'button-fg': 'var(--vscode-button-foreground)',
+					'button-border': 'var(--vscode-button-border)',
+					'button-separator': 'var(--vscode-button-separator)',
+					'button-hover-bg': 'var(--vscode-button-hoverBackground)',
+					'button-secondary-fg': 'var(--vscode-button-secondaryForeground)',
+					'button-secondary-bg': 'var(--vscode-button-secondaryBackground)',
+					'button-secondary-hover-bg': 'var(--vscode-button-secondaryHoverBackground)',
 
 					// checkbox colors
-					"checkbox-bg": "var(--vscode-checkbox-background)",
-					"checkbox-fg": "var(--vscode-checkbox-foreground)",
-					"checkbox-border": "var(--vscode-checkbox-border)",
-					"checkbox-select-bg": "var(--vscode-checkbox-selectBackground)",
+					'checkbox-bg': 'var(--vscode-checkbox-background)',
+					'checkbox-fg': 'var(--vscode-checkbox-foreground)',
+					'checkbox-border': 'var(--vscode-checkbox-border)',
+					'checkbox-select-bg': 'var(--vscode-checkbox-selectBackground)',
 
 					// sidebar colors
-					"sidebar-bg": "var(--vscode-sideBar-background)",
-					"sidebar-fg": "var(--vscode-sideBar-foreground)",
-					"sidebar-border": "var(--vscode-sideBar-border)",
-					"sidebar-drop-bg": "var(--vscode-sideBar-dropBackground)",
-					"sidebar-title-fg": "var(--vscode-sideBarTitle-foreground)",
-					"sidebar-header-bg": "var(--vscode-sideBarSectionHeader-background)",
-					"sidebar-header-fg": "var(--vscode-sideBarSectionHeader-foreground)",
-					"sidebar-header-border": "var(--vscode-sideBarSectionHeader-border)",
-					"sidebar-activitybartop-border": "var(--vscode-sideBarActivityBarTop-border)",
-					"sidebar-title-bg": "var(--vscode-sideBarTitle-background)",
-					"sidebar-title-border": "var(--vscode-sideBarTitle-border)",
-					"sidebar-stickyscroll-bg": "var(--vscode-sideBarStickyScroll-background)",
-					"sidebar-stickyscroll-border": "var(--vscode-sideBarStickyScroll-border)",
-					"sidebar-stickyscroll-shadow": "var(--vscode-sideBarStickyScroll-shadow)",
+					'sidebar-bg': 'var(--vscode-sideBar-background)',
+					'sidebar-fg': 'var(--vscode-sideBar-foreground)',
+					'sidebar-border': 'var(--vscode-sideBar-border)',
+					'sidebar-drop-bg': 'var(--vscode-sideBar-dropBackground)',
+					'sidebar-title-fg': 'var(--vscode-sideBarTitle-foreground)',
+					'sidebar-header-bg': 'var(--vscode-sideBarSectionHeader-background)',
+					'sidebar-header-fg': 'var(--vscode-sideBarSectionHeader-foreground)',
+					'sidebar-header-border': 'var(--vscode-sideBarSectionHeader-border)',
+					'sidebar-activitybartop-border': 'var(--vscode-sideBarActivityBarTop-border)',
+					'sidebar-title-bg': 'var(--vscode-sideBarTitle-background)',
+					'sidebar-title-border': 'var(--vscode-sideBarTitle-border)',
+					'sidebar-stickyscroll-bg': 'var(--vscode-sideBarStickyScroll-background)',
+					'sidebar-stickyscroll-border': 'var(--vscode-sideBarStickyScroll-border)',
+					'sidebar-stickyscroll-shadow': 'var(--vscode-sideBarStickyScroll-shadow)',
 
 					// other colors (these are partially complete)
 
 					// text formatting
-					"text-preformat-bg": "var(--vscode-textPreformat-background)",
-					"text-preformat-fg": "var(--vscode-textPreformat-foreground)",
+					'text-preformat-bg': 'var(--vscode-textPreformat-background)',
+					'text-preformat-fg': 'var(--vscode-textPreformat-foreground)',
 
 					// editor colors
-					"editor-bg": "var(--vscode-editor-background)",
-					"editor-fg": "var(--vscode-editor-foreground)",
+					'editor-bg': 'var(--vscode-editor-background)',
+					'editor-fg': 'var(--vscode-editor-foreground)',
 
 
 
 					// other
-					"editorwidget-bg": "var(--vscode-editorWidget-background)",
-					"toolbar-hover-bg": "var(--vscode-toolbar-hoverBackground)",
-					"toolbar-foreground": "var(--vscode-editorActionList-foreground)",
+					'editorwidget-bg': 'var(--vscode-editorWidget-background)',
+					'toolbar-hover-bg': 'var(--vscode-toolbar-hoverBackground)',
+					'toolbar-foreground': 'var(--vscode-editorActionList-foreground)',
 
-					"editorwidget-fg": "var(--vscode-editorWidget-foreground)",
-					"editorwidget-border": "var(--vscode-editorWidget-border)",
+					'editorwidget-fg': 'var(--vscode-editorWidget-foreground)',
+					'editorwidget-border': 'var(--vscode-editorWidget-border)',
 
-					"charts-orange": "var(--vscode-charts-orange)",
-					"charts-yellow": "var(--vscode-charts-yellow)",
+					'charts-orange': 'var(--vscode-charts-orange)',
+					'charts-yellow': 'var(--vscode-charts-yellow)',
 				},
 			},
 		},
 	},
-	plugins: [],
+	plugins: [
+		require('@tailwindcss/typography')
+	],
 	prefix: 'void-'
 }
 

src/vs/workbench/contrib/void/browser/react/tsup.config.js

@@ -7,6 +7,7 @@ import { defineConfig } from 'tsup'
 
 export default defineConfig({
 	entry: [
+		'./src2/void-command-bar-tsx/index.tsx',
 		'./src2/sidebar-tsx/index.tsx',
 		'./src2/void-settings-tsx/index.tsx',
 		'./src2/quick-edit-tsx/index.tsx',

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

@@ -7,8 +7,6 @@ import { Emitter, Event } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-// import { ILLMMessageService } from '../common/llmMessageService.js';
-// import { ServiceSendLLMMessageParams } from '../common/llmMessageTypes.js';
 
 
 
@@ -17,7 +15,7 @@ export interface ISearchReplaceService {
 }
 
 export const ISearchReplaceService = createDecorator<ISearchReplaceService>('SearchReplaceCacheService');
-class SearchReplaceService extends Disposable implements ISearchReplaceService {
+export class SearchReplaceService extends Disposable implements ISearchReplaceService {
 	_serviceBrand: undefined;
 
 	private readonly _onDidChangeState = new Emitter<void>();

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

@@ -11,24 +11,21 @@ import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js
 
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
-import { StagingSelectionItem, IChatThreadService } from '../common/chatThreadService.js';
 
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { IRange } from '../../../../editor/common/core/range.js';
 import { ITextModel } from '../../../../editor/common/model.js';
-import { VOID_VIEW_CONTAINER_ID, VOID_VIEW_ID } from './sidebarPane.js';
+import { VOID_VIEW_ID } from './sidebarPane.js';
 import { IMetricsService } from '../common/metricsService.js';
 import { ISidebarStateService } from './sidebarStateService.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { VOID_TOGGLE_SETTINGS_ACTION_ID } from './voidSettingsPane.js';
 import { VOID_CTRL_L_ACTION_ID } from './actionIDs.js';
-import { IWorkbenchContribution, registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
 import { ICodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { localize2 } from '../../../../nls.js';
-import { IViewsService } from '../../../services/views/common/viewsService.js';
-import { IVoidUriStateService } from './voidUriStateService.js';
+import { StagingSelectionItem } from '../common/chatThreadServiceTypes.js';
+import { IChatThreadService } from './chatThreadService.js';
 
 // ---------- Register commands and keybindings ----------
 
@@ -122,21 +119,23 @@ registerAction2(class extends Action2 {
 		const selection: StagingSelectionItem = !selectionRange || !selectionStr || (selectionRange.startLineNumber > selectionRange.endLineNumber) ? {
 			type: 'File',
 			fileURI: model.uri,
+			language: model.getLanguageId(),
 			selectionStr: null,
 			range: null,
-			state: { isOpened: false, }
+			state: { isOpened: false, wasAddedAsCurrentFile: false }
 		} : {
 			type: 'Selection',
 			fileURI: model.uri,
+			language: model.getLanguageId(),
 			selectionStr: selectionStr,
 			range: selectionRange,
-			state: { isOpened: true, }
+			state: { isOpened: true, wasAddedAsCurrentFile: false }
 		}
 
 		// update the staging selections
 		const chatThreadService = accessor.get(IChatThreadService)
 
-		const focusedMessageIdx = chatThreadService.getFocusedMessageIdx()
+		const focusedMessageIdx = chatThreadService.getCurrentFocusedMessageIdx()
 
 		// set the selections to the proper value
 		let selections: StagingSelectionItem[] = []
@@ -283,43 +282,3 @@ export class TabSwitchListener extends Disposable {
 		this._register(this._editorService.onCodeEditorAdd(editor => { initializeEditor(editor) }))
 	}
 }
-
-
-class TabSwitchContribution extends Disposable implements IWorkbenchContribution {
-	static readonly ID = 'workbench.contrib.void.tabswitch'
-
-	constructor(
-		@IInstantiationService private readonly instantiationService: IInstantiationService,
-		@IViewsService private readonly viewsService: IViewsService,
-		@IVoidUriStateService private readonly uriStateService: IVoidUriStateService,
-		@ICodeEditorService private readonly codeEditorService: ICodeEditorService,
-		// @ICommandService private readonly commandService: ICommandService,
-	) {
-		super()
-
-		// sidebarIsVisible state
-		let sidebarIsVisible = this.viewsService.isViewContainerVisible(VOID_VIEW_CONTAINER_ID)
-		this._register(this.viewsService.onDidChangeViewVisibility(e => {
-			sidebarIsVisible = e.visible
-		}))
-
-		const onSwitchTab = () => { // update state
-			if (sidebarIsVisible) {
-				const currentUri = this.codeEditorService.getActiveCodeEditor()?.getModel()?.uri
-				if (!currentUri) return;
-				this.uriStateService.setState({ currentUri })
-				// this.commandService.executeCommand(VOID_ADD_SELECTION_TO_SIDEBAR_ACTION_ID)
-			}
-		}
-
-		// when sidebar becomes visible, add current file
-		this._register(this.viewsService.onDidChangeViewVisibility(e => { sidebarIsVisible = e.visible }))
-
-		// run on current tab if it exists, and listen for tab switches and visibility changes
-		onSwitchTab()
-		this._register(this.viewsService.onDidChangeViewVisibility(() => { onSwitchTab() }))
-		this._register(this.instantiationService.createInstance(TabSwitchListener, () => { onSwitchTab() }))
-	}
-}
-
-registerWorkbenchContribution2(TabSwitchContribution.ID, TabSwitchContribution, WorkbenchPhase.BlockRestore);

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

@@ -38,7 +38,7 @@ import { mountSidebar } from './react/out/sidebar-tsx/index.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Orientation } from '../../../../base/browser/ui/sash/sash.js';
 // import { IDisposable } from '../../../../base/common/lifecycle.js';
-import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { toDisposable } from '../../../../base/common/lifecycle.js';
 import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
 import { IViewsService } from '../../../services/views/common/viewsService.js';
@@ -80,8 +80,8 @@ class SidebarViewPane extends ViewPane {
 		// gets set immediately
 		this.instantiationService.invokeFunction(accessor => {
 			// mount react
-			const disposables: IDisposable[] | undefined = mountSidebar(parent, accessor);
-			disposables?.forEach(d => this._register(d))
+			const disposeFn: (() => void) | undefined = mountSidebar(parent, accessor)?.dispose;
+			this._register(toDisposable(() => disposeFn?.()))
 		});
 	}
 

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

@@ -3,69 +3,229 @@
  *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
  *--------------------------------------------------------------------------------------*/
 
-import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
+import { removeAnsiEscapeCodes } from '../../../../base/common/strings.js';
 import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { ITerminalService, ITerminalInstance } from '../../../../workbench/contrib/terminal/browser/terminal.js';
 import { TerminalLocation } from '../../../../platform/terminal/common/terminal.js';
-import { generateUuid } from '../../../../base/common/uuid.js';
+import { ITerminalService, ITerminalInstance } from '../../../../workbench/contrib/terminal/browser/terminal.js';
+import { TerminalResolveReason } from '../common/toolsServiceTypes.js';
+import { MAX_TERMINAL_CHARS_PAGE, TERMINAL_BG_WAIT_TIME, TERMINAL_TIMEOUT_TIME } from './toolsService.js';
+
+
 
 export interface ITerminalToolService {
 	readonly _serviceBrand: undefined;
 
-	createNewTerminal(terminalId: string): Promise<string>;
-	runCommand(command: string, terminalId?: string): Promise<void>;
-	focus(terminalId: string): Promise<void>;
+	listTerminalIds(): string[];
+	runCommand(command: string, proposedTerminalId: string, waitForCompletion: boolean): Promise<{ terminalId: string, didCreateTerminal: boolean, result: string, resolveReason: TerminalResolveReason }>;
+	openTerminal(terminalId: string): Promise<void>
+	terminalExists(terminalId: string): boolean
 }
 
 export const ITerminalToolService = createDecorator<ITerminalToolService>('TerminalToolService');
 
+
+
+function isCommandComplete(output: string) {
+	// https://code.visualstudio.com/docs/terminal/shell-integration#_vs-code-custom-sequences-osc-633-st
+	const completionMatch = output.match(/\]633;D(?:;(\d+))?/)
+	if (!completionMatch) { return false }
+	if (completionMatch[1] !== undefined) return { exitCode: parseInt(completionMatch[1]) }
+	return { exitCode: 0 }
+}
+
+
+const nameOfId = (id: string) => {
+	if (id === '1') return 'Void Agent'
+	return `Void Agent (${id})`
+}
+const idOfName = (name: string) => {
+	if (name === 'Void Agent') return '1'
+
+	const match = name.match(/Void Agent \((\d+)\)/)
+	if (!match) return null
+	if (Number.isInteger(match[1]) && Number(match[1]) >= 1) return match[1]
+	return null
+}
+
 export class TerminalToolService extends Disposable implements ITerminalToolService {
 	readonly _serviceBrand: undefined;
 
-	private terminalInstances: Record<string, ITerminalInstance> = {}
+	private terminalInstanceOfId: Record<string, ITerminalInstance> = {}
 
 	constructor(
-		@ITerminalService private readonly terminalService: ITerminalService
+		@ITerminalService private readonly terminalService: ITerminalService,
 	) {
 		super();
-	}
 
-	async createNewTerminal() {
-		const terminalId = generateUuid();
-
-		this.terminalService.createTerminal({});
-		const terminal = await this.terminalService.createTerminal({
-			location: TerminalLocation.Editor,
-			config: { name: `Void Agent (${terminalId})`, }
-		});
-
-		this.terminalInstances[terminalId] = terminal
-		return terminalId;
-	}
-
-	async runCommand(command: string, terminalId?: string) {
-
-		if (!terminalId) {
-			terminalId = await this.createNewTerminal();
+		// runs on ALL terminals for simplicity
+		const initializeTerminal = (terminal: ITerminalInstance) => {
+			// when exit, remove
+			const d = terminal.onExit(() => {
+				const terminalId = idOfName(terminal.title)
+				if (terminalId !== null && (terminalId in this.terminalInstanceOfId)) delete this.terminalInstanceOfId[terminalId]
+				d.dispose()
+			})
 		}
 
-		const terminal = this.terminalInstances[terminalId];
-		if (!terminal) throw new Error(`Terminal with ID ${terminalId} does not exist`);
 
-		terminal.sendText(command, true);
-		return;
+		// initialize any terminals that are already open
+		for (const terminal of terminalService.instances) {
+			const proposedTerminalId = idOfName(terminal.title)
+			if (proposedTerminalId) this.terminalInstanceOfId[proposedTerminalId] = terminal
+
+			initializeTerminal(terminal)
+		}
+
+		this._register(
+			terminalService.onDidCreateInstance(terminal => { initializeTerminal(terminal) })
+		)
+
 	}
 
-	async focus(terminalId: string) {
-		const terminal = this.terminalInstances[terminalId];
-		if (!terminal) throw new Error(`That terminal was closed.`);
 
-
-		terminal.focus(true);
-		return;
+	listTerminalIds() {
+		return Object.keys(this.terminalInstanceOfId)
 	}
 
+	getValidNewTerminalId(): string {
+		// {1 2 3} # size 3, new=4
+		// {1 3 4} # size 3, new=2
+		// 1 <= newTerminalId <= n + 1
+		const n = Object.keys(this.terminalInstanceOfId).length;
+		if (n === 0) return '1'
+
+		for (let i = 1; i <= n + 1; i++) {
+			const potentialId = i + '';
+			if (!(potentialId in this.terminalInstanceOfId)) return potentialId;
+		}
+		throw new Error('This should never be reached by pigeonhole principle');
+	}
+
+
+
+	private async _getOrCreateTerminal(proposedTerminalId: string) {
+		// if terminal ID exists, return it
+		if (proposedTerminalId in this.terminalInstanceOfId) return { terminalId: proposedTerminalId, didCreateTerminal: false }
+
+		// create new terminal and return its ID
+		const terminalId = this.getValidNewTerminalId();
+		const terminal = await this.terminalService.createTerminal({
+			location: TerminalLocation.Panel,
+			config: { name: nameOfId(terminalId), title: nameOfId(terminalId) },
+		})
+
+
+		// when a new terminal is created, there is an initial command that gets run which is empty, wait for it to end before returning
+		const disposables: IDisposable[] = []
+		const waitForMount = new Promise<void>(res => {
+			let data = ''
+			const d = terminal.onData(newData => {
+				data += newData
+				if (isCommandComplete(data)) { res() }
+			})
+			disposables.push(d)
+		})
+		const waitForTimeout = new Promise<void>(res => { setTimeout(() => { res() }, 1000) })
+
+		await Promise.any([waitForMount, waitForTimeout,])
+		disposables.forEach(d => d.dispose())
+
+		this.terminalInstanceOfId[terminalId] = terminal
+		return { terminalId, didCreateTerminal: true }
+	}
+
+	terminalExists(terminalId: string): boolean {
+		return terminalId in this.terminalInstanceOfId
+	}
+
+
+	openTerminal: ITerminalToolService['openTerminal'] = async (terminalId) => {
+		if (!terminalId) return
+		const terminal = this.terminalInstanceOfId[terminalId]
+		if (!terminal) return // should never happen
+		this.terminalService.setActiveInstance(terminal)
+		await this.terminalService.focusActiveInstance()
+	}
+
+
+
+	runCommand: ITerminalToolService['runCommand'] = async (command, proposedTerminalId, waitForCompletion) => {
+		await this.terminalService.whenConnected;
+		const { terminalId, didCreateTerminal } = await this._getOrCreateTerminal(proposedTerminalId)
+		const terminal = this.terminalInstanceOfId[terminalId];
+		if (!terminal) throw new Error(`Unexpected internal error: Terminal with ID ${terminalId} did not exist.`);
+
+		// focus the terminal about to run
+		this.terminalService.setActiveInstance(terminal)
+		await this.terminalService.focusActiveInstance()
+
+		let result: string = ''
+		let resolveReason: TerminalResolveReason | undefined = undefined
+
+		const disposables: IDisposable[] = []
+
+		const waitUntilDone = new Promise<void>((res, rej) => {
+			const d2 = terminal.onData(async newData => {
+				if (resolveReason) return
+
+				result += newData
+
+				// onPageFull
+				if (result.length > MAX_TERMINAL_CHARS_PAGE) {
+					result = result.substring(0, MAX_TERMINAL_CHARS_PAGE)
+					await terminal.sendText('\x03', true) // interrupt the terminal with Ctrl+C
+					resolveReason = { type: 'toofull' }
+					res()
+					return
+				}
+
+				// onDone
+				const isDone = isCommandComplete(result)
+				if (isDone) {
+					resolveReason = { type: 'done', exitCode: isDone.exitCode }
+					res()
+					return
+				}
+			})
+			disposables.push(d2)
+		})
+
+
+		// send the command here
+		await terminal.sendText(command, true)
+
+		// timeout promise
+		const waitUntilTimeout = new Promise<void>((res, rej) => {
+			setTimeout(async () => {
+				if (resolveReason) return
+				await terminal.sendText('\x03', true) // interrupt the terminal with Ctrl+C
+				resolveReason = { type: waitForCompletion ? 'timeout' : 'bgtask' }
+				res()
+				return
+			}, (waitForCompletion ? TERMINAL_TIMEOUT_TIME : TERMINAL_BG_WAIT_TIME) * 1000)
+		})
+
+		await Promise.any([
+			waitUntilDone,
+			waitUntilTimeout,
+		])
+
+		disposables.forEach(d => d.dispose())
+
+		if (!resolveReason) throw new Error('Unexpected internal error: Promise.any should have resolved with a reason.')
+
+
+		result = removeAnsiEscapeCodes(result)
+			.split('\n').slice(1, -1) // remove first and last line (first = command, last = andrewpareles/void %)
+			.join('\n')
+
+		return { terminalId, didCreateTerminal, result, resolveReason }
+	}
+
+
+
 }
 
-registerSingleton(ITerminalToolService, TerminalToolService, InstantiationType.Eager);
+registerSingleton(ITerminalToolService, TerminalToolService, InstantiationType.Delayed);

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

@@ -0,0 +1,440 @@
+import { CancellationToken } from '../../../../base/common/cancellation.js'
+import { URI } from '../../../../base/common/uri.js'
+import { IFileService } from '../../../../platform/files/common/files.js'
+import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js'
+import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js'
+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 { ToolCallParams, ToolDirectoryItem, ToolName, 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'
+import { IVoidCommandBarService } from './voidCommandBarService.js'
+
+
+// tool use for AI
+
+
+
+
+type ValidateParams = { [T in ToolName]: (p: string) => 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: ToolResultType[T]) => string }
+
+
+
+
+// pagination info
+const MAX_FILE_CHARS_PAGE = 50_000
+const MAX_CHILDREN_URIs_PAGE = 500
+export const MAX_TERMINAL_CHARS_PAGE = 20_000
+export const TERMINAL_TIMEOUT_TIME = 15
+export const TERMINAL_BG_WAIT_TIME = 1
+
+
+
+const computeDirectoryResult = async (
+	fileService: IFileService,
+	rootURI: URI,
+	pageNumber: number = 1
+): Promise<ToolResultType['list_dir']> => {
+	const stat = await fileService.resolve(rootURI, { resolveMetadata: false });
+	if (!stat.isDirectory) {
+		return { children: null, hasNextPage: false, hasPrevPage: false, itemsRemaining: 0 };
+	}
+
+	const originalChildrenLength = stat.children?.length ?? 0;
+	const fromChildIdx = MAX_CHILDREN_URIs_PAGE * (pageNumber - 1);
+	const toChildIdx = MAX_CHILDREN_URIs_PAGE * pageNumber - 1; // INCLUSIVE
+	const listChildren = stat.children?.slice(fromChildIdx, toChildIdx + 1) ?? [];
+
+	const children: ToolDirectoryItem[] = listChildren.map(child => ({
+		name: child.name,
+		uri: child.resource,
+		isDirectory: child.isDirectory,
+		isSymbolicLink: child.isSymbolicLink
+	}));
+
+	const hasNextPage = (originalChildrenLength - 1) > toChildIdx;
+	const hasPrevPage = pageNumber > 1;
+	const itemsRemaining = Math.max(0, originalChildrenLength - (toChildIdx + 1));
+
+	return {
+		children,
+		hasNextPage,
+		hasPrevPage,
+		itemsRemaining
+	};
+};
+
+const directoryResultToString = (params: ToolCallParams['list_dir'], result: ToolResultType['list_dir']): string => {
+	if (!result.children) {
+		return `Error: ${params.rootURI} is not a directory`;
+	}
+
+	let output = '';
+	const entries = result.children;
+
+	if (!result.hasPrevPage) { // is first page
+		output += `${params.rootURI.fsPath}\n`;
+	}
+
+	for (let i = 0; i < entries.length; i++) {
+		const entry = entries[i];
+		const isLast = i === entries.length - 1 && !result.hasNextPage;
+		const prefix = isLast ? '└── ' : '├── ';
+
+		output += `${prefix}${entry.name}${entry.isDirectory ? '/' : ''}${entry.isSymbolicLink ? ' (symbolic link)' : ''}\n`;
+	}
+
+	if (result.hasNextPage) {
+		output += `└── (${result.itemsRemaining} results remaining...)\n`;
+	}
+
+	return output;
+};
+
+
+
+
+
+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 validateStr = (argName: string, value: unknown) => {
+	if (typeof value !== 'string') throw new Error(`Invalid LLM output format: ${argName} must be a string.`)
+	return value
+}
+
+
+// We are NOT checking to make sure in workspace
+const validateURI = (uriStr: unknown) => {
+	if (typeof uriStr !== 'string') throw new Error('Invalid LLM output format: Provided uri must be a string.')
+
+	const uri = URI.file(uriStr)
+	return uri
+}
+
+const validatePageNum = (pageNumberUnknown: unknown) => {
+	if (!pageNumberUnknown) return 1
+	const parsedInt = Number.parseInt(pageNumberUnknown + '')
+	if (!Number.isInteger(parsedInt)) throw new Error(`Page number was not an integer: "${pageNumberUnknown}".`)
+	if (parsedInt < 1) throw new Error(`Invalid LLM output format: Specified page number must be 1 or greater: "${pageNumberUnknown}".`)
+	return parsedInt
+}
+
+const validateRecursiveParamStr = (paramsUnknown: unknown) => {
+	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')
+	return isRecursive
+}
+
+const validateProposedTerminalId = (terminalIdUnknown: unknown) => {
+	if (!terminalIdUnknown) return '1'
+	const terminalId = terminalIdUnknown + ''
+	return terminalId
+}
+
+const validateWaitForCompletion = (b: unknown) => {
+	if (typeof b === 'string') {
+		if (b === 'true') return true
+		if (b === 'false') return false
+	}
+	return true // default is true
+}
+
+
+const checkIfIsFolder = (uriStr: string) => {
+	uriStr = uriStr.trim()
+	if (uriStr.endsWith('/') || uriStr.endsWith('\\')) return true
+	return false
+}
+
+export interface IToolsService {
+	readonly _serviceBrand: undefined;
+	validateParams: ValidateParams;
+	callTool: CallTool;
+	stringOfResult: ToolResultToString;
+}
+
+export const IToolsService = createDecorator<IToolsService>('ToolsService');
+
+export class ToolsService implements IToolsService {
+
+	readonly _serviceBrand: undefined;
+
+	public validateParams: ValidateParams;
+	public callTool: CallTool;
+	public stringOfResult: ToolResultToString;
+
+	constructor(
+		@IFileService fileService: IFileService,
+		@IWorkspaceContextService workspaceContextService: IWorkspaceContextService,
+		@ISearchService searchService: ISearchService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@IVoidModelService voidModelService: IVoidModelService,
+		@IEditCodeService editCodeService: IEditCodeService,
+		@ITerminalToolService private readonly terminalToolService: ITerminalToolService,
+		@IVoidCommandBarService private readonly commandBarService: IVoidCommandBarService,
+	) {
+
+		const queryBuilder = instantiationService.createInstance(QueryBuilder);
+
+		this.validateParams = {
+			read_file: async (params: string) => {
+				const o = validateJSON(params)
+				const { uri: uriStr, pageNumber: pageNumberUnknown } = o
+
+				const uri = validateURI(uriStr)
+				const pageNumber = validatePageNum(pageNumberUnknown)
+
+				return { uri, pageNumber }
+			},
+			list_dir: async (params: string) => {
+				const o = validateJSON(params)
+				const { uri: uriStr, pageNumber: pageNumberUnknown } = o
+
+				const uri = validateURI(uriStr)
+				const pageNumber = validatePageNum(pageNumberUnknown)
+				return { rootURI: uri, pageNumber }
+			},
+			pathname_search: async (params: string) => {
+				const o = validateJSON(params)
+				const { query: queryUnknown, pageNumber: pageNumberUnknown } = o
+
+				const queryStr = validateStr('query', queryUnknown)
+				const pageNumber = validatePageNum(pageNumberUnknown)
+
+				return { queryStr, pageNumber }
+
+			},
+			text_search: async (params: string) => {
+				const o = validateJSON(params)
+				const { query: queryUnknown, pageNumber: pageNumberUnknown } = o
+
+				const queryStr = validateStr('query', queryUnknown)
+				const pageNumber = validatePageNum(pageNumberUnknown)
+
+				return { queryStr, pageNumber }
+			},
+
+			// ---
+
+			create_uri: async (params: string) => {
+				const o = validateJSON(params)
+				const { uri: uriUnknown } = o
+				const uri = validateURI(uriUnknown)
+				const uriStr = validateStr('uri', uriUnknown)
+				const isFolder = checkIfIsFolder(uriStr)
+				return { uri, isFolder }
+			},
+
+			delete_uri: async (params: string) => {
+				const o = validateJSON(params)
+				const { uri: uriUnknown, params: paramsStr } = o
+				const uri = validateURI(uriUnknown)
+				const isRecursive = validateRecursiveParamStr(paramsStr)
+				const uriStr = validateStr('uri', uriUnknown)
+				const isFolder = checkIfIsFolder(uriStr)
+				return { uri, isRecursive, isFolder }
+			},
+
+			edit: async (params: string) => {
+				const o = validateJSON(params)
+				const { uri: uriStr, changeDescription: changeDescriptionUnknown } = o
+				const uri = validateURI(uriStr)
+				const changeDescription = validateStr('changeDescription', changeDescriptionUnknown)
+				return { uri, changeDescription }
+			},
+
+			terminal_command: async (s: string) => {
+				const o = validateJSON(s)
+				const { command: commandUnknown, terminalId: terminalIdUnknown, waitForCompletion: waitForCompletionUnknown } = o
+				const command = validateStr('command', commandUnknown)
+				const proposedTerminalId = validateProposedTerminalId(terminalIdUnknown)
+				const waitForCompletion = validateWaitForCompletion(waitForCompletionUnknown)
+				return { command, proposedTerminalId, waitForCompletion }
+			},
+
+		}
+
+
+		this.callTool = {
+			read_file: async ({ uri, pageNumber }) => {
+				await voidModelService.initializeModel(uri)
+				const { model } = await voidModelService.getModelSafe(uri)
+				if (model === null) { throw new Error(`Contents were empty. There may have been an error, or the file may not exist.`) }
+				const readFileContents = model.getValue(EndOfLinePreference.LF)
+
+				const fromIdx = MAX_FILE_CHARS_PAGE * (pageNumber - 1)
+				const toIdx = MAX_FILE_CHARS_PAGE * pageNumber - 1
+				const fileContents = readFileContents.slice(fromIdx, toIdx + 1) // paginate
+				const hasNextPage = (readFileContents.length - 1) - toIdx >= 1
+
+				return { result: { fileContents, hasNextPage } }
+			},
+
+			list_dir: async ({ rootURI, pageNumber }) => {
+				const dirResult = await computeDirectoryResult(fileService, rootURI, pageNumber)
+				return { result: dirResult }
+			},
+
+			pathname_search: async ({ queryStr, pageNumber }) => {
+				const query = queryBuilder.file(workspaceContextService.getWorkspace().folders.map(f => f.uri), {
+					filePattern: queryStr,
+				})
+				const data = await searchService.fileSearch(query, CancellationToken.None)
+
+				const fromIdx = MAX_CHILDREN_URIs_PAGE * (pageNumber - 1)
+				const toIdx = MAX_CHILDREN_URIs_PAGE * pageNumber - 1
+				const uris = data.results
+					.slice(fromIdx, toIdx + 1) // paginate
+					.map(({ resource, results }) => resource)
+
+				const hasNextPage = (data.results.length - 1) - toIdx >= 1
+				return { result: { uris, hasNextPage } }
+			},
+
+			text_search: async ({ queryStr, pageNumber }) => {
+				const query = queryBuilder.text({
+					pattern: queryStr,
+					isRegExp: true,
+				}, workspaceContextService.getWorkspace().folders.map(f => f.uri))
+
+				const data = await searchService.textSearch(query, CancellationToken.None)
+
+				const fromIdx = MAX_CHILDREN_URIs_PAGE * (pageNumber - 1)
+				const toIdx = MAX_CHILDREN_URIs_PAGE * pageNumber - 1
+				const uris = data.results
+					.slice(fromIdx, toIdx + 1) // paginate
+					.map(({ resource, results }) => resource)
+
+				const hasNextPage = (data.results.length - 1) - toIdx >= 1
+				return { result: { queryStr, uris, hasNextPage } }
+			},
+
+			// ---
+
+			create_uri: async ({ uri, isFolder }) => {
+				if (isFolder)
+					await fileService.createFolder(uri)
+				else {
+					await fileService.createFile(uri)
+				}
+				return { result: {} }
+			},
+
+			delete_uri: async ({ uri, isRecursive }) => {
+				await fileService.del(uri, { recursive: isRecursive })
+				return { result: {} }
+			},
+
+			edit: async ({ uri, changeDescription }) => {
+				await voidModelService.initializeModel(uri)
+				if (this.commandBarService.getStreamState(uri) === 'streaming') {
+					throw new Error(`The Apply model was already running. This can happen if two agents try editing the same file at the same time. Please try again in a moment.`)
+				}
+				const res = await editCodeService.startApplying({
+					uri,
+					applyStr: changeDescription,
+					from: 'ClickApply',
+					startBehavior: 'keep-conflicts',
+				})
+				if (!res) throw new Error(`The Apply model did not start running on ${basename(uri.fsPath)}. Please try again.`)
+				const [diffZoneURI, applyDonePromise] = res
+
+				const interruptTool = () => { // must reject the applyPromiseDone promise
+					editCodeService.interruptURIStreaming({ uri: diffZoneURI })
+				}
+				return { result: applyDonePromise, interruptTool }
+			},
+			terminal_command: async ({ command, proposedTerminalId, waitForCompletion }) => {
+				const { terminalId, didCreateTerminal, result, resolveReason } = await this.terminalToolService.runCommand(command, proposedTerminalId, waitForCompletion)
+				return { result: { terminalId, didCreateTerminal, result, resolveReason } }
+			},
+		}
+
+
+		const nextPageStr = (hasNextPage: boolean) => hasNextPage ? '\n\n(more on next page...)' : ''
+
+		// given to the LLM after the call
+		this.stringOfResult = {
+			read_file: (params, result) => {
+				return result.fileContents + nextPageStr(result.hasNextPage)
+			},
+			list_dir: (params, result) => {
+				const dirTreeStr = directoryResultToString(params, result)
+				return dirTreeStr // + nextPageStr(result.hasNextPage) // already handles num results remaining
+			},
+			pathname_search: (params, result) => {
+				return result.uris.map(uri => uri.fsPath).join('\n') + nextPageStr(result.hasNextPage)
+			},
+			text_search: (params, result) => {
+				return result.uris.map(uri => uri.fsPath).join('\n') + nextPageStr(result.hasNextPage)
+			},
+			// ---
+			create_uri: (params, result) => {
+				return `URI ${params.uri.fsPath} successfully created.`
+			},
+			delete_uri: (params, result) => {
+				return `URI ${params.uri.fsPath} successfully deleted.`
+			},
+			edit: (params, result) => {
+				console.log('STR OF RESULT', params)
+				return `Change successfully made to ${params.uri.fsPath}.`
+			},
+			terminal_command: (params, result) => {
+
+				const {
+					terminalId,
+					didCreateTerminal,
+					resolveReason,
+					result: result_,
+				} = result
+
+				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_}`
+				}
+				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_}`
+				}
+				else if (resolveReason.type === 'toofull') {
+					return `Terminal command executed in terminal ${terminalDesc}. Command was interrupted because output was too long. Result:\n${result_}`
+				}
+				else if (resolveReason.type === 'done') {
+					return `Terminal command executed in terminal ${terminalDesc}. Result (exit code ${resolveReason.exitCode}):\n${result_}`
+				}
+				throw new Error(`Unexpected internal error: Terminal command did not resolve with a valid reason.`)
+			},
+
+		}
+
+
+
+	}
+
+
+}
+
+registerSingleton(IToolsService, ToolsService, InstantiationType.Eager);

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

@@ -33,12 +33,23 @@ import './media/void.css'
 import './voidUpdateActions.js'
 
 
+// tools
+import './toolsService.js'
+import './terminalToolService.js'
 
+// register Thread History
+import './chatThreadService.js'
+
+// ping
+import './metricsPollService.js'
+
+// helper services
+import './helperServices/consistentItemService.js'
 
 // ---------- common (unclear if these actually need to be imported, because they're already imported wherever they're used) ----------
 
 // llmMessage
-import '../common/llmMessageService.js'
+import '../common/sendLLMMessageService.js'
 
 // voidSettings
 import '../common/voidSettingsService.js'
@@ -52,9 +63,5 @@ import '../common/metricsService.js'
 // updates
 import '../common/voidUpdateService.js'
 
-// tools
-import '../common/toolsService.js'
-
-// register Thread History
-import '../common/chatThreadService.js'
-
+// model service
+import '../common/voidModelService.js'

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

@@ -0,0 +1,443 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+import { Disposable, IDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { URI } from '../../../../base/common/uri.js';
+import * as dom from '../../../../base/browser/dom.js';
+import { Widget } from '../../../../base/browser/ui/widget.js';
+import { IOverlayWidget, ICodeEditor, OverlayWidgetPositionPreference } from '../../../../editor/browser/editorBrowser.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { mountVoidCommandBar } from './react/out/void-command-bar-tsx/index.js'
+import { deepClone } from '../../../../base/common/objects.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { IEditCodeService } from './editCodeServiceInterface.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { generateUuid } from '../../../../base/common/uuid.js';
+
+
+
+export interface IVoidCommandBarService {
+	readonly _serviceBrand: undefined;
+	stateOfURI: { [uri: string]: CommandBarStateType };
+	sortedURIs: URI[];
+	activeURI: URI | null;
+
+	onDidChangeState: Event<{ uri: URI }>;
+	onDidChangeActiveURI: Event<{ uri: URI | null }>;
+
+	getStreamState: (uri: URI) => 'streaming' | 'idle-has-changes' | 'idle-no-changes';
+	setDiffIdx(uri: URI, newIdx: number | null): void;
+
+	acceptOrRejectAllFiles(opts: { behavior: 'reject' | 'accept' }): void;
+	anyFileIsStreaming(): boolean;
+
+}
+
+
+export const IVoidCommandBarService = createDecorator<IVoidCommandBarService>('VoidCommandBarService');
+
+
+export type CommandBarStateType = undefined | {
+	sortedDiffZoneIds: string[]; // sorted by line number
+	sortedDiffIds: string[]; // sorted by line number (computed)
+	isStreaming: boolean; // is any diffZone streaming in this URI
+
+	diffIdx: number | null; // must refresh whenever sortedDiffIds does so it's valid
+}
+
+
+
+const defaultState: NonNullable<CommandBarStateType> = {
+	sortedDiffZoneIds: [],
+	sortedDiffIds: [],
+	isStreaming: false,
+	diffIdx: null,
+}
+
+
+export class VoidCommandBarService extends Disposable implements IVoidCommandBarService {
+	_serviceBrand: undefined;
+
+	static readonly ID: 'void.VoidCommandBarService'
+
+	// depends on uri -> diffZone -> {streaming, diffs}
+	public stateOfURI: { [uri: string]: CommandBarStateType } = {}
+	public sortedURIs: URI[] = [] // keys of state (depends on diffZones in the uri)
+	private readonly _listenToTheseURIs = new Set<URI>() // uriFsPaths
+
+	// Emits when a URI's stream state changes between idle, streaming, and acceptRejectAll
+	private readonly _onDidChangeState = new Emitter<{ uri: URI }>();
+	readonly onDidChangeState = this._onDidChangeState.event;
+
+
+	// active URI
+	activeURI: URI | null = null;
+	private readonly _onDidChangeActiveURI = new Emitter<{ uri: URI | null }>();
+	readonly onDidChangeActiveURI = this._onDidChangeActiveURI.event;
+
+	constructor(
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
+		@IModelService private readonly _modelService: IModelService,
+		@IEditCodeService private readonly _editCodeService: IEditCodeService,
+	) {
+		super();
+
+
+		const registeredModelURIs = new Set<string>()
+		const initializeModel = async (model: ITextModel) => {
+			// do not add listeners to the same model twice - important, or will see duplicates
+			if (registeredModelURIs.has(model.uri.fsPath)) return
+			registeredModelURIs.add(model.uri.fsPath)
+			this._listenToTheseURIs.add(model.uri)
+		}
+		// initialize all existing models + initialize when a new model mounts
+		this._modelService.getModels().forEach(model => { initializeModel(model) })
+		this._register(this._modelService.onModelAdded(model => { initializeModel(model) }));
+
+
+
+
+
+
+		// for every new editor, add the floating widget and update active URI
+		const disposablesOfEditorId: { [editorId: string]: IDisposable[] } = {};
+		const onCodeEditorAdd = (editor: ICodeEditor) => {
+			const id = editor.getId();
+			disposablesOfEditorId[id] = [];
+
+			// mount the command bar
+			const d1 = this._instantiationService.createInstance(AcceptRejectAllFloatingWidget, { editor });
+			disposablesOfEditorId[id].push(d1);
+			const d2 = editor.onDidChangeModel((e) => {
+				if (e.newModelUrl?.scheme !== 'file') return
+				this.activeURI = e.newModelUrl;
+				this._onDidChangeActiveURI.fire({ uri: e.newModelUrl })
+			})
+			disposablesOfEditorId[id].push(d2);
+		}
+		const onCodeEditorRemove = (editor: ICodeEditor) => {
+			const id = editor.getId();
+			if (disposablesOfEditorId[id]) {
+				disposablesOfEditorId[id].forEach(d => d.dispose());
+				delete disposablesOfEditorId[id];
+			}
+		}
+		this._register(this._codeEditorService.onCodeEditorAdd((editor) => { onCodeEditorAdd(editor) }))
+		this._register(this._codeEditorService.onCodeEditorRemove((editor) => { onCodeEditorRemove(editor) }))
+		this._codeEditorService.listCodeEditors().forEach(editor => { onCodeEditorAdd(editor) })
+
+		// state updaters
+		this._register(this._editCodeService.onDidAddOrDeleteDiffZones(e => {
+			for (const uri of this._listenToTheseURIs) {
+				if (e.uri.fsPath !== uri.fsPath) continue
+				// --- sortedURIs: delete if empty, add if not in state yet
+				const diffZones = this._getDiffZonesOnURI(uri)
+				if (diffZones.length === 0) {
+					this._deleteURIEntryFromState(uri)
+					this._onDidChangeState.fire({ uri })
+					continue // deleted, so done
+				}
+				if (!this.sortedURIs.find(uri2 => uri2.fsPath === uri.fsPath)) {
+					this._addURIEntryToState(uri)
+				}
+
+				const currState = this.stateOfURI[uri.fsPath]
+				if (!currState) continue // should never happen
+				// update state of the diffZones on this URI
+				const oldDiffZones = currState.sortedDiffZoneIds
+				const currentDiffZones = this._editCodeService.diffAreasOfURI[uri.fsPath] || [] // a Set
+				const { addedDiffZones, deletedDiffZones } = this._getDiffZoneChanges(oldDiffZones, currentDiffZones || [])
+
+				const diffZonesWithoutDeleted = oldDiffZones.filter(olddiffareaid => !deletedDiffZones.has(olddiffareaid))
+
+				// --- new state:
+				const newSortedDiffZoneIds = [
+					...diffZonesWithoutDeleted,
+					...addedDiffZones,
+				]
+				const newSortedDiffIds = this._computeSortedDiffs(newSortedDiffZoneIds)
+				const isStreaming = this._isAnyDiffZoneStreaming(currentDiffZones)
+
+				this._setState(uri, {
+					sortedDiffZoneIds: newSortedDiffZoneIds,
+					sortedDiffIds: newSortedDiffIds,
+					isStreaming: isStreaming
+				})
+				this._onDidChangeState.fire({ uri })
+			}
+
+		}))
+		this._register(this._editCodeService.onDidChangeDiffsInDiffZone(e => {
+			for (const uri of this._listenToTheseURIs) {
+				if (e.uri.fsPath !== uri.fsPath) continue
+				// --- sortedURIs: no change
+				// --- state:
+				// sortedDiffIds gets a change to it, so gets recomputed
+				const currState = this.stateOfURI[uri.fsPath]
+				if (!currState) continue // should never happen
+				const { sortedDiffZoneIds } = currState
+				const newSortedDiffIds = this._computeSortedDiffs(sortedDiffZoneIds)
+				this._setState(uri, {
+					sortedDiffIds: newSortedDiffIds,
+					// sortedDiffZoneIds, // no change
+					// isStreaming, // no change
+				})
+				this._onDidChangeState.fire({ uri })
+			}
+		}))
+		this._register(this._editCodeService.onDidChangeStreamingInDiffZone(e => {
+			for (const uri of this._listenToTheseURIs) {
+				if (e.uri.fsPath !== uri.fsPath) continue
+				// --- sortedURIs: no change
+				// --- state:
+				const currState = this.stateOfURI[uri.fsPath]
+				if (!currState) continue // should never happen
+				const { sortedDiffZoneIds } = currState
+				this._setState(uri, {
+					isStreaming: this._isAnyDiffZoneStreaming(sortedDiffZoneIds),
+					// sortedDiffIds, // no change
+					// sortedDiffZoneIds, // no change
+				})
+				this._onDidChangeState.fire({ uri })
+			}
+		}))
+
+	}
+
+
+	setDiffIdx(uri: URI, newIdx: number | null): void {
+		this._setState(uri, { diffIdx: newIdx });
+		this._onDidChangeState.fire({ uri });
+	}
+
+
+	getStreamState(uri: URI) {
+		const { isStreaming, sortedDiffZoneIds } = this.stateOfURI[uri.fsPath] ?? {}
+		if (isStreaming) {
+			return 'streaming'
+		}
+		if ((sortedDiffZoneIds?.length ?? 0) > 0) {
+			return 'idle-has-changes'
+		}
+		return 'idle-no-changes'
+	}
+
+
+	_computeSortedDiffs(diffareaids: string[]) {
+		const sortedDiffIds = [];
+		for (const diffareaid of diffareaids) {
+			const diffZone = this._editCodeService.diffAreaOfId[diffareaid];
+			if (!diffZone || diffZone.type !== 'DiffZone') {
+				continue;
+			}
+
+			// Add all diff ids from this diffzone
+			const diffIds = Object.keys(diffZone._diffOfId);
+			sortedDiffIds.push(...diffIds);
+		}
+
+		return sortedDiffIds;
+	}
+
+	_getDiffZoneChanges(oldDiffZones: Iterable<string>, currentDiffZones: Iterable<string>) {
+		// Find the added or deleted diffZones by comparing diffareaids
+		const addedDiffZoneIds = new Set<string>();
+		const deletedDiffZoneIds = new Set<string>();
+
+		// Convert the current diffZones to a set of ids for easy lookup
+		const currentDiffZoneIdSet = new Set(currentDiffZones);
+
+		// Find deleted diffZones (in old but not in current)
+		for (const oldDiffZoneId of oldDiffZones) {
+			if (!currentDiffZoneIdSet.has(oldDiffZoneId)) {
+				const diffZone = this._editCodeService.diffAreaOfId[oldDiffZoneId];
+				if (diffZone && diffZone.type === 'DiffZone') {
+					deletedDiffZoneIds.add(oldDiffZoneId);
+				}
+			}
+		}
+
+		// Find added diffZones (in current but not in old)
+		const oldDiffZoneIdSet = new Set(oldDiffZones);
+		for (const currentDiffZoneId of currentDiffZones) {
+			if (!oldDiffZoneIdSet.has(currentDiffZoneId)) {
+				const diffZone = this._editCodeService.diffAreaOfId[currentDiffZoneId];
+				if (diffZone && diffZone.type === 'DiffZone') {
+					addedDiffZoneIds.add(currentDiffZoneId);
+				}
+			}
+		}
+
+		return { addedDiffZones: addedDiffZoneIds, deletedDiffZones: deletedDiffZoneIds }
+	}
+
+	_isAnyDiffZoneStreaming(diffareaids: Iterable<string>) {
+		for (const diffareaid of diffareaids) {
+			const diffZone = this._editCodeService.diffAreaOfId[diffareaid];
+			if (!diffZone || diffZone.type !== 'DiffZone') {
+				continue;
+			}
+			if (diffZone._streamState.isStreaming) {
+				return true;
+			}
+		}
+		return false
+	}
+
+
+	_setState(uri: URI, opts: Partial<CommandBarStateType>) {
+		const newState = {
+			...this.stateOfURI[uri.fsPath] ?? deepClone(defaultState),
+			...opts
+		}
+
+		// make sure diffIdx is always correct
+		if (newState.diffIdx && newState.diffIdx > newState.sortedDiffIds.length) {
+			newState.diffIdx = newState.sortedDiffIds.length
+			if (newState.diffIdx < 0) newState.diffIdx = null
+		}
+
+		this.stateOfURI = {
+			...this.stateOfURI,
+			[uri.fsPath]: newState
+		}
+	}
+
+
+	_addURIEntryToState(uri: URI) {
+		// add to sortedURIs
+		this.sortedURIs = [
+			...this.sortedURIs,
+			uri
+		]
+
+		// add to state
+		this.stateOfURI[uri.fsPath] = deepClone(defaultState)
+	}
+
+	_deleteURIEntryFromState(uri: URI) {
+		// delete this from sortedURIs
+		const i = this.sortedURIs.findIndex(uri2 => uri2.fsPath === uri.fsPath)
+		if (i === -1) return
+		this.sortedURIs = [
+			...this.sortedURIs.slice(0, i),
+			...this.sortedURIs.slice(i + 1, Infinity),
+		]
+		// delete from state
+		delete this.stateOfURI[uri.fsPath]
+	}
+
+
+
+	private _getDiffZonesOnURI(uri: URI) {
+		const diffZones = [...this._editCodeService.diffAreasOfURI[uri.fsPath]?.values() ?? []]
+			.map(diffareaid => this._editCodeService.diffAreaOfId[diffareaid])
+			.filter(diffArea => !!diffArea && diffArea.type === 'DiffZone')
+		return diffZones
+	}
+
+
+	anyFileIsStreaming() {
+		return this.sortedURIs.some(uri => this.getStreamState(uri) === 'streaming')
+	}
+
+	acceptOrRejectAllFiles(opts: { behavior: 'reject' | 'accept' }) {
+		const { behavior } = opts
+		// if anything is streaming, do nothing
+		const anyIsStreaming = this.anyFileIsStreaming()
+		if (anyIsStreaming) return
+		for (const uri of this.sortedURIs) {
+			this._editCodeService.acceptOrRejectAllDiffAreas({ uri, behavior, removeCtrlKs: false })
+		}
+	}
+
+
+}
+
+registerSingleton(IVoidCommandBarService, VoidCommandBarService, InstantiationType.Delayed); // delayed is needed here :(
+
+// registerWorkbenchContribution2(VoidCommandBarService.ID, VoidCommandBarService, WorkbenchPhase.BlockRestore);
+
+
+export type VoidCommandBarProps = {
+	uri: URI | null;
+	editor: ICodeEditor;
+}
+
+
+
+
+class AcceptRejectAllFloatingWidget extends Widget implements IOverlayWidget {
+	private readonly _domNode: HTMLElement;
+	private readonly editor: ICodeEditor;
+	private readonly ID: string;
+
+	_height = 0
+
+	constructor({ editor }: { editor: ICodeEditor, },
+		@IInstantiationService private readonly instantiationService: IInstantiationService,
+	) {
+		super();
+
+		this.ID = generateUuid();
+		this.editor = editor;
+		// Create container div
+		const { root } = dom.h('div@root');
+
+		// Style the container
+		// root.style.backgroundColor = 'rgb(248 113 113)';
+		root.style.height = '16rem'; // make a fixed size, and all contents go on the bottom right. this fixes annoying VS Code mounting issues
+		root.style.width = '16rem';
+		root.style.flexDirection = 'column';
+		root.style.justifyContent = 'flex-end';
+		root.style.alignItems = 'flex-end';
+		root.style.zIndex = '2';
+		root.style.padding = '4px';
+		root.style.pointerEvents = 'none';
+		root.style.display = 'flex';
+		root.style.overflow = 'hidden';
+
+
+		this._domNode = root;
+		editor.addOverlayWidget(this);
+
+		this.instantiationService.invokeFunction(accessor => {
+			const uri = editor.getModel()?.uri || null
+			const res = mountVoidCommandBar(root, accessor, { uri, editor } satisfies VoidCommandBarProps)
+			if (!res) return
+			this._register(toDisposable(() => res.dispose?.()))
+			this._register(editor.onWillChangeModel((model) => {
+				const uri = model.newModelUrl
+				res.rerender({ uri, editor } satisfies VoidCommandBarProps)
+			}))
+		})
+	}
+
+
+	public getId(): string {
+		return this.ID;
+	}
+
+	public getDomNode(): HTMLElement {
+		return this._domNode;
+	}
+
+	public getPosition() {
+		return {
+			preference: OverlayWidgetPositionPreference.BOTTOM_RIGHT_CORNER
+		}
+	}
+
+	public override dispose(): void {
+		this.editor.removeOverlayWidget(this);
+		super.dispose();
+	}
+}
+
+

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

@@ -25,7 +25,7 @@ import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextke
 
 import { mountVoidSettings } from './react/out/void-settings-tsx/index.js'
 import { Codicon } from '../../../../base/common/codicons.js';
-import { IDisposable } from '../../../../base/common/lifecycle.js';
+import { toDisposable } from '../../../../base/common/lifecycle.js';
 
 
 // refer to preferences.contribution.ts keybindings editor
@@ -90,12 +90,12 @@ class VoidSettingsPane extends EditorPane {
 
 		// Mount React into the scrollable content
 		this.instantiationService.invokeFunction(accessor => {
-			const disposables: IDisposable[] | undefined = mountVoidSettings(settingsElt, accessor);
+			const disposeFn = mountVoidSettings(settingsElt, accessor)?.dispose;
+			this._register(toDisposable(() => disposeFn?.()))
 
 			// setTimeout(() => { // this is a complete hack and I don't really understand how scrollbar works here
 			// 	this._scrollbar?.scanDomNode();
 			// }, 1000)
-			disposables?.forEach(d => this._register(d));
 		});
 	}
 

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

@@ -17,11 +17,41 @@ import * as dom from '../../../../base/browser/dom.js';
 
 
 
-const notifyYesUpdate = (notifService: INotificationService, msg?: string) => {
-	const message = msg || 'This is a very old version of void, please download the latest version! [Void Editor](https://voideditor.com/download-beta)!'
-	notifService.notify({
+const notifyYesUpdate = (notifService: INotificationService, res: { message?: string } = {}) => {
+	const message = res?.message || 'This is a very old version of Void, please download the latest version! [Void Editor](https://voideditor.com/download-beta)!'
+	const notifController = notifService.notify({
 		severity: Severity.Info,
 		message: message,
+		sticky: true,
+		progress: { worked: 0, total: 100 },
+		actions: {
+			primary: [{
+				id: 'void.updater.update',
+				enabled: true,
+				label: `Reinstall`,
+				tooltip: '',
+				class: undefined,
+				run: () => {
+					const { window } = dom.getActiveWindow()
+					window.open('https://voideditor.com/download-beta')
+				}
+			},
+			{
+				id: 'void.updater.site',
+				enabled: true,
+				label: `Void Site`,
+				tooltip: '',
+				class: undefined,
+				run: () => {
+					const { window } = dom.getActiveWindow()
+					window.open('https://voideditor.com/')
+				}
+			}]
+		},
+	})
+	const d = notifController.onDidClose(() => {
+		notifyYesUpdate(notifService, res)
+		d.dispose()
 	})
 }
 const notifyNoUpdate = (notifService: INotificationService) => {
@@ -35,6 +65,7 @@ const notifyErrChecking = (notifService: INotificationService) => {
 	notifService.notify({
 		severity: Severity.Info,
 		message: message,
+		sticky: true,
 	})
 }
 
@@ -57,7 +88,7 @@ registerAction2(class extends Action2 {
 		metricsService.capture('Void Update Manual: Checking...', {})
 		const res = await voidUpdateService.check()
 		if (!res) { notifyErrChecking(notifService); metricsService.capture('Void Update Manual: Error', { res }) }
-		else if (res.hasUpdate) { notifyYesUpdate(notifService, res.message); metricsService.capture('Void Update Manual: Yes', { 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 }) }
 	}
 })
@@ -75,19 +106,19 @@ class VoidUpdateWorkbenchContribution extends Disposable implements IWorkbenchCo
 			this.metricsService.capture('Void Update Startup: Checking...', {})
 			const res = await this.voidUpdateService.check()
 			if (!res) { notifyErrChecking(this.notifService); this.metricsService.capture('Void Update Startup: Error', { res }) }
-			else if (res.hasUpdate) { notifyYesUpdate(this.notifService, res.message); this.metricsService.capture('Void Update Startup: Yes', { 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
 		}
 
 		// check once 5 seconds after mount
-
-		const initId = setTimeout(() => autoCheck(), 5 * 1000)
-		this._register({ dispose: () => clearTimeout(initId) })
-
 		// check every 3 hours
 		const { window } = dom.getActiveWindow()
 
-		const intervalId = window.setInterval(() => autoCheck(), 3 * 60 * 60 * 1000)
+		const initId = window.setTimeout(() => autoCheck(), 5 * 1000)
+		this._register({ dispose: () => window.clearTimeout(initId) })
+
+
+		const intervalId = window.setInterval(() => autoCheck(), 3 * 60 * 60 * 1000) // every 3 hrs
 		this._register({ dispose: () => window.clearInterval(intervalId) })
 
 	}

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

@@ -1,57 +0,0 @@
-/*--------------------------------------------------------------------------------------
- *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
- *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
- *--------------------------------------------------------------------------------------*/
-
-import { Emitter, Event } from '../../../../base/common/event.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { URI } from '../../../../base/common/uri.js';
-import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-
-
-
-// service that manages state
-export type VoidUriState = {
-	currentUri?: URI
-}
-
-export interface IVoidUriStateService {
-	readonly _serviceBrand: undefined;
-
-	readonly state: VoidUriState; // readonly to the user
-	setState(newState: Partial<VoidUriState>): void;
-	onDidChangeState: Event<void>;
-}
-
-export const IVoidUriStateService = createDecorator<IVoidUriStateService>('voidUriStateService');
-class VoidUriStateService extends Disposable implements IVoidUriStateService {
-	_serviceBrand: undefined;
-
-	static readonly ID = 'voidUriStateService';
-
-	private readonly _onDidChangeState = new Emitter<void>();
-	readonly onDidChangeState: Event<void> = this._onDidChangeState.event;
-
-
-	// state
-	state: VoidUriState
-
-	constructor(
-	) {
-		super()
-
-		// initial state
-		this.state = { currentUri: undefined }
-	}
-
-	setState(newState: Partial<VoidUriState>) {
-
-		this.state = { ...this.state, ...newState }
-		this._onDidChangeState.fire()
-	}
-
-
-}
-
-registerSingleton(IVoidUriStateService, VoidUriStateService, InstantiationType.Eager);

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

@@ -1,631 +0,0 @@
-/*--------------------------------------------------------------------------------------
- *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
- *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
- *--------------------------------------------------------------------------------------*/
-
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
-
-import { URI } from '../../../../base/common/uri.js';
-import { Emitter, Event } from '../../../../base/common/event.js';
-import { IRange } from '../../../../editor/common/core/range.js';
-import { ILLMMessageService } from './llmMessageService.js';
-import { chat_userMessageContent, chat_systemMessage, chat_userMessageContentWithAllFilesToo, chat_selectionsString } from '../browser/prompt/prompts.js';
-import { InternalToolInfo, IToolsService, ToolCallReturnType, ToolName, voidTools } from './toolsService.js';
-import { toLLMChatMessage, ToolCallType } from './llmMessageTypes.js';
-import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
-import { IVoidFileService } from './voidFileService.js';
-import { generateUuid } from '../../../../base/common/uuid.js';
-import { getErrorMessage } from '../../../../base/common/errors.js';
-
-
-const findLastIndex = <T>(arr: T[], condition: (t: T) => boolean): number => {
-	for (let i = arr.length - 1; i >= 0; i--) {
-		if (condition(arr[i])) {
-			return i;
-		}
-	}
-	return -1;
-}
-
-
-// one of the square items that indicates a selection in a chat bubble (NOT a file, a Selection of text)
-export type CodeSelection = {
-	type: 'Selection';
-	fileURI: URI;
-	selectionStr: string;
-	range: IRange;
-	state: {
-		isOpened: boolean;
-	};
-}
-
-export type FileSelection = {
-	type: 'File';
-	fileURI: URI;
-	selectionStr: null;
-	range: null;
-	state: {
-		isOpened: boolean;
-	};
-}
-
-export type StagingSelectionItem = CodeSelection | FileSelection
-
-
-export type ToolMessage<T extends ToolName> = {
-	role: 'tool';
-	name: T; // internal use
-	params: string; // internal use
-	id: string; // apis require this tool use id
-	content: string; // give this result to LLM
-	result: { type: 'success'; value: ToolCallReturnType[T], } | { type: 'error'; value: string }; // give this result to user
-}
-// WARNING: changing this format is a big deal!!!!!! need to migrate old format to new format on users' computers so people don't get errors.
-export type ChatMessage =
-	{
-		role: 'user';
-		content: string | null; // content displayed to the LLM on future calls - allowed to be '', will be replaced with (empty)
-		displayContent: string | null; // content displayed to user  - allowed to be '', will be ignored
-		selections: StagingSelectionItem[] | null; // the user's selection
-		state: {
-			stagingSelections: StagingSelectionItem[];
-			isBeingEdited: boolean;
-		}
-	} | {
-		role: 'assistant';
-		content: string | null; // content received from LLM  - allowed to be '', will be replaced with (empty)
-		reasoning: string | null; // reasoning from the LLM, used for step-by-step thinking
-	}
-	| ToolMessage<ToolName>
-
-type UserMessageType = ChatMessage & { role: 'user' }
-type UserMessageState = UserMessageType['state']
-
-export const defaultMessageState: UserMessageState = {
-	stagingSelections: [],
-	isBeingEdited: false,
-}
-
-// a 'thread' means a chat message history
-export type ChatThreads = {
-	[id: string]: {
-		id: string; // store the id here too
-		createdAt: string; // ISO string
-		lastModified: string; // ISO string
-		messages: ChatMessage[];
-		state: {
-			stagingSelections: StagingSelectionItem[];
-			focusedMessageIdx: number | undefined; // index of the message that is being edited (undefined if none)
-			isCheckedOfSelectionId: { [selectionId: string]: boolean }; // TODO
-		}
-	};
-}
-
-type ThreadType = ChatThreads[string]
-
-const defaultThreadState: ThreadType['state'] = {
-	stagingSelections: [],
-	focusedMessageIdx: undefined,
-	isCheckedOfSelectionId: {}
-}
-
-export type ThreadsState = {
-	allThreads: ChatThreads;
-	currentThreadId: string; // intended for internal use only
-}
-
-export type ThreadStreamState = {
-	[threadId: string]: undefined | {
-		error?: { message: string, fullError: Error | null, };
-		messageSoFar?: string;
-		reasoningSoFar?: string;
-		streamingToken?: string;
-	}
-}
-
-
-const newThreadObject = () => {
-	const now = new Date().toISOString()
-	return {
-		id: generateUuid(),
-		createdAt: now,
-		lastModified: now,
-		messages: [],
-		state: defaultThreadState,
-
-	} satisfies ChatThreads[string]
-}
-
-export const THREAD_STORAGE_KEY = 'void.chatThreadStorage'
-
-
-type ChatMode = 'agent' | 'chat'
-export interface IChatThreadService {
-	readonly _serviceBrand: undefined;
-
-	readonly state: ThreadsState;
-	readonly streamState: ThreadStreamState;
-
-	onDidChangeCurrentThread: Event<void>;
-	onDidChangeStreamState: Event<{ threadId: string }>
-
-	getCurrentThread(): ChatThreads[string];
-	openNewThread(): void;
-	switchToThread(threadId: string): void;
-
-	// you can edit multiple messages
-	// the one you're currently editing is "focused", and we add items to that one when you press cmd+L.
-	getFocusedMessageIdx(): number | undefined;
-	isFocusingMessage(): boolean;
-	setFocusedMessageIdx(messageIdx: number | undefined): void;
-
-	// exposed getters/setters
-	getCurrentMessageState: (messageIdx: number) => UserMessageState
-	setCurrentMessageState: (messageIdx: number, newState: Partial<UserMessageState>) => void
-	getCurrentThreadState: () => ThreadType['state']
-	setCurrentThreadState: (newState: Partial<ThreadType['state']>) => void
-
-
-	// call to edit a message
-	editUserMessageAndStreamResponse({ userMessage, chatMode, messageIdx }: { userMessage: string, chatMode: ChatMode, messageIdx: number }): Promise<void>;
-
-	// call to add a message
-	addUserMessageAndStreamResponse({ userMessage, chatMode }: { userMessage: string, chatMode: ChatMode }): Promise<void>;
-
-	cancelStreaming(threadId: string): void;
-	dismissStreamError(threadId: string): void;
-
-}
-
-export const IChatThreadService = createDecorator<IChatThreadService>('voidChatThreadService');
-class ChatThreadService extends Disposable implements IChatThreadService {
-	_serviceBrand: undefined;
-
-	// this fires when the current thread changes at all (a switch of currentThread, or a message added to it, etc)
-	private readonly _onDidChangeCurrentThread = new Emitter<void>();
-	readonly onDidChangeCurrentThread: Event<void> = this._onDidChangeCurrentThread.event;
-
-	readonly streamState: ThreadStreamState = {}
-	private readonly _onDidChangeStreamState = new Emitter<{ threadId: string }>();
-	readonly onDidChangeStreamState: Event<{ threadId: string }> = this._onDidChangeStreamState.event;
-
-	state: ThreadsState // allThreads is persisted, currentThread is not
-
-	constructor(
-		@IStorageService private readonly _storageService: IStorageService,
-		@IVoidFileService private readonly _voidFileService: IVoidFileService,
-		@ILLMMessageService private readonly _llmMessageService: ILLMMessageService,
-		@IToolsService private readonly _toolsService: IToolsService,
-		@IWorkspaceContextService private readonly _workspaceContextService: IWorkspaceContextService,
-	) {
-		super()
-		this.state = { allThreads: {}, currentThreadId: null as unknown as string } // default state
-
-		const readThreads = this._readAllThreads() || {}
-
-		const allThreads = readThreads
-		this.state = {
-			allThreads: allThreads,
-			currentThreadId: null as unknown as string, // gets set in startNewThread()
-		}
-
-		// always be in a thread
-		this.openNewThread()
-	}
-
-	// !!! this is important for properly restoring URIs from storage
-	private _convertThreadDataFromStorage(threadsStr: string): ChatThreads {
-		return JSON.parse(threadsStr, (key, value) => {
-			if (value && typeof value === 'object' && value.$mid === 1) { //$mid is the MarshalledId. $mid === 1 means it is a URI
-				return URI.from(value);
-			}
-			return value;
-		});
-	}
-
-	private _readAllThreads(): ChatThreads | null {
-		const threadsStr = this._storageService.get(THREAD_STORAGE_KEY, StorageScope.APPLICATION);
-		if (!threadsStr) {
-			return null
-		}
-		return this._convertThreadDataFromStorage(threadsStr);
-	}
-
-	private _storeAllThreads(threads: ChatThreads) {
-		const serializedThreads = JSON.stringify(threads);
-		this._storageService.store(
-			THREAD_STORAGE_KEY,
-			serializedThreads,
-			StorageScope.APPLICATION,
-			StorageTarget.USER
-		);
-	}
-
-
-	// this should be the only place this.state = ... appears besides constructor
-	private _setState(state: Partial<ThreadsState>, affectsCurrent: boolean) {
-		this.state = {
-			...this.state,
-			...state
-		}
-		if (affectsCurrent)
-			this._onDidChangeCurrentThread.fire()
-	}
-
-	private _getAllSelections() {
-		const thread = this.getCurrentThread()
-		return thread.messages.flatMap(m => m.role === 'user' && m.selections || [])
-	}
-
-	private _getSelectionsUpToMessageIdx(messageIdx: number) {
-		const thread = this.getCurrentThread()
-		const prevMessages = thread.messages.slice(0, messageIdx)
-		return prevMessages.flatMap(m => m.role === 'user' && m.selections || [])
-	}
-
-	private _setStreamState(threadId: string, state: Partial<NonNullable<ThreadStreamState[string]>>) {
-		this.streamState[threadId] = {
-			...this.streamState[threadId],
-			...state
-		}
-		this._onDidChangeStreamState.fire({ threadId })
-	}
-
-
-	// ---------- streaming ----------
-
-	private _finishStreamingTextMessage = (threadId: string, options: { content: string, reasoning?: string }, error?: { message: string, fullError: Error | null }) => {
-		// add assistant's message to chat history, and clear selection
-		this._addMessageToThread(threadId, { role: 'assistant', content: options.content, reasoning: options.reasoning || null })
-		this._setStreamState(threadId, { messageSoFar: undefined, reasoningSoFar: undefined, streamingToken: undefined, error })
-	}
-
-
-
-
-	async editUserMessageAndStreamResponse({ userMessage, chatMode, messageIdx }: { userMessage: string, chatMode: ChatMode, messageIdx: number }) {
-
-		const thread = this.getCurrentThread()
-
-		if (thread.messages?.[messageIdx]?.role !== 'user') {
-			throw new Error(`Error: editing a message with role !=='user'`)
-		}
-
-		// get prev and curr selections before clearing the message
-		const prevSelns = this._getSelectionsUpToMessageIdx(messageIdx) // selections for previous messages
-		const currSelns = thread.messages[messageIdx].state.stagingSelections || [] // staging selections for the edited message
-
-		// clear messages up to the index
-		const slicedMessages = thread.messages.slice(0, messageIdx)
-		this._setState({
-			allThreads: {
-				...this.state.allThreads,
-				[thread.id]: {
-					...thread,
-					messages: slicedMessages
-				}
-			}
-		}, true)
-
-		// re-add the message and stream it
-		this.addUserMessageAndStreamResponse({ userMessage, chatMode, chatSelections: { prevSelns, currSelns } })
-
-	}
-
-
-
-	async addUserMessageAndStreamResponse({ userMessage, chatMode, chatSelections }: { userMessage: string, chatMode: ChatMode, chatSelections?: { prevSelns?: StagingSelectionItem[], currSelns?: StagingSelectionItem[] } }) {
-
-		const thread = this.getCurrentThread()
-		const threadId = thread.id
-
-		// selections in all past chats, then in current chat (can have many duplicates here)
-		const prevSelns: StagingSelectionItem[] = chatSelections?.prevSelns ?? this._getAllSelections()
-		const currSelns: StagingSelectionItem[] = chatSelections?.currSelns ?? thread.state.stagingSelections
-
-		// add user's message to chat history
-		const instructions = userMessage
-		const userMessageContent = await chat_userMessageContent(instructions, currSelns)
-		const selectionsStr = await chat_selectionsString(prevSelns, currSelns, this._voidFileService)
-		const userMessageFullContent = chat_userMessageContentWithAllFilesToo(userMessageContent, selectionsStr)
-
-		const userHistoryElt: ChatMessage = { role: 'user', content: userMessageContent, displayContent: instructions, selections: currSelns, state: defaultMessageState }
-		this._addMessageToThread(threadId, userHistoryElt)
-
-		this._setStreamState(threadId, { error: undefined })
-
-
-		const tools: InternalToolInfo[] | undefined = (
-			chatMode === 'chat' ? undefined
-				: chatMode === 'agent' ? Object.keys(voidTools).map(toolName => voidTools[toolName as ToolName])
-					: undefined)
-
-		// agent loop
-		const agentLoop = async () => {
-
-			let shouldSendAnotherMessage = true
-			let nMessagesSent = 0
-
-			while (shouldSendAnotherMessage) {
-				shouldSendAnotherMessage = false
-				nMessagesSent += 1
-
-				let res_: () => void
-				const awaitable = new Promise<void>((res, rej) => { res_ = res })
-
-				// replace last userMessage with userMessageFullContent (which contains all the files too)
-				const messages_ = this.getCurrentThread().messages.map(m => (toLLMChatMessage(m)))
-				const lastUserMsgIdx = findLastIndex(messages_, m => m.role === 'user')
-				let messages = messages_
-				if (lastUserMsgIdx !== -1) { // should never be -1
-					messages = [
-						...messages.slice(0, lastUserMsgIdx),
-						{ role: 'user', content: userMessageFullContent },
-						...messages.slice(lastUserMsgIdx + 1, Infinity)]
-				}
-
-				const llmCancelToken = this._llmMessageService.sendLLMMessage({
-					messagesType: 'chatMessages',
-					useProviderFor: 'Ctrl+L',
-					logging: { loggingName: `Agent` },
-					messages: [
-						{ role: 'system', content: chat_systemMessage(this._workspaceContextService.getWorkspace().folders.map(f => f.uri.fsPath)) },
-						...messages,
-					],
-
-					tools: tools,
-
-					onText: ({ fullText, fullReasoning }) => {
-						this._setStreamState(threadId, { messageSoFar: fullText, reasoningSoFar: fullReasoning })
-					},
-					onFinalMessage: async ({ fullText, toolCalls, fullReasoning }) => {
-
-						if ((toolCalls?.length ?? 0) === 0) {
-							this._finishStreamingTextMessage(threadId, { content: fullText, reasoning: fullReasoning })
-						}
-						else {
-							this._addMessageToThread(threadId, { role: 'assistant', content: fullText, reasoning: fullReasoning || null })
-							this._setStreamState(threadId, { messageSoFar: undefined, reasoningSoFar: undefined }) // clear streaming message
-
-							// deal with the tool
-							const tool: ToolCallType | undefined = toolCalls?.[0]
-							if (!tool) {
-								res_()
-								return
-							}
-							const toolName = tool.name
-
-							// 1.
-							let toolResultVal: ToolCallReturnType[typeof toolName]
-							try {
-								const val = await this._toolsService.toolFns[toolName](tool.params)
-								toolResultVal = val
-							} catch (error) {
-								const errorMessage = getErrorMessage(error)
-								this._addMessageToThread(threadId, { role: 'tool', name: toolName, params: tool.params, id: tool.id, content: errorMessage, result: { type: 'error', value: errorMessage }, })
-								shouldSendAnotherMessage = true
-								res_()
-								return
-							}
-
-							// 2.
-							let toolResultStr: string
-							try {
-								toolResultStr = this._toolsService.toolResultToString[toolName](toolResultVal as any) // typescript is so bad it doesn't even couple the type of ToolResult with the type of the function being called here
-							} catch (error) {
-								// treat as irrecoverable error
-								this._setStreamState(threadId, { error })
-								res_()
-								return
-							}
-
-							this._addMessageToThread(threadId, { role: 'tool', name: toolName, params: tool.params, id: tool.id, content: toolResultStr, result: { type: 'success', value: toolResultVal }, })
-							shouldSendAnotherMessage = true
-							res_()
-						}
-
-					},
-					onError: (error) => {
-						const messageSoFar = this.streamState[threadId]?.messageSoFar ?? ''
-						const reasoningSoFar = this.streamState[threadId]?.reasoningSoFar ?? ''
-						this._finishStreamingTextMessage(threadId, { content: messageSoFar, reasoning: reasoningSoFar }, error)
-						res_()
-					},
-				})
-				if (llmCancelToken === null) break
-				this._setStreamState(threadId, { streamingToken: llmCancelToken })
-
-				await awaitable
-			}
-		}
-
-		agentLoop() // DO NOT AWAIT THIS, add fn should resolve when we've added message (this lets us interrupt the agent loop correctly instead of waiting for it to resolve)
-
-	}
-
-	cancelStreaming(threadId: string) {
-		const llmCancelToken = this.streamState[threadId]?.streamingToken
-		if (llmCancelToken !== undefined) this._llmMessageService.abort(llmCancelToken)
-		const messageSoFar = this.streamState[threadId]?.messageSoFar ?? ''
-		const reasoningSoFar = this.streamState[threadId]?.reasoningSoFar ?? ''
-		this._finishStreamingTextMessage(threadId, { content: messageSoFar, reasoning: reasoningSoFar })
-	}
-
-	dismissStreamError(threadId: string): void {
-		this._setStreamState(threadId, { error: undefined })
-	}
-
-
-
-	// ---------- the rest ----------
-
-	getCurrentThread(): ChatThreads[string] {
-		const state = this.state
-		const thread = state.allThreads[state.currentThreadId]
-		return thread
-	}
-
-	getFocusedMessageIdx() {
-		const thread = this.getCurrentThread()
-
-		// get the focusedMessageIdx
-		const focusedMessageIdx = thread.state.focusedMessageIdx
-		if (focusedMessageIdx === undefined) return;
-
-		// check that the message is actually being edited
-		const focusedMessage = thread.messages[focusedMessageIdx]
-		if (focusedMessage.role !== 'user') return;
-		if (!focusedMessage.state) return;
-
-		return focusedMessageIdx
-	}
-
-	isFocusingMessage() {
-		return this.getFocusedMessageIdx() !== undefined
-	}
-
-	switchToThread(threadId: string) {
-		this._setState({ currentThreadId: threadId }, true)
-	}
-
-
-	openNewThread() {
-		// if a thread with 0 messages already exists, switch to it
-		const { allThreads: currentThreads } = this.state
-		for (const threadId in currentThreads) {
-			if (currentThreads[threadId].messages.length === 0) {
-				this.switchToThread(threadId)
-				return
-			}
-		}
-		// otherwise, start a new thread
-		const newThread = newThreadObject()
-
-		// update state
-		const newThreads: ChatThreads = {
-			...currentThreads,
-			[newThread.id]: newThread
-		}
-		this._storeAllThreads(newThreads)
-		this._setState({ allThreads: newThreads, currentThreadId: newThread.id }, true)
-	}
-
-
-	_addMessageToThread(threadId: string, message: ChatMessage) {
-		const { allThreads } = this.state
-
-		const oldThread = allThreads[threadId]
-
-		// update state and store it
-		const newThreads = {
-			...allThreads,
-			[oldThread.id]: {
-				...oldThread,
-				lastModified: new Date().toISOString(),
-				messages: [...oldThread.messages, message],
-			}
-		}
-		this._storeAllThreads(newThreads)
-		this._setState({ allThreads: newThreads }, true) // the current thread just changed (it had a message added to it)
-	}
-
-	// sets the currently selected message (must be undefined if no message is selected)
-	setFocusedMessageIdx(messageIdx: number | undefined) {
-
-		const threadId = this.state.currentThreadId
-		const thread = this.state.allThreads[threadId]
-		if (!thread) return
-
-		this._setState({
-			allThreads: {
-				...this.state.allThreads,
-				[threadId]: {
-					...thread,
-					state: {
-						...thread.state,
-						focusedMessageIdx: messageIdx,
-					}
-				}
-			}
-		}, true)
-	}
-
-	// set message.state
-	private _setCurrentMessageState(state: Partial<UserMessageState>, messageIdx: number): void {
-
-		const threadId = this.state.currentThreadId
-		const thread = this.state.allThreads[threadId]
-		if (!thread) return
-
-		this._setState({
-			allThreads: {
-				...this.state.allThreads,
-				[threadId]: {
-					...thread,
-					messages: thread.messages.map((m, i) =>
-						i === messageIdx && m.role === 'user' ? {
-							...m,
-							state: {
-								...m.state,
-								...state
-							},
-						} : m
-					)
-				}
-			}
-		}, true)
-
-	}
-
-	// set thread.state
-	private _setCurrentThreadState(state: Partial<ThreadType['state']>): void {
-
-		const threadId = this.state.currentThreadId
-		const thread = this.state.allThreads[threadId]
-		if (!thread) return
-
-		this._setState({
-			allThreads: {
-				...this.state.allThreads,
-				[thread.id]: {
-					...thread,
-					state: {
-						...thread.state,
-						...state
-					}
-				}
-			}
-		}, true)
-
-	}
-
-	getCurrentThreadState = () => {
-		const currentThread = this.getCurrentThread()
-		return currentThread.state
-	}
-
-	setCurrentThreadState = (newState: Partial<ThreadType['state']>) => {
-		this._setCurrentThreadState(newState)
-	}
-
-	// gets `staging` and `setStaging` of the currently focused element, given the index of the currently selected message (or undefined if no message is selected)
-
-	getCurrentMessageState(messageIdx: number): UserMessageState {
-		const currMessage = this.getCurrentThread()?.messages?.[messageIdx]
-		if (!currMessage || currMessage.role !== 'user') return defaultMessageState
-		return currMessage.state
-	}
-	setCurrentMessageState(messageIdx: number, newState: Partial<UserMessageState>) {
-		const currMessage = this.getCurrentThread()?.messages?.[messageIdx]
-		if (!currMessage || currMessage.role !== 'user') return
-		this._setCurrentMessageState(newState, messageIdx)
-	}
-
-
-
-}
-
-registerSingleton(IChatThreadService, ChatThreadService, InstantiationType.Eager);

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

@@ -0,0 +1,87 @@
+import { URI } from '../../../../base/common/uri.js';
+import { IRange } from '../../../../editor/common/core/range.js';
+import { AnthropicReasoning } from './sendLLMMessageTypes.js';
+import { ToolName, ToolCallParams, ToolResultType } from './toolsServiceTypes.js';
+
+export type ToolMessage<T extends ToolName> = {
+	role: 'tool';
+	name: T; // internal use
+	paramsStr: string; // internal use
+	id: string; // apis require this tool use id
+	content: string; // give this result to LLM
+
+	// if rejected, don't show in chat
+	result:
+	| { type: 'success'; params: ToolCallParams[T]; value: ToolResultType[T], }
+	| { type: 'error'; params: ToolCallParams[T] | undefined; value: string }
+	| { type: 'rejected'; params: ToolCallParams[T] }
+}
+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
+}
+
+// WARNING: changing this format is a big deal!!!!!! need to migrate old format to new format on users' computers so people don't get errors.
+export type ChatMessage =
+	| {
+		role: 'user';
+		content: string; // content displayed to the LLM on future calls - allowed to be '', will be replaced with (empty)
+		displayContent: string; // content displayed to user  - allowed to be '', will be ignored
+		selections: StagingSelectionItem[] | null; // the user's selection
+		state: {
+			stagingSelections: StagingSelectionItem[];
+			isBeingEdited: boolean;
+		}
+	} | {
+		role: 'assistant';
+		content: 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
+
+		anthropicReasoning: AnthropicReasoning[] | null; // anthropic reasoning
+	}
+	| ToolMessage<ToolName>
+	| ToolRequestApproval<ToolName>
+
+
+// one of the square items that indicates a selection in a chat bubble (NOT a file, a Selection of text)
+export type CodeSelection = {
+	type: 'Selection';
+	fileURI: URI;
+	language: string;
+	selectionStr: string;
+	range: IRange;
+	state: {
+		isOpened: boolean;
+		wasAddedAsCurrentFile: boolean;
+	};
+}
+
+export type FileSelection = {
+	type: 'File';
+	fileURI: URI;
+	language: string;
+	selectionStr: null;
+	range: null;
+	state: {
+		isOpened: boolean;
+		wasAddedAsCurrentFile: boolean;
+	};
+}
+
+export type StagingSelectionItem = CodeSelection | FileSelection
+
+
+
+export type CodespanLocationLink = {
+	uri: URI, // we handle serialization for this
+	displayText: string,
+	selection?: { // store as JSON so dont have to worry about serialization
+		startLineNumber: number
+		startColumn: number,
+		endLineNumber: number
+		endColumn: number,
+	} | undefined
+} | null

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

@@ -0,0 +1,8 @@
+export const acceptBg = '#1a7431'
+export const acceptAllBg = '#1e8538'
+export const acceptBorder = '1px solid #145626'
+export const rejectBg = '#b42331'
+export const rejectAllBg = '#cf2838'
+export const rejectBorder = '1px solid #8e1c27'
+export const buttonFontSize = '11px'
+export const buttonTextColor = 'white'

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

@@ -3,7 +3,7 @@
  *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
  *--------------------------------------------------------------------------------------*/
 
-import { OnText } from '../../common/llmMessageTypes.js'
+import { OnText } from '../sendLLMMessageTypes.js'
 import { DIVIDER, FINAL, ORIGINAL } from '../prompt/prompts.js'
 
 class SurroundingsRemover {
@@ -171,6 +171,9 @@ 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) => {
 	// for each prefix
 	for (let i = anyPrefix.length; i >= 1; i--) { // i >= 1 because must not be empty string
@@ -187,7 +190,6 @@ export const extractSearchReplaceBlocks = (str: string) => {
 	const DIVIDER_ = '\n' + DIVIDER + `\n`
 	// logic for FINAL_ is slightly more complicated - should be '\n' + FINAL, but that ignores if the final output is empty
 
-
 	const blocks: ExtractedSearchReplaceBlock[] = []
 
 	let i = 0 // search i and beyond (this is done by plain index, not by line number. much simpler this way)
@@ -196,41 +198,42 @@ export const extractSearchReplaceBlocks = (str: string) => {
 		if (origStart === -1) { return blocks }
 		origStart += ORIGINAL_.length
 		i = origStart
-		// wrote <<<< ORIGINAL
+		// wrote <<<< ORIGINAL\n
 
 		let dividerStart = str.indexOf(DIVIDER_, i)
 		if (dividerStart === -1) { // if didnt find DIVIDER_, either writing originalStr or DIVIDER_ right now
-			const isWritingDIVIDER = endsWithAnyPrefixOf(str, DIVIDER_)
+			const writingDIVIDERlen = endsWithAnyPrefixOf(str, DIVIDER_)?.length ?? 0
 			blocks.push({
-				orig: str.substring(origStart, str.length - (isWritingDIVIDER?.length ?? 0)),
+				orig: voidSubstr(str, origStart, str.length - writingDIVIDERlen),
 				final: '',
 				state: 'writingOriginal'
 			})
 			return blocks
 		}
-		const origStrDone = str.substring(origStart, dividerStart)
+		const origStrDone = voidSubstr(str, origStart, dividerStart)
 		dividerStart += DIVIDER_.length
 		i = dividerStart
-		// wrote =====
+		// wrote \n=====\n
 
+		const fullFINALStart = str.indexOf(FINAL, i)
+		const fullFINALStart_ = str.indexOf('\n' + FINAL, i) // go with B if possible, else fallback to A, it's more permissive
+		const matchedFullFINAL_ = fullFINALStart_ !== -1 && fullFINALStart === fullFINALStart_ + 1  // this logic is really important, otherwise we might look for FINAL_ at a much later part of the string
 
-
-		const finalStartA = str.indexOf(FINAL, i)
-		const finalStartB = str.indexOf('\n' + FINAL, i) // go with B if possible, else fallback to A, it's more permissive
-		const FINAL_ = finalStartB !== -1 ? '\n' + FINAL : FINAL
-		let finalStart = finalStartB !== -1 ? finalStartB : finalStartA
-
-		if (finalStart === -1) { // if didnt find FINAL_, either writing finalStr or FINAL_ right now
-			const isWritingFINAL = endsWithAnyPrefixOf(str, FINAL_)
+		let finalStart = matchedFullFINAL_ ? fullFINALStart_ : fullFINALStart
+		if (finalStart === -1) { // if didnt find FINAL_, either writing finalStr or FINAL or FINAL_ right now
+			const writingFINALlen = endsWithAnyPrefixOf(str, FINAL)?.length ?? 0
+			const writingFINALlen_ = endsWithAnyPrefixOf(str, '\n' + FINAL)?.length ?? 0 // this gets priority
+			const usingWritingFINALlen = Math.max(writingFINALlen, writingFINALlen_)
 			blocks.push({
 				orig: origStrDone,
-				final: str.substring(dividerStart, str.length - (isWritingFINAL?.length ?? 0)),
+				final: voidSubstr(str, dividerStart, str.length - usingWritingFINALlen),
 				state: 'writingFinal'
 			})
 			return blocks
 		}
-		const finalStrDone = str.substring(dividerStart, finalStart)
-		finalStart += FINAL_.length
+		const usingFINAL = matchedFullFINAL_ ? '\n' + FINAL : FINAL
+		const finalStrDone = voidSubstr(str, dividerStart, finalStart)
+		finalStart += usingFINAL.length
 		i = finalStart
 		// wrote >>>>> FINAL
 
@@ -247,9 +250,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_
@@ -264,7 +264,7 @@ export const extractReasoningOnTextWrapper = (onText: OnText, thinkTags: [string
 		onText_(params)
 	}
 
-	const newOnText: OnText = ({ fullText: fullText_ }) => {
+	const newOnText: OnText = ({ fullText: fullText_, ...p }) => {
 		// until found the first think tag, keep adding to fullText
 		if (!foundTag1) {
 			const endsWithTag1 = endsWithAnyPrefixOf(fullText_, thinkTags[0])
@@ -282,7 +282,7 @@ export const extractReasoningOnTextWrapper = (onText: OnText, thinkTags: [string
 				fullTextSoFar += fullText_.substring(0, tag1Index)
 				// Update latestAddIdx to after the first tag
 				latestAddIdx = tag1Index + thinkTags[0].length
-				onText({ fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
+				onText({ ...p, fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
 				return
 			}
 
@@ -290,7 +290,7 @@ export const extractReasoningOnTextWrapper = (onText: OnText, thinkTags: [string
 			// add the text to fullText
 			fullTextSoFar = fullText_
 			latestAddIdx = fullText_.length
-			onText({ fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
+			onText({ ...p, fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
 			return
 		}
 
@@ -314,7 +314,7 @@ export const extractReasoningOnTextWrapper = (onText: OnText, thinkTags: [string
 				fullReasoningSoFar += fullText_.substring(latestAddIdx, tag2Index)
 				// Update latestAddIdx to after the second tag
 				latestAddIdx = tag2Index + thinkTags[1].length
-				onText({ fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
+				onText({ ...p, fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
 				return
 			}
 
@@ -327,7 +327,7 @@ export const extractReasoningOnTextWrapper = (onText: OnText, thinkTags: [string
 				latestAddIdx = fullText_.length
 			}
 
-			onText({ fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
+			onText({ ...p, fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
 			return
 		}
 
@@ -340,7 +340,7 @@ export const extractReasoningOnTextWrapper = (onText: OnText, thinkTags: [string
 			latestAddIdx = fullText_.length
 		}
 
-		onText({ fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
+		onText({ ...p, fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar })
 	}
 
 	return newOnText
@@ -357,3 +357,220 @@ export const extractReasoningOnFinalMessage = (fullText_: string, thinkTags: [st
 	const fullText = fullText_.substring(0, tag1Idx) + fullText_.substring(tag2Idx + thinkTags[1].length, Infinity)
 	return { fullText, fullReasoning }
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// const tests: [string, { shape: Partial<ExtractedSearchReplaceBlock>[] }][] = [[
+// 	`\
+// \`\`\`
+// <<<<<<< ORIGINA`, { shape: [] }
+// ], [
+// 	`\
+// \`\`\`
+// <<<<<<< ORIGINAL`, { shape: [], }
+// ], [
+// 	`\
+// \`\`\`
+// <<<<<<< ORIGINAL
+// A`, { shape: [{ state: 'writingOriginal', orig: 'A' }], }
+// ], [
+// 	`\
+// \`\`\`
+// <<<<<<< ORIGINAL
+// A
+// B`, { shape: [{ state: 'writingOriginal', orig: 'A\nB' }], }
+// ], [
+// 	`\
+// \`\`\`
+// <<<<<<< ORIGINAL
+// A
+// B
+// `, { shape: [{ state: 'writingOriginal', orig: 'A\nB' }], }
+// ], [
+// 	`\
+// \`\`\`
+// <<<<<<< ORIGINAL
+// A
+// B
+// ===`, { shape: [{ state: 'writingOriginal', orig: 'A\nB' }], }
+// ], [
+// 	`\
+// \`\`\`
+// <<<<<<< ORIGINAL
+// A
+// B
+// ======`, { shape: [{ state: 'writingOriginal', orig: 'A\nB' }], }
+// ], [
+// 	`\
+// \`\`\`
+// <<<<<<< ORIGINAL
+// A
+// B
+// =======`, { shape: [{ state: 'writingOriginal', orig: 'A\nB' }], }
+// ], [
+// 	`\
+// \`\`\`
+// <<<<<<< ORIGINAL
+// A
+// B
+// =======
+// `, { shape: [{ state: 'writingFinal', orig: 'A\nB', final: '' }], }
+// ], [
+// 	`\
+// \`\`\`
+// <<<<<<< ORIGINAL
+// A
+// B
+// =======
+// >>>>>>> UPDAT`, { shape: [{ state: 'writingFinal', orig: 'A\nB', final: '' }], }
+// ], [
+// 	`\
+// \`\`\`
+// <<<<<<< ORIGINAL
+// A
+// B
+// =======
+// >>>>>>> UPDATED`, { shape: [{ state: 'done', orig: 'A\nB', final: '' }], }
+// ], [
+// 	`\
+// \`\`\`
+// <<<<<<< ORIGINAL
+// A
+// B
+// =======
+// >>>>>>> UPDATED
+// \`\`\``, { shape: [{ state: 'done', orig: 'A\nB', final: '' }], }
+// ],
+
+
+// // alternatively
+// [
+// 	`\
+// \`\`\`
+// <<<<<<< ORIGINAL
+// A
+// B
+// =======
+// X`, { shape: [{ state: 'writingFinal', orig: 'A\nB', final: 'X' }], }
+// ],
+// [
+// 	`\
+// \`\`\`
+// <<<<<<< ORIGINAL
+// A
+// B
+// =======
+// X
+// Y`, { shape: [{ state: 'writingFinal', orig: 'A\nB', final: 'X\nY' }], }
+// ],
+// [
+// 	`\
+// \`\`\`
+// <<<<<<< ORIGINAL
+// A
+// B
+// =======
+// X
+// Y
+// `, { shape: [{ state: 'writingFinal', orig: 'A\nB', final: 'X\nY' }], }
+// ],
+// [
+// 	`\
+// \`\`\`
+// <<<<<<< ORIGINAL
+// A
+// B
+// =======
+// X
+// Y
+// >>>>>>> UPDAT`, { shape: [{ state: 'writingFinal', orig: 'A\nB', final: 'X\nY' }], }
+// ], [
+// 	`\
+// \`\`\`
+// <<<<<<< ORIGINAL
+// A
+// B
+// =======
+// X
+// Y
+// >>>>>>> UPDATED`, { shape: [{ state: 'done', orig: 'A\nB', final: 'X\nY' }], }
+// ], [
+// 	`\
+// \`\`\`
+// <<<<<<< ORIGINAL
+// A
+// B
+// =======
+// X
+// Y
+// >>>>>>> UPDATED
+// \`\`\``, { shape: [{ state: 'done', orig: 'A\nB', final: 'X\nY' }], }
+// ]]
+
+
+
+
+// function runTests() {
+
+
+// 	let passedTests = 0;
+// 	let failedTests = 0;
+
+// 	for (let i = 0; i < tests.length; i++) {
+// 		const [input, expected] = tests[i];
+// 		const result = extractSearchReplaceBlocks(input);
+
+// 		// Compare result with expected shape
+// 		let passed = true;
+// 		if (result.length !== expected.shape.length) {
+// 			passed = false;
+// 		} else {
+// 			for (let j = 0; j < result.length; j++) { // block
+// 				const expectedItem = expected.shape[j];
+// 				const resultItem = result[j];
+
+// 				if ((expectedItem.state !== undefined) && (expectedItem.state !== resultItem.state) ||
+// 					(expectedItem.orig !== undefined) && (expectedItem.orig !== resultItem.orig) ||
+// 					(expectedItem.final !== undefined) && (expectedItem.final !== resultItem.final)) {
+// 					passed = false;
+// 					break;
+// 				}
+// 			}
+// 		}
+
+// 		if (passed) {
+// 			passedTests++;
+// 			console.log(`Test ${i + 1} passed`);
+// 		} else {
+// 			failedTests++;
+// 			console.log(`Test ${i + 1} failed`);
+// 			console.log('Input:', input)
+// 			console.log(`Expected:`, expected.shape);
+// 			console.log(`Got:`, result);
+// 		}
+// 	}
+
+// 	console.log(`Total: ${tests.length}, Passed: ${passedTests}, Failed: ${failedTests}`);
+// 	return failedTests === 0;
+// }
+
+
+
+// runTests()
+
+

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

@@ -0,0 +1,197 @@
+// /*--------------------------------------------------------------------------------------
+//  *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+//  *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+//  *--------------------------------------------------------------------------------------*/
+
+import { URI } from '../../../../../base/common/uri.js';
+import { ILanguageService } from '../../../../../editor/common/languages/language.js';
+import { separateOutFirstLine } from './util.js';
+
+
+// this works better than model.getLanguageId()
+export function detectLanguage(languageService: ILanguageService, opts: { uri: URI | null, fileContents: string | undefined }) {
+	const firstLine = opts.fileContents ? separateOutFirstLine(opts.fileContents)?.[0] : undefined
+	const fullLang = languageService.createByFilepathOrFirstLine(opts.uri, firstLine)
+	return fullLang.languageId || 'plaintext'
+}
+
+// --- conversions
+export const convertToVscodeLang = (languageService: ILanguageService, markdownLang: string) => {
+	if (markdownLang in markdownLangToVscodeLang)
+		return markdownLangToVscodeLang[markdownLang]
+
+	const { languageId } = languageService.createById(markdownLang)
+	return languageId
+}
+
+
+// // eg "bash" -> "shell"
+const markdownLangToVscodeLang: { [key: string]: string } = {
+	// Web Technologies
+	'html': 'html',
+	'css': 'css',
+	'scss': 'scss',
+	'sass': 'scss',
+	'less': 'less',
+	'javascript': 'typescript',
+	'js': 'typescript', // use more general renderer
+	'jsx': 'typescriptreact',
+	'typescript': 'typescript',
+	'ts': 'typescript',
+	'tsx': 'typescriptreact',
+	'json': 'json',
+	'jsonc': 'json',
+
+	// Programming Languages
+	'python': 'python',
+	'py': 'python',
+	'java': 'java',
+	'cpp': 'cpp',
+	'c++': 'cpp',
+	'c': 'c',
+	'csharp': 'csharp',
+	'cs': 'csharp',
+	'c#': 'csharp',
+	'go': 'go',
+	'golang': 'go',
+	'rust': 'rust',
+	'rs': 'rust',
+	'ruby': 'ruby',
+	'rb': 'ruby',
+	'php': 'php',
+	'shell': 'shellscript', // this is important
+	'bash': 'shellscript',
+	'sh': 'shellscript',
+	'zsh': 'shellscript',
+
+	// Markup and Config
+	'markdown': 'markdown',
+	'md': 'markdown',
+	'xml': 'xml',
+	'svg': 'xml',
+	'yaml': 'yaml',
+	'yml': 'yaml',
+	'ini': 'ini',
+	'toml': 'ini',
+
+	// Database and Query Languages
+	'sql': 'sql',
+	'mysql': 'sql',
+	'postgresql': 'sql',
+	'graphql': 'graphql',
+	'gql': 'graphql',
+
+	// Others
+	'dockerfile': 'dockerfile',
+	'docker': 'dockerfile',
+	'makefile': 'makefile',
+	'plaintext': 'plaintext',
+	'text': 'plaintext'
+};
+
+// // eg ".ts" -> "typescript"
+// const fileExtensionToVscodeLanguage: { [key: string]: string } = {
+// 	// Web
+// 	'html': 'html',
+// 	'htm': 'html',
+// 	'css': 'css',
+// 	'scss': 'scss',
+// 	'less': 'less',
+// 	'js': 'javascript',
+// 	'jsx': 'javascript',
+// 	'ts': 'typescript',
+// 	'tsx': 'typescript',
+// 	'json': 'json',
+// 	'jsonc': 'json',
+
+// 	// Programming Languages
+// 	'py': 'python',
+// 	'java': 'java',
+// 	'cpp': 'cpp',
+// 	'cc': 'cpp',
+// 	'c': 'c',
+// 	'h': 'cpp',
+// 	'hpp': 'cpp',
+// 	'cs': 'csharp',
+// 	'go': 'go',
+// 	'rs': 'rust',
+// 	'rb': 'ruby',
+// 	'php': 'php',
+// 	'sh': 'shell',
+// 	'bash': 'shell',
+// 	'zsh': 'shell',
+
+// 	// Markup/Config
+// 	'md': 'markdown',
+// 	'markdown': 'markdown',
+// 	'xml': 'xml',
+// 	'svg': 'xml',
+// 	'yaml': 'yaml',
+// 	'yml': 'yaml',
+// 	'ini': 'ini',
+// 	'toml': 'ini',
+
+// 	// Other
+// 	'sql': 'sql',
+// 	'graphql': 'graphql',
+// 	'gql': 'graphql',
+// 	'dockerfile': 'dockerfile',
+// 	'docker': 'dockerfile',
+// 	'mk': 'makefile',
+
+// 	// Config Files and Dot Files
+// 	'npmrc': 'ini',
+// 	'env': 'ini',
+// 	'gitignore': 'ignore',
+// 	'dockerignore': 'ignore',
+// 	'eslintrc': 'json',
+// 	'babelrc': 'json',
+// 	'prettierrc': 'json',
+// 	'stylelintrc': 'json',
+// 	'editorconfig': 'ini',
+// 	'htaccess': 'apacheconf',
+// 	'conf': 'ini',
+// 	'config': 'ini',
+
+// 	// Package Files
+// 	'package': 'json',
+// 	'package-lock': 'json',
+// 	'gemfile': 'ruby',
+// 	'podfile': 'ruby',
+// 	'rakefile': 'ruby',
+
+// 	// Build Systems
+// 	'cmake': 'cmake',
+// 	'makefile': 'makefile',
+// 	'gradle': 'groovy',
+
+// 	// Shell Scripts
+// 	'bashrc': 'shell',
+// 	'zshrc': 'shell',
+// 	'fish': 'shell',
+
+// 	// Version Control
+// 	'gitconfig': 'ini',
+// 	'hgrc': 'ini',
+// 	'svnconfig': 'ini',
+
+// 	// Web Server
+// 	'nginx': 'nginx',
+
+// 	// Misc Config
+// 	'properties': 'properties',
+// 	'cfg': 'ini',
+// 	'reg': 'ini'
+// };
+
+
+// export function filenameToVscodeLanguage(filename: string): string | undefined {
+
+
+
+
+// 	const ext = filename.toLowerCase().split('.').pop();
+// 	if (!ext) return undefined;
+
+// 	return fileExtensionToVscodeLanguage[ext];
+// }

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

@@ -0,0 +1,18 @@
+
+export const separateOutFirstLine = (content: string): [string, string] | [string, undefined] => {
+	const newLineIdx = content.indexOf('\r\n')
+	if (newLineIdx !== -1) {
+		const A = content.substring(0, newLineIdx)
+		const B = content.substring(newLineIdx + 2, Infinity);
+		return [A, B]
+	}
+
+	const newLineIdx2 = content.indexOf('\n')
+	if (newLineIdx2 !== -1) {
+		const A = content.substring(0, newLineIdx2)
+		const B = content.substring(newLineIdx2 + 1, Infinity);
+		return [A, B]
+	}
+
+	return [content, undefined]
+}

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

@@ -3,12 +3,11 @@
  *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
  *--------------------------------------------------------------------------------------*/
 
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { createDecorator, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js';
 import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
 import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js';
 import { localize2 } from '../../../../nls.js';
-import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
 import { registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.js';
 

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

@@ -0,0 +1,767 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+import { ModelSelectionOptions, ProviderName } from './voidSettingsTypes.js';
+
+
+export const defaultModelsOfProvider = {
+	openAI: [ // https://platform.openai.com/docs/models/gp
+		'o3-mini',
+		'o1',
+		'o1-mini',
+		'gpt-4o',
+		'gpt-4o-mini',
+	],
+	anthropic: [ // https://docs.anthropic.com/en/docs/about-claude/models
+		'claude-3-7-sonnet-latest',
+		'claude-3-5-sonnet-latest',
+		'claude-3-5-haiku-latest',
+		'claude-3-opus-latest',
+	],
+	xAI: [ // https://docs.x.ai/docs/models?cluster=us-east-1
+		'grok-2-latest',
+		'grok-3-latest',
+	],
+	gemini: [ // https://ai.google.dev/gemini-api/docs/models/gemini
+		'gemini-2.0-flash',
+		'gemini-1.5-flash',
+		'gemini-1.5-pro',
+		'gemini-1.5-flash-8b',
+		'gemini-2.0-flash-thinking-exp',
+	],
+	deepseek: [ // https://api-docs.deepseek.com/quick_start/pricing
+		'deepseek-chat',
+		'deepseek-reasoner',
+	],
+	ollama: [ // autodetected
+	],
+	vLLM: [ // autodetected
+	],
+	openRouter: [ // https://openrouter.ai/models
+		'anthropic/claude-3.7-sonnet:thinking',
+		'anthropic/claude-3.7-sonnet',
+		'anthropic/claude-3.5-sonnet',
+		'deepseek/deepseek-r1',
+		'deepseek/deepseek-r1-zero:free',
+		'mistralai/codestral-2501',
+		'qwen/qwen-2.5-coder-32b-instruct',
+		// 'mistralai/mistral-small-3.1-24b-instruct:free',
+		'google/gemini-2.0-flash-lite-preview-02-05:free',
+		// 'google/gemini-2.0-pro-exp-02-05:free',
+		// 'google/gemini-2.0-flash-exp:free',
+	],
+	groq: [ // https://console.groq.com/docs/models
+		'qwen-qwq-32b',
+		'llama-3.3-70b-versatile',
+		'llama-3.1-8b-instant',
+		// 'qwen-2.5-coder-32b', // preview mode (experimental)
+	],
+	// not supporting mistral right now- it's last on Void usage, and a huge pain to set up since it's nonstandard (it supports codestral FIM but it's on v1/fim/completions, etc)
+	// mistral: [ // https://docs.mistral.ai/getting-started/models/models_overview/
+	// 	'codestral-latest',
+	// 	'mistral-large-latest',
+	// 	'ministral-3b-latest',
+	// 	'ministral-8b-latest',
+	// ],
+	openAICompatible: [], // fallback
+} as const satisfies Record<ProviderName, string[]>
+
+
+
+
+
+
+type ModelOptions = {
+	contextWindow: number; // input tokens              // <-- UNUSED
+	maxOutputTokens: number | null; // output tokens    // <-- UNUSED
+	cost: {                                             // <-- UNUSED
+		input: number;
+		output: number;
+		cache_read?: number;
+		cache_write?: number;
+	}
+	supportsSystemMessage: false | 'system-role' | 'developer-role' | 'separated';
+	supportsTools: false | 'anthropic-style' | 'openai-style';
+	supportsFIM: boolean;
+
+	reasoningCapabilities: false | {
+		readonly supportsReasoning: true;
+		// reasoning options if supports reasoning
+		readonly canTurnOffReasoning: boolean; // whether or not the user can disable reasoning mode (false if the model only supports reasoning)
+		readonly canIOReasoning: boolean; // whether or not the model actually outputs reasoning (eg o1 lets us control reasoning but not output it)
+		readonly reasoningMaxOutputTokens?: number; // overrides normal maxOutputTokens 																			// <-- UNUSED (except anthropic)
+		readonly reasoningBudgetSlider?: { type: 'slider'; min: number; max: number; default: number };
+
+		// options related specifically to model output
+		// you are allowed to not include openSourceThinkTags if it's not open source (no such cases as of writing)
+		// if it's open source, put the think tags here so we parse them out in e.g. ollama
+		readonly openSourceThinkTags?: [string, string];
+	};
+}
+
+type ProviderReasoningIOSettings = {
+	// include this in payload to get reasoning
+	input?: { includeInPayload?: (reasoningState: SendableReasoningInfo) => null | { [key: string]: any }, };
+	// nameOfFieldInDelta: reasoning output is in response.choices[0].delta[deltaReasoningField]
+	// needsManualParse: whether we must manually parse out the <think> tags
+	output?:
+	| { nameOfFieldInDelta?: string, needsManualParse?: undefined, }
+	| { nameOfFieldInDelta?: undefined, needsManualParse?: true, };
+}
+
+type ProviderSettings = {
+	providerReasoningIOSettings?: ProviderReasoningIOSettings; // input/output settings around thinking (allowed to be empty) - only applied if the model supports reasoning output
+	modelOptions: { [key: string]: ModelOptions };
+	modelOptionsFallback: (modelName: string) => (ModelOptions & { modelName: string }) | null;
+}
+
+
+
+const modelOptionsDefaults: ModelOptions = {
+	contextWindow: 32_000, // unused
+	maxOutputTokens: null, // unused
+	cost: { input: 0, output: 0 }, // unused
+	supportsSystemMessage: false,
+	supportsTools: false,
+	supportsFIM: false,
+	reasoningCapabilities: false,
+}
+
+
+const openSourceModelOptions_assumingOAICompat = {
+	'deepseekR1': {
+		supportsFIM: false,
+		supportsSystemMessage: false,
+		supportsTools: false,
+		reasoningCapabilities: { supportsReasoning: true, canTurnOffReasoning: false, canIOReasoning: true, openSourceThinkTags: ['<think>', '</think>'] },
+	},
+	'deepseekCoderV2': {
+		supportsFIM: false,
+		supportsSystemMessage: false, // unstable
+		supportsTools: false,
+		reasoningCapabilities: false,
+	},
+	'codestral': {
+		supportsFIM: true,
+		supportsSystemMessage: 'system-role',
+		supportsTools: 'openai-style',
+		reasoningCapabilities: false,
+	},
+	// llama
+	'llama3': {
+		supportsFIM: false,
+		supportsSystemMessage: 'system-role',
+		supportsTools: 'openai-style',
+		reasoningCapabilities: false,
+	},
+	'llama3.1': {
+		supportsFIM: false,
+		supportsSystemMessage: 'system-role',
+		supportsTools: 'openai-style',
+		reasoningCapabilities: false,
+	},
+	'llama3.2': {
+		supportsFIM: false,
+		supportsSystemMessage: 'system-role',
+		supportsTools: 'openai-style',
+		reasoningCapabilities: false,
+	},
+	'llama3.3': {
+		supportsFIM: false,
+		supportsSystemMessage: 'system-role',
+		supportsTools: 'openai-style',
+		reasoningCapabilities: false,
+	},
+	// qwen
+	'qwen2.5coder': {
+		supportsFIM: true,
+		supportsSystemMessage: 'system-role',
+		supportsTools: 'openai-style',
+		reasoningCapabilities: false,
+	},
+	'qwq': {
+		supportsFIM: false, // no FIM, yes reasoning
+		supportsSystemMessage: 'system-role',
+		supportsTools: 'openai-style',
+		reasoningCapabilities: { supportsReasoning: true, canTurnOffReasoning: false, canIOReasoning: true, openSourceThinkTags: ['<think>', '</think>'] },
+	},
+	// FIM only
+	'starcoder2': {
+		supportsFIM: true,
+		supportsSystemMessage: false,
+		supportsTools: false,
+		reasoningCapabilities: false,
+	},
+	'codegemma:2b': {
+		supportsFIM: true,
+		supportsSystemMessage: false,
+		supportsTools: false,
+		reasoningCapabilities: false,
+	},
+} as const satisfies { [s: string]: Partial<ModelOptions> }
+
+
+
+
+const extensiveModelFallback: ProviderSettings['modelOptionsFallback'] = (modelName) => {
+	const toFallback = (opts: Omit<ModelOptions, 'cost'>): ModelOptions & { modelName: string } => {
+		return {
+			modelName,
+			...opts,
+			supportsSystemMessage: opts.supportsSystemMessage ? 'system-role' : false,
+			cost: { input: 0, output: 0 },
+		}
+	}
+	if (modelName.includes('gpt-4o')) return toFallback(openAIModelOptions['gpt-4o'])
+	if (modelName.includes('claude-3-5') || modelName.includes('claude-3.5')) return toFallback(anthropicModelOptions['claude-3-5-sonnet-20241022'])
+	if (modelName.includes('claude')) return toFallback(anthropicModelOptions['claude-3-7-sonnet-20250219'])
+	if (modelName.includes('grok')) return toFallback(xAIModelOptions['grok-2'])
+	if (modelName.includes('deepseek-r1') || modelName.includes('deepseek-reasoner')) return toFallback({ ...openSourceModelOptions_assumingOAICompat.deepseekR1, contextWindow: 32_000, maxOutputTokens: 4_096, })
+	if (modelName.includes('deepseek')) return toFallback({ ...openSourceModelOptions_assumingOAICompat.deepseekCoderV2, contextWindow: 32_000, maxOutputTokens: 4_096, })
+	if (modelName.includes('llama3')) return toFallback({ ...openSourceModelOptions_assumingOAICompat.llama3, contextWindow: 32_000, maxOutputTokens: 4_096, })
+	if (modelName.includes('qwen') && modelName.includes('2.5') && modelName.includes('coder')) return toFallback({ ...openSourceModelOptions_assumingOAICompat['qwen2.5coder'], contextWindow: 32_000, maxOutputTokens: 4_096, })
+	if (modelName.includes('codestral')) return toFallback({ ...openSourceModelOptions_assumingOAICompat.codestral, contextWindow: 32_000, maxOutputTokens: 4_096, })
+	if (/\bo1\b/.test(modelName) || /\bo3\b/.test(modelName)) return toFallback(openAIModelOptions['o1'])
+	return toFallback(modelOptionsDefaults)
+}
+
+
+
+
+
+
+// ---------------- ANTHROPIC ----------------
+const anthropicModelOptions = {
+	'claude-3-7-sonnet-20250219': { // https://docs.anthropic.com/en/docs/about-claude/models/all-models#model-comparison-table
+		contextWindow: 200_000,
+		maxOutputTokens: 8_192,
+		cost: { input: 3.00, cache_read: 0.30, cache_write: 3.75, output: 15.00 },
+		supportsFIM: false,
+		supportsSystemMessage: 'separated',
+		supportsTools: 'anthropic-style',
+		reasoningCapabilities: {
+			supportsReasoning: true,
+			canTurnOffReasoning: true,
+			canIOReasoning: true,
+			reasoningMaxOutputTokens: 64_000, // can bump it to 128_000 with beta mode output-128k-2025-02-19
+			reasoningBudgetSlider: { type: 'slider', min: 1024, max: 32_000, default: 1024 }, // they recommend batching if max > 32_000
+		},
+	},
+	'claude-3-5-sonnet-20241022': {
+		contextWindow: 200_000,
+		maxOutputTokens: 8_192,
+		cost: { input: 3.00, cache_read: 0.30, cache_write: 3.75, output: 15.00 },
+		supportsFIM: false,
+		supportsSystemMessage: 'separated',
+		supportsTools: 'anthropic-style',
+		reasoningCapabilities: false,
+	},
+	'claude-3-5-haiku-20241022': {
+		contextWindow: 200_000,
+		maxOutputTokens: 8_192,
+		cost: { input: 0.80, cache_read: 0.08, cache_write: 1.00, output: 4.00 },
+		supportsFIM: false,
+		supportsSystemMessage: 'separated',
+		supportsTools: 'anthropic-style',
+		reasoningCapabilities: false,
+	},
+	'claude-3-opus-20240229': {
+		contextWindow: 200_000,
+		maxOutputTokens: 4_096,
+		cost: { input: 15.00, cache_read: 1.50, cache_write: 18.75, output: 75.00 },
+		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
+		contextWindow: 200_000, cost: { input: 3.00, output: 15.00 },
+		maxOutputTokens: 4_096,
+		supportsFIM: false,
+		supportsSystemMessage: 'separated',
+		supportsTools: 'anthropic-style',
+		reasoningCapabilities: false,
+	}
+} as const satisfies { [s: string]: ModelOptions }
+
+const anthropicSettings: ProviderSettings = {
+	providerReasoningIOSettings: {
+		input: {
+			includeInPayload: (reasoningInfo) => {
+				if (reasoningInfo?.type === 'budgetEnabled') {
+					return { thinking: { type: 'enabled', budget_tokens: reasoningInfo.reasoningBudget } }
+				}
+				return null
+			}
+		},
+	},
+	modelOptions: anthropicModelOptions,
+	modelOptionsFallback: (modelName) => {
+		let fallbackName: keyof typeof anthropicModelOptions | null = null
+		if (modelName.includes('claude-3-7-sonnet')) fallbackName = 'claude-3-7-sonnet-20250219'
+		if (modelName.includes('claude-3-5-sonnet')) fallbackName = 'claude-3-5-sonnet-20241022'
+		if (modelName.includes('claude-3-5-haiku')) fallbackName = 'claude-3-5-haiku-20241022'
+		if (modelName.includes('claude-3-opus')) fallbackName = 'claude-3-opus-20240229'
+		if (modelName.includes('claude-3-sonnet')) fallbackName = 'claude-3-sonnet-20240229'
+		if (fallbackName) return { modelName: fallbackName, ...anthropicModelOptions[fallbackName] }
+		return { modelName, ...modelOptionsDefaults, maxOutputTokens: 4_096 }
+	},
+}
+
+
+// ---------------- OPENAI ----------------
+const openAIModelOptions = { // https://platform.openai.com/docs/pricing
+	'o1': {
+		contextWindow: 128_000,
+		maxOutputTokens: 100_000,
+		cost: { input: 15.00, cache_read: 7.50, output: 60.00, },
+		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
+	},
+	'o3-mini': {
+		contextWindow: 200_000,
+		maxOutputTokens: 100_000,
+		cost: { input: 1.10, cache_read: 0.55, output: 4.40, },
+		supportsFIM: false,
+		supportsTools: false,
+		supportsSystemMessage: 'developer-role',
+		reasoningCapabilities: { supportsReasoning: true, canIOReasoning: false, canTurnOffReasoning: false },
+	},
+	'gpt-4o': {
+		contextWindow: 128_000,
+		maxOutputTokens: 16_384,
+		cost: { input: 2.50, cache_read: 1.25, output: 10.00, },
+		supportsFIM: false,
+		supportsTools: 'openai-style',
+		supportsSystemMessage: 'system-role',
+		reasoningCapabilities: false,
+	},
+	'o1-mini': {
+		contextWindow: 128_000,
+		maxOutputTokens: 65_536,
+		cost: { input: 1.10, cache_read: 0.55, output: 4.40, },
+		supportsFIM: false,
+		supportsTools: false,
+		supportsSystemMessage: false, // does not support any system
+		reasoningCapabilities: { supportsReasoning: true, canIOReasoning: false, canTurnOffReasoning: false },
+	},
+	'gpt-4o-mini': {
+		contextWindow: 128_000,
+		maxOutputTokens: 16_384,
+		cost: { input: 0.15, cache_read: 0.075, output: 0.60, },
+		supportsFIM: false,
+		supportsTools: 'openai-style',
+		supportsSystemMessage: 'system-role', // ??
+		reasoningCapabilities: false,
+	},
+} as const satisfies { [s: string]: ModelOptions }
+
+
+const openAISettings: ProviderSettings = {
+	modelOptions: openAIModelOptions,
+	modelOptionsFallback: (modelName) => {
+		let fallbackName: keyof typeof openAIModelOptions | null = null
+		if (modelName.includes('o1')) { fallbackName = 'o1' }
+		if (modelName.includes('o3-mini')) { fallbackName = 'o3-mini' }
+		if (modelName.includes('gpt-4o')) { fallbackName = 'gpt-4o' }
+		if (fallbackName) return { modelName: fallbackName, ...openAIModelOptions[fallbackName] }
+		return null
+	}
+}
+
+// ---------------- XAI ----------------
+const xAIModelOptions = {
+	'grok-2': {
+		contextWindow: 131_072,
+		maxOutputTokens: null, // 131_072,
+		cost: { input: 2.00, output: 10.00 },
+		supportsFIM: false,
+		supportsSystemMessage: 'system-role',
+		supportsTools: 'openai-style',
+		reasoningCapabilities: false,
+	},
+} as const satisfies { [s: string]: ModelOptions }
+
+const xAISettings: ProviderSettings = {
+	modelOptions: xAIModelOptions,
+	modelOptionsFallback: (modelName) => {
+		let fallbackName: keyof typeof xAIModelOptions | null = null
+		if (modelName.includes('grok-2')) fallbackName = 'grok-2'
+		if (fallbackName) return { modelName: fallbackName, ...xAIModelOptions[fallbackName] }
+		return null
+	}
+}
+
+
+// ---------------- GEMINI ----------------
+const geminiModelOptions = { // https://ai.google.dev/gemini-api/docs/pricing
+	'gemini-2.0-flash': {
+		contextWindow: 1_048_576,
+		maxOutputTokens: null, // 8_192,
+		cost: { input: 0.10, output: 0.40 },
+		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': {
+		contextWindow: 1_048_576,
+		maxOutputTokens: null, // 8_192,
+		cost: { input: 0.075, output: 0.30 },
+		supportsFIM: false,
+		supportsSystemMessage: 'system-role',
+		supportsTools: 'openai-style',
+		reasoningCapabilities: false,
+	},
+	'gemini-1.5-flash': {
+		contextWindow: 1_048_576,
+		maxOutputTokens: null, // 8_192,
+		cost: { input: 0.075, output: 0.30 },  // TODO!!! price doubles after 128K tokens, we are NOT encoding that info right now
+		supportsFIM: false,
+		supportsSystemMessage: 'system-role',
+		supportsTools: 'openai-style',
+		reasoningCapabilities: false,
+	},
+	'gemini-1.5-pro': {
+		contextWindow: 2_097_152,
+		maxOutputTokens: null, // 8_192,
+		cost: { input: 1.25, output: 5.00 },  // TODO!!! price doubles after 128K tokens, we are NOT encoding that info right now
+		supportsFIM: false,
+		supportsSystemMessage: 'system-role',
+		supportsTools: 'openai-style',
+		reasoningCapabilities: false,
+	},
+	'gemini-1.5-flash-8b': {
+		contextWindow: 1_048_576,
+		maxOutputTokens: null, // 8_192,
+		cost: { input: 0.0375, output: 0.15 },  // TODO!!! price doubles after 128K tokens, we are NOT encoding that info right now
+		supportsFIM: false,
+		supportsSystemMessage: 'system-role',
+		supportsTools: 'openai-style',
+		reasoningCapabilities: false,
+	},
+} as const satisfies { [s: string]: ModelOptions }
+
+const geminiSettings: ProviderSettings = {
+	modelOptions: geminiModelOptions,
+	modelOptionsFallback: (modelName) => { return null }
+}
+
+
+
+// ---------------- DEEPSEEK API ----------------
+const deepseekModelOptions = {
+	'deepseek-chat': {
+		...openSourceModelOptions_assumingOAICompat.deepseekR1,
+		contextWindow: 64_000, // https://api-docs.deepseek.com/quick_start/pricing
+		maxOutputTokens: null, // 8_000,
+		cost: { cache_read: .07, input: .27, output: 1.10, },
+	},
+	'deepseek-reasoner': {
+		...openSourceModelOptions_assumingOAICompat.deepseekCoderV2,
+		contextWindow: 64_000,
+		maxOutputTokens: null, // 8_000,
+		cost: { cache_read: .14, input: .55, output: 2.19, },
+	},
+} as const satisfies { [s: string]: ModelOptions }
+
+
+const deepseekSettings: ProviderSettings = {
+	modelOptions: deepseekModelOptions,
+	providerReasoningIOSettings: {
+		// reasoning: OAICompat +  response.choices[0].delta.reasoning_content // https://api-docs.deepseek.com/guides/reasoning_model
+		output: { nameOfFieldInDelta: 'reasoning_content' },
+	},
+	modelOptionsFallback: (modelName) => { return null }
+}
+
+// ---------------- GROQ ----------------
+const groqModelOptions = { // https://console.groq.com/docs/models, https://groq.com/pricing/
+	'llama-3.3-70b-versatile': {
+		contextWindow: 128_000,
+		maxOutputTokens: null, // 32_768,
+		cost: { input: 0.59, output: 0.79 },
+		supportsFIM: false,
+		supportsSystemMessage: 'system-role',
+		supportsTools: 'openai-style',
+		reasoningCapabilities: false,
+	},
+	'llama-3.1-8b-instant': {
+		contextWindow: 128_000,
+		maxOutputTokens: null, // 8_192,
+		cost: { input: 0.05, output: 0.08 },
+		supportsFIM: false,
+		supportsSystemMessage: 'system-role',
+		supportsTools: 'openai-style',
+		reasoningCapabilities: false,
+	},
+	'qwen-2.5-coder-32b': {
+		contextWindow: 128_000,
+		maxOutputTokens: null, // not specified?
+		cost: { input: 0.79, output: 0.79 },
+		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
+		contextWindow: 128_000,
+		maxOutputTokens: null, // not specified?
+		cost: { input: 0.29, output: 0.39 },
+		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]: ModelOptions }
+const groqSettings: ProviderSettings = {
+	providerReasoningIOSettings: {
+		input: {
+			includeInPayload: (reasoningInfo) => {
+				if (reasoningInfo?.type === 'budgetEnabled') {
+					return { reasoning_format: 'parsed' }
+				}
+				return null
+			}
+		},
+		output: { nameOfFieldInDelta: 'reasoning' },
+	}, // Must be set to either parsed or hidden when using tool calling https://console.groq.com/docs/reasoning
+	modelOptions: groqModelOptions,
+	modelOptionsFallback: (modelName) => { return null }
+}
+
+
+// ---------------- VLLM, OLLAMA, OPENAICOMPAT (self-hosted / local) ----------------
+const vLLMSettings: ProviderSettings = {
+	// reasoning: OAICompat + response.choices[0].delta.reasoning_content // https://docs.vllm.ai/en/stable/features/reasoning_outputs.html#streaming-chat-completions
+	providerReasoningIOSettings: { output: { nameOfFieldInDelta: 'reasoning_content' }, },
+	modelOptionsFallback: (modelName) => extensiveModelFallback(modelName),
+	modelOptions: {},
+}
+
+const ollamaSettings: ProviderSettings = {
+	// reasoning: we need to filter out reasoning <think> tags manually
+	providerReasoningIOSettings: { output: { needsManualParse: true }, },
+	modelOptionsFallback: (modelName) => extensiveModelFallback(modelName),
+	modelOptions: {},
+}
+
+const openaiCompatible: ProviderSettings = {
+	// reasoning: we have no idea what endpoint they used, so we can't consistently parse out reasoning
+	modelOptionsFallback: (modelName) => extensiveModelFallback(modelName),
+	modelOptions: {},
+}
+
+
+// ---------------- OPENROUTER ----------------
+const openRouterModelOptions_assumingOpenAICompat = {
+	'mistralai/mistral-small-3.1-24b-instruct:free': {
+		contextWindow: 128_000,
+		maxOutputTokens: null,
+		cost: { input: 0, output: 0 },
+		supportsFIM: false,
+		supportsTools: 'openai-style',
+		supportsSystemMessage: 'system-role',
+		reasoningCapabilities: false,
+	},
+	'google/gemini-2.0-flash-lite-preview-02-05:free': {
+		contextWindow: 1_048_576,
+		maxOutputTokens: null,
+		cost: { input: 0, output: 0 },
+		supportsFIM: false,
+		supportsTools: 'openai-style',
+		supportsSystemMessage: 'system-role',
+		reasoningCapabilities: false,
+	},
+	'google/gemini-2.0-pro-exp-02-05:free': {
+		contextWindow: 1_048_576,
+		maxOutputTokens: null,
+		cost: { input: 0, output: 0 },
+		supportsFIM: false,
+		supportsTools: 'openai-style',
+		supportsSystemMessage: 'system-role',
+		reasoningCapabilities: false,
+	},
+	'google/gemini-2.0-flash-exp:free': {
+		contextWindow: 1_048_576,
+		maxOutputTokens: null,
+		cost: { input: 0, output: 0 },
+		supportsFIM: false,
+		supportsTools: 'openai-style',
+		supportsSystemMessage: 'system-role',
+		reasoningCapabilities: false,
+	},
+	'deepseek/deepseek-r1': {
+		...openSourceModelOptions_assumingOAICompat.deepseekR1,
+		contextWindow: 128_000,
+		maxOutputTokens: null,
+		cost: { input: 0.8, output: 2.4 },
+	},
+	'anthropic/claude-3.7-sonnet:thinking': {
+		contextWindow: 200_000,
+		maxOutputTokens: null,
+		cost: { input: 3.00, output: 15.00 },
+		supportsFIM: false,
+		supportsSystemMessage: 'system-role',
+		supportsTools: 'openai-style',
+		reasoningCapabilities: { // same as anthropic, see above
+			supportsReasoning: true,
+			canTurnOffReasoning: false,
+			canIOReasoning: true,
+			reasoningMaxOutputTokens: 64_000,
+			reasoningBudgetSlider: { type: 'slider', min: 1024, max: 32_000, default: 1024 }, // they recommend batching if max > 32_000
+		},
+	},
+	'anthropic/claude-3.7-sonnet': {
+		contextWindow: 200_000,
+		maxOutputTokens: null,
+		cost: { input: 3.00, output: 15.00 },
+		supportsFIM: false,
+		supportsSystemMessage: 'system-role',
+		supportsTools: 'openai-style',
+		reasoningCapabilities: false, // stupidly, openrouter separates thinking from non-thinking
+	},
+	'anthropic/claude-3.5-sonnet': {
+		contextWindow: 200_000,
+		maxOutputTokens: null,
+		cost: { input: 3.00, output: 15.00 },
+		supportsFIM: false,
+		supportsSystemMessage: 'system-role',
+		supportsTools: 'openai-style',
+		reasoningCapabilities: false,
+	},
+	'mistralai/codestral-2501': {
+		...openSourceModelOptions_assumingOAICompat.codestral,
+		contextWindow: 256_000,
+		maxOutputTokens: null,
+		cost: { input: 0.3, output: 0.9 },
+		supportsTools: 'openai-style',
+		reasoningCapabilities: false,
+	},
+	'qwen/qwen-2.5-coder-32b-instruct': {
+		...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 },
+	},
+	'qwen/qwq-32b': {
+		...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 },
+	}
+} as const satisfies { [s: string]: ModelOptions }
+
+const openRouterSettings: ProviderSettings = {
+	// reasoning: OAICompat + response.choices[0].delta.reasoning : payload should have {include_reasoning: true} https://openrouter.ai/announcements/reasoning-tokens-for-thinking-models
+	providerReasoningIOSettings: {
+		input: {
+			includeInPayload: (reasoningInfo) => {
+				if (reasoningInfo?.type === 'budgetEnabled') {
+					return {
+						reasoning: {
+							max_tokens: reasoningInfo.reasoningBudget
+						}
+					}
+				}
+				return null
+			}
+		},
+		output: { nameOfFieldInDelta: 'reasoning' },
+	},
+	modelOptions: openRouterModelOptions_assumingOpenAICompat,
+	// TODO!!! send a query to openrouter to get the price, etc.
+	modelOptionsFallback: (modelName) => extensiveModelFallback(modelName),
+}
+
+
+
+
+// ---------------- model settings of everything above ----------------
+
+const modelSettingsOfProvider: { [providerName in ProviderName]: ProviderSettings } = {
+	openAI: openAISettings,
+	anthropic: anthropicSettings,
+	xAI: xAISettings,
+	gemini: geminiSettings,
+
+	// open source models
+	deepseek: deepseekSettings,
+	groq: groqSettings,
+
+	// open source models + providers (mixture of everything)
+	openRouter: openRouterSettings,
+	vLLM: vLLMSettings,
+	ollama: ollamaSettings,
+	openAICompatible: openaiCompatible,
+
+	// googleVertex: {},
+	// microsoftAzure: {},
+} as const
+
+
+// ---------------- exports ----------------
+
+// returns the capabilities and the adjusted modelName if it was a fallback
+export const getModelCapabilities = (providerName: ProviderName, modelName: string): ModelOptions & { modelName: string; isUnrecognizedModel: boolean } => {
+	const { modelOptions, modelOptionsFallback } = modelSettingsOfProvider[providerName]
+	if (modelName in modelOptions) return { modelName, ...modelOptions[modelName], isUnrecognizedModel: false }
+	const result = modelOptionsFallback(modelName)
+	if (result) return { ...result, isUnrecognizedModel: false }
+	return { modelName, ...modelOptionsDefaults, isUnrecognizedModel: true }
+}
+
+// non-model settings
+export const getProviderCapabilities = (providerName: ProviderName) => {
+	const { providerReasoningIOSettings } = modelSettingsOfProvider[providerName]
+	return { providerReasoningIOSettings }
+}
+
+
+export type SendableReasoningInfo = {
+	type: 'budgetEnabled',
+	isReasoningEnabled: true,
+	reasoningBudget: number,
+} | null
+
+
+
+export const getIsResoningEnabledState = (
+	providerName: ProviderName,
+	modelName: string,
+	modelSelectionOptions: ModelSelectionOptions | undefined,
+) => {
+	const { supportsReasoning } = getModelCapabilities(providerName, modelName).reasoningCapabilities || {}
+	if (!supportsReasoning) return false
+
+	const defaultEnabledVal = true // if can't toggle reasoning, then this must be true. just true as default
+	const isReasoningEnabled = modelSelectionOptions?.reasoningEnabled ?? defaultEnabledVal
+	return isReasoningEnabled
+}
+
+
+// used to force reasoning state (complex) into something simple we can just read from when sending a message
+export const getSendableReasoningInfo = (
+	providerName: ProviderName,
+	modelName: string,
+	modelSelectionOptions: ModelSelectionOptions | undefined,
+): SendableReasoningInfo => {
+
+	const { canIOReasoning, reasoningBudgetSlider } = getModelCapabilities(providerName, modelName).reasoningCapabilities || {}
+	if (!canIOReasoning) return null
+	const isReasoningEnabled = getIsResoningEnabledState(providerName, modelName, modelSelectionOptions)
+	if (!isReasoningEnabled) return null
+
+	// check for reasoning budget
+	const reasoningBudget = reasoningBudgetSlider?.type === 'slider' ? modelSelectionOptions?.reasoningBudget ?? reasoningBudgetSlider?.default : undefined
+	if (reasoningBudget) {
+		return { type: 'budgetEnabled', isReasoningEnabled: isReasoningEnabled, reasoningBudget: reasoningBudget }
+	}
+	return null
+}

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

@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------*/
 
 import { IVoidSettingsService } from './voidSettingsService.js';
-import { ILLMMessageService } from './llmMessageService.js';
+import { ILLMMessageService } from './sendLLMMessageService.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { Disposable, IDisposable } from '../../../../base/common/lifecycle.js';
 import { RefreshableProviderName, refreshableProviderNames, SettingsOfProvider } from './voidSettingsTypes.js';
-import { OllamaModelResponse, VLLMModelResponse } from './llmMessageTypes.js';
+import { OllamaModelResponse, VLLMModelResponse } from './sendLLMMessageTypes.js';
 import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 

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

@@ -3,7 +3,7 @@
  *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
  *--------------------------------------------------------------------------------------*/
 
-import { EventLLMMessageOnTextParams, EventLLMMessageOnErrorParams, EventLLMMessageOnFinalMessageParams, ServiceSendLLMMessageParams, MainSendLLMMessageParams, MainLLMMessageAbortParams, ServiceModelListParams, EventModelListOnSuccessParams, EventModelListOnErrorParams, MainModelListParams, OllamaModelResponse, VLLMModelResponse, } from './llmMessageTypes.js';
+import { EventLLMMessageOnTextParams, EventLLMMessageOnErrorParams, EventLLMMessageOnFinalMessageParams, ServiceSendLLMMessageParams, MainSendLLMMessageParams, MainLLMMessageAbortParams, ServiceModelListParams, EventModelListOnSuccessParams, EventModelListOnErrorParams, MainModelListParams, OllamaModelResponse, VLLMModelResponse, } from './sendLLMMessageTypes.js';
 
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
@@ -13,7 +13,6 @@ import { generateUuid } from '../../../../base/common/uuid.js';
 import { Event } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { IVoidSettingsService } from './voidSettingsService.js';
-import { displayInfoOfProviderName, isFeatureNameDisabled } from './voidSettingsTypes.js';
 // import { INotificationService } from '../../notification/common/notification.js';
 
 // calls channel to implement features
@@ -39,6 +38,7 @@ export class LLMMessageService extends Disposable implements ILLMMessageService
 		onText: {} as { [eventId: string]: ((params: EventLLMMessageOnTextParams) => void) },
 		onFinalMessage: {} as { [eventId: string]: ((params: EventLLMMessageOnFinalMessageParams) => void) },
 		onError: {} as { [eventId: string]: ((params: EventLLMMessageOnErrorParams) => void) },
+		onAbort: {} as { [eventId: string]: (() => void) }, // NOT sent over the channel, result is instant when we call .abort()
 	}
 
 	// list hooks
@@ -67,13 +67,13 @@ export class LLMMessageService extends Disposable implements ILLMMessageService
 
 		// const service = ProxyChannel.toService<LLMMessageChannel>(mainProcessService.getChannel('void-channel-sendLLMMessage')); // lets you call it like a service
 		// see llmMessageChannel.ts
-		this.channel = this.mainProcessService.getChannel('void-channel-llmMessageService')
+		this.channel = this.mainProcessService.getChannel('void-channel-llmMessage')
 
 		// .listen sets up an IPC channel and takes a few ms, so we set up listeners immediately and add hooks to them instead
 		// llm
 		this._register((this.channel.listen('onText_sendLLMMessage') satisfies Event<EventLLMMessageOnTextParams>)(e => { this.llmMessageHooks.onText[e.requestId]?.(e) }))
-		this._register((this.channel.listen('onFinalMessage_sendLLMMessage') satisfies Event<EventLLMMessageOnFinalMessageParams>)(e => { this.llmMessageHooks.onFinalMessage[e.requestId]?.(e); this._onRequestIdDone(e.requestId) }))
-		this._register((this.channel.listen('onError_sendLLMMessage') satisfies Event<EventLLMMessageOnErrorParams>)(e => { this.llmMessageHooks.onError[e.requestId]?.(e); this._onRequestIdDone(e.requestId); console.error('Error in LLMMessageService:', JSON.stringify(e)) }))
+		this._register((this.channel.listen('onFinalMessage_sendLLMMessage') satisfies Event<EventLLMMessageOnFinalMessageParams>)(e => { this.llmMessageHooks.onFinalMessage[e.requestId]?.(e); this._clearChannelHooks(e.requestId) }))
+		this._register((this.channel.listen('onError_sendLLMMessage') satisfies Event<EventLLMMessageOnErrorParams>)(e => { this.llmMessageHooks.onError[e.requestId]?.(e); this._clearChannelHooks(e.requestId); console.error('Error in LLMMessageService:', JSON.stringify(e)) }))
 		// ollama .list()
 		this._register((this.channel.listen('onSuccess_list_ollama') satisfies Event<EventModelListOnSuccessParams<OllamaModelResponse>>)(e => { this.listHooks.ollama.success[e.requestId]?.(e) }))
 		this._register((this.channel.listen('onError_list_ollama') satisfies Event<EventModelListOnErrorParams<OllamaModelResponse>>)(e => { this.listHooks.ollama.error[e.requestId]?.(e) }))
@@ -83,58 +83,48 @@ export class LLMMessageService extends Disposable implements ILLMMessageService
 	}
 
 	sendLLMMessage(params: ServiceSendLLMMessageParams) {
-		const { onText, onFinalMessage, onError, ...proxyParams } = params;
-		const { useProviderFor: featureName } = proxyParams
+		const { onText, onFinalMessage, onError, onAbort, modelSelection, ...proxyParams } = params;
 
 		// throw an error if no model/provider selected (this should usually never be reached, the UI should check this first, but might happen in cases like Apply where we haven't built much UI/checks yet, good practice to have check logic on backend)
-		const isDisabled = isFeatureNameDisabled(featureName, this.voidSettingsService.state)
-		const modelSelection = this.voidSettingsService.state.modelSelectionOfFeature[featureName]
-		if (isDisabled || modelSelection === null) {
-			let message: string
-
-			if (isDisabled === 'addProvider' || isDisabled === 'providerNotAutoDetected')
-				message = `Please add a provider in Void's Settings.`
-			else if (isDisabled === 'addModel')
-				message = `Please add a model.`
-			else if (isDisabled === 'needToEnableModel')
-				message = `Please enable a model.`
-			else if (isDisabled === 'notFilledIn')
-				message = `Please fill in Void's Settings${modelSelection !== null ? ` for ${displayInfoOfProviderName(modelSelection.providerName).title}` : ''}.`
-			else
-				message = `Please add a provider in Void's Settings.`
-
+		if (modelSelection === null) {
+			const message = `Please add a provider in Void's Settings.`
+			onError({ message, fullError: null })
+			return null
+		}
+
+		if (params.messagesType === 'chatMessages' && (params.messages?.length ?? 0) === 0) {
+			const message = `No messages detected.`
 			onError({ message, fullError: null })
 			return null
 		}
 
-		const { providerName, modelName } = modelSelection
 
 		// add state for request id
 		const requestId = generateUuid();
 		this.llmMessageHooks.onText[requestId] = onText
 		this.llmMessageHooks.onFinalMessage[requestId] = onFinalMessage
 		this.llmMessageHooks.onError[requestId] = onError
+		this.llmMessageHooks.onAbort[requestId] = onAbort // used internally only
 
 		const { aiInstructions } = this.voidSettingsService.state.globalSettings
-		const { settingsOfProvider } = this.voidSettingsService.state
+		const { settingsOfProvider, } = this.voidSettingsService.state
 
 		// params will be stripped of all its functions over the IPC channel
 		this.channel.call('sendLLMMessage', {
 			...proxyParams,
 			aiInstructions,
 			requestId,
-			providerName,
-			modelName,
 			settingsOfProvider,
+			modelSelection,
 		} satisfies MainSendLLMMessageParams);
 
 		return requestId
 	}
 
-
 	abort(requestId: string) {
+		this.llmMessageHooks.onAbort[requestId]?.() // calling the abort hook here is instant (doesn't go over a channel)
 		this.channel.call('abort', { requestId } satisfies MainLLMMessageAbortParams);
-		this._onRequestIdDone(requestId)
+		this._clearChannelHooks(requestId)
 	}
 
 
@@ -175,7 +165,7 @@ export class LLMMessageService extends Disposable implements ILLMMessageService
 		} satisfies MainModelListParams<VLLMModelResponse>)
 	}
 
-	_onRequestIdDone(requestId: string) {
+	_clearChannelHooks(requestId: string) {
 		delete this.llmMessageHooks.onText[requestId]
 		delete this.llmMessageHooks.onFinalMessage[requestId]
 		delete this.llmMessageHooks.onError[requestId]

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

@@ -3,9 +3,8 @@
  *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
  *--------------------------------------------------------------------------------------*/
 
-import { ChatMessage } from './chatThreadService.js'
-import { InternalToolInfo, ToolName } from './toolsService.js'
-import { FeatureName, ProviderName, SettingsOfProvider } from './voidSettingsTypes.js'
+import { ToolName, InternalToolInfo } from './toolsServiceTypes.js'
+import { ModelSelection, ModelSelectionOptions, ProviderName, SettingsOfProvider } from './voidSettingsTypes.js'
 
 
 export const errorDetails = (fullError: Error | null): string | null => {
@@ -29,11 +28,15 @@ export const getErrorMessage: (error: unknown) => string = (error) => {
 
 
 export type LLMChatMessage = {
-	role: 'system' | 'user';
+	role: 'system';
+	content: string;
+} | {
+	role: 'user';
 	content: string;
 } | {
 	role: 'assistant',
-	content: string;
+	content: string; // text content
+	anthropicReasoning: AnthropicReasoning[] | null;
 } | {
 	role: 'tool';
 	content: string; // result
@@ -45,31 +48,19 @@ export type LLMChatMessage = {
 
 export type ToolCallType = {
 	name: ToolName;
-	params: string;
+	paramsStr: string;
 	id: string;
 }
 
+export type AnthropicReasoning = ({ type: 'thinking'; thinking: any; signature: string; } | { type: 'redacted_thinking', data: any })
 
-export type OnText = (p: { fullText: string; fullReasoning: string }) => void
-export type OnFinalMessage = (p: { fullText: string, toolCalls?: ToolCallType[], fullReasoning?: string }) => void // id is tool_use_id
-export type OnError = (p: { message: string, fullError: Error | null }) => void
+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 OnError = (p: { message: string; fullError: Error | null }) => void
+export type OnAbort = () => void
 export type AbortRef = { current: (() => void) | null }
 
 
-export const toLLMChatMessage = (c: ChatMessage): LLMChatMessage => {
-	if (c.role === 'user') {
-		return { role: c.role, content: c.content || '(empty message)' }
-	}
-	else if (c.role === 'assistant')
-		return { role: c.role, content: c.content || '(empty message)' }
-	else if (c.role === 'tool')
-		return { role: c.role, id: c.id, name: c.name, params: c.params, content: c.content || '(empty output)' }
-	else {
-		throw new Error(`Role ${(c as any).role} not recognized.`)
-	}
-}
-
-
 export type LLMFIMMessage = {
 	prefix: string;
 	suffix: string;
@@ -91,22 +82,25 @@ export type ServiceSendLLMMessageParams = {
 	onText: OnText;
 	onFinalMessage: OnFinalMessage;
 	onError: OnError;
-	logging: { loggingName: string, };
-	useProviderFor: FeatureName;
-} & SendLLMType
+	logging: { loggingName: string, loggingExtras?: { [k: string]: any } };
+	modelSelection: ModelSelection | null;
+	modelSelectionOptions: ModelSelectionOptions | undefined;
+	onAbort: OnAbort;
+} & SendLLMType;
 
 // params to the true sendLLMMessage function
 export type SendLLMMessageParams = {
 	onText: OnText;
 	onFinalMessage: OnFinalMessage;
 	onError: OnError;
-	logging: { loggingName: string, };
+	logging: { loggingName: string, loggingExtras?: { [k: string]: any } };
 	abortRef: AbortRef;
 
 	aiInstructions: string;
 
-	providerName: ProviderName;
-	modelName: string;
+	modelSelection: ModelSelection;
+	modelSelectionOptions: ModelSelectionOptions | undefined;
+
 	settingsOfProvider: SettingsOfProvider;
 } & SendLLMType
 
@@ -122,7 +116,6 @@ export type EventLLMMessageOnTextParams = Parameters<OnText>[0] & { requestId: s
 export type EventLLMMessageOnFinalMessageParams = Parameters<OnFinalMessage>[0] & { requestId: string }
 export type EventLLMMessageOnErrorParams = Parameters<OnError>[0] & { requestId: string }
 
-
 // service -> main -> internal -> event (back to main)
 // (browser)
 

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

@@ -1,461 +0,0 @@
-import { CancellationToken } from '../../../../base/common/cancellation.js'
-import { URI } from '../../../../base/common/uri.js'
-import { IFileService } from '../../../../platform/files/common/files.js'
-import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js'
-import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'
-import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js'
-import { QueryBuilder } from '../../../../workbench/services/search/common/queryBuilder.js'
-import { ISearchService } from '../../../../workbench/services/search/common/search.js'
-import { IEditCodeService } from '../browser/editCodeService.js'
-import { editToolDesc_toolDescription } from '../browser/prompt/prompts.js'
-import { IVoidFileService } from './voidFileService.js'
-// import { ITerminalToolService } from '../browser/terminalToolService.js'
-
-
-// tool use for AI
-
-
-
-// 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
-	},
-	required: string[], // required paramNames
-}
-
-const paginationHelper = {
-	desc: `Very large results may be paginated (indicated in the result). Pagination fails gracefully if out of bounds or invalid page number.`,
-	param: { pageNumber: { type: 'number', description: 'The page number (optional, default is 1).' }, }
-} as const
-
-export const voidTools = {
-	// --- context-gathering (read/search/list) ---
-
-	read_file: {
-		name: 'read_file',
-		description: `Returns file contents of a given URI. ${paginationHelper.desc}`,
-		params: {
-			uri: { type: 'string', description: undefined },
-		},
-		required: ['uri'],
-	},
-
-	list_dir: {
-		name: 'list_dir',
-		description: `Returns all file names and folder names in a given URI. ${paginationHelper.desc}`,
-		params: {
-			uri: { type: 'string', description: undefined },
-			...paginationHelper.param
-		},
-		required: ['uri'],
-	},
-
-	pathname_search: {
-		name: 'pathname_search',
-		description: `Returns all pathnames that match a given grep query. You should use this when looking for a file with a specific name or path. This does NOT search file content. ${paginationHelper.desc}`,
-		params: {
-			query: { type: 'string', description: undefined },
-			...paginationHelper.param,
-		},
-		required: ['query'],
-	},
-
-	search: {
-		name: 'search',
-		description: `Returns all code excerpts containing the given string or grep query. This does NOT search pathname. As a follow-up, you may want to use read_file to view the full file contents of the results. ${paginationHelper.desc}`,
-		params: {
-			query: { type: 'string', description: undefined },
-			...paginationHelper.param,
-		},
-		required: ['query'],
-	},
-
-	// --- editing (create/delete) ---
-
-	create_uri: {
-		name: 'create_uri',
-		description: `Creates 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.`,
-		params: {
-			uri: { type: 'string', description: undefined },
-		},
-		required: ['uri'],
-	},
-
-	delete_uri: {
-		name: 'delete_uri',
-		description: `Deletes the file or folder at the given path. Fails gracefully if the file or folder does not exist.`,
-		params: {
-			uri: { type: 'string', description: undefined },
-			params: { type: 'string', description: 'Return -r here to delete this URI and all descendants (if applicable). Default is the empty string.' }
-		},
-		required: ['uri', 'params'],
-	},
-
-	edit: { // APPLY TOOL
-		name: 'edit',
-		description: `Edits the contents of a file at the given URI. Fails gracefully if the file does not exist.`,
-		params: {
-			uri: { type: 'string', description: undefined },
-			changeDescription: { type: 'string', description: editToolDesc_toolDescription }
-		},
-		required: ['uri', 'changeDescription'],
-	},
-
-	terminal_command: {
-		name: 'terminal_command',
-		description: `Executes a terminal command.`,
-		params: {
-			command: { type: 'string', description: 'The terminal command to execute.' }
-		},
-		required: ['command'],
-	},
-
-
-	// go_to_definition
-	// go_to_usages
-
-} satisfies { [name: string]: InternalToolInfo }
-
-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
-}
-
-
-export type ToolParamNames<T extends ToolName> = keyof typeof voidTools[T]['params']
-export type ToolParamsObj<T extends ToolName> = { [paramName in ToolParamNames<T>]: unknown }
-
-export type ToolCallReturnType = {
-	'read_file': { uri: URI, fileContents: string, hasNextPage: boolean },
-	'list_dir': { rootURI: URI, children: DirectoryItem[] | null, hasNextPage: boolean, hasPrevPage: boolean, itemsRemaining: number },
-	'pathname_search': { queryStr: string, uris: URI[], hasNextPage: boolean },
-	'search': { queryStr: string, uris: URI[], hasNextPage: boolean },
-	// ---
-	'edit': { uri: URI, changeDescription: string },
-	'create_uri': { uri: URI },
-	'delete_uri': { uri: URI },
-	'terminal_command': { command: string },
-}
-
-type DirectoryItem = {
-	uri: URI;
-	name: string;
-	isDirectory: boolean;
-	isSymbolicLink: boolean;
-}
-
-export type ToolFns = { [T in ToolName]: (p: string) => Promise<ToolCallReturnType[T]> }
-export type ToolResultToString = { [T in ToolName]: (result: ToolCallReturnType[T]) => string }
-
-
-// pagination info
-const MAX_FILE_CHARS_PAGE = 50_000
-const MAX_CHILDREN_URIs_PAGE = 500
-
-
-
-const computeDirectoryResult = async (
-	fileService: IFileService,
-	rootURI: URI,
-	pageNumber: number = 1
-): Promise<ToolCallReturnType['list_dir']> => {
-	const stat = await fileService.resolve(rootURI, { resolveMetadata: false });
-	if (!stat.isDirectory) {
-		return { rootURI, children: null, hasNextPage: false, hasPrevPage: false, itemsRemaining: 0 };
-	}
-
-	const originalChildrenLength = stat.children?.length ?? 0;
-	const fromChildIdx = MAX_CHILDREN_URIs_PAGE * (pageNumber - 1);
-	const toChildIdx = MAX_CHILDREN_URIs_PAGE * pageNumber - 1; // INCLUSIVE
-	const listChildren = stat.children?.slice(fromChildIdx, toChildIdx + 1) ?? [];
-
-	const children: DirectoryItem[] = listChildren.map(child => ({
-		name: child.name,
-		uri: child.resource,
-		isDirectory: child.isDirectory,
-		isSymbolicLink: child.isSymbolicLink
-	}));
-
-	const hasNextPage = (originalChildrenLength - 1) > toChildIdx;
-	const hasPrevPage = pageNumber > 1;
-	const itemsRemaining = Math.max(0, originalChildrenLength - (toChildIdx + 1));
-
-	return {
-		rootURI,
-		children,
-		hasNextPage,
-		hasPrevPage,
-		itemsRemaining
-	};
-};
-
-const directoryResultToString = (result: ToolCallReturnType['list_dir']): string => {
-	if (!result.children) {
-		return `Error: ${result.rootURI} is not a directory`;
-	}
-
-	let output = '';
-	const entries = result.children;
-
-	if (!result.hasPrevPage) {
-		output += `${result.rootURI}\n`;
-	}
-
-	for (let i = 0; i < entries.length; i++) {
-		const entry = entries[i];
-		const isLast = i === entries.length - 1 && !result.hasNextPage;
-		const prefix = isLast ? '└── ' : '├── ';
-
-		output += `${prefix}${entry.name}${entry.isDirectory ? '/' : ''}${entry.isSymbolicLink ? ' (symbolic link)' : ''}\n`;
-	}
-
-	if (result.hasNextPage) {
-		output += `└── (${result.itemsRemaining} results remaining...)\n`;
-	}
-
-	return output;
-};
-
-
-
-
-
-const validateJSON = (s: string): { [s: string]: unknown } => {
-	try {
-		const o = JSON.parse(s)
-		return o
-	}
-	catch (e) {
-		throw new Error(`Tool parameter was not a string of a valid JSON: "${s}".`)
-	}
-}
-
-
-
-const validateStr = (argName: string, value: unknown) => {
-	if (typeof value !== 'string') throw new Error(`Error: ${argName} must be a string.`)
-	return value
-}
-
-
-// TODO!!!! check to make sure in workspace
-const validateURI = (uriStr: unknown) => {
-	if (typeof uriStr !== 'string') throw new Error('Error: provided uri must be a string.')
-
-	const uri = URI.file(uriStr)
-	return uri
-}
-
-const validatePageNum = (pageNumberUnknown: unknown) => {
-	if (!pageNumberUnknown) return 1
-	const parsedInt = Number.parseInt(pageNumberUnknown + '')
-	if (!Number.isInteger(parsedInt)) throw new Error(`Page number was not an integer: "${pageNumberUnknown}".`)
-	if (parsedInt < 1) throw new Error(`Specified page number must be 1 or greater: "${pageNumberUnknown}".`)
-	return parsedInt
-}
-
-const validateRecursiveParamStr = (paramsUnknown: unknown) => {
-	if (typeof paramsUnknown !== 'string') throw new Error('Error calling tool: provided params must be a string.')
-	const params = paramsUnknown
-	const isRecursive = params.includes('r')
-	return isRecursive
-}
-
-export interface IToolsService {
-	readonly _serviceBrand: undefined;
-	toolFns: ToolFns;
-	toolResultToString: ToolResultToString;
-}
-
-export const IToolsService = createDecorator<IToolsService>('ToolsService');
-
-export class ToolsService implements IToolsService {
-
-	readonly _serviceBrand: undefined;
-
-	public toolFns: ToolFns;
-	public toolResultToString: ToolResultToString;
-
-
-	constructor(
-		@IFileService fileService: IFileService,
-		@IWorkspaceContextService workspaceContextService: IWorkspaceContextService,
-		@ISearchService searchService: ISearchService,
-		@IInstantiationService instantiationService: IInstantiationService,
-		@IVoidFileService voidFileService: IVoidFileService,
-		@IEditCodeService editCodeService: IEditCodeService,
-		// @ITerminalToolService private readonly terminalToolService: ITerminalToolService,
-	) {
-
-		const queryBuilder = instantiationService.createInstance(QueryBuilder);
-
-		this.toolFns = {
-			read_file: async (params: string) => {
-				console.log('read_file')
-
-				const o = validateJSON(params)
-				const { uri: uriStr, pageNumber: pageNumberUnknown } = o
-
-				const uri = validateURI(uriStr)
-				const pageNumber = validatePageNum(pageNumberUnknown)
-
-				const readFileContents = await voidFileService.readFile(uri)
-
-				const fromIdx = MAX_FILE_CHARS_PAGE * (pageNumber - 1)
-				const toIdx = MAX_FILE_CHARS_PAGE * pageNumber - 1
-				const fileContents = readFileContents.slice(fromIdx, toIdx + 1) || '(empty)' // paginate
-				const hasNextPage = (readFileContents.length - 1) - toIdx >= 1
-
-
-				console.log('read_file result:', fileContents)
-
-
-				return { uri, fileContents, hasNextPage }
-			},
-			list_dir: async (params: string) => {
-				const o = validateJSON(params)
-				const { uri: uriStr, pageNumber: pageNumberUnknown } = o
-
-				const uri = validateURI(uriStr)
-				const pageNumber = validatePageNum(pageNumberUnknown)
-
-				const dirResult = await computeDirectoryResult(fileService, uri, pageNumber)
-				return dirResult
-			},
-			pathname_search: async (params: string) => {
-				const o = validateJSON(params)
-				const { query: queryUnknown, pageNumber: pageNumberUnknown } = o
-
-				const queryStr = validateStr('query', queryUnknown)
-				const pageNumber = validatePageNum(pageNumberUnknown)
-
-				const query = queryBuilder.file(workspaceContextService.getWorkspace().folders.map(f => f.uri), { filePattern: queryStr, })
-				const data = await searchService.fileSearch(query, CancellationToken.None)
-
-				const fromIdx = MAX_CHILDREN_URIs_PAGE * (pageNumber - 1)
-				const toIdx = MAX_CHILDREN_URIs_PAGE * pageNumber - 1
-				const uris = data.results
-					.slice(fromIdx, toIdx + 1) // paginate
-					.map(({ resource, results }) => resource)
-
-				const hasNextPage = (data.results.length - 1) - toIdx >= 1
-				return { queryStr, uris, hasNextPage }
-			},
-			search: async (params: string) => {
-				const o = validateJSON(params)
-				const { query: queryUnknown, pageNumber: pageNumberUnknown } = o
-
-				const queryStr = validateStr('query', queryUnknown)
-				const pageNumber = validatePageNum(pageNumberUnknown)
-
-				const query = queryBuilder.text({ pattern: queryStr, }, workspaceContextService.getWorkspace().folders.map(f => f.uri))
-				const data = await searchService.textSearch(query, CancellationToken.None)
-
-				const fromIdx = MAX_CHILDREN_URIs_PAGE * (pageNumber - 1)
-				const toIdx = MAX_CHILDREN_URIs_PAGE * pageNumber - 1
-				const uris = data.results
-					.slice(fromIdx, toIdx + 1) // paginate
-					.map(({ resource, results }) => resource)
-
-				const hasNextPage = (data.results.length - 1) - toIdx >= 1
-				return { queryStr, uris, hasNextPage }
-			},
-
-			// ---
-
-			create_uri: async (params: string) => {
-				const o = validateJSON(params)
-				const { uri: uriStr } = o
-				const uri = validateURI(uriStr)
-				await fileService.createFile(uri)
-				return { uri }
-			},
-
-			delete_uri: async (params: string) => {
-				const o = validateJSON(params)
-				const { uri: uriStr, params: paramsStr } = o
-				const uri = validateURI(uriStr)
-				const isRecursive = validateRecursiveParamStr(paramsStr)
-				await fileService.del(uri, { recursive: isRecursive })
-				return { uri }
-			},
-
-			edit: async (params: string) => {
-				const o = validateJSON(params)
-				const { uri: uriStr, changeDescription: changeDescriptionUnknown } = o
-				const uri = validateURI(uriStr)
-				const changeDescription = validateStr('changeDescription', changeDescriptionUnknown)
-
-				// const applyId = editCodeService.startApplying({ uri, applyStr: changeDescription, from: 'ClickApply', type: 'rewrite' })
-
-				// // TODO!!!
-
-				// await // await apply done before moving on
-
-				return { uri, changeDescription }
-			},
-
-			terminal_command: async (s: string) => {
-				const o = validateJSON(s)
-				const { command: commandUnknown } = o
-				const command = validateStr('command', commandUnknown)
-
-				// TODO!!!!
-				// await // Await user confirmation and then command execution before resolving
-
-
-				return { command }
-			},
-
-
-
-		}
-
-		const nextPageStr = (hasNextPage: boolean) => hasNextPage ? '\n\n(more on next page...)' : ''
-
-		// given to the LLM after the call
-		this.toolResultToString = {
-			read_file: (result) => {
-				return nextPageStr(result.hasNextPage)
-			},
-			list_dir: (result) => {
-				const dirTreeStr = directoryResultToString(result)
-				return dirTreeStr + nextPageStr(result.hasNextPage)
-			},
-			pathname_search: (result) => {
-				return result.uris.map(uri => uri.fsPath).join('\n') + nextPageStr(result.hasNextPage)
-			},
-			search: (result) => {
-				return result.uris.map(uri => uri.fsPath).join('\n') + nextPageStr(result.hasNextPage)
-			},
-			// ---
-			create_uri: (result) => {
-				return `URI ${result.uri.fsPath} successfully created.`
-			},
-			delete_uri: (result) => {
-				return `URI ${result.uri.fsPath} successfully deleted.`
-			},
-			edit: (result) => {
-				return `Change successfully made ${result.uri.fsPath} successfully deleted.`
-			},
-			terminal_command: (result) => {
-				return `Terminal command "${result.command}" successfully executed.`
-			},
-
-		}
-
-
-
-	}
-
-
-}
-
-registerSingleton(IToolsService, ToolsService, InstantiationType.Eager);

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

@@ -0,0 +1,67 @@
+import { URI } from '../../../../base/common/uri.js'
+import { voidTools } from './prompt/prompts.js';
+
+
+export type ToolDirectoryItem = {
+	uri: URI;
+	name: string;
+	isDirectory: boolean;
+	isSymbolicLink: boolean;
+}
+
+
+export type TerminalResolveReason = { type: 'toofull' | 'timeout' | 'bgtask' } | { type: 'done', exitCode: number }
+
+
+
+// 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_uri', 'delete_uri', 'edit', 'terminal_command'] as const satisfies readonly ToolName[]
+export type ToolNameWithApproval = typeof toolNamesWithApproval[number]
+export const toolNamesThatRequireApproval = new Set<ToolName>(toolNamesWithApproval)
+
+export type ToolCallParams = {
+	'read_file': { uri: URI, pageNumber: number },
+	'list_dir': { rootURI: URI, pageNumber: number },
+	'pathname_search': { queryStr: string, pageNumber: number },
+	'text_search': { queryStr: string, pageNumber: number },
+	// ---
+	'edit': { uri: URI, changeDescription: string },
+	'create_uri': { uri: URI, isFolder: boolean },
+	'delete_uri': { uri: URI, isRecursive: boolean, isFolder: boolean },
+	'terminal_command': { command: string, proposedTerminalId: string, waitForCompletion: boolean },
+}
+
+
+export type ToolResultType = {
+	'read_file': { fileContents: string, hasNextPage: boolean },
+	'list_dir': { children: ToolDirectoryItem[] | null, hasNextPage: boolean, hasPrevPage: boolean, itemsRemaining: number },
+	'pathname_search': { uris: URI[], hasNextPage: boolean },
+	'text_search': { uris: URI[], hasNextPage: boolean },
+	// ---
+	'edit': Promise<void>,
+	'create_uri': {},
+	'delete_uri': {},
+	'terminal_command': { terminalId: string, didCreateTerminal: boolean, result: string; resolveReason: TerminalResolveReason; },
+}
+

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

@@ -1,109 +0,0 @@
-/*--------------------------------------------------------------------------------------
- *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
- *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
- *--------------------------------------------------------------------------------------*/
-
-import { isWindows } from '../../../../base/common/platform.js';
-import { URI } from '../../../../base/common/uri.js';
-import { EndOfLinePreference } from '../../../../editor/common/model.js';
-import { IModelService } from '../../../../editor/common/services/model.js';
-import { IFileService } from '../../../../platform/files/common/files.js';
-import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-
-
-// linebreak symbols
-export const allLinebreakSymbols = ['\r\n', '\n']
-export const _ln = isWindows ? allLinebreakSymbols[0] : allLinebreakSymbols[1]
-
-export interface IVoidFileService {
-	readonly _serviceBrand: undefined;
-
-	readFile(uri: URI, range?: { startLineNumber: number, endLineNumber: number }): Promise<string>;
-	readModel(uri: URI, range?: { startLineNumber: number, endLineNumber: number }): string | null;
-}
-
-export const IVoidFileService = createDecorator<IVoidFileService>('VoidFileService');
-
-// implemented by calling channel
-export class VoidFileService implements IVoidFileService {
-	readonly _serviceBrand: undefined;
-
-	constructor(
-		@IModelService private readonly modelService: IModelService,
-		@IFileService private readonly fileService: IFileService,
-	) {
-
-	}
-
-	readFile = async (uri: URI, range?: { startLineNumber: number, endLineNumber: number }): Promise<string> => {
-
-		// attempt to read the model
-		const modelResult = this.readModel(uri, range);
-		if (modelResult) return modelResult;
-
-		// if no model, read the raw file
-		const fileResult = await this._readFileRaw(uri, range);
-		if (fileResult) return fileResult;
-
-		return '';
-	}
-
-	_readFileRaw = async (uri: URI, range?: { startLineNumber: number, endLineNumber: number }): Promise<string | null> => {
-
-		try { // this throws an error if no file exists (eg it was deleted)
-
-			const res = await this.fileService.readFile(uri);
-
-			if (range) {
-				return res.value.toString()
-					.split(_ln)
-					.slice(range.startLineNumber - 1, range.endLineNumber)
-					.join(_ln)
-			}
-
-			return res.value.toString();
-
-
-		} catch (e) {
-			return null;
-		}
-	}
-
-
-	readModel = (uri: URI, range?: { startLineNumber: number, endLineNumber: number }): string | null => {
-
-		// read saved model (sometimes null if the user reloads application)
-		let model = this.modelService.getModel(uri);
-
-		// check all opened models for the same `fsPath`
-		if (!model) {
-			const models = this.modelService.getModels();
-			for (const m of models) {
-				if (m.uri.fsPath === uri.fsPath) {
-					model = m
-					break;
-				}
-			}
-		}
-
-		// if still not found, return
-		if (!model) { return null }
-
-		// if range, read it
-		if (range) {
-			return model.getValueInRange({
-				startLineNumber: range.startLineNumber,
-				endLineNumber: range.endLineNumber,
-				startColumn: 1,
-				endColumn: Number.MAX_VALUE
-			}, EndOfLinePreference.LF);
-		} else {
-			return model.getValue(EndOfLinePreference.LF)
-		}
-
-	}
-
-}
-
-registerSingleton(IVoidFileService, VoidFileService, InstantiationType.Eager);

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

@@ -0,0 +1,69 @@
+import { Disposable, IReference } from '../../../../base/common/lifecycle.js';
+import { URI } from '../../../../base/common/uri.js';
+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';
+
+type VoidModelType = {
+	model: ITextModel | null;
+	editorModel: IResolvedTextEditorModel | null;
+};
+
+export interface IVoidModelService {
+	readonly _serviceBrand: undefined;
+	initializeModel(uri: URI): Promise<void>;
+	getModel(uri: URI): VoidModelType;
+	getModelSafe(uri: URI): Promise<VoidModelType>;
+}
+
+export const IVoidModelService = createDecorator<IVoidModelService>('voidVoidModelService');
+
+class VoidModelService extends Disposable implements IVoidModelService {
+	_serviceBrand: undefined;
+	static readonly ID = 'voidVoidModelService';
+	private readonly _modelRefOfURI: Record<string, IReference<IResolvedTextEditorModel>> = {};
+
+	constructor(
+		@ITextModelService private readonly _textModelService: ITextModelService,
+	) {
+		super();
+	}
+
+	initializeModel = async (uri: URI) => {
+		if (uri.fsPath in this._modelRefOfURI) return;
+		const editorModelRef = await this._textModelService.createModelReference(uri);
+		// Keep a strong reference to prevent disposal
+		this._modelRefOfURI[uri.fsPath] = editorModelRef;
+	};
+
+	getModel = (uri: URI): VoidModelType => {
+		const editorModelRef = this._modelRefOfURI[uri.fsPath];
+		if (!editorModelRef) {
+			return { model: null, editorModel: null };
+		}
+
+		const model = editorModelRef.object.textEditorModel;
+
+		if (!model) {
+			return { model: null, editorModel: editorModelRef.object };
+		}
+
+		return { model, editorModel: editorModelRef.object };
+	};
+
+	getModelSafe = async (uri: URI): Promise<VoidModelType> => {
+		if (!(uri.fsPath in this._modelRefOfURI)) await this.initializeModel(uri);
+		return this.getModel(uri);
+
+	};
+
+	override dispose() {
+		super.dispose();
+		for (const ref of Object.values(this._modelRefOfURI)) {
+			ref.dispose(); // release reference to allow disposal
+		}
+	}
+}
+
+registerSingleton(IVoidModelService, VoidModelService, InstantiationType.Eager);

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

@@ -11,10 +11,19 @@ import { registerSingleton, InstantiationType } from '../../../../platform/insta
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IMetricsService } from './metricsService.js';
-import { defaultSettingsOfProvider, FeatureName, ProviderName, ModelSelectionOfFeature, SettingsOfProvider, SettingName, providerNames, ModelSelection, modelSelectionsEqual, featureNames, VoidModelInfo, GlobalSettings, GlobalSettingName, defaultGlobalSettings, defaultProviderSettings } from './voidSettingsTypes.js';
+import { getModelCapabilities } from './modelCapabilities.js';
+import { defaultSettingsOfProvider, FeatureName, ProviderName, ModelSelectionOfFeature, SettingsOfProvider, SettingName, providerNames, ModelSelection, modelSelectionsEqual, featureNames, VoidModelInfo, GlobalSettings, GlobalSettingName, defaultGlobalSettings, defaultProviderSettings, ModelSelectionOptions, OptionsOfModelSelection, ChatMode } from './voidSettingsTypes.js';
+
+// past values:
+// 'void.settingsServiceStorage'
+
+const STORAGE_KEY = 'void.settingsServiceStorageI'
+
+
+// name is the name in the dropdown
+export type ModelOption = { name: string, selection: ModelSelection }
 
 
-const STORAGE_KEY = 'void.settingsServiceStorage'
 
 type SetSettingOfProviderFn = <S extends SettingName>(
 	providerName: ProviderName,
@@ -25,16 +34,17 @@ type SetSettingOfProviderFn = <S extends SettingName>(
 type SetModelSelectionOfFeatureFn = <K extends FeatureName>(
 	featureName: K,
 	newVal: ModelSelectionOfFeature[K],
-	options?: { doNotApplyEffects?: true }
 ) => Promise<void>;
 
 type SetGlobalSettingFn = <T extends GlobalSettingName>(settingName: T, newVal: GlobalSettings[T]) => void;
 
-export type ModelOption = { name: string, selection: ModelSelection }
+type SetOptionsOfModelSelection = (providerName: ProviderName, modelName: string, newVal: Partial<ModelSelectionOptions>) => void
+
 
 export type VoidSettingsState = {
 	readonly settingsOfProvider: SettingsOfProvider; // optionsOfProvider
 	readonly modelSelectionOfFeature: ModelSelectionOfFeature; // stateOfFeature
+	readonly optionsOfModelSelection: OptionsOfModelSelection;
 	readonly globalSettings: GlobalSettings;
 
 	readonly _modelOptions: ModelOption[] // computed based on the two above items
@@ -49,12 +59,11 @@ export interface IVoidSettingsService {
 	readonly state: VoidSettingsState; // in order to play nicely with react, you should immutably change state
 	readonly waitForInitState: Promise<void>;
 
-	readAndInitializeState: (providedState?: VoidSettingsState) => Promise<void>;
-
 	onDidChangeState: Event<void>;
 
 	setSettingOfProvider: SetSettingOfProviderFn;
 	setModelSelectionOfFeature: SetModelSelectionOfFeatureFn;
+	setOptionsOfModelSelection: SetOptionsOfModelSelection;
 	setGlobalSetting: SetGlobalSettingFn;
 
 	setAutodetectedModels(providerName: ProviderName, modelNames: string[], logging: object): void;
@@ -88,7 +97,15 @@ const _updatedModelsAfterDefaultModelsChange = (defaultModelNames: string[], opt
 }
 
 
-const _validatedState = (state: Omit<VoidSettingsState, '_modelOptions'>) => {
+export const modelFilterOfFeatureName: { [featureName in FeatureName]: { filter: (o: ModelSelection, opts: { chatMode: ChatMode }) => boolean; emptyMessage: null | { message: string, priority: 'always' | 'fallback' } } } = {
+	'Autocomplete': { filter: (o) => getModelCapabilities(o.providerName, o.modelName).supportsFIM, emptyMessage: { message: 'No models support FIM', priority: 'always' } },
+	'Chat': { filter: (o, { chatMode }) => chatMode === 'normal' ? true : !!getModelCapabilities(o.providerName, o.modelName).supportsTools, emptyMessage: { message: 'No models support tool use', priority: 'fallback' } },
+	'Ctrl+K': { filter: o => true, emptyMessage: null, },
+	'Apply': { filter: o => true, emptyMessage: null, },
+}
+
+
+const _validatedModelState = (state: Omit<VoidSettingsState, '_modelOptions'>) => {
 
 	let newSettingsOfProvider = state.settingsOfProvider
 
@@ -125,14 +142,18 @@ const _validatedState = (state: Omit<VoidSettingsState, '_modelOptions'>) => {
 	let newModelSelectionOfFeature = state.modelSelectionOfFeature
 	for (const featureName of featureNames) {
 
-		const modelSelectionAtFeature = newModelSelectionOfFeature[featureName]
-		const selnIdx = modelSelectionAtFeature === null ? -1 : newModelOptions.findIndex(m => modelSelectionsEqual(m.selection, modelSelectionAtFeature))
+		const { filter } = modelFilterOfFeatureName[featureName]
+		const filterOpts = { chatMode: state.globalSettings.chatMode }
+		const modelOptionsForThisFeature = newModelOptions.filter((o) => filter(o.selection, filterOpts))
 
-		if (selnIdx !== -1) continue
+		const modelSelectionAtFeature = newModelSelectionOfFeature[featureName]
+		const selnIdx = modelSelectionAtFeature === null ? -1 : modelOptionsForThisFeature.findIndex(m => modelSelectionsEqual(m.selection, modelSelectionAtFeature))
+
+		if (selnIdx !== -1) continue // no longer in list, so update to 1st in list or null
 
 		newModelSelectionOfFeature = {
 			...newModelSelectionOfFeature,
-			[featureName]: newModelOptions.length === 0 ? null : newModelOptions[0].selection
+			[featureName]: modelOptionsForThisFeature.length === 0 ? null : modelOptionsForThisFeature[0].selection
 		}
 	}
 
@@ -154,8 +175,9 @@ const _validatedState = (state: Omit<VoidSettingsState, '_modelOptions'>) => {
 const defaultState = () => {
 	const d: VoidSettingsState = {
 		settingsOfProvider: deepClone(defaultSettingsOfProvider),
-		modelSelectionOfFeature: { 'Ctrl+L': null, 'Ctrl+K': null, 'Autocomplete': null, 'Apply': null },
+		modelSelectionOfFeature: { 'Chat': null, 'Ctrl+K': null, 'Autocomplete': null, 'Apply': null },
 		globalSettings: deepClone(defaultGlobalSettings),
+		optionsOfModelSelection: {},
 		_modelOptions: [], // computed later
 	}
 	return d
@@ -192,47 +214,12 @@ class VoidSettingsService extends Disposable implements IVoidSettingsService {
 		this.readAndInitializeState()
 	}
 
-	async readAndInitializeState(providedState?: VoidSettingsState) {
-		// If providedState is given, use it instead of reading from storage
-		const readS = providedState || await this._readState();
+	async readAndInitializeState() {
+		const readS = await this._readState();
 
 		// the stored data structure might be outdated, so we need to update it here
-		const newSettingsOfProvider = {
-			// A HACK BECAUSE WE ADDED DEEPSEEK (did not exist before, comes before readS)
-			...{ deepseek: defaultSettingsOfProvider.deepseek },
-
-			// A HACK BECAUSE WE ADDED XAI (did not exist before, comes before readS)
-			...{ xAI: defaultSettingsOfProvider.xAI },
-
-			// A HACK BECAUSE WE ADDED VLLM (did not exist before, comes before readS)
-			...{ vLLM: defaultSettingsOfProvider.vLLM },
-
-			...readS.settingsOfProvider,
-
-			// A HACK BECAUSE WE ADDED NEW GEMINI MODELS (existed before, comes after readS)
-			gemini: {
-				...readS.settingsOfProvider.gemini,
-				models: [
-					...readS.settingsOfProvider.gemini.models,
-					...defaultSettingsOfProvider.gemini.models.filter(m => /* if cant find the model in readS (yes this is O(n^2), very small) */ !readS.settingsOfProvider.gemini.models.find(m2 => m2.modelName === m.modelName))
-				]
-			}
-		};
-
-		const newModelSelectionOfFeature = {
-			// A HACK BECAUSE WE ADDED FastApply
-			...{ 'Apply': null },
-			...readS.modelSelectionOfFeature,
-		};
-
-		const finalState = {
-			...readS,
-			settingsOfProvider: newSettingsOfProvider,
-			modelSelectionOfFeature: newModelSelectionOfFeature,
-		};
-
-		this.state = _validatedState(finalState);
-
+		const finalState = readS
+		this.state = _validatedModelState(finalState);
 
 		this._resolver();
 		this._onDidChangeState.fire();
@@ -260,6 +247,8 @@ class VoidSettingsService extends Disposable implements IVoidSettingsService {
 
 		const newModelSelectionOfFeature = this.state.modelSelectionOfFeature
 
+		const newOptionsOfModelSelection = this.state.optionsOfModelSelection
+
 		const newSettingsOfProvider: SettingsOfProvider = {
 			...this.state.settingsOfProvider,
 			[providerName]: {
@@ -272,11 +261,12 @@ class VoidSettingsService extends Disposable implements IVoidSettingsService {
 
 		const newState = {
 			modelSelectionOfFeature: newModelSelectionOfFeature,
+			optionsOfModelSelection: newOptionsOfModelSelection,
 			settingsOfProvider: newSettingsOfProvider,
 			globalSettings: newGlobalSettings,
 		}
 
-		this.state = _validatedState(newState)
+		this.state = _validatedModelState(newState)
 
 		await this._storeState()
 		this._onDidChangeState.fire()
@@ -284,6 +274,12 @@ class VoidSettingsService extends Disposable implements IVoidSettingsService {
 	}
 
 
+	private _onUpdate_syncApplyToChat() {
+		// if sync is turned on, sync (call this whenever Chat model or !!sync changes)
+		this.setModelSelectionOfFeature('Apply', deepClone(this.state.modelSelectionOfFeature['Chat']))
+
+	}
+
 	setGlobalSetting: SetGlobalSettingFn = async (settingName, newVal) => {
 		const newState: VoidSettingsState = {
 			...this.state,
@@ -292,14 +288,16 @@ class VoidSettingsService extends Disposable implements IVoidSettingsService {
 				[settingName]: newVal
 			}
 		}
-		this.state = newState
+		this.state = _validatedModelState(newState)
 		await this._storeState()
 		this._onDidChangeState.fire()
 
+		// hooks
+		if (this.state.globalSettings.syncApplyToChat) this._onUpdate_syncApplyToChat()
 	}
 
 
-	setModelSelectionOfFeature: SetModelSelectionOfFeatureFn = async (featureName, newVal, options) => {
+	setModelSelectionOfFeature: SetModelSelectionOfFeatureFn = async (featureName, newVal) => {
 		const newState: VoidSettingsState = {
 			...this.state,
 			modelSelectionOfFeature: {
@@ -308,10 +306,33 @@ class VoidSettingsService extends Disposable implements IVoidSettingsService {
 			}
 		}
 
-		this.state = newState
+		this.state = _validatedModelState(newState)
 
-		if (options?.doNotApplyEffects)
-			return
+		await this._storeState()
+		this._onDidChangeState.fire()
+
+		// hooks
+		if (featureName === 'Chat') {
+			if (this.state.globalSettings.syncApplyToChat) this._onUpdate_syncApplyToChat()
+		}
+	}
+
+
+	setOptionsOfModelSelection = async (providerName: ProviderName, modelName: string, newVal: Partial<ModelSelectionOptions>) => {
+		const newState: VoidSettingsState = {
+			...this.state,
+			optionsOfModelSelection: {
+				...this.state.optionsOfModelSelection,
+				[providerName]: {
+					...this.state.optionsOfModelSelection[providerName],
+					[modelName]: {
+						...this.state.optionsOfModelSelection[providerName]?.[modelName],
+						...newVal
+					}
+				}
+			}
+		}
+		this.state = _validatedModelState(newState)
 
 		await this._storeState()
 		this._onDidChangeState.fire()

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

@@ -4,6 +4,7 @@
  *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
  *--------------------------------------------------------------------------------------*/
 
+import { defaultModelsOfProvider } from './modelCapabilities.js';
 import { VoidSettingsState } from './voidSettingsService.js'
 
 
@@ -47,63 +48,6 @@ export const defaultProviderSettings = {
 
 
 
-export const defaultModelsOfProvider = {
-	openAI: [ // https://platform.openai.com/docs/models/gp
-		'o1',
-		'o3-mini',
-		'o1-mini',
-		'gpt-4o',
-		'gpt-4o-mini',
-	],
-	anthropic: [ // https://docs.anthropic.com/en/docs/about-claude/models
-		'claude-3-7-sonnet-latest',
-		// 'claude-3-5-sonnet-latest',
-		'claude-3-5-haiku-latest',
-		'claude-3-opus-latest',
-	],
-	xAI: [ // https://docs.x.ai/docs/models?cluster=us-east-1
-		'grok-2-latest',
-		'grok-3-latest',
-	],
-	gemini: [ // https://ai.google.dev/gemini-api/docs/models/gemini
-		'gemini-2.0-flash',
-		'gemini-1.5-flash',
-		'gemini-1.5-pro',
-		'gemini-1.5-flash-8b',
-		'gemini-2.0-flash-thinking-exp',
-	],
-	deepseek: [ // https://api-docs.deepseek.com/quick_start/pricing
-		'deepseek-chat',
-		'deepseek-reasoner',
-	],
-	ollama: [ // autodetected
-	],
-	vLLM: [ // autodetected
-	],
-	openRouter: [ // https://openrouter.ai/models
-		'anthropic/claude-3.5-sonnet',
-		'deepseek/deepseek-r1',
-		'mistralai/codestral-2501',
-		'qwen/qwen-2.5-coder-32b-instruct',
-	],
-	groq: [ // https://console.groq.com/docs/models
-		'llama-3.3-70b-versatile',
-		'llama-3.1-8b-instant',
-		'qwen-2.5-coder-32b', // preview mode (experimental)
-	],
-	// not supporting mistral right now- it's last on Void usage, and a huge pain to set up since it's nonstandard (it supports codestral FIM but it's on v1/fim/completions, etc)
-	// mistral: [ // https://docs.mistral.ai/getting-started/models/models_overview/
-	// 	'codestral-latest',
-	// 	'mistral-large-latest',
-	// 	'ministral-3b-latest',
-	// 	'ministral-8b-latest',
-	// ],
-	openAICompatible: [], // fallback
-} as const satisfies Record<ProviderName, string[]>
-
-
-
-
 export type ProviderName = keyof typeof defaultProviderSettings
 export const providerNames = Object.keys(defaultProviderSettings) as ProviderName[]
 
@@ -197,7 +141,7 @@ export const displayInfoOfProviderName = (providerName: ProviderName): DisplayIn
 	}
 	else if (providerName === 'xAI') {
 		return {
-			title: 'xAI API',
+			title: 'Grok (xAI)',
 		}
 	}
 
@@ -366,7 +310,7 @@ export const modelSelectionsEqual = (m1: ModelSelection, m2: ModelSelection) =>
 }
 
 // this is a state
-export const featureNames = ['Ctrl+L', 'Ctrl+K', 'Autocomplete', 'Apply'] as const
+export const featureNames = ['Chat', 'Ctrl+K', 'Autocomplete', 'Apply'] as const
 export type ModelSelectionOfFeature = Record<(typeof featureNames)[number], ModelSelection | null>
 export type FeatureName = keyof ModelSelectionOfFeature
 
@@ -377,7 +321,7 @@ export const displayInfoOfFeatureName = (featureName: FeatureName) => {
 	else if (featureName === 'Ctrl+K')
 		return 'Quick Edit'
 	// sidebar:
-	else if (featureName === 'Ctrl+L')
+	else if (featureName === 'Chat')
 		return 'Chat'
 	else if (featureName === 'Apply')
 		return 'Apply'
@@ -434,15 +378,27 @@ export const isFeatureNameDisabled = (featureName: FeatureName, settingsState: V
 
 
 
+export type ChatMode = 'agent' | 'gather' | 'normal'
 
 
 export type GlobalSettings = {
 	autoRefreshModels: boolean;
 	aiInstructions: string;
+	enableAutocomplete: boolean;
+	syncApplyToChat: boolean;
+	enableFastApply: boolean;
+	chatMode: ChatMode;
+	autoApprove: boolean;
 }
+
 export const defaultGlobalSettings: GlobalSettings = {
 	autoRefreshModels: true,
 	aiInstructions: '',
+	enableAutocomplete: false,
+	syncApplyToChat: true,
+	enableFastApply: true,
+	chatMode: 'agent',
+	autoApprove: false,
 }
 
 export type GlobalSettingName = keyof GlobalSettings
@@ -459,4 +415,9 @@ export const globalSettingNames = Object.keys(defaultGlobalSettings) as GlobalSe
 
 
 
+export type ModelSelectionOptions = {
+	reasoningEnabled?: boolean;
+	reasoningBudget?: number;
+}
 
+export type OptionsOfModelSelection = Partial<{ [providerName in ProviderName]: { [modelName: string]: ModelSelectionOptions | undefined } }>

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

@@ -1,6 +1,9 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
 
-
-import { LLMChatMessage, LLMFIMMessage } from '../../common/llmMessageTypes.js';
+import { AnthropicReasoning, LLMChatMessage, LLMFIMMessage } from '../../common/sendLLMMessageTypes.js';
 import { deepClone } from '../../../../../base/common/objects.js';
 
 
@@ -14,17 +17,38 @@ export const parseObject = (args: unknown) => {
 }
 
 
-const prepareMessages_normalize = ({ messages: messages_ }: { messages: LLMChatMessage[] }) => {
+type InternalLLMChatMessage = {
+	role: 'system' | 'user';
+	content: string;
+} | {
+	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_)
 	const newMessages: LLMChatMessage[] = []
+	if (messages.length >= 0) newMessages.push(messages[0])
+
+	// remove duplicate roles
 	for (let i = 1; i < messages.length; i += 1) {
 		const curr = messages[i]
-		const prev = messages[i - 1]
-		// if found a repeated role, put the current content in the prev
-		if ((curr.role === 'user' && prev.role === 'user') || (curr.role === 'assistant' && prev.role === 'assistant')) {
-			prev.content += '\n' + curr.content
-			continue
-		}
+		// const prev = messages[i - 1]
+		// // if found a repeated role, put the current content in the prev
+		// if ((curr.role === 'assistant' && prev.role === 'assistant')) {
+		// 	prev.content += '\n' + curr.content
+		// 	continue
+		// }
 		// add the message
 		newMessages.push(curr)
 	}
@@ -32,13 +56,19 @@ const prepareMessages_normalize = ({ messages: messages_ }: { messages: LLMChatM
 	return { messages: finalMessages }
 }
 
+
+
+
+
+
+
 // no matter whether the model supports a system message or not (or what format it supports), add it in some way
 const prepareMessages_systemMessage = ({
 	messages,
 	aiInstructions,
 	supportsSystemMessage,
 }: {
-	messages: LLMChatMessage[],
+	messages: InternalLLMChatMessage[],
 	aiInstructions: string,
 	supportsSystemMessage: false | 'system-role' | 'developer-role' | 'separated',
 })
@@ -56,15 +86,10 @@ const prepareMessages_systemMessage = ({
 	let separateSystemMessageStr: string | undefined = undefined
 
 	// remove all system messages
-	const newMessages: (LLMChatMessage | { role: 'developer', content: string })[] = messages.filter(msg => msg.role !== 'system')
-
-
-	// if (!supportsTools) {
-	// 	if (!systemMessageStr) systemMessageStr = ''
-	// 	systemMessageStr += '' // TODO!!! add tool use system message here
-	// }
+	const newMessages: (InternalLLMChatMessage | { role: 'developer', content: string })[] = messages.filter(msg => msg.role !== 'system')
 
 
+	// if it has a system message (if doesn't, we obviously don't care about whether it supports system message or not...)
 	if (systemMessageStr) {
 		// if supports system message
 		if (supportsSystemMessage) {
@@ -77,25 +102,18 @@ const prepareMessages_systemMessage = ({
 		}
 		// if does not support system message
 		else {
-			if (supportsSystemMessage) {
-				if (newMessages.length === 0)
-					newMessages.push({ role: 'user', content: systemMessageStr })
-				// add system mesasges to first message (should be a user message)
-				else {
-					const newFirstMessage = {
-						role: 'user',
-						content: (''
-							+ '<SYSTEM_MESSAGE>\n'
-							+ systemMessageStr
-							+ '\n'
-							+ '</SYSTEM_MESSAGE>\n'
-							+ newMessages[0].content
-						)
-					} as const
-					newMessages.splice(0, 1) // delete first message
-					newMessages.unshift(newFirstMessage) // add new first message
-				}
-			}
+			const newFirstMessage = {
+				role: 'user',
+				content: (''
+					+ '<SYSTEM_MESSAGE>\n'
+					+ systemMessageStr
+					+ '\n'
+					+ '</SYSTEM_MESSAGE>\n'
+					+ newMessages[0].content
+				)
+			} as const
+			newMessages.splice(0, 1) // delete first message
+			newMessages.unshift(newFirstMessage) // add new first message
 		}
 	}
 
@@ -128,27 +146,27 @@ openai on prompting - https://platform.openai.com/docs/guides/reasoning#advice-o
 openai on developer system message - https://cdn.openai.com/spec/model-spec-2024-05-08.html#follow-the-chain-of-command
 */
 
-const prepareMessages_tools_openai = ({ messages }: { messages: LLMChatMessage[], }) => {
+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: (
-		Exclude<LLMChatMessage, { role: 'assistant' | 'tool' }> | {
-			role: 'assistant',
-			content: string;
-			tool_calls?: {
-				type: 'function';
-				id: string;
-				function: {
-					name: string;
-					arguments: string;
-				}
-			}[]
-		} | {
-			role: 'tool',
-			id: string; // old val
-			tool_call_id: string; // new val
-			content: string;
-		}
-	)[] = [];
+	const newMessages: PrepareMessagesToolsOpenAI = [];
 
 	for (let i = 0; i < messages.length; i += 1) {
 		const currMsg = messages[i]
@@ -174,9 +192,8 @@ const prepareMessages_tools_openai = ({ messages }: { messages: LLMChatMessage[]
 		// add the tool
 		newMessages.push({
 			role: 'tool',
-			id: currMsg.id,
-			content: currMsg.content,
 			tool_call_id: currMsg.id,
+			content: currMsg.content || EMPTY_TOOL_CONTENT,
 		})
 	}
 	return { messages: newMessages }
@@ -205,31 +222,44 @@ anthropic RESPONSE (role=user):
 }]
 */
 
-const prepareMessages_tools_anthropic = ({ messages }: { messages: LLMChatMessage[], }) => {
-	const newMessages: (
-		Exclude<LLMChatMessage, { role: 'assistant' | 'user' }> | {
-			role: 'assistant',
-			content: string | ({
+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;
 		} | {
-			role: 'user',
-			content: string | ({
-				type: 'text';
-				text: string;
-			} | {
-				type: 'tool_result';
-				tool_use_id: string;
-				content: string;
-			})[]
-		}
-	)[] = messages;
+			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;
 
 
 	for (let i = 0; i < newMessages.length; i += 1) {
@@ -248,8 +278,7 @@ const prepareMessages_tools_anthropic = ({ messages }: { messages: LLMChatMessag
 		newMessages[i] = {
 			role: 'user',
 			content: [
-				...[{ type: 'tool_result', tool_use_id: currMsg.id, content: currMsg.content }] as const,
-				...currMsg.content ? [{ type: 'text', text: currMsg.content }] as const : [],
+				...[{ type: 'tool_result', tool_use_id: currMsg.id, content: currMsg.content || EMPTY_TOOL_CONTENT }] as const,
 			]
 		}
 	}
@@ -259,8 +288,9 @@ const prepareMessages_tools_anthropic = ({ messages }: { messages: LLMChatMessag
 
 
 
+type PrepareMessagesTools = PrepareMessagesToolsAnthropic | PrepareMessagesToolsOpenAI
 
-const prepareMessages_tools = ({ messages, supportsTools }: { messages: LLMChatMessage[], supportsTools: false | 'anthropic-style' | 'openai-style' }) => {
+const prepareMessages_tools = ({ messages, supportsTools }: { messages: InternalLLMChatMessage[], supportsTools: false | 'anthropic-style' | 'openai-style' }): { messages: PrepareMessagesTools } => {
 	if (!supportsTools) {
 		return { messages: messages }
 	}
@@ -271,11 +301,135 @@ const prepareMessages_tools = ({ messages, supportsTools }: { messages: LLMChatM
 		return prepareMessages_tools_openai({ messages })
 	}
 	else {
-		throw 1
+		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 newMessages: InternalLLMChatMessage[] = []
+	for (const m of messages) {
+		if (m.role !== 'assistant') {
+			newMessages.push(m)
+			continue
+		}
+		let newMessage: InternalLLMChatMessage
+		if (supportsAnthropicReasoningSignature && m.anthropicReasoning) {
+			const content = m.content ? [...m.anthropicReasoning, { type: 'text' as const, text: m.content }] : m.anthropicReasoning
+			newMessage = { role: 'assistant', content: content }
+		}
+		else {
+			newMessage = { role: 'assistant', content: m.content }
+		}
+		newMessages.push(newMessage)
+	}
+	return { messages: newMessages }
+}
+
+
+
+
+
+// do this at end
+const prepareMessages_noEmptyMessage = ({ messages }: { messages: PrepareMessagesTools }): { messages: PrepareMessagesTools } => {
+	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') {
+			currMsg.content = currMsg.content || EMPTY_MESSAGE
+		}
+		else {
+			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 }
+}
+
+
+
+// --- CHAT ---
+
+export const prepareMessages = ({
+	messages,
+	aiInstructions,
+	supportsSystemMessage,
+	supportsTools,
+	supportsAnthropicReasoningSignature,
+}: {
+	messages: LLMChatMessage[],
+	aiInstructions: string,
+	supportsSystemMessage: false | 'system-role' | 'developer-role' | 'separated',
+	supportsTools: false | 'anthropic-style' | 'openai-style',
+	supportsAnthropicReasoningSignature: boolean,
+}) => {
+	const { messages: messages1 } = prepareMessages_normalize({ messages })
+	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 })
+
+	return {
+		messages: messages5 as any,
+		separateSystemMessageStr
+	} as const
+}
+
+
+
+
+
+
+
+// --- FIM ---
+
+export const prepareFIMMessage = ({
+	messages,
+	aiInstructions,
+}: {
+	messages: LLMFIMMessage,
+	aiInstructions: string,
+}) => {
+
+	let prefix = `\
+${!aiInstructions ? '' : `\
+// Instructions:
+// Do not output an explanation. Try to avoid outputting comments. Only output the middle code.
+${aiInstructions.split('\n').map(line => `//${line}`).join('\n')}`}
+
+${messages.prefix}`
+
+	const suffix = messages.suffix
+	const stopTokens = messages.stopTokens
+	const ret = { prefix, suffix, stopTokens, maxTokens: 300 } as const
+	return ret
+}
+
+
+
+
 
 
 
@@ -309,55 +463,3 @@ gemini response:
 
 
 
-
-
-
-
-
-
-export const prepareMessages = ({
-	messages,
-	aiInstructions,
-	supportsSystemMessage,
-	supportsTools,
-}: {
-	messages: LLMChatMessage[],
-	aiInstructions: string,
-	supportsSystemMessage: false | 'system-role' | 'developer-role' | 'separated',
-	supportsTools: false | 'anthropic-style' | 'openai-style',
-}) => {
-	const { messages: messages1 } = prepareMessages_normalize({ messages })
-	const { messages: messages2, separateSystemMessageStr } = prepareMessages_systemMessage({ messages: messages1, aiInstructions, supportsSystemMessage })
-	const { messages: messages3 } = prepareMessages_tools({ messages: messages2, supportsTools })
-	return {
-		messages: messages3 as any,
-		separateSystemMessageStr
-	} as const
-}
-
-
-
-
-
-export const prepareFIMMessage = ({
-	messages,
-	aiInstructions,
-}: {
-	messages: LLMFIMMessage,
-	aiInstructions: string,
-}) => {
-
-	let prefix = `\
-${!aiInstructions ? '' : `\
-// Instructions:
-// Do not output an explanation. Try to avoid outputting comments. Only output the middle code.
-${aiInstructions.split('\n').map(line => `//${line}`).join('\n')}`}
-
-${messages.prefix}`
-
-	const suffix = messages.suffix
-	const stopTokens = messages.stopTokens
-	const ret = { prefix, suffix, stopTokens, maxTokens: 300 } as const
-	console.log('ret', ret)
-	return ret
-}

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

@@ -0,0 +1,595 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+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 { defaultProviderSettings, displayInfoOfProviderName, ModelSelectionOptions, ProviderName, SettingsOfProvider } from '../../common/voidSettingsTypes.js';
+import { prepareFIMMessage, prepareMessages } from './preprocessLLMMessages.js';
+import { getSendableReasoningInfo, getModelCapabilities, getProviderCapabilities } from '../../common/modelCapabilities.js';
+import { InternalToolInfo, ToolName, isAToolName } from '../../common/toolsServiceTypes.js';
+
+
+type InternalCommonMessageParams = {
+	aiInstructions: string;
+	onText: OnText;
+	onFinalMessage: OnFinalMessage;
+	onError: OnError;
+	providerName: ProviderName;
+	settingsOfProvider: SettingsOfProvider;
+	modelSelectionOptions: ModelSelectionOptions | undefined;
+	modelName: string;
+	_setAborter: (aborter: () => void) => void;
+}
+
+type SendChatParams_Internal = InternalCommonMessageParams & { messages: LLMChatMessage[]; tools?: InternalToolInfo[] }
+type SendFIMParams_Internal = InternalCommonMessageParams & { messages: LLMFIMMessage; }
+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 = {
+		dangerouslyAllowBrowser: true,
+		...includeInPayload,
+	}
+	if (providerName === 'openAI') {
+		const thisConfig = settingsOfProvider[providerName]
+		return new OpenAI({ apiKey: thisConfig.apiKey, ...commonPayloadOpts })
+	}
+	else if (providerName === 'ollama') {
+		const thisConfig = settingsOfProvider[providerName]
+		return new OpenAI({ baseURL: `${thisConfig.endpoint}/v1`, apiKey: 'noop', ...commonPayloadOpts })
+	}
+	else if (providerName === 'vLLM') {
+		const thisConfig = settingsOfProvider[providerName]
+		return new OpenAI({ baseURL: `${thisConfig.endpoint}/v1`, apiKey: 'noop', ...commonPayloadOpts })
+	}
+	else if (providerName === 'openRouter') {
+		const thisConfig = settingsOfProvider[providerName]
+		return new OpenAI({
+			baseURL: 'https://openrouter.ai/api/v1',
+			apiKey: thisConfig.apiKey,
+			defaultHeaders: {
+				'HTTP-Referer': 'https://voideditor.com', // Optional, for including your app on openrouter.ai rankings.
+				'X-Title': 'Void', // Optional. Shows in rankings on openrouter.ai.
+			},
+			...commonPayloadOpts,
+		})
+	}
+	else if (providerName === 'gemini') {
+		const thisConfig = settingsOfProvider[providerName]
+		return new OpenAI({ baseURL: 'https://generativelanguage.googleapis.com/v1beta/openai', apiKey: thisConfig.apiKey, ...commonPayloadOpts })
+	}
+	else if (providerName === 'deepseek') {
+		const thisConfig = settingsOfProvider[providerName]
+		return new OpenAI({ baseURL: 'https://api.deepseek.com/v1', apiKey: thisConfig.apiKey, ...commonPayloadOpts })
+	}
+	else if (providerName === 'openAICompatible') {
+		const thisConfig = settingsOfProvider[providerName]
+		return new OpenAI({ baseURL: thisConfig.endpoint, apiKey: thisConfig.apiKey, ...commonPayloadOpts })
+	}
+	else if (providerName === 'groq') {
+		const thisConfig = settingsOfProvider[providerName]
+		return new OpenAI({ baseURL: 'https://api.groq.com/openai/v1', apiKey: thisConfig.apiKey, ...commonPayloadOpts })
+	}
+	else if (providerName === 'xAI') {
+		const thisConfig = settingsOfProvider[providerName]
+		return new OpenAI({ baseURL: 'https://api.x.ai/v1', apiKey: thisConfig.apiKey, ...commonPayloadOpts })
+	}
+
+	else throw new Error(`Void providerName was invalid: ${providerName}.`)
+}
+
+
+const _sendOpenAICompatibleFIM = ({ messages: messages_, onFinalMessage, onError, settingsOfProvider, modelName: modelName_, _setAborter, providerName, aiInstructions, }: SendFIMParams_Internal) => {
+	const { modelName, supportsFIM } = getModelCapabilities(providerName, modelName_)
+	if (!supportsFIM) {
+		if (modelName === modelName_)
+			onError({ message: `Model ${modelName} does not support FIM.`, fullError: null })
+		else
+			onError({ message: `Model ${modelName_} (${modelName}) does not support FIM.`, fullError: null })
+		return
+	}
+
+	const messages = prepareFIMMessage({ messages: messages_, aiInstructions, })
+
+	const openai = newOpenAICompatibleSDK({ providerName, settingsOfProvider })
+	openai.completions
+		.create({
+			model: modelName,
+			prompt: messages.prefix,
+			suffix: messages.suffix,
+			stop: messages.stopTokens,
+			max_tokens: messages.maxTokens,
+		})
+		.then(async response => {
+			const fullText = response.choices[0]?.text
+			onFinalMessage({ fullText, fullReasoning: '', anthropicReasoning: null });
+		})
+		.catch(error => {
+			if (error instanceof OpenAI.APIError && error.status === 401) { onError({ message: invalidApiKeyMessage(providerName), fullError: error }); }
+			else { onError({ message: error + '', fullError: error }); }
+		})
+}
+
+
+
+
+const _sendOpenAICompatibleChat = ({ messages: messages_, onText, onFinalMessage, onError, settingsOfProvider, modelSelectionOptions, modelName: modelName_, _setAborter, providerName, aiInstructions, tools: tools_ }: SendChatParams_Internal) => {
+	const {
+		modelName,
+		supportsSystemMessage,
+		supportsTools,
+		// maxOutputTokens,
+		reasoningCapabilities,
+	} = getModelCapabilities(providerName, modelName_)
+
+	const { providerReasoningIOSettings } = getProviderCapabilities(providerName)
+
+	// reasoning
+	const { canIOReasoning, openSourceThinkTags, } = reasoningCapabilities || {}
+	const reasoningInfo = getSendableReasoningInfo(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 })
+	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)
+	}
+
+	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
+
+				// reasoning
+				let newReasoning = ''
+				if (nameOfReasoningFieldInDelta) {
+					// @ts-ignore
+					newReasoning = (chunk.choices[0]?.delta?.[nameOfReasoningFieldInDelta] || '') + ''
+					fullReasoningSoFar += newReasoning
+				}
+
+				onText({ fullText: fullTextSoFar, fullReasoning: fullReasoningSoFar, fullToolName, fullToolParams })
+			}
+			// on final
+			const toolCalls = toolCallsFrom_OpenAICompat(toolCallOfIndex)
+			if (!fullTextSoFar && !fullReasoningSoFar && toolCalls.length === 0) {
+				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 });
+				}
+			}
+		})
+		// when error/fail - this catches errors of both .create() and .then(for await)
+		.catch(error => {
+			if (error instanceof OpenAI.APIError && error.status === 401) { onError({ message: invalidApiKeyMessage(providerName), fullError: error }); }
+			else { onError({ message: error + '', fullError: error }); }
+		})
+}
+
+
+
+type OpenAIModel = {
+	id: string;
+	created: number;
+	object: 'model';
+	owned_by: string;
+}
+const _openaiCompatibleList = async ({ onSuccess: onSuccess_, onError: onError_, settingsOfProvider, providerName }: ListParams_Internal<OpenAIModel>) => {
+	const onSuccess = ({ models }: { models: OpenAIModel[] }) => {
+		onSuccess_({ models })
+	}
+	const onError = ({ error }: { error: string }) => {
+		onError_({ error })
+	}
+	try {
+		const openai = newOpenAICompatibleSDK({ providerName, settingsOfProvider })
+		openai.models.list()
+			.then(async (response) => {
+				const models: OpenAIModel[] = []
+				models.push(...response.data)
+				while (response.hasNextPage()) {
+					models.push(...(await response.getNextPage()).data)
+				}
+				onSuccess({ models })
+			})
+			.catch((error) => {
+				onError({ error: error + '' })
+			})
+	}
+	catch (error) {
+		onError({ error: error + '' })
+	}
+}
+
+
+
+
+// ------------ 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 {
+		modelName,
+		supportsSystemMessage,
+		supportsTools,
+		maxOutputTokens,
+		reasoningCapabilities,
+	} = getModelCapabilities(providerName, modelName_)
+
+	const thisConfig = settingsOfProvider.anthropic
+	const { providerReasoningIOSettings } = getProviderCapabilities(providerName)
+
+	// reasoning
+	const reasoningInfo = getSendableReasoningInfo(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 })
+	const anthropic = new Anthropic({
+		apiKey: thisConfig.apiKey,
+		dangerouslyAllowBrowser: true
+	});
+
+	const stream = anthropic.messages.stream({
+		system: separateSystemMessageStr,
+		messages: messages,
+		model: modelName,
+		max_tokens: maxTokens ?? 4_096, // anthropic requires this
+		...toolsObj,
+		...includeInPayload,
+	})
+
+	// when receive text
+	let fullText = ''
+	let fullReasoning = ''
+
+	let fullToolName = ''
+	let fullToolParams = ''
+
+	// there are no events for tool_use, it comes in at the end
+	stream.on('streamEvent', e => {
+		// start block
+		if (e.type === 'content_block_start') {
+			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 })
+			}
+			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 })
+			}
+			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 })
+			}
+		}
+
+		// delta
+		else if (e.type === 'content_block_delta') {
+			if (e.delta.type === 'text_delta') {
+				fullText += e.delta.text
+				onText({ fullText, fullReasoning, fullToolName, fullToolParams })
+			}
+			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 })
+			}
+		}
+	})
+
+	// 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 })
+	})
+	// on error
+	stream.on('error', (error) => {
+		if (error instanceof Anthropic.APIError && error.status === 401) { onError({ message: invalidApiKeyMessage(providerName), fullError: error }) }
+		else { onError({ message: error + '', fullError: error }) }
+	})
+	_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
+	if (!endpoint) throw new Error(`Ollama Endpoint was empty (please enter ${defaultProviderSettings.ollama.endpoint} in Void if you want the default url).`)
+	const ollama = new Ollama({ host: endpoint })
+	return ollama
+}
+
+const ollamaList = async ({ onSuccess: onSuccess_, onError: onError_, settingsOfProvider }: ListParams_Internal<OllamaModelResponse>) => {
+	const onSuccess = ({ models }: { models: OllamaModelResponse[] }) => {
+		onSuccess_({ models })
+	}
+	const onError = ({ error }: { error: string }) => {
+		onError_({ error })
+	}
+	try {
+		const thisConfig = settingsOfProvider.ollama
+		const ollama = newOllamaSDK({ endpoint: thisConfig.endpoint })
+		ollama.list()
+			.then((response) => {
+				const { models } = response
+				onSuccess({ models })
+			})
+			.catch((error) => {
+				onError({ error: error + '' })
+			})
+	}
+	catch (error) {
+		onError({ error: error + '' })
+	}
+}
+
+const sendOllamaFIM = ({ messages: messages_, onFinalMessage, onError, settingsOfProvider, modelName, aiInstructions, _setAborter }: SendFIMParams_Internal) => {
+	const thisConfig = settingsOfProvider.ollama
+	const ollama = newOllamaSDK({ endpoint: thisConfig.endpoint })
+
+	const messages = prepareFIMMessage({ messages: messages_, aiInstructions, })
+
+	let fullText = ''
+	ollama.generate({
+		model: modelName,
+		prompt: messages.prefix,
+		suffix: messages.suffix,
+		options: {
+			stop: messages.stopTokens,
+			num_predict: messages.maxTokens, // max tokens
+			// repeat_penalty: 1,
+		},
+		raw: true,
+		stream: true, // stream is not necessary but lets us expose the
+	})
+		.then(async stream => {
+			_setAborter(() => stream.abort())
+			for await (const chunk of stream) {
+				const newText = chunk.response
+				fullText += newText
+			}
+			onFinalMessage({ fullText, fullReasoning: '', anthropicReasoning: null })
+		})
+		// when error/fail
+		.catch((error) => {
+			onError({ message: error + '', fullError: error })
+		})
+}
+
+
+
+type CallFnOfProvider = {
+	[providerName in ProviderName]: {
+		sendChat: (params: SendChatParams_Internal) => void;
+		sendFIM: ((params: SendFIMParams_Internal) => void) | null;
+		list: ((params: ListParams_Internal<any>) => void) | null;
+	}
+}
+
+export const sendLLMMessageToProviderImplementation = {
+	anthropic: {
+		sendChat: sendAnthropicChat,
+		sendFIM: null,
+		list: null,
+	},
+	openAI: {
+		sendChat: (params) => _sendOpenAICompatibleChat(params),
+		sendFIM: null,
+		list: null,
+	},
+	xAI: {
+		sendChat: (params) => _sendOpenAICompatibleChat(params),
+		sendFIM: null,
+		list: null,
+	},
+	gemini: {
+		sendChat: (params) => _sendOpenAICompatibleChat(params),
+		sendFIM: null,
+		list: null,
+	},
+	// mistral: {
+	// 	sendChat: , // TODO
+	// 	sendFIM: , // TODO // https://docs.mistral.ai/api/#tag/fim
+	// 	list: null,
+	// },
+	ollama: {
+		sendChat: (params) => _sendOpenAICompatibleChat(params),
+		sendFIM: sendOllamaFIM,
+		list: ollamaList,
+	},
+	openAICompatible: {
+		sendChat: (params) => _sendOpenAICompatibleChat(params), // using openai's SDK is not ideal (your implementation might not do tools, reasoning, FIM etc correctly), talk to us for a custom integration
+		sendFIM: (params) => _sendOpenAICompatibleFIM(params),
+		list: null,
+	},
+	openRouter: {
+		sendChat: (params) => _sendOpenAICompatibleChat(params),
+		sendFIM: (params) => _sendOpenAICompatibleFIM(params),
+		list: null,
+	},
+	vLLM: {
+		sendChat: (params) => _sendOpenAICompatibleChat(params),
+		sendFIM: (params) => _sendOpenAICompatibleFIM(params),
+		list: (params) => _openaiCompatibleList(params),
+	},
+	deepseek: {
+		sendChat: (params) => _sendOpenAICompatibleChat(params),
+		sendFIM: null,
+		list: null,
+	},
+	groq: {
+		sendChat: (params) => _sendOpenAICompatibleChat(params),
+		sendFIM: null,
+		list: null,
+	},
+} satisfies CallFnOfProvider
+
+
+
+
+/*
+FIM info (this may be useful in the future with vLLM, but in most cases the only way to use FIM is if the provider explicitly supports it):
+
+qwen2.5-coder https://ollama.com/library/qwen2.5-coder/blobs/e94a8ecb9327
+<|fim_prefix|>{{ .Prompt }}<|fim_suffix|>{{ .Suffix }}<|fim_middle|>
+
+codestral https://ollama.com/library/codestral/blobs/51707752a87c
+[SUFFIX]{{ .Suffix }}[PREFIX] {{ .Prompt }}
+
+deepseek-coder-v2 https://ollama.com/library/deepseek-coder-v2/blobs/22091531faf0
+<｜fim▁begin｜>{{ .Prompt }}<｜fim▁hole｜>{{ .Suffix }}<｜fim▁end｜>
+
+starcoder2 https://ollama.com/library/starcoder2/blobs/3b190e68fefe
+<file_sep>
+<fim_prefix>
+{{ .Prompt }}<fim_suffix>{{ .Suffix }}<fim_middle>
+<|end_of_text|>
+
+codegemma https://ollama.com/library/codegemma:2b/blobs/48d9a8140749
+<|fim_prefix|>{{ .Prompt }}<|fim_suffix|>{{ .Suffix }}<|fim_middle|>
+
+*/

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

@@ -3,10 +3,10 @@
  *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
  *--------------------------------------------------------------------------------------*/
 
-import { SendLLMMessageParams, OnText, OnFinalMessage, OnError } from '../../common/llmMessageTypes.js';
+import { SendLLMMessageParams, OnText, OnFinalMessage, OnError } from '../../common/sendLLMMessageTypes.js';
 import { IMetricsService } from '../../common/metricsService.js';
 import { displayInfoOfProviderName } from '../../common/voidSettingsTypes.js';
-import { sendLLMMessageToProviderImplementation } from './MODELS.js';
+import { sendLLMMessageToProviderImplementation } from './sendLLMMessage.impl.js';
 
 
 export const sendLLMMessage = ({
@@ -17,10 +17,10 @@ export const sendLLMMessage = ({
 	onFinalMessage: onFinalMessage_,
 	onError: onError_,
 	abortRef: abortRef_,
-	logging: { loggingName },
+	logging: { loggingName, loggingExtras },
 	settingsOfProvider,
-	providerName,
-	modelName,
+	modelSelection,
+	modelSelectionOptions,
 	tools,
 }: SendLLMMessageParams,
 
@@ -28,6 +28,8 @@ export const sendLLMMessage = ({
 ) => {
 
 
+	const { providerName, modelName } = modelSelection
+
 	// only captures number of messages and message "shape", no actual code, instructions, prompts, etc
 	const captureLLMEvent = (eventId: string, extras?: object) => {
 		metricsService.capture(eventId, {
@@ -46,6 +48,7 @@ export const sendLLMMessage = ({
 				suffixLength: messages_.suffix.length,
 			} : {},
 
+			...loggingExtras,
 			...extras,
 		})
 	}
@@ -82,6 +85,7 @@ export const sendLLMMessage = ({
 		onError_({ message: errorMessage, fullError })
 	}
 
+	// we should NEVER call onAbort internally, only from the outside
 	const onAbort = () => {
 		captureLLMEvent(`${loggingName} - Abort`, { messageLengthSoFar: _fullTextSoFar.length })
 		try { _aborter?.() } // aborter sometimes automatically throws an error
@@ -91,9 +95,9 @@ export const sendLLMMessage = ({
 	abortRef_.current = onAbort
 
 	if (messagesType === 'chatMessages')
-		captureLLMEvent(`${loggingName} - Sending Message`, { messageLength: messages_[messages_.length - 1]?.content.length })
+		captureLLMEvent(`${loggingName} - Sending Message`, { messageLength: messages_?.[messages_.length - 1]?.content.length })
 	else if (messagesType === 'FIMMessage')
-		captureLLMEvent(`${loggingName} - Sending FIM`, {}) // TODO!!! add more metrics
+		captureLLMEvent(`${loggingName} - Sending FIM`, { prefixLen: messages_?.prefix?.length, suffixLen: messages_?.suffix?.length }) // TODO!!! add more metrics for FIM
 
 
 	try {
@@ -104,18 +108,19 @@ export const sendLLMMessage = ({
 		}
 		const { sendFIM, sendChat } = implementation
 		if (messagesType === 'chatMessages') {
-			sendChat({ messages: messages_, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName, aiInstructions, tools })
+			sendChat({ messages: messages_, onText, onFinalMessage, onError, settingsOfProvider, modelSelectionOptions, modelName, _setAborter, providerName, aiInstructions, tools })
 			return
 		}
 		if (messagesType === 'FIMMessage') {
 			if (sendFIM) {
-				sendFIM({ messages: messages_, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName, aiInstructions })
+				sendFIM({ messages: messages_, onText, onFinalMessage, onError, settingsOfProvider, modelSelectionOptions, modelName, _setAborter, providerName, aiInstructions })
 				return
 			}
 			onError({ message: `Error: This provider does not support Autocomplete yet.`, fullError: null })
 			return
 		}
 		onError({ message: `Error: Message type "${messagesType}" not recognized.`, fullError: null })
+		return
 	}
 
 	catch (error) {

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

@@ -96,7 +96,7 @@ export class MetricsMainService extends Disposable implements IMetricsService {
 		// very important to await whenReady!
 		await this._appStorage.whenReady
 
-		const { commit, version, quality } = this._productService
+		const { commit, version, voidVersion, quality } = this._productService
 
 		const isDevMode = !this._envMainService.isBuilt // found in abstractUpdateService.ts
 
@@ -104,6 +104,7 @@ export class MetricsMainService extends Disposable implements IMetricsService {
 		this._initProperties = {
 			commit,
 			vscodeVersion: version,
+			voidVersion,
 			os,
 			quality,
 			distinctId: this.distinctId,

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

@@ -8,10 +8,10 @@
 
 import { IServerChannel } from '../../../../base/parts/ipc/common/ipc.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
-import { EventLLMMessageOnTextParams, EventLLMMessageOnErrorParams, EventLLMMessageOnFinalMessageParams, MainSendLLMMessageParams, AbortRef, SendLLMMessageParams, MainLLMMessageAbortParams, ModelListParams, EventModelListOnSuccessParams, EventModelListOnErrorParams, OllamaModelResponse, VLLMModelResponse, MainModelListParams, } from '../common/llmMessageTypes.js';
+import { EventLLMMessageOnTextParams, EventLLMMessageOnErrorParams, EventLLMMessageOnFinalMessageParams, MainSendLLMMessageParams, AbortRef, SendLLMMessageParams, MainLLMMessageAbortParams, ModelListParams, EventModelListOnSuccessParams, EventModelListOnErrorParams, OllamaModelResponse, VLLMModelResponse, MainModelListParams, } from '../common/sendLLMMessageTypes.js';
 import { sendLLMMessage } from './llmMessage/sendLLMMessage.js'
 import { IMetricsService } from '../common/metricsService.js';
-import { sendLLMMessageToProviderImplementation } from './llmMessage/MODELS.js';
+import { sendLLMMessageToProviderImplementation } from './llmMessage/sendLLMMessage.impl.js';
 
 // NODE IMPLEMENTATION - calls actual sendLLMMessage() and returns listeners to it
 
@@ -106,6 +106,17 @@ export class LLMMessageChannel implements IServerChannel {
 		sendLLMMessage(mainThreadParams, this.metricsService);
 	}
 
+	private _callAbort(params: MainLLMMessageAbortParams) {
+		const { requestId } = params;
+		if (!(requestId in this.abortRefOfRequestId)) return
+		this.abortRefOfRequestId[requestId].current?.()
+		delete this.abortRefOfRequestId[requestId]
+	}
+
+
+
+
+
 	_callOllamaList = (params: MainModelListParams<OllamaModelResponse>) => {
 		const { requestId } = params
 		const emitters = this.listEmitters.ollama
@@ -132,11 +143,4 @@ export class LLMMessageChannel implements IServerChannel {
 
 
 
-	private _callAbort(params: MainLLMMessageAbortParams) {
-		const { requestId } = params;
-		if (!(requestId in this.abortRefOfRequestId)) return
-		this.abortRefOfRequestId[requestId].current?.()
-		delete this.abortRefOfRequestId[requestId]
-	}
-
 }

src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts

@@ -71,6 +71,7 @@ export class NativeDialogHandler extends AbstractDialogHandler {
 
 	async about(): Promise<void> {
 		let version = this.productService.version;
+		let voidVersion = this.productService.voidVersion; // Void added this
 		if (this.productService.target) {
 			version = `${version} (${this.productService.target} setup)`;
 		} else if (this.productService.darwinUniversalAssetId) {
@@ -81,7 +82,8 @@ export class NativeDialogHandler extends AbstractDialogHandler {
 
 		const detailString = (useAgo: boolean): string => {
 			return localize({ key: 'aboutDetail', comment: ['Electron, Chromium, Node.js and V8 are product names that need no translation'] },
-				"Version: {0}\nCommit: {1}\nDate: {2}\nElectron: {3}\nElectronBuildId: {4}\nChromium: {5}\nNode.js: {6}\nV8: {7}\nOS: {8}",
+				"Void Version: {0}\nVSCode Version: {1}\nCommit: {2}\nDate: {3}\nElectron: {4}\nElectronBuildId: {5}\nChromium: {6}\nNode.js: {7}\nV8: {8}\nOS: {9}",
+				voidVersion || 'Unknown',
 				version,
 				this.productService.commit || 'Unknown',
 				this.productService.date ? `${this.productService.date}${useAgo ? ' (' + fromNow(new Date(this.productService.date), true) + ')' : ''}` : 'Unknown',

src/vs/workbench/services/themes/common/workbenchThemeService.ts

@@ -39,12 +39,12 @@ export enum ThemeSettings {
 }
 
 export enum ThemeSettingDefaults {
-	COLOR_THEME_DARK = 'Default Dark+',
+	COLOR_THEME_DARK = 'Default Dark+', // Void changed this from 'Default Dark Modern'
 	COLOR_THEME_LIGHT = 'Default Light Modern',
 	COLOR_THEME_HC_DARK = 'Default High Contrast',
 	COLOR_THEME_HC_LIGHT = 'Default High Contrast Light',
 
-	COLOR_THEME_DARK_OLD = 'Default Dark Modern',
+	COLOR_THEME_DARK_OLD = 'Default Dark Modern', // Void changed this from 'Default Dark+'
 	COLOR_THEME_LIGHT_OLD = 'Default Light+',
 
 	FILE_ICON_THEME = 'vs-seti',

src/vs/workbench/workbench.common.main.ts

@@ -192,8 +192,9 @@ import './contrib/notebook/browser/notebook.contribution.js';
 import './contrib/speech/browser/speech.contribution.js';
 
 // Chat
-// import './contrib/chat/browser/chat.contribution.js'; // Void - remove vscode built-in chat
-// import './contrib/inlineChat/browser/inlineChat.contribution.js';
+// Void - this is still registered to avoid console errors, we just commented it out in chatParticipant.contribution.ts
+import './contrib/chat/browser/chat.contribution.js';
+import './contrib/inlineChat/browser/inlineChat.contribution.js';
 
 // Interactive
 import './contrib/interactive/browser/interactive.contribution.js';