@xaidenlabs/uso 1.1.1 → 1.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xaidenlabs/uso",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "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

@@ -1,5 +1,7 @@
 const shell = require('shelljs');
 const os = require('os');
+const fs = require('fs');
+const path = require('path');
 const { log, spinner } = require('../utils/logger');
 
 const runProxyCommand = async (command, args = []) => {
@@ -26,23 +28,116 @@ const runProxyCommand = async (command, args = []) => {
 
     if (isPrivilegeError && os.platform() === 'win32') {
         log.warn("⚠️  Windows requires Administrator privileges for this operation.");
-        log.info("🔑 Requesting elevated access...");
+        log.info("🔑 Requesting elevated access...\n");
 
-        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"`;
-
-        const elevatedRun = shell.exec(elevateCmd);
-
-        if (elevatedRun.code === 0) {
-            log.success(`✅ '${command}' completed successfully (elevated).`);
-        } else {
-            log.error(`❌ '${command}' failed even with elevated privileges.`);
-            log.warn("👉 Try running your terminal as Administrator manually.");
-        }
+        await runElevatedWithProgress(command, args);
     } else {
         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 logFile = path.join(tmpDir, `uso-elevated-${Date.now()}.log`);
+        const doneFile = path.join(tmpDir, `uso-elevated-${Date.now()}.done`);
+        const cwd = process.cwd();
+
+        // 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)
+        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;
+        let lastLine = '';
+
+        const pollInterval = setInterval(() => {
+            try {
+                // Check if process finished
+                if (fs.existsSync(doneFile)) {
+                    clearInterval(pollInterval);
+
+                    const exitCode = fs.readFileSync(doneFile, 'utf8').trim();
+                    const fullLog = fs.readFileSync(logFile, 'utf8');
+
+                    // Cleanup temp files
+                    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}).`);
+                    }
+
+                    // Print the captured output
+                    if (fullLog.trim()) {
+                        console.log('\n' + fullLog.trim());
+                    }
+
+                    resolve();
+                    return;
+                }
+
+                // Read new content from log file for 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) {
+                        lastLine = lines[lines.length - 1].trim();
+                        // Show the last meaningful line as spinner text
+                        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
+            }
+        }, 500);
+
+        // Safety timeout: 10 minutes max
+        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');
 const test = () => runProxyCommand('test');
 const deploy = () => runProxyCommand('deploy');