From 884dd6ec3eae3ce867c24bf363a0f00e3683835c Mon Sep 17 00:00:00 2001
From: xosnrdev <successxodev@gmail.com>
Date: Fri, 7 Feb 2025 09:58:12 -0500
Subject: [PATCH 1/2] refactor: Use clap's built-in version command

---
 crates/goose-cli/src/commands/mod.rs     |  1 -
 crates/goose-cli/src/commands/version.rs |  3 ---
 crates/goose-cli/src/main.rs             | 11 +----------
 3 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 crates/goose-cli/src/commands/version.rs

diff --git a/crates/goose-cli/src/commands/mod.rs b/crates/goose-cli/src/commands/mod.rs
index 58d9f2da5c..6c3e29df14 100644
--- a/crates/goose-cli/src/commands/mod.rs
+++ b/crates/goose-cli/src/commands/mod.rs
@@ -2,4 +2,3 @@ pub mod agent_version;
 pub mod configure;
 pub mod mcp;
 pub mod session;
-pub mod version;
diff --git a/crates/goose-cli/src/commands/version.rs b/crates/goose-cli/src/commands/version.rs
deleted file mode 100644
index 632c8bacd2..0000000000
--- a/crates/goose-cli/src/commands/version.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub fn print_version() {
-    println!(env!("CARGO_PKG_VERSION"))
-}
diff --git a/crates/goose-cli/src/main.rs b/crates/goose-cli/src/main.rs
index 67a054690e..101b470035 100644
--- a/crates/goose-cli/src/main.rs
+++ b/crates/goose-cli/src/main.rs
@@ -11,7 +11,6 @@ use commands::agent_version::AgentCommand;
 use commands::configure::handle_configure;
 use commands::mcp::run_server;
 use commands::session::build_session;
-use commands::version::print_version;
 use console::style;
 use goose::config::Config;
 use logging::setup_logging;
@@ -21,11 +20,8 @@ use std::io::{self, Read};
 mod test_helpers;
 
 #[derive(Parser)]
-#[command(author, about, long_about = None)]
+#[command(author, version, about, long_about = None)]
 struct Cli {
-    #[arg(short = 'v', long = "version")]
-    version: bool,
-
     #[command(subcommand)]
     command: Option<Command>,
 }
@@ -166,11 +162,6 @@ enum CliProviderVariant {
 async fn main() -> Result<()> {
     let cli = Cli::parse();
 
-    if cli.version {
-        print_version();
-        return Ok(());
-    }
-
     match cli.command {
         Some(Command::Configure {}) => {
             let _ = handle_configure().await;

From 61ca8ed998e513443ec0a3809608661524e4f25c Mon Sep 17 00:00:00 2001
From: xosnrdev <successxodev@gmail.com>
Date: Sat, 8 Feb 2025 14:55:19 -0500
Subject: [PATCH 2/2] chore: Remove display name from version

---
 crates/goose-cli/src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/goose-cli/src/main.rs b/crates/goose-cli/src/main.rs
index 101b470035..04a69ca8ee 100644
--- a/crates/goose-cli/src/main.rs
+++ b/crates/goose-cli/src/main.rs
@@ -20,7 +20,7 @@ use std::io::{self, Read};
 mod test_helpers;
 
 #[derive(Parser)]
-#[command(author, version, about, long_about = None)]
+#[command(author, version, display_name = "", about, long_about = None)]
 struct Cli {
     #[command(subcommand)]
     command: Option<Command>,