fix merge conflicts

.github/ISSUE_TEMPLATE/issue_template.md

@@ -6,4 +6,4 @@ title: For VSCode-related issues (eg builds), please start the title with `[App]
 
 1. Press `Cmd+Shift+P` in Void, and type `Help: About`. Please paste the information here. Also let us know any other relevant details, like the model and provider you're using if applicable.
 
-2. Describe the issue/feature here.
+2. Describe the issue/feature here!

HOW_TO_CONTRIBUTE.md

@@ -86,7 +86,7 @@ To build Void from the terminal instead of from inside VSCode, follow the steps
 
 - Make sure you followed the prerequisite steps above.
 - Make sure you have Node version `20.18.2` (the version in `.nvmrc`)!
-    - You can do this easily without touching your base installation with [nvm](https://github.com/nvm-sh/nvm). Simply run `nvm install`, followed by `nvm use` and it will automatically install and use the version specified in `nvmrc`
+    - You can do this easily without touching your base installation with [nvm](https://github.com/nvm-sh/nvm). Simply run `nvm install`, followed by `nvm use` and it will automatically install and use the version specified in `nvmrc`.
 - Make sure that the path to your Void folder does not have any spaces in it.
 - If you get `"TypeError: Failed to fetch dynamically imported module"`, make sure all imports end with `.js`.
 - If you get an error with React, try running `NODE_OPTIONS="--max-old-space-size=8192" npm run buildreact`.

README.md

@@ -15,26 +15,23 @@ Use AI agents on your codebase, checkpoint and visualize changes, and bring any
 
 This repo contains the full sourcecode for Void. If you're new, welcome!
 
+- 🧭 [Website](https://voideditor.com)
+
 - 👋 [Discord](https://discord.gg/RSNjgaugJs)
 
-- 🚙 [Roadmap](https://github.com/orgs/voideditor/projects/2)
+- 🚙 [Project Board](https://github.com/orgs/voideditor/projects/2)
 
-- 📝 [Changelog](https://voideditor.com/changelog)
-
-- 🧭 [Website](https://voideditor.com)
 
 ## Contributing
 
-1. To get started working on Void, see [`HOW_TO_CONTRIBUTE`](https://github.com/voideditor/void/blob/main/HOW_TO_CONTRIBUTE.md).
+1. To get started working on Void, check out our Project Board! You can also see [HOW_TO_CONTRIBUTE](https://github.com/voideditor/void/blob/main/HOW_TO_CONTRIBUTE.md).
 
-2. Feel free to attend a weekly meeting in our Discord channel!
-
-3. We're open to collaborations and suggestions of all types - just reach out.
+2. Feel free to attend a casual weekly meeting in our Discord channel!
 
 
 ## Reference
 
-[Void](https://voideditor.com) is a fork of the [vscode](https://github.com/microsoft/vscode) repository. For a guide to the codebase, see [`VOID_CODEBASE_GUIDE`](https://github.com/voideditor/void/blob/main/VOID_CODEBASE_GUIDE.md).
+Void is a fork of the [vscode](https://github.com/microsoft/vscode) repository. For a guide to the codebase, see [VOID_CODEBASE_GUIDE](https://github.com/voideditor/void/blob/main/VOID_CODEBASE_GUIDE.md).
 
 ## Support
 You can always reach us in our Discord server or contact us via email: hello@voideditor.com.

src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx

@@ -255,6 +255,7 @@ export const ApplyButtonsHTML = ({
 	const editCodeService = accessor.get('IEditCodeService')
 	const metricsService = accessor.get('IMetricsService')
 	const terminalToolService = accessor.get('ITerminalToolService')
+	const notificationService = accessor.get('INotificationService')
 
 	const settingsState = useSettingsState()
 	const isDisabled = !!isFeatureNameDisabled('Apply', settingsState) || !applyBoxId
@@ -296,13 +297,18 @@ export const ApplyButtonsHTML = ({
 			uri: uri,
 			startBehavior: 'reject-conflicts',
 		}) ?? []
-		console.log('setting!!!', newApplyingUri)
 		setApplying(newApplyingUri)
 
+		if (!applyDonePromise) {
+			notificationService.info(`Void Error: We couldn't run Apply here. ${uri === 'current' ? 'This Apply block wants to run on the current file, but you might not have a file open.' : `This Apply block wants to run on ${uri.fsPath}, but it might not exist.`}`)
+		}
+
 		// catch any errors by interrupting the stream
 		applyDonePromise?.catch(e => {
 			const uri = getUriBeingApplied(applyBoxId)
 			if (uri) editCodeService.interruptURIStreaming({ uri: uri })
+			notificationService.info(`Void Error: There was a problem running Apply: ${e}.`)
+
 		})
 		metricsService.capture('Apply Code', { length: codeStr.length }) // capture the length only
 

src/vs/workbench/contrib/void/electron-main/voidUpdateMainService.ts

@@ -94,7 +94,7 @@ export class VoidMainUpdateService extends Disposable implements IVoidUpdateServ
 			const data = await response.json();
 			const version = data.tag_name;
 
-			const myVersion = `${this._productService.version}.${this._productService.release}`
+			const myVersion = this._productService.version
 			const latestVersion = version
 
 			const isUpToDate = myVersion === latestVersion // only makes sense if response.ok