re-add name conflict checking

Author: jkelaty-rbx

lute/cli/commands/pkg/loom-core/src/packageresolution.luau

@@ -80,23 +80,37 @@ local function resolve(rootDirectory: string): ResolvedGraph
 
 	table.freeze(packages)
 
+	local nameIndex: { [string]: string } = {}
+
 	for _, spec in queue do
 		local key = getKey(spec)
 
 		if dependencies[key] then
 			if hasConflict(dependencies[key], spec) then
 				error(
-					`Version conflict for package '{spec.name}':\n`
-					.. `  but {key} is already resolved\n`
-					.. `Resolve by pinning both to the same revision.`
+					`Source mismatch for package '{spec.name}':\n`
+						.. `  resolved: {dependencies[key].source} ({dependencies[key].sourceKind})\n`
+						.. `  incoming: {spec.source} ({spec.sourceKind})\n`
+						.. `Both resolve to '{key}' but from different sources.`
 				)
 			else
 				-- Already resolved at this exact version — deduplicate
 				continue
 			end
 		end
 
+		local conflictKey = nameIndex[spec.name]
+		if conflictKey then
+			error(
+				`Version conflict for package '{spec.name}':\n`
+					.. `  resolved: {conflictKey}\n`
+					.. `  incoming: {key}\n`
+					.. `Resolve by pinning both to the same revision.`
+			)
+		end
+
 		-- New package — resolve it
+		nameIndex[spec.name] = key
 		dependencies[key] = spec
 		graph[key] = {}
 

lute/cli/commands/pkg/loom-core/src/projectmanifest.luau

@@ -11,7 +11,7 @@ export type DependencySpec = {
 export type PackageManifest = {
 	read name: string,
 	read version: string,
-	read dependencies: { [string]: DependencySpec },
+	read dependencies: { [string]: DependencySpec }, -- maps alias to dependency spec
 }
 
 export type ProjectManifest = {
@@ -32,6 +32,10 @@ local function parseManifest(t: any): ProjectManifest
 	local dependencies: { [string]: DependencySpec } = {}
 	if pkg.dependencies ~= nil then
 		for name, spec in pkg.dependencies do
+			assert(
+				spec.name == nil or type(spec.name) == "string",
+				`Optional 'name' field in dependency spec for '{name}' expected to be a string`
+			)
 			assert(
 				spec.rev ~= nil and type(spec.rev) == "string",
 				`Expected 'rev' field in dependency spec for '{name}'`
@@ -45,7 +49,7 @@ local function parseManifest(t: any): ProjectManifest
 				`Expected 'source' field in dependency spec for '{name}'`
 			)
 			dependencies[name] = table.freeze({
-				name = name,
+				name = spec.name or name, -- use the optional name if provided, otherwise use the alias
 				rev = spec.rev,
 				sourceKind = spec.sourceKind,
 				source = spec.source,