feat(wiki): Sprint 35 copy — glossary, brand corps, brand templates #127

Closed

jpmschweitzer wants to merge 0 commits from sprint-35/copy into main

pull from: sprint-35/copy

merge into: :main

:main

Conversation 3 Commits - Files Changed -

jpmschweitzer commented 2026-04-12 19:45:59 +02:00

Owner

Copy Link

Copy Source

Summary

• #840 Glossary — wiki/glossary.md: canonical quick-reference for proper nouns, factions, currencies, corridors, key locations, economics terminology, TOML data terminology, and drift forms table. Linked from wiki/index.md.
• #830 Brand corps — tier1.toml: four new brand corporation records (Calloway Distillery, Vins de Grand Vide, thrds, Bífröst Marmor) with all 15 required fields. Verified against wiki corp pages (D-182 sync).
• #831 Brand templates — brand_templates.toml: 126 templates (42 archetypes × 3 scale tiers) covering all 8 brand categories and all 6 corridors. All commodity IDs verified against commodities.toml. All cultural templates carry reference_population annotations (D-190).

Corrections applied

Van Maanen's Star entries in glossary corrected to canonical: GJ 35 / Vuurkloof / DG white dwarf / south_reach / ~300y. Drift forms added: "Krenn System" → Vuurkloof (GJ 35), "GJ 280A" → GJ 35.

Test plan

• make economy-db compiles without errors (TOML valid)
• Spot-check 4 brand corp records in DB against tier1.toml
• Spot-check 5 brand templates in DB against brand_templates.toml
• Glossary drift table covers all Sprint 34 incidents and the Krenn/GJ-280A fix

## Summary - **#840 Glossary** — `wiki/glossary.md`: canonical quick-reference for proper nouns, factions, currencies, corridors, key locations, economics terminology, TOML data terminology, and drift forms table. Linked from `wiki/index.md`. - **#830 Brand corps** — `tier1.toml`: four new brand corporation records (Calloway Distillery, Vins de Grand Vide, thrds, Bífröst Marmor) with all 15 required fields. Verified against wiki corp pages (D-182 sync). - **#831 Brand templates** — `brand_templates.toml`: 126 templates (42 archetypes × 3 scale tiers) covering all 8 brand categories and all 6 corridors. All commodity IDs verified against `commodities.toml`. All cultural templates carry `reference_population` annotations (D-190). ## Corrections applied Van Maanen's Star entries in glossary corrected to canonical: GJ 35 / Vuurkloof / DG white dwarf / south_reach / ~300y. Drift forms added: "Krenn System" → Vuurkloof (GJ 35), "GJ 280A" → GJ 35. ## Test plan - [ ] `make economy-db` compiles without errors (TOML valid) - [ ] Spot-check 4 brand corp records in DB against tier1.toml - [ ] Spot-check 5 brand templates in DB against brand_templates.toml - [ ] Glossary drift table covers all Sprint 34 incidents and the Krenn/GJ-280A fix

jpmschweitzer added 1 commit 2026-04-12 19:45:59 +02:00

feat(wiki): Sprint 35 copy deliverables — glossary, brand corps, brand templates ... 92ad6b9515

- wiki/glossary.md: canonical proper nouns, factions, currencies, corridors,
  key locations, economics terminology, drift forms (tasks #840)
- wiki/economics/corporations/tier1.toml: add Calloway Distillery, Vins de Grand
  Vide, thrds, Bífröst Marmor brand corp records (#830)
- wiki/economics/archetypes/brand_templates.toml: 126 templates (42 archetypes ×
  3 scale tiers) covering all 8 brand categories and all 6 corridors (#831)
- wiki/index.md: add glossary link under Reference section

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

jpmschweitzer added 1 commit 2026-04-12 19:47:26 +02:00

content(atlas): hand-author markers.json for Edict, Vuurkloof, Røros, Cairnside (#837) ... 2d3361e24d

Author Phase 3 atlas quality-bar templates for 4 core systems alongside
the pre-existing Lendel template. Names, cities, roads/rail, and POIs
hand-placed against each body's heightmap and tied to the system's
corridor naming tradition.

- GJ244Ad Edict (Sirius system, inner_corridor) — Assembly institutional
  capital: Mandate 387M, Station Edict 13M, Founder's Range, Accord
  Peaks, Founding Ocean, Edict Deep Line rail.
- GJ35c Vuurkloof (Van Maanen's Star, south_reach) — volcanic geothermal
  settlement: Terras 290K, Kloofbas 50K, Groot Breuk, Ysterkop, Rantlyne
  underground rail. Afrikaans geology naming per wiki canon.
- GJ66Bc Røros (Voss system, west_reach) — Compact mining world:
  Storbjerg 3.2M, Hammervik 800K, Nordfjell, Rørosfjell, Storhav,
  Glåmelva. Norwegian/Scandinavian heritage naming.
- GJ892d Cairnside (deep frontier, research domes) — Cairnside Primary
  75M, Survey Post Kappa 5M, The Terraces, Baseline Lake, Baseline Rail.
  Technical frontier naming pattern.

All files match the implemented Lendel markers.json format (grid + pixel
coordinates, raw population, gate terminal as named POI). D-191 section 8
describes the schema in abstract lat/lon terms; server team should align
generate_atlas.py and D-191 prose with the on-disk format before #832
and #833 consume these as few-shot examples.

These templates serve as the quality bar for generator tuning and as
few-shot examples for the Gemma 2 naming pipeline (#833).

Ticket: #837
Decisions: D-191 (Phase 3 atlas), D-036 (Sova/Vuurkloof canon), D-144
(Sirius/Concord seat)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

jpmschweitzer commented 2026-04-12 19:58:32 +02:00

Author

Owner

Copy Link

Copy Source

Scope update: #837 added (commit 2d3361e2)

PR now also includes ticket #837 — Hand-author atlas templates (4 new markers.json files alongside the pre-existing Lendel template).

New files

• wiki/star-systems/GJ-244A/bodies/GJ244Ad/markers.json — Edict (Sirius, inner_corridor, Assembly institutional capital)
• wiki/star-systems/GJ-35/bodies/GJ35c/markers.json — Vuurkloof (Van Maanen's Star, south_reach, volcanic geothermal)
• wiki/star-systems/GJ-66B/bodies/GJ66Bc/markers.json — Røros (Voss system, west_reach, Compact mining)
• wiki/star-systems/GJ-892/bodies/GJ892d/markers.json — Cairnside (deep frontier, research domes)

Each body has named geography, hand-placed cities validated against the heightmap, roads/rail following terrain corridors, named institutional POIs, and gate terminal as a named POI.

Schema note — server team, please read

All 5 atlas template files (the 4 new ones plus the pre-existing Lendel template) use the implemented markers.json format: grid: {w, h} with [row, col] pixel coordinates, raw population numbers, and gate terminal expressed as a named POI rather than a boolean field.

D-191 section 8 describes this schema abstractly in terms of lat/lon, population_tier: 1–6, gate_terminal: bool, and continent_id. This does not match what tooling/planet-gen/ actually emits (the Lendel file).

Before generate_atlas.py (#832) and the Gemma 2 naming pass (#833) read these as few-shot examples, please align one side with the other:

• Either update D-191 prose to reflect the grid/pixel format, or
• Update the generator to emit lat/lon and migrate the 5 templates.

Flagging, not blocking — this is a spec-vs-implementation drift worth resolving before server work proceeds.

Full sprint 35 copy scope (PR #127)

#	Title	Status
#840	Wiki glossary	✓
#830	Brand corps in tier1.toml	✓
#831	brand_templates.toml (126 templates)	✓
#837	Hand-author atlas templates (Lendel + 4 systems)	✓

#838 (review generated atlas) remains blocked on server #832/#833 as expected.

## Scope update: #837 added (commit 2d3361e2) PR now also includes ticket **#837 — Hand-author atlas templates** (4 new markers.json files alongside the pre-existing Lendel template). ### New files - `wiki/star-systems/GJ-244A/bodies/GJ244Ad/markers.json` — **Edict** (Sirius, inner_corridor, Assembly institutional capital) - `wiki/star-systems/GJ-35/bodies/GJ35c/markers.json` — **Vuurkloof** (Van Maanen's Star, south_reach, volcanic geothermal) - `wiki/star-systems/GJ-66B/bodies/GJ66Bc/markers.json` — **Røros** (Voss system, west_reach, Compact mining) - `wiki/star-systems/GJ-892/bodies/GJ892d/markers.json` — **Cairnside** (deep frontier, research domes) Each body has named geography, hand-placed cities validated against the heightmap, roads/rail following terrain corridors, named institutional POIs, and gate terminal as a named POI. ### Schema note — server team, please read All 5 atlas template files (the 4 new ones plus the pre-existing Lendel template) use the **implemented** markers.json format: `grid: {w, h}` with `[row, col]` pixel coordinates, raw population numbers, and gate terminal expressed as a named POI rather than a boolean field. D-191 section 8 describes this schema abstractly in terms of `lat/lon`, `population_tier: 1–6`, `gate_terminal: bool`, and `continent_id`. This does not match what `tooling/planet-gen/` actually emits (the Lendel file). Before `generate_atlas.py` (#832) and the Gemma 2 naming pass (#833) read these as few-shot examples, please align one side with the other: - Either update D-191 prose to reflect the grid/pixel format, or - Update the generator to emit lat/lon and migrate the 5 templates. Flagging, not blocking — this is a spec-vs-implementation drift worth resolving before server work proceeds. ### Full sprint 35 copy scope (PR #127) | # | Title | Status | |---|---|---| | #840 | Wiki glossary | ✓ | | #830 | Brand corps in tier1.toml | ✓ | | #831 | brand_templates.toml (126 templates) | ✓ | | #837 | Hand-author atlas templates (Lendel + 4 systems) | ✓ | #838 (review generated atlas) remains blocked on server #832/#833 as expected.

jpmschweitzer added 1 commit 2026-04-14 00:04:21 +02:00

content(atlas): hand-author markers for Estrade (GJ 280A) — Parallax media capital ... c26d74f45d

Estrade (GJ280Ad) is the Reach's information/media hub: 1.8B population,
inner_corridor, service-mixed economy. Names 10 rivers, 2 water bodies,
3 mountain ranges; places 4 cities (Strata 1.1B, Vantage 450M, Ledger 150M,
Margin 100M); adds gate terminal + 3 institutional POIs, 2 roads, 1 railroad.

Complements #837 atlas template set (Lendel, Edict, Røros, Vuurkloof, Cairnside)
with a high-population urban service world example.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

jpmschweitzer commented 2026-04-14 12:05:53 +02:00

Author

Owner

Copy Link

Copy Source

PR Review — sprint-35/copy → main (3-reviewer consolidated)

Reviewers: Hoshe (QA), Paula (narrative depth), Miri (world consistency)
Verdict: CHANGES REQUESTED (all three reviewers request changes)

The PR is structurally sound and a lot of it is genuinely strong work — Vuurkloof and Røros markers are the bar to hold the others to, all 126 brand templates check out structurally, the corp wiki pages have real character. The fixes below are concentrated in 4 areas: a glossary self-reference bug, faction-term drift in three POI names, one commodity-corridor mismatch in templates, and a VGV currency field that the reviewers disagreed about.

---

Blocking — fix before merge

#	File	Location	Issue	Reviewer
1	wiki/glossary.md	line 118	Self-referential NOT entry on tâtonnement. The NOT line reads "tatônnement" (wrong accent position), "tâtonnement" (check: ô is wrong, correct is â) — but tâtonnement (with â) IS the canonical form. The third item lists the canonical spelling as a drift form. The annotation belongs on tatônnement (item 2), not item 3. Remove "tâtonnement" from the NOT line.	Hoshe
2	wiki/star-systems/GJ-280A/bodies/GJ280Ad/markers.json	pois[0], ~line 204	"Syndicate Editorial Complex" violates glossary. Glossary line 25 flags "Syndicate" as carrying shadow-economy connotations; the canonical bloc name is "the Syndics". As a proper noun on the Parallax media capital's central institution this will ship as canonical drift. Rename — e.g. "Syndics Editorial Board", "Adams & Ford Publishing Complex", or "Parallax Media Centre".	Paula + Miri
3	wiki/star-systems/GJ-66B/bodies/GJ66Bc/markers.json	pois[3], ~line 347	"Syndicate Trade Office" — same glossary violation. Voss is Compact-affiliated, so even rebranded the affiliation should match: "Compact Trade Representative" or "Caldwell Freight Office".	Miri
4	wiki/economics/archetypes/brand_templates.toml	lines 136, 146, 152 (deep_harvest_seafood_brand__local / __regional)	naming_pattern = "Korean/Tagalog" and description "Filipino/Korean maritime heritage" contradict D-189 §11, which defines east_reach as Korean/Japanese. This will direct the Gemma 2 generator to produce Tagalog brand names for east_reach seafood across every instance. Replace with "Korean/Japanese"; rework example names accordingly.	Miri
5	wiki/star-systems/GJ-244A/bodies/GJ244Ad/markers.json	pois[2], ~line 168	"Lattice Commission — Sirius Office" is an undocumented name for the Commission. Glossary lines 14–16 say the Commission's full formal name is unresolved and to use "the Commission" until decided. This POI sits at the Commission's home system and will become the visual canonical name. Rename to "Commission — Sirius Office" (or claim a decision and pick a name first).	Paula
6	wiki/star-systems/GJ-280A/bodies/GJ280Ad/markers.json	pois[2], ~line 218	"Commission Content Review Office" implies undocumented Commission jurisdiction over media. Wiki and decisions never establish Commission authority over content. If intentional, needs a decision reference; otherwise rename to a different actor ("Parallax Standards Office", "Syndics Content Board"). The "Lattice Network Operations Centre" POI in the same file already covers infrastructure-side certification, so a content-review POI under Commission authority is redundant if not canon-expanding.	Paula
7	wiki/star-systems/GJ-35/bodies/GJ35c/markers.json	pois[1] (gate terminal)	Gate terminal naming inconsistency. Four of five markers use "<Body> Gate Terminal" (Edict, Estrade, Cairnside, Voss). Vuurkloof's reads "Prime Surface Depot — Gate Terminal" — descriptive compound that breaks the convention. Either align ("Vuurkloof Gate Terminal" / "Terras Gate Terminal") or document the departure with an inline comment if intentional.	Hoshe
8	wiki/star-systems/GJ-66B/bodies/GJ66Bc/markers.json	pois[1] (gate terminal)	Gate terminal named after system, not body. Body is Røros (GJ66Bc); terminal is "Voss Gate Terminal". Other four markers use the body or capital name. Rename to "Røros Gate Terminal" or "Storbjerg Gate Terminal" for consistency.	Hoshe
9	wiki/star-systems/GJ-892/bodies/GJ892d/markers.json	cities[0] line ~92, roads[0] line ~77	"Cairnside Primary" and "Primary Access Road" are placeholders, not place names. Cairnside is 40 years old, founded — the frontier naming convention (glossary line 74) is "founder surname + noun". Compare Røros (Storbjerg) and Vuurkloof (Terras, Groot Breuk Surface Track). Replace with grounded names — e.g. "Cairn Station", "Okafor Base", "Founders' Reach"; road derived from "Cairn Reach Scarp".	Paula
10	wiki/economics/corporations/tier1.toml	line 564 (vins_de_grand_vide)	currency_preference = "mixed" — reviewers disagree. Miri: must be "mark". GJ 395 (Confluent) is MARK_PRIMARY in currency_zones.toml and the VGV wiki page describes the cooperative as a Compact frontier extension; "mixed" contradicts the canonical zone file and the only other "mark" corp in tier1.toml (westphalia_heavy_works) follows its HQ system's zone. Paula: "mixed" is a valid enum value and could be a deliberate authorial choice (hop-10 commercial pragmatism) IF documented in a TOML # NOTE: comment. Recommended resolution: Miri's reading is stronger — the convention across other corps is that currency_preference mirrors the HQ system's zone. Change to "mark". If a "mixed" reading is intentional, raise a decision before re-posting.	Miri / Paula (disagreement)

Polish — fix or document

#	File	Location	Issue	Reviewer
11	wiki/glossary.md	lines 14–16	Commission name note is editorial debt inside a canonical reference doc. "NOTE: Full formal name unresolved (open question). Use 'the Commission' until formally decided." Authors hitting this in sprint 37 will read it as ambient uncertainty. Either resolve (claim a decision, pick a name) or include a Q-NNN ticket reference so it's tracked.	Paula
12	wiki/economics/corporations/tier1.toml	lines 612–614 (bifrost_marmor)	Bífröst geological anomaly buried. The TOML comment captures the reserve-extent silence but drops the orbital-age formation anomaly (the most narratively load-bearing detail in the wiki page, lines 70–71). One additional comment line: # NOTE: geological survey flagged formation age anomaly inconsistent with current orbital config — sealed alongside reserve data.	Paula
13	wiki/economics/archetypes/brand_templates.toml	reach_wide variants across all 42 archetypes (e.g. cold_climate_spirits__reach_wide line 68)	reach_wide naming patterns systematically strip corridor identity to neutral. The cold_climate_spirits reach_wide variant gives examples like 'Northern Standard', 'Reach Grain Blend' — compass-generic. By contrast old_growth_botanical_spirits__reach_wide (line 265) keeps frontier identity ('Frontier Botanical', 'Edge Series'). Per the cross-cultural mixing rule (corridors are tendencies, not borders), reach_wide variants for terroir / heritage_craft archetypes should permit corridor-origin names that travel ('Calloway Export Blend', 'Northern Reach Grain') alongside neutral options — otherwise the Gemma 2 generator will flatten all reach_wide spirits to neutral.	Paula
14	wiki/economics/archetypes/brand_templates.toml	line 11 (header comment)	commodity_inputs unit context — "per tick" is documented in the header but not cross-referenced anywhere else in the file. If the #829 demand pipeline assumes a different cadence (per cycle, per day) the values will be wrong by a constant factor. Coordinate with server before #829 consumes these.	Hoshe
15	wiki/glossary.md	line 15	NOTE: prefix vs NOT: convention. All other qualifications use NOT:. Line 15 (Commission entry) uses NOTE: with no bold. Either align or document the convention distinction in the preamble.	Hoshe

---

Decision-document issues — flagged separately, not PR blockers

• decisions/economics.md D-189 §11 vs canonical sources: Miri verified on first attempt that the Bífröst Marmor row labels its corridor north_reach while wiki/corporations/bifrost-marmor.md and currency_zones.toml both place Nyrheim (GJ 3737) in west_reach / Compact at hop 7. The PR's TOML entry is consistent with the wiki/zone files, NOT with D-189. D-189 needs a corrective amendment but the PR is not required to make it.
• wiki/star-systems/GJ-892/bodies/GJ892d/index.md body population (80M) vs the GTTR tone (a small research program "that has not yet noticed it has also become a town") — pre-existing inconsistency, not introduced by this PR. Wiki team to reconcile.

---

Items verified clean (for the record)

• All 4 new corps in tier1.toml have all 15 D-175 fields in correct order.
• Calloway / thrds / Bífröst Marmor headquarters_system / headquarters_settlement / currency_preference / bloc_affiliation all match canonical wiki pages and currency_zones.toml.
• All primary_commodities / secondary_commodities IDs in the 4 new corps exist in commodities.toml (agricultural_produce, timber, water, organic_compounds, chemicals, textiles, stone, rare_minerals).
• All 126 brand templates: commodity IDs valid, all 15 cultural templates carry reference_population (D-190), all 18 terroir templates carry terroir_locked (D-177), 42 archetype groups × 3 scale tiers confirmed.
• All 5 markers files: well-formed JSON, consistent schema (grid: {w,h}, [row,col] coords, raw populations, gate terminal as named POI).
• Vuurkloof and Røros markers are the strongest of the five — Afrikaans naming consistent throughout Vuurkloof (rivers, mountains, lakes, cities), Nordic mining identity carried through Røros (Gruve Express, Storbjerg, Rørosfjell).
• IP originality: no Star Wars / Trek / Dune / Foundation / Mass Effect / X / EVE copies detected. Earth-echo names used appropriately per established blended-reality policy.
• wiki/index.md glossary link resolves.
• File placement: wiki/economics/corporations/ is an existing directory, brand_templates location consistent with archetypes pattern.

---

Re-review cadence

15 actionable findings, 1 reviewer disagreement to resolve (#10). Once fixed, /pr-push and re-review against this same comment table. The contextual notes (D-189 amendment, GJ892d population) can be raised as separate decision/wiki tickets after merge.

## PR Review — sprint-35/copy → main (3-reviewer consolidated) **Reviewers:** Hoshe (QA), Paula (narrative depth), Miri (world consistency) **Verdict: CHANGES REQUESTED** (all three reviewers request changes) The PR is structurally sound and a lot of it is genuinely strong work — Vuurkloof and Røros markers are the bar to hold the others to, all 126 brand templates check out structurally, the corp wiki pages have real character. The fixes below are concentrated in 4 areas: a glossary self-reference bug, faction-term drift in three POI names, one commodity-corridor mismatch in templates, and a VGV currency field that the reviewers disagreed about. --- ### Blocking — fix before merge | # | File | Location | Issue | Reviewer | |---|------|----------|-------|----------| | 1 | `wiki/glossary.md` | line 118 | **Self-referential NOT entry on `tâtonnement`.** The NOT line reads `"tatônnement" (wrong accent position), "tâtonnement" (check: ô is wrong, correct is â)` — but `tâtonnement` (with `â`) IS the canonical form. The third item lists the canonical spelling as a drift form. The annotation belongs on `tatônnement` (item 2), not item 3. Remove `"tâtonnement"` from the NOT line. | Hoshe | | 2 | `wiki/star-systems/GJ-280A/bodies/GJ280Ad/markers.json` | `pois[0]`, ~line 204 | **`"Syndicate Editorial Complex"` violates glossary.** Glossary line 25 flags "Syndicate" as carrying shadow-economy connotations; the canonical bloc name is "the Syndics". As a proper noun on the Parallax media capital's central institution this will ship as canonical drift. Rename — e.g. `"Syndics Editorial Board"`, `"Adams & Ford Publishing Complex"`, or `"Parallax Media Centre"`. | Paula + Miri | | 3 | `wiki/star-systems/GJ-66B/bodies/GJ66Bc/markers.json` | `pois[3]`, ~line 347 | **`"Syndicate Trade Office"` — same glossary violation.** Voss is Compact-affiliated, so even rebranded the affiliation should match: `"Compact Trade Representative"` or `"Caldwell Freight Office"`. | Miri | | 4 | `wiki/economics/archetypes/brand_templates.toml` | lines 136, 146, 152 (`deep_harvest_seafood_brand__local` / `__regional`) | **`naming_pattern = "Korean/Tagalog"` and description `"Filipino/Korean maritime heritage"` contradict D-189 §11**, which defines east_reach as Korean/Japanese. This will direct the Gemma 2 generator to produce Tagalog brand names for east_reach seafood across every instance. Replace with "Korean/Japanese"; rework example names accordingly. | Miri | | 5 | `wiki/star-systems/GJ-244A/bodies/GJ244Ad/markers.json` | `pois[2]`, ~line 168 | **`"Lattice Commission — Sirius Office"` is an undocumented name for the Commission.** Glossary lines 14–16 say the Commission's full formal name is unresolved and to use "the Commission" until decided. This POI sits at the Commission's home system and will become the visual canonical name. Rename to `"Commission — Sirius Office"` (or claim a decision and pick a name first). | Paula | | 6 | `wiki/star-systems/GJ-280A/bodies/GJ280Ad/markers.json` | `pois[2]`, ~line 218 | **`"Commission Content Review Office"` implies undocumented Commission jurisdiction over media.** Wiki and decisions never establish Commission authority over content. If intentional, needs a decision reference; otherwise rename to a different actor (`"Parallax Standards Office"`, `"Syndics Content Board"`). The `"Lattice Network Operations Centre"` POI in the same file already covers infrastructure-side certification, so a content-review POI under Commission authority is redundant if not canon-expanding. | Paula | | 7 | `wiki/star-systems/GJ-35/bodies/GJ35c/markers.json` | `pois[1]` (gate terminal) | **Gate terminal naming inconsistency.** Four of five markers use `"<Body> Gate Terminal"` (Edict, Estrade, Cairnside, Voss). Vuurkloof's reads `"Prime Surface Depot — Gate Terminal"` — descriptive compound that breaks the convention. Either align (`"Vuurkloof Gate Terminal"` / `"Terras Gate Terminal"`) or document the departure with an inline comment if intentional. | Hoshe | | 8 | `wiki/star-systems/GJ-66B/bodies/GJ66Bc/markers.json` | `pois[1]` (gate terminal) | **Gate terminal named after system, not body.** Body is Røros (`GJ66Bc`); terminal is `"Voss Gate Terminal"`. Other four markers use the body or capital name. Rename to `"Røros Gate Terminal"` or `"Storbjerg Gate Terminal"` for consistency. | Hoshe | | 9 | `wiki/star-systems/GJ-892/bodies/GJ892d/markers.json` | `cities[0]` line ~92, `roads[0]` line ~77 | **`"Cairnside Primary"` and `"Primary Access Road"` are placeholders, not place names.** Cairnside is 40 years old, founded — the frontier naming convention (glossary line 74) is "founder surname + noun". Compare Røros (`Storbjerg`) and Vuurkloof (`Terras`, `Groot Breuk Surface Track`). Replace with grounded names — e.g. `"Cairn Station"`, `"Okafor Base"`, `"Founders' Reach"`; road derived from `"Cairn Reach Scarp"`. | Paula | | 10 | `wiki/economics/corporations/tier1.toml` | line 564 (`vins_de_grand_vide`) | **`currency_preference = "mixed"` — reviewers disagree.** **Miri:** must be `"mark"`. GJ 395 (Confluent) is `MARK_PRIMARY` in `currency_zones.toml` and the VGV wiki page describes the cooperative as a Compact frontier extension; "mixed" contradicts the canonical zone file and the only other "mark" corp in tier1.toml (`westphalia_heavy_works`) follows its HQ system's zone. **Paula:** "mixed" is a valid enum value and could be a deliberate authorial choice (hop-10 commercial pragmatism) IF documented in a TOML `# NOTE:` comment. **Recommended resolution:** Miri's reading is stronger — the convention across other corps is that `currency_preference` mirrors the HQ system's zone. Change to `"mark"`. If a "mixed" reading is intentional, raise a decision before re-posting. | Miri / Paula (disagreement) | ### Polish — fix or document | # | File | Location | Issue | Reviewer | |---|------|----------|-------|----------| | 11 | `wiki/glossary.md` | lines 14–16 | **Commission name note is editorial debt inside a canonical reference doc.** `"NOTE: Full formal name unresolved (open question). Use 'the Commission' until formally decided."` Authors hitting this in sprint 37 will read it as ambient uncertainty. Either resolve (claim a decision, pick a name) or include a Q-NNN ticket reference so it's tracked. | Paula | | 12 | `wiki/economics/corporations/tier1.toml` | lines 612–614 (`bifrost_marmor`) | **Bífröst geological anomaly buried.** The TOML comment captures the reserve-extent silence but drops the orbital-age formation anomaly (the most narratively load-bearing detail in the wiki page, lines 70–71). One additional comment line: `# NOTE: geological survey flagged formation age anomaly inconsistent with current orbital config — sealed alongside reserve data.` | Paula | | 13 | `wiki/economics/archetypes/brand_templates.toml` | reach_wide variants across all 42 archetypes (e.g. `cold_climate_spirits__reach_wide` line 68) | **`reach_wide` naming patterns systematically strip corridor identity to neutral.** The cold_climate_spirits reach_wide variant gives examples like `'Northern Standard', 'Reach Grain Blend'` — compass-generic. By contrast `old_growth_botanical_spirits__reach_wide` (line 265) keeps frontier identity (`'Frontier Botanical', 'Edge Series'`). Per the cross-cultural mixing rule (corridors are tendencies, not borders), reach_wide variants for terroir / heritage_craft archetypes should permit corridor-origin names that travel (`'Calloway Export Blend', 'Northern Reach Grain'`) alongside neutral options — otherwise the Gemma 2 generator will flatten all reach_wide spirits to neutral. | Paula | | 14 | `wiki/economics/archetypes/brand_templates.toml` | line 11 (header comment) | **`commodity_inputs` unit context** — "per tick" is documented in the header but not cross-referenced anywhere else in the file. If the #829 demand pipeline assumes a different cadence (per cycle, per day) the values will be wrong by a constant factor. Coordinate with server before #829 consumes these. | Hoshe | | 15 | `wiki/glossary.md` | line 15 | **`NOTE:` prefix vs `NOT:` convention.** All other qualifications use `NOT:`. Line 15 (Commission entry) uses `NOTE:` with no bold. Either align or document the convention distinction in the preamble. | Hoshe | --- ### Decision-document issues — flagged separately, not PR blockers - `decisions/economics.md` D-189 §11 vs canonical sources: Miri verified on first attempt that the Bífröst Marmor row labels its corridor `north_reach` while `wiki/corporations/bifrost-marmor.md` and `currency_zones.toml` both place Nyrheim (GJ 3737) in `west_reach` / Compact at hop 7. The PR's TOML entry is consistent with the wiki/zone files, NOT with D-189. D-189 needs a corrective amendment but the PR is not required to make it. - `wiki/star-systems/GJ-892/bodies/GJ892d/index.md` body population (80M) vs the GTTR tone (a small research program "that has not yet noticed it has also become a town") — pre-existing inconsistency, not introduced by this PR. Wiki team to reconcile. --- ### Items verified clean (for the record) - All 4 new corps in `tier1.toml` have all 15 D-175 fields in correct order. - Calloway / thrds / Bífröst Marmor `headquarters_system` / `headquarters_settlement` / `currency_preference` / `bloc_affiliation` all match canonical wiki pages and `currency_zones.toml`. - All `primary_commodities` / `secondary_commodities` IDs in the 4 new corps exist in `commodities.toml` (`agricultural_produce`, `timber`, `water`, `organic_compounds`, `chemicals`, `textiles`, `stone`, `rare_minerals`). - All 126 brand templates: commodity IDs valid, all 15 cultural templates carry `reference_population` (D-190), all 18 terroir templates carry `terroir_locked` (D-177), 42 archetype groups × 3 scale tiers confirmed. - All 5 markers files: well-formed JSON, consistent schema (`grid: {w,h}`, `[row,col]` coords, raw populations, gate terminal as named POI). - Vuurkloof and Røros markers are the strongest of the five — Afrikaans naming consistent throughout Vuurkloof (rivers, mountains, lakes, cities), Nordic mining identity carried through Røros (`Gruve Express`, `Storbjerg`, `Rørosfjell`). - IP originality: no Star Wars / Trek / Dune / Foundation / Mass Effect / X / EVE copies detected. Earth-echo names used appropriately per established blended-reality policy. - `wiki/index.md` glossary link resolves. - File placement: `wiki/economics/corporations/` is an existing directory, brand_templates location consistent with archetypes pattern. --- ### Re-review cadence 15 actionable findings, 1 reviewer disagreement to resolve (#10). Once fixed, `/pr-push` and re-review against this same comment table. The contextual notes (D-189 amendment, GJ892d population) can be raised as separate decision/wiki tickets after merge.

jpmschweitzer referenced this issue from a commit 2026-04-14 16:07:25 +02:00

content(wiki): PR #127 review fix pass — 15 findings

jpmschweitzer added 1 commit 2026-04-14 16:07:25 +02:00

content(wiki): PR #127 review fix pass — 15 findings ... 9439a20253

Applies all review findings from Hoshe + Paula + Miri on PR #127.

Glossary (wiki/glossary.md):
- Remove self-referential "tâtonnement" from its own NOT list.
- Add NOT/NOTE annotation-prefix preamble.
- Replace ambient "open question" note on Commission with explicit
  Q-095 citation; add "Lattice Commission" to NOT list.

Decisions:
- Claim Q-095 (content) — "Commission formal name — authoritative
  designation"; register in decisions/questions.md index.

Marker POI renames (glossary.md line 25 — "Syndicate" is prohibited;
glossary.md lines 14–16 — "Lattice Commission" is undocumented):
- GJ280Ad: "Syndicate Editorial Complex" → "Parallax Media Centre";
  "Commission Content Review Office" → "Parallax Standards Office".
- GJ66Bc: "Syndicate Trade Office" → "Compact Trade Representative";
  "Voss Gate Terminal" → "Røros Gate Terminal".
- GJ244Ad: "Lattice Commission — Sirius Office" → "Commission — Sirius Office".
- GJ35c: "Prime Surface Depot — Gate Terminal" → "Terras Gate Terminal".
- GJ892d (Cairnside): "Cairnside Primary" → "Okafor Base" (frontier
  founder-surname pattern per glossary.md line 74); "Primary Access
  Road" → "Cairn Scarp Track" (derived from Cairn Reach Scarp).

Brand templates (wiki/economics/archetypes/brand_templates.toml):
- Deep-harvest seafood archetype: Korean/Tagalog → Korean/Japanese
  across naming_pattern and description fields, per D-189 §11.
- 11 terroir + heritage_craft _reach_wide variants now show BOTH
  corridor-origin and neutral example names, per cross-cultural
  mixing rule; inner_corridor/neutral monoculture removed.
- commodity_inputs header comment: add explicit "per tick" unit
  cross-reference to D-189 §5 and server/src/simulation/economy.rs.

Tier-1 corporations (wiki/economics/corporations/tier1.toml):
- Vins de Grand Vide: currency_preference "mixed" → "mark" — HQ
  booking currency must mirror the HQ-system canonical zone
  (GJ 395 Confluent → MARK_PRIMARY); "mixed" is reserved for hop 5–6
  transition systems.
- Bífröst Marmor: add NOTE surfacing the orbital-age formation
  anomaly (wiki/corporations/bifrost-marmor.md:70–71), alongside
  the existing reserve-silence comment.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

jpmschweitzer commented 2026-04-14 17:12:55 +02:00

Author

Owner

Copy Link

Copy Source

PR Review Round 2 — sprint-35/copy → main

Reviewers: Hoshe (QA), Paula (narrative depth), Miri (world consistency)
Verdict: APPROVED (3/3)

Fix commit 9439a202 cleanly addresses every finding from Round 1. All 15 items resolved, no regressions.

---

Per-finding resolution

#	File	Round 1 finding	Round 2 status	Resolution
1	wiki/glossary.md	Self-referential tâtonnement NOT entry	RESOLVED	Canonical form removed from its own NOT list; annotation now correctly applies to tatônnement
2	Estrade_GJ280Ad.json	"Syndicate Editorial Complex" violates glossary	RESOLVED	Renamed to "Parallax Media Centre" (coherent with Parallax as established settlement on GJ 280A)
3	Roros_GJ66Bc.json	"Syndicate Trade Office" violates glossary	RESOLVED	Renamed to "Compact Trade Representative" (consistent with Nordic naming palette and west_reach cultural territory)
4	brand_templates.toml	deep_harvest_seafood_brand Korean/Tagalog contradicts D-189 §11	RESOLVED	Both __local and __regional now use Korean/Japanese naming pattern; Tagalog example names replaced
5	Edict_GJ244Ad.json	"Lattice Commission — Sirius Office" undocumented variant	RESOLVED	Renamed to "Commission — Sirius Office"
6	Estrade_GJ280Ad.json	"Commission Content Review Office" implies undocumented jurisdiction	RESOLVED	Renamed to "Parallax Standards Office" — plausible trade/compliance function without asserting Commission media authority
7	Vuurkloof_GJ35c.json	Gate terminal naming breaks pattern	RESOLVED	Renamed to "Terras Gate Terminal" (capital city name, matches pattern)
8	Roros_GJ66Bc.json	Gate terminal named after system not body	RESOLVED	Renamed to "Røros Gate Terminal"
9	Cairnside_GJ892d.json	Placeholder names "Cairnside Primary" / "Primary Access Road"	RESOLVED	Renamed to "Okafor Base" (founder-surname pattern) and "Cairn Scarp Track" (derived from Cairn Reach Scarp)
10	tier1.toml:564 [vins_de_grand_vide]	currency_preference = "mixed" contradicts canonical zone	RESOLVED	Changed to "mark" per Jeroen-ruled convention (field reflects HQ booking currency; cross-zone acceptance is handled by export conversion rates)
11	wiki/glossary.md	Commission name ambient editorial debt	RESOLVED	Q-095 claimed (content domain), cited in glossary NOTE, registered in questions.md and questions-content.md with consistent status counts
12	tier1.toml [bifrost_marmor]	Orbital-age formation anomaly buried	RESOLVED	NOTE comment added surfacing the anomaly alongside the existing reserve-silence comment
13	brand_templates.toml	reach_wide naming patterns strip corridor identity	RESOLVED	All 11 terroir + heritage_craft _reach_wide variants now show both corridor-origin and neutral example names; other 6 categories correctly left untouched
14	brand_templates.toml	commodity_inputs unit context	RESOLVED	Header comment now cross-references D-189 §5 and server/src/simulation/economy.rs
15	wiki/glossary.md:15	NOTE: vs NOT: prefix convention	RESOLVED	Preamble added documenting both annotations (NOT: = drift/prohibition, NOTE: = advisory/placeholder)

---

Q-095 consistency

• decisions/questions.md index: Q-095 listed in the content domain row; footer counts consistent (Content: 25 total, 10 resolved, 2 partial, 13 open; 97 total)
• decisions/questions-content.md: Q-095 entry complete with Status, Question, Context, Affects, Source (Sprint 35 copy review PR #127); footer status counts match index
• wiki/glossary.md Commission entry NOTE cites Q-095 with correct file reference

---

Regressions

None in the scope examined. Valid TOML, valid JSON, intact markdown.

---

PR #127 is approved for merge.

## PR Review Round 2 — sprint-35/copy → main **Reviewers:** Hoshe (QA), Paula (narrative depth), Miri (world consistency) **Verdict: APPROVED** (3/3) Fix commit `9439a202` cleanly addresses every finding from Round 1. All 15 items resolved, no regressions. --- ### Per-finding resolution | # | File | Round 1 finding | Round 2 status | Resolution | |---|------|-----------------|----------------|------------| | 1 | `wiki/glossary.md` | Self-referential `tâtonnement` NOT entry | RESOLVED | Canonical form removed from its own NOT list; annotation now correctly applies to `tatônnement` | | 2 | `Estrade_GJ280Ad.json` | `"Syndicate Editorial Complex"` violates glossary | RESOLVED | Renamed to `"Parallax Media Centre"` (coherent with Parallax as established settlement on GJ 280A) | | 3 | `Roros_GJ66Bc.json` | `"Syndicate Trade Office"` violates glossary | RESOLVED | Renamed to `"Compact Trade Representative"` (consistent with Nordic naming palette and west_reach cultural territory) | | 4 | `brand_templates.toml` | `deep_harvest_seafood_brand` Korean/Tagalog contradicts D-189 §11 | RESOLVED | Both `__local` and `__regional` now use Korean/Japanese naming pattern; Tagalog example names replaced | | 5 | `Edict_GJ244Ad.json` | `"Lattice Commission — Sirius Office"` undocumented variant | RESOLVED | Renamed to `"Commission — Sirius Office"` | | 6 | `Estrade_GJ280Ad.json` | `"Commission Content Review Office"` implies undocumented jurisdiction | RESOLVED | Renamed to `"Parallax Standards Office"` — plausible trade/compliance function without asserting Commission media authority | | 7 | `Vuurkloof_GJ35c.json` | Gate terminal naming breaks pattern | RESOLVED | Renamed to `"Terras Gate Terminal"` (capital city name, matches pattern) | | 8 | `Roros_GJ66Bc.json` | Gate terminal named after system not body | RESOLVED | Renamed to `"Røros Gate Terminal"` | | 9 | `Cairnside_GJ892d.json` | Placeholder names `"Cairnside Primary"` / `"Primary Access Road"` | RESOLVED | Renamed to `"Okafor Base"` (founder-surname pattern) and `"Cairn Scarp Track"` (derived from Cairn Reach Scarp) | | 10 | `tier1.toml:564` `[vins_de_grand_vide]` | `currency_preference = "mixed"` contradicts canonical zone | RESOLVED | Changed to `"mark"` per Jeroen-ruled convention (field reflects HQ booking currency; cross-zone acceptance is handled by export conversion rates) | | 11 | `wiki/glossary.md` | Commission name ambient editorial debt | RESOLVED | **Q-095** claimed (content domain), cited in glossary NOTE, registered in `questions.md` and `questions-content.md` with consistent status counts | | 12 | `tier1.toml` `[bifrost_marmor]` | Orbital-age formation anomaly buried | RESOLVED | NOTE comment added surfacing the anomaly alongside the existing reserve-silence comment | | 13 | `brand_templates.toml` | reach_wide naming patterns strip corridor identity | RESOLVED | All 11 terroir + heritage_craft `_reach_wide` variants now show both corridor-origin and neutral example names; other 6 categories correctly left untouched | | 14 | `brand_templates.toml` | `commodity_inputs` unit context | RESOLVED | Header comment now cross-references D-189 §5 and `server/src/simulation/economy.rs` | | 15 | `wiki/glossary.md:15` | `NOTE:` vs `NOT:` prefix convention | RESOLVED | Preamble added documenting both annotations (`NOT:` = drift/prohibition, `NOTE:` = advisory/placeholder) | --- ### Q-095 consistency - `decisions/questions.md` index: Q-095 listed in the content domain row; footer counts consistent (Content: 25 total, 10 resolved, 2 partial, 13 open; 97 total) - `decisions/questions-content.md`: Q-095 entry complete with Status, Question, Context, Affects, Source (Sprint 35 copy review PR #127); footer status counts match index - `wiki/glossary.md` Commission entry NOTE cites Q-095 with correct file reference --- ### Regressions None in the scope examined. Valid TOML, valid JSON, intact markdown. --- **PR #127 is approved for merge.**

jpmschweitzer closed this pull request 2026-04-14 17:17:16 +02:00

jpmschweitzer referenced this issue from a commit 2026-04-15 08:52:04 +02:00

feat(simulation): brand layer schema and import pipeline (#827)

jpmschweitzer referenced this pull request 2026-04-15 08:53:27 +02:00

feat(server): Sprint 35 — seed, brand layer, terrain refs, atlas pipeline #129

jpmschweitzer referenced this pull request 2026-04-15 09:08:19 +02:00

feat(server): Sprint 35 — seed, brand layer, terrain refs, atlas pipeline #129

Pull request closed

This pull request cannot be reopened because the branch was deleted.

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No labels

Milestone

No items

No Milestone

Projects

Clear projects

No projects

Assignees

Clear assignees

jpmschweitzer (Jeroen Schweitzer)

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: jpmschweitzer/settled-reach#127