@xaidenlabs/uso 1.1.79 → 1.1.81

package/bin/index.js

@@ -16,12 +16,14 @@ program
     .command('init [component]')
     .alias('install')
     .description('Install Rust, Solana CLI, Anchor Framework, or specific component (rust, solana, anchor)')
+    .option('-g, --global', 'Compatibility flag (ignored). uso manages toolchain components, not npm packages')
     .option('--wsl', 'Install in Stealth WSL Mode (Windows Only)')
     .action(init);
 
 program
     .command('setup [component]')
     .description('Alias for init (Install components)')
+    .option('-g, --global', 'Compatibility flag (ignored). uso manages toolchain components, not npm packages')
     .option('--wsl', 'Install in Stealth WSL Mode (Windows Only)')
     .action(init);
 

package/package.json

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

@@ -15,6 +15,22 @@ const { installWsl, installWslFeature } = require("../platforms/wsl");
 const init = async (component, options) => {
   const platform = os.platform();
 
+  if (options?.global) {
+    log.warn(
+      "⚠️  '-g/--global' is an npm flag and is ignored by 'uso install'.",
+    );
+  }
+
+  if (
+    typeof component === "string" &&
+    (component.startsWith("@") || component.includes("/"))
+  ) {
+    log.error(`❌ '${component}' is not a valid uso component.`);
+    log.info("👉 Use one of: rust, solana, anchor");
+    log.info("👉 To install this CLI globally, run: npm install -g @xaidenlabs/uso");
+    return;
+  }
+
   // --- On Windows, ALWAYS use the WSL path ---
   if (platform === "win32") {
     const hasWslBinary = !!shell.which("wsl");

package/src/commands/uninstall.js

@@ -47,6 +47,61 @@ const wslPathExists = (wslPath, stealth) => {
   return result.code === 0;
 };
 
+const getInstalledAvmVersions = (stealth) => {
+  const listResult = stealth.enabled
+    ? runInStealth("avm list", stealth, true)
+    : shell.exec("avm list", { silent: true });
+
+  if (listResult.code !== 0) return [];
+
+  const versions = [];
+  for (const rawLine of listResult.stdout.split(/\r?\n/)) {
+    const line = rawLine.trim();
+    if (!line) continue;
+
+    // avm list output can contain markers like "* 0.30.1" or "0.30.1 (current)"
+    const match = line.match(/(\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?)/);
+    if (match) versions.push(match[1]);
+  }
+
+  return [...new Set(versions)];
+};
+
+const isCargoPackageInstalled = (packageName, stealth) => {
+  const checkCmd = `cargo install --list | grep -q '^${packageName} v'`;
+  const result = stealth.enabled
+    ? runInStealth(checkCmd, stealth, true)
+    : shell.exec(checkCmd, { silent: true });
+  return result.code === 0;
+};
+
+const uninstallAnchorComponents = (stealth) => {
+  if (commandExists("avm", stealth)) {
+    const versions = getInstalledAvmVersions(stealth);
+    if (versions.length > 0) {
+      for (const version of versions) {
+        runOrElevate(`avm uninstall ${version}`, `Uninstall Anchor (AVM ${version})`, stealth);
+      }
+    } else {
+      log.info("No AVM-managed Anchor versions found to remove.");
+    }
+  }
+
+  if (isCargoPackageInstalled("anchor-cli", stealth)) {
+    runOrElevate(
+      "cargo uninstall anchor-cli",
+      "Uninstall anchor-cli",
+      stealth,
+    );
+  }
+
+  if (isCargoPackageInstalled("avm", stealth)) {
+    runOrElevate("cargo uninstall avm", "Uninstall avm", stealth);
+  }
+
+  log.success("Anchor removal steps completed.");
+};
+
 /**
  * Runs a command and attempts to elevate privileges if it fails with a permission error.
  */
@@ -136,21 +191,7 @@ const uninstall = async (component) => {
       const anchorInstalled = commandExists("anchor", stealth);
       if (anchorInstalled) {
         log.info("Removing Anchor...");
-        // 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.");
+        uninstallAnchorComponents(stealth);
       } else {
         log.success("✅ Anchor is not installed.");
       }
@@ -253,17 +294,7 @@ const uninstall = async (component) => {
     );
     if (removeAnchor.toLowerCase() === "y") {
       log.info("Removing Anchor...");
-      // 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.");
+      uninstallAnchorComponents(stealth);
     }
   }
 

package/src/platforms/wsl.js

@@ -277,6 +277,32 @@ else
 fi
 source $HOME/.cargo/env 2>/dev/null || true
 
+# --- Solana SBPF Toolchain (required for anchor build) ---
+if ! rustup target list 2>/dev/null | grep -q "sbpf-solana-solana"; then
+    echo "🎯 Installing Solana SBPF toolchain..."
+    if run_with_progress "🎯 Installing Solana SBPF target..." 35 55 rustup target add sbpf-solana-solana; then
+        echo "✅ SBPF target installed."
+    else
+        FAILURES="$FAILURES sbpf-target"
+        echo "❌ SBPF target installation failed."
+    fi
+else
+    echo "✅ SBPF target already installed."
+fi
+
+# Install cargo-build-sbf
+if ! command -v cargo-build-sbf &> /dev/null; then
+    echo "🔨 Installing cargo-build-sbf..."
+    if run_with_progress "🔨 Installing cargo-build-sbf..." 55 60 cargo install cargo-build-sbf; then
+        echo "✅ cargo-build-sbf installed."
+    else
+        FAILURES="$FAILURES cargo-build-sbf"
+        echo "⚠️  cargo-build-sbf install failed (run 'uso init' to retry)."
+    fi
+else
+    echo "✅ cargo-build-sbf already installed."
+fi
+
 # --- Solana ---
 export PATH="$HOME/.local/share/solana/install/active_release/bin:$PATH"
 if ! command -v solana &> /dev/null; then
@@ -339,7 +365,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 run_with_progress "⚓ Installing AVM (compiling from source)..." 60 85 cargo install --git https://github.com/coral-xyz/anchor avm --locked --force; then
+    if run_with_progress "⚓ Installing AVM (compiling from source)..." 65 85 cargo install --git https://github.com/coral-xyz/anchor avm --locked --force; then
             echo "✅ AVM compiled."
         else
             FAILURES="$FAILURES avm"