restore arg parsing

Author: jeff-hykin

Cargo.lock

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

dimos/src/viewer.rs

@@ -50,13 +50,36 @@ 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());
+
     // Connect WebSocket publisher for click/keyboard events
-    let ws_url = std::env::var("DIMOS_VIEWER_WS_URL")
-        .unwrap_or_else(|_| DEFAULT_WS_URL.to_string());
+    // 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}");
 
@@ -142,7 +165,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         main_thread_token,
         build_info,
         rerun::CallSource::Cli,
-        std::env::args(),
+        rerun_args.into_iter(),
         Some(wrapper),
         Some(startup_patch),
     )?;