devmode

Latest UX/UI updates

.eslintrc.json

@@ -10,6 +10,7 @@
 		"jsdoc",
 		"header",
 		"local"
+		// "react" // Void
 	],
 	"rules": {
 		"constructor-super": "warn",

.gitignore

@@ -21,3 +21,4 @@ vscode.db
 product.overrides.json
 *.snap.actual
 .vscode-test
+.tmp/

CHANGELOG.md

@@ -0,0 +1,35 @@
+
+
+
+
+
+## Jan. 13, 2025 - Entering beta
+
+- Added quick edits! Void handles FIM-prompting, output parsing, and history management for inline UI.
+
+- Migrated away from VS Code extension API - Void now lives and interacts entirely within the VS Code codebase.
+
+- New settings page with model configuration, one-click switch, and user settings.
+
+- Added auto-detection (via polling) of local models by default.
+
+- LLM requests originate from `node/`, which fixes common CORS and CSP issues when running some models locally.
+
+- Misc improvements like UI and history for Accept | Reject in the sidebar and editor, streaming interruptions, and past chat history.
+
+- Automatic file selection on tab switches.
+
+- Lots of new UI, misc bug fixes, and performance improvements.
+
+- VS Code's default Ctrl+L is now Ctrl+M in Void (on Mac Cmd+L becomes Cmd+M).
+
+- Switched from the MIT License to the Apache 2.0 License. Apache's attribution clause provides a small amount of protection to our source initiative.
+
+A huge shoutout to our many contributors. If you'd like to help build Void,
+
+## Sept/Oct. 2024 - Early launch
+
+- Initialized Void's website and GitHub repo.
+
+- Started a waitlist.
+

CONTRIBUTING.md

@@ -4,20 +4,19 @@ Welcome! 👋 This is the official guide on how to contribute to Void. We want t
 
 There are a few ways to contribute:
 
-- Suggest New Features ([Discord](https://discord.gg/RSNjgaugJs))
-- Build New Features ([Project](https://github.com/orgs/voideditor/projects/2/views/3))
-- Submit Issues/Docs/Bugs ([Issues](https://github.com/voideditor/void/issues))
+- 👨‍💻 Build new features - see [Issues](https://github.com/voideditor/void/issues).
+- 💡 Make suggestions in our [Discord](https://discord.gg/RSNjgaugJs).
+- ⭐️ If you want to build your AI tool into Void, feel free to get in touch! It's very easy to extend Void, and the UX you create will be much more natural than a VSCode Extension.
+
+Void's code lives in `src/vs/workbench/contrib/void/browser/` and `src/vs/platform/void/`.
+
 
 
 ## Building the full IDE
 
-Please follow the steps below to build the IDE. If you have any questions, feel free to [submit an issue](https://github.com/voideditor/void/issues/new) with any build errors, or refer to VSCode's full [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute) page.
-
-Most of Void's code lives in `src/vs/workbench/contrib/void/browser/` and `src/vs/platform/void/`.
-
 ### a. Build Prerequisites - Mac
 
-If you're using a Mac, make sure you have Python and XCode installed (you probably do by default).
+If you're using a Mac, you need Python and XCode. You probably have these by default.
 
 ### b. Build Prerequisites - Windows
 
@@ -28,38 +27,39 @@ Go to the "Workloads" tab and select:
 - `Node.js build tools`
 
 Go to the "Individual Components" tab and select:
-- `MSVC v143 - VS 2022 C++ x64/x86 Spectre-mitigated libs (Latest)`,
-- `C++ ATL for latest build tools with Spectre Mitigations`,
-- `C++ MFC for latest build tools with Spectre Mitigations`.
+- `MSVC v143 - VS 2022 C++ x64/x86 Spectre-mitigated libs (Latest)`
+- `C++ ATL for latest build tools with Spectre Mitigations`
+- `C++ MFC for latest build tools with Spectre Mitigations`
 
 Finally, click Install.
 
 ### c. Build Prerequisites - Linux
 
-First, make sure you've installed NodeJS and run `npm install -g node-gyp`. Then:
-- Debian (Ubuntu, etc) - `sudo apt-get install build-essential g++ libx11-dev libxkbfile-dev libsecret-1-dev libkrb5-dev python-is-python3`.
-- Red Hat (Fedora, etc) - `sudo dnf install @development-tools gcc gcc-c++ make libsecret-devel krb5-devel libX11-devel libxkbfile-devel`.
-- Others - see [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute).
+First, run `npm install -g node-gyp`. Then:
 
-### Build instructions
+- Debian (Ubuntu, etc): `sudo apt-get install build-essential g++ libx11-dev libxkbfile-dev libsecret-1-dev libkrb5-dev python-is-python3`.
+- Red Hat (Fedora, etc): `sudo dnf install @development-tools gcc gcc-c++ make libsecret-devel krb5-devel libX11-devel libxkbfile-devel`.
+- Others: see [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute).
 
-To build Void, first follow the prerequisite steps above for your operating system and open `void/` inside VSCode. Then:
+### Building Void
 
-1. Install all dependencies.
+To build Void, open `void/` inside VSCode. Then open your terminal and run:
 
-```
-npm install
-```
+1. `npm install` to install all dependencies.
+2. `npm run watchreact` to build Void's browser dependencies like React. (If this doesn't work, try `npm run buildreact`).
+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.
+4. Run Void.
+	 - Run `./scripts/code.sh` (Mac/Linux).
+   - Run `./scripts/code.bat` (Windows).
+   - This command should open up the built IDE. You can always press <kbd>Ctrl+R</kbd> (<kbd>Cmd+R</kbd>)  inside the new window to see changes without re-building, or press or <kbd>Ctrl+Shift+P</kbd> in the new window and run "Reload Window".
+	- If you are actively developing Void, we strongly recommend adding the flags `--user-data-dir ./.tmp/user-data --extensions-dir ./.tmp/extensions` to the above run command (just append them at the end of the string). This will save all data and extensions to the `.tmp` folder. You can delete this folder to reset any IDE changes you made when testing.
 
-2. Run `cd ./src/vs/workbench/contrib/void/browser/react/` and then `node ./build.js` to build Void's external dependencies (our React components, etc).
+#### Building Void from Terminal
 
-3. Press <kbd>Ctrl+Shift+B</kbd>, or if you prefer using the terminal run `npm run watch`.
-
-This can take ~5 min.
-
-If you ran <kbd>Ctrl+Shift+B</kbd>, the build is done when you see two check marks.
-
-If you ran `npm run watch`, the build is done when you see something like this:
+Alternatively, if you want to build Void from the terminal, instead of pressing <kbd>Cmd+Shift+B</kbd> you can run `npm run watch`. The build is done when you see something like this:
 
 ```
 [watch-extensions] [00:37:39] Finished compilation extensions with 0 errors after 19303 ms
@@ -68,50 +68,61 @@ If you ran `npm run watch`, the build is done when you see something like this:
 [watch-client    ] [00:38:07] Finished compilation with 0 errors after 5 ms
 ```
 
-<!-- 3. Press <kbd>Ctrl+Shift+B</kbd> to start the build process. -->
 
-4. In a new terminal, run `./scripts/code.sh` (Mac/Linux) or `./scripts/code.bat` (Windows). This should open up the built IDE!
-You can always press <kbd>Ctrl+Shift+P</kbd> and run "Reload Window" inside the new window to see changes without re-building.
-
-Now that you're set up, feel free to check out our [Issues](https://github.com/voideditor/void/issues) page.
 
 ### Common Fixes
 
+- Make sure you follow the prerequisite steps.
 - Make sure you have the same NodeJS version as `.nvmrc`.
+- Make sure your `npm run watchreact` is running if you change any React files, or else you'll need to re-build.
+- If you see missing styles, go to `src2/styles.css` and re-save the file.
+- If you get `"TypeError: Failed to fetch dynamically imported module: vscode-file://vscode-app/.../workbench.desktop.main.js", source: file:///.../bootstrap-window.js`, make sure all imports end with `.js`.
+- If you have any questions, feel free to [submit an issue](https://github.com/voideditor/void/issues/new). For building questions, you can also refer to VSCode's full [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute) page.
 
-- If you see `[ERROR] Cannot start service: Host version "0.23.1" does not match binary version "0.23.0"`, run `npm i -D esbuild@0.23.0` or do a clean install of your npm dependencies.
 
 
 ## Bundling
 
-To bundle the IDE into an executable, run `npm run gulp vscode-darwin-arm64`.
-
-Here are the full options: `vscode-{win32-ia32 | win32-x64 | darwin-x64 | darwin-arm64 | linux-ia32 | linux-x64 | linux-arm}(-min)`
+We don't usually recommend bundling. Instead, you should probably just build. If you're sure you want to bundle Void into an executable app, make sure you've built first, then run one of the following commands. This will create a folder named `VSCode-darwin-arm64` or similar outside of the void/ repo (see below). Be patient - compiling can take ~25 minutes.
 
 
-## Roadmap
+### Mac
+- `npm run gulp vscode-darwin-arm64` - most common (Apple Silicon)
+- `npm run gulp vscode-darwin-x64` (Intel)
 
-Please refer to our [Issues](https://github.com/voideditor/void/issues) page for the latest issues.
+### Windows
+- `npm run gulp vscode-win32-x64` - most common
+- `npm run gulp vscode-win32-ia32`
+
+### Linux
+- `npm run gulp vscode-linux-x64` - most common
+- `npm run gulp vscode-linux-arm`
+- `npm run gulp vscode-linux-ia32`
 
 
-## ⭐⭐⭐ Creative.
+### Output
+
+This will generate a folder outside of `void/`:
+```bash
+workspace/
+├── void/   # Your Void fork
+└── VSCode-darwin-arm64/ # Generated output
+```
 
-Examples: creating better code search, or supporting AI agents that can edit across files and make multiple LLM calls.
 
-Eventually, we want to build a convenient API for creating AI tools. The API will provide methods for creating the UI (showing an autocomplete suggestion, or creating a new diff), detecting event changes (like `onKeystroke` or `onFileOpen`), and modifying the user's file-system (storing indexes associated with each file), making it much easier to make your own AI plugin. We plan on building these features further along in timeline, but we wanted to list them for completeness.
 
 # Guidelines
 
-We're always glad to talk about new ideas, help you get set up, and make sure your changes align with our vision for the project. Feel free to shoot us a message in the #general channel of the [Discord](https://discord.gg/RSNjgaugJs) for any reason. Please check in especially if you want to make a lot of changes or build a large new feature.
-
+We're always glad to talk about new ideas, help you get set up, and make sure your changes align with our vision for the project! Feel free to shoot Mat or Andrew a message, or start chatting with us in the `#contributing` channel of our [Discord](https://discord.gg/RSNjgaugJs).
 
 
 ## Submitting a Pull Request
 
-Please submit a pull request once you've made a change. You don't need to submit an issue.
+- Please submit a pull request once you've made a change. No need to submit an Issue unless you're creating a new feature.
+- Please don't use AI to write your PR 🙂.
 
-Please don't use AI to write your PR 🙂.
 
+<!--
 # Relevant files
 
 We keep track of all the files we've changed with Void so it's easy to rebase:
@@ -135,7 +146,7 @@ We keep track of all the files we've changed with Void so it's easy to rebase:
 - build/npm/dirs.js
 
 - vscode.proposed.editorInsets.d.ts - not modified, but code copied
-
+-->
 
 ## References
 

LICENSE-VS-Code.txt

@@ -0,0 +1,26 @@
+Void is a fork of VS Code, which is licensed under the MIT License (below).
+Void's additions and modifications are licensed under the Apache 2.0 License (see LICENSE.txt).
+
+--------------------
+
+MIT License
+
+Copyright (c) 2015 - present Microsoft Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE.txt

@@ -1,21 +1,201 @@
-MIT License
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Copyright (c) 2015 - present Microsoft Corporation
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+   1. Definitions.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2025 Glass Devtools, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,16 +1,39 @@
 # Welcome to Void.
 
-Void is the open-source Cursor alternative. This repo contains the full sourcecode for Void. We have a [waitlist](https://voideditor.com/email) for downloading the official release, but you can build and develop Void right now.
+<div align="center">
+	<img
+		src="./src/vs/workbench/browser/parts/editor/media/slice_of_void.png"
+	 	alt="Void Welcome"
+		width="300"
+	 	height="300"
+	/>
+</div>
 
-If you're new, welcome!
+Void is the open-source Cursor alternative. This repo contains the full sourcecode for Void. We are currently in [open beta](https://voideditor.com/) for downloading the official release. If you're new, welcome!
+
+- 👋 [Discord](https://discord.gg/RSNjgaugJs)
+
+- 🚙 [Roadmap](https://github.com/orgs/voideditor/projects/2)
+
+- 📝 [Changelog](https://voideditor.com/changelog)
+
+- 🔨 [Contribute](https://github.com/voideditor/void/blob/main/CONTRIBUTING.md)
+
+
+<!-- ❤️ Setup: -->
 
 ## Contributing
 
-To build and run Void, follow the steps in [`CONTRIBUTING.md`](https://github.com/voideditor/void/blob/main/CONTRIBUTING.md).
+
+1. To contribute to the Void repository, follow the steps in [`CONTRIBUTING.md`](https://github.com/voideditor/void/blob/main/CONTRIBUTING.md).
+  
+2. To suggest a new feature, please create a new [GitHub Issue](https://github.com/voideditor/void/issues). Suggestions will be added to our Roadmap within one day.
+
+3. We're open to collaborations of all types. Feel free to contact us via email or discord.
 
 ## Reference
 
-Void is a fork of the of [vscode](https://github.com/microsoft/vscode) repository. For some useful links on VSCode, see [`VOID_USEFUL_LINKS.md`](https://github.com/voideditor/void/blob/main/VOID_USEFUL_LINKS.md).
+Void is a fork of the [vscode](https://github.com/microsoft/vscode) repository. For some useful links on VSCode, see [`VOID_USEFUL_LINKS.md`](https://github.com/voideditor/void/blob/main/VOID_USEFUL_LINKS.md).
 
 ## Support
-Feel free to reach out in our [Discord](https://discord.gg/RSNjgaugJs) or contact us via email.
+Feel free to reach out in our discord or contact us via email.

SECURITY.md

@@ -1,41 +0,0 @@
-<!-- BEGIN MICROSOFT SECURITY.MD V0.0.9 BLOCK -->
-
-## Security
-
-Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet) and [Xamarin](https://github.com/xamarin).
-
-If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/security.md/definition), please report it to us as described below.
-
-## Reporting Security Issues
-
-**Please do not report security vulnerabilities through public GitHub issues.**
-
-Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/security.md/msrc/create-report).
-
-If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/security.md/msrc/pgp).
-
-You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc).
-
-Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
-
-  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
-  * Full paths of source file(s) related to the manifestation of the issue
-  * The location of the affected source code (tag/branch/commit or direct URL)
-  * Any special configuration required to reproduce the issue
-  * Step-by-step instructions to reproduce the issue
-  * Proof-of-concept or exploit code (if possible)
-  * Impact of the issue, including how an attacker might exploit the issue
-
-This information will help us triage your report more quickly.
-
-If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/security.md/msrc/bounty) page for more details about our active programs.
-
-## Preferred Languages
-
-We prefer all communications to be in English.
-
-## Policy
-
-Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/security.md/cvd).
-
-<!-- END MICROSOFT SECURITY.MD BLOCK -->

VOID_USEFUL_LINKS.md

@@ -2,18 +2,22 @@
 
 The Void team put together this list of links to get up and running with VSCode's sourcecode. We hope it's helpful!
 
+## 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.
+
+- [Built-in VSCode styles](https://code.visualstudio.com/api/references/theme-color) - CSS variables that are built into VSCode. Use `var(--vscode-{theme but replacing . with -})`. You can also see their [Webview theming guide](https://code.visualstudio.com/api/extension-guides/webview#theming-webview-content).
+
 ## Beginners / Getting started
 
 - [VSCode UI guide](https://code.visualstudio.com/docs/getstarted/userinterface)  - covers auxbar, panels, etc.
 
 - [UX guide](https://code.visualstudio.com/api/ux-guidelines/overview) - covers Containers, Views, Items, etc.
 
-## Contributing
 
-- [How VS Code'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.
+## Misc
 
-
-- [Every command](https://code.visualstudio.com/api/references/commands) built-in to VSCode - sometimes useful to reference.
+- [Every command](https://code.visualstudio.com/api/references/commands) built-in to VSCode - not used often, but here for reference.
 
 
 ## VSCode's Extension API
@@ -28,6 +32,6 @@ Void is no longer an extension, so these links are no longer required, but they
 
 - [The Full VSCode Extension API](https://code.visualstudio.com/api/references/vscode-api) - look on the right side for organization. The [bottom](https://code.visualstudio.com/api/references/vscode-api#api-patterns) of the page is easy to miss but is useful - cancellation tokens, events, disposables.
 
-- [Activation events](https://code.visualstudio.com/api/references/activation-events) you can define in `package.json` (not the most useful)
+- [Activation events](https://code.visualstudio.com/api/references/activation-events) you can define in `package.json` (not the most useful).
 
 

build/azure-pipelines/darwin/product-build-darwin-universal.yml

@@ -1,3 +1,5 @@
+# Void - this looks like the relevant file for us (product-build-darwin.yml is independent and maybe just used for testing)
+
 steps:
   - task: NodeTool@0
     inputs:
@@ -59,6 +61,8 @@ steps:
   - script: node build/azure-pipelines/distro/mixin-quality
     displayName: Mixin distro quality
 
+
+  ## Void - IMPORTANT
   - script: |
       set -e
       unzip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_x64_archive/VSCode-darwin-x64.zip -d $(agent.builddirectory)/VSCode-darwin-x64
@@ -66,6 +70,7 @@ steps:
       DEBUG=* node build/darwin/create-universal-app.js $(agent.builddirectory)
     displayName: Create Universal App
 
+  ## Void - IMPORTANT
   - script: |
       set -e
       security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain

build/darwin/create-universal-app.js

@@ -4,6 +4,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
+// Void explanation - product-build-darwin-universal.yml runs this (create-universal-app.ts), then sign.ts
 const path = require("path");
 const fs = require("fs");
 const minimatch = require("minimatch");

build/darwin/create-universal-app.ts

@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+// Void explanation - product-build-darwin-universal.yml runs this (create-universal-app.ts), then sign.ts
+
 import * as path from 'path';
 import * as fs from 'fs';
 import * as minimatch from 'minimatch';

build/darwin/sign.js

@@ -78,24 +78,24 @@ async function main(buildDir) {
     // universal will get its copy from the x64 build.
     if (arch !== 'universal') {
         await (0, cross_spawn_promise_1.spawn)('plutil', [
-            '-insert',
+            '-replace', // Void changed this to replace
             'NSAppleEventsUsageDescription',
             '-string',
-            'An application in Visual Studio Code wants to use AppleScript.',
+            'An application in Void wants to use AppleScript.',
             `${infoPlistPath}`
         ]);
         await (0, cross_spawn_promise_1.spawn)('plutil', [
             '-replace',
             'NSMicrophoneUsageDescription',
             '-string',
-            'An application in Visual Studio Code wants to use the Microphone.',
+            'An application in Void wants to use the Microphone.',
             `${infoPlistPath}`
         ]);
         await (0, cross_spawn_promise_1.spawn)('plutil', [
             '-replace',
             'NSCameraUsageDescription',
             '-string',
-            'An application in Visual Studio Code wants to use the Camera.',
+            'An application in Void wants to use the Camera.',
             `${infoPlistPath}`
         ]);
     }

build/darwin/sign.ts

@@ -89,24 +89,24 @@ async function main(buildDir?: string): Promise<void> {
 	// universal will get its copy from the x64 build.
 	if (arch !== 'universal') {
 		await spawn('plutil', [
-			'-insert',
+			'-replace', // Void changed this to replace
 			'NSAppleEventsUsageDescription',
 			'-string',
-			'An application in Visual Studio Code wants to use AppleScript.',
+			'An application in Void wants to use AppleScript.',
 			`${infoPlistPath}`
 		]);
 		await spawn('plutil', [
 			'-replace',
 			'NSMicrophoneUsageDescription',
 			'-string',
-			'An application in Visual Studio Code wants to use the Microphone.',
+			'An application in Void wants to use the Microphone.',
 			`${infoPlistPath}`
 		]);
 		await spawn('plutil', [
 			'-replace',
 			'NSCameraUsageDescription',
 			'-string',
-			'An application in Visual Studio Code wants to use the Camera.',
+			'An application in Void wants to use the Camera.',
 			`${infoPlistPath}`
 		]);
 	}

build/gulpfile.vscode.js

@@ -341,6 +341,8 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 				this.emit('data', file);
 			}));
 
+
+		// Void - this is important, creates the product.json in .app
 		let productJsonContents;
 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
 			.pipe(json({ commit, date: readISODate('out-build'), checksums, version }))
@@ -425,15 +427,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 				'resources/win32/vue.ico',
 				'resources/win32/xml.ico',
 				'resources/win32/yaml.ico',
-				'resources/win32/code_70x70.png',
-				'resources/win32/code_150x150.png'
+				'resources/win32/code_70x70.png', // <-- Void icon
+				'resources/win32/code_150x150.png' // <-- Void icon
 			], { base: '.' }));
 		} else if (platform === 'linux') {
-			all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' }));
+			all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' })); // <-- Void icon
 		} else if (platform === 'darwin') {
 			const shortcut = gulp.src('resources/darwin/bin/code.sh')
 				.pipe(replace('@@APPNAME@@', product.applicationName))
-				.pipe(rename('bin/code'));
+				.pipe(rename('bin/code')); // <-- Void icon
 
 			all = es.merge(all, shortcut);
 		}

build/lib/electron.js

@@ -54,7 +54,7 @@ function darwinBundleDocumentType(extensions, icon, nameOrSuffix, utis) {
         role: 'Editor',
         ostypes: ['TEXT', 'utxt', 'TUTX', '****'],
         extensions,
-        iconFile: 'resources/darwin/' + icon.toLowerCase() + '.icns',
+        iconFile: 'resources/darwin/' + icon.toLowerCase() + '.icns', // <-- Void icon code.icns
         utis
     };
 }
@@ -179,7 +179,7 @@ exports.config = {
     darwinForceDarkModeSupport: true,
     darwinCredits: darwinCreditsTemplate ? Buffer.from(darwinCreditsTemplate({ commit: commit, date: new Date().toISOString() })) : undefined,
     linuxExecutableName: product.applicationName,
-    winIcon: 'resources/win32/code.ico',
+    winIcon: 'resources/win32/code.ico', // <-- Void icon
     token: process.env['GITHUB_TOKEN'],
     repo: product.electronRepository || undefined,
     validateChecksum: true,

build/lib/electron.ts

@@ -68,7 +68,7 @@ function darwinBundleDocumentType(extensions: string[], icon: string, nameOrSuff
 		role: 'Editor',
 		ostypes: ['TEXT', 'utxt', 'TUTX', '****'],
 		extensions,
-		iconFile: 'resources/darwin/' + icon.toLowerCase() + '.icns',
+		iconFile: 'resources/darwin/' + icon.toLowerCase() + '.icns', // <-- Void icon code.icns
 		utis
 	};
 }
@@ -196,7 +196,7 @@ export const config = {
 	darwinForceDarkModeSupport: true,
 	darwinCredits: darwinCreditsTemplate ? Buffer.from(darwinCreditsTemplate({ commit: commit, date: new Date().toISOString() })) : undefined,
 	linuxExecutableName: product.applicationName,
-	winIcon: 'resources/win32/code.ico',
+	winIcon: 'resources/win32/code.ico', // <-- Void icon
 	token: process.env['GITHUB_TOKEN'],
 	repo: product.electronRepository || undefined,
 	validateChecksum: true,

build/win32/code.iss

@@ -4,6 +4,7 @@
       ? ('; LicenseFile: "' + RepoDir + '\licenses\LICENSE-' + Language + '.rtf"') \
       : '; LicenseFile: "' + RepoDir + '\' + RootLicenseFileName + '"'
 
+
 [Setup]
 AppId={#AppId}
 AppName={#NameLong}
@@ -20,8 +21,10 @@ Compression=lzma
 SolidCompression=yes
 AppMutex={code:GetAppMutex}
 SetupMutex={#AppMutex}setup
-WizardImageFile="{#RepoDir}\resources\win32\inno-big-100.bmp,{#RepoDir}\resources\win32\inno-big-125.bmp,{#RepoDir}\resources\win32\inno-big-150.bmp,{#RepoDir}\resources\win32\inno-big-175.bmp,{#RepoDir}\resources\win32\inno-big-200.bmp,{#RepoDir}\resources\win32\inno-big-225.bmp,{#RepoDir}\resources\win32\inno-big-250.bmp"
-WizardSmallImageFile="{#RepoDir}\resources\win32\inno-small-100.bmp,{#RepoDir}\resources\win32\inno-small-125.bmp,{#RepoDir}\resources\win32\inno-small-150.bmp,{#RepoDir}\resources\win32\inno-small-175.bmp,{#RepoDir}\resources\win32\inno-small-200.bmp,{#RepoDir}\resources\win32\inno-small-225.bmp,{#RepoDir}\resources\win32\inno-small-250.bmp"
+; this is a Void icon comment. Old: WizardImageFile="{#RepoDir}\resources\win32\inno-big-100.bmp,{#RepoDir}\resources\win32\inno-big-125.bmp,{#RepoDir}\resources\win32\inno-big-150.bmp,{#RepoDir}\resources\win32\inno-big-175.bmp,{#RepoDir}\resources\win32\inno-big-200.bmp,{#RepoDir}\resources\win32\inno-big-225.bmp,{#RepoDir}\resources\win32\inno-big-250.bmp"
+; this is a Void icon comment. Old: WizardSmallImageFile="{#RepoDir}\resources\win32\inno-small-100.bmp,{#RepoDir}\resources\win32\inno-small-125.bmp,{#RepoDir}\resources\win32\inno-small-150.bmp,{#RepoDir}\resources\win32\inno-small-175.bmp,{#RepoDir}\resources\win32\inno-small-200.bmp,{#RepoDir}\resources\win32\inno-small-225.bmp,{#RepoDir}\resources\win32\inno-small-250.bmp"
+WizardImageFile="{#RepoDir}\resources\win32\inno-void.bmp"
+WizardSmallImageFile="{#RepoDir}\resources\win32\inno-void.bmp"
 SetupIconFile={#RepoDir}\resources\win32\code.ico
 UninstallDisplayIcon={app}\{#ExeBasename}.exe
 ChangesEnvironment=true

extensions/void/LangaugeServerTest/createJsProgramGraph.ts

@@ -1,333 +0,0 @@
-import * as vscode from 'vscode';
-import Parser from 'tree-sitter';
-import JavaScript from 'tree-sitter-javascript';
-
-interface Definition {
-    file: string;
-    node: Parser.SyntaxNode;
-}
-
-interface DefnUse {
-    parent: Parser.SyntaxNode;
-    file: string;
-}
-
-interface ImportInfo {
-    source: string;
-    imported: string;
-}
-
-class ProjectAnalyzer {
-    private parser: Parser;
-    private graph: Map<string, Set<string>>;
-    private visited: Set<string>;
-    private parsedFiles: Map<string, Parser.Tree>;
-    private imports: Map<string, Map<string, ImportInfo>>;
-    private definitions: Map<string, Definition>;
-    private fileStack: Set<string>;
-
-    constructor() {
-        this.parser = new Parser();
-        this.parser.setLanguage(JavaScript);
-        this.graph = new Map();
-        this.visited = new Set();
-        this.parsedFiles = new Map();
-        this.imports = new Map();
-        this.definitions = new Map();
-        this.fileStack = new Set();
-    }
-
-    async parseFile(filePath: string): Promise<Parser.Tree | null> {
-        if (this.parsedFiles.has(filePath)) {
-            return this.parsedFiles.get(filePath)!;
-        }
-
-        if (this.fileStack.has(filePath)) {
-            return null; // Circular import
-        }
-
-        this.fileStack.add(filePath);
-
-        try {
-            const uri = vscode.Uri.file(filePath);
-            const document = await vscode.workspace.openTextDocument(uri);
-            const code = document.getText();
-            const tree = this.parser.parse(code);
-
-            this.parsedFiles.set(filePath, tree);
-            this.collectImports(filePath, tree);
-            this.collectDefinitions(filePath, tree);
-
-            return tree;
-        } catch (error) {
-            console.error(`Error parsing ${filePath}:`, error);
-            return null;
-        } finally {
-            this.fileStack.delete(filePath);
-        }
-    }
-
-    private collectImports(filePath: string, tree: Parser.Tree): void {
-        const fileImports = new Map<string, ImportInfo>();
-
-        const visit = (node: Parser.SyntaxNode): void => {
-            if (node.type === 'import_declaration') {
-                const source = node.childForFieldName('source')?.text.slice(1, -1) ?? '';
-                const specifiers = node.childForFieldName('specifiers');
-
-                specifiers?.children.forEach(spec => {
-                    if (spec.type === 'import_specifier') {
-                        const local = spec.childForFieldName('local')?.text ?? '';
-                        const imported = spec.childForFieldName('imported')?.text ?? '';
-                        fileImports.set(local, { source, imported });
-                    }
-                });
-            }
-            node.children.forEach(visit);
-        };
-
-        visit(tree.rootNode);
-        this.imports.set(filePath, fileImports);
-    }
-
-    private collectDefinitions(filePath: string, tree: Parser.Tree): void {
-        const visit = (node: Parser.SyntaxNode): void => {
-            if (node.type === 'function_declaration') {
-                const name = node.childForFieldName('name')?.text ?? '';
-                this.definitions.set(name, { file: filePath, node });
-            }
-            else if (node.type === 'variable_declarator') {
-                const name = node.childForFieldName('name')?.text;
-                const value = node.childForFieldName('value');
-                if (name && (value?.type === 'arrow_function' || value?.type === 'function')) {
-                    this.definitions.set(name, { file: filePath, node: value });
-                }
-            }
-            node.children.forEach(visit);
-        };
-
-        visit(tree.rootNode);
-    }
-
-    private async getTypeFromPosition(uri: vscode.Uri, position: vscode.Position): Promise<string | null> {
-        const hover = await vscode.commands.executeCommand<vscode.Hover[]>(
-            'vscode.executeHoverProvider',
-            uri,
-            position
-        );
-
-        if (hover?.[0]?.contents.length) {
-            for (const content of hover[0].contents) {
-                let hoverText = typeof content === 'string' ?
-                    content :
-                    ('value' in content ? content.value : '');
-
-                // Remove typescript backticks if present
-                hoverText = hoverText.replace(/```typescript\s*/, '').replace(/```\s*$/, '');
-                console.log('Processing hover text:', hoverText);
-
-                // Extract the type information - look for the type after the colon
-                const typeMatches = [
-                    /:\s*([\w<>]+)(?:\[\])?/,  // matches "foo: Type" or "foo: Type[]"
-                    /var\s+\w+:\s*([\w<>]+)/,  // matches "var foo: Type"
-                    /\(type\)\s+[\w<>]+:\s*([\w<>]+)/,  // matches "(type) foo: Type"
-                    /\(method\)\s*([\w<>]+)\./  // matches "(method) Type.method"
-                ];
-
-                for (const pattern of typeMatches) {
-                    const match = pattern.exec(hoverText);
-                    if (match) {
-                        let type = match[1];
-                        // Handle array types
-                        if (hoverText.includes('[]')) {
-                            return 'Array';
-                        }
-                        // Extract base type from generics
-                        if (type.includes('<')) {
-                            type = type.split('<')[0];
-                        }
-                        return type;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    private async getCallsInDefn(defnNode: Parser.SyntaxNode, currentFile: string): Promise<Set<string>> {
-        const calls = new Set<string>();
-        const fileImports = this.imports.get(currentFile) ?? new Map();
-        const uri = vscode.Uri.file(currentFile);
-
-        const visit = async (node: Parser.SyntaxNode): Promise<void> => {
-            if (node.type === 'call_expression') {
-                const callee = node.childForFieldName('function');
-                if (callee?.type === 'identifier') {
-                    const name = callee.text;
-                    const importInfo = fileImports.get(name);
-                    if (importInfo) {
-                        calls.add(`${importInfo.source}:${importInfo.imported}`);
-                    } else {
-                        calls.add(name);
-                    }
-                }
-                else if (callee?.type === 'member_expression') {
-                    const method = callee.childForFieldName('property')?.text;
-                    const object = callee.childForFieldName('object');
-
-                    if (method && object) {
-                        const position = new vscode.Position(
-                            object.startPosition.row,
-                            object.startPosition.column
-                        );
-
-                        const type = await this.getTypeFromPosition(uri, position);
-                        if (type) {
-                            calls.add(`${type}.${method}`);
-                        } else {
-                            calls.add(`method:${method}`);
-                        }
-                    }
-                }
-            }
-
-            for (const child of node.children) {
-                await visit(child);
-            }
-        };
-
-        await visit(defnNode);
-        return calls;
-    }
-
-    private gotoDefn(name: string): Definition | null {
-        if (name.includes(':')) {
-            const [file, funcName] = name.split(':');
-            const def = this.definitions.get(funcName);
-            return def ?? null;
-        }
-
-        return this.definitions.get(name) ?? null;
-    }
-
-    private getUses(defnNode: Parser.SyntaxNode, currentFile: string): DefnUse[] {
-        const uses: DefnUse[] = [];
-
-        let fnName: string | undefined;
-        if (defnNode.type === 'function_declaration') {
-            fnName = defnNode.childForFieldName('name')?.text;
-        } else if (defnNode.type === 'arrow_function' || defnNode.type === 'function') {
-            const parent = defnNode.parent;
-            if (parent?.type === 'variable_declarator') {
-                fnName = parent.childForFieldName('name')?.text;
-            }
-        }
-
-        if (!fnName) return uses;
-
-        for (const [file, tree] of this.parsedFiles) {
-            const visit = (node: Parser.SyntaxNode): void => {
-                if (node.type === 'call_expression') {
-                    const callee = node.childForFieldName('function');
-                    if (callee?.type === 'identifier' && callee.text === fnName) {
-                        let current: Parser.SyntaxNode | null = node;
-                        while (current) {
-                            if (current.type === 'function_declaration' ||
-                                current.type === 'arrow_function' ||
-                                current.type === 'function') {
-                                uses.push({ parent: current, file });
-                                break;
-                            }
-                            current = current.parent;
-                        }
-                    }
-                }
-                node.children.forEach(visit);
-            };
-
-            visit(tree.rootNode);
-        }
-
-        return uses;
-    }
-
-    private async visitAllNodesInGraphFromDefinition(defn: Parser.SyntaxNode, currentFile: string): Promise<void> {
-        let defnName: string | undefined;
-        if (defn.type === 'function_declaration') {
-            defnName = defn.childForFieldName('name')?.text;
-        } else if (defn.type === 'arrow_function' || defn.type === 'function') {
-            const parent = defn.parent;
-            if (parent?.type === 'variable_declarator') {
-                defnName = parent.childForFieldName('name')?.text;
-            }
-        }
-
-        if (!defnName) return;
-
-        const fullName = `${currentFile}:${defnName}`;
-        if (this.visited.has(fullName)) return;
-
-        const calls = await this.getCallsInDefn(defn, currentFile);
-        this.graph.set(fullName, calls);
-        this.visited.add(fullName);
-
-        const callDefns = Array.from(calls).map(call => this.gotoDefn(call));
-        for (const callDefn of callDefns) {
-            if (callDefn) {
-                await this.visitAllNodesInGraphFromDefinition(callDefn.node, callDefn.file);
-            }
-        }
-
-        const defnUses = this.getUses(defn, currentFile);
-        for (const defnUse of defnUses) {
-            await this.visitAllNodesInGraphFromDefinition(defnUse.parent, defnUse.file);
-        }
-    }
-
-    async analyze(entryFile: string): Promise<Map<string, Set<string>>> {
-        const tree = await this.parseFile(entryFile);
-        if (!tree) return new Map();
-
-        const visit = async (node: Parser.SyntaxNode): Promise<void> => {
-            if (node.type === 'function_declaration') {
-                await this.visitAllNodesInGraphFromDefinition(node, entryFile);
-            }
-            else if (node.type === 'variable_declarator') {
-                const value = node.childForFieldName('value');
-                if (value?.type === 'arrow_function' || value?.type === 'function') {
-                    await this.visitAllNodesInGraphFromDefinition(value, entryFile);
-                }
-            }
-            for (const child of node.children) {
-                await visit(child);
-            }
-        };
-
-        await visit(tree.rootNode);
-        return this.graph;
-    }
-}
-
-export async function runTreeSitter(filePath?: string): Promise<Map<string, Set<string>> | null> {
-    const editor = vscode.window.activeTextEditor;
-    if (!editor && !filePath) {
-        vscode.window.showWarningMessage('No active editor found');
-        return null;
-    }
-
-    try {
-        const targetPath = filePath ?? editor!.document.uri.fsPath;
-        const analyzer = new ProjectAnalyzer();
-        const graph = await analyzer.analyze(targetPath);
-
-        for (const [defn, calls] of graph) {
-            console.log(`${defn} calls: ${[...calls].join(', ')}`);
-        }
-
-        return graph;
-    } catch (error) {
-        console.error('Error analyzing file:', error);
-        vscode.window.showErrorMessage('Error analyzing file');
-        return null;
-    }
-}

extensions/void/LangaugeServerTest/findFunctions.ts

@@ -1,62 +0,0 @@
-import * as vscode from 'vscode';
-
-const legend = new vscode.SemanticTokensLegend([], []);
-
-export async function findFunctions() {
-
-	const editor = vscode.window.activeTextEditor;
-	if (!editor) return;
-	const document = editor.document;
-
-	const tokens = await vscode.commands.executeCommand<vscode.SemanticTokens>(
-		'vscode.provideDocumentSemanticTokens',
-		document.uri
-	);
-
-	if (!tokens) {
-		console.error('No tokens found');
-		return [];
-	}
-
-	const allTokens = decodeTokens(tokens, document);
-
-
-	return allTokens;
-}
-
-function decodeTokens(tokens: vscode.SemanticTokens, document: vscode.TextDocument) {
-	const data = tokens.data;
-	const decodedTokens = [];
-	let line = 0;
-	let character = 0;
-
-	for (let i = 0; i < data.length; i += 5) {
-		const deltaLine = data[i];
-		const deltaStartChar = data[i + 1];
-		const length = data[i + 2];
-		const tokenTypeIdx = data[i + 3];
-		const tokenModifierIdx = data[i + 4];
-
-		line += deltaLine;
-		character = deltaLine === 0 ? character + deltaStartChar : deltaStartChar;
-
-		const type = legend.tokenTypes[tokenTypeIdx] || `(${tokenTypeIdx})`;
-		const modifier = legend.tokenModifiers[tokenModifierIdx] || `(${tokenModifierIdx})`;
-
-		const tokenRange = new vscode.Range(line, character, line, character + length);
-		const tokenText = document.getText(tokenRange);
-
-		decodedTokens.push({
-			line,
-			startCharacter: character,
-			length,
-			type,
-			modifier,
-			text: tokenText,
-		});
-
-		console.log(`Token: '${tokenText}' | Type: ${type} | Modifier: ${modifier} | Line: ${line}, Character: ${character}`);
-	}
-
-	return decodedTokens;
-}

package.json

@@ -1,14 +1,19 @@
 {
-  "name": "code-oss-dev",
+  "name": "void-dev",
+  "productName": "Void",
   "version": "1.94.0",
-  "distro": "ffcc24343ac46468a625666e5b9e673971dd1a1f",
+  "distro": "this is a commit number if we want to publish on npm",
+  "homepage": "https://voideditor.com",
   "author": {
-    "name": "Microsoft Corporation"
+    "name": "Glass Devtools, Inc.",
+    "email": "andrew@voideditor.com"
   },
   "license": "MIT",
   "main": "./out/main",
   "private": true,
   "scripts": {
+    "buildreact": "cd ./src/vs/workbench/contrib/void/browser/react/ && node build.js && cd ../../../../../../../",
+    "watchreact": "cd ./src/vs/workbench/contrib/void/browser/react/ && node build.js --watch && cd ../../../../../../../",
     "test": "echo Please run any of the test scripts from the scripts folder.",
     "test-browser": "npx playwright install && node test/unit/browser/index.js",
     "test-browser-amd": "npx playwright install && node test/unit/browser/index.amd.js",
@@ -72,6 +77,8 @@
     "update-build-ts-version": "npm install typescript@next && tsc -p ./build/tsconfig.build.json"
   },
   "dependencies": {
+    "@anthropic-ai/sdk": "^0.32.1",
+    "@google/generative-ai": "^0.21.0",
     "@microsoft/1ds-core-js": "^3.2.13",
     "@microsoft/1ds-post-js": "^3.2.13",
     "@parcel/watcher": "2.1.0",
@@ -99,6 +106,8 @@
     "@xterm/addon-webgl": "^0.19.0-beta.64",
     "@xterm/headless": "^5.6.0-beta.64",
     "@xterm/xterm": "^5.6.0-beta.64",
+    "ajv": "^8.17.1",
+    "diff": "^7.0.0",
     "groq-sdk": "^0.9.0",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
@@ -110,8 +119,13 @@
     "native-keymap": "^3.3.5",
     "native-watchdog": "^1.4.1",
     "node-pty": "1.1.0-beta21",
+    "ollama": "^0.5.11",
     "open": "^8.4.2",
+    "openai": "^4.76.1",
     "posthog-node": "^4.3.1",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-syntax-highlighter": "^15.6.1",
     "tas-client-umd": "0.2.0",
     "v8-inspect-profiler": "^0.1.1",
     "vscode-oniguruma": "1.7.0",
@@ -121,13 +135,12 @@
     "yazl": "^2.4.3"
   },
   "devDependencies": {
-    "@anthropic-ai/sdk": "^0.32.1",
-    "@google/generative-ai": "^0.21.0",
     "@playwright/test": "^1.46.1",
     "@swc/core": "1.3.62",
     "@types/cookie": "^0.3.3",
     "@types/debug": "^4.1.5",
     "@types/diff": "^6.0.0",
+    "@types/eslint": "^9.6.1",
     "@types/gulp-svgmin": "^1.2.1",
     "@types/http-proxy-agent": "^2.0.1",
     "@types/kerberos": "^1.1.2",
@@ -168,7 +181,6 @@
     "cssnano": "^6.0.3",
     "debounce": "^1.0.0",
     "deemon": "^1.8.0",
-    "diff": "^7.0.0",
     "electron": "30.5.1",
     "eslint": "8.36.0",
     "eslint-plugin-header": "3.1.1",
@@ -211,9 +223,9 @@
     "mocha": "^10.2.0",
     "mocha-junit-reporter": "^2.2.1",
     "mocha-multi-reporters": "^1.5.1",
+    "next": "^15.1.4",
+    "nodemon": "^3.1.9",
     "npm-run-all": "^4.1.5",
-    "ollama": "^0.5.9",
-    "openai": "^4.71.1",
     "opn": "^6.0.0",
     "original-fs": "^1.2.0",
     "os-browserify": "^0.3.0",
@@ -223,11 +235,8 @@
     "postcss-nesting": "^12.0.2",
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-syntax-highlighter": "^15.6.1",
     "rimraf": "^2.7.1",
-    "scope-tailwind": "^1.0.1",
+    "scope-tailwind": "^1.0.5",
     "sinon": "^12.0.1",
     "sinon-test": "^3.1.3",
     "source-map": "0.6.1",

product.json

@@ -1,84 +1,38 @@
 {
 	"nameShort": "Void",
 	"nameLong": "Void",
-	"applicationName": "code-oss",
-	"dataFolderName": ".vscode-oss",
-	"win32MutexName": "vscodeoss",
+	"applicationName": "void",
+	"dataFolderName": ".void-editor",
+	"win32MutexName": "voideditor",
 	"licenseName": "MIT",
-	"licenseUrl": "https://github.com/microsoft/vscode/blob/main/LICENSE.txt",
-	"serverLicenseUrl": "https://github.com/microsoft/vscode/blob/main/LICENSE.txt",
+	"licenseUrl": "https://github.com/voideditor/void/blob/main/LICENSE.txt",
+	"serverLicenseUrl": "https://github.com/voideditor/void/blob/main/LICENSE.txt",
 	"serverGreeting": [],
 	"serverLicense": [],
 	"serverLicensePrompt": "",
-	"serverApplicationName": "code-server-oss",
-	"serverDataFolderName": ".vscode-server-oss",
-	"tunnelApplicationName": "code-tunnel-oss",
-	"win32DirName": "Microsoft Code OSS",
-	"win32NameVersion": "Microsoft Code OSS",
-	"win32RegValueName": "CodeOSS",
-	"win32x64AppId": "{{D77B7E06-80BA-4137-BCF4-654B95CCEBC5}",
-	"win32arm64AppId": "{{D1ACE434-89C5-48D1-88D3-E2991DF85475}",
-	"win32x64UserAppId": "{{CC6B787D-37A0-49E8-AE24-8559A032BE0C}",
-	"win32arm64UserAppId": "{{3AEBF0C8-F733-4AD4-BADE-FDB816D53D7B}",
-	"win32AppUserModelId": "Microsoft.CodeOSS",
-	"win32ShellNameShort": "C&ode - OSS",
-	"win32TunnelServiceMutex": "vscodeoss-tunnelservice",
-	"win32TunnelMutex": "vscodeoss-tunnel",
-	"darwinBundleIdentifier": "com.visualstudio.code.oss",
-	"linuxIconName": "code-oss",
+	"serverApplicationName": "void-server",
+	"serverDataFolderName": ".void-server",
+	"tunnelApplicationName": "void-tunnel",
+	"win32DirName": "Void",
+	"win32NameVersion": "Void",
+	"win32RegValueName": "VoidEditor",
+	"win32x64AppId": "{{9D394D01-1728-45A7-B997-A6C82C5452C3}",
+	"win32arm64AppId": "{{0668DD58-2BDE-4101-8CDA-40252DF8875D}",
+	"win32x64UserAppId": "{{8BED5DC1-6C55-46E6-9FE6-18F7E6F7C7F1}",
+	"win32arm64UserAppId": "{{F6C87466-BC82-4A8F-B0FF-18CA366BA4D8}",
+	"win32AppUserModelId": "Void.Editor",
+	"win32ShellNameShort": "V&oid",
+	"win32TunnelServiceMutex": "void-tunnelservice",
+	"win32TunnelMutex": "void-tunnel",
+	"darwinBundleIdentifier": "com.voideditor.code",
+	"linuxIconName": "void-editor",
 	"licenseFileName": "LICENSE.txt",
-	"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
+	"reportIssueUrl": "https://github.com/voideditor/void/issues/new",
 	"nodejsRepository": "https://nodejs.org",
-	"urlProtocol": "code-oss",
-	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-cdn.net/insider/ef65ac1ba57f57f2a3961bfe94aa20481caca4c6/out/vs/workbench/contrib/webview/browser/pre/",
-	"builtInExtensions": [
-		{
-			"name": "ms-vscode.js-debug-companion",
-			"version": "1.1.3",
-			"sha256": "7380a890787452f14b2db7835dfa94de538caf358ebc263f9d46dd68ac52de93",
-			"repo": "https://github.com/microsoft/vscode-js-debug-companion",
-			"metadata": {
-				"id": "99cb0b7f-7354-4278-b8da-6cc79972169d",
-				"publisherId": {
-					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
-					"publisherName": "ms-vscode",
-					"displayName": "Microsoft",
-					"flags": "verified"
-				},
-				"publisherDisplayName": "Microsoft"
-			}
-		},
-		{
-			"name": "ms-vscode.js-debug",
-			"version": "1.93.0",
-			"sha256": "9339cb8e6b77f554df54d79e71f533279cb76b0f9b04c207f633bfd507442b6a",
-			"repo": "https://github.com/microsoft/vscode-js-debug",
-			"metadata": {
-				"id": "25629058-ddac-4e17-abba-74678e126c5d",
-				"publisherId": {
-					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
-					"publisherName": "ms-vscode",
-					"displayName": "Microsoft",
-					"flags": "verified"
-				},
-				"publisherDisplayName": "Microsoft"
-			}
-		},
-		{
-			"name": "ms-vscode.vscode-js-profile-table",
-			"version": "1.0.9",
-			"sha256": "3b62ee4276a2bbea3fe230f94b1d5edd915b05966090ea56f882e1e0ab53e1a6",
-			"repo": "https://github.com/microsoft/vscode-js-profile-visualizer",
-			"metadata": {
-				"id": "7e52b41b-71ad-457b-ab7e-0620f1fc4feb",
-				"publisherId": {
-					"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
-					"publisherName": "ms-vscode",
-					"displayName": "Microsoft",
-					"flags": "verified"
-				},
-				"publisherDisplayName": "Microsoft"
-			}
-		}
-	]
+	"urlProtocol": "void-editor",
+	"extensionsGallery": {
+		"serviceUrl": "https://open-vsx.org/vscode/gallery",
+		"itemUrl": "https://open-vsx.org/vscode/item"
+	},
+	"builtInExtensions": []
 }

resources/win32/VisualElementsManifest.xml

@@ -1,9 +1,9 @@
 <Application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 		<VisualElements
-				BackgroundColor="#2D2D30"
+				BackgroundColor="#FFFFFF"
 				ShowNameOnSquare150x150Logo="on"
 				Square150x150Logo="resources\app\resources\win32\code_150x150.png"
 				Square70x70Logo="resources\app\resources\win32\code_70x70.png"
-				ForegroundText="light" 
-				ShortDisplayName="Code - OSS" />
+				ForegroundText="light"
+				ShortDisplayName="Void" />
 </Application>

src/main.js

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

src/vs/base/browser/ui/inputbox/inputBox.ts

@@ -159,7 +159,7 @@ export class InputBox extends Widget {
 			this.scrollableElement = new ScrollableElement(this.element, { vertical: ScrollbarVisibility.Auto });
 
 			if (this.options.flexibleWidth) {
-				this.input.setAttribute('wrap', 'off');
+				this.input.setAttribute('wrap', 'on');
 				this.mirror.style.whiteSpace = 'pre';
 				this.mirror.style.wordWrap = 'initial';
 			}

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

@@ -124,7 +124,8 @@ import { ExtensionSignatureVerificationService, IExtensionSignatureVerificationS
 import { LLMMessageChannel } from '../../platform/void/electron-main/llmMessageChannel.js';
 import { IMetricsService } from '../../platform/void/common/metricsService.js';
 import { MetricsMainService } from '../../platform/void/electron-main/metricsMainService.js';
-
+import { VoidMainUpdateService } from '../../platform/void/electron-main/voidUpdateMainService.js';
+import { IVoidUpdateService } from '../../platform/void/common/voidUpdateService.js';
 /**
  * The main VS Code application. There will only ever be one instance,
  * even if the user starts many instances (e.g. from the command line).
@@ -1107,6 +1108,7 @@ export class CodeApplication extends Disposable {
 
 		// Void main process services (required for services with a channel for comm between browser and electron-main (node))
 		services.set(IMetricsService, new SyncDescriptor(MetricsMainService, undefined, false));
+		services.set(IVoidUpdateService, new SyncDescriptor(VoidMainUpdateService, undefined, false));
 
 		// Default Extensions Profile Init
 		services.set(IExtensionsProfileScannerService, new SyncDescriptor(ExtensionsProfileScannerService, undefined, true));
@@ -1242,12 +1244,15 @@ export class CodeApplication extends Disposable {
 		mainProcessElectronServer.registerChannel('logger', loggerChannel);
 		sharedProcessClient.then(client => client.registerChannel('logger', loggerChannel));
 
-		// Void
+		// Void - use loggerChannel as reference
 		const metricsChannel = ProxyChannel.fromService(accessor.get(IMetricsService), disposables);
 		mainProcessElectronServer.registerChannel('void-channel-metrics', metricsChannel);
 
-		const sendLLMMessageChannel = new LLMMessageChannel(accessor.get(IMetricsService));
-		mainProcessElectronServer.registerChannel('void-channel-sendLLMMessage', sendLLMMessageChannel);
+		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);
 
 		// Extension Host Debug Broadcasting
 		const electronExtensionHostDebugBroadcastChannel = new ElectronExtensionHostDebugBroadcastChannel(accessor.get(IWindowsMainService));

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

@@ -6,6 +6,11 @@ import { ICodeEditor, IViewZone } from '../../editorBrowser.js';
 import { IRange } from '../../../common/core/range.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 
+
+// THIS FILE IS OLD + UNUSED!!!
+
+// SEE inlineDiffsService.ts INSTEAD.
+
 export interface IInlineDiffService {
 	readonly _serviceBrand: undefined;
 	addDiff(editor: ICodeEditor, originalText: string, modifiedRange: IRange): void;

src/vs/editor/common/services/editorSimpleWorker.ts

@@ -223,6 +223,11 @@ export class BaseEditorSimpleWorker implements IDisposable, IWorkerTextModelSync
 	private static readonly _diffLimit = 100000;
 
 	public async $computeMoreMinimalEdits(modelUrl: string, edits: TextEdit[], pretty: boolean): Promise<TextEdit[]> {
+		return this.$Void_computeMoreMinimalEdits(modelUrl, edits, pretty)
+	}
+
+	// Void added this as non async
+	public $Void_computeMoreMinimalEdits(modelUrl: string, edits: TextEdit[], pretty: boolean): TextEdit[] {
 		const model = this._getModel(modelUrl);
 		if (!model) {
 			return edits;

src/vs/editor/contrib/lineSelection/browser/lineSelection.ts

@@ -22,7 +22,7 @@ export class ExpandLineSelectionAction extends EditorAction {
 			kbOpts: {
 				weight: KeybindingWeight.EditorCore,
 				kbExpr: EditorContextKeys.textInputFocus,
-				primary: KeyMod.CtrlCmd | KeyCode.KeyL
+				primary: KeyMod.CtrlCmd | KeyCode.KeyM // Void changed this to Cmd+M
 			},
 		});
 	}

src/vs/platform/extensions/common/extensionValidator.ts

@@ -403,6 +403,7 @@ function isVersionValid(currentVersion: string, date: ProductDate, requestedVers
 	}
 
 	if (!isValidVersion(currentVersion, date, desiredVersion)) {
+		// Void - ignore not compatible
 		notices.push(nls.localize('versionMismatch', "Extension is not compatible with Code {0}. Extension requires: {1}.", currentVersion, requestedVersion));
 		return false;
 	}

src/vs/platform/keybinding/common/keybindingsRegistry.ts

@@ -64,7 +64,8 @@ export const enum KeybindingWeight {
 	EditorContrib = 100,
 	WorkbenchContrib = 200,
 	BuiltinExtension = 300,
-	ExternalExtension = 400
+	ExternalExtension = 400,
+	VoidExtension = 605, // Void -  must trump any external extension
 }
 
 export interface ICommandAndKeybindingRule extends IKeybindingRule {

src/vs/platform/telemetry/common/serverTelemetryService.ts

@@ -31,25 +31,29 @@ export class ServerTelemetryService extends TelemetryService implements IServerT
 	}
 
 	override publicLog(eventName: string, data?: ITelemetryData) {
-		if (this._injectedTelemetryLevel < TelemetryLevel.USAGE) {
-			return;
-		}
-		return super.publicLog(eventName, data);
+		// Void commented this out
+		// if (this._injectedTelemetryLevel < TelemetryLevel.USAGE) {
+		// 	return;
+		// }
+		// return super.publicLog(eventName, data);
 	}
 
 	override publicLog2<E extends ClassifiedEvent<OmitMetadata<T>> = never, T extends IGDPRProperty = never>(eventName: string, data?: StrictPropertyCheck<T, E>) {
-		return this.publicLog(eventName, data as ITelemetryData | undefined);
+		// Void commented this out
+		// return this.publicLog(eventName, data as ITelemetryData | undefined);
 	}
 
 	override publicLogError(errorEventName: string, data?: ITelemetryData) {
-		if (this._injectedTelemetryLevel < TelemetryLevel.ERROR) {
-			return Promise.resolve(undefined);
-		}
-		return super.publicLogError(errorEventName, data);
+		// Void commented this out
+		// if (this._injectedTelemetryLevel < TelemetryLevel.ERROR) {
+		// 	return Promise.resolve(undefined);
+		// }
+		// return super.publicLogError(errorEventName, data);
 	}
 
 	override publicLogError2<E extends ClassifiedEvent<OmitMetadata<T>> = never, T extends IGDPRProperty = never>(eventName: string, data?: StrictPropertyCheck<T, E>) {
-		return this.publicLogError(eventName, data as ITelemetryData | undefined);
+		// Void commented this out
+		// return this.publicLogError(eventName, data as ITelemetryData | undefined);
 	}
 
 	async updateInjectedTelemetryLevel(telemetryLevel: TelemetryLevel): Promise<void> {

src/vs/platform/telemetry/common/telemetryService.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { DisposableStore } from '../../../base/common/lifecycle.js';
-import { mixin } from '../../../base/common/objects.js';
+// import { mixin } from '../../../base/common/objects.js';
 import { isWeb } from '../../../base/common/platform.js';
 import { escapeRegExpCharacters } from '../../../base/common/strings.js';
 import { localize } from '../../../nls.js';
@@ -15,7 +15,8 @@ import { IProductService } from '../../product/common/productService.js';
 import { Registry } from '../../registry/common/platform.js';
 import { ClassifiedEvent, IGDPRProperty, OmitMetadata, StrictPropertyCheck } from './gdprTypings.js';
 import { ITelemetryData, ITelemetryService, TelemetryConfiguration, TelemetryLevel, TELEMETRY_CRASH_REPORTER_SETTING_ID, TELEMETRY_OLD_SETTING_ID, TELEMETRY_SECTION_ID, TELEMETRY_SETTING_ID, ICommonProperties } from './telemetry.js';
-import { cleanData, getTelemetryLevel, ITelemetryAppender } from './telemetryUtils.js';
+import { getTelemetryLevel, ITelemetryAppender } from './telemetryUtils.js';
+// import { cleanData } from './telemetryUtils.js';
 
 export interface ITelemetryServiceConfig {
 	appenders: ITelemetryAppender[];
@@ -38,7 +39,7 @@ export class TelemetryService implements ITelemetryService {
 	readonly firstSessionDate: string;
 	readonly msftInternal: boolean | undefined;
 
-	private _appenders: ITelemetryAppender[];
+	// private _appenders: ITelemetryAppender[];
 	private _commonProperties: ICommonProperties;
 	private _experimentProperties: { [name: string]: string } = {};
 	private _piiPaths: string[];
@@ -53,7 +54,7 @@ export class TelemetryService implements ITelemetryService {
 		@IConfigurationService private _configurationService: IConfigurationService,
 		@IProductService private _productService: IProductService
 	) {
-		this._appenders = config.appenders;
+		// this._appenders = config.appenders;
 		this._commonProperties = config.commonProperties ?? Object.create(null);
 
 		this.sessionId = this._commonProperties['sessionID'] as string;
@@ -121,44 +122,47 @@ export class TelemetryService implements ITelemetryService {
 		this._disposables.dispose();
 	}
 
-	private _log(eventName: string, eventLevel: TelemetryLevel, data?: ITelemetryData) {
-		// don't send events when the user is optout
-		if (this._telemetryLevel < eventLevel) {
-			return;
-		}
+	// Void commented this out
+	// private _log(eventName: string, eventLevel: TelemetryLevel, data?: ITelemetryData) {
+	// 	// don't send events when the user is optout
+	// 	if (this._telemetryLevel < eventLevel) {
+	// 		return;
+	// 	}
 
-		// add experiment properties
-		data = mixin(data, this._experimentProperties);
+	// 	// add experiment properties
+	// 	data = mixin(data, this._experimentProperties);
 
-		// remove all PII from data
-		data = cleanData(data as Record<string, any>, this._cleanupPatterns);
+	// 	// remove all PII from data
+	// 	data = cleanData(data as Record<string, any>, this._cleanupPatterns);
 
-		// add common properties
-		data = mixin(data, this._commonProperties);
+	// 	// add common properties
+	// 	data = mixin(data, this._commonProperties);
 
-		// Log to the appenders of sufficient level
-		this._appenders.forEach(a => a.log(eventName, data));
-	}
+	// 	// Log to the appenders of sufficient level
+	// 	this._appenders.forEach(a => a.log(eventName, data));
+	// }
 
 	publicLog(eventName: string, data?: ITelemetryData) {
-		this._log(eventName, TelemetryLevel.USAGE, data);
+		// this._log(eventName, TelemetryLevel.USAGE, data);
 	}
 
 	publicLog2<E extends ClassifiedEvent<OmitMetadata<T>> = never, T extends IGDPRProperty = never>(eventName: string, data?: StrictPropertyCheck<T, E>) {
-		this.publicLog(eventName, data as ITelemetryData);
+		// this.publicLog(eventName, data as ITelemetryData);
 	}
 
 	publicLogError(errorEventName: string, data?: ITelemetryData) {
-		if (!this._sendErrorTelemetry) {
-			return;
-		}
+		// Void commented this out
+		// if (!this._sendErrorTelemetry) {
+		// 	return;
+		// }
 
-		// Send error event and anonymize paths
-		this._log(errorEventName, TelemetryLevel.ERROR, data);
+		// // Send error event and anonymize paths
+		// this._log(errorEventName, TelemetryLevel.ERROR, data);
 	}
 
 	publicLogError2<E extends ClassifiedEvent<OmitMetadata<T>> = never, T extends IGDPRProperty = never>(eventName: string, data?: StrictPropertyCheck<T, E>) {
-		this.publicLogError(eventName, data as ITelemetryData);
+		// Void commented this out
+		// this.publicLogError(eventName, data as ITelemetryData);
 	}
 }
 

src/vs/platform/update/electron-main/abstractUpdateService.ts

@@ -3,11 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { timeout } from '../../../base/common/async.js';
+// import { timeout } from '../../../base/common/async.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { Emitter, Event } from '../../../base/common/event.js';
 import { IConfigurationService } from '../../configuration/common/configuration.js';
 import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+// import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
 import { ILifecycleMainService, LifecycleMainPhase } from '../../lifecycle/electron-main/lifecycleMainService.js';
 import { ILogService } from '../../log/common/log.js';
 import { IProductService } from '../../product/common/productService.js';
@@ -15,7 +16,10 @@ import { IRequestService } from '../../request/common/request.js';
 import { AvailableForDownload, DisablementReason, IUpdateService, State, StateType, UpdateType } from '../common/update.js';
 
 export function createUpdateURL(platform: string, quality: string, productService: IProductService): string {
-	return `${productService.updateUrl}/api/update/${platform}/${quality}/${productService.commit}`;
+	// return `https://voideditor.dev/api/update/${platform}/stable`;
+	// return `${productService.updateUrl}/api/update/${platform}/${quality}/${productService.commit}`;
+	// https://github.com/VSCodium/update-api
+	return `https://updates.voideditor.dev/api/update/${platform}/${quality}/${productService.commit}`;
 }
 
 export type UpdateNotAvailableClassification = {
@@ -57,7 +61,7 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		@IEnvironmentMainService private readonly environmentMainService: IEnvironmentMainService,
 		@IRequestService protected requestService: IRequestService,
 		@ILogService protected logService: ILogService,
-		@IProductService protected readonly productService: IProductService
+		@IProductService protected readonly productService: IProductService,
 	) {
 		lifecycleMainService.when(LifecycleMainPhase.AfterWindowOpen)
 			.finally(() => this.initialize());
@@ -70,75 +74,35 @@ export abstract class AbstractUpdateService implements IUpdateService {
 	 */
 	protected async initialize(): Promise<void> {
 		if (!this.environmentMainService.isBuilt) {
+			console.log('is NOT built, canceling update service')
 			this.setState(State.Disabled(DisablementReason.NotBuilt));
 			return; // updates are never enabled when running out of sources
 		}
+		console.log('is built, continuing with update service')
 
-		if (this.environmentMainService.disableUpdates) {
-			this.setState(State.Disabled(DisablementReason.DisabledByEnvironment));
-			this.logService.info('update#ctor - updates are disabled by the environment');
-			return;
-		}
-
-		if (!this.productService.updateUrl || !this.productService.commit) {
-			this.setState(State.Disabled(DisablementReason.MissingConfiguration));
-			this.logService.info('update#ctor - updates are disabled as there is no update URL');
-			return;
-		}
-
-		const updateMode = this.configurationService.getValue<'none' | 'manual' | 'start' | 'default'>('update.mode');
-		const quality = this.getProductQuality(updateMode);
-
-		if (!quality) {
-			this.setState(State.Disabled(DisablementReason.ManuallyDisabled));
-			this.logService.info('update#ctor - updates are disabled by user preference');
-			return;
-		}
-
-		this.url = this.buildUpdateFeedUrl(quality);
+		this.url = this.doBuildUpdateFeedUrl('stable');
 		if (!this.url) {
 			this.setState(State.Disabled(DisablementReason.InvalidConfiguration));
 			this.logService.info('update#ctor - updates are disabled as the update URL is badly formed');
 			return;
 		}
 
-		// hidden setting
-		if (this.configurationService.getValue<boolean>('_update.prss')) {
-			const url = new URL(this.url);
-			url.searchParams.set('prss', 'true');
-			this.url = url.toString();
-		}
+		this.setState(State.Disabled(DisablementReason.ManuallyDisabled));
 
-		this.setState(State.Idle(this.getUpdateType()));
 
-		if (updateMode === 'manual') {
-			this.logService.info('update#ctor - manual checks only; automatic updates are disabled by user preference');
-			return;
-		}
+		// Void - temporarily disabled while we figure out how to do this the right way
 
-		if (updateMode === 'start') {
-			this.logService.info('update#ctor - startup checks only; automatic updates are disabled by user preference');
+		// this.setState(State.Idle(this.getUpdateType()));
 
-			// Check for updates only once after 30 seconds
-			setTimeout(() => this.checkForUpdates(false), 30 * 1000);
-		} else {
-			// Start checking for updates after 30 seconds
-			this.scheduleCheckForUpdates(30 * 1000).then(undefined, err => this.logService.error(err));
-		}
+		// start checking for updates after 10 seconds
+		// this.scheduleCheckForUpdates(10 * 1000).then(undefined, err => this.logService.error(err));
 	}
 
-	private getProductQuality(updateMode: string): string | undefined {
-		return updateMode === 'none' ? undefined : this.productService.quality;
-	}
-
-	private scheduleCheckForUpdates(delay = 60 * 60 * 1000): Promise<void> {
-		return timeout(delay)
-			.then(() => this.checkForUpdates(false))
-			.then(() => {
-				// Check again after 1 hour
-				return this.scheduleCheckForUpdates(60 * 60 * 1000);
-			});
-	}
+	// private async scheduleCheckForUpdates(delay = 60 * 60 * 1000): Promise<void> {
+	// 	await timeout(delay);
+	// 	await this.checkForUpdates(false);
+	// 	return await this.scheduleCheckForUpdates(60 * 60 * 1000);
+	// }
 
 	async checkForUpdates(explicit: boolean): Promise<void> {
 		this.logService.trace('update#checkForUpdates, state = ', this.state.type);
@@ -160,6 +124,7 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		await this.doDownloadUpdate(this.state);
 	}
 
+	// override implemented by windows and linux
 	protected async doDownloadUpdate(state: AvailableForDownload): Promise<void> {
 		// noop
 	}
@@ -174,6 +139,7 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		await this.doApplyUpdate();
 	}
 
+	// windows overrides this
 	protected async doApplyUpdate(): Promise<void> {
 		// noop
 	}
@@ -236,6 +202,6 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		// noop
 	}
 
-	protected abstract buildUpdateFeedUrl(quality: string): string | undefined;
+	protected abstract doBuildUpdateFeedUrl(quality: string): string | undefined;
 	protected abstract doCheckForUpdates(context: any): void;
 }

src/vs/platform/update/electron-main/updateService.darwin.ts

@@ -34,7 +34,7 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
 		@IEnvironmentMainService environmentMainService: IEnvironmentMainService,
 		@IRequestService requestService: IRequestService,
 		@ILogService logService: ILogService,
-		@IProductService productService: IProductService
+		@IProductService productService: IProductService,
 	) {
 		super(lifecycleMainService, configurationService, environmentMainService, requestService, logService, productService);
 
@@ -73,7 +73,7 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
 		this.setState(State.Idle(UpdateType.Archive, message));
 	}
 
-	protected buildUpdateFeedUrl(quality: string): string | undefined {
+	protected doBuildUpdateFeedUrl(quality: string): string | undefined {
 		let assetID: string;
 		if (!this.productService.darwinUniversalAssetId) {
 			assetID = process.arch === 'x64' ? 'darwin' : 'darwin-arm64';

src/vs/platform/update/electron-main/updateService.linux.ts

@@ -30,7 +30,7 @@ export class LinuxUpdateService extends AbstractUpdateService {
 		super(lifecycleMainService, configurationService, environmentMainService, requestService, logService, productService);
 	}
 
-	protected buildUpdateFeedUrl(quality: string): string {
+	protected doBuildUpdateFeedUrl(quality: string): string {
 		return createUpdateURL(`linux-${process.arch}`, quality, this.productService);
 	}
 

src/vs/platform/update/electron-main/updateService.win32.ts

@@ -67,7 +67,7 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 		@ILogService logService: ILogService,
 		@IFileService private readonly fileService: IFileService,
 		@INativeHostMainService private readonly nativeHostMainService: INativeHostMainService,
-		@IProductService productService: IProductService
+		@IProductService productService: IProductService,
 	) {
 		super(lifecycleMainService, configurationService, environmentMainService, requestService, logService, productService);
 
@@ -99,7 +99,7 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 		await super.initialize();
 	}
 
-	protected buildUpdateFeedUrl(quality: string): string | undefined {
+	protected doBuildUpdateFeedUrl(quality: string): string | undefined {
 		let platform = `win32-${process.arch}`;
 
 		if (getUpdateType() === UpdateType.Archive) {

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

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

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

@@ -1,32 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPLv3 License.
- *--------------------------------------------------------------------------------------------*/
-
-import { IChannel } from '../../../base/parts/ipc/common/ipc.js';
-import { IMainProcessService } from '../../ipc/common/mainProcessService.js';
-import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
-import { IMetricsService } from '../common/metricsService.js';
-
-// BROWSER IMPLEMENTATION, calls channel
-
-export class MetricsService implements IMetricsService {
-
-	readonly _serviceBrand: undefined;
-	private readonly channel: IChannel;
-
-	constructor(
-		@IMainProcessService mainProcessService: IMainProcessService // (only usable on client side)
-	) {
-		this.channel = mainProcessService.getChannel('void-channel-metrics')
-	}
-
-	// call capture on the channel
-	capture(...params: Parameters<IMetricsService['capture']>) {
-		this.channel.call('capture', params);
-	}
-
-}
-
-registerSingleton(IMetricsService, MetricsService, InstantiationType.Eager);
-

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

@@ -0,0 +1,21 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+// ---------- common ----------
+
+// llmMessage
+import '../common/llmMessageService.js'
+
+// voidSettings
+import '../common/voidSettingsService.js'
+
+// refreshModel
+import '../common/refreshModelService.js'
+
+// metrics
+import '../common/metricsService.js'
+
+// updates
+import '../common/voidUpdateService.js'

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

@@ -1,210 +0,0 @@
-
-const configEnum = <EnumArr extends readonly string[]>(description: string, defaultVal: EnumArr[number], enumArr: EnumArr) => {
-	return {
-		description,
-		defaultVal,
-		enumArr,
-	}
-}
-
-const configString = (description: string, defaultVal: string) => {
-	return {
-		description,
-		defaultVal,
-		enumArr: undefined,
-	}
-}
-
-
-// fields you can customize (don't forget 'default' - it isn't included here!)
-export const nonDefaultConfigFields = [
-	'anthropic',
-	'openAI',
-	'gemini',
-	'greptile',
-	'groq',
-	'ollama',
-	'openRouter',
-	'openAICompatible',
-	'azure',
-] as const
-
-
-
-export const voidConfigInfo: Record<
-	typeof nonDefaultConfigFields[number] | 'default', {
-		[prop: string]: {
-			description: string;
-			enumArr?: readonly string[] | undefined;
-			defaultVal: string;
-		};
-	}
-> = {
-	default: {
-		whichApi: configEnum(
-			'API Provider.',
-			'anthropic',
-			nonDefaultConfigFields,
-		),
-
-		maxTokens: configEnum(
-			'Max number of tokens to output.',
-			'1024',
-			[
-				'default', // this will be parseInt'd into NaN and ignored by the API. Anything that's not a number has this behavior.
-				'1024',
-				'2048',
-				'4096',
-				'8192'
-			] as const,
-		),
-
-	},
-	anthropic: {
-		apikey: configString('Anthropic API key.', ''),
-		model: configEnum(
-			'Anthropic model to use.',
-			'claude-3-5-sonnet-20240620',
-			[
-				'claude-3-5-sonnet-20240620',
-				'claude-3-opus-20240229',
-				'claude-3-sonnet-20240229',
-				'claude-3-haiku-20240307'
-			] as const,
-		),
-	},
-	openAI: {
-		apikey: configString('OpenAI API key.', ''),
-		model: configEnum(
-			'OpenAI model to use.',
-			'gpt-4o',
-			[
-				'o1-preview',
-				'o1-mini',
-				'gpt-4o',
-				'gpt-4o-2024-05-13',
-				'gpt-4o-2024-08-06',
-				'gpt-4o-mini',
-				'gpt-4o-mini-2024-07-18',
-				'gpt-4-turbo',
-				'gpt-4-turbo-2024-04-09',
-				'gpt-4-turbo-preview',
-				'gpt-4-0125-preview',
-				'gpt-4-1106-preview',
-				'gpt-4',
-				'gpt-4-0613',
-				'gpt-3.5-turbo-0125',
-				'gpt-3.5-turbo',
-				'gpt-3.5-turbo-1106'
-			] as const
-		),
-	},
-	greptile: {
-		apikey: configString('Greptile API key.', ''),
-		githubPAT: configString('Github PAT that Greptile uses to access your repository', ''),
-		remote: configEnum(
-			'Repo location',
-			'github',
-			[
-				'github',
-				'gitlab'
-			] as const
-		),
-		repository: configString('Repository identifier in "owner / repository" format.', ''),
-		branch: configString('Name of the branch to use.', 'main'),
-	},
-	groq: {
-		apikey: configString('Groq API key.', ''),
-		model: configEnum(
-			'Groq model to use.',
-			'mixtral-8x7b-32768',
-			[
-				"mixtral-8x7b-32768",
-				"llama2-70b-4096",
-				"gemma-7b-it"
-			] as const
-		),
-	},
-	ollama: {
-		endpoint: configString(
-			'The endpoint of your Ollama instance. Start Ollama by running `OLLAMA_ORIGINS="vscode - webview://*" ollama serve`.',
-			'http://127.0.0.1:11434'
-		),
-		model: configEnum(
-			'Ollama model to use.',
-			'codestral',
-			['codestral', 'qwen2.5-coder', 'qwen2.5-coder:0.5b', 'qwen2.5-coder:1.5b', 'qwen2.5-coder:3b', 'qwen2.5-coder:7b', 'qwen2.5-coder:14b', 'qwen2.5-coder:32b', 'codegemma', 'codegemma:2b', 'codegemma:7b', 'codellama', 'codellama:7b', 'codellama:13b', 'codellama:34b', 'codellama:70b', 'codellama:code', 'codellama:python', 'command-r', 'command-r:35b', 'command-r-plus', 'command-r-plus:104b', 'deepseek-coder-v2', 'deepseek-coder-v2:16b', 'deepseek-coder-v2:236b', 'falcon2', 'falcon2:11b', 'firefunction-v2', 'firefunction-v2:70b', 'gemma', 'gemma:2b', 'gemma:7b', 'gemma2', 'gemma2:2b', 'gemma2:9b', 'gemma2:27b', 'llama2', 'llama2:7b', 'llama2:13b', 'llama2:70b', 'llama3', 'llama3:8b', 'llama3:70b', 'llama3-chatqa', 'llama3-chatqa:8b', 'llama3-chatqa:70b', 'llama3-gradient', 'llama3-gradient:8b', 'llama3-gradient:70b', 'llama3.1', 'llama3.1:8b', 'llama3.1:70b', 'llama3.1:405b', 'llava', 'llava:7b', 'llava:13b', 'llava:34b', 'llava-llama3', 'llava-llama3:8b', 'llava-phi3', 'llava-phi3:3.8b', 'mistral', 'mistral:7b', 'mistral-large', 'mistral-large:123b', 'mistral-nemo', 'mistral-nemo:12b', 'mixtral', 'mixtral:8x7b', 'mixtral:8x22b', 'moondream', 'moondream:1.8b', 'openhermes', 'openhermes:v2.5', 'phi3', 'phi3:3.8b', 'phi3:14b', 'phi3.5', 'phi3.5:3.8b', 'qwen', 'qwen:7b', 'qwen:14b', 'qwen:32b', 'qwen:72b', 'qwen:110b', 'qwen2', 'qwen2:0.5b', 'qwen2:1.5b', 'qwen2:7b', 'qwen2:72b', 'smollm', 'smollm:135m', 'smollm:360m', 'smollm:1.7b'] as const
-		),
-	},
-	openRouter: {
-		model: configString(
-			'OpenRouter model to use.',
-			'openai/gpt-4o'
-		),
-		apikey: configString('OpenRouter API key.', ''),
-	},
-	openAICompatible: {
-		endpoint: configString('The baseUrl (exluding /chat/completions).', 'http://127.0.0.1:11434/v1'),
-		model: configString('The name of the model to use.', 'gpt-4o'),
-		apikey: configString('Your API key.', ''),
-	},
-	azure: {
-		// 'void.azure.apiKey': {
-		// 	'type': 'string',
-		// 	'description': 'Azure API key.'
-		// },
-		// 'void.azure.deploymentId': {
-		// 	'type': 'string',
-		// 	'description': 'Azure API deployment ID.'
-		// },
-		// 'void.azure.resourceName': {
-		// 	'type': 'string',
-		// 	'description': 'Name of the Azure OpenAI resource. Either this or `baseURL` can be used. \nThe resource name is used in the assembled URL: `https://{resourceName}.openai.azure.com/openai/deployments/{modelId}{path}`'
-		// },
-		// 'void.azure.providerSettings': {
-		// 	'type': 'object',
-		// 	'properties': {
-		// 		'baseURL': {
-		// 			'type': 'string',
-		// 			'default': 'https://${resourceName}.openai.azure.com/openai/deployments',
-		// 			'description': 'Azure API base URL.'
-		// 		},
-		// 		'headers': {
-		// 			'type': 'object',
-		// 			'description': 'Custom headers to include in the requests.'
-		// 		}
-		// 	}
-		// },
-	},
-	gemini: {
-		apikey: configString('Google API key.', ''),
-		model: configEnum(
-			'Gemini model to use.',
-			'gemini-1.5-flash',
-			[
-				'gemini-1.5-flash',
-				'gemini-1.5-pro',
-				'gemini-1.5-flash-8b',
-				'gemini-1.0-pro'
-			] as const
-		),
-	},
-}
-
-
-// this is the type that comes with metadata like desc, default val, etc
-export type VoidConfigInfo = typeof voidConfigInfo
-export type VoidConfigField = keyof typeof voidConfigInfo // typeof configFields[number]
-
-// this is the type that specifies the user's actual config
-export type PartialVoidConfig = {
-	[K in keyof typeof voidConfigInfo]?: {
-		[P in keyof typeof voidConfigInfo[K]]?: typeof voidConfigInfo[K][P]['defaultVal']
-	}
-}
-
-export type VoidConfig = {
-	[K in keyof typeof voidConfigInfo]: {
-		[P in keyof typeof voidConfigInfo[K]]: typeof voidConfigInfo[K][P]['defaultVal']
-	}
-}

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

@@ -0,0 +1,179 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+import { EventLLMMessageOnTextParams, EventLLMMessageOnErrorParams, EventLLMMessageOnFinalMessageParams, ServiceSendLLMMessageParams, MainLLMMessageParams, MainLLMMessageAbortParams, ServiceModelListParams, EventModelListOnSuccessParams, EventModelListOnErrorParams, MainModelListParams, OllamaModelResponse, OpenaiCompatibleModelResponse, } from './llmMessageTypes.js';
+import { IChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { IMainProcessService } from '../../ipc/common/mainProcessService.js';
+import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { Event } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+import { IVoidSettingsService } from './voidSettingsService.js';
+// import { INotificationService } from '../../notification/common/notification.js';
+
+// calls channel to implement features
+export const ILLMMessageService = createDecorator<ILLMMessageService>('llmMessageService');
+
+export interface ILLMMessageService {
+	readonly _serviceBrand: undefined;
+	sendLLMMessage: (params: ServiceSendLLMMessageParams) => string | null;
+	abort: (requestId: string) => void;
+	ollamaList: (params: ServiceModelListParams<OllamaModelResponse>) => void;
+	openAICompatibleList: (params: ServiceModelListParams<OpenaiCompatibleModelResponse>) => void;
+}
+
+export class LLMMessageService extends Disposable implements ILLMMessageService {
+
+	readonly _serviceBrand: undefined;
+	private readonly channel: IChannel // LLMMessageChannel
+
+	// llmMessage
+	private readonly onTextHooks_llm: { [eventId: string]: ((params: EventLLMMessageOnTextParams) => void) } = {}
+	private readonly onFinalMessageHooks_llm: { [eventId: string]: ((params: EventLLMMessageOnFinalMessageParams) => void) } = {}
+	private readonly onErrorHooks_llm: { [eventId: string]: ((params: EventLLMMessageOnErrorParams) => void) } = {}
+
+
+	// ollamaList
+	private readonly onSuccess_ollama: { [eventId: string]: ((params: EventModelListOnSuccessParams<OllamaModelResponse>) => void) } = {}
+	private readonly onError_ollama: { [eventId: string]: ((params: EventModelListOnErrorParams<OllamaModelResponse>) => void) } = {}
+
+	// openAICompatibleList
+	private readonly onSuccess_openAICompatible: { [eventId: string]: ((params: EventModelListOnSuccessParams<OpenaiCompatibleModelResponse>) => void) } = {}
+	private readonly onError_openAICompatible: { [eventId: string]: ((params: EventModelListOnErrorParams<OpenaiCompatibleModelResponse>) => void) } = {}
+
+	constructor(
+		@IMainProcessService private readonly mainProcessService: IMainProcessService, // used as a renderer (only usable on client side)
+		@IVoidSettingsService private readonly voidSettingsService: IVoidSettingsService,
+		// @INotificationService private readonly notificationService: INotificationService,
+	) {
+		super()
+
+		// 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')
+
+		// .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_llm') satisfies Event<EventLLMMessageOnTextParams>)(e => {
+			this.onTextHooks_llm[e.requestId]?.(e)
+		}))
+		this._register((this.channel.listen('onFinalMessage_llm') satisfies Event<EventLLMMessageOnFinalMessageParams>)(e => {
+			this.onFinalMessageHooks_llm[e.requestId]?.(e)
+			this._onRequestIdDone(e.requestId)
+		}))
+		this._register((this.channel.listen('onError_llm') satisfies Event<EventLLMMessageOnErrorParams>)(e => {
+			console.error('Error in LLMMessageService:', JSON.stringify(e))
+			this.onErrorHooks_llm[e.requestId]?.(e)
+			this._onRequestIdDone(e.requestId)
+		}))
+		// ollama .list()
+		this._register((this.channel.listen('onSuccess_ollama') satisfies Event<EventModelListOnSuccessParams<OllamaModelResponse>>)(e => {
+			this.onSuccess_ollama[e.requestId]?.(e)
+		}))
+		this._register((this.channel.listen('onError_ollama') satisfies Event<EventModelListOnErrorParams<OllamaModelResponse>>)(e => {
+			this.onError_ollama[e.requestId]?.(e)
+		}))
+		// openaiCompatible .list()
+		this._register((this.channel.listen('onSuccess_openAICompatible') satisfies Event<EventModelListOnSuccessParams<OpenaiCompatibleModelResponse>>)(e => {
+			this.onSuccess_openAICompatible[e.requestId]?.(e)
+		}))
+		this._register((this.channel.listen('onError_openAICompatible') satisfies Event<EventModelListOnErrorParams<OpenaiCompatibleModelResponse>>)(e => {
+			this.onError_openAICompatible[e.requestId]?.(e)
+		}))
+
+	}
+
+	sendLLMMessage(params: ServiceSendLLMMessageParams) {
+		const { onText, onFinalMessage, onError, ...proxyParams } = params;
+		const { useProviderFor: featureName } = proxyParams
+
+		// end early if no provider
+		const modelSelection = this.voidSettingsService.state.modelSelectionOfFeature[featureName]
+		if (modelSelection === null) {
+			onError({ message: 'Please add a Provider in Settings!', fullError: null })
+			return null
+		}
+		const { providerName, modelName } = modelSelection
+
+		const aiInstructions = this.voidSettingsService.state.globalSettings.aiInstructions
+		if (aiInstructions)
+			proxyParams.messages.unshift({ role: 'system', content: aiInstructions })
+
+		// add state for request id
+		const requestId_ = generateUuid();
+		this.onTextHooks_llm[requestId_] = onText
+		this.onFinalMessageHooks_llm[requestId_] = onFinalMessage
+		this.onErrorHooks_llm[requestId_] = onError
+
+		const { settingsOfProvider } = this.voidSettingsService.state
+
+		// params will be stripped of all its functions over the IPC channel
+		this.channel.call('sendLLMMessage', {
+			...proxyParams,
+			requestId: requestId_,
+			providerName,
+			modelName,
+			settingsOfProvider,
+		} satisfies MainLLMMessageParams);
+
+		return requestId_
+	}
+
+
+	abort(requestId: string) {
+		this.channel.call('abort', { requestId } satisfies MainLLMMessageAbortParams);
+		this._onRequestIdDone(requestId)
+	}
+
+
+	ollamaList = (params: ServiceModelListParams<OllamaModelResponse>) => {
+		const { onSuccess, onError, ...proxyParams } = params
+
+		const { settingsOfProvider } = this.voidSettingsService.state
+
+		// add state for request id
+		const requestId_ = generateUuid();
+		this.onSuccess_ollama[requestId_] = onSuccess
+		this.onError_ollama[requestId_] = onError
+
+		this.channel.call('ollamaList', {
+			...proxyParams,
+			settingsOfProvider,
+			requestId: requestId_,
+		} satisfies MainModelListParams<OllamaModelResponse>)
+	}
+
+	openAICompatibleList = (params: ServiceModelListParams<OpenaiCompatibleModelResponse>) => {
+		const { onSuccess, onError, ...proxyParams } = params
+
+		const { settingsOfProvider } = this.voidSettingsService.state
+
+		// add state for request id
+		const requestId_ = generateUuid();
+		this.onSuccess_openAICompatible[requestId_] = onSuccess
+		this.onError_openAICompatible[requestId_] = onError
+
+		this.channel.call('openAICompatibleList', {
+			...proxyParams,
+			settingsOfProvider,
+			requestId: requestId_,
+		} satisfies MainModelListParams<OpenaiCompatibleModelResponse>)
+	}
+
+
+
+	_onRequestIdDone(requestId: string) {
+		delete this.onTextHooks_llm[requestId]
+		delete this.onFinalMessageHooks_llm[requestId]
+		delete this.onErrorHooks_llm[requestId]
+
+		delete this.onSuccess_ollama[requestId]
+		delete this.onError_ollama[requestId]
+	}
+}
+
+registerSingleton(ILLMMessageService, LLMMessageService, InstantiationType.Eager);
+

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

@@ -1,19 +1,28 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPLv3 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
 
-import { VoidConfig } from './configTypes.js'
+import { IRange } from '../../../editor/common/core/range'
+import { ProviderName, SettingsOfProvider } from './voidSettingsTypes.js'
 
 
-// ---------- type definitions ----------
+export const errorDetails = (fullError: Error | null): string | null => {
+	if (fullError === null) {
+		return null
+	}
+	else if (typeof fullError === 'object') {
+		return JSON.stringify(fullError, null, 2)
+	}
+	else if (typeof fullError === 'string') {
+		return null
+	}
+	return null
+}
 
 export type OnText = (p: { newText: string, fullText: string }) => void
-
 export type OnFinalMessage = (p: { fullText: string }) => void
-
-export type OnError = (p: { error: Error | string }) => void
-
+export type OnError = (p: { message: string, fullError: Error | null }) => void
 export type AbortRef = { current: (() => void) | null }
 
 export type LLMMessage = {
@@ -21,39 +30,133 @@ export type LLMMessage = {
 	content: string;
 }
 
-export type LLMMessageServiceParams = {
-	onText: OnText;
-	onFinalMessage: OnFinalMessage;
-	onError: OnError;
-
-	messages: LLMMessage[];
-	voidConfig: VoidConfig | null;
-
-	logging: {
-		loggingName: string,
-	};
+export type ServiceSendLLMFeatureParams = {
+	useProviderFor: 'Ctrl+K';
+	range: IRange;
+} | {
+	useProviderFor: 'Ctrl+L';
+} | {
+	useProviderFor: 'Autocomplete';
+	range: IRange;
 }
 
-export type SendLLMMMessageParams = {
+// params to the true sendLLMMessage function
+export type LLMMMessageParams = {
 	onText: OnText;
 	onFinalMessage: OnFinalMessage;
 	onError: OnError;
-
-	messages: LLMMessage[];
-	voidConfig: VoidConfig | null;
-
-	logging: {
-		loggingName: string,
-	};
 	abortRef: AbortRef;
+
+	messages: LLMMessage[];
+
+	logging: {
+		loggingName: string,
+	};
+	providerName: ProviderName;
+	modelName: string;
+	settingsOfProvider: SettingsOfProvider;
 }
 
+export type ServiceSendLLMMessageParams = {
+	onText: OnText;
+	onFinalMessage: OnFinalMessage;
+	onError: OnError;
+
+	messages: LLMMessage[];
+
+	logging: {
+		loggingName: string,
+	};
+} & ServiceSendLLMFeatureParams
+
 // can't send functions across a proxy, use listeners instead
-export const listenerNames = ['onText', 'onFinalMessage', 'onError'] as const
-export type ProxyLLMMessageParams = Omit<LLMMessageServiceParams, typeof listenerNames[number]> & { requestId: string }
+export type BlockedMainLLMMessageParams = 'onText' | 'onFinalMessage' | 'onError' | 'abortRef'
 
-export type ProxyOnTextPayload = Parameters<OnText>[0] & { requestId: string }
-export type ProxyOnFinalMessagePayload = Parameters<OnFinalMessage>[0] & { requestId: string }
-export type ProxyOnErrorPayload = Parameters<OnError>[0] & { requestId: string }
+export type MainLLMMessageParams = Omit<LLMMMessageParams, BlockedMainLLMMessageParams> & { requestId: string }
+export type MainLLMMessageAbortParams = { requestId: string }
 
-export type ProxyLLMMessageAbortParams = { requestId: string }
+export type EventLLMMessageOnTextParams = Parameters<OnText>[0] & { requestId: string }
+export type EventLLMMessageOnFinalMessageParams = Parameters<OnFinalMessage>[0] & { requestId: string }
+export type EventLLMMessageOnErrorParams = Parameters<OnError>[0] & { requestId: string }
+
+export type _InternalSendLLMMessageFnType = (params: {
+	messages: LLMMessage[];
+	onText: OnText;
+	onFinalMessage: OnFinalMessage;
+	onError: OnError;
+	settingsOfProvider: SettingsOfProvider;
+	providerName: ProviderName;
+	modelName: string;
+
+	_setAborter: (aborter: () => void) => void;
+}) => void
+
+// service -> main -> internal -> event (back to main)
+// (browser)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// These are from 'ollama' SDK
+interface OllamaModelDetails {
+	parent_model: string;
+	format: string;
+	family: string;
+	families: string[];
+	parameter_size: string;
+	quantization_level: string;
+}
+
+export type OllamaModelResponse = {
+	name: string;
+	modified_at: Date;
+	size: number;
+	digest: string;
+	details: OllamaModelDetails;
+	expires_at: Date;
+	size_vram: number;
+}
+
+export type OpenaiCompatibleModelResponse = {
+	id: string;
+	created: number;
+	object: 'model';
+	owned_by: string;
+}
+
+
+// params to the true list fn
+export type ModelListParams<modelResponse> = {
+	settingsOfProvider: SettingsOfProvider;
+	onSuccess: (param: { models: modelResponse[] }) => void;
+	onError: (param: { error: string }) => void;
+}
+
+// params to the service
+export type ServiceModelListParams<modelResponse> = {
+	onSuccess: (param: { models: modelResponse[] }) => void;
+	onError: (param: { error: any }) => void;
+}
+
+type BlockedMainModelListParams = 'onSuccess' | 'onError'
+export type MainModelListParams<modelResponse> = Omit<ModelListParams<modelResponse>, BlockedMainModelListParams> & { requestId: string }
+
+export type EventModelListOnSuccessParams<modelResponse> = Parameters<ModelListParams<modelResponse>['onSuccess']>[0] & { requestId: string }
+export type EventModelListOnErrorParams<modelResponse> = Parameters<ModelListParams<modelResponse>['onError']>[0] & { requestId: string }
+
+
+
+
+export type _InternalModelListFnType<modelResponse> = (params: ModelListParams<modelResponse>) => void

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

@@ -1,10 +1,68 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
 import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ProxyChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { IMainProcessService } from '../../ipc/common/mainProcessService.js';
+import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
+import { Action2, registerAction2 } from '../../actions/common/actions.js';
+import { localize2 } from '../../../nls.js';
+import { ServicesAccessor } from '../../../editor/browser/editorExtensions.js';
+import { INotificationService } from '../../notification/common/notification.js';
 
 export interface IMetricsService {
 	readonly _serviceBrand: undefined;
 	capture(event: string, params: Record<string, any>): void;
+	getDebuggingProperties(): Promise<object>;
 }
 
 export const IMetricsService = createDecorator<IMetricsService>('metricsService');
 
 
+// implemented by calling channel
+export class MetricsService implements IMetricsService {
+
+	readonly _serviceBrand: undefined;
+	private readonly metricsService: IMetricsService;
+
+	constructor(
+		@IMainProcessService mainProcessService: IMainProcessService // (only usable on client side)
+	) {
+		// creates an IPC proxy to use metricsMainService.ts
+		this.metricsService = ProxyChannel.toService<IMetricsService>(mainProcessService.getChannel('void-channel-metrics'));
+	}
+
+	// call capture on the channel
+	capture(...params: Parameters<IMetricsService['capture']>) {
+		this.metricsService.capture(...params);
+	}
+
+	// anything transmitted over a channel must be async even if it looks like it doesn't have to be
+	async getDebuggingProperties(): Promise<object> {
+		return this.metricsService.getDebuggingProperties()
+	}
+}
+
+registerSingleton(IMetricsService, MetricsService, InstantiationType.Eager);
+
+
+// debugging action
+registerAction2(class extends Action2 {
+	constructor() {
+		super({
+			id: 'voidDebugInfo',
+			f1: true,
+			title: localize2('voidMetricsDebug', 'Void: Log Debug Info'),
+		});
+	}
+	async run(accessor: ServicesAccessor): Promise<void> {
+		const metricsService = accessor.get(IMetricsService)
+		const notifService = accessor.get(INotificationService)
+
+		const debugProperties = await metricsService.getDebuggingProperties()
+		console.log('Metrics:', debugProperties)
+		notifService.info(`Void Debug info:\n${JSON.stringify(debugProperties, null, 2)}`)
+	}
+})

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

@@ -0,0 +1,218 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
+import { IVoidSettingsService } from './voidSettingsService.js';
+import { ILLMMessageService } from './llmMessageService.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, OpenaiCompatibleModelResponse } from './llmMessageTypes.js';
+
+
+
+
+type RefreshableState = ({
+	state: 'init',
+	timeoutId: null,
+} | {
+	state: 'refreshing',
+	timeoutId: NodeJS.Timeout | null, // the timeoutId of the most recent call to refreshModels
+} | {
+	state: 'finished',
+	timeoutId: null,
+} | {
+	state: 'error',
+	timeoutId: null,
+})
+
+
+/*
+
+user click -> error -> fire(error)
+		   \> success -> fire(success)
+	finally: keep polling
+
+poll -> do not fire
+
+*/
+export type RefreshModelStateOfProvider = Record<RefreshableProviderName, RefreshableState>
+
+
+
+const refreshBasedOn: { [k in RefreshableProviderName]: (keyof SettingsOfProvider[k])[] } = {
+	ollama: ['_enabled', 'endpoint'],
+	// openAICompatible: ['_enabled', 'endpoint', 'apiKey'],
+}
+const REFRESH_INTERVAL = 5_000
+// const COOLDOWN_TIMEOUT = 300
+
+const autoOptions = { enableProviderOnSuccess: true, doNotFire: true }
+
+// element-wise equals
+function eq<T>(a: T[], b: T[]): boolean {
+	if (a.length !== b.length) return false
+	for (let i = 0; i < a.length; i++) {
+		if (a[i] !== b[i]) return false
+	}
+	return true
+}
+export interface IRefreshModelService {
+	readonly _serviceBrand: undefined;
+	startRefreshingModels: (providerName: RefreshableProviderName, options: { enableProviderOnSuccess: boolean, doNotFire: boolean }) => void;
+	onDidChangeState: Event<RefreshableProviderName>;
+	state: RefreshModelStateOfProvider;
+}
+
+export const IRefreshModelService = createDecorator<IRefreshModelService>('RefreshModelService');
+
+export class RefreshModelService extends Disposable implements IRefreshModelService {
+
+	readonly _serviceBrand: undefined;
+
+	private readonly _onDidChangeState = new Emitter<RefreshableProviderName>();
+	readonly onDidChangeState: Event<RefreshableProviderName> = this._onDidChangeState.event; // this is primarily for use in react, so react can listen + update on state changes
+
+
+	constructor(
+		@IVoidSettingsService private readonly voidSettingsService: IVoidSettingsService,
+		@ILLMMessageService private readonly llmMessageService: ILLMMessageService,
+	) {
+		super()
+
+
+		const disposables: Set<IDisposable> = new Set()
+
+		const initializeAutoPollingAndOnChange = () => {
+			this._clearAllTimeouts()
+			disposables.forEach(d => d.dispose())
+			disposables.clear()
+
+			if (!voidSettingsService.state.globalSettings.autoRefreshModels) return
+
+			for (const providerName of refreshableProviderNames) {
+
+				// const { _enabled: enabled } = this.voidSettingsService.state.settingsOfProvider[providerName]
+				this.startRefreshingModels(providerName, autoOptions)
+
+				// every time providerName.enabled changes, refresh models too, like a useEffect
+				let relevantVals = () => refreshBasedOn[providerName].map(settingName => voidSettingsService.state.settingsOfProvider[providerName][settingName])
+				let prevVals = relevantVals() // each iteration of a for loop has its own context and vars, so this is ok
+				disposables.add(
+					voidSettingsService.onDidChangeState(() => { // we might want to debounce this
+						const newVals = relevantVals()
+						if (!eq(prevVals, newVals)) {
+
+							const prevEnabled = prevVals[0] as boolean
+							const enabled = newVals[0] as boolean
+
+							// if it was just enabled, or there was a change and it wasn't to the enabled state, refresh
+							if ((enabled && !prevEnabled) || (!enabled && !prevEnabled)) {
+								// if user just clicked enable, refresh
+								this.startRefreshingModels(providerName, autoOptions)
+							}
+							else {
+								// else if user just clicked disable, don't refresh
+
+								// //give cooldown before re-enabling (or at least re-fetching)
+								// const timeoutId = setTimeout(() => this.refreshModels(providerName, !enabled), COOLDOWN_TIMEOUT)
+								// this._setTimeoutId(providerName, timeoutId)
+							}
+							prevVals = newVals
+						}
+					})
+				)
+			}
+		}
+
+		// on mount (when get init settings state), and if a relevant feature flag changes, start refreshing models
+		voidSettingsService.waitForInitState.then(() => {
+			initializeAutoPollingAndOnChange()
+			this._register(
+				voidSettingsService.onDidChangeState((type) => { if (typeof type === 'object' && type[1] === 'autoRefreshModels') initializeAutoPollingAndOnChange() })
+			)
+		})
+
+	}
+
+	state: RefreshModelStateOfProvider = {
+		ollama: { state: 'init', timeoutId: null },
+	}
+
+
+	// start listening for models (and don't stop until success)
+	startRefreshingModels: IRefreshModelService['startRefreshingModels'] = (providerName, options) => {
+
+		this._clearProviderTimeout(providerName)
+
+		this._setRefreshState(providerName, 'refreshing', options)
+
+		const autoPoll = () => {
+			if (this.voidSettingsService.state.globalSettings.autoRefreshModels) {
+				// resume auto-polling
+				const timeoutId = setTimeout(() => this.startRefreshingModels(providerName, autoOptions), REFRESH_INTERVAL)
+				this._setTimeoutId(providerName, timeoutId)
+			}
+		}
+		const listFn = providerName === 'ollama' ? this.llmMessageService.ollamaList
+			: providerName === 'openAICompatible' ? this.llmMessageService.openAICompatibleList
+				: () => { }
+
+		listFn({
+			onSuccess: ({ models }) => {
+
+				// set the models to the detected models
+				this.voidSettingsService.setAutodetectedModels(
+					providerName,
+					models.map(model => {
+						if (providerName === 'ollama') return (model as OllamaModelResponse).name;
+						else if (providerName === 'openAICompatible') return (model as OpenaiCompatibleModelResponse).id;
+						else throw new Error('refreshMode fn: unknown provider', providerName);
+					}),
+					{ enableProviderOnSuccess: options.enableProviderOnSuccess, hideRefresh: options.doNotFire }
+				)
+
+				if (options.enableProviderOnSuccess) this.voidSettingsService.setSettingOfProvider(providerName, '_enabled', true)
+
+				this._setRefreshState(providerName, 'finished', options)
+				autoPoll()
+			},
+			onError: ({ error }) => {
+				this._setRefreshState(providerName, 'error', options)
+				autoPoll()
+			}
+		})
+
+
+	}
+
+	_clearAllTimeouts() {
+		for (const providerName of refreshableProviderNames) {
+			this._clearProviderTimeout(providerName)
+		}
+	}
+
+	_clearProviderTimeout(providerName: RefreshableProviderName) {
+		// cancel any existing poll
+		if (this.state[providerName].timeoutId) {
+			clearTimeout(this.state[providerName].timeoutId)
+			this._setTimeoutId(providerName, null)
+		}
+	}
+
+	private _setTimeoutId(providerName: RefreshableProviderName, timeoutId: NodeJS.Timeout | null) {
+		this.state[providerName].timeoutId = timeoutId
+	}
+
+	private _setRefreshState(providerName: RefreshableProviderName, state: RefreshableState['state'], options?: { doNotFire: boolean }) {
+		if (options?.doNotFire) return
+		this.state[providerName].state = state
+		this._onDidChangeState.fire(providerName)
+	}
+}
+
+registerSingleton(IRefreshModelService, RefreshModelService, InstantiationType.Eager);
+

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

@@ -0,0 +1,297 @@
+/*--------------------------------------------------------------------------------------
+ *  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 { deepClone } from '../../../base/common/objects.js';
+import { IEncryptionService } from '../../encryption/common/encryptionService.js';
+import { registerSingleton, InstantiationType } from '../../instantiation/common/extensions.js';
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { IStorageService, StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { IMetricsService } from './metricsService.js';
+import { defaultSettingsOfProvider, FeatureName, ProviderName, ModelSelectionOfFeature, SettingsOfProvider, SettingName, providerNames, ModelSelection, modelSelectionsEqual, featureNames, modelInfoOfDefaultNames, VoidModelInfo, GlobalSettings, GlobalSettingName, defaultGlobalSettings } from './voidSettingsTypes.js';
+
+
+const STORAGE_KEY = 'void.settingsServiceStorage'
+
+type SetSettingOfProviderFn = <S extends SettingName>(
+	providerName: ProviderName,
+	settingName: S,
+	newVal: SettingsOfProvider[ProviderName][S extends keyof SettingsOfProvider[ProviderName] ? S : never],
+) => Promise<void>;
+
+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 }
+
+
+
+export type VoidSettingsState = {
+	readonly settingsOfProvider: SettingsOfProvider; // optionsOfProvider
+	readonly modelSelectionOfFeature: ModelSelectionOfFeature; // stateOfFeature
+	readonly globalSettings: GlobalSettings;
+
+	readonly _modelOptions: ModelOption[] // computed based on the two above items
+}
+
+type RealVoidSettings = Exclude<keyof VoidSettingsState, '_modelOptions'>
+type EventProp<T extends RealVoidSettings = RealVoidSettings> = T extends 'globalSettings' ? [T, keyof VoidSettingsState[T]] : T | 'all'
+
+
+export interface IVoidSettingsService {
+	readonly _serviceBrand: undefined;
+	readonly state: VoidSettingsState; // in order to play nicely with react, you should immutably change state
+	readonly waitForInitState: Promise<void>;
+
+	onDidChangeState: Event<EventProp>;
+
+	setSettingOfProvider: SetSettingOfProviderFn;
+	setModelSelectionOfFeature: SetModelSelectionOfFeatureFn;
+	setGlobalSetting: SetGlobalSettingFn;
+
+	setAutodetectedModels(providerName: ProviderName, modelNames: string[], logging: object): void;
+	toggleModelHidden(providerName: ProviderName, modelName: string): void;
+	addModel(providerName: ProviderName, modelName: string): void;
+	deleteModel(providerName: ProviderName, modelName: string): boolean;
+}
+
+
+let _computeModelOptions = (settingsOfProvider: SettingsOfProvider) => {
+	let modelOptions: ModelOption[] = []
+	for (const providerName of providerNames) {
+		const providerConfig = settingsOfProvider[providerName]
+		if (!providerConfig._enabled) continue // if disabled, don't display model options
+		for (const { modelName, isHidden } of providerConfig.models) {
+			if (isHidden) continue
+			modelOptions.push({ name: `${modelName} (${providerName})`, selection: { providerName, modelName } })
+		}
+	}
+	return modelOptions
+}
+
+
+const defaultState = () => {
+	const d: VoidSettingsState = {
+		settingsOfProvider: deepClone(defaultSettingsOfProvider),
+		modelSelectionOfFeature: { 'Ctrl+L': null, 'Ctrl+K': null, 'Autocomplete': null },
+		globalSettings: deepClone(defaultGlobalSettings),
+		_modelOptions: _computeModelOptions(defaultSettingsOfProvider), // computed
+	}
+	return d
+}
+
+
+export const IVoidSettingsService = createDecorator<IVoidSettingsService>('VoidSettingsService');
+class VoidSettingsService extends Disposable implements IVoidSettingsService {
+	_serviceBrand: undefined;
+
+	private readonly _onDidChangeState = new Emitter<EventProp>();
+	readonly onDidChangeState: Event<EventProp> = this._onDidChangeState.event; // this is primarily for use in react, so react can listen + update on state changes
+
+	state: VoidSettingsState;
+	waitForInitState: Promise<void> // await this if you need a valid state initially
+
+	constructor(
+		@IStorageService private readonly _storageService: IStorageService,
+		@IEncryptionService private readonly _encryptionService: IEncryptionService,
+		@IMetricsService private readonly _metricsService: IMetricsService,
+		// could have used this, but it's clearer the way it is (+ slightly different eg StorageTarget.USER)
+		// @ISecretStorageService private readonly _secretStorageService: ISecretStorageService,
+	) {
+		super()
+
+		// at the start, we haven't read the partial config yet, but we need to set state to something
+		this.state = defaultState()
+
+		let resolver: () => void = () => { }
+		this.waitForInitState = new Promise((res, rej) => resolver = res)
+
+		// read and update the actual state immediately
+		this._readState().then(s => {
+			this.state = s
+			resolver()
+			this._onDidChangeState.fire('all')
+		})
+	}
+
+	private async _readState(): Promise<VoidSettingsState> {
+		const encryptedState = this._storageService.get(STORAGE_KEY, StorageScope.APPLICATION)
+
+		if (!encryptedState)
+			return defaultState()
+
+		const stateStr = await this._encryptionService.decrypt(encryptedState)
+		return JSON.parse(stateStr)
+	}
+
+
+	private async _storeState() {
+		const state = this.state
+		const encryptedState = await this._encryptionService.encrypt(JSON.stringify(state))
+		this._storageService.store(STORAGE_KEY, encryptedState, StorageScope.APPLICATION, StorageTarget.USER);
+	}
+
+	setSettingOfProvider: SetSettingOfProviderFn = async (providerName, settingName, newVal) => {
+
+		const newModelSelectionOfFeature = this.state.modelSelectionOfFeature
+
+		const newSettingsOfProvider = {
+			...this.state.settingsOfProvider,
+			[providerName]: {
+				...this.state.settingsOfProvider[providerName],
+				[settingName]: newVal,
+			}
+		}
+
+		const newGlobalSettings = this.state.globalSettings
+
+		// if changed models or enabled a provider, recompute models list
+		const modelsListChanged = settingName === 'models' || settingName === '_enabled'
+		const newModelsList = modelsListChanged ? _computeModelOptions(newSettingsOfProvider) : this.state._modelOptions
+
+		const newState: VoidSettingsState = {
+			modelSelectionOfFeature: newModelSelectionOfFeature,
+			settingsOfProvider: newSettingsOfProvider,
+			globalSettings: newGlobalSettings,
+			_modelOptions: newModelsList,
+		}
+
+		// this must go above this.setanythingelse()
+		this.state = newState
+
+		// if the user-selected model is no longer in the list, update the selection for each feature that needs it to something relevant (the 0th model available, or null)
+		if (modelsListChanged) {
+			for (const featureName of featureNames) {
+
+				const currentSelection = newModelSelectionOfFeature[featureName]
+				const selnIdx = currentSelection === null ? -1 : newModelsList.findIndex(m => modelSelectionsEqual(m.selection, currentSelection))
+
+				if (selnIdx === -1) {
+					if (newModelsList.length !== 0)
+						this.setModelSelectionOfFeature(featureName, newModelsList[0].selection, { doNotApplyEffects: true })
+					else
+						this.setModelSelectionOfFeature(featureName, null, { doNotApplyEffects: true })
+				}
+			}
+		}
+
+		await this._storeState()
+		this._onDidChangeState.fire('settingsOfProvider')
+	}
+
+
+	setGlobalSetting: SetGlobalSettingFn = async (settingName, newVal) => {
+		const newState: VoidSettingsState = {
+			...this.state,
+			globalSettings: {
+				...this.state.globalSettings,
+				[settingName]: newVal
+			}
+		}
+		this.state = newState
+		await this._storeState()
+		this._onDidChangeState.fire(['globalSettings', settingName])
+
+	}
+
+
+	setModelSelectionOfFeature: SetModelSelectionOfFeatureFn = async (featureName, newVal, options) => {
+		const newState: VoidSettingsState = {
+			...this.state,
+			modelSelectionOfFeature: {
+				...this.state.modelSelectionOfFeature,
+				[featureName]: newVal
+			}
+		}
+
+		this.state = newState
+
+		if (options?.doNotApplyEffects)
+			return
+
+		await this._storeState()
+		this._onDidChangeState.fire('modelSelectionOfFeature')
+	}
+
+
+
+	setAutodetectedModels(providerName: ProviderName, newDefaultModelNames: string[], logging: object) {
+
+		const { models } = this.state.settingsOfProvider[providerName]
+
+		const old_names = models.map(m => m.modelName)
+
+		const newDefaultModels = modelInfoOfDefaultNames(newDefaultModelNames, { isAutodetected: true, existingModels: models })
+		const newModels = [
+			...newDefaultModels,
+			...models.filter(m => !m.isDefault), // keep any non-default models
+		]
+
+
+		this.setSettingOfProvider(providerName, 'models', newModels)
+
+		// if the models changed, log it
+		const new_names = newModels.map(m => m.modelName)
+		if (!(old_names.length === new_names.length
+			&& old_names.every((_, i) => old_names[i] === new_names[i])
+		)) {
+			this._metricsService.capture('Autodetect Models', { providerName, newModels, ...logging })
+		}
+	}
+	toggleModelHidden(providerName: ProviderName, modelName: string) {
+
+
+		const { models } = this.state.settingsOfProvider[providerName]
+		const modelIdx = models.findIndex(m => m.modelName === modelName)
+		if (modelIdx === -1) return
+		const newIsHidden = !models[modelIdx].isHidden
+		const newModels: VoidModelInfo[] = [
+			...models.slice(0, modelIdx),
+			{ ...models[modelIdx], isHidden: newIsHidden },
+			...models.slice(modelIdx + 1, Infinity)
+		]
+		this.setSettingOfProvider(providerName, 'models', newModels)
+
+		this._metricsService.capture('Toggle Model Hidden', { providerName, modelName, newIsHidden })
+
+	}
+	addModel(providerName: ProviderName, modelName: string) {
+		const { models } = this.state.settingsOfProvider[providerName]
+		const existingIdx = models.findIndex(m => m.modelName === modelName)
+		if (existingIdx !== -1) return // if exists, do nothing
+		const newModels = [
+			...models,
+			{ modelName, isDefault: false, isHidden: false }
+		]
+		this.setSettingOfProvider(providerName, 'models', newModels)
+
+		this._metricsService.capture('Add Model', { providerName, modelName })
+
+	}
+	deleteModel(providerName: ProviderName, modelName: string): boolean {
+		const { models } = this.state.settingsOfProvider[providerName]
+		const delIdx = models.findIndex(m => m.modelName === modelName)
+		if (delIdx === -1) return false
+		const newModels = [
+			...models.slice(0, delIdx), // delete the idx
+			...models.slice(delIdx + 1, Infinity)
+		]
+		this.setSettingOfProvider(providerName, 'models', newModels)
+
+		this._metricsService.capture('Delete Model', { providerName, modelName })
+
+		return true
+	}
+
+}
+
+
+registerSingleton(IVoidSettingsService, VoidSettingsService, InstantiationType.Eager);

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

@@ -0,0 +1,412 @@
+
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+
+
+
+export type VoidModelInfo = {
+	modelName: string,
+	isDefault: boolean, // whether or not it's a default for its provider
+	isHidden: boolean, // whether or not the user is hiding it
+	isAutodetected?: boolean, // whether the model was autodetected by polling
+}
+
+// creates `modelInfo` from `modelNames`
+export const modelInfoOfDefaultNames = (modelNames: string[], options?: { isAutodetected: true, existingModels: VoidModelInfo[] }): VoidModelInfo[] => {
+
+	const { isAutodetected, existingModels } = options ?? {}
+
+	if (!existingModels) { // default settings
+
+		return modelNames.map((modelName, i) => ({
+			modelName,
+			isDefault: true,
+			isAutodetected: isAutodetected,
+			isHidden: modelNames.length >= 10 // hide all models if there are a ton of them, and make user enable them individually
+		}))
+
+	} else { // settings if there are existing models (keep existing `isHidden` property)
+
+		const existingModelsMap: Record<string, VoidModelInfo> = {}
+		for (const existingModel of existingModels) {
+			existingModelsMap[existingModel.modelName] = existingModel
+		}
+
+		return modelNames.map((modelName, i) => ({
+			modelName,
+			isDefault: true,
+			isAutodetected: isAutodetected,
+			isHidden: !!existingModelsMap[modelName]?.isHidden,
+		}))
+
+	}
+
+}
+
+// https://docs.anthropic.com/en/docs/about-claude/models
+export const defaultAnthropicModels = modelInfoOfDefaultNames([
+	'claude-3-5-sonnet-20241022',
+	'claude-3-5-haiku-20241022',
+	'claude-3-opus-20240229',
+	'claude-3-sonnet-20240229',
+	// 'claude-3-haiku-20240307',
+])
+
+
+// https://platform.openai.com/docs/models/gp
+export const defaultOpenAIModels = modelInfoOfDefaultNames([
+	'o1-preview',
+	'o1-mini',
+	'gpt-4o',
+	'gpt-4o-mini',
+	// 'gpt-4o-2024-05-13',
+	// 'gpt-4o-2024-08-06',
+	// 'gpt-4o-mini-2024-07-18',
+	// 'gpt-4-turbo',
+	// 'gpt-4-turbo-2024-04-09',
+	// 'gpt-4-turbo-preview',
+	// 'gpt-4-0125-preview',
+	// 'gpt-4-1106-preview',
+	// 'gpt-4',
+	// 'gpt-4-0613',
+	// 'gpt-3.5-turbo-0125',
+	// 'gpt-3.5-turbo',
+	// 'gpt-3.5-turbo-1106',
+])
+
+
+
+// https://console.groq.com/docs/models
+export const defaultGroqModels = modelInfoOfDefaultNames([
+	"mixtral-8x7b-32768",
+	"llama2-70b-4096",
+	"gemma-7b-it"
+])
+
+
+export const defaultGeminiModels = modelInfoOfDefaultNames([
+	'gemini-1.5-flash',
+	'gemini-1.5-pro',
+	'gemini-1.5-flash-8b',
+	'gemini-1.0-pro'
+])
+
+
+
+// export const parseMaxTokensStr = (maxTokensStr: string) => {
+// 	// parse the string but only if the full string is a valid number, eg parseInt('100abc') should return NaN
+// 	const int = isNaN(Number(maxTokensStr)) ? undefined : parseInt(maxTokensStr)
+// 	if (Number.isNaN(int))
+// 		return undefined
+// 	return int
+// }
+
+
+
+
+export const anthropicMaxPossibleTokens = (modelName: string) => {
+	if (modelName === 'claude-3-5-sonnet-20241022'
+		|| modelName === 'claude-3-5-haiku-20241022')
+		return 8192
+	if (modelName === 'claude-3-opus-20240229'
+		|| modelName === 'claude-3-sonnet-20240229'
+		|| modelName === 'claude-3-haiku-20240307')
+		return 4096
+	return 1024 // return a reasonably small number if they're using a different model
+}
+
+
+type UnionOfKeys<T> = T extends T ? keyof T : never;
+
+
+
+export const defaultProviderSettings = {
+	anthropic: {
+		apiKey: '',
+	},
+	openAI: {
+		apiKey: '',
+	},
+	ollama: {
+		endpoint: 'http://127.0.0.1:11434',
+	},
+	openRouter: {
+		apiKey: '',
+	},
+	openAICompatible: {
+		endpoint: '',
+		apiKey: '',
+	},
+	gemini: {
+		apiKey: '',
+	},
+	groq: {
+		apiKey: ''
+	}
+} as const
+
+export type ProviderName = keyof typeof defaultProviderSettings
+export const providerNames = Object.keys(defaultProviderSettings) as ProviderName[]
+
+export const localProviderNames = ['ollama'] satisfies ProviderName[] // all local names
+export const nonlocalProviderNames = providerNames.filter((name) => !(localProviderNames as string[]).includes(name)) // all non-local names
+
+type CustomSettingName = UnionOfKeys<typeof defaultProviderSettings[ProviderName]>
+type CustomProviderSettings<providerName extends ProviderName> = {
+	[k in CustomSettingName]: k extends keyof typeof defaultProviderSettings[providerName] ? string : undefined
+}
+export const customSettingNamesOfProvider = (providerName: ProviderName) => {
+	return Object.keys(defaultProviderSettings[providerName]) as CustomSettingName[]
+}
+
+
+type CommonProviderSettings = {
+	_enabled: boolean | undefined, // undefined initially, computed when user types in all fields
+	models: VoidModelInfo[],
+}
+
+export type SettingsForProvider<providerName extends ProviderName> = CustomProviderSettings<providerName> & CommonProviderSettings
+
+// part of state
+export type SettingsOfProvider = {
+	[providerName in ProviderName]: SettingsForProvider<providerName>
+}
+
+
+export type SettingName = keyof SettingsForProvider<ProviderName>
+
+
+
+
+
+type DisplayInfoForProviderName = {
+	title: string,
+	desc?: string,
+}
+
+export const displayInfoOfProviderName = (providerName: ProviderName): DisplayInfoForProviderName => {
+	if (providerName === 'anthropic') {
+		return {
+			title: 'Anthropic',
+		}
+	}
+	else if (providerName === 'openAI') {
+		return {
+			title: 'OpenAI',
+		}
+	}
+	else if (providerName === 'openRouter') {
+		return {
+			title: 'OpenRouter',
+		}
+	}
+	else if (providerName === 'ollama') {
+		return {
+			title: 'Ollama',
+
+		}
+	}
+	else if (providerName === 'openAICompatible') {
+		return {
+			title: 'OpenAI-Compatible',
+		}
+	}
+	else if (providerName === 'gemini') {
+		return {
+			title: 'Gemini',
+		}
+	}
+	else if (providerName === 'groq') {
+		return {
+			title: 'Groq',
+		}
+	}
+
+	throw new Error(`descOfProviderName: Unknown provider name: "${providerName}"`)
+}
+
+type DisplayInfo = {
+	title: string,
+	placeholder: string,
+	subTextMd?: string,
+}
+export const displayInfoOfSettingName = (providerName: ProviderName, settingName: SettingName): DisplayInfo => {
+	if (settingName === 'apiKey') {
+		return {
+			title: 'API Key',
+			placeholder: providerName === 'anthropic' ? 'sk-ant-key...' : // sk-ant-api03-key
+				providerName === 'openAI' ? 'sk-proj-key...' :
+					providerName === 'openRouter' ? 'sk-or-key...' : // sk-or-v1-key
+						providerName === 'gemini' ? 'key...' :
+							providerName === 'groq' ? 'gsk_key...' :
+								providerName === 'openAICompatible' ? 'sk-key...' :
+									'(never)',
+
+			subTextMd: providerName === 'anthropic' ? 'Get your [API Key here](https://console.anthropic.com/settings/keys).' :
+				providerName === 'openAI' ? 'Get your [API Key here](https://platform.openai.com/api-keys).' :
+					providerName === 'openRouter' ? 'Get your [API Key here](https://openrouter.ai/settings/keys).' :
+						providerName === 'gemini' ? 'Get your [API Key here](https://aistudio.google.com/apikey).' :
+							providerName === 'groq' ? 'Get your [API Key here](https://console.groq.com/keys).' :
+								providerName === 'openAICompatible' ? 'Add any OpenAI-Compatible endpoint.' :
+									undefined,
+		}
+	}
+	else if (settingName === 'endpoint') {
+		return {
+			title: providerName === 'ollama' ? 'Endpoint' :
+				providerName === 'openAICompatible' ? 'baseURL' // (do not include /chat/completions)
+					: '(never)',
+
+			placeholder: providerName === 'ollama' ? defaultProviderSettings.ollama.endpoint
+				: providerName === 'openAICompatible' ? 'https://my-website.com/v1'
+					: '(never)',
+
+			subTextMd: providerName === 'ollama' ? 'If you would like to change this endpoint, please read more about [Endpoints here](https://github.com/ollama/ollama/blob/main/docs/faq.md#how-can-i-expose-ollama-on-my-network).' :
+				undefined,
+		}
+	}
+	else if (settingName === '_enabled') {
+		return {
+			title: '(never)',
+			placeholder: '(never)',
+		}
+	}
+	else if (settingName === 'models') {
+		return {
+			title: '(never)',
+			placeholder: '(never)',
+		}
+	}
+
+	throw new Error(`displayInfo: Unknown setting name: "${settingName}"`)
+
+}
+
+
+
+
+const defaultCustomSettings: Record<CustomSettingName, undefined> = {
+	apiKey: undefined,
+	endpoint: undefined,
+}
+
+export const voidInitModelOptions = {
+	anthropic: {
+		models: defaultAnthropicModels,
+	},
+	openAI: {
+		models: defaultOpenAIModels,
+	},
+	ollama: {
+		models: [],
+	},
+	openRouter: {
+		models: [], // any string
+	},
+	openAICompatible: {
+		models: [],
+	},
+	gemini: {
+		models: defaultGeminiModels,
+	},
+	groq: {
+		models: defaultGroqModels,
+	},
+}
+
+
+// used when waiting and for a type reference
+export const defaultSettingsOfProvider: SettingsOfProvider = {
+	anthropic: {
+		_enabled: undefined,
+		...defaultCustomSettings,
+		...defaultProviderSettings.anthropic,
+		...voidInitModelOptions.anthropic,
+	},
+	openAI: {
+		_enabled: undefined,
+		...defaultCustomSettings,
+		...defaultProviderSettings.openAI,
+		...voidInitModelOptions.openAI,
+	},
+	gemini: {
+		...defaultCustomSettings,
+		...defaultProviderSettings.gemini,
+		...voidInitModelOptions.gemini,
+		_enabled: undefined,
+	},
+	groq: {
+		...defaultCustomSettings,
+		...defaultProviderSettings.groq,
+		...voidInitModelOptions.groq,
+		_enabled: undefined,
+	},
+	ollama: {
+		...defaultCustomSettings,
+		...defaultProviderSettings.ollama,
+		...voidInitModelOptions.ollama,
+		_enabled: undefined,
+	},
+	openRouter: {
+		...defaultCustomSettings,
+		...defaultProviderSettings.openRouter,
+		...voidInitModelOptions.openRouter,
+		_enabled: undefined,
+	},
+	openAICompatible: {
+		...defaultCustomSettings,
+		...defaultProviderSettings.openAICompatible,
+		...voidInitModelOptions.openAICompatible,
+		_enabled: undefined,
+	},
+}
+
+
+export type ModelSelection = { providerName: ProviderName, modelName: string }
+
+export const modelSelectionsEqual = (m1: ModelSelection, m2: ModelSelection) => {
+	return m1.modelName === m2.modelName && m1.providerName === m2.providerName
+}
+
+// this is a state
+export type ModelSelectionOfFeature = {
+	'Ctrl+L': ModelSelection | null,
+	'Ctrl+K': ModelSelection | null,
+	'Autocomplete': ModelSelection | null,
+}
+export type FeatureName = keyof ModelSelectionOfFeature
+export const featureNames = ['Ctrl+L', 'Ctrl+K', 'Autocomplete'] as const
+
+
+
+
+
+
+
+// the models of these can be refreshed (in theory all can, but not all should)
+export const refreshableProviderNames = localProviderNames
+export type RefreshableProviderName = typeof refreshableProviderNames[number]
+
+
+
+
+
+
+
+
+export type GlobalSettings = {
+	autoRefreshModels: boolean;
+	aiInstructions: string;
+}
+export const defaultGlobalSettings: GlobalSettings = {
+	autoRefreshModels: true,
+	aiInstructions: '',
+}
+
+export type GlobalSettingName = keyof GlobalSettings
+export const globalSettingNames = Object.keys(defaultGlobalSettings) as GlobalSettingName[]
+
+

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

@@ -0,0 +1,46 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+import { createDecorator } from '../../instantiation/common/instantiation.js';
+import { ProxyChannel } from '../../../base/parts/ipc/common/ipc.js';
+import { IMainProcessService } from '../../ipc/common/mainProcessService.js';
+import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
+
+
+
+export interface IVoidUpdateService {
+	readonly _serviceBrand: undefined;
+	check: () => Promise<{ hasUpdate: true, message: string } | { hasUpdate: false } | null>;
+}
+
+
+export const IVoidUpdateService = createDecorator<IVoidUpdateService>('VoidUpdateService');
+
+
+// implemented by calling channel
+export class VoidUpdateService implements IVoidUpdateService {
+
+	readonly _serviceBrand: undefined;
+	private readonly voidUpdateService: IVoidUpdateService;
+
+	constructor(
+		@IMainProcessService mainProcessService: IMainProcessService, // (only usable on client side)
+	) {
+		// creates an IPC proxy to use metricsMainService.ts
+		this.voidUpdateService = ProxyChannel.toService<IVoidUpdateService>(mainProcessService.getChannel('void-channel-update'));
+	}
+
+
+
+	// anything transmitted over a channel must be async even if it looks like it doesn't have to be
+	check: IVoidUpdateService['check'] = async () => {
+		const res = await this.voidUpdateService.check()
+		return res
+	}
+}
+
+registerSingleton(IVoidUpdateService, VoidUpdateService, InstantiationType.Eager);
+
+

src/vs/platform/void/electron-main/llmMessage/anthropic.ts

@@ -1,16 +1,28 @@
+/*--------------------------------------------------------------------------------------
+ *  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 { parseMaxTokensStr, SendLLMMessageFnTypeInternal } from './util.js';
+import { _InternalSendLLMMessageFnType } from '../../common/llmMessageTypes.js';
+import { anthropicMaxPossibleTokens } from '../../common/voidSettingsTypes.js';
 
 // Anthropic
 type LLMMessageAnthropic = {
 	role: 'user' | 'assistant';
 	content: string;
 }
-export const sendAnthropicMsg: SendLLMMessageFnTypeInternal = ({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter }) => {
+export const sendAnthropicMsg: _InternalSendLLMMessageFnType = ({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter }) => {
 
-	const thisConfig = voidConfig.anthropic
+	const thisConfig = settingsOfProvider.anthropic
 
-	const anthropic = new Anthropic({ apiKey: thisConfig.apikey, dangerouslyAllowBrowser: true }); // defaults to process.env["ANTHROPIC_API_KEY"]
+	const maxTokens = anthropicMaxPossibleTokens(modelName)
+	if (maxTokens === undefined) {
+		onError({ message: `Please set a value for Max Tokens.`, fullError: null })
+		return
+	}
+
+	const anthropic = new Anthropic({ apiKey: thisConfig.apiKey, dangerouslyAllowBrowser: true });
 
 	// find system messages and concatenate them
 	const systemMessage = messages
@@ -21,11 +33,13 @@ export const sendAnthropicMsg: SendLLMMessageFnTypeInternal = ({ messages, onTex
 	// remove system messages for Anthropic
 	const anthropicMessages = messages.filter(msg => msg.role !== 'system') as LLMMessageAnthropic[]
 
+
+
 	const stream = anthropic.messages.stream({
 		system: systemMessage,
 		messages: anthropicMessages,
-		model: thisConfig.model,
-		max_tokens: parseMaxTokensStr(voidConfig.default.maxTokens)!, // this might be undefined, but it will just throw an error for the user
+		model: modelName,
+		max_tokens: maxTokens,
 	});
 
 
@@ -44,10 +58,10 @@ export const sendAnthropicMsg: SendLLMMessageFnTypeInternal = ({ messages, onTex
 	stream.on('error', (error) => {
 		// the most common error will be invalid API key (401), so we handle this with a nice message
 		if (error instanceof Anthropic.APIError && error.status === 401) {
-			onError({ error: 'Invalid API key.' })
+			onError({ message: 'Invalid API key.', fullError: error })
 		}
 		else {
-			onError({ error })
+			onError({ message: error + '', fullError: error }) // anthropic errors can be stringified nicely like this
 		}
 	})
 

src/vs/platform/void/electron-main/llmMessage/gemini.ts

@@ -1,15 +1,20 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
 import { Content, GoogleGenerativeAI, GoogleGenerativeAIFetchError } from '@google/generative-ai';
-import { SendLLMMessageFnTypeInternal } from './util';
+import { _InternalSendLLMMessageFnType } from '../../common/llmMessageTypes.js';
 
 // Gemini
-export const sendGeminiMsg: SendLLMMessageFnTypeInternal = async ({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter }) => {
+export const sendGeminiMsg: _InternalSendLLMMessageFnType = async ({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter }) => {
 
 	let fullText = ''
 
-	const thisConfig = voidConfig.gemini
+	const thisConfig = settingsOfProvider.gemini
 
-	const genAI = new GoogleGenerativeAI(thisConfig.apikey);
-	const model = genAI.getGenerativeModel({ model: thisConfig.model });
+	const genAI = new GoogleGenerativeAI(thisConfig.apiKey);
+	const model = genAI.getGenerativeModel({ model: modelName });
 
 	// remove system messages that get sent to Gemini
 	// str of all system messages
@@ -39,10 +44,10 @@ export const sendGeminiMsg: SendLLMMessageFnTypeInternal = async ({ messages, on
 		})
 		.catch((error) => {
 			if (error instanceof GoogleGenerativeAIFetchError && error.status === 400) {
-				onError({ error: 'Invalid API key.' });
+				onError({ message: 'Invalid API key.', fullError: null });
 			}
 			else {
-				onError({ error });
+				onError({ message: error + '', fullError: error });
 			}
 		})
 }

src/vs/platform/void/electron-main/llmMessage/greptile.ts

@@ -1,64 +1,68 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
 
-// Greptile
-// https://docs.greptile.com/api-reference/query
-// https://docs.greptile.com/quickstart#sample-response-streamed
+// // Greptile
+// // https://docs.greptile.com/api-reference/query
+// // https://docs.greptile.com/quickstart#sample-response-streamed
 
-import { SendLLMMessageFnTypeInternal } from './util';
+// import { SendLLMMessageFnTypeInternal } from '../../common/llmMessageTypes.js';
 
-export const sendGreptileMsg: SendLLMMessageFnTypeInternal = ({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter }) => {
+// export const sendGreptileMsg: SendLLMMessageFnTypeInternal = ({ messages, onText, onFinalMessage, onError, settingsOfProvider, _setAborter }) => {
 
-	let fullText = ''
+// 	let fullText = ''
 
-	const thisConfig = voidConfig.greptile
+// 	const thisConfig = settingsOfProvider.greptile
 
-	fetch('https://api.greptile.com/v2/query', {
-		method: 'POST',
-		headers: {
-			'Authorization': `Bearer ${thisConfig.apikey}`,
-			'X-Github-Token': `${thisConfig.githubPAT}`,
-			'Content-Type': `application/json`,
-		},
-		body: JSON.stringify({
-			messages,
-			stream: true,
-			repositories: [thisConfig.repoinfo],
-		}),
-	})
-		// this is {message}\n{message}\n{message}...\n
-		.then(async response => {
-			const text = await response.text()
-			console.log('got greptile', text)
-			return JSON.parse(`[${text.trim().split('\n').join(',')}]`)
-		})
-		// TODO make this actually stream, right now it just sends one message at the end
-		// TODO add _setAborter() when add streaming
-		.then(async responseArr => {
+// 	fetch('https://api.greptile.com/v2/query', {
+// 		method: 'POST',
+// 		headers: {
+// 			'Authorization': `Bearer ${thisConfig.apikey}`,
+// 			'X-Github-Token': `${thisConfig.githubPAT}`,
+// 			'Content-Type': `application/json`,
+// 		},
+// 		body: JSON.stringify({
+// 			messages,
+// 			stream: true,
+// 			repositories: [thisConfig.repoinfo],
+// 		}),
+// 	})
+// 		// this is {message}\n{message}\n{message}...\n
+// 		.then(async response => {
+// 			const text = await response.text()
+// 			console.log('got greptile', text)
+// 			return JSON.parse(`[${text.trim().split('\n').join(',')}]`)
+// 		})
+// 		// TODO make this actually stream, right now it just sends one message at the end
+// 		// TODO add _setAborter() when add streaming
+// 		.then(async responseArr => {
 
-			for (const response of responseArr) {
-				const type: string = response['type']
-				const message = response['message']
+// 			for (const response of responseArr) {
+// 				const type: string = response['type']
+// 				const message = response['message']
 
-				// when receive text
-				if (type === 'message') {
-					fullText += message
-					onText({ newText: message, fullText })
-				}
-				else if (type === 'sources') {
-					const { filepath, linestart: _, lineend: _2 } = message as { filepath: string; linestart: number | null; lineend: number | null }
-					fullText += filepath
-					onText({ newText: filepath, fullText })
-				}
-				// type: 'status' with an empty 'message' means last message
-				else if (type === 'status') {
-					if (!message) {
-						onFinalMessage({ fullText })
-					}
-				}
-			}
+// 				// when receive text
+// 				if (type === 'message') {
+// 					fullText += message
+// 					onText({ newText: message, fullText })
+// 				}
+// 				else if (type === 'sources') {
+// 					const { filepath, linestart: _, lineend: _2 } = message as { filepath: string; linestart: number | null; lineend: number | null }
+// 					fullText += filepath
+// 					onText({ newText: filepath, fullText })
+// 				}
+// 				// type: 'status' with an empty 'message' means last message
+// 				else if (type === 'status') {
+// 					if (!message) {
+// 						onFinalMessage({ fullText })
+// 					}
+// 				}
+// 			}
 
-		})
-		.catch(error => {
-			onError({ error })
-		});
+// 		})
+// 		.catch(error => {
+// 			onError({ error })
+// 		});
 
-}
+// }

src/vs/platform/void/electron-main/llmMessage/groq.ts

@@ -1,23 +1,29 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
 import Groq from 'groq-sdk';
-import { SendLLMMessageFnTypeInternal } from './util';
-import { parseMaxTokensStr } from './util.js';
+import { _InternalSendLLMMessageFnType } from '../../common/llmMessageTypes.js';
 
 // Groq
-export const sendGroqMsg: SendLLMMessageFnTypeInternal = async ({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter }) => {
+export const sendGroqMsg: _InternalSendLLMMessageFnType = async ({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter }) => {
 	let fullText = '';
 
+	const thisConfig = settingsOfProvider.groq
+
 	const groq = new Groq({
-		apiKey: voidConfig.groq.apikey,
+		apiKey: thisConfig.apiKey,
 		dangerouslyAllowBrowser: true
 	});
 
 	await groq.chat.completions
 		.create({
 			messages: messages,
-			model: voidConfig.groq.model,
+			model: modelName,
 			stream: true,
 			temperature: 0.7,
-			max_tokens: parseMaxTokensStr(voidConfig.default.maxTokens),
+			// max_tokens: parseMaxTokensStr(thisConfig.maxTokens),
 		})
 		.then(async response => {
 			_setAborter(() => response.controller.abort())
@@ -33,7 +39,7 @@ export const sendGroqMsg: SendLLMMessageFnTypeInternal = async ({ messages, onTe
 			onFinalMessage({ fullText });
 		})
 		.catch(error => {
-			onError({ error });
+			onError({ message: error + '', fullError: error });
 		})
 
 

src/vs/platform/void/electron-main/llmMessage/ollama.ts

@@ -1,21 +1,59 @@
-import { Ollama, ErrorResponse } from 'ollama';
-import { SendLLMMessageFnTypeInternal } from './util';
-import { parseMaxTokensStr } from './util.js';
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+import { Ollama } from 'ollama';
+import { _InternalModelListFnType, _InternalSendLLMMessageFnType, OllamaModelResponse } from '../../common/llmMessageTypes.js';
+import { defaultProviderSettings } from '../../common/voidSettingsTypes.js';
+
+export const ollamaList: _InternalModelListFnType<OllamaModelResponse> = async ({ onSuccess: onSuccess_, onError: onError_, settingsOfProvider }) => {
+
+	const onSuccess = ({ models }: { models: OllamaModelResponse[] }) => {
+		onSuccess_({ models })
+	}
+
+	const onError = ({ error }: { error: string }) => {
+		onError_({ error })
+	}
+
+	try {
+		const thisConfig = settingsOfProvider.ollama
+		// if endpoint is empty, normally ollama will send to 11434, but we want it to fail - the user should type it in
+		if (!thisConfig.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: thisConfig.endpoint })
+		ollama.list()
+			.then((response) => {
+				const { models } = response
+				onSuccess({ models })
+			})
+			.catch((error) => {
+				onError({ error: error + '' })
+			})
+	}
+	catch (error) {
+		onError({ error: error + '' })
+	}
+}
+
 
 // Ollama
-export const sendOllamaMsg: SendLLMMessageFnTypeInternal = ({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter }) => {
+export const sendOllamaMsg: _InternalSendLLMMessageFnType = ({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter }) => {
 
-	const thisConfig = voidConfig.ollama
+	const thisConfig = settingsOfProvider.ollama
+	// if endpoint is empty, normally ollama will send to 11434, but we want it to fail - the user should type it in
+	if (!thisConfig.endpoint) throw new Error(`Ollama Endpoint was empty (please enter ${defaultProviderSettings.ollama.endpoint} if you want the default).`)
 
 	let fullText = ''
 
 	const ollama = new Ollama({ host: thisConfig.endpoint })
 
 	ollama.chat({
-		model: thisConfig.model,
+		model: modelName,
 		messages: messages,
 		stream: true,
-		options: { num_predict: parseMaxTokensStr(voidConfig.default.maxTokens) } // this is max_tokens
+		// options: { num_predict: parseMaxTokensStr(thisConfig.maxTokens) } // this is max_tokens
 	})
 		.then(async stream => {
 			_setAborter(() => stream.abort())
@@ -30,18 +68,19 @@ export const sendOllamaMsg: SendLLMMessageFnTypeInternal = ({ messages, onText,
 		})
 		// when error/fail
 		.catch((error) => {
-			if (typeof error === 'object') {
-				const e = error.error as ErrorResponse['error']
-				if (e) {
-					const name = error.name ?? 'Error'
-					onError({ error: `${name}: ${e}` })
-					return;
-				}
-			}
-			onError({ error })
+			// if (typeof error === 'object') {
+			// 	const e = error.error as ErrorResponse['error']
+			// 	if (e) {
+			// 		const name = error.name ?? 'Error'
+			// 		onError({ error: `${name}: ${e}` })
+			// 		return;
+			// 	}
+			// }
+			onError({ message: error + '', fullError: error })
 		})
 
 };
 
 
 
+// ['codestral', 'qwen2.5-coder', 'qwen2.5-coder:0.5b', 'qwen2.5-coder:1.5b', 'qwen2.5-coder:3b', 'qwen2.5-coder:7b', 'qwen2.5-coder:14b', 'qwen2.5-coder:32b', 'codegemma', 'codegemma:2b', 'codegemma:7b', 'codellama', 'codellama:7b', 'codellama:13b', 'codellama:34b', 'codellama:70b', 'codellama:code', 'codellama:python', 'command-r', 'command-r:35b', 'command-r-plus', 'command-r-plus:104b', 'deepseek-coder-v2', 'deepseek-coder-v2:16b', 'deepseek-coder-v2:236b', 'falcon2', 'falcon2:11b', 'firefunction-v2', 'firefunction-v2:70b', 'gemma', 'gemma:2b', 'gemma:7b', 'gemma2', 'gemma2:2b', 'gemma2:9b', 'gemma2:27b', 'llama2', 'llama2:7b', 'llama2:13b', 'llama2:70b', 'llama3', 'llama3:8b', 'llama3:70b', 'llama3-chatqa', 'llama3-chatqa:8b', 'llama3-chatqa:70b', 'llama3-gradient', 'llama3-gradient:8b', 'llama3-gradient:70b', 'llama3.1', 'llama3.1:8b', 'llama3.1:70b', 'llama3.1:405b', 'llava', 'llava:7b', 'llava:13b', 'llava:34b', 'llava-llama3', 'llava-llama3:8b', 'llava-phi3', 'llava-phi3:3.8b', 'mistral', 'mistral:7b', 'mistral-large', 'mistral-large:123b', 'mistral-nemo', 'mistral-nemo:12b', 'mixtral', 'mixtral:8x7b', 'mixtral:8x22b', 'moondream', 'moondream:1.8b', 'openhermes', 'openhermes:v2.5', 'phi3', 'phi3:3.8b', 'phi3:14b', 'phi3.5', 'phi3.5:3.8b', 'qwen', 'qwen:7b', 'qwen:14b', 'qwen:32b', 'qwen:72b', 'qwen:110b', 'qwen2', 'qwen2:0.5b', 'qwen2:1.5b', 'qwen2:7b', 'qwen2:72b', 'smollm', 'smollm:135m', 'smollm:360m', 'smollm:1.7b',]

src/vs/platform/void/electron-main/llmMessage/openai.ts

@@ -1,44 +1,85 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
 import OpenAI from 'openai';
-import { SendLLMMessageFnTypeInternal } from './util';
-import { parseMaxTokensStr } from './util.js';
+import { _InternalModelListFnType, _InternalSendLLMMessageFnType } from '../../common/llmMessageTypes.js';
+import { Model } from 'openai/resources/models.js';
+// import { parseMaxTokensStr } from './util.js';
+
+
+
+export const openaiCompatibleList: _InternalModelListFnType<Model> = async ({ onSuccess: onSuccess_, onError: onError_, settingsOfProvider }) => {
+	const onSuccess = ({ models }: { models: Model[] }) => {
+		onSuccess_({ models })
+	}
+
+	const onError = ({ error }: { error: string }) => {
+		onError_({ error })
+	}
+
+	try {
+		const thisConfig = settingsOfProvider.openAICompatible
+		const openai = new OpenAI({ baseURL: thisConfig.endpoint, apiKey: thisConfig.apiKey, dangerouslyAllowBrowser: true })
+
+		openai.models.list()
+			.then(async (response) => {
+				const models: Model[] = []
+				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 + '' })
+	}
+}
+
+
 
 
 // OpenAI, OpenRouter, OpenAICompatible
-export const sendOpenAIMsg: SendLLMMessageFnTypeInternal = ({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter }) => {
+export const sendOpenAIMsg: _InternalSendLLMMessageFnType = ({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName }) => {
 
 	let fullText = ''
 
 	let openai: OpenAI
 	let options: OpenAI.Chat.Completions.ChatCompletionCreateParamsStreaming
 
-	const maxTokens = parseMaxTokensStr(voidConfig.default.maxTokens)
 
-	if (voidConfig.default.whichApi === 'openAI') {
-		const thisConfig = voidConfig.openAI
-		openai = new OpenAI({ apiKey: thisConfig.apikey, dangerouslyAllowBrowser: true });
-		options = { model: thisConfig.model, messages: messages, stream: true, max_completion_tokens: maxTokens }
+	if (providerName === 'openAI') {
+		const thisConfig = settingsOfProvider.openAI
+		openai = new OpenAI({ apiKey: thisConfig.apiKey, dangerouslyAllowBrowser: true });
+		options = { model: modelName, messages: messages, stream: true, /*max_completion_tokens: parseMaxTokensStr(thisConfig.maxTokens)*/ }
 	}
-	else if (voidConfig.default.whichApi === 'openRouter') {
-		const thisConfig = voidConfig.openRouter
+	else if (providerName === 'openRouter') {
+		const thisConfig = settingsOfProvider.openRouter
 		openai = new OpenAI({
-			baseURL: 'https://openrouter.ai/api/v1', apiKey: thisConfig.apikey, dangerouslyAllowBrowser: true,
+			baseURL: 'https://openrouter.ai/api/v1', apiKey: thisConfig.apiKey, dangerouslyAllowBrowser: true,
 			defaultHeaders: {
 				'HTTP-Referer': 'https://voideditor.com', // Optional, for including your app on openrouter.ai rankings.
 				'X-Title': 'Void Editor', // Optional. Shows in rankings on openrouter.ai.
 			},
 		});
-		options = { model: thisConfig.model, messages: messages, stream: true, max_completion_tokens: maxTokens }
+		options = { model: modelName, messages: messages, stream: true, /*max_completion_tokens: parseMaxTokensStr(thisConfig.maxTokens)*/ }
 	}
-	else if (voidConfig.default.whichApi === 'openAICompatible') {
-		const thisConfig = voidConfig.openAICompatible
-		openai = new OpenAI({ baseURL: thisConfig.endpoint, apiKey: thisConfig.apikey, dangerouslyAllowBrowser: true })
-		options = { model: thisConfig.model, messages: messages, stream: true, max_completion_tokens: maxTokens }
+	else if (providerName === 'openAICompatible') {
+		const thisConfig = settingsOfProvider.openAICompatible
+		openai = new OpenAI({ baseURL: thisConfig.endpoint, apiKey: thisConfig.apiKey, dangerouslyAllowBrowser: true })
+		options = { model: modelName, messages: messages, stream: true, /*max_completion_tokens: parseMaxTokensStr(thisConfig.maxTokens)*/ }
 	}
 	else {
-		console.error(`sendOpenAIMsg: invalid whichApi: ${voidConfig.default.whichApi}`)
-		throw new Error(`voidConfig.whichAPI was invalid: ${voidConfig.default.whichApi}`)
+		console.error(`sendOpenAIMsg: invalid providerName: ${providerName}`)
+		throw new Error(`providerName was invalid: ${providerName}`)
 	}
 
+	openai.models.list()
 	openai.chat.completions
 		.create(options)
 		.then(async response => {
@@ -54,10 +95,10 @@ export const sendOpenAIMsg: SendLLMMessageFnTypeInternal = ({ messages, onText,
 		// when error/fail - this catches errors of both .create() and .then(for await)
 		.catch(error => {
 			if (error instanceof OpenAI.APIError && error.status === 401) {
-				onError({ error: 'Invalid API key.' });
+				onError({ message: 'Invalid API key.', fullError: error });
 			}
 			else {
-				onError({ error });
+				onError({ message: error, fullError: error });
 			}
 		})
 

src/vs/platform/void/electron-main/llmMessage/sendLLMMessage.ts

@@ -1,23 +1,31 @@
-import { SendLLMMMessageParams, OnText, OnFinalMessage, OnError } from '../../common/llmMessageTypes.js';
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+import { LLMMMessageParams, OnText, OnFinalMessage, OnError } from '../../common/llmMessageTypes.js';
 import { IMetricsService } from '../../common/metricsService.js';
 
 import { sendAnthropicMsg } from './anthropic.js';
-import { sendGeminiMsg } from './gemini.js';
-import { sendGreptileMsg } from './greptile.js';
-import { sendGroqMsg } from './groq.js';
 import { sendOllamaMsg } from './ollama.js';
 import { sendOpenAIMsg } from './openai.js';
+import { sendGeminiMsg } from './gemini.js';
+import { sendGroqMsg } from './groq.js';
 
-
-export const sendLLMMessage = (
-	{
-		messages, onText: onText_, onFinalMessage: onFinalMessage_, onError: onError_,
-		abortRef: abortRef_, voidConfig, logging: { loggingName },
-	}: SendLLMMMessageParams,
+export const sendLLMMessage = ({
+	messages,
+	onText: onText_,
+	onFinalMessage: onFinalMessage_,
+	onError: onError_,
+	abortRef: abortRef_,
+	logging: { loggingName },
+	settingsOfProvider,
+	providerName,
+	modelName,
+}: LLMMMessageParams,
 
 	metricsService: IMetricsService
 ) => {
-	if (!voidConfig) return;
 
 	// trim message content (Anthropic and other providers give an error if there is trailing whitespace)
 	messages = messages.map(m => ({ ...m, content: m.content.trim() }))
@@ -25,10 +33,10 @@ export const sendLLMMessage = (
 	// only captures number of messages and message "shape", no actual code, instructions, prompts, etc
 	const captureChatEvent = (eventId: string, extras?: object) => {
 		metricsService.capture(eventId, {
-			whichApi: voidConfig.default['whichApi'],
+			providerName,
+			modelName,
 			numMessages: messages?.length,
 			messagesShape: messages?.map(msg => ({ role: msg.role, length: msg.content.length })),
-			version: '2024-11-14',
 			...extras,
 		})
 	}
@@ -51,11 +59,11 @@ export const sendLLMMessage = (
 		onFinalMessage_({ fullText })
 	}
 
-	const onError: OnError = ({ error }) => {
+	const onError: OnError = ({ message: error, fullError }) => {
 		if (_didAbort) return
 		console.error('sendLLMMessage onError:', error)
 		captureChatEvent(`${loggingName} - Error`, { error })
-		onError_({ error })
+		onError_({ message: error, fullError })
 	}
 
 	const onAbort = () => {
@@ -69,36 +77,33 @@ export const sendLLMMessage = (
 	captureChatEvent(`${loggingName} - Sending Message`, { messageLength: messages[messages.length - 1]?.content.length })
 
 	try {
-		switch (voidConfig.default.whichApi) {
+		switch (providerName) {
 			case 'anthropic':
-				sendAnthropicMsg({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter, });
+				sendAnthropicMsg({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName });
 				break;
 			case 'openAI':
 			case 'openRouter':
 			case 'openAICompatible':
-				sendOpenAIMsg({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter, });
+				sendOpenAIMsg({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName });
 				break;
 			case 'gemini':
-				sendGeminiMsg({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter, });
+				sendGeminiMsg({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName });
 				break;
 			case 'ollama':
-				sendOllamaMsg({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter, });
-				break;
-			case 'greptile':
-				sendGreptileMsg({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter, });
+				sendOllamaMsg({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName });
 				break;
 			case 'groq':
-				sendGroqMsg({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter, });
+				sendGroqMsg({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName });
 				break;
 			default:
-				onError({ error: `Error: whichApi was "${voidConfig.default.whichApi}", which is not recognized!` })
+				onError({ message: `Error: Void provider was "${providerName}", which is not recognized.`, fullError: null })
 				break;
 		}
 	}
 
 	catch (error) {
-		if (error instanceof Error) { onError({ error }) }
-		else { onError({ error: `Unexpected Error in sendLLMMessage: ${error}` }); }
+		if (error instanceof Error) { onError({ message: error + '', fullError: error }) }
+		else { onError({ message: `Unexpected Error in sendLLMMessage: ${error}`, fullError: error }); }
 		// ; (_aborter as any)?.()
 		// _didAbort = true
 	}

src/vs/platform/void/electron-main/llmMessage/util.ts

@@ -1,21 +0,0 @@
-import { VoidConfig } from '../../common/configTypes'
-import { LLMMessage, OnText, OnFinalMessage, OnError } from '../../common/llmMessageTypes'
-
-export const parseMaxTokensStr = (maxTokensStr: string) => {
-	// parse the string but only if the full string is a valid number, eg parseInt('100abc') should return NaN
-	const int = isNaN(Number(maxTokensStr)) ? undefined : parseInt(maxTokensStr)
-	if (Number.isNaN(int))
-		return undefined
-	return int
-}
-
-
-export type SendLLMMessageFnTypeInternal = (params: {
-	messages: LLMMessage[];
-	onText: OnText;
-	onFinalMessage: OnFinalMessage;
-	onError: OnError;
-	voidConfig: VoidConfig;
-
-	_setAborter: (aborter: () => void) => void;
-}) => void

src/vs/platform/void/electron-main/llmMessageChannel.ts

@@ -1,47 +1,65 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPLv3 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
 
 // registered in app.ts
 // code convention is to make a service responsible for this stuff, and not a channel, but having fewer files is simpler...
 
 import { IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
 import { Emitter, Event } from '../../../base/common/event.js';
-import { listenerNames, ProxyOnTextPayload, ProxyOnErrorPayload, ProxyOnFinalMessagePayload, ProxyLLMMessageParams, AbortRef, SendLLMMMessageParams, ProxyLLMMessageAbortParams } from '../common/llmMessageTypes.js';
+import { EventLLMMessageOnTextParams, EventLLMMessageOnErrorParams, EventLLMMessageOnFinalMessageParams, MainLLMMessageParams, AbortRef, LLMMMessageParams, MainLLMMessageAbortParams, MainModelListParams, ModelListParams, EventModelListOnSuccessParams, EventModelListOnErrorParams, OllamaModelResponse, OpenaiCompatibleModelResponse, } from '../common/llmMessageTypes.js';
 import { sendLLMMessage } from './llmMessage/sendLLMMessage.js'
 import { IMetricsService } from '../common/metricsService.js';
+import { ollamaList } from './llmMessage/ollama.js';
+import { openaiCompatibleList } from './llmMessage/openai.js';
 
 // NODE IMPLEMENTATION - calls actual sendLLMMessage() and returns listeners to it
 
 export class LLMMessageChannel implements IServerChannel {
-	private readonly _onText = new Emitter<ProxyOnTextPayload>();
-	readonly onText = this._onText.event;
+	// sendLLMMessage
+	private readonly _onText_llm = new Emitter<EventLLMMessageOnTextParams>();
+	private readonly _onFinalMessage_llm = new Emitter<EventLLMMessageOnFinalMessageParams>();
+	private readonly _onError_llm = new Emitter<EventLLMMessageOnErrorParams>();
 
-	private readonly _onFinalMessage = new Emitter<ProxyOnFinalMessagePayload>();
-	readonly onFinalMessage = this._onFinalMessage.event;
+	// abort
+	private readonly _abortRefOfRequestId_llm: Record<string, AbortRef> = {}
 
-	private readonly _onError = new Emitter<ProxyOnErrorPayload>();
-	readonly onError = this._onError.event;
-
-
-	private readonly _abortRefOfRequestId: Record<string, AbortRef> = {}
+	// ollamaList
+	private readonly _onSuccess_ollama = new Emitter<EventModelListOnSuccessParams<OllamaModelResponse>>();
+	private readonly _onError_ollama = new Emitter<EventModelListOnErrorParams<OllamaModelResponse>>();
 
+	// openaiCompatibleList
+	private readonly _onSuccess_openAICompatible = new Emitter<EventModelListOnSuccessParams<OpenaiCompatibleModelResponse>>();
+	private readonly _onError_openAICompatible = new Emitter<EventModelListOnErrorParams<OpenaiCompatibleModelResponse>>();
 
+	// stupidly, channels can't take in @IService
 	constructor(
-		private readonly metricsService: IMetricsService
+		private readonly metricsService: IMetricsService,
 	) { }
 
 	// browser uses this to listen for changes
-	listen(_: unknown, event: typeof listenerNames[number]): Event<any> {
-		if (event === 'onText') {
-			return this.onText;
+	listen(_: unknown, event: string): Event<any> {
+		if (event === 'onText_llm') {
+			return this._onText_llm.event;
 		}
-		else if (event === 'onFinalMessage') {
-			return this.onFinalMessage;
+		else if (event === 'onFinalMessage_llm') {
+			return this._onFinalMessage_llm.event;
 		}
-		else if (event === 'onError') {
-			return this.onError;
+		else if (event === 'onError_llm') {
+			return this._onError_llm.event;
+		}
+		else if (event === 'onSuccess_ollama') {
+			return this._onSuccess_ollama.event;
+		}
+		else if (event === 'onError_ollama') {
+			return this._onError_ollama.event;
+		}
+		else if (event === 'onSuccess_openAICompatible') {
+			return this._onSuccess_openAICompatible.event;
+		}
+		else if (event === 'onError_openAICompatible') {
+			return this._onError_openAICompatible.event;
 		}
 		else {
 			throw new Error(`Event not found: ${event}`);
@@ -50,7 +68,6 @@ export class LLMMessageChannel implements IServerChannel {
 
 	// browser uses this to call
 	async call(_: unknown, command: string, params: any): Promise<any> {
-
 		try {
 			if (command === 'sendLLMMessage') {
 				this._callSendLLMMessage(params)
@@ -58,6 +75,12 @@ export class LLMMessageChannel implements IServerChannel {
 			else if (command === 'abort') {
 				this._callAbort(params)
 			}
+			else if (command === 'ollamaList') {
+				this._callOllamaList(params)
+			}
+			else if (command === 'openAICompatibleList') {
+				this._callOpenAICompatibleList(params)
+			}
 			else {
 				throw new Error(`Void sendLLM: command "${command}" not recognized.`)
 			}
@@ -68,27 +91,49 @@ export class LLMMessageChannel implements IServerChannel {
 	}
 
 	// the only place sendLLMMessage is actually called
-	private _callSendLLMMessage(params: ProxyLLMMessageParams) {
+	private async _callSendLLMMessage(params: MainLLMMessageParams) {
 		const { requestId } = params;
 
-		if (!(requestId in this._abortRefOfRequestId))
-			this._abortRefOfRequestId[requestId] = { current: null }
+		if (!(requestId in this._abortRefOfRequestId_llm))
+			this._abortRefOfRequestId_llm[requestId] = { current: null }
 
-		const mainThreadParams: SendLLMMMessageParams = {
+		const mainThreadParams: LLMMMessageParams = {
 			...params,
-			onText: ({ newText, fullText }) => { this._onText.fire({ requestId, newText, fullText }); },
-			onFinalMessage: ({ fullText }) => { this._onFinalMessage.fire({ requestId, fullText }); },
-			onError: ({ error }) => { this._onError.fire({ requestId, error }); },
-			abortRef: this._abortRefOfRequestId[requestId],
+			onText: ({ newText, fullText }) => { this._onText_llm.fire({ requestId, newText, fullText }); },
+			onFinalMessage: ({ fullText }) => { this._onFinalMessage_llm.fire({ requestId, fullText }); },
+			onError: ({ message: error, fullError }) => { console.log('sendLLM: firing err'); this._onError_llm.fire({ requestId, message: error, fullError }); },
+			abortRef: this._abortRefOfRequestId_llm[requestId],
 		}
 		sendLLMMessage(mainThreadParams, this.metricsService);
 	}
 
-	private _callAbort(params: ProxyLLMMessageAbortParams) {
+	private _callAbort(params: MainLLMMessageAbortParams) {
 		const { requestId } = params;
-		if (!(requestId in this._abortRefOfRequestId)) return
-		this._abortRefOfRequestId[requestId].current?.()
-		delete this._abortRefOfRequestId[requestId]
+		if (!(requestId in this._abortRefOfRequestId_llm)) return
+		this._abortRefOfRequestId_llm[requestId].current?.()
+		delete this._abortRefOfRequestId_llm[requestId]
+	}
+
+	private _callOllamaList(params: MainModelListParams<OllamaModelResponse>) {
+		const { requestId } = params;
+
+		const mainThreadParams: ModelListParams<OllamaModelResponse> = {
+			...params,
+			onSuccess: ({ models }) => { this._onSuccess_ollama.fire({ requestId, models }); },
+			onError: ({ error }) => { this._onError_ollama.fire({ requestId, error }); },
+		}
+		ollamaList(mainThreadParams)
+	}
+
+	private _callOpenAICompatibleList(params: MainModelListParams<OpenaiCompatibleModelResponse>) {
+		const { requestId } = params;
+
+		const mainThreadParams: ModelListParams<OpenaiCompatibleModelResponse> = {
+			...params,
+			onSuccess: ({ models }) => { this._onSuccess_openAICompatible.fire({ requestId, models }); },
+			onError: ({ error }) => { this._onError_openAICompatible.fire({ requestId, error }); },
+		}
+		openaiCompatibleList(mainThreadParams)
 	}
 
 

src/vs/platform/void/electron-main/metricsMainService.ts

@@ -1,51 +1,99 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPLv3 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  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 { ITelemetryService } from '../../telemetry/common/telemetry.js';
+import { isLinux, isMacintosh, isWindows } from '../../../base/common/platform.js';
+import { generateUuid } from '../../../base/common/uuid.js';
+import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+
+import { IProductService } from '../../product/common/productService.js';
+import { IStorageMainService } from '../../storage/electron-main/storageMainService.js';
 
 import { IMetricsService } from '../common/metricsService.js';
 import { PostHog } from 'posthog-node'
 
 
-// posthog.init('phc_UanIdujHiLp55BkUTjB1AuBXcasVkdqRwgnwRlWESH2', { api_host: 'https://us.i.posthog.com', })
+const os = isWindows ? 'windows' : isMacintosh ? 'mac' : isLinux ? 'linux' : null
 
-// const buildEnv = 'development';
-// const buildNumber = '1.0.0';
-// const isMac = process.platform === 'darwin';
-// // TODO use commandKey
-// const commandKey = isMac ? '⌘' : 'Ctrl';
-// const systemInfo = {
-// 	buildEnv,
-// 	buildNumber,
-// 	isMac,
-// }
+const VOID_MACHINE_STORAGE_KEY = 'void.machineId'
 
 export class MetricsMainService extends Disposable implements IMetricsService {
 	_serviceBrand: undefined;
 
-	readonly _distinctId: string
-	readonly client: PostHog
+	private readonly client: PostHog
+
+	private readonly _initProperties: object
+
+
+	// TODO we should eventually identify people based on email
+	private get machineId() {
+		const currVal = this._storageService.applicationStorage.get(VOID_MACHINE_STORAGE_KEY)
+		if (currVal !== undefined) return currVal
+		const newVal = generateUuid()
+		this._storageService.applicationStorage.set(VOID_MACHINE_STORAGE_KEY, newVal)
+		return newVal
+	}
+
 
 	constructor(
-		@ITelemetryService private readonly _telemetryService: ITelemetryService
+		@IProductService private readonly _productService: IProductService,
+		@IStorageMainService private readonly _storageService: IStorageMainService,
+		@IEnvironmentMainService private readonly _envMainService: IEnvironmentMainService,
 	) {
 		super()
-		this.client = new PostHog('phc_UanIdujHiLp55BkUTjB1AuBXcasVkdqRwgnwRlWESH2', { host: 'https://us.i.posthog.com', })
+		this.client = new PostHog('phc_UanIdujHiLp55BkUTjB1AuBXcasVkdqRwgnwRlWESH2', {
+			host: 'https://us.i.posthog.com',
+		})
 
-		const { devDeviceId, firstSessionDate, machineId } = this._telemetryService
-		this._distinctId = devDeviceId
-		this.client.identify({ distinctId: devDeviceId, properties: { firstSessionDate, machineId } })
+		// we'd like to use devDeviceId on telemetryService, but that gets sanitized by the time it gets here as 'someValue.devDeviceId'
 
-		console.log('Void posthog metrics info:', JSON.stringify({ devDeviceId, firstSessionDate, machineId }))
+		const { commit, version, quality } = this._productService
+
+		const isDevMode = !this._envMainService.isBuilt // found in abstractUpdateService.ts
+
+
+		// custom properties we identify
+		this._initProperties = {
+			commit,
+			version,
+			os,
+			quality,
+			distinctId: this.machineId,
+			isDevMode,
+			...this._getOSInfo(),
+		}
+
+		const identifyMessage = {
+			distinctId: this.machineId,
+			properties: this._initProperties,
+		}
+		this.client.identify(identifyMessage)
+
+		console.log('Void posthog metrics info:', JSON.stringify(identifyMessage, null, 2))
+
+	}
+
+	_getOSInfo() {
+		try {
+			const { platform, arch } = process // see platform.ts
+			return { platform, arch }
+		}
+		catch (e) {
+			return { osInfo: { platform: '??', arch: '??' } }
+		}
 	}
 
 	capture: IMetricsService['capture'] = (event, params) => {
-		console.log('Capturing', { event, params })
-		console.log('full capture:', { distinctId: this._distinctId, event, properties: params })
-		this.client.capture({ distinctId: this._distinctId, event, properties: params })
+		const capture = { distinctId: this.machineId, event, properties: params } as const
+		// console.log('full capture:', capture)
+		this.client.capture(capture)
+	}
+
+
+	async getDebuggingProperties() {
+		return this._initProperties
 	}
 }
 

src/vs/platform/void/electron-main/voidUpdateMainService.ts

@@ -0,0 +1,50 @@
+/*--------------------------------------------------------------------------------------
+ *  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 { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';
+
+import { IProductService } from '../../product/common/productService.js';
+
+import { IVoidUpdateService } from '../common/voidUpdateService.js';
+
+
+
+export class VoidMainUpdateService extends Disposable implements IVoidUpdateService {
+	_serviceBrand: undefined;
+
+	constructor(
+		@IProductService private readonly _productService: IProductService,
+		@IEnvironmentMainService private readonly _envMainService: IEnvironmentMainService,
+	) {
+		super()
+	}
+
+	async check() {
+		const isDevMode = !this._envMainService.isBuilt // found in abstractUpdateService.ts
+
+		if (isDevMode) {
+			return { hasUpdate: false } as const
+		}
+
+		try {
+			const res = await fetch(`https://updates.voideditor.dev/api/v0/${this._productService.commit}`)
+			const resJSON = await res.json()
+
+			if (!resJSON) return null
+
+			const { hasUpdate, downloadMessage } = resJSON ?? {}
+			if (hasUpdate === undefined)
+				return null
+
+			const after = (downloadMessage || '') + ''
+			return { hasUpdate: !!hasUpdate, message: after }
+		}
+		catch (e) {
+			return null
+		}
+	}
+}
+

src/vs/platform/windows/electron-main/windowImpl.ts

@@ -742,18 +742,6 @@ export class CodeWindow extends BaseWindow implements ICodeWindow {
 			cb({ cancel: false, requestHeaders: Object.assign(details.requestHeaders, headers) });
 		});
 
-
-		// // Void: send from https://
-		// this._win.webContents.session.webRequest.onBeforeSendHeaders({ urls }, async (details, cb) => {
-		// 	// const voidConfig = this.voidConfigStateService.state.voidConfig
-		// 	// const whichApi = voidConfig.default['whichApi']
-		// 	const endpoint = 'http://127.' //string | undefined = voidConfig[whichApi as VoidConfigField].endpoint
-
-		// 	if (endpoint && details.url.startsWith(endpoint)) {
-		// 		details.requestHeaders['Origin'] = 'https://app.voideditor.com'
-		// 	}
-		// 	cb({ cancel: false, requestHeaders: details.requestHeaders });
-		// });
 	}
 
 

src/vs/workbench/browser/actions/layoutActions.ts

@@ -239,7 +239,7 @@ MenuRegistry.appendMenuItems([{
 		group: '3_workbench_layout_move',
 		command: {
 			id: ToggleSidebarPositionAction.ID,
-			title: localize('move second sidebar left', "Move Secondary Side Bar Left")
+			title: localize('move second sidebar left', "Move Void Side Bar Left")
 		},
 		when: ContextKeyExpr.and(ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right'), ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.AuxiliaryBar))),
 		order: 1
@@ -250,7 +250,7 @@ MenuRegistry.appendMenuItems([{
 		group: '3_workbench_layout_move',
 		command: {
 			id: ToggleSidebarPositionAction.ID,
-			title: localize('move second sidebar right', "Move Secondary Side Bar Right")
+			title: localize('move second sidebar right', "Move Void Side Bar Right")
 		},
 		when: ContextKeyExpr.and(ContextKeyExpr.equals('config.workbench.sideBar.location', 'right'), ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.AuxiliaryBar))),
 		order: 1
@@ -949,7 +949,7 @@ registerAction2(class extends Action2 {
 					if (!hasAddedView) {
 						results.push({
 							type: 'separator',
-							label: localize('secondarySideBarContainer', "Secondary Side Bar / {0}", containerModel.title)
+							label: localize('secondarySideBarContainer', "Void Side Bar / {0}", containerModel.title)
 						});
 						hasAddedView = true;
 					}
@@ -1056,7 +1056,7 @@ class MoveFocusedViewAction extends Action2 {
 		if (!(isViewSolo && currentLocation === ViewContainerLocation.AuxiliaryBar)) {
 			items.push({
 				id: '_.auxiliarybar.newcontainer',
-				label: localize('moveFocusedView.newContainerInSidePanel', "New Secondary Side Bar Entry")
+				label: localize('moveFocusedView.newContainerInSidePanel', "New Void Side Bar Entry")
 			});
 		}
 
@@ -1104,7 +1104,7 @@ class MoveFocusedViewAction extends Action2 {
 
 		items.push({
 			type: 'separator',
-			label: localize('secondarySideBar', "Secondary Side Bar")
+			label: localize('secondarySideBar', "Void Side Bar")
 		});
 
 		const pinnedAuxPanels = paneCompositePartService.getPinnedPaneCompositeIds(ViewContainerLocation.AuxiliaryBar);
@@ -1386,7 +1386,7 @@ if (!isMacintosh || !isNative) {
 ToggleVisibilityActions.push(...[
 	CreateToggleLayoutItem(ToggleActivityBarVisibilityActionId, ContextKeyExpr.notEquals('config.workbench.activityBar.location', 'hidden'), localize('activityBar', "Activity Bar"), { whenA: ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'), iconA: activityBarLeftIcon, iconB: activityBarRightIcon }),
 	CreateToggleLayoutItem(ToggleSidebarVisibilityAction.ID, SideBarVisibleContext, localize('sideBar', "Primary Side Bar"), { whenA: ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'), iconA: panelLeftIcon, iconB: panelRightIcon }),
-	CreateToggleLayoutItem(ToggleAuxiliaryBarAction.ID, AuxiliaryBarVisibleContext, localize('secondarySideBar', "Secondary Side Bar"), { whenA: ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'), iconA: panelRightIcon, iconB: panelLeftIcon }),
+	CreateToggleLayoutItem(ToggleAuxiliaryBarAction.ID, AuxiliaryBarVisibleContext, localize('secondarySideBar', "Void Side Bar"), { whenA: ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'), iconA: panelRightIcon, iconB: panelLeftIcon }),
 	CreateToggleLayoutItem(TogglePanelAction.ID, PanelVisibleContext, localize('panel', "Panel"), panelIcon),
 	CreateToggleLayoutItem(ToggleStatusbarVisibilityAction.ID, ContextKeyExpr.equals('config.workbench.statusBar.visible', true), localize('statusBar', "Status Bar"), statusBarIcon),
 ]);

src/vs/workbench/browser/layout.ts

@@ -2434,7 +2434,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			comment: 'Information about the layout of the workbench during statup';
 			activityBarVisible: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether or the not the activity bar is visible' };
 			sideBarVisible: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether or the not the primary side bar is visible' };
-			auxiliaryBarVisible: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether or the not the secondary side bar is visible' };
+			auxiliaryBarVisible: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether or the not the Void side bar is visible' };
 			panelVisible: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether or the not the panel is visible' };
 			statusbarVisible: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether or the not the status bar is visible' };
 			sideBarPosition: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the primary side bar is on the left or right' };
@@ -2534,7 +2534,7 @@ const LayoutStateKeys = {
 	// Part Sizing
 	GRID_SIZE: new InitializationStateKey('grid.size', StorageScope.PROFILE, StorageTarget.MACHINE, { width: 800, height: 600 }),
 	SIDEBAR_SIZE: new InitializationStateKey<number>('sideBar.size', StorageScope.PROFILE, StorageTarget.MACHINE, 200),
-	AUXILIARYBAR_SIZE: new InitializationStateKey<number>('auxiliaryBar.size', StorageScope.PROFILE, StorageTarget.MACHINE, 200),
+	AUXILIARYBAR_SIZE: new InitializationStateKey<number>('auxiliaryBar.size', StorageScope.PROFILE, StorageTarget.MACHINE, 800), // Void changed this from 200 to 800
 	PANEL_SIZE: new InitializationStateKey<number>('panel.size', StorageScope.PROFILE, StorageTarget.MACHINE, 300),
 
 	PANEL_LAST_NON_MAXIMIZED_HEIGHT: new RuntimeStateKey<number>('panel.lastNonMaximizedHeight', StorageScope.PROFILE, StorageTarget.MACHINE, 300),

src/vs/workbench/browser/media/code-icon.svg

@@ -1 +0,0 @@
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024"><style>.st0{fill:#f6f6f6;fill-opacity:0}.st1{fill:#fff}.st2{fill:#167abf}</style><path class="st0" d="M1024 1024H0V0h1024v1024z"/><path class="st1" d="M1024 85.333v853.333H0V85.333h1024z"/><path class="st2" d="M0 85.333h298.667v853.333H0V85.333zm1024 0v853.333H384V85.333h640zm-554.667 160h341.333v-64H469.333v64zm341.334 533.334H469.333v64h341.333l.001-64zm128-149.334H597.333v64h341.333l.001-64zm0-149.333H597.333v64h341.333l.001-64zm0-149.333H597.333v64h341.333l.001-64z"/></svg>

src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts

@@ -26,7 +26,7 @@ const auxiliaryBarLeftOffIcon = registerIcon('auxiliarybar-left-off-layout-icon'
 export class ToggleAuxiliaryBarAction extends Action2 {
 
 	static readonly ID = 'workbench.action.toggleAuxiliaryBar';
-	static readonly LABEL = localize2('toggleAuxiliaryBar', "Toggle Secondary Side Bar Visibility");
+	static readonly LABEL = localize2('toggleAuxiliaryBar', "Toggle Void Side Bar Visibility");
 
 	constructor() {
 		super({
@@ -34,7 +34,7 @@ export class ToggleAuxiliaryBarAction extends Action2 {
 			title: ToggleAuxiliaryBarAction.LABEL,
 			toggled: {
 				condition: AuxiliaryBarVisibleContext,
-				title: localize('secondary sidebar', "Secondary Side Bar"),
+				title: localize('secondary sidebar', "Void Side Bar"),
 				mnemonicTitle: localize({ key: 'secondary sidebar mnemonic', comment: ['&& denotes a mnemonic'] }, "Secondary Si&&de Bar"),
 			},
 
@@ -70,7 +70,7 @@ registerAction2(ToggleAuxiliaryBarAction);
 registerAction2(class FocusAuxiliaryBarAction extends Action2 {
 
 	static readonly ID = 'workbench.action.focusAuxiliaryBar';
-	static readonly LABEL = localize2('focusAuxiliaryBar', "Focus into Secondary Side Bar");
+	static readonly LABEL = localize2('focusAuxiliaryBar', "Focus into Void Side Bar");
 
 	constructor() {
 		super({
@@ -103,7 +103,7 @@ MenuRegistry.appendMenuItems([
 			group: '0_workbench_toggles',
 			command: {
 				id: ToggleAuxiliaryBarAction.ID,
-				title: localize('toggleSecondarySideBar', "Toggle Secondary Side Bar"),
+				title: localize('toggleSecondarySideBar', "Toggle Void Side Bar"),
 				toggled: { condition: AuxiliaryBarVisibleContext, icon: auxiliaryBarLeftIcon },
 				icon: auxiliaryBarLeftOffIcon,
 			},
@@ -116,7 +116,7 @@ MenuRegistry.appendMenuItems([
 			group: '0_workbench_toggles',
 			command: {
 				id: ToggleAuxiliaryBarAction.ID,
-				title: localize('toggleSecondarySideBar', "Toggle Secondary Side Bar"),
+				title: localize('toggleSecondarySideBar', "Toggle Void Side Bar"),
 				toggled: { condition: AuxiliaryBarVisibleContext, icon: auxiliaryBarRightIcon },
 				icon: auxiliaryBarRightOffIcon,
 			},
@@ -129,7 +129,7 @@ MenuRegistry.appendMenuItems([
 			group: '3_workbench_layout_move',
 			command: {
 				id: ToggleAuxiliaryBarAction.ID,
-				title: localize2('hideAuxiliaryBar', 'Hide Secondary Side Bar'),
+				title: localize2('hideAuxiliaryBar', 'Hide Void Side Bar'),
 			},
 			when: ContextKeyExpr.and(AuxiliaryBarVisibleContext, ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.AuxiliaryBar))),
 			order: 2

src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts

@@ -45,7 +45,7 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
 	static readonly viewContainersWorkspaceStateKey = 'workbench.auxiliarybar.viewContainersWorkspaceState';
 
 	// Use the side bar dimensions
-	override readonly minimumWidth: number = 170;
+	override readonly minimumWidth: number = 230; // Void changed this (was 170)
 	override readonly maximumWidth: number = Number.POSITIVE_INFINITY;
 	override readonly minimumHeight: number = 0;
 	override readonly maximumHeight: number = Number.POSITIVE_INFINITY;
@@ -195,11 +195,13 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
 		const positionActions: IAction[] = [];
 		createAndFillInContextMenuActions(activityBarPositionMenu, { primary: [], secondary: positionActions });
 
+
+		// appears when right click
 		actions.push(...[
 			new Separator(),
 			new SubmenuAction('workbench.action.panel.position', localize('activity bar position', "Activity Bar Position"), positionActions),
-			toAction({ id: ToggleSidebarPositionAction.ID, label: currentPositionRight ? localize('move second side bar left', "Move Secondary Side Bar Left") : localize('move second side bar right', "Move Secondary Side Bar Right"), run: () => this.commandService.executeCommand(ToggleSidebarPositionAction.ID) }),
-			toAction({ id: ToggleAuxiliaryBarAction.ID, label: localize('hide second side bar', "Hide Secondary Side Bar"), run: () => this.commandService.executeCommand(ToggleAuxiliaryBarAction.ID) })
+			toAction({ id: ToggleSidebarPositionAction.ID, label: currentPositionRight ? localize('move second side bar left', "Move Void Side Bar Left") : localize('move second side bar right', "Move Void Side Bar Right"), run: () => this.commandService.executeCommand(ToggleSidebarPositionAction.ID) }),
+			toAction({ id: ToggleAuxiliaryBarAction.ID, label: localize('hide second side bar', "Hide Void Side Bar"), run: () => this.commandService.executeCommand(ToggleAuxiliaryBarAction.ID) })
 		]);
 	}
 

src/vs/workbench/browser/parts/banner/media/bannerpart.css

@@ -30,7 +30,7 @@
 	background-repeat: no-repeat;
 	background-position: center center;
 	background-size: 16px;
-	background-image: url('../../../../browser/media/code-icon.svg');
+	background-image: url('../../../../browser/media/void-icon-sm.png');
 	width: 16px;
 	padding: 0;
 	margin: 0 6px 0 10px;

src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts

@@ -4,82 +4,112 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { localize } from '../../../../nls.js';
-import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { isMacintosh, isWeb, OS } from '../../../../base/common/platform.js';
+import { Disposable, DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { IWorkspaceContextService, WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { append, clearNode, $, h } from '../../../../base/browser/dom.js';
 import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
-import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
-import { ContextKeyExpr, ContextKeyExpression, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { defaultKeybindingLabelStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { editorForeground, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { ColorScheme } from '../../../../platform/theme/common/theme.js';
+import { isRecentFolder, IWorkspacesService } from '../../../../platform/workspaces/common/workspaces.js';
+// import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { OpenFileFolderAction, OpenFolderAction } from '../../actions/workspaceActions.js';
+import { isMacintosh, isNative, OS } from '../../../../base/common/platform.js';
+import { defaultKeybindingLabelStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { IWindowOpenable } from '../../../../platform/window/common/window.js';
+import { ILabelService, Verbosity } from '../../../../platform/label/common/label.js';
+import { splitRecentLabel } from '../../../../base/common/labels.js';
+import { IHostService } from '../../../services/host/browser/host.js';
+import { VOID_OPEN_SETTINGS_ACTION_ID } from '../../../contrib/void/browser/voidSettingsPane.js';
+import { VOID_CTRL_K_ACTION_ID, VOID_CTRL_L_ACTION_ID } from '../../../contrib/void/browser/actionIDs.js';
+// import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 
 registerColor('editorWatermark.foreground', { dark: transparent(editorForeground, 0.6), light: transparent(editorForeground, 0.68), hcDark: editorForeground, hcLight: editorForeground }, localize('editorLineHighlight', 'Foreground color for the labels in the editor watermark.'));
 
-interface WatermarkEntry {
-	readonly text: string;
-	readonly id: string;
-	readonly mac?: boolean;
-	readonly when?: ContextKeyExpression;
-}
+// interface WatermarkEntry {
+// 	readonly text: string;
+// 	readonly id: string;
+// 	readonly mac?: boolean;
+// 	readonly when?: ContextKeyExpression;
+// }
 
-const showCommands: WatermarkEntry = { text: localize('watermark.showCommands', "Show All Commands"), id: 'workbench.action.showCommands' };
-const quickAccess: WatermarkEntry = { text: localize('watermark.quickAccess', "Go to File"), id: 'workbench.action.quickOpen' };
-const openFileNonMacOnly: WatermarkEntry = { text: localize('watermark.openFile', "Open File"), id: 'workbench.action.files.openFile', mac: false };
-const openFolderNonMacOnly: WatermarkEntry = { text: localize('watermark.openFolder', "Open Folder"), id: 'workbench.action.files.openFolder', mac: false };
-const openFileOrFolderMacOnly: WatermarkEntry = { text: localize('watermark.openFileFolder', "Open File or Folder"), id: 'workbench.action.files.openFileFolder', mac: true };
-const openRecent: WatermarkEntry = { text: localize('watermark.openRecent', "Open Recent"), id: 'workbench.action.openRecent' };
-const newUntitledFileMacOnly: WatermarkEntry = { text: localize('watermark.newUntitledFile', "New Untitled Text File"), id: 'workbench.action.files.newUntitledFile', mac: true };
-const findInFiles: WatermarkEntry = { text: localize('watermark.findInFiles', "Find in Files"), id: 'workbench.action.findInFiles' };
-const toggleTerminal: WatermarkEntry = { text: localize({ key: 'watermark.toggleTerminal', comment: ['toggle is a verb here'] }, "Toggle Terminal"), id: 'workbench.action.terminal.toggleTerminal', when: ContextKeyExpr.equals('terminalProcessSupported', true) };
-const startDebugging: WatermarkEntry = { text: localize('watermark.startDebugging', "Start Debugging"), id: 'workbench.action.debug.start', when: ContextKeyExpr.equals('terminalProcessSupported', true) };
-const toggleFullscreen: WatermarkEntry = { text: localize({ key: 'watermark.toggleFullscreen', comment: ['toggle is a verb here'] }, "Toggle Full Screen"), id: 'workbench.action.toggleFullScreen' };
-const showSettings: WatermarkEntry = { text: localize('watermark.showSettings', "Show Settings"), id: 'workbench.action.openSettings' };
+// const showCommands: WatermarkEntry = { text: localize('watermark.showCommands', "Show All Commands"), id: 'workbench.action.showCommands' };
+// const quickAccess: WatermarkEntry = { text: localize('watermark.quickAccess', "Go to File"), id: 'workbench.action.quickOpen' };
+// const openFileNonMacOnly: WatermarkEntry = { text: localize('watermark.openFile', "Open File"), id: 'workbench.action.files.openFile', mac: false };
+// const openFolderNonMacOnly: WatermarkEntry = { text: localize('watermark.openFolder', "Open Folder"), id: 'workbench.action.files.openFolder', mac: false };
+// const openFileOrFolderMacOnly: WatermarkEntry = { text: localize('watermark.openFileFolder', "Open File or Folder"), id: 'workbench.action.files.openFileFolder', mac: true };
+// const openRecent: WatermarkEntry = { text: localize('watermark.openRecent', "Open Recent"), id: 'workbench.action.openRecent' };
+// const newUntitledFileMacOnly: WatermarkEntry = { text: localize('watermark.newUntitledFile', "New Untitled Text File"), id: 'workbench.action.files.newUntitledFile', mac: true };
+// const findInFiles: WatermarkEntry = { text: localize('watermark.findInFiles', "Find in Files"), id: 'workbench.action.findInFiles' };
+// const toggleTerminal: WatermarkEntry = { text: localize({ key: 'watermark.toggleTerminal', comment: ['toggle is a verb here'] }, "Toggle Terminal"), id: 'workbench.action.terminal.toggleTerminal', when: ContextKeyExpr.equals('terminalProcessSupported', true) };
+// const startDebugging: WatermarkEntry = { text: localize('watermark.startDebugging', "Start Debugging"), id: 'workbench.action.debug.start', when: ContextKeyExpr.equals('terminalProcessSupported', true) };
+// const toggleFullscreen: WatermarkEntry = { text: localize({ key: 'watermark.toggleFullscreen', comment: ['toggle is a verb here'] }, "Toggle Full Screen"), id: 'workbench.action.toggleFullScreen' };
+// const showSettings: WatermarkEntry = { text: localize('watermark.showSettings', "Show Settings"), id: 'workbench.action.openSettings' };
 
-const noFolderEntries = [
-	showCommands,
-	openFileNonMacOnly,
-	openFolderNonMacOnly,
-	openFileOrFolderMacOnly,
-	openRecent,
-	newUntitledFileMacOnly
-];
+// // shown when Void is emtpty
+// const noFolderEntries = [
+// 	// showCommands,
+// 	openFileNonMacOnly,
+// 	openFolderNonMacOnly,
+// 	openFileOrFolderMacOnly,
+// 	openRecent,
+// 	// newUntitledFileMacOnly
+// ];
 
-const folderEntries = [
-	showCommands,
-	quickAccess,
-	findInFiles,
-	startDebugging,
-	toggleTerminal,
-	toggleFullscreen,
-	showSettings
-];
+// const folderEntries = [
+// 	showCommands,
+// 	// quickAccess,
+// 	// findInFiles,
+// 	// startDebugging,
+// 	// toggleTerminal,
+// 	// toggleFullscreen,
+// 	// showSettings
+// ];
 
 export class EditorGroupWatermark extends Disposable {
 	private readonly shortcuts: HTMLElement;
 	private readonly transientDisposables = this._register(new DisposableStore());
-	private enabled: boolean = false;
+	// private enabled: boolean = false;
 	private workbenchState: WorkbenchState;
-	private keybindingLabels = new Set<KeybindingLabel>();
+	private currentDisposables = new Set<IDisposable>();
 
 	constructor(
 		container: HTMLElement,
 		@IKeybindingService private readonly keybindingService: IKeybindingService,
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
-		@IContextKeyService private readonly contextKeyService: IContextKeyService,
-		@IConfigurationService private readonly configurationService: IConfigurationService
+		// @IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IConfigurationService private readonly configurationService: IConfigurationService,
+		@IThemeService private readonly themeService: IThemeService,
+		@IWorkspacesService private readonly workspacesService: IWorkspacesService,
+		@ICommandService private readonly commandService: ICommandService,
+		@IHostService private readonly hostService: IHostService,
+		@ILabelService private readonly labelService: ILabelService,
 	) {
 		super();
 
 		const elements = h('.editor-group-watermark', [
-			h('.letterpress'),
+			h('.letterpress@icon'),
 			h('.shortcuts@shortcuts'),
 		]);
 
 		append(container, elements.root);
-		this.shortcuts = elements.shortcuts;
+		this.shortcuts = elements.shortcuts; // shortcuts div is modified on render()
+
+		// void icon style
+		const updateTheme = () => {
+			const theme = this.themeService.getColorTheme().type
+			const isDark = theme === ColorScheme.DARK || theme === ColorScheme.HIGH_CONTRAST_DARK
+			elements.icon.style.maxWidth = '220px'
+			elements.icon.style.opacity = '50%'
+			elements.icon.style.filter = isDark ? '' : 'invert(1)' //brightness(.5)
+		}
+		updateTheme()
+		this._register(
+			this.themeService.onDidColorThemeChange(updateTheme)
+		)
 
 		this.registerListeners();
 
@@ -103,56 +133,178 @@ export class EditorGroupWatermark extends Disposable {
 			this.render();
 		}));
 
-		const allEntriesWhenClauses = [...noFolderEntries, ...folderEntries].filter(entry => entry.when !== undefined).map(entry => entry.when!);
-		const allKeys = new Set<string>();
-		allEntriesWhenClauses.forEach(when => when.keys().forEach(key => allKeys.add(key)));
-		this._register(this.contextKeyService.onDidChangeContext(e => {
-			if (e.affectsSome(allKeys)) {
-				this.render();
-			}
-		}));
+		// const allEntriesWhenClauses = [...noFolderEntries, ...folderEntries].filter(entry => entry.when !== undefined).map(entry => entry.when!);
+		// const allKeys = new Set<string>();
+		// allEntriesWhenClauses.forEach(when => when.keys().forEach(key => allKeys.add(key)));
+		// this._register(this.contextKeyService.onDidChangeContext(e => {
+		// 	if (e.affectsSome(allKeys)) {
+		// 		this.render();
+		// 	}
+		// }));
 	}
 
+
+
 	private render(): void {
-		const enabled = this.configurationService.getValue<boolean>('workbench.tips.enabled');
+		// const enabled = this.configurationService.getValue<boolean>('workbench.tips.enabled');
 
-		if (enabled === this.enabled) {
-			return;
-		}
+		// if (enabled === this.enabled) {
+		// 	return;
+		// }
+
+		// this.enabled = enabled;
+
+
+		// if (!enabled) {
+		// 	return;
+		// }
+
+		// const hasFolder = this.workbenchState !== WorkbenchState.EMPTY;
+		// const selected = (hasFolder ? folderEntries : noFolderEntries)
+		// 	.filter(entry => !('when' in entry) || this.contextKeyService.contextMatchesRules(entry.when))
+		// 	.filter(entry => !('mac' in entry) || entry.mac === (isMacintosh && !isWeb))
+		// 	.filter(entry => !!CommandsRegistry.getCommand(entry.id))
+		// 	.filter(entry => !!this.keybindingService.lookupKeybinding(entry.id));
 
-		this.enabled = enabled;
 		this.clear();
+		const voidIconBox = append(this.shortcuts, $('.watermark-box'));
+		const recentsBox = append(this.shortcuts, $('div'));
+		recentsBox.style.display = 'flex'
+		recentsBox.style.flex = 'row'
+		recentsBox.style.justifyContent = 'center'
 
-		if (!enabled) {
-			return;
-		}
 
-		const box = append(this.shortcuts, $('.watermark-box'));
-		const folder = this.workbenchState !== WorkbenchState.EMPTY;
-		const selected = (folder ? folderEntries : noFolderEntries)
-			.filter(entry => !('when' in entry) || this.contextKeyService.contextMatchesRules(entry.when))
-			.filter(entry => !('mac' in entry) || entry.mac === (isMacintosh && !isWeb))
-			.filter(entry => !!CommandsRegistry.getCommand(entry.id))
-			.filter(entry => !!this.keybindingService.lookupKeybinding(entry.id));
+		const update = async () => {
 
-		const update = () => {
-			clearNode(box);
-			this.keybindingLabels.forEach(label => label.dispose());
-			this.keybindingLabels.clear();
+			clearNode(voidIconBox);
+			clearNode(recentsBox);
 
-			for (const entry of selected) {
-				const keys = this.keybindingService.lookupKeybinding(entry.id);
-				if (!keys) {
-					continue;
+			this.currentDisposables.forEach(label => label.dispose());
+			this.currentDisposables.clear();
+
+
+			// Void - if the workbench is empty, show open
+			if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
+
+				// Open a folder
+				const openFolderButton = h('button')
+				openFolderButton.root.classList.add('void-watermark-button')
+				openFolderButton.root.style.display = 'block'
+				openFolderButton.root.style.marginLeft = 'auto'
+				openFolderButton.root.style.marginRight = 'auto'
+				openFolderButton.root.style.marginBottom = '16px'
+				openFolderButton.root.textContent = 'Open a folder'
+				openFolderButton.root.onclick = () => {
+					this.commandService.executeCommand(isMacintosh && isNative ? OpenFileFolderAction.ID : OpenFolderAction.ID)
+					// if (this.contextKeyService.contextMatchesRules(ContextKeyExpr.and(WorkbenchStateContext.isEqualTo('workspace')))) {
+					// 	this.commandService.executeCommand(OpenFolderViaWorkspaceAction.ID);
+					// } else {
+					// 	this.commandService.executeCommand(isMacintosh ? 'workbench.action.files.openFileFolder' : 'workbench.action.files.openFolder');
+					// }
 				}
-				const dl = append(box, $('dl'));
+				voidIconBox.appendChild(openFolderButton.root);
+
+
+				// Recents
+				const recentlyOpened = await this.workspacesService.getRecentlyOpened()
+					.catch(() => ({ files: [], workspaces: [] })).then(w => w.workspaces);
+
+
+				if (recentlyOpened.length !== 0) {
+
+					voidIconBox.append(
+						...recentlyOpened.map((w, i) => {
+
+							let fullPath: string;
+							let windowOpenable: IWindowOpenable;
+							if (isRecentFolder(w)) {
+								windowOpenable = { folderUri: w.folderUri };
+								fullPath = w.label || this.labelService.getWorkspaceLabel(w.folderUri, { verbose: Verbosity.LONG });
+							}
+							else {
+								return null
+								// fullPath = w.label || this.labelService.getWorkspaceLabel(w.workspace, { verbose: Verbosity.LONG });
+								// windowOpenable = { workspaceUri: w.workspace.configPath };
+							}
+
+
+							const { name, parentPath } = splitRecentLabel(fullPath);
+
+							const linkSpan = $('span');
+							linkSpan.classList.add('void-link')
+							linkSpan.style.display = 'flex'
+							linkSpan.style.gap = '4px'
+							linkSpan.style.padding = '8px'
+
+							linkSpan.addEventListener('click', e => {
+								this.hostService.openWindow([windowOpenable], {
+									forceNewWindow: e.ctrlKey || e.metaKey,
+									remoteAuthority: w.remoteAuthority || null // local window if remoteAuthority is not set or can not be deducted from the openable
+								});
+								e.preventDefault();
+								e.stopPropagation();
+							});
+
+							const nameSpan = $('span');
+							nameSpan.innerText = name;
+							nameSpan.title = fullPath;
+							linkSpan.appendChild(nameSpan);
+
+							const dirSpan = $('span');
+							dirSpan.style.paddingLeft = '4px';
+							dirSpan.innerText = parentPath;
+							dirSpan.title = fullPath;
+
+							linkSpan.appendChild(dirSpan);
+
+							return linkSpan
+						}).filter(v => !!v)
+					)
+				}
+
+			}
+			else {
+
+				// show them Void keybindings
+				const keys = this.keybindingService.lookupKeybinding(VOID_CTRL_L_ACTION_ID);
+				const dl = append(voidIconBox, $('dl'));
 				const dt = append(dl, $('dt'));
-				dt.textContent = entry.text;
+				dt.textContent = 'Chat'
 				const dd = append(dl, $('dd'));
 				const label = new KeybindingLabel(dd, OS, { renderUnboundKeybindings: true, ...defaultKeybindingLabelStyles });
-				label.set(keys);
-				this.keybindingLabels.add(label);
+				if (keys)
+					label.set(keys);
+				this.currentDisposables.add(label);
+
+
+				const keys2 = this.keybindingService.lookupKeybinding(VOID_CTRL_K_ACTION_ID);
+				const dl2 = append(voidIconBox, $('dl'));
+				const dt2 = append(dl2, $('dt'));
+				dt2.textContent = 'Quick Edit'
+				const dd2 = append(dl2, $('dd'));
+				const label2 = new KeybindingLabel(dd2, OS, { renderUnboundKeybindings: true, ...defaultKeybindingLabelStyles });
+				if (keys2)
+					label2.set(keys2);
+				this.currentDisposables.add(label2);
+
+				const keys3 = this.keybindingService.lookupKeybinding('workbench.action.openGlobalKeybindings');
+				const button3 = append(recentsBox, $('button'));
+				button3.textContent = 'Void Settings'
+				button3.style.display = 'block'
+				button3.style.marginLeft = 'auto'
+				button3.style.marginRight = 'auto'
+				button3.classList.add('void-settings-watermark-button')
+
+				const label3 = new KeybindingLabel(button3, OS, { renderUnboundKeybindings: true, ...defaultKeybindingLabelStyles });
+				if (keys3)
+					label3.set(keys3);
+				button3.onclick = () => {
+					this.commandService.executeCommand(VOID_OPEN_SETTINGS_ACTION_ID)
+				}
+				this.currentDisposables.add(label3);
+
 			}
+
 		};
 
 		update();
@@ -167,6 +319,6 @@ export class EditorGroupWatermark extends Disposable {
 	override dispose(): void {
 		super.dispose();
 		this.clear();
-		this.keybindingLabels.forEach(label => label.dispose());
+		this.currentDisposables.forEach(label => label.dispose());
 	}
 }

src/vs/workbench/browser/parts/editor/media/editorgroupview.css

@@ -9,13 +9,15 @@
 	height: 100%;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container.empty  {
-	opacity: 0.5; /* dimmed to indicate inactive state */
+.monaco-workbench .part.editor > .content .editor-group-container.empty {
+	opacity: 0.5;
+	/* dimmed to indicate inactive state */
 }
 
 .monaco-workbench .part.editor > .content .editor-group-container.empty.active,
 .monaco-workbench .part.editor > .content .editor-group-container.empty.dragged-over {
-	opacity: 1; /* indicate active/dragged-over group through undimmed state */
+	opacity: 1;
+	/* indicate active/dragged-over group through undimmed state */
 }
 
 .monaco-workbench .part.editor > .content:not(.empty) .editor-group-container.empty.active:focus {
@@ -24,12 +26,13 @@
 }
 
 .monaco-workbench .part.editor > .content.empty .editor-group-container.empty.active:focus {
-	outline: none; /* never show outline for empty group if it is the last */
+	outline: none;
+	/* never show outline for empty group if it is the last */
 }
 
 /* Watermark & shortcuts */
 
-.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark  {
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark {
 	display: flex;
 	height: 100%;
 	max-width: 290px;
@@ -49,26 +52,27 @@
 	height: calc(100% - 70px);
 }
 
+/* light */
 .monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark > .letterpress {
 	width: 100%;
 	max-height: 100%;
 	aspect-ratio: 1/1;
-	background-image: url('./letterpress-light.svg');
+	background-image: url('./void_cube_noshadow.png');
 	background-size: contain;
 	background-position-x: center;
 	background-repeat: no-repeat;
 }
 
 .monaco-workbench.vs-dark .part.editor > .content .editor-group-container .editor-group-watermark > .letterpress {
-	background-image: url('./letterpress-dark.svg');
+	background-image: url('./void_cube_noshadow.png');
 }
 
 .monaco-workbench.hc-light .part.editor > .content .editor-group-container .editor-group-watermark > .letterpress {
-	background-image: url('./letterpress-hcLight.svg');
+	background-image: url('./void_cube_noshadow.png');
 }
 
 .monaco-workbench.hc-black .part.editor > .content .editor-group-container .editor-group-watermark > .letterpress {
-	background-image: url('./letterpress-hcDark.svg');
+	background-image: url('./void_cube_noshadow.png');
 }
 
 .monaco-workbench .part.editor > .content:not(.empty) .editor-group-container > .editor-group-watermark > .shortcuts,
@@ -109,12 +113,13 @@
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title {
 	position: relative;
-	box-sizing:	border-box;
+	box-sizing: border-box;
 	overflow: hidden;
 }
 
 .monaco-workbench .part.editor > .content .editor-group-container > .title:not(.tabs) {
-	display: flex; /* when tabs are not shown, use flex layout */
+	display: flex;
+	/* when tabs are not shown, use flex layout */
 	flex-wrap: nowrap;
 }
 
@@ -144,7 +149,8 @@
 .monaco-workbench .part.editor > .content .editor-group-container.empty.locked > .editor-group-container-toolbar,
 .monaco-workbench .part.editor > .content:not(.empty) .editor-group-container.empty > .editor-group-container-toolbar,
 .monaco-workbench .part.editor > .content.auxiliary .editor-group-container.empty > .editor-group-container-toolbar {
-	display: block; /* show toolbar when more than one editor group or always when auxiliary or locked */
+	display: block;
+	/* show toolbar when more than one editor group or always when auxiliary or locked */
 }
 
 .monaco-workbench .part.editor > .content .editor-group-container > .editor-group-container-toolbar .actions-container {
@@ -157,7 +163,7 @@
 
 /* Editor */
 
-.monaco-workbench .part.editor > .content .editor-group-container.empty > .editor-container  {
+.monaco-workbench .part.editor > .content .editor-group-container.empty > .editor-container {
 	display: none;
 }
 

src/vs/workbench/browser/parts/panel/panelActions.ts

@@ -342,7 +342,7 @@ registerAction2(class extends Action2 {
 	constructor() {
 		super({
 			id: 'workbench.action.closeAuxiliaryBar',
-			title: localize2('closeSecondarySideBar', 'Hide Secondary Side Bar'),
+			title: localize2('closeSecondarySideBar', 'Hide Void Side Bar'),
 			category: Categories.View,
 			icon: closeIcon,
 			menu: [{
@@ -415,14 +415,16 @@ class MoveViewsBetweenPanelsAction extends Action2 {
 	}
 }
 
-// --- Move Panel Views To Secondary Side Bar
+// --- Move Panel Views To Void Side Bar
+
+// these are just for the command pallette
 
 class MovePanelToSidePanelAction extends MoveViewsBetweenPanelsAction {
 	static readonly ID = 'workbench.action.movePanelToSidePanel';
 	constructor() {
 		super(ViewContainerLocation.Panel, ViewContainerLocation.AuxiliaryBar, {
 			id: MovePanelToSidePanelAction.ID,
-			title: localize2('movePanelToSecondarySideBar', "Move Panel Views To Secondary Side Bar"),
+			title: localize2('movePanelToSecondarySideBar', "Move Panel Views To Void Side Bar"),
 			category: Categories.View,
 			f1: false
 		});
@@ -434,7 +436,7 @@ export class MovePanelToSecondarySideBarAction extends MoveViewsBetweenPanelsAct
 	constructor() {
 		super(ViewContainerLocation.Panel, ViewContainerLocation.AuxiliaryBar, {
 			id: MovePanelToSecondarySideBarAction.ID,
-			title: localize2('movePanelToSecondarySideBar', "Move Panel Views To Secondary Side Bar"),
+			title: localize2('movePanelToSecondarySideBar', "Move Panel Views To Void Side Bar"),
 			category: Categories.View,
 			f1: true
 		});
@@ -452,7 +454,7 @@ class MoveSidePanelToPanelAction extends MoveViewsBetweenPanelsAction {
 	constructor() {
 		super(ViewContainerLocation.AuxiliaryBar, ViewContainerLocation.Panel, {
 			id: MoveSidePanelToPanelAction.ID,
-			title: localize2('moveSidePanelToPanel', "Move Secondary Side Bar Views To Panel"),
+			title: localize2('moveSidePanelToPanel', "Move Side Bar Views To Panel"), // Void - this seemed to have a typo before
 			category: Categories.View,
 			f1: false
 		});
@@ -465,7 +467,7 @@ export class MoveSecondarySideBarToPanelAction extends MoveViewsBetweenPanelsAct
 	constructor() {
 		super(ViewContainerLocation.AuxiliaryBar, ViewContainerLocation.Panel, {
 			id: MoveSecondarySideBarToPanelAction.ID,
-			title: localize2('moveSidePanelToPanel', "Move Secondary Side Bar Views To Panel"),
+			title: localize2('moveSidePanelToPanel', "Move Void Side Bar Views To Panel"),
 			category: Categories.View,
 			f1: true
 		});

src/vs/workbench/browser/parts/titlebar/media/titlebarpart.css

@@ -253,7 +253,7 @@
 }
 
 .monaco-workbench .part.titlebar > .titlebar-container > .titlebar-left > .window-appicon:not(.codicon) {
-	background-image: url('../../../media/code-icon.svg');
+	background-image: url('../../../media/void-icon-sm.png');
 	background-repeat: no-repeat;
 	background-position: center center;
 	background-size: 16px;
@@ -275,7 +275,7 @@
 	height: 8px;
 	z-index: 1;
 	/* on top of home indicator */
-	background-image: url('../../../media/code-icon.svg');
+	background-image: url('../../../media/void-icon-sm.png');
 	background-repeat: no-repeat;
 	background-position: center center;
 	background-size: 8px;

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

@@ -512,7 +512,7 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 				'type': 'string',
 				'enum': ['left', 'right'],
 				'default': 'left',
-				'description': localize('sideBarLocation', "Controls the location of the primary side bar and activity bar. They can either show on the left or right of the workbench. The secondary side bar will show on the opposite side of the workbench.")
+				'description': localize('sideBarLocation', "Controls the location of the primary side bar and activity bar. They can either show on the left or right of the workbench. The Void side bar will show on the opposite side of the workbench.")
 			},
 			'workbench.panel.showLabel': {
 				'type': 'boolean',
@@ -545,12 +545,12 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 				'type': 'string',
 				'enum': ['default', 'top', 'bottom', 'hidden'],
 				'default': 'default',
-				'markdownDescription': localize({ comment: ['This is the description for a setting'], key: 'activityBarLocation' }, "Controls the location of the Activity Bar relative to the Primary and Secondary Side Bars."),
+				'markdownDescription': localize({ comment: ['This is the description for a setting'], key: 'activityBarLocation' }, "Controls the location of the Activity Bar relative to the Primary and Void Side Bars."),
 				'enumDescriptions': [
-					localize('workbench.activityBar.location.default', "Show the Activity Bar on the side of the Primary Side Bar and on top of the Secondary Side Bar."),
-					localize('workbench.activityBar.location.top', "Show the Activity Bar on top of the Primary and Secondary Side Bars."),
-					localize('workbench.activityBar.location.bottom', "Show the Activity Bar at the bottom of the Primary and Secondary Side Bars."),
-					localize('workbench.activityBar.location.hide', "Hide the Activity Bar in the Primary and Secondary Side Bars.")
+					localize('workbench.activityBar.location.default', "Show the Activity Bar on the side of the Primary Side Bar and on top of the Void Side Bar."),
+					localize('workbench.activityBar.location.top', "Show the Activity Bar on top of the Primary and Void Side Bars."),
+					localize('workbench.activityBar.location.bottom', "Show the Activity Bar at the bottom of the Primary and Void Side Bars."),
+					localize('workbench.activityBar.location.hide', "Hide the Activity Bar in the Primary and Void Side Bars.")
 				],
 			},
 			'workbench.activityBar.iconClickBehavior': {
@@ -598,7 +598,7 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 				'description': localize('workbench.hover.delay', "Controls the delay in milliseconds after which the hover is shown for workbench items (ex. some extension provided tree view items). Already visible items may require a refresh before reflecting this setting change."),
 				// Testing has indicated that on Windows and Linux 500 ms matches the native hovers most closely.
 				// On Mac, the delay is 1500.
-				'default': isMacintosh ? 1500 : 500,
+				'default': isMacintosh ? 300 : 300, // <-- Void edited this to 300 : 300 (was 1500 : 500)
 				'minimum': 0
 			},
 			'workbench.reduceMotion': {

src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.ts

@@ -151,7 +151,7 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider<IViewQuic
 		// Viewlets / Panels
 		addPaneComposites(ViewContainerLocation.Sidebar, localize('views', "Side Bar"));
 		addPaneComposites(ViewContainerLocation.Panel, localize('panels', "Panel"));
-		addPaneComposites(ViewContainerLocation.AuxiliaryBar, localize('secondary side bar', "Secondary Side Bar"));
+		addPaneComposites(ViewContainerLocation.AuxiliaryBar, localize('secondary side bar', "Void Side Bar"));
 
 		const addPaneCompositeViews = (location: ViewContainerLocation) => {
 			const paneComposites = this.paneCompositeService.getPaneComposites(location);

src/vs/workbench/contrib/update/browser/media/releasenoteseditor.css

@@ -5,5 +5,5 @@
 
 .file-icons-enabled .show-file-icons .webview-vs_code_release_notes-name-file-icon.file-icon::before {
 	content: ' ';
-	background-image: url('../../../../browser/media/code-icon.svg');
+	background-image: url('../../../../browser/media/void-icon-sm.png');
 }

src/vs/workbench/contrib/void/browser/.gitignore

@@ -1 +0,0 @@
-void-imports/

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

@@ -0,0 +1,6 @@
+// Normally you'd want to put these exports in the files that register them, but if you do that you'll get an import order error if you import them in certain cases.
+// (importing them runs the whole file to get the ID, causing an import error). I guess it's best practice to separate out IDs, pretty annoying...
+
+export const VOID_CTRL_L_ACTION_ID = 'void.ctrlLAction'
+
+export const VOID_CTRL_K_ACTION_ID = 'void.ctrlKAction'

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

@@ -0,0 +1,760 @@
+/*--------------------------------------------------------------------------------------
+ *  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 { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
+import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { ITextModel } from '../../../../editor/common/model.js';
+import { Position } from '../../../../editor/common/core/position.js';
+import { InlineCompletion, InlineCompletionContext } from '../../../../editor/common/languages.js';
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { ILLMMessageService } from '../../../../platform/void/common/llmMessageService.js';
+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';
+
+// The extension this was called from is here - https://github.com/voideditor/void/blob/autocomplete/extensions/void/src/extension/extension.ts
+
+
+/*
+A summary of autotab:
+
+Postprocessing
+-one common problem for all models is outputting unbalanced parentheses
+we solve this by trimming all extra closing parentheses from the generated string
+in future, should make sure parentheses are always balanced
+
+-another problem is completing the middle of a string, eg. "const [x, CURSOR] = useState()"
+we complete up to first matchup character
+but should instead complete the whole line / block (difficult because of parenthesis accuracy)
+
+-too much info is bad. usually we want to show the user 1 line, and have a preloaded response afterwards
+this should happen automatically with caching system
+should break preloaded responses into \n\n chunks
+
+Preprocessing
+- we don't generate if cursor is at end / beginning of a line (no spaces)
+- we generate 1 line if there is text to the right of cursor
+- we generate 1 line if variable declaration
+- (in many cases want to show 1 line but generate multiple)
+
+State
+- cache based on prefix (and do some trimming first)
+- when press tab on one line, should have an immediate followup response
+to do this, show autocompletes before they're fully finished
+- [todo] remove each autotab when accepted
+!- [todo] provide type information
+
+Details
+-generated results are trimmed up to 1 leading/trailing space
+-prefixes are cached up to 1 trailing newline
+-
+*/
+
+class LRUCache<K, V> {
+	public items: Map<K, V>;
+	private keyOrder: K[];
+	private maxSize: number;
+	private disposeCallback?: (value: V, key?: K) => void;
+
+	constructor(maxSize: number, disposeCallback?: (value: V, key?: K) => void) {
+		if (maxSize <= 0) throw new Error('Cache size must be greater than 0');
+
+		this.items = new Map();
+		this.keyOrder = [];
+		this.maxSize = maxSize;
+		this.disposeCallback = disposeCallback;
+	}
+
+	set(key: K, value: V): void {
+		// If key exists, remove it from the order list
+		if (this.items.has(key)) {
+			this.keyOrder = this.keyOrder.filter(k => k !== key);
+		}
+		// If cache is full, remove least recently used item
+		else if (this.items.size >= this.maxSize) {
+			const key = this.keyOrder[0];
+			const value = this.items.get(key);
+
+			// Call dispose callback if it exists
+			if (this.disposeCallback && value !== undefined) {
+				this.disposeCallback(value, key);
+			}
+
+			this.items.delete(key);
+			this.keyOrder.shift();
+		}
+
+		// Add new item
+		this.items.set(key, value);
+		this.keyOrder.push(key);
+	}
+
+	delete(key: K): boolean {
+		const value = this.items.get(key);
+
+		if (value !== undefined) {
+			// Call dispose callback if it exists
+			if (this.disposeCallback) {
+				this.disposeCallback(value, key);
+			}
+
+			this.items.delete(key);
+			this.keyOrder = this.keyOrder.filter(k => k !== key);
+			return true;
+		}
+
+		return false;
+	}
+
+	clear(): void {
+		// Call dispose callback for all items if it exists
+		if (this.disposeCallback) {
+			for (const [key, value] of this.items.entries()) {
+				this.disposeCallback(value, key);
+			}
+		}
+
+		this.items.clear();
+		this.keyOrder = [];
+	}
+
+	get size(): number {
+		return this.items.size;
+	}
+
+	has(key: K): boolean {
+		return this.items.has(key);
+	}
+}
+
+type AutocompletionStatus = 'pending' | 'finished' | 'error';
+type Autocompletion = {
+	id: number,
+	prefix: string,
+	suffix: string,
+	startTime: number,
+	endTime: number | undefined,
+	status: AutocompletionStatus,
+	llmPromise: Promise<string> | undefined,
+	insertText: string,
+	requestId: string | null,
+}
+
+const DEBOUNCE_TIME = 500
+const TIMEOUT_TIME = 60000
+const MAX_CACHE_SIZE = 20
+const MAX_PENDING_REQUESTS = 2
+
+// postprocesses the result
+const postprocessResult = (result: string) => {
+
+	// trim all whitespace except for a single leading/trailing space
+	// return result.trim()
+
+	const hasLeadingSpace = result.startsWith(' ');
+	const hasTrailingSpace = result.endsWith(' ');
+	return (hasLeadingSpace ? ' ' : '')
+		+ result.trim()
+		+ (hasTrailingSpace ? ' ' : '');
+
+}
+
+
+// trims the end of the prefix to improve cache hit rate
+const removeLeftTabsAndTrimEnd = (s: string): string => {
+	const trimmedString = s.trimEnd();
+	const trailingEnd = s.slice(trimmedString.length);
+
+	// keep only a single trailing newline
+	if (trailingEnd.includes('\n')) {
+		s = trimmedString + '\n';
+	}
+
+	s = s.replace(/^\s+/gm, ''); // remove left tabs
+
+	return s;
+}
+
+
+
+function getStringUpToUnbalancedParenthesis(s: string, prefix: string): string {
+
+	const pairs: Record<string, string> = { ')': '(', '}': '{', ']': '[' };
+
+	// process all bracets in prefix
+	let stack: string[] = []
+	const firstOpenIdx = prefix.search(/[[({]/);
+	if (firstOpenIdx !== -1) {
+		const brackets = prefix.slice(firstOpenIdx).split('').filter(c => '()[]{}'.includes(c));
+
+		for (const bracket of brackets) {
+			if (bracket === '(' || bracket === '{' || bracket === '[') {
+				stack.push(bracket);
+			} else {
+				if (stack.length > 0 && stack[stack.length - 1] === pairs[bracket]) {
+					stack.pop();
+				} else {
+					stack.push(bracket);
+				}
+			}
+		}
+	}
+
+	// iterate through each character
+	for (let i = 0; i < s.length; i++) {
+		const char = s[i];
+
+		if (char === '(' || char === '{' || char === '[') { stack.push(char); }
+		else if (char === ')' || char === '}' || char === ']') {
+			if (stack.length === 0 || stack.pop() !== pairs[char]) { return s.substring(0, i); }
+		}
+	}
+	return s;
+}
+
+
+const parenthesisChars = `{}()[]<>\`'"`
+
+// returns the text in the autocompletion to display, assuming the prefix is already matched
+const toInlineCompletions = ({ matchInfo, prefix, suffix, autocompletion, position, debug }: { matchInfo: matchInfo, prefix: string, suffix: string, autocompletion: Autocompletion, position: Position, debug?: boolean }): { insertText: string, range: Range }[] => {
+
+
+	const suffixLines = suffix.split('\n')
+	const prefixLines = prefix.split('\n')
+	const suffixToTheRightOfCursor = suffixLines[0]
+	const prefixToTheLeftOfCursor = prefixLines[prefixLines.length - 1]
+	const generatedMiddle = autocompletion.insertText
+
+	let startIdx = matchInfo.startIdx
+	let endIdx = generatedMiddle.length // exclusive bounds
+
+	// const naiveReturnValue = generatedMiddle.slice(startIdx)
+	// console.log('naiveReturnValue: ', JSON.stringify(naiveReturnValue))
+	// return [{ insertText: naiveReturnValue, }]
+
+	// do postprocessing for better ux
+	// this is a bit hacky but may change a lot
+
+	// if there is space at the start of the completion and user has added it, remove it
+	const charToLeftOfCursor = prefixToTheLeftOfCursor.slice(-1)[0] || ''
+	const userHasAddedASpace = charToLeftOfCursor === ' ' || charToLeftOfCursor === '\t'
+	const rawFirstNonspaceIdx = generatedMiddle.slice(startIdx).search(/[^\t ]/)
+	if (rawFirstNonspaceIdx > -1 && userHasAddedASpace) {
+		const firstNonspaceIdx = rawFirstNonspaceIdx + startIdx;
+		// console.log('p0', startIdx, rawFirstNonspaceIdx)
+		startIdx = Math.max(startIdx, firstNonspaceIdx)
+	}
+
+	// if user is on a blank line and the generation starts with newline(s), remove them
+	const numStartingNewlines = generatedMiddle.slice(startIdx).match(/^\n+/)?.[0].length || 0;
+	if (
+		!prefixToTheLeftOfCursor.trim()
+		&& !suffixToTheRightOfCursor.trim()
+		&& numStartingNewlines > 0
+	) {
+		// console.log('p1', numStartingNewlines)
+		startIdx += numStartingNewlines
+	}
+
+	// if the generated text matches with the suffix on the current line, stop
+	if (suffixToTheRightOfCursor.trim()) { // completing in the middle of a line
+		// complete until there is a match
+		const rawMatchIndex = generatedMiddle.slice(startIdx).lastIndexOf(suffixToTheRightOfCursor.trim()[0])
+		if (rawMatchIndex > -1) {
+			// console.log('p2', rawMatchIndex, startIdx, suffixToTheRightOfCursor.trim()[0], 'AAA', generatedMiddle.slice(startIdx))
+			const matchIdx = rawMatchIndex + startIdx;
+			const matchChar = generatedMiddle[matchIdx]
+			if (parenthesisChars.includes(matchChar)) {
+				endIdx = Math.min(endIdx, matchIdx)
+			}
+		}
+	}
+
+	const restOfLineToGenerate = generatedMiddle.slice(startIdx).split('\n')[0] ?? ''
+	// condition to complete as a single line completion
+	if (
+		prefixToTheLeftOfCursor.trim()
+		&& !suffixToTheRightOfCursor.trim()
+		&& restOfLineToGenerate.trim()
+	) {
+
+		const rawNewlineIdx = generatedMiddle.slice(startIdx).indexOf('\n')
+		if (rawNewlineIdx > -1) {
+			// console.log('p3', startIdx, rawNewlineIdx)
+			const newlineIdx = rawNewlineIdx + startIdx;
+			endIdx = Math.min(endIdx, newlineIdx)
+		}
+	}
+
+	// // if a generated line matches with a suffix line, stop
+	// if (suffixLines.length > 1) {
+	// 	console.log('4')
+	// 	const lines = []
+	// 	for (const generatedLine of generatedLines) {
+	// 		if (suffixLines.slice(0, 10).some(suffixLine =>
+	// 			generatedLine.trim() !== '' && suffixLine.trim() !== ''
+	// 			&& generatedLine.trim().startsWith(suffixLine.trim())
+	// 		)) break;
+	// 		lines.push(generatedLine)
+	// 	}
+	// 	endIdx = lines.join('\n').length // this is hacky, remove or refactor in future
+	// }
+
+	// console.log('pFinal', startIdx, endIdx)
+	let completionStr = generatedMiddle.slice(startIdx, endIdx)
+
+	// filter out unbalanced parentheses
+	completionStr = getStringUpToUnbalancedParenthesis(completionStr, prefix)
+	// console.log('originalCompletionStr: ', JSON.stringify(generatedMiddle.slice(startIdx)))
+	// console.log('finalCompletionStr: ', JSON.stringify(completionStr))
+
+	let rangeToReplace: Range = new Range(position.lineNumber, position.column, position.lineNumber, position.column)
+
+	return [{
+		insertText: completionStr,
+		range: rangeToReplace,
+	}]
+
+}
+
+
+
+
+
+// returns whether this autocompletion is in the cache
+// const doesPrefixMatchAutocompletion = ({ prefix, autocompletion }: { prefix: string, autocompletion: Autocompletion }): boolean => {
+
+// 	const originalPrefix = autocompletion.prefix
+// 	const generatedMiddle = autocompletion.result
+// 	const originalPrefixTrimmed = trimPrefix(originalPrefix)
+// 	const currentPrefixTrimmed = trimPrefix(prefix)
+
+// 	if (currentPrefixTrimmed.length < originalPrefixTrimmed.length) {
+// 		return false
+// 	}
+
+// 	const isMatch = (originalPrefixTrimmed + generatedMiddle).startsWith(currentPrefixTrimmed)
+// 	return isMatch
+
+// }
+
+const getPrefixAndSuffix = (model: ITextModel, position: Position) => {
+
+	const fullText = model.getValue();
+
+	const cursorOffset = model.getOffsetAt(position)
+	const prefix = fullText.substring(0, cursorOffset)
+	const suffix = fullText.substring(cursorOffset)
+
+	return { prefix, suffix }
+
+}
+
+const getIndex = (str: string, line: number, char: number) => {
+	return str.split('\n').slice(0, line).join('\n').length + (line > 0 ? 1 : 0) + char;
+}
+const getLastLine = (s: string): string => {
+	const matches = s.match(/[^\n]*$/)
+	return matches ? matches[0] : ''
+}
+
+type matchInfo = {
+	lineStart: number,
+	character: number,
+	startIdx: number,
+}
+// returns the startIdx of the match if there is a match, or undefined if there is no match
+// all results are wrt `autocompletion.result`
+const getPrefixAutocompletionMatch = ({ prefix, autocompletion }: { prefix: string, autocompletion: Autocompletion }): matchInfo | undefined => {
+
+	const trimmedCurrentPrefix = removeLeftTabsAndTrimEnd(prefix)
+	const trimmedCompletionPrefix = removeLeftTabsAndTrimEnd(autocompletion.prefix)
+	const trimmedCompletionMiddle = removeLeftTabsAndTrimEnd(autocompletion.insertText)
+
+	// console.log('@result: ', JSON.stringify(autocompletion.insertText))
+	// console.log('@trimmedCurrentPrefix: ', JSON.stringify(trimmedCurrentPrefix))
+	// console.log('@trimmedCompletionPrefix: ', JSON.stringify(trimmedCompletionPrefix))
+	// console.log('@trimmedCompletionMiddle: ', JSON.stringify(trimmedCompletionMiddle))
+
+	if (trimmedCurrentPrefix.length < trimmedCompletionPrefix.length) { // user must write text beyond the original prefix at generation time
+		console.log('@undefined1')
+		return undefined
+	}
+
+	if ( // check that completion starts with the prefix
+		!(trimmedCompletionPrefix + trimmedCompletionMiddle)
+			.startsWith(trimmedCurrentPrefix)
+	) {
+		console.log('@undefined2')
+		return undefined
+	}
+
+	// reverse map to find position wrt `autocompletion.result`
+	const lineStart =
+		trimmedCurrentPrefix.split('\n').length -
+		trimmedCompletionPrefix.split('\n').length;
+
+	if (lineStart < 0) {
+		console.log('@undefined3')
+
+		console.error('Error: No line found.');
+		return undefined;
+	}
+	const currentPrefixLine = getLastLine(trimmedCurrentPrefix)
+	const completionPrefixLine = lineStart === 0 ? getLastLine(trimmedCompletionPrefix) : ''
+	const completionMiddleLine = autocompletion.insertText.split('\n')[lineStart]
+	const fullCompletionLine = completionPrefixLine + completionMiddleLine
+
+	// console.log('currentPrefixLine', currentPrefixLine)
+	// console.log('completionPrefixLine', completionPrefixLine)
+	// console.log('completionMiddleLine', completionMiddleLine)
+
+	const charMatchIdx = fullCompletionLine.indexOf(currentPrefixLine)
+	if (charMatchIdx < 0) {
+		console.log('@undefined4', charMatchIdx)
+
+		console.error('Warning: Found character with negative index. This should never happen.')
+		return undefined
+	}
+
+	const character = (charMatchIdx +
+		currentPrefixLine.length
+		- completionPrefixLine.length
+	)
+
+	const startIdx = getIndex(autocompletion.insertText, lineStart, character)
+
+	return {
+		lineStart,
+		character,
+		startIdx,
+	}
+
+
+}
+
+
+
+
+const getCompletionOptions = ({ prefix, suffix }: { prefix: string, suffix: string }) => {
+
+	const prefixLines = prefix.split('\n')
+	const suffixLines = suffix.split('\n')
+
+	const prefixToLeftOfCursor = prefixLines.slice(-1)[0] ?? ''
+	const suffixToRightOfCursor = suffixLines[0] ?? ''
+
+	// default parameters
+	let shouldGenerate = true
+	let stopTokens: string[] = ['\n\n', '\r\n\r\n']
+
+	// specific cases
+	if (suffixToRightOfCursor.trim() !== '') { // typing between something
+		stopTokens = ['\n', '\r\n']
+	}
+
+	// if (prefixToLeftOfCursor.trim() === '' && suffixToRightOfCursor.trim() === '') { // at an empty line
+	// 	stopTokens = ['\n\n', '\r\n\r\n']
+	// }
+
+	if (prefixToLeftOfCursor === '') { // at beginning or end of line
+		shouldGenerate = false
+	}
+
+	return { shouldGenerate, stopTokens }
+
+}
+
+
+
+
+export interface IAutocompleteService {
+	readonly _serviceBrand: undefined;
+}
+
+export const IAutocompleteService = createDecorator<IAutocompleteService>('AutocompleteService');
+
+export class AutocompleteService extends Disposable implements IAutocompleteService {
+	_serviceBrand: undefined;
+
+	private _autocompletionId: number = 0;
+	private _autocompletionsOfDocument: { [docUriStr: string]: LRUCache<number, Autocompletion> } = {}
+
+	private _lastCompletionTime = 0
+	private _lastPrefix: string = ''
+
+	// used internally by vscode
+	// fires after every keystroke and returns the completion to show
+	async _provideInlineCompletionItems(
+		model: ITextModel,
+		position: Position,
+		context: InlineCompletionContext,
+		token: CancellationToken,
+	): Promise<InlineCompletion[]> {
+
+		const disabled = true
+		const testMode = false
+
+		if (disabled) return [];
+
+		const docUriStr = model.uri.toString();
+
+		const { prefix, suffix } = getPrefixAndSuffix(model, position)
+		// initialize cache and other variables
+		// note that whenever an autocompletion is rejected, it is removed from cache
+		if (!this._autocompletionsOfDocument[docUriStr]) {
+			this._autocompletionsOfDocument[docUriStr] = new LRUCache<number, Autocompletion>(
+				MAX_CACHE_SIZE,
+				(autocompletion: Autocompletion) => {
+					if (autocompletion.requestId)
+						this._llmMessageService.abort(autocompletion.requestId)
+				}
+			)
+		}
+		this._lastPrefix = prefix
+
+		// print all pending autocompletions
+		// let _numPending = 0
+		// this._autocompletionsOfDocument[docUriStr].items.forEach((a: Autocompletion) => { if (a.status === 'pending') _numPending += 1 })
+		// console.log('@numPending: ' + _numPending)
+
+		// get autocompletion from cache
+		let cachedAutocompletion: Autocompletion | undefined = undefined
+		let matchInfo: matchInfo | undefined = undefined
+		for (const autocompletion of this._autocompletionsOfDocument[docUriStr].items.values()) {
+			// if the user's change matches up with the generated text
+			matchInfo = getPrefixAutocompletionMatch({ prefix, autocompletion })
+			if (matchInfo !== undefined) {
+				cachedAutocompletion = autocompletion
+				break;
+			}
+		}
+
+		// if there is a cached autocompletion, return it
+		if (cachedAutocompletion && matchInfo) {
+
+			// console.log('id: ' + cachedAutocompletion.id)
+
+			if (cachedAutocompletion.status === 'finished') {
+				// console.log('A1')
+
+				const inlineCompletions = toInlineCompletions({ matchInfo, autocompletion: cachedAutocompletion, prefix, suffix, position, debug: true })
+				return inlineCompletions
+
+			} else if (cachedAutocompletion.status === 'pending') {
+				// console.log('A2')
+
+				try {
+					await cachedAutocompletion.llmPromise;
+					const inlineCompletions = toInlineCompletions({ matchInfo, autocompletion: cachedAutocompletion, prefix, suffix, position })
+					return inlineCompletions
+
+				} catch (e) {
+					this._autocompletionsOfDocument[docUriStr].delete(cachedAutocompletion.id)
+					console.error('Error creating autocompletion (1): ' + e)
+				}
+
+			} else if (cachedAutocompletion.status === 'error') {
+				// console.log('A3')
+			}
+
+			return []
+		}
+
+		// else if no more typing happens, then go forwards with the request
+		// wait DEBOUNCE_TIME for the user to stop typing
+		const thisTime = Date.now()
+		this._lastCompletionTime = thisTime
+		const didTypingHappenDuringDebounce = await new Promise((resolve, reject) =>
+			setTimeout(() => {
+				if (this._lastCompletionTime === thisTime) {
+					resolve(false)
+				} else {
+					resolve(true)
+				}
+			}, DEBOUNCE_TIME)
+		)
+
+		// if more typing happened, then do not go forwards with the request
+		if (didTypingHappenDuringDebounce) {
+			return []
+		}
+
+
+		// if there are too many pending requests, cancel the oldest one
+		let numPending = 0
+		let oldestPending: Autocompletion | undefined = undefined
+		for (const autocompletion of this._autocompletionsOfDocument[docUriStr].items.values()) {
+			if (autocompletion.status === 'pending') {
+				numPending += 1
+				if (oldestPending === undefined) {
+					oldestPending = autocompletion
+				}
+				if (numPending >= MAX_PENDING_REQUESTS) {
+					// cancel the oldest pending request and remove it from cache
+					this._autocompletionsOfDocument[docUriStr].delete(oldestPending.id)
+					break
+				}
+			}
+		}
+
+		const { shouldGenerate, stopTokens: _ } = getCompletionOptions({ prefix, suffix }) // TODO mat
+
+		if (!shouldGenerate) return []
+
+		if (testMode && this._autocompletionId !== 0) { // TODO remove this
+			return []
+		}
+
+		// console.log('B')
+
+		// create a new autocompletion and add it to cache
+		const newAutocompletion: Autocompletion = {
+			id: this._autocompletionId++,
+			prefix: prefix,
+			suffix: suffix,
+			startTime: Date.now(),
+			endTime: undefined,
+			status: 'pending',
+			llmPromise: undefined,
+			insertText: '',
+			requestId: null,
+		}
+
+		// set parameters of `newAutocompletion` appropriately
+		newAutocompletion.llmPromise = new Promise((resolve, reject) => {
+
+			const requestId = this._llmMessageService.sendLLMMessage({
+				logging: { loggingName: 'Autocomplete' },
+				messages: [],
+				onText: async ({ newText, fullText }) => {
+
+					newAutocompletion.insertText = fullText
+
+					// if generation doesn't match the prefix for the first few tokens generated, reject it
+					if (!getPrefixAutocompletionMatch({ prefix: this._lastPrefix, autocompletion: newAutocompletion })) {
+						reject('LLM response did not match user\'s text.')
+					}
+				},
+				onFinalMessage: ({ fullText }) => {
+
+					// newAutocompletion.prefix = prefix
+					// newAutocompletion.suffix = suffix
+					// newAutocompletion.startTime = Date.now()
+					newAutocompletion.endTime = Date.now()
+					// newAutocompletion.abortRef = { current: () => { } }
+					newAutocompletion.status = 'finished'
+					// newAutocompletion.promise = undefined
+					const [text, _] = extractCodeFromRegular({ text: fullText, recentlyAddedTextLen: 0 })
+					newAutocompletion.insertText = postprocessResult(text)
+
+					resolve(newAutocompletion.insertText)
+
+				},
+				onError: ({ message }) => {
+					newAutocompletion.endTime = Date.now()
+					newAutocompletion.status = 'error'
+					reject(message)
+				},
+				useProviderFor: 'Autocomplete',
+				range: { startLineNumber: position.lineNumber, startColumn: position.column, endLineNumber: position.lineNumber, endColumn: position.column },
+			})
+			newAutocompletion.requestId = requestId
+
+			// if the request hasnt resolved in TIMEOUT_TIME seconds, reject it
+			setTimeout(() => {
+				if (newAutocompletion.status === 'pending') {
+					reject('Timeout receiving message to LLM.')
+				}
+			}, TIMEOUT_TIME)
+
+		})
+
+
+
+		// add autocompletion to cache
+		this._autocompletionsOfDocument[docUriStr].set(newAutocompletion.id, newAutocompletion)
+
+		// show autocompletion
+		try {
+			await newAutocompletion.llmPromise
+			// console.log('id: ' + newAutocompletion.id)
+
+			const matchInfo: matchInfo = { startIdx: 0, lineStart: 0, character: 0 }
+			const inlineCompletions = toInlineCompletions({ matchInfo, autocompletion: newAutocompletion, prefix, suffix, position })
+			return inlineCompletions
+
+		} catch (e) {
+			this._autocompletionsOfDocument[docUriStr].delete(newAutocompletion.id)
+			console.error('Error creating autocompletion (2): ' + e)
+			return []
+		}
+
+	}
+
+	constructor(
+		@ILanguageFeaturesService private _langFeatureService: ILanguageFeaturesService,
+		@ILLMMessageService private readonly _llmMessageService: ILLMMessageService,
+		@IEditorService private readonly _editorService: IEditorService,
+		@IModelService private readonly _modelService: IModelService,
+	) {
+		super()
+
+		this._langFeatureService.inlineCompletionsProvider.register('*', {
+			provideInlineCompletions: async (model, position, context, token) => {
+				const items = await this._provideInlineCompletionItems(model, position, context, token)
+
+				// console.log('item: ', items?.[0]?.insertText)
+				return { items: items, }
+			},
+			freeInlineCompletions: (completions) => {
+
+				// get the `docUriStr` and the `position` of the cursor
+				const activePane = this._editorService.activeEditorPane;
+				if (!activePane) return;
+				const control = activePane.getControl();
+				if (!control || !isCodeEditor(control)) return;
+				const position = control.getPosition();
+				if (!position) return;
+				const resource = EditorResourceAccessor.getCanonicalUri(this._editorService.activeEditor);
+				if (!resource) return;
+				const model = this._modelService.getModel(resource)
+				if (!model) return;
+				const docUriStr = resource.toString();
+
+				const { prefix, } = getPrefixAndSuffix(model, position)
+
+				if (!this._autocompletionsOfDocument[docUriStr]) return;
+
+				// go through cached items and remove matching ones
+				// autocompletion.prefix + autocompletion.insertedText ~== insertedText
+				completions.items.forEach(item => {
+					this._autocompletionsOfDocument[docUriStr].items.forEach((autocompletion: Autocompletion) => {
+						if (removeLeftTabsAndTrimEnd(prefix)
+							=== removeLeftTabsAndTrimEnd(autocompletion.prefix + autocompletion.insertText)
+						) {
+							this._autocompletionsOfDocument[docUriStr].delete(autocompletion.id);
+						}
+					});
+				});
+
+			},
+		})
+
+
+	}
+
+
+}
+
+
+registerSingleton(IAutocompleteService, AutocompleteService, InstantiationType.Eager);
+
+

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

@@ -0,0 +1,302 @@
+/*--------------------------------------------------------------------------------------
+ *  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 '../../../../platform/void/common/llmMessageService.js';
+import { IModelService } from '../../../../editor/common/services/model.js';
+import { VSReadFile } from './helpers/readFile.js';
+import { chat_prompt, chat_systemMessage } from './prompt/prompts.js';
+
+export type CodeSelection = {
+	fileURI: URI;
+	selectionStr: string | null;
+	content: string; // TODO remove this (replace `selectionStr` with `content`)
+	range: IRange;
+}
+
+// if selectionStr is null, it means to use the entire file at send time
+export type CodeStagingSelection = {
+	type: 'Selection',
+	fileURI: URI,
+	selectionStr: string,
+	range: IRange
+} | {
+	type: 'File',
+	fileURI: URI,
+	selectionStr: null,
+	range: null
+}
+
+
+// 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 sent to the llm - allowed to be '', will be replaced with (empty)
+		displayContent: string | null; // content displayed to user  - allowed to be '', will be ignored
+		selections: CodeSelection[] | null; // the user's selection
+	}
+	| {
+		role: 'assistant';
+		content: string | null; // content received from LLM  - allowed to be '', will be replaced with (empty)
+		displayContent: string | null; // content displayed to user (this is the same as content for now) - allowed to be '', will be ignored
+	}
+	| {
+		role: 'system';
+		content: string;
+		displayContent?: undefined;
+	}
+
+// 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[];
+	};
+}
+
+export type ThreadsState = {
+	allThreads: ChatThreads;
+	currentThreadId: string; // intended for internal use only
+	currentStagingSelections: CodeStagingSelection[] | null;
+}
+
+export type ThreadStreamState = {
+	[threadId: string]: undefined | {
+		error?: { message: string, fullError: Error | null };
+		messageSoFar?: string;
+		streamingToken?: string;
+	}
+}
+
+
+const newThreadObject = () => {
+	const now = new Date().toISOString()
+	return {
+		id: new Date().getTime().toString(),
+		createdAt: now,
+		lastModified: now,
+		messages: [],
+	} satisfies ChatThreads[string]
+}
+
+const THREAD_STORAGE_KEY = 'void.chatThreadStorage'
+
+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;
+
+	setStaging(stagingSelection: CodeStagingSelection[] | null): void;
+
+	addUserMessageAndStreamResponse(userMessage: string): 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,
+		@IModelService private readonly _modelService: IModelService,
+		@ILLMMessageService private readonly _llmMessageService: ILLMMessageService,
+	) {
+		super()
+
+		this.state = {
+			allThreads: this._readAllThreads(),
+			currentThreadId: null as unknown as string, // gets set in startNewThread()
+			currentStagingSelections: null,
+		}
+
+		// always be in a thread
+		this.openNewThread()
+	}
+
+
+	private _readAllThreads(): ChatThreads {
+		// PUT ANY VERSION CHANGE FORMAT CONVERSION CODE HERE
+		const threads = this._storageService.get(THREAD_STORAGE_KEY, StorageScope.APPLICATION)
+		return threads ? JSON.parse(threads) : {}
+	}
+
+	private _storeAllThreads(threads: ChatThreads) {
+		this._storageService.store(THREAD_STORAGE_KEY, JSON.stringify(threads), 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 _setStreamState(threadId: string, state: Partial<NonNullable<ThreadStreamState[string]>>) {
+		this.streamState[threadId] = {
+			...this.streamState[threadId],
+			...state
+		}
+		this._onDidChangeStreamState.fire({ threadId })
+	}
+
+
+	// ---------- streaming ----------
+
+	finishStreaming = (threadId: string, content: string, error?: { message: string, fullError: Error | null }) => {
+		// add assistant's message to chat history, and clear selection
+		const assistantHistoryElt: ChatMessage = { role: 'assistant', content, displayContent: content || null }
+		this._addMessageToThread(threadId, assistantHistoryElt)
+		this._setStreamState(threadId, { messageSoFar: undefined, streamingToken: undefined, error })
+	}
+
+	async addUserMessageAndStreamResponse(userMessage: string) {
+		const threadId = this.getCurrentThread().id
+
+		const currSelns = this.state.currentStagingSelections ?? []
+		const selections = !currSelns ? null : await Promise.all(
+			currSelns.map(async (sel) => ({ ...sel, content: await VSReadFile(this._modelService, sel.fileURI) }))
+		).then(
+			(files) => files.filter(file => file.content !== null) as CodeSelection[]
+		)
+
+		// add user's message to chat history
+		const instructions = userMessage
+		const userHistoryElt: ChatMessage = { role: 'user', content: chat_prompt(instructions, selections), displayContent: instructions, selections: selections }
+		this._addMessageToThread(threadId, userHistoryElt)
+
+
+		this._setStreamState(threadId, { error: undefined })
+
+		const llmCancelToken = this._llmMessageService.sendLLMMessage({
+			logging: { loggingName: 'Chat' },
+			messages: [
+				{ role: 'system', content: chat_systemMessage },
+				...this.getCurrentThread().messages.map(m => ({ role: m.role, content: m.content || '(null)' })),
+			],
+			onText: ({ newText, fullText }) => {
+				this._setStreamState(threadId, { messageSoFar: fullText })
+			},
+			onFinalMessage: ({ fullText: content }) => {
+				this.finishStreaming(threadId, content)
+			},
+			onError: (error) => {
+				this.finishStreaming(threadId, this.streamState[threadId]?.messageSoFar ?? '', error)
+			},
+			useProviderFor: 'Ctrl+L',
+
+		})
+		if (llmCancelToken === null) return
+		this._setStreamState(threadId, { streamingToken: llmCancelToken })
+
+	}
+
+	cancelStreaming(threadId: string) {
+		const llmCancelToken = this.streamState[threadId]?.streamingToken
+		if (llmCancelToken !== undefined) this._llmMessageService.abort(llmCancelToken)
+		this.finishStreaming(threadId, this.streamState[threadId]?.messageSoFar ?? '')
+	}
+
+	dismissStreamError(threadId: string): void {
+		this._setStreamState(threadId, { error: undefined })
+	}
+
+
+
+	// ---------- the rest ----------
+
+	getCurrentThread(): ChatThreads[string] {
+		const state = this.state
+		return state.allThreads[state.currentThreadId];
+	}
+
+	switchToThread(threadId: string) {
+		// console.log('threadId', threadId)
+		// console.log('messages', this.state.allThreads[threadId].messages)
+		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)
+	}
+
+
+	setStaging(stagingSelection: CodeStagingSelection[] | null): void {
+		this._setState({ currentStagingSelections: stagingSelection }, true) // this is a hack for now
+	}
+
+}
+
+registerSingleton(IChatThreadService, ChatThreadService, InstantiationType.Eager);
+

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

@@ -1,18 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPLv3 License.
- *--------------------------------------------------------------------------------------------*/
-
-import { OperatingSystem, OS } from '../../../../base/common/platform.js';
-
-export function getCmdKey(): string {
-	if (OS === OperatingSystem.Macintosh) {
-		return '⌘';
-	} else {
-		return 'Ctrl';
-	}
-}
-
-
-
-

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

@@ -0,0 +1,429 @@
+/*--------------------------------------------------------------------------------------
+ *  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 { URI } from '../../../../../base/common/uri.js';
+import { generateUuid } from '../../../../../base/common/uuid.js';
+import { ICodeEditor } from '../../../../../editor/browser/editorBrowser.js';
+import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
+import { InstantiationType, registerSingleton } from '../../../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+
+
+// lets you add a "consistent" item to a Model (aka URI), instead of just to a single editor
+
+type AddItemInputs = { uri: URI; fn: (editor: ICodeEditor) => (() => void); }
+
+export interface IConsistentItemService {
+	readonly _serviceBrand: undefined;
+	getEditorsOnURI(uri: URI): ICodeEditor[];
+	addConsistentItemToURI(inputs: AddItemInputs): string;
+	removeConsistentItemFromURI(consistentItemId: string): void;
+}
+
+export const IConsistentItemService = createDecorator<IConsistentItemService>('ConsistentItemService');
+
+export class ConsistentItemService extends Disposable {
+
+	readonly _serviceBrand: undefined
+
+	// the items that are attached to each URI, completely independent from current state of editors
+	private readonly consistentItemIdsOfURI: Record<string, Set<string> | undefined> = {}
+	private readonly infoOfConsistentItemId: Record<string, AddItemInputs> = {}
+
+
+	// current state of items on each editor, and the fns to call to remove them
+	private readonly itemIdsOfEditorId: Record<string, Set<string> | undefined> = {}
+	private readonly consistentItemIdOfItemId: Record<string, string> = {}
+	private readonly disposeFnOfItemId: Record<string, () => void> = {}
+
+
+	constructor(
+		@ICodeEditorService private readonly _editorService: ICodeEditorService,
+	) {
+		super()
+
+
+		const removeItemsFromEditor = (editor: ICodeEditor) => {
+			const editorId = editor.getId()
+			for (const itemId of this.itemIdsOfEditorId[editorId] ?? [])
+				this._removeItemFromEditor(editor, itemId)
+		}
+
+		// put items on the editor, based on the consistent items for that URI
+		const putItemsOnEditor = (editor: ICodeEditor, uri: URI | null) => {
+			if (!uri) return
+			for (const consistentItemId of this.consistentItemIdsOfURI[uri.fsPath] ?? [])
+				this._putItemOnEditor(editor, consistentItemId)
+		}
+
+
+		// when editor switches tabs (models)
+		const addTabSwitchListeners = (editor: ICodeEditor) => {
+			this._register(
+				editor.onDidChangeModel(e => {
+					removeItemsFromEditor(editor)
+					putItemsOnEditor(editor, e.newModelUrl)
+				})
+			)
+		}
+
+		// when editor is disposed
+		const addDisposeListener = (editor: ICodeEditor) => {
+			this._register(editor.onDidDispose(() => {
+				// anything on the editor has been disposed already
+				for (const itemId of this.itemIdsOfEditorId[editor.getId()] ?? [])
+					delete this.disposeFnOfItemId[itemId]
+			}))
+		}
+
+		const initializeEditor = (editor: ICodeEditor) => {
+			// if (editor.getModel()?.uri.scheme !== 'file') return // THIS BREAKS THINGS
+			addTabSwitchListeners(editor)
+			addDisposeListener(editor)
+			putItemsOnEditor(editor, editor.getModel()?.uri ?? null)
+		}
+
+		// initialize current editors + any new editors
+		for (let editor of this._editorService.listCodeEditors()) initializeEditor(editor)
+		this._register(this._editorService.onCodeEditorAdd(editor => { initializeEditor(editor) }))
+
+		// when an editor is deleted, remove its items
+		this._register(this._editorService.onCodeEditorRemove(editor => {
+			removeItemsFromEditor(editor)
+		}))
+
+	}
+
+
+
+	_putItemOnEditor(editor: ICodeEditor, consistentItemId: string) {
+		const { fn } = this.infoOfConsistentItemId[consistentItemId]
+
+		// add item
+		const dispose = fn(editor)
+
+		const itemId = generateUuid()
+		const editorId = editor.getId()
+
+		if (!(editorId in this.itemIdsOfEditorId))
+			this.itemIdsOfEditorId[editorId] = new Set()
+		this.itemIdsOfEditorId[editorId]!.add(itemId)
+
+
+		this.consistentItemIdOfItemId[itemId] = consistentItemId
+
+		this.disposeFnOfItemId[itemId] = () => {
+			// console.log('calling remove for', itemId)
+			dispose?.()
+		}
+
+	}
+
+
+	_removeItemFromEditor(editor: ICodeEditor, itemId: string) {
+
+		const editorId = editor.getId()
+		this.itemIdsOfEditorId[editorId]?.delete(itemId)
+		if (this.itemIdsOfEditorId[editorId]?.size === 0)
+			delete this.itemIdsOfEditorId[editorId]
+
+		this.disposeFnOfItemId[itemId]?.()
+		delete this.disposeFnOfItemId[itemId]
+
+		delete this.consistentItemIdOfItemId[itemId]
+	}
+
+	getEditorsOnURI(uri: URI) {
+		const editors = this._editorService.listCodeEditors().filter(editor => editor.getModel()?.uri.fsPath === uri.fsPath)
+		return editors
+	}
+
+	consistentItemIdPool = 0
+	addConsistentItemToURI({ uri, fn }: AddItemInputs) {
+		const consistentItemId = (this.consistentItemIdPool++) + ''
+
+		if (!(uri.fsPath in this.consistentItemIdsOfURI))
+			this.consistentItemIdsOfURI[uri.fsPath] = new Set()
+		this.consistentItemIdsOfURI[uri.fsPath]!.add(consistentItemId)
+
+		this.infoOfConsistentItemId[consistentItemId] = { fn, uri }
+
+		const editors = this.getEditorsOnURI(uri)
+		for (const editor of editors)
+			this._putItemOnEditor(editor, consistentItemId)
+
+		return consistentItemId
+	}
+
+
+	removeConsistentItemFromURI(consistentItemId: string) {
+		if (!(consistentItemId in this.infoOfConsistentItemId))
+			return
+
+		const { uri } = this.infoOfConsistentItemId[consistentItemId]
+		const editors = this.getEditorsOnURI(uri)
+
+		for (const editor of editors) {
+			for (const itemId of this.itemIdsOfEditorId[editor.getId()] ?? []) {
+				if (this.consistentItemIdOfItemId[itemId] === consistentItemId)
+					this._removeItemFromEditor(editor, itemId)
+			}
+		}
+
+		// clear
+		this.consistentItemIdsOfURI[uri.fsPath]?.delete(consistentItemId)
+		if (this.consistentItemIdsOfURI[uri.fsPath]?.size === 0)
+			delete this.consistentItemIdsOfURI[uri.fsPath]
+
+		delete this.infoOfConsistentItemId[consistentItemId]
+
+	}
+
+}
+
+registerSingleton(IConsistentItemService, ConsistentItemService, InstantiationType.Eager);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// mostly generated by o1 (almost the same as above, but just for 1 editor)
+export interface IConsistentEditorItemService {
+	readonly _serviceBrand: undefined;
+	addToEditor(editor: ICodeEditor, fn: () => () => void): string;
+	removeFromEditor(itemId: string): void;
+}
+export const IConsistentEditorItemService = createDecorator<IConsistentEditorItemService>('ConsistentEditorItemService');
+
+
+export class ConsistentEditorItemService extends Disposable {
+	readonly _serviceBrand: undefined;
+
+	/**
+	 * For each editorId, we track the set of itemIds that have been "added" to that editor.
+	 * This does *not* necessarily mean they're currently mounted (the user may have switched models).
+	 */
+	private readonly itemIdsByEditorId: Record<string, Set<string>> = {};
+
+	/**
+	 * For each itemId, we store relevant info (the fn to call on the editor, the editorId, the uri, and the current dispose function).
+	 */
+	private readonly itemInfoById: Record<
+		string,
+		{
+			editorId: string;
+			uriFsPath: string;
+			fn: (editor: ICodeEditor) => () => void;
+			disposeFn?: () => void;
+		}
+	> = {};
+
+	constructor(
+		@ICodeEditorService private readonly _editorService: ICodeEditorService,
+	) {
+		super();
+
+		//
+		// Wire up listeners to watch for new editors, removed editors, etc.
+		//
+
+		// Initialize any already-existing editors
+		for (const editor of this._editorService.listCodeEditors()) {
+			this._initializeEditor(editor);
+		}
+
+		// When an editor is added, track it
+		this._register(
+			this._editorService.onCodeEditorAdd((editor) => {
+				this._initializeEditor(editor);
+			})
+		);
+
+		// When an editor is removed, remove all items associated with that editor
+		this._register(
+			this._editorService.onCodeEditorRemove((editor) => {
+				this._removeAllItemsFromEditor(editor);
+			})
+		);
+	}
+
+	/**
+	 * Sets up listeners on the provided editor so that:
+	 * - If the editor changes models, we remove items and re-mount only if the new model matches.
+	 * - If the editor is disposed, we do the needed cleanup.
+	 */
+	private _initializeEditor(editor: ICodeEditor) {
+		const editorId = editor.getId();
+
+		//
+		// Listen for model changes
+		//
+		this._register(
+			editor.onDidChangeModel((e) => {
+				this._removeAllItemsFromEditor(editor);
+				if (!e.newModelUrl) {
+					return;
+				}
+				// Re-mount any items that belong to this editor and match the new URI
+				const itemsForEditor = this.itemIdsByEditorId[editorId];
+				if (itemsForEditor) {
+					for (const itemId of itemsForEditor) {
+						const itemInfo = this.itemInfoById[itemId];
+						if (itemInfo && itemInfo.uriFsPath === e.newModelUrl.fsPath) {
+							this._mountItemOnEditor(editor, itemId);
+						}
+					}
+				}
+			})
+		);
+
+		//
+		// When the editor is disposed, remove all items from it
+		//
+		this._register(
+			editor.onDidDispose(() => {
+				this._removeAllItemsFromEditor(editor);
+			})
+		);
+
+		//
+		// If the editor already has a model (e.g. on initial load), try mounting items
+		//
+		const uri = editor.getModel()?.uri;
+		if (!uri) {
+			return;
+		}
+
+		const itemsForEditor = this.itemIdsByEditorId[editorId];
+		if (itemsForEditor) {
+			for (const itemId of itemsForEditor) {
+				const itemInfo = this.itemInfoById[itemId];
+				if (itemInfo && itemInfo.uriFsPath === uri.fsPath) {
+					this._mountItemOnEditor(editor, itemId);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Actually calls the item-creation function `fn(editor)` and saves the resulting disposeFn
+	 * so we can later clean it up.
+	 */
+	private _mountItemOnEditor(editor: ICodeEditor, itemId: string) {
+		const info = this.itemInfoById[itemId];
+		if (!info) {
+			return;
+		}
+		const { fn } = info;
+		const disposeFn = fn(editor);
+		info.disposeFn = disposeFn;
+	}
+
+	/**
+	 * Removes a single item from an editor (calling its `disposeFn` if present).
+	 */
+	private _removeItemFromEditor(editor: ICodeEditor, itemId: string) {
+		const info = this.itemInfoById[itemId];
+		if (info?.disposeFn) {
+			info.disposeFn();
+			info.disposeFn = undefined;
+		}
+	}
+
+	/**
+	 * Removes *all* items from the given editor. Typically called when the editor changes model or is disposed.
+	 */
+	private _removeAllItemsFromEditor(editor: ICodeEditor) {
+		const editorId = editor.getId();
+		const itemsForEditor = this.itemIdsByEditorId[editorId];
+		if (!itemsForEditor) {
+			return;
+		}
+
+		for (const itemId of itemsForEditor) {
+			this._removeItemFromEditor(editor, itemId);
+		}
+	}
+
+	/**
+	 * Public API: Adds an item to an *individual* editor (determined by editor ID),
+	 * but only when that editor is showing the same model (uri.fsPath).
+	 */
+	addToEditor(editor: ICodeEditor, fn: () => () => void): string {
+		const uri = editor.getModel()?.uri
+		if (!uri) {
+			throw new Error('No URI on the provided editor or in AddItemInputs.');
+		}
+
+		const editorId = editor.getId();
+
+		// Create an ID for this item
+		const itemId = generateUuid();
+
+		// Record the info
+		this.itemInfoById[itemId] = {
+			editorId,
+			uriFsPath: uri.fsPath,
+			fn,
+		};
+
+		// Add to the editor's known items
+		if (!this.itemIdsByEditorId[editorId]) {
+			this.itemIdsByEditorId[editorId] = new Set();
+		}
+		this.itemIdsByEditorId[editorId].add(itemId);
+
+		// If the editor's current URI matches, mount it now
+		if (editor.getModel()?.uri.fsPath === uri.fsPath) {
+			this._mountItemOnEditor(editor, itemId);
+		}
+
+		return itemId;
+	}
+
+	/**
+	 * Public API: Removes an item from the *specific* editor. We look up which editor
+	 * had this item and remove it from that editor.
+	 */
+	removeFromEditor(itemId: string): void {
+		const info = this.itemInfoById[itemId];
+		if (!info) {
+			// Nothing to remove
+			return;
+		}
+
+		const { editorId } = info;
+
+		// Find the editor in question
+		const editor = this._editorService.listCodeEditors().find(
+			(ed) => ed.getId() === editorId
+		);
+		if (editor) {
+			// Dispose on that editor
+			this._removeItemFromEditor(editor, itemId);
+		}
+
+		// Clean up references
+		this.itemIdsByEditorId[editorId]?.delete(itemId);
+		delete this.itemInfoById[itemId];
+	}
+}
+
+registerSingleton(IConsistentEditorItemService, ConsistentEditorItemService, InstantiationType.Eager);
+
+

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

@@ -0,0 +1,170 @@
+
+// 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/extractCodeFromResult.ts

@@ -0,0 +1,169 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+class SurroundingsRemover {
+	readonly originalS: string
+	i: number
+	j: number
+
+	// string is s[i...j]
+
+	constructor(s: string) {
+		this.originalS = s
+		this.i = 0
+		this.j = s.length - 1
+	}
+	value() {
+		return this.originalS.substring(this.i, this.j + 1)
+	}
+
+	// returns whether it removed the whole prefix
+	removePrefix = (prefix: string): boolean => {
+		let offset = 0
+		// console.log('prefix', prefix, Math.min(this.j, prefix.length - 1))
+		while (this.i <= this.j && offset <= prefix.length - 1) {
+			if (this.originalS.charAt(this.i) !== prefix.charAt(offset))
+				break
+			offset += 1
+			this.i += 1
+		}
+		return offset === prefix.length
+	}
+
+	// // removes suffix from right to left
+	removeSuffix = (suffix: string): boolean => {
+		// e.g. suffix = <PRE/>, the string is <PRE>hi<P
+		const s = this.value()
+		// for every possible prefix of `suffix`, check if string ends with it
+		for (let len = Math.min(s.length, suffix.length); len >= 1; len -= 1) {
+			if (s.endsWith(suffix.substring(0, len))) { // the end of the string equals a prefix
+				this.j -= len
+				return len === suffix.length
+			}
+		}
+		return false
+	}
+	// removeSuffix = (suffix: string): boolean => {
+	// 	let offset = 0
+
+	// 	while (this.j >= Math.max(this.i, 0)) {
+	// 		if (this.originalS.charAt(this.j) !== suffix.charAt(suffix.length - 1 - offset))
+	// 			break
+	// 		offset += 1
+	// 		this.j -= 1
+	// 	}
+	// 	return offset === suffix.length
+	// }
+
+	removeFromStartUntil = (until: string, alsoRemoveUntilStr: boolean) => {
+		const index = this.originalS.indexOf(until, this.i)
+
+		if (index === -1) {
+			this.i = this.j + 1
+			return false
+		}
+		// console.log('index', index, until.length)
+
+		if (alsoRemoveUntilStr)
+			this.i = index + until.length
+		else
+			this.i = index
+
+		return true
+	}
+
+
+	removeCodeBlock = () => {
+		const pm = this
+		const foundCodeBlock = pm.removePrefix('```')
+		if (!foundCodeBlock) return false
+
+		pm.removeFromStartUntil('\n', true) // language
+
+		const foundCodeBlockEnd = pm.removeSuffix('```')
+		if (!foundCodeBlockEnd) return false
+
+		pm.removeSuffix('\n')
+		return true
+	}
+
+
+	actualRecentlyAdded = (recentlyAddedTextLen: number) => {
+		// aaaaaatextaaaaaa{recentlyAdded}
+		//           i      ^        j
+		//                  |
+		//            recentyAddedIdx
+		const recentlyAddedIdx = this.j - recentlyAddedTextLen + 1
+		return this.originalS.substring(Math.max(this.i, recentlyAddedIdx), this.j + 1)
+	}
+
+
+}
+
+
+
+export const extractCodeFromRegular = ({ text, recentlyAddedTextLen }: { text: string, recentlyAddedTextLen: number }): [string, string] => {
+	// Match either:
+	// 1. ```language\n<code>```
+	// 2. ```<code>```
+
+	const pm = new SurroundingsRemover(text)
+
+	pm.removeCodeBlock()
+
+	const s = pm.value()
+	const actual = pm.actualRecentlyAdded(recentlyAddedTextLen)
+
+	return [s, actual]
+}
+
+
+
+
+
+// Ollama has its own FIM, we should not use this if we use that
+export const extractCodeFromFIM = ({ text, recentlyAddedTextLen, midTag, }: { text: string, recentlyAddedTextLen: number, midTag: string }): [string, string] => {
+
+	/* ------------- summary of the regex -------------
+		[optional ` | `` | ```]
+		(match optional_language_name)
+		[optional strings here]
+		[required <MID> tag]
+		(match the stuff between mid tags)
+		[optional <MID/> tag]
+		[optional ` | `` | ```]
+	*/
+
+	const pm = new SurroundingsRemover(text)
+
+	pm.removeCodeBlock()
+
+	const foundMid = pm.removePrefix(`<${midTag}>`)
+
+	if (foundMid) {
+		pm.removeSuffix(`</${midTag}>`)
+	}
+	const s = pm.value()
+	const actual = pm.actualRecentlyAdded(recentlyAddedTextLen)
+
+	return [s, actual]
+
+
+	// // const regex = /[\s\S]*?(?:`{1,3}\s*([a-zA-Z_]+[\w]*)?[\s\S]*?)?<MID>([\s\S]*?)(?:<\/MID>|`{1,3}|$)/;
+	// const regex = new RegExp(
+	// 	`[\\s\\S]*?(?:\`{1,3}\\s*([a-zA-Z_]+[\\w]*)?[\\s\\S]*?)?<${midTag}>([\\s\\S]*?)(?:</${midTag}>|\`{1,3}|$)`,
+	// 	''
+	// );
+	// const match = text.match(regex);
+	// if (match) {
+	// 	const [_, languageName, codeBetweenMidTags] = match;
+	// 	return [languageName, codeBetweenMidTags] as const
+
+	// } else {
+	// 	return [undefined, extractCodeFromRegular(text)] as const
+	// }
+
+}
+

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

@@ -1,9 +1,9 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPLv3 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
 
-import { diffLines } from './react/out/util/diffLines.js'
+import { diffLines } from '../react/out/diff/index.js'
 
 export type ComputedDiff = {
 	type: 'edit';

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

@@ -0,0 +1,10 @@
+import { URI } from '../../../../../base/common/uri'
+import { EndOfLinePreference } from '../../../../../editor/common/model'
+import { IModelService } from '../../../../../editor/common/services/model.js'
+
+// read files from VSCode
+export const VSReadFile = async (modelService: IModelService, uri: URI): Promise<string | null> => {
+	const model = modelService.getModel(uri)
+	if (!model) return null
+	return model.getValue(EndOfLinePreference.LF)
+}

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

@@ -1,4 +1,9 @@
-.monaco-editor .void-sweepIdxBG {
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+ .monaco-editor .void-sweepIdxBG {
 	background-color: var(--vscode-void-sweepIdxBG);
 }
 
@@ -6,6 +11,10 @@
 	background-color: var(--vscode-void-sweepBG);
 }
 
+.void-highlightBG {
+	background-color: var(--vscode-void-highlightBG);
+}
+
 .void-greenBG {
 	background-color: var(--vscode-void-greenBG);
 }
@@ -13,3 +22,147 @@
 .void-redBG {
 	background-color: var(--vscode-void-redBG);
 }
+
+.void-watermark-button {
+    margin: 8px 0;
+    padding: 8px 20px;
+    background-color: #3b82f6;
+    color: white;
+    border: none;
+    border-radius: 4px;
+    outline: none !important;
+	box-shadow: none !important;
+    cursor: pointer;
+    transition: background-color 0.2s ease;
+}
+.void-watermark-button:hover {
+    background-color: #2563eb;
+}
+.void-watermark-button:active {
+    background-color: #2563eb;
+}
+
+
+
+
+.void-settings-watermark-button {
+    margin: 8px 0;
+    padding: 8px 20px;
+    background-color: var(--vscode-input-background);
+	color: var(--vscode-input-foreground);
+    border: none;
+    border-radius: 4px;
+    outline: none !important;
+	box-shadow: none !important;
+    cursor: pointer;
+    transition: all 0.2s ease;
+}
+.void-settings-watermark-button:hover {
+	filter: brightness(1.1);
+}
+.void-settings-watermark-button:active {
+	filter: brightness(1.1);
+}
+
+
+
+
+.void-link {
+	color: #3b82f6;
+	cursor: pointer;
+	transition: all 0.2s ease;
+}
+.void-link:hover {
+	opacity: 80%;
+}
+
+
+
+
+
+.void-scrollable-element::-webkit-scrollbar,
+.void-scrollable-element *::-webkit-scrollbar {
+    width: 14px !important;
+    height: 14px !important;
+}
+
+.void-scrollable-element::-webkit-scrollbar-track,
+.void-scrollable-element *::-webkit-scrollbar-track {
+    background: transparent !important;
+}
+
+.void-scrollable-element::-webkit-scrollbar-thumb,
+.void-scrollable-element *::-webkit-scrollbar-thumb {
+    background-color: transparent !important;
+    border-radius: 0px !important;
+}
+
+.void-scrollable-element::-webkit-scrollbar-thumb:hover,
+.void-scrollable-element *::-webkit-scrollbar-thumb:hover {
+    background-color: var(--vscode-scrollbarSlider-hoverBackground) !important;
+}
+
+.void-scrollable-element::-webkit-scrollbar-thumb:active,
+.void-scrollable-element *::-webkit-scrollbar-thumb:active {
+    background-color: var(--vscode-scrollbarSlider-activeBackground) !important;
+}
+
+.void-scrollable-element::-webkit-scrollbar-corner,
+.void-scrollable-element *::-webkit-scrollbar-corner {
+    background-color: transparent !important;
+}
+
+.void-scrollable-element.show-scrollbar-0::-webkit-scrollbar-thumb,
+.void-scrollable-element.show-scrollbar-0 *::-webkit-scrollbar-thumb {
+    background-color: color-mix(in srgb, var(--vscode-scrollbarSlider-background) 0%, transparent) !important;
+}
+
+.void-scrollable-element.show-scrollbar-1::-webkit-scrollbar-thumb,
+.void-scrollable-element.show-scrollbar-1 *::-webkit-scrollbar-thumb {
+    background-color: color-mix(in srgb, var(--vscode-scrollbarSlider-background) 10%, transparent) !important;
+}
+
+.void-scrollable-element.show-scrollbar-2::-webkit-scrollbar-thumb,
+.void-scrollable-element.show-scrollbar-2 *::-webkit-scrollbar-thumb {
+    background-color: color-mix(in srgb, var(--vscode-scrollbarSlider-background) 20%, transparent) !important;
+}
+
+.void-scrollable-element.show-scrollbar-3::-webkit-scrollbar-thumb,
+.void-scrollable-element.show-scrollbar-3 *::-webkit-scrollbar-thumb {
+    background-color: color-mix(in srgb, var(--vscode-scrollbarSlider-background) 30%, transparent) !important;
+}
+
+.void-scrollable-element.show-scrollbar-4::-webkit-scrollbar-thumb,
+.void-scrollable-element.show-scrollbar-4 *::-webkit-scrollbar-thumb {
+    background-color: color-mix(in srgb, var(--vscode-scrollbarSlider-background) 40%, transparent) !important;
+}
+
+.void-scrollable-element.show-scrollbar-5::-webkit-scrollbar-thumb,
+.void-scrollable-element.show-scrollbar-5 *::-webkit-scrollbar-thumb {
+    background-color: color-mix(in srgb, var(--vscode-scrollbarSlider-background) 50%, transparent) !important;
+}
+
+.void-scrollable-element.show-scrollbar-6::-webkit-scrollbar-thumb,
+.void-scrollable-element.show-scrollbar-6 *::-webkit-scrollbar-thumb {
+    background-color: color-mix(in srgb, var(--vscode-scrollbarSlider-background) 60%, transparent) !important;
+}
+
+.void-scrollable-element.show-scrollbar-7::-webkit-scrollbar-thumb,
+.void-scrollable-element.show-scrollbar-7 *::-webkit-scrollbar-thumb {
+    background-color: color-mix(in srgb, var(--vscode-scrollbarSlider-background) 70%, transparent) !important;
+}
+
+.void-scrollable-element.show-scrollbar-8::-webkit-scrollbar-thumb,
+.void-scrollable-element.show-scrollbar-8 *::-webkit-scrollbar-thumb {
+    background-color: color-mix(in srgb, var(--vscode-scrollbarSlider-background) 80%, transparent) !important;
+}
+
+.void-scrollable-element.show-scrollbar-9::-webkit-scrollbar-thumb,
+.void-scrollable-element.show-scrollbar-9 *::-webkit-scrollbar-thumb {
+    background-color: color-mix(in srgb, var(--vscode-scrollbarSlider-background) 90%, transparent) !important;
+}
+
+.void-scrollable-element.show-scrollbar-10::-webkit-scrollbar-thumb,
+.void-scrollable-element.show-scrollbar-10 *::-webkit-scrollbar-thumb {
+    background-color: var(--vscode-scrollbarSlider-background) !important;
+}

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

@@ -0,0 +1,652 @@
+/*--------------------------------------------------------------------------------------
+ *  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 { filenameToVscodeLanguage } from '../helpers/detectLanguage.js';
+import { CodeSelection } from '../chatThreadService.js';
+
+export const chat_systemMessage = `\
+You are a coding assistant. You are given a list of relevant files \`files\`, a selection that the user is making \`selection\`, and instructions to follow \`instructions\`.
+
+Please edit the selected file following the user's instructions (or, if appropriate, answer their question instead).
+
+Instructions:
+1. Output the changes to make to the entire file.
+1. Do not re-write the entire file.
+3. Instead, you may use code elision to represent unchanged portions of code. For example, write "existing code..." in code comments.
+4. You must give enough context to apply the change in the correct location.
+5. Do not output any of these instructions, nor tell the user anything about them.
+
+## EXAMPLE
+
+FILES
+selected file \`math.ts\`:
+\`\`\` typescript
+const addNumbers = (a, b) => a + b
+const subtractNumbers = (a, b) => a - b
+const divideNumbers = (a, b) => a / b
+\`\`\`
+
+SELECTION
+\`\`\` typescript
+const subtractNumbers = (a, b) => a - b
+\`\`\`
+
+INSTRUCTIONS
+\`\`\` typescript
+add a function that multiplies numbers below this
+\`\`\`
+
+EXPECTED OUTPUT
+We can add the following code to the file:
+\`\`\` typescript
+// existing code...
+const subtractNumbers = (a, b) => a - b;
+const multiplyNumbers = (a, b) => a * b;
+// existing code...
+\`\`\`
+
+## EXAMPLE
+
+FILES
+selected file \`fib.ts\`:
+\`\`\` typescript
+
+const dfs = (root) => {
+	if (!root) return;
+	console.log(root.val);
+	dfs(root.left);
+	dfs(root.right);
+}
+const fib = (n) => {
+	if (n < 1) return 1
+	return fib(n - 1) + fib(n - 2)
+}
+\`\`\`
+
+SELECTION
+\`\`\` typescript
+	return fib(n - 1) + fib(n - 2)
+\`\`\`
+
+INSTRUCTIONS
+\`\`\` typescript
+memoize results
+\`\`\`
+
+EXPECTED OUTPUT
+To implement memoization in your Fibonacci function, you can use a JavaScript object to store previously computed results. This will help avoid redundant calculations and improve performance. Here's how you can modify your function:
+\`\`\` typescript
+// existing code...
+const fib = (n, memo = {}) => {
+    if (n < 1) return 1;
+    if (memo[n]) return memo[n]; // Check if result is already computed
+    memo[n] = fib(n - 1, memo) + fib(n - 2, memo); // Store result in memo
+    return memo[n];
+}
+\`\`\`
+Explanation:
+Memoization Object: A memo object is used to store the results of Fibonacci calculations for each n.
+Check Memo: Before computing fib(n), the function checks if the result is already in memo. If it is, it returns the stored result.
+Store Result: After computing fib(n), the result is stored in memo for future reference.
+
+## END EXAMPLES\
+`
+
+
+
+const stringifySelections = (selections: CodeSelection[]) => {
+	return selections.map(({ fileURI, content, selectionStr }) =>
+		`\
+File: ${fileURI.fsPath}
+\`\`\` ${filenameToVscodeLanguage(fileURI.fsPath) ?? ''}
+${content // this was the enite file which is foolish
+		}
+\`\`\`${selectionStr === null ? '' : `
+Selection: ${selectionStr}`}
+`).join('\n')
+}
+
+
+export const chat_prompt = (instructions: string, selections: CodeSelection[] | null) => {
+	let str = '';
+	if (selections && selections.length > 0) {
+		str += stringifySelections(selections);
+		str += `Please edit the selected code following these instructions:\n`
+	}
+	str += `${instructions}`;
+	return str;
+};
+
+
+
+
+export const ctrlLStream_systemMessage = `
+You are a coding assistant that applies a diff to a file. You are given the original file \`original_file\`, a diff \`diff\`, and a new file that you are applying the diff to \`new_file\`.
+
+Please finish writing the new file \`new_file\`, according to the diff \`diff\`. You must completely re-write the whole file, using the diff.
+
+Directions:
+1. Continue exactly where the new file \`new_file\` left off.
+2. Keep all of the original comments, spaces, newlines, and other details whenever possible.
+3. Note that \`+\` lines represent additions, \`-\` lines represent removals, and space lines \` \` represent no change.
+
+# Example 1:
+
+ORIGINAL_FILE
+\`Sidebar.tsx\`:
+\`\`\` typescript
+import React from 'react';
+import styles from './Sidebar.module.css';
+
+interface SidebarProps {
+  items: { label: string; href: string }[];
+  onItemSelect?: (label: string) => void;
+  onExtraButtonClick?: () => void;
+}
+
+const Sidebar: React.FC<SidebarProps> = ({ items, onItemSelect, onExtraButtonClick }) => {
+  return (
+    <div className={styles.sidebar}>
+      <ul>
+        {items.map((item, index) => (
+          <li key={index}>
+            <button
+              className={styles.sidebarButton}
+              onClick={() => onItemSelect?.(item.label)}
+            >
+              {item.label}
+            </button>
+          </li>
+        ))}
+      </ul>
+      <button className={styles.extraButton} onClick={onExtraButtonClick}>
+        Extra Action
+      </button>
+    </div>
+  );
+};
+
+export default Sidebar;
+\`\`\`
+
+DIFF
+\`\`\` typescript
+@@ ... @@
+-<div className={styles.sidebar}>
+-<ul>
+-  {items.map((item, index) => (
+-	<li key={index}>
+-	  <button
+-		className={styles.sidebarButton}
+-		onClick={() => onItemSelect?.(item.label)}
+-	  >
+-		{item.label}
+-	  </button>
+-	</li>
+-  ))}
+-</ul>
+-<button className={styles.extraButton} onClick={onExtraButtonClick}>
+-  Extra Action
+-</button>
+-</div>
++<div className={styles.sidebar}>
++<ul>
++  {items.map((item, index) => (
++	<li key={index}>
++	  <div
++		className={styles.sidebarButton}
++		onClick={() => onItemSelect?.(item.label)}
++	  >
++		{item.label}
++	  </div>
++	</li>
++  ))}
++</ul>
++<div className={styles.extraButton} onClick={onExtraButtonClick}>
++  Extra Action
++</div>
++</div>
+\`\`\`
+
+NEW_FILE
+\`\`\` typescript
+import React from 'react';
+import styles from './Sidebar.module.css';
+
+interface SidebarProps {
+  items: { label: string; href: string }[];
+  onItemSelect?: (label: string) => void;
+  onExtraButtonClick?: () => void;
+}
+
+const Sidebar: React.FC<SidebarProps> = ({ items, onItemSelect, onExtraButtonClick }) => {
+  return (
+\`\`\`
+
+COMPLETION
+\`\`\` typescript
+    <div className={styles.sidebar}>
+      <ul>
+        {items.map((item, index) => (
+          <li key={index}>
+            <div
+              className={styles.sidebarButton}
+              onClick={() => onItemSelect?.(item.label)}
+            >
+              {item.label}
+            </div>
+          </li>
+        ))}
+      </ul>
+      <div className={styles.extraButton} onClick={onExtraButtonClick}>
+        Extra Action
+      </div>
+    </div>
+  );
+};
+
+export default Sidebar;\`\`\`
+`
+
+
+
+
+export const ctrlLStream_prompt = ({ originalCode, userMessage, uri }: { originalCode: string, userMessage: string, uri: URI }) => {
+
+	const language = filenameToVscodeLanguage(uri.fsPath) ?? ''
+
+	return `\
+ORIGINAL_CODE
+\`\`\` ${language}
+${originalCode}
+\`\`\`
+
+DIFF
+\`\`\`
+${userMessage}
+\`\`\`
+
+INSTRUCTIONS
+Please finish writing the new file by applying the diff to the original file. Return ONLY the completion of the file, without any explanation.
+`
+}
+
+
+
+export const ctrlKStream_systemMessage = `\
+`
+
+
+export const ctrlKStream_prefixAndSuffix = ({ fullFileStr, startLine, endLine }: { fullFileStr: string, startLine: number, endLine: number }) => {
+
+	const fullFileLines = fullFileStr.split('\n')
+
+	// we can optimize this later
+	const MAX_PREFIX_SUFFIX_CHARS = 20_000
+	/*
+
+	a
+	a
+	a     <-- final i (prefix = a\na\n)
+	a
+	|b    <-- startLine-1 (middle = b\nc\nd\n)   <-- initial i (moves up)
+	c
+	d|    <-- endLine-1                          <-- initial j (moves down)
+	e
+	e     <-- final j (suffix = e\ne\n)
+	e
+	e
+	*/
+
+	let prefix = ''
+	let i = startLine - 1  // 0-indexed exclusive
+	// we'll include fullFileLines[i...(startLine-1)-1].join('\n') in the prefix.
+	while (i !== 0) {
+		const newLine = fullFileLines[i - 1]
+		if (newLine.length + 1 + prefix.length <= MAX_PREFIX_SUFFIX_CHARS) { // +1 to include the \n
+			prefix = `${newLine}\n${prefix}`
+			i -= 1
+		}
+		else break
+	}
+
+	let suffix = ''
+	let j = endLine - 1
+	while (j !== fullFileLines.length - 1) {
+		const newLine = fullFileLines[j + 1]
+		if (newLine.length + 1 + suffix.length <= MAX_PREFIX_SUFFIX_CHARS) { // +1 to include the \n
+			suffix = `${suffix}\n${newLine}`
+			j += 1
+		}
+		else break
+	}
+
+	return { prefix, suffix }
+
+}
+
+
+export type FimTagsType = {
+	preTag: string,
+	sufTag: string,
+	midTag: string
+}
+export const defaultFimTags: FimTagsType = {
+	preTag: 'BEFORE',
+	sufTag: 'AFTER',
+	midTag: 'SELECTION',
+}
+
+export const ctrlKStream_prompt = ({ selection, prefix, suffix, userMessage, fimTags, isOllamaFIM, language }:
+	{
+		selection: string, prefix: string, suffix: string, userMessage: string, fimTags: FimTagsType, language: string,
+		isOllamaFIM: false, // we require this be false for clarity
+	}) => {
+	const { preTag, sufTag, midTag } = fimTags
+
+	// prompt the model artifically on how to do FIM
+	// const preTag = 'BEFORE'
+	// const sufTag = 'AFTER'
+	// const midTag = 'SELECTION'
+	return `\
+The user is selecting this code as their SELECTION:
+\`\`\` ${language}
+<${midTag}>${selection}</${midTag}>
+\`\`\`
+
+The user wants to apply the following INSTRUCTIONS to the SELECTION:
+${userMessage}
+
+Please edit the SELECTION following the user's INSTRUCTIONS, and return the edited selection.
+
+Note that the SELECTION has code that comes before it. This code is indicated with <${preTag}>...before</${preTag}>.
+Note also that the SELECTION has code that comes after it. This code is indicated with <${sufTag}>...after</${sufTag}>.
+
+Instructions:
+1. Your OUTPUT should be a SINGLE PIECE OF CODE of the form <${midTag}>...new_selection</${midTag}>. Do NOT output any text or explanations before or after this.
+2. You may ONLY CHANGE the original SELECTION, and NOT the content in the <${preTag}>...</${preTag}> or <${sufTag}>...</${sufTag}> tags.
+3. Make sure all brackets in the new selection are balanced the same as in the original selection.
+4. Be careful not to duplicate or remove variables, comments, or other syntax by mistake.
+
+Given the code:
+<${preTag}>${prefix}</${preTag}>
+<${sufTag}>${suffix}</${sufTag}>
+
+Return only the completion block of code (of the form \`\`\` ${language}\n <${midTag}>...new_selection</${midTag}>\`\`\`):`
+};
+
+
+
+// export const searchDiffChunkInstructions = `
+// You are a coding assistant that applies a diff to a file. You are given a diff \`diff\`, a list of files \`files\` to apply the diff to, and a selection \`selection\` that you are currently considering in the file.
+
+// Determine whether you should modify ANY PART of the selection \`selection\` following the \`diff\`. Return \`true\` if you should modify any part of the selection, and \`false\` if you should not modify any part of it.
+
+// # Example 1:
+
+// FILES
+// selected file \`Sidebar.tsx\`:
+// \`\`\`
+// import React from 'react';
+// import styles from './Sidebar.module.css';
+
+// interface SidebarProps {
+//   items: { label: string; href: string }[];
+//   onItemSelect?: (label: string) => void;
+//   onExtraButtonClick?: () => void;
+// }
+
+// const Sidebar: React.FC<SidebarProps> = ({ items, onItemSelect, onExtraButtonClick }) => {
+//   return (
+//     <div className={styles.sidebar}>
+//       <ul>
+//         {items.map((item, index) => (
+//           <li key={index}>
+//             <button
+//               className={styles.sidebarButton}
+//               onClick={() => onItemSelect?.(item.label)}
+//             >
+//               {item.label}
+//             </button>
+//           </li>
+//         ))}
+//       </ul>
+//       <button className={styles.extraButton} onClick={onExtraButtonClick}>
+//         Extra Action
+//       </button>
+//     </div>
+//   );
+// };
+
+// export default Sidebar;
+// \`\`\`
+
+// DIFF
+// \`\`\`
+// @@ ... @@
+// -<div className={styles.sidebar}>
+// -<ul>
+// -  {items.map((item, index) => (
+// -	<li key={index}>
+// -	  <button
+// -		className={styles.sidebarButton}
+// -		onClick={() => onItemSelect?.(item.label)}
+// -	  >
+// -		{item.label}
+// -	  </button>
+// -	</li>
+// -  ))}
+// -</ul>
+// -<button className={styles.extraButton} onClick={onExtraButtonClick}>
+// -  Extra Action
+// -</button>
+// -</div>
+// +<div className={styles.sidebar}>
+// +<ul>
+// +  {items.map((item, index) => (
+// +	<li key={index}>
+// +	  <div
+// +		className={styles.sidebarButton}
+// +		onClick={() => onItemSelect?.(item.label)}
+// +	  >
+// +		{item.label}
+// +	  </div>
+// +	</li>
+// +  ))}
+// +</ul>
+// +<div className={styles.extraButton} onClick={onExtraButtonClick}>
+// +  Extra Action
+// +</div>
+// +</div>
+// \`\`\`
+
+// SELECTION
+// \`\`\`
+// import React from 'react';
+// import styles from './Sidebar.module.css';
+
+// interface SidebarProps {
+//   items: { label: string; href: string }[];
+//   onItemSelect?: (label: string) => void;
+//   onExtraButtonClick?: () => void;
+// }
+
+// const Sidebar: React.FC<SidebarProps> = ({ items, onItemSelect, onExtraButtonClick }) => {
+//   return (
+//     <div className={styles.sidebar}>
+//       <ul>
+//         {items.map((item, index) => (
+// \`\`\`
+
+// RESULT
+// The output should be \`true\` because the diff begins on the line with \`<div className={styles.sidebar}>\` and this line is present in the selection.
+
+// OUTPUT
+// \`true\`
+// `
+
+
+
+// export const generateDiffInstructions = `
+// You are a coding assistant. You are given a list of relevant files \`files\`, a selection that the user is making \`selection\`, and instructions to follow \`instructions\`.
+
+// Please edit the selected file following the user's instructions (or, if appropriate, answer their question instead).
+
+// All changes made to files must be outputted in unified diff format.
+// Unified diff format instructions:
+// 1. Each diff must begin with \`\`\`@@ ... @@\`\`\`.
+// 2. Each line must start with a \`+\` or \`-\` or \` \` symbol.
+// 3. Make diffs more than a few lines.
+// 4. Make high-level diffs rather than many one-line diffs.
+
+// Here's an example of unified diff format:
+
+// \`\`\`
+// @@ ... @@
+// -def factorial(n):
+// -    if n == 0:
+// -        return 1
+// -    else:
+// -        return n * factorial(n-1)
+// +def factorial(number):
+// +    if number == 0:
+// +        return 1
+// +    else:
+// +        return number * factorial(number-1)
+// \`\`\`
+
+// Please create high-level diffs where you group edits together if they are near each other, like in the above example. Another way to represent the above example is to make many small line edits. However, this is less preferred, because the edits are not high-level. The edits are close together and should be grouped:
+
+// \`\`\`
+// @@ ... @@ # This is less preferred because edits are close together and should be grouped:
+// -def factorial(n):
+// +def factorial(number):
+// -    if n == 0:
+// +    if number == 0:
+//          return 1
+//      else:
+// -        return n * factorial(n-1)
+// +        return number * factorial(number-1)
+// \`\`\`
+
+// # Example 1:
+
+// FILES
+// selected file \`test.ts\`:
+// \`\`\`
+// x = 1
+
+// {{selection}}
+
+// z = 3
+// \`\`\`
+
+// SELECTION
+// \`\`\`const y = 2\`\`\`
+
+// INSTRUCTIONS
+// \`\`\`y = 3\`\`\`
+
+// EXPECTED RESULT
+
+// We should change the selection from \`\`\`y = 2\`\`\` to \`\`\`y = 3\`\`\`.
+// \`\`\`
+// @@ ... @@
+// -x = 1
+// -
+// -y = 2
+// +x = 1
+// +
+// +y = 3
+// \`\`\`
+
+// # Example 2:
+
+// FILES
+// selected file \`Sidebar.tsx\`:
+// \`\`\`
+// import React from 'react';
+// import styles from './Sidebar.module.css';
+
+// interface SidebarProps {
+//   items: { label: string; href: string }[];
+//   onItemSelect?: (label: string) => void;
+//   onExtraButtonClick?: () => void;
+// }
+
+// const Sidebar: React.FC<SidebarProps> = ({ items, onItemSelect, onExtraButtonClick }) => {
+//   return (
+//     <div className={styles.sidebar}>
+//       <ul>
+//         {items.map((item, index) => (
+//           <li key={index}>
+//              {{selection}}
+//               className={styles.sidebarButton}
+//               onClick={() => onItemSelect?.(item.label)}
+//             >
+//               {item.label}
+//             </button>
+//           </li>
+//         ))}
+//       </ul>
+//       <button className={styles.extraButton} onClick={onExtraButtonClick}>
+//         Extra Action
+//       </button>
+//     </div>
+//   );
+// };
+
+// export default Sidebar;
+// \`\`\`
+
+// SELECTION
+// \`\`\`             <button\`\`\`
+
+// INSTRUCTIONS
+// \`\`\`make all the buttons like this into divs\`\`\`
+
+// EXPECTED OUTPUT
+
+// We should change all the buttons like the one selected into a div component. Here is the change:
+// \`\`\`
+// @@ ... @@
+// -<div className={styles.sidebar}>
+// -<ul>
+// -  {items.map((item, index) => (
+// -	<li key={index}>
+// -	  <button
+// -		className={styles.sidebarButton}
+// -		onClick={() => onItemSelect?.(item.label)}
+// -	  >
+// -		{item.label}
+// -	  </button>
+// -	</li>
+// -  ))}
+// -</ul>
+// -<button className={styles.extraButton} onClick={onExtraButtonClick}>
+// -  Extra Action
+// -</button>
+// -</div>
+// +<div className={styles.sidebar}>
+// +<ul>
+// +  {items.map((item, index) => (
+// +	<li key={index}>
+// +	  <div
+// +		className={styles.sidebarButton}
+// +		onClick={() => onItemSelect?.(item.label)}
+// +	  >
+// +		{item.label}
+// +	  </div>
+// +	</li>
+// +  ))}
+// +</ul>
+// +<div className={styles.extraButton} onClick={onExtraButtonClick}>
+// +  Extra Action
+// +</div>
+// +</div>
+// \`\`\`
+// `;