header update

update
apache 2.0
2025-01-09 18:51:40 -08:00 · 2025-01-09 18:49:05 -08:00 · 2025-01-09 18:48:52 -08:00 · 2025-01-09 18:48:15 -08:00 · 2025-01-05 18:00:40 -08:00 · 2025-01-04 23:55:52 -08:00
70 changed files with 733 additions and 764 deletions
@@ -8,7 +8,7 @@ There are a few ways to contribute:
 - 💡 Make suggestions in our [Discord](https://discord.gg/RSNjgaugJs).
 - ⭐️ If you want to build your AI tool into Void, feel free to get in touch! It's very easy to extend Void, and the UX you create will be much more natural than a VSCode Extension.

-Most of Void's code lives in `src/vs/workbench/contrib/void/browser/` and `src/vs/platform/void/`.
+Void's code lives in `src/vs/workbench/contrib/void/browser/` and `src/vs/platform/void/`.



@@ -55,7 +55,7 @@ To build Void, open `void/` inside VSCode. Then open your terminal and run:
 	 - Run `./scripts/code.sh` (Mac/Linux).
   - Run `./scripts/code.bat` (Windows).
   - This command should open up the built IDE. You can always press <kbd>Ctrl+R</kbd> (<kbd>Cmd+R</kbd>)  inside the new window to see changes without re-building, or press or <kbd>Ctrl+Shift+P</kbd> in the new window and run "Reload Window".
-	- If you would like to reset Void back to its default settings, you can run `./scripts/code.sh --user-data-dir ./.tmp/user-data --extensions-dir ./.tmp/extensions` (mac). This will save all data and extensions to the `.tmp` folder. You can delete this folder to reset your settings.
+	- If you are actively developing Void, we strongly recommend adding the flags `--user-data-dir ./.tmp/user-data --extensions-dir ./.tmp/extensions` to the above run command (just append them at the end of the string). This will save all data and extensions to the `.tmp` folder. You can delete this folder to reset any IDE changes you made when testing.

 #### Building Void from Terminal

@@ -83,7 +83,8 @@ Alternatively, if you want to build Void from the terminal, instead of pressing

 ## Bundling

-We don't usually recommend bundling. Instead, you should probably just build. If you're sure you want to bundle Void into an executable app, make sure you've built first, then run one of the following commands. This will create a folder named `VSCode-darwin-arm64` (or similar) in the repo's parent's directory. Be patient - compiling can take ~25 minutes.
+We don't usually recommend bundling. Instead, you should probably just build. If you're sure you want to bundle Void into an executable app, make sure you've built first, then run one of the following commands. This will create a folder named `VSCode-darwin-arm64` or similar outside of the void/ repo (see below). Be patient - compiling can take ~25 minutes.
+

 ### Mac
 - `npm run gulp vscode-darwin-arm64` - most common (Apple Silicon)
@@ -99,6 +100,16 @@ We don't usually recommend bundling. Instead, you should probably just build. If
 - `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
+```
+
+

 # Guidelines

@@ -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.
@@ -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.
@@ -13,4 +13,4 @@ To build and run Void, follow the steps in [`CONTRIBUTING.md`](https://github.co
 Void is a fork of the of [vscode](https://github.com/microsoft/vscode) repository. For some useful links on VSCode, see [`VOID_USEFUL_LINKS.md`](https://github.com/voideditor/void/blob/main/VOID_USEFUL_LINKS.md).

 ## Support
-Feel free to reach out in our [Discord](https://discord.gg/RSNjgaugJs) or contact us via email.
+Feel free to reach out in our [Discord](https://discord.gg/RSNjgaugJs) server or contact us via email.
@@ -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 -->
@@ -32,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).


@@ -1,12 +1,12 @@
 {
  "name": "void-dev",
-  "version": "1.0.0",
+  "version": "1.94.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "void-dev",
-      "version": "1.0.0",
+      "version": "1.94.0",
      "hasInstallScript": true,
      "license": "MIT",
      "dependencies": {
@@ -3,8 +3,10 @@
  "productName": "Void",
  "version": "1.94.0",
  "distro": "this is a commit number if we want to publish on npm",
+  "homepage": "https://voideditor.com",
  "author": {
-    "name": "Glass Devtools, Inc."
+    "name": "Glass Devtools, Inc.",
+    "email": "andrew@voideditor.com"
  },
  "license": "MIT",
  "main": "./out/main",
@@ -15,7 +15,6 @@ import { IRequestService } from '../../request/common/request.js';
 import { AvailableForDownload, DisablementReason, IUpdateService, State, StateType, UpdateType } from '../common/update.js';

 export function createUpdateURL(platform: string, quality: string, productService: IProductService): string {
-	// return `https://voideditor.dev/api/update/${platform}/stable`;
 	return `${productService.updateUrl}/api/update/${platform}/${quality}/${productService.commit}`;
 }

@@ -71,11 +70,9 @@ 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));
@@ -89,19 +86,16 @@ export abstract class AbstractUpdateService implements IUpdateService {
 			return;
 		}

-		// Void - for now, always update
-
 		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;
 		}

-		// const quality = 'stable'
-		this.url = this.doBuildUpdateFeedUrl(quality);
+		this.url = this.buildUpdateFeedUrl(quality);
 		if (!this.url) {
 			this.setState(State.Disabled(DisablementReason.InvalidConfiguration));
 			this.logService.info('update#ctor - updates are disabled as the update URL is badly formed');
@@ -137,10 +131,13 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		return updateMode === 'none' ? undefined : this.productService.quality;
 	}

-	private async scheduleCheckForUpdates(delay = 60 * 60 * 1000): Promise<void> {
-		await timeout(delay);
-		await this.checkForUpdates(false);
-		return await this.scheduleCheckForUpdates(60 * 60 * 1000);
+	private scheduleCheckForUpdates(delay = 60 * 60 * 1000): Promise<void> {
+		return timeout(delay)
+			.then(() => this.checkForUpdates(false))
+			.then(() => {
+				// Check again after 1 hour
+				return this.scheduleCheckForUpdates(60 * 60 * 1000);
+			});
 	}

 	async checkForUpdates(explicit: boolean): Promise<void> {
@@ -163,7 +160,6 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		await this.doDownloadUpdate(this.state);
 	}

-	// override implemented by windows and linux
 	protected async doDownloadUpdate(state: AvailableForDownload): Promise<void> {
 		// noop
 	}
@@ -178,7 +174,6 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		await this.doApplyUpdate();
 	}

-	// windows overrides this
 	protected async doApplyUpdate(): Promise<void> {
 		// noop
 	}
@@ -241,6 +236,6 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		// noop
 	}

-	protected abstract doBuildUpdateFeedUrl(quality: string): string | undefined;
+	protected abstract buildUpdateFeedUrl(quality: string): string | undefined;
 	protected abstract doCheckForUpdates(context: any): void;
 }
@@ -73,7 +73,7 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
 		this.setState(State.Idle(UpdateType.Archive, message));
 	}

-	protected doBuildUpdateFeedUrl(quality: string): string | undefined {
+	protected buildUpdateFeedUrl(quality: string): string | undefined {
 		let assetID: string;
 		if (!this.productService.darwinUniversalAssetId) {
 			assetID = process.arch === 'x64' ? 'darwin' : 'darwin-arm64';
@@ -30,7 +30,7 @@ export class LinuxUpdateService extends AbstractUpdateService {
 		super(lifecycleMainService, configurationService, environmentMainService, requestService, logService, productService);
 	}

-	protected doBuildUpdateFeedUrl(quality: string): string {
+	protected buildUpdateFeedUrl(quality: string): string {
 		return createUpdateURL(`linux-${process.arch}`, quality, this.productService);
 	}

@@ -99,7 +99,7 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 		await super.initialize();
 	}

-	protected doBuildUpdateFeedUrl(quality: string): string | undefined {
+	protected buildUpdateFeedUrl(quality: string): string | undefined {
 		let platform = `win32-${process.arch}`;

 		if (getUpdateType() === UpdateType.Archive) {
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 // ---------- common ----------

@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { EventLLMMessageOnTextParams, EventLLMMessageOnErrorParams, EventLLMMessageOnFinalMessageParams, ServiceSendLLMMessageParams, MainLLMMessageParams, MainLLMMessageAbortParams, ServiceModelListParams, EventModelListOnSuccessParams, EventModelListOnErrorParams, MainModelListParams, OllamaModelResponse, OpenaiCompatibleModelResponse, } from './llmMessageTypes.js';
 import { IChannel } from '../../../base/parts/ipc/common/ipc.js';
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { IRange } from '../../../editor/common/core/range'
 import { ProviderName, SettingsOfProvider } from './voidSettingsTypes.js'
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { createDecorator } from '../../instantiation/common/instantiation.js';
 import { ProxyChannel } from '../../../base/parts/ipc/common/ipc.js';
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { createDecorator } from '../../instantiation/common/instantiation.js';
 import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { Emitter, Event } from '../../../base/common/event.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
@@ -1,8 +1,8 @@

-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/



@@ -177,7 +177,6 @@ export type SettingName = keyof SettingsForProvider<ProviderName>

 type DisplayInfoForProviderName = {
 	title: string,
-	desc?: string,
 }

 export const displayInfoOfProviderName = (providerName: ProviderName): DisplayInfoForProviderName => {
@@ -204,7 +203,7 @@ export const displayInfoOfProviderName = (providerName: ProviderName): DisplayIn
 	}
 	else if (providerName === 'openAICompatible') {
 		return {
-			title: 'OpenAI-Compatible',
+			title: 'Other',
 		}
 	}
 	else if (providerName === 'gemini') {
@@ -257,7 +256,7 @@ export const displayInfoOfSettingName = (providerName: ProviderName, settingName
 				: providerName === 'openAICompatible' ? 'https://my-website.com/v1'
 					: '(never)',

-			subTextMd: providerName === 'ollama' ? 'If you would like to change this endpoint, please read more about [Endpoints here](https://github.com/ollama/ollama/blob/main/docs/faq.md#how-can-i-expose-ollama-on-my-network).' :
+			subTextMd: providerName === 'ollama' ? 'Read about advanced [Endpoints here](https://github.com/ollama/ollama/blob/main/docs/faq.md#how-can-i-expose-ollama-on-my-network).' :
 				undefined,
 		}
 	}
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import Anthropic from '@anthropic-ai/sdk';
 import { _InternalSendLLMMessageFnType } from '../../common/llmMessageTypes.js';
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { Content, GoogleGenerativeAI, GoogleGenerativeAIFetchError } from '@google/generative-ai';
 import { _InternalSendLLMMessageFnType } from '../../common/llmMessageTypes.js';
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 // // Greptile
 // // https://docs.greptile.com/api-reference/query
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import Groq from 'groq-sdk';
 import { _InternalSendLLMMessageFnType } from '../../common/llmMessageTypes.js';
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { Ollama } from 'ollama';
 import { _InternalModelListFnType, _InternalSendLLMMessageFnType, OllamaModelResponse } from '../../common/llmMessageTypes.js';
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import OpenAI from 'openai';
 import { _InternalModelListFnType, _InternalSendLLMMessageFnType } from '../../common/llmMessageTypes.js';
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { LLMMMessageParams, OnText, OnFinalMessage, OnError } from '../../common/llmMessageTypes.js';
 import { IMetricsService } from '../../common/metricsService.js';
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 // registered in app.ts
 // code convention is to make a service responsible for this stuff, and not a channel, but having fewer files is simpler...
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { Disposable } from '../../../base/common/lifecycle.js';
 import { ITelemetryService } from '../../telemetry/common/telemetry.js';
@@ -289,7 +289,6 @@ export interface IFileTemplateData {
 	readonly templateDisposables: DisposableStore;
 	readonly elementDisposables: DisposableStore;
 	readonly label: IResourceLabel;
-	readonly voidLabels: IResourceLabel;
 	readonly container: HTMLElement;
 	readonly contribs: IExplorerFileContribution[];
 	currentContext?: ExplorerItem;
@@ -348,24 +347,15 @@ export class FilesRenderer implements ICompressibleTreeRenderer<ExplorerItem, Fu

 	renderTemplate(container: HTMLElement): IFileTemplateData {
 		const templateDisposables = new DisposableStore();
-
-		// Create void buttons container
-		const voidButtonsContainer = DOM.append(container, DOM.$('div'));
-		voidButtonsContainer.style.position = 'absolute'
-		voidButtonsContainer.style.top = '0'
-		voidButtonsContainer.style.right = '0'
-		// const voidButtons = DOM.append(voidButtonsContainer, DOM.$('span'));
-		// voidButtons.textContent = 'voidbuttons'
-		// voidButtons.addEventListener('click', () => {
-		// 	console.log('ON CLICK', templateData.currentContext?.children)
-		// })
-		const voidLabels = this.labels.create(voidButtonsContainer, { supportHighlights: false, supportIcons: false, });
-		voidLabels.element.textContent = 'hi333'
-
 		const label = templateDisposables.add(this.labels.create(container, { supportHighlights: true }));
 		templateDisposables.add(label.onDidRender(() => {
-			try { if (templateData.currentContext) this.updateWidth(templateData.currentContext); }
-			catch (e) { /* noop since the element might no longer be in the tree, no update of width necessary*/ }
+			try {
+				if (templateData.currentContext) {
+					this.updateWidth(templateData.currentContext);
+				}
+			} catch (e) {
+				// noop since the element might no longer be in the tree, no update of width necessary
+			}
 		}));

 		const contribs = explorerFileContribRegistry.create(this.instantiationService, container, templateDisposables);
@@ -375,12 +365,10 @@ export class FilesRenderer implements ICompressibleTreeRenderer<ExplorerItem, Fu
 			contr.setResource(templateData.currentContext?.resource);
 		}));

-		const templateData: IFileTemplateData = { templateDisposables, elementDisposables: templateDisposables.add(new DisposableStore()), label, voidLabels, container, contribs };
+		const templateData: IFileTemplateData = { templateDisposables, elementDisposables: templateDisposables.add(new DisposableStore()), label, container, contribs };
 		return templateData;
 	}

-
-	// Void cares about this function, this is where elements in the tree are rendered
 	renderElement(node: ITreeNode<ExplorerItem, FuzzyScore>, index: number, templateData: IFileTemplateData): void {
 		const stat = node.element;
 		templateData.currentContext = stat;
@@ -394,7 +382,8 @@ export class FilesRenderer implements ICompressibleTreeRenderer<ExplorerItem, Fu
 			templateData.label.element.style.display = 'flex';
 			this.renderStat(stat, stat.name, undefined, node.filterData, templateData);
 		}
-		// Input Box (Void - shown only if currently editing - this is the box that appears when user edits the name of the file)
+
+		// Input Box
 		else {
 			templateData.label.element.style.display = 'none';
 			templateData.contribs.forEach(c => c.setResource(undefined));
@@ -488,13 +477,6 @@ export class FilesRenderer implements ICompressibleTreeRenderer<ExplorerItem, Fu
 			separator: this.labelService.getSeparator(stat.resource.scheme, stat.resource.authority),
 			domId
 		});
-
-		templateData.voidLabels.setResource({ resource: undefined, name: 'hi', }, {
-			hideIcon: true,
-			extraClasses: realignNestedChildren ? [...extraClasses, 'align-nest-icon-with-parent-icon'] : extraClasses,
-			forceLabel: true,
-		});
-
 	}

 	private renderInputBox(container: HTMLElement, stat: ExplorerItem, editableData: IEditableData): IDisposable {
@@ -95,12 +95,7 @@ suite('Files - ExplorerView', () => {
 			label: <any>{
 				container: label,
 				onDidRender: emitter.event
-			},
-			voidLabels: <any>{
-				container: label,
-				onDidRender: emitter.event
-			},
-
+			}
 		}, 1, false);

 		ds.add(navigationController);
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
@@ -17,7 +17,7 @@ import { IEditorService } from '../../../services/editor/common/editorService.js
 import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { EditorResourceAccessor } from '../../../common/editor.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
-import { extractCodeFromRegular } from './helpers/extractCodeFromResult.js';
+import { extractCodeFromResult } from './helpers/extractCodeFromResult.js';

 // The extension this was called from is here - https://github.com/voideditor/void/blob/autocomplete/extensions/void/src/extension/extension.ts

@@ -652,7 +652,7 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 					// newAutocompletion.abortRef = { current: () => { } }
 					newAutocompletion.status = 'finished'
 					// newAutocompletion.promise = undefined
-					newAutocompletion.insertText = postprocessResult(extractCodeFromRegular(fullText))
+					newAutocompletion.insertText = postprocessResult(extractCodeFromResult(fullText))

 					resolve(newAutocompletion.insertText)

@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { URI } from '../../../../../base/common/uri.js';
@@ -1,68 +1,12 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

-
-// modelWasTrainedOnFIM should be false here
-export const extractCodeFromFIM = ({ text, midTag, modelWasTrainedOnFIM }: { text: string, midTag: string, modelWasTrainedOnFIM: false }) => {
-
-	/* desired matches
-`
-``
-```
-<
-<P
-<PR
-<PRE
-<PRE>
-<PRE> a
-<PRE> a </PRE>
-<PRE> a </PRE><
-<PRE> a </PRE><M
-<PRE> a </PRE><MI
-<PRE> a </PRE><MID
-<PRE> a </PRE><MID>
-
-<PRE> a <PRE/> ->
-	*/
-
-
-	/* ------------- summary of the regex -------------
-		[optional ` | `` | ```]
-		(match optional_language_name)
-		[optional strings here]
-		[required <MID> tag]
-		(match the stuff between mid tags)
-		[optional <MID/> tag]
-		[optional ` | `` | ```]
-	*/
-
-	// const regex = /[\s\S]*?(?:`{1,3}\s*([a-zA-Z_]+[\w]*)?[\s\S]*?)?<MID>([\s\S]*?)(?:<\/MID>|`{1,3}|$)/;
-	const regex = new RegExp(
-		`[\\s\\S]*?(?:\`{1,3}\\s*([a-zA-Z_]+[\\w]*)?[\\s\\S]*?)?<${midTag}>([\\s\\S]*?)(?:</${midTag}>|\`{1,3}|$)`,
-		''
-	);
-	const match = text.match(regex);
-	if (match) {
-		const [_, languageName, codeBetweenMidTags] = match;
-		return [languageName, codeBetweenMidTags] as const
-
-	} else {
-		return [undefined, extractCodeFromRegular(text)] as const
-	}
-
-}
-
-
-
-export const extractCodeFromRegular = (result: string) => {
+export const extractCodeFromResult = (result: string) => {
 	// Match either:
 	// 1. ```language\n<code>```
 	// 2. ```<code>```
-
-	// 4 <PRE> A
-	// 3. <PRE> A </PRE><MID> B </MID> -> B
 	const match = result.match(/```(?:\w+\n)?([\s\S]*?)```|```([\s\S]*?)```/);

 	if (!match) {
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { diffLines } from '../react/out/diff/index.js'

@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { isMacintosh } from '../../../../../base/common/platform.js';

@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
@@ -27,16 +27,15 @@ import * as dom from '../../../../base/browser/dom.js';
 import { Widget } from '../../../../base/browser/ui/widget.js';
 import { URI } from '../../../../base/common/uri.js';
 import { IConsistentEditorItemService, IConsistentItemService } from './helperServices/consistentItemService.js';
-import { ctrlKStream_prefixAndSuffix, ctrlKStream_prompt, ctrlKStream_systemMessage, ctrlLStream_prompt, ctrlLStream_systemMessage, defaultFimTags } from './prompt/prompts.js';
+import { ctrlKStream_prefixAndSuffix, ctrlKStream_prompt, ctrlKStream_systemMessage, ctrlLStream_prompt, ctrlLStream_systemMessage } from './prompt/prompts.js';
 import { ILLMMessageService } from '../../../../platform/void/common/llmMessageService.js';
 import { IPosition } from '../../../../editor/common/core/position.js';

-import { mountCtrlK } from '../browser/react/out/quick-edit-tsx/index.js'
+import { mountCtrlK } from '../browser/react/out/ctrl-k-tsx/index.js'
 import { QuickEditPropsType } from './quickEditActions.js';
 import { InputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
 import { LLMMessage } from '../../../../platform/void/common/llmMessageTypes.js';
 import { IModelContentChangedEvent } from '../../../../editor/common/textModelEvents.js';
-import { extractCodeFromFIM, extractCodeFromRegular } from './helpers/extractCodeFromResult.js';

 const configOfBG = (color: Color) => {
 	return { dark: color, light: color, hcDark: color, hcLight: color, }
@@ -823,7 +822,6 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
 		const lastDiff = computedDiffs.pop()

 		if (!lastDiff) {
-			// console.log('!lastDiff')
 			// if the writing is identical so far, display no changes
 			originalCodeStartLine = 1
 			newCodeEndLine = 1
@@ -843,8 +841,7 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
 		const newCodeTop = llmText.split('\n').slice(0, (newCodeEndLine - 1) + 1).join('\n')
 		const oldFileBottom = diffZone.originalCode.split('\n').slice((originalCodeStartLine - 1) + 1, Infinity).join('\n')

-		// oriignalCode[1 + line...Infinity]. Must make sure 1 + line < originalCode.length. This is another way to check:
-		const newCode = (newCodeTop && oldFileBottom) ? `${newCodeTop}\n${oldFileBottom}` : (oldFileBottom || newCodeTop)
+		const newCode = `${newCodeTop}\n${oldFileBottom}`

 		this._writeText(uri, newCode,
 			{ startLineNumber: diffZone.startLine, startColumn: 1, endLineNumber: diffZone.endLine, endColumn: Number.MAX_SAFE_INTEGER, }, // 1-indexed
@@ -1046,10 +1043,6 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
 		// 	this._deleteDiffArea(ctrlKZone)
 		// }

-		// TODO ctrl+K case should be replaced with an actual check for model.isFIM
-		const modelWasTrainedOnFIM = featureName === 'Ctrl+K' ? false : false
-		const modelFimTags = defaultFimTags
-
 		const adding: Omit<DiffZone, 'diffareaid'> = {
 			type: 'DiffZone',
 			originalCode,
@@ -1078,7 +1071,7 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
 		}
 		else if (featureName === 'Ctrl+K') {
 			const { prefix, suffix } = ctrlKStream_prefixAndSuffix({ fullFileStr: currentFileStr, startLine, endLine })
-			const userContent = ctrlKStream_prompt({ selection: originalCode, userMessage, prefix, suffix, modelWasTrainedOnFIM, fimTags: modelFimTags })
+			const userContent = ctrlKStream_prompt({ selection: originalCode, userMessage, prefix, suffix })
 			console.log('PREFIX:\n', prefix)
 			console.log('SUFFIX:\n', suffix)
 			console.log('USER CONTENT:\n', userContent)
@@ -1109,30 +1102,17 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
 		// refresh now in case onText takes a while to get 1st message
 		this._refreshStylesAndDiffsInURI(uri)

-
-		const extractText = (fullText: string) => {
-			if (featureName === 'Ctrl+K') {
-				const [_, textSoFar] = extractCodeFromFIM({ text: fullText, midTag: modelFimTags.midTag, modelWasTrainedOnFIM })
-				return textSoFar
-			}
-			else if (featureName === 'Ctrl+L') {
-				return extractCodeFromRegular(fullText)
-			}
-			throw 1
-		}
-
 		streamRequestIdRef.current = this._llmMessageService.sendLLMMessage({
 			featureName,
 			logging: { loggingName: `startApplying - ${featureName}` },
 			messages,
 			onText: ({ newText, fullText }) => {
-				this._writeDiffZoneLLMText(diffZone, extractText(fullText), latestCurrentFileEnd, latestOriginalFileStart)
+				this._writeDiffZoneLLMText(diffZone, fullText, latestCurrentFileEnd, latestOriginalFileStart)
 				this._refreshStylesAndDiffsInURI(uri)
 			},
 			onFinalMessage: ({ fullText }) => {
-				// console.log('DONE! FULL TEXT\n', extractText(fullText), diffZone.startLine, diffZone.endLine)
 				// at the end, re-write whole thing to make sure no sync errors
-				this._writeText(uri, extractText(fullText),
+				this._writeText(uri, fullText,
 					{ startLineNumber: diffZone.startLine, startColumn: 1, endLineNumber: diffZone.endLine, endColumn: Number.MAX_SAFE_INTEGER }, // 1-indexed
 					{ shouldRealignDiffAreas: false }
 				)
@@ -1298,18 +1278,8 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
 		//  B|  <-- endLine (we want to delete this whole line)
 		//  C
 		else if (diff.type === 'insertion') {
-			// console.log('REJECTING:', diff)
-			// handle the case where the insertion was a newline at end of diffarea (applying to the next line doesnt work because it doesnt exist, vscode just doesnt delete the correct # of newlines)
-			if (diff.endLine === diffArea.endLine) {
-				// delete the line before instead of after
-				writeText = ''
-				toRange = { startLineNumber: diff.startLine - 1, startColumn: Number.MAX_SAFE_INTEGER, endLineNumber: diff.endLine, endColumn: 1 } // 1-indexed
-			}
-			else {
-				writeText = ''
-				toRange = { startLineNumber: diff.startLine, startColumn: 1, endLineNumber: diff.endLine + 1, endColumn: 1 } // 1-indexed
-			}
-
+			writeText = ''
+			toRange = { startLineNumber: diff.startLine, startColumn: 1, endLineNumber: diff.endLine + 1, endColumn: 1 } // 1-indexed
 		}
 		// if it was an edit, just edit the range
 		// (this image applies to writeText and toRange, not newOriginalCode)
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 .monaco-editor .void-sweepIdxBG {
 	background-color: var(--vscode-void-sweepIdxBG);
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/


 import { CodeSelection } from '../threadHistoryService.js';
@@ -324,25 +324,13 @@ export const ctrlKStream_prefixAndSuffix = ({ fullFileStr, startLine, endLine }:

 }

+export const ctrlKStream_prompt = ({ selection, prefix, suffix, userMessage }: { selection: string, prefix: string, suffix: string, userMessage: string, }) => {
+	const onlySpeaksFIM = false

-export type FimTagsType = {
-	preTag: string,
-	sufTag: string,
-	midTag: string
-}
-export const defaultFimTags: FimTagsType = {
-	preTag: 'BEFORE',
-	sufTag: 'AFTER',
-	midTag: 'SELECTION',
-}
-
-export const ctrlKStream_prompt = ({ selection, prefix, suffix, userMessage, modelWasTrainedOnFIM, fimTags }: { selection: string, prefix: string, suffix: string, userMessage: string, modelWasTrainedOnFIM: boolean, fimTags: FimTagsType }) => {
-	const { preTag, sufTag, midTag } = fimTags
-
-	if (modelWasTrainedOnFIM) {
-		// const preTag = 'PRE'
-		// const sufTag = 'SUF'
-		// const midTag = 'MID'
+	if (onlySpeaksFIM) {
+		const preTag = 'PRE'
+		const sufTag = 'SUF'
+		const midTag = 'MID'
 		return `\
 <${preTag}>
 /* Original Selection:
@@ -353,34 +341,32 @@ ${prefix}</${preTag}>
 <${sufTag}>${suffix}</${sufTag}>
 <${midTag}>`
 	}
-	// prompt the model artifically on how to do FIM
+	// prompt the model on how to do FIM
 	else {
-		// const preTag = 'BEFORE'
-		// const sufTag = 'AFTER'
-		// const midTag = 'SELECTION'
+		const preTag = 'PRE'
+		const sufTag = 'SUF'
+		const midTag = 'MID'
 		return `\
-The user is selecting this code as their SELECTION:
+Here is the user's original selection:
 \`\`\`
 <${midTag}>${selection}</${midTag}>
 \`\`\`

-The user wants to apply the following INSTRUCTIONS to the SELECTION:
+The user wants to apply the following instructions to the selection:
 ${userMessage}

-Please edit the SELECTION following the user's INSTRUCTIONS, and return the new SELECTION.
+Please rewrite the selection following the user's instructions.

-Note that the SELECTION has code that comes before it. This code is indicated with <${preTag}>...before<${preTag}/>.
-Note also that the SELECTION has code that comes after it. This code is indicated with <${sufTag}>...after<${sufTag}/>.
-
-Instructions:
-1. Your OUTPUT should be a SINGLE PIECE OF CODE of the form <${midTag}>...new_selection<${midTag}/>. Do not give any explanation before or after this. ONLY output this format, nothing more.
-2. You may ONLY CHANGE the original SELECTION, and NOT the content in the <${preTag}>...<${preTag}/> or <${sufTag}>...<${sufTag}/> tags.
-3. Make sure all brackets in the new selection are balanced the same as in the original selection.
-4. Be careful not to duplicate or remove variables, comments, or other syntax by mistake.
+Instructions to follow:
+1. Follow the user's instructions
+2. You may ONLY CHANGE the selection, and nothing else in the file
+3. Make sure all brackets in the new selection are balanced the same was as in the original selection
+3. Be careful not to duplicate or remove variables, comments, or other syntax by mistake

 Complete the following:
 <${preTag}>${prefix}</${preTag}>
-<${sufTag}>${suffix}</${sufTag}>`
+<${sufTag}>${suffix}</${sufTag}>
+<${midTag}>`
 	}
 };

@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
@@ -11,7 +11,6 @@ import { IMetricsService } from '../../../../platform/void/common/metricsService
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { IInlineDiffsService } from './inlineDiffsService.js';
 import { InputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
-import { roundRangeToLines } from './sidebarActions.js';


 export type QuickEditPropsType = {
@@ -55,7 +54,7 @@ registerAction2(class extends Action2 {
 		if (!editor) return;
 		const model = editor.getModel()
 		if (!model) return;
-		const selection = roundRangeToLines(editor.getSelection(), { emptySelectionBehavior: 'line' })
+		const selection = editor.getSelection()
 		if (!selection) return;


@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { Emitter, Event } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { spawn, execSync } from 'child_process';
 // Added lines below
@@ -11,23 +11,64 @@ import { fileURLToPath } from 'url';

 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-const __void_name = 'void'
+
+function doesPathExist(filePath) {
+	try {
+		const stats = fs.statSync(filePath);
+
+		return stats.isFile();
+	} catch (err) {
+		if (err.code === 'ENOENT') {
+			return false;
+		}
+		throw err;
+	}
+}
+
+/*
+
+This function finds `globalDesiredPath` given `localDesiredPath` and `currentPath`
+
+Diagram:
+
+...basePath/
+└── void/
+	├── ...currentPath/ (defined globally)
+	└── ...localDesiredPath/ (defined locally)
+
+*/
+function findDesiredPathFromLocalPath(localDesiredPath, currentPath) {
+
+	// walk upwards until currentPath + localDesiredPath exists
+	while (!doesPathExist(path.join(currentPath, localDesiredPath))) {
+		const parentDir = path.dirname(currentPath);
+
+		if (parentDir === currentPath) {
+			return undefined;
+		}
+
+		currentPath = parentDir;
+	}
+
+	// return the `globallyDesiredPath`
+	const globalDesiredPath = path.join(currentPath, localDesiredPath)
+	return globalDesiredPath;
+}

 // hack to refresh styles automatically
 function saveStylesFile() {
 	setTimeout(() => {
 		try {
-			// Find "void" in __dirname and use that as our base:
-			const voidIdx = __dirname.indexOf(__void_name);
-			const baseDir = __dirname.substring(0, voidIdx + __void_name.length);
-			const target = path.join(
-				baseDir,
-				'src/vs/workbench/contrib/void/browser/react/src2/styles.css'
-			);
+			const pathToCssFile = findDesiredPathFromLocalPath('./src/vs/workbench/contrib/void/browser/react/src2/styles.css', __dirname);
+
+			if (pathToCssFile === undefined) {
+				console.error('[scope-tailwind] Error finding styles.css');
+				return;
+			}

 			// Or re-write with the same content:
-			const content = fs.readFileSync(target, 'utf8');
-			fs.writeFileSync(target, content, 'utf8');
+			const content = fs.readFileSync(pathToCssFile, 'utf8');
+			fs.writeFileSync(pathToCssFile, content, 'utf8');
 			console.log('[scope-tailwind] Force-saved styles.css');
 		} catch (err) {
 			console.error('[scope-tailwind] Error saving styles.css:', err);
@@ -1,21 +1,21 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { useEffect, useState } from 'react'
 import { useIsDark, useSidebarState } from '../util/services.js'
 import ErrorBoundary from '../sidebar-tsx/ErrorBoundary.js'
-import { QuickEditChat } from './QuickEditChat.js'
+import { CtrlKChat } from './CtrlKChat.js'
 import { QuickEditPropsType } from '../../../quickEditActions.js'

-export const QuickEdit = (props: QuickEditPropsType) => {
+export const CtrlK = (props: QuickEditPropsType) => {

 	const isDark = useIsDark()

 	return <div className={`@@void-scope ${isDark ? 'dark' : ''}`}>
 		<ErrorBoundary>
-			<QuickEditChat {...props} />
+			<CtrlKChat {...props} />
 		</ErrorBoundary>
 	</div>

@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import React, { FormEvent, useCallback, useEffect, useRef, useState } from 'react';
 import { useSettingsState, useSidebarState, useThreadsState, useQuickEditState, useAccessor } from '../util/services.js';
@@ -14,14 +14,13 @@ import { ButtonStop, ButtonSubmit } from '../sidebar-tsx/SidebarChat.js';
 import { ModelDropdown } from '../void-settings-tsx/ModelDropdown.js';
 import { X } from 'lucide-react';

-export const QuickEditChat = ({ diffareaid, onGetInputBox, onUserUpdateText, onChangeHeight, initText }: QuickEditPropsType) => {
+export const CtrlKChat = ({ diffareaid, onGetInputBox, onUserUpdateText, onChangeHeight, initText }: QuickEditPropsType) => {

 	const accessor = useAccessor()
 	const inlineDiffsService = accessor.get('IInlineDiffsService')
 	const sizerRef = useRef<HTMLDivElement | null>(null)
 	const inputBoxRef: React.MutableRefObject<InputBox | null> = useRef(null);

-
 	useEffect(() => {
 		const inputContainer = sizerRef.current
 		if (!inputContainer) return;
@@ -68,10 +67,6 @@ export const QuickEditChat = ({ diffareaid, onGetInputBox, onUserUpdateText, onC
 	}, [inlineDiffsService])


-	const onX = useCallback(() => {
-		inlineDiffsService.removeCtrlKZone({ diffareaid })
-	}, [inlineDiffsService, diffareaid])
-
 	// sync init value
 	const alreadySetRef = useRef(false)
 	useEffect(() => {
@@ -120,7 +115,12 @@ export const QuickEditChat = ({ diffareaid, onGetInputBox, onUserUpdateText, onC
 					@@[&_div.monaco-inputbox]:!void-border-none
 					@@[&_div.monaco-inputbox]:!void-outline-none`}
 			>
-				<div className='flex flex-row items-center justify-between items-end gap-1'>
+				<div className='flex flex-row justify-between items-end gap-1'>
+					<div className='absolute size-0.5 top-0 right-4 z-[1]'>
+						<X
+							onClick={() => { inlineDiffsService.removeCtrlKZone({ diffareaid }) }}
+						/>
+					</div>

 					{/* input */}
 					<div // copied from SidebarChat.tsx
@@ -132,12 +132,6 @@ export const QuickEditChat = ({ diffareaid, onGetInputBox, onUserUpdateText, onC
 							onChangeText={onChangeText}
 							onCreateInstance={useCallback((instance: InputBox) => {
 								inputBoxRef.current = instance;
-
-								// if presses the esc key, X
-								instance.element.addEventListener('keydown', (e) => {
-									if (e.key === 'Escape')
-										onX()
-								})
 								onGetInputBox(instance);
 								instance.focus()
 							}, [onGetInputBox])}
@@ -145,16 +139,6 @@ export const QuickEditChat = ({ diffareaid, onGetInputBox, onUserUpdateText, onC
 						/>
 					</div>

-					<div className='absolute pt-1 -top-1 -right-1'>
-						<span className='cursor-pointer rounded-md z-1'>
-							<X
-								className='size-4 text-vscode-toolbar-foreground'
-								onClick={onX}
-							/>
-						</span>
-					</div>
-
-
 				</div>


@@ -0,0 +1,12 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+import { mountFnGenerator } from '../util/mountFnGenerator.js'
+import { CtrlK } from './CtrlK.js'
+
+
+export const mountCtrlK = mountFnGenerator(CtrlK)
+
+
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { diffLines, Change } from 'diff';

@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { ReactNode } from "react"
 import { VoidCodeEditor } from '../util/inputs.js';
@@ -69,7 +69,7 @@ export const BlockCode = ({ text, buttonsOnHover, language }: { text: string, bu
 	const isSingleLine = !text.includes('\n')

 	return (<>
-		<div className={`relative group w-full overflow-hidden`}>
+		<div className={`relative group w-full bg-vscode-editor-bg overflow-hidden isolate`}>
 			{buttonsOnHover === null ? null : (
 				<div className="z-[1] absolute top-0 right-0 opacity-0 group-hover:opacity-100 duration-200">
 					<div className={`flex space-x-2 ${isSingleLine ? '' : 'p-2'}`}>{buttonsOnHover}</div>
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import React, { JSX, useCallback, useEffect, useState } from 'react'
 import { marked, MarkedToken, Token } from 'marked'
@@ -49,14 +49,14 @@ const CodeButtonsOnHover = ({ text }: { text: string }) => {

 	return <>
 		<button
-			className={`${isSingleLine ? '' : 'px-1 py-0.5'} text-sm bg-void-bg-1 text-void-fg-1 hover:brightness-110 border border-vscode-input-border rounded`}
+			className={`${isSingleLine ? '' : 'p-1'} text-xs hover:brightness-110 bg-vscode-input-bg border border-vscode-input-border rounded text-xs text-vscode-input-fg`}
 			onClick={onCopy}
 		>
 			{copyButtonState}
 		</button>
 		<button
-			// btn btn-secondary btn-sm border text-sm border-vscode-input-border rounded
-			className={`${isSingleLine ? '' : 'px-1 py-0.5'} text-sm bg-void-bg-1 text-void-fg-1 hover:brightness-110 border border-vscode-input-border rounded`}
+			// btn btn-secondary btn-sm border text-xs text-vscode-input-fg border-vscode-input-border rounded
+			className={`${isSingleLine ? '' : 'p-1'} text-xs hover:brightness-110 bg-vscode-input-bg border border-vscode-input-border rounded text-xs text-vscode-input-fg`}
 			onClick={onApply}
 		>
 			Apply
@@ -215,7 +215,7 @@ const RenderToken = ({ token, nested = false }: { token: Token | string, nested?
 	// default
 	return (
 		<div className="bg-orange-50 rounded-sm overflow-hidden">
-			<span className="text-sm text-orange-500">Unknown type:</span>
+			<span className="text-xs text-orange-500">Unknown type:</span>
 			{t.raw}
 		</div>
 	)
@@ -1,12 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
-
-import { mountFnGenerator } from '../util/mountFnGenerator.js'
-import { QuickEdit } from './QuickEdit.js'
-
-
-export const mountCtrlK = mountFnGenerator(QuickEdit)
-
-
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import React, { Component, ErrorInfo, ReactNode } from 'react';
 import { ErrorDisplay } from './ErrorDisplay.js';
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import React, { useState } from 'react';
 import { AlertCircle, ChevronDown, ChevronUp, X } from 'lucide-react';
@@ -36,38 +36,38 @@ export const ErrorDisplay = ({
 	return (
 		<div className={`rounded-lg border border-red-200 bg-red-50 p-4 overflow-auto`}>
 			{/* Header */}
-			<div className='flex items-start justify-between'>
-				<div className='flex gap-3'>
-					<AlertCircle className='h-5 w-5 text-red-600 mt-0.5' />
-					<div className='flex-1'>
-						<h3 className='font-semibold text-red-800'>
+			<div className="flex items-start justify-between">
+				<div className="flex gap-3">
+					<AlertCircle className="h-5 w-5 text-red-600 mt-0.5" />
+					<div className="flex-1">
+						<h3 className="font-semibold text-red-800">
 							{/* eg Error */}
 							Error
 						</h3>
-						<p className='text-red-700 mt-1'>
+						<p className="text-red-700 mt-1">
 							{/* eg Something went wrong */}
 							{message}
 						</p>
 					</div>
 				</div>

-				<div className='flex gap-2'>
+				<div className="flex gap-2">
 					{details && (
-						<button className='text-red-600 hover:text-red-800 p-1 rounded'
+						<button className="text-red-600 hover:text-red-800 p-1 rounded"
 							onClick={() => setIsExpanded(!isExpanded)}
 						>
 							{isExpanded ? (
-								<ChevronUp className='h-5 w-5' />
+								<ChevronUp className="h-5 w-5" />
 							) : (
-								<ChevronDown className='h-5 w-5' />
+								<ChevronDown className="h-5 w-5" />
 							)}
 						</button>
 					)}
 					{showDismiss && onDismiss && (
-						<button className='text-red-600 hover:text-red-800 p-1 rounded'
+						<button className="text-red-600 hover:text-red-800 p-1 rounded"
 							onClick={onDismiss}
 						>
-							<X className='h-5 w-5' />
+							<X className="h-5 w-5" />
 						</button>
 					)}
 				</div>
@@ -75,10 +75,10 @@ export const ErrorDisplay = ({

 			{/* Expandable Details */}
 			{isExpanded && details && (
-				<div className='mt-4 space-y-3 border-t border-red-200 pt-3 overflow-auto'>
+				<div className="mt-4 space-y-3 border-t border-red-200 pt-3 overflow-auto">
 					<div>
-						<span className='font-semibold text-red-800'>Full Error: </span>
-						<pre className='text-red-700'>{details}</pre>
+						<span className="font-semibold text-red-800">Full Error: </span>
+						<pre className="text-red-700">{details}</pre>
 					</div>
 				</div>
 			)}
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
 import React, { useEffect, useState } from 'react'
 import { mountFnGenerator } from '../util/mountFnGenerator.js'

@@ -24,14 +24,7 @@ export const Sidebar = ({ className }: { className: string }) => {
 	const isDark = useIsDark()
 	// ${isDark ? 'dark' : ''}
 	return <div className={`@@void-scope`} style={{ width: '100%', height: '100%' }}>
-		<div
-			// default background + text styles for sidebar
-			className={`
-				w-full h-full py-2
-				bg-void-bg-2
-				text-void-fg-1
-			`}
-		>
+		<div className={`w-full h-full flex flex-col py-2 bg-vscode-sidebar-bg`}>

 			{/* <span onClick={() => {
 				const tabs = ['chat', 'settings', 'threadSelector']
@@ -39,7 +32,7 @@ export const Sidebar = ({ className }: { className: string }) => {
 				sidebarStateService.setState({ currentTab: tabs[(index + 1) % tabs.length] as any })
 			}}>clickme {tab}</span> */}

-			<div className={`w-full h-auto mb-2 ${isHistoryOpen ? '' : 'hidden'} ring-inset ring-2 ring-widget-shadow z-10`}>
+			<div className={`w-full h-auto mb-2 ${isHistoryOpen ? '' : 'hidden'} ring-2 ring-widget-shadow z-10`}>
 				<ErrorBoundary>
 					<SidebarThreadSelector />
 				</ErrorBoundary>
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import React, { ButtonHTMLAttributes, FormEvent, FormHTMLAttributes, Fragment, useCallback, useEffect, useRef, useState } from 'react';

@@ -272,7 +272,7 @@ export const SelectedFiles = (
 	return (
 		!!selections && selections.length !== 0 && (
 			<div
-				className='flex flex-wrap gap-0.5 text-left'
+				className='flex flex-wrap gap-2 text-left'
 			>
 				{selections.map((selection, i) => {

@@ -285,13 +285,13 @@ export const SelectedFiles = (
 							{/* selection summary */}
 							<div
 								// className="relative rounded rounded-e-2xl flex items-center space-x-2 mx-1 mb-1 disabled:cursor-default"
-								className={`flex items-center gap-0.5 relative
-									rounded-md px-1
+								className={`flex items-center gap-1 relative
+									rounded-md p-1
 									w-fit h-fit
 									select-none
-									bg-void-bg-3 hover:brightness-95
-									text-void-fg-1 text-xs text-nowrap
+									bg-vscode-editor-bg hover:brightness-95
 									border border-vscode-commandcenter-border rounded-xs
+									text-xs text-vscode-editor-fg text-nowrap
 								`}
 								onClick={() => {
 									setSelectionIsOpened(s => {
@@ -311,7 +311,12 @@ export const SelectedFiles = (
 								{/* X button */}
 								{type === 'staging' &&
 									<span
-										className='cursor-pointer hover:bg-vscode-toolbar-hover-bg rounded-md z-1'
+										className='
+											cursor-pointer
+											bg-vscode-editorwidget-bg hover:bg-vscode-toolbar-hover-bg
+											rounded-md
+											z-1
+										'
 										onClick={(e) => {
 											e.stopPropagation();
 											if (type !== 'staging') return;
@@ -342,7 +347,7 @@ export const SelectedFiles = (
 							</div>
 							{/* selection text */}
 							{isThisSelectionOpened &&
-								<div className='w-full px-1 rounded-sm border-vscode-editor-border'>
+								<div className='w-full p-1 rounded-sm border-vscode-editor-border'>
 									<BlockCode text={selection.selectionStr!} language={getLanguageFromFileName(selection.fileURI.path)} />
 								</div>
 							}
@@ -631,13 +636,13 @@ export const SidebarChat = () => {
 						//     .split(' ')
 						//     .map(style => `@@[&_div.monaco-inputbox]:!void-${style}`)
 						//     .join(' ');
-						`
+						`@@[&_textarea]:!void-bg-transparent
 						@@[&_textarea]:!void-outline-none
+						@@[&_textarea]:!void-text-vscode-input-fg
 						@@[&_textarea]:!void-min-h-[81px]
 						@@[&_textarea]:!void-max-h-[500px]
 						@@[&_div.monaco-inputbox]:!void-border-none
-						@@[&_div.monaco-inputbox]:!void-outline-none
-						`
+						@@[&_div.monaco-inputbox]:!void-outline-none`
 					}
 				>

@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import React from "react";
 import { useAccessor, useThreadsState } from '../util/services.js';
@@ -53,7 +53,7 @@ export const SidebarThreadSelector = () => {
 			</div>

 			{/* a list of all the past threads */}
-			<div className='px-1'><div className='flex flex-col gap-y-1 overflow-y-auto'>
+			<div className='flex flex-col gap-y-1 overflow-y-auto'>
 				{sortedThreadIds.map((threadId) => {
 					if (!allThreads)
 						return <>Error: Threads not found.</>
@@ -88,7 +88,7 @@ export const SidebarThreadSelector = () => {
 						</button>
 					)
 				})}
-			</div></div>
+			</div>

 		</div>
 	)
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { mountFnGenerator } from '../util/mountFnGenerator.js'
 import { Sidebar } from './Sidebar.js'
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

@tailwind base;
@tailwind components;
@@ -20,16 +20,6 @@



-.inherit-bg-all-restyle > * {
-	background-color: inherit !important;
-}
-
-
-.bg-editor-style-override {
-	--vscode-sideBar-background: var(--vscode-editor-background);
-}
-
-

 /* html {
 	font-size: var(--vscode-font-size);
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import React, { useCallback, useEffect, useRef } from 'react';
 import { IInputBoxStyles, InputBox } from '../../../../../../../base/browser/ui/inputbox/inputBox.js';
@@ -60,10 +60,6 @@ export const VoidInputBox = ({ onChangeText, onCreateInstance, inputBoxRef, plac
 	const contextViewProvider = accessor.get('IContextViewService')
 	return <WidgetComponent
 		ctor={InputBox}
-		className='
-			bg-void-bg-1
-			@@[&_::placeholder]:!void-text-void-fg-3
-		'
 		propsFn={useCallback((container) => [
 			container,
 			contextViewProvider,
@@ -197,12 +193,11 @@ export const VoidCheckBox = ({ label, value, onClick, className }: { label: stri
 }


-export const VoidSelectBox = <T,>({ onChangeSelection, onCreateInstance, selectBoxRef, options, className }: {
+export const VoidSelectBox = <T,>({ onChangeSelection, onCreateInstance, selectBoxRef, options }: {
 	onChangeSelection: (value: T) => void;
 	onCreateInstance?: ((instance: SelectBox) => void | IDisposable[]);
 	selectBoxRef?: React.MutableRefObject<SelectBox | null>;
 	options: readonly { text: string, value: T }[];
-	className?:string;
 }) => {
 	const accessor = useAccessor()
 	const contextViewProvider = accessor.get('IContextViewService')
@@ -210,9 +205,7 @@ export const VoidSelectBox = <T,>({ onChangeSelection, onCreateInstance, selectB
 	let containerRef = useRef<HTMLDivElement | null>(null);

 	return <WidgetComponent
-		className={`@@select-child-restyle
-			@@[&_select]:!void-text-void-fg-3
-			${className ?? ''}`}
+		className='@@select-child-restyle'
 		ctor={SelectBox}
 		propsFn={useCallback((container) => {
 			containerRef.current = container
@@ -308,9 +301,9 @@ export const VoidCodeEditor = ({ initValue, language }: { initValue: string, lan

 	return <div ref={divRef}>
 		<WidgetComponent
-			className='relative z-0 @@bg-editor-style-override' // text-sm
-			ctor={useCallback((container) => {
-				return instantiationService.createInstance(
+			className='relative z-0 text-sm bg-vscode-editor-bg'
+			ctor={useCallback((container) =>
+				instantiationService.createInstance(
 					CodeEditorWidget,
 					container,
 					{
@@ -354,7 +347,7 @@ export const VoidCodeEditor = ({ initValue, language }: { initValue: string, lan
 					{
 						isSimpleWidget: true,
 					})
-			}, [instantiationService])
+				, [instantiationService])
 			}

 			onCreateInstance={useCallback((editor: CodeEditorWidget) => {
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import React, { useEffect, useState } from 'react';
 import * as ReactDOM from 'react-dom/client'
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import React, { useState, useEffect } from 'react'
 import { ThreadsState } from '../../../threadHistoryService.js'
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { FeatureName, featureNames, ModelSelection, modelSelectionsEqual, ProviderName, providerNames } from '../../../../../../../platform/void/common/voidSettingsTypes.js'
@@ -32,7 +32,6 @@ const ModelSelectBox = ({ options, featureName }: { options: ModelOption[], feat
 	let weChangedText = false

 	return <VoidSelectBox
-		className='@@[&_select]:!void-text-xs'
 		options={options}
 		onChangeSelection={useCallback((newVal: ModelSelection) => {
 			if (weChangedText) return
@@ -85,20 +84,17 @@ const DummySelectBox = () => {
 		className={`
 			flex items-center
 			flex-nowrap text-ellipsis
-
-			text-void-warning brightness-90 opacity-90
-
-			hover:brightness-75 transition-all duration-200
+			text-vscode-charts-yellow
+			hover:brightness-90 transition-all duration-200
 			cursor-pointer
-			text-xs
 		`}
 		onClick={openSettings}
 	>
 		<IconWarning
-			size={14}
+			size={20}
 			className='mr-1 brightness-90'
 		/>
-		<span>Provider required</span>
+		<span>Model required</span>
 	</div>
 	// return <VoidSelectBox
 	// 	options={[{ text: 'Please add a model!', value: null }]}
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { InputBox } from '../../../../../../../base/browser/ui/inputbox/inputBox.js'
@@ -9,16 +9,16 @@ import { ProviderName, SettingName, displayInfoOfSettingName, providerNames, Voi
 import ErrorBoundary from '../sidebar-tsx/ErrorBoundary.js'
 import { VoidCheckBox, VoidInputBox, VoidSelectBox, VoidSwitch } from '../util/inputs.js'
 import { useAccessor, useIsDark, useRefreshModelListener, useRefreshModelState, useSettingsState } from '../util/services.js'
-import { X, RefreshCw, Loader2, Check, MoveRight } from 'lucide-react'
+import { X, RefreshCw, Loader2, Check } from 'lucide-react'
 import { ChatMarkdownRender } from '../markdown/ChatMarkdownRender.js'

 const SubtleButton = ({ onClick, text, icon, disabled }: { onClick: () => void, text: string, icon: React.ReactNode, disabled: boolean }) => {

-	return <div className='flex items-center text-void-fg-3 mb-1 px-3 rounded-sm overflow-hidden gap-2 hover:bg-black/10 dark:hover:bg-gray-300/10'>
+	return <div className='flex items-center px-3 rounded-sm overflow-hidden gap-2 hover:bg-black/10 dark:hover:bg-gray-300/10'>
 		<button className='flex items-center' disabled={disabled} onClick={onClick}>
 			{icon}
 		</button>
-		<span>
+		<span className='opacity-50'>
 			{text}
 		</span>
 	</div>
@@ -195,19 +195,16 @@ export const ModelDump = () => {

 			const disabled = !providerEnabled

-			return <div key={`${modelName}${providerName}`}
-				className={`flex items-center justify-between gap-4 hover:bg-black/10 dark:hover:bg-gray-300/10 py-1 px-3 rounded-sm overflow-hidden cursor-default truncate
-				`}
-			>
+			return <div key={`${modelName}${providerName}`} className={`flex items-center justify-between gap-4 hover:bg-black/10 dark:hover:bg-gray-300/10 py-1 px-3 rounded-sm overflow-hidden cursor-default truncate ${isNewProviderName ? 'mt-4' : ''}`}>
 				{/* left part is width:full */}
 				<div className={`w-full flex items-center gap-4`}>
-					<span className='min-w-20'>{isNewProviderName ? displayInfoOfProviderName(providerName).title : ''}</span>
+					<span className='min-w-40'>{isNewProviderName ? displayInfoOfProviderName(providerName).title : ''}</span>
 					<span>{modelName}</span>
 					{/* <span>{`${modelName} (${providerName})`}</span> */}
 				</div>
 				{/* right part is anything that fits */}
 				<div className='w-fit flex items-center gap-4'>
-					<span className='opacity-50'>{isAutodetected ? '(detected locally)' : isDefault ? '' : '(custom model)'}</span>
+				<span className='opacity-50'>{isAutodetected ? '(detected locally)' : isDefault ? '' : '(custom model)'}</span>

 					<VoidSwitch
 						value={disabled ? false : !isHidden}
@@ -244,8 +241,8 @@ const ProviderSetting = ({ providerName, settingName }: { providerName: Provider
 	return <ErrorBoundary>
 		<div className='my-1'>
 			<VoidInputBox
-				// placeholder={`${providerTitle} ${settingTitle} (${placeholder})`}
-				placeholder={`${settingTitle} (${placeholder})`}
+				// placeholder={`${providerTitle} ${settingTitle} (${placeholder}).`}
+				placeholder={`${settingTitle} (${placeholder}).`}
 				onChangeText={useCallback((newVal) => {
 					if (weChangedTextRef) return
 					voidSettingsService.setSettingOfProvider(providerName, settingName, newVal)
@@ -284,7 +281,7 @@ const ProviderSetting = ({ providerName, settingName }: { providerName: Provider
 				}, [voidSettingsService, providerName, settingName])}
 				multiline={false}
 			/>
-			{subTextMd === undefined ? null : <div className='py-1 px-3 opacity-50 text-sm'>
+			{subTextMd === undefined ? null : <div className='py-1 px-3 opacity-50 text-xs'>
 				<ChatMarkdownRender string={subTextMd} />
 			</div>}

@@ -360,7 +357,6 @@ export const VoidProviderSettings = ({ providerNames }: { providerNames: Provide
 // 		})}
 // 	</>
 // }
-type TabName = 'models' | 'general'
 export const VoidFeatureFlagSettings = () => {

 	const accessor = useAccessor()
@@ -384,85 +380,12 @@ export const VoidFeatureFlagSettings = () => {
 }


-export const FeaturesTab = () => {
-	return <>
-		<h2 className={`text-3xl mb-2`}>Local Providers</h2>
-		{/* <h3 className={`opacity-50 mb-2`}>{`Keep your data private by hosting AI locally on your computer.`}</h3> */}
-		{/* <h3 className={`opacity-50 mb-2`}>{`Instructions:`}</h3> */}
-		{/* <h3 className={`mb-2`}>{`Void can access any model that you host locally. We automatically detect your local models by default.`}</h3> */}
-		<h3 className={`text-void-fg-3 mb-2`}>{`Void can access any model that you host locally. We automatically detect your local models by default.`}</h3>
-		<div className='pl-4 select-text opacity-50'>
-			<span className={`text-sm mb-2`}><ChatMarkdownRender string={`1. Download [Ollama](https://ollama.com/download).`} /></span>
-			<span className={`text-sm mb-2`}><ChatMarkdownRender string={`2. Open your terminal.`} /></span>
-			<span className={`text-sm mb-2`}><ChatMarkdownRender string={`3. Run \`ollama run llama3.1\`. This installs Meta's llama3.1 model which is best for chat and inline edits. Requires 5GB of memory.`} /></span>
-			<span className={`text-sm mb-2`}><ChatMarkdownRender string={`4. Run \`ollama run qwen2.5-coder:1.5b\`. This installs a faster autocomplete model. Requires 1GB of memory.`} /></span>
-			<span className={`text-sm mb-2`}><ChatMarkdownRender string={`Void automatically detects locally running models and enables them.`} /></span>
-			{/* TODO we should create UI for downloading models without user going into terminal */}
-		</div>
-
-		<ErrorBoundary>
-			<VoidProviderSettings providerNames={localProviderNames} />
-		</ErrorBoundary>
-
-		<h2 className={`text-3xl mb-2 mt-16`}>Providers</h2>
-		<h3 className={`text-void-fg-3 mb-2`}>{`Void can access models from Anthropic, OpenAI, OpenRouter, and more.`}</h3>
-		{/* <h3 className={`opacity-50 mb-2`}>{`Access models like ChatGPT and Claude. We recommend using Anthropic or OpenAI as providers, or Groq as a faster alternative.`}</h3> */}
-		<ErrorBoundary>
-			<VoidProviderSettings providerNames={nonlocalProviderNames} />
-		</ErrorBoundary>
-
-		<h2 className={`text-3xl mb-2 mt-16`}>Models</h2>
-		<ErrorBoundary>
-			<VoidFeatureFlagSettings />
-			<RefreshableModels />
-			<ModelDump />
-			<AddModelMenuFull />
-		</ErrorBoundary>
-	</>
-}
-
-
-
-
-
-
-const OneClickSwitch = () => {
-
-}
-
-
-const GeneralTab = () => {
-	return <>
-		{/* <VoidFeatureFlagSettings /> */}
-
-		{/* keyboard shortcuts */}
-
-		<h2 className={`text-3xl mb-2`}>General Settings</h2>
-		<h3 className={`text-void-fg-3 mb-2`}>{`VS Code's built-in settings.`}</h3>
-
-		<h2 className={`text-3xl mb-2`}>Keyboard Settings</h2>
-		<h3 className={`text-void-fg-3 mb-2`}>{`Void can access models from Anthropic, OpenAI, OpenRouter, and more.`}</h3>
-
-
-		<h2 className={`text-3xl mb-2`}>One-click Switch</h2>
-
-		Transfer your VS Code settings to Void.
-
-		<h2 className={`text-3xl mb-2`}>Theme</h2>
-
-
-		<h2 className={`text-3xl mb-2`}>Rules for AI</h2>
-
-
-	</>
-}
-
 // full settings

 export const Settings = () => {
 	const isDark = useIsDark()

-	const [tab, setTab] = useState<TabName>('models')
+	const [tab, setTab] = useState<'models' | 'features'>('models')

 	return <div className={`@@void-scope ${isDark ? 'dark' : ''}`}>
 		<div className='w-full h-full px-10 py-10 select-none'>
@@ -481,9 +404,9 @@ export const Settings = () => {
 						<button className={`text-left p-1 px-3 my-0.5 rounded-sm overflow-hidden ${tab === 'models' ? 'bg-black/10 dark:bg-gray-200/10' : ''} hover:bg-black/10 hover:dark:bg-gray-200/10 active:bg-black/10 active:dark:bg-gray-200/10 `}
 							onClick={() => { setTab('models') }}
 						>Models</button>
-						<button className={`text-left p-1 px-3 my-0.5 rounded-sm overflow-hidden ${tab === 'general' ? 'bg-black/10 dark:bg-gray-200/10' : ''} hover:bg-black/10 hover:dark:bg-gray-200/10 active:bg-black/10 active:dark:bg-gray-200/10 `}
-							onClick={() => { setTab('general') }}
-						>General</button>
+						{/* <button className={`text-left p-1 px-3 my-0.5 rounded-sm overflow-hidden ${tab === 'features' ? 'bg-black/10 dark:bg-gray-200/10' : ''} hover:bg-black/10 hover:dark:bg-gray-200/10 active:bg-black/10 active:dark:bg-gray-200/10 `}
+							onClick={() => { setTab('features') }}
+						>Features</button> */}
 					</div>

 					{/* separator */}
@@ -494,11 +417,41 @@ export const Settings = () => {
 					<div className='w-full overflow-y-auto'>

 						<div className={`${tab !== 'models' ? 'hidden' : ''}`}>
-							<FeaturesTab />
+							<h2 className={`text-3xl mb-2`}>Local Providers</h2>
+							{/* <h3 className={`text-md opacity-50 mb-2`}>{`Keep your data private by hosting AI locally on your computer.`}</h3> */}
+							{/* <h3 className={`text-md opacity-50 mb-2`}>{`Instructions:`}</h3> */}
+							<h3 className={`text-md mb-2`}>{`Void can access any model that you host locally. We automatically detect your local models by default.`}</h3>
+							<div className='pl-4 select-text opacity-50'>
+								<h4 className={`text-xs mb-2`}><ChatMarkdownRender string={`1. Download [Ollama](https://ollama.com/download).`} /></h4>
+								<h4 className={`text-xs mb-2`}><ChatMarkdownRender string={`2. Open your terminal.`} /></h4>
+								<h4 className={`text-xs mb-2`}><ChatMarkdownRender string={`3. Run \`ollama run llama3.1\`. This installs Meta's llama model which is competitive with GPT-series models. It requires 5GB of memory.`} /></h4>
+								<h4 className={`text-xs mb-2`}><ChatMarkdownRender string={`4. Run \`ollama run qwen2.5-coder:1.5b\`. This is a faster autocomplete model and requires 1GB of memory.`} /></h4>
+								{/* TODO we should create UI for downloading models without user going into terminal */}
+							</div>
+
+							<ErrorBoundary>
+								<VoidProviderSettings providerNames={localProviderNames} />
+							</ErrorBoundary>
+
+							<h2 className={`text-3xl mb-2 mt-16`}>More Providers</h2>
+							<h3 className={`text-md mb-2`}>{`Void can also access models like ChatGPT and Claude. We recommend using Anthropic or OpenAI.`}</h3>
+							{/* <h3 className={`text-md opacity-50 mb-2`}>{`Access models like ChatGPT and Claude. We recommend using Anthropic or OpenAI as providers, or Groq as a faster alternative.`}</h3> */}
+							<ErrorBoundary>
+								<VoidProviderSettings providerNames={nonlocalProviderNames} />
+							</ErrorBoundary>
+
+							<h2 className={`text-3xl mb-2 mt-16`}>Models</h2>
+							<ErrorBoundary>
+								<VoidFeatureFlagSettings />
+								<RefreshableModels />
+								<ModelDump />
+								<AddModelMenuFull />
+							</ErrorBoundary>
 						</div>

-						<div className={`${tab !== 'general' ? 'hidden' : ''}`}>
-							<GeneralTab />
+						<div className={`${tab !== 'features' ? 'hidden' : ''}`}>
+							<h2 className={`text-3xl mb-2`} onClick={() => { setTab('features') }}>Features</h2>
+							{/* <VoidFeatureFlagSettings /> */}
 						</div>

 					</div>
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { mountFnGenerator } from '../util/mountFnGenerator.js'
 import { Settings } from './Settings.js'
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 /** @type {import('tailwindcss').Config} */
 module.exports = {
@@ -9,34 +9,7 @@ module.exports = {
 	content: ['./src2/**/*.{jsx,tsx}'], // uses these files to decide how to transform the css file
 	theme: {
 		extend: {
-			fontSize: {
-				xs: '10px',
-				sm: '12px',
-				root: '13px',
-				lg: '14px',
-				xl: '16px',
-				'2xl': '18px',
-				'3xl': '20px',
-				'4xl': '24px',
-				'5xl': '30px',
-				'6xl': '36px',
-				'7xl': '48px',
-				'8xl': '64px',
-				'9xl': '72px',
-			},
-			// common colors to use, ordered light to dark
-
 			colors: {
-				"void-bg-1": "var(--vscode-input-background)",
-				"void-bg-2": "var(--vscode-sideBar-background)",
-				"void-bg-3": "var(--vscode-editor-background)",
-
-				"void-fg-1": "var(--vscode-editor-foreground)",
-				"void-fg-2": "var(--vscode-input-foreground)",
-				"void-fg-3": "var(--vscode-input-placeholderForeground)",
-				"void-warning": "var(--vscode-charts-orange)",
-
-
 				vscode: {
 					// see: https://code.visualstudio.com/api/extension-guides/webview#theming-webview-content

@@ -66,8 +39,8 @@ module.exports = {
 					"input-bg": "var(--vscode-input-background)",
 					"input-border": "var(--vscode-input-border)",
 					"input-fg": "var(--vscode-input-foreground)",
-					"input-placeholder-fg": "var(--vscode-input-placeholderForeground)",
-					"input-active-bg": "var(--vscode-input-activeBackground)",
+					"input-placeholder-fg": "var(--vscode-placeholderForeground)",
+					"input-active-bg": "var(--vscode-activeBackground)",
 					"input-option-active-border": "var(--vscode-inputOption-activeBorder)",
 					"input-option-active-fg": "var(--vscode-inputOption-activeForeground)",
 					"input-option-hover-bg": "var(--vscode-inputOption-hoverBackground)",
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 {
 	"compilerOptions": {
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { defineConfig } from 'tsup'

@@ -9,7 +9,7 @@ export default defineConfig({
 	entry: [
 		'./src2/sidebar-tsx/index.tsx',
 		'./src2/void-settings-tsx/index.tsx',
-		'./src2/quick-edit-tsx/index.tsx',
+		'./src2/ctrl-k-tsx/index.tsx',
 		'./src2/diff/index.tsx',
 	],
 	outDir: './out',
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';

@@ -26,18 +26,9 @@ import { VOID_OPEN_SETTINGS_ACTION_ID } from './voidSettingsPane.js';
 // ---------- Register commands and keybindings ----------


-export const roundRangeToLines = (range: IRange | null | undefined, options: { emptySelectionBehavior: 'null' | 'line' }) => {
+const roundRangeToLines = (range: IRange | null | undefined) => {
 	if (!range)
 		return null
-
-	// treat as no selection if selection is empty
-	if (range.endColumn === range.startColumn && range.endLineNumber === range.startLineNumber) {
-		if (options.emptySelectionBehavior === 'null')
-			return null
-		else if (options.emptySelectionBehavior === 'line')
-			return { startLineNumber: range.startLineNumber, startColumn: 1, endLineNumber: range.startLineNumber, endColumn: 1 }
-	}
-
 	// IRange is 1-indexed
 	const endLine = range.endColumn === 1 ? range.endLineNumber - 1 : range.endLineNumber // e.g. if the user triple clicks, it selects column=0, line=line -> column=0, line=line+1
 	const newRange: IRange = {
@@ -81,49 +72,51 @@ registerAction2(class extends Action2 {
 		stateService.fireFocusChat()

 		const editor = editorService.getActiveCodeEditor()
-		// accessor.get(IEditorService).activeTextEditorControl?.getSelection()
-		const selectionRange = roundRangeToLines(editor?.getSelection(), { emptySelectionBehavior: 'null' })
-
-
-		// select whole lines
-		if (selectionRange) {
-			editor?.setSelection({ startLineNumber: selectionRange.startLineNumber, endLineNumber: selectionRange.endLineNumber, startColumn: 1, endColumn: Number.MAX_SAFE_INTEGER })
-		}
-
-		const selectionStr = getContentInRange(model, selectionRange)
-
-		const selection: CodeStagingSelection = !selectionRange || !selectionStr || (selectionRange.startLineNumber > selectionRange.endLineNumber) ? {
-			type: 'File',
-			fileURI: model.uri,
-			selectionStr: null,
-			range: null,
-		} : {
-			type: 'Selection',
-			fileURI: model.uri,
-			selectionStr: selectionStr,
-			range: selectionRange,
-		}
-
-		// add selection to staging
-		const threadHistoryService = accessor.get(IThreadHistoryService)
-		const currentStaging = threadHistoryService.state._currentStagingSelections
-		const currentStagingEltIdx = currentStaging?.findIndex(s =>
-			s.fileURI.fsPath === model.uri.fsPath
-			&& s.range?.startLineNumber === selection.range?.startLineNumber
-			&& s.range?.endLineNumber === selection.range?.endLineNumber
+		const selectionRange = roundRangeToLines(
+			// accessor.get(IEditorService).activeTextEditorControl?.getSelection()
+			editor?.getSelection()
 		)

-		// if matches with existing selection, overwrite
-		if (currentStagingEltIdx !== undefined && currentStagingEltIdx !== -1) {
-			threadHistoryService.setStaging([
-				...currentStaging!.slice(0, currentStagingEltIdx),
-				selection,
-				...currentStaging!.slice(currentStagingEltIdx + 1, Infinity)
-			])
-		}
-		// if no match, add
-		else {
-			threadHistoryService.setStaging([...(currentStaging ?? []), selection])
+
+		if (selectionRange) {
+			// select whole lines
+			editor?.setSelection({ startLineNumber: selectionRange.startLineNumber, endLineNumber: selectionRange.endLineNumber, startColumn: 1, endColumn: Number.MAX_SAFE_INTEGER })
+
+			const selectionStr = getContentInRange(model, selectionRange)
+
+			const selection: CodeStagingSelection = selectionStr === null || selectionRange.startLineNumber > selectionRange.endLineNumber ? {
+				type: 'File',
+				fileURI: model.uri,
+				selectionStr: null,
+				range: null,
+			} : {
+				type: 'Selection',
+				fileURI: model.uri,
+				selectionStr: selectionStr,
+				range: selectionRange,
+			}
+
+			// add selection to staging
+			const threadHistoryService = accessor.get(IThreadHistoryService)
+			const currentStaging = threadHistoryService.state._currentStagingSelections
+			const currentStagingEltIdx = currentStaging?.findIndex(s =>
+				s.fileURI.fsPath === model.uri.fsPath
+				&& s.range?.startLineNumber === selection.range?.startLineNumber
+				&& s.range?.endLineNumber === selection.range?.endLineNumber
+			)
+
+			// if matches with existing selection, overwrite
+			if (currentStagingEltIdx !== undefined && currentStagingEltIdx !== -1) {
+				threadHistoryService.setStaging([
+					...currentStaging!.slice(0, currentStagingEltIdx),
+					selection,
+					...currentStaging!.slice(currentStagingEltIdx + 1, Infinity)
+				])
+			}
+			// if no match, add
+			else {
+				threadHistoryService.setStaging([...(currentStaging ?? []), selection])
+			}
 		}

 	}
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { Registry } from '../../../../platform/registry/common/platform.js';
 import {
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { Emitter, Event } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/


 // register inline diffs
@@ -1,7 +1,7 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/

 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
Author	SHA1	Message	Date
Andrew Pareles	7925e438c6	header update	2025-01-09 18:51:40 -08:00
Andrew Pareles	2f5e954ebf	update	2025-01-09 18:49:05 -08:00
Andrew Pareles	6a8ac1a68e	apache 2.0	2025-01-09 18:48:52 -08:00
Andrew Pareles	c5b6fd9b75	Create temp	2025-01-09 18:48:15 -08:00
Raz Luvaton	5083b8e971	fix react build.js to properly find the base folder (#203 )	2025-01-05 18:00:40 -08:00
Andrew Pareles	85c2c80db0	Update README.md	2025-01-04 23:55:52 -08:00
Andrew Pareles	b677d3dfc1	Update CONTRIBUTING.md	2025-01-03 17:18:18 -08:00
Andrew Pareles	cc177b9cd4	update package	2025-01-03 14:14:37 -08:00
Andrew Pareles	dd204978e5	update lock	2025-01-03 13:31:54 -08:00
Andrew Pareles	fb48c4e67e	Update VOID_USEFUL_LINKS.md	2025-01-03 13:15:55 -08:00
Andrew Pareles	74fa5cb505	Merge pull request #202 from PraveenAsh/patch-1 Update CONTRIBUTING.md	2025-01-03 12:44:33 -08:00
Andrew Pareles	fae03c3060	Update CONTRIBUTING.md	2025-01-03 12:44:12 -08:00
Praveen Naik	68722ee5c3	Update CONTRIBUTING.md Added details about Bundling output. Most of us open only the repo without workspace to save memory. It's easy to miss out on where the bundle is located. Added clarity	2025-01-03 21:04:54 +05:30
Andrew Pareles	4a993a716b	Update README.md	2025-01-02 23:34:37 -08:00
Andrew Pareles	23d1d4169a	update CONTRIBUTING.md	2025-01-02 23:20:36 -08:00
Andrew Pareles	f688e1ffae	Update LICENSE-VS-Code.txt	2025-01-02 23:06:06 -08:00
Andrew Pareles	a443315c14	Merge branch 'main' of https://github.com/voideditor/void	2025-01-02 23:02:05 -08:00
Andrew Pareles	eeacb2d3c9	separate licenses + header	2025-01-02 23:00:59 -08:00
Andrew Pareles	cdbdf3c5c7	License update (#199 )	2025-01-02 22:58:05 -08:00
Andrew Pareles	825c40bfff	license	2025-01-02 22:40:43 -08:00
Andrew Pareles	a3d3309b9d	Merge pull request #197 from voideditor/model-selection Fix line indexing for CtrlK	2025-01-02 18:59:08 -08:00
Andrew Pareles	b0d21dfdb1	Merge pull request #196 from voideditor/model-selection misc necessary updates	2025-01-02 16:41:33 -08:00
Andrew Pareles	6feb713682	Merge pull request #192 from jcommaret/main Fix - bundle - ajv missing deps	2025-01-02 16:31:45 -08:00
Andrew Pareles	667dc8bd7e	merge	2025-01-02 16:31:29 -08:00
Andrew Pareles	bdb0c65346	Merge pull request #195 from voideditor/model-selection Merge model selection branch (ctrlK, model selection, UI)	2025-01-02 16:29:10 -08:00
Jérôme Commaret	9543bf8eb3	Fix : Ajv missing deps at bundle	2024-12-28 22:19:16 +01:00
Jérôme Commaret	d85a316536	Merge branch 'voideditor:main' into main	2024-12-27 13:59:49 +01:00
Jérôme Commaret	2d80a29275	Merge branch 'voideditor:main' into main	2024-12-12 01:03:51 +01:00
Jérôme Commaret	d8e9b50890	Advanced builder section added	2024-12-07 14:49:28 +01:00