@xaidenlabs/uso 1.1.20 → 1.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xaidenlabs/uso",
-  "version": "1.1.20",
+  "version": "1.1.21",
   "description": "Universal Solana Orchestrator - A one-command setup tool for Solana and Anchor development environments on Windows, macOS, and Linux.",
   "bin": {
     "uso": "bin/index.js"

package/src/platforms/windows.js

@@ -6,15 +6,43 @@ const path = require('path');
 const installWindows = async (shouldInstallRust, shouldInstallSolana) => {
     log.header("🪟 Windows detected.");
 
-    // 1. Check for C++ Build Tools
-    if (shouldInstallRust) {
+    // 1. Check for C++ Build Tools (Robust)
+    // Rust needs C++, Anchor needs Rust. 
+    // We check this if we are installing either, because even if Rust is present, 
+    // Anchor build might fail if C++ tools are missing/broken.
+    if (shouldInstallRust || shouldInstallSolana) {
         const hasCl = shell.which('cl');
+        let hasCppTools = false;
+
+        // Try vswhere if cl is missing
         if (!hasCl) {
-            log.warn("⚠️  Visual Studio C++ Build Tools (cl.exe) not found!");
-            log.error("❌ Rust and Anchor CANNOT run without these tools.");
-            log.warn("👉 Please install them from: https://visualstudio.microsoft.com/visual-cpp-build-tools/");
-            log.warn("   Make sure to select 'Desktop development with C++' workload.");
-            log.warn("   After installing, restart your terminal and run `uso init` again.");
+            const programFilesx86 = process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)';
+            const vswhere = path.join(programFilesx86, 'Microsoft Visual Studio', 'Installer', 'vswhere.exe');
+
+            if (fs.existsSync(vswhere)) {
+                // Check specifically for VC++ tools
+                const toolsCheck = shell.exec(`"${vswhere}" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`, { silent: true });
+                if (toolsCheck.code === 0 && toolsCheck.stdout.trim().length > 0) {
+                    hasCppTools = true;
+                }
+            }
+        } else {
+            hasCppTools = true;
+        }
+
+        if (!hasCppTools) {
+            log.error("❌ Critical Dependency Missing: Visual Studio C++ Build Tools");
+            log.error("   Rust and Anchor CANNOT run without these tools.");
+            log.warn("👉 Install from: https://visualstudio.microsoft.com/visual-cpp-build-tools/");
+            log.warn("   Workload required: 'Desktop development with C++'");
+            log.warn("   Aborting installation to prevent broken setup.");
+            return false; // STOP HERE
+        }
+
+        if (!hasCl && hasCppTools) {
+            log.warn("⚠️  C++ Build Tools are installed but 'cl.exe' is not in PATH.");
+            log.warn("   You may need to restart your terminal or launch 'Developer Command Prompt for VS'.");
+            // We continue, hoping rustup might find it, but it's risky.
         }
     }
 
@@ -23,8 +51,12 @@ const installWindows = async (shouldInstallRust, shouldInstallSolana) => {
         log.info("🦀 Installing Rust (rustup-init.exe)...");
         shell.exec('powershell -Command "Invoke-WebRequest -Uri https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe -OutFile rustup-init.exe"');
 
-        // Unblock the file to prevent Device Guard/SmartScreen issues
-        shell.exec('powershell -Command "Unblock-File -Path rustup-init.exe"');
+        // Unblock the file (Robust)
+        const unblock = shell.exec('powershell -Command "Unblock-File -Path rustup-init.exe"');
+        if (unblock.code !== 0) {
+            log.warn("⚠️  Failed to unblock rustup-init.exe. Trying elevated...");
+            shell.exec('powershell -Command "Start-Process powershell -ArgumentList \'Unblock-File -Path rustup-init.exe\' -Verb RunAs -Wait"');
+        }
 
         const rustInstall = shell.exec('powershell -Command "./rustup-init.exe -y"');
 
@@ -49,8 +81,12 @@ const installWindows = async (shouldInstallRust, shouldInstallSolana) => {
         const downloadCmd = 'powershell -Command "Invoke-WebRequest -Uri https://release.anza.xyz/stable/solana-install-init-x86_64-pc-windows-msvc.exe -OutFile solana-install.exe"';
         const dlResult = shell.exec(downloadCmd);
 
-        // Unblock the file to prevent Device Guard/SmartScreen issues
-        shell.exec('powershell -Command "Unblock-File -Path solana-install.exe"');
+        // Unblock the file (Robust)
+        const unblockSolana = shell.exec('powershell -Command "Unblock-File -Path solana-install.exe"');
+        if (unblockSolana.code !== 0) {
+            log.warn("⚠️  Failed to unblock solana-install.exe via Unblock-File. Trying elevated...");
+            shell.exec('powershell -Command "Start-Process powershell -ArgumentList \'Unblock-File -Path solana-install.exe\' -Verb RunAs -Wait"');
+        }
 
         if (dlResult.code !== 0) {
             log.error("❌ Failed to download Solana installer.");