diff --git a/docs/atlas/proposals/GJ17.json b/docs/atlas/proposals/GJ17.json
new file mode 100644
index 000000000..3db23b629
--- /dev/null
+++ b/docs/atlas/proposals/GJ17.json
@@ -0,0 +1,289 @@
+{
+  "system_id": "GJ 17",
+  "proper_name": "Binh Trang",
+  "star_type": "F",
+  "spectral_class": "F9V",
+  "wiki_data": {
+    "habitable_count": 1,
+    "inhabited_count": 1,
+    "has_gas_giant": true,
+    "has_asteroid_belt": true,
+    "has_horizon_station": true,
+    "raw_bodies_line": null
+  },
+  "bodies": [
+    {
+      "body_id": "GJ17b",
+      "proper_name": null,
+      "body_type": "planet",
+      "orbit_index": 1,
+      "parent_body_id": null,
+      "inhabited": false,
+      "population": null,
+      "mass_class": "terrestrial",
+      "surface_gravity": 0.48,
+      "orbital_period_days": 48.0,
+      "rotation_period_hours": 18.6,
+      "atmosphere": "none",
+      "biome_summary": "barren",
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "inner rocky, hot, uninhabited"
+    },
+    {
+      "body_id": "GJ17c",
+      "proper_name": null,
+      "body_type": "planet",
+      "orbit_index": 2,
+      "parent_body_id": null,
+      "inhabited": false,
+      "population": null,
+      "mass_class": "terrestrial",
+      "surface_gravity": 0.71,
+      "orbital_period_days": 180.0,
+      "rotation_period_hours": 23.8,
+      "atmosphere": "thin",
+      "biome_summary": "hot_arid",
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "hot inner rocky, Venus-zone, uninhabited"
+    },
+    {
+      "body_id": "GJ17d",
+      "proper_name": "Binh Trang",
+      "body_type": "planet",
+      "orbit_index": 3,
+      "parent_body_id": null,
+      "inhabited": true,
+      "population": 520000,
+      "mass_class": "terrestrial",
+      "surface_gravity": 0.94,
+      "orbital_period_days": 480.0,
+      "rotation_period_hours": 25.2,
+      "atmosphere": "standard",
+      "biome_summary": "temperate",
+      "hydrosphere": "liquid_water",
+      "economic_role": "agricultural",
+      "settlement_pattern": "dispersed",
+      "industrial_corridor": "agricultural_export",
+      "notes": "primary inhabited world; wave_3 Vietnamese heritage (Kaelong offshoot); 3-aperture junction; prominent river-delta geography; agricultural cooperative governance; food surpluses exported primarily to Thornfield Station; F9V star supports better agricultural conditions than M-dwarf corridor neighbors"
+    },
+    {
+      "body_id": "GJ17-belt",
+      "proper_name": null,
+      "body_type": "asteroid_belt",
+      "orbit_index": 4,
+      "parent_body_id": null,
+      "inhabited": false,
+      "population": null,
+      "mass_class": null,
+      "surface_gravity": null,
+      "orbital_period_days": null,
+      "rotation_period_hours": null,
+      "atmosphere": null,
+      "biome_summary": null,
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "inner asteroid belt"
+    },
+    {
+      "body_id": "GJ17e",
+      "proper_name": null,
+      "body_type": "planet",
+      "orbit_index": 5,
+      "parent_body_id": null,
+      "inhabited": false,
+      "population": null,
+      "mass_class": "terrestrial",
+      "surface_gravity": 0.62,
+      "orbital_period_days": 1300.0,
+      "rotation_period_hours": 27.4,
+      "atmosphere": "thin",
+      "biome_summary": "cold_arid",
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "outer rocky, uninhabited"
+    },
+    {
+      "body_id": "GJ17f",
+      "proper_name": null,
+      "body_type": "gas_giant",
+      "orbit_index": 6,
+      "parent_body_id": null,
+      "inhabited": false,
+      "population": null,
+      "mass_class": null,
+      "surface_gravity": null,
+      "orbital_period_days": 3600.0,
+      "rotation_period_hours": 10.8,
+      "atmosphere": "gas_giant",
+      "biome_summary": null,
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "outer gas giant, two moons"
+    },
+    {
+      "body_id": "GJ17f-m1",
+      "proper_name": null,
+      "body_type": "moon",
+      "orbit_index": 1,
+      "parent_body_id": "GJ17f",
+      "inhabited": false,
+      "population": null,
+      "mass_class": "dwarf",
+      "surface_gravity": 0.14,
+      "orbital_period_days": 7.2,
+      "rotation_period_hours": 172.8,
+      "atmosphere": "trace",
+      "biome_summary": "frozen",
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "icy moon, tidally locked"
+    },
+    {
+      "body_id": "GJ17f-m2",
+      "proper_name": null,
+      "body_type": "moon",
+      "orbit_index": 2,
+      "parent_body_id": "GJ17f",
+      "inhabited": false,
+      "population": null,
+      "mass_class": "dwarf",
+      "surface_gravity": 0.09,
+      "orbital_period_days": 15.4,
+      "rotation_period_hours": 369.6,
+      "atmosphere": null,
+      "biome_summary": "barren",
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "small rocky moon, tidally locked"
+    },
+    {
+      "body_id": "GJ17g",
+      "proper_name": null,
+      "body_type": "planet",
+      "orbit_index": 7,
+      "parent_body_id": null,
+      "inhabited": false,
+      "population": null,
+      "mass_class": "terrestrial",
+      "surface_gravity": 0.49,
+      "orbital_period_days": 9200.0,
+      "rotation_period_hours": 36.2,
+      "atmosphere": "trace",
+      "biome_summary": "frozen",
+      "hydrosphere": "ice",
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "outer icy rocky, uninhabited"
+    },
+    {
+      "body_id": "GJ17h",
+      "proper_name": null,
+      "body_type": "planet",
+      "orbit_index": 8,
+      "parent_body_id": null,
+      "inhabited": false,
+      "population": null,
+      "mass_class": "terrestrial",
+      "surface_gravity": 0.39,
+      "orbital_period_days": 19000.0,
+      "rotation_period_hours": 44.6,
+      "atmosphere": "trace",
+      "biome_summary": "frozen",
+      "hydrosphere": "ice",
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "distant icy rocky, uninhabited"
+    },
+    {
+      "body_id": "GJ17i",
+      "proper_name": null,
+      "body_type": "planet",
+      "orbit_index": 9,
+      "parent_body_id": null,
+      "inhabited": false,
+      "population": null,
+      "mass_class": "terrestrial",
+      "surface_gravity": 0.30,
+      "orbital_period_days": 38000.0,
+      "rotation_period_hours": 53.4,
+      "atmosphere": "none",
+      "biome_summary": "frozen",
+      "hydrosphere": "ice",
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "far outer icy rocky, uninhabited"
+    },
+    {
+      "body_id": "GJ17j",
+      "proper_name": null,
+      "body_type": "planet",
+      "orbit_index": 10,
+      "parent_body_id": null,
+      "inhabited": false,
+      "population": null,
+      "mass_class": "dwarf",
+      "surface_gravity": 0.12,
+      "orbital_period_days": 68000.0,
+      "rotation_period_hours": 30.2,
+      "atmosphere": "none",
+      "biome_summary": "frozen",
+      "hydrosphere": "ice",
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "outermost dwarf, near oort boundary"
+    },
+    {
+      "body_id": "GJ17-oort",
+      "proper_name": null,
+      "body_type": "oort_cloud",
+      "orbit_index": 11,
+      "parent_body_id": null,
+      "inhabited": false,
+      "population": null,
+      "mass_class": null,
+      "surface_gravity": null,
+      "orbital_period_days": null,
+      "rotation_period_hours": null,
+      "atmosphere": null,
+      "biome_summary": null,
+      "hydrosphere": null,
+      "economic_role": null,
+      "settlement_pattern": null,
+      "industrial_corridor": null,
+      "notes": "oort cloud"
+    }
+  ],
+  "stations": [
+    {
+      "station_id": "GJ17-oort-S1",
+      "proper_name": "Binh Trang Horizon",
+      "orbits_body_id": "GJ17-oort",
+      "station_type": "horizon",
+      "population": 1400,
+      "economic_role": "transit",
+      "docking_class": "major",
+      "has_gate_infrastructure": true,
+      "notes": "horizon station — 3 apertures; junction; connects Kaelong, Thornfield Station, and GJ 660A; agricultural freight and outer corridor transit"
+    }
+  ]
+}
diff --git a/wiki/star-systems/GJ-17/index.md b/wiki/star-systems/GJ-17/index.md
index e92a29ad7..4e072ca94 100644
--- a/wiki/star-systems/GJ-17/index.md
+++ b/wiki/star-systems/GJ-17/index.md
@@ -44,6 +44,31 @@ Binh Trang's food trade agreement with Thornfield Station includes a currency de
 
 `wave_3` at `hop 6` as a `junction` with 3 apertures and an F9V primary is consistent with deliberate agricultural expansion along the Vietnamese corridor — the F9V star's better conditions would justify pushing a generation further out than the K8V systems that anchored the earlier wave. Vietnamese heritage founding community continuing the corridor identity established at Kaelong is a corridor-consistent choice that also explains the cultural relationship tension. The junction topology with an F9V star at 28.0 ly is calibrated correctly — the star's energy output supports the agricultural basis that a pure-M-dwarf system at this distance could not.
 
+## Celestial Bodies
+<!-- READ-ONLY — generated from systems.db bodies/stations tables -->
+
+| Orbit | ID | Name | Type | Inhabited | Pop | Mass | Gravity | Year (d) | Day (h) | Atmo | Biome | Hydro | Economy | Settlement | Industrial |
+|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
+| 1 | `GJ17b` | — | planet | no | — | terrestrial | 0.48g | 48 | 18.6 | none | barren | — | — | — | — |
+| 2 | `GJ17c` | — | planet | no | — | terrestrial | 0.71g | 180 | 23.8 | thin | hot_arid | — | — | — | — |
+| 3 | `GJ17d` | Binh Trang | planet | yes | 520K | terrestrial | 0.94g | 480 | 25.2 | standard | temperate | liquid_water | agricultural | dispersed | agricultural_export |
+| 4 | `GJ17-belt` | — | asteroid_belt | no | — | — | — | — | — | — | — | — | — | — | — |
+| 5 | `GJ17e` | — | planet | no | — | terrestrial | 0.62g | 1300 | 27.4 | thin | cold_arid | — | — | — | — |
+| 6 | `GJ17f` | — | gas_giant | no | — | — | — | 3600 | 10.8 | gas_giant | — | — | — | — | — |
+| ↳ 6.1 | `GJ17f-m1` | — | moon | no | — | dwarf | 0.14g | 7 | 172.8 | trace | frozen | — | — | — | — |
+| ↳ 6.2 | `GJ17f-m2` | — | moon | no | — | dwarf | 0.09g | 15 | 369.6 | — | barren | — | — | — | — |
+| 7 | `GJ17g` | — | planet | no | — | terrestrial | 0.49g | 9200 | 36.2 | trace | frozen | ice | — | — | — |
+| 8 | `GJ17h` | — | planet | no | — | terrestrial | 0.39g | 19000 | 44.6 | trace | frozen | ice | — | — | — |
+| 9 | `GJ17i` | — | planet | no | — | terrestrial | 0.30g | 38000 | 53.4 | none | frozen | ice | — | — | — |
+| 10 | `GJ17j` | — | planet | no | — | dwarf | 0.12g | 68000 | 30.2 | none | frozen | ice | — | — | — |
+| 11 | `GJ17-oort` | — | oort_cloud | no | — | — | — | — | — | — | — | — | — | — | — |
+
+### Stations & Facilities
+
+| ID | Name | Type | Orbits | Population | Economy | Governance | Docking | Gate | Districts |
+|---|---|---|---|---|---|---|---|---|---|
+| `GJ17-oort-S1` | Binh Trang Horizon | horizon | `GJ17-oort` | 1K | transit | — | major | yes | 1 |
+
 ## Topology
 <!-- READ-ONLY — regenerated from star-map.json edges -->
 - **Hop Distance from Gateway:** 6