hf2q 0.1.4

Pure Rust CLI for converting HuggingFace models to hardware-optimized formats and serving them over an OpenAI-compatible API on Apple Silicon
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
//! DeepSeek-V4 circular and compressed KV cache planning.

use mlx_native::{DType, MlxBuffer, MlxDevice, MlxError};
use thiserror::Error;

use super::cache_buffers::{
    allocate_buffer, allocate_optional, allocate_overwrite_buffer, buffer_plan,
    completed_group_step, compressor_state_plans, fill_state, optional_buffer_plan,
    validate_request, view_buffer,
};
use super::Deepseek4Config;

mod prefill;
pub use prefill::{CacheSpan, LayerCacheSpan};

#[derive(Clone, Debug, Eq, PartialEq)]
pub struct CacheBufferPlan {
    pub shape: Vec<usize>,
    pub dtype: DType,
    pub bytes: u64,
}

#[derive(Clone, Debug, Eq, PartialEq)]
pub struct LayerCachePlan {
    pub layer_index: usize,
    pub compress_ratio: u32,
    /// Physical BF16 allocation addressed as window rows followed by
    /// compressed rows. The two fields below are zero-copy views.
    pub attention_kv: CacheBufferPlan,
    pub window_kv: CacheBufferPlan,
    pub compressed_kv: Option<CacheBufferPlan>,
    pub indexer_kv: Option<CacheBufferPlan>,
    pub main_kv_state: Option<CacheBufferPlan>,
    pub main_score_state: Option<CacheBufferPlan>,
    pub indexer_kv_state: Option<CacheBufferPlan>,
    pub indexer_score_state: Option<CacheBufferPlan>,
    pub resident_bytes: u64,
}

#[derive(Clone, Debug, Eq, PartialEq)]
pub struct Deepseek4CachePlan {
    pub context_length: usize,
    pub layers: Vec<LayerCachePlan>,
    pub resident_bytes: u64,
}

/// Exact cache slots and visibility bounds for one autoregressive position.
#[derive(Clone, Debug, Eq, PartialEq)]
pub struct LayerCacheStep {
    pub layer_index: usize,
    pub window_write_slot: usize,
    pub window_start_position: usize,
    pub window_valid_after: usize,
    pub compressed_write_slot: Option<usize>,
    pub compressed_valid_after: usize,
    pub indexer_write_slot: Option<usize>,
    pub indexer_valid_after: usize,
}

#[derive(Clone, Debug, Eq, PartialEq)]
pub struct CacheStep {
    pub position: usize,
    pub layers: Vec<LayerCacheStep>,
}

#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub enum CacheKind {
    AttentionKv,
    WindowKv,
    CompressedKv,
    IndexerKv,
    MainKvState,
    MainScoreState,
    IndexerKvState,
    IndexerScoreState,
}

#[derive(Debug, Error)]
pub enum CacheError {
    #[error("DeepSeek-V4 cache context must be greater than zero")]
    EmptyContext,
    #[error("requested cache context {requested} exceeds model bound {maximum}")]
    ContextBound { requested: usize, maximum: usize },
    #[error("DeepSeek-V4 cache requires a 128-token circular window, got {actual}")]
    SlidingWindow { actual: u32 },
    #[error("compression schedule has {actual} layers, expected {expected}")]
    LayerCount { expected: usize, actual: usize },
    #[error("layer {layer} has unsupported compression ratio {ratio}")]
    CompressionRatio { layer: usize, ratio: u32 },
    #[error("cache byte accounting overflowed at layer {layer} {kind:?}")]
    ByteOverflow { layer: usize, kind: CacheKind },
    #[error("layer {layer} {kind:?} cache needs {bytes} bytes, beyond this host's address space")]
    AddressSpace {
        layer: usize,
        kind: CacheKind,
        bytes: u64,
    },
    #[error("failed to allocate layer {layer} {kind:?} cache: {source}")]
    Allocate {
        layer: usize,
        kind: CacheKind,
        #[source]
        source: MlxError,
    },
    #[error("failed to create layer {layer} {kind:?} cache view: {source}")]
    View {
        layer: usize,
        kind: CacheKind,
        #[source]
        source: MlxError,
    },
    #[error("failed to initialize layer {layer} {kind:?} cache state: {source}")]
    Initialize {
        layer: usize,
        kind: CacheKind,
        #[source]
        source: MlxError,
    },
    #[error("allocated cache byte accounting mismatch: planned {planned}, actual {actual}")]
    Accounting { planned: u64, actual: u64 },
    #[error("DeepSeek-V4 cache is full at context bound {maximum}")]
    ContextExhausted { maximum: usize },
    #[error("cache step committed out of order: expected position {expected}, got {actual}")]
    StepOutOfOrder { expected: usize, actual: usize },
    #[error("DeepSeek-V4 prefill requires at least one token")]
    EmptyPrefill,
    #[error("DeepSeek-V4 start-zero prefill requires an empty cache, currently at {position}")]
    PrefillNotEmpty { position: usize },
    #[error("DeepSeek-V4 cache is poisoned by a partial token; reset and replay the request")]
    Poisoned,
    #[error("DeepSeek-V4 cache snapshot does not match the live cache plan")]
    SnapshotPlanMismatch,
    #[error("DeepSeek-V4 cache snapshot layer count {actual} does not match {expected}")]
    SnapshotLayerCount { expected: usize, actual: usize },
    #[error("failed to copy layer {layer} {kind:?} cache snapshot: {source}")]
    SnapshotCopy {
        layer: usize,
        kind: CacheKind,
        #[source]
        source: MlxError,
    },
    #[error("layer {layer} {kind:?} cache snapshot shape or dtype does not match")]
    SnapshotBufferMismatch { layer: usize, kind: CacheKind },
    #[error(
        "DeepSeek-V4 cache growth requires a larger context: source {source_context}, target {target_context}"
    )]
    MigrationContext {
        source_context: usize,
        target_context: usize,
    },
    #[error(
        "DeepSeek-V4 cache growth layer count {target_layers} does not match source {source_layers}"
    )]
    MigrationLayerCount {
        source_layers: usize,
        target_layers: usize,
    },
    #[error("layer {layer} {kind:?} cache growth plan is not prefix-compatible")]
    MigrationPlanMismatch { layer: usize, kind: CacheKind },
    #[error("DeepSeek-V4 cache-growth snapshot does not match the source cache plan")]
    MigrationSnapshotPlanMismatch,
    #[error(
        "DeepSeek-V4 cache-growth snapshot position {snapshot_position} exceeds source position {source_position}"
    )]
    MigrationSnapshotPosition {
        snapshot_position: usize,
        source_position: usize,
    },
    #[error("failed to copy layer {layer} {kind:?} during cache growth: {source}")]
    MigrationCopy {
        layer: usize,
        kind: CacheKind,
        #[source]
        source: MlxError,
    },
    #[error("layer {layer} {kind:?} cache growth buffer shape or dtype does not match")]
    MigrationBufferMismatch { layer: usize, kind: CacheKind },
}

pub struct LayerCache {
    /// Owns the allocation shared by `window_kv` and `compressed_kv`.
    pub attention_kv: MlxBuffer,
    pub window_kv: MlxBuffer,
    pub compressed_kv: Option<MlxBuffer>,
    pub indexer_kv: Option<MlxBuffer>,
    pub main_kv_state: Option<MlxBuffer>,
    pub main_score_state: Option<MlxBuffer>,
    pub indexer_kv_state: Option<MlxBuffer>,
    pub indexer_score_state: Option<MlxBuffer>,
}

pub struct Deepseek4Cache {
    layers: Vec<LayerCache>,
    pub(super) plan: Deepseek4CachePlan,
    pub(super) next_position: usize,
    poisoned: bool,
    resident_bytes: u64,
    _device: MlxDevice,
}

/// Exact rollback state for a DeepSeek-V4 cache at a token boundary.
///
/// Compressed and indexer KV rows are append-only: decode after the anchor can
/// only write rows at or beyond the anchor's logical position, and restoring
/// `next_position` makes those future rows invisible until replay overwrites
/// them. The 128-token circular window and recurrent compressor state *are*
/// overwritten by decode, so the snapshot owns compact, non-aliasing copies
/// of exactly those buffers. This keeps rollback exact without duplicating a
/// context-linear multi-gigabyte allocation.
pub struct Deepseek4CacheSnapshot {
    layers: Vec<LayerCacheSnapshot>,
    plan: Deepseek4CachePlan,
    next_position: usize,
    resident_bytes: u64,
}

struct LayerCacheSnapshot {
    window_kv: MlxBuffer,
    main_kv_state: Option<MlxBuffer>,
    main_score_state: Option<MlxBuffer>,
    indexer_kv_state: Option<MlxBuffer>,
    indexer_score_state: Option<MlxBuffer>,
}

impl Deepseek4CachePlan {
    pub fn for_context(cfg: &Deepseek4Config, context_length: usize) -> Result<Self, CacheError> {
        validate_request(cfg, context_length)?;
        let mut layers = Vec::with_capacity(cfg.compress_ratios.len());
        let mut resident_bytes = 0_u64;
        for (layer, &ratio) in cfg.compress_ratios.iter().enumerate() {
            let window_capacity = context_length.min(cfg.sliding_window as usize);
            let window_kv = buffer_plan(
                layer,
                CacheKind::WindowKv,
                vec![window_capacity, cfg.head_dim as usize],
                DType::BF16,
            )?;
            let compressed_kv = if ratio == 0 {
                None
            } else {
                optional_buffer_plan(
                    layer,
                    CacheKind::CompressedKv,
                    vec![context_length / ratio as usize, cfg.head_dim as usize],
                    DType::BF16,
                )?
            };
            let compressed_capacity = compressed_kv.as_ref().map_or(0, |plan| plan.shape[0]);
            let attention_kv = buffer_plan(
                layer,
                CacheKind::AttentionKv,
                vec![window_capacity + compressed_capacity, cfg.head_dim as usize],
                DType::BF16,
            )?;
            let indexer_kv = if ratio == 4 {
                optional_buffer_plan(
                    layer,
                    CacheKind::IndexerKv,
                    vec![context_length / 4, cfg.index_head_dim as usize],
                    DType::BF16,
                )?
            } else {
                None
            };
            let (main_kv_state, main_score_state) = compressor_state_plans(
                layer,
                ratio,
                cfg.head_dim as usize,
                CacheKind::MainKvState,
                CacheKind::MainScoreState,
            )?;
            let (indexer_kv_state, indexer_score_state) = if ratio == 4 {
                compressor_state_plans(
                    layer,
                    ratio,
                    cfg.index_head_dim as usize,
                    CacheKind::IndexerKvState,
                    CacheKind::IndexerScoreState,
                )?
            } else {
                (None, None)
            };
            let mut layer_bytes = attention_kv.bytes;
            for (kind, plan) in [
                (CacheKind::IndexerKv, indexer_kv.as_ref()),
                (CacheKind::MainKvState, main_kv_state.as_ref()),
                (CacheKind::MainScoreState, main_score_state.as_ref()),
                (CacheKind::IndexerKvState, indexer_kv_state.as_ref()),
                (CacheKind::IndexerScoreState, indexer_score_state.as_ref()),
            ] {
                if let Some(plan) = plan {
                    layer_bytes = layer_bytes
                        .checked_add(plan.bytes)
                        .ok_or(CacheError::ByteOverflow { layer, kind })?;
                }
            }
            resident_bytes =
                resident_bytes
                    .checked_add(layer_bytes)
                    .ok_or(CacheError::ByteOverflow {
                        layer,
                        kind: CacheKind::AttentionKv,
                    })?;
            layers.push(LayerCachePlan {
                layer_index: layer,
                compress_ratio: ratio,
                attention_kv,
                window_kv,
                compressed_kv,
                indexer_kv,
                main_kv_state,
                main_score_state,
                indexer_kv_state,
                indexer_score_state,
                resident_bytes: layer_bytes,
            });
        }
        Ok(Self {
            context_length,
            layers,
            resident_bytes,
        })
    }
}

impl Deepseek4Cache {
    pub fn allocate(plan: &Deepseek4CachePlan, device: MlxDevice) -> Result<Self, CacheError> {
        Self::allocate_impl(plan, device, false)
    }

    /// Reserve the full logical context while physically committing only KV
    /// rows that inference writes. Compressor state remains normally
    /// initialized because it is read across token steps.
    pub fn allocate_logical(
        plan: &Deepseek4CachePlan,
        device: MlxDevice,
    ) -> Result<Self, CacheError> {
        Self::allocate_impl(plan, device, true)
    }

    fn allocate_impl(
        plan: &Deepseek4CachePlan,
        device: MlxDevice,
        lazy_append_storage: bool,
    ) -> Result<Self, CacheError> {
        let mut layers = Vec::with_capacity(plan.layers.len());
        let mut resident_bytes = 0_u64;
        for layer in &plan.layers {
            let attention_kv = if lazy_append_storage {
                allocate_overwrite_buffer(
                    &device,
                    layer.layer_index,
                    CacheKind::AttentionKv,
                    &layer.attention_kv,
                )?
            } else {
                allocate_buffer(
                    &device,
                    layer.layer_index,
                    CacheKind::AttentionKv,
                    &layer.attention_kv,
                )?
            };
            let window_kv = view_buffer(
                &attention_kv,
                0,
                layer.layer_index,
                CacheKind::WindowKv,
                &layer.window_kv,
            )?;
            let compressed_kv = layer
                .compressed_kv
                .as_ref()
                .map(|buffer| {
                    view_buffer(
                        &attention_kv,
                        layer.window_kv.bytes,
                        layer.layer_index,
                        CacheKind::CompressedKv,
                        buffer,
                    )
                })
                .transpose()?;
            let indexer_kv = layer
                .indexer_kv
                .as_ref()
                .map(|buffer| {
                    if lazy_append_storage {
                        allocate_overwrite_buffer(
                            &device,
                            layer.layer_index,
                            CacheKind::IndexerKv,
                            buffer,
                        )
                    } else {
                        allocate_buffer(&device, layer.layer_index, CacheKind::IndexerKv, buffer)
                    }
                })
                .transpose()?;
            let main_kv_state = allocate_optional(
                &device,
                layer.layer_index,
                CacheKind::MainKvState,
                layer.main_kv_state.as_ref(),
            )?;
            let main_score_state = allocate_optional(
                &device,
                layer.layer_index,
                CacheKind::MainScoreState,
                layer.main_score_state.as_ref(),
            )?;
            let indexer_kv_state = allocate_optional(
                &device,
                layer.layer_index,
                CacheKind::IndexerKvState,
                layer.indexer_kv_state.as_ref(),
            )?;
            let indexer_score_state = allocate_optional(
                &device,
                layer.layer_index,
                CacheKind::IndexerScoreState,
                layer.indexer_score_state.as_ref(),
            )?;
            resident_bytes = resident_bytes.checked_add(layer.resident_bytes).ok_or(
                CacheError::ByteOverflow {
                    layer: layer.layer_index,
                    kind: CacheKind::WindowKv,
                },
            )?;
            layers.push(LayerCache {
                attention_kv,
                window_kv,
                compressed_kv,
                indexer_kv,
                main_kv_state,
                main_score_state,
                indexer_kv_state,
                indexer_score_state,
            });
        }
        let actual = layers.iter().try_fold(0_u64, |total, layer| {
            std::iter::once(&layer.attention_kv)
                .chain(layer.indexer_kv.iter())
                .chain(layer.main_kv_state.iter())
                .chain(layer.main_score_state.iter())
                .chain(layer.indexer_kv_state.iter())
                .chain(layer.indexer_score_state.iter())
                .try_fold(total, |bytes, buffer| {
                    u64::try_from(buffer.byte_len())
                        .ok()
                        .and_then(|buffer_bytes| bytes.checked_add(buffer_bytes))
                })
        });
        let actual = actual.ok_or(CacheError::ByteOverflow {
            layer: layers.len().saturating_sub(1),
            kind: CacheKind::AttentionKv,
        })?;
        if actual != plan.resident_bytes || resident_bytes != plan.resident_bytes {
            return Err(CacheError::Accounting {
                planned: plan.resident_bytes,
                actual,
            });
        }
        let mut cache = Self {
            layers,
            plan: plan.clone(),
            next_position: 0,
            poisoned: false,
            resident_bytes: actual,
            _device: device,
        };
        cache.reset()?;
        Ok(cache)
    }

    pub fn layers(&self) -> &[LayerCache] {
        &self.layers
    }

    #[cfg(test)]
    pub(super) fn layers_mut(&mut self) -> &mut [LayerCache] {
        &mut self.layers
    }

    pub fn resident_bytes(&self) -> u64 {
        self.resident_bytes
    }

    pub fn position(&self) -> usize {
        self.next_position
    }

    pub fn capacity(&self) -> usize {
        self.plan.context_length
    }

    pub fn is_poisoned(&self) -> bool {
        self.poisoned
    }

    /// Copy a valid live prefix into a larger, prefix-compatible cache.
    ///
    /// The source remains untouched until every destination copy succeeds, so
    /// callers can discard the partially populated destination and continue
    /// serving from the old cache after an allocation or copy failure. The
    /// optional compact rollback snapshot is rebound only after all live bytes
    /// have migrated; this keeps recovery-anchor restore exact across the
    /// capacity boundary without accepting unrelated old-plan snapshots.
    pub fn migrate_from(
        &mut self,
        source: &Deepseek4Cache,
        snapshot: Option<&mut Deepseek4CacheSnapshot>,
    ) -> Result<(), CacheError> {
        if source.poisoned {
            return Err(CacheError::Poisoned);
        }
        validate_growth_plans(&source.plan, &self.plan)?;
        if let Some(snapshot) = snapshot.as_ref() {
            if snapshot.plan != source.plan {
                return Err(CacheError::MigrationSnapshotPlanMismatch);
            }
            if snapshot.next_position > source.next_position {
                return Err(CacheError::MigrationSnapshotPosition {
                    snapshot_position: snapshot.next_position,
                    source_position: source.next_position,
                });
            }
        }

        for (layer_index, (source_layer, destination_layer)) in
            source.layers.iter().zip(self.layers.iter_mut()).enumerate()
        {
            let layer_plan = &source.plan.layers[layer_index];
            let window_rows = source.next_position.min(source_layer.window_kv.shape()[0]);
            let compressed_rows = if layer_plan.compress_ratio == 0 {
                0
            } else {
                source.next_position / layer_plan.compress_ratio as usize
            };
            copy_buffer_valid_rows(
                &source_layer.window_kv,
                &mut destination_layer.window_kv,
                window_rows,
                layer_index,
                CacheKind::WindowKv,
            )?;
            copy_optional_buffer_valid_rows(
                source_layer.compressed_kv.as_ref(),
                destination_layer.compressed_kv.as_mut(),
                compressed_rows,
                layer_index,
                CacheKind::CompressedKv,
            )?;
            copy_optional_buffer_valid_rows(
                source_layer.indexer_kv.as_ref(),
                destination_layer.indexer_kv.as_mut(),
                if layer_plan.compress_ratio == 4 {
                    compressed_rows
                } else {
                    0
                },
                layer_index,
                CacheKind::IndexerKv,
            )?;
            copy_optional_buffer_prefix(
                source_layer.main_kv_state.as_ref(),
                destination_layer.main_kv_state.as_mut(),
                layer_index,
                CacheKind::MainKvState,
            )?;
            copy_optional_buffer_prefix(
                source_layer.main_score_state.as_ref(),
                destination_layer.main_score_state.as_mut(),
                layer_index,
                CacheKind::MainScoreState,
            )?;
            copy_optional_buffer_prefix(
                source_layer.indexer_kv_state.as_ref(),
                destination_layer.indexer_kv_state.as_mut(),
                layer_index,
                CacheKind::IndexerKvState,
            )?;
            copy_optional_buffer_prefix(
                source_layer.indexer_score_state.as_ref(),
                destination_layer.indexer_score_state.as_mut(),
                layer_index,
                CacheKind::IndexerScoreState,
            )?;
        }

        self.next_position = source.next_position;
        self.poisoned = false;
        if let Some(snapshot) = snapshot {
            snapshot.plan = self.plan.clone();
        }
        Ok(())
    }

    /// Capture exact prompt-boundary rollback state before generation mutates
    /// the circular window and recurrent compressor state.
    pub fn snapshot(&self) -> Result<Deepseek4CacheSnapshot, CacheError> {
        if self.poisoned {
            return Err(CacheError::Poisoned);
        }
        let mut layers = Vec::with_capacity(self.layers.len());
        let mut resident_bytes = 0_u64;
        for (layer_index, layer) in self.layers.iter().enumerate() {
            let snapshot = LayerCacheSnapshot {
                window_kv: snapshot_buffer_valid_rows(
                    &self._device,
                    &layer.window_kv,
                    self.next_position.min(layer.window_kv.shape()[0]),
                    layer_index,
                    CacheKind::WindowKv,
                )?,
                main_kv_state: snapshot_optional_buffer(
                    &self._device,
                    layer.main_kv_state.as_ref(),
                    layer_index,
                    CacheKind::MainKvState,
                )?,
                main_score_state: snapshot_optional_buffer(
                    &self._device,
                    layer.main_score_state.as_ref(),
                    layer_index,
                    CacheKind::MainScoreState,
                )?,
                indexer_kv_state: snapshot_optional_buffer(
                    &self._device,
                    layer.indexer_kv_state.as_ref(),
                    layer_index,
                    CacheKind::IndexerKvState,
                )?,
                indexer_score_state: snapshot_optional_buffer(
                    &self._device,
                    layer.indexer_score_state.as_ref(),
                    layer_index,
                    CacheKind::IndexerScoreState,
                )?,
            };
            let layer_bytes = std::iter::once(&snapshot.window_kv)
                .chain(snapshot.main_kv_state.iter())
                .chain(snapshot.main_score_state.iter())
                .chain(snapshot.indexer_kv_state.iter())
                .chain(snapshot.indexer_score_state.iter())
                .try_fold(0_u64, |total, buffer| {
                    u64::try_from(buffer.data_byte_len())
                        .ok()
                        .and_then(|bytes| total.checked_add(bytes))
                })
                .ok_or(CacheError::ByteOverflow {
                    layer: layer_index,
                    kind: CacheKind::WindowKv,
                })?;
            resident_bytes =
                resident_bytes
                    .checked_add(layer_bytes)
                    .ok_or(CacheError::ByteOverflow {
                        layer: layer_index,
                        kind: CacheKind::WindowKv,
                    })?;
            layers.push(snapshot);
        }
        Ok(Deepseek4CacheSnapshot {
            layers,
            plan: self.plan.clone(),
            next_position: self.next_position,
            resident_bytes,
        })
    }

    /// Restore a prior token-boundary snapshot into this fixed-capacity cache.
    /// The cache remains allocated; only its bytes and logical position move.
    pub fn restore(&mut self, snapshot: &Deepseek4CacheSnapshot) -> Result<(), CacheError> {
        if snapshot.plan != self.plan {
            return Err(CacheError::SnapshotPlanMismatch);
        }
        if snapshot.layers.len() != self.layers.len() {
            return Err(CacheError::SnapshotLayerCount {
                expected: self.layers.len(),
                actual: snapshot.layers.len(),
            });
        }
        for (layer_index, (source, destination)) in snapshot
            .layers
            .iter()
            .zip(self.layers.iter_mut())
            .enumerate()
        {
            restore_buffer(
                &source.window_kv,
                &mut destination.window_kv,
                layer_index,
                CacheKind::WindowKv,
            )?;
            restore_optional_buffer(
                source.main_kv_state.as_ref(),
                destination.main_kv_state.as_mut(),
                layer_index,
                CacheKind::MainKvState,
            )?;
            restore_optional_buffer(
                source.main_score_state.as_ref(),
                destination.main_score_state.as_mut(),
                layer_index,
                CacheKind::MainScoreState,
            )?;
            restore_optional_buffer(
                source.indexer_kv_state.as_ref(),
                destination.indexer_kv_state.as_mut(),
                layer_index,
                CacheKind::IndexerKvState,
            )?;
            restore_optional_buffer(
                source.indexer_score_state.as_ref(),
                destination.indexer_score_state.as_mut(),
                layer_index,
                CacheKind::IndexerScoreState,
            )?;
        }
        self.next_position = snapshot.next_position;
        self.poisoned = false;
        Ok(())
    }

    /// Prevent retries after any submitted layer has mutated recurrent state.
    /// Resetting the request clears the poison and recurrent state together.
    pub(super) fn poison(&mut self) {
        self.poisoned = true;
    }

    /// Return the write slots and post-write visibility bounds for the next
    /// token without changing logical cache state. The caller commits only
    /// after its Metal command buffer completes successfully.
    pub fn plan_next_step(&self) -> Result<CacheStep, CacheError> {
        if self.poisoned {
            return Err(CacheError::Poisoned);
        }
        if self.next_position >= self.plan.context_length {
            return Err(CacheError::ContextExhausted {
                maximum: self.plan.context_length,
            });
        }
        let position = self.next_position;
        let tokens_after = position + 1;
        let layers = self
            .plan
            .layers
            .iter()
            .map(|layer| {
                let window_capacity = layer.window_kv.shape[0];
                let window_valid_after = tokens_after.min(window_capacity);
                let (compressed_write_slot, compressed_valid_after) =
                    completed_group_step(tokens_after, layer.compress_ratio);
                let indexer_write_slot = (layer.compress_ratio == 4)
                    .then_some(compressed_write_slot)
                    .flatten();
                let indexer_valid_after = if layer.compress_ratio == 4 {
                    compressed_valid_after
                } else {
                    0
                };
                LayerCacheStep {
                    layer_index: layer.layer_index,
                    window_write_slot: position % window_capacity,
                    window_start_position: tokens_after - window_valid_after,
                    window_valid_after,
                    compressed_write_slot,
                    compressed_valid_after,
                    indexer_write_slot,
                    indexer_valid_after,
                }
            })
            .collect();
        Ok(CacheStep { position, layers })
    }

    /// Advance logical visibility after the planned GPU writes complete.
    pub fn commit_step(&mut self, position: usize) -> Result<(), CacheError> {
        if self.poisoned {
            return Err(CacheError::Poisoned);
        }
        if position != self.next_position {
            return Err(CacheError::StepOutOfOrder {
                expected: self.next_position,
                actual: position,
            });
        }
        if self.next_position >= self.plan.context_length {
            return Err(CacheError::ContextExhausted {
                maximum: self.plan.context_length,
            });
        }
        self.next_position += 1;
        Ok(())
    }

    /// Reset logical visibility and all recurrent compressor state. KV rows
    /// remain validity-bounded, but pooling state participates in future
    /// writes and therefore must be restored exactly between requests.
    pub fn reset(&mut self) -> Result<(), CacheError> {
        for (layer_index, layer) in self.layers.iter_mut().enumerate() {
            fill_state(
                layer.main_kv_state.as_mut(),
                0.0,
                layer_index,
                CacheKind::MainKvState,
            )?;
            fill_state(
                layer.main_score_state.as_mut(),
                f32::NEG_INFINITY,
                layer_index,
                CacheKind::MainScoreState,
            )?;
            fill_state(
                layer.indexer_kv_state.as_mut(),
                0.0,
                layer_index,
                CacheKind::IndexerKvState,
            )?;
            fill_state(
                layer.indexer_score_state.as_mut(),
                f32::NEG_INFINITY,
                layer_index,
                CacheKind::IndexerScoreState,
            )?;
        }
        self.next_position = 0;
        self.poisoned = false;
        Ok(())
    }
}

impl Deepseek4CacheSnapshot {
    pub fn position(&self) -> usize {
        self.next_position
    }

    pub fn resident_bytes(&self) -> u64 {
        self.resident_bytes
    }
}

fn snapshot_buffer(
    device: &MlxDevice,
    source: &MlxBuffer,
    layer: usize,
    kind: CacheKind,
) -> Result<MlxBuffer, CacheError> {
    let mut destination = device
        .alloc_buffer(
            source.data_byte_len(),
            source.dtype(),
            source.shape().to_vec(),
        )
        .map_err(|source| CacheError::SnapshotCopy {
            layer,
            kind,
            source,
        })?;
    copy_buffer(source, &mut destination, layer, kind)?;
    Ok(destination)
}

/// Snapshot only cursor-visible rows from overwrite-backed sequence storage.
/// The destination is normally initialized, so its unread tail is coherent
/// zero state without ever exposing the source allocation's unwritten bytes.
fn snapshot_buffer_valid_rows(
    device: &MlxDevice,
    source: &MlxBuffer,
    valid_rows: usize,
    layer: usize,
    kind: CacheKind,
) -> Result<MlxBuffer, CacheError> {
    if source.shape().is_empty() || valid_rows > source.shape()[0] {
        return Err(CacheError::SnapshotBufferMismatch { layer, kind });
    }
    let mut destination = device
        .alloc_buffer(
            source.data_byte_len(),
            source.dtype(),
            source.shape().to_vec(),
        )
        .map_err(|source| CacheError::SnapshotCopy {
            layer,
            kind,
            source,
        })?;
    let row_elements = source.shape()[1..]
        .iter()
        .try_fold(1usize, |elements, &dimension| {
            elements.checked_mul(dimension)
        })
        .ok_or(CacheError::ByteOverflow { layer, kind })?;
    let valid_bytes = valid_rows
        .checked_mul(row_elements)
        .and_then(|elements| elements.checked_mul(source.dtype().size_of()))
        .ok_or(CacheError::ByteOverflow { layer, kind })?;
    if valid_bytes == 0 {
        return Ok(destination);
    }
    let source_bytes = source
        .as_slice::<u8>()
        .map_err(|source| CacheError::SnapshotCopy {
            layer,
            kind,
            source,
        })?;
    let destination_bytes =
        destination
            .as_mut_slice::<u8>()
            .map_err(|source| CacheError::SnapshotCopy {
                layer,
                kind,
                source,
            })?;
    destination_bytes[..valid_bytes].copy_from_slice(&source_bytes[..valid_bytes]);
    Ok(destination)
}

fn snapshot_optional_buffer(
    device: &MlxDevice,
    source: Option<&MlxBuffer>,
    layer: usize,
    kind: CacheKind,
) -> Result<Option<MlxBuffer>, CacheError> {
    source
        .map(|source| snapshot_buffer(device, source, layer, kind))
        .transpose()
}

fn restore_buffer(
    source: &MlxBuffer,
    destination: &mut MlxBuffer,
    layer: usize,
    kind: CacheKind,
) -> Result<(), CacheError> {
    if source.data_byte_len() != destination.data_byte_len()
        || source.dtype() != destination.dtype()
        || source.shape() != destination.shape()
    {
        return Err(CacheError::SnapshotBufferMismatch { layer, kind });
    }
    copy_buffer(source, destination, layer, kind)
}

fn restore_optional_buffer(
    source: Option<&MlxBuffer>,
    destination: Option<&mut MlxBuffer>,
    layer: usize,
    kind: CacheKind,
) -> Result<(), CacheError> {
    match (source, destination) {
        (Some(source), Some(destination)) => restore_buffer(source, destination, layer, kind),
        (None, None) => Ok(()),
        _ => Err(CacheError::SnapshotBufferMismatch { layer, kind }),
    }
}

fn copy_buffer(
    source: &MlxBuffer,
    destination: &mut MlxBuffer,
    layer: usize,
    kind: CacheKind,
) -> Result<(), CacheError> {
    let source = source
        .as_slice::<u8>()
        .map_err(|source| CacheError::SnapshotCopy {
            layer,
            kind,
            source,
        })?;
    let destination =
        destination
            .as_mut_slice::<u8>()
            .map_err(|source| CacheError::SnapshotCopy {
                layer,
                kind,
                source,
            })?;
    if source.len() != destination.len() {
        return Err(CacheError::SnapshotBufferMismatch { layer, kind });
    }
    destination.copy_from_slice(source);
    Ok(())
}

fn validate_growth_plans(
    source: &Deepseek4CachePlan,
    target: &Deepseek4CachePlan,
) -> Result<(), CacheError> {
    if target.context_length <= source.context_length {
        return Err(CacheError::MigrationContext {
            source_context: source.context_length,
            target_context: target.context_length,
        });
    }
    if source.layers.len() != target.layers.len() {
        return Err(CacheError::MigrationLayerCount {
            source_layers: source.layers.len(),
            target_layers: target.layers.len(),
        });
    }
    for (layer_index, (source, target)) in
        source.layers.iter().zip(target.layers.iter()).enumerate()
    {
        if source.layer_index != target.layer_index
            || source.compress_ratio != target.compress_ratio
            || !buffer_plan_is_prefix(&source.attention_kv, &target.attention_kv)
        {
            return Err(CacheError::MigrationPlanMismatch {
                layer: layer_index,
                kind: CacheKind::AttentionKv,
            });
        }
        if source.window_kv != target.window_kv {
            return Err(CacheError::MigrationPlanMismatch {
                layer: layer_index,
                kind: CacheKind::WindowKv,
            });
        }
        if !optional_buffer_plan_is_prefix(
            source.compressed_kv.as_ref(),
            target.compressed_kv.as_ref(),
        ) {
            return Err(CacheError::MigrationPlanMismatch {
                layer: layer_index,
                kind: CacheKind::CompressedKv,
            });
        }
        if !optional_buffer_plan_is_prefix(source.indexer_kv.as_ref(), target.indexer_kv.as_ref()) {
            return Err(CacheError::MigrationPlanMismatch {
                layer: layer_index,
                kind: CacheKind::IndexerKv,
            });
        }
        for (kind, source, target) in [
            (
                CacheKind::MainKvState,
                source.main_kv_state.as_ref(),
                target.main_kv_state.as_ref(),
            ),
            (
                CacheKind::MainScoreState,
                source.main_score_state.as_ref(),
                target.main_score_state.as_ref(),
            ),
            (
                CacheKind::IndexerKvState,
                source.indexer_kv_state.as_ref(),
                target.indexer_kv_state.as_ref(),
            ),
            (
                CacheKind::IndexerScoreState,
                source.indexer_score_state.as_ref(),
                target.indexer_score_state.as_ref(),
            ),
        ] {
            if source != target {
                return Err(CacheError::MigrationPlanMismatch {
                    layer: layer_index,
                    kind,
                });
            }
        }
    }
    Ok(())
}

fn buffer_plan_is_prefix(source: &CacheBufferPlan, target: &CacheBufferPlan) -> bool {
    source.dtype == target.dtype
        && !source.shape.is_empty()
        && source.shape.len() == target.shape.len()
        && source.shape[1..] == target.shape[1..]
        && source.shape[0] <= target.shape[0]
        && source.bytes <= target.bytes
}

fn optional_buffer_plan_is_prefix(
    source: Option<&CacheBufferPlan>,
    target: Option<&CacheBufferPlan>,
) -> bool {
    match (source, target) {
        (Some(source), Some(target)) => buffer_plan_is_prefix(source, target),
        (None, None) => true,
        _ => false,
    }
}

fn copy_buffer_prefix(
    source: &MlxBuffer,
    destination: &mut MlxBuffer,
    layer: usize,
    kind: CacheKind,
) -> Result<(), CacheError> {
    if source.dtype() != destination.dtype()
        || source.shape().is_empty()
        || source.shape().len() != destination.shape().len()
        || source.shape()[1..] != destination.shape()[1..]
        || source.shape()[0] > destination.shape()[0]
        || source.data_byte_len() > destination.data_byte_len()
    {
        return Err(CacheError::MigrationBufferMismatch { layer, kind });
    }
    let source = source
        .as_slice::<u8>()
        .map_err(|source| CacheError::MigrationCopy {
            layer,
            kind,
            source,
        })?;
    let destination =
        destination
            .as_mut_slice::<u8>()
            .map_err(|source| CacheError::MigrationCopy {
                layer,
                kind,
                source,
            })?;
    destination[..source.len()].copy_from_slice(source);
    Ok(())
}

/// Copy only rows made visible by the cache cursor.
///
/// Append-only KV storage may come from `alloc_buffer_for_overwrite`, whose
/// unwritten tail is not readable. Migration therefore operates on the
/// logical window/compressed/indexer views and never maps bytes beyond the
/// row count derived from `next_position`.
fn copy_buffer_valid_rows(
    source: &MlxBuffer,
    destination: &mut MlxBuffer,
    valid_rows: usize,
    layer: usize,
    kind: CacheKind,
) -> Result<(), CacheError> {
    if source.dtype() != destination.dtype()
        || source.shape().is_empty()
        || source.shape().len() != destination.shape().len()
        || source.shape()[1..] != destination.shape()[1..]
        || valid_rows > source.shape()[0]
        || valid_rows > destination.shape()[0]
    {
        return Err(CacheError::MigrationBufferMismatch { layer, kind });
    }
    let row_elements = source.shape()[1..]
        .iter()
        .try_fold(1usize, |elements, &dimension| {
            elements.checked_mul(dimension)
        })
        .ok_or(CacheError::ByteOverflow { layer, kind })?;
    let valid_bytes = valid_rows
        .checked_mul(row_elements)
        .and_then(|elements| elements.checked_mul(source.dtype().size_of()))
        .ok_or(CacheError::ByteOverflow { layer, kind })?;
    if valid_bytes == 0 {
        return Ok(());
    }
    let source = source
        .as_slice::<u8>()
        .map_err(|source| CacheError::MigrationCopy {
            layer,
            kind,
            source,
        })?;
    let destination =
        destination
            .as_mut_slice::<u8>()
            .map_err(|source| CacheError::MigrationCopy {
                layer,
                kind,
                source,
            })?;
    destination[..valid_bytes].copy_from_slice(&source[..valid_bytes]);
    Ok(())
}

fn copy_optional_buffer_valid_rows(
    source: Option<&MlxBuffer>,
    destination: Option<&mut MlxBuffer>,
    valid_rows: usize,
    layer: usize,
    kind: CacheKind,
) -> Result<(), CacheError> {
    match (source, destination) {
        (Some(source), Some(destination)) => {
            copy_buffer_valid_rows(source, destination, valid_rows, layer, kind)
        }
        (None, None) if valid_rows == 0 => Ok(()),
        _ => Err(CacheError::MigrationBufferMismatch { layer, kind }),
    }
}

fn copy_optional_buffer_prefix(
    source: Option<&MlxBuffer>,
    destination: Option<&mut MlxBuffer>,
    layer: usize,
    kind: CacheKind,
) -> Result<(), CacheError> {
    match (source, destination) {
        (Some(source), Some(destination)) => copy_buffer_prefix(source, destination, layer, kind),
        (None, None) => Ok(()),
        _ => Err(CacheError::MigrationBufferMismatch { layer, kind }),
    }
}