digdigdig3-station 0.3.30

Consumer-facing builder over digdigdig3 ExchangeHub. Persistence, cache, replay, cure, orderbook tracker, multiplex, reconnect.
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
//! Bar-aligned historical series for non-OHLCV streams.
//!
//! The mlq backtester warmup is a slice factory: per `(symbol, timeframe)` it
//! drives each indicator bar-by-bar. To feed the ~130 non-OHLCV mli indicators
//! it needs, per `(symbol, timeframe, stream)`, a series **time-aligned to the
//! OHLCV bar grid** — one value per bar — that warmup routes into the matching
//! mli `update_*` method. This module is dig3's side of that contract: a fetch
//! that returns, for `(exchange, account, symbol, kind, range)`, a bar-aligned
//! series pulled through the shared [`ExchangeHub`] REST surface.
//!
//! Fill policy is decided by the *nature* of the stream, not a global flag
//! (see [`Kind::fill_policy`]):
//!
//! * **State** streams (funding, OI, mark/index price, long/short ratio) are
//!   levels → **last-value carry-forward** onto the bar grid. A bar with no
//!   fresh observation carries the previous value (`filled = true`).
//! * **Flow** streams (liquidation, aggTrade) are event flows → **bucket-sum
//!   per bar**, gaps are a real `0.0` (`filled = false`).
//!
//! Kline-family kinds (mark/index/premium price klines) arrive already on the
//! bar grid; they are returned verbatim as [`BarPoint`]s, no resample needed.

use std::collections::BTreeMap;
use std::sync::Arc;

use digdigdig3::connector_manager::ExchangeHub;
use digdigdig3::core::types::{AccountType, ExchangeId, SymbolInput};
use digdigdig3::core::websocket::KlineInterval;

use crate::data::BarPoint;
use crate::error::{Result, StationError};
use crate::series::{Kind, SeriesKey};

/// How a stream's observations collapse onto a bar.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum FillPolicy {
    /// State/level stream — carry the last observation forward into empty bars.
    ForwardFill,
    /// Event-flow stream — sum observations falling inside the bar; empty = 0.
    ZeroFlow,
}

/// One bar's worth of a scalar non-OHLCV stream, aligned to the OHLCV grid.
#[derive(Debug, Clone, Copy, PartialEq)]
pub struct ScalarBar {
    /// Bar open time (ms) — aligned to the interval grid, matches the kline key.
    pub bar_open_time: i64,
    /// The stream's value for this bar (rate / OI / ratio / price / flow-sum).
    pub value: f64,
    /// `true` if this bar carried a prior value (ForwardFill) rather than
    /// observing a fresh one. Always `false` for ZeroFlow.
    pub filled: bool,
}

/// Bar-aligned series, shaped by the stream kind. Mirrors the kline path so
/// mlq keys it the same way and warmup feeds it to the matching `update_*`.
#[derive(Debug, Clone)]
pub enum BarAlignedSeries {
    /// Mark/index/premium price klines — native OHLCV bars.
    Klines(Vec<BarPoint>),
    /// Scalar state or flow stream collapsed onto the bar grid.
    Scalar(Vec<ScalarBar>),
}

impl BarAlignedSeries {
    /// Number of bars in the series.
    pub fn len(&self) -> usize {
        match self {
            BarAlignedSeries::Klines(v) => v.len(),
            BarAlignedSeries::Scalar(v) => v.len(),
        }
    }
    pub fn is_empty(&self) -> bool {
        self.len() == 0
    }
}

impl Kind {
    /// Fill policy for collapsing this stream's observations onto a bar.
    /// State streams carry forward; flow streams bucket-sum with zero gaps.
    pub fn fill_policy(&self) -> FillPolicy {
        match self {
            Kind::Liquidation | Kind::AggTrade | Kind::Trade
            | Kind::TakerVolume | Kind::LiquidationBucket => FillPolicy::ZeroFlow,
            _ => FillPolicy::ForwardFill,
        }
    }
}

/// Interval string → bar step in milliseconds. Supports the standard kline
/// intervals up to weekly. Calendar-month (`"1M"`) has no fixed ms width and
/// returns `None` (kline-family months don't need this path; scalar resample
/// at monthly is out of scope).
fn interval_millis(iv: &str) -> Option<i64> {
    let iv = iv.trim();
    let (num, unit) = iv.split_at(iv.len().saturating_sub(1));
    let n: i64 = num.parse().ok()?;
    let per = match unit {
        "m" => 60_000,
        "h" => 60 * 60_000,
        "d" | "D" => 24 * 60 * 60_000,
        "w" | "W" => 7 * 24 * 60 * 60_000,
        _ => return None,
    };
    Some(n * per)
}

/// Resample a sorted `(ts_ms, value)` source onto the `[start, end)` bar grid
/// of width `step` ms, per `policy`. The grid is aligned to interval boundaries
/// (`bar_open_time % step == 0`), matching exchange kline semantics.
///
/// * `ForwardFill`: each bar's value is the most recent observation known by
///   the bar's close (`ts < bar_open + step`); leading bars with no prior
///   observation are omitted (gap = none at the head).
/// * `ZeroFlow`: each bar's value is the sum of observations with
///   `ts ∈ [bar_open, bar_open + step)`; every bar in range is emitted (0 if
///   none).
fn resample(mut src: Vec<(i64, f64)>, start: i64, end: i64, step: i64, policy: FillPolicy) -> Vec<ScalarBar> {
    src.sort_unstable_by_key(|(ts, _)| *ts);
    let first_bar = start.div_euclid(step) * step;
    let mut out = Vec::new();

    match policy {
        FillPolicy::ForwardFill => {
            let mut idx = 0usize;
            let mut last: Option<f64> = None;
            let mut t = first_bar;
            while t < end {
                let bar_close = t + step;
                let mut fresh = false;
                while idx < src.len() && src[idx].0 < bar_close {
                    last = Some(src[idx].1);
                    if src[idx].0 >= t {
                        fresh = true;
                    }
                    idx += 1;
                }
                if let Some(v) = last {
                    out.push(ScalarBar { bar_open_time: t, value: v, filled: !fresh });
                }
                t += step;
            }
        }
        FillPolicy::ZeroFlow => {
            let mut idx = 0usize;
            let mut t = first_bar;
            while t < end {
                let bar_close = t + step;
                let mut sum = 0.0;
                while idx < src.len() && src[idx].0 < bar_close {
                    if src[idx].0 >= t {
                        sum += src[idx].1;
                    }
                    idx += 1;
                }
                out.push(ScalarBar { bar_open_time: t, value: sum, filled: false });
                t += step;
            }
        }
    }
    out
}

/// Bar-align an in-memory series of recorded [`DataPoint`]s onto the OHLCV grid
/// (Track C — daemon-recorded streams with no REST history: liquidations, L2,
/// aggTrades). The forward-recording daemon (`dig3 watch` / Station persistence)
/// writes typed points to a `DiskStore<T>`; a consumer reads them back
/// (`DiskStore::read_tail` / `Series`) and feeds the slice here with a scalar
/// projection to get the same bar-aligned shape the REST loader produces.
///
/// `project` extracts the scalar per point (e.g. liquidation notional, aggTrade
/// size). Fill policy is the caller's choice: `ZeroFlow` for event flows
/// (liq/aggTrade — sum per bar, gap=0), `ForwardFill` for recorded levels.
///
/// This is the in-process resample step; reading the points off disk and
/// choosing the range is the caller's job (the recording is forward-only — you
/// can only bar-align what the daemon has captured).
pub fn bar_align_points<T, F>(
    points: &[T],
    project: F,
    start_ms: i64,
    end_ms: i64,
    interval: &KlineInterval,
    policy: FillPolicy,
) -> Result<Vec<ScalarBar>>
where
    T: crate::series::DataPoint,
    F: Fn(&T) -> f64,
{
    let step = interval_millis(interval.as_str())
        .ok_or_else(|| StationError::Core(format!("interval {interval} has no fixed ms width for resample")))?;
    let src: Vec<(i64, f64)> = points
        .iter()
        .filter(|p| {
            let t = p.timestamp_ms();
            t >= start_ms && t < end_ms
        })
        .map(|p| (p.timestamp_ms(), project(p)))
        .collect();
    Ok(resample(src, start_ms, end_ms, step, policy))
}

/// Track-C read-path: read a recorded stream off its `DiskStore` and bar-align
/// it in one call. Reads the last `max_points` records (the daemon appends
/// forward-only, so the tail is the captured window), range-filters, and
/// resamples per `project`/`policy`. Native-only — the wasm OPFS store has a
/// divergent read error type; wasm consumers read points then call
/// [`bar_align_points`] directly.
#[cfg(not(target_arch = "wasm32"))]
pub async fn bar_align_from_disk<T, F>(
    store: &crate::series::DiskStore<T>,
    project: F,
    start_ms: i64,
    end_ms: i64,
    interval: &KlineInterval,
    policy: FillPolicy,
    max_points: usize,
) -> Result<Vec<ScalarBar>>
where
    T: crate::series::DataPoint,
    F: Fn(&T) -> f64,
{
    let pts = store
        .read_tail(max_points)
        .await
        .map_err(|e| StationError::Core(format!("DiskStore read_tail failed: {e}")))?;
    bar_align_points(&pts, project, start_ms, end_ms, interval, policy)
}

/// Cap a REST kline `limit` to the per-call exchange ceiling.
const KLINE_PAGE: u16 = 1000;

/// Paginate kline-family history backwards over `[start, end)` and return all
/// bars in `[start, end)`, oldest-first, deduped by `open_time`.
///
/// `fetch` pulls up to `KLINE_PAGE` bars ending at the given exclusive
/// `end_time` (oldest→newest). We walk `end_time` backwards until we reach
/// `start` or the exchange stops returning new bars.
async fn paginate_klines<F, Fut>(start: i64, end: i64, mut fetch: F) -> Result<Vec<BarPoint>>
where
    F: FnMut(i64) -> Fut,
    Fut: std::future::Future<Output = Result<Vec<BarPoint>>>,
{
    let mut all: Vec<BarPoint> = Vec::new();
    let mut cursor = end;
    // Safety bound: never loop forever on a misbehaving venue.
    for _ in 0..256 {
        // One retry to absorb a transient gateway error (e.g. Gate.io's
        // premium-index endpoint intermittently 504s on heavy pages).
        let page = match fetch(cursor).await {
            Ok(p) => p,
            Err(_) => fetch(cursor).await?,
        };
        if page.is_empty() {
            break;
        }
        let oldest = page.iter().map(|b| b.open_time).min().unwrap_or(cursor);
        all.extend(page);
        if oldest <= start {
            break;
        }
        // Next page ends just before the oldest bar we already have.
        let next = oldest - 1;
        if next >= cursor {
            break; // no progress
        }
        cursor = next;
    }
    all.retain(|b| b.open_time >= start && b.open_time < end);
    all.sort_unstable_by_key(|b| b.open_time);
    all.dedup_by_key(|b| b.open_time);
    Ok(all)
}

/// Load a bar-aligned historical series for one `(exchange, account, symbol,
/// kind, interval)` over `[start_ms, end_ms)`.
///
/// `symbol` must be exchange-native (already normalized) — matching the
/// `SubscriptionSet::add_raw` / `fetch_history` convention.
///
/// Supported now (REST-historical, no daemon):
/// * Kline-family: `Kline`, `MarkPriceKline`, `IndexPriceKline`,
///   `PremiumIndexKline` → [`BarAlignedSeries::Klines`].
/// * Scalar state: `FundingRate`, `OpenInterest`, `LongShortRatio`,
///   `MarkPrice`, `IndexPrice` → [`BarAlignedSeries::Scalar`].
///
/// Flow streams (`Liquidation`, `AggTrade`) and book streams require the
/// recording daemon and return `StreamNotSupported` here.
pub async fn load_bar_aligned(
    hub: &Arc<ExchangeHub>,
    exchange: ExchangeId,
    account: AccountType,
    symbol: &str,
    kind: &Kind,
    interval: &KlineInterval,
    start_ms: i64,
    end_ms: i64,
) -> Result<BarAlignedSeries> {
    let rest = hub
        .rest(exchange)
        .ok_or_else(|| StationError::Core(format!("{exchange:?} not connected in hub")))?;

    // ── Kline-family — native bar grid, just paginate + range-filter. ──────────
    if let Some(klines) = match kind {
        Kind::Kline(iv) => Some(("kline", iv.clone())),
        Kind::MarkPriceKline(iv) => Some(("mark", iv.clone())),
        Kind::IndexPriceKline(iv) => Some(("index", iv.clone())),
        Kind::PremiumIndexKline(iv) => Some(("premium", iv.clone())),
        _ => None,
    } {
        let (which, iv) = klines;
        let rest = rest.clone();
        let sym = symbol.to_string();
        let bars = paginate_klines(start_ms, end_ms, |cursor| {
            let rest = rest.clone();
            let sym = sym.clone();
            let ivs = iv.as_str().to_string();
            async move {
                let res = match which {
                    "kline" => rest
                        .get_klines(SymbolInput::Raw(&sym), &ivs, Some(KLINE_PAGE), account, Some(cursor))
                        .await,
                    "mark" => rest
                        .get_mark_price_klines(SymbolInput::Raw(&sym), &ivs, Some(KLINE_PAGE as u32), account, Some(cursor))
                        .await,
                    "index" => rest
                        .get_index_price_klines(SymbolInput::Raw(&sym), &ivs, Some(KLINE_PAGE as u32), account, Some(cursor))
                        .await,
                    _ => rest
                        .get_premium_index_klines(SymbolInput::Raw(&sym), &ivs, Some(KLINE_PAGE as u32), account, Some(cursor))
                        .await,
                };
                res.map(|ks| ks.iter().map(BarPoint::from_kline).collect())
                    .map_err(|e| StationError::Core(format!("{which} klines failed: {e}")))
            }
        })
        .await?;
        return Ok(BarAlignedSeries::Klines(bars));
    }

    // ── Scalar streams — fetch source observations then resample to the grid. ──
    let step = interval_millis(interval.as_str())
        .ok_or_else(|| StationError::Core(format!("interval {interval} has no fixed ms width for resample")))?;

    let src: Vec<(i64, f64)> = match kind {
        Kind::FundingRate => rest
            .get_funding_rate_history(SymbolInput::Raw(symbol), Some(start_ms), Some(end_ms), Some(1000), account)
            .await
            .map_err(|e| StationError::Core(format!("funding history failed: {e}")))?
            .into_iter()
            .map(|f| (f.timestamp, f.rate))
            .collect(),

        Kind::OpenInterest => rest
            .get_open_interest_history(SymbolInput::Raw(symbol), interval.as_str(), Some(start_ms), Some(end_ms), Some(500), account)
            .await
            .map_err(|e| StationError::Core(format!("open interest history failed: {e}")))?
            .into_iter()
            .map(|oi| (oi.timestamp, oi.open_interest))
            .collect(),

        Kind::Basis => rest
            .get_basis_history(SymbolInput::Raw(symbol), interval.as_str(), Some(start_ms), Some(end_ms), Some(500), account)
            .await
            .map_err(|e| StationError::Core(format!("basis history failed: {e}")))?
            .into_iter()
            .map(|b| (b.timestamp, b.basis))
            .collect(),

        Kind::LongShortRatio => rest
            .get_long_short_ratio_history(SymbolInput::Raw(symbol), interval.as_str(), Some(start_ms), Some(end_ms), Some(500), account)
            .await
            .map_err(|e| StationError::Core(format!("long/short ratio history failed: {e}")))?
            .into_iter()
            .map(|r| {
                // Prefer the exchange-provided combined ratio; else long/short.
                let v = r.ratio.unwrap_or_else(|| {
                    if r.short_ratio > 0.0 { r.long_ratio / r.short_ratio } else { r.long_ratio }
                });
                (r.timestamp, v)
            })
            .collect(),

        // Scalar mark/index price: project the close of the corresponding
        // derived kline (native bar grid — no separate resample).
        Kind::MarkPrice | Kind::IndexPrice => {
            let which = if matches!(kind, Kind::MarkPrice) { "mark" } else { "index" };
            let rest2 = rest.clone();
            let sym = symbol.to_string();
            let ivs = interval.as_str().to_string();
            let bars = paginate_klines(start_ms, end_ms, |cursor| {
                let rest2 = rest2.clone();
                let sym = sym.clone();
                let ivs = ivs.clone();
                async move {
                    let res = if which == "mark" {
                        rest2.get_mark_price_klines(SymbolInput::Raw(&sym), &ivs, Some(KLINE_PAGE as u32), account, Some(cursor)).await
                    } else {
                        rest2.get_index_price_klines(SymbolInput::Raw(&sym), &ivs, Some(KLINE_PAGE as u32), account, Some(cursor)).await
                    };
                    res.map(|ks| ks.iter().map(BarPoint::from_kline).collect())
                        .map_err(|e| StationError::Core(format!("{which} klines failed: {e}")))
                }
            })
            .await?;
            // Already bar-aligned; project close directly.
            let scalars = bars
                .into_iter()
                .map(|b| ScalarBar { bar_open_time: b.open_time, value: b.close, filled: false })
                .collect();
            return Ok(BarAlignedSeries::Scalar(scalars));
        }

        // Liquidation: ZeroFlow — sum notional per bar from REST history.
        Kind::Liquidation => rest
            .get_liquidation_history(Some(SymbolInput::Raw(symbol)), Some(start_ms), Some(end_ms), Some(1000), account)
            .await
            .map_err(|e| StationError::Core(format!("liquidation history failed: {e}")))?
            .into_iter()
            .filter_map(|liq| {
                let value = liq.value.unwrap_or_else(|| liq.price * liq.quantity);
                if value > 0.0 { Some((liq.timestamp, value)) } else { None }
            })
            .collect(),

        // InsuranceFund: ForwardFill — snapshot balance onto the bar grid.
        Kind::InsuranceFund => rest
            .get_insurance_fund(Some(SymbolInput::Raw(symbol)), account)
            .await
            .map_err(|e| StationError::Core(format!("insurance fund failed: {e}")))?
            .into_iter()
            .map(|f| (f.timestamp, f.balance))
            .collect(),

        // TakerVolume: ZeroFlow — bucket buy_volume+sell_volume per bar.
        Kind::TakerVolume => rest
            .get_taker_volume_history(SymbolInput::Raw(symbol), interval.as_str(), Some(start_ms), Some(end_ms), Some(500), account)
            .await
            .map_err(|e| StationError::Core(format!("taker volume history failed: {e}")))?
            .into_iter()
            .map(|tv| (tv.timestamp, tv.buy_volume + tv.sell_volume))
            .collect(),

        // LiquidationBucket: ZeroFlow — sum long+short liq value per bar.
        Kind::LiquidationBucket => rest
            .get_liquidation_bucket_history(SymbolInput::Raw(symbol), interval.as_str(), Some(start_ms), Some(end_ms), Some(500), account)
            .await
            .map_err(|e| StationError::Core(format!("liquidation bucket history failed: {e}")))?
            .into_iter()
            .map(|lb| {
                let total = lb.long_liq_usd.unwrap_or(0.0) + lb.short_liq_usd.unwrap_or(0.0);
                (lb.timestamp, total)
            })
            .collect(),

        Kind::AggTrade => {
            return Err(StationError::StreamNotSupported(format!(
                "AggTrade bar-aligned history needs the recording daemon (no usable REST history endpoint)"
            )));
        }

        other => {
            return Err(StationError::StreamNotSupported(format!(
                "bar-aligned loader does not yet support {other:?}"
            )));
        }
    };

    Ok(BarAlignedSeries::Scalar(resample(src, start_ms, end_ms, step, kind.fill_policy())))
}

/// Convenience wrapper keyed by [`SeriesKey`]. The interval is read from the
/// key's kline-family kind; non-kline scalar kinds require `interval` to be
/// passed via [`load_bar_aligned`] directly (they carry no interval in the key).
pub async fn load_for_key(
    hub: &Arc<ExchangeHub>,
    key: &SeriesKey,
    interval: &KlineInterval,
    start_ms: i64,
    end_ms: i64,
) -> Result<BarAlignedSeries> {
    let iv = match &key.kind {
        Kind::Kline(iv) | Kind::MarkPriceKline(iv) | Kind::IndexPriceKline(iv) | Kind::PremiumIndexKline(iv) => iv.clone(),
        _ => interval.clone(),
    };
    load_bar_aligned(hub, key.exchange, key.account_type, &key.symbol, &key.kind, &iv, start_ms, end_ms).await
}

// ── Multi-scalar bar-aligned loader ─────────────────────────────────────────

/// One bar's worth of a multi-lane non-OHLCV stream, aligned to the OHLCV grid.
/// Each lane carries one named scalar from an enriched wire payload. Missing /
/// wire-absent values use `f64::NAN` so callers can distinguish "not reported
/// by the exchange" from a genuine `0.0`.
#[derive(Debug, Clone)]
pub struct MultiScalarBar {
    /// Bar open time (ms) — aligned to the interval grid, matches the kline key.
    pub bar_open_time: i64,
    /// Named lanes. Keys are short identifiers matching the source field names.
    /// Missing wire-absent observations use `f64::NAN`.
    pub lanes: BTreeMap<&'static str, f64>,
    /// `true` if this bar was forward-filled (no fresh observation).
    pub filled: bool,
}

/// Multi-lane bar-aligned historical series. All bars carry the same ordered
/// set of lane names declared in `lanes` (the schema).
#[derive(Debug, Clone)]
pub struct MultiScalarSeries {
    /// Lane names (schema), stable across all bars.
    pub lanes: Vec<&'static str>,
    /// Bars in ascending `bar_open_time` order.
    pub bars: Vec<MultiScalarBar>,
}

impl MultiScalarSeries {
    /// Number of bars.
    pub fn len(&self) -> usize { self.bars.len() }
    /// True when no bars are present.
    pub fn is_empty(&self) -> bool { self.bars.is_empty() }
}

/// Resample a multi-lane source onto the `[start, end)` bar grid.
///
/// `src` is a time-ordered slice where each element is `(ts_ms, lane_map)`.
/// Each lane follows the given `policy` independently. ForwardFill: carry the
/// last known value; leading bars with no prior value emit `NAN`. ZeroFlow: sum
/// observations per bar; gap bars emit `0.0`.
fn resample_multi(
    mut src: Vec<(i64, BTreeMap<&'static str, f64>)>,
    lanes: &[&'static str],
    start: i64,
    end: i64,
    step: i64,
    policy: FillPolicy,
) -> Vec<MultiScalarBar> {
    src.sort_unstable_by_key(|(ts, _)| *ts);
    let first_bar = start.div_euclid(step) * step;
    let mut out = Vec::new();

    match policy {
        FillPolicy::ForwardFill => {
            // Per-lane last-known value.
            let mut last: BTreeMap<&'static str, f64> = BTreeMap::new();
            let mut idx = 0usize;
            let mut t = first_bar;
            while t < end {
                let bar_close = t + step;
                let mut fresh = false;
                while idx < src.len() && src[idx].0 < bar_close {
                    for lane in lanes {
                        if let Some(&v) = src[idx].1.get(lane) {
                            last.insert(lane, v);
                        }
                    }
                    if src[idx].0 >= t { fresh = true; }
                    idx += 1;
                }
                // Emit only if at least one lane has a value to carry.
                if !last.is_empty() {
                    let mut bar_lanes: BTreeMap<&'static str, f64> = BTreeMap::new();
                    for lane in lanes {
                        bar_lanes.insert(lane, *last.get(lane).unwrap_or(&f64::NAN));
                    }
                    out.push(MultiScalarBar { bar_open_time: t, lanes: bar_lanes, filled: !fresh });
                }
                t += step;
            }
        }
        FillPolicy::ZeroFlow => {
            let mut idx = 0usize;
            let mut t = first_bar;
            while t < end {
                let bar_close = t + step;
                let mut sums: BTreeMap<&'static str, f64> = lanes.iter().map(|&l| (l, 0.0)).collect();
                while idx < src.len() && src[idx].0 < bar_close {
                    if src[idx].0 >= t {
                        for lane in lanes {
                            if let Some(&v) = src[idx].1.get(lane) {
                                if !v.is_nan() {
                                    *sums.entry(lane).or_insert(0.0) += v;
                                }
                            }
                        }
                    }
                    idx += 1;
                }
                out.push(MultiScalarBar { bar_open_time: t, lanes: sums, filled: false });
                t += step;
            }
        }
    }
    out
}

/// Multi-scalar bar-aligned historical series. Returns a [`MultiScalarSeries`]
/// where each bar carries multiple named lanes from the enriched wire struct.
///
/// Supported kinds and their lanes:
///
/// | Kind | Lanes | Fill |
/// |---|---|---|
/// | FundingRate | rate, interest_8h, index_price, premium, realized_rate, estimated_rate, accrued_funding, funding_step, funding_interval_hours | ForwardFill |
/// | MarkPrice | mark, index, estimated_settle, funding_rate, interest_rate, indicative_index, deriv_price | ForwardFill |
/// | OpenInterest | open_interest, open_interest_value, oi_ccy, oi_usd, sum_oi | ForwardFill |
/// | LongShortRatio | ratio, long_pct, short_pct | ForwardFill |
/// | Basis | basis, futures_price, index_price | ForwardFill |
/// | Ticker | last_price, bid, ask, bid_qty, ask_qty, volume, quote_volume, high_24h, low_24h, open_24h, weighted_avg, last_qty, count | ForwardFill |
/// | IndexPrice | price, high_24h, low_24h, open_24h | ForwardFill |
/// | Liquidation | total_value, count, long_value, short_value | ZeroFlow |
///
/// `symbol` must be exchange-native. `interval` is the bar grid width.
pub async fn load_bar_aligned_multi(
    hub: &Arc<ExchangeHub>,
    exchange: ExchangeId,
    account: AccountType,
    symbol: &str,
    kind: &Kind,
    interval: &KlineInterval,
    start_ms: i64,
    end_ms: i64,
) -> Result<MultiScalarSeries> {
    let rest = hub
        .rest(exchange)
        .ok_or_else(|| StationError::Core(format!("{exchange:?} not connected in hub")))?;

    let step = interval_millis(interval.as_str())
        .ok_or_else(|| StationError::Core(format!("interval {interval} has no fixed ms width")))?;

    match kind {
        Kind::FundingRate => {
            const LANES: &[&str] = &[
                "rate", "interest_8h", "index_price", "premium",
                "realized_rate", "estimated_rate", "accrued_funding",
                "funding_step", "funding_interval_hours",
            ];
            let items = rest
                .get_funding_rate_history(SymbolInput::Raw(symbol), Some(start_ms), Some(end_ms), Some(1000), account)
                .await
                .map_err(|e| StationError::Core(format!("funding history failed: {e}")))?;
            let src: Vec<(i64, BTreeMap<&'static str, f64>)> = items.into_iter().map(|f| {
                let mut m = BTreeMap::new();
                m.insert("rate", f.rate);
                m.insert("interest_8h", f.interest_8h.unwrap_or(f64::NAN));
                m.insert("index_price", f.index_price.unwrap_or(f64::NAN));
                m.insert("premium", f.premium.unwrap_or(f64::NAN));
                m.insert("realized_rate", f.realized_rate.unwrap_or(f64::NAN));
                m.insert("estimated_rate", f.estimated_rate.unwrap_or(f64::NAN));
                m.insert("accrued_funding", f.accrued_funding.unwrap_or(f64::NAN));
                m.insert("funding_step", f.funding_step.unwrap_or(0) as f64);
                m.insert("funding_interval_hours", f.funding_interval_hours.unwrap_or(f64::NAN));
                (f.timestamp, m)
            }).collect();
            let bars = resample_multi(src, LANES, start_ms, end_ms, step, FillPolicy::ForwardFill);
            Ok(MultiScalarSeries { lanes: LANES.to_vec(), bars })
        }

        Kind::MarkPrice => {
            const LANES: &[&str] = &[
                "mark", "index", "estimated_settle", "funding_rate",
                "interest_rate", "indicative_index", "deriv_price",
            ];
            let items = rest
                .get_premium_index(Some(SymbolInput::Raw(symbol)), account)
                .await
                .map_err(|e| StationError::Core(format!("mark price failed: {e}")))?;
            let src: Vec<(i64, BTreeMap<&'static str, f64>)> = items.into_iter().map(|mp| {
                let mut m = BTreeMap::new();
                m.insert("mark", mp.mark_price);
                m.insert("index", mp.index_price.unwrap_or(f64::NAN));
                m.insert("estimated_settle", mp.estimated_settle_price.unwrap_or(f64::NAN));
                m.insert("funding_rate", mp.funding_rate.unwrap_or(f64::NAN));
                m.insert("interest_rate", mp.interest_rate.unwrap_or(f64::NAN));
                m.insert("indicative_index", mp.indicative_settle_price.unwrap_or(f64::NAN));
                m.insert("deriv_price", mp.deriv_price.unwrap_or(f64::NAN));
                (mp.timestamp, m)
            }).collect();
            let bars = resample_multi(src, LANES, start_ms, end_ms, step, FillPolicy::ForwardFill);
            Ok(MultiScalarSeries { lanes: LANES.to_vec(), bars })
        }

        Kind::OpenInterest => {
            const LANES: &[&str] = &[
                "open_interest", "open_interest_value", "oi_ccy", "oi_usd", "sum_oi",
            ];
            let items = rest
                .get_open_interest_history(SymbolInput::Raw(symbol), interval.as_str(), Some(start_ms), Some(end_ms), Some(500), account)
                .await
                .map_err(|e| StationError::Core(format!("open interest history failed: {e}")))?;
            let src: Vec<(i64, BTreeMap<&'static str, f64>)> = items.into_iter().map(|oi| {
                let mut m = BTreeMap::new();
                m.insert("open_interest", oi.open_interest);
                m.insert("open_interest_value", oi.open_interest_value.unwrap_or(f64::NAN));
                m.insert("oi_ccy", oi.open_interest_ccy.unwrap_or(f64::NAN));
                m.insert("oi_usd", oi.open_interest_usd.unwrap_or(f64::NAN));
                m.insert("sum_oi", oi.sum_open_interest.unwrap_or(f64::NAN));
                (oi.timestamp, m)
            }).collect();
            let bars = resample_multi(src, LANES, start_ms, end_ms, step, FillPolicy::ForwardFill);
            Ok(MultiScalarSeries { lanes: LANES.to_vec(), bars })
        }

        Kind::LongShortRatio => {
            const LANES: &[&str] = &["ratio", "long_pct", "short_pct"];
            let items = rest
                .get_long_short_ratio_history(SymbolInput::Raw(symbol), interval.as_str(), Some(start_ms), Some(end_ms), Some(500), account)
                .await
                .map_err(|e| StationError::Core(format!("long/short ratio history failed: {e}")))?;
            let src: Vec<(i64, BTreeMap<&'static str, f64>)> = items.into_iter().map(|r| {
                let combined = r.ratio.unwrap_or_else(|| {
                    if r.short_ratio > 0.0 { r.long_ratio / r.short_ratio } else { r.long_ratio }
                });
                let mut m = BTreeMap::new();
                m.insert("ratio", combined);
                m.insert("long_pct", r.long_ratio);
                m.insert("short_pct", r.short_ratio);
                (r.timestamp, m)
            }).collect();
            let bars = resample_multi(src, LANES, start_ms, end_ms, step, FillPolicy::ForwardFill);
            Ok(MultiScalarSeries { lanes: LANES.to_vec(), bars })
        }

        Kind::Basis => {
            const LANES: &[&str] = &["basis", "futures_price", "index_price"];
            let items = rest
                .get_basis_history(SymbolInput::Raw(symbol), interval.as_str(), Some(start_ms), Some(end_ms), Some(500), account)
                .await
                .map_err(|e| StationError::Core(format!("basis history failed: {e}")))?;
            let src: Vec<(i64, BTreeMap<&'static str, f64>)> = items.into_iter().map(|b| {
                let mut m = BTreeMap::new();
                m.insert("basis", b.basis);
                m.insert("futures_price", b.futures_price.unwrap_or(f64::NAN));
                m.insert("index_price", b.index_price.unwrap_or(f64::NAN));
                (b.timestamp, m)
            }).collect();
            let bars = resample_multi(src, LANES, start_ms, end_ms, step, FillPolicy::ForwardFill);
            Ok(MultiScalarSeries { lanes: LANES.to_vec(), bars })
        }

        Kind::Ticker => {
            const LANES: &[&str] = &[
                "last_price", "bid", "ask", "bid_qty", "ask_qty",
                "volume", "quote_volume", "high_24h", "low_24h", "open_24h",
                "weighted_avg", "last_qty", "count",
            ];
            let ticker = rest
                .get_ticker(SymbolInput::Raw(symbol), account)
                .await
                .map_err(|e| StationError::Core(format!("ticker failed: {e}")))?;
            // Ticker is a single snapshot — wrap in vec for resample.
            let mut m = BTreeMap::new();
            m.insert("last_price", ticker.last_price);
            m.insert("bid", ticker.bid_price.unwrap_or(f64::NAN));
            m.insert("ask", ticker.ask_price.unwrap_or(f64::NAN));
            m.insert("bid_qty", ticker.bid_qty.unwrap_or(f64::NAN));
            m.insert("ask_qty", ticker.ask_qty.unwrap_or(f64::NAN));
            m.insert("volume", ticker.volume_24h.unwrap_or(f64::NAN));
            m.insert("quote_volume", ticker.quote_volume_24h.unwrap_or(f64::NAN));
            m.insert("high_24h", ticker.high_24h.unwrap_or(f64::NAN));
            m.insert("low_24h", ticker.low_24h.unwrap_or(f64::NAN));
            m.insert("open_24h", ticker.open_price.unwrap_or(f64::NAN));
            m.insert("weighted_avg", ticker.weighted_avg_price.unwrap_or(f64::NAN));
            m.insert("last_qty", f64::NAN); // not in Ticker — wire-absent
            m.insert("count", ticker.count.map(|c| c as f64).unwrap_or(f64::NAN));
            let src = vec![(ticker.timestamp, m)];
            let bars = resample_multi(src, LANES, start_ms, end_ms, step, FillPolicy::ForwardFill);
            Ok(MultiScalarSeries { lanes: LANES.to_vec(), bars })
        }

        Kind::IndexPrice => {
            const LANES: &[&str] = &["price", "high_24h", "low_24h", "open_24h"];
            // Use index price klines for the price lane; OKX 24h stats from
            // the index snapshot are not historically available per-bar via a
            // single REST call, so those lanes carry NAN outside the snapshot ts.
            let sym = symbol.to_string();
            let ivs = interval.as_str().to_string();
            let rest2 = rest.clone();
            let bars_raw = paginate_klines(start_ms, end_ms, |cursor| {
                let rest2 = rest2.clone();
                let sym = sym.clone();
                let ivs = ivs.clone();
                async move {
                    rest2.get_index_price_klines(SymbolInput::Raw(&sym), &ivs, Some(KLINE_PAGE as u32), account, Some(cursor))
                        .await
                        .map(|ks| ks.iter().map(BarPoint::from_kline).collect())
                        .map_err(|e| StationError::Core(format!("index klines failed: {e}")))
                }
            }).await?;
            let src: Vec<(i64, BTreeMap<&'static str, f64>)> = bars_raw.into_iter().map(|b| {
                let mut m = BTreeMap::new();
                m.insert("price", b.close);
                m.insert("high_24h", f64::NAN);
                m.insert("low_24h", f64::NAN);
                m.insert("open_24h", f64::NAN);
                (b.open_time, m)
            }).collect();
            let bars = resample_multi(src, LANES, start_ms, end_ms, step, FillPolicy::ForwardFill);
            Ok(MultiScalarSeries { lanes: LANES.to_vec(), bars })
        }

        Kind::Liquidation => {
            const LANES: &[&str] = &["total_value", "count", "long_value", "short_value"];
            let items = rest
                .get_liquidation_history(Some(SymbolInput::Raw(symbol)), Some(start_ms), Some(end_ms), Some(1000), account)
                .await
                .map_err(|e| StationError::Core(format!("liquidation history failed: {e}")))?;
            let src: Vec<(i64, BTreeMap<&'static str, f64>)> = items.into_iter().map(|liq| {
                let value = liq.value.unwrap_or_else(|| liq.price * liq.quantity);
                let is_long_liq = matches!(liq.side, digdigdig3::core::types::TradeSide::Buy);
                let mut m = BTreeMap::new();
                m.insert("total_value", value);
                m.insert("count", 1.0);
                m.insert("long_value", if is_long_liq { value } else { 0.0 });
                m.insert("short_value", if !is_long_liq { value } else { 0.0 });
                (liq.timestamp, m)
            }).collect();
            let bars = resample_multi(src, LANES, start_ms, end_ms, step, FillPolicy::ZeroFlow);
            Ok(MultiScalarSeries { lanes: LANES.to_vec(), bars })
        }

        other => Err(StationError::StreamNotSupported(format!(
            "load_bar_aligned_multi does not support {other:?}"
        ))),
    }
}

#[cfg(test)]
mod tests {
    use super::*;

    #[test]
    fn interval_parsing() {
        assert_eq!(interval_millis("1m"), Some(60_000));
        assert_eq!(interval_millis("5m"), Some(300_000));
        assert_eq!(interval_millis("1h"), Some(3_600_000));
        assert_eq!(interval_millis("4h"), Some(14_400_000));
        assert_eq!(interval_millis("1d"), Some(86_400_000));
        assert_eq!(interval_millis("1w"), Some(604_800_000));
        assert_eq!(interval_millis("1M"), None);
        assert_eq!(interval_millis("xx"), None);
    }

    #[test]
    fn forward_fill_carries_into_empty_bars() {
        // step 60s. Observations at t=0 (v=10) and t=130s (v=20).
        let step = 60_000;
        let src = vec![(0, 10.0), (130_000, 20.0)];
        let out = resample(src, 0, 240_000, step, FillPolicy::ForwardFill);
        // bars: 0,60k,120k,180k
        assert_eq!(out.len(), 4);
        assert_eq!(out[0], ScalarBar { bar_open_time: 0, value: 10.0, filled: false });
        // bar 60k: no fresh obs → carry 10.0, filled
        assert_eq!(out[1], ScalarBar { bar_open_time: 60_000, value: 10.0, filled: true });
        // bar 120k: obs at 130k is inside [120k,180k) → fresh 20.0
        assert_eq!(out[2], ScalarBar { bar_open_time: 120_000, value: 20.0, filled: false });
        // bar 180k: carry 20.0
        assert_eq!(out[3], ScalarBar { bar_open_time: 180_000, value: 20.0, filled: true });
    }

    #[test]
    fn forward_fill_omits_leading_gap() {
        let step = 60_000;
        // First observation only at 150s — bars 0 and 60k have nothing to carry.
        let src = vec![(150_000, 5.0)];
        let out = resample(src, 0, 240_000, step, FillPolicy::ForwardFill);
        assert_eq!(out.len(), 2); // only 120k and 180k
        assert_eq!(out[0].bar_open_time, 120_000);
        assert_eq!(out[0].value, 5.0);
        assert!(!out[0].filled);
        assert_eq!(out[1], ScalarBar { bar_open_time: 180_000, value: 5.0, filled: true });
    }

    #[test]
    fn zero_flow_buckets_and_zeros_gaps() {
        let step = 60_000;
        // Two events in bar 0, none in bar 60k, one in bar 120k.
        let src = vec![(1_000, 3.0), (50_000, 4.0), (125_000, 9.0)];
        let out = resample(src, 0, 180_000, step, FillPolicy::ZeroFlow);
        assert_eq!(out.len(), 3);
        assert_eq!(out[0], ScalarBar { bar_open_time: 0, value: 7.0, filled: false });
        assert_eq!(out[1], ScalarBar { bar_open_time: 60_000, value: 0.0, filled: false });
        assert_eq!(out[2], ScalarBar { bar_open_time: 120_000, value: 9.0, filled: false });
    }

    #[test]
    fn bar_align_points_flow_from_recorded() {
        use crate::data::LiquidationPoint;
        // Recorded liquidations: two in bar 0, none in bar 60k, one in bar 120k.
        let pts = vec![
            LiquidationPoint { ts_ms: 1_000, price: 100.0, quantity: 1.0, value: 5_000.0, side: 0 },
            LiquidationPoint { ts_ms: 40_000, price: 100.0, quantity: 1.0, value: 3_000.0, side: 1 },
            LiquidationPoint { ts_ms: 125_000, price: 100.0, quantity: 1.0, value: 9_000.0, side: 0 },
        ];
        let out = bar_align_points(
            &pts, |p| p.value, 0, 180_000, &KlineInterval::new("1m"), FillPolicy::ZeroFlow,
        ).unwrap();
        assert_eq!(out.len(), 3);
        assert_eq!(out[0], ScalarBar { bar_open_time: 0, value: 8_000.0, filled: false });
        assert_eq!(out[1], ScalarBar { bar_open_time: 60_000, value: 0.0, filled: false });
        assert_eq!(out[2], ScalarBar { bar_open_time: 120_000, value: 9_000.0, filled: false });
    }

    #[test]
    fn grid_aligns_to_interval_boundary() {
        let step = 60_000;
        // start mid-bar → grid still snaps to boundary below start.
        let src = vec![(70_000, 1.0)];
        let out = resample(src, 35_000, 130_000, step, FillPolicy::ForwardFill);
        // first_bar = floor(35000/60000)*60000 = 0
        assert_eq!(out[0].bar_open_time, 60_000); // bar 0 had no obs (omitted); 60k has obs at 70k
        assert_eq!(out[0].value, 1.0);
    }

    // -----------------------------------------------------------------------
    // resample_multi unit tests (Task B)
    // -----------------------------------------------------------------------

    fn make_multi_src(entries: Vec<(i64, &[(&'static str, f64)])>) -> Vec<(i64, BTreeMap<&'static str, f64>)> {
        entries.into_iter().map(|(ts, pairs)| {
            let m: BTreeMap<&'static str, f64> = pairs.iter().copied().collect();
            (ts, m)
        }).collect()
    }

    #[test]
    fn resample_multi_forward_fill_two_lanes() {
        let step = 60_000;
        // Lane "a" observed at t=0 (v=1.0). Lane "b" at t=130k (v=2.0).
        let src = make_multi_src(vec![
            (0, &[("a", 1.0)]),
            (130_000, &[("b", 2.0)]),
        ]);
        const LANES: &[&str] = &["a", "b"];
        let out = resample_multi(src, LANES, 0, 240_000, step, FillPolicy::ForwardFill);
        // 4 bars: 0, 60k, 120k, 180k
        // bar 0: a=1.0 fresh; b=NAN (no prior)
        assert_eq!(out[0].bar_open_time, 0);
        assert_eq!(out[0].lanes["a"], 1.0);
        assert!(out[0].lanes["b"].is_nan());
        assert!(!out[0].filled);

        // bar 60k: carry a=1.0, b still NAN → filled
        assert_eq!(out[1].bar_open_time, 60_000);
        assert_eq!(out[1].lanes["a"], 1.0);
        assert!(out[1].lanes["b"].is_nan());
        assert!(out[1].filled);

        // bar 120k: obs at 130k → b=2.0 fresh, a=1.0 carried
        assert_eq!(out[2].bar_open_time, 120_000);
        assert_eq!(out[2].lanes["a"], 1.0);
        assert_eq!(out[2].lanes["b"], 2.0);
        assert!(!out[2].filled, "b is fresh at 130k");

        // bar 180k: carry both
        assert_eq!(out[3].bar_open_time, 180_000);
        assert!(out[3].filled);
    }

    #[test]
    fn resample_multi_zero_flow_two_lanes() {
        let step = 60_000;
        // Two events in bar 0, none in bar 60k, one in bar 120k.
        let src = make_multi_src(vec![
            (1_000,   &[("total_value", 5_000.0), ("count", 1.0)]),
            (50_000,  &[("total_value", 3_000.0), ("count", 1.0)]),
            (125_000, &[("total_value", 9_000.0), ("count", 1.0)]),
        ]);
        const LANES: &[&str] = &["total_value", "count"];
        let out = resample_multi(src, LANES, 0, 180_000, step, FillPolicy::ZeroFlow);
        assert_eq!(out.len(), 3);
        assert_eq!(out[0].lanes["total_value"], 8_000.0, "sum of bar-0 events");
        assert_eq!(out[0].lanes["count"], 2.0);
        assert_eq!(out[1].lanes["total_value"], 0.0, "gap bar = 0");
        assert_eq!(out[1].lanes["count"], 0.0);
        assert_eq!(out[2].lanes["total_value"], 9_000.0);
    }
}