@xaidenlabs/uso 1.1.2 → 1.1.4

package/README.md

@@ -2,7 +2,7 @@
 
 The Universal Solana Orchestrator (USO) is a command-line interface designed to streamline the initialization and management of Solana development environments. By automating the installation of the Rust toolchain, Solana CLI, and Anchor framework, USO eliminates the complexity often associated with setting up a Web3 development workspace on Windows, macOS, and Linux.
 
-This tool is engineered to support developers at all levels—from beginners setting up their first environment to senior engineers managing multiple workstations.
+This tool is engineered to support developers at all levels, from beginners setting up their first environment to senior engineers managing multiple workstations.
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xaidenlabs/uso",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "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/commands/create.js

@@ -1,8 +1,8 @@
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 const shell = require('shelljs');
 const { log, spinner } = require('../utils/logger');
-const { getCargoBinPath } = require('../utils/paths');
 
 const create = async (projectName) => {
     if (!projectName) {
@@ -37,6 +37,19 @@ const create = async (projectName) => {
         return;
     }
 
+    // 1b. Add Windows Defender exclusion for the project directory (prevents build blocks)
+    if (os.platform() === 'win32') {
+        const defSpin = spinner('Adding Windows Defender exclusion...').start();
+        const cargoHome = path.join(os.homedir(), '.cargo');
+        const cmd = `powershell -Command "Start-Process powershell -ArgumentList '-NoProfile', '-Command', 'Add-MpPreference -ExclusionPath \\\"${targetDir.replace(/\\/g, '\\\\')}\\\"; Add-MpPreference -ExclusionPath \\\"${cargoHome.replace(/\\/g, '\\\\')}\\\"' -Verb RunAs -WindowStyle Hidden -Wait"`;
+        const defResult = shell.exec(cmd, { silent: true });
+        if (defResult.code === 0) {
+            defSpin.succeed('Defender exclusion added (builds won\'t be blocked).');
+        } else {
+            defSpin.warn('Could not add Defender exclusion. Builds may be blocked by antivirus.');
+        }
+    }
+
     // 2. Customize Project (Rename files and content)
     log.info("✏️  Customizing project details...");
 

package/src/commands/workflow.js

@@ -22,13 +22,26 @@ const runProxyCommand = async (command, args = []) => {
         return;
     }
 
-    // Check for Windows privilege error (os error 1314 — symlink creation requires elevation)
     const output = (execution.stderr || '') + (execution.stdout || '');
+
+    // Detect Windows-specific errors that require elevation
     const isPrivilegeError = output.includes('os error 1314') || output.includes('A required privilege is not held by the client');
+    const isAppControlBlock = output.includes('os error 4551') || output.includes('Application Control policy has blocked');
 
-    if (isPrivilegeError && os.platform() === 'win32') {
-        log.warn("⚠️  Windows requires Administrator privileges for this operation.");
-        log.info("🔑 Requesting elevated access...\n");
+    if ((isPrivilegeError || isAppControlBlock) && os.platform() === 'win32') {
+        if (isAppControlBlock) {
+            log.warn("⚠️  Windows Application Control is blocking Cargo build scripts.");
+        } else {
+            log.warn("⚠️  Windows requires Administrator privileges for this operation.");
+        }
+        log.info("🔑 Requesting elevated access (build will run in background)...\n");
+
+        // Clean stale blocked artifacts before elevated retry
+        if (isAppControlBlock) {
+            const cleanSpin = spinner('Cleaning blocked build artifacts...').start();
+            shell.exec('cargo clean', { silent: true, cwd: process.cwd() });
+            cleanSpin.succeed('Build cache cleaned.');
+        }
 
         await runElevatedWithProgress(command, args);
     } else {
@@ -44,34 +57,41 @@ const runProxyCommand = async (command, args = []) => {
 const runElevatedWithProgress = (command, args = []) => {
     return new Promise((resolve) => {
         const tmpDir = os.tmpdir();
-        const logFile = path.join(tmpDir, `uso-elevated-${Date.now()}.log`);
-        const doneFile = path.join(tmpDir, `uso-elevated-${Date.now()}.done`);
-        const cwd = process.cwd();
+        const ts = Date.now();
+        const logFile = path.join(tmpDir, `uso-elevated-${ts}.log`).replace(/\\/g, '\\\\');
+        const doneFile = path.join(tmpDir, `uso-elevated-${ts}.done`).replace(/\\/g, '\\\\');
+        const logFileNormal = path.join(tmpDir, `uso-elevated-${ts}.log`);
+        const doneFileNormal = path.join(tmpDir, `uso-elevated-${ts}.done`);
+        const cwd = process.cwd().replace(/\\/g, '\\\\');
 
         // Write an empty log file so we can start reading immediately
-        fs.writeFileSync(logFile, '', 'utf8');
-
-        // Build the elevated command:
-        // 1. cd into the user's project directory
-        // 2. Run anchor <command>
-        // 3. Write exit code to a .done file so we know it finished
-        // 4. All stdout/stderr piped to the log file
-        const anchorCmd = `anchor ${command} ${args.join(' ')}`;
-        const innerScript = `
-            Set-Location '${cwd.replace(/'/g, "''")}';
-            $output = & cmd /c '${anchorCmd} 2>&1';
-            $output | Out-File -FilePath '${logFile.replace(/\\/g, '\\\\')}' -Encoding utf8 -Append;
-            $LASTEXITCODE | Out-File -FilePath '${doneFile.replace(/\\/g, '\\\\')}' -Encoding utf8;
-        `.replace(/\n/g, ' ').trim();
-
-        // Launch hidden elevated process
-        const elevateCmd = `powershell -Command "Start-Process powershell -ArgumentList '-NoProfile', '-ExecutionPolicy', 'Bypass', '-Command', '${innerScript.replace(/'/g, "''")}' -Verb RunAs -WindowStyle Hidden"`;
-
-        // This triggers the UAC prompt (that one still shows — it's Windows security, can't bypass it)
+        fs.writeFileSync(logFileNormal, '', 'utf8');
+
+        // Build a PowerShell script file to avoid quoting hell
+        const scriptFile = path.join(tmpDir, `uso-elevated-${ts}.ps1`);
+        const scriptContent = [
+            `Set-Location "${cwd}"`,
+            `$env:PATH = [System.Environment]::GetEnvironmentVariable("PATH", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("PATH", "User")`,
+            `try {`,
+            `    anchor ${command} ${args.join(' ')} 2>&1 | Tee-Object -FilePath "${logFile}" -Append`,
+            `    $LASTEXITCODE | Out-File -FilePath "${doneFile}" -Encoding utf8`,
+            `} catch {`,
+            `    $_.Exception.Message | Out-File -FilePath "${logFile}" -Encoding utf8 -Append`,
+            `    "1" | Out-File -FilePath "${doneFile}" -Encoding utf8`,
+            `}`,
+        ].join('\n');
+
+        fs.writeFileSync(scriptFile, scriptContent, 'utf8');
+
+        // Launch hidden elevated process using the script file
+        const elevateCmd = `powershell -Command "Start-Process powershell -ArgumentList '-NoProfile', '-ExecutionPolicy', 'Bypass', '-File', '${scriptFile.replace(/\\/g, '\\\\')}' -Verb RunAs -WindowStyle Hidden"`;
+
         const elevateResult = shell.exec(elevateCmd, { silent: true });
 
         if (elevateResult.code !== 0) {
             log.error("❌ Failed to launch elevated process. Was the UAC prompt declined?");
+            // Cleanup
+            try { fs.unlinkSync(scriptFile); } catch (e) { /* ignore */ }
             resolve();
             return;
         }
@@ -79,20 +99,20 @@ const runElevatedWithProgress = (command, args = []) => {
         // Now poll the log file and show progress
         const spin = spinner('Building with elevated privileges...').start();
         let lastSize = 0;
-        let lastLine = '';
 
         const pollInterval = setInterval(() => {
             try {
                 // Check if process finished
-                if (fs.existsSync(doneFile)) {
+                if (fs.existsSync(doneFileNormal)) {
                     clearInterval(pollInterval);
 
-                    const exitCode = fs.readFileSync(doneFile, 'utf8').trim();
-                    const fullLog = fs.readFileSync(logFile, 'utf8');
+                    const exitCode = fs.readFileSync(doneFileNormal, 'utf8').trim();
+                    const fullLog = fs.readFileSync(logFileNormal, 'utf8');
 
                     // Cleanup temp files
-                    try { fs.unlinkSync(logFile); } catch (e) { /* ignore */ }
-                    try { fs.unlinkSync(doneFile); } catch (e) { /* ignore */ }
+                    try { fs.unlinkSync(logFileNormal); } catch (e) { /* ignore */ }
+                    try { fs.unlinkSync(doneFileNormal); } catch (e) { /* ignore */ }
+                    try { fs.unlinkSync(scriptFile); } catch (e) { /* ignore */ }
 
                     if (exitCode === '0') {
                         spin.succeed(`'${command}' completed successfully (elevated).`);
@@ -109,29 +129,29 @@ const runElevatedWithProgress = (command, args = []) => {
                     return;
                 }
 
-                // Read new content from log file for progress
-                const stats = fs.statSync(logFile);
+                // Read new content for live progress
+                const stats = fs.statSync(logFileNormal);
                 if (stats.size > lastSize) {
-                    const content = fs.readFileSync(logFile, 'utf8');
+                    const content = fs.readFileSync(logFileNormal, 'utf8');
                     const lines = content.trim().split('\n').filter(l => l.trim());
                     if (lines.length > 0) {
-                        lastLine = lines[lines.length - 1].trim();
-                        // Show the last meaningful line as spinner text
+                        const lastLine = lines[lines.length - 1].trim();
                         const displayLine = lastLine.length > 70 ? lastLine.substring(0, 67) + '...' : lastLine;
                         spin.text = displayLine;
                     }
                     lastSize = stats.size;
                 }
             } catch (e) {
-                // File might not exist yet or be locked, just keep polling
+                // File might not exist yet or be locked
             }
         }, 500);
 
-        // Safety timeout: 10 minutes max
+        // Safety timeout: 10 minutes
         setTimeout(() => {
-            if (!fs.existsSync(doneFile)) {
+            if (!fs.existsSync(doneFileNormal)) {
                 clearInterval(pollInterval);
                 spin.fail("Timed out waiting for elevated process (10 min).");
+                try { fs.unlinkSync(scriptFile); } catch (e) { /* ignore */ }
                 resolve();
             }
         }, 10 * 60 * 1000);