From c1d9f0496370e90ee3a300aa96dcf21149543779 Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <me@sebastinez.dev>
Date: Fri, 17 Oct 2025 14:41:53 +0200
Subject: [PATCH] cli/self: Use clap

---
 crates/radicle-cli/src/commands/help.rs      |   5 +-
 crates/radicle-cli/src/commands/self.rs      | 144 ++++---------------
 crates/radicle-cli/src/commands/self/args.rs |  30 ++++
 crates/radicle-cli/src/main.rs               |  10 +-
 4 files changed, 67 insertions(+), 122 deletions(-)
 create mode 100644 crates/radicle-cli/src/commands/self/args.rs

diff --git a/crates/radicle-cli/src/commands/help.rs b/crates/radicle-cli/src/commands/help.rs
index 873535b4..fee59faa 100644
--- a/crates/radicle-cli/src/commands/help.rs
+++ b/crates/radicle-cli/src/commands/help.rs
@@ -95,7 +95,10 @@ const COMMANDS: &[CommandItem] = &[
         name: "clean",
         about: crate::commands::clean::ABOUT,
     },
-    CommandItem::Lexopt(crate::commands::rad_self::HELP),
+    CommandItem::Clap {
+        name: "self",
+        about: crate::commands::rad_self::ABOUT,
+    },
     CommandItem::Clap {
         name: "seed",
         about: crate::commands::seed::ABOUT,
diff --git a/crates/radicle-cli/src/commands/self.rs b/crates/radicle-cli/src/commands/self.rs
index 04cb11f6..bf587c1e 100644
--- a/crates/radicle-cli/src/commands/self.rs
+++ b/crates/radicle-cli/src/commands/self.rs
@@ -1,129 +1,41 @@
-use std::ffi::OsString;
+#[path = "self/args.rs"]
+mod args;
+
+pub use args::Args;
+pub(crate) use args::ABOUT;
 
 use radicle::crypto::ssh;
 use radicle::node::Handle as _;
 use radicle::{Node, Profile};
 
 use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
 use crate::terminal::Element as _;
 
-pub const HELP: Help = Help {
-    name: "self",
-    description: "Show information about your identity and device",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad self [<option>...]
-
-Options
-
-    --did                Show your DID
-    --alias              Show your Node alias
-    --home               Show your Radicle home
-    --config             Show the location of your configuration file
-    --ssh-key            Show your public key in OpenSSH format
-    --ssh-fingerprint    Show your public key fingerprint in OpenSSH format
-    --help               Show help
-"#,
-};
-
-#[derive(Debug)]
-enum Show {
-    Alias,
-    NodeId,
-    Did,
-    Home,
-    Config,
-    SshKey,
-    SshFingerprint,
-    All,
-}
-
-#[derive(Debug)]
-pub struct Options {
-    show: Show,
-}
-
-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);
-        let mut show: Option<Show> = None;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("alias") if show.is_none() => {
-                    show = Some(Show::Alias);
-                }
-                Long("nid") if show.is_none() => {
-                    show = Some(Show::NodeId);
-                }
-                Long("did") if show.is_none() => {
-                    show = Some(Show::Did);
-                }
-                Long("home") if show.is_none() => {
-                    show = Some(Show::Home);
-                }
-                Long("config") if show.is_none() => {
-                    show = Some(Show::Config);
-                }
-                Long("ssh-key") if show.is_none() => {
-                    show = Some(Show::SshKey);
-                }
-                Long("ssh-fingerprint") if show.is_none() => {
-                    show = Some(Show::SshFingerprint);
-                }
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                _ => anyhow::bail!(arg.unexpected()),
-            }
-        }
-
-        Ok((
-            Options {
-                show: show.unwrap_or(Show::All),
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
+pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
     let profile = ctx.profile()?;
 
-    match options.show {
-        Show::Alias => {
-            term::print(profile.config.alias());
-        }
-        Show::NodeId => {
-            crate::warning::deprecated("rad self --nid", "rad node status --only nid");
-            term::print(
-                Node::new(profile.socket())
-                    .nid()
-                    .ok()
-                    .unwrap_or_else(|| *profile.id()),
-            );
-        }
-        Show::Did => {
-            term::print(profile.did());
-        }
-        Show::Home => {
-            term::print(profile.home().path().display());
-        }
-        Show::Config => {
-            term::print(profile.home.config().display());
-        }
-        Show::SshKey => {
-            term::print(ssh::fmt::key(profile.id()));
-        }
-        Show::SshFingerprint => {
-            term::print(ssh::fmt::fingerprint(profile.id()));
-        }
-        Show::All => all(&profile)?,
+    if args.did {
+        term::print(profile.did());
+    } else if args.alias {
+        term::print(profile.config.alias());
+    } else if args.home {
+        term::print(profile.home().path().display());
+    } else if args.ssh_key {
+        term::print(ssh::fmt::key(profile.id()));
+    } else if args.config {
+        term::print(profile.home.config().display());
+    } else if args.ssh_fingerprint {
+        term::print(ssh::fmt::fingerprint(profile.id()));
+    } else if args.nid {
+        crate::warning::deprecated("rad self --nid", "rad node status --only nid");
+        term::print(
+            Node::new(profile.socket())
+                .nid()
+                .ok()
+                .unwrap_or_else(|| *profile.id()),
+        );
+    } else {
+        all(&profile)?
     }
 
     Ok(())
diff --git a/crates/radicle-cli/src/commands/self/args.rs b/crates/radicle-cli/src/commands/self/args.rs
new file mode 100644
index 00000000..791d14eb
--- /dev/null
+++ b/crates/radicle-cli/src/commands/self/args.rs
@@ -0,0 +1,30 @@
+use clap::Parser;
+
+pub(crate) const ABOUT: &str = "Show information about your identity and device";
+
+#[derive(Debug, Parser)]
+#[command(about = ABOUT, disable_version_flag = true)]
+#[group(multiple = false)]
+pub struct Args {
+    /// Show your DID
+    #[arg(long)]
+    pub(super) did: bool,
+    /// Show your Node alias
+    #[arg(long)]
+    pub(super) alias: bool,
+    /// Show your Node identifier
+    #[arg(long, hide(true))]
+    pub(super) nid: bool,
+    /// Show your Radicle home
+    #[arg(long)]
+    pub(super) home: bool,
+    /// Show the location of your configuration file
+    #[arg(long)]
+    pub(super) config: bool,
+    /// Show your public key in OpenSSH format
+    #[arg(long)]
+    pub(super) ssh_key: bool,
+    /// Show your public key fingerprint in OpenSSH format
+    #[arg(long)]
+    pub(super) ssh_fingerprint: bool,
+}
diff --git a/crates/radicle-cli/src/main.rs b/crates/radicle-cli/src/main.rs
index cf0e98e8..8d6be2cf 100644
--- a/crates/radicle-cli/src/main.rs
+++ b/crates/radicle-cli/src/main.rs
@@ -72,6 +72,8 @@ enum Commands {
     Path(path::Args),
     Publish(publish::Args),
     Seed(seed::Args),
+    #[command(name = "self")]
+    RadSelf(rad_self::Args),
     Stats(stats::Args),
     Unblock(unblock::Args),
     Unfollow(unfollow::Args),
@@ -303,11 +305,9 @@ pub(crate) fn run_other(exe: &str, args: &[OsString]) -> Result<(), Option<anyho
             }
         }
         "self" => {
-            term::run_command_args::<rad_self::Options, _>(
-                rad_self::HELP,
-                rad_self::run,
-                args.to_vec(),
-            );
+            if let Some(Commands::RadSelf(args)) = CliArgs::parse().command {
+                term::run_command_fn(rad_self::run, args)
+            }
         }
         "sync" => {
             term::run_command_args::<sync::Options, _>(sync::HELP, sync::run, args.to_vec());