package update

comment
void settings opening behavior
2025-02-13 01:24:47 -08:00 · 2025-01-31 20:24:09 -08:00 · 2025-01-31 20:17:51 -08:00 · 2025-01-30 16:38:51 -08:00 · 2025-01-30 16:37:44 -08:00 · 2025-01-30 15:07:02 -08:00
43 changed files with 1576 additions and 1219 deletions
@@ -22,3 +22,4 @@ product.overrides.json
 *.snap.actual
 .vscode-test
 .tmp/
+.tool-versions
@@ -29,6 +29,34 @@
 				}
 			}
 		},
+		{
+			"type": "npm",
+			"script": "watchreactd",
+			"label": "React - Build",
+			"isBackground": true,
+			"presentation": {
+				"reveal": "never",
+				"group": "buildWatchers",
+				"close": false
+			},
+			"problemMatcher": {
+				"owner": "typescript",
+				"applyTo": "closedDocuments",
+				"fileLocation": [
+					"absolute"
+				],
+				"pattern": {
+					"regexp": "Error: ([^(]+)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\): (.*)$",
+					"file": 1,
+					"location": 2,
+					"message": 3
+				},
+				"background": {
+					"beginsPattern": "Starting compilation",
+					"endsPattern": "Finished compilation"
+				}
+			}
+		},
 		{
 			"type": "npm",
 			"script": "watch-extensionsd",
@@ -61,7 +89,8 @@
 			"label": "VS Code - Build",
 			"dependsOn": [
 				"Core - Build",
-				"Ext - Build"
+				"Ext - Build",
+				"React - Build"
 			],
 			"group": {
 				"kind": "build",
@@ -1,16 +1,28 @@
 # Contributing to Void
-
-Welcome! 👋 This is the official guide on how to contribute to Void. We want to make it as easy as possible to contribute, so if you have any questions or comments, reach out via email or discord!
-
-
+### Welcome! 👋
+This is the official guide on how to contribute to Void. We want to make it as easy as possible to contribute, so if you have any questions or comments, reach out via email or discord!

 There are a few ways to contribute:

- 👨‍💻 Build new features - see [Issues](https://github.com/voideditor/void/issues).
+- 💫 Complete items on the [Roadmap](https://github.com/orgs/voideditor/projects/2).
 - 💡 Make suggestions in our [Discord](https://discord.gg/RSNjgaugJs).
- ⭐️ 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.
+- 🪴 Start new Issues - see [Issues](https://github.com/voideditor/void/issues).
+
+
+
+### Codebase Guide
+
+We highly recommend reading [this](https://github.com/microsoft/vscode/wiki/Source-Code-Organization) article on VSCode's sourcecode organization.
+
+We are currently putting together our own articles on VSCode and Void's sourcecode organization. The best way to get this information right now is by attending a weekly meeting.
+
+<!-- ADD BLOG HERE
+We wrote a [guide to working in VSCode].
+-->
+
+Most of Void's code lives in the two folders called `void/`.
+

-Void's code mostly lives in `src/vs/workbench/contrib/void/` and `src/vs/platform/void/`.


 ## Building Void
@@ -75,7 +87,7 @@ Alternatively, if you want to build Void from the terminal, instead of pressing
 #### Common Fixes

 - Make sure you followed the prerequisite steps.
- Make sure you have the same NodeJS version as `.nvmrc`.
+- Make sure you have Node version `20.16.0` (the version in `.nvmrc`)!
 - If you get `"TypeError: Failed to fetch dynamically imported module"`, make sure all imports end with `.js`.
 - If you see missing styles, wait a few seconds and then reload.
 - If you have any questions, feel free to [submit an issue](https://github.com/voideditor/void/issues/new). You can also refer to VSCode's complete [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute) page.
@@ -111,16 +123,19 @@ workspace/
 ```

 ### Distributing
-We have a few scripts to convert `Mac .app -> .dmg`, `Windows folder -> .exe`, and `Linux folder -> appimage` for distribution. Let us know if you'd like access to them. 
+Void's maintainers distribute Void on our website and in releases. If you'd like to see the scripts to convert `Mac .app -> .dmg`, `Windows folder -> .exe`, and `Linux folder -> appimage` for distribution, feel free to reach out.

 ## Pull Request Guidelines


 - Please submit a pull request once you've made a change.
- No need to submit an Issue unless you're creating a new feature.
+- No need to submit an Issue unless you're creating a new feature that might involve multiple PRs.
 - Please don't use AI to write your PR 🙂


+
+
+
 <!--
 # Relevant files

@@ -149,7 +164,3 @@ Edit: far too many changes to track... this is old
 - vscode.proposed.editorInsets.d.ts - not modified, but code copied

 -->
-
-## References
-
-For some useful links we've compiled on VSCode, see [`VOID_USEFUL_LINKS.md`](https://github.com/voideditor/void/blob/main/VOID_USEFUL_LINKS.md).
@@ -9,31 +9,31 @@
 	/>
 </div>

-Void is the open-source Cursor alternative. This repo contains the full sourcecode for Void. We are currently in [open beta](https://voideditor.com/) for downloading the official release. If you're new, welcome!
+Void is the open-source Cursor alternative. 
+
+This repo contains the full sourcecode for Void. We are currently in [open beta](https://voideditor.com/email) for Discord members (see the `announcements` channel), with a waitlist for our official release. If you're new, welcome!

 - 👋 [Discord](https://discord.gg/RSNjgaugJs)

+- 🔨 [Contribute](https://github.com/voideditor/void/blob/main/CONTRIBUTING.md)
+
 - 🚙 [Roadmap](https://github.com/orgs/voideditor/projects/2)

 - 📝 [Changelog](https://voideditor.com/changelog)

- 🔨 [Contribute](https://github.com/voideditor/void/blob/main/CONTRIBUTING.md)
-
-
-<!-- ❤️ Setup: -->

 ## Contributing

+1. Feel free to attend a weekly meeting in our Discord channel if you'd like to contribute!

-1. To contribute to the Void repository, follow the steps in [`CONTRIBUTING.md`](https://github.com/voideditor/void/blob/main/CONTRIBUTING.md).
-  
-2. To suggest a new feature, please create a new [GitHub Issue](https://github.com/voideditor/void/issues). Suggestions will be added to our Roadmap within one day.
+2. To get started working on Void, see [Contributing](https://github.com/voideditor/void/blob/main/CONTRIBUTING.md).
+
+3. We're open to collaborations and suggestions of all types - just reach out.

-3. We're open to collaborations of all types. Feel free to contact us via email or discord.

 ## Reference

 Void is a fork of the [vscode](https://github.com/microsoft/vscode) repository. For some useful links on VSCode, see [`VOID_USEFUL_LINKS.md`](https://github.com/voideditor/void/blob/main/VOID_USEFUL_LINKS.md).

 ## Support
-Feel free to reach out in our discord or contact us via email.
+Feel free to reach out in our Discord or contact us via email: hello@voideditor.com.
@@ -11,9 +11,11 @@
      "license": "MIT",
      "dependencies": {
        "@anthropic-ai/sdk": "^0.32.1",
+        "@floating-ui/react": "^0.27.3",
        "@google/generative-ai": "^0.21.0",
        "@microsoft/1ds-core-js": "^3.2.13",
        "@microsoft/1ds-post-js": "^3.2.13",
+        "@mistralai/mistralai": "^1.4.0",
        "@parcel/watcher": "2.1.0",
        "@rrweb/record": "^2.0.0-alpha.17",
        "@rrweb/types": "^2.0.0-alpha.17",
@@ -65,7 +67,8 @@
        "vscode-regexpp": "^3.1.0",
        "vscode-textmate": "9.1.0",
        "yauzl": "^3.0.0",
-        "yazl": "^2.4.3"
+        "yazl": "^2.4.3",
+        "zod": "^3.24.1"
      },
      "devDependencies": {
        "@playwright/test": "^1.46.1",
@@ -1549,6 +1552,65 @@
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
      }
    },
+    "node_modules/@floating-ui/core": {
+      "version": "1.6.9",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.9.tgz",
+      "integrity": "sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/utils": "^0.2.9"
+      }
+    },
+    "node_modules/@floating-ui/dom": {
+      "version": "1.6.13",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.13.tgz",
+      "integrity": "sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/core": "^1.6.0",
+        "@floating-ui/utils": "^0.2.9"
+      }
+    },
+    "node_modules/@floating-ui/react": {
+      "version": "0.27.3",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.27.3.tgz",
+      "integrity": "sha512-CLHnes3ixIFFKVQDdICjel8muhFLOBdQH7fgtHNPY8UbCNqbeKZ262G7K66lGQOUQWWnYocf7ZbUsLJgGfsLHg==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/react-dom": "^2.1.2",
+        "@floating-ui/utils": "^0.2.9",
+        "tabbable": "^6.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=17.0.0",
+        "react-dom": ">=17.0.0"
+      }
+    },
+    "node_modules/@floating-ui/react-dom": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.2.tgz",
+      "integrity": "sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/dom": "^1.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
+    "node_modules/@floating-ui/react/node_modules/tabbable": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz",
+      "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==",
+      "license": "MIT"
+    },
+    "node_modules/@floating-ui/utils": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.9.tgz",
+      "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==",
+      "license": "MIT"
+    },
    "node_modules/@google/generative-ai": {
      "version": "0.21.0",
      "resolved": "https://registry.npmjs.org/@google/generative-ai/-/generative-ai-0.21.0.tgz",
@@ -2366,17 +2428,25 @@
        "exenv-es6": "^1.1.1"
      }
    },
+    "node_modules/@mistralai/mistralai": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@mistralai/mistralai/-/mistralai-1.4.0.tgz",
+      "integrity": "sha512-xA3DAtIDh4Qgr1EoSuiGVE+2ABNrxpcTeC0kSXYbkDNUGdthalLAH7DgbG0fkKZ7TN8xdWXQq2WiIghp/O96Eg==",
+      "peerDependencies": {
+        "zod": ">= 3"
+      }
+    },
    "node_modules/@next/env": {
-      "version": "15.1.4",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-15.1.4.tgz",
-      "integrity": "sha512-2fZ5YZjedi5AGaeoaC0B20zGntEHRhi2SdWcu61i48BllODcAmmtj8n7YarSPt4DaTsJaBFdxQAVEVzgmx2Zpw==",
+      "version": "15.1.6",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-15.1.6.tgz",
+      "integrity": "sha512-d9AFQVPEYNr+aqokIiPLNK/MTyt3DWa/dpKveiAaVccUadFbhFEvY6FXYX2LJO2Hv7PHnLBu2oWwB4uBuHjr/w==",
      "dev": true,
      "license": "MIT"
    },
    "node_modules/@next/swc-darwin-arm64": {
-      "version": "15.1.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.1.4.tgz",
-      "integrity": "sha512-wBEMBs+np+R5ozN1F8Y8d/Dycns2COhRnkxRc+rvnbXke5uZBHkUGFgWxfTXn5rx7OLijuUhyfB+gC/ap58dDw==",
+      "version": "15.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.1.6.tgz",
+      "integrity": "sha512-u7lg4Mpl9qWpKgy6NzEkz/w0/keEHtOybmIl0ykgItBxEM5mYotS5PmqTpo+Rhg8FiOiWgwr8USxmKQkqLBCrw==",
      "cpu": [
        "arm64"
      ],
@@ -2391,9 +2461,9 @@
      }
    },
    "node_modules/@next/swc-darwin-x64": {
-      "version": "15.1.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.1.4.tgz",
-      "integrity": "sha512-7sgf5rM7Z81V9w48F02Zz6DgEJulavC0jadab4ZsJ+K2sxMNK0/BtF8J8J3CxnsJN3DGcIdC260wEKssKTukUw==",
+      "version": "15.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.1.6.tgz",
+      "integrity": "sha512-x1jGpbHbZoZ69nRuogGL2MYPLqohlhnT9OCU6E6QFewwup+z+M6r8oU47BTeJcWsF2sdBahp5cKiAcDbwwK/lg==",
      "cpu": [
        "x64"
      ],
@@ -2408,9 +2478,9 @@
      }
    },
    "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "15.1.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.1.4.tgz",
-      "integrity": "sha512-JaZlIMNaJenfd55kjaLWMfok+vWBlcRxqnRoZrhFQrhM1uAehP3R0+Aoe+bZOogqlZvAz53nY/k3ZyuKDtT2zQ==",
+      "version": "15.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.1.6.tgz",
+      "integrity": "sha512-jar9sFw0XewXsBzPf9runGzoivajeWJUc/JkfbLTC4it9EhU8v7tCRLH7l5Y1ReTMN6zKJO0kKAGqDk8YSO2bg==",
      "cpu": [
        "arm64"
      ],
@@ -2425,9 +2495,9 @@
      }
    },
    "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "15.1.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.1.4.tgz",
-      "integrity": "sha512-7EBBjNoyTO2ipMDgCiORpwwOf5tIueFntKjcN3NK+GAQD7OzFJe84p7a2eQUeWdpzZvhVXuAtIen8QcH71ZCOQ==",
+      "version": "15.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.1.6.tgz",
+      "integrity": "sha512-+n3u//bfsrIaZch4cgOJ3tXCTbSxz0s6brJtU3SzLOvkJlPQMJ+eHVRi6qM2kKKKLuMY+tcau8XD9CJ1OjeSQQ==",
      "cpu": [
        "arm64"
      ],
@@ -2442,9 +2512,9 @@
      }
    },
    "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "15.1.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.1.4.tgz",
-      "integrity": "sha512-9TGEgOycqZFuADyFqwmK/9g6S0FYZ3tphR4ebcmCwhL8Y12FW8pIBKJvSwV+UBjMkokstGNH+9F8F031JZKpHw==",
+      "version": "15.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.1.6.tgz",
+      "integrity": "sha512-SpuDEXixM3PycniL4iVCLyUyvcl6Lt0mtv3am08sucskpG0tYkW1KlRhTgj4LI5ehyxriVVcfdoxuuP8csi3kQ==",
      "cpu": [
        "x64"
      ],
@@ -2459,9 +2529,9 @@
      }
    },
    "node_modules/@next/swc-linux-x64-musl": {
-      "version": "15.1.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.1.4.tgz",
-      "integrity": "sha512-0578bLRVDJOh+LdIoKvgNDz77+Bd85c5JrFgnlbI1SM3WmEQvsjxTA8ATu9Z9FCiIS/AliVAW2DV/BDwpXbtiQ==",
+      "version": "15.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.1.6.tgz",
+      "integrity": "sha512-L4druWmdFSZIIRhF+G60API5sFB7suTbDRhYWSjiw0RbE+15igQvE2g2+S973pMGvwN3guw7cJUjA/TmbPWTHQ==",
      "cpu": [
        "x64"
      ],
@@ -2476,9 +2546,9 @@
      }
    },
    "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "15.1.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.1.4.tgz",
-      "integrity": "sha512-JgFCiV4libQavwII+kncMCl30st0JVxpPOtzWcAI2jtum4HjYaclobKhj+JsRu5tFqMtA5CJIa0MvYyuu9xjjQ==",
+      "version": "15.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.1.6.tgz",
+      "integrity": "sha512-s8w6EeqNmi6gdvM19tqKKWbCyOBvXFbndkGHl+c9YrzsLARRdCHsD9S1fMj8gsXm9v8vhC8s3N8rjuC/XrtkEg==",
      "cpu": [
        "arm64"
      ],
@@ -2493,9 +2563,9 @@
      }
    },
    "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "15.1.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.1.4.tgz",
-      "integrity": "sha512-xxsJy9wzq7FR5SqPCUqdgSXiNXrMuidgckBa8nH9HtjjxsilgcN6VgXF6tZ3uEWuVEadotQJI8/9EQ6guTC4Yw==",
+      "version": "15.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.1.6.tgz",
+      "integrity": "sha512-6xomMuu54FAFxttYr5PJbEfu96godcxBTRk1OhAvJq0/EnmFU/Ybiax30Snis4vdWZ9LGpf7Roy5fSs7v/5ROQ==",
      "cpu": [
        "x64"
      ],
@@ -16219,13 +16289,13 @@
      "dev": true
    },
    "node_modules/next": {
-      "version": "15.1.4",
-      "resolved": "https://registry.npmjs.org/next/-/next-15.1.4.tgz",
-      "integrity": "sha512-mTaq9dwaSuwwOrcu3ebjDYObekkxRnXpuVL21zotM8qE2W0HBOdVIdg2Li9QjMEZrj73LN96LcWcz62V19FjAg==",
+      "version": "15.1.6",
+      "resolved": "https://registry.npmjs.org/next/-/next-15.1.6.tgz",
+      "integrity": "sha512-Hch4wzbaX0vKQtalpXvUiw5sYivBy4cm5rzUKrBnUB/y436LGrvOUqYvlSeNVCWFO/770gDlltR9gqZH62ct4Q==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@next/env": "15.1.4",
+        "@next/env": "15.1.6",
        "@swc/counter": "0.1.3",
        "@swc/helpers": "0.5.15",
        "busboy": "1.6.0",
@@ -16240,14 +16310,14 @@
        "node": "^18.18.0 || ^19.8.0 || >= 20.0.0"
      },
      "optionalDependencies": {
-        "@next/swc-darwin-arm64": "15.1.4",
-        "@next/swc-darwin-x64": "15.1.4",
-        "@next/swc-linux-arm64-gnu": "15.1.4",
-        "@next/swc-linux-arm64-musl": "15.1.4",
-        "@next/swc-linux-x64-gnu": "15.1.4",
-        "@next/swc-linux-x64-musl": "15.1.4",
-        "@next/swc-win32-arm64-msvc": "15.1.4",
-        "@next/swc-win32-x64-msvc": "15.1.4",
+        "@next/swc-darwin-arm64": "15.1.6",
+        "@next/swc-darwin-x64": "15.1.6",
+        "@next/swc-linux-arm64-gnu": "15.1.6",
+        "@next/swc-linux-arm64-musl": "15.1.6",
+        "@next/swc-linux-x64-gnu": "15.1.6",
+        "@next/swc-linux-x64-musl": "15.1.6",
+        "@next/swc-win32-arm64-msvc": "15.1.6",
+        "@next/swc-win32-x64-msvc": "15.1.6",
        "sharp": "^0.33.5"
      },
      "peerDependencies": {
@@ -24104,6 +24174,15 @@
      "funding": {
        "url": "https://github.com/sponsors/sindresorhus"
      }
+    },
+    "node_modules/zod": {
+      "version": "3.24.1",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.1.tgz",
+      "integrity": "sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
    }
  }
 }
@@ -14,6 +14,7 @@
  "scripts": {
    "buildreact": "cd ./src/vs/workbench/contrib/void/browser/react/ && node build.js && cd ../../../../../../../",
    "watchreact": "cd ./src/vs/workbench/contrib/void/browser/react/ && node build.js --watch && cd ../../../../../../../",
+    "watchreactd": "deemon npm run watchreact",
    "test": "echo Please run any of the test scripts from the scripts folder.",
    "test-browser": "npx playwright install && node test/unit/browser/index.js",
    "test-browser-amd": "npx playwright install && node test/unit/browser/index.amd.js",
@@ -25,7 +26,7 @@
    "preinstall": "node build/npm/preinstall.js",
    "postinstall": "node build/npm/postinstall.js",
    "compile": "node ./node_modules/gulp/bin/gulp.js compile",
-    "watch": "npm-run-all -lp watch-client watch-extensions",
+    "watch": "npm-run-all -lp watchreact watch-client watch-extensions",
    "watch-amd": "npm-run-all -lp watch-client-amd watch-extensions",
    "watchd": "deemon npm run watch",
    "watch-webd": "deemon npm run watch-web",
@@ -78,9 +79,11 @@
  },
  "dependencies": {
    "@anthropic-ai/sdk": "^0.32.1",
+    "@floating-ui/react": "^0.27.3",
    "@google/generative-ai": "^0.21.0",
    "@microsoft/1ds-core-js": "^3.2.13",
    "@microsoft/1ds-post-js": "^3.2.13",
+    "@mistralai/mistralai": "^1.4.0",
    "@parcel/watcher": "2.1.0",
    "@rrweb/record": "^2.0.0-alpha.17",
    "@rrweb/types": "^2.0.0-alpha.17",
@@ -132,7 +135,8 @@
    "vscode-regexpp": "^3.1.0",
    "vscode-textmate": "9.1.0",
    "yauzl": "^3.0.0",
-    "yazl": "^2.4.3"
+    "yazl": "^2.4.3",
+    "zod": "^3.24.1"
  },
  "devDependencies": {
    "@playwright/test": "^1.46.1",
@@ -29,6 +29,7 @@
        "@xterm/headless": "^5.6.0-beta.64",
        "@xterm/xterm": "^5.6.0-beta.64",
        "cookie": "^0.4.0",
+        "debounced": "1.0.2",
        "http-proxy-agent": "^7.0.0",
        "https-proxy-agent": "^7.0.2",
        "jschardet": "3.1.3",
@@ -396,6 +397,12 @@
        "node": ">= 0.6"
      }
    },
+    "node_modules/debounced": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/debounced/-/debounced-1.0.2.tgz",
+      "integrity": "sha512-6GPv+l/OOtdb1DKNY70k5ubuJhVjtBjUnujC5vQAHHrMuvBpDXsTc91xEMTdeA3/v4swYHamtdB9XIN7DcKxpw==",
+      "license": "MIT"
+    },
    "node_modules/debug": {
      "version": "4.3.4",
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -26,6 +26,7 @@
    "cookie": "^0.4.0",
    "http-proxy-agent": "^7.0.0",
    "https-proxy-agent": "^7.0.2",
+    "debounced": "1.0.2",
    "jschardet": "3.1.3",
    "kerberos": "2.1.1",
    "minimist": "^1.2.6",
@@ -3,7 +3,7 @@
 *  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 { EventLLMMessageOnTextParams, EventLLMMessageOnErrorParams, EventLLMMessageOnFinalMessageParams, ServiceSendLLMMessageParams, MainSendLLMMessageParams, MainLLMMessageAbortParams, ServiceModelListParams, EventModelListOnSuccessParams, EventModelListOnErrorParams, MainModelListParams, OllamaModelResponse, OpenaiCompatibleModelResponse, } from './llmMessageTypes.js';
 import { IChannel } from '../../../base/parts/ipc/common/ipc.js';
 import { IMainProcessService } from '../../ipc/common/mainProcessService.js';
 import { InstantiationType, registerSingleton } from '../../instantiation/common/extensions.js';
@@ -96,30 +96,29 @@ export class LLMMessageService extends Disposable implements ILLMMessageService
 			onError({ message: 'Please add a Provider in Settings!', fullError: null })
 			return null
 		}
+
 		const { providerName, modelName } = modelSelection

-		const aiInstructions = this.voidSettingsService.state.globalSettings.aiInstructions
-		if (aiInstructions)
-			proxyParams.messages.unshift({ role: 'system', content: aiInstructions })
-
 		// add state for request id
-		const requestId_ = generateUuid();
-		this.onTextHooks_llm[requestId_] = onText
-		this.onFinalMessageHooks_llm[requestId_] = onFinalMessage
-		this.onErrorHooks_llm[requestId_] = onError
+		const requestId = generateUuid();
+		this.onTextHooks_llm[requestId] = onText
+		this.onFinalMessageHooks_llm[requestId] = onFinalMessage
+		this.onErrorHooks_llm[requestId] = onError

+		const { aiInstructions } = this.voidSettingsService.state.globalSettings
 		const { settingsOfProvider } = this.voidSettingsService.state

 		// params will be stripped of all its functions over the IPC channel
 		this.channel.call('sendLLMMessage', {
 			...proxyParams,
-			requestId: requestId_,
+			aiInstructions,
+			requestId,
 			providerName,
 			modelName,
 			settingsOfProvider,
-		} satisfies MainLLMMessageParams);
+		} satisfies MainSendLLMMessageParams);

-		return requestId_
+		return requestId
 	}


@@ -146,6 +145,7 @@ export class LLMMessageService extends Disposable implements ILLMMessageService
 		} satisfies MainModelListParams<OllamaModelResponse>)
 	}

+
 	openAICompatibleList = (params: ServiceModelListParams<OpenaiCompatibleModelResponse>) => {
 		const { onSuccess, onError, ...proxyParams } = params

@@ -3,7 +3,6 @@
 *  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'


@@ -30,66 +29,89 @@ export type LLMMessage = {
 	content: string;
 }

-export type ServiceSendLLMFeatureParams = {
-	useProviderFor: 'Ctrl+K';
-	range: IRange;
-} | {
-	useProviderFor: 'Ctrl+L';
-} | {
-	useProviderFor: 'Autocomplete';
-	range: IRange;
+export type _InternalLLMMessage = {
+	role: 'user' | 'assistant';
+	content: string;
 }

-// params to the true sendLLMMessage function
-export type LLMMMessageParams = {
-	onText: OnText;
-	onFinalMessage: OnFinalMessage;
-	onError: OnError;
-	abortRef: AbortRef;
+type _InternalOllamaFIMMessages = {
+	prefix: string;
+	suffix: string;
+	stopTokens: string[];
+}

+type SendLLMType = {
+	type: 'sendLLMMessage';
 	messages: LLMMessage[];
-
-	logging: {
-		loggingName: string,
-	};
-	providerName: ProviderName;
-	modelName: string;
-	settingsOfProvider: SettingsOfProvider;
+} | {
+	type: 'ollamaFIM';
+	messages: _InternalOllamaFIMMessages;
 }

+// service types
 export type ServiceSendLLMMessageParams = {
 	onText: OnText;
 	onFinalMessage: OnFinalMessage;
 	onError: OnError;
+	logging: { loggingName: string, };
+	useProviderFor: 'Ctrl+K' | 'Ctrl+L' | 'Autocomplete';
+} & SendLLMType
+
+// params to the true sendLLMMessage function
+export type SendLLMMessageParams = {
+	onText: OnText;
+	onFinalMessage: OnFinalMessage;
+	onError: OnError;
+	logging: { loggingName: string, };
+	abortRef: AbortRef;
+
+	aiInstructions: string;
+
+	providerName: ProviderName;
+	modelName: string;
+	settingsOfProvider: SettingsOfProvider;
+} & SendLLMType

-	messages: LLMMessage[];

-	logging: {
-		loggingName: string,
-	};
-} & ServiceSendLLMFeatureParams

 // can't send functions across a proxy, use listeners instead
 export type BlockedMainLLMMessageParams = 'onText' | 'onFinalMessage' | 'onError' | 'abortRef'
+export type MainSendLLMMessageParams = Omit<SendLLMMessageParams, BlockedMainLLMMessageParams> & { requestId: string } & SendLLMType

-export type MainLLMMessageParams = Omit<LLMMMessageParams, BlockedMainLLMMessageParams> & { requestId: string }
 export type MainLLMMessageAbortParams = { requestId: string }

 export type EventLLMMessageOnTextParams = Parameters<OnText>[0] & { requestId: string }
 export type EventLLMMessageOnFinalMessageParams = Parameters<OnFinalMessage>[0] & { requestId: string }
 export type EventLLMMessageOnErrorParams = Parameters<OnError>[0] & { requestId: string }

-export type _InternalSendLLMMessageFnType = (params: {
-	messages: LLMMessage[];
-	onText: OnText;
-	onFinalMessage: OnFinalMessage;
-	onError: OnError;
-	settingsOfProvider: SettingsOfProvider;
-	providerName: ProviderName;
-	modelName: string;

-	_setAborter: (aborter: () => void) => void;
-}) => void
+export type _InternalSendLLMMessageFnType = (
+	params: {
+		onText: OnText;
+		onFinalMessage: OnFinalMessage;
+		onError: OnError;
+		providerName: ProviderName;
+		settingsOfProvider: SettingsOfProvider;
+		modelName: string;
+		_setAborter: (aborter: () => void) => void;
+
+		messages: _InternalLLMMessage[];
+	}
+) => void
+
+export type _InternalOllamaFIMMessageFnType = (
+	params: {
+		onText: OnText;
+		onFinalMessage: OnFinalMessage;
+		onError: OnError;
+		providerName: ProviderName;
+		settingsOfProvider: SettingsOfProvider;
+		modelName: string;
+		_setAborter: (aborter: () => void) => void;
+
+		messages: _InternalOllamaFIMMessages;
+	}
+) => void

 // service -> main -> internal -> event (back to main)
 // (browser)
@@ -102,13 +124,6 @@ export type _InternalSendLLMMessageFnType = (params: {



-
-
-
-
-
-
-
 // These are from 'ollama' SDK
 interface OllamaModelDetails {
 	parent_model: string;
@@ -81,7 +81,7 @@ let _computeModelOptions = (settingsOfProvider: SettingsOfProvider) => {
 const defaultState = () => {
 	const d: VoidSettingsState = {
 		settingsOfProvider: deepClone(defaultSettingsOfProvider),
-		modelSelectionOfFeature: { 'Ctrl+L': null, 'Ctrl+K': null, 'Autocomplete': null },
+		modelSelectionOfFeature: { 'Ctrl+L': null, 'Ctrl+K': null, 'Autocomplete': null, 'FastApply': null },
 		globalSettings: deepClone(defaultGlobalSettings),
 		_modelOptions: _computeModelOptions(defaultSettingsOfProvider), // computed
 	}
@@ -115,8 +115,37 @@ class VoidSettingsService extends Disposable implements IVoidSettingsService {
 		this.waitForInitState = new Promise((res, rej) => resolver = res)

 		// read and update the actual state immediately
-		this._readState().then(s => {
-			this.state = s
+		this._readState().then(readS => {
+
+			// the stored data structure might be outdated, so we need to update it here (can do a more general solution later when we need to)
+			readS = {
+				...readS,
+				settingsOfProvider: {
+					// A HACK BECAUSE WE ADDED DEEPSEEK (did not exist before, comes before readS)
+					...{ deepseek: defaultSettingsOfProvider.deepseek },
+
+					// A HACK BECAUSE WE ADDED MISTRAL (did not exist before, comes before readS)
+					...{ mistral: defaultSettingsOfProvider.mistral },
+
+					...readS.settingsOfProvider,
+
+					// A HACK BECAUSE WE ADDED NEW GEMINI MODELS (existed before, comes after readS)
+					gemini: {
+						...readS.settingsOfProvider.gemini,
+						models: [
+							...readS.settingsOfProvider.gemini.models,
+							...defaultSettingsOfProvider.gemini.models.filter(m => /* if cant find the model in readS (yes this is O(n^2), very small) */ !readS.settingsOfProvider.gemini.models.find(m2 => m2.modelName === m.modelName))
+						]
+					}
+				},
+				modelSelectionOfFeature: {
+					// A HACK BECAUSE WE ADDED FastApply
+					...{ 'FastApply': null },
+					...readS.modelSelectionOfFeature,
+				}
+			}
+
+			this.state = readS
 			resolver()
 			this._onDidChangeState.fire('all')
 		})
@@ -77,13 +77,19 @@ export const defaultOpenAIModels = modelInfoOfDefaultNames([
 	// 'gpt-3.5-turbo-1106',
 ])

+// https://platform.openai.com/docs/models/gp
+export const defaultDeepseekModels = modelInfoOfDefaultNames([
+	'deepseek-chat',
+	'deepseek-reasoner',
+])


 // https://console.groq.com/docs/models
 export const defaultGroqModels = modelInfoOfDefaultNames([
-	"mixtral-8x7b-32768",
-	"llama2-70b-4096",
-	"gemma-7b-it"
+	"distil-whisper-large-v3-en",
+	"llama-3.3-70b-versatile",
+	"llama-3.1-8b-instant",
+	"gemma2-9b-it"
 ])


@@ -91,10 +97,21 @@ export const defaultGeminiModels = modelInfoOfDefaultNames([
 	'gemini-1.5-flash',
 	'gemini-1.5-pro',
 	'gemini-1.5-flash-8b',
-	'gemini-1.0-pro'
+	'gemini-2.0-flash-exp',
+	'gemini-2.0-flash-thinking-exp-1219',
+	'learnlm-1.5-pro-experimental'
 ])

-
+export const defaultMistralModels = modelInfoOfDefaultNames([
+	"codestral-latest",
+	"open-codestral-mamba",
+	"open-mistral-nemo",
+	"mistral-large-latest",
+	"pixtral-large-latest",
+	"ministral-3b-latest",
+	"ministral-8b-latest",
+	"mistral-small-latest",
+])

 // export const parseMaxTokensStr = (maxTokensStr: string) => {
 // 	// parse the string but only if the full string is a valid number, eg parseInt('100abc') should return NaN
@@ -130,6 +147,9 @@ export const defaultProviderSettings = {
 	openAI: {
 		apiKey: '',
 	},
+	deepseek: {
+		apiKey: '',
+	},
 	ollama: {
 		endpoint: 'http://127.0.0.1:11434',
 	},
@@ -144,6 +164,9 @@ export const defaultProviderSettings = {
 		apiKey: '',
 	},
 	groq: {
+		apiKey: '',
+	},
+	mistral: {
 		apiKey: ''
 	}
 } as const
@@ -198,6 +221,11 @@ export const displayInfoOfProviderName = (providerName: ProviderName): DisplayIn
 			title: 'OpenAI',
 		}
 	}
+	else if (providerName === 'deepseek') {
+		return {
+			title: 'DeepSeek',
+		}
+	}
 	else if (providerName === 'openRouter') {
 		return {
 			title: 'OpenRouter',
@@ -224,6 +252,11 @@ export const displayInfoOfProviderName = (providerName: ProviderName): DisplayIn
 			title: 'Groq',
 		}
 	}
+	else if (providerName === 'mistral') {
+		return {
+			title: 'Mistral',
+		}
+	}

 	throw new Error(`descOfProviderName: Unknown provider name: "${providerName}"`)
 }
@@ -237,21 +270,28 @@ export const displayInfoOfSettingName = (providerName: ProviderName, settingName
 	if (settingName === 'apiKey') {
 		return {
 			title: 'API Key',
+
+			// **Please follow this convention**:
+			// The word "key..." here is a placeholder for the hash. For example, sk-ant-key... means the key will look like sk-ant-abcdefg123...
 			placeholder: providerName === 'anthropic' ? 'sk-ant-key...' : // sk-ant-api03-key
 				providerName === 'openAI' ? 'sk-proj-key...' :
-					providerName === 'openRouter' ? 'sk-or-key...' : // sk-or-v1-key
-						providerName === 'gemini' ? 'key...' :
-							providerName === 'groq' ? 'gsk_key...' :
-								providerName === 'openAICompatible' ? 'sk-key...' :
-									'(never)',
+					providerName === 'deepseek' ? 'sk-key...' :
+						providerName === 'openRouter' ? 'sk-or-key...' : // sk-or-v1-key
+							providerName === 'gemini' ? 'key...' :
+								providerName === 'groq' ? 'gsk_key...' :
+									providerName === 'mistral' ? 'key...' :
+										providerName === 'openAICompatible' ? 'sk-key...' :
+											'',

 			subTextMd: providerName === 'anthropic' ? 'Get your [API Key here](https://console.anthropic.com/settings/keys).' :
 				providerName === 'openAI' ? 'Get your [API Key here](https://platform.openai.com/api-keys).' :
-					providerName === 'openRouter' ? 'Get your [API Key here](https://openrouter.ai/settings/keys).' :
-						providerName === 'gemini' ? 'Get your [API Key here](https://aistudio.google.com/apikey).' :
-							providerName === 'groq' ? 'Get your [API Key here](https://console.groq.com/keys).' :
-								providerName === 'openAICompatible' ? 'Add any OpenAI-Compatible endpoint.' :
-									undefined,
+					providerName === 'deepseek' ? 'Get your [API Key here](https://platform.deepseek.com/api_keys).' :
+						providerName === 'openRouter' ? 'Get your [API Key here](https://openrouter.ai/settings/keys).' :
+							providerName === 'gemini' ? 'Get your [API Key here](https://aistudio.google.com/apikey).' :
+								providerName === 'groq' ? 'Get your [API Key here](https://console.groq.com/keys).' :
+									providerName === 'mistral' ? 'Get your [API Key here](https://console.mistral.ai/api-keys/).' :
+										providerName === 'openAICompatible' ? undefined :
+											'',
 		}
 	}
 	else if (settingName === 'endpoint') {
@@ -293,6 +333,8 @@ const defaultCustomSettings: Record<CustomSettingName, undefined> = {
 	endpoint: undefined,
 }

+
+
 export const voidInitModelOptions = {
 	anthropic: {
 		models: defaultAnthropicModels,
@@ -300,6 +342,9 @@ export const voidInitModelOptions = {
 	openAI: {
 		models: defaultOpenAIModels,
 	},
+	deepseek: {
+		models: defaultDeepseekModels,
+	},
 	ollama: {
 		models: [],
 	},
@@ -315,22 +360,31 @@ export const voidInitModelOptions = {
 	groq: {
 		models: defaultGroqModels,
 	},
+	mistral: {
+		models: defaultMistralModels,
+	}
 }


 // used when waiting and for a type reference
 export const defaultSettingsOfProvider: SettingsOfProvider = {
 	anthropic: {
-		_enabled: undefined,
 		...defaultCustomSettings,
 		...defaultProviderSettings.anthropic,
 		...voidInitModelOptions.anthropic,
+		_enabled: undefined,
 	},
 	openAI: {
-		_enabled: undefined,
 		...defaultCustomSettings,
 		...defaultProviderSettings.openAI,
 		...voidInitModelOptions.openAI,
+		_enabled: undefined,
+	},
+	deepseek: {
+		...defaultCustomSettings,
+		...defaultProviderSettings.deepseek,
+		...voidInitModelOptions.deepseek,
+		_enabled: undefined,
 	},
 	gemini: {
 		...defaultCustomSettings,
@@ -362,6 +416,12 @@ export const defaultSettingsOfProvider: SettingsOfProvider = {
 		...voidInitModelOptions.openAICompatible,
 		_enabled: undefined,
 	},
+	mistral: {
+		...defaultCustomSettings,
+		...defaultProviderSettings.mistral,
+		...voidInitModelOptions.mistral,
+		_enabled: undefined,
+	}
 }


@@ -372,14 +432,22 @@ export const modelSelectionsEqual = (m1: ModelSelection, m2: ModelSelection) =>
 }

 // this is a state
-export type ModelSelectionOfFeature = {
-	'Ctrl+L': ModelSelection | null,
-	'Ctrl+K': ModelSelection | null,
-	'Autocomplete': ModelSelection | null,
-}
+export const featureNames = ['Ctrl+L', 'Ctrl+K', 'Autocomplete', 'FastApply'] as const
+export type ModelSelectionOfFeature = Record<(typeof featureNames)[number], ModelSelection | null>
 export type FeatureName = keyof ModelSelectionOfFeature
-export const featureNames = ['Ctrl+L', 'Ctrl+K', 'Autocomplete'] as const

+export const displayInfoOfFeatureName = (featureName: FeatureName) => {
+	if (featureName === 'Autocomplete')
+		return 'Autocomplete'
+	else if (featureName === 'Ctrl+K')
+		return 'Quick Edit'
+	else if (featureName === 'Ctrl+L')
+		return 'Sidebar Chat'
+	else if (featureName === 'FastApply')
+		return 'Fast Apply'
+	else
+		throw new Error(`Feature Name ${featureName} not allowed`)
+}



@@ -33,7 +33,6 @@ export class VoidUpdateService implements IVoidUpdateService {
 	}


-
 	// anything transmitted over a channel must be async even if it looks like it doesn't have to be
 	check: IVoidUpdateService['check'] = async () => {
 		const res = await this.voidUpdateService.check()
@@ -7,11 +7,6 @@ import Anthropic from '@anthropic-ai/sdk';
 import { _InternalSendLLMMessageFnType } from '../../common/llmMessageTypes.js';
 import { anthropicMaxPossibleTokens } from '../../common/voidSettingsTypes.js';

-// Anthropic
-type LLMMessageAnthropic = {
-	role: 'user' | 'assistant';
-	content: string;
-}
 export const sendAnthropicMsg: _InternalSendLLMMessageFnType = ({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter }) => {

 	const thisConfig = settingsOfProvider.anthropic
@@ -24,20 +19,9 @@ export const sendAnthropicMsg: _InternalSendLLMMessageFnType = ({ messages, onTe

 	const anthropic = new Anthropic({ apiKey: thisConfig.apiKey, dangerouslyAllowBrowser: true });

-	// find system messages and concatenate them
-	const systemMessage = messages
-		.filter(msg => msg.role === 'system')
-		.map(msg => msg.content)
-		.join('\n');
-
-	// remove system messages for Anthropic
-	const anthropicMessages = messages.filter(msg => msg.role !== 'system') as LLMMessageAnthropic[]
-
-
-
 	const stream = anthropic.messages.stream({
-		system: systemMessage,
-		messages: anthropicMessages,
+		// system: systemMessage,
+		messages: messages,
 		model: modelName,
 		max_tokens: maxTokens,
 	});
@@ -3,7 +3,7 @@
 *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
 *--------------------------------------------------------------------------------------*/

-import { Content, GoogleGenerativeAI, GoogleGenerativeAIFetchError } from '@google/generative-ai';
+import { Content, GoogleGenerativeAI } from '@google/generative-ai';
 import { _InternalSendLLMMessageFnType } from '../../common/llmMessageTypes.js';

 // Gemini
@@ -16,22 +16,17 @@ export const sendGeminiMsg: _InternalSendLLMMessageFnType = async ({ messages, o
 	const genAI = new GoogleGenerativeAI(thisConfig.apiKey);
 	const model = genAI.getGenerativeModel({ model: modelName });

-	// remove system messages that get sent to Gemini
-	// str of all system messages
-	const systemMessage = messages
-		.filter(msg => msg.role === 'system')
-		.map(msg => msg.content)
-		.join('\n');
-
 	// Convert messages to Gemini format
 	const geminiMessages: Content[] = messages
-		.filter(msg => msg.role !== 'system')
 		.map((msg, i) => ({
 			parts: [{ text: msg.content }],
 			role: msg.role === 'assistant' ? 'model' : 'user'
 		}))

-	model.generateContentStream({ contents: geminiMessages, systemInstruction: systemMessage, })
+	model.generateContentStream({
+		// systemInstruction: systemMessage,
+		contents: geminiMessages,
+	})
 		.then(async response => {
 			_setAborter(() => response.stream.return(fullText))

@@ -43,11 +38,6 @@ export const sendGeminiMsg: _InternalSendLLMMessageFnType = async ({ messages, o
 			onFinalMessage({ fullText });
 		})
 		.catch((error) => {
-			if (error instanceof GoogleGenerativeAIFetchError && error.status === 400) {
-				onError({ message: 'Invalid API key.', fullError: null });
-			}
-			else {
-				onError({ message: error + '', fullError: error });
-			}
+			onError({ message: error + '', fullError: error })
 		})
 }
@@ -22,7 +22,7 @@ export const sendGroqMsg: _InternalSendLLMMessageFnType = async ({ messages, onT
 			messages: messages,
 			model: modelName,
 			stream: true,
-			temperature: 0.7,
+			// temperature: 0.7,
 			// max_tokens: parseMaxTokensStr(thisConfig.maxTokens),
 		})
 		.then(async response => {
@@ -30,10 +30,8 @@ export const sendGroqMsg: _InternalSendLLMMessageFnType = async ({ messages, onT
 			// when receive text
 			for await (const chunk of response) {
 				const newText = chunk.choices[0]?.delta?.content || '';
-				if (newText) {
-					fullText += newText;
-					onText({ newText, fullText });
-				}
+				fullText += newText;
+				onText({ newText, fullText });
 			}

 			onFinalMessage({ fullText });
@@ -0,0 +1,46 @@
+/*--------------------------------------------------------------------------------------
+ *  Copyright 2025 Glass Devtools, Inc. All rights reserved.
+ *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
+ *--------------------------------------------------------------------------------------*/
+
+import { Mistral } from '@mistralai/mistralai';
+import { _InternalSendLLMMessageFnType } from '../../common/llmMessageTypes.js';
+
+// Mistral
+export const sendMistralMsg: _InternalSendLLMMessageFnType = async ({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter }) => {
+	let fullText = '';
+
+	const thisConfig = settingsOfProvider.mistral;
+
+	const mistral = new Mistral({
+		apiKey: thisConfig.apiKey,
+	})
+
+	await mistral.chat
+		.stream({
+			messages: messages,
+			model: modelName,
+			stream: true,
+			// temperature: 0.7,
+			// maxTokens: 2048,
+		})
+		.then(async response => {
+			// Mistral has a really nonstandard API - no interrupt and weird stream types
+			_setAborter(() => { console.log('Mistral does not support interrupts! Further messages will just be ignored.') });
+			// when receive text
+			for await (const chunk of response) {
+				const c = chunk.data.choices[0].delta.content || ''
+				const newText = (
+					typeof c === 'string' ? c
+						: c?.map(c => c.type === 'text' ? c.text : c.type).join('\n')
+				)
+				fullText += newText;
+				onText({ newText, fullText });
+			}
+
+			onFinalMessage({ fullText });
+		})
+		.catch(error => {
+			onError({ message: error + '', fullError: error });
+		})
+}
@@ -4,7 +4,7 @@
 *--------------------------------------------------------------------------------------*/

 import { Ollama } from 'ollama';
-import { _InternalModelListFnType, _InternalSendLLMMessageFnType, OllamaModelResponse } from '../../common/llmMessageTypes.js';
+import { _InternalModelListFnType, _InternalOllamaFIMMessageFnType, _InternalSendLLMMessageFnType, OllamaModelResponse } from '../../common/llmMessageTypes.js';
 import { defaultProviderSettings } from '../../common/voidSettingsTypes.js';

 export const ollamaList: _InternalModelListFnType<OllamaModelResponse> = async ({ onSuccess: onSuccess_, onError: onError_, settingsOfProvider }) => {
@@ -38,6 +38,44 @@ export const ollamaList: _InternalModelListFnType<OllamaModelResponse> = async (
 }


+export const sendOllamaFIM: _InternalOllamaFIMMessageFnType = ({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter }) => {
+
+	const thisConfig = settingsOfProvider.ollama
+	// if endpoint is empty, normally ollama will send to 11434, but we want it to fail - the user should type it in
+	if (!thisConfig.endpoint) throw new Error(`Ollama Endpoint was empty (please enter ${defaultProviderSettings.ollama.endpoint} if you want the default).`)
+
+	let fullText = ''
+
+	const ollama = new Ollama({ host: thisConfig.endpoint })
+
+	ollama.generate({
+		model: modelName,
+		prompt: messages.prefix,
+		suffix: messages.suffix,
+		options: {
+			stop: messages.stopTokens,
+		},
+		raw: true,
+		stream: true,
+		// options: { num_predict: parseMaxTokensStr(thisConfig.maxTokens) } // this is max_tokens
+	})
+		.then(async stream => {
+			_setAborter(() => stream.abort())
+			// iterate through the stream
+			for await (const chunk of stream) {
+				const newText = chunk.response;
+				fullText += newText;
+				onText({ newText, fullText });
+			}
+			onFinalMessage({ fullText });
+		})
+		// when error/fail
+		.catch((error) => {
+			onError({ message: error + '', fullError: error })
+		})
+};
+
+
 // Ollama
 export const sendOllamaMsg: _InternalSendLLMMessageFnType = ({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter }) => {

@@ -68,14 +106,6 @@ export const sendOllamaMsg: _InternalSendLLMMessageFnType = ({ messages, onText,
 		})
 		// when error/fail
 		.catch((error) => {
-			// if (typeof error === 'object') {
-			// 	const e = error.error as ErrorResponse['error']
-			// 	if (e) {
-			// 		const name = error.name ?? 'Error'
-			// 		onError({ error: `${name}: ${e}` })
-			// 		return;
-			// 	}
-			// }
 			onError({ message: error + '', fullError: error })
 		})

@@ -69,6 +69,14 @@ export const sendOpenAIMsg: _InternalSendLLMMessageFnType = ({ messages, onText,
 		});
 		options = { model: modelName, messages: messages, stream: true, /*max_completion_tokens: parseMaxTokensStr(thisConfig.maxTokens)*/ }
 	}
+	else if (providerName === 'deepseek') {
+		const thisConfig = settingsOfProvider.deepseek
+		openai = new OpenAI({
+			baseURL: 'https://api.deepseek.com/v1', apiKey: thisConfig.apiKey, dangerouslyAllowBrowser: true,
+		});
+		options = { model: modelName, messages: messages, stream: true, /*max_completion_tokens: parseMaxTokensStr(thisConfig.maxTokens)*/ }
+
+	}
 	else if (providerName === 'openAICompatible') {
 		const thisConfig = settingsOfProvider.openAICompatible
 		openai = new OpenAI({ baseURL: thisConfig.endpoint, apiKey: thisConfig.apiKey, dangerouslyAllowBrowser: true })
@@ -79,7 +87,6 @@ export const sendOpenAIMsg: _InternalSendLLMMessageFnType = ({ messages, onText,
 		throw new Error(`providerName was invalid: ${providerName}`)
 	}

-	openai.models.list()
 	openai.chat.completions
 		.create(options)
 		.then(async response => {
@@ -98,7 +105,7 @@ export const sendOpenAIMsg: _InternalSendLLMMessageFnType = ({ messages, onText,
 				onError({ message: 'Invalid API key.', fullError: error });
 			}
 			else {
-				onError({ message: error, fullError: error });
+				onError({ message: error + '', fullError: error });
 			}
 		})

@@ -3,17 +3,55 @@
 *  Licensed under the Apache License, Version 2.0. See LICENSE.txt for more information.
 *--------------------------------------------------------------------------------------*/

-import { LLMMMessageParams, OnText, OnFinalMessage, OnError } from '../../common/llmMessageTypes.js';
+import { SendLLMMessageParams, OnText, OnFinalMessage, OnError, LLMMessage, _InternalLLMMessage } from '../../common/llmMessageTypes.js';
 import { IMetricsService } from '../../common/metricsService.js';

 import { sendAnthropicMsg } from './anthropic.js';
-import { sendOllamaMsg } from './ollama.js';
+import { sendOllamaFIM, sendOllamaMsg } from './ollama.js';
 import { sendOpenAIMsg } from './openai.js';
 import { sendGeminiMsg } from './gemini.js';
 import { sendGroqMsg } from './groq.js';
+import { sendMistralMsg } from './mistral.js';
+
+
+const cleanMessages = (messages: LLMMessage[]): _InternalLLMMessage[] => {
+	// trim message content (Anthropic and other providers give an error if there is trailing whitespace)
+	messages = messages.map(m => ({ ...m, content: m.content.trim() }))
+
+	// find system messages and concatenate them
+	const systemMessage = messages
+		.filter(msg => msg.role === 'system')
+		.map(msg => msg.content)
+		.join('\n') || undefined;
+
+	// remove all system messages
+	const noSystemMessages = messages
+		.filter(msg => msg.role !== 'system') as _InternalLLMMessage[]
+
+	// add system mesasges to first message (should be a user message)
+	if (systemMessage && (noSystemMessages.length !== 0)) {
+		const newFirstMessage = {
+			role: noSystemMessages[0].role,
+			content: (''
+				+ '<SYSTEM_MESSAGE>\n'
+				+ systemMessage
+				+ '\n'
+				+ '</SYSTEM_MESSAGE>\n'
+				+ noSystemMessages[0].content
+			)
+		}
+		noSystemMessages.splice(0, 1) // delete first message
+		noSystemMessages.unshift(newFirstMessage) // add new first message
+	}
+
+	return noSystemMessages
+}
+

 export const sendLLMMessage = ({
-	messages,
+	type,
+	aiInstructions,
+	messages: messages_,
 	onText: onText_,
 	onFinalMessage: onFinalMessage_,
 	onError: onError_,
@@ -22,21 +60,29 @@ export const sendLLMMessage = ({
 	settingsOfProvider,
 	providerName,
 	modelName,
-}: LLMMMessageParams,
+}: SendLLMMessageParams,

 	metricsService: IMetricsService
 ) => {
+	// messages.unshift({ role: 'system', content: aiInstructions })

-	// trim message content (Anthropic and other providers give an error if there is trailing whitespace)
-	messages = messages.map(m => ({ ...m, content: m.content.trim() }))
+	const messagesArr = type === 'sendLLMMessage' ? cleanMessages(messages_) : []

 	// only captures number of messages and message "shape", no actual code, instructions, prompts, etc
-	const captureChatEvent = (eventId: string, extras?: object) => {
+	const captureLLMEvent = (eventId: string, extras?: object) => {
 		metricsService.capture(eventId, {
 			providerName,
 			modelName,
-			numMessages: messages?.length,
-			messagesShape: messages?.map(msg => ({ role: msg.role, length: msg.content.length })),
+			...type === 'sendLLMMessage' ? {
+				numMessages: messagesArr?.length,
+				messagesShape: messagesArr?.map(msg => ({ role: msg.role, length: msg.content.length })),
+				origNumMessages: messages_?.length,
+				origMessagesShape: messages_?.map(msg => ({ role: msg.role, length: msg.content.length })),
+
+			} : type === 'ollamaFIM' ? {
+
+			} : {},
+
 			...extras,
 		})
 	}
@@ -55,45 +101,52 @@ export const sendLLMMessage = ({

 	const onFinalMessage: OnFinalMessage = ({ fullText }) => {
 		if (_didAbort) return
-		captureChatEvent(`${loggingName} - Received Full Message`, { messageLength: fullText.length, duration: new Date().getMilliseconds() - submit_time.getMilliseconds() })
+		captureLLMEvent(`${loggingName} - Received Full Message`, { messageLength: fullText.length, duration: new Date().getMilliseconds() - submit_time.getMilliseconds() })
 		onFinalMessage_({ fullText })
 	}

 	const onError: OnError = ({ message: error, fullError }) => {
 		if (_didAbort) return
 		console.error('sendLLMMessage onError:', error)
-		captureChatEvent(`${loggingName} - Error`, { error })
+		captureLLMEvent(`${loggingName} - Error`, { error })
 		onError_({ message: error, fullError })
 	}

 	const onAbort = () => {
-		captureChatEvent(`${loggingName} - Abort`, { messageLengthSoFar: _fullTextSoFar.length })
+		captureLLMEvent(`${loggingName} - Abort`, { messageLengthSoFar: _fullTextSoFar.length })
 		try { _aborter?.() } // aborter sometimes automatically throws an error
 		catch (e) { }
 		_didAbort = true
 	}
 	abortRef_.current = onAbort

-	captureChatEvent(`${loggingName} - Sending Message`, { messageLength: messages[messages.length - 1]?.content.length })
+	captureLLMEvent(`${loggingName} - Sending Message`, { messageLength: messagesArr[messagesArr.length - 1]?.content.length })

 	try {
 		switch (providerName) {
 			case 'anthropic':
-				sendAnthropicMsg({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName });
+				sendAnthropicMsg({ messages: messagesArr, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName });
 				break;
 			case 'openAI':
 			case 'openRouter':
+			case 'deepseek':
 			case 'openAICompatible':
-				sendOpenAIMsg({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName });
+				sendOpenAIMsg({ messages: messagesArr, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName });
 				break;
 			case 'gemini':
-				sendGeminiMsg({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName });
+				sendGeminiMsg({ messages: messagesArr, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName });
 				break;
 			case 'ollama':
-				sendOllamaMsg({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName });
+				if (type === 'ollamaFIM')
+					sendOllamaFIM({ messages: messages_, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName })
+				else
+					sendOllamaMsg({ messages: messagesArr, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName });
 				break;
 			case 'groq':
-				sendGroqMsg({ messages, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName });
+				sendGroqMsg({ messages: messagesArr, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName });
+				break;
+			case 'mistral':
+				sendMistralMsg({ messages: messagesArr, onText, onFinalMessage, onError, settingsOfProvider, modelName, _setAborter, providerName });
 				break;
 			default:
 				onError({ message: `Error: Void provider was "${providerName}", which is not recognized.`, fullError: null })
@@ -8,7 +8,7 @@

 import { IServerChannel } from '../../../base/parts/ipc/common/ipc.js';
 import { Emitter, Event } from '../../../base/common/event.js';
-import { EventLLMMessageOnTextParams, EventLLMMessageOnErrorParams, EventLLMMessageOnFinalMessageParams, MainLLMMessageParams, AbortRef, LLMMMessageParams, MainLLMMessageAbortParams, MainModelListParams, ModelListParams, EventModelListOnSuccessParams, EventModelListOnErrorParams, OllamaModelResponse, OpenaiCompatibleModelResponse, } from '../common/llmMessageTypes.js';
+import { EventLLMMessageOnTextParams, EventLLMMessageOnErrorParams, EventLLMMessageOnFinalMessageParams, MainSendLLMMessageParams, AbortRef, SendLLMMessageParams, MainLLMMessageAbortParams, MainModelListParams, ModelListParams, EventModelListOnSuccessParams, EventModelListOnErrorParams, OllamaModelResponse, OpenaiCompatibleModelResponse, } from '../common/llmMessageTypes.js';
 import { sendLLMMessage } from './llmMessage/sendLLMMessage.js'
 import { IMetricsService } from '../common/metricsService.js';
 import { ollamaList } from './llmMessage/ollama.js';
@@ -91,13 +91,13 @@ export class LLMMessageChannel implements IServerChannel {
 	}

 	// the only place sendLLMMessage is actually called
-	private async _callSendLLMMessage(params: MainLLMMessageParams) {
+	private async _callSendLLMMessage(params: MainSendLLMMessageParams) {
 		const { requestId } = params;

 		if (!(requestId in this._abortRefOfRequestId_llm))
 			this._abortRefOfRequestId_llm[requestId] = { current: null }

-		const mainThreadParams: LLMMMessageParams = {
+		const mainThreadParams: SendLLMMessageParams = {
 			...params,
 			onText: ({ newText, fullText }) => { this._onText_llm.fire({ requestId, newText, fullText }); },
 			onFinalMessage: ({ fullText }) => { this._onFinalMessage_llm.fire({ requestId, fullText }); },
@@ -9,84 +9,123 @@ import { generateUuid } from '../../../base/common/uuid.js';
 import { IEnvironmentMainService } from '../../environment/electron-main/environmentMainService.js';

 import { IProductService } from '../../product/common/productService.js';
-import { IStorageMainService } from '../../storage/electron-main/storageMainService.js';
+import { StorageScope, StorageTarget } from '../../storage/common/storage.js';
+import { IApplicationStorageMainService } from '../../storage/electron-main/storageMainService.js';

 import { IMetricsService } from '../common/metricsService.js';
 import { PostHog } from 'posthog-node'


 const os = isWindows ? 'windows' : isMacintosh ? 'mac' : isLinux ? 'linux' : null
+const _getOSInfo = () => {
+	try {
+		const { platform, arch } = process // see platform.ts
+		return { platform, arch }
+	}
+	catch (e) {
+		return { osInfo: { platform: '??', arch: '??' } }
+	}
+}
+const osInfo = _getOSInfo()

-const VOID_MACHINE_STORAGE_KEY = 'void.machineId'
+// we'd like to use devDeviceId on telemetryService, but that gets sanitized by the time it gets here as 'someValue.devDeviceId'

 export class MetricsMainService extends Disposable implements IMetricsService {
 	_serviceBrand: undefined;

 	private readonly client: PostHog

-	private readonly _initProperties: object
+	private _initProperties: object = {}


-	// TODO we should eventually identify people based on email
-	private get machineId() {
-		const currVal = this._storageService.applicationStorage.get(VOID_MACHINE_STORAGE_KEY)
+	// helper - looks like this is stored in a .vscdb file in ~/Library/Application Support/Void
+	private _memoStorage(key: string, target: StorageTarget, setValIfNotExist?: string) {
+		const currVal = this._appStorage.get(key, StorageScope.APPLICATION)
 		if (currVal !== undefined) return currVal
-		const newVal = generateUuid()
-		this._storageService.applicationStorage.set(VOID_MACHINE_STORAGE_KEY, newVal)
+		const newVal = setValIfNotExist ?? generateUuid()
+		this._appStorage.store(key, newVal, StorageScope.APPLICATION, target)
 		return newVal
 	}


+	// this is old, eventually we can just delete this since all the keys will have been transferred over
+	// returns 'NULL' or the old key
+	private get oldId() {
+		// check new storage key first
+		const newKey = 'void.app.oldMachineId'
+		const newOldId = this._appStorage.get(newKey, StorageScope.APPLICATION)
+		if (newOldId) return newOldId
+
+		// put old key into new key if didn't already
+		const oldValue = this._appStorage.get('void.machineId', StorageScope.APPLICATION) ?? 'NULL' // the old way of getting the key
+		this._appStorage.store(newKey, oldValue, StorageScope.APPLICATION, StorageTarget.MACHINE)
+		return oldValue
+
+		// in a few weeks we can replace above with this
+		// private get oldId() {
+		// 	return this._memoStorage('void.app.oldMachineId', StorageTarget.MACHINE, 'NULL')
+		// }
+	}
+
+
+	// the main id
+	private get distinctId() {
+		const oldId = this.oldId
+		const setValIfNotExist = oldId === 'NULL' ? undefined : oldId
+		return this._memoStorage('void.app.machineId', StorageTarget.MACHINE, setValIfNotExist)
+	}
+
+	// just to see if there are ever multiple machineIDs per userID (instead of this, we should just track by the user's email)
+	private get userId() {
+		return this._memoStorage('void.app.userMachineId', StorageTarget.USER)
+	}
+
 	constructor(
 		@IProductService private readonly _productService: IProductService,
-		@IStorageMainService private readonly _storageService: IStorageMainService,
 		@IEnvironmentMainService private readonly _envMainService: IEnvironmentMainService,
+		@IApplicationStorageMainService private readonly _appStorage: IApplicationStorageMainService,
 	) {
 		super()
 		this.client = new PostHog('phc_UanIdujHiLp55BkUTjB1AuBXcasVkdqRwgnwRlWESH2', {
 			host: 'https://us.i.posthog.com',
 		})

-		// we'd like to use devDeviceId on telemetryService, but that gets sanitized by the time it gets here as 'someValue.devDeviceId'
+		this.initialize() // async
+	}
+
+	async initialize() {
+		// very important to await whenReady!
+		await this._appStorage.whenReady

 		const { commit, version, quality } = this._productService

 		const isDevMode = !this._envMainService.isBuilt // found in abstractUpdateService.ts

-
 		// custom properties we identify
 		this._initProperties = {
 			commit,
-			version,
+			vscodeVersion: version,
 			os,
 			quality,
-			distinctId: this.machineId,
+			distinctId: this.distinctId,
+			distinctIdUser: this.userId,
+			oldId: this.oldId,
 			isDevMode,
-			...this._getOSInfo(),
+			...osInfo,
 		}

 		const identifyMessage = {
-			distinctId: this.machineId,
+			distinctId: this.distinctId,
 			properties: this._initProperties,
 		}
 		this.client.identify(identifyMessage)

 		console.log('Void posthog metrics info:', JSON.stringify(identifyMessage, null, 2))
-
 	}

-	_getOSInfo() {
-		try {
-			const { platform, arch } = process // see platform.ts
-			return { platform, arch }
-		}
-		catch (e) {
-			return { osInfo: { platform: '??', arch: '??' } }
-		}
-	}

 	capture: IMetricsService['capture'] = (event, params) => {
-		const capture = { distinctId: this.machineId, event, properties: params } as const
+		const capture = { distinctId: this.distinctId, event, properties: params } as const
 		// console.log('full capture:', capture)
 		this.client.capture(capture)
 	}
@@ -146,25 +146,6 @@ export class EditorGroupWatermark extends Disposable {


 	private render(): void {
-		// const enabled = this.configurationService.getValue<boolean>('workbench.tips.enabled');
-
-		// if (enabled === this.enabled) {
-		// 	return;
-		// }
-
-		// this.enabled = enabled;
-
-
-		// if (!enabled) {
-		// 	return;
-		// }
-
-		// const hasFolder = this.workbenchState !== WorkbenchState.EMPTY;
-		// const selected = (hasFolder ? folderEntries : noFolderEntries)
-		// 	.filter(entry => !('when' in entry) || this.contextKeyService.contextMatchesRules(entry.when))
-		// 	.filter(entry => !('mac' in entry) || entry.mac === (isMacintosh && !isWeb))
-		// 	.filter(entry => !!CommandsRegistry.getCommand(entry.id))
-		// 	.filter(entry => !!this.keybindingService.lookupKeybinding(entry.id));

 		this.clear();
 		const voidIconBox = append(this.shortcuts, $('.watermark-box'));
@@ -176,6 +157,10 @@ export class EditorGroupWatermark extends Disposable {

 		const update = async () => {

+			// put async at top so don't need to wait (this prevents a jitter on load)
+			const recentlyOpened = await this.workspacesService.getRecentlyOpened()
+				.catch(() => ({ files: [], workspaces: [] })).then(w => w.workspaces);
+
 			clearNode(voidIconBox);
 			clearNode(recentsBox);

@@ -206,10 +191,6 @@ export class EditorGroupWatermark extends Disposable {


 				// Recents
-				const recentlyOpened = await this.workspacesService.getRecentlyOpened()
-					.catch(() => ({ files: [], workspaces: [] })).then(w => w.workspaces);
-
-
 				if (recentlyOpened.length !== 0) {

 					voidIconBox.append(
@@ -5,11 +5,10 @@

 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
-import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { ITextModel } from '../../../../editor/common/model.js';
 import { Position } from '../../../../editor/common/core/position.js';
-import { InlineCompletion, InlineCompletionContext } from '../../../../editor/common/languages.js';
+import { InlineCompletion, InlineCompletionContext, LocationLink } from '../../../../editor/common/languages.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { ILLMMessageService } from '../../../../platform/void/common/llmMessageService.js';
@@ -18,6 +17,8 @@ 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 { isWindows } from '../../../../base/common/platform.js';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';

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

@@ -134,14 +135,23 @@ class LRUCache<K, V> {
 	}
 }

-type AutocompletionStatus = 'pending' | 'finished' | 'error';
+type AutocompletionPredictionType =
+	| 'single-line-fill-middle'
+	| 'single-line-redo-suffix'
+	// | 'multi-line-start-here'
+	| 'multi-line-start-on-next-line'
+	| 'do-not-predict'
+
 type Autocompletion = {
 	id: number,
 	prefix: string,
 	suffix: string,
+	llmPrefix: string,
+	llmSuffix: string,
 	startTime: number,
 	endTime: number | undefined,
-	status: AutocompletionStatus,
+	status: 'pending' | 'finished' | 'error',
+	type: AutocompletionPredictionType,
 	llmPromise: Promise<string> | undefined,
 	insertText: string,
 	requestId: string | null,
@@ -153,7 +163,7 @@ const MAX_CACHE_SIZE = 20
 const MAX_PENDING_REQUESTS = 2

 // postprocesses the result
-const postprocessResult = (result: string) => {
+const joinSpaces = (result: string) => {

 	// trim all whitespace except for a single leading/trailing space
 	// return result.trim()
@@ -168,13 +178,13 @@ const postprocessResult = (result: string) => {


 // trims the end of the prefix to improve cache hit rate
-const removeLeftTabsAndTrimEnd = (s: string): string => {
+const removeLeftTabsAndTrimEnds = (s: string): string => {
 	const trimmedString = s.trimEnd();
 	const trailingEnd = s.slice(trimmedString.length);

 	// keep only a single trailing newline
-	if (trailingEnd.includes('\n')) {
-		s = trimmedString + '\n';
+	if (trailingEnd.includes(_ln)) {
+		s = trimmedString + _ln;
 	}

 	s = s.replace(/^\s+/gm, ''); // remove left tabs
@@ -184,7 +194,28 @@ const removeLeftTabsAndTrimEnd = (s: string): string => {



-function getStringUpToUnbalancedParenthesis(s: string, prefix: string): string {
+const removeAllWhitespace = (str: string): string => str.replace(/\s+/g, '');
+
+function isSubsequence({ of, subsequence }: { of: string, subsequence: string }): boolean {
+	if (subsequence.length === 0) return true;
+	if (of.length === 0) return false;
+
+	let subsequenceIndex = 0;
+
+	for (let i = 0; i < of.length; i++) {
+		if (of[i] === subsequence[subsequenceIndex]) {
+			subsequenceIndex++;
+		}
+		if (subsequenceIndex === subsequence.length) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+
+function getStringUpToUnbalancedClosingParenthesis(s: string, prefix: string): string {

 	const pairs: Record<string, string> = { ')': '(', '}': '{', ']': '[' };

@@ -220,19 +251,15 @@ function getStringUpToUnbalancedParenthesis(s: string, prefix: string): string {
 }


-const parenthesisChars = `{}()[]<>\`'"`

-// returns the text in the autocompletion to display, assuming the prefix is already matched
-const toInlineCompletions = ({ matchInfo, prefix, suffix, autocompletion, position, debug }: { matchInfo: matchInfo, prefix: string, suffix: string, autocompletion: Autocompletion, position: Position, debug?: boolean }): { insertText: string, range: Range }[] => {
+// further trim the autocompletion
+const postprocessAutocompletion = ({ autocompletionMatchup, autocompletion, prefixAndSuffix }: { autocompletionMatchup: AutocompletionMatchupBounds, autocompletion: Autocompletion, prefixAndSuffix: PrefixAndSuffixInfo }) => {

+	const { prefix, prefixToTheLeftOfCursor, suffixToTheRightOfCursor } = prefixAndSuffix

-	const suffixLines = suffix.split('\n')
-	const prefixLines = prefix.split('\n')
-	const suffixToTheRightOfCursor = suffixLines[0]
-	const prefixToTheLeftOfCursor = prefixLines[prefixLines.length - 1]
 	const generatedMiddle = autocompletion.insertText

-	let startIdx = matchInfo.startIdx
+	let startIdx = autocompletionMatchup.startIdx
 	let endIdx = generatedMiddle.length // exclusive bounds

 	// const naiveReturnValue = generatedMiddle.slice(startIdx)
@@ -253,7 +280,7 @@ const toInlineCompletions = ({ matchInfo, prefix, suffix, autocompletion, positi
 	}

 	// if user is on a blank line and the generation starts with newline(s), remove them
-	const numStartingNewlines = generatedMiddle.slice(startIdx).match(/^\n+/)?.[0].length || 0;
+	const numStartingNewlines = generatedMiddle.slice(startIdx).match(new RegExp(`^${_ln}+`))?.[0].length || 0;
 	if (
 		!prefixToTheLeftOfCursor.trim()
 		&& !suffixToTheRightOfCursor.trim()
@@ -263,21 +290,21 @@ const toInlineCompletions = ({ matchInfo, prefix, suffix, autocompletion, positi
 		startIdx += numStartingNewlines
 	}

-	// if the generated text matches with the suffix on the current line, stop
-	if (suffixToTheRightOfCursor.trim()) { // completing in the middle of a line
+	// if the generated FIM text matches with the suffix on the current line, stop
+	if (autocompletion.type === 'single-line-fill-middle' && suffixToTheRightOfCursor.trim()) { // completing in the middle of a line
 		// complete until there is a match
 		const rawMatchIndex = generatedMiddle.slice(startIdx).lastIndexOf(suffixToTheRightOfCursor.trim()[0])
 		if (rawMatchIndex > -1) {
 			// console.log('p2', rawMatchIndex, startIdx, suffixToTheRightOfCursor.trim()[0], 'AAA', generatedMiddle.slice(startIdx))
 			const matchIdx = rawMatchIndex + startIdx;
 			const matchChar = generatedMiddle[matchIdx]
-			if (parenthesisChars.includes(matchChar)) {
+			if (`{}()[]<>\`'"`.includes(matchChar)) {
 				endIdx = Math.min(endIdx, matchIdx)
 			}
 		}
 	}

-	const restOfLineToGenerate = generatedMiddle.slice(startIdx).split('\n')[0] ?? ''
+	const restOfLineToGenerate = generatedMiddle.slice(startIdx).split(_ln)[0] ?? ''
 	// condition to complete as a single line completion
 	if (
 		prefixToTheLeftOfCursor.trim()
@@ -285,7 +312,7 @@ const toInlineCompletions = ({ matchInfo, prefix, suffix, autocompletion, positi
 		&& restOfLineToGenerate.trim()
 	) {

-		const rawNewlineIdx = generatedMiddle.slice(startIdx).indexOf('\n')
+		const rawNewlineIdx = generatedMiddle.slice(startIdx).indexOf(_ln)
 		if (rawNewlineIdx > -1) {
 			// console.log('p3', startIdx, rawNewlineIdx)
 			const newlineIdx = rawNewlineIdx + startIdx;
@@ -311,14 +338,39 @@ const toInlineCompletions = ({ matchInfo, prefix, suffix, autocompletion, positi
 	let completionStr = generatedMiddle.slice(startIdx, endIdx)

 	// filter out unbalanced parentheses
-	completionStr = getStringUpToUnbalancedParenthesis(completionStr, prefix)
+	completionStr = getStringUpToUnbalancedClosingParenthesis(completionStr, prefix)
 	// console.log('originalCompletionStr: ', JSON.stringify(generatedMiddle.slice(startIdx)))
 	// console.log('finalCompletionStr: ', JSON.stringify(completionStr))

+
+	return completionStr
+
+}
+
+// returns the text in the autocompletion to display, assuming the prefix is already matched
+const toInlineCompletions = ({ autocompletionMatchup, autocompletion, prefixAndSuffix, position, debug }: { autocompletionMatchup: AutocompletionMatchupBounds, autocompletion: Autocompletion, prefixAndSuffix: PrefixAndSuffixInfo, position: Position, debug?: boolean }): { insertText: string, range: Range }[] => {
+
+	let trimmedInsertText = postprocessAutocompletion({ autocompletionMatchup, autocompletion, prefixAndSuffix, })
 	let rangeToReplace: Range = new Range(position.lineNumber, position.column, position.lineNumber, position.column)

+	// handle special cases
+
+	// if we redid the suffix, replace the suffix
+	if (autocompletion.type === 'single-line-redo-suffix') {
+		if (isSubsequence({ // check that the old text contains the same brackets + symbols as the new text
+			subsequence: removeAllWhitespace(prefixAndSuffix.suffixToTheRightOfCursor), // old suffix
+			of: removeAllWhitespace(autocompletion.insertText), // new suffix (note that this should not be `trimmedInsertText`)
+		})) {
+			rangeToReplace = new Range(position.lineNumber, position.column, position.lineNumber, Number.MAX_SAFE_INTEGER)
+		}
+		else {
+			// TODO redo the autocompletion
+			trimmedInsertText = '' // for now set the mismatched text to ''
+		}
+	}
+
 	return [{
-		insertText: completionStr,
+		insertText: trimmedInsertText,
 		range: rangeToReplace,
 	}]

@@ -345,7 +397,12 @@ const toInlineCompletions = ({ matchInfo, prefix, suffix, autocompletion, positi

 // }

-const getPrefixAndSuffix = (model: ITextModel, position: Position) => {
+
+const allLinebreakSymbols = ['\r\n', '\n']
+const _ln = isWindows ? allLinebreakSymbols[0] : allLinebreakSymbols[1]
+
+type PrefixAndSuffixInfo = { prefix: string, suffix: string, prefixLines: string[], suffixLines: string[], prefixToTheLeftOfCursor: string, suffixToTheRightOfCursor: string }
+const getPrefixAndSuffixInfo = (model: ITextModel, position: Position): PrefixAndSuffixInfo => {

 	const fullText = model.getValue();

@@ -353,30 +410,37 @@ const getPrefixAndSuffix = (model: ITextModel, position: Position) => {
 	const prefix = fullText.substring(0, cursorOffset)
 	const suffix = fullText.substring(cursorOffset)

-	return { prefix, suffix }
+
+	const prefixLines = prefix.split(_ln)
+	const suffixLines = suffix.split(_ln)
+
+	const prefixToTheLeftOfCursor = prefixLines.slice(-1)[0] ?? ''
+	const suffixToTheRightOfCursor = suffixLines[0] ?? ''
+
+	return { prefix, suffix, prefixLines, suffixLines, prefixToTheLeftOfCursor, suffixToTheRightOfCursor }

 }

 const getIndex = (str: string, line: number, char: number) => {
-	return str.split('\n').slice(0, line).join('\n').length + (line > 0 ? 1 : 0) + char;
+	return str.split(_ln).slice(0, line).join(_ln).length + (line > 0 ? 1 : 0) + char;
 }
 const getLastLine = (s: string): string => {
-	const matches = s.match(/[^\n]*$/)
+	const matches = s.match(new RegExp(`[^${_ln}]*$`))
 	return matches ? matches[0] : ''
 }

-type matchInfo = {
-	lineStart: number,
-	character: number,
+type AutocompletionMatchupBounds = {
+	startLine: number,
+	startCharacter: number,
 	startIdx: number,
 }
 // returns the startIdx of the match if there is a match, or undefined if there is no match
 // all results are wrt `autocompletion.result`
-const getPrefixAutocompletionMatch = ({ prefix, autocompletion }: { prefix: string, autocompletion: Autocompletion }): matchInfo | undefined => {
+const getAutocompletionMatchup = ({ prefix, autocompletion }: { prefix: string, autocompletion: Autocompletion }): AutocompletionMatchupBounds | undefined => {

-	const trimmedCurrentPrefix = removeLeftTabsAndTrimEnd(prefix)
-	const trimmedCompletionPrefix = removeLeftTabsAndTrimEnd(autocompletion.prefix)
-	const trimmedCompletionMiddle = removeLeftTabsAndTrimEnd(autocompletion.insertText)
+	const trimmedCurrentPrefix = removeLeftTabsAndTrimEnds(prefix)
+	const trimmedCompletionPrefix = removeLeftTabsAndTrimEnds(autocompletion.prefix)
+	const trimmedCompletionMiddle = removeLeftTabsAndTrimEnds(autocompletion.insertText)

 	// console.log('@result: ', JSON.stringify(autocompletion.insertText))
 	// console.log('@trimmedCurrentPrefix: ', JSON.stringify(trimmedCurrentPrefix))
@@ -384,7 +448,7 @@ const getPrefixAutocompletionMatch = ({ prefix, autocompletion }: { prefix: stri
 	// console.log('@trimmedCompletionMiddle: ', JSON.stringify(trimmedCompletionMiddle))

 	if (trimmedCurrentPrefix.length < trimmedCompletionPrefix.length) { // user must write text beyond the original prefix at generation time
-		console.log('@undefined1')
+		// console.log('@undefined1')
 		return undefined
 	}

@@ -392,24 +456,24 @@ const getPrefixAutocompletionMatch = ({ prefix, autocompletion }: { prefix: stri
 		!(trimmedCompletionPrefix + trimmedCompletionMiddle)
 			.startsWith(trimmedCurrentPrefix)
 	) {
-		console.log('@undefined2')
+		// console.log('@undefined2')
 		return undefined
 	}

 	// reverse map to find position wrt `autocompletion.result`
 	const lineStart =
-		trimmedCurrentPrefix.split('\n').length -
-		trimmedCompletionPrefix.split('\n').length;
+		trimmedCurrentPrefix.split(_ln).length -
+		trimmedCompletionPrefix.split(_ln).length;

 	if (lineStart < 0) {
-		console.log('@undefined3')
+		// console.log('@undefined3')

 		console.error('Error: No line found.');
 		return undefined;
 	}
 	const currentPrefixLine = getLastLine(trimmedCurrentPrefix)
 	const completionPrefixLine = lineStart === 0 ? getLastLine(trimmedCompletionPrefix) : ''
-	const completionMiddleLine = autocompletion.insertText.split('\n')[lineStart]
+	const completionMiddleLine = autocompletion.insertText.split(_ln)[lineStart]
 	const fullCompletionLine = completionPrefixLine + completionMiddleLine

 	// console.log('currentPrefixLine', currentPrefixLine)
@@ -418,7 +482,7 @@ const getPrefixAutocompletionMatch = ({ prefix, autocompletion }: { prefix: stri

 	const charMatchIdx = fullCompletionLine.indexOf(currentPrefixLine)
 	if (charMatchIdx < 0) {
-		console.log('@undefined4', charMatchIdx)
+		// console.log('@undefined4', charMatchIdx)

 		console.error('Warning: Found character with negative index. This should never happen.')
 		return undefined
@@ -432,49 +496,97 @@ const getPrefixAutocompletionMatch = ({ prefix, autocompletion }: { prefix: stri
 	const startIdx = getIndex(autocompletion.insertText, lineStart, character)

 	return {
-		lineStart,
-		character,
+		startLine: lineStart,
+		startCharacter: character,
 		startIdx,
 	}


 }

+// const x = []
+// const
+// c[[]]
+// asd[[]] =
+// const [{{}}]
+//
+type CompletionOptions = {
+	predictionType: AutocompletionPredictionType,
+	shouldGenerate: boolean,
+	llmPrefix: string,
+	llmSuffix: string,
+	stopTokens: string[],
+}
+const getCompletionOptions = (prefixAndSuffix: PrefixAndSuffixInfo, relevantContext: string, justAcceptedAutocompletion: boolean): CompletionOptions => {

+	const { prefix, suffix, prefixToTheLeftOfCursor, suffixToTheRightOfCursor, suffixLines } = prefixAndSuffix

+	let completionOptions: CompletionOptions

-const getCompletionOptions = ({ prefix, suffix }: { prefix: string, suffix: string }) => {
+	// if line is empty, do multiline completion
+	const isLineEmpty = !prefixToTheLeftOfCursor.trim() && !suffixToTheRightOfCursor.trim()
+	const isLinePrefixEmpty = removeAllWhitespace(prefixToTheLeftOfCursor).length === 0
+	const isLineSuffixEmpty = removeAllWhitespace(suffixToTheRightOfCursor).length === 0

-	const prefixLines = prefix.split('\n')
-	const suffixLines = suffix.split('\n')
+	// TODO add context to prefix
+	// llmPrefix = '\n\n/* Relevant context:\n' + relevantContext + '\n*/\n' + llmPrefix

-	const prefixToLeftOfCursor = prefixLines.slice(-1)[0] ?? ''
-	const suffixToRightOfCursor = suffixLines[0] ?? ''
-
-	// default parameters
-	let shouldGenerate = true
-	let stopTokens: string[] = ['\n\n', '\r\n\r\n']
-
-	// specific cases
-	if (suffixToRightOfCursor.trim() !== '') { // typing between something
-		stopTokens = ['\n', '\r\n']
+	// if we just accepted an autocompletion, predict a multiline completion starting on the next line
+	if (justAcceptedAutocompletion && isLineSuffixEmpty) {
+		const prefixWithNewline = prefix + _ln
+		completionOptions = {
+			predictionType: 'multi-line-start-on-next-line',
+			shouldGenerate: true,
+			llmPrefix: prefixWithNewline,
+			llmSuffix: suffix,
+			stopTokens: [`${_ln}${_ln}`] // double newlines
+		}
+	}
+	// if the current line is empty, predict a single-line completion
+	else if (isLineEmpty) {
+		completionOptions = {
+			predictionType: 'single-line-fill-middle',
+			shouldGenerate: true,
+			llmPrefix: prefix,
+			llmSuffix: suffix,
+			stopTokens: allLinebreakSymbols
+		}
+	}
+	// if suffix is 3 or less characters, attempt to complete the line ignorning it
+	else if (removeAllWhitespace(suffixToTheRightOfCursor).length <= 3) {
+		const suffixLinesIgnoringThisLine = suffixLines.slice(1)
+		const suffixStringIgnoringThisLine = suffixLinesIgnoringThisLine.length === 0 ? '' : _ln + suffixLinesIgnoringThisLine.join(_ln)
+		completionOptions = {
+			predictionType: 'single-line-redo-suffix',
+			shouldGenerate: true,
+			llmPrefix: prefix,
+			llmSuffix: suffixStringIgnoringThisLine,
+			stopTokens: allLinebreakSymbols
+		}
+	}
+	// else attempt to complete the middle of the line if there is a prefix (the completion looks bad if there is no prefix)
+	else if (!isLinePrefixEmpty) {
+		completionOptions = {
+			predictionType: 'single-line-fill-middle',
+			shouldGenerate: true,
+			llmPrefix: prefix,
+			llmSuffix: suffix,
+			stopTokens: allLinebreakSymbols
+		}
+	} else {
+		completionOptions = {
+			predictionType: 'do-not-predict',
+			shouldGenerate: false,
+			llmPrefix: prefix,
+			llmSuffix: suffix,
+			stopTokens: []
+		}
 	}

-	// if (prefixToLeftOfCursor.trim() === '' && suffixToRightOfCursor.trim() === '') { // at an empty line
-	// 	stopTokens = ['\n\n', '\r\n\r\n']
-	// }
-
-	if (prefixToLeftOfCursor === '') { // at beginning or end of line
-		shouldGenerate = false
-	}
-
-	return { shouldGenerate, stopTokens }
+	return completionOptions

 }

-
-
-
 export interface IAutocompleteService {
 	readonly _serviceBrand: undefined;
 }
@@ -482,13 +594,17 @@ export interface IAutocompleteService {
 export const IAutocompleteService = createDecorator<IAutocompleteService>('AutocompleteService');

 export class AutocompleteService extends Disposable implements IAutocompleteService {
+
+	static readonly ID = 'void.autocompleteService'
+
 	_serviceBrand: undefined;

 	private _autocompletionId: number = 0;
 	private _autocompletionsOfDocument: { [docUriStr: string]: LRUCache<number, Autocompletion> } = {}

-	private _lastCompletionTime = 0
-	private _lastPrefix: string = ''
+	private _lastCompletionStart = 0
+	private _lastCompletionAccept = 0
+	// private _lastPrefix: string = ''

 	// used internally by vscode
 	// fires after every keystroke and returns the completion to show
@@ -499,16 +615,17 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 		token: CancellationToken,
 	): Promise<InlineCompletion[]> {

-		const disabled = true
-		const testMode = false
+		console.log('START_0')

-		if (disabled) return [];
+		const testMode = false

 		const docUriStr = model.uri.toString();

-		const { prefix, suffix } = getPrefixAndSuffix(model, position)
-		// initialize cache and other variables
-		// note that whenever an autocompletion is rejected, it is removed from cache
+		const prefixAndSuffix = getPrefixAndSuffixInfo(model, position)
+		const { prefix, suffix } = prefixAndSuffix
+
+		// initialize cache if it doesnt exist
+		// note that whenever an autocompletion is accepted, it is removed from cache
 		if (!this._autocompletionsOfDocument[docUriStr]) {
 			this._autocompletionsOfDocument[docUriStr] = new LRUCache<number, Autocompletion>(
 				MAX_CACHE_SIZE,
@@ -518,7 +635,7 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 				}
 			)
 		}
-		this._lastPrefix = prefix
+		// this._lastPrefix = prefix

 		// print all pending autocompletions
 		// let _numPending = 0
@@ -527,33 +644,36 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ

 		// get autocompletion from cache
 		let cachedAutocompletion: Autocompletion | undefined = undefined
-		let matchInfo: matchInfo | undefined = undefined
+		let autocompletionMatchup: AutocompletionMatchupBounds | undefined = undefined
 		for (const autocompletion of this._autocompletionsOfDocument[docUriStr].items.values()) {
-			// if the user's change matches up with the generated text
-			matchInfo = getPrefixAutocompletionMatch({ prefix, autocompletion })
-			if (matchInfo !== undefined) {
+			// if the user's change matches with the autocompletion
+			autocompletionMatchup = getAutocompletionMatchup({ prefix, autocompletion })
+			if (autocompletionMatchup !== undefined) {
 				cachedAutocompletion = autocompletion
 				break;
 			}
 		}

 		// if there is a cached autocompletion, return it
-		if (cachedAutocompletion && matchInfo) {
+		if (cachedAutocompletion && autocompletionMatchup) {
+
+			console.log('AA')
+

 			// console.log('id: ' + cachedAutocompletion.id)

 			if (cachedAutocompletion.status === 'finished') {
-				// console.log('A1')
+				console.log('A1')

-				const inlineCompletions = toInlineCompletions({ matchInfo, autocompletion: cachedAutocompletion, prefix, suffix, position, debug: true })
+				const inlineCompletions = toInlineCompletions({ autocompletionMatchup, autocompletion: cachedAutocompletion, prefixAndSuffix, position, debug: true })
 				return inlineCompletions

 			} else if (cachedAutocompletion.status === 'pending') {
-				// console.log('A2')
+				console.log('A2')

 				try {
 					await cachedAutocompletion.llmPromise;
-					const inlineCompletions = toInlineCompletions({ matchInfo, autocompletion: cachedAutocompletion, prefix, suffix, position })
+					const inlineCompletions = toInlineCompletions({ autocompletionMatchup, autocompletion: cachedAutocompletion, prefixAndSuffix, position })
 					return inlineCompletions

 				} catch (e) {
@@ -562,19 +682,25 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 				}

 			} else if (cachedAutocompletion.status === 'error') {
-				// console.log('A3')
+				console.log('A3')
+			} else {
+				console.log('A4')
 			}

 			return []
 		}

 		// else if no more typing happens, then go forwards with the request
+
 		// wait DEBOUNCE_TIME for the user to stop typing
 		const thisTime = Date.now()
-		this._lastCompletionTime = thisTime
+
+		const justAcceptedAutocompletion = thisTime - this._lastCompletionAccept < 500
+
+		this._lastCompletionStart = thisTime
 		const didTypingHappenDuringDebounce = await new Promise((resolve, reject) =>
 			setTimeout(() => {
-				if (this._lastCompletionTime === thisTime) {
+				if (this._lastCompletionStart === thisTime) {
 					resolve(false)
 				} else {
 					resolve(true)
@@ -605,7 +731,16 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 			}
 		}

-		const { shouldGenerate, stopTokens: _ } = getCompletionOptions({ prefix, suffix }) // TODO mat
+
+		// gather relevant context from the code around the user's selection and definitions
+		const relevantContext = await this._gatherRelevantContextForPosition(
+			model,
+			position,
+			3, //recursion depth
+			1 // number of lines to view in each recursion
+		);
+
+		const { shouldGenerate, predictionType, llmPrefix, llmSuffix, stopTokens } = getCompletionOptions(prefixAndSuffix, relevantContext, justAcceptedAutocompletion)

 		if (!shouldGenerate) return []

@@ -613,38 +748,53 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 			return []
 		}

+
+
 		// console.log('B')

 		// create a new autocompletion and add it to cache
 		const newAutocompletion: Autocompletion = {
 			id: this._autocompletionId++,
-			prefix: prefix,
+			prefix: prefix, // the actual prefix and suffix
 			suffix: suffix,
+			llmPrefix: llmPrefix, // the prefix and suffix the llm sees
+			llmSuffix: llmSuffix,
 			startTime: Date.now(),
 			endTime: undefined,
+			type: predictionType,
 			status: 'pending',
 			llmPromise: undefined,
 			insertText: '',
 			requestId: null,
 		}

+		console.log('BB')
+		console.log(predictionType)
+
 		// set parameters of `newAutocompletion` appropriately
 		newAutocompletion.llmPromise = new Promise((resolve, reject) => {

 			const requestId = this._llmMessageService.sendLLMMessage({
+				type: 'ollamaFIM',
+				messages: {
+					prefix: llmPrefix,
+					suffix: llmSuffix,
+					stopTokens: stopTokens,
+				},
 				logging: { loggingName: 'Autocomplete' },
-				messages: [],
-				onText: async ({ newText, fullText }) => {
+				onText: async ({ fullText }) => {

 					newAutocompletion.insertText = fullText

 					// if generation doesn't match the prefix for the first few tokens generated, reject it
-					if (!getPrefixAutocompletionMatch({ prefix: this._lastPrefix, autocompletion: newAutocompletion })) {
-						reject('LLM response did not match user\'s text.')
-					}
+					// if (!getAutocompletionMatchup({ prefix: this._lastPrefix, autocompletion: newAutocompletion })) {
+					// reject('LLM response did not match user\'s text.')
+					// }
 				},
 				onFinalMessage: ({ fullText }) => {

+					console.log('____res: ', JSON.stringify(newAutocompletion.insertText))
+
 					// newAutocompletion.prefix = prefix
 					// newAutocompletion.suffix = suffix
 					// newAutocompletion.startTime = Date.now()
@@ -653,7 +803,12 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 					newAutocompletion.status = 'finished'
 					// newAutocompletion.promise = undefined
 					const [text, _] = extractCodeFromRegular({ text: fullText, recentlyAddedTextLen: 0 })
-					newAutocompletion.insertText = postprocessResult(text)
+					newAutocompletion.insertText = joinSpaces(text)
+
+					// handle special case for predicting starting on the next line, add a newline character
+					if (newAutocompletion.type === 'multi-line-start-on-next-line') {
+						newAutocompletion.insertText = _ln + newAutocompletion.insertText
+					}

 					resolve(newAutocompletion.insertText)

@@ -664,7 +819,6 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 					reject(message)
 				},
 				useProviderFor: 'Autocomplete',
-				range: { startLineNumber: position.lineNumber, startColumn: position.column, endLineNumber: position.lineNumber, endColumn: position.column },
 			})
 			newAutocompletion.requestId = requestId

@@ -687,8 +841,8 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 			await newAutocompletion.llmPromise
 			// console.log('id: ' + newAutocompletion.id)

-			const matchInfo: matchInfo = { startIdx: 0, lineStart: 0, character: 0 }
-			const inlineCompletions = toInlineCompletions({ matchInfo, autocompletion: newAutocompletion, prefix, suffix, position })
+			const autocompletionMatchup: AutocompletionMatchupBounds = { startIdx: 0, startLine: 0, startCharacter: 0 }
+			const inlineCompletions = toInlineCompletions({ autocompletionMatchup, autocompletion: newAutocompletion, prefixAndSuffix, position })
 			return inlineCompletions

 		} catch (e) {
@@ -699,6 +853,84 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ

 	}

+	// helper method to gather ~N lines above and below the user's current line,
+	// and recursively gather lines around any symbol definitions encountered.
+	private async _gatherRelevantContextForPosition(
+		model: ITextModel,
+		position: Position,
+		recursionDepth: number,
+		linesAround: number
+	): Promise<string> {
+		// We'll do a BFS-like approach: for each position or definition, gather lines around it,
+		// then attempt to find the definition of any symbols in that range, up to 'recursionDepth' times.
+
+		// A set of "key" strings to avoid repeating the same location or line chunk
+		const visitedRanges = new Set<string>();
+		const collectedSnippets: string[] = [];
+
+		// A queue of tasks, each being a tuple of: (model, position, depth)
+		const tasks: Array<{ model: ITextModel, position: Position, depth: number }> = [];
+		tasks.push({ model, position, depth: recursionDepth });
+
+		const getSnippetAroundLine = (model: ITextModel, lineNumber: number, linesAround: number): string => {
+			const startLine = Math.max(1, lineNumber - linesAround);
+			const endLine = Math.min(model.getLineCount(), lineNumber + linesAround);
+			const lines: string[] = [];
+			for (let i = startLine; i <= endLine; i++) {
+				lines.push(model.getLineContent(i));
+			}
+			return lines.join('\n');
+		};
+
+		while (tasks.length > 0) {
+			const { model: currentModel, position: currentPos, depth } = tasks.shift()!;
+
+			if (depth < 0) {
+				continue;
+			}
+
+			// Gather snippet around the current line
+			const snippet = getSnippetAroundLine(currentModel, currentPos.lineNumber, linesAround);
+			const snippetKey = `${currentModel.uri.toString()}:${currentPos.lineNumber}`;
+			if (!visitedRanges.has(snippetKey)) {
+				visitedRanges.add(snippetKey);
+				collectedSnippets.push(`-- Snippet around line ${currentPos.lineNumber} --\n${snippet}\n`);
+			}
+
+			// Attempt to gather definitions for the symbol at this position
+			// We just pick all definition providers and see if any has a definition
+			const providers = this._langFeatureService.definitionProvider.ordered(currentModel);
+			for (const provider of providers) {
+				try {
+					const definitions = await provider.provideDefinition(currentModel, currentPos, CancellationToken.None);
+					if (!definitions) continue;
+
+					// definitions can be a single LocationLink or an array
+					const defArray: LocationLink[] = Array.isArray(definitions) ? definitions : [definitions];
+					for (const def of defArray) {
+						if (!def.uri) continue;
+						if (typeof def.range === 'undefined') continue;
+						const definitionModel = this._modelService.getModel(def.uri);
+						if (!definitionModel) continue;
+
+						// We'll queue up a new task for that definition range
+						const defPos = new Position(def.range.startLineNumber, def.range.startColumn);
+						const defKey = `${def.uri.toString()}:${defPos.lineNumber}`;
+						if (!visitedRanges.has(defKey)) {
+							tasks.push({ model: definitionModel, position: defPos, depth: depth - 1 });
+						}
+					}
+				} catch (err) {
+					// If a provider fails, ignore
+				}
+			}
+		}
+
+		// Return the joined context
+		return collectedSnippets.join('\n');
+	}
+
+
 	constructor(
 		@ILanguageFeaturesService private _langFeatureService: ILanguageFeaturesService,
 		@ILLMMessageService private readonly _llmMessageService: ILLMMessageService,
@@ -715,7 +947,6 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 				return { items: items, }
 			},
 			freeInlineCompletions: (completions) => {
-
 				// get the `docUriStr` and the `position` of the cursor
 				const activePane = this._editorService.activeEditorPane;
 				if (!activePane) return;
@@ -728,33 +959,30 @@ export class AutocompleteService extends Disposable implements IAutocompleteServ
 				const model = this._modelService.getModel(resource)
 				if (!model) return;
 				const docUriStr = resource.toString();
-
-				const { prefix, } = getPrefixAndSuffix(model, position)
-
 				if (!this._autocompletionsOfDocument[docUriStr]) return;

+				const { prefix, } = getPrefixAndSuffixInfo(model, position)
+
 				// go through cached items and remove matching ones
 				// autocompletion.prefix + autocompletion.insertedText ~== insertedText
-				completions.items.forEach(item => {
-					this._autocompletionsOfDocument[docUriStr].items.forEach((autocompletion: Autocompletion) => {
-						if (removeLeftTabsAndTrimEnd(prefix)
-							=== removeLeftTabsAndTrimEnd(autocompletion.prefix + autocompletion.insertText)
-						) {
-							this._autocompletionsOfDocument[docUriStr].delete(autocompletion.id);
-						}
-					});
+				this._autocompletionsOfDocument[docUriStr].items.forEach((autocompletion: Autocompletion) => {
+					// const matchup = getAutocompletionMatchup({ prefix, autocompletion })
+					const matchup = removeAllWhitespace(prefix) === removeAllWhitespace(autocompletion.prefix + autocompletion.insertText)
+					if (matchup) {
+						console.log('ACCEPT', autocompletion.id)
+						this._lastCompletionAccept = Date.now()
+						this._autocompletionsOfDocument[docUriStr].delete(autocompletion.id);
+					}
 				});

 			},
 		})
-
-
 	}


 }

-
-registerSingleton(IAutocompleteService, AutocompleteService, InstantiationType.Eager);
+registerWorkbenchContribution2(AutocompleteService.ID, AutocompleteService, WorkbenchPhase.BlockRestore);
+


@@ -13,29 +13,25 @@ import { Emitter, Event } from '../../../../base/common/event.js';
 import { IRange } from '../../../../editor/common/core/range.js';
 import { ILLMMessageService } from '../../../../platform/void/common/llmMessageService.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
-import { VSReadFile } from './helpers/readFile.js';
-import { chat_prompt, chat_systemMessage } from './prompt/prompts.js';
+import { chat_userMessage, chat_systemMessage } from './prompt/prompts.js';

+// one of the square items that indicates a selection in a chat bubble (NOT a file, a Selection of text)
 export type CodeSelection = {
+	type: 'Selection';
 	fileURI: URI;
-	selectionStr: string | null;
-	content: string; // TODO remove this (replace `selectionStr` with `content`)
+	selectionStr: string;
 	range: IRange;
 }

-// if selectionStr is null, it means to use the entire file at send time
-export type CodeStagingSelection = {
-	type: 'Selection',
-	fileURI: URI,
-	selectionStr: string,
-	range: IRange
-} | {
-	type: 'File',
-	fileURI: URI,
-	selectionStr: null,
-	range: null
+export type FileSelection = {
+	type: 'File';
+	fileURI: URI;
+	selectionStr: null;
+	range: null;
 }

+export type StagingSelectionItem = CodeSelection | FileSelection
+

 // WARNING: changing this format is a big deal!!!!!! need to migrate old format to new format on users' computers so people don't get errors.
 export type ChatMessage =
@@ -43,7 +39,7 @@ export type ChatMessage =
 		role: 'user';
 		content: string | null; // content sent to the llm - allowed to be '', will be replaced with (empty)
 		displayContent: string | null; // content displayed to user  - allowed to be '', will be ignored
-		selections: CodeSelection[] | null; // the user's selection
+		selections: StagingSelectionItem[] | null; // the user's selection
 	}
 	| {
 		role: 'assistant';
@@ -69,7 +65,7 @@ export type ChatThreads = {
 export type ThreadsState = {
 	allThreads: ChatThreads;
 	currentThreadId: string; // intended for internal use only
-	currentStagingSelections: CodeStagingSelection[] | null;
+	currentStagingSelections: StagingSelectionItem[] | null;
 }

 export type ThreadStreamState = {
@@ -91,6 +87,9 @@ const newThreadObject = () => {
 	} satisfies ChatThreads[string]
 }

+const THREAD_VERSION_KEY = 'void.chatThreadVersion'
+const THREAD_VERSION = 'v1'
+
 const THREAD_STORAGE_KEY = 'void.chatThreadStorage'

 export interface IChatThreadService {
@@ -106,7 +105,7 @@ export interface IChatThreadService {
 	openNewThread(): void;
 	switchToThread(threadId: string): void;

-	setStaging(stagingSelection: CodeStagingSelection[] | null): void;
+	setStaging(stagingSelection: StagingSelectionItem[] | null): void;

 	addUserMessageAndStreamResponse(userMessage: string): Promise<void>;
 	cancelStreaming(threadId: string): void;
@@ -143,11 +142,15 @@ class ChatThreadService extends Disposable implements IChatThreadService {

 		// always be in a thread
 		this.openNewThread()
+
+		// for now just write the version, anticipating bigger changes in the future where we'll want to access this
+		this._storageService.store(THREAD_VERSION_KEY, THREAD_VERSION, StorageScope.APPLICATION, StorageTarget.USER)
 	}


 	private _readAllThreads(): ChatThreads {
 		// PUT ANY VERSION CHANGE FORMAT CONVERSION CODE HERE
+		// CAN ADD "v0" TAG IN STORAGE AND CONVERT
 		const threads = this._storageService.get(THREAD_STORAGE_KEY, StorageScope.APPLICATION)
 		return threads ? JSON.parse(threads) : {}
 	}
@@ -188,21 +191,18 @@ class ChatThreadService extends Disposable implements IChatThreadService {
 		const threadId = this.getCurrentThread().id

 		const currSelns = this.state.currentStagingSelections ?? []
-		const selections = !currSelns ? null : await Promise.all(
-			currSelns.map(async (sel) => ({ ...sel, content: await VSReadFile(this._modelService, sel.fileURI) }))
-		).then(
-			(files) => files.filter(file => file.content !== null) as CodeSelection[]
-		)

 		// add user's message to chat history
 		const instructions = userMessage
-		const userHistoryElt: ChatMessage = { role: 'user', content: chat_prompt(instructions, selections), displayContent: instructions, selections: selections }
+		const content = await chat_userMessage(instructions, currSelns, this._modelService)
+		const userHistoryElt: ChatMessage = { role: 'user', content: content, displayContent: instructions, selections: currSelns }
 		this._addMessageToThread(threadId, userHistoryElt)


 		this._setStreamState(threadId, { error: undefined })

 		const llmCancelToken = this._llmMessageService.sendLLMMessage({
+			type: 'sendLLMMessage',
 			logging: { loggingName: 'Chat' },
 			messages: [
 				{ role: 'system', content: chat_systemMessage },
@@ -292,7 +292,7 @@ class ChatThreadService extends Disposable implements IChatThreadService {
 	}


-	setStaging(stagingSelection: CodeStagingSelection[] | null): void {
+	setStaging(stagingSelection: StagingSelectionItem[] | null): void {
 		this._setState({ currentStagingSelections: stagingSelection }, true) // this is a hack for now
 	}

@@ -91,10 +91,7 @@ export class ConsistentItemService extends Disposable {
 		this._register(this._editorService.onCodeEditorAdd(editor => { initializeEditor(editor) }))

 		// when an editor is deleted, remove its items
-		this._register(this._editorService.onCodeEditorRemove(editor => {
-			removeItemsFromEditor(editor)
-		}))
-
+		this._register(this._editorService.onCodeEditorRemove(editor => { removeItemsFromEditor(editor) }))
 	}


@@ -76,47 +76,55 @@ class SurroundingsRemover {


 	removeCodeBlock = () => {
+		// Match either:
+		// 1. ```language\n<code>\n```\n?
+		// 2. ```<code>\n```\n?
+
 		const pm = this
 		const foundCodeBlock = pm.removePrefix('```')
 		if (!foundCodeBlock) return false

 		pm.removeFromStartUntil('\n', true) // language

-		const foundCodeBlockEnd = pm.removeSuffix('```')
+		const j = pm.j
+		let foundCodeBlockEnd = pm.removeSuffix('```')
+
+		if (pm.j === j) foundCodeBlockEnd = pm.removeSuffix('```\n') // if no change, try again with \n after ```
+
 		if (!foundCodeBlockEnd) return false

-		pm.removeSuffix('\n')
+		pm.removeSuffix('\n') // remove the newline before ```
 		return true
 	}


-	actualRecentlyAdded = (recentlyAddedTextLen: number) => {
+	deltaInfo = (recentlyAddedTextLen: number) => {
 		// aaaaaatextaaaaaa{recentlyAdded}
-		//           i      ^        j
+		//                  ^   i    j    len
 		//                  |
 		//            recentyAddedIdx
-		const recentlyAddedIdx = this.j - recentlyAddedTextLen + 1
-		return this.originalS.substring(Math.max(this.i, recentlyAddedIdx), this.j + 1)
+		const recentlyAddedIdx = this.originalS.length - recentlyAddedTextLen
+		const actualDelta = this.originalS.substring(Math.max(this.i, recentlyAddedIdx), this.j + 1)
+		const ignoredSuffix = this.originalS.substring(Math.max(this.j + 1, recentlyAddedIdx), Infinity)
+		return [actualDelta, ignoredSuffix] as const
 	}


+
 }



-export const extractCodeFromRegular = ({ text, recentlyAddedTextLen }: { text: string, recentlyAddedTextLen: number }): [string, string] => {
-	// Match either:
-	// 1. ```language\n<code>```
-	// 2. ```<code>```
+export const extractCodeFromRegular = ({ text, recentlyAddedTextLen }: { text: string, recentlyAddedTextLen: number }): [string, string, string] => {

 	const pm = new SurroundingsRemover(text)

 	pm.removeCodeBlock()

 	const s = pm.value()
-	const actual = pm.actualRecentlyAdded(recentlyAddedTextLen)
+	const [delta, ignoredSuffix] = pm.deltaInfo(recentlyAddedTextLen)

-	return [s, actual]
+	return [s, delta, ignoredSuffix]
 }


@@ -124,7 +132,7 @@ export const extractCodeFromRegular = ({ text, recentlyAddedTextLen }: { text: s


 // Ollama has its own FIM, we should not use this if we use that
-export const extractCodeFromFIM = ({ text, recentlyAddedTextLen, midTag, }: { text: string, recentlyAddedTextLen: number, midTag: string }): [string, string] => {
+export const extractCodeFromFIM = ({ text, recentlyAddedTextLen, midTag, }: { text: string, recentlyAddedTextLen: number, midTag: string }): [string, string, string] => {

 	/* ------------- summary of the regex -------------
 		[optional ` | `` | ```]
@@ -146,9 +154,9 @@ export const extractCodeFromFIM = ({ text, recentlyAddedTextLen, midTag, }: { te
 		pm.removeSuffix(`</${midTag}>`)
 	}
 	const s = pm.value()
-	const actual = pm.actualRecentlyAdded(recentlyAddedTextLen)
+	const [delta, ignoredSuffix] = pm.deltaInfo(recentlyAddedTextLen)

-	return [s, actual]
+	return [s, delta, ignoredSuffix]


 	// // const regex = /[\s\S]*?(?:`{1,3}\s*([a-zA-Z_]+[\w]*)?[\s\S]*?)?<MID>([\s\S]*?)(?:<\/MID>|`{1,3}|$)/;
@@ -25,7 +25,7 @@ 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 { voidPrefixAndSuffix, ctrlKStream_userMessage, ctrlKStream_systemMessage, fastApply_userMessage, fastApply_systemMessage, defaultFimTags } from './prompt/prompts.js';
 import { ILLMMessageService } from '../../../../platform/void/common/llmMessageService.js';

 import { mountCtrlK } from '../browser/react/out/quick-edit-tsx/index.js'
@@ -104,10 +104,9 @@ const getLeadingWhitespacePx = (editor: ICodeEditor, startLine: number): number
 export type StartApplyingOpts = {
 	featureName: 'Ctrl+K';
 	diffareaid: number; // id of the CtrlK area (contains text selection)
-	userMessage: string; // user message
 } | {
 	featureName: 'Ctrl+L';
-	userMessage: string;
+	applyStr: string;
 } | {
 	featureName: 'Autocomplete';
 	range: IRange;
@@ -260,6 +259,7 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
 			if (!(model.uri.fsPath in this.diffAreasOfURI)) {
 				this.diffAreasOfURI[model.uri.fsPath] = new Set();
 			}
+			else return // do not add listeners to the same model twice - important, or will see duplicates

 			// when the user types, realign diff areas and re-render them
 			this._register(
@@ -280,7 +280,7 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
 					.filter(diffArea => !!diffArea && diffArea.type === 'DiffZone')
 				const isStreaming = diffZones.find(diffZone => !!diffZone._streamState.isStreaming)
 				if (diffZones.length !== 0 && !isStreaming && !removeAcceptRejectAllUI) {
-					removeAcceptRejectAllUI = this._addAcceptRejectUI(uri) ?? null
+					removeAcceptRejectAllUI = this._addAcceptRejectAllUI(uri) ?? null
 				} else {
 					removeAcceptRejectAllUI?.()
 					removeAcceptRejectAllUI = null
@@ -394,7 +394,7 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
 		}
 	}

-	private _addAcceptRejectUI(uri: URI) {
+	private _addAcceptRejectAllUI(uri: URI) {

 		// find all diffzones that aren't streaming
 		const diffZones: DiffZone[] = []
@@ -1214,7 +1214,6 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
 		let startLine: number
 		let endLine: number
 		let uri: URI
-		let userMessage: string

 		if (featureName === 'Ctrl+L') {

@@ -1231,20 +1230,16 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
 			startLine = 1
 			endLine = numLines

-			userMessage = opts.userMessage
 		}
 		else if (featureName === 'Ctrl+K') {
 			const { diffareaid } = opts
 			const ctrlKZone = this.diffAreaOfId[diffareaid]
 			if (ctrlKZone.type !== 'CtrlKZone') return

-			const { startLine: startLine_, endLine: endLine_, _URI, _mountInfo } = ctrlKZone
+			const { startLine: startLine_, endLine: endLine_, _URI } = ctrlKZone
 			uri = _URI
 			startLine = startLine_
 			endLine = endLine_
-
-			if (!_mountInfo?.textAreaRef.current) return
-			userMessage = _mountInfo.textAreaRef.current?.value
 		}
 		else {
 			throw new Error(`Void: diff.type not recognized on: ${featureName}`)
@@ -1295,26 +1290,38 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
 		let messages: LLMMessage[]

 		if (featureName === 'Ctrl+L') {
-			const userContent = ctrlLStream_prompt({ originalCode, userMessage, uri })
+			const userContent = fastApply_userMessage({ originalCode, applyStr: opts.applyStr, uri })
 			messages = [
-				{ role: 'system', content: ctrlLStream_systemMessage, },
+				{ role: 'system', content: fastApply_systemMessage, },
 				{ role: 'user', content: userContent, }
 			]
 		}
 		else if (featureName === 'Ctrl+K') {
-			const { prefix, suffix } = ctrlKStream_prefixAndSuffix({ fullFileStr: currentFileStr, startLine, endLine })
-			// console.log('PREFIX:\n', prefix)
-			// console.log('SUFFIX:\n', suffix)
-			// console.log('USER CONTENT:\n', userContent)
+			const { diffareaid } = opts
+			const ctrlKZone = this.diffAreaOfId[diffareaid]
+			if (ctrlKZone.type !== 'CtrlKZone') return
+			const { _mountInfo } = ctrlKZone
+			const instructions = _mountInfo?.textAreaRef.current?.value ?? ''

-			// __TODO__ use Ollama's FIM api
-			// if (isOllamaFIM) {...} else:
+			// __TODO__ use Ollama's FIM api, if (isOllamaFIM) {...} else:
+			const { prefix, suffix } = voidPrefixAndSuffix({ fullFileStr: currentFileStr, startLine, endLine })
+			// if (isOllamaFIM) {
+			// 	messages = {
+			// 		type: 'ollamaFIM',
+			// 		prefix,
+			// 		suffix,
+			// 	}
+
+			// }
+			// else {
 			const language = filenameToVscodeLanguage(uri.fsPath) ?? ''
-			const userContent = ctrlKStream_prompt({ selection: originalCode, userMessage, prefix, suffix, isOllamaFIM: false, fimTags: modelFimTags, language })
+			const userContent = ctrlKStream_userMessage({ selection: originalCode, instructions: instructions, prefix, suffix, isOllamaFIM: false, fimTags: modelFimTags, language })
+			// type: 'messages',
 			messages = [
-				{ role: 'system', content: ctrlKStream_systemMessage, },
+				{ role: 'system', content: ctrlKStream_systemMessage({ fimTags: modelFimTags }), },
 				{ role: 'user', content: userContent, }
 			]
+			// }
 		}
 		else { throw new Error(`featureName ${featureName} is invalid`) }

@@ -1354,15 +1361,26 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
 		}

 		const latestStreamInfo = { line: diffZone.startLine, addedSplitYet: false, col: 1, originalCodeStartLine: 1 }
+
+		// state used in onText:
+		let fullText = ''
+		let prevIgnoredSuffix = ''
+
 		streamRequestIdRef.current = this._llmMessageService.sendLLMMessage({
+			type: 'sendLLMMessage',
 			useProviderFor: featureName,
 			logging: { loggingName: `startApplying - ${featureName}` },
 			messages,
-			onText: ({ newText, fullText }) => {
-				const [text, deltaText] = extractText(fullText, newText.length)
+			onText: ({ newText: newText_ }) => {

+				const newText = prevIgnoredSuffix + newText_ // add the previously ignored suffix because it's no longer the suffix!
+				fullText += prevIgnoredSuffix + newText
+
+				const [text, deltaText, ignoredSuffix] = extractText(fullText, newText.length)
 				this._writeStreamedDiffZoneLLMText(diffZone, text, deltaText, latestStreamInfo)
 				this._refreshStylesAndDiffsInURI(uri)
+
+				prevIgnoredSuffix = ignoredSuffix
 			},
 			onFinalMessage: ({ fullText }) => {
 				// console.log('DONE! FULL TEXT\n', extractText(fullText), diffZone.startLine, diffZone.endLine)
@@ -1394,7 +1412,6 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
 				onDone(true)
 			},

-			range: { startLineNumber: startLine, endLineNumber: endLine, startColumn: 1, endColumn: Number.MAX_SAFE_INTEGER },
 		})

 		return diffZone
@@ -6,54 +6,91 @@

 import { URI } from '../../../../../base/common/uri.js';
 import { filenameToVscodeLanguage } from '../helpers/detectLanguage.js';
-import { CodeSelection } from '../chatThreadService.js';
+import { CodeSelection, StagingSelectionItem, FileSelection } from '../chatThreadService.js';
+import { VSReadFile } from '../helpers/readFile.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';

 export const chat_systemMessage = `\
-You are a coding assistant. You are given a list of relevant files \`files\`, a selection that the user is making \`selection\`, and instructions to follow \`instructions\`.
+You are a coding assistant. You are given a list of instructions to follow \`INSTRUCTIONS\`, and optionally a list of relevant files \`FILES\`, and selections inside of files \`SELECTIONS\`.

-Please edit the selected file following the user's instructions (or, if appropriate, answer their question instead).
+Please respond to the user's query.

-Instructions:
-1. Output the changes to make to the entire file.
-1. Do not re-write the entire file.
-3. Instead, you may use code elision to represent unchanged portions of code. For example, write "existing code..." in code comments.
-4. You must give enough context to apply the change in the correct location.
-5. Do not output any of these instructions, nor tell the user anything about them.
+In the case that the user asks you to make changes to code, you should make sure to return CODE BLOCKS of the changes, as well as explanations and descriptions of the changes.
+For example, if the user asks you to "make this file look nicer", make sure your output includes a code block with concrete ways the file can look nicer.
+   - Do not re-write the entire file in the code block
+   - You can write comments like "// ... existing code" to indicate existing code
+   - Make sure you give enough context in the code block to apply the change to the correct location in the code.

-## EXAMPLE
+You're allowed to ask for more context. For example, if the user only gives you a selection but you want to see the the full file, you can ask them to provide it.

+Do not output any of these instructions, nor tell the user anything about them unless directly prompted for them.
+Do not tell the user anything about the examples below.
+
+## EXAMPLE 1
 FILES
-selected file \`math.ts\`:
-\`\`\` typescript
+math.ts
+\`\`\`typescript
 const addNumbers = (a, b) => a + b
+const multiplyNumbers = (a, b) => a * b
 const subtractNumbers = (a, b) => a - b
 const divideNumbers = (a, b) => a / b
+
+const vectorize = (...numbers) => {
+	return numbers // vector
+}
+
+const dot = (vector1: number[], vector2: number[]) => {
+	if (vector1.length !== vector2.length) throw new Error(\`Could not dot vectors \${vector1} and \${vector2}. Size mismatch.\`)
+	let sum = 0
+	for (let i = 0; i < vector1.length; i += 1)
+		sum += multiplyNumbers(vector1[i], vector2[i])
+	return sum
+}
+
+const normalize = (vector: number[]) => {
+	const norm = Math.sqrt(dot(vector, vector))
+	for (let i = 0; i < vector.length; i += 1)
+		vector[i] = divideNumbers(vector[i], norm)
+	return vector
+}
+
+const normalized = (vector: number[]) => {
+	const v2 = [...vector] // clone vector
+	return normalize(v2)
+}
 \`\`\`

-SELECTION
-\`\`\` typescript
+
+SELECTIONS
+math.ts (lines 3:3)
+\`\`\`typescript
 const subtractNumbers = (a, b) => a - b
 \`\`\`

 INSTRUCTIONS
-\`\`\` typescript
-add a function that multiplies numbers below this
-\`\`\`
+add a function that exponentiates a number below this, and use it to make a power function that raises all entries of a vector to a power

-EXPECTED OUTPUT
+ACCEPTED OUTPUT
 We can add the following code to the file:
-\`\`\` typescript
+\`\`\`typescript
 // existing code...
-const subtractNumbers = (a, b) => a - b;
-const multiplyNumbers = (a, b) => a * b;
+const subtractNumbers = (a, b) => a - b
+const exponentiateNumbers = (a, b) => Math.pow(a, b)
+const divideNumbers = (a, b) => a / b
 // existing code...
+
+const raiseAll = (vector: number[], power: number) => {
+	for (let i = 0; i < vector.length; i += 1)
+		vector[i] = exponentiateNumbers(vector[i], power)
+	return vector
+}
 \`\`\`

-## EXAMPLE

+## EXAMPLE 2
 FILES
-selected file \`fib.ts\`:
-\`\`\` typescript
+fib.ts
+\`\`\`typescript

 const dfs = (root) => {
 	if (!root) return;
@@ -67,19 +104,18 @@ const fib = (n) => {
 }
 \`\`\`

-SELECTION
-\`\`\` typescript
+SELECTIONS
+fib.ts (lines 10:10)
+\`\`\`typescript
 	return fib(n - 1) + fib(n - 2)
 \`\`\`

 INSTRUCTIONS
-\`\`\` typescript
 memoize results
-\`\`\`

-EXPECTED OUTPUT
+ACCEPTED OUTPUT
 To implement memoization in your Fibonacci function, you can use a JavaScript object to store previously computed results. This will help avoid redundant calculations and improve performance. Here's how you can modify your function:
-\`\`\` typescript
+\`\`\`typescript
 // existing code...
 const fib = (n, memo = {}) => {
    if (n < 1) return 1;
@@ -97,191 +133,94 @@ Store Result: After computing fib(n), the result is stored in memo for future re
 `


+type FileSelnLocal = FileSelection & { content: string }
+const stringifyFileSelection = ({ fileURI, selectionStr, range, content }: FileSelnLocal) => {
+	return `\
+${fileURI.fsPath}
+\`\`\`${filenameToVscodeLanguage(fileURI.fsPath) ?? ''}
+${content}
+\`\`\`
+`
+}
+const stringifyCodeSelection = ({ fileURI, selectionStr, range }: CodeSelection) => {
+	return `\
+${fileURI.fsPath} (lines ${range.startLineNumber}:${range.endLineNumber})
+\`\`\`${filenameToVscodeLanguage(fileURI.fsPath) ?? ''}
+${selectionStr}
+\`\`\`
+`
+}

-const stringifySelections = (selections: CodeSelection[]) => {
-	return selections.map(({ fileURI, content, selectionStr }) =>
-		`\
-File: ${fileURI.fsPath}
-\`\`\` ${filenameToVscodeLanguage(fileURI.fsPath) ?? ''}
-${content // this was the enite file which is foolish
-		}
-\`\`\`${selectionStr === null ? '' : `
-Selection: ${selectionStr}`}
-`).join('\n')
+const failToReadStr = 'Could not read content. This file may have been deleted. If you expected content here, you can tell the user about this as they might not know.'
+const stringifyFileSelections = async (fileSelections: FileSelection[], modelService: IModelService) => {
+	if (fileSelections.length === 0) return null
+	const fileSlns: FileSelnLocal[] = await Promise.all(fileSelections.map(async (sel) => {
+		const content = await VSReadFile(modelService, sel.fileURI) ?? failToReadStr
+		return { ...sel, content }
+	}))
+	return fileSlns.map(sel => stringifyFileSelection(sel)).join('\n')
+}
+const stringifyCodeSelections = (codeSelections: CodeSelection[]) => {
+	return codeSelections.map(sel => stringifyCodeSelection(sel)).join('\n')
 }


-export const chat_prompt = (instructions: string, selections: CodeSelection[] | null) => {
-	let str = '';
-	if (selections && selections.length > 0) {
-		str += stringifySelections(selections);
-		str += `Please edit the selected code following these instructions:\n`
-	}
-	str += `${instructions}`;
+
+export const chat_userMessage = async (instructions: string, selections: StagingSelectionItem[] | null, modelService: IModelService) => {
+	const fileSelections = selections?.filter(s => s.type === 'File') as FileSelection[]
+	const codeSelections = selections?.filter(s => s.type === 'Selection') as CodeSelection[]
+
+	const filesStr = await stringifyFileSelections(fileSelections, modelService)
+	const codeStr = stringifyCodeSelections(codeSelections)
+
+	let str = ''
+	if (filesStr) str += `FILES\n${filesStr}\n`
+	if (codeStr) str += `SELECTIONS\n${codeStr}\n`
+	str += `INSTRUCTIONS\n${instructions}`
 	return str;
 };




-export const ctrlLStream_systemMessage = `
-You are a coding assistant that applies a diff to a file. You are given the original file \`original_file\`, a diff \`diff\`, and a new file that you are applying the diff to \`new_file\`.
-
-Please finish writing the new file \`new_file\`, according to the diff \`diff\`. You must completely re-write the whole file, using the diff.
+export const fastApply_systemMessage = `\
+You are a coding assistant that re-writes an entire file to make a change. You are given the original file \`ORIGINAL_FILE\` and a change \`CHANGE\`.

 Directions:
-1. Continue exactly where the new file \`new_file\` left off.
+1. Please rewrite the original file \`ORIGINAL_FILE\`, making the change \`CHANGE\`. You must completely re-write the whole file.
 2. Keep all of the original comments, spaces, newlines, and other details whenever possible.
-3. Note that \`+\` lines represent additions, \`-\` lines represent removals, and space lines \` \` represent no change.
-
-# Example 1:
-
-ORIGINAL_FILE
-\`Sidebar.tsx\`:
-\`\`\` typescript
-import React from 'react';
-import styles from './Sidebar.module.css';
-
-interface SidebarProps {
-  items: { label: string; href: string }[];
-  onItemSelect?: (label: string) => void;
-  onExtraButtonClick?: () => void;
-}
-
-const Sidebar: React.FC<SidebarProps> = ({ items, onItemSelect, onExtraButtonClick }) => {
-  return (
-    <div className={styles.sidebar}>
-      <ul>
-        {items.map((item, index) => (
-          <li key={index}>
-            <button
-              className={styles.sidebarButton}
-              onClick={() => onItemSelect?.(item.label)}
-            >
-              {item.label}
-            </button>
-          </li>
-        ))}
-      </ul>
-      <button className={styles.extraButton} onClick={onExtraButtonClick}>
-        Extra Action
-      </button>
-    </div>
-  );
-};
-
-export default Sidebar;
-\`\`\`
-
-DIFF
-\`\`\` typescript
-@@ ... @@
-<div className={styles.sidebar}>
-<ul>
-  {items.map((item, index) => (
-	<li key={index}>
-	  <button
-		className={styles.sidebarButton}
-		onClick={() => onItemSelect?.(item.label)}
-	  >
-		{item.label}
-	  </button>
-	</li>
-  ))}
-</ul>
-<button className={styles.extraButton} onClick={onExtraButtonClick}>
-  Extra Action
-</button>
-</div>
-+<div className={styles.sidebar}>
-+<ul>
-+  {items.map((item, index) => (
-+	<li key={index}>
-+	  <div
-+		className={styles.sidebarButton}
-+		onClick={() => onItemSelect?.(item.label)}
-+	  >
-+		{item.label}
-+	  </div>
-+	</li>
-+  ))}
-+</ul>
-+<div className={styles.extraButton} onClick={onExtraButtonClick}>
-+  Extra Action
-+</div>
-+</div>
-\`\`\`
-
-NEW_FILE
-\`\`\` typescript
-import React from 'react';
-import styles from './Sidebar.module.css';
-
-interface SidebarProps {
-  items: { label: string; href: string }[];
-  onItemSelect?: (label: string) => void;
-  onExtraButtonClick?: () => void;
-}
-
-const Sidebar: React.FC<SidebarProps> = ({ items, onItemSelect, onExtraButtonClick }) => {
-  return (
-\`\`\`
-
-COMPLETION
-\`\`\` typescript
-    <div className={styles.sidebar}>
-      <ul>
-        {items.map((item, index) => (
-          <li key={index}>
-            <div
-              className={styles.sidebarButton}
-              onClick={() => onItemSelect?.(item.label)}
-            >
-              {item.label}
-            </div>
-          </li>
-        ))}
-      </ul>
-      <div className={styles.extraButton} onClick={onExtraButtonClick}>
-        Extra Action
-      </div>
-    </div>
-  );
-};
-
-export default Sidebar;\`\`\`
+3. ONLY output the full new file. Do not add any other explanations or text.
 `




-export const ctrlLStream_prompt = ({ originalCode, userMessage, uri }: { originalCode: string, userMessage: string, uri: URI }) => {
+export const fastApply_userMessage = ({ originalCode, applyStr, uri }: { originalCode: string, applyStr: string, uri: URI }) => {

 	const language = filenameToVscodeLanguage(uri.fsPath) ?? ''

 	return `\
-ORIGINAL_CODE
-\`\`\` ${language}
+ORIGINAL_FILE
+\`\`\`${language}
 ${originalCode}
 \`\`\`

-DIFF
+CHANGE
 \`\`\`
-${userMessage}
+${applyStr}
 \`\`\`

 INSTRUCTIONS
-Please finish writing the new file by applying the diff to the original file. Return ONLY the completion of the file, without any explanation.
+Please finish writing the new file by applying the change to the original file. Return ONLY the completion of the file, without any explanation.
 `
 }



-export const ctrlKStream_systemMessage = `\
-`


-export const ctrlKStream_prefixAndSuffix = ({ fullFileStr, startLine, endLine }: { fullFileStr: string, startLine: number, endLine: number }) => {
+
+export const voidPrefixAndSuffix = ({ fullFileStr, startLine, endLine }: { fullFileStr: string, startLine: number, endLine: number }) => {

 	const fullFileLines = fullFileStr.split('\n')

@@ -336,16 +275,31 @@ export type FimTagsType = {
 	midTag: string
 }
 export const defaultFimTags: FimTagsType = {
-	preTag: 'BEFORE',
-	sufTag: 'AFTER',
+	preTag: 'ABOVE',
+	sufTag: 'BELOW',
 	midTag: 'SELECTION',
 }

-export const ctrlKStream_prompt = ({ selection, prefix, suffix, userMessage, fimTags, isOllamaFIM, language }:
-	{
-		selection: string, prefix: string, suffix: string, userMessage: string, fimTags: FimTagsType, language: string,
-		isOllamaFIM: false, // we require this be false for clarity
-	}) => {
+// this should probably be longer
+export const ctrlKStream_systemMessage = ({ fimTags: { preTag, midTag, sufTag } }: { fimTags: FimTagsType }) => {
+	return `\
+You are a FIM (fill-in-the-middle) coding assistant. Your task is to fill in the middle SELECTION marked by <${midTag}> tags.
+
+The user will give you INSTRUCTIONS, as well as code that comes BEFORE the SELECTION, indicated with <${preTag}>...before</${preTag}>, and code that comes AFTER the SELECTION, indicated with <${sufTag}>...after</${sufTag}>.
+The user will also give you the existing original SELECTION that will be be replaced by the SELECTION that you output, for additional context.
+
+Instructions:
+1. Your OUTPUT should be a SINGLE PIECE OF CODE of the form <${midTag}>...new_code</${midTag}>. Do NOT output any text or explanations before or after this.
+2. You may ONLY CHANGE the original SELECTION, and NOT the content in the <${preTag}>...</${preTag}> or <${sufTag}>...</${sufTag}> tags.
+3. Make sure all brackets in the new selection are balanced the same as in the original selection.
+4. Be careful not to duplicate or remove variables, comments, or other syntax by mistake.
+`
+}
+
+export const ctrlKStream_userMessage = ({ selection, prefix, suffix, instructions, fimTags, isOllamaFIM, language }: {
+	selection: string, prefix: string, suffix: string, instructions: string, fimTags: FimTagsType, language: string,
+	isOllamaFIM: false, // we require this be false for clarity
+}) => {
 	const { preTag, sufTag, midTag } = fimTags

 	// prompt the model artifically on how to do FIM
@@ -353,300 +307,20 @@ export const ctrlKStream_prompt = ({ selection, prefix, suffix, userMessage, fim
 	// const sufTag = 'AFTER'
 	// const midTag = 'SELECTION'
 	return `\
-The user is selecting this code as their SELECTION:
-\`\`\` ${language}
+
+CURRENT SELECTION
+\`\`\`${language}
 <${midTag}>${selection}</${midTag}>
 \`\`\`

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

-Please edit the SELECTION following the user's INSTRUCTIONS, and return the edited selection.
-
-Note that the SELECTION has code that comes before it. This code is indicated with <${preTag}>...before</${preTag}>.
-Note also that the SELECTION has code that comes after it. This code is indicated with <${sufTag}>...after</${sufTag}>.
-
-Instructions:
-1. Your OUTPUT should be a SINGLE PIECE OF CODE of the form <${midTag}>...new_selection</${midTag}>. Do NOT output any text or explanations before or after this.
-2. You may ONLY CHANGE the original SELECTION, and NOT the content in the <${preTag}>...</${preTag}> or <${sufTag}>...</${sufTag}> tags.
-3. Make sure all brackets in the new selection are balanced the same as in the original selection.
-4. Be careful not to duplicate or remove variables, comments, or other syntax by mistake.
-
-Given the code:
 <${preTag}>${prefix}</${preTag}>
 <${sufTag}>${suffix}</${sufTag}>

-Return only the completion block of code (of the form \`\`\` ${language}\n <${midTag}>...new_selection</${midTag}>\`\`\`):`
+Return only the completion block of code (of the form \`\`\`${language}
+<${midTag}>...new code</${midTag}>
+\`\`\`).`
 };

-
-
-// export const searchDiffChunkInstructions = `
-// You are a coding assistant that applies a diff to a file. You are given a diff \`diff\`, a list of files \`files\` to apply the diff to, and a selection \`selection\` that you are currently considering in the file.
-
-// Determine whether you should modify ANY PART of the selection \`selection\` following the \`diff\`. Return \`true\` if you should modify any part of the selection, and \`false\` if you should not modify any part of it.
-
-// # Example 1:
-
-// FILES
-// selected file \`Sidebar.tsx\`:
-// \`\`\`
-// import React from 'react';
-// import styles from './Sidebar.module.css';
-
-// interface SidebarProps {
-//   items: { label: string; href: string }[];
-//   onItemSelect?: (label: string) => void;
-//   onExtraButtonClick?: () => void;
-// }
-
-// const Sidebar: React.FC<SidebarProps> = ({ items, onItemSelect, onExtraButtonClick }) => {
-//   return (
-//     <div className={styles.sidebar}>
-//       <ul>
-//         {items.map((item, index) => (
-//           <li key={index}>
-//             <button
-//               className={styles.sidebarButton}
-//               onClick={() => onItemSelect?.(item.label)}
-//             >
-//               {item.label}
-//             </button>
-//           </li>
-//         ))}
-//       </ul>
-//       <button className={styles.extraButton} onClick={onExtraButtonClick}>
-//         Extra Action
-//       </button>
-//     </div>
-//   );
-// };
-
-// export default Sidebar;
-// \`\`\`
-
-// DIFF
-// \`\`\`
-// @@ ... @@
-// -<div className={styles.sidebar}>
-// -<ul>
-// -  {items.map((item, index) => (
-// -	<li key={index}>
-// -	  <button
-// -		className={styles.sidebarButton}
-// -		onClick={() => onItemSelect?.(item.label)}
-// -	  >
-// -		{item.label}
-// -	  </button>
-// -	</li>
-// -  ))}
-// -</ul>
-// -<button className={styles.extraButton} onClick={onExtraButtonClick}>
-// -  Extra Action
-// -</button>
-// -</div>
-// +<div className={styles.sidebar}>
-// +<ul>
-// +  {items.map((item, index) => (
-// +	<li key={index}>
-// +	  <div
-// +		className={styles.sidebarButton}
-// +		onClick={() => onItemSelect?.(item.label)}
-// +	  >
-// +		{item.label}
-// +	  </div>
-// +	</li>
-// +  ))}
-// +</ul>
-// +<div className={styles.extraButton} onClick={onExtraButtonClick}>
-// +  Extra Action
-// +</div>
-// +</div>
-// \`\`\`
-
-// SELECTION
-// \`\`\`
-// import React from 'react';
-// import styles from './Sidebar.module.css';
-
-// interface SidebarProps {
-//   items: { label: string; href: string }[];
-//   onItemSelect?: (label: string) => void;
-//   onExtraButtonClick?: () => void;
-// }
-
-// const Sidebar: React.FC<SidebarProps> = ({ items, onItemSelect, onExtraButtonClick }) => {
-//   return (
-//     <div className={styles.sidebar}>
-//       <ul>
-//         {items.map((item, index) => (
-// \`\`\`
-
-// RESULT
-// The output should be \`true\` because the diff begins on the line with \`<div className={styles.sidebar}>\` and this line is present in the selection.
-
-// OUTPUT
-// \`true\`
-// `
-
-
-
-// export const generateDiffInstructions = `
-// You are a coding assistant. You are given a list of relevant files \`files\`, a selection that the user is making \`selection\`, and instructions to follow \`instructions\`.
-
-// Please edit the selected file following the user's instructions (or, if appropriate, answer their question instead).
-
-// All changes made to files must be outputted in unified diff format.
-// Unified diff format instructions:
-// 1. Each diff must begin with \`\`\`@@ ... @@\`\`\`.
-// 2. Each line must start with a \`+\` or \`-\` or \` \` symbol.
-// 3. Make diffs more than a few lines.
-// 4. Make high-level diffs rather than many one-line diffs.
-
-// Here's an example of unified diff format:
-
-// \`\`\`
-// @@ ... @@
-// -def factorial(n):
-// -    if n == 0:
-// -        return 1
-// -    else:
-// -        return n * factorial(n-1)
-// +def factorial(number):
-// +    if number == 0:
-// +        return 1
-// +    else:
-// +        return number * factorial(number-1)
-// \`\`\`
-
-// Please create high-level diffs where you group edits together if they are near each other, like in the above example. Another way to represent the above example is to make many small line edits. However, this is less preferred, because the edits are not high-level. The edits are close together and should be grouped:
-
-// \`\`\`
-// @@ ... @@ # This is less preferred because edits are close together and should be grouped:
-// -def factorial(n):
-// +def factorial(number):
-// -    if n == 0:
-// +    if number == 0:
-//          return 1
-//      else:
-// -        return n * factorial(n-1)
-// +        return number * factorial(number-1)
-// \`\`\`
-
-// # Example 1:
-
-// FILES
-// selected file \`test.ts\`:
-// \`\`\`
-// x = 1
-
-// {{selection}}
-
-// z = 3
-// \`\`\`
-
-// SELECTION
-// \`\`\`const y = 2\`\`\`
-
-// INSTRUCTIONS
-// \`\`\`y = 3\`\`\`
-
-// EXPECTED RESULT
-
-// We should change the selection from \`\`\`y = 2\`\`\` to \`\`\`y = 3\`\`\`.
-// \`\`\`
-// @@ ... @@
-// -x = 1
-// -
-// -y = 2
-// +x = 1
-// +
-// +y = 3
-// \`\`\`
-
-// # Example 2:
-
-// FILES
-// selected file \`Sidebar.tsx\`:
-// \`\`\`
-// import React from 'react';
-// import styles from './Sidebar.module.css';
-
-// interface SidebarProps {
-//   items: { label: string; href: string }[];
-//   onItemSelect?: (label: string) => void;
-//   onExtraButtonClick?: () => void;
-// }
-
-// const Sidebar: React.FC<SidebarProps> = ({ items, onItemSelect, onExtraButtonClick }) => {
-//   return (
-//     <div className={styles.sidebar}>
-//       <ul>
-//         {items.map((item, index) => (
-//           <li key={index}>
-//              {{selection}}
-//               className={styles.sidebarButton}
-//               onClick={() => onItemSelect?.(item.label)}
-//             >
-//               {item.label}
-//             </button>
-//           </li>
-//         ))}
-//       </ul>
-//       <button className={styles.extraButton} onClick={onExtraButtonClick}>
-//         Extra Action
-//       </button>
-//     </div>
-//   );
-// };
-
-// export default Sidebar;
-// \`\`\`
-
-// SELECTION
-// \`\`\`             <button\`\`\`
-
-// INSTRUCTIONS
-// \`\`\`make all the buttons like this into divs\`\`\`
-
-// EXPECTED OUTPUT
-
-// We should change all the buttons like the one selected into a div component. Here is the change:
-// \`\`\`
-// @@ ... @@
-// -<div className={styles.sidebar}>
-// -<ul>
-// -  {items.map((item, index) => (
-// -	<li key={index}>
-// -	  <button
-// -		className={styles.sidebarButton}
-// -		onClick={() => onItemSelect?.(item.label)}
-// -	  >
-// -		{item.label}
-// -	  </button>
-// -	</li>
-// -  ))}
-// -</ul>
-// -<button className={styles.extraButton} onClick={onExtraButtonClick}>
-// -  Extra Action
-// -</button>
-// -</div>
-// +<div className={styles.sidebar}>
-// +<ul>
-// +  {items.map((item, index) => (
-// +	<li key={index}>
-// +	  <div
-// +		className={styles.sidebarButton}
-// +		onClick={() => onItemSelect?.(item.label)}
-// +	  >
-// +		{item.label}
-// +	  </div>
-// +	</li>
-// +  ))}
-// +</ul>
-// +<div className={styles.extraButton} onClick={onExtraButtonClick}>
-// +  Extra Action
-// +</div>
-// +</div>
-// \`\`\`
-// `;
@@ -80,6 +80,22 @@ const args = process.argv.slice(2);
 const isWatch = args.includes('--watch') || args.includes('-w');

 if (isWatch) {
+	// this just builds it if it doesn't exist instead of waiting for the watcher to trigger
+	// Check if src2/ exists; if not, do an initial scope-tailwind build
+	if (!fs.existsSync('src2')) {
+		try {
+			console.log('🔨 Running initial scope-tailwind build to create src2 folder...');
+			execSync(
+				'npx scope-tailwind ./src -o src2/ -s void-scope -c styles.css -p "void-"',
+				{ stdio: 'inherit' }
+			);
+			console.log('✅ src2/ created successfully.');
+		} catch (err) {
+			console.error('❌ Error running initial scope-tailwind build:', err);
+			process.exit(1);
+		}
+	}
+
 	// Watch mode
 	const scopeTailwindWatcher = spawn('npx', [
 		'nodemon',
@@ -13,10 +13,9 @@ export const BlockCode = ({ buttonsOnHover, ...codeEditorProps }: { buttonsOnHov

 	return (
 		<>
-			<div className="relative group w-full overflow-hidden">
+			<div className="relative group w-full overflow-hidden my-4">
 				{buttonsOnHover === null ? null : (
-					<div className={`z-[1] absolute top-0 right-0 opacity-0 group-hover:opacity-100 duration-200 ${isSingleLine ? 'h-full flex items-center' : ''
-						}`}>
+					<div className={`z-[1] absolute top-0 right-0 opacity-0 group-hover:opacity-100 duration-200 ${isSingleLine ? 'h-full flex items-center' : ''}`}>
 						<div className={`flex space-x-1 ${isSingleLine ? 'pr-2' : 'p-2'}`}>
 							{buttonsOnHover}
 						</div>
@@ -41,15 +41,15 @@ const CodeButtonsOnHover = ({ text }: { text: string }) => {
 			.catch(() => { setCopyButtonState(CopyButtonState.Error) })
 		metricsService.capture('Copy Code', { length: text.length }) // capture the length only

-	}, [text, clipboardService])
+	}, [metricsService, clipboardService, text])

 	const onApply = useCallback(() => {
 		inlineDiffService.startApplying({
 			featureName: 'Ctrl+L',
-			userMessage: text,
+			applyStr: text,
 		})
 		metricsService.capture('Apply Code', { length: text.length }) // capture the length only
-	}, [inlineDiffService])
+	}, [metricsService, inlineDiffService, text])

 	const isSingleLine = !text.includes('\n')

@@ -58,7 +58,6 @@ export const QuickEditChat = ({
 		const id = inlineDiffsService.startApplying({
 			featureName: 'Ctrl+K',
 			diffareaid: diffareaid,
-			userMessage: instructions,
 		})
 		setCurrentlyStreamingDiffZone(id ?? null)
 	}, [currStreamingDiffZoneRef, setCurrentlyStreamingDiffZone, isDisabled, inlineDiffsService, diffareaid])
@@ -80,7 +79,7 @@ export const QuickEditChat = ({

 	const keybindingString = accessor.get('IKeybindingService').lookupKeybinding(VOID_CTRL_K_ACTION_ID)?.getLabel()

-	return <div ref={sizerRef} style={{ maxWidth: 500 }} className={`py-2 w-full`}>
+	return <div ref={sizerRef} style={{ maxWidth: 450 }} className={`py-2 w-full`}>
 		<form
 			// copied from SidebarChat.tsx
 			className={`
@@ -146,8 +145,8 @@ export const QuickEditChat = ({
 					{/* X button */}
 					<div className='absolute -top-1 -right-1 cursor-pointer z-1'>
 						<IconX
-							size={16}
-							className="p-[1px] stroke-[2] opacity-80 text-void-fg-3 hover:brightness-95"
+							size={12}
+							className="stroke-[2] opacity-80 text-void-fg-3 hover:brightness-95"
 							onClick={onX}
 						/>
 					</div>
@@ -9,7 +9,7 @@ import { errorDetails } from '../../../../../../../platform/void/common/llmMessa


 export const ErrorDisplay = ({
-	message:message_,
+	message: message_,
 	fullError,
 	onDismiss,
 	showDismiss,
@@ -23,7 +23,7 @@ export const ErrorDisplay = ({

 	const details = errorDetails(fullError)

-	const message = message_ === 'TypeError: fetch failed' ? 'TypeError: fetch failed. This likely means you specified the wrong endpoint in Void Settings.' : message_
+	const message = message_ === 'TypeError: fetch failed' ? 'TypeError: fetch failed. This likely means you specified the wrong endpoint in Void Settings.' : message_ + ''


 	return (
@@ -3,32 +3,23 @@
 *  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';
+import React, { ButtonHTMLAttributes, FormEvent, FormHTMLAttributes, Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';


 import { useAccessor, useSidebarState, useChatThreadsState, useChatThreadsStreamState, useUriState } from '../util/services.js';
-import { ChatMessage, CodeSelection, CodeStagingSelection } from '../../../chatThreadService.js';
+import { ChatMessage, StagingSelectionItem } from '../../../chatThreadService.js';

 import { BlockCode } from '../markdown/BlockCode.js';
 import { ChatMarkdownRender } from '../markdown/ChatMarkdownRender.js';
 import { URI } from '../../../../../../../base/common/uri.js';
-import { EndOfLinePreference } from '../../../../../../../editor/common/model.js';
 import { IDisposable } from '../../../../../../../base/common/lifecycle.js';
 import { ErrorDisplay } from './ErrorDisplay.js';
-import { OnError, ServiceSendLLMMessageParams } from '../../../../../../../platform/void/common/llmMessageTypes.js';
-import { HistoryInputBox, InputBox } from '../../../../../../../base/browser/ui/inputbox/inputBox.js';
-import { TextAreaFns, VoidCodeEditorProps, VoidInputBox2 } from '../util/inputs.js';
+import { TextAreaFns, VoidInputBox2 } from '../util/inputs.js';
 import { ModelDropdown, WarningBox } from '../void-settings-tsx/ModelDropdown.js';
-import { chat_systemMessage, chat_prompt } from '../../../prompt/prompts.js';
-import { ISidebarStateService } from '../../../sidebarStateService.js';
-import { ILLMMessageService } from '../../../../../../../platform/void/common/llmMessageService.js';
-import { IModelService } from '../../../../../../../editor/common/services/model.js';
 import { SidebarThreadSelector } from './SidebarThreadSelector.js';
 import { useScrollbarStyles } from '../util/useScrollbarStyles.js';
 import { VOID_CTRL_L_ACTION_ID } from '../../../actionIDs.js';
-import { ArrowBigLeftDash, CopyX, Delete, FileX2, SquareX, X } from 'lucide-react';
 import { filenameToVscodeLanguage } from '../../../helpers/detectLanguage.js';
-import { Pencil } from 'lucide-react'
 import { VOID_OPEN_SETTINGS_ACTION_ID } from '../../../voidSettingsPane.js';


@@ -261,8 +252,8 @@ const getBasename = (pathStr: string) => {

 export const SelectedFiles = (
 	{ type, selections, setSelections, showProspectiveSelections }:
-		| { type: 'past', selections: CodeSelection[]; setSelections?: undefined, showProspectiveSelections?: undefined }
-		| { type: 'staging', selections: CodeStagingSelection[]; setSelections: ((newSelections: CodeStagingSelection[]) => void), showProspectiveSelections?: boolean }
+		| { type: 'past', selections: StagingSelectionItem[]; setSelections?: undefined, showProspectiveSelections?: undefined }
+		| { type: 'staging', selections: StagingSelectionItem[]; setSelections: ((newSelections: StagingSelectionItem[]) => void), showProspectiveSelections?: boolean }
 ) => {

 	// index -> isOpened
@@ -287,11 +278,11 @@ export const SelectedFiles = (
 			return withCurrent.slice(0, maxRecentUris)
 		})
 	}, [currentUri])
-	let prospectiveSelections: CodeStagingSelection[] = []
+	let prospectiveSelections: StagingSelectionItem[] = []
 	if (type === 'staging' && showProspectiveSelections) { // handle prospective files
 		// add a prospective file if type === 'staging' and if the user is in a file, and if the file is not selected yet
 		prospectiveSelections = recentUris
-			.filter(uri => !selections.find(s => s.range === null && s.fileURI.fsPath === uri.fsPath))
+			.filter(uri => !selections.find(s => s.type === 'File' && s.fileURI.fsPath === uri.fsPath))
 			.slice(0, maxProspectiveFiles)
 			.map(uri => ({
 				type: 'File',
@@ -339,7 +330,7 @@ export const SelectedFiles = (
 							onClick={() => {
 								if (isThisSelectionProspective) { // add prospective selection to selections
 									if (type !== 'staging') return; // (never)
-									setSelections([...selections, selection as CodeStagingSelection])
+									setSelections([...selections, selection])

 								} else if (isThisSelectionAFile) { // open files
 									commandService.executeCommand('vscode.open', selection.fileURI, {
@@ -413,7 +404,7 @@ export const SelectedFiles = (
 							}}
 						>
 							<BlockCode
-								initValue={selection.selectionStr!}
+								initValue={selection.selectionStr}
 								language={filenameToVscodeLanguage(selection.fileURI.path)}
 								maxHeight={200}
 								showScrollbars={true}
@@ -445,7 +436,7 @@ const ChatBubble_ = ({ isEditMode, isLoading, children, role }: { role: ChatMess
 		className={`
 		relative
 		${isEditMode ? 'px-2 w-full max-w-full'
-				: role === 'user' ? `px-2 self-end w-fit max-w-full`
+				: role === 'user' ? `px-2 self-end w-fit max-w-full whitespace-pre-wrap` // user words should be pre
 					: role === 'assistant' ? `px-2 self-start w-full max-w-full` : ''
 			}
 	`}
@@ -453,7 +444,7 @@ const ChatBubble_ = ({ isEditMode, isLoading, children, role }: { role: ChatMess
 		<div
 			// style chatbubble according to role
 			className={`
-		    text-left space-y-2 rounded-lg
+		    text-left rounded-lg
 			overflow-x-auto max-w-full
 			${role === 'user' ? 'p-2 bg-void-bg-1 text-void-fg-1' : 'px-2'}
 		`}
@@ -486,7 +477,7 @@ const ChatBubble = ({ chatMessage, isLoading }: { chatMessage: ChatMessage, isLo
 	const [isEditMode, setIsEditMode] = useState(false)


-	if (!chatMessage.content) { // don't show if empty
+	if (!chatMessage.content && !isLoading) { // don't show if empty and not loading (if loading, want to show)
 		return null
 	}

@@ -605,130 +596,136 @@ export const SidebarChat = () => {
 			scrollContainerRef.current?.scrollTo({ top: 0, left: 0 })
 	}, [isHistoryOpen, currentThread.id])

-	return <div
-		ref={sidebarRef}
-		className={`w-full h-full`}
+
+	const prevMessagesHTML = useMemo(() => {
+		return previousMessages.map((message, i) =>
+			<ChatBubble key={i} chatMessage={message} />
+		)
+	}, [previousMessages])
+
+
+	const threadSelector = <div ref={historyRef}
+		className={`w-full h-auto ${isHistoryOpen ? '' : 'hidden'} ring-2 ring-widget-shadow ring-inset z-10`}
 	>
-		{/* thread selector */}
-		<div ref={historyRef}
-			className={`w-full h-auto ${isHistoryOpen ? '' : 'hidden'} ring-2 ring-widget-shadow ring-inset z-10`}
-		>
-			<SidebarThreadSelector />
-		</div>
-
-		{/* previous messages + current stream */}
-		<ScrollToBottomContainer
-			scrollContainerRef={scrollContainerRef}
-			className={`
-				w-full h-auto
-				flex flex-col gap-1
-				overflow-x-hidden
-				overflow-y-auto
-			`}
-			style={{ maxHeight: sidebarDimensions.height - historyDimensions.height - formDimensions.height - 36 }} // the height of the previousMessages is determined by all other heights
-		>
-			{/* previous messages */}
-			{previousMessages.map((message, i) =>
-				<ChatBubble key={i} chatMessage={message} />
-			)}
-
-			{/* message stream */}
-			<ChatBubble chatMessage={{ role: 'assistant', content: messageSoFar ?? '', displayContent: messageSoFar || null }} isLoading={isStreaming} />
+		<SidebarThreadSelector />
+	</div>


-			{/* error message */}
-			{latestError === undefined ? null :
-				<div className='px-2'>
-					<ErrorDisplay
-						message={latestError.message}
-						fullError={latestError.fullError}
-						onDismiss={() => { chatThreadsService.dismissStreamError(currentThread.id) }}
-						showDismiss={true}
-					/>
+	const messagesHTML = <ScrollToBottomContainer
+		scrollContainerRef={scrollContainerRef}
+		className={`
+		w-full h-auto
+		flex flex-col
+		overflow-x-hidden
+		overflow-y-auto
+		py-4
+	`}
+		style={{ maxHeight: sidebarDimensions.height - historyDimensions.height - formDimensions.height - 36 }} // the height of the previousMessages is determined by all other heights
+	>
+		{/* previous messages */}
+		{prevMessagesHTML}

-					<WarningBox className='text-sm my-2 pl-4' onClick={() => { commandService.executeCommand(VOID_OPEN_SETTINGS_ACTION_ID) }} text='Open settings' />
-				</div>
-			}
-
-		</ScrollToBottomContainer>
+		{/* message stream */}
+		<ChatBubble chatMessage={{ role: 'assistant', content: messageSoFar ?? '', displayContent: messageSoFar || null }} isLoading={isStreaming} />


-		{/* input box */}
-		<div // this div is used to position the input box properly
-			className={`right-0 left-0 m-2 z-[999] overflow-hidden ${previousMessages.length > 0 ? 'absolute bottom-0' : ''}`}
-		>
-			<div
-				ref={formRef}
-				className={`
-					flex flex-col gap-1 p-2 relative input text-left shrink-0
-					transition-all duration-200
-					rounded-md
-					bg-vscode-input-bg
-					max-h-[80vh] overflow-y-auto
-					border border-void-border-3 focus-within:border-void-border-1 hover:border-void-border-1
-				`}
-				onClick={(e) => {
-					textAreaRef.current?.focus()
-				}}
-			>
-				{/* top row */}
-				<>
-					{/* selections */}
-					<SelectedFiles type='staging' selections={selections || []} setSelections={chatThreadsService.setStaging.bind(chatThreadsService)} showProspectiveSelections={previousMessages.length === 0} />
-				</>
-
-				{/* middle row */}
-				<div>
-
-					{/* text input */}
-					<VoidInputBox2
-						className='min-h-[81px] p-1'
-						placeholder={`${keybindingString ? `${keybindingString} to select. ` : ''}Enter instructions...`}
-						onChangeText={useCallback((newStr: string) => { setInstructionsAreEmpty(!newStr) }, [setInstructionsAreEmpty])}
-						onKeyDown={(e) => {
-							if (e.key === 'Enter' && !e.shiftKey) {
-								onSubmit()
-							}
-						}}
-						ref={textAreaRef}
-						fnsRef={textAreaFnsRef}
-						multiline={true}
-					/>
-				</div>
-
-				{/* bottom row */}
-				<div
-					className='flex flex-row justify-between items-end gap-1'
-				>
-					{/* submit options */}
-					<div className='max-w-[150px]
-						@@[&_select]:!void-border-none
-						@@[&_select]:!void-outline-none
-						flex-grow
-						'
-					>
-						<ModelDropdown featureName='Ctrl+L' />
-					</div>
-
-					{/* submit / stop button */}
-					{isStreaming ?
-						// stop button
-						<ButtonStop
-							onClick={onAbort}
-						/>
-						:
-						// submit button (up arrow)
-						<ButtonSubmit
-							onClick={onSubmit}
-							disabled={isDisabled}
-						/>
-					}
-				</div>
-
+		{/* error message */}
+		{latestError === undefined ? null :
+			<div className='px-2'>
+				<ErrorDisplay
+					message={latestError.message}
+					fullError={latestError.fullError}
+					onDismiss={() => { chatThreadsService.dismissStreamError(currentThread.id) }}
+					showDismiss={true}
+				/>

+				<WarningBox className='text-sm my-2 pl-4' onClick={() => { commandService.executeCommand(VOID_OPEN_SETTINGS_ACTION_ID) }} text='Open settings' />
 			</div>
-		</div >
-	</div >
+		}
+	</ScrollToBottomContainer>
+
+
+	const inputBox = <div // this div is used to position the input box properly
+		className={`right-0 left-0 m-2 z-[999] overflow-hidden ${previousMessages.length > 0 ? 'absolute bottom-0' : ''}`}
+	>
+		<div
+			ref={formRef}
+			className={`
+		flex flex-col gap-1 p-2 relative input text-left shrink-0
+		transition-all duration-200
+		rounded-md
+		bg-vscode-input-bg
+		max-h-[80vh] overflow-y-auto
+		border border-void-border-3 focus-within:border-void-border-1 hover:border-void-border-1
+	`}
+			onClick={(e) => {
+				textAreaRef.current?.focus()
+			}}
+		>
+			{/* top row */}
+			<>
+				{/* selections */}
+				<SelectedFiles type='staging' selections={selections || []} setSelections={chatThreadsService.setStaging.bind(chatThreadsService)} showProspectiveSelections={previousMessages.length === 0} />
+			</>
+
+			{/* middle row */}
+			<div>
+
+				{/* text input */}
+				<VoidInputBox2
+					className='min-h-[81px] p-1'
+					placeholder={`${keybindingString ? `${keybindingString} to select. ` : ''}Enter instructions...`}
+					onChangeText={useCallback((newStr: string) => { setInstructionsAreEmpty(!newStr) }, [setInstructionsAreEmpty])}
+					onKeyDown={(e) => {
+						if (e.key === 'Enter' && !e.shiftKey) {
+							onSubmit()
+						}
+					}}
+					ref={textAreaRef}
+					fnsRef={textAreaFnsRef}
+					multiline={true}
+				/>
+			</div>
+
+			{/* bottom row */}
+			<div
+				className='flex flex-row justify-between items-end gap-1'
+			>
+				{/* submit options */}
+				<div className='max-w-[150px]
+			@@[&_select]:!void-border-none
+			@@[&_select]:!void-outline-none
+			flex-grow
+			'
+				>
+					<ModelDropdown featureName='Ctrl+L' />
+				</div>
+
+				{/* submit / stop button */}
+				{isStreaming ?
+					// stop button
+					<ButtonStop
+						onClick={onAbort}
+					/>
+					:
+					// submit button (up arrow)
+					<ButtonSubmit
+						onClick={onSubmit}
+						disabled={isDisabled}
+					/>
+				}
+			</div>
+		</div>
+	</div>
+
+	return <div ref={sidebarRef} className={`w-full h-full`}>
+		{threadSelector}
+
+		{messagesHTML}
+
+		{inputBox}
+
+	</div>
 }


@@ -15,6 +15,7 @@ import { useAccessor } from './services.js';
 import { ITextModel } from '../../../../../../../editor/common/model.js';
 import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
 import { inputBackground, inputForeground } from '../../../../../../../platform/theme/common/colorRegistry.js';
+import { useFloating, autoUpdate, offset, flip, shift, size, autoPlacement } from '@floating-ui/react';


 // type guard
@@ -296,6 +297,7 @@ export const VoidCheckBox = ({ label, value, onClick, className }: { label: stri
 }


+
 export const VoidCustomSelectBox = <T extends any>({
 	options,
 	selectedOption: selectedOption_,
@@ -306,7 +308,6 @@ export const VoidCustomSelectBox = <T extends any>({
 	className,
 	arrowTouchesText = true,
 	matchInputWidth = false,
-	isMenuPositionFixed = true,
 	gap = 0,
 }: {
 	options: T[];
@@ -318,18 +319,58 @@ export const VoidCustomSelectBox = <T extends any>({
 	className?: string;
 	arrowTouchesText?: boolean;
 	matchInputWidth?: boolean;
-	isMenuPositionFixed?: boolean;
 	gap?: number;
 }) => {
 	const [isOpen, setIsOpen] = useState(false);
-	const [readyToShow, setReadyToShow] = useState(false);
-	const [position, setPosition] = useState({ top: 0, left: 0, width: 0 });
-	const containerRef = useRef<HTMLDivElement | null>(null);
-	const buttonRef = useRef<HTMLButtonElement | null>(null);
-	const measureRef = useRef<HTMLDivElement | null>(null);
+	const measureRef = useRef<HTMLDivElement>(null);

+	// Replace manual positioning with floating-ui
+	const {
+		x,
+		y,
+		strategy,
+		refs,
+		middlewareData,
+		update
+	} = useFloating({
+		open: isOpen,
+		onOpenChange: setIsOpen,
+		placement:'bottom-start',

-	// if the selected option is null, use the 0th option as the selected, and set the option to options[0]
+		middleware: [
+			offset(gap),
+			flip({
+				boundary: document.body,
+				padding: 8
+			}),
+			shift({
+				boundary: document.body,
+				padding: 8,
+			}),
+			size({
+				apply({ availableHeight, elements, rects }) {
+					const maxHeight = Math.min(availableHeight)
+
+					Object.assign(elements.floating.style, {
+						maxHeight: `${maxHeight}px`,
+						overflowY: 'auto',
+						// Ensure the width isn't constrained by the parent
+						width: `${Math.max(
+							rects.reference.width,
+							measureRef.current?.offsetWidth ?? 0
+						)}px`
+					});
+				},
+				padding: 8,
+				// Use viewport as boundary instead of any parent element
+				boundary: document.body,
+			}),
+		],
+		whileElementsMounted: autoUpdate,
+		strategy:'fixed',
+	});
+
+	// if the selected option is null, use the 0th option
 	useEffect(() => {
 		if (!options[0]) return
 		if (!selectedOption_) {
@@ -338,84 +379,33 @@ export const VoidCustomSelectBox = <T extends any>({
 	}, [selectedOption_, options])
 	const selectedOption = !selectedOption_ ? options[0] : selectedOption_

-
-	const updatePosition = useCallback(() => {
-		if (!buttonRef.current || !containerRef.current || !measureRef.current) return;
-
-		const buttonRect = buttonRef.current.getBoundingClientRect();
-		const containerRect = containerRef.current.getBoundingClientRect();
-		const containerWidth = containerRef.current.offsetWidth;
-		const viewportHeight = window.innerHeight;
-		const spaceBelow = viewportHeight - buttonRect.bottom;
-		const spaceNeeded = options.length * 28;
-		const showAbove = spaceBelow < spaceNeeded && buttonRect.top > spaceBelow;
-
-		// Calculate the menu width
-		let menuWidth = matchInputWidth ? containerWidth : buttonRect.width;
-
-		// If not matchInputWidth, calculate content width from measurement div
-		if (!matchInputWidth) {
-			const contentWidth = measureRef.current.offsetWidth;
-			menuWidth = Math.max(buttonRect.width, contentWidth);
-		}
-
-		if (isMenuPositionFixed) {
-			// Fixed positioning (relative to viewport)
-			setPosition({
-				top: showAbove
-					? buttonRect.top - spaceNeeded
-					: buttonRect.bottom + gap,
-				left: buttonRect.left,
-				width: menuWidth,
-			});
-		} else {
-			// Absolute positioning (relative to parent container)
-			setPosition({
-				top: showAbove
-					? -(spaceNeeded + gap)
-					: buttonRect.height + gap,
-				left: 0,
-				width: menuWidth,
-			});
-		}
-
-		setReadyToShow(true);
-	}, [gap, matchInputWidth, options.length, isMenuPositionFixed]);
-
+	// Handle clicks outside
 	useEffect(() => {
-		if (isOpen) {
-			setReadyToShow(false);
-			updatePosition();
-			window.addEventListener('scroll', updatePosition, true);
-			window.addEventListener('resize', updatePosition);
+		if (!isOpen) return;

-			return () => {
-				window.removeEventListener('scroll', updatePosition, true);
-				window.removeEventListener('resize', updatePosition);
-			};
-		} else {
-			setReadyToShow(false);
-		}
-	}, [isOpen, updatePosition]);
-
-	useEffect(() => {
 		const handleClickOutside = (event: MouseEvent) => {
-			if (containerRef.current && !containerRef.current.contains(event.target as Node)) {
+			const target = event.target as Node;
+			const floating = refs.floating.current;
+			const reference = refs.reference.current;
+
+			// Check if reference is an HTML element before using contains
+			const isReferenceHTMLElement = reference && 'contains' in reference;
+
+			if (
+				floating &&
+				(!isReferenceHTMLElement || !reference.contains(target)) &&
+				!floating.contains(target)
+			) {
 				setIsOpen(false);
 			}
 		};

-		if (isOpen) {
-			document.addEventListener('mousedown', handleClickOutside);
-			return () => document.removeEventListener('mousedown', handleClickOutside);
-		}
-	}, [isOpen]);
+		document.addEventListener('mousedown', handleClickOutside);
+		return () => document.removeEventListener('mousedown', handleClickOutside);
+	}, [isOpen, refs.floating, refs.reference]);

 	return (
-		<div
-			ref={containerRef}
-			className={`inline-block relative ${className}`}
-		>
+		<div className={`inline-block relative ${className}`}>
 			{/* Hidden measurement div */}
 			<div
 				ref={measureRef}
@@ -433,11 +423,9 @@ export const VoidCustomSelectBox = <T extends any>({
 			{/* Select Button */}
 			<button
 				type='button'
-				ref={buttonRef}
+				ref={refs.setReference}
 				className="flex items-center h-4 bg-transparent whitespace-nowrap hover:brightness-90 w-full"
-				onClick={() => {
-					setIsOpen(!isOpen);
-				}}
+				onClick={() => setIsOpen(!isOpen)}
 			>
 				<span className={`max-w-[120px] truncate ${arrowTouchesText ? 'mr-1' : ''}`}>
 					{getOptionDisplayName(selectedOption)}
@@ -458,13 +446,20 @@ export const VoidCustomSelectBox = <T extends any>({
 			</button>

 			{/* Dropdown Menu */}
-			{isOpen && readyToShow && (
+			{isOpen && (
 				<div
-					className={`${isMenuPositionFixed ? 'fixed' : 'absolute'} z-10 bg-void-bg-1 border-void-border-1 border overflow-hidden rounded shadow-lg`}
+					ref={refs.setFloating}
+					className="z-10 bg-void-bg-1 border-void-border-1 border overflow-hidden rounded shadow-lg"
 					style={{
-						top: position.top,
-						left: position.left,
-						width: position.width,
+						position: strategy,
+						top: y ?? 0,
+						left: x ?? 0,
+						width: matchInputWidth
+							? (refs.reference.current instanceof HTMLElement ? refs.reference.current.offsetWidth : 0)
+							: Math.max(
+								(refs.reference.current instanceof HTMLElement ? refs.reference.current.offsetWidth : 0),
+								(measureRef.current instanceof HTMLElement ? measureRef.current.offsetWidth : 0)
+							),
 					}}
 				>
 					{options.map((option) => {
@@ -40,9 +40,8 @@ const ModelSelectBox = ({ options, featureName }: { options: ModelOption[], feat
 		getOptionDisplayName={(option) => option.selection.modelName}
 		getOptionDropdownName={(option) => option.name}
 		getOptionsEqual={(a, b) => optionsEqual([a], [b])}
-		className={`text-xs text-void-fg-3 px-1`}
+		className='text-xs text-void-fg-3 px-1'
 		matchInputWidth={false}
-		isMenuPositionFixed={featureName === 'Ctrl+K' ? false : true}
 	/>
 }
 // const ModelSelectBox = ({ options, featureName }: { options: ModelOption[], featureName: FeatureName }) => {
@@ -5,7 +5,7 @@

 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { InputBox } from '../../../../../../../base/browser/ui/inputbox/inputBox.js'
-import { ProviderName, SettingName, displayInfoOfSettingName, providerNames, VoidModelInfo, globalSettingNames, customSettingNamesOfProvider, RefreshableProviderName, refreshableProviderNames, displayInfoOfProviderName, defaultProviderSettings, nonlocalProviderNames, localProviderNames, GlobalSettingName } from '../../../../../../../platform/void/common/voidSettingsTypes.js'
+import { ProviderName, SettingName, displayInfoOfSettingName, providerNames, VoidModelInfo, globalSettingNames, customSettingNamesOfProvider, RefreshableProviderName, refreshableProviderNames, displayInfoOfProviderName, defaultProviderSettings, nonlocalProviderNames, localProviderNames, GlobalSettingName, featureNames, displayInfoOfFeatureName } from '../../../../../../../platform/void/common/voidSettingsTypes.js'
 import ErrorBoundary from '../sidebar-tsx/ErrorBoundary.js'
 import { VoidButton, VoidCheckBox, VoidCustomSelectBox, VoidInputBox, VoidInputBox2, VoidSwitch } from '../util/inputs.js'
 import { useAccessor, useIsDark, useRefreshModelListener, useRefreshModelState, useSettingsState } from '../util/services.js'
@@ -14,7 +14,7 @@ import { useScrollbarStyles } from '../util/useScrollbarStyles.js'
 import { isWindows, isLinux, isMacintosh } from '../../../../../../../base/common/platform.js'
 import { URI } from '../../../../../../../base/common/uri.js'
 import { env } from '../../../../../../../base/common/process.js'
-import { WarningBox } from './ModelDropdown.js'
+import { WarningBox, ModelDropdown } from './ModelDropdown.js'
 import { ChatMarkdownRender } from '../markdown/ChatMarkdownRender.js'

 const SubtleButton = ({ onClick, text, icon, disabled }: { onClick: () => void, text: string, icon: React.ReactNode, disabled: boolean }) => {
@@ -392,7 +392,7 @@ export const AIInstructionsBox = () => {
 	const voidSettingsService = accessor.get('IVoidSettingsService')
 	const voidSettingsState = useSettingsState()
 	return <VoidInputBox2
-	className='min-h-[81px] p-3 rounded-sm'
+		className='min-h-[81px] p-3 rounded-sm'
 		initValue={voidSettingsState.globalSettings.aiInstructions}
 		placeholder={`Do not change my indentation or delete my comments. When writing TS or JS, do not add ;'s. Respond to all queries in French. `}
 		multiline
@@ -597,6 +597,17 @@ const GeneralTab = () => {
 			<AIInstructionsBox />
 		</div>

+		<div className='mt-12'>
+			<h2 className={`text-3xl mb-2`}>Model Selection</h2>
+			{featureNames.map(featureName =>
+				<div key={featureName}
+					className='mb-2'
+				>
+					<h4 className={`text-void-fg-3`}>{displayInfoOfFeatureName(featureName)}</h4>
+					<ModelDropdown featureName={featureName} />
+				</div>
+			)}
+		</div>

 	</>
 }
@@ -11,7 +11,7 @@ import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js

 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
-import { CodeStagingSelection, IChatThreadService } from './chatThreadService.js';
+import { StagingSelectionItem, IChatThreadService } from './chatThreadService.js';

 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { IRange } from '../../../../editor/common/core/range.js';
@@ -112,7 +112,7 @@ registerAction2(class extends Action2 {

 		const selectionStr = getContentInRange(model, selectionRange)

-		const selection: CodeStagingSelection = !selectionRange || !selectionStr || (selectionRange.startLineNumber > selectionRange.endLineNumber) ? {
+		const selection: StagingSelectionItem = !selectionRange || !selectionStr || (selectionRange.startLineNumber > selectionRange.endLineNumber) ? {
 			type: 'File',
 			fileURI: model.uri,
 			selectionStr: null,
@@ -8,7 +8,7 @@ import { EditorInput } from '../../../common/editor/editorInput.js';
 import * as nls from '../../../../nls.js';
 import { EditorExtensions } from '../../../common/editor.js';
 import { EditorPane } from '../../../browser/parts/editor/editorPane.js';
-import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
+import { IEditorGroup, IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.js';
@@ -35,7 +35,7 @@ class VoidSettingsInput extends EditorInput {
 	static readonly ID: string = 'workbench.input.void.settings';

 	static readonly RESOURCE = URI.from({ // I think this scheme is invalid, it just shuts up TS
-		scheme: 'void',  // Custom scheme for our editor
+		scheme: 'void',  // Custom scheme for our editor (try Schemas.https)
 		path: 'settings'
 	})
 	readonly resource = VoidSettingsInput.RESOURCE;
@@ -141,18 +141,27 @@ registerAction2(class extends Action2 {

 	async run(accessor: ServicesAccessor): Promise<void> {
 		const editorService = accessor.get(IEditorService);
+		const editorGroupService = accessor.get(IEditorGroupsService);
+
 		const instantiationService = accessor.get(IInstantiationService);

-		// close all instances if found
-		const openEditors = editorService.findEditors(VoidSettingsInput.RESOURCE);
-		if (openEditors.length > 0) {
-			await editorService.closeEditors(openEditors);
+		// if is open, close it
+		const openEditors = editorService.findEditors(VoidSettingsInput.RESOURCE); // should only have 0 or 1 elements...
+		if (openEditors.length !== 0) {
+			const openEditor = openEditors[0].editor
+			const isCurrentlyOpen = editorService.activeEditor?.resource?.fsPath === openEditor.resource?.fsPath
+			if (isCurrentlyOpen)
+				await editorService.closeEditors(openEditors)
+			else
+				await editorGroupService.activeGroup.openEditor(openEditor)
 			return;
 		}

+
 		// else open it
 		const input = instantiationService.createInstance(VoidSettingsInput);
-		await editorService.openEditor(input);
+
+		await editorGroupService.activeGroup.openEditor(input);
 	}
 })

@@ -53,10 +53,11 @@ registerAction2(class extends Action2 {
 		const notifService = accessor.get(INotificationService)
 		const metricsService = accessor.get(IMetricsService)

+		metricsService.capture('Void Update Manual: Checking...', {})
 		const res = await voidUpdateService.check()
-		if (!res) { notifyErrChecking(notifService); metricsService.capture('Void Update: Error', {}) }
-		else if (res.hasUpdate) { notifyYesUpdate(notifService, res.message); metricsService.capture('Void Update: Yes', {}) }
-		else if (!res.hasUpdate) { notifyNoUpdate(notifService); metricsService.capture('Void Update: No', {}) }
+		if (!res) { notifyErrChecking(notifService); metricsService.capture('Void Update Manual: Error', { res }) }
+		else if (res.hasUpdate) { notifyYesUpdate(notifService, res.message); metricsService.capture('Void Update Manual: Yes', { res }) }
+		else if (!res.hasUpdate) { notifyNoUpdate(notifService); metricsService.capture('Void Update Manual: No', { res }) }
 	}
 })

@@ -65,23 +66,27 @@ class VoidUpdateWorkbenchContribution extends Disposable implements IWorkbenchCo
 	static readonly ID = 'workbench.contrib.void.voidUpdate'
 	constructor(
 		@IVoidUpdateService private readonly voidUpdateService: IVoidUpdateService,
-		@INotificationService private readonly notifService: INotificationService,
 		@IMetricsService private readonly metricsService: IMetricsService,
+		@INotificationService private readonly notifService: INotificationService,
 	) {
 		super()
-
-		// on mount
-		setTimeout(async () => {
+		const autoCheck = async () => {
+			this.metricsService.capture('Void Update Startup: Checking...', {})
 			const res = await this.voidUpdateService.check()
+			if (!res) { notifyErrChecking(this.notifService); this.metricsService.capture('Void Update Startup: Error', { res }) }
+			else if (res.hasUpdate) { notifyYesUpdate(this.notifService, res.message); this.metricsService.capture('Void Update Startup: Yes', { res }) }
+			else if (!res.hasUpdate) { this.metricsService.capture('Void Update Startup: No', { res }) } // display nothing if up to date
+		}

-			const notifService = this.notifService
-			const metricsService = this.metricsService
+		// check once 5 seconds after mount

-			if (!res) { notifyErrChecking(notifService); metricsService.capture('Void Update Startup: Error', {}) }
-			else if (res.hasUpdate) { notifyYesUpdate(this.notifService, res.message); metricsService.capture('Void Update Startup: Yes', {}) }
-			else if (!res.hasUpdate) { metricsService.capture('Void Update Startup: No', {}) } // display nothing if up to date
+		const initId = setTimeout(() => autoCheck(), 5 * 1000)
+		this._register({ dispose: () => clearTimeout(initId) })
+
+		// check every 3 hours
+		const intervalId = setInterval(() => autoCheck(), 3 * 60 * 60 * 1000)
+		this._register({ dispose: () => clearInterval(intervalId) })

-		}, 5 * 1000)
 	}
 }
 registerWorkbenchContribution2(VoidUpdateWorkbenchContribution.ID, VoidUpdateWorkbenchContribution, WorkbenchPhase.BlockRestore);
@@ -44,45 +44,77 @@ export enum ThemeSettings {
 }

 export enum ThemeSettingDefaults {
-	COLOR_THEME_DARK = 'Default Dark Modern',
+	COLOR_THEME_DARK = 'Default Dark+', // Void changed this. this is the default theme
 	COLOR_THEME_LIGHT = 'Default Light Modern',
 	COLOR_THEME_HC_DARK = 'Default High Contrast',
 	COLOR_THEME_HC_LIGHT = 'Default High Contrast Light',

-	COLOR_THEME_DARK_OLD = 'Default Dark+',
+	COLOR_THEME_DARK_OLD = 'Default Dark Modern', // Void changed this
 	COLOR_THEME_LIGHT_OLD = 'Default Light+',

 	FILE_ICON_THEME = 'vs-seti',
 	PRODUCT_ICON_THEME = 'Default',
 }

-export const COLOR_THEME_DARK_INITIAL_COLORS = {
-	'activityBar.activeBorder': '#0078d4',
-	'activityBar.background': '#181818',
-	'activityBar.border': '#2b2b2b',
-	'activityBar.foreground': '#d7d7d7',
-	'activityBar.inactiveForeground': '#868686',
-	'editorGroup.border': '#ffffff17',
-	'editorGroupHeader.tabsBackground': '#181818',
-	'editorGroupHeader.tabsBorder': '#2b2b2b',
-	'statusBar.background': '#181818',
-	'statusBar.border': '#2b2b2b',
-	'statusBar.foreground': '#cccccc',
-	'statusBar.noFolderBackground': '#1f1f1f',
-	'tab.activeBackground': '#1f1f1f',
-	'tab.activeBorder': '#1f1f1f',
-	'tab.activeBorderTop': '#0078d4',
+// export const COLOR_THEME_DARK_INITIAL_COLORS = {
+// 	'activityBar.activeBorder': '#0078d4',
+// 	'activityBar.background': '#181818',
+// 	'activityBar.border': '#2b2b2b',
+// 	'activityBar.foreground': '#d7d7d7',
+// 	'activityBar.inactiveForeground': '#868686',
+// 	'editorGroup.border': '#ffffff17',
+// 	'editorGroupHeader.tabsBackground': '#181818',
+// 	'editorGroupHeader.tabsBorder': '#2b2b2b',
+// 	'statusBar.background': '#181818',
+// 	'statusBar.border': '#2b2b2b',
+// 	'statusBar.foreground': '#cccccc',
+// 	'statusBar.noFolderBackground': '#1f1f1f',
+// 	'tab.activeBackground': '#1f1f1f',
+// 	'tab.activeBorder': '#1f1f1f',
+// 	'tab.activeBorderTop': '#0078d4',
+// 	'tab.activeForeground': '#ffffff',
+// 	'tab.border': '#2b2b2b',
+// 	'textLink.foreground': '#4daafc',
+// 	'titleBar.activeBackground': '#181818',
+// 	'titleBar.activeForeground': '#cccccc',
+// 	'titleBar.border': '#2b2b2b',
+// 	'titleBar.inactiveBackground': '#1f1f1f',
+// 	'titleBar.inactiveForeground': '#9d9d9d',
+// 	'welcomePage.tileBackground': '#2b2b2b'
+// };
+
+
+
+export const COLOR_THEME_DARK_INITIAL_COLORS = { // Void changed this to match dark+
+	'activityBar.activeBorder': '#ffffff',
+	'activityBar.background': '#333333',
+	'activityBar.border': '#454545',
+	'activityBar.foreground': '#ffffff',
+	'activityBar.inactiveForeground': '#ffffff66',
+	'editorGroup.border': '#444444',
+	'editorGroupHeader.tabsBackground': '#252526',
+	'editorGroupHeader.tabsBorder': '#252526',
+	'statusBar.background': '#007ACC',
+	'statusBar.border': '#454545',
+	'statusBar.foreground': '#ffffff',
+	'statusBar.noFolderBackground': '#68217A',
+	'tab.activeBackground': '#2D2D2D',
+	'tab.activeBorder': '#ffffff',
+	'tab.activeBorderTop': '#007ACC',
 	'tab.activeForeground': '#ffffff',
-	'tab.border': '#2b2b2b',
-	'textLink.foreground': '#4daafc',
-	'titleBar.activeBackground': '#181818',
-	'titleBar.activeForeground': '#cccccc',
-	'titleBar.border': '#2b2b2b',
-	'titleBar.inactiveBackground': '#1f1f1f',
-	'titleBar.inactiveForeground': '#9d9d9d',
-	'welcomePage.tileBackground': '#2b2b2b'
+	'tab.border': '#252526',
+	'textLink.foreground': '#3794ff',
+	'titleBar.activeBackground': '#3C3C3C',
+	'titleBar.activeForeground': '#CCCCCC',
+	'titleBar.border': '#454545',
+	'titleBar.inactiveBackground': '#2C2C2C',
+	'titleBar.inactiveForeground': '#999999',
+	'welcomePage.tileBackground': '#252526'
 };

+
+
+
 export const COLOR_THEME_LIGHT_INITIAL_COLORS = {
 	'activityBar.activeBorder': '#005FB8',
 	'activityBar.background': '#f8f8f8',
Author	SHA1	Message	Date
Andrew Pareles	42bfc06258	package update	2025-02-13 01:24:47 -08:00
Andrew Pareles	3baaf8d6c4	comment	2025-01-31 20:24:09 -08:00
Andrew Pareles	0ec0c324b1	void settings opening behavior	2025-01-31 20:17:51 -08:00
Andrew Pareles	9cd8295dab	fix comment	2025-01-30 16:38:51 -08:00
Andrew Pareles	9ec13d2ad8	rm comments	2025-01-30 16:37:44 -08:00
Andrew Pareles	d9cf21448c	add model selection + misc UI improvements (notably, change how model dropdown works)	2025-01-30 15:07:02 -08:00
Andrew Pareles	27d009314b	finish merge	2025-01-29 15:55:18 -08:00
Andrew Pareles	5fdd21f12b	Merge remote-tracking branch 'origin/main' into model-selection	2025-01-29 15:54:07 -08:00
Andrew Pareles	dc5c7e9a46	Merge remote-tracking branch 'origin/main' into model-selection	2025-01-28 21:02:17 -08:00
Andrew Pareles	c1123f2cfd	Merge pull request #233 from bjoaquinc/react-build-bug-fix Fix npm run watchreact initial build bug	2025-01-28 20:04:51 -08:00
Andrew Pareles	fb0bb0ca31	Merge remote-tracking branch 'origin/main' into pr/bjoaquinc/233	2025-01-28 20:04:11 -08:00
Andrew Pareles	4863802713	contrib	2025-01-28 20:02:57 -08:00
Andrew Pareles	5589b2e302	updates	2025-01-28 20:02:15 -08:00
Andrew Pareles	327dbb937b	Merge pull request #183 from bjoaquinc/react-build-improvements Improve React build by incorporating the watcher in base build commands	2025-01-28 19:56:05 -08:00
Mathew Pareles	a3e62ee6f4	autocompletion multiline works	2025-01-28 01:43:47 -08:00
Andrew Pareles	d7a6611d89	read	2025-01-28 01:23:40 -08:00
Mathew Pareles	e4bb15ef64	autocomplete draft	2025-01-27 22:20:19 -08:00
Andrew Pareles	a98c77572e	add gap-4 and remove mt-4 for chat bubbles	2025-01-27 22:18:12 -08:00
Mathew Pareles	e4d747d0a6	andrew ollamaFIM progress	2025-01-26 23:49:16 -08:00
Mathew Pareles	01b1358a01	autocomplete refactor	2025-01-26 19:01:03 -08:00
Mathew Pareles	c7a6bddfbe	groq	2025-01-26 19:01:03 -08:00
Andrew Pareles	55ea8e61c6	Merge pull request #190 from jcommaret/feat-mistral-new [LLM]Mistral implementation	2025-01-25 19:40:44 -08:00
Andrew Pareles	4f7fd66c2f	explanation	2025-01-25 19:39:38 -08:00
Andrew Pareles	4547363dde	mistral fix	2025-01-25 19:38:55 -08:00
Andrew Pareles	a1dfeb0f00	.tool-versions	2025-01-25 19:36:49 -08:00
Andrew Pareles	b036a8c59c	Merge remote-tracking branch 'origin/main' into pr/jcommaret/190	2025-01-25 19:35:05 -08:00
Andrew Pareles	72cd23f0ac	Merge branch 'main' into pr/jcommaret/190	2025-01-25 19:31:25 -08:00
Andrew Pareles	49c2bcb848	Merge pull request #216 from Piyu-Pika/Gemini-experimental-model Add new experimental Gemini models to default settings	2025-01-25 19:30:09 -08:00
Andrew Pareles	97ea0f77f9	remove duplicate model name and add storage fix	2025-01-25 19:29:22 -08:00
Andrew Pareles	0cd6e0fb67	...	2025-01-25 19:01:47 -08:00
Andrew Pareles	7c227e237f	key	2025-01-25 19:01:29 -08:00
Andrew Pareles	3089bb31b5	mistral	2025-01-25 18:39:37 -08:00
Jérôme Commaret	018fd016c8	trying to fix error	2025-01-26 02:05:58 +01:00
Mathew Pareles	f69f90b4c8	Reset Window: Zoom Level default to 0 (#239 ) Co-authored-by: Chandler Thompson <3262190+chandlertee@users.noreplyrgithub.com>	2025-01-25 16:37:00 -08:00
Jérôme Commaret	000747eb88	Merge branch 'main' into feat-mistral-new	2025-01-25 23:58:50 +01:00
Piyush Bhardwaj	74022e0306	Merge branch 'main' into Gemini-experimental-model	2025-01-25 19:42:54 +05:30
Andrew Pareles	21708fd7e0	contrib	2025-01-25 03:14:31 -08:00
Andrew Pareles	5593ff5d79	add key	2025-01-25 03:11:47 -08:00
Andrew Pareles	197067af5a	contrib	2025-01-24 15:19:13 -08:00
Andrew Pareles	eec4f6c95e	email	2025-01-24 15:18:04 -08:00
Andrew Pareles	3e045117d6	contrib	2025-01-24 15:11:57 -08:00
Andrew Pareles	67c557b7b9	contributing	2025-01-24 15:02:16 -08:00
Joaquin Coromina	5ffd569fd8	Fixed npm run watch bug for first time builders by checking if src2 folder already exists, and if not then create it first before setting up the watchers	2025-01-25 00:02:26 +07:00
Jérôme Commaret	ff83bb5edc	Merge branch 'main' into feat-mistral-new and fix conflict introduced by Deepseek	2025-01-24 14:22:06 +01:00
Andrew Pareles	a3f145328b	Merge pull request #231 from voideditor/model-selection DeepSeek as a provider	2025-01-24 03:24:46 -08:00
Mathew Pareles	02894c12de	deepseek	2025-01-24 03:18:42 -08:00
Mathew Pareles	52b6c81507	update style of quickedit	2025-01-24 03:18:42 -08:00
Andrew Pareles	5df5f37a6a	contributing	2025-01-24 01:12:12 -08:00
Andrew Pareles	f247b76a6e	Update README.md	2025-01-24 01:06:07 -08:00
Andrew Pareles	d1c659be9d	+	2025-01-24 01:05:31 -08:00
Andrew Pareles	a6b4955f8d	+	2025-01-23 21:58:48 -08:00
Andrew Pareles	03b0b98eed	+	2025-01-23 21:58:26 -08:00
Andrew Pareles	7f7d30e40b	+	2025-01-23 21:55:32 -08:00
Andrew Pareles	f68bc52023	update readme	2025-01-23 21:42:55 -08:00
Andrew Pareles	520c971e3e	remove jitter on load	2025-01-23 21:41:03 -08:00
Andrew Pareles	657e752987	fix autoupdate	2025-01-23 21:14:10 -08:00
Andrew Pareles	458a5160b0	metrics for updates	2025-01-23 20:58:07 -08:00
Andrew Pareles	a90bbffeb9	Merge pull request #229 from voideditor/model-selection Minor usability updates	2025-01-23 20:37:38 -08:00
Andrew Pareles	99ff885ce2	Merge remote-tracking branch 'origin/main' into model-selection	2025-01-23 20:34:35 -08:00
Andrew Pareles	a97047ed43	higher code icon res	2025-01-23 20:34:10 -08:00
Andrew Pareles	00f10c283e	update tracking	2025-01-23 20:11:15 -08:00
Andrew Pareles	57628ec244	rename version to vscodeVersion	2025-01-23 20:08:20 -08:00
Andrew Pareles	c54dcd0b0c	fix delta issue when streaming	2025-01-23 19:47:01 -08:00
Andrew Pareles	e957932f39	avoid duplicate model listeners	2025-01-23 15:51:37 -08:00
Piyush Bhardwaj	fea9d380cc	Merge branch 'main' into Gemini-experimental-model	2025-01-23 22:35:17 +05:30
bjoaquinc	f2318cc8a2	Merge branch 'voideditor:main' into react-build-improvements	2025-01-23 22:06:50 +07:00
Mathew Pareles	8264cccd04	change default theme to dark+. also set default zoom to -1 (window.zoomLevel.default)	2025-01-23 03:30:26 -08:00
Andrew Pareles	a1ca0f9291	format	2025-01-23 03:25:00 -08:00
Andrew Pareles	58f06d3ebb	minor changes	2025-01-23 02:55:29 -08:00
Mathew Pareles	e06eda1cc4	wording	2025-01-23 02:28:24 -08:00
Mathew Pareles	f4d72e3ee8	remove prompt spaces	2025-01-23 02:26:03 -08:00
Mathew Pareles	b3837a3099	changes to prompt	2025-01-23 02:25:01 -08:00
Andrew Pareles	c6ae6d5152	await whenReady	2025-01-23 01:36:45 -08:00
Andrew Pareles	2d43dbded1	write version	2025-01-23 00:18:13 -08:00
Andrew Pareles	a34d652a1d	improve prompts (+ change chat history types)	2025-01-23 00:02:50 -08:00
Andrew Pareles	a0569b1ead	better FIM codeblock matching	2025-01-23 00:02:50 -08:00
Andrew Pareles	b3ebe85c04	rm system message	2025-01-23 00:02:50 -08:00
Mathew Pareles	0919775e77	refactors for autocomplete	2025-01-22 22:19:54 -08:00
Andrew Pareles	da6636a948	update deviceId code	2025-01-22 18:13:48 -08:00
Mathew Pareles	6327c584cc	remove role=system for compatibility	2025-01-22 17:23:02 -08:00
Andrew Pareles	f7cf44136b	loading	2025-01-22 16:57:02 -08:00
Andrew Pareles	c8635a1bdb	memo previous chat messages as we stream (important)	2025-01-22 16:02:34 -08:00
Andrew Pareles	d7501112f5	fix error handling	2025-01-22 15:47:33 -08:00
Jérôme Commaret	d7ca99e23d	Merge branch 'main' into feat-mistral-new	2025-01-23 00:17:23 +01:00
Andrew Pareles	387be4db76	fix gemini	2025-01-22 03:25:27 -08:00
Andrew Pareles	2aec37fc57	numbering	2025-01-22 03:09:18 -08:00
Andrew Pareles	7e5cc27349	tes	2025-01-22 03:08:50 -08:00
Andrew Pareles	151cdb13e6	add roadmap	2025-01-22 02:56:56 -08:00
Andrew Pareles	d54ccff4a2	see	2025-01-22 02:30:06 -08:00
Andrew Pareles	c2f358bd5e	#announcements	2025-01-22 01:18:50 -08:00
Andrew Pareles	198f04d87a	minor	2025-01-22 01:04:08 -08:00
Andrew Pareles	326e75eb45	minor	2025-01-22 00:57:57 -08:00
Andrew Pareles	7891a908ff	links	2025-01-22 00:55:22 -08:00
Andrew Pareles	6970ec9fd2	contrib	2025-01-22 00:54:01 -08:00
Mathew Pareles	fd4f3c3ab6	Merge remote-tracking branch 'origin/main' into model-selection	2025-01-22 00:45:17 -08:00
Andrew Pareles	aa2394e207	Update README.md	2025-01-22 00:38:26 -08:00
Piyu-Pika	cd9bb6a07d	Add new experimental Gemini models to default settings	2025-01-21 21:46:02 +05:30
Jérôme Commaret	fd989b2c13	Merge branch 'main' into feat-mistral-new	2025-01-20 16:12:45 +01:00
Jérôme Commaret	4b8afc1771	Merge branch 'voideditor:main' into feat-mistral-new	2025-01-14 01:38:11 +01:00
Jérôme Commaret	d067966b58	Merge branch 'model-selection' into feat-mistral-new	2025-01-13 23:31:19 +01:00
Jérôme Commaret	278c52bd35	Merging everything here	2025-01-13 22:48:43 +01:00
Jérôme Commaret	2701226ef3	Translate abort comments	2025-01-10 23:57:40 +01:00
Jérôme Commaret	9abc3ad3dc	_aborter set	2025-01-10 23:46:58 +01:00
Jérôme Commaret	af85949561	Merge branch 'main' into feat-mistral-new	2025-01-09 15:48:57 +01:00
Jérôme Commaret	5453acdb19	Mistral : update	2025-01-03 20:21:46 +01:00
Jérôme Commaret	7047459e57	Merge branch 'main' into feat-mistral-new	2025-01-03 19:57:34 +01:00
Jérôme Commaret	4065c5b504	Mistral implementation : Working	2024-12-27 16:37:27 +01:00
Jérôme Commaret	4729e4dac3	Mistral v2	2024-12-27 14:46:02 +01:00
Joaquin Coromina	1e975ecc3b	Merge branch 'react-build-watcher' into react-build-improvements Adding react build improvements to the proper branch#	2024-12-19 15:22:07 +08:00
Joaquin Coromina	8476a99903	Added watchreactd to tasks.json so that when using build hotkey (cmd/ctrl + shift + B) it includes watchreactd automatically	2024-12-19 15:10:42 +08:00
Joaquin Coromina	85314f8d47	Updated watch script to include watchreact, and added watchreactd	2024-12-19 15:09:16 +08:00