Diverged 2026-04-16 → 2026-04-26: local 27 commits (designs gallery, combat
calculator React app, culture-tree UI, hex-grid formation pages, design
tokens, dashboard status updates, threshold tweak, mc-trade crate scaffold)
vs origin 37 commits (HUD panels, scenes, AI turn-bridge, fog-of-war tests,
diplomacy, culture refinements, tactical tuning, improvement-preview system,
paused-state save/load).
17 files were edited on both sides since merge-base c70b43326. Findings:
• 15 of 17 files: byte-identical between local and origin — the same
autonomous agent applied the same edits on both hosts, so the merge
is a no-op for those.
• src/game/engine/scenes/world_map/world_map.gd: auto-merged cleanly.
Local _sync_cities() definition + call kept; origin's improvement-
preview system (89 lines) layered alongside. Final file has 2 refs
to _sync_cities and 10 refs to preview symbols (preview_yields,
building_placement_pick_requested, _confirm_building_placement,
improvement_preview_requested).
• src/game/engine/scenes/world_map/world_map_city_actions.gd: hand-
merged. Origin's _on_popup_selected is a strict superset of local's
— same preview-emit path PLUS an AI_ARENA fallback that calls
_improvement_manager.start_improvement directly when no preview
listener is connected. Took origin's version; tagged the merged
block with a 'merged from local 9fd0a2ab5 + origin 07ad84d6c' note.
No commits dropped. All 27 local commits preserved in history.
Pure-additive local work (.project/designs/*, scripts/run/dev.sh designs
subcommand, mc-trade crate, combat calculator React app) carried through
the merge unchanged. All 165 origin-only added files (HUD .uid files,
proof-test scenes, integration tests, rendering/.uid files) integrated.
JSON validity verified: vocabulary.json + 6 culture/*.json all parse
cleanly. No conflict markers remain. Validation pending: ./run verify on
EDIT host; cargo check + ./run test:headless on apricot.
3280c93c5d