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

Fix encryption service not working on Linux

.eslintignore

@@ -11,6 +11,7 @@
 **/extensions/markdown-language-features/notebook-out/**
 **/extensions/markdown-math/notebook-out/**
 **/extensions/notebook-renderers/renderer-out/index.js
+**/extensions/open-remote-ssh/out/extension.js
 **/extensions/simple-browser/media/index.js
 **/extensions/typescript-language-features/test-workspace/**
 **/extensions/typescript-language-features/extension.webpack.config.js

.eslintrc.json

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

.gitignore

@@ -21,3 +21,6 @@ vscode.db
 product.overrides.json
 *.snap.actual
 .vscode-test
+.tmp/
+.tmp2/
+.tool-versions

.vscode/tasks.json

@@ -29,6 +29,34 @@
 				}
 			}
 		},
+		{
+			"type": "npm",
+			"script": "watchreactd",
+			"label": "React - Build",
+			"isBackground": true,
+			"presentation": {
+				"reveal": "never",
+				"group": "buildWatchers",
+				"close": false
+			},
+			"problemMatcher": {
+				"owner": "typescript",
+				"applyTo": "closedDocuments",
+				"fileLocation": [
+					"absolute"
+				],
+				"pattern": {
+					"regexp": "Error: ([^(]+)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\): (.*)$",
+					"file": 1,
+					"location": 2,
+					"message": 3
+				},
+				"background": {
+					"beginsPattern": "Starting compilation",
+					"endsPattern": "Finished compilation"
+				}
+			}
+		},
 		{
 			"type": "npm",
 			"script": "watch-extensionsd",
@@ -61,7 +89,8 @@
 			"label": "VS Code - Build",
 			"dependsOn": [
 				"Core - Build",
-				"Ext - Build"
+				"Ext - Build",
+				"React - Build"
 			],
 			"group": {
 				"kind": "build",

CONTRIBUTING.md

@@ -1,23 +1,33 @@
 # Contributing to Void
-
-Welcome! 👋 This is the official guide on how to contribute to Void. We want to make it as easy as possible to contribute, so if you have any questions or comments, reach out via email or discord!
+### Welcome! 👋
+This is the official guide on how to contribute to Void. We want to make it as easy as possible to contribute, so if you have any questions or comments, reach out via email or discord!
 
 There are a few ways to contribute:
 
-- Suggest New Features ([Discord](https://discord.gg/RSNjgaugJs))
-- Build New Features ([Project](https://github.com/orgs/voideditor/projects/2/views/3))
-- Submit Issues/Docs/Bugs ([Issues](https://github.com/voideditor/void/issues))
+- 💫 Complete items on the [Roadmap](https://github.com/orgs/voideditor/projects/2).
+- 💡 Make suggestions in our [Discord](https://discord.gg/RSNjgaugJs).
+- 🪴 Start new Issues - see [Issues](https://github.com/voideditor/void/issues).
 
 
-## Building the full IDE
 
-Please follow the steps below to build the IDE. If you have any questions, feel free to [submit an issue](https://github.com/voideditor/void/issues/new) with any build errors, or refer to VSCode's full [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute) page.
+### Codebase Guide
 
-Most of Void's code lives in `src/vs/workbench/contrib/void/browser/` and `src/vs/platform/void/`.
+We highly recommend reading [this](https://github.com/microsoft/vscode/wiki/Source-Code-Organization) article on VSCode's sourcecode organization.
+
+<!-- ADD BLOG HERE
+We wrote a [guide to working in VSCode].
+-->
+
+Most of Void's code lives in the folder `src/vs/workbench/contrib/void/`.
+
+
+
+
+## Building Void
 
 ### a. Build Prerequisites - Mac
 
-If you're using a Mac, make sure you have Python and XCode installed (you probably do by default).
+If you're using a Mac, you need Python and XCode. You probably have these by default.
 
 ### b. Build Prerequisites - Windows
 
@@ -28,38 +38,40 @@ Go to the "Workloads" tab and select:
 - `Node.js build tools`
 
 Go to the "Individual Components" tab and select:
-- `MSVC v143 - VS 2022 C++ x64/x86 Spectre-mitigated libs (Latest)`,
-- `C++ ATL for latest build tools with Spectre Mitigations`,
-- `C++ MFC for latest build tools with Spectre Mitigations`.
+- `MSVC v143 - VS 2022 C++ x64/x86 Spectre-mitigated libs (Latest)`
+- `C++ ATL for latest build tools with Spectre Mitigations`
+- `C++ MFC for latest build tools with Spectre Mitigations`
 
 Finally, click Install.
 
 ### c. Build Prerequisites - Linux
 
-First, make sure you've installed NodeJS and run `npm install -g node-gyp`. Then:
-- Debian (Ubuntu, etc) - `sudo apt-get install build-essential g++ libx11-dev libxkbfile-dev libsecret-1-dev libkrb5-dev python-is-python3`.
-- Red Hat (Fedora, etc) - `sudo dnf install @development-tools gcc gcc-c++ make libsecret-devel krb5-devel libX11-devel libxkbfile-devel`.
-- Others - see [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute).
+First, run `npm install -g node-gyp`. Then:
 
-### Build instructions
+- Debian (Ubuntu, etc): `sudo apt-get install build-essential g++ libx11-dev libxkbfile-dev libsecret-1-dev libkrb5-dev python-is-python3`.
+- Red Hat (Fedora, etc): `sudo dnf install @development-tools gcc gcc-c++ make libsecret-devel krb5-devel libX11-devel libxkbfile-devel`.
+- Others: see [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute).
 
-To build Void, first follow the prerequisite steps above for your operating system and open `void/` inside VSCode. Then:
+### d. Building Void
 
-1. Install all dependencies.
+To build Void, open `void/` inside VSCode. Then open your terminal and run:
 
-```
-npm install
-```
+1. `npm install` to install all dependencies.
+2. `npm run watchreact` to build Void's browser dependencies like React. (If this doesn't work, try `npm run buildreact`).
+3. Build Void.
+	 - Press <kbd>Cmd+Shift+B</kbd> (Mac).
+   - Press <kbd>Ctrl+Shift+B</kbd> (Windows/Linux).
+   - This step can take ~5 min. The build is done when you see two check marks.
+4. Run Void.
+   - Run `./scripts/code.sh` (Mac/Linux).
+   - Run `./scripts/code.bat` (Windows).
+6. Nice-to-knows.
+   - You can always press <kbd>Ctrl+R</kbd> (<kbd>Cmd+R</kbd>) inside the new window to reload and see your new changes. It's faster than <kbd>Ctrl+Shift+P</kbd> and `Reload Window`.
+   - You might want to add the flags `--user-data-dir ./.tmp/user-data --extensions-dir ./.tmp/extensions` to the above run command, which lets you delete the `.tmp` folder to reset any IDE changes you made when testing.
 
-2. Run `cd ./src/vs/workbench/contrib/void/browser/react/` and then `node ./build.js` to build Void's external dependencies (our React components, etc).
+#### Building Void from Terminal
 
-3. Press <kbd>Ctrl+Shift+B</kbd>, or if you prefer using the terminal run `npm run watch`.
-
-This can take ~5 min.
-
-If you ran <kbd>Ctrl+Shift+B</kbd>, the build is done when you see two check marks.
-
-If you ran `npm run watch`, the build is done when you see something like this:
+Alternatively, if you want to build Void from the terminal, instead of pressing <kbd>Cmd+Shift+B</kbd> you can run `npm run watch`. The build is done when you see something like this:
 
 ```
 [watch-extensions] [00:37:39] Finished compilation extensions with 0 errors after 19303 ms
@@ -68,54 +80,67 @@ If you ran `npm run watch`, the build is done when you see something like this:
 [watch-client    ] [00:38:07] Finished compilation with 0 errors after 5 ms
 ```
 
-<!-- 3. Press <kbd>Ctrl+Shift+B</kbd> to start the build process. -->
-
-4. In a new terminal, run `./scripts/code.sh` (Mac/Linux) or `./scripts/code.bat` (Windows). This should open up the built IDE!
-You can always press <kbd>Ctrl+Shift+P</kbd> and run "Reload Window" inside the new window to see changes without re-building.
-
-Now that you're set up, feel free to check out our [Issues](https://github.com/voideditor/void/issues) page.
-
-### Common Fixes
-
-- Make sure you have the same NodeJS version as `.nvmrc`.
-
-- 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
+#### Common Fixes
 
-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)`
-
-
-## Roadmap
-
-Please refer to our [Issues](https://github.com/voideditor/void/issues) page for the latest issues.
-
-
-## ⭐⭐⭐ 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.
-
-# Guidelines
-
-We're always glad to talk about new ideas, help you get set up, and make sure your changes align with our vision for the project. Feel free to shoot us a message in the #general channel of the [Discord](https://discord.gg/RSNjgaugJs) for any reason. Please check in especially if you want to make a lot of changes or build a large new feature.
+- Make sure you followed the prerequisite steps.
+- Make sure you have Node version `20.16.0` (the version in `.nvmrc`)!
+- If you get `"TypeError: Failed to fetch dynamically imported module"`, make sure all imports end with `.js`.
+- If you see missing styles, wait a few seconds and then reload.
+- If you have any questions, feel free to [submit an issue](https://github.com/voideditor/void/issues/new). You can also refer to VSCode's complete [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute) page.
 
 
 
-## Submitting a Pull Request
+## Packaging
 
-Please submit a pull request once you've made a change. You don't need to submit an issue.
+We don't usually recommend packaging. Instead, you should probably just build. If you're sure you want to package 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 - packaging can take ~25 minutes.
 
-Please don't use AI to write your PR 🙂.
 
+### Mac
+- `npm run gulp vscode-darwin-arm64` - most common (Apple Silicon)
+- `npm run gulp vscode-darwin-x64` (Intel)
+
+### Windows
+- `npm run gulp vscode-win32-x64` - most common
+- `npm run gulp vscode-win32-ia32`
+
+### Linux
+- `npm run gulp vscode-linux-x64` - most common
+- `npm run gulp vscode-linux-arm`
+- `npm run gulp vscode-linux-ia32`
+
+
+### Output
+
+This will generate a folder outside of `void/`:
+```bash
+workspace/
+├── void/   # Your Void fork
+└── VSCode-darwin-arm64/ # Generated output
+```
+
+### Distributing
+Void's maintainers distribute Void on our website and in releases. If you'd like to see the scripts to convert `Mac .app -> .dmg`, `Windows folder -> .exe`, and `Linux folder -> appimage` for distribution, feel free to reach out.
+
+## Pull Request Guidelines
+
+
+- Please submit a pull request once you've made a change.
+- No need to submit an Issue unless you're creating a new feature that might involve multiple PRs.
+- 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:
 
+Edit: far too many changes to track... this is old
+
 - README.md
 - CONTRIBUTING.md
 - VOID_USEFUL_LINKS.md
@@ -136,7 +161,4 @@ We keep track of all the files we've changed with Void so it's easy to rebase:
 
 - vscode.proposed.editorInsets.d.ts - not modified, but code copied
 
-
-## References
-
-For some useful links we've compiled on VSCode, see [`VOID_USEFUL_LINKS.md`](https://github.com/voideditor/void/blob/main/VOID_USEFUL_LINKS.md).
+-->

LICENSE-VS-Code.txt

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

LICENSE.txt

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

README.md

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

SECURITY.md

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

VOID_USEFUL_LINKS.md

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

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

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

build/darwin/create-universal-app.js

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

build/darwin/create-universal-app.ts

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

build/darwin/sign.js

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

build/darwin/sign.ts

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

build/filters.js

@@ -134,6 +134,7 @@ module.exports.indentationFilter = [
 	'!extensions/markdown-math/notebook-out/*.js',
 	'!extensions/ipynb/notebook-out/**',
 	'!extensions/notebook-renderers/renderer-out/*.js',
+	'!extensions/open-remote-ssh/out/*.js',
 	'!extensions/simple-browser/media/*.js',
 ];
 

build/gulpfile.extensions.js

@@ -55,6 +55,7 @@ const compilations = [
 	'extensions/microsoft-authentication/tsconfig.json',
 	'extensions/notebook-renderers/tsconfig.json',
 	'extensions/npm/tsconfig.json',
+	'extensions/open-remote-ssh/tsconfig.json',
 	'extensions/php-language-features/tsconfig.json',
 	'extensions/references-view/tsconfig.json',
 	'extensions/search-result/tsconfig.json',

build/gulpfile.reh.js

@@ -516,7 +516,7 @@ function tweakProductForServerWeb(product) {
 
 		['', 'min'].forEach(minified => {
 			const sourceFolderName = `out-vscode-${type}${dashed(minified)}`;
-			const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`;
+			const destinationFolderName = `void-${type}${dashed(platform)}${dashed(arch)}`;
 
 			const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series(
 				gulp.task(`node-${platform}-${arch}`),

build/gulpfile.vscode.js

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

build/lib/electron.js

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

build/lib/electron.ts

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

build/npm/dirs.js

@@ -36,6 +36,7 @@ const dirs = [
 	'extensions/microsoft-authentication',
 	'extensions/notebook-renderers',
 	'extensions/npm',
+	'extensions/open-remote-ssh',
 	'extensions/php-language-features',
 	'extensions/references-view',
 	'extensions/search-result',

build/win32/code.iss

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

create-appimage.sh

@@ -0,0 +1,112 @@
+#!/bin/bash
+set -e  # Exit on error
+set -x  # Print commands as they are executed
+
+# Configuration
+APP_NAME="void"
+APP_VERSION="1.0.0"
+ARCH="x86_64"
+
+export ARCH
+
+# Check if void binary exists in current directory
+if [ ! -f "./void" ]; then
+    echo "Error: void binary not found in current directory"
+    exit 1
+fi
+
+# Check if icon exists
+if [ ! -f "./void.png" ]; then
+    echo "Error: void.png icon not found in current directory"
+    exit 1
+fi
+
+# Create temporary directory
+TEMP_DIR="$(mktemp -d)"
+echo "Created temporary directory: $TEMP_DIR"
+APP_DIR="$TEMP_DIR/$APP_NAME.AppDir"
+
+# Create basic AppDir structure
+mkdir -pv "$APP_DIR/usr/bin"
+mkdir -pv "$APP_DIR/usr/lib"
+mkdir -pv "$APP_DIR/usr/share/applications"
+mkdir -pv "$APP_DIR/usr/share/icons/hicolor/256x256/apps"
+
+# Exclude create-appimage.sh and appimagetool-x86_64.AppImage from being copied
+echo "Copying files excluding create-appimage.sh and appimagetool-x86_64.AppImage..."
+for file in ./*; do
+    if [[ "$file" != "./create-appimage.sh" && "$file" != "./appimagetool-x86_64.AppImage" ]]; then
+        cp -rv "$file" "$APP_DIR/usr/bin/"
+    fi
+done
+
+# Copy the icon to required locations
+cp -v ./void.png "$APP_DIR/void.png"
+cp -v ./void.png "$APP_DIR/usr/share/icons/hicolor/256x256/apps/void.png"
+
+# Copy dependencies with error checking
+echo "Copying dependencies..."
+for lib in $(ldd ./void | grep "=> /" | awk '{print $3}'); do
+    if [ -f "$lib" ]; then
+        cp -v "$lib" "$APP_DIR/usr/lib/" || echo "Failed to copy $lib"
+    else
+        echo "Warning: Library $lib not found"
+    fi
+done
+
+# Create desktop file with error checking
+echo "Creating desktop file..."
+if ! cat > "$APP_DIR/$APP_NAME.desktop" <<EOF
+[Desktop Entry]
+Name=$APP_NAME
+Exec=void
+Icon=void
+Type=Application
+Categories=Utility;
+Comment=Void Linux Application
+EOF
+then
+    echo "Error creating desktop file"
+    exit 1
+fi
+
+# Make desktop file executable
+chmod +x "$APP_DIR/$APP_NAME.desktop"
+
+# Copy the desktop file to the applications directory
+cp -v "$APP_DIR/$APP_NAME.desktop" "$APP_DIR/usr/share/applications/"
+
+# Create AppRun with error checking
+echo "Creating AppRun..."
+if ! cat > "$APP_DIR/AppRun" <<EOF
+#!/bin/bash
+cd "\$(dirname "\$0")/usr/bin"
+export LD_LIBRARY_PATH="\$APPDIR/usr/lib:\$LD_LIBRARY_PATH"
+exec ./void "\$@"
+EOF
+then
+    echo "Error creating AppRun"
+    exit 1
+fi
+
+# Make AppRun executable
+chmod +x "$APP_DIR/AppRun"
+
+# Download appimagetool if not present in the current directory
+if [ ! -f "./appimagetool-x86_64.AppImage" ]; then
+    echo "Downloading appimagetool-x86_64.AppImage..."
+    wget "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
+    chmod +x appimagetool-x86_64.AppImage
+else
+    echo "appimagetool-x86_64.AppImage is already present."
+fi
+
+# Create the AppImage
+echo "Creating AppImage..."
+ARCH=x86_64 ./appimagetool-x86_64.AppImage "$APP_DIR" "${APP_NAME}-${APP_VERSION}-${ARCH}.AppImage"
+
+# Cleanup
+echo "Cleaning up..."
+rm -rf "$TEMP_DIR"
+
+echo "AppImage creation complete!"

extensions/open-remote-ssh/CHANGELOG.md

@@ -0,0 +1,74 @@
+## 0.0.48
+- Support `%n` in ProxyCommand
+- fix: add missing direct @types/ssh2-stream dependency (#177)
+- fix Win32 internal error (#178)
+
+## 0.0.47
+- Add support for loong64 (#175)
+- Add s390x support (#174)
+- Support vscodium alpine reh (#142)
+
+## 0.0.46
+- Add riscv64 support (#147)
+
+## 0.0.45
+- Use windows-x64 server on windows-arm64
+
+## 0.0.44
+- Update ssh2 lib
+- Properly set extensionHost env variables
+
+## 0.0.43
+- Fix parsing multiple include directives
+
+## 0.0.42
+- Fix remote label to show port when connecting to a port other than 22
+
+## 0.0.41
+- Take into account parsed port from ssh destination. Fixes (#110)
+
+## 0.0.40
+- Update ssh-config package
+
+## 0.0.39
+
+- output error messages when downloading vscode server (#39)
+- Add PreferredAuthentications support (#97)
+
+## 0.0.38
+
+- Enable remote support for ppc64le (#93)
+
+## 0.0.37
+
+- Default to Current OS User in Connection String if No User Provided (#91)
+- Add support for (unofficial) DragonFly reh (#86)
+
+## 0.0.36
+
+- Make wget support continue download (#85)
+
+## 0.0.35
+
+- Fixes hardcoded agentsock for windows breaks pageant compatibility (#81)
+
+## 0.0.34
+
+- Add remote.SSH.connectTimeout setting
+- adding %r username replacement to proxycommand (#77)
+
+## 0.0.33
+
+- feat: support %r user substitution in proxycommand
+
+## 0.0.32
+
+- feat: use serverDownloadUrlTemplate from product.json (#59)
+
+## 0.0.31
+
+- feat: support glob patterns in SSH include directives
+
+## 0.0.30
+
+- feat: support file patterns in SSH include directives

extensions/open-remote-ssh/README.md

@@ -0,0 +1,48 @@
+# Open Remote - SSH
+
+## SSH Host Requirements
+
+You can connect to a running SSH server on the following platforms.
+
+**Supported**:
+
+- x86_64 Debian 8+, Ubuntu 16.04+, CentOS / RHEL 7+ Linux.
+- ARMv7l (AArch32) Raspbian Stretch/9+ (32-bit).
+- ARMv8l (AArch64) Ubuntu 18.04+ (64-bit).
+- macOS 10.14+ (Mojave)
+- Windows 10+
+- FreeBSD 13 (Requires manual remote-extension-host installation)
+- DragonFlyBSD (Requires manual remote-extension-host installation)
+
+## Requirements
+
+**Activation**
+
+Enable the extension in your `argv.json`
+
+```json
+{
+    ...
+    "enable-proposed-api": [
+        ...,
+        "jeanp413.open-remote-ssh",
+    ]
+    ...
+}
+```
+
+which you can open by running the `Preferences: Configure Runtime Arguments` command.
+The file is located in `~/.vscode-oss/argv.json`.
+
+**Alpine linux**
+
+When running on alpine linux, the packages `libstdc++` and `bash` are necessary and can be installed via
+running
+
+```bash
+sudo apk add bash libstdc++
+```
+
+## SSH configuration file
+
+[OpenSSH](https://www.openssh.com/) supports using a [configuration file](https://linuxize.com/post/using-the-ssh-config-file/) to store all your different SSH connections. To use an SSH config file, run the `Remote-SSH: Open SSH Configuration File...` command.

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

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

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

@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../shared.webpack.config');
+const { IgnorePlugin } = require('webpack');
+
+module.exports = withDefaults({
+	context: __dirname,
+	resolve: {
+		mainFields: ['module', 'main']
+	},
+	entry: {
+		extension: './src/extension.ts',
+	},
+	externals: {
+		vscode: "commonjs vscode",
+		bufferutil: "commonjs bufferutil",
+		"utf-8-validate": "commonjs utf-8-validate",
+	},
+	plugins: [
+		new IgnorePlugin({
+			resourceRegExp: /crypto\/build\/Release\/sshcrypto\.node$/,
+		}),
+		new IgnorePlugin({
+			resourceRegExp: /cpu-features/,
+		})
+	]
+});

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

@@ -0,0 +1,370 @@
+{
+  "name": "open-remote-ssh",
+  "version": "0.0.48",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "open-remote-ssh",
+      "version": "0.0.48",
+      "dependencies": {
+        "@jeanp413/ssh-config": "^4.3.1",
+        "glob": "^9.3.1",
+        "simple-socks": "git+https://github.com/jeanp413/simple-socks#main",
+        "socks": "^2.5.0",
+        "ssh2": "git+https://github.com/jeanp413/ssh2#master"
+      },
+      "devDependencies": {
+        "@types/ssh2": "^0.5.52",
+        "@types/ssh2-streams": "0.1.12"
+      },
+      "engines": {
+        "vscode": "^1.70.2"
+      }
+    },
+    "node_modules/@babel/runtime-corejs3": {
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.26.0.tgz",
+      "integrity": "sha512-YXHu5lN8kJCb1LOb9PgV6pvak43X2h4HvRApcN5SdWeaItQOzfn1hgP6jasD6KWQyJDBxrVmA9o9OivlnNJK/w==",
+      "license": "MIT",
+      "dependencies": {
+        "core-js-pure": "^3.30.2",
+        "regenerator-runtime": "^0.14.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@jeanp413/ssh-config": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@jeanp413/ssh-config/-/ssh-config-4.3.1.tgz",
+      "integrity": "sha512-x0EaWRdjs5sPDNmYr11wVB1GdwWQgRekc7SbueuO5FK7YZUav98qZKtZZU5iSDKyxJkooCs3rgVizB1wIWrF7g==",
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "22.10.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.7.tgz",
+      "integrity": "sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
+    "node_modules/@types/ssh2": {
+      "version": "0.5.52",
+      "resolved": "https://registry.npmjs.org/@types/ssh2/-/ssh2-0.5.52.tgz",
+      "integrity": "sha512-lbLLlXxdCZOSJMCInKH2+9V/77ET2J6NPQHpFI0kda61Dd1KglJs+fPQBchizmzYSOJBgdTajhPqBO1xxLywvg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "@types/ssh2-streams": "*"
+      }
+    },
+    "node_modules/@types/ssh2-streams": {
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/@types/ssh2-streams/-/ssh2-streams-0.1.12.tgz",
+      "integrity": "sha512-Sy8tpEmCce4Tq0oSOYdfqaBpA3hDM8SoxoFh5vzFsu2oL+znzGz8oVWW7xb4K920yYMUY+PIG31qZnFMfPWNCg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/asn1": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
+      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "license": "MIT"
+    },
+    "node_modules/bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "node_modules/binary": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+      "integrity": "sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==",
+      "license": "MIT",
+      "dependencies": {
+        "buffers": "~0.1.1",
+        "chainsaw": "~0.1.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/buffers": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+      "integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==",
+      "engines": {
+        "node": ">=0.2.0"
+      }
+    },
+    "node_modules/buildcheck": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.6.tgz",
+      "integrity": "sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==",
+      "optional": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/chainsaw": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+      "integrity": "sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==",
+      "license": "MIT/X11",
+      "dependencies": {
+        "traverse": ">=0.3.0 <0.4"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/core-js-pure": {
+      "version": "3.40.0",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.40.0.tgz",
+      "integrity": "sha512-AtDzVIgRrmRKQai62yuSIN5vNiQjcJakJb4fbhVw3ehxx7Lohphvw9SGNWKhLFqSxC4ilD0g/L1huAYFQU3Q6A==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/cpu-features": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.10.tgz",
+      "integrity": "sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==",
+      "hasInstallScript": true,
+      "optional": true,
+      "dependencies": {
+        "buildcheck": "~0.0.6",
+        "nan": "^2.19.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "license": "ISC"
+    },
+    "node_modules/glob": {
+      "version": "9.3.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz",
+      "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==",
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "minimatch": "^8.0.2",
+        "minipass": "^4.2.4",
+        "path-scurry": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/ip-address": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+      "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+      "license": "MIT",
+      "dependencies": {
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
+      "license": "MIT"
+    },
+    "node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "license": "ISC"
+    },
+    "node_modules/minimatch": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz",
+      "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz",
+      "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nan": {
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
+      "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+      "license": "MIT"
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "license": "MIT"
+    },
+    "node_modules/simple-socks": {
+      "version": "2.2.2",
+      "resolved": "git+ssh://git@github.com/jeanp413/simple-socks.git#2ac739301a82d6baff04804ed494436a026acb60",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime-corejs3": "^7.16.8",
+        "binary": "^0.3.0"
+      }
+    },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "license": "MIT",
+      "dependencies": {
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+      "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/ssh2": {
+      "version": "1.14.0",
+      "resolved": "git+ssh://git@github.com/jeanp413/ssh2.git#a169f627213aa663e0aa2fd2f0ef5c8931890c26",
+      "hasInstallScript": true,
+      "dependencies": {
+        "asn1": "^0.2.6",
+        "bcrypt-pbkdf": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=10.16.0"
+      },
+      "optionalDependencies": {
+        "cpu-features": "~0.0.9",
+        "nan": "^2.17.0"
+      }
+    },
+    "node_modules/traverse": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+      "integrity": "sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==",
+      "license": "MIT/X11",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
+      "license": "Unlicense"
+    },
+    "node_modules/undici-types": {
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+      "dev": true,
+      "license": "MIT"
+    }
+  }
+}

extensions/open-remote-ssh/package.json

@@ -0,0 +1,351 @@
+{
+  "name": "open-remote-ssh",
+  "displayName": "Open Remote - SSH",
+  "publisher": "voideditor",
+  "description": "Use any remote machine with a SSH server as your development environment.",
+  "version": "0.0.48",
+  "icon": "resources/icon.png",
+  "engines": {
+    "vscode": "^1.70.2"
+  },
+  "extensionKind": [
+    "ui"
+  ],
+  "enabledApiProposals": [
+    "resolvers",
+    "contribViewsRemote"
+  ],
+  "keywords": [
+    "remote development",
+    "remote",
+    "ssh"
+  ],
+  "api": "none",
+  "activationEvents": [
+    "onCommand:openremotessh.openEmptyWindow",
+    "onCommand:openremotessh.openEmptyWindowInCurrentWindow",
+    "onCommand:openremotessh.openConfigFile",
+    "onCommand:openremotessh.showLog",
+    "onResolveRemoteAuthority:ssh-remote",
+    "onView:sshHosts"
+  ],
+  "main": "./out/extension.js",
+  "contributes": {
+    "configuration": {
+      "title": "Remote - SSH",
+      "properties": {
+        "remote.SSH.configFile": {
+          "type": "string",
+          "description": "The absolute file path to a custom SSH config file.",
+          "default": "",
+          "scope": "application"
+        },
+        "remote.SSH.connectTimeout": {
+          "type": "number",
+          "description": "Specifies the timeout in seconds used for the SSH command that connects to the remote.",
+          "default": 60,
+          "scope": "application",
+          "minimum": 1
+        },
+        "remote.SSH.defaultExtensions": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "List of extensions that should be installed automatically on all SSH hosts.",
+          "scope": "application"
+        },
+        "remote.SSH.enableDynamicForwarding": {
+          "type": "boolean",
+          "description": "Whether to use SSH dynamic forwarding to allow setting up new port tunnels over an existing SSH connection.",
+          "scope": "application",
+          "default": true
+        },
+        "remote.SSH.enableAgentForwarding": {
+          "type": "boolean",
+          "markdownDescription": "Enable fixing the remote environment so that the SSH config option `ForwardAgent` will take effect as expected from VS Code's remote extension host.",
+          "scope": "application",
+          "default": true
+        },
+        "remote.SSH.serverDownloadUrlTemplate": {
+          "type": "string",
+          "description": "The URL from where the vscode server will be downloaded. You can use the following variables and they will be replaced dynamically:\n- ${quality}: vscode server quality, e.g. stable or insiders\n- ${version}: vscode server version, e.g. 1.69.0\n- ${commit}: vscode server release commit\n- ${arch}: vscode server arch, e.g. x64, armhf, arm64\n- ${release}: release number",
+          "scope": "application",
+          "default": "https://github.com/voideditor/${NAME_OF_REPO}/releases/download/${version}.${release}/void-server-${os}-${arch}-${version}.${release}.tar.gz"
+        },
+        "remote.SSH.remotePlatform": {
+          "type": "object",
+          "description": "A map of the remote hostname to the platform for that remote. Valid values: linux, macos, windows.",
+          "scope": "application",
+          "default": {},
+          "additionalProperties": {
+            "type": "string",
+            "enum": [
+              "linux",
+              "macos",
+              "windows"
+            ]
+          }
+        },
+        "remote.SSH.remoteServerListenOnSocket": {
+          "type": "boolean",
+          "description": "When true, the remote vscode server will listen on a socket path instead of opening a port. Only valid for Linux and macOS remotes. Requires `AllowStreamLocalForwarding` to be enabled for the SSH server.",
+          "default": false
+        },
+        "remote.SSH.experimental.serverBinaryName": {
+          "type": "string",
+          "description": "**Experimental:** The name of the server binary, use this **only if** you are using a client without a corresponding server release",
+          "scope": "application",
+          "default": ""
+        }
+      }
+    },
+    "views": {
+      "remote": [
+        {
+          "id": "sshHosts",
+          "name": "SSH Targets",
+          "group": "targets@1",
+          "remoteName": "ssh-remote"
+        }
+      ]
+    },
+    "commands": [
+      {
+        "command": "openremotessh.openEmptyWindow",
+        "title": "Connect to Host...",
+        "category": "Remote-SSH"
+      },
+      {
+        "command": "openremotessh.openEmptyWindowInCurrentWindow",
+        "title": "Connect Current Window to Host...",
+        "category": "Remote-SSH"
+      },
+      {
+        "command": "openremotessh.openConfigFile",
+        "title": "Open SSH Configuration File...",
+        "category": "Remote-SSH"
+      },
+      {
+        "command": "openremotessh.showLog",
+        "title": "Show Log",
+        "category": "Remote-SSH"
+      },
+      {
+        "command": "openremotessh.explorer.emptyWindowInNewWindow",
+        "title": "Connect to Host in New Window",
+        "icon": "$(empty-window)"
+      },
+      {
+        "command": "openremotessh.explorer.emptyWindowInCurrentWindow",
+        "title": "Connect to Host in Current Window"
+      },
+      {
+        "command": "openremotessh.explorer.reopenFolderInCurrentWindow",
+        "title": "Open on SSH Host in Current Window"
+      },
+      {
+        "command": "openremotessh.explorer.reopenFolderInNewWindow",
+        "title": "Open on SSH Host in New Window",
+        "icon": "$(folder-opened)"
+      },
+      {
+        "command": "openremotessh.explorer.deleteFolderHistoryItem",
+        "title": "Remove From Recent List",
+        "icon": "$(x)"
+      },
+      {
+        "command": "openremotessh.explorer.refresh",
+        "title": "Refresh",
+        "icon": "$(refresh)"
+      },
+      {
+        "command": "openremotessh.explorer.configure",
+        "title": "Configure",
+        "icon": "$(gear)"
+      },
+      {
+        "command": "openremotessh.explorer.add",
+        "title": "Add New",
+        "icon": "$(plus)"
+      }
+    ],
+    "resourceLabelFormatters": [
+      {
+        "scheme": "vscode-remote",
+        "authority": "ssh-remote+*",
+        "formatting": {
+          "label": "${path}",
+          "separator": "/",
+          "tildify": true,
+          "workspaceSuffix": "SSH"
+        }
+      }
+    ],
+    "menus": {
+      "statusBar/remoteIndicator": [
+        {
+          "command": "openremotessh.openEmptyWindow",
+          "when": "remoteName =~ /^ssh-remote$/ && remoteConnectionState == connected",
+          "group": "remote_20_ssh_1general@1"
+        },
+        {
+          "command": "openremotessh.openEmptyWindowInCurrentWindow",
+          "when": "remoteName =~ /^ssh-remote$/ && remoteConnectionState == connected",
+          "group": "remote_20_ssh_1general@2"
+        },
+        {
+          "command": "openremotessh.openConfigFile",
+          "when": "remoteName =~ /^ssh-remote$/ && remoteConnectionState == connected",
+          "group": "remote_20_ssh_1general@3"
+        },
+        {
+          "command": "openremotessh.showLog",
+          "when": "remoteName =~ /^ssh-remote$/ && remoteConnectionState == connected",
+          "group": "remote_20_ssh_1general@4"
+        },
+        {
+          "command": "openremotessh.openEmptyWindow",
+          "when": "remoteConnectionState == disconnected",
+          "group": "remote_20_ssh_3local@1"
+        },
+        {
+          "command": "openremotessh.openEmptyWindowInCurrentWindow",
+          "when": "remoteConnectionState == disconnected",
+          "group": "remote_20_ssh_3local@2"
+        },
+        {
+          "command": "openremotessh.openConfigFile",
+          "when": "remoteConnectionState == disconnected",
+          "group": "remote_20_ssh_3local@3"
+        },
+        {
+          "command": "openremotessh.openEmptyWindow",
+          "when": "!remoteName && !virtualWorkspace",
+          "group": "remote_20_ssh_3local@5"
+        },
+        {
+          "command": "openremotessh.openEmptyWindowInCurrentWindow",
+          "when": "!remoteName && !virtualWorkspace",
+          "group": "remote_20_ssh_3local@6"
+        },
+        {
+          "command": "openremotessh.openConfigFile",
+          "when": "!remoteName && !virtualWorkspace",
+          "group": "remote_20_ssh_3local@7"
+        }
+      ],
+      "commandPalette": [
+        {
+          "command": "openremotessh.explorer.refresh",
+          "when": "false"
+        },
+        {
+          "command": "openremotessh.explorer.configure",
+          "when": "false"
+        },
+        {
+          "command": "openremotessh.explorer.add",
+          "when": "false"
+        },
+        {
+          "command": "openremotessh.explorer.emptyWindowInNewWindow",
+          "when": "false"
+        },
+        {
+          "command": "openremotessh.explorer.emptyWindowInCurrentWindow",
+          "when": "false"
+        },
+        {
+          "command": "openremotessh.explorer.reopenFolderInCurrentWindow",
+          "when": "false"
+        },
+        {
+          "command": "openremotessh.explorer.reopenFolderInNewWindow",
+          "when": "false"
+        },
+        {
+          "command": "openremotessh.explorer.deleteFolderHistoryItem",
+          "when": "false"
+        }
+      ],
+      "view/title": [
+        {
+          "command": "openremotessh.explorer.add",
+          "when": "view == sshHosts",
+          "group": "navigation"
+        },
+        {
+          "command": "openremotessh.explorer.configure",
+          "when": "view == sshHosts",
+          "group": "navigation"
+        },
+        {
+          "command": "openremotessh.explorer.refresh",
+          "when": "view == sshHosts",
+          "group": "navigation"
+        }
+      ],
+      "view/item/context": [
+        {
+          "command": "openremotessh.explorer.emptyWindowInNewWindow",
+          "when": "viewItem =~ /^openremotessh.explorer.host$/",
+          "group": "inline@1"
+        },
+        {
+          "command": "openremotessh.explorer.emptyWindowInNewWindow",
+          "when": "viewItem =~ /^openremotessh.explorer.host$/",
+          "group": "navigation@2"
+        },
+        {
+          "command": "openremotessh.explorer.emptyWindowInCurrentWindow",
+          "when": "viewItem =~ /^openremotessh.explorer.host$/",
+          "group": "navigation@1"
+        },
+        {
+          "command": "openremotessh.explorer.reopenFolderInNewWindow",
+          "when": "viewItem == openremotessh.explorer.folder",
+          "group": "inline@1"
+        },
+        {
+          "command": "openremotessh.explorer.reopenFolderInNewWindow",
+          "when": "viewItem == openremotessh.explorer.folder",
+          "group": "navigation@2"
+        },
+        {
+          "command": "openremotessh.explorer.reopenFolderInCurrentWindow",
+          "when": "viewItem == openremotessh.explorer.folder",
+          "group": "navigation@1"
+        },
+        {
+          "command": "openremotessh.explorer.deleteFolderHistoryItem",
+          "when": "viewItem =~ /^openremotessh.explorer.folder/",
+          "group": "navigation@3"
+        },
+        {
+          "command": "openremotessh.explorer.deleteFolderHistoryItem",
+          "when": "viewItem =~ /^openremotessh.explorer.folder/",
+          "group": "inline@2"
+        }
+      ]
+    }
+  },
+  "scripts": {
+    "vscode:prepublish": "npm run compile",
+    "compile": "gulp compile-extension:open-remote-ssh",
+    "compile-web": "npx webpack-cli --config extension-browser.webpack.config --mode none",
+    "watch": "gulp watch-extension:open-remote-ssh",
+    "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
+  },
+  "devDependencies": {
+    "@types/ssh2": "^0.5.52",
+    "@types/ssh2-streams": "0.1.12"
+  },
+  "dependencies": {
+    "glob": "^9.3.1",
+    "simple-socks": "git+https://github.com/jeanp413/simple-socks#main",
+    "socks": "^2.5.0",
+    "@jeanp413/ssh-config": "^4.3.1",
+    "ssh2": "git+https://github.com/jeanp413/ssh2#master"
+  }
+}

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

@@ -0,0 +1,464 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as cp from 'child_process';
+import * as fs from 'fs';
+import * as net from 'net';
+import * as stream from 'stream';
+import { SocksClient, SocksClientOptions } from 'socks';
+import * as vscode from 'vscode';
+import * as ssh2 from 'ssh2';
+import type { ParsedKey } from 'ssh2-streams';
+import Log from './common/logger';
+import SSHDestination from './ssh/sshDestination';
+import SSHConnection, { SSHTunnelConfig } from './ssh/sshConnection';
+import SSHConfiguration from './ssh/sshConfig';
+import { gatherIdentityFiles } from './ssh/identityFiles';
+import { untildify, exists as fileExists } from './common/files';
+import { findRandomPort } from './common/ports';
+import { disposeAll } from './common/disposable';
+import { installCodeServer, ServerInstallError } from './serverSetup';
+import { isWindows } from './common/platform';
+import * as os from 'os';
+
+const PASSWORD_RETRY_COUNT = 3;
+const PASSPHRASE_RETRY_COUNT = 3;
+
+export const REMOTE_SSH_AUTHORITY = 'ssh-remote';
+
+export function getRemoteAuthority(host: string) {
+	return `${REMOTE_SSH_AUTHORITY}+${host}`;
+}
+
+class TunnelInfo implements vscode.Disposable {
+	constructor(
+		readonly localPort: number,
+		readonly remotePortOrSocketPath: number | string,
+		private disposables: vscode.Disposable[]
+	) {
+	}
+
+	dispose() {
+		disposeAll(this.disposables);
+	}
+}
+
+interface SSHKey {
+	filename: string;
+	parsedKey: ParsedKey;
+	fingerprint: string;
+	agentSupport?: boolean;
+	isPrivate?: boolean;
+}
+
+export class RemoteSSHResolver implements vscode.RemoteAuthorityResolver, vscode.Disposable {
+
+	private proxyConnections: SSHConnection[] = [];
+	private sshConnection: SSHConnection | undefined;
+	private sshAgentSock: string | undefined;
+	private proxyCommandProcess: cp.ChildProcessWithoutNullStreams | undefined;
+
+	private socksTunnel: SSHTunnelConfig | undefined;
+	private tunnels: TunnelInfo[] = [];
+
+	private labelFormatterDisposable: vscode.Disposable | undefined;
+
+	constructor(
+		readonly context: vscode.ExtensionContext,
+		readonly logger: Log
+	) {
+	}
+
+	resolve(authority: string, context: vscode.RemoteAuthorityResolverContext): Thenable<vscode.ResolverResult> {
+		const [type, dest] = authority.split('+');
+		if (type !== REMOTE_SSH_AUTHORITY) {
+			throw new Error(`Invalid authority type for SSH resolver: ${type}`);
+		}
+
+		this.logger.info(`Resolving ssh remote authority '${authority}' (attemp #${context.resolveAttempt})`);
+
+		const sshDest = SSHDestination.parseEncoded(dest);
+
+		// It looks like default values are not loaded yet when resolving a remote,
+		// so let's hardcode the default values here
+		const remoteSSHconfig = vscode.workspace.getConfiguration('remote.SSH');
+		const enableDynamicForwarding = remoteSSHconfig.get<boolean>('enableDynamicForwarding', true)!;
+		const enableAgentForwarding = remoteSSHconfig.get<boolean>('enableAgentForwarding', true)!;
+		const serverDownloadUrlTemplate = remoteSSHconfig.get<string>('serverDownloadUrlTemplate');
+		const defaultExtensions = remoteSSHconfig.get<string[]>('defaultExtensions', []);
+		const remotePlatformMap = remoteSSHconfig.get<Record<string, string>>('remotePlatform', {});
+		const remoteServerListenOnSocket = remoteSSHconfig.get<boolean>('remoteServerListenOnSocket', false)!;
+		const connectTimeout = remoteSSHconfig.get<number>('connectTimeout', 60)!;
+
+		return vscode.window.withProgress({
+			title: `Setting up SSH Host ${sshDest.hostname}`,
+			location: vscode.ProgressLocation.Notification,
+			cancellable: false
+		}, async () => {
+			try {
+				const sshconfig = await SSHConfiguration.loadFromFS();
+				const sshHostConfig = sshconfig.getHostConfiguration(sshDest.hostname);
+				const sshHostName = sshHostConfig['HostName'] ? sshHostConfig['HostName'].replace('%h', sshDest.hostname) : sshDest.hostname;
+				const sshUser = sshHostConfig['User'] || sshDest.user || os.userInfo().username || ''; // https://github.com/openssh/openssh-portable/blob/5ec5504f1d328d5bfa64280cd617c3efec4f78f3/sshconnect.c#L1561-L1562
+				const sshPort = sshHostConfig['Port'] ? parseInt(sshHostConfig['Port'], 10) : (sshDest.port || 22);
+
+				this.sshAgentSock = sshHostConfig['IdentityAgent'] || process.env['SSH_AUTH_SOCK'] || (isWindows ? '\\\\.\\pipe\\openssh-ssh-agent' : undefined);
+				this.sshAgentSock = this.sshAgentSock ? untildify(this.sshAgentSock) : undefined;
+				const agentForward = enableAgentForwarding && (sshHostConfig['ForwardAgent'] || 'no').toLowerCase() === 'yes';
+				const agent = agentForward && this.sshAgentSock ? new ssh2.OpenSSHAgent(this.sshAgentSock) : undefined;
+
+				const preferredAuthentications = sshHostConfig['PreferredAuthentications'] ? sshHostConfig['PreferredAuthentications'].split(',').map(s => s.trim()) : ['publickey', 'password', 'keyboard-interactive'];
+
+				const identityFiles: string[] = (sshHostConfig['IdentityFile'] as unknown as string[]) || [];
+				const identitiesOnly = (sshHostConfig['IdentitiesOnly'] || 'no').toLowerCase() === 'yes';
+				const identityKeys = await gatherIdentityFiles(identityFiles, this.sshAgentSock, identitiesOnly, this.logger);
+
+				// Create proxy jump connections if any
+				let proxyStream: ssh2.ClientChannel | stream.Duplex | undefined;
+				if (sshHostConfig['ProxyJump']) {
+					const proxyJumps = sshHostConfig['ProxyJump'].split(',').filter(i => !!i.trim())
+						.map(i => {
+							const proxy = SSHDestination.parse(i);
+							const proxyHostConfig = sshconfig.getHostConfiguration(proxy.hostname);
+							return [proxy, proxyHostConfig] as [SSHDestination, Record<string, string>];
+						});
+					for (let i = 0; i < proxyJumps.length; i++) {
+						const [proxy, proxyHostConfig] = proxyJumps[i];
+						const proxyHostName = proxyHostConfig['HostName'] || proxy.hostname;
+						const proxyUser = proxyHostConfig['User'] || proxy.user || sshUser;
+						const proxyPort = proxyHostConfig['Port'] ? parseInt(proxyHostConfig['Port'], 10) : (proxy.port || sshPort);
+
+						const proxyAgentForward = enableAgentForwarding && (proxyHostConfig['ForwardAgent'] || 'no').toLowerCase() === 'yes';
+						const proxyAgent = proxyAgentForward && this.sshAgentSock ? new ssh2.OpenSSHAgent(this.sshAgentSock) : undefined;
+
+						const proxyIdentityFiles: string[] = (proxyHostConfig['IdentityFile'] as unknown as string[]) || [];
+						const proxyIdentitiesOnly = (proxyHostConfig['IdentitiesOnly'] || 'no').toLowerCase() === 'yes';
+						const proxyIdentityKeys = await gatherIdentityFiles(proxyIdentityFiles, this.sshAgentSock, proxyIdentitiesOnly, this.logger);
+
+						const proxyAuthHandler = this.getSSHAuthHandler(proxyUser, proxyHostName, proxyIdentityKeys, preferredAuthentications);
+						const proxyConnection = new SSHConnection({
+							host: !proxyStream ? proxyHostName : undefined,
+							port: !proxyStream ? proxyPort : undefined,
+							sock: proxyStream,
+							username: proxyUser,
+							readyTimeout: connectTimeout * 1000,
+							strictVendor: false,
+							agentForward: proxyAgentForward,
+							agent: proxyAgent,
+							authHandler: (arg0, arg1, arg2) => (proxyAuthHandler(arg0, arg1, arg2), undefined)
+						});
+						this.proxyConnections.push(proxyConnection);
+
+						const nextProxyJump = i < proxyJumps.length - 1 ? proxyJumps[i + 1] : undefined;
+						const destIP = nextProxyJump ? (nextProxyJump[1]['HostName'] || nextProxyJump[0].hostname) : sshHostName;
+						const destPort = nextProxyJump ? ((nextProxyJump[1]['Port'] && parseInt(nextProxyJump[1]['Port'], 10)) || nextProxyJump[0].port || 22) : sshPort;
+						proxyStream = await proxyConnection.forwardOut('127.0.0.1', 0, destIP, destPort);
+					}
+				} else if (sshHostConfig['ProxyCommand']) {
+					let proxyArgs = (sshHostConfig['ProxyCommand'] as unknown as string[])
+						.map((arg) => arg.replace('%h', sshHostName).replace('%n', sshDest.hostname).replace('%p', sshPort.toString()).replace('%r', sshUser));
+					let proxyCommand = proxyArgs.shift()!;
+
+					let options = {};
+					if (isWindows && /\.(bat|cmd)$/.test(proxyCommand)) {
+						proxyCommand = `"${proxyCommand}"`;
+						proxyArgs = proxyArgs.map((arg) => arg.includes(' ') ? `"${arg}"` : arg);
+						options = { shell: true, windowsHide: true, windowsVerbatimArguments: true };
+					}
+
+					this.logger.trace(`Spawning ProxyCommand: ${proxyCommand} ${proxyArgs.join(' ')}`);
+
+					const child = cp.spawn(proxyCommand, proxyArgs, options);
+					proxyStream = stream.Duplex.from({ readable: child.stdout, writable: child.stdin });
+					this.proxyCommandProcess = child;
+				}
+
+				// Create final shh connection
+				const sshAuthHandler = this.getSSHAuthHandler(sshUser, sshHostName, identityKeys, preferredAuthentications);
+
+				this.sshConnection = new SSHConnection({
+					host: !proxyStream ? sshHostName : undefined,
+					port: !proxyStream ? sshPort : undefined,
+					sock: proxyStream,
+					username: sshUser,
+					readyTimeout: connectTimeout * 1000,
+					strictVendor: false,
+					agentForward,
+					agent,
+					authHandler: (arg0, arg1, arg2) => (sshAuthHandler(arg0, arg1, arg2), undefined),
+				});
+				await this.sshConnection.connect();
+
+				const envVariables: Record<string, string | null> = {};
+				if (agentForward) {
+					envVariables['SSH_AUTH_SOCK'] = null;
+				}
+
+				const installResult = await installCodeServer(this.sshConnection, serverDownloadUrlTemplate, defaultExtensions, Object.keys(envVariables), remotePlatformMap[sshDest.hostname], remoteServerListenOnSocket, this.logger);
+
+				for (const key of Object.keys(envVariables)) {
+					if (installResult[key] !== undefined) {
+						envVariables[key] = installResult[key];
+					}
+				}
+
+				// Update terminal env variables
+				this.context.environmentVariableCollection.persistent = false;
+				for (const [key, value] of Object.entries(envVariables)) {
+					if (value) {
+						this.context.environmentVariableCollection.replace(key, value);
+					}
+				}
+
+				if (enableDynamicForwarding) {
+					const socksPort = await findRandomPort();
+					this.socksTunnel = await this.sshConnection!.addTunnel({
+						name: `ssh_tunnel_socks_${socksPort}`,
+						localPort: socksPort,
+						socks: true
+					});
+				}
+
+				const tunnelConfig = await this.openTunnel(0, installResult.listeningOn);
+				this.tunnels.push(tunnelConfig);
+
+				// Enable ports view
+				vscode.commands.executeCommand('setContext', 'forwardedPortsViewEnabled', true);
+
+				this.labelFormatterDisposable?.dispose();
+				this.labelFormatterDisposable = vscode.workspace.registerResourceLabelFormatter({
+					scheme: 'vscode-remote',
+					authority: `${REMOTE_SSH_AUTHORITY}+*`,
+					formatting: {
+						label: '${path}',
+						separator: '/',
+						tildify: true,
+						workspaceSuffix: `SSH: ${sshDest.hostname}` + (sshDest.port && sshDest.port !== 22 ? `:${sshDest.port}` : '')
+					}
+				});
+
+				const resolvedResult: vscode.ResolverResult = new vscode.ResolvedAuthority('127.0.0.1', tunnelConfig.localPort, installResult.connectionToken);
+				resolvedResult.extensionHostEnv = envVariables;
+				return resolvedResult;
+			} catch (e: unknown) {
+				this.logger.error(`Error resolving authority`, e);
+
+				// Initial connection
+				if (context.resolveAttempt === 1) {
+					this.logger.show();
+
+					const closeRemote = 'Close Remote';
+					const retry = 'Retry';
+					const result = await vscode.window.showErrorMessage(`Could not establish connection to "${sshDest.hostname}"`, { modal: true }, closeRemote, retry);
+					if (result === closeRemote) {
+						await vscode.commands.executeCommand('workbench.action.remote.close');
+					} else if (result === retry) {
+						await vscode.commands.executeCommand('workbench.action.reloadWindow');
+					}
+				}
+
+				if (e instanceof ServerInstallError || !(e instanceof Error)) {
+					throw vscode.RemoteAuthorityResolverError.NotAvailable(e instanceof Error ? e.message : String(e));
+				} else {
+					throw vscode.RemoteAuthorityResolverError.TemporarilyNotAvailable(e.message);
+				}
+			}
+		});
+	}
+
+	private async openTunnel(localPort: number, remotePortOrSocketPath: number | string) {
+		localPort = localPort > 0 ? localPort : await findRandomPort();
+
+		const disposables: vscode.Disposable[] = [];
+		const remotePort = typeof remotePortOrSocketPath === 'number' ? remotePortOrSocketPath : undefined;
+		const remoteSocketPath = typeof remotePortOrSocketPath === 'string' ? remotePortOrSocketPath : undefined;
+		if (this.socksTunnel && remotePort) {
+			const forwardingServer = await new Promise<net.Server>((resolve, reject) => {
+				this.logger.trace(`Creating forwarding server ${localPort}(local) => ${this.socksTunnel!.localPort!}(socks) => ${remotePort}(remote)`);
+				const socksOptions: SocksClientOptions = {
+					proxy: {
+						host: '127.0.0.1',
+						port: this.socksTunnel!.localPort!,
+						type: 5
+					},
+					command: 'connect',
+					destination: {
+						host: '127.0.0.1',
+						port: remotePort
+					}
+				};
+				const server: net.Server = net.createServer()
+					.on('error', reject)
+					.on('connection', async (socket: net.Socket) => {
+						try {
+							const socksConn = await SocksClient.createConnection(socksOptions);
+							socket.pipe(socksConn.socket);
+							socksConn.socket.pipe(socket);
+						} catch (error) {
+							this.logger.error(`Error while creating SOCKS connection`, error);
+						}
+					})
+					.on('listening', () => resolve(server))
+					.listen(localPort);
+			});
+			disposables.push({
+				dispose: () => forwardingServer.close(() => {
+					this.logger.trace(`SOCKS forwading server closed`);
+				}),
+			});
+		} else {
+			this.logger.trace(`Opening tunnel ${localPort}(local) => ${remotePortOrSocketPath}(remote)`);
+			const tunnelConfig = await this.sshConnection!.addTunnel({
+				name: `ssh_tunnel_${localPort}_${remotePortOrSocketPath}`,
+				remoteAddr: '127.0.0.1',
+				remotePort,
+				remoteSocketPath,
+				localPort
+			});
+			disposables.push({
+				dispose: () => {
+					this.sshConnection?.closeTunnel(tunnelConfig.name);
+					this.logger.trace(`Tunnel ${tunnelConfig.name} closed`);
+				}
+			});
+		}
+
+		return new TunnelInfo(localPort, remotePortOrSocketPath, disposables);
+	}
+
+	private getSSHAuthHandler(sshUser: string, sshHostName: string, identityKeys: SSHKey[], preferredAuthentications: string[]) {
+		let passwordRetryCount = PASSWORD_RETRY_COUNT;
+		let keyboardRetryCount = PASSWORD_RETRY_COUNT;
+		identityKeys = identityKeys.slice();
+		return async (methodsLeft: string[] | null, _partialSuccess: boolean | null, callback: (nextAuth: ssh2.AuthHandlerResult) => void) => {
+			if (methodsLeft === null) {
+				this.logger.info(`Trying no-auth authentication`);
+
+				return callback({
+					type: 'none',
+					username: sshUser,
+				});
+			}
+			if (methodsLeft.includes('publickey') && identityKeys.length && preferredAuthentications.includes('publickey')) {
+				const identityKey = identityKeys.shift()!;
+
+				this.logger.info(`Trying publickey authentication: ${identityKey.filename} ${identityKey.parsedKey.type} SHA256:${identityKey.fingerprint}`);
+
+				if (identityKey.agentSupport) {
+					return callback({
+						type: 'agent',
+						username: sshUser,
+						agent: new class extends ssh2.OpenSSHAgent {
+							// Only return the current key
+							override getIdentities(callback: (err: Error | undefined, publicKeys?: ParsedKey[]) => void): void {
+								callback(undefined, [identityKey.parsedKey]);
+							}
+						}(this.sshAgentSock!)
+					});
+				}
+				if (identityKey.isPrivate) {
+					return callback({
+						type: 'publickey',
+						username: sshUser,
+						key: identityKey.parsedKey
+					});
+				}
+				if (!await fileExists(identityKey.filename)) {
+					// Try next identity file
+					return callback(null as any);
+				}
+
+				const keyBuffer = await fs.promises.readFile(identityKey.filename);
+				let result = ssh2.utils.parseKey(keyBuffer); // First try without passphrase
+				if (result instanceof Error && result.message === 'Encrypted private OpenSSH key detected, but no passphrase given') {
+					let passphraseRetryCount = PASSPHRASE_RETRY_COUNT;
+					while (result instanceof Error && passphraseRetryCount > 0) {
+						const passphrase = await vscode.window.showInputBox({
+							title: `Enter passphrase for ${identityKey.filename}`,
+							password: true,
+							ignoreFocusOut: true
+						});
+						if (!passphrase) {
+							break;
+						}
+						result = ssh2.utils.parseKey(keyBuffer, passphrase);
+						passphraseRetryCount--;
+					}
+				}
+				if (!result || result instanceof Error) {
+					// Try next identity file
+					return callback(null as any);
+				}
+
+				const key = Array.isArray(result) ? result[0] : result;
+				return callback({
+					type: 'publickey',
+					username: sshUser,
+					key
+				});
+			}
+			if (methodsLeft.includes('password') && passwordRetryCount > 0 && preferredAuthentications.includes('password')) {
+				if (passwordRetryCount === PASSWORD_RETRY_COUNT) {
+					this.logger.info(`Trying password authentication`);
+				}
+
+				const password = await vscode.window.showInputBox({
+					title: `Enter password for ${sshUser}@${sshHostName}`,
+					password: true,
+					ignoreFocusOut: true
+				});
+				passwordRetryCount--;
+
+				return callback(password
+					? {
+						type: 'password',
+						username: sshUser,
+						password
+					}
+					: false);
+			}
+			if (methodsLeft.includes('keyboard-interactive') && keyboardRetryCount > 0 && preferredAuthentications.includes('keyboard-interactive')) {
+				if (keyboardRetryCount === PASSWORD_RETRY_COUNT) {
+					this.logger.info(`Trying keyboard-interactive authentication`);
+				}
+
+				return callback({
+					type: 'keyboard-interactive',
+					username: sshUser,
+					prompt: async (_name, _instructions, _instructionsLang, prompts, finish) => {
+						const responses: string[] = [];
+						for (const prompt of prompts) {
+							const response = await vscode.window.showInputBox({
+								title: `(${sshUser}@${sshHostName}) ${prompt.prompt}`,
+								password: !prompt.echo,
+								ignoreFocusOut: true
+							});
+							if (response === undefined) {
+								keyboardRetryCount = 0;
+								break;
+							}
+							responses.push(response);
+						}
+						keyboardRetryCount--;
+						finish(responses);
+					}
+				});
+			}
+
+			callback(false);
+		};
+	}
+
+	dispose() {
+		disposeAll(this.tunnels);
+		// If there's proxy connections then just close the parent connection
+		if (this.proxyConnections.length) {
+			this.proxyConnections[0].close();
+		} else {
+			this.sshConnection?.close();
+		}
+		this.proxyCommandProcess?.kill();
+		this.labelFormatterDisposable?.dispose();
+	}
+}

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

@@ -0,0 +1,68 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as vscode from 'vscode';
+import * as fs from 'fs';
+import { getRemoteAuthority } from './authResolver';
+import { getSSHConfigPath } from './ssh/sshConfig';
+import { exists as fileExists } from './common/files';
+import SSHDestination from './ssh/sshDestination';
+
+export async function promptOpenRemoteSSHWindow(reuseWindow: boolean) {
+	const host = await vscode.window.showInputBox({
+		title: 'Enter [user@]hostname[:port]'
+	});
+
+	if (!host) {
+		return;
+	}
+
+	const sshDest = new SSHDestination(host);
+	openRemoteSSHWindow(sshDest.toEncodedString(), reuseWindow);
+}
+
+export function openRemoteSSHWindow(host: string, reuseWindow: boolean) {
+	vscode.commands.executeCommand('vscode.newWindow', { remoteAuthority: getRemoteAuthority(host), reuseWindow });
+}
+
+export function openRemoteSSHLocationWindow(host: string, path: string, reuseWindow: boolean) {
+	vscode.commands.executeCommand('vscode.openFolder', vscode.Uri.from({ scheme: 'vscode-remote', authority: getRemoteAuthority(host), path }), { forceNewWindow: !reuseWindow });
+}
+
+export async function addNewHost() {
+	const sshConfigPath = getSSHConfigPath();
+	if (!await fileExists(sshConfigPath)) {
+		await fs.promises.appendFile(sshConfigPath, '');
+	}
+
+	await vscode.commands.executeCommand('vscode.open', vscode.Uri.file(sshConfigPath), { preview: false });
+
+	const textEditor = vscode.window.activeTextEditor;
+	if (textEditor?.document.uri.fsPath !== sshConfigPath) {
+		return;
+	}
+
+	const textDocument = textEditor.document;
+	const lastLine = textDocument.lineAt(textDocument.lineCount - 1);
+
+	if (!lastLine.isEmptyOrWhitespace) {
+		await textEditor.edit((editBuilder: vscode.TextEditorEdit) => {
+			editBuilder.insert(lastLine.range.end, '\n');
+		});
+	}
+
+	const snippet = '\nHost ${1:dev}\n\tHostName ${2:dev.example.com}\n\tUser ${3:john}';
+	await textEditor.insertSnippet(
+		new vscode.SnippetString(snippet),
+		new vscode.Position(textDocument.lineCount, 0)
+	);
+}
+
+export async function openSSHConfigFile() {
+	const sshConfigPath = getSSHConfigPath();
+	if (!await fileExists(sshConfigPath)) {
+		await fs.promises.appendFile(sshConfigPath, '');
+	}
+	vscode.commands.executeCommand('vscode.open', vscode.Uri.file(sshConfigPath));
+}

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as vscode from 'vscode';
+import Log from './common/logger';
+import { RemoteSSHResolver, REMOTE_SSH_AUTHORITY } from './authResolver';
+import { openSSHConfigFile, promptOpenRemoteSSHWindow } from './commands';
+import { HostTreeDataProvider } from './hostTreeView';
+import { getRemoteWorkspaceLocationData, RemoteLocationHistory } from './remoteLocationHistory';
+
+export async function activate(context: vscode.ExtensionContext) {
+	const logger = new Log('Remote - SSH');
+	context.subscriptions.push(logger);
+
+	const remoteSSHResolver = new RemoteSSHResolver(context, logger);
+	context.subscriptions.push(vscode.workspace.registerRemoteAuthorityResolver(REMOTE_SSH_AUTHORITY, remoteSSHResolver));
+	context.subscriptions.push(remoteSSHResolver);
+
+	const locationHistory = new RemoteLocationHistory(context);
+	const locationData = getRemoteWorkspaceLocationData();
+	if (locationData) {
+		await locationHistory.addLocation(locationData[0], locationData[1]);
+	}
+
+	const hostTreeDataProvider = new HostTreeDataProvider(locationHistory);
+	context.subscriptions.push(vscode.window.createTreeView('sshHosts', { treeDataProvider: hostTreeDataProvider }));
+	context.subscriptions.push(hostTreeDataProvider);
+
+	context.subscriptions.push(vscode.commands.registerCommand('openremotessh.openEmptyWindow', () => promptOpenRemoteSSHWindow(false)));
+	context.subscriptions.push(vscode.commands.registerCommand('openremotessh.openEmptyWindowInCurrentWindow', () => promptOpenRemoteSSHWindow(true)));
+	context.subscriptions.push(vscode.commands.registerCommand('openremotessh.openConfigFile', () => openSSHConfigFile()));
+	context.subscriptions.push(vscode.commands.registerCommand('openremotessh.showLog', () => logger.show()));
+}
+
+export function deactivate() {
+}

extensions/open-remote-ssh/src/hostTreeView.ts

@@ -0,0 +1,109 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as vscode from 'vscode';
+import * as path from 'path';
+import SSHConfiguration, { getSSHConfigPath } from './ssh/sshConfig';
+import { RemoteLocationHistory } from './remoteLocationHistory';
+import { Disposable } from './common/disposable';
+import { addNewHost, openRemoteSSHLocationWindow, openRemoteSSHWindow, openSSHConfigFile } from './commands';
+import SSHDestination from './ssh/sshDestination';
+
+class HostItem {
+	constructor(
+		public hostname: string,
+		public locations: string[]
+	) {
+	}
+}
+
+class HostLocationItem {
+	constructor(
+		public path: string,
+		public hostname: string
+	) {
+	}
+}
+
+type DataTreeItem = HostItem | HostLocationItem;
+
+export class HostTreeDataProvider extends Disposable implements vscode.TreeDataProvider<DataTreeItem> {
+
+	private readonly _onDidChangeTreeData = this._register(new vscode.EventEmitter<DataTreeItem | DataTreeItem[] | void>());
+	public readonly onDidChangeTreeData = this._onDidChangeTreeData.event;
+
+	constructor(
+		private locationHistory: RemoteLocationHistory
+	) {
+		super();
+
+		this._register(vscode.commands.registerCommand('openremotessh.explorer.add', () => addNewHost()));
+		this._register(vscode.commands.registerCommand('openremotessh.explorer.configure', () => openSSHConfigFile()));
+		this._register(vscode.commands.registerCommand('openremotessh.explorer.refresh', () => this.refresh()));
+		this._register(vscode.commands.registerCommand('openremotessh.explorer.emptyWindowInNewWindow', e => this.openRemoteSSHWindow(e, false)));
+		this._register(vscode.commands.registerCommand('openremotessh.explorer.emptyWindowInCurrentWindow', e => this.openRemoteSSHWindow(e, true)));
+		this._register(vscode.commands.registerCommand('openremotessh.explorer.reopenFolderInNewWindow', e => this.openRemoteSSHLocationWindow(e, false)));
+		this._register(vscode.commands.registerCommand('openremotessh.explorer.reopenFolderInCurrentWindow', e => this.openRemoteSSHLocationWindow(e, true)));
+		this._register(vscode.commands.registerCommand('openremotessh.explorer.deleteFolderHistoryItem', e => this.deleteHostLocation(e)));
+
+		this._register(vscode.workspace.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration('remote.SSH.configFile')) {
+				this.refresh();
+			}
+		}));
+		this._register(vscode.workspace.onDidSaveTextDocument(e => {
+			if (e.uri.fsPath === getSSHConfigPath()) {
+				this.refresh();
+			}
+		}));
+	}
+
+	getTreeItem(element: DataTreeItem): vscode.TreeItem {
+		if (element instanceof HostLocationItem) {
+			const label = path.posix.basename(element.path).replace(/\.code-workspace$/, ' (Workspace)');
+			const treeItem = new vscode.TreeItem(label);
+			treeItem.description = path.posix.dirname(element.path);
+			treeItem.iconPath = new vscode.ThemeIcon('folder');
+			treeItem.contextValue = 'openremotessh.explorer.folder';
+			return treeItem;
+		}
+
+		const treeItem = new vscode.TreeItem(element.hostname);
+		treeItem.collapsibleState = element.locations.length ? vscode.TreeItemCollapsibleState.Collapsed : vscode.TreeItemCollapsibleState.None;
+		treeItem.iconPath = new vscode.ThemeIcon('vm');
+		treeItem.contextValue = 'openremotessh.explorer.host';
+		return treeItem;
+	}
+
+	async getChildren(element?: HostItem): Promise<DataTreeItem[]> {
+		if (!element) {
+			const sshConfigFile = await SSHConfiguration.loadFromFS();
+			const hosts = sshConfigFile.getAllConfiguredHosts();
+			return hosts.map(hostname => new HostItem(hostname, this.locationHistory.getHistory(hostname)));
+		}
+		if (element instanceof HostItem) {
+			return element.locations.map(location => new HostLocationItem(location, element.hostname));
+		}
+		return [];
+	}
+
+	private refresh() {
+		this._onDidChangeTreeData.fire();
+	}
+
+	private async deleteHostLocation(element: HostLocationItem) {
+		await this.locationHistory.removeLocation(element.hostname, element.path);
+		this.refresh();
+	}
+
+	private async openRemoteSSHWindow(element: HostItem, reuseWindow: boolean) {
+		const sshDest = new SSHDestination(element.hostname);
+		openRemoteSSHWindow(sshDest.toEncodedString(), reuseWindow);
+	}
+
+	private async openRemoteSSHLocationWindow(element: HostLocationItem, reuseWindow: boolean) {
+		const sshDest = new SSHDestination(element.hostname);
+		openRemoteSSHLocationWindow(sshDest.toEncodedString(), element.path, reuseWindow);
+	}
+}

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

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

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

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

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

@@ -0,0 +1,626 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as crypto from 'crypto';
+import Log from './common/logger';
+import { getVSCodeServerConfig } from './serverConfig';
+import SSHConnection from './ssh/sshConnection';
+
+export interface ServerInstallOptions {
+	id: string;
+	quality: string;
+	commit: string;
+	version: string;
+	release?: string; // void specific
+	extensionIds: string[];
+	envVariables: string[];
+	useSocketPath: boolean;
+	serverApplicationName: string;
+	serverDataFolderName: string;
+	serverDownloadUrlTemplate: string;
+}
+
+export interface ServerInstallResult {
+	exitCode: number;
+	listeningOn: number | string;
+	connectionToken: string;
+	logFile: string;
+	osReleaseId: string;
+	arch: string;
+	platform: string;
+	tmpDir: string;
+	[key: string]: any;
+}
+
+export class ServerInstallError extends Error {
+	constructor(message: string) {
+		super(message);
+	}
+}
+
+const DEFAULT_DOWNLOAD_URL_TEMPLATE = 'https://github.com/voideditor/void-updates-server/releases/download/test/void-server-${os}-${arch}.tar.gz';
+
+export async function installCodeServer(conn: SSHConnection, serverDownloadUrlTemplate: string | undefined, extensionIds: string[], envVariables: string[], platform: string | undefined, useSocketPath: boolean, logger: Log): Promise<ServerInstallResult> {
+	let shell = 'powershell';
+
+	// detect platform and shell for windows
+	if (!platform || platform === 'windows') {
+		const result = await conn.exec('uname -s');
+
+		if (result.stdout) {
+			if (result.stdout.includes('windows32')) {
+				platform = 'windows';
+			} else if (result.stdout.includes('MINGW64')) {
+				platform = 'windows';
+				shell = 'bash';
+			}
+		} else if (result.stderr) {
+			if (result.stderr.includes('FullyQualifiedErrorId : CommandNotFoundException')) {
+				platform = 'windows';
+			}
+
+			if (result.stderr.includes('is not recognized as an internal or external command')) {
+				platform = 'windows';
+				shell = 'cmd';
+			}
+		}
+
+		if (platform) {
+			logger.trace(`Detected platform: ${platform}, ${shell}`);
+		}
+	}
+
+	const scriptId = crypto.randomBytes(12).toString('hex');
+
+	const vscodeServerConfig = await getVSCodeServerConfig();
+	const installOptions: ServerInstallOptions = {
+		id: scriptId,
+		version: vscodeServerConfig.version,
+		commit: vscodeServerConfig.commit,
+		quality: vscodeServerConfig.quality,
+		release: vscodeServerConfig.release,
+		extensionIds,
+		envVariables,
+		useSocketPath,
+		serverApplicationName: vscodeServerConfig.serverApplicationName,
+		serverDataFolderName: vscodeServerConfig.serverDataFolderName,
+		serverDownloadUrlTemplate: serverDownloadUrlTemplate ?? vscodeServerConfig.serverDownloadUrlTemplate ?? DEFAULT_DOWNLOAD_URL_TEMPLATE,
+	};
+
+	let commandOutput: { stdout: string; stderr: string };
+	if (platform === 'windows') {
+		const installServerScript = generatePowerShellInstallScript(installOptions);
+
+		logger.trace('Server install command:', installServerScript);
+
+		const installDir = `$HOME\\${vscodeServerConfig.serverDataFolderName}\\install`;
+		const installScript = `${installDir}\\${vscodeServerConfig.commit}.ps1`;
+		const endRegex = new RegExp(`${scriptId}: end`);
+		// investigate if it's possible to use `-EncodedCommand` flag
+		// https://devblogs.microsoft.com/powershell/invoking-powershell-with-complex-expressions-using-scriptblocks/
+		let command = '';
+		if (shell === 'powershell') {
+			command = `md -Force ${installDir}; echo @'\n${installServerScript}\n'@ | Set-Content ${installScript}; powershell -ExecutionPolicy ByPass -File "${installScript}"`;
+		} else if (shell === 'bash') {
+			command = `mkdir -p ${installDir.replace(/\\/g, '/')} && echo '\n${installServerScript.replace(/'/g, '\'"\'"\'')}\n' > ${installScript.replace(/\\/g, '/')} && powershell -ExecutionPolicy ByPass -File "${installScript}"`;
+		} else if (shell === 'cmd') {
+			const script = installServerScript.trim()
+				// remove comments
+				.replace(/^#.*$/gm, '')
+				// remove empty lines
+				.replace(/\n{2,}/gm, '\n')
+				// remove leading spaces
+				.replace(/^\s*/gm, '')
+				// escape double quotes (from powershell/cmd)
+				.replace(/"/g, '"""')
+				// escape single quotes (from cmd)
+				.replace(/'/g, `''`)
+				// escape redirect (from cmd)
+				.replace(/>/g, `^>`)
+				// escape new lines (from powershell/cmd)
+				.replace(/\n/g, '\'`n\'');
+
+			command = `powershell "md -Force ${installDir}" && powershell "echo '${script}'" > ${installScript.replace('$HOME', '%USERPROFILE%')} && powershell -ExecutionPolicy ByPass -File "${installScript.replace('$HOME', '%USERPROFILE%')}"`;
+
+			logger.trace('Command length (8191 max):', command.length);
+
+			if (command.length > 8191) {
+				throw new ServerInstallError(`Command line too long`);
+			}
+		} else {
+			throw new ServerInstallError(`Not supported shell: ${shell}`);
+		}
+
+		commandOutput = await conn.execPartial(command, (stdout: string) => endRegex.test(stdout));
+	} else {
+		const installServerScript = generateBashInstallScript(installOptions);
+
+		logger.trace('Server install command:', installServerScript);
+		// Fish shell does not support heredoc so let's workaround it using -c option,
+		// also replace single quotes (') within the script with ('\'') as there's no quoting within single quotes, see https://unix.stackexchange.com/a/24676
+		commandOutput = await conn.exec(`bash -c '${installServerScript.replace(/'/g, `'\\''`)}'`);
+	}
+
+	if (commandOutput.stderr) {
+		logger.trace('Server install command stderr:', commandOutput.stderr);
+	}
+	logger.trace('Server install command stdout:', commandOutput.stdout);
+
+	const resultMap = parseServerInstallOutput(commandOutput.stdout, scriptId);
+	if (!resultMap) {
+		throw new ServerInstallError(`Failed parsing install script output`);
+	}
+
+	const exitCode = parseInt(resultMap.exitCode, 10);
+	if (exitCode !== 0) {
+		throw new ServerInstallError(`Couldn't install vscode server on remote server, install script returned non-zero exit status`);
+	}
+
+	const listeningOn = resultMap.listeningOn.match(/^\d+$/)
+		? parseInt(resultMap.listeningOn, 10)
+		: resultMap.listeningOn;
+
+	const remoteEnvVars = Object.fromEntries(Object.entries(resultMap).filter(([key,]) => envVariables.includes(key)));
+
+	return {
+		exitCode,
+		listeningOn,
+		connectionToken: resultMap.connectionToken,
+		logFile: resultMap.logFile,
+		osReleaseId: resultMap.osReleaseId,
+		arch: resultMap.arch,
+		platform: resultMap.platform,
+		tmpDir: resultMap.tmpDir,
+		...remoteEnvVars
+	};
+}
+
+function parseServerInstallOutput(str: string, scriptId: string): { [k: string]: string } | undefined {
+	const startResultStr = `${scriptId}: start`;
+	const endResultStr = `${scriptId}: end`;
+
+	const startResultIdx = str.indexOf(startResultStr);
+	if (startResultIdx < 0) {
+		return undefined;
+	}
+
+	const endResultIdx = str.indexOf(endResultStr, startResultIdx + startResultStr.length);
+	if (endResultIdx < 0) {
+		return undefined;
+	}
+
+	const installResult = str.substring(startResultIdx + startResultStr.length, endResultIdx);
+
+	const resultMap: { [k: string]: string } = {};
+	const resultArr = installResult.split(/\r?\n/);
+	for (const line of resultArr) {
+		const [key, value] = line.split('==');
+		resultMap[key] = value;
+	}
+
+	return resultMap;
+}
+
+function generateBashInstallScript({ id, quality, version, commit, release, extensionIds, envVariables, useSocketPath, serverApplicationName, serverDataFolderName, serverDownloadUrlTemplate }: ServerInstallOptions) {
+	const extensions = extensionIds.map(id => '--install-extension ' + id).join(' ');
+	return `
+# Server installation script
+
+TMP_DIR="\${XDG_RUNTIME_DIR:-"/tmp"}"
+
+DISTRO_VERSION="${version}"
+DISTRO_COMMIT="${commit}"
+DISTRO_QUALITY="${quality}"
+DISTRO_VOID_RELEASE="${release ?? ''}"
+
+SERVER_APP_NAME="${serverApplicationName}"
+SERVER_INITIAL_EXTENSIONS="${extensions}"
+SERVER_LISTEN_FLAG="${useSocketPath ? `--socket-path="$TMP_DIR/vscode-server-sock-${crypto.randomUUID()}"` : '--port=0'}"
+SERVER_DATA_DIR="$HOME/${serverDataFolderName}"
+SERVER_DIR="$SERVER_DATA_DIR/bin/$DISTRO_COMMIT"
+SERVER_SCRIPT="$SERVER_DIR/bin/$SERVER_APP_NAME"
+SERVER_LOGFILE="$SERVER_DATA_DIR/.$DISTRO_COMMIT.log"
+SERVER_PIDFILE="$SERVER_DATA_DIR/.$DISTRO_COMMIT.pid"
+SERVER_TOKENFILE="$SERVER_DATA_DIR/.$DISTRO_COMMIT.token"
+SERVER_ARCH=
+SERVER_CONNECTION_TOKEN=
+SERVER_DOWNLOAD_URL=
+
+LISTENING_ON=
+OS_RELEASE_ID=
+ARCH=
+PLATFORM=
+
+# Mimic output from logs of remote-ssh extension
+print_install_results_and_exit() {
+    echo "${id}: start"
+    echo "exitCode==$1=="
+    echo "listeningOn==$LISTENING_ON=="
+    echo "connectionToken==$SERVER_CONNECTION_TOKEN=="
+    echo "logFile==$SERVER_LOGFILE=="
+    echo "osReleaseId==$OS_RELEASE_ID=="
+    echo "arch==$ARCH=="
+    echo "platform==$PLATFORM=="
+    echo "tmpDir==$TMP_DIR=="
+    ${envVariables.map(envVar => `echo "${envVar}==$${envVar}=="`).join('\n')}
+    echo "${id}: end"
+    exit 0
+}
+
+# Check if platform is supported
+KERNEL="$(uname -s)"
+case $KERNEL in
+    Darwin)
+        PLATFORM="darwin"
+        ;;
+    Linux)
+        PLATFORM="linux"
+        ;;
+    FreeBSD)
+        PLATFORM="freebsd"
+        ;;
+    DragonFly)
+        PLATFORM="dragonfly"
+        ;;
+    *)
+        echo "Error platform not supported: $KERNEL"
+        print_install_results_and_exit 1
+        ;;
+esac
+
+# Check machine architecture
+ARCH="$(uname -m)"
+case $ARCH in
+    x86_64 | amd64)
+        SERVER_ARCH="x64"
+        ;;
+    armv7l | armv8l)
+        SERVER_ARCH="armhf"
+        ;;
+    arm64 | aarch64)
+        SERVER_ARCH="arm64"
+        ;;
+    ppc64le)
+        SERVER_ARCH="ppc64le"
+        ;;
+    riscv64)
+        SERVER_ARCH="riscv64"
+        ;;
+    loongarch64)
+        SERVER_ARCH="loong64"
+        ;;
+    s390x)
+        SERVER_ARCH="s390x"
+        ;;
+    *)
+        echo "Error architecture not supported: $ARCH"
+        print_install_results_and_exit 1
+        ;;
+esac
+
+# https://www.freedesktop.org/software/systemd/man/os-release.html
+OS_RELEASE_ID="$(grep -i '^ID=' /etc/os-release 2>/dev/null | sed 's/^ID=//gi' | sed 's/"//g')"
+if [[ -z $OS_RELEASE_ID ]]; then
+    OS_RELEASE_ID="$(grep -i '^ID=' /usr/lib/os-release 2>/dev/null | sed 's/^ID=//gi' | sed 's/"//g')"
+    if [[ -z $OS_RELEASE_ID ]]; then
+        OS_RELEASE_ID="unknown"
+    fi
+fi
+
+# Create installation folder
+if [[ ! -d $SERVER_DIR ]]; then
+    mkdir -p $SERVER_DIR
+    if (( $? > 0 )); then
+        echo "Error creating server install directory"
+        print_install_results_and_exit 1
+    fi
+fi
+
+# adjust platform for void download, if needed
+if [[ $OS_RELEASE_ID = alpine ]]; then
+    PLATFORM=$OS_RELEASE_ID
+fi
+
+SERVER_DOWNLOAD_URL="$(echo "${serverDownloadUrlTemplate.replace(/\$\{/g, '\\${')}" | sed "s/\\\${quality}/$DISTRO_QUALITY/g" | sed "s/\\\${version}/$DISTRO_VERSION/g" | sed "s/\\\${commit}/$DISTRO_COMMIT/g" | sed "s/\\\${os}/$PLATFORM/g" | sed "s/\\\${arch}/$SERVER_ARCH/g" | sed "s/\\\${release}/$DISTRO_VOID_RELEASE/g")"
+
+# Check if server script is already installed
+if [[ ! -f $SERVER_SCRIPT ]]; then
+    case "$PLATFORM" in
+        darwin | linux | alpine )
+            ;;
+        *)
+            echo "Error '$PLATFORM' needs manual installation of remote extension host"
+            print_install_results_and_exit 1
+            ;;
+    esac
+
+    pushd $SERVER_DIR > /dev/null
+
+    if [[ ! -z $(which wget) ]]; then
+        wget --tries=3 --timeout=10 --continue --no-verbose -O vscode-server.tar.gz $SERVER_DOWNLOAD_URL
+    elif [[ ! -z $(which curl) ]]; then
+        curl --retry 3 --connect-timeout 10 --location --show-error --silent --output vscode-server.tar.gz $SERVER_DOWNLOAD_URL
+    else
+        echo "Error no tool to download server binary"
+        print_install_results_and_exit 1
+    fi
+
+    if (( $? > 0 )); then
+        echo "Error downloading server from $SERVER_DOWNLOAD_URL"
+        print_install_results_and_exit 1
+    fi
+
+    tar -xf vscode-server.tar.gz --strip-components 1
+    if (( $? > 0 )); then
+        echo "Error while extracting server contents"
+        print_install_results_and_exit 1
+    fi
+
+    if [[ ! -f $SERVER_SCRIPT ]]; then
+        echo "Error server contents are corrupted"
+        print_install_results_and_exit 1
+    fi
+
+    rm -f vscode-server.tar.gz
+
+    popd > /dev/null
+else
+    echo "Server script already installed in $SERVER_SCRIPT"
+fi
+
+# Try to find if server is already running
+if [[ -f $SERVER_PIDFILE ]]; then
+    SERVER_PID="$(cat $SERVER_PIDFILE)"
+    SERVER_RUNNING_PROCESS="$(ps -o pid,args -p $SERVER_PID | grep $SERVER_SCRIPT)"
+else
+    SERVER_RUNNING_PROCESS="$(ps -o pid,args -A | grep $SERVER_SCRIPT | grep -v grep)"
+fi
+
+if [[ -z $SERVER_RUNNING_PROCESS ]]; then
+    if [[ -f $SERVER_LOGFILE ]]; then
+        rm $SERVER_LOGFILE
+    fi
+    if [[ -f $SERVER_TOKENFILE ]]; then
+        rm $SERVER_TOKENFILE
+    fi
+
+    touch $SERVER_TOKENFILE
+    chmod 600 $SERVER_TOKENFILE
+    SERVER_CONNECTION_TOKEN="${crypto.randomUUID()}"
+    echo $SERVER_CONNECTION_TOKEN > $SERVER_TOKENFILE
+
+    $SERVER_SCRIPT --start-server --host=127.0.0.1 $SERVER_LISTEN_FLAG $SERVER_INITIAL_EXTENSIONS --connection-token-file $SERVER_TOKENFILE --telemetry-level off --enable-remote-auto-shutdown --accept-server-license-terms &> $SERVER_LOGFILE &
+    echo $! > $SERVER_PIDFILE
+else
+    echo "Server script is already running $SERVER_SCRIPT"
+fi
+
+if [[ -f $SERVER_TOKENFILE ]]; then
+    SERVER_CONNECTION_TOKEN="$(cat $SERVER_TOKENFILE)"
+else
+    echo "Error server token file not found $SERVER_TOKENFILE"
+    print_install_results_and_exit 1
+fi
+
+if [[ -f $SERVER_LOGFILE ]]; then
+    for i in {1..5}; do
+        LISTENING_ON="$(cat $SERVER_LOGFILE | grep -E 'Extension host agent listening on .+' | sed 's/Extension host agent listening on //')"
+        if [[ -n $LISTENING_ON ]]; then
+            break
+        fi
+        sleep 0.5
+    done
+
+    if [[ -z $LISTENING_ON ]]; then
+        echo "Error server did not start successfully"
+        print_install_results_and_exit 1
+    fi
+else
+    echo "Error server log file not found $SERVER_LOGFILE"
+    print_install_results_and_exit 1
+fi
+
+# Finish server setup
+print_install_results_and_exit 0
+`;
+}
+
+function generatePowerShellInstallScript({ id, quality, version, commit, release, extensionIds, envVariables, useSocketPath, serverApplicationName, serverDataFolderName, serverDownloadUrlTemplate }: ServerInstallOptions) {
+	const extensions = extensionIds.map(id => '--install-extension ' + id).join(' ');
+	const downloadUrl = serverDownloadUrlTemplate
+		.replace(/\$\{quality\}/g, quality)
+		.replace(/\$\{version\}/g, version)
+		.replace(/\$\{commit\}/g, commit)
+		.replace(/\$\{os\}/g, 'win32')
+		.replace(/\$\{arch\}/g, 'x64')
+		.replace(/\$\{release\}/g, release ?? '');
+
+	return `
+# Server installation script
+
+$TMP_DIR="$env:TEMP\\$([System.IO.Path]::GetRandomFileName())"
+$ProgressPreference = "SilentlyContinue"
+
+$DISTRO_VERSION="${version}"
+$DISTRO_COMMIT="${commit}"
+$DISTRO_QUALITY="${quality}"
+$DISTRO_VOID_RELEASE="${release ?? ''}"
+
+$SERVER_APP_NAME="${serverApplicationName}"
+$SERVER_INITIAL_EXTENSIONS="${extensions}"
+$SERVER_LISTEN_FLAG="${useSocketPath ? `--socket-path="$TMP_DIR/vscode-server-sock-${crypto.randomUUID()}"` : '--port=0'}"
+$SERVER_DATA_DIR="$(Resolve-Path ~)\\${serverDataFolderName}"
+$SERVER_DIR="$SERVER_DATA_DIR\\bin\\$DISTRO_COMMIT"
+$SERVER_SCRIPT="$SERVER_DIR\\bin\\$SERVER_APP_NAME.cmd"
+$SERVER_LOGFILE="$SERVER_DATA_DIR\\.$DISTRO_COMMIT.log"
+$SERVER_PIDFILE="$SERVER_DATA_DIR\\.$DISTRO_COMMIT.pid"
+$SERVER_TOKENFILE="$SERVER_DATA_DIR\\.$DISTRO_COMMIT.token"
+$SERVER_ARCH=
+$SERVER_CONNECTION_TOKEN=
+$SERVER_DOWNLOAD_URL=
+
+$LISTENING_ON=
+$OS_RELEASE_ID=
+$ARCH=
+$PLATFORM="win32"
+
+function printInstallResults($code) {
+    "${id}: start"
+    "exitCode==$code=="
+    "listeningOn==$LISTENING_ON=="
+    "connectionToken==$SERVER_CONNECTION_TOKEN=="
+    "logFile==$SERVER_LOGFILE=="
+    "osReleaseId==$OS_RELEASE_ID=="
+    "arch==$ARCH=="
+    "platform==$PLATFORM=="
+    "tmpDir==$TMP_DIR=="
+    ${envVariables.map(envVar => `"${envVar}==$${envVar}=="`).join('\n')}
+    "${id}: end"
+}
+
+# Check machine architecture
+$ARCH=$env:PROCESSOR_ARCHITECTURE
+# Use x64 version for ARM64, as it's not yet available.
+if(($ARCH -eq "AMD64") -or ($ARCH -eq "IA64") -or ($ARCH -eq "ARM64")) {
+    $SERVER_ARCH="x64"
+}
+else {
+    "Error architecture not supported: $ARCH"
+    printInstallResults 1
+    exit 0
+}
+
+# Create installation folder
+if(!(Test-Path $SERVER_DIR)) {
+    try {
+        ni -it d $SERVER_DIR -f -ea si
+    } catch {
+        "Error creating server install directory - $($_.ToString())"
+        exit 1
+    }
+
+    if(!(Test-Path $SERVER_DIR)) {
+        "Error creating server install directory"
+        exit 1
+    }
+}
+
+cd $SERVER_DIR
+
+# Check if server script is already installed
+if(!(Test-Path $SERVER_SCRIPT)) {
+    del vscode-server.tar.gz
+
+    $REQUEST_ARGUMENTS = @{
+        Uri="${downloadUrl}"
+        TimeoutSec=20
+        OutFile="vscode-server.tar.gz"
+        UseBasicParsing=$True
+    }
+
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+    Invoke-RestMethod @REQUEST_ARGUMENTS
+
+    if(Test-Path "vscode-server.tar.gz") {
+        tar -xf vscode-server.tar.gz --strip-components 1
+
+        del vscode-server.tar.gz
+    }
+
+    if(!(Test-Path $SERVER_SCRIPT)) {
+        "Error while installing the server binary"
+        exit 1
+    }
+}
+else {
+    "Server script already installed in $SERVER_SCRIPT"
+}
+
+# Try to find if server is already running
+if(Get-Process node -ErrorAction SilentlyContinue | Where-Object Path -Like "$SERVER_DIR\\*") {
+    echo "Server script is already running $SERVER_SCRIPT"
+}
+else {
+    if(Test-Path $SERVER_LOGFILE) {
+        del $SERVER_LOGFILE
+    }
+    if(Test-Path $SERVER_PIDFILE) {
+        del $SERVER_PIDFILE
+    }
+    if(Test-Path $SERVER_TOKENFILE) {
+        del $SERVER_TOKENFILE
+    }
+
+    $SERVER_CONNECTION_TOKEN="${crypto.randomUUID()}"
+    [System.IO.File]::WriteAllLines($SERVER_TOKENFILE, $SERVER_CONNECTION_TOKEN)
+
+    $SCRIPT_ARGUMENTS="--start-server --host=127.0.0.1 $SERVER_LISTEN_FLAG $SERVER_INITIAL_EXTENSIONS --connection-token-file $SERVER_TOKENFILE --telemetry-level off --enable-remote-auto-shutdown --accept-server-license-terms *> '$SERVER_LOGFILE'"
+
+    $START_ARGUMENTS = @{
+        FilePath = "powershell.exe"
+        WindowStyle = "hidden"
+        ArgumentList = @(
+            "-ExecutionPolicy", "Unrestricted", "-NoLogo", "-NoProfile", "-NonInteractive", "-c", "$SERVER_SCRIPT $SCRIPT_ARGUMENTS"
+        )
+        PassThru = $True
+    }
+
+    $SERVER_ID = (start @START_ARGUMENTS).ID
+
+    if($SERVER_ID) {
+        [System.IO.File]::WriteAllLines($SERVER_PIDFILE, $SERVER_ID)
+    }
+}
+
+if(Test-Path $SERVER_TOKENFILE) {
+    $SERVER_CONNECTION_TOKEN="$(cat $SERVER_TOKENFILE)"
+}
+else {
+    "Error server token file not found $SERVER_TOKENFILE"
+    printInstallResults 1
+    exit 0
+}
+
+sleep -Milliseconds 500
+
+$SELECT_ARGUMENTS = @{
+    Path = $SERVER_LOGFILE
+    Pattern = "Extension host agent listening on (\\d+)"
+}
+
+for($I = 1; $I -le 5; $I++) {
+    if(Test-Path $SERVER_LOGFILE) {
+        $GROUPS = (Select-String @SELECT_ARGUMENTS).Matches.Groups
+
+        if($GROUPS) {
+            $LISTENING_ON = $GROUPS[1].Value
+            break
+        }
+    }
+
+    sleep -Milliseconds 500
+}
+
+if(!(Test-Path $SERVER_LOGFILE)) {
+    "Error server log file not found $SERVER_LOGFILE"
+    printInstallResults 1
+    exit 0
+}
+
+# Finish server setup
+printInstallResults 0
+
+if($SERVER_ID) {
+    while($True) {
+        if(!(gps -Id $SERVER_ID)) {
+            "server died, exit"
+            exit 0
+        }
+
+        sleep 30
+    }
+}
+`;
+}

extensions/open-remote-ssh/src/ssh/hostfile.ts

@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as os from 'os';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as crypto from 'crypto';
+import { exists as folderExists } from '../common/files';
+
+const PATH_SSH_USER_DIR = path.join(os.homedir(), '.ssh');
+const KNOW_HOST_FILE = path.join(PATH_SSH_USER_DIR, 'known_hosts');
+const HASH_MAGIC = '|1|';
+const HASH_DELIM = '|';
+
+export async function checkNewHostInHostkeys(host: string): Promise<boolean> {
+	const fileContent = await fs.promises.readFile(KNOW_HOST_FILE, { encoding: 'utf8' });
+	const lines = fileContent.split(/\r?\n/);
+	for (let line of lines) {
+		line = line.trim();
+		if (!line.startsWith(HASH_MAGIC)) {
+			continue;
+		}
+
+		const [hostEncripted_] = line.split(' ');
+		const [salt_, hostHash_] = hostEncripted_.substring(HASH_MAGIC.length).split(HASH_DELIM);
+		const hostHash = crypto.createHmac('sha1', Buffer.from(salt_, 'base64')).update(host).digest();
+		if (hostHash.toString('base64') === hostHash_) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+export async function addHostToHostFile(host: string, hostKey: Buffer, type: string): Promise<void> {
+	if (!folderExists(PATH_SSH_USER_DIR)) {
+		await fs.promises.mkdir(PATH_SSH_USER_DIR, 0o700);
+	}
+
+	const salt = crypto.randomBytes(20);
+	const hostHash = crypto.createHmac('sha1', salt).update(host).digest();
+
+	const entry = `${HASH_MAGIC}${salt.toString('base64')}${HASH_DELIM}${hostHash.toString('base64')} ${type} ${hostKey.toString('base64')}\n`;
+	await fs.promises.appendFile(KNOW_HOST_FILE, entry);
+}

extensions/open-remote-ssh/src/ssh/identityFiles.ts

@@ -0,0 +1,120 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import * as crypto from 'crypto';
+import type { ParsedKey } from 'ssh2-streams';
+import * as ssh2 from 'ssh2';
+import { untildify, exists as fileExists } from '../common/files';
+import Log from '../common/logger';
+
+const homeDir = os.homedir();
+const PATH_SSH_CLIENT_ID_DSA = path.join(homeDir, '.ssh', '/id_dsa');
+const PATH_SSH_CLIENT_ID_ECDSA = path.join(homeDir, '.ssh', '/id_ecdsa');
+const PATH_SSH_CLIENT_ID_RSA = path.join(homeDir, '.ssh', '/id_rsa');
+const PATH_SSH_CLIENT_ID_ED25519 = path.join(homeDir, '.ssh', '/id_ed25519');
+const PATH_SSH_CLIENT_ID_XMSS = path.join(homeDir, '.ssh', '/id_xmss');
+const PATH_SSH_CLIENT_ID_ECDSA_SK = path.join(homeDir, '.ssh', '/id_ecdsa_sk');
+const PATH_SSH_CLIENT_ID_ED25519_SK = path.join(homeDir, '.ssh', '/id_ed25519_sk');
+
+const DEFAULT_IDENTITY_FILES: string[] = [
+	PATH_SSH_CLIENT_ID_RSA,
+	PATH_SSH_CLIENT_ID_ECDSA,
+	PATH_SSH_CLIENT_ID_ECDSA_SK,
+	PATH_SSH_CLIENT_ID_ED25519,
+	PATH_SSH_CLIENT_ID_ED25519_SK,
+	PATH_SSH_CLIENT_ID_XMSS,
+	PATH_SSH_CLIENT_ID_DSA,
+];
+
+export interface SSHKey {
+	filename: string;
+	parsedKey: ParsedKey;
+	fingerprint: string;
+	agentSupport?: boolean;
+	isPrivate?: boolean;
+}
+
+// From https://github.com/openssh/openssh-portable/blob/acb2059febaddd71ee06c2ebf63dcf211d9ab9f2/sshconnect2.c#L1689-L1690
+export async function gatherIdentityFiles(identityFiles: string[], sshAgentSock: string | undefined, identitiesOnly: boolean, logger: Log) {
+	identityFiles = identityFiles.map(untildify).map(i => i.replace(/\.pub$/, ''));
+	if (identityFiles.length === 0) {
+		identityFiles.push(...DEFAULT_IDENTITY_FILES);
+	}
+
+	const identityFileContentsResult = await Promise.allSettled(identityFiles.map(async keyPath => {
+		keyPath = await fileExists(keyPath + '.pub') ? keyPath + '.pub' : keyPath;
+		return fs.promises.readFile(keyPath);
+	}));
+	const fileKeys: SSHKey[] = identityFileContentsResult.map((result, i) => {
+		if (result.status === 'rejected') {
+			return undefined;
+		}
+
+		const parsedResult = ssh2.utils.parseKey(result.value);
+		if (parsedResult instanceof Error || !parsedResult) {
+			logger.error(`Error while parsing SSH public key ${identityFiles[i]}:`, parsedResult);
+			return undefined;
+		}
+
+		const parsedKey = Array.isArray(parsedResult) ? parsedResult[0] : parsedResult;
+		const fingerprint = crypto.createHash('sha256').update(parsedKey.getPublicSSH()).digest('base64');
+
+		return {
+			filename: identityFiles[i],
+			parsedKey,
+			fingerprint
+		};
+	}).filter(<T>(v: T | undefined): v is T => !!v);
+
+	let sshAgentParsedKeys: ParsedKey[] = [];
+	try {
+		if (!sshAgentSock) {
+			throw new Error(`SSH_AUTH_SOCK environment variable not defined`);
+		}
+
+		sshAgentParsedKeys = await new Promise<ParsedKey[]>((resolve, reject) => {
+			const sshAgent = new ssh2.OpenSSHAgent(sshAgentSock);
+			sshAgent.getIdentities((err, publicKeys) => {
+				if (err) {
+					reject(err);
+				} else {
+					resolve(publicKeys || []);
+				}
+			});
+		});
+	} catch (e) {
+		logger.error(`Couldn't get identities from OpenSSH agent`, e);
+	}
+
+	const sshAgentKeys: SSHKey[] = sshAgentParsedKeys.map(parsedKey => {
+		const fingerprint = crypto.createHash('sha256').update(parsedKey.getPublicSSH()).digest('base64');
+		return {
+			filename: parsedKey.comment,
+			parsedKey,
+			fingerprint,
+			agentSupport: true
+		};
+	});
+
+	const agentKeys: SSHKey[] = [];
+	const preferredIdentityKeys: SSHKey[] = [];
+	for (const agentKey of sshAgentKeys) {
+		const foundIdx = fileKeys.findIndex(k => agentKey.parsedKey.type === k.parsedKey.type && agentKey.fingerprint === k.fingerprint);
+		if (foundIdx >= 0) {
+			preferredIdentityKeys.push({ ...fileKeys[foundIdx], agentSupport: true });
+			fileKeys.splice(foundIdx, 1);
+		} else if (!identitiesOnly) {
+			agentKeys.push(agentKey);
+		}
+	}
+	preferredIdentityKeys.push(...agentKeys);
+	preferredIdentityKeys.push(...fileKeys);
+
+	logger.trace(`Identity keys:`, preferredIdentityKeys.length ? preferredIdentityKeys.map(k => `${k.filename} ${k.parsedKey.type} SHA256:${k.fingerprint}`).join('\n') : 'None');
+
+	return preferredIdentityKeys;
+}

extensions/open-remote-ssh/src/ssh/sshConfig.ts

@@ -0,0 +1,129 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as os from 'os';
+import * as fs from 'fs';
+import * as path from 'path';
+import SSHConfig, { Directive, Line, Section } from '@jeanp413/ssh-config';
+import * as vscode from 'vscode';
+import { exists as fileExists, normalizeToSlash, untildify } from '../common/files';
+import { isWindows } from '../common/platform';
+import { glob } from 'glob';
+
+const systemSSHConfig = isWindows ? path.resolve(process.env.ALLUSERSPROFILE || 'C:\\ProgramData', 'ssh\\ssh_config') : '/etc/ssh/ssh_config';
+const defaultSSHConfigPath = path.resolve(os.homedir(), '.ssh/config');
+
+export function getSSHConfigPath() {
+	const sshConfigPath = vscode.workspace.getConfiguration('remote.SSH').get<string>('configFile');
+	return sshConfigPath ? untildify(sshConfigPath) : defaultSSHConfigPath;
+}
+
+function isDirective(line: Line): line is Directive {
+	return line.type === SSHConfig.DIRECTIVE;
+}
+
+function isHostSection(line: Line): line is Section {
+	return isDirective(line) && line.param === 'Host' && !!line.value && !!(line as Section).config;
+}
+
+function isIncludeDirective(line: Line): line is Section {
+	return isDirective(line) && line.param === 'Include' && !!line.value;
+}
+
+const SSH_CONFIG_PROPERTIES: Record<string, string> = {
+	'host': 'Host',
+	'hostname': 'HostName',
+	'user': 'User',
+	'port': 'Port',
+	'identityagent': 'IdentityAgent',
+	'identitiesonly': 'IdentitiesOnly',
+	'identityfile': 'IdentityFile',
+	'forwardagent': 'ForwardAgent',
+	'preferredauthentications': 'PreferredAuthentications',
+	'proxyjump': 'ProxyJump',
+	'proxycommand': 'ProxyCommand',
+	'include': 'Include',
+};
+
+function normalizeProp(prop: Directive) {
+	prop.param = SSH_CONFIG_PROPERTIES[prop.param.toLowerCase()] || prop.param;
+}
+
+function normalizeSSHConfig(config: SSHConfig) {
+	for (const line of config) {
+		if (isDirective(line)) {
+			normalizeProp(line);
+		}
+		if (isHostSection(line)) {
+			normalizeSSHConfig(line.config);
+		}
+	}
+	return config;
+}
+
+async function parseSSHConfigFromFile(filePath: string, userConfig: boolean) {
+	let content = '';
+	if (await fileExists(filePath)) {
+		content = (await fs.promises.readFile(filePath, 'utf8')).trim();
+	}
+	const config = normalizeSSHConfig(SSHConfig.parse(content));
+
+	const includedConfigs: [number, SSHConfig[]][] = [];
+	for (let i = 0; i < config.length; i++) {
+		const line = config[i];
+		if (isIncludeDirective(line)) {
+			const values = (line.value as string).split(',').map(s => s.trim());
+			const configs: SSHConfig[] = [];
+			for (const value of values) {
+				const includePaths = await glob(normalizeToSlash(untildify(value)), {
+					absolute: true,
+					cwd: normalizeToSlash(path.dirname(userConfig ? defaultSSHConfigPath : systemSSHConfig))
+				});
+				for (const p of includePaths) {
+					configs.push(await parseSSHConfigFromFile(p, userConfig));
+				}
+			}
+			includedConfigs.push([i, configs]);
+		}
+	}
+	for (const [idx, includeConfigs] of includedConfigs.reverse()) {
+		config.splice(idx, 1, ...includeConfigs.flat());
+	}
+
+	return config;
+}
+
+export default class SSHConfiguration {
+
+	static async loadFromFS(): Promise<SSHConfiguration> {
+		const config = await parseSSHConfigFromFile(getSSHConfigPath(), true);
+		config.push(...await parseSSHConfigFromFile(systemSSHConfig, false));
+
+		return new SSHConfiguration(config);
+	}
+
+	constructor(private sshConfig: SSHConfig) {
+	}
+
+	getAllConfiguredHosts(): string[] {
+		const hosts = new Set<string>();
+		for (const line of this.sshConfig) {
+			if (isHostSection(line)) {
+				const value = Array.isArray(line.value) ? line.value[0] : line.value;
+				const isPattern = /^!/.test(value) || /[?*]/.test(value);
+				if (!isPattern) {
+					hosts.add(value);
+				}
+			}
+		}
+
+		return [...hosts.keys()];
+	}
+
+	getHostConfiguration(host: string): Record<string, string> {
+		// Only a few directives return an array
+		// https://github.com/jeanp413/ssh-config/blob/8d187bb8f1d83a51ff2b1d127e6b6269d24092b5/src/ssh-config.ts#L9C1-L9C118
+		return this.sshConfig.compute(host) as Record<string, string>;
+	}
+}

extensions/open-remote-ssh/src/ssh/sshConnection.ts

@@ -0,0 +1,367 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { EventEmitter } from 'events';
+import * as net from 'net';
+import * as fs from 'fs';
+import * as stream from 'stream';
+import { Client, ClientChannel, ClientErrorExtensions, ExecOptions, ShellOptions, ConnectConfig } from 'ssh2';
+import { Server } from 'net';
+import { SocksConnectionInfo, createServer as createSocksServer } from 'simple-socks';
+
+export interface SSHConnectConfig extends ConnectConfig {
+	/** Optional Unique ID attached to ssh connection. */
+	uniqueId?: string;
+	/** Automatic retry to connect, after disconnect. Default true */
+	reconnect?: boolean;
+	/** Number of reconnect retry, after disconnect. Default 10 */
+	reconnectTries?: number;
+	/** Delay after which reconnect should be done. Default 5000ms */
+	reconnectDelay?: number;
+	/** Path to private key */
+	identity?: string | Buffer;
+}
+
+export interface SSHTunnelConfig {
+	/** Remote Address to connect */
+	remoteAddr?: string;
+	/** Local port to bind to. By default, it will bind to a random port, if not passed */
+	localPort?: number;
+	/** Remote Port to connect */
+	remotePort?: number;
+	/** Remote socket path to connect */
+	remoteSocketPath?: string;
+	socks?: boolean;
+	/**  Unique name */
+	name?: string;
+}
+
+const defaultOptions: Partial<SSHConnectConfig> = {
+	reconnect: false,
+	port: 22,
+	reconnectTries: 3,
+	reconnectDelay: 5000
+};
+
+const SSHConstants = {
+	'CHANNEL': {
+		SSH: 'ssh',
+		TUNNEL: 'tunnel',
+		X11: 'x11'
+	},
+	'STATUS': {
+		BEFORECONNECT: 'beforeconnect',
+		CONNECT: 'connect',
+		BEFOREDISCONNECT: 'beforedisconnect',
+		DISCONNECT: 'disconnect'
+	}
+};
+
+export default class SSHConnection extends EventEmitter {
+	public config: SSHConnectConfig;
+
+	private activeTunnels: { [index: string]: SSHTunnelConfig & { server: Server } } = {};
+	private __$connectPromise: Promise<SSHConnection> | null = null;
+	private __retries: number = 0;
+	private __err: Error & ClientErrorExtensions & { code?: string } | null = null;
+	private sshConnection: Client | null = null;
+
+	constructor(options: SSHConnectConfig) {
+		super();
+		this.config = Object.assign({}, defaultOptions, options);
+		this.config.uniqueId = this.config.uniqueId || `${this.config.username}@${this.config.host}`;
+	}
+
+	/**
+	  * Emit message on this channel
+	  */
+	override emit(channel: string, status: string, payload?: any): boolean {
+		super.emit(channel, status, this, payload);
+		return super.emit(`${channel}:${status}`, this, payload);
+	}
+
+	/**
+	 * Get shell socket
+	 */
+	shell(options: ShellOptions = {}): Promise<ClientChannel> {
+		return this.connect().then(() => {
+			return new Promise<ClientChannel>((resolve, reject) => {
+				this.sshConnection!.shell(options, (err, stream) => err ? reject(err) : resolve(stream));
+			});
+		});
+	}
+
+	/**
+	 * Exec a command
+	 */
+	exec(cmd: string, params?: Array<string>, options: ExecOptions = {}): Promise<{ stdout: string; stderr: string }> {
+		cmd += (Array.isArray(params) ? (' ' + params.join(' ')) : '');
+		return this.connect().then(() => {
+			return new Promise((resolve, reject) => {
+				this.sshConnection!.exec(cmd, options, (err, stream) => {
+					if (err) {
+						return reject(err);
+					}
+					let stdout = '';
+					let stderr = '';
+					stream.on('close', function () {
+						return resolve({ stdout, stderr });
+					}).on('data', function (data: Buffer | string) {
+						stdout += data.toString();
+					}).stderr.on('data', function (data: Buffer | string) {
+						stderr += data.toString();
+					});
+				});
+			});
+		});
+	}
+
+	/**
+	 * Exec a command
+	 */
+	execPartial(cmd: string, tester: (stdout: string, stderr: string) => boolean, params?: Array<string>, options: ExecOptions = {}): Promise<{ stdout: string; stderr: string }> {
+		cmd += (Array.isArray(params) ? (' ' + params.join(' ')) : '');
+		return this.connect().then(() => {
+			return new Promise((resolve, reject) => {
+				this.sshConnection!.exec(cmd, options, (err, stream) => {
+					if (err) {
+						return reject(err);
+					}
+					let stdout = '';
+					let stderr = '';
+					let resolved = false;
+					stream.on('close', function () {
+						if (!resolved) {
+							return resolve({ stdout, stderr });
+						}
+					}).on('data', function (data: Buffer | string) {
+						stdout += data.toString();
+
+						if (tester(stdout, stderr)) {
+							resolved = true;
+
+							return resolve({ stdout, stderr });
+						}
+					}).stderr.on('data', function (data: Buffer | string) {
+						stderr += data.toString();
+
+						if (tester(stdout, stderr)) {
+							resolved = true;
+
+							return resolve({ stdout, stderr });
+						}
+					});
+				});
+			});
+		});
+	}
+
+	/**
+	 * Forward out
+	 */
+	forwardOut(srcIP: string, srcPort: number, destIP: string, destPort: number): Promise<ClientChannel> {
+		return this.connect().then(() => {
+			return new Promise((resolve, reject) => {
+				this.sshConnection!.forwardOut(srcIP, srcPort, destIP, destPort, (err, stream) => {
+					if (err) {
+						return reject(err);
+					}
+					resolve(stream);
+				});
+			});
+		});
+	}
+
+	/**
+	 * Get a Socks Port
+	 */
+	getSocksPort(localPort: number): Promise<number> {
+		return this.addTunnel({ name: '__socksServer', socks: true, localPort: localPort }).then((tunnel) => {
+			return tunnel.localPort!;
+		});
+	}
+
+	/**
+	 * Close SSH Connection
+	 */
+	close(): Promise<void> {
+		this.emit(SSHConstants.CHANNEL.SSH, SSHConstants.STATUS.BEFOREDISCONNECT);
+		return this.closeTunnel().then(() => {
+			if (this.sshConnection) {
+				this.sshConnection.end();
+				this.emit(SSHConstants.CHANNEL.SSH, SSHConstants.STATUS.DISCONNECT);
+			}
+		});
+	}
+
+	/**
+	 * Connect the SSH Connection
+	 */
+	connect(c?: SSHConnectConfig): Promise<SSHConnection> {
+		this.config = Object.assign(this.config, c);
+		++this.__retries;
+
+		if (this.__$connectPromise) {
+			return this.__$connectPromise;
+		}
+
+		this.__$connectPromise = new Promise((resolve, reject) => {
+			this.emit(SSHConstants.CHANNEL.SSH, SSHConstants.STATUS.BEFORECONNECT);
+			if (!this.config || typeof this.config === 'function' || !(this.config.host || this.config.sock) || !this.config.username) {
+				reject(`Invalid SSH connection configuration host/username can't be empty`);
+				this.__$connectPromise = null;
+				return;
+			}
+
+			if (this.config.identity) {
+				if (fs.existsSync(this.config.identity)) {
+					this.config.privateKey = fs.readFileSync(this.config.identity);
+				}
+				delete this.config.identity;
+			}
+
+			//Start ssh server connection
+			this.sshConnection = new Client();
+			this.sshConnection.on('ready', (err: Error & ClientErrorExtensions) => {
+				if (err) {
+					this.emit(SSHConstants.CHANNEL.SSH, SSHConstants.STATUS.DISCONNECT, { err: err });
+					this.__$connectPromise = null;
+					return reject(err);
+				}
+				this.emit(SSHConstants.CHANNEL.SSH, SSHConstants.STATUS.CONNECT);
+				this.__retries = 0;
+				this.__err = null;
+				resolve(this);
+			}).on('error', (err) => {
+				this.emit(SSHConstants.CHANNEL.SSH, SSHConstants.STATUS.DISCONNECT, { err: err });
+				this.__err = err;
+			}).on('close', () => {
+				this.emit(SSHConstants.CHANNEL.SSH, SSHConstants.STATUS.DISCONNECT, { err: this.__err });
+				if (this.config.reconnect && this.__retries <= this.config.reconnectTries! && this.__err && this.__err.level !== 'client-authentication' && this.__err.code !== 'ENOTFOUND') {
+					setTimeout(() => {
+						this.__$connectPromise = null;
+						resolve(this.connect());
+					}, this.config.reconnectDelay);
+				} else {
+					reject(this.__err);
+				}
+			}).connect(this.config);
+		});
+		return this.__$connectPromise;
+	}
+
+	/**
+	 * Get existing tunnel by name
+	 */
+	getTunnel(name: string) {
+		return this.activeTunnels[name];
+	}
+
+	/**
+	 * Add new tunnel if not exist
+	 */
+	addTunnel(SSHTunnelConfig: SSHTunnelConfig): Promise<SSHTunnelConfig & { server: Server }> {
+		SSHTunnelConfig.name = SSHTunnelConfig.name || `${SSHTunnelConfig.remoteAddr}@${SSHTunnelConfig.remotePort || SSHTunnelConfig.remoteSocketPath}`;
+		this.emit(SSHConstants.CHANNEL.TUNNEL, SSHConstants.STATUS.BEFORECONNECT, { SSHTunnelConfig: SSHTunnelConfig });
+		if (this.getTunnel(SSHTunnelConfig.name)) {
+			this.emit(SSHConstants.CHANNEL.TUNNEL, SSHConstants.STATUS.CONNECT, { SSHTunnelConfig: SSHTunnelConfig });
+			return Promise.resolve(this.getTunnel(SSHTunnelConfig.name));
+		} else {
+			return new Promise((resolve, reject) => {
+				let server: net.Server;
+				if (SSHTunnelConfig.socks) {
+					server = createSocksServer({
+						connectionFilter: (destination: SocksConnectionInfo, origin: SocksConnectionInfo, callback: (err?: any, dest?: stream.Duplex) => void) => {
+							this.connect().then(() => {
+								this.sshConnection!.forwardOut(
+									origin.address,
+									origin.port,
+									destination.address,
+									destination.port,
+									(err, stream) => {
+										if (err) {
+											this.emit(SSHConstants.CHANNEL.TUNNEL, SSHConstants.STATUS.DISCONNECT, { SSHTunnelConfig: SSHTunnelConfig, err: err });
+											return callback(err);
+										}
+										return callback(null, stream);
+									});
+							});
+						}
+					}).on('proxyError', (err: any) => {
+						this.emit(SSHConstants.CHANNEL.TUNNEL, SSHConstants.STATUS.DISCONNECT, { SSHTunnelConfig: SSHTunnelConfig, err: err });
+					});
+				} else {
+					server = net.createServer()
+						.on('connection', (socket) => {
+							this.connect().then(() => {
+								if (SSHTunnelConfig.remotePort) {
+									this.sshConnection!.forwardOut('127.0.0.1', 0, SSHTunnelConfig.remoteAddr!, SSHTunnelConfig.remotePort!, (err, stream) => {
+										if (err) {
+											this.emit(SSHConstants.CHANNEL.TUNNEL, SSHConstants.STATUS.DISCONNECT, { SSHTunnelConfig: SSHTunnelConfig, err: err });
+											return;
+										}
+										stream.pipe(socket);
+										socket.pipe(stream);
+									});
+								} else {
+									this.sshConnection!.openssh_forwardOutStreamLocal(SSHTunnelConfig.remoteSocketPath!, (err, stream) => {
+										if (err) {
+											this.emit(SSHConstants.CHANNEL.TUNNEL, SSHConstants.STATUS.DISCONNECT, { SSHTunnelConfig: SSHTunnelConfig, err: err });
+											return;
+										}
+										stream.pipe(socket);
+										socket.pipe(stream);
+									});
+								}
+							});
+						});
+				}
+
+				SSHTunnelConfig.localPort = SSHTunnelConfig.localPort || 0;
+				server.on('listening', () => {
+					SSHTunnelConfig.localPort = (server.address() as net.AddressInfo).port;
+					this.activeTunnels[SSHTunnelConfig.name!] = Object.assign({}, { server }, SSHTunnelConfig);
+					this.emit(SSHConstants.CHANNEL.TUNNEL, SSHConstants.STATUS.CONNECT, { SSHTunnelConfig: SSHTunnelConfig });
+					resolve(this.activeTunnels[SSHTunnelConfig.name!]);
+				}).on('error', (err: any) => {
+					this.emit(SSHConstants.CHANNEL.TUNNEL, SSHConstants.STATUS.DISCONNECT, { SSHTunnelConfig: SSHTunnelConfig, err: err });
+					server.close();
+					reject(err);
+					delete this.activeTunnels[SSHTunnelConfig.name!];
+				}).listen(SSHTunnelConfig.localPort);
+			});
+		}
+	}
+
+	/**
+	 * Close the tunnel
+	 */
+	closeTunnel(name?: string): Promise<void> {
+		if (name && this.activeTunnels[name]) {
+			return new Promise((resolve) => {
+				const tunnel = this.activeTunnels[name];
+				this.emit(
+					SSHConstants.CHANNEL.TUNNEL,
+					SSHConstants.STATUS.BEFOREDISCONNECT,
+					{ SSHTunnelConfig: tunnel }
+				);
+				tunnel.server.close(() => {
+					this.emit(
+						SSHConstants.CHANNEL.TUNNEL,
+						SSHConstants.STATUS.DISCONNECT,
+						{ SSHTunnelConfig: this.activeTunnels[name] }
+					);
+					delete this.activeTunnels[name];
+					resolve();
+				});
+			});
+		} else if (!name) {
+			const tunnels = Object.keys(this.activeTunnels).map((key) => this.closeTunnel(key));
+			return Promise.all(tunnels).then(() => { });
+		}
+
+		return Promise.resolve();
+	}
+}

extensions/open-remote-ssh/src/ssh/sshDestination.ts

@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+export default class SSHDestination {
+	constructor(
+		public readonly hostname: string,
+		public readonly user?: string,
+		public readonly port?: number
+	) {
+	}
+
+	static parse(dest: string): SSHDestination {
+		let user: string | undefined;
+		const atPos = dest.lastIndexOf('@');
+		if (atPos !== -1) {
+			user = dest.substring(0, atPos);
+		}
+
+		let port: number | undefined;
+		const colonPos = dest.lastIndexOf(':');
+		if (colonPos !== -1) {
+			port = parseInt(dest.substring(colonPos + 1), 10);
+		}
+
+		const start = atPos !== -1 ? atPos + 1 : 0;
+		const end = colonPos !== -1 ? colonPos : dest.length;
+		const hostname = dest.substring(start, end);
+
+		return new SSHDestination(hostname, user, port);
+	}
+
+	toString(): string {
+		let result = this.hostname;
+		if (this.user) {
+			result = `${this.user}@` + result;
+		}
+		if (this.port) {
+			result = result + `:${this.port}`;
+		}
+		return result;
+	}
+
+	// vscode.uri implementation lowercases the authority, so when reopen or restore
+	// a remote session from the recently openend list the connection fails
+	static parseEncoded(dest: string): SSHDestination {
+		try {
+			const data = JSON.parse(Buffer.from(dest, 'hex').toString());
+			return new SSHDestination(data.hostName, data.user, data.port);
+		} catch {
+		}
+		return SSHDestination.parse(dest.replace(/\\x([0-9a-f]{2})/g, (_, charCode) => String.fromCharCode(parseInt(charCode, 16))));
+	}
+
+	toEncodedString(): string {
+		return this.toString().replace(/[A-Z]/g, (ch) => `\\x${ch.charCodeAt(0).toString(16).toLowerCase()}`);
+	}
+}

extensions/open-remote-ssh/tsconfig.json

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

extensions/void/LangaugeServerTest/createJsProgramGraph.ts

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

extensions/void/LangaugeServerTest/findFunctions.ts

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

package.json

@@ -1,14 +1,20 @@
 {
-  "name": "code-oss-dev",
+  "name": "void-dev",
+  "productName": "Void",
   "version": "1.94.0",
-  "distro": "ffcc24343ac46468a625666e5b9e673971dd1a1f",
+  "distro": "this is a commit number if we want to publish on npm",
+  "homepage": "https://voideditor.com",
   "author": {
-    "name": "Microsoft Corporation"
+    "name": "Glass Devtools, Inc.",
+    "email": "andrew@voideditor.com"
   },
   "license": "MIT",
   "main": "./out/main",
   "private": true,
   "scripts": {
+    "buildreact": "cd ./src/vs/workbench/contrib/void/browser/react/ && node build.js && cd ../../../../../../../",
+    "watchreact": "cd ./src/vs/workbench/contrib/void/browser/react/ && node build.js --watch && cd ../../../../../../../",
+    "watchreactd": "deemon npm run watchreact",
     "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",
@@ -20,7 +26,7 @@
     "preinstall": "node build/npm/preinstall.js",
     "postinstall": "node build/npm/postinstall.js",
     "compile": "node ./node_modules/gulp/bin/gulp.js compile",
-    "watch": "npm-run-all -lp watch-client watch-extensions",
+    "watch": "npm-run-all -lp watchreact watch-client watch-extensions",
     "watch-amd": "npm-run-all -lp watch-client-amd watch-extensions",
     "watchd": "deemon npm run watch",
     "watch-webd": "deemon npm run watch-web",
@@ -72,8 +78,12 @@
     "update-build-ts-version": "npm install typescript@next && tsc -p ./build/tsconfig.build.json"
   },
   "dependencies": {
+    "@anthropic-ai/sdk": "^0.37.0",
+    "@floating-ui/react": "^0.27.3",
+    "@google/generative-ai": "^0.21.0",
     "@microsoft/1ds-core-js": "^3.2.13",
     "@microsoft/1ds-post-js": "^3.2.13",
+    "@mistralai/mistralai": "^1.4.0",
     "@parcel/watcher": "2.1.0",
     "@rrweb/record": "^2.0.0-alpha.17",
     "@rrweb/types": "^2.0.0-alpha.17",
@@ -99,6 +109,9 @@
     "@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",
+    "cross-spawn": "^7.0.6",
+    "diff": "^7.0.0",
     "groq-sdk": "^0.9.0",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
@@ -110,24 +123,29 @@
     "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.85.4",
     "posthog-node": "^4.3.1",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-syntax-highlighter": "^15.6.1",
     "tas-client-umd": "0.2.0",
     "v8-inspect-profiler": "^0.1.1",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",
     "vscode-textmate": "9.1.0",
     "yauzl": "^3.0.0",
-    "yazl": "^2.4.3"
+    "yazl": "^2.4.3",
+    "zod": "^3.24.1"
   },
   "devDependencies": {
-    "@anthropic-ai/sdk": "^0.32.1",
-    "@google/generative-ai": "^0.21.0",
     "@playwright/test": "^1.46.1",
     "@swc/core": "1.3.62",
     "@types/cookie": "^0.3.3",
     "@types/debug": "^4.1.5",
     "@types/diff": "^6.0.0",
+    "@types/eslint": "^9.6.1",
     "@types/gulp-svgmin": "^1.2.1",
     "@types/http-proxy-agent": "^2.0.1",
     "@types/kerberos": "^1.1.2",
@@ -168,7 +186,6 @@
     "cssnano": "^6.0.3",
     "debounce": "^1.0.0",
     "deemon": "^1.8.0",
-    "diff": "^7.0.0",
     "electron": "30.5.1",
     "eslint": "8.36.0",
     "eslint-plugin-header": "3.1.1",
@@ -211,9 +228,9 @@
     "mocha": "^10.2.0",
     "mocha-junit-reporter": "^2.2.1",
     "mocha-multi-reporters": "^1.5.1",
+    "next": "^15.1.4",
+    "nodemon": "^3.1.9",
     "npm-run-all": "^4.1.5",
-    "ollama": "^0.5.9",
-    "openai": "^4.71.1",
     "opn": "^6.0.0",
     "original-fs": "^1.2.0",
     "os-browserify": "^0.3.0",
@@ -223,11 +240,8 @@
     "postcss-nesting": "^12.0.2",
     "pump": "^1.0.1",
     "rcedit": "^1.1.0",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-syntax-highlighter": "^15.6.1",
     "rimraf": "^2.7.1",
-    "scope-tailwind": "^1.0.1",
+    "scope-tailwind": "^1.0.5",
     "sinon": "^12.0.1",
     "sinon-test": "^3.1.3",
     "source-map": "0.6.1",

product.json

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

remote/package-lock.json

@@ -29,6 +29,7 @@
         "@xterm/headless": "^5.6.0-beta.64",
         "@xterm/xterm": "^5.6.0-beta.64",
         "cookie": "^0.4.0",
+        "debounced": "1.0.2",
         "http-proxy-agent": "^7.0.0",
         "https-proxy-agent": "^7.0.2",
         "jschardet": "3.1.3",
@@ -37,6 +38,7 @@
         "native-watchdog": "^1.4.1",
         "node-pty": "1.1.0-beta21",
         "tas-client-umd": "0.2.0",
+        "tslib": "^2.8.1",
         "vscode-oniguruma": "1.7.0",
         "vscode-regexpp": "^3.1.0",
         "vscode-textmate": "9.1.0",
@@ -396,6 +398,12 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/debounced": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/debounced/-/debounced-1.0.2.tgz",
+      "integrity": "sha512-6GPv+l/OOtdb1DKNY70k5ubuJhVjtBjUnujC5vQAHHrMuvBpDXsTc91xEMTdeA3/v4swYHamtdB9XIN7DcKxpw==",
+      "license": "MIT"
+    },
     "node_modules/debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -1028,6 +1036,11 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
+    },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",

remote/package.json

@@ -26,12 +26,14 @@
     "cookie": "^0.4.0",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.2",
+    "debounced": "1.0.2",
     "jschardet": "3.1.3",
     "kerberos": "2.1.1",
     "minimist": "^1.2.6",
     "native-watchdog": "^1.4.1",
     "node-pty": "1.1.0-beta21",
     "tas-client-umd": "0.2.0",
+    "tslib": "^2.8.1",
     "vscode-oniguruma": "1.7.0",
     "vscode-regexpp": "^3.1.0",
     "vscode-textmate": "9.1.0",

resources/win32/VisualElementsManifest.xml

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

src/main.js

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

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

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

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

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

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

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

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

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

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

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

src/vs/platform/encryption/electron-main/encryptionMainService.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { safeStorage as safeStorageElectron, app } from 'electron';
-import { isMacintosh, isWindows } from '../../../base/common/platform.js';
+import { isMacintosh, isWindows, isLinux } from '../../../base/common/platform.js';
 import { KnownStorageProvider, IEncryptionMainService, PasswordStoreCLIOption } from '../common/encryptionService.js';
 import { ILogService } from '../../log/common/log.js';
 
@@ -23,6 +23,11 @@ export class EncryptionMainService implements IEncryptionMainService {
 	constructor(
 		@ILogService private readonly logService: ILogService
 	) {
+		if (isLinux && !app.commandLine.getSwitchValue('password-store')) {
+			this.logService.trace('[EncryptionMainService] No password-store switch, defaulting to basic...');
+			app.commandLine.appendSwitch('password-store', PasswordStoreCLIOption.basic);
+		}
+
 		// if this commandLine switch is set, the user has opted in to using basic text encryption
 		if (app.commandLine.getSwitchValue('password-store') === PasswordStoreCLIOption.basic) {
 			this.logService.trace('[EncryptionMainService] setting usePlainTextEncryption to true...');

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,59 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPLv3 License.
- *--------------------------------------------------------------------------------------------*/
-
-import { VoidConfig } from './configTypes.js'
-
-
-// ---------- type definitions ----------
-
-export type OnText = (p: { newText: string, fullText: string }) => void
-
-export type OnFinalMessage = (p: { fullText: string }) => void
-
-export type OnError = (p: { error: Error | string }) => void
-
-export type AbortRef = { current: (() => void) | null }
-
-export type LLMMessage = {
-	role: 'system' | 'user' | 'assistant';
-	content: string;
-}
-
-export type LLMMessageServiceParams = {
-	onText: OnText;
-	onFinalMessage: OnFinalMessage;
-	onError: OnError;
-
-	messages: LLMMessage[];
-	voidConfig: VoidConfig | null;
-
-	logging: {
-		loggingName: string,
-	};
-}
-
-export type SendLLMMMessageParams = {
-	onText: OnText;
-	onFinalMessage: OnFinalMessage;
-	onError: OnError;
-
-	messages: LLMMessage[];
-	voidConfig: VoidConfig | null;
-
-	logging: {
-		loggingName: string,
-	};
-	abortRef: AbortRef;
-}
-
-// can't send functions across a proxy, use listeners instead
-export const listenerNames = ['onText', 'onFinalMessage', 'onError'] as const
-export type ProxyLLMMessageParams = Omit<LLMMessageServiceParams, typeof listenerNames[number]> & { requestId: string }
-
-export type ProxyOnTextPayload = Parameters<OnText>[0] & { requestId: string }
-export type ProxyOnFinalMessagePayload = Parameters<OnFinalMessage>[0] & { requestId: string }
-export type ProxyOnErrorPayload = Parameters<OnError>[0] & { requestId: string }
-
-export type ProxyLLMMessageAbortParams = { requestId: string }

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

@@ -1,10 +0,0 @@
-import { createDecorator } from '../../instantiation/common/instantiation.js';
-
-export interface IMetricsService {
-	readonly _serviceBrand: undefined;
-	capture(event: string, params: Record<string, any>): void;
-}
-
-export const IMetricsService = createDecorator<IMetricsService>('metricsService');
-
-

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

@@ -1,57 +0,0 @@
-import Anthropic from '@anthropic-ai/sdk';
-import { parseMaxTokensStr, SendLLMMessageFnTypeInternal } from './util.js';
-
-// Anthropic
-type LLMMessageAnthropic = {
-	role: 'user' | 'assistant';
-	content: string;
-}
-export const sendAnthropicMsg: SendLLMMessageFnTypeInternal = ({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter }) => {
-
-	const thisConfig = voidConfig.anthropic
-
-	const anthropic = new Anthropic({ apiKey: thisConfig.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: thisConfig.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({ fullText: 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({ error: 'Invalid API key.' })
-		}
-		else {
-			onError({ error })
-		}
-	})
-
-	// TODO need to test this to make sure it works, it might throw an error
-	_setAborter(() => stream.controller.abort())
-
-};

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

@@ -1,48 +0,0 @@
-import { Content, GoogleGenerativeAI, GoogleGenerativeAIFetchError } from '@google/generative-ai';
-import { SendLLMMessageFnTypeInternal } from './util';
-
-// Gemini
-export const sendGeminiMsg: SendLLMMessageFnTypeInternal = async ({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter }) => {
-
-	let fullText = ''
-
-	const thisConfig = voidConfig.gemini
-
-	const genAI = new GoogleGenerativeAI(thisConfig.apikey);
-	const model = genAI.getGenerativeModel({ model: thisConfig.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 && error.status === 400) {
-				onError({ error: 'Invalid API key.' });
-			}
-			else {
-				onError({ error });
-			}
-		})
-}

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

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

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

@@ -1,40 +0,0 @@
-import Groq from 'groq-sdk';
-import { SendLLMMessageFnTypeInternal } from './util';
-import { parseMaxTokensStr } from './util.js';
-
-// Groq
-export const sendGroqMsg: SendLLMMessageFnTypeInternal = async ({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter }) => {
-	let fullText = '';
-
-	const groq = new Groq({
-		apiKey: voidConfig.groq.apikey,
-		dangerouslyAllowBrowser: true
-	});
-
-	await groq.chat.completions
-		.create({
-			messages: messages,
-			model: voidConfig.groq.model,
-			stream: true,
-			temperature: 0.7,
-			max_tokens: parseMaxTokensStr(voidConfig.default.maxTokens),
-		})
-		.then(async response => {
-			_setAborter(() => response.controller.abort())
-			// when receive text
-			for await (const chunk of response) {
-				const newText = chunk.choices[0]?.delta?.content || '';
-				if (newText) {
-					fullText += newText;
-					onText({ newText, fullText });
-				}
-			}
-
-			onFinalMessage({ fullText });
-		})
-		.catch(error => {
-			onError({ error });
-		})
-
-
-};

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

@@ -1,47 +0,0 @@
-import { Ollama, ErrorResponse } from 'ollama';
-import { SendLLMMessageFnTypeInternal } from './util';
-import { parseMaxTokensStr } from './util.js';
-
-// Ollama
-export const sendOllamaMsg: SendLLMMessageFnTypeInternal = ({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter }) => {
-
-	const thisConfig = voidConfig.ollama
-
-	let fullText = ''
-
-	const ollama = new Ollama({ host: thisConfig.endpoint })
-
-	ollama.chat({
-		model: thisConfig.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) => {
-			if (typeof error === 'object') {
-				const e = error.error as ErrorResponse['error']
-				if (e) {
-					const name = error.name ?? 'Error'
-					onError({ error: `${name}: ${e}` })
-					return;
-				}
-			}
-			onError({ error })
-		})
-
-};
-
-
-

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

@@ -1,64 +0,0 @@
-import OpenAI from 'openai';
-import { SendLLMMessageFnTypeInternal } from './util';
-import { parseMaxTokensStr } from './util.js';
-
-
-// OpenAI, OpenRouter, OpenAICompatible
-export 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') {
-		const thisConfig = voidConfig.openAI
-		openai = new OpenAI({ apiKey: thisConfig.apikey, dangerouslyAllowBrowser: true });
-		options = { model: thisConfig.model, messages: messages, stream: true, max_completion_tokens: maxTokens }
-	}
-	else if (voidConfig.default.whichApi === 'openRouter') {
-		const thisConfig = voidConfig.openRouter
-		openai = new OpenAI({
-			baseURL: 'https://openrouter.ai/api/v1', apiKey: thisConfig.apikey, dangerouslyAllowBrowser: true,
-			defaultHeaders: {
-				'HTTP-Referer': 'https://voideditor.com', // Optional, for including your app on openrouter.ai rankings.
-				'X-Title': 'Void Editor', // Optional. Shows in rankings on openrouter.ai.
-			},
-		});
-		options = { model: thisConfig.model, messages: messages, stream: true, max_completion_tokens: maxTokens }
-	}
-	else if (voidConfig.default.whichApi === 'openAICompatible') {
-		const thisConfig = voidConfig.openAICompatible
-		openai = new OpenAI({ baseURL: thisConfig.endpoint, apiKey: thisConfig.apikey, dangerouslyAllowBrowser: true })
-		options = { model: thisConfig.model, messages: messages, stream: true, max_completion_tokens: maxTokens }
-	}
-	else {
-		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 && error.status === 401) {
-				onError({ error: 'Invalid API key.' });
-			}
-			else {
-				onError({ error });
-			}
-		})
-
-};

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

@@ -1,109 +0,0 @@
-import { SendLLMMMessageParams, OnText, OnFinalMessage, OnError } from '../../common/llmMessageTypes.js';
-import { IMetricsService } from '../../common/metricsService.js';
-
-import { sendAnthropicMsg } from './anthropic.js';
-import { sendGeminiMsg } from './gemini.js';
-import { sendGreptileMsg } from './greptile.js';
-import { sendGroqMsg } from './groq.js';
-import { sendOllamaMsg } from './ollama.js';
-import { sendOpenAIMsg } from './openai.js';
-
-
-export const sendLLMMessage = (
-	{
-		messages, onText: onText_, onFinalMessage: onFinalMessage_, onError: onError_,
-		abortRef: abortRef_, voidConfig, logging: { loggingName },
-	}: SendLLMMMessageParams,
-
-	metricsService: IMetricsService
-) => {
-	if (!voidConfig) return;
-
-	// trim message content (Anthropic and other providers give an error if there is trailing whitespace)
-	messages = messages.map(m => ({ ...m, content: m.content.trim() }))
-
-	// only captures number of messages and message "shape", no actual code, instructions, prompts, etc
-	const captureChatEvent = (eventId: string, extras?: object) => {
-		metricsService.capture(eventId, {
-			whichApi: voidConfig.default['whichApi'],
-			numMessages: messages?.length,
-			messagesShape: messages?.map(msg => ({ role: msg.role, length: msg.content.length })),
-			version: '2024-11-14',
-			...extras,
-		})
-	}
-	const submit_time = new Date()
-
-	let _fullTextSoFar = ''
-	let _aborter: (() => void) | null = null
-	let _setAborter = (fn: () => void) => { _aborter = fn }
-	let _didAbort = false
-
-	const onText: OnText = ({ newText, fullText }) => {
-		if (_didAbort) return
-		onText_({ newText, fullText })
-		_fullTextSoFar = fullText
-	}
-
-	const onFinalMessage: OnFinalMessage = ({ fullText }) => {
-		if (_didAbort) return
-		captureChatEvent(`${loggingName} - Received Full Message`, { messageLength: fullText.length, duration: new Date().getMilliseconds() - submit_time.getMilliseconds() })
-		onFinalMessage_({ fullText })
-	}
-
-	const onError: OnError = ({ error }) => {
-		if (_didAbort) return
-		console.error('sendLLMMessage onError:', error)
-		captureChatEvent(`${loggingName} - Error`, { error })
-		onError_({ error })
-	}
-
-	const onAbort = () => {
-		captureChatEvent(`${loggingName} - Abort`, { messageLengthSoFar: _fullTextSoFar.length })
-		try { _aborter?.() } // aborter sometimes automatically throws an error
-		catch (e) { }
-		_didAbort = true
-	}
-	abortRef_.current = onAbort
-
-	captureChatEvent(`${loggingName} - Sending Message`, { messageLength: messages[messages.length - 1]?.content.length })
-
-	try {
-		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;
-			case 'groq':
-				sendGroqMsg({ messages, onText, onFinalMessage, onError, voidConfig, _setAborter, });
-				break;
-			default:
-				onError({ error: `Error: whichApi was "${voidConfig.default.whichApi}", which is not recognized!` })
-				break;
-		}
-	}
-
-	catch (error) {
-		if (error instanceof Error) { onError({ error }) }
-		else { onError({ error: `Unexpected Error in sendLLMMessage: ${error}` }); }
-		// ; (_aborter as any)?.()
-		// _didAbort = true
-	}
-
-
-
-}
-

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

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

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

@@ -1,95 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPLv3 License.
- *--------------------------------------------------------------------------------------------*/
-
-// registered in app.ts
-// code convention is to make a service responsible for this stuff, and not a channel, but having fewer files is simpler...
-
-import { IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
-import { Emitter, Event } from '../../../base/common/event.js';
-import { listenerNames, ProxyOnTextPayload, ProxyOnErrorPayload, ProxyOnFinalMessagePayload, ProxyLLMMessageParams, AbortRef, SendLLMMMessageParams, ProxyLLMMessageAbortParams } from '../common/llmMessageTypes.js';
-import { sendLLMMessage } from './llmMessage/sendLLMMessage.js'
-import { IMetricsService } from '../common/metricsService.js';
-
-// NODE IMPLEMENTATION - calls actual sendLLMMessage() and returns listeners to it
-
-export class LLMMessageChannel implements IServerChannel {
-	private readonly _onText = new Emitter<ProxyOnTextPayload>();
-	readonly onText = this._onText.event;
-
-	private readonly _onFinalMessage = new Emitter<ProxyOnFinalMessagePayload>();
-	readonly onFinalMessage = this._onFinalMessage.event;
-
-	private readonly _onError = new Emitter<ProxyOnErrorPayload>();
-	readonly onError = this._onError.event;
-
-
-	private readonly _abortRefOfRequestId: Record<string, AbortRef> = {}
-
-
-	constructor(
-		private readonly metricsService: IMetricsService
-	) { }
-
-	// browser uses this to listen for changes
-	listen(_: unknown, event: typeof listenerNames[number]): Event<any> {
-		if (event === 'onText') {
-			return this.onText;
-		}
-		else if (event === 'onFinalMessage') {
-			return this.onFinalMessage;
-		}
-		else if (event === 'onError') {
-			return this.onError;
-		}
-		else {
-			throw new Error(`Event not found: ${event}`);
-		}
-	}
-
-	// browser uses this to call
-	async call(_: unknown, command: string, params: any): Promise<any> {
-
-		try {
-			if (command === 'sendLLMMessage') {
-				this._callSendLLMMessage(params)
-			}
-			else if (command === 'abort') {
-				this._callAbort(params)
-			}
-			else {
-				throw new Error(`Void sendLLM: command "${command}" not recognized.`)
-			}
-		}
-		catch (e) {
-			console.log('llmMessageChannel: Call Error:', e)
-		}
-	}
-
-	// the only place sendLLMMessage is actually called
-	private _callSendLLMMessage(params: ProxyLLMMessageParams) {
-		const { requestId } = params;
-
-		if (!(requestId in this._abortRefOfRequestId))
-			this._abortRefOfRequestId[requestId] = { current: null }
-
-		const mainThreadParams: SendLLMMMessageParams = {
-			...params,
-			onText: ({ newText, fullText }) => { this._onText.fire({ requestId, newText, fullText }); },
-			onFinalMessage: ({ fullText }) => { this._onFinalMessage.fire({ requestId, fullText }); },
-			onError: ({ error }) => { this._onError.fire({ requestId, error }); },
-			abortRef: this._abortRefOfRequestId[requestId],
-		}
-		sendLLMMessage(mainThreadParams, this.metricsService);
-	}
-
-	private _callAbort(params: ProxyLLMMessageAbortParams) {
-		const { requestId } = params;
-		if (!(requestId in this._abortRefOfRequestId)) return
-		this._abortRefOfRequestId[requestId].current?.()
-		delete this._abortRefOfRequestId[requestId]
-	}
-
-
-}

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

@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPLv3 License.
- *--------------------------------------------------------------------------------------------*/
-
-import { Disposable } from '../../../base/common/lifecycle.js';
-import { ITelemetryService } from '../../telemetry/common/telemetry.js';
-
-import { IMetricsService } from '../common/metricsService.js';
-import { PostHog } from 'posthog-node'
-
-
-// posthog.init('phc_UanIdujHiLp55BkUTjB1AuBXcasVkdqRwgnwRlWESH2', { api_host: 'https://us.i.posthog.com', })
-
-// const buildEnv = 'development';
-// const buildNumber = '1.0.0';
-// const isMac = process.platform === 'darwin';
-// // TODO use commandKey
-// const commandKey = isMac ? '⌘' : 'Ctrl';
-// const systemInfo = {
-// 	buildEnv,
-// 	buildNumber,
-// 	isMac,
-// }
-
-export class MetricsMainService extends Disposable implements IMetricsService {
-	_serviceBrand: undefined;
-
-	readonly _distinctId: string
-	readonly client: PostHog
-
-	constructor(
-		@ITelemetryService private readonly _telemetryService: ITelemetryService
-	) {
-		super()
-		this.client = new PostHog('phc_UanIdujHiLp55BkUTjB1AuBXcasVkdqRwgnwRlWESH2', { host: 'https://us.i.posthog.com', })
-
-		const { devDeviceId, firstSessionDate, machineId } = this._telemetryService
-		this._distinctId = devDeviceId
-		this.client.identify({ distinctId: devDeviceId, properties: { firstSessionDate, machineId } })
-
-		console.log('Void posthog metrics info:', JSON.stringify({ devDeviceId, firstSessionDate, machineId }))
-	}
-
-	capture: IMetricsService['capture'] = (event, params) => {
-		console.log('Capturing', { event, params })
-		console.log('full capture:', { distinctId: this._distinctId, event, properties: params })
-		this.client.capture({ distinctId: this._distinctId, event, properties: params })
-	}
-}
-
-

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

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

src/vs/workbench/api/browser/mainThreadInlineDiff.ts

@@ -14,6 +14,8 @@ import { WorkspaceEdit } from '../../../editor/common/languages.js';
 // import { IHistoryService } from '../../services/history/common/history.js';
 
 
+// VOID: THIS FILE IS OUTDATED!!!!!! No longer used anywhere.
+
 @extHostNamedCustomer(MainContext.MainThreadInlineDiff)
 export class MainThreadInlineDiff extends Disposable implements MainThreadInlineDiffShape {
 

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

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