Give packs an identity so create can refuse missing deps and load in a stable order.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-20 00:20:36 +03:00
parent e5a0ae5b9d
commit 263c94c55d
28 changed files with 851 additions and 56 deletions
@@ -303,7 +303,30 @@ internal sealed class GameLoopService(
                }
            }

-            var packIds = mods.NormalizePackIds(extras);
+            IReadOnlyList<string> packIds;
+            try
+            {
+                packIds = mods.ResolveSelectedPacks(extras);
+            }
+            catch (PackDependencyException ex) when (ex.Code == PackDependencyException.MissingCode)
+            {
+                command.Result.TrySetResult(new SchoolCreationOutcome(
+                    null,
+                    SchoolCreationError.MissingMod,
+                    ex.MissingPackId));
+                return;
+            }
+            catch (PackDependencyException)
+            {
+                command.Result.TrySetResult(new SchoolCreationOutcome(null, SchoolCreationError.ModCycle));
+                return;
+            }
+            catch (ContentLoadException)
+            {
+                command.Result.TrySetResult(new SchoolCreationOutcome(null, SchoolCreationError.InvalidCatalog));
+                return;
+            }
+
            if (!mods.PackExists(CatalogLoader.CorePackId))
            {
                command.Result.TrySetResult(new SchoolCreationOutcome(null, SchoolCreationError.InvalidCatalog));