new: Add moon toolchain commands. (#2022)

* Get info working.

* Add command.

* Add info tests.

* Adda dd tests.

* Remove init toolchain.

* Add docs.

Author: milesj

CHANGELOG.md

@@ -4,12 +4,15 @@
 
 #### 🚀 Updates
 
-- Added support for terminal desktop notifications. Can be enabled with the new
-  `notifier.terminalNotifications` setting in `.moon/workspace.yml`.
-- Added new MCP tools.
+- Added new tools for `moon mcp`.
   - `get_touched_files` - Gets touched files between base and head.
   - `sync_projects` - Runs the `SyncProject` action for one or many projects.
   - `sync_workspace` - Runs the `SyncWorkspace` action.
+- Added new `moon toolchain` command and sub-commands.
+  - Add a toolchain to `.moon/toolchain.yml` with `moon toolchain add`.
+  - View information about a toolchain plugin with `moon toolchain info`.
+- Added support for terminal desktop notifications. Can be enabled with the new
+  `notifier.terminalNotifications` setting in `.moon/workspace.yml`.
 
 #### ⚙️ Internal
 

crates/app/src/app.rs

@@ -285,27 +285,35 @@ pub struct Cli {
         global = true,
         env = "MOON_CACHE",
         help = "Mode for cache operations",
+        help_heading = "Global options",
         default_value_t
     )]
     pub cache: CacheMode,
 
-    #[arg(long, global = true, help = "Force colored output")]
+    #[arg(
+        long,
+        global = true,
+        help = "Force colored output",
+        help_heading = "Global options"
+    )]
     pub color: bool,
 
     #[arg(
         long,
         short = 'c',
         global = true,
         env = "MOON_CONCURRENCY",
-        help = "Maximum number of threads to utilize"
+        help = "Maximum number of threads to utilize",
+        help_heading = "Global options"
     )]
     pub concurrency: Option<usize>,
 
     #[arg(
         long,
         global = true,
         env = "MOON_DUMP",
-        help = "Dump a trace profile to the working directory"
+        help = "Dump a trace profile to the working directory",
+        help_heading = "Global options"
     )]
     pub dump: bool,
 
@@ -315,6 +323,7 @@ pub struct Cli {
         global = true,
         env = "MOON_LOG",
         help = "Lowest log level to output",
+        help_heading = "Global options",
         default_value_t
     )]
     pub log: LogLevel,
@@ -323,7 +332,8 @@ pub struct Cli {
         long,
         global = true,
         env = "MOON_LOG_FILE",
-        help = "Path to a file to write logs to"
+        help = "Path to a file to write logs to",
+        help_heading = "Global options"
     )]
     pub log_file: Option<PathBuf>,
 
@@ -332,7 +342,8 @@ pub struct Cli {
         short = 'q',
         global = true,
         env = "MOON_QUIET",
-        help = "Hide all non-important terminal output"
+        help = "Hide all non-important terminal output",
+        help_heading = "Global options"
     )]
     pub quiet: bool,
 
@@ -342,6 +353,7 @@ pub struct Cli {
         global = true,
         env = "MOON_THEME",
         help = "Terminal theme to print with",
+        help_heading = "Global options",
         default_value_t
     )]
     pub theme: AppTheme,

crates/app/src/app_error.rs

@@ -61,6 +61,13 @@ pub enum AppError {
     #[error("Upgrading moon requires an internet connection!")]
     UpgradeRequiresInternet,
 
+    #[diagnostic(
+        code(app::plugin::locator_required),
+        url = "https://moonrepo.dev/docs/guides/wasm-plugins#configuring-plugin-locations"
+    )]
+    #[error("A plugin locator string is required for non-built-in plugins.")]
+    PluginLocatorRequired,
+
     #[diagnostic(code(app::id_required))]
     #[error("A project ID is required.")]
     ProjectIdRequired,

crates/app/src/commands/init/bun.rs

@@ -53,11 +53,12 @@ pub async fn init_bun(console: &Console, options: &InitOptions) -> miette::Resul
         })?;
     }
 
-    let bun_version = render_version_prompt(console, options, "Bun", || Ok(None)).await?;
+    let bun_version =
+        render_version_prompt(console, options.yes || options.minimal, "Bun", || Ok(None)).await?;
 
     let sync_dependencies = render_prompt(
         console,
-        options,
+        options.yes,
         &SettingPrompt::new(
             "syncDependencies",
             "Sync project relationships as <file>package.json</file> <property>dependencies</property>?",

crates/app/src/commands/init/mod.rs

@@ -1,8 +1,7 @@
 mod bun;
 mod node;
-mod prompts;
+pub mod prompts;
 mod rust;
-mod toolchain;
 
 use crate::session::MoonSession;
 use bun::init_bun;
@@ -11,25 +10,22 @@ use clean_path::Clean;
 use iocraft::prelude::{FlexDirection, View, element};
 use miette::IntoDiagnostic;
 use moon_common::{Id, consts::CONFIG_DIRNAME, is_test_env};
-use moon_config::{
-    ToolchainConfig, load_toolchain_config_template, load_workspace_config_template,
-};
+use moon_config::{load_toolchain_config_template, load_workspace_config_template};
 use moon_console::{
     Console,
     ui::{Confirm, Container, Notice, StyledText, Variant},
 };
 use moon_vcs::{Git, Vcs};
 use node::init_node;
-use proto_core::{Id as PluginId, PluginLocator};
+use proto_core::PluginLocator;
 use rust::init_rust;
 use starbase::AppResult;
 use starbase_styles::color;
 use starbase_utils::fs;
 use std::collections::BTreeMap;
 use std::path::PathBuf;
 use tera::{Context, Tera};
-use toolchain::init_toolchain;
-use tracing::instrument;
+use tracing::{instrument, warn};
 
 #[derive(Args, Clone, Debug)]
 pub struct InitArgs {
@@ -164,41 +160,12 @@ pub async fn init_for_toolchain(
         "node" => init_node(console, options).await?,
         "rust" => init_rust(console, options).await?,
         _ => {
-            let mut include_locator = true;
-            let plugin_id = PluginId::raw(id.as_str());
-            let plugin_locator = match args.plugin.as_ref() {
-                Some(locator) => locator.to_owned(),
-                None => match ToolchainConfig::get_plugin_locator(id) {
-                    Some(locator) => {
-                        include_locator = false;
-                        locator
-                    }
-                    None => {
-                        console.err.write_line(
-                            "A plugin locator is required as the 2nd argument when initializing a toolchain!"
-                        )?;
-
-                        return Ok(Some(1));
-                    }
-                },
-            };
-
-            let toolchain_registry = session.get_toolchain_registry().await?;
-
-            toolchain_registry
-                .load_without_config(&plugin_id, plugin_locator)
-                .await?;
-
-            let toolchain = toolchain_registry.get_instance(&plugin_id).await?;
+            warn!(
+                "This command has been deprecated for toolchain plugins, use {} instead.",
+                color::shell(format!("moon toolchain add {}", id))
+            );
 
-            init_toolchain(
-                &session.console,
-                options,
-                &toolchain_registry,
-                &toolchain,
-                include_locator,
-            )
-            .await?
+            return Ok(None);
         }
     };
 

crates/app/src/commands/init/node.rs

@@ -83,7 +83,7 @@ async fn detect_package_manager(
     if pm_type.is_empty() {
         let pm = render_prompt(
             console,
-            options,
+            options.yes,
             &SettingPrompt::new(
                 "packageManager",
                 "Package manager?",
@@ -100,14 +100,15 @@ async fn detect_package_manager(
         }
     }
 
-    let pm_version = render_version_prompt(console, options, &pm_type, || {
-        if pm_version.is_empty() {
-            Ok(None)
-        } else {
-            Ok(UnresolvedVersionSpec::parse(&pm_version).ok())
-        }
-    })
-    .await?;
+    let pm_version =
+        render_version_prompt(console, options.yes || options.minimal, &pm_type, || {
+            if pm_version.is_empty() {
+                Ok(None)
+            } else {
+                Ok(UnresolvedVersionSpec::parse(&pm_version).ok())
+            }
+        })
+        .await?;
 
     Ok((pm_type, pm_version))
 }
@@ -151,13 +152,16 @@ pub async fn init_node(console: &Console, options: &InitOptions) -> miette::Resu
     }
 
     let node_version =
-        render_version_prompt(console, options, "Node", || detect_node_version(options)).await?;
+        render_version_prompt(console, options.yes || options.minimal, "Node", || {
+            detect_node_version(options)
+        })
+        .await?;
     let node_version_manager = detect_node_version_manager(options)?;
     let package_manager = detect_package_manager(console, options).await?;
 
     let infer_tasks = render_prompt(
         console,
-        options,
+        options.yes,
         &SettingPrompt::new(
             "inferTasks",
             "Infer <file>package.json</file> scripts as moon tasks? <muted>(not recommended)</muted>",
@@ -168,7 +172,7 @@ pub async fn init_node(console: &Console, options: &InitOptions) -> miette::Resu
 
     let sync_dependencies = render_prompt(
         console,
-        options,
+        options.yes,
         &SettingPrompt::new(
             "syncDependencies",
             "Sync project relationships as <file>package.json</file> <property>dependencies</property>?",
@@ -179,7 +183,7 @@ pub async fn init_node(console: &Console, options: &InitOptions) -> miette::Resu
 
     let dedupe_lockfile = render_prompt(
         console,
-        options,
+        options.yes,
         &SettingPrompt::new(
             "dedupeLockfile",
             "Automatically dedupe lockfile when changed?",

crates/app/src/commands/init/prompts.rs

@@ -1,4 +1,3 @@
-use super::InitOptions;
 use iocraft::prelude::element;
 use moon_console::{
     Console,
@@ -27,13 +26,13 @@ pub fn fully_qualify_version(version: String) -> Option<String> {
 
 pub async fn render_prompt(
     console: &Console,
-    options: &InitOptions,
+    skip_prompts: bool,
     prompt: &SettingPrompt,
 ) -> miette::Result<Option<JsonValue>> {
     match &prompt.ty {
         PromptType::None => Ok(None),
         PromptType::Confirm { default } => {
-            let result = if options.yes {
+            let result = if skip_prompts {
                 *default
             } else {
                 let mut value = *default;
@@ -54,7 +53,7 @@ pub async fn render_prompt(
             Ok(Some(JsonValue::Bool(result)))
         }
         PromptType::Input { default } => {
-            let result = if options.yes {
+            let result = if skip_prompts {
                 default.to_owned()
             } else {
                 let mut value = default.to_owned();
@@ -87,7 +86,7 @@ pub async fn render_prompt(
             default_index,
             options: items,
         } => {
-            let index = if options.yes {
+            let index = if skip_prompts {
                 *default_index
             } else {
                 let mut index = *default_index;
@@ -114,13 +113,13 @@ pub async fn render_prompt(
 
 pub async fn render_version_prompt(
     console: &Console,
-    options: &InitOptions,
+    skip_prompts: bool,
     tool: &str,
     op: impl FnOnce() -> miette::Result<Option<UnresolvedVersionSpec>>,
 ) -> miette::Result<Option<UnresolvedVersionSpec>> {
     let default_version = op()?;
 
-    if options.yes || options.minimal {
+    if skip_prompts {
         return Ok(default_version);
     }
 

crates/app/src/commands/init/rust.rs

@@ -75,10 +75,11 @@ pub async fn init_rust(console: &Console, options: &InitOptions) -> miette::Resu
         })?;
     }
 
-    let rust_version = render_version_prompt(console, options, "Rust", || {
-        detect_rust_version(&options.dir)
-    })
-    .await?;
+    let rust_version =
+        render_version_prompt(console, options.yes || options.minimal, "Rust", || {
+            detect_rust_version(&options.dir)
+        })
+        .await?;
 
     let mut context = Context::new();
     if let Some(rust_version) = rust_version {