onnx-genai-engine 0.1.0-dev.2

Text generation engine combining ONNX Runtime, scheduling, and KV caching
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
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
//! KV model metadata, paged-cache mirroring, and rewind helpers.

use crate::config::SessionId;
use crate::decode::{DecodeState, is_kv_input, is_present_output, matching_past_input};
use crate::logits::TokenId;
use crate::session::{DraftModel, DraftSession, EngineSession};
use anyhow::Context;
use onnx_genai_kv::{
    KvCacheOps, KvDType, KvLayerPayload, KvPayload, KvPayloadDtype, LayerKv, LayerTensorConfig,
    PageId, PageTensorConfig, PagedKvCache,
};
use onnx_genai_ort::{DataType, Session, TensorInfo, Value};
use std::collections::HashMap;

#[derive(Debug, Clone)]
pub(crate) struct KvModelInfo {
    /// Representative (layer-0) geometry. Authoritative for `num_layers`,
    /// `page_size` and `dtype`; the `num_kv_heads`/`head_dim` fields mirror
    /// layer 0 and are only valid to read directly for uniform models. Use
    /// [`KvModelInfo::layer_configs`] / [`KvModelInfo::layer_tensor_config`] for
    /// per-layer geometry.
    pub(crate) tensor_config: PageTensorConfig,
    /// Per-layer KV geometry, indexed identically to [`KvModelInfo::layers`].
    /// Length equals the number of exported KV layers (post kv-sharing).
    pub(crate) layer_configs: Vec<LayerTensorConfig>,
    pub(crate) layers: Vec<KvLayerIo>,
}

impl KvModelInfo {
    /// The tensor config for a single exported KV layer, carrying that layer's
    /// own `num_kv_heads`/`head_dim` while inheriting the shared `num_layers`,
    /// `page_size` and `dtype`.
    pub(crate) fn layer_tensor_config(&self, layer: usize) -> PageTensorConfig {
        let geom = self.layer_configs[layer];
        PageTensorConfig {
            num_layers: self.tensor_config.num_layers,
            num_kv_heads: geom.num_kv_heads,
            head_dim: geom.head_dim,
            page_size: self.tensor_config.page_size,
            dtype: self.tensor_config.dtype,
        }
    }
}

#[derive(Debug, Clone)]
pub(crate) struct KvLayerIo {
    pub(crate) key_present: String,
    pub(crate) value_present: String,
    pub(crate) key_past: String,
    pub(crate) value_past: String,
}

pub(crate) fn infer_kv_model_info(
    session: &Session,
    page_size: usize,
    dtype: KvDType,
) -> anyhow::Result<Option<KvModelInfo>> {
    let mut key_outputs = Vec::new();
    let mut value_outputs = Vec::new();
    for info in session
        .outputs()
        .iter()
        .filter(|info| is_present_output(&info.name))
    {
        let lower = info.name.to_ascii_lowercase();
        if lower.contains("key") {
            key_outputs.push(info.clone());
        } else if lower.contains("value") {
            value_outputs.push(info.clone());
        }
    }

    if key_outputs.is_empty() && value_outputs.is_empty() {
        return Ok(None);
    }
    key_outputs.sort_by_key(|info| kv_layer_index(&info.name).unwrap_or(usize::MAX));
    value_outputs.sort_by_key(|info| kv_layer_index(&info.name).unwrap_or(usize::MAX));
    if key_outputs.len() != value_outputs.len() {
        anyhow::bail!(
            "model exposes mismatched present key/value outputs: {} keys, {} values",
            key_outputs.len(),
            value_outputs.len()
        );
    }

    let layer_configs = layer_configs_from_key_outputs(&key_outputs)?;
    // Representative geometry (layer 0). The paged cache is built from the full
    // per-layer `layer_configs` below; `tensor_config` remains a single-value
    // view for uniform-only consumers (connector payloads, num_layers/dtype).
    let config = PageTensorConfig {
        num_layers: key_outputs.len(),
        num_kv_heads: layer_configs[0].num_kv_heads,
        head_dim: layer_configs[0].head_dim,
        page_size,
        dtype,
    };
    let kv_inputs = session
        .inputs()
        .iter()
        .filter(|info| is_kv_input(&info.name))
        .map(|info| info.name.clone())
        .collect::<Vec<_>>();
    let mut layers = Vec::with_capacity(key_outputs.len());
    for (key, value) in key_outputs.iter().zip(value_outputs.iter()) {
        if !is_supported_kv_dtype(key.dtype) || !is_supported_kv_dtype(value.dtype) {
            anyhow::bail!("KV present outputs must be Float32, Float16, or BFloat16");
        }
        let key_past = matching_past_input(&key.name, &kv_inputs)
            .with_context(|| format!("missing past input for present output '{}'", key.name))?
            .clone();
        let value_past = matching_past_input(&value.name, &kv_inputs)
            .with_context(|| format!("missing past input for present output '{}'", value.name))?
            .clone();
        layers.push(KvLayerIo {
            key_present: key.name.clone(),
            value_present: value.name.clone(),
            key_past,
            value_past,
        });
    }

    Ok(Some(KvModelInfo {
        tensor_config: config,
        layer_configs,
        layers,
    }))
}

/// Build the per-layer KV geometry from each exported present-KV output shape.
///
/// The returned vector has one [`LayerTensorConfig`] per exported KV layer, in
/// the same order as `key_outputs` (sorted by layer index). Because a model
/// exports only `num_hidden_layers - num_kv_shared_layers` KV entries — the last
/// `num_kv_shared_layers` layers reuse an earlier layer's K/V — this vector's
/// length equals the number of *exported* KV entries, and metadata
/// `shared_kv.target_layers` indices map directly onto these positions (post
/// kv-sharing). Different layers may declare different head_dim (e.g. Gemma-4
/// sliding=256 vs full=512); geometry is read structurally from the ONNX I/O
/// shapes, never from model names.
pub(crate) fn layer_configs_from_key_outputs(
    key_outputs: &[TensorInfo],
) -> anyhow::Result<Vec<LayerTensorConfig>> {
    key_outputs
        .iter()
        .map(|info| {
            let (num_kv_heads, head_dim) = infer_kv_heads_and_head_dim(info)?;
            Ok(LayerTensorConfig::new(num_kv_heads, head_dim))
        })
        .collect()
}

pub(crate) fn infer_kv_heads_and_head_dim(info: &TensorInfo) -> anyhow::Result<(usize, usize)> {
    if !is_supported_kv_dtype(info.dtype) || info.shape.len() < 3 {
        anyhow::bail!(
            "present KV output '{}' must be Float32, Float16, or BFloat16 rank >= 3, got {:?} {:?}",
            info.name,
            info.dtype,
            info.shape
        );
    }
    let head_dim = *info
        .shape
        .last()
        .filter(|dim| **dim > 0)
        .with_context(|| format!("cannot infer KV head_dim from '{}'", info.name))?
        as usize;
    let num_kv_heads = info
        .shape
        .iter()
        .enumerate()
        .find_map(|(idx, &dim)| {
            (idx != 0 && idx + 1 != info.shape.len() && dim > 0).then_some(dim as usize)
        })
        .with_context(|| format!("cannot infer KV heads from '{}'", info.name))?;
    Ok((num_kv_heads, head_dim))
}

/// KV present/past tensor element types the runtime can consume.
///
/// The host paged-mirror path widens 16-bit float values to fp32 page storage.
/// Shared buffers keep their native dtype and never round-trip through the host
/// cache.
fn is_supported_kv_dtype(dtype: DataType) -> bool {
    matches!(
        dtype,
        DataType::Float32 | DataType::Float16 | DataType::BFloat16
    )
}

pub(crate) fn mirror_present_kv_to_pages(
    session: &Session,
    kv_model: &KvModelInfo,
    kv_cache: &mut PagedKvCache,
    seq: SessionId,
    outputs: &[Value],
    past_len: usize,
    input_len: usize,
) -> anyhow::Result<()> {
    let output_lookup = session
        .output_names()
        .iter()
        .enumerate()
        .map(|(idx, name)| (name.as_str(), idx))
        .collect::<HashMap<_, _>>();
    let layer_data = kv_model
        .layers
        .iter()
        .map(|layer| {
            let key = outputs[*output_lookup
                .get(layer.key_present.as_str())
                .with_context(|| format!("missing output '{}'", layer.key_present))?]
            .to_vec_f32_lossy()?;
            let key_shape = outputs[*output_lookup
                .get(layer.key_present.as_str())
                .with_context(|| format!("missing output '{}'", layer.key_present))?]
            .shape()
            .to_vec();
            let value = outputs[*output_lookup
                .get(layer.value_present.as_str())
                .with_context(|| format!("missing output '{}'", layer.value_present))?]
            .to_vec_f32_lossy()?;
            let value_shape = outputs[*output_lookup
                .get(layer.value_present.as_str())
                .with_context(|| format!("missing output '{}'", layer.value_present))?]
            .shape()
            .to_vec();
            Ok((key, key_shape, value, value_shape))
        })
        .collect::<anyhow::Result<Vec<_>>>()?;

    for offset in 0..input_len {
        let token_pos = past_len + offset;
        let owned_layers = layer_data
            .iter()
            .enumerate()
            .map(|(layer_idx, (key, key_shape, value, value_shape))| {
                let layer_config = kv_model.layer_tensor_config(layer_idx);
                Ok((
                    extract_present_token(key, key_shape, layer_config, token_pos)?,
                    extract_present_token(value, value_shape, layer_config, token_pos)?,
                ))
            })
            .collect::<anyhow::Result<Vec<(Vec<f32>, Vec<f32>)>>>()?;
        let borrowed = owned_layers
            .iter()
            .map(|(key, value)| LayerKv {
                key: key.as_slice(),
                value: value.as_slice(),
            })
            .collect::<Vec<_>>();
        kv_cache
            .append_token_kv(seq, &borrowed)
            .map_err(|e| anyhow::anyhow!("Failed to mirror present KV into pages: {}", e))?;
    }
    Ok(())
}

pub(crate) fn extract_present_token(
    data: &[f32],
    shape: &[i64],
    config: PageTensorConfig,
    token_pos: usize,
) -> anyhow::Result<Vec<f32>> {
    let axes = kv_tensor_axes(shape, config, token_pos)?;
    let strides = row_major_strides(shape);
    let mut token = Vec::with_capacity(config.num_kv_heads * config.head_dim);
    for head in 0..config.num_kv_heads {
        for dim in 0..config.head_dim {
            let mut indices = vec![0_usize; shape.len()];
            indices[axes.head] = head;
            indices[axes.sequence] = token_pos;
            indices[axes.head_dim] = dim;
            let flat = indices
                .iter()
                .zip(strides.iter())
                .map(|(idx, stride)| idx * stride)
                .sum::<usize>();
            token.push(
                *data
                    .get(flat)
                    .context("present KV tensor index out of bounds")?,
            );
        }
    }
    Ok(token)
}

pub(crate) fn load_materialized_past(
    session: &Session,
    kv_model: &KvModelInfo,
    decode_state: &mut DecodeState,
    materialized: &onnx_genai_kv::MaterializedKv,
) -> anyhow::Result<()> {
    if materialized.start_position != 0 || materialized.sink_len != 0 {
        anyhow::bail!(
            "cannot load paged KV starting at absolute position {} (sink_len {}) into a contiguous past/present graph; discontinuous attention-sink positions require explicit position_ids support",
            materialized.start_position,
            materialized.sink_len
        );
    }
    let input_shapes = session
        .inputs()
        .iter()
        .map(|info| (info.name.as_str(), info.shape.as_slice()))
        .collect::<HashMap<_, _>>();
    let input_dtypes = session
        .inputs()
        .iter()
        .map(|info| (info.name.as_str(), info.dtype))
        .collect::<HashMap<_, _>>();
    decode_state.past.clear();
    for (idx, layer) in kv_model.layers.iter().enumerate() {
        let key_shape = past_shape(
            input_shapes
                .get(layer.key_past.as_str())
                .copied()
                .context("missing key past input shape")?,
            materialized.sequence_len,
        )?;
        let value_shape = past_shape(
            input_shapes
                .get(layer.value_past.as_str())
                .copied()
                .context("missing value past input shape")?,
            materialized.sequence_len,
        )?;
        // Paged storage holds KV widened to f32; narrow back to the graph's
        // declared past-input dtype (e.g. fp16 GQA exports) so the injected KV
        // matches the model contract. For an fp16 model this is the exact
        // inverse of the fp16->f32 widening done when mirroring present KV.
        let key_dtype = input_dtypes
            .get(layer.key_past.as_str())
            .copied()
            .context("missing key past input dtype")?;
        let value_dtype = input_dtypes
            .get(layer.value_past.as_str())
            .copied()
            .context("missing value past input dtype")?;
        decode_state.past.insert(
            layer.key_past.clone(),
            Value::from_f32_slice_as(&materialized.layers[idx].key, &key_shape, key_dtype)?,
        );
        decode_state.past.insert(
            layer.value_past.clone(),
            Value::from_f32_slice_as(&materialized.layers[idx].value, &value_shape, value_dtype)?,
        );
    }
    Ok(())
}

pub(crate) fn past_shape(shape: &[i64], sequence_len: usize) -> anyhow::Result<Vec<i64>> {
    if shape.len() < 3 {
        anyhow::bail!("KV past shape rank must be >= 3, got {:?}", shape);
    }
    let seq_axis = shape.len() - 2;
    Ok(shape
        .iter()
        .enumerate()
        .map(|(axis, &dim)| {
            if axis == 0 {
                1
            } else if axis == seq_axis {
                sequence_len as i64
            } else {
                dim
            }
        })
        .collect())
}

pub(crate) fn attach_pages_to_sequence(
    kv_cache: &mut PagedKvCache,
    seq: SessionId,
    page_ids: &[PageId],
    len: usize,
) -> anyhow::Result<()> {
    if !kv_cache
        .page_table
        .get_sequence(seq)
        .context("sequence not found")?
        .is_empty()
    {
        anyhow::bail!("cannot attach prefix pages to a non-empty sequence");
    }
    for &page_id in page_ids {
        kv_cache.page_table.push_page(seq, page_id);
    }
    kv_cache.page_table.set_sequence_len(seq, len);
    Ok(())
}

pub(crate) fn rewind_target_state_to_len(
    session: &Session,
    kv_model: Option<&KvModelInfo>,
    kv_cache: &mut PagedKvCache,
    seq: SessionId,
    state: &mut EngineSession,
    len: usize,
) -> anyhow::Result<()> {
    state.tokens.truncate(len);
    rewind_decode_state_to_len(
        session,
        kv_model,
        kv_cache,
        seq,
        &mut state.decode_state,
        &mut state.kv_token_count,
        len,
    )
}

pub(crate) fn trim_overmaterialized_target_kv(
    session: &Session,
    kv_model: Option<&KvModelInfo>,
    kv_cache: &mut PagedKvCache,
    seq: SessionId,
    state: &mut EngineSession,
) -> anyhow::Result<()> {
    if state.kv_token_count > state.tokens.len() {
        rewind_target_state_to_len(session, kv_model, kv_cache, seq, state, state.tokens.len())?;
    }
    Ok(())
}

pub(crate) fn rewind_draft_state_to_len(
    draft_model: &mut DraftModel,
    state: &mut DraftSession,
    len: usize,
) -> anyhow::Result<()> {
    state.tokens.truncate(len);
    rewind_decode_state_to_len(
        &draft_model.session,
        draft_model.kv_model.as_ref(),
        &mut draft_model.kv_cache,
        state.seq,
        &mut state.decode_state,
        &mut state.kv_token_count,
        len,
    )
}

pub(crate) fn common_prefix_len(left: &[TokenId], right: &[TokenId]) -> usize {
    left.iter()
        .zip(right.iter())
        .take_while(|(left, right)| left == right)
        .count()
}

pub(crate) fn rewind_decode_state_to_len(
    session: &Session,
    kv_model: Option<&KvModelInfo>,
    kv_cache: &mut PagedKvCache,
    seq: SessionId,
    decode_state: &mut DecodeState,
    kv_token_count: &mut usize,
    len: usize,
) -> anyhow::Result<()> {
    if !decode_state.use_kv {
        *kv_token_count = 0;
        return Ok(());
    }
    if *kv_token_count == len {
        return Ok(());
    }
    if decode_state.has_runner() {
        kv_cache
            .rewind_to(seq, len)
            .map_err(|e| anyhow::anyhow!("Failed to rewind KV sequence {seq} to {len}: {}", e))?;
        decode_state.rewind_runner(len)?;
        *kv_token_count = len;
        return Ok(());
    }
    if decode_state.is_windowed() {
        decode_state.rewind_windowed(*kv_token_count, len)?;
        kv_cache
            .rewind_to(seq, len)
            .map_err(|e| anyhow::anyhow!("Failed to rewind KV sequence {seq} to {len}: {}", e))?;
        *kv_token_count = len;
        return Ok(());
    }
    if kv_model.is_none() && *kv_token_count != len {
        anyhow::bail!("cannot rewind ORT KV tensors without paged KV materialization");
    }
    kv_cache
        .rewind_to(seq, len)
        .map_err(|e| anyhow::anyhow!("Failed to rewind KV sequence {seq} to {len}: {}", e))?;
    *kv_token_count = len;
    if len == 0 {
        decode_state.past.clear();
        return Ok(());
    }
    let kv_model = kv_model.context("missing KV model after rewind check")?;
    let materialized = kv_cache
        .materialize_sequence(seq)
        .map_err(|e| anyhow::anyhow!("Failed to materialize rewound KV sequence {seq}: {}", e))?;
    load_materialized_past(session, kv_model, decode_state, &materialized)
}

pub(crate) fn sequence_pages_for_len(
    kv_cache: &PagedKvCache,
    seq: SessionId,
    len: usize,
) -> anyhow::Result<Vec<PageId>> {
    let pages_needed = len.div_ceil(kv_cache.page_table.page_size);
    Ok(kv_cache
        .page_table
        .get_sequence(seq)
        .with_context(|| format!("sequence {seq} not found"))?
        .iter()
        .copied()
        .take(pages_needed)
        .collect())
}

struct KvTensorAxes {
    head: usize,
    sequence: usize,
    head_dim: usize,
}

fn kv_tensor_axes(
    shape: &[i64],
    config: PageTensorConfig,
    token_pos: usize,
) -> anyhow::Result<KvTensorAxes> {
    let head_dim = shape
        .iter()
        .rposition(|&dim| dim == config.head_dim as i64)
        .context("KV tensor head_dim axis not found")?;
    let head = shape
        .iter()
        .enumerate()
        .find_map(|(idx, &dim)| {
            (idx != head_dim && dim == config.num_kv_heads as i64).then_some(idx)
        })
        .context("KV tensor head axis not found")?;
    let sequence = shape
        .iter()
        .enumerate()
        .find_map(|(idx, &dim)| {
            (idx != head && idx != head_dim && dim as usize > token_pos).then_some(idx)
        })
        .context("KV tensor sequence axis not found")?;
    Ok(KvTensorAxes {
        head,
        sequence,
        head_dim,
    })
}

pub(crate) fn row_major_strides(shape: &[i64]) -> Vec<usize> {
    let mut strides = vec![1; shape.len()];
    for idx in (0..shape.len().saturating_sub(1)).rev() {
        strides[idx] = strides[idx + 1] * shape[idx + 1] as usize;
    }
    strides
}

pub(crate) fn kv_layer_index(name: &str) -> Option<usize> {
    name.split(|ch: char| !ch.is_ascii_digit())
        .find(|part| !part.is_empty())
        .and_then(|part| part.parse().ok())
}

// ---------------------------------------------------------------------------
// Connector KV payload <-> runner-KV conversion (DESIGN §38, K4)
// ---------------------------------------------------------------------------

/// One layer's exported past K/V as owned host floats plus their ORT shapes.
///
/// Produced from a `PastPresent` runner's [`crate::decode::DecodeState::export_runner_kv`]
/// so a chunk's token range can be sliced out into a portable [`KvPayload`].
pub(crate) struct ExportedLayerKv {
    pub(crate) key: Vec<f32>,
    pub(crate) key_shape: Vec<i64>,
    pub(crate) value: Vec<f32>,
    pub(crate) value_shape: Vec<i64>,
}

/// Collect exported runner KV into per-layer host buffers in `kv_model` layer
/// order, ready for chunk slicing via [`chunk_payload_from_exported`].
pub(crate) fn exported_layers_from_runner(
    kv_model: &KvModelInfo,
    exported: &[(String, onnx_genai_ort::Value)],
) -> anyhow::Result<Vec<ExportedLayerKv>> {
    let by_name = exported
        .iter()
        .map(|(name, value)| (name.as_str(), value))
        .collect::<HashMap<_, _>>();
    kv_model
        .layers
        .iter()
        .map(|layer| {
            let key_v = *by_name
                .get(layer.key_past.as_str())
                .with_context(|| format!("exported KV missing '{}'", layer.key_past))?;
            let value_v = *by_name
                .get(layer.value_past.as_str())
                .with_context(|| format!("exported KV missing '{}'", layer.value_past))?;
            Ok(ExportedLayerKv {
                key: key_v.to_vec_f32_lossy()?,
                key_shape: key_v.shape().to_vec(),
                value: value_v.to_vec_f32_lossy()?,
                value_shape: value_v.shape().to_vec(),
            })
        })
        .collect()
}

/// Slice the token range `[chunk_start, chunk_start + num_tokens)` out of the
/// exported per-layer KV into a portable [`KvPayload`].
///
/// The payload uses the head-major `[num_kv_heads, num_tokens, head_dim]` layout
/// documented on [`KvPayload`], read via the same [`extract_present_token`] axis
/// handling used to mirror present KV, so it matches the engine's KV contract
/// for arbitrary tensor axis orders.
pub(crate) fn chunk_payload_from_exported(
    layers: &[ExportedLayerKv],
    config: PageTensorConfig,
    chunk_start: usize,
    num_tokens: usize,
) -> anyhow::Result<KvPayload> {
    let num_kv_heads = config.num_kv_heads;
    let head_dim = config.head_dim;
    let per_layer = num_kv_heads * num_tokens * head_dim;
    let mut payload_layers = Vec::with_capacity(layers.len());
    for layer in layers {
        let mut key = vec![0.0_f32; per_layer];
        let mut value = vec![0.0_f32; per_layer];
        for t in 0..num_tokens {
            let abs = chunk_start + t;
            let key_tok = extract_present_token(&layer.key, &layer.key_shape, config, abs)?;
            let value_tok = extract_present_token(&layer.value, &layer.value_shape, config, abs)?;
            for head in 0..num_kv_heads {
                for dim in 0..head_dim {
                    let dst = (head * num_tokens + t) * head_dim + dim;
                    let src = head * head_dim + dim;
                    key[dst] = key_tok[src];
                    value[dst] = value_tok[src];
                }
            }
        }
        payload_layers.push(KvLayerPayload { key, value });
    }
    Ok(KvPayload {
        num_tokens,
        num_layers: layers.len(),
        num_kv_heads,
        head_dim,
        dtype: KvPayloadDtype::F32,
        layers: payload_layers,
    })
}

/// A fetched chunk's payload positioned at a token offset relative to the start
/// of the contiguous fetched region (`relative_start == 0` for the first chunk).
pub(crate) struct PlacedPayload<'a> {
    pub(crate) relative_start: usize,
    pub(crate) payload: &'a KvPayload,
}

/// Assemble contiguous fetched chunk payloads into full-length
/// `(past_key_values.* name, Value)` past tensors covering `[0, total_len)`,
/// ready for [`crate::decode::DecodeState::import_runner_kv`].
///
/// Each per-layer tensor is built in `[num_kv_heads, total_len, head_dim]`
/// head-major order and shaped with [`past_shape`], matching the past-tensor
/// contract [`load_materialized_past`] uses, so the injected KV is consumed by
/// the model exactly as if it had been recomputed.
pub(crate) fn past_kv_from_payloads(
    session: &Session,
    kv_model: &KvModelInfo,
    placed: &[PlacedPayload<'_>],
    total_len: usize,
) -> anyhow::Result<Vec<(String, Value)>> {
    let config = kv_model.tensor_config;
    let num_kv_heads = config.num_kv_heads;
    let head_dim = config.head_dim;
    let input_shapes = session
        .inputs()
        .iter()
        .map(|info| (info.name.as_str(), info.shape.as_slice()))
        .collect::<HashMap<_, _>>();

    let mut out = Vec::with_capacity(kv_model.layers.len() * 2);
    for (idx, layer) in kv_model.layers.iter().enumerate() {
        let key_shape = past_shape(
            input_shapes
                .get(layer.key_past.as_str())
                .copied()
                .context("missing key past input shape")?,
            total_len,
        )?;
        let value_shape = past_shape(
            input_shapes
                .get(layer.value_past.as_str())
                .copied()
                .context("missing value past input shape")?,
            total_len,
        )?;
        let full = num_kv_heads * total_len * head_dim;
        let mut key = vec![0.0_f32; full];
        let mut value = vec![0.0_f32; full];
        for placed in placed {
            let layer_payload = placed
                .payload
                .layers
                .get(idx)
                .context("fetched payload missing a layer")?;
            let num_tokens = placed.payload.num_tokens;
            for head in 0..num_kv_heads {
                for t in 0..num_tokens {
                    for dim in 0..head_dim {
                        let dst =
                            (head * total_len + placed.relative_start + t) * head_dim + dim;
                        let src = (head * num_tokens + t) * head_dim + dim;
                        key[dst] = layer_payload.key[src];
                        value[dst] = layer_payload.value[src];
                    }
                }
            }
        }
        out.push((layer.key_past.clone(), Value::from_vec_f32(key, &key_shape)?));
        out.push((
            layer.value_past.clone(),
            Value::from_vec_f32(value, &value_shape)?,
        ));
    }
    Ok(out)
}

/// Whether `kv_model`'s past KV inputs are plain f32 in the ORT graph — the
/// only dtype the connector payload round-trips today. Non-f32 KV (fp16/fp8/
/// int8) is skipped so a dtype mismatch can never corrupt injected output. The
/// check uses the model's actual past-input dtype (not the coarser
/// [`KvDType`], which folds fp16 into `F32`).
pub(crate) fn kv_model_past_is_f32(session: &Session, kv_model: &KvModelInfo) -> bool {
    let Some(layer) = kv_model.layers.first() else {
        return false;
    };
    session
        .inputs()
        .iter()
        .find(|info| info.name == layer.key_past)
        .map(|info| info.dtype == DataType::Float32)
        .unwrap_or(false)
}

#[cfg(test)]
mod tests {
    use super::*;
    use crate::decode::{
        ModelDecodePath, detect_model_decode_path, run_decode_session_logits, run_decode_step,
    };
    use onnx_genai_kv::{KvCacheOps, MaterializedLayerKv};
    use onnx_genai_ort::{Environment, SessionOptions};
    use std::path::{Path, PathBuf};
    use std::sync::{Mutex, MutexGuard, OnceLock};

    fn model_test_lock() -> MutexGuard<'static, ()> {
        static LOCK: OnceLock<Mutex<()>> = OnceLock::new();
        LOCK.get_or_init(|| Mutex::new(()))
            .lock()
            .unwrap_or_else(|poisoned| poisoned.into_inner())
    }

    fn fixture(name: &str) -> PathBuf {
        Path::new(env!("CARGO_MANIFEST_DIR"))
            .join("../../tests/fixtures")
            .join(name)
            .join("model.onnx")
    }

    fn load_session(name: &str) -> anyhow::Result<(Environment, Session)> {
        let environment = Environment::new("kv-bridge-tests")?;
        let session = Session::new(
            &environment,
            &fixture(name),
            SessionOptions::default().with_intra_op_threads(1),
        )?;
        Ok((environment, session))
    }

    fn tensor_config() -> PageTensorConfig {
        PageTensorConfig {
            num_layers: 1,
            num_kv_heads: 2,
            head_dim: 2,
            page_size: 2,
            dtype: KvDType::F32,
        }
    }

    fn append_token(cache: &mut PagedKvCache, seq: SessionId, base: f32) {
        let key = [base, base + 1.0, base + 2.0, base + 3.0];
        let value = [base + 10.0, base + 11.0, base + 12.0, base + 13.0];
        cache
            .append_token_kv(
                seq,
                &[LayerKv {
                    key: &key,
                    value: &value,
                }],
            )
            .unwrap();
    }

    fn infers_past_present_model_and_rejects_static_cache_as_kv_bridge_model() -> anyhow::Result<()>
    {
        let _guard = model_test_lock();
        let (_environment, session) = load_session("tiny-llm")?;
        let info = infer_kv_model_info(&session, 4, KvDType::F32)?.expect("past/present KV model");
        assert_eq!(
            info.tensor_config,
            PageTensorConfig {
                num_layers: 1,
                num_kv_heads: 2,
                head_dim: 8,
                page_size: 4,
                dtype: KvDType::F32,
            }
        );
        assert_eq!(info.layers[0].key_present, "present.0.key");
        assert_eq!(info.layers[0].value_present, "present.0.value");
        assert_eq!(info.layers[0].key_past, "past_key_values.0.key");
        assert_eq!(info.layers[0].value_past, "past_key_values.0.value");
        // Per-layer geometry for a uniform model is a single-entry vector equal
        // to the representative config's num_kv_heads/head_dim.
        assert_eq!(
            info.layer_configs,
            vec![onnx_genai_kv::LayerTensorConfig::new(2, 8)]
        );

        let (_environment, static_session) = load_session("tiny-llm-scatter")?;
        assert!(infer_kv_model_info(&static_session, 4, KvDType::F32)?.is_none());
        Ok(())
    }

    /// Per-layer geometry construction for a heterogeneous model, plus the
    /// `num_kv_shared_layers` fold. A model with `num_hidden_layers = 4` and
    /// `num_kv_shared_layers = 1` exports only `4 - 1 = 3` KV entries; the last
    /// full-attention layer here uses a larger head_dim (16) than the sliding
    /// layers (8), mirroring Gemma-4 E2B's 256/512 split at tiny scale.
    ///
    /// The resulting `layer_configs` therefore has exactly 3 entries (one per
    /// exported KV output), and metadata `shared_kv.target_layers` indices map
    /// directly onto these positions — index 2 selects the full layer's (3, 16)
    /// geometry, never the sliding layers' (2, 8). An off-by-one in this mapping
    /// would silently read the wrong layer's geometry.
    #[test]
    fn layer_configs_are_built_per_exported_kv_layer_with_shared_layer_fold() {
        // 3 EXPORTED present-key outputs = num_hidden_layers(4) - num_kv_shared_layers(1).
        let key_outputs = vec![
            TensorInfo {
                name: "present.0.key".into(),
                dtype: DataType::Float32,
                shape: vec![-1, 2, -1, 8], // sliding: num_kv_heads=2, head_dim=8
            },
            TensorInfo {
                name: "present.1.key".into(),
                dtype: DataType::Float32,
                shape: vec![-1, 2, -1, 8], // sliding: num_kv_heads=2, head_dim=8
            },
            TensorInfo {
                name: "present.2.key".into(),
                dtype: DataType::Float16,
                shape: vec![-1, 3, -1, 16], // full: num_kv_heads=3, head_dim=16
            },
        ];

        let configs = layer_configs_from_key_outputs(&key_outputs).unwrap();
        assert_eq!(
            configs,
            vec![
                onnx_genai_kv::LayerTensorConfig::new(2, 8),
                onnx_genai_kv::LayerTensorConfig::new(2, 8),
                onnx_genai_kv::LayerTensorConfig::new(3, 16),
            ],
            "one LayerTensorConfig per EXPORTED KV layer, with per-layer head_dim"
        );
        // Exported-entry count equals the folded layer count, not num_hidden_layers.
        assert_eq!(configs.len(), 3);

        // shared_kv.target_layers index the EXPORTED entries directly: the
        // full-attention group's last target layer (2) must pick (3, 16).
        let full_group_target: usize = *[0usize, 1, 2].last().unwrap();
        assert_eq!(configs[full_group_target].num_kv_heads, 3);
        assert_eq!(configs[full_group_target].head_dim, 16);
        // A sliding group targeting layer 0 must pick (2, 8), not the full geometry.
        assert_eq!(configs[0].head_dim, 8);
    }

    #[test]
    fn validates_kv_metadata_and_shape_helpers() {
        let valid = TensorInfo {
            name: "present.7.key".into(),
            dtype: DataType::Float32,
            shape: vec![-1, 2, -1, 8],
        };
        assert_eq!(infer_kv_heads_and_head_dim(&valid).unwrap(), (2, 8));
        assert_eq!(kv_layer_index(&valid.name), Some(7));
        assert_eq!(kv_layer_index("present.key"), None);
        assert_eq!(past_shape(&[-1, 2, -1, 8], 3).unwrap(), [1, 2, 3, 8]);
        assert_eq!(row_major_strides(&[1, 2, 3, 4]), [24, 12, 4, 1]);

        // fp16 present KV is accepted for on-device / share-buffer decode runners.
        let fp16 = TensorInfo {
            dtype: DataType::Float16,
            ..valid.clone()
        };
        assert_eq!(infer_kv_heads_and_head_dim(&fp16).unwrap(), (2, 8));

        let wrong_dtype = TensorInfo {
            dtype: DataType::Int64,
            ..valid.clone()
        };
        assert!(
            infer_kv_heads_and_head_dim(&wrong_dtype)
                .unwrap_err()
                .to_string()
                .contains("must be Float32, Float16, or BFloat16 rank >= 3")
        );
        let unknown_head_dim = TensorInfo {
            shape: vec![-1, 2, -1, -1],
            ..valid
        };
        assert!(
            infer_kv_heads_and_head_dim(&unknown_head_dim)
                .unwrap_err()
                .to_string()
                .contains("cannot infer KV head_dim")
        );
        assert!(past_shape(&[1, 2], 3).is_err());
    }

    #[test]
    fn extracts_tokens_from_present_tensor_and_reports_bad_layouts() {
        let config = PageTensorConfig {
            num_layers: 1,
            num_kv_heads: 2,
            head_dim: 2,
            page_size: 2,
            dtype: KvDType::F32,
        };
        let data = (0..12).map(|value| value as f32).collect::<Vec<_>>();
        assert_eq!(
            extract_present_token(&data, &[1, 2, 3, 2], config, 1).unwrap(),
            [2.0, 3.0, 8.0, 9.0]
        );
        assert!(
            extract_present_token(&data, &[1, 2, 3, 4], config, 1)
                .unwrap_err()
                .to_string()
                .contains("head axis not found")
        );
        assert!(
            extract_present_token(&data[..4], &[1, 2, 3, 2], config, 2)
                .unwrap_err()
                .to_string()
                .contains("index out of bounds")
        );
    }

    fn mirrors_present_append_range_into_paged_cache() -> anyhow::Result<()> {
        let _guard = model_test_lock();
        let (_environment, session) = load_session("tiny-llm")?;
        let model = infer_kv_model_info(&session, 2, KvDType::F32)?.unwrap();
        let mut cache = PagedKvCache::new_with_tensor_config(model.tensor_config, 4);
        let seq = cache.create_sequence();

        let logits = Value::from_vec_f32(vec![0.0; 2 * 32], &[1, 2, 32])?;
        let key = (0..64).map(|value| value as f32).collect::<Vec<_>>();
        let value = (100..164).map(|value| value as f32).collect::<Vec<_>>();
        let outputs = vec![
            logits,
            Value::from_vec_f32(key, &[1, 2, 4, 8])?,
            Value::from_vec_f32(value, &[1, 2, 4, 8])?,
        ];

        mirror_present_kv_to_pages(&session, &model, &mut cache, seq, &outputs, 1, 2)?;
        let materialized = cache.materialize_sequence(seq)?;
        assert_eq!(materialized.sequence_len, 2);
        assert_eq!(
            materialized.layers[0].key,
            [
                8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 19.0, 20.0, 21.0,
                22.0, 23.0, 40.0, 41.0, 42.0, 43.0, 44.0, 45.0, 46.0, 47.0, 48.0, 49.0, 50.0, 51.0,
                52.0, 53.0, 54.0, 55.0,
            ]
        );
        assert_eq!(
            &materialized.layers[0].value[..8],
            &[108.0, 109.0, 110.0, 111.0, 112.0, 113.0, 114.0, 115.0]
        );

        let missing_seq =
            mirror_present_kv_to_pages(&session, &model, &mut cache, 999, &outputs, 1, 1)
                .unwrap_err();
        assert!(
            missing_seq
                .to_string()
                .contains("Failed to mirror present KV")
        );
        Ok(())
    }

    fn materializes_past_values_in_model_input_layout() -> anyhow::Result<()> {
        let _guard = model_test_lock();
        let (_environment, session) = load_session("tiny-llm")?;
        let model = infer_kv_model_info(&session, 2, KvDType::F32)?.unwrap();
        let materialized = onnx_genai_kv::MaterializedKv {
            start_position: 0,
            sink_len: 0,
            sequence_len: 2,
            layers: vec![MaterializedLayerKv {
                key: (0..32).map(|value| value as f32).collect(),
                value: (100..132).map(|value| value as f32).collect(),
                num_kv_heads: 2,
                head_dim: 8,
            }],
        };
        let mut state = DecodeState::new(&session)?;
        state
            .past
            .insert("stale".into(), Value::from_vec_f32(vec![0.0], &[1])?);

        load_materialized_past(&session, &model, &mut state, &materialized)?;

        assert!(!state.past.contains_key("stale"));
        let key = &state.past["past_key_values.0.key"];
        assert_eq!(key.shape(), &[1, 2, 2, 8]);
        assert_eq!(key.to_vec_f32()?, materialized.layers[0].key);
        assert_eq!(
            state.past["past_key_values.0.value"].to_vec_f32()?,
            materialized.layers[0].value
        );
        Ok(())
    }

    #[test]
    fn attaches_prefix_pages_and_selects_only_pages_needed_for_length() -> anyhow::Result<()> {
        let mut cache = PagedKvCache::new_with_tensor_config(tensor_config(), 8);
        let source = cache.create_sequence();
        for base in [0.0, 10.0, 20.0] {
            append_token(&mut cache, source, base);
        }
        let source_pages = sequence_pages_for_len(&cache, source, 3)?;
        assert_eq!(source_pages.len(), 2);
        assert_eq!(sequence_pages_for_len(&cache, source, 1)?.len(), 1);

        let target = cache.create_sequence();
        attach_pages_to_sequence(&mut cache, target, &source_pages, 3)?;
        assert_eq!(
            cache.materialize_sequence(target)?,
            cache.materialize_sequence(source)?
        );
        assert!(
            attach_pages_to_sequence(&mut cache, target, &source_pages, 3)
                .unwrap_err()
                .to_string()
                .contains("non-empty sequence")
        );
        assert!(attach_pages_to_sequence(&mut cache, 999, &source_pages, 3).is_err());
        assert!(sequence_pages_for_len(&cache, 999, 1).is_err());
        Ok(())
    }

    fn rewinds_materialized_ort_past_and_handles_edge_branches() -> anyhow::Result<()> {
        let _guard = model_test_lock();
        let (_environment, session) = load_session("tiny-llm")?;
        let model = infer_kv_model_info(&session, 2, KvDType::F32)?.unwrap();
        let mut cache = PagedKvCache::new_with_tensor_config(model.tensor_config, 8);
        let seq = cache.create_sequence();
        for base in [0.0, 10.0, 20.0] {
            let key = vec![base; 16];
            let value = vec![base + 1.0; 16];
            cache.append_token_kv(
                seq,
                &[LayerKv {
                    key: &key,
                    value: &value,
                }],
            )?;
        }
        let mut decode_state = DecodeState::new(&session)?;
        let mut count = 3;

        rewind_decode_state_to_len(
            &session,
            Some(&model),
            &mut cache,
            seq,
            &mut decode_state,
            &mut count,
            2,
        )?;
        assert_eq!(count, 2);
        assert_eq!(
            decode_state.past["past_key_values.0.key"].shape(),
            &[1, 2, 2, 8]
        );

        rewind_decode_state_to_len(
            &session,
            Some(&model),
            &mut cache,
            seq,
            &mut decode_state,
            &mut count,
            0,
        )?;
        assert_eq!(count, 0);
        assert!(decode_state.past.is_empty());

        count = 1;
        let error = rewind_decode_state_to_len(
            &session,
            None,
            &mut cache,
            seq,
            &mut decode_state,
            &mut count,
            0,
        )
        .unwrap_err();
        assert!(
            error
                .to_string()
                .contains("without paged KV materialization")
        );

        decode_state.use_kv = false;
        rewind_decode_state_to_len(
            &session,
            None,
            &mut cache,
            seq,
            &mut decode_state,
            &mut count,
            5,
        )?;
        assert_eq!(count, 0);
        Ok(())
    }

    fn rewinds_static_and_past_present_decode_runners() -> anyhow::Result<()> {
        let _guard = model_test_lock();
        for (fixture_name, path) in [
            (
                "tiny-llm-scatter",
                ModelDecodePath::StaticCache { max_len: 16 },
            ),
            (
                "tiny-llm",
                ModelDecodePath::PastPresent {
                    shared_buffer: false,
                    max_len: None,
                    sliding_window: None,
                    sink_tokens: None,
                },
            ),
        ] {
            let (_environment, session) = load_session(fixture_name)?;
            let mut state = DecodeState::new_for_path(&session, &path)?;
            let mut cache = PagedKvCache::new(2, 8);
            let seq = cache.create_sequence();
            run_decode_session_logits(&mut state, &[2, 4, 3], 0)?;
            cache.append(seq, 3)?;
            let mut count = 3;

            rewind_decode_state_to_len(&session, None, &mut cache, seq, &mut state, &mut count, 1)?;

            assert_eq!(count, 1);
            assert_eq!(state.runner_len(), 1);
            assert_eq!(cache.len(seq)?, 1);
        }
        Ok(())
    }

    #[test]
    fn windowed_past_present_keeps_absolute_positions_with_bounded_past() -> anyhow::Result<()> {
        let _guard = model_test_lock();
        let (_environment, session) = load_session("tiny-llm")?;
        let path = detect_model_decode_path(&session, None, None, Some(2), 0)?;
        assert!(matches!(
            path,
            ModelDecodePath::PastPresent {
                shared_buffer: false,
                max_len: None,
                sliding_window: Some(2),
                sink_tokens: None,
            }
        ));
        let mut state = DecodeState::new_for_path(&session, &path)?;

        run_decode_step(&session, &mut state, &[2, 4], 0)?;
        assert_eq!(state.retained_kv_len(2), 2);
        assert!(state.past.values().all(|value| value.shape()[2] == 2));

        run_decode_step(&session, &mut state, &[3], 2)?;
        assert_eq!(state.retained_kv_len(3), 2);
        assert!(state.past.values().all(|value| value.shape()[2] == 2));
        // A declared share-buffer KV dtype (shared_kv_max_len = Some) does not
        // override sliding-window attention: the model still takes the bounded
        // paged sliding-window path (shared_buffer: false), since the append-only
        // single shared buffer cannot express windowed eviction.
        assert!(matches!(
            detect_model_decode_path(&session, Some(16), Some(16), Some(2), 0)?,
            ModelDecodePath::PastPresent {
                shared_buffer: false,
                max_len: None,
                sliding_window: Some(2),
                sink_tokens: None,
            }
        ));
        Ok(())
    }

    #[test]
    fn windowed_past_present_pins_attention_sink_rows() -> anyhow::Result<()> {
        let _guard = model_test_lock();
        let (_environment, session) = load_session("tiny-llm")?;
        // window=2, sink=1 (StreamingLLM): retained buffer = 1 sink row + up to 2
        // window rows once the context exceeds sink + window.
        let path = ModelDecodePath::PastPresent {
            shared_buffer: false,
            max_len: None,
            sliding_window: Some(2),
            sink_tokens: Some(1),
        };
        let mut state = DecodeState::new_for_path(&session, &path)?;
        assert_eq!(state.sink_tokens(), 1);

        // present_len=2, window covers the whole buffer (window_start=0 <= sink).
        run_decode_step(&session, &mut state, &[2, 4], 0)?;
        assert_eq!(state.retained_kv_len(2), 2);
        assert!(state.past.values().all(|value| value.shape()[2] == 2));

        // present_len=3, window_start=1 == sink: still keep everything.
        run_decode_step(&session, &mut state, &[3], 2)?;
        assert_eq!(state.retained_kv_len(3), 3);
        assert!(state.past.values().all(|value| value.shape()[2] == 3));

        // present_len=4, window_start=2 > sink=1: pin sink row + trailing window.
        run_decode_step(&session, &mut state, &[5], 3)?;
        assert_eq!(state.retained_kv_len(4), 3);
        assert!(state.past.values().all(|value| value.shape()[2] == 3));
        Ok(())
    }

    fn rewinds_target_state_and_trims_overmaterialized_kv() -> anyhow::Result<()> {
        let _guard = model_test_lock();
        let (_environment, session) = load_session("tiny-llm-scatter")?;
        let mut cache = PagedKvCache::new(2, 8);
        let seq = cache.create_sequence();
        cache.append(seq, 4)?;
        let mut state = EngineSession {
            tokens: vec![2, 4, 3],
            kv_token_count: 4,
            decode_state: DecodeState::new(&session)?,
            draft: None,
        };

        trim_overmaterialized_target_kv(&session, None, &mut cache, seq, &mut state)?;
        assert_eq!(state.kv_token_count, 0);
        assert_eq!(cache.len(seq)?, 4);

        state.decode_state.use_kv = true;
        state.kv_token_count = 4;
        rewind_target_state_to_len(&session, None, &mut cache, seq, &mut state, 4)?;
        assert_eq!(state.tokens, [2, 4, 3]);
        assert_eq!(state.kv_token_count, 4);
        assert_eq!(common_prefix_len(&[1, 2, 3], &[1, 2, 4, 5]), 2);
        Ok(())
    }

    #[test]
    fn model_backed_bridge_paths_are_deterministic() -> anyhow::Result<()> {
        infers_past_present_model_and_rejects_static_cache_as_kv_bridge_model()?;
        mirrors_present_append_range_into_paged_cache()?;
        materializes_past_values_in_model_input_layout()?;
        rewinds_materialized_ort_past_and_handles_edge_branches()?;
        rewinds_static_and_past_present_decode_runners()?;
        rewinds_target_state_and_trims_overmaterialized_kv()
    }

    /// Build a minimal TensorInfo set that looks like a past/present KV model and
    /// verify that `infer_kv_model_info` propagates the requested storage dtype
    /// directly into `PageTensorConfig.dtype` without any special-casing.
    ///
    /// These tests use the real tiny-llm fixture so that `Session::inputs/outputs`
    /// are fully populated; the dtype under test is a storage-layer knob that does
    /// not touch the model I/O schema.
    fn infer_kv_model_info_propagates_dtype_to_page_tensor_config(
        dtype: KvDType,
    ) -> anyhow::Result<()> {
        let _guard = model_test_lock();
        let (_environment, session) = load_session("tiny-llm")?;
        let info = infer_kv_model_info(&session, 4, dtype)?
            .expect("tiny-llm exposes past/present KV outputs");
        assert_eq!(
            info.tensor_config.dtype,
            dtype,
            "PageTensorConfig.dtype must equal the requested storage dtype"
        );
        Ok(())
    }

    #[test]
    fn configured_dtype_f32_flows_into_page_tensor_config() -> anyhow::Result<()> {
        infer_kv_model_info_propagates_dtype_to_page_tensor_config(KvDType::F32)
    }

    #[test]
    fn configured_dtype_fp8_e4m3fn_flows_into_page_tensor_config() -> anyhow::Result<()> {
        infer_kv_model_info_propagates_dtype_to_page_tensor_config(KvDType::Fp8E4M3Fn)
    }

    #[test]
    fn configured_dtype_fp8_e5m2_flows_into_page_tensor_config() -> anyhow::Result<()> {
        infer_kv_model_info_propagates_dtype_to_page_tensor_config(KvDType::Fp8E5M2)
    }

    #[test]
    fn configured_dtype_int8_flows_into_page_tensor_config() -> anyhow::Result<()> {
        infer_kv_model_info_propagates_dtype_to_page_tensor_config(KvDType::Int8)
    }

    /// K4 multi-layer coverage: directly exercise [`chunk_payload_from_exported`]
    /// with **3 synthetic exported layers** (2 kv_heads, 4 head_dim, 8-token total
    /// exported window, chunk covering positions 3-6) and verify that every
    /// (layer, K/V slot, head, chunk-relative token, dim) cell is byte-identical
    /// to the input after extraction.
    ///
    /// Choosing `chunk_start = 3` ensures `token_pos ≥ 3` on every step, which
    /// prevents the benign batch-vs-sequence axis ambiguity in [`kv_tensor_axes`]
    /// for `token_pos == 0` and exercises the full code path cleanly.
    ///
    /// Pattern:
    ///   `key[l][h][t][d]  = 1000·l + 100·h + 10·t + d`  (absolute token `t`)
    ///   `val[l][h][t][d]  = -(1000·l + 100·h + 10·t + d)`
    ///
    /// Any layer swap, K/V swap, or [head, token, dim] transposition produces a
    /// value that differs from the expected → the mismatch is always detectable.
    #[test]
    fn chunk_payload_from_exported_multilayer_preserves_layer_head_token_dim_ordering() {
        const NUM_LAYERS: usize = 3;
        const NUM_KV_HEADS: usize = 2;
        const TOTAL_SEQ: usize = 8;
        const HEAD_DIM: usize = 4;
        const CHUNK_START: usize = 3;
        const NUM_TOKENS: usize = 4; // covers absolute positions 3,4,5,6

        let config = PageTensorConfig {
            num_layers: NUM_LAYERS,
            num_kv_heads: NUM_KV_HEADS,
            head_dim: HEAD_DIM,
            page_size: NUM_TOKENS,
            dtype: KvDType::F32,
        };

        // Shape [1, NUM_KV_HEADS, TOTAL_SEQ, HEAD_DIM] — standard past-KV form.
        let shape = vec![1_i64, NUM_KV_HEADS as i64, TOTAL_SEQ as i64, HEAD_DIM as i64];
        let exported: Vec<ExportedLayerKv> = (0..NUM_LAYERS)
            .map(|l| {
                // flat index: h*TOTAL_SEQ*HEAD_DIM + t*HEAD_DIM + d  (batch=0 → 0 offset)
                let size = NUM_KV_HEADS * TOTAL_SEQ * HEAD_DIM;
                let mut key = vec![0.0_f32; size];
                let mut value = vec![0.0_f32; size];
                for h in 0..NUM_KV_HEADS {
                    for t in 0..TOTAL_SEQ {
                        for d in 0..HEAD_DIM {
                            let flat = h * TOTAL_SEQ * HEAD_DIM + t * HEAD_DIM + d;
                            let sig = (1000 * l + 100 * h + 10 * t + d) as f32;
                            key[flat] = sig;
                            value[flat] = -sig;
                        }
                    }
                }
                ExportedLayerKv {
                    key,
                    key_shape: shape.clone(),
                    value,
                    value_shape: shape.clone(),
                }
            })
            .collect();

        let payload =
            chunk_payload_from_exported(&exported, config, CHUNK_START, NUM_TOKENS).unwrap();

        assert_eq!(payload.num_layers, NUM_LAYERS);
        assert_eq!(payload.num_kv_heads, NUM_KV_HEADS);
        assert_eq!(payload.num_tokens, NUM_TOKENS);
        assert_eq!(payload.head_dim, HEAD_DIM);
        assert!(payload.is_well_formed());

        for l in 0..NUM_LAYERS {
            for h in 0..NUM_KV_HEADS {
                for t in 0..NUM_TOKENS {
                    let abs_t = CHUNK_START + t; // absolute token index
                    for d in 0..HEAD_DIM {
                        let idx = (h * NUM_TOKENS + t) * HEAD_DIM + d;
                        let expected = (1000 * l + 100 * h + 10 * abs_t + d) as f32;
                        assert_eq!(
                            payload.layers[l].key[idx],
                            expected,
                            "layer={l} head={h} token={t}(abs={abs_t}) dim={d}: key mismatch \
                             (got {}, expected {expected})",
                            payload.layers[l].key[idx]
                        );
                        assert_eq!(
                            payload.layers[l].value[idx],
                            -expected,
                            "layer={l} head={h} token={t}(abs={abs_t}) dim={d}: value mismatch \
                             (got {}, expected {expected})",
                            payload.layers[l].value[idx]
                        );
                    }
                }
            }
        }
    }
}