feat: add rich version, verbose logging, colored output, error context, single-user delete

- Rich --version via vergen-gitcl showing git hash and build date
- Wire up --verbose with tracing-subscriber (stderr, env-filter)
- Colored output: bold/dim key labels, bold table headers,
  green success messages, red/green disabled status
- Add .context() on all SDK calls for user-friendly error messages
- Remove fb_anyhow! macro in claims.rs, use IntoAnyhow consistently
- Add users remove --email for single-user delete with confirmation
- Add tracing debug/info logs in firebase, config, errors, commands
- Remove unused toml dependency

Author: NeoScript

Cargo.lock

@@ -11,6 +11,7 @@ clap = { version = "4", features = ["derive", "env"] }
 comfy-table = "7"
 confy = "2"
 console = "0.16"
+const_format = "0.2"
 csv = "1"
 dialoguer = "0.12"
 error-stack = "0.6"
@@ -24,7 +25,11 @@ serde_json = "1"
 shellexpand = "3"
 time = { version = "0.3", features = ["formatting", "parsing", "macros"] }
 tokio = { version = "1", features = ["full"] }
-toml = "0.8"
+tracing = "0.1"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+
+[build-dependencies]
+vergen-gitcl = { version = "9", features = ["build"] }
 
 [profile.release]
 strip = true

Cargo.toml

@@ -107,16 +107,18 @@ fbadmin info    # Shows resolved profile, project, credentials, and verifies con
 
 ## Global flags
 
-| Flag | Short | Env var | Description |
-|---|---|---|---|
-| `--profile` | `-p` | `FBADMIN_PROFILE` | Named profile from config |
-| `--project` | | `FBADMIN_PROJECT` | Firebase project ID |
-| `--credentials` | `-c` | `FBADMIN_CREDENTIALS` | Path to service account JSON |
-| `--emulator-host` | `-e` | `FBADMIN_EMULATOR_HOST` | Emulator host:port |
-| `--format` | `-f` | | Output format: `table`, `json`, `csv` |
-| `--dry-run` | | | Preview destructive operations |
-| `--yes` | `-y` | | Skip confirmation prompts |
-| `--verbose` | `-v` | | Increase verbosity (`-vv`, `-vvv`) |
+
+| Flag              | Short | Env var                 | Description                           |
+| ----------------- | ----- | ----------------------- | ------------------------------------- |
+| `--profile`       | `-p`  | `FBADMIN_PROFILE`       | Named profile from config             |
+| `--project`       |       | `FBADMIN_PROJECT`       | Firebase project ID                   |
+| `--credentials`   | `-c`  | `FBADMIN_CREDENTIALS`   | Path to service account JSON          |
+| `--emulator-host` | `-e`  | `FBADMIN_EMULATOR_HOST` | Emulator host:port                    |
+| `--format`        | `-f`  |                         | Output format: `table`, `json`, `csv` |
+| `--dry-run`       |       |                         | Preview destructive operations        |
+| `--yes`           | `-y`  |                         | Skip confirmation prompts             |
+| `--verbose`       | `-v`  |                         | Increase verbosity (`-vv`, `-vvv`)    |
+
 
 ## Output formats
 
@@ -129,4 +131,4 @@ fbadmin claims get --email user@example.com -f json  # Single record as JSON
 
 ## License
 
-MIT
+MIT

README.md

@@ -0,0 +1,14 @@
+use vergen_gitcl::{BuildBuilder, Emitter, GitclBuilder};
+
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let build = BuildBuilder::default().build_date(true).build()?;
+    let git = GitclBuilder::default()
+        .sha(true)
+        .commit_date(true)
+        .build()?;
+    Emitter::default()
+        .add_instructions(&build)?
+        .add_instructions(&git)?
+        .emit()?;
+    Ok(())
+}

build.rs

@@ -1,13 +1,14 @@
 use std::collections::BTreeMap;
 
-use anyhow::{Result, bail};
+use anyhow::{Context, Result, bail};
 use indicatif::ProgressBar;
 use rs_firebase_admin_sdk::auth::{Claims, FirebaseAuthService, UserIdentifiers, UserUpdate};
 use serde_json::Value;
 
 use crate::config::resolve_connection;
+use crate::errors::IntoAnyhow;
 use crate::firebase::{AuthBackend, init_firebase};
-use crate::output::{render_json_value, render_message, render_table};
+use crate::output::{render_json_value, render_message, render_success, render_table};
 use crate::prompt::{confirm, resolve_email, resolve_string};
 use crate::{ClaimsCommand, Cli};
 
@@ -65,12 +66,6 @@ fn map_to_claims(map: BTreeMap<String, Value>) -> Claims {
     Claims::from(map)
 }
 
-macro_rules! fb_anyhow {
-    ($expr:expr) => {
-        $expr.map_err(|e| anyhow::anyhow!("{e}"))
-    };
-}
-
 async fn get(cli: &Cli, email: Option<String>) -> Result<()> {
     let email = resolve_email(email)?;
     let conn = resolve_connection(
@@ -81,8 +76,13 @@ async fn get(cli: &Cli, email: Option<String>) -> Result<()> {
     )?;
     let auth = init_firebase(AuthBackend::from_resolved(&conn)).await?;
 
+    tracing::debug!("Fetching claims for {email}");
     let identifiers = UserIdentifiers::builder().with_email(email.clone()).build();
-    let user = fb_anyhow!(auth.get_user(identifiers).await)?
+    let user = auth
+        .get_user(identifiers)
+        .await
+        .into_anyhow()
+        .context(format!("Failed to fetch user {email}"))?
         .ok_or_else(|| anyhow::anyhow!("User not found: {email}"))?;
 
     let claims_map = claims_to_map(&user.custom_claims);
@@ -114,8 +114,13 @@ async fn merge(
     )?;
     let auth = init_firebase(AuthBackend::from_resolved(&conn)).await?;
 
+    tracing::debug!("Fetching user {email} for claim merge");
     let identifiers = UserIdentifiers::builder().with_email(email.clone()).build();
-    let user = fb_anyhow!(auth.get_user(identifiers).await)?
+    let user = auth
+        .get_user(identifiers)
+        .await
+        .into_anyhow()
+        .context(format!("Failed to fetch user {email}"))?
         .ok_or_else(|| anyhow::anyhow!("User not found: {email}"))?;
 
     let mut claims_map = claims_to_map(&user.custom_claims);
@@ -127,10 +132,15 @@ async fn merge(
         return Ok(());
     }
 
+    tracing::debug!("Updating claims for {email}");
     let update = UserUpdate::builder(user.uid)
         .custom_claims(map_to_claims(claims_map))
         .build();
-    let updated_user = fb_anyhow!(auth.update_user(update).await)?;
+    let updated_user = auth
+        .update_user(update)
+        .await
+        .into_anyhow()
+        .context(format!("Failed to update claims for {email}"))?;
 
     let updated_map = claims_to_map(&updated_user.custom_claims);
     render_json_value(&cli.format, &map_to_json(&updated_map));
@@ -150,8 +160,13 @@ async fn remove(cli: &Cli, key: Option<String>, email: Option<String>) -> Result
     )?;
     let auth = init_firebase(AuthBackend::from_resolved(&conn)).await?;
 
+    tracing::debug!("Fetching user {email} for claim removal");
     let identifiers = UserIdentifiers::builder().with_email(email.clone()).build();
-    let user = fb_anyhow!(auth.get_user(identifiers).await)?
+    let user = auth
+        .get_user(identifiers)
+        .await
+        .into_anyhow()
+        .context(format!("Failed to fetch user {email}"))?
         .ok_or_else(|| anyhow::anyhow!("User not found: {email}"))?;
 
     let mut claims_map = claims_to_map(&user.custom_claims);
@@ -167,10 +182,15 @@ async fn remove(cli: &Cli, key: Option<String>, email: Option<String>) -> Result
         return Ok(());
     }
 
+    tracing::debug!("Removing claim '{key}' for {email}");
     let update = UserUpdate::builder(user.uid)
         .custom_claims(map_to_claims(claims_map))
         .build();
-    let updated_user = fb_anyhow!(auth.update_user(update).await)?;
+    let updated_user = auth
+        .update_user(update)
+        .await
+        .into_anyhow()
+        .context(format!("Failed to update claims for {email}"))?;
 
     let updated_map = claims_to_map(&updated_user.custom_claims);
     render_json_value(&cli.format, &map_to_json(&updated_map));
@@ -200,16 +220,24 @@ async fn clear(cli: &Cli, email: Option<String>) -> Result<()> {
     )?;
     let auth = init_firebase(AuthBackend::from_resolved(&conn)).await?;
 
+    tracing::debug!("Clearing all claims for {email}");
     let identifiers = UserIdentifiers::builder().with_email(email.clone()).build();
-    let user = fb_anyhow!(auth.get_user(identifiers).await)?
+    let user = auth
+        .get_user(identifiers)
+        .await
+        .into_anyhow()
+        .context(format!("Failed to fetch user {email}"))?
         .ok_or_else(|| anyhow::anyhow!("User not found: {email}"))?;
 
     let update = UserUpdate::builder(user.uid)
         .custom_claims(map_to_claims(BTreeMap::new()))
         .build();
-    fb_anyhow!(auth.update_user(update).await)?;
+    auth.update_user(update)
+        .await
+        .into_anyhow()
+        .context(format!("Failed to clear claims for {email}"))?;
 
-    render_message(&format!("Cleared all custom claims for {email}"));
+    render_success(&format!("Cleared all custom claims for {email}"));
 
     Ok(())
 }
@@ -233,7 +261,11 @@ async fn find(cli: &Cli, key: String, value: Option<String>, exclusive: bool) ->
     loop {
         spinner.tick();
 
-        let page = fb_anyhow!(auth.list_users(1000, prev_page).await)?;
+        let page = auth
+            .list_users(1000, prev_page)
+            .await
+            .into_anyhow()
+            .context("Failed to list users during claim search")?;
 
         let user_list = match page {
             Some(list) => list,

src/commands/claims.rs

@@ -4,7 +4,7 @@ use crate::config::{
     Profile, add_profile, config_dir, load_config, remove_profile, resolve_connection, save_config,
     set_default,
 };
-use crate::output::{render_message, render_single_record, render_table};
+use crate::output::{render_message, render_single_record, render_success, render_table};
 use crate::prompt::{resolve_select, resolve_string};
 use crate::{Cli, ConfigCommand};
 
@@ -80,7 +80,7 @@ async fn init(_cli: &Cli) -> Result<()> {
     }
 
     save_config(&config)?;
-    render_message(&format!("Profile '{name}' created."));
+    render_success(&format!("Profile '{name}' created."));
 
     Ok(())
 }
@@ -114,9 +114,9 @@ async fn add(
     save_config(&config)?;
 
     if overwriting {
-        render_message(&format!("Profile '{name}' updated."));
+        render_success(&format!("Profile '{name}' updated."));
     } else {
-        render_message(&format!("Profile '{name}' added."));
+        render_success(&format!("Profile '{name}' added."));
     }
 
     Ok(())
@@ -131,7 +131,7 @@ async fn remove(_cli: &Cli, name: Option<String>) -> Result<()> {
     remove_profile(&mut config, &name)?;
     save_config(&config)?;
 
-    render_message(&format!("Profile '{name}' removed."));
+    render_success(&format!("Profile '{name}' removed."));
     Ok(())
 }
 
@@ -144,7 +144,7 @@ async fn default(_cli: &Cli, name: Option<String>) -> Result<()> {
     set_default(&mut config, &name)?;
     save_config(&config)?;
 
-    render_message(&format!("Default profile set to '{name}'."));
+    render_success(&format!("Default profile set to '{name}'."));
     Ok(())
 }
 

src/commands/config_cmd.rs

@@ -1,10 +1,10 @@
-use anyhow::Result;
+use anyhow::{Context, Result};
 use rs_firebase_admin_sdk::auth::FirebaseEmulatorAuthService;
 
 use crate::config::resolve_connection;
 use crate::errors::IntoAnyhow;
 use crate::firebase::{AuthBackend, init_firebase, require_emulator};
-use crate::output::{render_json_value, render_message};
+use crate::output::{render_json_value, render_success};
 use crate::{Cli, EmulatorCommand};
 
 pub async fn run(cli: &Cli, command: &EmulatorCommand) -> Result<()> {
@@ -24,9 +24,13 @@ async fn clear_users(cli: &Cli) -> Result<()> {
     require_emulator(&conn)?;
     let auth = init_firebase(AuthBackend::from_resolved(&conn)).await?;
 
-    auth.clear_all_users().await.into_anyhow()?;
+    tracing::debug!("Clearing all emulator users");
+    auth.clear_all_users()
+        .await
+        .into_anyhow()
+        .context("Failed to clear emulator users")?;
 
-    render_message("All users cleared.");
+    render_success("All users cleared.");
 
     Ok(())
 }
@@ -41,7 +45,12 @@ async fn config(cli: &Cli) -> Result<()> {
     require_emulator(&conn)?;
     let auth = init_firebase(AuthBackend::from_resolved(&conn)).await?;
 
-    let config = auth.get_emulator_configuration().await.into_anyhow()?;
+    tracing::debug!("Fetching emulator configuration");
+    let config = auth
+        .get_emulator_configuration()
+        .await
+        .into_anyhow()
+        .context("Failed to get emulator configuration")?;
     let value = serde_json::to_value(&config)?;
 
     render_json_value(&cli.format, &value);

src/commands/emulator.rs

@@ -1,11 +1,11 @@
-use anyhow::Result;
+use anyhow::{Context, Result};
 use rs_firebase_admin_sdk::auth::FirebaseAuthService;
 
 use crate::Cli;
 use crate::config::resolve_connection;
 use crate::errors::IntoAnyhow;
 use crate::firebase::{AuthBackend, init_firebase};
-use crate::output::{render_message, render_single_record};
+use crate::output::{render_message, render_single_record, render_success};
 
 pub async fn run(cli: &Cli) -> Result<()> {
     let conn = resolve_connection(
@@ -50,9 +50,15 @@ pub async fn run(cli: &Cli) -> Result<()> {
 
     render_single_record(&cli.format, &fields);
 
+    tracing::debug!("Verifying connectivity");
     match init_firebase(AuthBackend::from_resolved(&conn)).await {
-        Ok(auth) => match auth.list_users(1, None).await.into_anyhow() {
-            Ok(_) => render_message("status: connected ✓"),
+        Ok(auth) => match auth
+            .list_users(1, None)
+            .await
+            .into_anyhow()
+            .context("Connectivity check failed")
+        {
+            Ok(_) => render_success("status: connected"),
             Err(err) => render_message(&format!("status: error - {err}")),
         },
         Err(err) => render_message(&format!("status: error - {err}")),

src/commands/info.rs

@@ -1,4 +1,4 @@
-use anyhow::Result;
+use anyhow::{Context, Result};
 use rs_firebase_admin_sdk::auth::FirebaseAuthService;
 use rs_firebase_admin_sdk::auth::oob_code::{OobCodeAction, OobCodeActionType};
 
@@ -37,11 +37,13 @@ async fn generate_link(
     )?;
     let auth = init_firebase(AuthBackend::from_resolved(&conn)).await?;
 
-    let action = OobCodeAction::builder(action_type, email).build();
+    tracing::debug!("Generating {action_type:?} link for {email}");
+    let action = OobCodeAction::builder(action_type, email.clone()).build();
     let link = auth
         .generate_email_action_link(action)
         .await
-        .into_anyhow()?;
+        .into_anyhow()
+        .context(format!("Failed to generate link for {email}"))?;
 
     render_message(&link);