Merge branch 'main' into max/dataset-versions

Author: max-braintrust

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "bt"
-version = "0.4.0"
+version = "0.5.0"
 edition = "2021"
 rust-version = "1.86.0"
 authors = ["Braintrust engineering <eng@braintrust.dev>"]

Cargo.toml

@@ -266,10 +266,11 @@ Local transaction-id conversion helpers:
 
 Auth resolution order for commands is:
 
-1. `--api-key` or `BRAINTRUST_API_KEY` (unless `--prefer-profile` is set)
-2. `--profile` or `BRAINTRUST_PROFILE`
-3. Org-based profile match (profile whose org matches `--org`/config org)
-4. Single-profile auto-select (if only one profile exists)
+1. Explicit `--profile`
+2. `--api-key` or `BRAINTRUST_API_KEY` (unless `--prefer-profile` is set)
+3. `BRAINTRUST_PROFILE`
+4. Org-based profile match (profile whose org matches `--org`/config org)
+5. Single-profile auto-select (if only one profile exists)
 
 On Linux, secure storage uses `secret-tool` (libsecret) with a running Secret Service daemon. On macOS, it uses the `security` keychain utility. If a secure store is unavailable, `bt` falls back to a plaintext secrets file with `0600` permissions.
 

README.md

@@ -1,27 +1,45 @@
+use std::ffi::OsString;
 use std::path::PathBuf;
 
 use clap::Args;
 
 pub use braintrust_sdk_rust::{DEFAULT_API_URL, DEFAULT_APP_URL};
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ArgValueSource {
+    CommandLine,
+    EnvVariable,
+}
+
 #[derive(Debug, Clone, Args)]
 pub struct BaseArgs {
     /// Output as JSON
     #[arg(long, global = true)]
     pub json: bool,
 
-    /// Suppress non-essential output
+    /// Verbose mode — set at runtime by subcommands that support it
+    #[arg(skip)]
+    pub verbose: bool,
+
+    /// Reduce interactive UI output
     #[arg(long, short = 'q', env = "BRAINTRUST_QUIET", global = true, value_parser = clap::builder::BoolishValueParser::new(), default_value_t = false)]
     pub quiet: bool,
 
     /// Disable ANSI color output
     #[arg(long, env = "BRAINTRUST_NO_COLOR", global = true, value_parser = clap::builder::BoolishValueParser::new(), default_value_t = false)]
     pub no_color: bool,
 
+    /// Disable all interactive prompts
+    #[arg(long, env = "BRAINTRUST_NO_INPUT", global = true, value_parser = clap::builder::BoolishValueParser::new(), default_value_t = false)]
+    pub no_input: bool,
+
     /// Use a saved login profile (or via BRAINTRUST_PROFILE)
     #[arg(long, env = "BRAINTRUST_PROFILE", global = true)]
     pub profile: Option<String>,
 
+    #[arg(skip = false)]
+    pub profile_explicit: bool,
+
     /// Override active org (or via BRAINTRUST_ORG_NAME)
     #[arg(short = 'o', long = "org", env = "BRAINTRUST_ORG_NAME", global = true)]
     pub org_name: Option<String>,
@@ -40,14 +58,13 @@ pub struct BaseArgs {
     #[arg(long, env = "BRAINTRUST_API_KEY", global = true, hide = true)]
     pub api_key: Option<String>,
 
+    #[arg(skip)]
+    pub api_key_source: Option<ArgValueSource>,
+
     /// Prefer profile credentials even if BRAINTRUST_API_KEY/--api-key is set.
     #[arg(long, global = true)]
     pub prefer_profile: bool,
 
-    /// Disable all interactive prompts
-    #[arg(long, global = true)]
-    pub no_input: bool,
-
     /// Override API URL (or via BRAINTRUST_API_URL)
     #[arg(
         long,
@@ -67,7 +84,12 @@ pub struct BaseArgs {
     pub app_url: Option<String>,
 
     /// Path to a .env file to load before running commands.
-    #[arg(long, env = "BRAINTRUST_ENV_FILE", hide_env_values = true)]
+    #[arg(
+        long,
+        env = "BRAINTRUST_ENV_FILE",
+        hide_env_values = true,
+        global = true
+    )]
     pub env_file: Option<PathBuf>,
 }
 
@@ -79,3 +101,64 @@ pub struct CLIArgs<T: Args> {
     #[command(flatten)]
     pub args: T,
 }
+
+pub fn has_explicit_profile_arg(args: &[OsString]) -> bool {
+    let mut idx = 1usize;
+    while idx < args.len() {
+        let Some(arg) = args[idx].to_str() else {
+            idx += 1;
+            continue;
+        };
+
+        if arg == "--" {
+            break;
+        }
+
+        if arg == "--profile" || arg.starts_with("--profile=") {
+            return true;
+        }
+
+        idx += 1;
+    }
+
+    false
+}
+
+#[cfg(test)]
+mod tests {
+    use super::has_explicit_profile_arg;
+    use std::ffi::OsString;
+
+    #[test]
+    fn has_explicit_profile_arg_detects_split_flag() {
+        let args = vec![
+            OsString::from("bt"),
+            OsString::from("status"),
+            OsString::from("--profile"),
+            OsString::from("work"),
+        ];
+        assert!(has_explicit_profile_arg(&args));
+    }
+
+    #[test]
+    fn has_explicit_profile_arg_detects_equals_flag() {
+        let args = vec![
+            OsString::from("bt"),
+            OsString::from("status"),
+            OsString::from("--profile=work"),
+        ];
+        assert!(has_explicit_profile_arg(&args));
+    }
+
+    #[test]
+    fn has_explicit_profile_arg_ignores_passthrough_args() {
+        let args = vec![
+            OsString::from("bt"),
+            OsString::from("eval"),
+            OsString::from("--"),
+            OsString::from("--profile"),
+            OsString::from("work"),
+        ];
+        assert!(!has_explicit_profile_arg(&args));
+    }
+}