@xaidenlabs/uso 1.1.1 → 1.1.3

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.1",
+  "version": "1.1.3",
   "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

@@ -1,7 +1,20 @@
 const shell = require('shelljs');
 const os = require('os');
+const fs = require('fs');
+const path = require('path');
 const { log, spinner } = require('../utils/logger');
 
+/**
+ * Adds a Windows Defender exclusion for a given path (requires elevation).
+ * Returns true if successful.
+ */
+const addDefenderExclusion = (dirPath) => {
+    const normalized = dirPath.replace(/\//g, '\\');
+    const cmd = `powershell -Command "Start-Process powershell -ArgumentList '-NoProfile', '-Command', 'Add-MpPreference -ExclusionPath \\\"${normalized}\\\"' -Verb RunAs -WindowStyle Hidden -Wait"`;
+    const result = shell.exec(cmd, { silent: true });
+    return result.code === 0;
+};
+
 const runProxyCommand = async (command, args = []) => {
     // Check if anchor is available
     if (!shell.which('anchor')) {
@@ -20,27 +33,148 @@ const runProxyCommand = async (command, args = []) => {
         return;
     }
 
-    // Check for Windows privilege error (os error 1314 — symlink creation requires elevation)
     const output = (execution.stderr || '') + (execution.stdout || '');
-    const isPrivilegeError = output.includes('os error 1314') || output.includes('A required privilege is not held by the client');
 
-    if (isPrivilegeError && os.platform() === 'win32') {
-        log.warn("⚠️  Windows requires Administrator privileges for this operation.");
-        log.info("🔑 Requesting elevated access...");
+    // --- Error Detection & Auto-Fix ---
 
-        const elevateCmd = `powershell -Command "Start-Process powershell -ArgumentList '-NoProfile', '-Command', 'cd \\"${process.cwd()}\\"; anchor ${command} ${args.join(' ')}; Read-Host \\"Press Enter to close\\"' -Verb RunAs -Wait"`;
+    // 1. Windows Defender / Application Control blocking build scripts (os error 4551)
+    const isDefenderBlock = output.includes('os error 4551') || output.includes('Application Control policy has blocked');
+    if (isDefenderBlock && os.platform() === 'win32') {
+        log.warn("⚠️  Windows Defender is blocking Cargo build scripts.");
+        log.info("🛡️  Adding project directory to Defender exclusions...\n");
 
-        const elevatedRun = shell.exec(elevateCmd);
+        const cwd = process.cwd();
+        const cargoHome = path.join(os.homedir(), '.cargo');
 
-        if (elevatedRun.code === 0) {
-            log.success(`✅ '${command}' completed successfully (elevated).`);
+        const success = addDefenderExclusion(cwd) && addDefenderExclusion(cargoHome);
+
+        if (success) {
+            log.success("✅ Defender exclusions added.");
+            log.info("🔄 Cleaning build cache and retrying...\n");
+
+            // Clean stale blocked artifacts
+            shell.exec('cargo clean', { silent: true });
+
+            // Retry the command
+            const retry = shell.exec(fullCommand);
+            if (retry.code === 0) {
+                log.success(`✅ '${command}' completed successfully.`);
+            } else {
+                log.error(`❌ '${command}' still failed after adding exclusions.`);
+                log.warn("👉 Try running your terminal as Administrator.");
+            }
         } else {
-            log.error(`❌ '${command}' failed even with elevated privileges.`);
-            log.warn("👉 Try running your terminal as Administrator manually.");
+            log.error("❌ Could not add Defender exclusions. Was the UAC prompt declined?");
+            log.info("👉 Manually add exclusions in Windows Security > Virus & threat protection > Exclusions:");
+            log.info(`   - ${cwd}`);
+            log.info(`   - ${cargoHome}`);
         }
-    } else {
-        log.error(`❌ '${command}' failed.`);
+        return;
     }
+
+    // 2. Privilege error (os error 1314 — symlink creation requires elevation)
+    const isPrivilegeError = output.includes('os error 1314') || output.includes('A required privilege is not held by the client');
+    if (isPrivilegeError && os.platform() === 'win32') {
+        log.warn("⚠️  Windows requires Administrator privileges for this operation.");
+        log.info("🔑 Requesting elevated access...\n");
+
+        await runElevatedWithProgress(command, args);
+        return;
+    }
+
+    log.error(`❌ '${command}' failed.`);
+};
+
+/**
+ * Runs the anchor command in a HIDDEN elevated PowerShell window,
+ * redirecting all output to a temp log file. The user's terminal
+ * shows a spinner that tails the log file in real-time.
+ */
+const runElevatedWithProgress = (command, args = []) => {
+    return new Promise((resolve) => {
+        const tmpDir = os.tmpdir();
+        const ts = Date.now();
+        const logFile = path.join(tmpDir, `uso-elevated-${ts}.log`);
+        const doneFile = path.join(tmpDir, `uso-elevated-${ts}.done`);
+        const cwd = process.cwd();
+
+        // Write an empty log file so we can start reading immediately
+        fs.writeFileSync(logFile, '', 'utf8');
+
+        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"`;
+
+        const elevateResult = shell.exec(elevateCmd, { silent: true });
+
+        if (elevateResult.code !== 0) {
+            log.error("❌ Failed to launch elevated process. Was the UAC prompt declined?");
+            resolve();
+            return;
+        }
+
+        // Now poll the log file and show progress
+        const spin = spinner('Building with elevated privileges...').start();
+        let lastSize = 0;
+
+        const pollInterval = setInterval(() => {
+            try {
+                if (fs.existsSync(doneFile)) {
+                    clearInterval(pollInterval);
+
+                    const exitCode = fs.readFileSync(doneFile, 'utf8').trim();
+                    const fullLog = fs.readFileSync(logFile, 'utf8');
+
+                    try { fs.unlinkSync(logFile); } catch (e) { /* ignore */ }
+                    try { fs.unlinkSync(doneFile); } catch (e) { /* ignore */ }
+
+                    if (exitCode === '0') {
+                        spin.succeed(`'${command}' completed successfully (elevated).`);
+                    } else {
+                        spin.fail(`'${command}' failed (elevated, exit code: ${exitCode}).`);
+                    }
+
+                    if (fullLog.trim()) {
+                        console.log('\n' + fullLog.trim());
+                    }
+
+                    resolve();
+                    return;
+                }
+
+                // Read new content for live progress
+                const stats = fs.statSync(logFile);
+                if (stats.size > lastSize) {
+                    const content = fs.readFileSync(logFile, 'utf8');
+                    const lines = content.trim().split('\n').filter(l => l.trim());
+                    if (lines.length > 0) {
+                        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
+            }
+        }, 500);
+
+        // Safety timeout: 10 minutes
+        setTimeout(() => {
+            if (!fs.existsSync(doneFile)) {
+                clearInterval(pollInterval);
+                spin.fail("Timed out waiting for elevated process (10 min).");
+                resolve();
+            }
+        }, 10 * 60 * 1000);
+    });
 };
 
 const build = () => runProxyCommand('build');