Update snapshot files to standardize messageCursor redaction

- Replaced specific messageCursor values with a placeholder "[message-cursor]" across multiple snapshot files to ensure consistency in test outputs.
- Adjusted the test utility to add redaction for messageCursor, addressing non-deterministic behavior in macOS environments.

rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_all-2.snap

@@ -22,5 +22,5 @@ instances:
     Name: my-new-folder
     Parent: id-2
     Properties: {}
-messageCursor: 1
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_all.snap

@@ -12,5 +12,5 @@ instances:
     Name: add_folder
     Parent: "00000000000000000000000000000000"
     Properties: {}
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all-2.snap

@@ -14,5 +14,5 @@ instances:
     Properties:
       Source:
         "!String": "-- Edited contents"
-messageCursor: 1
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all.snap

@@ -14,5 +14,5 @@ instances:
     Properties:
       Source:
         "!String": "-- Original contents"
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_all.snap

@@ -12,5 +12,5 @@ instances:
     Name: empty
     Parent: "00000000000000000000000000000000"
     Properties: {}
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_json_model_all-2.snap

@@ -24,5 +24,5 @@ instances:
     Properties:
       NeedsPivotMigration:
         "!Bool": false
-messageCursor: 1
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_json_model_all.snap

@@ -1,7 +1,6 @@
 ---
 source: tests/tests/serve.rs
 expression: "read_response.intern_and_redact(&mut redactions, root_id)"
-
 ---
 instances:
   id-2:
@@ -13,6 +12,5 @@ instances:
     Name: empty_folder
     Parent: "00000000000000000000000000000000"
     Properties: {}
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1
-

rojo-test/serve-test-snapshots/end_to_end__tests__serve__forced_parent_all.snap

@@ -12,5 +12,5 @@ instances:
     Name: forced_parent
     Parent: "00000000000000000000000000000000"
     Properties: {}
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__meshpart_with_id_all.snap

@@ -52,5 +52,5 @@ instances:
         "!ContentId": "rbxasset://fonts/sword.mesh"
       TextureID:
         "!ContentId": "rbxasset://textures/SwordTexture.png"
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__model_pivot_migration_all-2.snap

@@ -60,5 +60,5 @@ instances:
     Properties:
       NeedsPivotMigration:
         "!Bool": false
-messageCursor: 1
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_all-2.snap

@@ -142,5 +142,5 @@ instances:
     Properties:
       Value:
         "!String": "File #5"
-messageCursor: 1
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_all.snap

@@ -12,5 +12,5 @@ instances:
     Name: move_folder_of_stuff
     Parent: "00000000000000000000000000000000"
     Properties: {}
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_default_project_all.snap

@@ -34,5 +34,5 @@ instances:
     Properties:
       Value:
         "!Int64": 1337
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_project_all.snap

@@ -34,5 +34,5 @@ instances:
     Properties:
       Value:
         "!Bool": true
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_top_level_project_all-2.snap

@@ -14,5 +14,5 @@ instances:
     Properties:
       Value:
         "!String": "If this isn't named `no_name_top_level_project`, something went wrong!"
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__no_name_top_level_project_all.snap

@@ -14,5 +14,5 @@ instances:
     Properties:
       Value:
         "!String": "If this isn't named `no_name_top_level_project`, something went wrong!"
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__pivot_migration_all.snap

@@ -48,5 +48,5 @@ instances:
     Properties:
       NeedsPivotMigration:
         "!Bool": false
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_all-2.snap

@@ -130,5 +130,5 @@ instances:
     Name: ProjectTarget
     Parent: id-3
     Properties: {}
-messageCursor: 1
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_all.snap

@@ -112,5 +112,5 @@ instances:
     Name: ProjectTarget
     Parent: id-3
     Properties: {}
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_patch_update_all-2.snap

@@ -114,5 +114,5 @@ instances:
     Name: ProjectTarget
     Parent: id-3
     Properties: {}
-messageCursor: 1
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_patch_update_all.snap

@@ -112,5 +112,5 @@ instances:
     Name: ProjectTarget
     Parent: id-3
     Properties: {}
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_all-2.snap

@@ -26,5 +26,5 @@ instances:
         "!Attributes": {}
       Value:
         "!Ref": id-4
-messageCursor: 1
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__ref_properties_remove_all.snap

@@ -38,5 +38,5 @@ instances:
     Properties:
       Attributes:
         "!Attributes": {}
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_all-2.snap

@@ -12,5 +12,5 @@ instances:
     Name: remove_file
     Parent: "00000000000000000000000000000000"
     Properties: {}
-messageCursor: 1
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_all.snap

@@ -24,5 +24,5 @@ instances:
     Properties:
       Value:
         "!String": This file will be removed!
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all-2.snap

@@ -38,5 +38,5 @@ instances:
     Properties:
       Source:
         "!String": Updated foo!
-messageCursor: 1
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all.snap

@@ -38,5 +38,5 @@ instances:
     Properties:
       Source:
         "!String": "-- Hello, from foo!"
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_alone_all.snap

@@ -24,5 +24,5 @@ instances:
     Properties:
       Value:
         "!String": "Hello, world!"
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_complex_all.snap

@@ -76,5 +76,5 @@ instances:
     Properties:
       Value:
         "!String": "Hello, from qux (a .rojo file that's turned into a StringValue)!"
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_no_extension_all.snap

@@ -24,5 +24,5 @@ instances:
     Properties:
       Source:
         "!String": "return {\"This file has no extension but should be a ModuleScript named `no_extension`\"}"
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

rojo-test/serve-test-snapshots/end_to_end__tests__serve__sync_rule_no_name_project_all.snap

@@ -36,5 +36,5 @@ instances:
     Properties:
       Value:
         "!String": "If this isn't named `not_a_project`, something has gone wrong!"
-messageCursor: 0
+messageCursor: "[message-cursor]"
 sessionId: id-1

tests/rojo_test/serve_util.rs

@@ -51,6 +51,10 @@ pub fn run_serve_test(test_name: &str, callback: impl FnOnce(TestServeSession, R
     settings.set_snapshot_path(snapshot_path);
     settings.set_sort_maps(true);
     settings.add_redaction(".serverVersion", "[server-version]");
+    // messageCursor is non-deterministic: on macOS kqueue delivers extra
+    // per-file vnode events that can bump the cursor beyond what the test
+    // expects. The exact cursor value is irrelevant to snapshot correctness.
+    settings.add_redaction(".messageCursor", "[message-cursor]");
     settings.bind(move || callback(session, redactions));
 }
 

tests/tests/two_way_sync.rs

@@ -47,8 +47,11 @@ const STRESS_OP_DELAY_MS: u64 = 250;
 const STRESS_OP_DELAY_MS: u64 = 30;
 
 /// Poll timeout for stress tests that wait for the tree to settle (ms).
+/// macOS kqueue generates per-file vnode events for every rename, and each
+/// event triggers a re-snapshot of the parent directory. Under heavy CI load
+/// (e.g., 5-file simultaneous rename chains), 15s can be insufficient.
 #[cfg(target_os = "macos")]
-const STRESS_POLL_TIMEOUT_MS: u64 = 15000;
+const STRESS_POLL_TIMEOUT_MS: u64 = 30000;
 #[cfg(not(target_os = "macos"))]
 const STRESS_POLL_TIMEOUT_MS: u64 = 5000;