fix(store): scope context frame iteration correctly when using last_id

Author: cablehead

src/store/mod.rs

@@ -522,26 +522,28 @@ impl Store {
     ) -> Box<dyn Iterator<Item = Frame> + '_> {
         match context_id {
             Some(ctx_id) => {
-                let mut start_key = Vec::with_capacity(32);
-                start_key.extend(ctx_id.as_bytes());
-                if let Some(last_id) = last_id {
-                    start_key.extend(last_id.as_bytes());
-                }
-
-                let range = match last_id {
-                    Some(_) => (Bound::Excluded(start_key), Bound::Unbounded),
-                    None => (
-                        Bound::Included(ctx_id.as_bytes().to_vec()),
-                        Bound::Excluded(idx_context_key_range_end(ctx_id)),
-                    ),
+                let start_key = if let Some(last_id) = last_id {
+                    // explicitly combine context_id + last_id
+                    let mut v = Vec::with_capacity(32);
+                    v.extend(ctx_id.as_bytes());
+                    v.extend(last_id.as_bytes());
+                    Bound::Excluded(v)
+                } else {
+                    Bound::Included(ctx_id.as_bytes().to_vec())
                 };
 
-                Box::new(self.idx_context.range(range).filter_map(move |r| {
-                    let (key, _) = r.ok()?;
-                    let frame_id_bytes = &key[16..];
-                    let frame_id = Scru128Id::from_bytes(frame_id_bytes.try_into().ok()?);
-                    self.get(&frame_id)
-                }))
+                let end_key = Bound::Excluded(idx_context_key_range_end(ctx_id));
+
+                Box::new(
+                    self.idx_context
+                        .range((start_key, end_key))
+                        .filter_map(move |r| {
+                            let (key, _) = r.ok()?;
+                            let frame_id_bytes = &key[16..];
+                            let frame_id = Scru128Id::from_bytes(frame_id_bytes.try_into().ok()?);
+                            self.get(&frame_id)
+                        }),
+                )
             }
             None => {
                 let range = match last_id {

src/store/tests.rs

@@ -844,6 +844,53 @@ mod tests_context {
             "No context with last_id failed"
         );
     }
+
+    #[test]
+    fn test_iter_frames_context_scope_with_last_id() {
+        let temp_dir = tempfile::tempdir().unwrap();
+        let store = Store::new(temp_dir.path().to_path_buf());
+
+        // Create two distinct contexts
+        let ctx1 = store
+            .append(Frame::builder("xs.context", ZERO_CONTEXT).build())
+            .unwrap()
+            .id;
+        let ctx2 = store
+            .append(Frame::builder("xs.context", ZERO_CONTEXT).build())
+            .unwrap()
+            .id;
+
+        // Add frames in context 1
+        let ctx1_frame1 = store.append(Frame::builder("test", ctx1).build()).unwrap();
+        let ctx1_frame2 = store.append(Frame::builder("test", ctx1).build()).unwrap();
+
+        // Add frames in context 2
+        let ctx2_frame1 = store.append(Frame::builder("test", ctx2).build()).unwrap();
+        let ctx2_frame2 = store.append(Frame::builder("test", ctx2).build()).unwrap();
+
+        // Attempt to iterate from ctx1_frame1 in ctx1
+        let frames_ctx1: Vec<_> = store
+            .iter_frames(Some(ctx1), Some(&ctx1_frame1.id))
+            .collect();
+
+        // Verify we ONLY get ctx1_frame2
+        assert_eq!(frames_ctx1, vec![ctx1_frame2.clone()]);
+
+        // Attempt to iterate from ctx1_frame1 but incorrectly across contexts
+        let frames_cross_context: Vec<_> = store
+            .iter_frames(Some(ctx1), Some(&ctx1_frame2.id))
+            .collect();
+
+        // This should yield NO frames, as ctx1_frame2 is the last in ctx1
+        assert!(
+            frames_cross_context.is_empty(),
+            "Iterator incorrectly traversed beyond context boundary"
+        );
+
+        // Additionally, ensure iterating in ctx2 doesn't return frames from ctx1
+        let frames_ctx2: Vec<_> = store.iter_frames(Some(ctx2), None).collect();
+        assert_eq!(frames_ctx2, vec![ctx2_frame1, ctx2_frame2]);
+    }
 }
 
 mod tests_ttl_expire {