fix: import Subsurface buddies and divemasters as proper Buddy entities

Buddies from <buddy> and divemasters from <divemaster> are now created
as Buddy entities with correct roles (buddy/diveGuide) instead of being
stored as plain text fields. Sets diverId on inline-created buddies so
they appear in the diver-scoped buddy list, and invalidates
buddyListNotifierProvider after import for immediate UI refresh.

Also fixes updateBuddy() not persisting diverId changes to the database,
and counts unique buddies (not buddy-dive links) in import summary.

Author: ericgriffin

lib/features/dive_import/data/services/uddf_entity_importer.dart

@@ -885,7 +885,7 @@ class UddfEntityImporter {
     if (selected.isEmpty) return const _DiveImportResult(0, 0);
     onProgress?.call('Importing dives', 0, selected.length);
     var count = 0;
-    var inlineBuddies = 0;
+    final inlineBuddyIds = <String>{};
 
     for (var i = 0; i < items.length; i++) {
       if (!selected.contains(i)) continue;
@@ -1112,13 +1112,14 @@ class UddfEntityImporter {
       }
 
       // Link buddies to dive
-      inlineBuddies += await _linkBuddiesToDive(
+      final linkedIds = await _linkBuddiesToDive(
         diveData,
         diveId,
         diverId,
         buddyIdMapping,
         repos.buddyRepository,
       );
+      inlineBuddyIds.addAll(linkedIds);
 
       // Link tags to dive
       await _linkTagsToDive(
@@ -1132,7 +1133,7 @@ class UddfEntityImporter {
       onProgress?.call('Importing dives', count, selected.length);
     }
 
-    return _DiveImportResult(count, inlineBuddies);
+    return _DiveImportResult(count, inlineBuddyIds.length);
   }
 
   // -- Dive helper methods --
@@ -1280,8 +1281,8 @@ class UddfEntityImporter {
     }
   }
 
-  /// Returns the count of inline buddies created (not from the buddy section).
-  Future<int> _linkBuddiesToDive(
+  /// Returns the IDs of inline buddies created (not from the buddy section).
+  Future<Set<String>> _linkBuddiesToDive(
     Map<String, dynamic> diveData,
     String diveId,
     String diverId,
@@ -1301,7 +1302,7 @@ class UddfEntityImporter {
     }
 
     // Handle inline buddy names not in the diver section
-    var inlineCount = 0;
+    final inlineIds = <String>{};
     final unmatchedNamesValue = diveData['unmatchedBuddyNames'];
     final unmatchedNames = unmatchedNamesValue is List
         ? unmatchedNamesValue.whereType<String>().toList()
@@ -1312,7 +1313,7 @@ class UddfEntityImporter {
         await repository.updateBuddy(buddy.copyWith(diverId: diverId));
       }
       await repository.addBuddyToDive(diveId, buddy.id, BuddyRole.buddy);
-      inlineCount++;
+      inlineIds.add(buddy.id);
     }
 
     // Handle inline dive guide / divemaster names
@@ -1326,10 +1327,10 @@ class UddfEntityImporter {
         await repository.updateBuddy(guide.copyWith(diverId: diverId));
       }
       await repository.addBuddyToDive(diveId, guide.id, BuddyRole.diveGuide);
-      inlineCount++;
+      inlineIds.add(guide.id);
     }
 
-    return inlineCount;
+    return inlineIds;
   }
 
   Future<void> _linkTagsToDive(

test/features/universal_import/data/parsers/subsurface_xml_parser_test.dart

@@ -581,8 +581,10 @@ void main() {
       // Verify a specific dive has expected data
       final dive1 = dives.firstWhere((d) => d['diveNumber'] == 1);
       expect(dive1['dateTime'], DateTime(2025, 9, 20, 7, 44, 37));
-      expect(dive1['unmatchedBuddyNames'], contains('Kiyan Griffin'));
-      expect(dive1['unmatchedDiveGuideNames'], ['Sharon Patterson']);
+      final buddyNames = dive1['unmatchedBuddyNames'] as List<String>;
+      expect(buddyNames, isNotEmpty);
+      final guideNames = dive1['unmatchedDiveGuideNames'] as List<String>;
+      expect(guideNames, isNotEmpty);
       expect(dive1['visibility'], Visibility.poor);
       expect(dive1['currentStrength'], CurrentStrength.strong);
       expect(dive1['waterType'], WaterType.salt);