From fb8f2ea2fb7211563b3e491afb69ba32199782e5 Mon Sep 17 00:00:00 2001
From: soul <s@x>
Date: Thu, 22 Oct 2026 20:23:32 +0200
Subject: [PATCH] ShipAuthoring: Load follows the pull's InvalidDataException,
 RefuseLegacyEmbeddedHull the nil-stamp NotSupportedException

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 Assets/Scripts/ServerShared/ShipAuthoring.cs  |  4 ++--
 .../ShipAuthoringTests.cs                     | 23 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/Assets/Scripts/ServerShared/ShipAuthoring.cs b/Assets/Scripts/ServerShared/ShipAuthoring.cs
index eafbacd2d..2f6db9e5c 100644
--- a/Assets/Scripts/ServerShared/ShipAuthoring.cs
+++ b/Assets/Scripts/ServerShared/ShipAuthoring.cs
@@ -136,7 +136,7 @@ public static class ShipAuthoringStore
     {
         RefuseLegacyEmbeddedHull(path);
         try { return LoadRecords(path); }
-        catch (MessagePackSerializationException error)
+        catch (Exception error) when (error is InvalidDataException or MessagePackSerializationException)
         {
             throw new InvalidOperationException($"{path}: a record does not decode as its schema: {error.Message}", error);
         }
@@ -152,7 +152,7 @@ public static class ShipAuthoringStore
         if (bytes.Length == 0) return;
         CultPersistedStoreSnapshot snapshot;
         try { snapshot = CultDocumentMessagePackSerialization.DeserializeSnapshot(bytes); }
-        catch (MessagePackSerializationException error)
+        catch (Exception error) when (error is MessagePackSerializationException or NotSupportedException)
         {
             throw new InvalidOperationException($"{path}: not a readable ship file: {error.Message}", error);
         }
diff --git a/tests/Aetheria.Shared.Tests/ShipAuthoringTests.cs b/tests/Aetheria.Shared.Tests/ShipAuthoringTests.cs
index eced4c6f7..35a346fe0 100644
--- a/tests/Aetheria.Shared.Tests/ShipAuthoringTests.cs
+++ b/tests/Aetheria.Shared.Tests/ShipAuthoringTests.cs
@@ -173,7 +173,28 @@ public sealed class ShipAuthoringTests
         RewritePayload(path, "aetheria.hulldata", slots => ((object[])((object[])slots[5])[0])[2] = new object[] { 5, false, true, false });
         var error = Assert.Throws<InvalidOperationException>(() => ShipAuthoringStore.Load(path));
         Assert.Contains(path, error.Message);
-        Assert.IsAssignableFrom<MessagePackSerializationException>(error.InnerException);
+        // The pull names the record key and schema; the MessagePack failure is its cause.
+        var pull = Assert.IsType<InvalidDataException>(error.InnerException);
+        Assert.Contains("aetheria.hulldata", pull.Message);
+        Assert.Contains(ShipModCatalog.HullKey("mod.skiff").ToString(), pull.Message);
+        Assert.IsAssignableFrom<MessagePackSerializationException>(pull.InnerException);
+    }
+
+    // A store header with a nil format stamp is refused by the runtime with NotSupportedException; Load names the file.
+    [Fact]
+    public void LoadNamesTheFileWhoseFormatStampIsNil()
+    {
+        using var directory = new TempDirectory();
+        var path = Path.Combine(directory.Path, "nilstamp.cc");
+        File.WriteAllBytes(path, CultDocumentMessagePackSerialization.SerializeSnapshot(new CultPersistedStoreSnapshot
+        {
+            FormatVersion = null,
+            SchemaCatalog = Array.Empty<CultSchemaCatalogEntry>(),
+            Records = Array.Empty<CultPersistedRecord>(),
+        }));
+        var error = Assert.Throws<InvalidOperationException>(() => ShipAuthoringStore.Load(path));
+        Assert.Contains(path, error.Message);
+        Assert.IsType<NotSupportedException>(error.InnerException);
     }
 
     // Decodes one record's payload of the named schema to its slot array, lets the edit change it, and stores it again.