name-prop (#1)

Reviewed-on: #1
Co-authored-by: ari <git@astrid.email>
Co-committed-by: ari <git@astrid.email>

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "plugin/Packages/Highlighter"]
 	path = plugin/Packages/Highlighter
 	url = https://github.com/boatbomber/highlighter.git
+[submodule "plugin/Packages/msgpack-luau"]
+	path = plugin/Packages/msgpack-luau
+	url = https://github.com/cipharius/msgpack-luau/

CHANGELOG.md

@@ -30,15 +30,26 @@ Making a new release? Simply add the new header with the version and date undern
 -->
 
 ## Unreleased
+
+* `inf` and `nan` values in properties are now synced ([#1176])
 * Fixed a bug caused by having reference properties (such as `ObjectValue.Value`) that point to an Instance not included in syncback. ([#1179])
 * Implemented support for the "name" property in meta/model JSON files. ([#1187])
 * Fixed instance replacement fallback failing when too many instances needed to be replaced. ([#1192])
+* Added actors and bindable/remote event/function variants to be synced back as JSON files. ([#1199])
 * Fixed a bug where MacOS paths weren't being handled correctly. ([#1201])
+* Fixed a bug where the notification timeout thread would fail to cancel on unmount ([#1211])
+* Added a "Forget" option to the sync reminder notification to avoid being reminded for that place in the future ([#1215])
+* Improves relative path calculation for sourcemap generation to avoid issues with Windows UNC paths. ([#1217])
 
+[#1176]: https://github.com/rojo-rbx/rojo/pull/1176
 [#1179]: https://github.com/rojo-rbx/rojo/pull/1179
 [#1187]: https://github.com/rojo-rbx/rojo/pull/1187
 [#1192]: https://github.com/rojo-rbx/rojo/pull/1192
+[#1199]: https://github.com/rojo-rbx/rojo/pull/1199
 [#1201]: https://github.com/rojo-rbx/rojo/pull/1201
+[#1211]: https://github.com/rojo-rbx/rojo/pull/1211
+[#1215]: https://github.com/rojo-rbx/rojo/pull/1215
+[#1217]: https://github.com/rojo-rbx/rojo/pull/1217
 
 ## [7.7.0-rc.1] (November 27th, 2025)
 

CONTRIBUTING.md

@@ -14,6 +14,7 @@ Code contributions are welcome for features and bugs that have been reported in
 You'll want these tools to work on Rojo:
 
 * Latest stable Rust compiler
+  * Rustfmt and Clippy are used for code formatting and linting.
 * Latest stable [Rojo](https://github.com/rojo-rbx/rojo)
 * [Rokit](https://github.com/rojo-rbx/rokit)
 * [Luau Language Server](https://github.com/JohnnyMorganz/luau-lsp) (Only needed if working on the Studio plugin.)

Cargo.lock

@@ -1520,6 +1520,12 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
+[[package]]
+name = "pathdiff"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.2"
@@ -2068,6 +2074,7 @@ dependencies = [
  "num_cpus",
  "opener",
  "paste",
+ "pathdiff",
  "pretty_assertions",
  "profiling",
  "rayon",
@@ -2078,10 +2085,12 @@ dependencies = [
  "rbx_xml",
  "reqwest",
  "ritz",
+ "rmp-serde",
  "roblox_install",
  "rojo-insta-ext",
  "semver",
  "serde",
+ "serde_bytes",
  "serde_json",
  "serde_yaml",
  "strum",
@@ -2222,6 +2231,16 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde_bytes"
+version = "0.11.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8"
+dependencies = [
+ "serde",
+ "serde_core",
+]
+
 [[package]]
 name = "serde_cbor"
 version = "0.11.2"

Cargo.toml

@@ -100,10 +100,13 @@ clap = { version = "3.2.25", features = ["derive"] }
 profiling = "1.0.15"
 yaml-rust2 = "0.10.3"
 data-encoding = "2.8.0"
+pathdiff = "0.2.3"
 
 blake3 = "1.5.0"
 float-cmp = "0.9.0"
 indexmap = { version = "2.10.0", features = ["serde"] }
+rmp-serde = "1.3.0"
+serde_bytes = "0.11.19"
 
 [target.'cfg(windows)'.dependencies]
 winreg = "0.10.1"
@@ -122,7 +125,7 @@ semver = "1.0.22"
 rojo-insta-ext = { path = "crates/rojo-insta-ext" }
 
 criterion = "0.3.6"
-insta = { version = "1.36.1", features = ["redactions", "yaml"] }
+insta = { version = "1.36.1", features = ["redactions", "yaml", "json"] }
 paste = "1.0.14"
 pretty_assertions = "1.4.0"
 serde_yaml = "0.8.26"

build.rs

@@ -30,6 +30,11 @@ fn snapshot_from_fs_path(path: &Path) -> io::Result<VfsSnapshot> {
                 continue;
             }
 
+            // Ignore images in msgpack-luau because they aren't UTF-8 encoded.
+            if file_name.ends_with(".png") {
+                continue;
+            }
+
             let child_snapshot = snapshot_from_fs_path(&entry.path())?;
             children.push((file_name, child_snapshot));
         }

plugin/http/Response.lua

@@ -1,5 +1,7 @@
 local HttpService = game:GetService("HttpService")
 
+local msgpack = require(script.Parent.Parent.msgpack)
+
 local stringTemplate = [[
 Http.Response {
 	code: %d
@@ -31,4 +33,8 @@ function Response:json()
 	return HttpService:JSONDecode(self.body)
 end
 
+function Response:msgpack()
+	return msgpack.decode(self.body)
+end
+
 return Response

plugin/http/init.lua

@@ -1,7 +1,8 @@
 local HttpService = game:GetService("HttpService")
 
-local Promise = require(script.Parent.Promise)
 local Log = require(script.Parent.Log)
+local msgpack = require(script.Parent.msgpack)
+local Promise = require(script.Parent.Promise)
 
 local HttpError = require(script.Error)
 local HttpResponse = require(script.Response)
@@ -68,4 +69,12 @@ function Http.jsonDecode(source)
 	return HttpService:JSONDecode(source)
 end
 
+function Http.msgpackEncode(object)
+	return msgpack.encode(object)
+end
+
+function Http.msgpackDecode(source)
+	return msgpack.decode(source)
+end
+
 return Http

plugin/src/ApiContext.lua

@@ -145,7 +145,7 @@ function ApiContext:connect()
 
 	return Http.get(url)
 		:andThen(rejectFailedRequests)
-		:andThen(Http.Response.json)
+		:andThen(Http.Response.msgpack)
 		:andThen(rejectWrongProtocolVersion)
 		:andThen(function(body)
 			assert(validateApiInfo(body))
@@ -163,7 +163,7 @@ end
 function ApiContext:read(ids)
 	local url = ("%s/api/read/%s"):format(self.__baseUrl, table.concat(ids, ","))
 
-	return Http.get(url):andThen(rejectFailedRequests):andThen(Http.Response.json):andThen(function(body)
+	return Http.get(url):andThen(rejectFailedRequests):andThen(Http.Response.msgpack):andThen(function(body)
 		if body.sessionId ~= self.__sessionId then
 			return Promise.reject("Server changed ID")
 		end
@@ -191,9 +191,9 @@ function ApiContext:write(patch)
 		table.insert(updated, fixedUpdate)
 	end
 
-	-- Only add the 'added' field if the table is non-empty, or else Roblox's
-	-- JSON implementation will turn the table into an array instead of an
-	-- object, causing API validation to fail.
+	-- Only add the 'added' field if the table is non-empty, or else the msgpack
+	-- encode implementation will turn the table into an array instead of a map,
+	-- causing API validation to fail.
 	local added
 	if next(patch.added) ~= nil then
 		added = patch.added
@@ -206,13 +206,16 @@ function ApiContext:write(patch)
 		added = added,
 	}
 
-	body = Http.jsonEncode(body)
+	body = Http.msgpackEncode(body)
 
-	return Http.post(url, body):andThen(rejectFailedRequests):andThen(Http.Response.json):andThen(function(responseBody)
-		Log.info("Write response: {:?}", responseBody)
+	return Http.post(url, body)
+		:andThen(rejectFailedRequests)
+		:andThen(Http.Response.msgpack)
+		:andThen(function(responseBody)
+			Log.info("Write response: {:?}", responseBody)
 
-		return responseBody
-	end)
+			return responseBody
+		end)
 end
 
 function ApiContext:connectWebSocket(packetHandlers)
@@ -234,7 +237,7 @@ function ApiContext:connectWebSocket(packetHandlers)
 		local closed, errored, received
 
 		received = self.__wsClient.MessageReceived:Connect(function(msg)
-			local data = Http.jsonDecode(msg)
+			local data = Http.msgpackDecode(msg)
 			if data.sessionId ~= self.__sessionId then
 				Log.warn("Received message with wrong session ID; ignoring")
 				return
@@ -280,7 +283,7 @@ end
 function ApiContext:open(id)
 	local url = ("%s/api/open/%s"):format(self.__baseUrl, id)
 
-	return Http.post(url, ""):andThen(rejectFailedRequests):andThen(Http.Response.json):andThen(function(body)
+	return Http.post(url, ""):andThen(rejectFailedRequests):andThen(Http.Response.msgpack):andThen(function(body)
 		if body.sessionId ~= self.__sessionId then
 			return Promise.reject("Server changed ID")
 		end
@@ -291,11 +294,11 @@ end
 
 function ApiContext:serialize(ids: { string })
 	local url = ("%s/api/serialize"):format(self.__baseUrl)
-	local request_body = Http.jsonEncode({ sessionId = self.__sessionId, ids = ids })
+	local request_body = Http.msgpackEncode({ sessionId = self.__sessionId, ids = ids })
 
 	return Http.post(url, request_body)
 		:andThen(rejectFailedRequests)
-		:andThen(Http.Response.json)
+		:andThen(Http.Response.msgpack)
 		:andThen(function(response_body)
 			if response_body.sessionId ~= self.__sessionId then
 				return Promise.reject("Server changed ID")
@@ -309,11 +312,11 @@ end
 
 function ApiContext:refPatch(ids: { string })
 	local url = ("%s/api/ref-patch"):format(self.__baseUrl)
-	local request_body = Http.jsonEncode({ sessionId = self.__sessionId, ids = ids })
+	local request_body = Http.msgpackEncode({ sessionId = self.__sessionId, ids = ids })
 
 	return Http.post(url, request_body)
 		:andThen(rejectFailedRequests)
-		:andThen(Http.Response.json)
+		:andThen(Http.Response.msgpack)
 		:andThen(function(response_body)
 			if response_body.sessionId ~= self.__sessionId then
 				return Promise.reject("Server changed ID")

plugin/src/App/Components/Notifications/FullscreenNotification.lua

@@ -19,9 +19,15 @@ local FullscreenNotification = Roact.Component:extend("FullscreeFullscreenNotifi
 function FullscreenNotification:init()
 	self.transparency, self.setTransparency = Roact.createBinding(0)
 	self.lifetime = self.props.timeout
+	self.dismissed = false
 end
 
 function FullscreenNotification:dismiss()
+	if self.dismissed then
+		return
+	end
+	self.dismissed = true
+
 	if self.props.onClose then
 		self.props.onClose()
 	end
@@ -59,7 +65,7 @@ function FullscreenNotification:didMount()
 end
 
 function FullscreenNotification:willUnmount()
-	if self.timeout and coroutine.status(self.timeout) ~= "dead" then
+	if self.timeout and coroutine.status(self.timeout) == "suspended" then
 		task.cancel(self.timeout)
 	end
 end

plugin/src/App/Components/Notifications/Notification.lua

@@ -25,6 +25,7 @@ function Notification:init()
 	self.binding = bindingUtil.fromMotor(self.motor)
 
 	self.lifetime = self.props.timeout
+	self.dismissed = false
 
 	self.motor:onStep(function(value)
 		if value <= 0 and self.props.onClose then
@@ -34,6 +35,11 @@ function Notification:init()
 end
 
 function Notification:dismiss()
+	if self.dismissed then
+		return
+	end
+	self.dismissed = true
+
 	self.motor:setGoal(Flipper.Spring.new(0, {
 		frequency = 5,
 		dampingRatio = 1,
@@ -75,7 +81,7 @@ function Notification:didMount()
 end
 
 function Notification:willUnmount()
-	if self.timeout and coroutine.status(self.timeout) ~= "dead" then
+	if self.timeout and coroutine.status(self.timeout) == "suspended" then
 		task.cancel(self.timeout)
 	end
 end

plugin/src/App/init.lua

@@ -301,6 +301,19 @@ function App:setPriorSyncInfo(host: string, port: string, projectName: string)
 	Settings:set("priorEndpoints", priorSyncInfos)
 end
 
+function App:forgetPriorSyncInfo()
+	local priorSyncInfos = Settings:get("priorEndpoints")
+	if not priorSyncInfos then
+		priorSyncInfos = {}
+	end
+
+	local id = tostring(game.PlaceId)
+	priorSyncInfos[id] = nil
+	Log.trace("Erased last used endpoint for {}", game.PlaceId)
+
+	Settings:set("priorEndpoints", priorSyncInfos)
+end
+
 function App:getHostAndPort()
 	local host = self.host:getValue()
 	local port = self.port:getValue()
@@ -435,7 +448,8 @@ function App:checkSyncReminder()
 	self:findActiveServer()
 		:andThen(function(serverInfo, host, port)
 			self:sendSyncReminder(
-				`Project '{serverInfo.projectName}' is serving at {host}:{port}.\nWould you like to connect?`
+				`Project '{serverInfo.projectName}' is serving at {host}:{port}.\nWould you like to connect?`,
+				{ "Connect", "Dismiss" }
 			)
 		end)
 		:catch(function()
@@ -446,7 +460,8 @@ function App:checkSyncReminder()
 
 				local timeSinceSync = timeUtil.elapsedToText(os.time() - priorSyncInfo.timestamp)
 				self:sendSyncReminder(
-					`You synced project '{priorSyncInfo.projectName}' to this place {timeSinceSync}.\nDid you mean to run 'rojo serve' and then connect?`
+					`You synced project '{priorSyncInfo.projectName}' to this place {timeSinceSync}.\nDid you mean to run 'rojo serve' and then connect?`,
+					{ "Connect", "Forget", "Dismiss" }
 				)
 			end
 		end)
@@ -486,12 +501,16 @@ function App:stopSyncReminderPolling()
 	end
 end
 
-function App:sendSyncReminder(message: string)
+function App:sendSyncReminder(message: string, shownActions: { string })
 	local syncReminderMode = Settings:get("syncReminderMode")
 	if syncReminderMode == "None" then
 		return
 	end
 
+	local connectIndex = table.find(shownActions, "Connect")
+	local forgetIndex = table.find(shownActions, "Forget")
+	local dismissIndex = table.find(shownActions, "Dismiss")
+
 	self.dismissSyncReminder = self:addNotification({
 		text = message,
 		timeout = 120,
@@ -500,24 +519,39 @@ function App:sendSyncReminder(message: string)
 			self.dismissSyncReminder = nil
 		end,
 		actions = {
-			Connect = {
-				text = "Connect",
-				style = "Solid",
-				layoutOrder = 1,
-				onClick = function()
-					self:startSession()
-				end,
-			},
-			Dismiss = {
-				text = "Dismiss",
-				style = "Bordered",
-				layoutOrder = 2,
-				onClick = function()
-					-- If the user dismisses the reminder,
-					-- then we don't need to remind them again
-					self:stopSyncReminderPolling()
-				end,
-			},
+			Connect = if connectIndex
+				then {
+					text = "Connect",
+					style = "Solid",
+					layoutOrder = connectIndex,
+					onClick = function()
+						self:startSession()
+					end,
+				}
+				else nil,
+			Forget = if forgetIndex
+				then {
+					text = "Forget",
+					style = "Bordered",
+					layoutOrder = forgetIndex,
+					onClick = function()
+						-- The user doesn't want to be reminded again about this sync
+						self:forgetPriorSyncInfo()
+					end,
+				}
+				else nil,
+			Dismiss = if dismissIndex
+				then {
+					text = "Dismiss",
+					style = "Bordered",
+					layoutOrder = dismissIndex,
+					onClick = function()
+						-- If the user dismisses the reminder,
+						-- then we don't need to remind them again
+						self:stopSyncReminderPolling()
+					end,
+				}
+				else nil,
 		},
 	})
 end

plugin/src/Reconciler/diff.lua

@@ -54,6 +54,10 @@ local function trueEquals(a, b): boolean
 		end
 		return true
 
+	-- For NaN, check if both values are not equal to themselves
+	elseif a ~= a and b ~= b then
+		return true
+
 	-- For numbers, compare with epsilon of 0.0001 to avoid floating point inequality
 	elseif typeA == "number" and typeB == "number" then
 		return fuzzyEq(a, b, 0.0001)

rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback-src__ChildWithDuplicates.rbxm.snap

@@ -0,0 +1,73 @@
+---
+source: tests/rojo_test/syncback_util.rs
+expression: src/ChildWithDuplicates.rbxm
+---
+num_types: 1
+num_instances: 3
+chunks:
+  - Inst:
+      type_id: 0
+      type_name: Folder
+      object_format: 0
+      referents:
+        - 0
+        - 1
+        - 2
+  - Prop:
+      type_id: 0
+      prop_name: AttributesSerialize
+      prop_type: String
+      values:
+        - ""
+        - ""
+        - ""
+  - Prop:
+      type_id: 0
+      prop_name: Capabilities
+      prop_type: SecurityCapabilities
+      values:
+        - 0
+        - 0
+        - 0
+  - Prop:
+      type_id: 0
+      prop_name: Name
+      prop_type: String
+      values:
+        - DuplicateChild
+        - DuplicateChild
+        - ChildWithDuplicates
+  - Prop:
+      type_id: 0
+      prop_name: DefinesCapabilities
+      prop_type: Bool
+      values:
+        - false
+        - false
+        - false
+  - Prop:
+      type_id: 0
+      prop_name: SourceAssetId
+      prop_type: Int64
+      values:
+        - -1
+        - -1
+        - -1
+  - Prop:
+      type_id: 0
+      prop_name: Tags
+      prop_type: String
+      values:
+        - ""
+        - ""
+        - ""
+  - Prnt:
+      version: 0
+      links:
+        - - 0
+          - 2
+        - - 1
+          - 2
+        - - 2
+          - -1
+  - End

rojo-test/syncback-test-snapshots/end_to_end__rojo_test__syncback_util__rbxm_fallback-stdout.snap

@@ -1,12 +1,9 @@
 ---
 source: tests/rojo_test/syncback_util.rs
-assertion_line: 101
 expression: "String::from_utf8_lossy(&output.stdout)"
 ---
-Writing src/ChildWithDuplicates/DuplicateChild/.gitkeep
-Writing src/ChildWithDuplicates/DuplicateChild1/.gitkeep
+Writing src/ChildWithDuplicates.rbxm
 Writing src/ChildWithoutDuplicates/Child/.gitkeep
-Writing src/ChildWithDuplicates/DuplicateChild
-Writing src/ChildWithDuplicates/DuplicateChild1
 Writing src/ChildWithoutDuplicates
 Writing src/ChildWithoutDuplicates/Child
+Removing src/ChildWithDuplicates

rojo-test/syncback-test-snapshots/end_to_end__tests__syncback__rbxm_fallback-src__ChildWithDuplicates__DuplicateChild1__.gitkeep.snap

@@ -1,6 +0,0 @@
----
-source: tests/tests/syncback.rs
-assertion_line: 31
-expression: src/ChildWithDuplicates/DuplicateChild1/.gitkeep
----
-

rojo-test/syncback-test-snapshots/end_to_end__tests__syncback__rbxm_fallback-src__ChildWithDuplicates__DuplicateChild__.gitkeep.snap

@@ -1,6 +0,0 @@
----
-source: tests/tests/syncback.rs
-assertion_line: 31
-expression: src/ChildWithDuplicates/DuplicateChild/.gitkeep
----
-

src/cli/snapshots/librojo__cli__sourcemap__test__maps_absolute_paths.snap

@@ -0,0 +1,35 @@
+---
+source: src/cli/sourcemap.rs
+expression: sourcemap_contents
+---
+{
+  "name": "default",
+  "className": "DataModel",
+  "filePaths": "[...1 path omitted...]",
+  "children": [
+    {
+      "name": "ReplicatedStorage",
+      "className": "ReplicatedStorage",
+      "children": [
+        {
+          "name": "Project",
+          "className": "ModuleScript",
+          "filePaths": "[...1 path omitted...]",
+          "children": [
+            {
+              "name": "Module",
+              "className": "Folder",
+              "children": [
+                {
+                  "name": "module",
+                  "className": "ModuleScript",
+                  "filePaths": "[...1 path omitted...]"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

src/cli/snapshots/librojo__cli__sourcemap__test__maps_relative_paths.snap

@@ -0,0 +1,41 @@
+---
+source: src/cli/sourcemap.rs
+expression: sourcemap_contents
+---
+{
+  "name": "default",
+  "className": "DataModel",
+  "filePaths": [
+    "default.project.json"
+  ],
+  "children": [
+    {
+      "name": "ReplicatedStorage",
+      "className": "ReplicatedStorage",
+      "children": [
+        {
+          "name": "Project",
+          "className": "ModuleScript",
+          "filePaths": [
+            "src/init.luau"
+          ],
+          "children": [
+            {
+              "name": "Module",
+              "className": "Folder",
+              "children": [
+                {
+                  "name": "module",
+                  "className": "ModuleScript",
+                  "filePaths": [
+                    "../module/module.luau"
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

src/cli/sourcemap.rs

@@ -10,7 +10,7 @@ use fs_err::File;
 use memofs::Vfs;
 use rayon::prelude::*;
 use rbx_dom_weak::{types::Ref, Ustr};
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use tokio::runtime::Runtime;
 
 use crate::{
@@ -24,19 +24,20 @@ const PATH_STRIP_FAILED_ERR: &str = "Failed to create relative paths for project
 const ABSOLUTE_PATH_FAILED_ERR: &str = "Failed to turn relative path into absolute path!";
 
 /// Representation of a node in the generated sourcemap tree.
-#[derive(Serialize)]
+#[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct SourcemapNode<'a> {
     name: &'a str,
     class_name: Ustr,
 
     #[serde(
+        default,
         skip_serializing_if = "Vec::is_empty",
         serialize_with = "crate::path_serializer::serialize_vec_absolute"
     )]
     file_paths: Vec<Cow<'a, Path>>,
 
-    #[serde(skip_serializing_if = "Vec::is_empty")]
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
     children: Vec<SourcemapNode<'a>>,
 }
 
@@ -70,12 +71,13 @@ pub struct SourcemapCommand {
 
 impl SourcemapCommand {
     pub fn run(self) -> anyhow::Result<()> {
-        let project_path = resolve_path(&self.project);
+        let project_path = fs_err::canonicalize(resolve_path(&self.project))?;
 
-        log::trace!("Constructing in-memory filesystem");
+        log::trace!("Constructing filesystem with StdBackend");
         let vfs = Vfs::new_default();
         vfs.set_watch_enabled(self.watch);
 
+        log::trace!("Setting up session for sourcemap generation");
         let session = ServeSession::new(vfs, project_path)?;
         let mut cursor = session.message_queue().cursor();
 
@@ -87,14 +89,17 @@ impl SourcemapCommand {
 
         // Pre-build a rayon threadpool with a low number of threads to avoid
         // dynamic creation overhead on systems with a high number of cpus.
+        log::trace!("Setting rayon global threadpool");
         rayon::ThreadPoolBuilder::new()
             .num_threads(num_cpus::get().min(6))
             .build_global()
-            .unwrap();
+            .ok();
 
+        log::trace!("Writing initial sourcemap");
         write_sourcemap(&session, self.output.as_deref(), filter, self.absolute)?;
 
         if self.watch {
+            log::trace!("Setting up runtime for watch mode");
             let rt = Runtime::new().unwrap();
 
             loop {
@@ -208,7 +213,7 @@ fn recurse_create_node<'a>(
     } else {
         for val in file_paths {
             output_file_paths.push(Cow::from(
-                val.strip_prefix(project_dir).expect(PATH_STRIP_FAILED_ERR),
+                pathdiff::diff_paths(val, project_dir).expect(PATH_STRIP_FAILED_ERR),
             ));
         }
     };
@@ -250,3 +255,80 @@ fn write_sourcemap(
 
     Ok(())
 }
+
+#[cfg(test)]
+mod test {
+    use crate::cli::sourcemap::SourcemapNode;
+    use crate::cli::SourcemapCommand;
+    use insta::internals::Content;
+    use std::path::Path;
+
+    #[test]
+    fn maps_relative_paths() {
+        let sourcemap_dir = tempfile::tempdir().unwrap();
+        let sourcemap_output = sourcemap_dir.path().join("sourcemap.json");
+        let project_path = fs_err::canonicalize(
+            Path::new(env!("CARGO_MANIFEST_DIR"))
+                .join("test-projects")
+                .join("relative_paths")
+                .join("project"),
+        )
+        .unwrap();
+        let sourcemap_command = SourcemapCommand {
+            project: project_path,
+            output: Some(sourcemap_output.clone()),
+            include_non_scripts: false,
+            watch: false,
+            absolute: false,
+        };
+        assert!(sourcemap_command.run().is_ok());
+
+        let raw_sourcemap_contents = fs_err::read_to_string(sourcemap_output.as_path()).unwrap();
+        let sourcemap_contents =
+            serde_json::from_str::<SourcemapNode>(&raw_sourcemap_contents).unwrap();
+        insta::assert_json_snapshot!(sourcemap_contents);
+    }
+
+    #[test]
+    fn maps_absolute_paths() {
+        let sourcemap_dir = tempfile::tempdir().unwrap();
+        let sourcemap_output = sourcemap_dir.path().join("sourcemap.json");
+        let project_path = fs_err::canonicalize(
+            Path::new(env!("CARGO_MANIFEST_DIR"))
+                .join("test-projects")
+                .join("relative_paths")
+                .join("project"),
+        )
+        .unwrap();
+        let sourcemap_command = SourcemapCommand {
+            project: project_path,
+            output: Some(sourcemap_output.clone()),
+            include_non_scripts: false,
+            watch: false,
+            absolute: true,
+        };
+        assert!(sourcemap_command.run().is_ok());
+
+        let raw_sourcemap_contents = fs_err::read_to_string(sourcemap_output.as_path()).unwrap();
+        let sourcemap_contents =
+            serde_json::from_str::<SourcemapNode>(&raw_sourcemap_contents).unwrap();
+        insta::assert_json_snapshot!(sourcemap_contents, {
+            ".**.filePaths" => insta::dynamic_redaction(|mut value, _path| {
+                let mut paths_count = 0;
+
+                match value {
+                    Content::Seq(ref mut vec) => {
+                        for path in vec.iter().map(|i| i.as_str().unwrap()) {
+                            assert_eq!(fs_err::canonicalize(path).is_ok(), true, "path was not valid");
+                            assert_eq!(Path::new(path).is_absolute(), true, "path was not absolute");
+
+                            paths_count += 1;
+                        }
+                    }
+                    _ => panic!("Expected filePaths to be a sequence"),
+                }
+                format!("[...{} path{} omitted...]", paths_count, if paths_count != 1 { "s" } else { "" } )
+            })
+        });
+    }
+}

src/snapshot/patch_compute.rs

@@ -8,7 +8,7 @@ use rbx_dom_weak::{
     ustr, HashMapExt as _, UstrMap, UstrSet,
 };
 
-use crate::{RojoRef, REF_POINTER_ATTRIBUTE_PREFIX};
+use crate::{variant_eq::variant_eq, RojoRef, REF_POINTER_ATTRIBUTE_PREFIX};
 
 use super::{
     patch::{PatchAdd, PatchSet, PatchUpdate},
@@ -127,7 +127,7 @@ fn compute_property_patches(
 
         match instance.properties().get(&name) {
             Some(instance_value) => {
-                if &snapshot_value != instance_value {
+                if !variant_eq(&snapshot_value, instance_value) {
                     changed_properties.insert(name, Some(snapshot_value));
                 }
             }

src/snapshot_middleware/csv.rs

@@ -109,14 +109,8 @@ pub fn syncback_csv<'sync>(
 
         if !meta.is_empty() {
             let parent = snapshot.path.parent_err()?;
-            let file_name = snapshot
-                .path
-                .file_name()
-                .and_then(|n| n.to_str())
-                .unwrap_or("");
-            let meta_stem = file_name.strip_suffix(".csv").unwrap_or(file_name);
             fs_snapshot.add_file(
-                parent.join(format!("{meta_stem}.meta.json")),
+                parent.join(format!("{}.meta.json", new_inst.name)),
                 serde_json::to_vec_pretty(&meta).context("cannot serialize metadata")?,
             )
         }

src/snapshot_middleware/dir.rs

@@ -8,13 +8,10 @@ use memofs::{DirEntry, Vfs};
 
 use crate::{
     snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot, InstigatingSource},
-    syncback::{
-        extension_for_middleware, hash_instance, FsSnapshot, SyncbackReturn,
-        SyncbackSnapshot,
-    },
+    syncback::{hash_instance, FsSnapshot, SyncbackReturn, SyncbackSnapshot},
 };
 
-use super::{meta_file::DirectoryMetadata, snapshot_from_vfs, Middleware};
+use super::{meta_file::DirectoryMetadata, snapshot_from_vfs};
 
 const EMPTY_DIR_KEEP_NAME: &str = ".gitkeep";
 
@@ -94,22 +91,6 @@ pub fn snapshot_dir_no_meta(
     Ok(Some(snapshot))
 }
 
-/// Splits a filesystem name into (stem, extension) based on middleware type.
-/// For directory middleware, the extension is empty. For file middleware,
-/// the extension comes from `extension_for_middleware`.
-fn split_name_and_ext(name: &str, middleware: Middleware) -> (&str, &str) {
-    if middleware.is_dir() {
-        (name, "")
-    } else {
-        let ext = extension_for_middleware(middleware);
-        if let Some(stem) = name.strip_suffix(&format!(".{ext}")) {
-            (stem, ext)
-        } else {
-            (name, "")
-        }
-    }
-}
-
 pub fn syncback_dir<'sync>(
     snapshot: &SyncbackSnapshot<'sync>,
 ) -> anyhow::Result<SyncbackReturn<'sync>> {
@@ -153,128 +134,65 @@ pub fn syncback_dir_no_meta<'sync>(
     let mut children = Vec::new();
     let mut removed_children = Vec::new();
 
-    // Build the old child map early so it can be used for deduplication below.
-    let mut old_child_map = HashMap::new();
+    // We have to enforce unique child names for the file system.
+    let mut child_names = HashSet::with_capacity(new_inst.children().len());
+    let mut duplicate_set = HashSet::new();
+    for child_ref in new_inst.children() {
+        let child = snapshot.get_new_instance(*child_ref).unwrap();
+        if !child_names.insert(child.name.to_lowercase()) {
+            duplicate_set.insert(child.name.as_str());
+        }
+    }
+    if !duplicate_set.is_empty() {
+        if duplicate_set.len() <= 25 {
+            anyhow::bail!(
+                "Instance has children with duplicate name (case may not exactly match):\n {}",
+                duplicate_set.into_iter().collect::<Vec<&str>>().join(", ")
+            );
+        }
+        anyhow::bail!("Instance has more than 25 children with duplicate names");
+    }
+
     if let Some(old_inst) = snapshot.old_inst() {
+        let mut old_child_map = HashMap::with_capacity(old_inst.children().len());
         for child in old_inst.children() {
             let inst = snapshot.get_old_instance(*child).unwrap();
             old_child_map.insert(inst.name(), inst);
         }
-    }
 
-    // --- Two-pass collision resolution ---
-    //
-    // Pass 1: Collect each child's base filesystem name and old ref, applying
-    // skip conditions. Track which names are used (lowercased) so we can
-    // detect collisions.
-    struct ChildEntry {
-        new_ref: rbx_dom_weak::types::Ref,
-        old_ref: Option<rbx_dom_weak::types::Ref>,
-        base_name: String,
-        middleware: Middleware,
-        skip: bool,
-    }
-
-    let mut entries = Vec::with_capacity(new_inst.children().len());
-    let mut used_names: HashSet<String> = HashSet::with_capacity(new_inst.children().len());
-    let mut collision_indices: Vec<usize> = Vec::new();
-
-    for new_child_ref in new_inst.children() {
-        let new_child = snapshot.get_new_instance(*new_child_ref).unwrap();
-
-        // Determine old_ref and apply skip conditions.
-        let old_child = if snapshot.old_inst().is_some() {
-            old_child_map.remove(new_child.name.as_str())
-        } else {
-            None
-        };
-
-        let mut skip = false;
-        if let Some(ref old) = old_child {
-            if old.metadata().relevant_paths.is_empty() {
-                log::debug!(
-                    "Skipping instance {} because it doesn't exist on the disk",
-                    old.name()
-                );
-                skip = true;
-            } else if matches!(
-                old.metadata().instigating_source,
-                Some(InstigatingSource::ProjectNode { .. })
-            ) {
-                log::debug!(
-                    "Skipping instance {} because it originates in a project file",
-                    old.name()
-                );
-                skip = true;
-            }
-        }
-
-        let old_ref = old_child.as_ref().map(|o| o.id());
-
-        if skip {
-            entries.push(ChildEntry {
-                new_ref: *new_child_ref,
-                old_ref,
-                base_name: String::new(),
-                middleware: Middleware::Dir,
-                skip: true,
-            });
-            continue;
-        }
-
-        let (middleware, base_name) =
-            snapshot.child_middleware_and_name(*new_child_ref, old_ref)?;
-
-        let idx = entries.len();
-        let lower = base_name.to_lowercase();
-        if !used_names.insert(lower) {
-            // Name already claimed — needs resolution.
-            collision_indices.push(idx);
-        }
-
-        entries.push(ChildEntry {
-            new_ref: *new_child_ref,
-            old_ref,
-            base_name,
-            middleware,
-            skip: false,
-        });
-    }
-
-    // Pass 2: Resolve collisions by appending incrementing suffixes.
-    for idx in collision_indices {
-        let entry = &entries[idx];
-        let (stem, ext) = split_name_and_ext(&entry.base_name, entry.middleware);
-        let mut counter = 1u32;
-        loop {
-            let candidate = if ext.is_empty() {
-                format!("{stem}{counter}")
+        for new_child_ref in new_inst.children() {
+            let new_child = snapshot.get_new_instance(*new_child_ref).unwrap();
+            if let Some(old_child) = old_child_map.remove(new_child.name.as_str()) {
+                if old_child.metadata().relevant_paths.is_empty() {
+                    log::debug!(
+                        "Skipping instance {} because it doesn't exist on the disk",
+                        old_child.name()
+                    );
+                    continue;
+                } else if matches!(
+                    old_child.metadata().instigating_source,
+                    Some(InstigatingSource::ProjectNode { .. })
+                ) {
+                    log::debug!(
+                        "Skipping instance {} because it originates in a project file",
+                        old_child.name()
+                    );
+                    continue;
+                }
+                // This child exists in both doms. Pass it on.
+                children.push(snapshot.with_joined_path(*new_child_ref, Some(old_child.id()))?);
             } else {
-                format!("{stem}{counter}.{ext}")
-            };
-            let lower = candidate.to_lowercase();
-            if used_names.insert(lower) {
-                // Safe to mutate — we only visit each collision index once.
-                let entry = &mut entries[idx];
-                entry.base_name = candidate;
-                break;
+                // The child only exists in the the new dom
+                children.push(snapshot.with_joined_path(*new_child_ref, None)?);
             }
-            counter += 1;
         }
-    }
-
-    // Create snapshots from resolved entries.
-    for entry in &entries {
-        if entry.skip {
-            continue;
-        }
-        let resolved_path = snapshot.path.join(&entry.base_name);
-        children.push(snapshot.with_new_path(resolved_path, entry.new_ref, entry.old_ref));
-    }
-
-    // Any children that are in the old dom but not the new one are removed.
-    if snapshot.old_inst().is_some() {
+        // Any children that are in the old dom but not the new one are removed.
         removed_children.extend(old_child_map.into_values());
+    } else {
+        // There is no old instance. Just add every child.
+        for new_child_ref in new_inst.children() {
+            children.push(snapshot.with_joined_path(*new_child_ref, None)?);
+        }
     }
     let mut fs_snapshot = FsSnapshot::new();
 
@@ -307,12 +225,6 @@ pub fn syncback_dir_no_meta<'sync>(
 mod test {
     use super::*;
 
-    use std::path::PathBuf;
-
-    use crate::{
-        snapshot::{InstanceMetadata, InstanceSnapshot},
-        Project, RojoTree, SyncbackData, SyncbackSnapshot,
-    };
     use memofs::{InMemoryFs, VfsSnapshot};
 
     #[test]
@@ -349,302 +261,4 @@ mod test {
 
         insta::assert_yaml_snapshot!(instance_snapshot);
     }
-
-    fn make_project() -> Project {
-        serde_json::from_str(r#"{"tree": {"$className": "DataModel"}}"#).unwrap()
-    }
-
-    fn make_vfs() -> Vfs {
-        let mut imfs = InMemoryFs::new();
-        imfs.load_snapshot("/root", VfsSnapshot::empty_dir()).unwrap();
-        Vfs::new(imfs)
-    }
-
-    /// Two children whose Roblox names are identical when lowercased ("Alpha"
-    /// and "alpha") but live at different filesystem paths because of the
-    /// `name` property ("Beta/" and "Alpha/" respectively). The dedup check
-    /// must use the actual filesystem paths, not the raw Roblox names, to
-    /// avoid a false-positive duplicate error.
-    #[test]
-    fn syncback_no_false_duplicate_with_name_prop() {
-        use rbx_dom_weak::{InstanceBuilder, WeakDom};
-
-        // Old child A: Roblox name "Alpha", on disk at "/root/Beta"
-        //   (name property maps "Alpha" → "Beta" on the filesystem)
-        let old_child_a = InstanceSnapshot::new()
-            .name("Alpha")
-            .class_name("Folder")
-            .metadata(
-                InstanceMetadata::new()
-                    .instigating_source(PathBuf::from("/root/Beta"))
-                    .relevant_paths(vec![PathBuf::from("/root/Beta")]),
-            );
-        // Old child B: Roblox name "alpha", on disk at "/root/Alpha"
-        let old_child_b = InstanceSnapshot::new()
-            .name("alpha")
-            .class_name("Folder")
-            .metadata(
-                InstanceMetadata::new()
-                    .instigating_source(PathBuf::from("/root/Alpha"))
-                    .relevant_paths(vec![PathBuf::from("/root/Alpha")]),
-            );
-        let old_parent = InstanceSnapshot::new()
-            .name("Parent")
-            .class_name("Folder")
-            .children(vec![old_child_a, old_child_b])
-            .metadata(
-                InstanceMetadata::new()
-                    .instigating_source(PathBuf::from("/root"))
-                    .relevant_paths(vec![PathBuf::from("/root")]),
-            );
-        let old_tree = RojoTree::new(old_parent);
-
-        // New state: same two children in Roblox.
-        let mut new_tree = WeakDom::new(InstanceBuilder::new("ROOT"));
-        let new_parent = new_tree.insert(
-            new_tree.root_ref(),
-            InstanceBuilder::new("Folder").with_name("Parent"),
-        );
-        new_tree.insert(new_parent, InstanceBuilder::new("Folder").with_name("Alpha"));
-        new_tree.insert(new_parent, InstanceBuilder::new("Folder").with_name("alpha"));
-
-        let vfs = make_vfs();
-        let project = make_project();
-        let data = SyncbackData::for_test(&vfs, &old_tree, &new_tree, &project);
-        let snapshot = SyncbackSnapshot {
-            data,
-            old: Some(old_tree.get_root_id()),
-            new: new_parent,
-            path: PathBuf::from("/root"),
-            middleware: None,
-        };
-
-        let result = syncback_dir_no_meta(&snapshot);
-        assert!(
-            result.is_ok(),
-            "should not error when two children have the same lowercased Roblox \
-             name but map to distinct filesystem paths: {:?}",
-            result.as_ref().err(),
-        );
-    }
-
-    /// Two completely new children with the same name get resolved via
-    /// incrementing suffixes instead of erroring.
-    #[test]
-    fn syncback_resolves_sibling_duplicate_names() {
-        use rbx_dom_weak::{InstanceBuilder, WeakDom};
-
-        let old_parent = InstanceSnapshot::new()
-            .name("Parent")
-            .class_name("Folder")
-            .metadata(
-                InstanceMetadata::new()
-                    .instigating_source(PathBuf::from("/root"))
-                    .relevant_paths(vec![PathBuf::from("/root")]),
-            );
-        let old_tree = RojoTree::new(old_parent);
-
-        let mut new_tree = WeakDom::new(InstanceBuilder::new("ROOT"));
-        let new_parent = new_tree.insert(
-            new_tree.root_ref(),
-            InstanceBuilder::new("Folder").with_name("Parent"),
-        );
-        new_tree.insert(new_parent, InstanceBuilder::new("Folder").with_name("Foo"));
-        new_tree.insert(new_parent, InstanceBuilder::new("Folder").with_name("Foo"));
-
-        let vfs = make_vfs();
-        let project = make_project();
-        let data = SyncbackData::for_test(&vfs, &old_tree, &new_tree, &project);
-        let snapshot = SyncbackSnapshot {
-            data,
-            old: Some(old_tree.get_root_id()),
-            new: new_parent,
-            path: PathBuf::from("/root"),
-            middleware: None,
-        };
-
-        let result = syncback_dir_no_meta(&snapshot);
-        assert!(
-            result.is_ok(),
-            "should resolve duplicate names with suffixes, not error: {:?}",
-            result.as_ref().err(),
-        );
-        let children = result.unwrap().children;
-        let mut names: Vec<String> = children
-            .iter()
-            .map(|c| c.path.file_name().unwrap().to_string_lossy().into_owned())
-            .collect();
-        names.sort();
-        assert_eq!(names, vec!["Foo", "Foo1"]);
-    }
-
-    /// A new child named "Init" (as a ModuleScript) would naively become
-    /// "Init.luau", which case-insensitively matches the parent's reserved
-    /// "init.luau". Syncback must resolve this automatically by prefixing the
-    /// filesystem name with '_' (→ "_Init.luau") rather than erroring.
-    #[test]
-    fn syncback_resolves_init_name_conflict() {
-        use rbx_dom_weak::{InstanceBuilder, WeakDom};
-
-        let old_parent = InstanceSnapshot::new()
-            .name("Parent")
-            .class_name("Folder")
-            .metadata(
-                InstanceMetadata::new()
-                    .instigating_source(PathBuf::from("/root"))
-                    .relevant_paths(vec![PathBuf::from("/root")]),
-            );
-        let old_tree = RojoTree::new(old_parent);
-
-        let mut new_tree = WeakDom::new(InstanceBuilder::new("ROOT"));
-        let new_parent = new_tree.insert(
-            new_tree.root_ref(),
-            InstanceBuilder::new("Folder").with_name("Parent"),
-        );
-        new_tree.insert(
-            new_parent,
-            InstanceBuilder::new("ModuleScript").with_name("Init"),
-        );
-
-        let vfs = make_vfs();
-        let project = make_project();
-        let data = SyncbackData::for_test(&vfs, &old_tree, &new_tree, &project);
-        let snapshot = SyncbackSnapshot {
-            data,
-            old: Some(old_tree.get_root_id()),
-            new: new_parent,
-            path: PathBuf::from("/root"),
-            middleware: None,
-        };
-
-        let result = syncback_dir_no_meta(&snapshot);
-        assert!(
-            result.is_ok(),
-            "should resolve init-name conflict by prefixing '_', not error: {:?}",
-            result.as_ref().err(),
-        );
-        // The child should have been placed at "_Init.luau", not "Init.luau".
-        let child_file_name = result
-            .unwrap()
-            .children
-            .into_iter()
-            .next()
-            .and_then(|c| c.path.file_name().map(|n| n.to_string_lossy().into_owned()))
-            .unwrap_or_default();
-        assert!(
-            child_file_name.starts_with('_'),
-            "child filesystem name should start with '_' to avoid init collision, \
-             got: {child_file_name}",
-        );
-    }
-
-    /// A child whose filesystem name is stored with a slugified prefix (e.g.
-    /// "_Init") must NOT be blocked — only the bare "init" stem is reserved.
-    #[test]
-    fn syncback_allows_slugified_init_name() {
-        use rbx_dom_weak::{InstanceBuilder, WeakDom};
-
-        // Existing child: on disk as "_Init" (slugified from a name with an
-        // illegal character), its stem is "_init" which is not reserved.
-        let old_child = InstanceSnapshot::new()
-            .name("Init")
-            .class_name("Folder")
-            .metadata(
-                InstanceMetadata::new()
-                    .instigating_source(PathBuf::from("/root/_Init"))
-                    .relevant_paths(vec![PathBuf::from("/root/_Init")]),
-            );
-        let old_parent = InstanceSnapshot::new()
-            .name("Parent")
-            .class_name("Folder")
-            .children(vec![old_child])
-            .metadata(
-                InstanceMetadata::new()
-                    .instigating_source(PathBuf::from("/root"))
-                    .relevant_paths(vec![PathBuf::from("/root")]),
-            );
-        let old_tree = RojoTree::new(old_parent);
-
-        let mut new_tree = WeakDom::new(InstanceBuilder::new("ROOT"));
-        let new_parent = new_tree.insert(
-            new_tree.root_ref(),
-            InstanceBuilder::new("Folder").with_name("Parent"),
-        );
-        new_tree.insert(new_parent, InstanceBuilder::new("Folder").with_name("Init"));
-
-        let vfs = make_vfs();
-        let project = make_project();
-        let data = SyncbackData::for_test(&vfs, &old_tree, &new_tree, &project);
-        let snapshot = SyncbackSnapshot {
-            data,
-            old: Some(old_tree.get_root_id()),
-            new: new_parent,
-            path: PathBuf::from("/root"),
-            middleware: None,
-        };
-
-        let result = syncback_dir_no_meta(&snapshot);
-        assert!(
-            result.is_ok(),
-            "should allow a child whose filesystem name is slugified away from \
-             the reserved 'init' stem: {:?}",
-            result.as_ref().err(),
-        );
-    }
-
-    /// Two new children both named "Init" (ModuleScripts) should get
-    /// "_Init.luau" and "_Init1.luau" respectively.
-    #[test]
-    fn syncback_resolves_multiple_init_conflicts() {
-        use rbx_dom_weak::{InstanceBuilder, WeakDom};
-
-        let old_parent = InstanceSnapshot::new()
-            .name("Parent")
-            .class_name("Folder")
-            .metadata(
-                InstanceMetadata::new()
-                    .instigating_source(PathBuf::from("/root"))
-                    .relevant_paths(vec![PathBuf::from("/root")]),
-            );
-        let old_tree = RojoTree::new(old_parent);
-
-        let mut new_tree = WeakDom::new(InstanceBuilder::new("ROOT"));
-        let new_parent = new_tree.insert(
-            new_tree.root_ref(),
-            InstanceBuilder::new("Folder").with_name("Parent"),
-        );
-        new_tree.insert(
-            new_parent,
-            InstanceBuilder::new("ModuleScript").with_name("Init"),
-        );
-        new_tree.insert(
-            new_parent,
-            InstanceBuilder::new("ModuleScript").with_name("Init"),
-        );
-
-        let vfs = make_vfs();
-        let project = make_project();
-        let data = SyncbackData::for_test(&vfs, &old_tree, &new_tree, &project);
-        let snapshot = SyncbackSnapshot {
-            data,
-            old: Some(old_tree.get_root_id()),
-            new: new_parent,
-            path: PathBuf::from("/root"),
-            middleware: None,
-        };
-
-        let result = syncback_dir_no_meta(&snapshot);
-        assert!(
-            result.is_ok(),
-            "should resolve multiple init conflicts with suffixes: {:?}",
-            result.as_ref().err(),
-        );
-        let children = result.unwrap().children;
-        let mut names: Vec<String> = children
-            .iter()
-            .map(|c| c.path.file_name().unwrap().to_string_lossy().into_owned())
-            .collect();
-        names.sort();
-        assert_eq!(names, vec!["_Init.luau", "_Init1.luau"]);
-    }
 }

src/snapshot_middleware/lua.rs

@@ -158,23 +158,16 @@ pub fn syncback_lua<'sync>(
 
         if !meta.is_empty() {
             let parent_location = snapshot.path.parent_err()?;
-            let file_name = snapshot
-                .path
-                .file_name()
-                .and_then(|n| n.to_str())
-                .unwrap_or("");
-            let meta_stem = file_name
-                .strip_suffix(".server.luau")
-                .or_else(|| file_name.strip_suffix(".server.lua"))
-                .or_else(|| file_name.strip_suffix(".client.luau"))
-                .or_else(|| file_name.strip_suffix(".client.lua"))
-                .or_else(|| file_name.strip_suffix(".plugin.luau"))
-                .or_else(|| file_name.strip_suffix(".plugin.lua"))
-                .or_else(|| file_name.strip_suffix(".luau"))
-                .or_else(|| file_name.strip_suffix(".lua"))
-                .unwrap_or(file_name);
+            let instance_name = &snapshot.new_inst().name;
+            let slugified;
+            let meta_name = if crate::syncback::validate_file_name(instance_name).is_err() {
+                slugified = crate::syncback::slugify_name(instance_name);
+                &slugified
+            } else {
+                instance_name
+            };
             fs_snapshot.add_file(
-                parent_location.join(format!("{meta_stem}.meta.json")),
+                parent_location.join(format!("{}.meta.json", meta_name)),
                 serde_json::to_vec_pretty(&meta).context("cannot serialize metadata")?,
             );
         }

src/snapshot_middleware/meta_file.rs

@@ -154,13 +154,11 @@ impl AdjacentMetadata {
             .old_inst()
             .and_then(|inst| inst.metadata().specified_name.clone())
             .or_else(|| {
-                // Write name when name_for_inst would produce a different
-                // filesystem stem (slugification or init-prefix).
+                // If this is a new instance and its name is invalid for the filesystem,
+                // we need to specify the name in meta.json so it can be preserved
                 if snapshot.old_inst().is_none() {
                     let instance_name = &snapshot.new_inst().name;
-                    if validate_file_name(instance_name).is_err()
-                        || instance_name.to_lowercase() == "init"
-                    {
+                    if validate_file_name(instance_name).is_err() {
                         Some(instance_name.clone())
                     } else {
                         None
@@ -423,13 +421,11 @@ impl DirectoryMetadata {
             .old_inst()
             .and_then(|inst| inst.metadata().specified_name.clone())
             .or_else(|| {
-                // Write name when name_for_inst would produce a different
-                // directory name (slugification or init-prefix).
+                // If this is a new instance and its name is invalid for the filesystem,
+                // we need to specify the name in meta.json so it can be preserved
                 if snapshot.old_inst().is_none() {
                     let instance_name = &snapshot.new_inst().name;
-                    if validate_file_name(instance_name).is_err()
-                        || instance_name.to_lowercase() == "init"
-                    {
+                    if validate_file_name(instance_name).is_err() {
                         Some(instance_name.clone())
                     } else {
                         None

src/snapshot_middleware/txt.rs

@@ -58,14 +58,8 @@ pub fn syncback_txt<'sync>(
 
         if !meta.is_empty() {
             let parent = snapshot.path.parent_err()?;
-            let file_name = snapshot
-                .path
-                .file_name()
-                .and_then(|n| n.to_str())
-                .unwrap_or("");
-            let meta_stem = file_name.strip_suffix(".txt").unwrap_or(file_name);
             fs_snapshot.add_file(
-                parent.join(format!("{meta_stem}.meta.json")),
+                parent.join(format!("{}.meta.json", new_inst.name)),
                 serde_json::to_vec_pretty(&meta).context("could not serialize metadata")?,
             );
         }

src/syncback/file_names.rs

@@ -36,33 +36,23 @@ pub fn name_for_inst<'a>(
             | Middleware::ServerScriptDir
             | Middleware::ClientScriptDir
             | Middleware::ModuleScriptDir => {
-                let name = if validate_file_name(&new_inst.name).is_err() {
+                if validate_file_name(&new_inst.name).is_err() {
                     Cow::Owned(slugify_name(&new_inst.name))
                 } else {
-                    Cow::Borrowed(new_inst.name.as_str())
-                };
-                // Prefix "init" to avoid colliding with reserved init files.
-                if name.to_lowercase() == "init" {
-                    Cow::Owned(format!("_{name}"))
-                } else {
-                    name
+                    Cow::Borrowed(&new_inst.name)
                 }
             }
             _ => {
                 let extension = extension_for_middleware(middleware);
                 let slugified;
-                let stem: &str = if validate_file_name(&new_inst.name).is_err() {
+                let final_name = if validate_file_name(&new_inst.name).is_err() {
                     slugified = slugify_name(&new_inst.name);
                     &slugified
                 } else {
                     &new_inst.name
                 };
-                // Prefix "init" stems to avoid colliding with reserved init files.
-                if stem.to_lowercase() == "init" {
-                    Cow::Owned(format!("_{stem}.{extension}"))
-                } else {
-                    Cow::Owned(format!("{stem}.{extension}"))
-                }
+
+                Cow::Owned(format!("{final_name}.{extension}"))
             }
         })
     }

src/syncback/mod.rs

@@ -28,7 +28,7 @@ use crate::{
     Project,
 };
 
-pub use file_names::{extension_for_middleware, name_for_inst, validate_file_name};
+pub use file_names::{extension_for_middleware, name_for_inst, slugify_name, validate_file_name};
 pub use fs_snapshot::FsSnapshot;
 pub use hash::*;
 pub use property_filter::{filter_properties, filter_properties_preallocated};
@@ -301,6 +301,7 @@ pub fn get_best_middleware(snapshot: &SyncbackSnapshot) -> Middleware {
     static JSON_MODEL_CLASSES: OnceLock<HashSet<&str>> = OnceLock::new();
     let json_model_classes = JSON_MODEL_CLASSES.get_or_init(|| {
         [
+            "Actor",
             "Sound",
             "SoundGroup",
             "Sky",
@@ -318,6 +319,11 @@ pub fn get_best_middleware(snapshot: &SyncbackSnapshot) -> Middleware {
             "ChatInputBarConfiguration",
             "BubbleChatConfiguration",
             "ChannelTabsConfiguration",
+            "RemoteEvent",
+            "UnreliableRemoteEvent",
+            "RemoteFunction",
+            "BindableEvent",
+            "BindableFunction",
         ]
         .into()
     });

src/syncback/snapshot.rs

@@ -31,25 +31,6 @@ pub struct SyncbackSnapshot<'sync> {
 }
 
 impl<'sync> SyncbackSnapshot<'sync> {
-    /// Computes the middleware and filesystem name for a child without
-    /// creating a full snapshot. Uses the same logic as `with_joined_path`.
-    pub fn child_middleware_and_name(
-        &self,
-        new_ref: Ref,
-        old_ref: Option<Ref>,
-    ) -> anyhow::Result<(Middleware, String)> {
-        let temp = Self {
-            data: self.data,
-            old: old_ref,
-            new: new_ref,
-            path: PathBuf::new(),
-            middleware: None,
-        };
-        let middleware = get_best_middleware(&temp, self.data.force_json);
-        let name = name_for_inst(middleware, temp.new_inst(), temp.old_inst())?;
-        Ok((middleware, name.into_owned()))
-    }
-
     /// Constructs a SyncbackSnapshot from the provided refs
     /// while inheriting this snapshot's path and data. This should be used for
     /// directories.
@@ -256,25 +237,6 @@ pub fn inst_path(dom: &WeakDom, referent: Ref) -> String {
     path.join("/")
 }
 
-impl<'sync> SyncbackData<'sync> {
-    /// Constructs a `SyncbackData` for use in unit tests.
-    #[cfg(test)]
-    pub fn for_test(
-        vfs: &'sync Vfs,
-        old_tree: &'sync RojoTree,
-        new_tree: &'sync WeakDom,
-        project: &'sync Project,
-    ) -> Self {
-        Self {
-            vfs,
-            old_tree,
-            new_tree,
-            project,
-            force_json: false,
-        }
-    }
-}
-
 #[cfg(test)]
 mod test {
     use rbx_dom_weak::{InstanceBuilder, WeakDom};

src/web/api.rs

@@ -13,7 +13,6 @@ use rbx_dom_weak::{
 };
 
 use crate::{
-    json,
     serve_session::ServeSession,
     snapshot::{InstanceWithMeta, PatchSet, PatchUpdate},
     web::{
@@ -22,11 +21,10 @@ use crate::{
             ServerInfoResponse, SocketPacket, SocketPacketBody, SocketPacketType, SubscribeMessage,
             WriteRequest, WriteResponse, PROTOCOL_VERSION, SERVER_VERSION,
         },
-        util::{json, json_ok},
+        util::{deserialize_msgpack, msgpack, msgpack_ok, serialize_msgpack},
     },
     web_api::{
-        BufferEncode, InstanceUpdate, RefPatchRequest, RefPatchResponse, SerializeRequest,
-        SerializeResponse,
+        InstanceUpdate, RefPatchRequest, RefPatchResponse, SerializeRequest, SerializeResponse,
     },
 };
 
@@ -42,7 +40,7 @@ pub async fn call(serve_session: Arc<ServeSession>, mut request: Request<Body>)
             if is_upgrade_request(&request) {
                 service.handle_api_socket(&mut request).await
             } else {
-                json(
+                msgpack(
                     ErrorResponse::bad_request(
                         "/api/socket must be called as a websocket upgrade request",
                     ),
@@ -58,7 +56,7 @@ pub async fn call(serve_session: Arc<ServeSession>, mut request: Request<Body>)
         }
         (&Method::POST, "/api/write") => service.handle_api_write(request).await,
 
-        (_method, path) => json(
+        (_method, path) => msgpack(
             ErrorResponse::not_found(format!("Route not found: {}", path)),
             StatusCode::NOT_FOUND,
         ),
@@ -79,7 +77,7 @@ impl ApiService {
         let tree = self.serve_session.tree();
         let root_instance_id = tree.get_root_id();
 
-        json_ok(&ServerInfoResponse {
+        msgpack_ok(&ServerInfoResponse {
             server_version: SERVER_VERSION.to_owned(),
             protocol_version: PROTOCOL_VERSION,
             session_id: self.serve_session.session_id(),
@@ -98,7 +96,7 @@ impl ApiService {
         let input_cursor: u32 = match argument.parse() {
             Ok(v) => v,
             Err(err) => {
-                return json(
+                return msgpack(
                     ErrorResponse::bad_request(format!("Malformed message cursor: {}", err)),
                     StatusCode::BAD_REQUEST,
                 );
@@ -109,7 +107,7 @@ impl ApiService {
         let (response, websocket) = match upgrade(request, None) {
             Ok(result) => result,
             Err(err) => {
-                return json(
+                return msgpack(
                     ErrorResponse::internal_error(format!("WebSocket upgrade failed: {}", err)),
                     StatusCode::INTERNAL_SERVER_ERROR,
                 );
@@ -136,10 +134,10 @@ impl ApiService {
 
         let body = body::to_bytes(request.into_body()).await.unwrap();
 
-        let request: WriteRequest = match json::from_slice(&body) {
+        let request: WriteRequest = match deserialize_msgpack(&body) {
             Ok(request) => request,
             Err(err) => {
-                return json(
+                return msgpack(
                     ErrorResponse::bad_request(format!("Invalid body: {}", err)),
                     StatusCode::BAD_REQUEST,
                 );
@@ -147,7 +145,7 @@ impl ApiService {
         };
 
         if request.session_id != session_id {
-            return json(
+            return msgpack(
                 ErrorResponse::bad_request("Wrong session ID"),
                 StatusCode::BAD_REQUEST,
             );
@@ -173,7 +171,7 @@ impl ApiService {
             })
             .unwrap();
 
-        json_ok(WriteResponse { session_id })
+        msgpack_ok(WriteResponse { session_id })
     }
 
     async fn handle_api_read(&self, request: Request<Body>) -> Response<Body> {
@@ -183,7 +181,7 @@ impl ApiService {
         let requested_ids = match requested_ids {
             Ok(ids) => ids,
             Err(_) => {
-                return json(
+                return msgpack(
                     ErrorResponse::bad_request("Malformed ID list"),
                     StatusCode::BAD_REQUEST,
                 );
@@ -207,7 +205,7 @@ impl ApiService {
             }
         }
 
-        json_ok(ReadResponse {
+        msgpack_ok(ReadResponse {
             session_id: self.serve_session.session_id(),
             message_cursor,
             instances,
@@ -225,10 +223,10 @@ impl ApiService {
         let session_id = self.serve_session.session_id();
         let body = body::to_bytes(request.into_body()).await.unwrap();
 
-        let request: SerializeRequest = match json::from_slice(&body) {
+        let request: SerializeRequest = match deserialize_msgpack(&body) {
             Ok(request) => request,
             Err(err) => {
-                return json(
+                return msgpack(
                     ErrorResponse::bad_request(format!("Invalid body: {}", err)),
                     StatusCode::BAD_REQUEST,
                 );
@@ -236,7 +234,7 @@ impl ApiService {
         };
 
         if request.session_id != session_id {
-            return json(
+            return msgpack(
                 ErrorResponse::bad_request("Wrong session ID"),
                 StatusCode::BAD_REQUEST,
             );
@@ -269,7 +267,7 @@ impl ApiService {
 
                 response_dom.transfer_within(child_ref, object_value);
             } else {
-                json(
+                msgpack(
                     ErrorResponse::bad_request(format!("provided id {id} is not in the tree")),
                     StatusCode::BAD_REQUEST,
                 );
@@ -280,9 +278,9 @@ impl ApiService {
         let mut source = Vec::new();
         rbx_binary::to_writer(&mut source, &response_dom, &[response_dom.root_ref()]).unwrap();
 
-        json_ok(SerializeResponse {
+        msgpack_ok(SerializeResponse {
             session_id: self.serve_session.session_id(),
-            model_contents: BufferEncode::new(source),
+            model_contents: source,
         })
     }
 
@@ -294,10 +292,10 @@ impl ApiService {
         let session_id = self.serve_session.session_id();
         let body = body::to_bytes(request.into_body()).await.unwrap();
 
-        let request: RefPatchRequest = match json::from_slice(&body) {
+        let request: RefPatchRequest = match deserialize_msgpack(&body) {
             Ok(request) => request,
             Err(err) => {
-                return json(
+                return msgpack(
                     ErrorResponse::bad_request(format!("Invalid body: {}", err)),
                     StatusCode::BAD_REQUEST,
                 );
@@ -305,7 +303,7 @@ impl ApiService {
         };
 
         if request.session_id != session_id {
-            return json(
+            return msgpack(
                 ErrorResponse::bad_request("Wrong session ID"),
                 StatusCode::BAD_REQUEST,
             );
@@ -338,7 +336,7 @@ impl ApiService {
             }
         }
 
-        json_ok(RefPatchResponse {
+        msgpack_ok(RefPatchResponse {
             session_id: self.serve_session.session_id(),
             patch: SubscribeMessage {
                 added: HashMap::new(),
@@ -354,7 +352,7 @@ impl ApiService {
         let requested_id = match Ref::from_str(argument) {
             Ok(id) => id,
             Err(_) => {
-                return json(
+                return msgpack(
                     ErrorResponse::bad_request("Invalid instance ID"),
                     StatusCode::BAD_REQUEST,
                 );
@@ -366,7 +364,7 @@ impl ApiService {
         let instance = match tree.get_instance(requested_id) {
             Some(instance) => instance,
             None => {
-                return json(
+                return msgpack(
                     ErrorResponse::bad_request("Instance not found"),
                     StatusCode::NOT_FOUND,
                 );
@@ -376,7 +374,7 @@ impl ApiService {
         let script_path = match pick_script_path(instance) {
             Some(path) => path,
             None => {
-                return json(
+                return msgpack(
                     ErrorResponse::bad_request(
                         "No appropriate file could be found to open this script",
                     ),
@@ -389,7 +387,7 @@ impl ApiService {
             Ok(()) => {}
             Err(error) => match error {
                 OpenError::Io(io_error) => {
-                    return json(
+                    return msgpack(
                         ErrorResponse::internal_error(format!(
                             "Attempting to open {} failed because of the following io error: {}",
                             script_path.display(),
@@ -403,7 +401,7 @@ impl ApiService {
                     status,
                     stderr,
                 } => {
-                    return json(
+                    return msgpack(
                         ErrorResponse::internal_error(format!(
                             r#"The command '{}' to open '{}' failed with the error code '{}'.
                             Error logs:
@@ -419,7 +417,7 @@ impl ApiService {
             },
         };
 
-        json_ok(OpenResponse {
+        msgpack_ok(OpenResponse {
             session_id: self.serve_session.session_id(),
         })
     }
@@ -483,7 +481,7 @@ async fn handle_websocket_subscription(
                 match result {
                     Ok((new_cursor, messages)) => {
                         if !messages.is_empty() {
-                            let json_message = {
+                            let msgpack_message = {
                                 let tree = tree_handle.lock().unwrap();
                                 let api_messages = messages
                                     .into_iter()
@@ -499,12 +497,12 @@ async fn handle_websocket_subscription(
                                     }),
                                 };
 
-                                serde_json::to_string(&response)?
+                                serialize_msgpack(response)?
                             };
 
                             log::debug!("Sending batch of messages over WebSocket subscription");
 
-                            if websocket.send(Message::Text(json_message)).await.is_err() {
+                            if websocket.send(Message::Binary(msgpack_message)).await.is_err() {
                                 // Client disconnected
                                 log::debug!("WebSocket subscription closed by client");
                                 break;

src/web/interface.rs

@@ -249,31 +249,8 @@ pub struct SerializeRequest {
 #[serde(rename_all = "camelCase")]
 pub struct SerializeResponse {
     pub session_id: SessionId,
-    pub model_contents: BufferEncode,
-}
-
-/// Using this struct we can force Roblox to JSONDecode this as a buffer.
-/// This is what Roblox's serde APIs use, so it saves a step in the plugin.
-#[derive(Debug, Serialize, Deserialize)]
-pub struct BufferEncode {
-    m: (),
-    t: Cow<'static, str>,
-    base64: String,
-}
-
-impl BufferEncode {
-    pub fn new(content: Vec<u8>) -> Self {
-        let base64 = data_encoding::BASE64.encode(&content);
-        Self {
-            m: (),
-            t: Cow::Borrowed("buffer"),
-            base64,
-        }
-    }
-
-    pub fn model(&self) -> &str {
-        &self.base64
-    }
+    #[serde(with = "serde_bytes")]
+    pub model_contents: Vec<u8>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]

src/web/util.rs

@@ -1,8 +1,48 @@
 use hyper::{header::CONTENT_TYPE, Body, Response, StatusCode};
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 
-pub fn json_ok<T: Serialize>(value: T) -> Response<Body> {
-    json(value, StatusCode::OK)
+pub fn msgpack_ok<T: Serialize>(value: T) -> Response<Body> {
+    msgpack(value, StatusCode::OK)
+}
+
+pub fn msgpack<T: Serialize>(value: T, code: StatusCode) -> Response<Body> {
+    let mut serialized = Vec::new();
+    let mut serializer = rmp_serde::Serializer::new(&mut serialized)
+        .with_human_readable()
+        .with_struct_map();
+
+    if let Err(err) = value.serialize(&mut serializer) {
+        return Response::builder()
+            .status(StatusCode::INTERNAL_SERVER_ERROR)
+            .header(CONTENT_TYPE, "text/plain")
+            .body(Body::from(err.to_string()))
+            .unwrap();
+    };
+
+    Response::builder()
+        .status(code)
+        .header(CONTENT_TYPE, "application/msgpack")
+        .body(Body::from(serialized))
+        .unwrap()
+}
+
+pub fn serialize_msgpack<T: Serialize>(value: T) -> anyhow::Result<Vec<u8>> {
+    let mut serialized = Vec::new();
+    let mut serializer = rmp_serde::Serializer::new(&mut serialized)
+        .with_human_readable()
+        .with_struct_map();
+
+    value.serialize(&mut serializer)?;
+
+    Ok(serialized)
+}
+
+pub fn deserialize_msgpack<'a, T: Deserialize<'a>>(
+    input: &'a [u8],
+) -> Result<T, rmp_serde::decode::Error> {
+    let mut deserializer = rmp_serde::Deserializer::new(input).with_human_readable();
+
+    T::deserialize(&mut deserializer)
 }
 
 pub fn json<T: Serialize>(value: T, code: StatusCode) -> Response<Body> {

test-projects/relative_paths/default.project.json

@@ -0,0 +1,14 @@
+{
+  "name": "default",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "Project": {
+        "$path": "project/src",
+        "Module": {
+          "$path": "module"
+        }
+      }
+    }
+  }
+}

test-projects/relative_paths/module/module.luau

@@ -0,0 +1 @@
+return nil

test-projects/relative_paths/project/default.project.json

@@ -0,0 +1,14 @@
+{
+  "name": "default",
+  "tree": {
+    "$className": "DataModel",
+    "ReplicatedStorage": {
+      "Project": {
+        "$path": "src/",
+        "Module": {
+          "$path": "../module"
+        }
+      }
+    }
+  }
+}

test-projects/relative_paths/project/src/init.luau

@@ -0,0 +1 @@
+return nil

tests/rojo_test/serve_util.rs

@@ -10,6 +10,7 @@ use std::{
 use hyper_tungstenite::tungstenite::{connect, Message};
 use rbx_dom_weak::types::Ref;
 
+use serde::{Deserialize, Serialize};
 use tempfile::{tempdir, TempDir};
 
 use librojo::{
@@ -161,22 +162,16 @@ impl TestServeSession {
 
     pub fn get_api_rojo(&self) -> Result<ServerInfoResponse, reqwest::Error> {
         let url = format!("http://localhost:{}/api/rojo", self.port);
-        let body = reqwest::blocking::get(url)?.text()?;
+        let body = reqwest::blocking::get(url)?.bytes()?;
 
-        let value = jsonc_parser::parse_to_serde_value(&body, &Default::default())
-            .expect("Failed to parse JSON")
-            .expect("No JSON value");
-        Ok(serde_json::from_value(value).expect("Server returned malformed response"))
+        Ok(deserialize_msgpack(&body).expect("Server returned malformed response"))
     }
 
     pub fn get_api_read(&self, id: Ref) -> Result<ReadResponse<'_>, reqwest::Error> {
         let url = format!("http://localhost:{}/api/read/{}", self.port, id);
-        let body = reqwest::blocking::get(url)?.text()?;
+        let body = reqwest::blocking::get(url)?.bytes()?;
 
-        let value = jsonc_parser::parse_to_serde_value(&body, &Default::default())
-            .expect("Failed to parse JSON")
-            .expect("No JSON value");
-        Ok(serde_json::from_value(value).expect("Server returned malformed response"))
+        Ok(deserialize_msgpack(&body).expect("Server returned malformed response"))
     }
 
     pub fn get_api_socket_packet(
@@ -198,8 +193,8 @@ impl TestServeSession {
             }
 
             match socket.read() {
-                Ok(Message::Text(text)) => {
-                    let packet: SocketPacket = serde_json::from_str(&text)?;
+                Ok(Message::Binary(binary)) => {
+                    let packet: SocketPacket = deserialize_msgpack(&binary)?;
                     if packet.packet_type != packet_type {
                         continue;
                     }
@@ -212,7 +207,7 @@ impl TestServeSession {
                     return Err("WebSocket closed before receiving messages".into());
                 }
                 Ok(_) => {
-                    // Ignore other message types (ping, pong, binary)
+                    // Ignore other message types (ping, pong, text)
                     continue;
                 }
                 Err(hyper_tungstenite::tungstenite::Error::Io(e))
@@ -236,15 +231,37 @@ impl TestServeSession {
     ) -> Result<SerializeResponse, reqwest::Error> {
         let client = reqwest::blocking::Client::new();
         let url = format!("http://localhost:{}/api/serialize", self.port);
-        let body = serde_json::to_string(&SerializeRequest {
+        let body = serialize_msgpack(&SerializeRequest {
             session_id,
             ids: ids.to_vec(),
-        });
+        })
+        .unwrap();
 
-        client.post(url).body((body).unwrap()).send()?.json()
+        let body = client.post(url).body(body).send()?.bytes()?;
+
+        Ok(deserialize_msgpack(&body).expect("Server returned malformed response"))
     }
 }
 
+fn serialize_msgpack<T: Serialize>(value: T) -> Result<Vec<u8>, rmp_serde::encode::Error> {
+    let mut serialized = Vec::new();
+    let mut serializer = rmp_serde::Serializer::new(&mut serialized)
+        .with_human_readable()
+        .with_struct_map();
+
+    value.serialize(&mut serializer)?;
+
+    Ok(serialized)
+}
+
+fn deserialize_msgpack<'a, T: Deserialize<'a>>(
+    input: &'a [u8],
+) -> Result<T, rmp_serde::decode::Error> {
+    let mut deserializer = rmp_serde::Deserializer::new(input).with_human_readable();
+
+    T::deserialize(&mut deserializer)
+}
+
 /// Probably-okay way to generate random enough port numbers for running the
 /// Rojo live server.
 ///
@@ -262,11 +279,7 @@ fn get_port_number() -> usize {
 /// Since the provided structure intentionally includes unredacted referents,
 /// some post-processing is done to ensure they don't show up in the model.
 pub fn serialize_to_xml_model(response: &SerializeResponse, redactions: &RedactionMap) -> String {
-    let model_content = data_encoding::BASE64
-        .decode(response.model_contents.model().as_bytes())
-        .unwrap();
-
-    let mut dom = rbx_binary::from_reader(model_content.as_slice()).unwrap();
+    let mut dom = rbx_binary::from_reader(response.model_contents.as_slice()).unwrap();
     // This makes me realize that maybe we need a `descendants_mut` iter.
     let ref_list: Vec<Ref> = dom.descendants().map(|inst| inst.referent()).collect();
     for referent in ref_list {

tests/tests/syncback.rs

@@ -60,8 +60,8 @@ syncback_tests! {
     // Ensures that projects can be reserialized by syncback and that
     // default.project.json doesn't change unexpectedly.
     project_reserialize => ["attribute_mismatch.luau", "property_mismatch.project.json"],
-    // Confirms that duplicate children are resolved with incrementing suffixes
-    rbxm_fallback => ["src/ChildWithDuplicates/DuplicateChild/.gitkeep", "src/ChildWithDuplicates/DuplicateChild1/.gitkeep"],
+    // Confirms that Instances that cannot serialize as directories serialize as rbxms
+    rbxm_fallback => ["src/ChildWithDuplicates.rbxm"],
     // Ensures that ref properties are linked properly on the file system
     ref_properties => ["src/pointer.model.json", "src/target.model.json"],
     // Ensures that ref properties are linked when no attributes are manually