merge: origin/main into feature/macdive-native-xml

PR #252 (UDDF gap-fill M1) landed on main and was followed by two
refactors that this branch needs to absorb:

- `dive_number_of_day` column removed (derivable from `diveDateTime`).
  Dropped from `database.dart`, `IncomingDiveData`, `uddf_entity_importer`
  write path, `uddf_full_import_service` parser, and the MacDive XML
  parser's tank-map output. Removed assertions from schema + integration
  tests.
- `Value.absent()` for missing companion fields in `uddf_entity_importer`
  applyImportedMetadata paths (site + dive).

Also swapped the hard-coded real-sample path in
`uddf_macdive_real_sample_test.dart` for main's env-var / skip-safe
version so the suite runs cleanly on CI and fresh clones.

Tests: 1539 passing, 5 skipped (gated real-data suites).

Author: ericgriffin

.gitignore

@@ -64,3 +64,6 @@ android/fastlane/play-store-key.json
 .venv/
 venv/
 .python-version
+
+# Sample data
+scripts/sample_data/

CHANGELOG.md

@@ -8,9 +8,9 @@ All notable changes to Submersion are documented in this file.
 ### Added
 
 - MacDive UDDF imports now capture substantially richer dive data: boat
-  name and captain, dive operator, surface conditions, dive-number-of-day,
-  weather (stored in the existing weather description field), plus site
-  water type, body of water, and difficulty rating.
+  name and captain, dive operator, surface conditions, weather (stored
+  in the existing weather description field), plus site water type, body
+  of water, and difficulty rating.
 - **MacDive native XML import.** MacDive's own `.xml` logbook format is now
   a first-class import source. Unlike MacDive UDDF (which doesn't emit tags),
   the native XML export carries dive tags — so users migrating tag metadata
@@ -19,13 +19,13 @@ All notable changes to Submersion are documented in this file.
   internal units at the reader boundary.
 - **MacDive (XML) source override** in the import wizard's detected-source
   dropdown, alongside the existing MacDive (CSV) option.
-
-### Fixed
-
 - Cross-format import deduplication: stable per-dive UUIDs from MacDive,
   Shearwater Cloud, Subsurface SSRF, and generic UDDF are now preserved on
   the `dive_data_sources` sidecar. Re-importing the same dives in a
   different format no longer creates duplicates.
+
+### Fixed
+
 - MacDive UDDF: equipment / gear now imports correctly. The parser
   previously only scanned Submersion's private equipment extension,
   missing the standard UDDF gear location (`<diver><owner><equipment>`)
@@ -43,6 +43,29 @@ All notable changes to Submersion are documented in this file.
   milestone will wire them through, likely via the dive-events table.
 
 
+## 1.4.6 (2026-04-22)
+
+### Bug Fixes
+
+- log download failures to the file log (#258)
+- DB readonly-rollback recovery + cooperative import cancellation (#255)
+
+### Documentation
+
+- implementation plans for MacDive import milestones 1-4
+- design spec for robust MacDive import (UDDF, XML, SQLite, photos)
+
+### Chores
+
+- bump version to 1.4.6+92
+- changelog + plan update for MacDive UDDF gap-fill milestone
+
+### Other
+
+- ignore sample data
+- Revert "chore: changelog + plan update for MacDive UDDF gap-fill milestone"
+
+
 ## 1.4.5 (2026-04-21)
 
 ### Features

docs/superpowers/plans/2026-04-21-macdive-uddf-gap-fill.md

@@ -16,9 +16,11 @@
 
 - All 12 tasks landed or explicitly skipped (Task 3 proven non-bug; see Task 3 section).
 - Schema bumped v69 → v70 (source_uuid on dive_data_sources) → v71
-  (7 new dive + site metadata columns: dive_number_of_day, boat_name,
-  boat_captain, dive_operator, surface_conditions on dives; water_type,
-  body_of_water on dive_sites).
+  (6 new dive + site metadata columns: boat_name, boat_captain,
+  dive_operator, surface_conditions on dives; water_type, body_of_water
+  on dive_sites). Task 8 and Task 10's snippets below show an earlier
+  plan that also added `dive_number_of_day`; see "Post-completion
+  revision" note directly below.
 - Cross-format import dedup now works via `dive_data_sources.source_uuid`.
 - Parser-to-DB gap closed for MacDive rich fields. `weather` now lands
   on the existing weather_description column. difficulty continues to
@@ -31,6 +33,21 @@
   to a future milestone, likely via dive-events.
 - Real-sample regression test passes (gated behind `@Tags(['real-data'])`).
 
+### Post-completion revision: dive_number_of_day is derived, not stored
+
+Originally this milestone planned a `dive_number_of_day` INT column on
+`dives`, populated from UDDF `<divenumberofday>`. After landing,
+review found the value is trivially derivable from `diveDateTime`
+(`ROW_NUMBER() OVER (PARTITION BY DATE(diveDateTime) ORDER BY
+diveDateTime)`) and has no current reader in the app. Storing it would
+also desync the moment a diver manually adds a dive between two
+imported dives. The column, its v71 ALTER, parser extraction,
+`IncomingDiveData` field, and importer write path were all removed.
+Task 8's "Add fields to the domain model" snippet and Task 10's DB
+write snippet in this document are the pre-revision plan; they are
+kept for historical context. `<divenumberofday>` is now ignored on
+import and computed on demand if/when the UI needs it.
+
 ---
 
 ## File Structure

lib/core/database/database.dart

@@ -127,7 +127,6 @@ class Dives extends Table {
   TextColumn get buddy => text().nullable()();
   TextColumn get diveMaster => text().nullable()();
   // MacDive import fields — common dive metadata
-  IntColumn get diveNumberOfDay => integer().nullable()();
   TextColumn get boatName => text().nullable()();
   TextColumn get boatCaptain => text().nullable()();
   TextColumn get diveOperator => text().nullable()();
@@ -3284,11 +3283,6 @@ class AppDatabase extends _$AppDatabase {
               .map((r) => r.data['name'] as String)
               .toSet();
           if (divesCols.isNotEmpty) {
-            if (!divesExisting.contains('dive_number_of_day')) {
-              await customStatement(
-                'ALTER TABLE dives ADD COLUMN dive_number_of_day INTEGER',
-              );
-            }
             if (!divesExisting.contains('boat_name')) {
               await customStatement(
                 'ALTER TABLE dives ADD COLUMN boat_name TEXT',

lib/core/domain/models/incoming_dive_data.dart

@@ -23,7 +23,6 @@ class IncomingDiveData {
   final String? boatName;
   final String? boatCaptain;
   final String? diveOperator;
-  final int? diveNumberOfDay;
   final String? sourceUuid;
 
   const IncomingDiveData({
@@ -42,7 +41,6 @@ class IncomingDiveData {
     this.boatName,
     this.boatCaptain,
     this.diveOperator,
-    this.diveNumberOfDay,
     this.sourceUuid,
   });
 
@@ -105,7 +103,6 @@ class IncomingDiveData {
       boatName: data['boatName'] as String?,
       boatCaptain: data['boatCaptain'] as String?,
       diveOperator: data['diveOperator'] as String?,
-      diveNumberOfDay: data['diveNumberOfDay'] as int?,
       sourceUuid: data['sourceUuid'] as String?,
     );
   }