install openai

.eslintrc.json

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

.gitignore

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

.idx/dev.nix

@@ -1,48 +0,0 @@
-# Created for Void
-# To learn more about how to use Nix to configure your environment
-# see: https://developers.google.com/idx/guides/customize-idx-env
-{pkgs}: {
-  # Which nixpkgs channel to use.
-  channel = "stable-23.11"; # or "unstable"
-  # Use https://search.nixos.org/packages to find packages
-  packages = [
-    pkgs.nodejs_20
-    pkgs.yarn
-    pkgs.nodePackages.pnpm
-    pkgs.bun
-    pkgs.gh
-  ];
-  # Sets environment variables in the workspace
-  env = {};
-  idx = {
-    # Search for the extensions you want on https://open-vsx.org/ and use "publisher.id"
-    extensions = [
-      # "vscodevim.vim"
-    ];
-    workspace = {
-      # Runs when a workspace is first created with this `dev.nix` file
-      onCreate = {
-        npm-install = "npm ci --no-audit --prefer-offline --no-progress --timing";
-        # Open editors for the following files by default, if they exist:
-        default.openFiles = [
-          # Cover all the variations of language, src-dir, router (app/pages)
-          "pages/index.tsx" "pages/index.jsx"
-          "src/pages/index.tsx" "src/pages/index.jsx"
-          "app/page.tsx" "app/page.jsx"
-          "src/app/page.tsx" "src/app/page.jsx"
-        ];
-      };
-      # To run something each time the workspace is (re)started, use the `onStart` hook
-    };
-    # Enable previews and customize configuration
-    previews = {
-      enable = true;
-      previews = {
-        web = {
-          command = ["npm" "run" "dev" "--" "--port" "$PORT" "--hostname" "0.0.0.0"];
-          manager = "web";
-        };
-      };
-    };
-  };
-}

CHANGELOG.md

@@ -1,35 +0,0 @@
-
-
-
-
-
-## 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,62 +4,89 @@ Welcome! 👋 This is the official guide on how to contribute to Void. We want t
 
 There are a few ways to contribute:
 
-- 👨‍💻 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/`.
+- 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))
 
 
+## 1. Building the Extension
 
-## Building the full IDE
+Here's how you can start contributing to the Void extension. This is where you should get started if you're new.
+
+1. Clone the repository:
+
+```
+git clone https://github.com/voideditor/void
+```
+
+2. Open the folder `/extensions/void` in VSCode (open it in a new workspace, _don't_ just cd into it).
+
+3. Install dependencies:
+
+```
+npm install
+```
+
+1. Compile the React files by running `npm run build`. This build command converts all the Tailwind/React entrypoint files into raw .css and .js files in `dist/`.
+
+```
+npm run build
+```
+
+5. Run the extension in a new window by pressing <kbd>F5</kbd>.
+
+This will start a new instance of VSCode with the extension enabled. If this doesn't work, you can press <kbd>Ctrl+Shift+P</kbd>, select "Debug: Start Debugging", and select "VSCode Extension Development".
+
+## 2. Building the full IDE
+
+If you want to work on the full IDE, please follow the steps below. If you have any questions/issues, you can refer to VSCode's full [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute) page. Also feel free to submit an issue or get in touch with us with any build errors.
+
+<!-- TODO say whether you can build each distribution on any Operating System, or if you need to build Windows on Windows, etc -->
 
 ### a. Build Prerequisites - Mac
 
-If you're using a Mac, you need Python and XCode. You probably have these by default.
+If you're using a Mac, make sure you have Python and XCode installed (you probably do by default).
 
 ### b. Build Prerequisites - Windows
 
 If you're using a Windows computer, first get [Visual Studio 2022](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=Community) (recommended) or [VS Build Tools](https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools) (not recommended). If you already have both, you might need to run the next few steps on both of them.
 
+Open the installer for Visual Studio 2022 (or VS Build Tools). This is often automatic.
+
 Go to the "Workloads" tab and select:
 - `Desktop development with C++`
 - `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, run `npm install -g node-gyp`. Then:
+We haven't created prerequisite steps for building on Linux yet, but you can follow [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute).
 
-- 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).
+### Build instructions
 
-### Building Void
+Before building Void, please follow the prerequisite steps above for your operating system. Also, make sure you've already built and compiled the Void extension (or just run `cd ./extensions/void && npm install && npm run build && npm run compile && cd ../..`).
 
-To build Void, open `void/` inside VSCode. Then open your terminal and run:
+To build Void, first open `void/` in VSCode. Then:
 
-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.
+1. Install all dependencies.
 
-#### Building Void from Terminal
+```
+npm install
+```
 
-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:
+2. 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:
 
 ```
 [watch-extensions] [00:37:39] Finished compilation extensions with 0 errors after 19303 ms
@@ -68,61 +95,62 @@ Alternatively, if you want to build Void from the terminal, instead of pressing
 [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. -->
+
+1. 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
 
-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.
+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)`
 
 
-### Mac
-- `npm run gulp vscode-darwin-arm64` - most common (Apple Silicon)
-- `npm run gulp vscode-darwin-x64` (Intel)
+## Roadmap
 
-### Windows
-- `npm run gulp vscode-win32-x64` - most common
-- `npm run gulp vscode-win32-ia32`
+Here are the most important topics on our Roadmap. More ⭐'s = more important. Please refer to our [Issues](https://github.com/voideditor/void/issues) page for the latest issues.
 
-### Linux
-- `npm run gulp vscode-linux-x64` - most common
-- `npm run gulp vscode-linux-arm`
-- `npm run gulp vscode-linux-ia32`
+## ⭐⭐⭐ Make History work well.
 
+When the user submits a response or presses the apply/accept/reject button, we should add these events to the history, allowing the user to undo/redo them. Right now there is unexpected behavior if the user tries to undo or redo their changes.
 
-### Output
+## ⭐⭐⭐ Build Cursor-style quick edits (Ctrl+K).
 
-This will generate a folder outside of `void/`:
-```bash
-workspace/
-├── void/   # Your Void fork
-└── VSCode-darwin-arm64/ # Generated output
-```
+When the user presses Ctrl+K, an input box should appear inline with the code that they were selecting. This is somewhat difficult to do because an extension alone cannot do this, and it requires creating a new component in the IDE. We think you can modify vscode's built-in "codelens" or "zone widget" components, but we are open to alternatives.
 
+## ⭐⭐⭐ Creative.
 
+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.
+
+## ⭐ One-stars.
+
+⭐ Let the user Accept / Reject all Diffs in an entire file via the sidebar.
 
 # 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 Mat or Andrew a message, or start chatting with us in the `#contributing` channel of our [Discord](https://discord.gg/RSNjgaugJs).
+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.
+
 
 
 ## Submitting a Pull Request
 
-- 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 submit a pull request once you've made a change. You don't need to submit an issue.
 
+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:
@@ -146,7 +174,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

@@ -1,26 +0,0 @@
-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,201 +1,21 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+MIT License
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+Copyright (c) 2015 - present Microsoft Corporation
 
-   1. Definitions.
+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:
 
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of 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.
+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.

README.md

@@ -1,39 +1,16 @@
 # Welcome to Void.
 
-<div align="center">
-	<img
-		src="./src/vs/workbench/browser/parts/editor/media/slice_of_void.png"
-	 	alt="Void Welcome"
-		width="300"
-	 	height="300"
-	/>
-</div>
+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.
 
-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: -->
+If you're new, welcome!
 
 ## Contributing
 
-
-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.
+To build and run Void, follow the steps in [`CONTRIBUTING.md`](https://github.com/voideditor/void/blob/main/CONTRIBUTING.md).
 
 ## Reference
 
-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).
+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).
 
 ## Support
-Feel free to reach out in our discord or contact us via email.
+Feel free to reach out in our [Discord](https://discord.gg/RSNjgaugJs) or contact us via email.

SECURITY.md

@@ -0,0 +1,41 @@
+<!-- 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,27 +2,23 @@
 
 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
 
-## Misc
+- [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.
 
-- [Every command](https://code.visualstudio.com/api/references/commands) built-in to VSCode - not used often, but here for reference.
+
+- [Every command](https://code.visualstudio.com/api/references/commands) built-in to VSCode - sometimes useful to reference.
 
 
 ## VSCode's Extension API
 
-Void is no longer an extension, so these links are no longer required, but they might be useful if we ever build an extension again.
+Void is mainly an extension right now, and these links were very useful for us to get set up.
 
 - [Files you need in an extension](https://code.visualstudio.com/api/get-started/extension-anatomy).
 
@@ -32,6 +28,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,5 +1,3 @@
-# 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:
@@ -61,8 +59,6 @@ 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
@@ -70,7 +66,6 @@ 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,7 +4,6 @@
  *  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,8 +3,6 @@
  *  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', [
-            '-replace', // Void changed this to replace
+            '-insert',
             'NSAppleEventsUsageDescription',
             '-string',
-            'An application in Void wants to use AppleScript.',
+            'An application in Visual Studio Code wants to use AppleScript.',
             `${infoPlistPath}`
         ]);
         await (0, cross_spawn_promise_1.spawn)('plutil', [
             '-replace',
             'NSMicrophoneUsageDescription',
             '-string',
-            'An application in Void wants to use the Microphone.',
+            'An application in Visual Studio Code wants to use the Microphone.',
             `${infoPlistPath}`
         ]);
         await (0, cross_spawn_promise_1.spawn)('plutil', [
             '-replace',
             'NSCameraUsageDescription',
             '-string',
-            'An application in Void wants to use the Camera.',
+            'An application in Visual Studio Code 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', [
-			'-replace', // Void changed this to replace
+			'-insert',
 			'NSAppleEventsUsageDescription',
 			'-string',
-			'An application in Void wants to use AppleScript.',
+			'An application in Visual Studio Code wants to use AppleScript.',
 			`${infoPlistPath}`
 		]);
 		await spawn('plutil', [
 			'-replace',
 			'NSMicrophoneUsageDescription',
 			'-string',
-			'An application in Void wants to use the Microphone.',
+			'An application in Visual Studio Code wants to use the Microphone.',
 			`${infoPlistPath}`
 		]);
 		await spawn('plutil', [
 			'-replace',
 			'NSCameraUsageDescription',
 			'-string',
-			'An application in Void wants to use the Camera.',
+			'An application in Visual Studio Code wants to use the Camera.',
 			`${infoPlistPath}`
 		]);
 	}

build/gulpfile.vscode.js

@@ -341,8 +341,6 @@ 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 }))
@@ -427,15 +425,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', // <-- Void icon
-				'resources/win32/code_150x150.png' // <-- Void icon
+				'resources/win32/code_70x70.png',
+				'resources/win32/code_150x150.png'
 			], { base: '.' }));
 		} else if (platform === 'linux') {
-			all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' })); // <-- Void icon
+			all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' }));
 		} else if (platform === 'darwin') {
 			const shortcut = gulp.src('resources/darwin/bin/code.sh')
 				.pipe(replace('@@APPNAME@@', product.applicationName))
-				.pipe(rename('bin/code')); // <-- Void icon
+				.pipe(rename('bin/code'));
 
 			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', // <-- Void icon code.icns
+        iconFile: 'resources/darwin/' + icon.toLowerCase() + '.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', // <-- Void icon
+    winIcon: 'resources/win32/code.ico',
     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', // <-- Void icon code.icns
+		iconFile: 'resources/darwin/' + icon.toLowerCase() + '.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', // <-- Void icon
+	winIcon: 'resources/win32/code.ico',
 	token: process.env['GITHUB_TOKEN'],
 	repo: product.electronRepository || undefined,
 	validateChecksum: true,

build/npm/dirs.js

@@ -7,6 +7,8 @@ const fs = require('fs');
 
 // Complete list of directories where npm should be executed to install node modules
 const dirs = [
+	'extensions/void', // <-- Void
+
 	'',
 	'build',
 	'extensions',
@@ -53,11 +55,6 @@ const dirs = [
 	'test/smoke',
 	'.vscode/extensions/vscode-selfhost-import-aid',
 	'.vscode/extensions/vscode-selfhost-test-provider',
-
-	// Void added these:
-	// 'extensions/void',
-	// 'void-imports',
-
 ];
 
 if (fs.existsSync(`${__dirname}/../../.build/distro/npm`)) {

build/npm/postinstall.js

@@ -139,21 +139,3 @@ for (let dir of dirs) {
 
 cp.execSync('git config pull.rebase merges');
 cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs');
-
-
-// // Void added this (inject void-imports into project):
-// const buildVoidImports = () => {
-// 	console.log('\n\nVoid is injecting void-imports...')
-// 	cp.execSync(`npm install`, { // this goes here, not in postinstall, because we need to
-// 		env: process.env,
-// 		cwd: path.join(__dirname, '..', '..', '/void-imports'),
-// 		stdio: 'inherit'
-// 	});
-// 	cp.execSync(`node build-index.mjs`, {
-// 		env: process.env,
-// 		cwd: path.join(__dirname, '..', '..', '/void-imports'),
-// 		stdio: 'inherit'
-// 	});
-// 	console.log('Done injecting void-imports.')
-// }
-// buildVoidImports()

build/win32/code.iss

@@ -4,7 +4,6 @@
       ? ('; LicenseFile: "' + RepoDir + '\licenses\LICENSE-' + Language + '.rtf"') \
       : '; LicenseFile: "' + RepoDir + '\' + RootLicenseFileName + '"'
 
-
 [Setup]
 AppId={#AppId}
 AppName={#NameLong}
@@ -21,10 +20,8 @@ Compression=lzma
 SolidCompression=yes
 AppMutex={code:GetAppMutex}
 SetupMutex={#AppMutex}setup
-; 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"
+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"
 SetupIconFile={#RepoDir}\resources\win32\code.ico
 UninstallDisplayIcon={app}\{#ExeBasename}.exe
 ChangesEnvironment=true

extensions/void/.eslintrc

@@ -0,0 +1,56 @@
+{
+	"root": true,
+	"parser": "@typescript-eslint/parser",
+	"parserOptions": {
+		"ecmaVersion": 6,
+		"sourceType": "module",
+		"ecmaFeatures": {
+			"jsx": true
+		}
+	},
+	"plugins": [
+		"@typescript-eslint",
+		"react",
+		"react-hooks"
+	],
+	"extends": [
+		"eslint:recommended",
+		"plugin:react/recommended",
+		"plugin:react-hooks/recommended"
+	],
+	"rules": {
+		"@typescript-eslint/naming-convention": [
+			"warn",
+			{
+				"selector": "import",
+				"format": [
+					"camelCase",
+					"PascalCase"
+				]
+			}
+		],
+		"curly": "off",
+		"eqeqeq": "warn",
+		"no-empty": "off",
+		"no-throw-literal": "warn",
+		"semi": "off",
+		"no-unused-vars": "off",
+		"react-hooks/exhaustive-deps": "warn"
+	},
+	"ignorePatterns": [
+		"out",
+		"dist",
+		"**/*.d.ts"
+	],
+	"settings": {
+		"react": {
+			"version": "detect"
+		}
+	},
+	"env": {
+		"browser": true, // enable browser globals linting (window, document, console, etc)
+		"es6": true, // enable ES6 linting
+		"node": true, // enable Node linting (things like Buffer which is used in file reading, etc)
+		"mocha": true // enable Mocha linting
+	}
+}

extensions/void/.gitignore

@@ -0,0 +1,5 @@
+out
+dist
+node_modules
+.vscode-test/
+*.vsix

extensions/void/.vscode-test.mjs

@@ -0,0 +1,5 @@
+import { defineConfig } from '@vscode/test-cli';
+
+export default defineConfig({
+	files: 'out/test/**/*.test.js',
+});

extensions/void/.vscode/extensions.json

@@ -0,0 +1,8 @@
+{
+	// See http://go.microsoft.com/fwlink/?LinkId=827846
+	// for the documentation about the extensions.json format
+	"recommendations": [
+		"dbaeumer.vscode-eslint",
+		"ms-vscode.extension-test-runner"
+	]
+}

extensions/void/.vscode/launch.json

@@ -0,0 +1,22 @@
+// A launch configuration that compiles the extension and then opens it inside a new window
+// Use IntelliSense to learn about possible attributes.
+// Hover to view descriptions of existing attributes.
+// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+{
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"name": "Run Extension",
+			"type": "extensionHost",
+			"request": "launch",
+			"args": [
+				"--extensionDevelopmentPath=${workspaceFolder}",
+                "--enable-proposed-api=void.void",
+			],
+			"outFiles": [
+				"${workspaceFolder}/out/**/*.js"
+			],
+			"preLaunchTask": "${defaultBuildTask}"
+		}
+	]
+}

extensions/void/.vscode/settings.json

@@ -0,0 +1,18 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+	"files.exclude": {
+		"**/.git": true,
+		"**/.svn": true,
+		"**/.hg": true,
+		"**/CVS": true,
+		"**/.DS_Store": true,
+		"**/Thumbs.db": true,
+		"out": false,
+		"**/node_modules": true
+	},
+	"search.exclude": {
+		"out": true // set this to false to include "out" folder in search results
+	},
+	// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
+	"typescript.tsc.autoDetect": "off",
+}

extensions/void/.vscode/tasks.json

@@ -0,0 +1,20 @@
+// See https://go.microsoft.com/fwlink/?LinkId=733558
+// for the documentation about the tasks.json format
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "npm",
+			"script": "watch",
+			"problemMatcher": "$tsc-watch",
+			"isBackground": true,
+			"presentation": {
+				"reveal": "never"
+			},
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			}
+		}
+	]
+}

extensions/void/.vscodeignore

@@ -0,0 +1,11 @@
+.vscode/**
+.vscode-test/**
+src/**
+.gitignore
+.yarnrc
+vsc-extension-quickstart.md
+**/tsconfig.json
+**/.eslintrc.json
+**/*.map
+**/*.ts
+**/.vscode-test.*

extensions/void/README.md

@@ -0,0 +1,11 @@
+Please see the `CONTRIBUTING.md` for information on how to contribute :)!
+
+
+Here's an overview on how the extension works:
+
+- The extension mounts in `extension.ts`.
+
+- The Sidebar's HTML (everything in `sidebar/`) is built in React, and it's rendered by mounting a `<script>` tag - see `SidebarWebviewProvider.ts`.
+
+- Communication between the sidebar script and the extension takes place via API. You can search for "postMessage" to see where API calls happen.
+

extensions/void/README.txt

@@ -1,3 +0,0 @@
-This folder is no longer relevant, since Void is no longer just an extension.
-
-See the new Void code in `src/vs/workbench/contrib/void` (and a few other locations - you can just search "Void").

extensions/void/build/build.js

@@ -0,0 +1,64 @@
+const tailwindcss = require('tailwindcss')
+const autoprefixer = require('autoprefixer')
+const postcss = require('postcss')
+const fs = require('fs')
+
+const convertTailwindToCSS = ({ from, to }) => {
+	console.log('converting ', from, ' --> ', to)
+
+	const original_css_contents = fs.readFileSync(from, 'utf8')
+
+	return postcss([
+		tailwindcss, // this compiles tailwind of all the files specified in tailwind.config.json
+		autoprefixer,
+	])
+		.process(original_css_contents, { from, to })
+		.then(processed_css_contents => { fs.writeFileSync(to, processed_css_contents.css) })
+		.catch(error => {
+			console.error('Error in build-css:', error)
+		})
+}
+
+
+const esbuild = require('esbuild')
+
+const convertTSXtoJS = async ({ from, to }) => {
+	console.log('converting ', from, ' --> ', to)
+
+	return esbuild.build({
+		entryPoints: [from],
+		bundle: true,
+		minify: true,
+		sourcemap: true,
+		outfile: to,
+		format: 'iife', // apparently iife is safe for browsers (safer than cjs)
+		platform: 'browser',
+		external: ['vscode'],
+	}).catch(() => process.exit(1));
+}
+
+(async () => {
+	// convert tsx to js
+	await convertTSXtoJS({
+		from: 'src/webviews/sidebar/index.tsx',
+		to: 'dist/webviews/sidebar/index.js',
+	})
+
+	await convertTSXtoJS({
+		from: 'src/webviews/ctrlk/index.tsx',
+		to: 'dist/webviews/ctrlk/index.js',
+	})
+
+	await convertTSXtoJS({
+		from: 'src/webviews/diffline/index.tsx',
+		to: 'dist/webviews/diffline/index.js',
+	})
+
+	// convert tailwind to css
+	await convertTailwindToCSS({
+		from: 'src/webviews/styles.css',
+		to: 'dist/webviews/styles.css',
+	})
+
+})()
+

extensions/void/package.json

@@ -0,0 +1,158 @@
+{
+  "name": "void",
+  "publisher": "void",
+  "displayName": "Void",
+  "description": "",
+  "version": "0.0.1",
+  "engines": {
+    "vscode": "*"
+  },
+  "categories": [
+    "Other"
+  ],
+  "enabledApiProposals": [
+    "editorInsets"
+  ],
+  "activationEvents": [],
+  "main": "./out/extension/extension.js",
+  "contributes": {
+    "configuration": {
+      "title": "Void",
+      "properties": {}
+    },
+    "commands": [
+      {
+        "command": "void.ctrl+l",
+        "title": "Show Sidebar"
+      },
+      {
+        "command": "void.ctrl+k",
+        "title": "Make Inline Edit"
+      },
+      {
+        "command": "void.acceptDiff",
+        "title": "Approve Diff"
+      },
+      {
+        "command": "void.rejectDiff",
+        "title": "Discard Diff"
+      },
+      {
+        "command": "void.startNewThread",
+        "title": "Start a new chat",
+        "icon": "$(add)"
+      },
+      {
+        "command": "void.toggleThreadSelector",
+        "title": "View past chats",
+        "icon": "$(history)"
+      },
+      {
+        "command": "void.toggleSettings",
+        "title": "Void settings",
+        "icon": "$(settings-gear)"
+      }
+    ],
+    "viewsContainers": {
+      "activitybar": [
+        {
+          "id": "voidViewContainer",
+          "title": "Chat",
+          "icon": "$(hubot)"
+        }
+      ]
+    },
+    "views": {
+      "voidViewContainer": [
+        {
+          "type": "webview",
+          "id": "void.viewnumberone",
+          "name": "Void"
+        }
+      ]
+    },
+    "keybindings": [
+      {
+        "command": "void.ctrl+l",
+        "key": "ctrl+l",
+        "mac": "cmd+l"
+      },
+      {
+        "command": "void.ctrl+k",
+        "key": "ctrl+k",
+        "mac": "cmd+k"
+      }
+    ],
+    "menus": {
+      "view/title": [
+        {
+          "command": "void.startNewThread",
+          "when": "view == 'void.viewnumberone'",
+          "group": "navigation"
+        },
+        {
+          "command": "void.toggleThreadSelector",
+          "when": "view == 'void.viewnumberone'",
+          "group": "navigation"
+        },
+        {
+          "command": "void.toggleSettings",
+          "when": "view == 'void.viewnumberone'",
+          "group": "navigation"
+        }
+      ]
+    }
+  },
+  "scripts": {
+    "vscode:prepublish": "npm run compile",
+    "compile": "tsc -p ./",
+    "watch": "tsc -watch -p ./",
+    "build": "rimraf dist && node build/build.js",
+    "pretest": "tsc -p ./ && eslint src --ext ts",
+    "test": "vscode-test"
+  },
+  "devDependencies": {
+    "@anthropic-ai/sdk": "^0.31.0",
+    "@eslint/js": "^9.9.1",
+    "@google/generative-ai": "^0.21.0",
+    "@monaco-editor/react": "^4.6.0",
+    "@rrweb/types": "^2.0.0-alpha.17",
+    "@types/diff": "^5.2.2",
+    "@types/diff-match-patch": "^1.0.36",
+    "@types/jest": "^29.5.12",
+    "@types/lodash": "^4.17.12",
+    "@types/mocha": "^10.0.8",
+    "@types/node": "^22.5.1",
+    "@types/react": "^18.3.4",
+    "@types/react-dom": "^18.3.0",
+    "@types/react-syntax-highlighter": "^15.5.13",
+    "@types/uuid": "^10.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.3.0",
+    "@typescript-eslint/parser": "^8.3.0",
+    "@vscode/test-cli": "^0.0.10",
+    "@vscode/test-electron": "2.4.1",
+    "autoprefixer": "^10.4.20",
+    "diff-match-patch": "^1.0.5",
+    "esbuild": "^0.23.1",
+    "eslint": "^8.57.0",
+    "eslint-plugin-react": "^7.35.1",
+    "eslint-plugin-react-hooks": "^4.6.2",
+    "globals": "^15.9.0",
+    "lodash": "^4.17.21",
+    "marked": "^14.1.0",
+    "ollama": "^0.5.9",
+    "openai": "^4.70.2",
+    "postcss": "^8.4.41",
+    "posthog-js": "^1.176.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-markdown": "^9.0.1",
+    "react-syntax-highlighter": "^15.6.1",
+    "rimraf": "^6.0.1",
+    "rrweb-snapshot": "^2.0.0-alpha.4",
+    "tailwindcss": "^3.4.10",
+    "typescript": "5.5.4",
+    "typescript-eslint": "^8.3.0",
+    "uuid": "^10.0.0"
+  }
+}

extensions/void/src/common/sendLLMMessage.ts

@@ -0,0 +1,393 @@
+import Anthropic from '@anthropic-ai/sdk';
+import OpenAI from 'openai';
+import { Ollama } from 'ollama/browser'
+import { Content, GoogleGenerativeAI, GoogleGenerativeAIError, GoogleGenerativeAIFetchError } from '@google/generative-ai';
+import { VoidConfig } from '../webviews/common/contextForConfig'
+import { captureEvent } from '../webviews/common/posthog';
+import { ChatMessage } from './shared_types';
+
+export type AbortRef = { current: (() => void) | null }
+
+export type OnText = (newText: string, fullText: string) => void
+
+export type OnFinalMessage = (input: string) => void
+
+export type LLMMessageAnthropic = {
+	role: 'user' | 'assistant';
+	content: string;
+}
+
+export type LLMMessage = {
+	role: 'system' | 'user' | 'assistant';
+	content: string;
+}
+
+type SendLLMMessageFnTypeInternal = (params: {
+	messages: LLMMessage[];
+	onText: OnText;
+	onFinalMessage: OnFinalMessage;
+	onError: (error: string) => void;
+	voidConfig: VoidConfig;
+
+	_setAborter: (aborter: () => void) => void;
+}) => void
+
+type SendLLMMessageFnTypeExternal = (params: {
+	messages: LLMMessage[];
+	onText: OnText;
+	onFinalMessage: (fullText: string) => void;
+	onError: (error: string) => void;
+	voidConfig: VoidConfig | null;
+	abortRef: AbortRef;
+
+	logging: {
+		loggingName: string,
+	};
+}) => void
+
+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
+}
+
+// Anthropic
+const sendAnthropicMsg: SendLLMMessageFnTypeInternal = ({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter }) => {
+
+	const anthropic = new Anthropic({ apiKey: voidConfig.anthropic.apikey, dangerouslyAllowBrowser: true }); // defaults to process.env["ANTHROPIC_API_KEY"]
+
+	// find system messages and concatenate them
+	const systemMessage = messages
+		.filter(msg => msg.role === 'system')
+		.map(msg => msg.content)
+		.join('\n');
+
+	// 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: voidConfig.anthropic.model,
+		max_tokens: parseMaxTokensStr(voidConfig.default.maxTokens)!, // this might be undefined, but it will just throw an error for the user
+	});
+
+
+	// when receive text
+	stream.on('text', (newText, fullText) => {
+		onText(newText, fullText)
+	})
+
+	// when we get the final message on this stream (or when error/fail)
+	stream.on('finalMessage', (claude_response) => {
+		// stringify the response's content
+		const content = claude_response.content.map(c => c.type === 'text' ? c.text : c.type).join('\n');
+		onFinalMessage(content)
+	})
+
+	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('Invalid API key.')
+		}
+		else {
+			onError(error.message)
+		}
+	})
+
+	// TODO need to test this to make sure it works, it might throw an error
+	_setAborter(() => stream.controller.abort())
+
+};
+
+// Gemini
+const sendGeminiMsg: SendLLMMessageFnTypeInternal = async ({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter }) => {
+
+	let fullText = ''
+
+	const genAI = new GoogleGenerativeAI(voidConfig.gemini.apikey);
+	const model = genAI.getGenerativeModel({ model: voidConfig.gemini.model });
+
+	// remove system messages that get sent to Gemini
+	// str of all system messages
+	const systemMessage = messages
+		.filter(msg => msg.role === 'system')
+		.map(msg => msg.content)
+		.join('\n');
+
+	// Convert messages to Gemini format
+	const geminiMessages: Content[] = messages
+		.filter(msg => msg.role !== 'system')
+		.map((msg, i) => ({
+			parts: [{ text: msg.content }],
+			role: msg.role === 'assistant' ? 'model' : 'user'
+		}))
+
+	model.generateContentStream({ contents: geminiMessages, systemInstruction: systemMessage, })
+		.then(async response => {
+			_setAborter(() => response.stream.return(fullText))
+
+			for await (const chunk of response.stream) {
+				const newText = chunk.text();
+				fullText += newText;
+				onText(newText, fullText);
+			}
+			onFinalMessage(fullText);
+		})
+		.catch((error) => {
+			if (error instanceof GoogleGenerativeAIFetchError) {
+				if (error.status === 400) {
+					onError('Invalid API key.');
+				}
+				else {
+					onError(`${error.name}:\n${error.message}`);
+				}
+			}
+			else {
+				onError(error);
+			}
+		})
+}
+
+// OpenAI, OpenRouter, OpenAICompatible
+const sendOpenAIMsg: SendLLMMessageFnTypeInternal = ({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter }) => {
+
+	let fullText = ''
+
+	let openai: OpenAI
+	let options: OpenAI.Chat.Completions.ChatCompletionCreateParamsStreaming
+
+	const maxTokens = parseMaxTokensStr(voidConfig.default.maxTokens)
+
+	if (voidConfig.default.whichApi === 'openAI') {
+		openai = new OpenAI({ apiKey: voidConfig.openAI.apikey, dangerouslyAllowBrowser: true });
+		options = { model: voidConfig.openAI.model, messages: messages, stream: true, max_completion_tokens: maxTokens }
+	}
+	else if (voidConfig.default.whichApi === 'openRouter') {
+		openai = new OpenAI({
+			baseURL: 'https://openrouter.ai/api/v1', apiKey: voidConfig.openRouter.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: voidConfig.openRouter.model, messages: messages, stream: true, max_completion_tokens: maxTokens }
+	}
+	else if (voidConfig.default.whichApi === 'openAICompatible') {
+		openai = new OpenAI({ baseURL: voidConfig.openAICompatible.endpoint, apiKey: voidConfig.openAICompatible.apikey, dangerouslyAllowBrowser: true })
+		options = { model: voidConfig.openAICompatible.model, messages: messages, stream: true, max_completion_tokens: maxTokens }
+	}
+	else {
+		console.error(`sendOpenAIMsg: invalid whichApi: ${voidConfig.default.whichApi}`)
+		throw new Error(`voidConfig.whichAPI was invalid: ${voidConfig.default.whichApi}`)
+	}
+
+	openai.chat.completions
+		.create(options)
+		.then(async response => {
+			_setAborter(() => response.controller.abort())
+			// when receive text
+			for await (const chunk of response) {
+				const newText = chunk.choices[0]?.delta?.content || '';
+				fullText += newText;
+				onText(newText, fullText);
+			}
+			onFinalMessage(fullText);
+		})
+		// when error/fail - this catches errors of both .create() and .then(for await)
+		.catch(error => {
+			if (error instanceof OpenAI.APIError) {
+				if (error.status === 401) {
+					onError('Invalid API key.');
+				}
+				else {
+					onError(`${error.name}:\n${error.message}`);
+				}
+			}
+			else {
+				onError(error);
+			}
+		})
+
+};
+
+// Ollama
+export const sendOllamaMsg: SendLLMMessageFnTypeInternal = ({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter }) => {
+
+	let fullText = ''
+
+	const ollama = new Ollama({ host: voidConfig.ollama.endpoint })
+
+	ollama.chat({
+		model: voidConfig.ollama.model,
+		messages: messages,
+		stream: true,
+		options: { num_predict: parseMaxTokensStr(voidConfig.default.maxTokens) } // this is max_tokens
+	})
+		.then(async stream => {
+			_setAborter(() => stream.abort())
+			// iterate through the stream
+			for await (const chunk of stream) {
+				const newText = chunk.message.content;
+				fullText += newText;
+				onText(newText, fullText);
+			}
+			onFinalMessage(fullText);
+
+		})
+		// when error/fail
+		.catch(error => {
+			onError(error)
+		})
+
+};
+
+// Greptile
+// https://docs.greptile.com/api-reference/query
+// https://docs.greptile.com/quickstart#sample-response-streamed
+
+const sendGreptileMsg: SendLLMMessageFnTypeInternal = ({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter }) => {
+
+	let fullText = ''
+
+	fetch('https://api.greptile.com/v2/query', {
+		method: 'POST',
+		headers: {
+			'Authorization': `Bearer ${voidConfig.greptile.apikey}`,
+			'X-Github-Token': `${voidConfig.greptile.githubPAT}`,
+			'Content-Type': `application/json`,
+		},
+		body: JSON.stringify({
+			messages,
+			stream: true,
+			repositories: [voidConfig.greptile.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']
+
+				// when receive text
+				if (type === 'message') {
+					fullText += message
+					onText(message, fullText)
+				}
+				else if (type === 'sources') {
+					const { filepath, linestart: _, lineend: _2 } = message as { filepath: string; linestart: number | null; lineend: number | null }
+					fullText += filepath
+					onText(filepath, fullText)
+				}
+				// type: 'status' with an empty 'message' means last message
+				else if (type === 'status') {
+					if (!message) {
+						onFinalMessage(fullText)
+					}
+				}
+			}
+
+		})
+		.catch(e => {
+			onError(e)
+		});
+
+}
+
+
+
+
+
+export const sendLLMMessage: SendLLMMessageFnTypeExternal = ({
+	messages,
+	onText: onText_,
+	onFinalMessage: onFinalMessage_,
+	onError: onError_,
+	abortRef: abortRef_,
+	voidConfig,
+	logging: { loggingName }
+}) => {
+	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() }))
+
+	// only captures number of messages and message "shape", no actual code, instructions, prompts, etc
+	const captureChatEvent = (eventId: string, extras?: object) => {
+		captureEvent(eventId, {
+			whichApi: voidConfig.default['whichApi'],
+			numMessages: messages?.length,
+			messagesShape: messages?.map(msg => ({ role: msg.role, length: msg.content.length })),
+			version: '2024-11-02',
+			...extras,
+		})
+	}
+	const submit_time = new Date()
+
+	let _fullTextSoFar = ''
+	let _aborter: (() => void) | null = null
+	let _setAborter = (fn: () => void) => { _aborter = fn }
+	let _didAbort = false
+
+	const onText = (newText: string, fullText: string) => {
+		if (_didAbort) return
+		onText_(newText, fullText)
+		_fullTextSoFar = fullText
+	}
+
+	const onFinalMessage = (fullText: string) => {
+		if (_didAbort) return
+		captureChatEvent(`${loggingName} - Received Full Message`, { messageLength: fullText.length, duration: new Date().getMilliseconds() - submit_time.getMilliseconds() })
+		onFinalMessage_(fullText)
+	}
+
+	const onError = (error: string) => {
+		if (_didAbort) return
+		captureChatEvent(`${loggingName} - Error`, { error })
+		onError_(error)
+	}
+
+	const onAbort = () => {
+		captureChatEvent(`${loggingName} - Abort`, { messageLengthSoFar: _fullTextSoFar.length })
+		_aborter?.()
+		_didAbort = true
+	}
+	abortRef_.current = onAbort
+
+	captureChatEvent(`${loggingName} - Sending Message`, { messageLength: messages[messages.length - 1]?.content.length })
+
+	switch (voidConfig.default.whichApi) {
+		case 'anthropic':
+			sendAnthropicMsg({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter, });
+			break;
+		case 'openAI':
+		case 'openRouter':
+		case 'openAICompatible':
+			sendOpenAIMsg({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter, });
+			break;
+		case 'gemini':
+			sendGeminiMsg({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter, });
+			break;
+		case 'ollama':
+			sendOllamaMsg({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter, });
+			break;
+		case 'greptile':
+			sendGreptileMsg({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter, });
+			break;
+		default:
+			onError(`Error: whichApi was ${voidConfig.default.whichApi}, which is not recognized!`)
+			break;
+	}
+
+
+}

extensions/void/src/common/shared_types.ts

@@ -0,0 +1,97 @@
+
+import * as vscode from 'vscode';
+import { PartialVoidConfig } from '../webviews/common/contextForConfig'
+
+type CodeSelection = { selectionStr: string, filePath: vscode.Uri }
+
+type File = { filepath: vscode.Uri, content: string }
+
+// an area that is currently being diffed
+type DiffArea = {
+	diffareaid: number,
+	startLine: number,
+	endLine: number,
+	originalStartLine: number,
+	originalEndLine: number,
+	sweepIndex: number | null // null iff not sweeping
+}
+
+// the return type of diff creator
+type BaseDiff = {
+	type: 'edit' | 'insertion' | 'deletion';
+	// repr: string; // representation of the diff in text
+	originalRange: vscode.Range;
+	originalCode: string;
+	range: vscode.Range;
+	code: string;
+}
+
+// each diff on the user's screen
+type Diff = {
+	diffid: number,
+	lenses: vscode.CodeLens[],
+} & BaseDiff
+
+// editor -> sidebar
+type MessageToSidebar = (
+	| { type: 'ctrl+l', selection: CodeSelection } // user presses ctrl+l in the editor. selection and path are frozen snapshots
+	| { type: 'ctrl+k', selection: CodeSelection }
+	| { type: 'files', files: { filepath: vscode.Uri, content: string }[] }
+	| { type: 'partialVoidConfig', partialVoidConfig: PartialVoidConfig }
+	| { type: 'allThreads', threads: ChatThreads }
+	| { type: 'startNewThread' }
+	| { type: 'toggleThreadSelector' }
+	| { type: 'toggleSettings' }
+	| { type: 'deviceId', deviceId: string }
+)
+
+// sidebar -> editor
+type MessageFromSidebar = (
+	| { type: 'applyChanges', diffRepr: string } // user clicks "apply" in the sidebar
+	| { type: 'requestFiles', filepaths: vscode.Uri[] }
+	| { type: 'getPartialVoidConfig' }
+	| { type: 'persistPartialVoidConfig', partialVoidConfig: PartialVoidConfig }
+	| { type: 'getAllThreads' }
+	| { type: 'persistThread', thread: ChatThreads[string] }
+	| { type: 'getDeviceId' }
+)
+
+
+type ChatThreads = {
+	[id: string]: {
+		id: string; // store the id here too
+		createdAt: string; // ISO string
+		lastModified: string; // ISO string
+		messages: ChatMessage[];
+	}
+}
+
+type ChatMessage =
+	| {
+		role: "user";
+		content: string; // content sent to the llm
+		displayContent: string; // content displayed to user
+		selection: CodeSelection | null; // the user's selection
+		files: vscode.Uri[]; // the files sent in the message
+	}
+	| {
+		role: "assistant";
+		content: string; // content received from LLM
+		displayContent: string | undefined; // content displayed to user (this is the same as content for now)
+	}
+	| {
+		role: "system";
+		content: string;
+		displayContent?: undefined;
+	}
+
+export {
+	BaseDiff, Diff,
+	DiffArea,
+	CodeSelection,
+	File,
+	MessageFromSidebar,
+	MessageToSidebar,
+	ChatThreads,
+	ChatMessage,
+}

extensions/void/src/common/systemPrompts.ts

@@ -0,0 +1,406 @@
+
+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>
+\`\`\`
+`;
+
+
+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\`
+`
+
+
+const writeFileWithDiffInstructions = `
+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\`.
+
+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\`:
+\`\`\`
+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>
+\`\`\`
+
+NEW_FILE
+\`\`\`
+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
+\`\`\`
+    <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 {
+	generateDiffInstructions,
+	searchDiffChunkInstructions,
+	writeFileWithDiffInstructions,
+};

extensions/void/src/extension/DiffProvider.ts

@@ -0,0 +1,450 @@
+import * as vscode from 'vscode';
+import { findDiffs } from './findDiffs';
+import { throttle } from 'lodash';
+import { DiffArea, BaseDiff, Diff } from '../common/shared_types';
+import { readFileContentOfUri } from './extensionLib/readFileContentOfUri';
+import { AbortRef, sendLLMMessage } from '../common/sendLLMMessage';
+import { writeFileWithDiffInstructions } from '../common/systemPrompts';
+import { VoidConfig } from '../webviews/common/contextForConfig';
+
+
+const THROTTLE_TIME = 100
+
+// TODO in theory this should be disposed
+const lightGrayDecoration = vscode.window.createTextEditorDecorationType({
+	backgroundColor: 'rgba(218 218 218 / .2)',
+	isWholeLine: true,
+})
+const darkGrayDecoration = vscode.window.createTextEditorDecorationType({
+	backgroundColor: 'rgb(148 148 148 / .2)',
+	isWholeLine: true,
+})
+
+// responsible for displaying diffs and showing accept/reject buttons
+export class DiffProvider implements vscode.CodeLensProvider {
+
+	private _originalFileOfDocument: { [docUriStr: string]: string } = {}
+	private _diffAreasOfDocument: { [docUriStr: string]: DiffArea[] } = {}
+	private _diffsOfDocument: { [docUriStr: string]: Diff[] } = {}
+
+	private _diffareaidPool = 0
+	private _diffidPool = 0
+
+	private _extensionUri: vscode.Uri
+
+	// used internally by vscode
+	private _onDidChangeCodeLenses: vscode.EventEmitter<void> = new vscode.EventEmitter<void>(); // signals a UI refresh on .fire() events
+	public readonly onDidChangeCodeLenses: vscode.Event<void> = this._onDidChangeCodeLenses.event;
+
+	// used internally by vscode
+	public provideCodeLenses(document: vscode.TextDocument, token: vscode.CancellationToken): vscode.ProviderResult<vscode.CodeLens[]> {
+		const docUriStr = document.uri.toString()
+		return this._diffsOfDocument[docUriStr]?.flatMap(diff => diff.lenses) ?? []
+	}
+
+	// declared by us, registered with vscode.languages.registerCodeLensProvider()
+	constructor(context: vscode.ExtensionContext) {
+		this._extensionUri = context.extensionUri
+
+		console.log('Creating DisplayChangesProvider')
+
+		// this acts as a useEffect every time text changes
+		vscode.workspace.onDidChangeTextDocument((e) => {
+
+			const editor = vscode.window.activeTextEditor
+
+			if (!editor) return
+
+			const docUriStr = editor.document.uri.toString()
+			const changes = e.contentChanges.map(c => ({ startLine: c.range.start.line, endLine: c.range.end.line, text: c.text, }))
+
+			// on user change, grow/shrink/merge/delete diff areas
+			this.resizeDiffAreas(docUriStr, changes, 'currentFile')
+
+			// refresh the diffAreas
+			this.refreshStylesAndDiffs(docUriStr)
+
+		})
+	}
+
+	// used by us only
+	public createDiffArea(uri: vscode.Uri, partialDiffArea: Omit<DiffArea, 'diffareaid'>, originalFile: string) {
+
+		const uriStr = uri.toString()
+
+		this._originalFileOfDocument[uriStr] = originalFile
+
+		// make sure array is defined
+		if (!this._diffAreasOfDocument[uriStr]) this._diffAreasOfDocument[uriStr] = []
+
+		// remove all diffAreas that the new `diffArea` is overlapping with
+		this._diffAreasOfDocument[uriStr] = this._diffAreasOfDocument[uriStr].filter(da => {
+			const noOverlap = da.startLine > partialDiffArea.endLine || da.endLine < partialDiffArea.startLine
+			if (!noOverlap) return false
+			return true
+		})
+
+		// add `diffArea` to storage
+		const diffArea = {
+			...partialDiffArea,
+			diffareaid: this._diffareaidPool
+		}
+		this._diffAreasOfDocument[uriStr].push(diffArea)
+		this._diffareaidPool += 1
+
+		return diffArea
+	}
+
+	// used by us only
+	// changes the start/line locations based on the changes that were recently made. does not change any of the diffs in the diff areas
+	// changes tells us how many lines were inserted/deleted so we can grow/shrink the diffAreas accordingly
+	public resizeDiffAreas(docUriStr: string, changes: { text: string, startLine: number, endLine: number }[], changesTo: 'originalFile' | 'currentFile') {
+
+		const diffAreas = this._diffAreasOfDocument[docUriStr] || []
+
+		let endLine: 'originalEndLine' | 'endLine'
+		let startLine: 'originalStartLine' | 'startLine'
+
+		if (changesTo === 'originalFile') {
+			endLine = 'originalEndLine' as const
+			startLine = 'originalStartLine' as const
+		} else {
+			endLine = 'endLine' as const
+			startLine = 'startLine' as const
+		}
+
+		for (const change of changes) {
+
+			// here, `change.range` is the range of the original file that gets replaced with `change.text`
+
+
+			// compute net number of newlines lines that were added/removed
+			const numNewLines = (change.text.match(/\n/g) || []).length
+			const numLineDeletions = change.endLine - change.startLine
+			const deltaNewlines = numNewLines - numLineDeletions
+
+			// compute overlap with each diffArea and shrink/elongate the diffArea accordingly
+			for (const diffArea of diffAreas) {
+
+				// if the change is fully within the diffArea, elongate it by the delta amount of newlines
+				if (change.startLine >= diffArea[startLine] && change.endLine <= diffArea[endLine]) {
+					diffArea[endLine] += deltaNewlines
+				}
+				// check if the `diffArea` was fully deleted and remove it if so
+				if (diffArea[startLine] > diffArea[endLine]) {
+					//remove it
+					const index = diffAreas.findIndex(da => da === diffArea)
+					diffAreas.splice(index, 1)
+				}
+
+				// TODO handle other cases where eg. the change overlaps many diffAreas
+			}
+
+
+			// if a diffArea is below the last character of the change, shift the diffArea up/down by the delta amount of newlines
+			for (const diffArea of diffAreas) {
+				if (diffArea[startLine] > change.endLine) {
+					diffArea[startLine] += deltaNewlines
+					diffArea[endLine] += deltaNewlines
+				}
+			}
+
+			// TODO merge any diffAreas if they overlap with each other as a result from the shift
+
+		}
+	}
+
+
+	// used by us only
+	// refreshes all the diffs inside each diff area, and refreshes the styles
+	public refreshStylesAndDiffs(docUriStr: string) {
+
+		const editor = vscode.window.activeTextEditor // TODO the editor should be that of `docUri` and not necessarily the current editor
+		if (!editor) {
+			console.log('Error: No active editor!')
+			return;
+		}
+		const originalFile = this._originalFileOfDocument[docUriStr]
+		if (!originalFile) {
+			console.log('Error: No original file!')
+			return;
+		}
+
+		const diffAreas = this._diffAreasOfDocument[docUriStr] || []
+
+		// reset all diffs (we update them below)
+		this._diffsOfDocument[docUriStr] = []
+
+		// TODO!!!!
+		// vscode.languages.clearInlineDiffs(editor)
+
+		// for each diffArea
+		for (const diffArea of diffAreas) {
+
+			// get code inside of diffArea
+			const originalCode = originalFile.split('\n').slice(diffArea.originalStartLine, diffArea.originalEndLine + 1).join('\n')
+			const currentCode = editor.document.getText(new vscode.Range(diffArea.startLine, 0, diffArea.endLine, Number.MAX_SAFE_INTEGER)).replace(/\r\n/g, '\n')
+
+			// compute the diffs
+			const diffs = findDiffs(originalCode, currentCode)
+
+			// add the diffs to `this._diffsOfDocument[docUriStr]`
+
+			// if no diffs, set diffs to []
+			if (!this._diffsOfDocument[docUriStr])
+				this._diffsOfDocument[docUriStr] = []
+
+			// add each diff and its codelens to the document
+			for (let i = diffs.length - 1; i > -1; i -= 1) {
+				let suggestedDiff = diffs[i]
+
+				this._diffsOfDocument[docUriStr].push({
+					...suggestedDiff,
+					diffid: this._diffidPool,
+					// originalCode: suggestedDiff.deletedText,
+					lenses: [
+						new vscode.CodeLens(suggestedDiff.range, { title: 'Accept', command: 'void.acceptDiff', arguments: [{ diffid: this._diffidPool, diffareaid: diffArea.diffareaid }] }),
+						new vscode.CodeLens(suggestedDiff.range, { title: 'Reject', command: 'void.rejectDiff', arguments: [{ diffid: this._diffidPool, diffareaid: diffArea.diffareaid }] })
+					]
+				});
+				vscode.languages.addInlineDiff(editor, suggestedDiff.originalCode, suggestedDiff.range)
+				this._diffidPool += 1
+			}
+
+		}
+
+
+		// for each diffArea, highlight its sweepIndex in dark gray
+		editor.setDecorations(
+			darkGrayDecoration,
+			(this._diffAreasOfDocument[docUriStr]
+				.filter(diffArea => diffArea.sweepIndex !== null)
+				.map(diffArea => {
+					let s = diffArea.sweepIndex!
+					return new vscode.Range(s, 0, s, 0)
+				})
+			)
+		)
+
+		// for each diffArea, highlight sweepIndex+1...end in light gray
+		editor.setDecorations(
+			lightGrayDecoration,
+			(this._diffAreasOfDocument[docUriStr]
+				.filter(diffArea => diffArea.sweepIndex !== null)
+				.map(diffArea => {
+					return new vscode.Range(diffArea.sweepIndex! + 1, 0, diffArea.endLine, 0)
+				})
+			)
+		)
+
+
+		// update code lenses
+		this._onDidChangeCodeLenses.fire()
+
+	}
+
+
+	// called on void.acceptDiff
+	public async acceptDiff({ diffid, diffareaid }: { diffid: number, diffareaid: number }) {
+		const editor = vscode.window.activeTextEditor
+		if (!editor)
+			return
+
+		const docUriStr = editor.document.uri.toString()
+
+		const diffIdx = this._diffsOfDocument[docUriStr].findIndex(diff => diff.diffid === diffid);
+		if (diffIdx === -1) { console.error('Error: DiffID could not be found: ', diffid, diffareaid, this._diffsOfDocument[docUriStr], this._diffAreasOfDocument[docUriStr]); return; }
+
+		const diffareaIdx = this._diffAreasOfDocument[docUriStr].findIndex(diff => diff.diffareaid === diffareaid);
+		if (diffareaIdx === -1) { console.error('Error: DiffAreaID could not be found: ', diffid, diffareaid, this._diffsOfDocument[docUriStr], this._diffAreasOfDocument[docUriStr]); return; }
+
+		const diff = this._diffsOfDocument[docUriStr][diffIdx]
+		const originalFile = this._originalFileOfDocument[docUriStr]
+		const currentFile = await readFileContentOfUri(editor.document.uri)
+
+		// Fixed: Handle newlines properly by splitting into lines and joining with proper newlines
+		const originalLines = originalFile.split('\n');
+		const currentLines = currentFile.split('\n');
+
+		// Get the changed lines from current file
+		const changedLines = currentLines.slice(diff.range.start.line, diff.range.end.line + 1);
+
+		// Create new original file content by replacing the affected lines
+		const newOriginalLines = [
+			...originalLines.slice(0, diff.originalRange.start.line),
+			...changedLines,
+			...originalLines.slice(diff.originalRange.end.line + 1)
+		];
+
+		this._originalFileOfDocument[docUriStr] = newOriginalLines.join('\n');
+
+		// Update diff areas based on the change
+		this.resizeDiffAreas(docUriStr, [{
+			text: changedLines.join('\n'),
+			startLine: diff.originalRange.start.line,
+			endLine: diff.originalRange.end.line
+		}], 'originalFile')
+
+		// Check if diffArea should be removed
+
+		const diffArea = this._diffAreasOfDocument[docUriStr][diffareaIdx]
+
+		const currentArea = currentLines.slice(diffArea.startLine, diffArea.endLine + 1).join('\n')
+		const originalArea = newOriginalLines.slice(diffArea.originalStartLine, diffArea.originalEndLine + 1).join('\n')
+
+		if (originalArea === currentArea) {
+			const index = this._diffAreasOfDocument[docUriStr].findIndex(da => da.diffareaid === diffArea.diffareaid)
+			this._diffAreasOfDocument[docUriStr].splice(index, 1)
+		}
+
+		this.refreshStylesAndDiffs(docUriStr)
+	}
+
+	// called on void.rejectDiff
+	public async rejectDiff({ diffid, diffareaid }: { diffid: number, diffareaid: number }) {
+		const editor = vscode.window.activeTextEditor
+		if (!editor)
+			return
+
+		const docUriStr = editor.document.uri.toString()
+
+		const diffIdx = this._diffsOfDocument[docUriStr].findIndex(diff => diff.diffid === diffid);
+		if (diffIdx === -1) { console.error('Error: DiffID could not be found: ', diffid, diffareaid, this._diffsOfDocument[docUriStr], this._diffAreasOfDocument[docUriStr]); return; }
+
+		const diffareaIdx = this._diffAreasOfDocument[docUriStr].findIndex(diff => diff.diffareaid === diffareaid);
+		if (diffareaIdx === -1) { console.error('Error: DiffAreaID could not be found: ', diffid, diffareaid, this._diffsOfDocument[docUriStr], this._diffAreasOfDocument[docUriStr]); return; }
+
+		const diff = this._diffsOfDocument[docUriStr][diffIdx]
+
+		// Apply the rejection by replacing with original code
+		// we don't have to edit the original or final file; just do a workspace edit so the code equals the original code
+		const workspaceEdit = new vscode.WorkspaceEdit();
+		workspaceEdit.replace(editor.document.uri, diff.range, diff.originalCode)
+		await vscode.workspace.applyEdit(workspaceEdit)
+
+		// Check if diffArea should be removed
+		const originalFile = this._originalFileOfDocument[docUriStr]
+		const currentFile = await readFileContentOfUri(editor.document.uri)
+		const diffArea = this._diffAreasOfDocument[docUriStr][diffareaIdx]
+		const currentLines = currentFile.split('\n');
+		const originalLines = originalFile.split('\n');
+
+		const currentArea = currentLines.slice(diffArea.startLine, diffArea.endLine + 1).join('\n')
+		const originalArea = originalLines.slice(diffArea.originalStartLine, diffArea.originalEndLine + 1).join('\n')
+
+		if (originalArea === currentArea) {
+			const index = this._diffAreasOfDocument[docUriStr].findIndex(da => da.diffareaid === diffArea.diffareaid)
+			this._diffAreasOfDocument[docUriStr].splice(index, 1)
+		}
+
+		this.refreshStylesAndDiffs(docUriStr)
+	}
+
+	async startStreamingInDiffArea({ docUri, oldFileStr, diffRepr, diffArea, voidConfig, abortRef }: { docUri: vscode.Uri, oldFileStr: string, diffRepr: string, voidConfig: VoidConfig, diffArea: DiffArea, abortRef: AbortRef }) {
+
+
+		const promptContent = `\
+ORIGINAL_FILE
+\`\`\`
+${oldFileStr}
+\`\`\`
+
+DIFF
+\`\`\`
+${diffRepr}
+\`\`\`
+
+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.
+
+`
+		// make LLM complete the file to include the diff
+		await new Promise<void>((resolve, reject) => {
+			sendLLMMessage({
+				logging: { loggingName: 'streamChunk' },
+				messages: [
+					{ role: 'system', content: writeFileWithDiffInstructions, },
+					// TODO include more context too
+					{ role: 'user', content: promptContent, }
+				],
+				onText: (newText, fullText) => {
+					this._updateStream(docUri.toString(), diffArea, fullText)
+				},
+				onFinalMessage: (fullText) => {
+					this._updateStream(docUri.toString(), diffArea, fullText)
+					resolve();
+				},
+				onError: (e) => {
+					console.error('Error rewriting file with diff', e);
+					resolve();
+				},
+				voidConfig,
+				abortRef,
+			})
+		})
+
+	}
+
+
+	// used by us only
+	private _updateStream = throttle(async (docUriStr: string, diffArea: DiffArea, newDiffAreaCode: string) => {
+
+		const editor = vscode.window.activeTextEditor // TODO the editor should be that of `docUri` and not necessarily the current editor
+		if (!editor) {
+			console.log('Error: No active editor!')
+			return;
+		}
+
+		// original code all diffs are based on in the code
+		const originalDiffAreaCode = (this._originalFileOfDocument[docUriStr] || '').split('\n').slice(diffArea.originalStartLine, diffArea.originalEndLine + 1).join('\n')
+
+		// figure out where to highlight based on where the AI is in the stream right now, use the last diff in findDiffs to figure that out
+		const diffs = findDiffs(originalDiffAreaCode, newDiffAreaCode)
+		const lastDiff = diffs?.[diffs.length - 1] ?? null
+
+		// these are two different coordinate systems - new and old line number
+		let newFileEndLine: number // get new[0...newStoppingPoint] with line=newStoppingPoint highlighted
+		let oldFileStartLine: number // get original[oldStartingPoint...]
+
+		if (!lastDiff) {
+			// if the writing is identical so far, display no changes
+			newFileEndLine = 0
+			oldFileStartLine = 0
+		}
+		else {
+			if (lastDiff.type === 'insertion') {
+				newFileEndLine = lastDiff.range.end.line
+				oldFileStartLine = lastDiff.originalRange.start.line
+			}
+			else if (lastDiff.type === 'deletion') {
+				newFileEndLine = lastDiff.range.start.line
+				oldFileStartLine = lastDiff.originalRange.start.line
+			}
+			else if (lastDiff.type === 'edit') {
+				newFileEndLine = lastDiff.range.end.line
+				oldFileStartLine = lastDiff.originalRange.start.line
+			}
+			else {
+				throw new Error(`updateStream: diff.type not recognized: ${lastDiff.type}`)
+			}
+		}
+
+		// display
+		const newFileTop = newDiffAreaCode.split('\n').slice(0, newFileEndLine + 1).join('\n')
+		const oldFileBottom = originalDiffAreaCode.split('\n').slice(oldFileStartLine + 1, Infinity).join('\n')
+
+		let newCode = `${newFileTop}\n${oldFileBottom}`
+		diffArea.sweepIndex = newFileEndLine
+		// replace oldDACode with newDACode with a vscode edit
+
+		const workspaceEdit = new vscode.WorkspaceEdit();
+
+		const diffareaRange = new vscode.Range(diffArea.startLine, 0, diffArea.endLine, Number.MAX_SAFE_INTEGER)
+		workspaceEdit.replace(editor.document.uri, diffareaRange, newCode)
+		await vscode.workspace.applyEdit(workspaceEdit)
+	}, THROTTLE_TIME)
+
+}
+
+
+

extensions/void/src/extension/applyDiffLazily.ts

@@ -0,0 +1,181 @@
+// import type * as vscode from 'vscode';
+
+// import { AbortRef, sendLLMMessage } from '../common/sendLLMMessage';
+// import { DiffArea } from '../common/shared_types';
+// import { writeFileWithDiffInstructions, searchDiffChunkInstructions } from '../common/systemPrompts';
+// import { VoidConfig } from '../webviews/common/contextForConfig';
+// import { DiffProvider } from './DiffProvider';
+// import { readFileContentOfUri } from './extensionLib/readFileContentOfUri';
+
+// const LINES_PER_CHUNK = 20 // number of lines to search at a time
+
+
+// type CompetedReturn = { isFinished: true, } | { isFinished?: undefined, }
+// const streamChunk = ({ diffProvider, docUri, oldFileStr, completedStr, diffRepr, diffArea, voidConfig, abortRef }: { diffProvider: DiffProvider, docUri: vscode.Uri, oldFileStr: string, completedStr: string, diffRepr: string, voidConfig: VoidConfig, diffArea: DiffArea, abortRef: AbortRef }) => {
+
+// 	const promptContent = `ORIGINAL_FILE
+// \`\`\`
+// ${oldFileStr}
+// \`\`\`
+
+// DIFF
+// \`\`\`
+// ${diffRepr}
+// \`\`\`
+
+// INSTRUCTIONS
+// Please finish writing the new file \`NEW_FILE\`. Return ONLY the completion of the file, without any explanation.
+
+// NEW_FILE
+// \`\`\`
+// ${completedStr}
+// \`\`\`
+// `
+// 	// create a promise that can be awaited
+// 	return new Promise<CompetedReturn>((resolve, reject) => {
+
+// 		let isAnyChangeSoFar = false
+
+// 		// make LLM complete the file to include the diff
+// 		sendLLMMessage({
+// 			logging: { loggingName: 'applyDiffLazily' },
+// 			messages: [{ role: 'system', content: writeFileWithDiffInstructions, }, { role: 'user', content: promptContent, }],
+// 			onText: (newText, fullText) => {
+// 				const fullCompletedStr = completedStr + fullText
+
+// 				diffProvider.updateStream(docUri.toString(), diffArea, fullCompletedStr)
+
+// 				// if there was any change from the original file
+// 				if (!oldFileStr.includes(fullCompletedStr)) {
+// 					isAnyChangeSoFar = true
+// 				}
+
+
+// 				const isRecentMatchup = false
+// 				// the final NUM_MATCHUP_TOKENS characters of fullCompletedStr are the same as the final NUM_MATCHUP_TOKENS characters of the last item in the diffs of oldFileStr that had 0 changes
+
+// 				if (isAnyChangeSoFar && isRecentMatchup) {
+// 					diffProvider.updateStream(docUri.toString(), diffArea, fullCompletedStr)
+
+// 					// TODO resolve the promise
+// 					// resolve({ speculativeIndex: newCurrentLine + 1 });
+
+// 					// abort the LLM call
+// 					abortRef.current?.()
+
+// 				}
+
+// 			},
+
+// 			onFinalMessage: (fullText) => {
+// 				const newCompletedStr = completedStr + fullText
+// 				diffProvider.updateStream(docUri.toString(), diffArea, newCompletedStr)
+// 				resolve({ isFinished: true });
+// 			},
+// 			onError: (e) => {
+// 				resolve({ isFinished: true });
+// 				console.error('Error rewriting file with diff', e);
+// 			},
+// 			voidConfig,
+// 			abortRef,
+// 		})
+// 	})
+// }
+
+
+// // const shouldApplyDiff = ({ diffRepr, oldFileStr: fileStr, speculationStr, voidConfig, abortRef }: { diffRepr: string, oldFileStr: string, speculationStr: string, voidConfig: VoidConfig, abortRef: AbortRef }) => {
+
+// // 	const promptContent = `DIFF
+// // \`\`\`
+// // ${diffRepr}
+// // \`\`\`
+
+// // FILES
+// // \`\`\`
+// // ${fileStr}
+// // \`\`\`
+
+// // SELECTION
+// // \`\`\`
+// // ${speculationStr}
+// // \`\`\`
+
+// // Return \`true\` if ANY part of the chunk should be modified, and \`false\` if it should not be modified. You should respond only with \`true\` or \`false\` and nothing else.
+// // `
+
+// // 	// create new promise
+// // 	return new Promise<boolean>((resolve, reject) => {
+// // 		// send message to LLM
+// // 		sendLLMMessage({
+// // 			messages: [{ role: 'system', content: searchDiffChunkInstructions, }, { role: 'user', content: promptContent, }],
+// // 			onFinalMessage: (finalMessage) => {
+
+// // 				const containsTrue = finalMessage
+// // 					.slice(-10) // check for `true` in last 10 characters
+// // 					.toLowerCase()
+// // 					.includes('true')
+
+// // 				resolve(containsTrue)
+// // 			},
+// // 			onError: (e) => {
+// // 				resolve(false);
+// // 				console.error('Error in shouldApplyDiff: ', e)
+// // 			},
+// // 			onText: () => { },
+// // 			voidConfig,
+// // 			abortRef,
+// // 		})
+
+// // 	})
+
+// // }
+
+
+
+// // lazily applies the diff to the file
+// // we chunk the text in the file, and ask an LLM whether it should edit each chunk
+// export const applyDiffLazily = async ({ docUri, oldFileStr, voidConfig, abortRef, diffRepr, diffProvider, diffArea }: { docUri: vscode.Uri, oldFileStr: string, diffRepr: string, voidConfig: VoidConfig, diffProvider: DiffProvider, diffArea: DiffArea, abortRef: AbortRef }) => {
+
+
+// 	// stateful variables
+// 	let speculativeIndex = 0
+// 	let writtenTextSoFar: string[] = []
+
+// 	while (speculativeIndex < oldFileStr.split('\n').length) {
+
+// 		const chunkStr = oldFileStr.split('\n').slice(speculativeIndex, speculativeIndex + LINES_PER_CHUNK).join('\n')
+
+// 		// ask LLM if we should apply the diff to the chunk
+// 		const START = new Date().getTime()
+// 		let shouldApplyDiff_ = true; //await shouldApplyDiff({ oldFileStr, speculationStr: chunkStr, diffRepr, voidConfig, abortRef })
+// 		const END = new Date().getTime()
+
+// 		// if should not change the chunk
+// 		if (!shouldApplyDiff_) {
+// 			console.log('KEEP CHUNK time: ', END - START)
+// 			speculativeIndex += LINES_PER_CHUNK
+// 			writtenTextSoFar.push(chunkStr)
+// 			// diffProvider.updateStream(docUri.toString(), diffArea, writtenTextSoFar.join('\n'))
+// 			continue;
+// 		}
+
+// 		// ask LLM to rewrite file with diff (if there is significant matchup with the original file, we stop rewriting)
+// 		const START2 = new Date().getTime()
+// 		const completedStr = (await readFileContentOfUri(docUri)).split('\n').slice(0, speculativeIndex).join('\n');
+// 		const result = await streamChunk({ diffProvider, docUri, oldFileStr, completedStr, diffRepr, voidConfig, diffArea, abortRef, })
+// 		const END2 = new Date().getTime()
+
+// 		console.log('EDIT CHUNK time: ', END2 - START2);
+
+// 		// if we are finished, stop the loop
+// 		if (result.isFinished) {
+// 			break;
+// 		}
+
+// 		// TODO
+// 		// speculativeIndex = result.speculativeIndex
+
+// 	}
+
+
+// }

extensions/void/src/extension/ctrlK.ts

@@ -0,0 +1,101 @@
+import * as vscode from 'vscode';
+import { AbortRef, OnFinalMessage, OnText, sendLLMMessage } from "../common/sendLLMMessage"
+import { VoidConfig } from '../webviews/common/contextForConfig';
+import { searchDiffChunkInstructions, writeFileWithDiffInstructions } from '../common/systemPrompts';
+import { throttle } from 'lodash';
+import { readFileContentOfUri } from './extensionLib/readFileContentOfUri';
+
+type Res<T> = ((value: T) => void)
+
+const THRTOTLE_TIME = 100 // minimum time between edits
+const LINES_PER_CHUNK = 20 // number of lines to search at a time
+
+const applyCtrlLChangesToFile = throttle(
+	({ fileUri, newCurrentLine, oldCurrentLine, fullCompletedStr, oldFileStr, debug }: { fileUri: vscode.Uri, newCurrentLine: number, oldCurrentLine: number, fullCompletedStr: string, oldFileStr: string, debug?: string }) => {
+
+		// write the change to the file
+		const WRITE_TO_FILE = (
+			fullCompletedStr.split('\n').slice(0, newCurrentLine + 1).join('\n')  // newFile[:newCurrentLine+1]
+			+ oldFileStr.split('\n').slice(oldCurrentLine + 1).join('\n')	// oldFile[oldCurrentLine+1:]
+		)
+		const workspaceEdit = new vscode.WorkspaceEdit()
+		workspaceEdit.replace(fileUri, new vscode.Range(0, 0, Number.MAX_SAFE_INTEGER, 0), WRITE_TO_FILE)
+		vscode.workspace.applyEdit(workspaceEdit)
+
+		// highlight the `newCurrentLine` in white
+		// highlight the remaining part of the file in gray
+
+	},
+	THRTOTLE_TIME, { trailing: true }
+)
+
+
+const applyCtrlK = async ({ fileUri, startLine, endLine, instructions, voidConfig, abortRef }: { fileUri: vscode.Uri, startLine: number, endLine: number, instructions: string, voidConfig: VoidConfig, abortRef: AbortRef }) => {
+
+	const fileStr = await readFileContentOfUri(fileUri)
+	const fileLines = fileStr.split('\n')
+
+	const prefix = fileLines.slice(startLine).join('\n')
+	const suffix = fileLines.slice(endLine + 1).join('\n')
+	const selection = fileLines.slice(startLine, endLine + 1).join('\n')
+
+	const promptContent = `Here is the user's original selection:
+\`\`\`
+<MID>${selection}</MID>
+\`\`\`
+
+The user wants to apply the following instructions to the selection:
+${instructions}
+
+Please rewrite the selection following the user's instructions.
+
+Instructions to follow:
+1. Follow the user's instructions
+2. You may ONLY CHANGE the selection, and nothing else in the file
+3. Make sure all brackets in the new selection are balanced the same was as in the original selection
+3. Be careful not to duplicate or remove variables, comments, or other syntax by mistake
+
+Complete the following:
+\`\`\`
+<PRE>${prefix}</PRE>
+<SUF>${suffix}</SUF>
+<MID>`;
+
+
+	// TODO initialize stream
+
+	// update stream
+	sendLLMMessage({
+		logging: { loggingName: 'Ctrl+K' },
+		messages: [{ role: 'user', content: promptContent, }],
+		onText: async (tokenStr, completionStr) => {
+			// TODO update stream
+
+
+			// apply the changes
+			const newCode = `${prefix}\n${completionStr}\n${suffix}`
+			const workspaceEdit = new vscode.WorkspaceEdit()
+			workspaceEdit.replace(fileUri, new vscode.Range(0, 0, Number.MAX_SAFE_INTEGER, 0), newCode)
+			vscode.workspace.applyEdit(workspaceEdit)
+		},
+		onFinalMessage: (completionStr) => {
+			// TODO end stream
+
+			// apply the changes
+			const newCode = `${prefix}\n${completionStr}\n${suffix}`
+			const workspaceEdit = new vscode.WorkspaceEdit()
+			workspaceEdit.replace(fileUri, new vscode.Range(0, 0, Number.MAX_SAFE_INTEGER, 0), newCode)
+			vscode.workspace.applyEdit(workspaceEdit)
+		},
+		onError: (e) => {
+			console.error('Error rewriting file with diff', e);
+		},
+		voidConfig,
+		abortRef,
+	})
+
+}
+
+
+
+export { applyCtrlK }

extensions/void/src/extension/extension.ts

@@ -0,0 +1,184 @@
+import * as vscode from 'vscode';
+
+import { v4 as uuidv4 } from 'uuid'
+import { AbortRef } from '../common/sendLLMMessage';
+import { MessageToSidebar, MessageFromSidebar, DiffArea, ChatThreads } from '../common/shared_types';
+import { getVoidConfigFromPartial } from '../webviews/common/contextForConfig';
+import { DiffProvider } from './DiffProvider';
+import { readFileContentOfUri } from './extensionLib/readFileContentOfUri';
+import { SidebarWebviewProvider } from './providers/SidebarWebviewProvider';
+import { CtrlKWebviewProvider } from './providers/CtrlKWebviewProvider';
+
+const roundRangeToLines = (selection: vscode.Selection) => {
+	let endLine = selection.end.character === 0 ? selection.end.line - 1 : selection.end.line // e.g. if the user triple clicks, it selects column=0, line=line -> column=0, line=line+1
+	return new vscode.Range(selection.start.line, 0, endLine, Number.MAX_SAFE_INTEGER)
+}
+
+const getSelection = (editor: vscode.TextEditor) => {
+	// get the range of the selection and the file the user is in
+	const selectionRange = roundRangeToLines(editor.selection);
+	const selectionStr = editor.document.getText(selectionRange).trim();
+	const filePath = editor.document.uri;
+	return { selectionStr, filePath }
+}
+
+export function activate(context: vscode.ExtensionContext) {
+
+	// 1. Mount the chat sidebar
+	const sidebarWebviewProvider = new SidebarWebviewProvider(context);
+	context.subscriptions.push(
+		vscode.window.registerWebviewViewProvider(SidebarWebviewProvider.viewId, sidebarWebviewProvider, { webviewOptions: { retainContextWhenHidden: true } })
+	);
+
+	// 1.5
+	const ctrlKWebviewProvider = new CtrlKWebviewProvider(context)
+
+
+	// 2. ctrl+l
+	context.subscriptions.push(
+		vscode.commands.registerCommand('void.ctrl+l', () => {
+			const editor = vscode.window.activeTextEditor
+			if (!editor) return
+
+			// show the sidebar
+			vscode.commands.executeCommand('workbench.view.extension.voidViewContainer');
+			// vscode.commands.executeCommand('vscode.moveViewToPanel', CustomViewProvider.viewId); // move to aux bar
+
+			const { selectionStr, filePath } = getSelection(editor)
+
+			// send message to the webview (Sidebar.tsx)
+			sidebarWebviewProvider.webview.then(webview => webview.postMessage({ type: 'ctrl+l', selection: { selectionStr, filePath } } satisfies MessageToSidebar));
+		})
+	);
+
+	// 2.5: ctrl+k
+	context.subscriptions.push(
+		vscode.commands.registerCommand('void.ctrl+k', () => {
+			console.log('CTRLK PRESSED')
+			const editor = vscode.window.activeTextEditor
+			if (!editor) return
+
+			const { selectionStr, filePath } = getSelection(editor)
+
+			// send message to the webview (Sidebar.tsx)
+			// ctrlKWebviewProvider.onPressCtrlK()
+			// sidebarWebviewProvider.webview.then(webview => webview.postMessage({ type: 'ctrl+k', selection: { selectionStr, filePath } } satisfies MessageToSidebar));
+		})
+	);
+
+	// 3. Show an approve/reject codelens above each change
+	const diffProvider = new DiffProvider(context);
+	context.subscriptions.push(vscode.languages.registerCodeLensProvider('*', diffProvider));
+
+	// 4. Add approve/reject commands
+	context.subscriptions.push(vscode.commands.registerCommand('void.acceptDiff', async (params) => {
+		diffProvider.acceptDiff(params)
+	}));
+	context.subscriptions.push(vscode.commands.registerCommand('void.rejectDiff', async (params) => {
+		diffProvider.rejectDiff(params)
+	}));
+
+	// 5. Receive messages from sidebar
+	sidebarWebviewProvider.webview.then(
+		webview => {
+
+			// top navigation bar commands
+			context.subscriptions.push(vscode.commands.registerCommand('void.startNewThread', async () => {
+				webview.postMessage({ type: 'startNewThread' } satisfies MessageToSidebar)
+			}))
+			context.subscriptions.push(vscode.commands.registerCommand('void.toggleThreadSelector', async () => {
+				webview.postMessage({ type: 'toggleThreadSelector' } satisfies MessageToSidebar)
+			}))
+			context.subscriptions.push(vscode.commands.registerCommand('void.toggleSettings', async () => {
+				webview.postMessage({ type: 'toggleSettings' } satisfies MessageToSidebar)
+			}));
+
+			// Receive messages in the extension from the sidebar webview (messages are sent using `postMessage`)
+			webview.onDidReceiveMessage(async (m: MessageFromSidebar) => {
+
+				const abortApplyRef: AbortRef = { current: null }
+
+				if (m.type === 'requestFiles') {
+
+					// get contents of all file paths
+					const files = await Promise.all(
+						m.filepaths.map(async (filepath) => ({ filepath, content: await readFileContentOfUri(filepath) }))
+					)
+
+					// send contents to webview
+					webview.postMessage({ type: 'files', files, } satisfies MessageToSidebar)
+
+				}
+				else if (m.type === 'applyChanges') {
+
+					const editor = vscode.window.activeTextEditor
+					if (!editor) {
+						vscode.window.showInformationMessage('No active editor!')
+						return
+					}
+					// create an area to show diffs
+					const partialDiffArea: Omit<DiffArea, 'diffareaid'> = {
+						startLine: 0, // in ctrl+L the start and end lines are the full document
+						endLine: editor.document.lineCount,
+						originalStartLine: 0,
+						originalEndLine: editor.document.lineCount,
+						sweepIndex: null,
+					}
+					const diffArea = diffProvider.createDiffArea(editor.document.uri, partialDiffArea, await readFileContentOfUri(editor.document.uri))
+
+					const docUri = editor.document.uri
+					const fileStr = await readFileContentOfUri(docUri)
+					const voidConfig = getVoidConfigFromPartial(context.globalState.get('partialVoidConfig') ?? {})
+
+					await diffProvider.startStreamingInDiffArea({ docUri, oldFileStr: fileStr, diffRepr: m.diffRepr, voidConfig, diffArea, abortRef: abortApplyRef })
+				}
+				else if (m.type === 'getPartialVoidConfig') {
+					const partialVoidConfig = context.globalState.get('partialVoidConfig') ?? {}
+					webview.postMessage({ type: 'partialVoidConfig', partialVoidConfig } satisfies MessageToSidebar)
+				}
+				else if (m.type === 'persistPartialVoidConfig') {
+					const partialVoidConfig = m.partialVoidConfig
+					context.globalState.update('partialVoidConfig', partialVoidConfig)
+				}
+				else if (m.type === 'getAllThreads') {
+					const threads: ChatThreads = context.workspaceState.get('allThreads') ?? {}
+					webview.postMessage({ type: 'allThreads', threads } satisfies MessageToSidebar)
+				}
+				else if (m.type === 'persistThread') {
+					const threads: ChatThreads = context.workspaceState.get('allThreads') ?? {}
+					const updatedThreads: ChatThreads = { ...threads, [m.thread.id]: m.thread }
+					context.workspaceState.update('allThreads', updatedThreads)
+				}
+				else if (m.type === 'getDeviceId') {
+					let deviceId = context.globalState.get('void_deviceid')
+					if (!deviceId || typeof deviceId !== 'string') {
+						deviceId = uuidv4()
+						context.globalState.update('void_deviceid', deviceId)
+					}
+					webview.postMessage({ type: 'deviceId', deviceId: deviceId as string } satisfies MessageToSidebar)
+				}
+				else {
+					console.error('unrecognized command', m)
+				}
+			})
+		}
+	)
+
+
+
+
+	// Gets called when user presses ctrl + k (mounts ctrl+k-style codelens)
+	// TODO need to build this
+	// const ctrlKCodeLensProvider = new CtrlKCodeLensProvider();
+	// context.subscriptions.push(vscode.languages.registerCodeLensProvider('*', ctrlKCodeLensProvider));
+	// context.subscriptions.push(
+	// 	vscode.commands.registerCommand('void.ctrl+k', () => {
+	// 		const editor = vscode.window.activeTextEditor;
+	// 		if (!editor)
+	// 			return
+	// 		ctrlKCodeLensProvider.addNewCodeLens(editor.document, editor.selection);
+	// 		// vscode.commands.executeCommand('editor.action.showHover'); // apparently this refreshes the codelenses by having the internals call provideCodeLenses
+	// 	})
+	// )
+
+}

extensions/void/src/extension/extensionLib/readFileContentOfUri.ts

@@ -0,0 +1,14 @@
+import * as vscode from 'vscode'
+
+
+export const readFileContentOfUri = async (uri: vscode.Uri): Promise<string> => {
+	const document = await vscode.workspace.openTextDocument(uri);
+	return document.getText().replace(/\r\n/g, '\n') ?? '' // Normalize line endings
+
+};
+
+// this is the old version, which only reads the most recently saved version
+// export const readFileContentOfUri = async (uri: vscode.Uri) => {
+// 	return Buffer.from(await vscode.workspace.fs.readFile(uri)).toString('utf8')
+// 		.replace(/\r\n/g, '\n') // replace windows \r\n with \n
+// }

extensions/void/src/extension/extensionLib/updateWebviewHTML.ts

@@ -0,0 +1,46 @@
+import * as vscode from 'vscode'
+
+function generateNonce() {
+	let text = "";
+	const possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+	for (let i = 0; i < 32; i++) {
+		text += possible.charAt(Math.floor(Math.random() * possible.length));
+	}
+	return text;
+}
+
+
+// call this when you have access to the webview to set its html
+export const updateWebviewHTML = (webview: vscode.Webview, extensionUri: vscode.Uri, { jsOutLocation, cssOutLocation }: { jsOutLocation: string, cssOutLocation: string }, props?: object) => {
+
+	// 'dist/sidebar/index.js'
+	// 'dist/sidebar/styles.css'
+
+	const scriptUri = webview.asWebviewUri(vscode.Uri.joinPath(extensionUri, jsOutLocation));
+	const stylesUri = webview.asWebviewUri(vscode.Uri.joinPath(extensionUri, cssOutLocation));
+	const rootUri = webview.asWebviewUri(vscode.Uri.joinPath(extensionUri));
+	const nonce = generateNonce();
+
+	const webviewHTML = `<!DOCTYPE html>
+  <html lang="en">
+  <head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<title>Custom View</title>
+	<meta http-equiv="Content-Security-Policy" content="img-src vscode-resource: https:; script-src 'nonce-${nonce}'; style-src vscode-resource: 'unsafe-inline' http: https: data:;">
+	<base href="${rootUri}/">
+	<link href="${stylesUri}" rel="stylesheet">
+  </head>
+  <body>
+	<div id="root"${props ? ` data-void-props="${encodeURIComponent(JSON.stringify(props))}"` : ''}></div>
+	<script nonce="${nonce}" src="${scriptUri}"></script>
+  </body>
+  </html>`;
+
+	webview.html = webviewHTML
+
+	webview.options = {
+		enableScripts: true,
+		localResourceRoots: [extensionUri]
+	};
+}

extensions/void/src/extension/findDiffs.ts

@@ -0,0 +1,132 @@
+
+import { Range } from 'vscode';
+import { diffLines, Change } from 'diff';
+import { BaseDiff } from '../common/shared_types';
+
+
+
+// class Range {
+// 	range: any;
+// 	constructor(startLine, startCol, endLine, endCol) {
+// 	  const range = {
+// 		startLine,
+// 		startCol,
+// 		endLine,
+// 		endCol,
+// 	  };
+// 	  this.range = range;
+// 	}
+//   }
+
+
+
+// Andrew diff algo:
+export type SuggestedEdit = {
+	// start/end of current file
+	newRange: Range;
+
+	// start/end of original file
+	originalRange: Range;
+	type: 'insertion' | 'deletion' | 'edit',
+	originalContent: string, // original content (originalfile[originalStart...originalEnd])
+	newContent: string,
+}
+
+export function findDiffs(oldStr: string, newStr: string) {
+	// an ordered list of every original line, line added to the new file, and line removed from the old file (order is unambiguous, think about it)
+	const lineByLineChanges: Change[] = diffLines(oldStr, newStr);
+	lineByLineChanges.push({ value: '' }) // add a dummy so we flush any streaks we haven't yet at the very end (!line.added && !line.removed)
+
+	let oldFileLineNum: number = 0;
+	let newFileLineNum: number = 0;
+
+	let streakStartInNewFile: number | undefined = undefined
+	let streakStartInOldFile: number | undefined = undefined
+
+	let oldStrLines = oldStr.split('\n')
+	let newStrLines = newStr.split('\n')
+
+	const replacements: BaseDiff[] = []
+	for (let line of lineByLineChanges) {
+
+		// no change on this line
+		if (!line.added && !line.removed) {
+
+			// do nothing
+
+			// if we were on a streak of +s and -s, end it
+			if (streakStartInNewFile !== undefined) {
+				let type: 'edit' | 'insertion' | 'deletion' = 'edit'
+
+				let startLine = streakStartInNewFile
+				let endLine = newFileLineNum - 1 // don't include current line, the edit was up to this line but not including it
+				let startCol = 0
+				let endCol = Number.MAX_SAFE_INTEGER
+
+				let originalStartLine = streakStartInOldFile!
+				let originalEndLine = oldFileLineNum - 1 // don't include current line, the edit was up to this line but not including it
+				let originalStartCol = 0
+				let originalEndCol = Number.MAX_SAFE_INTEGER
+
+				let newContent = newStrLines.slice(startLine, endLine + 1).join('\n')
+				let originalContent = oldStrLines.slice(originalStartLine, originalEndLine + 1).join('\n')
+
+				// if the range is empty, mark it as a deletion / insertion (both won't be true at once)
+				// DELETION
+				if (endLine === startLine - 1) {
+					type = 'deletion'
+					endLine = startLine
+					startCol = 0
+					endCol = 0
+					newContent += '\n'
+				}
+
+				// INSERTION
+				else if (originalEndLine === originalStartLine - 1) {
+					type = 'insertion'
+					originalEndLine = originalStartLine
+					originalStartCol = 0
+					originalEndCol = 0
+				}
+
+				const replacement: BaseDiff = {
+					type,
+					range: new Range(startLine, startCol, endLine, endCol),
+					code: newContent,
+					originalRange: new Range(originalStartLine, originalStartCol, originalEndLine, originalEndCol),
+					originalCode: originalContent,
+				}
+
+				replacements.push(replacement)
+
+				streakStartInNewFile = undefined
+				streakStartInOldFile = undefined
+			}
+			oldFileLineNum += line.count ?? 0;
+			newFileLineNum += line.count ?? 0;
+		}
+
+		// line was removed from old file
+		else if (line.removed) {
+			// if we weren't on a streak, start one on this current line num
+			if (streakStartInNewFile === undefined) {
+				streakStartInNewFile = newFileLineNum
+				streakStartInOldFile = oldFileLineNum
+			}
+			oldFileLineNum += line.count ?? 0 // we processed the line so add 1
+		}
+
+		// line was added to new file
+		else if (line.added) {
+			// if we weren't on a streak, start one on this current line num
+			if (streakStartInNewFile === undefined) {
+				streakStartInNewFile = newFileLineNum
+				streakStartInOldFile = oldFileLineNum
+			}
+			newFileLineNum += line.count ?? 0; // we processed the line so add 1
+		}
+	} // end for
+
+	console.debug('Replacements', replacements)
+	return replacements
+}

extensions/void/src/extension/providers/CtrlKWebviewProvider.ts

@@ -0,0 +1,41 @@
+// renders the code from `src/sidebar`
+
+import * as vscode from 'vscode';
+import { updateWebviewHTML as _updateWebviewHTML, updateWebviewHTML } from '../extensionLib/updateWebviewHTML';
+
+
+export class CtrlKWebviewProvider {
+
+	private readonly _extensionUri: vscode.Uri
+
+	private _idPool = 0
+
+
+
+	constructor(context: vscode.ExtensionContext) {
+		this._extensionUri = context.extensionUri
+	}
+
+	onPressCtrlK() {
+
+		// // TODO if currently selecting a ctrl k element, just focus it and do nothing
+
+
+		// const inset = vscode.window.createWebviewTextEditorInset(editor, line, height);
+
+
+		// const newCtrlKId = this._idPool++
+		// updateWebviewHTML(inset.webview, this._extensionUri, { jsOutLocation: 'dist/webviews/ctrlk/index.js', cssOutLocation: 'dist/webviews/styles.css' },
+		// 	{ id: newCtrlKId }
+		// )
+
+		// ctrlKWebviewProvider.webview.then(webview => webview.postMessage({ type: 'ctrl+k', selection: { selectionStr, selectionRange, filePath } } satisfies MessageToSidebar));
+
+
+	}
+
+	onDisposeCtrlK() {
+
+	}
+
+}

extensions/void/src/extension/providers/SidebarWebviewProvider.ts

@@ -0,0 +1,30 @@
+// renders the code from `src/sidebar`
+
+import * as vscode from 'vscode';
+import { updateWebviewHTML as _updateWebviewHTML } from '../extensionLib/updateWebviewHTML';
+
+export class SidebarWebviewProvider implements vscode.WebviewViewProvider {
+	public static readonly viewId = 'void.viewnumberone';
+
+	public webview: Promise<vscode.Webview> // used to send messages to the webview, resolved by _res in resolveWebviewView
+	private _res: (c: vscode.Webview) => void // used to resolve the webview
+
+	private readonly _extensionUri: vscode.Uri
+
+	constructor(context: vscode.ExtensionContext) {
+		// const extensionPath = context.extensionPath // the directory where the extension is installed, might be useful later... was included in webviewProvider code
+		this._extensionUri = context.extensionUri
+
+		let temp_res: typeof this._res | undefined = undefined
+		this.webview = new Promise((res, rej) => { temp_res = res })
+		if (!temp_res) throw new Error("Void sidebar provider: resolver was undefined")
+		this._res = temp_res
+	}
+
+	// called internally by vscode
+	resolveWebviewView(webviewView: vscode.WebviewView, context: vscode.WebviewViewResolveContext, token: vscode.CancellationToken,) {
+		const webview = webviewView.webview;
+		_updateWebviewHTML(webview, this._extensionUri, { jsOutLocation: 'dist/webviews/sidebar/index.js', cssOutLocation: 'dist/webviews/styles.css' })
+		this._res(webview); // resolve webview and _webviewView
+	}
+}

extensions/void/src/test/extension.test.ts

@@ -0,0 +1,15 @@
+import * as assert from 'assert';
+
+// You can import and use all API from the 'vscode' module
+// as well as import your extension to test it
+import * as vscode from 'vscode';
+// import * as myExtension from '../../extension';
+
+suite('Extension Test Suite', () => {
+	vscode.window.showInformationMessage('Start all tests.');
+
+	test('Sample test', () => {
+		assert.strictEqual(-1, [1, 2, 3].indexOf(5));
+		assert.strictEqual(-1, [1, 2, 3].indexOf(0));
+	});
+});

extensions/void/src/webviews/common/contextForConfig.tsx

@@ -0,0 +1,289 @@
+import React, { ReactNode, createContext, useCallback, useContext, useEffect, useRef, useState, } from "react"
+import { awaitVSCodeResponse, getVSCodeAPI, useOnVSCodeMessage } from "./getVscodeApi"
+
+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 configFields = [
+	'anthropic',
+	'openAI',
+	'gemini',
+	'greptile',
+	'ollama',
+	'openRouter',
+	'openAICompatible',
+	'azure',
+] as const
+
+
+
+const voidConfigInfo: Record<
+	typeof configFields[number] | 'default', {
+		[prop: string]: {
+			description: string,
+			enumArr?: readonly string[] | undefined,
+			defaultVal: string,
+		},
+	}
+> = {
+	default: {
+		whichApi: configEnum(
+			"API Provider.",
+			'anthropic',
+			configFields,
+		),
+
+		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'),
+	},
+	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'
+		),
+		// TODO we should allow user to select model inside Void, but for now we'll just let them handle the Ollama setup on their own
+		// model: configEnum(
+		// 	'Ollama model to use.',
+		// 	'llama3.1',
+		// 	["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
+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']
+	}
+}
+
+
+
+export const getVoidConfigFromPartial = (partialVoidConfig: PartialVoidConfig): VoidConfig => {
+	const config = {} as PartialVoidConfig
+	for (let field of [...configFields, 'default'] as const) {
+		config[field] = {}
+		for (let prop in voidConfigInfo[field]) {
+			config[field][prop] = partialVoidConfig[field]?.[prop]?.trim() || voidConfigInfo[field][prop].defaultVal
+		}
+	}
+	return config as VoidConfig
+}
+
+const defaultVoidConfig: VoidConfig = getVoidConfigFromPartial({})
+
+// const [stateRef, setState] = useInstantState(initVal)
+// setState instantly changes the value of stateRef instead of having to wait until the next render
+const useInstantState = <T,>(initVal: T) => {
+	const stateRef = useRef<T>(initVal)
+	const [_, setS] = useState<T>(initVal)
+	const setState = useCallback((newVal: T) => {
+		setS(newVal);
+		stateRef.current = newVal;
+	}, [])
+	return [stateRef as React.RefObject<T>, setState] as const // make s.current readonly - setState handles all changes
+}
+
+
+
+type SetConfigParamType = <K extends VoidConfigField>(field: K, param: keyof VoidConfigInfo[K], newVal: string) => void
+
+type ConfigValueType = {
+	voidConfig: VoidConfig,
+	voidConfigInfo: VoidConfigInfo,
+	partialVoidConfig: PartialVoidConfig,
+	setConfigParam: SetConfigParamType
+}
+
+
+const ConfigContext = createContext<ConfigValueType>(undefined as unknown as ConfigValueType)
+
+export function ConfigProvider({ children }: { children: ReactNode }) {
+	const [partialVoidConfig, setPartialVoidConfig] = useInstantState<PartialVoidConfig>({}) // the user's selections
+	const [voidConfig, setVoidConfig] = useState<VoidConfig>(defaultVoidConfig)
+
+
+	// get the config on mount
+	useEffect(() => {
+		getVSCodeAPI().postMessage({ type: 'getPartialVoidConfig' })
+		awaitVSCodeResponse('partialVoidConfig').then((m) => {
+			setPartialVoidConfig(m.partialVoidConfig)
+			const newFullConfig = getVoidConfigFromPartial(m.partialVoidConfig)
+			setVoidConfig(newFullConfig)
+		})
+	}, [setPartialVoidConfig])
+
+	// return the provider
+	return (<ConfigContext.Provider
+		value={{
+			voidConfig,
+			voidConfigInfo,
+			partialVoidConfig: partialVoidConfig.current ?? {},
+			setConfigParam: (field, param, newVal) => {
+				const newPartialConfig: PartialVoidConfig = {
+					...partialVoidConfig.current,
+					[field]: {
+						...partialVoidConfig.current?.[field],
+						[param]: newVal
+					}
+				}
+				setPartialVoidConfig(newPartialConfig)
+				const newFullConfig = getVoidConfigFromPartial(newPartialConfig)
+				setVoidConfig(newFullConfig)
+				getVSCodeAPI().postMessage({ type: 'persistPartialVoidConfig', partialVoidConfig: newPartialConfig })
+			}
+		}}
+	>
+		{children}
+	</ConfigContext.Provider>
+	)
+}
+
+export function useVoidConfig(): ConfigValueType {
+	const context = useContext<ConfigValueType>(ConfigContext)
+	if (context === undefined) {
+		throw new Error("useVoidConfig missing Provider")
+	}
+	return context
+}

extensions/void/src/webviews/common/contextForProps.tsx

@@ -0,0 +1,36 @@
+import React, { ReactNode, createContext, useCallback, useContext, useEffect, useRef, useState, } from "react"
+
+const PropsContext = createContext<any>(undefined as unknown as any)
+
+// provider for whatever came in data-void-props
+export function PropsProvider({ children, rootElement }: { children: ReactNode, rootElement: HTMLElement }) {
+
+	const [props, setProps] = useState<object | null>(null)
+
+	// update props when rootElement changes
+	useEffect(() => {
+		let props = rootElement.getAttribute("data-void-props")
+		let propsObj: object | null = null
+		if (props !== null) {
+			propsObj = JSON.parse(decodeURIComponent(props))
+		}
+		setProps(propsObj)
+	}, [rootElement])
+
+	return (
+		<PropsContext.Provider value={props}>
+			{children}
+		</PropsContext.Provider>
+	)
+}
+
+export function useVoidProps<T extends {}>(): T | null {
+	// context is the "value" from above
+	const context: T | null | undefined = useContext<T>(PropsContext)
+	// only undefined if has no provider
+	if (context === undefined) {
+		throw new Error("useVoidProps missing Provider")
+	}
+	return context
+}
+

extensions/void/src/webviews/common/contextForThreads.tsx

@@ -0,0 +1,106 @@
+import React, { ReactNode, createContext, useCallback, useContext, useEffect, useRef, useState, } from "react"
+import { ChatMessage, ChatThreads } from "../../common/shared_types"
+import { awaitVSCodeResponse, getVSCodeAPI } from "./getVscodeApi"
+
+
+// a "thread" means a chat message history
+type ConfigForThreadsValueType = {
+	readonly getAllThreads: () => ChatThreads;
+	readonly getCurrentThread: () => ChatThreads[string] | null;
+	addMessageToHistory: (message: ChatMessage) => void;
+	switchToThread: (threadId: string) => void;
+	startNewThread: () => void;
+}
+
+const ThreadsContext = createContext<ConfigForThreadsValueType>(undefined as unknown as ConfigForThreadsValueType)
+
+const createNewThread = () => {
+	const now = new Date().toISOString()
+	return {
+		id: new Date().getTime().toString(),
+		createdAt: now,
+		lastModified: now,
+		messages: [],
+	}
+}
+
+
+// const [stateRef, setState] = useInstantState(initVal)
+// setState instantly changes the value of stateRef instead of having to wait until the next render
+const useInstantState = <T,>(initVal: T) => {
+	const stateRef = useRef<T>(initVal)
+	const [_, setS] = useState<T>(initVal)
+	const setState = useCallback((newVal: T) => {
+		setS(newVal);
+		stateRef.current = newVal;
+	}, [])
+	return [stateRef as React.RefObject<T>, setState] as const // make s.current readonly - setState handles all changes
+}
+
+
+export function ThreadsProvider({ children }: { children: ReactNode }) {
+	const [allThreadsRef, setAllThreads] = useInstantState<ChatThreads>({})
+	const [currentThreadIdRef, setCurrentThreadId] = useInstantState<string | null>(null)
+
+	// this loads allThreads in on mount
+	useEffect(() => {
+		getVSCodeAPI().postMessage({ type: 'getAllThreads' })
+		awaitVSCodeResponse('allThreads')
+			.then(response => {
+				setAllThreads(response.threads)
+			})
+	}, [setAllThreads])
+
+
+	return (
+		<ThreadsContext.Provider
+			value={{
+				getAllThreads: () => allThreadsRef.current ?? {},
+				getCurrentThread: () => currentThreadIdRef.current ? allThreadsRef.current?.[currentThreadIdRef.current] ?? null : null,
+				addMessageToHistory: (message: ChatMessage) => {
+					let currentThread: ChatThreads[string]
+					if (!(currentThreadIdRef.current === null || allThreadsRef.current === null)) {
+						currentThread = allThreadsRef.current[currentThreadIdRef.current]
+					}
+					else {
+						currentThread = createNewThread()
+						setCurrentThreadId(currentThread.id)
+					}
+
+					setAllThreads({
+						...allThreadsRef.current,
+						[currentThread.id]: {
+							...currentThread,
+							lastModified: new Date().toISOString(),
+							messages: [...currentThread.messages, message],
+						}
+					})
+
+					getVSCodeAPI().postMessage({ type: "persistThread", thread: currentThread })
+				},
+				switchToThread: (threadId: string) => {
+					setCurrentThreadId(threadId);
+				},
+				startNewThread: () => {
+					const newThread = createNewThread()
+					setAllThreads({
+						...allThreadsRef.current,
+						[newThread.id]: newThread
+					})
+					setCurrentThreadId(newThread.id)
+				},
+			}}
+		>
+			{children}
+		</ThreadsContext.Provider>
+	)
+}
+
+export function useThreads(): ConfigForThreadsValueType {
+	const context = useContext<ConfigForThreadsValueType>(ThreadsContext)
+	if (context === undefined) {
+		throw new Error("useThreads missing Provider")
+	}
+	return context
+}
+

extensions/void/src/webviews/common/getVscodeApi.ts

@@ -0,0 +1,94 @@
+import { useEffect } from "react";
+import { MessageFromSidebar, MessageToSidebar, } from "../../common/shared_types";
+import { v4 as uuidv4 } from 'uuid';
+
+
+type Command = MessageToSidebar['type']
+
+// messageType -> res[]
+const onetimeCallbacks: { [C in Command]: ((res: any) => void)[] } = {
+	"ctrl+l": [],
+	"ctrl+k": [],
+	"files": [],
+	"partialVoidConfig": [],
+	"startNewThread": [],
+	"allThreads": [],
+	"toggleThreadSelector": [],
+	"toggleSettings": [],
+	"deviceId": [],
+}
+
+// messageType -> id -> res
+const callbacks: { [C in Command]: { [id: string]: ((res: any) => void) } } = {
+	"ctrl+l": {},
+	"ctrl+k": {},
+	"files": {},
+	"partialVoidConfig": {},
+	"startNewThread": {},
+	"allThreads": {},
+	"toggleThreadSelector": {},
+	"toggleSettings": {},
+	"deviceId": {}
+}
+
+
+// use this function to await responses
+export const awaitVSCodeResponse = <C extends Command>(c: C) => {
+	let result: Promise<MessageToSidebar & { type: C }> = new Promise((res, rej) => {
+		onetimeCallbacks[c].push(res)
+	})
+	return result
+}
+
+
+// use this function to add a listener to a certain type of message
+export const useOnVSCodeMessage = <C extends Command>(messageType: C, fn: (e: MessageToSidebar & { type: C }) => void) => {
+	useEffect(() => {
+		const mType = messageType
+		const callbackId: string = uuidv4();
+		// @ts-ignore
+		callbacks[mType][callbackId] = fn;
+		return () => { delete callbacks[mType][callbackId] }
+	}, [messageType, fn])
+}
+
+
+
+// this function gets called whenever sidebar receives a message - it should only mount once
+export const onMessageFromVSCode = (m: MessageToSidebar) => {
+	// resolve all promises for this message type
+	for (let res of onetimeCallbacks[m.type]) {
+		res(m)
+		onetimeCallbacks[m.type].splice(0) // clear the array
+	}
+	// call the listener for this message type
+	for (let res of Object.values(callbacks[m.type])) {
+		res(m)
+	}
+}
+
+
+
+type AcquireVsCodeApiType = () => {
+	postMessage(message: MessageFromSidebar): void;
+	// setState(state: any): void; // getState and setState are made obsolete by us using { retainContextWhenHidden: true }
+	// getState(): any;
+};
+
+// VS Code exposes the function acquireVsCodeApi() to us, this variable makes sure it only gets called once
+let vsCodeApi: ReturnType<AcquireVsCodeApiType> | undefined;
+
+export function getVSCodeAPI(): ReturnType<AcquireVsCodeApiType> {
+	if (vsCodeApi)
+		return vsCodeApi;
+
+	try {
+		// @ts-expect-error
+		// eslint-disable-next-line no-undef
+		vsCodeApi = acquireVsCodeApi();
+		return vsCodeApi!;
+	} catch (error) {
+		console.error('Failed to acquire VS Code API:', error);
+		throw new Error('This script must be run in a VS Code webview context');
+	}
+}

extensions/void/src/webviews/common/mount.tsx

@@ -0,0 +1,66 @@
+import React, { useEffect } from "react";
+import * as ReactDOM from "react-dom/client"
+import { MessageToSidebar } from "../../common/shared_types";
+import { getVSCodeAPI, awaitVSCodeResponse, onMessageFromVSCode } from "./getVscodeApi";
+import { initPosthog, identifyUser } from "./posthog";
+import { ThreadsProvider } from "./contextForThreads";
+import { ConfigProvider } from "./contextForConfig";
+import { PropsProvider } from "./contextForProps";
+
+const ListenersAndTracking = () => {
+	// initialize posthog
+	useEffect(() => {
+		initPosthog()
+	}, [])
+
+	// when we get the deviceid, identify the user
+	useEffect(() => {
+		getVSCodeAPI().postMessage({ type: 'getDeviceId' });
+		awaitVSCodeResponse('deviceId').then((m => {
+			identifyUser(m.deviceId)
+		}))
+	}, [])
+
+	// Receive messages from the VSCode extension
+	useEffect(() => {
+		const listener = (event: MessageEvent) => {
+			const m = event.data as MessageToSidebar;
+			onMessageFromVSCode(m)
+		}
+		window.addEventListener('message', listener);
+		return () => window.removeEventListener('message', listener)
+	}, [])
+
+	return null
+}
+
+
+
+
+export const mount = (children: React.ReactNode) => {
+
+	if (typeof document === "undefined") {
+		console.error("index.tsx error: document was undefined")
+		return
+	}
+
+	// mount the sidebar on the id="root" element
+	const rootElement = document.getElementById("root")!
+	// console.log("Void root Element:", rootElement)
+
+	const content = (<>
+		<ListenersAndTracking />
+
+		<PropsProvider rootElement={rootElement}>
+			<ThreadsProvider>
+				<ConfigProvider>
+					{children}
+				</ConfigProvider>
+			</ThreadsProvider>
+		</PropsProvider>
+	</>)
+
+	const root = ReactDOM.createRoot(rootElement)
+	root.render(content);
+
+}

extensions/void/src/webviews/common/posthog.ts

@@ -0,0 +1,20 @@
+import posthog from 'posthog-js'
+
+
+export const identifyUser = (id: string) => {
+	posthog.identify(id)
+}
+
+export const captureEvent = (eventId: string, properties: object) => {
+	posthog.capture(eventId, properties)
+}
+
+export const initPosthog = () => {
+	// We send absolutely no code to the server. We only track usage metrics like button clicks, etc. This might change and we might eventually add an opt-in or opt-out.
+	posthog.init('phc_UanIdujHiLp55BkUTjB1AuBXcasVkdqRwgnwRlWESH2',
+		{
+			api_host: 'https://us.i.posthog.com',
+			person_profiles: 'identified_only' // we only track events from identified users. We identify them in Sidebar
+		}
+	)
+}

extensions/void/src/webviews/ctrlk/CtrlK.tsx

@@ -0,0 +1,27 @@
+import React, { useState } from 'react';
+import { useOnVSCodeMessage } from '../common/getVscodeApi';
+
+
+export const CtrlK = () => {
+
+	const [x, sx] = useState('abc')
+
+	useOnVSCodeMessage('ctrl+k', () => {
+		console.log('Ctrl+K pressed')
+		sx('Pressed ctrl+k')
+	})
+
+	// const inset = vscode.window.createWebviewTextEditorInset(editor, 10, 10, {})
+	// inset.webview.html = `
+	// <html>
+	// 	<body style="pointer-events:none;">Hello World!</body>
+	// </html>
+	// `;
+
+	return <>
+		<div>
+			{x}
+		</div>
+	</>
+};
+

extensions/void/src/webviews/ctrlk/index.tsx

@@ -0,0 +1,7 @@
+import React from "react"
+import { mount } from "../common/mount"
+import { CtrlK } from "./CtrlK"
+
+// this is the entry point that mounts ctrlk
+mount(<CtrlK />)
+

extensions/void/src/webviews/diffline/DiffLine.tsx

@@ -0,0 +1,29 @@
+import React, { useState } from 'react';
+import { useOnVSCodeMessage } from '../common/getVscodeApi';
+import { useVoidProps } from '../common/contextForProps';
+
+
+type props = {
+	text: string
+}
+
+export const DiffLine = () => {
+
+	const props = useVoidProps<props>()
+
+	console.log('props!', props)
+
+	if (!props) {
+		return null
+	}
+
+	// eslint-disable-next-line react/prop-types
+	const text = props.text
+
+	return <>
+		<div>
+			{text}
+		</div>
+	</>
+};
+

extensions/void/src/webviews/diffline/index.tsx

@@ -0,0 +1,7 @@
+import React from "react"
+import { mount } from "../common/mount"
+import { DiffLine } from "./DiffLine"
+
+// this is the entry point that mounts diffline
+mount(<DiffLine />)
+

extensions/void/src/webviews/sidebar/Sidebar.tsx

@@ -0,0 +1,67 @@
+import React, { useState, useEffect, useRef, useCallback, FormEvent } from "react"
+import { CodeSelection, ChatMessage, MessageToSidebar } from "../../common/shared_types"
+import { awaitVSCodeResponse, getVSCodeAPI, onMessageFromVSCode, useOnVSCodeMessage } from "../common/getVscodeApi"
+
+import { SidebarThreadSelector } from "./SidebarThreadSelector";
+import { SidebarChat } from "./SidebarChat";
+import { SidebarSettings } from "./SidebarSettings";
+import { identifyUser } from "../common/posthog";
+
+
+const Sidebar = () => {
+
+	const chatInputRef = useRef<HTMLTextAreaElement | null>(null)
+
+	const [tab, setTab] = useState<'threadSelector' | 'chat' | 'settings'>('chat')
+
+	// if they pressed the + to add a new chat
+	useOnVSCodeMessage('startNewThread', (m) => {
+		setTab('chat');
+		chatInputRef.current?.focus();
+	})
+
+	// ctrl+l should switch back to chat
+	useOnVSCodeMessage('ctrl+l', (m) => {
+		setTab('chat');
+		chatInputRef.current?.focus();
+	})
+
+	// if they toggled thread selector
+	useOnVSCodeMessage('toggleThreadSelector', (m) => {
+		if (tab === 'threadSelector') {
+			setTab('chat')
+			chatInputRef.current?.blur();
+		} else
+			setTab('threadSelector')
+	})
+
+	// if they toggled settings
+	useOnVSCodeMessage('toggleSettings', (m) => {
+		if (tab === 'settings') {
+			setTab('chat')
+			chatInputRef.current?.blur();
+		} else
+			setTab('settings')
+	})
+
+	return <>
+		<div className={`flex flex-col h-screen w-full`}>
+
+			<div className={`mb-2 h-[30vh] ${tab !== 'threadSelector' ? 'hidden' : ''}`}>
+				<SidebarThreadSelector onClose={() => setTab('chat')} />
+			</div>
+
+			<div className={`${tab !== 'chat' && tab !== 'threadSelector' ? 'hidden' : ''}`}>
+				<SidebarChat chatInputRef={chatInputRef} />
+			</div>
+
+			<div className={`${tab !== 'settings' ? 'hidden' : ''}`}>
+				<SidebarSettings />
+			</div>
+
+		</div>
+	</>
+
+}
+
+export default Sidebar

extensions/void/src/webviews/sidebar/SidebarChat.tsx

@@ -0,0 +1,359 @@
+import React, { FormEvent, useCallback, useEffect, useRef, useState } from "react";
+
+
+import { marked } from 'marked';
+import MarkdownRender from "./markdown/MarkdownRender";
+import BlockCode from "./markdown/BlockCode";
+import { File, ChatMessage, CodeSelection } from "../../common/shared_types";
+import * as vscode from 'vscode'
+import { awaitVSCodeResponse, getVSCodeAPI, onMessageFromVSCode, useOnVSCodeMessage } from "../common/getVscodeApi";
+import { useThreads } from "../common/contextForThreads";
+import { sendLLMMessage } from "../../common/sendLLMMessage";
+import { useVoidConfig } from "../common/contextForConfig";
+import { captureEvent } from "../common/posthog";
+import { generateDiffInstructions } from "../../common/systemPrompts";
+
+
+
+const filesStr = (fullFiles: File[]) => {
+	return fullFiles.map(({ filepath, content }) =>
+		`
+${filepath.fsPath}
+\`\`\`
+${content}
+\`\`\``).join('\n')
+}
+
+const userInstructionsStr = (instructions: string, files: File[], selection: CodeSelection | null) => {
+	let str = '';
+
+	if (files.length > 0) {
+		str += filesStr(files);
+	}
+
+	if (selection) {
+		str += `
+I am currently selecting this code:
+\t\`\`\`${selection.selectionStr}\`\`\`
+`;
+	}
+
+	if (files.length > 0 && selection) {
+		str += `
+Please edit the selected code or the entire file following these instructions:
+`;
+	} else if (files.length > 0) {
+		str += `
+Please edit the file following these instructions:
+`;
+	} else if (selection) {
+		str += `
+Please edit the selected code following these instructions:
+`;
+	}
+
+	str += `
+\t${instructions}
+`;
+	if (files.length > 0) {
+		str += `
+\tIf you make a change, rewrite the entire file.
+`; // TODO don't rewrite the whole file on prompt, instead rewrite it when click Apply
+	}
+	return str;
+};
+
+
+
+
+
+const getBasename = (pathStr: string) => {
+	// "unixify" path
+	pathStr = pathStr.replace(/[/\\]+/g, "/") // replace any / or \ or \\ with /
+	const parts = pathStr.split("/") // split on /
+	return parts[parts.length - 1]
+}
+
+export const SelectedFiles = ({ files, setFiles, }: { files: vscode.Uri[], setFiles: null | ((files: vscode.Uri[]) => void) }) => {
+	return (
+		files.length !== 0 && (
+			<div className="flex flex-wrap -mx-1 -mb-1">
+				{files.map((filename, i) => (
+					<button
+						key={filename.path}
+						disabled={!setFiles}
+						className={`btn btn-secondary btn-sm border border-vscode-input-border rounded flex items-center space-x-2 mx-1 mb-1 disabled:cursor-default`}
+						type="button"
+						onClick={() => setFiles?.([...files.slice(0, i), ...files.slice(i + 1, Infinity)])}
+					>
+						<span>{getBasename(filename.fsPath)}</span>
+
+						{/* X button */}
+						{!!setFiles && <span className="">
+							<svg
+								xmlns="http://www.w3.org/2000/svg"
+								fill="none"
+								viewBox="0 0 24 24"
+								stroke="currentColor"
+								className="size-4"
+							>
+								<path
+									strokeLinecap="round"
+									strokeLinejoin="round"
+									d="M6 18 18 6M6 6l12 12"
+								/>
+							</svg>
+						</span>}
+					</button>
+				))}
+			</div>
+		)
+	)
+}
+
+
+const ChatBubble = ({ chatMessage }: { chatMessage: ChatMessage }) => {
+
+	const role = chatMessage.role
+	const children = chatMessage.displayContent
+
+	if (!children)
+		return null
+
+	let chatbubbleContents: React.ReactNode
+
+	if (role === 'user') {
+		chatbubbleContents = <>
+			<SelectedFiles files={chatMessage.files} setFiles={null} />
+			{chatMessage.selection?.selectionStr && <BlockCode
+				text={chatMessage.selection.selectionStr}
+				buttonsOnHover={null}
+			/>}
+			{children}
+		</>
+	}
+	else if (role === 'assistant') {
+		chatbubbleContents = <MarkdownRender string={children} /> // sectionsHTML
+	}
+
+	return <div className={`${role === 'user' ? 'text-right' : 'text-left'}`}>
+		<div className={`inline-block p-2 rounded-lg space-y-2 ${role === 'user' ? 'bg-vscode-input-bg text-vscode-input-fg' : ''} max-w-full`}>
+			{chatbubbleContents}
+		</div>
+	</div>
+}
+
+
+
+export const SidebarChat = ({ chatInputRef }: { chatInputRef: React.RefObject<HTMLTextAreaElement> }) => {
+
+
+	// state of current message
+	const [selection, setSelection] = useState<CodeSelection | null>(null) // the code the user is selecting
+	const [files, setFiles] = useState<vscode.Uri[]>([]) // the names of the files in the chat
+	const [instructions, setInstructions] = useState('') // the user's instructions
+
+	// state of chat
+	const [messageStream, setMessageStream] = useState('')
+	const [isLoading, setIsLoading] = useState(false)
+	const abortFnRef = useRef<(() => void) | null>(null)
+
+	const [latestError, setLatestError] = useState('')
+
+	// higher level state
+	const { getAllThreads, getCurrentThread, addMessageToHistory, startNewThread, switchToThread } = useThreads()
+
+	const { voidConfig } = useVoidConfig()
+
+
+
+	// if they pressed the + to add a new chat
+	useOnVSCodeMessage('startNewThread', (m) => {
+		const allThreads = getAllThreads()
+		// find a thread with 0 messages and switch to it
+		for (let threadId in allThreads) {
+			if (allThreads[threadId].messages.length === 0) {
+				switchToThread(threadId)
+				return
+			}
+		}
+		// start a new thread
+		startNewThread()
+	})
+
+	// if user pressed ctrl+l, add their selection to the sidebar
+	useOnVSCodeMessage('ctrl+l', (m) => {
+		setSelection(m.selection)
+		const filepath = m.selection.filePath
+
+		// add current file to the context if it's not already in the files array
+		if (!files.find(f => f.fsPath === filepath.fsPath))
+			setFiles(files => [...files, filepath])
+	})
+
+
+	const isDisabled = !instructions
+
+	const formRef = useRef<HTMLFormElement | null>(null)
+	const onSubmit = async (e: FormEvent<HTMLFormElement>) => {
+
+		e.preventDefault()
+		if (isDisabled) return
+		if (isLoading) return
+
+		setIsLoading(true)
+		setInstructions('');
+		formRef.current?.reset(); // reset the form's text when clear instructions or unexpected behavior happens
+		setSelection(null)
+		setFiles([])
+		setLatestError('')
+
+		// request file content from vscode and await response
+		getVSCodeAPI().postMessage({ type: 'requestFiles', filepaths: files })
+		const relevantFiles = await awaitVSCodeResponse('files')
+
+		// add system message to chat history
+		const systemPromptElt: ChatMessage = { role: 'system', content: generateDiffInstructions }
+		addMessageToHistory(systemPromptElt)
+
+		const userContent = userInstructionsStr(instructions, relevantFiles.files, selection)
+		const newHistoryElt: ChatMessage = { role: 'user', content: userContent, displayContent: instructions, selection, files }
+		addMessageToHistory(newHistoryElt)
+
+		// send message to LLM
+		sendLLMMessage({
+			logging: { loggingName: 'Chat' },
+			messages: [...(getCurrentThread()?.messages ?? []).map(m => ({ role: m.role, content: m.content })),],
+			onText: (newText, fullText) => setMessageStream(fullText),
+			onFinalMessage: (content) => {
+
+				// add assistant's message to chat history, and clear selection
+				const newHistoryElt: ChatMessage = { role: 'assistant', content, displayContent: content }
+				addMessageToHistory(newHistoryElt)
+				setMessageStream('')
+				setIsLoading(false)
+			},
+			onError: (error) => {
+				// add assistant's message to chat history, and clear selection
+				let content = messageStream; // just use the current content
+				const newHistoryElt: ChatMessage = { role: 'assistant', content, displayContent: content, }
+				addMessageToHistory(newHistoryElt)
+				setMessageStream('')
+				setIsLoading(false)
+
+				setLatestError(error)
+			},
+			voidConfig,
+			abortRef: abortFnRef,
+		})
+
+
+	}
+
+	const onAbort = useCallback(() => {
+		// abort claude
+		abortFnRef.current?.()
+
+		// if messageStream was not empty, add it to the history
+		const llmContent = messageStream || '(null)'
+		const newHistoryElt: ChatMessage = { role: 'assistant', content: llmContent, displayContent: messageStream, }
+		addMessageToHistory(newHistoryElt)
+
+		setMessageStream('')
+		setIsLoading(false)
+
+	}, [messageStream, addMessageToHistory])
+
+
+	return <>
+		<div className="overflow-x-hidden space-y-4">
+			{/* previous messages */}
+			{getCurrentThread() !== null && getCurrentThread()?.messages.map((message, i) =>
+				<ChatBubble key={i} chatMessage={message} />
+			)}
+			{/* message stream */}
+			<ChatBubble chatMessage={{ role: 'assistant', content: messageStream, displayContent: messageStream }} />
+		</div>
+		{/* chatbar */}
+		<div className="shrink-0 py-4">
+			{/* selection */}
+			<div className="text-left">
+				<div className="relative">
+					<div className="input">
+						{/* selection */}
+						{(files.length || selection?.selectionStr) && <div className="p-2 pb-0 space-y-2">
+							{/* selected files */}
+							<SelectedFiles files={files} setFiles={setFiles} />
+							{/* selected code */}
+							{!!selection?.selectionStr && (
+								<BlockCode text={selection.selectionStr}
+									buttonsOnHover={(
+										<button
+											onClick={() => setSelection(null)}
+											className="btn btn-secondary btn-sm border border-vscode-input-border rounded"
+										>
+											Remove
+										</button>
+									)} />
+							)}
+						</div>}
+
+						<form
+							ref={formRef}
+							className="flex flex-row items-center rounded-md p-2"
+							onKeyDown={(e) => { if (e.key === 'Enter' && !e.shiftKey) onSubmit(e) }}
+
+							onSubmit={(e) => {
+								console.log('submit!')
+								onSubmit(e)
+							}}>
+							{/* input */}
+
+							<textarea
+								ref={chatInputRef}
+								onChange={(e) => { setInstructions(e.target.value) }}
+								className="w-full p-2 leading-tight resize-none max-h-[50vh] overflow-hidden bg-transparent border-none !outline-none"
+								placeholder="Ctrl+L to select"
+								rows={1}
+								onInput={e => { e.currentTarget.style.height = 'auto'; e.currentTarget.style.height = e.currentTarget.scrollHeight + 'px' }} // Adjust height dynamically
+							/>
+							{isLoading ?
+								// stop button
+								<button
+									onClick={onAbort}
+									type='button'
+									className="btn btn-primary font-bold size-8 flex justify-center items-center rounded-full p-2 max-h-10"
+								>
+									<svg
+										className='scale-50'
+										stroke="currentColor" fill="currentColor" strokeWidth="0" viewBox="0 0 24 24" height="24" width="24" xmlns="http://www.w3.org/2000/svg">
+										<path d="M24 24H0V0h24v24z"></path>
+									</svg>
+								</button>
+								:
+								// submit button (up arrow)
+								<button
+									className="btn btn-primary font-bold size-8 flex justify-center items-center rounded-full p-2 max-h-10"
+									disabled={isDisabled}
+									type='submit'
+								>
+									<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+										<line x1="12" y1="19" x2="12" y2="5"></line>
+										<polyline points="5 12 12 5 19 12"></polyline>
+									</svg>
+								</button>
+							}
+						</form>
+					</div>
+				</div>
+			</div>
+
+			{/* error message */}
+			{!latestError ? null : <div>
+				{latestError}
+			</div>}
+		</div>
+	</>
+}
+
+

extensions/void/src/webviews/sidebar/SidebarSettings.tsx

@@ -0,0 +1,105 @@
+import React, { useState } from "react";
+import { configFields, useVoidConfig, VoidConfigField } from "../common/contextForConfig";
+
+
+const SettingOfFieldAndParam = ({ field, param }: { field: VoidConfigField, param: string }) => {
+	const { voidConfig, partialVoidConfig, voidConfigInfo, setConfigParam } = useVoidConfig()
+	const { enumArr, defaultVal, description } = voidConfigInfo[field][param]
+	const val = partialVoidConfig[field]?.[param] ?? defaultVal // current value of this item
+
+	const updateState = (newValue: string) => { setConfigParam(field, param, newValue) }
+
+	const resetButton = <button
+		disabled={val === defaultVal}
+		title={val === defaultVal ? 'This is the default value.' : `Revert value to '${defaultVal}'?`}
+		className='group btn btn-sm disabled:opacity-75 disabled:cursor-default'
+		onClick={() => updateState(defaultVal)}
+	>
+		<svg
+			className='size-5 group-disabled:stroke-current group-disabled:fill-current group-hover:stroke-red-600 group-hover:fill-red-600 duration-200'
+			fill="currentColor" strokeWidth="0" viewBox="0 0 16 16" height="200px" width="200px" xmlns="http://www.w3.org/2000/svg"><path fillRule="evenodd" clipRule="evenodd" d="M3.5 2v3.5L4 6h3.5V5H4.979l.941-.941a3.552 3.552 0 1 1 5.023 5.023L5.746 14.28l.72.72 5.198-5.198A4.57 4.57 0 0 0 5.2 3.339l-.7.7V2h-1z"></path>
+		</svg>
+	</button>
+
+	const inputElement = enumArr === undefined ?
+		// string
+		(<input
+			className='input p-1 w-full'
+			type="text"
+			value={val}
+			onChange={(e) => updateState(e.target.value)}
+		/>)
+		:
+		// enum
+		(<select
+			className='dropdown p-1 w-full'
+			value={val}
+			onChange={(e) => updateState(e.target.value)}
+		>
+			{enumArr.map((option) => (
+				<option key={option} value={option}>
+					{option}
+				</option>
+			))}
+		</select>)
+
+	return <div>
+		<label className='hidden'>{param}</label>
+		<span>{description}</span>
+		<div className='flex items-center'>
+			{inputElement}
+			{resetButton}
+		</div>
+	</div>
+}
+
+export const SidebarSettings = () => {
+
+	const { voidConfig, voidConfigInfo } = useVoidConfig()
+
+	const current_field = voidConfig.default['whichApi'] as VoidConfigField
+
+
+	return (
+		<div className='space-y-4 py-2 overflow-y-auto'>
+
+			{/* choose the field */}
+			<div className='outline-vscode-input-bg'>
+				<SettingOfFieldAndParam
+					field='default'
+					param='whichApi'
+				/>
+				<SettingOfFieldAndParam
+					field='default'
+					param='maxTokens'
+				/>
+			</div>
+
+			<hr />
+
+			{/* render all fields, but hide the ones not visible for fast tab switching */}
+			{configFields.map(field => {
+				return <div
+					key={field}
+					className={`flex flex-col gap-y-2 ${field !== current_field ? 'hidden' : ''}`}
+				>
+					{Object.keys(voidConfigInfo[field]).map((param) => (
+						<SettingOfFieldAndParam
+							key={param}
+							field={field}
+							param={param}
+						/>
+					))}
+				</div>
+			})}
+
+			{/* Remove this after 10/21/24, this is just to give developers a heads up about the recent change  */}
+			<div className='pt-20'>
+				{`We recently updated Settings. To copy your old Void settings over, press Ctrl+Shift+P, `}
+				{`type 'Open User Settings (JSON)',`}
+				{` and look for 'void.'. `}
+			</div>
+		</div>
+	)
+}
+

extensions/void/src/webviews/sidebar/SidebarThreadSelector.tsx

@@ -0,0 +1,79 @@
+import React from "react";
+import { ThreadsProvider, useThreads } from "../common/contextForThreads";
+
+
+const truncate = (s: string) => {
+	let len = s.length
+	const TRUNC_AFTER = 16
+	if (len >= TRUNC_AFTER)
+		s = s.substring(0, TRUNC_AFTER) + '...'
+	return s
+}
+
+
+export const SidebarThreadSelector = ({ onClose }: { onClose: () => void }) => {
+	const { getAllThreads, getCurrentThread, switchToThread } = useThreads()
+
+	const allThreads = getAllThreads()
+
+	// sorted by most recent to least recent
+	const sortedThreadIds = Object.keys(allThreads ?? {}).sort((threadId1, threadId2) => allThreads![threadId1].lastModified > allThreads![threadId2].lastModified ? 1 : -1)
+
+	return (
+		<div className="flex flex-col gap-y-1">
+
+			{/* X button at top right */}
+			<div className="text-right">
+				<button className="btn btn-sm" onClick={onClose}>
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						fill="none"
+						viewBox="0 0 24 24"
+						stroke="currentColor"
+						className="size-4"
+					>
+						<path
+							strokeLinecap="round"
+							strokeLinejoin="round"
+							d="M6 18 18 6M6 6l12 12"
+						/>
+					</svg>
+				</button>
+			</div>
+
+			{/* a list of all the past threads */}
+			<div className='flex flex-col gap-y-1 max-h-80 overflow-y-auto'>
+				{sortedThreadIds.map((threadId) => {
+					if (!allThreads)
+						return <>Error: Threads not found.</>
+					const pastThread = allThreads[threadId]
+
+					let btnStringArr = []
+
+					let msg1 = truncate(allThreads[threadId].messages[0]?.displayContent ?? '(empty)')
+					btnStringArr.push(msg1)
+
+					let msg2 = truncate(allThreads[threadId].messages[1]?.displayContent ?? '')
+					if (msg2)
+						btnStringArr.push(msg2)
+
+					btnStringArr.push(allThreads[threadId].messages.length)
+
+					const btnString = btnStringArr.join(' / ')
+
+					return (
+						<button
+							key={pastThread.id}
+							className={`btn btn-sm rounded-sm ${pastThread.id === getCurrentThread()?.id ? "btn-primary" : "btn-secondary"}`}
+							onClick={() => switchToThread(pastThread.id)}
+							title={new Date(pastThread.createdAt).toLocaleString()}
+						>
+							{btnString}
+						</button>
+					)
+				})}
+			</div>
+
+		</div>
+	)
+}

extensions/void/src/webviews/sidebar/index.tsx

@@ -0,0 +1,7 @@
+import React from "react"
+import Sidebar from "./Sidebar"
+import { mount } from "../common/mount"
+
+// this is the entry point that mounts the sidebar
+mount(<Sidebar />)
+

extensions/void/src/webviews/sidebar/markdown/BlockCode.tsx

@@ -0,0 +1,42 @@
+import React, { ReactNode, useCallback, useEffect, useState } from "react"
+import SyntaxHighlighter from "react-syntax-highlighter";
+import { atomOneDarkReasonable } from "react-syntax-highlighter/dist/esm/styles/hljs";
+
+
+const BlockCode = ({ text, buttonsOnHover, language }: { text: string, buttonsOnHover?: ReactNode, language?: string }) => {
+
+	const customStyle = {
+		...atomOneDarkReasonable,
+		'code[class*="language-"]': {
+			...atomOneDarkReasonable['code[class*="language-"]'],
+			background: "none",
+		},
+	}
+
+	return (<>
+		<div className={`relative group w-full bg-vscode-sidebar-bg overflow-hidden isolate`}>
+
+			{!toolbar ? null : (
+				<div className="absolute top-0 right-0 opacity-0 group-hover:opacity-100 duration-200">
+					<div className="flex space-x-2 p-2">{buttonsOnHover === null ? null : buttonsOnHover}</div>
+				</div>
+			)}
+
+			<div
+				className={`overflow-x-auto rounded-sm text-vscode-editor-fg bg-vscode-editor-bg`}
+			>
+				<SyntaxHighlighter
+					language={language ?? 'plaintext'} // TODO must auto detect language
+					style={customStyle}
+					className={"rounded-sm"}
+				>
+					{text}
+				</SyntaxHighlighter>
+
+			</div>
+		</div>
+	</>
+	)
+}
+
+export default BlockCode

extensions/void/src/webviews/sidebar/markdown/MarkdownRender.tsx

@@ -0,0 +1,223 @@
+import React, { JSX, useCallback, useEffect, useState } from "react"
+import { marked, MarkedToken, Token, TokensList } from "marked"
+import BlockCode from "./BlockCode"
+import { getVSCodeAPI } from "../../common/getVscodeApi"
+
+
+enum CopyButtonState {
+	Copy = "Copy",
+	Copied = "Copied!",
+	Error = "Could not copy",
+}
+
+const COPY_FEEDBACK_TIMEOUT = 1000 // amount of time to say 'Copied!'
+
+const CodeButtonsOnHover = ({ diffRepr: text }: { diffRepr: string }) => {
+	const [copyButtonState, setCopyButtonState] = useState(CopyButtonState.Copy)
+
+	useEffect(() => {
+		if (copyButtonState !== CopyButtonState.Copy) {
+			setTimeout(() => {
+				setCopyButtonState(CopyButtonState.Copy)
+			}, COPY_FEEDBACK_TIMEOUT)
+		}
+	}, [copyButtonState])
+
+	const onCopy = useCallback(() => {
+		navigator.clipboard.writeText(text).then(
+			() => {
+				setCopyButtonState(CopyButtonState.Copied)
+			},
+			() => {
+				setCopyButtonState(CopyButtonState.Error)
+			}
+		)
+	}, [text])
+
+	return <>
+		<button
+			className="btn btn-secondary btn-sm border border-vscode-input-border rounded"
+			onClick={onCopy}
+		>
+			{copyButtonState}
+		</button>
+		<button
+			className="btn btn-secondary btn-sm border border-vscode-input-border rounded"
+			onClick={async () => {
+				getVSCodeAPI().postMessage({ type: "applyChanges", diffRepr: text })
+			}}
+		>
+			Apply
+		</button>
+	</>
+}
+
+
+const RenderToken = ({ token, nested = false }: { token: Token | string, nested?: boolean }): JSX.Element => {
+
+	// deal with built-in tokens first (assume marked token)
+	const t = token as MarkedToken
+
+	if (t.type === "space") {
+		return <span>{t.raw}</span>
+	}
+
+	if (t.type === "code") {
+		return <BlockCode
+			text={t.text}
+			language={t.lang}
+			buttonsOnHover={<CodeButtonsOnHover diffRepr={t.text} />}
+		/>
+	}
+
+	if (t.type === "heading") {
+		const HeadingTag = `h${t.depth}` as keyof JSX.IntrinsicElements
+		return <HeadingTag>{t.text}</HeadingTag>
+	}
+
+	if (t.type === "table") {
+		return (
+			<table>
+				<thead>
+					<tr>
+						{t.header.map((cell: any, index: number) => (
+							<th key={index} style={{ textAlign: t.align[index] || "left" }}>
+								{cell.raw}
+							</th>
+						))}
+					</tr>
+				</thead>
+				<tbody>
+					{t.rows.map((row: any[], rowIndex: number) => (
+						<tr key={rowIndex}>
+							{row.map((cell: any, cellIndex: number) => (
+								<td
+									key={cellIndex}
+									style={{ textAlign: t.align[cellIndex] || "left" }}
+								>
+									{cell.raw}
+								</td>
+							))}
+						</tr>
+					))}
+				</tbody>
+			</table>
+		)
+	}
+
+	if (t.type === "hr") {
+		return <hr />
+	}
+
+	if (t.type === "blockquote") {
+		return <blockquote>{t.text}</blockquote>
+	}
+
+	if (t.type === "list") {
+		const ListTag = t.ordered ? "ol" : "ul"
+		return (
+			<ListTag
+				start={t.start ? t.start : undefined}
+				className={`list-inside ${t.ordered ? "list-decimal" : "list-disc"}`}
+			>
+				{t.items.map((item, index) => (
+					<li key={index}>
+						{item.task && (
+							<input type="checkbox" checked={item.checked} readOnly />
+						)}
+						<MarkdownRender string={item.text} nested={true} />
+					</li>
+				))}
+			</ListTag>
+		)
+	}
+
+	if (t.type === "paragraph") {
+		const contents = <>
+			{t.tokens.map((token, index) => (
+				<RenderToken key={index} token={token} />
+			))}
+		</>
+		if (nested)
+			return contents
+		return <p>{contents}</p>
+	}
+
+	// don't actually render <html> tags, just render strings of them
+	if (t.type === "html") {
+		return (
+			<pre>
+				{`<html>`}
+				{t.raw}
+				{`</html>`}
+			</pre>
+		)
+	}
+
+	if (t.type === "text" || t.type === "escape") {
+		return <span>{t.raw}</span>
+	}
+
+	if (t.type === "def") {
+		return <></> // Definitions are typically not rendered
+	}
+
+	if (t.type === "link") {
+		return (
+			<a href={t.href} title={t.title ?? undefined}>
+				{t.text}
+			</a>
+		)
+	}
+
+	if (t.type === "image") {
+		return <img src={t.href} alt={t.text} title={t.title ?? undefined} />
+	}
+
+	if (t.type === "strong") {
+		return <strong>{t.text}</strong>
+	}
+
+	if (t.type === "em") {
+		return <em>{t.text}</em>
+	}
+
+	// inline code
+	if (t.type === "codespan") {
+		return (
+			<code className="text-vscode-editor-fg bg-vscode-editor-bg px-1 rounded-sm font-mono">
+				{t.text}
+			</code>
+		)
+	}
+
+	if (t.type === "br") {
+		return <br />
+	}
+
+	// strikethrough
+	if (t.type === "del") {
+		return <del>{t.text}</del>
+	}
+
+	// default
+	return (
+		<div className="bg-orange-50 rounded-sm overflow-hidden">
+			<span className="text-xs text-orange-500">Unknown type:</span>
+			{t.raw}
+		</div>
+	)
+}
+
+const MarkdownRender = ({ string, nested = false }: { string: string, nested?: boolean }) => {
+	const tokens = marked.lexer(string); // https://marked.js.org/using_pro#renderer
+	return (
+		<>
+			{tokens.map((token, index) => (
+				<RenderToken key={index} token={token} nested={nested} />
+			))}
+		</>
+	)
+}
+
+export default MarkdownRender

extensions/void/src/webviews/styles.css

@@ -1,37 +1,10 @@
-/*--------------------------------------------------------------------------------------
- *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
- *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
- *--------------------------------------------------------------------------------------*/
+/* all the styles are shared right now between all webviews */
 
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
 
-
-.select-child-restyle select {
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	padding-right: 24px;
-}
-
-* {
-	outline: none !important;
-}
-
-
-
-.inherit-bg-all-restyle > * {
-	background-color: inherit !important;
-}
-
-
-.bg-editor-style-override {
-	--vscode-sideBar-background: var(--vscode-editor-background);
-}
-
-
-
-/* html {
+html {
 	font-size: var(--vscode-font-size);
 }
 
@@ -58,6 +31,7 @@
 		}
 	}
 
+	/* add transparency when disabled */
 	&:disabled {
 		@apply opacity-75 cursor-not-allowed;
 	}
@@ -69,4 +43,4 @@
 
 .dropdown {
 	@apply bg-vscode-dropdown-bg text-vscode-dropdown-foreground border-vscode-dropdown-border focus:outline-vscode-focus-border;
-} */
+}

extensions/void/tailwind.config.js

@@ -0,0 +1,31 @@
+/** @type {import('tailwindcss').Config} */
+
+// inject user's vscode theme colors: https://code.visualstudio.com/api/extension-guides/webview#theming-webview-content
+module.exports = {
+	content: ["./src/webviews/**/*.{html,js,ts,jsx,tsx}"],
+	theme: {
+		extend: {
+			colors: {
+				vscode: {
+					"sidebar-bg": "var(--vscode-sideBar-background)",
+					"editor-bg": "var(--vscode-editor-background)",
+					"editor-fg": "var(--vscode-editor-foreground)",
+					"input-bg": "var(--vscode-input-background)",
+					"input-fg": "var(--vscode-input-foreground)",
+					"input-border": "var(--vscode-input-border)",
+					"button-fg": "var(--vscode-button-foreground)",
+					"button-bg": "var(--vscode-button-background)",
+					"button-hoverBg": "var(--vscode-button-hoverBackground)",
+					"button-secondary-fg": "var(--vscode-button-secondaryForeground)",
+					"button-secondary-bg": "var(--vscode-button-secondaryBackground)",
+					"button-secondary-hoverBg": "var(--vscode-button-secondaryHoverBackground)",
+					"dropdown-bg": "var(--vscode-settings-dropdownBackground)",
+					"dropdown-foreground": "var(--vscode-settings-dropdownForeground)",
+					"dropdown-border": "var(--vscode-settings-dropdownBorder)",
+					"focus-border": "var(--vscode-focusBorder)",
+				},
+			},
+		},
+	},
+	plugins: [],
+};

extensions/void/tsconfig.json

@@ -0,0 +1,31 @@
+{
+	"include": [
+		"src/**/*",
+		"../../src/vscode-dts/vscode.d.ts",
+	],
+	"exclude": [
+		"node_modules"
+	],
+	"compilerOptions": {
+		"jsx": "react",
+		"module": "Node16",
+		"target": "ES6",
+		"outDir": "out",
+		"types": [
+			"node",
+			"mocha",
+		],
+		"lib": [
+			"dom",
+			"es6",
+			"dom.iterable",
+		],
+		"sourceMap": true,
+		"rootDir": "src",
+		"strict": true, /* enable all strict type-checking options */
+		/* Additional Checks */
+		// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
+		// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
+		// "noUnusedParameters": true,  /* Report errors on unused parameters. */
+	}
+}

package.json

@@ -1,19 +1,14 @@
 {
-  "name": "void-dev",
-  "productName": "Void",
+  "name": "code-oss-dev",
   "version": "1.94.0",
-  "distro": "this is a commit number if we want to publish on npm",
-  "homepage": "https://voideditor.com",
+  "distro": "ffcc24343ac46468a625666e5b9e673971dd1a1f",
   "author": {
-    "name": "Glass Devtools, Inc.",
-    "email": "andrew@voideditor.com"
+    "name": "Microsoft Corporation"
   },
   "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",
@@ -77,13 +72,9 @@
     "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",
-    "@rrweb/record": "^2.0.0-alpha.17",
-    "@rrweb/types": "^2.0.0-alpha.17",
     "@vscode/deviceid": "^0.1.1",
     "@vscode/iconv-lite-umd": "0.7.0",
     "@vscode/policy-watcher": "^1.1.4",
@@ -94,7 +85,6 @@
     "@vscode/sudo-prompt": "9.3.1",
     "@vscode/tree-sitter-wasm": "^0.0.4",
     "@vscode/vscode-languagedetection": "1.0.21",
-    "@vscode/webview-ui-toolkit": "^1.4.0",
     "@vscode/windows-mutex": "^0.5.0",
     "@vscode/windows-process-tree": "^0.6.0",
     "@vscode/windows-registry": "^1.1.0",
@@ -106,26 +96,17 @@
     "@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",
     "jschardet": "3.1.3",
     "kerberos": "2.1.1",
-    "lucide-react": "^0.460.0",
     "minimist": "^1.2.6",
     "native-is-elevated": "0.7.0",
     "native-keymap": "^3.3.5",
     "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",
+    "openai": "^4.70.2",
     "tas-client-umd": "0.2.0",
     "v8-inspect-profiler": "^0.1.1",
     "vscode-oniguruma": "1.7.0",
@@ -139,17 +120,12 @@
     "@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",
     "@types/minimist": "^1.2.1",
     "@types/mocha": "^9.1.1",
     "@types/node": "20.x",
-    "@types/react": "^18.3.12",
-    "@types/react-dom": "^18.3.1",
-    "@types/react-syntax-highlighter": "^15.5.13",
     "@types/sinon": "^10.0.2",
     "@types/sinon-test": "^2.4.2",
     "@types/trusted-types": "^1.0.6",
@@ -215,7 +191,6 @@
     "istanbul-lib-source-maps": "^4.0.1",
     "istanbul-reports": "^3.1.5",
     "lazy.js": "^0.4.2",
-    "marked": "^15.0.0",
     "merge-options": "^1.0.1",
     "mime": "^1.4.1",
     "minimatch": "^3.0.4",
@@ -223,8 +198,6 @@
     "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",
     "opn": "^6.0.0",
     "original-fs": "^1.2.0",
@@ -235,19 +208,16 @@
     "postcss-nesting": "^12.0.2",
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",
-    "rimraf": "^2.7.1",
-    "scope-tailwind": "^1.0.5",
+    "rimraf": "^2.2.8",
     "sinon": "^12.0.1",
     "sinon-test": "^3.1.3",
     "source-map": "0.6.1",
     "source-map-support": "^0.3.2",
     "style-loader": "^3.3.2",
-    "tailwindcss": "^3.4.14",
     "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",
     "tsec": "0.2.7",
     "tslib": "^2.6.3",
-    "tsup": "^8.3.5",
     "typescript": "^5.7.0-dev.20240903",
     "util": "^0.12.4",
     "webpack": "^5.94.0",

product.json

@@ -1,38 +1,84 @@
 {
 	"nameShort": "Void",
 	"nameLong": "Void",
-	"applicationName": "void",
-	"dataFolderName": ".void-editor",
-	"win32MutexName": "voideditor",
+	"applicationName": "code-oss",
+	"dataFolderName": ".vscode-oss",
+	"win32MutexName": "vscodeoss",
 	"licenseName": "MIT",
-	"licenseUrl": "https://github.com/voideditor/void/blob/main/LICENSE.txt",
-	"serverLicenseUrl": "https://github.com/voideditor/void/blob/main/LICENSE.txt",
+	"licenseUrl": "https://github.com/microsoft/vscode/blob/main/LICENSE.txt",
+	"serverLicenseUrl": "https://github.com/microsoft/vscode/blob/main/LICENSE.txt",
 	"serverGreeting": [],
 	"serverLicense": [],
 	"serverLicensePrompt": "",
-	"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",
+	"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",
 	"licenseFileName": "LICENSE.txt",
-	"reportIssueUrl": "https://github.com/voideditor/void/issues/new",
+	"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
 	"nodejsRepository": "https://nodejs.org",
-	"urlProtocol": "void-editor",
-	"extensionsGallery": {
-		"serviceUrl": "https://open-vsx.org/vscode/gallery",
-		"itemUrl": "https://open-vsx.org/vscode/item"
-	},
-	"builtInExtensions": []
+	"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"
+			}
+		}
+	]
 }

resources/win32/VisualElementsManifest.xml

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

@@ -1,7 +1,6 @@
 {
 	"extends": "./tsconfig.base.json",
 	"compilerOptions": {
-		// "jsx": "react", // <-- Void added this
 		"esModuleInterop": true,
 		"removeComments": false,
 		"preserveConstEnums": true,
@@ -52,10 +51,6 @@
 		"./typings",
 		"./vs/**/*.ts",
 		"vscode-dts/vscode.proposed.*.d.ts",
-		"vscode-dts/vscode.d.ts",
-
-		// Void added these:
-		// "./vs/workbench/contrib/void/browser/**.tsx",
-		// "./vs/**/*.d.mts",
+		"vscode-dts/vscode.d.ts"
 	]
 }

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', 'on');
+				this.input.setAttribute('wrap', 'off');
 				this.mirror.style.whiteSpace = 'pre';
 				this.mirror.style.wordWrap = 'initial';
 			}

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

@@ -121,11 +121,6 @@ import { normalizeNFC } from '../../base/common/normalization.js';
 import { ICSSDevelopmentService, CSSDevelopmentService } from '../../platform/cssDev/node/cssDevService.js';
 import { ExtensionSignatureVerificationService, IExtensionSignatureVerificationService } from '../../platform/extensionManagement/node/extensionSignatureVerificationService.js';
 
-import { LLMMessageChannel } from '../../platform/void/electron-main/llmMessageChannel.js';
-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).
@@ -153,7 +148,7 @@ export class CodeApplication extends Disposable {
 		@IStateService private readonly stateService: IStateService,
 		@IFileService private readonly fileService: IFileService,
 		@IProductService private readonly productService: IProductService,
-		@IUserDataProfilesMainService private readonly userDataProfilesMainService: IUserDataProfilesMainService,
+		@IUserDataProfilesMainService private readonly userDataProfilesMainService: IUserDataProfilesMainService
 	) {
 		super();
 
@@ -513,16 +508,6 @@ export class CodeApplication extends Disposable {
 		});
 
 		//#endregion
-
-		// //#region Void IPC
-		// validatedIpcMain.handle('vscode:sendLLMMessage', async (event, data) => {
-		// 	try {
-		// 		await this.sendLLMMessage(data);
-		// 	} catch (error) {
-		// 		console.error('Error sending LLM message:', error);
-		// 	}
-		// });
-		// //#endregion
 	}
 
 	private onUnexpectedError(error: Error): void {
@@ -1106,10 +1091,6 @@ export class CodeApplication extends Disposable {
 			services.set(ITelemetryService, NullTelemetryService);
 		}
 
-		// 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));
 		services.set(IExtensionsScannerService, new SyncDescriptor(ExtensionsScannerService, undefined, true));
@@ -1244,16 +1225,6 @@ export class CodeApplication extends Disposable {
 		mainProcessElectronServer.registerChannel('logger', loggerChannel);
 		sharedProcessClient.then(client => client.registerChannel('logger', loggerChannel));
 
-		// Void - use loggerChannel as reference
-		const metricsChannel = ProxyChannel.fromService(accessor.get(IMetricsService), disposables);
-		mainProcessElectronServer.registerChannel('void-channel-metrics', metricsChannel);
-
-		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));
 		mainProcessElectronServer.registerChannel('extensionhostdebugservice', electronExtensionHostDebugBroadcastChannel);

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

@@ -1,3 +1,5 @@
+// import * as dom from '../../../../base/browser/dom.js';
+
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
@@ -5,11 +7,12 @@ import { IModelDeltaDecoration } from '../../../common/model.js';
 import { ICodeEditor, IViewZone } from '../../editorBrowser.js';
 import { IRange } from '../../../common/core/range.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
+// // ------ eslint-disable-next-line local/code-import-patterns
+// import openai from 'openai'
 
+// console.log(openai.apply);
 
-// THIS FILE IS OLD + UNUSED!!!
-
-// SEE inlineDiffsService.ts INSTEAD.
+// import { sendLLMMessage } from './sendLLMMessage.js';
 
 export interface IInlineDiffService {
 	readonly _serviceBrand: undefined;
@@ -17,7 +20,7 @@ export interface IInlineDiffService {
 	removeDiffs(editor: ICodeEditor): void;
 }
 
-export const IInlineDiffService = createDecorator<IInlineDiffService>('inlineDiffServiceOld');
+export const IInlineDiffService = createDecorator<IInlineDiffService>('inlineDiffService');
 
 class InlineDiffService extends Disposable implements IInlineDiffService {
 	private readonly _diffDecorations = new Map<ICodeEditor, string[]>();
@@ -64,21 +67,21 @@ class InlineDiffService extends Disposable implements IInlineDiffService {
 			const fontInfo = editor.getOption(EditorOption.fontInfo);
 
 			const domNode = document.createElement('div');
-			// domNode.className = 'monaco-editor view-zones line-delete monaco-mouse-cursor-text';
+			domNode.className = 'monaco-editor view-zones line-delete monaco-mouse-cursor-text';
 			domNode.style.fontSize = `${fontInfo.fontSize}px`;
 			domNode.style.fontFamily = fontInfo.fontFamily;
 			domNode.style.lineHeight = `${fontInfo.lineHeight}px`;
 
 			// div
 			const lineContent = document.createElement('div');
-			// lineContent.className = 'view-line'; // .monaco-editor .inline-deleted-text
+			lineContent.className = 'view-line'; // .monaco-editor .inline-deleted-text
 
 			// span
 			const contentSpan = document.createElement('span');
 
 			// span
 			const codeSpan = document.createElement('span');
-			// codeSpan.className = 'mtk1'; // char-delete
+			codeSpan.className = 'mtk1'; // char-delete
 			codeSpan.textContent = originalText;
 
 			// Mount

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

@@ -223,11 +223,6 @@ 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.KeyM // Void changed this to Cmd+M
+				primary: KeyMod.CtrlCmd | KeyCode.KeyL
 			},
 		});
 	}

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

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

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

@@ -31,29 +31,25 @@ export class ServerTelemetryService extends TelemetryService implements IServerT
 	}
 
 	override publicLog(eventName: string, data?: ITelemetryData) {
-		// Void commented this out
-		// if (this._injectedTelemetryLevel < TelemetryLevel.USAGE) {
-		// 	return;
-		// }
-		// return super.publicLog(eventName, data);
+		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>) {
-		// Void commented this out
-		// return this.publicLog(eventName, data as ITelemetryData | undefined);
+		return this.publicLog(eventName, data as ITelemetryData | undefined);
 	}
 
 	override publicLogError(errorEventName: string, data?: ITelemetryData) {
-		// Void commented this out
-		// if (this._injectedTelemetryLevel < TelemetryLevel.ERROR) {
-		// 	return Promise.resolve(undefined);
-		// }
-		// return super.publicLogError(errorEventName, data);
+		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>) {
-		// Void commented this out
-		// return this.publicLogError(eventName, data as ITelemetryData | undefined);
+		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,8 +15,7 @@ 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 { getTelemetryLevel, ITelemetryAppender } from './telemetryUtils.js';
-// import { cleanData } from './telemetryUtils.js';
+import { cleanData, getTelemetryLevel, ITelemetryAppender } from './telemetryUtils.js';
 
 export interface ITelemetryServiceConfig {
 	appenders: ITelemetryAppender[];
@@ -39,7 +38,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[];
@@ -54,7 +53,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;
@@ -122,47 +121,44 @@ export class TelemetryService implements ITelemetryService {
 		this._disposables.dispose();
 	}
 
-	// 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;
-	// 	}
+	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) {
-		// Void commented this out
-		// if (!this._sendErrorTelemetry) {
-		// 	return;
-		// }
+		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>) {
-		// Void commented this out
-		// this.publicLogError(eventName, data as ITelemetryData);
+		this.publicLogError(eventName, data as ITelemetryData);
 	}
 }
 

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

@@ -3,12 +3,11 @@
  *  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';
@@ -16,10 +15,7 @@ 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 `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}`;
+	return `${productService.updateUrl}/api/update/${platform}/${quality}/${productService.commit}`;
 }
 
 export type UpdateNotAvailableClassification = {
@@ -61,7 +57,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());
@@ -74,35 +70,75 @@ 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')
 
-		this.url = this.doBuildUpdateFeedUrl('stable');
+		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);
 		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;
 		}
 
-		this.setState(State.Disabled(DisablementReason.ManuallyDisabled));
+		// 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.Idle(this.getUpdateType()));
 
-		// Void - temporarily disabled while we figure out how to do this the right way
+		if (updateMode === 'manual') {
+			this.logService.info('update#ctor - manual checks only; automatic updates are disabled by user preference');
+			return;
+		}
 
-		// this.setState(State.Idle(this.getUpdateType()));
+		if (updateMode === 'start') {
+			this.logService.info('update#ctor - startup checks only; automatic updates are disabled by user preference');
 
-		// start checking for updates after 10 seconds
-		// this.scheduleCheckForUpdates(10 * 1000).then(undefined, err => this.logService.error(err));
+			// 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));
+		}
 	}
 
-	// private async scheduleCheckForUpdates(delay = 60 * 60 * 1000): Promise<void> {
-	// 	await timeout(delay);
-	// 	await this.checkForUpdates(false);
-	// 	return await this.scheduleCheckForUpdates(60 * 60 * 1000);
-	// }
+	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);
+			});
+	}
 
 	async checkForUpdates(explicit: boolean): Promise<void> {
 		this.logService.trace('update#checkForUpdates, state = ', this.state.type);
@@ -124,7 +160,6 @@ 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
 	}
@@ -139,7 +174,6 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		await this.doApplyUpdate();
 	}
 
-	// windows overrides this
 	protected async doApplyUpdate(): Promise<void> {
 		// noop
 	}
@@ -202,6 +236,6 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		// noop
 	}
 
-	protected abstract doBuildUpdateFeedUrl(quality: string): string | undefined;
+	protected abstract buildUpdateFeedUrl(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 doBuildUpdateFeedUrl(quality: string): string | undefined {
+	protected buildUpdateFeedUrl(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 doBuildUpdateFeedUrl(quality: string): string {
+	protected buildUpdateFeedUrl(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 doBuildUpdateFeedUrl(quality: string): string | undefined {
+	protected buildUpdateFeedUrl(quality: string): string | undefined {
 		let platform = `win32-${process.arch}`;
 
 		if (getUpdateType() === UpdateType.Archive) {

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

@@ -1,21 +0,0 @@
-/*--------------------------------------------------------------------------------------
- *  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/llmMessageService.ts

@@ -1,179 +0,0 @@
-/*--------------------------------------------------------------------------------------
- *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
- *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
- *--------------------------------------------------------------------------------------*/
-
-import { 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,162 +0,0 @@
-/*--------------------------------------------------------------------------------------
- *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
- *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
- *--------------------------------------------------------------------------------------*/
-
-import { IRange } from '../../../editor/common/core/range'
-import { ProviderName, SettingsOfProvider } from './voidSettingsTypes.js'
-
-
-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: { message: string, fullError: Error | null }) => void
-export type AbortRef = { current: (() => void) | null }
-
-export type LLMMessage = {
-	role: 'system' | 'user' | 'assistant';
-	content: string;
-}
-
-export type ServiceSendLLMFeatureParams = {
-	useProviderFor: 'Ctrl+K';
-	range: IRange;
-} | {
-	useProviderFor: 'Ctrl+L';
-} | {
-	useProviderFor: 'Autocomplete';
-	range: IRange;
-}
-
-// params to the true sendLLMMessage function
-export type LLMMMessageParams = {
-	onText: OnText;
-	onFinalMessage: OnFinalMessage;
-	onError: OnError;
-	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 type BlockedMainLLMMessageParams = 'onText' | 'onFinalMessage' | 'onError' | 'abortRef'
-
-export type MainLLMMessageParams = Omit<LLMMMessageParams, BlockedMainLLMMessageParams> & { requestId: string }
-export type MainLLMMessageAbortParams = { 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,68 +0,0 @@
-/*--------------------------------------------------------------------------------------
- *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
- *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
- *--------------------------------------------------------------------------------------*/
-
-import { 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)}`)
-	}
-})