From ccf6fa34b1ed659711c29bb85b94ccf28c211cd5 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 9 Mar 2026 23:59:18 -0600
Subject: [PATCH] fix: set correct binary name and version on all CLI commands

---
 core/src/bins/container_cli.rs | 8 ++++----
 core/src/bins/registry.rs      | 5 +++++
 core/src/bins/start_cli.rs     | 8 ++++----
 core/src/bins/tunnel.rs        | 5 +++++
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/core/src/bins/container_cli.rs b/core/src/bins/container_cli.rs
index a03204107..0f5c65226 100644
--- a/core/src/bins/container_cli.rs
+++ b/core/src/bins/container_cli.rs
@@ -7,10 +7,6 @@ use crate::service::cli::{ContainerCliContext, ContainerClientConfig};
 use crate::util::logger::LOGGER;
 use crate::version::{Current, VersionT};
 
-lazy_static::lazy_static! {
-    static ref VERSION_STRING: String = Current::default().semver().to_string();
-}
-
 pub fn main(args: impl IntoIterator<Item = OsString>) {
     LOGGER.enable();
     if let Err(e) = CliApp::new(
@@ -18,6 +14,10 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
         crate::service::effects::handler(),
     )
     .mutate_command(super::translate_cli)
+    .mutate_command(|cmd| {
+        cmd.name("start-container")
+            .version(Current::default().semver().to_string())
+    })
     .run(args)
     {
         match e.data {
diff --git a/core/src/bins/registry.rs b/core/src/bins/registry.rs
index 13d0c54c2..49892247c 100644
--- a/core/src/bins/registry.rs
+++ b/core/src/bins/registry.rs
@@ -8,6 +8,7 @@ use tokio::signal::unix::signal;
 use tracing::instrument;
 
 use crate::context::CliContext;
+use crate::version::{Current, VersionT};
 use crate::context::config::ClientConfig;
 use crate::net::web_server::{Acceptor, WebServer};
 use crate::prelude::*;
@@ -101,6 +102,10 @@ pub fn cli(args: impl IntoIterator<Item = OsString>) {
         crate::registry::registry_api(),
     )
     .mutate_command(super::translate_cli)
+    .mutate_command(|cmd| {
+        cmd.name("start-registry")
+            .version(Current::default().semver().to_string())
+    })
     .run(args)
     {
         match e.data {
diff --git a/core/src/bins/start_cli.rs b/core/src/bins/start_cli.rs
index e1d737be4..85847f110 100644
--- a/core/src/bins/start_cli.rs
+++ b/core/src/bins/start_cli.rs
@@ -8,10 +8,6 @@ use crate::context::config::ClientConfig;
 use crate::util::logger::LOGGER;
 use crate::version::{Current, VersionT};
 
-lazy_static::lazy_static! {
-    static ref VERSION_STRING: String = Current::default().semver().to_string();
-}
-
 pub fn main(args: impl IntoIterator<Item = OsString>) {
     LOGGER.enable();
 
@@ -20,6 +16,10 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
         crate::main_api(),
     )
     .mutate_command(super::translate_cli)
+    .mutate_command(|cmd| {
+        cmd.name("start-cli")
+            .version(Current::default().semver().to_string())
+    })
     .run(args)
     {
         match e.data {
diff --git a/core/src/bins/tunnel.rs b/core/src/bins/tunnel.rs
index 07db8f671..3c72e556a 100644
--- a/core/src/bins/tunnel.rs
+++ b/core/src/bins/tunnel.rs
@@ -13,6 +13,7 @@ use tracing::instrument;
 use visit_rs::Visit;
 
 use crate::context::CliContext;
+use crate::version::{Current, VersionT};
 use crate::context::config::ClientConfig;
 use crate::net::tls::TlsListener;
 use crate::net::web_server::{Accept, Acceptor, MetadataVisitor, WebServer};
@@ -186,6 +187,10 @@ pub fn cli(args: impl IntoIterator<Item = OsString>) {
         crate::tunnel::api::tunnel_api(),
     )
     .mutate_command(super::translate_cli)
+    .mutate_command(|cmd| {
+        cmd.name("start-tunnel")
+            .version(Current::default().semver().to_string())
+    })
     .run(args)
     {
         match e.data {