add to --ws-url help properly

Author: jeff-hykin

Cargo.lock

@@ -3119,6 +3119,7 @@ name = "dimos-viewer"
 version = "0.30.0-alpha.6"
 dependencies = [
  "bincode",
+ "clap",
  "futures-util",
  "mimalloc",
  "rerun",

crates/top/rerun/src/commands/entrypoint.rs

@@ -196,6 +196,17 @@ When persisted, the state will be stored at the following locations:
     #[clap(long)]
     pub follow: bool,
 
+    /// WebSocket server URL for publishing viewer interaction events
+    /// (clicks, keyboard teleop commands).
+    ///
+    /// The viewer connects as a WebSocket client to this URL and sends
+    /// JSON events. Used by DimOS for click-to-navigate and WASD teleop.
+    ///
+    /// Also configurable via the DIMOS_VIEWER_WS_URL environment variable.
+    /// CLI flag takes priority over the environment variable.
+    #[clap(long, default_value = "ws://127.0.0.1:3030/ws")]
+    pub ws_url: String,
+
     /// The number of compute threads to use.
     ///
     /// If zero, the same number of threads as the number of cores will be used.

dimos/Cargo.toml

@@ -27,6 +27,7 @@ rerun = { path = "../crates/top/rerun", default-features = false, features = [
 ] }
 
 bincode.workspace = true
+clap.workspace = true
 futures-util.workspace = true
 mimalloc.workspace = true
 serde = { workspace = true, features = ["derive"] }

dimos/src/viewer.rs

@@ -50,36 +50,27 @@ impl eframe::App for DimosApp {
     }
 }
 
-/// Extract `--ws-url <value>` from args, returning (ws_url, remaining_args).
-/// This lets us handle our custom flag without conflicting with Rerun's own arg parsing.
-fn extract_ws_url(args: Vec<String>) -> (Option<String>, Vec<String>) {
-    let mut ws_url = None;
-    let mut remaining = Vec::with_capacity(args.len());
-    let mut iter = args.into_iter();
-    while let Some(arg) = iter.next() {
-        if arg == "--ws-url" {
-            ws_url = iter.next();
-        } else if let Some(val) = arg.strip_prefix("--ws-url=") {
-            ws_url = Some(val.to_string());
-        } else {
-            remaining.push(arg);
-        }
-    }
-    (ws_url, remaining)
-}
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let main_thread_token = re_viewer::MainThreadToken::i_promise_i_am_on_the_main_thread();
     let build_info = re_viewer::build_info();
 
-    // Extract --ws-url before passing remaining args to Rerun
-    let (ws_url_arg, rerun_args) = extract_ws_url(std::env::args().collect());
+    // Parse args (including --ws-url) via Rerun's clap Args, without consuming them.
+    // We peek at the parsed value, then pass the original args to run_with_app_wrapper
+    // which will parse them again.
+    let parsed: rerun::RerunArgs = clap::Parser::parse();
+    let ws_url = if std::env::var("DIMOS_VIEWER_WS_URL").is_ok() {
+        // Env var overrides default but not an explicit CLI flag.
+        // If the parsed value equals the default, check the env var.
+        if parsed.ws_url == DEFAULT_WS_URL {
+            std::env::var("DIMOS_VIEWER_WS_URL").unwrap()
+        } else {
+            parsed.ws_url.clone()
+        }
+    } else {
+        parsed.ws_url.clone()
+    };
 
     // Connect WebSocket publisher for click/keyboard events
-    // Priority: --ws-url flag > DIMOS_VIEWER_WS_URL env var > default
-    let ws_url = ws_url_arg
-        .or_else(|| std::env::var("DIMOS_VIEWER_WS_URL").ok())
-        .unwrap_or_else(|| DEFAULT_WS_URL.to_string());
     let ws_publisher = WsPublisher::connect(ws_url.clone());
     re_log::info!("WebSocket client connecting to {ws_url}");
 
@@ -165,7 +156,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         main_thread_token,
         build_info,
         rerun::CallSource::Cli,
-        rerun_args.into_iter(),
+        std::env::args(),
         Some(wrapper),
         Some(startup_patch),
     )?;