@xaidenlabs/uso 1.1.3 → 1.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xaidenlabs/uso",
-  "version": "1.1.3",
+  "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/workflow.js

@@ -4,17 +4,6 @@ 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')) {
@@ -35,54 +24,29 @@ const runProxyCommand = async (command, args = []) => {
 
     const output = (execution.stderr || '') + (execution.stdout || '');
 
-    // --- Error Detection & Auto-Fix ---
-
-    // 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 cwd = process.cwd();
-        const cargoHome = path.join(os.homedir(), '.cargo');
-
-        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 });
+    // 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');
 
-            // 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.");
-            }
+    if ((isPrivilegeError || isAppControlBlock) && os.platform() === 'win32') {
+        if (isAppControlBlock) {
+            log.warn("⚠️  Windows Application Control is blocking Cargo build scripts.");
         } else {
-            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}`);
+            log.warn("⚠️  Windows requires Administrator privileges for this operation.");
         }
-        return;
-    }
+        log.info("🔑 Requesting elevated access (build will run in background)...\n");
 
-    // 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");
+        // 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);
-        return;
+    } else {
+        log.error(`❌ '${command}' failed.`);
     }
-
-    log.error(`❌ '${command}' failed.`);
 };
 
 /**
@@ -94,28 +58,40 @@ 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();
+        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');
-
-        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"`;
+        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;
         }
@@ -126,14 +102,17 @@ const runElevatedWithProgress = (command, args = []) => {
 
         const pollInterval = setInterval(() => {
             try {
-                if (fs.existsSync(doneFile)) {
+                // Check if process finished
+                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');
 
-                    try { fs.unlinkSync(logFile); } catch (e) { /* ignore */ }
-                    try { fs.unlinkSync(doneFile); } catch (e) { /* ignore */ }
+                    // Cleanup temp files
+                    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).`);
@@ -141,6 +120,7 @@ const runElevatedWithProgress = (command, args = []) => {
                         spin.fail(`'${command}' failed (elevated, exit code: ${exitCode}).`);
                     }
 
+                    // Print the captured output
                     if (fullLog.trim()) {
                         console.log('\n' + fullLog.trim());
                     }
@@ -150,9 +130,9 @@ const runElevatedWithProgress = (command, args = []) => {
                 }
 
                 // Read new content for live progress
-                const stats = fs.statSync(logFile);
+                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) {
                         const lastLine = lines[lines.length - 1].trim();
@@ -168,9 +148,10 @@ const runElevatedWithProgress = (command, args = []) => {
 
         // 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);