Diverged 2026-04-26 → 2026-04-29 from base 59dea7f35: local 59 commits
(Natalie autocommit), origin 103 commits (apricot autocommit).
458 dual-edit files, 448 byte-identical (same agent generating same
content on both hosts). 10 actual conflicts resolved:
• .project/designs/app/tsconfig.tsbuildinfo — kept HEAD (superset of
tracked files; will regenerate on next tsc).
• public/games/age-of-dwarves/data/buildings/manifest.json — DELETED
per post-p1-40 architecture (single source of truth at
public/resources/<category>/, no override layer in data/<category>/).
• .project/objectives/README.md — kept HEAD (adds p1-41 row + updated
totals 110/155).
• .project/objectives/p1-38-biome-economy-coupling.md — kept HEAD (proof
scene captured 2026-04-29, was [x]).
• .project/objectives/p2-36-data-resources-building-duplicates.md —
kept HEAD (status: done with closure note absorbed by p1-40).
• public/games/age-of-dwarves/data/objectives.json — kept HEAD (later
timestamp 2026-04-30T04:20Z, includes p1-41 entry, totals 110/155).
• tools/audio-batch-12-defeat-pool.tsv — kept HEAD's swap from Action1
to Exploration2 for defeat_domination (Action1 collided with
victory_domination_b — same cue for win + loss of same type).
• src/simulator/crates/mc-core/src/grid/mod.rs — kept HEAD's added
exports (zoc_from_centre, zoc_from_edge, ZocReach).
• src/simulator/crates/mc-core/src/grid/terrain_blend.rs — kept HEAD's
canonical resources/tiles/ path (post-p1-40) over origin's stale
games/<game>/data/terrain/ path.
• src/simulator/crates/mc-core/src/grid/edge.rs — kept HEAD's ZOC
implementation (ZocReach, zoc_from_centre, zoc_from_edge) + 3
accompanying unit tests. Origin lacked them; mod.rs already exports.
No commits dropped. Validation: ./run validate green pre-commit.
dd675b3402