Two textual conflicts, and one the merge resolved cleanly and wrongly.
effect.rs: #96 extracted the LayoutGeometry list into
layout_geometry_cases() shared by two tests, one of which compares it
against the wire vocabulary; my side had added ViewTarget arguments and
carried the base's assert_eq!(cases.len(), 13). Kept #96's structure with
my arguments and dropped the count -- the list-versus-vocabulary check is
strictly stronger and a count beside it would be a second answer to the
same question. Verified the count came from the merge base, not from my
side, before dropping it.
test-evidence/command.md: both sides appended entries at the same point.
Kept both.
app.rs auto-merged CLEANLY and did not compile: improvise-4dpj's new
a_batch_that_leaves_records_settles_out_of_records_normal constructs
effect::SetAxis, which now carries a view operand. Fixed with
ViewTarget::Active -- the host's own key path, which is what that test is.
Checked rather than assumed, per the brief:
- Test names diffed BOTH ways against the union of the two parents, not
the count. Union 1510, merged 1509, exactly one name absent and it is
the intended one: a_hosts_none_cats_leak_into_another_views_formula_columns,
the ac2z characterization test my own branch replaced with
a_formulas_columns_survive_a_host_that_aggregates_differently. Nothing
else lost, nothing unexpected gained.
- #96's the_enumeration_names_every_variant_the_derive_declares is still
discriminating against the reshaped ModelCommand variants: dropping
TransposeAxes from every_model_command() fails it by name.
- The test-support feature stays off in shipped builds: cargo tree
--edges normal --target wasm32-unknown-unknown finds no serde_json.
And the finding the brief asked for, which is the opposite of a
disagreement: #96's switching_views_across_records_ness_settles_against_
the_view_switched_to is the HOST-side twin of the client fix in this
branch. Same batch, same crossing in both directions, and independently
the same phrase in its message. Neither is redundant -- nothing in the
projection stream carries the host's ViewState, so a host-side guard
cannot see a client's mode or the reverse. Cross-referenced in
context/test-evidence/clients.md so neither is deleted as a duplicate.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01FC2jVn8Au7E9JPkw6bwXXH
Edward Langley
3d0850c132