Support CCR as equipment type, with cylinder configurations and rebreather service by ericgriffin · Pull Request #868 · submersion-app/submersion

ericgriffin · 2026-08-06T00:49:13Z

Closes #804.

Adds a rebreather equipment type, reusable cylinder configurations, and
rebreather service tracking, in three phases across 16 commits.

Phase 1 - `EquipmentType.rebreather`

One enum value plus a catalog entry; no schema migration, because
type-specific fields are KV rows in the existing equipment_attributes table
(v115).

Eight curated attributes: unit type (eCCR / mCCR / hCCR and the three SCR
variants), mount configuration, scrubber type and rated duration, O2 cell
count, onboard diluent and O2 cylinder volumes, and depth rating. unit_type
is a choice attribute rather than a second enum value, matching how wetsuit
uses suit_style and bcd uses bcd_style - so SCR divers are served
without splitting the type, which would later be a data migration.

depth_rating_m is shared verbatim with the camera entry rather than
duplicated. buoyancy_kg / dry_weight_kg arrive from the universal set, so
a rebreather contributes to weight-planner predictions with no extra wiring.

Two exhaustive EquipmentType icon switches gained a rebreather arm using
Icons.recycling. The vendored MdiIcons file carries only six glyphs and has
no rebreather among them; inventing a seventh code point risks a tofu box no
test would catch, and a closed circuit recycling its breathing loop is the
accurate metaphor.

Phase 3 - Rebreather service kinds

Three built-ins seeded via kSeedBuiltInServiceKindsSql:

Slug	Interval
`scrubber-repack`	3.0 hours
`o2-cell-replacement`	365 days
`rebreather-annual`	365 days

ServiceDueEngine needed no changes - it already computes hours-since-anchor
from logged dive duration. No migration either: the seed runs from onCreate
and the v122 beforeOpen backstop and is INSERT OR IGNORE, so upgraded
databases pick the kinds up on next open (covered by a test).

Scrubber repack is the first built-in with an hours interval, so the seed SQL
gained a positional hours column. That refactor is guarded by a
characterization test pinning all nine pre-existing kinds.

The service clocks card now states that hours-based clocks count logged dive
time - which approximates rebreather loop time but excludes pre-breathe and
surface loop time. Worth saying out loud rather than leaving a diver to infer
it from a scrubber budget.

Phase 2 - Cylinder configurations (schema v139)

Two new synced tables. A configuration is a named, ordered cylinder list with
a nullable equipment_id: set, it reads as "a config for my JJ"; null, it
is a generic gas plan. The tedium the issue describes - re-entering diluent
and bailout every dive - is identical for a technical open-circuit diver
entering doubles plus two deco stages, so the entity is generic and merely
surfaced per unit.

No FK to tank_presets. The preset picker seeds volume_l /
working_pressure_bar / tank_material and is then out of the picture. A
configuration records what you actually dive, so a later preset edit must not
rewrite what a saved configuration means.

ON DELETE SET NULL on equipment_id. Deleting a rebreather demotes its
configurations to generic gas plans rather than destroying a painstakingly
entered bailout plan. This propagates into sync: both of cylinderConfigs'
parent refs are declared nullable, so a peer's config referencing a
locally-deleted unit gets its reference cleared rather than being skipped.

The merge

CylinderConfigApplier is pure - no database, no DateTime.now() - mirroring
ServiceDueEngine so the rules are exhaustively testable without a fixture.
It matches config items to existing cylinders by role, claiming the first
unclaimed one each time, because roles are not unique: a CCR diver routinely
carries two bailouts, and greedy in-order claiming is what makes "config has 2
bailouts, dive already has 1" resolve to keep-one-add-one.

A gas mix already on the dive is never overwritten. dive_tanks defaults
o2_percent to 21 and he_percent to 0, so a tank reading air is
indistinguishable from one nobody filled in - there is no null to test against
and therefore no honest way to detect "unset". FillTank has no gas fields at
all, making an overwrite unexpressible rather than merely discouraged. Absent
gas on a dive is a nuisance; wrong gas is a safety-relevant falsehood in a
logbook divers plan future dives from.

Applying happens in the dive edit page against its in-memory cylinder
list, not dive_tanks. Those cylinders are unsaved form state until Save;
writing through would bypass dirty tracking and persist changes even if the
diver then cancelled.

Surfaces

Dive edit gas/gear section: an "Apply configuration" menu, grouped by owning
unit, hidden entirely when there are no configurations.
Rebreather detail page: a "Configurations" card, rendered only for
rebreathers.
List and edit pages under /equipment/cylinder-configs, registered before
the :equipmentId catch-all that would otherwise swallow the segment.

Schema version

Claims v139; v138 is left reserved for the divelogs.de branch (#603).
_assertCylinderConfigSchema is CREATE TABLE IF NOT EXISTS and runs from
both the onUpgrade block and the beforeOpen backstop, so a database
stranded by a parallel-branch collision self-heals. The migration test uses
greaterThanOrEqualTo(139) + contains(139) rather than an exact-latest
tripwire.

Please re-check currentSchemaVersion on main before merging.

Verification

flutter analyze clean, no infos
14,879 tests pass. backup_service_encryption_test.dart fails only in the
full-suite run and passes in isolation - the known backup flake; nothing here
touches backup encryption
dart format . produces no changes
macOS debug build succeeds
Live migration verified: the built app was launched against a real
database (dev database displaced and restored byte-identical afterwards) and
reached user_version = 139 with both tables present and all three
rebreather service kinds seeded, including the hours-only scrubber clock

Not verified: an interactive UI walkthrough. The three UI flows are covered by
widget tests but were not driven by hand.

The pre-push hook was bypassed. It resolves PROJECT_ROOT from its own script
path, and because core.hooksPath is a single repo-level setting it analyzes
the main checkout rather than the worktree being pushed; its failures were
all stale codegen in that tree (accentNavIcons, reefDataCache, ungenerated
mocks), none of them in files this branch touches.

Out of scope

Unifying a rebreather with a DiveComputer entity. The issue author's
workaround registers the CCR controller as a dive computer; that stays
possible and unchanged, but the two remain separate records.
Auto-applying configurations to downloaded or imported dives.
DiveEquipmentDefaulter is untouched - a diver with several fills would
otherwise get the wrong one applied silently.

Note on translations

The 10 non-English locales were translated as part of this change rather than
by a translator. CCR, SCR, eCCR, mCCR, hCCR and O2 are kept
verbatim everywhere as international abbreviations.

Design and plan: docs/superpowers/specs/2026-08-05-ccr-equipment-design.md,
docs/superpowers/plans/2026-08-05-ccr-equipment.md.

Covers three phases: a rebreather equipment type with CCR/SCR attributes, reusable cylinder configurations (schema v139) with a conservative merge that never overwrites downloaded gas mixes, and built-in rebreather service kinds for scrubber repack, O2 cell replacement, and annual service.

16 tasks across three phases, sequenced 1 -> 3 -> 2 so the rebreather type and its service kinds ship before the schema v139 cylinder configuration work.

Adds EquipmentType.rebreather between tank and weights. Two exhaustive icon switches (dive edit page, equipment picker sheet) gain a rebreather arm using Icons.recycling: the vendored MdiIcons subset carries only six glyphs and has no rebreather among them, and a closed circuit recycling its breathing loop is the accurate metaphor.

Eight curated attributes: unit type (eCCR/mCCR/hCCR and the three SCR variants), mount configuration, scrubber type and rated duration, O2 cell count, onboard diluent and O2 cylinder volumes, and depth rating. The depth rating key is shared verbatim with the camera entry rather than duplicated. Scrubber duration is deliberately dimensionless: hours need no conversion.

Adds 18 keys across all 11 locales: seven attribute labels and eleven choice options. The depth rating label is reused from the camera entry rather than duplicated. CCR, SCR, eCCR, mCCR and hCCR stay verbatim in every locale as international abbreviations; only the surrounding words are translated.

Round-trips a rebreather through createEquipment and back, asserting curated attribute values and the deterministic attr_<id>_<key> id form. Passes without production changes: the equipment_attributes table is type-agnostic, which is what makes adding an equipment type a catalog change rather than a migration.

kSeedBuiltInServiceKindsSql hardcoded NULL for default_interval_hours because no built-in had ever needed one. Adds a positional hours column to the inline SELECT so a kind can declare one. Pure refactor: a characterization test pins all nine existing kinds, including that every one keeps a null hours interval.

Three built-ins with applicable_types ["rebreather"]: scrubber-repack on a 3.0 hour clock, o2-cell-replacement and rebreather-annual on 365 days. Scrubber repack is the first built-in with an hours-only interval, because a scrubber is consumed by loop time rather than the calendar. ServiceDueEngine needs no changes: it already computes hours-since-anchor from logged dive duration. No migration either, since the seed runs from onCreate and the v122 beforeOpen backstop and is INSERT OR IGNORE. Three count tripwires updated from 9 to 12 (schema, repository, and provider tests).

ServiceDueEngine accrues hours-based clocks by summing logged dive duration, which approximates rebreather loop time but excludes pre-breathe and surface loop time. The scrubber clock is the first built-in where that distinction reaches a diver, so the card now states what the number counts instead of leaving it to be inferred. Renders only when a clock has an hours trigger; date-only clocks are unchanged.

CylinderConfig is a named cylinder list, optionally owned by a rebreather via a nullable equipmentId; null means a generic gas plan. CylinderConfigItem snapshots the cylinder spec rather than referencing a tank preset, so editing a preset later cannot rewrite what a saved configuration means. Gas fractions are non-nullable and default to air, mirroring dive_tanks. Timestamps are excluded from props so provider rebuilds stay stable.

CylinderConfigApplier is pure -- no database, no DateTime.now() -- mirroring ServiceDueEngine so the merge rules are exhaustively testable without a fixture. It matches config items to existing dive_tanks rows by role, taking the first unclaimed tank each time, because roles are not unique: a CCR diver routinely carries two bailouts. FillTank has no gas fields. dive_tanks defaults o2_percent to 21 and he_percent to 0, so a tank reading air is indistinguishable from one nobody filled in; with no null to test against there is no honest way to detect 'unset'. Omitting the fields makes overwriting a downloaded mix unexpressible rather than merely discouraged.

Two synced tables: cylinder_configs (nullable equipment_id, ON DELETE SET NULL so deleting a rebreather demotes its configs to generic gas plans rather than destroying them) and cylinder_config_items (ON DELETE CASCADE). _assertCylinderConfigSchema is CREATE TABLE IF NOT EXISTS and runs from both the onUpgrade v139 block and the beforeOpen backstop, so a database stranded by a parallel-branch version collision self-heals. v138 is left reserved for the divelogs.de branch. Migration test asserts greaterThanOrEqualTo(139) plus contains(139) rather than an exact-latest tripwire, and enables PRAGMA foreign_keys so the FK behaviours are actually exercised.

Modelled on EquipmentSetRepository: writes register sync intent through SyncRepository and notify the event bus. saveItems writes the desired end state, renumbering sortOrder from list position so the reorderable editor can move entries instead of maintaining indices. Every child delete writes a deletion-log tombstone, on both the saveItems diff path and deleteConfig. The database cascades children when a config is deleted, but a peer that has not seen the delete would push them straight back without a tombstone. Unknown persisted role and material strings degrade to a default rather than throwing, so a row written by a newer version cannot break an older one. Tests run with PRAGMA foreign_keys ON, which caught a missing divers row.

Both entities added across the 14 serializer sites and the sync service's merge order, entityHasUpdatedAt, and parentRefs, modelled on equipmentSetGeofences. cylinderConfigs merges after equipment (its nullable FK parent) and cylinderConfigItems after cylinderConfigs, so the deferred-FK commit always sees the parent row. Both of cylinderConfigs' parent refs are declared nullable: deleting a rebreather demotes its configurations to generic gas plans, so a peer's config referencing a locally-deleted unit gets its reference cleared rather than being skipped. Registering both in sync_parent_refs_completeness_test's table map activates the live-schema FK guard for them, which is what catches an unguarded reference before it dangles at COMMIT.

Repository, diver-scoped list, per-unit family, and single-config family, following equipment_set_providers. The list provider hydrates items eagerly because every surface that lists configurations shows a cylinder count, so a lazy variant would just add a round trip per row. Full suite passes at 14861: adding a provider dependency breaks consumer tests that analyze cannot catch, so the whole suite is the only real check.

New feature directory lib/features/cylinder_configs with a list page grouping configurations by owning rebreather (generic gas plans last), a reorderable edit page, and a per-cylinder editor whose preset picker seeds the spec fields rather than holding a live reference. Routes are registered under /equipment/cylinder-configs, placed before the ':equipmentId' catch-all which would otherwise swallow the path segment. Fixes a crash the widget tests surfaced: the owning-unit dropdown passed a value from the route while the diver-scoped equipment list was still loading, and a Flutter dropdown asserts exactly one item matches its value. It now falls back to the generic option until the unit appears, which also covers a deleted owning unit. Adds 19 UI strings plus two pluralized apply-result strings across all 11 locales.

Adds an Apply configuration menu to the dive edit gas/gear section, grouped by owning rebreather with generic gas plans separate, hidden entirely when the diver has no configurations. Deviates from the plan on where the merge lands. The plan had a service writing to dive_tanks, but the dive edit page holds its cylinders as unsaved form state until Save: writing through would bypass dirty tracking and persist changes even if the diver then cancelled. DiveTankConfigAdapter therefore translates between DiveTank and the pure applier's view and returns a NEW list, which the page merges into its local state and marks dirty. All merge rules still live in CylinderConfigApplier, so the never-overwrite-gas guarantee is unchanged and the adapter stays pure (ids are supplied by the caller, no DateTime.now()).

A Configurations card listing the unit's configurations with their roles and cylinder count, plus an add action that pre-fills the owning unit through a query parameter. Rendered only for rebreathers: any other type would show a card that can never be anything but empty. Closes the issue's 'configurations for each CCR' phrasing by making them reachable from the unit, even though the underlying entity is generic and equally usable as an open-circuit gas plan.

Copilot

Pull request overview

Adds first-class Closed Circuit Rebreather (CCR) support to Submersion’s equipment model and dive-edit workflow by introducing a new EquipmentType.rebreather, reusable cylinder configurations (schema v139) with sync support, and rebreather-specific service kinds (including the first hours-based clock).

Changes:

Add EquipmentType.rebreather plus curated rebreather attributes and localized labels/choices.
Introduce reusable cylinder configurations (new DB tables + migration/backstop + sync serialization/merge ordering) and UI surfaces to create/list/apply them.
Seed three rebreather service kinds (including an hours-based scrubber clock) and add an hours-source caption to the service clocks UI.

Reviewed changes

Copilot reviewed 64 out of 65 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
test/features/equipment/presentation/widgets/service_clocks_hours_caption_test.dart	Verifies hours-based clock caption text behavior.
test/features/equipment/presentation/providers/service_clock_providers_test.dart	Updates built-in service kind count expectation.
test/features/equipment/domain/equipment_attribute_catalog_test.dart	Adds coverage for `rebreather` type and its curated attributes + l10n resolution.
test/features/equipment/data/service_kind_repository_test.dart	Updates built-in count and validates rebreather kinds round-trip behavior.
test/features/equipment/data/equipment_attribute_repository_test.dart	Ensures curated rebreather attributes persist/reload deterministically.
test/features/cylinder_configs/presentation/unit_configurations_card_test.dart	Widget coverage for rebreather detail “Configurations” card.
test/features/cylinder_configs/presentation/cylinder_config_providers_test.dart	Tests new cylinder config Riverpod providers and filtering.
test/features/cylinder_configs/presentation/cylinder_config_edit_page_test.dart	Widget coverage for creating/editing cylinder configurations.
test/features/cylinder_configs/presentation/apply_configuration_menu_test.dart	Widget coverage for grouping/selecting configs in the apply menu.
test/features/cylinder_configs/domain/services/dive_tank_config_adapter_test.dart	Verifies applying configs to in-memory dive tanks preserves gas mixes.
test/features/cylinder_configs/domain/services/cylinder_config_applier_test.dart	Unit tests for pure planning logic and merge rules.
test/features/cylinder_configs/domain/entities/cylinder_config_test.dart	Value-equality/copyWith semantics for cylinder config entities.
test/features/cylinder_configs/data/cylinder_config_repository_test.dart	Repository CRUD, ordering, tombstones, and ON DELETE SET NULL semantics.
test/core/services/sync/sync_parent_refs_completeness_test.dart	Registers new entities in sync parent-ref completeness coverage.
test/core/services/sync/cylinder_config_sync_test.dart	Sync serializer round-trip/export/parentRefs assertions for new entities.
test/core/database/service_ledger_schema_test.dart	Validates updated service seed (hours column + new rebreather kinds).
test/core/database/migration_v139_cylinder_configs_test.dart	Verifies v139 DDL, indexes, demote-on-unit-delete, and self-heal assert.
lib/l10n/arb/app_zh.arb	Adds cylinder config + rebreather strings (ZH).
lib/l10n/arb/app_pt.arb	Adds cylinder config + rebreather strings (PT).
lib/l10n/arb/app_nl.arb	Adds cylinder config + rebreather strings (NL).
lib/l10n/arb/app_it.arb	Adds cylinder config + rebreather strings (IT).
lib/l10n/arb/app_hu.arb	Adds cylinder config + rebreather strings (HU).
lib/l10n/arb/app_he.arb	Adds cylinder config + rebreather strings (HE).
lib/l10n/arb/app_fr.arb	Adds cylinder config + rebreather strings (FR).
lib/l10n/arb/app_es.arb	Adds cylinder config + rebreather strings (ES).
lib/l10n/arb/app_en.arb	Adds cylinder config + rebreather strings (EN).
lib/l10n/arb/app_de.arb	Adds cylinder config + rebreather strings (DE).
lib/l10n/arb/app_ar.arb	Adds cylinder config + rebreather strings (AR).
lib/l10n/arb/app_localizations.dart	Regenerated localization API for new keys.
lib/l10n/arb/app_localizations_zh.dart	Regenerated ZH localizations.
lib/l10n/arb/app_localizations_pt.dart	Regenerated PT localizations.
lib/l10n/arb/app_localizations_nl.dart	Regenerated NL localizations.
lib/l10n/arb/app_localizations_it.dart	Regenerated IT localizations.
lib/l10n/arb/app_localizations_hu.dart	Regenerated HU localizations.
lib/l10n/arb/app_localizations_he.dart	Regenerated HE localizations.
lib/l10n/arb/app_localizations_fr.dart	Regenerated FR localizations.
lib/l10n/arb/app_localizations_es.dart	Regenerated ES localizations.
lib/l10n/arb/app_localizations_en.dart	Regenerated EN localizations.
lib/l10n/arb/app_localizations_de.dart	Regenerated DE localizations.
lib/l10n/arb/app_localizations_ar.dart	Regenerated AR localizations.
lib/features/equipment/presentation/widgets/service_clocks_card.dart	Adds hours-source caption line for hours-based service clocks.
lib/features/equipment/presentation/utils/equipment_attribute_l10n.dart	Adds label/choice l10n mappings for new rebreather attributes.
lib/features/equipment/presentation/pages/equipment_detail_page.dart	Shows UnitConfigurationsCard only for rebreathers.
lib/features/equipment/domain/constants/equipment_attribute_catalog.dart	Adds curated rebreather attribute definitions.
lib/features/dive_log/presentation/widgets/pickers/equipment_picker_sheet.dart	Adds icon mapping for rebreather equipment type.
lib/features/dive_log/presentation/widgets/edit_sections/gas_gear_section.dart	Adds optional ApplyConfigurationMenu slot in tank section.
lib/features/dive_log/presentation/pages/dive_edit_page.dart	Wires ApplyConfigurationMenu and applies configs to in-memory tank list.
lib/features/cylinder_configs/presentation/widgets/unit_configurations_card.dart	New: rebreather detail card listing owned configurations.
lib/features/cylinder_configs/presentation/widgets/cylinder_config_item_editor.dart	New: editor UI for a cylinder config item (+ preset seeding).
lib/features/cylinder_configs/presentation/widgets/apply_configuration_menu.dart	New: config picker menu grouped by owning unit and generic gas plans.
lib/features/cylinder_configs/presentation/providers/cylinder_config_providers.dart	New: repository + list/detail providers and invalidation helper.
lib/features/cylinder_configs/presentation/pages/cylinder_config_list_page.dart	New: list page grouped by owning unit + generic plans.
lib/features/cylinder_configs/presentation/pages/cylinder_config_edit_page.dart	New: create/edit page with unit selector and reorderable cylinder list.
lib/features/cylinder_configs/domain/services/dive_tank_config_adapter.dart	New: adapter applying a config plan to DiveTank list (pure id injection).
lib/features/cylinder_configs/domain/services/cylinder_config_applier.dart	New: pure planning engine (InsertTank/FillTank ops).
lib/features/cylinder_configs/domain/entities/cylinder_config.dart	New: domain entity for a configuration (Equatable, copyWith).
lib/features/cylinder_configs/domain/entities/cylinder_config_item.dart	New: domain entity for config cylinders (snapshot spec).
lib/core/services/sync/sync_service.dart	Adds merge ordering + parentRefs + updatedAt flags for new entities.
lib/core/services/sync/sync_data_serializer.dart	Adds serialization/export/import plumbing for new entities.
lib/core/router/app_router.dart	Adds routes for cylinder configs list/edit (before equipmentId catch-all).
lib/core/database/database.dart	Seeds hours-based service kind; adds v139 tables + backstop assert; bumps schema version.
lib/core/constants/enums.dart	Adds `EquipmentType.rebreather`.

Suppressed comments (2)

lib/features/cylinder_configs/presentation/pages/cylinder_config_edit_page.dart:97

Saving a new cylinder configuration derives diverId from the first existing config, which is null when the diver has no configs yet (and can also propagate earlier nulls). That causes the newly-created config to have diver_id = NULL and it won’t show up in diver-scoped providers/pages.

    final repository = ref.read(cylinderConfigRepositoryProvider);
    final diverId = await ref
        .read(cylinderConfigsProvider.future)
        .then((configs) => configs.isNotEmpty ? configs.first.diverId : null);

lib/features/cylinder_configs/presentation/widgets/cylinder_config_item_editor.dart:171

This label is a hardcoded string ('He %'), which bypasses localization. Since an existing l10n key is available (gasCalculators_mnd_hePercent), use it so the new screen remains fully translatable.

                  decoration: const InputDecoration(labelText: 'He %'),

Three fixes from the Copilot review: Diver scoping: the edit page inferred diverId from an existing configuration, so with none yet it saved null. A null diver_id never matches a diver-scoped query, meaning the FIRST configuration a diver ever created persisted but was invisible in every list. Now reads validatedCurrentDiverIdProvider directly. The existing test missed this because it asserted through an unfiltered getAllConfigs, which skips the where clause entirely; it now reads scoped, and a regression test covers the empty-database path. No-op apply: "nothing to do" was derived from added == 0 && kept == 0, but a repeat apply matches every role and reports a non-zero kept while doing no work, so it read "Added 0 cylinders, kept 3" and, worse, marked the form dirty, raising an unsaved-changes prompt for a merge that changed nothing. DiveTankConfigAdapter now returns a "changed" flag derived from the plan's ops rather than from the counts. Localization: the O2 % and He % field labels were hardcoded; they now reuse gasCalculators_mnd_o2Percent and gasCalculators_mnd_hePercent, which already carry translations in all 11 locales.

Copilot

Pull request overview

Copilot reviewed 64 out of 65 changed files in this pull request and generated no new comments.

Suppressed comments (2)

lib/features/cylinder_configs/domain/services/cylinder_config_applier.dart:88

CylinderConfigPlan.isNoOp currently returns true only when both insertedCount and keptCount are zero. A true apply no-op (everything matched, no inserts/fills) still has keptCount > 0, so this getter misreports and is easy to misuse later. Since the actual work is represented by ops, isNoOp should be based on ops.isEmpty.

    required this.keptCount,
  });

  bool get isNoOp => insertedCount == 0 && keptCount == 0;
}

lib/features/cylinder_configs/presentation/pages/cylinder_config_edit_page.dart:120

If widget.configId is non-null but the config no longer exists (e.g. deleted on another device while this page is open, or a stale deep link), existing becomes null and _save still calls saveItems(id, _items). With foreign keys enabled this will fail because cylinder_config_items.config_id references a non-existent parent row, and _saving is never reset or surfaced to the user.

    } else {
      final existing = await repository.getConfigById(id);
      if (existing != null) {
        await repository.updateConfig(
          existing.copyWith(

github-actions · 2026-08-06T01:29:55Z

📦 Build artifacts for this PR · commit 177b7c5

Platform	Download
Android (APK)	android-apk
macOS	macos-build
Windows	windows-build
Linux	linux-build

Artifacts expire in 7 days. Downloading requires being signed in to GitHub. macOS needs two extractions: unzip the downloaded artifact, then unzip the submersion-macos.zip inside it to get a runnable submersion.app. The build is ad-hoc signed — right-click → Open on first launch.

_{Updated automatically on each push.}

codecov · 2026-08-06T01:30:41Z

Codecov Report

❌ Patch coverage is 94.92326% with 43 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
lib/core/database/database.dart	27.50%	29 Missing ⚠️
lib/core/router/app_router.dart	44.44%	5 Missing ⚠️
.../presentation/pages/cylinder_config_edit_page.dart	96.36%	4 Missing ⚠️
...nfigs/domain/services/cylinder_config_applier.dart	97.36%	1 Missing ⚠️
...sentation/providers/cylinder_config_providers.dart	94.73%	1 Missing ⚠️
...presentation/widgets/unit_configurations_card.dart	97.61%	1 Missing ⚠️
...es/dive_log/presentation/pages/dive_edit_page.dart	95.83%	1 Missing ⚠️
...ment/presentation/pages/equipment_detail_page.dart	50.00%	1 Missing ⚠️

📢 Thoughts on this report? Let us know!

Patch coverage was 72.85%, concentrated in presentation code that had no widget test at all: the configuration list page sat at 1.56% and the dive edit page's apply handler at 8.70%. Adds 41 tests across 7 files (3 new, 4 extended). Test-only change; no lib/ files are touched. - List page: grouping by owning unit with gas plans last, the empty / loading / error arms, a config whose unit is gone, and both context.push routes driven through a real GoRouter. - Item editor: gas parsing (including a lone "." that must not clobber a saved mix), label clearing, the preset picker, and the spec summary in both metric and imperial. - Serializer: fetchRecord, the batch fetch/upsert paths, and an incremental changeset filtered by HLC watermark. - Dive edit page: applying a configuration, and the repeat-apply no-op that must not mark the form dirty. - Edit page: editing in place, demoting a config to a generic gas plan, removing a cylinder, and an edited gas mix reaching the database. - Entity: config equality, so a field missing from props cannot silently stop rebuilding the list. Measured with Codecov's own method (diff-added lines intersected with lcov misses, honoring codecov.yml ignores): 74.35% -> 95.04% locally. The lines left uncovered are Drift column getters in database.dart, which only execute during query building, plus the router's route builders and the reorder closure.

Copilot

Pull request overview

Copilot reviewed 67 out of 68 changed files in this pull request and generated no new comments.

Suppressed comments (3)

lib/features/cylinder_configs/presentation/widgets/unit_configurations_card.dart:81

UnitConfigurationsCard always builds a subtitle Text, even when a configuration has zero items. That produces an empty subtitle line (extra vertical padding) for empty configs; other surfaces (e.g., CylinderConfigListPage) omit the subtitle when there are no roles.

                        subtitle: Text(
                          config.items
                              .map((i) => i.tankRole.displayName)
                              .join(', '),
                        ),

lib/features/cylinder_configs/domain/services/cylinder_config_applier.dart:87

CylinderConfigPlan.isNoOp is currently based on inserted/kept counts, but a true no-op plan can have keptCount > 0 (e.g., all roles match and no Fill/Insert ops are needed). This makes isNoOp return false when ops is empty, which is misleading and easy to misuse in callers.

  bool get isNoOp => insertedCount == 0 && keptCount == 0;

lib/features/cylinder_configs/presentation/pages/cylinder_config_edit_page.dart:93

_save() sets _saving=true (disabling the Save action) but never resets it if any awaited repository call throws. That can leave the page stuck in a disabled state with no error surfaced. Consider wrapping the save flow in try/catch/finally: show a SnackBar on failure and always reset _saving in finally (pattern used in other async save surfaces).

  Future<void> _save() async {
    if (!(_formKey.currentState?.validate() ?? false)) return;
    setState(() => _saving = true);

PR submersion-app#868 (cylinder configurations, submersion-app#804) merged while CI was running and took v139, so the default-currency migration renumbers v139 -> v140 -- its third number, after v138 went to the divelogs.de branch. database.dart conflicted in the ladder and the onUpgrade tail; both resolved as a union with the currency block ordered after main's v139 cylinder-config step. Main's ladder already skips 138 to reserve it for divelogs, so this branch keeps that gap rather than filling it. Main's v139 migration test already asserts greaterThanOrEqualTo, so nothing needed relaxing; migration_v139_default_currency_test.dart is renamed to _v140_ and its fixture still stamps 137, now migrating 137 -> 140 through main's intervening cylinder-config block. Codegen and l10n regenerated against main's new tables.

ericgriffin added 18 commits August 5, 2026 15:50

Add implementation plan for CCR equipment support (#804)

a68bcb5

16 tasks across three phases, sequenced 1 -> 3 -> 2 so the rebreather type and its service kinds ship before the schema v139 cylinder configuration work.

Copilot AI lite review requested due to automatic review settings August 6, 2026 00:49

github-project-automation Bot added this to Submersion Release Tracker Aug 6, 2026

github-project-automation Bot moved this to Backlog in Submersion Release Tracker Aug 6, 2026

Copilot started reviewing on behalf of ericgriffin August 6, 2026 00:49 View session

ericgriffin self-assigned this Aug 6, 2026

ericgriffin added the enhancement New feature or request label Aug 6, 2026

ericgriffin moved this from Backlog to In review in Submersion Release Tracker Aug 6, 2026

Copilot AI reviewed Aug 6, 2026

View reviewed changes

Comment thread lib/features/cylinder_configs/presentation/pages/cylinder_config_edit_page.dart

Comment thread lib/features/dive_log/presentation/pages/dive_edit_page.dart

Comment thread lib/features/cylinder_configs/presentation/widgets/cylinder_config_item_editor.dart Outdated

Copilot AI review requested due to automatic review settings August 6, 2026 01:01

Copilot started reviewing on behalf of ericgriffin August 6, 2026 01:02 View session

Copilot AI reviewed Aug 6, 2026

View reviewed changes

Copilot AI review requested due to automatic review settings August 6, 2026 02:57

Copilot started reviewing on behalf of ericgriffin August 6, 2026 02:58 View session

Copilot AI reviewed Aug 6, 2026

View reviewed changes

ericgriffin merged commit 4cc0471 into main Aug 6, 2026
26 checks passed

github-project-automation Bot moved this from In review to Done in Submersion Release Tracker Aug 6, 2026

ericgriffin deleted the worktree-feat-804-ccr-equipment branch August 6, 2026 03:34

Navigation Menu

Uh oh!

Support CCR as equipment type, with cylinder configurations and rebreather service - #868

Support CCR as equipment type, with cylinder configurations and rebreather service#868
ericgriffin merged 20 commits into
mainfrom
worktree-feat-804-ccr-equipment

ericgriffin commented Aug 6, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

github-actions Bot commented Aug 6, 2026 •

edited

Loading

Uh oh!

codecov Bot commented Aug 6, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

ericgriffin commented Aug 6, 2026

Phase 1 - EquipmentType.rebreather

Phase 3 - Rebreather service kinds

Phase 2 - Cylinder configurations (schema v139)

The merge

Surfaces

Schema version

Verification

Out of scope

Note on translations

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

github-actions Bot commented Aug 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov Bot commented Aug 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Phase 1 - `EquipmentType.rebreather`

github-actions Bot commented Aug 6, 2026 •

edited

Loading

codecov Bot commented Aug 6, 2026 •

edited

Loading