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.

Author: ericgriffin

docs/REMAINING_TASKS.md

@@ -223,13 +223,14 @@ All v1.5 tasks complete.
 | Feature | Notes |
 |---------|-------|
 | HTML export | Web-viewable logbook |
-| Subsurface XML import | Common format |
+| Subsurface import | Common formats |
 
 **Tasks:**
 
 - [ ] HTML export (static website with CSS, images, interactive map)
 - [ ] MySQL dump export (for migration to other systems)
 - [ ] Handle importing Subsurface XML natively
+- [ ] Handle importing from Subsurface database natively
 
 ### 13.2 Interoperability
 

lib/features/buddies/data/repositories/buddy_repository.dart

@@ -208,6 +208,7 @@ class BuddyRepository {
         _db.buddies,
       )..where((t) => t.id.equals(buddy.id))).write(
         BuddiesCompanion(
+          diverId: Value(buddy.diverId),
           name: Value(buddy.name),
           email: Value(buddy.email),
           phone: Value(buddy.phone),

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

@@ -1115,6 +1115,7 @@ class UddfEntityImporter {
       inlineBuddies += await _linkBuddiesToDive(
         diveData,
         diveId,
+        diverId,
         buddyIdMapping,
         repos.buddyRepository,
       );
@@ -1283,6 +1284,7 @@ class UddfEntityImporter {
   Future<int> _linkBuddiesToDive(
     Map<String, dynamic> diveData,
     String diveId,
+    String diverId,
     Map<String, String> buddyIdMapping,
     BuddyRepository repository,
   ) async {
@@ -1306,10 +1308,27 @@ class UddfEntityImporter {
         : <String>[];
     for (final buddyName in unmatchedNames) {
       final buddy = await repository.findOrCreateByName(buddyName);
+      if (buddy.diverId == null) {
+        await repository.updateBuddy(buddy.copyWith(diverId: diverId));
+      }
       await repository.addBuddyToDive(diveId, buddy.id, BuddyRole.buddy);
       inlineCount++;
     }
 
+    // Handle inline dive guide / divemaster names
+    final unmatchedGuideValue = diveData['unmatchedDiveGuideNames'];
+    final unmatchedGuides = unmatchedGuideValue is List
+        ? unmatchedGuideValue.whereType<String>().toList()
+        : <String>[];
+    for (final guideName in unmatchedGuides) {
+      final guide = await repository.findOrCreateByName(guideName);
+      if (guide.diverId == null) {
+        await repository.updateBuddy(guide.copyWith(diverId: diverId));
+      }
+      await repository.addBuddyToDive(diveId, guide.id, BuddyRole.diveGuide);
+      inlineCount++;
+    }
+
     return inlineCount;
   }
 

lib/features/universal_import/data/parsers/subsurface_xml_parser.dart

@@ -250,19 +250,22 @@ class SubsurfaceXmlParser implements ImportParser {
           : WaterType.fresh;
     }
 
-    // Buddy (strip leading/trailing commas and whitespace)
+    // Buddy -> proper Buddy entities via unmatchedBuddyNames
     final buddyEl = dive.findElements('buddy').firstOrNull;
     if (buddyEl != null) {
-      final raw = buddyEl.innerText.trim();
-      final cleaned = raw.replaceAll(RegExp(r'^[,\s]+|[,\s]+$'), '').trim();
-      if (cleaned.isNotEmpty) result['buddy'] = cleaned;
+      final buddyNames = _splitNames(buddyEl.innerText);
+      if (buddyNames.isNotEmpty) {
+        result['unmatchedBuddyNames'] = buddyNames;
+      }
     }
 
-    // Divemaster
+    // Divemaster -> proper Buddy entities with diveGuide role
     final divemasterEl = dive.findElements('divemaster').firstOrNull;
     if (divemasterEl != null) {
-      final raw = divemasterEl.innerText.trim();
-      if (raw.isNotEmpty) result['diveMaster'] = raw;
+      final dmNames = _splitNames(divemasterEl.innerText);
+      if (dmNames.isNotEmpty) {
+        result['unmatchedDiveGuideNames'] = dmNames;
+      }
     }
 
     // Composite notes: <notes> + "Suit: <suit>" + "SAC: <sac attr>"
@@ -538,6 +541,18 @@ class SubsurfaceXmlParser implements ImportParser {
     _ => null,
   };
 
+  /// Splits a comma-separated name string, trimming leading/trailing commas
+  /// and whitespace from each name.
+  ///
+  /// Handles Subsurface quirks like ', Kiyan Griffin' (leading comma).
+  static List<String> _splitNames(String text) {
+    return text
+        .split(',')
+        .map((n) => n.trim())
+        .where((n) => n.isNotEmpty)
+        .toList();
+  }
+
   /// Parses a double value from a string that may have a unit suffix.
   ///
   /// Examples: '2.41 m' -> 2.41, '25.5 bar' -> 25.5, '21.0' -> 21.0

lib/features/universal_import/presentation/providers/universal_import_providers.dart

@@ -622,6 +622,7 @@ class UniversalImportNotifier extends StateNotifier<UniversalImportState> {
     _ref.invalidate(sitesWithCountsProvider);
     _ref.invalidate(siteListNotifierProvider);
     _ref.invalidate(allBuddiesProvider);
+    _ref.invalidate(buddyListNotifierProvider);
     _ref.invalidate(allEquipmentProvider);
     _ref.invalidate(activeEquipmentProvider);
     _ref.invalidate(retiredEquipmentProvider);