@xaidenlabs/uso 1.1.50 → 1.1.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xaidenlabs/uso",
-  "version": "1.1.50",
+  "version": "1.1.51",
   "description": "Universal Solana Development Toolchain. Native or Stealth WSL Mode. Build, test, and deploy without the friction.",
   "bin": {
     "uso": "bin/index.js"

package/src/platforms/wsl.js

@@ -74,77 +74,85 @@ const installWsl = async () => {
 
     log.info("⚙️  Initializing Uso Engine environment...");
 
-    const setupScript = `
-        #!/bin/bash
-        set -e
-        
-        # 1. Hush Login
-        touch ~/.hushlogin
-        
-        # 2. Update & Install Build Dependencies (ALWAYS check for cc linker)
-        if ! command -v cc &> /dev/null || ! command -v pkg-config &> /dev/null; then
-            echo "Installing build tools..."
-            sudo apt-get update -y && sudo apt-get install -y curl build-essential pkg-config libssl-dev libudev-dev
-        fi
-
-        # 3. Install Rust
-        if ! command -v cargo &> /dev/null; then
-            echo "Installing Rust..."
-            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-        fi
-        # Always source cargo env for subsequent steps
-        source $HOME/.cargo/env 2>/dev/null || true
-
-        # 4. Install Solana
-        if ! command -v solana &> /dev/null; then
-            echo "Installing Solana CLI..."
-            # Try official installer first, fall back to Agave
-            if ! sh -c "$(curl -sSfL https://release.solana.com/stable/install)" 2>/dev/null; then
-                echo "Retrying with Agave installer..."
-                sh -c "$(curl -sSfL https://release.anza.xyz/stable/install)" 2>/dev/null || true
-            fi
-            export PATH="$HOME/.local/share/solana/install/active_release/bin:$PATH"
-        fi
-
-        # 5. Install Anchor (AVM)
-        if ! command -v avm &> /dev/null; then
-            echo "Installing AVM..."
-            cargo install --git https://github.com/coral-xyz/anchor avm --locked --force
-            avm install latest
-            avm use latest
-        fi
-        
-        echo "✅ Uso Engine Setup Complete."
-    `;
-
-    // Write script to a temporary file in Windows (which is mounted in WSL)
-    const scriptPath = path.join(process.cwd(), 'setup_wsl.sh');
-    fs.writeFileSync(scriptPath, setupScript);
-
-    // Convert path to WSL format
-    const wslScriptPath = toWslPath(scriptPath);
-
-    // Run the script inside WSL
-    // We pipe the script content to bash to avoid permission issues with the file itself
-    // Or just run it. Let's run it.
-
-    const spin = spinner('Running Linux setup script (this takes a while)...').start();
-
-    // Ensure line endings are LF
-    const linuxScript = setupScript.replace(/\r\n/g, '\n');
-    fs.writeFileSync(scriptPath, linuxScript);
-
-    const res = shell.exec(`wsl -d Ubuntu -e bash "${wslScriptPath}"`);
-
-    // Clean up
-    fs.unlinkSync(scriptPath);
-
-    if (res.code === 0) {
-        spin.succeed('Linux environment configured successfully.');
-
-        // 4. Set "Stealth Mode" config (could be a local file or env var)
-        // For now, we assume if the user ran --wsl, they want to use it.
-        // We could create a .uso-config.json
+    // --- PHASE 1: System Dependencies (as root, no sudo needed) ---
+    const rootScript = `
+#!/bin/bash
+set -e
+export DEBIAN_FRONTEND=noninteractive
+
+if ! command -v cc &> /dev/null || ! command -v pkg-config &> /dev/null; then
+    echo "📦 Installing system build tools..."
+    apt-get update -y -qq
+    apt-get install -y -qq curl build-essential pkg-config libssl-dev libudev-dev
+    echo "✅ Build tools installed."
+else
+    echo "✅ Build tools already present."
+fi
+`.replace(/\r\n/g, '\n');
+
+    const rootScriptPath = path.join(process.cwd(), 'uso_root_setup.sh');
+    fs.writeFileSync(rootScriptPath, rootScript);
+    const wslRootScriptPath = toWslPath(rootScriptPath);
+
+    const spin1 = spinner('Phase 1/2: Installing system dependencies...').start();
+    const rootRes = shell.exec(`wsl -d Ubuntu -u root -e bash "${wslRootScriptPath}"`);
+    fs.unlinkSync(rootScriptPath);
+
+    if (rootRes.code !== 0) {
+        spin1.fail('System dependency installation failed.');
+        log.error(rootRes.stderr || 'Unknown error during root setup.');
+        return false;
+    }
+    spin1.succeed('System dependencies ready.');
+
+    // --- PHASE 2: User Tools (Rust, Solana, Anchor as normal user) ---
+    const userScript = `
+#!/bin/bash
+set -e
+
+# Hush login
+touch ~/.hushlogin
+
+# Install Rust
+if ! command -v cargo &> /dev/null; then
+    echo "🦀 Installing Rust..."
+    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+fi
+source $HOME/.cargo/env 2>/dev/null || true
+
+# Install Solana
+if ! command -v solana &> /dev/null; then
+    echo "☀️  Installing Solana CLI..."
+    if ! sh -c "$(curl -sSfL https://release.solana.com/stable/install)" 2>/dev/null; then
+        echo "Retrying with Agave installer..."
+        sh -c "$(curl -sSfL https://release.anza.xyz/stable/install)" 2>/dev/null || true
+    fi
+fi
+export PATH="$HOME/.local/share/solana/install/active_release/bin:$PATH"
+
+# Install Anchor (AVM)
+if ! command -v avm &> /dev/null; then
+    echo "⚓ Installing AVM (this compiles from source, ~5 min)..."
+    cargo install --git https://github.com/coral-xyz/anchor avm --locked --force
+    avm install latest
+    avm use latest
+fi
+
+echo "✅ Uso Engine Setup Complete."
+`.replace(/\r\n/g, '\n');
+
+    const userScriptPath = path.join(process.cwd(), 'uso_user_setup.sh');
+    fs.writeFileSync(userScriptPath, userScript);
+    const wslUserScriptPath = toWslPath(userScriptPath);
+
+    const spin2 = spinner('Phase 2/2: Installing Rust, Solana, Anchor (this takes a while)...').start();
+    const userRes = shell.exec(`wsl -d Ubuntu -e bash "${wslUserScriptPath}"`);
+    fs.unlinkSync(userScriptPath);
+
+    if (userRes.code === 0) {
+        spin2.succeed('Uso Engine configured successfully.');
+
+        // Set "Stealth Mode" config
         const configPath = path.join(os.homedir(), '.uso-config.json');
         const config = { mode: 'wsl', distro: 'Ubuntu' };
         fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
@@ -152,8 +160,8 @@ const installWsl = async () => {
         log.success("✅ Stealth Mode Enabled. 'uso' commands will now run via WSL.");
         return true;
     } else {
-        spin.fail('Setup script failed.');
-        log.error(res.stderr);
+        spin2.fail('Setup script failed.');
+        log.error(userRes.stderr || 'Check the output above for errors.');
         return false;
     }
 };