Merge branch 'add_version' into 'main'

feat(cli): runtime version override + ws auth-hint fix

See merge request mobilex/web3/OKOutcomes!27

Author: puderty

src/app.rs

@@ -8,7 +8,7 @@
 //! cargo run --bin okx-outcomes -- search "world cup"  # search
 //! ```
 
-use super::{APP_NAME, APP_VERSION};
+use super::APP_NAME;
 
 /// Run the predictions CLI application.
 pub async fn run() {
@@ -31,7 +31,7 @@ pub async fn run() {
 pub(super) async fn dispatch(raw_args: &[String]) {
     // Version flag — print and return before any command parsing.
     if raw_args.iter().any(|a| a == "--version" || a == "-V") {
-        println!("{APP_NAME} v{APP_VERSION}");
+        println!("{APP_NAME} v{}", super::version());
         return;
     }
 
@@ -145,7 +145,7 @@ fn filter_outer_flags(args: &[String]) -> Vec<&str> {
 }
 
 fn print_help() {
-    println!("OKX Outcomes CLI v{APP_VERSION}");
+    println!("OKX Outcomes CLI v{}", super::version());
     println!();
     println!("USAGE:");
     println!("  {APP_NAME} [COMMAND] [OPTIONS]");
@@ -237,7 +237,7 @@ fn print_help() {
     println!("  {APP_NAME} account positions -j                 JSON positions");
     println!("  {APP_NAME} clob create-order                    Place order");
     println!("  {APP_NAME} ctf split --market 1 --amount 100    Split position");
-    println!("  {APP_NAME} ws prices 100170100               Stream prices");
+    println!("  {APP_NAME} ws prices 101663000                  Stream prices");
     println!("  {APP_NAME} status                               Check API connectivity");
     println!("  {APP_NAME} shell                                Enter REPL mode");
 }

src/lib.rs

@@ -19,9 +19,28 @@
 pub const APP_NAME: &str = "okx-outcomes";
 
 /// CLI version, sourced from `[package].version` in `Cargo.toml` at compile
-/// time. Surfaced via `--version`/`-V` and in the help header.
+/// time. The default surfaced via `--version`/`-V` and the help header,
+/// unless an embedding binary overrides it via [`set_version`].
 pub const APP_VERSION: &str = env!("CARGO_PKG_VERSION");
 
+/// Override the version string shown by `--version`/`-V` and the help
+/// header. Lets an embedding binary report its own / effective version
+/// instead of this crate's. One-shot, like [`set_http_client`].
+pub fn set_version(version: String) -> Result<(), String> {
+    CUSTOM_VERSION.set(version)
+}
+
+pub(crate) static CUSTOM_VERSION: std::sync::OnceLock<String> = std::sync::OnceLock::new();
+
+/// Effective version: the injected override if any, else the compile-time
+/// [`APP_VERSION`].
+pub(crate) fn version() -> &'static str {
+    CUSTOM_VERSION
+        .get()
+        .map(String::as_str)
+        .unwrap_or(APP_VERSION)
+}
+
 /// Override the HTTP client used by the SDK for every REST request.
 ///
 /// Must be called before any command dispatches (typically at the top of

src/setup_cmds.rs

@@ -72,6 +72,31 @@ pub fn maybe_print_setup_hint(positional: &[&str]) {
     if clob_public_read {
         return;
     }
+    // `ws` is likewise mixed, but its public channels are an open set (any
+    // `candle*` bar, plus future additions), so we identify the *private*
+    // subcommands instead and treat everything else as public. This keeps a
+    // single source of truth with the private dispatch arms in `ws/cmds.rs`:
+    // terminal/orders/positions/balance/user-trades/pnl/private all need an
+    // account; prices/books/trades/tickers/event-status/candle* don't.
+    let ws_public_read = positional.first().map(|s| s.to_lowercase()).as_deref() == Some("ws")
+        && positional
+            .get(1)
+            .map(|s| s.to_lowercase())
+            .is_some_and(|s| {
+                !matches!(
+                    s.as_str(),
+                    "terminal"
+                        | "orders"
+                        | "positions"
+                        | "balance"
+                        | "user-trades"
+                        | "pnl"
+                        | "private"
+                )
+            });
+    if ws_public_read {
+        return;
+    }
     // Only nag when the user has no way to authenticate at all — neither a live
     // API key in `~/.okx/config.toml` nor an OAuth session. Check the cheap file
     // read first so the broker subprocess is skipped whenever a key is present.

src/ws/cmds.rs

@@ -127,7 +127,7 @@ pub async fn run_ws_command(args: &[&str], json_mode: bool) {
     if inst_ids.is_empty() && !no_id_ok {
         crate::util::mark_failed();
         raw_println!("Error: at least one assetId is required.");
-        raw_println!("Example: {APP_NAME} ws prices 100888000");
+        raw_println!("Example: {APP_NAME} ws prices 101663000");
         return;
     }
 
@@ -532,11 +532,11 @@ Output modes:
   --json / -j             NDJSON: one compact JSON object per push, suitable for piping
 
 Examples:
-  {APP_NAME} ws prices 100170100
-  {APP_NAME} ws books 100170100 100888000
-  {APP_NAME} ws trades 100170100 --json
-  {APP_NAME} ws trades 100170100 --json | jq '.px'
-  {APP_NAME} ws candle15m 100170100
+  {APP_NAME} ws prices 101663000
+  {APP_NAME} ws books 101663000
+  {APP_NAME} ws trades 101663000 --json
+  {APP_NAME} ws trades 101663000 --json | jq '.px'
+  {APP_NAME} ws candle15m 101663000
   {APP_NAME} ws orders                          # private; needs credentials from `setup`
 "#
     );