diff --git a/src/config/install_remote.rs b/src/config/install_remote.rs index deded51..3a26651 100644 --- a/src/config/install_remote.rs +++ b/src/config/install_remote.rs @@ -575,7 +575,7 @@ fn resolve_conflict(planned: &PlannedFile, sticky: &mut StickyMode) -> Result bail!("Aborted by user."), + "abort" => bail!("Install aborted by user at conflict resolution."), _ => unreachable!("inquire::Select returned an unexpected option"), } } diff --git a/src/main.rs b/src/main.rs index ed38323..f3a7f2f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -92,6 +92,14 @@ async fn main() -> Result<()> { install_builtins()?; + if let Some(category) = cli.install { + return config::install_assets(category); + } + + if let Some(url) = cli.install_from.as_deref() { + return config::install_remote(url, cli.filter, cli.install_force); + } + if let Some(client_arg) = &cli.authenticate { let cfg = Config::load_with_interpolation(true).await?; let app_config = AppConfig::from_config(cfg)?; @@ -152,14 +160,6 @@ async fn run( text: Option, abort_signal: AbortSignal, ) -> Result<()> { - if let Some(category) = cli.install { - return config::install_assets(category); - } - - if let Some(url) = cli.install_from.as_deref() { - return config::install_remote(url, cli.filter, cli.install_force); - } - if cli.sync_models { let url = ctx.app.config.sync_models_url(); return sync_models(&url, abort_signal.clone()).await; diff --git a/src/repl/mod.rs b/src/repl/mod.rs index 2e586bb..ff0ba6b 100644 --- a/src/repl/mod.rs +++ b/src/repl/mod.rs @@ -220,7 +220,7 @@ static REPL_COMMANDS: LazyLock<[ReplCommand; 42]> = LazyLock::new(|| { ), ReplCommand::new( ".install", - "Reinstall bundled agents, macros, functions, or MCP config (overwrites local changes)", + "Reinstall bundled assets, or install assets from a remote git repo (.install remote )", AssertState::pass(), ), ReplCommand::new(