diff --git a/docs/engineering/VALIDATION.md b/docs/engineering/VALIDATION.md index 3a26139..e8be600 100644 --- a/docs/engineering/VALIDATION.md +++ b/docs/engineering/VALIDATION.md @@ -6826,3 +6826,10 @@ CI run 270 compiled the reservation slice and passed all 68 CTests, then failed the format gate on the wrapped call in `tests/region_checkpoint_tests.cpp`. That call now matches local clang-format output; the follow-up CI run is needed to validate the PostgreSQL migration and remaining jobs. + +CI run 271 passed the client, deploy, ECS and network jobs, then the PostgreSQL +image's clang-tidy analysis rejected four unchecked mutation-offer optional +accesses in `cellular_lives.cpp` and `cellular_batch.cpp`. The accesses now use +checked `optional::value()` and the trace matcher checks offer presence before +reading it. The PostgreSQL migration/tests did not run in that job; a fresh CI +run is required to validate the repair and schema v29. diff --git a/src/server/lifecycle/cellular_batch.cpp b/src/server/lifecycle/cellular_batch.cpp index f5302cd..c9ba177 100644 --- a/src/server/lifecycle/cellular_batch.cpp +++ b/src/server/lifecycle/cellular_batch.cpp @@ -549,15 +549,17 @@ match_cellular_mutation_actions_to_trace(const CellularLives& predecessor, const auto& mutations = batch.ticks[tick_index].mutations; const auto selection = std::ranges::lower_bound(mutations, life->identity.life, {}, &CellularMutationSelection::life_id); + if (!life->mutation.offer) + return std::unexpected{CellularActionBlockError::mismatch}; + const auto& offer = life->mutation.offer.value(); if (selection == mutations.end() || selection->life_id != life->identity.life || selection->event_index != action.input.event_index || selection->offer_tick != action.input.offer_tick || - selection->operator_id != action.input.operator_id || !life->mutation.offer || + selection->operator_id != action.input.operator_id || life->mutation.event_index != action.input.event_index || life->mutation.offer_tick != action.input.offer_tick || - life->identity.life != action.input.life_id || - life->mutation.offer->parent != life->identity.genome || - !std::ranges::any_of(life->mutation.offer->candidates, [&](const auto& candidate) { + life->identity.life != action.input.life_id || offer.parent != life->identity.genome || + !std::ranges::any_of(offer.candidates, [&](const auto& candidate) { return candidate.operator_id == action.input.operator_id; })) return std::unexpected{CellularActionBlockError::mismatch}; diff --git a/src/server/lifecycle/cellular_lives.cpp b/src/server/lifecycle/cellular_lives.cpp index 1e2b309..82505a7 100644 --- a/src/server/lifecycle/cellular_lives.cpp +++ b/src/server/lifecycle/cellular_lives.cpp @@ -991,7 +991,7 @@ CellularLives::advance_tick_with_mutations(std::span i return std::unexpected{CellularLivesError::mutation}; if (!life->mutation.offer.has_value()) return std::unexpected{CellularLivesError::mutation}; - const auto& offer = *life->mutation.offer; + const auto& offer = life->mutation.offer.value(); if (offer.parent != life->identity.genome || offer.context.event_index != selection.event_index || !std::ranges::any_of(offer.candidates, @@ -1115,7 +1115,7 @@ CellularLives::advance_tick_with_mutations(std::span i const auto parent = next_archive.find(found->identity.genome); if (!parent || !found->mutation.offer.has_value()) return std::unexpected{CellularLivesError::mutation}; - const auto& offer = *found->mutation.offer; + const auto& offer = found->mutation.offer.value(); auto transition = biology::fund_mutation(*parent, offer.context, offer, selection.operator_id, selection.successor_id, selection.successor_id, found->reserve);