@xaidenlabs/uso 1.1.82 → 1.1.83

package/bin/index.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 const { program } = require('commander');
 const { init } = require('../src/commands/init');
 const { doctor } = require('../src/commands/doctor');

package/package.json

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

@@ -45,7 +45,6 @@ const commandExists = (command, stealth) => {
 const wslPathExists = (wslPath, stealth) => {
   const result = runInStealth(`[ -e "${wslPath}" ]`, stealth, true);
   return result.code === 0;
-<<<<<<< HEAD
 };
 
 const getInstalledAvmVersions = (stealth) => {
@@ -101,118 +100,6 @@ const uninstallAnchorComponents = (stealth) => {
   }
 
   log.success("Anchor removal steps completed.");
-=======
->>>>>>> d47ca156cb2a252419c54c520c7fcd0f0c18c525
-};
-
-/**
- * Runs a command and attempts to elevate privileges if it fails with a permission error.
- */
-const runOrElevate = (
-  command,
-  description,
-  stealth = { enabled: false, distro: "Ubuntu" },
-) => {
-  if (stealth.enabled) {
-    const result = runInStealth(command, stealth, true);
-
-    if (result.code === 0) {
-      if (result.stdout) console.log(result.stdout);
-      return true;
-    }
-
-    if (result.stdout) console.log(result.stdout);
-    if (result.stderr) console.error(result.stderr);
-    log.error(`❌ Command failed in WSL: ${description}`);
-    return false;
-  }
-
-  // We run without silent:true initially to let the user see output,
-  // but detecting the error code is what matters.
-  // actually, to detect the specific string "os error 1314", we need to capture output.
-  // So we run silently first? Or we just run and if it fails, we assume it *might* be elevation if on Windows?
-  // Let's run synchronously and capture output.
-
-  const result = shell.exec(command, { silent: true });
-
-  if (result.code === 0) {
-    console.log(result.stdout);
-    return true;
-  }
-
-  // Print the error output to the user
-  console.log(result.stdout);
-  console.error(result.stderr);
-
-  const output = result.stderr + result.stdout;
-
-  // Check for common permission errors
-  // "os error 1314" is specific to Windows symlink privilege
-  if (
-    (output.includes("os error 1314") ||
-      output.includes("EPERM") ||
-      output.includes("permission denied")) &&
-    os.platform() === "win32"
-  ) {
-    log.warn(`⚠️  Permission denied during: ${description}`);
-    log.info("🛡️  Triggering Run as Administrator (UAC) to retry...");
-
-    // Construct PowerShell command to run cmd /c <command> as admin
-    // We need to be careful with quoting.
-    const escapedCommand = command.replace(/'/g, "''"); // Basic PowerShell escaping for single quotes
-    const elevateCmd = `powershell -Command "Start-Process -FilePath 'cmd.exe' -ArgumentList '/c ${escapedCommand}' -Verb RunAs -Wait"`;
-
-    const elevatedRun = shell.exec(elevateCmd);
-
-    if (elevatedRun.code === 0) {
-      log.success(`✅ ${description} completed (Elevated).`);
-      return true;
-    } else {
-      log.error(`❌ Elevated execution failed for: ${description}`);
-      return false;
-    }
-  }
-
-  log.error(`❌ Command failed: ${description}`);
-  return false;
-};
-
-const uninstall = async (component) => {
-  const stealth = getStealthContext();
-  log.header("🗑️  USO Uninstallation & Cleanup");
-  if (stealth.enabled) {
-    log.info(
-      `🐧 Stealth Mode detected. Uninstall targets WSL distro: ${stealth.distro}`,
-    );
-  }
-
-  if (component) {
-    component = component.toLowerCase();
-    log.info(`🎯 Targeted uninstallation: ${component}`);
-
-    if (component === "anchor") {
-      const anchorInstalled = commandExists("anchor", stealth);
-      if (anchorInstalled) {
-        log.info("Removing Anchor...");
-<<<<<<< HEAD
-        uninstallAnchorComponents(stealth);
-=======
-        // Try avm uninstall first if available
-        if (commandExists("avm", stealth)) {
-          runOrElevate(
-            "avm uninstall latest",
-            "Uninstall Anchor (AVM)",
-            stealth,
-          );
-        }
-        runOrElevate(
-          "cargo uninstall anchor-cli",
-          "Uninstall anchor-cli",
-          stealth,
-        );
-        runOrElevate("cargo uninstall avm", "Uninstall avm", stealth);
-        log.success("Anchor removal steps completed.");
->>>>>>> d47ca156cb2a252419c54c520c7fcd0f0c18c525
       } else {
         log.success("✅ Anchor is not installed.");
       }
@@ -315,21 +202,7 @@ const uninstall = async (component) => {
     );
     if (removeAnchor.toLowerCase() === "y") {
       log.info("Removing Anchor...");
-<<<<<<< HEAD
       uninstallAnchorComponents(stealth);
-=======
-      // Try avm uninstall first if available
-      if (commandExists("avm", stealth)) {
-        runOrElevate("avm uninstall latest", "Uninstall Anchor (AVM)", stealth);
-      }
-      runOrElevate(
-        "cargo uninstall anchor-cli",
-        "Uninstall anchor-cli",
-        stealth,
-      );
-      runOrElevate("cargo uninstall avm", "Uninstall avm", stealth);
-      log.success("Anchor removal steps completed.");
->>>>>>> d47ca156cb2a252419c54c520c7fcd0f0c18c525
     }
   }
 

package/src/platforms/wsl.js

@@ -6,7 +6,6 @@ const fs = require("fs");
 const os = require("os");
 const { spawnSync } = require("child_process");
 const chalk = require("chalk");
-<<<<<<< HEAD
 const WSL_DISTRO = "Ubuntu";
 
 const progressHelpers = `
@@ -41,80 +40,6 @@ run_with_progress() {
   return "$status"
 }
 `.replace(/\r\n/g, "\n");
-=======
->>>>>>> d47ca156cb2a252419c54c520c7fcd0f0c18c525
-
-/**
- * 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.
- * Returns true if WSL is now available after the attempt, false otherwise.
- */
-const installWslFeature = async () => {
-  log.warn(
-    "⚠️  WSL (Windows Subsystem for Linux) is not installed on this machine.",
-  );
-  log.info("🛡️  Administrator permission is required to install WSL.");
-  log.info(
-    "👉 A UAC (User Account Control) popup will appear — please click 'Yes' to allow the installation.",
-  );
-  console.log("");
-
-  // Run `wsl --install --no-distribution` elevated.
-  // --no-distribution: only enables the WSL feature, does not pull a distro yet.
-  // We wait for it to finish (-Wait) so we can check the result.
-  const elevateCmd = `powershell -Command "Start-Process -FilePath 'wsl.exe' -ArgumentList '--install', '--no-distribution' -Verb RunAs -Wait"`;
-  const result = shell.exec(elevateCmd, { silent: false });
-
-  if (result.code !== 0) {
-    // User likely denied UAC or the command failed
-    log.error("❌ WSL installation was cancelled or failed.");
-    log.warn(
-      "👉 To install manually, open PowerShell as Administrator and run:",
-    );
-    console.log(chalk.bold.yellow("    wsl --install"));
-    return false;
-  }
-
-  // Verify wsl is now available
-  const check = shell.exec("wsl --status", { silent: true });
-  if (check.code !== 0) {
-    // WSL was just installed — a reboot is almost certainly required
-    log.warn(
-      "⚠️  WSL feature has been installed, but a system restart is required to complete setup.",
-    );
-    log.warn(
-      "👉 Please RESTART your computer, then run `uso install` again to set up the toolchain.",
-    );
-    return false; // Signal caller that we need a restart before proceeding
-  }
-
-  log.success("✅ WSL feature installed successfully.");
-  return true;
-};
-
-const installWsl = async () => {
-  log.header("🐧 Configuring Stealth WSL Environment...");
-
-  // 1. Check if WSL is enabled
-  if (!shell.which("wsl")) {
-    log.error("❌ WSL is not enabled on this Windows machine.");
-    log.warn(
-      "👉 Please enable 'Windows Subsystem for Linux' in 'Turn Windows features on or off'.",
-    );
-    log.warn("👉 Or run this in PowerShell as Admin: wsl --install");
-    return false;
-  }
-
-  // 2. Install Ubuntu silently (Branded as Uso Engine)
-  // We use 'wsl -d Ubuntu -e true' to check if it's installed and runnable.
-  // 'wsl -l -v' output is notoriously unreliable due to charset encoding (UTF-16) on Windows.
-<<<<<<< HEAD
-  const checkDistro = shell.exec(`wsl -d ${WSL_DISTRO} -e true`, {
-    silent: true,
-  });
-=======
-  const checkDistro = shell.exec("wsl -d Ubuntu -e true", { silent: true });
->>>>>>> d47ca156cb2a252419c54c520c7fcd0f0c18c525
 
   // If exit code is 0, it's installed and working.
   if (checkDistro.code !== 0) {
@@ -132,14 +57,10 @@ const installWsl = async () => {
     };
 
     // Attempt 1: Standard Install
-<<<<<<< HEAD
     let success = tryInstall(
       ["--install", "-d", WSL_DISTRO],
       "Standard Install",
     );
-=======
-    let success = tryInstall(["--install", "-d", "Ubuntu"], "Standard Install");
->>>>>>> d47ca156cb2a252419c54c520c7fcd0f0c18c525
 
     // Attempt 2: Update WSL Kernel (Fixes network/protocol issues)
     if (!success) {
@@ -148,11 +69,7 @@ const installWsl = async () => {
       );
       spawnSync("wsl", ["--update"], { stdio: "inherit", shell: false });
       success = tryInstall(
-<<<<<<< HEAD
         ["--install", "-d", WSL_DISTRO],
-=======
-        ["--install", "-d", "Ubuntu"],
->>>>>>> d47ca156cb2a252419c54c520c7fcd0f0c18c525
         "Install after Update",
       );
     }
@@ -161,11 +78,7 @@ const installWsl = async () => {
     if (!success) {
       log.warn("⚠️  Still failing. Trying --web-download (Bypasses Store)...");
       success = tryInstall(
-<<<<<<< HEAD
         ["--install", "-d", WSL_DISTRO, "--web-download"],
-=======
-        ["--install", "-d", "Ubuntu", "--web-download"],
->>>>>>> d47ca156cb2a252419c54c520c7fcd0f0c18c525
         "Web Download Install",
       );
     }
@@ -178,18 +91,13 @@ const installWsl = async () => {
         "\n👉 ACTION REQUIRED: Run this command manually in PowerShell as Administrator:",
       );
       console.log(
-<<<<<<< HEAD
         chalk.bold.yellow(`    wsl --install -d ${WSL_DISTRO} --web-download`),
-=======
-        chalk.bold.yellow("    wsl --install -d Ubuntu --web-download"),
->>>>>>> d47ca156cb2a252419c54c520c7fcd0f0c18c525
       );
       log.warn(
         "\nOnce that completes successfully, run 'uso setup --wsl' again.",
       );
       return false;
     }
-<<<<<<< HEAD
 
     const verifyInstall = shell.exec(`wsl -d ${WSL_DISTRO} -e true`, {
       silent: true,
@@ -215,19 +123,6 @@ const installWsl = async () => {
   // 3. Configure Internal Environment (Rust + Solana + Anchor)
   // We create a shell script and run it inside WSL.
 
-=======
-    log.success("✅ Uso Engine configured.");
-  } else {
-    log.success("✅ Uso Engine is ready.");
-  }
-
-  // 2.5 Hide from Windows Terminal (Stealth Mode)
-  hideFromWindowsTerminal();
-
-  // 3. Configure Internal Environment (Rust + Solana + Anchor)
-  // We create a shell script and run it inside WSL.
-
->>>>>>> d47ca156cb2a252419c54c520c7fcd0f0c18c525
   log.info("⚙️  Initializing Uso Engine environment...");
 
   // --- PHASE 1: System Dependencies (as root, no sudo needed) ---
@@ -252,11 +147,7 @@ fi
 
   const spin1 = spinner("Phase 1/2: Installing system dependencies...").start();
   const rootRes = shell.exec(
-<<<<<<< HEAD
     `wsl -d ${WSL_DISTRO} -u root -e bash "${wslRootScriptPath}"`,
-=======
-    `wsl -d Ubuntu -u root -e bash "${wslRootScriptPath}"`,
->>>>>>> d47ca156cb2a252419c54c520c7fcd0f0c18c525
   );
   fs.unlinkSync(rootScriptPath);
 
@@ -456,13 +347,9 @@ fi
   const spin2 = spinner(
     "Phase 2/2: Installing Rust, Solana, Anchor (this takes a while)...",
   ).start();
-<<<<<<< HEAD
   const userRes = shell.exec(
     `wsl -d ${WSL_DISTRO} -e bash "${wslUserScriptPath}"`,
   );
-=======
-  const userRes = shell.exec(`wsl -d Ubuntu -e bash "${wslUserScriptPath}"`);
->>>>>>> d47ca156cb2a252419c54c520c7fcd0f0c18c525
   fs.unlinkSync(userScriptPath);
 
   if (userRes.code === 0) {
@@ -474,11 +361,7 @@ fi
 
   // Always set stealth mode config — even partial setup enables routing
   const configPath = path.join(os.homedir(), ".uso-config.json");
-<<<<<<< HEAD
   const config = { mode: "wsl", distro: WSL_DISTRO };
-=======
-  const config = { mode: "wsl", distro: "Ubuntu" };
->>>>>>> d47ca156cb2a252419c54c520c7fcd0f0c18c525
   fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
 
   log.success("✅ Stealth Mode Enabled. 'uso' commands will now run via WSL.");