upgrade

CORTEXIDE_CODEBASE_GUIDE.md

@@ -7,7 +7,7 @@ This guide orients you to key areas changed or added for CortexIDE.
 - Linux packaging: `resources/linux/cortex.desktop`, `cortex-url-handler.desktop`, `cortex.appdata.xml`
 - Provider configs: `resources/provider-config.example.json`
 - LLM wiring: `src/vs/workbench/contrib/cortexide/*/llm*` (providers, settings, services)
-- Settings UI: `src/vs/workbench/contrib/cortexide/browser/voidSettingsPane.ts`
+- Settings UI: `src/vs/workbench/contrib/cortexide/browser/cortexideSettingsPane.ts`
 - Chat and sidebar: `src/vs/workbench/contrib/cortexide/browser/sidebar*`
 
 Note: Some internal identifiers may still use the `void` namespace in type names and interfaces for backward compatibility, but the folder structure uses `cortexide`.

build/gulpfile.compile.js

@@ -11,6 +11,56 @@ const util = require('./lib/util');
 const date = require('./lib/date');
 const task = require('./lib/task');
 const compilation = require('./lib/compilation');
+const { execSync } = require('child_process');
+const path = require('path');
+
+/**
+ * Task to build React components for production
+ */
+const buildReactTask = task.define('build-react', () => {
+	return new Promise((resolve, reject) => {
+		try {
+			const reactBuildPath = path.join(__dirname, '../src/vs/workbench/contrib/cortexide/browser/react');
+			// allow-any-unicode-next-line
+			console.log('🔨 Building React components...');
+			execSync('node build.js', {
+				cwd: reactBuildPath,
+				stdio: 'inherit'
+			});
+			// allow-any-unicode-next-line
+			console.log('✅ React components built successfully');
+			resolve();
+		} catch (error) {
+			// allow-any-unicode-next-line
+			console.error('❌ Error building React components:', error);
+			reject(error);
+		}
+	});
+});
+
+/**
+ * Task to verify React build files exist after compilation
+ */
+const verifyReactBuildTask = task.define('verify-react-build', () => {
+	const fs = require('fs');
+	const path = require('path');
+	const reactOutPath = path.join(__dirname, '../out-build/vs/workbench/contrib/cortexide/browser/react/out');
+
+	if (!fs.existsSync(reactOutPath)) {
+		throw new Error(`React build output directory does not exist: ${reactOutPath}`);
+	}
+
+	const files = fs.readdirSync(reactOutPath);
+	const jsFiles = files.filter(f => f.endsWith('.js'));
+
+	if (jsFiles.length === 0) {
+		throw new Error(`No React build files found in ${reactOutPath}. Expected at least one .js file.`);
+	}
+
+	// allow-any-unicode-next-line
+	console.log(`✅ Verified ${jsFiles.length} React build files exist in out-build/`);
+	return Promise.resolve();
+});
 
 /**
  * @param {boolean} disableMangle
@@ -20,7 +70,9 @@ function makeCompileBuildTask(disableMangle) {
 		util.rimraf('out-build'),
 		date.writeISODate('out-build'),
 		compilation.compileApiProposalNamesTask,
-		compilation.compileTask('src', 'out-build', true, { disableMangle })
+		buildReactTask, // Build React components before compiling
+		compilation.compileTask('src', 'out-build', true, { disableMangle }),
+		verifyReactBuildTask // Verify React files are preserved after compilation
 	);
 }
 

build/gulpfile.reh.js

@@ -156,9 +156,16 @@ function getNodeChecksum(expectedName) {
 
 function extractAlpinefromDocker(nodeVersion, platform, arch) {
 	const imageName = arch === 'arm64' ? 'arm64v8/node' : 'node';
-	log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from docker image ${imageName}`);
-	const contents = cp.execSync(`docker run --rm ${imageName}:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' });
-	return es.readArray([new File({ path: 'node', contents, stat: { mode: parseInt('755', 8) } })]);
+	const imageTag = `${imageName}:${nodeVersion}-alpine`;
+	log(`Downloading node.js ${nodeVersion} ${platform} ${arch} from docker image ${imageTag}`);
+	try {
+		// Use double quotes for the shell command and properly escape the which command
+		const contents = cp.execSync(`docker run --rm "${imageTag}" /bin/sh -c "cat \\$(which node)"`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' });
+		return es.readArray([new File({ path: 'node', contents, stat: { mode: parseInt('755', 8) } })]);
+	} catch (error) {
+		log.error(`Failed to extract Node.js from Docker image ${imageTag}: ${error.message}`);
+		throw new Error(`Docker command failed: ${error.message}`);
+	}
 }
 
 const { nodeVersion, internalNodeVersion } = getNodeVersion();
@@ -231,6 +238,19 @@ function nodejs(platform, arch) {
 				.pipe(rename('node.exe'));
 		case 'darwin':
 		case 'linux':
+			// Handle alternative architectures that may not have official Node.js builds
+			if (arch === 'riscv64' && product.nodejsRepository === 'https://nodejs.org') {
+				// Try unofficial builds site for riscv64
+				const unofficialUrl = process.env['VSCODE_NODEJS_SITE'] || 'https://unofficial-builds.nodejs.org';
+				log(`Attempting to download Node.js from ${unofficialUrl} for ${arch}...`);
+				return fetchUrls(`/download/release/v${nodeVersion}/node-v${nodeVersion}-linux-${arch}.tar.gz`, {
+					base: unofficialUrl,
+					checksumSha256
+				}).pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar())))
+					.pipe(filter('**/node'))
+					.pipe(util.setExecutableBit('**'))
+					.pipe(rename('node'));
+			}
 			return (product.nodejsRepository !== 'https://nodejs.org' ?
 				fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: expectedName, checksumSha256 }) :
 				fetchUrls(`/dist/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`, { base: 'https://nodejs.org', checksumSha256 })

build/gulpfile.vscode.js

@@ -100,7 +100,10 @@ const vscodeResourceIncludes = [
 	'out-build/vs/editor/common/languages/highlights/*.scm',
 
 	// Tree Sitter injection queries
-	'out-build/vs/editor/common/languages/injections/*.scm'
+	'out-build/vs/editor/common/languages/injections/*.scm',
+
+	// React components (Cortexide)
+	'out-build/vs/workbench/contrib/cortexide/browser/react/out/**'
 ];
 
 const vscodeResources = [
@@ -122,6 +125,36 @@ const bootstrapEntryPoints = [
 	'out-build/bootstrap-fork.js'
 ];
 
+/**
+ * Task to verify React build files exist after bundling
+ */
+const verifyReactFilesAfterBundleTask = task.define('verify-react-files-after-bundle', () => {
+	const fs = require('fs');
+	const path = require('path');
+	const reactOutPath = path.join(__dirname, '../out-vscode/vs/workbench/contrib/cortexide/browser/react/out');
+
+	if (!fs.existsSync(reactOutPath)) {
+		// allow-any-unicode-next-line
+		console.error(`❌ React build output directory does not exist: ${reactOutPath}`);
+		console.error('React files were not copied during bundling. This will cause a blank screen!');
+		throw new Error(`React build output directory does not exist: ${reactOutPath}`);
+	}
+
+	const files = fs.readdirSync(reactOutPath);
+	const jsFiles = files.filter(f => f.endsWith('.js'));
+
+	if (jsFiles.length === 0) {
+		// allow-any-unicode-next-line
+		console.error(`❌ No React build files found in ${reactOutPath}`);
+		console.error('React files were not copied during bundling. This will cause a blank screen!');
+		throw new Error(`No React build files found in ${reactOutPath}. Expected at least one .js file.`);
+	}
+
+	// allow-any-unicode-next-line
+	console.log(`✅ Verified ${jsFiles.length} React build files exist in out-vscode/ after bundling`);
+	return Promise.resolve();
+});
+
 const bundleVSCodeTask = task.define('bundle-vscode', task.series(
 	util.rimraf('out-vscode'),
 	// Optimize: bundles source files automatically based on
@@ -141,15 +174,48 @@ const bundleVSCodeTask = task.define('bundle-vscode', task.series(
 				skipTSBoilerplateRemoval: entryPoint => entryPoint === 'vs/code/electron-browser/workbench/workbench'
 			}
 		}
-	)
+	),
+	verifyReactFilesAfterBundleTask // Verify React files are present after bundling
 ));
 gulp.task(bundleVSCodeTask);
 
 const sourceMappingURLBase = `https://main.vscode-cdn.net/sourcemaps/${commit}`;
+
+/**
+ * Task to verify React build files exist after minification
+ */
+const verifyReactFilesAfterMinifyTask = task.define('verify-react-files-after-minify', () => {
+	const fs = require('fs');
+	const path = require('path');
+	const reactOutPath = path.join(__dirname, '../out-vscode-min/vs/workbench/contrib/cortexide/browser/react/out');
+
+	if (!fs.existsSync(reactOutPath)) {
+		// allow-any-unicode-next-line
+		console.error(`❌ React build output directory does not exist: ${reactOutPath}`);
+		console.error('This will cause a blank screen in the packaged app!');
+		throw new Error(`React build output directory does not exist: ${reactOutPath}`);
+	}
+
+	const files = fs.readdirSync(reactOutPath);
+	const jsFiles = files.filter(f => f.endsWith('.js'));
+
+	if (jsFiles.length === 0) {
+		// allow-any-unicode-next-line
+		console.error(`❌ No React build files found in ${reactOutPath}`);
+		console.error('This will cause a blank screen in the packaged app!');
+		throw new Error(`No React build files found in ${reactOutPath}. Expected at least one .js file.`);
+	}
+
+	// allow-any-unicode-next-line
+	console.log(`✅ Verified ${jsFiles.length} React build files exist in out-vscode-min/`);
+	return Promise.resolve();
+});
+
 const minifyVSCodeTask = task.define('minify-vscode', task.series(
 	bundleVSCodeTask,
 	util.rimraf('out-vscode-min'),
-	optimize.minifyTask('out-vscode', `${sourceMappingURLBase}/core`)
+	optimize.minifyTask('out-vscode', `${sourceMappingURLBase}/core`),
+	verifyReactFilesAfterMinifyTask // Verify React files are present after minification
 ));
 gulp.task(minifyVSCodeTask);
 

build/gulpfile.vscode.win32.js

@@ -75,21 +75,50 @@ function buildWin32Setup(arch, target) {
 		const outputPath = setupDir(arch, target);
 		fs.mkdirSync(outputPath, { recursive: true });
 
+		// CRITICAL: Verify executable exists before creating installer.
+		// Some upstream builds may still emit Code.exe/Void.exe instead of CortexIDE.exe.
+		// Fall back to whatever executable actually exists so the installer launch step never breaks.
+		let exeBasename = product.nameShort;
+		let expectedExePath = path.join(sourcePath, `${exeBasename}.exe`);
+		if (!fs.existsSync(expectedExePath)) {
+			const executableCandidates = fs.readdirSync(sourcePath)
+				.filter(file => file.toLowerCase().endsWith('.exe'))
+				.filter(file => {
+					const lower = file.toLowerCase();
+					return lower !== 'inno_updater.exe' && !lower.includes('tunnel') && !lower.includes('server');
+				});
+
+			if (executableCandidates.length === 0) {
+				const errorMsg = `ERROR: Executable not found at expected path: ${expectedExePath}\n` +
+					`and no other *.exe files were located in ${sourcePath}. ` +
+					`This will cause "CreateProcess failed; code 2" errors during installation.`;
+				console.error(errorMsg);
+				return cb(new Error(errorMsg));
+			}
+
+			exeBasename = path.basename(executableCandidates[0], '.exe');
+			expectedExePath = path.join(sourcePath, `${exeBasename}.exe`);
+			console.warn(`⚠️ ${product.nameShort}.exe not found. Using detected executable "${exeBasename}.exe" instead.`);
+		}
+		console.log(`✓ Executable verified: ${expectedExePath}`);
+
 		const originalProductJsonPath = path.join(sourcePath, 'resources/app/product.json');
 		const productJsonPath = path.join(outputPath, 'product.json');
 		const productJson = JSON.parse(fs.readFileSync(originalProductJsonPath, 'utf8'));
 		productJson['target'] = target;
 		fs.writeFileSync(productJsonPath, JSON.stringify(productJson, undefined, '\t'));
 
 		const quality = product.quality || 'dev';
+		const dirName = product.win32DirName || product.nameShort || exeBasename;
+
 		const definitions = {
 			NameLong: product.nameLong,
 			NameShort: product.nameShort,
-			DirName: product.win32DirName,
+			DirName: dirName,
 			Version: pkg.version,
 			RawVersion: pkg.version.replace(/-\w+$/, ''),
 			NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''),
-			ExeBasename: product.nameShort,
+			ExeBasename: exeBasename,
 			RegValueName: product.win32RegValueName,
 			ShellNameShort: product.win32ShellNameShort,
 			AppMutex: product.win32MutexName,

build/lib/extensions.js.patched

@@ -0,0 +1 @@
+utf8