From 753b7aef93e3f8deb1056aa6946cdc2fdc87b9dd Mon Sep 17 00:00:00 2001
From: Lorenz Leutgeb <lorenz.leutgeb@radicle.xyz>
Date: Sun, 28 Sep 2025 19:32:40 +0200
Subject: [PATCH] cli/path: Use clap

---
 crates/radicle-cli/src/commands/help.rs      |  5 +-
 crates/radicle-cli/src/commands/path.rs      | 49 ++------------------
 crates/radicle-cli/src/commands/path/args.rs |  7 +++
 crates/radicle-cli/src/main.rs               |  5 +-
 4 files changed, 19 insertions(+), 47 deletions(-)
 create mode 100644 crates/radicle-cli/src/commands/path/args.rs

diff --git a/crates/radicle-cli/src/commands/help.rs b/crates/radicle-cli/src/commands/help.rs
index 99d5d814..839f8d1d 100644
--- a/crates/radicle-cli/src/commands/help.rs
+++ b/crates/radicle-cli/src/commands/help.rs
@@ -55,7 +55,10 @@ const COMMANDS: &[CommandItem] = &[
     CommandItem::Lexopt(crate::commands::ls::HELP),
     CommandItem::Lexopt(crate::commands::node::HELP),
     CommandItem::Lexopt(crate::commands::patch::HELP),
-    CommandItem::Lexopt(crate::commands::path::HELP),
+    CommandItem::Clap {
+        name: "path",
+        about: crate::commands::path::ABOUT,
+    },
     CommandItem::Lexopt(crate::commands::clean::HELP),
     CommandItem::Lexopt(crate::commands::rad_self::HELP),
     CommandItem::Lexopt(crate::commands::seed::HELP),
diff --git a/crates/radicle-cli/src/commands/path.rs b/crates/radicle-cli/src/commands/path.rs
index 19bbe238..cddac86f 100644
--- a/crates/radicle-cli/src/commands/path.rs
+++ b/crates/radicle-cli/src/commands/path.rs
@@ -1,54 +1,13 @@
-#![allow(clippy::or_fun_call)]
-use std::ffi::OsString;
-
-use anyhow::anyhow;
+mod args;
 
 use radicle::profile;
 
 use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
 
-pub const HELP: Help = Help {
-    name: "path",
-    description: "Display the Radicle home path",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
+pub use args::Args;
+pub(crate) use args::ABOUT;
 
-    rad path [<option>...]
-
-    If no argument is specified, the Radicle home path is displayed.
-
-Options
-
-    --help    Print help
-
-"#,
-};
-
-pub struct Options {}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-
-        #[allow(clippy::never_loop)]
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                _ => return Err(anyhow!(arg.unexpected())),
-            }
-        }
-
-        Ok((Options {}, vec![]))
-    }
-}
-
-pub fn run(_options: Options, _ctx: impl term::Context) -> anyhow::Result<()> {
+pub fn run(_args: Args, _ctx: impl term::Context) -> anyhow::Result<()> {
     let home = profile::home()?;
 
     println!("{}", home.path().display());
diff --git a/crates/radicle-cli/src/commands/path/args.rs b/crates/radicle-cli/src/commands/path/args.rs
new file mode 100644
index 00000000..58ea1b6d
--- /dev/null
+++ b/crates/radicle-cli/src/commands/path/args.rs
@@ -0,0 +1,7 @@
+use clap::Parser;
+
+pub const ABOUT: &str = "Display the Radicle home path";
+
+#[derive(Parser, Debug)]
+#[command(about = ABOUT, disable_version_flag = true)]
+pub struct Args {}
diff --git a/crates/radicle-cli/src/main.rs b/crates/radicle-cli/src/main.rs
index 2bd6e543..0203b98c 100644
--- a/crates/radicle-cli/src/main.rs
+++ b/crates/radicle-cli/src/main.rs
@@ -46,6 +46,7 @@ struct CliArgs {
 #[derive(Subcommand, Debug)]
 enum Commands {
     Issue(issue::Args),
+    Path(path::Args),
     Stats(stats::Args),
     Unseed(unseed::Args),
 }
@@ -239,7 +240,9 @@ pub(crate) fn run_other(exe: &str, args: &[OsString]) -> Result<(), Option<anyho
             term::run_command_args::<patch::Options, _>(patch::HELP, patch::run, args.to_vec());
         }
         "path" => {
-            term::run_command_args::<path::Options, _>(path::HELP, path::run, args.to_vec());
+            if let Some(Commands::Path(args)) = CliArgs::parse().command {
+                term::run_command_fn(path::run, args);
+            }
         }
         "publish" => {
             term::run_command_args::<publish::Options, _>(