2 files changed, 21 insertions, 7 deletions

diff --git a/src/bin/ngit/cli.rs b/src/bin/ngit/cli.rs
index fce5664..851dd70 100644
--- a/src/bin/ngit/cli.rs
+++ b/src/bin/ngit/cli.rs
@@ -57,8 +57,6 @@ pub enum Commands {
     Fetch(sub_commands::fetch::SubCommandArgs),
     /// signal you are this repo's maintainer accepting proposals via nostr
     Init(sub_commands::init::SubCommandArgs),
-    /// export nostr keys to login to other nostr clients
-    ExportKeys,
     /// issue commits as a proposal
     Send(sub_commands::send::SubCommandArgs),
     /// list proposals; checkout, apply or download selected
@@ -67,8 +65,22 @@ pub enum Commands {
     Push(sub_commands::push::SubCommandArgs),
     /// fetch and apply new proposal commits / revisions linked to branch
     Pull,
+    /// login, logout or export keys
+    Account(AccountSubCommandArgs),
+}
+
+#[derive(Subcommand)]
+pub enum AccountCommands {
     /// run with --nsec flag to change npub
     Login(sub_commands::login::SubCommandArgs),
     /// remove nostr account details stored in git config
     Logout,
+    /// export nostr keys to login to other nostr clients
+    ExportKeys,
+}
+
+#[derive(clap::Parser)]
+pub struct AccountSubCommandArgs {
+    #[command(subcommand)]
+    pub account_command: AccountCommands,
 }
diff --git a/src/bin/ngit/main.rs b/src/bin/ngit/main.rs
index cdd0e97..a49267b 100644
--- a/src/bin/ngit/main.rs
+++ b/src/bin/ngit/main.rs
@@ -4,7 +4,7 @@
 
 use anyhow::Result;
 use clap::Parser;
-use cli::{Cli, Commands};
+use cli::{AccountCommands, Cli, Commands};
 
 mod cli;
 use ngit::{cli_interactor, client, git, git_events, login, repo_ref};
@@ -15,14 +15,16 @@ mod sub_commands;
 async fn main() -> Result<()> {
     let cli = Cli::parse();
     match &cli.command {
+        Commands::Account(args) => match &args.account_command {
+            AccountCommands::Login(sub_args) => sub_commands::login::launch(&cli, sub_args).await,
+            AccountCommands::Logout => sub_commands::logout::launch().await,
+            AccountCommands::ExportKeys => sub_commands::export_keys::launch().await,
+        },
         Commands::Fetch(args) => sub_commands::fetch::launch(&cli, args).await,
-        Commands::Login(args) => sub_commands::login::launch(&cli, args).await,
-        Commands::Logout => sub_commands::logout::launch().await,
         Commands::Init(args) => sub_commands::init::launch(&cli, args).await,
-        Commands::ExportKeys => sub_commands::export_keys::launch().await,
-        Commands::Send(args) => sub_commands::send::launch(&cli, args, false).await,
         Commands::List => sub_commands::list::launch().await,
         Commands::Pull => sub_commands::pull::launch().await,
         Commands::Push(args) => sub_commands::push::launch(&cli, args).await,
+        Commands::Send(args) => sub_commands::send::launch(&cli, args, false).await,
     }
 }