From afc7dc3134f9e182d80a046fa3b897143b0744bf Mon Sep 17 00:00:00 2001
From: Meta Vens <rwvens@hotmail.com>
Date: Tue, 16 Jun 2026 03:43:21 +0100
Subject: [PATCH] Route docked ship selection through checkpoints

---
 .voidbot/state/aetheria.cc                   | Bin 143833 -> 144421 bytes
 Aetheria.State.Verify/Program.cs             |  54 +++++++++++++++++++
 Assets/Scripts/Gameplay/ActionGameManager.cs |  17 ++++++
 Assets/Scripts/UI/Menu/InventoryPanel.cs     |   5 +-
 docs/aetheria-perfect-machine-map.md         |   8 ++-
 5 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc
index 9029284c77741b46292b56d075bba93665a74d36..a71310eb60c1b9f2b2fe149d252b36f1da961958 100644
GIT binary patch
delta 1138
zcmZWp%}Z2K6z`4ZS0E$?TA>#t&9Kq&1D#oAlZatorW;q?d2^h(`sUu(z4tjyi-uM$
zA}HQs{(!!yjlvK{n`qHKXq6Nc64;_exk?Q>_c?DQ+zfNi@7&+-oZmV3ecEVvy4kS$
zEYdU_OT@;aLu0Y|N7ga_edK;6G8`KSBBJJYH8K)J8frTuU7O|J+E-u7i`y&G|M=}e
z{nQ0vFG1R0-EH&#ZVy?#er%^bsz56;Npo<Ca+(1dO?pxS*ArYbT_8gK2l_vEJNy?r
z-NikwO78V6bNdM8X_7%A*P#WnOdXb{8Who4An8Dv7z89yLAvMe;|i2wf)fP}*xLLv
zWabv*8InRiiU}E>!@>fgMsm{w580`IXQQLIZk?G$8E<lKiZH&6Swa?22ONhe&G6Ti
zpfJ2w&b~~_(^~L8qC}WM19_$h7n)2g!&%ppKnj4mm>hJYG&V*=o?|aTVv#t4qjv#{
z=A}WRkz_WDsEd^o>YxDJa)p94p@aj=WK%+#=8~SHr&$WgnUf|d33Q3%vq(TB*n)HP
zgSf(Bb^$9C3(Nsxi!>NEgpf|SI%*t4)CH+oU^(5ZG}&cfgX)5dfJ4m&l*ZSs*5aF_
zz!7r~NUDHZI2+s4W5%^_Va2vRQ}Rq_jU_~Ra)H{$eVh{BUIK8#UM>SlOUjiiq$bMF
zLXP%_l~;;!sbm*%xezq<n0`4dqkrRo@{&<(kt;7}DrTq`dW1BK*tCkiq}<L5IRgvo
z^P$f2*!N^}X&`RZ`Ny|f{NnGyqX*Wr^doLfAF1r?d7OIbT*7KCJ&ao|{>rbOgBSc8
zTPFg}nQKaT(uPE(iiDDOzj-j`9L09?LYg)0H)lM~hRsK9m6!=<cr_T|m0%dEEVk|)
zZXHZi9`?xS{1Z(x*viRr)1Nu3{<)1*9M;-$*5lWW)hz!*O?&vzM@P*=FYTU+ybVK@
k?}MnRD}C*bh-!E^$mBhdyVX!|d9C?$<XvMJix15I1A9H40ssI2

delta 811
zcmZuvziSjh7<Km|TvBL?1Op=X*?Dp%cXGMp4y=Nxpdyk3xo&QDZg*gBW|<#}i$%~j
zHt~wJuo9yn2ttq(n_yufR+fQS#58I3FYw#Rou;synfJZ-zBh0CsJM4neE-^?sx?}*
z#{AN9v$N&R4!-!C#p9dhYIe5lUl`be8DW;I4TmXCl>Cb?cFGeUeq_&Ay(e=ktBM2+
z602xLG=si1#BeDF$<M1~@5sI0VZwrt5K9p<1=@CvBGhQ0iUr*03gB7j9#i@+Q2>;v
zP*y-Hpi*d~Y(6p82|!0Y(b?Cww=nHQ?u{H&fIQouEy;DE!9@RY21#u7;NY;d@$H{G
zu0b0f$3Vc|Xy1ZFG0nvBDk#PB7lEP<LrF|+ObkPXG+_Y*TqiL}af(yC%#l69W2-O^
zrZou}?x>~ngXAbCq=DPG41?=y3{qw)(6z<^x)zCuiB2TumI<sP-Izg0`pl_mw8sEr
z$5eH;weHPqyjzjNaA6sAQ!rKuE<!l5r7#lR<(gNJ6P;u5_<P!_9-(Z3%6>mLkCZ`-
zKZV&N548q4LuXE~hbD)w@wNQQWksxsq~a!pYtFZc2x44Pt__%ovS_Q1Le6r)6{99j
z=id@Rar8dx>HSmZhi@KuD`$pj<UKk)Q)?|QwyIdpdbRV)kkA2&!fSik?r(2)=jdQt
z4Vm;_e$1ZU^`-{j3v=VD*6VpyvzwRv-N{j(m+IMc+20%^npKDRRQ4Z_8{ZuKDx4d3
OF8iM+N2q4C*7*Z0z95bO

diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs
index 2eef7a521..4276dd340 100644
--- a/Aetheria.State.Verify/Program.cs
+++ b/Aetheria.State.Verify/Program.cs
@@ -21,6 +21,7 @@ RequireWeaponGroupCommitAuthority(root);
 RequireInventoryDoubleClickTransferCommitAuthority(root);
 RequireTradePurchaseCommitAuthority(root);
 RequireInventoryLoadoutRestoreCommitAuthority(root);
+RequireDockedCurrentShipCommitAuthority(root);
 
 await using var node = await AetheriaStateNode.OpenAsync(statePath, "aetheria-state-verify");
 
@@ -471,6 +472,7 @@ Console.WriteLine("Weapon group authority: UI assignment flows through gameplay
 Console.WriteLine("Inventory transfer authority: UI transfer and drag/drop requests flow through gameplay checkpoint commits");
 Console.WriteLine("Trade purchase authority: UI buy requests flow through gameplay checkpoint commits");
 Console.WriteLine("Inventory loadout restore authority: UI restore requests flow through gameplay checkpoint commits");
+Console.WriteLine("Docked current-ship authority: UI selection requests flow through gameplay checkpoint commits");
 
 static void RequireCount(AetheriaMigrationLedger ledger, string documentType, int actual)
 {
@@ -1124,6 +1126,58 @@ static void RequireInventoryLoadoutRestoreCommitAuthority(string root)
     }
 }
 
+static void RequireDockedCurrentShipCommitAuthority(string root)
+{
+    var actionGameManagerPath = Path.Combine(root, "Assets", "Scripts", "Gameplay", "ActionGameManager.cs");
+    var actionGameManager = File.Exists(actionGameManagerPath)
+        ? File.ReadAllText(actionGameManagerPath)
+        : throw new InvalidOperationException("Cannot verify docked current-ship authority; ActionGameManager.cs is missing.");
+
+    var requiredSymbols = new[]
+    {
+        "CommitDockedCurrentShip",
+        "QueueRunCheckpoint(\"docked-current-ship\")",
+        "DockingBay.DockedShip = ship"
+    };
+
+    var missingSymbols = requiredSymbols
+        .Where(symbol => !actionGameManager.Contains(symbol, StringComparison.Ordinal))
+        .ToArray();
+
+    if (missingSymbols.Length > 0)
+    {
+        throw new InvalidOperationException(
+            "Docked current-ship selection no longer has a gameplay-owned checkpoint commit primitive: " +
+            string.Join(", ", missingSymbols));
+    }
+
+    var inventoryPanelPath = Path.Combine(root, "Assets", "Scripts", "UI", "Menu", "InventoryPanel.cs");
+    var forbiddenSymbols = new[]
+    {
+        "GameManager.CurrentEntity =",
+        "GameManager.DockingBay.DockedShip ="
+    };
+
+    var hits = File.ReadLines(inventoryPanelPath)
+        .Select((line, index) => new { LineNumber = index + 1, Line = line })
+        .Where(line => forbiddenSymbols.Any(symbol => line.Line.Contains(symbol, StringComparison.Ordinal)))
+        .Select(line => $"{Path.GetRelativePath(root, inventoryPanelPath)}:{line.LineNumber}: {line.Line.Trim()}")
+        .ToArray();
+
+    if (hits.Length > 0)
+    {
+        throw new InvalidOperationException(
+            "InventoryPanel still owns direct docked current-ship mutation: " +
+            string.Join("; ", hits));
+    }
+
+    var inventoryPanel = File.ReadAllText(inventoryPanelPath);
+    if (!inventoryPanel.Contains("GameManager.CommitDockedCurrentShip", StringComparison.Ordinal))
+    {
+        throw new InvalidOperationException("InventoryPanel no longer routes current-ship selection through ActionGameManager.");
+    }
+}
+
 static string ExtractMethodBody(string source, string methodName)
 {
     var signature = "private void " + methodName + "()";
diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs
index d5449e5b8..93c00996b 100644
--- a/Assets/Scripts/Gameplay/ActionGameManager.cs
+++ b/Assets/Scripts/Gameplay/ActionGameManager.cs
@@ -1336,6 +1336,23 @@ public class ActionGameManager : MonoBehaviour
         return true;
     }
 
+    public bool CommitDockedCurrentShip(Ship ship)
+    {
+        if (ship == null ||
+            !ship.IsPlayerShip ||
+            DockedEntity == null ||
+            DockingBay == null ||
+            !DockedEntity.Children.Contains(ship))
+        {
+            return false;
+        }
+
+        CurrentEntity = ship;
+        DockingBay.DockedShip = ship;
+        QueueRunCheckpoint("docked-current-ship");
+        return true;
+    }
+
     private static AetheriaRuntimeLoadoutTemplateSnapshot CreateRuntimeLoadoutTemplateSnapshot(
         AetheriaRuntimeLoadoutTemplateCommit template)
     {
diff --git a/Assets/Scripts/UI/Menu/InventoryPanel.cs b/Assets/Scripts/UI/Menu/InventoryPanel.cs
index 02b331af4..e929132e3 100644
--- a/Assets/Scripts/UI/Menu/InventoryPanel.cs
+++ b/Assets/Scripts/UI/Menu/InventoryPanel.cs
@@ -119,9 +119,8 @@ public class InventoryPanel : MonoBehaviour, IPointerClickHandler
                 {
                     if(_displayedEntity is Ship ship)
                     {
-                        GameManager.CurrentEntity = ship;
-                        GameManager.DockingBay.DockedShip = ship;
-                        Current.targetGraphic.color = ToggleEnabledColor;
+                        if (GameManager.CommitDockedCurrentShip(ship))
+                            Current.targetGraphic.color = ToggleEnabledColor;
                     }
                     else
                     {
diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md
index b4b311a33..8d67c313f 100644
--- a/docs/aetheria-perfect-machine-map.md
+++ b/docs/aetheria-perfect-machine-map.md
@@ -1406,6 +1406,10 @@ First Aetheria surfaces to publish:
      cargo-to-cargo, cargo-to-equipment, equipment-to-cargo, or
      equipment-to-equipment movement and then refresh display. uGUI still owns
      the presentation shell for now, not the inventory mutation.
+   - Done: route docked current-ship selection through
+     `ActionGameManager.CommitDockedCurrentShip`. `InventoryPanel` may request
+     a selected docked player ship and update the button color, but gameplay
+     owns `CurrentEntity`, `DockingBay.DockedShip`, and the typed checkpoint.
    - Replace the next concrete uGUI screen with an Eve-owned surface.
    - Move the staged packages into the Eve repo once its worktree is clean, then
      import them back into Aetheria from Eve instead of carrying a local copy.
@@ -1733,7 +1737,9 @@ cargo/equipment movement, gameplay owns the move and queues the checkpoint.
 Trade purchases follow the same rule: UI requests the purchase, gameplay owns
 credit changes, cargo transfer, ship creation, and checkpoint. Runtime loadout
 restore follows the same rule: UI requests restoration, gameplay owns
-instantiation, credits, dock assignment, current entity, and checkpoint. Any
+instantiation, credits, dock assignment, current entity, and checkpoint. Docked
+current-ship selection follows the same rule: UI requests selection, gameplay
+owns `CurrentEntity`, `DockingBay.DockedShip`, and checkpoint. Any
 predicate that still needs legacy DTO objects must earn that dependency by
 using behavior objects or simulation-only methods that typed facets do not yet
 expose.