comment

Fixed default url in package.json since this is used by app

extensions/open-remote-ssh/package.json

@@ -71,7 +71,7 @@
           "type": "string",
           "description": "The URL from where the vscode server will be downloaded. You can use the following variables and they will be replaced dynamically:\n- ${quality}: vscode server quality, e.g. stable or insiders\n- ${version}: vscode server version, e.g. 1.69.0\n- ${commit}: vscode server release commit\n- ${arch}: vscode server arch, e.g. x64, armhf, arm64\n- ${release}: release number",
           "scope": "application",
-          "default": "https://github.com/voideditor/${NAME_OF_REPO}/releases/download/${version}.${release}/void-server-${os}-${arch}-${version}.${release}.tar.gz"
+          "default": "https://github.com/voideditor/binaries/releases/download/${version}.${release}/void-reh-${os}-${arch}-${version}.${release}.tar.gz"
         },
         "remote.SSH.remotePlatform": {
           "type": "object",

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

@@ -32,12 +32,14 @@ export async function getVSCodeServerConfig(): Promise<IServerConfig> {
 	const customServerBinaryName = vscode.workspace.getConfiguration('remote.SSH.experimental').get<string>('serverBinaryName', '');
 
 	return {
-		version: vscode.version.replace('-insider', ''),
+		// version: vscode.version.replace('-insider', ''),
 		commit: productJson.commit,
 		quality: productJson.quality,
 		release: productJson.release,
 		serverApplicationName: customServerBinaryName || productJson.serverApplicationName,
 		serverDataFolderName: productJson.serverDataFolderName,
-		serverDownloadUrlTemplate: productJson.serverDownloadUrlTemplate
+		serverDownloadUrlTemplate: productJson.serverDownloadUrlTemplate,
+		// Void changed this
+		version: productJson.voidVersion
 	};
 }

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

@@ -39,7 +39,7 @@ export class ServerInstallError extends Error {
 	}
 }
 
-const DEFAULT_DOWNLOAD_URL_TEMPLATE = 'https://github.com/voideditor/void-updates-server/releases/download/test/void-server-${os}-${arch}.tar.gz';
+const DEFAULT_DOWNLOAD_URL_TEMPLATE = 'https://github.com/voideditor/binaries/releases/download/${version}.${release}/void-reh-${os}-${arch}-${version}.${release}.tar.gz';
 
 export async function installCodeServer(conn: SSHConnection, serverDownloadUrlTemplate: string | undefined, extensionIds: string[], envVariables: string[], platform: string | undefined, useSocketPath: boolean, logger: Log): Promise<ServerInstallResult> {
 	let shell = 'powershell';

package.json

@@ -178,7 +178,7 @@
     "cssnano": "^6.0.3",
     "debounce": "^1.0.0",
     "deemon": "^1.8.0",
-    "electron": "^34.3.2",
+    "electron": "34.3.2",
     "eslint": "^9.11.1",
     "eslint-formatter-compact": "^8.40.0",
     "eslint-plugin-header": "3.1.1",

product.json

@@ -1,7 +1,7 @@
 {
 	"nameShort": "Void",
 	"nameLong": "Void",
-	"voidVersion": "1.0.2",
+	"voidVersion": "1.0.4",
 	"applicationName": "void",
 	"dataFolderName": ".void-editor",
 	"win32MutexName": "voideditor",

src/vs/base/common/product.ts

@@ -56,7 +56,7 @@ export type ExtensionVirtualWorkspaceSupport = {
 
 export interface IProductConfiguration {
 	readonly version: string;
-	readonly voidVersion?: string; // Void added this
+	readonly voidVersion: string; // Void added this
 	readonly release: string; // VSCodium added this
 	readonly date?: string;
 	readonly quality?: string;

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

@@ -105,7 +105,9 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
 				}
 
 				const fetchedVersion = update.productVersion.replace(/(\d+\.\d+\.\d+)(?:\.(\d+))(\-\w+)?/, '$1$3+$2');
-				const currentVersion = `${this.productService.version}+${this.productService.release}`;
+				const currentVersion = `${this.productService.voidVersion}+${this.productService.release}`;
+				// Void compares voidVersion, not VSCode version
+				// const currentVersion = `${this.productService.version}+${this.productService.release}`;
 
 				if (semver.compareBuild(currentVersion, fetchedVersion) >= 0) {
 					this.setState(State.Idle(UpdateType.Setup));

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

@@ -144,7 +144,9 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
 				}
 
 				const fetchedVersion = update.productVersion.replace(/(\d+\.\d+\.\d+)(?:\.(\d+))(\-\w+)?/, '$1$3+$2');
-				const currentVersion = `${this.productService.version}+${this.productService.release}`;
+				const currentVersion = `${this.productService.voidVersion}+${this.productService.release}`;
+				// Void compares voidVersion, not VSCode version
+				// const currentVersion = `${this.productService.version}+${this.productService.release}`;
 
 				if (semver.compareBuild(currentVersion, fetchedVersion) >= 0) {
 					this.setState(State.Idle(updateType));

src/vs/workbench/contrib/void/browser/metricsPollService.ts

@@ -11,6 +11,7 @@ import * as dom from '../../../../base/browser/dom.js';
 import { IMetricsService } from '../common/metricsService.js';
 
 
+
 export interface IMetricsPollService {
 	readonly _serviceBrand: undefined;
 }

src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx

@@ -735,6 +735,8 @@ const ToolHeaderWrapper = ({
 
 					{/* right */}
 					<div className="flex items-center gap-x-2 flex-shrink-0">
+						{isError && <AlertTriangle className='text-void-warning opacity-90 flex-shrink-0' size={14} />}
+						{isRejected && <Ban className='text-void-fg-4 opacity-90 flex-shrink-0' size={14} />}
 						{desc2 && <span className="text-void-fg-4 text-xs">
 							{desc2}
 						</span>}
@@ -743,8 +745,6 @@ const ToolHeaderWrapper = ({
 								{`${numResults}${hasNextPage ? '+' : ''} result${numResults !== 1 ? 's' : ''}`}
 							</span>
 						)}
-						{isError && <AlertTriangle className='text-void-warning opacity-90 flex-shrink-0' size={14} />}
-						{isRejected && <Ban className='text-void-fg-4 opacity-90 flex-shrink-0' size={14} />}
 					</div>
 				</div>
 			</div>