Complete universe model migration

2026-04-07 14:16:59 -04:00
parent d0c6e30304
commit 6c92ab50c8
76 changed files with 2061 additions and 1072 deletions
--- a/apps/backend/Ships/AI/ShipAiService.BehaviorQueue.cs
+++ b/apps/backend/Ships/AI/ShipAiService.BehaviorQueue.cs
@@ -288,7 +288,7 @@ public sealed partial class ShipAiService
                TargetSystemId = opportunity.Node.SystemId,
                DestinationStationId = opportunity.DropOffStation.Id,
                ItemId = opportunity.Node.ItemId,
-                NodeId = opportunity.Node.Id,
+                AnchorId = opportunity.Node.AnchorId,
                MaxSystemRange = ship.DefaultBehavior.MaxSystemRange,
                KnownStationsOnly = ship.DefaultBehavior.KnownStationsOnly,
            };
@@ -509,7 +509,7 @@ public sealed partial class ShipAiService
                SourceStationId = template.SourceStationId,
                DestinationStationId = template.DestinationStationId,
                ItemId = template.ItemId,
-                NodeId = template.NodeId,
+                AnchorId = template.AnchorId,
                ConstructionSiteId = template.ConstructionSiteId,
                ModuleId = template.ModuleId,
                WaitSeconds = template.WaitSeconds,
@@ -561,7 +561,7 @@ public sealed partial class ShipAiService
            };
        }

-        var node = SelectLocalMiningNode(world, ship, systemId, itemId);
+        var node = SelectLocalMiningNode(world, ship, systemId, itemId, ship.DefaultBehavior.PreferredAnchorId);
        if (node is null)
        {
            ship.LastAccessFailureReason = "no-mineable-node";
@@ -578,8 +578,9 @@ public sealed partial class ShipAiService
            Priority = 0,
            InterruptCurrentPlan = false,
            Label = $"Mine {itemId} in {systemId}",
+            TargetEntityId = node.Id,
            TargetSystemId = node.SystemId,
-            NodeId = node.Id,
+            AnchorId = node.AnchorId,
            ItemId = node.ItemId,
            WaitSeconds = 0f,
            Radius = 0f,
@@ -601,7 +602,7 @@ public sealed partial class ShipAiService
      && left.TargetPosition == right.TargetPosition
      && string.Equals(left.DestinationStationId, right.DestinationStationId, StringComparison.Ordinal)
      && string.Equals(left.ItemId, right.ItemId, StringComparison.Ordinal)
-      && string.Equals(left.NodeId, right.NodeId, StringComparison.Ordinal)
+      && string.Equals(left.AnchorId, right.AnchorId, StringComparison.Ordinal)
      && left.WaitSeconds.Equals(right.WaitSeconds)
      && left.Radius.Equals(right.Radius)
      && left.MaxSystemRange == right.MaxSystemRange
--- a/apps/backend/Ships/AI/ShipAiService.Execution.cs
+++ b/apps/backend/Ships/AI/ShipAiService.Execution.cs
@@ -69,7 +69,7 @@ public sealed partial class ShipAiService
        }

        var targetPosition = ResolveCurrentTargetPosition(world, subTask);
-        var targetCelestial = ResolveTravelTargetCelestial(world, subTask, targetPosition);
+        var targetAnchor = ResolveTravelTargetAnchor(world, subTask, targetPosition);
        ship.TargetPosition = targetPosition;

        if (ship.SystemId != subTask.TargetSystemId)
@@ -81,32 +81,33 @@ public sealed partial class ShipAiService
                return SubTaskOutcome.Failed;
            }

-            var destinationEntryCelestial = ResolveSystemEntryCelestial(world, subTask.TargetSystemId);
-            var destinationEntryPosition = destinationEntryCelestial?.Position ?? targetPosition;
-            return UpdateFtlTransit(world, ship, subTask, deltaSeconds, subTask.TargetSystemId, destinationEntryPosition, destinationEntryCelestial, completeOnArrival, targetPosition);
+            var destinationEntryAnchor = ResolveSystemEntryAnchor(world, subTask.TargetSystemId) ?? targetAnchor;
+            var destinationEntryPosition = destinationEntryAnchor?.Position ?? targetPosition;
+            return UpdateFtlTransit(world, ship, subTask, deltaSeconds, subTask.TargetSystemId, destinationEntryPosition, destinationEntryAnchor, completeOnArrival, targetPosition, targetAnchor);
        }

-        var currentCelestial = ResolveCurrentCelestial(world, ship);
-        if (targetCelestial is not null
-            && currentCelestial is not null
-            && !string.Equals(currentCelestial.Id, targetCelestial.Id, StringComparison.Ordinal))
+        var currentAnchor = ResolveCurrentAnchor(world, ship);
+        if (targetAnchor is not null
+            && currentAnchor is not null
+            && !string.Equals(currentAnchor.Id, targetAnchor.Id, StringComparison.Ordinal))
        {
            if (!CanWarp(ship.Definition))
            {
-                return UpdateLocalTravel(world, ship, subTask, deltaSeconds, subTask.TargetSystemId, targetPosition, targetCelestial, completeOnArrival);
+                return UpdateLocalTravel(world, ship, subTask, deltaSeconds, subTask.TargetSystemId, targetPosition, currentAnchor, targetAnchor, completeOnArrival);
            }

-            return UpdateWarpTransit(world, ship, subTask, deltaSeconds, targetPosition, targetCelestial, completeOnArrival);
+            return UpdateWarpTransit(world, ship, subTask, deltaSeconds, targetPosition, currentAnchor, targetAnchor, completeOnArrival);
        }

-        if (targetCelestial is not null
-            && ship.Position.DistanceTo(targetPosition) > WarpEngageDistanceKilometers
+        if (targetAnchor is not null
+            && currentAnchor is not null
+            && !string.Equals(currentAnchor.Id, targetAnchor.Id, StringComparison.Ordinal)
            && CanWarp(ship.Definition))
        {
-            return UpdateWarpTransit(world, ship, subTask, deltaSeconds, targetPosition, targetCelestial, completeOnArrival);
+            return UpdateWarpTransit(world, ship, subTask, deltaSeconds, targetPosition, currentAnchor, targetAnchor, completeOnArrival);
        }

-        return UpdateLocalTravel(world, ship, subTask, deltaSeconds, subTask.TargetSystemId, targetPosition, targetCelestial, completeOnArrival);
+        return UpdateLocalTravel(world, ship, subTask, deltaSeconds, subTask.TargetSystemId, targetPosition, currentAnchor, targetAnchor, completeOnArrival);
    }

    private SubTaskOutcome UpdateAttackSubTask(SimulationWorld world, ShipRuntime ship, ShipSubTaskRuntime subTask, float deltaSeconds)
@@ -157,7 +158,7 @@ public sealed partial class ShipAiService

    private SubTaskOutcome UpdateMineSubTask(SimulationWorld world, ShipRuntime ship, ShipSubTaskRuntime subTask, float deltaSeconds)
    {
-        var node = ResolveNode(world, subTask.TargetEntityId ?? subTask.TargetNodeId);
+        var node = ResolveNode(world, subTask.TargetResourceNodeId ?? subTask.TargetEntityId);
        if (node is null || !CanExtractNode(ship, node, world))
        {
            subTask.BlockingReason = "node-missing";
@@ -165,9 +166,28 @@ public sealed partial class ShipAiService
            return SubTaskOutcome.Failed;
        }

-        var targetPosition = subTask.TargetPosition ?? GetResourceHoldPosition(node.Position, ship.Id, 20f);
+        var deposit = ResolveResourceDeposit(world, subTask.TargetResourceDepositId);
+        if (deposit is null || !string.Equals(deposit.NodeId, node.Id, StringComparison.Ordinal) || deposit.OreRemaining <= 0.01f)
+        {
+            deposit = SelectMiningDeposit(node, ship.Id);
+            subTask.TargetResourceDepositId = deposit?.Id;
+        }
+
+        if (deposit is null)
+        {
+            SyncNodeOreTotals(node);
+            return SubTaskOutcome.Completed;
+        }
+
+        var targetPosition = GetResourceHoldPosition(deposit.Position, ship.Id, 20f);
+        subTask.TargetPosition = targetPosition;
+        var approachThreshold = MathF.Max(subTask.Threshold, 8f);
+        var distanceToTarget = ship.Position.DistanceTo(targetPosition);
+        var distanceToDeposit = ship.Position.DistanceTo(deposit.Position);
+        var effectivelyAtDeposit = string.Equals(ship.SpatialState.CurrentAnchorId, node.AnchorId, StringComparison.Ordinal)
+            && distanceToDeposit <= approachThreshold;
        ship.TargetPosition = targetPosition;
-        if (ship.Position.DistanceTo(targetPosition) > MathF.Max(subTask.Threshold, 8f))
+        if (distanceToTarget > approachThreshold && !effectivelyAtDeposit)
        {
            ship.State = ShipState.MiningApproach;
            ship.Position = ship.Position.MoveToward(targetPosition, GetLocalTravelSpeed(ship) * deltaSeconds);
@@ -188,14 +208,15 @@ public sealed partial class ShipAiService

        var remainingCapacity = MathF.Max(0f, ship.Definition.GetTotalCargoCapacity() - cargoAmount);
        var mined = MathF.Min(balance.MiningRate * GetSkillFactor(ship.Skills.Mining), remainingCapacity);
-        mined = MathF.Min(mined, node.OreRemaining);
+        mined = MathF.Min(mined, deposit.OreRemaining);
        if (mined <= 0.01f)
        {
            return SubTaskOutcome.Completed;
        }

        AddInventory(ship.Inventory, node.ItemId, mined);
-        node.OreRemaining = MathF.Max(0f, node.OreRemaining - mined);
+        deposit.OreRemaining = MathF.Max(0f, deposit.OreRemaining - mined);
+        SyncNodeOreTotals(node);
        if (GetShipCargoAmount(ship) >= ship.Definition.GetTotalCargoCapacity() - 0.01f || node.OreRemaining <= 0.01f)
        {
            return SubTaskOutcome.Completed;
@@ -605,15 +626,22 @@ public sealed partial class ShipAiService
      float deltaSeconds,
      string targetSystemId,
      Vector3 targetPosition,
-      CelestialRuntime? targetCelestial,
+      AnchorRuntime? currentAnchor,
+      AnchorRuntime? targetAnchor,
      bool completeOnArrival)
    {
        var distance = ship.Position.DistanceTo(targetPosition);
        ship.SpatialState.SpaceLayer = SpaceLayerKind.LocalSpace;
        ship.SpatialState.MovementRegime = MovementRegimeKind.LocalFlight;
        ship.SpatialState.Transit = null;
-        ship.SpatialState.DestinationNodeId = targetCelestial?.Id;
+        ship.SpatialState.DestinationAnchorId = targetAnchor?.Id ?? currentAnchor?.Id;
        subTask.Progress = Math.Clamp(1f - (distance / MathF.Max(distance + GetLocalTravelSpeed(ship), 1f)), 0f, 1f);
+        ship.SpatialState.SystemPosition = currentAnchor is null
+          ? ship.Position
+          : new Vector3(
+              currentAnchor.Position.X + ship.Position.X,
+              currentAnchor.Position.Y + ship.Position.Y,
+              currentAnchor.Position.Z + ship.Position.Z);

        if (distance <= MathF.Max(subTask.Threshold, balance.ArrivalThreshold))
        {
@@ -621,13 +649,26 @@ public sealed partial class ShipAiService
            ship.TargetPosition = targetPosition;
            ship.SystemId = targetSystemId;
            ship.SpatialState.CurrentSystemId = targetSystemId;
-            ship.SpatialState.CurrentCelestialId = targetCelestial?.Id;
+            ship.SpatialState.CurrentAnchorId = targetAnchor?.Id ?? currentAnchor?.Id;
+            ship.SpatialState.SystemPosition = targetAnchor is null
+              ? targetPosition
+              : new Vector3(
+                  targetAnchor.Position.X + targetPosition.X,
+                  targetAnchor.Position.Y + targetPosition.Y,
+                  targetAnchor.Position.Z + targetPosition.Z);
            ship.State = ShipState.Arriving;
            return completeOnArrival ? SubTaskOutcome.Completed : SubTaskOutcome.Active;
        }

        ship.State = ShipState.LocalFlight;
+        ship.SpatialState.CurrentAnchorId = currentAnchor?.Id;
        ship.Position = ship.Position.MoveToward(targetPosition, GetLocalTravelSpeed(ship) * deltaSeconds);
+        ship.SpatialState.SystemPosition = currentAnchor is null
+          ? ship.Position
+          : new Vector3(
+              currentAnchor.Position.X + ship.Position.X,
+              currentAnchor.Position.Y + ship.Position.Y,
+              currentAnchor.Position.Z + ship.Position.Z);
        return SubTaskOutcome.Active;
    }

@@ -637,18 +678,24 @@ public sealed partial class ShipAiService
      ShipSubTaskRuntime subTask,
      float deltaSeconds,
      Vector3 targetPosition,
-      CelestialRuntime targetCelestial,
+      AnchorRuntime currentAnchor,
+      AnchorRuntime targetAnchor,
      bool completeOnArrival)
    {
        var transit = ship.SpatialState.Transit;
-        if (transit is null || transit.Regime != MovementRegimeKind.Warp || transit.DestinationNodeId != targetCelestial.Id)
+        if (transit is null || transit.Regime != MovementRegimeKind.Warp || transit.DestinationAnchorId != targetAnchor.Id)
        {
+            var originAnchorPosition = currentAnchor.Position;
+            var destinationAnchorPosition = targetAnchor.Position;
+            var initialSpoolDuration = MathF.Max(0.4f, ship.Definition.SpoolTime * 0.5f);
+            var initialTravelDuration = MathF.Max(0.1f, originAnchorPosition.DistanceTo(destinationAnchorPosition) / MathF.Max(GetWarpTravelSpeed(ship), 0.001f));
            transit = new ShipTransitRuntime
            {
                Regime = MovementRegimeKind.Warp,
-                OriginNodeId = ship.SpatialState.CurrentCelestialId,
-                DestinationNodeId = targetCelestial.Id,
+                OriginAnchorId = currentAnchor.Id,
+                DestinationAnchorId = targetAnchor.Id,
                StartedAtUtc = world.GeneratedAtUtc,
+                ArrivalDueAtUtc = world.GeneratedAtUtc.AddSeconds(initialSpoolDuration + initialTravelDuration),
            };
            ship.SpatialState.Transit = transit;
            subTask.ElapsedSeconds = 0f;
@@ -656,33 +703,47 @@ public sealed partial class ShipAiService

        ship.SpatialState.SpaceLayer = SpaceLayerKind.SystemSpace;
        ship.SpatialState.MovementRegime = MovementRegimeKind.Warp;
-        ship.SpatialState.CurrentCelestialId = null;
-        ship.SpatialState.DestinationNodeId = targetCelestial.Id;
+        ship.SpatialState.CurrentAnchorId = null;
+        ship.SpatialState.DestinationAnchorId = targetAnchor.Id;

-        var spoolDuration = MathF.Max(0.4f, ship.Definition.SpoolTime * 0.5f);
-        if (ship.State != ShipState.Warping)
+        var spoolDurationSeconds = MathF.Max(0.4f, ship.Definition.SpoolTime * 0.5f);
+        var startedAtUtc = transit.StartedAtUtc ?? world.GeneratedAtUtc;
+        var arrivalDueAtUtc = transit.ArrivalDueAtUtc ?? world.GeneratedAtUtc;
+        var totalDuration = MathF.Max(0.1f, (float)(arrivalDueAtUtc - startedAtUtc).TotalSeconds);
+        var elapsedSeconds = Math.Clamp((float)(world.GeneratedAtUtc - startedAtUtc).TotalSeconds, 0f, totalDuration);
+        var originPosition = ResolveAnchorPosition(world, transit.OriginAnchorId, currentAnchor.Position);
+        var destinationPosition = ResolveAnchorPosition(world, transit.DestinationAnchorId, targetAnchor.Position);
+
+        if (elapsedSeconds < spoolDurationSeconds)
        {
            ship.State = ShipState.SpoolingWarp;
-            if (!AdvanceTimedSubTask(subTask, deltaSeconds, spoolDuration))
-            {
-                return SubTaskOutcome.Active;
-            }
-
-            ship.State = ShipState.Warping;
+            ship.Position = Vector3.Zero;
+            ship.TargetPosition = Vector3.Zero;
+            ship.SpatialState.SystemPosition = originPosition;
+            transit.Progress = Math.Clamp(elapsedSeconds / totalDuration, 0f, 1f);
+            subTask.Progress = transit.Progress;
+            return SubTaskOutcome.Active;
        }

-        var totalDistance = MathF.Max(0.001f, transit.OriginNodeId is null
-          ? ship.Position.DistanceTo(targetPosition)
-          : (world.Celestials.FirstOrDefault(candidate => candidate.Id == transit.OriginNodeId)?.Position.DistanceTo(targetPosition) ?? ship.Position.DistanceTo(targetPosition)));
-        ship.Position = ship.Position.MoveToward(targetPosition, GetWarpTravelSpeed(ship) * deltaSeconds);
-        transit.Progress = MathF.Min(1f, 1f - (ship.Position.DistanceTo(targetPosition) / totalDistance));
+        ship.State = ShipState.Warping;
+        var warpTravelDuration = MathF.Max(0.001f, totalDuration - spoolDurationSeconds);
+        var travelElapsed = Math.Clamp(elapsedSeconds - spoolDurationSeconds, 0f, warpTravelDuration);
+        var travelProgress = Math.Clamp(travelElapsed / warpTravelDuration, 0f, 1f);
+        var travelDelta = destinationPosition.Subtract(originPosition);
+        ship.Position = Vector3.Zero;
+        ship.TargetPosition = Vector3.Zero;
+        ship.SpatialState.SystemPosition = new Vector3(
+            originPosition.X + (travelDelta.X * travelProgress),
+            originPosition.Y + (travelDelta.Y * travelProgress),
+            originPosition.Z + (travelDelta.Z * travelProgress));
+        transit.Progress = Math.Clamp(elapsedSeconds / totalDuration, 0f, 1f);
        subTask.Progress = transit.Progress;
-        if (ship.Position.DistanceTo(targetPosition) > 18f)
+        if (elapsedSeconds < totalDuration - 0.001f)
        {
            return SubTaskOutcome.Active;
        }

-        return CompleteTransitArrival(ship, subTask.TargetSystemId ?? ship.SystemId, targetPosition, targetCelestial, completeOnArrival);
+        return CompleteTransitArrival(ship, subTask.TargetSystemId ?? ship.SystemId, targetPosition, targetAnchor, completeOnArrival);
    }

    private SubTaskOutcome UpdateFtlTransit(
@@ -692,20 +753,24 @@ public sealed partial class ShipAiService
      float deltaSeconds,
      string targetSystemId,
      Vector3 entryPosition,
-      CelestialRuntime? targetCelestial,
+      AnchorRuntime? entryAnchor,
      bool completeOnArrival,
-      Vector3 finalTargetPosition)
+      Vector3 finalTargetPosition,
+      AnchorRuntime? finalTargetAnchor)
    {
-        var destinationNodeId = targetCelestial?.Id;
+        var destinationAnchorId = entryAnchor?.Id;
        var transit = ship.SpatialState.Transit;
-        if (transit is null || transit.Regime != MovementRegimeKind.FtlTransit || transit.DestinationNodeId != destinationNodeId)
+        if (transit is null || transit.Regime != MovementRegimeKind.FtlTransit || transit.DestinationAnchorId != destinationAnchorId)
        {
+            var initialTravelDuration = MathF.Max(0.1f, ResolveSystemGalaxyPosition(world, ship.SystemId).DistanceTo(ResolveSystemGalaxyPosition(world, targetSystemId)) / MathF.Max(ship.Definition.FtlSpeed * GetSkillFactor(ship.Skills.Navigation), 0.001f));
+            var initialSpoolDuration = MathF.Max(ship.Definition.SpoolTime, 0.1f);
            transit = new ShipTransitRuntime
            {
                Regime = MovementRegimeKind.FtlTransit,
-                OriginNodeId = ship.SpatialState.CurrentCelestialId,
-                DestinationNodeId = destinationNodeId,
+                OriginAnchorId = ship.SpatialState.CurrentAnchorId,
+                DestinationAnchorId = destinationAnchorId,
                StartedAtUtc = world.GeneratedAtUtc,
+                ArrivalDueAtUtc = world.GeneratedAtUtc.AddSeconds(initialSpoolDuration + initialTravelDuration),
            };
            ship.SpatialState.Transit = transit;
            subTask.ElapsedSeconds = 0f;
@@ -713,39 +778,32 @@ public sealed partial class ShipAiService

        ship.SpatialState.SpaceLayer = SpaceLayerKind.GalaxySpace;
        ship.SpatialState.MovementRegime = MovementRegimeKind.FtlTransit;
-        ship.SpatialState.CurrentCelestialId = null;
-        ship.SpatialState.DestinationNodeId = destinationNodeId;
+        ship.SpatialState.CurrentAnchorId = null;
+        ship.SpatialState.DestinationAnchorId = destinationAnchorId;

-        if (ship.State != ShipState.Ftl)
-        {
-            ship.State = ShipState.SpoolingFtl;
-            if (!AdvanceTimedSubTask(subTask, deltaSeconds, MathF.Max(ship.Definition.SpoolTime, 0.1f)))
-            {
-                return SubTaskOutcome.Active;
-            }
-
-            ship.State = ShipState.Ftl;
-        }
-
-        var originSystemPosition = ResolveSystemGalaxyPosition(world, ship.SystemId);
-        var destinationSystemPosition = ResolveSystemGalaxyPosition(world, targetSystemId);
-        var totalDistance = MathF.Max(0.001f, originSystemPosition.DistanceTo(destinationSystemPosition));
-        transit.Progress = MathF.Min(1f, transit.Progress + ((ship.Definition.FtlSpeed * GetSkillFactor(ship.Skills.Navigation)) * deltaSeconds / totalDistance));
+        var spoolDurationSeconds = MathF.Max(ship.Definition.SpoolTime, 0.1f);
+        var startedAtUtc = transit.StartedAtUtc ?? world.GeneratedAtUtc;
+        var arrivalDueAtUtc = transit.ArrivalDueAtUtc ?? world.GeneratedAtUtc;
+        var totalDuration = MathF.Max(0.1f, (float)(arrivalDueAtUtc - startedAtUtc).TotalSeconds);
+        var elapsedSeconds = Math.Clamp((float)(world.GeneratedAtUtc - startedAtUtc).TotalSeconds, 0f, totalDuration);
+        ship.State = elapsedSeconds < spoolDurationSeconds ? ShipState.SpoolingFtl : ShipState.Ftl;
+        transit.Progress = Math.Clamp(elapsedSeconds / totalDuration, 0f, 1f);
        subTask.Progress = transit.Progress;
-        if (transit.Progress < 0.999f)
+        if (elapsedSeconds < totalDuration - 0.001f)
        {
            return SubTaskOutcome.Active;
        }

-        ship.Position = entryPosition;
+        ship.Position = Vector3.Zero;
        ship.TargetPosition = finalTargetPosition;
        ship.SystemId = targetSystemId;
        ship.SpatialState.CurrentSystemId = targetSystemId;
        ship.SpatialState.Transit = null;
        ship.SpatialState.SpaceLayer = SpaceLayerKind.LocalSpace;
        ship.SpatialState.MovementRegime = MovementRegimeKind.LocalFlight;
-        ship.SpatialState.CurrentCelestialId = targetCelestial?.Id;
-        ship.SpatialState.DestinationNodeId = targetCelestial?.Id;
+        ship.SpatialState.CurrentAnchorId = entryAnchor?.Id;
+        ship.SpatialState.DestinationAnchorId = finalTargetAnchor?.Id ?? entryAnchor?.Id;
+        ship.SpatialState.SystemPosition = entryPosition;
        ship.State = ShipState.Arriving;

        // Cross-system travel is only complete once the ship finishes the
@@ -753,7 +811,7 @@ public sealed partial class ShipAiService
        return SubTaskOutcome.Active;
    }

-    private static SubTaskOutcome CompleteTransitArrival(ShipRuntime ship, string targetSystemId, Vector3 targetPosition, CelestialRuntime? targetCelestial, bool completeOnArrival)
+    private static SubTaskOutcome CompleteTransitArrival(ShipRuntime ship, string targetSystemId, Vector3 targetPosition, AnchorRuntime? targetAnchor, bool completeOnArrival)
    {
        ship.Position = targetPosition;
        ship.TargetPosition = targetPosition;
@@ -762,8 +820,14 @@ public sealed partial class ShipAiService
        ship.SpatialState.Transit = null;
        ship.SpatialState.SpaceLayer = SpaceLayerKind.LocalSpace;
        ship.SpatialState.MovementRegime = MovementRegimeKind.LocalFlight;
-        ship.SpatialState.CurrentCelestialId = targetCelestial?.Id;
-        ship.SpatialState.DestinationNodeId = targetCelestial?.Id;
+        ship.SpatialState.CurrentAnchorId = targetAnchor?.Id;
+        ship.SpatialState.DestinationAnchorId = targetAnchor?.Id;
+        ship.SpatialState.SystemPosition = targetAnchor is null
+          ? targetPosition
+          : new Vector3(
+              targetAnchor.Position.X + targetPosition.X,
+              targetAnchor.Position.Y + targetPosition.Y,
+              targetAnchor.Position.Z + targetPosition.Z);
        ship.State = ShipState.Arriving;
        return completeOnArrival ? SubTaskOutcome.Completed : SubTaskOutcome.Active;
    }
--- a/apps/backend/Ships/AI/ShipAiService.Helpers.cs
+++ b/apps/backend/Ships/AI/ShipAiService.Helpers.cs
@@ -9,6 +9,11 @@ public sealed partial class ShipAiService
 {
    private static Vector3 ResolveCurrentTargetPosition(SimulationWorld world, ShipSubTaskRuntime subTask)
    {
+        if (!string.IsNullOrWhiteSpace(subTask.TargetAnchorId) && ResolveAnchor(world, subTask.TargetAnchorId) is not null)
+        {
+            return subTask.TargetPosition ?? Vector3.Zero;
+        }
+
        if (!string.IsNullOrWhiteSpace(subTask.TargetEntityId))
        {
            var ship = world.Ships.FirstOrDefault(candidate => candidate.Id == subTask.TargetEntityId);
@@ -44,15 +49,20 @@ public sealed partial class ShipAiService
        if (!string.IsNullOrWhiteSpace(subTask.TargetEntityId))
        {
            var station = ResolveStation(world, subTask.TargetEntityId);
-            if (station?.CelestialId is not null)
+            if (station?.AnchorId is not null)
            {
-                return world.Celestials.FirstOrDefault(candidate => candidate.Id == station.CelestialId);
+                return ResolveAnchorBackedCelestial(world, station.AnchorId);
            }

            var site = world.ConstructionSites.FirstOrDefault(candidate => candidate.Id == subTask.TargetEntityId);
-            if (site?.CelestialId is not null)
+            if (site?.AnchorId is not null)
            {
-                return world.Celestials.FirstOrDefault(candidate => candidate.Id == site.CelestialId);
+                return ResolveAnchorBackedCelestial(world, site.AnchorId);
+            }
+
+            if (ResolveAnchor(world, subTask.TargetEntityId) is { } anchorBackedCelestialTarget)
+            {
+                return ResolveAnchorBackedCelestial(world, anchorBackedCelestialTarget.Id);
            }

            var celestial = world.Celestials.FirstOrDefault(candidate => candidate.Id == subTask.TargetEntityId);
@@ -76,25 +86,145 @@ public sealed partial class ShipAiService
          .FirstOrDefault();
    }

+    private static AnchorRuntime? ResolveTravelTargetAnchor(SimulationWorld world, ShipSubTaskRuntime subTask, Vector3 targetPosition)
+    {
+        if (!string.IsNullOrWhiteSpace(subTask.TargetAnchorId) && ResolveAnchor(world, subTask.TargetAnchorId) is { } explicitTargetAnchor)
+        {
+            return explicitTargetAnchor;
+        }
+
+        if (!string.IsNullOrWhiteSpace(subTask.TargetEntityId))
+        {
+            var station = ResolveStation(world, subTask.TargetEntityId);
+            if (station?.AnchorId is not null)
+            {
+                return ResolveAnchor(world, station.AnchorId);
+            }
+
+            var site = world.ConstructionSites.FirstOrDefault(candidate => candidate.Id == subTask.TargetEntityId);
+            if (site?.AnchorId is not null)
+            {
+                return ResolveAnchor(world, site.AnchorId);
+            }
+
+            var node = ResolveNode(world, subTask.TargetEntityId);
+            if (node is not null)
+            {
+                return ResolveAnchor(world, node.AnchorId);
+            }
+
+            if (ResolveAnchor(world, subTask.TargetEntityId) is { } directAnchor)
+            {
+                return directAnchor;
+            }
+
+            if (world.Celestials.FirstOrDefault(candidate => candidate.Id == subTask.TargetEntityId) is { } celestial)
+            {
+                return ResolveAnchor(world, celestial.Id);
+            }
+
+            if (world.Wrecks.FirstOrDefault(candidate => candidate.Id == subTask.TargetEntityId) is { } wreck)
+            {
+                return world.Anchors
+                  .Where(candidate => candidate.SystemId == wreck.SystemId)
+                  .OrderBy(candidate => candidate.Position.DistanceTo(wreck.Position))
+                  .FirstOrDefault();
+            }
+        }
+
+        return world.Anchors
+          .Where(candidate => subTask.TargetSystemId is null || candidate.SystemId == subTask.TargetSystemId)
+          .OrderBy(candidate => candidate.Position.DistanceTo(targetPosition))
+          .FirstOrDefault();
+    }
+
+    private static AnchorRuntime? ResolveCurrentAnchor(SimulationWorld world, ShipRuntime ship)
+    {
+        if (ship.SpatialState.CurrentAnchorId is not null && ResolveAnchor(world, ship.SpatialState.CurrentAnchorId) is { } explicitAnchor)
+        {
+            return explicitAnchor;
+        }
+
+        if (ship.DockedStationId is not null && ResolveStation(world, ship.DockedStationId)?.AnchorId is { } dockAnchorId)
+        {
+            return ResolveAnchor(world, dockAnchorId);
+        }
+
+        return world.Anchors
+          .Where(candidate => candidate.SystemId == ship.SystemId)
+          .OrderBy(candidate => candidate.Position.DistanceTo(ResolveShipSystemPosition(world, ship)))
+          .FirstOrDefault();
+    }
+
    private static CelestialRuntime? ResolveCurrentCelestial(SimulationWorld world, ShipRuntime ship)
    {
-        if (ship.SpatialState.CurrentCelestialId is not null)
+        if (ship.SpatialState.CurrentAnchorId is not null && ResolveAnchorBackedCelestial(world, ship.SpatialState.CurrentAnchorId) is { } currentAnchorCelestial)
        {
-            return world.Celestials.FirstOrDefault(candidate => candidate.Id == ship.SpatialState.CurrentCelestialId);
+            return currentAnchorCelestial;
        }

        return world.Celestials
          .Where(candidate => candidate.SystemId == ship.SystemId)
-          .OrderBy(candidate => candidate.Position.DistanceTo(ship.Position))
+          .OrderBy(candidate => candidate.Position.DistanceTo(ResolveShipSystemPosition(world, ship)))
          .FirstOrDefault();
    }

    private static CelestialRuntime? ResolveSystemEntryCelestial(SimulationWorld world, string systemId) =>
      world.Celestials.FirstOrDefault(candidate => candidate.SystemId == systemId && candidate.Kind == SpatialNodeKind.Star);

+    private static AnchorRuntime? ResolveSystemEntryAnchor(SimulationWorld world, string systemId) =>
+      world.Anchors.FirstOrDefault(candidate => candidate.SystemId == systemId && candidate.Kind == SpatialNodeKind.Star);
+
    private static Vector3 ResolveSystemGalaxyPosition(SimulationWorld world, string systemId) =>
      world.Systems.FirstOrDefault(candidate => candidate.Definition.Id == systemId)?.Position ?? Vector3.Zero;

+    private static Vector3 ResolveAnchorPosition(SimulationWorld world, string? anchorId, Vector3 fallbackPosition) =>
+      ResolveAnchor(world, anchorId)?.Position ?? fallbackPosition;
+
+    private static Vector3 ResolveStationSystemPosition(SimulationWorld world, StationRuntime station)
+    {
+        if (station.AnchorId is not null && ResolveAnchor(world, station.AnchorId) is { } anchor)
+        {
+            return new Vector3(
+              anchor.Position.X + station.Position.X,
+              anchor.Position.Y + station.Position.Y,
+              anchor.Position.Z + station.Position.Z);
+        }
+
+        return station.Position;
+    }
+
+    private static Vector3 ResolveNodeSystemPosition(SimulationWorld world, ResourceNodeRuntime node)
+    {
+        if (ResolveAnchor(world, node.AnchorId) is { } anchor)
+        {
+            return new Vector3(
+              anchor.Position.X + node.Position.X,
+              anchor.Position.Y + node.Position.Y,
+              anchor.Position.Z + node.Position.Z);
+        }
+
+        return node.Position;
+    }
+
+    private static Vector3 ResolveShipSystemPosition(SimulationWorld world, ShipRuntime ship)
+    {
+        if (ship.SpatialState.SystemPosition is { } systemPosition)
+        {
+            return systemPosition;
+        }
+
+        if (ResolveCurrentAnchor(world, ship) is { } anchor)
+        {
+            return new Vector3(
+              anchor.Position.X + ship.Position.X,
+              anchor.Position.Y + ship.Position.Y,
+              anchor.Position.Z + ship.Position.Z);
+        }
+
+        return ship.Position;
+    }
+
    private static float GetLocalTravelSpeed(ShipRuntime ship) =>
      SimulationUnits.MetersPerSecondToKilometersPerSecond(ship.Definition.Speed) * GetSkillFactor(ship.Skills.Navigation);

@@ -183,6 +313,7 @@ public sealed partial class ShipAiService
    {
        var policy = ResolvePolicy(world, ship.PolicySetId);
        var preferredItemId = assignment?.ItemId ?? ship.DefaultBehavior.ItemId;
+        var preferredAnchorId = ship.DefaultBehavior.PreferredAnchorId;
        var rangeBudget = ResolveBehaviorSystemRange(world, ship, behaviorKind, ship.DefaultBehavior.MaxSystemRange);
        var effectiveMiningSkill = GetEffectiveSkillLevel(world, ship, skills => skills.Mining, skills => skills.Coordination);
        string? deniedReason = null;
@@ -194,6 +325,11 @@ public sealed partial class ShipAiService
                  return false;
              }

+               if (preferredAnchorId is not null && !string.Equals(node.AnchorId, preferredAnchorId, StringComparison.Ordinal))
+               {
+                   return false;
+               }
+
              if (!TryCheckSystemAllowed(world, policy, ship.FactionId, node.SystemId, "military", out var reason))
              {
                  deniedReason ??= reason;
@@ -214,7 +350,7 @@ public sealed partial class ShipAiService
            + (effectiveMiningSkill * 10f)
            - distancePenalty
            - routeRiskPenalty
-            - node.Position.DistanceTo(ship.Position);
+            - ResolveNodeSystemPosition(world, node).DistanceTo(ResolveShipSystemPosition(world, ship));
              return new MiningOpportunity(node, buyer, score, $"Mine {node.ItemId} for {buyer.Label}");
          })
          .OrderByDescending(candidate => candidate.Score)
@@ -452,7 +588,7 @@ public sealed partial class ShipAiService
          ?? homeStation;
    }

-    private static ResourceNodeRuntime? SelectLocalMiningNode(SimulationWorld world, ShipRuntime ship, string systemId, string itemId)
+    private static ResourceNodeRuntime? SelectLocalMiningNode(SimulationWorld world, ShipRuntime ship, string systemId, string itemId, string? anchorId = null)
    {
        var policy = ResolvePolicy(world, ship.PolicySetId);
        string? deniedReason = null;
@@ -467,6 +603,11 @@ public sealed partial class ShipAiService
                  return false;
              }

+              if (anchorId is not null && !string.Equals(candidate.AnchorId, anchorId, StringComparison.Ordinal))
+              {
+                  return false;
+              }
+
              if (!TryCheckSystemAllowed(world, policy, ship.FactionId, candidate.SystemId, "military", out var reason))
              {
                  deniedReason ??= reason;
@@ -487,6 +628,54 @@ public sealed partial class ShipAiService
        return node;
    }

+    private static ResourceDepositRuntime? ResolveResourceDeposit(SimulationWorld world, string? depositId)
+    {
+        if (string.IsNullOrWhiteSpace(depositId))
+        {
+            return null;
+        }
+
+        foreach (var node in world.Nodes)
+        {
+            var deposit = node.Deposits.FirstOrDefault(candidate => string.Equals(candidate.Id, depositId, StringComparison.Ordinal));
+            if (deposit is not null)
+            {
+                return deposit;
+            }
+        }
+
+        return null;
+    }
+
+    private static ResourceDepositRuntime? SelectMiningDeposit(ResourceNodeRuntime node, string shipId)
+    {
+        return node.Deposits
+          .Where(candidate => candidate.OreRemaining > 0.01f)
+          .OrderByDescending(candidate => candidate.OreRemaining)
+          .ThenBy(candidate => candidate.Id, StringComparer.Ordinal)
+          .FirstOrDefault();
+    }
+
+    private static void SyncNodeOreTotals(ResourceNodeRuntime node)
+    {
+        node.OreRemaining = node.Deposits.Sum(candidate => candidate.OreRemaining);
+    }
+
+    private static AnchorRuntime? ResolveMiningAnchor(SimulationWorld world, string? anchorId, string? nodeId)
+    {
+        if (anchorId is not null)
+        {
+            return ResolveAnchor(world, anchorId);
+        }
+
+        if (nodeId is not null && ResolveNode(world, nodeId) is { } node)
+        {
+            return ResolveAnchor(world, node.AnchorId);
+        }
+
+        return null;
+    }
+
    private static StationRuntime? SelectLocalAutoMineBuyer(SimulationWorld world, ShipRuntime ship, string systemId, string itemId)
    {
        var policy = ResolvePolicy(world, ship.PolicySetId);
@@ -686,9 +875,14 @@ public sealed partial class ShipAiService
            return (celestial.SystemId, celestial.Position);
        }

+        if (ResolveAnchor(world, entityId) is { } anchor)
+        {
+            return (anchor.SystemId, anchor.Position);
+        }
+
        if (world.ConstructionSites.FirstOrDefault(candidate => candidate.Id == entityId) is { } site)
        {
-            var position = world.Celestials.FirstOrDefault(candidate => candidate.Id == site.CelestialId)?.Position ?? Vector3.Zero;
+            var position = ResolveAnchor(world, site.AnchorId)?.Position ?? Vector3.Zero;
            return (site.SystemId, position);
        }

@@ -720,6 +914,16 @@ public sealed partial class ShipAiService
    private static StationRuntime? ResolveStation(SimulationWorld world, string? stationId) =>
      stationId is null ? null : world.Stations.FirstOrDefault(candidate => candidate.Id == stationId);

+    private static AnchorRuntime? ResolveAnchor(SimulationWorld world, string? anchorId) =>
+      anchorId is null ? null : world.Anchors.FirstOrDefault(candidate => candidate.Id == anchorId);
+
+    private static CelestialRuntime? ResolveAnchorBackedCelestial(SimulationWorld world, string? anchorId)
+    {
+        var anchor = ResolveAnchor(world, anchorId);
+        var celestialId = SpatialBuilder.ResolveCompatibleCelestialId(anchor);
+        return celestialId is null ? null : world.Celestials.FirstOrDefault(candidate => candidate.Id == celestialId);
+    }
+
    private static ResourceNodeRuntime? ResolveNode(SimulationWorld world, string? nodeId) =>
      nodeId is null ? null : world.Nodes.FirstOrDefault(candidate => candidate.Id == nodeId);

@@ -815,7 +1019,8 @@ public sealed partial class ShipAiService

        if (site?.StationId is null && site is not null)
        {
-            var anchorPosition = world.Celestials.FirstOrDefault(candidate => candidate.Id == site.CelestialId)?.Position ?? station.Position;
+            var anchorPosition = ResolveAnchor(world, site.AnchorId)?.Position
+              ?? station.Position;
            return GetResourceHoldPosition(anchorPosition, ship.Id, 78f);
        }

@@ -867,7 +1072,7 @@ public sealed partial class ShipAiService

    private static void CompleteStationFoundation(SimulationWorld world, StationRuntime supportStation, ConstructionSiteRuntime site)
    {
-        var anchor = world.Celestials.FirstOrDefault(candidate => candidate.Id == site.CelestialId);
+        var anchor = ResolveAnchor(world, site.AnchorId);
        if (anchor is null || site.BlueprintId is null)
        {
            site.State = ConstructionSiteStateKinds.Destroyed;
@@ -878,13 +1083,13 @@ public sealed partial class ShipAiService
        {
            Id = $"station-{world.Stations.Count + 1}",
            SystemId = site.SystemId,
+            AnchorId = site.AnchorId,
            Label = BuildFoundedStationLabel(site.TargetDefinitionId),
            Category = "station",
            Objective = DetermineFoundationObjective(site.TargetDefinitionId),
            Color = world.Factions.FirstOrDefault(candidate => candidate.Id == site.FactionId)?.Color ?? supportStation.Color,
-            Position = anchor.Position,
+            Position = Vector3.Zero,
            FactionId = site.FactionId,
-            CelestialId = site.CelestialId,
            Health = 600f,
            MaxHealth = 600f,
        };
--- a/apps/backend/Ships/AI/ShipAiService.Planning.Behaviors.cs
+++ b/apps/backend/Ships/AI/ShipAiService.Planning.Behaviors.cs
@@ -128,11 +128,11 @@ public sealed partial class ShipAiService
            CreateStep("step-construction-deliver", "deliver-materials", $"Deliver materials to {site.Id}",
        [
          CreateSubTask("sub-construction-travel", ShipTaskKinds.Travel, $"Travel to support station {supportStation.Label}", supportStation.SystemId, targetPosition, supportStation.Id, MathF.Max(supportStation.Radius + 18f, 18f), 0f),
-          CreateSubTask("sub-construction-deliver", ShipTaskKinds.DeliverConstruction, $"Deliver materials to {site.Id}", site.SystemId, site.CelestialId is null ? supportStation.Position : supportStation.Position, site.Id, 12f, 0f)
+          CreateSubTask("sub-construction-deliver", ShipTaskKinds.DeliverConstruction, $"Deliver materials to {site.Id}", site.SystemId, supportStation.Position, site.Id, 12f, 0f)
        ]),
        CreateStep("step-construction-build", "build-site", $"Build {site.Id}",
        [
-          CreateSubTask("sub-construction-build", ShipTaskKinds.BuildConstructionSite, $"Build {site.Id}", site.SystemId, site.CelestialId is null ? supportStation.Position : supportStation.Position, site.Id, 12f, 0f)
+          CreateSubTask("sub-construction-build", ShipTaskKinds.BuildConstructionSite, $"Build {site.Id}", site.SystemId, supportStation.Position, site.Id, 12f, 0f)
        ])
          ]);
    }
@@ -301,7 +301,9 @@ public sealed partial class ShipAiService
      float amount,
      string? itemId = null,
      string? moduleId = null,
-      string? targetNodeId = null) =>
+      string? targetAnchorId = null,
+      string? targetResourceNodeId = null,
+      string? targetResourceDepositId = null) =>
      new()
      {
          Id = id,
@@ -310,7 +312,9 @@ public sealed partial class ShipAiService
          TargetSystemId = targetSystemId,
          TargetPosition = targetPosition,
          TargetEntityId = targetEntityId,
-          TargetNodeId = targetNodeId,
+          TargetAnchorId = targetAnchorId,
+          TargetResourceNodeId = targetResourceNodeId,
+          TargetResourceDepositId = targetResourceDepositId,
          ItemId = itemId,
          ModuleId = moduleId,
          Threshold = threshold,
--- a/apps/backend/Ships/AI/ShipAiService.Planning.Orders.cs
+++ b/apps/backend/Ships/AI/ShipAiService.Planning.Orders.cs
@@ -171,7 +171,8 @@ public sealed partial class ShipAiService
            return null;
        }

-        var node = ResolveNode(world, order.NodeId);
+        var anchor = ResolveMiningAnchor(world, order.AnchorId, order.TargetEntityId);
+        var node = ResolveNode(world, order.TargetEntityId);
        if (node is not null)
        {
            if (!string.Equals(node.SystemId, systemId, StringComparison.Ordinal))
@@ -188,7 +189,7 @@ public sealed partial class ShipAiService
        }
        else
        {
-            node = SelectLocalMiningNode(world, ship, systemId, itemId);
+            node = SelectLocalMiningNode(world, ship, systemId, itemId, anchor?.Id);
        }

        if (node is null)
@@ -197,24 +198,30 @@ public sealed partial class ShipAiService
            return null;
        }

-        return BuildLocalMiningPlan(ship, AiPlanSourceKind.Order, order.Id, node, order.Label ?? $"Mine {itemId} in {systemId}");
+        return BuildLocalMiningPlan(world, ship, AiPlanSourceKind.Order, order.Id, node, order.Label ?? $"Mine {itemId} in {systemId}");
    }

    private ShipPlanRuntime? BuildMineLocalOrderPlan(SimulationWorld world, ShipRuntime ship, ShipOrderRuntime order)
    {
-        var node = ResolveNode(world, order.NodeId);
+        var anchor = ResolveMiningAnchor(world, order.AnchorId, order.TargetEntityId);
+        var node = ResolveNode(world, order.TargetEntityId)
+          ?? SelectLocalMiningNode(world, ship, order.TargetSystemId ?? ship.SystemId, order.ItemId ?? ship.DefaultBehavior.ItemId ?? string.Empty, anchor?.Id);
        if (node is null)
        {
            order.FailureReason = "mine-order-incomplete";
            return null;
        }

-        return BuildLocalMiningPlan(ship, AiPlanSourceKind.Order, order.Id, node, order.Label ?? $"Mine {node.ItemId}");
+        return BuildLocalMiningPlan(world, ship, AiPlanSourceKind.Order, order.Id, node, order.Label ?? $"Mine {node.ItemId}");
    }

    private ShipPlanRuntime? BuildMineAndDeliverRunOrderPlan(SimulationWorld world, ShipRuntime ship, ShipOrderRuntime order)
    {
-        var node = ResolveNode(world, order.NodeId);
+        var anchor = ResolveMiningAnchor(world, order.AnchorId, order.TargetEntityId);
+        var node = ResolveNode(world, order.TargetEntityId)
+          ?? (string.IsNullOrWhiteSpace(order.ItemId)
+            ? null
+            : SelectLocalMiningNode(world, ship, order.TargetSystemId ?? ship.SystemId, order.ItemId, anchor?.Id));
        var buyer = ResolveStation(world, order.DestinationStationId);
        if (node is null || buyer is null)
        {
@@ -222,7 +229,7 @@ public sealed partial class ShipAiService
            return null;
        }

-        return BuildMiningPlan(ship, AiPlanSourceKind.Order, order.Id, node, buyer, order.Label ?? $"Mine {node.ItemId} for {buyer.Label}");
+        return BuildMiningPlan(world, ship, AiPlanSourceKind.Order, order.Id, node, buyer, order.Label ?? $"Mine {node.ItemId} for {buyer.Label}");
    }

    private ShipPlanRuntime? BuildSellMinedCargoOrderPlan(SimulationWorld world, ShipRuntime ship, ShipOrderRuntime order)
@@ -396,9 +403,10 @@ public sealed partial class ShipAiService
        return BuildFollowShipPlan(ship, AiPlanSourceKind.Order, order.Id, targetShip, MathF.Max(order.Radius, 18f), MathF.Max(2f, order.WaitSeconds), order.Label ?? $"Follow {targetShip.Definition.Name}");
    }

-    private ShipPlanRuntime BuildMiningPlan(ShipRuntime ship, AiPlanSourceKind sourceKind, string sourceId, ResourceNodeRuntime node, StationRuntime homeStation, string summary)
+    private ShipPlanRuntime BuildMiningPlan(SimulationWorld world, ShipRuntime ship, AiPlanSourceKind sourceKind, string sourceId, ResourceNodeRuntime node, StationRuntime homeStation, string summary)
    {
-        var extractionPosition = GetResourceHoldPosition(node.Position, ship.Id, 20f);
+        var deposit = SelectMiningDeposit(node, ship.Id);
+        var extractionPosition = GetResourceHoldPosition(deposit?.Position ?? Vector3.Zero, ship.Id, 20f);
        return CreatePlan(
          ship,
          sourceKind,
@@ -408,8 +416,8 @@ public sealed partial class ShipAiService
          [
            CreateStep("step-mine", "mine", $"Mine {node.ItemId}",
        [
-          CreateSubTask("sub-mine-travel", ShipTaskKinds.Travel, $"Travel to {node.ItemId} node", node.SystemId, extractionPosition, node.Id, 8f, 0f),
-          CreateSubTask("sub-mine", ShipTaskKinds.MineNode, $"Mine {node.ItemId}", node.SystemId, extractionPosition, node.Id, 8f, ship.Definition.GetTotalCargoCapacity())
+          CreateSubTask("sub-mine-travel", ShipTaskKinds.Travel, $"Travel to {node.ItemId} field", node.SystemId, Vector3.Zero, node.AnchorId, 8f, 0f, targetAnchorId: node.AnchorId),
+          CreateSubTask("sub-mine", ShipTaskKinds.MineNode, $"Mine {node.ItemId}", node.SystemId, extractionPosition, node.Id, 8f, ship.Definition.GetTotalCargoCapacity(), itemId: node.ItemId, targetAnchorId: node.AnchorId, targetResourceNodeId: node.Id, targetResourceDepositId: deposit?.Id)
        ]),
        CreateStep("step-deliver", "deliver", $"Deliver {node.ItemId} to {homeStation.Label}",
        [
@@ -421,9 +429,10 @@ public sealed partial class ShipAiService
          ]);
    }

-    private ShipPlanRuntime BuildLocalMiningPlan(ShipRuntime ship, AiPlanSourceKind sourceKind, string sourceId, ResourceNodeRuntime node, string summary)
+    private ShipPlanRuntime BuildLocalMiningPlan(SimulationWorld world, ShipRuntime ship, AiPlanSourceKind sourceKind, string sourceId, ResourceNodeRuntime node, string summary)
    {
-        var extractionPosition = GetResourceHoldPosition(node.Position, ship.Id, 20f);
+        var deposit = SelectMiningDeposit(node, ship.Id);
+        var extractionPosition = GetResourceHoldPosition(deposit?.Position ?? Vector3.Zero, ship.Id, 20f);
        return CreatePlan(
          ship,
          sourceKind,
@@ -433,8 +442,8 @@ public sealed partial class ShipAiService
          [
            CreateStep("step-mine", "mine", $"Mine {node.ItemId}",
        [
-          CreateSubTask("sub-mine-travel", ShipTaskKinds.Travel, $"Travel to {node.ItemId} node", node.SystemId, extractionPosition, node.Id, 8f, 0f),
-          CreateSubTask("sub-mine", ShipTaskKinds.MineNode, $"Mine {node.ItemId}", node.SystemId, extractionPosition, node.Id, 8f, ship.Definition.GetTotalCargoCapacity(), itemId: node.ItemId)
+          CreateSubTask("sub-mine-travel", ShipTaskKinds.Travel, $"Travel to {node.ItemId} field", node.SystemId, Vector3.Zero, node.AnchorId, 8f, 0f, targetAnchorId: node.AnchorId),
+          CreateSubTask("sub-mine", ShipTaskKinds.MineNode, $"Mine {node.ItemId}", node.SystemId, extractionPosition, node.Id, 8f, ship.Definition.GetTotalCargoCapacity(), itemId: node.ItemId, targetAnchorId: node.AnchorId, targetResourceNodeId: node.Id, targetResourceDepositId: deposit?.Id)
        ])
          ]);
    }
--- a/apps/backend/Ships/Contracts/ShipCommands.cs
+++ b/apps/backend/Ships/Contracts/ShipCommands.cs
@@ -11,7 +11,7 @@ public sealed record ShipOrderCommandRequest(
  string? SourceStationId,
  string? DestinationStationId,
  string? ItemId,
-  string? NodeId,
+  string? AnchorId,
  string? ConstructionSiteId,
  string? ModuleId,
  float? WaitSeconds,
@@ -28,7 +28,7 @@ public sealed record ShipOrderTemplateCommandRequest(
  string? SourceStationId,
  string? DestinationStationId,
  string? ItemId,
-  string? NodeId,
+  string? AnchorId,
  string? ConstructionSiteId,
  string? ModuleId,
  float? WaitSeconds,
@@ -43,7 +43,7 @@ public sealed record ShipDefaultBehaviorCommandRequest(
  string? AreaSystemId,
  string? TargetEntityId,
  string? ItemId,
-  string? PreferredNodeId,
+  string? PreferredAnchorId,
  string? PreferredConstructionSiteId,
  string? PreferredModuleId,
  Vector3Dto? TargetPosition,
--- a/apps/backend/Ships/Contracts/Ships.cs
+++ b/apps/backend/Ships/Contracts/Ships.cs
@@ -23,7 +23,7 @@ public sealed record ShipOrderSnapshot(
  string? SourceStationId,
  string? DestinationStationId,
  string? ItemId,
-  string? NodeId,
+  string? AnchorId,
  string? ConstructionSiteId,
  string? ModuleId,
  float WaitSeconds,
@@ -41,7 +41,7 @@ public sealed record ShipOrderTemplateSnapshot(
  string? SourceStationId,
  string? DestinationStationId,
  string? ItemId,
-  string? NodeId,
+  string? AnchorId,
  string? ConstructionSiteId,
  string? ModuleId,
  float WaitSeconds,
@@ -56,7 +56,7 @@ public sealed record DefaultBehaviorSnapshot(
  string? AreaSystemId,
  string? TargetEntityId,
  string? ItemId,
-  string? PreferredNodeId,
+  string? PreferredAnchorId,
  string? PreferredConstructionSiteId,
  string? PreferredModuleId,
  Vector3Dto? TargetPosition,
@@ -95,7 +95,9 @@ public sealed record ShipSubTaskSnapshot(
  string Summary,
  string? TargetEntityId,
  string? TargetSystemId,
-  string? TargetNodeId,
+  string? TargetAnchorId,
+  string? TargetResourceNodeId,
+  string? TargetResourceDepositId,
  Vector3Dto? TargetPosition,
  string? ItemId,
  string? ModuleId,
@@ -135,6 +137,7 @@ public sealed record ShipSnapshot(
  string Purpose,
  string Type,
  string SystemId,
+  string? AnchorId,
  Vector3Dto LocalPosition,
  Vector3Dto LocalVelocity,
  Vector3Dto TargetLocalPosition,
@@ -151,11 +154,11 @@ public sealed record ShipSnapshot(
  string? ControlReason,
  string? LastReplanReason,
  string? LastAccessFailureReason,
-  string? CelestialId,
  string? DockedStationId,
  string? CommanderId,
  string? PolicySetId,
  float CargoCapacity,
+  IReadOnlyList<string> CargoTypes,
  float TravelSpeed,
  string TravelSpeedUnit,
  IReadOnlyList<InventoryEntry> Inventory,
@@ -170,6 +173,7 @@ public sealed record ShipDelta(
  string Purpose,
  string Type,
  string SystemId,
+  string? AnchorId,
  Vector3Dto LocalPosition,
  Vector3Dto LocalVelocity,
  Vector3Dto TargetLocalPosition,
@@ -186,11 +190,11 @@ public sealed record ShipDelta(
  string? ControlReason,
  string? LastReplanReason,
  string? LastAccessFailureReason,
-  string? CelestialId,
  string? DockedStationId,
  string? CommanderId,
  string? PolicySetId,
  float CargoCapacity,
+  IReadOnlyList<string> CargoTypes,
  float TravelSpeed,
  string TravelSpeedUnit,
  IReadOnlyList<InventoryEntry> Inventory,
@@ -202,17 +206,17 @@ public sealed record ShipDelta(
 public sealed record ShipSpatialStateSnapshot(
  string SpaceLayer,
  string CurrentSystemId,
-  string? CurrentCelestialId,
+  string? CurrentAnchorId,
  Vector3Dto? LocalPosition,
  Vector3Dto? SystemPosition,
  string MovementRegime,
-  string? DestinationNodeId,
+  string? DestinationAnchorId,
  ShipTransitSnapshot? Transit);

 public sealed record ShipTransitSnapshot(
  string Regime,
-  string? OriginNodeId,
-  string? DestinationNodeId,
+  string? OriginAnchorId,
+  string? DestinationAnchorId,
  DateTimeOffset? StartedAtUtc,
  DateTimeOffset? ArrivalDueAtUtc,
  float Progress);
--- a/apps/backend/Ships/Runtime/ShipRuntimeModels.cs
+++ b/apps/backend/Ships/Runtime/ShipRuntimeModels.cs
@@ -60,7 +60,7 @@ public sealed class ShipOrderRuntime
    public string? SourceStationId { get; set; }
    public string? DestinationStationId { get; set; }
    public string? ItemId { get; set; }
-    public string? NodeId { get; set; }
+    public string? AnchorId { get; set; }
    public string? ConstructionSiteId { get; set; }
    public string? ModuleId { get; set; }
    public float WaitSeconds { get; set; }
@@ -78,7 +78,7 @@ public sealed class DefaultBehaviorRuntime
    public string? AreaSystemId { get; set; }
    public string? TargetEntityId { get; set; }
    public string? ItemId { get; set; }
-    public string? PreferredNodeId { get; set; }
+    public string? PreferredAnchorId { get; set; }
    public string? PreferredConstructionSiteId { get; set; }
    public string? PreferredModuleId { get; set; }
    public Vector3? TargetPosition { get; set; }
@@ -102,7 +102,7 @@ public sealed class ShipOrderTemplateRuntime
    public string? SourceStationId { get; set; }
    public string? DestinationStationId { get; set; }
    public string? ItemId { get; set; }
-    public string? NodeId { get; set; }
+    public string? AnchorId { get; set; }
    public string? ConstructionSiteId { get; set; }
    public string? ModuleId { get; set; }
    public float WaitSeconds { get; set; }
@@ -146,7 +146,9 @@ public sealed class ShipSubTaskRuntime
    public WorkStatus Status { get; set; } = WorkStatus.Pending;
    public string? TargetEntityId { get; set; }
    public string? TargetSystemId { get; set; }
-    public string? TargetNodeId { get; set; }
+    public string? TargetAnchorId { get; set; }
+    public string? TargetResourceNodeId { get; set; }
+    public string? TargetResourceDepositId { get; set; }
    public Vector3? TargetPosition { get; set; }
    public string? ItemId { get; set; }
    public string? ModuleId { get; set; }