request.rs 36.8 KB
Newer Older
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
// SPDX-FileCopyrightText: Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

//! # Request Sequence
//!
//! Low-level request primitive with direct RAII block lifecycle management.
//!
//! [`RequestSequence`] composes [`BlockSequence`](crate::BlockSequence),
//! [`LogicalBlockAssignments`](crate::LogicalBlockAssignments), and
//! [`BlockManager`](crate::BlockManager) into a single type that exposes
//! individual block lifecycle operations without opinionation about
//! scheduling policy.
//!
//! For a structured two-phase schedule/apply layer built on top of this,
//! see [`SchedulableSequence`](crate::SchedulableSequence).
//!
//! ## When to use
//!
//! Use `RequestSequence` directly when you need full control over block
//! allocation, staging, and registration timing. Use `SchedulableSequence`
//! when you want state-machine enforcement of the prefill/decode protocol.
//!
//! ## Block lifecycle
//!
//! Blocks flow through three phases:
//!
//! 1. **Unassigned** -- freshly allocated `MutableBlock`s waiting to be paired
//!    with token data
//! 2. **Staged** -- `CompleteBlock`s paired with token data but not yet
//!    committed to the registry
//! 3. **Assigned** -- `ImmutableBlock`s registered in the block manager,
//!    visible for prefix matching
//!
//! ## Basic usage
//!
//! ```ignore
//! use kvbm_logical::{RequestSequence, BlockManager};
//!
//! // 1. Construct with tokens only (no manager interaction)
//! let tokens: Vec<u32> = (0..8).collect();
//! let mut seq = RequestSequence::<MyMeta>::new(tokens, 10, 4);
//! // total_tokens=8, num_blocks=2, nothing allocated yet
//!
//! // 2. Prefix match against the cache
//! let matched_count = seq.match_and_add_prefix(&manager).unwrap();
//!
//! // 3. Allocate blocks for the rest
//! let remaining = seq.num_blocks() - matched_count;
//! seq.allocate_blocks(remaining, &manager);
//!
//! // 4. Stage and register
//! seq.complete_and_register_pending(&manager);
//! // Now: assigned_blocks() == num_blocks()
//! ```
//!
//! ## Generation loop
//!
//! After initial setup, generate tokens one at a time. Each `append_token`
//! call returns `Some(block_index)` when a block boundary is crossed,
//! signaling that `complete_and_register_pending` should be called and a
//! new generation block allocated.
//!
//! ```ignore
//! while !seq.is_complete() {
//!     let token = model.forward(&seq);
//!     let crossed = seq.append_token(token);
//!     if crossed.is_some() {
//!         seq.complete_and_register_pending(&manager);
//!         seq.allocate_blocks(1, &manager);
//!     }
//! }
//! ```
//!
//! ## Preemption and reacquire
//!
//! Release all blocks (RAII returns them to pools), then re-acquire later.
//! Prefix-matched blocks may come from cache, saving re-computation.
//!
//! ```ignore
//! // Preempt
//! seq.release();
//! assert_eq!(seq.assigned_blocks(), 0);
//!
//! // Later: reacquire
//! let success = seq.reacquire(&manager);
//! // Prefix cache hits are reflected in prefix_matched_blocks()
//! ```
//!
//! ## Key accessors
//!
//! | Method                    | Description                                    |
//! |---------------------------|------------------------------------------------|
//! | `total_tokens()`          | Input + generated token count                  |
//! | `num_input_tokens()`      | Original input token count                     |
//! | `generated_tokens()`      | Tokens appended via `append_token`             |
//! | `num_blocks()`            | Complete token blocks in the sequence          |
//! | `assigned_blocks()`       | Registered/cache-matched blocks                |
//! | `staged_blocks()`         | Completed but not yet registered               |
//! | `unassigned_blocks()`     | Allocated but not yet paired with token data   |
//! | `prefix_matched_blocks()` | Blocks matched from cache                      |
//! | `is_complete()`           | `generated_tokens >= max_output_tokens`         |
//! | `new_tokens_for_prefill()`| Tokens not covered by cache hits               |

use crate::KvbmSequenceHashProvider;
use crate::blocks::{BlockMetadata, ImmutableBlock};
use crate::manager::BlockManager;
use crate::sequence::{BlockSequence, LogicalBlockAssignmentError, LogicalBlockAssignments};

use dynamo_tokens::Token;

/// Manages a request's block lifecycle through direct RAII integration with
/// [`BlockManager`], bypassing the `MoveBlock` signal protocol.
///
/// Composes [`BlockSequence`] (token data and hashing) and
/// [`LogicalBlockAssignments`] (RAII block guards) into a single unit that
/// handles:
///
/// - **Construction**: prefix matching, allocation, and registration of input blocks
/// - **Generation**: token-by-token extension with automatic block promotion
/// - **Preemption**: release all blocks, re-acquire later with potential cache hits
///
/// # Block lifecycle
///
/// The generation block (always at most one) lives as the single unassigned
/// entry in [`LogicalBlockAssignments`]. When a block boundary is crossed:
///
/// 1. `stage()` — the generation `MutableBlock` becomes a `CompleteBlock`
/// 2. `register()` — the `CompleteBlock` becomes an `ImmutableBlock`
/// 3. `allocate_blocks(1)` → `extend_blocks()` — a new generation block
pub struct RequestSequence<T: BlockMetadata> {
    sequence: BlockSequence,
    assignments: LogicalBlockAssignments<T>,
    generated_tokens: usize,
    max_output_tokens: usize,
    num_input_tokens: usize,
    prefix_matched_blocks: usize,
}

impl<T: BlockMetadata> RequestSequence<T> {
    // =====================================================================
    // Minimal constructor (no manager interaction)
    // =====================================================================

    /// Creates a `RequestSequence` with token data only. No blocks are
    /// allocated and no manager interaction occurs.
    ///
    /// The caller must use [`match_and_add_prefix`], [`allocate_blocks`],
    /// and [`complete_and_register_pending`] to search, allocate, and
    /// register blocks.
    ///
    /// [`match_and_add_prefix`]: Self::match_and_add_prefix
    /// [`allocate_blocks`]: Self::allocate_blocks
    /// [`complete_and_register_pending`]: Self::complete_and_register_pending
    pub fn new(tokens: Vec<Token>, max_output_tokens: usize, block_size: u32) -> Self {
        let num_input_tokens = tokens.len();
        let sequence = BlockSequence::new(tokens, block_size, None);
        let assignments = LogicalBlockAssignments::new();

        Self {
            sequence,
            assignments,
            generated_tokens: 0,
            max_output_tokens,
            num_input_tokens,
            prefix_matched_blocks: 0,
        }
    }

    // =====================================================================
    // Individual block operations
    // =====================================================================

    /// Search for prefix cache hits and add matched blocks in one step.
    ///
    /// This is the standard entry point for prefix matching on a fresh
    /// sequence. Combines [`match_prefix`](Self::match_prefix) and
    /// [`add_matched_blocks`](Self::add_matched_blocks).
    ///
    /// # Panics
    ///
    /// Panics if the sequence already has assigned blocks (i.e. this is
    /// not a fresh sequence).
    pub fn match_and_add_prefix(
        &mut self,
        manager: &BlockManager<T>,
    ) -> Result<usize, LogicalBlockAssignmentError<T>> {
        assert!(
            self.assignments.is_empty(),
            "match_and_add_prefix called on sequence with existing assignments"
        );
        let matched = self.match_prefix(manager);
        if matched.is_empty() {
            return Ok(0);
        }
        self.add_matched_blocks(matched)
    }

    /// Search for prefix cache hits against the manager's pools.
    ///
    /// Returns matched [`ImmutableBlock`]s in sequence order. Pass the result
    /// to [`add_matched_blocks`](Self::add_matched_blocks).
    fn match_prefix(&self, manager: &BlockManager<T>) -> Vec<ImmutableBlock<T>> {
        let hashes = self.sequence.all_sequence_hashes();
        manager.match_blocks(&hashes)
    }

    /// Add prefix-matched immutable blocks as assigned.
    ///
    /// Accumulates the internal `prefix_matched_blocks` counter so this
    /// method can be called more than once (e.g. partial prefix matches
    /// applied in separate batches).
    ///
    /// Returns the number of blocks added.
    fn add_matched_blocks(
        &mut self,
        blocks: Vec<ImmutableBlock<T>>,
    ) -> Result<usize, LogicalBlockAssignmentError<T>> {
        let count = blocks.len();
        let start = self.assignments.assigned_count();
        let end = start + count;
        let sequence_blocks = self.sequence.blocks();

        assert!(
            end <= sequence_blocks.len(),
            "matched blocks exceed completed sequence blocks"
        );

        for (i, (block, seq_block)) in blocks.iter().zip(&sequence_blocks[start..end]).enumerate() {
            let expected = seq_block.kvbm_sequence_hash();
            let actual = block.sequence_hash();
            if expected != actual {
                return Err(LogicalBlockAssignmentError::SequenceHashMismatch {
                    position: start + i,
                    expected,
                    actual,
                    blocks,
                });
            }
        }

        self.assignments.extend_assigned(blocks)?;
        self.prefix_matched_blocks += count;
        Ok(count)
    }

    /// Allocate mutable blocks from the manager and store as unassigned.
    ///
    /// Returns `false` if allocation fails (insufficient blocks).
    pub fn allocate_blocks(&mut self, count: usize, manager: &BlockManager<T>) -> bool {
        if count == 0 {
            return true;
        }
        let Some(new_blocks) = manager.allocate_blocks(count) else {
            return false;
        };
        self.assignments.extend_blocks(new_blocks).is_ok()
    }

    /// Stage all unassigned blocks that have corresponding completed token
    /// data in the sequence, without registering them.
    ///
    /// Moves unassigned `MutableBlock`s → `CompleteBlock`s (staged). Staged
    /// blocks are not yet visible to `match_blocks()` — call
    /// [`register_staged`](Self::register_staged) after the GPU has computed
    /// their KV data.
    pub fn stage_pending(&mut self) {
        let start = self.assignments.assigned_count() + self.assignments.staged_count();
        let completed = self.sequence.blocks().len();
        if start < completed {
            let blocks_slice = &self.sequence.blocks()[start..completed];
            self.assignments
                .stage(blocks_slice)
                .expect("staging should not fail (block sizes and counts match)");
        }
    }

    /// Register all staged blocks with the block manager.
    ///
    /// Moves staged `CompleteBlock`s → `ImmutableBlock`s (assigned). After
    /// registration, blocks become visible to `match_blocks()` for prefix
    /// reuse by future requests.
    ///
    /// Returns the number of blocks registered.
    pub fn register_staged(&mut self, manager: &BlockManager<T>) -> usize {
        self.assignments.register(manager)
    }

    /// Stage and register all unassigned blocks that have corresponding
    /// completed token data in the sequence.
    ///
    /// Computes the offset from `assigned_count + staged_count` and stages
    /// all completed token blocks beyond that offset. This converts
    /// unassigned `MutableBlock`s → `CompleteBlock`s → `ImmutableBlock`s.
    ///
    /// A generation block (not yet filled) remains unassigned because it has
    /// no corresponding entry in `sequence.blocks()`.
    pub fn complete_and_register_pending(&mut self, manager: &BlockManager<T>) {
        self.stage_pending();
        self.register_staged(manager);
    }

    // =====================================================================
    // Token-only append (no block lifecycle)
    // =====================================================================

    /// Append a generated token to the sequence. Increments `generated_tokens`.
    ///
    /// Returns `Some(block_index)` if a block boundary was crossed (the block
    /// at that index is now complete), `None` otherwise.
    ///
    /// Does **not** stage, register, or allocate — the caller handles block
    /// lifecycle via [`complete_and_register_pending`] and [`allocate_blocks`].
    ///
    /// [`complete_and_register_pending`]: Self::complete_and_register_pending
    /// [`allocate_blocks`]: Self::allocate_blocks
    ///
    /// # Panics
    ///
    /// Panics if `generated_tokens >= max_output_tokens`.
    pub fn append_token(&mut self, token: Token) -> Option<usize> {
        assert!(
            self.generated_tokens < self.max_output_tokens,
            "Cannot generate more tokens: reached max_output_tokens limit"
        );

        let completed_block = self
            .sequence
            .append_token(token)
            .expect("Token append failed");

        self.generated_tokens += 1;
        completed_block
    }

    /// Whether `generated_tokens >= max_output_tokens`.
    pub fn is_complete(&self) -> bool {
        self.generated_tokens >= self.max_output_tokens
    }

    // =====================================================================
    // Release / reacquire
    // =====================================================================

    /// Releases all block assignments (RAII returns them to pools).
    pub fn release(&mut self) {
        self.assignments.clear();
    }

    /// Re-acquires blocks from the manager after a release/preemption.
    ///
    /// Uses the sequence's current token state (input + generated) to
    /// match prefix blocks from pools and allocate the remainder.
    ///
    /// Returns `true` if all blocks were successfully acquired.
    pub fn reacquire(&mut self, manager: &BlockManager<T>) -> bool {
        assert!(
            self.assignments.is_empty(),
            "reacquire called with existing assignments"
        );

        let completed_blocks = self.sequence.blocks().len();

        // Step 1: Prefix match
        let hashes = self.sequence.all_sequence_hashes();
        let matched = manager.match_blocks(&hashes);
        let matched_count = matched.len();

        if !matched.is_empty() && self.assignments.extend_assigned(matched).is_err() {
            self.assignments.clear();
            return false;
        }

        // Step 2: Allocate remaining complete blocks (gen block allocated by schedule_decode)
        let remaining_complete = completed_blocks - matched_count;
        let total = remaining_complete;

        if total > 0 {
            let Some(new_blocks) = manager.allocate_blocks(total) else {
                self.assignments.clear();
                return false;
            };
            if self.assignments.extend_blocks(new_blocks).is_err() {
                self.assignments.clear();
                return false;
            }
        }

        // Step 3: Stage and register remaining complete blocks
        if remaining_complete > 0 {
            let blocks_slice = &self.sequence.blocks()[matched_count..completed_blocks];
            if self.assignments.stage(blocks_slice).is_err() {
                self.assignments.clear();
                return false;
            }
            self.assignments.register(manager);
        }

        self.prefix_matched_blocks = matched_count;
        true
    }

    // =====================================================================
    // Accessors
    // =====================================================================

    /// Number of tokens generated so far.
    pub fn generated_tokens(&self) -> usize {
        self.generated_tokens
    }

    /// Maximum number of output tokens.
    pub fn max_output_tokens(&self) -> usize {
        self.max_output_tokens
    }

    /// Number of input tokens the sequence was created with.
    pub fn num_input_tokens(&self) -> usize {
        self.num_input_tokens
    }

    /// Total token count (input + generated).
    pub fn total_tokens(&self) -> usize {
        self.sequence.total_tokens()
    }

    /// Number of tokens remaining to be generated.
    pub fn remaining_tokens(&self) -> usize {
        self.max_output_tokens.saturating_sub(self.generated_tokens)
    }

    /// Number of completed blocks in the token sequence.
    pub fn num_blocks(&self) -> usize {
        self.sequence.blocks().len()
    }

    /// Number of complete token blocks in the sequence.
    /// Alias for `num_blocks()` with a more descriptive name for scheduling.
    pub fn complete_sequence_blocks(&self) -> usize {
        self.sequence.blocks().len()
    }

    /// Number of blocks currently assigned (registered or cache-matched).
    pub fn assigned_blocks(&self) -> usize {
        self.assignments.assigned_count()
    }

    /// Number of blocks currently staged (completed but not registered).
    pub fn staged_blocks(&self) -> usize {
        self.assignments.staged_count()
    }

    /// Number of unassigned blocks (the generation block, if any).
    pub fn unassigned_blocks(&self) -> usize {
        self.assignments.unassigned_count()
    }

    /// Number of blocks that were prefix-matched during construction or reacquire.
    pub fn prefix_matched_blocks(&self) -> usize {
        self.prefix_matched_blocks
    }

    /// Number of new (non-cached) tokens for prefill cost calculation.
    pub fn new_tokens_for_prefill(&self) -> usize {
        let cached_tokens = self.prefix_matched_blocks * self.sequence.block_size();
        self.total_tokens().saturating_sub(cached_tokens)
    }

    /// Reference to the underlying `BlockSequence`.
    pub fn sequence(&self) -> &BlockSequence {
        &self.sequence
    }

    /// Reference to the underlying `LogicalBlockAssignments`.
    pub fn assignments(&self) -> &LogicalBlockAssignments<T> {
        &self.assignments
    }

    /// Block size used by this sequence.
    pub fn block_size(&self) -> usize {
        self.sequence.block_size()
    }

    /// All block IDs in order: assigned ++ staged ++ unassigned.
    ///
    /// Block IDs identity-map to page indices in the GPU page pool.
    pub fn page_indices(&self) -> Vec<u32> {
        self.assignments
            .all_block_ids()
            .map(|&id| id as u32)
            .collect()
    }

    /// Drop excess unassigned blocks beyond `keep` count.
    /// Returns the number of blocks dropped (RAII returns them to reset pool).
    pub fn drop_excess_unassigned(&mut self, keep: usize) -> usize {
        let mut dropped = 0;
        while self.assignments.unassigned_count() > keep {
            if self.assignments.pop_last_unassigned().is_some() {
                dropped += 1;
            } else {
                break;
            }
        }
        dropped
    }

    // =====================================================================
    // Crate-internal mutation accessors
    // =====================================================================

    /// Mutable access to assignments for higher-level wrappers.
    pub(crate) fn assignments_mut(&mut self) -> &mut LogicalBlockAssignments<T> {
        &mut self.assignments
    }

    /// Mutable access to the underlying `BlockSequence`.
    #[allow(dead_code)]
    pub(crate) fn sequence_mut(&mut self) -> &mut BlockSequence {
        &mut self.sequence
    }

    /// Bulk-increment the generated token counter (for speculative decode).
    #[allow(dead_code)]
    pub(crate) fn add_generated_tokens(&mut self, count: usize) {
        self.generated_tokens += count;
    }
}

impl<T: BlockMetadata> std::fmt::Debug for RequestSequence<T> {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        f.debug_struct("RequestSequence")
            .field("total_tokens", &self.sequence.total_tokens())
            .field("num_blocks", &self.sequence.blocks().len())
            .field("generated_tokens", &self.generated_tokens)
            .field("max_output_tokens", &self.max_output_tokens)
            .field("num_input_tokens", &self.num_input_tokens)
            .field("prefix_matched_blocks", &self.prefix_matched_blocks)
            .field("assigned", &self.assignments.assigned_count())
            .field("staged", &self.assignments.staged_count())
            .field("unassigned", &self.assignments.unassigned_count())
            .finish()
    }
}

#[cfg(test)]
mod tests {
    use super::*;
    use crate::testing::{TestMeta, create_test_manager};

    const BLOCK_SIZE: u32 = 4;

    fn make_tokens(n: usize) -> Vec<Token> {
        (0..n as u32).collect()
    }

    /// Builds a prefilled `RequestSequence` with blocks allocated, staged,
    /// and registered — the same end state as the removed `with_manager()`.
    fn build_prefilled(
        tokens: Vec<Token>,
        max_output_tokens: usize,
        block_size: u32,
        manager: &BlockManager<TestMeta>,
    ) -> Option<RequestSequence<TestMeta>> {
        let mut seq = RequestSequence::new(tokens, max_output_tokens, block_size);
        let completed_blocks = seq.num_blocks();
        let matched_count = seq.match_and_add_prefix(manager).ok()?;
        let remaining_complete = completed_blocks - matched_count;
        let needs_generation = max_output_tokens > 0;
        let total_to_allocate = remaining_complete + usize::from(needs_generation);
        if !seq.allocate_blocks(total_to_allocate, manager) {
            return None;
        }
        seq.complete_and_register_pending(manager);
        Some(seq)
    }

    // =========================================================================
    // Construction
    // =========================================================================

    #[test]
    fn test_new_minimal_constructor() {
        let tokens = make_tokens(8);
        let seq = RequestSequence::<TestMeta>::new(tokens, 10, BLOCK_SIZE);

        assert_eq!(seq.num_input_tokens(), 8);
        assert_eq!(seq.total_tokens(), 8);
        assert_eq!(seq.num_blocks(), 2);
        assert_eq!(seq.generated_tokens(), 0);
        assert_eq!(seq.max_output_tokens(), 10);
        assert_eq!(seq.block_size(), BLOCK_SIZE as usize);

        assert_eq!(seq.assigned_blocks(), 0);
        assert_eq!(seq.staged_blocks(), 0);
        assert_eq!(seq.unassigned_blocks(), 0);
        assert_eq!(seq.prefix_matched_blocks(), 0);
    }

    #[test]
    fn test_build_prefilled_basic() {
        let manager = create_test_manager::<TestMeta>(20);
        let tokens = make_tokens(8); // 2 complete blocks
        let seq = build_prefilled(tokens, 10, BLOCK_SIZE, &manager).unwrap();

        assert_eq!(seq.num_input_tokens(), 8);
        assert_eq!(seq.total_tokens(), 8);
        assert_eq!(seq.num_blocks(), 2);
        assert_eq!(seq.generated_tokens(), 0);
        assert_eq!(seq.max_output_tokens(), 10);

        assert_eq!(seq.assigned_blocks(), 2);
        assert_eq!(seq.staged_blocks(), 0);
        assert_eq!(seq.unassigned_blocks(), 1);
    }

    #[test]
    fn test_build_prefilled_partial_tokens() {
        let manager = create_test_manager::<TestMeta>(20);
        let seq = build_prefilled(make_tokens(6), 10, BLOCK_SIZE, &manager).unwrap();

        assert_eq!(seq.num_blocks(), 1);
        assert_eq!(seq.assigned_blocks(), 1);
        assert_eq!(seq.unassigned_blocks(), 1);
    }

    #[test]
    fn test_build_prefilled_empty_tokens() {
        let manager = create_test_manager::<TestMeta>(20);
        let seq = build_prefilled(vec![], 10, BLOCK_SIZE, &manager).unwrap();

        assert_eq!(seq.num_blocks(), 0);
        assert_eq!(seq.assigned_blocks(), 0);
        assert_eq!(seq.unassigned_blocks(), 1);
    }

    #[test]
    fn test_build_prefilled_zero_max() {
        let manager = create_test_manager::<TestMeta>(20);
        let seq = build_prefilled(make_tokens(8), 0, BLOCK_SIZE, &manager).unwrap();

        assert_eq!(seq.assigned_blocks(), 2);
        assert_eq!(seq.unassigned_blocks(), 0);
    }

    #[test]
    fn test_build_prefilled_allocation_failure() {
        let manager = create_test_manager::<TestMeta>(2);
        let result = build_prefilled(make_tokens(12), 10, BLOCK_SIZE, &manager);
        assert!(result.is_none());
        assert_eq!(manager.available_blocks(), 2);
    }

    // =========================================================================
    // Prefix matching
    // =========================================================================

    #[test]
    fn test_prefix_cache_hit() {
        let manager = create_test_manager::<TestMeta>(20);
        let tokens = make_tokens(8);

        // Populate the manager with blocks for these tokens
        let seq_for_populate = BlockSequence::new(tokens.clone(), BLOCK_SIZE, None);
        let mutables = manager.allocate_blocks(2).unwrap();
        let registered: Vec<_> = mutables
            .into_iter()
            .zip(seq_for_populate.blocks().iter())
            .map(|(m, tb)| manager.register_block(m.complete(tb).unwrap()))
            .collect();
        drop(registered);

        let seq = build_prefilled(tokens, 10, BLOCK_SIZE, &manager).unwrap();
        assert_eq!(seq.prefix_matched_blocks(), 2);
    }

    #[test]
    fn test_partial_prefix_cache_hit() {
        let manager = create_test_manager::<TestMeta>(20);
        let tokens = make_tokens(12);

        let seq_for_populate = BlockSequence::new(tokens[..4].to_vec(), BLOCK_SIZE, None);
        let mutables = manager.allocate_blocks(1).unwrap();
        let registered: Vec<_> = mutables
            .into_iter()
            .zip(seq_for_populate.blocks().iter())
            .map(|(m, tb)| manager.register_block(m.complete(tb).unwrap()))
            .collect();
        drop(registered);

        let seq = build_prefilled(tokens, 10, BLOCK_SIZE, &manager).unwrap();
        assert_eq!(seq.prefix_matched_blocks(), 1);
        assert_eq!(seq.assigned_blocks(), 3);
        assert_eq!(seq.unassigned_blocks(), 1);
    }

    #[test]
    #[should_panic(expected = "matched blocks exceed completed sequence blocks")]
    fn test_add_matched_blocks_panics_when_matched_exceeds_completed() {
        let manager = create_test_manager::<TestMeta>(20);
        let mut seq = RequestSequence::<TestMeta>::new(make_tokens(4), 10, BLOCK_SIZE);

        let source = BlockSequence::new(make_tokens(8), BLOCK_SIZE, None);
        let mutables = manager.allocate_blocks(2).unwrap();
        let matched: Vec<_> = mutables
            .into_iter()
            .zip(source.blocks().iter())
            .map(|(m, tb)| manager.register_block(m.complete(tb).unwrap()))
            .collect();

        let _ = seq.add_matched_blocks(matched);
    }

    #[test]
    fn test_add_matched_blocks_returns_error_on_hash_mismatch() {
        let manager = create_test_manager::<TestMeta>(20);
        let mut seq = RequestSequence::<TestMeta>::new(make_tokens(4), 10, BLOCK_SIZE);

        let source = BlockSequence::new(vec![100, 101, 102, 103], BLOCK_SIZE, None);
        let mutable = manager
            .allocate_blocks(1)
            .unwrap()
            .into_iter()
            .next()
            .unwrap();
        let mismatched = manager.register_block(mutable.complete(&source.blocks()[0]).unwrap());

        let result = seq.add_matched_blocks(vec![mismatched]);
        assert!(result.is_err());
        match result.unwrap_err() {
            LogicalBlockAssignmentError::SequenceHashMismatch {
                position, blocks, ..
            } => {
                assert_eq!(position, 0);
                assert_eq!(blocks.len(), 1);
            }
            other => panic!("expected SequenceHashMismatch, got: {other:?}"),
        }
    }

    #[test]
    fn test_new_tokens_for_prefill() {
        let manager = create_test_manager::<TestMeta>(20);
        let tokens = make_tokens(12);

        let seq_for_populate = BlockSequence::new(tokens[..4].to_vec(), BLOCK_SIZE, None);
        let mutables = manager.allocate_blocks(1).unwrap();
        let registered: Vec<_> = mutables
            .into_iter()
            .zip(seq_for_populate.blocks().iter())
            .map(|(m, tb)| manager.register_block(m.complete(tb).unwrap()))
            .collect();
        drop(registered);

        let seq = build_prefilled(tokens, 10, BLOCK_SIZE, &manager).unwrap();
        assert_eq!(seq.prefix_matched_blocks(), 1);
        assert_eq!(seq.new_tokens_for_prefill(), 8);
    }

    // =========================================================================
    // Token append (individual ops)
    // =========================================================================

    #[test]
    fn test_append_token_no_boundary() {
        let manager = create_test_manager::<TestMeta>(20);
        let mut seq = build_prefilled(make_tokens(5), 10, BLOCK_SIZE, &manager).unwrap();

        // 5 tokens = 1 complete + 1 partial (1 token). Append 1 → 2 partial tokens, no boundary.
        assert!(seq.append_token(100).is_none());
        assert_eq!(seq.generated_tokens(), 1);
        assert_eq!(seq.total_tokens(), 6);
    }

    #[test]
    fn test_append_token_crosses_boundary() {
        let manager = create_test_manager::<TestMeta>(20);
        let mut seq = build_prefilled(make_tokens(7), 10, BLOCK_SIZE, &manager).unwrap();

        // 7 tokens = 1 complete + 3 partial. 1 more completes block 1.
        let block_idx = seq.append_token(100);
        assert!(block_idx.is_some());
        assert_eq!(seq.num_blocks(), 2);
    }

    #[test]
    #[should_panic(expected = "Cannot generate more tokens")]
    fn test_append_token_panics_after_max() {
        let manager = create_test_manager::<TestMeta>(20);
        let mut seq = build_prefilled(make_tokens(4), 1, BLOCK_SIZE, &manager).unwrap();

        seq.append_token(100); // generated_tokens == 1 == max
        seq.append_token(101); // panics
    }

    #[test]
    fn test_is_complete_transitions() {
        let manager = create_test_manager::<TestMeta>(20);
        let mut seq = build_prefilled(make_tokens(4), 3, BLOCK_SIZE, &manager).unwrap();

        assert!(!seq.is_complete());
        seq.append_token(100);
        assert!(!seq.is_complete());
        seq.append_token(101);
        assert!(!seq.is_complete());
        seq.append_token(102);
        assert!(seq.is_complete());
    }

    #[test]
    fn test_is_complete_zero_max() {
        let seq = RequestSequence::<TestMeta>::new(make_tokens(4), 0, BLOCK_SIZE);
        assert!(seq.is_complete());
    }

    // =========================================================================
    // Modular decode loop
    // =========================================================================

    #[test]
    fn test_modular_decode_loop() {
        let manager = create_test_manager::<TestMeta>(20);
        let mut seq = build_prefilled(make_tokens(4), 8, BLOCK_SIZE, &manager).unwrap();

        // Generate 4 tokens → complete a block
        for i in 0..3 {
            assert!(seq.append_token(100 + i).is_none());
        }
        let block_idx = seq.append_token(103);
        assert!(block_idx.is_some());
        assert!(!seq.is_complete());

        seq.complete_and_register_pending(&manager);
        assert_eq!(seq.assigned_blocks(), 2);
        assert_eq!(seq.unassigned_blocks(), 0);
        assert!(seq.allocate_blocks(1, &manager));
        assert_eq!(seq.unassigned_blocks(), 1);

        // Generate 4 more → complete + max
        for i in 0..3 {
            assert!(seq.append_token(200 + i).is_none());
        }
        assert!(seq.append_token(203).is_some());
        assert!(seq.is_complete());

        seq.complete_and_register_pending(&manager);
        assert_eq!(seq.assigned_blocks(), 3);
        seq.release();
        assert_eq!(seq.assigned_blocks(), 0);
    }

    #[test]
    fn test_modular_prefill_with_cache() {
        let manager = create_test_manager::<TestMeta>(20);
        let tokens = make_tokens(8);

        // Populate cache
        let seq_for_populate = BlockSequence::new(tokens[..4].to_vec(), BLOCK_SIZE, None);
        let mutables = manager.allocate_blocks(1).unwrap();
        let registered: Vec<_> = mutables
            .into_iter()
            .zip(seq_for_populate.blocks().iter())
            .map(|(m, tb)| manager.register_block(m.complete(tb).unwrap()))
            .collect();
        drop(registered);

        let mut seq = RequestSequence::<TestMeta>::new(tokens, 10, BLOCK_SIZE);
        let matched_count = seq.match_and_add_prefix(&manager).unwrap();
        assert_eq!(matched_count, 1);
        assert_eq!(seq.prefix_matched_blocks(), 1);

        let remaining = seq.num_blocks() - matched_count;
        assert!(seq.allocate_blocks(remaining + 1, &manager));
        seq.complete_and_register_pending(&manager);

        assert_eq!(seq.assigned_blocks(), 2);
        assert_eq!(seq.unassigned_blocks(), 1);
    }

    // =========================================================================
    // Allocate blocks
    // =========================================================================

    #[test]
    fn test_allocate_blocks_failure() {
        let manager = create_test_manager::<TestMeta>(2);
        let mut seq = RequestSequence::<TestMeta>::new(make_tokens(4), 10, BLOCK_SIZE);

        assert!(!seq.allocate_blocks(3, &manager));
        assert!(seq.allocate_blocks(2, &manager));
        assert_eq!(seq.unassigned_blocks(), 2);
    }

    #[test]
    fn test_allocate_blocks_zero() {
        let manager = create_test_manager::<TestMeta>(2);
        let mut seq = RequestSequence::<TestMeta>::new(make_tokens(4), 10, BLOCK_SIZE);

        assert!(seq.allocate_blocks(0, &manager));
        assert_eq!(seq.unassigned_blocks(), 0);
    }

    // =========================================================================
    // Release / reacquire
    // =========================================================================

    #[test]
    fn test_release() {
        let manager = create_test_manager::<TestMeta>(20);
        let mut seq = build_prefilled(make_tokens(8), 10, BLOCK_SIZE, &manager).unwrap();

        assert_eq!(seq.assigned_blocks(), 2);
        assert_eq!(seq.unassigned_blocks(), 1);
        let available_before = manager.available_blocks();

        seq.release();

        assert_eq!(seq.assigned_blocks(), 0);
        assert_eq!(seq.staged_blocks(), 0);
        assert_eq!(seq.unassigned_blocks(), 0);
        assert!(manager.available_blocks() > available_before);
    }

    #[test]
    fn test_release_idempotent() {
        let manager = create_test_manager::<TestMeta>(20);
        let mut seq = build_prefilled(make_tokens(8), 10, BLOCK_SIZE, &manager).unwrap();

        seq.release();
        seq.release();
        assert_eq!(seq.assigned_blocks(), 0);
    }

    #[test]
    fn test_release_returns_blocks_to_pools() {
        let manager = create_test_manager::<TestMeta>(20);
        let mut seq = build_prefilled(make_tokens(8), 10, BLOCK_SIZE, &manager).unwrap();

        assert_eq!(manager.available_blocks(), 17);
        seq.release();
        assert_eq!(manager.available_blocks(), 20);
    }

    #[test]
    fn test_reacquire_basic() {
        let manager = create_test_manager::<TestMeta>(20);
        let mut seq = build_prefilled(make_tokens(8), 10, BLOCK_SIZE, &manager).unwrap();

        seq.append_token(100);
        seq.append_token(101);

        seq.release();
        assert!(seq.reacquire(&manager));
        assert_eq!(seq.assigned_blocks(), 2);
        assert_eq!(seq.unassigned_blocks(), 0); // no gen block from reacquire
        assert_eq!(seq.generated_tokens(), 2);
    }

    #[test]
    fn test_reacquire_with_cache_hits() {
        let manager = create_test_manager::<TestMeta>(20);
        let mut seq = build_prefilled(make_tokens(8), 10, BLOCK_SIZE, &manager).unwrap();

        seq.release();
        assert!(seq.reacquire(&manager));
        assert_eq!(seq.prefix_matched_blocks(), 2);
    }

    #[test]
    fn test_reacquire_cleans_up_on_failure() {
        let manager = create_test_manager::<TestMeta>(4);
        let mut seq = build_prefilled(make_tokens(4), 10, BLOCK_SIZE, &manager).unwrap();

        seq.release();
        let _all = manager.allocate_blocks(4).unwrap();

        assert!(!seq.reacquire(&manager));
        assert_eq!(seq.assigned_blocks(), 0);
        assert_eq!(seq.unassigned_blocks(), 0);
    }

    // =========================================================================
    // RAII
    // =========================================================================

    #[test]
    fn test_blocks_returned_on_drop() {
        let manager = create_test_manager::<TestMeta>(20);
        {
            let _seq = build_prefilled(make_tokens(8), 10, BLOCK_SIZE, &manager).unwrap();
            assert_eq!(manager.available_blocks(), 17);
        }
        assert_eq!(manager.available_blocks(), 20);
    }

    // =========================================================================
    // Debug
    // =========================================================================

    #[test]
    fn test_debug_impl() {
        let manager = create_test_manager::<TestMeta>(20);
        let seq = build_prefilled(make_tokens(8), 10, BLOCK_SIZE, &manager).unwrap();

        let debug_str = format!("{seq:?}");
        assert!(debug_str.contains("RequestSequence"));
        assert!(debug_str.contains("total_tokens"));
    }
}