refactor(cli): rename --transport/Transport to --enabled-binding/Binding

Signed-off-by: Sam Betts <1769706+Tehsmash@users.noreply.github.com>

Author: Tehsmash

a2acli/src/config.rs

@@ -7,13 +7,13 @@ use std::path::{Path, PathBuf};
 use serde::Deserialize;
 use thiserror::Error;
 
-use crate::{Cli, HeaderArg, OutputFormat, Transport};
+use crate::{Binding, Cli, HeaderArg, OutputFormat};
 
 #[derive(Debug, Clone, Default, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct Config {
     #[serde(default)]
-    pub transports: Vec<String>,
+    pub enabled_bindings: Vec<String>,
     #[serde(default)]
     pub bearer_token: Option<String>,
     #[serde(default)]
@@ -84,13 +84,13 @@ pub fn apply_config(
     let placeholder = PathBuf::from("<config>");
     let p = path.as_ref().unwrap_or(&placeholder);
 
-    // Transports: CLI wins if any flags were given
-    if cli.transports.is_empty() && !config.transports.is_empty() {
-        for s in &config.transports {
-            let transport = parse_transport_str(s).ok_or_else(|| {
+    // Enabled bindings: CLI wins if any flags were given
+    if cli.enabled_bindings.is_empty() && !config.enabled_bindings.is_empty() {
+        for s in &config.enabled_bindings {
+            let binding = parse_binding_str(s).ok_or_else(|| {
                 ConfigError::Invalid(p.clone(), format!("unknown transport: {s:?}"))
             })?;
-            cli.transports.push(transport);
+            cli.enabled_bindings.push(binding);
         }
     }
 
@@ -125,12 +125,12 @@ pub fn apply_config(
     Ok(())
 }
 
-fn parse_transport_str(s: &str) -> Option<Transport> {
+fn parse_binding_str(s: &str) -> Option<Binding> {
     match s {
-        "jsonrpc" => Some(Transport::Jsonrpc),
-        "http-json" => Some(Transport::HttpJson),
+        "jsonrpc" => Some(Binding::Jsonrpc),
+        "http-json" => Some(Binding::HttpJson),
         #[cfg(feature = "slimrpc")]
-        "slimrpc" => Some(Transport::Slimrpc),
+        "slimrpc" => Some(Binding::Slimrpc),
         _ => None,
     }
 }
@@ -146,7 +146,7 @@ fn parse_output_format(s: &str) -> Option<OutputFormat> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{OutputFormat, Transport};
+    use crate::{Binding, OutputFormat};
 
     fn parse_config(yaml: &str) -> Config {
         serde_yaml::from_str(yaml).unwrap()
@@ -155,7 +155,7 @@ mod tests {
     fn empty_cli() -> Cli {
         use crate::Command;
         Cli {
-            transports: vec![],
+            enabled_bindings: vec![],
             bearer_token: None,
             headers: vec![],
             output: None,
@@ -218,8 +218,8 @@ mod tests {
 
     #[test]
     fn test_parse_valid_config() {
-        let cfg = parse_config("transports:\n  - jsonrpc\nbearer_token: tok\noutput: json\n");
-        assert_eq!(cfg.transports, vec!["jsonrpc"]);
+        let cfg = parse_config("enabled_bindings:\n  - jsonrpc\nbearer_token: tok\noutput: json\n");
+        assert_eq!(cfg.enabled_bindings, vec!["jsonrpc"]);
         assert_eq!(cfg.bearer_token.as_deref(), Some("tok"));
         assert_eq!(cfg.output.as_deref(), Some("json"));
     }
@@ -233,20 +233,20 @@ mod tests {
     #[test]
     fn test_apply_fills_empty_cli() {
         let mut cli = empty_cli();
-        let cfg = parse_config("transports:\n  - http-json\nbearer_token: tok\noutput: json\n");
+        let cfg = parse_config("enabled_bindings:\n  - http-json\nbearer_token: tok\noutput: json\n");
         apply_config(&mut cli, &cfg, &None).unwrap();
-        assert_eq!(cli.transports, vec![crate::Transport::HttpJson]);
+        assert_eq!(cli.enabled_bindings, vec![crate::Binding::HttpJson]);
         assert_eq!(cli.bearer_token.as_deref(), Some("tok"));
         assert_eq!(cli.output, Some(OutputFormat::Json));
     }
 
     #[test]
-    fn test_cli_transports_take_precedence() {
+    fn test_cli_bindings_take_precedence() {
         let mut cli = empty_cli();
-        cli.transports = vec![Transport::Jsonrpc];
-        let cfg = parse_config("transports:\n  - http-json\n");
+        cli.enabled_bindings = vec![Binding::Jsonrpc];
+        let cfg = parse_config("enabled_bindings:\n  - http-json\n");
         apply_config(&mut cli, &cfg, &None).unwrap();
-        assert_eq!(cli.transports, vec![Transport::Jsonrpc]);
+        assert_eq!(cli.enabled_bindings, vec![Binding::Jsonrpc]);
     }
 
     #[test]
@@ -264,9 +264,9 @@ mod tests {
     }
 
     #[test]
-    fn test_invalid_transport_errors() {
+    fn test_invalid_binding_errors() {
         let mut cli = empty_cli();
-        let cfg = parse_config("transports:\n  - bogus\n");
+        let cfg = parse_config("enabled_bindings:\n  - bogus\n");
         let err = apply_config(&mut cli, &cfg, &None).unwrap_err();
         assert!(err.to_string().contains("unknown transport"));
     }

a2acli/src/lib.rs

@@ -16,11 +16,11 @@ use thiserror::Error;
 #[derive(Debug, Clone, Parser, PartialEq, Eq)]
 #[command(name = "a2a", version, about = "A2A client CLI")]
 pub struct Cli {
-    /// Enabled transports in preference order (first = most preferred).
-    /// Repeat the flag to enable multiple transports, e.g. --transport jsonrpc --transport http-json.
-    /// Only transports listed here will be used; the order overrides the server's preference.
-    #[arg(long = "transport", global = true, value_enum)]
-    pub transports: Vec<Transport>,
+    /// Enabled protocol bindings in preference order (first = most preferred).
+    /// Repeat the flag to enable multiple bindings, e.g. --enabled-binding jsonrpc --enabled-binding http-json.
+    /// Only bindings listed here will be used; the order overrides the server's preference.
+    #[arg(long = "enabled-binding", global = true, value_enum)]
+    pub enabled_bindings: Vec<Binding>,
 
     /// Bearer token attached to the agent-card fetch and client calls.
     #[arg(long, global = true, env = "A2A_BEARER_TOKEN")]
@@ -291,21 +291,21 @@ pub struct HeaderArg {
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, ValueEnum)]
-pub enum Transport {
+pub enum Binding {
     Jsonrpc,
     HttpJson,
 }
 
-impl Transport {
+impl Binding {
     fn protocol(self) -> &'static str {
         match self {
-            Transport::Jsonrpc => TRANSPORT_PROTOCOL_JSONRPC,
-            Transport::HttpJson => TRANSPORT_PROTOCOL_HTTP_JSON,
+            Binding::Jsonrpc => TRANSPORT_PROTOCOL_JSONRPC,
+            Binding::HttpJson => TRANSPORT_PROTOCOL_HTTP_JSON,
         }
     }
 }
 
-const DEFAULT_TRANSPORTS: &[Transport] = &[Transport::Jsonrpc, Transport::HttpJson];
+const DEFAULT_BINDINGS: &[Binding] = &[Binding::Jsonrpc, Binding::HttpJson];
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, ValueEnum)]
 pub enum TaskStateArg {
@@ -609,15 +609,15 @@ async fn resolve_client(
 ) -> Result<A2AClient<Box<dyn a2a_client::Transport>>, CliError> {
     let card = resolve_agent_card(agent_ref, cli).await?;
 
-    let effective_transports = if cli.transports.is_empty() {
-        DEFAULT_TRANSPORTS.to_vec()
+    let effective_bindings = if cli.enabled_bindings.is_empty() {
+        DEFAULT_BINDINGS.to_vec()
     } else {
-        cli.transports.clone()
+        cli.enabled_bindings.clone()
     };
 
-    let preferred: Vec<String> = effective_transports
+    let preferred: Vec<String> = effective_bindings
         .iter()
-        .map(|t| t.protocol().to_string())
+        .map(|b| b.protocol().to_string())
         .collect();
 
     let mut builder = A2AClientFactory::builder().preferred_bindings(preferred);
@@ -1346,7 +1346,7 @@ mod tests {
     #[test]
     fn test_cli_parse_send_command() {
         let cli = parse_cli(&[
-            "--transport",
+            "--enabled-binding",
             "jsonrpc",
             "--header",
             "X-Test:123",
@@ -1357,7 +1357,7 @@ mod tests {
             "2",
         ]);
 
-        assert_eq!(cli.transports, vec![crate::Transport::Jsonrpc]);
+        assert_eq!(cli.enabled_bindings, vec![crate::Binding::Jsonrpc]);
         assert_eq!(cli.headers.len(), 1);
         assert!(matches!(cli.command, Command::Send(_)));
     }
@@ -1461,9 +1461,9 @@ mod tests {
     }
 
     #[test]
-    fn test_transport_protocols() {
-        assert_eq!(crate::Transport::Jsonrpc.protocol(), TRANSPORT_PROTOCOL_JSONRPC);
-        assert_eq!(crate::Transport::HttpJson.protocol(), TRANSPORT_PROTOCOL_HTTP_JSON);
+    fn test_binding_protocols() {
+        assert_eq!(crate::Binding::Jsonrpc.protocol(), TRANSPORT_PROTOCOL_JSONRPC);
+        assert_eq!(crate::Binding::HttpJson.protocol(), TRANSPORT_PROTOCOL_HTTP_JSON);
     }
 
     #[test]
@@ -1678,7 +1678,7 @@ mod tests {
             .await
             .unwrap();
         run(parse_cli(&[
-            "--transport",
+            "--enabled-binding",
             "jsonrpc",
             "--bearer-token",
             "secret",

a2acli/tests/e2e.rs

@@ -478,7 +478,7 @@ async fn card_and_extended_card_commands_work() {
     assert_eq!(headers[0].1.as_deref(), Some("abc"));
 
     let compact = run_cli_success(&[
-        "--transport",
+        "--enabled-binding",
         "http-json",
         "-o",
         "json",