@xaidenlabs/uso 1.1.68 → 1.1.69

package/package.json

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

package/src/commands/init.js

@@ -28,13 +28,14 @@ const init = async (component, options) => {
 
             const wslInstalled = await installWslFeature();
 
-            if (!wslInstalled) {
+            if (!wslInstalled && !shell.which('wsl')) {
                 // installWslFeature already printed the relevant error/reboot message
                 return;
             }
 
-            // If we're here, WSL was instantly available (rare — usually needs reboot)
-            // Fall through to installWsl() below
+            // If wsl.exe is now available, continue straight into the Ubuntu setup.
+            // On some machines this still needs a reboot, but we let the distro phase
+            // run immediately so setup can continue as far as the system allows.
         }
 
         // WSL binary is present — run the full WSL toolchain install

package/src/platforms/wsl.js

@@ -8,6 +8,39 @@ const { spawnSync } = require("child_process");
 const chalk = require("chalk");
 const WSL_DISTRO = "Ubuntu";
 
+const progressHelpers = `
+print_progress() {
+  local label="$1"
+  local percent="$2"
+  printf "\r%s %d%%" "$label" "$percent"
+}
+
+run_with_progress() {
+  local label="$1"
+  local start="$2"
+  local end="$3"
+  shift 3
+
+  "$@" &
+  local pid=$!
+  local current="$start"
+
+  while kill -0 "$pid" 2>/dev/null; do
+    print_progress "$label" "$current"
+    if [ "$current" -lt "$((end - 1))" ]; then
+      current=$((current + 1))
+    fi
+    sleep 2
+  done
+
+  wait "$pid"
+  local status=$?
+  print_progress "$label" "$end"
+  printf "\n"
+  return "$status"
+}
+`.replace(/\r\n/g, "\n");
+
 /**
  * Installs the WSL Windows Feature via an elevated PowerShell UAC prompt.
  * This is needed when `wsl.exe` is not present on the system at all.
@@ -126,9 +159,7 @@ const installWsl = async () => {
         "\n👉 ACTION REQUIRED: Run this command manually in PowerShell as Administrator:",
       );
       console.log(
-        chalk.bold.yellow(
-          `    wsl --install -d ${WSL_DISTRO} --web-download`,
-        ),
+        chalk.bold.yellow(`    wsl --install -d ${WSL_DISTRO} --web-download`),
       );
       log.warn(
         "\nOnce that completes successfully, run 'uso setup --wsl' again.",
@@ -168,10 +199,10 @@ const installWsl = async () => {
 set -e
 export DEBIAN_FRONTEND=noninteractive
 
+  ${progressHelpers}
+
 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
+    run_with_progress "📦 Installing system build tools..." 0 100 bash -lc "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."
@@ -201,6 +232,8 @@ fi
 # NO set -e — we handle errors per-step
 FAILURES=""
 
+${progressHelpers}
+
 # Hush login
 touch ~/.hushlogin
 
@@ -224,7 +257,7 @@ else
         echo "✅ Rust repaired."
     else
         echo "🦀 Installing Rust..."
-        if curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y; then
+      if run_with_progress "🦀 Installing Rust..." 10 35 bash -lc "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y"; then
             source $HOME/.cargo/env 2>/dev/null || true
             rustup toolchain install stable >/dev/null 2>&1 || true
             rustup default stable >/dev/null 2>&1 || true
@@ -248,9 +281,9 @@ source $HOME/.cargo/env 2>/dev/null || true
 export PATH="$HOME/.local/share/solana/install/active_release/bin:$PATH"
 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
+  if run_with_progress "☀️  Installing Solana CLI..." 35 60 bash -lc 'sh -c "$(curl -sSfL https://release.solana.com/stable/install)"'; then
         echo "✅ Solana installed."
-    elif sh -c "$(curl -sSfL https://release.anza.xyz/stable/install)" 2>/dev/null; then
+  elif run_with_progress "☀️  Installing Solana CLI..." 35 60 bash -lc 'sh -c "$(curl -sSfL https://release.anza.xyz/stable/install)"'; then
         echo "✅ Solana installed (via Agave)."
     else
         FAILURES="$FAILURES solana"
@@ -266,7 +299,7 @@ if ! command -v anchor &> /dev/null; then
     # Install AVM if not present
     if ! command -v avm &> /dev/null; then
         echo "⚓ Installing AVM (compiling from source, ~5 min)..."
-        if cargo install --git https://github.com/coral-xyz/anchor avm --locked --force; then
+    if run_with_progress "⚓ Installing AVM (compiling from source)..." 60 85 cargo install --git https://github.com/coral-xyz/anchor avm --locked --force; then
             echo "✅ AVM compiled."
         else
             FAILURES="$FAILURES avm"
@@ -279,12 +312,12 @@ if ! command -v anchor &> /dev/null; then
     # Install Anchor via AVM (try binary first, then compile from source)
     if command -v avm &> /dev/null; then
         echo "⚓ Installing Anchor CLI..."
-        if avm install latest 2>/dev/null; then
+      if run_with_progress "⚓ Installing Anchor CLI..." 85 100 avm install latest; then
             avm use latest
             echo "✅ Anchor installed."
         else
             echo "⚠️  Binary download timed out. Building from source (this takes ~10 min)..."
-            if avm install latest --force 2>/dev/null; then
+        if run_with_progress "⚓ Building Anchor CLI from source..." 85 100 avm install latest --force; then
                 avm use latest
                 echo "✅ Anchor built from source."
             else
@@ -316,7 +349,9 @@ fi
   const spin2 = spinner(
     "Phase 2/2: Installing Rust, Solana, Anchor (this takes a while)...",
   ).start();
-  const userRes = shell.exec(`wsl -d ${WSL_DISTRO} -e bash "${wslUserScriptPath}"`);
+  const userRes = shell.exec(
+    `wsl -d ${WSL_DISTRO} -e bash "${wslUserScriptPath}"`,
+  );
   fs.unlinkSync(userScriptPath);
 
   if (userRes.code === 0) {